From b939adfa155f2b3ca5c5226e86da85629654d79b Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Thu, 24 May 2007 10:44:53 +0100
Subject: Use the x11 driver as a test harness for the softpipe/state_tracker
 code.

This has some limitations as we currently require a mapped framebuffer,
so it only really works with double-buffered ximage rgba8888 windows.
---
 src/mesa/main/mtypes.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 71215d5470..2a8556388c 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -126,6 +126,7 @@ struct gl_pixelstore_attrib;
 struct gl_texture_format;
 struct gl_texture_image;
 struct gl_texture_object;
+struct st_context;
 typedef struct __GLcontextRec GLcontext;
 typedef struct __GLcontextModesRec GLvisual;
 typedef struct gl_framebuffer GLframebuffer;
@@ -3069,7 +3070,7 @@ struct __GLcontextRec
    void *swsetup_context;
    void *swtnl_context;
    void *swtnl_im;
-   void *acache_context;
+   struct st_context *st;
    void *aelt_context;
    /*@}*/
 };
-- 
cgit v1.2.3


From 563479552e2f491fb94e7fac5772f3c72cee962a Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Fri, 13 Jul 2007 09:25:57 -0600
Subject: Added basic occlusion counting

---
 src/mesa/main/queryobj.c                   | 15 +++++++
 src/mesa/pipe/p_context.h                  | 10 ++++-
 src/mesa/pipe/p_state.h                    |  1 +
 src/mesa/pipe/softpipe/sp_context.c        | 17 ++++++++
 src/mesa/pipe/softpipe/sp_context.h        |  3 ++
 src/mesa/pipe/softpipe/sp_quad.c           |  5 +++
 src/mesa/pipe/softpipe/sp_quad.h           |  1 +
 src/mesa/pipe/softpipe/sp_quad_occlusion.c | 67 ++++++++++++++++++++++++++++++
 src/mesa/sources                           |  1 +
 src/mesa/state_tracker/st_atom_depth.c     |  4 ++
 10 files changed, 123 insertions(+), 1 deletion(-)
 create mode 100644 src/mesa/pipe/softpipe/sp_quad_occlusion.c

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c
index 0e59ba615a..fc04dde3f4 100644
--- a/src/mesa/main/queryobj.c
+++ b/src/mesa/main/queryobj.c
@@ -30,6 +30,11 @@
 #include "queryobj.h"
 #include "mtypes.h"
 
+#if 1 /*PIPE*/
+#include "pipe/p_context.h"
+#include "state_tracker/st_context.h"
+#endif
+
 
 /**
  * Allocate a new query object.  This is a fallback routine called via
@@ -220,6 +225,10 @@ _mesa_BeginQueryARB(GLenum target, GLuint id)
    q->Result = 0;
    q->Ready = GL_FALSE;
 
+#if 1 /*PIPE*/
+   ctx->st->pipe->reset_occlusion_counter(ctx->st->pipe);
+#endif
+
    if (target == GL_SAMPLES_PASSED_ARB) {
       ctx->Query.CurrentOcclusionObject = q;
    }
@@ -282,6 +291,12 @@ _mesa_EndQueryARB(GLenum target)
       /* if we're using software rendering/querying */
       q->Ready = GL_TRUE;
    }
+
+#if 1 /*PIPE*/
+   if (target == GL_SAMPLES_PASSED_ARB) {
+      q->Result = ctx->st->pipe->get_occlusion_counter(ctx->st->pipe);
+   }
+#endif
 }
 
 
diff --git a/src/mesa/pipe/p_context.h b/src/mesa/pipe/p_context.h
index e4115226e7..05a175c8dc 100644
--- a/src/mesa/pipe/p_context.h
+++ b/src/mesa/pipe/p_context.h
@@ -28,7 +28,9 @@
 #ifndef PIPE_CONTEXT_H
 #define PIPE_CONTEXT_H
 
-#include "mtypes.h"
+#include "main/mtypes.h"
+#include "p_state.h"
+
 
 /* Kludge:
  */
@@ -57,6 +59,12 @@ struct pipe_context {
    void (*clear)(struct pipe_context *pipe, GLboolean color, GLboolean depth,
                  GLboolean stencil, GLboolean accum);
 
+   /** occlusion counting (XXX this may be temporary - we should probably
+    * have generic query objects with begin/end methods)
+    */
+   void (*reset_occlusion_counter)(struct pipe_context *pipe);
+   GLuint (*get_occlusion_counter)(struct pipe_context *pipe);
+
    /*
     * State functions
     */
diff --git a/src/mesa/pipe/p_state.h b/src/mesa/pipe/p_state.h
index 2b0d659993..fd5e7ad3af 100644
--- a/src/mesa/pipe/p_state.h
+++ b/src/mesa/pipe/p_state.h
@@ -136,6 +136,7 @@ struct pipe_depth_state
    GLuint enabled:1;   /**< depth test enabled? */
    GLuint writemask:1; /**< allow depth buffer writes? */
    GLuint func:3;      /**< depth test func (PIPE_FUNC_x) */
+   GLuint occlusion_count:1; /**< XXX move this elsewhere? */
    GLfloat clear;      /**< Clear value in [0,1] (XXX correct place?) */
 };
 
diff --git a/src/mesa/pipe/softpipe/sp_context.c b/src/mesa/pipe/softpipe/sp_context.c
index cc4b8d5914..685e55be84 100644
--- a/src/mesa/pipe/softpipe/sp_context.c
+++ b/src/mesa/pipe/softpipe/sp_context.c
@@ -60,6 +60,20 @@ static void softpipe_draw_vb( struct pipe_context *pipe,
 }
 
 
+static void softpipe_reset_occlusion_counter(struct pipe_context *pipe)
+{
+   struct softpipe_context *softpipe = softpipe_context( pipe );
+   softpipe->occlusion_counter = 0;
+}
+
+/* XXX pipe param should be const */
+static GLuint softpipe_get_occlusion_counter(struct pipe_context *pipe)
+{
+   struct softpipe_context *softpipe = softpipe_context( pipe );
+   return softpipe->occlusion_counter;
+}
+
+
 struct pipe_context *softpipe_create( void )
 {
    struct softpipe_context *softpipe = CALLOC_STRUCT(softpipe_context);
@@ -82,12 +96,15 @@ struct pipe_context *softpipe_create( void )
    softpipe->pipe.set_viewport_state = softpipe_set_viewport_state;
    softpipe->pipe.draw_vb = softpipe_draw_vb;
    softpipe->pipe.clear = softpipe_clear;
+   softpipe->pipe.reset_occlusion_counter = softpipe_reset_occlusion_counter;
+   softpipe->pipe.get_occlusion_counter = softpipe_get_occlusion_counter;
 
    softpipe->quad.polygon_stipple = sp_quad_polygon_stipple_stage(softpipe);
    softpipe->quad.shade = sp_quad_shade_stage(softpipe);
    softpipe->quad.alpha_test = sp_quad_alpha_test_stage(softpipe);
    softpipe->quad.depth_test = sp_quad_depth_test_stage(softpipe);
    softpipe->quad.stencil_test = sp_quad_stencil_test_stage(softpipe);
+   softpipe->quad.occlusion = sp_quad_occlusion_stage(softpipe);
    softpipe->quad.bufloop = sp_quad_bufloop_stage(softpipe);
    softpipe->quad.blend = sp_quad_blend_stage(softpipe);
    softpipe->quad.colormask = sp_quad_colormask_stage(softpipe);
diff --git a/src/mesa/pipe/softpipe/sp_context.h b/src/mesa/pipe/softpipe/sp_context.h
index 81d2b58cf9..38f2977bd8 100644
--- a/src/mesa/pipe/softpipe/sp_context.h
+++ b/src/mesa/pipe/softpipe/sp_context.h
@@ -115,6 +115,8 @@ struct softpipe_context {
     */
    GLubyte stipple_masks[16][16];
 
+   GLuint occlusion_counter;
+
    /** Software quad rendering pipeline */
    struct {
       struct quad_stage *polygon_stipple;
@@ -122,6 +124,7 @@ struct softpipe_context {
       struct quad_stage *alpha_test;
       struct quad_stage *stencil_test;
       struct quad_stage *depth_test;
+      struct quad_stage *occlusion;
       struct quad_stage *bufloop;
       struct quad_stage *blend;
       struct quad_stage *colormask;
diff --git a/src/mesa/pipe/softpipe/sp_quad.c b/src/mesa/pipe/softpipe/sp_quad.c
index 5f34f5f1b3..c27f14f32e 100644
--- a/src/mesa/pipe/softpipe/sp_quad.c
+++ b/src/mesa/pipe/softpipe/sp_quad.c
@@ -31,6 +31,11 @@ sp_build_quad_pipeline(struct softpipe_context *sp)
       sp->quad.first = sp->quad.bufloop;
    }
 
+   if (sp->depth_test.occlusion_count) {
+      sp->quad.occlusion->next = sp->quad.first;
+      sp->quad.first = sp->quad.occlusion;
+   }
+
    if (   sp->stencil.front_enabled
        || sp->stencil.front_enabled) {
       sp->quad.stencil_test->next = sp->quad.first;
diff --git a/src/mesa/pipe/softpipe/sp_quad.h b/src/mesa/pipe/softpipe/sp_quad.h
index 719d4774cc..072b51f9bf 100644
--- a/src/mesa/pipe/softpipe/sp_quad.h
+++ b/src/mesa/pipe/softpipe/sp_quad.h
@@ -51,6 +51,7 @@ struct quad_stage *sp_quad_shade_stage( struct softpipe_context *softpipe );
 struct quad_stage *sp_quad_alpha_test_stage( struct softpipe_context *softpipe );
 struct quad_stage *sp_quad_stencil_test_stage( struct softpipe_context *softpipe );
 struct quad_stage *sp_quad_depth_test_stage( struct softpipe_context *softpipe );
+struct quad_stage *sp_quad_occlusion_stage( struct softpipe_context *softpipe );
 struct quad_stage *sp_quad_bufloop_stage( struct softpipe_context *softpipe );
 struct quad_stage *sp_quad_blend_stage( struct softpipe_context *softpipe );
 struct quad_stage *sp_quad_colormask_stage( struct softpipe_context *softpipe );
diff --git a/src/mesa/pipe/softpipe/sp_quad_occlusion.c b/src/mesa/pipe/softpipe/sp_quad_occlusion.c
new file mode 100644
index 0000000000..843c462d48
--- /dev/null
+++ b/src/mesa/pipe/softpipe/sp_quad_occlusion.c
@@ -0,0 +1,67 @@
+/**************************************************************************
+ * 
+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * 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, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ **************************************************************************/
+
+
+/**
+ * \brief  Quad occlusion counter stage
+ * \author  Brian Paul
+ */
+
+
+#include "main/glheader.h"
+#include "main/imports.h"
+#include "pipe/p_defines.h"
+#include "sp_context.h"
+#include "sp_headers.h"
+#include "sp_surface.h"
+#include "sp_quad.h"
+
+
+static void
+occlusion_count_quad(struct quad_stage *qs, struct quad_header *quad)
+{
+   struct softpipe_context *softpipe = qs->softpipe;
+
+   softpipe->occlusion_counter += (quad->mask     ) & 1;
+   softpipe->occlusion_counter += (quad->mask >> 1) & 1;
+   softpipe->occlusion_counter += (quad->mask >> 2) & 1;
+   softpipe->occlusion_counter += (quad->mask >> 3) & 1;
+
+   if (quad->mask)
+      qs->next->run(qs->next, quad);
+}
+
+
+struct quad_stage *sp_quad_occlusion_stage( struct softpipe_context *softpipe )
+{
+   struct quad_stage *stage = CALLOC_STRUCT(quad_stage);
+
+   stage->softpipe = softpipe;
+   stage->run = occlusion_count_quad;
+
+   return stage;
+}
diff --git a/src/mesa/sources b/src/mesa/sources
index 4856f7b023..9bb05e35f7 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -164,6 +164,7 @@ SOFTPIPE_SOURCES = \
 	pipe/softpipe/sp_quad_colormask.c \
 	pipe/softpipe/sp_quad_depth_test.c \
 	pipe/softpipe/sp_quad_fs.c \
+	pipe/softpipe/sp_quad_occlusion.c \
 	pipe/softpipe/sp_quad_output.c \
 	pipe/softpipe/sp_quad_stipple.c \
 	pipe/softpipe/sp_quad_stencil.c \
diff --git a/src/mesa/state_tracker/st_atom_depth.c b/src/mesa/state_tracker/st_atom_depth.c
index a1523e06c2..7fc51953dc 100644
--- a/src/mesa/state_tracker/st_atom_depth.c
+++ b/src/mesa/state_tracker/st_atom_depth.c
@@ -71,6 +71,10 @@ update_depth( struct st_context *st )
    depth.func = gl_depth_func_to_sp(st->ctx->Depth.Func);
    depth.clear = st->ctx->Depth.Clear;
 
+   if (st->ctx->Query.CurrentOcclusionObject &&
+       st->ctx->Query.CurrentOcclusionObject->Active)
+      depth.occlusion_count = 1;
+
    if (memcmp(&depth, &st->state.depth, sizeof(depth)) != 0) {
       /* state has changed */
       st->state.depth = depth;  /* struct copy */
-- 
cgit v1.2.3


From 4576d754c98e3fb5d413e294d48fb70a893defcf Mon Sep 17 00:00:00 2001
From: Brian <brian@i915.localnet.net>
Date: Mon, 30 Jul 2007 17:17:44 -0600
Subject: Lots of improvements to the surface-related code.

Z testing now works with i915 driver.
Add gl_renderbuffer::surface pointer (and reverse pointer).
Remove intel_surface and xmesa_surface types - no longer used.
---
 src/mesa/drivers/dri/i915tex/intel_fbo.c     |  18 ++
 src/mesa/drivers/dri/i915tex/intel_fbo.h     |  14 +-
 src/mesa/drivers/dri/i915tex/intel_surface.c | 231 ++++++++++++++-------
 src/mesa/drivers/x11/xm_buffer.c             |   8 +
 src/mesa/drivers/x11/xm_surface.c            | 288 +++++----------------------
 src/mesa/drivers/x11/xmesaP.h                |  14 +-
 src/mesa/main/mtypes.h                       |   3 +
 src/mesa/main/renderbuffer.c                 |  22 +-
 src/mesa/pipe/p_state.h                      |  16 +-
 src/mesa/pipe/softpipe/sp_context.c          |  13 ++
 src/mesa/pipe/softpipe/sp_z_surface.c        | 118 +++++++++++
 src/mesa/pipe/softpipe/sp_z_surface.h        |  37 ++++
 src/mesa/sources                             |   1 +
 src/mesa/state_tracker/st_atom_framebuffer.c |  19 +-
 14 files changed, 449 insertions(+), 353 deletions(-)
 create mode 100644 src/mesa/pipe/softpipe/sp_z_surface.c
 create mode 100644 src/mesa/pipe/softpipe/sp_z_surface.h

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/i915tex/intel_fbo.c b/src/mesa/drivers/dri/i915tex/intel_fbo.c
index a09db46163..5a93eb7ad1 100644
--- a/src/mesa/drivers/dri/i915tex/intel_fbo.c
+++ b/src/mesa/drivers/dri/i915tex/intel_fbo.c
@@ -289,6 +289,12 @@ intel_alloc_renderbuffer_storage(GLcontext * ctx, struct gl_renderbuffer *rb,
       rb->Width = width;
       rb->Height = height;
 
+#if 1
+      /* update the surface's size too */
+      rb->surface->width = width;
+      rb->surface->height = height;
+#endif
+
       /* This sets the Get/PutRow/Value functions */
       intel_set_span_functions(&irb->Base);
 
@@ -451,6 +457,12 @@ intel_create_renderbuffer(GLenum intFormat, GLsizei width, GLsizei height,
    return irb;
 }
 
+
+/**
+ * Create a new renderbuffer which corresponds to an X window buffer
+ * (color, depth, stencil, etc) - not a user-created GL renderbuffer.
+ * The internal format is set at creation time and does not change.
+ */
 struct gl_renderbuffer *
 intel_new_renderbuffer_fb(GLcontext * ctx, GLuint intFormat)
 {
@@ -472,6 +484,9 @@ intel_new_renderbuffer_fb(GLcontext * ctx, GLuint intFormat)
    irb->Base.GetPointer = intel_get_pointer;
    /* span routines set in alloc_storage function */
 
+   irb->Base.surface = intel_new_surface(intFormat);
+   irb->Base.surface->rb = irb;
+
    return &irb->Base;
 }
 
@@ -500,6 +515,9 @@ intel_new_renderbuffer(GLcontext * ctx, GLuint name)
    irb->Base.GetPointer = intel_get_pointer;
    /* span routines set in alloc_storage function */
 
+   irb->Base.surface = intel_new_surface(0 /*unknown format*/);
+   irb->Base.surface->rb = irb;
+
    return &irb->Base;
 }
 
diff --git a/src/mesa/drivers/dri/i915tex/intel_fbo.h b/src/mesa/drivers/dri/i915tex/intel_fbo.h
index 1642ce774f..86c8106084 100644
--- a/src/mesa/drivers/dri/i915tex/intel_fbo.h
+++ b/src/mesa/drivers/dri/i915tex/intel_fbo.h
@@ -37,17 +37,6 @@ struct intel_context;
 struct intel_region;
 
 
-/**
- * Intel "pipe" surface.  This is kind of a temporary thing as
- * renderbuffers and surfaces should eventually become one.
- */
-struct intel_surface
-{
-   struct softpipe_surface surface;  /**< base class */
-   struct intel_renderbuffer *rb;    /**< ptr back to matching renderbuffer */
-};
-
-
 /**
  * Intel framebuffer, derived from gl_framebuffer.
  */
@@ -129,5 +118,8 @@ extern struct intel_region *intel_get_rb_region(struct gl_framebuffer *fb,
 
 
 
+extern struct pipe_surface *
+intel_new_surface(GLuint intFormat);
+
 
 #endif /* INTEL_FBO_H */
diff --git a/src/mesa/drivers/dri/i915tex/intel_surface.c b/src/mesa/drivers/dri/i915tex/intel_surface.c
index 3be902cf9c..043c5aa5fe 100644
--- a/src/mesa/drivers/dri/i915tex/intel_surface.c
+++ b/src/mesa/drivers/dri/i915tex/intel_surface.c
@@ -23,27 +23,33 @@
  * XXX a lof of this is a temporary kludge
  */
 
+/**
+ * Note: the arithmetic/addressing in these functions is a little
+ * tricky since we need to invert the Y axis.
+ */
 
 
 static void
 read_quad_f_swz(struct softpipe_surface *sps, GLint x, GLint y,
                 GLfloat (*rrrr)[QUAD_SIZE])
 {
-   struct intel_surface *is = (struct intel_surface *) sps;
-   struct intel_renderbuffer *irb = is->rb;
-   const GLubyte *src = (const GLubyte *) irb->region->map
-      + (y * irb->region->pitch + x) * irb->region->cpp;
+   const GLint bytesPerRow = sps->surface.stride * sps->surface.cpp;
+   const GLint invY = sps->surface.height - y - 1;
+   const GLubyte *src = sps->surface.ptr + invY * bytesPerRow + x * sps->surface.cpp;
    GLfloat *dst = (GLfloat *) rrrr;
    GLubyte temp[16];
-   GLuint i, j;
+   GLuint j;
+
+   assert(sps->surface.format == PIPE_FORMAT_U_A8_R8_G8_B8);
 
-   memcpy(temp, src, 8);
-   memcpy(temp + 8, src + irb->region->pitch * irb->region->cpp, 8);
+   memcpy(temp + 8, src, 8);
+   memcpy(temp + 0, src + bytesPerRow, 8);
 
-   for (i = 0; i < 4; i++) {
-      for (j = 0; j < 4; j++) {
-         dst[j * 4 + i] = UBYTE_TO_FLOAT(temp[i * 4 + j]);
-      }
+   for (j = 0; j < 4; j++) {
+      dst[0 * 4 + j] = UBYTE_TO_FLOAT(temp[j * 4 + 2]); /*R*/
+      dst[1 * 4 + j] = UBYTE_TO_FLOAT(temp[j * 4 + 1]); /*G*/
+      dst[2 * 4 + j] = UBYTE_TO_FLOAT(temp[j * 4 + 0]); /*B*/
+      dst[3 * 4 + j] = UBYTE_TO_FLOAT(temp[j * 4 + 3]); /*A*/
    }
 }
 
@@ -52,45 +58,128 @@ static void
 write_quad_f_swz(struct softpipe_surface *sps, GLint x, GLint y,
                  GLfloat (*rrrr)[QUAD_SIZE])
 {
-   struct intel_surface *is = (struct intel_surface *) sps;
-   struct intel_renderbuffer *irb = is->rb;
    const GLfloat *src = (const GLfloat *) rrrr;
-   GLubyte *dst = (GLubyte *) irb->region->map
-      + (y * irb->region->pitch + x) * irb->region->cpp;
+   const GLint bytesPerRow = sps->surface.stride * sps->surface.cpp;
+   const GLint invY = sps->surface.height - y - 1;
+   GLubyte *dst = sps->surface.ptr + invY * bytesPerRow + x * sps->surface.cpp;
    GLubyte temp[16];
-   GLuint i, j;
+   GLuint j;
+
+   assert(sps->surface.format == PIPE_FORMAT_U_A8_R8_G8_B8);
 
-   for (i = 0; i < 4; i++) {
-      for (j = 0; j < 4; j++) {
-         UNCLAMPED_FLOAT_TO_UBYTE(temp[j * 4 + i], src[i * 4 + j]);
-      }
+   for (j = 0; j < 4; j++) {
+      UNCLAMPED_FLOAT_TO_UBYTE(temp[j * 4 + 2], src[0 * 4 + j]); /*R*/
+      UNCLAMPED_FLOAT_TO_UBYTE(temp[j * 4 + 1], src[1 * 4 + j]); /*G*/
+      UNCLAMPED_FLOAT_TO_UBYTE(temp[j * 4 + 0], src[2 * 4 + j]); /*B*/
+      UNCLAMPED_FLOAT_TO_UBYTE(temp[j * 4 + 3], src[3 * 4 + j]); /*A*/
    }
 
-   memcpy(dst, temp, 8);
-   memcpy(dst + irb->region->pitch * irb->region->cpp, temp + 8, 8);
+   memcpy(dst, temp + 8, 8);
+   memcpy(dst + bytesPerRow, temp + 0, 8);
 }
 
 
 
+static void
+read_quad_z24(struct softpipe_surface *sps,
+              GLint x, GLint y, GLuint zzzz[QUAD_SIZE])
+{
+   static const GLuint mask = 0xffffff;
+   const GLint invY = sps->surface.height - y - 1;
+   const GLuint *src
+      = (GLuint *) (sps->surface.ptr
+                    + (invY * sps->surface.stride + x) * sps->surface.cpp);
+
+   assert(sps->surface.format == PIPE_FORMAT_Z24_S8);
+
+   /* extract lower three bytes */
+   zzzz[0] = src[0] & mask;
+   zzzz[1] = src[1] & mask;
+   zzzz[2] = src[-sps->surface.stride] & mask;
+   zzzz[3] = src[-sps->surface.stride + 1] & mask;
+}
+
+static void
+write_quad_z24(struct softpipe_surface *sps,
+               GLint x, GLint y, const GLuint zzzz[QUAD_SIZE])
+{
+   static const GLuint mask = 0xff000000;
+   const GLint invY = sps->surface.height - y - 1;
+   GLuint *dst
+      = (GLuint *) (sps->surface.ptr
+                    + (invY * sps->surface.stride + x) * sps->surface.cpp);
+
+   assert(sps->surface.format == PIPE_FORMAT_Z24_S8);
+
+   /* write lower three bytes */
+   dst[0] = (dst[0] & mask) | zzzz[0];
+   dst[1] = (dst[1] & mask) | zzzz[1];
+   dst -= sps->surface.stride;
+   dst[0] = (dst[0] & mask) | zzzz[2];
+   dst[1] = (dst[1] & mask) | zzzz[3];
+}
+
+
+static void
+read_quad_stencil(struct softpipe_surface *sps,
+                  GLint x, GLint y, GLubyte ssss[QUAD_SIZE])
+{
+   const GLint invY = sps->surface.height - y - 1;
+   const GLuint *src = (const GLuint *) (sps->surface.ptr
+                     + (invY * sps->surface.stride + x) * sps->surface.cpp);
+
+   assert(sps->surface.format == PIPE_FORMAT_Z24_S8);
+
+   /* extract high byte */
+   ssss[0] = src[0] >> 24;
+   ssss[1] = src[1] >> 24;
+   ssss[2] = src[-sps->surface.width] >> 24;
+   ssss[3] = src[-sps->surface.width + 1] >> 24;
+}
+
+static void
+write_quad_stencil(struct softpipe_surface *sps,
+                   GLint x, GLint y, const GLubyte ssss[QUAD_SIZE])
+{
+   static const GLuint mask = 0x00ffffff;
+   const GLint invY = sps->surface.height - y - 1;
+   GLuint *dst = (GLuint *) (sps->surface.ptr
+               + (invY * sps->surface.stride + x) * sps->surface.cpp);
+
+   assert(sps->surface.format == PIPE_FORMAT_Z24_S8);
+
+   /* write high byte */
+   dst[0] = (dst[0] & mask) | (ssss[0] << 24);
+   dst[1] = (dst[1] & mask) | (ssss[1] << 24);
+   dst -= sps->surface.stride;
+   dst[0] = (dst[0] & mask) | (ssss[2] << 24);
+   dst[1] = (dst[1] & mask) | (ssss[3] << 24);
+}
+
+
 static void *
 map_surface_buffer(struct pipe_buffer *pb, GLuint access_mode)
 {
-   struct intel_surface *is = (struct intel_surface *) pb;
-   struct intel_renderbuffer *irb = is->rb;
-   GET_CURRENT_CONTEXT(ctx);
-   struct intel_context *intel = intel_context(ctx);
-
+   struct softpipe_surface *sps = (struct softpipe_surface *) pb;
+   struct intel_renderbuffer *irb = (struct intel_renderbuffer *) sps->surface.rb;
    assert(access_mode == PIPE_MAP_READ_WRITE);
 
-   intelFinish(&intel->ctx);
-
    /*LOCK_HARDWARE(intel);*/
 
    if (irb->region) {
+      GET_CURRENT_CONTEXT(ctx);
+      struct intel_context *intel = intel_context(ctx);
+#if 0
+      intelFinish(&intel->ctx);  /* XXX need this? */
+#endif
       intel_region_map(intel->intelScreen, irb->region);
    }
    pb->ptr = irb->region->map;
 
+   sps->surface.stride = irb->region->pitch;
+   sps->surface.cpp = irb->region->cpp;
+   sps->surface.ptr = irb->region->map;
+
    return pb->ptr;
 }
 
@@ -98,69 +187,67 @@ map_surface_buffer(struct pipe_buffer *pb, GLuint access_mode)
 static void
 unmap_surface_buffer(struct pipe_buffer *pb)
 {
-   struct intel_surface *is = (struct intel_surface *) pb;
-   struct intel_renderbuffer *irb = is->rb;
-   GET_CURRENT_CONTEXT(ctx);
-   struct intel_context *intel = intel_context(ctx);
+   struct softpipe_surface *sps = (struct softpipe_surface *) pb;
+   struct intel_renderbuffer *irb = (struct intel_renderbuffer *) sps->surface.rb;
 
    if (irb->region) {
+      GET_CURRENT_CONTEXT(ctx);
+      struct intel_context *intel = intel_context(ctx);
       intel_region_unmap(intel->intelScreen, irb->region);
    }
    pb->ptr = NULL;
 
+   sps->surface.stride = 0;
+   sps->surface.cpp = 0;
+   sps->surface.ptr = NULL;
+
    /*UNLOCK_HARDWARE(intel);*/
 }
 
 
 struct pipe_surface *
-xmesa_get_color_surface(GLcontext *ctx, GLuint i)
+intel_new_surface(GLuint intFormat)
 {
-   struct intel_context *intel = intel_context(ctx);
-   struct intel_framebuffer *intel_fb;
-   struct intel_renderbuffer *intel_rb;
-
-   intel_fb = (struct intel_framebuffer *) ctx->DrawBuffer;
-   intel_rb = intel_fb->color_rb[1];
-
-   if (!intel_rb->surface) {
-      /* create surface and attach to intel_rb */
-      struct intel_surface *is;
-      is = CALLOC_STRUCT(intel_surface);
-      if (is) {
-         is->surface.surface.width = intel_rb->Base.Width;
-         is->surface.surface.height = intel_rb->Base.Height;
-
-         is->surface.read_quad_f_swz = read_quad_f_swz;
-         is->surface.write_quad_f_swz = write_quad_f_swz;
-
-         is->surface.surface.buffer.map = map_surface_buffer;
-         is->surface.surface.buffer.unmap = unmap_surface_buffer;
-
-         is->rb = intel_rb;
-      }
-      intel_rb->surface = is;
+   struct softpipe_surface *sps = CALLOC_STRUCT(softpipe_surface);
+   if (!sps)
+      return NULL;
+
+   sps->surface.width = 0; /* set in intel_alloc_renderbuffer_storage() */
+   sps->surface.height = 0;
+
+   if (intFormat == GL_RGBA8) {
+      sps->surface.format = PIPE_FORMAT_U_A8_R8_G8_B8;
+      sps->read_quad_f_swz = read_quad_f_swz;
+      sps->write_quad_f_swz = write_quad_f_swz;
    }
-   else {
-      /* update surface size */
-      struct intel_surface *is = intel_rb->surface;
-      is->surface.surface.width = intel_rb->Base.Width;
-      is->surface.surface.height = intel_rb->Base.Height;
-      /* sanity check */
-      assert(is->surface.surface.buffer.map == map_surface_buffer);
+   else if (intFormat == GL_RGB5) {
+      sps->surface.format = PIPE_FORMAT_U_R5_G6_B5;
+
    }
+   else if (intFormat == GL_DEPTH_COMPONENT16) {
+      sps->surface.format = PIPE_FORMAT_U_Z16;
 
-   return &intel_rb->surface->surface.surface;
-}
+   }
+   else if (intFormat == GL_DEPTH24_STENCIL8_EXT) {
+      sps->surface.format = PIPE_FORMAT_Z24_S8;
+      sps->read_quad_z = read_quad_z24;
+      sps->write_quad_z = write_quad_z24;
+      sps->read_quad_stencil = read_quad_stencil;
+      sps->write_quad_stencil = write_quad_stencil;
+   }
+   else {
+      /* TBD / unknown */
 
+   }
 
-struct pipe_surface *
-xmesa_get_z_surface(GLcontext *ctx)
-{
-   /* XXX fix */
-   return NULL;
+   sps->surface.buffer.map = map_surface_buffer;
+   sps->surface.buffer.unmap = unmap_surface_buffer;
+
+   return &sps->surface;
 }
 
 
+
 struct pipe_surface *
 xmesa_get_stencil_surface(GLcontext *ctx)
 {
diff --git a/src/mesa/drivers/x11/xm_buffer.c b/src/mesa/drivers/x11/xm_buffer.c
index 51d183bb43..8fbd9a783b 100644
--- a/src/mesa/drivers/x11/xm_buffer.c
+++ b/src/mesa/drivers/x11/xm_buffer.c
@@ -35,6 +35,7 @@
 #include "imports.h"
 #include "framebuffer.h"
 #include "renderbuffer.h"
+#include "pipe/p_state.h"
 
 
 #if defined(USE_XSHM) && !defined(XFree86Server)
@@ -268,6 +269,8 @@ xmesa_alloc_front_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
    rb->Height = height;
    rb->InternalFormat = internalFormat;
 
+   rb->surface->resize(rb->surface, width, height);
+
    return GL_TRUE;
 }
 
@@ -317,6 +320,8 @@ xmesa_alloc_back_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
       xrb->origin4 = NULL;
    }
 
+   rb->surface->resize(rb->surface, width, height);
+
    return GL_TRUE;
 }
 
@@ -352,6 +357,9 @@ xmesa_new_renderbuffer(GLcontext *ctx, GLuint name, const GLvisual *visual,
          xrb->Base.IndexBits = visual->indexBits;
       }
       /* only need to set Red/Green/EtcBits fields for user-created RBs */
+
+      xrb->Base.surface = xmesa_new_surface(xrb);
+
    }
    return xrb;
 }
diff --git a/src/mesa/drivers/x11/xm_surface.c b/src/mesa/drivers/x11/xm_surface.c
index 9d6db2b5ce..17f5f28a9d 100644
--- a/src/mesa/drivers/x11/xm_surface.c
+++ b/src/mesa/drivers/x11/xm_surface.c
@@ -24,7 +24,7 @@
 
 
 /**
- * \file xm_surface.h
+ * \file xm_surface.c
  * Code to allow the softpipe code to write to X windows/buffers.
  * This is a bit of a hack for now.  We've basically got two different
  * abstractions for color buffers: gl_renderbuffer and softpipe_surface.
@@ -48,31 +48,11 @@
 #include "pipe/softpipe/sp_surface.h"
 
 
-/**
- * An xm_surface is derived from a softpipe_surface
- */
-struct xmesa_surface
-{
-   struct softpipe_surface sps;
-   struct xmesa_renderbuffer *xrb;  /** ptr back to matching xmesa_renderbuffer */
-   struct gl_renderbuffer *rb; /* ptr to matching gl_renderbuffer */
-};
-
-
-/**
- * Cast wrapper
- */
-static INLINE struct xmesa_surface *
-xmesa_surface(struct softpipe_surface *sps)
-{
-   return (struct xmesa_surface *) sps;
-}
-
-
 static void *
 map_surface_buffer(struct pipe_buffer *pb, GLuint access_mode)
 {
    /* no-op */
+   return NULL;
 }
 
 
@@ -83,6 +63,13 @@ unmap_surface_buffer(struct pipe_buffer *pb)
 }
 
 
+static INLINE struct xmesa_renderbuffer *
+xmesa_rb(struct softpipe_surface *sps)
+{
+   return (struct xmesa_renderbuffer *) sps->surface.rb;
+}
+
+
 /**
  * quad reading/writing
  * These functions are just wrappers around the existing renderbuffer
@@ -90,11 +77,10 @@ unmap_surface_buffer(struct pipe_buffer *pb)
  */
 
 static void
-read_quad_f(struct softpipe_surface *gs, GLint x, GLint y,
+read_quad_f(struct softpipe_surface *sps, GLint x, GLint y,
             GLfloat (*rgba)[NUM_CHANNELS])
 {
-   struct xmesa_surface *xmsurf = xmesa_surface(gs);
-   struct xmesa_renderbuffer *xrb = xmsurf->xrb;
+   struct xmesa_renderbuffer *xrb = xmesa_rb(sps);
    GLubyte temp[16];
    GLfloat *dst = (GLfloat *) rgba;
    GLuint i;
@@ -107,11 +93,10 @@ read_quad_f(struct softpipe_surface *gs, GLint x, GLint y,
 }
 
 static void
-read_quad_f_swz(struct softpipe_surface *gs, GLint x, GLint y,
+read_quad_f_swz(struct softpipe_surface *sps, GLint x, GLint y,
                 GLfloat (*rrrr)[QUAD_SIZE])
 {
-   struct xmesa_surface *xmsurf = xmesa_surface(gs);
-   struct xmesa_renderbuffer *xrb = xmsurf->xrb;
+   struct xmesa_renderbuffer *xrb = xmesa_rb(sps);
    GLubyte temp[16];
    GLfloat *dst = (GLfloat *) rrrr;
    GLuint i, j;
@@ -126,11 +111,10 @@ read_quad_f_swz(struct softpipe_surface *gs, GLint x, GLint y,
 }
 
 static void
-write_quad_f(struct softpipe_surface *gs, GLint x, GLint y,
+write_quad_f(struct softpipe_surface *sps, GLint x, GLint y,
              GLfloat (*rgba)[NUM_CHANNELS])
 {
-   struct xmesa_surface *xmsurf = xmesa_surface(gs);
-   struct xmesa_renderbuffer *xrb = xmsurf->xrb;
+   struct xmesa_renderbuffer *xrb = xmesa_rb(sps);
    GLubyte temp[16];
    const GLfloat *src = (const GLfloat *) rgba;
    GLuint i;
@@ -143,11 +127,10 @@ write_quad_f(struct softpipe_surface *gs, GLint x, GLint y,
 }
 
 static void
-write_quad_f_swz(struct softpipe_surface *gs, GLint x, GLint y,
+write_quad_f_swz(struct softpipe_surface *sps, GLint x, GLint y,
                  GLfloat (*rrrr)[QUAD_SIZE])
 {
-   struct xmesa_surface *xmsurf = xmesa_surface(gs);
-   struct xmesa_renderbuffer *xrb = xmsurf->xrb;
+   struct xmesa_renderbuffer *xrb = xmesa_rb(sps);
    GLubyte temp[16];
    const GLfloat *src = (const GLfloat *) rrrr;
    GLuint i, j;
@@ -162,251 +145,70 @@ write_quad_f_swz(struct softpipe_surface *gs, GLint x, GLint y,
 }
 
 static void
-read_quad_ub(struct softpipe_surface *gs, GLint x, GLint y,
+read_quad_ub(struct softpipe_surface *sps, GLint x, GLint y,
              GLubyte (*rgba)[NUM_CHANNELS])
 {
-   struct xmesa_surface *xmsurf = xmesa_surface(gs);
-   struct xmesa_renderbuffer *xrb = xmsurf->xrb;
+   struct xmesa_renderbuffer *xrb = xmesa_rb(sps);
    GET_CURRENT_CONTEXT(ctx);
    xrb->Base.GetRow(ctx, &xrb->Base, 2, x, y,     rgba);
    xrb->Base.GetRow(ctx, &xrb->Base, 2, x, y + 1, rgba + 2);
 }
 
 static void
-write_quad_ub(struct softpipe_surface *gs, GLint x, GLint y,
+write_quad_ub(struct softpipe_surface *sps, GLint x, GLint y,
               GLubyte (*rgba)[NUM_CHANNELS])
 {
-   struct xmesa_surface *xmsurf = xmesa_surface(gs);
-   struct xmesa_renderbuffer *xrb = xmsurf->xrb;
+   struct xmesa_renderbuffer *xrb = xmesa_rb(sps);
    GET_CURRENT_CONTEXT(ctx);
    xrb->Base.GetRow(ctx, &xrb->Base, 2, x, y,     rgba);
    xrb->Base.GetRow(ctx, &xrb->Base, 2, x, y + 1, rgba + 2);
 }
 
 static void
-write_mono_row_ub(struct softpipe_surface *gs, GLuint count, GLint x, GLint y,
+write_mono_row_ub(struct softpipe_surface *sps, GLuint count, GLint x, GLint y,
                   GLubyte rgba[NUM_CHANNELS])
 {
-   struct xmesa_surface *xmsurf = xmesa_surface(gs);
-   struct xmesa_renderbuffer *xrb = xmsurf->xrb;
+   struct xmesa_renderbuffer *xrb = xmesa_rb(sps);
    GET_CURRENT_CONTEXT(ctx);
    xrb->Base.PutMonoRow(ctx, &xrb->Base, count, x, y, rgba, NULL);
 }
 
 
-static struct xmesa_surface *
-create_surface(XMesaContext xmctx, struct xmesa_renderbuffer *xrb)
-{
-   struct xmesa_surface *xmsurf;
-
-   xmsurf = CALLOC_STRUCT(xmesa_surface);
-   if (xmsurf) {
-      xmsurf->xrb = xrb;
-      xmsurf->sps.surface.width = xrb->Base.Width;
-      xmsurf->sps.surface.height = xrb->Base.Height;
-
-      xmsurf->sps.read_quad_f = read_quad_f;
-      xmsurf->sps.read_quad_f_swz = read_quad_f_swz;
-      xmsurf->sps.read_quad_ub = read_quad_ub;
-      xmsurf->sps.write_quad_f = write_quad_f;
-      xmsurf->sps.write_quad_f_swz = write_quad_f_swz;
-      xmsurf->sps.write_quad_ub = write_quad_ub;
-      xmsurf->sps.write_mono_row_ub = write_mono_row_ub;
-
-      xmsurf->sps.surface.buffer.map = map_surface_buffer;
-      xmsurf->sps.surface.buffer.unmap = unmap_surface_buffer;
-
-#if 0
-      if (xrb->ximage) {
-         xmsurf->sps.surface.ptr = (GLubyte *) xrb->ximage->data;
-         xmsurf->sps.surface.stride = xrb->ximage->bytes_per_line;
-         xmsurf->sps.surface.cpp = xrb->ximage->depth;
-
-      }
-#endif
-   }
-   return xmsurf;
-}
-
-
-static void
-free_surface(struct softpipe_surface *sps)
-{
-   /* XXX may need to do more in the future */
-   free(sps);
-}
-
-
-/**
- * Return generic surface pointer corresponding to the current color buffer.
- */
-struct pipe_surface *
-xmesa_get_color_surface(GLcontext *ctx, GLuint buf)
-{
-   XMesaContext xmctx = XMESA_CONTEXT(ctx);
-   struct gl_renderbuffer *rb = ctx->DrawBuffer->_ColorDrawBuffers[0][buf];   
-   struct xmesa_renderbuffer *xrb = xmesa_renderbuffer(rb);
-   struct softpipe_surface *sps = (struct softpipe_surface *) xrb->pSurface;
-
-   if (!sps) {
-      xrb->pSurface = create_surface(xmctx, xrb);
-   }
-   else if (sps->surface.width != rb->Width ||
-            sps->surface.height != rb->Height) {
-      free_surface(sps);
-      xrb->pSurface = create_surface(xmctx, xrb);
-   }
-
-   return (struct pipe_surface *) xrb->pSurface;
-}
-
-
-
-
-static void
-read_quad_z(struct softpipe_surface *sps,
-            GLint x, GLint y, GLuint zzzz[QUAD_SIZE])
-{
-   struct xmesa_surface *xmsurf = xmesa_surface(sps);
-   struct gl_renderbuffer *rb = xmsurf->rb;
-   GLushort temp[4];
-   GLuint i;
-   GET_CURRENT_CONTEXT(ctx);
-   rb->GetRow(ctx, rb, 2, x, y,     temp);
-   rb->GetRow(ctx, rb, 2, x, y + 1, temp + 2);
-   /* convert from GLushort to GLuint */
-   for (i = 0; i < 4; i++) {
-      zzzz[i] = temp[i];
-   }
-}
-
-static void
-write_quad_z(struct softpipe_surface *sps,
-             GLint x, GLint y, const GLuint zzzz[QUAD_SIZE])
-{
-   struct xmesa_surface *xmsurf = xmesa_surface(sps);
-   struct gl_renderbuffer *rb = xmsurf->rb;
-   GLushort temp[4];
-   GLuint i;
-   GET_CURRENT_CONTEXT(ctx);
-   /* convert from GLuint to GLushort */
-   for (i = 0; i < 4; i++) {
-      temp[i] = zzzz[i];
-   }
-   rb->PutRow(ctx, rb, 2, x, y,     temp,     NULL);
-   rb->PutRow(ctx, rb, 2, x, y + 1, temp + 2, NULL);
-}
-
-
-static struct xmesa_surface *
-create_z_surface(XMesaContext xmctx, struct gl_renderbuffer *rb)
-{
-   struct xmesa_surface *xmsurf;
-
-   xmsurf = CALLOC_STRUCT(xmesa_surface);
-   if (xmsurf) {
-      xmsurf->sps.surface.format = PIPE_FORMAT_U_Z16;
-      xmsurf->sps.surface.width = rb->Width;
-      xmsurf->sps.surface.height = rb->Height;
-      xmsurf->sps.read_quad_z = read_quad_z;
-      xmsurf->sps.write_quad_z = write_quad_z;
-      xmsurf->rb = rb;
-   }
-   return xmsurf;
-}
-
-
-
-
 static void
-read_quad_stencil(struct softpipe_surface *sps,
-                  GLint x, GLint y, GLubyte ssss[QUAD_SIZE])
+resize_surface(struct pipe_surface *ps, GLuint width, GLuint height)
 {
-   struct xmesa_surface *xmsurf = xmesa_surface(sps);
-   struct gl_renderbuffer *rb = xmsurf->rb;
-   GET_CURRENT_CONTEXT(ctx);
-   rb->GetRow(ctx, rb, 2, x, y,     ssss);
-   rb->GetRow(ctx, rb, 2, x, y + 1, ssss + 2);
-}
-
-static void
-write_quad_stencil(struct softpipe_surface *sps,
-                   GLint x, GLint y, const GLubyte ssss[QUAD_SIZE])
-{
-   struct xmesa_surface *xmsurf = xmesa_surface(sps);
-   struct gl_renderbuffer *rb = xmsurf->rb;
-   GET_CURRENT_CONTEXT(ctx);
-   rb->PutRow(ctx, rb, 2, x, y,     ssss,     NULL);
-   rb->PutRow(ctx, rb, 2, x, y + 1, ssss + 2, NULL);
-}
-
-static struct xmesa_surface *
-create_stencil_surface(XMesaContext xmctx, struct gl_renderbuffer *rb)
-{
-   struct xmesa_surface *xmsurf;
-
-   xmsurf = CALLOC_STRUCT(xmesa_surface);
-   if (xmsurf) {
-      xmsurf->sps.surface.format = PIPE_FORMAT_U_S8;
-      xmsurf->sps.surface.width = rb->Width;
-      xmsurf->sps.surface.height = rb->Height;
-      xmsurf->sps.read_quad_stencil = read_quad_stencil;
-      xmsurf->sps.write_quad_stencil = write_quad_stencil;
-      xmsurf->rb = rb;
-   }
-   return xmsurf;
+   ps->width = width;
+   ps->height = height;
 }
 
 
-
-
 /**
- * Return a pipe_surface that wraps the current Z/depth buffer.
- * XXX this is pretty much a total hack until gl_renderbuffers and
- * pipe_surfaces are merged...
+ * Called to create a pipe_surface for each X renderbuffer.
  */
 struct pipe_surface *
-xmesa_get_z_surface(GLcontext *ctx)
+xmesa_new_surface(struct xmesa_renderbuffer *xrb)
 {
-   XMesaContext xmctx = XMESA_CONTEXT(ctx);
-   struct gl_renderbuffer *rb = ctx->DrawBuffer->_DepthBuffer;
-   static struct xmesa_surface *xms = NULL;
+   struct softpipe_surface *sps;
 
-   if (!rb)
+   sps = CALLOC_STRUCT(softpipe_surface);
+   if (!sps)
       return NULL;
 
-   if (!xms) {
-      xms = create_z_surface(xmctx, rb);
-   }
-   else if (xms->sps.surface.width != rb->Width ||
-            xms->sps.surface.height != rb->Height) {
-      free_surface(&xms->sps);
-      xms = create_z_surface(xmctx, rb);
-   }
-
-   return (struct pipe_surface *) &xms->sps.surface;
-}
+   sps->surface.rb = xrb;
+   sps->surface.width = xrb->Base.Width;
+   sps->surface.height = xrb->Base.Height;
 
+   sps->read_quad_f = read_quad_f;
+   sps->read_quad_f_swz = read_quad_f_swz;
+   sps->read_quad_ub = read_quad_ub;
+   sps->write_quad_f = write_quad_f;
+   sps->write_quad_f_swz = write_quad_f_swz;
+   sps->write_quad_ub = write_quad_ub;
+   sps->write_mono_row_ub = write_mono_row_ub;
 
-struct pipe_surface *
-xmesa_get_stencil_surface(GLcontext *ctx)
-{
-   XMesaContext xmctx = XMESA_CONTEXT(ctx);
-   struct gl_renderbuffer *rb = ctx->DrawBuffer->_StencilBuffer;
-   static struct xmesa_surface *xms = NULL;
+   sps->surface.buffer.map = map_surface_buffer;
+   sps->surface.buffer.unmap = unmap_surface_buffer;
+   sps->surface.resize = resize_surface;
 
-   if (!rb)
-      return NULL;
-
-   if (!xms) {
-      xms = create_stencil_surface(xmctx, rb);
-   }
-   else if (xms->sps.surface.width != rb->Width ||
-            xms->sps.surface.height != rb->Height) {
-      free_surface(&xms->sps);
-      xms = create_stencil_surface(xmctx, rb);
-   }
-
-   return (struct pipe_surface *) &xms->sps.surface;
+   return &sps->surface;
 }
-
diff --git a/src/mesa/drivers/x11/xmesaP.h b/src/mesa/drivers/x11/xmesaP.h
index 8648b19939..daf6a3f942 100644
--- a/src/mesa/drivers/x11/xmesaP.h
+++ b/src/mesa/drivers/x11/xmesaP.h
@@ -585,23 +585,11 @@ extern void xmesa_register_swrast_functions( GLcontext *ctx );
 #define ENABLE_EXT_timer_query 0 /* may not have 64-bit GLuint64EXT */
 #endif
 
-#if 0
-GLboolean xmesa_get_cbuf_details( GLcontext *ctx,
-				  void **ptr,
-				  GLuint *cpp,
-				  GLint *stride,
-				  GLuint *format );
-#endif
 
 struct pipe_surface;
-struct pipe_surface *
-xmesa_get_color_surface(GLcontext *ctx, GLuint buf);
-
-struct pipe_surface *
-xmesa_get_z_surface(GLcontext *ctx);
 
 struct pipe_surface *
-xmesa_get_stencil_surface(GLcontext *ctx);
+xmesa_new_surface(struct xmesa_renderbuffer *xrb);
 
 
 #endif
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 52448ee04e..d70df5d945 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -127,6 +127,7 @@ struct gl_texture_format;
 struct gl_texture_image;
 struct gl_texture_object;
 struct st_context;
+struct pipe_surface;
 typedef struct __GLcontextRec GLcontext;
 typedef struct __GLcontextModesRec GLvisual;
 typedef struct gl_framebuffer GLframebuffer;
@@ -2268,6 +2269,8 @@ struct gl_renderbuffer
    GLubyte StencilBits;
    GLvoid *Data;        /**< This may not be used by some kinds of RBs */
 
+   struct pipe_surface *surface;
+
    /* Used to wrap one renderbuffer around another: */
    struct gl_renderbuffer *Wrapped;
 
diff --git a/src/mesa/main/renderbuffer.c b/src/mesa/main/renderbuffer.c
index 6f1d7c3960..a1412ef007 100644
--- a/src/mesa/main/renderbuffer.c
+++ b/src/mesa/main/renderbuffer.c
@@ -49,6 +49,9 @@
 
 #include "rbadaptors.h"
 
+#include "pipe/softpipe/sp_z_surface.h"
+#include "pipe/p_state.h"
+
 
 /* 32-bit color index format.  Not a public format. */
 #define COLOR_INDEX32 0x424243
@@ -1091,6 +1094,7 @@ _mesa_soft_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
       rb->PutValues = put_values_ushort;
       rb->PutMonoValues = put_mono_values_ushort;
       rb->DepthBits = 8 * sizeof(GLushort);
+      rb->surface = (struct pipe_surface *) softpipe_new_z_surface(16);
       pixelSize = sizeof(GLushort);
       break;
    case GL_DEPTH_COMPONENT24:
@@ -1193,13 +1197,27 @@ _mesa_soft_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
 
    /* free old buffer storage */
    if (rb->Data) {
-      _mesa_free(rb->Data);
+      if (rb->surface) {
+         /* pipe surface */
+      }
+      else {
+         /* legacy renderbuffer */
+         _mesa_free(rb->Data);
+      }
       rb->Data = NULL;
    }
 
    if (width > 0 && height > 0) {
       /* allocate new buffer storage */
-      rb->Data = _mesa_malloc(width * height * pixelSize);
+      if (rb->surface) {
+         /* pipe surface */
+         rb->surface->resize(rb->surface, width, height);
+         rb->Data = rb->surface->buffer.ptr;
+      }
+      else {
+         /* legacy renderbuffer */
+         rb->Data = _mesa_malloc(width * height * pixelSize);
+      }
       if (rb->Data == NULL) {
          rb->Width = 0;
          rb->Height = 0;
diff --git a/src/mesa/pipe/p_state.h b/src/mesa/pipe/p_state.h
index 4ae8928018..9973a7b8dd 100644
--- a/src/mesa/pipe/p_state.h
+++ b/src/mesa/pipe/p_state.h
@@ -239,6 +239,7 @@ struct pipe_sampler_state
 
 /**
  * A mappable buffer (vertex data, pixel data, etc)
+ * XXX replace with "intel_region".
  */
 struct pipe_buffer
 {
@@ -247,7 +248,7 @@ struct pipe_buffer
                            const void *src);
    void *(*map)(struct pipe_buffer *pb, GLuint access_mode);
    void (*unmap)(struct pipe_buffer *pb);
-   void *ptr;        /**< address, only valid while mapped */
+   GLubyte *ptr;     /**< address, only valid while mapped */
    GLuint mode;      /**< PIPE_MAP_x, only valid while mapped */
 };
 
@@ -261,12 +262,13 @@ struct pipe_surface
    struct pipe_buffer buffer;  /**< surfaces can be mapped */
    GLuint format:5;            /**< PIPE_FORMAT_x */
    GLuint width, height;
-#if 0
-   GLubyte *ptr;
-   GLint stride;
-   GLuint cpp;
-   GLuint format;
-#endif
+
+   GLint stride, cpp;
+   GLubyte *ptr;    /**< only valid while mapped, may not equal buffer->ptr */
+
+   void *rb;  /**< Ptr back to renderbuffer (temporary?) */
+
+   void (*resize)(struct pipe_surface *ps, GLuint width, GLuint height);
 };
 
 
diff --git a/src/mesa/pipe/softpipe/sp_context.c b/src/mesa/pipe/softpipe/sp_context.c
index 6b44fabfa4..8655aa83fd 100644
--- a/src/mesa/pipe/softpipe/sp_context.c
+++ b/src/mesa/pipe/softpipe/sp_context.c
@@ -49,6 +49,13 @@ static void map_surfaces(struct softpipe_context *sp)
       struct pipe_buffer *buf = &sps->surface.buffer;
       buf->map(buf, PIPE_MAP_READ_WRITE);
    }
+
+   if (sp->framebuffer.zbuf) {
+      struct softpipe_surface *sps = softpipe_surface(sp->framebuffer.zbuf);
+      struct pipe_buffer *buf = &sps->surface.buffer;
+      buf->map(buf, PIPE_MAP_READ_WRITE);
+   }
+
    /* XXX depth & stencil bufs */
 }
 
@@ -62,6 +69,12 @@ static void unmap_surfaces(struct softpipe_context *sp)
       struct pipe_buffer *buf = &sps->surface.buffer;
       buf->unmap(buf);
    }
+
+   if (sp->framebuffer.zbuf) {
+      struct softpipe_surface *sps = softpipe_surface(sp->framebuffer.zbuf);
+      struct pipe_buffer *buf = &sps->surface.buffer;
+      buf->unmap(buf);
+   }
    /* XXX depth & stencil bufs */
 }
 
diff --git a/src/mesa/pipe/softpipe/sp_z_surface.c b/src/mesa/pipe/softpipe/sp_z_surface.c
new file mode 100644
index 0000000000..662a4a15ee
--- /dev/null
+++ b/src/mesa/pipe/softpipe/sp_z_surface.c
@@ -0,0 +1,118 @@
+/**************************************************************************
+ * 
+ * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * 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, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ **************************************************************************/
+
+
+/**
+ * Software Z buffer/surface.
+ *
+ * \author Brian Paul
+ */
+
+
+#include "main/imports.h"
+#include "pipe/p_state.h"
+#include "pipe/p_defines.h"
+#include "sp_surface.h"
+#include "sp_z_surface.h"
+
+static void*
+z16_map(struct pipe_buffer *pb, GLuint access_mode)
+{
+   struct softpipe_surface *sps = (struct softpipe_surface *) pb;
+   sps->surface.ptr = pb->ptr;
+   return pb->ptr;
+}
+
+static void
+z16_unmap(struct pipe_buffer *pb)
+{
+   struct softpipe_surface *sps = (struct softpipe_surface *) pb;
+   sps->surface.ptr = NULL;
+}
+
+static void
+z16_resize(struct pipe_surface *ps, GLuint width, GLuint height)
+{
+   struct softpipe_surface *sps = (struct softpipe_surface *) ps;
+
+   if (sps->surface.buffer.ptr)
+      free(sps->surface.buffer.ptr);
+
+   ps->buffer.ptr = (GLubyte *) malloc(width * height * sizeof(GLushort));
+   ps->width = width;
+   ps->height = height;
+
+   sps->surface.stride = sps->surface.width;
+   sps->surface.cpp = 2;
+}
+
+static void
+z16_read_quad_z(struct softpipe_surface *sps,
+                GLint x, GLint y, GLuint zzzz[QUAD_SIZE])
+{
+   const GLushort *src
+      = (GLushort *) sps->surface.ptr + y * sps->surface.stride + x;
+
+   /* converting GLushort to GLuint: */
+   zzzz[0] = src[0];
+   zzzz[1] = src[1];
+   zzzz[2] = src[sps->surface.width];
+   zzzz[3] = src[sps->surface.width + 1];
+}
+
+static void
+z16_write_quad_z(struct softpipe_surface *sps,
+                 GLint x, GLint y, const GLuint zzzz[QUAD_SIZE])
+{
+   GLushort *dst = (GLushort *) sps->surface.ptr + y * sps->surface.stride + x;
+
+   /* converting GLuint to GLushort: */
+   dst[0] = zzzz[0];
+   dst[1] = zzzz[1];
+   dst[sps->surface.width] = zzzz[2];
+   dst[sps->surface.width + 1] = zzzz[3];
+}
+
+struct softpipe_surface *
+softpipe_new_z_surface(GLuint depth)
+{
+   struct softpipe_surface *sps = CALLOC_STRUCT(softpipe_surface);
+   if (!sps)
+      return NULL;
+
+   /* XXX ignoring depth param for now */
+
+   sps->surface.format = PIPE_FORMAT_U_Z16;
+
+   sps->surface.resize = z16_resize;
+   sps->surface.buffer.map = z16_map;
+   sps->surface.buffer.unmap = z16_unmap;
+   sps->read_quad_z = z16_read_quad_z;
+   sps->write_quad_z = z16_write_quad_z;
+
+   return sps;
+}
diff --git a/src/mesa/pipe/softpipe/sp_z_surface.h b/src/mesa/pipe/softpipe/sp_z_surface.h
new file mode 100644
index 0000000000..9c3c43ca57
--- /dev/null
+++ b/src/mesa/pipe/softpipe/sp_z_surface.h
@@ -0,0 +1,37 @@
+/**************************************************************************
+ * 
+ * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * 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, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ **************************************************************************/
+
+
+#ifndef SP_Z_SURFACE_H
+#define SP_Z_SURFACE_H
+
+
+extern struct softpipe_surface *
+softpipe_new_z_surface(GLuint depth);
+
+
+#endif /* SP_Z_SURFACE_H */
diff --git a/src/mesa/sources b/src/mesa/sources
index a589ae4373..32c2ff2350 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -176,6 +176,7 @@ SOFTPIPE_SOURCES = \
 	pipe/softpipe/sp_state_sampler.c \
 	pipe/softpipe/sp_state_setup.c \
 	pipe/softpipe/sp_state_surface.c \
+	pipe/softpipe/sp_z_surface.c \
 	pipe/softpipe/sp_prim_setup.c
 
 DRAW_SOURCES = \
diff --git a/src/mesa/state_tracker/st_atom_framebuffer.c b/src/mesa/state_tracker/st_atom_framebuffer.c
index 595f390b28..f5e3ce8b67 100644
--- a/src/mesa/state_tracker/st_atom_framebuffer.c
+++ b/src/mesa/state_tracker/st_atom_framebuffer.c
@@ -54,22 +54,31 @@ static void
 update_framebuffer_state( struct st_context *st )
 {
    struct pipe_framebuffer_state framebuffer;
+   struct gl_renderbuffer *rb;
    GLuint i;
 
+   memset(&framebuffer, 0, sizeof(framebuffer));
+
    /* Examine Mesa's ctx->DrawBuffer->_ColorDrawBuffers state
     * to determine which surfaces to draw to
     */
    framebuffer.num_cbufs = st->ctx->DrawBuffer->_NumColorDrawBuffers[0];
    for (i = 0; i < framebuffer.num_cbufs; i++) {
-      framebuffer.cbufs[i] = xmesa_get_color_surface(st->ctx, i);
+      rb = st->ctx->DrawBuffer->_ColorDrawBuffers[0][i];
+      assert(rb->surface);
+      framebuffer.cbufs[i] = rb->surface;
    }
 
-   if (st->ctx->DrawBuffer->_DepthBuffer/*Attachment[BUFFER_DEPTH].Renderbuffer*/) {
-      framebuffer.zbuf = xmesa_get_z_surface(st->ctx);
+   rb = st->ctx->DrawBuffer->_DepthBuffer;
+   if (rb) {
+      assert(rb->surface);
+      framebuffer.zbuf = rb->Wrapped->surface;
    }
 
-   if (st->ctx->DrawBuffer->Attachment[BUFFER_STENCIL].Renderbuffer) {
-      framebuffer.sbuf = xmesa_get_stencil_surface(st->ctx);
+   rb = st->ctx->DrawBuffer->_StencilBuffer;
+   if (rb) {
+      assert(rb->surface);
+      framebuffer.sbuf = rb->Wrapped->surface;
    }
 
    if (memcmp(&framebuffer, &st->state.framebuffer, sizeof(framebuffer)) != 0) {
-- 
cgit v1.2.3


From 9bc1c92a0b809c6b60d5e4a2c8909f5f98528919 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Mon, 30 Jul 2007 21:39:57 -0600
Subject: 32 and z24s8 softpipe buffers

---
 src/mesa/main/renderbuffer.c          |   8 +-
 src/mesa/pipe/p_defines.h             |  28 +++---
 src/mesa/pipe/softpipe/sp_z_surface.c | 159 ++++++++++++++++++++++++++++++----
 src/mesa/pipe/softpipe/sp_z_surface.h |   2 +-
 4 files changed, 164 insertions(+), 33 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/renderbuffer.c b/src/mesa/main/renderbuffer.c
index a1412ef007..a900de169e 100644
--- a/src/mesa/main/renderbuffer.c
+++ b/src/mesa/main/renderbuffer.c
@@ -51,6 +51,7 @@
 
 #include "pipe/softpipe/sp_z_surface.h"
 #include "pipe/p_state.h"
+#include "pipe/p_defines.h"
 
 
 /* 32-bit color index format.  Not a public format. */
@@ -1094,7 +1095,8 @@ _mesa_soft_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
       rb->PutValues = put_values_ushort;
       rb->PutMonoValues = put_mono_values_ushort;
       rb->DepthBits = 8 * sizeof(GLushort);
-      rb->surface = (struct pipe_surface *) softpipe_new_z_surface(16);
+      rb->surface
+         = (struct pipe_surface *) softpipe_new_z_surface(PIPE_FORMAT_U_Z16);
       pixelSize = sizeof(GLushort);
       break;
    case GL_DEPTH_COMPONENT24:
@@ -1117,6 +1119,8 @@ _mesa_soft_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
          rb->_ActualFormat = GL_DEPTH_COMPONENT32;
          rb->DepthBits = 32;
       }
+      rb->surface
+         = (struct pipe_surface *) softpipe_new_z_surface(PIPE_FORMAT_U_Z32);
       pixelSize = sizeof(GLuint);
       break;
    case GL_DEPTH_STENCIL_EXT:
@@ -1134,6 +1138,8 @@ _mesa_soft_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
       rb->PutMonoValues = put_mono_values_uint;
       rb->DepthBits = 24;
       rb->StencilBits = 8;
+      rb->surface
+         = (struct pipe_surface *) softpipe_new_z_surface(PIPE_FORMAT_Z24_S8);
       pixelSize = sizeof(GLuint);
       break;
    case GL_COLOR_INDEX8_EXT:
diff --git a/src/mesa/pipe/p_defines.h b/src/mesa/pipe/p_defines.h
index 1b799f1451..58f01758e3 100644
--- a/src/mesa/pipe/p_defines.h
+++ b/src/mesa/pipe/p_defines.h
@@ -132,19 +132,21 @@
 /**
  * Texture/surface image formats (preliminary)
  */
-#define PIPE_FORMAT_U_R8_G8_B8_A8   0  /**< ubyte[4] RGBA */
-#define PIPE_FORMAT_U_A8_R8_G8_B8   1  /**< ubyte[4] ARGB */
-#define PIPE_FORMAT_U_R5_G6_B5      2  /**< 5/6/5 RGB */
-#define PIPE_FORMAT_U_L8            3  /**< ubyte luminance */
-#define PIPE_FORMAT_U_A8            4  /**< ubyte alpha */
-#define PIPE_FORMAT_U_I8            5  /**< ubyte intensity */
-#define PIPE_FORMAT_U_L8_A8         6  /**< ubyte luminance, alpha */
-#define PIPE_FORMAT_U_Z16           7  /**< ushort Z/depth */
-#define PIPE_FORMAT_F_Z32           8  /**< float Z/depth */
-#define PIPE_FORMAT_YCBCR           9
-#define PIPE_FORMAT_YCBCR_REV      10
-#define PIPE_FORMAT_U_S8           11  /**< 8-bit stencil */
-#define PIPE_FORMAT_Z24_S8         12  /**< 24-bit Z + 8-bit stencil */
+#define PIPE_FORMAT_NONE            0  /**< unstructured */
+#define PIPE_FORMAT_U_R8_G8_B8_A8   1  /**< ubyte[4] RGBA */
+#define PIPE_FORMAT_U_A8_R8_G8_B8   2  /**< ubyte[4] ARGB */
+#define PIPE_FORMAT_U_R5_G6_B5      3  /**< 5/6/5 RGB */
+#define PIPE_FORMAT_U_L8            4  /**< ubyte luminance */
+#define PIPE_FORMAT_U_A8            5  /**< ubyte alpha */
+#define PIPE_FORMAT_U_I8            6  /**< ubyte intensity */
+#define PIPE_FORMAT_U_L8_A8         7  /**< ubyte luminance, alpha */
+#define PIPE_FORMAT_YCBCR           8
+#define PIPE_FORMAT_YCBCR_REV       9
+#define PIPE_FORMAT_U_Z16          10  /**< ushort Z/depth */
+#define PIPE_FORMAT_U_Z32          11  /**< uint Z/depth */
+#define PIPE_FORMAT_F_Z32          12  /**< float Z/depth */
+#define PIPE_FORMAT_Z24_S8         13  /**< 24-bit Z + 8-bit stencil */
+#define PIPE_FORMAT_U_S8           14  /**< 8-bit stencil */
 
 
 /**
diff --git a/src/mesa/pipe/softpipe/sp_z_surface.c b/src/mesa/pipe/softpipe/sp_z_surface.c
index 662a4a15ee..744737cb6c 100644
--- a/src/mesa/pipe/softpipe/sp_z_surface.c
+++ b/src/mesa/pipe/softpipe/sp_z_surface.c
@@ -36,38 +36,48 @@
 #include "main/imports.h"
 #include "pipe/p_state.h"
 #include "pipe/p_defines.h"
+#include "sp_context.h"
 #include "sp_surface.h"
 #include "sp_z_surface.h"
 
 static void*
-z16_map(struct pipe_buffer *pb, GLuint access_mode)
+z_map(struct pipe_buffer *pb, GLuint access_mode)
 {
    struct softpipe_surface *sps = (struct softpipe_surface *) pb;
    sps->surface.ptr = pb->ptr;
+   sps->surface.stride = sps->surface.width;
    return pb->ptr;
 }
 
 static void
-z16_unmap(struct pipe_buffer *pb)
+z_unmap(struct pipe_buffer *pb)
 {
    struct softpipe_surface *sps = (struct softpipe_surface *) pb;
    sps->surface.ptr = NULL;
+   sps->surface.stride = 0;
 }
 
 static void
-z16_resize(struct pipe_surface *ps, GLuint width, GLuint height)
+z_resize(struct pipe_surface *ps, GLuint width, GLuint height)
 {
    struct softpipe_surface *sps = (struct softpipe_surface *) ps;
 
    if (sps->surface.buffer.ptr)
       free(sps->surface.buffer.ptr);
 
-   ps->buffer.ptr = (GLubyte *) malloc(width * height * sizeof(GLushort));
+   sps->surface.stride = sps->surface.width;
+   if (sps->surface.format == PIPE_FORMAT_U_Z16)
+      sps->surface.cpp = 2;
+   else if (sps->surface.format == PIPE_FORMAT_U_Z32 ||
+            sps->surface.format == PIPE_FORMAT_Z24_S8)
+      sps->surface.cpp = 4;
+   else
+      assert(0);
+
+   ps->buffer.ptr = (GLubyte *) malloc(width * height * sps->surface.cpp);
    ps->width = width;
    ps->height = height;
 
-   sps->surface.stride = sps->surface.width;
-   sps->surface.cpp = 2;
 }
 
 static void
@@ -77,10 +87,12 @@ z16_read_quad_z(struct softpipe_surface *sps,
    const GLushort *src
       = (GLushort *) sps->surface.ptr + y * sps->surface.stride + x;
 
+   assert(sps->surface.format == PIPE_FORMAT_U_Z16);
+
    /* converting GLushort to GLuint: */
    zzzz[0] = src[0];
    zzzz[1] = src[1];
-   zzzz[2] = src[sps->surface.width];
+   zzzz[2] = src[sps->surface.width + 0];
    zzzz[3] = src[sps->surface.width + 1];
 }
 
@@ -90,29 +102,140 @@ z16_write_quad_z(struct softpipe_surface *sps,
 {
    GLushort *dst = (GLushort *) sps->surface.ptr + y * sps->surface.stride + x;
 
+   assert(sps->surface.format == PIPE_FORMAT_U_Z16);
+
    /* converting GLuint to GLushort: */
    dst[0] = zzzz[0];
    dst[1] = zzzz[1];
-   dst[sps->surface.width] = zzzz[2];
+   dst[sps->surface.width + 0] = zzzz[2];
+   dst[sps->surface.width + 1] = zzzz[3];
+}
+
+static void
+z32_read_quad_z(struct softpipe_surface *sps,
+                GLint x, GLint y, GLuint zzzz[QUAD_SIZE])
+{
+   const GLuint *src
+      = (GLuint *) sps->surface.ptr + y * sps->surface.stride + x;
+
+   assert(sps->surface.format == PIPE_FORMAT_U_Z32);
+
+   zzzz[0] = src[0];
+   zzzz[1] = src[1];
+   zzzz[2] = src[sps->surface.width + 0];
+   zzzz[3] = src[sps->surface.width + 1];
+}
+
+static void
+z32_write_quad_z(struct softpipe_surface *sps,
+                 GLint x, GLint y, const GLuint zzzz[QUAD_SIZE])
+{
+   GLuint *dst = (GLuint *) sps->surface.ptr + y * sps->surface.stride + x;
+
+   assert(sps->surface.format == PIPE_FORMAT_U_Z32);
+
+   dst[0] = zzzz[0];
+   dst[1] = zzzz[1];
+   dst[sps->surface.width + 0] = zzzz[2];
    dst[sps->surface.width + 1] = zzzz[3];
 }
 
+static void
+z24s8_read_quad_z(struct softpipe_surface *sps,
+                  GLint x, GLint y, GLuint zzzz[QUAD_SIZE])
+{
+   const GLuint *src
+      = (GLuint *) sps->surface.ptr + y * sps->surface.stride + x;
+
+   assert(sps->surface.format == PIPE_FORMAT_Z24_S8);
+
+   zzzz[0] = src[0] >> 8;
+   zzzz[1] = src[1] >> 8;
+   zzzz[2] = src[sps->surface.width + 0] >> 8;
+   zzzz[3] = src[sps->surface.width + 1] >> 8;
+}
+
+static void
+z24s8_write_quad_z(struct softpipe_surface *sps,
+                   GLint x, GLint y, const GLuint zzzz[QUAD_SIZE])
+{
+   GLuint *dst = (GLuint *) sps->surface.ptr + y * sps->surface.stride + x;
+
+   assert(sps->surface.format == PIPE_FORMAT_Z24_S8);
+   assert(zzzz[0] <= 0xffffff);
+
+   dst[0] = (dst[0] & 0xff) | (zzzz[0] << 8);
+   dst[1] = (dst[1] & 0xff) | (zzzz[1] << 8);
+   dst += sps->surface.width;
+   dst[0] = (dst[0] & 0xff) | (zzzz[2] << 8);
+   dst[1] = (dst[1] & 0xff) | (zzzz[3] << 8);
+}
+
+static void
+z24s8_read_quad_stencil(struct softpipe_surface *sps,
+                        GLint x, GLint y, GLubyte ssss[QUAD_SIZE])
+{
+   const GLuint *src
+      = (GLuint *) sps->surface.ptr + y * sps->surface.stride + x;
+
+   assert(sps->surface.format == PIPE_FORMAT_Z24_S8);
+
+   ssss[0] = src[0] & 0xff;
+   ssss[1] = src[1] & 0xff;
+   ssss[2] = src[sps->surface.width + 0] & 0xff;
+   ssss[3] = src[sps->surface.width + 1] & 0xff;
+}
+
+static void
+z24s8_write_quad_stencil(struct softpipe_surface *sps,
+                         GLint x, GLint y, const GLubyte ssss[QUAD_SIZE])
+{
+   GLuint *dst = (GLuint *) sps->surface.ptr + y * sps->surface.stride + x;
+
+   assert(sps->surface.format == PIPE_FORMAT_Z24_S8);
+
+   dst[0] = (dst[0] & 0xffffff00) | ssss[0];
+   dst[1] = (dst[1] & 0xffffff00) | ssss[1];
+   dst += sps->surface.width;
+   dst[0] = (dst[0] & 0xffffff00) | ssss[2];
+   dst[1] = (dst[1] & 0xffffff00) | ssss[3];
+}
+
+
+
+/**
+ * Create a new software-based Z buffer.
+ * \param format  one of the PIPE_FORMAT_z* formats
+ */
 struct softpipe_surface *
-softpipe_new_z_surface(GLuint depth)
+softpipe_new_z_surface(GLuint format)
 {
    struct softpipe_surface *sps = CALLOC_STRUCT(softpipe_surface);
    if (!sps)
       return NULL;
 
-   /* XXX ignoring depth param for now */
-
-   sps->surface.format = PIPE_FORMAT_U_Z16;
-
-   sps->surface.resize = z16_resize;
-   sps->surface.buffer.map = z16_map;
-   sps->surface.buffer.unmap = z16_unmap;
-   sps->read_quad_z = z16_read_quad_z;
-   sps->write_quad_z = z16_write_quad_z;
+   sps->surface.format = format;
+   sps->surface.resize = z_resize;
+   sps->surface.buffer.map = z_map;
+   sps->surface.buffer.unmap = z_unmap;
+
+   if (format == PIPE_FORMAT_U_Z16) {
+      sps->read_quad_z = z16_read_quad_z;
+      sps->write_quad_z = z16_write_quad_z;
+   }
+   else if (format == PIPE_FORMAT_U_Z32) {
+      sps->read_quad_z = z32_read_quad_z;
+      sps->write_quad_z = z32_write_quad_z;
+   }
+   else if (format == PIPE_FORMAT_Z24_S8) {
+      sps->read_quad_z = z24s8_read_quad_z;
+      sps->write_quad_z = z24s8_write_quad_z;
+      sps->read_quad_stencil = z24s8_read_quad_stencil;
+      sps->write_quad_stencil = z24s8_write_quad_stencil;
+   }
+   else {
+      assert(0);
+   }
 
    return sps;
 }
diff --git a/src/mesa/pipe/softpipe/sp_z_surface.h b/src/mesa/pipe/softpipe/sp_z_surface.h
index 9c3c43ca57..6a8d89a7c1 100644
--- a/src/mesa/pipe/softpipe/sp_z_surface.h
+++ b/src/mesa/pipe/softpipe/sp_z_surface.h
@@ -31,7 +31,7 @@
 
 
 extern struct softpipe_surface *
-softpipe_new_z_surface(GLuint depth);
+softpipe_new_z_surface(GLuint format);
 
 
 #endif /* SP_Z_SURFACE_H */
-- 
cgit v1.2.3


From 20adf45c23dd9ec86a1439ad87c1473395bbb1a7 Mon Sep 17 00:00:00 2001
From: Brian <brian@i915.localnet.net>
Date: Tue, 31 Jul 2007 17:42:03 -0600
Subject: Redesign pipe_surface in terms of pipe_region.

struct pipe_buffer goes away.
Added basic region functions to softpipe to allocate/release malloc'd regions.
Surface-related code is fairly coherent now.
---
 src/mesa/drivers/dri/i915pipe/intel_fbo.c     |   3 +-
 src/mesa/drivers/dri/i915pipe/intel_surface.c |  85 ++--------
 src/mesa/drivers/x11/xm_buffer.c              |  13 +-
 src/mesa/drivers/x11/xm_surface.c             |  42 ++---
 src/mesa/drivers/x11/xmesaP.h                 |   2 +-
 src/mesa/main/renderbuffer.c                  |  54 +++---
 src/mesa/pipe/p_context.h                     |   8 +
 src/mesa/pipe/p_state.h                       |  53 ++----
 src/mesa/pipe/softpipe/sp_context.c           |  19 ++-
 src/mesa/pipe/softpipe/sp_region.c            | 105 ++++++++++++
 src/mesa/pipe/softpipe/sp_region.h            |  40 +++++
 src/mesa/pipe/softpipe/sp_surface.c           | 236 ++++++++++++++++++++++++--
 src/mesa/pipe/softpipe/sp_surface.h           |   7 +-
 src/mesa/pipe/softpipe/sp_z_surface.c         | 138 ++++++---------
 src/mesa/sources                              |   3 +-
 15 files changed, 538 insertions(+), 270 deletions(-)
 create mode 100644 src/mesa/pipe/softpipe/sp_region.c
 create mode 100644 src/mesa/pipe/softpipe/sp_region.h

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/i915pipe/intel_fbo.c b/src/mesa/drivers/dri/i915pipe/intel_fbo.c
index bac2ef8467..1470ce7d82 100644
--- a/src/mesa/drivers/dri/i915pipe/intel_fbo.c
+++ b/src/mesa/drivers/dri/i915pipe/intel_fbo.c
@@ -291,11 +291,10 @@ intel_alloc_renderbuffer_storage(GLcontext * ctx, struct gl_renderbuffer *rb,
       rb->Width = width;
       rb->Height = height;
 
-#if 1
       /* update the surface's size too */
       rb->surface->width = width;
       rb->surface->height = height;
-#endif
+      rb->surface->region = irb->region;
 
       /* This sets the Get/PutRow/Value functions */
       intel_set_span_functions(&irb->Base);
diff --git a/src/mesa/drivers/dri/i915pipe/intel_surface.c b/src/mesa/drivers/dri/i915pipe/intel_surface.c
index 58f5cb5f96..936c9cb5e7 100644
--- a/src/mesa/drivers/dri/i915pipe/intel_surface.c
+++ b/src/mesa/drivers/dri/i915pipe/intel_surface.c
@@ -33,9 +33,9 @@ static void
 read_quad_f_swz(struct softpipe_surface *sps, GLint x, GLint y,
                 GLfloat (*rrrr)[QUAD_SIZE])
 {
-   const GLint bytesPerRow = sps->surface.stride * sps->surface.cpp;
+   const GLint bytesPerRow = sps->surface.region->pitch * sps->surface.region->cpp;
    const GLint invY = sps->surface.height - y - 1;
-   const GLubyte *src = sps->surface.ptr + invY * bytesPerRow + x * sps->surface.cpp;
+   const GLubyte *src = sps->surface.region->map + invY * bytesPerRow + x * sps->surface.region->cpp;
    GLfloat *dst = (GLfloat *) rrrr;
    GLubyte temp[16];
    GLuint j;
@@ -59,9 +59,9 @@ write_quad_f_swz(struct softpipe_surface *sps, GLint x, GLint y,
                  GLfloat (*rrrr)[QUAD_SIZE])
 {
    const GLfloat *src = (const GLfloat *) rrrr;
-   const GLint bytesPerRow = sps->surface.stride * sps->surface.cpp;
+   const GLint bytesPerRow = sps->surface.region->pitch * sps->surface.region->cpp;
    const GLint invY = sps->surface.height - y - 1;
-   GLubyte *dst = sps->surface.ptr + invY * bytesPerRow + x * sps->surface.cpp;
+   GLubyte *dst = sps->surface.region->map + invY * bytesPerRow + x * sps->surface.region->cpp;
    GLubyte temp[16];
    GLuint j;
 
@@ -87,16 +87,16 @@ read_quad_z24(struct softpipe_surface *sps,
    static const GLuint mask = 0xffffff;
    const GLint invY = sps->surface.height - y - 1;
    const GLuint *src
-      = (GLuint *) (sps->surface.ptr
-                    + (invY * sps->surface.stride + x) * sps->surface.cpp);
+      = (GLuint *) (sps->surface.region->map
+                    + (invY * sps->surface.region->pitch + x) * sps->surface.region->cpp);
 
    assert(sps->surface.format == PIPE_FORMAT_Z24_S8);
 
    /* extract lower three bytes */
    zzzz[0] = src[0] & mask;
    zzzz[1] = src[1] & mask;
-   zzzz[2] = src[-sps->surface.stride] & mask;
-   zzzz[3] = src[-sps->surface.stride + 1] & mask;
+   zzzz[2] = src[-sps->surface.region->pitch] & mask;
+   zzzz[3] = src[-sps->surface.region->pitch + 1] & mask;
 }
 
 static void
@@ -106,15 +106,15 @@ write_quad_z24(struct softpipe_surface *sps,
    static const GLuint mask = 0xff000000;
    const GLint invY = sps->surface.height - y - 1;
    GLuint *dst
-      = (GLuint *) (sps->surface.ptr
-                    + (invY * sps->surface.stride + x) * sps->surface.cpp);
+      = (GLuint *) (sps->surface.region->map
+                    + (invY * sps->surface.region->pitch + x) * sps->surface.region->cpp);
 
    assert(sps->surface.format == PIPE_FORMAT_Z24_S8);
 
    /* write lower three bytes */
    dst[0] = (dst[0] & mask) | zzzz[0];
    dst[1] = (dst[1] & mask) | zzzz[1];
-   dst -= sps->surface.stride;
+   dst -= sps->surface.region->pitch;
    dst[0] = (dst[0] & mask) | zzzz[2];
    dst[1] = (dst[1] & mask) | zzzz[3];
 }
@@ -125,15 +125,15 @@ read_quad_stencil(struct softpipe_surface *sps,
                   GLint x, GLint y, GLubyte ssss[QUAD_SIZE])
 {
    const GLint invY = sps->surface.height - y - 1;
-   const GLuint *src = (const GLuint *) (sps->surface.ptr
-                     + (invY * sps->surface.stride + x) * sps->surface.cpp);
+   const GLuint *src = (const GLuint *) (sps->surface.region->map
+                     + (invY * sps->surface.region->pitch + x) * sps->surface.region->cpp);
 
    assert(sps->surface.format == PIPE_FORMAT_Z24_S8);
 
    /* extract high byte */
    ssss[0] = src[0] >> 24;
    ssss[1] = src[1] >> 24;
-   src -= sps->surface.stride;
+   src -= sps->surface.region->pitch;
    ssss[2] = src[0] >> 24;
    ssss[3] = src[1] >> 24;
 }
@@ -144,68 +144,20 @@ write_quad_stencil(struct softpipe_surface *sps,
 {
    static const GLuint mask = 0x00ffffff;
    const GLint invY = sps->surface.height - y - 1;
-   GLuint *dst = (GLuint *) (sps->surface.ptr
-               + (invY * sps->surface.stride + x) * sps->surface.cpp);
+   GLuint *dst = (GLuint *) (sps->surface.region->map
+               + (invY * sps->surface.region->pitch + x) * sps->surface.region->cpp);
 
    assert(sps->surface.format == PIPE_FORMAT_Z24_S8);
 
    /* write high byte */
    dst[0] = (dst[0] & mask) | (ssss[0] << 24);
    dst[1] = (dst[1] & mask) | (ssss[1] << 24);
-   dst -= sps->surface.stride;
+   dst -= sps->surface.region->pitch;
    dst[0] = (dst[0] & mask) | (ssss[2] << 24);
    dst[1] = (dst[1] & mask) | (ssss[3] << 24);
 }
 
 
-static void *
-map_surface_buffer(struct pipe_buffer *pb, GLuint access_mode)
-{
-   struct softpipe_surface *sps = (struct softpipe_surface *) pb;
-   struct intel_renderbuffer *irb = (struct intel_renderbuffer *) sps->surface.rb;
-   assert(access_mode == PIPE_MAP_READ_WRITE);
-
-   /*LOCK_HARDWARE(intel);*/
-
-   if (irb->region) {
-      GET_CURRENT_CONTEXT(ctx);
-      struct intel_context *intel = intel_context(ctx);
-#if 0
-      intelFinish(&intel->ctx);  /* XXX need this? */
-#endif
-      intel->pipe->region_map(intel->pipe, irb->region);
-   }
-   pb->ptr = irb->region->map;
-
-   sps->surface.stride = irb->region->pitch;
-   sps->surface.cpp = irb->region->cpp;
-   sps->surface.ptr = irb->region->map;
-
-   return pb->ptr;
-}
-
-
-static void
-unmap_surface_buffer(struct pipe_buffer *pb)
-{
-   struct softpipe_surface *sps = (struct softpipe_surface *) pb;
-   struct intel_renderbuffer *irb = (struct intel_renderbuffer *) sps->surface.rb;
-
-   if (irb->region) {
-      GET_CURRENT_CONTEXT(ctx);
-      struct intel_context *intel = intel_context(ctx);
-      intel->pipe->region_unmap(intel->pipe, irb->region);
-   }
-   pb->ptr = NULL;
-
-   sps->surface.stride = 0;
-   sps->surface.cpp = 0;
-   sps->surface.ptr = NULL;
-
-   /*UNLOCK_HARDWARE(intel);*/
-}
-
-
 struct pipe_surface *
 intel_new_surface(GLuint intFormat)
 {
@@ -241,8 +193,5 @@ intel_new_surface(GLuint intFormat)
 
    }
 
-   sps->surface.buffer.map = map_surface_buffer;
-   sps->surface.buffer.unmap = unmap_surface_buffer;
-
    return &sps->surface;
 }
diff --git a/src/mesa/drivers/x11/xm_buffer.c b/src/mesa/drivers/x11/xm_buffer.c
index 8fbd9a783b..5bba52da48 100644
--- a/src/mesa/drivers/x11/xm_buffer.c
+++ b/src/mesa/drivers/x11/xm_buffer.c
@@ -269,7 +269,10 @@ xmesa_alloc_front_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
    rb->Height = height;
    rb->InternalFormat = internalFormat;
 
-   rb->surface->resize(rb->surface, width, height);
+   if (!xrb->Base.surface)
+      xrb->Base.surface = xmesa_new_surface(ctx, xrb);
+   xrb->Base.surface->width = width;
+   xrb->Base.surface->height = height;
 
    return GL_TRUE;
 }
@@ -320,7 +323,10 @@ xmesa_alloc_back_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
       xrb->origin4 = NULL;
    }
 
-   rb->surface->resize(rb->surface, width, height);
+   if (!xrb->Base.surface)
+      xrb->Base.surface = xmesa_new_surface(ctx, xrb);
+   xrb->Base.surface->width = width;
+   xrb->Base.surface->height = height;
 
    return GL_TRUE;
 }
@@ -357,9 +363,6 @@ xmesa_new_renderbuffer(GLcontext *ctx, GLuint name, const GLvisual *visual,
          xrb->Base.IndexBits = visual->indexBits;
       }
       /* only need to set Red/Green/EtcBits fields for user-created RBs */
-
-      xrb->Base.surface = xmesa_new_surface(xrb);
-
    }
    return xrb;
 }
diff --git a/src/mesa/drivers/x11/xm_surface.c b/src/mesa/drivers/x11/xm_surface.c
index 17f5f28a9d..e8e795c00f 100644
--- a/src/mesa/drivers/x11/xm_surface.c
+++ b/src/mesa/drivers/x11/xm_surface.c
@@ -42,25 +42,11 @@
 #include "framebuffer.h"
 #include "renderbuffer.h"
 
-#include "pipe/p_state.h"
+#include "pipe/p_context.h"
 #include "pipe/p_defines.h"
 #include "pipe/softpipe/sp_context.h"
 #include "pipe/softpipe/sp_surface.h"
-
-
-static void *
-map_surface_buffer(struct pipe_buffer *pb, GLuint access_mode)
-{
-   /* no-op */
-   return NULL;
-}
-
-
-static void
-unmap_surface_buffer(struct pipe_buffer *pb)
-{
-   /* no-op */
-}
+#include "state_tracker/st_context.h"
 
 
 static INLINE struct xmesa_renderbuffer *
@@ -174,27 +160,22 @@ write_mono_row_ub(struct softpipe_surface *sps, GLuint count, GLint x, GLint y,
 }
 
 
-static void
-resize_surface(struct pipe_surface *ps, GLuint width, GLuint height)
-{
-   ps->width = width;
-   ps->height = height;
-}
-
-
 /**
  * Called to create a pipe_surface for each X renderbuffer.
+ * Note: this is being used instead of pipe->surface_alloc() since we
+ * have special/unique quad read/write functions for X.
  */
 struct pipe_surface *
-xmesa_new_surface(struct xmesa_renderbuffer *xrb)
+xmesa_new_surface(GLcontext *ctx, struct xmesa_renderbuffer *xrb)
 {
+   struct pipe_context *pipe = ctx->st->pipe;
    struct softpipe_surface *sps;
 
    sps = CALLOC_STRUCT(softpipe_surface);
    if (!sps)
       return NULL;
 
-   sps->surface.rb = xrb;
+   sps->surface.rb = xrb; /* XXX only needed for quad funcs above */
    sps->surface.width = xrb->Base.Width;
    sps->surface.height = xrb->Base.Height;
 
@@ -206,9 +187,12 @@ xmesa_new_surface(struct xmesa_renderbuffer *xrb)
    sps->write_quad_ub = write_quad_ub;
    sps->write_mono_row_ub = write_mono_row_ub;
 
-   sps->surface.buffer.map = map_surface_buffer;
-   sps->surface.buffer.unmap = unmap_surface_buffer;
-   sps->surface.resize = resize_surface;
+   /* Note, the region we allocate doesn't actually have any storage
+    * since we're drawing into an XImage or Pixmap.
+    * The region's size will get set in the xmesa_alloc_front/back_storage()
+    * functions.
+    */
+   sps->surface.region = pipe->region_alloc(pipe, 0, 0, 0);
 
    return &sps->surface;
 }
diff --git a/src/mesa/drivers/x11/xmesaP.h b/src/mesa/drivers/x11/xmesaP.h
index daf6a3f942..098b9218ae 100644
--- a/src/mesa/drivers/x11/xmesaP.h
+++ b/src/mesa/drivers/x11/xmesaP.h
@@ -589,7 +589,7 @@ extern void xmesa_register_swrast_functions( GLcontext *ctx );
 struct pipe_surface;
 
 struct pipe_surface *
-xmesa_new_surface(struct xmesa_renderbuffer *xrb);
+xmesa_new_surface(GLcontext *ctx, struct xmesa_renderbuffer *xrb);
 
 
 #endif
diff --git a/src/mesa/main/renderbuffer.c b/src/mesa/main/renderbuffer.c
index a900de169e..7c35575d12 100644
--- a/src/mesa/main/renderbuffer.c
+++ b/src/mesa/main/renderbuffer.c
@@ -51,7 +51,9 @@
 
 #include "pipe/softpipe/sp_z_surface.h"
 #include "pipe/p_state.h"
+#include "pipe/p_context.h"
 #include "pipe/p_defines.h"
+#include "state_tracker/st_context.h"
 
 
 /* 32-bit color index format.  Not a public format. */
@@ -949,6 +951,7 @@ _mesa_soft_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
                                 GLenum internalFormat,
                                 GLuint width, GLuint height)
 {
+   struct pipe_context *pipe = ctx->st->pipe;
    GLuint pixelSize;
 
    /* first clear these fields */
@@ -1065,6 +1068,9 @@ _mesa_soft_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
       rb->PutMonoValues = put_mono_values_ubyte;
       rb->StencilBits = 8 * sizeof(GLubyte);
       pixelSize = sizeof(GLubyte);
+      if (!rb->surface)
+         rb->surface = (struct pipe_surface *)
+            pipe->surface_alloc(pipe, PIPE_FORMAT_U_S8);
       break;
    case GL_STENCIL_INDEX16_EXT:
       rb->_ActualFormat = GL_STENCIL_INDEX16_EXT;
@@ -1095,8 +1101,9 @@ _mesa_soft_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
       rb->PutValues = put_values_ushort;
       rb->PutMonoValues = put_mono_values_ushort;
       rb->DepthBits = 8 * sizeof(GLushort);
-      rb->surface
-         = (struct pipe_surface *) softpipe_new_z_surface(PIPE_FORMAT_U_Z16);
+      if (!rb->surface)
+         rb->surface = (struct pipe_surface *)
+            pipe->surface_alloc(pipe, PIPE_FORMAT_U_Z16);
       pixelSize = sizeof(GLushort);
       break;
    case GL_DEPTH_COMPONENT24:
@@ -1119,8 +1126,9 @@ _mesa_soft_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
          rb->_ActualFormat = GL_DEPTH_COMPONENT32;
          rb->DepthBits = 32;
       }
-      rb->surface
-         = (struct pipe_surface *) softpipe_new_z_surface(PIPE_FORMAT_U_Z32);
+      if (!rb->surface)
+         rb->surface = (struct pipe_surface *)
+            pipe->surface_alloc(pipe, PIPE_FORMAT_U_Z32);
       pixelSize = sizeof(GLuint);
       break;
    case GL_DEPTH_STENCIL_EXT:
@@ -1138,8 +1146,9 @@ _mesa_soft_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
       rb->PutMonoValues = put_mono_values_uint;
       rb->DepthBits = 24;
       rb->StencilBits = 8;
-      rb->surface
-         = (struct pipe_surface *) softpipe_new_z_surface(PIPE_FORMAT_Z24_S8);
+      if (!rb->surface)
+         rb->surface = (struct pipe_surface *)
+            pipe->surface_alloc(pipe, PIPE_FORMAT_Z24_S8);
       pixelSize = sizeof(GLuint);
       break;
    case GL_COLOR_INDEX8_EXT:
@@ -1202,28 +1211,33 @@ _mesa_soft_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
    ASSERT(rb->PutMonoValues);
 
    /* free old buffer storage */
-   if (rb->Data) {
-      if (rb->surface) {
-         /* pipe surface */
-      }
-      else {
-         /* legacy renderbuffer */
-         _mesa_free(rb->Data);
-      }
-      rb->Data = NULL;
+   if (rb->surface) {
+      /* pipe_surface/region */
    }
+   else if (rb->Data) {
+      /* legacy renderbuffer (this will go away) */
+      _mesa_free(rb->Data);
+   }
+   rb->Data = NULL;
 
    if (width > 0 && height > 0) {
       /* allocate new buffer storage */
       if (rb->surface) {
-         /* pipe surface */
-         rb->surface->resize(rb->surface, width, height);
-         rb->Data = rb->surface->buffer.ptr;
+         /* pipe_surface/region */
+         if (rb->surface->region) {
+            pipe->region_unmap(pipe, rb->surface->region);
+            pipe->region_release(pipe, &rb->surface->region);
+         }
+         rb->surface->region = pipe->region_alloc(pipe, pixelSize, width, height);
+         /* XXX probably don't want to really map here */
+         pipe->region_map(pipe, rb->surface->region);
+         rb->Data = rb->surface->region->map;
       }
       else {
-         /* legacy renderbuffer */
-         rb->Data = _mesa_malloc(width * height * pixelSize);
+         /* legacy renderbuffer (this will go away) */
+         rb->Data = malloc(width * height * pixelSize);
       }
+
       if (rb->Data == NULL) {
          rb->Width = 0;
          rb->Height = 0;
diff --git a/src/mesa/pipe/p_context.h b/src/mesa/pipe/p_context.h
index bfae55a4ba..b48c7775de 100644
--- a/src/mesa/pipe/p_context.h
+++ b/src/mesa/pipe/p_context.h
@@ -116,6 +116,14 @@ struct pipe_context {
                                const struct pipe_viewport_state * );
 
 
+   /*
+    * Surface functions
+    * This might go away...
+    */
+   struct pipe_surface *(*surface_alloc)(struct pipe_context *pipe,
+                                         GLuint format);
+
+
    /*
     * Memory region functions
     * Some of these may go away...
diff --git a/src/mesa/pipe/p_state.h b/src/mesa/pipe/p_state.h
index d81c3f1778..0767fc2fcb 100644
--- a/src/mesa/pipe/p_state.h
+++ b/src/mesa/pipe/p_state.h
@@ -233,51 +233,17 @@ struct pipe_sampler_state
 
 
 /***
- *** Non-state Objects
+ *** Resource Objects
  ***/
 
 
-/**
- * A mappable buffer (vertex data, pixel data, etc)
- * XXX replace with "intel_region".
- */
-struct pipe_buffer
-{
-   void (*buffer_data)(struct pipe_buffer *pb, GLuint size, const void *src);
-   void (*buffer_sub_data)(struct pipe_buffer *pb, GLuint offset, GLuint size,
-                           const void *src);
-   void *(*map)(struct pipe_buffer *pb, GLuint access_mode);
-   void (*unmap)(struct pipe_buffer *pb);
-   GLubyte *ptr;     /**< address, only valid while mapped */
-   GLuint mode;      /**< PIPE_MAP_x, only valid while mapped */
-};
-
-
-/**
- * 2D surface.
- * May be a renderbuffer, texture mipmap level, etc.
- */
-struct pipe_surface
-{
-   struct pipe_buffer buffer;  /**< surfaces can be mapped */
-   GLuint format:5;            /**< PIPE_FORMAT_x */
-   GLuint width, height;
-
-   GLint stride, cpp;
-   GLubyte *ptr;    /**< only valid while mapped, may not equal buffer->ptr */
-
-   void *rb;  /**< Ptr back to renderbuffer (temporary?) */
-
-   void (*resize)(struct pipe_surface *ps, GLuint width, GLuint height);
-};
-
-
 struct _DriBufferObject;
 struct intel_buffer_object;
 
 struct pipe_region
 {
    struct _DriBufferObject *buffer;   /**< buffer manager's buffer ID */
+
    GLuint refcount; /**< Reference count for region */
    GLuint cpp;      /**< bytes per pixel */
    GLuint pitch;    /**< in pixels */
@@ -290,6 +256,21 @@ struct pipe_region
    struct intel_buffer_object *pbo;     /* zero-copy uploads */
 };
 
+
+/**
+ * 2D surface.
+ * May be a renderbuffer, texture mipmap level, etc.
+ */
+struct pipe_surface
+{
+   struct pipe_region *region;
+   GLuint format:5;            /**< PIPE_FORMAT_x */
+   GLuint width, height;
+
+   void *rb;  /**< Ptr back to renderbuffer (temporary?) */
+};
+
+
 /**
  * Texture object.
  * Mipmap levels, cube faces, 3D slices can be accessed as surfaces.
diff --git a/src/mesa/pipe/softpipe/sp_context.c b/src/mesa/pipe/softpipe/sp_context.c
index 8655aa83fd..002fe73b59 100644
--- a/src/mesa/pipe/softpipe/sp_context.c
+++ b/src/mesa/pipe/softpipe/sp_context.c
@@ -35,6 +35,7 @@
 #include "pipe/p_defines.h"
 #include "sp_context.h"
 #include "sp_clear.h"
+#include "sp_region.h"
 #include "sp_state.h"
 #include "sp_surface.h"
 #include "sp_prim_setup.h"
@@ -42,18 +43,16 @@
 
 static void map_surfaces(struct softpipe_context *sp)
 {
+   struct pipe_context *pipe = &sp->pipe;
    GLuint i;
 
    for (i = 0; i < sp->framebuffer.num_cbufs; i++) {
-      struct softpipe_surface *sps = softpipe_surface(sp->framebuffer.cbufs[i]);
-      struct pipe_buffer *buf = &sps->surface.buffer;
-      buf->map(buf, PIPE_MAP_READ_WRITE);
+      struct softpipe_surface *sps = softpipe_surface(sp->framebuffer.cbufs[i]);      pipe->region_map(pipe, sps->surface.region);
    }
 
    if (sp->framebuffer.zbuf) {
       struct softpipe_surface *sps = softpipe_surface(sp->framebuffer.zbuf);
-      struct pipe_buffer *buf = &sps->surface.buffer;
-      buf->map(buf, PIPE_MAP_READ_WRITE);
+      pipe->region_map(pipe, sps->surface.region);
    }
 
    /* XXX depth & stencil bufs */
@@ -62,18 +61,17 @@ static void map_surfaces(struct softpipe_context *sp)
 
 static void unmap_surfaces(struct softpipe_context *sp)
 {
+   struct pipe_context *pipe = &sp->pipe;
    GLuint i;
 
    for (i = 0; i < sp->framebuffer.num_cbufs; i++) {
       struct softpipe_surface *sps = softpipe_surface(sp->framebuffer.cbufs[i]);
-      struct pipe_buffer *buf = &sps->surface.buffer;
-      buf->unmap(buf);
+      pipe->region_unmap(pipe, sps->surface.region);
    }
 
    if (sp->framebuffer.zbuf) {
       struct softpipe_surface *sps = softpipe_surface(sp->framebuffer.zbuf);
-      struct pipe_buffer *buf = &sps->surface.buffer;
-      buf->unmap(buf);
+      pipe->region_unmap(pipe, sps->surface.region);
    }
    /* XXX depth & stencil bufs */
 }
@@ -161,6 +159,9 @@ struct pipe_context *softpipe_create( void )
    softpipe->draw = draw_create();
    draw_set_setup_stage(softpipe->draw, sp_draw_render_stage(softpipe));
 
+   sp_init_region_functions(softpipe);
+   sp_init_surface_functions(softpipe);
+
    /*
     * XXX we could plug GL selection/feedback into the drawing pipeline
     * by specifying a different setup/render stage.
diff --git a/src/mesa/pipe/softpipe/sp_region.c b/src/mesa/pipe/softpipe/sp_region.c
new file mode 100644
index 0000000000..04ae5e94f9
--- /dev/null
+++ b/src/mesa/pipe/softpipe/sp_region.c
@@ -0,0 +1,105 @@
+/**************************************************************************
+ * 
+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * 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, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ **************************************************************************/
+
+/**
+ * Software-based region allocation and management.
+ * A hardware driver would override these functions.
+ */
+
+
+#include "sp_context.h"
+#include "sp_region.h"
+#include "sp_surface.h"
+#include "main/imports.h"
+
+
+static struct pipe_region *
+sp_region_alloc(struct pipe_context *pipe,
+                GLuint cpp, GLuint pitch, GLuint height)
+{
+   struct pipe_region *region = CALLOC_STRUCT(pipe_region);
+   if (!region)
+      return NULL;
+
+   region->refcount = 1;
+   region->cpp = cpp;
+   region->pitch = pitch;
+   region->height = height;
+   region->map = malloc(cpp * pitch * height);
+
+   return region;
+}
+
+
+static void
+sp_region_release(struct pipe_context *pipe, struct pipe_region **region)
+{
+   assert((*region)->refcount > 0);
+   (*region)->refcount--;
+
+   if ((*region)->refcount == 0) {
+      assert((*region)->map_refcount == 0);
+
+#if 0
+      if ((*region)->pbo)
+	 (*region)->pbo->region = NULL;
+      (*region)->pbo = NULL;
+#endif
+
+      free(*region);
+   }
+   *region = NULL;
+}
+
+
+
+static GLubyte *
+sp_region_map(struct pipe_context *pipe, struct pipe_region *region)
+{
+   region->map_refcount++;
+   return region->map;
+}
+
+
+static void
+sp_region_unmap(struct pipe_context *pipe, struct pipe_region *region)
+{
+   region->map_refcount--;
+}
+
+
+void
+sp_init_region_functions(struct softpipe_context *sp)
+{
+   sp->pipe.region_alloc = sp_region_alloc;
+   sp->pipe.region_release = sp_region_release;
+
+   sp->pipe.region_map = sp_region_map;
+   sp->pipe.region_unmap = sp_region_unmap;
+
+   /* XXX lots of other region functions needed... */
+}
diff --git a/src/mesa/pipe/softpipe/sp_region.h b/src/mesa/pipe/softpipe/sp_region.h
new file mode 100644
index 0000000000..432746b27f
--- /dev/null
+++ b/src/mesa/pipe/softpipe/sp_region.h
@@ -0,0 +1,40 @@
+/**************************************************************************
+ * 
+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * 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, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ **************************************************************************/
+
+
+#ifndef SP_REGION_H
+#define SP_REGION_H
+
+
+struct softpipe_context;
+
+
+extern void
+sp_init_region_functions(struct softpipe_context *sp);
+
+
+#endif /* SP_REGION_H */
diff --git a/src/mesa/pipe/softpipe/sp_surface.c b/src/mesa/pipe/softpipe/sp_surface.c
index 16bbacb12b..cf89d28941 100644
--- a/src/mesa/pipe/softpipe/sp_surface.c
+++ b/src/mesa/pipe/softpipe/sp_surface.c
@@ -28,8 +28,22 @@
 #include "sp_context.h"
 #include "sp_state.h"
 #include "sp_surface.h"
-#include "sp_headers.h"
+#include "pipe/p_defines.h"
+#include "main/imports.h"
 
+
+/**
+ * Softpipe surface functions.
+ * Basically, create surface of a particular type, then plug in default
+ * read/write_quad functions.
+ * Note that these quad funcs assume the buffer/region is in a linear
+ * layout with Y=0=bottom.
+ * If we had swizzled/AOS buffers the read/write functions could be
+ * simplified a lot....
+ */
+
+
+#if 000 /* OLD... should be recycled... */
 static void rgba8_read_quad_f( struct softpipe_surface *gs,
 			       GLint x, GLint y,
 			       GLfloat (*rgba)[NUM_CHANNELS] )
@@ -98,9 +112,6 @@ static void rgba8_write_quad_f_swz( struct softpipe_surface *gs,
    }
 }
 
-
-
-
 static void rgba8_read_quad_ub( struct softpipe_surface *gs,
 				GLint x, GLint y,
 				GLubyte (*rgba)[NUM_CHANNELS] )
@@ -118,7 +129,6 @@ static void rgba8_read_quad_ub( struct softpipe_surface *gs,
    }
 }
 
-
 static void rgba8_write_quad_ub( struct softpipe_surface *gs,
 				 GLint x, GLint y,
 				 GLubyte (*rgba)[NUM_CHANNELS] )
@@ -136,18 +146,216 @@ static void rgba8_write_quad_ub( struct softpipe_surface *gs,
    }
 }
 
+#endif
+
+
+
+static void
+z16_read_quad_z(struct softpipe_surface *sps,
+                GLint x, GLint y, GLuint zzzz[QUAD_SIZE])
+{
+   const GLushort *src
+      = (GLushort *) sps->surface.region->map + y * sps->surface.region->pitch + x;
+
+   assert(sps->surface.format == PIPE_FORMAT_U_Z16);
+
+   /* converting GLushort to GLuint: */
+   zzzz[0] = src[0];
+   zzzz[1] = src[1];
+   src += sps->surface.region->pitch;
+   zzzz[2] = src[0];
+   zzzz[3] = src[1];
+}
+
+static void
+z16_write_quad_z(struct softpipe_surface *sps,
+                 GLint x, GLint y, const GLuint zzzz[QUAD_SIZE])
+{
+   GLushort *dst = (GLushort *) sps->surface.region->map + y * sps->surface.region->pitch + x;
+
+   assert(sps->surface.format == PIPE_FORMAT_U_Z16);
+
+   /* converting GLuint to GLushort: */
+   dst[0] = zzzz[0];
+   dst[1] = zzzz[1];
+   dst += sps->surface.region->pitch;
+   dst[0] = zzzz[2];
+   dst[1] = zzzz[3];
+}
+
+static void
+z32_read_quad_z(struct softpipe_surface *sps,
+                GLint x, GLint y, GLuint zzzz[QUAD_SIZE])
+{
+   const GLuint *src
+      = (GLuint *) sps->surface.region->map + y * sps->surface.region->pitch + x;
+
+   assert(sps->surface.format == PIPE_FORMAT_U_Z32);
+
+   zzzz[0] = src[0];
+   zzzz[1] = src[1];
+   src += sps->surface.region->pitch;
+   zzzz[2] = src[0];
+   zzzz[3] = src[1];
+}
+
+static void
+z32_write_quad_z(struct softpipe_surface *sps,
+                 GLint x, GLint y, const GLuint zzzz[QUAD_SIZE])
+{
+   GLuint *dst = (GLuint *) sps->surface.region->map + y * sps->surface.region->pitch + x;
+
+   assert(sps->surface.format == PIPE_FORMAT_U_Z32);
+
+   dst[0] = zzzz[0];
+   dst[1] = zzzz[1];
+   dst += sps->surface.region->pitch;
+   dst[0] = zzzz[2];
+   dst[1] = zzzz[3];
+}
+
+static void
+z24s8_read_quad_z(struct softpipe_surface *sps,
+                  GLint x, GLint y, GLuint zzzz[QUAD_SIZE])
+{
+   const GLuint *src
+      = (GLuint *) sps->surface.region->map + y * sps->surface.region->pitch + x;
+
+   assert(sps->surface.format == PIPE_FORMAT_Z24_S8);
+
+   zzzz[0] = src[0] >> 8;
+   zzzz[1] = src[1] >> 8;
+   src += sps->surface.region->pitch;
+   zzzz[2] = src[0] >> 8;
+   zzzz[3] = src[1] >> 8;
+}
+
+static void
+z24s8_write_quad_z(struct softpipe_surface *sps,
+                   GLint x, GLint y, const GLuint zzzz[QUAD_SIZE])
+{
+   GLuint *dst = (GLuint *) sps->surface.region->map + y * sps->surface.region->pitch + x;
+
+   assert(sps->surface.format == PIPE_FORMAT_Z24_S8);
+   assert(zzzz[0] <= 0xffffff);
+
+   dst[0] = (dst[0] & 0xff) | (zzzz[0] << 8);
+   dst[1] = (dst[1] & 0xff) | (zzzz[1] << 8);
+   dst += sps->surface.region->pitch;
+   dst[0] = (dst[0] & 0xff) | (zzzz[2] << 8);
+   dst[1] = (dst[1] & 0xff) | (zzzz[3] << 8);
+}
+
+static void
+z24s8_read_quad_stencil(struct softpipe_surface *sps,
+                        GLint x, GLint y, GLubyte ssss[QUAD_SIZE])
+{
+   const GLuint *src
+      = (GLuint *) sps->surface.region->map + y * sps->surface.region->pitch + x;
+
+   assert(sps->surface.format == PIPE_FORMAT_Z24_S8);
+
+   ssss[0] = src[0] & 0xff;
+   ssss[1] = src[1] & 0xff;
+   src += sps->surface.region->pitch;
+   ssss[2] = src[0] & 0xff;
+   ssss[3] = src[1] & 0xff;
+}
 
+static void
+z24s8_write_quad_stencil(struct softpipe_surface *sps,
+                         GLint x, GLint y, const GLubyte ssss[QUAD_SIZE])
+{
+   GLuint *dst = (GLuint *) sps->surface.region->map + y * sps->surface.region->pitch + x;
+
+   assert(sps->surface.format == PIPE_FORMAT_Z24_S8);
 
+   dst[0] = (dst[0] & 0xffffff00) | ssss[0];
+   dst[1] = (dst[1] & 0xffffff00) | ssss[1];
+   dst += sps->surface.region->pitch;
+   dst[0] = (dst[0] & 0xffffff00) | ssss[2];
+   dst[1] = (dst[1] & 0xffffff00) | ssss[3];
+}
 
-struct softpipe_surface_type gs_rgba8 = {
-   G_SURFACE_RGBA_8888,
-   rgba8_read_quad_f,
-   rgba8_read_quad_f_swz,
-   rgba8_read_quad_ub,
-   rgba8_write_quad_f,
-   rgba8_write_quad_f_swz,
-   rgba8_write_quad_ub,
-};
 
+static void
+s8_read_quad_stencil(struct softpipe_surface *sps,
+                     GLint x, GLint y, GLubyte ssss[QUAD_SIZE])
+{
+   const GLubyte *src
+      = sps->surface.region->map + y * sps->surface.region->pitch + x;
+
+   assert(sps->surface.format == PIPE_FORMAT_U_S8);
+
+   ssss[0] = src[0];
+   ssss[1] = src[1];
+   src += sps->surface.region->pitch;
+   ssss[2] = src[0];
+   ssss[3] = src[1];
+}
+
+static void
+s8_write_quad_stencil(struct softpipe_surface *sps,
+                      GLint x, GLint y, const GLubyte ssss[QUAD_SIZE])
+{
+   GLubyte *dst
+      = sps->surface.region->map + y * sps->surface.region->pitch + x;
 
+   assert(sps->surface.format == PIPE_FORMAT_U_S8);
 
+   dst[0] = ssss[0];
+   dst[1] = ssss[1];
+   dst += sps->surface.region->pitch;
+   dst[0] = ssss[2];
+   dst[1] = ssss[3];
+}
+
+
+
+static void
+init_quad_funcs(struct softpipe_surface *sps)
+{
+   switch (sps->surface.format) {
+   case PIPE_FORMAT_U_Z16:
+      sps->read_quad_z = z16_read_quad_z;
+      sps->write_quad_z = z16_write_quad_z;
+      break;
+   case PIPE_FORMAT_U_Z32:
+      sps->read_quad_z = z32_read_quad_z;
+      sps->write_quad_z = z32_write_quad_z;
+      break;
+   case PIPE_FORMAT_Z24_S8:
+      sps->read_quad_z = z24s8_read_quad_z;
+      sps->write_quad_z = z24s8_write_quad_z;
+      sps->read_quad_stencil = z24s8_read_quad_stencil;
+      sps->write_quad_stencil = z24s8_write_quad_stencil;
+      break;
+   case PIPE_FORMAT_U_S8:
+      sps->read_quad_stencil = s8_read_quad_stencil;
+      sps->write_quad_stencil = s8_write_quad_stencil;
+      break;
+   default:
+      assert(0);
+   }
+}
+
+
+static struct pipe_surface *
+sp_surface_alloc(struct pipe_context *pipe, GLenum format)
+{
+   struct softpipe_surface *sps = CALLOC_STRUCT(softpipe_surface);
+   if (!sps)
+      return NULL;
+
+   sps->surface.format = format;
+   init_quad_funcs(sps);
+
+   return &sps->surface;
+}
+
+
+void
+sp_init_surface_functions(struct softpipe_context *sp)
+{
+   sp->pipe.surface_alloc = sp_surface_alloc;
+}
diff --git a/src/mesa/pipe/softpipe/sp_surface.h b/src/mesa/pipe/softpipe/sp_surface.h
index 3ba732cebe..e8466256db 100644
--- a/src/mesa/pipe/softpipe/sp_surface.h
+++ b/src/mesa/pipe/softpipe/sp_surface.h
@@ -35,8 +35,7 @@
 #include "sp_headers.h"
 
 struct softpipe_surface;
-
-#define G_SURFACE_RGBA_8888  0x1
+struct softpipe_context;
 
 
 /**
@@ -98,4 +97,8 @@ softpipe_surface(struct pipe_surface *ps)
 }
 
 
+extern void
+sp_init_surface_functions(struct softpipe_context *sp);
+
+
 #endif /* SP_SURFACE_H */
diff --git a/src/mesa/pipe/softpipe/sp_z_surface.c b/src/mesa/pipe/softpipe/sp_z_surface.c
index 744737cb6c..7ff1a0cbc8 100644
--- a/src/mesa/pipe/softpipe/sp_z_surface.c
+++ b/src/mesa/pipe/softpipe/sp_z_surface.c
@@ -40,75 +40,35 @@
 #include "sp_surface.h"
 #include "sp_z_surface.h"
 
-static void*
-z_map(struct pipe_buffer *pb, GLuint access_mode)
-{
-   struct softpipe_surface *sps = (struct softpipe_surface *) pb;
-   sps->surface.ptr = pb->ptr;
-   sps->surface.stride = sps->surface.width;
-   return pb->ptr;
-}
-
-static void
-z_unmap(struct pipe_buffer *pb)
-{
-   struct softpipe_surface *sps = (struct softpipe_surface *) pb;
-   sps->surface.ptr = NULL;
-   sps->surface.stride = 0;
-}
-
-static void
-z_resize(struct pipe_surface *ps, GLuint width, GLuint height)
-{
-   struct softpipe_surface *sps = (struct softpipe_surface *) ps;
-
-   if (sps->surface.buffer.ptr)
-      free(sps->surface.buffer.ptr);
-
-   sps->surface.stride = sps->surface.width;
-   if (sps->surface.format == PIPE_FORMAT_U_Z16)
-      sps->surface.cpp = 2;
-   else if (sps->surface.format == PIPE_FORMAT_U_Z32 ||
-            sps->surface.format == PIPE_FORMAT_Z24_S8)
-      sps->surface.cpp = 4;
-   else
-      assert(0);
-
-   ps->buffer.ptr = (GLubyte *) malloc(width * height * sps->surface.cpp);
-   ps->width = width;
-   ps->height = height;
-
-}
-
 static void
 z16_read_quad_z(struct softpipe_surface *sps,
                 GLint x, GLint y, GLuint zzzz[QUAD_SIZE])
 {
    const GLushort *src
-      = (GLushort *) sps->surface.ptr + y * sps->surface.stride + x;
+      = (GLushort *) sps->surface.region->map + y * sps->surface.region->pitch + x;
 
    assert(sps->surface.format == PIPE_FORMAT_U_Z16);
 
    /* converting GLushort to GLuint: */
    zzzz[0] = src[0];
    zzzz[1] = src[1];
-   zzzz[2] = src[sps->surface.width + 0];
-   zzzz[3] = src[sps->surface.width + 1];
+   zzzz[2] = src[sps->surface.region->pitch + 0];
+   zzzz[3] = src[sps->surface.region->pitch + 1];
 }
 
 static void
 z16_write_quad_z(struct softpipe_surface *sps,
                  GLint x, GLint y, const GLuint zzzz[QUAD_SIZE])
 {
-   GLushort *dst = (GLushort *) sps->surface.ptr + y * sps->surface.stride + x;
+   GLushort *dst = (GLushort *) sps->surface.region->map + y * sps->surface.region->pitch + x;
 
    assert(sps->surface.format == PIPE_FORMAT_U_Z16);
 
    /* converting GLuint to GLushort: */
    dst[0] = zzzz[0];
    dst[1] = zzzz[1];
-   dst[sps->surface.width + 0] = zzzz[2];
-   dst[sps->surface.width + 1] = zzzz[3];
+   dst[sps->surface.region->pitch + 0] = zzzz[2];
+   dst[sps->surface.region->pitch + 1] = zzzz[3];
 }
 
 static void
@@ -116,28 +76,28 @@ z32_read_quad_z(struct softpipe_surface *sps,
                 GLint x, GLint y, GLuint zzzz[QUAD_SIZE])
 {
    const GLuint *src
-      = (GLuint *) sps->surface.ptr + y * sps->surface.stride + x;
+      = (GLuint *) sps->surface.region->map + y * sps->surface.region->pitch + x;
 
    assert(sps->surface.format == PIPE_FORMAT_U_Z32);
 
    zzzz[0] = src[0];
    zzzz[1] = src[1];
-   zzzz[2] = src[sps->surface.width + 0];
-   zzzz[3] = src[sps->surface.width + 1];
+   zzzz[2] = src[sps->surface.region->pitch + 0];
+   zzzz[3] = src[sps->surface.region->pitch + 1];
 }
 
 static void
 z32_write_quad_z(struct softpipe_surface *sps,
                  GLint x, GLint y, const GLuint zzzz[QUAD_SIZE])
 {
-   GLuint *dst = (GLuint *) sps->surface.ptr + y * sps->surface.stride + x;
+   GLuint *dst = (GLuint *) sps->surface.region->map + y * sps->surface.region->pitch + x;
 
    assert(sps->surface.format == PIPE_FORMAT_U_Z32);
 
    dst[0] = zzzz[0];
    dst[1] = zzzz[1];
-   dst[sps->surface.width + 0] = zzzz[2];
-   dst[sps->surface.width + 1] = zzzz[3];
+   dst[sps->surface.region->pitch + 0] = zzzz[2];
+   dst[sps->surface.region->pitch + 1] = zzzz[3];
 }
 
 static void
@@ -145,28 +105,28 @@ z24s8_read_quad_z(struct softpipe_surface *sps,
                   GLint x, GLint y, GLuint zzzz[QUAD_SIZE])
 {
    const GLuint *src
-      = (GLuint *) sps->surface.ptr + y * sps->surface.stride + x;
+      = (GLuint *) sps->surface.region->map + y * sps->surface.region->pitch + x;
 
    assert(sps->surface.format == PIPE_FORMAT_Z24_S8);
 
    zzzz[0] = src[0] >> 8;
    zzzz[1] = src[1] >> 8;
-   zzzz[2] = src[sps->surface.width + 0] >> 8;
-   zzzz[3] = src[sps->surface.width + 1] >> 8;
+   zzzz[2] = src[sps->surface.region->pitch + 0] >> 8;
+   zzzz[3] = src[sps->surface.region->pitch + 1] >> 8;
 }
 
 static void
 z24s8_write_quad_z(struct softpipe_surface *sps,
                    GLint x, GLint y, const GLuint zzzz[QUAD_SIZE])
 {
-   GLuint *dst = (GLuint *) sps->surface.ptr + y * sps->surface.stride + x;
+   GLuint *dst = (GLuint *) sps->surface.region->map + y * sps->surface.region->pitch + x;
 
    assert(sps->surface.format == PIPE_FORMAT_Z24_S8);
    assert(zzzz[0] <= 0xffffff);
 
    dst[0] = (dst[0] & 0xff) | (zzzz[0] << 8);
    dst[1] = (dst[1] & 0xff) | (zzzz[1] << 8);
-   dst += sps->surface.width;
+   dst += sps->surface.region->pitch;
    dst[0] = (dst[0] & 0xff) | (zzzz[2] << 8);
    dst[1] = (dst[1] & 0xff) | (zzzz[3] << 8);
 }
@@ -176,32 +136,65 @@ z24s8_read_quad_stencil(struct softpipe_surface *sps,
                         GLint x, GLint y, GLubyte ssss[QUAD_SIZE])
 {
    const GLuint *src
-      = (GLuint *) sps->surface.ptr + y * sps->surface.stride + x;
+      = (GLuint *) sps->surface.region->map + y * sps->surface.region->pitch + x;
 
    assert(sps->surface.format == PIPE_FORMAT_Z24_S8);
 
    ssss[0] = src[0] & 0xff;
    ssss[1] = src[1] & 0xff;
-   ssss[2] = src[sps->surface.width + 0] & 0xff;
-   ssss[3] = src[sps->surface.width + 1] & 0xff;
+   ssss[2] = src[sps->surface.region->pitch + 0] & 0xff;
+   ssss[3] = src[sps->surface.region->pitch + 1] & 0xff;
 }
 
 static void
 z24s8_write_quad_stencil(struct softpipe_surface *sps,
                          GLint x, GLint y, const GLubyte ssss[QUAD_SIZE])
 {
-   GLuint *dst = (GLuint *) sps->surface.ptr + y * sps->surface.stride + x;
+   GLuint *dst = (GLuint *) sps->surface.region->map + y * sps->surface.region->pitch + x;
 
    assert(sps->surface.format == PIPE_FORMAT_Z24_S8);
 
    dst[0] = (dst[0] & 0xffffff00) | ssss[0];
    dst[1] = (dst[1] & 0xffffff00) | ssss[1];
-   dst += sps->surface.width;
+   dst += sps->surface.region->pitch;
    dst[0] = (dst[0] & 0xffffff00) | ssss[2];
    dst[1] = (dst[1] & 0xffffff00) | ssss[3];
 }
 
 
+static void
+s8_read_quad_stencil(struct softpipe_surface *sps,
+                     GLint x, GLint y, GLubyte ssss[QUAD_SIZE])
+{
+   const GLubyte *src
+      = sps->surface.region->map + y * sps->surface.region->pitch + x;
+
+   assert(sps->surface.format == PIPE_FORMAT_U_S8);
+
+   ssss[0] = src[0];
+   ssss[1] = src[1];
+   src += sps->surface.region->pitch;
+   ssss[2] = src[0];
+   ssss[3] = src[1];
+}
+
+static void
+s8_write_quad_stencil(struct softpipe_surface *sps,
+                      GLint x, GLint y, const GLubyte ssss[QUAD_SIZE])
+{
+   GLubyte *dst
+      = sps->surface.region->map + y * sps->surface.region->pitch + x;
+
+   assert(sps->surface.format == PIPE_FORMAT_U_S8);
+
+   dst[0] = ssss[0];
+   dst[1] = ssss[1];
+   dst += sps->surface.region->pitch;
+   dst[0] = ssss[2];
+   dst[1] = ssss[3];
+}
+
+
 
 /**
  * Create a new software-based Z buffer.
@@ -215,27 +208,6 @@ softpipe_new_z_surface(GLuint format)
       return NULL;
 
    sps->surface.format = format;
-   sps->surface.resize = z_resize;
-   sps->surface.buffer.map = z_map;
-   sps->surface.buffer.unmap = z_unmap;
-
-   if (format == PIPE_FORMAT_U_Z16) {
-      sps->read_quad_z = z16_read_quad_z;
-      sps->write_quad_z = z16_write_quad_z;
-   }
-   else if (format == PIPE_FORMAT_U_Z32) {
-      sps->read_quad_z = z32_read_quad_z;
-      sps->write_quad_z = z32_write_quad_z;
-   }
-   else if (format == PIPE_FORMAT_Z24_S8) {
-      sps->read_quad_z = z24s8_read_quad_z;
-      sps->write_quad_z = z24s8_write_quad_z;
-      sps->read_quad_stencil = z24s8_read_quad_stencil;
-      sps->write_quad_stencil = z24s8_write_quad_stencil;
-   }
-   else {
-      assert(0);
-   }
 
    return sps;
 }
diff --git a/src/mesa/sources b/src/mesa/sources
index 32c2ff2350..3b820b71f0 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -157,6 +157,7 @@ VF_SOURCES = \
 SOFTPIPE_SOURCES = \
 	pipe/softpipe/sp_clear.c \
 	pipe/softpipe/sp_context.c \
+	pipe/softpipe/sp_region.c \
 	pipe/softpipe/sp_quad.c \
 	pipe/softpipe/sp_quad_alpha_test.c \
 	pipe/softpipe/sp_quad_blend.c \
@@ -176,7 +177,7 @@ SOFTPIPE_SOURCES = \
 	pipe/softpipe/sp_state_sampler.c \
 	pipe/softpipe/sp_state_setup.c \
 	pipe/softpipe/sp_state_surface.c \
-	pipe/softpipe/sp_z_surface.c \
+	pipe/softpipe/sp_surface.c \
 	pipe/softpipe/sp_prim_setup.c
 
 DRAW_SOURCES = \
-- 
cgit v1.2.3


From d28661870a92f0beccd018855030146e01efb02e Mon Sep 17 00:00:00 2001
From: Brian <brian@i915.localnet.net>
Date: Tue, 31 Jul 2007 17:55:32 -0600
Subject: sp_z_surface.h is dead

---
 src/mesa/main/renderbuffer.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/renderbuffer.c b/src/mesa/main/renderbuffer.c
index 7c35575d12..9509df3159 100644
--- a/src/mesa/main/renderbuffer.c
+++ b/src/mesa/main/renderbuffer.c
@@ -49,7 +49,6 @@
 
 #include "rbadaptors.h"
 
-#include "pipe/softpipe/sp_z_surface.h"
 #include "pipe/p_state.h"
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
-- 
cgit v1.2.3


From fb206809ba2a131fd9034e10a00592f2d0d81fce Mon Sep 17 00:00:00 2001
From: Brian <brian@i915.localnet.net>
Date: Wed, 1 Aug 2007 12:58:38 -0600
Subject: Checkpoint: glClear changes - working, bug very rough.

---
 src/mesa/Makefile                             |  9 ++-
 src/mesa/drivers/dri/i915pipe/intel_buffers.c | 29 ++++++++-
 src/mesa/drivers/dri/i915pipe/intel_buffers.h |  5 ++
 src/mesa/drivers/dri/i915pipe/intel_context.c |  2 +
 src/mesa/drivers/x11/xm_api.c                 |  2 +
 src/mesa/drivers/x11/xm_dd.c                  | 26 ++++++++
 src/mesa/drivers/x11/xmesaP.h                 |  6 +-
 src/mesa/main/buffers.c                       | 10 +++
 src/mesa/pipe/p_context.h                     |  1 +
 src/mesa/pipe/softpipe/sp_clear.c             | 90 ++++++++++++++++++++++-----
 src/mesa/pipe/softpipe/sp_region.c            | 55 ++++++++++++++++
 11 files changed, 213 insertions(+), 22 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 6943219036..3055564341 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -11,6 +11,8 @@ GL_MINOR = 5
 GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
 
 
+SOFTPIPE_LIB = $(TOP)/src/mesa/pipe/softpipe/libsoftpipe.a
+
 .SUFFIXES : .cpp
 
 .c.o:
@@ -110,11 +112,12 @@ stand-alone: depend subdirs $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$
 osmesa-only: depend subdirs $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME)
 
 # Make the GL library
-$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS)
+$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS) $(SOFTPIPE_LIB)
 	@ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \
 		-major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \
 		-install $(TOP)/$(LIB_DIR) \
-		$(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(STAND_ALONE_OBJECTS)
+		$(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(STAND_ALONE_OBJECTS) \
+		$(SOFTPIPE_LIB)
 
 # Make the OSMesa library
 $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) $(OSMESA16_OBJECTS)
@@ -146,7 +149,7 @@ depend: $(ALL_SOURCES)
 subdirs:
 	@ (cd x86 ; $(MAKE))
 	@ (cd x86-64 ; $(MAKE))
-
+	#(cd pipe/softpipe ; $(MAKE))
 
 install: default
 	$(INSTALL) -d $(INSTALL_DIR)/include/GL
diff --git a/src/mesa/drivers/dri/i915pipe/intel_buffers.c b/src/mesa/drivers/dri/i915pipe/intel_buffers.c
index c03c009a3a..fb93151430 100644
--- a/src/mesa/drivers/dri/i915pipe/intel_buffers.c
+++ b/src/mesa/drivers/dri/i915pipe/intel_buffers.c
@@ -40,6 +40,7 @@
 #include "swrast/swrast.h"
 #include "vblank.h"
 
+#include "pipe/p_context.h"
 
 /* This block can be removed when libdrm >= 2.3.1 is required */
 
@@ -298,9 +299,17 @@ intelWindowMoved(struct intel_context *intel)
 /**
  * Called by ctx->Driver.Clear.
  */
+#if 0
 static void
 intelClear(GLcontext *ctx, GLbitfield mask)
+#else
+void
+intelClear(struct pipe_context *pipe,
+           GLboolean color, GLboolean depth,
+           GLboolean stencil, GLboolean accum)
+#endif
 {
+   GLcontext *ctx = (GLcontext *) pipe->glctx;
    const GLuint colorMask = *((GLuint *) & ctx->Color.ColorMask);
    GLbitfield tri_mask = 0;
    GLbitfield blit_mask = 0;
@@ -308,6 +317,13 @@ intelClear(GLcontext *ctx, GLbitfield mask)
    struct gl_framebuffer *fb = ctx->DrawBuffer;
    GLuint i;
 
+   GLbitfield mask;
+
+   if (color)
+      mask = ctx->DrawBuffer->_ColorDrawBufferMask[0]; /*XXX temporary*/
+   else
+      mask = 0x0;
+
    if (0)
       fprintf(stderr, "%s\n", __FUNCTION__);
 
@@ -323,7 +339,7 @@ intelClear(GLcontext *ctx, GLbitfield mask)
    }
 
    /* HW stencil */
-   if (mask & BUFFER_BIT_STENCIL) {
+   if (stencil) {
       const struct pipe_region *stencilRegion
          = intel_get_rb_region(fb, BUFFER_STENCIL);
       if (stencilRegion) {
@@ -340,7 +356,7 @@ intelClear(GLcontext *ctx, GLbitfield mask)
    }
 
    /* HW depth */
-   if (mask & BUFFER_BIT_DEPTH) {
+   if (depth) {
       /* clear depth with whatever method is used for stencil (see above) */
       if (tri_mask & BUFFER_BIT_STENCIL)
          tri_mask |= BUFFER_BIT_DEPTH;
@@ -368,9 +384,14 @@ intelClear(GLcontext *ctx, GLbitfield mask)
    if (blit_mask)
       intelClearWithBlit(ctx, blit_mask);
 
-#if 1
+#if 0
    if (swrast_mask | tri_mask)
       _swrast_Clear(ctx, swrast_mask | tri_mask);
+#else
+   softpipe_clear(pipe, GL_FALSE,
+                  (swrast_mask | tri_mask) & BUFFER_BIT_DEPTH,
+                  (swrast_mask | tri_mask) & BUFFER_BIT_STENCIL,
+                  (swrast_mask | tri_mask) & BUFFER_BIT_ACCUM);
 #endif
 }
 
@@ -786,7 +807,9 @@ intelReadBuffer(GLcontext * ctx, GLenum mode)
 void
 intelInitBufferFuncs(struct dd_function_table *functions)
 {
+#if 0
    functions->Clear = intelClear;
+#endif
    functions->DrawBuffer = intelDrawBuffer;
    functions->ReadBuffer = intelReadBuffer;
 }
diff --git a/src/mesa/drivers/dri/i915pipe/intel_buffers.h b/src/mesa/drivers/dri/i915pipe/intel_buffers.h
index 5834e39501..f0602eebae 100644
--- a/src/mesa/drivers/dri/i915pipe/intel_buffers.h
+++ b/src/mesa/drivers/dri/i915pipe/intel_buffers.h
@@ -52,4 +52,9 @@ extern void intel_draw_buffer(GLcontext * ctx, struct gl_framebuffer *fb);
 
 extern void intelInitBufferFuncs(struct dd_function_table *functions);
 
+extern void
+intelClear(struct pipe_context *pipe,
+           GLboolean color, GLboolean depth,
+           GLboolean stencil, GLboolean accum);
+
 #endif /* INTEL_BUFFERS_H */
diff --git a/src/mesa/drivers/dri/i915pipe/intel_context.c b/src/mesa/drivers/dri/i915pipe/intel_context.c
index 0ccd22a4d0..6121f6bc60 100644
--- a/src/mesa/drivers/dri/i915pipe/intel_context.c
+++ b/src/mesa/drivers/dri/i915pipe/intel_context.c
@@ -420,6 +420,8 @@ intelCreateContext(const __GLcontextModes * mesaVis,
    
    intel->pipe = intel->ctx.st->pipe;
    intel->pipe->screen = intelScreen;
+   intel->pipe->glctx = ctx;
+   intel->pipe->clear = intelClear;
    intelScreen->pipe = intel->pipe;
    intel_init_region_functions(intel->pipe);
 
diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c
index f20e8104fb..92d37085d1 100644
--- a/src/mesa/drivers/x11/xm_api.c
+++ b/src/mesa/drivers/x11/xm_api.c
@@ -82,6 +82,7 @@
 #include "drivers/common/driverfuncs.h"
 
 #include "state_tracker/st_public.h"
+#include "state_tracker/st_context.h"
 #include "pipe/softpipe/sp_context.h"
 
 /**
@@ -1572,6 +1573,7 @@ XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list )
 
    st_create_context( mesaCtx,
 		      softpipe_create() );
+   mesaCtx->st->pipe->clear = xmesa_clear;
    
    return c;
 }
diff --git a/src/mesa/drivers/x11/xm_dd.c b/src/mesa/drivers/x11/xm_dd.c
index 5725414856..0aa47d55e4 100644
--- a/src/mesa/drivers/x11/xm_dd.c
+++ b/src/mesa/drivers/x11/xm_dd.c
@@ -435,6 +435,32 @@ clear_buffers(GLcontext *ctx, GLbitfield buffers)
 }
 
 
+void
+xmesa_clear(struct pipe_context *pipe, GLboolean color, GLboolean depth,
+            GLboolean stencil, GLboolean accum)
+{
+   struct softpipe_context *sp = (struct softpipe_context *) pipe;
+   if (color) {
+      GET_CURRENT_CONTEXT(ctx);
+      GLuint i;
+      softpipe_update_derived(sp);
+      for (i = 0; i < sp->framebuffer.num_cbufs; i++) {
+         struct pipe_surface *ps = sp->framebuffer.cbufs[i];
+         struct xmesa_renderbuffer *xrb = (struct xmesa_renderbuffer *) ps->rb;
+         const GLint x = sp->cliprect.minx;
+         const GLint y = sp->cliprect.miny;
+         const GLint w = sp->cliprect.maxx - x;
+         const GLint h = sp->cliprect.maxy - y;
+         xrb->clearFunc(ctx, xrb, x, y, w, h);
+      }
+      color = GL_FALSE;
+   }
+
+   softpipe_clear(pipe, color, depth, stencil, accum);
+}
+
+
+
 #ifndef XFree86Server
 /* XXX this was never tested in the Xserver environment */
 
diff --git a/src/mesa/drivers/x11/xmesaP.h b/src/mesa/drivers/x11/xmesaP.h
index 098b9218ae..fb1c1f8c3b 100644
--- a/src/mesa/drivers/x11/xmesaP.h
+++ b/src/mesa/drivers/x11/xmesaP.h
@@ -587,9 +587,13 @@ extern void xmesa_register_swrast_functions( GLcontext *ctx );
 
 
 struct pipe_surface;
+struct pipe_context;
 
-struct pipe_surface *
+extern struct pipe_surface *
 xmesa_new_surface(GLcontext *ctx, struct xmesa_renderbuffer *xrb);
 
+extern void
+xmesa_clear(struct pipe_context *pipe, GLboolean color, GLboolean depth,
+            GLboolean stencil, GLboolean accum);
 
 #endif
diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c
index 0e6ca8ea1c..bb019b5998 100644
--- a/src/mesa/main/buffers.c
+++ b/src/mesa/main/buffers.c
@@ -38,6 +38,8 @@
 #include "fbobject.h"
 #include "state.h"
 
+#include "state_tracker/st_draw.h"
+
 
 #define BAD_MASK ~0u
 
@@ -176,7 +178,15 @@ _mesa_Clear( GLbitfield mask )
       }
 
       ASSERT(ctx->Driver.Clear);
+#if 0
       ctx->Driver.Clear(ctx, bufferMask);
+#else
+      st_clear(ctx->st, 
+               (mask & GL_COLOR_BUFFER_BIT) ? GL_TRUE : GL_FALSE,
+               (bufferMask & BUFFER_BIT_DEPTH) ? GL_TRUE : GL_FALSE,
+               (bufferMask & BUFFER_BIT_STENCIL) ? GL_TRUE : GL_FALSE,
+               (bufferMask & BUFFER_BIT_ACCUM) ? GL_TRUE : GL_FALSE);
+#endif                     
    }
 }
 
diff --git a/src/mesa/pipe/p_context.h b/src/mesa/pipe/p_context.h
index b48c7775de..8517d7ab68 100644
--- a/src/mesa/pipe/p_context.h
+++ b/src/mesa/pipe/p_context.h
@@ -188,6 +188,7 @@ struct pipe_context {
                                              GLuint flag);
 
    void *screen;  /**< temporary */
+   void *glctx;   /**< temporary */
 };
 
 
diff --git a/src/mesa/pipe/softpipe/sp_clear.c b/src/mesa/pipe/softpipe/sp_clear.c
index e83bc053ef..40b1156715 100644
--- a/src/mesa/pipe/softpipe/sp_clear.c
+++ b/src/mesa/pipe/softpipe/sp_clear.c
@@ -30,42 +30,102 @@
  */
 
 
+#include "pipe/p_defines.h"
 #include "sp_clear.h"
 #include "sp_context.h"
 #include "sp_surface.h"
 #include "colormac.h"
 
 
+static GLuint
+color_value(GLuint format, const GLfloat color[4])
+{
+   GLubyte r, g, b, a;
+
+   UNCLAMPED_FLOAT_TO_UBYTE(r, color[0]);
+   UNCLAMPED_FLOAT_TO_UBYTE(g, color[1]);
+   UNCLAMPED_FLOAT_TO_UBYTE(b, color[2]);
+   UNCLAMPED_FLOAT_TO_UBYTE(a, color[3]);
+
+   switch (format) {
+   case PIPE_FORMAT_U_R8_G8_B8_A8:
+      return (r << 24) | (g << 16) | (b << 8) | a;
+   case PIPE_FORMAT_U_A8_R8_G8_B8:
+      return (a << 24) | (r << 16) | (g << 8) | b;
+   case PIPE_FORMAT_U_R5_G6_B5:
+      return ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | (b >> 3);
+   default:
+      return 0;
+   }
+}
+ 
+
 void
 softpipe_clear(struct pipe_context *pipe, GLboolean color, GLboolean depth,
                GLboolean stencil, GLboolean accum)
 {
    const struct softpipe_context *softpipe = softpipe_context(pipe);
-   const GLint x = softpipe->scissor.minx;
-   const GLint y = softpipe->scissor.miny;
-   const GLint w = softpipe->scissor.maxx - x;
-   const GLint h = softpipe->scissor.maxy - y;
+   const GLint x = softpipe->cliprect.minx;
+   const GLint y = softpipe->cliprect.miny;
+   const GLint w = softpipe->cliprect.maxx - x;
+   const GLint h = softpipe->cliprect.maxy - y;
 
    if (color) {
       GLuint i;
-      GLubyte clr[4];
-
-      UNCLAMPED_FLOAT_TO_UBYTE(clr[0], softpipe->clear_color.color[0]);
-      UNCLAMPED_FLOAT_TO_UBYTE(clr[1], softpipe->clear_color.color[1]);
-      UNCLAMPED_FLOAT_TO_UBYTE(clr[2], softpipe->clear_color.color[2]);
-      UNCLAMPED_FLOAT_TO_UBYTE(clr[3], softpipe->clear_color.color[3]);
-
       for (i = 0; i < softpipe->framebuffer.num_cbufs; i++) {
          struct pipe_surface *ps = softpipe->framebuffer.cbufs[i];
-         struct softpipe_surface *sps = softpipe_surface(ps);
-         GLint j;
-         for (j = 0; j < h; j++) {
-            sps->write_mono_row_ub(sps, w, x, y + j, clr);
+
+         if (softpipe->blend.colormask == (PIPE_MASK_R | PIPE_MASK_G |
+                                           PIPE_MASK_B | PIPE_MASK_A)) {
+            /* no masking */
+            GLuint clearVal = color_value(ps->format,
+                                          softpipe->clear_color.color);
+            pipe->region_fill(pipe, ps->region, 0, x, y, w, h, clearVal);
+         }
+         else {
+            /* masking */
+
+            /*
+            for (j = 0; j < h; j++) {
+               sps->write_mono_row_ub(sps, w, x, y + j, clr);
+            }
+            */
          }
       }
    }
 
    if (depth) {
+      struct pipe_surface *ps = softpipe->framebuffer.zbuf;
+      GLuint clearVal;
+
+      switch (ps->format) {
+      case PIPE_FORMAT_U_Z16:
+         clearVal = (GLuint) (softpipe->depth_test.clear * 65535.0);
+         break;
+      case PIPE_FORMAT_U_Z32:
+         clearVal = (GLuint) (softpipe->depth_test.clear * 0xffffffff);
+         break;
+      case PIPE_FORMAT_Z24_S8:
+         clearVal = (GLuint) (softpipe->depth_test.clear * 0xffffff);
+         break;
+      default:
+         assert(0);
+      }
+
+      pipe->region_fill(pipe, ps->region, 0, x, y, w, h, clearVal);
    }
 
+   if (stencil) {
+      struct pipe_surface *ps = softpipe->framebuffer.sbuf;
+      GLuint clearVal = softpipe->stencil.clear_value;
+      if (softpipe->stencil.write_mask[0] /*== 0xff*/) {
+         /* no masking */
+         pipe->region_fill(pipe, ps->region, 0, x, y, w, h, clearVal);
+      }
+      else if (softpipe->stencil.write_mask[0] != 0x0) {
+         /* masking */
+         /* fill with quad funcs */
+         assert(0);
+      }
+   }
 }
diff --git a/src/mesa/pipe/softpipe/sp_region.c b/src/mesa/pipe/softpipe/sp_region.c
index 04ae5e94f9..4d8b35d3e7 100644
--- a/src/mesa/pipe/softpipe/sp_region.c
+++ b/src/mesa/pipe/softpipe/sp_region.c
@@ -92,6 +92,59 @@ sp_region_unmap(struct pipe_context *pipe, struct pipe_region *region)
 }
 
 
+
+static GLubyte *
+get_pointer(struct pipe_region *dst, GLuint x, GLuint y)
+{
+   return dst->map + (y * dst->pitch + x) * dst->cpp;
+}
+
+
+static void
+sp_region_fill(struct pipe_context *pipe,
+               struct pipe_region *dst,
+               GLuint dst_offset,
+               GLuint dstx, GLuint dsty,
+               GLuint width, GLuint height, GLuint value)
+{
+   GLuint i, j;
+   switch (dst->cpp) {
+   case 1:
+      {
+         GLubyte *row = get_pointer(dst, dstx, dsty);
+         for (i = 0; i < height; i++) {
+            memset(row, value, width);
+            row += dst->pitch;
+         }
+      }
+      break;
+   case 2:
+      {
+         GLushort *row = (GLushort *) get_pointer(dst, dstx, dsty);
+         for (i = 0; i < height; i++) {
+            for (j = 0; j < width; j++)
+               row[j] = value;
+            row += dst->pitch;
+         }
+      }
+      break;
+   case 4:
+      {
+         GLuint *row = (GLuint *) get_pointer(dst, dstx, dsty);
+         for (i = 0; i < height; i++) {
+            for (j = 0; j < width; j++)
+               row[j] = value;
+            row += dst->pitch;
+         }
+      }
+      break;
+   default:
+      assert(0);
+
+   }
+}
+
+
 void
 sp_init_region_functions(struct softpipe_context *sp)
 {
@@ -101,5 +154,7 @@ sp_init_region_functions(struct softpipe_context *sp)
    sp->pipe.region_map = sp_region_map;
    sp->pipe.region_unmap = sp_region_unmap;
 
+   sp->pipe.region_fill = sp_region_fill;
+
    /* XXX lots of other region functions needed... */
 }
-- 
cgit v1.2.3


From 5fd46065915d3958569ebb590104b69886352157 Mon Sep 17 00:00:00 2001
From: Brian <brian@i915.localnet.net>
Date: Wed, 1 Aug 2007 13:04:58 -0600
Subject: s/Z24_S8/S8_Z24/ (stencil is in the high byte)

---
 src/mesa/main/renderbuffer.c                |  2 +-
 src/mesa/pipe/p_defines.h                   |  2 +-
 src/mesa/pipe/softpipe/sp_clear.c           |  2 +-
 src/mesa/pipe/softpipe/sp_quad_depth_test.c |  2 +-
 src/mesa/pipe/softpipe/sp_surface.c         | 61 +++++++++++++++--------------
 5 files changed, 36 insertions(+), 33 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/renderbuffer.c b/src/mesa/main/renderbuffer.c
index 9509df3159..d89704196a 100644
--- a/src/mesa/main/renderbuffer.c
+++ b/src/mesa/main/renderbuffer.c
@@ -1147,7 +1147,7 @@ _mesa_soft_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
       rb->StencilBits = 8;
       if (!rb->surface)
          rb->surface = (struct pipe_surface *)
-            pipe->surface_alloc(pipe, PIPE_FORMAT_Z24_S8);
+            pipe->surface_alloc(pipe, PIPE_FORMAT_S8_Z24);
       pixelSize = sizeof(GLuint);
       break;
    case GL_COLOR_INDEX8_EXT:
diff --git a/src/mesa/pipe/p_defines.h b/src/mesa/pipe/p_defines.h
index 58f01758e3..c92895342e 100644
--- a/src/mesa/pipe/p_defines.h
+++ b/src/mesa/pipe/p_defines.h
@@ -145,7 +145,7 @@
 #define PIPE_FORMAT_U_Z16          10  /**< ushort Z/depth */
 #define PIPE_FORMAT_U_Z32          11  /**< uint Z/depth */
 #define PIPE_FORMAT_F_Z32          12  /**< float Z/depth */
-#define PIPE_FORMAT_Z24_S8         13  /**< 24-bit Z + 8-bit stencil */
+#define PIPE_FORMAT_S8_Z24         13  /**< 8-bit stencil + 24-bit Z */
 #define PIPE_FORMAT_U_S8           14  /**< 8-bit stencil */
 
 
diff --git a/src/mesa/pipe/softpipe/sp_clear.c b/src/mesa/pipe/softpipe/sp_clear.c
index 40b1156715..6266d124be 100644
--- a/src/mesa/pipe/softpipe/sp_clear.c
+++ b/src/mesa/pipe/softpipe/sp_clear.c
@@ -105,7 +105,7 @@ softpipe_clear(struct pipe_context *pipe, GLboolean color, GLboolean depth,
       case PIPE_FORMAT_U_Z32:
          clearVal = (GLuint) (softpipe->depth_test.clear * 0xffffffff);
          break;
-      case PIPE_FORMAT_Z24_S8:
+      case PIPE_FORMAT_S8_Z24:
          clearVal = (GLuint) (softpipe->depth_test.clear * 0xffffff);
          break;
       default:
diff --git a/src/mesa/pipe/softpipe/sp_quad_depth_test.c b/src/mesa/pipe/softpipe/sp_quad_depth_test.c
index a26bd51d84..3a8df33e67 100644
--- a/src/mesa/pipe/softpipe/sp_quad_depth_test.c
+++ b/src/mesa/pipe/softpipe/sp_quad_depth_test.c
@@ -59,7 +59,7 @@ sp_depth_test_quad(struct quad_stage *qs, struct quad_header *quad)
     */
    if (sps->surface.format == PIPE_FORMAT_U_Z16)
       scale = 65535.0;
-   else if (sps->surface.format == PIPE_FORMAT_Z24_S8)
+   else if (sps->surface.format == PIPE_FORMAT_S8_Z24)
       scale = (float) ((1 << 24) - 1);
    else
       assert(0);  /* XXX fix this someday */
diff --git a/src/mesa/pipe/softpipe/sp_surface.c b/src/mesa/pipe/softpipe/sp_surface.c
index cf89d28941..819243ae6e 100644
--- a/src/mesa/pipe/softpipe/sp_surface.c
+++ b/src/mesa/pipe/softpipe/sp_surface.c
@@ -215,66 +215,69 @@ z32_write_quad_z(struct softpipe_surface *sps,
 }
 
 static void
-z24s8_read_quad_z(struct softpipe_surface *sps,
+s8z24_read_quad_z(struct softpipe_surface *sps,
                   GLint x, GLint y, GLuint zzzz[QUAD_SIZE])
 {
+   static const GLuint mask = 0x00ffffff;
    const GLuint *src
       = (GLuint *) sps->surface.region->map + y * sps->surface.region->pitch + x;
 
-   assert(sps->surface.format == PIPE_FORMAT_Z24_S8);
+   assert(sps->surface.format == PIPE_FORMAT_S8_Z24);
 
-   zzzz[0] = src[0] >> 8;
-   zzzz[1] = src[1] >> 8;
+   zzzz[0] = src[0] & mask;
+   zzzz[1] = src[1] & mask;
    src += sps->surface.region->pitch;
-   zzzz[2] = src[0] >> 8;
-   zzzz[3] = src[1] >> 8;
+   zzzz[2] = src[0] & mask;
+   zzzz[3] = src[1] & mask;
 }
 
 static void
-z24s8_write_quad_z(struct softpipe_surface *sps,
+s8z24_write_quad_z(struct softpipe_surface *sps,
                    GLint x, GLint y, const GLuint zzzz[QUAD_SIZE])
 {
+   static const GLuint mask = 0xff000000;
    GLuint *dst = (GLuint *) sps->surface.region->map + y * sps->surface.region->pitch + x;
 
-   assert(sps->surface.format == PIPE_FORMAT_Z24_S8);
+   assert(sps->surface.format == PIPE_FORMAT_S8_Z24);
    assert(zzzz[0] <= 0xffffff);
 
-   dst[0] = (dst[0] & 0xff) | (zzzz[0] << 8);
-   dst[1] = (dst[1] & 0xff) | (zzzz[1] << 8);
+   dst[0] = (dst[0] & mask) | zzzz[0];
+   dst[1] = (dst[1] & mask) | zzzz[1];
    dst += sps->surface.region->pitch;
-   dst[0] = (dst[0] & 0xff) | (zzzz[2] << 8);
-   dst[1] = (dst[1] & 0xff) | (zzzz[3] << 8);
+   dst[0] = (dst[0] & mask) | zzzz[2];
+   dst[1] = (dst[1] & mask) | zzzz[3];
 }
 
 static void
-z24s8_read_quad_stencil(struct softpipe_surface *sps,
+s8z24_read_quad_stencil(struct softpipe_surface *sps,
                         GLint x, GLint y, GLubyte ssss[QUAD_SIZE])
 {
    const GLuint *src
       = (GLuint *) sps->surface.region->map + y * sps->surface.region->pitch + x;
 
-   assert(sps->surface.format == PIPE_FORMAT_Z24_S8);
+   assert(sps->surface.format == PIPE_FORMAT_S8_Z24);
 
-   ssss[0] = src[0] & 0xff;
-   ssss[1] = src[1] & 0xff;
+   ssss[0] = src[0] >> 24;
+   ssss[1] = src[1] >> 24;
    src += sps->surface.region->pitch;
-   ssss[2] = src[0] & 0xff;
-   ssss[3] = src[1] & 0xff;
+   ssss[2] = src[0] >> 24;
+   ssss[3] = src[1] >> 24;
 }
 
 static void
-z24s8_write_quad_stencil(struct softpipe_surface *sps,
+s8z24_write_quad_stencil(struct softpipe_surface *sps,
                          GLint x, GLint y, const GLubyte ssss[QUAD_SIZE])
 {
+   static const GLuint mask = 0x00ffffff;
    GLuint *dst = (GLuint *) sps->surface.region->map + y * sps->surface.region->pitch + x;
 
-   assert(sps->surface.format == PIPE_FORMAT_Z24_S8);
+   assert(sps->surface.format == PIPE_FORMAT_S8_Z24);
 
-   dst[0] = (dst[0] & 0xffffff00) | ssss[0];
-   dst[1] = (dst[1] & 0xffffff00) | ssss[1];
+   dst[0] = (dst[0] & mask) | (ssss[0] << 24);
+   dst[1] = (dst[1] & mask) | (ssss[1] << 24);
    dst += sps->surface.region->pitch;
-   dst[0] = (dst[0] & 0xffffff00) | ssss[2];
-   dst[1] = (dst[1] & 0xffffff00) | ssss[3];
+   dst[0] = (dst[0] & mask) | (ssss[2] << 24);
+   dst[1] = (dst[1] & mask) | (ssss[3] << 24);
 }
 
 
@@ -324,11 +327,11 @@ init_quad_funcs(struct softpipe_surface *sps)
       sps->read_quad_z = z32_read_quad_z;
       sps->write_quad_z = z32_write_quad_z;
       break;
-   case PIPE_FORMAT_Z24_S8:
-      sps->read_quad_z = z24s8_read_quad_z;
-      sps->write_quad_z = z24s8_write_quad_z;
-      sps->read_quad_stencil = z24s8_read_quad_stencil;
-      sps->write_quad_stencil = z24s8_write_quad_stencil;
+   case PIPE_FORMAT_S8_Z24:
+      sps->read_quad_z = s8z24_read_quad_z;
+      sps->write_quad_z = s8z24_write_quad_z;
+      sps->read_quad_stencil = s8z24_read_quad_stencil;
+      sps->write_quad_stencil = s8z24_write_quad_stencil;
       break;
    case PIPE_FORMAT_U_S8:
       sps->read_quad_stencil = s8_read_quad_stencil;
-- 
cgit v1.2.3


From 4f442d9ef5db42867c99a7288b4114a0340f73e6 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Thu, 2 Aug 2007 13:59:31 +0100
Subject: Reroute some clear functionality.

Still require the intelClear() call to flush batchbuffers.  That will be
removed later...
---
 src/mesa/drivers/dri/i915pipe/intel_buffers.c | 120 ++------------------------
 src/mesa/drivers/dri/i915pipe/intel_context.c |   7 +-
 src/mesa/main/buffers.c                       |   8 --
 src/mesa/pipe/softpipe/sp_clear.c             |  70 +++++----------
 src/mesa/sources                              |   1 +
 src/mesa/state_tracker/st_cb_clear.c          |  89 +++++++++++++++++++
 src/mesa/state_tracker/st_context.c           |   1 +
 src/mesa/state_tracker/st_draw.c              |  11 ---
 8 files changed, 125 insertions(+), 182 deletions(-)
 create mode 100644 src/mesa/state_tracker/st_cb_clear.c

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/i915pipe/intel_buffers.c b/src/mesa/drivers/dri/i915pipe/intel_buffers.c
index e39220fe47..5e68a869bf 100644
--- a/src/mesa/drivers/dri/i915pipe/intel_buffers.c
+++ b/src/mesa/drivers/dri/i915pipe/intel_buffers.c
@@ -295,110 +295,14 @@ intelWindowMoved(struct intel_context *intel)
 
 
 
-/**
- * Called by ctx->Driver.Clear.
- * XXX NO LONGER USED - REMOVE IN NEAR FUTURE
- */
-#if 0
-static void
-intelClear(GLcontext *ctx, GLbitfield mask)
-#else
-static void
-OLD_intelClear(struct pipe_context *pipe,
-           GLboolean color, GLboolean depth,
-           GLboolean stencil, GLboolean accum)
-#endif
-{
-   GLcontext *ctx = (GLcontext *) pipe->glctx;
-   const GLuint colorMask = *((GLuint *) & ctx->Color.ColorMask);
-   GLbitfield tri_mask = 0;
-   GLbitfield blit_mask = 0;
-   GLbitfield swrast_mask = 0;
-   struct gl_framebuffer *fb = ctx->DrawBuffer;
-   GLuint i;
-
-   GLbitfield mask;
-
-   if (color)
-      mask = ctx->DrawBuffer->_ColorDrawBufferMask[0]; /*XXX temporary*/
-   else
-      mask = 0x0;
-
-   if (0)
-      fprintf(stderr, "%s\n", __FUNCTION__);
-
-   /* HW color buffers (front, back, aux, generic FBO, etc) */
-   if (colorMask == ~0) {
-      /* clear all R,G,B,A */
-      /* XXX FBO: need to check if colorbuffers are software RBOs! */
-      blit_mask |= (mask & BUFFER_BITS_COLOR);
-   }
-   else {
-      /* glColorMask in effect */
-      tri_mask |= (mask & BUFFER_BITS_COLOR);
-   }
-
-   /* HW stencil */
-   if (stencil) {
-      const struct pipe_region *stencilRegion
-         = intel_get_rb_region(fb, BUFFER_STENCIL);
-      if (stencilRegion) {
-         /* have hw stencil */
-         if ((ctx->Stencil.WriteMask[0] & 0xff) != 0xff) {
-            /* not clearing all stencil bits, so use triangle clearing */
-            tri_mask |= BUFFER_BIT_STENCIL;
-         }
-         else {
-            /* clearing all stencil bits, use blitting */
-            blit_mask |= BUFFER_BIT_STENCIL;
-         }
-      }
-   }
-
-   /* HW depth */
-   if (depth) {
-      /* clear depth with whatever method is used for stencil (see above) */
-      if (tri_mask & BUFFER_BIT_STENCIL)
-         tri_mask |= BUFFER_BIT_DEPTH;
-      else
-         blit_mask |= BUFFER_BIT_DEPTH;
-   }
-
-   /* SW fallback clearing */
-   swrast_mask = mask & ~tri_mask & ~blit_mask;
-
-   for (i = 0; i < BUFFER_COUNT; i++) {
-      GLuint bufBit = 1 << i;
-      if ((blit_mask | tri_mask) & bufBit) {
-         if (!fb->Attachment[i].Renderbuffer->ClassID) {
-            blit_mask &= ~bufBit;
-            tri_mask &= ~bufBit;
-            swrast_mask |= bufBit;
-         }
-      }
-   }
-
-
-   intelFlush(ctx);             /* XXX intelClearWithBlit also does this */
-
-   if (blit_mask)
-      intelClearWithBlit(ctx, blit_mask);
-
-#if 0
-   if (swrast_mask | tri_mask)
-      _swrast_Clear(ctx, swrast_mask | tri_mask);
-#else
-   softpipe_clear(pipe, GL_FALSE,
-                  (swrast_mask | tri_mask) & BUFFER_BIT_DEPTH,
-                  (swrast_mask | tri_mask) & BUFFER_BIT_STENCIL,
-                  (swrast_mask | tri_mask) & BUFFER_BIT_ACCUM);
-#endif
-}
-
 
-/**
- * Clear buffers.  Called via pipe->clear().
- */
+/* XXX - kludge required because softpipe_clear uses
+ * region->fill(), which still calls intelBlit(!), but doesn't
+ * flush the batchbuffer.  
+ *
+    * One way or another, that behaviour should stop, and then this
+    * function can go aawy.
+    */
 void
 intelClear(struct pipe_context *pipe,
            GLboolean color, GLboolean depth,
@@ -407,19 +311,9 @@ intelClear(struct pipe_context *pipe,
    GLcontext *ctx = (GLcontext *) pipe->glctx;
    struct intel_context *intel = intel_context(ctx);
 
-   /* XXX
-    * Examine stencil and color writemasks to determine if we can clear
-    * with blits.
-    */
-
-   intelFlush(&intel->ctx);
-   LOCK_HARDWARE(intel);
-
    softpipe_clear(pipe, color, depth, stencil, accum);
 
    intel_batchbuffer_flush(intel->batch);
-
-   UNLOCK_HARDWARE(intel);
 }
 
 
diff --git a/src/mesa/drivers/dri/i915pipe/intel_context.c b/src/mesa/drivers/dri/i915pipe/intel_context.c
index be8235d7d1..0fc24c3b5a 100644
--- a/src/mesa/drivers/dri/i915pipe/intel_context.c
+++ b/src/mesa/drivers/dri/i915pipe/intel_context.c
@@ -417,7 +417,12 @@ intelCreateContext(const __GLcontextModes * mesaVis,
     */
    st_create_context( &intel->ctx,
 		      softpipe_create() );
-   
+
+   /* KW: Not sure I like this - we should only be talking to the
+    * state_tracker.  The pipe code will need some way of talking to
+    * us, eg for batchbuffer ioctls, and there will need to be a
+    * buffer manager interface.  So, this is a temporary hack, right?
+    */
    intel->pipe = intel->ctx.st->pipe;
    intel->pipe->screen = intelScreen;
    intel->pipe->glctx = ctx;
diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c
index bb019b5998..eea443c03c 100644
--- a/src/mesa/main/buffers.c
+++ b/src/mesa/main/buffers.c
@@ -178,15 +178,7 @@ _mesa_Clear( GLbitfield mask )
       }
 
       ASSERT(ctx->Driver.Clear);
-#if 0
       ctx->Driver.Clear(ctx, bufferMask);
-#else
-      st_clear(ctx->st, 
-               (mask & GL_COLOR_BUFFER_BIT) ? GL_TRUE : GL_FALSE,
-               (bufferMask & BUFFER_BIT_DEPTH) ? GL_TRUE : GL_FALSE,
-               (bufferMask & BUFFER_BIT_STENCIL) ? GL_TRUE : GL_FALSE,
-               (bufferMask & BUFFER_BIT_ACCUM) ? GL_TRUE : GL_FALSE);
-#endif                     
    }
 }
 
diff --git a/src/mesa/pipe/softpipe/sp_clear.c b/src/mesa/pipe/softpipe/sp_clear.c
index a133b48891..09cc643003 100644
--- a/src/mesa/pipe/softpipe/sp_clear.c
+++ b/src/mesa/pipe/softpipe/sp_clear.c
@@ -60,53 +60,20 @@ color_value(GLuint format, const GLfloat color[4])
    }
 }
  
-static GLuint
-color_mask(GLuint format, GLuint pipeMask)
-{
-   GLuint mask = 0x0;
-   switch (format) {
-   case PIPE_FORMAT_U_R8_G8_B8_A8:
-      if (pipeMask & PIPE_MASK_R)  mask |= 0xff000000;
-      if (pipeMask & PIPE_MASK_G)  mask |= 0x00ff0000;
-      if (pipeMask & PIPE_MASK_B)  mask |= 0x0000ff00;
-      if (pipeMask & PIPE_MASK_A)  mask |= 0x000000ff;
-      break;
-   case PIPE_FORMAT_U_A8_R8_G8_B8:
-      if (pipeMask & PIPE_MASK_R)  mask |= 0x00ff0000;
-      if (pipeMask & PIPE_MASK_G)  mask |= 0x0000ff00;
-      if (pipeMask & PIPE_MASK_B)  mask |= 0x000000ff;
-      if (pipeMask & PIPE_MASK_A)  mask |= 0xff000000;
-      break;
-   case PIPE_FORMAT_U_R5_G6_B5:
-      if (pipeMask & PIPE_MASK_R)  mask |= 0xf800;
-      if (pipeMask & PIPE_MASK_G)  mask |= 0x07e0;
-      if (pipeMask & PIPE_MASK_B)  mask |= 0x001f;
-      if (pipeMask & PIPE_MASK_A)  mask |= 0;
-      break;
-   default:
-      return 0;
-   }
-   return mask;
-}
 
-
-/**
- * XXX This should probaby be renamed to something like pipe_clear_with_blits()
- * and moved into a device-independent pipe file.
- */
 void
 softpipe_clear(struct pipe_context *pipe, GLboolean color, GLboolean depth,
                GLboolean stencil, GLboolean accum)
 {
-   const struct softpipe_context *softpipe = softpipe_context(pipe);
+   struct softpipe_context *softpipe = softpipe_context(pipe);
    GLint x, y, w, h;
 
-   softpipe_update_derived(softpipe);
+   softpipe_update_derived(softpipe); /* not needed?? */
 
-   x = softpipe->cliprect.minx;
-   y = softpipe->cliprect.miny;
-   w = softpipe->cliprect.maxx - x;
-   h = softpipe->cliprect.maxy - y;
+   x = 0;
+   y = 0;
+   w = softpipe->framebuffer.cbufs[0]->width;
+   h = softpipe->framebuffer.cbufs[0]->height;
 
    if (color) {
       GLuint i;
@@ -114,8 +81,7 @@ softpipe_clear(struct pipe_context *pipe, GLboolean color, GLboolean depth,
          struct pipe_surface *ps = softpipe->framebuffer.cbufs[i];
          GLuint clearVal = color_value(ps->format,
                                        softpipe->clear_color.color);
-         GLuint mask = color_mask(ps->format, softpipe->blend.colormask);
-         pipe->region_fill(pipe, ps->region, 0, x, y, w, h, clearVal, mask);
+         pipe->region_fill(pipe, ps->region, 0, x, y, w, h, clearVal, ~0);
       }
    }
 
@@ -124,10 +90,13 @@ softpipe_clear(struct pipe_context *pipe, GLboolean color, GLboolean depth,
       /* clear Z and stencil together */
       struct pipe_surface *ps = softpipe->framebuffer.zbuf;
       if (ps->format == PIPE_FORMAT_S8_Z24) {
-         GLuint mask = (softpipe->stencil.write_mask[0] << 8) | 0xffffff;
+         GLuint mask = (softpipe->stencil.write_mask[0] << 8) | 0xffffff;	 
          GLuint clearVal = (GLuint) (softpipe->depth_test.clear * 0xffffff);
+
+	 assert (mask == ~0);
+
          clearVal |= (softpipe->stencil.clear_value << 24);
-         pipe->region_fill(pipe, ps->region, 0, x, y, w, h, clearVal, mask);
+         pipe->region_fill(pipe, ps->region, 0, x, y, w, h, clearVal, ~0);
       }
       else {
          /* XXX Z24_S8 format? */
@@ -138,33 +107,36 @@ softpipe_clear(struct pipe_context *pipe, GLboolean color, GLboolean depth,
       /* separate Z and stencil */
       if (depth) {
          struct pipe_surface *ps = softpipe->framebuffer.zbuf;
-         GLuint mask, clearVal;
+         GLuint clearVal;
 
          switch (ps->format) {
          case PIPE_FORMAT_U_Z16:
             clearVal = (GLuint) (softpipe->depth_test.clear * 65535.0);
-            mask = 0xffff;
             break;
          case PIPE_FORMAT_U_Z32:
             clearVal = (GLuint) (softpipe->depth_test.clear * 0xffffffff);
-            mask = 0xffffffff;
             break;
          case PIPE_FORMAT_S8_Z24:
             clearVal = (GLuint) (softpipe->depth_test.clear * 0xffffff);
-            mask = 0xffffff;
             break;
          default:
             assert(0);
          }
 
-         pipe->region_fill(pipe, ps->region, 0, x, y, w, h, clearVal, mask);
+         pipe->region_fill(pipe, ps->region, 0, x, y, w, h, clearVal, ~0);
       }
 
       if (stencil) {
          struct pipe_surface *ps = softpipe->framebuffer.sbuf;
          GLuint clearVal = softpipe->stencil.clear_value;
+
+	 /* If this is not ~0, we shouldn't get here - clear should be
+	  * done with geometry instead.
+	  */
          GLuint mask = softpipe->stencil.write_mask[0];
 
+	 assert((mask & 0xff) == 0xff);
+
          switch (ps->format) {
          case PIPE_FORMAT_S8_Z24:
             clearVal = clearVal << 24;
@@ -187,7 +159,7 @@ softpipe_clear(struct pipe_context *pipe, GLboolean color, GLboolean depth,
        */
       struct pipe_surface *ps = softpipe->framebuffer.abuf;
       GLuint clearVal = 0x0; /* XXX FIX */
-      GLuint mask = !0;
+      GLuint mask = ~0;
       assert(ps);
       pipe->region_fill(pipe, ps->region, 0, x, y, w, h, clearVal, mask);
    }
diff --git a/src/mesa/sources b/src/mesa/sources
index d9ee7266e5..d0fe3a979f 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -191,6 +191,7 @@ STATETRACKER_SOURCES = \
 	state_tracker/st_atom_stencil.c \
 	state_tracker/st_atom_stipple.c \
 	state_tracker/st_atom_viewport.c \
+	state_tracker/st_cb_clear.c \
 	state_tracker/st_cb_program.c \
 	state_tracker/st_draw.c \
 	state_tracker/st_context.c \
diff --git a/src/mesa/state_tracker/st_cb_clear.c b/src/mesa/state_tracker/st_cb_clear.c
new file mode 100644
index 0000000000..d9cb83b8ad
--- /dev/null
+++ b/src/mesa/state_tracker/st_cb_clear.c
@@ -0,0 +1,89 @@
+/**************************************************************************
+ * 
+ * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * 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, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ **************************************************************************/
+
+ /*
+  * Authors:
+  *   Keith Whitwell <keith@tungstengraphics.com>
+  *   Brian Paul
+  */
+
+#include "st_context.h"
+#include "glheader.h"
+#include "macros.h"
+#include "enums.h"
+#include "st_context.h"
+#include "st_atom.h"
+#include "pipe/p_context.h"
+
+
+
+/* XXX: doesn't pick up the differences between front/back/left/right
+ * clears.  Need to sort that out...
+ */
+static void st_clear(GLcontext *ctx, GLbitfield mask)
+{
+   struct st_context *st = ctx->st;
+   GLboolean color = (mask & BUFFER_BITS_COLOR) ? GL_TRUE : GL_FALSE;
+   GLboolean depth = (mask & BUFFER_BIT_DEPTH) ? GL_TRUE : GL_FALSE;
+   GLboolean stencil = (mask & BUFFER_BIT_STENCIL) ? GL_TRUE : GL_FALSE;
+   GLboolean accum = (mask & BUFFER_BIT_ACCUM) ? GL_TRUE : GL_FALSE;
+   GLboolean fullscreen = 1;	/* :-) */
+
+   /* This makes sure the softpipe has the latest scissor, etc values */
+   st_validate_state( st );
+
+   if (fullscreen) {
+      /* pipe->clear() should clear a particular surface, so that we
+       * can iterate over render buffers at this level and clear the
+       * ones GL is asking for.  
+       *
+       * Will probably need something like pipe->clear_z_stencil() to
+       * cope with the special case of paired and unpaired z/stencil
+       * buffers, though could perhaps deal with them explicitly at
+       * this level.
+       */
+      st->pipe->clear(st->pipe, color, depth, stencil, accum);
+   }
+   else {
+      /* Convert to geometry, etc:
+       */
+   }
+}
+
+
+void st_init_cb_clear( struct st_context *st )
+{
+   struct dd_function_table *functions = &st->ctx->Driver;
+
+   functions->Clear = st_clear;
+}
+
+
+void st_destroy_cb_clear( struct st_context *st )
+{
+}
+
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index 6308e81a61..4d3f0ec4d3 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -58,6 +58,7 @@ struct st_context *st_create_context( GLcontext *ctx,
    st_init_atoms( st );
    st_init_draw( st );
    st_init_cb_program( st );
+   st_init_cb_clear( st );
 
    return st;
 }
diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index a424d1dd05..95fa43df4d 100644
--- a/src/mesa/state_tracker/st_draw.c
+++ b/src/mesa/state_tracker/st_draw.c
@@ -107,14 +107,3 @@ void st_destroy_draw( struct st_context *st )
 }
 
 
-/** XXX temporary here */
-void
-st_clear(struct st_context *st, GLboolean color, GLboolean depth,
-         GLboolean stencil, GLboolean accum)
-{
-   /* This makes sure the softpipe has the latest scissor, etc values */
-   st_validate_state( st );
-
-   st->pipe->clear(st->pipe, color, depth, stencil, accum);
-}
-
-- 
cgit v1.2.3


From 566ae9196b267492d9fcfb2be9065fb8017702f9 Mon Sep 17 00:00:00 2001
From: Brian <brian@i915.localnet.net>
Date: Thu, 2 Aug 2007 14:20:13 -0600
Subject: remove st_draw.h include

---
 src/mesa/main/buffers.c | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c
index eea443c03c..0e6ca8ea1c 100644
--- a/src/mesa/main/buffers.c
+++ b/src/mesa/main/buffers.c
@@ -38,8 +38,6 @@
 #include "fbobject.h"
 #include "state.h"
 
-#include "state_tracker/st_draw.h"
-
 
 #define BAD_MASK ~0u
 
-- 
cgit v1.2.3


From f5713c7d2e7ba8e1170fd9b1dd95379662ab6117 Mon Sep 17 00:00:00 2001
From: Brian <brian@i915.localnet.net>
Date: Thu, 9 Aug 2007 12:59:11 -0600
Subject: Checkpoint intel_renderbuffer removal.

Remove surface ptr from gl_renderbuffer.
Use st_renderbuffer in most places.
More clean-up.
---
 src/mesa/drivers/dri/intel_winsys/intel_blit.c | 14 +++--
 src/mesa/main/mtypes.h                         |  2 -
 src/mesa/main/renderbuffer.c                   | 14 ++++-
 src/mesa/pipe/p_state.h                        |  2 -
 src/mesa/state_tracker/st_atom_framebuffer.c   | 27 +++++----
 src/mesa/state_tracker/st_cb_clear.c           | 35 +++++++----
 src/mesa/state_tracker/st_cb_fbo.c             | 82 +++++++++-----------------
 src/mesa/state_tracker/st_cb_fbo.h             | 23 ++++++--
 8 files changed, 107 insertions(+), 92 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/intel_winsys/intel_blit.c b/src/mesa/drivers/dri/intel_winsys/intel_blit.c
index 48bbbbeac9..aa4135ed2d 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_blit.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_blit.c
@@ -38,6 +38,7 @@
 #include "vblank.h"
 
 #include "pipe/p_context.h"
+#include "state_tracker/st_cb_fbo.h"
 
 
 #define FILE_DEBUG_FLAG DEBUG_BLIT
@@ -106,12 +107,17 @@ intelCopyBuffer(__DRIdrawablePrivate * dPriv,
       const struct pipe_surface *backSurf;
       const struct pipe_region *backRegion;
       int srcpitch;
+      struct st_renderbuffer *strb;
 
       /* blit from back color buffer if it exists, else front buffer */
-      if (intel_fb->Base.Attachment[BUFFER_BACK_LEFT].Renderbuffer)
-         backSurf = intel_fb->Base.Attachment[BUFFER_BACK_LEFT].Renderbuffer->surface;
-      else
-         backSurf = intel_fb->Base.Attachment[BUFFER_FRONT_LEFT].Renderbuffer->surface;
+      strb = st_renderbuffer(intel_fb->Base.Attachment[BUFFER_BACK_LEFT].Renderbuffer);
+      if (strb) {
+         backSurf = strb->surface;
+      }
+      else {
+         strb = st_renderbuffer(intel_fb->Base.Attachment[BUFFER_FRONT_LEFT].Renderbuffer);
+         backSurf = strb->surface;
+      }
 
       backRegion = backSurf->region;
       srcpitch = backRegion->pitch;
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index d70df5d945..0a64e0c58c 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2269,8 +2269,6 @@ struct gl_renderbuffer
    GLubyte StencilBits;
    GLvoid *Data;        /**< This may not be used by some kinds of RBs */
 
-   struct pipe_surface *surface;
-
    /* Used to wrap one renderbuffer around another: */
    struct gl_renderbuffer *Wrapped;
 
diff --git a/src/mesa/main/renderbuffer.c b/src/mesa/main/renderbuffer.c
index d89704196a..e7aeea8e3e 100644
--- a/src/mesa/main/renderbuffer.c
+++ b/src/mesa/main/renderbuffer.c
@@ -1067,9 +1067,11 @@ _mesa_soft_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
       rb->PutMonoValues = put_mono_values_ubyte;
       rb->StencilBits = 8 * sizeof(GLubyte);
       pixelSize = sizeof(GLubyte);
+#if 0
       if (!rb->surface)
          rb->surface = (struct pipe_surface *)
             pipe->surface_alloc(pipe, PIPE_FORMAT_U_S8);
+#endif
       break;
    case GL_STENCIL_INDEX16_EXT:
       rb->_ActualFormat = GL_STENCIL_INDEX16_EXT;
@@ -1100,9 +1102,11 @@ _mesa_soft_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
       rb->PutValues = put_values_ushort;
       rb->PutMonoValues = put_mono_values_ushort;
       rb->DepthBits = 8 * sizeof(GLushort);
+#if 0
       if (!rb->surface)
          rb->surface = (struct pipe_surface *)
             pipe->surface_alloc(pipe, PIPE_FORMAT_U_Z16);
+#endif
       pixelSize = sizeof(GLushort);
       break;
    case GL_DEPTH_COMPONENT24:
@@ -1125,9 +1129,11 @@ _mesa_soft_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
          rb->_ActualFormat = GL_DEPTH_COMPONENT32;
          rb->DepthBits = 32;
       }
+#if 0
       if (!rb->surface)
          rb->surface = (struct pipe_surface *)
             pipe->surface_alloc(pipe, PIPE_FORMAT_U_Z32);
+#endif
       pixelSize = sizeof(GLuint);
       break;
    case GL_DEPTH_STENCIL_EXT:
@@ -1145,9 +1151,11 @@ _mesa_soft_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
       rb->PutMonoValues = put_mono_values_uint;
       rb->DepthBits = 24;
       rb->StencilBits = 8;
+#if 0
       if (!rb->surface)
          rb->surface = (struct pipe_surface *)
             pipe->surface_alloc(pipe, PIPE_FORMAT_S8_Z24);
+#endif
       pixelSize = sizeof(GLuint);
       break;
    case GL_COLOR_INDEX8_EXT:
@@ -1210,7 +1218,7 @@ _mesa_soft_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
    ASSERT(rb->PutMonoValues);
 
    /* free old buffer storage */
-   if (rb->surface) {
+   if (0/**rb->surface**/) {
       /* pipe_surface/region */
    }
    else if (rb->Data) {
@@ -1221,8 +1229,9 @@ _mesa_soft_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
 
    if (width > 0 && height > 0) {
       /* allocate new buffer storage */
-      if (rb->surface) {
+      if (0/**rb->surface**/) {
          /* pipe_surface/region */
+#if 0
          if (rb->surface->region) {
             pipe->region_unmap(pipe, rb->surface->region);
             pipe->region_release(pipe, &rb->surface->region);
@@ -1231,6 +1240,7 @@ _mesa_soft_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
          /* XXX probably don't want to really map here */
          pipe->region_map(pipe, rb->surface->region);
          rb->Data = rb->surface->region->map;
+#endif
       }
       else {
          /* legacy renderbuffer (this will go away) */
diff --git a/src/mesa/pipe/p_state.h b/src/mesa/pipe/p_state.h
index 2dcd2db868..ee29e38a48 100644
--- a/src/mesa/pipe/p_state.h
+++ b/src/mesa/pipe/p_state.h
@@ -260,8 +260,6 @@ struct pipe_surface
    GLuint offset;              /**< offset from start of region, in bytes */
    GLint refcount;
 
-   void *rb;  /**< Ptr back to renderbuffer (temporary?) */
-
    /** get block/tile of pixels from surface */
    void (*get_tile)(struct pipe_surface *ps,
                     GLuint x, GLuint y, GLuint w, GLuint h, GLfloat *p);
diff --git a/src/mesa/state_tracker/st_atom_framebuffer.c b/src/mesa/state_tracker/st_atom_framebuffer.c
index 7edd044ad9..f054eb8f21 100644
--- a/src/mesa/state_tracker/st_atom_framebuffer.c
+++ b/src/mesa/state_tracker/st_atom_framebuffer.c
@@ -33,6 +33,7 @@
  
 #include "st_context.h"
 #include "st_atom.h"
+#include "st_cb_fbo.h"
 #include "pipe/p_context.h"
 
 
@@ -44,7 +45,7 @@ static void
 update_framebuffer_state( struct st_context *st )
 {
    struct pipe_framebuffer_state framebuffer;
-   struct gl_renderbuffer *rb;
+   struct st_renderbuffer *strb;
    GLuint i;
 
    memset(&framebuffer, 0, sizeof(framebuffer));
@@ -54,21 +55,23 @@ update_framebuffer_state( struct st_context *st )
     */
    framebuffer.num_cbufs = st->ctx->DrawBuffer->_NumColorDrawBuffers[0];
    for (i = 0; i < framebuffer.num_cbufs; i++) {
-      rb = st->ctx->DrawBuffer->_ColorDrawBuffers[0][i];
-      assert(rb->surface);
-      framebuffer.cbufs[i] = rb->surface;
+      strb = st_renderbuffer(st->ctx->DrawBuffer->_ColorDrawBuffers[0][i]);
+      assert(strb->surface);
+      framebuffer.cbufs[i] = strb->surface;
    }
 
-   rb = st->ctx->DrawBuffer->_DepthBuffer;
-   if (rb) {
-      assert(rb->Wrapped->surface);
-      framebuffer.zbuf = rb->Wrapped->surface;
+   strb = st_renderbuffer(st->ctx->DrawBuffer->_DepthBuffer);
+   if (strb) {
+      strb = st_renderbuffer(strb->Base.Wrapped);
+      assert(strb->surface);
+      framebuffer.zbuf = strb->surface;
    }
 
-   rb = st->ctx->DrawBuffer->_StencilBuffer;
-   if (rb) {
-      assert(rb->Wrapped->surface);
-      framebuffer.sbuf = rb->Wrapped->surface;
+   strb = st_renderbuffer(st->ctx->DrawBuffer->_StencilBuffer);
+   if (strb) {
+      strb = st_renderbuffer(strb->Base.Wrapped);
+      assert(strb->surface);
+      framebuffer.sbuf = strb->surface;
    }
 
    if (memcmp(&framebuffer, &st->state.framebuffer, sizeof(framebuffer)) != 0) {
diff --git a/src/mesa/state_tracker/st_cb_clear.c b/src/mesa/state_tracker/st_cb_clear.c
index d862f7ba46..4da3a2500d 100644
--- a/src/mesa/state_tracker/st_cb_clear.c
+++ b/src/mesa/state_tracker/st_cb_clear.c
@@ -37,6 +37,7 @@
 #include "st_atom.h"
 #include "st_context.h"
 #include "st_cb_clear.h"
+#include "st_cb_fbo.h"
 #include "st_program.h"
 #include "st_public.h"
 #include "pipe/p_context.h"
@@ -288,6 +289,8 @@ clear_with_quad(GLcontext *ctx, GLuint x0, GLuint y0,
 static void
 clear_color_buffer(GLcontext *ctx, struct gl_renderbuffer *rb)
 {
+   struct st_renderbuffer *strb = st_renderbuffer(rb);
+
    if (ctx->Color.ColorMask[0] &&
        ctx->Color.ColorMask[1] &&
        ctx->Color.ColorMask[2] &&
@@ -296,8 +299,8 @@ clear_color_buffer(GLcontext *ctx, struct gl_renderbuffer *rb)
    {
       /* clear whole buffer w/out masking */
       GLuint clearValue
-         = color_value(rb->surface->format, ctx->Color.ClearColor);
-      ctx->st->pipe->clear(ctx->st->pipe, rb->surface, clearValue);
+         = color_value(strb->surface->format, ctx->Color.ClearColor);
+      ctx->st->pipe->clear(ctx->st->pipe, strb->surface, clearValue);
    }
    else {
       /* masking or scissoring */
@@ -314,14 +317,16 @@ clear_color_buffer(GLcontext *ctx, struct gl_renderbuffer *rb)
 static void
 clear_accum_buffer(GLcontext *ctx, struct gl_renderbuffer *rb)
 {
+   struct st_renderbuffer *strb = st_renderbuffer(rb);
+
    if (!ctx->Scissor.Enabled) {
       /* clear whole buffer w/out masking */
       GLuint clearValue
-         = color_value(rb->surface->format, ctx->Accum.ClearColor);
+         = color_value(strb->surface->format, ctx->Accum.ClearColor);
       /* Note that clearValue is 32 bits but the accum buffer will
        * typically be 64bpp...
        */
-      ctx->st->pipe->clear(ctx->st->pipe, rb->surface, clearValue);
+      ctx->st->pipe->clear(ctx->st->pipe, strb->surface, clearValue);
    }
    else {
       /* scissoring */
@@ -339,11 +344,13 @@ clear_accum_buffer(GLcontext *ctx, struct gl_renderbuffer *rb)
 static void
 clear_depth_buffer(GLcontext *ctx, struct gl_renderbuffer *rb)
 {
+   struct st_renderbuffer *strb = st_renderbuffer(rb);
+
    if (!ctx->Scissor.Enabled &&
-       !is_depth_stencil_format(rb->surface->format)) {
+       !is_depth_stencil_format(strb->surface->format)) {
       /* clear whole depth buffer w/out masking */
-      GLuint clearValue = depth_value(rb->surface->format, ctx->Depth.Clear);
-      ctx->st->pipe->clear(ctx->st->pipe, rb->surface, clearValue);
+      GLuint clearValue = depth_value(strb->surface->format, ctx->Depth.Clear);
+      ctx->st->pipe->clear(ctx->st->pipe, strb->surface, clearValue);
    }
    else {
       /* masking or scissoring or combined z/stencil buffer */
@@ -360,14 +367,15 @@ clear_depth_buffer(GLcontext *ctx, struct gl_renderbuffer *rb)
 static void
 clear_stencil_buffer(GLcontext *ctx, struct gl_renderbuffer *rb)
 {
+   struct st_renderbuffer *strb = st_renderbuffer(rb);
    const GLuint stencilMax = (1 << rb->StencilBits) - 1;
    GLboolean maskStencil = ctx->Stencil.WriteMask[0] != stencilMax;
 
    if (!maskStencil && !ctx->Scissor.Enabled &&
-       !is_depth_stencil_format(rb->surface->format)) {
+       !is_depth_stencil_format(strb->surface->format)) {
       /* clear whole stencil buffer w/out masking */
       GLuint clearValue = ctx->Stencil.Clear;
-      ctx->st->pipe->clear(ctx->st->pipe, rb->surface, clearValue);
+      ctx->st->pipe->clear(ctx->st->pipe, strb->surface, clearValue);
    }
    else {
       /* masking or scissoring */
@@ -384,16 +392,17 @@ clear_stencil_buffer(GLcontext *ctx, struct gl_renderbuffer *rb)
 static void
 clear_depth_stencil_buffer(GLcontext *ctx, struct gl_renderbuffer *rb)
 {
+   struct st_renderbuffer *strb = st_renderbuffer(rb);
    const GLuint stencilMax = 1 << rb->StencilBits;
    GLboolean maskStencil = ctx->Stencil.WriteMask[0] != stencilMax;
 
-   assert(is_depth_stencil_format(rb->surface->format));
+   assert(is_depth_stencil_format(strb->surface->format));
 
    if (!maskStencil && !ctx->Scissor.Enabled) {
       /* clear whole buffer w/out masking */
-      GLuint clearValue = depth_value(rb->surface->format, ctx->Depth.Clear);
+      GLuint clearValue = depth_value(strb->surface->format, ctx->Depth.Clear);
 
-      switch (rb->surface->format) {
+      switch (strb->surface->format) {
       case PIPE_FORMAT_S8_Z24:
          clearValue |= ctx->Stencil.Clear << 24;
          break;
@@ -406,7 +415,7 @@ clear_depth_stencil_buffer(GLcontext *ctx, struct gl_renderbuffer *rb)
          assert(0);
       }  
 
-      ctx->st->pipe->clear(ctx->st->pipe, rb->surface, clearValue);
+      ctx->st->pipe->clear(ctx->st->pipe, strb->surface, clearValue);
    }
    else {
       /* masking or scissoring */
diff --git a/src/mesa/state_tracker/st_cb_fbo.c b/src/mesa/state_tracker/st_cb_fbo.c
index 3cd1fbe851..02bdb5aba5 100644
--- a/src/mesa/state_tracker/st_cb_fbo.c
+++ b/src/mesa/state_tracker/st_cb_fbo.c
@@ -46,29 +46,6 @@
 #include "st_cb_teximage.h"
 
 
-/**
- * Derived renderbuffer class.  Just need to add a pointer to the
- * pipe surface.
- */
-struct st_renderbuffer
-{
-   struct gl_renderbuffer Base;
-#if 0
-   struct pipe_surface *surface;
-#endif
-};
-
-
-/**
- * Cast wrapper.
- */
-static INLINE struct st_renderbuffer *
-st_renderbuffer(struct gl_renderbuffer *rb)
-{
-   return (struct st_renderbuffer *) rb;
-}
-
-
 struct pipe_format_info
 {
    GLuint format;
@@ -168,29 +145,29 @@ st_renderbuffer_alloc_storage(GLcontext * ctx, struct gl_renderbuffer *rb,
 
    cpp = info->size;
 
-   if (!strb->Base.surface) {
-      strb->Base.surface = pipe->surface_alloc(pipe, pipeFormat);
-      if (!strb->Base.surface)
+   if (!strb->surface) {
+      strb->surface = pipe->surface_alloc(pipe, pipeFormat);
+      if (!strb->surface)
          return GL_FALSE;
    }
 
    /* free old region */
-   if (strb->Base.surface->region) {
-      pipe->region_release(pipe, &strb->Base.surface->region);
+   if (strb->surface->region) {
+      pipe->region_release(pipe, &strb->surface->region);
    }
 
    /* Choose a pitch to match hardware requirements:
     */
    pitch = ((cpp * width + 63) & ~63) / cpp; /* XXX fix: device-specific */
 
-   strb->Base.surface->region = pipe->region_alloc(pipe, cpp, pitch, height);
-   if (!strb->Base.surface->region)
+   strb->surface->region = pipe->region_alloc(pipe, cpp, pitch, height);
+   if (!strb->surface->region)
       return GL_FALSE; /* out of memory, try s/w buffer? */
 
-   ASSERT(strb->Base.surface->region->buffer);
+   ASSERT(strb->surface->region->buffer);
 
-   strb->Base.Width  = strb->Base.surface->width  = width;
-   strb->Base.Height = strb->Base.surface->height = height;
+   strb->Base.Width  = strb->surface->width  = width;
+   strb->Base.Height = strb->surface->height = height;
 
    return GL_TRUE;
 }
@@ -206,11 +183,11 @@ st_renderbuffer_delete(struct gl_renderbuffer *rb)
    struct pipe_context *pipe = ctx->st->pipe;
    struct st_renderbuffer *strb = st_renderbuffer(rb);
    ASSERT(strb);
-   if (strb && strb->Base.surface) {
-      if (rb->surface->region) {
-         pipe->region_release(pipe, &strb->Base.surface->region);
+   if (strb && strb->surface) {
+      if (strb->surface->region) {
+         pipe->region_release(pipe, &strb->surface->region);
       }
-      free(strb->Base.surface);
+      free(strb->surface);
    }
    free(strb);
 }
@@ -285,28 +262,28 @@ st_new_renderbuffer_fb(struct pipe_region *region, GLuint width, GLuint height)
 struct gl_renderbuffer *
 st_new_renderbuffer_fb(GLuint intFormat)
 {
-   struct st_renderbuffer *irb;
+   struct st_renderbuffer *strb;
 
-   irb = CALLOC_STRUCT(st_renderbuffer);
-   if (!irb) {
+   strb = CALLOC_STRUCT(st_renderbuffer);
+   if (!strb) {
       _mesa_error(NULL, GL_OUT_OF_MEMORY, "creating renderbuffer");
       return NULL;
    }
 
-   _mesa_init_renderbuffer(&irb->Base, 0);
-   irb->Base.ClassID = 0x42; /* XXX temp */
-   irb->Base.InternalFormat = intFormat;
+   _mesa_init_renderbuffer(&strb->Base, 0);
+   strb->Base.ClassID = 0x42; /* XXX temp */
+   strb->Base.InternalFormat = intFormat;
 
    switch (intFormat) {
    case GL_RGB5:
    case GL_RGBA8:
-      irb->Base._BaseFormat = GL_RGBA;
+      strb->Base._BaseFormat = GL_RGBA;
       break;
    case GL_DEPTH_COMPONENT16:
-      irb->Base._BaseFormat = GL_DEPTH_COMPONENT;
+      strb->Base._BaseFormat = GL_DEPTH_COMPONENT;
       break;
    case GL_DEPTH24_STENCIL8_EXT:
-      irb->Base._BaseFormat = GL_DEPTH_STENCIL_EXT;
+      strb->Base._BaseFormat = GL_DEPTH_STENCIL_EXT;
       break;
    default:
       _mesa_problem(NULL,
@@ -315,15 +292,14 @@ st_new_renderbuffer_fb(GLuint intFormat)
    }
 
    /* st-specific methods */
-   irb->Base.Delete = st_renderbuffer_delete;
-   irb->Base.AllocStorage = st_renderbuffer_alloc_storage;
-   irb->Base.GetPointer = null_get_pointer;
-   /* span routines set in alloc_storage function */
+   strb->Base.Delete = st_renderbuffer_delete;
+   strb->Base.AllocStorage = st_renderbuffer_alloc_storage;
+   strb->Base.GetPointer = null_get_pointer;
 
-   irb->Base.surface = NULL;/*intel_new_surface(intFormat);*/
-   /*irb->Base.surface->rb = irb;*/
+   /* surface is allocate in alloc_renderbuffer_storage() */
+   strb->surface = NULL;
 
-   return &irb->Base;
+   return &strb->Base;
 }
 #endif
 
diff --git a/src/mesa/state_tracker/st_cb_fbo.h b/src/mesa/state_tracker/st_cb_fbo.h
index 7f52ab10d7..b2e7ba810c 100644
--- a/src/mesa/state_tracker/st_cb_fbo.h
+++ b/src/mesa/state_tracker/st_cb_fbo.h
@@ -30,10 +30,25 @@
 #define ST_CB_FBO_H
 
 
-/*
-extern struct gl_renderbuffer *
-st_new_renderbuffer_fb(struct pipe_region *region, GLuint width, GLuint height);
-*/
+
+/**
+ * Derived renderbuffer class.  Just need to add a pointer to the
+ * pipe surface.
+ */
+struct st_renderbuffer
+{
+   struct gl_renderbuffer Base;
+   struct pipe_surface *surface;
+};
+
+
+static INLINE struct st_renderbuffer *
+st_renderbuffer(struct gl_renderbuffer *rb)
+{
+   return (struct st_renderbuffer *) rb;
+}
+
+
 extern struct gl_renderbuffer *
 st_new_renderbuffer_fb(GLuint intFormat);
 
-- 
cgit v1.2.3


From 938c307e4526298d2703818d5fa848a31b076905 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Fri, 10 Aug 2007 10:02:34 +0100
Subject: Add printf handlers, pass pci id and move texlayout code to driver.

---
 src/mesa/drivers/dri/intel_winsys/Makefile         |   1 -
 src/mesa/drivers/dri/intel_winsys/intel_context.c  |  26 +-
 .../dri/intel_winsys/intel_pipe_i915simple.c       |  17 +-
 .../drivers/dri/intel_winsys/intel_pipe_softpipe.c |  14 +-
 .../drivers/dri/intel_winsys/intel_tex_layout.c    | 476 ---------------------
 .../drivers/dri/intel_winsys/intel_tex_layout.h    |  16 -
 src/mesa/main/imports.c                            |   4 +-
 src/mesa/pipe/i915simple/Makefile                  |   1 +
 src/mesa/pipe/i915simple/i915_context.c            |   7 +
 9 files changed, 37 insertions(+), 525 deletions(-)
 delete mode 100644 src/mesa/drivers/dri/intel_winsys/intel_tex_layout.c
 delete mode 100644 src/mesa/drivers/dri/intel_winsys/intel_tex_layout.h

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/intel_winsys/Makefile b/src/mesa/drivers/dri/intel_winsys/Makefile
index da971aca83..ae08afccb3 100644
--- a/src/mesa/drivers/dri/intel_winsys/Makefile
+++ b/src/mesa/drivers/dri/intel_winsys/Makefile
@@ -14,7 +14,6 @@ DRIVER_SOURCES = \
 	intel_pipe_i915simple.c \
 	intel_pipe_softpipe.c \
 	intel_batchbuffer.c \
-	intel_tex_layout.c \
 	intel_buffers.c \
 	intel_blit.c \
 	intel_context.c \
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_context.c b/src/mesa/drivers/dri/intel_winsys/intel_context.c
index 8c61f0cf3c..b88c785fb6 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_context.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_context.c
@@ -243,6 +243,8 @@ intelFlush(GLcontext * ctx)
 {
    struct intel_context *intel = intel_context(ctx);
 
+   /* Hmm:
+    */
    intel->pipe->flush( intel->pipe, 0 );
 }
 
@@ -421,8 +423,6 @@ intelCreateContext(const __GLcontextModes * mesaVis,
     */
    if (!getenv("INTEL_HW")) {
       intel->pipe = intel_create_softpipe( intel );
-      /* use default softpipe function for surface_alloc() */
-      intel->pipe->supported_formats = intel_supported_formats;
    }
    else {
       switch (intel->intelScreen->deviceID) {
@@ -447,28 +447,6 @@ intelCreateContext(const __GLcontextModes * mesaVis,
 
    st_create_context( &intel->ctx, intel->pipe ); 
 
-
-   /* TODO: Push this down into the pipe driver:
-    */
-   switch (intel->intelScreen->deviceID) {
-   case PCI_CHIP_I945_G:
-   case PCI_CHIP_I945_GM:
-   case PCI_CHIP_I945_GME:
-   case PCI_CHIP_G33_G:
-   case PCI_CHIP_Q33_G:
-   case PCI_CHIP_Q35_G:
-      intel->pipe->mipmap_tree_layout = i945_miptree_layout;
-      break;
-   case PCI_CHIP_I915_G:
-   case PCI_CHIP_I915_GM:
-   case PCI_CHIP_I830_M:
-   case PCI_CHIP_I855_GM:
-   case PCI_CHIP_I865_G:
-      intel->pipe->mipmap_tree_layout = i915_miptree_layout;
-   default:
-      assert(0); /*FIX*/
-   }
-
    return GL_TRUE;
 }
 
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_pipe_i915simple.c b/src/mesa/drivers/dri/intel_winsys/intel_pipe_i915simple.c
index 98d446ba90..c0e8c2349c 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_pipe_i915simple.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_pipe_i915simple.c
@@ -227,10 +227,18 @@ static void intel_i915_batch_flush( struct i915_winsys *sws )
 {
    struct intel_context *intel = intel_i915_winsys(sws)->intel;
 
-   _mesa_printf("%s: start\n");
    intel_batchbuffer_flush( intel->batch );
-   intel_i915_batch_wait_idle( sws );
-   _mesa_printf("%s: done\n");
+   if (0) intel_i915_batch_wait_idle( sws );
+}
+
+
+static void intel_i915_printf( struct i915_winsys *sws,
+			       const char *fmtString, ... )
+{
+   va_list args;
+   va_start( args, fmtString );  
+   vfprintf(stderr, fmtString, args);
+   va_end( args );
 }
 
 
@@ -242,6 +250,7 @@ intel_create_i915simple( struct intel_context *intel )
    /* Fill in this struct with callbacks that i915simple will need to
     * communicate with the window system, buffer manager, etc. 
     */
+   iws->winsys.printf = intel_i915_printf;
    iws->winsys.buffer_create = intel_i915_buffer_create;
    iws->winsys.buffer_map = intel_i915_buffer_map;
    iws->winsys.buffer_unmap = intel_i915_buffer_unmap;
@@ -259,5 +268,5 @@ intel_create_i915simple( struct intel_context *intel )
 
    /* Create the i915simple context:
     */
-   return i915_create( &iws->winsys );
+   return i915_create( &iws->winsys, intel->intelScreen->deviceID );
 }
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_pipe_softpipe.c b/src/mesa/drivers/dri/intel_winsys/intel_pipe_softpipe.c
index 5edbca1098..fdd7acf747 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_pipe_softpipe.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_pipe_softpipe.c
@@ -36,9 +36,14 @@
 
 #include "intel_context.h"
 #include "intel_pipe.h"
+#include "intel_surface.h"
 
 #include "pipe/softpipe/sp_winsys.h"
 
+/* Shouldn't really need this:
+ */
+#include "pipe/p_context.h"
+
 
 struct intel_softpipe_winsys {
    struct softpipe_winsys sws;
@@ -157,6 +162,7 @@ struct pipe_context *
 intel_create_softpipe( struct intel_context *intel )
 {
    struct intel_softpipe_winsys *isws = CALLOC_STRUCT( intel_softpipe_winsys );
+   struct pipe_context *pipe;
    
    /* Fill in this struct with callbacks that softpipe will need to
     * communicate with the window system, buffer manager, etc. 
@@ -177,5 +183,11 @@ intel_create_softpipe( struct intel_context *intel )
 
    /* Create the softpipe context:
     */
-   return softpipe_create( &isws->sws );
+   pipe = softpipe_create( &isws->sws );
+
+   /* XXX: This should probably be a parameter to softpipe_create()
+    */
+   pipe->supported_formats = intel_supported_formats;
+
+   return pipe;
 }
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_tex_layout.c b/src/mesa/drivers/dri/intel_winsys/intel_tex_layout.c
deleted file mode 100644
index 882d9e04a2..0000000000
--- a/src/mesa/drivers/dri/intel_winsys/intel_tex_layout.c
+++ /dev/null
@@ -1,476 +0,0 @@
-/**************************************************************************
- * 
- * Copyright 2006 Tungsten Graphics, Inc., Cedar Park, Texas.
- * 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, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- * 
- **************************************************************************/
- /*
-  * Authors:
-  *   Keith Whitwell <keith@tungstengraphics.com>
-  *   Michel Dänzer <michel@tungstengraphics.com>
-  */
-
-#include "macros.h"
-#include "pipe/p_state.h"
-#include "pipe/p_context.h"
-#include "intel_tex_layout.h"
-#include "state_tracker/st_mipmap_tree.h"
-
-
-static GLuint minify( GLuint d )
-{
-   return MAX2(1, d>>1);
-}
-
-static int align(int value, int alignment)
-{
-   return (value + alignment - 1) & ~(alignment - 1);
-}
-
-
-static void
-intel_miptree_set_level_info(struct pipe_mipmap_tree *mt,
-                             GLuint level,
-                             GLuint nr_images,
-                             GLuint x, GLuint y, GLuint w, GLuint h, GLuint d)
-{
-   assert(level < MAX_TEXTURE_LEVELS);
-
-   mt->level[level].width = w;
-   mt->level[level].height = h;
-   mt->level[level].depth = d;
-   mt->level[level].level_offset = (x + y * mt->pitch) * mt->cpp;
-   mt->level[level].nr_images = nr_images;
-
-   /*
-   DBG("%s level %d size: %d,%d,%d offset %d,%d (0x%x)\n", __FUNCTION__,
-       level, w, h, d, x, y, mt->level[level].level_offset);
-   */
-
-   /* Not sure when this would happen, but anyway: 
-    */
-   if (mt->level[level].image_offset) {
-      free(mt->level[level].image_offset);
-      mt->level[level].image_offset = NULL;
-   }
-
-   assert(nr_images);
-   assert(!mt->level[level].image_offset);
-
-   mt->level[level].image_offset = (GLuint *) malloc(nr_images * sizeof(GLuint));
-   mt->level[level].image_offset[0] = 0;
-}
-
-
-static void
-intel_miptree_set_image_offset(struct pipe_mipmap_tree *mt,
-                               GLuint level, GLuint img, GLuint x, GLuint y)
-{
-   if (img == 0 && level == 0)
-      assert(x == 0 && y == 0);
-
-   assert(img < mt->level[level].nr_images);
-
-   mt->level[level].image_offset[img] = (x + y * mt->pitch);
-
-   /*
-   DBG("%s level %d img %d pos %d,%d image_offset %x\n",
-       __FUNCTION__, level, img, x, y, mt->level[level].image_offset[img]);
-   */
-}
-
-
-static void
-i945_miptree_layout_2d( struct pipe_mipmap_tree *mt )
-{
-   GLint align_h = 2, align_w = 4;
-   GLuint level;
-   GLuint x = 0;
-   GLuint y = 0;
-   GLuint width = mt->width0;
-   GLuint height = mt->height0;
-
-   mt->pitch = mt->width0;
-
-   /* May need to adjust pitch to accomodate the placement of
-    * the 2nd mipmap.  This occurs when the alignment
-    * constraints of mipmap placement push the right edge of the
-    * 2nd mipmap out past the width of its parent.
-    */
-   if (mt->first_level != mt->last_level) {
-      GLuint mip1_width = align(minify(mt->width0), align_w)
-			+ minify(minify(mt->width0));
-
-      if (mip1_width > mt->width0)
-	 mt->pitch = mip1_width;
-   }
-
-   /* Pitch must be a whole number of dwords, even though we
-    * express it in texels.
-    */
-   mt->pitch = align(mt->pitch * mt->cpp, 4) / mt->cpp;
-   mt->total_height = 0;
-
-   for ( level = mt->first_level ; level <= mt->last_level ; level++ ) {
-      GLuint img_height;
-
-      intel_miptree_set_level_info(mt, level, 1, x, y, width, height, 1);
-
-      if (mt->compressed)
-	 img_height = MAX2(1, height/4);
-      else
-	 img_height = align(height, align_h);
-
-
-      /* Because the images are packed better, the final offset
-       * might not be the maximal one:
-       */
-      mt->total_height = MAX2(mt->total_height, y + img_height);
-
-      /* Layout_below: step right after second mipmap.
-       */
-      if (level == mt->first_level + 1) {
-	 x += align(width, align_w);
-      }
-      else {
-	 y += img_height;
-      }
-
-      width  = minify(width);
-      height = minify(height);
-   }
-}
-
-
-static const GLint initial_offsets[6][2] = {
-   {0, 0},
-   {0, 2},
-   {1, 0},
-   {1, 2},
-   {1, 1},
-   {1, 3}
-};
-
-static const GLint step_offsets[6][2] = {
-   {0, 2},
-   {0, 2},
-   {-1, 2},
-   {-1, 2},
-   {-1, 1},
-   {-1, 1}
-};
-
-
-GLboolean
-i915_miptree_layout(struct pipe_context *pipe, struct pipe_mipmap_tree * mt)
-{
-   GLint level;
-
-   switch (mt->target) {
-   case GL_TEXTURE_CUBE_MAP:{
-         const GLuint dim = mt->width0;
-         GLuint face;
-         GLuint lvlWidth = mt->width0, lvlHeight = mt->height0;
-
-         assert(lvlWidth == lvlHeight); /* cubemap images are square */
-
-         /* double pitch for cube layouts */
-         mt->pitch = ((dim * mt->cpp * 2 + 3) & ~3) / mt->cpp;
-         mt->total_height = dim * 4;
-
-         for (level = mt->first_level; level <= mt->last_level; level++) {
-            intel_miptree_set_level_info(mt, level, 6,
-                                         0, 0,
-                                         /*OLD: mt->pitch, mt->total_height,*/
-                                         lvlWidth, lvlHeight,
-                                         1);
-            lvlWidth /= 2;
-            lvlHeight /= 2;
-         }
-
-         for (face = 0; face < 6; face++) {
-            GLuint x = initial_offsets[face][0] * dim;
-            GLuint y = initial_offsets[face][1] * dim;
-            GLuint d = dim;
-
-            for (level = mt->first_level; level <= mt->last_level; level++) {
-               intel_miptree_set_image_offset(mt, level, face, x, y);
-
-               if (d == 0)
-                  _mesa_printf("cube mipmap %d/%d (%d..%d) is 0x0\n",
-                               face, level, mt->first_level, mt->last_level);
-
-               d >>= 1;
-               x += step_offsets[face][0] * d;
-               y += step_offsets[face][1] * d;
-            }
-         }
-         break;
-      }
-   case GL_TEXTURE_3D:{
-         GLuint width = mt->width0;
-         GLuint height = mt->height0;
-         GLuint depth = mt->depth0;
-         GLuint stack_height = 0;
-
-         /* Calculate the size of a single slice. 
-          */
-         mt->pitch = ((mt->width0 * mt->cpp + 3) & ~3) / mt->cpp;
-
-         /* XXX: hardware expects/requires 9 levels at minimum.
-          */
-         for (level = mt->first_level; level <= MAX2(8, mt->last_level);
-              level++) {
-            intel_miptree_set_level_info(mt, level, depth, 0, mt->total_height,
-                                         width, height, depth);
-
-
-            stack_height += MAX2(2, height);
-
-            width = minify(width);
-            height = minify(height);
-            depth = minify(depth);
-         }
-
-         /* Fixup depth image_offsets: 
-          */
-         depth = mt->depth0;
-         for (level = mt->first_level; level <= mt->last_level; level++) {
-            GLuint i;
-            for (i = 0; i < depth; i++) 
-               intel_miptree_set_image_offset(mt, level, i,
-                                              0, i * stack_height);
-
-            depth = minify(depth);
-         }
-
-
-         /* Multiply slice size by texture depth for total size.  It's
-          * remarkable how wasteful of memory the i915 texture layouts
-          * are.  They are largely fixed in the i945.
-          */
-         mt->total_height = stack_height * mt->depth0;
-         break;
-      }
-
-   default:{
-         GLuint width = mt->width0;
-         GLuint height = mt->height0;
-	 GLuint img_height;
-
-         mt->pitch = ((mt->width0 * mt->cpp + 3) & ~3) / mt->cpp;
-         mt->total_height = 0;
-
-         for (level = mt->first_level; level <= mt->last_level; level++) {
-            intel_miptree_set_level_info(mt, level, 1,
-                                         0, mt->total_height,
-                                         width, height, 1);
-
-            if (mt->compressed)
-               img_height = MAX2(1, height / 4);
-            else
-               img_height = (MAX2(2, height) + 1) & ~1;
-
-	    mt->total_height += img_height;
-
-            width = minify(width);
-            height = minify(height);
-         }
-         break;
-      }
-   }
-   /*
-   DBG("%s: %dx%dx%d - sz 0x%x\n", __FUNCTION__,
-       mt->pitch,
-       mt->total_height, mt->cpp, mt->pitch * mt->total_height * mt->cpp);
-   */
-
-   return GL_TRUE;
-}
-
-
-GLboolean
-i945_miptree_layout(struct pipe_context *pipe, struct pipe_mipmap_tree * mt)
-{
-   GLint level;
-
-   switch (mt->target) {
-   case GL_TEXTURE_CUBE_MAP:{
-         const GLuint dim = mt->width0;
-         GLuint face;
-         GLuint lvlWidth = mt->width0, lvlHeight = mt->height0;
-
-         assert(lvlWidth == lvlHeight); /* cubemap images are square */
-
-         /* Depending on the size of the largest images, pitch can be
-          * determined either by the old-style packing of cubemap faces,
-          * or the final row of 4x4, 2x2 and 1x1 faces below this. 
-          */
-         if (dim > 32)
-            mt->pitch = ((dim * mt->cpp * 2 + 3) & ~3) / mt->cpp;
-         else
-            mt->pitch = 14 * 8;
-
-         mt->total_height = dim * 4 + 4;
-
-         /* Set all the levels to effectively occupy the whole rectangular region. 
-          */
-         for (level = mt->first_level; level <= mt->last_level; level++) {
-            intel_miptree_set_level_info(mt, level, 6,
-                                         0, 0,
-                                         lvlWidth, lvlHeight, 1);
-	    lvlWidth /= 2;
-	    lvlHeight /= 2;
-	 }
-
-
-         for (face = 0; face < 6; face++) {
-            GLuint x = initial_offsets[face][0] * dim;
-            GLuint y = initial_offsets[face][1] * dim;
-            GLuint d = dim;
-
-            if (dim == 4 && face >= 4) {
-               y = mt->total_height - 4;
-               x = (face - 4) * 8;
-            }
-            else if (dim < 4 && (face > 0 || mt->first_level > 0)) {
-               y = mt->total_height - 4;
-               x = face * 8;
-            }
-
-            for (level = mt->first_level; level <= mt->last_level; level++) {
-               intel_miptree_set_image_offset(mt, level, face, x, y);
-
-               d >>= 1;
-
-               switch (d) {
-               case 4:
-                  switch (face) {
-                  case FACE_POS_X:
-                  case FACE_NEG_X:
-                     x += step_offsets[face][0] * d;
-                     y += step_offsets[face][1] * d;
-                     break;
-                  case FACE_POS_Y:
-                  case FACE_NEG_Y:
-                     y += 12;
-                     x -= 8;
-                     break;
-                  case FACE_POS_Z:
-                  case FACE_NEG_Z:
-                     y = mt->total_height - 4;
-                     x = (face - 4) * 8;
-                     break;
-                  }
-
-               case 2:
-                  y = mt->total_height - 4;
-                  x = 16 + face * 8;
-                  break;
-
-               case 1:
-                  x += 48;
-                  break;
-
-               default:
-                  x += step_offsets[face][0] * d;
-                  y += step_offsets[face][1] * d;
-                  break;
-               }
-            }
-         }
-         break;
-      }
-   case GL_TEXTURE_3D:{
-         GLuint width = mt->width0;
-         GLuint height = mt->height0;
-         GLuint depth = mt->depth0;
-         GLuint pack_x_pitch, pack_x_nr;
-         GLuint pack_y_pitch;
-         GLuint level;
-
-         mt->pitch = ((mt->width0 * mt->cpp + 3) & ~3) / mt->cpp;
-         mt->total_height = 0;
-
-         pack_y_pitch = MAX2(mt->height0, 2);
-         pack_x_pitch = mt->pitch;
-         pack_x_nr = 1;
-
-         for (level = mt->first_level; level <= mt->last_level; level++) {
-            GLuint nr_images = mt->target == GL_TEXTURE_3D ? depth : 6;
-            GLint x = 0;
-            GLint y = 0;
-            GLint q, j;
-
-            intel_miptree_set_level_info(mt, level, nr_images,
-                                         0, mt->total_height,
-                                         width, height, depth);
-
-            for (q = 0; q < nr_images;) {
-               for (j = 0; j < pack_x_nr && q < nr_images; j++, q++) {
-                  intel_miptree_set_image_offset(mt, level, q, x, y);
-                  x += pack_x_pitch;
-               }
-
-               x = 0;
-               y += pack_y_pitch;
-            }
-
-
-            mt->total_height += y;
-
-            if (pack_x_pitch > 4) {
-               pack_x_pitch >>= 1;
-               pack_x_nr <<= 1;
-               assert(pack_x_pitch * pack_x_nr <= mt->pitch);
-            }
-
-            if (pack_y_pitch > 2) {
-               pack_y_pitch >>= 1;
-            }
-
-            width = minify(width);
-            height = minify(height);
-            depth = minify(depth);
-         }
-         break;
-      }
-
-   case GL_TEXTURE_1D:
-   case GL_TEXTURE_2D:
-   case GL_TEXTURE_RECTANGLE_ARB:
-         i945_miptree_layout_2d(mt);
-         break;
-   default:
-      _mesa_problem(NULL, "Unexpected tex target in i945_miptree_layout()");
-   }
-
-   /*
-   DBG("%s: %dx%dx%d - sz 0x%x\n", __FUNCTION__,
-       mt->pitch,
-       mt->total_height, mt->cpp, mt->pitch * mt->total_height * mt->cpp);
-   */
-
-   return GL_TRUE;
-}
-
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_tex_layout.h b/src/mesa/drivers/dri/intel_winsys/intel_tex_layout.h
deleted file mode 100644
index 83913b89cb..0000000000
--- a/src/mesa/drivers/dri/intel_winsys/intel_tex_layout.h
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#ifndef INTEL_TEX_LAYOUT_H
-#define INTEL_TEX_LAYOUT_H
-
-struct pipe_context;
-struct pipe_mipmap_tree;
-
-
-extern GLboolean
-i915_miptree_layout(struct pipe_context *, struct pipe_mipmap_tree *);
-
-extern GLboolean
-i945_miptree_layout(struct pipe_context *, struct pipe_mipmap_tree *);
-
-
-#endif /* INTEL_TEX_LAYOUT_H */
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 3ae56c8b0b..d8d35af15e 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -902,12 +902,10 @@ _mesa_sprintf( char *str, const char *fmt, ... )
 void
 _mesa_printf( const char *fmtString, ... )
 {
-   char s[MAXSTRING];
    va_list args;
    va_start( args, fmtString );  
-   vsnprintf(s, MAXSTRING, fmtString, args);
+   vfprintf(stderr, fmtString, args);
    va_end( args );
-   fprintf(stderr,"%s", s);
 }
 
 /** Wrapper around vsprintf() */
diff --git a/src/mesa/pipe/i915simple/Makefile b/src/mesa/pipe/i915simple/Makefile
index 96e16a948f..5b919e3bed 100644
--- a/src/mesa/pipe/i915simple/Makefile
+++ b/src/mesa/pipe/i915simple/Makefile
@@ -21,6 +21,7 @@ DRIVER_SOURCES = \
 	i915_state_emit.c \
 	i915_state_fragprog.c \
 	i915_prim_emit.c \
+	i915_tex_layout.c \
 	i915_surface.c 
 
 C_SOURCES = \
diff --git a/src/mesa/pipe/i915simple/i915_context.c b/src/mesa/pipe/i915simple/i915_context.c
index a15d3505d7..d8e54f02ee 100644
--- a/src/mesa/pipe/i915simple/i915_context.c
+++ b/src/mesa/pipe/i915simple/i915_context.c
@@ -29,6 +29,7 @@
 #include "i915_context.h"
 #include "i915_winsys.h"
 #include "i915_state.h"
+#include "i915_tex_layout.h"
 
 #include "pipe/draw/draw_context.h"
 #include "pipe/p_defines.h"
@@ -207,6 +208,12 @@ struct pipe_context *i915_create( struct i915_winsys *winsys,
    i915_init_flush_functions(i915);
 
 
+   if (i915->flags.is_i945)
+      i915->pipe.mipmap_tree_layout = i945_miptree_layout;
+   else
+      i915->pipe.mipmap_tree_layout = i945_miptree_layout;
+
+
    i915->dirty = ~0;
    i915->hardware_dirty = ~0;
 
-- 
cgit v1.2.3


From 6349bd3112116841326885550188224af87ec15c Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Fri, 10 Aug 2007 11:16:53 -0600
Subject: remove some temporary hacks

---
 src/mesa/main/renderbuffer.c | 50 +++-----------------------------------------
 1 file changed, 3 insertions(+), 47 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/renderbuffer.c b/src/mesa/main/renderbuffer.c
index e7aeea8e3e..d576a7a121 100644
--- a/src/mesa/main/renderbuffer.c
+++ b/src/mesa/main/renderbuffer.c
@@ -49,9 +49,6 @@
 
 #include "rbadaptors.h"
 
-#include "pipe/p_state.h"
-#include "pipe/p_context.h"
-#include "pipe/p_defines.h"
 #include "state_tracker/st_context.h"
 
 
@@ -950,7 +947,6 @@ _mesa_soft_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
                                 GLenum internalFormat,
                                 GLuint width, GLuint height)
 {
-   struct pipe_context *pipe = ctx->st->pipe;
    GLuint pixelSize;
 
    /* first clear these fields */
@@ -1067,11 +1063,6 @@ _mesa_soft_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
       rb->PutMonoValues = put_mono_values_ubyte;
       rb->StencilBits = 8 * sizeof(GLubyte);
       pixelSize = sizeof(GLubyte);
-#if 0
-      if (!rb->surface)
-         rb->surface = (struct pipe_surface *)
-            pipe->surface_alloc(pipe, PIPE_FORMAT_U_S8);
-#endif
       break;
    case GL_STENCIL_INDEX16_EXT:
       rb->_ActualFormat = GL_STENCIL_INDEX16_EXT;
@@ -1102,11 +1093,6 @@ _mesa_soft_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
       rb->PutValues = put_values_ushort;
       rb->PutMonoValues = put_mono_values_ushort;
       rb->DepthBits = 8 * sizeof(GLushort);
-#if 0
-      if (!rb->surface)
-         rb->surface = (struct pipe_surface *)
-            pipe->surface_alloc(pipe, PIPE_FORMAT_U_Z16);
-#endif
       pixelSize = sizeof(GLushort);
       break;
    case GL_DEPTH_COMPONENT24:
@@ -1129,11 +1115,6 @@ _mesa_soft_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
          rb->_ActualFormat = GL_DEPTH_COMPONENT32;
          rb->DepthBits = 32;
       }
-#if 0
-      if (!rb->surface)
-         rb->surface = (struct pipe_surface *)
-            pipe->surface_alloc(pipe, PIPE_FORMAT_U_Z32);
-#endif
       pixelSize = sizeof(GLuint);
       break;
    case GL_DEPTH_STENCIL_EXT:
@@ -1151,11 +1132,6 @@ _mesa_soft_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
       rb->PutMonoValues = put_mono_values_uint;
       rb->DepthBits = 24;
       rb->StencilBits = 8;
-#if 0
-      if (!rb->surface)
-         rb->surface = (struct pipe_surface *)
-            pipe->surface_alloc(pipe, PIPE_FORMAT_S8_Z24);
-#endif
       pixelSize = sizeof(GLuint);
       break;
    case GL_COLOR_INDEX8_EXT:
@@ -1218,34 +1194,14 @@ _mesa_soft_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
    ASSERT(rb->PutMonoValues);
 
    /* free old buffer storage */
-   if (0/**rb->surface**/) {
-      /* pipe_surface/region */
-   }
-   else if (rb->Data) {
-      /* legacy renderbuffer (this will go away) */
+   if (rb->Data) {
       _mesa_free(rb->Data);
+      rb->Data = NULL;
    }
-   rb->Data = NULL;
 
    if (width > 0 && height > 0) {
       /* allocate new buffer storage */
-      if (0/**rb->surface**/) {
-         /* pipe_surface/region */
-#if 0
-         if (rb->surface->region) {
-            pipe->region_unmap(pipe, rb->surface->region);
-            pipe->region_release(pipe, &rb->surface->region);
-         }
-         rb->surface->region = pipe->region_alloc(pipe, pixelSize, width, height);
-         /* XXX probably don't want to really map here */
-         pipe->region_map(pipe, rb->surface->region);
-         rb->Data = rb->surface->region->map;
-#endif
-      }
-      else {
-         /* legacy renderbuffer (this will go away) */
-         rb->Data = malloc(width * height * pixelSize);
-      }
+      rb->Data = malloc(width * height * pixelSize);
 
       if (rb->Data == NULL) {
          rb->Width = 0;
-- 
cgit v1.2.3


From 24e21301e0cc16f0a3a81bfd7ac7ae8765174da8 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Sat, 11 Aug 2007 19:57:50 +0100
Subject: remove some temp pipe hacks

---
 src/mesa/main/queryobj.c | 15 ---------------
 1 file changed, 15 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c
index fc04dde3f4..0e59ba615a 100644
--- a/src/mesa/main/queryobj.c
+++ b/src/mesa/main/queryobj.c
@@ -30,11 +30,6 @@
 #include "queryobj.h"
 #include "mtypes.h"
 
-#if 1 /*PIPE*/
-#include "pipe/p_context.h"
-#include "state_tracker/st_context.h"
-#endif
-
 
 /**
  * Allocate a new query object.  This is a fallback routine called via
@@ -225,10 +220,6 @@ _mesa_BeginQueryARB(GLenum target, GLuint id)
    q->Result = 0;
    q->Ready = GL_FALSE;
 
-#if 1 /*PIPE*/
-   ctx->st->pipe->reset_occlusion_counter(ctx->st->pipe);
-#endif
-
    if (target == GL_SAMPLES_PASSED_ARB) {
       ctx->Query.CurrentOcclusionObject = q;
    }
@@ -291,12 +282,6 @@ _mesa_EndQueryARB(GLenum target)
       /* if we're using software rendering/querying */
       q->Ready = GL_TRUE;
    }
-
-#if 1 /*PIPE*/
-   if (target == GL_SAMPLES_PASSED_ARB) {
-      q->Result = ctx->st->pipe->get_occlusion_counter(ctx->st->pipe);
-   }
-#endif
 }
 
 
-- 
cgit v1.2.3


From 730df7662f57a46dee892733afc9a55f37d2ab03 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Mon, 20 Aug 2007 12:50:34 -0600
Subject: don't map element buffer in _mesa_validate_DrawElements() unless
 necessary

---
 src/mesa/main/api_validate.c | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c
index 841c6a5302..64ab324af2 100644
--- a/src/mesa/main/api_validate.c
+++ b/src/mesa/main/api_validate.c
@@ -69,8 +69,9 @@ _mesa_validate_DrawElements(GLcontext *ctx,
       GLuint indexBytes;
 
       /* use indices in the buffer object */
-      if (!ctx->Array.ElementArrayBufferObj->Data) {
-         _mesa_warning(ctx, "DrawElements with empty vertex elements buffer!");
+      if (!ctx->Array.ElementArrayBufferObj->Size) {
+         _mesa_warning(ctx,
+                       "glDrawElements called with empty array elements buffer");
          return GL_FALSE;
       }
 
@@ -86,19 +87,10 @@ _mesa_validate_DrawElements(GLcontext *ctx,
          indexBytes = count * sizeof(GLushort);
       }
 
-      if ((GLubyte *) indices + indexBytes >
-          ctx->Array.ElementArrayBufferObj->Data +
-          ctx->Array.ElementArrayBufferObj->Size) {
+      if (indexBytes > ctx->Array.ElementArrayBufferObj->Size) {
          _mesa_warning(ctx, "glDrawElements index out of buffer bounds");
          return GL_FALSE;
       }
-
-      /* Actual address is the sum of pointers.  Indices may be used below. */
-      if (ctx->Const.CheckArrayBounds) {
-         indices = (const GLvoid *)
-            ADD_POINTERS(ctx->Array.ElementArrayBufferObj->Data,
-                         (const GLubyte *) indices);
-      }
    }
    else {
       /* not using a VBO */
@@ -108,8 +100,18 @@ _mesa_validate_DrawElements(GLcontext *ctx,
 
    if (ctx->Const.CheckArrayBounds) {
       /* find max array index */
+      const GLubyte *map;
       GLuint max = 0;
       GLint i;
+
+      map = ctx->Driver.MapBuffer(ctx,
+                                  GL_ELEMENT_ARRAY_BUFFER_ARB,
+                                  GL_READ_ONLY,
+                                  ctx->Array.ElementArrayBufferObj);
+
+      /* Actual address is the sum of pointers */
+      indices = (const GLvoid *) ADD_POINTERS(map, (const GLubyte *) indices);
+
       if (type == GL_UNSIGNED_INT) {
          for (i = 0; i < count; i++)
             if (((GLuint *) indices)[i] > max)
@@ -126,6 +128,11 @@ _mesa_validate_DrawElements(GLcontext *ctx,
             if (((GLubyte *) indices)[i] > max)
                max = ((GLubyte *) indices)[i];
       }
+
+      ctx->Driver.UnmapBuffer(ctx,
+                              GL_ELEMENT_ARRAY_BUFFER_ARB,
+                              ctx->Array.ElementArrayBufferObj);
+
       if (max >= ctx->Array._MaxElement) {
          /* the max element is out of bounds of one or more enabled arrays */
          return GL_FALSE;
-- 
cgit v1.2.3


From 4c01d498fac14bba751dd87bff235efb5409dca9 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Thu, 6 Sep 2007 17:02:07 -0600
Subject: Move guts of glRasterPos down into T&L module.

---
 src/mesa/drivers/common/driverfuncs.c |   1 +
 src/mesa/main/dd.h                    |   5 +
 src/mesa/main/rastpos.c               | 564 ++--------------------------------
 src/mesa/sources                      |   1 +
 src/mesa/tnl/tnl.h                    |   3 +
 5 files changed, 44 insertions(+), 530 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c
index 9b1c3f1e06..500dbb2545 100644
--- a/src/mesa/drivers/common/driverfuncs.c
+++ b/src/mesa/drivers/common/driverfuncs.c
@@ -79,6 +79,7 @@ _mesa_init_driver_functions(struct dd_function_table *driver)
    /* framebuffer/image functions */
    driver->Clear = _swrast_Clear;
    driver->Accum = _swrast_Accum;
+   driver->RasterPos = _tnl_RasterPos;
    driver->DrawPixels = _swrast_DrawPixels;
    driver->ReadPixels = _swrast_ReadPixels;
    driver->CopyPixels = _swrast_CopyPixels;
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index caa50dd682..582e0c334d 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -110,6 +110,11 @@ struct dd_function_table {
    void (*Accum)( GLcontext *ctx, GLenum op, GLfloat value );
 
 
+   /**
+    * Execute glRasterPos, updating the ctx->Current.Raster fields
+    */
+   void (*RasterPos)( GLcontext *ctx, const GLfloat v[4] );
+
    /**
     * \name Image-related functions
     */
diff --git a/src/mesa/main/rastpos.c b/src/mesa/main/rastpos.c
index 2d71014a18..eef3b09d6d 100644
--- a/src/mesa/main/rastpos.c
+++ b/src/mesa/main/rastpos.c
@@ -29,674 +29,178 @@
  */
 
 #include "glheader.h"
-#include "colormac.h"
 #include "context.h"
 #include "feedback.h"
-#include "light.h"
 #include "macros.h"
 #include "rastpos.h"
 #include "state.h"
-#include "simple_list.h"
-#include "mtypes.h"
-
-#include "math/m_matrix.h"
-
-
-/**
- * Clip a point against the view volume.
- *
- * \param v vertex vector describing the point to clip.
- * 
- * \return zero if outside view volume, or one if inside.
- */
-static GLuint
-viewclip_point( const GLfloat v[] )
-{
-   if (   v[0] > v[3] || v[0] < -v[3]
-       || v[1] > v[3] || v[1] < -v[3]
-       || v[2] > v[3] || v[2] < -v[3] ) {
-      return 0;
-   }
-   else {
-      return 1;
-   }
-}
-
-
-/**
- * Clip a point against the far/near Z clipping planes.
- *
- * \param v vertex vector describing the point to clip.
- * 
- * \return zero if outside view volume, or one if inside.
- */
-static GLuint
-viewclip_point_z( const GLfloat v[] )
-{
-   if (v[2] > v[3] || v[2] < -v[3] ) {
-      return 0;
-   }
-   else {
-      return 1;
-   }
-}
-
-
-/**
- * Clip a point against the user clipping planes.
- * 
- * \param ctx GL context.
- * \param v vertex vector describing the point to clip.
- * 
- * \return zero if the point was clipped, or one otherwise.
- */
-static GLuint
-userclip_point( GLcontext *ctx, const GLfloat v[] )
-{
-   GLuint p;
-
-   for (p = 0; p < ctx->Const.MaxClipPlanes; p++) {
-      if (ctx->Transform.ClipPlanesEnabled & (1 << p)) {
-	 GLfloat dot = v[0] * ctx->Transform._ClipUserPlane[p][0]
-		     + v[1] * ctx->Transform._ClipUserPlane[p][1]
-		     + v[2] * ctx->Transform._ClipUserPlane[p][2]
-		     + v[3] * ctx->Transform._ClipUserPlane[p][3];
-         if (dot < 0.0F) {
-            return 0;
-         }
-      }
-   }
-
-   return 1;
-}
-
-
-/**
- * Compute lighting for the raster position.  Both RGB and CI modes computed.
- * \param ctx the context
- * \param vertex vertex location
- * \param normal normal vector
- * \param Rcolor returned color
- * \param Rspec returned specular color (if separate specular enabled)
- * \param Rindex returned color index
- */
-static void
-shade_rastpos(GLcontext *ctx,
-              const GLfloat vertex[4],
-              const GLfloat normal[3],
-              GLfloat Rcolor[4],
-              GLfloat Rspec[4],
-              GLfloat *Rindex)
-{
-   /*const*/ GLfloat (*base)[3] = ctx->Light._BaseColor;
-   const struct gl_light *light;
-   GLfloat diffuseColor[4], specularColor[4];  /* for RGB mode only */
-   GLfloat diffuseCI = 0.0, specularCI = 0.0;  /* for CI mode only */
-
-   _mesa_validate_all_lighting_tables( ctx );
-
-   COPY_3V(diffuseColor, base[0]);
-   diffuseColor[3] = CLAMP( 
-      ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE][3], 0.0F, 1.0F );
-   ASSIGN_4V(specularColor, 0.0, 0.0, 0.0, 1.0);
-
-   foreach (light, &ctx->Light.EnabledList) {
-      GLfloat attenuation = 1.0;
-      GLfloat VP[3]; /* vector from vertex to light pos */
-      GLfloat n_dot_VP;
-      GLfloat diffuseContrib[3], specularContrib[3];
-
-      if (!(light->_Flags & LIGHT_POSITIONAL)) {
-         /* light at infinity */
-	 COPY_3V(VP, light->_VP_inf_norm);
-	 attenuation = light->_VP_inf_spot_attenuation;
-      }
-      else {
-         /* local/positional light */
-	 GLfloat d;
-
-         /* VP = vector from vertex pos to light[i].pos */
-	 SUB_3V(VP, light->_Position, vertex);
-         /* d = length(VP) */
-	 d = (GLfloat) LEN_3FV( VP );
-	 if (d > 1.0e-6) {
-            /* normalize VP */
-	    GLfloat invd = 1.0F / d;
-	    SELF_SCALE_SCALAR_3V(VP, invd);
-	 }
-
-         /* atti */
-	 attenuation = 1.0F / (light->ConstantAttenuation + d *
-			       (light->LinearAttenuation + d *
-				light->QuadraticAttenuation));
-
-	 if (light->_Flags & LIGHT_SPOT) {
-	    GLfloat PV_dot_dir = - DOT3(VP, light->_NormDirection);
-
-	    if (PV_dot_dir<light->_CosCutoff) {
-	       continue;
-	    }
-	    else {
-	       double x = PV_dot_dir * (EXP_TABLE_SIZE-1);
-	       int k = (int) x;
-	       GLfloat spot = (GLfloat) (light->_SpotExpTable[k][0]
-			       + (x-k)*light->_SpotExpTable[k][1]);
-	       attenuation *= spot;
-	    }
-	 }
-      }
-
-      if (attenuation < 1e-3)
-	 continue;
-
-      n_dot_VP = DOT3( normal, VP );
-
-      if (n_dot_VP < 0.0F) {
-	 ACC_SCALE_SCALAR_3V(diffuseColor, attenuation, light->_MatAmbient[0]);
-	 continue;
-      }
-
-      /* Ambient + diffuse */
-      COPY_3V(diffuseContrib, light->_MatAmbient[0]);
-      ACC_SCALE_SCALAR_3V(diffuseContrib, n_dot_VP, light->_MatDiffuse[0]);
-      diffuseCI += n_dot_VP * light->_dli * attenuation;
-
-      /* Specular */
-      {
-         const GLfloat *h;
-         GLfloat n_dot_h;
-
-         ASSIGN_3V(specularContrib, 0.0, 0.0, 0.0);
-
-	 if (ctx->Light.Model.LocalViewer) {
-	    GLfloat v[3];
-	    COPY_3V(v, vertex);
-	    NORMALIZE_3FV(v);
-	    SUB_3V(VP, VP, v);
-            NORMALIZE_3FV(VP);
-	    h = VP;
-	 }
-	 else if (light->_Flags & LIGHT_POSITIONAL) {
-	    ACC_3V(VP, ctx->_EyeZDir);
-            NORMALIZE_3FV(VP);
-	    h = VP;
-	 }
-         else {
-	    h = light->_h_inf_norm;
-	 }
-
-	 n_dot_h = DOT3(normal, h);
-
-	 if (n_dot_h > 0.0F) {
-	    GLfloat spec_coef;
-	    GET_SHINE_TAB_ENTRY( ctx->_ShineTable[0], n_dot_h, spec_coef );
-
-	    if (spec_coef > 1.0e-10) {
-               if (ctx->Light.Model.ColorControl==GL_SEPARATE_SPECULAR_COLOR) {
-                  ACC_SCALE_SCALAR_3V( specularContrib, spec_coef,
-                                       light->_MatSpecular[0]);
-               }
-               else {
-                  ACC_SCALE_SCALAR_3V( diffuseContrib, spec_coef,
-                                       light->_MatSpecular[0]);
-               }
-               /*assert(light->_sli > 0.0);*/
-               specularCI += spec_coef * light->_sli * attenuation;
-	    }
-	 }
-      }
-
-      ACC_SCALE_SCALAR_3V( diffuseColor, attenuation, diffuseContrib );
-      ACC_SCALE_SCALAR_3V( specularColor, attenuation, specularContrib );
-   }
-
-   if (ctx->Visual.rgbMode) {
-      Rcolor[0] = CLAMP(diffuseColor[0], 0.0F, 1.0F);
-      Rcolor[1] = CLAMP(diffuseColor[1], 0.0F, 1.0F);
-      Rcolor[2] = CLAMP(diffuseColor[2], 0.0F, 1.0F);
-      Rcolor[3] = CLAMP(diffuseColor[3], 0.0F, 1.0F);
-      Rspec[0] = CLAMP(specularColor[0], 0.0F, 1.0F);
-      Rspec[1] = CLAMP(specularColor[1], 0.0F, 1.0F);
-      Rspec[2] = CLAMP(specularColor[2], 0.0F, 1.0F);
-      Rspec[3] = CLAMP(specularColor[3], 0.0F, 1.0F);
-   }
-   else {
-      GLfloat *ind = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_INDEXES];
-      GLfloat d_a = ind[MAT_INDEX_DIFFUSE] - ind[MAT_INDEX_AMBIENT];
-      GLfloat s_a = ind[MAT_INDEX_SPECULAR] - ind[MAT_INDEX_AMBIENT];
-      GLfloat i = (ind[MAT_INDEX_AMBIENT]
-		   + diffuseCI * (1.0F-specularCI) * d_a
-		   + specularCI * s_a);
-      if (i > ind[MAT_INDEX_SPECULAR]) {
-	 i = ind[MAT_INDEX_SPECULAR];
-      }
-      *Rindex = i;
-   }
-}
 
 
 /**
- * Do texgen needed for glRasterPos.
- * \param ctx  rendering context
- * \param vObj  object-space vertex coordinate
- * \param vEye  eye-space vertex coordinate
- * \param normal  vertex normal
- * \param unit  texture unit number
- * \param texcoord  incoming texcoord and resulting texcoord
- */
-static void
-compute_texgen(GLcontext *ctx, const GLfloat vObj[4], const GLfloat vEye[4],
-               const GLfloat normal[3], GLuint unit, GLfloat texcoord[4])
-{
-   const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
-
-   /* always compute sphere map terms, just in case */
-   GLfloat u[3], two_nu, rx, ry, rz, m, mInv;
-   COPY_3V(u, vEye);
-   NORMALIZE_3FV(u);
-   two_nu = 2.0F * DOT3(normal, u);
-   rx = u[0] - normal[0] * two_nu;
-   ry = u[1] - normal[1] * two_nu;
-   rz = u[2] - normal[2] * two_nu;
-   m = rx * rx + ry * ry + (rz + 1.0F) * (rz + 1.0F);
-   if (m > 0.0F)
-      mInv = 0.5F * _mesa_inv_sqrtf(m);
-   else
-      mInv = 0.0F;
-
-   if (texUnit->TexGenEnabled & S_BIT) {
-      switch (texUnit->GenModeS) {
-         case GL_OBJECT_LINEAR:
-            texcoord[0] = DOT4(vObj, texUnit->ObjectPlaneS);
-            break;
-         case GL_EYE_LINEAR:
-            texcoord[0] = DOT4(vEye, texUnit->EyePlaneS);
-            break;
-         case GL_SPHERE_MAP:
-            texcoord[0] = rx * mInv + 0.5F;
-            break;
-         case GL_REFLECTION_MAP:
-            texcoord[0] = rx;
-            break;
-         case GL_NORMAL_MAP:
-            texcoord[0] = normal[0];
-            break;
-         default:
-            _mesa_problem(ctx, "Bad S texgen in compute_texgen()");
-            return;
-      }
-   }
-
-   if (texUnit->TexGenEnabled & T_BIT) {
-      switch (texUnit->GenModeT) {
-         case GL_OBJECT_LINEAR:
-            texcoord[1] = DOT4(vObj, texUnit->ObjectPlaneT);
-            break;
-         case GL_EYE_LINEAR:
-            texcoord[1] = DOT4(vEye, texUnit->EyePlaneT);
-            break;
-         case GL_SPHERE_MAP:
-            texcoord[1] = ry * mInv + 0.5F;
-            break;
-         case GL_REFLECTION_MAP:
-            texcoord[1] = ry;
-            break;
-         case GL_NORMAL_MAP:
-            texcoord[1] = normal[1];
-            break;
-         default:
-            _mesa_problem(ctx, "Bad T texgen in compute_texgen()");
-            return;
-      }
-   }
-
-   if (texUnit->TexGenEnabled & R_BIT) {
-      switch (texUnit->GenModeR) {
-         case GL_OBJECT_LINEAR:
-            texcoord[2] = DOT4(vObj, texUnit->ObjectPlaneR);
-            break;
-         case GL_EYE_LINEAR:
-            texcoord[2] = DOT4(vEye, texUnit->EyePlaneR);
-            break;
-         case GL_REFLECTION_MAP:
-            texcoord[2] = rz;
-            break;
-         case GL_NORMAL_MAP:
-            texcoord[2] = normal[2];
-            break;
-         default:
-            _mesa_problem(ctx, "Bad R texgen in compute_texgen()");
-            return;
-      }
-   }
-
-   if (texUnit->TexGenEnabled & Q_BIT) {
-      switch (texUnit->GenModeQ) {
-         case GL_OBJECT_LINEAR:
-            texcoord[3] = DOT4(vObj, texUnit->ObjectPlaneQ);
-            break;
-         case GL_EYE_LINEAR:
-            texcoord[3] = DOT4(vEye, texUnit->EyePlaneQ);
-            break;
-         default:
-            _mesa_problem(ctx, "Bad Q texgen in compute_texgen()");
-            return;
-      }
-   }
-}
-
-
-
-/**
- * Set the raster position for pixel operations.
- *
- * All glRasterPos command call this function to update the current
- * raster position.
- * 
- * \param ctx GL context.
- * \param x x coordinate for the raster position.
- * \param y y coordinate for the raster position.
- * \param z z coordinate for the raster position.
- * \param w w coordinate for the raster position.
- * 
- * \sa Called by _mesa_RasterPos4f().
- *
- * Flushes the vertices, transforms and clips the vertex coordinates, and
- * finally sets the current raster position and associated data in
- * __GLcontextRec::Current.  When in selection mode calls
- * _mesa_update_hitflag() with the current raster position.
+ * Helper function for all the RasterPos functions.
  */
 static void
-raster_pos4f(GLcontext *ctx, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+rasterpos(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-   FLUSH_CURRENT(ctx, 0);
+   GET_CURRENT_CONTEXT(ctx);
+   GLfloat p[4];
+
+   p[0] = x;
+   p[1] = y;
+   p[2] = z;
+   p[3] = w;
 
    if (ctx->NewState)
       _mesa_update_state( ctx );
 
-   if (ctx->VertexProgram._Enabled) {
-      /* XXX implement this */
-      _mesa_problem(ctx, "Vertex programs not implemented for glRasterPos");
-      return;
-   }
-   else {
-      GLfloat obj[4], eye[4], clip[4], ndc[3], d;
-      GLfloat *norm, eyenorm[3];
-      GLfloat *objnorm = ctx->Current.Attrib[VERT_ATTRIB_NORMAL];
-
-      ASSIGN_4V( obj, x, y, z, w );
-      /* apply modelview matrix:  eye = MV * obj */
-      TRANSFORM_POINT( eye, ctx->ModelviewMatrixStack.Top->m, obj );
-      /* apply projection matrix:  clip = Proj * eye */
-      TRANSFORM_POINT( clip, ctx->ProjectionMatrixStack.Top->m, eye );
-
-      /* clip to view volume */
-      if (ctx->Transform.RasterPositionUnclipped) {
-         /* GL_IBM_rasterpos_clip: only clip against Z */
-         if (viewclip_point_z(clip) == 0) {
-            ctx->Current.RasterPosValid = GL_FALSE;
-            return;
-         }
-      }
-      else if (viewclip_point(clip) == 0) {
-         /* Normal OpenGL behaviour */
-         ctx->Current.RasterPosValid = GL_FALSE;
-         return;
-      }
-
-      /* clip to user clipping planes */
-      if (ctx->Transform.ClipPlanesEnabled && !userclip_point(ctx, clip)) {
-         ctx->Current.RasterPosValid = GL_FALSE;
-         return;
-      }
-
-      /* ndc = clip / W */
-      d = (clip[3] == 0.0F) ? 1.0F : 1.0F / clip[3];
-      ndc[0] = clip[0] * d;
-      ndc[1] = clip[1] * d;
-      ndc[2] = clip[2] * d;
-      /* wincoord = viewport_mapping(ndc) */
-      ctx->Current.RasterPos[0] = (ndc[0] * ctx->Viewport._WindowMap.m[MAT_SX]
-                                   + ctx->Viewport._WindowMap.m[MAT_TX]);
-      ctx->Current.RasterPos[1] = (ndc[1] * ctx->Viewport._WindowMap.m[MAT_SY]
-                                   + ctx->Viewport._WindowMap.m[MAT_TY]);
-      ctx->Current.RasterPos[2] = (ndc[2] * ctx->Viewport._WindowMap.m[MAT_SZ]
-                                   + ctx->Viewport._WindowMap.m[MAT_TZ])
-                                  / ctx->DrawBuffer->_DepthMaxF;
-      ctx->Current.RasterPos[3] = clip[3];
-
-      /* compute raster distance */
-      if (ctx->Fog.FogCoordinateSource == GL_FOG_COORDINATE_EXT)
-         ctx->Current.RasterDistance = ctx->Current.Attrib[VERT_ATTRIB_FOG][0];
-      else
-         ctx->Current.RasterDistance =
-                        SQRTF( eye[0]*eye[0] + eye[1]*eye[1] + eye[2]*eye[2] );
-
-      /* compute transformed normal vector (for lighting or texgen) */
-      if (ctx->_NeedEyeCoords) {
-         const GLfloat *inv = ctx->ModelviewMatrixStack.Top->inv;
-         TRANSFORM_NORMAL( eyenorm, objnorm, inv );
-         norm = eyenorm;
-      }
-      else {
-         norm = objnorm;
-      }
-
-      /* update raster color */
-      if (ctx->Light.Enabled) {
-         /* lighting */
-         shade_rastpos( ctx, obj, norm,
-                        ctx->Current.RasterColor,
-                        ctx->Current.RasterSecondaryColor,
-                        &ctx->Current.RasterIndex );
-      }
-      else {
-         /* use current color or index */
-         if (ctx->Visual.rgbMode) {
-            COPY_4FV(ctx->Current.RasterColor,
-                     ctx->Current.Attrib[VERT_ATTRIB_COLOR0]);
-            COPY_4FV(ctx->Current.RasterSecondaryColor,
-                     ctx->Current.Attrib[VERT_ATTRIB_COLOR1]);
-         }
-         else {
-            ctx->Current.RasterIndex
-               = ctx->Current.Attrib[VERT_ATTRIB_COLOR_INDEX][0];
-         }
-      }
-
-      /* texture coords */
-      {
-         GLuint u;
-         for (u = 0; u < ctx->Const.MaxTextureCoordUnits; u++) {
-            GLfloat tc[4];
-            COPY_4V(tc, ctx->Current.Attrib[VERT_ATTRIB_TEX0 + u]);
-            if (ctx->Texture.Unit[u].TexGenEnabled) {
-               compute_texgen(ctx, obj, eye, norm, u, tc);
-            }
-            TRANSFORM_POINT(ctx->Current.RasterTexCoords[u],
-                            ctx->TextureMatrixStack[u].Top->m, tc);
-         }
-      }
-
-      ctx->Current.RasterPosValid = GL_TRUE;
-   }
-
-   if (ctx->RenderMode == GL_SELECT) {
-      _mesa_update_hitflag( ctx, ctx->Current.RasterPos[2] );
-   }
+   ctx->Driver.RasterPos(ctx, p);
 }
 
 
-/** Calls _mesa_RasterPos4f() */
 void GLAPIENTRY
 _mesa_RasterPos2d(GLdouble x, GLdouble y)
 {
-   _mesa_RasterPos4f((GLfloat) x, (GLfloat) y, 0.0F, 1.0F);
+   rasterpos(x, y, 0.0F, 1.0F);
 }
 
-/** Calls _mesa_RasterPos4f() */
 void GLAPIENTRY
 _mesa_RasterPos2f(GLfloat x, GLfloat y)
 {
-   _mesa_RasterPos4f(x, y, 0.0F, 1.0F);
+   rasterpos(x, y, 0.0F, 1.0F);
 }
 
-/** Calls _mesa_RasterPos4f() */
 void GLAPIENTRY
 _mesa_RasterPos2i(GLint x, GLint y)
 {
-   _mesa_RasterPos4f((GLfloat) x, (GLfloat) y, 0.0F, 1.0F);
+   rasterpos((GLfloat) x, (GLfloat) y, 0.0F, 1.0F);
 }
 
-/** Calls _mesa_RasterPos4f() */
 void GLAPIENTRY
 _mesa_RasterPos2s(GLshort x, GLshort y)
 {
-   _mesa_RasterPos4f(x, y, 0.0F, 1.0F);
+   rasterpos(x, y, 0.0F, 1.0F);
 }
 
-/** Calls _mesa_RasterPos4f() */
 void GLAPIENTRY
 _mesa_RasterPos3d(GLdouble x, GLdouble y, GLdouble z)
 {
-   _mesa_RasterPos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);
+   rasterpos((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);
 }
 
-/** Calls _mesa_RasterPos4f() */
 void GLAPIENTRY
 _mesa_RasterPos3f(GLfloat x, GLfloat y, GLfloat z)
 {
-   _mesa_RasterPos4f(x, y, z, 1.0F);
+   rasterpos(x, y, z, 1.0F);
 }
 
-/** Calls _mesa_RasterPos4f() */
 void GLAPIENTRY
 _mesa_RasterPos3i(GLint x, GLint y, GLint z)
 {
-   _mesa_RasterPos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);
+   rasterpos((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);
 }
 
-/** Calls _mesa_RasterPos4f() */
 void GLAPIENTRY
 _mesa_RasterPos3s(GLshort x, GLshort y, GLshort z)
 {
-   _mesa_RasterPos4f(x, y, z, 1.0F);
+   rasterpos(x, y, z, 1.0F);
 }
 
-/** Calls _mesa_RasterPos4f() */
 void GLAPIENTRY
 _mesa_RasterPos4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-   _mesa_RasterPos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);
+   rasterpos((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);
 }
 
-/** Calls raster_pos4f() */
 void GLAPIENTRY
 _mesa_RasterPos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-   GET_CURRENT_CONTEXT(ctx);
-   raster_pos4f(ctx, x, y, z, w);
+   rasterpos(x, y, z, w);
 }
 
-/** Calls _mesa_RasterPos4f() */
 void GLAPIENTRY
 _mesa_RasterPos4i(GLint x, GLint y, GLint z, GLint w)
 {
-   _mesa_RasterPos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);
+   rasterpos((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);
 }
 
-/** Calls _mesa_RasterPos4f() */
 void GLAPIENTRY
 _mesa_RasterPos4s(GLshort x, GLshort y, GLshort z, GLshort w)
 {
-   _mesa_RasterPos4f(x, y, z, w);
+   rasterpos(x, y, z, w);
 }
 
-/** Calls _mesa_RasterPos4f() */
 void GLAPIENTRY
 _mesa_RasterPos2dv(const GLdouble *v)
 {
-   _mesa_RasterPos4f((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F);
+   rasterpos((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F);
 }
 
-/** Calls _mesa_RasterPos4f() */
 void GLAPIENTRY
 _mesa_RasterPos2fv(const GLfloat *v)
 {
-   _mesa_RasterPos4f(v[0], v[1], 0.0F, 1.0F);
+   rasterpos(v[0], v[1], 0.0F, 1.0F);
 }
 
-/** Calls _mesa_RasterPos4f() */
 void GLAPIENTRY
 _mesa_RasterPos2iv(const GLint *v)
 {
-   _mesa_RasterPos4f((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F);
+   rasterpos((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F);
 }
 
-/** Calls _mesa_RasterPos4f() */
 void GLAPIENTRY
 _mesa_RasterPos2sv(const GLshort *v)
 {
-   _mesa_RasterPos4f(v[0], v[1], 0.0F, 1.0F);
+   rasterpos(v[0], v[1], 0.0F, 1.0F);
 }
 
-/** Calls _mesa_RasterPos4f() */
 void GLAPIENTRY
 _mesa_RasterPos3dv(const GLdouble *v)
 {
-   _mesa_RasterPos4f((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F);
+   rasterpos((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F);
 }
 
-/** Calls _mesa_RasterPos4f() */
 void GLAPIENTRY
 _mesa_RasterPos3fv(const GLfloat *v)
 {
-   _mesa_RasterPos4f(v[0], v[1], v[2], 1.0F);
+   rasterpos(v[0], v[1], v[2], 1.0F);
 }
 
-/** Calls _mesa_RasterPos4f() */
 void GLAPIENTRY
 _mesa_RasterPos3iv(const GLint *v)
 {
-   _mesa_RasterPos4f((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F);
+   rasterpos((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F);
 }
 
-/** Calls _mesa_RasterPos4f() */
 void GLAPIENTRY
 _mesa_RasterPos3sv(const GLshort *v)
 {
-   _mesa_RasterPos4f(v[0], v[1], v[2], 1.0F);
+   rasterpos(v[0], v[1], v[2], 1.0F);
 }
 
-/** Calls _mesa_RasterPos4f() */
 void GLAPIENTRY
 _mesa_RasterPos4dv(const GLdouble *v)
 {
-   _mesa_RasterPos4f((GLfloat) v[0], (GLfloat) v[1], 
+   rasterpos((GLfloat) v[0], (GLfloat) v[1], 
 		     (GLfloat) v[2], (GLfloat) v[3]);
 }
 
-/** Calls _mesa_RasterPos4f() */
 void GLAPIENTRY
 _mesa_RasterPos4fv(const GLfloat *v)
 {
-   _mesa_RasterPos4f(v[0], v[1], v[2], v[3]);
+   rasterpos(v[0], v[1], v[2], v[3]);
 }
 
-/** Calls _mesa_RasterPos4f() */
 void GLAPIENTRY
 _mesa_RasterPos4iv(const GLint *v)
 {
-   _mesa_RasterPos4f((GLfloat) v[0], (GLfloat) v[1], 
+   rasterpos((GLfloat) v[0], (GLfloat) v[1], 
 		     (GLfloat) v[2], (GLfloat) v[3]);
 }
 
-/** Calls _mesa_RasterPos4f() */
 void GLAPIENTRY
 _mesa_RasterPos4sv(const GLshort *v)
 {
-   _mesa_RasterPos4f(v[0], v[1], v[2], v[3]);
+   rasterpos(v[0], v[1], v[2], v[3]);
 }
 
 
diff --git a/src/mesa/sources b/src/mesa/sources
index ae0797ae24..437af0f57b 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -118,6 +118,7 @@ TNL_SOURCES = \
 	tnl/t_context.c \
 	tnl/t_pipeline.c \
 	tnl/t_draw.c \
+	tnl/t_rasterpos.c \
 	tnl/t_vb_program.c \
 	tnl/t_vb_render.c \
 	tnl/t_vb_texgen.c \
diff --git a/src/mesa/tnl/tnl.h b/src/mesa/tnl/tnl.h
index 047b764dcb..4bdbed92df 100644
--- a/src/mesa/tnl/tnl.h
+++ b/src/mesa/tnl/tnl.h
@@ -85,4 +85,7 @@ _tnl_draw_prims( GLcontext *ctx,
 extern void
 _mesa_load_tracked_matrices(GLcontext *ctx);
 
+extern void
+_tnl_RasterPos(GLcontext *ctx, const GLfloat vObj[4]);
+
 #endif
-- 
cgit v1.2.3


From 21c925f49191df46ed8788ac09bbb3bd4a437c99 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Mon, 10 Sep 2007 16:27:07 -0600
Subject: move FLUSH_CURRENT

---
 src/mesa/main/rastpos.c    | 3 +++
 src/mesa/tnl/t_rasterpos.c | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/rastpos.c b/src/mesa/main/rastpos.c
index eef3b09d6d..ee163e0c71 100644
--- a/src/mesa/main/rastpos.c
+++ b/src/mesa/main/rastpos.c
@@ -53,6 +53,9 @@ rasterpos(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
    if (ctx->NewState)
       _mesa_update_state( ctx );
 
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+   FLUSH_CURRENT(ctx, 0);
+
    ctx->Driver.RasterPos(ctx, p);
 }
 
diff --git a/src/mesa/tnl/t_rasterpos.c b/src/mesa/tnl/t_rasterpos.c
index 272f855fc1..be963867c0 100644
--- a/src/mesa/tnl/t_rasterpos.c
+++ b/src/mesa/tnl/t_rasterpos.c
@@ -393,9 +393,6 @@ compute_texgen(GLcontext *ctx, const GLfloat vObj[4], const GLfloat vEye[4],
 void
 _tnl_RasterPos(GLcontext *ctx, const GLfloat vObj[4])
 {
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-   FLUSH_CURRENT(ctx, 0);
-
    if (ctx->VertexProgram._Enabled) {
       /* XXX implement this */
       _mesa_problem(ctx, "Vertex programs not implemented for glRasterPos");
-- 
cgit v1.2.3


From 09fbb3837b6aa5dfc6c94f41ab5443820177c569 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Tue, 11 Sep 2007 16:01:17 -0600
Subject: Implement query object interface.

This replaces the temporary occlusion counter functions we had before.
Added new ctx->Driver.WaitQuery() function which should block until the result is ready.
Sketch out some code for vertex transformation feedback counters.
---
 src/mesa/drivers/common/driverfuncs.c      |  5 +-
 src/mesa/main/dd.h                         |  6 +-
 src/mesa/main/mtypes.h                     |  9 +--
 src/mesa/main/queryobj.c                   | 95 ++++++++++++++++--------------
 src/mesa/main/queryobj.h                   | 14 ++++-
 src/mesa/pipe/failover/fo_context.c        |  4 +-
 src/mesa/pipe/i915simple/i915_context.c    | 21 ++++++-
 src/mesa/pipe/p_context.h                  |  9 +--
 src/mesa/pipe/p_defines.h                  |  8 +++
 src/mesa/pipe/p_state.h                    | 10 ++++
 src/mesa/pipe/softpipe/sp_context.c        | 35 ++++++++---
 src/mesa/pipe/softpipe/sp_context.h        |  7 ++-
 src/mesa/pipe/softpipe/sp_quad_occlusion.c | 10 ++--
 src/mesa/state_tracker/st_cb_queryobj.c    | 83 +++++++++++++++++++++++---
 14 files changed, 232 insertions(+), 84 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c
index 500dbb2545..96e5037fa5 100644
--- a/src/mesa/drivers/common/driverfuncs.c
+++ b/src/mesa/drivers/common/driverfuncs.c
@@ -224,8 +224,9 @@ _mesa_init_driver_functions(struct dd_function_table *driver)
 
    /* query objects */
    driver->NewQueryObject = _mesa_new_query_object;
-   driver->BeginQuery = NULL;
-   driver->EndQuery = NULL;
+   driver->BeginQuery = _mesa_begin_query;
+   driver->EndQuery = _mesa_end_query;
+   driver->WaitQuery = _mesa_wait_query;
 
    /* APPLE_vertex_array_object */
    driver->NewArrayObject = _mesa_new_array_object;
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index 582e0c334d..f089fcb48f 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -811,9 +811,9 @@ struct dd_function_table {
     */
    /*@{*/
    struct gl_query_object * (*NewQueryObject)(GLcontext *ctx, GLuint id);
-   void (*BeginQuery)(GLcontext *ctx, GLenum target,
-                      struct gl_query_object *q);
-   void (*EndQuery)(GLcontext *ctx, GLenum target, struct gl_query_object *q);
+   void (*BeginQuery)(GLcontext *ctx, struct gl_query_object *q);
+   void (*EndQuery)(GLcontext *ctx, struct gl_query_object *q);
+   void (*WaitQuery)(GLcontext *ctx, struct gl_query_object *q);
    /*@}*/
 
 
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 0a64e0c58c..514170dbcf 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2085,10 +2085,11 @@ struct gl_ati_fragment_shader_state
  */
 struct gl_query_object
 {
-   GLuint Id;
-   GLuint64EXT Result; /* the counter */
-   GLboolean Active;   /* inside Begin/EndQuery */
-   GLboolean Ready;    /* result is ready */
+   GLenum Target;      /**< The query target, when active */
+   GLuint Id;          /**< hash table ID/name */
+   GLuint64EXT Result; /**< the counter */
+   GLboolean Active;   /**< inside Begin/EndQuery */
+   GLboolean Ready;    /**< result is ready? */
 };
 
 
diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c
index 0e59ba615a..688d0fc7bc 100644
--- a/src/mesa/main/queryobj.c
+++ b/src/mesa/main/queryobj.c
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.5.1
+ * Version:  7.1
  *
- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -53,6 +53,42 @@ _mesa_new_query_object(GLcontext *ctx, GLuint id)
 }
 
 
+/**
+ * Begin a query.  Software driver fallback.
+ * Called via ctx->Driver.BeginQuery().
+ */
+void
+_mesa_begin_query(GLcontext *ctx, struct gl_query_object *q)
+{
+   /* no-op */
+}
+
+
+/**
+ * End a query.  Software driver fallback.
+ * Called via ctx->Driver.EndQuery().
+ */
+void
+_mesa_end_query(GLcontext *ctx, struct gl_query_object *q)
+{
+   q->Ready = GL_TRUE;
+}
+
+
+/**
+ * Wait for query to complete.  Software driver fallback.
+ * Called via ctx->Driver.WaitQuery().
+ */
+void
+_mesa_wait_query(GLcontext *ctx, struct gl_query_object *q)
+{
+   /* For software drivers, _mesa_end_query() should have completed the query.
+    * For real hardware, implement a proper WaitQuery() driver function.
+    */
+   assert(q->Ready);
+}
+
+
 /**
  * Delete an occlusion query object.
  * Not removed from hash table here.
@@ -61,7 +97,7 @@ _mesa_new_query_object(GLcontext *ctx, GLuint id)
 static void
 delete_query_object(struct gl_query_object *q)
 {
-   FREE(q);
+   _mesa_free(q);
 }
 
 
@@ -216,6 +252,7 @@ _mesa_BeginQueryARB(GLenum target, GLuint id)
       }
    }
 
+   q->Target = target;
    q->Active = GL_TRUE;
    q->Result = 0;
    q->Ready = GL_FALSE;
@@ -229,9 +266,7 @@ _mesa_BeginQueryARB(GLenum target, GLuint id)
    }
 #endif
 
-   if (ctx->Driver.BeginQuery) {
-      ctx->Driver.BeginQuery(ctx, target, q);
-   }
+   ctx->Driver.BeginQuery(ctx, q);
 }
 
 
@@ -275,13 +310,7 @@ _mesa_EndQueryARB(GLenum target)
    }
 
    q->Active = GL_FALSE;
-   if (ctx->Driver.EndQuery) {
-      ctx->Driver.EndQuery(ctx, target, q);
-   }
-   else {
-      /* if we're using software rendering/querying */
-      q->Ready = GL_TRUE;
-   }
+   ctx->Driver.EndQuery(ctx, q);
 }
 
 
@@ -346,13 +375,8 @@ _mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params)
 
    switch (pname) {
       case GL_QUERY_RESULT_ARB:
-         while (!q->Ready) {
-            /* Wait for the query to finish! */
-            /* If using software rendering, the result will always be ready
-             * by time we get here.  Otherwise, we must be using hardware!
-             */
-            ASSERT(ctx->Driver.EndQuery);
-         }
+         if (!q->Ready)
+            ctx->Driver.WaitQuery(ctx, q);
          /* if result is too large for returned type, clamp to max value */
          if (q->Result > 0x7fffffff) {
             *params = 0x7fffffff;
@@ -362,7 +386,6 @@ _mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params)
          }
          break;
       case GL_QUERY_RESULT_AVAILABLE_ARB:
-         /* XXX revisit when we have a hardware implementation! */
          *params = q->Ready;
          break;
       default:
@@ -390,13 +413,8 @@ _mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params)
 
    switch (pname) {
       case GL_QUERY_RESULT_ARB:
-         while (!q->Ready) {
-            /* Wait for the query to finish! */
-            /* If using software rendering, the result will always be ready
-             * by time we get here.  Otherwise, we must be using hardware!
-             */
-            ASSERT(ctx->Driver.EndQuery);
-         }
+         if (!q->Ready)
+            ctx->Driver.WaitQuery(ctx, q);
          /* if result is too large for returned type, clamp to max value */
          if (q->Result > 0xffffffff) {
             *params = 0xffffffff;
@@ -406,7 +424,6 @@ _mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params)
          }
          break;
       case GL_QUERY_RESULT_AVAILABLE_ARB:
-         /* XXX revisit when we have a hardware implementation! */
          *params = q->Ready;
          break;
       default:
@@ -439,17 +456,11 @@ _mesa_GetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64EXT *params)
 
    switch (pname) {
       case GL_QUERY_RESULT_ARB:
-         while (!q->Ready) {
-            /* Wait for the query to finish! */
-            /* If using software rendering, the result will always be ready
-             * by time we get here.  Otherwise, we must be using hardware!
-             */
-            ASSERT(ctx->Driver.EndQuery);
-         }
+         if (!q->Ready)
+            ctx->Driver.WaitQuery(ctx, q);
          *params = q->Result;
          break;
       case GL_QUERY_RESULT_AVAILABLE_ARB:
-         /* XXX revisit when we have a hardware implementation! */
          *params = q->Ready;
          break;
       default:
@@ -480,17 +491,11 @@ _mesa_GetQueryObjectui64vEXT(GLuint id, GLenum pname, GLuint64EXT *params)
 
    switch (pname) {
       case GL_QUERY_RESULT_ARB:
-         while (!q->Ready) {
-            /* Wait for the query to finish! */
-            /* If using software rendering, the result will always be ready
-             * by time we get here.  Otherwise, we must be using hardware!
-             */
-            ASSERT(ctx->Driver.EndQuery);
-         }
+         if (!q->Ready)
+            ctx->Driver.WaitQuery(ctx, q);
          *params = q->Result;
          break;
       case GL_QUERY_RESULT_AVAILABLE_ARB:
-         /* XXX revisit when we have a hardware implementation! */
          *params = q->Ready;
          break;
       default:
diff --git a/src/mesa/main/queryobj.h b/src/mesa/main/queryobj.h
index ada8cf8356..d466aae652 100644
--- a/src/mesa/main/queryobj.h
+++ b/src/mesa/main/queryobj.h
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.5
+ * Version:  7.1
  *
- * Copyright (C) 1999-2005  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -36,6 +36,16 @@ _mesa_init_query(GLcontext *ctx);
 extern void
 _mesa_free_query_data(GLcontext *ctx);
 
+extern void
+_mesa_begin_query(GLcontext *ctx, struct gl_query_object *q);
+
+extern void
+_mesa_end_query(GLcontext *ctx, struct gl_query_object *q);
+
+extern void
+_mesa_wait_query(GLcontext *ctx, struct gl_query_object *q);
+
+
 extern void GLAPIENTRY
 _mesa_GenQueriesARB(GLsizei n, GLuint *ids);
 
diff --git a/src/mesa/pipe/failover/fo_context.c b/src/mesa/pipe/failover/fo_context.c
index b88f1b466c..c58fc9cedc 100644
--- a/src/mesa/pipe/failover/fo_context.c
+++ b/src/mesa/pipe/failover/fo_context.c
@@ -129,8 +129,8 @@ struct pipe_context *failover_create( struct pipe_context *hw,
     * at this point - if the hardware doesn't support it, don't
     * advertise it to the application.
     */
-   failover->pipe.reset_occlusion_counter = hw->reset_occlusion_counter;
-   failover->pipe.get_occlusion_counter = hw->get_occlusion_counter;
+   failover->pipe.begin_query = hw->begin_query;
+   failover->pipe.end_query = hw->end_query;
 
    failover_init_state_functions( failover );
 
diff --git a/src/mesa/pipe/i915simple/i915_context.c b/src/mesa/pipe/i915simple/i915_context.c
index f4121419f7..6e48b3bd03 100644
--- a/src/mesa/pipe/i915simple/i915_context.c
+++ b/src/mesa/pipe/i915simple/i915_context.c
@@ -149,6 +149,22 @@ static void i915_destroy( struct pipe_context *pipe )
 
 
 
+static void
+i915_begin_query(struct pipe_context *pipe, struct pipe_query_object *q)
+{
+   /* should never be called */
+   assert(0);
+}
+
+
+static void
+i915_end_query(struct pipe_context *pipe, struct pipe_query_object *q)
+{
+   /* should never be called */
+   assert(0);
+}
+
+
 static boolean i915_draw_elements( struct pipe_context *pipe,
                                 struct pipe_buffer_handle *indexBuffer,
                                 unsigned indexSize,
@@ -257,8 +273,9 @@ struct pipe_context *i915_create( struct pipe_winsys *pipe_winsys,
    i915->pipe.supported_formats = i915_supported_formats;
    i915->pipe.max_texture_size = i915_max_texture_size;
    i915->pipe.clear = i915_clear;
-   i915->pipe.reset_occlusion_counter = NULL; /* no support */
-   i915->pipe.get_occlusion_counter = NULL;
+
+   i915->pipe.begin_query = i915_begin_query;
+   i915->pipe.end_query = i915_end_query;
 
    i915->pipe.draw_arrays = i915_draw_arrays;
    i915->pipe.draw_elements = i915_draw_elements;
diff --git a/src/mesa/pipe/p_context.h b/src/mesa/pipe/p_context.h
index 27a1128365..dafbef410e 100644
--- a/src/mesa/pipe/p_context.h
+++ b/src/mesa/pipe/p_context.h
@@ -75,11 +75,12 @@ struct pipe_context {
    void (*clear)(struct pipe_context *pipe, struct pipe_surface *ps,
                  unsigned clearValue);
 
-   /** occlusion counting (XXX this may be temporary - we should probably
-    * have generic query objects with begin/end methods)
+   /**
+    * Query objects
     */
-   void (*reset_occlusion_counter)(struct pipe_context *pipe);
-   unsigned (*get_occlusion_counter)(struct pipe_context *pipe);
+   void (*begin_query)(struct pipe_context *pipe, struct pipe_query_object *q);
+   void (*end_query)(struct pipe_context *pipe, struct pipe_query_object *q);
+   void (*wait_query)(struct pipe_context *pipe, struct pipe_query_object *q);
 
    /*
     * State functions
diff --git a/src/mesa/pipe/p_defines.h b/src/mesa/pipe/p_defines.h
index c1164c5c08..b3ee890576 100644
--- a/src/mesa/pipe/p_defines.h
+++ b/src/mesa/pipe/p_defines.h
@@ -299,4 +299,12 @@
 #define PIPE_PRIM_POLYGON         9
 
 
+/**
+ * Query object types
+ */
+#define PIPE_QUERY_OCCLUSION_COUNTER     0
+#define PIPE_QUERY_PRIMITIVES_GENERATED  1
+#define PIPE_QUERY_PRIMITIVES_EMITTED    2
+#define PIPE_QUERY_TYPES                 3
+
 #endif
diff --git a/src/mesa/pipe/p_state.h b/src/mesa/pipe/p_state.h
index ccd40d39e6..b994d17ea9 100644
--- a/src/mesa/pipe/p_state.h
+++ b/src/mesa/pipe/p_state.h
@@ -381,4 +381,14 @@ struct pipe_feedback_buffer {
 };
 
 
+/**
+ * Hardware queries (occlusion, transform feedback, timing, etc)
+ */
+struct pipe_query_object {
+   uint type:3;   /**< PIPE_QUERY_x */
+   uint ready:1;  /**< is result ready? */
+   uint64 count;
+};
+
+
 #endif
diff --git a/src/mesa/pipe/softpipe/sp_context.c b/src/mesa/pipe/softpipe/sp_context.c
index 26453d9785..92357808e2 100644
--- a/src/mesa/pipe/softpipe/sp_context.c
+++ b/src/mesa/pipe/softpipe/sp_context.c
@@ -195,19 +195,37 @@ static void softpipe_destroy( struct pipe_context *pipe )
 }
 
 
-static void softpipe_reset_occlusion_counter(struct pipe_context *pipe)
+static void
+softpipe_begin_query(struct pipe_context *pipe, struct pipe_query_object *q)
 {
    struct softpipe_context *softpipe = softpipe_context( pipe );
-   softpipe->occlusion_counter = 0;
+   assert(q->type < PIPE_QUERY_TYPES);
+   assert(!softpipe->queries[q->type]);
+   softpipe->queries[q->type] = q;
 }
 
-/* XXX pipe param should be const */
-static unsigned softpipe_get_occlusion_counter(struct pipe_context *pipe)
+
+static void
+softpipe_end_query(struct pipe_context *pipe, struct pipe_query_object *q)
 {
    struct softpipe_context *softpipe = softpipe_context( pipe );
-   return softpipe->occlusion_counter;
+   assert(q->type < PIPE_QUERY_TYPES);
+   assert(softpipe->queries[q->type]);
+   q->ready = 1;  /* software rendering is synchronous */
+   softpipe->queries[q->type] = NULL;
+}
+
+
+static void
+softpipe_wait_query(struct pipe_context *pipe, struct pipe_query_object *q)
+{
+   /* Should never get here since we indicated that the result was
+    * ready in softpipe_end_query().
+    */
+   assert(0);
 }
 
+
 static const char *softpipe_get_name( struct pipe_context *pipe )
 {
    return "softpipe";
@@ -260,8 +278,11 @@ struct pipe_context *softpipe_create( struct pipe_winsys *pipe_winsys,
 
    softpipe->pipe.clear = softpipe_clear;
    softpipe->pipe.flush = softpipe_flush;
-   softpipe->pipe.reset_occlusion_counter = softpipe_reset_occlusion_counter;
-   softpipe->pipe.get_occlusion_counter = softpipe_get_occlusion_counter;
+
+   softpipe->pipe.begin_query = softpipe_begin_query;
+   softpipe->pipe.end_query = softpipe_end_query;
+   softpipe->pipe.wait_query = softpipe_wait_query;
+
    softpipe->pipe.get_name = softpipe_get_name;
    softpipe->pipe.get_vendor = softpipe_get_vendor;
 
diff --git a/src/mesa/pipe/softpipe/sp_context.h b/src/mesa/pipe/softpipe/sp_context.h
index 2a6b932523..13d1143c89 100644
--- a/src/mesa/pipe/softpipe/sp_context.h
+++ b/src/mesa/pipe/softpipe/sp_context.h
@@ -93,6 +93,11 @@ struct softpipe_context {
    struct pipe_vertex_element vertex_element[PIPE_ATTRIB_MAX];
    unsigned dirty;
 
+   /*
+    * Active queries
+    */
+   struct pipe_query_object *queries[PIPE_QUERY_TYPES];
+
    /*
     * Mapped vertex buffers
     */
@@ -120,8 +125,6 @@ struct softpipe_context {
    /** Derived from scissor and surface bounds: */
    struct pipe_scissor_state cliprect;
 
-   unsigned occlusion_counter;
-
    unsigned line_stipple_counter;
 
    /** Software quad rendering pipeline */
diff --git a/src/mesa/pipe/softpipe/sp_quad_occlusion.c b/src/mesa/pipe/softpipe/sp_quad_occlusion.c
index 6b094a5bef..4f178f0557 100644
--- a/src/mesa/pipe/softpipe/sp_quad_occlusion.c
+++ b/src/mesa/pipe/softpipe/sp_quad_occlusion.c
@@ -44,11 +44,13 @@ static void
 occlusion_count_quad(struct quad_stage *qs, struct quad_header *quad)
 {
    struct softpipe_context *softpipe = qs->softpipe;
+   struct pipe_query_object *occ
+      = softpipe->queries[PIPE_QUERY_OCCLUSION_COUNTER];
 
-   softpipe->occlusion_counter += (quad->mask     ) & 1;
-   softpipe->occlusion_counter += (quad->mask >> 1) & 1;
-   softpipe->occlusion_counter += (quad->mask >> 2) & 1;
-   softpipe->occlusion_counter += (quad->mask >> 3) & 1;
+   occ->count += (quad->mask     ) & 1;
+   occ->count += (quad->mask >> 1) & 1;
+   occ->count += (quad->mask >> 2) & 1;
+   occ->count += (quad->mask >> 3) & 1;
 
    if (quad->mask)
       qs->next->run(qs->next, quad);
diff --git a/src/mesa/state_tracker/st_cb_queryobj.c b/src/mesa/state_tracker/st_cb_queryobj.c
index 3a8fbde8ab..5b95dd7fd3 100644
--- a/src/mesa/state_tracker/st_cb_queryobj.c
+++ b/src/mesa/state_tracker/st_cb_queryobj.c
@@ -44,33 +44,102 @@
 #include "st_public.h"
 
 
+struct st_query_object
+{
+   struct gl_query_object base;
+   struct pipe_query_object pq;
+};
+
+
+/**
+ * Cast wrapper
+ */
+static struct st_query_object *
+st_query_object(struct gl_query_object *q)
+{
+   return (struct st_query_object *) q;
+}
+
+
+static struct gl_query_object *
+st_NewQueryObject(GLcontext *ctx, GLuint id)
+{
+   struct st_query_object *stq = CALLOC_STRUCT(st_query_object);
+   if (stq) {
+      stq->base.Id = id;
+      stq->base.Ready = GL_TRUE;
+      return &stq->base;
+   }
+   return NULL;
+}
+
+
 /**
  * Do glReadPixels by getting rows from the framebuffer surface with
  * get_tile().  Convert to requested format/type with Mesa image routines.
  * Image transfer ops are done in software too.
  */
 static void
-st_BeginQuery(GLcontext *ctx, GLenum target, struct gl_query_object *q)
+st_BeginQuery(GLcontext *ctx, struct gl_query_object *q)
 {
    struct pipe_context *pipe = ctx->st->pipe;
-   if (target == GL_SAMPLES_PASSED_ARB) {
-      pipe->reset_occlusion_counter(pipe);
+   struct st_query_object *stq = st_query_object(q);
+
+   stq->pq.count = 0;
+
+   switch (q->Target) {
+   case GL_SAMPLES_PASSED_ARB:
+      stq->pq.type = PIPE_QUERY_OCCLUSION_COUNTER;
+      break;
+   case GL_PRIMITIVES_GENERATED_NV:
+      /* someday */
+      stq->pq.type = PIPE_QUERY_PRIMITIVES_GENERATED;
+      break;
+   case GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_NV:
+      /* someday */
+      stq->pq.type = PIPE_QUERY_PRIMITIVES_EMITTED;
+      break;
+   default:
+      assert(0);
    }
+
+   pipe->begin_query(pipe, &stq->pq);
 }
 
 
 static void
-st_EndQuery(GLcontext *ctx, GLenum target, struct gl_query_object *q)
+st_EndQuery(GLcontext *ctx, struct gl_query_object *q)
 {
    struct pipe_context *pipe = ctx->st->pipe;
-   if (target == GL_SAMPLES_PASSED_ARB) {
-      q->Result = pipe->get_occlusion_counter(pipe);
-   }
+   struct st_query_object *stq = st_query_object(q);
+
+   pipe->end_query(pipe, &stq->pq);
+   stq->base.Ready = stq->pq.ready;
+   if (stq->base.Ready)
+      stq->base.Result = stq->pq.count;
+}
+
+
+static void
+st_WaitQuery(GLcontext *ctx, struct gl_query_object *q)
+{
+   struct pipe_context *pipe = ctx->st->pipe;
+   struct st_query_object *stq = st_query_object(q);
+
+   /* this function should only be called if we don't have a ready result */
+   assert(!stq->base.Ready);
+
+   pipe->wait_query(pipe, &stq->pq);
+   q->Ready = GL_TRUE;
+   q->Result = stq->pq.count;
 }
 
 
+
 void st_init_query_functions(struct dd_function_table *functions)
 {
+   functions->NewQueryObject = st_NewQueryObject;
    functions->BeginQuery = st_BeginQuery;
    functions->EndQuery = st_EndQuery;
+   functions->WaitQuery = st_WaitQuery;
 }
-- 
cgit v1.2.3


From 63be96bdc7e9f388a5c49295bd7e150462fd003a Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Tue, 18 Sep 2007 19:29:26 -0600
Subject: temporarily set the FRAG_BIT_FOGC bit in InputsRead when fog is
 enabled

---
 src/mesa/main/texenvprogram.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 72b54b27d9..37f8fc8090 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -1081,6 +1081,7 @@ create_new_program(GLcontext *ctx, struct state_key *key,
        * a reduced value and not what is expected in FogOption
        */
       p.program->FogOption = ctx->Fog.Mode;
+      p.program->Base.InputsRead |= FRAG_BIT_FOGC; /* XXX new */
    } else
       p.program->FogOption = GL_NONE;
 
-- 
cgit v1.2.3


From 3bf8d2ac7108a7f0f1722e411161e013bb8573f0 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Tue, 25 Sep 2007 15:18:51 -0600
Subject: Disable vertex shader fog, compute fog in fragment shader.

---
 src/mesa/main/texenvprogram.c       | 16 +++++++++++-----
 src/mesa/state_tracker/st_context.c |  5 +++++
 2 files changed, 16 insertions(+), 5 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 37f8fc8090..48c28d45ca 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -1097,15 +1097,21 @@ create_new_program(GLcontext *ctx, struct state_key *key,
    ASSERT(p.program->Base.NumInstructions <= MAX_INSTRUCTIONS);
 
    /* Allocate final instruction array */
-   program->Base.Instructions
-      = _mesa_alloc_instructions(program->Base.NumInstructions);
-   if (!program->Base.Instructions) {
+   p.program->Base.Instructions
+      = _mesa_alloc_instructions(p.program->Base.NumInstructions);
+   if (!p.program->Base.Instructions) {
       _mesa_error(ctx, GL_OUT_OF_MEMORY,
                   "generating tex env program");
       return;
    }
-   _mesa_copy_instructions(program->Base.Instructions, instBuffer,
-                           program->Base.NumInstructions);
+   _mesa_copy_instructions(p.program->Base.Instructions, instBuffer,
+                           p.program->Base.NumInstructions);
+
+   if (p.program->FogOption) {
+      _mesa_append_fog_code(ctx, p.program);
+      p.program->FogOption = GL_NONE;
+   }
+
 
    /* Notify driver the fragment program has (actually) changed.
     */
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index e0304dd22d..7c20b036a4 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -26,6 +26,8 @@
  **************************************************************************/
 
 #include "main/imports.h"
+#include "main/extensions.h"
+#include "tnl/tnl.h"
 #include "vbo/vbo.h"
 #include "st_public.h"
 #include "st_context.h"
@@ -98,6 +100,9 @@ struct st_context *st_create_context( GLcontext *ctx,
    /* XXXX This is temporary! */
    _mesa_enable_sw_extensions(ctx);
 
+   /* we'll always do per-pixel fog in the fragment shader */
+   _tnl_allow_vertex_fog(ctx, GL_FALSE);
+
    return st;
 }
 
-- 
cgit v1.2.3


From 83fad68ec1989c719646a76f4cc5e0b3d23537ed Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Tue, 25 Sep 2007 15:20:04 -0600
Subject: include programopt.h

---
 src/mesa/main/texenvprogram.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 48c28d45ca..cdf35b4636 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -32,6 +32,7 @@
 #include "shader/prog_instruction.h"
 #include "shader/prog_print.h"
 #include "shader/prog_statevars.h"
+#include "shader/programopt.h"
 #include "texenvprogram.h"
 
 /**
-- 
cgit v1.2.3


From 324ecadbfdf9b944e059832f146451e4151dcb21 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Wed, 26 Sep 2007 17:03:11 -0600
Subject: Added new _mesa_clip_copytexsubimage() function to do avoid clipping
 down in the drivers.

This should probably be pulled into main-line Mesa...
---
 src/mesa/main/image.c    | 31 +++++++++++++++++++++++++++++++
 src/mesa/main/image.h    |  6 ++++++
 src/mesa/main/teximage.c | 30 +++++++++++++++++++++++-------
 3 files changed, 60 insertions(+), 7 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index ba46cdc1b1..ae3c82b810 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -4624,6 +4624,37 @@ _mesa_clip_readpixels(const GLcontext *ctx,
 }
 
 
+/**
+ * Do clipping for a glCopyTexSubImage call.
+ * The framebuffer source region might extend outside the framebuffer
+ * bounds.  Clip the source region against the framebuffer bounds and
+ * adjust the texture/dest position and size accordingly.
+ *
+ * \return GL_FALSE if region is totally clipped, GL_TRUE otherwise.
+ */
+GLboolean
+_mesa_clip_copytexsubimage(const GLcontext *ctx,
+                           GLint *destX, GLint *destY,
+                           GLint *srcX, GLint *srcY,
+                           GLsizei *width, GLsizei *height)
+{
+   const struct gl_framebuffer *fb = ctx->ReadBuffer;
+   const GLint srcX0 = *srcX, srcY0 = *srcY;
+
+   if (_mesa_clip_to_region(fb->_Xmin, fb->_Ymin, fb->_Xmax, fb->_Ymax,
+                            srcX, srcY, width, height)) {
+      *destX = *destX + *srcX - srcX0;
+      *destY = *destY + *srcY - srcY0;
+
+      return GL_TRUE;
+   }
+   else {
+      return GL_FALSE;
+   }
+}
+
+
+
 /**
  * Clip the rectangle defined by (x, y, width, height) against the bounds
  * specified by [xmin, xmax) and [ymin, ymax).
diff --git a/src/mesa/main/image.h b/src/mesa/main/image.h
index 2a16989fa7..c379d5fa7d 100644
--- a/src/mesa/main/image.h
+++ b/src/mesa/main/image.h
@@ -224,6 +224,12 @@ _mesa_clip_readpixels(const GLcontext *ctx,
                       GLsizei *width, GLsizei *height,
                       struct gl_pixelstore_attrib *pack);
 
+extern GLboolean
+_mesa_clip_copytexsubimage(const GLcontext *ctx,
+                           GLint *destX, GLint *destY,
+                           GLint *srcX, GLint *srcY,
+                           GLsizei *width, GLsizei *height);
+                           
 extern GLboolean
 _mesa_clip_to_region(GLint xmin, GLint ymin,
                      GLint xmax, GLint ymax,
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 3420d8e2ba..09ec0d4553 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -3024,6 +3024,9 @@ _mesa_CopyTexSubImage1D( GLenum target, GLint level,
    struct gl_texture_object *texObj;
    struct gl_texture_image *texImage;
    GLsizei postConvWidth = width;
+   GLint yoffset = 0;
+   GLsizei height = 1;
+
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
@@ -3053,8 +3056,13 @@ _mesa_CopyTexSubImage1D( GLenum target, GLint level,
       /* If we have a border, xoffset=-1 is legal.  Bias by border width */
       xoffset += texImage->Border;
 
-      ASSERT(ctx->Driver.CopyTexSubImage1D);
-      (*ctx->Driver.CopyTexSubImage1D)(ctx, target, level, xoffset, x, y, width);
+      if (_mesa_clip_copytexsubimage(ctx, &xoffset, &yoffset, &x, &y,
+                                     &width, &height)) {
+         ASSERT(ctx->Driver.CopyTexSubImage1D);
+         ctx->Driver.CopyTexSubImage1D(ctx, target, level,
+                                       xoffset, x, y, width);
+      }
+
       ctx->NewState |= _NEW_TEXTURE;
    }
  out:
@@ -3099,10 +3107,14 @@ _mesa_CopyTexSubImage2D( GLenum target, GLint level,
       /* If we have a border, xoffset=-1 is legal.  Bias by border width */
       xoffset += texImage->Border;
       yoffset += texImage->Border;
-      
-      ASSERT(ctx->Driver.CopyTexSubImage2D);
-      (*ctx->Driver.CopyTexSubImage2D)(ctx, target, level,
+
+      if (_mesa_clip_copytexsubimage(ctx, &xoffset, &yoffset, &x, &y,
+                                     &width, &height)) {
+         ASSERT(ctx->Driver.CopyTexSubImage2D);
+         ctx->Driver.CopyTexSubImage2D(ctx, target, level,
 				       xoffset, yoffset, x, y, width, height);
+      }
+
       ctx->NewState |= _NEW_TEXTURE;
    }
  out:
@@ -3150,10 +3162,14 @@ _mesa_CopyTexSubImage3D( GLenum target, GLint level,
       yoffset += texImage->Border;
       zoffset += texImage->Border;
       
-      ASSERT(ctx->Driver.CopyTexSubImage3D);
-      (*ctx->Driver.CopyTexSubImage3D)(ctx, target, level,
+      if (_mesa_clip_copytexsubimage(ctx, &xoffset, &yoffset, &x, &y,
+                                     &width, &height)) {
+         ASSERT(ctx->Driver.CopyTexSubImage3D);
+         ctx->Driver.CopyTexSubImage3D(ctx, target, level,
 				       xoffset, yoffset, zoffset,
 				       x, y, width, height);
+      }
+
       ctx->NewState |= _NEW_TEXTURE;
    }
  out:
-- 
cgit v1.2.3


From fcd4eeb743c717d48166e38a57fcd4a1752e32ab Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Wed, 26 Sep 2007 18:34:13 -0600
Subject: don't use scissored bounds in _mesa_clip_copytexsubimage()

---
 src/mesa/main/image.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index ae3c82b810..76e105e65e 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -4641,7 +4641,7 @@ _mesa_clip_copytexsubimage(const GLcontext *ctx,
    const struct gl_framebuffer *fb = ctx->ReadBuffer;
    const GLint srcX0 = *srcX, srcY0 = *srcY;
 
-   if (_mesa_clip_to_region(fb->_Xmin, fb->_Ymin, fb->_Xmax, fb->_Ymax,
+   if (_mesa_clip_to_region(0, 0, fb->Width, fb->Height,
                             srcX, srcY, width, height)) {
       *destX = *destX + *srcX - srcX0;
       *destY = *destY + *srcY - srcY0;
-- 
cgit v1.2.3


From d781cdc8fadc802a1f2edbeb13ccb1ee768ce803 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Tue, 2 Oct 2007 16:55:21 -0600
Subject: Generate a texenv fragment program if there's a GLSL vertex shader
 but no GLSL fragment shader.

This allows Glean glsl1 test to get pretty far.
---
 src/mesa/main/texenvprogram.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index cdf35b4636..a554c033c4 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -1247,7 +1247,8 @@ _mesa_UpdateTexEnvProgram( GLcontext *ctx )
 
    /* If a conventional fragment program/shader isn't in effect... */
    if (!ctx->FragmentProgram._Enabled &&
-       !ctx->Shader.CurrentProgram) {
+       (!ctx->Shader.CurrentProgram ||
+        !ctx->Shader.CurrentProgram->FragmentProgram) ) {
       make_state_key(ctx, &key);
       hash = hash_key(&key);
       
-- 
cgit v1.2.3


From ce8988018ca2d838c93df904271b2afc62d6b021 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Mon, 15 Oct 2007 15:30:45 -0600
Subject: check for width or height = 0 before calling driver Bitmap func

---
 src/mesa/main/drawpix.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index c82abccc41..296dcf8f0b 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -341,7 +341,7 @@ _mesa_Bitmap( GLsizei width, GLsizei height,
    }
 
    if (ctx->RenderMode == GL_RENDER) {
-      if (bitmap) {
+      if (bitmap && width && height) {
          /* Truncate, to satisfy conformance tests (matches SGI's OpenGL). */
          GLint x = IFLOOR(ctx->Current.RasterPos[0] - xorig);
          GLint y = IFLOOR(ctx->Current.RasterPos[1] - yorig);
-- 
cgit v1.2.3


From 49adf51eeec31c9f3c995a70acc5008522689708 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Wed, 17 Oct 2007 16:18:45 -0600
Subject: Add some FLUSH_CURRENT() calls.

Without these we can find ourselves in _mesa_load_state_parameters()
computing derived lighting/material values whhen the current material
properties haven't been updated from the VBO.
This may be a somewhat wide-spread problem that needs more attention...
---
 src/mesa/main/buffers.c | 2 ++
 src/mesa/main/drawpix.c | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c
index 0e6ca8ea1c..7a918c53a7 100644
--- a/src/mesa/main/buffers.c
+++ b/src/mesa/main/buffers.c
@@ -118,6 +118,8 @@ _mesa_Clear( GLbitfield mask )
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
+   FLUSH_CURRENT(ctx, 0);
+
    if (MESA_VERBOSE & VERBOSE_API)
       _mesa_debug(ctx, "glClear 0x%x\n", mask);
 
diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index 296dcf8f0b..e4be0d496e 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -276,6 +276,8 @@ _mesa_ReadPixels( GLint x, GLint y, GLsizei width, GLsizei height,
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
+   FLUSH_CURRENT(ctx, 0);
+
    if (width < 0 || height < 0) {
       _mesa_error( ctx, GL_INVALID_VALUE,
                    "glReadPixels(width=%d height=%d)", width, height );
-- 
cgit v1.2.3


From 96b06ac557b721f0b1b9cc05b1d2b3a289701ae5 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Fri, 19 Oct 2007 10:12:00 -0600
Subject: call Driver.Flush() in _mesa_notifySwapBuffers()

---
 src/mesa/main/context.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 00e4c8328e..e8335e19ca 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -163,9 +163,11 @@ free_shared_state( GLcontext *ctx, struct gl_shared_state *ss );
  * We have to finish any pending rendering.
  */
 void
-_mesa_notifySwapBuffers(__GLcontext *gc)
+_mesa_notifySwapBuffers(__GLcontext *ctx)
 {
-   FLUSH_VERTICES( gc, 0 );
+   if (ctx->Driver.Flush) {
+      ctx->Driver.Flush(ctx);
+   }
 }
 
 
-- 
cgit v1.2.3


From e69943e6dda102df8418a8261b95155350181a2f Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Tue, 23 Oct 2007 10:23:01 -0600
Subject: bump up MAX_INSTRUCTIONS and add an assertion to catch emitting too
 many instructions

---
 src/mesa/main/texenvprogram.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index a554c033c4..2614440a74 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -36,10 +36,11 @@
 #include "texenvprogram.h"
 
 /**
- * According to Glean's texCombine test, no more than 21 instructions
- * are needed.  Allow a few extra just in case.
+ * This MAX is probably a bit generous, but that's OK.  There can be
+ * up to four instructions per texture unit (TEX + 3 for combine),
+ * then there's fog and specular add.
  */
-#define MAX_INSTRUCTIONS 24
+#define MAX_INSTRUCTIONS ((MAX_TEXTURE_UNITS * 4) + 12)
 
 #define DISASSEM (MESA_VERBOSE & VERBOSE_DISASSEM)
 
@@ -478,6 +479,8 @@ emit_op(struct texenv_fragment_program *p,
    GLuint nr = p->program->Base.NumInstructions++;
    struct prog_instruction *inst = &p->program->Base.Instructions[nr];
       
+   assert(nr < MAX_INSTRUCTIONS);
+
    _mesa_init_instructions(inst, 1);
    inst->Opcode = op;
    
-- 
cgit v1.2.3


From 112a1580f658948e553fe04399a20958dca67c16 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Tue, 23 Oct 2007 10:54:50 -0600
Subject: properly init dst reg's CondMask/Swizzle fields

---
 src/mesa/main/texenvprogram.c | 4 ++--
 src/mesa/tnl/t_vp_build.c     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 2614440a74..abc2567134 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -462,8 +462,8 @@ static void emit_dst( struct prog_dst_register *dst,
    dst->File = ureg.file;
    dst->Index = ureg.idx;
    dst->WriteMask = mask;
-   dst->CondMask = 0;
-   dst->CondSwizzle = 0;
+   dst->CondMask = COND_TR;  /* always pass cond test */
+   dst->CondSwizzle = SWIZZLE_NOOP;
 }
 
 static struct prog_instruction *
diff --git a/src/mesa/tnl/t_vp_build.c b/src/mesa/tnl/t_vp_build.c
index cbffed5155..dc2d5e0065 100644
--- a/src/mesa/tnl/t_vp_build.c
+++ b/src/mesa/tnl/t_vp_build.c
@@ -488,8 +488,8 @@ static void emit_dst( struct prog_dst_register *dst,
    dst->Index = reg.idx;
    /* allow zero as a shorthand for xyzw */
    dst->WriteMask = mask ? mask : WRITEMASK_XYZW; 
-   dst->CondMask = COND_TR;
-   dst->CondSwizzle = 0;
+   dst->CondMask = COND_TR;  /* always pass cond test */
+   dst->CondSwizzle = SWIZZLE_NOOP;
    dst->CondSrc = 0;
    dst->pad = 0;
 }
@@ -512,7 +512,7 @@ static void debug_insn( struct prog_instruction *inst, const char *fn,
 
 
 static void emit_op3fn(struct tnl_program *p,
-		       GLuint op,
+                       enum prog_opcode op,
 		       struct ureg dest,
 		       GLuint mask,
 		       struct ureg src0,
-- 
cgit v1.2.3


From 8fed2466e4056668a76a87cf935b5fbff8ae15ca Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Fri, 26 Oct 2007 19:19:09 -0600
Subject: Re-implement GLSL texture sampler variables.

GLSL sampler variables indicate which texture unit to use for TEX instructions.
Previously, this was baked into the fragment/vertex program and couldn't be
readily changed once set.
Now, SamplerUnits[] array indicates which texture unit is to be used for
each sampler variable.  These values are set with glUniform1i().
This is extra state that must be passed to the fragment/vertex program
executor at runtime.
---
 src/mesa/main/config.h                    |   1 +
 src/mesa/main/mtypes.h                    |   6 ++
 src/mesa/pipe/failover/fo_context.h       |   1 +
 src/mesa/pipe/failover/fo_state.c         |  14 ++++
 src/mesa/pipe/i915simple/i915_context.h   |   1 +
 src/mesa/pipe/i915simple/i915_state.c     |  10 +++
 src/mesa/pipe/p_context.h                 |   3 +
 src/mesa/pipe/softpipe/sp_context.c       |   1 +
 src/mesa/pipe/softpipe/sp_context.h       |   1 +
 src/mesa/pipe/softpipe/sp_quad_fs.c       |   1 +
 src/mesa/pipe/softpipe/sp_state.h         |   3 +
 src/mesa/pipe/softpipe/sp_state_sampler.c |  14 ++++
 src/mesa/pipe/tgsi/exec/tgsi_exec.c       |   5 +-
 src/mesa/pipe/tgsi/exec/tgsi_exec.h       |   1 +
 src/mesa/shader/prog_execute.c            |  16 ++---
 src/mesa/shader/prog_execute.h            |   2 +
 src/mesa/shader/prog_instruction.c        |  11 +++
 src/mesa/shader/prog_instruction.h        |   5 ++
 src/mesa/shader/prog_parameter.c          |   7 +-
 src/mesa/shader/prog_parameter.h          |   2 +-
 src/mesa/shader/prog_print.c              |   7 ++
 src/mesa/shader/program.c                 |   5 ++
 src/mesa/shader/shader_api.c              | 113 +++++++++++++++++++-----------
 src/mesa/shader/slang/slang_codegen.c     |  15 +++-
 src/mesa/shader/slang/slang_compile.c     |   6 ++
 src/mesa/shader/slang/slang_emit.c        |   6 +-
 src/mesa/shader/slang/slang_link.c        |  71 +++++++------------
 src/mesa/shader/slang/slang_link.h        |   4 --
 src/mesa/shader/slang/slang_typeinfo.h    |   1 +
 src/mesa/state_tracker/st_atom_sampler.c  |  33 ++++++++-
 src/mesa/swrast/s_fragprog.c              |   2 +
 31 files changed, 262 insertions(+), 106 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index cebef1c383..8c64248845 100644
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -207,6 +207,7 @@
 #define MAX_PROGRAM_ADDRESS_REGS 2
 #define MAX_UNIFORMS 128
 #define MAX_VARYING 8
+#define MAX_SAMPLERS 8
 /*@}*/
 
 /** For GL_ARB_vertex_shader */
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 514170dbcf..8adc4e3373 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1901,6 +1901,7 @@ struct gl_program
    GLbitfield InputsRead;     /**< Bitmask of which input regs are read */
    GLbitfield OutputsWritten; /**< Bitmask of which output regs are written to */
    GLbitfield TexturesUsed[MAX_TEXTURE_IMAGE_UNITS];  /**< TEXTURE_x_BIT bitmask */
+   GLbitfield SamplersUsed;   /**< Bitfield of which samplers are used */
    GLbitfield ShadowSamplers; /**< Texture units used for shadow sampling. */
 
    /** Named parameters, constants, etc. from program text */
@@ -1913,6 +1914,11 @@ struct gl_program
    /** Vertex program user-defined attributes */
    struct gl_program_parameter_list *Attributes;
 
+   /** Map from sampler unit to texture unit (set by glUniform1i()) */
+   GLubyte SamplerUnits[MAX_SAMPLERS];
+   /** Which texture target is being sampled (TEXTURE_1D/2D/3D/etc_INDEX) */
+   GLubyte SamplerTargets[MAX_SAMPLERS];
+
    /** Logical counts */
    /*@{*/
    GLuint NumInstructions;
diff --git a/src/mesa/pipe/failover/fo_context.h b/src/mesa/pipe/failover/fo_context.h
index 7a597013ab..759b53ccbe 100644
--- a/src/mesa/pipe/failover/fo_context.h
+++ b/src/mesa/pipe/failover/fo_context.h
@@ -84,6 +84,7 @@ struct failover_context {
    struct pipe_framebuffer_state framebuffer;
    struct pipe_poly_stipple poly_stipple;
    struct pipe_scissor_state scissor;
+   uint sampler_units[PIPE_MAX_SAMPLERS];
    struct pipe_mipmap_tree *texture[PIPE_MAX_SAMPLERS];
    struct pipe_viewport_state viewport;
    struct pipe_vertex_buffer vertex_buffer[PIPE_ATTRIB_MAX];
diff --git a/src/mesa/pipe/failover/fo_state.c b/src/mesa/pipe/failover/fo_state.c
index f63137f591..2cd1a50b20 100644
--- a/src/mesa/pipe/failover/fo_state.c
+++ b/src/mesa/pipe/failover/fo_state.c
@@ -294,6 +294,19 @@ failover_set_polygon_stipple( struct pipe_context *pipe,
    failover->hw->set_polygon_stipple( failover->hw, stipple );
 }
 
+static void
+failover_set_sampler_units( struct pipe_context *pipe,
+                            uint num_samplers, const uint *units )
+{
+   struct failover_context *failover = failover_context(pipe);
+   uint i;
+
+   for (i = 0; i < num_samplers; i++)
+      failover->sampler_units[i] = units[i];
+   failover->dirty |= FO_NEW_SAMPLER;
+   failover->hw->set_sampler_units(failover->hw, num_samplers, units);
+}
+
 static void *
 failover_create_rasterizer_state(struct pipe_context *pipe,
                                  const struct pipe_rasterizer_state *templ)
@@ -470,6 +483,7 @@ failover_init_state_functions( struct failover_context *failover )
    failover->pipe.set_clear_color_state = failover_set_clear_color_state;
    failover->pipe.set_framebuffer_state = failover_set_framebuffer_state;
    failover->pipe.set_polygon_stipple = failover_set_polygon_stipple;
+   failover->pipe.set_sampler_units = failover_set_sampler_units;
    failover->pipe.set_scissor_state = failover_set_scissor_state;
    failover->pipe.set_texture_state = failover_set_texture_state;
    failover->pipe.set_viewport_state = failover_set_viewport_state;
diff --git a/src/mesa/pipe/i915simple/i915_context.h b/src/mesa/pipe/i915simple/i915_context.h
index a3dd392e75..5a3ecedad2 100644
--- a/src/mesa/pipe/i915simple/i915_context.h
+++ b/src/mesa/pipe/i915simple/i915_context.h
@@ -173,6 +173,7 @@ struct i915_context
    struct pipe_framebuffer_state framebuffer;
    struct pipe_poly_stipple poly_stipple;
    struct pipe_scissor_state scissor;
+   uint sampler_units[PIPE_MAX_SAMPLERS];
    struct pipe_mipmap_tree *texture[PIPE_MAX_SAMPLERS];
    struct pipe_viewport_state viewport;
    struct pipe_vertex_buffer vertex_buffer[PIPE_ATTRIB_MAX];
diff --git a/src/mesa/pipe/i915simple/i915_state.c b/src/mesa/pipe/i915simple/i915_state.c
index 8da5662e3f..05f8a6e1fd 100644
--- a/src/mesa/pipe/i915simple/i915_state.c
+++ b/src/mesa/pipe/i915simple/i915_state.c
@@ -446,6 +446,15 @@ static void i915_set_polygon_stipple( struct pipe_context *pipe,
 {
 }
 
+static void i915_set_sampler_units(struct pipe_context *pipe,
+                                   uint numSamplers, const uint *units)
+{
+   struct i915_context *i915 = i915_context(pipe);
+   uint i;
+   for (i = 0; i < numSamplers; i++)
+      i915->sampler_units[i] = units[i];
+}
+
 static void * i915_create_fs_state(struct pipe_context *pipe,
                                    const struct pipe_shader_state *templ)
 {
@@ -765,6 +774,7 @@ i915_init_state_functions( struct i915_context *i915 )
    i915->pipe.set_feedback_buffer = i915_set_feedback_buffer;
 
    i915->pipe.set_polygon_stipple = i915_set_polygon_stipple;
+   i915->pipe.set_sampler_units = i915_set_sampler_units;
    i915->pipe.set_scissor_state = i915_set_scissor_state;
    i915->pipe.set_texture_state = i915_set_texture_state;
    i915->pipe.set_viewport_state = i915_set_viewport_state;
diff --git a/src/mesa/pipe/p_context.h b/src/mesa/pipe/p_context.h
index 3a041f158b..5497f50f73 100644
--- a/src/mesa/pipe/p_context.h
+++ b/src/mesa/pipe/p_context.h
@@ -148,6 +148,9 @@ struct pipe_context {
    void (*set_polygon_stipple)( struct pipe_context *,
 				const struct pipe_poly_stipple * );
 
+   void (*set_sampler_units)( struct pipe_context *,
+                              uint num_samplers, const uint *units );
+
    void (*set_scissor_state)( struct pipe_context *,
                               const struct pipe_scissor_state * );
 
diff --git a/src/mesa/pipe/softpipe/sp_context.c b/src/mesa/pipe/softpipe/sp_context.c
index 476d4ac01c..58ef744f30 100644
--- a/src/mesa/pipe/softpipe/sp_context.c
+++ b/src/mesa/pipe/softpipe/sp_context.c
@@ -318,6 +318,7 @@ struct pipe_context *softpipe_create( struct pipe_winsys *pipe_winsys,
    softpipe->pipe.set_feedback_state = softpipe_set_feedback_state;
    softpipe->pipe.set_framebuffer_state = softpipe_set_framebuffer_state;
    softpipe->pipe.set_polygon_stipple = softpipe_set_polygon_stipple;
+   softpipe->pipe.set_sampler_units = softpipe_set_sampler_units;
    softpipe->pipe.set_scissor_state = softpipe_set_scissor_state;
    softpipe->pipe.set_texture_state = softpipe_set_texture_state;
    softpipe->pipe.set_viewport_state = softpipe_set_viewport_state;
diff --git a/src/mesa/pipe/softpipe/sp_context.h b/src/mesa/pipe/softpipe/sp_context.h
index 3e77bd6b85..88a418d3c7 100644
--- a/src/mesa/pipe/softpipe/sp_context.h
+++ b/src/mesa/pipe/softpipe/sp_context.h
@@ -95,6 +95,7 @@ struct softpipe_context {
    struct pipe_viewport_state viewport;
    struct pipe_vertex_buffer vertex_buffer[PIPE_ATTRIB_MAX];
    struct pipe_vertex_element vertex_element[PIPE_ATTRIB_MAX];
+   uint sampler_units[PIPE_MAX_SAMPLERS];
    unsigned dirty;
 
    /*
diff --git a/src/mesa/pipe/softpipe/sp_quad_fs.c b/src/mesa/pipe/softpipe/sp_quad_fs.c
index 3371b109fc..9b9504cd15 100644
--- a/src/mesa/pipe/softpipe/sp_quad_fs.c
+++ b/src/mesa/pipe/softpipe/sp_quad_fs.c
@@ -85,6 +85,7 @@ shade_quad(
    /* Consts does not require 16 byte alignment. */
    machine->Consts = softpipe->mapped_constants[PIPE_SHADER_FRAGMENT];
 
+   machine->SamplerUnits = softpipe->sampler_units;
    machine->InterpCoefs = quad->coef;
 
    machine->Inputs[0].xyzw[0].f[0] = fx;
diff --git a/src/mesa/pipe/softpipe/sp_state.h b/src/mesa/pipe/softpipe/sp_state.h
index c194f0ea0d..61532bcdeb 100644
--- a/src/mesa/pipe/softpipe/sp_state.h
+++ b/src/mesa/pipe/softpipe/sp_state.h
@@ -99,6 +99,9 @@ void softpipe_delete_vs_state(struct pipe_context *, void *);
 void softpipe_set_polygon_stipple( struct pipe_context *,
 				  const struct pipe_poly_stipple * );
 
+void softpipe_set_sampler_units( struct pipe_context *,
+                                 uint numSamplers, const uint *units );
+
 void softpipe_set_scissor_state( struct pipe_context *,
                                  const struct pipe_scissor_state * );
 
diff --git a/src/mesa/pipe/softpipe/sp_state_sampler.c b/src/mesa/pipe/softpipe/sp_state_sampler.c
index c00e815f2d..e70eabd578 100644
--- a/src/mesa/pipe/softpipe/sp_state_sampler.c
+++ b/src/mesa/pipe/softpipe/sp_state_sampler.c
@@ -78,3 +78,17 @@ softpipe_set_texture_state(struct pipe_context *pipe,
 
    softpipe->dirty |= SP_NEW_TEXTURE;
 }
+
+
+void
+softpipe_set_sampler_units(struct pipe_context *pipe,
+                           uint num_samplers, const uint *units )
+{
+   struct softpipe_context *softpipe = softpipe_context(pipe);
+   uint i;
+   for (i = 0; i < num_samplers; i++)
+      softpipe->sampler_units[i] = units[i];
+   softpipe->dirty |= SP_NEW_SAMPLER;
+}
+
+
diff --git a/src/mesa/pipe/tgsi/exec/tgsi_exec.c b/src/mesa/pipe/tgsi/exec/tgsi_exec.c
index 0125f40dd2..66a81b4bd8 100644
--- a/src/mesa/pipe/tgsi/exec/tgsi_exec.c
+++ b/src/mesa/pipe/tgsi/exec/tgsi_exec.c
@@ -1219,11 +1219,14 @@ exec_tex(struct tgsi_exec_machine *mach,
          const struct tgsi_full_instruction *inst,
          boolean biasLod)
 {
-   const uint unit = inst->FullSrcRegisters[1].SrcRegister.Index;
+   const uint sampler = inst->FullSrcRegisters[1].SrcRegister.Index;
+   const uint unit = mach->SamplerUnits[sampler];
    union tgsi_exec_channel r[8];
    uint chan_index;
    float lodBias;
 
+   //   printf("Sampler %u unit %u\n", sampler, unit);
+
    switch (inst->InstructionExtTexture.Texture) {
    case TGSI_TEXTURE_1D:
 
diff --git a/src/mesa/pipe/tgsi/exec/tgsi_exec.h b/src/mesa/pipe/tgsi/exec/tgsi_exec.h
index 1805e72487..38f9218520 100644
--- a/src/mesa/pipe/tgsi/exec/tgsi_exec.h
+++ b/src/mesa/pipe/tgsi/exec/tgsi_exec.h
@@ -118,6 +118,7 @@ struct tgsi_exec_machine
    struct tgsi_exec_vector       *Temps;
    struct tgsi_exec_vector       *Addrs;
 
+   uint                          *SamplerUnits;
    struct tgsi_sampler           *Samplers;
 
    float                         Imms[TGSI_EXEC_NUM_IMMEDIATES][4];
diff --git a/src/mesa/shader/prog_execute.c b/src/mesa/shader/prog_execute.c
index 28d195d0ee..bd64b57eb9 100644
--- a/src/mesa/shader/prog_execute.c
+++ b/src/mesa/shader/prog_execute.c
@@ -1316,22 +1316,22 @@ _mesa_execute_program(GLcontext * ctx,
              * The rest of the time, just use zero (until we get a more
              * sophisticated way of computing lambda).
              */
+            const GLuint unit = machine->Samplers[inst->TexSrcUnit];
             GLfloat coord[4], color[4], lambda;
 #if 0
             if (inst->SrcReg[0].File == PROGRAM_INPUT &&
-                inst->SrcReg[0].Index == FRAG_ATTRIB_TEX0 + inst->TexSrcUnit)
-               lambda = span->array->lambda[inst->TexSrcUnit][column];
+                inst->SrcReg[0].Index == FRAG_ATTRIB_TEX0 + unit)
+               lambda = span->array->lambda[unit][column];
             else
 #endif
                lambda = 0.0;
             fetch_vector4(&inst->SrcReg[0], machine, coord);
-            machine->FetchTexelLod(ctx, coord, lambda, inst->TexSrcUnit,
-                                   color);
+            machine->FetchTexelLod(ctx, coord, lambda, unit, color);
             if (DEBUG_PROG) {
                printf("TEX (%g, %g, %g, %g) = texture[%d][%g, %g, %g, %g], "
                       "lod %f\n",
                       color[0], color[1], color[2], color[3],
-                      inst->TexSrcUnit,
+                      unit,
                       coord[0], coord[1], coord[2], coord[3], lambda);
             }
             store_vector4(inst, machine, color);
@@ -1375,11 +1375,12 @@ _mesa_execute_program(GLcontext * ctx,
       case OPCODE_TXP:         /* GL_ARB_fragment_program only */
          /* Texture lookup w/ projective divide */
          {
+            const GLuint unit = machine->Samplers[inst->TexSrcUnit];
             GLfloat texcoord[4], color[4], lambda;
 #if 0
             if (inst->SrcReg[0].File == PROGRAM_INPUT &&
                 inst->SrcReg[0].Index == FRAG_ATTRIB_TEX0 + inst->TexSrcUnit)
-               lambda = span->array->lambda[inst->TexSrcUnit][column];
+               lambda = span->array->lambda[unit][column];
             else
 #endif
                lambda = 0.0;
@@ -1393,8 +1394,7 @@ _mesa_execute_program(GLcontext * ctx,
                texcoord[1] /= texcoord[3];
                texcoord[2] /= texcoord[3];
             }
-            machine->FetchTexelLod(ctx, texcoord, lambda,
-                                   inst->TexSrcUnit, color);
+            machine->FetchTexelLod(ctx, texcoord, lambda, unit, color);
             store_vector4(inst, machine, color);
          }
          break;
diff --git a/src/mesa/shader/prog_execute.h b/src/mesa/shader/prog_execute.h
index be29eceeda..db7bcee516 100644
--- a/src/mesa/shader/prog_execute.h
+++ b/src/mesa/shader/prog_execute.h
@@ -62,6 +62,8 @@ struct gl_program_machine
    GLuint CondCodes[4];  /**< COND_* value for x/y/z/w */
    GLint AddressReg[MAX_PROGRAM_ADDRESS_REGS][4];
 
+   GLuint *Samplers;  /** Array mapping sampler var to tex unit */
+
    GLuint CallStack[MAX_PROGRAM_CALL_DEPTH]; /**< For CAL/RET instructions */
    GLuint StackDepth; /**< Index/ptr to top of CallStack[] */
 
diff --git a/src/mesa/shader/prog_instruction.c b/src/mesa/shader/prog_instruction.c
index c84c76fd5b..066129037a 100644
--- a/src/mesa/shader/prog_instruction.c
+++ b/src/mesa/shader/prog_instruction.c
@@ -246,6 +246,17 @@ _mesa_num_inst_dst_regs(gl_inst_opcode opcode)
 }
 
 
+GLboolean
+_mesa_is_tex_instruction(gl_inst_opcode opcode)
+{
+   return (opcode == OPCODE_TEX ||
+           opcode == OPCODE_TXB ||
+           opcode == OPCODE_TXD ||
+           opcode == OPCODE_TXL ||
+           opcode == OPCODE_TXP);
+}
+
+
 /**
  * Return string name for given program opcode.
  */
diff --git a/src/mesa/shader/prog_instruction.h b/src/mesa/shader/prog_instruction.h
index 643969b367..e8a2407ea8 100644
--- a/src/mesa/shader/prog_instruction.h
+++ b/src/mesa/shader/prog_instruction.h
@@ -413,11 +413,13 @@ struct prog_instruction
     */
    GLint BranchTarget;
 
+#if 0
    /**
     * For TEX instructions in shaders, the sampler to use for the
     * texture lookup.
     */
    GLint Sampler;
+#endif
 
    const char *Comment;
 };
@@ -443,6 +445,9 @@ _mesa_num_inst_src_regs(gl_inst_opcode opcode);
 extern GLuint
 _mesa_num_inst_dst_regs(gl_inst_opcode opcode);
 
+extern GLboolean
+_mesa_is_tex_instruction(gl_inst_opcode opcode);
+
 extern const char *
 _mesa_opcode_string(gl_inst_opcode opcode);
 
diff --git a/src/mesa/shader/prog_parameter.c b/src/mesa/shader/prog_parameter.c
index 9e3d3fecf2..b4008abbd9 100644
--- a/src/mesa/shader/prog_parameter.c
+++ b/src/mesa/shader/prog_parameter.c
@@ -283,22 +283,25 @@ _mesa_add_uniform(struct gl_program_parameter_list *paramList,
  * Add a sampler to the parameter list.
  * \param name  uniform's name
  * \param datatype  GL_SAMPLER_2D, GL_SAMPLER_2D_RECT_ARB, etc.
+ * \param index  the sampler number (as seen in TEX instructions)
  */
 GLint
 _mesa_add_sampler(struct gl_program_parameter_list *paramList,
-                  const char *name, GLenum datatype)
+                  const char *name, GLenum datatype, GLuint index)
 {
    GLint i = _mesa_lookup_parameter_index(paramList, -1, name);
    if (i >= 0 && paramList->Parameters[i].Type == PROGRAM_SAMPLER) {
       ASSERT(paramList->Parameters[i].Size == 1);
       ASSERT(paramList->Parameters[i].DataType == datatype);
+      ASSERT(paramList->ParameterValues[i][0] == index);
       /* already in list */
       return i;
    }
    else {
+      GLfloat indexf = index;
       const GLint size = 1; /* a sampler is basically a texture unit number */
       i = _mesa_add_parameter(paramList, PROGRAM_SAMPLER, name,
-                              size, datatype, NULL, NULL);
+                              size, datatype, &indexf, NULL);
       return i;
    }
 }
diff --git a/src/mesa/shader/prog_parameter.h b/src/mesa/shader/prog_parameter.h
index 09ff851ea7..40c8c09e09 100644
--- a/src/mesa/shader/prog_parameter.h
+++ b/src/mesa/shader/prog_parameter.h
@@ -104,7 +104,7 @@ _mesa_add_uniform(struct gl_program_parameter_list *paramList,
 
 extern GLint
 _mesa_add_sampler(struct gl_program_parameter_list *paramList,
-                  const char *name, GLenum datatype);
+                  const char *name, GLenum datatype, GLuint index);
 
 extern GLint
 _mesa_add_varying(struct gl_program_parameter_list *paramList,
diff --git a/src/mesa/shader/prog_print.c b/src/mesa/shader/prog_print.c
index e92837f739..c421b1228b 100644
--- a/src/mesa/shader/prog_print.c
+++ b/src/mesa/shader/prog_print.c
@@ -719,6 +719,8 @@ _mesa_print_program_opt(const struct gl_program *prog,
 void
 _mesa_print_program_parameters(GLcontext *ctx, const struct gl_program *prog)
 {
+   GLuint i;
+
    _mesa_printf("InputsRead: 0x%x\n", prog->InputsRead);
    _mesa_printf("OutputsWritten: 0x%x\n", prog->OutputsWritten);
    _mesa_printf("NumInstructions=%d\n", prog->NumInstructions);
@@ -726,6 +728,11 @@ _mesa_print_program_parameters(GLcontext *ctx, const struct gl_program *prog)
    _mesa_printf("NumParameters=%d\n", prog->NumParameters);
    _mesa_printf("NumAttributes=%d\n", prog->NumAttributes);
    _mesa_printf("NumAddressRegs=%d\n", prog->NumAddressRegs);
+   _mesa_printf("Samplers=[ ");
+   for (i = 0; i < MAX_SAMPLERS; i++) {
+      _mesa_printf("%d ", prog->SamplerUnits[i]);
+   }
+   _mesa_printf("]\n");
 	
    _mesa_load_state_parameters(ctx, prog->Parameters);
 			
diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c
index 1f227390af..cafc0dcfaa 100644
--- a/src/mesa/shader/program.c
+++ b/src/mesa/shader/program.c
@@ -187,12 +187,17 @@ _mesa_init_program_struct( GLcontext *ctx, struct gl_program *prog,
 {
    (void) ctx;
    if (prog) {
+      GLuint i;
       _mesa_bzero(prog, sizeof(*prog));
       prog->Id = id;
       prog->Target = target;
       prog->Resident = GL_TRUE;
       prog->RefCount = 1;
       prog->Format = GL_PROGRAM_FORMAT_ASCII_ARB;
+
+      /* default mapping from samplers to texture units */
+      for (i = 0; i < MAX_SAMPLERS; i++)
+         prog->SamplerUnits[i] = i;
    }
 
    return prog;
diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index 9f6c54dd4c..bc5ecdaa15 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -1045,6 +1045,28 @@ _mesa_use_program(GLcontext *ctx, GLuint program)
 }
 
 
+
+/**
+ * Update the vertex and fragment program's TexturesUsed arrays.
+ */
+static void
+update_textures_used(struct gl_program *prog)
+{
+   GLuint s;
+
+   memset(prog->TexturesUsed, 0, sizeof(prog->TexturesUsed));
+
+   for (s = 0; s < MAX_SAMPLERS; s++) {
+      if (prog->SamplersUsed & (1 << s)) {
+         GLuint u = prog->SamplerUnits[s];
+         GLuint t = prog->SamplerTargets[s];
+         assert(u < MAX_TEXTURE_IMAGE_UNITS);
+         prog->TexturesUsed[u] |= (1 << t);
+      }
+   }
+}
+
+
 /**
  * Called via ctx->Driver.Uniform().
  */
@@ -1067,26 +1089,6 @@ _mesa_uniform(GLcontext *ctx, GLint location, GLsizei count,
 
    FLUSH_VERTICES(ctx, _NEW_PROGRAM);
 
-   /*
-    * If we're setting a sampler, we must use glUniformi1()!
-    */
-   if (shProg->Uniforms->Parameters[location].Type == PROGRAM_SAMPLER) {
-      GLint unit;
-      if (type != GL_INT || count != 1) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glUniform(only glUniform1i can be used "
-                     "to set sampler uniforms)");
-         return;
-      }
-      /* check that the sampler (tex unit index) is legal */
-      unit = ((GLint *) values)[0];
-      if (unit >= ctx->Const.MaxTextureImageUnits) {
-         _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glUniform1(invalid sampler/tex unit index)");
-         return;
-      }
-   }
-
    if (count < 0) {
       _mesa_error(ctx, GL_INVALID_VALUE, "glUniform(count < 0)");
       return;
@@ -1119,32 +1121,61 @@ _mesa_uniform(GLcontext *ctx, GLint location, GLsizei count,
       return;
    }
 
-   for (k = 0; k < count; k++) {
-      GLfloat *uniformVal = shProg->Uniforms->ParameterValues[location + k];
-      if (type == GL_INT ||
-          type == GL_INT_VEC2 ||
-          type == GL_INT_VEC3 ||
-          type == GL_INT_VEC4) {
-         const GLint *iValues = ((const GLint *) values) + k * elems;
-         for (i = 0; i < elems; i++) {
-            uniformVal[i] = (GLfloat) iValues[i];
-         }
+   if (shProg->Uniforms->Parameters[location].Type == PROGRAM_SAMPLER) {
+      /* This controls which texture unit which is used by a sampler */
+      GLuint texUnit, sampler;
+
+      /* data type for setting samplers must be int */
+      if (type != GL_INT || count != 1) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glUniform(only glUniform1i can be used "
+                     "to set sampler uniforms)");
+         return;
       }
-      else {
-         const GLfloat *fValues = ((const GLfloat *) values) + k * elems;
-         for (i = 0; i < elems; i++) {
-            uniformVal[i] = fValues[i];
-         }
+
+      sampler = (GLuint) shProg->Uniforms->ParameterValues[location][0];
+      texUnit = ((GLuint *) values)[0];
+
+      /* check that the sampler (tex unit index) is legal */
+      if (texUnit >= ctx->Const.MaxTextureImageUnits) {
+         _mesa_error(ctx, GL_INVALID_VALUE,
+                     "glUniform1(invalid sampler/tex unit index)");
+         return;
       }
-   }
 
-   if (shProg->Uniforms->Parameters[location].Type == PROGRAM_SAMPLER) {
-      if (shProg->VertexProgram)
-         _slang_resolve_samplers(shProg, &shProg->VertexProgram->Base);
-      if (shProg->FragmentProgram)
-         _slang_resolve_samplers(shProg, &shProg->FragmentProgram->Base);
+      if (shProg->VertexProgram) {
+         shProg->VertexProgram->Base.SamplerUnits[sampler] = texUnit;
+         update_textures_used(&shProg->VertexProgram->Base);
+      }
+      if (shProg->FragmentProgram) {
+         shProg->FragmentProgram->Base.SamplerUnits[sampler] = texUnit;
+         update_textures_used(&shProg->FragmentProgram->Base);
+      }
+
+
       FLUSH_VERTICES(ctx, _NEW_TEXTURE);
    }
+   else {
+      /* ordinary uniform variable */
+      for (k = 0; k < count; k++) {
+         GLfloat *uniformVal = shProg->Uniforms->ParameterValues[location + k];
+         if (type == GL_INT ||
+             type == GL_INT_VEC2 ||
+             type == GL_INT_VEC3 ||
+             type == GL_INT_VEC4) {
+            const GLint *iValues = ((const GLint *) values) + k * elems;
+            for (i = 0; i < elems; i++) {
+               uniformVal[i] = (GLfloat) iValues[i];
+            }
+         }
+         else {
+            const GLfloat *fValues = ((const GLfloat *) values) + k * elems;
+            for (i = 0; i < elems; i++) {
+               uniformVal[i] = fValues[i];
+            }
+         }
+      }
+   }
 }
 
 
diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c
index fb1f9d5a20..767ba3ffb4 100644
--- a/src/mesa/shader/slang/slang_codegen.c
+++ b/src/mesa/shader/slang/slang_codegen.c
@@ -2874,14 +2874,23 @@ _slang_codegen_global_variable(slang_assemble_ctx *A, slang_variable *var,
    const GLint texIndex = sampler_to_texture_index(var->type.specifier.type);
 
    if (texIndex != -1) {
-      /* Texture sampler:
+      /* This is a texture sampler variable...
        * store->File = PROGRAM_SAMPLER
-       * store->Index = sampler uniform location
+       * store->Index = sampler number (0..7, typically)
        * store->Size = texture type index (1D, 2D, 3D, cube, etc)
        */
+#if 0
       GLint samplerUniform
          = _mesa_add_sampler(prog->Parameters, varName, datatype);
-      store = _slang_new_ir_storage(PROGRAM_SAMPLER, samplerUniform, texIndex);
+#elif 0
+      GLint samplerUniform
+         = _mesa_add_sampler(prog->Samplers, varName, datatype);
+      (void) _mesa_add_sampler(prog->Parameters, varName, datatype); /* dummy entry */
+#else
+      const GLint sampNum = A->numSamplers++;
+      _mesa_add_sampler(prog->Parameters, varName, datatype, sampNum);
+#endif
+      store = _slang_new_ir_storage(PROGRAM_SAMPLER, sampNum, texIndex);
       if (dbg) printf("SAMPLER ");
    }
    else if (var->type.qualifier == SLANG_QUAL_UNIFORM) {
diff --git a/src/mesa/shader/slang/slang_compile.c b/src/mesa/shader/slang/slang_compile.c
index 2be89a5ce0..bfb9ca4db6 100644
--- a/src/mesa/shader/slang/slang_compile.c
+++ b/src/mesa/shader/slang/slang_compile.c
@@ -1618,6 +1618,7 @@ parse_init_declarator(slang_parse_ctx * C, slang_output_ctx * O,
       A.program = O->program;
       A.vartable = O->vartable;
       A.curFuncEndLabel = NULL;
+      A.numSamplers = 0;
       if (!_slang_codegen_global_variable(&A, var, C->type))
          return 0;
    }
@@ -1640,6 +1641,7 @@ parse_init_declarator(slang_parse_ctx * C, slang_output_ctx * O,
          A.space.funcs = O->funs;
          A.space.structs = O->structs;
          A.space.vars = O->vars;
+         A.numSamplers = 0;
          if (!initialize_global(&A, var))
             return 0;
       }
@@ -1773,6 +1775,7 @@ parse_function(slang_parse_ctx * C, slang_output_ctx * O, int definition,
       A.program = O->program;
       A.vartable = O->vartable;
       A.log = C->L;
+      A.numSamplers = 0;
 
       _slang_codegen_function(&A, *parsed_func_ret);
    }
@@ -2152,6 +2155,9 @@ _slang_compile(GLcontext *ctx, struct gl_shader *shader)
       shader->Programs[0]->Parameters = _mesa_new_parameter_list();
       shader->Programs[0]->Varying = _mesa_new_parameter_list();
       shader->Programs[0]->Attributes = _mesa_new_parameter_list();
+#if 0
+      shader->Programs[0]->Samplers = _mesa_new_parameter_list();
+#endif
    }
 
    slang_info_log_construct(&info_log);
diff --git a/src/mesa/shader/slang/slang_emit.c b/src/mesa/shader/slang/slang_emit.c
index fe13f2865c..2b08e7020f 100644
--- a/src/mesa/shader/slang/slang_emit.c
+++ b/src/mesa/shader/slang/slang_emit.c
@@ -906,11 +906,15 @@ emit_tex(slang_emit_info *emitInfo, slang_ir_node *n)
    assert(n->Children[0]->Store->Size >= TEXTURE_1D_INDEX);
    assert(n->Children[0]->Store->Size <= TEXTURE_RECT_INDEX);
 
-   inst->Sampler = n->Children[0]->Store->Index; /* i.e. uniform's index */
    inst->TexSrcTarget = n->Children[0]->Store->Size;
+#if 0
    inst->TexSrcUnit = 27; /* Dummy value; the TexSrcUnit will be computed at
                            * link time, using the sampler uniform's value.
                            */
+   inst->Sampler = n->Children[0]->Store->Index; /* i.e. uniform's index */
+#else
+   inst->TexSrcUnit = n->Children[0]->Store->Index; /* i.e. uniform's index */
+#endif
    return inst;
 }
 
diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c
index eaa29ba094..32f7168553 100644
--- a/src/mesa/shader/slang/slang_link.c
+++ b/src/mesa/shader/slang/slang_link.c
@@ -144,10 +144,14 @@ is_uniform(GLuint file)
 }
 
 
+static GLuint shProg_NumSamplers = 0; /** XXX temporary */
+
+
 static GLboolean
 link_uniform_vars(struct gl_shader_program *shProg, struct gl_program *prog)
 {
    GLuint *map, i;
+   GLuint samplerMap[MAX_SAMPLERS];
 
 #if 0
    printf("================ pre link uniforms ===============\n");
@@ -168,10 +172,13 @@ link_uniform_vars(struct gl_shader_program *shProg, struct gl_program *prog)
       /* sanity check */
       assert(is_uniform(p->Type));
 
+      /* See if this uniform is already in the linked program's list */
       if (p->Name) {
+         /* this is a named uniform */
          j = _mesa_lookup_parameter_index(shProg->Uniforms, -1, p->Name);
       }
       else {
+         /* this is an unnamed constant */
          /*GLuint swizzle;*/
          ASSERT(p->Type == PROGRAM_CONSTANT);
          if (_mesa_lookup_parameter_constant(shProg->Uniforms, pVals,
@@ -184,7 +191,8 @@ link_uniform_vars(struct gl_shader_program *shProg, struct gl_program *prog)
       }
 
       if (j >= 0) {
-         /* already in list, check size XXX check this */
+         /* already in linked program's list */
+         /* check size XXX check this */
 #if 0
          assert(p->Size == shProg->Uniforms->Parameters[j].Size);
 #endif
@@ -205,7 +213,15 @@ link_uniform_vars(struct gl_shader_program *shProg, struct gl_program *prog)
             j = _mesa_add_uniform(shProg->Uniforms, p->Name, p->Size, p->DataType);
             break;
          case PROGRAM_SAMPLER:
-            j = _mesa_add_sampler(shProg->Uniforms, p->Name, p->DataType);
+            {
+               GLuint sampNum = shProg_NumSamplers++;
+               GLuint oldSampNum;
+               j = _mesa_add_sampler(shProg->Uniforms, p->Name,
+                                     p->DataType, sampNum);
+               oldSampNum = (GLuint) prog->Parameters->ParameterValues[i][0];
+               assert(oldSampNum < MAX_SAMPLERS);
+               samplerMap[oldSampNum] = sampNum;
+            }
             break;
          default:
             _mesa_problem(NULL, "bad parameter type in link_uniform_vars()");
@@ -243,6 +259,7 @@ link_uniform_vars(struct gl_shader_program *shProg, struct gl_program *prog)
    /* OK, now scan the program/shader instructions looking for uniform vars,
     * replacing the old index with the new index.
     */
+   prog->SamplersUsed = 0x0;
    for (i = 0; i < prog->NumInstructions; i++) {
       struct prog_instruction *inst = prog->Instructions + i;
       GLuint j;
@@ -257,14 +274,15 @@ link_uniform_vars(struct gl_shader_program *shProg, struct gl_program *prog)
          }
       }
 
-      if (inst->Opcode == OPCODE_TEX ||
-          inst->Opcode == OPCODE_TXB ||
-          inst->Opcode == OPCODE_TXP) {
+      if (_mesa_is_tex_instruction(inst->Opcode)) {
          /*
          printf("====== remap sampler from %d to %d\n",
                 inst->Sampler, map[ inst->Sampler ]);
          */
-         inst->Sampler = map[ inst->Sampler ];
+         /* here, texUnit is really samplerUnit */
+         inst->TexSrcUnit = samplerMap[inst->TexSrcUnit];
+         prog->SamplerTargets[inst->TexSrcUnit] = inst->TexSrcTarget;
+         prog->SamplersUsed |= (1 << inst->TexSrcUnit);
       }
    }
 
@@ -404,36 +422,6 @@ _slang_remap_attribute(struct gl_program *prog, GLuint oldAttrib, GLuint newAttr
 
 
 
-/**
- * Scan program for texture instructions, lookup sampler/uniform's value
- * to determine which texture unit to use.
- * Also, update the program's TexturesUsed[] array.
- */
-void
-_slang_resolve_samplers(struct gl_shader_program *shProg,
-                        struct gl_program *prog)
-{
-   GLuint i;
-
-   for (i = 0; i < MAX_TEXTURE_IMAGE_UNITS; i++)
-      prog->TexturesUsed[i] = 0;
-
-   for (i = 0; i < prog->NumInstructions; i++) {
-      struct prog_instruction *inst = prog->Instructions + i;
-      if (inst->Opcode == OPCODE_TEX ||
-          inst->Opcode == OPCODE_TXB ||
-          inst->Opcode == OPCODE_TXP) {
-         GLint sampleUnit = (GLint) shProg->Uniforms->ParameterValues[inst->Sampler][0];
-         assert(sampleUnit < MAX_TEXTURE_IMAGE_UNITS);
-         inst->TexSrcUnit = sampleUnit;
-
-         prog->TexturesUsed[inst->TexSrcUnit] |= (1 << inst->TexSrcTarget);
-      }
-   }
-}
-
-
-
 /** cast wrapper */
 static struct gl_vertex_program *
 vertex_program(struct gl_program *prog)
@@ -490,6 +478,8 @@ _slang_link(GLcontext *ctx,
    const struct gl_fragment_program *fragProg;
    GLuint i;
 
+   shProg_NumSamplers = 0; /** XXX temporary */
+
    _mesa_clear_shader_program_data(ctx, shProg);
 
    shProg->Uniforms = _mesa_new_parameter_list();
@@ -549,13 +539,6 @@ _slang_link(GLcontext *ctx,
       shProg->FragmentProgram->Base.Parameters = shProg->Uniforms;
    }
 
-   if (shProg->VertexProgram) {
-      _slang_resolve_samplers(shProg, &shProg->VertexProgram->Base);
-   }
-   if (shProg->FragmentProgram) {
-      _slang_resolve_samplers(shProg, &shProg->FragmentProgram->Base);
-   }
-
    if (shProg->VertexProgram) {
       if (!_slang_resolve_attributes(shProg, &shProg->VertexProgram->Base)) {
          /*goto cleanup;*/
@@ -601,7 +584,7 @@ _slang_link(GLcontext *ctx,
       _mesa_print_program(&fragProg->Base);
       _mesa_print_program_parameters(ctx, &fragProg->Base);
 #endif
-#if 0
+#if 01
       printf("************** linked fragment prog\n");
       _mesa_print_program(&shProg->FragmentProgram->Base);
       _mesa_print_program_parameters(ctx, &shProg->FragmentProgram->Base);
diff --git a/src/mesa/shader/slang/slang_link.h b/src/mesa/shader/slang/slang_link.h
index 606b9e46b1..8ef8a6b4b3 100644
--- a/src/mesa/shader/slang/slang_link.h
+++ b/src/mesa/shader/slang/slang_link.h
@@ -32,10 +32,6 @@ extern void
 _slang_link(GLcontext *ctx, GLhandleARB h,
             struct gl_shader_program *shProg);
 
-extern void
-_slang_resolve_samplers(struct gl_shader_program *shProg,
-                        struct gl_program *prog);
-
 extern void
 _slang_remap_attribute(struct gl_program *prog, GLuint oldAttrib,
                        GLuint newAttrib);
diff --git a/src/mesa/shader/slang/slang_typeinfo.h b/src/mesa/shader/slang/slang_typeinfo.h
index 587331e8b1..ad5aa3e195 100644
--- a/src/mesa/shader/slang/slang_typeinfo.h
+++ b/src/mesa/shader/slang/slang_typeinfo.h
@@ -65,6 +65,7 @@ typedef struct slang_assemble_ctx_
    struct slang_label_ *curFuncEndLabel;
    struct slang_ir_node_ *CurLoop;
    struct slang_function_ *CurFunction;
+   GLuint numSamplers;
 } slang_assemble_ctx;
 
 
diff --git a/src/mesa/state_tracker/st_atom_sampler.c b/src/mesa/state_tracker/st_atom_sampler.c
index 38de35933e..80b8cae013 100644
--- a/src/mesa/state_tracker/st_atom_sampler.c
+++ b/src/mesa/state_tracker/st_atom_sampler.c
@@ -113,6 +113,23 @@ gl_filter_to_img_filter(GLenum filter)
 }
 
 
+static struct gl_fragment_program *
+current_fragment_program(GLcontext *ctx)
+{
+   struct gl_fragment_program *f;
+
+   if (ctx->Shader.CurrentProgram &&
+       ctx->Shader.CurrentProgram->LinkStatus &&
+       ctx->Shader.CurrentProgram->FragmentProgram) {
+      f = ctx->Shader.CurrentProgram->FragmentProgram;
+   }
+   else {
+      f = ctx->FragmentProgram._Current;
+      assert(f);
+   }
+   return f;
+}
+
 
 static void 
 update_samplers(struct st_context *st)
@@ -165,13 +182,27 @@ update_samplers(struct st_context *st)
          st->pipe->bind_sampler_state(st->pipe, u, cso->data);
       }
    }
+
+
+   /* mapping from sampler vars to texture units */
+   {
+      struct gl_fragment_program *fprog = current_fragment_program(st->ctx);
+      const GLubyte *samplerUnits = fprog->Base.SamplerUnits;
+      uint sample_units[PIPE_MAX_SAMPLERS];
+      uint s;
+      for (s = 0; s < PIPE_MAX_SAMPLERS; s++) {
+         sample_units[s] = fprog->Base.SamplerUnits[s];
+      }
+
+      st->pipe->set_sampler_units(st->pipe, PIPE_MAX_SAMPLERS, sample_units);
+   }
 }
 
 
 const struct st_tracked_state st_update_sampler = {
    .name = "st_update_sampler",
    .dirty = {
-      .mesa = _NEW_TEXTURE,
+      .mesa = _NEW_TEXTURE | _NEW_PROGRAM,
       .st  = 0,
    },
    .update = update_samplers
diff --git a/src/mesa/swrast/s_fragprog.c b/src/mesa/swrast/s_fragprog.c
index 6656ebc0d0..6ee8bfd0a5 100644
--- a/src/mesa/swrast/s_fragprog.c
+++ b/src/mesa/swrast/s_fragprog.c
@@ -113,6 +113,8 @@ init_machine(GLcontext *ctx, struct gl_program_machine *machine,
    machine->DerivY = (GLfloat (*)[4]) span->attrStepY;
    machine->NumDeriv = FRAG_ATTRIB_MAX;
 
+   machine->Samplers = program->Base.SamplerUnits;
+
    /* if running a GLSL program (not ARB_fragment_program) */
    if (ctx->Shader.CurrentProgram) {
       /* Store front/back facing value in register FOGC.Y */
-- 
cgit v1.2.3


From 2a3f3679eba802dcb4b46f90c66326c9195cdbcb Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Mon, 29 Oct 2007 09:23:46 -0600
Subject: Disable the else clause which assigns the default fragment program to
 ctx->FragmentProgram._Current

The _Current field should either point to the fragment program which is to be
run (GLSL, ARB_f_p, fixed-func-generated, etc) or be NULL if conventional
fixed-function code is to be used.  Matches TNL program code.
---
 src/mesa/main/texenvprogram.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index abc2567134..21a290402f 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -1279,9 +1279,11 @@ _mesa_UpdateTexEnvProgram( GLcontext *ctx )
             _mesa_printf("Found existing texenv program for key %x\n", hash);
       }
    } 
+#if 0
    else {
       ctx->FragmentProgram._Current = ctx->FragmentProgram.Current;
    }
+#endif
 
    /* Tell the driver about the change.  Could define a new target for
     * this?
-- 
cgit v1.2.3


From 918ea5168baaecdf70f5ea37e5815cacf9558163 Mon Sep 17 00:00:00 2001
From: Michal Krol <michal@tungstengraphics.com>
Date: Mon, 29 Oct 2007 19:50:10 +0000
Subject: Rename 'mms-config.' to 'mms.config'.

It looks like Windows does not like filenames ending with a dot,
in effect renaming it to 'mms-config'.
---
 mms-config.                         | 23 -----------------------
 mms.config                          | 23 +++++++++++++++++++++++
 progs/demos/descrip.mms             |  2 +-
 progs/tests/descrip.mms             |  2 +-
 progs/util/descrip.mms              |  2 +-
 progs/xdemos/descrip.mms            |  2 +-
 src/descrip.mms                     |  2 +-
 src/glu/mesa/descrip.mms            |  2 +-
 src/glu/sgi/descrip.mms             |  2 +-
 src/glut/glx/descrip.mms            |  2 +-
 src/mesa/drivers/common/descrip.mms |  2 +-
 src/mesa/drivers/osmesa/descrip.mms |  2 +-
 src/mesa/drivers/x11/descrip.mms    |  2 +-
 src/mesa/glapi/descrip.mms          |  2 +-
 src/mesa/main/descrip.mms           |  2 +-
 src/mesa/math/descrip.mms           |  2 +-
 src/mesa/shader/descrip.mms         |  2 +-
 src/mesa/shader/grammar/descrip.mms |  2 +-
 src/mesa/shader/slang/descrip.mms   |  2 +-
 src/mesa/swrast/descrip.mms         |  2 +-
 src/mesa/swrast_setup/descrip.mms   |  2 +-
 src/mesa/tnl/descrip.mms            |  2 +-
 src/mesa/vbo/descrip.mms            |  2 +-
 23 files changed, 44 insertions(+), 44 deletions(-)
 delete mode 100644 mms-config.
 create mode 100644 mms.config

(limited to 'src/mesa/main')

diff --git a/mms-config. b/mms-config.
deleted file mode 100644
index 6a960084b3..0000000000
--- a/mms-config.
+++ /dev/null
@@ -1,23 +0,0 @@
-# Makefile for VMS
-# contributed by Jouk Jansen  joukj@hrem.stm.tudelft.nl
-
-
-#vms
-.ifdef SHARE
-GL_SHAR = libMesaGL.exe
-GLU_SHAR = libMesaGLU.exe
-GLUT_SHAR = libglut.exe
-.endif
-GL_LIB = libMesaGL.olb
-GLU_LIB = libMesaGLU.olb
-GLUT_LIB = libglut.olb
-CC = cc
-CXX = cxx/define=(LIBRARYBUILD=1)/assume=(nostdnew,noglobal_array_new)
-CFLAGS1 =
-MAKELIB = library/create
-RANLIB = true
-.ifdef SHARE
-XLIBS = [--.vms]xlib_share/opt
-.else
-XLIBS = [--.vms]xlib/opt
-.endif
diff --git a/mms.config b/mms.config
new file mode 100644
index 0000000000..6a960084b3
--- /dev/null
+++ b/mms.config
@@ -0,0 +1,23 @@
+# Makefile for VMS
+# contributed by Jouk Jansen  joukj@hrem.stm.tudelft.nl
+
+
+#vms
+.ifdef SHARE
+GL_SHAR = libMesaGL.exe
+GLU_SHAR = libMesaGLU.exe
+GLUT_SHAR = libglut.exe
+.endif
+GL_LIB = libMesaGL.olb
+GLU_LIB = libMesaGLU.olb
+GLUT_LIB = libglut.olb
+CC = cc
+CXX = cxx/define=(LIBRARYBUILD=1)/assume=(nostdnew,noglobal_array_new)
+CFLAGS1 =
+MAKELIB = library/create
+RANLIB = true
+.ifdef SHARE
+XLIBS = [--.vms]xlib_share/opt
+.else
+XLIBS = [--.vms]xlib/opt
+.endif
diff --git a/progs/demos/descrip.mms b/progs/demos/descrip.mms
index a374fdf13d..bb2489fc3b 100644
--- a/progs/demos/descrip.mms
+++ b/progs/demos/descrip.mms
@@ -5,7 +5,7 @@
 .first
 	define gl [--.include.gl]
 
-.include [--]mms-config.
+.include [--]mms.config
 
 ##### MACROS #####
 
diff --git a/progs/tests/descrip.mms b/progs/tests/descrip.mms
index b6ba3e1aeb..567b76bc4b 100644
--- a/progs/tests/descrip.mms
+++ b/progs/tests/descrip.mms
@@ -5,7 +5,7 @@
 .first
 	define gl [--.include.gl]
 
-.include [--]mms-config.
+.include [--]mms.config
 
 ##### MACROS #####
 
diff --git a/progs/util/descrip.mms b/progs/util/descrip.mms
index 21dec4b9be..b2ee5ec971 100644
--- a/progs/util/descrip.mms
+++ b/progs/util/descrip.mms
@@ -5,7 +5,7 @@
 .first
 	define gl [--.include.gl]
 
-.include [--]mms-config.
+.include [--]mms.config
 
 ##### MACROS #####
 
diff --git a/progs/xdemos/descrip.mms b/progs/xdemos/descrip.mms
index aa74daff59..fe6a3c44e6 100644
--- a/progs/xdemos/descrip.mms
+++ b/progs/xdemos/descrip.mms
@@ -5,7 +5,7 @@
 .first
 	define gl [--.include.gl]
 
-.include [--]mms-config.
+.include [--]mms.config
 
 ##### MACROS #####
 
diff --git a/src/descrip.mms b/src/descrip.mms
index 71b8ea16ac..79c7d98d25 100644
--- a/src/descrip.mms
+++ b/src/descrip.mms
@@ -1,7 +1,7 @@
 # Makefile for Mesa for VMS
 # contributed by Jouk Jansen  joukj@hrem.stm.tudelft.nl
 
-.include [-]mms-config.
+.include [-]mms.config
 
 all :
 	set default [.mesa]
diff --git a/src/glu/mesa/descrip.mms b/src/glu/mesa/descrip.mms
index 2b3f64d8bc..12eb6a437a 100644
--- a/src/glu/mesa/descrip.mms
+++ b/src/glu/mesa/descrip.mms
@@ -4,7 +4,7 @@
 .first
 	define gl [-.include.gl]
 
-.include [-]mms-config.
+.include [-]mms.config
 
 ##### MACROS #####
 
diff --git a/src/glu/sgi/descrip.mms b/src/glu/sgi/descrip.mms
index 5abc8b2e04..49d618e6c9 100644
--- a/src/glu/sgi/descrip.mms
+++ b/src/glu/sgi/descrip.mms
@@ -4,7 +4,7 @@
 .first
 	define gl [---.include.gl]
 
-.include [---]mms-config.
+.include [---]mms.config
 
 ##### MACROS #####
 
diff --git a/src/glut/glx/descrip.mms b/src/glut/glx/descrip.mms
index 2e858309b6..358b417511 100644
--- a/src/glut/glx/descrip.mms
+++ b/src/glut/glx/descrip.mms
@@ -4,7 +4,7 @@
 .first
 	define gl [---.include.gl]
 
-.include [---]mms-config.
+.include [---]mms.config
 
 ##### MACROS #####
 GLUT_MAJOR = 3
diff --git a/src/mesa/drivers/common/descrip.mms b/src/mesa/drivers/common/descrip.mms
index 3cb856d12c..c2c119db7f 100644
--- a/src/mesa/drivers/common/descrip.mms
+++ b/src/mesa/drivers/common/descrip.mms
@@ -8,7 +8,7 @@
 	define tnl [--.tnl]
 	define swrast [--.swrast]
 
-.include [----]mms-config.
+.include [----]mms.config
 
 ##### MACROS #####
 
diff --git a/src/mesa/drivers/osmesa/descrip.mms b/src/mesa/drivers/osmesa/descrip.mms
index 4035b24e4e..5be194bcee 100644
--- a/src/mesa/drivers/osmesa/descrip.mms
+++ b/src/mesa/drivers/osmesa/descrip.mms
@@ -11,7 +11,7 @@
 	define array_cache [--.array_cache]
 	define drivers [-]
 
-.include [----]mms-config.
+.include [----]mms.config
 
 ##### MACROS #####
 
diff --git a/src/mesa/drivers/x11/descrip.mms b/src/mesa/drivers/x11/descrip.mms
index 6c6184b2c3..f181707a14 100644
--- a/src/mesa/drivers/x11/descrip.mms
+++ b/src/mesa/drivers/x11/descrip.mms
@@ -11,7 +11,7 @@
 	define array_cache [--.array_cache]
 	define drivers [-]
 
-.include [----]mms-config.
+.include [----]mms.config
 
 ##### MACROS #####
 
diff --git a/src/mesa/glapi/descrip.mms b/src/mesa/glapi/descrip.mms
index f17e5329b6..16bf6387e8 100644
--- a/src/mesa/glapi/descrip.mms
+++ b/src/mesa/glapi/descrip.mms
@@ -5,7 +5,7 @@
 .first
 	define gl [---.include.gl]
 
-.include [---]mms-config.
+.include [---]mms.config
 
 ##### MACROS #####
 
diff --git a/src/mesa/main/descrip.mms b/src/mesa/main/descrip.mms
index d09c57b321..2bd388be89 100644
--- a/src/mesa/main/descrip.mms
+++ b/src/mesa/main/descrip.mms
@@ -7,7 +7,7 @@
 	define math [-.math]
 	define shader [-.shader]
 
-.include [---]mms-config.
+.include [---]mms.config
 
 ##### MACROS #####
 
diff --git a/src/mesa/math/descrip.mms b/src/mesa/math/descrip.mms
index a3f20c2f25..5b9e9915f8 100644
--- a/src/mesa/math/descrip.mms
+++ b/src/mesa/math/descrip.mms
@@ -6,7 +6,7 @@
 	define gl [---.include.gl]
 	define math [-.math]
 
-.include [---]mms-config.
+.include [---]mms.config
 
 ##### MACROS #####
 
diff --git a/src/mesa/shader/descrip.mms b/src/mesa/shader/descrip.mms
index d70cec3830..f5d04cfa78 100644
--- a/src/mesa/shader/descrip.mms
+++ b/src/mesa/shader/descrip.mms
@@ -7,7 +7,7 @@
 	define swrast [-.swrast]
 	define array_cache [-.array_cache]
 
-.include [---]mms-config.
+.include [---]mms.config
 
 ##### MACROS #####
 
diff --git a/src/mesa/shader/grammar/descrip.mms b/src/mesa/shader/grammar/descrip.mms
index f7fbee96bc..cff53ee872 100644
--- a/src/mesa/shader/grammar/descrip.mms
+++ b/src/mesa/shader/grammar/descrip.mms
@@ -8,7 +8,7 @@
 	define swrast [--.swrast]
 	define array_cache [--.array_cache]
 
-.include [----]mms-config.
+.include [----]mms.config
 
 ##### MACROS #####
 
diff --git a/src/mesa/shader/slang/descrip.mms b/src/mesa/shader/slang/descrip.mms
index c86763718a..8b9cd822b8 100644
--- a/src/mesa/shader/slang/descrip.mms
+++ b/src/mesa/shader/slang/descrip.mms
@@ -8,7 +8,7 @@
 	define swrast [--.swrast]
 	define array_cache [--.array_cache]
 
-.include [----]mms-config.
+.include [----]mms.config
 
 ##### MACROS #####
 
diff --git a/src/mesa/swrast/descrip.mms b/src/mesa/swrast/descrip.mms
index 4d49673b5d..4d446600ba 100644
--- a/src/mesa/swrast/descrip.mms
+++ b/src/mesa/swrast/descrip.mms
@@ -8,7 +8,7 @@
 	define swrast [-.swrast]
 	define array_cache [-.array_cache]
 
-.include [---]mms-config.
+.include [---]mms.config
 
 ##### MACROS #####
 
diff --git a/src/mesa/swrast_setup/descrip.mms b/src/mesa/swrast_setup/descrip.mms
index e5e48afb3d..0ab81c07d3 100644
--- a/src/mesa/swrast_setup/descrip.mms
+++ b/src/mesa/swrast_setup/descrip.mms
@@ -9,7 +9,7 @@
 	define swrast [-.swrast]
 	define array_cache [-.array_cache]
 
-.include [---]mms-config.
+.include [---]mms.config
 
 ##### MACROS #####
 
diff --git a/src/mesa/tnl/descrip.mms b/src/mesa/tnl/descrip.mms
index 91e32bf978..a9aed89f1d 100644
--- a/src/mesa/tnl/descrip.mms
+++ b/src/mesa/tnl/descrip.mms
@@ -8,7 +8,7 @@
 	define shader [-.shader]
 	define array_cache [-.array_cache]
 
-.include [---]mms-config.
+.include [---]mms.config
 
 ##### MACROS #####
 
diff --git a/src/mesa/vbo/descrip.mms b/src/mesa/vbo/descrip.mms
index 4ab22e4005..e00b6703aa 100644
--- a/src/mesa/vbo/descrip.mms
+++ b/src/mesa/vbo/descrip.mms
@@ -11,7 +11,7 @@
 	define swrast [-.swrast]
 	define swrast_setup [-.swrast_setup]
 
-.include [---]mms-config.
+.include [---]mms.config
 
 ##### MACROS #####
 
-- 
cgit v1.2.3


From 83ce6c51d7189094cf2a13fdcc0882a051a3bd41 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Mon, 29 Oct 2007 11:23:02 -0600
Subject: Refactor _mesa_UpdateTexEnvProgram()

Will be replaced by _mesa_get_fixed_func_fragment_program().
---
 src/mesa/main/texenvprogram.c | 68 +++++++++++++++++++++++--------------------
 src/mesa/main/texenvprogram.h |  3 ++
 2 files changed, 39 insertions(+), 32 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 21a290402f..d8f3314c70 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -1234,6 +1234,39 @@ static GLuint hash_key( const struct state_key *key )
 }
 
 
+/**
+ * Return a fragment program which implements the current
+ * fixed-function texture, fog and color-sum operations.
+ */
+struct gl_fragment_program *
+_mesa_get_fixed_func_fragment_program(GLcontext *ctx)
+{
+   struct gl_fragment_program *prog;
+   struct state_key key;
+   GLuint hash;
+	
+   make_state_key(ctx, &key);
+   hash = hash_key(&key);
+      
+   prog = search_cache(&ctx->Texture.env_fp_cache, hash, &key, sizeof(key));
+
+   if (!prog) {
+      if (0)
+         _mesa_printf("Building new texenv proggy for key %x\n", hash);
+
+      prog = (struct gl_fragment_program *) 
+         ctx->Driver.NewProgram(ctx, GL_FRAGMENT_PROGRAM_ARB, 0);
+
+      create_new_program(ctx, &key, prog);
+
+      cache_item(&ctx->Texture.env_fp_cache, hash, &key, prog);
+   }
+
+   return prog;
+}
+
+
+
 /**
  * If _MaintainTexEnvProgram is set we'll generate a fragment program that
  * implements the current texture env/combine mode.
@@ -1242,8 +1275,6 @@ static GLuint hash_key( const struct state_key *key )
 void
 _mesa_UpdateTexEnvProgram( GLcontext *ctx )
 {
-   struct state_key key;
-   GLuint hash;
    const struct gl_fragment_program *prev = ctx->FragmentProgram._Current;
 	
    ASSERT(ctx->FragmentProgram._MaintainTexEnvProgram);
@@ -1252,38 +1283,11 @@ _mesa_UpdateTexEnvProgram( GLcontext *ctx )
    if (!ctx->FragmentProgram._Enabled &&
        (!ctx->Shader.CurrentProgram ||
         !ctx->Shader.CurrentProgram->FragmentProgram) ) {
-      make_state_key(ctx, &key);
-      hash = hash_key(&key);
-      
-      ctx->FragmentProgram._Current =
-      ctx->FragmentProgram._TexEnvProgram =
-         search_cache(&ctx->Texture.env_fp_cache, hash, &key, sizeof(key));
-
-      if (!ctx->FragmentProgram._TexEnvProgram) {
-         if (0)
-            _mesa_printf("Building new texenv proggy for key %x\n", hash);
 
-         /* create new tex env program */
-	 ctx->FragmentProgram._Current =
-         ctx->FragmentProgram._TexEnvProgram =
-            (struct gl_fragment_program *) 
-            ctx->Driver.NewProgram(ctx, GL_FRAGMENT_PROGRAM_ARB, 0);
-
-         create_new_program(ctx, &key, ctx->FragmentProgram._TexEnvProgram);
-
-         cache_item(&ctx->Texture.env_fp_cache, hash, &key,
-                    ctx->FragmentProgram._TexEnvProgram);
-      }
-      else {
-         if (0)
-            _mesa_printf("Found existing texenv program for key %x\n", hash);
-      }
+      ctx->FragmentProgram._Current
+         = ctx->FragmentProgram._TexEnvProgram
+         = _mesa_get_fixed_func_fragment_program(ctx);
    } 
-#if 0
-   else {
-      ctx->FragmentProgram._Current = ctx->FragmentProgram.Current;
-   }
-#endif
 
    /* Tell the driver about the change.  Could define a new target for
     * this?
diff --git a/src/mesa/main/texenvprogram.h b/src/mesa/main/texenvprogram.h
index 6f017767c8..ac73910cb5 100644
--- a/src/mesa/main/texenvprogram.h
+++ b/src/mesa/main/texenvprogram.h
@@ -34,6 +34,9 @@
 
 #include "mtypes.h"
 
+extern struct gl_fragment_program *
+_mesa_get_fixed_func_fragment_program(GLcontext *ctx);
+
 extern void _mesa_UpdateTexEnvProgram( GLcontext *ctx );
 extern void _mesa_TexEnvProgramCacheInit( GLcontext *ctx );
 extern void _mesa_TexEnvProgramCacheDestroy( GLcontext *ctx );
-- 
cgit v1.2.3


From f18d4e058ed979c6e42e868c7febde4fa62c5810 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Mon, 29 Oct 2007 12:25:46 -0600
Subject: Remove ctx field from texenvprog_cache

---
 src/mesa/main/mtypes.h        |  1 -
 src/mesa/main/texenvprogram.c | 23 +++++++++++------------
 2 files changed, 11 insertions(+), 13 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 8adc4e3373..44587ae962 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1566,7 +1566,6 @@ struct texenvprog_cache_item {
 struct texenvprog_cache {
    struct texenvprog_cache_item **items;
    GLuint size, n_items;
-   GLcontext *ctx;
 };
 
 /**
diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index d8f3314c70..cf92503c34 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -399,9 +399,9 @@ static struct ureg get_tex_temp( struct texenv_fragment_program *p )
 }
 
 
-static void release_temps( struct texenv_fragment_program *p )
+static void release_temps(GLcontext *ctx, struct texenv_fragment_program *p )
 {
-   GLuint max_temp = p->ctx->Const.FragmentProgram.MaxTemps;
+   GLuint max_temp = ctx->Const.FragmentProgram.MaxTemps;
 
    /* KW: To support tex_env_crossbar, don't release the registers in
     * temps_output.
@@ -1037,7 +1037,7 @@ create_new_program(GLcontext *ctx, struct state_key *key,
    p.one = undef;
 
    p.last_tex_stage = 0;
-   release_temps(&p);
+   release_temps(ctx, &p);
 
    if (key->enabled_units) {
       /* First pass - to support texture_env_crossbar, first identify
@@ -1055,7 +1055,7 @@ create_new_program(GLcontext *ctx, struct state_key *key,
       for (unit = 0 ; unit < ctx->Const.MaxTextureUnits; unit++)
 	 if (key->enabled_units & (1<<unit)) {
 	    p.src_previous = emit_texenv( &p, unit );
-	    release_temps(&p);	/* release all temps */
+	    release_temps(ctx, &p);	/* release all temps */
 	 }
    }
 
@@ -1169,7 +1169,7 @@ static void rehash( struct texenvprog_cache *cache )
    cache->size = size;
 }
 
-static void clear_cache( struct texenvprog_cache *cache )
+static void clear_cache( GLcontext *ctx, struct texenvprog_cache *cache )
 {
    struct texenvprog_cache_item *c, *next;
    GLuint i;
@@ -1178,8 +1178,7 @@ static void clear_cache( struct texenvprog_cache *cache )
       for (c = cache->items[i]; c; c = next) {
 	 next = c->next;
 	 _mesa_free(c->key);
-	 cache->ctx->Driver.DeleteProgram(cache->ctx,
-                                          (struct gl_program *) c->data);
+	 ctx->Driver.DeleteProgram(ctx, (struct gl_program *) c->data);
 	 _mesa_free(c);
       }
       cache->items[i] = NULL;
@@ -1190,7 +1189,8 @@ static void clear_cache( struct texenvprog_cache *cache )
 }
 
 
-static void cache_item( struct texenvprog_cache *cache,
+static void cache_item( GLcontext *ctx,
+                        struct texenvprog_cache *cache,
 			GLuint hash,
 			const struct state_key *key,
 			void *data )
@@ -1208,7 +1208,7 @@ static void cache_item( struct texenvprog_cache *cache,
       if (cache->size < 1000)
 	 rehash(cache);
       else 
-	 clear_cache(cache);
+	 clear_cache(ctx, cache);
    }
 
    cache->n_items++;
@@ -1259,7 +1259,7 @@ _mesa_get_fixed_func_fragment_program(GLcontext *ctx)
 
       create_new_program(ctx, &key, prog);
 
-      cache_item(&ctx->Texture.env_fp_cache, hash, &key, prog);
+      cache_item(ctx, &ctx->Texture.env_fp_cache, hash, &key, prog);
    }
 
    return prog;
@@ -1301,7 +1301,6 @@ _mesa_UpdateTexEnvProgram( GLcontext *ctx )
 
 void _mesa_TexEnvProgramCacheInit( GLcontext *ctx )
 {
-   ctx->Texture.env_fp_cache.ctx = ctx;
    ctx->Texture.env_fp_cache.size = 17;
    ctx->Texture.env_fp_cache.n_items = 0;
    ctx->Texture.env_fp_cache.items = (struct texenvprog_cache_item **)
@@ -1312,6 +1311,6 @@ void _mesa_TexEnvProgramCacheInit( GLcontext *ctx )
 
 void _mesa_TexEnvProgramCacheDestroy( GLcontext *ctx )
 {
-   clear_cache(&ctx->Texture.env_fp_cache);
+   clear_cache(ctx, &ctx->Texture.env_fp_cache);
    _mesa_free(ctx->Texture.env_fp_cache.items);
 }
-- 
cgit v1.2.3


From 1553eba50c7a2577bce069a3400a29e4d49c0f31 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Mon, 29 Oct 2007 14:13:57 -0600
Subject: Rewrite update_program() to use
 _mesa_get_fixed_func_fragment/vertex_program().

---
 src/mesa/main/state.c | 126 +++++++++++++++++++++++++++++---------------------
 1 file changed, 74 insertions(+), 52 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 444f227760..41c657e9fd 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -92,6 +92,7 @@
 #include "shader/program.h"
 #include "texenvprogram.h"
 #endif
+#include "tnl/t_vp_build.h"
 #if FEATURE_ARB_shader_objects
 #include "shaders.h"
 #endif
@@ -938,13 +939,12 @@ update_arrays( GLcontext *ctx )
 }
 
 
-/**
- * Update derived vertex/fragment program state.
- */
 static void
 update_program(GLcontext *ctx)
 {
    const struct gl_shader_program *shProg = ctx->Shader.CurrentProgram;
+   const struct gl_vertex_program *prevVP = ctx->VertexProgram._Current;
+   const struct gl_fragment_program *prevFP = ctx->FragmentProgram._Current;
 
    /* These _Enabled flags indicate if the program is enabled AND valid. */
    ctx->VertexProgram._Enabled = ctx->VertexProgram.Enabled
@@ -956,64 +956,83 @@ update_program(GLcontext *ctx)
 
    /*
     * Set the ctx->VertexProgram._Current and ctx->FragmentProgram._Current
-    * pointers to the programs that should be enabled/used.
+    * pointers to the programs that should be enabled/used.  These will only
+    * be NULL if we need to use the fixed-function code.
     *
     * These programs may come from several sources.  The priority is as
     * follows:
     *   1. OpenGL 2.0/ARB vertex/fragment shaders
     *   2. ARB/NV vertex/fragment programs
     *   3. Programs derived from fixed-function state.
+    *
+    * Note: it's possible for a vertex shader to get used with a fragment
+    * program (and vice versa) here, but in practice that shouldn't ever
+    * come up, or matter.
     */
 
-   ctx->FragmentProgram._Current = NULL;
-
-   if (shProg && shProg->LinkStatus) {
-      /* Use shader programs */
-      /* XXX this isn't quite right, since we may have either a vertex
-       * _or_ fragment shader (not always both).
-       */
-      ctx->VertexProgram._Current = shProg->VertexProgram;
+   /**
+    ** Fragment program
+    **/
+#if 1
+   /* XXX get rid of this someday? */
+   ctx->FragmentProgram._Active = GL_FALSE;
+#endif
+   if (shProg && shProg->LinkStatus && shProg->FragmentProgram) {
+      /* user-defined fragment shader */
       ctx->FragmentProgram._Current = shProg->FragmentProgram;
    }
+   else if (ctx->FragmentProgram._Enabled) {
+      /* use user-defined fragment program */
+      ctx->FragmentProgram._Current = ctx->FragmentProgram.Current;
+   }
+   else if (ctx->FragmentProgram._MaintainTexEnvProgram) {
+      /* fragment program generated from fixed-function state */
+      ctx->FragmentProgram._Current = _mesa_get_fixed_func_fragment_program(ctx);
+      ctx->FragmentProgram._TexEnvProgram = ctx->FragmentProgram._Current;
+
+      /* XXX get rid of this confusing stuff someday? */
+      ctx->FragmentProgram._Active = ctx->FragmentProgram._Enabled;
+      if (ctx->FragmentProgram._UseTexEnvProgram)
+         ctx->FragmentProgram._Active = GL_TRUE;
+   }
    else {
-      if (ctx->VertexProgram._Enabled) {
-         /* use user-defined vertex program */
-         ctx->VertexProgram._Current = ctx->VertexProgram.Current;
-      }
-      else if (ctx->VertexProgram._MaintainTnlProgram) {
-         /* Use vertex program generated from fixed-function state.
-          * The _Current pointer will get set in
-          * _tnl_UpdateFixedFunctionProgram() later if appropriate.
-          */
-         ctx->VertexProgram._Current = NULL;
-      }
-      else {
-         /* no vertex program */
-         ctx->VertexProgram._Current = NULL;
-      }
+      /* no fragment program */
+      ctx->FragmentProgram._Current = NULL;
+   }
 
-      if (ctx->FragmentProgram._Enabled) {
-         /* use user-defined vertex program */
-         ctx->FragmentProgram._Current = ctx->FragmentProgram.Current;
-      }
-      else if (ctx->FragmentProgram._MaintainTexEnvProgram) {
-         /* Use fragment program generated from fixed-function state.
-          * The _Current pointer will get set in _mesa_UpdateTexEnvProgram()
-          * later if appropriate.
-          */
-         ctx->FragmentProgram._Current = NULL;
-      }
-      else {
-         /* no fragment program */
-         ctx->FragmentProgram._Current = NULL;
-      }
+   if (ctx->FragmentProgram._Current != prevFP && ctx->Driver.BindProgram) {
+      ctx->Driver.BindProgram(ctx, GL_FRAGMENT_PROGRAM_ARB,
+                         (struct gl_program *) ctx->FragmentProgram._Current);
    }
 
-   ctx->FragmentProgram._Active = ctx->FragmentProgram._Enabled;
-   if (ctx->FragmentProgram._MaintainTexEnvProgram &&
-       !ctx->FragmentProgram._Enabled) {
-      if (ctx->FragmentProgram._UseTexEnvProgram)
-	 ctx->FragmentProgram._Active = GL_TRUE;
+   /**
+    ** Vertex program
+    **/
+#if 1
+   /* XXX get rid of this someday? */
+   ctx->VertexProgram._TnlProgram = NULL;
+#endif
+   if (shProg && shProg->LinkStatus && shProg->VertexProgram) {
+      /* user-defined vertex shader */
+      ctx->VertexProgram._Current = shProg->VertexProgram;
+   }
+   else if (ctx->VertexProgram._Enabled) {
+      /* use user-defined vertex program */
+      ctx->VertexProgram._Current = ctx->VertexProgram.Current;
+   }
+   else if (ctx->VertexProgram._MaintainTnlProgram) {
+      /* vertex program generated from fixed-function state */
+      ctx->VertexProgram._Current = _mesa_get_fixed_func_vertex_program(ctx);
+      ctx->VertexProgram._TnlProgram = ctx->VertexProgram._Current;
+   }
+   else {
+      /* no vertex program / used fixed-function code */
+      ctx->VertexProgram._Current = NULL;
+   }
+
+   if (ctx->VertexProgram._Current != prevVP && ctx->Driver.BindProgram) {
+      ctx->Driver.BindProgram(ctx, GL_VERTEX_PROGRAM_ARB,
+                              (struct gl_program *) ctx->VertexProgram._Current);
    }
 }
 
@@ -1140,13 +1159,11 @@ void
 _mesa_update_state_locked( GLcontext *ctx )
 {
    GLbitfield new_state = ctx->NewState;
+   GLbitfield prog_flags = _NEW_PROGRAM;
 
    if (MESA_VERBOSE & VERBOSE_STATE)
       _mesa_print_state("_mesa_update_state", new_state);
 
-   if (new_state & _NEW_PROGRAM)
-      update_program( ctx );
-
    if (new_state & (_NEW_MODELVIEW|_NEW_PROJECTION))
       _mesa_update_modelview_project( ctx, new_state );
 
@@ -1182,9 +1199,14 @@ _mesa_update_state_locked( GLcontext *ctx )
       update_tricaps( ctx, new_state );
 
    if (ctx->FragmentProgram._MaintainTexEnvProgram) {
-      if (new_state & (_NEW_TEXTURE | _DD_NEW_SEPARATE_SPECULAR | _NEW_FOG))
-	 _mesa_UpdateTexEnvProgram(ctx);
+      prog_flags |= (_NEW_TEXTURE | _NEW_FOG | _DD_NEW_SEPARATE_SPECULAR);
    }
+   if (ctx->VertexProgram._MaintainTnlProgram) {
+      prog_flags |= (_NEW_TEXTURE | _NEW_FOG | _NEW_LIGHT);
+   }
+   if (new_state & prog_flags)
+      update_program( ctx );
+
 
    /* ctx->_NeedEyeCoords is now up to date.
     *
-- 
cgit v1.2.3


From ba0fcc47d61be6caa2f4a5f4eb0c36eba9e2cb59 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Mon, 29 Oct 2007 17:36:39 -0600
Subject: Set _NEW_BUFFERS in glRead/DrawBuffer().

Previously, we set _NEW_PIXEL and _NEW_COLOR in these functions, respectively.
That correponds to the GL attribute groups, but doesn't make much sense
otherwise.  This could improve validation efficiency in a few places too.
It looks like all the drivers are already checking for _NEW_BUFFERS in the
right places (since that's the bit for FBO state) so we can trim out
_NEW_PIXEL and _NEW_COLOR at any time.
---
 src/mesa/drivers/x11/xm_dd.c                 | 2 +-
 src/mesa/main/buffers.c                      | 4 ++--
 src/mesa/main/state.c                        | 2 +-
 src/mesa/state_tracker/st_atom_framebuffer.c | 6 +-----
 4 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/x11/xm_dd.c b/src/mesa/drivers/x11/xm_dd.c
index 3ee44bfbaf..8ae243ae66 100644
--- a/src/mesa/drivers/x11/xm_dd.c
+++ b/src/mesa/drivers/x11/xm_dd.c
@@ -841,7 +841,7 @@ xmesa_update_state( GLcontext *ctx, GLbitfield new_state )
     * GL_DITHER, GL_READ/DRAW_BUFFER, buffer binding state, etc. effect
     * renderbuffer span/clear funcs.
     */
-   if (new_state & (_NEW_COLOR | _NEW_PIXEL | _NEW_BUFFERS)) {
+   if (new_state & (_NEW_COLOR | _NEW_BUFFERS)) {
       XMesaBuffer xmbuf = XMESA_BUFFER(ctx->DrawBuffer);
       struct xmesa_renderbuffer *front_xrb, *back_xrb;
 
diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c
index 7a918c53a7..3cbd671bab 100644
--- a/src/mesa/main/buffers.c
+++ b/src/mesa/main/buffers.c
@@ -527,7 +527,7 @@ _mesa_drawbuffers(GLcontext *ctx, GLuint n, const GLenum *buffers,
       set_color_output(ctx, output, GL_NONE, 0x0);
    }
 
-   ctx->NewState |= _NEW_COLOR;
+   ctx->NewState |= _NEW_BUFFERS;
 }
 
 
@@ -588,7 +588,7 @@ _mesa_ReadBuffer(GLenum buffer)
    if (!_mesa_readbuffer_update_fields(ctx, buffer))
       return;
 
-   ctx->NewState |= _NEW_PIXEL;
+   ctx->NewState |= _NEW_BUFFERS;
 
    /*
     * Call device driver function.
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 41c657e9fd..0e4cf047c8 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -1170,7 +1170,7 @@ _mesa_update_state_locked( GLcontext *ctx )
    if (new_state & (_NEW_PROGRAM|_NEW_TEXTURE|_NEW_TEXTURE_MATRIX))
       _mesa_update_texture( ctx, new_state );
 
-   if (new_state & (_NEW_BUFFERS | _NEW_COLOR | _NEW_PIXEL))
+   if (new_state & _NEW_BUFFERS)
       _mesa_update_framebuffer(ctx);
 
    if (new_state & (_NEW_SCISSOR | _NEW_BUFFERS | _NEW_VIEWPORT))
diff --git a/src/mesa/state_tracker/st_atom_framebuffer.c b/src/mesa/state_tracker/st_atom_framebuffer.c
index e776c9112d..aec51f5eed 100644
--- a/src/mesa/state_tracker/st_atom_framebuffer.c
+++ b/src/mesa/state_tracker/st_atom_framebuffer.c
@@ -85,14 +85,10 @@ update_framebuffer_state( struct st_context *st )
 }
 
 
-/**
- * Note that glDrawBuffer() sets _NEW_COLOR, not _NEW_BUFFER.
- */
-
 const struct st_tracked_state st_update_framebuffer = {
    .name = "st_update_framebuffer",
    .dirty = {
-      .mesa = (_NEW_BUFFERS | _NEW_COLOR),
+      .mesa = _NEW_BUFFERS,
       .st  = 0,
    },
    .update = update_framebuffer_state
-- 
cgit v1.2.3


From b26aae67f5fe4194b48a5d3ddf704797b804b58c Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Wed, 31 Oct 2007 12:00:38 -0600
Subject: alloc caches for fixed-func vertex/fragment progs

---
 src/mesa/main/mtypes.h    | 7 +++++++
 src/mesa/shader/program.c | 4 ++++
 2 files changed, 11 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 44587ae962..b435c29793 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -123,6 +123,7 @@ typedef int GLfixed;
 /*@{*/
 struct _mesa_HashTable;
 struct gl_pixelstore_attrib;
+struct gl_program_cache;
 struct gl_texture_format;
 struct gl_texture_image;
 struct gl_texture_object;
@@ -2000,6 +2001,9 @@ struct gl_vertex_program_state
    /** Program to emulate fixed-function T&L (see above) */
    struct gl_vertex_program *_TnlProgram;
 
+   /** Cache of fixed-function programs */
+   struct gl_program_cache *Cache;
+
 #if FEATURE_MESA_program_debug
    GLprogramcallbackMESA Callback;
    GLvoid *CallbackData;
@@ -2033,6 +2037,9 @@ struct gl_fragment_program_state
    /** Program to emulate fixed-function texture env/combine (see above) */
    struct gl_fragment_program *_TexEnvProgram;
 
+   /** Cache of fixed-function programs */
+   struct gl_program_cache *Cache;
+
 #if FEATURE_MESA_program_debug
    GLprogramcallbackMESA Callback;
    GLvoid *CallbackData;
diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c
index ed1aacd068..f13aa18e95 100644
--- a/src/mesa/shader/program.c
+++ b/src/mesa/shader/program.c
@@ -33,6 +33,7 @@
 #include "context.h"
 #include "hash.h"
 #include "program.h"
+#include "prog_cache.h"
 #include "prog_parameter.h"
 #include "prog_instruction.h"
 
@@ -66,6 +67,7 @@ _mesa_init_program(GLcontext *ctx)
       ctx->VertexProgram.TrackMatrix[i] = GL_NONE;
       ctx->VertexProgram.TrackMatrixTransform[i] = GL_IDENTITY_NV;
    }
+   ctx->VertexProgram.Cache = _mesa_new_program_cache();
 #endif
 
 #if FEATURE_NV_fragment_program || FEATURE_ARB_fragment_program
@@ -73,8 +75,10 @@ _mesa_init_program(GLcontext *ctx)
    ctx->FragmentProgram.Current = (struct gl_fragment_program *) ctx->Shared->DefaultFragmentProgram;
    assert(ctx->FragmentProgram.Current);
    ctx->FragmentProgram.Current->Base.RefCount++;
+   ctx->FragmentProgram.Cache = _mesa_new_program_cache();
 #endif
 
+
    /* XXX probably move this stuff */
 #if FEATURE_ATI_fragment_shader
    ctx->ATIFragmentShader.Enabled = GL_FALSE;
-- 
cgit v1.2.3


From cf3f601682297d94482a1448eff3f36b26514ab1 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Wed, 31 Oct 2007 12:03:55 -0600
Subject: Lift fixed function vertex program generation up from tnl module.

---
 src/mesa/main/ffvertex_prog.c | 1550 +++++++++++++++++++++++++++++++++++++++++
 src/mesa/main/ffvertex_prog.h |   38 +
 2 files changed, 1588 insertions(+)
 create mode 100644 src/mesa/main/ffvertex_prog.c
 create mode 100644 src/mesa/main/ffvertex_prog.h

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
new file mode 100644
index 0000000000..8fcb9e5b14
--- /dev/null
+++ b/src/mesa/main/ffvertex_prog.c
@@ -0,0 +1,1550 @@
+/**************************************************************************
+ * 
+ * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * 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, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ **************************************************************************/
+
+/**
+ * \file ffvertex_prog.
+ *
+ * Create a vertex program to execute the current fixed function T&L pipeline.
+ * \author Keith Whitwell
+ */
+
+
+#include "main/glheader.h"
+#include "main/mtypes.h"
+#include "main/macros.h"
+#include "main/enums.h"
+#include "main/ffvertex_prog.h"
+#include "shader/program.h"
+#include "shader/prog_cache.h"
+#include "shader/prog_instruction.h"
+#include "shader/prog_parameter.h"
+#include "shader/prog_print.h"
+#include "shader/prog_statevars.h"
+
+
+struct state_key {
+   unsigned light_global_enabled:1;
+   unsigned light_local_viewer:1;
+   unsigned light_twoside:1;
+   unsigned light_color_material:1;
+   unsigned light_color_material_mask:12;
+   unsigned light_material_mask:12;
+
+   unsigned normalize:1;
+   unsigned rescale_normals:1;
+   unsigned fog_source_is_depth:1;
+   unsigned tnl_do_vertex_fog:1;
+   unsigned separate_specular:1;
+   unsigned fog_mode:2;
+   unsigned point_attenuated:1;
+   unsigned texture_enabled_global:1;
+   unsigned fragprog_inputs_read:12;
+
+   struct {
+      unsigned light_enabled:1;
+      unsigned light_eyepos3_is_zero:1;
+      unsigned light_spotcutoff_is_180:1;
+      unsigned light_attenuated:1;      
+      unsigned texunit_really_enabled:1;
+      unsigned texmat_enabled:1;
+      unsigned texgen_enabled:4;
+      unsigned texgen_mode0:4;
+      unsigned texgen_mode1:4;
+      unsigned texgen_mode2:4;
+      unsigned texgen_mode3:4;
+   } unit[8];
+};
+
+
+
+#define FOG_NONE   0
+#define FOG_LINEAR 1
+#define FOG_EXP    2
+#define FOG_EXP2   3
+
+static GLuint translate_fog_mode( GLenum mode )
+{
+   switch (mode) {
+   case GL_LINEAR: return FOG_LINEAR;
+   case GL_EXP: return FOG_EXP;
+   case GL_EXP2: return FOG_EXP2;
+   default: return FOG_NONE;
+   }
+}
+
+#define TXG_NONE           0
+#define TXG_OBJ_LINEAR     1
+#define TXG_EYE_LINEAR     2
+#define TXG_SPHERE_MAP     3
+#define TXG_REFLECTION_MAP 4
+#define TXG_NORMAL_MAP     5
+
+static GLuint translate_texgen( GLboolean enabled, GLenum mode )
+{
+   if (!enabled)
+      return TXG_NONE;
+
+   switch (mode) {
+   case GL_OBJECT_LINEAR: return TXG_OBJ_LINEAR;
+   case GL_EYE_LINEAR: return TXG_EYE_LINEAR;
+   case GL_SPHERE_MAP: return TXG_SPHERE_MAP;
+   case GL_REFLECTION_MAP_NV: return TXG_REFLECTION_MAP;
+   case GL_NORMAL_MAP_NV: return TXG_NORMAL_MAP;
+   default: return TXG_NONE;
+   }
+}
+
+
+/**
+ * Returns bitmask of flags indicating which materials are set per-vertex
+ * in the current VB.
+ * XXX get these from the VBO...
+ */
+static GLbitfield
+tnl_get_per_vertex_materials(GLcontext *ctx)
+{
+   GLbitfield mask = 0x0;
+#if 0
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   struct vertex_buffer *VB = &tnl->vb;
+   GLuint i;
+
+   for (i = _TNL_FIRST_MAT; i <= _TNL_LAST_MAT; i++) 
+      if (VB->AttribPtr[i] && VB->AttribPtr[i]->stride) 
+         mask |= 1 << (i - _TNL_FIRST_MAT);
+#endif
+   return mask;
+}
+
+/**
+ * Should fog be computed per-vertex?
+ */
+static GLboolean
+tnl_get_per_vertex_fog(GLcontext *ctx)
+{
+#if 0
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   return tnl->_DoVertexFog;
+#else
+   return GL_FALSE;
+#endif
+}
+
+
+static struct state_key *make_state_key( GLcontext *ctx )
+{
+   const struct gl_fragment_program *fp;
+   struct state_key *key = CALLOC_STRUCT(state_key);
+   GLuint i;
+
+   fp = ctx->FragmentProgram._Current;
+
+   /* This now relies on texenvprogram.c being active:
+    */
+   assert(fp);
+
+   key->fragprog_inputs_read = fp->Base.InputsRead;
+
+   if (ctx->RenderMode == GL_FEEDBACK) {
+      /* make sure the vertprog emits color and tex0 */
+      key->fragprog_inputs_read |= (FRAG_BIT_COL0 | FRAG_BIT_TEX0);
+   }
+
+   key->separate_specular = (ctx->Light.Model.ColorControl ==
+			     GL_SEPARATE_SPECULAR_COLOR);
+
+   if (ctx->Light.Enabled) {
+      key->light_global_enabled = 1;
+
+      if (ctx->Light.Model.LocalViewer)
+	 key->light_local_viewer = 1;
+
+      if (ctx->Light.Model.TwoSide)
+	 key->light_twoside = 1;
+
+      if (ctx->Light.ColorMaterialEnabled) {
+	 key->light_color_material = 1;
+	 key->light_color_material_mask = ctx->Light.ColorMaterialBitmask;
+      }
+
+      key->light_material_mask = tnl_get_per_vertex_materials(ctx);
+
+      for (i = 0; i < MAX_LIGHTS; i++) {
+	 struct gl_light *light = &ctx->Light.Light[i];
+
+	 if (light->Enabled) {
+	    key->unit[i].light_enabled = 1;
+
+	    if (light->EyePosition[3] == 0.0)
+	       key->unit[i].light_eyepos3_is_zero = 1;
+	    
+	    if (light->SpotCutoff == 180.0)
+	       key->unit[i].light_spotcutoff_is_180 = 1;
+
+	    if (light->ConstantAttenuation != 1.0 ||
+		light->LinearAttenuation != 0.0 ||
+		light->QuadraticAttenuation != 0.0)
+	       key->unit[i].light_attenuated = 1;
+	 }
+      }
+   }
+
+   if (ctx->Transform.Normalize)
+      key->normalize = 1;
+
+   if (ctx->Transform.RescaleNormals)
+      key->rescale_normals = 1;
+
+   key->fog_mode = translate_fog_mode(fp->FogOption);
+   
+   if (ctx->Fog.FogCoordinateSource == GL_FRAGMENT_DEPTH_EXT)
+      key->fog_source_is_depth = 1;
+   
+   key->tnl_do_vertex_fog = tnl_get_per_vertex_fog(ctx);
+
+   if (ctx->Point._Attenuated)
+      key->point_attenuated = 1;
+
+   if (ctx->Texture._TexGenEnabled ||
+       ctx->Texture._TexMatEnabled ||
+       ctx->Texture._EnabledUnits)
+      key->texture_enabled_global = 1;
+      
+   for (i = 0; i < MAX_TEXTURE_UNITS; i++) {
+      struct gl_texture_unit *texUnit = &ctx->Texture.Unit[i];
+
+      if (texUnit->_ReallyEnabled)
+	 key->unit[i].texunit_really_enabled = 1;
+
+      if (ctx->Texture._TexMatEnabled & ENABLE_TEXMAT(i))      
+	 key->unit[i].texmat_enabled = 1;
+      
+      if (texUnit->TexGenEnabled) {
+	 key->unit[i].texgen_enabled = 1;
+      
+	 key->unit[i].texgen_mode0 = 
+	    translate_texgen( texUnit->TexGenEnabled & (1<<0),
+			      texUnit->GenModeS );
+	 key->unit[i].texgen_mode1 = 
+	    translate_texgen( texUnit->TexGenEnabled & (1<<1),
+			      texUnit->GenModeT );
+	 key->unit[i].texgen_mode2 = 
+	    translate_texgen( texUnit->TexGenEnabled & (1<<2),
+			      texUnit->GenModeR );
+	 key->unit[i].texgen_mode3 = 
+	    translate_texgen( texUnit->TexGenEnabled & (1<<3),
+			      texUnit->GenModeQ );
+      }
+   }
+   
+   return key;
+}
+
+
+   
+/* Very useful debugging tool - produces annotated listing of
+ * generated program with line/function references for each
+ * instruction back into this file:
+ */
+#define DISASSEM (MESA_VERBOSE&VERBOSE_DISASSEM)
+
+/* Should be tunable by the driver - do we want to do matrix
+ * multiplications with DP4's or with MUL/MAD's?  SSE works better
+ * with the latter, drivers may differ.
+ */
+#define PREFER_DP4 0
+
+#define MAX_INSN 256
+
+/* Use uregs to represent registers internally, translate to Mesa's
+ * expected formats on emit.  
+ *
+ * NOTE: These are passed by value extensively in this file rather
+ * than as usual by pointer reference.  If this disturbs you, try
+ * remembering they are just 32bits in size.
+ *
+ * GCC is smart enough to deal with these dword-sized structures in
+ * much the same way as if I had defined them as dwords and was using
+ * macros to access and set the fields.  This is much nicer and easier
+ * to evolve.
+ */
+struct ureg {
+   GLuint file:4;
+   GLint idx:8;      /* relative addressing may be negative */
+   GLuint negate:1;
+   GLuint swz:12;
+   GLuint pad:7;
+};
+
+
+struct tnl_program {
+   const struct state_key *state;
+   struct gl_vertex_program *program;
+   
+   GLuint temp_in_use;
+   GLuint temp_reserved;
+   
+   struct ureg eye_position;
+   struct ureg eye_position_normalized;
+   struct ureg eye_normal;
+   struct ureg identity;
+
+   GLuint materials;
+   GLuint color_materials;
+};
+
+
+static const struct ureg undef = { 
+   PROGRAM_UNDEFINED,
+   ~0,
+   0,
+   0,
+   0
+};
+
+/* Local shorthand:
+ */
+#define X    SWIZZLE_X
+#define Y    SWIZZLE_Y
+#define Z    SWIZZLE_Z
+#define W    SWIZZLE_W
+
+
+/* Construct a ureg:
+ */
+static struct ureg make_ureg(GLuint file, GLint idx)
+{
+   struct ureg reg;
+   reg.file = file;
+   reg.idx = idx;
+   reg.negate = 0;
+   reg.swz = SWIZZLE_NOOP;
+   reg.pad = 0;
+   return reg;
+}
+
+
+
+static struct ureg negate( struct ureg reg )
+{
+   reg.negate ^= 1;
+   return reg;
+} 
+
+
+static struct ureg swizzle( struct ureg reg, int x, int y, int z, int w )
+{
+   reg.swz = MAKE_SWIZZLE4(GET_SWZ(reg.swz, x),
+			   GET_SWZ(reg.swz, y),
+			   GET_SWZ(reg.swz, z),
+			   GET_SWZ(reg.swz, w));
+
+   return reg;
+}
+
+static struct ureg swizzle1( struct ureg reg, int x )
+{
+   return swizzle(reg, x, x, x, x);
+}
+
+static struct ureg get_temp( struct tnl_program *p )
+{
+   int bit = _mesa_ffs( ~p->temp_in_use );
+   if (!bit) {
+      _mesa_problem(NULL, "%s: out of temporaries\n", __FILE__);
+      _mesa_exit(1);
+   }
+
+   if ((GLuint) bit > p->program->Base.NumTemporaries)
+      p->program->Base.NumTemporaries = bit;
+
+   p->temp_in_use |= 1<<(bit-1);
+   return make_ureg(PROGRAM_TEMPORARY, bit-1);
+}
+
+static struct ureg reserve_temp( struct tnl_program *p )
+{
+   struct ureg temp = get_temp( p );
+   p->temp_reserved |= 1<<temp.idx;
+   return temp;
+}
+
+static void release_temp( struct tnl_program *p, struct ureg reg )
+{
+   if (reg.file == PROGRAM_TEMPORARY) {
+      p->temp_in_use &= ~(1<<reg.idx);
+      p->temp_in_use |= p->temp_reserved; /* can't release reserved temps */
+   }
+}
+
+static void release_temps( struct tnl_program *p )
+{
+   p->temp_in_use = p->temp_reserved;
+}
+
+
+
+static struct ureg register_input( struct tnl_program *p, GLuint input )
+{
+   p->program->Base.InputsRead |= (1<<input);
+   return make_ureg(PROGRAM_INPUT, input);
+}
+
+static struct ureg register_output( struct tnl_program *p, GLuint output )
+{
+   p->program->Base.OutputsWritten |= (1<<output);
+   return make_ureg(PROGRAM_OUTPUT, output);
+}
+
+static struct ureg register_const4f( struct tnl_program *p, 
+			      GLfloat s0,
+			      GLfloat s1,
+			      GLfloat s2,
+			      GLfloat s3)
+{
+   GLfloat values[4];
+   GLint idx;
+   GLuint swizzle;
+   values[0] = s0;
+   values[1] = s1;
+   values[2] = s2;
+   values[3] = s3;
+   idx = _mesa_add_unnamed_constant( p->program->Base.Parameters, values, 4,
+                                     &swizzle );
+   ASSERT(swizzle == SWIZZLE_NOOP);
+   return make_ureg(PROGRAM_STATE_VAR, idx);
+}
+
+#define register_const1f(p, s0)         register_const4f(p, s0, 0, 0, 1)
+#define register_scalar_const(p, s0)    register_const4f(p, s0, s0, s0, s0)
+#define register_const2f(p, s0, s1)     register_const4f(p, s0, s1, 0, 1)
+#define register_const3f(p, s0, s1, s2) register_const4f(p, s0, s1, s2, 1)
+
+static GLboolean is_undef( struct ureg reg )
+{
+   return reg.file == PROGRAM_UNDEFINED;
+}
+
+static struct ureg get_identity_param( struct tnl_program *p )
+{
+   if (is_undef(p->identity)) 
+      p->identity = register_const4f(p, 0,0,0,1);
+
+   return p->identity;
+}
+
+static struct ureg register_param5(struct tnl_program *p, 
+				   GLint s0,
+				   GLint s1,
+				   GLint s2,
+				   GLint s3,
+                                   GLint s4)
+{
+   gl_state_index tokens[STATE_LENGTH];
+   GLint idx;
+   tokens[0] = s0;
+   tokens[1] = s1;
+   tokens[2] = s2;
+   tokens[3] = s3;
+   tokens[4] = s4;
+   idx = _mesa_add_state_reference( p->program->Base.Parameters, tokens );
+   return make_ureg(PROGRAM_STATE_VAR, idx);
+}
+
+
+#define register_param1(p,s0)          register_param5(p,s0,0,0,0,0)
+#define register_param2(p,s0,s1)       register_param5(p,s0,s1,0,0,0)
+#define register_param3(p,s0,s1,s2)    register_param5(p,s0,s1,s2,0,0)
+#define register_param4(p,s0,s1,s2,s3) register_param5(p,s0,s1,s2,s3,0)
+
+
+static void register_matrix_param5( struct tnl_program *p,
+				    GLint s0, /* modelview, projection, etc */
+				    GLint s1, /* texture matrix number */
+				    GLint s2, /* first row */
+				    GLint s3, /* last row */
+				    GLint s4, /* inverse, transpose, etc */
+				    struct ureg *matrix )
+{
+   GLint i;
+
+   /* This is a bit sad as the support is there to pull the whole
+    * matrix out in one go:
+    */
+   for (i = 0; i <= s3 - s2; i++) 
+      matrix[i] = register_param5( p, s0, s1, i, i, s4 );
+}
+
+
+static void emit_arg( struct prog_src_register *src,
+		      struct ureg reg )
+{
+   src->File = reg.file;
+   src->Index = reg.idx;
+   src->Swizzle = reg.swz;
+   src->NegateBase = reg.negate ? NEGATE_XYZW : 0;
+   src->Abs = 0;
+   src->NegateAbs = 0;
+   src->RelAddr = 0;
+}
+
+static void emit_dst( struct prog_dst_register *dst,
+		      struct ureg reg, GLuint mask )
+{
+   dst->File = reg.file;
+   dst->Index = reg.idx;
+   /* allow zero as a shorthand for xyzw */
+   dst->WriteMask = mask ? mask : WRITEMASK_XYZW; 
+   dst->CondMask = COND_TR;  /* always pass cond test */
+   dst->CondSwizzle = SWIZZLE_NOOP;
+   dst->CondSrc = 0;
+   dst->pad = 0;
+}
+
+static void debug_insn( struct prog_instruction *inst, const char *fn,
+			GLuint line )
+{
+   if (DISASSEM) {
+      static const char *last_fn;
+   
+      if (fn != last_fn) {
+	 last_fn = fn;
+	 _mesa_printf("%s:\n", fn);
+      }
+	 
+      _mesa_printf("%d:\t", line);
+      _mesa_print_instruction(inst);
+   }
+}
+
+
+static void emit_op3fn(struct tnl_program *p,
+                       enum prog_opcode op,
+		       struct ureg dest,
+		       GLuint mask,
+		       struct ureg src0,
+		       struct ureg src1,
+		       struct ureg src2,
+		       const char *fn,
+		       GLuint line)
+{
+   GLuint nr = p->program->Base.NumInstructions++;
+   struct prog_instruction *inst = &p->program->Base.Instructions[nr];
+      
+   if (p->program->Base.NumInstructions > MAX_INSN) {
+      _mesa_problem(0, "Out of instructions in emit_op3fn\n");
+      return;
+   }
+      
+   inst->Opcode = (enum prog_opcode) op; 
+   inst->StringPos = 0;
+   inst->Data = 0;
+   
+   emit_arg( &inst->SrcReg[0], src0 );
+   emit_arg( &inst->SrcReg[1], src1 );
+   emit_arg( &inst->SrcReg[2], src2 );   
+
+   emit_dst( &inst->DstReg, dest, mask );
+
+   debug_insn(inst, fn, line);
+}
+
+
+#define emit_op3(p, op, dst, mask, src0, src1, src2) \
+   emit_op3fn(p, op, dst, mask, src0, src1, src2, __FUNCTION__, __LINE__)
+
+#define emit_op2(p, op, dst, mask, src0, src1) \
+    emit_op3fn(p, op, dst, mask, src0, src1, undef, __FUNCTION__, __LINE__)
+
+#define emit_op1(p, op, dst, mask, src0) \
+    emit_op3fn(p, op, dst, mask, src0, undef, undef, __FUNCTION__, __LINE__)
+
+
+static struct ureg make_temp( struct tnl_program *p, struct ureg reg )
+{
+   if (reg.file == PROGRAM_TEMPORARY && 
+       !(p->temp_reserved & (1<<reg.idx)))
+      return reg;
+   else {
+      struct ureg temp = get_temp(p);
+      emit_op1(p, OPCODE_MOV, temp, 0, reg);
+      return temp;
+   }
+}
+
+
+/* Currently no tracking performed of input/output/register size or
+ * active elements.  Could be used to reduce these operations, as
+ * could the matrix type.
+ */
+static void emit_matrix_transform_vec4( struct tnl_program *p,
+					struct ureg dest,
+					const struct ureg *mat,
+					struct ureg src)
+{
+   emit_op2(p, OPCODE_DP4, dest, WRITEMASK_X, src, mat[0]);
+   emit_op2(p, OPCODE_DP4, dest, WRITEMASK_Y, src, mat[1]);
+   emit_op2(p, OPCODE_DP4, dest, WRITEMASK_Z, src, mat[2]);
+   emit_op2(p, OPCODE_DP4, dest, WRITEMASK_W, src, mat[3]);
+}
+
+/* This version is much easier to implement if writemasks are not
+ * supported natively on the target or (like SSE), the target doesn't
+ * have a clean/obvious dotproduct implementation.
+ */
+static void emit_transpose_matrix_transform_vec4( struct tnl_program *p,
+						  struct ureg dest,
+						  const struct ureg *mat,
+						  struct ureg src)
+{
+   struct ureg tmp;
+
+   if (dest.file != PROGRAM_TEMPORARY)
+      tmp = get_temp(p);
+   else
+      tmp = dest;
+
+   emit_op2(p, OPCODE_MUL, tmp, 0, swizzle1(src,X), mat[0]);
+   emit_op3(p, OPCODE_MAD, tmp, 0, swizzle1(src,Y), mat[1], tmp);
+   emit_op3(p, OPCODE_MAD, tmp, 0, swizzle1(src,Z), mat[2], tmp);
+   emit_op3(p, OPCODE_MAD, dest, 0, swizzle1(src,W), mat[3], tmp);
+
+   if (dest.file != PROGRAM_TEMPORARY)
+      release_temp(p, tmp);
+}
+
+static void emit_matrix_transform_vec3( struct tnl_program *p,
+					struct ureg dest,
+					const struct ureg *mat,
+					struct ureg src)
+{
+   emit_op2(p, OPCODE_DP3, dest, WRITEMASK_X, src, mat[0]);
+   emit_op2(p, OPCODE_DP3, dest, WRITEMASK_Y, src, mat[1]);
+   emit_op2(p, OPCODE_DP3, dest, WRITEMASK_Z, src, mat[2]);
+}
+
+
+static void emit_normalize_vec3( struct tnl_program *p,
+				 struct ureg dest,
+				 struct ureg src )
+{
+   struct ureg tmp = get_temp(p);
+   emit_op2(p, OPCODE_DP3, tmp, 0, src, src);
+   emit_op1(p, OPCODE_RSQ, tmp, 0, tmp);
+   emit_op2(p, OPCODE_MUL, dest, 0, src, tmp);
+   release_temp(p, tmp);
+}
+
+static void emit_passthrough( struct tnl_program *p, 
+			      GLuint input,
+			      GLuint output )
+{
+   struct ureg out = register_output(p, output);
+   emit_op1(p, OPCODE_MOV, out, 0, register_input(p, input)); 
+}
+
+static struct ureg get_eye_position( struct tnl_program *p )
+{
+   if (is_undef(p->eye_position)) {
+      struct ureg pos = register_input( p, VERT_ATTRIB_POS ); 
+      struct ureg modelview[4];
+
+      p->eye_position = reserve_temp(p);
+
+      if (PREFER_DP4) {
+	 register_matrix_param5( p, STATE_MODELVIEW_MATRIX, 0, 0, 3,
+                                 0, modelview );
+
+	 emit_matrix_transform_vec4(p, p->eye_position, modelview, pos);
+      }
+      else {
+	 register_matrix_param5( p, STATE_MODELVIEW_MATRIX, 0, 0, 3,
+				 STATE_MATRIX_TRANSPOSE, modelview );
+
+	 emit_transpose_matrix_transform_vec4(p, p->eye_position, modelview, pos);
+      }
+   }
+   
+   return p->eye_position;
+}
+
+
+static struct ureg get_eye_position_normalized( struct tnl_program *p )
+{
+   if (is_undef(p->eye_position_normalized)) {
+      struct ureg eye = get_eye_position(p);
+      p->eye_position_normalized = reserve_temp(p);
+      emit_normalize_vec3(p, p->eye_position_normalized, eye);
+   }
+   
+   return p->eye_position_normalized;
+}
+
+
+static struct ureg get_eye_normal( struct tnl_program *p )
+{
+   if (is_undef(p->eye_normal)) {
+      struct ureg normal = register_input(p, VERT_ATTRIB_NORMAL );
+      struct ureg mvinv[3];
+
+      register_matrix_param5( p, STATE_MODELVIEW_MATRIX, 0, 0, 2,
+			      STATE_MATRIX_INVTRANS, mvinv );
+
+      p->eye_normal = reserve_temp(p);
+
+      /* Transform to eye space:
+       */
+      emit_matrix_transform_vec3( p, p->eye_normal, mvinv, normal );
+
+      /* Normalize/Rescale:
+       */
+      if (p->state->normalize) {
+	 emit_normalize_vec3( p, p->eye_normal, p->eye_normal );
+      }
+      else if (p->state->rescale_normals) {
+	 struct ureg rescale = register_param2(p, STATE_INTERNAL,
+					       STATE_NORMAL_SCALE);
+
+	 emit_op2( p, OPCODE_MUL, p->eye_normal, 0, p->eye_normal,
+		   swizzle1(rescale, X));
+      }
+   }
+
+   return p->eye_normal;
+}
+
+
+
+static void build_hpos( struct tnl_program *p )
+{
+   struct ureg pos = register_input( p, VERT_ATTRIB_POS ); 
+   struct ureg hpos = register_output( p, VERT_RESULT_HPOS );
+   struct ureg mvp[4];
+
+   if (PREFER_DP4) {
+      register_matrix_param5( p, STATE_MVP_MATRIX, 0, 0, 3, 
+			      0, mvp );
+      emit_matrix_transform_vec4( p, hpos, mvp, pos );
+   }
+   else {
+      register_matrix_param5( p, STATE_MVP_MATRIX, 0, 0, 3, 
+			      STATE_MATRIX_TRANSPOSE, mvp );
+      emit_transpose_matrix_transform_vec4( p, hpos, mvp, pos );
+   }
+}
+
+
+static GLuint material_attrib( GLuint side, GLuint property )
+{
+   return ((property - STATE_AMBIENT) * 2 + 
+	   side);
+}
+
+/* Get a bitmask of which material values vary on a per-vertex basis.
+ */
+static void set_material_flags( struct tnl_program *p )
+{
+   p->color_materials = 0;
+   p->materials = 0;
+
+   if (p->state->light_color_material) {
+      p->materials = 
+	 p->color_materials = p->state->light_color_material_mask;
+   }
+
+   p->materials |= p->state->light_material_mask;
+}
+
+
+/* XXX temporary!!! */
+#define _TNL_ATTRIB_MAT_FRONT_AMBIENT 32
+
+static struct ureg get_material( struct tnl_program *p, GLuint side, 
+				 GLuint property )
+{
+   GLuint attrib = material_attrib(side, property);
+
+   if (p->color_materials & (1<<attrib))
+      return register_input(p, VERT_ATTRIB_COLOR0);
+   else if (p->materials & (1<<attrib)) 
+      return register_input( p, attrib + _TNL_ATTRIB_MAT_FRONT_AMBIENT );
+   else
+      return register_param3( p, STATE_MATERIAL, side, property );
+}
+
+#define SCENE_COLOR_BITS(side) (( MAT_BIT_FRONT_EMISSION | \
+				   MAT_BIT_FRONT_AMBIENT | \
+				   MAT_BIT_FRONT_DIFFUSE) << (side))
+
+/* Either return a precalculated constant value or emit code to
+ * calculate these values dynamically in the case where material calls
+ * are present between begin/end pairs.
+ *
+ * Probably want to shift this to the program compilation phase - if
+ * we always emitted the calculation here, a smart compiler could
+ * detect that it was constant (given a certain set of inputs), and
+ * lift it out of the main loop.  That way the programs created here
+ * would be independent of the vertex_buffer details.
+ */
+static struct ureg get_scenecolor( struct tnl_program *p, GLuint side )
+{
+   if (p->materials & SCENE_COLOR_BITS(side)) {
+      struct ureg lm_ambient = register_param1(p, STATE_LIGHTMODEL_AMBIENT);
+      struct ureg material_emission = get_material(p, side, STATE_EMISSION);
+      struct ureg material_ambient = get_material(p, side, STATE_AMBIENT);
+      struct ureg material_diffuse = get_material(p, side, STATE_DIFFUSE);
+      struct ureg tmp = make_temp(p, material_diffuse);
+      emit_op3(p, OPCODE_MAD, tmp,  WRITEMASK_XYZ, lm_ambient, 
+	       material_ambient, material_emission);
+      return tmp;
+   }
+   else
+      return register_param2( p, STATE_LIGHTMODEL_SCENECOLOR, side );
+}
+
+
+static struct ureg get_lightprod( struct tnl_program *p, GLuint light, 
+				  GLuint side, GLuint property )
+{
+   GLuint attrib = material_attrib(side, property);
+   if (p->materials & (1<<attrib)) {
+      struct ureg light_value = 
+	 register_param3(p, STATE_LIGHT, light, property);
+      struct ureg material_value = get_material(p, side, property);
+      struct ureg tmp = get_temp(p);
+      emit_op2(p, OPCODE_MUL, tmp,  0, light_value, material_value);
+      return tmp;
+   }
+   else
+      return register_param4(p, STATE_LIGHTPROD, light, side, property);
+}
+
+static struct ureg calculate_light_attenuation( struct tnl_program *p,
+						GLuint i, 
+						struct ureg VPpli,
+						struct ureg dist )
+{
+   struct ureg attenuation = register_param3(p, STATE_LIGHT, i,
+					     STATE_ATTENUATION);
+   struct ureg att = get_temp(p);
+
+   /* Calculate spot attenuation:
+    */
+   if (!p->state->unit[i].light_spotcutoff_is_180) {
+      struct ureg spot_dir_norm = register_param3(p, STATE_INTERNAL,
+						  STATE_SPOT_DIR_NORMALIZED, i);
+      struct ureg spot = get_temp(p);
+      struct ureg slt = get_temp(p);
+
+      emit_op2(p, OPCODE_DP3, spot, 0, negate(VPpli), spot_dir_norm);
+      emit_op2(p, OPCODE_SLT, slt, 0, swizzle1(spot_dir_norm,W), spot);
+      emit_op2(p, OPCODE_POW, spot, 0, spot, swizzle1(attenuation, W));
+      emit_op2(p, OPCODE_MUL, att, 0, slt, spot);
+
+      release_temp(p, spot);
+      release_temp(p, slt);
+   }
+
+   /* Calculate distance attenuation:
+    */
+   if (p->state->unit[i].light_attenuated) {
+
+      /* 1/d,d,d,1/d */
+      emit_op1(p, OPCODE_RCP, dist, WRITEMASK_YZ, dist); 
+      /* 1,d,d*d,1/d */
+      emit_op2(p, OPCODE_MUL, dist, WRITEMASK_XZ, dist, swizzle1(dist,Y)); 
+      /* 1/dist-atten */
+      emit_op2(p, OPCODE_DP3, dist, 0, attenuation, dist); 
+
+      if (!p->state->unit[i].light_spotcutoff_is_180) {
+	 /* dist-atten */
+	 emit_op1(p, OPCODE_RCP, dist, 0, dist); 
+	 /* spot-atten * dist-atten */
+	 emit_op2(p, OPCODE_MUL, att, 0, dist, att);	
+      } else {
+	 /* dist-atten */
+	 emit_op1(p, OPCODE_RCP, att, 0, dist); 
+      }
+   }
+
+   return att;
+}
+						
+
+
+
+
+/* Need to add some addtional parameters to allow lighting in object
+ * space - STATE_SPOT_DIRECTION and STATE_HALF_VECTOR implicitly assume eye
+ * space lighting.
+ */
+static void build_lighting( struct tnl_program *p )
+{
+   const GLboolean twoside = p->state->light_twoside;
+   const GLboolean separate = p->state->separate_specular;
+   GLuint nr_lights = 0, count = 0;
+   struct ureg normal = get_eye_normal(p);
+   struct ureg lit = get_temp(p);
+   struct ureg dots = get_temp(p);
+   struct ureg _col0 = undef, _col1 = undef;
+   struct ureg _bfc0 = undef, _bfc1 = undef;
+   GLuint i;
+
+   for (i = 0; i < MAX_LIGHTS; i++) 
+      if (p->state->unit[i].light_enabled)
+	 nr_lights++;
+   
+   set_material_flags(p);
+
+   {
+      struct ureg shininess = get_material(p, 0, STATE_SHININESS);
+      emit_op1(p, OPCODE_MOV, dots,  WRITEMASK_W, swizzle1(shininess,X));
+      release_temp(p, shininess);
+
+      _col0 = make_temp(p, get_scenecolor(p, 0));
+      if (separate)
+	 _col1 = make_temp(p, get_identity_param(p));
+      else
+	 _col1 = _col0;
+
+   }
+
+   if (twoside) {
+      struct ureg shininess = get_material(p, 1, STATE_SHININESS);
+      emit_op1(p, OPCODE_MOV, dots, WRITEMASK_Z, 
+	       negate(swizzle1(shininess,X)));
+      release_temp(p, shininess);
+
+      _bfc0 = make_temp(p, get_scenecolor(p, 1));
+      if (separate)
+	 _bfc1 = make_temp(p, get_identity_param(p));
+      else
+	 _bfc1 = _bfc0;
+   }
+
+
+   /* If no lights, still need to emit the scenecolor.
+    */
+      {
+	 struct ureg res0 = register_output( p, VERT_RESULT_COL0 );
+	 emit_op1(p, OPCODE_MOV, res0, 0, _col0);
+      }
+
+      if (separate) {
+	 struct ureg res1 = register_output( p, VERT_RESULT_COL1 );
+	 emit_op1(p, OPCODE_MOV, res1, 0, _col1);
+      }
+
+      if (twoside) {
+	 struct ureg res0 = register_output( p, VERT_RESULT_BFC0 );
+	 emit_op1(p, OPCODE_MOV, res0, 0, _bfc0);
+      }
+      
+      if (twoside && separate) {
+	 struct ureg res1 = register_output( p, VERT_RESULT_BFC1 );
+	 emit_op1(p, OPCODE_MOV, res1, 0, _bfc1);
+      }
+      
+   if (nr_lights == 0) {
+      release_temps(p);
+      return;
+   }
+
+
+   for (i = 0; i < MAX_LIGHTS; i++) {
+      if (p->state->unit[i].light_enabled) {
+	 struct ureg half = undef;
+	 struct ureg att = undef, VPpli = undef;
+	  
+	 count++;
+
+	 if (p->state->unit[i].light_eyepos3_is_zero) {
+	    /* Can used precomputed constants in this case.
+	     * Attenuation never applies to infinite lights.
+	     */
+	    VPpli = register_param3(p, STATE_LIGHT, i, 
+				    STATE_POSITION_NORMALIZED); 
+            if (p->state->light_local_viewer) {
+                struct ureg eye_hat = get_eye_position_normalized(p);
+                half = get_temp(p);
+                emit_op2(p, OPCODE_SUB, half, 0, VPpli, eye_hat);
+                emit_normalize_vec3(p, half, half);
+            } else {
+                half = register_param3(p, STATE_LIGHT, i, STATE_HALF_VECTOR);
+            }
+	 } 
+	 else {
+	    struct ureg Ppli = register_param3(p, STATE_LIGHT, i, 
+					       STATE_POSITION); 
+	    struct ureg V = get_eye_position(p);
+	    struct ureg dist = get_temp(p);
+
+	    VPpli = get_temp(p); 
+	    half = get_temp(p);
+ 
+	    /* Calulate VPpli vector
+	     */
+	    emit_op2(p, OPCODE_SUB, VPpli, 0, Ppli, V); 
+
+	    /* Normalize VPpli.  The dist value also used in
+	     * attenuation below.
+	     */
+	    emit_op2(p, OPCODE_DP3, dist, 0, VPpli, VPpli);
+	    emit_op1(p, OPCODE_RSQ, dist, 0, dist);
+	    emit_op2(p, OPCODE_MUL, VPpli, 0, VPpli, dist);
+
+
+	    /* Calculate  attenuation:
+	     */ 
+	    if (!p->state->unit[i].light_spotcutoff_is_180 ||
+		p->state->unit[i].light_attenuated) {
+	       att = calculate_light_attenuation(p, i, VPpli, dist);
+	    }
+	 
+      
+	    /* Calculate viewer direction, or use infinite viewer:
+	     */
+	    if (p->state->light_local_viewer) {
+	       struct ureg eye_hat = get_eye_position_normalized(p);
+	       emit_op2(p, OPCODE_SUB, half, 0, VPpli, eye_hat);
+	    }
+	    else {
+	       struct ureg z_dir = swizzle(get_identity_param(p),X,Y,W,Z); 
+	       emit_op2(p, OPCODE_ADD, half, 0, VPpli, z_dir);
+	    }
+
+	    emit_normalize_vec3(p, half, half);
+
+	    release_temp(p, dist);
+	 }
+
+	 /* Calculate dot products:
+	  */
+	 emit_op2(p, OPCODE_DP3, dots, WRITEMASK_X, normal, VPpli);
+	 emit_op2(p, OPCODE_DP3, dots, WRITEMASK_Y, normal, half);
+
+	
+	 /* Front face lighting:
+	  */
+	 {
+	    struct ureg ambient = get_lightprod(p, i, 0, STATE_AMBIENT);
+	    struct ureg diffuse = get_lightprod(p, i, 0, STATE_DIFFUSE);
+	    struct ureg specular = get_lightprod(p, i, 0, STATE_SPECULAR);
+	    struct ureg res0, res1;
+	    GLuint mask0, mask1;
+
+	    emit_op1(p, OPCODE_LIT, lit, 0, dots);
+   
+	    if (!is_undef(att)) 
+	       emit_op2(p, OPCODE_MUL, lit, 0, lit, att);
+   
+	    
+	    if (count == nr_lights) {
+	       if (separate) {
+		  mask0 = WRITEMASK_XYZ;
+		  mask1 = WRITEMASK_XYZ;
+		  res0 = register_output( p, VERT_RESULT_COL0 );
+		  res1 = register_output( p, VERT_RESULT_COL1 );
+	       }
+	       else {
+		  mask0 = 0;
+		  mask1 = WRITEMASK_XYZ;
+		  res0 = _col0;
+		  res1 = register_output( p, VERT_RESULT_COL0 );
+	       }
+	    } else {
+	       mask0 = 0;
+	       mask1 = 0;
+	       res0 = _col0;
+	       res1 = _col1;
+	    }
+
+	    emit_op3(p, OPCODE_MAD, _col0, 0, swizzle1(lit,X), ambient, _col0);
+	    emit_op3(p, OPCODE_MAD, res0, mask0, swizzle1(lit,Y), diffuse, _col0);
+	    emit_op3(p, OPCODE_MAD, res1, mask1, swizzle1(lit,Z), specular, _col1);
+      
+	    release_temp(p, ambient);
+	    release_temp(p, diffuse);
+	    release_temp(p, specular);
+	 }
+
+	 /* Back face lighting:
+	  */
+	 if (twoside) {
+	    struct ureg ambient = get_lightprod(p, i, 1, STATE_AMBIENT);
+	    struct ureg diffuse = get_lightprod(p, i, 1, STATE_DIFFUSE);
+	    struct ureg specular = get_lightprod(p, i, 1, STATE_SPECULAR);
+	    struct ureg res0, res1;
+	    GLuint mask0, mask1;
+	       
+	    emit_op1(p, OPCODE_LIT, lit, 0, negate(swizzle(dots,X,Y,W,Z)));
+
+	    if (!is_undef(att)) 
+	       emit_op2(p, OPCODE_MUL, lit, 0, lit, att);
+
+	    if (count == nr_lights) {
+	       if (separate) {
+		  mask0 = WRITEMASK_XYZ;
+		  mask1 = WRITEMASK_XYZ;
+		  res0 = register_output( p, VERT_RESULT_BFC0 );
+		  res1 = register_output( p, VERT_RESULT_BFC1 );
+	       }
+	       else {
+		  mask0 = 0;
+		  mask1 = WRITEMASK_XYZ;
+		  res0 = _bfc0;
+		  res1 = register_output( p, VERT_RESULT_BFC0 );
+	       }
+	    } else {
+	       res0 = _bfc0;
+	       res1 = _bfc1;
+	       mask0 = 0;
+	       mask1 = 0;
+	    }
+
+	    emit_op3(p, OPCODE_MAD, _bfc0, 0, swizzle1(lit,X), ambient, _bfc0);
+	    emit_op3(p, OPCODE_MAD, res0, mask0, swizzle1(lit,Y), diffuse, _bfc0);
+	    emit_op3(p, OPCODE_MAD, res1, mask1, swizzle1(lit,Z), specular, _bfc1);
+
+	    release_temp(p, ambient);
+	    release_temp(p, diffuse);
+	    release_temp(p, specular);
+	 }
+
+	 release_temp(p, half);
+	 release_temp(p, VPpli);
+	 release_temp(p, att);
+      }
+   }
+
+   release_temps( p );
+}
+
+
+static void build_fog( struct tnl_program *p )
+{
+   struct ureg fog = register_output(p, VERT_RESULT_FOGC);
+   struct ureg input;
+
+   if (p->state->fog_source_is_depth) {
+      input = swizzle1(get_eye_position(p), Z);
+   }
+   else {
+      input = swizzle1(register_input(p, VERT_ATTRIB_FOG), X);
+   }
+
+   if (p->state->fog_mode && p->state->tnl_do_vertex_fog) {
+      struct ureg params = register_param2(p, STATE_INTERNAL,
+					   STATE_FOG_PARAMS_OPTIMIZED);
+      struct ureg tmp = get_temp(p);
+      GLboolean useabs = (p->state->fog_mode != FOG_EXP2);
+
+      if (useabs) {
+	 emit_op1(p, OPCODE_ABS, tmp, 0, input);
+      }
+
+      switch (p->state->fog_mode) {
+      case FOG_LINEAR: {
+	 struct ureg id = get_identity_param(p);
+	 emit_op3(p, OPCODE_MAD, tmp, 0, useabs ? tmp : input,
+			swizzle1(params,X), swizzle1(params,Y));
+	 emit_op2(p, OPCODE_MAX, tmp, 0, tmp, swizzle1(id,X)); /* saturate */
+	 emit_op2(p, OPCODE_MIN, fog, WRITEMASK_X, tmp, swizzle1(id,W));
+	 break;
+      }
+      case FOG_EXP:
+	 emit_op2(p, OPCODE_MUL, tmp, 0, useabs ? tmp : input,
+			swizzle1(params,Z));
+	 emit_op1(p, OPCODE_EX2, fog, WRITEMASK_X, negate(tmp));
+	 break;
+      case FOG_EXP2:
+	 emit_op2(p, OPCODE_MUL, tmp, 0, input, swizzle1(params,W));
+	 emit_op2(p, OPCODE_MUL, tmp, 0, tmp, tmp);
+	 emit_op1(p, OPCODE_EX2, fog, WRITEMASK_X, negate(tmp));
+	 break;
+      }
+
+      release_temp(p, tmp);
+   }
+   else {
+      /* results = incoming fog coords (compute fog per-fragment later) 
+       *
+       * KW:  Is it really necessary to do anything in this case?
+       * BP: Yes, we always need to compute the absolute value, unless
+       * we want to push that down into the fragment program...
+       */
+      GLboolean useabs = GL_TRUE;
+      emit_op1(p, useabs ? OPCODE_ABS : OPCODE_MOV, fog, WRITEMASK_X, input);
+   }
+}
+ 
+static void build_reflect_texgen( struct tnl_program *p,
+				  struct ureg dest,
+				  GLuint writemask )
+{
+   struct ureg normal = get_eye_normal(p);
+   struct ureg eye_hat = get_eye_position_normalized(p);
+   struct ureg tmp = get_temp(p);
+
+   /* n.u */
+   emit_op2(p, OPCODE_DP3, tmp, 0, normal, eye_hat); 
+   /* 2n.u */
+   emit_op2(p, OPCODE_ADD, tmp, 0, tmp, tmp); 
+   /* (-2n.u)n + u */
+   emit_op3(p, OPCODE_MAD, dest, writemask, negate(tmp), normal, eye_hat);
+
+   release_temp(p, tmp);
+}
+
+static void build_sphere_texgen( struct tnl_program *p,
+				 struct ureg dest,
+				 GLuint writemask )
+{
+   struct ureg normal = get_eye_normal(p);
+   struct ureg eye_hat = get_eye_position_normalized(p);
+   struct ureg tmp = get_temp(p);
+   struct ureg half = register_scalar_const(p, .5);
+   struct ureg r = get_temp(p);
+   struct ureg inv_m = get_temp(p);
+   struct ureg id = get_identity_param(p);
+
+   /* Could share the above calculations, but it would be
+    * a fairly odd state for someone to set (both sphere and
+    * reflection active for different texture coordinate
+    * components.  Of course - if two texture units enable
+    * reflect and/or sphere, things start to tilt in favour
+    * of seperating this out:
+    */
+
+   /* n.u */
+   emit_op2(p, OPCODE_DP3, tmp, 0, normal, eye_hat); 
+   /* 2n.u */
+   emit_op2(p, OPCODE_ADD, tmp, 0, tmp, tmp); 
+   /* (-2n.u)n + u */
+   emit_op3(p, OPCODE_MAD, r, 0, negate(tmp), normal, eye_hat); 
+   /* r + 0,0,1 */
+   emit_op2(p, OPCODE_ADD, tmp, 0, r, swizzle(id,X,Y,W,Z)); 
+   /* rx^2 + ry^2 + (rz+1)^2 */
+   emit_op2(p, OPCODE_DP3, tmp, 0, tmp, tmp); 
+   /* 2/m */
+   emit_op1(p, OPCODE_RSQ, tmp, 0, tmp); 
+   /* 1/m */
+   emit_op2(p, OPCODE_MUL, inv_m, 0, tmp, half); 
+   /* r/m + 1/2 */
+   emit_op3(p, OPCODE_MAD, dest, writemask, r, inv_m, half); 
+	       
+   release_temp(p, tmp);
+   release_temp(p, r);
+   release_temp(p, inv_m);
+}
+
+
+static void build_texture_transform( struct tnl_program *p )
+{
+   GLuint i, j;
+
+   for (i = 0; i < MAX_TEXTURE_UNITS; i++) {
+
+      if (!(p->state->fragprog_inputs_read & FRAG_BIT_TEX(i)))
+	 continue;
+							     
+      if (p->state->unit[i].texgen_enabled || 
+	  p->state->unit[i].texmat_enabled) {
+	 
+	 GLuint texmat_enabled = p->state->unit[i].texmat_enabled;
+	 struct ureg out = register_output(p, VERT_RESULT_TEX0 + i);
+	 struct ureg out_texgen = undef;
+
+	 if (p->state->unit[i].texgen_enabled) {
+	    GLuint copy_mask = 0;
+	    GLuint sphere_mask = 0;
+	    GLuint reflect_mask = 0;
+	    GLuint normal_mask = 0;
+	    GLuint modes[4];
+	 
+	    if (texmat_enabled) 
+	       out_texgen = get_temp(p);
+	    else
+	       out_texgen = out;
+
+	    modes[0] = p->state->unit[i].texgen_mode0;
+	    modes[1] = p->state->unit[i].texgen_mode1;
+	    modes[2] = p->state->unit[i].texgen_mode2;
+	    modes[3] = p->state->unit[i].texgen_mode3;
+
+	    for (j = 0; j < 4; j++) {
+	       switch (modes[j]) {
+	       case TXG_OBJ_LINEAR: {
+		  struct ureg obj = register_input(p, VERT_ATTRIB_POS);
+		  struct ureg plane = 
+		     register_param3(p, STATE_TEXGEN, i,
+				     STATE_TEXGEN_OBJECT_S + j);
+
+		  emit_op2(p, OPCODE_DP4, out_texgen, WRITEMASK_X << j, 
+			   obj, plane );
+		  break;
+	       }
+	       case TXG_EYE_LINEAR: {
+		  struct ureg eye = get_eye_position(p);
+		  struct ureg plane = 
+		     register_param3(p, STATE_TEXGEN, i, 
+				     STATE_TEXGEN_EYE_S + j);
+
+		  emit_op2(p, OPCODE_DP4, out_texgen, WRITEMASK_X << j, 
+			   eye, plane );
+		  break;
+	       }
+	       case TXG_SPHERE_MAP: 
+		  sphere_mask |= WRITEMASK_X << j;
+		  break;
+	       case TXG_REFLECTION_MAP:
+		  reflect_mask |= WRITEMASK_X << j;
+		  break;
+	       case TXG_NORMAL_MAP: 
+		  normal_mask |= WRITEMASK_X << j;
+		  break;
+	       case TXG_NONE:
+		  copy_mask |= WRITEMASK_X << j;
+	       }
+
+	    }
+
+	 
+	    if (sphere_mask) {
+	       build_sphere_texgen(p, out_texgen, sphere_mask);
+	    }
+
+	    if (reflect_mask) {
+	       build_reflect_texgen(p, out_texgen, reflect_mask);
+	    }
+
+	    if (normal_mask) {
+	       struct ureg normal = get_eye_normal(p);
+	       emit_op1(p, OPCODE_MOV, out_texgen, normal_mask, normal );
+	    }
+
+	    if (copy_mask) {
+	       struct ureg in = register_input(p, VERT_ATTRIB_TEX0+i);
+	       emit_op1(p, OPCODE_MOV, out_texgen, copy_mask, in );
+	    }
+	 }
+
+	 if (texmat_enabled) {
+	    struct ureg texmat[4];
+	    struct ureg in = (!is_undef(out_texgen) ? 
+			      out_texgen : 
+			      register_input(p, VERT_ATTRIB_TEX0+i));
+	    if (PREFER_DP4) {
+	       register_matrix_param5( p, STATE_TEXTURE_MATRIX, i, 0, 3,
+				       0, texmat );
+	       emit_matrix_transform_vec4( p, out, texmat, in );
+	    }
+	    else {
+	       register_matrix_param5( p, STATE_TEXTURE_MATRIX, i, 0, 3,
+				       STATE_MATRIX_TRANSPOSE, texmat );
+	       emit_transpose_matrix_transform_vec4( p, out, texmat, in );
+	    }
+	 }
+
+	 release_temps(p);
+      } 
+      else {
+	 emit_passthrough(p, VERT_ATTRIB_TEX0+i, VERT_RESULT_TEX0+i);
+      }
+   }
+}
+
+
+static void build_pointsize( struct tnl_program *p )
+{
+   struct ureg eye = get_eye_position(p);
+   struct ureg state_size = register_param1(p, STATE_POINT_SIZE);
+   struct ureg state_attenuation = register_param1(p, STATE_POINT_ATTENUATION);
+   struct ureg out = register_output(p, VERT_RESULT_PSIZ);
+   struct ureg ut = get_temp(p);
+
+   /* dist = |eyez| */
+   emit_op1(p, OPCODE_ABS, ut, WRITEMASK_Y, swizzle1(eye, Z));
+   /* p1 + dist * (p2 + dist * p3); */
+   emit_op3(p, OPCODE_MAD, ut, WRITEMASK_X, swizzle1(ut, Y),
+		swizzle1(state_attenuation, Z), swizzle1(state_attenuation, Y));
+   emit_op3(p, OPCODE_MAD, ut, WRITEMASK_X, swizzle1(ut, Y),
+		ut, swizzle1(state_attenuation, X));
+
+   /* 1 / sqrt(factor) */
+   emit_op1(p, OPCODE_RSQ, ut, WRITEMASK_X, ut );
+
+#if 1
+   /* out = pointSize / sqrt(factor) */
+   emit_op2(p, OPCODE_MUL, out, WRITEMASK_X, ut, state_size);
+#else
+   /* not sure, might make sense to do clamping here,
+      but it's not done in t_vb_points neither */
+   emit_op2(p, OPCODE_MUL, ut, WRITEMASK_X, ut, state_size);
+   emit_op2(p, OPCODE_MAX, ut, WRITEMASK_X, ut, swizzle1(state_size, Y));
+   emit_op2(p, OPCODE_MIN, out, WRITEMASK_X, ut, swizzle1(state_size, Z));
+#endif
+
+   release_temp(p, ut);
+}
+
+/**
+ * Emit constant point size.
+ */
+static void constant_pointsize( struct tnl_program *p )
+{
+   struct ureg state_size = register_param1(p, STATE_POINT_SIZE);
+   struct ureg out = register_output(p, VERT_RESULT_PSIZ);
+   emit_op1(p, OPCODE_MOV, out, WRITEMASK_X, state_size);
+}
+
+static void build_tnl_program( struct tnl_program *p )
+{   /* Emit the program, starting with modelviewproject:
+    */
+   build_hpos(p);
+
+   /* Lighting calculations:
+    */
+   if (p->state->fragprog_inputs_read & (FRAG_BIT_COL0|FRAG_BIT_COL1)) {
+      if (p->state->light_global_enabled)
+	 build_lighting(p);
+      else {
+	 if (p->state->fragprog_inputs_read & FRAG_BIT_COL0)
+	    emit_passthrough(p, VERT_ATTRIB_COLOR0, VERT_RESULT_COL0);
+
+	 if (p->state->fragprog_inputs_read & FRAG_BIT_COL1)
+	    emit_passthrough(p, VERT_ATTRIB_COLOR1, VERT_RESULT_COL1);
+      }
+   }
+
+   if ((p->state->fragprog_inputs_read & FRAG_BIT_FOGC) ||
+       p->state->fog_mode != FOG_NONE)
+      build_fog(p);
+
+   if (p->state->fragprog_inputs_read & FRAG_BITS_TEX_ANY)
+      build_texture_transform(p);
+
+   if (p->state->point_attenuated)
+      build_pointsize(p);
+#if 0
+   else
+      constant_pointsize(p);
+#endif
+
+   /* Finish up:
+    */
+   emit_op1(p, OPCODE_END, undef, 0, undef);
+
+   /* Disassemble:
+    */
+   if (DISASSEM) {
+      _mesa_printf ("\n");
+   }
+}
+
+
+static void
+create_new_program( const struct state_key *key,
+                    struct gl_vertex_program *program,
+                    GLuint max_temps)
+{
+   struct tnl_program p;
+
+   _mesa_memset(&p, 0, sizeof(p));
+   p.state = key;
+   p.program = program;
+   p.eye_position = undef;
+   p.eye_position_normalized = undef;
+   p.eye_normal = undef;
+   p.identity = undef;
+   p.temp_in_use = 0;
+   
+   if (max_temps >= sizeof(int) * 8)
+      p.temp_reserved = 0;
+   else
+      p.temp_reserved = ~((1<<max_temps)-1);
+
+   p.program->Base.Instructions = _mesa_alloc_instructions(MAX_INSN);
+   p.program->Base.String = NULL;
+   p.program->Base.NumInstructions =
+   p.program->Base.NumTemporaries =
+   p.program->Base.NumParameters =
+   p.program->Base.NumAttributes = p.program->Base.NumAddressRegs = 0;
+   p.program->Base.Parameters = _mesa_new_parameter_list();
+   p.program->Base.InputsRead = 0;
+   p.program->Base.OutputsWritten = 0;
+
+   build_tnl_program( &p );
+}
+
+
+/**
+ * Return a vertex program which implements the current fixed-function
+ * transform/lighting/texgen operations.
+ * XXX move this into core mesa (main/)
+ */
+struct gl_vertex_program *
+_mesa_get_fixed_func_vertex_program(GLcontext *ctx)
+{
+   struct gl_vertex_program *prog;
+   struct state_key *key;
+
+   /* Grab all the relevent state and put it in a single structure:
+    */
+   key = make_state_key(ctx);
+
+   /* Look for an already-prepared program for this state:
+    */
+   prog = (struct gl_vertex_program *)
+      _mesa_search_program_cache(ctx->VertexProgram.Cache, key, sizeof(*key));
+   
+   if (!prog) {
+      /* OK, we'll have to build a new one */
+      if (0)
+         _mesa_printf("Build new TNL program\n");
+	 
+      prog = (struct gl_vertex_program *)
+         ctx->Driver.NewProgram(ctx, GL_VERTEX_PROGRAM_ARB, 0); 
+
+      create_new_program( key, prog,
+                          ctx->Const.VertexProgram.MaxTemps );
+
+#if 0
+      if (ctx->Driver.ProgramStringNotify)
+         ctx->Driver.ProgramStringNotify( ctx, GL_VERTEX_PROGRAM_ARB, 
+                                          &prog->Base );
+#endif
+      _mesa_program_cache_insert(ctx, ctx->VertexProgram.Cache,
+                                 key, sizeof(*key), &prog->Base);
+   }
+   else {
+      /* use cached program */
+      _mesa_free(key);
+   }
+
+   return prog;
+}
diff --git a/src/mesa/main/ffvertex_prog.h b/src/mesa/main/ffvertex_prog.h
new file mode 100644
index 0000000000..74cafc65c1
--- /dev/null
+++ b/src/mesa/main/ffvertex_prog.h
@@ -0,0 +1,38 @@
+/**************************************************************************
+ * 
+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * 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, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ **************************************************************************/
+
+
+#ifndef FFVERTEX_PROG_H
+#define FFVERTEX_PROG_H
+
+
+struct gl_vertex_program *
+_mesa_get_fixed_func_vertex_program(GLcontext *ctx);
+
+
+
+#endif /* FFVERTEX_PROG_H */
-- 
cgit v1.2.3


From 8d9afa76eb090ff58ca9a8a7a86a0b23ffc56857 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Wed, 31 Oct 2007 12:17:32 -0600
Subject: Use ffvertex_prog.c code instead of t_vp_build.c code.

---
 src/mesa/main/ffvertex_prog.h    | 2 ++
 src/mesa/sources                 | 1 +
 src/mesa/state_tracker/st_draw.c | 4 ----
 src/mesa/tnl/t_context.c         | 4 ++++
 src/mesa/tnl/t_vp_build.c        | 6 +++++-
 src/mesa/tnl/t_vp_build.h        | 4 ++++
 6 files changed, 16 insertions(+), 5 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/ffvertex_prog.h b/src/mesa/main/ffvertex_prog.h
index 74cafc65c1..38dc5fbb8d 100644
--- a/src/mesa/main/ffvertex_prog.h
+++ b/src/mesa/main/ffvertex_prog.h
@@ -30,6 +30,8 @@
 #define FFVERTEX_PROG_H
 
 
+#include "main/mtypes.h"
+
 struct gl_vertex_program *
 _mesa_get_fixed_func_vertex_program(GLcontext *ctx);
 
diff --git a/src/mesa/sources b/src/mesa/sources
index 727872378e..845a5ff556 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -27,6 +27,7 @@ MAIN_SOURCES = \
 	main/extensions.c \
 	main/fbobject.c \
 	main/feedback.c \
+	main/ffvertex_prog.c \
 	main/fog.c \
 	main/framebuffer.c \
 	main/get.c \
diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index 065e157bc6..c3f33a447e 100644
--- a/src/mesa/state_tracker/st_draw.c
+++ b/src/mesa/state_tracker/st_draw.c
@@ -36,8 +36,6 @@
 #include "vbo/vbo.h"
 #include "vbo/vbo_context.h"
 
-#include "tnl/t_vp_build.h"
-
 #include "st_atom.h"
 #include "st_cache.h"
 #include "st_context.h"
@@ -527,8 +525,6 @@ void st_init_draw( struct st_context *st )
    assert(vbo);
    assert(vbo->draw_prims);
    vbo->draw_prims = st_draw_vbo;
-
-   _tnl_ProgramCacheInit( ctx );
 }
 
 
diff --git a/src/mesa/tnl/t_context.c b/src/mesa/tnl/t_context.c
index 3b8dd18bbb..60770a91c2 100644
--- a/src/mesa/tnl/t_context.c
+++ b/src/mesa/tnl/t_context.c
@@ -61,7 +61,9 @@ _tnl_CreateContext( GLcontext *ctx )
    /* Initialize tnl state.
     */
    if (ctx->VertexProgram._MaintainTnlProgram) {
+#if 0
       _tnl_ProgramCacheInit( ctx );
+#endif
       _tnl_install_pipeline( ctx, _tnl_vp_pipeline );
    } else {
       _tnl_install_pipeline( ctx, _tnl_default_pipeline );
@@ -90,8 +92,10 @@ _tnl_DestroyContext( GLcontext *ctx )
 
    _tnl_destroy_pipeline( ctx );
 
+#if 0
    if (ctx->VertexProgram._MaintainTnlProgram)
       _tnl_ProgramCacheDestroy( ctx );
+#endif
 
    FREE(tnl);
    ctx->swtnl_context = NULL;
diff --git a/src/mesa/tnl/t_vp_build.c b/src/mesa/tnl/t_vp_build.c
index 2b7d8eebe0..215d6653a3 100644
--- a/src/mesa/tnl/t_vp_build.c
+++ b/src/mesa/tnl/t_vp_build.c
@@ -33,6 +33,7 @@
 #include "glheader.h"
 #include "macros.h"
 #include "enums.h"
+#include "main/ffvertex_prog.h"
 #include "shader/program.h"
 #include "shader/prog_instruction.h"
 #include "shader/prog_parameter.h"
@@ -41,7 +42,7 @@
 #include "t_context.h" /* NOTE: very light dependency on this */
 #include "t_vp_build.h"
 
-
+#if 0
 struct state_key {
    unsigned light_global_enabled:1;
    unsigned light_local_viewer:1;
@@ -1605,6 +1606,7 @@ _mesa_get_fixed_func_vertex_program(GLcontext *ctx)
 
    return prog;
 }
+#endif
 
 
 void _tnl_UpdateFixedFunctionProgram( GLcontext *ctx )
@@ -1627,6 +1629,7 @@ void _tnl_UpdateFixedFunctionProgram( GLcontext *ctx )
    }
 }
 
+#if 0
 void _tnl_ProgramCacheInit( GLcontext *ctx )
 {
    TNLcontext *tnl = TNL_CONTEXT(ctx);
@@ -1655,3 +1658,4 @@ void _tnl_ProgramCacheDestroy( GLcontext *ctx )
    FREE(tnl->vp_cache->items);
    FREE(tnl->vp_cache);
 }
+#endif
diff --git a/src/mesa/tnl/t_vp_build.h b/src/mesa/tnl/t_vp_build.h
index 034701d8c4..adcd8f1662 100644
--- a/src/mesa/tnl/t_vp_build.h
+++ b/src/mesa/tnl/t_vp_build.h
@@ -37,12 +37,16 @@
 					_NEW_FOG |		\
 					_NEW_POINT)
 
+#if 0
 extern struct gl_vertex_program *
 _mesa_get_fixed_func_vertex_program(GLcontext *ctx);
+#endif
 
 extern void _tnl_UpdateFixedFunctionProgram( GLcontext *ctx );
 
+#if 0
 extern void _tnl_ProgramCacheInit( GLcontext *ctx );
 extern void _tnl_ProgramCacheDestroy( GLcontext *ctx );
+#endif
 
 #endif
-- 
cgit v1.2.3


From 68ab379be09de775244bb787f0d30e562fc21038 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Wed, 31 Oct 2007 12:27:47 -0600
Subject: more flags for MaintainTnlProgram case, update #includes

---
 src/mesa/main/state.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 0e4cf047c8..2f88ec615a 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -62,6 +62,7 @@
 #if FEATURE_EXT_framebuffer_object
 #include "fbobject.h"
 #endif
+#include "ffvertex_prog.h"
 #include "framebuffer.h"
 #include "hint.h"
 #include "histogram.h"
@@ -92,7 +93,6 @@
 #include "shader/program.h"
 #include "texenvprogram.h"
 #endif
-#include "tnl/t_vp_build.h"
 #if FEATURE_ARB_shader_objects
 #include "shaders.h"
 #endif
@@ -1202,7 +1202,9 @@ _mesa_update_state_locked( GLcontext *ctx )
       prog_flags |= (_NEW_TEXTURE | _NEW_FOG | _DD_NEW_SEPARATE_SPECULAR);
    }
    if (ctx->VertexProgram._MaintainTnlProgram) {
-      prog_flags |= (_NEW_TEXTURE | _NEW_FOG | _NEW_LIGHT);
+      prog_flags |= (_NEW_TEXTURE | _NEW_TEXTURE_MATRIX |
+                     _NEW_TRANSFORM | _NEW_POINT |
+                     _NEW_FOG | _NEW_LIGHT);
    }
    if (new_state & prog_flags)
       update_program( ctx );
-- 
cgit v1.2.3


From f4a5ea2ccb472958a4635c606e9510011bceaa3d Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Wed, 31 Oct 2007 12:45:32 -0600
Subject: Update texenvprogram.c code to use prog_cache.c routines.

---
 src/mesa/main/mtypes.h        |  14 -----
 src/mesa/main/texenvprogram.c | 135 +++---------------------------------------
 src/mesa/main/texenvprogram.h |  11 +---
 src/mesa/main/texstate.c      |   4 --
 4 files changed, 9 insertions(+), 155 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index b435c29793..8e49431a8f 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1557,17 +1557,6 @@ struct gl_texture_unit
    /*@}*/
 };
 
-struct texenvprog_cache_item {
-   GLuint hash;
-   void *key;
-   struct gl_fragment_program *data;
-   struct texenvprog_cache_item *next;
-};
-
-struct texenvprog_cache {
-   struct texenvprog_cache_item **items;
-   GLuint size, n_items;
-};
 
 /**
  * Texture attribute group (GL_TEXTURE_BIT).
@@ -1599,9 +1588,6 @@ struct gl_texture_attrib
    /** GL_EXT_shared_texture_palette */
    GLboolean SharedPalette;
    struct gl_color_table Palette;
-   
-   /** Cached texenv fragment programs */
-   struct texenvprog_cache env_fp_cache;
 };
 
 
diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index cf92503c34..efb3b35f6a 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -1,6 +1,6 @@
 /**************************************************************************
  * 
- * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
  * All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -29,6 +29,7 @@
 #include "macros.h"
 #include "enums.h"
 #include "shader/prog_parameter.h"
+#include "shader/prog_cache.h"
 #include "shader/prog_instruction.h"
 #include "shader/prog_print.h"
 #include "shader/prog_statevars.h"
@@ -1131,109 +1132,6 @@ create_new_program(GLcontext *ctx, struct state_key *key,
 }
 
 
-static struct gl_fragment_program *
-search_cache(const struct texenvprog_cache *cache,
-             GLuint hash,
-             const void *key,
-             GLuint keysize)
-{
-   struct texenvprog_cache_item *c;
-
-   for (c = cache->items[hash % cache->size]; c; c = c->next) {
-      if (c->hash == hash && memcmp(c->key, key, keysize) == 0)
-	 return (struct gl_fragment_program *) c->data;
-   }
-
-   return NULL;
-}
-
-static void rehash( struct texenvprog_cache *cache )
-{
-   struct texenvprog_cache_item **items;
-   struct texenvprog_cache_item *c, *next;
-   GLuint size, i;
-
-   size = cache->size * 3;
-   items = (struct texenvprog_cache_item**) _mesa_malloc(size * sizeof(*items));
-   _mesa_memset(items, 0, size * sizeof(*items));
-
-   for (i = 0; i < cache->size; i++)
-      for (c = cache->items[i]; c; c = next) {
-	 next = c->next;
-	 c->next = items[c->hash % size];
-	 items[c->hash % size] = c;
-      }
-
-   _mesa_free(cache->items);
-   cache->items = items;
-   cache->size = size;
-}
-
-static void clear_cache( GLcontext *ctx, struct texenvprog_cache *cache )
-{
-   struct texenvprog_cache_item *c, *next;
-   GLuint i;
-
-   for (i = 0; i < cache->size; i++) {
-      for (c = cache->items[i]; c; c = next) {
-	 next = c->next;
-	 _mesa_free(c->key);
-	 ctx->Driver.DeleteProgram(ctx, (struct gl_program *) c->data);
-	 _mesa_free(c);
-      }
-      cache->items[i] = NULL;
-   }
-
-
-   cache->n_items = 0;
-}
-
-
-static void cache_item( GLcontext *ctx,
-                        struct texenvprog_cache *cache,
-			GLuint hash,
-			const struct state_key *key,
-			void *data )
-{
-   struct texenvprog_cache_item *c
-      = (struct texenvprog_cache_item *) MALLOC(sizeof(*c));
-   c->hash = hash;
-
-   c->key = _mesa_malloc(sizeof(*key));
-   memcpy(c->key, key, sizeof(*key));
-
-   c->data = (struct gl_fragment_program *) data;
-
-   if (cache->n_items > cache->size * 1.5) {
-      if (cache->size < 1000)
-	 rehash(cache);
-      else 
-	 clear_cache(ctx, cache);
-   }
-
-   cache->n_items++;
-   c->next = cache->items[hash % cache->size];
-   cache->items[hash % cache->size] = c;
-}
-
-static GLuint hash_key( const struct state_key *key )
-{
-   GLuint *ikey = (GLuint *)key;
-   GLuint hash = 0, i;
-
-   /* Make a slightly better attempt at a hash function:
-    */
-   for (i = 0; i < sizeof(*key)/sizeof(*ikey); i++)
-   {
-      hash += ikey[i];
-      hash += (hash << 10);
-      hash ^= (hash >> 6);
-   }
-
-   return hash;
-}
-
-
 /**
  * Return a fragment program which implements the current
  * fixed-function texture, fog and color-sum operations.
@@ -1243,23 +1141,21 @@ _mesa_get_fixed_func_fragment_program(GLcontext *ctx)
 {
    struct gl_fragment_program *prog;
    struct state_key key;
-   GLuint hash;
 	
    make_state_key(ctx, &key);
-   hash = hash_key(&key);
       
-   prog = search_cache(&ctx->Texture.env_fp_cache, hash, &key, sizeof(key));
+   prog = (struct gl_fragment_program *)
+      _mesa_search_program_cache(ctx->FragmentProgram.Cache,
+                                 &key, sizeof(key));
 
    if (!prog) {
-      if (0)
-         _mesa_printf("Building new texenv proggy for key %x\n", hash);
-
       prog = (struct gl_fragment_program *) 
          ctx->Driver.NewProgram(ctx, GL_FRAGMENT_PROGRAM_ARB, 0);
 
       create_new_program(ctx, &key, prog);
 
-      cache_item(ctx, &ctx->Texture.env_fp_cache, hash, &key, prog);
+      _mesa_program_cache_insert(ctx, ctx->FragmentProgram.Cache,
+                                 &key, sizeof(key), &prog->Base);
    }
 
    return prog;
@@ -1297,20 +1193,3 @@ _mesa_UpdateTexEnvProgram( GLcontext *ctx )
                          (struct gl_program *) ctx->FragmentProgram._Current);
    }
 }
-
-
-void _mesa_TexEnvProgramCacheInit( GLcontext *ctx )
-{
-   ctx->Texture.env_fp_cache.size = 17;
-   ctx->Texture.env_fp_cache.n_items = 0;
-   ctx->Texture.env_fp_cache.items = (struct texenvprog_cache_item **)
-      _mesa_calloc(ctx->Texture.env_fp_cache.size * 
-		   sizeof(struct texenvprog_cache_item));
-}
-
-
-void _mesa_TexEnvProgramCacheDestroy( GLcontext *ctx )
-{
-   clear_cache(ctx, &ctx->Texture.env_fp_cache);
-   _mesa_free(ctx->Texture.env_fp_cache.items);
-}
diff --git a/src/mesa/main/texenvprogram.h b/src/mesa/main/texenvprogram.h
index ac73910cb5..a7aa60cf37 100644
--- a/src/mesa/main/texenvprogram.h
+++ b/src/mesa/main/texenvprogram.h
@@ -1,13 +1,8 @@
-/**
- * \file texenvprogram.h
- * Texture state management.
- */
-
 /*
  * Mesa 3-D graphics library
- * Version:  5.1
+ * Version:  7.1
  *
- * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -38,7 +33,5 @@ extern struct gl_fragment_program *
 _mesa_get_fixed_func_fragment_program(GLcontext *ctx);
 
 extern void _mesa_UpdateTexEnvProgram( GLcontext *ctx );
-extern void _mesa_TexEnvProgramCacheInit( GLcontext *ctx );
-extern void _mesa_TexEnvProgramCacheDestroy( GLcontext *ctx );
 
 #endif
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index c9f8a0656e..cb7da39b51 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -3210,8 +3210,6 @@ _mesa_init_texture(GLcontext *ctx)
    ctx->Texture.SharedPalette = GL_FALSE;
    _mesa_init_colortable(&ctx->Texture.Palette);
 
-   _mesa_TexEnvProgramCacheInit( ctx );
-
    /* Allocate proxy textures */
    if (!alloc_proxy_textures( ctx ))
       return GL_FALSE;
@@ -3239,6 +3237,4 @@ _mesa_free_texture_data(GLcontext *ctx)
 
    for (i = 0; i < MAX_TEXTURE_IMAGE_UNITS; i++)
       _mesa_free_colortable_data( &ctx->Texture.Unit[i].ColorTable );
-
-   _mesa_TexEnvProgramCacheDestroy( ctx );
 }
-- 
cgit v1.2.3


From 7cafaff0ebb7c3fb7461573442aa44b354682d81 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Thu, 1 Nov 2007 14:51:37 -0600
Subject: disable the driverContext assertions

---
 src/mesa/main/context.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index e8335e19ca..563a89e686 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1044,7 +1044,7 @@ _mesa_initialize_context(GLcontext *ctx,
                          const struct dd_function_table *driverFunctions,
                          void *driverContext)
 {
-   ASSERT(driverContext);
+   /*ASSERT(driverContext);*/
    assert(driverFunctions->NewTextureObject);
    assert(driverFunctions->FreeTexImageData);
 
@@ -1143,7 +1143,7 @@ _mesa_create_context(const GLvisual *visual,
    GLcontext *ctx;
 
    ASSERT(visual);
-   ASSERT(driverContext);
+   /*ASSERT(driverContext);*/
 
    ctx = (GLcontext *) _mesa_calloc(sizeof(GLcontext));
    if (!ctx)
-- 
cgit v1.2.3


From 9a563d5e696a7c8fc09f7da5a0d33a9675b00e4c Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Mon, 5 Nov 2007 15:42:55 -0700
Subject: no-op glCopyPixels if width or height is zero

---
 src/mesa/main/drawpix.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index e4be0d496e..ae9c7e29a1 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -239,7 +239,7 @@ _mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height,
       return;
    }
 
-   if (!ctx->Current.RasterPosValid) {
+   if (!ctx->Current.RasterPosValid || width ==0 || height == 0) {
       return;
    }
 
-- 
cgit v1.2.3


From c6499a741c99394e81d1d86ffd066f3d9749875c Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Mon, 5 Nov 2007 18:04:30 -0700
Subject: Determine GL extensions/limits by making pipe queries.

The state tracker calls pipe->get_param() to determine the GL limits and
which OpenGL extensions are supported.
This is an initial implementation that'll probably change...
---
 src/mesa/main/extensions.c              |   2 +-
 src/mesa/pipe/i915simple/i915_context.c |  20 ++++
 src/mesa/pipe/p_defines.h               |  17 +++
 src/mesa/pipe/softpipe/sp_context.c     |  20 ++++
 src/mesa/sources                        |   1 +
 src/mesa/state_tracker/st_context.c     |   8 +-
 src/mesa/state_tracker/st_extensions.c  | 186 ++++++++++++++++++++++++++++++++
 src/mesa/state_tracker/st_extensions.h  |  38 +++++++
 8 files changed, 288 insertions(+), 4 deletions(-)
 create mode 100644 src/mesa/state_tracker/st_extensions.c
 create mode 100644 src/mesa/state_tracker/st_extensions.h

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 80dce56c0c..e5279e7f3e 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -86,7 +86,7 @@ static const struct {
    { OFF, "GL_EXT_blend_logic_op",             F(EXT_blend_logic_op) },
    { OFF, "GL_EXT_blend_minmax",               F(EXT_blend_minmax) },
    { OFF, "GL_EXT_blend_subtract",             F(EXT_blend_subtract) },
-   { ON,  "GL_EXT_clip_volume_hint",           F(EXT_clip_volume_hint) },
+   { OFF, "GL_EXT_clip_volume_hint",           F(EXT_clip_volume_hint) },
    { OFF, "GL_EXT_cull_vertex",                F(EXT_cull_vertex) },
    { ON,  "GL_EXT_compiled_vertex_array",      F(EXT_compiled_vertex_array) },
    { OFF, "GL_EXT_convolution",                F(EXT_convolution) },
diff --git a/src/mesa/pipe/i915simple/i915_context.c b/src/mesa/pipe/i915simple/i915_context.c
index 2c36a194c7..6de1e68f73 100644
--- a/src/mesa/pipe/i915simple/i915_context.c
+++ b/src/mesa/pipe/i915simple/i915_context.c
@@ -142,6 +142,26 @@ static int
 i915_get_param(struct pipe_context *pipe, int param)
 {
    switch (param) {
+   case PIPE_CAP_MAX_TEXTURE_IMAGE_UNITS:
+      return 8;
+   case PIPE_CAP_NPOT_TEXTURES:
+      return 1;
+   case PIPE_CAP_TWO_SIDED_STENCIL:
+      return 1;
+   case PIPE_CAP_GLSL:
+      return 0;
+   case PIPE_CAP_S3TC:
+      return 0;
+   case PIPE_CAP_ANISOTROPIC_FILTER:
+      return 0;
+   case PIPE_CAP_POINT_SPRITE:
+      return 0;
+   case PIPE_CAP_MAX_RENDER_TARGETS:
+      return 1;
+   case PIPE_CAP_OCCLUSION_QUERY:
+      return 0;
+   case PIPE_CAP_TEXTURE_SHADOW_MAP:
+      return 0;
    default:
       return 0;
    }
diff --git a/src/mesa/pipe/p_defines.h b/src/mesa/pipe/p_defines.h
index 8982428636..ef79716ed9 100644
--- a/src/mesa/pipe/p_defines.h
+++ b/src/mesa/pipe/p_defines.h
@@ -225,4 +225,21 @@
 #define PIPE_SPRITE_COORD_UPPER_LEFT 1
 #define PIPE_SPRITE_COORD_LOWER_LEFT 2
 
+
+/**
+ * Implementation capabilities/limits
+ * Passed to pipe->get_param()
+ * XXX this will need some fine tuning...
+ */
+#define PIPE_CAP_MAX_TEXTURE_IMAGE_UNITS 1
+#define PIPE_CAP_NPOT_TEXTURES           2
+#define PIPE_CAP_TWO_SIDED_STENCIL       3
+#define PIPE_CAP_GLSL                    4  /* XXX need something better */
+#define PIPE_CAP_S3TC                    5
+#define PIPE_CAP_ANISOTROPIC_FILTER      6
+#define PIPE_CAP_POINT_SPRITE            7
+#define PIPE_CAP_MAX_RENDER_TARGETS      8
+#define PIPE_CAP_OCCLUSION_QUERY         9
+#define PIPE_CAP_TEXTURE_SHADOW_MAP     10
+
 #endif
diff --git a/src/mesa/pipe/softpipe/sp_context.c b/src/mesa/pipe/softpipe/sp_context.c
index 46f591e425..effecda87e 100644
--- a/src/mesa/pipe/softpipe/sp_context.c
+++ b/src/mesa/pipe/softpipe/sp_context.c
@@ -277,6 +277,26 @@ static const char *softpipe_get_vendor( struct pipe_context *pipe )
 static int softpipe_get_param(struct pipe_context *pipe, int param)
 {
    switch (param) {
+   case PIPE_CAP_MAX_TEXTURE_IMAGE_UNITS:
+      return 8;
+   case PIPE_CAP_NPOT_TEXTURES:
+      return 1;
+   case PIPE_CAP_TWO_SIDED_STENCIL:
+      return 1;
+   case PIPE_CAP_GLSL:
+      return 1;
+   case PIPE_CAP_S3TC:
+      return 0;
+   case PIPE_CAP_ANISOTROPIC_FILTER:
+      return 0;
+   case PIPE_CAP_POINT_SPRITE:
+      return 1;
+   case PIPE_CAP_MAX_RENDER_TARGETS:
+      return 1;
+   case PIPE_CAP_OCCLUSION_QUERY:
+      return 1;
+   case PIPE_CAP_TEXTURE_SHADOW_MAP:
+      return 1;
    default:
       return 0;
    }
diff --git a/src/mesa/sources b/src/mesa/sources
index 5322cd8867..0b9b5fca3a 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -231,6 +231,7 @@ STATETRACKER_SOURCES = \
 	state_tracker/st_context.c \
 	state_tracker/st_debug.c \
 	state_tracker/st_draw.c \
+	state_tracker/st_extensions.c \
 	state_tracker/st_format.c \
 	state_tracker/st_framebuffer.c \
 	state_tracker/st_mesa_to_tgsi.c \
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index 88fbaeeb7a..3810729847 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -1,6 +1,6 @@
 /**************************************************************************
  * 
- * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
  * All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -45,6 +45,7 @@
 #include "st_cb_strings.h"
 #include "st_atom.h"
 #include "st_draw.h"
+#include "st_extensions.h"
 #include "st_program.h"
 #include "pipe/p_context.h"
 #include "pipe/draw/draw_context.h"
@@ -105,8 +106,9 @@ st_create_context_priv( GLcontext *ctx, struct pipe_context *pipe )
 
    st->pixel_xfer.cache = _mesa_new_program_cache();
 
-   /* XXXX This is temporary! */
-   _mesa_enable_sw_extensions(ctx);
+   /* GL limits and extensions */
+   st_init_limits(st);
+   st_init_extensions(st);
 
    return st;
 }
diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
new file mode 100644
index 0000000000..3f56b537bb
--- /dev/null
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -0,0 +1,186 @@
+/**************************************************************************
+ * 
+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * 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, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ **************************************************************************/
+
+#include "main/imports.h"
+#include "main/context.h"
+#include "main/extensions.h"
+#include "main/macros.h"
+
+#include "pipe/p_context.h"
+#include "pipe/p_defines.h"
+
+#include "st_context.h"
+#include "st_extensions.h"
+
+
+/*
+ * Compute floor(log_base_2(n)).
+ * If n < 0 return -1.
+ */
+static int
+logbase2( int n )
+{
+   GLint i = 1;
+   GLint log2 = 0;
+
+   if (n < 0)
+      return -1;
+
+   if (n == 0)
+      return 0;
+
+   while ( n > i ) {
+      i *= 2;
+      log2++;
+   }
+   if (i != n) {
+      return log2 - 1;
+   }
+   else {
+      return log2;
+   }
+}
+
+
+void st_init_limits(struct st_context *st)
+{
+   struct pipe_context *pipe = st->pipe;
+   GLcontext *ctx = st->ctx;
+   uint w, h, d;
+
+   ctx->Const.MaxTextureImageUnits
+      = ctx->Const.MaxTextureCoordUnits
+      = pipe->get_param(pipe, PIPE_CAP_MAX_TEXTURE_IMAGE_UNITS);
+
+   pipe->max_texture_size(pipe, PIPE_TEXTURE_2D, &w, &h, &d);
+   ctx->Const.MaxTextureLevels = logbase2(w) + 1;
+   ctx->Const.MaxTextureRectSize = w;
+
+   pipe->max_texture_size(pipe, PIPE_TEXTURE_3D, &w, &h, &d);
+   ctx->Const.Max3DTextureLevels = logbase2(d) + 1;
+
+   pipe->max_texture_size(pipe, PIPE_TEXTURE_CUBE, &w, &h, &d);
+   ctx->Const.MaxCubeTextureLevels = logbase2(w) + 1;
+   
+   ctx->Const.MaxDrawBuffers = MAX2(1, pipe->get_param(pipe, PIPE_CAP_MAX_RENDER_TARGETS));
+
+}
+
+
+/**
+ * XXX this needs careful review
+ */
+void st_init_extensions(struct st_context *st)
+{
+   struct pipe_context *pipe = st->pipe;
+   GLcontext *ctx = st->ctx;
+
+   /*
+    * Extensions that are supported by all Gallium drivers:
+    */
+   ctx->Extensions.ARB_fragment_program = GL_TRUE;
+   ctx->Extensions.ARB_texture_cube_map = GL_TRUE;
+   ctx->Extensions.ARB_texture_env_combine = GL_TRUE;
+   ctx->Extensions.ARB_texture_env_crossbar = GL_TRUE;
+   ctx->Extensions.ARB_texture_env_dot3 = GL_TRUE;
+   ctx->Extensions.ARB_vertex_program = GL_TRUE;
+   ctx->Extensions.ARB_vertex_buffer_object = GL_TRUE;
+
+   ctx->Extensions.EXT_blend_color = GL_TRUE;
+   ctx->Extensions.EXT_blend_equation_separate = GL_TRUE;
+   ctx->Extensions.EXT_blend_func_separate = GL_TRUE;
+   ctx->Extensions.EXT_blend_logic_op = GL_TRUE;
+   ctx->Extensions.EXT_blend_minmax = GL_TRUE;
+   ctx->Extensions.EXT_blend_subtract = GL_TRUE;
+   ctx->Extensions.EXT_framebuffer_object = GL_TRUE;
+   ctx->Extensions.EXT_fog_coord = GL_TRUE;
+   ctx->Extensions.EXT_multi_draw_arrays = GL_TRUE;
+   ctx->Extensions.EXT_pixel_buffer_object = GL_TRUE;
+   ctx->Extensions.EXT_point_parameters = GL_TRUE;
+   ctx->Extensions.EXT_secondary_color = GL_TRUE;
+   ctx->Extensions.EXT_stencil_wrap = GL_TRUE;
+   ctx->Extensions.EXT_texture_env_add = GL_TRUE;
+   ctx->Extensions.EXT_texture_env_combine = GL_TRUE;
+   ctx->Extensions.EXT_texture_env_dot3 = GL_TRUE;
+   ctx->Extensions.EXT_texture_lod_bias = GL_TRUE;
+
+   ctx->Extensions.NV_blend_square = GL_TRUE;
+   ctx->Extensions.NV_texgen_reflection = GL_TRUE;
+
+
+   /*
+    * Extensions that depend on the driver/hardware:
+    */
+   if (pipe->get_param(pipe, PIPE_CAP_MAX_RENDER_TARGETS) > 1) {
+      ctx->Extensions.ARB_draw_buffers = GL_TRUE;
+   }
+
+   if (pipe->get_param(pipe, PIPE_CAP_GLSL) > 1) {
+      ctx->Extensions.ARB_fragment_shader = GL_TRUE;
+      ctx->Extensions.ARB_vertex_shader = GL_TRUE;
+      ctx->Extensions.ARB_shader_objects = GL_TRUE;
+      ctx->Extensions.ARB_shading_language_100 = GL_TRUE;
+      ctx->Extensions.ARB_shading_language_120 = GL_TRUE;
+   }
+
+   if (pipe->get_param(pipe, PIPE_CAP_NPOT_TEXTURES)) {
+      ctx->Extensions.ARB_texture_non_power_of_two = GL_TRUE;
+      ctx->Extensions.NV_texture_rectangle = GL_TRUE;
+   }
+
+   if (pipe->get_param(pipe, PIPE_CAP_MAX_TEXTURE_IMAGE_UNITS) > 1) {
+      ctx->Extensions.ARB_multitexture = GL_TRUE;
+   }
+
+   if (pipe->get_param(pipe, PIPE_CAP_TWO_SIDED_STENCIL) > 1) {
+      ctx->Extensions.ATI_separate_stencil = GL_TRUE;
+   }
+
+   if (pipe->get_param(pipe, PIPE_CAP_S3TC) > 1) {
+      ctx->Extensions.ARB_texture_compression = GL_TRUE;
+      ctx->Extensions.EXT_texture_compression_s3tc = GL_TRUE;
+   }
+
+   if (pipe->get_param(pipe, PIPE_CAP_ANISOTROPIC_FILTER)) {
+      ctx->Extensions.EXT_texture_filter_anisotropic = GL_TRUE;
+   }
+
+   if (pipe->get_param(pipe, PIPE_CAP_POINT_SPRITE)) {
+      ctx->Extensions.ARB_point_sprite = GL_TRUE;
+   }
+
+   if (pipe->get_param(pipe, PIPE_CAP_OCCLUSION_QUERY) > 1) {
+      ctx->Extensions.ARB_occlusion_query = GL_TRUE;
+   }
+
+   if (pipe->get_param(pipe, PIPE_CAP_TEXTURE_SHADOW_MAP) > 1) {
+      ctx->Extensions.ARB_depth_texture = GL_TRUE;
+      ctx->Extensions.ARB_shadow = GL_TRUE;
+      /*ctx->Extensions.ARB_shadow_ambient = GL_TRUE;*/
+   }
+
+}
diff --git a/src/mesa/state_tracker/st_extensions.h b/src/mesa/state_tracker/st_extensions.h
new file mode 100644
index 0000000000..2994f16dd3
--- /dev/null
+++ b/src/mesa/state_tracker/st_extensions.h
@@ -0,0 +1,38 @@
+/**************************************************************************
+ * 
+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * 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, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ **************************************************************************/
+
+
+#ifndef ST_EXTENSIONS_H
+#define ST_EXTENSIONS_H
+
+
+extern void st_init_limits(struct st_context *st);
+
+extern void st_init_extensions(struct st_context *st);
+
+
+#endif /* ST_EXTENSIONS_H */
-- 
cgit v1.2.3


From 98c539d337fec8b4e21d9788b52ff551462e90d6 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Thu, 8 Nov 2007 09:14:43 -0700
Subject: in check_end_texture_render(), test for presence of a renderbuffer
 and texobj

---
 src/mesa/main/fbobject.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 6f7effcce7..963e35d678 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -913,8 +913,7 @@ check_end_texture_render(GLcontext *ctx, struct gl_framebuffer *fb)
       GLuint i;
       for (i = 0; i < BUFFER_COUNT; i++) {
          struct gl_renderbuffer_attachment *att = fb->Attachment + i;
-         struct gl_texture_object *texObj = att->Texture;
-         if (texObj) {
+         if (att->Texture && att->Renderbuffer) {
             ctx->Driver.FinishRenderTexture(ctx, att);
          }
       }
-- 
cgit v1.2.3


From 3eadbe64bf027b7e90167d4980e880c8a01c889f Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Wed, 5 Dec 2007 14:53:19 -0700
Subject: Fix endianness bug in _mesa_texstore_argb8888()

On big-endian, storing in _mesa_texformat_argb8888 format produced wrong results.
Also, clean-up nearby code to match.
---
 src/mesa/main/texstore.c | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index 3b5151ed17..30be65525e 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.5.1
+ * Version:  7.1
  *
- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -1443,7 +1443,6 @@ _mesa_texstore_argb8888(TEXSTORE_PARAMS)
 	    (baseInternalFormat == GL_RGBA ||
 	     baseInternalFormat == GL_RGB) &&
             srcType == GL_UNSIGNED_BYTE) {
-
       int img, row, col;
       for (img = 0; img < srcDepth; img++) {
          const GLint srcRowStride = _mesa_image_row_stride(srcPacking,
@@ -1455,11 +1454,12 @@ _mesa_texstore_argb8888(TEXSTORE_PARAMS)
             + dstYoffset * dstRowStride
             + dstXoffset * dstFormat->TexelBytes;
          for (row = 0; row < srcHeight; row++) {
+            GLuint *d4 = (GLuint *) dstRow;
             for (col = 0; col < srcWidth; col++) {
-               dstRow[col * 4 + 0] = srcRow[col * 3 + BCOMP];
-               dstRow[col * 4 + 1] = srcRow[col * 3 + GCOMP];
-               dstRow[col * 4 + 2] = srcRow[col * 3 + RCOMP];
-               dstRow[col * 4 + 3] = 0xff;
+               d4[col] = ((0xff                    << 24) |
+                          (srcRow[col * 3 + RCOMP] << 16) |
+                          (srcRow[col * 3 + GCOMP] <<  8) |
+                          (srcRow[col * 3 + BCOMP] <<  0));
             }
             dstRow += dstRowStride;
             srcRow += srcRowStride;
@@ -1471,7 +1471,9 @@ _mesa_texstore_argb8888(TEXSTORE_PARAMS)
 	    dstFormat == &_mesa_texformat_argb8888 &&
             srcFormat == GL_RGBA &&
 	    baseInternalFormat == GL_RGBA &&
-            (srcType == GL_UNSIGNED_BYTE && littleEndian)) {
+            srcType == GL_UNSIGNED_BYTE &&
+            littleEndian) {
+      /* same as above case, but src data has alpha too */
       GLint img, row, col;
       /* For some reason, streaming copies to write-combined regions
        * are extremely sensitive to the characteristics of how the
@@ -1488,13 +1490,13 @@ _mesa_texstore_argb8888(TEXSTORE_PARAMS)
             + dstImageOffsets[dstZoffset + img] * dstFormat->TexelBytes
             + dstYoffset * dstRowStride
             + dstXoffset * dstFormat->TexelBytes;
-
          for (row = 0; row < srcHeight; row++) {
+            GLuint *d4 = (GLuint *) dstRow;
             for (col = 0; col < srcWidth; col++) {
-               *(GLuint *)(dstRow + col * 4)  = (srcRow[col * 4 + RCOMP] << 16 |
-						 srcRow[col * 4 + GCOMP] << 8 |
-						 srcRow[col * 4 + BCOMP] << 0 |
-						 srcRow[col * 4 + ACOMP] << 24);
+               d4[col] = ((srcRow[col * 4 + ACOMP] << 24) |
+                          (srcRow[col * 4 + RCOMP] << 16) |
+                          (srcRow[col * 4 + GCOMP] <<  8) |
+                          (srcRow[col * 4 + BCOMP] <<  0));
             }
             dstRow += dstRowStride;
             srcRow += srcRowStride;
-- 
cgit v1.2.3


From 13699463a33c1adf44005125c488e886e074a05b Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Tue, 11 Dec 2007 17:10:26 +0000
Subject: Rework gallium and mesa queries a little.

Add a 'CheckQuery()' driver callback to mesa to check query completion.
Make pipe_query an opaque type.
Rework softpipe queries, support overlapping occlusion queries.
---
 src/mesa/drivers/common/driverfuncs.c      |   1 +
 src/mesa/main/dd.h                         |   2 +
 src/mesa/main/queryobj.c                   |  18 +++--
 src/mesa/main/queryobj.h                   |   3 +
 src/mesa/pipe/i915simple/i915_context.c    |  17 -----
 src/mesa/pipe/p_context.h                  |  20 +++++-
 src/mesa/pipe/p_state.h                    |  10 ---
 src/mesa/pipe/softpipe/Makefile            |   1 +
 src/mesa/pipe/softpipe/sp_context.c        |  36 +---------
 src/mesa/pipe/softpipe/sp_context.h        |   6 +-
 src/mesa/pipe/softpipe/sp_quad_occlusion.c |  16 +++--
 src/mesa/pipe/softpipe/sp_query.c          | 107 +++++++++++++++++++++++++++++
 src/mesa/pipe/softpipe/sp_query.h          |  39 +++++++++++
 src/mesa/state_tracker/st_cb_queryobj.c    |  68 +++++++++++++-----
 14 files changed, 247 insertions(+), 97 deletions(-)
 create mode 100644 src/mesa/pipe/softpipe/sp_query.c
 create mode 100644 src/mesa/pipe/softpipe/sp_query.h

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c
index ea0cc51d4a..33caf7dae1 100644
--- a/src/mesa/drivers/common/driverfuncs.c
+++ b/src/mesa/drivers/common/driverfuncs.c
@@ -224,6 +224,7 @@ _mesa_init_driver_functions(struct dd_function_table *driver)
 
    /* query objects */
    driver->NewQueryObject = _mesa_new_query_object;
+   driver->DeleteQuery = _mesa_delete_query;
    driver->BeginQuery = _mesa_begin_query;
    driver->EndQuery = _mesa_end_query;
    driver->WaitQuery = _mesa_wait_query;
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index f089fcb48f..3bec3bd433 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -811,8 +811,10 @@ struct dd_function_table {
     */
    /*@{*/
    struct gl_query_object * (*NewQueryObject)(GLcontext *ctx, GLuint id);
+   void (*DeleteQuery)(GLcontext *ctx, struct gl_query_object *q);
    void (*BeginQuery)(GLcontext *ctx, struct gl_query_object *q);
    void (*EndQuery)(GLcontext *ctx, struct gl_query_object *q);
+   void (*CheckQuery)(GLcontext *ctx, struct gl_query_object *q);
    void (*WaitQuery)(GLcontext *ctx, struct gl_query_object *q);
    /*@}*/
 
diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c
index 688d0fc7bc..e30f5480da 100644
--- a/src/mesa/main/queryobj.c
+++ b/src/mesa/main/queryobj.c
@@ -94,8 +94,8 @@ _mesa_wait_query(GLcontext *ctx, struct gl_query_object *q)
  * Not removed from hash table here.
  * XXX maybe add Delete() method to gl_query_object class and call that instead
  */
-static void
-delete_query_object(struct gl_query_object *q)
+void
+_mesa_delete_query(struct gl_query_object *q)
 {
    _mesa_free(q);
 }
@@ -171,7 +171,7 @@ _mesa_DeleteQueriesARB(GLsizei n, const GLuint *ids)
          if (q) {
             ASSERT(!q->Active); /* should be caught earlier */
             _mesa_HashRemove(ctx->Query.QueryObjects, ids[i]);
-            delete_query_object(q);
+            ctx->Driver.DeleteQuery(ctx, q);
          }
       }
    }
@@ -386,6 +386,8 @@ _mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params)
          }
          break;
       case GL_QUERY_RESULT_AVAILABLE_ARB:
+	 if (!q->Ready)
+	    ctx->Driver.CheckQuery( ctx, q );
          *params = q->Ready;
          break;
       default:
@@ -424,6 +426,8 @@ _mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params)
          }
          break;
       case GL_QUERY_RESULT_AVAILABLE_ARB:
+	 if (!q->Ready)
+	    ctx->Driver.CheckQuery( ctx, q );
          *params = q->Ready;
          break;
       default:
@@ -461,6 +465,8 @@ _mesa_GetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64EXT *params)
          *params = q->Result;
          break;
       case GL_QUERY_RESULT_AVAILABLE_ARB:
+	 if (!q->Ready)
+	    ctx->Driver.CheckQuery( ctx, q );
          *params = q->Ready;
          break;
       default:
@@ -496,6 +502,8 @@ _mesa_GetQueryObjectui64vEXT(GLuint id, GLenum pname, GLuint64EXT *params)
          *params = q->Result;
          break;
       case GL_QUERY_RESULT_AVAILABLE_ARB:
+	 if (!q->Ready)
+	    ctx->Driver.CheckQuery( ctx, q );
          *params = q->Ready;
          break;
       default:
@@ -527,8 +535,8 @@ static void
 delete_queryobj_cb(GLuint id, void *data, void *userData)
 {
    struct gl_query_object *q= (struct gl_query_object *) data;
-   (void) userData;
-   delete_query_object(q);
+   GLcontext *ctx = (GLcontext *)userData;
+   ctx->Driver.DeleteQuery(ctx, q);
 }
 
 
diff --git a/src/mesa/main/queryobj.h b/src/mesa/main/queryobj.h
index d466aae652..c05a1f3da8 100644
--- a/src/mesa/main/queryobj.h
+++ b/src/mesa/main/queryobj.h
@@ -36,6 +36,9 @@ _mesa_init_query(GLcontext *ctx);
 extern void
 _mesa_free_query_data(GLcontext *ctx);
 
+extern void
+_mesa_delete_query(struct gl_query_object *q);
+
 extern void
 _mesa_begin_query(GLcontext *ctx, struct gl_query_object *q);
 
diff --git a/src/mesa/pipe/i915simple/i915_context.c b/src/mesa/pipe/i915simple/i915_context.c
index d2bbeea16a..a08cf5087e 100644
--- a/src/mesa/pipe/i915simple/i915_context.c
+++ b/src/mesa/pipe/i915simple/i915_context.c
@@ -170,21 +170,6 @@ static void i915_destroy( struct pipe_context *pipe )
 
 
 
-static void
-i915_begin_query(struct pipe_context *pipe, struct pipe_query_object *q)
-{
-   /* should never be called */
-   assert(0);
-}
-
-
-static void
-i915_end_query(struct pipe_context *pipe, struct pipe_query_object *q)
-{
-   /* should never be called */
-   assert(0);
-}
-
 
 static boolean
 i915_draw_elements( struct pipe_context *pipe,
@@ -298,8 +283,6 @@ struct pipe_context *i915_create( struct pipe_winsys *pipe_winsys,
 
    i915->pipe.clear = i915_clear;
 
-   i915->pipe.begin_query = i915_begin_query;
-   i915->pipe.end_query = i915_end_query;
 
    i915->pipe.draw_arrays = i915_draw_arrays;
    i915->pipe.draw_elements = i915_draw_elements;
diff --git a/src/mesa/pipe/p_context.h b/src/mesa/pipe/p_context.h
index 83b4ab07fb..92ca7dd8e3 100644
--- a/src/mesa/pipe/p_context.h
+++ b/src/mesa/pipe/p_context.h
@@ -29,9 +29,13 @@
 #define PIPE_CONTEXT_H
 
 #include "p_state.h"
+#include <stdint.h>
 
 struct pipe_state_cache;
 
+/* Opaque driver handles:
+ */
+struct pipe_query;
 
 /**
  * Gallium rendering context.  Basically:
@@ -81,9 +85,19 @@ struct pipe_context {
    /**
     * Query objects
     */
-   void (*begin_query)(struct pipe_context *pipe, struct pipe_query_object *q);
-   void (*end_query)(struct pipe_context *pipe, struct pipe_query_object *q);
-   void (*wait_query)(struct pipe_context *pipe, struct pipe_query_object *q);
+   struct pipe_query *(*create_query)( struct pipe_context *pipe,
+                                              unsigned query_type );
+
+   void (*destroy_query)(struct pipe_context *pipe,
+                         struct pipe_query *q);
+
+   void (*begin_query)(struct pipe_context *pipe, struct pipe_query *q);
+   void (*end_query)(struct pipe_context *pipe, struct pipe_query *q);
+
+   boolean (*get_query_result)(struct pipe_context *pipe, 
+                               struct pipe_query *q,
+                               boolean wait,
+                               uint64_t *result);
 
    /*
     * State functions
diff --git a/src/mesa/pipe/p_state.h b/src/mesa/pipe/p_state.h
index a571071ea9..109913b040 100644
--- a/src/mesa/pipe/p_state.h
+++ b/src/mesa/pipe/p_state.h
@@ -317,14 +317,4 @@ struct pipe_vertex_element
 
 
 
-/**
- * Hardware queries (occlusion, transform feedback, timing, etc)
- */
-struct pipe_query_object {
-   uint type:3;   /**< PIPE_QUERY_x */
-   uint ready:1;  /**< is result ready? */
-   uint64 count;
-};
-
-
 #endif
diff --git a/src/mesa/pipe/softpipe/Makefile b/src/mesa/pipe/softpipe/Makefile
index 5e6886a37e..31438a882e 100644
--- a/src/mesa/pipe/softpipe/Makefile
+++ b/src/mesa/pipe/softpipe/Makefile
@@ -7,6 +7,7 @@ LIBNAME = softpipe
 DRIVER_SOURCES = \
 	sp_clear.c \
 	sp_flush.c \
+	sp_query.c \
 	sp_context.c \
 	sp_draw_arrays.c \
 	sp_prim_setup.c \
diff --git a/src/mesa/pipe/softpipe/sp_context.c b/src/mesa/pipe/softpipe/sp_context.c
index 7d243aaabb..107c8f8597 100644
--- a/src/mesa/pipe/softpipe/sp_context.c
+++ b/src/mesa/pipe/softpipe/sp_context.c
@@ -42,6 +42,7 @@
 #include "sp_tile_cache.h"
 #include "sp_texture.h"
 #include "sp_winsys.h"
+#include "sp_query.h"
 
 
 
@@ -150,37 +151,6 @@ static void softpipe_destroy( struct pipe_context *pipe )
 }
 
 
-static void
-softpipe_begin_query(struct pipe_context *pipe, struct pipe_query_object *q)
-{
-   struct softpipe_context *softpipe = softpipe_context( pipe );
-   assert(q->type < PIPE_QUERY_TYPES);
-   assert(!softpipe->queries[q->type]);
-   softpipe->queries[q->type] = q;
-}
-
-
-static void
-softpipe_end_query(struct pipe_context *pipe, struct pipe_query_object *q)
-{
-   struct softpipe_context *softpipe = softpipe_context( pipe );
-   assert(q->type < PIPE_QUERY_TYPES);
-   assert(softpipe->queries[q->type]);
-   q->ready = 1;  /* software rendering is synchronous */
-   softpipe->queries[q->type] = NULL;
-}
-
-
-static void
-softpipe_wait_query(struct pipe_context *pipe, struct pipe_query_object *q)
-{
-   /* Should never get here since we indicated that the result was
-    * ready in softpipe_end_query().
-    */
-   assert(0);
-}
-
-
 static const char *softpipe_get_name( struct pipe_context *pipe )
 {
    return "softpipe";
@@ -320,9 +290,7 @@ struct pipe_context *softpipe_create( struct pipe_winsys *pipe_winsys,
    softpipe->pipe.clear = softpipe_clear;
    softpipe->pipe.flush = softpipe_flush;
 
-   softpipe->pipe.begin_query = softpipe_begin_query;
-   softpipe->pipe.end_query = softpipe_end_query;
-   softpipe->pipe.wait_query = softpipe_wait_query;
+   softpipe_init_query_funcs( softpipe );
 
    /* textures */
    softpipe->pipe.texture_create = softpipe_texture_create;
diff --git a/src/mesa/pipe/softpipe/sp_context.h b/src/mesa/pipe/softpipe/sp_context.h
index afdd0ec88e..2c038de5f7 100644
--- a/src/mesa/pipe/softpipe/sp_context.h
+++ b/src/mesa/pipe/softpipe/sp_context.h
@@ -93,10 +93,10 @@ struct softpipe_context {
    struct pipe_vertex_element vertex_element[PIPE_ATTRIB_MAX];
    unsigned dirty;
 
-   /*
-    * Active queries
+   /* Counter for occlusion queries.  Note this supports overlapping
+    * queries.
     */
-   struct pipe_query_object *queries[PIPE_QUERY_TYPES];
+   uint64_t occlusion_count;
 
    /*
     * Mapped vertex buffers
diff --git a/src/mesa/pipe/softpipe/sp_quad_occlusion.c b/src/mesa/pipe/softpipe/sp_quad_occlusion.c
index d65fdbdab7..54254df1f1 100644
--- a/src/mesa/pipe/softpipe/sp_quad_occlusion.c
+++ b/src/mesa/pipe/softpipe/sp_quad_occlusion.c
@@ -39,18 +39,22 @@
 #include "sp_surface.h"
 #include "sp_quad.h"
 
+static unsigned count_bits( unsigned val )
+{
+   unsigned i;
+
+   for (i = 0; val ; val >>= 1)
+      i += (val & 1);
+
+   return i;
+}
 
 static void
 occlusion_count_quad(struct quad_stage *qs, struct quad_header *quad)
 {
    struct softpipe_context *softpipe = qs->softpipe;
-   struct pipe_query_object *occ
-      = softpipe->queries[PIPE_QUERY_OCCLUSION_COUNTER];
 
-   occ->count += (quad->mask     ) & 1;
-   occ->count += (quad->mask >> 1) & 1;
-   occ->count += (quad->mask >> 2) & 1;
-   occ->count += (quad->mask >> 3) & 1;
+   softpipe->occlusion_count += count_bits(quad->mask);
 
    qs->next->run(qs->next, quad);
 }
diff --git a/src/mesa/pipe/softpipe/sp_query.c b/src/mesa/pipe/softpipe/sp_query.c
new file mode 100644
index 0000000000..bf753dad98
--- /dev/null
+++ b/src/mesa/pipe/softpipe/sp_query.c
@@ -0,0 +1,107 @@
+/**************************************************************************
+ * 
+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * 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, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ **************************************************************************/
+
+/* Author:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+#include "pipe/draw/draw_context.h"
+#include "pipe/p_defines.h"
+#include "pipe/p_inlines.h"
+#include "pipe/p_util.h"
+#include "sp_context.h"
+#include "sp_query.h"
+
+struct softpipe_query {
+   uint64_t start;
+   uint64_t end;
+};
+
+
+static struct softpipe_query *softpipe_query( struct pipe_query *p )
+{
+   return (struct softpipe_query *)p;
+}
+
+static struct pipe_query *
+softpipe_create_query(struct pipe_context *pipe, 
+		      unsigned type)
+{
+   assert(type == PIPE_QUERY_OCCLUSION_COUNTER);
+   return (struct pipe_query *)CALLOC_STRUCT( softpipe_query );
+}
+
+
+static void
+softpipe_destroy_query(struct pipe_context *pipe, struct pipe_query *q)
+{
+   FREE(q);
+}
+
+
+static void
+softpipe_begin_query(struct pipe_context *pipe, struct pipe_query *q)
+{
+   struct softpipe_context *softpipe = softpipe_context( pipe );
+   struct softpipe_query *sq = softpipe_query(q);
+   
+   sq->start = softpipe->occlusion_count;
+}
+
+
+static void
+softpipe_end_query(struct pipe_context *pipe, struct pipe_query *q)
+{
+   struct softpipe_context *softpipe = softpipe_context( pipe );
+   struct softpipe_query *sq = softpipe_query(q);
+
+   sq->end = softpipe->occlusion_count;
+}
+
+
+static boolean
+softpipe_get_query_result(struct pipe_context *pipe, 
+			  struct pipe_query *q,
+			  boolean wait,
+			  uint64_t *result )
+{
+   struct softpipe_query *sq = softpipe_query(q);
+   *result = sq->end - sq->start;
+   return TRUE;
+}
+
+
+void softpipe_init_query_funcs(struct softpipe_context *softpipe )
+{
+   softpipe->pipe.create_query = softpipe_create_query;
+   softpipe->pipe.destroy_query = softpipe_destroy_query;
+   softpipe->pipe.begin_query = softpipe_begin_query;
+   softpipe->pipe.end_query = softpipe_end_query;
+   softpipe->pipe.get_query_result = softpipe_get_query_result;
+}
+
+
diff --git a/src/mesa/pipe/softpipe/sp_query.h b/src/mesa/pipe/softpipe/sp_query.h
new file mode 100644
index 0000000000..05060a4575
--- /dev/null
+++ b/src/mesa/pipe/softpipe/sp_query.h
@@ -0,0 +1,39 @@
+/**************************************************************************
+ * 
+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * 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, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ **************************************************************************/
+
+/* Author:
+ *    Keith Whitwell
+ */
+
+#ifndef SP_QUERY_H
+#define SP_QUERY_H
+
+struct softpipe_context;
+extern void softpipe_init_query_funcs(struct softpipe_context * );
+
+
+#endif /* SP_QUERY_H */
diff --git a/src/mesa/state_tracker/st_cb_queryobj.c b/src/mesa/state_tracker/st_cb_queryobj.c
index 5b95dd7fd3..c1d0d086b4 100644
--- a/src/mesa/state_tracker/st_cb_queryobj.c
+++ b/src/mesa/state_tracker/st_cb_queryobj.c
@@ -47,7 +47,7 @@
 struct st_query_object
 {
    struct gl_query_object base;
-   struct pipe_query_object pq;
+   struct pipe_query *pq;
 };
 
 
@@ -68,12 +68,28 @@ st_NewQueryObject(GLcontext *ctx, GLuint id)
    if (stq) {
       stq->base.Id = id;
       stq->base.Ready = GL_TRUE;
+      stq->pq = NULL;
       return &stq->base;
    }
    return NULL;
 }
 
 
+
+static void
+st_DeleteQuery(GLcontext *ctx, struct gl_query_object *q)
+{
+   struct pipe_context *pipe = ctx->st->pipe;
+   struct st_query_object *stq = st_query_object(q);
+
+   if (stq->pq) {
+      pipe->destroy_query(pipe, stq->pq);
+      stq->pq = NULL;
+   }
+
+   FREE(stq);
+}
+
 /**
  * Do glReadPixels by getting rows from the framebuffer surface with
  * get_tile().  Convert to requested format/type with Mesa image routines.
@@ -85,25 +101,17 @@ st_BeginQuery(GLcontext *ctx, struct gl_query_object *q)
    struct pipe_context *pipe = ctx->st->pipe;
    struct st_query_object *stq = st_query_object(q);
 
-   stq->pq.count = 0;
-
    switch (q->Target) {
    case GL_SAMPLES_PASSED_ARB:
-      stq->pq.type = PIPE_QUERY_OCCLUSION_COUNTER;
-      break;
-   case GL_PRIMITIVES_GENERATED_NV:
-      /* someday */
-      stq->pq.type = PIPE_QUERY_PRIMITIVES_GENERATED;
-      break;
-   case GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_NV:
-      /* someday */
-      stq->pq.type = PIPE_QUERY_PRIMITIVES_EMITTED;
+      if (!stq->pq)
+	 stq->pq = pipe->create_query( pipe, PIPE_QUERY_OCCLUSION_COUNTER );
       break;
    default:
       assert(0);
+      return;
    }
 
-   pipe->begin_query(pipe, &stq->pq);
+   pipe->begin_query(pipe, stq->pq);
 }
 
 
@@ -113,10 +121,7 @@ st_EndQuery(GLcontext *ctx, struct gl_query_object *q)
    struct pipe_context *pipe = ctx->st->pipe;
    struct st_query_object *stq = st_query_object(q);
 
-   pipe->end_query(pipe, &stq->pq);
-   stq->base.Ready = stq->pq.ready;
-   if (stq->base.Ready)
-      stq->base.Result = stq->pq.count;
+   pipe->end_query(pipe, stq->pq);
 }
 
 
@@ -129,17 +134,42 @@ st_WaitQuery(GLcontext *ctx, struct gl_query_object *q)
    /* this function should only be called if we don't have a ready result */
    assert(!stq->base.Ready);
 
-   pipe->wait_query(pipe, &stq->pq);
+   while (!stq->base.Ready &&
+	  !pipe->get_query_result(pipe, 
+				  stq->pq,
+				  TRUE,
+				  &q->Result))
+   {
+      /* nothing */
+   }
+			    
    q->Ready = GL_TRUE;
-   q->Result = stq->pq.count;
 }
 
 
+static void
+st_CheckQuery(GLcontext *ctx, struct gl_query_object *q)
+{
+   struct pipe_context *pipe = ctx->st->pipe;
+   struct st_query_object *stq = st_query_object(q);
+
+   if (!q->Ready) {
+      q->Ready = pipe->get_query_result(pipe, 
+					stq->pq,
+					FALSE,
+					&q->Result);
+   }
+}
+
+
+
 
 void st_init_query_functions(struct dd_function_table *functions)
 {
    functions->NewQueryObject = st_NewQueryObject;
+   functions->DeleteQuery = st_DeleteQuery;
    functions->BeginQuery = st_BeginQuery;
    functions->EndQuery = st_EndQuery;
    functions->WaitQuery = st_WaitQuery;
+   functions->CheckQuery = st_CheckQuery;
 }
-- 
cgit v1.2.3


From 5dcc894ea2d926d4845e805298b79c514f58687d Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Tue, 11 Dec 2007 19:16:46 -0700
Subject: prefix some #includes

---
 src/mesa/main/dispatch.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/dispatch.c b/src/mesa/main/dispatch.c
index 05c1c36c0d..c12f55a7a1 100644
--- a/src/mesa/main/dispatch.c
+++ b/src/mesa/main/dispatch.c
@@ -40,9 +40,9 @@
 #ifndef GLX_USE_APPLEGL
 
 #include "glheader.h"
-#include "glapi.h"
-#include "glapitable.h"
-#include "glthread.h"
+#include "glapi/glapi.h"
+#include "glapi/glapitable.h"
+#include "glapi/glthread.h"
 
 
 #if !(defined(USE_X86_ASM) || defined(USE_X86_64_ASM) || defined(USE_SPARC_ASM))
@@ -87,8 +87,8 @@
 #define GLAPIENTRY
 #endif
 
-#include "dispatch.h"
-#include "glapitemp.h"
+#include "glapi/dispatch.h"
+#include "glapi/glapitemp.h"
 
 #endif /* USE_X86_ASM */
 
-- 
cgit v1.2.3


From 1e3b07f363e6bf512ab1a5c620656985aece40fd Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Fri, 14 Dec 2007 11:16:49 -0700
Subject: set program->SamplersUsed bit when using a texture instruction

---
 src/mesa/main/texenvprogram.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index efb3b35f6a..1e46d8c375 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -936,10 +936,12 @@ static void load_texture( struct texenv_fragment_program *p, GLuint unit )
 			  
       /* TODO: Use D0_MASK_XY where possible.
        */
-      if (p->state->unit[unit].enabled) 
+      if (p->state->unit[unit].enabled) {
 	 p->src_texture[unit] = emit_texld( p, OPCODE_TXP,
 					    tmp, WRITEMASK_XYZW, 
 					    unit, dim, texcoord );
+         p->program->Base.SamplersUsed |= (1 << unit);
+      }
       else
 	 p->src_texture[unit] = get_zero(p);
    }
-- 
cgit v1.2.3


From fce4612f8a29ee1798c9326a431a139d856c7a04 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Fri, 14 Dec 2007 11:42:28 -0700
Subject: set SamplerUnit[] entry in load_texture() just to be safe

---
 src/mesa/main/texenvprogram.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 1e46d8c375..d866d10017 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -941,6 +941,10 @@ static void load_texture( struct texenv_fragment_program *p, GLuint unit )
 					    tmp, WRITEMASK_XYZW, 
 					    unit, dim, texcoord );
          p->program->Base.SamplersUsed |= (1 << unit);
+         /* This identity mapping should already be in place
+          * (see _mesa_init_program_struct()) but let's be safe.
+          */
+         p->program->Base.SamplerUnits[unit] = unit;
       }
       else
 	 p->src_texture[unit] = get_zero(p);
-- 
cgit v1.2.3


From 552907d8a497d42f6693ca0f9324f003cfe3a66d Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Mon, 24 Dec 2007 17:37:30 -0700
Subject: free Default1D/2DArray objects

---
 src/mesa/main/context.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 563a89e686..a9f9bd9da4 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -554,8 +554,13 @@ alloc_shared_state( GLcontext *ctx )
       (*ctx->Driver.DeleteTexture)(ctx, ss->DefaultCubeMap);
    if (ss->DefaultRect)
       (*ctx->Driver.DeleteTexture)(ctx, ss->DefaultRect);
-   if (ss)
-      _mesa_free(ss);
+   if (ss->Default1DArray)
+      (*ctx->Driver.DeleteTexture)(ctx, ss->Default1DArray);
+   if (ss->Default2DArray)
+      (*ctx->Driver.DeleteTexture)(ctx, ss->Default2DArray);
+
+   _mesa_free(ss);
+
    return GL_FALSE;
 }
 
@@ -678,6 +683,9 @@ free_shared_state( GLcontext *ctx, struct gl_shared_state *ss )
    ctx->Driver.DeleteTexture(ctx, ss->Default3D);
    ctx->Driver.DeleteTexture(ctx, ss->DefaultCubeMap);
    ctx->Driver.DeleteTexture(ctx, ss->DefaultRect);
+   ctx->Driver.DeleteTexture(ctx, ss->Default1DArray);
+   ctx->Driver.DeleteTexture(ctx, ss->Default2DArray);
+
    /* all other textures */
    _mesa_HashDeleteAll(ss->TexObjects, delete_texture_cb, ctx);
    _mesa_DeleteHashTable(ss->TexObjects);
-- 
cgit v1.2.3


From 573b4414b926bb86e9a1e8f3ffad64426aa4bda4 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Wed, 26 Dec 2007 06:56:42 -0700
Subject: fix mem leak (free key)

---
 src/mesa/main/ffvertex_prog.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index 8fcb9e5b14..4a9a0cd975 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -1,6 +1,6 @@
 /**************************************************************************
  * 
- * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
  * All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -1529,6 +1529,8 @@ _mesa_get_fixed_func_vertex_program(GLcontext *ctx)
 	 
       prog = (struct gl_vertex_program *)
          ctx->Driver.NewProgram(ctx, GL_VERTEX_PROGRAM_ARB, 0); 
+      if (!prog)
+         return NULL;
 
       create_new_program( key, prog,
                           ctx->Const.VertexProgram.MaxTemps );
@@ -1541,10 +1543,8 @@ _mesa_get_fixed_func_vertex_program(GLcontext *ctx)
       _mesa_program_cache_insert(ctx, ctx->VertexProgram.Cache,
                                  key, sizeof(*key), &prog->Base);
    }
-   else {
-      /* use cached program */
-      _mesa_free(key);
-   }
+
+   _mesa_free(key);
 
    return prog;
 }
-- 
cgit v1.2.3


From fdc8636bdc65deb0d95a62a51c8d9bca05bc6bb8 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Fri, 18 Jan 2008 12:45:27 -0700
Subject: use PROGRAM_CONSTANT instead of PROGRAM_STATE_VAR when generating
 immediates/literals

---
 src/mesa/main/ffvertex_prog.c | 2 +-
 src/mesa/main/texenvprogram.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index 4a9a0cd975..04ece4cda8 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -436,7 +436,7 @@ static struct ureg register_const4f( struct tnl_program *p,
    idx = _mesa_add_unnamed_constant( p->program->Base.Parameters, values, 4,
                                      &swizzle );
    ASSERT(swizzle == SWIZZLE_NOOP);
-   return make_ureg(PROGRAM_STATE_VAR, idx);
+   return make_ureg(PROGRAM_CONSTANT, idx);
 }
 
 #define register_const1f(p, s0)         register_const4f(p, s0, 0, 0, 1)
diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index d866d10017..644b1f39c7 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -582,7 +582,7 @@ static struct ureg register_const4f( struct texenv_fragment_program *p,
    idx = _mesa_add_unnamed_constant( p->program->Base.Parameters, values, 4,
                                      &swizzle );
    ASSERT(swizzle == SWIZZLE_NOOP);
-   return make_ureg(PROGRAM_STATE_VAR, idx);
+   return make_ureg(PROGRAM_CONSTANT, idx);
 }
 
 #define register_scalar_const(p, s0)    register_const4f(p, s0, s0, s0, s0)
-- 
cgit v1.2.3


From 4c2f3dbca940f289e67248682b84a3516d5a3031 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Tue, 5 Feb 2008 18:15:03 -0700
Subject: Added ctx->Driver.GenerateMipmap() driver hook

---
 src/mesa/drivers/common/driverfuncs.c |  2 ++
 src/mesa/main/dd.h                    |  7 +++++
 src/mesa/main/fbobject.c              |  2 +-
 src/mesa/main/texstore.c              | 48 +++++++++++++++++------------------
 4 files changed, 34 insertions(+), 25 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c
index 33caf7dae1..b5b383b4e4 100644
--- a/src/mesa/drivers/common/driverfuncs.c
+++ b/src/mesa/drivers/common/driverfuncs.c
@@ -28,6 +28,7 @@
 #include "buffers.h"
 #include "context.h"
 #include "framebuffer.h"
+#include "mipmap.h"
 #include "program.h"
 #include "prog_execute.h"
 #include "queryobj.h"
@@ -99,6 +100,7 @@ _mesa_init_driver_functions(struct dd_function_table *driver)
    driver->CopyTexSubImage1D = _swrast_copy_texsubimage1d;
    driver->CopyTexSubImage2D = _swrast_copy_texsubimage2d;
    driver->CopyTexSubImage3D = _swrast_copy_texsubimage3d;
+   driver->GenerateMipmap = _mesa_generate_mipmap;
    driver->TestProxyTexImage = _mesa_test_proxy_teximage;
    driver->CompressedTexImage1D = _mesa_store_compressed_teximage1d;
    driver->CompressedTexImage2D = _mesa_store_compressed_teximage2d;
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index 3bec3bd433..c2ef67ba6d 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -332,6 +332,13 @@ struct dd_function_table {
                               GLint x, GLint y,
                               GLsizei width, GLsizei height );
 
+   /**
+    * Called by glGenerateMipmap() or when GL_GENERATE_MIPMAP_SGIS is enabled.
+    */
+   void (*GenerateMipmap)(GLcontext *ctx,  GLenum target,
+                          const struct gl_texture_unit *texUnit,
+                          struct gl_texture_object *texObj);
+
    /**
     * Called by glTexImage[123]D when user specifies a proxy texture
     * target.  
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 963e35d678..13cbd35424 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -1560,7 +1560,7 @@ _mesa_GenerateMipmapEXT(GLenum target)
 
    /* XXX this might not handle cube maps correctly */
    _mesa_lock_texture(ctx, texObj);
-   _mesa_generate_mipmap(ctx, target, texUnit, texObj);
+   ctx->Driver.GenerateMipmap(ctx, target, texUnit, texObj);
    _mesa_unlock_texture(ctx, texObj);
 }
 
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index 30be65525e..26ca4f1bd5 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -2917,9 +2917,9 @@ _mesa_store_teximage1d(GLcontext *ctx, GLenum target, GLint level,
 
    /* GL_SGIS_generate_mipmap */
    if (level == texObj->BaseLevel && texObj->GenerateMipmap) {
-      _mesa_generate_mipmap(ctx, target,
-                            &ctx->Texture.Unit[ctx->Texture.CurrentUnit],
-                            texObj);
+      ctx->Driver.GenerateMipmap(ctx, target,
+                                 &ctx->Texture.Unit[ctx->Texture.CurrentUnit],
+                                 texObj);
    }
 
    _mesa_unmap_teximage_pbo(ctx, packing);
@@ -3003,9 +3003,9 @@ _mesa_store_teximage2d(GLcontext *ctx, GLenum target, GLint level,
 
    /* GL_SGIS_generate_mipmap */
    if (level == texObj->BaseLevel && texObj->GenerateMipmap) {
-      _mesa_generate_mipmap(ctx, target,
-                            &ctx->Texture.Unit[ctx->Texture.CurrentUnit],
-                            texObj);
+      ctx->Driver.GenerateMipmap(ctx, target,
+                                 &ctx->Texture.Unit[ctx->Texture.CurrentUnit],
+                                 texObj);
    }
 
    _mesa_unmap_teximage_pbo(ctx, packing);
@@ -3079,9 +3079,9 @@ _mesa_store_teximage3d(GLcontext *ctx, GLenum target, GLint level,
 
    /* GL_SGIS_generate_mipmap */
    if (level == texObj->BaseLevel && texObj->GenerateMipmap) {
-      _mesa_generate_mipmap(ctx, target,
-                            &ctx->Texture.Unit[ctx->Texture.CurrentUnit],
-                            texObj);
+      ctx->Driver.GenerateMipmap(ctx, target,
+                                 &ctx->Texture.Unit[ctx->Texture.CurrentUnit],
+                                 texObj);
    }
 
    _mesa_unmap_teximage_pbo(ctx, packing);
@@ -3127,9 +3127,9 @@ _mesa_store_texsubimage1d(GLcontext *ctx, GLenum target, GLint level,
 
    /* GL_SGIS_generate_mipmap */
    if (level == texObj->BaseLevel && texObj->GenerateMipmap) {
-      _mesa_generate_mipmap(ctx, target,
-                            &ctx->Texture.Unit[ctx->Texture.CurrentUnit],
-                            texObj);
+      ctx->Driver.GenerateMipmap(ctx, target,
+                                 &ctx->Texture.Unit[ctx->Texture.CurrentUnit],
+                                 texObj);
    }
 
    _mesa_unmap_teximage_pbo(ctx, packing);
@@ -3182,9 +3182,9 @@ _mesa_store_texsubimage2d(GLcontext *ctx, GLenum target, GLint level,
 
    /* GL_SGIS_generate_mipmap */
    if (level == texObj->BaseLevel && texObj->GenerateMipmap) {
-      _mesa_generate_mipmap(ctx, target,
-                            &ctx->Texture.Unit[ctx->Texture.CurrentUnit],
-                            texObj);
+      ctx->Driver.GenerateMipmap(ctx, target,
+                                 &ctx->Texture.Unit[ctx->Texture.CurrentUnit],
+                                 texObj);
    }
 
    _mesa_unmap_teximage_pbo(ctx, packing);
@@ -3237,9 +3237,9 @@ _mesa_store_texsubimage3d(GLcontext *ctx, GLenum target, GLint level,
 
    /* GL_SGIS_generate_mipmap */
    if (level == texObj->BaseLevel && texObj->GenerateMipmap) {
-      _mesa_generate_mipmap(ctx, target,
-                            &ctx->Texture.Unit[ctx->Texture.CurrentUnit],
-                            texObj);
+      ctx->Driver.GenerateMipmap(ctx, target,
+                                 &ctx->Texture.Unit[ctx->Texture.CurrentUnit],
+                                 texObj);
    }
 
    _mesa_unmap_teximage_pbo(ctx, packing);
@@ -3313,9 +3313,9 @@ _mesa_store_compressed_teximage2d(GLcontext *ctx, GLenum target, GLint level,
 
    /* GL_SGIS_generate_mipmap */
    if (level == texObj->BaseLevel && texObj->GenerateMipmap) {
-      _mesa_generate_mipmap(ctx, target,
-                            &ctx->Texture.Unit[ctx->Texture.CurrentUnit],
-                            texObj);
+      ctx->Driver.GenerateMipmap(ctx, target,
+                                 &ctx->Texture.Unit[ctx->Texture.CurrentUnit],
+                                 texObj);
    }
 
    _mesa_unmap_teximage_pbo(ctx, &ctx->Unpack);
@@ -3425,9 +3425,9 @@ _mesa_store_compressed_texsubimage2d(GLcontext *ctx, GLenum target,
 
    /* GL_SGIS_generate_mipmap */
    if (level == texObj->BaseLevel && texObj->GenerateMipmap) {
-      _mesa_generate_mipmap(ctx, target,
-                            &ctx->Texture.Unit[ctx->Texture.CurrentUnit],
-                            texObj);
+      ctx->Driver.GenerateMipmap(ctx, target,
+                                 &ctx->Texture.Unit[ctx->Texture.CurrentUnit],
+                                 texObj);
    }
 
    _mesa_unmap_teximage_pbo(ctx, &ctx->Unpack);
-- 
cgit v1.2.3


From c3395f4473c8fdf75d04c0dd72e687bc8d8127a7 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Fri, 8 Feb 2008 14:45:58 -0700
Subject: Remove unused texunit parameter to ctx->Driver.GenerateMipmap()

---
 src/mesa/main/dd.h       |  3 +--
 src/mesa/main/fbobject.c |  2 +-
 src/mesa/main/mipmap.c   |  1 -
 src/mesa/main/mipmap.h   |  1 -
 src/mesa/main/texstore.c | 32 ++++++++------------------------
 5 files changed, 10 insertions(+), 29 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index c2ef67ba6d..37ef2a865b 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -335,8 +335,7 @@ struct dd_function_table {
    /**
     * Called by glGenerateMipmap() or when GL_GENERATE_MIPMAP_SGIS is enabled.
     */
-   void (*GenerateMipmap)(GLcontext *ctx,  GLenum target,
-                          const struct gl_texture_unit *texUnit,
+   void (*GenerateMipmap)(GLcontext *ctx, GLenum target,
                           struct gl_texture_object *texObj);
 
    /**
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 13cbd35424..6a8cba4d8a 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -1560,7 +1560,7 @@ _mesa_GenerateMipmapEXT(GLenum target)
 
    /* XXX this might not handle cube maps correctly */
    _mesa_lock_texture(ctx, texObj);
-   ctx->Driver.GenerateMipmap(ctx, target, texUnit, texObj);
+   ctx->Driver.GenerateMipmap(ctx, target, texObj);
    _mesa_unlock_texture(ctx, texObj);
 }
 
diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index 9f3db22b75..1e61829e8f 100644
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -933,7 +933,6 @@ make_2d_stack_mipmap(const struct gl_texture_format *format, GLint border,
  */
 void
 _mesa_generate_mipmap(GLcontext *ctx, GLenum target,
-                      const struct gl_texture_unit *texUnit,
                       struct gl_texture_object *texObj)
 {
    const struct gl_texture_image *srcImage;
diff --git a/src/mesa/main/mipmap.h b/src/mesa/main/mipmap.h
index df78603283..46e16902c8 100644
--- a/src/mesa/main/mipmap.h
+++ b/src/mesa/main/mipmap.h
@@ -30,7 +30,6 @@
 
 extern void
 _mesa_generate_mipmap(GLcontext *ctx, GLenum target,
-                      const struct gl_texture_unit *texUnit,
                       struct gl_texture_object *texObj);
 
 
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index 26ca4f1bd5..a6a18910fc 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -2917,9 +2917,7 @@ _mesa_store_teximage1d(GLcontext *ctx, GLenum target, GLint level,
 
    /* GL_SGIS_generate_mipmap */
    if (level == texObj->BaseLevel && texObj->GenerateMipmap) {
-      ctx->Driver.GenerateMipmap(ctx, target,
-                                 &ctx->Texture.Unit[ctx->Texture.CurrentUnit],
-                                 texObj);
+      ctx->Driver.GenerateMipmap(ctx, target, texObj);
    }
 
    _mesa_unmap_teximage_pbo(ctx, packing);
@@ -3003,9 +3001,7 @@ _mesa_store_teximage2d(GLcontext *ctx, GLenum target, GLint level,
 
    /* GL_SGIS_generate_mipmap */
    if (level == texObj->BaseLevel && texObj->GenerateMipmap) {
-      ctx->Driver.GenerateMipmap(ctx, target,
-                                 &ctx->Texture.Unit[ctx->Texture.CurrentUnit],
-                                 texObj);
+      ctx->Driver.GenerateMipmap(ctx, target, texObj);
    }
 
    _mesa_unmap_teximage_pbo(ctx, packing);
@@ -3079,9 +3075,7 @@ _mesa_store_teximage3d(GLcontext *ctx, GLenum target, GLint level,
 
    /* GL_SGIS_generate_mipmap */
    if (level == texObj->BaseLevel && texObj->GenerateMipmap) {
-      ctx->Driver.GenerateMipmap(ctx, target,
-                                 &ctx->Texture.Unit[ctx->Texture.CurrentUnit],
-                                 texObj);
+      ctx->Driver.GenerateMipmap(ctx, target, texObj);
    }
 
    _mesa_unmap_teximage_pbo(ctx, packing);
@@ -3127,9 +3121,7 @@ _mesa_store_texsubimage1d(GLcontext *ctx, GLenum target, GLint level,
 
    /* GL_SGIS_generate_mipmap */
    if (level == texObj->BaseLevel && texObj->GenerateMipmap) {
-      ctx->Driver.GenerateMipmap(ctx, target,
-                                 &ctx->Texture.Unit[ctx->Texture.CurrentUnit],
-                                 texObj);
+      ctx->Driver.GenerateMipmap(ctx, target, texObj);
    }
 
    _mesa_unmap_teximage_pbo(ctx, packing);
@@ -3182,9 +3174,7 @@ _mesa_store_texsubimage2d(GLcontext *ctx, GLenum target, GLint level,
 
    /* GL_SGIS_generate_mipmap */
    if (level == texObj->BaseLevel && texObj->GenerateMipmap) {
-      ctx->Driver.GenerateMipmap(ctx, target,
-                                 &ctx->Texture.Unit[ctx->Texture.CurrentUnit],
-                                 texObj);
+      ctx->Driver.GenerateMipmap(ctx, target, texObj);
    }
 
    _mesa_unmap_teximage_pbo(ctx, packing);
@@ -3237,9 +3227,7 @@ _mesa_store_texsubimage3d(GLcontext *ctx, GLenum target, GLint level,
 
    /* GL_SGIS_generate_mipmap */
    if (level == texObj->BaseLevel && texObj->GenerateMipmap) {
-      ctx->Driver.GenerateMipmap(ctx, target,
-                                 &ctx->Texture.Unit[ctx->Texture.CurrentUnit],
-                                 texObj);
+      ctx->Driver.GenerateMipmap(ctx, target, texObj);
    }
 
    _mesa_unmap_teximage_pbo(ctx, packing);
@@ -3313,9 +3301,7 @@ _mesa_store_compressed_teximage2d(GLcontext *ctx, GLenum target, GLint level,
 
    /* GL_SGIS_generate_mipmap */
    if (level == texObj->BaseLevel && texObj->GenerateMipmap) {
-      ctx->Driver.GenerateMipmap(ctx, target,
-                                 &ctx->Texture.Unit[ctx->Texture.CurrentUnit],
-                                 texObj);
+      ctx->Driver.GenerateMipmap(ctx, target, texObj);
    }
 
    _mesa_unmap_teximage_pbo(ctx, &ctx->Unpack);
@@ -3425,9 +3411,7 @@ _mesa_store_compressed_texsubimage2d(GLcontext *ctx, GLenum target,
 
    /* GL_SGIS_generate_mipmap */
    if (level == texObj->BaseLevel && texObj->GenerateMipmap) {
-      ctx->Driver.GenerateMipmap(ctx, target,
-                                 &ctx->Texture.Unit[ctx->Texture.CurrentUnit],
-                                 texObj);
+      ctx->Driver.GenerateMipmap(ctx, target, texObj);
    }
 
    _mesa_unmap_teximage_pbo(ctx, &ctx->Unpack);
-- 
cgit v1.2.3


From aa9d9d9c40ae34d61b113ffc54bffd702138f72f Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Fri, 8 Feb 2008 16:35:44 -0700
Subject: checkpoint- remove dependencies on gl_texture_format to make code
 re-usable by state tracker

---
 src/mesa/main/mipmap.c | 424 +++++++++++++++++++++++++++++++------------------
 1 file changed, 266 insertions(+), 158 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index 1e61829e8f..013dc3752e 100644
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -36,27 +36,205 @@
 
 
 
+static GLint
+bytes_per_pixel(GLenum datatype, GLuint comps)
+{
+   GLint b = _mesa_sizeof_packed_type(datatype);
+   assert(b >= 0);
+   return b * comps;
+}
+
+
+static void
+mesa_format_to_type_and_comps(const struct gl_texture_format *format,
+                              GLenum *datatype, GLuint *comps)
+{
+   switch (format->MesaFormat) {
+   case MESA_FORMAT_RGBA8888:
+   case MESA_FORMAT_RGBA8888_REV:
+   case MESA_FORMAT_ARGB8888:
+   case MESA_FORMAT_ARGB8888_REV:
+      *datatype = CHAN_TYPE;
+      *comps = 4;
+      return;
+   case MESA_FORMAT_RGB888:
+   case MESA_FORMAT_BGR888:
+      *datatype = GL_UNSIGNED_BYTE;
+      *comps = 3;
+      return;
+   case MESA_FORMAT_RGB565:
+   case MESA_FORMAT_RGB565_REV:
+      *datatype = GL_UNSIGNED_SHORT_5_6_5;
+      *comps = 3;
+      return;
+
+   case MESA_FORMAT_ARGB4444:
+   case MESA_FORMAT_ARGB4444_REV:
+      *datatype = GL_UNSIGNED_SHORT_4_4_4_4;
+      *comps = 4;
+      return;
+
+   case MESA_FORMAT_ARGB1555:
+   case MESA_FORMAT_ARGB1555_REV:
+      *datatype = GL_UNSIGNED_SHORT_1_5_5_5_REV;
+      *comps = 3;
+      return;
+
+   case MESA_FORMAT_AL88:
+   case MESA_FORMAT_AL88_REV:
+      *datatype = GL_UNSIGNED_BYTE;
+      *comps = 2;
+      return;
+   case MESA_FORMAT_RGB332:
+      *datatype = GL_UNSIGNED_BYTE_3_3_2;
+      *comps = 3;
+      return;
+
+   case MESA_FORMAT_A8:
+   case MESA_FORMAT_L8:
+   case MESA_FORMAT_I8:
+   case MESA_FORMAT_CI8:
+      *datatype = GL_UNSIGNED_BYTE;
+      *comps = 1;
+      return;
+
+   case MESA_FORMAT_YCBCR:
+   case MESA_FORMAT_YCBCR_REV:
+      *datatype = GL_UNSIGNED_SHORT;
+      *comps = 2;
+      return;
+
+   case MESA_FORMAT_Z24_S8:
+      *datatype = GL_UNSIGNED_INT;
+      *comps = 1; /* XXX OK? */
+      return;
+
+   case MESA_FORMAT_Z16:
+      *datatype = GL_UNSIGNED_SHORT;
+      *comps = 1;
+      return;
+
+   case MESA_FORMAT_Z32:
+      *datatype = GL_UNSIGNED_INT;
+      *comps = 1;
+      return;
+
+   case MESA_FORMAT_SRGB8:
+      *datatype = GL_UNSIGNED_BYTE;
+      *comps = 3;
+      return;
+   case MESA_FORMAT_SRGBA8:
+      *datatype = GL_UNSIGNED_BYTE;
+      *comps = 4;
+      return;
+   case MESA_FORMAT_SL8:
+      *datatype = GL_UNSIGNED_BYTE;
+      *comps = 1;
+      return;
+   case MESA_FORMAT_SLA8:
+      *datatype = GL_UNSIGNED_BYTE;
+      *comps = 2;
+      return;
+
+   case MESA_FORMAT_RGB_FXT1:
+   case MESA_FORMAT_RGBA_FXT1:
+   case MESA_FORMAT_RGB_DXT1:
+   case MESA_FORMAT_RGBA_DXT1:
+   case MESA_FORMAT_RGBA_DXT3:
+   case MESA_FORMAT_RGBA_DXT5:
+      /* XXX generate error instead? */
+      *datatype = GL_UNSIGNED_BYTE;
+      *comps = 0;
+      return;
+
+   case MESA_FORMAT_RGBA:
+      *datatype = CHAN_TYPE;
+      *comps = 4;
+      return;
+   case MESA_FORMAT_RGB:
+      *datatype = CHAN_TYPE;
+      *comps = 3;
+      return;
+   case MESA_FORMAT_LUMINANCE_ALPHA:
+      *datatype = CHAN_TYPE;
+      *comps = 2;
+      return;
+   case MESA_FORMAT_ALPHA:
+   case MESA_FORMAT_LUMINANCE:
+   case MESA_FORMAT_INTENSITY:
+      *datatype = CHAN_TYPE;
+      *comps = 1;
+      return;
+
+   case MESA_FORMAT_RGBA_FLOAT32:
+      *datatype = GL_FLOAT;
+      *comps = 4;
+      return;
+   case MESA_FORMAT_RGBA_FLOAT16:
+      *datatype = GL_HALF_FLOAT_ARB;
+      *comps = 4;
+      return;
+   case MESA_FORMAT_RGB_FLOAT32:
+      *datatype = GL_FLOAT;
+      *comps = 3;
+      return;
+   case MESA_FORMAT_RGB_FLOAT16:
+      *datatype = GL_HALF_FLOAT_ARB;
+      *comps = 3;
+      return;
+   case MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32:
+      *datatype = GL_FLOAT;
+      *comps = 2;
+      return;
+   case MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16:
+      *datatype = GL_HALF_FLOAT_ARB;
+      *comps = 2;
+      return;
+   case MESA_FORMAT_ALPHA_FLOAT32:
+   case MESA_FORMAT_LUMINANCE_FLOAT32:
+   case MESA_FORMAT_INTENSITY_FLOAT32:
+      *datatype = GL_FLOAT;
+      *comps = 1;
+      return;
+   case MESA_FORMAT_ALPHA_FLOAT16:
+   case MESA_FORMAT_LUMINANCE_FLOAT16:
+   case MESA_FORMAT_INTENSITY_FLOAT16:
+      *datatype = GL_HALF_FLOAT_ARB;
+      *comps = 1;
+      return;
+
+   default:
+      _mesa_problem(NULL, "bad texture format in mesa_format_to_type_and_comps");
+      *datatype = 0;
+      *comps = 1;
+   }
+}
+
+
 /**
  * Average together two rows of a source image to produce a single new
  * row in the dest image.  It's legal for the two source rows to point
  * to the same data.  The source width must be equal to either the
  * dest width or two times the dest width.
+ * \param datatype  GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT, GL_FLOAT, etc.
+ * \param comps  number of components per pixel (1..4)
  */
 static void
-do_row(const struct gl_texture_format *format, GLint srcWidth,
+do_row(GLenum datatype, GLuint comps, GLint srcWidth,
        const GLvoid *srcRowA, const GLvoid *srcRowB,
        GLint dstWidth, GLvoid *dstRow)
 {
    const GLuint k0 = (srcWidth == dstWidth) ? 0 : 1;
    const GLuint colStride = (srcWidth == dstWidth) ? 1 : 2;
 
+   ASSERT(comps >= 1);
+   ASSERT(comps <= 4);
+
    /* This assertion is no longer valid with non-power-of-2 textures
    assert(srcWidth == dstWidth || srcWidth == 2 * dstWidth);
    */
 
-   switch (format->MesaFormat) {
-   case MESA_FORMAT_RGBA:
-      {
+   if (datatype == CHAN_TYPE && comps == 4) {
          GLuint i, j, k;
          const GLchan (*rowA)[4] = (const GLchan (*)[4]) srcRowA;
          const GLchan (*rowB)[4] = (const GLchan (*)[4]) srcRowB;
@@ -72,10 +250,8 @@ do_row(const struct gl_texture_format *format, GLint srcWidth,
             dst[i][3] = (rowA[j][3] + rowA[k][3] +
                          rowB[j][3] + rowB[k][3]) / 4;
          }
-      }
-      return;
-   case MESA_FORMAT_RGB:
-      {
+   }
+   else if (datatype == CHAN_TYPE && comps == 3) {
          GLuint i, j, k;
          const GLchan (*rowA)[3] = (const GLchan (*)[3]) srcRowA;
          const GLchan (*rowB)[3] = (const GLchan (*)[3]) srcRowB;
@@ -89,12 +265,8 @@ do_row(const struct gl_texture_format *format, GLint srcWidth,
             dst[i][2] = (rowA[j][2] + rowA[k][2] +
                          rowB[j][2] + rowB[k][2]) / 4;
          }
-      }
-      return;
-   case MESA_FORMAT_ALPHA:
-   case MESA_FORMAT_LUMINANCE:
-   case MESA_FORMAT_INTENSITY:
-      {
+   }
+   else if (datatype == CHAN_TYPE && comps == 1) {
          GLuint i, j, k;
          const GLchan *rowA = (const GLchan *) srcRowA;
          const GLchan *rowB = (const GLchan *) srcRowB;
@@ -103,10 +275,8 @@ do_row(const struct gl_texture_format *format, GLint srcWidth,
               i++, j += colStride, k += colStride) {
             dst[i] = (rowA[j] + rowA[k] + rowB[j] + rowB[k]) / 4;
          }
-      }
-      return;
-   case MESA_FORMAT_LUMINANCE_ALPHA:
-      {
+   }
+   else if (datatype == CHAN_TYPE && comps == 2) {
          GLuint i, j, k;
          const GLchan (*rowA)[2] = (const GLchan (*)[2]) srcRowA;
          const GLchan (*rowB)[2] = (const GLchan (*)[2]) srcRowB;
@@ -118,10 +288,8 @@ do_row(const struct gl_texture_format *format, GLint srcWidth,
             dst[i][1] = (rowA[j][1] + rowA[k][1] +
                          rowB[j][1] + rowB[k][1]) / 4;
          }
-      }
-      return;
-   case MESA_FORMAT_Z32:
-      {
+   }
+   else if (datatype == GL_UNSIGNED_INT && comps == 1) {
          GLuint i, j, k;
          const GLuint *rowA = (const GLuint *) srcRowA;
          const GLuint *rowB = (const GLuint *) srcRowB;
@@ -130,10 +298,8 @@ do_row(const struct gl_texture_format *format, GLint srcWidth,
               i++, j += colStride, k += colStride) {
             dst[i] = rowA[j] / 4 + rowA[k] / 4 + rowB[j] / 4 + rowB[k] / 4;
          }
-      }
-      return;
-   case MESA_FORMAT_Z16:
-      {
+   }
+   else if (datatype == GL_UNSIGNED_SHORT && comps == 1) {
          GLuint i, j, k;
          const GLushort *rowA = (const GLushort *) srcRowA;
          const GLushort *rowB = (const GLushort *) srcRowB;
@@ -142,17 +308,8 @@ do_row(const struct gl_texture_format *format, GLint srcWidth,
               i++, j += colStride, k += colStride) {
             dst[i] = (rowA[j] + rowA[k] + rowB[j] + rowB[k]) / 4;
          }
-      }
-      return;
-   /* Begin hardware formats */
-   case MESA_FORMAT_RGBA8888:
-   case MESA_FORMAT_RGBA8888_REV:
-   case MESA_FORMAT_ARGB8888:
-   case MESA_FORMAT_ARGB8888_REV:
-#if FEATURE_EXT_texture_sRGB
-   case MESA_FORMAT_SRGBA8:
-#endif
-      {
+   }
+   else if (datatype == GL_UNSIGNED_BYTE && comps == 4) {
          GLuint i, j, k;
          const GLubyte (*rowA)[4] = (const GLubyte (*)[4]) srcRowA;
          const GLubyte (*rowB)[4] = (const GLubyte (*)[4]) srcRowB;
@@ -168,14 +325,8 @@ do_row(const struct gl_texture_format *format, GLint srcWidth,
             dst[i][3] = (rowA[j][3] + rowA[k][3] +
                          rowB[j][3] + rowB[k][3]) / 4;
          }
-      }
-      return;
-   case MESA_FORMAT_RGB888:
-   case MESA_FORMAT_BGR888:
-#if FEATURE_EXT_texture_sRGB
-   case MESA_FORMAT_SRGB8:
-#endif
-      {
+   }
+   else if (datatype == GL_UNSIGNED_BYTE && comps == 3) {
          GLuint i, j, k;
          const GLubyte (*rowA)[3] = (const GLubyte (*)[3]) srcRowA;
          const GLubyte (*rowB)[3] = (const GLubyte (*)[3]) srcRowB;
@@ -189,11 +340,8 @@ do_row(const struct gl_texture_format *format, GLint srcWidth,
             dst[i][2] = (rowA[j][2] + rowA[k][2] +
                          rowB[j][2] + rowB[k][2]) / 4;
          }
-      }
-      return;
-   case MESA_FORMAT_RGB565:
-   case MESA_FORMAT_RGB565_REV:
-      {
+   }
+   else if (datatype == GL_UNSIGNED_SHORT_5_6_5 && comps == 3) {
          GLuint i, j, k;
          const GLushort *rowA = (const GLushort *) srcRowA;
          const GLushort *rowB = (const GLushort *) srcRowB;
@@ -217,11 +365,8 @@ do_row(const struct gl_texture_format *format, GLint srcWidth,
             const GLint blue  = (rowAb0 + rowAb1 + rowBb0 + rowBb1) >> 2;
             dst[i] = (blue << 11) | (green << 5) | red;
          }
-      }
-      return;
-   case MESA_FORMAT_ARGB4444:
-   case MESA_FORMAT_ARGB4444_REV:
-      {
+   }
+   else if (datatype == GL_UNSIGNED_SHORT_4_4_4_4 && comps == 4) {
          GLuint i, j, k;
          const GLushort *rowA = (const GLushort *) srcRowA;
          const GLushort *rowB = (const GLushort *) srcRowB;
@@ -250,11 +395,8 @@ do_row(const struct gl_texture_format *format, GLint srcWidth,
             const GLint alpha = (rowAa0 + rowAa1 + rowBa0 + rowBa1) >> 2;
             dst[i] = (alpha << 12) | (blue << 8) | (green << 4) | red;
          }
-      }
-      return;
-   case MESA_FORMAT_ARGB1555:
-   case MESA_FORMAT_ARGB1555_REV: /* XXX broken? */
-      {
+   }
+   else if (datatype == GL_UNSIGNED_SHORT_1_5_5_5_REV && comps == 4) {
          GLuint i, j, k;
          const GLushort *rowA = (const GLushort *) srcRowA;
          const GLushort *rowB = (const GLushort *) srcRowB;
@@ -283,14 +425,8 @@ do_row(const struct gl_texture_format *format, GLint srcWidth,
             const GLint alpha = (rowAa0 + rowAa1 + rowBa0 + rowBa1) >> 2;
             dst[i] = (alpha << 15) | (blue << 10) | (green << 5) | red;
          }
-      }
-      return;
-   case MESA_FORMAT_AL88:
-   case MESA_FORMAT_AL88_REV:
-#if FEATURE_EXT_texture_sRGB
-   case MESA_FORMAT_SLA8:
-#endif
-      {
+   }
+   else if (datatype == GL_UNSIGNED_BYTE && comps == 2) {
          GLuint i, j, k;
          const GLubyte (*rowA)[2] = (const GLubyte (*)[2]) srcRowA;
          const GLubyte (*rowB)[2] = (const GLubyte (*)[2]) srcRowB;
@@ -302,10 +438,8 @@ do_row(const struct gl_texture_format *format, GLint srcWidth,
             dst[i][1] = (rowA[j][1] + rowA[k][1] +
                          rowB[j][1] + rowB[k][1]) >> 2;
          }
-      }
-      return;
-   case MESA_FORMAT_RGB332:
-      {
+   }
+   else if (datatype == GL_UNSIGNED_BYTE_3_3_2 && comps == 3) {
          GLuint i, j, k;
          const GLubyte *rowA = (const GLubyte *) srcRowA;
          const GLubyte *rowB = (const GLubyte *) srcRowB;
@@ -329,16 +463,8 @@ do_row(const struct gl_texture_format *format, GLint srcWidth,
             const GLint blue  = (rowAb0 + rowAb1 + rowBb0 + rowBb1) >> 2;
             dst[i] = (blue << 5) | (green << 2) | red;
          }
-      }
-      return;
-   case MESA_FORMAT_A8:
-   case MESA_FORMAT_L8:
-   case MESA_FORMAT_I8:
-   case MESA_FORMAT_CI8:
-#if FEATURE_EXT_texture_sRGB
-   case MESA_FORMAT_SL8:
-#endif
-      {
+   }
+   else if (datatype == GL_UNSIGNED_BYTE && comps == 1) {
          GLuint i, j, k;
          const GLubyte *rowA = (const GLubyte *) srcRowA;
          const GLubyte *rowB = (const GLubyte *) srcRowB;
@@ -347,10 +473,8 @@ do_row(const struct gl_texture_format *format, GLint srcWidth,
               i++, j += colStride, k += colStride) {
             dst[i] = (rowA[j] + rowA[k] + rowB[j] + rowB[k]) >> 2;
          }
-      }
-      return;
-   case MESA_FORMAT_RGBA_FLOAT32:
-      {
+   }
+   else if (datatype == GL_FLOAT && comps == 4) {
          GLuint i, j, k;
          const GLfloat (*rowA)[4] = (const GLfloat (*)[4]) srcRowA;
          const GLfloat (*rowB)[4] = (const GLfloat (*)[4]) srcRowB;
@@ -366,10 +490,8 @@ do_row(const struct gl_texture_format *format, GLint srcWidth,
             dst[i][3] = (rowA[j][3] + rowA[k][3] +
                          rowB[j][3] + rowB[k][3]) * 0.25F;
          }
-      }
-      return;
-   case MESA_FORMAT_RGBA_FLOAT16:
-      {
+   }
+   else if (datatype == GL_HALF_FLOAT_ARB && comps == 4) {
          GLuint i, j, k, comp;
          const GLhalfARB (*rowA)[4] = (const GLhalfARB (*)[4]) srcRowA;
          const GLhalfARB (*rowB)[4] = (const GLhalfARB (*)[4]) srcRowB;
@@ -385,10 +507,8 @@ do_row(const struct gl_texture_format *format, GLint srcWidth,
                dst[i][comp] = _mesa_float_to_half((aj + ak + bj + bk) * 0.25F);
             }
          }
-      }
-      return;
-   case MESA_FORMAT_RGB_FLOAT32:
-      {
+   }
+   else if (datatype == GL_FLOAT && comps == 3) {
          GLuint i, j, k;
          const GLfloat (*rowA)[3] = (const GLfloat (*)[3]) srcRowA;
          const GLfloat (*rowB)[3] = (const GLfloat (*)[3]) srcRowB;
@@ -402,10 +522,8 @@ do_row(const struct gl_texture_format *format, GLint srcWidth,
             dst[i][2] = (rowA[j][2] + rowA[k][2] +
                          rowB[j][2] + rowB[k][2]) * 0.25F;
          }
-      }
-      return;
-   case MESA_FORMAT_RGB_FLOAT16:
-      {
+   }
+   else if (datatype == GL_HALF_FLOAT_ARB && comps == 3) {
          GLuint i, j, k, comp;
          const GLhalfARB (*rowA)[3] = (const GLhalfARB (*)[3]) srcRowA;
          const GLhalfARB (*rowB)[3] = (const GLhalfARB (*)[3]) srcRowB;
@@ -421,10 +539,8 @@ do_row(const struct gl_texture_format *format, GLint srcWidth,
                dst[i][comp] = _mesa_float_to_half((aj + ak + bj + bk) * 0.25F);
             }
          }
-      }
-      return;
-   case MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32:
-      {
+   }
+   else if (datatype == GL_FLOAT && comps == 2) {
          GLuint i, j, k;
          const GLfloat (*rowA)[2] = (const GLfloat (*)[2]) srcRowA;
          const GLfloat (*rowB)[2] = (const GLfloat (*)[2]) srcRowB;
@@ -436,10 +552,8 @@ do_row(const struct gl_texture_format *format, GLint srcWidth,
             dst[i][1] = (rowA[j][1] + rowA[k][1] +
                          rowB[j][1] + rowB[k][1]) * 0.25F;
          }
-      }
-      return;
-   case MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16:
-      {
+   }
+   else if (datatype == GL_HALF_FLOAT_ARB && comps == 2) {
          GLuint i, j, k, comp;
          const GLhalfARB (*rowA)[2] = (const GLhalfARB (*)[2]) srcRowA;
          const GLhalfARB (*rowB)[2] = (const GLhalfARB (*)[2]) srcRowB;
@@ -455,12 +569,8 @@ do_row(const struct gl_texture_format *format, GLint srcWidth,
                dst[i][comp] = _mesa_float_to_half((aj + ak + bj + bk) * 0.25F);
             }
          }
-      }
-      return;
-   case MESA_FORMAT_ALPHA_FLOAT32:
-   case MESA_FORMAT_LUMINANCE_FLOAT32:
-   case MESA_FORMAT_INTENSITY_FLOAT32:
-      {
+   }
+   else if (datatype == GL_FLOAT && comps == 1) {
          GLuint i, j, k;
          const GLfloat *rowA = (const GLfloat *) srcRowA;
          const GLfloat *rowB = (const GLfloat *) srcRowB;
@@ -469,12 +579,8 @@ do_row(const struct gl_texture_format *format, GLint srcWidth,
               i++, j += colStride, k += colStride) {
             dst[i] = (rowA[j] + rowA[k] + rowB[j] + rowB[k]) * 0.25F;
          }
-      }
-      return;
-   case MESA_FORMAT_ALPHA_FLOAT16:
-   case MESA_FORMAT_LUMINANCE_FLOAT16:
-   case MESA_FORMAT_INTENSITY_FLOAT16:
-      {
+   }
+   else if (datatype == GL_HALF_FLOAT_ARB && comps == 1) {
          GLuint i, j, k;
          const GLhalfARB *rowA = (const GLhalfARB *) srcRowA;
          const GLhalfARB *rowB = (const GLhalfARB *) srcRowB;
@@ -488,10 +594,8 @@ do_row(const struct gl_texture_format *format, GLint srcWidth,
             bk = _mesa_half_to_float(rowB[k]);
             dst[i] = _mesa_float_to_half((aj + ak + bj + bk) * 0.25F);
          }
-      }
-      return;
-
-   default:
+   }
+   else {
       _mesa_problem(NULL, "bad format in do_row()");
    }
 }
@@ -504,11 +608,11 @@ do_row(const struct gl_texture_format *format, GLint srcWidth,
  */
 
 static void
-make_1d_mipmap(const struct gl_texture_format *format, GLint border,
+make_1d_mipmap(GLenum datatype, GLuint comps, GLint border,
                GLint srcWidth, const GLubyte *srcPtr,
                GLint dstWidth, GLubyte *dstPtr)
 {
-   const GLint bpt = format->TexelBytes;
+   const GLint bpt = bytes_per_pixel(datatype, comps);
    const GLubyte *src;
    GLubyte *dst;
 
@@ -517,7 +621,7 @@ make_1d_mipmap(const struct gl_texture_format *format, GLint border,
    dst = dstPtr + border * bpt;
 
    /* we just duplicate the input row, kind of hack, saves code */
-   do_row(format, srcWidth - 2 * border, src, src,
+   do_row(datatype, comps, srcWidth - 2 * border, src, src,
           dstWidth - 2 * border, dst);
 
    if (border) {
@@ -535,11 +639,11 @@ make_1d_mipmap(const struct gl_texture_format *format, GLint border,
  * XXX need to use the tex image's row stride!
  */
 static void
-make_2d_mipmap(const struct gl_texture_format *format, GLint border,
+make_2d_mipmap(GLenum datatype, GLuint comps, GLint border,
                GLint srcWidth, GLint srcHeight, const GLubyte *srcPtr,
                GLint dstWidth, GLint dstHeight, GLubyte *dstPtr)
 {
-   const GLint bpt = format->TexelBytes;
+   const GLint bpt = bytes_per_pixel(datatype, comps);
    const GLint srcWidthNB = srcWidth - 2 * border;  /* sizes w/out border */
    const GLint dstWidthNB = dstWidth - 2 * border;
    const GLint dstHeightNB = dstHeight - 2 * border;
@@ -558,7 +662,7 @@ make_2d_mipmap(const struct gl_texture_format *format, GLint border,
    dst = dstPtr + border * ((dstWidth + 1) * bpt);
 
    for (row = 0; row < dstHeightNB; row++) {
-      do_row(format, srcWidthNB, srcA, srcB,
+      do_row(datatype, comps, srcWidthNB, srcA, srcB,
              dstWidthNB, dst);
       srcA += 2 * srcRowStride;
       srcB += 2 * srcRowStride;
@@ -580,12 +684,12 @@ make_2d_mipmap(const struct gl_texture_format *format, GLint border,
       MEMCPY(dstPtr + (dstWidth * dstHeight - 1) * bpt,
              srcPtr + (srcWidth * srcHeight - 1) * bpt, bpt);
       /* lower border */
-      do_row(format, srcWidthNB,
+      do_row(datatype, comps, srcWidthNB,
              srcPtr + bpt,
              srcPtr + bpt,
              dstWidthNB, dstPtr + bpt);
       /* upper border */
-      do_row(format, srcWidthNB,
+      do_row(datatype, comps, srcWidthNB,
              srcPtr + (srcWidth * (srcHeight - 1) + 1) * bpt,
              srcPtr + (srcWidth * (srcHeight - 1) + 1) * bpt,
              dstWidthNB,
@@ -603,11 +707,11 @@ make_2d_mipmap(const struct gl_texture_format *format, GLint border,
       else {
          /* average two src pixels each dest pixel */
          for (row = 0; row < dstHeightNB; row += 2) {
-            do_row(format, 1,
+            do_row(datatype, comps, 1,
                    srcPtr + (srcWidth * (row * 2 + 1)) * bpt,
                    srcPtr + (srcWidth * (row * 2 + 2)) * bpt,
                    1, dstPtr + (dstWidth * row + 1) * bpt);
-            do_row(format, 1,
+            do_row(datatype, comps, 1,
                    srcPtr + (srcWidth * (row * 2 + 1) + srcWidth - 1) * bpt,
                    srcPtr + (srcWidth * (row * 2 + 2) + srcWidth - 1) * bpt,
                    1, dstPtr + (dstWidth * row + 1 + dstWidth - 1) * bpt);
@@ -618,13 +722,13 @@ make_2d_mipmap(const struct gl_texture_format *format, GLint border,
 
 
 static void
-make_3d_mipmap(const struct gl_texture_format *format, GLint border,
+make_3d_mipmap(GLenum datatype, GLuint comps, GLint border,
                GLint srcWidth, GLint srcHeight, GLint srcDepth,
                const GLubyte *srcPtr,
                GLint dstWidth, GLint dstHeight, GLint dstDepth,
                GLubyte *dstPtr)
 {
-   const GLint bpt = format->TexelBytes;
+   const GLint bpt = bytes_per_pixel(datatype, comps);
    const GLint srcWidthNB = srcWidth - 2 * border;  /* sizes w/out border */
    const GLint srcDepthNB = srcDepth - 2 * border;
    const GLint dstWidthNB = dstWidth - 2 * border;
@@ -694,13 +798,13 @@ make_3d_mipmap(const struct gl_texture_format *format, GLint border,
 
       for (row = 0; row < dstHeightNB; row++) {
          /* Average together two rows from first src image */
-         do_row(format, srcWidthNB, srcImgARowA, srcImgARowB,
+         do_row(datatype, comps, srcWidthNB, srcImgARowA, srcImgARowB,
                 srcWidthNB, tmpRowA);
          /* Average together two rows from second src image */
-         do_row(format, srcWidthNB, srcImgBRowA, srcImgBRowB,
+         do_row(datatype, comps, srcWidthNB, srcImgBRowA, srcImgBRowB,
                 srcWidthNB, tmpRowB);
          /* Average together the temp rows to make the final row */
-         do_row(format, srcWidthNB, tmpRowA, tmpRowB,
+         do_row(datatype, comps, srcWidthNB, tmpRowA, tmpRowB,
                 dstWidthNB, dstImgRow);
          /* advance to next rows */
          srcImgARowA += bytesPerSrcRow + srcRowOffset;
@@ -717,10 +821,10 @@ make_3d_mipmap(const struct gl_texture_format *format, GLint border,
    /* Luckily we can leverage the make_2d_mipmap() function here! */
    if (border > 0) {
       /* do front border image */
-      make_2d_mipmap(format, 1, srcWidth, srcHeight, srcPtr,
+      make_2d_mipmap(datatype, comps, 1, srcWidth, srcHeight, srcPtr,
                      dstWidth, dstHeight, dstPtr);
       /* do back border image */
-      make_2d_mipmap(format, 1, srcWidth, srcHeight,
+      make_2d_mipmap(datatype, comps, 1, srcWidth, srcHeight,
                      srcPtr + bytesPerSrcImage * (srcDepth - 1),
                      dstWidth, dstHeight,
                      dstPtr + bytesPerDstImage * (dstDepth - 1));
@@ -768,28 +872,28 @@ make_3d_mipmap(const struct gl_texture_format *format, GLint border,
             /* do border along [img][row=0][col=0] */
             src = srcPtr + (img * 2 + 1) * bytesPerSrcImage;
             dst = dstPtr + (img + 1) * bytesPerDstImage;
-            do_row(format, 1, src, src + srcImageOffset, 1, dst);
+            do_row(datatype, comps, 1, src, src + srcImageOffset, 1, dst);
 
             /* do border along [img][row=dstHeight-1][col=0] */
             src = srcPtr + (img * 2 + 1) * bytesPerSrcImage
                          + (srcHeight - 1) * bytesPerSrcRow;
             dst = dstPtr + (img + 1) * bytesPerDstImage
                          + (dstHeight - 1) * bytesPerDstRow;
-            do_row(format, 1, src, src + srcImageOffset, 1, dst);
+            do_row(datatype, comps, 1, src, src + srcImageOffset, 1, dst);
 
             /* do border along [img][row=0][col=dstWidth-1] */
             src = srcPtr + (img * 2 + 1) * bytesPerSrcImage
                          + (srcWidth - 1) * bpt;
             dst = dstPtr + (img + 1) * bytesPerDstImage
                          + (dstWidth - 1) * bpt;
-            do_row(format, 1, src, src + srcImageOffset, 1, dst);
+            do_row(datatype, comps, 1, src, src + srcImageOffset, 1, dst);
 
             /* do border along [img][row=dstHeight-1][col=dstWidth-1] */
             src = srcPtr + (img * 2 + 1) * bytesPerSrcImage
                          + (bytesPerSrcImage - bpt);
             dst = dstPtr + (img + 1) * bytesPerDstImage
                          + (bytesPerDstImage - bpt);
-            do_row(format, 1, src, src + srcImageOffset, 1, dst);
+            do_row(datatype, comps, 1, src, src + srcImageOffset, 1, dst);
          }
       }
    }
@@ -797,11 +901,11 @@ make_3d_mipmap(const struct gl_texture_format *format, GLint border,
 
 
 static void
-make_1d_stack_mipmap(const struct gl_texture_format *format, GLint border,
+make_1d_stack_mipmap(GLenum datatype, GLuint comps, GLint border,
                      GLint srcWidth, const GLubyte *srcPtr,
                      GLint dstWidth, GLint dstHeight, GLubyte *dstPtr)
 {
-   const GLint bpt = format->TexelBytes;
+   const GLint bpt = bytes_per_pixel(datatype, comps);
    const GLint srcWidthNB = srcWidth - 2 * border;  /* sizes w/out border */
    const GLint dstWidthNB = dstWidth - 2 * border;
    const GLint dstHeightNB = dstHeight - 2 * border;
@@ -816,7 +920,7 @@ make_1d_stack_mipmap(const struct gl_texture_format *format, GLint border,
    dst = dstPtr + border * ((dstWidth + 1) * bpt);
 
    for (row = 0; row < dstHeightNB; row++) {
-      do_row(format, srcWidthNB, src, src,
+      do_row(datatype, comps, srcWidthNB, src, src,
              dstWidthNB, dst);
       src += srcRowStride;
       dst += dstRowStride;
@@ -839,12 +943,12 @@ make_1d_stack_mipmap(const struct gl_texture_format *format, GLint border,
  * and \c make_2d_mipmap.
  */
 static void
-make_2d_stack_mipmap(const struct gl_texture_format *format, GLint border,
+make_2d_stack_mipmap(GLenum datatype, GLuint comps, GLint border,
                      GLint srcWidth, GLint srcHeight, const GLubyte *srcPtr,
                      GLint dstWidth, GLint dstHeight, GLint dstDepth,
                      GLubyte *dstPtr)
 {
-   const GLint bpt = format->TexelBytes;
+   const GLint bpt = bytes_per_pixel(datatype, comps);
    const GLint srcWidthNB = srcWidth - 2 * border;  /* sizes w/out border */
    const GLint dstWidthNB = dstWidth - 2 * border;
    const GLint dstHeightNB = dstHeight - 2 * border;
@@ -866,7 +970,7 @@ make_2d_stack_mipmap(const struct gl_texture_format *format, GLint border,
 
    for (layer = 0; layer < dstDepthNB; layer++) {
       for (row = 0; row < dstHeightNB; row++) {
-         do_row(format, srcWidthNB, srcA, srcB,
+         do_row(datatype, comps, srcWidthNB, srcA, srcB,
                 dstWidthNB, dst);
          srcA += 2 * srcRowStride;
          srcB += 2 * srcRowStride;
@@ -888,12 +992,12 @@ make_2d_stack_mipmap(const struct gl_texture_format *format, GLint border,
          MEMCPY(dstPtr + (dstWidth * dstHeight - 1) * bpt,
                 srcPtr + (srcWidth * srcHeight - 1) * bpt, bpt);
          /* lower border */
-         do_row(format, srcWidthNB,
+         do_row(datatype, comps, srcWidthNB,
                 srcPtr + bpt,
                 srcPtr + bpt,
                 dstWidthNB, dstPtr + bpt);
          /* upper border */
-         do_row(format, srcWidthNB,
+         do_row(datatype, comps, srcWidthNB,
                 srcPtr + (srcWidth * (srcHeight - 1) + 1) * bpt,
                 srcPtr + (srcWidth * (srcHeight - 1) + 1) * bpt,
                 dstWidthNB,
@@ -911,11 +1015,11 @@ make_2d_stack_mipmap(const struct gl_texture_format *format, GLint border,
          else {
             /* average two src pixels each dest pixel */
             for (row = 0; row < dstHeightNB; row += 2) {
-               do_row(format, 1,
+               do_row(datatype, comps, 1,
                       srcPtr + (srcWidth * (row * 2 + 1)) * bpt,
                       srcPtr + (srcWidth * (row * 2 + 2)) * bpt,
                       1, dstPtr + (dstWidth * row + 1) * bpt);
-               do_row(format, 1,
+               do_row(datatype, comps, 1,
                       srcPtr + (srcWidth * (row * 2 + 1) + srcWidth - 1) * bpt,
                       srcPtr + (srcWidth * (row * 2 + 2) + srcWidth - 1) * bpt,
                       1, dstPtr + (dstWidth * row + 1 + dstWidth - 1) * bpt);
@@ -940,6 +1044,8 @@ _mesa_generate_mipmap(GLcontext *ctx, GLenum target,
    const GLubyte *srcData = NULL;
    GLubyte *dstData = NULL;
    GLint level, maxLevels;
+   GLenum datatype;
+   GLuint comps;
 
    ASSERT(texObj);
    /* XXX choose cube map face here??? */
@@ -1002,6 +1108,8 @@ _mesa_generate_mipmap(GLcontext *ctx, GLenum target,
       convertFormat = srcImage->TexFormat;
    }
 
+   mesa_format_to_type_and_comps(convertFormat, &datatype, &comps);
+
    for (level = texObj->BaseLevel; level < texObj->MaxLevel
            && level < maxLevels - 1; level++) {
       /* generate image[level+1] from image[level] */
@@ -1118,7 +1226,7 @@ _mesa_generate_mipmap(GLcontext *ctx, GLenum target,
        */
       switch (target) {
          case GL_TEXTURE_1D:
-            make_1d_mipmap(convertFormat, border,
+            make_1d_mipmap(datatype, comps, border,
                            srcWidth, srcData,
                            dstWidth, dstData);
             break;
@@ -1129,22 +1237,22 @@ _mesa_generate_mipmap(GLcontext *ctx, GLenum target,
          case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB:
          case GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB:
          case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB:
-            make_2d_mipmap(convertFormat, border,
+            make_2d_mipmap(datatype, comps, border,
                            srcWidth, srcHeight, srcData,
                            dstWidth, dstHeight, dstData);
             break;
          case GL_TEXTURE_3D:
-            make_3d_mipmap(convertFormat, border,
+            make_3d_mipmap(datatype, comps, border,
                            srcWidth, srcHeight, srcDepth, srcData,
                            dstWidth, dstHeight, dstDepth, dstData);
             break;
          case GL_TEXTURE_1D_ARRAY_EXT:
-            make_1d_stack_mipmap(convertFormat, border,
+            make_1d_stack_mipmap(datatype, comps, border,
                                  srcWidth, srcData,
                                  dstWidth, dstHeight, dstData);
             break;
          case GL_TEXTURE_2D_ARRAY_EXT:
-            make_2d_stack_mipmap(convertFormat, border,
+            make_2d_stack_mipmap(datatype, comps, border,
                                  srcWidth, srcHeight, srcData,
                                  dstWidth, dstHeight, dstDepth, dstData);
             break;
-- 
cgit v1.2.3


From ed6e72e8556a961ad31c80ae3c0582878ce64bf3 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Fri, 8 Feb 2008 16:38:28 -0700
Subject: checkpoint- consolidation in do_row()

---
 src/mesa/main/mipmap.c | 42 ++++++++++++++++--------------------------
 1 file changed, 16 insertions(+), 26 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index 013dc3752e..c5f1c5bcbe 100644
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -234,11 +234,11 @@ do_row(GLenum datatype, GLuint comps, GLint srcWidth,
    assert(srcWidth == dstWidth || srcWidth == 2 * dstWidth);
    */
 
-   if (datatype == CHAN_TYPE && comps == 4) {
+   if (datatype == GL_UNSIGNED_SHORT && comps == 4) {
          GLuint i, j, k;
-         const GLchan (*rowA)[4] = (const GLchan (*)[4]) srcRowA;
-         const GLchan (*rowB)[4] = (const GLchan (*)[4]) srcRowB;
-         GLchan (*dst)[4] = (GLchan (*)[4]) dstRow;
+         const GLushort (*rowA)[4] = (const GLushort (*)[4]) srcRowA;
+         const GLushort (*rowB)[4] = (const GLushort (*)[4]) srcRowB;
+         GLushort (*dst)[4] = (GLushort (*)[4]) dstRow;
          for (i = j = 0, k = k0; i < (GLuint) dstWidth;
               i++, j += colStride, k += colStride) {
             dst[i][0] = (rowA[j][0] + rowA[k][0] +
@@ -251,11 +251,11 @@ do_row(GLenum datatype, GLuint comps, GLint srcWidth,
                          rowB[j][3] + rowB[k][3]) / 4;
          }
    }
-   else if (datatype == CHAN_TYPE && comps == 3) {
+   else if (datatype == GL_UNSIGNED_SHORT && comps == 3) {
          GLuint i, j, k;
-         const GLchan (*rowA)[3] = (const GLchan (*)[3]) srcRowA;
-         const GLchan (*rowB)[3] = (const GLchan (*)[3]) srcRowB;
-         GLchan (*dst)[3] = (GLchan (*)[3]) dstRow;
+         const GLushort (*rowA)[3] = (const GLushort (*)[3]) srcRowA;
+         const GLushort (*rowB)[3] = (const GLushort (*)[3]) srcRowB;
+         GLushort (*dst)[3] = (GLushort (*)[3]) dstRow;
          for (i = j = 0, k = k0; i < (GLuint) dstWidth;
               i++, j += colStride, k += colStride) {
             dst[i][0] = (rowA[j][0] + rowA[k][0] +
@@ -266,21 +266,21 @@ do_row(GLenum datatype, GLuint comps, GLint srcWidth,
                          rowB[j][2] + rowB[k][2]) / 4;
          }
    }
-   else if (datatype == CHAN_TYPE && comps == 1) {
+   else if (datatype == GL_UNSIGNED_SHORT && comps == 1) {
          GLuint i, j, k;
-         const GLchan *rowA = (const GLchan *) srcRowA;
-         const GLchan *rowB = (const GLchan *) srcRowB;
-         GLchan *dst = (GLchan *) dstRow;
+         const GLushort *rowA = (const GLushort *) srcRowA;
+         const GLushort *rowB = (const GLushort *) srcRowB;
+         GLushort *dst = (GLushort *) dstRow;
          for (i = j = 0, k = k0; i < (GLuint) dstWidth;
               i++, j += colStride, k += colStride) {
             dst[i] = (rowA[j] + rowA[k] + rowB[j] + rowB[k]) / 4;
          }
    }
-   else if (datatype == CHAN_TYPE && comps == 2) {
+   else if (datatype == GL_UNSIGNED_SHORT && comps == 2) {
          GLuint i, j, k;
-         const GLchan (*rowA)[2] = (const GLchan (*)[2]) srcRowA;
-         const GLchan (*rowB)[2] = (const GLchan (*)[2]) srcRowB;
-         GLchan (*dst)[2] = (GLchan (*)[2]) dstRow;
+         const GLushort (*rowA)[2] = (const GLushort (*)[2]) srcRowA;
+         const GLushort (*rowB)[2] = (const GLushort (*)[2]) srcRowB;
+         GLushort (*dst)[2] = (GLushort (*)[2]) dstRow;
          for (i = j = 0, k = k0; i < (GLuint) dstWidth;
               i++, j += colStride, k += colStride) {
             dst[i][0] = (rowA[j][0] + rowA[k][0] +
@@ -299,16 +299,6 @@ do_row(GLenum datatype, GLuint comps, GLint srcWidth,
             dst[i] = rowA[j] / 4 + rowA[k] / 4 + rowB[j] / 4 + rowB[k] / 4;
          }
    }
-   else if (datatype == GL_UNSIGNED_SHORT && comps == 1) {
-         GLuint i, j, k;
-         const GLushort *rowA = (const GLushort *) srcRowA;
-         const GLushort *rowB = (const GLushort *) srcRowB;
-         GLushort *dst = (GLushort *) dstRow;
-         for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-              i++, j += colStride, k += colStride) {
-            dst[i] = (rowA[j] + rowA[k] + rowB[j] + rowB[k]) / 4;
-         }
-   }
    else if (datatype == GL_UNSIGNED_BYTE && comps == 4) {
          GLuint i, j, k;
          const GLubyte (*rowA)[4] = (const GLubyte (*)[4]) srcRowA;
-- 
cgit v1.2.3


From 30dff589a447529232016f3e792378fd8fa67820 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Fri, 8 Feb 2008 16:40:39 -0700
Subject: re-indent do_row()

---
 src/mesa/main/mipmap.c | 594 ++++++++++++++++++++++++-------------------------
 1 file changed, 288 insertions(+), 306 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index c5f1c5bcbe..22c7530e83 100644
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -235,355 +235,337 @@ do_row(GLenum datatype, GLuint comps, GLint srcWidth,
    */
 
    if (datatype == GL_UNSIGNED_SHORT && comps == 4) {
-         GLuint i, j, k;
-         const GLushort (*rowA)[4] = (const GLushort (*)[4]) srcRowA;
-         const GLushort (*rowB)[4] = (const GLushort (*)[4]) srcRowB;
-         GLushort (*dst)[4] = (GLushort (*)[4]) dstRow;
-         for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-              i++, j += colStride, k += colStride) {
-            dst[i][0] = (rowA[j][0] + rowA[k][0] +
-                         rowB[j][0] + rowB[k][0]) / 4;
-            dst[i][1] = (rowA[j][1] + rowA[k][1] +
-                         rowB[j][1] + rowB[k][1]) / 4;
-            dst[i][2] = (rowA[j][2] + rowA[k][2] +
-                         rowB[j][2] + rowB[k][2]) / 4;
-            dst[i][3] = (rowA[j][3] + rowA[k][3] +
-                         rowB[j][3] + rowB[k][3]) / 4;
-         }
+      GLuint i, j, k;
+      const GLushort(*rowA)[4] = (const GLushort(*)[4]) srcRowA;
+      const GLushort(*rowB)[4] = (const GLushort(*)[4]) srcRowB;
+      GLushort(*dst)[4] = (GLushort(*)[4]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;
+         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;
+         dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;
+         dst[i][3] = (rowA[j][3] + rowA[k][3] + rowB[j][3] + rowB[k][3]) / 4;
+      }
    }
    else if (datatype == GL_UNSIGNED_SHORT && comps == 3) {
-         GLuint i, j, k;
-         const GLushort (*rowA)[3] = (const GLushort (*)[3]) srcRowA;
-         const GLushort (*rowB)[3] = (const GLushort (*)[3]) srcRowB;
-         GLushort (*dst)[3] = (GLushort (*)[3]) dstRow;
-         for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-              i++, j += colStride, k += colStride) {
-            dst[i][0] = (rowA[j][0] + rowA[k][0] +
-                         rowB[j][0] + rowB[k][0]) / 4;
-            dst[i][1] = (rowA[j][1] + rowA[k][1] +
-                         rowB[j][1] + rowB[k][1]) / 4;
-            dst[i][2] = (rowA[j][2] + rowA[k][2] +
-                         rowB[j][2] + rowB[k][2]) / 4;
-         }
+      GLuint i, j, k;
+      const GLushort(*rowA)[3] = (const GLushort(*)[3]) srcRowA;
+      const GLushort(*rowB)[3] = (const GLushort(*)[3]) srcRowB;
+      GLushort(*dst)[3] = (GLushort(*)[3]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;
+         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;
+         dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;
+      }
    }
    else if (datatype == GL_UNSIGNED_SHORT && comps == 1) {
-         GLuint i, j, k;
-         const GLushort *rowA = (const GLushort *) srcRowA;
-         const GLushort *rowB = (const GLushort *) srcRowB;
-         GLushort *dst = (GLushort *) dstRow;
-         for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-              i++, j += colStride, k += colStride) {
-            dst[i] = (rowA[j] + rowA[k] + rowB[j] + rowB[k]) / 4;
-         }
+      GLuint i, j, k;
+      const GLushort *rowA = (const GLushort *) srcRowA;
+      const GLushort *rowB = (const GLushort *) srcRowB;
+      GLushort *dst = (GLushort *) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i] = (rowA[j] + rowA[k] + rowB[j] + rowB[k]) / 4;
+      }
    }
    else if (datatype == GL_UNSIGNED_SHORT && comps == 2) {
-         GLuint i, j, k;
-         const GLushort (*rowA)[2] = (const GLushort (*)[2]) srcRowA;
-         const GLushort (*rowB)[2] = (const GLushort (*)[2]) srcRowB;
-         GLushort (*dst)[2] = (GLushort (*)[2]) dstRow;
-         for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-              i++, j += colStride, k += colStride) {
-            dst[i][0] = (rowA[j][0] + rowA[k][0] +
-                         rowB[j][0] + rowB[k][0]) / 4;
-            dst[i][1] = (rowA[j][1] + rowA[k][1] +
-                         rowB[j][1] + rowB[k][1]) / 4;
-         }
+      GLuint i, j, k;
+      const GLushort(*rowA)[2] = (const GLushort(*)[2]) srcRowA;
+      const GLushort(*rowB)[2] = (const GLushort(*)[2]) srcRowB;
+      GLushort(*dst)[2] = (GLushort(*)[2]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;
+         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;
+      }
    }
    else if (datatype == GL_UNSIGNED_INT && comps == 1) {
-         GLuint i, j, k;
-         const GLuint *rowA = (const GLuint *) srcRowA;
-         const GLuint *rowB = (const GLuint *) srcRowB;
-         GLfloat *dst = (GLfloat *) dstRow;
-         for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-              i++, j += colStride, k += colStride) {
-            dst[i] = rowA[j] / 4 + rowA[k] / 4 + rowB[j] / 4 + rowB[k] / 4;
-         }
+      GLuint i, j, k;
+      const GLuint *rowA = (const GLuint *) srcRowA;
+      const GLuint *rowB = (const GLuint *) srcRowB;
+      GLfloat *dst = (GLfloat *) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i] = rowA[j] / 4 + rowA[k] / 4 + rowB[j] / 4 + rowB[k] / 4;
+      }
    }
    else if (datatype == GL_UNSIGNED_BYTE && comps == 4) {
-         GLuint i, j, k;
-         const GLubyte (*rowA)[4] = (const GLubyte (*)[4]) srcRowA;
-         const GLubyte (*rowB)[4] = (const GLubyte (*)[4]) srcRowB;
-         GLubyte (*dst)[4] = (GLubyte (*)[4]) dstRow;
-         for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-              i++, j += colStride, k += colStride) {
-            dst[i][0] = (rowA[j][0] + rowA[k][0] +
-                         rowB[j][0] + rowB[k][0]) / 4;
-            dst[i][1] = (rowA[j][1] + rowA[k][1] +
-                         rowB[j][1] + rowB[k][1]) / 4;
-            dst[i][2] = (rowA[j][2] + rowA[k][2] +
-                         rowB[j][2] + rowB[k][2]) / 4;
-            dst[i][3] = (rowA[j][3] + rowA[k][3] +
-                         rowB[j][3] + rowB[k][3]) / 4;
-         }
+      GLuint i, j, k;
+      const GLubyte(*rowA)[4] = (const GLubyte(*)[4]) srcRowA;
+      const GLubyte(*rowB)[4] = (const GLubyte(*)[4]) srcRowB;
+      GLubyte(*dst)[4] = (GLubyte(*)[4]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;
+         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;
+         dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;
+         dst[i][3] = (rowA[j][3] + rowA[k][3] + rowB[j][3] + rowB[k][3]) / 4;
+      }
    }
    else if (datatype == GL_UNSIGNED_BYTE && comps == 3) {
-         GLuint i, j, k;
-         const GLubyte (*rowA)[3] = (const GLubyte (*)[3]) srcRowA;
-         const GLubyte (*rowB)[3] = (const GLubyte (*)[3]) srcRowB;
-         GLubyte (*dst)[3] = (GLubyte (*)[3]) dstRow;
-         for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-              i++, j += colStride, k += colStride) {
-            dst[i][0] = (rowA[j][0] + rowA[k][0] +
-                         rowB[j][0] + rowB[k][0]) / 4;
-            dst[i][1] = (rowA[j][1] + rowA[k][1] +
-                         rowB[j][1] + rowB[k][1]) / 4;
-            dst[i][2] = (rowA[j][2] + rowA[k][2] +
-                         rowB[j][2] + rowB[k][2]) / 4;
-         }
+      GLuint i, j, k;
+      const GLubyte(*rowA)[3] = (const GLubyte(*)[3]) srcRowA;
+      const GLubyte(*rowB)[3] = (const GLubyte(*)[3]) srcRowB;
+      GLubyte(*dst)[3] = (GLubyte(*)[3]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;
+         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;
+         dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;
+      }
    }
    else if (datatype == GL_UNSIGNED_SHORT_5_6_5 && comps == 3) {
-         GLuint i, j, k;
-         const GLushort *rowA = (const GLushort *) srcRowA;
-         const GLushort *rowB = (const GLushort *) srcRowB;
-         GLushort *dst = (GLushort *) dstRow;
-         for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-              i++, j += colStride, k += colStride) {
-            const GLint rowAr0 = rowA[j] & 0x1f;
-            const GLint rowAr1 = rowA[k] & 0x1f;
-            const GLint rowBr0 = rowB[j] & 0x1f;
-            const GLint rowBr1 = rowB[k] & 0x1f;
-            const GLint rowAg0 = (rowA[j] >> 5) & 0x3f;
-            const GLint rowAg1 = (rowA[k] >> 5) & 0x3f;
-            const GLint rowBg0 = (rowB[j] >> 5) & 0x3f;
-            const GLint rowBg1 = (rowB[k] >> 5) & 0x3f;
-            const GLint rowAb0 = (rowA[j] >> 11) & 0x1f;
-            const GLint rowAb1 = (rowA[k] >> 11) & 0x1f;
-            const GLint rowBb0 = (rowB[j] >> 11) & 0x1f;
-            const GLint rowBb1 = (rowB[k] >> 11) & 0x1f;
-            const GLint red   = (rowAr0 + rowAr1 + rowBr0 + rowBr1) >> 2;
-            const GLint green = (rowAg0 + rowAg1 + rowBg0 + rowBg1) >> 2;
-            const GLint blue  = (rowAb0 + rowAb1 + rowBb0 + rowBb1) >> 2;
-            dst[i] = (blue << 11) | (green << 5) | red;
-         }
+      GLuint i, j, k;
+      const GLushort *rowA = (const GLushort *) srcRowA;
+      const GLushort *rowB = (const GLushort *) srcRowB;
+      GLushort *dst = (GLushort *) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         const GLint rowAr0 = rowA[j] & 0x1f;
+         const GLint rowAr1 = rowA[k] & 0x1f;
+         const GLint rowBr0 = rowB[j] & 0x1f;
+         const GLint rowBr1 = rowB[k] & 0x1f;
+         const GLint rowAg0 = (rowA[j] >> 5) & 0x3f;
+         const GLint rowAg1 = (rowA[k] >> 5) & 0x3f;
+         const GLint rowBg0 = (rowB[j] >> 5) & 0x3f;
+         const GLint rowBg1 = (rowB[k] >> 5) & 0x3f;
+         const GLint rowAb0 = (rowA[j] >> 11) & 0x1f;
+         const GLint rowAb1 = (rowA[k] >> 11) & 0x1f;
+         const GLint rowBb0 = (rowB[j] >> 11) & 0x1f;
+         const GLint rowBb1 = (rowB[k] >> 11) & 0x1f;
+         const GLint red = (rowAr0 + rowAr1 + rowBr0 + rowBr1) >> 2;
+         const GLint green = (rowAg0 + rowAg1 + rowBg0 + rowBg1) >> 2;
+         const GLint blue = (rowAb0 + rowAb1 + rowBb0 + rowBb1) >> 2;
+         dst[i] = (blue << 11) | (green << 5) | red;
+      }
    }
    else if (datatype == GL_UNSIGNED_SHORT_4_4_4_4 && comps == 4) {
-         GLuint i, j, k;
-         const GLushort *rowA = (const GLushort *) srcRowA;
-         const GLushort *rowB = (const GLushort *) srcRowB;
-         GLushort *dst = (GLushort *) dstRow;
-         for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-              i++, j += colStride, k += colStride) {
-            const GLint rowAr0 = rowA[j] & 0xf;
-            const GLint rowAr1 = rowA[k] & 0xf;
-            const GLint rowBr0 = rowB[j] & 0xf;
-            const GLint rowBr1 = rowB[k] & 0xf;
-            const GLint rowAg0 = (rowA[j] >> 4) & 0xf;
-            const GLint rowAg1 = (rowA[k] >> 4) & 0xf;
-            const GLint rowBg0 = (rowB[j] >> 4) & 0xf;
-            const GLint rowBg1 = (rowB[k] >> 4) & 0xf;
-            const GLint rowAb0 = (rowA[j] >> 8) & 0xf;
-            const GLint rowAb1 = (rowA[k] >> 8) & 0xf;
-            const GLint rowBb0 = (rowB[j] >> 8) & 0xf;
-            const GLint rowBb1 = (rowB[k] >> 8) & 0xf;
-            const GLint rowAa0 = (rowA[j] >> 12) & 0xf;
-            const GLint rowAa1 = (rowA[k] >> 12) & 0xf;
-            const GLint rowBa0 = (rowB[j] >> 12) & 0xf;
-            const GLint rowBa1 = (rowB[k] >> 12) & 0xf;
-            const GLint red   = (rowAr0 + rowAr1 + rowBr0 + rowBr1) >> 2;
-            const GLint green = (rowAg0 + rowAg1 + rowBg0 + rowBg1) >> 2;
-            const GLint blue  = (rowAb0 + rowAb1 + rowBb0 + rowBb1) >> 2;
-            const GLint alpha = (rowAa0 + rowAa1 + rowBa0 + rowBa1) >> 2;
-            dst[i] = (alpha << 12) | (blue << 8) | (green << 4) | red;
-         }
+      GLuint i, j, k;
+      const GLushort *rowA = (const GLushort *) srcRowA;
+      const GLushort *rowB = (const GLushort *) srcRowB;
+      GLushort *dst = (GLushort *) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         const GLint rowAr0 = rowA[j] & 0xf;
+         const GLint rowAr1 = rowA[k] & 0xf;
+         const GLint rowBr0 = rowB[j] & 0xf;
+         const GLint rowBr1 = rowB[k] & 0xf;
+         const GLint rowAg0 = (rowA[j] >> 4) & 0xf;
+         const GLint rowAg1 = (rowA[k] >> 4) & 0xf;
+         const GLint rowBg0 = (rowB[j] >> 4) & 0xf;
+         const GLint rowBg1 = (rowB[k] >> 4) & 0xf;
+         const GLint rowAb0 = (rowA[j] >> 8) & 0xf;
+         const GLint rowAb1 = (rowA[k] >> 8) & 0xf;
+         const GLint rowBb0 = (rowB[j] >> 8) & 0xf;
+         const GLint rowBb1 = (rowB[k] >> 8) & 0xf;
+         const GLint rowAa0 = (rowA[j] >> 12) & 0xf;
+         const GLint rowAa1 = (rowA[k] >> 12) & 0xf;
+         const GLint rowBa0 = (rowB[j] >> 12) & 0xf;
+         const GLint rowBa1 = (rowB[k] >> 12) & 0xf;
+         const GLint red = (rowAr0 + rowAr1 + rowBr0 + rowBr1) >> 2;
+         const GLint green = (rowAg0 + rowAg1 + rowBg0 + rowBg1) >> 2;
+         const GLint blue = (rowAb0 + rowAb1 + rowBb0 + rowBb1) >> 2;
+         const GLint alpha = (rowAa0 + rowAa1 + rowBa0 + rowBa1) >> 2;
+         dst[i] = (alpha << 12) | (blue << 8) | (green << 4) | red;
+      }
    }
    else if (datatype == GL_UNSIGNED_SHORT_1_5_5_5_REV && comps == 4) {
-         GLuint i, j, k;
-         const GLushort *rowA = (const GLushort *) srcRowA;
-         const GLushort *rowB = (const GLushort *) srcRowB;
-         GLushort *dst = (GLushort *) dstRow;
-         for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-              i++, j += colStride, k += colStride) {
-            const GLint rowAr0 = rowA[j] & 0x1f;
-            const GLint rowAr1 = rowA[k] & 0x1f;
-            const GLint rowBr0 = rowB[j] & 0x1f;
-            const GLint rowBr1 = rowB[k] & 0xf;
-            const GLint rowAg0 = (rowA[j] >> 5) & 0x1f;
-            const GLint rowAg1 = (rowA[k] >> 5) & 0x1f;
-            const GLint rowBg0 = (rowB[j] >> 5) & 0x1f;
-            const GLint rowBg1 = (rowB[k] >> 5) & 0x1f;
-            const GLint rowAb0 = (rowA[j] >> 10) & 0x1f;
-            const GLint rowAb1 = (rowA[k] >> 10) & 0x1f;
-            const GLint rowBb0 = (rowB[j] >> 10) & 0x1f;
-            const GLint rowBb1 = (rowB[k] >> 10) & 0x1f;
-            const GLint rowAa0 = (rowA[j] >> 15) & 0x1;
-            const GLint rowAa1 = (rowA[k] >> 15) & 0x1;
-            const GLint rowBa0 = (rowB[j] >> 15) & 0x1;
-            const GLint rowBa1 = (rowB[k] >> 15) & 0x1;
-            const GLint red   = (rowAr0 + rowAr1 + rowBr0 + rowBr1) >> 2;
-            const GLint green = (rowAg0 + rowAg1 + rowBg0 + rowBg1) >> 2;
-            const GLint blue  = (rowAb0 + rowAb1 + rowBb0 + rowBb1) >> 2;
-            const GLint alpha = (rowAa0 + rowAa1 + rowBa0 + rowBa1) >> 2;
-            dst[i] = (alpha << 15) | (blue << 10) | (green << 5) | red;
-         }
+      GLuint i, j, k;
+      const GLushort *rowA = (const GLushort *) srcRowA;
+      const GLushort *rowB = (const GLushort *) srcRowB;
+      GLushort *dst = (GLushort *) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         const GLint rowAr0 = rowA[j] & 0x1f;
+         const GLint rowAr1 = rowA[k] & 0x1f;
+         const GLint rowBr0 = rowB[j] & 0x1f;
+         const GLint rowBr1 = rowB[k] & 0xf;
+         const GLint rowAg0 = (rowA[j] >> 5) & 0x1f;
+         const GLint rowAg1 = (rowA[k] >> 5) & 0x1f;
+         const GLint rowBg0 = (rowB[j] >> 5) & 0x1f;
+         const GLint rowBg1 = (rowB[k] >> 5) & 0x1f;
+         const GLint rowAb0 = (rowA[j] >> 10) & 0x1f;
+         const GLint rowAb1 = (rowA[k] >> 10) & 0x1f;
+         const GLint rowBb0 = (rowB[j] >> 10) & 0x1f;
+         const GLint rowBb1 = (rowB[k] >> 10) & 0x1f;
+         const GLint rowAa0 = (rowA[j] >> 15) & 0x1;
+         const GLint rowAa1 = (rowA[k] >> 15) & 0x1;
+         const GLint rowBa0 = (rowB[j] >> 15) & 0x1;
+         const GLint rowBa1 = (rowB[k] >> 15) & 0x1;
+         const GLint red = (rowAr0 + rowAr1 + rowBr0 + rowBr1) >> 2;
+         const GLint green = (rowAg0 + rowAg1 + rowBg0 + rowBg1) >> 2;
+         const GLint blue = (rowAb0 + rowAb1 + rowBb0 + rowBb1) >> 2;
+         const GLint alpha = (rowAa0 + rowAa1 + rowBa0 + rowBa1) >> 2;
+         dst[i] = (alpha << 15) | (blue << 10) | (green << 5) | red;
+      }
    }
    else if (datatype == GL_UNSIGNED_BYTE && comps == 2) {
-         GLuint i, j, k;
-         const GLubyte (*rowA)[2] = (const GLubyte (*)[2]) srcRowA;
-         const GLubyte (*rowB)[2] = (const GLubyte (*)[2]) srcRowB;
-         GLubyte (*dst)[2] = (GLubyte (*)[2]) dstRow;
-         for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-              i++, j += colStride, k += colStride) {
-            dst[i][0] = (rowA[j][0] + rowA[k][0] +
-                         rowB[j][0] + rowB[k][0]) >> 2;
-            dst[i][1] = (rowA[j][1] + rowA[k][1] +
-                         rowB[j][1] + rowB[k][1]) >> 2;
-         }
+      GLuint i, j, k;
+      const GLubyte(*rowA)[2] = (const GLubyte(*)[2]) srcRowA;
+      const GLubyte(*rowB)[2] = (const GLubyte(*)[2]) srcRowB;
+      GLubyte(*dst)[2] = (GLubyte(*)[2]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) >> 2;
+         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) >> 2;
+      }
    }
    else if (datatype == GL_UNSIGNED_BYTE_3_3_2 && comps == 3) {
-         GLuint i, j, k;
-         const GLubyte *rowA = (const GLubyte *) srcRowA;
-         const GLubyte *rowB = (const GLubyte *) srcRowB;
-         GLubyte *dst = (GLubyte *) dstRow;
-         for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-              i++, j += colStride, k += colStride) {
-            const GLint rowAr0 = rowA[j] & 0x3;
-            const GLint rowAr1 = rowA[k] & 0x3;
-            const GLint rowBr0 = rowB[j] & 0x3;
-            const GLint rowBr1 = rowB[k] & 0x3;
-            const GLint rowAg0 = (rowA[j] >> 2) & 0x7;
-            const GLint rowAg1 = (rowA[k] >> 2) & 0x7;
-            const GLint rowBg0 = (rowB[j] >> 2) & 0x7;
-            const GLint rowBg1 = (rowB[k] >> 2) & 0x7;
-            const GLint rowAb0 = (rowA[j] >> 5) & 0x7;
-            const GLint rowAb1 = (rowA[k] >> 5) & 0x7;
-            const GLint rowBb0 = (rowB[j] >> 5) & 0x7;
-            const GLint rowBb1 = (rowB[k] >> 5) & 0x7;
-            const GLint red   = (rowAr0 + rowAr1 + rowBr0 + rowBr1) >> 2;
-            const GLint green = (rowAg0 + rowAg1 + rowBg0 + rowBg1) >> 2;
-            const GLint blue  = (rowAb0 + rowAb1 + rowBb0 + rowBb1) >> 2;
-            dst[i] = (blue << 5) | (green << 2) | red;
-         }
+      GLuint i, j, k;
+      const GLubyte *rowA = (const GLubyte *) srcRowA;
+      const GLubyte *rowB = (const GLubyte *) srcRowB;
+      GLubyte *dst = (GLubyte *) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         const GLint rowAr0 = rowA[j] & 0x3;
+         const GLint rowAr1 = rowA[k] & 0x3;
+         const GLint rowBr0 = rowB[j] & 0x3;
+         const GLint rowBr1 = rowB[k] & 0x3;
+         const GLint rowAg0 = (rowA[j] >> 2) & 0x7;
+         const GLint rowAg1 = (rowA[k] >> 2) & 0x7;
+         const GLint rowBg0 = (rowB[j] >> 2) & 0x7;
+         const GLint rowBg1 = (rowB[k] >> 2) & 0x7;
+         const GLint rowAb0 = (rowA[j] >> 5) & 0x7;
+         const GLint rowAb1 = (rowA[k] >> 5) & 0x7;
+         const GLint rowBb0 = (rowB[j] >> 5) & 0x7;
+         const GLint rowBb1 = (rowB[k] >> 5) & 0x7;
+         const GLint red = (rowAr0 + rowAr1 + rowBr0 + rowBr1) >> 2;
+         const GLint green = (rowAg0 + rowAg1 + rowBg0 + rowBg1) >> 2;
+         const GLint blue = (rowAb0 + rowAb1 + rowBb0 + rowBb1) >> 2;
+         dst[i] = (blue << 5) | (green << 2) | red;
+      }
    }
    else if (datatype == GL_UNSIGNED_BYTE && comps == 1) {
-         GLuint i, j, k;
-         const GLubyte *rowA = (const GLubyte *) srcRowA;
-         const GLubyte *rowB = (const GLubyte *) srcRowB;
-         GLubyte *dst = (GLubyte *) dstRow;
-         for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-              i++, j += colStride, k += colStride) {
-            dst[i] = (rowA[j] + rowA[k] + rowB[j] + rowB[k]) >> 2;
-         }
+      GLuint i, j, k;
+      const GLubyte *rowA = (const GLubyte *) srcRowA;
+      const GLubyte *rowB = (const GLubyte *) srcRowB;
+      GLubyte *dst = (GLubyte *) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i] = (rowA[j] + rowA[k] + rowB[j] + rowB[k]) >> 2;
+      }
    }
    else if (datatype == GL_FLOAT && comps == 4) {
-         GLuint i, j, k;
-         const GLfloat (*rowA)[4] = (const GLfloat (*)[4]) srcRowA;
-         const GLfloat (*rowB)[4] = (const GLfloat (*)[4]) srcRowB;
-         GLfloat (*dst)[4] = (GLfloat (*)[4]) dstRow;
-         for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-              i++, j += colStride, k += colStride) {
-            dst[i][0] = (rowA[j][0] + rowA[k][0] +
-                         rowB[j][0] + rowB[k][0]) * 0.25F;
-            dst[i][1] = (rowA[j][1] + rowA[k][1] +
-                         rowB[j][1] + rowB[k][1]) * 0.25F;
-            dst[i][2] = (rowA[j][2] + rowA[k][2] +
-                         rowB[j][2] + rowB[k][2]) * 0.25F;
-            dst[i][3] = (rowA[j][3] + rowA[k][3] +
-                         rowB[j][3] + rowB[k][3]) * 0.25F;
-         }
+      GLuint i, j, k;
+      const GLfloat(*rowA)[4] = (const GLfloat(*)[4]) srcRowA;
+      const GLfloat(*rowB)[4] = (const GLfloat(*)[4]) srcRowB;
+      GLfloat(*dst)[4] = (GLfloat(*)[4]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i][0] = (rowA[j][0] + rowA[k][0] +
+                      rowB[j][0] + rowB[k][0]) * 0.25F;
+         dst[i][1] = (rowA[j][1] + rowA[k][1] +
+                      rowB[j][1] + rowB[k][1]) * 0.25F;
+         dst[i][2] = (rowA[j][2] + rowA[k][2] +
+                      rowB[j][2] + rowB[k][2]) * 0.25F;
+         dst[i][3] = (rowA[j][3] + rowA[k][3] +
+                      rowB[j][3] + rowB[k][3]) * 0.25F;
+      }
    }
    else if (datatype == GL_HALF_FLOAT_ARB && comps == 4) {
-         GLuint i, j, k, comp;
-         const GLhalfARB (*rowA)[4] = (const GLhalfARB (*)[4]) srcRowA;
-         const GLhalfARB (*rowB)[4] = (const GLhalfARB (*)[4]) srcRowB;
-         GLhalfARB (*dst)[4] = (GLhalfARB (*)[4]) dstRow;
-         for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-              i++, j += colStride, k += colStride) {
-            for (comp = 0; comp < 4; comp++) {
-               GLfloat aj, ak, bj, bk;
-               aj = _mesa_half_to_float(rowA[j][comp]);
-               ak = _mesa_half_to_float(rowA[k][comp]);
-               bj = _mesa_half_to_float(rowB[j][comp]);
-               bk = _mesa_half_to_float(rowB[k][comp]);
-               dst[i][comp] = _mesa_float_to_half((aj + ak + bj + bk) * 0.25F);
-            }
+      GLuint i, j, k, comp;
+      const GLhalfARB(*rowA)[4] = (const GLhalfARB(*)[4]) srcRowA;
+      const GLhalfARB(*rowB)[4] = (const GLhalfARB(*)[4]) srcRowB;
+      GLhalfARB(*dst)[4] = (GLhalfARB(*)[4]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         for (comp = 0; comp < 4; comp++) {
+            GLfloat aj, ak, bj, bk;
+            aj = _mesa_half_to_float(rowA[j][comp]);
+            ak = _mesa_half_to_float(rowA[k][comp]);
+            bj = _mesa_half_to_float(rowB[j][comp]);
+            bk = _mesa_half_to_float(rowB[k][comp]);
+            dst[i][comp] = _mesa_float_to_half((aj + ak + bj + bk) * 0.25F);
          }
+      }
    }
    else if (datatype == GL_FLOAT && comps == 3) {
-         GLuint i, j, k;
-         const GLfloat (*rowA)[3] = (const GLfloat (*)[3]) srcRowA;
-         const GLfloat (*rowB)[3] = (const GLfloat (*)[3]) srcRowB;
-         GLfloat (*dst)[3] = (GLfloat (*)[3]) dstRow;
-         for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-              i++, j += colStride, k += colStride) {
-            dst[i][0] = (rowA[j][0] + rowA[k][0] +
-                         rowB[j][0] + rowB[k][0]) * 0.25F;
-            dst[i][1] = (rowA[j][1] + rowA[k][1] +
-                         rowB[j][1] + rowB[k][1]) * 0.25F;
-            dst[i][2] = (rowA[j][2] + rowA[k][2] +
-                         rowB[j][2] + rowB[k][2]) * 0.25F;
-         }
+      GLuint i, j, k;
+      const GLfloat(*rowA)[3] = (const GLfloat(*)[3]) srcRowA;
+      const GLfloat(*rowB)[3] = (const GLfloat(*)[3]) srcRowB;
+      GLfloat(*dst)[3] = (GLfloat(*)[3]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i][0] = (rowA[j][0] + rowA[k][0] +
+                      rowB[j][0] + rowB[k][0]) * 0.25F;
+         dst[i][1] = (rowA[j][1] + rowA[k][1] +
+                      rowB[j][1] + rowB[k][1]) * 0.25F;
+         dst[i][2] = (rowA[j][2] + rowA[k][2] +
+                      rowB[j][2] + rowB[k][2]) * 0.25F;
+      }
    }
    else if (datatype == GL_HALF_FLOAT_ARB && comps == 3) {
-         GLuint i, j, k, comp;
-         const GLhalfARB (*rowA)[3] = (const GLhalfARB (*)[3]) srcRowA;
-         const GLhalfARB (*rowB)[3] = (const GLhalfARB (*)[3]) srcRowB;
-         GLhalfARB (*dst)[3] = (GLhalfARB (*)[3]) dstRow;
-         for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-              i++, j += colStride, k += colStride) {
-            for (comp = 0; comp < 3; comp++) {
-               GLfloat aj, ak, bj, bk;
-               aj = _mesa_half_to_float(rowA[j][comp]);
-               ak = _mesa_half_to_float(rowA[k][comp]);
-               bj = _mesa_half_to_float(rowB[j][comp]);
-               bk = _mesa_half_to_float(rowB[k][comp]);
-               dst[i][comp] = _mesa_float_to_half((aj + ak + bj + bk) * 0.25F);
-            }
+      GLuint i, j, k, comp;
+      const GLhalfARB(*rowA)[3] = (const GLhalfARB(*)[3]) srcRowA;
+      const GLhalfARB(*rowB)[3] = (const GLhalfARB(*)[3]) srcRowB;
+      GLhalfARB(*dst)[3] = (GLhalfARB(*)[3]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         for (comp = 0; comp < 3; comp++) {
+            GLfloat aj, ak, bj, bk;
+            aj = _mesa_half_to_float(rowA[j][comp]);
+            ak = _mesa_half_to_float(rowA[k][comp]);
+            bj = _mesa_half_to_float(rowB[j][comp]);
+            bk = _mesa_half_to_float(rowB[k][comp]);
+            dst[i][comp] = _mesa_float_to_half((aj + ak + bj + bk) * 0.25F);
          }
+      }
    }
    else if (datatype == GL_FLOAT && comps == 2) {
-         GLuint i, j, k;
-         const GLfloat (*rowA)[2] = (const GLfloat (*)[2]) srcRowA;
-         const GLfloat (*rowB)[2] = (const GLfloat (*)[2]) srcRowB;
-         GLfloat (*dst)[2] = (GLfloat (*)[2]) dstRow;
-         for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-              i++, j += colStride, k += colStride) {
-            dst[i][0] = (rowA[j][0] + rowA[k][0] +
-                         rowB[j][0] + rowB[k][0]) * 0.25F;
-            dst[i][1] = (rowA[j][1] + rowA[k][1] +
-                         rowB[j][1] + rowB[k][1]) * 0.25F;
-         }
+      GLuint i, j, k;
+      const GLfloat(*rowA)[2] = (const GLfloat(*)[2]) srcRowA;
+      const GLfloat(*rowB)[2] = (const GLfloat(*)[2]) srcRowB;
+      GLfloat(*dst)[2] = (GLfloat(*)[2]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i][0] = (rowA[j][0] + rowA[k][0] +
+                      rowB[j][0] + rowB[k][0]) * 0.25F;
+         dst[i][1] = (rowA[j][1] + rowA[k][1] +
+                      rowB[j][1] + rowB[k][1]) * 0.25F;
+      }
    }
    else if (datatype == GL_HALF_FLOAT_ARB && comps == 2) {
-         GLuint i, j, k, comp;
-         const GLhalfARB (*rowA)[2] = (const GLhalfARB (*)[2]) srcRowA;
-         const GLhalfARB (*rowB)[2] = (const GLhalfARB (*)[2]) srcRowB;
-         GLhalfARB (*dst)[2] = (GLhalfARB (*)[2]) dstRow;
-         for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-              i++, j += colStride, k += colStride) {
-            for (comp = 0; comp < 2; comp++) {
-               GLfloat aj, ak, bj, bk;
-               aj = _mesa_half_to_float(rowA[j][comp]);
-               ak = _mesa_half_to_float(rowA[k][comp]);
-               bj = _mesa_half_to_float(rowB[j][comp]);
-               bk = _mesa_half_to_float(rowB[k][comp]);
-               dst[i][comp] = _mesa_float_to_half((aj + ak + bj + bk) * 0.25F);
-            }
+      GLuint i, j, k, comp;
+      const GLhalfARB(*rowA)[2] = (const GLhalfARB(*)[2]) srcRowA;
+      const GLhalfARB(*rowB)[2] = (const GLhalfARB(*)[2]) srcRowB;
+      GLhalfARB(*dst)[2] = (GLhalfARB(*)[2]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         for (comp = 0; comp < 2; comp++) {
+            GLfloat aj, ak, bj, bk;
+            aj = _mesa_half_to_float(rowA[j][comp]);
+            ak = _mesa_half_to_float(rowA[k][comp]);
+            bj = _mesa_half_to_float(rowB[j][comp]);
+            bk = _mesa_half_to_float(rowB[k][comp]);
+            dst[i][comp] = _mesa_float_to_half((aj + ak + bj + bk) * 0.25F);
          }
+      }
    }
    else if (datatype == GL_FLOAT && comps == 1) {
-         GLuint i, j, k;
-         const GLfloat *rowA = (const GLfloat *) srcRowA;
-         const GLfloat *rowB = (const GLfloat *) srcRowB;
-         GLfloat *dst = (GLfloat *) dstRow;
-         for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-              i++, j += colStride, k += colStride) {
-            dst[i] = (rowA[j] + rowA[k] + rowB[j] + rowB[k]) * 0.25F;
-         }
+      GLuint i, j, k;
+      const GLfloat *rowA = (const GLfloat *) srcRowA;
+      const GLfloat *rowB = (const GLfloat *) srcRowB;
+      GLfloat *dst = (GLfloat *) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i] = (rowA[j] + rowA[k] + rowB[j] + rowB[k]) * 0.25F;
+      }
    }
    else if (datatype == GL_HALF_FLOAT_ARB && comps == 1) {
-         GLuint i, j, k;
-         const GLhalfARB *rowA = (const GLhalfARB *) srcRowA;
-         const GLhalfARB *rowB = (const GLhalfARB *) srcRowB;
-         GLhalfARB *dst = (GLhalfARB *) dstRow;
-         for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-              i++, j += colStride, k += colStride) {
-            GLfloat aj, ak, bj, bk;
-            aj = _mesa_half_to_float(rowA[j]);
-            ak = _mesa_half_to_float(rowA[k]);
-            bj = _mesa_half_to_float(rowB[j]);
-            bk = _mesa_half_to_float(rowB[k]);
-            dst[i] = _mesa_float_to_half((aj + ak + bj + bk) * 0.25F);
-         }
+      GLuint i, j, k;
+      const GLhalfARB *rowA = (const GLhalfARB *) srcRowA;
+      const GLhalfARB *rowB = (const GLhalfARB *) srcRowB;
+      GLhalfARB *dst = (GLhalfARB *) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         GLfloat aj, ak, bj, bk;
+         aj = _mesa_half_to_float(rowA[j]);
+         ak = _mesa_half_to_float(rowA[k]);
+         bj = _mesa_half_to_float(rowB[j]);
+         bk = _mesa_half_to_float(rowB[k]);
+         dst[i] = _mesa_float_to_half((aj + ak + bj + bk) * 0.25F);
+      }
    }
    else {
       _mesa_problem(NULL, "bad format in do_row()");
-- 
cgit v1.2.3


From 9ddb7d794bac57e63f5eb247ad3c02ba6dfb87f9 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Fri, 8 Feb 2008 16:42:50 -0700
Subject: reorder cases in do_row()

---
 src/mesa/main/mipmap.c | 341 +++++++++++++++++++++++++------------------------
 1 file changed, 173 insertions(+), 168 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index 22c7530e83..db8ab65401 100644
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -234,7 +234,54 @@ do_row(GLenum datatype, GLuint comps, GLint srcWidth,
    assert(srcWidth == dstWidth || srcWidth == 2 * dstWidth);
    */
 
-   if (datatype == GL_UNSIGNED_SHORT && comps == 4) {
+   if (datatype == GL_UNSIGNED_BYTE && comps == 4) {
+      GLuint i, j, k;
+      const GLubyte(*rowA)[4] = (const GLubyte(*)[4]) srcRowA;
+      const GLubyte(*rowB)[4] = (const GLubyte(*)[4]) srcRowB;
+      GLubyte(*dst)[4] = (GLubyte(*)[4]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;
+         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;
+         dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;
+         dst[i][3] = (rowA[j][3] + rowA[k][3] + rowB[j][3] + rowB[k][3]) / 4;
+      }
+   }
+   else if (datatype == GL_UNSIGNED_BYTE && comps == 3) {
+      GLuint i, j, k;
+      const GLubyte(*rowA)[3] = (const GLubyte(*)[3]) srcRowA;
+      const GLubyte(*rowB)[3] = (const GLubyte(*)[3]) srcRowB;
+      GLubyte(*dst)[3] = (GLubyte(*)[3]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;
+         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;
+         dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;
+      }
+   }
+   else if (datatype == GL_UNSIGNED_BYTE && comps == 2) {
+      GLuint i, j, k;
+      const GLubyte(*rowA)[2] = (const GLubyte(*)[2]) srcRowA;
+      const GLubyte(*rowB)[2] = (const GLubyte(*)[2]) srcRowB;
+      GLubyte(*dst)[2] = (GLubyte(*)[2]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) >> 2;
+         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) >> 2;
+      }
+   }
+   else if (datatype == GL_UNSIGNED_BYTE && comps == 1) {
+      GLuint i, j, k;
+      const GLubyte *rowA = (const GLubyte *) srcRowA;
+      const GLubyte *rowB = (const GLubyte *) srcRowB;
+      GLubyte *dst = (GLubyte *) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i] = (rowA[j] + rowA[k] + rowB[j] + rowB[k]) >> 2;
+      }
+   }
+
+   else if (datatype == GL_UNSIGNED_SHORT && comps == 4) {
       GLuint i, j, k;
       const GLushort(*rowA)[4] = (const GLushort(*)[4]) srcRowA;
       const GLushort(*rowB)[4] = (const GLushort(*)[4]) srcRowB;
@@ -259,6 +306,17 @@ do_row(GLenum datatype, GLuint comps, GLint srcWidth,
          dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;
       }
    }
+   else if (datatype == GL_UNSIGNED_SHORT && comps == 2) {
+      GLuint i, j, k;
+      const GLushort(*rowA)[2] = (const GLushort(*)[2]) srcRowA;
+      const GLushort(*rowB)[2] = (const GLushort(*)[2]) srcRowB;
+      GLushort(*dst)[2] = (GLushort(*)[2]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;
+         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;
+      }
+   }
    else if (datatype == GL_UNSIGNED_SHORT && comps == 1) {
       GLuint i, j, k;
       const GLushort *rowA = (const GLushort *) srcRowA;
@@ -269,52 +327,141 @@ do_row(GLenum datatype, GLuint comps, GLint srcWidth,
          dst[i] = (rowA[j] + rowA[k] + rowB[j] + rowB[k]) / 4;
       }
    }
-   else if (datatype == GL_UNSIGNED_SHORT && comps == 2) {
+
+   else if (datatype == GL_FLOAT && comps == 4) {
       GLuint i, j, k;
-      const GLushort(*rowA)[2] = (const GLushort(*)[2]) srcRowA;
-      const GLushort(*rowB)[2] = (const GLushort(*)[2]) srcRowB;
-      GLushort(*dst)[2] = (GLushort(*)[2]) dstRow;
+      const GLfloat(*rowA)[4] = (const GLfloat(*)[4]) srcRowA;
+      const GLfloat(*rowB)[4] = (const GLfloat(*)[4]) srcRowB;
+      GLfloat(*dst)[4] = (GLfloat(*)[4]) dstRow;
       for (i = j = 0, k = k0; i < (GLuint) dstWidth;
            i++, j += colStride, k += colStride) {
-         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;
-         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;
+         dst[i][0] = (rowA[j][0] + rowA[k][0] +
+                      rowB[j][0] + rowB[k][0]) * 0.25F;
+         dst[i][1] = (rowA[j][1] + rowA[k][1] +
+                      rowB[j][1] + rowB[k][1]) * 0.25F;
+         dst[i][2] = (rowA[j][2] + rowA[k][2] +
+                      rowB[j][2] + rowB[k][2]) * 0.25F;
+         dst[i][3] = (rowA[j][3] + rowA[k][3] +
+                      rowB[j][3] + rowB[k][3]) * 0.25F;
       }
    }
-   else if (datatype == GL_UNSIGNED_INT && comps == 1) {
+   else if (datatype == GL_FLOAT && comps == 3) {
       GLuint i, j, k;
-      const GLuint *rowA = (const GLuint *) srcRowA;
-      const GLuint *rowB = (const GLuint *) srcRowB;
+      const GLfloat(*rowA)[3] = (const GLfloat(*)[3]) srcRowA;
+      const GLfloat(*rowB)[3] = (const GLfloat(*)[3]) srcRowB;
+      GLfloat(*dst)[3] = (GLfloat(*)[3]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i][0] = (rowA[j][0] + rowA[k][0] +
+                      rowB[j][0] + rowB[k][0]) * 0.25F;
+         dst[i][1] = (rowA[j][1] + rowA[k][1] +
+                      rowB[j][1] + rowB[k][1]) * 0.25F;
+         dst[i][2] = (rowA[j][2] + rowA[k][2] +
+                      rowB[j][2] + rowB[k][2]) * 0.25F;
+      }
+   }
+   else if (datatype == GL_FLOAT && comps == 2) {
+      GLuint i, j, k;
+      const GLfloat(*rowA)[2] = (const GLfloat(*)[2]) srcRowA;
+      const GLfloat(*rowB)[2] = (const GLfloat(*)[2]) srcRowB;
+      GLfloat(*dst)[2] = (GLfloat(*)[2]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i][0] = (rowA[j][0] + rowA[k][0] +
+                      rowB[j][0] + rowB[k][0]) * 0.25F;
+         dst[i][1] = (rowA[j][1] + rowA[k][1] +
+                      rowB[j][1] + rowB[k][1]) * 0.25F;
+      }
+   }
+   else if (datatype == GL_FLOAT && comps == 1) {
+      GLuint i, j, k;
+      const GLfloat *rowA = (const GLfloat *) srcRowA;
+      const GLfloat *rowB = (const GLfloat *) srcRowB;
       GLfloat *dst = (GLfloat *) dstRow;
       for (i = j = 0, k = k0; i < (GLuint) dstWidth;
            i++, j += colStride, k += colStride) {
-         dst[i] = rowA[j] / 4 + rowA[k] / 4 + rowB[j] / 4 + rowB[k] / 4;
+         dst[i] = (rowA[j] + rowA[k] + rowB[j] + rowB[k]) * 0.25F;
+      }
+   }
+
+   else if (datatype == GL_HALF_FLOAT_ARB && comps == 4) {
+      GLuint i, j, k, comp;
+      const GLhalfARB(*rowA)[4] = (const GLhalfARB(*)[4]) srcRowA;
+      const GLhalfARB(*rowB)[4] = (const GLhalfARB(*)[4]) srcRowB;
+      GLhalfARB(*dst)[4] = (GLhalfARB(*)[4]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         for (comp = 0; comp < 4; comp++) {
+            GLfloat aj, ak, bj, bk;
+            aj = _mesa_half_to_float(rowA[j][comp]);
+            ak = _mesa_half_to_float(rowA[k][comp]);
+            bj = _mesa_half_to_float(rowB[j][comp]);
+            bk = _mesa_half_to_float(rowB[k][comp]);
+            dst[i][comp] = _mesa_float_to_half((aj + ak + bj + bk) * 0.25F);
+         }
+      }
+   }
+   else if (datatype == GL_HALF_FLOAT_ARB && comps == 3) {
+      GLuint i, j, k, comp;
+      const GLhalfARB(*rowA)[3] = (const GLhalfARB(*)[3]) srcRowA;
+      const GLhalfARB(*rowB)[3] = (const GLhalfARB(*)[3]) srcRowB;
+      GLhalfARB(*dst)[3] = (GLhalfARB(*)[3]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         for (comp = 0; comp < 3; comp++) {
+            GLfloat aj, ak, bj, bk;
+            aj = _mesa_half_to_float(rowA[j][comp]);
+            ak = _mesa_half_to_float(rowA[k][comp]);
+            bj = _mesa_half_to_float(rowB[j][comp]);
+            bk = _mesa_half_to_float(rowB[k][comp]);
+            dst[i][comp] = _mesa_float_to_half((aj + ak + bj + bk) * 0.25F);
+         }
+      }
+   }
+   else if (datatype == GL_HALF_FLOAT_ARB && comps == 2) {
+      GLuint i, j, k, comp;
+      const GLhalfARB(*rowA)[2] = (const GLhalfARB(*)[2]) srcRowA;
+      const GLhalfARB(*rowB)[2] = (const GLhalfARB(*)[2]) srcRowB;
+      GLhalfARB(*dst)[2] = (GLhalfARB(*)[2]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         for (comp = 0; comp < 2; comp++) {
+            GLfloat aj, ak, bj, bk;
+            aj = _mesa_half_to_float(rowA[j][comp]);
+            ak = _mesa_half_to_float(rowA[k][comp]);
+            bj = _mesa_half_to_float(rowB[j][comp]);
+            bk = _mesa_half_to_float(rowB[k][comp]);
+            dst[i][comp] = _mesa_float_to_half((aj + ak + bj + bk) * 0.25F);
+         }
       }
    }
-   else if (datatype == GL_UNSIGNED_BYTE && comps == 4) {
+   else if (datatype == GL_HALF_FLOAT_ARB && comps == 1) {
       GLuint i, j, k;
-      const GLubyte(*rowA)[4] = (const GLubyte(*)[4]) srcRowA;
-      const GLubyte(*rowB)[4] = (const GLubyte(*)[4]) srcRowB;
-      GLubyte(*dst)[4] = (GLubyte(*)[4]) dstRow;
+      const GLhalfARB *rowA = (const GLhalfARB *) srcRowA;
+      const GLhalfARB *rowB = (const GLhalfARB *) srcRowB;
+      GLhalfARB *dst = (GLhalfARB *) dstRow;
       for (i = j = 0, k = k0; i < (GLuint) dstWidth;
            i++, j += colStride, k += colStride) {
-         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;
-         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;
-         dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;
-         dst[i][3] = (rowA[j][3] + rowA[k][3] + rowB[j][3] + rowB[k][3]) / 4;
+         GLfloat aj, ak, bj, bk;
+         aj = _mesa_half_to_float(rowA[j]);
+         ak = _mesa_half_to_float(rowA[k]);
+         bj = _mesa_half_to_float(rowB[j]);
+         bk = _mesa_half_to_float(rowB[k]);
+         dst[i] = _mesa_float_to_half((aj + ak + bj + bk) * 0.25F);
       }
    }
-   else if (datatype == GL_UNSIGNED_BYTE && comps == 3) {
+
+   else if (datatype == GL_UNSIGNED_INT && comps == 1) {
       GLuint i, j, k;
-      const GLubyte(*rowA)[3] = (const GLubyte(*)[3]) srcRowA;
-      const GLubyte(*rowB)[3] = (const GLubyte(*)[3]) srcRowB;
-      GLubyte(*dst)[3] = (GLubyte(*)[3]) dstRow;
+      const GLuint *rowA = (const GLuint *) srcRowA;
+      const GLuint *rowB = (const GLuint *) srcRowB;
+      GLfloat *dst = (GLfloat *) dstRow;
       for (i = j = 0, k = k0; i < (GLuint) dstWidth;
            i++, j += colStride, k += colStride) {
-         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;
-         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;
-         dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;
+         dst[i] = rowA[j] / 4 + rowA[k] / 4 + rowB[j] / 4 + rowB[k] / 4;
       }
    }
+
    else if (datatype == GL_UNSIGNED_SHORT_5_6_5 && comps == 3) {
       GLuint i, j, k;
       const GLushort *rowA = (const GLushort *) srcRowA;
@@ -400,17 +547,6 @@ do_row(GLenum datatype, GLuint comps, GLint srcWidth,
          dst[i] = (alpha << 15) | (blue << 10) | (green << 5) | red;
       }
    }
-   else if (datatype == GL_UNSIGNED_BYTE && comps == 2) {
-      GLuint i, j, k;
-      const GLubyte(*rowA)[2] = (const GLubyte(*)[2]) srcRowA;
-      const GLubyte(*rowB)[2] = (const GLubyte(*)[2]) srcRowB;
-      GLubyte(*dst)[2] = (GLubyte(*)[2]) dstRow;
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) >> 2;
-         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) >> 2;
-      }
-   }
    else if (datatype == GL_UNSIGNED_BYTE_3_3_2 && comps == 3) {
       GLuint i, j, k;
       const GLubyte *rowA = (const GLubyte *) srcRowA;
@@ -436,137 +572,6 @@ do_row(GLenum datatype, GLuint comps, GLint srcWidth,
          dst[i] = (blue << 5) | (green << 2) | red;
       }
    }
-   else if (datatype == GL_UNSIGNED_BYTE && comps == 1) {
-      GLuint i, j, k;
-      const GLubyte *rowA = (const GLubyte *) srcRowA;
-      const GLubyte *rowB = (const GLubyte *) srcRowB;
-      GLubyte *dst = (GLubyte *) dstRow;
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         dst[i] = (rowA[j] + rowA[k] + rowB[j] + rowB[k]) >> 2;
-      }
-   }
-   else if (datatype == GL_FLOAT && comps == 4) {
-      GLuint i, j, k;
-      const GLfloat(*rowA)[4] = (const GLfloat(*)[4]) srcRowA;
-      const GLfloat(*rowB)[4] = (const GLfloat(*)[4]) srcRowB;
-      GLfloat(*dst)[4] = (GLfloat(*)[4]) dstRow;
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         dst[i][0] = (rowA[j][0] + rowA[k][0] +
-                      rowB[j][0] + rowB[k][0]) * 0.25F;
-         dst[i][1] = (rowA[j][1] + rowA[k][1] +
-                      rowB[j][1] + rowB[k][1]) * 0.25F;
-         dst[i][2] = (rowA[j][2] + rowA[k][2] +
-                      rowB[j][2] + rowB[k][2]) * 0.25F;
-         dst[i][3] = (rowA[j][3] + rowA[k][3] +
-                      rowB[j][3] + rowB[k][3]) * 0.25F;
-      }
-   }
-   else if (datatype == GL_HALF_FLOAT_ARB && comps == 4) {
-      GLuint i, j, k, comp;
-      const GLhalfARB(*rowA)[4] = (const GLhalfARB(*)[4]) srcRowA;
-      const GLhalfARB(*rowB)[4] = (const GLhalfARB(*)[4]) srcRowB;
-      GLhalfARB(*dst)[4] = (GLhalfARB(*)[4]) dstRow;
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         for (comp = 0; comp < 4; comp++) {
-            GLfloat aj, ak, bj, bk;
-            aj = _mesa_half_to_float(rowA[j][comp]);
-            ak = _mesa_half_to_float(rowA[k][comp]);
-            bj = _mesa_half_to_float(rowB[j][comp]);
-            bk = _mesa_half_to_float(rowB[k][comp]);
-            dst[i][comp] = _mesa_float_to_half((aj + ak + bj + bk) * 0.25F);
-         }
-      }
-   }
-   else if (datatype == GL_FLOAT && comps == 3) {
-      GLuint i, j, k;
-      const GLfloat(*rowA)[3] = (const GLfloat(*)[3]) srcRowA;
-      const GLfloat(*rowB)[3] = (const GLfloat(*)[3]) srcRowB;
-      GLfloat(*dst)[3] = (GLfloat(*)[3]) dstRow;
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         dst[i][0] = (rowA[j][0] + rowA[k][0] +
-                      rowB[j][0] + rowB[k][0]) * 0.25F;
-         dst[i][1] = (rowA[j][1] + rowA[k][1] +
-                      rowB[j][1] + rowB[k][1]) * 0.25F;
-         dst[i][2] = (rowA[j][2] + rowA[k][2] +
-                      rowB[j][2] + rowB[k][2]) * 0.25F;
-      }
-   }
-   else if (datatype == GL_HALF_FLOAT_ARB && comps == 3) {
-      GLuint i, j, k, comp;
-      const GLhalfARB(*rowA)[3] = (const GLhalfARB(*)[3]) srcRowA;
-      const GLhalfARB(*rowB)[3] = (const GLhalfARB(*)[3]) srcRowB;
-      GLhalfARB(*dst)[3] = (GLhalfARB(*)[3]) dstRow;
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         for (comp = 0; comp < 3; comp++) {
-            GLfloat aj, ak, bj, bk;
-            aj = _mesa_half_to_float(rowA[j][comp]);
-            ak = _mesa_half_to_float(rowA[k][comp]);
-            bj = _mesa_half_to_float(rowB[j][comp]);
-            bk = _mesa_half_to_float(rowB[k][comp]);
-            dst[i][comp] = _mesa_float_to_half((aj + ak + bj + bk) * 0.25F);
-         }
-      }
-   }
-   else if (datatype == GL_FLOAT && comps == 2) {
-      GLuint i, j, k;
-      const GLfloat(*rowA)[2] = (const GLfloat(*)[2]) srcRowA;
-      const GLfloat(*rowB)[2] = (const GLfloat(*)[2]) srcRowB;
-      GLfloat(*dst)[2] = (GLfloat(*)[2]) dstRow;
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         dst[i][0] = (rowA[j][0] + rowA[k][0] +
-                      rowB[j][0] + rowB[k][0]) * 0.25F;
-         dst[i][1] = (rowA[j][1] + rowA[k][1] +
-                      rowB[j][1] + rowB[k][1]) * 0.25F;
-      }
-   }
-   else if (datatype == GL_HALF_FLOAT_ARB && comps == 2) {
-      GLuint i, j, k, comp;
-      const GLhalfARB(*rowA)[2] = (const GLhalfARB(*)[2]) srcRowA;
-      const GLhalfARB(*rowB)[2] = (const GLhalfARB(*)[2]) srcRowB;
-      GLhalfARB(*dst)[2] = (GLhalfARB(*)[2]) dstRow;
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         for (comp = 0; comp < 2; comp++) {
-            GLfloat aj, ak, bj, bk;
-            aj = _mesa_half_to_float(rowA[j][comp]);
-            ak = _mesa_half_to_float(rowA[k][comp]);
-            bj = _mesa_half_to_float(rowB[j][comp]);
-            bk = _mesa_half_to_float(rowB[k][comp]);
-            dst[i][comp] = _mesa_float_to_half((aj + ak + bj + bk) * 0.25F);
-         }
-      }
-   }
-   else if (datatype == GL_FLOAT && comps == 1) {
-      GLuint i, j, k;
-      const GLfloat *rowA = (const GLfloat *) srcRowA;
-      const GLfloat *rowB = (const GLfloat *) srcRowB;
-      GLfloat *dst = (GLfloat *) dstRow;
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         dst[i] = (rowA[j] + rowA[k] + rowB[j] + rowB[k]) * 0.25F;
-      }
-   }
-   else if (datatype == GL_HALF_FLOAT_ARB && comps == 1) {
-      GLuint i, j, k;
-      const GLhalfARB *rowA = (const GLhalfARB *) srcRowA;
-      const GLhalfARB *rowB = (const GLhalfARB *) srcRowB;
-      GLhalfARB *dst = (GLhalfARB *) dstRow;
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         GLfloat aj, ak, bj, bk;
-         aj = _mesa_half_to_float(rowA[j]);
-         ak = _mesa_half_to_float(rowA[k]);
-         bj = _mesa_half_to_float(rowB[j]);
-         bk = _mesa_half_to_float(rowB[k]);
-         dst[i] = _mesa_float_to_half((aj + ak + bj + bk) * 0.25F);
-      }
-   }
    else {
       _mesa_problem(NULL, "bad format in do_row()");
    }
-- 
cgit v1.2.3


From 42eac65da45fb58bffdf94ab8f9860d8cee5b256 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Fri, 8 Feb 2008 16:46:12 -0700
Subject: move _mesa_format_to_type_and_comps() to texformat.c

---
 src/mesa/main/mipmap.c    | 168 +--------------------------------------------
 src/mesa/main/texformat.c | 171 ++++++++++++++++++++++++++++++++++++++++++++++
 src/mesa/main/texformat.h |   6 ++
 3 files changed, 178 insertions(+), 167 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index db8ab65401..981da5dd89 100644
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -45,172 +45,6 @@ bytes_per_pixel(GLenum datatype, GLuint comps)
 }
 
 
-static void
-mesa_format_to_type_and_comps(const struct gl_texture_format *format,
-                              GLenum *datatype, GLuint *comps)
-{
-   switch (format->MesaFormat) {
-   case MESA_FORMAT_RGBA8888:
-   case MESA_FORMAT_RGBA8888_REV:
-   case MESA_FORMAT_ARGB8888:
-   case MESA_FORMAT_ARGB8888_REV:
-      *datatype = CHAN_TYPE;
-      *comps = 4;
-      return;
-   case MESA_FORMAT_RGB888:
-   case MESA_FORMAT_BGR888:
-      *datatype = GL_UNSIGNED_BYTE;
-      *comps = 3;
-      return;
-   case MESA_FORMAT_RGB565:
-   case MESA_FORMAT_RGB565_REV:
-      *datatype = GL_UNSIGNED_SHORT_5_6_5;
-      *comps = 3;
-      return;
-
-   case MESA_FORMAT_ARGB4444:
-   case MESA_FORMAT_ARGB4444_REV:
-      *datatype = GL_UNSIGNED_SHORT_4_4_4_4;
-      *comps = 4;
-      return;
-
-   case MESA_FORMAT_ARGB1555:
-   case MESA_FORMAT_ARGB1555_REV:
-      *datatype = GL_UNSIGNED_SHORT_1_5_5_5_REV;
-      *comps = 3;
-      return;
-
-   case MESA_FORMAT_AL88:
-   case MESA_FORMAT_AL88_REV:
-      *datatype = GL_UNSIGNED_BYTE;
-      *comps = 2;
-      return;
-   case MESA_FORMAT_RGB332:
-      *datatype = GL_UNSIGNED_BYTE_3_3_2;
-      *comps = 3;
-      return;
-
-   case MESA_FORMAT_A8:
-   case MESA_FORMAT_L8:
-   case MESA_FORMAT_I8:
-   case MESA_FORMAT_CI8:
-      *datatype = GL_UNSIGNED_BYTE;
-      *comps = 1;
-      return;
-
-   case MESA_FORMAT_YCBCR:
-   case MESA_FORMAT_YCBCR_REV:
-      *datatype = GL_UNSIGNED_SHORT;
-      *comps = 2;
-      return;
-
-   case MESA_FORMAT_Z24_S8:
-      *datatype = GL_UNSIGNED_INT;
-      *comps = 1; /* XXX OK? */
-      return;
-
-   case MESA_FORMAT_Z16:
-      *datatype = GL_UNSIGNED_SHORT;
-      *comps = 1;
-      return;
-
-   case MESA_FORMAT_Z32:
-      *datatype = GL_UNSIGNED_INT;
-      *comps = 1;
-      return;
-
-   case MESA_FORMAT_SRGB8:
-      *datatype = GL_UNSIGNED_BYTE;
-      *comps = 3;
-      return;
-   case MESA_FORMAT_SRGBA8:
-      *datatype = GL_UNSIGNED_BYTE;
-      *comps = 4;
-      return;
-   case MESA_FORMAT_SL8:
-      *datatype = GL_UNSIGNED_BYTE;
-      *comps = 1;
-      return;
-   case MESA_FORMAT_SLA8:
-      *datatype = GL_UNSIGNED_BYTE;
-      *comps = 2;
-      return;
-
-   case MESA_FORMAT_RGB_FXT1:
-   case MESA_FORMAT_RGBA_FXT1:
-   case MESA_FORMAT_RGB_DXT1:
-   case MESA_FORMAT_RGBA_DXT1:
-   case MESA_FORMAT_RGBA_DXT3:
-   case MESA_FORMAT_RGBA_DXT5:
-      /* XXX generate error instead? */
-      *datatype = GL_UNSIGNED_BYTE;
-      *comps = 0;
-      return;
-
-   case MESA_FORMAT_RGBA:
-      *datatype = CHAN_TYPE;
-      *comps = 4;
-      return;
-   case MESA_FORMAT_RGB:
-      *datatype = CHAN_TYPE;
-      *comps = 3;
-      return;
-   case MESA_FORMAT_LUMINANCE_ALPHA:
-      *datatype = CHAN_TYPE;
-      *comps = 2;
-      return;
-   case MESA_FORMAT_ALPHA:
-   case MESA_FORMAT_LUMINANCE:
-   case MESA_FORMAT_INTENSITY:
-      *datatype = CHAN_TYPE;
-      *comps = 1;
-      return;
-
-   case MESA_FORMAT_RGBA_FLOAT32:
-      *datatype = GL_FLOAT;
-      *comps = 4;
-      return;
-   case MESA_FORMAT_RGBA_FLOAT16:
-      *datatype = GL_HALF_FLOAT_ARB;
-      *comps = 4;
-      return;
-   case MESA_FORMAT_RGB_FLOAT32:
-      *datatype = GL_FLOAT;
-      *comps = 3;
-      return;
-   case MESA_FORMAT_RGB_FLOAT16:
-      *datatype = GL_HALF_FLOAT_ARB;
-      *comps = 3;
-      return;
-   case MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32:
-      *datatype = GL_FLOAT;
-      *comps = 2;
-      return;
-   case MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16:
-      *datatype = GL_HALF_FLOAT_ARB;
-      *comps = 2;
-      return;
-   case MESA_FORMAT_ALPHA_FLOAT32:
-   case MESA_FORMAT_LUMINANCE_FLOAT32:
-   case MESA_FORMAT_INTENSITY_FLOAT32:
-      *datatype = GL_FLOAT;
-      *comps = 1;
-      return;
-   case MESA_FORMAT_ALPHA_FLOAT16:
-   case MESA_FORMAT_LUMINANCE_FLOAT16:
-   case MESA_FORMAT_INTENSITY_FLOAT16:
-      *datatype = GL_HALF_FLOAT_ARB;
-      *comps = 1;
-      return;
-
-   default:
-      _mesa_problem(NULL, "bad texture format in mesa_format_to_type_and_comps");
-      *datatype = 0;
-      *comps = 1;
-   }
-}
-
-
 /**
  * Average together two rows of a source image to produce a single new
  * row in the dest image.  It's legal for the two source rows to point
@@ -1085,7 +919,7 @@ _mesa_generate_mipmap(GLcontext *ctx, GLenum target,
       convertFormat = srcImage->TexFormat;
    }
 
-   mesa_format_to_type_and_comps(convertFormat, &datatype, &comps);
+   _mesa_format_to_type_and_comps(convertFormat, &datatype, &comps);
 
    for (level = texObj->BaseLevel; level < texObj->MaxLevel
            && level < maxLevels - 1; level++) {
diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c
index acc268e622..88fbd8f07c 100644
--- a/src/mesa/main/texformat.c
+++ b/src/mesa/main/texformat.c
@@ -1569,3 +1569,174 @@ _mesa_choose_tex_format( GLcontext *ctx, GLint internalFormat,
    _mesa_problem(ctx, "unexpected format in _mesa_choose_tex_format()");
    return NULL;
 }
+
+
+
+/**
+ * Return datatype and number of components per texel for the
+ * given gl_texture_format.
+ */
+void
+_mesa_format_to_type_and_comps(const struct gl_texture_format *format,
+                               GLenum *datatype, GLuint *comps)
+{
+   switch (format->MesaFormat) {
+   case MESA_FORMAT_RGBA8888:
+   case MESA_FORMAT_RGBA8888_REV:
+   case MESA_FORMAT_ARGB8888:
+   case MESA_FORMAT_ARGB8888_REV:
+      *datatype = CHAN_TYPE;
+      *comps = 4;
+      return;
+   case MESA_FORMAT_RGB888:
+   case MESA_FORMAT_BGR888:
+      *datatype = GL_UNSIGNED_BYTE;
+      *comps = 3;
+      return;
+   case MESA_FORMAT_RGB565:
+   case MESA_FORMAT_RGB565_REV:
+      *datatype = GL_UNSIGNED_SHORT_5_6_5;
+      *comps = 3;
+      return;
+
+   case MESA_FORMAT_ARGB4444:
+   case MESA_FORMAT_ARGB4444_REV:
+      *datatype = GL_UNSIGNED_SHORT_4_4_4_4;
+      *comps = 4;
+      return;
+
+   case MESA_FORMAT_ARGB1555:
+   case MESA_FORMAT_ARGB1555_REV:
+      *datatype = GL_UNSIGNED_SHORT_1_5_5_5_REV;
+      *comps = 3;
+      return;
+
+   case MESA_FORMAT_AL88:
+   case MESA_FORMAT_AL88_REV:
+      *datatype = GL_UNSIGNED_BYTE;
+      *comps = 2;
+      return;
+   case MESA_FORMAT_RGB332:
+      *datatype = GL_UNSIGNED_BYTE_3_3_2;
+      *comps = 3;
+      return;
+
+   case MESA_FORMAT_A8:
+   case MESA_FORMAT_L8:
+   case MESA_FORMAT_I8:
+   case MESA_FORMAT_CI8:
+      *datatype = GL_UNSIGNED_BYTE;
+      *comps = 1;
+      return;
+
+   case MESA_FORMAT_YCBCR:
+   case MESA_FORMAT_YCBCR_REV:
+      *datatype = GL_UNSIGNED_SHORT;
+      *comps = 2;
+      return;
+
+   case MESA_FORMAT_Z24_S8:
+      *datatype = GL_UNSIGNED_INT;
+      *comps = 1; /* XXX OK? */
+      return;
+
+   case MESA_FORMAT_Z16:
+      *datatype = GL_UNSIGNED_SHORT;
+      *comps = 1;
+      return;
+
+   case MESA_FORMAT_Z32:
+      *datatype = GL_UNSIGNED_INT;
+      *comps = 1;
+      return;
+
+   case MESA_FORMAT_SRGB8:
+      *datatype = GL_UNSIGNED_BYTE;
+      *comps = 3;
+      return;
+   case MESA_FORMAT_SRGBA8:
+      *datatype = GL_UNSIGNED_BYTE;
+      *comps = 4;
+      return;
+   case MESA_FORMAT_SL8:
+      *datatype = GL_UNSIGNED_BYTE;
+      *comps = 1;
+      return;
+   case MESA_FORMAT_SLA8:
+      *datatype = GL_UNSIGNED_BYTE;
+      *comps = 2;
+      return;
+
+   case MESA_FORMAT_RGB_FXT1:
+   case MESA_FORMAT_RGBA_FXT1:
+   case MESA_FORMAT_RGB_DXT1:
+   case MESA_FORMAT_RGBA_DXT1:
+   case MESA_FORMAT_RGBA_DXT3:
+   case MESA_FORMAT_RGBA_DXT5:
+      /* XXX generate error instead? */
+      *datatype = GL_UNSIGNED_BYTE;
+      *comps = 0;
+      return;
+
+   case MESA_FORMAT_RGBA:
+      *datatype = CHAN_TYPE;
+      *comps = 4;
+      return;
+   case MESA_FORMAT_RGB:
+      *datatype = CHAN_TYPE;
+      *comps = 3;
+      return;
+   case MESA_FORMAT_LUMINANCE_ALPHA:
+      *datatype = CHAN_TYPE;
+      *comps = 2;
+      return;
+   case MESA_FORMAT_ALPHA:
+   case MESA_FORMAT_LUMINANCE:
+   case MESA_FORMAT_INTENSITY:
+      *datatype = CHAN_TYPE;
+      *comps = 1;
+      return;
+
+   case MESA_FORMAT_RGBA_FLOAT32:
+      *datatype = GL_FLOAT;
+      *comps = 4;
+      return;
+   case MESA_FORMAT_RGBA_FLOAT16:
+      *datatype = GL_HALF_FLOAT_ARB;
+      *comps = 4;
+      return;
+   case MESA_FORMAT_RGB_FLOAT32:
+      *datatype = GL_FLOAT;
+      *comps = 3;
+      return;
+   case MESA_FORMAT_RGB_FLOAT16:
+      *datatype = GL_HALF_FLOAT_ARB;
+      *comps = 3;
+      return;
+   case MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32:
+      *datatype = GL_FLOAT;
+      *comps = 2;
+      return;
+   case MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16:
+      *datatype = GL_HALF_FLOAT_ARB;
+      *comps = 2;
+      return;
+   case MESA_FORMAT_ALPHA_FLOAT32:
+   case MESA_FORMAT_LUMINANCE_FLOAT32:
+   case MESA_FORMAT_INTENSITY_FLOAT32:
+      *datatype = GL_FLOAT;
+      *comps = 1;
+      return;
+   case MESA_FORMAT_ALPHA_FLOAT16:
+   case MESA_FORMAT_LUMINANCE_FLOAT16:
+   case MESA_FORMAT_INTENSITY_FLOAT16:
+      *datatype = GL_HALF_FLOAT_ARB;
+      *comps = 1;
+      return;
+
+   default:
+      _mesa_problem(NULL, "bad format in _mesa_format_to_type_and_comps");
+      *datatype = 0;
+      *comps = 1;
+   }
+}
diff --git a/src/mesa/main/texformat.h b/src/mesa/main/texformat.h
index 55851db701..48f0fe99f2 100644
--- a/src/mesa/main/texformat.h
+++ b/src/mesa/main/texformat.h
@@ -239,4 +239,10 @@ extern const struct gl_texture_format *
 _mesa_choose_tex_format( GLcontext *ctx, GLint internalFormat,
                          GLenum format, GLenum type );
 
+
+extern void
+_mesa_format_to_type_and_comps(const struct gl_texture_format *format,
+                               GLenum *datatype, GLuint *comps);
+
+
 #endif
-- 
cgit v1.2.3


From 3bae27fcc54187235a6962577580e838b012f9a5 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Fri, 8 Feb 2008 16:56:21 -0700
Subject: refactor code, export _mesa_generate_mipmap_level()

---
 src/mesa/main/mipmap.c | 98 ++++++++++++++++++++++++++++----------------------
 src/mesa/main/mipmap.h | 11 ++++++
 2 files changed, 67 insertions(+), 42 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index 981da5dd89..ed7795aef9 100644
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -841,6 +841,59 @@ make_2d_stack_mipmap(GLenum datatype, GLuint comps, GLint border,
 }
 
 
+/**
+ * Down-sample a texture image to produce the next lower mipmap level.
+ */
+void
+_mesa_generate_mipmap_level(GLenum target,
+                            GLenum datatype, GLuint comps,
+                            GLint border,
+                            GLint srcWidth, GLint srcHeight, GLint srcDepth,
+                            const GLubyte *srcData,
+                            GLint dstWidth, GLint dstHeight, GLint dstDepth,
+                            GLubyte *dstData)
+{
+   switch (target) {
+   case GL_TEXTURE_1D:
+      make_1d_mipmap(datatype, comps, border,
+                     srcWidth, srcData,
+                     dstWidth, dstData);
+      break;
+   case GL_TEXTURE_2D:
+   case GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB:
+   case GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB:
+   case GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB:
+   case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB:
+   case GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB:
+   case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB:
+      make_2d_mipmap(datatype, comps, border,
+                     srcWidth, srcHeight, srcData,
+                     dstWidth, dstHeight, dstData);
+      break;
+   case GL_TEXTURE_3D:
+      make_3d_mipmap(datatype, comps, border,
+                     srcWidth, srcHeight, srcDepth, srcData,
+                     dstWidth, dstHeight, dstDepth, dstData);
+      break;
+   case GL_TEXTURE_1D_ARRAY_EXT:
+      make_1d_stack_mipmap(datatype, comps, border,
+                           srcWidth, srcData,
+                           dstWidth, dstHeight, dstData);
+      break;
+   case GL_TEXTURE_2D_ARRAY_EXT:
+      make_2d_stack_mipmap(datatype, comps, border,
+                           srcWidth, srcHeight, srcData,
+                           dstWidth, dstHeight, dstDepth, dstData);
+      break;
+   case GL_TEXTURE_RECTANGLE_NV:
+      /* no mipmaps, do nothing */
+      break;
+   default:
+      _mesa_problem(NULL, "bad target in _mesa_generate_mipmap_level");
+   }
+}
+
+
 /**
  * For GL_SGIX_generate_mipmap:
  * Generate a complete set of mipmaps from texObj's base-level image.
@@ -1032,48 +1085,9 @@ _mesa_generate_mipmap(GLcontext *ctx, GLenum target,
          dstData = (GLubyte *) dstImage->Data;
       }
 
-      /*
-       * We use simple 2x2 averaging to compute the next mipmap level.
-       */
-      switch (target) {
-         case GL_TEXTURE_1D:
-            make_1d_mipmap(datatype, comps, border,
-                           srcWidth, srcData,
-                           dstWidth, dstData);
-            break;
-         case GL_TEXTURE_2D:
-         case GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB:
-         case GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB:
-         case GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB:
-         case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB:
-         case GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB:
-         case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB:
-            make_2d_mipmap(datatype, comps, border,
-                           srcWidth, srcHeight, srcData,
-                           dstWidth, dstHeight, dstData);
-            break;
-         case GL_TEXTURE_3D:
-            make_3d_mipmap(datatype, comps, border,
-                           srcWidth, srcHeight, srcDepth, srcData,
-                           dstWidth, dstHeight, dstDepth, dstData);
-            break;
-         case GL_TEXTURE_1D_ARRAY_EXT:
-            make_1d_stack_mipmap(datatype, comps, border,
-                                 srcWidth, srcData,
-                                 dstWidth, dstHeight, dstData);
-            break;
-         case GL_TEXTURE_2D_ARRAY_EXT:
-            make_2d_stack_mipmap(datatype, comps, border,
-                                 srcWidth, srcHeight, srcData,
-                                 dstWidth, dstHeight, dstDepth, dstData);
-            break;
-         case GL_TEXTURE_RECTANGLE_NV:
-            /* no mipmaps, do nothing */
-            break;
-         default:
-            _mesa_problem(ctx, "bad dimensions in _mesa_generate_mipmaps");
-            return;
-      }
+      _mesa_generate_mipmap_level(target, datatype, comps, border,
+                                  srcWidth, srcHeight, srcDepth, srcData,
+                                  dstWidth, dstHeight, dstDepth, dstData);
 
       if (dstImage->IsCompressed) {
          GLubyte *temp;
diff --git a/src/mesa/main/mipmap.h b/src/mesa/main/mipmap.h
index 46e16902c8..b6491f5507 100644
--- a/src/mesa/main/mipmap.h
+++ b/src/mesa/main/mipmap.h
@@ -28,6 +28,17 @@
 
 #include "mtypes.h"
 
+
+extern void
+_mesa_generate_mipmap_level(GLenum target,
+                            GLenum datatype, GLuint comps,
+                            GLint border,
+                            GLint srcWidth, GLint srcHeight, GLint srcDepth,
+                            const GLubyte *srcData,
+                            GLint dstWidth, GLint dstHeight, GLint dstDepth,
+                            GLubyte *dstData);
+
+
 extern void
 _mesa_generate_mipmap(GLcontext *ctx, GLenum target,
                       struct gl_texture_object *texObj);
-- 
cgit v1.2.3


From b52ce6341f877a0a1cfd3c50c07eeb1c156ae89e Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Mon, 11 Feb 2008 09:33:28 -0700
Subject: added _mesa_tex_target_to_face()

---
 src/mesa/main/teximage.c | 20 +++++++++++++-------
 src/mesa/main/teximage.h |  5 +++++
 2 files changed, 18 insertions(+), 7 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 09ec0d4553..5c96be9216 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -595,8 +595,12 @@ is_compressed_format(GLcontext *ctx, GLenum internalFormat)
 }
 
 
-static GLuint
-texture_face(GLenum target)
+/**
+ * For cube map faces, return a face index in [0,5].
+ * For other targets return 0;
+ */
+GLuint
+_mesa_tex_target_to_face(GLenum target)
 {
    if (target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB &&
        target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB)
@@ -625,6 +629,7 @@ _mesa_set_tex_image(struct gl_texture_object *tObj,
 {
    ASSERT(tObj);
    ASSERT(texImage);
+   /* XXX simplify this with _mesa_tex_target_to_face() */
    switch (target) {
       case GL_TEXTURE_1D:
       case GL_TEXTURE_2D:
@@ -828,6 +833,7 @@ _mesa_select_tex_image(GLcontext *ctx, const struct gl_texture_object *texObj,
    if (level < 0 || level >= MAX_TEXTURE_LEVELS) 
       return NULL;
 
+   /* XXX simplify this with _mesa_tex_target_to_face() */
    switch (target) {
       case GL_TEXTURE_1D:
       case GL_PROXY_TEXTURE_1D:
@@ -2424,7 +2430,7 @@ _mesa_TexImage1D( GLenum target, GLint level, GLint internalFormat,
       struct gl_texture_unit *texUnit;
       struct gl_texture_object *texObj;
       struct gl_texture_image *texImage;
-      const GLuint face = texture_face(target);
+      const GLuint face = _mesa_tex_target_to_face(target);
 
       if (texture_error_check(ctx, target, level, internalFormat,
                               format, type, 1, postConvWidth, 1, 1, border)) {
@@ -2527,7 +2533,7 @@ _mesa_TexImage2D( GLenum target, GLint level, GLint internalFormat,
       struct gl_texture_unit *texUnit;
       struct gl_texture_object *texObj;
       struct gl_texture_image *texImage;
-      const GLuint face = texture_face(target);
+      const GLuint face = _mesa_tex_target_to_face(target);
 
       if (texture_error_check(ctx, target, level, internalFormat,
                               format, type, 2, postConvWidth, postConvHeight,
@@ -2629,7 +2635,7 @@ _mesa_TexImage3D( GLenum target, GLint level, GLint internalFormat,
       struct gl_texture_unit *texUnit;
       struct gl_texture_object *texObj;
       struct gl_texture_image *texImage;
-      const GLuint face = texture_face(target);
+      const GLuint face = _mesa_tex_target_to_face(target);
 
       if (texture_error_check(ctx, target, level, (GLint) internalFormat,
                               format, type, 3, width, height, depth, border)) {
@@ -2897,7 +2903,7 @@ _mesa_CopyTexImage1D( GLenum target, GLint level,
    struct gl_texture_object *texObj;
    struct gl_texture_image *texImage;
    GLsizei postConvWidth = width;
-   const GLuint face = texture_face(target);
+   const GLuint face = _mesa_tex_target_to_face(target);
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
@@ -2960,7 +2966,7 @@ _mesa_CopyTexImage2D( GLenum target, GLint level, GLenum internalFormat,
    struct gl_texture_object *texObj;
    struct gl_texture_image *texImage;
    GLsizei postConvWidth = width, postConvHeight = height;
-   const GLuint face = texture_face(target);
+   const GLuint face = _mesa_tex_target_to_face(target);
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
diff --git a/src/mesa/main/teximage.h b/src/mesa/main/teximage.h
index f2cad7eb2d..b718c0046d 100644
--- a/src/mesa/main/teximage.h
+++ b/src/mesa/main/teximage.h
@@ -107,6 +107,11 @@ _mesa_test_proxy_teximage(GLcontext *ctx, GLenum target, GLint level,
                          GLint width, GLint height, GLint depth, GLint border);
 
 
+extern GLuint
+_mesa_tex_target_to_face(GLenum target);
+
+
+
 /**
  * Lock a texture for updating.  See also _mesa_lock_context_textures().
  */
-- 
cgit v1.2.3


From c22d9152e33792ea58426c53bc9b96bf552b0b44 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Mon, 11 Feb 2008 09:43:30 -0700
Subject: code refactoring, new next_mipmap_level_size() function

---
 src/mesa/main/mipmap.c | 75 +++++++++++++++++++++++++++++++++-----------------
 1 file changed, 50 insertions(+), 25 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index ed7795aef9..721a227bb5 100644
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -894,6 +894,51 @@ _mesa_generate_mipmap_level(GLenum target,
 }
 
 
+/**
+ * compute next (level+1) image size
+ * \return GL_FALSE if no smaller size can be generated (eg. src is 1x1x1 size)
+ */
+static GLboolean
+next_mipmap_level_size(GLenum target, GLint border,
+                       GLint srcWidth, GLint srcHeight, GLint srcDepth,
+                       GLint *dstWidth, GLint *dstHeight, GLint *dstDepth)
+{
+   if (srcWidth - 2 * border > 1) {
+      *dstWidth = (srcWidth - 2 * border) / 2 + 2 * border;
+   }
+   else {
+      *dstWidth = srcWidth; /* can't go smaller */
+   }
+
+   if ((srcHeight - 2 * border > 1) && 
+       (target != GL_TEXTURE_1D_ARRAY_EXT)) {
+      *dstHeight = (srcHeight - 2 * border) / 2 + 2 * border;
+   }
+   else {
+      *dstHeight = srcHeight; /* can't go smaller */
+   }
+
+   if ((srcDepth - 2 * border > 1) &&
+       (target != GL_TEXTURE_2D_ARRAY_EXT)) {
+      *dstDepth = (srcDepth - 2 * border) / 2 + 2 * border;
+   }
+   else {
+      *dstDepth = srcDepth; /* can't go smaller */
+   }
+
+   if (*dstWidth == srcWidth &&
+       *dstHeight == srcHeight &&
+       *dstDepth == srcDepth) {
+      return GL_FALSE;
+   }
+   else {
+      return GL_TRUE;
+   }
+}
+
+
+
+
 /**
  * For GL_SGIX_generate_mipmap:
  * Generate a complete set of mipmaps from texObj's base-level image.
@@ -982,6 +1027,7 @@ _mesa_generate_mipmap(GLcontext *ctx, GLenum target,
       GLint srcWidth, srcHeight, srcDepth;
       GLint dstWidth, dstHeight, dstDepth;
       GLint border, bytesPerTexel;
+      GLboolean nextLevel;
 
       /* get src image parameters */
       srcImage = _mesa_select_tex_image(ctx, texObj, target, level);
@@ -991,31 +1037,10 @@ _mesa_generate_mipmap(GLcontext *ctx, GLenum target,
       srcDepth = srcImage->Depth;
       border = srcImage->Border;
 
-      /* compute next (level+1) image size */
-      if (srcWidth - 2 * border > 1) {
-         dstWidth = (srcWidth - 2 * border) / 2 + 2 * border;
-      }
-      else {
-         dstWidth = srcWidth; /* can't go smaller */
-      }
-      if ((srcHeight - 2 * border > 1) && 
-          (texObj->Target != GL_TEXTURE_1D_ARRAY_EXT)) {
-         dstHeight = (srcHeight - 2 * border) / 2 + 2 * border;
-      }
-      else {
-         dstHeight = srcHeight; /* can't go smaller */
-      }
-      if ((srcDepth - 2 * border > 1) &&
-               (texObj->Target != GL_TEXTURE_2D_ARRAY_EXT)) {
-         dstDepth = (srcDepth - 2 * border) / 2 + 2 * border;
-      }
-      else {
-         dstDepth = srcDepth; /* can't go smaller */
-      }
-
-      if (dstWidth == srcWidth &&
-          dstHeight == srcHeight &&
-          dstDepth == srcDepth) {
+      nextLevel = next_mipmap_level_size(target, border,
+                                         srcWidth, srcHeight, srcDepth,
+                                         &dstWidth, &dstHeight, &dstDepth);
+      if (!nextLevel) {
          /* all done */
          if (srcImage->IsCompressed) {
             _mesa_free((void *) srcData);
-- 
cgit v1.2.3


From b61b1a295b13a0ff2cf98c8d07e62147d71c08b9 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Mon, 11 Feb 2008 10:59:40 -0700
Subject: gallium: take pitch/stride into account in mipmap generation

---
 src/mesa/main/mipmap.c                 | 85 +++++++++++++++++++++-------------
 src/mesa/main/mipmap.h                 |  2 +
 src/mesa/state_tracker/st_gen_mipmap.c |  3 +-
 3 files changed, 57 insertions(+), 33 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index 721a227bb5..d3d1958951 100644
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -447,23 +447,29 @@ make_1d_mipmap(GLenum datatype, GLuint comps, GLint border,
 
 
 /**
- * XXX need to use the tex image's row stride!
+ * Strides are in bytes.  If zero, it'll be computed as width * bpp.
  */
 static void
 make_2d_mipmap(GLenum datatype, GLuint comps, GLint border,
-               GLint srcWidth, GLint srcHeight, const GLubyte *srcPtr,
-               GLint dstWidth, GLint dstHeight, GLubyte *dstPtr)
+               GLint srcWidth, GLint srcHeight,
+               GLint srcRowStride, const GLubyte *srcPtr,
+               GLint dstWidth, GLint dstHeight,
+               GLint dstRowStride, GLubyte *dstPtr)
 {
    const GLint bpt = bytes_per_pixel(datatype, comps);
    const GLint srcWidthNB = srcWidth - 2 * border;  /* sizes w/out border */
    const GLint dstWidthNB = dstWidth - 2 * border;
    const GLint dstHeightNB = dstHeight - 2 * border;
-   const GLint srcRowStride = bpt * srcWidth;
-   const GLint dstRowStride = bpt * dstWidth;
    const GLubyte *srcA, *srcB;
    GLubyte *dst;
    GLint row;
 
+   if (!srcRowStride)
+      srcRowStride = bpt * srcWidth;
+
+   if (!dstRowStride)
+      dstRowStride = bpt * dstWidth;
+
    /* Compute src and dst pointers, skipping any border */
    srcA = srcPtr + border * ((srcWidth + 1) * bpt);
    if (srcHeight > 1) 
@@ -535,8 +541,10 @@ make_2d_mipmap(GLenum datatype, GLuint comps, GLint border,
 static void
 make_3d_mipmap(GLenum datatype, GLuint comps, GLint border,
                GLint srcWidth, GLint srcHeight, GLint srcDepth,
+               GLint srcRowStride,
                const GLubyte *srcPtr,
                GLint dstWidth, GLint dstHeight, GLint dstDepth,
+               GLint dstRowStride,
                GLubyte *dstPtr)
 {
    const GLint bpt = bytes_per_pixel(datatype, comps);
@@ -548,7 +556,6 @@ make_3d_mipmap(GLenum datatype, GLuint comps, GLint border,
    GLvoid *tmpRowA, *tmpRowB;
    GLint img, row;
    GLint bytesPerSrcImage, bytesPerDstImage;
-   GLint bytesPerSrcRow, bytesPerDstRow;
    GLint srcImageOffset, srcRowOffset;
 
    (void) srcDepthNB; /* silence warnings */
@@ -566,8 +573,10 @@ make_3d_mipmap(GLenum datatype, GLuint comps, GLint border,
    bytesPerSrcImage = srcWidth * srcHeight * bpt;
    bytesPerDstImage = dstWidth * dstHeight * bpt;
 
-   bytesPerSrcRow = srcWidth * bpt;
-   bytesPerDstRow = dstWidth * bpt;
+   if (!srcRowStride)
+      srcRowStride = srcWidth * bpt;
+   if (!dstRowStride)
+      dstRowStride = dstWidth * bpt;
 
    /* Offset between adjacent src images to be averaged together */
    srcImageOffset = (srcDepth == dstDepth) ? 0 : bytesPerSrcImage;
@@ -591,13 +600,13 @@ make_3d_mipmap(GLenum datatype, GLuint comps, GLint border,
    for (img = 0; img < dstDepthNB; img++) {
       /* first source image pointer, skipping border */
       const GLubyte *imgSrcA = srcPtr
-         + (bytesPerSrcImage + bytesPerSrcRow + border) * bpt * border
+         + (bytesPerSrcImage + srcRowStride + border) * bpt * border
          + img * (bytesPerSrcImage + srcImageOffset);
       /* second source image pointer, skipping border */
       const GLubyte *imgSrcB = imgSrcA + srcImageOffset;
       /* address of the dest image, skipping border */
       GLubyte *imgDst = dstPtr
-         + (bytesPerDstImage + bytesPerDstRow + border) * bpt * border
+         + (bytesPerDstImage + dstRowStride + border) * bpt * border
          + img * bytesPerDstImage;
 
       /* setup the four source row pointers and the dest row pointer */
@@ -618,11 +627,11 @@ make_3d_mipmap(GLenum datatype, GLuint comps, GLint border,
          do_row(datatype, comps, srcWidthNB, tmpRowA, tmpRowB,
                 dstWidthNB, dstImgRow);
          /* advance to next rows */
-         srcImgARowA += bytesPerSrcRow + srcRowOffset;
-         srcImgARowB += bytesPerSrcRow + srcRowOffset;
-         srcImgBRowA += bytesPerSrcRow + srcRowOffset;
-         srcImgBRowB += bytesPerSrcRow + srcRowOffset;
-         dstImgRow += bytesPerDstRow;
+         srcImgARowA += srcRowStride + srcRowOffset;
+         srcImgARowB += srcRowStride + srcRowOffset;
+         srcImgBRowA += srcRowStride + srcRowOffset;
+         srcImgBRowB += srcRowStride + srcRowOffset;
+         dstImgRow += dstRowStride;
       }
    }
 
@@ -632,12 +641,14 @@ make_3d_mipmap(GLenum datatype, GLuint comps, GLint border,
    /* Luckily we can leverage the make_2d_mipmap() function here! */
    if (border > 0) {
       /* do front border image */
-      make_2d_mipmap(datatype, comps, 1, srcWidth, srcHeight, srcPtr,
-                     dstWidth, dstHeight, dstPtr);
+      make_2d_mipmap(datatype, comps, 1, srcWidth, srcHeight, 0, srcPtr,
+                     dstWidth, dstHeight, 0, dstPtr);
       /* do back border image */
       make_2d_mipmap(datatype, comps, 1, srcWidth, srcHeight,
+                     0, 
                      srcPtr + bytesPerSrcImage * (srcDepth - 1),
                      dstWidth, dstHeight,
+                     0,
                      dstPtr + bytesPerDstImage * (dstDepth - 1));
       /* do four remaining border edges that span the image slices */
       if (srcDepth == dstDepth) {
@@ -653,9 +664,9 @@ make_3d_mipmap(GLenum datatype, GLuint comps, GLint border,
 
             /* do border along [img][row=dstHeight-1][col=0] */
             src = srcPtr + (img * 2 + 1) * bytesPerSrcImage
-                         + (srcHeight - 1) * bytesPerSrcRow;
+                         + (srcHeight - 1) * srcRowStride;
             dst = dstPtr + (img + 1) * bytesPerDstImage
-                         + (dstHeight - 1) * bytesPerDstRow;
+                         + (dstHeight - 1) * dstRowStride;
             MEMCPY(dst, src, bpt);
 
             /* do border along [img][row=0][col=dstWidth-1] */
@@ -687,9 +698,9 @@ make_3d_mipmap(GLenum datatype, GLuint comps, GLint border,
 
             /* do border along [img][row=dstHeight-1][col=0] */
             src = srcPtr + (img * 2 + 1) * bytesPerSrcImage
-                         + (srcHeight - 1) * bytesPerSrcRow;
+                         + (srcHeight - 1) * srcRowStride;
             dst = dstPtr + (img + 1) * bytesPerDstImage
-                         + (dstHeight - 1) * bytesPerDstRow;
+                         + (dstHeight - 1) * dstRowStride;
             do_row(datatype, comps, 1, src, src + srcImageOffset, 1, dst);
 
             /* do border along [img][row=0][col=dstWidth-1] */
@@ -755,8 +766,11 @@ make_1d_stack_mipmap(GLenum datatype, GLuint comps, GLint border,
  */
 static void
 make_2d_stack_mipmap(GLenum datatype, GLuint comps, GLint border,
-                     GLint srcWidth, GLint srcHeight, const GLubyte *srcPtr,
+                     GLint srcWidth, GLint srcHeight,
+                     GLint srcRowStride,
+                     const GLubyte *srcPtr,
                      GLint dstWidth, GLint dstHeight, GLint dstDepth,
+                     GLint dstRowStride,
                      GLubyte *dstPtr)
 {
    const GLint bpt = bytes_per_pixel(datatype, comps);
@@ -764,13 +778,17 @@ make_2d_stack_mipmap(GLenum datatype, GLuint comps, GLint border,
    const GLint dstWidthNB = dstWidth - 2 * border;
    const GLint dstHeightNB = dstHeight - 2 * border;
    const GLint dstDepthNB = dstDepth - 2 * border;
-   const GLint srcRowStride = bpt * srcWidth;
-   const GLint dstRowStride = bpt * dstWidth;
    const GLubyte *srcA, *srcB;
    GLubyte *dst;
    GLint layer;
    GLint row;
 
+   if (!srcRowStride)
+      srcRowStride = bpt * srcWidth;
+
+   if (!dstRowStride)
+      dstRowStride = bpt * dstWidth;
+
    /* Compute src and dst pointers, skipping any border */
    srcA = srcPtr + border * ((srcWidth + 1) * bpt);
    if (srcHeight > 1) 
@@ -849,8 +867,10 @@ _mesa_generate_mipmap_level(GLenum target,
                             GLenum datatype, GLuint comps,
                             GLint border,
                             GLint srcWidth, GLint srcHeight, GLint srcDepth,
+                            GLint srcRowStride,
                             const GLubyte *srcData,
                             GLint dstWidth, GLint dstHeight, GLint dstDepth,
+                            GLint dstRowStride,
                             GLubyte *dstData)
 {
    switch (target) {
@@ -867,13 +887,13 @@ _mesa_generate_mipmap_level(GLenum target,
    case GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB:
    case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB:
       make_2d_mipmap(datatype, comps, border,
-                     srcWidth, srcHeight, srcData,
-                     dstWidth, dstHeight, dstData);
+                     srcWidth, srcHeight, srcRowStride, srcData,
+                     dstWidth, dstHeight, dstRowStride, dstData);
       break;
    case GL_TEXTURE_3D:
       make_3d_mipmap(datatype, comps, border,
-                     srcWidth, srcHeight, srcDepth, srcData,
-                     dstWidth, dstHeight, dstDepth, dstData);
+                     srcWidth, srcHeight, srcDepth, srcRowStride, srcData,
+                     dstWidth, dstHeight, dstDepth, dstRowStride, dstData);
       break;
    case GL_TEXTURE_1D_ARRAY_EXT:
       make_1d_stack_mipmap(datatype, comps, border,
@@ -882,8 +902,8 @@ _mesa_generate_mipmap_level(GLenum target,
       break;
    case GL_TEXTURE_2D_ARRAY_EXT:
       make_2d_stack_mipmap(datatype, comps, border,
-                           srcWidth, srcHeight, srcData,
-                           dstWidth, dstHeight, dstDepth, dstData);
+                           srcWidth, srcHeight, srcRowStride, srcData,
+                           dstWidth, dstHeight, dstDepth, dstRowStride, dstData);
       break;
    case GL_TEXTURE_RECTANGLE_NV:
       /* no mipmaps, do nothing */
@@ -1110,9 +1130,10 @@ _mesa_generate_mipmap(GLcontext *ctx, GLenum target,
          dstData = (GLubyte *) dstImage->Data;
       }
 
+      /* Note, 0 indicates default row strides */
       _mesa_generate_mipmap_level(target, datatype, comps, border,
-                                  srcWidth, srcHeight, srcDepth, srcData,
-                                  dstWidth, dstHeight, dstDepth, dstData);
+                                  srcWidth, srcHeight, srcDepth, 0, srcData,
+                                  dstWidth, dstHeight, dstDepth, 0, dstData);
 
       if (dstImage->IsCompressed) {
          GLubyte *temp;
diff --git a/src/mesa/main/mipmap.h b/src/mesa/main/mipmap.h
index b6491f5507..44ecdddb27 100644
--- a/src/mesa/main/mipmap.h
+++ b/src/mesa/main/mipmap.h
@@ -34,8 +34,10 @@ _mesa_generate_mipmap_level(GLenum target,
                             GLenum datatype, GLuint comps,
                             GLint border,
                             GLint srcWidth, GLint srcHeight, GLint srcDepth,
+                            GLint srcRowStride,
                             const GLubyte *srcData,
                             GLint dstWidth, GLint dstHeight, GLint dstDepth,
+                            GLint dstRowStride,
                             GLubyte *dstData);
 
 
diff --git a/src/mesa/state_tracker/st_gen_mipmap.c b/src/mesa/state_tracker/st_gen_mipmap.c
index f6af37cfac..c152c59905 100644
--- a/src/mesa/state_tracker/st_gen_mipmap.c
+++ b/src/mesa/state_tracker/st_gen_mipmap.c
@@ -352,12 +352,13 @@ fallback_generate_mipmap(GLcontext *ctx, GLenum target,
                                          PIPE_BUFFER_USAGE_CPU_WRITE)
               + dstSurf->offset;
 
-      /* XXX need to take stride/pitch info into account... */
       _mesa_generate_mipmap_level(target, datatype, comps,
                    0 /*border*/,
                    pt->width[srcLevel], pt->height[srcLevel], pt->depth[srcLevel],
+                   srcSurf->pitch * srcSurf->cpp, /* stride in bytes */
                    srcData,
                    pt->width[dstLevel], pt->height[dstLevel], pt->depth[dstLevel],
+                   dstSurf->pitch * dstSurf->cpp, /* stride in bytes */
                    dstData);
 
       ws->buffer_unmap(ws, srcSurf->buffer);
-- 
cgit v1.2.3


From 2d38d1b3005c02273abf3941df5dddc245a6b792 Mon Sep 17 00:00:00 2001
From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Mon, 25 Feb 2008 17:11:28 +0900
Subject: Remove files of unsupported build systems.

---
 Makefile.DJ                             |   88 --
 Makefile.mgw                            |  110 --
 configs/config.mgw                      |   42 -
 descrip.mms                             |   22 -
 mms.config                              |   23 -
 progs/demos/descrip.mms                 |   90 --
 progs/samples/Makefile.DJ               |   85 -
 progs/samples/Makefile.mgw              |   93 --
 progs/tests/descrip.mms                 |   84 -
 progs/util/descrip.mms                  |   42 -
 progs/xdemos/descrip.mms                |   83 -
 src/descrip.mms                         |   43 -
 src/glu/descrip.mms                     |    9 -
 src/glu/mesa/Makefile.DJ                |  100 --
 src/glu/mesa/descrip.mms                |   61 -
 src/glu/mesa/mms_depend                 |   15 -
 src/glu/sgi/Makefile.DJ                 |  188 ---
 src/glu/sgi/Makefile.mgw                |  229 ---
 src/glu/sgi/descrip.mms                 |  451 ------
 src/glut/dos/Makefile.DJ                |  126 --
 src/glut/glx/Makefile.mgw               |  198 ---
 src/glut/glx/descrip.mms                |  208 ---
 src/glut/glx/mms_depend                 |   72 -
 src/mesa/Makefile.DJ                    |  166 --
 src/mesa/Makefile.mgw                   |  235 ---
 src/mesa/descrip.mms                    |   26 -
 src/mesa/drivers/common/descrip.mms     |   38 -
 src/mesa/drivers/osmesa/descrip.mms     |   41 -
 src/mesa/drivers/x11/descrip.mms        |   51 -
 src/mesa/glapi/descrip.mms              |   37 -
 src/mesa/main/descrip.mms               |  221 ---
 src/mesa/math/descrip.mms               |   45 -
 src/mesa/shader/descrip.mms             |   76 -
 src/mesa/shader/grammar/descrip.mms     |   41 -
 src/mesa/shader/slang/descrip.mms       |   65 -
 src/mesa/swrast/descrip.mms             |   80 -
 src/mesa/swrast_setup/descrip.mms       |   39 -
 src/mesa/tnl/descrip.mms                |   75 -
 src/mesa/vbo/descrip.mms                |   60 -
 vms/analyze_map.com                     |  148 --
 vms/xlib.opt                            |    2 -
 vms/xlib_share.opt                      |    7 -
 windows/VC6/mesa/gdi/gdi.dsp            |  211 ---
 windows/VC6/mesa/glu/compileDebug.txt   |   82 -
 windows/VC6/mesa/glu/compileRelease.txt |   82 -
 windows/VC6/mesa/glu/glu.dsp            | 2579 -------------------------------
 windows/VC6/mesa/glu/objectsDebug.txt   |   73 -
 windows/VC6/mesa/glu/objectsRelease.txt |   73 -
 windows/VC6/mesa/mesa.dsw               |   74 -
 windows/VC6/mesa/mesa/mesa.dsp          | 1582 -------------------
 windows/VC6/mesa/osmesa/osmesa.dsp      |  195 ---
 windows/VC6/progs/demos/gears.dsp       |  114 --
 windows/VC6/progs/glut/glut.dsp         |  333 ----
 windows/VC6/progs/progs.dsw             |   41 -
 windows/VC7/mesa/gdi/gdi.vcproj         |  181 ---
 windows/VC7/mesa/glu/glu.vcproj         |  752 ---------
 windows/VC7/mesa/mesa.sln               |   41 -
 windows/VC7/mesa/mesa/mesa.vcproj       | 1114 -------------
 windows/VC7/mesa/osmesa/osmesa.vcproj   |  168 --
 windows/VC7/progs/demos/gears.vcproj    |  154 --
 windows/VC7/progs/glut/glut.vcproj      |  322 ----
 windows/VC7/progs/progs.sln             |   27 -
 windows/VC8/mesa/gdi/gdi.vcproj         |  260 ----
 windows/VC8/mesa/glu/glu.vcproj         | 1022 ------------
 windows/VC8/mesa/mesa.sln               |   43 -
 windows/VC8/mesa/mesa/mesa.vcproj       | 1753 ---------------------
 windows/VC8/mesa/osmesa/osmesa.vcproj   |  243 ---
 windows/VC8/progs/demos/gears.vcproj    |  239 ---
 windows/VC8/progs/glut/glut.vcproj      |  449 ------
 windows/VC8/progs/progs.sln             |   28 -
 70 files changed, 16150 deletions(-)
 delete mode 100644 Makefile.DJ
 delete mode 100644 Makefile.mgw
 delete mode 100644 configs/config.mgw
 delete mode 100644 descrip.mms
 delete mode 100644 mms.config
 delete mode 100644 progs/demos/descrip.mms
 delete mode 100644 progs/samples/Makefile.DJ
 delete mode 100644 progs/samples/Makefile.mgw
 delete mode 100644 progs/tests/descrip.mms
 delete mode 100644 progs/util/descrip.mms
 delete mode 100644 progs/xdemos/descrip.mms
 delete mode 100644 src/descrip.mms
 delete mode 100644 src/glu/descrip.mms
 delete mode 100644 src/glu/mesa/Makefile.DJ
 delete mode 100644 src/glu/mesa/descrip.mms
 delete mode 100644 src/glu/mesa/mms_depend
 delete mode 100644 src/glu/sgi/Makefile.DJ
 delete mode 100644 src/glu/sgi/Makefile.mgw
 delete mode 100644 src/glu/sgi/descrip.mms
 delete mode 100644 src/glut/dos/Makefile.DJ
 delete mode 100644 src/glut/glx/Makefile.mgw
 delete mode 100644 src/glut/glx/descrip.mms
 delete mode 100644 src/glut/glx/mms_depend
 delete mode 100644 src/mesa/Makefile.DJ
 delete mode 100644 src/mesa/Makefile.mgw
 delete mode 100644 src/mesa/descrip.mms
 delete mode 100644 src/mesa/drivers/common/descrip.mms
 delete mode 100644 src/mesa/drivers/osmesa/descrip.mms
 delete mode 100644 src/mesa/drivers/x11/descrip.mms
 delete mode 100644 src/mesa/glapi/descrip.mms
 delete mode 100644 src/mesa/main/descrip.mms
 delete mode 100644 src/mesa/math/descrip.mms
 delete mode 100644 src/mesa/shader/descrip.mms
 delete mode 100644 src/mesa/shader/grammar/descrip.mms
 delete mode 100644 src/mesa/shader/slang/descrip.mms
 delete mode 100644 src/mesa/swrast/descrip.mms
 delete mode 100644 src/mesa/swrast_setup/descrip.mms
 delete mode 100644 src/mesa/tnl/descrip.mms
 delete mode 100644 src/mesa/vbo/descrip.mms
 delete mode 100644 vms/analyze_map.com
 delete mode 100644 vms/xlib.opt
 delete mode 100644 vms/xlib_share.opt
 delete mode 100644 windows/VC6/mesa/gdi/gdi.dsp
 delete mode 100644 windows/VC6/mesa/glu/compileDebug.txt
 delete mode 100644 windows/VC6/mesa/glu/compileRelease.txt
 delete mode 100644 windows/VC6/mesa/glu/glu.dsp
 delete mode 100644 windows/VC6/mesa/glu/objectsDebug.txt
 delete mode 100644 windows/VC6/mesa/glu/objectsRelease.txt
 delete mode 100644 windows/VC6/mesa/mesa.dsw
 delete mode 100644 windows/VC6/mesa/mesa/mesa.dsp
 delete mode 100644 windows/VC6/mesa/osmesa/osmesa.dsp
 delete mode 100644 windows/VC6/progs/demos/gears.dsp
 delete mode 100644 windows/VC6/progs/glut/glut.dsp
 delete mode 100644 windows/VC6/progs/progs.dsw
 delete mode 100644 windows/VC7/mesa/gdi/gdi.vcproj
 delete mode 100644 windows/VC7/mesa/glu/glu.vcproj
 delete mode 100644 windows/VC7/mesa/mesa.sln
 delete mode 100644 windows/VC7/mesa/mesa/mesa.vcproj
 delete mode 100644 windows/VC7/mesa/osmesa/osmesa.vcproj
 delete mode 100644 windows/VC7/progs/demos/gears.vcproj
 delete mode 100644 windows/VC7/progs/glut/glut.vcproj
 delete mode 100644 windows/VC7/progs/progs.sln
 delete mode 100644 windows/VC8/mesa/gdi/gdi.vcproj
 delete mode 100644 windows/VC8/mesa/glu/glu.vcproj
 delete mode 100644 windows/VC8/mesa/mesa.sln
 delete mode 100644 windows/VC8/mesa/mesa/mesa.vcproj
 delete mode 100644 windows/VC8/mesa/osmesa/osmesa.vcproj
 delete mode 100644 windows/VC8/progs/demos/gears.vcproj
 delete mode 100644 windows/VC8/progs/glut/glut.vcproj
 delete mode 100644 windows/VC8/progs/progs.sln

(limited to 'src/mesa/main')

diff --git a/Makefile.DJ b/Makefile.DJ
deleted file mode 100644
index deaac09d18..0000000000
--- a/Makefile.DJ
+++ /dev/null
@@ -1,88 +0,0 @@
-# Mesa 3-D graphics library
-# Version:  4.0
-# 
-# Copyright (C) 1999  Brian Paul   All Rights Reserved.
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-# DOS/DJGPP makefile for Mesa
-#
-#  Author: Daniel Borca
-#  Email : dborca@users.sourceforge.net
-#  Web   : http://www.geocities.com/dborca
-
-
-#
-#  Available options:
-#
-#    Environment variables:
-#	GLIDE		path to Glide3 SDK; used with FX.
-#			default = $(TOP)/glide3
-#	FX=1		build for 3dfx Glide3. Note that this disables
-#			compilation of most DMesa code and requires fxMesa.
-#			As a consequence, you'll need the DJGPP Glide3
-#			library to build any application.
-#			default = no
-#	X86=1		optimize for x86 (if possible, use MMX, SSE, 3DNow).
-#			default = no
-#
-#    Targets:
-#	all:		build everything
-#	libgl:		build GL
-#	libglu:		build GLU
-#	libglut:	build GLUT
-#	clean:		remove object files
-#	realclean:	remove all generated files
-#
-
-
-
-.PHONY : all libgl libglu libglut clean realclean
-
-CFLAGS = -Wall -W -pedantic
-CFLAGS += -O2 -ffast-math
-
-export CFLAGS
-
-ifeq ($(wildcard $(addsuffix /rm.exe,$(subst ;, ,$(PATH)))),)
-UNLINK = del $(subst /,\,$(1))
-else
-UNLINK = $(RM) $(1)
-endif
-
-all: libgl libglu libglut
-
-libgl: lib
-	$(MAKE) -f Makefile.DJ -C src/mesa
-libglu: lib
-	$(MAKE) -f Makefile.DJ -C src/glu/sgi
-libglut: lib
-	$(MAKE) -f Makefile.DJ -C src/glut/dos
-
-lib:
-	mkdir lib
-
-clean:
-	$(MAKE) -f Makefile.DJ clean -C src/mesa
-	$(MAKE) -f Makefile.DJ clean -C src/glu/mesa
-	$(MAKE) -f Makefile.DJ clean -C src/glu/sgi
-	$(MAKE) -f Makefile.DJ clean -C src/glut/dos
-
-realclean: clean
-	-$(call UNLINK,lib/*.a)
-	-$(call UNLINK,lib/*.dxe)
diff --git a/Makefile.mgw b/Makefile.mgw
deleted file mode 100644
index 3dc9f62643..0000000000
--- a/Makefile.mgw
+++ /dev/null
@@ -1,110 +0,0 @@
-# Mesa 3-D graphics library
-# Version:  4.0
-# 
-# Copyright (C) 1999  Brian Paul   All Rights Reserved.
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-# MinGW makefile v1.2 for Mesa
-#
-#  Copyright (C) 2002 - Daniel Borca
-#  Email : dborca@users.sourceforge.net
-#  Web   : http://www.geocities.com/dborca
-
-
-#
-#  Available options:
-#
-#    Environment variables:
-#	GLIDE		path to Glide3 SDK; used with FX.
-#			default = $(TOP)/glide3
-#	FX=1		build for 3dfx Glide3. Note that this disables
-#			compilation of most WMesa code and requires fxMesa.
-#			As a consequence, you'll need the Win32 Glide3
-#			library to build any application.
-#			default = no
-#	ICD=1		build the installable client driver interface
-#			(windows opengl driver interface)
-#			default = no
-#	X86=1		optimize for x86 (if possible, use MMX, SSE, 3DNow).
-#			default = no
-#
-#    Targets:
-#	all:		build everything
-#	libgl:		build GL
-#	clean:		remove object files
-#	realclean:	remove all generated files
-#
-
-# MinGW core makefile updated for Mesa 7.0
-#
-#  Updated : by Heromyth, on 2007-7-21
-#  Email   : zxpmyth@yahoo.com.cn
-#  Bugs    : 1) All the default settings work fine. But the setting X86=1 can't work. 
-#            The others havn't been tested yet.
-#            2) The generated DLLs are *not* compatible with the ones built
-#            with the other compilers like VC8, especially for GLUT. 
-#            3) MAlthough more tests are needed, it can be used individually!
-
-
-.PHONY : all libgl clean realclean
-
-ifeq ($(ICD),1)
-  # when -std=c99 mingw will not define WIN32
-  CFLAGS = -Wall -Werror
-else
-  # I love c89
-  CFLAGS = -Wall -pedantic
-endif
-CFLAGS += -O2 -ffast-math
-
-export CFLAGS
-
-
-ifeq ($(wildcard $(addsuffix /rm.exe,$(subst ;, ,$(PATH)))),)
-UNLINK = del $(subst /,\,$(1))
-else
-UNLINK = $(RM) $(1)
-endif
-
-all: libgl libglu libglut example
-
-libgl: lib
-	$(MAKE) -f Makefile.mgw -C src/mesa
-
-libglu: libgl
-	$(MAKE) -f Makefile.mgw -C src/glu/sgi
-
-libglut: libglu 
-	$(MAKE) -f Makefile.mgw -C src/glut/glx
-
-example: libglut 
-	$(MAKE) -f Makefile.mgw star -C progs/samples
-	copy progs\samples\star.exe lib
-
-lib:
-	mkdir lib
-
-clean:
-	$(MAKE) -f Makefile.mgw clean -C src/mesa
-	$(MAKE) -f Makefile.mgw clean -C src/glu/sgi
-	$(MAKE) -f Makefile.mgw clean -C src/glut/glx
-
-realclean: clean
-	-$(call UNLINK,lib/*.a)
-	-$(call UNLINK,lib/*.dll)
diff --git a/configs/config.mgw b/configs/config.mgw
deleted file mode 100644
index b961eb965c..0000000000
--- a/configs/config.mgw
+++ /dev/null
@@ -1,42 +0,0 @@
-# MinGW config include file updated for Mesa 7.0
-#
-#  Updated : by Heromyth, on 2007-7-21
-#  Email   : zxpmyth@yahoo.com.cn
-#  Bugs    : 1) All the default settings work fine. But the setting X86=1 can't work. 
-#            The others havn't been tested yet.
-#            2) The generated DLLs are *not* compatible with the ones built
-#            with the other compilers like VC8, especially for GLUT. 
-#            3) Although more tests are needed, it can be used individually!
-
-# The generated DLLs by MingW with STDCALL are not totally compatible 
-# with the ones linked by Microsoft's compilers.
-#
-# xxx_USING_STDCALL = 1          Compiling MESA with __stdcall. This is default!
-# 
-# xxx_USING_STDCALL = 0          Compiling MESA without __stdcall. I like this:)
-#  
-
-# In fact, GL_USING_STDCALL and GLUT_USING_STDCALL can be
-# different. For example:
-#
-#   GL_USING_STDCALL = 0
-#   GLUT_USING_STDCALL = 1
-# 
-# Suggested setting:
-#
-#     ALL_USING_STDCALL = 1
-#
-# That's default!
-#
-
-
-ALL_USING_STDCALL = 1
-
-
-ifeq ($(ALL_USING_STDCALL),1)
-  GL_USING_STDCALL = 1
-  GLUT_USING_STDCALL = 1
-else
-  GL_USING_STDCALL = 0
-  GLUT_USING_STDCALL = 0
-endif
diff --git a/descrip.mms b/descrip.mms
deleted file mode 100644
index f2f8434913..0000000000
--- a/descrip.mms
+++ /dev/null
@@ -1,22 +0,0 @@
-# Makefile for Mesa for VMS
-# contributed by Jouk Jansen  joukj@hrem.stm.tudelft.nl
-
-macro : 
-        @ macro=""
-.ifdef NOSHARE
-.else
-	@ if f$getsyi("HW_MODEL") .ge. 1024 then macro= "/MACRO=(SHARE=1)"
-.endif
-	$(MMS)$(MMSQUALIFIERS)'macro' all
-
-all :
-	if f$search("lib.dir") .eqs. "" then create/directory [.lib]
-	set default [.src]
-	$(MMS)$(MMSQUALIFIERS)
-	set default [-.progs.util]
-	$(MMS)$(MMSQUALIFIERS)
-	set default [-.demos]
-	$(MMS)$(MMSQUALIFIERS)
-	set default [-.xdemos]
-	$(MMS)$(MMSQUALIFIERS)
-	if f$search("[-]tests.DIR") .nes. "" then pipe set default [-.tests] ; $(MMS)$(MMSQUALIFIERS)
diff --git a/mms.config b/mms.config
deleted file mode 100644
index 6a960084b3..0000000000
--- a/mms.config
+++ /dev/null
@@ -1,23 +0,0 @@
-# Makefile for VMS
-# contributed by Jouk Jansen  joukj@hrem.stm.tudelft.nl
-
-
-#vms
-.ifdef SHARE
-GL_SHAR = libMesaGL.exe
-GLU_SHAR = libMesaGLU.exe
-GLUT_SHAR = libglut.exe
-.endif
-GL_LIB = libMesaGL.olb
-GLU_LIB = libMesaGLU.olb
-GLUT_LIB = libglut.olb
-CC = cc
-CXX = cxx/define=(LIBRARYBUILD=1)/assume=(nostdnew,noglobal_array_new)
-CFLAGS1 =
-MAKELIB = library/create
-RANLIB = true
-.ifdef SHARE
-XLIBS = [--.vms]xlib_share/opt
-.else
-XLIBS = [--.vms]xlib/opt
-.endif
diff --git a/progs/demos/descrip.mms b/progs/demos/descrip.mms
deleted file mode 100644
index bb2489fc3b..0000000000
--- a/progs/demos/descrip.mms
+++ /dev/null
@@ -1,90 +0,0 @@
-# Makefile for GLUT-based demo programs for VMS
-# contributed by Jouk Jansen  joukj@hrem.stm.tudelft.nl
-# Last update : 20 May 2005
-
-.first
-	define gl [--.include.gl]
-
-.include [--]mms.config
-
-##### MACROS #####
-
-INCDIR = ([--.include],[-.util])
-CFLAGS =/include=$(INCDIR)/prefix=all/name=(as_is,short)/float=ieee/ieee=denorm
-
-.ifdef SHARE
-GL_LIBS = $(XLIBS)
-LIB_DEP = [--.lib]$(GL_SHAR) [--.lib]$(GLU_SHAR) [--.lib]$(GLUT_SHAR)
-.else
-GL_LIBS = [--.lib]libGLUT/l,libMesaGLU/l,libMesaGL/l,$(XLIBS)
-LIB_DEP = [--.lib]$(GL_LIB) [--.lib]$(GLU_LIB) [--.lib]$(GLUT_LIB)
-.endif
-
-
-PROGS = bounce.exe;,clearspd.exe;,drawpix.exe;,gamma.exe;,gears.exe;,\
-	glinfo.exe;,glutfx.exe;,isosurf.exe;,morph3d.exe;,\
-	paltex.exe;,pointblast.exe;,reflect.exe;,spectex.exe;,stex3d.exe;,\
-	tessdemo.exe;,texcyl.exe;,texobj.exe;,trispd.exe;,winpos.exe;
-
-
-##### RULES #####
-.obj.exe :
-	cxxlink $(MMS$TARGET_NAME),$(GL_LIBS)
-
-##### TARGETS #####
-default :
-	$(MMS)$(MMSQUALIFIERS) $(PROGS)
-
-clean :
-	delete *.obj;*
-
-realclean :
-	delete $(PROGS)
-	delete *.obj;*
-
-bounce.exe; : bounce.obj $(LIB_DEP)
-clearspd.exe; : clearspd.obj $(LIB_DEP)
-drawpix.exe; : drawpix.obj $(LIB_DEP) [-.util]readtex.obj
-	cxxlink $(MMS$TARGET_NAME),[-.util]readtex.obj,$(GL_LIBS)
-gamma.exe; : gamma.obj $(LIB_DEP)
-gears.exe; : gears.obj $(LIB_DEP)
-glinfo.exe; : glinfo.obj $(LIB_DEP)
-glutfx.exe; : glutfx.obj $(LIB_DEP)
-isosurf.exe; : isosurf.obj $(LIB_DEP) [-.util]readtex.obj
-	cxxlink $(MMS$TARGET_NAME),[-.util]readtex.obj,$(GL_LIBS)
-morph3d.exe; : morph3d.obj $(LIB_DEP)
-paltex.exe; : paltex.obj $(LIB_DEP)
-pointblast.exe; : pointblast.obj $(LIB_DEP)
-reflect.exe; : reflect.obj [-.util]readtex.obj [-.util]showbuffer.obj\
-	$(LIB_DEP)
-	cxxlink $(MMS$TARGET_NAME),[-.util]readtex,showbuffer,$(GL_LIBS)
-spectex.exe; : spectex.obj $(LIB_DEP)
-stex3d.exe; : stex3d.obj $(LIB_DEP)
-tessdemo.exe; : tessdemo.obj $(LIB_DEP)
-texcyl.exe; : texcyl.obj [-.util]readtex.obj $(LIB_DEP)
-	cxxlink $(MMS$TARGET_NAME),[-.util]readtex.obj,$(GL_LIBS)
-texobj.exe; : texobj.obj $(LIB_DEP)
-trispd.exe; : trispd.obj $(LIB_DEP)
-winpos.exe; : winpos.obj [-.util]readtex.obj $(LIB_DEP)
-	cxxlink $(MMS$TARGET_NAME),[-.util]readtex.obj,$(GL_LIBS)
-
-
-bounce.obj : bounce.c
-clearspd.obj : clearspd.c
-drawpix.obj : drawpix.c
-gamma.obj : gamma.c
-gears.obj : gears.c
-glinfo.obj : glinfo.c
-glutfx.obj : glutfx.c
-isosurf.obj : isosurf.c
-morph3d.obj : morph3d.c
-paltex.obj : paltex.c
-pointblast.obj : pointblast.c
-reflect.obj : reflect.c
-spectex.obj : spectex.c
-stex3d.obj : stex3d.c
-tessdemo.obj : tessdemo.c
-texcyl.obj : texcyl.c
-texobj.obj : texobj.c
-trispd.obj : trispd.c
-winpos.obj : winpos.c
diff --git a/progs/samples/Makefile.DJ b/progs/samples/Makefile.DJ
deleted file mode 100644
index cda4e05941..0000000000
--- a/progs/samples/Makefile.DJ
+++ /dev/null
@@ -1,85 +0,0 @@
-# Mesa 3-D graphics library
-# Version:  4.0
-# 
-# Copyright (C) 1999  Brian Paul   All Rights Reserved.
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-# DOS/DJGPP samples makefile v1.6 for Mesa
-#
-#  Copyright (C) 2002 - Daniel Borca
-#  Email : dborca@users.sourceforge.net
-#  Web   : http://www.geocities.com/dborca
-
-
-#
-#  Available options:
-#
-#    Environment variables:
-#	GLIDE		path to Glide3 SDK; used with FX.
-#			default = $(TOP)/glide3
-#	FX=1		build for 3dfx Glide3. Note that this disables
-#			compilation of most DMesa code and requires fxMesa.
-#			As a consequence, you'll need the DJGPP Glide3
-#			library to build any application.
-#			default = no
-#	DXE=1		use DXE modules (see README.DJ for details).
-#			default = no
-#
-#    Targets:
-#	<file.exe>	build a specific file
-#
-
-
-
-.PHONY: all
-.SUFFIXES: .c .o .exe
-.SECONDARY: ../util/readtex.o ../util/showbuffer.o
-
-TOP = ../..
-GLIDE ?= $(TOP)/glide3
-
-CC = gcc
-CFLAGS = -Wall -W -pedantic
-CFLAGS += -O2 -ffast-math
-CFLAGS += -I$(TOP)/include -I../util
-CFLAGS += -DGLUT_IMPORT_LIB
-ifeq ($(FX),1)
-CFLAGS += -DFX
-endif
-
-LD = gxx
-LDFLAGS = -s -L$(TOP)/lib
-
-ifeq ($(DXE),1)
-LDLIBS += -liglut -liglu -ligl
-else
-LDLIBS = -lglut -lglu -lgl
-ifeq ($(FX),1)
-LDFLAGS += -L$(GLIDE)/lib
-LDLIBS += -lgld3x
-endif
-endif
-
-.c.o:
-	$(CC) -o $@ $(CFLAGS) -c $<
-%.exe: ../util/readtex.o ../util/showbuffer.o %.o
-	$(LD) -o $@ $(LDFLAGS) $^ $(LDLIBS)
-
-all:
-	$(error Must specify <filename.exe> to build)
diff --git a/progs/samples/Makefile.mgw b/progs/samples/Makefile.mgw
deleted file mode 100644
index 3b2fd785de..0000000000
--- a/progs/samples/Makefile.mgw
+++ /dev/null
@@ -1,93 +0,0 @@
-# Mesa 3-D graphics library
-# Version:  4.0
-# 
-# Copyright (C) 1999  Brian Paul   All Rights Reserved.
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-# MinGW samples makefile v1.2 for Mesa
-#
-#  Copyright (C) 2002 - Daniel Borca
-#  Email : dborca@users.sourceforge.net
-#  Web   : http://www.geocities.com/dborca
-
-# MinGW samples makefile updated for Mesa 7.0
-#
-#  Updated : by Heromyth, on 2007-7-21
-#  Email   : zxpmyth@yahoo.com.cn
-#  Bugs    : 1) All the default settings work fine. But the setting X86=1 can't work. 
-#            The others havn't been tested yet.
-#            2) The generated DLLs are *not* compatible with the ones built
-#            with the other compilers like VC8, especially for GLUT. 
-#            3) Although more tests are needed, it can be used individually!
-
-#
-#  Available options:
-#
-#    Environment variables:
-#
-#    Targets:
-#	<file.exe>	build a specific file
-#
-
-
-
-.PHONY: all
-.SUFFIXES: .c .o .exe
-.SECONDARY: ../util/readtex.o ../util/showbuffer.o
-
-TOP = ../..
-
-include $(TOP)/configs/config.mgw
-ALL_USING_STDCALL ?= 1
-GL_USING_STDCALL ?= 1
-GLUT_USING_STDCALL ?= 1
-
-CC = mingw32-gcc
-CFLAGS = -Wall -pedantic
-CFLAGS += -O2 -ffast-math
-CFLAGS += -I$(TOP)/include -I../util
-ifeq ($(FX),1)
-  CFLAGS += -DFX
-endif
-
-CFLAGS += -DGLUT_DISABLE_ATEXIT_HACK
-
-ifeq ($(GL_USING_STDCALL),0)
-  CFLAGS += -DGL_NO_STDCALL
-endif
-
-ifeq ($(GLUT_USING_STDCALL),1)
-  CFLAGS += -D_STDCALL_SUPPORTED
-else
-  CFLAGS += -DGLUT_NO_STDCALL
-endif
-
-
-LD = mingw32-g++
-LDFLAGS = -s -L$(TOP)/lib
-
-LDLIBS = -lglut32 -lglu32 -lopengl32
-
-.c.o:
-	$(CC) -o $@ $(CFLAGS) -c $<
-%.exe: ../util/readtex.o ../util/showbuffer.o %.o
-	$(LD) -o $@ $(LDFLAGS) $^ $(LDLIBS)
-
-all:
-	$(error Must specify <filename.exe> to build)
diff --git a/progs/tests/descrip.mms b/progs/tests/descrip.mms
deleted file mode 100644
index 567b76bc4b..0000000000
--- a/progs/tests/descrip.mms
+++ /dev/null
@@ -1,84 +0,0 @@
-# Makefile for GLUT-based demo programs for VMS
-# contributed by Jouk Jansen  joukj@hrem.stm.tudelft.nl
-
-
-.first
-	define gl [--.include.gl]
-
-.include [--]mms.config
-
-##### MACROS #####
-
-INCDIR = ([--.include],[-.util])
-CFLAGS = /include=$(INCDIR)/prefix=all/name=(as_is,short)/float=ieee/ieee=denorm
-
-.ifdef SHARE
-GL_LIBS = $(XLIBS)
-.else
-GL_LIBS = [--.lib]libGLUT/l,libMesaGLU/l,libMesaGL/l,$(XLIBS)
-.endif
-
-LIB_DEP = [--.lib]$(GL_LIB) [--.lib]$(GLU_LIB) [--.lib]$(GLUT_LIB)
-
-PROGS = cva.exe,\
-	dinoshade.exe,\
-	fogcoord.exe,\
-	manytex.exe,\
-	multipal.exe,\
-	projtex.exe,\
-	seccolor.exe,\
-	sharedtex.exe,\
-	texline.exe,\
-	texwrap.exe,\
-	vptest1.exe,\
-	vptest2.exe,\
-	vptest3.exe,\
-	vptorus.exe,\
-	vpwarpmesh.exe
-
-##### RULES #####
-.obj.exe :
-	cxxlink $(MMS$TARGET_NAME),$(GL_LIBS)
-
-##### TARGETS #####
-default :
-	$(MMS)$(MMSQUALIFIERS) $(PROGS)
-
-clean :
-	delete *.obj;*
-
-realclean :
-	delete $(PROGS)
-	delete *.obj;*
-
-cva.exe : cva.obj $(LIB_DEP)
-dinoshade.exe : dinoshade.obj $(LIB_DEP)
-fogcoord.exe : fogcoord.obj $(LIB_DEP)
-manytex.exe : manytex.obj $(LIB_DEP)
-multipal.exe : multipal.obj $(LIB_DEP)
-projtex.exe : projtex.obj $(LIB_DEP)
-seccolor.exe : seccolor.obj $(LIB_DEP)
-sharedtex.exe : sharedtex.obj $(LIB_DEP)
-texline.exe : texline.obj $(LIB_DEP)
-texwrap.exe : texwrap.obj $(LIB_DEP)
-vptest1.exe : vptest1.obj $(LIB_DEP)
-vptest2.exe : vptest2.obj $(LIB_DEP)
-vptest3.exe : vptest3.obj $(LIB_DEP)
-vptorus.exe : vptorus.obj $(LIB_DEP)
-vpwarpmesh.exe : vpwarpmesh.obj $(LIB_DEP)
-
-cva.obj : cva.c
-dinoshade.obj : dinoshade.c
-fogcoord.obj : fogcoord.c
-manytex.obj : manytex.c
-multipal.obj : multipal.c
-projtex.obj : projtex.c
-seccolor.obj : seccolor.c
-sharedtex.obj : sharedtex.c
-texline.obj : texline.c
-texwrap.obj : texwrap.c
-vptest1.obj : vptest1.c
-vptest2.obj : vptest2.c
-vptest3.obj : vptest3.c
-vptorus.obj : vptorus.c
-vpwarpmesh.obj : vpwarpmesh.c
diff --git a/progs/util/descrip.mms b/progs/util/descrip.mms
deleted file mode 100644
index b2ee5ec971..0000000000
--- a/progs/util/descrip.mms
+++ /dev/null
@@ -1,42 +0,0 @@
-# Makefile for GLUT-based demo programs for VMS
-# contributed by Jouk Jansen  joukj@crys.chem.uva.nl
-
-
-.first
-	define gl [--.include.gl]
-
-.include [--]mms.config
-
-##### MACROS #####
-
-INCDIR = ([--.include],[-.util])
-CFLAGS = /include=$(INCDIR)/prefix=all/name=(as_is,short)/float=ieee/ieee=denorm
-
-.ifdef SHARE
-GL_LIBS = $(XLIBS)
-LIB_DEP = [--.lib]$(GL_SHAR) [--.lib]$(GLU_SHAR) [--.lib]$(GLUT_SHAR)
-.else
-GL_LIBS = [--.lib]libGLUT/l,libMesaGLU/l,libMesaGL/l,$(XLIBS)
-LIB_DEP = [--.lib]$(GL_LIB) [--.lib]$(GLU_LIB) [--.lib]$(GLUT_LIB)
-.endif
-
-
-OBJS =readtex.obj,showbuffer.obj
-
-
-##### RULES #####
-.obj.exe :
-	cxxlink $(MMS$TARGET_NAME),$(GL_LIBS)
-
-##### TARGETS #####
-default :
-	$(MMS)$(MMSQUALIFIERS) $(OBJS)
-
-clean :
-	delete *.obj;*
-
-realclean :
-	delete *.obj;*
-
-readtex.obj : readtex.c
-showbuffer.obj : showbuffer.c
diff --git a/progs/xdemos/descrip.mms b/progs/xdemos/descrip.mms
deleted file mode 100644
index fe6a3c44e6..0000000000
--- a/progs/xdemos/descrip.mms
+++ /dev/null
@@ -1,83 +0,0 @@
-# Makefile for GLUT-based demo programs for VMS
-# contributed by Jouk Jansen  joukj@hrem.stm.tudelft.nl
-
-
-.first
-	define gl [--.include.gl]
-
-.include [--]mms.config
-
-##### MACROS #####
-
-INCDIR = ([--.include],[-.util])
-CFLAGS = /include=$(INCDIR)/prefix=all/name=(as_is,short)/nowarn/float=ieee/ieee=denorm
-
-.ifdef SHARE
-GL_LIBS = $(XLIBS)
-.else
-GL_LIBS = [--.lib]libGLUT/l,libMesaGLU/l,libMesaGL/l,$(XLIBS)
-.endif
-
-LIB_DEP = [--.lib]$(GL_LIB) [--.lib]$(GLU_LIB) [--.lib]$(GLUT_LIB)
-
-PROGS =glthreads.exe,\
-	glxdemo.exe,\
-	glxgears.exe,\
-	glxheads.exe,\
-	glxinfo.exe,\
-	glxpixmap.exe,\
-	manywin.exe,\
-	offset.exe,\
-	pbinfo.exe,\
-	pbdemo.exe,\
-	wincopy.exe,\
-	xdemo.exe,\
-	xfont.exe
-
-##### RULES #####
-.obj.exe :
-	cxxlink $(MMS$TARGET_NAME),$(GL_LIBS)
-
-##### TARGETS #####
-default :
-	$(MMS)$(MMSQUALIFIERS) $(PROGS)
-
-clean :
-	delete *.obj;*
-
-realclean :
-	delete $(PROGS)
-	delete *.obj;*
-
-
-glthreads.exe : glthreads.obj $(LIB_DEP) 
-glxdemo.exe : glxdemo.obj $(LIB_DEP)
-glxgears.exe : glxgears.obj $(LIB_DEP)
-glxheads.exe : glxheads.obj $(LIB_DEP)
-glxinfo.exe : glxinfo.obj $(LIB_DEP)
-glxpixmap.exe : glxpixmap.obj $(LIB_DEP)
-manywin.exe : manywin.obj $(LIB_DEP)
-offset.exe : offset.obj $(LIB_DEP)
-pbinfo.exe : pbinfo.obj pbutil.obj $(LIB_DEP)
-	cxxlink pbinfo.obj,pbutil.obj,$(GL_LIBS)
-pbdemo.exe : pbdemo.obj pbutil.obj $(LIB_DEP)
-	cxxlink pbdemo.obj,pbutil.obj,$(GL_LIBS)
-wincopy.exe : wincopy.obj $(LIB_DEP)
-xdemo.exe : xdemo.obj $(LIB_DEP)
-xfont.exe :xfont.obj $(LIB_DEP)
-
-
-glthreads.obj : glthreads.c 
-glxdemo.obj : glxdemo.c
-glxgears.obj : glxgears.c
-glxheads.obj : glxheads.c
-glxinfo.obj : glxinfo.c
-glxpixmap.obj : glxpixmap.c
-manywin.obj : manywin.c
-offset.obj : offset.c
-pbinfo.obj : pbinfo.c
-pbutil.obj : pbutil.c
-pbdemo.obj : pbdemo.c
-wincopy.obj : wincopy.c
-xdemo.obj : xdemo.c
-xfont.obj :xfont.c
diff --git a/src/descrip.mms b/src/descrip.mms
deleted file mode 100644
index 79c7d98d25..0000000000
--- a/src/descrip.mms
+++ /dev/null
@@ -1,43 +0,0 @@
-# Makefile for Mesa for VMS
-# contributed by Jouk Jansen  joukj@hrem.stm.tudelft.nl
-
-.include [-]mms.config
-
-all :
-	set default [.mesa]
-	$(MMS)$(MMSQUALIFIERS)
-	set default [-]
-.ifdef SHARE
-	$(MMS)$(MMSQUALIFIERS) [-.lib]$(GL_SHAR)
-.endif
-	set default [.glu]
-	$(MMS)$(MMSQUALIFIERS)
-	set default [-.glut.glx]
-	$(MMS)$(MMSQUALIFIERS)
-	set default [--]
-
-[-.lib]$(GL_SHAR) : [-.lib]$(GL_LIB)
-	@ WRITE_ SYS$OUTPUT "  generating libmesa.opt"
-	@ library/extract=* [-.lib]$(GL_LIB)
-	@ OPEN_/WRITE FILE  libmesa.opt
-	@ WRITE_ FILE "!"
-	@ WRITE_ FILE "! libmesa.opt generated by DESCRIP.$(MMS_EXT)" 
-	@ WRITE_ FILE "!"
-	@ WRITE_ FILE "IDENTIFICATION=""mesa5.1"""
-	@ WRITE_ FILE "GSMATCH=LEQUAL,5,1
-	@ WRITE_ FILE "libmesagl.obj"
-	@ write_ file "sys$share:decw$xextlibshr/share"
-	@ write_ file "sys$share:decw$xlibshr/share"
-	@ write_ file "sys$share:pthread$rtl/share"
-	@ CLOSE_ FILE
-	@ $(MMS)$(MMSQUALIFIERS)/ignore=warning mesa_vms
-	@ WRITE_ SYS$OUTPUT "  linking ..."
-	@ LINK_/NODEB/SHARE=[-.lib]$(GL_SHAR)/MAP=libmesa.map/FULL libmesa.opt/opt,\
-	mesa_vms.opt/opt
-	@ delete libmesagl.obj;*
-
-mesa_vms :
-	@ WRITE_ SYS$OUTPUT "  generating libmesa.map ..."
-	@ LINK_/NODEB/NOSHARE/NOEXE/MAP=libmesa.map/FULL libmesa.opt/OPT
-	@ WRITE_ SYS$OUTPUT "  analyzing libmesa.map ..."
-	@ @[-.vms]analyze_map.com libmesa.map mesa_vms.opt
diff --git a/src/glu/descrip.mms b/src/glu/descrip.mms
deleted file mode 100644
index 6d5cd858da..0000000000
--- a/src/glu/descrip.mms
+++ /dev/null
@@ -1,9 +0,0 @@
-# Makefile for Mesa for VMS
-# contributed by Jouk Jansen  joukj@hrem.stm.tudelft.nl
-
-all :
-# PIPE is avalailable on VMS7.0 and higher. For lower versions split the
-#command in two conditional command.   JJ
-	if f$search("SYS$SYSTEM:CXX$COMPILER.EXE") .nes. "" then pipe set default [.sgi] ; $(MMS)$(MMSQUALIFIERS)
-	if f$search("SYS$SYSTEM:CXX$COMPILER.EXE") .eqs. "" then pipe set default [.mesa] ; $(MMS)$(MMSQUALIFIERS)
-	set default [-]
diff --git a/src/glu/mesa/Makefile.DJ b/src/glu/mesa/Makefile.DJ
deleted file mode 100644
index 92bcdaae94..0000000000
--- a/src/glu/mesa/Makefile.DJ
+++ /dev/null
@@ -1,100 +0,0 @@
-# Mesa 3-D graphics library
-# Version:  4.0
-# 
-# Copyright (C) 1999  Brian Paul   All Rights Reserved.
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-# DOS/DJGPP glu makefile v1.5 for Mesa
-#
-#  Copyright (C) 2002 - Daniel Borca
-#  Email : dborca@users.sourceforge.net
-#  Web   : http://www.geocities.com/dborca
-
-
-#
-#  Available options:
-#
-#    Environment variables:
-#	CFLAGS
-#
-#    Targets:
-#	all:		build GLU
-#	clean:		remove object files
-#
-
-
-
-.PHONY: all clean
-
-TOP = ../../..
-LIBDIR = $(TOP)/lib
-GLU_LIB = libglu.a
-GLU_DXE = glu.dxe
-GLU_IMP = libiglu.a
-
-export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH);$(LIBDIR);$(GLIDE)/lib
-
-CC = gcc
-CFLAGS += -I$(TOP)/include
-
-AR = ar
-ARFLAGS = crus
-
-HAVEDXE3 = $(wildcard $(DJDIR)/bin/dxe3gen.exe)
-
-ifeq ($(wildcard $(addsuffix /rm.exe,$(subst ;, ,$(PATH)))),)
-UNLINK = del $(subst /,\,$(1))
-else
-UNLINK = $(RM) $(1)
-endif
-
-CORE_SOURCES = \
-	glu.c \
-	mipmap.c \
-	nurbs.c \
-	nurbscrv.c \
-	nurbssrf.c \
-	nurbsutl.c \
-	polytest.c \
-	project.c \
-	quadric.c \
-	tess.c \
-	tesselat.c
-
-SOURCES = $(CORE_SOURCES)
-
-OBJECTS = $(SOURCES:.c=.o)
-
-.c.o:
-	$(CC) -o $@ $(CFLAGS) -c $<
-
-all: $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLU_DXE) $(LIBDIR)/$(GLU_IMP)
-
-$(LIBDIR)/$(GLU_LIB): $(OBJECTS)
-	$(AR) $(ARFLAGS) $@ $^
-
-$(LIBDIR)/$(GLU_DXE) $(LIBDIR)/$(GLU_IMP): $(OBJECTS)
-ifeq ($(HAVEDXE3),)
-	$(warning Missing DXE3 package... Skipping $(GLU_DXE))
-else
-	-dxe3gen -o $(LIBDIR)/$(GLU_DXE) -Y $(LIBDIR)/$(GLU_IMP) -D "MesaGLU DJGPP" -E _glu -P gl.dxe -U $^
-endif
-
-clean:
-	-$(call UNLINK,*.o)
diff --git a/src/glu/mesa/descrip.mms b/src/glu/mesa/descrip.mms
deleted file mode 100644
index 12eb6a437a..0000000000
--- a/src/glu/mesa/descrip.mms
+++ /dev/null
@@ -1,61 +0,0 @@
-# Makefile for GLU for VMS
-# contributed by Jouk Jansen  joukj@hrem.stm.tudelft.nl
-
-.first
-	define gl [-.include.gl]
-
-.include [-]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = $disk2:[-.include]
-LIBDIR = [-.lib]
-CFLAGS = /include=$(INCDIR)/define=(FBIND=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = glu.c mipmap.c nurbs.c nurbscrv.c nurbssrf.c nurbsutl.c \
-	polytest.c project.c quadric.c tess.c tesselat.c
-
-OBJECTS =glu.obj,mipmap.obj,nurbs.obj,nurbscrv.obj,nurbssrf.obj,nurbsutl.obj,\
-	polytest.obj,project.obj,quadric.obj,tess.obj,tesselat.obj
-
-
-##### RULES #####
-
-VERSION=MesaGlu V3.2
-
-##### TARGETS #####
-
-# Make the library:
-$(LIBDIR)$(GLU_LIB) : $(OBJECTS)
-.ifdef SHARE
-  @ WRITE_ SYS$OUTPUT "  generating mesagl1.opt"
-  @ OPEN_/WRITE FILE  mesagl1.opt
-  @ WRITE_ FILE "!"
-  @ WRITE_ FILE "! mesagl1.opt generated by DESCRIP.$(MMS_EXT)" 
-  @ WRITE_ FILE "!"
-  @ WRITE_ FILE "IDENTIFICATION=""$(VERSION)"""
-  @ WRITE_ FILE "GSMATCH=LEQUAL,3,2
-  @ WRITE_ FILE "$(OBJECTS)"
-  @ WRITE_ FILE "[-.lib]libmesagl.exe/SHARE"
-  @ WRITE_ FILE "SYS$SHARE:DECW$XEXTLIBSHR/SHARE"
-  @ WRITE_ FILE "SYS$SHARE:DECW$XLIBSHR/SHARE"
-  @ CLOSE_ FILE
-  @ WRITE_ SYS$OUTPUT "  generating mesagl.map ..."
-  @ LINK_/NODEB/NOSHARE/NOEXE/MAP=mesagl.map/FULL mesagl1.opt/OPT
-  @ WRITE_ SYS$OUTPUT "  analyzing mesagl.map ..."
-  @ @[-.vms]ANALYZE_MAP.COM mesagl.map mesagl.opt
-  @ WRITE_ SYS$OUTPUT "  linking $(GLU_LIB) ..."
-  @ LINK_/noinform/NODEB/SHARE=$(GLU_LIB)/MAP=mesagl.map/FULL mesagl1.opt/opt,mesagl.opt/opt
-.else
-  @ $(MAKELIB) $(GLU_LIB) $(OBJECTS)
-.endif
-  @ rename $(GLU_LIB)* $(LIBDIR)
-
-clean :
-	delete *.obj;*
-	purge
-
-include mms_depend.
-
diff --git a/src/glu/mesa/mms_depend b/src/glu/mesa/mms_depend
deleted file mode 100644
index ed59ca9de8..0000000000
--- a/src/glu/mesa/mms_depend
+++ /dev/null
@@ -1,15 +0,0 @@
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-glu.obj : gluP.h [-.include.gl]gl.h [-.include.gl]glu.h
-mipmap.obj : gluP.h [-.include.gl]gl.h [-.include.gl]glu.h
-nurbs.obj : gluP.h [-.include.gl]gl.h [-.include.gl]glu.h nurbs.h
-nurbscrv.obj : nurbs.h gluP.h [-.include.gl]gl.h [-.include.gl]glu.h
-nurbssrf.obj : gluP.h [-.include.gl]gl.h [-.include.gl]glu.h nurbs.h
-nurbsutl.obj : gluP.h [-.include.gl]gl.h [-.include.gl]glu.h nurbs.h
-project.obj : gluP.h [-.include.gl]gl.h [-.include.gl]glu.h
-quadric.obj : gluP.h [-.include.gl]gl.h [-.include.gl]glu.h
-tess.obj : gluP.h [-.include.gl]gl.h [-.include.gl]glu.h tess.h
-tess_fist.obj : gluP.h [-.include.gl]gl.h [-.include.gl]glu.h tess.h
-tess_hash.obj : gluP.h [-.include.gl]gl.h [-.include.gl]glu.h tess.h
-tess_heap.obj : gluP.h [-.include.gl]gl.h [-.include.gl]glu.h tess.h
-tess_clip.obj : gluP.h [-.include.gl]gl.h [-.include.gl]glu.h tess.h
diff --git a/src/glu/sgi/Makefile.DJ b/src/glu/sgi/Makefile.DJ
deleted file mode 100644
index b5df3e846a..0000000000
--- a/src/glu/sgi/Makefile.DJ
+++ /dev/null
@@ -1,188 +0,0 @@
-# Mesa 3-D graphics library
-# Version:  4.0
-# 
-# Copyright (C) 1999  Brian Paul   All Rights Reserved.
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-# DOS/DJGPP glu makefile v1.5 for Mesa
-#
-#  Copyright (C) 2002 - Daniel Borca
-#  Email : dborca@users.sourceforge.net
-#  Web   : http://www.geocities.com/dborca
-
-
-#
-#  Available options:
-#
-#    Environment variables:
-#	CFLAGS
-#
-#    Targets:
-#	all:		build GLU
-#	clean:		remove object files
-#
-
-
-
-.PHONY: all clean
-
-TOP = ../../..
-LIBDIR = $(TOP)/lib
-GLU_LIB = libglu.a
-GLU_DXE = glu.dxe
-GLU_IMP = libiglu.a
-
-export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH);$(LIBDIR);$(GLIDE)/lib
-
-CC = gcc
-CFLAGS += -DNDEBUG -DLIBRARYBUILD -I$(TOP)/include -Iinclude
-CXX = gpp
-CXXFLAGS = $(CFLAGS) -Ilibnurbs/internals -Ilibnurbs/interface -Ilibnurbs/nurbtess
-
-AR = ar
-ARFLAGS = crus
-
-HAVEDXE3 = $(wildcard $(DJDIR)/bin/dxe3gen.exe)
-
-ifeq ($(wildcard $(addsuffix /rm.exe,$(subst ;, ,$(PATH)))),)
-UNLINK = del $(subst /,\,$(1))
-else
-UNLINK = $(RM) $(1)
-endif
-
-C_SOURCES = \
-	libutil/error.c \
-	libutil/glue.c \
-	libutil/mipmap.c \
-	libutil/project.c \
-	libutil/quad.c \
-	libutil/registry.c \
-	libtess/dict.c \
-	libtess/geom.c \
-	libtess/memalloc.c \
-	libtess/mesh.c \
-	libtess/normal.c \
-	libtess/priorityq.c \
-	libtess/render.c \
-	libtess/sweep.c \
-	libtess/tess.c \
-	libtess/tessmono.c
-
-CC_SOURCES = \
-	libnurbs/interface/bezierEval.cc \
-	libnurbs/interface/bezierPatch.cc \
-	libnurbs/interface/bezierPatchMesh.cc \
-	libnurbs/interface/glcurveval.cc \
-	libnurbs/interface/glinterface.cc \
-	libnurbs/interface/glrenderer.cc \
-	libnurbs/interface/glsurfeval.cc \
-	libnurbs/interface/incurveeval.cc \
-	libnurbs/interface/insurfeval.cc \
-	libnurbs/internals/arc.cc \
-	libnurbs/internals/arcsorter.cc \
-	libnurbs/internals/arctess.cc \
-	libnurbs/internals/backend.cc \
-	libnurbs/internals/basiccrveval.cc \
-	libnurbs/internals/basicsurfeval.cc \
-	libnurbs/internals/bin.cc \
-	libnurbs/internals/bufpool.cc \
-	libnurbs/internals/cachingeval.cc \
-	libnurbs/internals/ccw.cc \
-	libnurbs/internals/coveandtiler.cc \
-	libnurbs/internals/curve.cc \
-	libnurbs/internals/curvelist.cc \
-	libnurbs/internals/curvesub.cc \
-	libnurbs/internals/dataTransform.cc \
-	libnurbs/internals/displaylist.cc \
-	libnurbs/internals/flist.cc \
-	libnurbs/internals/flistsorter.cc \
-	libnurbs/internals/hull.cc \
-	libnurbs/internals/intersect.cc \
-	libnurbs/internals/knotvector.cc \
-	libnurbs/internals/mapdesc.cc \
-	libnurbs/internals/mapdescv.cc \
-	libnurbs/internals/maplist.cc \
-	libnurbs/internals/mesher.cc \
-	libnurbs/internals/monoTriangulationBackend.cc \
-	libnurbs/internals/monotonizer.cc \
-	libnurbs/internals/mycode.cc \
-	libnurbs/internals/nurbsinterfac.cc \
-	libnurbs/internals/nurbstess.cc \
-	libnurbs/internals/patch.cc \
-	libnurbs/internals/patchlist.cc \
-	libnurbs/internals/quilt.cc \
-	libnurbs/internals/reader.cc \
-	libnurbs/internals/renderhints.cc \
-	libnurbs/internals/slicer.cc \
-	libnurbs/internals/sorter.cc \
-	libnurbs/internals/splitarcs.cc \
-	libnurbs/internals/subdivider.cc \
-	libnurbs/internals/tobezier.cc \
-	libnurbs/internals/trimline.cc \
-	libnurbs/internals/trimregion.cc \
-	libnurbs/internals/trimvertpool.cc \
-	libnurbs/internals/uarray.cc \
-	libnurbs/internals/varray.cc \
-	libnurbs/nurbtess/directedLine.cc \
-	libnurbs/nurbtess/gridWrap.cc \
-	libnurbs/nurbtess/monoChain.cc \
-	libnurbs/nurbtess/monoPolyPart.cc \
-	libnurbs/nurbtess/monoTriangulation.cc \
-	libnurbs/nurbtess/partitionX.cc \
-	libnurbs/nurbtess/partitionY.cc \
-	libnurbs/nurbtess/polyDBG.cc \
-	libnurbs/nurbtess/polyUtil.cc \
-	libnurbs/nurbtess/primitiveStream.cc \
-	libnurbs/nurbtess/quicksort.cc \
-	libnurbs/nurbtess/rectBlock.cc \
-	libnurbs/nurbtess/sampleComp.cc \
-	libnurbs/nurbtess/sampleCompBot.cc \
-	libnurbs/nurbtess/sampleCompRight.cc \
-	libnurbs/nurbtess/sampleCompTop.cc \
-	libnurbs/nurbtess/sampleMonoPoly.cc \
-	libnurbs/nurbtess/sampledLine.cc \
-	libnurbs/nurbtess/searchTree.cc
-
-SOURCES = $(C_SOURCES) $(CC_SOURCES)
-
-OBJECTS = $(addsuffix .o,$(basename $(SOURCES)))
-
-.c.o:
-	$(CC) -o $@ $(CFLAGS) -c $<
-.cc.o:
-	$(CXX) -o $@ $(CXXFLAGS) -c $<
-
-all: $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLU_DXE) $(LIBDIR)/$(GLU_IMP)
-
-$(LIBDIR)/$(GLU_LIB): $(OBJECTS)
-	$(AR) $(ARFLAGS) $@ $^
-
-$(LIBDIR)/$(GLU_DXE) $(LIBDIR)/$(GLU_IMP): $(OBJECTS)
-ifeq ($(HAVEDXE3),)
-	$(warning Missing DXE3 package... Skipping $(GLU_DXE))
-else
-	-dxe3gen -o $(LIBDIR)/$(GLU_DXE) -Y $(LIBDIR)/$(GLU_IMP) -D "MesaGLU/SGI DJGPP" -E _glu -P gl.dxe -U $^
-endif
-
-clean:
-	-$(call UNLINK,libutil/*.o)
-	-$(call UNLINK,libtess/*.o)
-	-$(call UNLINK,libnurbs/interface/*.o)
-	-$(call UNLINK,libnurbs/internals/*.o)
-	-$(call UNLINK,libnurbs/nurbtess/*.o)
diff --git a/src/glu/sgi/Makefile.mgw b/src/glu/sgi/Makefile.mgw
deleted file mode 100644
index 43b421e737..0000000000
--- a/src/glu/sgi/Makefile.mgw
+++ /dev/null
@@ -1,229 +0,0 @@
-# Mesa 3-D graphics library
-# Version:  5.1
-# 
-# Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-# MinGW core makefile v1.4 for Mesa
-#
-#  Copyright (C) 2002 - Daniel Borca
-#  Email : dborca@users.sourceforge.net
-#  Web   : http://www.geocities.com/dborca
-
-# MinGW core-glu makefile updated for Mesa 7.0
-#
-#  Updated : by Heromyth, on 2007-7-21
-#  Email   : zxpmyth@yahoo.com.cn
-#  Bugs    : 1) All the default settings work fine. But the setting X86=1 can't work. 
-#            The others havn't been tested yet.
-#            2) The generated DLLs are *not* compatible with the ones built
-#            with the other compilers like VC8, especially for GLUT. 
-#            3) Although more tests are needed, it can be used individually!
-
-#
-#  Available options:
-#
-#    Environment variables:
-#	CFLAGS
-#
-#	GLIDE		path to Glide3 SDK; used with FX.
-#			default = $(TOP)/glide3
-#	FX=1		build for 3dfx Glide3. Note that this disables
-#			compilation of most WMesa code and requires fxMesa.
-#			As a consequence, you'll need the Win32 Glide3
-#			library to build any application.
-#			default = no
-#	ICD=1		build the installable client driver interface
-#			(windows opengl driver interface)
-#			default = no
-#	X86=1		optimize for x86 (if possible, use MMX, SSE, 3DNow).
-#			default = no
-#
-#    Targets:
-#	all:		build GL
-#	clean:		remove object files
-#
-
-
-
-.PHONY: all clean
-.INTERMEDIATE: x86/gen_matypes.exe
-.SUFFIXES: .rc .res
-
-# Set this to the prefix of your build tools, i.e. mingw32-
-TOOLS_PREFIX = mingw32-
-
-TOP = ../../..
-
-LIBDIR = $(TOP)/lib
-
-GLU_DLL = glu32.dll
-GLU_IMP = libglu32.a
-GLU_DEF = glu.def
-
-include $(TOP)/configs/config.mgw
-GL_USING_STDCALL ?= 1
-
-LDLIBS = -L$(LIBDIR) -lopengl32
-LDFLAGS = -Wl,--out-implib=$(LIBDIR)/$(GLU_IMP) -Wl,--output-def=$(LIBDIR)/$(GLU_DEF)
-
-CFLAGS += -DBUILD_GLU32 -D_DLL
-
-ifeq ($(GL_USING_STDCALL),1)
-  LDFLAGS += -Wl,--add-stdcall-alias
-else
-  CFLAGS += -DGL_NO_STDCALL
-endif
-
-CC = gcc
-CFLAGS += -DNDEBUG -DLIBRARYBUILD -I$(TOP)/include -Iinclude
-CXX = g++
-CXXFLAGS = $(CFLAGS) -Ilibnurbs/internals -Ilibnurbs/interface -Ilibnurbs/nurbtess
-
-AR = ar
-ARFLAGS = crus
-
-UNLINK = del $(subst /,\,$(1))
-ifneq ($(wildcard $(addsuffix /rm.exe,$(subst ;, ,$(PATH)))),)
-UNLINK = $(RM) $(1)
-endif
-ifneq ($(wildcard $(addsuffix /rm,$(subst :, ,$(PATH)))),)
-UNLINK = $(RM) $(1)
-endif
-
-C_SOURCES = \
-	libutil/error.c \
-	libutil/glue.c \
-	libutil/mipmap.c \
-	libutil/project.c \
-	libutil/quad.c \
-	libutil/registry.c \
-	libtess/dict.c \
-	libtess/geom.c \
-	libtess/memalloc.c \
-	libtess/mesh.c \
-	libtess/normal.c \
-	libtess/priorityq.c \
-	libtess/render.c \
-	libtess/sweep.c \
-	libtess/tess.c \
-	libtess/tessmono.c
-
-CC_SOURCES = \
-	libnurbs/interface/bezierEval.cc \
-	libnurbs/interface/bezierPatch.cc \
-	libnurbs/interface/bezierPatchMesh.cc \
-	libnurbs/interface/glcurveval.cc \
-	libnurbs/interface/glinterface.cc \
-	libnurbs/interface/glrenderer.cc \
-	libnurbs/interface/glsurfeval.cc \
-	libnurbs/interface/incurveeval.cc \
-	libnurbs/interface/insurfeval.cc \
-	libnurbs/internals/arc.cc \
-	libnurbs/internals/arcsorter.cc \
-	libnurbs/internals/arctess.cc \
-	libnurbs/internals/backend.cc \
-	libnurbs/internals/basiccrveval.cc \
-	libnurbs/internals/basicsurfeval.cc \
-	libnurbs/internals/bin.cc \
-	libnurbs/internals/bufpool.cc \
-	libnurbs/internals/cachingeval.cc \
-	libnurbs/internals/ccw.cc \
-	libnurbs/internals/coveandtiler.cc \
-	libnurbs/internals/curve.cc \
-	libnurbs/internals/curvelist.cc \
-	libnurbs/internals/curvesub.cc \
-	libnurbs/internals/dataTransform.cc \
-	libnurbs/internals/displaylist.cc \
-	libnurbs/internals/flist.cc \
-	libnurbs/internals/flistsorter.cc \
-	libnurbs/internals/hull.cc \
-	libnurbs/internals/intersect.cc \
-	libnurbs/internals/knotvector.cc \
-	libnurbs/internals/mapdesc.cc \
-	libnurbs/internals/mapdescv.cc \
-	libnurbs/internals/maplist.cc \
-	libnurbs/internals/mesher.cc \
-	libnurbs/internals/monoTriangulationBackend.cc \
-	libnurbs/internals/monotonizer.cc \
-	libnurbs/internals/mycode.cc \
-	libnurbs/internals/nurbsinterfac.cc \
-	libnurbs/internals/nurbstess.cc \
-	libnurbs/internals/patch.cc \
-	libnurbs/internals/patchlist.cc \
-	libnurbs/internals/quilt.cc \
-	libnurbs/internals/reader.cc \
-	libnurbs/internals/renderhints.cc \
-	libnurbs/internals/slicer.cc \
-	libnurbs/internals/sorter.cc \
-	libnurbs/internals/splitarcs.cc \
-	libnurbs/internals/subdivider.cc \
-	libnurbs/internals/tobezier.cc \
-	libnurbs/internals/trimline.cc \
-	libnurbs/internals/trimregion.cc \
-	libnurbs/internals/trimvertpool.cc \
-	libnurbs/internals/uarray.cc \
-	libnurbs/internals/varray.cc \
-	libnurbs/nurbtess/directedLine.cc \
-	libnurbs/nurbtess/gridWrap.cc \
-	libnurbs/nurbtess/monoChain.cc \
-	libnurbs/nurbtess/monoPolyPart.cc \
-	libnurbs/nurbtess/monoTriangulation.cc \
-	libnurbs/nurbtess/partitionX.cc \
-	libnurbs/nurbtess/partitionY.cc \
-	libnurbs/nurbtess/polyDBG.cc \
-	libnurbs/nurbtess/polyUtil.cc \
-	libnurbs/nurbtess/primitiveStream.cc \
-	libnurbs/nurbtess/quicksort.cc \
-	libnurbs/nurbtess/rectBlock.cc \
-	libnurbs/nurbtess/sampleComp.cc \
-	libnurbs/nurbtess/sampleCompBot.cc \
-	libnurbs/nurbtess/sampleCompRight.cc \
-	libnurbs/nurbtess/sampleCompTop.cc \
-	libnurbs/nurbtess/sampleMonoPoly.cc \
-	libnurbs/nurbtess/sampledLine.cc \
-	libnurbs/nurbtess/searchTree.cc
-
-SOURCES = $(C_SOURCES) $(CC_SOURCES)
-
-OBJECTS = $(addsuffix .o,$(basename $(SOURCES)))
-
-.c.o:
-	$(CC) -o $@ $(CFLAGS) -c $<
-.cc.o:
-	$(CXX) -o $@ $(CXXFLAGS) -c $<
-
-
-all: $(LIBDIR) $(LIBDIR)/$(GLU_DLL) $(LIBDIR)/$(GLU_IMP)
-
-$(LIBDIR):
-	mkdir -p $(LIBDIR)
-
-$(LIBDIR)/$(GLU_DLL) $(LIBDIR)/$(GLU_IMP): $(OBJECTS)
-	g++ -shared -fPIC -o $(LIBDIR)/$(GLU_DLL) $(LDFLAGS) \
-    $^ $(LDLIBS)
-
-
-
-clean:
-	-$(call UNLINK,libutil/*.o)
-	-$(call UNLINK,libtess/*.o)
-	-$(call UNLINK,libnurbs/interface/*.o)
-	-$(call UNLINK,libnurbs/internals/*.o)
-	-$(call UNLINK,libnurbs/nurbtess/*.o)
diff --git a/src/glu/sgi/descrip.mms b/src/glu/sgi/descrip.mms
deleted file mode 100644
index 49d618e6c9..0000000000
--- a/src/glu/sgi/descrip.mms
+++ /dev/null
@@ -1,451 +0,0 @@
-# Makefile for GLU for VMS
-# contributed by Jouk Jansen  joukj@hrem.stm.tudelft.nl
-
-.first
-	define gl [---.include.gl]
-
-.include [---]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR =([-.include],[.include],[.internals],[.libnurbs.internals],\
-       [.libnurbs.interface],[.libnurbs.nurbtess])
-LIBDIR = [---.lib]
-CFLAGS = /include=$(INCDIR)/name=(as_is,short)/float=ieee/ieee=denorm
-
-LU_OBJECTS=\
-	[.libutil]error.obj,	\
-	[.libutil]glue.obj,	\
-	[.libutil]mipmap.obj,\
-	[.libutil]project.obj,\
-	[.libutil]quad.obj,	\
-	[.libutil]registry.obj
-
-LT_OBJECTS=[.libtess]dict.obj,	\
-	[.libtess]geom.obj,	\
-	[.libtess]memalloc.obj,\
-	[.libtess]mesh.obj,	\
-	[.libtess]normal.obj,\
-	[.libtess]priorityq.obj,\
-	[.libtess]render.obj,\
-	[.libtess]sweep.obj,	\
-	[.libtess]tess.obj,	\
-	[.libtess]tessmono.obj
-
-LI_OBJECTS=[.libnurbs.interface]bezierEval.obj,	\
-	[.libnurbs.interface]bezierPatch.obj,	\
-	[.libnurbs.interface]bezierPatchMesh.obj,	\
-	[.libnurbs.interface]glcurveval.obj,	\
-	[.libnurbs.interface]glinterface.obj
-
-LI_OBJECTS1=[.libnurbs.interface]glrenderer.obj,	\
-	[.libnurbs.interface]glsurfeval.obj,	\
-	[.libnurbs.interface]incurveeval.obj,	\
-	[.libnurbs.interface]insurfeval.obj
-
-LI2_OBJECTS=[.libnurbs.internals]arc.obj,		\
-	[.libnurbs.internals]arcsorter.obj,		\
-	[.libnurbs.internals]arctess.obj,		\
-	[.libnurbs.internals]backend.obj,		\
-	[.libnurbs.internals]basiccrveval.obj,	\
-	[.libnurbs.internals]basicsurfeval.obj
-
-LI2_OBJECTS1=[.libnurbs.internals]bin.obj,		\
-	[.libnurbs.internals]bufpool.obj,		\
-	[.libnurbs.internals]cachingeval.obj,	\
-	[.libnurbs.internals]ccw.obj,		\
-	[.libnurbs.internals]coveandtiler.obj,	\
-	[.libnurbs.internals]curve.obj,		\
-	[.libnurbs.internals]curvelist.obj
-
-LI2_OBJECTS2=[.libnurbs.internals]curvesub.obj,		\
-	[.libnurbs.internals]dataTransform.obj,	\
-	[.libnurbs.internals]displaylist.obj,	\
-	[.libnurbs.internals]flist.obj,		\
-	[.libnurbs.internals]flistsorter.obj
-
-LI2_OBJECTS3=[.libnurbs.internals]hull.obj,		\
-	[.libnurbs.internals]intersect.obj,		\
-	[.libnurbs.internals]knotvector.obj,	\
-	[.libnurbs.internals]mapdesc.obj
-
-LI2_OBJECTS4=[.libnurbs.internals]mapdescv.obj,		\
-	[.libnurbs.internals]maplist.obj,		\
-	[.libnurbs.internals]mesher.obj,		\
-	[.libnurbs.internals]monoTriangulationBackend.obj,\
-	[.libnurbs.internals]monotonizer.obj
-
-LI2_OBJECTS5=[.libnurbs.internals]mycode.obj,		\
-	[.libnurbs.internals]nurbsinterfac.obj,	\
-	[.libnurbs.internals]nurbstess.obj,		\
-	[.libnurbs.internals]patch.obj
-
-LI2_OBJECTS6=[.libnurbs.internals]patchlist.obj,		\
-	[.libnurbs.internals]quilt.obj,		\
-	[.libnurbs.internals]reader.obj,		\
-	[.libnurbs.internals]renderhints.obj,	\
-	[.libnurbs.internals]slicer.obj
-
-LI2_OBJECTS7=[.libnurbs.internals]sorter.obj,		\
-	[.libnurbs.internals]splitarcs.obj,		\
-	[.libnurbs.internals]subdivider.obj,	\
-	[.libnurbs.internals]tobezier.obj
-
-LI2_OBJECTS8=[.libnurbs.internals]trimline.obj,		\
-	[.libnurbs.internals]trimregion.obj,	\
-	[.libnurbs.internals]trimvertpool.obj,	\
-	[.libnurbs.internals]uarray.obj,		\
-	[.libnurbs.internals]varray.obj
-
-LN_OBJECTS=[.libnurbs.nurbtess]directedLine.obj,	\
-	[.libnurbs.nurbtess]gridWrap.obj,		\
-	[.libnurbs.nurbtess]monoChain.obj,		\
-	[.libnurbs.nurbtess]monoPolyPart.obj,	\
-	[.libnurbs.nurbtess]monoTriangulation.obj
-
-LN_OBJECTS1=[.libnurbs.nurbtess]partitionX.obj,		\
-	[.libnurbs.nurbtess]partitionY.obj,		\
-	[.libnurbs.nurbtess]polyDBG.obj
-
-LN_OBJECTS2=[.libnurbs.nurbtess]polyUtil.obj,		\
-	[.libnurbs.nurbtess]primitiveStream.obj,	\
-	[.libnurbs.nurbtess]quicksort.obj,		\
-	[.libnurbs.nurbtess]rectBlock.obj
-
-LN_OBJECTS3=[.libnurbs.nurbtess]sampleComp.obj,		\
-	[.libnurbs.nurbtess]sampleCompBot.obj,	\
-	[.libnurbs.nurbtess]sampleCompRight.obj
-
-LN_OBJECTS4=[.libnurbs.nurbtess]sampleCompTop.obj,	\
-	[.libnurbs.nurbtess]sampleMonoPoly.obj,\
-	[.libnurbs.nurbtess]sampledLine.obj,	\
-	[.libnurbs.nurbtess]searchTree.obj
-
-##### RULES #####
-
-VERSION=MesaGlu V3.5
-
-##### TARGETS #####
-
-# Make the library:
-$(LIBDIR)$(GLU_LIB) : $(LU_OBJECTS) $(LT_OBJECTS) $(LI_OBJECTS) $(LI_OBJECTS1)\
-		    $(LI2_OBJECTS) $(LI2_OBJECTS1) $(LI2_OBJECTS2)\
-		    $(LI2_OBJECTS3) $(LI2_OBJECTS4) $(LI2_OBJECTS5)\
-		    $(LI2_OBJECTS6) $(LI2_OBJECTS7) $(LI2_OBJECTS8)\
-		    $(LN_OBJECTS) $(LN_OBJECTS1) $(LN_OBJECTS2)\
-		    $(LN_OBJECTS3) $(LN_OBJECTS4)
-  @ $(MAKELIB) $(GLU_LIB)  $(LU_OBJECTS),$(LT_OBJECTS),$(LI_OBJECTS),\
-	$(LI2_OBJECTS),$(LN_OBJECTS)
-  @ rename $(GLU_LIB)* $(LIBDIR)
-.ifdef SHARE
-  @ WRITE_ SYS$OUTPUT "  generating mesagl1.opt"
-  @ OPEN_/WRITE FILE  mesagl1.opt
-  @ WRITE_ FILE "!"
-  @ WRITE_ FILE "! mesagl1.opt generated by DESCRIP.$(MMS_EXT)" 
-  @ WRITE_ FILE "!"
-  @ WRITE_ FILE "IDENTIFICATION=""$(VERSION)"""
-  @ WRITE_ FILE "GSMATCH=LEQUAL,3,5
-  @ WRITE_ FILE "$(LU_OBJECTS)"
-  @ WRITE_ FILE "$(LT_OBJECTS)"
-  @ WRITE_ FILE "$(LI_OBJECTS)"
-  @ WRITE_ FILE "$(LI_OBJECTS1)"
-  @ WRITE_ FILE "$(LI2_OBJECTS)"
-  @ WRITE_ FILE "$(LI2_OBJECTS1)"
-  @ WRITE_ FILE "$(LI2_OBJECTS2)"
-  @ WRITE_ FILE "$(LI2_OBJECTS3)"
-  @ WRITE_ FILE "$(LI2_OBJECTS4)"
-  @ WRITE_ FILE "$(LI2_OBJECTS5)"
-  @ WRITE_ FILE "$(LI2_OBJECTS6)"
-  @ WRITE_ FILE "$(LI2_OBJECTS7)"
-  @ WRITE_ FILE "$(LI2_OBJECTS8)"
-  @ WRITE_ FILE "$(LN_OBJECTS)"
-  @ WRITE_ FILE "$(LN_OBJECTS1)"
-  @ WRITE_ FILE "$(LN_OBJECTS2)"
-  @ WRITE_ FILE "$(LN_OBJECTS3)"
-  @ WRITE_ FILE "$(LN_OBJECTS4)"
-  @ WRITE_ FILE "[---.lib]libmesagl.exe/SHARE"
-  @ WRITE_ FILE "SYS$SHARE:DECW$XEXTLIBSHR/SHARE"
-  @ WRITE_ FILE "SYS$SHARE:DECW$XLIBSHR/SHARE"
-  @ CLOSE_ FILE
-#  @ WRITE_ SYS$OUTPUT "  generating mesagl.map ..."
-#  @ CXXLINK_/NODEB/NOSHARE/NOEXE/MAP=mesagl.map/FULL mesagl1.opt/OPT
-#  @ WRITE_ SYS$OUTPUT "  analyzing mesagl.map ..."
-#  @ @[-.vms]ANALYZE_MAP.COM mesagl.map mesagl.opt
-  @ WRITE_ SYS$OUTPUT "  linking $(GLU_SHAR) ..."
-#  @ CXXLINK_/noinform/NODEB/SHARE=$(GLU_SHAR)/MAP=mesagl.map/FULL mesagl1.opt/opt,mesagl.opt/opt
-  @ CXXLINK_/noinform/NODEB/SHARE=$(GLU_SHAR)/MAP=mesagl.map/FULL mesagl1.opt/opt,mesaglu.opt/opt
-  @ rename $(GLU_SHAR)* $(LIBDIR)
-.endif
-
-clean :
-	delete [...]*.obj;*
-	purge
-
-[.libutil]error.obj : [.libutil]error.c
-	$(CC) $(CFLAGS) /obj=[.libutil]error.obj [.libutil]error.c
-
-[.libutil]glue.obj : [.libutil]glue.c
-	$(CC) $(CFLAGS) /obj=[.libutil]glue.obj [.libutil]glue.c
-
-[.libutil]mipmap.obj : [.libutil]mipmap.c
-	$(CC) $(CFLAGS) /obj=[.libutil]mipmap.obj [.libutil]mipmap.c
-
-[.libutil]project.obj : [.libutil]project.c
-	$(CC) $(CFLAGS) /obj=[.libutil]project.obj [.libutil]project.c
-
-[.libutil]quad.obj : [.libutil]quad.c
-	$(CC) $(CFLAGS) /obj=[.libutil]quad.obj [.libutil]quad.c
-
-[.libutil]registry.obj : [.libutil]registry.c
-	$(CC) $(CFLAGS) /obj=[.libutil]registry.obj [.libutil]registry.c
-
-[.libtess]dict.obj : [.libtess]dict.c
-	$(CC) $(CFLAGS) /obj=[.libtess]dict.obj [.libtess]dict.c
-
-[.libtess]geom.obj : [.libtess]geom.c
-	$(CC) $(CFLAGS) /obj=[.libtess]geom.obj [.libtess]geom.c
-
-[.libtess]memalloc.obj : [.libtess]memalloc.c
-	$(CC) $(CFLAGS) /obj=[.libtess]memalloc.obj [.libtess]memalloc.c
-
-[.libtess]mesh.obj : [.libtess]mesh.c
-	$(CC) $(CFLAGS) /obj=[.libtess]mesh.obj [.libtess]mesh.c
-
-[.libtess]normal.obj : [.libtess]normal.c
-	$(CC) $(CFLAGS) /obj=[.libtess]normal.obj [.libtess]normal.c
-
-[.libtess]priorityq.obj : [.libtess]priorityq.c
-	$(CC) $(CFLAGS) /obj=[.libtess]priorityq.obj [.libtess]priorityq.c
-
-[.libtess]render.obj : [.libtess]render.c
-	$(CC) $(CFLAGS) /obj=[.libtess]render.obj [.libtess]render.c
-
-[.libtess]sweep.obj : [.libtess]sweep.c
-	$(CC) $(CFLAGS) /obj=[.libtess]sweep.obj [.libtess]sweep.c
-
-[.libtess]tess.obj : [.libtess]tess.c
-	$(CC) $(CFLAGS) /obj=[.libtess]tess.obj [.libtess]tess.c
-
-[.libtess]tessmono.obj : [.libtess]tessmono.c
-	$(CC) $(CFLAGS) /obj=[.libtess]tessmono.obj [.libtess]tessmono.c
-
-[.libnurbs.interface]bezierEval.obj : [.libnurbs.interface]bezierEval.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.interface]bezierEval.obj [.libnurbs.interface]bezierEval.cc
-
-[.libnurbs.interface]bezierPatch.obj : [.libnurbs.interface]bezierPatch.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.interface]bezierPatch.obj [.libnurbs.interface]bezierPatch.cc
-
-[.libnurbs.interface]bezierPatchMesh.obj : [.libnurbs.interface]bezierPatchMesh.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.interface]bezierPatchMesh.obj [.libnurbs.interface]bezierPatchMesh.cc
-
-[.libnurbs.interface]glcurveval.obj : [.libnurbs.interface]glcurveval.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.interface]glcurveval.obj [.libnurbs.interface]glcurveval.cc
-
-[.libnurbs.interface]glinterface.obj : [.libnurbs.interface]glinterface.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.interface]glinterface.obj [.libnurbs.interface]glinterface.cc
-
-[.libnurbs.interface]glrenderer.obj : [.libnurbs.interface]glrenderer.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.interface]glrenderer.obj [.libnurbs.interface]glrenderer.cc
-
-[.libnurbs.interface]glsurfeval.obj : [.libnurbs.interface]glsurfeval.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.interface]glsurfeval.obj [.libnurbs.interface]glsurfeval.cc
-
-[.libnurbs.interface]incurveeval.obj : [.libnurbs.interface]incurveeval.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.interface]incurveeval.obj [.libnurbs.interface]incurveeval.cc
-
-[.libnurbs.interface]insurfeval.obj : [.libnurbs.interface]insurfeval.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.interface]insurfeval.obj [.libnurbs.interface]insurfeval.cc
-
-[.libnurbs.internals]arc.obj : [.libnurbs.internals]arc.cc
-	$(CXX) $(CFLAGS)/list/show=all /obj=[.libnurbs.internals]arc.obj [.libnurbs.internals]arc.cc
-
-[.libnurbs.internals]arcsorter.obj : [.libnurbs.internals]arcsorter.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]arcsorter.obj [.libnurbs.internals]arcsorter.cc
-
-[.libnurbs.internals]arctess.obj : [.libnurbs.internals]arctess.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]arctess.obj [.libnurbs.internals]arctess.cc
-
-[.libnurbs.internals]backend.obj : [.libnurbs.internals]backend.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]backend.obj [.libnurbs.internals]backend.cc
-
-[.libnurbs.internals]basiccrveval.obj : [.libnurbs.internals]basiccrveval.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]basiccrveval.obj [.libnurbs.internals]basiccrveval.cc
-
-[.libnurbs.internals]basicsurfeval.obj : [.libnurbs.internals]basicsurfeval.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]basicsurfeval.obj [.libnurbs.internals]basicsurfeval.cc
-
-[.libnurbs.internals]bin.obj : [.libnurbs.internals]bin.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]bin.obj [.libnurbs.internals]bin.cc
-
-[.libnurbs.internals]bufpool.obj : [.libnurbs.internals]bufpool.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]bufpool.obj [.libnurbs.internals]bufpool.cc
-
-[.libnurbs.internals]cachingeval.obj : [.libnurbs.internals]cachingeval.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]cachingeval.obj [.libnurbs.internals]cachingeval.cc
-
-[.libnurbs.internals]ccw.obj : [.libnurbs.internals]ccw.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]ccw.obj [.libnurbs.internals]ccw.cc
-
-[.libnurbs.internals]coveandtiler.obj : [.libnurbs.internals]coveandtiler.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]coveandtiler.obj [.libnurbs.internals]coveandtiler.cc
-
-[.libnurbs.internals]curve.obj : [.libnurbs.internals]curve.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]curve.obj [.libnurbs.internals]curve.cc
-
-[.libnurbs.internals]curvelist.obj : [.libnurbs.internals]curvelist.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]curvelist.obj [.libnurbs.internals]curvelist.cc
-
-[.libnurbs.internals]curvesub.obj : [.libnurbs.internals]curvesub.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]curvesub.obj [.libnurbs.internals]curvesub.cc
-
-[.libnurbs.internals]dataTransform.obj : [.libnurbs.internals]dataTransform.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]dataTransform.obj [.libnurbs.internals]dataTransform.cc
-
-[.libnurbs.internals]displaylist.obj : [.libnurbs.internals]displaylist.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]displaylist.obj [.libnurbs.internals]displaylist.cc
-
-[.libnurbs.internals]flist.obj : [.libnurbs.internals]flist.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]flist.obj [.libnurbs.internals]flist.cc
-
-[.libnurbs.internals]flistsorter.obj : [.libnurbs.internals]flistsorter.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]flistsorter.obj [.libnurbs.internals]flistsorter.cc
-
-[.libnurbs.internals]hull.obj : [.libnurbs.internals]hull.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]hull.obj [.libnurbs.internals]hull.cc
-
-[.libnurbs.internals]intersect.obj : [.libnurbs.internals]intersect.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]intersect.obj [.libnurbs.internals]intersect.cc
-
-[.libnurbs.internals]knotvector.obj : [.libnurbs.internals]knotvector.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]knotvector.obj [.libnurbs.internals]knotvector.cc
-
-[.libnurbs.internals]mapdesc.obj : [.libnurbs.internals]mapdesc.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]mapdesc.obj [.libnurbs.internals]mapdesc.cc
-
-[.libnurbs.internals]mapdescv.obj : [.libnurbs.internals]mapdescv.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]mapdescv.obj [.libnurbs.internals]mapdescv.cc
-
-[.libnurbs.internals]maplist.obj : [.libnurbs.internals]maplist.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]maplist.obj [.libnurbs.internals]maplist.cc
-
-[.libnurbs.internals]mesher.obj : [.libnurbs.internals]mesher.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]mesher.obj [.libnurbs.internals]mesher.cc
-
-[.libnurbs.internals]monoTriangulationBackend.obj : [.libnurbs.internals]monoTriangulationBackend.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]monoTriangulationBackend.obj [.libnurbs.internals]monoTriangulationBackend.cc
-
-[.libnurbs.internals]monotonizer.obj : [.libnurbs.internals]monotonizer.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]monotonizer.obj [.libnurbs.internals]monotonizer.cc
-
-[.libnurbs.internals]mycode.obj : [.libnurbs.internals]mycode.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]mycode.obj [.libnurbs.internals]mycode.cc
-
-[.libnurbs.internals]nurbsinterfac.obj : [.libnurbs.internals]nurbsinterfac.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]nurbsinterfac.obj [.libnurbs.internals]nurbsinterfac.cc
-
-[.libnurbs.internals]nurbstess.obj : [.libnurbs.internals]nurbstess.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]nurbstess.obj [.libnurbs.internals]nurbstess.cc
-
-[.libnurbs.internals]patch.obj : [.libnurbs.internals]patch.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]patch.obj [.libnurbs.internals]patch.cc
-
-[.libnurbs.internals]patchlist.obj : [.libnurbs.internals]patchlist.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]patchlist.obj [.libnurbs.internals]patchlist.cc
-
-[.libnurbs.internals]quilt.obj : [.libnurbs.internals]quilt.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]quilt.obj [.libnurbs.internals]quilt.cc
-
-[.libnurbs.internals]reader.obj : [.libnurbs.internals]reader.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]reader.obj [.libnurbs.internals]reader.cc
-
-[.libnurbs.internals]renderhints.obj : [.libnurbs.internals]renderhints.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]renderhints.obj [.libnurbs.internals]renderhints.cc
-
-[.libnurbs.internals]slicer.obj : [.libnurbs.internals]slicer.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]slicer.obj [.libnurbs.internals]slicer.cc
-
-[.libnurbs.internals]sorter.obj : [.libnurbs.internals]sorter.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]sorter.obj [.libnurbs.internals]sorter.cc
-
-[.libnurbs.internals]splitarcs.obj : [.libnurbs.internals]splitarcs.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]splitarcs.obj [.libnurbs.internals]splitarcs.cc
-
-[.libnurbs.internals]subdivider.obj : [.libnurbs.internals]subdivider.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]subdivider.obj [.libnurbs.internals]subdivider.cc
-
-[.libnurbs.internals]tobezier.obj : [.libnurbs.internals]tobezier.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]tobezier.obj [.libnurbs.internals]tobezier.cc
-
-[.libnurbs.internals]trimline.obj : [.libnurbs.internals]trimline.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]trimline.obj [.libnurbs.internals]trimline.cc
-
-[.libnurbs.internals]trimregion.obj : [.libnurbs.internals]trimregion.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]trimregion.obj [.libnurbs.internals]trimregion.cc
-
-[.libnurbs.internals]trimvertpool.obj : [.libnurbs.internals]trimvertpool.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]trimvertpool.obj [.libnurbs.internals]trimvertpool.cc
-
-[.libnurbs.internals]uarray.obj : [.libnurbs.internals]uarray.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]uarray.obj [.libnurbs.internals]uarray.cc
-
-[.libnurbs.internals]varray.obj : [.libnurbs.internals]varray.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.internals]varray.obj [.libnurbs.internals]varray.cc
-
-[.libnurbs.nurbtess]directedLine.obj : [.libnurbs.nurbtess]directedLine.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.nurbtess]directedLine.obj [.libnurbs.nurbtess]directedLine.cc
-
-[.libnurbs.nurbtess]gridWrap.obj : [.libnurbs.nurbtess]gridWrap.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.nurbtess]gridWrap.obj [.libnurbs.nurbtess]gridWrap.cc
-
-[.libnurbs.nurbtess]monoChain.obj : [.libnurbs.nurbtess]monoChain.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.nurbtess]monoChain.obj [.libnurbs.nurbtess]monoChain.cc
-
-[.libnurbs.nurbtess]monoPolyPart.obj : [.libnurbs.nurbtess]monoPolyPart.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.nurbtess]monoPolyPart.obj [.libnurbs.nurbtess]monoPolyPart.cc
-
-[.libnurbs.nurbtess]monoTriangulation.obj : [.libnurbs.nurbtess]monoTriangulation.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.nurbtess]monoTriangulation.obj [.libnurbs.nurbtess]monoTriangulation.cc
-
-[.libnurbs.nurbtess]partitionX.obj : [.libnurbs.nurbtess]partitionX.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.nurbtess]partitionX.obj [.libnurbs.nurbtess]partitionX.cc
-
-[.libnurbs.nurbtess]partitionY.obj : [.libnurbs.nurbtess]partitionY.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.nurbtess]partitionY.obj [.libnurbs.nurbtess]partitionY.cc
-
-[.libnurbs.nurbtess]polyDBG.obj : [.libnurbs.nurbtess]polyDBG.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.nurbtess]polyDBG.obj [.libnurbs.nurbtess]polyDBG.cc
-
-[.libnurbs.nurbtess]polyUtil.obj : [.libnurbs.nurbtess]polyUtil.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.nurbtess]polyUtil.obj [.libnurbs.nurbtess]polyUtil.cc
-
-[.libnurbs.nurbtess]primitiveStream.obj : [.libnurbs.nurbtess]primitiveStream.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.nurbtess]primitiveStream.obj [.libnurbs.nurbtess]primitiveStream.cc
-
-[.libnurbs.nurbtess]quicksort.obj : [.libnurbs.nurbtess]quicksort.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.nurbtess]quicksort.obj [.libnurbs.nurbtess]quicksort.cc
-
-[.libnurbs.nurbtess]rectBlock.obj : [.libnurbs.nurbtess]rectBlock.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.nurbtess]rectBlock.obj [.libnurbs.nurbtess]rectBlock.cc
-
-[.libnurbs.nurbtess]sampleComp.obj : [.libnurbs.nurbtess]sampleComp.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.nurbtess]sampleComp.obj [.libnurbs.nurbtess]sampleComp.cc
-
-[.libnurbs.nurbtess]sampleCompBot.obj : [.libnurbs.nurbtess]sampleCompBot.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.nurbtess]sampleCompBot.obj [.libnurbs.nurbtess]sampleCompBot.cc
-
-[.libnurbs.nurbtess]sampleCompRight.obj : [.libnurbs.nurbtess]sampleCompRight.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.nurbtess]sampleCompRight.obj [.libnurbs.nurbtess]sampleCompRight.cc
-
-[.libnurbs.nurbtess]sampleCompTop.obj : [.libnurbs.nurbtess]sampleCompTop.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.nurbtess]sampleCompTop.obj [.libnurbs.nurbtess]sampleCompTop.cc
-
-[.libnurbs.nurbtess]sampleMonoPoly.obj : [.libnurbs.nurbtess]sampleMonoPoly.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.nurbtess]sampleMonoPoly.obj [.libnurbs.nurbtess]sampleMonoPoly.cc
-
-[.libnurbs.nurbtess]sampledLine.obj : [.libnurbs.nurbtess]sampledLine.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.nurbtess]sampledLine.obj [.libnurbs.nurbtess]sampledLine.cc
-
-[.libnurbs.nurbtess]searchTree.obj : [.libnurbs.nurbtess]searchTree.cc
-	$(CXX) $(CFLAGS) /obj=[.libnurbs.nurbtess]searchTree.obj [.libnurbs.nurbtess]searchTree.cc
diff --git a/src/glut/dos/Makefile.DJ b/src/glut/dos/Makefile.DJ
deleted file mode 100644
index 7e4e0b8576..0000000000
--- a/src/glut/dos/Makefile.DJ
+++ /dev/null
@@ -1,126 +0,0 @@
-# DOS/DJGPP Mesa Utility Toolkit
-# Version:  1.0
-#
-# Copyright (C) 2005  Daniel Borca   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
-# DANIEL BORCA 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.
-
-
-#
-#  Available options:
-#
-#    Environment variables:
-#	CFLAGS
-#
-#	GLIDE		path to Glide3 SDK; used to resolve DXEs.
-#			default = $(TOP)/glide3
-#
-#    Targets:
-#	all:		build GLUT
-#	clean:		remove object files
-#
-
-
-
-.PHONY: all clean
-
-TOP = ../../..
-GLIDE ?= $(TOP)/glide3
-LIBDIR = $(TOP)/lib
-GLUT_LIB = libglut.a
-GLUT_DXE = glut.dxe
-GLUT_IMP = libiglut.a
-
-export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH);$(LIBDIR);$(GLIDE)/lib
-
-CC = gcc
-CFLAGS += -I$(TOP)/include -I. -IPC_HW
-CFLAGS += -DGLUT_IMPORT_LIB
-
-AR = ar
-ARFLAGS = crus
-
-HAVEDXE3 = $(wildcard $(DJDIR)/bin/dxe3gen.exe)
-
-ifeq ($(wildcard $(addsuffix /rm.exe,$(subst ;, ,$(PATH)))),)
-UNLINK = del $(subst /,\,$(1))
-else
-UNLINK = $(RM) $(1)
-endif
-
-CORE_SOURCES = \
-	loop.c \
-	callback.c \
-	color.c \
-	extens.c \
-	init.c \
-	menu.c \
-	mouse.c \
-	overlay.c \
-	state.c \
-	util.c \
-	window.c \
-	f8x13.c \
-	f9x15.c \
-	hel10.c \
-	hel12.c \
-	hel18.c \
-	tr10.c \
-	tr24.c \
-	mroman.c \
-	roman.c \
-	bitmap.c \
-	stroke.c \
-	teapot.c \
-	shapes.c
-
-PC_HW_SOURCES = \
-	PC_HW/pc_hw.c \
-	PC_HW/pc_keyb.c \
-	PC_HW/pc_mouse.c \
-	PC_HW/pc_timer.c \
-	PC_HW/pc_irq.S
-
-SOURCES = $(CORE_SOURCES) $(PC_HW_SOURCES)
-
-OBJECTS = $(addsuffix .o,$(basename $(SOURCES)))
-
-.c.o:
-	$(CC) -o $@ $(CFLAGS) -c $<
-.S.o:
-	$(CC) -o $@ $(CFLAGS) -c $<
-.s.o:
-	$(CC) -o $@ $(CFLAGS) -x assembler-with-cpp -c $<
-
-all: $(LIBDIR)/$(GLUT_LIB) $(LIBDIR)/$(GLUT_DXE) $(LIBDIR)/$(GLUT_IMP)
-
-$(LIBDIR)/$(GLUT_LIB): $(OBJECTS)
-	$(AR) $(ARFLAGS) $@ $^
-
-$(LIBDIR)/$(GLUT_DXE) $(LIBDIR)/$(GLUT_IMP): $(OBJECTS)
-ifeq ($(HAVEDXE3),)
-	$(warning Missing DXE3 package... Skipping $(GLUT_DXE))
-else
-	-dxe3gen -o $(LIBDIR)/$(GLUT_DXE) -Y $(LIBDIR)/$(GLUT_IMP) -D "MesaGLUT DJGPP" -E _glut -P gl.dxe -U $^
-endif
-
-clean:
-	-$(call UNLINK,*.o)
-	-$(call UNLINK,PC_HW/*.o)
-
--include depend
diff --git a/src/glut/glx/Makefile.mgw b/src/glut/glx/Makefile.mgw
deleted file mode 100644
index ae4eb6addc..0000000000
--- a/src/glut/glx/Makefile.mgw
+++ /dev/null
@@ -1,198 +0,0 @@
-# Mesa 3-D graphics library
-# Version:  5.1
-# 
-# Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-# MinGW core makefile v1.4 for Mesa
-#
-#  Copyright (C) 2002 - Daniel Borca
-#  Email : dborca@users.sourceforge.net
-#  Web   : http://www.geocities.com/dborca
-
-# MinGW core-glut makefile updated for Mesa 7.0
-#
-#  Updated : by Heromyth, on 2007-7-21
-#  Email   : zxpmyth@yahoo.com.cn
-#  Bugs    : 1) All the default settings work fine. But the setting X86=1 can't work. 
-#            The others havn't been tested yet.
-#            2) The generated DLLs are *not* compatible with the ones built
-#            with the other compilers like VC8, especially for GLUT. 
-#            3) Although more tests are needed, it can be used individually!
-
-
-#
-#  Available options:
-#
-#    Environment variables:
-#	CFLAGS
-#
-#	GLIDE		path to Glide3 SDK; used with FX.
-#			default = $(TOP)/glide3
-#	FX=1		build for 3dfx Glide3. Note that this disables
-#			compilation of most WMesa code and requires fxMesa.
-#			As a consequence, you'll need the Win32 Glide3
-#			library to build any application.
-#			default = no
-#	ICD=1		build the installable client driver interface
-#			(windows opengl driver interface)
-#			default = no
-#	X86=1		optimize for x86 (if possible, use MMX, SSE, 3DNow).
-#			default = no
-#
-#    Targets:
-#	all:		build GL
-#	clean:		remove object files
-#
-
-
-
-.PHONY: all clean
-.INTERMEDIATE: x86/gen_matypes.exe
-.SUFFIXES: .rc .res
-
-# Set this to the prefix of your build tools, i.e. mingw32-
-TOOLS_PREFIX = mingw32-
-
-TOP = ../../..
-
-LIBDIR = $(TOP)/lib
-
-GLUT_DLL = glut32.dll
-GLUT_IMP = libglut32.a
-GLUT_DEF = glut.def
-
-include $(TOP)/configs/config.mgw
-GLUT_USING_STDCALL ?= 1
-
-
-
-LDLIBS = -L$(LIBDIR) -lwinmm -lgdi32 -luser32 -lopengl32 -lglu32 
-LDFLAGS = -Wl,--out-implib=$(LIBDIR)/$(GLUT_IMP) -Wl,--output-def=$(LIBDIR)/$(GLUT_DEF) 
-
-CFLAGS += -DBUILD_GLUT32 -DGLUT_BUILDING_LIB -DMESA -D_DLL
-
-ifeq ($(GL_USING_STDCALL),0)
-  CFLAGS += -DGL_NO_STDCALL
-endif
-
-ifeq ($(GLUT_USING_STDCALL),1)
-  CFLAGS += -D_STDCALL_SUPPORTED
-  LDFLAGS += -Wl,--add-stdcall-alias
-else
-  CFLAGS += -DGLUT_NO_STDCALL
-endif
-
-CFLAGS += -DNDEBUG -DLIBRARYBUILD -I$(TOP)/include 
-
-CC = gcc
-CXX = g++
-CXXFLAGS = $(CFLAGS)
-
-AR = ar
-ARFLAGS = crus
-
-UNLINK = del $(subst /,\,$(1))
-ifneq ($(wildcard $(addsuffix /rm.exe,$(subst ;, ,$(PATH)))),)
-UNLINK = $(RM) $(1)
-endif
-ifneq ($(wildcard $(addsuffix /rm,$(subst :, ,$(PATH)))),)
-UNLINK = $(RM) $(1)
-endif
-
-HDRS = glutint.h glutstroke.h glutbitmap.h glutwin32.h stroke.h win32_glx.h win32_x11.h
-
-SRCS = \
-	glut_bitmap.c \
-	glut_bwidth.c \
-	glut_cindex.c \
-	glut_cmap.c \
-	glut_cursor.c \
-	glut_dials.c \
-	glut_dstr.c \
-	glut_event.c \
-	glut_ext.c \
-	glut_fbc.c \
-	glut_fullscrn.c \
-	glut_gamemode.c \
-	glut_get.c \
-	glut_init.c \
-	glut_input.c \
-	glut_joy.c \
-	glut_key.c \
-	glut_keyctrl.c \
-	glut_keyup.c \
-	glut_mesa.c \
-	glut_modifier.c \
-	glut_overlay.c \
-	glut_shapes.c \
-	glut_space.c \
-	glut_stroke.c \
-	glut_swap.c \
-	glut_swidth.c \
-	glut_tablet.c \
-	glut_teapot.c \
-	glut_util.c \
-	glut_vidresize.c \
-	glut_warp.c \
-	glut_win.c \
-	glut_winmisc.c \
-	win32_glx.c \
-	win32_menu.c \
-	win32_util.c \
-	win32_winproc.c \
-	win32_x11.c
-	
-
-SRCSSEMIGENS = \
-	glut_8x13.c \
-	glut_9x15.c \
-	glut_hel10.c \
-	glut_hel12.c \
-	glut_hel18.c \
-	glut_mroman.c \
-	glut_roman.c \
-	glut_tr10.c \
-	glut_tr24.c
-
-
-
-SOURCES = $(SRCS) $(SRCSSEMIGENS)
-
-OBJECTS = $(addsuffix .o,$(basename $(SOURCES)))
-
-.c.o:
-	$(CC) -o $@ $(CFLAGS) -c $<
-.cc.o:
-	$(CXX) -o $@ $(CXXFLAGS) -c $<
-
-
-all: $(LIBDIR) $(LIBDIR)/$(GLUT_DLL) $(LIBDIR)/$(GLUT_IMP)
-
-$(LIBDIR):
-	mkdir -p $(LIBDIR)
-
-$(LIBDIR)/$(GLUT_DLL) $(LIBDIR)/$(GLUT_IMP): $(OBJECTS)
-	$(CXX) -shared -fPIC -o $(LIBDIR)/$(GLUT_DLL) $(LDFLAGS) \
-	$^ $(LDLIBS)
-
-
-
-clean:
-	-$(call UNLINK,*.o)
\ No newline at end of file
diff --git a/src/glut/glx/descrip.mms b/src/glut/glx/descrip.mms
deleted file mode 100644
index 358b417511..0000000000
--- a/src/glut/glx/descrip.mms
+++ /dev/null
@@ -1,208 +0,0 @@
-# Makefile for GLUT for VMS
-# contributed by Jouk Jansen  joukj@hrem.stm.tudelft.nl
-
-.first
-	define gl [---.include.gl]
-
-.include [---]mms.config
-
-##### MACROS #####
-GLUT_MAJOR = 3
-GLUT_MINOR = 7
-
-VPATH = RCS
-
-INCDIR = [---.include]
-LIBDIR = [---.lib]
-CFLAGS = /nowarn/include=$(INCDIR)/prefix=all/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = \
-glut_8x13.c \
-glut_9x15.c \
-glut_bitmap.c \
-glut_bwidth.c \
-glut_cindex.c \
-glut_cmap.c \
-glut_cursor.c \
-glut_dials.c \
-glut_dstr.c \
-glut_event.c \
-glut_ext.c \
-glut_fullscrn.c \
-glut_gamemode.c \
-glut_get.c \
-glut_glxext.c \
-glut_hel10.c \
-glut_hel12.c \
-glut_hel18.c \
-glut_init.c \
-glut_input.c \
-glut_joy.c \
-glut_key.c \
-glut_keyctrl.c \
-glut_keyup.c \
-glut_menu.c \
-glut_menu2.c \
-glut_mesa.c \
-glut_modifier.c \
-glut_mroman.c \
-glut_overlay.c \
-glut_roman.c \
-glut_shapes.c \
-glut_space.c \
-glut_stroke.c \
-glut_swap.c \
-glut_swidth.c \
-glut_tablet.c \
-glut_teapot.c \
-glut_tr10.c \
-glut_tr24.c \
-glut_util.c \
-glut_vidresize.c \
-glut_warp.c \
-glut_win.c \
-glut_winmisc.c \
-layerutil.c
-
-OBJECTS0=glut_8x13.obj,\
-glut_9x15.obj,\
-glut_bitmap.obj,\
-glut_bwidth.obj,\
-glut_cindex.obj,\
-glut_cmap.obj,\
-glut_cursor.obj,\
-glut_dials.obj,\
-glut_dstr.obj,\
-glut_event.obj,\
-glut_ext.obj,\
-glut_fullscrn.obj,\
-glut_gamemode.obj
-
-OBJECTS1=glut_get.obj,\
-glut_glxext.obj,\
-glut_hel10.obj,\
-glut_hel12.obj,\
-glut_hel18.obj,\
-glut_init.obj,\
-glut_input.obj,\
-glut_joy.obj,\
-glut_key.obj,\
-glut_keyctrl.obj,\
-glut_keyup.obj,\
-glut_menu.obj,\
-glut_menu2.obj,\
-glut_mesa.obj,\
-glut_modifier.obj
-
-OBJECTS2=glut_mroman.obj,\
-glut_overlay.obj,\
-glut_roman.obj,\
-glut_shapes.obj,\
-glut_space.obj,\
-glut_stroke.obj,\
-glut_swap.obj,\
-glut_swidth.obj,\
-glut_tablet.obj,\
-glut_teapot.obj,\
-glut_tr10.obj,\
-glut_tr24.obj,\
-glut_util.obj,\
-glut_vidresize.obj
-
-OBJECTS3=glut_warp.obj,\
-glut_win.obj,\
-glut_winmisc.obj,\
-layerutil.obj
-
-##### RULES #####
-
-VERSION=Glut V3.7
-
-##### TARGETS #####
-
-# Make the library
-$(LIBDIR)$(GLUT_LIB) : $(OBJECTS0) $(OBJECTS1) $(OBJECTS2) $(OBJECTS3)
-  @ $(MAKELIB) $(GLUT_LIB) $(OBJECTS0)
-  @ library $(GLUT_LIB) $(OBJECTS1)
-  @ library $(GLUT_LIB) $(OBJECTS2)
-  @ library $(GLUT_LIB) $(OBJECTS3)
-  @ rename $(GLUT_LIB)* $(LIBDIR)
-.ifdef SHARE
-  @ WRITE_ SYS$OUTPUT "  generating mesagl1.opt"
-  @ OPEN_/WRITE FILE  mesagl1.opt
-  @ WRITE_ FILE "!"
-  @ WRITE_ FILE "! mesagl1.opt generated by DESCRIP.$(MMS_EXT)" 
-  @ WRITE_ FILE "!"
-  @ WRITE_ FILE "IDENTIFICATION=""$(VERSION)"""
-  @ WRITE_ FILE "GSMATCH=LEQUAL,3,7
-  @ WRITE_ FILE "$(OBJECTS0)"
-  @ WRITE_ FILE "$(OBJECTS1)"
-  @ WRITE_ FILE "$(OBJECTS2)"
-  @ WRITE_ FILE "$(OBJECTS3)"
-  @ WRITE_ FILE "[---.lib]libmesaglu.exe/SHARE"
-  @ WRITE_ FILE "[---.lib]libmesagl.exe/SHARE"
-  @ write file "sys$library:decw$xmulibshr.exe/share"
-  @ WRITE_ FILE "SYS$SHARE:DECW$XEXTLIBSHR/SHARE"
-  @ WRITE_ FILE "SYS$SHARE:DECW$XLIBSHR/SHARE"
-  @ CLOSE_ FILE
-  @ WRITE_ SYS$OUTPUT "  generating mesagl.map ..."
-  @ CXXLINK_/NODEB/NOSHARE/NOEXE/MAP=mesagl.map/FULL mesagl1.opt/OPT
-  @ WRITE_ SYS$OUTPUT "  analyzing mesagl.map ..."
-  @ @[---.vms]ANALYZE_MAP.COM mesagl.map mesagl.opt
-  @ WRITE_ SYS$OUTPUT "  linking $(GLUT_SHAR) ..."
-  @ CXXLINK_/NODEB/SHARE=$(GLUT_SHAR)/MAP=mesagl.map/FULL mesagl1.opt/opt,mesagl.opt/opt
-  @ rename $(GLUT_SHAR)* $(LIBDIR)
-.endif
-
-clean :
-	delete *.obj;*
-	purge
-
-include mms_depend.
-
-glut_8x13.obj : glut_8x13.c
-glut_9x15.obj : glut_9x15.c
-glut_bitmap.obj : glut_bitmap.c
-glut_bwidth.obj : glut_bwidth.c
-glut_cindex.obj : glut_cindex.c
-glut_cmap.obj : glut_cmap.c
-glut_cursor.obj : glut_cursor.c
-glut_dials.obj : glut_dials.c
-glut_dstr.obj : glut_dstr.c
-glut_event.obj : glut_event.c
-glut_ext.obj : glut_ext.c
-glut_fullscrn.obj : glut_fullscrn.c
-glut_gamemode.obj : glut_gamemode.c
-glut_get.obj : glut_get.c
-glut_glxext.obj : glut_glxext.c
-glut_hel10.obj : glut_hel10.c
-glut_hel12.obj : glut_hel12.c
-glut_hel18.obj : glut_hel18.c
-glut_init.obj : glut_init.c
-glut_input.obj : glut_input.c
-glut_joy.obj : glut_joy.c
-glut_key.obj : glut_key.c
-glut_keyctrl.obj : glut_keyctrl.c
-glut_keyup.obj : glut_keyup.c
-glut_menu.obj : glut_menu.c
-glut_menu2.obj : glut_menu2.c
-glut_mesa.obj : glut_mesa.c
-glut_modifier.obj : glut_modifier.c
-glut_mroman.obj : glut_mroman.c
-glut_overlay.obj : glut_overlay.c
-glut_roman.obj : glut_roman.c
-glut_shapes.obj : glut_shapes.c
-glut_space.obj : glut_space.c
-glut_stroke.obj : glut_stroke.c
-glut_swap.obj : glut_swap.c
-glut_swidth.obj : glut_swidth.c
-glut_tablet.obj : glut_tablet.c
-glut_teapot.obj : glut_teapot.c
-glut_tr10.obj : glut_tr10.c
-glut_tr24.obj : glut_tr24.c
-glut_util.obj : glut_util.c
-glut_vidresize.obj : glut_vidresize.c
-glut_warp.obj : glut_warp.c
-glut_win.obj : glut_win.c
-glut_winmisc.obj : glut_winmisc.c
-layerutil.obj : layerutil.c
diff --git a/src/glut/glx/mms_depend b/src/glut/glx/mms_depend
deleted file mode 100644
index 98f87c29e2..0000000000
--- a/src/glut/glx/mms_depend
+++ /dev/null
@@ -1,72 +0,0 @@
-# DO NOT DELETE
-
-glut_8x13.obj : glutbitmap.h [---.include.gl]gl.h
-glut_9x15.obj : glutbitmap.h [---.include.gl]gl.h
-glut_bitmap.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
-glut_bitmap.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
-glut_bitmap.obj : glutbitmap.h
-glut_bwidth.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
-glut_bwidth.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
-glut_bwidth.obj : glutbitmap.h
-glut_cindex.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
-glut_cindex.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
-glut_cindex.obj : layerutil.h
-glut_cursor.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
-glut_cursor.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
-glut_dials.obj : glutint.h [---.include.gl]glx.h [---.include.gl]gl.h
-glut_dials.obj : [---.include.gl]xmesa.h [---.include.gl]glut.h [---.include.gl]glu.h
-glut_dstr.obj : glutint.h [---.include.gl]glx.h [---.include.gl]gl.h
-glut_dstr.obj : [---.include.gl]xmesa.h [---.include.gl]glut.h [---.include.gl]glu.h
-glut_event.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
-glut_event.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
-glut_ext.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
-glut_ext.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
-glut_fullscrn.obj : glutint.h [---.include.gl]glx.h [---.include.gl]gl.h
-glut_fullscrn.obj : [---.include.gl]xmesa.h [---.include.gl]glut.h
-glut_fullscrn.obj : [---.include.gl]glu.h
-glut_get.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
-glut_get.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
-glut_hel10.obj : glutbitmap.h [---.include.gl]gl.h
-glut_hel12.obj : glutbitmap.h [---.include.gl]gl.h
-glut_hel18.obj : glutbitmap.h [---.include.gl]gl.h
-glut_init.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
-glut_init.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
-glut_menu.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
-glut_menu.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h layerutil.h
-glut_mesa.obj : glutint.h [---.include.gl]glx.h [---.include.gl]gl.h
-glut_mesa.obj : [---.include.gl]xmesa.h [---.include.gl]glut.h [---.include.gl]glu.h
-glut_modifier.obj : glutint.h [---.include.gl]glx.h [---.include.gl]gl.h
-glut_modifier.obj : [---.include.gl]xmesa.h [---.include.gl]glut.h
-glut_modifier.obj : [---.include.gl]glu.h
-glut_mroman.obj : glutstroke.h
-glut_overlay.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
-glut_overlay.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
-glut_overlay.obj : layerutil.h
-glut_roman.obj : glutstroke.h
-glut_shapes.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
-glut_shapes.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
-glut_space.obj : glutint.h [---.include.gl]glx.h [---.include.gl]gl.h
-glut_space.obj : [---.include.gl]xmesa.h [---.include.gl]glut.h [---.include.gl]glu.h
-glut_stroke.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
-glut_stroke.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
-glut_stroke.obj : glutstroke.h
-glut_swidth.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
-glut_swidth.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
-glut_swidth.obj : glutstroke.h
-glut_tablet.obj : glutint.h [---.include.gl]glx.h [---.include.gl]gl.h
-glut_tablet.obj : [---.include.gl]xmesa.h [---.include.gl]glut.h [---.include.gl]glu.h
-glut_teapot.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
-glut_tr10.obj : glutbitmap.h [---.include.gl]gl.h
-glut_tr24.obj : glutbitmap.h [---.include.gl]gl.h
-glut_util.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
-glut_util.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
-glut_vidresize.obj : [---.include.gl]glx.h [---.include.gl]gl.h
-glut_vidresize.obj : [---.include.gl]xmesa.h glutint.h [---.include.gl]glut.h
-glut_vidresize.obj : [---.include.gl]glu.h
-glut_warp.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
-glut_warp.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
-glut_win.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
-glut_win.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
-glut_winmisc.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
-glut_winmisc.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
-layerutil.obj : layerutil.h
diff --git a/src/mesa/Makefile.DJ b/src/mesa/Makefile.DJ
deleted file mode 100644
index 06a13fb1ab..0000000000
--- a/src/mesa/Makefile.DJ
+++ /dev/null
@@ -1,166 +0,0 @@
-# Mesa 3-D graphics library
-# Version:  5.1
-# 
-# Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-# DOS/DJGPP core makefile v1.7 for Mesa
-#
-#  Copyright (C) 2002 - Daniel Borca
-#  Email : dborca@users.sourceforge.net
-#  Web   : http://www.geocities.com/dborca
-
-
-#
-#  Available options:
-#
-#    Environment variables:
-#	CFLAGS
-#
-#	GLIDE		path to Glide3 SDK; used with FX.
-#			default = $(TOP)/glide3
-#	FX=1		build for 3dfx Glide3. Note that this disables
-#			compilation of most DMesa code and requires fxMesa.
-#			As a consequence, you'll need the DJGPP Glide3
-#			library to build any application.
-#			default = no
-#	X86=1		optimize for x86 (if possible, use MMX, SSE, 3DNow).
-#			default = no
-#
-#    Targets:
-#	all:		build GL
-#	clean:		remove object files
-#
-
-
-
-.PHONY: all clean
-.INTERMEDIATE: x86/gen_matypes.exe
-
-TOP = ../..
-GLIDE ?= $(TOP)/glide3
-LIBDIR = $(TOP)/lib
-GL_LIB = libgl.a
-GL_DXE = gl.dxe
-GL_IMP = libigl.a
-
-export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH);$(LIBDIR);$(GLIDE)/lib
-
-CC = gcc
-CFLAGS += $(INCLUDE_DIRS)
-CFLAGS += -DUSE_EXTERNAL_DXTN_LIB=1
-ifeq ($(FX),1)
-CFLAGS += -D__DOS__
-CFLAGS += -I$(GLIDE)/include -DFX
-LIBNAME = "Mesa/FX DJGPP"
-else
-LIBNAME = "Mesa DJGPP"
-endif
-
-AR = ar
-ARFLAGS = crus
-
-HAVEDXE3 = $(wildcard $(DJDIR)/bin/dxe3gen.exe)
-
-ifeq ($(wildcard $(addsuffix /rm.exe,$(subst ;, ,$(PATH)))),)
-UNLINK = del $(subst /,\,$(1))
-else
-UNLINK = $(RM) $(1)
-endif
-
-include sources
-
-ifeq ($(X86),1)
-CFLAGS += -DUSE_X86_ASM
-CFLAGS += -DUSE_MMX_ASM
-CFLAGS += -DUSE_SSE_ASM
-CFLAGS += -DUSE_3DNOW_ASM
-X86_SOURCES += $(X86_API)
-else
-X86_SOURCES =
-endif
-
-DRIVER_SOURCES = \
-	drivers/dos/dmesa.c
-ifeq ($(FX),1)
-DRIVER_SOURCES += \
-	$(GLIDE_DRIVER_SOURCES)
-else
-DRIVER_SOURCES += \
-	$(OSMESA_DRIVER_SOURCES) \
-	drivers/dos/video.c \
-	drivers/dos/vesa.c \
-	drivers/dos/blit.S \
-	drivers/dos/vga.c \
-	drivers/dos/null.c \
-	drivers/dos/dpmi.c
-endif
-
-SOURCES = $(CORE_SOURCES) $(X86_SOURCES) $(COMMON_DRIVER_SOURCES) $(DRIVER_SOURCES)
-
-OBJECTS = $(addsuffix .o,$(basename $(SOURCES)))
-
-X86_OBJECTS = $(addsuffix .o,$(basename $(X86_SOURCES)))
-
-.c.o:
-	$(CC) -o $@ $(CFLAGS) -c $<
-.S.o:
-	$(CC) -o $@ $(CFLAGS) -c $<
-.s.o:
-	$(CC) -o $@ $(CFLAGS) -x assembler-with-cpp -c $<
-
-all: $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GL_DXE) $(LIBDIR)/$(GL_IMP)
-
-$(LIBDIR)/$(GL_LIB): $(OBJECTS)
-	$(AR) $(ARFLAGS) $@ $^
-
-$(LIBDIR)/$(GL_DXE) $(LIBDIR)/$(GL_IMP): $(OBJECTS)
-ifeq ($(HAVEDXE3),)
-	$(warning Missing DXE3 package... Skipping $(GL_DXE))
-else
-ifeq ($(FX),1)
-	-dxe3gen -o $(LIBDIR)/$(GL_DXE) -Y $(LIBDIR)/$(GL_IMP) -D $(LIBNAME) -E _gl -E _DMesa -P glide3x.dxe -U $^
-else
-	-dxe3gen -o $(LIBDIR)/$(GL_DXE) -Y $(LIBDIR)/$(GL_IMP) -D $(LIBNAME) -E _gl -E _DMesa -U $^
-endif
-endif
-
-$(X86_OBJECTS): x86/matypes.h
-
-x86/matypes.h: x86/gen_matypes.exe
-	$< > $@
-
-x86/gen_matypes.exe: x86/gen_matypes.c
-	$(CC) -o $@ $(CFLAGS) -s $<
-
-clean:
-	-$(call UNLINK,array_cache/*.o)
-	-$(call UNLINK,glapi/*.o)
-	-$(call UNLINK,main/*.o)
-	-$(call UNLINK,math/*.o)
-	-$(call UNLINK,shader/*.o)
-	-$(call UNLINK,sparc/*.o)
-	-$(call UNLINK,ppc/*.o)
-	-$(call UNLINK,swrast/*.o)
-	-$(call UNLINK,swrast_setup/*.o)
-	-$(call UNLINK,tnl/*.o)
-	-$(call UNLINK,x86/*.o)
-	-$(call UNLINK,drivers/common/*.o)
-	-$(call UNLINK,drivers/dos/*.o)
-	-$(call UNLINK,drivers/glide/*.o)
diff --git a/src/mesa/Makefile.mgw b/src/mesa/Makefile.mgw
deleted file mode 100644
index 3b52834bd1..0000000000
--- a/src/mesa/Makefile.mgw
+++ /dev/null
@@ -1,235 +0,0 @@
-# Mesa 3-D graphics library
-# Version:  7.0
-# 
-# Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-# MinGW core makefile v1.4 for Mesa
-#
-#  Copyright (C) 2002 - Daniel Borca
-#  Email : dborca@users.sourceforge.net
-#  Web   : http://www.geocities.com/dborca
-
-# MinGW core-gl makefile updated for Mesa 7.0
-#
-#  updated : by Heromyth, on 2007-7-21
-#  Email   : zxpmyth@yahoo.com.cn
-#  Bugs    : 1) All the default settings work fine. But the setting X86=1 can't work. 
-#            The others havn't been tested yet.
-#            2) The generated DLLs are *not* compatible with the ones built
-#            with the other compilers like VC8, especially for GLUT. 
-#            3) Although more tests are needed, it can be used individually!
-
-
-#
-#  Available options:
-#
-#    Environment variables:
-#	CFLAGS
-#
-#	GLIDE		path to Glide3 SDK; used with FX.
-#			default = $(TOP)/glide3
-#	FX=1		build for 3dfx Glide3. Note that this disables
-#			compilation of most WMesa code and requires fxMesa.
-#			As a consequence, you'll need the Win32 Glide3
-#			library to build any application.
-#			default = no
-#	ICD=1		build the installable client driver interface
-#			(windows opengl driver interface)
-#			default = no
-#	X86=1		optimize for x86 (if possible, use MMX, SSE, 3DNow).
-#			default = no
-#
-#    Targets:
-#	all:		build GL
-#	clean:		remove object files
-#
-
-
-.PHONY: all clean
-.INTERMEDIATE: x86/gen_matypes.exe
-.SUFFIXES: .rc .res
-
-# Set this to the prefix of your build tools, i.e. mingw32-
-TOOLS_PREFIX = mingw32-
-
-
-
-TOP = ../..
-GLIDE ?= $(TOP)/glide3
-LIBDIR = $(TOP)/lib
-ifeq ($(ICD),1)
-  GL_DLL = mesa32.dll
-  GL_IMP = libmesa32.a
-else
-  GL_DLL = opengl32.dll
-  GL_IMP = libopengl32.a
-endif
-
-GL_DEF = gl.def
-
-include $(TOP)/configs/config.mgw
-GL_USING_STDCALL ?= 1
-
-MESA_LIB = libmesa.a
-
-LDLIBS = -lgdi32 -luser32 -liberty
-LDFLAGS = -Wl,--out-implib=$(LIBDIR)/$(GL_IMP) -Wl,--output-def=$(LIBDIR)/gl.def
-
-CC = $(TOOLS_PREFIX)gcc
-CFLAGS += -DBUILD_GL32 -D_OPENGL32_ -D_DLL -DMESA_MINWARN -DNDEBUG -D_USRDLL -DGDI_EXPORTS
-
-ifeq ($(GL_USING_STDCALL),1)
-  LDFLAGS += -Wl,--add-stdcall-alias
-else
-  CFLAGS += -DGL_NO_STDCALL
-endif
-
-CFLAGS += -DUSE_EXTERNAL_DXTN_LIB=1
-ifeq ($(FX),1)
-  CFLAGS += -I$(GLIDE)/include -DFX
-  LDLIBS += -L$(GLIDE)/lib -lglide3x
-  GL_DEF = drivers/windows/fx/fxopengl.def
-  GL_RES = drivers/windows/fx/fx.rc
-else
-  ifeq ($(ICD),1)
-    CFLAGS += -DUSE_MGL_NAMESPACE
-    GL_DEF = drivers/windows/icd/mesa.def
-  else    
-    GL_DEF = drivers/windows/gdi/mesa.def
-  endif
-endif
-
-AR = ar
-ARFLAGS = crus
-
-UNLINK = del $(subst /,\,$(1))
-ifneq ($(wildcard $(addsuffix /rm.exe,$(subst ;, ,$(PATH)))),)
-UNLINK = $(RM) $(1)
-endif
-ifneq ($(wildcard $(addsuffix /rm,$(subst :, ,$(PATH)))),)
-UNLINK = $(RM) $(1)
-endif
-
-include sources
-
-CFLAGS += $(INCLUDE_DIRS) 
-
-ifeq ($(X86),1)
-CFLAGS += -DUSE_X86_ASM
-CFLAGS += -DUSE_MMX_ASM
-CFLAGS += -DUSE_SSE_ASM
-CFLAGS += -DUSE_3DNOW_ASM
-X86_SOURCES += $(X86_API)
-else
-X86_SOURCES =
-endif
-
-ifeq ($(FX),1)
-DRIVER_SOURCES = \
-	$(GLIDE_DRIVER_SOURCES) \
-	drivers/windows/fx/fxwgl.c
-else
-ifeq ($(ICD),1)
-DRIVER_SOURCES = \
-	drivers/windows/gdi/wmesa.c \
-	drivers/windows/icd/icd.c
-else
-DRIVER_SOURCES = \
-	drivers/windows/gdi/wmesa.c \
-	drivers/windows/gdi/wgl.c
-endif
-endif
-
-SOURCES = $(CORE_SOURCES) $(X86_SOURCES) $(COMMON_DRIVER_SOURCES) $(DRIVER_SOURCES)
-
-OBJECTS = $(addsuffix .o,$(basename $(SOURCES)))
-
-X86_OBJECTS = $(addsuffix .o,$(basename $(X86_SOURCES)))
-
-RESOURCE = $(GL_RES:.rc=.res)
-
-.c.o:
-	$(CC) -o $@ $(CFLAGS) -c $<
-.s.o:
-	$(CC) -o $@ $(CFLAGS) -x assembler-with-cpp -c $<
-
-.rc.res:
-	windres -o $@ -Irc -Ocoff $<
-
-all: $(LIBDIR) $(LIBDIR)/$(GL_DLL) $(LIBDIR)/$(GL_IMP)
-
-$(LIBDIR):
-	mkdir -p $(LIBDIR)
-
-$(LIBDIR)/$(GL_DLL) $(LIBDIR)/$(GL_IMP): $(OBJECTS) $(RESOURCE)
-	$(CC) -shared -fPIC -o $(LIBDIR)/$(GL_DLL) $(LDFLAGS) \
-	$^ $(LDLIBS)
-
-$(X86_OBJECTS): x86/matypes.h
-
-x86/matypes.h: x86/gen_matypes.exe
-	$(subst /,\,$< > $@)
-
-x86/gen_matypes.exe: x86/gen_matypes.c
-	$(CC) -o $@ $(CFLAGS) -s $<
-
-# [dBorca]
-# glapi_x86.S needs some adjustments
-# in order to generate correct entrypoints
-# Trick: change the following condition to
-# be always false if you need C entrypoints
-# with USE_X86_ASM (useful for trace/debug)
-ifeq (1,1)
-x86/glapi_x86.o: x86/glapi_x86.S
-	$(CC) -o $@ $(CFLAGS) -DSTDCALL_API -c $<
-else
-main/dispatch.o: main/dispatch.c
-	$(CC) -o $@ $(CFLAGS) -UUSE_X86_ASM -c $<
-glapi/glapi.o: glapi/glapi.c
-	$(CC) -o $@ $(CFLAGS) -UUSE_X86_ASM -c $<
-endif
-
-# [dBorca]
-# if we want codegen, we have to stdcall
-tnl/t_vtx_x86_gcc.o: tnl/t_vtx_x86_gcc.S
-	$(CC) -o $@ $(CFLAGS) -DSTDCALL_API -c $<
-
-clean:
-	-$(call UNLINK,glapi/*.o)
-	-$(call UNLINK,main/*.o)
-	-$(call UNLINK,math/*.o)
-	-$(call UNLINK,vbo/*.o)
-	-$(call UNLINK,shader/*.o)
-	-$(call UNLINK,shader/slang/*.o)
-	-$(call UNLINK,shader/grammar/*.o)
-	-$(call UNLINK,sparc/*.o)
-	-$(call UNLINK,ppc/*.o)
-	-$(call UNLINK,swrast/*.o)
-	-$(call UNLINK,swrast_setup/*.o)
-	-$(call UNLINK,tnl/*.o)
-	-$(call UNLINK,x86/*.o)
-	-$(call UNLINK,x86/rtasm/*.o)
-	-$(call UNLINK,x86-64/*.o)
-	-$(call UNLINK,drivers/common/*.o)
-	-$(call UNLINK,drivers/glide/*.o)
-	-$(call UNLINK,drivers/windows/fx/*.o)
-	-$(call UNLINK,drivers/windows/fx/*.res)
-	-$(call UNLINK,drivers/windows/gdi/*.o)
-	-$(call UNLINK,drivers/windows/icd/*.o)
diff --git a/src/mesa/descrip.mms b/src/mesa/descrip.mms
deleted file mode 100644
index a12e3fc1b7..0000000000
--- a/src/mesa/descrip.mms
+++ /dev/null
@@ -1,26 +0,0 @@
-# Makefile for Mesa for VMS
-# contributed by Jouk Jansen  joukj@hrem.stm.tudelft.nl
-
-all :
-	set default [.main]
-	$(MMS)$(MMSQUALIFIERS)
-	set default [-.glapi]
-	$(MMS)$(MMSQUALIFIERS)
-	set default [-.shader]
-	$(MMS)$(MMSQUALIFIERS)
-	set default [-.drivers.common]
-	$(MMS)$(MMSQUALIFIERS)
-	set default [-.x11]
-	$(MMS)$(MMSQUALIFIERS)
-	set default [-.osmesa]
-	$(MMS)$(MMSQUALIFIERS)
-	set default [--.math]
-	$(MMS)$(MMSQUALIFIERS)
-	set default [-.tnl]
-	$(MMS)$(MMSQUALIFIERS)
-	set default [-.swrast]
-	$(MMS)$(MMSQUALIFIERS)
-	set default [-.swrast_setup]
-	$(MMS)$(MMSQUALIFIERS)
-	set default [-.array_cache]
-	$(MMS)$(MMSQUALIFIERS)
diff --git a/src/mesa/drivers/common/descrip.mms b/src/mesa/drivers/common/descrip.mms
deleted file mode 100644
index c2c119db7f..0000000000
--- a/src/mesa/drivers/common/descrip.mms
+++ /dev/null
@@ -1,38 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen  joukj@hrem.nano.tudelft.nl
-# Last revision : 2 November 2005
-
-.first
-	define gl [----.include.gl]
-	define math [--.math]
-	define tnl [--.tnl]
-	define swrast [--.swrast]
-
-.include [----]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [----.include],[--.main],[--.glapi],[--.shader]
-LIBDIR = [----.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = driverfuncs.c
-
-OBJECTS =driverfuncs.obj
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
-  @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
-	purge
-	delete *.obj;*
-
-driverfuncs.obj : driverfuncs.c
diff --git a/src/mesa/drivers/osmesa/descrip.mms b/src/mesa/drivers/osmesa/descrip.mms
deleted file mode 100644
index 5be194bcee..0000000000
--- a/src/mesa/drivers/osmesa/descrip.mms
+++ /dev/null
@@ -1,41 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen  joukj@hrem.stm.tudelft.nl
-# Last revision : 16 June 2003
-
-.first
-	define gl [----.include.gl]
-	define math [--.math]
-	define tnl [--.tnl]
-	define swrast [--.swrast]
-	define swrast_setup [--.swrast_setup]
-	define array_cache [--.array_cache]
-	define drivers [-]
-
-.include [----]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [----.include],[--.main],[--.glapi]
-LIBDIR = [----.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = osmesa.c
-
-OBJECTS = osmesa.obj
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
-  @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
-	purge
-	delete *.obj;*
-
-osmesa.obj : osmesa.c
diff --git a/src/mesa/drivers/x11/descrip.mms b/src/mesa/drivers/x11/descrip.mms
deleted file mode 100644
index f181707a14..0000000000
--- a/src/mesa/drivers/x11/descrip.mms
+++ /dev/null
@@ -1,51 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen  joukj@hrem.stm.tudelft.nl
-# Last revision : 16 June 2003
-
-.first
-	define gl [----.include.gl]
-	define math [--.math]
-	define tnl [--.tnl]
-	define swrast [--.swrast]
-	define swrast_setup [--.swrast_setup]
-	define array_cache [--.array_cache]
-	define drivers [-]
-
-.include [----]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [----.include],[--.main],[--.glapi]
-LIBDIR = [----.lib]
-CFLAGS =/include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = fakeglx.c glxapi.c xfonts.c xm_api.c xm_dd.c xm_line.c xm_span.c\
-	xm_tri.c xm_buffer.c
-
-OBJECTS =fakeglx.obj,glxapi.obj,xfonts.obj,xm_api.obj,xm_dd.obj,xm_line.obj,\
-	xm_span.obj,xm_tri.obj,xm_buffer.obj
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
-  @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
-	purge
-	delete *.obj;*
-
-fakeglx.obj : fakeglx.c
-glxapi.obj : glxapi.c
-xfonts.obj : xfonts.c
-xm_api.obj : xm_api.c
-xm_buffer.obj : xm_buffer.c
-xm_dd.obj : xm_dd.c
-xm_line.obj : xm_line.c
-xm_span.obj : xm_span.c
-xm_tri.obj : xm_tri.c
diff --git a/src/mesa/glapi/descrip.mms b/src/mesa/glapi/descrip.mms
deleted file mode 100644
index 16bf6387e8..0000000000
--- a/src/mesa/glapi/descrip.mms
+++ /dev/null
@@ -1,37 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen  joukj@hrem.stm.tudelft.nl
-# Last revision : 16 June 2003
-
-.first
-	define gl [---.include.gl]
-
-.include [---]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [---.include],[-.main]
-LIBDIR = [---.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = glapi.c glthread.c
-
-OBJECTS =  glapi.obj,glthread.obj
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
-  @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
-	purge
-	delete *.obj;*
-
-glapi.obj : glapi.c
-
-glthread.obj : glthread.c
diff --git a/src/mesa/main/descrip.mms b/src/mesa/main/descrip.mms
deleted file mode 100644
index 2bd388be89..0000000000
--- a/src/mesa/main/descrip.mms
+++ /dev/null
@@ -1,221 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen  joukj@hrem.stm.tudelft.nl
-# Last revision : 10 May 2005
-
-.first
-	define gl [---.include.gl]
-	define math [-.math]
-	define shader [-.shader]
-
-.include [---]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [---.include],[-.glapi],[-.shader]
-LIBDIR = [---.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES =accum.c \
-	api_arrayelt.c \
-	api_loopback.c \
-	api_noop.c \
-	api_validate.c \
- 	attrib.c \
-	arrayobj.c \
-	blend.c \
-	bufferobj.c \
-	buffers.c \
-	clip.c \
-	colortab.c \
-	context.c \
-	convolve.c \
-	debug.c \
-	depth.c \
-	depthstencil.c \
-	dispatch.c \
-	dlist.c \
-	drawpix.c \
-	enable.c \
-	enums.c \
-	eval.c \
-	execmem.c \
-	extensions.c \
-	fbobject.c \
-	feedback.c \
-	fog.c \
-	framebuffer.c \
-	get.c \
-	getstring.c \
-	hash.c \
-	hint.c \
-	histogram.c \
-	image.c \
-	imports.c \
-	light.c \
-	lines.c \
-	matrix.c \
-	mipmap.c \
-	mm.c \
-	occlude.c \
-	pixel.c \
-	points.c \
-	polygon.c \
-	rastpos.c \
-	rbadaptors.c \
-	renderbuffer.c \
-	state.c \
-	stencil.c \
-	texcompress.c \
-	texcompress_fxt1.c \
-	texcompress_s3tc.c \
-	texenvprogram.c \
-	texformat.c \
-	teximage.c \
-	texobj.c \
-	texrender.c \
-	texstate.c \
-	texstore.c \
-	varray.c \
-	vtxfmt.c
-
-OBJECTS=accum.obj,\
-api_arrayelt.obj,\
-api_loopback.obj,\
-api_noop.obj,\
-api_validate.obj,\
-arrayobj.obj,\
-attrib.obj,\
-blend.obj,\
-bufferobj.obj,\
-buffers.obj,\
-clip.obj,\
-colortab.obj,\
-context.obj,\
-convolve.obj,\
-debug.obj,\
-depth.obj,\
-depthstencil.obj,\
-dispatch.obj,\
-dlist.obj,\
-drawpix.obj,\
-enable.obj,\
-enums.obj,\
-eval.obj,\
-execmem.obj,\
-extensions.obj,\
-fbobject.obj,\
-feedback.obj,\
-fog.obj,\
-framebuffer.obj,\
-get.obj,\
-getstring.obj,\
-hash.obj,\
-hint.obj,\
-histogram.obj,\
-image.obj,\
-imports.obj,\
-light.obj,\
-lines.obj,\
-matrix.obj,\
-mipmap.obj,\
-mm.obj,\
-occlude.obj,\
-pixel.obj,\
-points.obj,\
-polygon.obj,\
-rastpos.obj,\
-renderbuffer.obj,\
-state.obj,\
-stencil.obj,\
-texcompress.obj,\
-texcompress_fxt1.obj,\
-texcompress_s3tc.obj,\
-texenvprogram.obj,\
-texformat.obj,\
-teximage.obj,\
-texobj.obj,\
-texrender.obj,\
-texstate.obj,\
-texstore.obj,\
-varray.obj,\
-vtxfmt.obj
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
-  @ $(MAKELIB) $(GL_LIB) $(OBJECTS)
-  @ rename $(GL_LIB)* $(LIBDIR)
-
-clean :
-	purge
-	delete *.obj;*
-
-accum.obj : accum.c
-api_arrayelt.obj : api_arrayelt.c
-api_loopback.obj : api_loopback.c
-api_noop.obj : api_noop.c
-api_validate.obj : api_validate.c
-arrayobj.obj : arrayobj.c
-attrib.obj : attrib.c
-blend.obj : blend.c
-bufferobj.obj : bufferobj.c
-buffers.obj : buffers.c
-clip.obj : clip.c
-colortab.obj : colortab.c
-context.obj : context.c
-convolve.obj : convolve.c
-debug.obj : debug.c
-depth.obj : depth.c
-depthstencil.obj : depthstencil.c
-dispatch.obj : dispatch.c
-dlist.obj : dlist.c
-drawpix.obj : drawpix.c
-enable.obj : enable.c
-enums.obj : enums.c
-eval.obj : eval.c
-execmem.obj : execmem.c
-extensions.obj : extensions.c
-fbobject.obj : fbobject.c
-feedback.obj : feedback.c
-fog.obj : fog.c
-framebuffer.obj : framebuffer.c
-get.obj : get.c
-getstring.obj : getstring.c
-hash.obj : hash.c
-hint.obj : hint.c
-histogram.obj : histogram.c
-image.obj : image.c
-imports.obj : imports.c vsnprintf.c
-light.obj : light.c
-lines.obj : lines.c
-matrix.obj : matrix.c
-mipmap.obj : mipmap.c
-mm.obj : mm.c
-occlude.obj : occlude.c
-pixel.obj : pixel.c
-points.obj : points.c
-polygon.obj : polygon.c
-rastpos.obj : rastpos.c
-rbadaptors.obj : rbadaptors.c
-renderbuffer.obj : renderbuffer.c
-state.obj : state.c
-stencil.obj : stencil.c
-texcompress.obj : texcompress.c
-texcompress_fxt1.obj : texcompress_fxt1.c
-	cc$(CFLAGS)/warn=(disable=SHIFTCOUNT) texcompress_fxt1.c
-texcompress_s3tc.obj : texcompress_s3tc.c
-texenvprogram.obj : texenvprogram.c
-texformat.obj : texformat.c
-teximage.obj : teximage.c
-texobj.obj : texobj.c
-texrender.obj : texrender.c
-texstate.obj : texstate.c
-texstore.obj : texstore.c
-varray.obj : varray.c
-vtxfmt.obj : vtxfmt.c
diff --git a/src/mesa/math/descrip.mms b/src/mesa/math/descrip.mms
deleted file mode 100644
index 5b9e9915f8..0000000000
--- a/src/mesa/math/descrip.mms
+++ /dev/null
@@ -1,45 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen  joukj@hrem.stm.tudelft.nl
-# Last revision : 16 June 2003
-
-.first
-	define gl [---.include.gl]
-	define math [-.math]
-
-.include [---]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [---.include],[-.main],[-.glapi]
-LIBDIR = [---.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = m_debug_clip.c m_debug_norm.c m_debug_xform.c m_eval.c m_matrix.c\
-	m_translate.c m_vector.c m_xform.c
-
-OBJECTS = m_debug_clip.obj,m_debug_norm.obj,m_debug_xform.obj,m_eval.obj,\
-	m_matrix.obj,m_translate.obj,m_vector.obj,m_xform.obj
- 
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
-  @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
-	purge
-	delete *.obj;*
-
-m_debug_clip.obj : m_debug_clip.c
-m_debug_norm.obj : m_debug_norm.c
-m_debug_xform.obj : m_debug_xform.c
-m_eval.obj : m_eval.c
-m_matrix.obj : m_matrix.c
-m_translate.obj : m_translate.c
-m_vector.obj : m_vector.c
-m_xform.obj : m_xform.c
diff --git a/src/mesa/shader/descrip.mms b/src/mesa/shader/descrip.mms
deleted file mode 100644
index f5d04cfa78..0000000000
--- a/src/mesa/shader/descrip.mms
+++ /dev/null
@@ -1,76 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen  joukj@hrem.nano.tudelft.nl
-# Last revision : 20 November 2006
-.first
-	define gl [---.include.gl]
-	define math [-.math]
-	define swrast [-.swrast]
-	define array_cache [-.array_cache]
-
-.include [---]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [---.include],[.grammar],[-.main],[-.glapi],[.slang]
-LIBDIR = [---.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1,"__extension__=")/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = \
-	atifragshader.c \
-	arbprogparse.c \
-	arbprogram.c \
-	nvfragparse.c \
-	nvprogram.c \
-	nvvertexec.c \
-	nvvertparse.c \
-	program.c \
-	shaderobjects.c \
-	shaderobjects_3dlabs.c
-
-OBJECTS = \
-	atifragshader.obj,\
-	arbprogparse.obj,\
-	arbprogram.obj,\
-	nvfragparse.obj,\
-	nvprogram.obj,\
-	nvvertexec.obj,\
-	nvvertparse.obj,\
-	program.obj,\
-	shaderobjects.obj,\
-	shaderobjects_3dlabs.obj
-
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-all : 
-	$(MMS)$(MMSQUALIFIERS) $(LIBDIR)$(GL_LIB)
-	set def [.slang]
-	$(MMS)$(MMSQUALIFIERS)
-	set def [-.grammar]
-	$(MMS)$(MMSQUALIFIERS)
-	set def [-]
-
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
-  @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
-	purge
-	delete *.obj;*
-
-atifragshader.obj : atifragshader.c
-arbprogparse.obj : arbprogparse.c
-arbprogram.obj : arbprogram.c
-nvfragparse.obj : nvfragparse.c
-nvprogram.obj : nvprogram.c
-nvvertexec.obj : nvvertexec.c
-nvvertparse.obj : nvvertparse.c
-program.obj : program.c
-shaderobjects.obj : shaderobjects.c
-	cc$(CFLAGS)/nowarn shaderobjects.c
-shaderobjects_3dlabs.obj : shaderobjects_3dlabs.c
diff --git a/src/mesa/shader/grammar/descrip.mms b/src/mesa/shader/grammar/descrip.mms
deleted file mode 100644
index cff53ee872..0000000000
--- a/src/mesa/shader/grammar/descrip.mms
+++ /dev/null
@@ -1,41 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen  joukj@hrem.stm.tudelft.nl
-# Last revision : 1 June 2005
-
-.first
-	define gl [----.include.gl]
-	define math [--.math]
-	define swrast [--.swrast]
-	define array_cache [--.array_cache]
-
-.include [----]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [----.include],[],[--.main],[--.glapi],[-.slang]
-LIBDIR = [----.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = grammar_mesa.c
-
-OBJECTS = grammar_mesa.obj
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-all : 
-	$(MMS)$(MMSQUALIFIERS) $(LIBDIR)$(GL_LIB)
-
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
-  @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
-	purge
-	delete *.obj;*
-
-grammar_mesa.obj : grammar_mesa.c grammar.c
diff --git a/src/mesa/shader/slang/descrip.mms b/src/mesa/shader/slang/descrip.mms
deleted file mode 100644
index 8b9cd822b8..0000000000
--- a/src/mesa/shader/slang/descrip.mms
+++ /dev/null
@@ -1,65 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen  joukj@hrem.nano.tudelft.nl
-# Last revision : 17 March 2006
-
-.first
-	define gl [----.include.gl]
-	define math [--.math]
-	define swrast [--.swrast]
-	define array_cache [--.array_cache]
-
-.include [----]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [----.include],[--.main],[--.glapi],[-.slang],[-.grammar],[-]
-LIBDIR = [----.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = \
-	slang_compile.c,slang_preprocess.c
-
-OBJECTS = \
-	slang_compile.obj,slang_preprocess.obj,slang_utility.obj,\
-	slang_execute.obj,slang_assemble.obj,slang_assemble_conditional.obj,\
-	slang_assemble_constructor.obj,slang_assemble_typeinfo.obj,\
-	slang_storage.obj,slang_assemble_assignment.obj,\
-	slang_compile_function.obj,slang_compile_struct.obj,\
-	slang_compile_variable.obj,slang_compile_operation.obj,\
-	slang_library_noise.obj,slang_link.obj,slang_export.obj,\
-	slang_analyse.obj,slang_library_texsample.obj
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
-  @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
-	purge
-	delete *.obj;*
-
-slang_compile.obj : slang_compile.c
-slang_preprocess.obj : slang_preprocess.c
-slang_utility.obj : slang_utility.c
-slang_execute.obj : slang_execute.c
-slang_assemble.obj : slang_assemble.c
-slang_assemble_conditional.obj : slang_assemble_conditional.c
-slang_assemble_constructor.obj : slang_assemble_constructor.c
-slang_assemble_typeinfo.obj : slang_assemble_typeinfo.c
-slang_storage.obj : slang_storage.c
-slang_assemble_assignment.obj : slang_assemble_assignment.c
-slang_compile_function.obj : slang_compile_function.c
-slang_compile_struct.obj : slang_compile_struct.c
-slang_compile_variable.obj : slang_compile_variable.c
-slang_compile_operation.obj : slang_compile_operation.c
-slang_library_noise.obj : slang_library_noise.c
-slang_link.obj : slang_link.c
-slang_export.obj : slang_export.c
-slang_analyse.obj : slang_analyse.c
-slang_library_texsample.obj : slang_library_texsample.c
diff --git a/src/mesa/swrast/descrip.mms b/src/mesa/swrast/descrip.mms
deleted file mode 100644
index 4d446600ba..0000000000
--- a/src/mesa/swrast/descrip.mms
+++ /dev/null
@@ -1,80 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen  joukj@hrem.nano.tudelft.nl
-# Last revision : 21 February 2006
-
-.first
-	define gl [---.include.gl]
-	define math [-.math]
-	define swrast [-.swrast]
-	define array_cache [-.array_cache]
-
-.include [---]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [---.include],[-.main],[-.glapi],[-.shader],[-.shader.slang]
-LIBDIR = [---.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = s_aaline.c s_aatriangle.c s_accum.c s_alpha.c \
-	s_bitmap.c s_blend.c s_blit.c s_buffers.c s_context.c \
-	s_copypix.c s_depth.c \
-        s_drawpix.c s_feedback.c s_fog.c s_imaging.c s_lines.c s_logic.c \
-	s_masking.c s_nvfragprog.c s_points.c s_readpix.c \
-	s_span.c s_stencil.c s_texstore.c s_texcombine.c s_texfilter.c \
-	s_triangle.c s_zoom.c s_atifragshader.c s_arbshader.c
- 
-OBJECTS = s_aaline.obj,s_aatriangle.obj,s_accum.obj,s_alpha.obj,\
-	s_bitmap.obj,s_blend.obj,s_blit.obj,s_arbshader.obj,\
-	s_buffers.obj,s_context.obj,s_atifragshader.obj,\
-	s_copypix.obj,s_depth.obj,s_drawpix.obj,s_feedback.obj,s_fog.obj,\
-	s_imaging.obj,s_lines.obj,s_logic.obj,s_masking.obj,s_nvfragprog.obj,\
-	s_points.obj,s_readpix.obj,s_span.obj,s_stencil.obj,\
-	s_texstore.obj,s_texcombine.obj,s_texfilter.obj,s_triangle.obj,\
-	s_zoom.obj
- 
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
-  @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
-	purge
-	delete *.obj;*
-
-s_atifragshader.obj : s_atifragshader.c
-s_aaline.obj : s_aaline.c
-s_aatriangle.obj : s_aatriangle.c
-s_accum.obj : s_accum.c
-s_alpha.obj : s_alpha.c
-s_bitmap.obj : s_bitmap.c
-s_blend.obj : s_blend.c
-s_blit.obj : s_blit.c
-s_buffers.obj : s_buffers.c
-s_context.obj : s_context.c
-s_copypix.obj : s_copypix.c
-s_depth.obj : s_depth.c
-s_drawpix.obj : s_drawpix.c
-s_feedback.obj : s_feedback.c
-s_fog.obj : s_fog.c
-s_imaging.obj : s_imaging.c
-s_lines.obj : s_lines.c
-s_logic.obj : s_logic.c
-s_masking.obj : s_masking.c
-s_nvfragprog.obj : s_nvfragprog.c
-s_points.obj : s_points.c
-s_readpix.obj : s_readpix.c
-s_span.obj : s_span.c
-s_stencil.obj : s_stencil.c
-s_texstore.obj : s_texstore.c
-s_texcombine.obj : s_texcombine.c
-s_texfilter.obj : s_texfilter.c
-s_triangle.obj : s_triangle.c
-s_zoom.obj : s_zoom.c
-s_arbshader.obj : s_arbshader.c
diff --git a/src/mesa/swrast_setup/descrip.mms b/src/mesa/swrast_setup/descrip.mms
deleted file mode 100644
index 0ab81c07d3..0000000000
--- a/src/mesa/swrast_setup/descrip.mms
+++ /dev/null
@@ -1,39 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen  joukj@hrem.stm.tudelft.nl
-# Last revision : 16 June 2003
-
-.first
-	define gl [---.include.gl]
-	define math [-.math]
-	define tnl [-.tnl]
-	define swrast [-.swrast]
-	define array_cache [-.array_cache]
-
-.include [---]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [---.include],[-.main],[-.glapi]
-LIBDIR = [---.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = ss_context.c ss_triangle.c
-
-OBJECTS =  ss_context.obj,ss_triangle.obj
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
-  @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
-	purge
-	delete *.obj;*
-
-ss_context.obj : ss_context.c
-ss_triangle.obj : ss_triangle.c
diff --git a/src/mesa/tnl/descrip.mms b/src/mesa/tnl/descrip.mms
deleted file mode 100644
index a9aed89f1d..0000000000
--- a/src/mesa/tnl/descrip.mms
+++ /dev/null
@@ -1,75 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen  joukj@hrem.nano.tudelft.nl
-# Last revision : 21 February 2006
-
-.first
-	define gl [---.include.gl]
-	define math [-.math]
-	define shader [-.shader]
-	define array_cache [-.array_cache]
-
-.include [---]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [---.include],[-.main],[-.glapi],[-.shader],[-.shader.slang]
-LIBDIR = [---.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = t_array_api.c t_array_import.c t_context.c \
-	t_pipeline.c t_vb_fog.c t_save_api.c t_vtx_api.c \
-	t_vb_light.c t_vb_normals.c t_vb_points.c t_vb_program.c \
-	t_vb_render.c t_vb_texgen.c t_vb_texmat.c t_vb_vertex.c \
-	t_vtx_eval.c t_vtx_exec.c t_save_playback.c t_save_loopback.c \
-	t_vertex.c t_vtx_generic.c t_vtx_x86.c t_vertex_generic.c \
-	t_vb_arbprogram.c t_vp_build.c t_vb_arbshader.c
-
-OBJECTS = t_array_api.obj,t_array_import.obj,t_context.obj,\
-	t_pipeline.obj,t_vb_fog.obj,t_vb_light.obj,t_vb_normals.obj,\
-	t_vb_points.obj,t_vb_program.obj,t_vb_render.obj,t_vb_texgen.obj,\
-	t_vb_texmat.obj,t_vb_vertex.obj,t_save_api.obj,t_vtx_api.obj,\
-	t_vtx_eval.obj,t_vtx_exec.obj,t_save_playback.obj,t_save_loopback.obj,\
-	t_vertex.obj,t_vtx_generic.obj,t_vtx_x86.obj,t_vertex_generic.obj,\
-	t_vb_arbprogram.obj,t_vp_build.obj,t_vb_arbshader.obj
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
-  @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
-	purge
-	delete *.obj;*
-
-t_array_api.obj : t_array_api.c
-t_array_import.obj : t_array_import.c
-t_context.obj : t_context.c
-t_pipeline.obj : t_pipeline.c
-t_vb_fog.obj : t_vb_fog.c
-t_vb_light.obj : t_vb_light.c
-t_vb_normals.obj : t_vb_normals.c
-t_vb_points.obj : t_vb_points.c
-t_vb_program.obj : t_vb_program.c
-t_vb_render.obj : t_vb_render.c
-t_vb_texgen.obj : t_vb_texgen.c
-t_vb_texmat.obj : t_vb_texmat.c
-t_vb_vertex.obj : t_vb_vertex.c
-t_save_api.obj : t_save_api.c
-t_vtx_api.obj : t_vtx_api.c
-t_vtx_eval.obj : t_vtx_eval.c
-t_vtx_exec.obj : t_vtx_exec.c
-t_save_playback.obj : t_save_playback.c
-t_save_loopback.obj : t_save_loopback.c
-t_vertex.obj : t_vertex.c
-t_vtx_x86.obj : t_vtx_x86.c
-t_vtx_generic.obj : t_vtx_generic.c
-t_vertex_generic.obj : t_vertex_generic.c
-t_vb_arbprogram.obj : t_vb_arbprogram.c
-t_vp_build.obj : t_vp_build.c
-t_vb_arbshader.obj : t_vb_arbshader.c
diff --git a/src/mesa/vbo/descrip.mms b/src/mesa/vbo/descrip.mms
deleted file mode 100644
index e00b6703aa..0000000000
--- a/src/mesa/vbo/descrip.mms
+++ /dev/null
@@ -1,60 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen  joukj@hrem.nano.tudelft.nl
-# Last revision : 7 March 2007
-
-.first
-	define gl [---.include.gl]
-	define math [-.math]
-	define vbo [-.vbo]
-	define tnl [-.tnl]
-	define shader [-.shader]
-	define swrast [-.swrast]
-	define swrast_setup [-.swrast_setup]
-
-.include [---]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [---.include],[-.main],[-.glapi],[-.shader],[-.shader.slang]
-LIBDIR = [---.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES =vbo_context.c,vbo_exec.c,vbo_exec_api.c,vbo_exec_array.c,\
-	vbo_exec_draw.c,vbo_exec_eval.c,vbo_rebase.c,vbo_save.c,\
-	vbo_save_api.c,vbo_save_draw.c,vbo_save_loopback.c,\
-	vbo_split.c,vbo_split_copy.c,vbo_split_inplace.c
-
-OBJECTS =vbo_context.obj,vbo_exec.obj,vbo_exec_api.obj,vbo_exec_array.obj,\
-	vbo_exec_draw.obj,vbo_exec_eval.obj,vbo_rebase.obj,vbo_save.obj,\
-	vbo_save_api.obj,vbo_save_draw.obj,vbo_save_loopback.obj,\
-	vbo_split.obj,vbo_split_copy.obj,vbo_split_inplace.obj
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
-  @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
-	purge
-	delete *.obj;*
-
-vbo_context.obj : vbo_context.c
-vbo_exec.obj : vbo_exec.c
-vbo_exec_api.obj : vbo_exec_api.c
-vbo_exec_array.obj : vbo_exec_array.c
-vbo_exec_draw.obj : vbo_exec_draw.c
-vbo_exec_eval.obj : vbo_exec_eval.c
-vbo_rebase.obj : vbo_rebase.c
-vbo_save.obj : vbo_save.c
-vbo_save_api.obj : vbo_save_api.c
-vbo_save_draw.obj : vbo_save_draw.c
-vbo_save_loopback.obj : vbo_save_loopback.c
-vbo_split.obj : vbo_split.c
-vbo_split_copy.obj : vbo_split_copy.c
-vbo_split_inplace.obj : vbo_split_inplace.c
diff --git a/vms/analyze_map.com b/vms/analyze_map.com
deleted file mode 100644
index d024ffcf90..0000000000
--- a/vms/analyze_map.com
+++ /dev/null
@@ -1,148 +0,0 @@
-$! Analyze Map for OpenVMS AXP
-$!
-$! Originally found in the distribution of gv
-$!       http://wwwthep.physik.uni-mainz.de/~plass/gv/
-$!
-$! 1-Jul-1999 : modified to be used with $BSS$ & $READONLY sections in the
-$!              map-file by J. Jansen (joukj@hrem.stm.tudelft.nl)
-$!
-$ SET SYMBOL/GENERAL/SCOPE=(NOLOCAL,NOGLOBAL)
-$ SAY := "WRITE_ SYS$OUTPUT"
-$ 
-$ IF F$SEARCH("''P1'") .EQS. ""
-$ THEN
-$    SAY "  ANALYZE_MAP.COM:  Error, no mapfile provided"
-$    EXIT_
-$ ENDIF
-$ IF "''P2'" .EQS. ""
-$ THEN
-$    SAY "  ANALYZE_MAP.COM:  Error, no output file provided"
-$    EXIT_
-$ ENDIF
-$
-$ LINK_TMP  = F$PARSE(P2,,,"DEVICE")+F$PARSE(P2,,,"DIRECTORY")+F$PARSE(P2,,,"NAME")+".TMP"
-$
-$ SAY "  checking PSECT list in ''P2'"
-$ OPEN_/READ IN 'P1'
-$ LOOP_PSECT_SEARCH:
-$    READ_/END=EOF_PSECT IN REC
-$ LOOP_PSECT_SEARCH0:
-$    if F$EXTRACT(0,5,REC) .eqs. "$DATA" .or. F$EXTRACT(0,5,REC) .eqs. -
-       "$BSS$" .or. f$extract(0,10,rec) .eqs. "$READONLY$" then goto do_data
-$    if F$EXTRACT(0,14,REC) .eqs. "$READONLY_ADDR" then goto do_readonly
-$    goto LOOP_PSECT_SEARCH
-$ do_data:
-$ LAST = ""
-$ LOOP_PSECT:
-$    READ_/END=EOF_PSECT IN REC
-$    if F$EXTRACT(0,1,REC) .eqs. "$" .and. F$EXTRACT(0,5,REC) .nes. "$DATA" -
-       .and. F$EXTRACT(0,5,REC) .nes. "$BSS$" .and.  f$extract(0,10,rec) -
-       .nes. "$READONLY$" then goto LOOP_PSECT_SEARCH0
-$    if REC - "NOPIC,OVR,REL,GBL,NOSHR,NOEXE,  WRT,NOVEC" .nes. REC
-$    then 
-$       J = F$LOCATE(" ",REC)
-$       S = F$EXTRACT(0,J,REC)
-$       IF S .EQS. LAST THEN GOTO LOOP_PSECT
-$       P$_'S= 1
-$       LAST = S
-$    endif
-$    if REC - "NOPIC,OVR,REL,GBL,NOSHR,NOEXE,NOWRT,NOVEC" .nes. REC
-$    then 
-$       J = F$LOCATE(" ",REC)
-$       S = F$EXTRACT(0,J,REC)
-$       IF S .EQS. LAST THEN GOTO LOOP_PSECT
-$       P$_'S= 1
-$       LAST = S
-$    endif
-$    GOTO LOOP_PSECT
-$ 
-$ do_readonly:
-$ LAST = ""
-$ LOOP_PSECT3:
-$    READ_/END=EOF_PSECT IN REC
-$    if F$EXTRACT(0,1,REC) .eqs. "-" .or. F$EXTRACT(0,3,REC) .eqs. "NL:" then -
-       goto loop_psect3
-$    if F$EXTRACT(0,1,REC) .eqs. "$" .and. F$EXTRACT(0,14,REC) .nes. -
-       "$READONLY_ADDR" then goto LOOP_PSECT_SEARCH0
-$    if REC - "OCTA" .nes. REC
-$    then 
-$       J = F$LOCATE(" ",REC)
-$       S = F$EXTRACT(0,J,REC)
-$       IF S .EQS. LAST THEN GOTO LOOP_PSECT3
-$       P$_'S= 1
-$       LAST = S
-$    endif
-$    GOTO LOOP_PSECT3
-$
-$ EOF_PSECT:
-$    CLOSE_ IN
-$
-$ SAY "  appending list of UNIVERSAL procedures to ''P2'"
-$ SEARCH_/NOHIGH/WINDOW=(0,0) 'P1' " R-"/OUT='LINK_TMP
-$ OPEN_/READ IN 'LINK_TMP
-$ OPEN_/write OUT 'P2'
-$ WRITE_ OUT "!"
-$ WRITE_ OUT "! ### UNIVERSAL procedures and global definitions extracted from ''P1'"
-$ WRITE_ OUT "!"
-$ write_ OUT "case_sensitive=YES"
-$ LOOP_UNIVERSAL:
-$    READ_/END=EOF_UNIVERSAL IN REC
-$    J = F$LOCATE(" R-",REC)
-$    S = F$EXTRACT(J+3,F$length(rec),REC)
-$    J = F$LOCATE(" ",S)
-$    S = F$EXTRACT(0,J,S)
-$    PP$_'S= 1
-$    IF F$TYPE(P$_'S').EQS.""
-$    THEN
-$       WRITE_ OUT "symbol_vector = ("+S+"	= PROCEDURE)"
-$    ELSE
-$       WRITE_ OUT "symbol_vector = ("+S+"	= DATA)"
-$    ENDIF
-$    GOTO LOOP_UNIVERSAL
-$ EOF_UNIVERSAL:
-$    CLOSE_ IN
-$    CLOSE_ OUT
-$!
-$ SAY "  creating PSECT list in ''P2'"
-$ OPEN_/READ IN 'P1'
-$ OPEN_/append OUT 'P2'
-$ WRITE_ OUT "!"
-$ WRITE_ OUT "! ### PSECT list extracted from ''P1'"
-$ WRITE_ OUT "!" 
-$ LOOP_PSECT_SEARCH1:
-$    READ_/END=EOF_PSECT1 IN REC
-$    if F$EXTRACT(0,5,REC) .nes. "$DATA" .and. F$EXTRACT(0,5,REC) .nes. -
-       "$BSS$" .and.  f$extract(0,10,rec) .nes. "$READONLY$" then goto -
-       LOOP_PSECT_SEARCH1
-$ LAST = ""
-$ LOOP_PSECT1:
-$    READ_/END=EOF_PSECT1 IN REC
-$    if F$EXTRACT(0,1,REC) .eqs. "$" .and. F$EXTRACT(0,5,REC) .nes. "$DATA" -
-       .and. F$EXTRACT(0,5,REC) .nes. "$BSS$" .and.  f$extract(0,10,rec) -
-       .nes. "$READONLY$" then goto LOOP_PSECT_SEARCH1
-$    if REC - "NOPIC,OVR,REL,GBL,NOSHR,NOEXE,  WRT,NOVEC" .nes. REC
-$    then 
-$       J = F$LOCATE(" ",REC)
-$       S = F$EXTRACT(0,J,REC)
-$       IF S .EQS. LAST THEN GOTO LOOP_PSECT1
-$       IF F$TYPE(PP$_'S').nes."" then WRITE_ OUT "symbol_vector = (" +  S + " = PSECT)"
-$       P$_'S= 1
-$       LAST = S
-$    endif
-$    if REC - "NOPIC,OVR,REL,GBL,NOSHR,NOEXE,NOWRT,NOVEC" .nes. REC
-$    then 
-$       J = F$LOCATE(" ",REC)
-$       S = F$EXTRACT(0,J,REC)
-$       IF S .EQS. LAST THEN GOTO LOOP_PSECT1
-$       IF F$TYPE(PP$_'S').nes."" then WRITE_ OUT "symbol_vector = (" +  S + " = PSECT)"
-$       P$_'S= 1
-$       LAST = S
-$    endif
-$    GOTO LOOP_PSECT1
-$
-$ EOF_PSECT1:
-$    CLOSE_ IN
-$    CLOSE_ OUT 
-$    if f$search("''LINK_TMP'") .nes. "" then DELETE_/NOLOG/NOCONFIRM 'LINK_TMP';*
-$
-$ EXIT_ 
diff --git a/vms/xlib.opt b/vms/xlib.opt
deleted file mode 100644
index acae358b57..0000000000
--- a/vms/xlib.opt
+++ /dev/null
@@ -1,2 +0,0 @@
-sys$library:decw$xlibshr.exe/share
-sys$library:decw$xmulibshr.exe/share
diff --git a/vms/xlib_share.opt b/vms/xlib_share.opt
deleted file mode 100644
index ebe039f012..0000000000
--- a/vms/xlib_share.opt
+++ /dev/null
@@ -1,7 +0,0 @@
-[--.lib]libmesagl.exe/share
-[--.lib]libmesaglu.exe/share
-[--.lib]libglut.exe/share
-sys$library:decw$xlibshr.exe/share
-sys$library:decw$xmulibshr.exe/share
-sys$library:decw$xmlibshr12/share
-sys$library:decw$xtlibshrr5/share
diff --git a/windows/VC6/mesa/gdi/gdi.dsp b/windows/VC6/mesa/gdi/gdi.dsp
deleted file mode 100644
index ef38215216..0000000000
--- a/windows/VC6/mesa/gdi/gdi.dsp
+++ /dev/null
@@ -1,211 +0,0 @@
-# Microsoft Developer Studio Project File - Name="gdi" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=gdi - Win32 Debug x86
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "gdi.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "gdi.mak" CFG="gdi - Win32 Debug x86"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "gdi - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gdi - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gdi - Win32 Release x86" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gdi - Win32 Debug x86" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "gdi - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDI_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../main" /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/main" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/swrast" /I "../../../../src/mesa/shader" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDI_EXPORTS" /D "_DLL" /D "BUILD_GL32" /D "MESA_MINWARN" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 mesa.lib winmm.lib msvcrt.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /nodefaultlib /out:"Release/OPENGL32.DLL" /libpath:"../mesa/Release"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=if not exist ..\..\..\..\lib md ..\..\..\..\lib	copy Release\OPENGL32.LIB ..\..\..\..\lib	copy Release\OPENGL32.DLL ..\..\..\..\lib	if exist ..\..\..\..\progs\demos copy Release\OPENGL32.DLL ..\..\..\..\progs\demos
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "gdi - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDI_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/main" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/swrast" /I "../../../../src/mesa/shader" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDI_EXPORTS" /D "_DLL" /D "BUILD_GL32" /D "MESA_MINWARN" /FR /FD /GZ /c
-# SUBTRACT CPP /YX /Yc /Yu
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 mesa.lib winmm.lib msvcrtd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /debug /machine:I386 /nodefaultlib /out:"Debug/OPENGL32.DLL" /pdbtype:sept /libpath:"../mesa/Debug"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=if not exist ..\..\..\..\lib md ..\..\..\..\lib	copy Debug\OPENGL32.LIB ..\..\..\..\lib	copy Debug\OPENGL32.DLL ..\..\..\..\lib	if exist ..\..\..\..\progs\demos copy Debug\OPENGL32.DLL ..\..\..\..\progs\demos
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "gdi - Win32 Release x86"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "gdi___Win32_Release_x86"
-# PROP BASE Intermediate_Dir "gdi___Win32_Release_x86"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release_x86"
-# PROP Intermediate_Dir "Release_x86"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "../../main" /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/main" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/swrast" /I "../../../../src/mesa/shader" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDI_EXPORTS" /D "_DLL" /D "BUILD_GL32" /D "MESA_MINWARN" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../main" /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/main" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/swrast" /I "../../../../src/mesa/shader" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDI_EXPORTS" /D "_DLL" /D "BUILD_GL32" /D "MESA_MINWARN" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 mesa.lib winmm.lib msvcrt.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /nodefaultlib /out:"Release/OPENGL32.DLL" /libpath:"../mesa/Release"
-# ADD LINK32 mesa.lib winmm.lib msvcrt.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /nodefaultlib /out:"Release_x86/OPENGL32.DLL" /libpath:"../mesa/Release_x86"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=if not exist ..\..\..\..\lib md ..\..\..\..\lib	copy Release_x86\OPENGL32.LIB ..\..\..\..\lib	copy Release_x86\OPENGL32.DLL ..\..\..\..\lib	if exist ..\..\..\..\progs\demos copy Release_x86\OPENGL32.DLL ..\..\..\..\progs\demos	copy Release_x86\OPENGL32.DLL "C:\Documents and Settings\mjk\Pulpit\pen\noise-demo"
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "gdi - Win32 Debug x86"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "gdi___Win32_Debug_x86"
-# PROP BASE Intermediate_Dir "gdi___Win32_Debug_x86"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug_x86"
-# PROP Intermediate_Dir "Debug_x86"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/main" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/swrast" /I "../../../../src/mesa/shader" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDI_EXPORTS" /D "_DLL" /D "BUILD_GL32" /D "MESA_MINWARN" /FR /FD /GZ /c
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/main" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/swrast" /I "../../../../src/mesa/shader" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDI_EXPORTS" /D "_DLL" /D "BUILD_GL32" /D "MESA_MINWARN" /FR /FD /GZ /c
-# SUBTRACT CPP /YX /Yc /Yu
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 mesa.lib winmm.lib msvcrtd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /debug /machine:I386 /nodefaultlib /out:"Debug/OPENGL32.DLL" /pdbtype:sept /libpath:"../mesa/Debug"
-# ADD LINK32 mesa.lib winmm.lib msvcrtd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /debug /machine:I386 /nodefaultlib /out:"Debug_x86/OPENGL32.DLL" /pdbtype:sept /libpath:"../mesa/Debug_x86"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=if not exist ..\..\..\..\lib md ..\..\..\..\lib	copy Debug_x86\OPENGL32.LIB ..\..\..\..\lib	copy Debug_x86\OPENGL32.DLL ..\..\..\..\lib	if exist ..\..\..\..\progs\demos copy Debug_x86\OPENGL32.DLL ..\..\..\..\progs\demos	copy Debug_x86\OPENGL32.DLL "C:\Documents and Settings\mjk\Pulpit\pen\noise-demo"
-# End Special Build Tool
-
-!ENDIF 
-
-# Begin Target
-
-# Name "gdi - Win32 Release"
-# Name "gdi - Win32 Debug"
-# Name "gdi - Win32 Release x86"
-# Name "gdi - Win32 Debug x86"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\drivers\common\driverfuncs.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\drivers\windows\gdi\wgl.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\drivers\windows\gdi\wmesa.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\drivers\windows\gdi\colors.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\drivers\common\driverfuncs.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\drivers\windows\gdi\wmesadef.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows/VC6/mesa/glu/compileDebug.txt b/windows/VC6/mesa/glu/compileDebug.txt
deleted file mode 100644
index d149302245..0000000000
--- a/windows/VC6/mesa/glu/compileDebug.txt
+++ /dev/null
@@ -1,82 +0,0 @@
-/nologo /W2 /GX- /Zi /Od /c /TP 
-/I "../../../../include" 
-/I "../../../../src/glu/sgi/include" 
-/I "../../../../src/glu/sgi/libnurbs/interface"
-/I "../../../../src/glu/sgi/libnurbs/internals"
-/I "../../../../src/glu/sgi/libnurbs/nurbtess"
-/D "WIN32"  /D "_DEBUG"  /D "_WINDOWS"  /D "_MBCS" 
-/D "_USRDLL" /D "GLU_EXPORTS" /D "BUILD_GL32" /D "LIBRARYBUILD" 
-/Fo"Debug/" /Fd"Debug/" /GZ 
-../../../../src/glu/sgi/libnurbs/interface/bezierEval.cc 
-../../../../src/glu/sgi/libnurbs/interface/bezierPatch.cc 
-../../../../src/glu/sgi/libnurbs/interface/bezierPatchMesh.cc 
-../../../../src/glu/sgi/libnurbs/interface/glcurveval.cc 
-../../../../src/glu/sgi/libnurbs/interface/glinterface.cc 
-../../../../src/glu/sgi/libnurbs/interface/glrenderer.cc 
-../../../../src/glu/sgi/libnurbs/interface/glsurfeval.cc 
-../../../../src/glu/sgi/libnurbs/interface/incurveeval.cc 
-../../../../src/glu/sgi/libnurbs/interface/insurfeval.cc 
-../../../../src/glu/sgi/libnurbs/internals/arc.cc 
-../../../../src/glu/sgi/libnurbs/internals/arcsorter.cc 
-../../../../src/glu/sgi/libnurbs/internals/arctess.cc 
-../../../../src/glu/sgi/libnurbs/internals/backend.cc  
-../../../../src/glu/sgi/libnurbs/internals/basiccrveval.cc  
-../../../../src/glu/sgi/libnurbs/internals/basicsurfeval.cc  
-../../../../src/glu/sgi/libnurbs/internals/bin.cc  
-../../../../src/glu/sgi/libnurbs/internals/bufpool.cc 
-../../../../src/glu/sgi/libnurbs/internals/cachingeval.cc 
-../../../../src/glu/sgi/libnurbs/internals/ccw.cc 
-../../../../src/glu/sgi/libnurbs/internals/coveandtiler.cc 
-../../../../src/glu/sgi/libnurbs/internals/curve.cc 
-../../../../src/glu/sgi/libnurbs/internals/curvelist.cc 
-../../../../src/glu/sgi/libnurbs/internals/curvesub.cc 
-../../../../src/glu/sgi/libnurbs/internals/dataTransform.cc 
-../../../../src/glu/sgi/libnurbs/internals/displaylist.cc 
-../../../../src/glu/sgi/libnurbs/internals/flist.cc 
-../../../../src/glu/sgi/libnurbs/internals/flistsorter.cc 
-../../../../src/glu/sgi/libnurbs/internals/hull.cc 
-../../../../src/glu/sgi/libnurbs/internals/intersect.cc 
-../../../../src/glu/sgi/libnurbs/internals/knotvector.cc 
-../../../../src/glu/sgi/libnurbs/internals/mapdesc.cc 
-../../../../src/glu/sgi/libnurbs/internals/mapdescv.cc 
-../../../../src/glu/sgi/libnurbs/internals/maplist.cc 
-../../../../src/glu/sgi/libnurbs/internals/mesher.cc 
-../../../../src/glu/sgi/libnurbs/internals/monoTriangulationBackend.cc 
-../../../../src/glu/sgi/libnurbs/internals/monotonizer.cc 
-../../../../src/glu/sgi/libnurbs/internals/mycode.cc 
-../../../../src/glu/sgi/libnurbs/internals/nurbsinterfac.cc 
-../../../../src/glu/sgi/libnurbs/internals/nurbstess.cc 
-../../../../src/glu/sgi/libnurbs/internals/patch.cc 
-../../../../src/glu/sgi/libnurbs/internals/patchlist.cc 
-../../../../src/glu/sgi/libnurbs/internals/quilt.cc 
-../../../../src/glu/sgi/libnurbs/internals/reader.cc 
-../../../../src/glu/sgi/libnurbs/internals/renderhints.cc 
-../../../../src/glu/sgi/libnurbs/internals/slicer.cc 
-../../../../src/glu/sgi/libnurbs/internals/sorter.cc 
-../../../../src/glu/sgi/libnurbs/internals/splitarcs.cc 
-../../../../src/glu/sgi/libnurbs/internals/subdivider.cc 
-../../../../src/glu/sgi/libnurbs/internals/tobezier.cc 
-../../../../src/glu/sgi/libnurbs/internals/trimline.cc 
-../../../../src/glu/sgi/libnurbs/internals/trimregion.cc 
-../../../../src/glu/sgi/libnurbs/internals/trimvertpool.cc 
-../../../../src/glu/sgi/libnurbs/internals/uarray.cc 
-../../../../src/glu/sgi/libnurbs/internals/varray.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/directedLine.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/gridWrap.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/monoChain.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/monoPolyPart.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/monoTriangulation.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/partitionX.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/partitionY.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/polyDBG.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/polyUtil.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/primitiveStream.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/quicksort.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/rectBlock.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/sampleComp.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/sampleCompBot.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/sampleCompRight.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/sampleCompTop.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/sampledLine.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/searchTree.cc
diff --git a/windows/VC6/mesa/glu/compileRelease.txt b/windows/VC6/mesa/glu/compileRelease.txt
deleted file mode 100644
index 7f41952bd5..0000000000
--- a/windows/VC6/mesa/glu/compileRelease.txt
+++ /dev/null
@@ -1,82 +0,0 @@
-/nologo /W2 /GX- /O2 /c /TP 
-/I "../../../../include" 
-/I "../../../../src/glu/sgi/include" 
-/I "../../../../src/glu/sgi/libnurbs/interface"
-/I "../../../../src/glu/sgi/libnurbs/internals"
-/I "../../../../src/glu/sgi/libnurbs/nurbtess"
-/D "WIN32"  /D "_WINDOWS"  /D "_MBCS" 
-/D "_USRDLL" /D "GLU_EXPORTS" /D "BUILD_GL32" /D "LIBRARYBUILD" 
-/Fo"Release/" 
-../../../../src/glu/sgi/libnurbs/interface/bezierEval.cc 
-../../../../src/glu/sgi/libnurbs/interface/bezierPatch.cc 
-../../../../src/glu/sgi/libnurbs/interface/bezierPatchMesh.cc 
-../../../../src/glu/sgi/libnurbs/interface/glcurveval.cc 
-../../../../src/glu/sgi/libnurbs/interface/glinterface.cc 
-../../../../src/glu/sgi/libnurbs/interface/glrenderer.cc 
-../../../../src/glu/sgi/libnurbs/interface/glsurfeval.cc 
-../../../../src/glu/sgi/libnurbs/interface/incurveeval.cc 
-../../../../src/glu/sgi/libnurbs/interface/insurfeval.cc 
-../../../../src/glu/sgi/libnurbs/internals/arc.cc 
-../../../../src/glu/sgi/libnurbs/internals/arcsorter.cc 
-../../../../src/glu/sgi/libnurbs/internals/arctess.cc 
-../../../../src/glu/sgi/libnurbs/internals/backend.cc  
-../../../../src/glu/sgi/libnurbs/internals/basiccrveval.cc  
-../../../../src/glu/sgi/libnurbs/internals/basicsurfeval.cc  
-../../../../src/glu/sgi/libnurbs/internals/bin.cc  
-../../../../src/glu/sgi/libnurbs/internals/bufpool.cc 
-../../../../src/glu/sgi/libnurbs/internals/cachingeval.cc 
-../../../../src/glu/sgi/libnurbs/internals/ccw.cc 
-../../../../src/glu/sgi/libnurbs/internals/coveandtiler.cc 
-../../../../src/glu/sgi/libnurbs/internals/curve.cc 
-../../../../src/glu/sgi/libnurbs/internals/curvelist.cc 
-../../../../src/glu/sgi/libnurbs/internals/curvesub.cc 
-../../../../src/glu/sgi/libnurbs/internals/dataTransform.cc 
-../../../../src/glu/sgi/libnurbs/internals/displaylist.cc 
-../../../../src/glu/sgi/libnurbs/internals/flist.cc 
-../../../../src/glu/sgi/libnurbs/internals/flistsorter.cc 
-../../../../src/glu/sgi/libnurbs/internals/hull.cc 
-../../../../src/glu/sgi/libnurbs/internals/intersect.cc 
-../../../../src/glu/sgi/libnurbs/internals/knotvector.cc 
-../../../../src/glu/sgi/libnurbs/internals/mapdesc.cc 
-../../../../src/glu/sgi/libnurbs/internals/mapdescv.cc 
-../../../../src/glu/sgi/libnurbs/internals/maplist.cc 
-../../../../src/glu/sgi/libnurbs/internals/mesher.cc 
-../../../../src/glu/sgi/libnurbs/internals/monoTriangulationBackend.cc 
-../../../../src/glu/sgi/libnurbs/internals/monotonizer.cc 
-../../../../src/glu/sgi/libnurbs/internals/mycode.cc 
-../../../../src/glu/sgi/libnurbs/internals/nurbsinterfac.cc 
-../../../../src/glu/sgi/libnurbs/internals/nurbstess.cc 
-../../../../src/glu/sgi/libnurbs/internals/patch.cc 
-../../../../src/glu/sgi/libnurbs/internals/patchlist.cc 
-../../../../src/glu/sgi/libnurbs/internals/quilt.cc 
-../../../../src/glu/sgi/libnurbs/internals/reader.cc 
-../../../../src/glu/sgi/libnurbs/internals/renderhints.cc 
-../../../../src/glu/sgi/libnurbs/internals/slicer.cc 
-../../../../src/glu/sgi/libnurbs/internals/sorter.cc 
-../../../../src/glu/sgi/libnurbs/internals/splitarcs.cc 
-../../../../src/glu/sgi/libnurbs/internals/subdivider.cc 
-../../../../src/glu/sgi/libnurbs/internals/tobezier.cc 
-../../../../src/glu/sgi/libnurbs/internals/trimline.cc 
-../../../../src/glu/sgi/libnurbs/internals/trimregion.cc 
-../../../../src/glu/sgi/libnurbs/internals/trimvertpool.cc 
-../../../../src/glu/sgi/libnurbs/internals/uarray.cc 
-../../../../src/glu/sgi/libnurbs/internals/varray.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/directedLine.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/gridWrap.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/monoChain.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/monoPolyPart.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/monoTriangulation.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/partitionX.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/partitionY.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/polyDBG.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/polyUtil.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/primitiveStream.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/quicksort.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/rectBlock.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/sampleComp.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/sampleCompBot.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/sampleCompRight.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/sampleCompTop.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/sampledLine.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/searchTree.cc
diff --git a/windows/VC6/mesa/glu/glu.dsp b/windows/VC6/mesa/glu/glu.dsp
deleted file mode 100644
index 5f05a81dcc..0000000000
--- a/windows/VC6/mesa/glu/glu.dsp
+++ /dev/null
@@ -1,2579 +0,0 @@
-# Microsoft Developer Studio Project File - Name="glu" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=glu - Win32 Debug x86
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "glu.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "glu.mak" CFG="glu - Win32 Debug x86"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "glu - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "glu - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "glu - Win32 Release x86" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "glu - Win32 Debug x86" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLU_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../../../include" /I "../../../../src/glu/sgi/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLU_EXPORTS" /D "BUILD_GL32" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 msvcrt.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib Release/glucc.lib /nologo /dll /machine:I386 /nodefaultlib /out:"Release/GLU32.DLL" /libpath:"../gdi/Release"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PreLink_Desc=C++ Compilations
-PreLink_Cmds=cl @compileRelease.txt	LIB /OUT:Release/GLUCC.LIB @objectsRelease.txt
-PostBuild_Cmds=if not exist ..\..\..\..\lib md ..\..\..\..\lib	copy Release\GLU32.LIB ..\..\..\..\lib	copy Release\GLU32.DLL ..\..\..\..\lib	if exist ..\..\..\..\progs\demos copy Release\GLU32.DLL ..\..\..\..\progs\demos
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLU_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../include" /I "../../../../src/glu/sgi/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLU_EXPORTS" /D "BUILD_GL32" /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 msvcrtd.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib Debug/glucc.lib /nologo /dll /incremental:no /debug /machine:I386 /nodefaultlib /out:"Debug/GLU32.DLL" /pdbtype:sept /libpath:"../gdi/Debug"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PreLink_Desc=C++ Compilations
-PreLink_Cmds=cl @compileDebug.txt	LIB /OUT:Debug/GLUCC.LIB @objectsDebug.txt
-PostBuild_Cmds=if not exist ..\..\..\..\lib md ..\..\..\..\lib	copy Debug\GLU32.LIB ..\..\..\..\lib	copy Debug\GLU32.DLL ..\..\..\..\lib	if exist ..\..\..\..\progs\demos copy Debug\GLU32.DLL ..\..\..\..\progs\demos
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "glu___Win32_Release_x86"
-# PROP BASE Intermediate_Dir "glu___Win32_Release_x86"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release_x86"
-# PROP Intermediate_Dir "Release_x86"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "../../../../include" /I "../../../../src/glu/sgi/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLU_EXPORTS" /D "BUILD_GL32" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../../../include" /I "../../../../src/glu/sgi/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLU_EXPORTS" /D "BUILD_GL32" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 msvcrt.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib Release/glucc.lib /nologo /dll /machine:I386 /nodefaultlib /out:"Release/GLU32.DLL" /libpath:"../gdi/Release"
-# ADD LINK32 msvcrt.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib Release/glucc.lib /nologo /dll /machine:I386 /nodefaultlib /out:"Release_x86/GLU32.DLL" /libpath:"../gdi/Release_x86"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PreLink_Desc=C++ Compilations
-PreLink_Cmds=cl @compileRelease.txt	LIB /OUT:Release/GLUCC.LIB @objectsRelease.txt
-PostBuild_Cmds=if not exist ..\..\..\..\lib md ..\..\..\..\lib	copy Release_x86\GLU32.LIB ..\..\..\..\lib	copy Release_x86\GLU32.DLL ..\..\..\..\lib	if exist ..\..\..\..\progs\demos copy Release_x86\GLU32.DLL ..\..\..\..\progs\demos
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "glu___Win32_Debug_x86"
-# PROP BASE Intermediate_Dir "glu___Win32_Debug_x86"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug_x86"
-# PROP Intermediate_Dir "Debug_x86"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../include" /I "../../../../src/glu/sgi/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLU_EXPORTS" /D "BUILD_GL32" /FD /GZ /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../include" /I "../../../../src/glu/sgi/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLU_EXPORTS" /D "BUILD_GL32" /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 msvcrtd.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib Debug/glucc.lib /nologo /dll /incremental:no /debug /machine:I386 /nodefaultlib /out:"Debug/GLU32.DLL" /pdbtype:sept /libpath:"../gdi/Debug"
-# ADD LINK32 msvcrtd.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib Debug/glucc.lib /nologo /dll /incremental:no /debug /machine:I386 /nodefaultlib /out:"Debug_x86/GLU32.DLL" /pdbtype:sept /libpath:"../gdi/Debug_x86"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PreLink_Desc=C++ Compilations
-PreLink_Cmds=cl @compileDebug.txt	LIB /OUT:Debug/GLUCC.LIB @objectsDebug.txt
-PostBuild_Cmds=if not exist ..\..\..\..\lib md ..\..\..\..\lib	copy Debug_x86\GLU32.LIB ..\..\..\..\lib	copy Debug_x86\GLU32.DLL ..\..\..\..\lib	if exist ..\..\..\..\progs\demos copy Debug_x86\GLU32.DLL ..\..\..\..\progs\demos
-# End Special Build Tool
-
-!ENDIF 
-
-# Begin Target
-
-# Name "glu - Win32 Release"
-# Name "glu - Win32 Debug"
-# Name "glu - Win32 Release x86"
-# Name "glu - Win32 Debug x86"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libtess\dict.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libutil\error.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libtess\geom.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\glu.def
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libutil\glue.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libtess\memalloc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libtess\mesh.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libutil\mipmap.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libtess\normal.c
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\..\src\glu\sgi\libtess\priorityq-heap.c"
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libtess\priorityq.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libutil\project.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libutil\quad.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libutil\registry.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libtess\render.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libtess\sweep.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libtess\tess.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libtess\tessmono.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\arc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\arcsorter.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\arctess.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\backend.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\basiccrveval.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\basicsurfeval.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\bezierarc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\bezierEval.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatch.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatchMesh.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\bin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\bufpool.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\cachingeval.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\coveandtiler.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\curve.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\curvelist.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\dataTransform.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\defines.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\definitions.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\..\src\glu\sgi\libtess\dict-list.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libtess\dict.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\directedLine.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\displaylist.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\displaymode.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\flist.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\flistsorter.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libtess\geom.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\glcurveval.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\glimports.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\glimports.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\glrenderer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\glsurfeval.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libutil\gluint.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\include\gluos.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\gridline.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\gridtrimvertex.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\gridvertex.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\gridWrap.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\hull.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\jarcloc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\knotvector.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\mapdesc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\maplist.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libtess\memalloc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libtess\mesh.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\mesher.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoChain.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoPolyPart.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\monotonizer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoTriangulation.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\myassert.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\mymath.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\mysetjmp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\mystdio.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdio.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\mystdlib.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdlib.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\mystring.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libtess\normal.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\nurbsconsts.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\nurbstess.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionX.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionY.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\patch.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\patchlist.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyDBG.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyUtil.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\primitiveStream.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\..\src\glu\sgi\libtess\priorityq-heap.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\..\src\glu\sgi\libtess\priorityq-sort.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libtess\priorityq.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\pwlarc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\quicksort.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\quilt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\reader.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\rectBlock.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libtess\render.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\renderhints.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleComp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompBot.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompRight.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompTop.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampledLine.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleMonoPoly.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\searchTree.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\simplemath.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\slicer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\sorter.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\subdivider.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libtess\sweep.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libtess\tess.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libtess\tessmono.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\trimline.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\trimregion.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\trimvertex.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\trimvertpool.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\uarray.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\varray.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\zlassert.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# Begin Group "C++ files"
-
-# PROP Default_Filter ".cc"
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\arc.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\arcsorter.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\arctess.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\backend.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\basiccrveval.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\basicsurfeval.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\bezierEval.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatch.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatchMesh.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\bin.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\bufpool.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\cachingeval.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\ccw.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\coveandtiler.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\curve.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\curvelist.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\curvesub.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\dataTransform.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\directedLine.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\displaylist.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\flist.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\flistsorter.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\glcurveval.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\glinterface.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\glrenderer.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\glsurfeval.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\gridWrap.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\hull.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\incurveeval.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\insurfeval.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\intersect.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\knotvector.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\mapdesc.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\mapdescv.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\maplist.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\mesher.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoChain.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoPolyPart.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\monotonizer.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoTriangulation.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\monoTriangulationBackend.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\mycode.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\nurbsinterfac.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\nurbstess.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionX.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionY.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\patch.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\patchlist.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyDBG.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyUtil.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\primitiveStream.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\quicksort.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\quilt.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\reader.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libtess\README
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\rectBlock.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\renderhints.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleComp.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompBot.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompRight.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompTop.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampledLine.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleMonoPoly.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\searchTree.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\slicer.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\sorter.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\splitarcs.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\subdivider.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\tobezier.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\trimline.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\trimregion.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\trimvertpool.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\uarray.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\varray.cc
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE="..\..\..\..\src\glu\sgi\libtess\alg-outline"
-
-!IF  "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\compileDebug.txt
-# End Source File
-# Begin Source File
-
-SOURCE=.\compileRelease.txt
-# End Source File
-# Begin Source File
-
-SOURCE=.\objectsDebug.txt
-# End Source File
-# Begin Source File
-
-SOURCE=.\objectsRelease.txt
-# End Source File
-# End Target
-# End Project
diff --git a/windows/VC6/mesa/glu/objectsDebug.txt b/windows/VC6/mesa/glu/objectsDebug.txt
deleted file mode 100644
index 9fdce157c4..0000000000
--- a/windows/VC6/mesa/glu/objectsDebug.txt
+++ /dev/null
@@ -1,73 +0,0 @@
-Debug/bezierEval.obj 
-Debug/bezierPatch.obj 
-Debug/bezierPatchMesh.obj 
-Debug/glcurveval.obj 
-Debug/glinterface.obj 
-Debug/glrenderer.obj 
-Debug/glsurfeval.obj 
-Debug/incurveeval.obj 
-Debug/insurfeval.obj 
-Debug/arc.obj 
-Debug/arcsorter.obj 
-Debug/arctess.obj 
-Debug/backend.obj  
-Debug/basiccrveval.obj  
-Debug/basicsurfeval.obj  
-Debug/bin.obj  
-Debug/bufpool.obj 
-Debug/cachingeval.obj 
-Debug/ccw.obj 
-Debug/coveandtiler.obj 
-Debug/curve.obj 
-Debug/curvelist.obj 
-Debug/curvesub.obj 
-Debug/dataTransform.obj 
-Debug/displaylist.obj 
-Debug/flist.obj 
-Debug/flistsorter.obj 
-Debug/hull.obj 
-Debug/intersect.obj 
-Debug/knotvector.obj 
-Debug/mapdesc.obj 
-Debug/mapdescv.obj 
-Debug/maplist.obj 
-Debug/mesher.obj 
-Debug/monoTriangulationBackend.obj 
-Debug/monotonizer.obj 
-Debug/mycode.obj 
-Debug/nurbsinterfac.obj 
-Debug/nurbstess.obj 
-Debug/patch.obj 
-Debug/patchlist.obj 
-Debug/quilt.obj 
-Debug/reader.obj 
-Debug/renderhints.obj 
-Debug/slicer.obj 
-Debug/sorter.obj 
-Debug/splitarcs.obj 
-Debug/subdivider.obj 
-Debug/tobezier.obj 
-Debug/trimline.obj 
-Debug/trimregion.obj 
-Debug/trimvertpool.obj 
-Debug/uarray.obj 
-Debug/varray.obj 
-Debug/directedLine.obj 
-Debug/gridWrap.obj 
-Debug/monoChain.obj 
-Debug/monoPolyPart.obj 
-Debug/monoTriangulation.obj 
-Debug/partitionX.obj 
-Debug/partitionY.obj 
-Debug/polyDBG.obj 
-Debug/polyUtil.obj 
-Debug/primitiveStream.obj 
-Debug/quicksort.obj 
-Debug/rectBlock.obj 
-Debug/sampleComp.obj 
-Debug/sampleCompBot.obj 
-Debug/sampleCompRight.obj 
-Debug/sampleCompTop.obj 
-Debug/sampleMonoPoly.obj 
-Debug/sampledLine.obj 
-Debug/searchTree.obj
diff --git a/windows/VC6/mesa/glu/objectsRelease.txt b/windows/VC6/mesa/glu/objectsRelease.txt
deleted file mode 100644
index 2d1b384db8..0000000000
--- a/windows/VC6/mesa/glu/objectsRelease.txt
+++ /dev/null
@@ -1,73 +0,0 @@
-Release/bezierEval.obj 
-Release/bezierPatch.obj 
-Release/bezierPatchMesh.obj 
-Release/glcurveval.obj 
-Release/glinterface.obj 
-Release/glrenderer.obj 
-Release/glsurfeval.obj 
-Release/incurveeval.obj 
-Release/insurfeval.obj 
-Release/arc.obj 
-Release/arcsorter.obj 
-Release/arctess.obj 
-Release/backend.obj  
-Release/basiccrveval.obj  
-Release/basicsurfeval.obj  
-Release/bin.obj  
-Release/bufpool.obj 
-Release/cachingeval.obj 
-Release/ccw.obj 
-Release/coveandtiler.obj 
-Release/curve.obj 
-Release/curvelist.obj 
-Release/curvesub.obj 
-Release/dataTransform.obj 
-Release/displaylist.obj 
-Release/flist.obj 
-Release/flistsorter.obj 
-Release/hull.obj 
-Release/intersect.obj 
-Release/knotvector.obj 
-Release/mapdesc.obj 
-Release/mapdescv.obj 
-Release/maplist.obj 
-Release/mesher.obj 
-Release/monoTriangulationBackend.obj 
-Release/monotonizer.obj 
-Release/mycode.obj 
-Release/nurbsinterfac.obj 
-Release/nurbstess.obj 
-Release/patch.obj 
-Release/patchlist.obj 
-Release/quilt.obj 
-Release/reader.obj 
-Release/renderhints.obj 
-Release/slicer.obj 
-Release/sorter.obj 
-Release/splitarcs.obj 
-Release/subdivider.obj 
-Release/tobezier.obj 
-Release/trimline.obj 
-Release/trimregion.obj 
-Release/trimvertpool.obj 
-Release/uarray.obj 
-Release/varray.obj 
-Release/directedLine.obj 
-Release/gridWrap.obj 
-Release/monoChain.obj 
-Release/monoPolyPart.obj 
-Release/monoTriangulation.obj 
-Release/partitionX.obj 
-Release/partitionY.obj 
-Release/polyDBG.obj 
-Release/polyUtil.obj 
-Release/primitiveStream.obj 
-Release/quicksort.obj 
-Release/rectBlock.obj 
-Release/sampleComp.obj 
-Release/sampleCompBot.obj 
-Release/sampleCompRight.obj 
-Release/sampleCompTop.obj 
-Release/sampleMonoPoly.obj 
-Release/sampledLine.obj 
-Release/searchTree.obj
diff --git a/windows/VC6/mesa/mesa.dsw b/windows/VC6/mesa/mesa.dsw
deleted file mode 100644
index a6da850c1c..0000000000
--- a/windows/VC6/mesa/mesa.dsw
+++ /dev/null
@@ -1,74 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "gdi"=.\gdi\gdi.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name mesa
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "glu"=.\glu\glu.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name gdi
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "mesa"=.\mesa\mesa.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "osmesa"=.\osmesa\osmesa.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name gdi
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/windows/VC6/mesa/mesa/mesa.dsp b/windows/VC6/mesa/mesa/mesa.dsp
deleted file mode 100644
index 5a2f724b6a..0000000000
--- a/windows/VC6/mesa/mesa/mesa.dsp
+++ /dev/null
@@ -1,1582 +0,0 @@
-# Microsoft Developer Studio Project File - Name="mesa" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=mesa - Win32 Debug x86
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "mesa.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "mesa.mak" CFG="mesa - Win32 Debug x86"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "mesa - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "mesa - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "mesa - Win32 Release x86" (based on "Win32 (x86) Static Library")
-!MESSAGE "mesa - Win32 Debug x86" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "mesa - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/main" /I "../../../../src/mesa/shader" /I "../../../../src/mesa/shader/slang" /I "../../../../src/mesa/shader/grammar" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "_DLL" /D "BUILD_GL32" /D "MESA_MINWARN" /YX /FD /Zm1000 /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "mesa - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/main" /I "../../../../src/mesa/shader" /I "../../../../src/mesa/shader/slang" /I "../../../../src/mesa/shader/grammar" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "_DLL" /D "BUILD_GL32" /D "MESA_MINWARN" /Fr /FD /GZ /Zm1000 /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "mesa - Win32 Release x86"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "mesa___Win32_Release_x86"
-# PROP BASE Intermediate_Dir "mesa___Win32_Release_x86"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release_x86"
-# PROP Intermediate_Dir "Release_x86"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/main" /I "../../../../src/mesa/shader" /I "../../../../src/mesa/shader/slang" /I "../../../../src/mesa/shader/grammar" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "_DLL" /D "BUILD_GL32" /D "MESA_MINWARN" /YX /FD /Zm1000 /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/main" /I "../../../../src/mesa/shader" /I "../../../../src/mesa/shader/slang" /I "../../../../src/mesa/shader/grammar" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "_DLL" /D "BUILD_GL32" /D "MESA_MINWARN" /D "SLANG_X86" /YX /FD /Zm1000 /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "mesa - Win32 Debug x86"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "mesa___Win32_Debug_x86"
-# PROP BASE Intermediate_Dir "mesa___Win32_Debug_x86"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug_x86"
-# PROP Intermediate_Dir "Debug_x86"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/main" /I "../../../../src/mesa/shader" /I "../../../../src/mesa/shader/slang" /I "../../../../src/mesa/shader/grammar" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "_DLL" /D "BUILD_GL32" /D "MESA_MINWARN" /Fr /FD /GZ /Zm1000 /c
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/main" /I "../../../../src/mesa/shader" /I "../../../../src/mesa/shader/slang" /I "../../../../src/mesa/shader/grammar" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "_DLL" /D "BUILD_GL32" /D "MESA_MINWARN" /D "SLANG_X86" /Fr /FD /GZ /Zm1000 /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "mesa - Win32 Release"
-# Name "mesa - Win32 Debug"
-# Name "mesa - Win32 Release x86"
-# Name "mesa - Win32 Debug x86"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\array_cache\ac_context.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\array_cache\ac_import.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\accum.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\api_arrayelt.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\api_loopback.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\api_noop.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\api_validate.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\arrayobj.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\arbprogparse.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\arbprogram.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\atifragshader.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\attrib.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\blend.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\bufferobj.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\buffers.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\clip.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\colortab.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\context.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\convolve.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\debug.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\depth.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\depthstencil.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\dispatch.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\dlist.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\drawpix.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\enable.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\enums.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\eval.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\execmem.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\extensions.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\fbobject.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\feedback.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\fog.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\framebuffer.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\get.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\getstring.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\glapi\glapi.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\glapi\glthread.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\grammar\grammar.c
-
-!IF  "$(CFG)" == "mesa - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "mesa - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "mesa - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "mesa - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\grammar\grammar_mesa.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\hash.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\hint.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\histogram.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\image.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\imports.c
-
-!IF  "$(CFG)" == "mesa - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "mesa - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "mesa - Win32 Release x86"
-
-# ADD CPP /YX
-
-!ELSEIF  "$(CFG)" == "mesa - Win32 Debug x86"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\light.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\lines.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\m_debug_clip.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\m_debug_norm.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\m_debug_xform.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\m_eval.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\m_matrix.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\m_translate.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\m_vector.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\m_xform.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\matrix.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\mipmap.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\mm.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\nvfragparse.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\nvprogram.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\nvvertexec.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\nvvertparse.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\occlude.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\pixel.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\points.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\polygon.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\program.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\rastpos.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\rbadaptors.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\renderbuffer.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_aaline.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_aatriangle.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_accum.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_alpha.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_arbshader.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_atifragshader.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_bitmap.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_blend.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_blit.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_buffers.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_context.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_copypix.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_depth.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_drawpix.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_feedback.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_fog.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_imaging.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_lines.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_logic.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_masking.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_nvfragprog.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_points.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_readpix.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_span.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_stencil.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_texcombine.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_texfilter.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_texstore.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_triangle.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_zoom.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\shaderobjects.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\shaderobjects_3dlabs.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_analyse.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_assemble.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_assemble_assignment.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_assemble_conditional.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_assemble_constructor.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_assemble_typeinfo.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_compile.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_compile_function.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_compile_operation.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_compile_struct.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_compile_variable.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_execute.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_execute_x86.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_export.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_library_noise.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_library_texsample.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_link.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_preprocess.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_storage.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_utility.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast_setup\ss_context.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast_setup\ss_triangle.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\state.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\stencil.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_array_api.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_array_import.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_context.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_pipeline.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_save_loopback.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_save_playback.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vb_arbprogram.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vb_arbshader.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vb_cull.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vb_fog.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vb_light.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vb_normals.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vb_points.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vb_program.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vb_render.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vb_texgen.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vb_texmat.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vb_vertex.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vertex.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vertex_generic.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vp_build.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vtx_api.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vtx_eval.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vtx_exec.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vtx_generic.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\texcompress.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\texcompress_fxt1.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\texcompress_s3tc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\texenvprogram.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\texformat.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\teximage.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\texobj.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\texrender.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\texstate.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\texstore.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\varray.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\vsnprintf.c
-
-!IF  "$(CFG)" == "mesa - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "mesa - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "mesa - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "mesa - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\vtxfmt.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\x86\rtasm\x86sse.c
-
-!IF  "$(CFG)" == "mesa - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "mesa - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "mesa - Win32 Release x86"
-
-!ELSEIF  "$(CFG)" == "mesa - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\array_cache\ac_context.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\array_cache\acache.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\accum.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\api_arrayelt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\api_eval.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\api_loopback.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\api_noop.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\api_validate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\arrayobj.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\arbprogparse.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\arbprogram.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\arbprogram_syn.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\atifragshader.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\attrib.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\bitset.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\blend.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\bufferobj.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\buffers.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\clip.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\colormac.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\colortab.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\config.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\context.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\convolve.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\dd.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\debug.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\depth.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\depthstencil.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\dlist.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\drawpix.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\enable.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\enums.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\eval.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\extensions.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\fbobject.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\feedback.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\fog.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\framebuffer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\get.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\glapi\glapi.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\glapi\glapioffsets.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\glapi\glapitable.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\glapi\glapitemp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\glheader.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\glapi\glprocs.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\glapi\glthread.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\grammar\grammar.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\grammar\grammar_mesa.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\grammar\grammar_syn.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\hash.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\hint.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\histogram.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\image.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\imports.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\light.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\lines.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\m_clip_tmp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\m_copy_tmp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\m_debug.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\m_debug_util.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\m_dotprod_tmp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\m_eval.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\m_matrix.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\m_norm_tmp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\m_trans_tmp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\m_translate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\m_vector.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\m_xform.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\m_xform_tmp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\macros.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\mathmod.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\matrix.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\mm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\mtypes.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\nvfragparse.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\nvfragprog.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\nvprogram.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\nvvertexec.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\nvvertparse.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\nvvertprog.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\occlude.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\pixel.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\points.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\polygon.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\program.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\rastpos.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\rbadaptors.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\renderbuffer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_aaline.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_aalinetemp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_aatriangle.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_aatritemp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_accum.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_alpha.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_arbshader.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_atifragshader.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_blend.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_context.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_depth.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_drawpix.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_feedback.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_fog.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_lines.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_linetemp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_logic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_masking.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_nvfragprog.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_points.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_pointtemp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_span.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_spantemp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_stencil.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_texcombine.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_texfilter.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_triangle.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_trispan.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_tritemp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_zoom.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\shaderobjects.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\shaderobjects_3dlabs.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\simple_list.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_analyse.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_assemble.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_assemble_assignment.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_assemble_conditional.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_assemble_constructor.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_assemble_typeinfo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_compile.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_compile_function.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_compile_operation.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_compile_struct.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_compile_variable.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_execute.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_export.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_library_noise.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_library_texsample.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_link.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_mesa.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_preprocess.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_storage.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_utility.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast_setup\ss_context.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast_setup\ss_triangle.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast_setup\ss_tritmp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast_setup\ss_vb.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\state.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\stencil.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\swrast.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast_setup\swrast_setup.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_array_api.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_array_import.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_context.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_pipeline.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_save_api.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vb_arbprogram.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vb_cliptmp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vb_lighttmp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vb_rendertmp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vertex.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vp_build.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vtx_api.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\texcompress.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\texenvprogram.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\texformat.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\texformat_tmp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\teximage.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\texobj.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\texrender.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\texstate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\texstore.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\tnl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\traverse_wrap.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\varray.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\version.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\vtxfmt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\vtxfmt_tmp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\x86\rtasm\x86sse.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/windows/VC6/mesa/osmesa/osmesa.dsp b/windows/VC6/mesa/osmesa/osmesa.dsp
deleted file mode 100644
index 0dd5cd4ac7..0000000000
--- a/windows/VC6/mesa/osmesa/osmesa.dsp
+++ /dev/null
@@ -1,195 +0,0 @@
-# Microsoft Developer Studio Project File - Name="osmesa" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=osmesa - Win32 Debug x86
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "osmesa.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "osmesa.mak" CFG="osmesa - Win32 Debug x86"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "osmesa - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "osmesa - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "osmesa - Win32 Release x86" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "osmesa - Win32 Debug x86" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "osmesa - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OSMESA_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/main" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/swrast" /I "../../../../src/mesa/shader" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OSMESA_EXPORTS" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 opengl32.lib winmm.lib msvcrt.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /nodefaultlib /out:"Release/OSMESA32.DLL" /libpath:"../gdi/Release"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=if not exist ..\..\..\..\lib md ..\..\..\..\lib	copy Release\OSMESA32.LIB ..\..\..\..\lib	copy Release\OSMESA32.DLL ..\..\..\..\lib	if exist ..\..\..\..\progs\demos copy Release\OSMESA32.DLL ..\..\..\..\progs\demos
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "osmesa - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OSMESA_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/main" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/swrast" /I "../../../../src/mesa/shader" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OSMESA_EXPORTS" /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 opengl32.lib winmm.lib msvcrtd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /debug /machine:I386 /nodefaultlib /out:"Debug/OSMESA32.DLL" /pdbtype:sept /libpath:"../gdi/Debug"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=if not exist ..\..\..\..\lib md ..\..\..\..\lib	copy Debug\OSMESA32.LIB ..\..\..\..\lib	copy Debug\OSMESA32.DLL ..\..\..\..\lib	if exist ..\..\..\..\progs\demos copy Debug\OSMESA32.DLL ..\..\..\..\progs\demos
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "osmesa - Win32 Release x86"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "osmesa___Win32_Release_x86"
-# PROP BASE Intermediate_Dir "osmesa___Win32_Release_x86"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release_x86"
-# PROP Intermediate_Dir "Release_x86"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/main" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/swrast" /I "../../../../src/mesa/shader" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OSMESA_EXPORTS" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/main" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/swrast" /I "../../../../src/mesa/shader" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OSMESA_EXPORTS" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 opengl32.lib winmm.lib msvcrt.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /nodefaultlib /out:"Release/OSMESA32.DLL" /libpath:"../gdi/Release"
-# ADD LINK32 opengl32.lib winmm.lib msvcrt.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /nodefaultlib /out:"Release_x86/OSMESA32.DLL" /libpath:"../gdi/Release_x86"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=if not exist ..\..\..\..\lib md ..\..\..\..\lib	copy Release_x86\OSMESA32.LIB ..\..\..\..\lib	copy Release_x86\OSMESA32.DLL ..\..\..\..\lib	if exist ..\..\..\..\progs\demos copy Release_x86\OSMESA32.DLL ..\..\..\..\progs\demos
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "osmesa - Win32 Debug x86"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "osmesa___Win32_Debug_x86"
-# PROP BASE Intermediate_Dir "osmesa___Win32_Debug_x86"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug_x86"
-# PROP Intermediate_Dir "Debug_x86"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/main" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/swrast" /I "../../../../src/mesa/shader" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OSMESA_EXPORTS" /FD /GZ /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/main" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/swrast" /I "../../../../src/mesa/shader" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OSMESA_EXPORTS" /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 opengl32.lib winmm.lib msvcrtd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /debug /machine:I386 /nodefaultlib /out:"Debug/OSMESA32.DLL" /pdbtype:sept /libpath:"../gdi/Debug"
-# ADD LINK32 opengl32.lib winmm.lib msvcrtd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /debug /machine:I386 /nodefaultlib /out:"Debug/OSMESA32.DLL" /pdbtype:sept /libpath:"../gdi/Debug_x86"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=if not exist ..\..\..\..\lib md ..\..\..\..\lib	copy Debug_x86\OSMESA32.LIB ..\..\..\..\lib	copy Debug_x86\OSMESA32.DLL ..\..\..\..\lib	if exist ..\..\..\..\progs\demos copy Debug_x86\OSMESA32.DLL ..\..\..\..\progs\demos
-# End Special Build Tool
-
-!ENDIF 
-
-# Begin Target
-
-# Name "osmesa - Win32 Release"
-# Name "osmesa - Win32 Debug"
-# Name "osmesa - Win32 Release x86"
-# Name "osmesa - Win32 Debug x86"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\drivers\common\driverfuncs.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\drivers\osmesa\osmesa.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\drivers\osmesa\osmesa.def
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows/VC6/progs/demos/gears.dsp b/windows/VC6/progs/demos/gears.dsp
deleted file mode 100644
index af6b3a8793..0000000000
--- a/windows/VC6/progs/demos/gears.dsp
+++ /dev/null
@@ -1,114 +0,0 @@
-# Microsoft Developer Studio Project File - Name="gears" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=gears - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "gears.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "gears.mak" CFG="gears - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "gears - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "gears - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "gears - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../../../../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 glut32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"../glut/Release"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=copy Release\gears.exe ..\..\..\..\progs\demos
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "gears - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "../../../../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glut32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../glut/Debug"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=copy Debug\gears.exe ..\..\..\..\progs\demos
-# End Special Build Tool
-
-!ENDIF 
-
-# Begin Target
-
-# Name "gears - Win32 Release"
-# Name "gears - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\..\progs\demos\gears.c
-# ADD CPP /I "../../../../include"
-# SUBTRACT CPP /I "../../../../../include"
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows/VC6/progs/glut/glut.dsp b/windows/VC6/progs/glut/glut.dsp
deleted file mode 100644
index 04fb886c05..0000000000
--- a/windows/VC6/progs/glut/glut.dsp
+++ /dev/null
@@ -1,333 +0,0 @@
-# Microsoft Developer Studio Project File - Name="glut" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=glut - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "glut.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "glut.mak" CFG="glut - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "glut - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "glut - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "glut - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLUT_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../../../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_DLL" /D "_USRDLL" /D "GLUT_EXPORTS" /D "MESA" /D "BUILD_GL32" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 opengl32.lib glu32.lib winmm.lib msvcrt.lib oldnames.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /nodefaultlib /out:"Release/GLUT32.DLL" /libpath:"../../mesa/Release"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=if not exist ..\..\..\..\lib md ..\..\..\..\lib	copy Release\GLUT32.LIB ..\..\..\..\lib	copy Release\GLUT32.DLL ..\..\..\..\lib	if exist ..\..\..\..\progs\demos copy Release\GLUT32.DLL ..\..\..\..\progs\demos
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "glut - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLUT_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_DLL" /D "_USRDLL" /D "GLUT_EXPORTS" /D "MESA" /D "BUILD_GL32" /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 winmm.lib msvcrtd.lib oldnames.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib /nologo /dll /incremental:no /debug /machine:I386 /nodefaultlib /out:"Debug/GLUT32.DLL" /pdbtype:sept /libpath:"../../mesa/Debug"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=if not exist ..\..\..\..\lib md ..\..\..\..\lib	copy Debug\GLUT32.LIB ..\..\..\..\lib	copy Debug\GLUT32.DLL ..\..\..\..\lib	if exist ..\..\..\..\progs\demos copy Debug\GLUT32.DLL ..\..\..\..\progs\demos
-# End Special Build Tool
-
-!ENDIF 
-
-# Begin Target
-
-# Name "glut - Win32 Release"
-# Name "glut - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_8x13.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_9x15.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_bitmap.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_bwidth.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_cindex.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_cmap.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_cursor.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_dials.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_dstr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_event.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_ext.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_fbc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_fullscrn.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_gamemode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_get.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_hel10.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_hel12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_hel18.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_init.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_input.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_joy.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_key.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_keyctrl.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_keyup.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_mesa.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_modifier.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_mroman.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_overlay.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_roman.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_shapes.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_space.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_stroke.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_swap.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_swidth.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_tablet.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_teapot.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_tr10.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_tr24.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_util.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_vidresize.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_warp.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_win.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_winmisc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\win32_glx.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\win32_menu.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\win32_util.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\win32_winproc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\win32_x11.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glutbitmap.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glutint.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glutstroke.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glutwin32.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\stroke.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\win32_glx.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\win32_x11.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows/VC6/progs/progs.dsw b/windows/VC6/progs/progs.dsw
deleted file mode 100644
index d220455e64..0000000000
--- a/windows/VC6/progs/progs.dsw
+++ /dev/null
@@ -1,41 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "gears"=.\demos\gears.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "glut"=.\glut\glut.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/windows/VC7/mesa/gdi/gdi.vcproj b/windows/VC7/mesa/gdi/gdi.vcproj
deleted file mode 100644
index 82de75dc5d..0000000000
--- a/windows/VC7/mesa/gdi/gdi.vcproj
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.00"
-	Name="gdi"
-	SccProjectName=""
-	SccLocalPath="">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"
-				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;GDI_EXPORTS;_DLL;BUILD_GL32;MESA_MINWARN"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\Debug/gdi.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="3"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="mesa.lib winmm.lib msvcrtd.lib odbc32.lib odbccp32.lib"
-				OutputFile="Debug/OPENGL32.DLL"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="../mesa/Debug"
-				IgnoreAllDefaultLibraries="TRUE"
-				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\Debug/OPENGL32.pdb"
-				ImportLibrary=".\Debug/OPENGL32.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/gdi.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib
-copy Debug\OPENGL32.LIB ..\..\..\..\lib
-copy Debug\OPENGL32.DLL ..\..\..\..\lib
-if exist ..\..\..\..\progs\demos copy Debug\OPENGL32.DLL ..\..\..\..\progs\demos
-"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../main,../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"
-				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;GDI_EXPORTS;_DLL;BUILD_GL32;MESA_MINWARN"
-				StringPooling="TRUE"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="TRUE"
-				PrecompiledHeaderFile=".\Release/gdi.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="mesa.lib winmm.lib msvcrt.lib odbc32.lib odbccp32.lib"
-				OutputFile="Release/OPENGL32.DLL"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="../mesa/Release"
-				IgnoreAllDefaultLibraries="TRUE"
-				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def"
-				ProgramDatabaseFile=".\Release/OPENGL32.pdb"
-				ImportLibrary=".\Release/OPENGL32.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/gdi.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib
-copy Release\OPENGL32.LIB ..\..\..\..\lib
-copy Release\OPENGL32.DLL ..\..\..\..\lib
-if exist ..\..\..\..\progs\demos copy Release\OPENGL32.DLL ..\..\..\..\progs\demos
-"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
-			<File
-				RelativePath="..\..\..\..\src\mesa\drivers\common\driverfuncs.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\wgl.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\wmesa.c">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
-			<File
-				RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\colors.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\drivers\common\driverfuncs.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\wmesadef.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/windows/VC7/mesa/glu/glu.vcproj b/windows/VC7/mesa/glu/glu.vcproj
deleted file mode 100644
index e0c481e011..0000000000
--- a/windows/VC7/mesa/glu/glu.vcproj
+++ /dev/null
@@ -1,752 +0,0 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.00"
-	Name="glu"
-	SccProjectName=""
-	SccLocalPath="">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../../include;../../../../src/glu/sgi/include;../../../../src/glu/sgi/libnurbs/interface;../../../../src/glu/sgi/libnurbs/internals;../../../../src/glu/sgi/libnurbs/nurbtess"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GLU_EXPORTS;BUILD_GL32;LIBRARYBUILD"
-				StringPooling="TRUE"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="TRUE"
-				PrecompiledHeaderFile=".\Release/glu.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="msvcrt.lib winmm.lib odbc32.lib odbccp32.lib opengl32.lib"
-				OutputFile="Release/GLU32.DLL"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="../gdi/Release"
-				IgnoreAllDefaultLibraries="TRUE"
-				ModuleDefinitionFile="..\..\..\..\src\glu\sgi\glu.def"
-				ProgramDatabaseFile=".\Release/GLU32.pdb"
-				ImportLibrary=".\Release/GLU32.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/glu.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib
-copy Release\GLU32.LIB ..\..\..\..\lib
-copy Release\GLU32.DLL ..\..\..\..\lib
-if exist ..\..\..\..\progs\demos copy Release\GLU32.DLL ..\..\..\..\progs\demos
-"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../../../include;../../../../src/glu/sgi/include;../../../../src/glu/sgi/libnurbs/interface;../../../../src/glu/sgi/libnurbs/internals;../../../../src/glu/sgi/libnurbs/nurbtess"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GLU_EXPORTS;BUILD_GL32;LIBRARYBUILD"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\Debug/glu.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="msvcrtd.lib winmm.lib odbc32.lib odbccp32.lib opengl32.lib"
-				OutputFile="Debug/GLU32.DLL"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="../gdi/Debug"
-				IgnoreAllDefaultLibraries="TRUE"
-				ModuleDefinitionFile="..\..\..\..\src\glu\sgi\glu.def"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\Debug/GLU32.pdb"
-				ImportLibrary=".\Debug/GLU32.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/glu.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib
-copy Debug\GLU32.LIB ..\..\..\..\lib
-copy Debug\GLU32.DLL ..\..\..\..\lib
-if exist ..\..\..\..\progs\demos copy Debug\GLU32.DLL ..\..\..\..\progs\demos
-"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\dict.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libutil\error.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\geom.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\glu.def">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libutil\glue.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\memalloc.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\mesh.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libutil\mipmap.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\normal.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\priorityq-heap.c">
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\priorityq.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libutil\project.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libutil\quad.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libutil\registry.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\render.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\sweep.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\tess.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\tessmono.c">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\arc.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\arcsorter.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\arctess.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\backend.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\basiccrveval.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\basicsurfeval.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierEval.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatch.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatchMesh.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\bezierarc.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\bin.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\bufpool.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\cachingeval.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\coveandtiler.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\curve.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\curvelist.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\dataTransform.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\defines.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\definitions.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\dict-list.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\dict.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\directedLine.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\displaylist.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\displaymode.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\flist.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\flistsorter.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\geom.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glcurveval.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\glimports.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glimports.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glrenderer.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glsurfeval.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libutil\gluint.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\include\gluos.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\gridWrap.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\gridline.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\gridtrimvertex.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\gridvertex.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\hull.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\jarcloc.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\knotvector.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mapdesc.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\maplist.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\memalloc.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\mesh.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mesher.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoChain.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoPolyPart.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoTriangulation.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\monotonizer.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\myassert.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mymath.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mysetjmp.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdio.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdio.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdlib.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdlib.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mystring.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\normal.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\nurbsconsts.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\nurbstess.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionX.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionY.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\patch.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\patchlist.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyDBG.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyUtil.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\primitiveStream.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\priorityq-heap.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\priorityq-sort.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\priorityq.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\pwlarc.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\quicksort.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\quilt.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\reader.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\rectBlock.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\render.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\renderhints.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleComp.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompBot.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompRight.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompTop.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleMonoPoly.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampledLine.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\searchTree.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\simplemath.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\slicer.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\sorter.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\subdivider.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\sweep.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\tess.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\tessmono.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\trimline.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\trimregion.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\trimvertex.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\trimvertpool.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\types.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\uarray.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\varray.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\zlassert.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="C++ files"
-			Filter=".cc">
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\README">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\arc.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\arcsorter.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\arctess.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\backend.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\basiccrveval.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\basicsurfeval.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierEval.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatch.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatchMesh.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\bin.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\bufpool.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\cachingeval.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\ccw.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\coveandtiler.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\curve.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\curvelist.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\curvesub.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\dataTransform.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\directedLine.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\displaylist.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\flist.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\flistsorter.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glcurveval.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glinterface.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glrenderer.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glsurfeval.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\gridWrap.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\hull.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\incurveeval.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\insurfeval.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\intersect.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\knotvector.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mapdesc.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mapdescv.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\maplist.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mesher.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoChain.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoPolyPart.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoTriangulation.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\monoTriangulationBackend.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\monotonizer.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mycode.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\nurbsinterfac.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\nurbstess.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionX.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionY.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\patch.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\patchlist.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyDBG.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyUtil.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\primitiveStream.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\quicksort.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\quilt.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\reader.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\rectBlock.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\renderhints.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleComp.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompBot.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompRight.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompTop.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleMonoPoly.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampledLine.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\searchTree.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\slicer.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\sorter.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\splitarcs.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\subdivider.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\tobezier.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\trimline.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\trimregion.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\trimvertpool.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\uarray.cc">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\varray.cc">
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
-		</Filter>
-		<File
-			RelativePath="..\..\..\..\src\glu\sgi\libtess\alg-outline">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/windows/VC7/mesa/mesa.sln b/windows/VC7/mesa/mesa.sln
deleted file mode 100644
index ada5568f48..0000000000
--- a/windows/VC7/mesa/mesa.sln
+++ /dev/null
@@ -1,41 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 7.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdi", "gdi\gdi.vcproj", "{A1B24907-E196-4826-B6AF-26723629B633}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glu", "glu\glu.vcproj", "{2E50FDAF-430B-475B-AE6B-60B68F2875BA}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mesa", "mesa\mesa.vcproj", "{2120C974-2717-4709-B44F-D6E6D0A56448}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osmesa", "osmesa\osmesa.vcproj", "{8D6CD423-383B-49E7-81BC-D20C70B07DF5}"
-EndProject
-Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		ConfigName.0 = Debug
-		ConfigName.1 = Release
-	EndGlobalSection
-	GlobalSection(ProjectDependencies) = postSolution
-		{A1B24907-E196-4826-B6AF-26723629B633}.0 = {2120C974-2717-4709-B44F-D6E6D0A56448}
-		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.0 = {A1B24907-E196-4826-B6AF-26723629B633}
-	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{A1B24907-E196-4826-B6AF-26723629B633}.Debug.ActiveCfg = Debug|Win32
-		{A1B24907-E196-4826-B6AF-26723629B633}.Debug.Build.0 = Debug|Win32
-		{A1B24907-E196-4826-B6AF-26723629B633}.Release.ActiveCfg = Release|Win32
-		{A1B24907-E196-4826-B6AF-26723629B633}.Release.Build.0 = Release|Win32
-		{2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Debug.ActiveCfg = Debug|Win32
-		{2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Debug.Build.0 = Debug|Win32
-		{2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Release.ActiveCfg = Release|Win32
-		{2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Release.Build.0 = Release|Win32
-		{2120C974-2717-4709-B44F-D6E6D0A56448}.Debug.ActiveCfg = Debug|Win32
-		{2120C974-2717-4709-B44F-D6E6D0A56448}.Debug.Build.0 = Debug|Win32
-		{2120C974-2717-4709-B44F-D6E6D0A56448}.Release.ActiveCfg = Release|Win32
-		{2120C974-2717-4709-B44F-D6E6D0A56448}.Release.Build.0 = Release|Win32
-		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Debug.ActiveCfg = Debug|Win32
-		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Debug.Build.0 = Debug|Win32
-		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Release.ActiveCfg = Release|Win32
-		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Release.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
-EndGlobal
diff --git a/windows/VC7/mesa/mesa/mesa.vcproj b/windows/VC7/mesa/mesa/mesa.vcproj
deleted file mode 100644
index 668c6fbb81..0000000000
--- a/windows/VC7/mesa/mesa/mesa.vcproj
+++ /dev/null
@@ -1,1114 +0,0 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.00"
-	Name="mesa"
-	SccProjectName=""
-	SccLocalPath="">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Zm1000 "
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/glapi,../../../../src/mesa/main,../../../../src/mesa/shader,../../../../src/mesa/shader/slang,../../../../src/mesa/shader/grammar"
-				PreprocessorDefinitions="NDEBUG,WIN32,_LIB,_DLL,BUILD_GL32,MESA_MINWARN"
-				StringPooling="TRUE"
-				RuntimeLibrary="4"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Release/mesa.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\Release\mesa.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Zm1000 "
-				Optimization="0"
-				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/glapi,../../../../src/mesa/main,../../../../src/mesa/shader,../../../../src/mesa/shader/slang,../../../../src/mesa/shader/grammar"
-				PreprocessorDefinitions="_DEBUG,WIN32,_LIB,_DLL,BUILD_GL32,MESA_MINWARN"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
-				PrecompiledHeaderFile=".\Debug/mesa.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="3"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\Debug\mesa.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
-			<File
-				RelativePath="..\..\..\..\src\mesa\array_cache\ac_context.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\array_cache\ac_import.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\accum.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\api_arrayelt.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\api_loopback.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\api_noop.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\api_validate.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\arrayobj.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\arbprogparse.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\arbprogram.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\atifragshader.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\attrib.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\blend.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\bufferobj.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\buffers.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\clip.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\colortab.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\context.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\convolve.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\debug.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\depth.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\depthstencil.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\dispatch.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\dlist.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\drawpix.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\enable.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\enums.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\eval.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\execmem.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\extensions.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\fbobject.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\feedback.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\fog.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\framebuffer.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\get.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\getstring.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\glapi\glapi.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\glapi\glthread.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar.c">
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar_mesa.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\hash.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\hint.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\histogram.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\image.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\imports.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\light.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\lines.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\m_debug_clip.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\m_debug_norm.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\m_debug_xform.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\m_eval.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\m_matrix.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\m_translate.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\m_vector.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\m_xform.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\matrix.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\mipmap.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\mm.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\nvfragparse.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\nvprogram.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\nvvertexec.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\nvvertparse.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\occlude.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\pixel.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\points.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\polygon.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\program.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\rastpos.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\rbadaptors.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\renderbuffer.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_aaline.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_aatriangle.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_accum.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_alpha.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_arbshader.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_atifragshader.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_bitmap.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_blend.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_blit.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_buffers.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_context.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_copypix.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_depth.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_drawpix.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_feedback.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_fog.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_imaging.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_lines.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_logic.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_masking.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_nvfragprog.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_points.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_readpix.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_span.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_stencil.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_texcombine.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_texfilter.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_texstore.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_triangle.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_zoom.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\shaderobjects.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\shaderobjects_3dlabs.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_analyse.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_assemble.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_assemble_assignment.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_assemble_conditional.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_assemble_constructor.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_assemble_typeinfo.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_function.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_operation.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_struct.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_variable.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_execute.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_execute_x86.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_export.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_library_noise.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_library_texsample.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_link.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_preprocess.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_storage.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_utility.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast_setup\ss_context.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast_setup\ss_triangle.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\state.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\stencil.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_array_api.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_array_import.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_context.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_pipeline.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_cull.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_fog.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_light.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_normals.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_points.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_program.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_render.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_texgen.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_texmat.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_vertex.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vertex.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vertex_generic.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vp_build.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vtx_api.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vtx_eval.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vtx_exec.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vtx_generic.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\texcompress.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\texcompress_fxt1.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\texcompress_s3tc.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\texenvprogram.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\texformat.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\teximage.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\texobj.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\texrender.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\texstate.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\texstore.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\varray.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\vsnprintf.c">
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\vtxfmt.c">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
-			<File
-				RelativePath="..\..\..\..\src\mesa\array_cache\ac_context.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\array_cache\acache.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\accum.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\api_arrayelt.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\api_eval.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\api_loopback.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\api_noop.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\api_validate.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\arbprogparse.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\arbprogram.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\arbprogram_syn.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\atifragshader.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\attrib.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\blend.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\bufferobj.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\buffers.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\clip.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\colormac.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\colortab.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\config.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\context.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\convolve.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\dd.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\debug.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\depth.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\depthstencil.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\dlist.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\drawpix.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\enable.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\enums.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\eval.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\extensions.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\fbobject.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\feedback.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\fog.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\framebuffer.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\get.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\glapi\glapi.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\glapi\glapioffsets.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\glapi\glapitable.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\glapi\glapitemp.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\glheader.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\glapi\glprocs.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\glapi\glthread.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar_mesa.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar_syn.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\hash.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\hint.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\histogram.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\image.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\imports.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\light.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\lines.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\m_clip_tmp.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\m_copy_tmp.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\m_debug.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\m_debug_util.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\m_dotprod_tmp.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\m_eval.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\m_matrix.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\m_norm_tmp.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\m_trans_tmp.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\m_translate.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\m_vector.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\m_xform.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\m_xform_tmp.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\macros.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\mathmod.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\matrix.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\mm.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\mtypes.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\nvfragparse.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\nvfragprog.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\nvprogram.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\nvvertexec.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\nvvertparse.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\nvvertprog.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\occlude.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\pixel.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\points.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\polygon.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\program.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\rastpos.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\rbadaptors.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\renderbuffer.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_aaline.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_aalinetemp.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_aatriangle.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_aatritemp.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_accum.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_alpha.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_atifragshader.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_blend.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_context.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_depth.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_drawpix.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_feedback.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_fog.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_lines.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_linetemp.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_logic.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_masking.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_nvfragprog.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_points.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_pointtemp.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_span.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_spantemp.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_stencil.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_texcombine.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_texfilter.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_triangle.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_trispan.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_tritemp.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_zoom.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\shaderobjects.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\shaderobjects_3dlabs.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\simple_list.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_assemble.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_assemble_assignment.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_assemble_conditional.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_assemble_constructor.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_assemble_typeinfo.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_execute.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_mesa.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_preprocess.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_storage.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_utility.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast_setup\ss_context.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast_setup\ss_triangle.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast_setup\ss_tritmp.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast_setup\ss_vb.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\state.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\stencil.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\swrast.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast_setup\swrast_setup.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_array_api.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_array_import.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_context.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_pipeline.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_save_api.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_arbprogram.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_cliptmp.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_lighttmp.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_rendertmp.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vertex.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vp_build.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vtx_api.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\texcompress.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\texenvprogram.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\texformat.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\texformat_tmp.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\teximage.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\texobj.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\texrender.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\texstate.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\texstore.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\tnl.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\traverse_wrap.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\varray.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\version.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\vtxfmt.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\vtxfmt_tmp.h">
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/windows/VC7/mesa/osmesa/osmesa.vcproj b/windows/VC7/mesa/osmesa/osmesa.vcproj
deleted file mode 100644
index 266aff509f..0000000000
--- a/windows/VC7/mesa/osmesa/osmesa.vcproj
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.00"
-	Name="osmesa"
-	SccProjectName=""
-	SccLocalPath="">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OSMESA_EXPORTS"
-				StringPooling="TRUE"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="TRUE"
-				PrecompiledHeaderFile=".\Release/osmesa.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="opengl32.lib winmm.lib msvcrt.lib odbc32.lib odbccp32.lib"
-				OutputFile="Release/OSMESA32.DLL"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="../gdi/Release"
-				IgnoreAllDefaultLibraries="TRUE"
-				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\osmesa\osmesa.def"
-				ProgramDatabaseFile=".\Release/OSMESA32.pdb"
-				ImportLibrary=".\Release/OSMESA32.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/osmesa.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib
-copy Release\OSMESA32.LIB ..\..\..\..\lib
-copy Release\OSMESA32.DLL ..\..\..\..\lib
-if exist ..\..\..\..\progs\demos copy Release\OSMESA32.DLL ..\..\..\..\progs\demos
-"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OSMESA_EXPORTS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\Debug/osmesa.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="3"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="opengl32.lib winmm.lib msvcrtd.lib odbc32.lib odbccp32.lib"
-				OutputFile="Debug/OSMESA32.DLL"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="../gdi/Debug"
-				IgnoreAllDefaultLibraries="TRUE"
-				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\osmesa\osmesa.def"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\Debug/OSMESA32.pdb"
-				ImportLibrary=".\Debug/OSMESA32.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/osmesa.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib
-copy Debug\OSMESA32.LIB ..\..\..\..\lib
-copy Debug\OSMESA32.DLL ..\..\..\..\lib
-if exist ..\..\..\..\progs\demos copy Debug\OSMESA32.DLL ..\..\..\..\progs\demos
-"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
-			<File
-				RelativePath="..\..\..\..\src\mesa\drivers\common\driverfuncs.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\drivers\osmesa\osmesa.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\drivers\osmesa\osmesa.def">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/windows/VC7/progs/demos/gears.vcproj b/windows/VC7/progs/demos/gears.vcproj
deleted file mode 100644
index 9880b2e080..0000000000
--- a/windows/VC7/progs/demos/gears.vcproj
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.00"
-	Name="gears"
-	SccProjectName=""
-	SccLocalPath="">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../../../include"
-				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
-				PrecompiledHeaderFile=".\Debug/gears.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="3"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="glut32.lib odbc32.lib odbccp32.lib"
-				OutputFile=".\Debug/gears.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="../glut/Debug"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\Debug/gears.pdb"
-				SubSystem="1"/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug/gears.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy Debug\gears.exe ..\..\..\..\progs\demos"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../../include"
-				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
-				StringPooling="TRUE"
-				RuntimeLibrary="4"
-				EnableFunctionLevelLinking="TRUE"
-				PrecompiledHeaderFile=".\Release/gears.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="glut32.lib odbc32.lib odbccp32.lib"
-				OutputFile=".\Release/gears.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="../glut/Release"
-				ProgramDatabaseFile=".\Release/gears.pdb"
-				SubSystem="1"/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/gears.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy Release\gears.exe ..\..\..\..\progs\demos"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
-			<File
-				RelativePath="..\..\..\..\progs\demos\gears.c">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/windows/VC7/progs/glut/glut.vcproj b/windows/VC7/progs/glut/glut.vcproj
deleted file mode 100644
index 2d0dd351ce..0000000000
--- a/windows/VC7/progs/glut/glut.vcproj
+++ /dev/null
@@ -1,322 +0,0 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.00"
-	Name="glut"
-	SccProjectName=""
-	SccLocalPath="">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../../../include"
-				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_DLL;_USRDLL;GLUT_EXPORTS;MESA;BUILD_GL32"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\Debug/glut.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="3"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="winmm.lib msvcrtd.lib oldnames.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib"
-				OutputFile="Debug/GLUT32.DLL"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="../../mesa/Debug"
-				IgnoreAllDefaultLibraries="TRUE"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\Debug/GLUT32.pdb"
-				ImportLibrary=".\Debug/GLUT32.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/glut.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib
-copy Debug\GLUT32.LIB ..\..\..\..\lib
-copy Debug\GLUT32.DLL ..\..\..\..\lib
-if exist ..\..\..\..\progs\demos copy Debug\GLUT32.DLL ..\..\..\..\progs\demos
-"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../../include"
-				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_DLL;_USRDLL;GLUT_EXPORTS;MESA;BUILD_GL32"
-				StringPooling="TRUE"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="TRUE"
-				PrecompiledHeaderFile=".\Release/glut.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="opengl32.lib glu32.lib winmm.lib msvcrt.lib oldnames.lib odbc32.lib odbccp32.lib"
-				OutputFile="Release/GLUT32.DLL"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="../../mesa/Release"
-				IgnoreAllDefaultLibraries="TRUE"
-				ProgramDatabaseFile=".\Release/GLUT32.pdb"
-				ImportLibrary=".\Release/GLUT32.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/glut.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib
-copy Release\GLUT32.LIB ..\..\..\..\lib
-copy Release\GLUT32.DLL ..\..\..\..\lib
-if exist ..\..\..\..\progs\demos copy Release\GLUT32.DLL ..\..\..\..\progs\demos
-"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_8x13.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_9x15.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_bitmap.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_bwidth.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_cindex.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_cmap.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_cursor.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_dials.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_dstr.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_event.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_ext.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_fbc.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_fullscrn.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_gamemode.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_get.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_hel10.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_hel12.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_hel18.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_init.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_input.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_joy.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_key.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_keyctrl.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_keyup.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_mesa.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_modifier.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_mroman.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_overlay.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_roman.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_shapes.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_space.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_stroke.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_swap.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_swidth.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_tablet.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_teapot.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_tr10.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_tr24.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_util.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_vidresize.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_warp.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_win.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_winmisc.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\win32_glx.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\win32_menu.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\win32_util.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\win32_winproc.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\win32_x11.c">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glutbitmap.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glutint.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glutstroke.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glutwin32.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\stroke.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\win32_glx.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\win32_x11.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/windows/VC7/progs/progs.sln b/windows/VC7/progs/progs.sln
deleted file mode 100644
index d94293e316..0000000000
--- a/windows/VC7/progs/progs.sln
+++ /dev/null
@@ -1,27 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 7.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gears", "demos\gears.vcproj", "{3A7B0671-10F8-45D1-B012-F6D650F817CE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glut", "glut\glut.vcproj", "{0234F0D2-C8A6-4C4D-93E7-0E2248049C67}"
-EndProject
-Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		ConfigName.0 = Debug
-		ConfigName.1 = Release
-	EndGlobalSection
-	GlobalSection(ProjectDependencies) = postSolution
-	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{3A7B0671-10F8-45D1-B012-F6D650F817CE}.Debug.ActiveCfg = Debug|Win32
-		{3A7B0671-10F8-45D1-B012-F6D650F817CE}.Debug.Build.0 = Debug|Win32
-		{3A7B0671-10F8-45D1-B012-F6D650F817CE}.Release.ActiveCfg = Release|Win32
-		{3A7B0671-10F8-45D1-B012-F6D650F817CE}.Release.Build.0 = Release|Win32
-		{0234F0D2-C8A6-4C4D-93E7-0E2248049C67}.Debug.ActiveCfg = Debug|Win32
-		{0234F0D2-C8A6-4C4D-93E7-0E2248049C67}.Debug.Build.0 = Debug|Win32
-		{0234F0D2-C8A6-4C4D-93E7-0E2248049C67}.Release.ActiveCfg = Release|Win32
-		{0234F0D2-C8A6-4C4D-93E7-0E2248049C67}.Release.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
-EndGlobal
diff --git a/windows/VC8/mesa/gdi/gdi.vcproj b/windows/VC8/mesa/gdi/gdi.vcproj
deleted file mode 100644
index 0aab8cf9d4..0000000000
--- a/windows/VC8/mesa/gdi/gdi.vcproj
+++ /dev/null
@@ -1,260 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="gdi"
-	ProjectGUID="{A1B24907-E196-4826-B6AF-26723629B633}"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/gdi.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"
-				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;GDI_EXPORTS;_DLL;BUILD_GL32;MESA_MINWARN"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\Debug/gdi.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="mesa.lib msvcrtd.lib gdi32.lib user32.lib winmm.lib odbc32.lib odbccp32.lib"
-				OutputFile="Debug/OPENGL32.DLL"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../mesa/Debug"
-				IgnoreAllDefaultLibraries="true"
-				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Debug/OPENGL32.pdb"
-				ImportLibrary=".\Debug/OPENGL32.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy Debug\OPENGL32.LIB ..\..\..\..\lib&#x0D;&#x0A;copy Debug\OPENGL32.DLL ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy Debug\OPENGL32.DLL ..\..\..\..\progs\demos&#x0D;&#x0A;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/gdi.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../main,../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"
-				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;GDI_EXPORTS;_DLL;BUILD_GL32;MESA_MINWARN"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release/gdi.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="mesa.lib winmm.lib gdi32.lib user32.lib msvcrt.lib odbc32.lib odbccp32.lib"
-				OutputFile="Release/OPENGL32.DLL"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../mesa/Release"
-				IgnoreAllDefaultLibraries="true"
-				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def"
-				ProgramDatabaseFile=".\Release/OPENGL32.pdb"
-				ImportLibrary=".\Release/OPENGL32.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy Release\OPENGL32.LIB ..\..\..\..\lib&#x0D;&#x0A;copy Release\OPENGL32.DLL ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy Release\OPENGL32.DLL ..\..\..\..\progs\demos&#x0D;&#x0A;"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="..\..\..\..\src\mesa\drivers\common\driverfuncs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\wgl.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\wmesa.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<File
-				RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\colors.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\drivers\common\driverfuncs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\wmesadef.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/windows/VC8/mesa/glu/glu.vcproj b/windows/VC8/mesa/glu/glu.vcproj
deleted file mode 100644
index 8679aa18ce..0000000000
--- a/windows/VC8/mesa/glu/glu.vcproj
+++ /dev/null
@@ -1,1022 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="glu"
-	ProjectGUID="{2E50FDAF-430B-475B-AE6B-60B68F2875BA}"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/glu.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../../include;../../../../src/glu/sgi/include;../../../../src/glu/sgi/libnurbs/interface;../../../../src/glu/sgi/libnurbs/internals;../../../../src/glu/sgi/libnurbs/nurbtess"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GLU_EXPORTS;BUILD_GL32;LIBRARYBUILD"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release/glu.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="msvcrt.lib winmm.lib odbc32.lib odbccp32.lib opengl32.lib"
-				OutputFile="Release/GLU32.DLL"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../gdi/Release"
-				IgnoreAllDefaultLibraries="true"
-				ModuleDefinitionFile="..\..\..\..\src\glu\sgi\glu.def"
-				ProgramDatabaseFile=".\Release/GLU32.pdb"
-				ImportLibrary=".\Release/GLU32.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy Release\GLU32.LIB ..\..\..\..\lib&#x0D;&#x0A;copy Release\GLU32.DLL ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy Release\GLU32.DLL ..\..\..\..\progs\demos&#x0D;&#x0A;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/glu.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../../../include;../../../../src/glu/sgi/include;../../../../src/glu/sgi/libnurbs/interface;../../../../src/glu/sgi/libnurbs/internals;../../../../src/glu/sgi/libnurbs/nurbtess"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GLU_EXPORTS;BUILD_GL32;LIBRARYBUILD"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\Debug/glu.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="msvcrtd.lib winmm.lib odbc32.lib odbccp32.lib opengl32.lib"
-				OutputFile="Debug/GLU32.DLL"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../gdi/Debug"
-				IgnoreAllDefaultLibraries="true"
-				ModuleDefinitionFile="..\..\..\..\src\glu\sgi\glu.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Debug/GLU32.pdb"
-				ImportLibrary=".\Debug/GLU32.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy Debug\GLU32.LIB ..\..\..\..\lib&#x0D;&#x0A;copy Debug\GLU32.DLL ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy Debug\GLU32.DLL ..\..\..\..\progs\demos&#x0D;&#x0A;"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\dict.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libutil\error.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\geom.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\glu.def"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libutil\glue.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\memalloc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\mesh.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libutil\mipmap.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\normal.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\priorityq-heap.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\priorityq.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libutil\project.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libutil\quad.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libutil\registry.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\render.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\sweep.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\tess.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\tessmono.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\arc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\arcsorter.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\arctess.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\backend.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\basiccrveval.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\basicsurfeval.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\bezierarc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierEval.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatch.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatchMesh.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\bin.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\bufpool.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\cachingeval.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\coveandtiler.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\curve.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\curvelist.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\dataTransform.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\defines.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\definitions.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\dict-list.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\dict.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\directedLine.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\displaylist.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\displaymode.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\flist.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\flistsorter.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\geom.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glcurveval.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\glimports.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glimports.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glrenderer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glsurfeval.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libutil\gluint.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\include\gluos.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\gridline.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\gridtrimvertex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\gridvertex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\gridWrap.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\hull.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\jarcloc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\knotvector.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mapdesc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\maplist.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\memalloc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\mesh.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mesher.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoChain.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoPolyPart.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\monotonizer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoTriangulation.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\myassert.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mymath.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mysetjmp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdio.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdio.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdlib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdlib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mystring.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\normal.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\nurbsconsts.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\nurbstess.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionX.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionY.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\patch.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\patchlist.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyDBG.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyUtil.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\primitiveStream.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\priorityq-heap.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\priorityq-sort.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\priorityq.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\pwlarc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\quicksort.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\quilt.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\reader.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\rectBlock.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\render.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\renderhints.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleComp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompBot.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompRight.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompTop.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampledLine.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleMonoPoly.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\searchTree.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\simplemath.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\slicer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\sorter.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\subdivider.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\sweep.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\tess.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\tessmono.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\trimline.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\trimregion.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\trimvertex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\trimvertpool.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\types.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\uarray.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\varray.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\zlassert.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="C++ files"
-			Filter=".cc"
-			>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\arc.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\arcsorter.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\arctess.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\backend.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\basiccrveval.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\basicsurfeval.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierEval.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatch.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatchMesh.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\bin.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\bufpool.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\cachingeval.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\ccw.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\coveandtiler.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\curve.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\curvelist.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\curvesub.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\dataTransform.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\directedLine.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\displaylist.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\flist.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\flistsorter.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glcurveval.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glinterface.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glrenderer.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glsurfeval.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\gridWrap.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\hull.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\incurveeval.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\insurfeval.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\intersect.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\knotvector.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mapdesc.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mapdescv.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\maplist.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mesher.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoChain.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoPolyPart.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\monotonizer.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoTriangulation.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\monoTriangulationBackend.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mycode.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\nurbsinterfac.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\nurbstess.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionX.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionY.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\patch.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\patchlist.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyDBG.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyUtil.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\primitiveStream.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\quicksort.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\quilt.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\reader.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\README"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\rectBlock.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\renderhints.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleComp.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompBot.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompRight.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompTop.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampledLine.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleMonoPoly.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\searchTree.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\slicer.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\sorter.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\splitarcs.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\subdivider.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\tobezier.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\trimline.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\trimregion.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\trimvertpool.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\uarray.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\varray.cc"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-		</Filter>
-		<File
-			RelativePath="..\..\..\..\src\glu\sgi\libtess\alg-outline"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/windows/VC8/mesa/mesa.sln b/windows/VC8/mesa/mesa.sln
deleted file mode 100644
index 46d361ae28..0000000000
--- a/windows/VC8/mesa/mesa.sln
+++ /dev/null
@@ -1,43 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdi", "gdi\gdi.vcproj", "{A1B24907-E196-4826-B6AF-26723629B633}"
-	ProjectSection(ProjectDependencies) = postProject
-		{2120C974-2717-4709-B44F-D6E6D0A56448} = {2120C974-2717-4709-B44F-D6E6D0A56448}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glu", "glu\glu.vcproj", "{2E50FDAF-430B-475B-AE6B-60B68F2875BA}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mesa", "mesa\mesa.vcproj", "{2120C974-2717-4709-B44F-D6E6D0A56448}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osmesa", "osmesa\osmesa.vcproj", "{8D6CD423-383B-49E7-81BC-D20C70B07DF5}"
-	ProjectSection(ProjectDependencies) = postProject
-		{A1B24907-E196-4826-B6AF-26723629B633} = {A1B24907-E196-4826-B6AF-26723629B633}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A1B24907-E196-4826-B6AF-26723629B633}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A1B24907-E196-4826-B6AF-26723629B633}.Debug|Win32.Build.0 = Debug|Win32
-		{A1B24907-E196-4826-B6AF-26723629B633}.Release|Win32.ActiveCfg = Release|Win32
-		{A1B24907-E196-4826-B6AF-26723629B633}.Release|Win32.Build.0 = Release|Win32
-		{2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Debug|Win32.Build.0 = Debug|Win32
-		{2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Release|Win32.ActiveCfg = Release|Win32
-		{2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Release|Win32.Build.0 = Release|Win32
-		{2120C974-2717-4709-B44F-D6E6D0A56448}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2120C974-2717-4709-B44F-D6E6D0A56448}.Debug|Win32.Build.0 = Debug|Win32
-		{2120C974-2717-4709-B44F-D6E6D0A56448}.Release|Win32.ActiveCfg = Release|Win32
-		{2120C974-2717-4709-B44F-D6E6D0A56448}.Release|Win32.Build.0 = Release|Win32
-		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Debug|Win32.Build.0 = Debug|Win32
-		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Release|Win32.ActiveCfg = Release|Win32
-		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/windows/VC8/mesa/mesa/mesa.vcproj b/windows/VC8/mesa/mesa/mesa.vcproj
deleted file mode 100644
index 58856842a3..0000000000
--- a/windows/VC8/mesa/mesa/mesa.vcproj
+++ /dev/null
@@ -1,1753 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="mesa"
-	ProjectGUID="{2120C974-2717-4709-B44F-D6E6D0A56448}"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Zm1000 "
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/glapi,../../../../src/mesa/main,../../../../src/mesa/shader,../../../../src/mesa/shader/slang,../../../../src/mesa/shader/grammar"
-				PreprocessorDefinitions="NDEBUG,WIN32,_LIB,_DLL,BUILD_GL32,MESA_MINWARN"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\Release/mesa.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\Release\mesa.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Zm1000 "
-				Optimization="0"
-				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/glapi,../../../../src/mesa/main,../../../../src/mesa/shader,../../../../src/mesa/shader/slang,../../../../src/mesa/shader/grammar"
-				PreprocessorDefinitions="_DEBUG,WIN32,_LIB,_DLL,BUILD_GL32,MESA_MINWARN"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\Debug/mesa.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\Debug\mesa.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\accum.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\api_arrayelt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\api_loopback.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\api_noop.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\api_validate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\arbprogparse.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\arbprogram.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\arrayobj.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\atifragshader.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\attrib.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\blend.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\bufferobj.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\buffers.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\clip.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\colortab.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\context.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\convolve.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\debug.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\depth.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\depthstencil.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\dispatch.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\dlist.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\drawpix.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\enable.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\enums.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\eval.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\execmem.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\extensions.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\fbobject.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\feedback.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\fog.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\framebuffer.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\get.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\getstring.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\glapi\glapi.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\glapi\glthread.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar_crt.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar_mesa.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\hash.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\hint.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\histogram.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\image.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\imports.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\light.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\lines.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\m_debug_clip.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\m_debug_norm.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\m_debug_xform.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\m_eval.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\m_matrix.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\m_translate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\m_vector.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\m_xform.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\matrix.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\mipmap.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\mm.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\nvfragparse.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\nvprogram.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\nvvertparse.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\pixel.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\points.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\polygon.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\prog_debug.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\prog_execute.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\prog_instruction.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\prog_parameter.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\prog_print.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\prog_statevars.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\program.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\programopt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\queryobj.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\rastpos.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\rbadaptors.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\renderbuffer.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_aaline.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_aatriangle.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_accum.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_alpha.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_atifragshader.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_bitmap.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_blend.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_blit.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_buffers.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_context.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_copypix.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_depth.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_drawpix.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_feedback.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_fog.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_fragprog.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_imaging.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_lines.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_logic.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_masking.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_points.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_readpix.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_span.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_stencil.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_texcombine.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_texfilter.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_texstore.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_triangle.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_zoom.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\shader_api.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\shaders.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_builtin.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_codegen.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_function.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_operation.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_struct.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_variable.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_emit.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_ir.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_label.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_library_noise.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_link.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_log.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_mem.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_preprocess.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_print.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_simplify.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_storage.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_typeinfo.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_utility.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_vartable.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast_setup\ss_context.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast_setup\ss_triangle.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\state.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\stencil.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_context.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_draw.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_pipeline.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_cull.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_fog.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_light.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_normals.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_points.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_program.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_render.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_texgen.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_texmat.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_vertex.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vertex.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vertex_generic.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vp_build.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\texcompress.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\texcompress_fxt1.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\texcompress_s3tc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\texenvprogram.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\texformat.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\teximage.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\texobj.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\texrender.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\texstate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\texstore.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\varray.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\vbo\vbo_context.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\vbo\vbo_exec.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\vbo\vbo_exec_api.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\vbo\vbo_exec_array.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\vbo\vbo_exec_draw.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\vbo\vbo_exec_eval.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\vbo\vbo_rebase.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\vbo\vbo_save.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\vbo\vbo_save_api.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\vbo\vbo_save_draw.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\vbo\vbo_save_loopback.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\vbo\vbo_split.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\vbo\vbo_split_copy.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\vbo\vbo_split_inplace.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\vsnprintf.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\vtxfmt.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\accum.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\api_arrayelt.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\api_eval.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\api_loopback.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\api_noop.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\api_validate.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\arbprogparse.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\arbprogram.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\arbprogram_syn.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\atifragshader.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\attrib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\blend.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\bufferobj.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\buffers.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\clip.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\colormac.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\colortab.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\config.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\context.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\convolve.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\dd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\debug.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\depth.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\depthstencil.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\dlist.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\drawpix.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\enable.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\enums.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\eval.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\extensions.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\fbobject.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\feedback.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\fog.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\framebuffer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\get.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\glapi\glapi.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\glapi\glapioffsets.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\glapi\glapitable.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\glapi\glapitemp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\glheader.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\glapi\glprocs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\glapi\glthread.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar_crt.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar_mesa.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar_syn.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\hash.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\hint.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\histogram.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\image.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\imports.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\light.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\lines.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\m_clip_tmp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\m_copy_tmp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\m_debug.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\m_debug_util.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\m_dotprod_tmp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\m_eval.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\m_matrix.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\m_norm_tmp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\m_trans_tmp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\m_translate.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\m_vector.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\m_xform.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\m_xform_tmp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\macros.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\mathmod.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\matrix.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\mm.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\mtypes.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\nvfragparse.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\nvprogram.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\nvvertparse.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\pixel.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\points.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\polygon.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\prog_debug.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\prog_execute.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\prog_instruction.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\prog_parameter.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\prog_print.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\prog_statevars.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\program.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\programopt.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\queryobj.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\rastpos.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\rbadaptors.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\renderbuffer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_aaline.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_aalinetemp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_aatriangle.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_aatritemp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_accum.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_alpha.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_atifragshader.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_blend.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_context.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_depth.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_drawpix.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_feedback.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_fog.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_fragprog.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_lines.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_linetemp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_logic.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_masking.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_points.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_pointtemp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_span.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_spantemp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_stencil.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_texcombine.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_texfilter.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_triangle.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_trispan.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_tritemp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_zoom.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\shader_api.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\shaders.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\simple_list.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_builtin.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_codegen.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_function.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_operation.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_struct.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_variable.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_emit.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_ir.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_label.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_library_noise.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_link.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_log.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_mem.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_preprocess.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_print.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_simplify.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_storage.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_typeinfo.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_utility.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_vartable.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast_setup\ss_context.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast_setup\ss_triangle.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast_setup\ss_tritmp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast_setup\ss_vb.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\state.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\stencil.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\swrast.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast_setup\swrast_setup.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_context.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_pipeline.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_cliptmp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_lighttmp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_rendertmp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vertex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vp_build.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\texcompress.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\texenvprogram.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\texformat.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\texformat_tmp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\teximage.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\texobj.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\texrender.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\texstate.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\texstore.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\tnl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\varray.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\vbo\vbo.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\vbo\vbo_attrib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\vbo\vbo_attrib_tmp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\vbo\vbo_context.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\vbo\vbo_exec.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\vbo\vbo_save.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\vbo\vbo_split.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\version.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\vtxfmt.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\vtxfmt_tmp.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/windows/VC8/mesa/osmesa/osmesa.vcproj b/windows/VC8/mesa/osmesa/osmesa.vcproj
deleted file mode 100644
index 2ba0077fca..0000000000
--- a/windows/VC8/mesa/osmesa/osmesa.vcproj
+++ /dev/null
@@ -1,243 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="osmesa"
-	ProjectGUID="{8D6CD423-383B-49E7-81BC-D20C70B07DF5}"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/osmesa.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OSMESA_EXPORTS"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release/osmesa.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="opengl32.lib winmm.lib msvcrt.lib odbc32.lib odbccp32.lib"
-				OutputFile="Release/OSMESA32.DLL"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../gdi/Release"
-				IgnoreAllDefaultLibraries="true"
-				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\osmesa\osmesa.def"
-				ProgramDatabaseFile=".\Release/OSMESA32.pdb"
-				ImportLibrary=".\Release/OSMESA32.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy Release\OSMESA32.LIB ..\..\..\..\lib&#x0D;&#x0A;copy Release\OSMESA32.DLL ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy Release\OSMESA32.DLL ..\..\..\..\progs\demos&#x0D;&#x0A;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/osmesa.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OSMESA_EXPORTS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\Debug/osmesa.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="opengl32.lib winmm.lib msvcrtd.lib odbc32.lib odbccp32.lib"
-				OutputFile="Debug/OSMESA32.DLL"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../gdi/Debug"
-				IgnoreAllDefaultLibraries="true"
-				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\osmesa\osmesa.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Debug/OSMESA32.pdb"
-				ImportLibrary=".\Debug/OSMESA32.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy Debug\OSMESA32.LIB ..\..\..\..\lib&#x0D;&#x0A;copy Debug\OSMESA32.DLL ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy Debug\OSMESA32.DLL ..\..\..\..\progs\demos&#x0D;&#x0A;"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="..\..\..\..\src\mesa\drivers\common\driverfuncs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\drivers\osmesa\osmesa.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\drivers\osmesa\osmesa.def"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/windows/VC8/progs/demos/gears.vcproj b/windows/VC8/progs/demos/gears.vcproj
deleted file mode 100644
index 891acd641a..0000000000
--- a/windows/VC8/progs/demos/gears.vcproj
+++ /dev/null
@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="gears"
-	ProjectGUID="{3A7B0671-10F8-45D1-B012-F6D650F817CE}"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug/gears.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../../../include"
-				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\Debug/gears.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="glut32.lib odbc32.lib odbccp32.lib"
-				OutputFile=".\Debug/gears.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../glut/Debug"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Debug/gears.pdb"
-				SubSystem="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy Debug\gears.exe ..\..\..\..\progs\demos"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/gears.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../../include"
-				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release/gears.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="glut32.lib odbc32.lib odbccp32.lib"
-				OutputFile=".\Release/gears.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../glut/Release"
-				ProgramDatabaseFile=".\Release/gears.pdb"
-				SubSystem="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy Release\gears.exe ..\..\..\..\progs\demos"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="..\..\..\..\progs\demos\gears.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/windows/VC8/progs/glut/glut.vcproj b/windows/VC8/progs/glut/glut.vcproj
deleted file mode 100644
index f86cc1b15a..0000000000
--- a/windows/VC8/progs/glut/glut.vcproj
+++ /dev/null
@@ -1,449 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="glut"
-	ProjectGUID="{0234F0D2-C8A6-4C4D-93E7-0E2248049C67}"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/glut.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../../../include"
-				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_DLL;_USRDLL;GLUT_EXPORTS;MESA;BUILD_GL32;_CRT_SECURE_NO_DEPRECATE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\Debug/glut.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="winmm.lib msvcrtd.lib gdi32.lib user32.lib oldnames.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib"
-				OutputFile="Debug/GLUT32.DLL"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../mesa/Debug"
-				IgnoreAllDefaultLibraries="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Debug/GLUT32.pdb"
-				ImportLibrary=".\Debug/GLUT32.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy Debug\GLUT32.LIB ..\..\..\..\lib&#x0D;&#x0A;copy Debug\GLUT32.DLL ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy Debug\GLUT32.DLL ..\..\..\..\progs\demos&#x0D;&#x0A;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/glut.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../../include"
-				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_DLL;_USRDLL;GLUT_EXPORTS;MESA;BUILD_GL32;_CRT_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release/glut.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="opengl32.lib glu32.lib user32.lib winmm.lib gdi32.lib msvcrt.lib oldnames.lib odbc32.lib odbccp32.lib"
-				OutputFile="Release/GLUT32.DLL"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../mesa/Release"
-				IgnoreAllDefaultLibraries="true"
-				ProgramDatabaseFile=".\Release/GLUT32.pdb"
-				ImportLibrary=".\Release/GLUT32.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy Release\GLUT32.LIB ..\..\..\..\lib&#x0D;&#x0A;copy Release\GLUT32.DLL ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy Release\GLUT32.DLL ..\..\..\..\progs\demos&#x0D;&#x0A;"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_8x13.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_9x15.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_bitmap.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_bwidth.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_cindex.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_cmap.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_cursor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_dials.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_dstr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_event.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_ext.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_fbc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_fullscrn.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_gamemode.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_get.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_hel10.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_hel12.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_hel18.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_init.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_input.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_joy.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_key.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_keyctrl.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_keyup.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_mesa.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_modifier.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_mroman.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_overlay.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_roman.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_shapes.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_space.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_stroke.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_swap.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_swidth.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_tablet.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_teapot.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_tr10.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_tr24.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_util.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_vidresize.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_warp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_win.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glut_winmisc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\win32_glx.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\win32_menu.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\win32_util.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\win32_winproc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\win32_x11.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glutbitmap.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glutint.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glutstroke.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\glutwin32.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\stroke.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\win32_glx.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\glut\glx\win32_x11.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/windows/VC8/progs/progs.sln b/windows/VC8/progs/progs.sln
deleted file mode 100644
index 3d91afa1a3..0000000000
--- a/windows/VC8/progs/progs.sln
+++ /dev/null
@@ -1,28 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gears", "demos\gears.vcproj", "{3A7B0671-10F8-45D1-B012-F6D650F817CE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{0234F0D2-C8A6-4C4D-93E7-0E2248049C67} = {0234F0D2-C8A6-4C4D-93E7-0E2248049C67}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glut", "glut\glut.vcproj", "{0234F0D2-C8A6-4C4D-93E7-0E2248049C67}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{3A7B0671-10F8-45D1-B012-F6D650F817CE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3A7B0671-10F8-45D1-B012-F6D650F817CE}.Debug|Win32.Build.0 = Debug|Win32
-		{3A7B0671-10F8-45D1-B012-F6D650F817CE}.Release|Win32.ActiveCfg = Release|Win32
-		{3A7B0671-10F8-45D1-B012-F6D650F817CE}.Release|Win32.Build.0 = Release|Win32
-		{0234F0D2-C8A6-4C4D-93E7-0E2248049C67}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0234F0D2-C8A6-4C4D-93E7-0E2248049C67}.Debug|Win32.Build.0 = Debug|Win32
-		{0234F0D2-C8A6-4C4D-93E7-0E2248049C67}.Release|Win32.ActiveCfg = Release|Win32
-		{0234F0D2-C8A6-4C4D-93E7-0E2248049C67}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
-- 
cgit v1.2.3


From c813b545ab4726fc5030f123ec6255224d64ad82 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Mon, 10 Mar 2008 17:41:00 -0600
Subject: fix Height2/Depth2 init problem when using texture borders

---
 src/mesa/main/teximage.c | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 5c96be9216..f15e404527 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -1214,19 +1214,30 @@ _mesa_init_teximage_fields(GLcontext *ctx, GLenum target,
    img->Width = width;
    img->Height = height;
    img->Depth = depth;
+
    img->Width2 = width - 2 * border;   /* == 1 << img->WidthLog2; */
-   img->Height2 = height - 2 * border; /* == 1 << img->HeightLog2; */
-   img->Depth2 = depth - 2 * border;   /* == 1 << img->DepthLog2; */
    img->WidthLog2 = logbase2(img->Width2);
-   if (height == 1)  /* 1-D texture */
+
+   if (height == 1) { /* 1-D texture */
+      img->Height2 = 1;
       img->HeightLog2 = 0;
-   else
+   }
+   else {
+      img->Height2 = height - 2 * border; /* == 1 << img->HeightLog2; */
       img->HeightLog2 = logbase2(img->Height2);
-   if (depth == 1)   /* 2-D texture */
+   }
+
+   if (depth == 1) {  /* 2-D texture */
+      img->Depth2 = 1;
       img->DepthLog2 = 0;
-   else
+   }
+   else {
+      img->Depth2 = depth - 2 * border;   /* == 1 << img->DepthLog2; */
       img->DepthLog2 = logbase2(img->Depth2);
+   }
+
    img->MaxLog2 = MAX2(img->WidthLog2, img->HeightLog2);
+
    img->IsCompressed = GL_FALSE;
    img->CompressedSize = 0;
 
-- 
cgit v1.2.3


From c2bf23b8372607a5507a44ea3654c8af1083529a Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 14 Mar 2008 17:47:11 -0600
Subject: mesa: clamp point size in vertex program when computing attenuated
 size

---
 src/mesa/main/ffvertex_prog.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index 04ece4cda8..f648d081c0 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -1398,12 +1398,13 @@ static void build_pointsize( struct tnl_program *p )
    /* 1 / sqrt(factor) */
    emit_op1(p, OPCODE_RSQ, ut, WRITEMASK_X, ut );
 
-#if 1
+#if 0
    /* out = pointSize / sqrt(factor) */
    emit_op2(p, OPCODE_MUL, out, WRITEMASK_X, ut, state_size);
 #else
-   /* not sure, might make sense to do clamping here,
-      but it's not done in t_vb_points neither */
+   /* this is a good place to clamp the point size since there's likely
+    * no hardware registers to clamp point size at rasterization time.
+    */
    emit_op2(p, OPCODE_MUL, ut, WRITEMASK_X, ut, state_size);
    emit_op2(p, OPCODE_MAX, ut, WRITEMASK_X, ut, swizzle1(state_size, Y));
    emit_op2(p, OPCODE_MIN, out, WRITEMASK_X, ut, swizzle1(state_size, Z));
-- 
cgit v1.2.3


From c80a380ebb58c15db87309d466ef57fb006b40ae Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Fri, 21 Mar 2008 12:32:48 -0600
Subject: Fix some PBO breakage.

In _mesa_Bitmap, can't early return if bitmap ptr is NULL, it may be an offset
into a PBO.  Similarly for _mesa_GetTexImage.
---
 src/mesa/main/drawpix.c  | 14 ++++++--------
 src/mesa/main/teximage.c |  3 ---
 2 files changed, 6 insertions(+), 11 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index ae9c7e29a1..5df55ef0c9 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.5
+ * Version:  7.1
  *
- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -343,12 +343,10 @@ _mesa_Bitmap( GLsizei width, GLsizei height,
    }
 
    if (ctx->RenderMode == GL_RENDER) {
-      if (bitmap && width && height) {
-         /* Truncate, to satisfy conformance tests (matches SGI's OpenGL). */
-         GLint x = IFLOOR(ctx->Current.RasterPos[0] - xorig);
-         GLint y = IFLOOR(ctx->Current.RasterPos[1] - yorig);
-         ctx->Driver.Bitmap( ctx, x, y, width, height, &ctx->Unpack, bitmap );
-      }
+      /* Truncate, to satisfy conformance tests (matches SGI's OpenGL). */
+      GLint x = IFLOOR(ctx->Current.RasterPos[0] - xorig);
+      GLint y = IFLOOR(ctx->Current.RasterPos[1] - yorig);
+      ctx->Driver.Bitmap( ctx, x, y, width, height, &ctx->Unpack, bitmap );
    }
 #if _HAVE_FULL_GL
    else if (ctx->RenderMode == GL_FEEDBACK) {
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index f15e404527..384e145520 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -2323,9 +2323,6 @@ _mesa_GetTexImage( GLenum target, GLint level, GLenum format,
       return;
    }
 
-   if (!pixels)
-      return;
-
    _mesa_lock_texture(ctx, texObj);
    {
       texImage = _mesa_select_tex_image(ctx, texObj, target, level);
-- 
cgit v1.2.3


From ff938bf059a41a9bdf4c2c93cebe4a3b8a89c201 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 21 Mar 2008 13:43:07 -0600
Subject: add a number of PBO validate/map/unmap functions

Helper functions for (some) drivers, including swrast.
cherry-picked from Mesa/master
---
 src/mesa/main/bufferobj.c   | 187 +++++++++++++++++++++++++++++++++++++++++++-
 src/mesa/main/bufferobj.h   |  39 ++++++++-
 src/mesa/swrast/s_bitmap.c  |  32 ++------
 src/mesa/swrast/s_drawpix.c |  30 ++-----
 src/mesa/swrast/s_readpix.c |  30 ++-----
 5 files changed, 240 insertions(+), 78 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 009055a6ab..71e571353f 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.5.1
+ * Version:  7.1
  *
- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -469,6 +469,189 @@ _mesa_validate_pbo_access(GLuint dimensions,
 }
 
 
+/**
+ * If the source of glBitmap data is a PBO, check that we won't read out
+ * of buffer bounds, then map the buffer.
+ * If not sourcing from a PBO, just return the bitmap pointer.
+ * This is a helper function for (some) drivers.
+ * Return NULL if error.
+ * If non-null return, must call validate_and_map_bitmap_pbo() when done.
+ */
+const GLubyte *
+_mesa_validate_and_map_bitmap_pbo(GLcontext *ctx,
+                                  GLsizei width, GLsizei height,
+                                  const struct gl_pixelstore_attrib *unpack,
+                                  const GLubyte *bitmap)
+{
+   const GLubyte *buf;
+
+   if (unpack->BufferObj->Name) {
+      /* unpack from PBO */
+      if (!_mesa_validate_pbo_access(2, unpack, width, height, 1,
+                                     GL_COLOR_INDEX, GL_BITMAP,
+                                     (GLvoid *) bitmap)) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,"glBitmap(invalid PBO access)");
+         return NULL;
+      }
+
+      if (unpack->BufferObj->Pointer) {
+         /* buffer is already mapped - that's an error */
+         _mesa_error(ctx, GL_INVALID_OPERATION, "glBitmap(PBO is mapped)");
+         return NULL;
+      }
+
+      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
+                                              GL_READ_ONLY_ARB,
+                                              unpack->BufferObj);
+      if (!buf)
+         return NULL;
+
+      buf = ADD_POINTERS(buf, bitmap);
+   }
+   else {
+      /* unpack from normal memory */
+      buf = bitmap;
+   }
+
+   return buf;
+}
+
+
+/**
+ * Counterpart to validate_and_map_bitmap_pbo()
+ * This is a helper function for (some) drivers.
+ */
+void
+_mesa_unmap_bitmap_pbo(GLcontext *ctx,
+                       const struct gl_pixelstore_attrib *unpack)
+{
+   if (unpack->BufferObj->Name) {
+      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
+                              unpack->BufferObj);
+   }
+}
+
+
+/**
+ * \sa _mesa_validate_and_map_bitmap_pbo
+ */
+const GLvoid *
+_mesa_validate_and_map_drawpix_pbo(GLcontext *ctx,
+                                   GLsizei width, GLsizei height,
+                                   GLenum format, GLenum type,
+                                   const struct gl_pixelstore_attrib *unpack,
+                                   const GLvoid *pixels)
+{
+   const GLvoid *buf;
+
+   if (unpack->BufferObj->Name) {
+      /* unpack from PBO */
+
+      if (!_mesa_validate_pbo_access(2, unpack, width, height, 1,
+                                     format, type, pixels)) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glDrawPixels(invalid PBO access)");
+         return NULL;
+      }
+
+      if (unpack->BufferObj->Pointer) {
+         /* buffer is already mapped - that's an error */
+         _mesa_error(ctx, GL_INVALID_OPERATION, "glDrawPixels(PBO is mapped)");
+         return NULL;
+      }
+
+      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
+                                              GL_READ_ONLY_ARB,
+                                              unpack->BufferObj);
+      if (!buf)
+         return NULL;
+
+      buf = ADD_POINTERS(buf, pixels);
+   }
+   else {
+      /* unpack from normal memory */
+      buf = pixels;
+   }
+
+   return buf;
+}
+
+
+/**
+ * \sa _mesa_unmap_bitmap_pbo
+ */
+void
+_mesa_unmap_drapix_pbo(GLcontext *ctx,
+                       const struct gl_pixelstore_attrib *unpack)
+{
+   if (unpack->BufferObj->Name) {
+      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
+                              unpack->BufferObj);
+   }
+}
+
+
+/**
+ * When doing glReadPixels into a PBO, this function will check for errors
+ * and map the buffer.
+ * Call _mesa_unmap_readpix_pbo() when finished
+ * \return NULL if error
+ */
+void *
+_mesa_validate_and_map_readpix_pbo(GLcontext *ctx,
+                                   GLint x, GLint y,
+                                   GLsizei width, GLsizei height,
+                                   GLenum format, GLenum type,
+                                   const struct gl_pixelstore_attrib *pack,
+                                   GLvoid *dest)
+{
+   void *buf;
+
+   if (pack->BufferObj->Name) {
+      /* pack into PBO */
+      if (!_mesa_validate_pbo_access(2, pack, width, height, 1,
+                                     format, type, dest)) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glReadPixels(invalid PBO access)");
+         return NULL;
+      }
+
+      if (pack->BufferObj->Pointer) {
+         /* buffer is already mapped - that's an error */
+         _mesa_error(ctx, GL_INVALID_OPERATION, "glReadPixels(PBO is mapped)");
+         return NULL;
+      }
+
+      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
+                                              GL_WRITE_ONLY_ARB,
+                                              pack->BufferObj);
+      if (!buf)
+         return NULL;
+
+      buf = ADD_POINTERS(buf, dest);
+   }
+   else {
+      /* pack to normal memory */
+      buf = dest;
+   }
+
+   return buf;
+}
+
+
+/**
+ * Counterpart to validate_and_map_readpix_pbo()
+ */
+void
+_mesa_unmap_readpix_pbo(GLcontext *ctx,
+                        const struct gl_pixelstore_attrib *pack)
+{
+   if (pack->BufferObj->Name) {
+      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT, pack->BufferObj);
+   }
+}
+
+
 /**
  * Return the gl_buffer_object for the given ID.
  * Always return NULL for ID 0.
diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h
index f54f9e9ff0..efb3b4711e 100644
--- a/src/mesa/main/bufferobj.h
+++ b/src/mesa/main/bufferobj.h
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.3
+ * Version:  7.1
  *
- * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -86,6 +86,41 @@ _mesa_validate_pbo_access(GLuint dimensions,
                           GLsizei width, GLsizei height, GLsizei depth,
                           GLenum format, GLenum type, const GLvoid *ptr);
 
+extern const GLubyte *
+_mesa_validate_and_map_bitmap_pbo(GLcontext *ctx,
+                                  GLsizei width, GLsizei height,
+                                  const struct gl_pixelstore_attrib *unpack,
+                                  const GLubyte *bitmap);
+
+extern void
+_mesa_unmap_bitmap_pbo(GLcontext *ctx,
+                       const struct gl_pixelstore_attrib *unpack);
+
+extern const GLvoid *
+_mesa_validate_and_map_drawpix_pbo(GLcontext *ctx,
+                                   GLsizei width, GLsizei height,
+                                   GLenum format, GLenum type,
+                                   const struct gl_pixelstore_attrib *unpack,
+                                   const GLvoid *pixels);
+
+extern void
+_mesa_unmap_drapix_pbo(GLcontext *ctx,
+                       const struct gl_pixelstore_attrib *unpack);
+
+
+extern void *
+_mesa_validate_and_map_readpix_pbo(GLcontext *ctx,
+                                   GLint x, GLint y,
+                                   GLsizei width, GLsizei height,
+                                   GLenum format, GLenum type,
+                                   const struct gl_pixelstore_attrib *pack,
+                                   GLvoid *dest);
+
+extern void
+_mesa_unmap_readpix_pbo(GLcontext *ctx,
+                        const struct gl_pixelstore_attrib *pack);
+
+
 extern void
 _mesa_unbind_buffer_object( GLcontext *ctx, struct gl_buffer_object *bufObj );
 
diff --git a/src/mesa/swrast/s_bitmap.c b/src/mesa/swrast/s_bitmap.c
index 1e7f6c18e6..17f639fd55 100644
--- a/src/mesa/swrast/s_bitmap.c
+++ b/src/mesa/swrast/s_bitmap.c
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.5.2
+ * Version:  7.1
  *
- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -57,24 +57,10 @@ _swrast_Bitmap( GLcontext *ctx, GLint px, GLint py,
 
    ASSERT(ctx->RenderMode == GL_RENDER);
 
-   if (unpack->BufferObj->Name) {
-      /* unpack from PBO */
-      GLubyte *buf;
-      if (!_mesa_validate_pbo_access(2, unpack, width, height, 1,
-                                     GL_COLOR_INDEX, GL_BITMAP,
-                                     (GLvoid *) bitmap)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,"glBitmap(invalid PBO access)");
-         return;
-      }
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                                              GL_READ_ONLY_ARB,
-                                              unpack->BufferObj);
-      if (!buf) {
-         /* buffer is already mapped - that's an error */
-         _mesa_error(ctx, GL_INVALID_OPERATION, "glBitmap(PBO is mapped)");
-         return;
-      }
-      bitmap = ADD_POINTERS(buf, bitmap);
+   bitmap = _mesa_validate_and_map_bitmap_pbo(ctx, width, height,
+                                              unpack, bitmap);
+   if (!bitmap) {
+      return NULL;
    }
 
    RENDER_START(swrast,ctx);
@@ -150,11 +136,7 @@ _swrast_Bitmap( GLcontext *ctx, GLint px, GLint py,
 
    RENDER_FINISH(swrast,ctx);
 
-   if (unpack->BufferObj->Name) {
-      /* done with PBO so unmap it now */
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                              unpack->BufferObj);
-   }
+   _mesa_unmap_bitmap_pbo(ctx, unpack);
 }
 
 
diff --git a/src/mesa/swrast/s_drawpix.c b/src/mesa/swrast/s_drawpix.c
index 0cf425e1c6..2cf3501274 100644
--- a/src/mesa/swrast/s_drawpix.c
+++ b/src/mesa/swrast/s_drawpix.c
@@ -812,7 +812,6 @@ draw_depth_stencil_pixels(GLcontext *ctx, GLint x, GLint y,
 }
 
 
-
 /**
  * Execute software-based glDrawPixels.
  * By time we get here, all error checking will have been done.
@@ -835,25 +834,10 @@ _swrast_DrawPixels( GLcontext *ctx,
    if (swrast->NewState)
       _swrast_validate_derived( ctx );
 
-   if (unpack->BufferObj->Name) {
-      /* unpack from PBO */
-      GLubyte *buf;
-      if (!_mesa_validate_pbo_access(2, unpack, width, height, 1,
-                                     format, type, pixels)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glDrawPixels(invalid PBO access)");
-         goto end;
-      }
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                                              GL_READ_ONLY_ARB,
-                                              unpack->BufferObj);
-      if (!buf) {
-         /* buffer is already mapped - that's an error */
-         _mesa_error(ctx, GL_INVALID_OPERATION, "glDrawPixels(PBO is mapped)");
-         goto end;
-      }
-      pixels = ADD_POINTERS(buf, pixels);
-   }
+   pixels = _mesa_validate_and_map_drawpix_pbo(ctx, x, y, width, height,
+                                               format, type, unpack, pixels);
+   if (!pixels)
+      return;
 
    switch (format) {
    case GL_STENCIL_INDEX:
@@ -894,11 +878,7 @@ end:
 
    RENDER_FINISH(swrast,ctx);
 
-   if (unpack->BufferObj->Name) {
-      /* done with PBO so unmap it now */
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                              unpack->BufferObj);
-   }
+   _mesa_unmap_drapix_pbo(ctx, unpack);
 }
 
 
diff --git a/src/mesa/swrast/s_readpix.c b/src/mesa/swrast/s_readpix.c
index fe9a70f4ea..f4f882ae84 100644
--- a/src/mesa/swrast/s_readpix.c
+++ b/src/mesa/swrast/s_readpix.c
@@ -572,25 +572,11 @@ _swrast_ReadPixels( GLcontext *ctx,
       goto end;
    }
 
-   if (clippedPacking.BufferObj->Name) {
-      /* pack into PBO */
-      GLubyte *buf;
-      if (!_mesa_validate_pbo_access(2, &clippedPacking, width, height, 1,
-                                     format, type, pixels)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glReadPixels(invalid PBO access)");
-         goto end;
-      }
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                                              GL_WRITE_ONLY_ARB,
-                                              clippedPacking.BufferObj);
-      if (!buf) {
-         /* buffer is already mapped - that's an error */
-         _mesa_error(ctx, GL_INVALID_OPERATION, "glReadPixels(PBO is mapped)");
-         goto end;
-      }
-      pixels = ADD_POINTERS(buf, pixels);
-   }
+   pixels = _mesa_validate_and_map_readpix_pbo(ctx, x, y, width, height,
+                                               format, type,
+                                               &clippedPacking, pixels);
+   if (!pixels)
+      return;
 
    switch (format) {
       case GL_COLOR_INDEX:
@@ -632,9 +618,5 @@ _swrast_ReadPixels( GLcontext *ctx,
 end:
    RENDER_FINISH(swrast, ctx);
 
-   if (clippedPacking.BufferObj->Name) {
-      /* done with PBO so unmap it now */
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                              clippedPacking.BufferObj);
-   }
+   _mesa_unmap_readpix_pbo(ctx, &clippedPacking);
 }
-- 
cgit v1.2.3


From a39091bc5b68e4d4f5302f1d3f1a138798f54b77 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Fri, 21 Mar 2008 14:20:07 -0600
Subject: Refactor PBO validate/map code.

We always need to do PBO validation, so do that in core Mesa before calling driv
er routine.
cherry-picked from Mesa/master.
---
 src/mesa/main/bufferobj.c                 | 76 ++++++-------------------------
 src/mesa/main/bufferobj.h                 | 24 ++++------
 src/mesa/main/drawpix.c                   | 50 ++++++++++++++++++++
 src/mesa/state_tracker/st_cb_bitmap.c     |  3 +-
 src/mesa/state_tracker/st_cb_drawpixels.c |  4 +-
 src/mesa/state_tracker/st_cb_readpixels.c |  4 +-
 src/mesa/swrast/s_bitmap.c                |  8 ++--
 src/mesa/swrast/s_drawpix.c               |  3 +-
 src/mesa/swrast/s_readpix.c               |  4 +-
 9 files changed, 82 insertions(+), 94 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 71e571353f..e762eb3b63 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -475,31 +475,17 @@ _mesa_validate_pbo_access(GLuint dimensions,
  * If not sourcing from a PBO, just return the bitmap pointer.
  * This is a helper function for (some) drivers.
  * Return NULL if error.
- * If non-null return, must call validate_and_map_bitmap_pbo() when done.
+ * If non-null return, must call _mesa_unmap_bitmap_pbo() when done.
  */
 const GLubyte *
-_mesa_validate_and_map_bitmap_pbo(GLcontext *ctx,
-                                  GLsizei width, GLsizei height,
-                                  const struct gl_pixelstore_attrib *unpack,
-                                  const GLubyte *bitmap)
+_mesa_map_bitmap_pbo(GLcontext *ctx,
+                     const struct gl_pixelstore_attrib *unpack,
+                     const GLubyte *bitmap)
 {
    const GLubyte *buf;
 
    if (unpack->BufferObj->Name) {
       /* unpack from PBO */
-      if (!_mesa_validate_pbo_access(2, unpack, width, height, 1,
-                                     GL_COLOR_INDEX, GL_BITMAP,
-                                     (GLvoid *) bitmap)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,"glBitmap(invalid PBO access)");
-         return NULL;
-      }
-
-      if (unpack->BufferObj->Pointer) {
-         /* buffer is already mapped - that's an error */
-         _mesa_error(ctx, GL_INVALID_OPERATION, "glBitmap(PBO is mapped)");
-         return NULL;
-      }
-
       buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
                                               GL_READ_ONLY_ARB,
                                               unpack->BufferObj);
@@ -518,7 +504,7 @@ _mesa_validate_and_map_bitmap_pbo(GLcontext *ctx,
 
 
 /**
- * Counterpart to validate_and_map_bitmap_pbo()
+ * Counterpart to _mesa_map_bitmap_pbo()
  * This is a helper function for (some) drivers.
  */
 void
@@ -533,33 +519,17 @@ _mesa_unmap_bitmap_pbo(GLcontext *ctx,
 
 
 /**
- * \sa _mesa_validate_and_map_bitmap_pbo
+ * \sa _mesa_map_bitmap_pbo
  */
 const GLvoid *
-_mesa_validate_and_map_drawpix_pbo(GLcontext *ctx,
-                                   GLsizei width, GLsizei height,
-                                   GLenum format, GLenum type,
-                                   const struct gl_pixelstore_attrib *unpack,
-                                   const GLvoid *pixels)
+_mesa_map_drawpix_pbo(GLcontext *ctx,
+                      const struct gl_pixelstore_attrib *unpack,
+                      const GLvoid *pixels)
 {
    const GLvoid *buf;
 
    if (unpack->BufferObj->Name) {
       /* unpack from PBO */
-
-      if (!_mesa_validate_pbo_access(2, unpack, width, height, 1,
-                                     format, type, pixels)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glDrawPixels(invalid PBO access)");
-         return NULL;
-      }
-
-      if (unpack->BufferObj->Pointer) {
-         /* buffer is already mapped - that's an error */
-         _mesa_error(ctx, GL_INVALID_OPERATION, "glDrawPixels(PBO is mapped)");
-         return NULL;
-      }
-
       buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
                                               GL_READ_ONLY_ARB,
                                               unpack->BufferObj);
@@ -592,36 +562,19 @@ _mesa_unmap_drapix_pbo(GLcontext *ctx,
 
 
 /**
- * When doing glReadPixels into a PBO, this function will check for errors
- * and map the buffer.
+ * If PBO is bound, map the buffer, return dest pointer in mapped buffer.
  * Call _mesa_unmap_readpix_pbo() when finished
  * \return NULL if error
  */
 void *
-_mesa_validate_and_map_readpix_pbo(GLcontext *ctx,
-                                   GLint x, GLint y,
-                                   GLsizei width, GLsizei height,
-                                   GLenum format, GLenum type,
-                                   const struct gl_pixelstore_attrib *pack,
-                                   GLvoid *dest)
+_mesa_map_readpix_pbo(GLcontext *ctx,
+                      const struct gl_pixelstore_attrib *pack,
+                      GLvoid *dest)
 {
    void *buf;
 
    if (pack->BufferObj->Name) {
       /* pack into PBO */
-      if (!_mesa_validate_pbo_access(2, pack, width, height, 1,
-                                     format, type, dest)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glReadPixels(invalid PBO access)");
-         return NULL;
-      }
-
-      if (pack->BufferObj->Pointer) {
-         /* buffer is already mapped - that's an error */
-         _mesa_error(ctx, GL_INVALID_OPERATION, "glReadPixels(PBO is mapped)");
-         return NULL;
-      }
-
       buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
                                               GL_WRITE_ONLY_ARB,
                                               pack->BufferObj);
@@ -640,7 +593,7 @@ _mesa_validate_and_map_readpix_pbo(GLcontext *ctx,
 
 
 /**
- * Counterpart to validate_and_map_readpix_pbo()
+ * Counterpart to _mesa_map_readpix_pbo()
  */
 void
 _mesa_unmap_readpix_pbo(GLcontext *ctx,
@@ -652,6 +605,7 @@ _mesa_unmap_readpix_pbo(GLcontext *ctx,
 }
 
 
+
 /**
  * Return the gl_buffer_object for the given ID.
  * Always return NULL for ID 0.
diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h
index efb3b4711e..46525f08ae 100644
--- a/src/mesa/main/bufferobj.h
+++ b/src/mesa/main/bufferobj.h
@@ -87,21 +87,18 @@ _mesa_validate_pbo_access(GLuint dimensions,
                           GLenum format, GLenum type, const GLvoid *ptr);
 
 extern const GLubyte *
-_mesa_validate_and_map_bitmap_pbo(GLcontext *ctx,
-                                  GLsizei width, GLsizei height,
-                                  const struct gl_pixelstore_attrib *unpack,
-                                  const GLubyte *bitmap);
+_mesa_map_bitmap_pbo(GLcontext *ctx,
+                     const struct gl_pixelstore_attrib *unpack,
+                     const GLubyte *bitmap);
 
 extern void
 _mesa_unmap_bitmap_pbo(GLcontext *ctx,
                        const struct gl_pixelstore_attrib *unpack);
 
 extern const GLvoid *
-_mesa_validate_and_map_drawpix_pbo(GLcontext *ctx,
-                                   GLsizei width, GLsizei height,
-                                   GLenum format, GLenum type,
-                                   const struct gl_pixelstore_attrib *unpack,
-                                   const GLvoid *pixels);
+_mesa_map_drawpix_pbo(GLcontext *ctx,
+                      const struct gl_pixelstore_attrib *unpack,
+                      const GLvoid *pixels);
 
 extern void
 _mesa_unmap_drapix_pbo(GLcontext *ctx,
@@ -109,12 +106,9 @@ _mesa_unmap_drapix_pbo(GLcontext *ctx,
 
 
 extern void *
-_mesa_validate_and_map_readpix_pbo(GLcontext *ctx,
-                                   GLint x, GLint y,
-                                   GLsizei width, GLsizei height,
-                                   GLenum format, GLenum type,
-                                   const struct gl_pixelstore_attrib *pack,
-                                   GLvoid *dest);
+_mesa_map_readpix_pbo(GLcontext *ctx,
+                      const struct gl_pixelstore_attrib *pack,
+                      GLvoid *dest);
 
 extern void
 _mesa_unmap_readpix_pbo(GLcontext *ctx,
diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index 5df55ef0c9..0f64f1c1c0 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -24,6 +24,7 @@
 
 #include "glheader.h"
 #include "imports.h"
+#include "bufferobj.h"
 #include "context.h"
 #include "drawpix.h"
 #include "feedback.h"
@@ -183,6 +184,23 @@ _mesa_DrawPixels( GLsizei width, GLsizei height,
       /* Round, to satisfy conformance tests (matches SGI's OpenGL) */
       GLint x = IROUND(ctx->Current.RasterPos[0]);
       GLint y = IROUND(ctx->Current.RasterPos[1]);
+
+      if (ctx->Unpack.BufferObj->Name) {
+         /* unpack from PBO */
+         if (!_mesa_validate_pbo_access(2, &ctx->Unpack, width, height, 1,
+                                        format, type, pixels)) {
+            _mesa_error(ctx, GL_INVALID_OPERATION,
+                        "glDrawPixels(invalid PBO access)");
+            return;
+         }
+         if (ctx->Unpack.BufferObj->Pointer) {
+            /* buffer is mapped - that's an error */
+            _mesa_error(ctx, GL_INVALID_OPERATION,
+                        "glDrawPixels(PBO is mapped)");
+            return;
+         }
+      }
+
       ctx->Driver.DrawPixels(ctx, x, y, width, height, format, type,
 			     &ctx->Unpack, pixels);
    }
@@ -303,6 +321,21 @@ _mesa_ReadPixels( GLint x, GLint y, GLsizei width, GLsizei height,
       return;
    }
 
+   if (ctx->Pack.BufferObj->Name) {
+      if (!_mesa_validate_pbo_access(2, &ctx->Pack, width, height, 1,
+                                     format, type, pixels)) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glReadPixels(invalid PBO access)");
+         return;
+      }
+
+      if (ctx->Pack.BufferObj->Pointer) {
+         /* buffer is mapped - that's an error */
+         _mesa_error(ctx, GL_INVALID_OPERATION, "glReadPixels(PBO is mapped)");
+         return;
+      }
+   }
+
    ctx->Driver.ReadPixels(ctx, x, y, width, height,
 			  format, type, &ctx->Pack, pixels);
 }
@@ -346,6 +379,23 @@ _mesa_Bitmap( GLsizei width, GLsizei height,
       /* Truncate, to satisfy conformance tests (matches SGI's OpenGL). */
       GLint x = IFLOOR(ctx->Current.RasterPos[0] - xorig);
       GLint y = IFLOOR(ctx->Current.RasterPos[1] - yorig);
+
+      if (ctx->Unpack.BufferObj->Name) {
+         /* unpack from PBO */
+         if (!_mesa_validate_pbo_access(2, &ctx->Unpack, width, height, 1,
+                                        GL_COLOR_INDEX, GL_BITMAP,
+                                        (GLvoid *) bitmap)) {
+            _mesa_error(ctx, GL_INVALID_OPERATION,
+                        "glBitmap(invalid PBO access)");
+            return;
+         }
+         if (ctx->Unpack.BufferObj->Pointer) {
+            /* buffer is mapped - that's an error */
+            _mesa_error(ctx, GL_INVALID_OPERATION, "glBitmap(PBO is mapped)");
+            return;
+         }
+      }
+
       ctx->Driver.Bitmap( ctx, x, y, width, height, &ctx->Unpack, bitmap );
    }
 #if _HAVE_FULL_GL
diff --git a/src/mesa/state_tracker/st_cb_bitmap.c b/src/mesa/state_tracker/st_cb_bitmap.c
index 4e23db0edc..acc22d4323 100644
--- a/src/mesa/state_tracker/st_cb_bitmap.c
+++ b/src/mesa/state_tracker/st_cb_bitmap.c
@@ -225,8 +225,7 @@ make_bitmap_texture(GLcontext *ctx, GLsizei width, GLsizei height,
    }
 
    /* PBO source... */
-   bitmap = _mesa_validate_and_map_bitmap_pbo(ctx, width, height,
-                                              unpack, bitmap);
+   bitmap = _mesa_map_bitmap_pbo(ctx, unpack, bitmap);
    if (!bitmap) {
       return NULL;
    }
diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index c0f8e5ffdd..2ebaf8a2c3 100644
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -335,9 +335,7 @@ make_texture(struct st_context *st,
    assert(pipeFormat);
    cpp = st_sizeof_format(pipeFormat);
 
-   pixels = _mesa_validate_and_map_drawpix_pbo(ctx, width, height,
-                                               format, type,
-                                               unpack, pixels);
+   pixels = _mesa_map_drawpix_pbo(ctx, unpack, pixels);
    if (!pixels)
       return NULL;
 
diff --git a/src/mesa/state_tracker/st_cb_readpixels.c b/src/mesa/state_tracker/st_cb_readpixels.c
index b22e846a15..4cf9adcd28 100644
--- a/src/mesa/state_tracker/st_cb_readpixels.c
+++ b/src/mesa/state_tracker/st_cb_readpixels.c
@@ -155,9 +155,7 @@ st_readpixels(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height,
       return;
    }
 
-   dest = _mesa_validate_and_map_readpix_pbo(ctx, x, y, width, height,
-                                             format, type,
-                                             &clippedPacking, dest);
+   dest = _mesa_map_readpix_pbo(ctx, &clippedPacking, dest);
    if (!dest)
       return;
 
diff --git a/src/mesa/swrast/s_bitmap.c b/src/mesa/swrast/s_bitmap.c
index 17f639fd55..f3dda12e25 100644
--- a/src/mesa/swrast/s_bitmap.c
+++ b/src/mesa/swrast/s_bitmap.c
@@ -57,11 +57,9 @@ _swrast_Bitmap( GLcontext *ctx, GLint px, GLint py,
 
    ASSERT(ctx->RenderMode == GL_RENDER);
 
-   bitmap = _mesa_validate_and_map_bitmap_pbo(ctx, width, height,
-                                              unpack, bitmap);
-   if (!bitmap) {
-      return NULL;
-   }
+   bitmap = _mesa_map_bitmap_pbo(ctx, unpack, bitmap);
+   if (!bitmap)
+      return;
 
    RENDER_START(swrast,ctx);
 
diff --git a/src/mesa/swrast/s_drawpix.c b/src/mesa/swrast/s_drawpix.c
index 2cf3501274..fb04d9f746 100644
--- a/src/mesa/swrast/s_drawpix.c
+++ b/src/mesa/swrast/s_drawpix.c
@@ -834,8 +834,7 @@ _swrast_DrawPixels( GLcontext *ctx,
    if (swrast->NewState)
       _swrast_validate_derived( ctx );
 
-   pixels = _mesa_validate_and_map_drawpix_pbo(ctx, x, y, width, height,
-                                               format, type, unpack, pixels);
+   pixels = _mesa_map_drawpix_pbo(ctx, unpack, pixels);
    if (!pixels)
       return;
 
diff --git a/src/mesa/swrast/s_readpix.c b/src/mesa/swrast/s_readpix.c
index f4f882ae84..2f155d0b70 100644
--- a/src/mesa/swrast/s_readpix.c
+++ b/src/mesa/swrast/s_readpix.c
@@ -572,9 +572,7 @@ _swrast_ReadPixels( GLcontext *ctx,
       goto end;
    }
 
-   pixels = _mesa_validate_and_map_readpix_pbo(ctx, x, y, width, height,
-                                               format, type,
-                                               &clippedPacking, pixels);
+   pixels = _mesa_map_readpix_pbo(ctx, &clippedPacking, pixels);
    if (!pixels)
       return;
 
-- 
cgit v1.2.3


From f73cfd9e5cb0f47057f5b78b019787726798f238 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Sat, 22 Mar 2008 09:12:02 -0600
Subject: delete default programs with ctx->Driver.DeleteProgram()

---
 src/mesa/main/context.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index a9f9bd9da4..d06644f65d 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -695,10 +695,10 @@ free_shared_state( GLcontext *ctx, struct gl_shared_state *ss )
    _mesa_DeleteHashTable(ss->Programs);
 #endif
 #if FEATURE_ARB_vertex_program
-   _mesa_delete_program(ctx, ss->DefaultVertexProgram);
+   ctx->Driver.DeleteProgram(ctx, ss->DefaultVertexProgram);
 #endif
 #if FEATURE_ARB_fragment_program
-   _mesa_delete_program(ctx, ss->DefaultFragmentProgram);
+   ctx->Driver.DeleteProgram(ctx, ss->DefaultFragmentProgram);
 #endif
 
 #if FEATURE_ATI_fragment_shader
-- 
cgit v1.2.3


From 13041da714106ae61b4184b79e847c2b382e07ad Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 28 Mar 2008 13:10:16 -0600
Subject: mesa: fix texture/renderbuffer mix-up in
 test_attachment_completeness()

---
 src/mesa/main/fbobject.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 6a8cba4d8a..800f6ee9a3 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -307,7 +307,7 @@ test_attachment_completeness(const GLcontext *ctx, GLenum format,
             /* OK */
          }
          else if (ctx->Extensions.EXT_packed_depth_stencil &&
-                  att->Renderbuffer->_BaseFormat == GL_DEPTH_STENCIL_EXT) {
+                  texImage->TexFormat->BaseFormat == GL_DEPTH_STENCIL_EXT) {
             /* OK */
          }
          else {
-- 
cgit v1.2.3


From 04097f558325eae35b5da1b72e6da938b433ad0a Mon Sep 17 00:00:00 2001
From: Roland Scheidegger <sroland@tungstengraphics.com>
Date: Tue, 30 Oct 2007 14:09:17 +0100
Subject: add missing _mesa_StencilFuncSeparateATI function

---
 src/mesa/main/stencil.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++++
 src/mesa/main/stencil.h |  2 ++
 2 files changed, 77 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/stencil.c b/src/mesa/main/stencil.c
index e61eb0030c..ca7f6eaf88 100644
--- a/src/mesa/main/stencil.c
+++ b/src/mesa/main/stencil.c
@@ -82,6 +82,81 @@ _mesa_ClearStencil( GLint s )
 }
 
 
+/**
+ * Set the function and reference value for stencil testing.
+ *
+ * \param frontfunc front test function.
+ * \param backfunc back test function.
+ * \param ref front and back reference value.
+ * \param mask front and back bitmask.
+ *
+ * \sa glStencilFunc().
+ *
+ * Verifies the parameters and updates the respective values in
+ * __GLcontextRec::Stencil. On change flushes the vertices and notifies the
+ * driver via the dd_function_table::StencilFunc callback.
+ */
+void GLAPIENTRY
+_mesa_StencilFuncSeparateATI( GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   const GLint stencilMax = (1 << ctx->DrawBuffer->Visual.stencilBits) - 1;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   switch (frontfunc) {
+      case GL_NEVER:
+      case GL_LESS:
+      case GL_LEQUAL:
+      case GL_GREATER:
+      case GL_GEQUAL:
+      case GL_EQUAL:
+      case GL_NOTEQUAL:
+      case GL_ALWAYS:
+         break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glStencilFuncSeparateATI (0x%04x)", frontfunc );
+         return;
+   }
+
+   switch (backfunc) {
+      case GL_NEVER:
+      case GL_LESS:
+      case GL_LEQUAL:
+      case GL_GREATER:
+      case GL_GEQUAL:
+      case GL_EQUAL:
+      case GL_NOTEQUAL:
+      case GL_ALWAYS:
+         break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glStencilFuncSeparateATI (0x%04x)", backfunc );
+         return;
+   }
+
+   ref = CLAMP( ref, 0, stencilMax );
+
+   /* set both front and back state */
+   if (ctx->Stencil.Function[0] == frontfunc &&
+       ctx->Stencil.Function[1] == backfunc &&
+       ctx->Stencil.ValueMask[0] == mask &&
+       ctx->Stencil.ValueMask[1] == mask &&
+       ctx->Stencil.Ref[0] == ref &&
+       ctx->Stencil.Ref[1] == ref)
+      return;
+   FLUSH_VERTICES(ctx, _NEW_STENCIL);
+   ctx->Stencil.Function[0]  = frontfunc;
+   ctx->Stencil.Function[1]  = backfunc;
+   ctx->Stencil.Ref[0]       = ctx->Stencil.Ref[1]       = ref;
+   ctx->Stencil.ValueMask[0] = ctx->Stencil.ValueMask[1] = mask;
+   if (ctx->Driver.StencilFuncSeparate) {
+      ctx->Driver.StencilFuncSeparate(ctx, GL_FRONT,
+                                      frontfunc, ref, mask);
+      ctx->Driver.StencilFuncSeparate(ctx, GL_BACK,
+                                      backfunc, ref, mask);
+   }
+}
+
+
 /**
  * Set the function and reference value for stencil testing.
  *
diff --git a/src/mesa/main/stencil.h b/src/mesa/main/stencil.h
index 27c6362023..0be9810005 100644
--- a/src/mesa/main/stencil.h
+++ b/src/mesa/main/stencil.h
@@ -62,6 +62,8 @@ _mesa_StencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLenum zpass);
 extern void GLAPIENTRY
 _mesa_StencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask);
 
+extern void GLAPIENTRY
+_mesa_StencilFuncSeparateATI(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
 
 extern void GLAPIENTRY
 _mesa_StencilMaskSeparate(GLenum face, GLuint mask);
-- 
cgit v1.2.3


From 102f2ef4fc2d45c51926add6bdf51ef6fcb43b35 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Tue, 30 Oct 2007 09:13:58 -0600
Subject: Finish up ATI_separate_stencil

Add entrypoints to glapi XML file and regenerate files.
Implement glStencilOpSeparateATI().
Consolidate some code in stencil.c
---
 src/mesa/drivers/dri/common/extension_helper.h |   22 +
 src/mesa/glapi/dispatch.h                      |   24 +-
 src/mesa/glapi/gl_API.xml                      |   29 +
 src/mesa/glapi/glapioffsets.h                  |   14 +-
 src/mesa/glapi/glapitable.h                    |   10 +-
 src/mesa/glapi/glapitemp.h                     |   32 +-
 src/mesa/glapi/glprocs.h                       |  564 +++++------
 src/mesa/main/enums.c                          | 1224 ++++++++++++------------
 src/mesa/main/state.c                          |    4 +
 src/mesa/main/stencil.c                        |  289 +++---
 src/mesa/main/stencil.h                        |    8 +-
 src/mesa/sparc/glapi_sparc.S                   |    4 +
 src/mesa/x86-64/glapi_x86-64.S                 |   92 ++
 src/mesa/x86/glapi_x86.S                       |   16 +-
 14 files changed, 1258 insertions(+), 1074 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/common/extension_helper.h b/src/mesa/drivers/dri/common/extension_helper.h
index bf103a3931..726d9900c3 100644
--- a/src/mesa/drivers/dri/common/extension_helper.h
+++ b/src/mesa/drivers/dri/common/extension_helper.h
@@ -3839,6 +3839,13 @@ static const char Binormal3svEXT_names[] =
     "";
 #endif
 
+#if defined(need_GL_ATI_separate_stencil)
+static const char StencilOpSeparateATI_names[] = 
+    "iiii\0" /* Parameter signature */
+    "glStencilOpSeparateATI\0"
+    "";
+#endif
+
 #if defined(need_GL_EXT_light_texture)
 static const char ApplyTextureEXT_names[] = 
     "i\0" /* Parameter signature */
@@ -4179,6 +4186,13 @@ static const char ActiveStencilFaceEXT_names[] =
     "";
 #endif
 
+#if defined(need_GL_ATI_separate_stencil)
+static const char StencilFuncSeparateATI_names[] = 
+    "iiii\0" /* Parameter signature */
+    "glStencilFuncSeparateATI\0"
+    "";
+#endif
+
 #if defined(need_GL_VERSION_2_0) || defined(need_GL_ARB_shader_objects)
 static const char GetShaderSourceARB_names[] = 
     "iipp\0" /* Parameter signature */
@@ -5182,6 +5196,14 @@ static const struct dri_extension_function GL_ATI_fragment_shader_functions[] =
 };
 #endif
 
+#if defined(need_GL_ATI_separate_stencil)
+static const struct dri_extension_function GL_ATI_separate_stencil_functions[] = {
+    { StencilOpSeparateATI_names, StencilOpSeparateATI_remap_index, -1 },
+    { StencilFuncSeparateATI_names, StencilFuncSeparateATI_remap_index, -1 },
+    { NULL, 0, 0 }
+};
+#endif
+
 #if defined(need_GL_EXT_blend_color)
 static const struct dri_extension_function GL_EXT_blend_color_functions[] = {
     { BlendColor_names, -1, 336 },
diff --git a/src/mesa/glapi/dispatch.h b/src/mesa/glapi/dispatch.h
index 0ce59f7b99..e46f159f94 100644
--- a/src/mesa/glapi/dispatch.h
+++ b/src/mesa/glapi/dispatch.h
@@ -2365,6 +2365,12 @@
 #define CALL_FramebufferTextureLayerEXT(disp, parameters) (*((disp)->FramebufferTextureLayerEXT)) parameters
 #define GET_FramebufferTextureLayerEXT(disp) ((disp)->FramebufferTextureLayerEXT)
 #define SET_FramebufferTextureLayerEXT(disp, fn) ((disp)->FramebufferTextureLayerEXT = fn)
+#define CALL_StencilFuncSeparateATI(disp, parameters) (*((disp)->StencilFuncSeparateATI)) parameters
+#define GET_StencilFuncSeparateATI(disp) ((disp)->StencilFuncSeparateATI)
+#define SET_StencilFuncSeparateATI(disp, fn) ((disp)->StencilFuncSeparateATI = fn)
+#define CALL_StencilOpSeparateATI(disp, parameters) (*((disp)->StencilOpSeparateATI)) parameters
+#define GET_StencilOpSeparateATI(disp) ((disp)->StencilOpSeparateATI)
+#define SET_StencilOpSeparateATI(disp, fn) ((disp)->StencilOpSeparateATI = fn)
 #define CALL_ProgramEnvParameters4fvEXT(disp, parameters) (*((disp)->ProgramEnvParameters4fvEXT)) parameters
 #define GET_ProgramEnvParameters4fvEXT(disp) ((disp)->ProgramEnvParameters4fvEXT)
 #define SET_ProgramEnvParameters4fvEXT(disp, fn) ((disp)->ProgramEnvParameters4fvEXT = fn)
@@ -2380,7 +2386,7 @@
 
 #else
 
-#define driDispatchRemapTable_size 365
+#define driDispatchRemapTable_size 367
 extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 
 #define AttachShader_remap_index 0
@@ -2744,10 +2750,12 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define RenderbufferStorageEXT_remap_index 358
 #define BlitFramebufferEXT_remap_index 359
 #define FramebufferTextureLayerEXT_remap_index 360
-#define ProgramEnvParameters4fvEXT_remap_index 361
-#define ProgramLocalParameters4fvEXT_remap_index 362
-#define GetQueryObjecti64vEXT_remap_index 363
-#define GetQueryObjectui64vEXT_remap_index 364
+#define StencilFuncSeparateATI_remap_index 361
+#define StencilOpSeparateATI_remap_index 362
+#define ProgramEnvParameters4fvEXT_remap_index 363
+#define ProgramLocalParameters4fvEXT_remap_index 364
+#define GetQueryObjecti64vEXT_remap_index 365
+#define GetQueryObjectui64vEXT_remap_index 366
 
 #define CALL_AttachShader(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLuint)), driDispatchRemapTable[AttachShader_remap_index], parameters)
 #define GET_AttachShader(disp) GET_by_offset(disp, driDispatchRemapTable[AttachShader_remap_index])
@@ -3832,6 +3840,12 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define CALL_FramebufferTextureLayerEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLuint, GLint, GLint)), driDispatchRemapTable[FramebufferTextureLayerEXT_remap_index], parameters)
 #define GET_FramebufferTextureLayerEXT(disp) GET_by_offset(disp, driDispatchRemapTable[FramebufferTextureLayerEXT_remap_index])
 #define SET_FramebufferTextureLayerEXT(disp, fn) SET_by_offset(disp, driDispatchRemapTable[FramebufferTextureLayerEXT_remap_index], fn)
+#define CALL_StencilFuncSeparateATI(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLint, GLuint)), driDispatchRemapTable[StencilFuncSeparateATI_remap_index], parameters)
+#define GET_StencilFuncSeparateATI(disp) GET_by_offset(disp, driDispatchRemapTable[StencilFuncSeparateATI_remap_index])
+#define SET_StencilFuncSeparateATI(disp, fn) SET_by_offset(disp, driDispatchRemapTable[StencilFuncSeparateATI_remap_index], fn)
+#define CALL_StencilOpSeparateATI(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLenum, GLenum)), driDispatchRemapTable[StencilOpSeparateATI_remap_index], parameters)
+#define GET_StencilOpSeparateATI(disp) GET_by_offset(disp, driDispatchRemapTable[StencilOpSeparateATI_remap_index])
+#define SET_StencilOpSeparateATI(disp, fn) SET_by_offset(disp, driDispatchRemapTable[StencilOpSeparateATI_remap_index], fn)
 #define CALL_ProgramEnvParameters4fvEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, GLsizei, const GLfloat *)), driDispatchRemapTable[ProgramEnvParameters4fvEXT_remap_index], parameters)
 #define GET_ProgramEnvParameters4fvEXT(disp) GET_by_offset(disp, driDispatchRemapTable[ProgramEnvParameters4fvEXT_remap_index])
 #define SET_ProgramEnvParameters4fvEXT(disp, fn) SET_by_offset(disp, driDispatchRemapTable[ProgramEnvParameters4fvEXT_remap_index], fn)
diff --git a/src/mesa/glapi/gl_API.xml b/src/mesa/glapi/gl_API.xml
index 4bd3b2f0fb..e16ffe870f 100644
--- a/src/mesa/glapi/gl_API.xml
+++ b/src/mesa/glapi/gl_API.xml
@@ -12156,6 +12156,35 @@
     </function>
 </category>
 
+<category name="GL_ATI_separate_stencil">
+    <enum name="STENCIL_BACK_FUNC_ATI"     count="1"  value="0x8800">
+        <size name="Get" mode="get"/>
+    </enum>
+    <enum name="STENCIL_BACK_FAIL_ATI"     count="1"  value="0x8801">
+        <size name="Get" mode="get"/>
+    </enum>
+    <enum name="STENCIL_BACK_PASS_DEPTH_FAIL_ATI" count="1"  value="0x8802">
+        <size name="Get" mode="get"/>
+    </enum>
+    <enum name="STENCIL_BACK_PASS_DEPTH_PASS_ATI" count="1"  value="0x8803">
+        <size name="Get" mode="get"/>
+    </enum>
+
+    <function name="StencilOpSeparateATI" offset="assign" static_dispatch="false">
+        <param name="face" type="GLenum"/>
+        <param name="sfail" type="GLenum"/>
+        <param name="zfail" type="GLenum"/>
+        <param name="zpass" type="GLenum"/>
+    </function>
+    <function name="StencilFuncSeparateATI" offset="assign" static_dispatch="false">
+        <param name="frontfunc" type="GLenum"/>
+        <param name="backfunc" type="GLenum"/>
+        <param name="ref" type="GLint"/>
+        <param name="mask" type="GLuint"/>
+    </function>
+
+</category>
+
 <category name="GL_EXT_gpu_program_parameters">
     <function name="ProgramEnvParameters4fvEXT" offset="assign" static_dispatch="false">
         <param name="target" type="GLenum"/>
diff --git a/src/mesa/glapi/glapioffsets.h b/src/mesa/glapi/glapioffsets.h
index c207a06ac4..a2db342ffe 100644
--- a/src/mesa/glapi/glapioffsets.h
+++ b/src/mesa/glapi/glapioffsets.h
@@ -801,11 +801,13 @@
 #define _gloffset_RenderbufferStorageEXT 766
 #define _gloffset_BlitFramebufferEXT 767
 #define _gloffset_FramebufferTextureLayerEXT 768
-#define _gloffset_ProgramEnvParameters4fvEXT 769
-#define _gloffset_ProgramLocalParameters4fvEXT 770
-#define _gloffset_GetQueryObjecti64vEXT 771
-#define _gloffset_GetQueryObjectui64vEXT 772
-#define _gloffset_FIRST_DYNAMIC 773
+#define _gloffset_StencilFuncSeparateATI 769
+#define _gloffset_StencilOpSeparateATI 770
+#define _gloffset_ProgramEnvParameters4fvEXT 771
+#define _gloffset_ProgramLocalParameters4fvEXT 772
+#define _gloffset_GetQueryObjecti64vEXT 773
+#define _gloffset_GetQueryObjectui64vEXT 774
+#define _gloffset_FIRST_DYNAMIC 775
 
 #else
 
@@ -1170,6 +1172,8 @@
 #define _gloffset_RenderbufferStorageEXT driDispatchRemapTable[RenderbufferStorageEXT_remap_index]
 #define _gloffset_BlitFramebufferEXT driDispatchRemapTable[BlitFramebufferEXT_remap_index]
 #define _gloffset_FramebufferTextureLayerEXT driDispatchRemapTable[FramebufferTextureLayerEXT_remap_index]
+#define _gloffset_StencilFuncSeparateATI driDispatchRemapTable[StencilFuncSeparateATI_remap_index]
+#define _gloffset_StencilOpSeparateATI driDispatchRemapTable[StencilOpSeparateATI_remap_index]
 #define _gloffset_ProgramEnvParameters4fvEXT driDispatchRemapTable[ProgramEnvParameters4fvEXT_remap_index]
 #define _gloffset_ProgramLocalParameters4fvEXT driDispatchRemapTable[ProgramLocalParameters4fvEXT_remap_index]
 #define _gloffset_GetQueryObjecti64vEXT driDispatchRemapTable[GetQueryObjecti64vEXT_remap_index]
diff --git a/src/mesa/glapi/glapitable.h b/src/mesa/glapi/glapitable.h
index 1e4c2949e4..148aa96b88 100644
--- a/src/mesa/glapi/glapitable.h
+++ b/src/mesa/glapi/glapitable.h
@@ -810,10 +810,12 @@ struct _glapi_table
    void (GLAPIENTRYP RenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); /* 766 */
    void (GLAPIENTRYP BlitFramebufferEXT)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); /* 767 */
    void (GLAPIENTRYP FramebufferTextureLayerEXT)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); /* 768 */
-   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 769 */
-   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 770 */
-   void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 771 */
-   void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 772 */
+   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 769 */
+   void (GLAPIENTRYP StencilOpSeparateATI)(GLenum face, GLenum sfail, GLenum zfail, GLenum zpass); /* 770 */
+   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 771 */
+   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 772 */
+   void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 773 */
+   void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 774 */
 };
 
 #endif /* !defined( _GLAPI_TABLE_H_ ) */
diff --git a/src/mesa/glapi/glapitemp.h b/src/mesa/glapi/glapitemp.h
index 10af9b3085..cd420fdee5 100644
--- a/src/mesa/glapi/glapitemp.h
+++ b/src/mesa/glapi/glapitemp.h
@@ -5446,30 +5446,44 @@ KEYWORD1 void KEYWORD2 NAME(FramebufferTextureLayerEXT)(GLenum target, GLenum at
    DISPATCH(FramebufferTextureLayerEXT, (target, attachment, texture, level, layer), (F, "glFramebufferTextureLayerEXT(0x%x, 0x%x, %d, %d, %d);\n", target, attachment, texture, level, layer));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_769)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_769)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_769)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_769)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask)
+{
+   DISPATCH(StencilFuncSeparateATI, (frontfunc, backfunc, ref, mask), (F, "glStencilFuncSeparateATI(0x%x, 0x%x, %d, %d);\n", frontfunc, backfunc, ref, mask));
+}
+
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_770)(GLenum face, GLenum sfail, GLenum zfail, GLenum zpass);
+
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_770)(GLenum face, GLenum sfail, GLenum zfail, GLenum zpass)
+{
+   DISPATCH(StencilOpSeparateATI, (face, sfail, zfail, zpass), (F, "glStencilOpSeparateATI(0x%x, 0x%x, 0x%x, 0x%x);\n", face, sfail, zfail, zpass));
+}
+
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_771)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_771)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
 {
    DISPATCH(ProgramEnvParameters4fvEXT, (target, index, count, params), (F, "glProgramEnvParameters4fvEXT(0x%x, %d, %d, %p);\n", target, index, count, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_770)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_772)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_770)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_772)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
 {
    DISPATCH(ProgramLocalParameters4fvEXT, (target, index, count, params), (F, "glProgramLocalParameters4fvEXT(0x%x, %d, %d, %p);\n", target, index, count, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_771)(GLuint id, GLenum pname, GLint64EXT * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_773)(GLuint id, GLenum pname, GLint64EXT * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_771)(GLuint id, GLenum pname, GLint64EXT * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_773)(GLuint id, GLenum pname, GLint64EXT * params)
 {
    DISPATCH(GetQueryObjecti64vEXT, (id, pname, params), (F, "glGetQueryObjecti64vEXT(%d, 0x%x, %p);\n", id, pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_772)(GLuint id, GLenum pname, GLuint64EXT * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_774)(GLuint id, GLenum pname, GLuint64EXT * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_772)(GLuint id, GLenum pname, GLuint64EXT * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_774)(GLuint id, GLenum pname, GLuint64EXT * params)
 {
    DISPATCH(GetQueryObjectui64vEXT, (id, pname, params), (F, "glGetQueryObjectui64vEXT(%d, 0x%x, %p);\n", id, pname, (const void *) params));
 }
@@ -6261,6 +6275,8 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(_dispatch_stub_770),
    TABLE_ENTRY(_dispatch_stub_771),
    TABLE_ENTRY(_dispatch_stub_772),
+   TABLE_ENTRY(_dispatch_stub_773),
+   TABLE_ENTRY(_dispatch_stub_774),
    /* A whole bunch of no-op functions.  These might be called
     * when someone tries to call a dynamically-registered
     * extension function without a current rendering context.
diff --git a/src/mesa/glapi/glprocs.h b/src/mesa/glapi/glprocs.h
index c461333c51..657b74e578 100644
--- a/src/mesa/glapi/glprocs.h
+++ b/src/mesa/glapi/glprocs.h
@@ -821,6 +821,8 @@ static const char gl_string_table[] =
     "glRenderbufferStorageEXT\0"
     "glBlitFramebufferEXT\0"
     "glFramebufferTextureLayerEXT\0"
+    "glStencilFuncSeparateATI\0"
+    "glStencilOpSeparateATI\0"
     "glProgramEnvParameters4fvEXT\0"
     "glProgramLocalParameters4fvEXT\0"
     "glGetQueryObjecti64vEXT\0"
@@ -1148,6 +1150,8 @@ static const char gl_string_table[] =
 #define gl_dispatch_stub_770 mgl_dispatch_stub_770
 #define gl_dispatch_stub_771 mgl_dispatch_stub_771
 #define gl_dispatch_stub_772 mgl_dispatch_stub_772
+#define gl_dispatch_stub_773 mgl_dispatch_stub_773
+#define gl_dispatch_stub_774 mgl_dispatch_stub_774
 #endif /* USE_MGL_NAMESPACE */
 
 
@@ -1198,6 +1202,8 @@ extern void gl_dispatch_stub_769(void);
 extern void gl_dispatch_stub_770(void);
 extern void gl_dispatch_stub_771(void);
 extern void gl_dispatch_stub_772(void);
+extern void gl_dispatch_stub_773(void);
+extern void gl_dispatch_stub_774(void);
 #endif /* defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING) */
 
 static const glprocs_table_t static_functions[] = {
@@ -1970,284 +1976,286 @@ static const glprocs_table_t static_functions[] = {
     NAME_FUNC_OFFSET(13424, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, _gloffset_RenderbufferStorageEXT),
     NAME_FUNC_OFFSET(13449, gl_dispatch_stub_767, gl_dispatch_stub_767, NULL, _gloffset_BlitFramebufferEXT),
     NAME_FUNC_OFFSET(13470, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
-    NAME_FUNC_OFFSET(13499, gl_dispatch_stub_769, gl_dispatch_stub_769, NULL, _gloffset_ProgramEnvParameters4fvEXT),
-    NAME_FUNC_OFFSET(13528, gl_dispatch_stub_770, gl_dispatch_stub_770, NULL, _gloffset_ProgramLocalParameters4fvEXT),
-    NAME_FUNC_OFFSET(13559, gl_dispatch_stub_771, gl_dispatch_stub_771, NULL, _gloffset_GetQueryObjecti64vEXT),
-    NAME_FUNC_OFFSET(13583, gl_dispatch_stub_772, gl_dispatch_stub_772, NULL, _gloffset_GetQueryObjectui64vEXT),
-    NAME_FUNC_OFFSET(13608, glArrayElement, glArrayElement, NULL, _gloffset_ArrayElement),
-    NAME_FUNC_OFFSET(13626, glBindTexture, glBindTexture, NULL, _gloffset_BindTexture),
-    NAME_FUNC_OFFSET(13643, glDrawArrays, glDrawArrays, NULL, _gloffset_DrawArrays),
-    NAME_FUNC_OFFSET(13659, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, _gloffset_AreTexturesResident),
-    NAME_FUNC_OFFSET(13684, glCopyTexImage1D, glCopyTexImage1D, NULL, _gloffset_CopyTexImage1D),
-    NAME_FUNC_OFFSET(13704, glCopyTexImage2D, glCopyTexImage2D, NULL, _gloffset_CopyTexImage2D),
-    NAME_FUNC_OFFSET(13724, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, _gloffset_CopyTexSubImage1D),
-    NAME_FUNC_OFFSET(13747, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, _gloffset_CopyTexSubImage2D),
-    NAME_FUNC_OFFSET(13770, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, _gloffset_DeleteTextures),
-    NAME_FUNC_OFFSET(13790, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, _gloffset_GenTextures),
-    NAME_FUNC_OFFSET(13807, glGetPointerv, glGetPointerv, NULL, _gloffset_GetPointerv),
-    NAME_FUNC_OFFSET(13824, glIsTexture, glIsTextureEXT, glIsTextureEXT, _gloffset_IsTexture),
-    NAME_FUNC_OFFSET(13839, glPrioritizeTextures, glPrioritizeTextures, NULL, _gloffset_PrioritizeTextures),
-    NAME_FUNC_OFFSET(13863, glTexSubImage1D, glTexSubImage1D, NULL, _gloffset_TexSubImage1D),
-    NAME_FUNC_OFFSET(13882, glTexSubImage2D, glTexSubImage2D, NULL, _gloffset_TexSubImage2D),
-    NAME_FUNC_OFFSET(13901, glBlendColor, glBlendColor, NULL, _gloffset_BlendColor),
-    NAME_FUNC_OFFSET(13917, glBlendEquation, glBlendEquation, NULL, _gloffset_BlendEquation),
-    NAME_FUNC_OFFSET(13936, glDrawRangeElements, glDrawRangeElements, NULL, _gloffset_DrawRangeElements),
-    NAME_FUNC_OFFSET(13959, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
-    NAME_FUNC_OFFSET(13975, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
-    NAME_FUNC_OFFSET(13991, glColorTableParameterfv, glColorTableParameterfv, NULL, _gloffset_ColorTableParameterfv),
-    NAME_FUNC_OFFSET(14018, glColorTableParameteriv, glColorTableParameteriv, NULL, _gloffset_ColorTableParameteriv),
-    NAME_FUNC_OFFSET(14045, glCopyColorTable, glCopyColorTable, NULL, _gloffset_CopyColorTable),
-    NAME_FUNC_OFFSET(14065, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
-    NAME_FUNC_OFFSET(14084, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
-    NAME_FUNC_OFFSET(14103, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
-    NAME_FUNC_OFFSET(14133, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
-    NAME_FUNC_OFFSET(14163, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
-    NAME_FUNC_OFFSET(14193, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
-    NAME_FUNC_OFFSET(14223, glColorSubTable, glColorSubTable, NULL, _gloffset_ColorSubTable),
-    NAME_FUNC_OFFSET(14242, glCopyColorSubTable, glCopyColorSubTable, NULL, _gloffset_CopyColorSubTable),
-    NAME_FUNC_OFFSET(14265, glConvolutionFilter1D, glConvolutionFilter1D, NULL, _gloffset_ConvolutionFilter1D),
-    NAME_FUNC_OFFSET(14290, glConvolutionFilter2D, glConvolutionFilter2D, NULL, _gloffset_ConvolutionFilter2D),
-    NAME_FUNC_OFFSET(14315, glConvolutionParameterf, glConvolutionParameterf, NULL, _gloffset_ConvolutionParameterf),
-    NAME_FUNC_OFFSET(14342, glConvolutionParameterfv, glConvolutionParameterfv, NULL, _gloffset_ConvolutionParameterfv),
-    NAME_FUNC_OFFSET(14370, glConvolutionParameteri, glConvolutionParameteri, NULL, _gloffset_ConvolutionParameteri),
-    NAME_FUNC_OFFSET(14397, glConvolutionParameteriv, glConvolutionParameteriv, NULL, _gloffset_ConvolutionParameteriv),
-    NAME_FUNC_OFFSET(14425, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, _gloffset_CopyConvolutionFilter1D),
-    NAME_FUNC_OFFSET(14454, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, _gloffset_CopyConvolutionFilter2D),
-    NAME_FUNC_OFFSET(14483, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, _gloffset_GetConvolutionFilter),
-    NAME_FUNC_OFFSET(14509, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, _gloffset_GetConvolutionParameterfv),
-    NAME_FUNC_OFFSET(14540, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, _gloffset_GetConvolutionParameteriv),
-    NAME_FUNC_OFFSET(14571, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, _gloffset_GetSeparableFilter),
-    NAME_FUNC_OFFSET(14595, glSeparableFilter2D, glSeparableFilter2D, NULL, _gloffset_SeparableFilter2D),
-    NAME_FUNC_OFFSET(14618, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, _gloffset_GetHistogram),
-    NAME_FUNC_OFFSET(14636, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, _gloffset_GetHistogramParameterfv),
-    NAME_FUNC_OFFSET(14665, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, _gloffset_GetHistogramParameteriv),
-    NAME_FUNC_OFFSET(14694, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, _gloffset_GetMinmax),
-    NAME_FUNC_OFFSET(14709, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, _gloffset_GetMinmaxParameterfv),
-    NAME_FUNC_OFFSET(14735, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, _gloffset_GetMinmaxParameteriv),
-    NAME_FUNC_OFFSET(14761, glHistogram, glHistogram, NULL, _gloffset_Histogram),
-    NAME_FUNC_OFFSET(14776, glMinmax, glMinmax, NULL, _gloffset_Minmax),
-    NAME_FUNC_OFFSET(14788, glResetHistogram, glResetHistogram, NULL, _gloffset_ResetHistogram),
-    NAME_FUNC_OFFSET(14808, glResetMinmax, glResetMinmax, NULL, _gloffset_ResetMinmax),
-    NAME_FUNC_OFFSET(14825, glTexImage3D, glTexImage3D, NULL, _gloffset_TexImage3D),
-    NAME_FUNC_OFFSET(14841, glTexSubImage3D, glTexSubImage3D, NULL, _gloffset_TexSubImage3D),
-    NAME_FUNC_OFFSET(14860, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, _gloffset_CopyTexSubImage3D),
-    NAME_FUNC_OFFSET(14883, glActiveTextureARB, glActiveTextureARB, NULL, _gloffset_ActiveTextureARB),
-    NAME_FUNC_OFFSET(14899, glClientActiveTextureARB, glClientActiveTextureARB, NULL, _gloffset_ClientActiveTextureARB),
-    NAME_FUNC_OFFSET(14921, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL, _gloffset_MultiTexCoord1dARB),
-    NAME_FUNC_OFFSET(14939, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL, _gloffset_MultiTexCoord1dvARB),
-    NAME_FUNC_OFFSET(14958, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, _gloffset_MultiTexCoord1fARB),
-    NAME_FUNC_OFFSET(14976, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, _gloffset_MultiTexCoord1fvARB),
-    NAME_FUNC_OFFSET(14995, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL, _gloffset_MultiTexCoord1iARB),
-    NAME_FUNC_OFFSET(15013, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL, _gloffset_MultiTexCoord1ivARB),
-    NAME_FUNC_OFFSET(15032, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL, _gloffset_MultiTexCoord1sARB),
-    NAME_FUNC_OFFSET(15050, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL, _gloffset_MultiTexCoord1svARB),
-    NAME_FUNC_OFFSET(15069, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL, _gloffset_MultiTexCoord2dARB),
-    NAME_FUNC_OFFSET(15087, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL, _gloffset_MultiTexCoord2dvARB),
-    NAME_FUNC_OFFSET(15106, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, _gloffset_MultiTexCoord2fARB),
-    NAME_FUNC_OFFSET(15124, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, _gloffset_MultiTexCoord2fvARB),
-    NAME_FUNC_OFFSET(15143, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL, _gloffset_MultiTexCoord2iARB),
-    NAME_FUNC_OFFSET(15161, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL, _gloffset_MultiTexCoord2ivARB),
-    NAME_FUNC_OFFSET(15180, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL, _gloffset_MultiTexCoord2sARB),
-    NAME_FUNC_OFFSET(15198, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL, _gloffset_MultiTexCoord2svARB),
-    NAME_FUNC_OFFSET(15217, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL, _gloffset_MultiTexCoord3dARB),
-    NAME_FUNC_OFFSET(15235, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL, _gloffset_MultiTexCoord3dvARB),
-    NAME_FUNC_OFFSET(15254, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, _gloffset_MultiTexCoord3fARB),
-    NAME_FUNC_OFFSET(15272, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, _gloffset_MultiTexCoord3fvARB),
-    NAME_FUNC_OFFSET(15291, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL, _gloffset_MultiTexCoord3iARB),
-    NAME_FUNC_OFFSET(15309, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL, _gloffset_MultiTexCoord3ivARB),
-    NAME_FUNC_OFFSET(15328, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL, _gloffset_MultiTexCoord3sARB),
-    NAME_FUNC_OFFSET(15346, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL, _gloffset_MultiTexCoord3svARB),
-    NAME_FUNC_OFFSET(15365, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL, _gloffset_MultiTexCoord4dARB),
-    NAME_FUNC_OFFSET(15383, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL, _gloffset_MultiTexCoord4dvARB),
-    NAME_FUNC_OFFSET(15402, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, _gloffset_MultiTexCoord4fARB),
-    NAME_FUNC_OFFSET(15420, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, _gloffset_MultiTexCoord4fvARB),
-    NAME_FUNC_OFFSET(15439, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL, _gloffset_MultiTexCoord4iARB),
-    NAME_FUNC_OFFSET(15457, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL, _gloffset_MultiTexCoord4ivARB),
-    NAME_FUNC_OFFSET(15476, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL, _gloffset_MultiTexCoord4sARB),
-    NAME_FUNC_OFFSET(15494, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL, _gloffset_MultiTexCoord4svARB),
-    NAME_FUNC_OFFSET(15513, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, _gloffset_LoadTransposeMatrixdARB),
-    NAME_FUNC_OFFSET(15536, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, _gloffset_LoadTransposeMatrixfARB),
-    NAME_FUNC_OFFSET(15559, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, _gloffset_MultTransposeMatrixdARB),
-    NAME_FUNC_OFFSET(15582, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB, NULL, _gloffset_MultTransposeMatrixfARB),
-    NAME_FUNC_OFFSET(15605, glSampleCoverageARB, glSampleCoverageARB, NULL, _gloffset_SampleCoverageARB),
-    NAME_FUNC_OFFSET(15622, glCompressedTexImage1DARB, glCompressedTexImage1DARB, NULL, _gloffset_CompressedTexImage1DARB),
-    NAME_FUNC_OFFSET(15645, glCompressedTexImage2DARB, glCompressedTexImage2DARB, NULL, _gloffset_CompressedTexImage2DARB),
-    NAME_FUNC_OFFSET(15668, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, _gloffset_CompressedTexImage3DARB),
-    NAME_FUNC_OFFSET(15691, glCompressedTexSubImage1DARB, glCompressedTexSubImage1DARB, NULL, _gloffset_CompressedTexSubImage1DARB),
-    NAME_FUNC_OFFSET(15717, glCompressedTexSubImage2DARB, glCompressedTexSubImage2DARB, NULL, _gloffset_CompressedTexSubImage2DARB),
-    NAME_FUNC_OFFSET(15743, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, _gloffset_CompressedTexSubImage3DARB),
-    NAME_FUNC_OFFSET(15769, glGetCompressedTexImageARB, glGetCompressedTexImageARB, NULL, _gloffset_GetCompressedTexImageARB),
-    NAME_FUNC_OFFSET(15793, glDisableVertexAttribArrayARB, glDisableVertexAttribArrayARB, NULL, _gloffset_DisableVertexAttribArrayARB),
-    NAME_FUNC_OFFSET(15820, glEnableVertexAttribArrayARB, glEnableVertexAttribArrayARB, NULL, _gloffset_EnableVertexAttribArrayARB),
-    NAME_FUNC_OFFSET(15846, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL, _gloffset_GetVertexAttribdvARB),
-    NAME_FUNC_OFFSET(15866, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL, _gloffset_GetVertexAttribfvARB),
-    NAME_FUNC_OFFSET(15886, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL, _gloffset_GetVertexAttribivARB),
-    NAME_FUNC_OFFSET(15906, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, _gloffset_VertexAttrib1dARB),
-    NAME_FUNC_OFFSET(15923, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL, _gloffset_VertexAttrib1dvARB),
-    NAME_FUNC_OFFSET(15941, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, _gloffset_VertexAttrib1fARB),
-    NAME_FUNC_OFFSET(15958, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, _gloffset_VertexAttrib1fvARB),
-    NAME_FUNC_OFFSET(15976, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, _gloffset_VertexAttrib1sARB),
-    NAME_FUNC_OFFSET(15993, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL, _gloffset_VertexAttrib1svARB),
-    NAME_FUNC_OFFSET(16011, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, _gloffset_VertexAttrib2dARB),
-    NAME_FUNC_OFFSET(16028, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL, _gloffset_VertexAttrib2dvARB),
-    NAME_FUNC_OFFSET(16046, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, _gloffset_VertexAttrib2fARB),
-    NAME_FUNC_OFFSET(16063, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, _gloffset_VertexAttrib2fvARB),
-    NAME_FUNC_OFFSET(16081, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, _gloffset_VertexAttrib2sARB),
-    NAME_FUNC_OFFSET(16098, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL, _gloffset_VertexAttrib2svARB),
-    NAME_FUNC_OFFSET(16116, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, _gloffset_VertexAttrib3dARB),
-    NAME_FUNC_OFFSET(16133, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL, _gloffset_VertexAttrib3dvARB),
-    NAME_FUNC_OFFSET(16151, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, _gloffset_VertexAttrib3fARB),
-    NAME_FUNC_OFFSET(16168, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, _gloffset_VertexAttrib3fvARB),
-    NAME_FUNC_OFFSET(16186, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, _gloffset_VertexAttrib3sARB),
-    NAME_FUNC_OFFSET(16203, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL, _gloffset_VertexAttrib3svARB),
-    NAME_FUNC_OFFSET(16221, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL, _gloffset_VertexAttrib4NbvARB),
-    NAME_FUNC_OFFSET(16240, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL, _gloffset_VertexAttrib4NivARB),
-    NAME_FUNC_OFFSET(16259, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL, _gloffset_VertexAttrib4NsvARB),
-    NAME_FUNC_OFFSET(16278, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL, _gloffset_VertexAttrib4NubARB),
-    NAME_FUNC_OFFSET(16297, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, _gloffset_VertexAttrib4NubvARB),
-    NAME_FUNC_OFFSET(16317, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, _gloffset_VertexAttrib4NuivARB),
-    NAME_FUNC_OFFSET(16337, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, _gloffset_VertexAttrib4NusvARB),
-    NAME_FUNC_OFFSET(16357, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, _gloffset_VertexAttrib4bvARB),
-    NAME_FUNC_OFFSET(16375, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, _gloffset_VertexAttrib4dARB),
-    NAME_FUNC_OFFSET(16392, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, _gloffset_VertexAttrib4dvARB),
-    NAME_FUNC_OFFSET(16410, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, _gloffset_VertexAttrib4fARB),
-    NAME_FUNC_OFFSET(16427, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, _gloffset_VertexAttrib4fvARB),
-    NAME_FUNC_OFFSET(16445, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, _gloffset_VertexAttrib4ivARB),
-    NAME_FUNC_OFFSET(16463, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, _gloffset_VertexAttrib4sARB),
-    NAME_FUNC_OFFSET(16480, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, _gloffset_VertexAttrib4svARB),
-    NAME_FUNC_OFFSET(16498, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, _gloffset_VertexAttrib4ubvARB),
-    NAME_FUNC_OFFSET(16517, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, _gloffset_VertexAttrib4uivARB),
-    NAME_FUNC_OFFSET(16536, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, _gloffset_VertexAttrib4usvARB),
-    NAME_FUNC_OFFSET(16555, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, _gloffset_VertexAttribPointerARB),
-    NAME_FUNC_OFFSET(16577, glBindBufferARB, glBindBufferARB, NULL, _gloffset_BindBufferARB),
-    NAME_FUNC_OFFSET(16590, glBufferDataARB, glBufferDataARB, NULL, _gloffset_BufferDataARB),
-    NAME_FUNC_OFFSET(16603, glBufferSubDataARB, glBufferSubDataARB, NULL, _gloffset_BufferSubDataARB),
-    NAME_FUNC_OFFSET(16619, glDeleteBuffersARB, glDeleteBuffersARB, NULL, _gloffset_DeleteBuffersARB),
-    NAME_FUNC_OFFSET(16635, glGenBuffersARB, glGenBuffersARB, NULL, _gloffset_GenBuffersARB),
-    NAME_FUNC_OFFSET(16648, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, _gloffset_GetBufferParameterivARB),
-    NAME_FUNC_OFFSET(16671, glGetBufferPointervARB, glGetBufferPointervARB, NULL, _gloffset_GetBufferPointervARB),
-    NAME_FUNC_OFFSET(16691, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, _gloffset_GetBufferSubDataARB),
-    NAME_FUNC_OFFSET(16710, glIsBufferARB, glIsBufferARB, NULL, _gloffset_IsBufferARB),
-    NAME_FUNC_OFFSET(16721, glMapBufferARB, glMapBufferARB, NULL, _gloffset_MapBufferARB),
-    NAME_FUNC_OFFSET(16733, glUnmapBufferARB, glUnmapBufferARB, NULL, _gloffset_UnmapBufferARB),
-    NAME_FUNC_OFFSET(16747, glBeginQueryARB, glBeginQueryARB, NULL, _gloffset_BeginQueryARB),
-    NAME_FUNC_OFFSET(16760, glDeleteQueriesARB, glDeleteQueriesARB, NULL, _gloffset_DeleteQueriesARB),
-    NAME_FUNC_OFFSET(16776, glEndQueryARB, glEndQueryARB, NULL, _gloffset_EndQueryARB),
-    NAME_FUNC_OFFSET(16787, glGenQueriesARB, glGenQueriesARB, NULL, _gloffset_GenQueriesARB),
-    NAME_FUNC_OFFSET(16800, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, _gloffset_GetQueryObjectivARB),
-    NAME_FUNC_OFFSET(16819, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, _gloffset_GetQueryObjectuivARB),
-    NAME_FUNC_OFFSET(16839, glGetQueryivARB, glGetQueryivARB, NULL, _gloffset_GetQueryivARB),
-    NAME_FUNC_OFFSET(16852, glIsQueryARB, glIsQueryARB, NULL, _gloffset_IsQueryARB),
-    NAME_FUNC_OFFSET(16862, glCompileShaderARB, glCompileShaderARB, NULL, _gloffset_CompileShaderARB),
-    NAME_FUNC_OFFSET(16878, glGetActiveUniformARB, glGetActiveUniformARB, NULL, _gloffset_GetActiveUniformARB),
-    NAME_FUNC_OFFSET(16897, glGetShaderSourceARB, glGetShaderSourceARB, NULL, _gloffset_GetShaderSourceARB),
-    NAME_FUNC_OFFSET(16915, glGetUniformLocationARB, glGetUniformLocationARB, NULL, _gloffset_GetUniformLocationARB),
-    NAME_FUNC_OFFSET(16936, glGetUniformfvARB, glGetUniformfvARB, NULL, _gloffset_GetUniformfvARB),
-    NAME_FUNC_OFFSET(16951, glGetUniformivARB, glGetUniformivARB, NULL, _gloffset_GetUniformivARB),
-    NAME_FUNC_OFFSET(16966, glLinkProgramARB, glLinkProgramARB, NULL, _gloffset_LinkProgramARB),
-    NAME_FUNC_OFFSET(16980, glShaderSourceARB, glShaderSourceARB, NULL, _gloffset_ShaderSourceARB),
-    NAME_FUNC_OFFSET(16995, glUniform1fARB, glUniform1fARB, NULL, _gloffset_Uniform1fARB),
-    NAME_FUNC_OFFSET(17007, glUniform1fvARB, glUniform1fvARB, NULL, _gloffset_Uniform1fvARB),
-    NAME_FUNC_OFFSET(17020, glUniform1iARB, glUniform1iARB, NULL, _gloffset_Uniform1iARB),
-    NAME_FUNC_OFFSET(17032, glUniform1ivARB, glUniform1ivARB, NULL, _gloffset_Uniform1ivARB),
-    NAME_FUNC_OFFSET(17045, glUniform2fARB, glUniform2fARB, NULL, _gloffset_Uniform2fARB),
-    NAME_FUNC_OFFSET(17057, glUniform2fvARB, glUniform2fvARB, NULL, _gloffset_Uniform2fvARB),
-    NAME_FUNC_OFFSET(17070, glUniform2iARB, glUniform2iARB, NULL, _gloffset_Uniform2iARB),
-    NAME_FUNC_OFFSET(17082, glUniform2ivARB, glUniform2ivARB, NULL, _gloffset_Uniform2ivARB),
-    NAME_FUNC_OFFSET(17095, glUniform3fARB, glUniform3fARB, NULL, _gloffset_Uniform3fARB),
-    NAME_FUNC_OFFSET(17107, glUniform3fvARB, glUniform3fvARB, NULL, _gloffset_Uniform3fvARB),
-    NAME_FUNC_OFFSET(17120, glUniform3iARB, glUniform3iARB, NULL, _gloffset_Uniform3iARB),
-    NAME_FUNC_OFFSET(17132, glUniform3ivARB, glUniform3ivARB, NULL, _gloffset_Uniform3ivARB),
-    NAME_FUNC_OFFSET(17145, glUniform4fARB, glUniform4fARB, NULL, _gloffset_Uniform4fARB),
-    NAME_FUNC_OFFSET(17157, glUniform4fvARB, glUniform4fvARB, NULL, _gloffset_Uniform4fvARB),
-    NAME_FUNC_OFFSET(17170, glUniform4iARB, glUniform4iARB, NULL, _gloffset_Uniform4iARB),
-    NAME_FUNC_OFFSET(17182, glUniform4ivARB, glUniform4ivARB, NULL, _gloffset_Uniform4ivARB),
-    NAME_FUNC_OFFSET(17195, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, _gloffset_UniformMatrix2fvARB),
-    NAME_FUNC_OFFSET(17214, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, _gloffset_UniformMatrix3fvARB),
-    NAME_FUNC_OFFSET(17233, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, _gloffset_UniformMatrix4fvARB),
-    NAME_FUNC_OFFSET(17252, glUseProgramObjectARB, glUseProgramObjectARB, NULL, _gloffset_UseProgramObjectARB),
-    NAME_FUNC_OFFSET(17265, glValidateProgramARB, glValidateProgramARB, NULL, _gloffset_ValidateProgramARB),
-    NAME_FUNC_OFFSET(17283, glBindAttribLocationARB, glBindAttribLocationARB, NULL, _gloffset_BindAttribLocationARB),
-    NAME_FUNC_OFFSET(17304, glGetActiveAttribARB, glGetActiveAttribARB, NULL, _gloffset_GetActiveAttribARB),
-    NAME_FUNC_OFFSET(17322, glGetAttribLocationARB, glGetAttribLocationARB, NULL, _gloffset_GetAttribLocationARB),
-    NAME_FUNC_OFFSET(17342, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
-    NAME_FUNC_OFFSET(17356, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
-    NAME_FUNC_OFFSET(17373, gl_dispatch_stub_568, gl_dispatch_stub_568, NULL, _gloffset_SampleMaskSGIS),
-    NAME_FUNC_OFFSET(17389, gl_dispatch_stub_569, gl_dispatch_stub_569, NULL, _gloffset_SamplePatternSGIS),
-    NAME_FUNC_OFFSET(17408, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(17426, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(17447, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(17469, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(17488, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(17510, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(17533, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
-    NAME_FUNC_OFFSET(17552, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
-    NAME_FUNC_OFFSET(17572, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
-    NAME_FUNC_OFFSET(17591, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
-    NAME_FUNC_OFFSET(17611, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
-    NAME_FUNC_OFFSET(17630, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
-    NAME_FUNC_OFFSET(17650, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
-    NAME_FUNC_OFFSET(17669, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
-    NAME_FUNC_OFFSET(17689, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
-    NAME_FUNC_OFFSET(17708, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
-    NAME_FUNC_OFFSET(17728, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
-    NAME_FUNC_OFFSET(17748, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
-    NAME_FUNC_OFFSET(17769, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
-    NAME_FUNC_OFFSET(17789, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
-    NAME_FUNC_OFFSET(17810, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
-    NAME_FUNC_OFFSET(17830, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
-    NAME_FUNC_OFFSET(17851, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
-    NAME_FUNC_OFFSET(17875, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
-    NAME_FUNC_OFFSET(17893, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
-    NAME_FUNC_OFFSET(17913, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
-    NAME_FUNC_OFFSET(17931, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
-    NAME_FUNC_OFFSET(17943, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
-    NAME_FUNC_OFFSET(17956, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
-    NAME_FUNC_OFFSET(17968, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
-    NAME_FUNC_OFFSET(17981, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
-    NAME_FUNC_OFFSET(18001, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
-    NAME_FUNC_OFFSET(18025, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
-    NAME_FUNC_OFFSET(18039, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
-    NAME_FUNC_OFFSET(18056, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
-    NAME_FUNC_OFFSET(18071, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
-    NAME_FUNC_OFFSET(18089, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
-    NAME_FUNC_OFFSET(18103, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
-    NAME_FUNC_OFFSET(18120, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
-    NAME_FUNC_OFFSET(18135, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
-    NAME_FUNC_OFFSET(18153, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
-    NAME_FUNC_OFFSET(18167, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
-    NAME_FUNC_OFFSET(18184, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
-    NAME_FUNC_OFFSET(18199, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
-    NAME_FUNC_OFFSET(18217, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
-    NAME_FUNC_OFFSET(18231, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
-    NAME_FUNC_OFFSET(18248, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
-    NAME_FUNC_OFFSET(18263, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
-    NAME_FUNC_OFFSET(18281, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
-    NAME_FUNC_OFFSET(18295, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
-    NAME_FUNC_OFFSET(18312, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
-    NAME_FUNC_OFFSET(18327, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
-    NAME_FUNC_OFFSET(18345, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
-    NAME_FUNC_OFFSET(18359, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
-    NAME_FUNC_OFFSET(18376, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
-    NAME_FUNC_OFFSET(18391, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
-    NAME_FUNC_OFFSET(18409, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
-    NAME_FUNC_OFFSET(18423, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
-    NAME_FUNC_OFFSET(18440, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
-    NAME_FUNC_OFFSET(18455, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
-    NAME_FUNC_OFFSET(18473, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
-    NAME_FUNC_OFFSET(18487, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
-    NAME_FUNC_OFFSET(18504, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
-    NAME_FUNC_OFFSET(18519, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
-    NAME_FUNC_OFFSET(18537, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
-    NAME_FUNC_OFFSET(18554, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
-    NAME_FUNC_OFFSET(18574, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
-    NAME_FUNC_OFFSET(18591, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
-    NAME_FUNC_OFFSET(18617, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
-    NAME_FUNC_OFFSET(18646, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
-    NAME_FUNC_OFFSET(18661, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
-    NAME_FUNC_OFFSET(18679, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
-    NAME_FUNC_OFFSET(18698, gl_dispatch_stub_749, gl_dispatch_stub_749, NULL, _gloffset_BlendEquationSeparateEXT),
-    NAME_FUNC_OFFSET(18722, gl_dispatch_stub_749, gl_dispatch_stub_749, NULL, _gloffset_BlendEquationSeparateEXT),
+    NAME_FUNC_OFFSET(13499, gl_dispatch_stub_769, gl_dispatch_stub_769, NULL, _gloffset_StencilFuncSeparateATI),
+    NAME_FUNC_OFFSET(13524, gl_dispatch_stub_770, gl_dispatch_stub_770, NULL, _gloffset_StencilOpSeparateATI),
+    NAME_FUNC_OFFSET(13547, gl_dispatch_stub_771, gl_dispatch_stub_771, NULL, _gloffset_ProgramEnvParameters4fvEXT),
+    NAME_FUNC_OFFSET(13576, gl_dispatch_stub_772, gl_dispatch_stub_772, NULL, _gloffset_ProgramLocalParameters4fvEXT),
+    NAME_FUNC_OFFSET(13607, gl_dispatch_stub_773, gl_dispatch_stub_773, NULL, _gloffset_GetQueryObjecti64vEXT),
+    NAME_FUNC_OFFSET(13631, gl_dispatch_stub_774, gl_dispatch_stub_774, NULL, _gloffset_GetQueryObjectui64vEXT),
+    NAME_FUNC_OFFSET(13656, glArrayElement, glArrayElement, NULL, _gloffset_ArrayElement),
+    NAME_FUNC_OFFSET(13674, glBindTexture, glBindTexture, NULL, _gloffset_BindTexture),
+    NAME_FUNC_OFFSET(13691, glDrawArrays, glDrawArrays, NULL, _gloffset_DrawArrays),
+    NAME_FUNC_OFFSET(13707, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, _gloffset_AreTexturesResident),
+    NAME_FUNC_OFFSET(13732, glCopyTexImage1D, glCopyTexImage1D, NULL, _gloffset_CopyTexImage1D),
+    NAME_FUNC_OFFSET(13752, glCopyTexImage2D, glCopyTexImage2D, NULL, _gloffset_CopyTexImage2D),
+    NAME_FUNC_OFFSET(13772, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, _gloffset_CopyTexSubImage1D),
+    NAME_FUNC_OFFSET(13795, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, _gloffset_CopyTexSubImage2D),
+    NAME_FUNC_OFFSET(13818, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, _gloffset_DeleteTextures),
+    NAME_FUNC_OFFSET(13838, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, _gloffset_GenTextures),
+    NAME_FUNC_OFFSET(13855, glGetPointerv, glGetPointerv, NULL, _gloffset_GetPointerv),
+    NAME_FUNC_OFFSET(13872, glIsTexture, glIsTextureEXT, glIsTextureEXT, _gloffset_IsTexture),
+    NAME_FUNC_OFFSET(13887, glPrioritizeTextures, glPrioritizeTextures, NULL, _gloffset_PrioritizeTextures),
+    NAME_FUNC_OFFSET(13911, glTexSubImage1D, glTexSubImage1D, NULL, _gloffset_TexSubImage1D),
+    NAME_FUNC_OFFSET(13930, glTexSubImage2D, glTexSubImage2D, NULL, _gloffset_TexSubImage2D),
+    NAME_FUNC_OFFSET(13949, glBlendColor, glBlendColor, NULL, _gloffset_BlendColor),
+    NAME_FUNC_OFFSET(13965, glBlendEquation, glBlendEquation, NULL, _gloffset_BlendEquation),
+    NAME_FUNC_OFFSET(13984, glDrawRangeElements, glDrawRangeElements, NULL, _gloffset_DrawRangeElements),
+    NAME_FUNC_OFFSET(14007, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
+    NAME_FUNC_OFFSET(14023, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
+    NAME_FUNC_OFFSET(14039, glColorTableParameterfv, glColorTableParameterfv, NULL, _gloffset_ColorTableParameterfv),
+    NAME_FUNC_OFFSET(14066, glColorTableParameteriv, glColorTableParameteriv, NULL, _gloffset_ColorTableParameteriv),
+    NAME_FUNC_OFFSET(14093, glCopyColorTable, glCopyColorTable, NULL, _gloffset_CopyColorTable),
+    NAME_FUNC_OFFSET(14113, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
+    NAME_FUNC_OFFSET(14132, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
+    NAME_FUNC_OFFSET(14151, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
+    NAME_FUNC_OFFSET(14181, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
+    NAME_FUNC_OFFSET(14211, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
+    NAME_FUNC_OFFSET(14241, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
+    NAME_FUNC_OFFSET(14271, glColorSubTable, glColorSubTable, NULL, _gloffset_ColorSubTable),
+    NAME_FUNC_OFFSET(14290, glCopyColorSubTable, glCopyColorSubTable, NULL, _gloffset_CopyColorSubTable),
+    NAME_FUNC_OFFSET(14313, glConvolutionFilter1D, glConvolutionFilter1D, NULL, _gloffset_ConvolutionFilter1D),
+    NAME_FUNC_OFFSET(14338, glConvolutionFilter2D, glConvolutionFilter2D, NULL, _gloffset_ConvolutionFilter2D),
+    NAME_FUNC_OFFSET(14363, glConvolutionParameterf, glConvolutionParameterf, NULL, _gloffset_ConvolutionParameterf),
+    NAME_FUNC_OFFSET(14390, glConvolutionParameterfv, glConvolutionParameterfv, NULL, _gloffset_ConvolutionParameterfv),
+    NAME_FUNC_OFFSET(14418, glConvolutionParameteri, glConvolutionParameteri, NULL, _gloffset_ConvolutionParameteri),
+    NAME_FUNC_OFFSET(14445, glConvolutionParameteriv, glConvolutionParameteriv, NULL, _gloffset_ConvolutionParameteriv),
+    NAME_FUNC_OFFSET(14473, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, _gloffset_CopyConvolutionFilter1D),
+    NAME_FUNC_OFFSET(14502, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, _gloffset_CopyConvolutionFilter2D),
+    NAME_FUNC_OFFSET(14531, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, _gloffset_GetConvolutionFilter),
+    NAME_FUNC_OFFSET(14557, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, _gloffset_GetConvolutionParameterfv),
+    NAME_FUNC_OFFSET(14588, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, _gloffset_GetConvolutionParameteriv),
+    NAME_FUNC_OFFSET(14619, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, _gloffset_GetSeparableFilter),
+    NAME_FUNC_OFFSET(14643, glSeparableFilter2D, glSeparableFilter2D, NULL, _gloffset_SeparableFilter2D),
+    NAME_FUNC_OFFSET(14666, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, _gloffset_GetHistogram),
+    NAME_FUNC_OFFSET(14684, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, _gloffset_GetHistogramParameterfv),
+    NAME_FUNC_OFFSET(14713, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, _gloffset_GetHistogramParameteriv),
+    NAME_FUNC_OFFSET(14742, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, _gloffset_GetMinmax),
+    NAME_FUNC_OFFSET(14757, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, _gloffset_GetMinmaxParameterfv),
+    NAME_FUNC_OFFSET(14783, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, _gloffset_GetMinmaxParameteriv),
+    NAME_FUNC_OFFSET(14809, glHistogram, glHistogram, NULL, _gloffset_Histogram),
+    NAME_FUNC_OFFSET(14824, glMinmax, glMinmax, NULL, _gloffset_Minmax),
+    NAME_FUNC_OFFSET(14836, glResetHistogram, glResetHistogram, NULL, _gloffset_ResetHistogram),
+    NAME_FUNC_OFFSET(14856, glResetMinmax, glResetMinmax, NULL, _gloffset_ResetMinmax),
+    NAME_FUNC_OFFSET(14873, glTexImage3D, glTexImage3D, NULL, _gloffset_TexImage3D),
+    NAME_FUNC_OFFSET(14889, glTexSubImage3D, glTexSubImage3D, NULL, _gloffset_TexSubImage3D),
+    NAME_FUNC_OFFSET(14908, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, _gloffset_CopyTexSubImage3D),
+    NAME_FUNC_OFFSET(14931, glActiveTextureARB, glActiveTextureARB, NULL, _gloffset_ActiveTextureARB),
+    NAME_FUNC_OFFSET(14947, glClientActiveTextureARB, glClientActiveTextureARB, NULL, _gloffset_ClientActiveTextureARB),
+    NAME_FUNC_OFFSET(14969, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL, _gloffset_MultiTexCoord1dARB),
+    NAME_FUNC_OFFSET(14987, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL, _gloffset_MultiTexCoord1dvARB),
+    NAME_FUNC_OFFSET(15006, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, _gloffset_MultiTexCoord1fARB),
+    NAME_FUNC_OFFSET(15024, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, _gloffset_MultiTexCoord1fvARB),
+    NAME_FUNC_OFFSET(15043, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL, _gloffset_MultiTexCoord1iARB),
+    NAME_FUNC_OFFSET(15061, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL, _gloffset_MultiTexCoord1ivARB),
+    NAME_FUNC_OFFSET(15080, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL, _gloffset_MultiTexCoord1sARB),
+    NAME_FUNC_OFFSET(15098, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL, _gloffset_MultiTexCoord1svARB),
+    NAME_FUNC_OFFSET(15117, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL, _gloffset_MultiTexCoord2dARB),
+    NAME_FUNC_OFFSET(15135, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL, _gloffset_MultiTexCoord2dvARB),
+    NAME_FUNC_OFFSET(15154, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, _gloffset_MultiTexCoord2fARB),
+    NAME_FUNC_OFFSET(15172, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, _gloffset_MultiTexCoord2fvARB),
+    NAME_FUNC_OFFSET(15191, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL, _gloffset_MultiTexCoord2iARB),
+    NAME_FUNC_OFFSET(15209, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL, _gloffset_MultiTexCoord2ivARB),
+    NAME_FUNC_OFFSET(15228, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL, _gloffset_MultiTexCoord2sARB),
+    NAME_FUNC_OFFSET(15246, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL, _gloffset_MultiTexCoord2svARB),
+    NAME_FUNC_OFFSET(15265, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL, _gloffset_MultiTexCoord3dARB),
+    NAME_FUNC_OFFSET(15283, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL, _gloffset_MultiTexCoord3dvARB),
+    NAME_FUNC_OFFSET(15302, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, _gloffset_MultiTexCoord3fARB),
+    NAME_FUNC_OFFSET(15320, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, _gloffset_MultiTexCoord3fvARB),
+    NAME_FUNC_OFFSET(15339, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL, _gloffset_MultiTexCoord3iARB),
+    NAME_FUNC_OFFSET(15357, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL, _gloffset_MultiTexCoord3ivARB),
+    NAME_FUNC_OFFSET(15376, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL, _gloffset_MultiTexCoord3sARB),
+    NAME_FUNC_OFFSET(15394, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL, _gloffset_MultiTexCoord3svARB),
+    NAME_FUNC_OFFSET(15413, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL, _gloffset_MultiTexCoord4dARB),
+    NAME_FUNC_OFFSET(15431, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL, _gloffset_MultiTexCoord4dvARB),
+    NAME_FUNC_OFFSET(15450, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, _gloffset_MultiTexCoord4fARB),
+    NAME_FUNC_OFFSET(15468, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, _gloffset_MultiTexCoord4fvARB),
+    NAME_FUNC_OFFSET(15487, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL, _gloffset_MultiTexCoord4iARB),
+    NAME_FUNC_OFFSET(15505, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL, _gloffset_MultiTexCoord4ivARB),
+    NAME_FUNC_OFFSET(15524, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL, _gloffset_MultiTexCoord4sARB),
+    NAME_FUNC_OFFSET(15542, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL, _gloffset_MultiTexCoord4svARB),
+    NAME_FUNC_OFFSET(15561, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, _gloffset_LoadTransposeMatrixdARB),
+    NAME_FUNC_OFFSET(15584, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, _gloffset_LoadTransposeMatrixfARB),
+    NAME_FUNC_OFFSET(15607, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, _gloffset_MultTransposeMatrixdARB),
+    NAME_FUNC_OFFSET(15630, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB, NULL, _gloffset_MultTransposeMatrixfARB),
+    NAME_FUNC_OFFSET(15653, glSampleCoverageARB, glSampleCoverageARB, NULL, _gloffset_SampleCoverageARB),
+    NAME_FUNC_OFFSET(15670, glCompressedTexImage1DARB, glCompressedTexImage1DARB, NULL, _gloffset_CompressedTexImage1DARB),
+    NAME_FUNC_OFFSET(15693, glCompressedTexImage2DARB, glCompressedTexImage2DARB, NULL, _gloffset_CompressedTexImage2DARB),
+    NAME_FUNC_OFFSET(15716, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, _gloffset_CompressedTexImage3DARB),
+    NAME_FUNC_OFFSET(15739, glCompressedTexSubImage1DARB, glCompressedTexSubImage1DARB, NULL, _gloffset_CompressedTexSubImage1DARB),
+    NAME_FUNC_OFFSET(15765, glCompressedTexSubImage2DARB, glCompressedTexSubImage2DARB, NULL, _gloffset_CompressedTexSubImage2DARB),
+    NAME_FUNC_OFFSET(15791, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, _gloffset_CompressedTexSubImage3DARB),
+    NAME_FUNC_OFFSET(15817, glGetCompressedTexImageARB, glGetCompressedTexImageARB, NULL, _gloffset_GetCompressedTexImageARB),
+    NAME_FUNC_OFFSET(15841, glDisableVertexAttribArrayARB, glDisableVertexAttribArrayARB, NULL, _gloffset_DisableVertexAttribArrayARB),
+    NAME_FUNC_OFFSET(15868, glEnableVertexAttribArrayARB, glEnableVertexAttribArrayARB, NULL, _gloffset_EnableVertexAttribArrayARB),
+    NAME_FUNC_OFFSET(15894, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL, _gloffset_GetVertexAttribdvARB),
+    NAME_FUNC_OFFSET(15914, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL, _gloffset_GetVertexAttribfvARB),
+    NAME_FUNC_OFFSET(15934, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL, _gloffset_GetVertexAttribivARB),
+    NAME_FUNC_OFFSET(15954, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, _gloffset_VertexAttrib1dARB),
+    NAME_FUNC_OFFSET(15971, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL, _gloffset_VertexAttrib1dvARB),
+    NAME_FUNC_OFFSET(15989, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, _gloffset_VertexAttrib1fARB),
+    NAME_FUNC_OFFSET(16006, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, _gloffset_VertexAttrib1fvARB),
+    NAME_FUNC_OFFSET(16024, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, _gloffset_VertexAttrib1sARB),
+    NAME_FUNC_OFFSET(16041, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL, _gloffset_VertexAttrib1svARB),
+    NAME_FUNC_OFFSET(16059, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, _gloffset_VertexAttrib2dARB),
+    NAME_FUNC_OFFSET(16076, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL, _gloffset_VertexAttrib2dvARB),
+    NAME_FUNC_OFFSET(16094, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, _gloffset_VertexAttrib2fARB),
+    NAME_FUNC_OFFSET(16111, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, _gloffset_VertexAttrib2fvARB),
+    NAME_FUNC_OFFSET(16129, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, _gloffset_VertexAttrib2sARB),
+    NAME_FUNC_OFFSET(16146, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL, _gloffset_VertexAttrib2svARB),
+    NAME_FUNC_OFFSET(16164, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, _gloffset_VertexAttrib3dARB),
+    NAME_FUNC_OFFSET(16181, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL, _gloffset_VertexAttrib3dvARB),
+    NAME_FUNC_OFFSET(16199, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, _gloffset_VertexAttrib3fARB),
+    NAME_FUNC_OFFSET(16216, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, _gloffset_VertexAttrib3fvARB),
+    NAME_FUNC_OFFSET(16234, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, _gloffset_VertexAttrib3sARB),
+    NAME_FUNC_OFFSET(16251, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL, _gloffset_VertexAttrib3svARB),
+    NAME_FUNC_OFFSET(16269, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL, _gloffset_VertexAttrib4NbvARB),
+    NAME_FUNC_OFFSET(16288, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL, _gloffset_VertexAttrib4NivARB),
+    NAME_FUNC_OFFSET(16307, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL, _gloffset_VertexAttrib4NsvARB),
+    NAME_FUNC_OFFSET(16326, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL, _gloffset_VertexAttrib4NubARB),
+    NAME_FUNC_OFFSET(16345, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, _gloffset_VertexAttrib4NubvARB),
+    NAME_FUNC_OFFSET(16365, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, _gloffset_VertexAttrib4NuivARB),
+    NAME_FUNC_OFFSET(16385, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, _gloffset_VertexAttrib4NusvARB),
+    NAME_FUNC_OFFSET(16405, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, _gloffset_VertexAttrib4bvARB),
+    NAME_FUNC_OFFSET(16423, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, _gloffset_VertexAttrib4dARB),
+    NAME_FUNC_OFFSET(16440, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, _gloffset_VertexAttrib4dvARB),
+    NAME_FUNC_OFFSET(16458, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, _gloffset_VertexAttrib4fARB),
+    NAME_FUNC_OFFSET(16475, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, _gloffset_VertexAttrib4fvARB),
+    NAME_FUNC_OFFSET(16493, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, _gloffset_VertexAttrib4ivARB),
+    NAME_FUNC_OFFSET(16511, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, _gloffset_VertexAttrib4sARB),
+    NAME_FUNC_OFFSET(16528, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, _gloffset_VertexAttrib4svARB),
+    NAME_FUNC_OFFSET(16546, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, _gloffset_VertexAttrib4ubvARB),
+    NAME_FUNC_OFFSET(16565, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, _gloffset_VertexAttrib4uivARB),
+    NAME_FUNC_OFFSET(16584, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, _gloffset_VertexAttrib4usvARB),
+    NAME_FUNC_OFFSET(16603, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, _gloffset_VertexAttribPointerARB),
+    NAME_FUNC_OFFSET(16625, glBindBufferARB, glBindBufferARB, NULL, _gloffset_BindBufferARB),
+    NAME_FUNC_OFFSET(16638, glBufferDataARB, glBufferDataARB, NULL, _gloffset_BufferDataARB),
+    NAME_FUNC_OFFSET(16651, glBufferSubDataARB, glBufferSubDataARB, NULL, _gloffset_BufferSubDataARB),
+    NAME_FUNC_OFFSET(16667, glDeleteBuffersARB, glDeleteBuffersARB, NULL, _gloffset_DeleteBuffersARB),
+    NAME_FUNC_OFFSET(16683, glGenBuffersARB, glGenBuffersARB, NULL, _gloffset_GenBuffersARB),
+    NAME_FUNC_OFFSET(16696, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, _gloffset_GetBufferParameterivARB),
+    NAME_FUNC_OFFSET(16719, glGetBufferPointervARB, glGetBufferPointervARB, NULL, _gloffset_GetBufferPointervARB),
+    NAME_FUNC_OFFSET(16739, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, _gloffset_GetBufferSubDataARB),
+    NAME_FUNC_OFFSET(16758, glIsBufferARB, glIsBufferARB, NULL, _gloffset_IsBufferARB),
+    NAME_FUNC_OFFSET(16769, glMapBufferARB, glMapBufferARB, NULL, _gloffset_MapBufferARB),
+    NAME_FUNC_OFFSET(16781, glUnmapBufferARB, glUnmapBufferARB, NULL, _gloffset_UnmapBufferARB),
+    NAME_FUNC_OFFSET(16795, glBeginQueryARB, glBeginQueryARB, NULL, _gloffset_BeginQueryARB),
+    NAME_FUNC_OFFSET(16808, glDeleteQueriesARB, glDeleteQueriesARB, NULL, _gloffset_DeleteQueriesARB),
+    NAME_FUNC_OFFSET(16824, glEndQueryARB, glEndQueryARB, NULL, _gloffset_EndQueryARB),
+    NAME_FUNC_OFFSET(16835, glGenQueriesARB, glGenQueriesARB, NULL, _gloffset_GenQueriesARB),
+    NAME_FUNC_OFFSET(16848, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, _gloffset_GetQueryObjectivARB),
+    NAME_FUNC_OFFSET(16867, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, _gloffset_GetQueryObjectuivARB),
+    NAME_FUNC_OFFSET(16887, glGetQueryivARB, glGetQueryivARB, NULL, _gloffset_GetQueryivARB),
+    NAME_FUNC_OFFSET(16900, glIsQueryARB, glIsQueryARB, NULL, _gloffset_IsQueryARB),
+    NAME_FUNC_OFFSET(16910, glCompileShaderARB, glCompileShaderARB, NULL, _gloffset_CompileShaderARB),
+    NAME_FUNC_OFFSET(16926, glGetActiveUniformARB, glGetActiveUniformARB, NULL, _gloffset_GetActiveUniformARB),
+    NAME_FUNC_OFFSET(16945, glGetShaderSourceARB, glGetShaderSourceARB, NULL, _gloffset_GetShaderSourceARB),
+    NAME_FUNC_OFFSET(16963, glGetUniformLocationARB, glGetUniformLocationARB, NULL, _gloffset_GetUniformLocationARB),
+    NAME_FUNC_OFFSET(16984, glGetUniformfvARB, glGetUniformfvARB, NULL, _gloffset_GetUniformfvARB),
+    NAME_FUNC_OFFSET(16999, glGetUniformivARB, glGetUniformivARB, NULL, _gloffset_GetUniformivARB),
+    NAME_FUNC_OFFSET(17014, glLinkProgramARB, glLinkProgramARB, NULL, _gloffset_LinkProgramARB),
+    NAME_FUNC_OFFSET(17028, glShaderSourceARB, glShaderSourceARB, NULL, _gloffset_ShaderSourceARB),
+    NAME_FUNC_OFFSET(17043, glUniform1fARB, glUniform1fARB, NULL, _gloffset_Uniform1fARB),
+    NAME_FUNC_OFFSET(17055, glUniform1fvARB, glUniform1fvARB, NULL, _gloffset_Uniform1fvARB),
+    NAME_FUNC_OFFSET(17068, glUniform1iARB, glUniform1iARB, NULL, _gloffset_Uniform1iARB),
+    NAME_FUNC_OFFSET(17080, glUniform1ivARB, glUniform1ivARB, NULL, _gloffset_Uniform1ivARB),
+    NAME_FUNC_OFFSET(17093, glUniform2fARB, glUniform2fARB, NULL, _gloffset_Uniform2fARB),
+    NAME_FUNC_OFFSET(17105, glUniform2fvARB, glUniform2fvARB, NULL, _gloffset_Uniform2fvARB),
+    NAME_FUNC_OFFSET(17118, glUniform2iARB, glUniform2iARB, NULL, _gloffset_Uniform2iARB),
+    NAME_FUNC_OFFSET(17130, glUniform2ivARB, glUniform2ivARB, NULL, _gloffset_Uniform2ivARB),
+    NAME_FUNC_OFFSET(17143, glUniform3fARB, glUniform3fARB, NULL, _gloffset_Uniform3fARB),
+    NAME_FUNC_OFFSET(17155, glUniform3fvARB, glUniform3fvARB, NULL, _gloffset_Uniform3fvARB),
+    NAME_FUNC_OFFSET(17168, glUniform3iARB, glUniform3iARB, NULL, _gloffset_Uniform3iARB),
+    NAME_FUNC_OFFSET(17180, glUniform3ivARB, glUniform3ivARB, NULL, _gloffset_Uniform3ivARB),
+    NAME_FUNC_OFFSET(17193, glUniform4fARB, glUniform4fARB, NULL, _gloffset_Uniform4fARB),
+    NAME_FUNC_OFFSET(17205, glUniform4fvARB, glUniform4fvARB, NULL, _gloffset_Uniform4fvARB),
+    NAME_FUNC_OFFSET(17218, glUniform4iARB, glUniform4iARB, NULL, _gloffset_Uniform4iARB),
+    NAME_FUNC_OFFSET(17230, glUniform4ivARB, glUniform4ivARB, NULL, _gloffset_Uniform4ivARB),
+    NAME_FUNC_OFFSET(17243, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, _gloffset_UniformMatrix2fvARB),
+    NAME_FUNC_OFFSET(17262, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, _gloffset_UniformMatrix3fvARB),
+    NAME_FUNC_OFFSET(17281, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, _gloffset_UniformMatrix4fvARB),
+    NAME_FUNC_OFFSET(17300, glUseProgramObjectARB, glUseProgramObjectARB, NULL, _gloffset_UseProgramObjectARB),
+    NAME_FUNC_OFFSET(17313, glValidateProgramARB, glValidateProgramARB, NULL, _gloffset_ValidateProgramARB),
+    NAME_FUNC_OFFSET(17331, glBindAttribLocationARB, glBindAttribLocationARB, NULL, _gloffset_BindAttribLocationARB),
+    NAME_FUNC_OFFSET(17352, glGetActiveAttribARB, glGetActiveAttribARB, NULL, _gloffset_GetActiveAttribARB),
+    NAME_FUNC_OFFSET(17370, glGetAttribLocationARB, glGetAttribLocationARB, NULL, _gloffset_GetAttribLocationARB),
+    NAME_FUNC_OFFSET(17390, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
+    NAME_FUNC_OFFSET(17404, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
+    NAME_FUNC_OFFSET(17421, gl_dispatch_stub_568, gl_dispatch_stub_568, NULL, _gloffset_SampleMaskSGIS),
+    NAME_FUNC_OFFSET(17437, gl_dispatch_stub_569, gl_dispatch_stub_569, NULL, _gloffset_SamplePatternSGIS),
+    NAME_FUNC_OFFSET(17456, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(17474, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(17495, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(17517, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(17536, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(17558, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(17581, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
+    NAME_FUNC_OFFSET(17600, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
+    NAME_FUNC_OFFSET(17620, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
+    NAME_FUNC_OFFSET(17639, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
+    NAME_FUNC_OFFSET(17659, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
+    NAME_FUNC_OFFSET(17678, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
+    NAME_FUNC_OFFSET(17698, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
+    NAME_FUNC_OFFSET(17717, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
+    NAME_FUNC_OFFSET(17737, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
+    NAME_FUNC_OFFSET(17756, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
+    NAME_FUNC_OFFSET(17776, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
+    NAME_FUNC_OFFSET(17796, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
+    NAME_FUNC_OFFSET(17817, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
+    NAME_FUNC_OFFSET(17837, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
+    NAME_FUNC_OFFSET(17858, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
+    NAME_FUNC_OFFSET(17878, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
+    NAME_FUNC_OFFSET(17899, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
+    NAME_FUNC_OFFSET(17923, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
+    NAME_FUNC_OFFSET(17941, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
+    NAME_FUNC_OFFSET(17961, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
+    NAME_FUNC_OFFSET(17979, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
+    NAME_FUNC_OFFSET(17991, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
+    NAME_FUNC_OFFSET(18004, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
+    NAME_FUNC_OFFSET(18016, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
+    NAME_FUNC_OFFSET(18029, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
+    NAME_FUNC_OFFSET(18049, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
+    NAME_FUNC_OFFSET(18073, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
+    NAME_FUNC_OFFSET(18087, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
+    NAME_FUNC_OFFSET(18104, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
+    NAME_FUNC_OFFSET(18119, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
+    NAME_FUNC_OFFSET(18137, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
+    NAME_FUNC_OFFSET(18151, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
+    NAME_FUNC_OFFSET(18168, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
+    NAME_FUNC_OFFSET(18183, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
+    NAME_FUNC_OFFSET(18201, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
+    NAME_FUNC_OFFSET(18215, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
+    NAME_FUNC_OFFSET(18232, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
+    NAME_FUNC_OFFSET(18247, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
+    NAME_FUNC_OFFSET(18265, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
+    NAME_FUNC_OFFSET(18279, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
+    NAME_FUNC_OFFSET(18296, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
+    NAME_FUNC_OFFSET(18311, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
+    NAME_FUNC_OFFSET(18329, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
+    NAME_FUNC_OFFSET(18343, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
+    NAME_FUNC_OFFSET(18360, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
+    NAME_FUNC_OFFSET(18375, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
+    NAME_FUNC_OFFSET(18393, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
+    NAME_FUNC_OFFSET(18407, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
+    NAME_FUNC_OFFSET(18424, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
+    NAME_FUNC_OFFSET(18439, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
+    NAME_FUNC_OFFSET(18457, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
+    NAME_FUNC_OFFSET(18471, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
+    NAME_FUNC_OFFSET(18488, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
+    NAME_FUNC_OFFSET(18503, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
+    NAME_FUNC_OFFSET(18521, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
+    NAME_FUNC_OFFSET(18535, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
+    NAME_FUNC_OFFSET(18552, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
+    NAME_FUNC_OFFSET(18567, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
+    NAME_FUNC_OFFSET(18585, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
+    NAME_FUNC_OFFSET(18602, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
+    NAME_FUNC_OFFSET(18622, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
+    NAME_FUNC_OFFSET(18639, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
+    NAME_FUNC_OFFSET(18665, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
+    NAME_FUNC_OFFSET(18694, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
+    NAME_FUNC_OFFSET(18709, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
+    NAME_FUNC_OFFSET(18727, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
+    NAME_FUNC_OFFSET(18746, gl_dispatch_stub_749, gl_dispatch_stub_749, NULL, _gloffset_BlendEquationSeparateEXT),
+    NAME_FUNC_OFFSET(18770, gl_dispatch_stub_749, gl_dispatch_stub_749, NULL, _gloffset_BlendEquationSeparateEXT),
     NAME_FUNC_OFFSET(-1, NULL, NULL, NULL, 0)
 };
 
diff --git a/src/mesa/main/enums.c b/src/mesa/main/enums.c
index d5019ae045..6aeb18fa27 100644
--- a/src/mesa/main/enums.c
+++ b/src/mesa/main/enums.c
@@ -1433,9 +1433,13 @@ LONGSTRING static const char enum_string_table[] =
    "GL_STENCIL\0"
    "GL_STENCIL_ATTACHMENT_EXT\0"
    "GL_STENCIL_BACK_FAIL\0"
+   "GL_STENCIL_BACK_FAIL_ATI\0"
    "GL_STENCIL_BACK_FUNC\0"
+   "GL_STENCIL_BACK_FUNC_ATI\0"
    "GL_STENCIL_BACK_PASS_DEPTH_FAIL\0"
+   "GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI\0"
    "GL_STENCIL_BACK_PASS_DEPTH_PASS\0"
+   "GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI\0"
    "GL_STENCIL_BACK_REF\0"
    "GL_STENCIL_BACK_VALUE_MASK\0"
    "GL_STENCIL_BACK_WRITEMASK\0"
@@ -1783,7 +1787,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_ZOOM_Y\0"
    ;
 
-static const enum_elt all_enums[1746] =
+static const enum_elt all_enums[1750] =
 {
    {     0, 0x00000600 }, /* GL_2D */
    {     6, 0x00001407 }, /* GL_2_BYTES */
@@ -3183,354 +3187,358 @@ static const enum_elt all_enums[1746] =
    { 29675, 0x00001802 }, /* GL_STENCIL */
    { 29686, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */
    { 29712, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */
-   { 29733, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
-   { 29754, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-   { 29786, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
-   { 29818, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
-   { 29838, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
-   { 29865, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
-   { 29891, 0x00000D57 }, /* GL_STENCIL_BITS */
-   { 29907, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
-   { 29929, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
-   { 29952, 0x00000B94 }, /* GL_STENCIL_FAIL */
-   { 29968, 0x00000B92 }, /* GL_STENCIL_FUNC */
-   { 29984, 0x00001901 }, /* GL_STENCIL_INDEX */
-   { 30001, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
-   { 30024, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
-   { 30046, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
-   { 30068, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
-   { 30090, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
-   { 30111, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
-   { 30138, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
-   { 30165, 0x00000B97 }, /* GL_STENCIL_REF */
-   { 30180, 0x00000B90 }, /* GL_STENCIL_TEST */
-   { 30196, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
-   { 30225, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
-   { 30247, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
-   { 30268, 0x00000C33 }, /* GL_STEREO */
-   { 30278, 0x000088E2 }, /* GL_STREAM_COPY */
-   { 30293, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
-   { 30312, 0x000088E0 }, /* GL_STREAM_DRAW */
-   { 30327, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
-   { 30346, 0x000088E1 }, /* GL_STREAM_READ */
-   { 30361, 0x000088E1 }, /* GL_STREAM_READ_ARB */
-   { 30380, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
-   { 30397, 0x000084E7 }, /* GL_SUBTRACT */
-   { 30409, 0x000084E7 }, /* GL_SUBTRACT_ARB */
-   { 30425, 0x00002001 }, /* GL_T */
-   { 30430, 0x00002A2A }, /* GL_T2F_C3F_V3F */
-   { 30445, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
-   { 30464, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
-   { 30480, 0x00002A2B }, /* GL_T2F_N3F_V3F */
-   { 30495, 0x00002A27 }, /* GL_T2F_V3F */
-   { 30506, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
-   { 30525, 0x00002A28 }, /* GL_T4F_V4F */
-   { 30536, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
-   { 30559, 0x00001702 }, /* GL_TEXTURE */
-   { 30570, 0x000084C0 }, /* GL_TEXTURE0 */
-   { 30582, 0x000084C0 }, /* GL_TEXTURE0_ARB */
-   { 30598, 0x000084C1 }, /* GL_TEXTURE1 */
-   { 30610, 0x000084CA }, /* GL_TEXTURE10 */
-   { 30623, 0x000084CA }, /* GL_TEXTURE10_ARB */
-   { 30640, 0x000084CB }, /* GL_TEXTURE11 */
-   { 30653, 0x000084CB }, /* GL_TEXTURE11_ARB */
-   { 30670, 0x000084CC }, /* GL_TEXTURE12 */
-   { 30683, 0x000084CC }, /* GL_TEXTURE12_ARB */
-   { 30700, 0x000084CD }, /* GL_TEXTURE13 */
-   { 30713, 0x000084CD }, /* GL_TEXTURE13_ARB */
-   { 30730, 0x000084CE }, /* GL_TEXTURE14 */
-   { 30743, 0x000084CE }, /* GL_TEXTURE14_ARB */
-   { 30760, 0x000084CF }, /* GL_TEXTURE15 */
-   { 30773, 0x000084CF }, /* GL_TEXTURE15_ARB */
-   { 30790, 0x000084D0 }, /* GL_TEXTURE16 */
-   { 30803, 0x000084D0 }, /* GL_TEXTURE16_ARB */
-   { 30820, 0x000084D1 }, /* GL_TEXTURE17 */
-   { 30833, 0x000084D1 }, /* GL_TEXTURE17_ARB */
-   { 30850, 0x000084D2 }, /* GL_TEXTURE18 */
-   { 30863, 0x000084D2 }, /* GL_TEXTURE18_ARB */
-   { 30880, 0x000084D3 }, /* GL_TEXTURE19 */
-   { 30893, 0x000084D3 }, /* GL_TEXTURE19_ARB */
-   { 30910, 0x000084C1 }, /* GL_TEXTURE1_ARB */
-   { 30926, 0x000084C2 }, /* GL_TEXTURE2 */
-   { 30938, 0x000084D4 }, /* GL_TEXTURE20 */
-   { 30951, 0x000084D4 }, /* GL_TEXTURE20_ARB */
-   { 30968, 0x000084D5 }, /* GL_TEXTURE21 */
-   { 30981, 0x000084D5 }, /* GL_TEXTURE21_ARB */
-   { 30998, 0x000084D6 }, /* GL_TEXTURE22 */
-   { 31011, 0x000084D6 }, /* GL_TEXTURE22_ARB */
-   { 31028, 0x000084D7 }, /* GL_TEXTURE23 */
-   { 31041, 0x000084D7 }, /* GL_TEXTURE23_ARB */
-   { 31058, 0x000084D8 }, /* GL_TEXTURE24 */
-   { 31071, 0x000084D8 }, /* GL_TEXTURE24_ARB */
-   { 31088, 0x000084D9 }, /* GL_TEXTURE25 */
-   { 31101, 0x000084D9 }, /* GL_TEXTURE25_ARB */
-   { 31118, 0x000084DA }, /* GL_TEXTURE26 */
-   { 31131, 0x000084DA }, /* GL_TEXTURE26_ARB */
-   { 31148, 0x000084DB }, /* GL_TEXTURE27 */
-   { 31161, 0x000084DB }, /* GL_TEXTURE27_ARB */
-   { 31178, 0x000084DC }, /* GL_TEXTURE28 */
-   { 31191, 0x000084DC }, /* GL_TEXTURE28_ARB */
-   { 31208, 0x000084DD }, /* GL_TEXTURE29 */
-   { 31221, 0x000084DD }, /* GL_TEXTURE29_ARB */
-   { 31238, 0x000084C2 }, /* GL_TEXTURE2_ARB */
-   { 31254, 0x000084C3 }, /* GL_TEXTURE3 */
-   { 31266, 0x000084DE }, /* GL_TEXTURE30 */
-   { 31279, 0x000084DE }, /* GL_TEXTURE30_ARB */
-   { 31296, 0x000084DF }, /* GL_TEXTURE31 */
-   { 31309, 0x000084DF }, /* GL_TEXTURE31_ARB */
-   { 31326, 0x000084C3 }, /* GL_TEXTURE3_ARB */
-   { 31342, 0x000084C4 }, /* GL_TEXTURE4 */
-   { 31354, 0x000084C4 }, /* GL_TEXTURE4_ARB */
-   { 31370, 0x000084C5 }, /* GL_TEXTURE5 */
-   { 31382, 0x000084C5 }, /* GL_TEXTURE5_ARB */
-   { 31398, 0x000084C6 }, /* GL_TEXTURE6 */
-   { 31410, 0x000084C6 }, /* GL_TEXTURE6_ARB */
-   { 31426, 0x000084C7 }, /* GL_TEXTURE7 */
-   { 31438, 0x000084C7 }, /* GL_TEXTURE7_ARB */
-   { 31454, 0x000084C8 }, /* GL_TEXTURE8 */
-   { 31466, 0x000084C8 }, /* GL_TEXTURE8_ARB */
-   { 31482, 0x000084C9 }, /* GL_TEXTURE9 */
-   { 31494, 0x000084C9 }, /* GL_TEXTURE9_ARB */
-   { 31510, 0x00000DE0 }, /* GL_TEXTURE_1D */
-   { 31524, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
-   { 31548, 0x00000DE1 }, /* GL_TEXTURE_2D */
-   { 31562, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
-   { 31586, 0x0000806F }, /* GL_TEXTURE_3D */
-   { 31600, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
-   { 31622, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
-   { 31648, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
-   { 31670, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
-   { 31692, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
-   { 31724, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
-   { 31746, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
-   { 31778, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
-   { 31800, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
-   { 31828, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
-   { 31860, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
-   { 31893, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
-   { 31925, 0x00040000 }, /* GL_TEXTURE_BIT */
-   { 31940, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
-   { 31961, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
-   { 31986, 0x00001005 }, /* GL_TEXTURE_BORDER */
-   { 32004, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
-   { 32028, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-   { 32059, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
-   { 32089, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-   { 32119, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-   { 32154, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-   { 32185, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-   { 32223, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
-   { 32250, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
-   { 32282, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
-   { 32316, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
-   { 32340, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
-   { 32368, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
-   { 32392, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
-   { 32420, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-   { 32453, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
-   { 32477, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
-   { 32499, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
-   { 32521, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
-   { 32547, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
-   { 32581, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-   { 32614, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
-   { 32651, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
-   { 32679, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
-   { 32711, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
-   { 32734, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
-   { 32772, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
-   { 32814, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
-   { 32845, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-   { 32873, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
-   { 32903, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-   { 32931, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
-   { 32951, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
-   { 32975, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-   { 33006, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
-   { 33041, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-   { 33072, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
-   { 33107, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
-   { 33138, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
-   { 33173, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-   { 33204, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
-   { 33239, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-   { 33270, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
-   { 33305, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-   { 33336, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
-   { 33371, 0x00008071 }, /* GL_TEXTURE_DEPTH */
-   { 33388, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
-   { 33410, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
-   { 33436, 0x00002300 }, /* GL_TEXTURE_ENV */
-   { 33451, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
-   { 33472, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
-   { 33492, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
-   { 33518, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
-   { 33538, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
-   { 33555, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
-   { 33572, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
-   { 33589, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
-   { 33606, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
-   { 33631, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
-   { 33653, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
-   { 33679, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
-   { 33697, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
-   { 33723, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
-   { 33749, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
-   { 33779, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
-   { 33806, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
-   { 33831, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
-   { 33851, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
-   { 33875, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
-   { 33902, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-   { 33929, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-   { 33956, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
-   { 33982, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
-   { 34012, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
-   { 34034, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
-   { 34052, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
-   { 34082, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
-   { 34110, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-   { 34138, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-   { 34166, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
-   { 34187, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
-   { 34206, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
-   { 34228, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
-   { 34247, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
-   { 34267, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
-   { 34292, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
-   { 34316, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
-   { 34336, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
-   { 34360, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
-   { 34380, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
-   { 34403, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
-   { 34428, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
-   { 34462, 0x00001000 }, /* GL_TEXTURE_WIDTH */
-   { 34479, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
-   { 34497, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
-   { 34515, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
-   { 34533, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
-   { 34553, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
-   { 34572, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-   { 34601, 0x00001000 }, /* GL_TRANSFORM_BIT */
-   { 34618, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
-   { 34644, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
-   { 34674, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-   { 34706, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-   { 34736, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
-   { 34770, 0x0000862C }, /* GL_TRANSPOSE_NV */
-   { 34786, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-   { 34817, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
-   { 34852, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-   { 34880, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
-   { 34912, 0x00000004 }, /* GL_TRIANGLES */
-   { 34925, 0x00000006 }, /* GL_TRIANGLE_FAN */
-   { 34941, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
-   { 34962, 0x00000005 }, /* GL_TRIANGLE_STRIP */
-   { 34980, 0x00000001 }, /* GL_TRUE */
-   { 34988, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
-   { 35008, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
-   { 35031, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
-   { 35051, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
-   { 35072, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
-   { 35094, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
-   { 35116, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
-   { 35136, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
-   { 35157, 0x00001401 }, /* GL_UNSIGNED_BYTE */
-   { 35174, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-   { 35201, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
-   { 35224, 0x00001405 }, /* GL_UNSIGNED_INT */
-   { 35240, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
-   { 35267, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
-   { 35291, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-   { 35322, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
-   { 35346, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-   { 35374, 0x00001403 }, /* GL_UNSIGNED_SHORT */
-   { 35392, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-   { 35422, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-   { 35448, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-   { 35478, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-   { 35504, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
-   { 35528, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-   { 35556, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-   { 35584, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
-   { 35611, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-   { 35643, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
-   { 35674, 0x00008CA2 }, /* GL_UPPER_LEFT */
-   { 35688, 0x00002A20 }, /* GL_V2F */
-   { 35695, 0x00002A21 }, /* GL_V3F */
-   { 35702, 0x00008B83 }, /* GL_VALIDATE_STATUS */
-   { 35721, 0x00001F00 }, /* GL_VENDOR */
-   { 35731, 0x00001F02 }, /* GL_VERSION */
-   { 35742, 0x00008074 }, /* GL_VERTEX_ARRAY */
-   { 35758, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
-   { 35788, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-   { 35819, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
-   { 35854, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
-   { 35878, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
-   { 35899, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
-   { 35922, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
-   { 35943, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-   { 35970, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-   { 35998, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-   { 36026, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-   { 36054, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-   { 36082, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-   { 36110, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
-   { 36138, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-   { 36165, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-   { 36192, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-   { 36219, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-   { 36246, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-   { 36273, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-   { 36300, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-   { 36327, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-   { 36354, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-   { 36381, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-   { 36419, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
-   { 36461, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-   { 36492, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
-   { 36527, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
-   { 36561, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
-   { 36599, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-   { 36630, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
-   { 36665, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-   { 36693, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
-   { 36725, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-   { 36755, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
-   { 36789, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
-   { 36817, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
-   { 36849, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
-   { 36869, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
-   { 36891, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
-   { 36920, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
-   { 36941, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-   { 36970, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
-   { 37003, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
-   { 37035, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-   { 37062, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
-   { 37093, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
-   { 37123, 0x00008B31 }, /* GL_VERTEX_SHADER */
-   { 37140, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
-   { 37161, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
-   { 37188, 0x00000BA2 }, /* GL_VIEWPORT */
-   { 37200, 0x00000800 }, /* GL_VIEWPORT_BIT */
-   { 37216, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
-   { 37236, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-   { 37267, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
-   { 37302, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-   { 37330, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-   { 37355, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-   { 37382, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-   { 37407, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
-   { 37431, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
-   { 37450, 0x000088B9 }, /* GL_WRITE_ONLY */
-   { 37464, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
-   { 37482, 0x00001506 }, /* GL_XOR */
-   { 37489, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
-   { 37508, 0x00008757 }, /* GL_YCBCR_MESA */
-   { 37522, 0x00000000 }, /* GL_ZERO */
-   { 37530, 0x00000D16 }, /* GL_ZOOM_X */
-   { 37540, 0x00000D17 }, /* GL_ZOOM_Y */
+   { 29733, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */
+   { 29758, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
+   { 29779, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */
+   { 29804, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
+   { 29836, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */
+   { 29872, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
+   { 29904, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */
+   { 29940, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
+   { 29960, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
+   { 29987, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
+   { 30013, 0x00000D57 }, /* GL_STENCIL_BITS */
+   { 30029, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
+   { 30051, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
+   { 30074, 0x00000B94 }, /* GL_STENCIL_FAIL */
+   { 30090, 0x00000B92 }, /* GL_STENCIL_FUNC */
+   { 30106, 0x00001901 }, /* GL_STENCIL_INDEX */
+   { 30123, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
+   { 30146, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
+   { 30168, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
+   { 30190, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
+   { 30212, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
+   { 30233, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
+   { 30260, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
+   { 30287, 0x00000B97 }, /* GL_STENCIL_REF */
+   { 30302, 0x00000B90 }, /* GL_STENCIL_TEST */
+   { 30318, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
+   { 30347, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
+   { 30369, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
+   { 30390, 0x00000C33 }, /* GL_STEREO */
+   { 30400, 0x000088E2 }, /* GL_STREAM_COPY */
+   { 30415, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
+   { 30434, 0x000088E0 }, /* GL_STREAM_DRAW */
+   { 30449, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
+   { 30468, 0x000088E1 }, /* GL_STREAM_READ */
+   { 30483, 0x000088E1 }, /* GL_STREAM_READ_ARB */
+   { 30502, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
+   { 30519, 0x000084E7 }, /* GL_SUBTRACT */
+   { 30531, 0x000084E7 }, /* GL_SUBTRACT_ARB */
+   { 30547, 0x00002001 }, /* GL_T */
+   { 30552, 0x00002A2A }, /* GL_T2F_C3F_V3F */
+   { 30567, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
+   { 30586, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
+   { 30602, 0x00002A2B }, /* GL_T2F_N3F_V3F */
+   { 30617, 0x00002A27 }, /* GL_T2F_V3F */
+   { 30628, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
+   { 30647, 0x00002A28 }, /* GL_T4F_V4F */
+   { 30658, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
+   { 30681, 0x00001702 }, /* GL_TEXTURE */
+   { 30692, 0x000084C0 }, /* GL_TEXTURE0 */
+   { 30704, 0x000084C0 }, /* GL_TEXTURE0_ARB */
+   { 30720, 0x000084C1 }, /* GL_TEXTURE1 */
+   { 30732, 0x000084CA }, /* GL_TEXTURE10 */
+   { 30745, 0x000084CA }, /* GL_TEXTURE10_ARB */
+   { 30762, 0x000084CB }, /* GL_TEXTURE11 */
+   { 30775, 0x000084CB }, /* GL_TEXTURE11_ARB */
+   { 30792, 0x000084CC }, /* GL_TEXTURE12 */
+   { 30805, 0x000084CC }, /* GL_TEXTURE12_ARB */
+   { 30822, 0x000084CD }, /* GL_TEXTURE13 */
+   { 30835, 0x000084CD }, /* GL_TEXTURE13_ARB */
+   { 30852, 0x000084CE }, /* GL_TEXTURE14 */
+   { 30865, 0x000084CE }, /* GL_TEXTURE14_ARB */
+   { 30882, 0x000084CF }, /* GL_TEXTURE15 */
+   { 30895, 0x000084CF }, /* GL_TEXTURE15_ARB */
+   { 30912, 0x000084D0 }, /* GL_TEXTURE16 */
+   { 30925, 0x000084D0 }, /* GL_TEXTURE16_ARB */
+   { 30942, 0x000084D1 }, /* GL_TEXTURE17 */
+   { 30955, 0x000084D1 }, /* GL_TEXTURE17_ARB */
+   { 30972, 0x000084D2 }, /* GL_TEXTURE18 */
+   { 30985, 0x000084D2 }, /* GL_TEXTURE18_ARB */
+   { 31002, 0x000084D3 }, /* GL_TEXTURE19 */
+   { 31015, 0x000084D3 }, /* GL_TEXTURE19_ARB */
+   { 31032, 0x000084C1 }, /* GL_TEXTURE1_ARB */
+   { 31048, 0x000084C2 }, /* GL_TEXTURE2 */
+   { 31060, 0x000084D4 }, /* GL_TEXTURE20 */
+   { 31073, 0x000084D4 }, /* GL_TEXTURE20_ARB */
+   { 31090, 0x000084D5 }, /* GL_TEXTURE21 */
+   { 31103, 0x000084D5 }, /* GL_TEXTURE21_ARB */
+   { 31120, 0x000084D6 }, /* GL_TEXTURE22 */
+   { 31133, 0x000084D6 }, /* GL_TEXTURE22_ARB */
+   { 31150, 0x000084D7 }, /* GL_TEXTURE23 */
+   { 31163, 0x000084D7 }, /* GL_TEXTURE23_ARB */
+   { 31180, 0x000084D8 }, /* GL_TEXTURE24 */
+   { 31193, 0x000084D8 }, /* GL_TEXTURE24_ARB */
+   { 31210, 0x000084D9 }, /* GL_TEXTURE25 */
+   { 31223, 0x000084D9 }, /* GL_TEXTURE25_ARB */
+   { 31240, 0x000084DA }, /* GL_TEXTURE26 */
+   { 31253, 0x000084DA }, /* GL_TEXTURE26_ARB */
+   { 31270, 0x000084DB }, /* GL_TEXTURE27 */
+   { 31283, 0x000084DB }, /* GL_TEXTURE27_ARB */
+   { 31300, 0x000084DC }, /* GL_TEXTURE28 */
+   { 31313, 0x000084DC }, /* GL_TEXTURE28_ARB */
+   { 31330, 0x000084DD }, /* GL_TEXTURE29 */
+   { 31343, 0x000084DD }, /* GL_TEXTURE29_ARB */
+   { 31360, 0x000084C2 }, /* GL_TEXTURE2_ARB */
+   { 31376, 0x000084C3 }, /* GL_TEXTURE3 */
+   { 31388, 0x000084DE }, /* GL_TEXTURE30 */
+   { 31401, 0x000084DE }, /* GL_TEXTURE30_ARB */
+   { 31418, 0x000084DF }, /* GL_TEXTURE31 */
+   { 31431, 0x000084DF }, /* GL_TEXTURE31_ARB */
+   { 31448, 0x000084C3 }, /* GL_TEXTURE3_ARB */
+   { 31464, 0x000084C4 }, /* GL_TEXTURE4 */
+   { 31476, 0x000084C4 }, /* GL_TEXTURE4_ARB */
+   { 31492, 0x000084C5 }, /* GL_TEXTURE5 */
+   { 31504, 0x000084C5 }, /* GL_TEXTURE5_ARB */
+   { 31520, 0x000084C6 }, /* GL_TEXTURE6 */
+   { 31532, 0x000084C6 }, /* GL_TEXTURE6_ARB */
+   { 31548, 0x000084C7 }, /* GL_TEXTURE7 */
+   { 31560, 0x000084C7 }, /* GL_TEXTURE7_ARB */
+   { 31576, 0x000084C8 }, /* GL_TEXTURE8 */
+   { 31588, 0x000084C8 }, /* GL_TEXTURE8_ARB */
+   { 31604, 0x000084C9 }, /* GL_TEXTURE9 */
+   { 31616, 0x000084C9 }, /* GL_TEXTURE9_ARB */
+   { 31632, 0x00000DE0 }, /* GL_TEXTURE_1D */
+   { 31646, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
+   { 31670, 0x00000DE1 }, /* GL_TEXTURE_2D */
+   { 31684, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
+   { 31708, 0x0000806F }, /* GL_TEXTURE_3D */
+   { 31722, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
+   { 31744, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
+   { 31770, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
+   { 31792, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
+   { 31814, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
+   { 31846, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
+   { 31868, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
+   { 31900, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
+   { 31922, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
+   { 31950, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
+   { 31982, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
+   { 32015, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
+   { 32047, 0x00040000 }, /* GL_TEXTURE_BIT */
+   { 32062, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
+   { 32083, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
+   { 32108, 0x00001005 }, /* GL_TEXTURE_BORDER */
+   { 32126, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
+   { 32150, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
+   { 32181, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
+   { 32211, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
+   { 32241, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
+   { 32276, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
+   { 32307, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+   { 32345, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
+   { 32372, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
+   { 32404, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+   { 32438, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
+   { 32462, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
+   { 32490, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
+   { 32514, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
+   { 32542, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
+   { 32575, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
+   { 32599, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
+   { 32621, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
+   { 32643, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
+   { 32669, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
+   { 32703, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
+   { 32736, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
+   { 32773, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
+   { 32801, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
+   { 32833, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
+   { 32856, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
+   { 32894, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
+   { 32936, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
+   { 32967, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
+   { 32995, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
+   { 33025, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
+   { 33053, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
+   { 33073, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
+   { 33097, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
+   { 33128, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
+   { 33163, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
+   { 33194, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
+   { 33229, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
+   { 33260, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
+   { 33295, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
+   { 33326, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
+   { 33361, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
+   { 33392, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
+   { 33427, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
+   { 33458, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
+   { 33493, 0x00008071 }, /* GL_TEXTURE_DEPTH */
+   { 33510, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
+   { 33532, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
+   { 33558, 0x00002300 }, /* GL_TEXTURE_ENV */
+   { 33573, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
+   { 33594, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
+   { 33614, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
+   { 33640, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
+   { 33660, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
+   { 33677, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
+   { 33694, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
+   { 33711, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
+   { 33728, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
+   { 33753, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
+   { 33775, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
+   { 33801, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
+   { 33819, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
+   { 33845, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
+   { 33871, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
+   { 33901, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
+   { 33928, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
+   { 33953, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
+   { 33973, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
+   { 33997, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+   { 34024, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+   { 34051, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+   { 34078, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
+   { 34104, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
+   { 34134, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
+   { 34156, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
+   { 34174, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+   { 34204, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+   { 34232, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+   { 34260, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+   { 34288, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
+   { 34309, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
+   { 34328, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
+   { 34350, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
+   { 34369, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
+   { 34389, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
+   { 34414, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
+   { 34438, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
+   { 34458, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
+   { 34482, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
+   { 34502, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
+   { 34525, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
+   { 34550, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+   { 34584, 0x00001000 }, /* GL_TEXTURE_WIDTH */
+   { 34601, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
+   { 34619, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
+   { 34637, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
+   { 34655, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
+   { 34675, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
+   { 34694, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+   { 34723, 0x00001000 }, /* GL_TRANSFORM_BIT */
+   { 34740, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
+   { 34766, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
+   { 34796, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+   { 34828, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+   { 34858, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
+   { 34892, 0x0000862C }, /* GL_TRANSPOSE_NV */
+   { 34908, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+   { 34939, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
+   { 34974, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+   { 35002, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
+   { 35034, 0x00000004 }, /* GL_TRIANGLES */
+   { 35047, 0x00000006 }, /* GL_TRIANGLE_FAN */
+   { 35063, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
+   { 35084, 0x00000005 }, /* GL_TRIANGLE_STRIP */
+   { 35102, 0x00000001 }, /* GL_TRUE */
+   { 35110, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
+   { 35130, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
+   { 35153, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
+   { 35173, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
+   { 35194, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
+   { 35216, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
+   { 35238, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
+   { 35258, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
+   { 35279, 0x00001401 }, /* GL_UNSIGNED_BYTE */
+   { 35296, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+   { 35323, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
+   { 35346, 0x00001405 }, /* GL_UNSIGNED_INT */
+   { 35362, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
+   { 35389, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
+   { 35413, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+   { 35444, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
+   { 35468, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+   { 35496, 0x00001403 }, /* GL_UNSIGNED_SHORT */
+   { 35514, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+   { 35544, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+   { 35570, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+   { 35600, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+   { 35626, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
+   { 35650, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+   { 35678, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+   { 35706, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
+   { 35733, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+   { 35765, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
+   { 35796, 0x00008CA2 }, /* GL_UPPER_LEFT */
+   { 35810, 0x00002A20 }, /* GL_V2F */
+   { 35817, 0x00002A21 }, /* GL_V3F */
+   { 35824, 0x00008B83 }, /* GL_VALIDATE_STATUS */
+   { 35843, 0x00001F00 }, /* GL_VENDOR */
+   { 35853, 0x00001F02 }, /* GL_VERSION */
+   { 35864, 0x00008074 }, /* GL_VERTEX_ARRAY */
+   { 35880, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
+   { 35910, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+   { 35941, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
+   { 35976, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
+   { 36000, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
+   { 36021, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
+   { 36044, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
+   { 36065, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+   { 36092, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+   { 36120, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+   { 36148, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+   { 36176, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+   { 36204, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+   { 36232, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+   { 36260, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+   { 36287, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+   { 36314, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+   { 36341, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+   { 36368, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+   { 36395, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+   { 36422, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+   { 36449, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+   { 36476, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+   { 36503, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+   { 36541, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
+   { 36583, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+   { 36614, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
+   { 36649, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+   { 36683, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
+   { 36721, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+   { 36752, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
+   { 36787, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+   { 36815, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
+   { 36847, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+   { 36877, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
+   { 36911, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+   { 36939, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
+   { 36971, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
+   { 36991, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
+   { 37013, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
+   { 37042, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
+   { 37063, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
+   { 37092, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
+   { 37125, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
+   { 37157, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+   { 37184, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
+   { 37215, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
+   { 37245, 0x00008B31 }, /* GL_VERTEX_SHADER */
+   { 37262, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
+   { 37283, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
+   { 37310, 0x00000BA2 }, /* GL_VIEWPORT */
+   { 37322, 0x00000800 }, /* GL_VIEWPORT_BIT */
+   { 37338, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
+   { 37358, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+   { 37389, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
+   { 37424, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+   { 37452, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+   { 37477, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+   { 37504, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+   { 37529, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
+   { 37553, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
+   { 37572, 0x000088B9 }, /* GL_WRITE_ONLY */
+   { 37586, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
+   { 37604, 0x00001506 }, /* GL_XOR */
+   { 37611, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
+   { 37630, 0x00008757 }, /* GL_YCBCR_MESA */
+   { 37644, 0x00000000 }, /* GL_ZERO */
+   { 37652, 0x00000D16 }, /* GL_ZOOM_X */
+   { 37662, 0x00000D17 }, /* GL_ZOOM_Y */
 };
 
 static const unsigned reduced_enums[1284] =
@@ -3539,9 +3547,9 @@ static const unsigned reduced_enums[1284] =
        645, /* GL_LINES */
        647, /* GL_LINE_LOOP */
        654, /* GL_LINE_STRIP */
-      1637, /* GL_TRIANGLES */
-      1640, /* GL_TRIANGLE_STRIP */
-      1638, /* GL_TRIANGLE_FAN */
+      1641, /* GL_TRIANGLES */
+      1644, /* GL_TRIANGLE_STRIP */
+      1642, /* GL_TRIANGLE_FAN */
       1211, /* GL_QUADS */
       1213, /* GL_QUAD_STRIP */
       1099, /* GL_POLYGON */
@@ -3664,24 +3672,24 @@ static const unsigned reduced_enums[1284] =
        321, /* GL_DEPTH_CLEAR_VALUE */
        332, /* GL_DEPTH_FUNC */
         12, /* GL_ACCUM_CLEAR_VALUE */
-      1418, /* GL_STENCIL_TEST */
-      1406, /* GL_STENCIL_CLEAR_VALUE */
-      1408, /* GL_STENCIL_FUNC */
-      1420, /* GL_STENCIL_VALUE_MASK */
-      1407, /* GL_STENCIL_FAIL */
-      1415, /* GL_STENCIL_PASS_DEPTH_FAIL */
-      1416, /* GL_STENCIL_PASS_DEPTH_PASS */
-      1417, /* GL_STENCIL_REF */
-      1421, /* GL_STENCIL_WRITEMASK */
+      1422, /* GL_STENCIL_TEST */
+      1410, /* GL_STENCIL_CLEAR_VALUE */
+      1412, /* GL_STENCIL_FUNC */
+      1424, /* GL_STENCIL_VALUE_MASK */
+      1411, /* GL_STENCIL_FAIL */
+      1419, /* GL_STENCIL_PASS_DEPTH_FAIL */
+      1420, /* GL_STENCIL_PASS_DEPTH_PASS */
+      1421, /* GL_STENCIL_REF */
+      1425, /* GL_STENCIL_WRITEMASK */
        791, /* GL_MATRIX_MODE */
        958, /* GL_NORMALIZE */
-      1727, /* GL_VIEWPORT */
+      1731, /* GL_VIEWPORT */
        932, /* GL_MODELVIEW_STACK_DEPTH */
       1191, /* GL_PROJECTION_STACK_DEPTH */
-      1616, /* GL_TEXTURE_STACK_DEPTH */
+      1620, /* GL_TEXTURE_STACK_DEPTH */
        930, /* GL_MODELVIEW_MATRIX */
       1190, /* GL_PROJECTION_MATRIX */
-      1601, /* GL_TEXTURE_MATRIX */
+      1605, /* GL_TEXTURE_MATRIX */
         61, /* GL_ATTRIB_STACK_DEPTH */
        127, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
         43, /* GL_ALPHA_TEST */
@@ -3706,17 +3714,17 @@ static const unsigned reduced_enums[1284] =
        587, /* GL_INDEX_MODE */
       1287, /* GL_RGBA_MODE */
        353, /* GL_DOUBLEBUFFER */
-      1422, /* GL_STEREO */
+      1426, /* GL_STEREO */
       1246, /* GL_RENDER_MODE */
       1043, /* GL_PERSPECTIVE_CORRECTION_HINT */
       1092, /* GL_POINT_SMOOTH_HINT */
        650, /* GL_LINE_SMOOTH_HINT */
       1109, /* GL_POLYGON_SMOOTH_HINT */
        478, /* GL_FOG_HINT */
-      1582, /* GL_TEXTURE_GEN_S */
-      1583, /* GL_TEXTURE_GEN_T */
-      1581, /* GL_TEXTURE_GEN_R */
-      1580, /* GL_TEXTURE_GEN_Q */
+      1586, /* GL_TEXTURE_GEN_S */
+      1587, /* GL_TEXTURE_GEN_T */
+      1585, /* GL_TEXTURE_GEN_R */
+      1584, /* GL_TEXTURE_GEN_Q */
       1056, /* GL_PIXEL_MAP_I_TO_I */
       1062, /* GL_PIXEL_MAP_S_TO_S */
       1058, /* GL_PIXEL_MAP_I_TO_R */
@@ -3737,12 +3745,12 @@ static const unsigned reduced_enums[1284] =
       1049, /* GL_PIXEL_MAP_G_TO_G_SIZE */
       1047, /* GL_PIXEL_MAP_B_TO_B_SIZE */
       1045, /* GL_PIXEL_MAP_A_TO_A_SIZE */
-      1649, /* GL_UNPACK_SWAP_BYTES */
-      1644, /* GL_UNPACK_LSB_FIRST */
-      1645, /* GL_UNPACK_ROW_LENGTH */
-      1648, /* GL_UNPACK_SKIP_ROWS */
-      1647, /* GL_UNPACK_SKIP_PIXELS */
-      1642, /* GL_UNPACK_ALIGNMENT */
+      1653, /* GL_UNPACK_SWAP_BYTES */
+      1648, /* GL_UNPACK_LSB_FIRST */
+      1649, /* GL_UNPACK_ROW_LENGTH */
+      1652, /* GL_UNPACK_SKIP_ROWS */
+      1651, /* GL_UNPACK_SKIP_PIXELS */
+      1646, /* GL_UNPACK_ALIGNMENT */
       1031, /* GL_PACK_SWAP_BYTES */
       1026, /* GL_PACK_LSB_FIRST */
       1027, /* GL_PACK_ROW_LENGTH */
@@ -3755,8 +3763,8 @@ static const unsigned reduced_enums[1284] =
        588, /* GL_INDEX_OFFSET */
       1235, /* GL_RED_SCALE */
       1233, /* GL_RED_BIAS */
-      1744, /* GL_ZOOM_X */
-      1745, /* GL_ZOOM_Y */
+      1748, /* GL_ZOOM_X */
+      1749, /* GL_ZOOM_Y */
        551, /* GL_GREEN_SCALE */
        549, /* GL_GREEN_BIAS */
         92, /* GL_BLUE_SCALE */
@@ -3777,14 +3785,14 @@ static const unsigned reduced_enums[1284] =
        866, /* GL_MAX_TEXTURE_STACK_DEPTH */
        880, /* GL_MAX_VIEWPORT_DIMS */
        797, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
-      1429, /* GL_SUBPIXEL_BITS */
+      1433, /* GL_SUBPIXEL_BITS */
        584, /* GL_INDEX_BITS */
       1234, /* GL_RED_BITS */
        550, /* GL_GREEN_BITS */
         91, /* GL_BLUE_BITS */
         41, /* GL_ALPHA_BITS */
        316, /* GL_DEPTH_BITS */
-      1404, /* GL_STENCIL_BITS */
+      1408, /* GL_STENCIL_BITS */
         14, /* GL_ACCUM_RED_BITS */
         13, /* GL_ACCUM_GREEN_BITS */
         10, /* GL_ACCUM_BLUE_BITS */
@@ -3813,18 +3821,18 @@ static const unsigned reduced_enums[1284] =
        692, /* GL_MAP1_GRID_SEGMENTS */
        718, /* GL_MAP2_GRID_DOMAIN */
        719, /* GL_MAP2_GRID_SEGMENTS */
-      1506, /* GL_TEXTURE_1D */
-      1508, /* GL_TEXTURE_2D */
+      1510, /* GL_TEXTURE_1D */
+      1512, /* GL_TEXTURE_2D */
        439, /* GL_FEEDBACK_BUFFER_POINTER */
        440, /* GL_FEEDBACK_BUFFER_SIZE */
        441, /* GL_FEEDBACK_BUFFER_TYPE */
       1330, /* GL_SELECTION_BUFFER_POINTER */
       1331, /* GL_SELECTION_BUFFER_SIZE */
-      1619, /* GL_TEXTURE_WIDTH */
-      1587, /* GL_TEXTURE_HEIGHT */
-      1543, /* GL_TEXTURE_COMPONENTS */
-      1527, /* GL_TEXTURE_BORDER_COLOR */
-      1526, /* GL_TEXTURE_BORDER */
+      1623, /* GL_TEXTURE_WIDTH */
+      1591, /* GL_TEXTURE_HEIGHT */
+      1547, /* GL_TEXTURE_COMPONENTS */
+      1531, /* GL_TEXTURE_BORDER_COLOR */
+      1530, /* GL_TEXTURE_BORDER */
        345, /* GL_DONT_CARE */
        437, /* GL_FASTEST */
        954, /* GL_NICEST */
@@ -3841,11 +3849,11 @@ static const unsigned reduced_enums[1284] =
        219, /* GL_COMPILE */
        220, /* GL_COMPILE_AND_EXECUTE */
        111, /* GL_BYTE */
-      1650, /* GL_UNSIGNED_BYTE */
+      1654, /* GL_UNSIGNED_BYTE */
       1344, /* GL_SHORT */
-      1659, /* GL_UNSIGNED_SHORT */
+      1663, /* GL_UNSIGNED_SHORT */
        592, /* GL_INT */
-      1653, /* GL_UNSIGNED_INT */
+      1657, /* GL_UNSIGNED_INT */
        444, /* GL_FLOAT */
          1, /* GL_2_BYTES */
          5, /* GL_3_BYTES */
@@ -3857,7 +3865,7 @@ static const unsigned reduced_enums[1284] =
        269, /* GL_COPY */
         50, /* GL_AND_INVERTED */
        956, /* GL_NOOP */
-      1740, /* GL_XOR */
+      1744, /* GL_XOR */
       1018, /* GL_OR */
        957, /* GL_NOR */
        427, /* GL_EQUIV */
@@ -3873,12 +3881,12 @@ static const unsigned reduced_enums[1284] =
        165, /* GL_COLOR_INDEXES */
        897, /* GL_MODELVIEW */
       1189, /* GL_PROJECTION */
-      1441, /* GL_TEXTURE */
+      1445, /* GL_TEXTURE */
        138, /* GL_COLOR */
        313, /* GL_DEPTH */
       1395, /* GL_STENCIL */
        164, /* GL_COLOR_INDEX */
-      1409, /* GL_STENCIL_INDEX */
+      1413, /* GL_STENCIL_INDEX */
        322, /* GL_DEPTH_COMPONENT */
       1230, /* GL_RED */
        548, /* GL_GREEN */
@@ -3901,23 +3909,23 @@ static const unsigned reduced_enums[1284] =
       1248, /* GL_REPLACE */
        575, /* GL_INCR */
        309, /* GL_DECR */
-      1674, /* GL_VENDOR */
+      1678, /* GL_VENDOR */
       1245, /* GL_RENDERER */
-      1675, /* GL_VERSION */
+      1679, /* GL_VERSION */
        431, /* GL_EXTENSIONS */
       1294, /* GL_S */
-      1432, /* GL_T */
+      1436, /* GL_T */
       1220, /* GL_R */
       1209, /* GL_Q */
        933, /* GL_MODULATE */
        308, /* GL_DECAL */
-      1577, /* GL_TEXTURE_ENV_MODE */
-      1576, /* GL_TEXTURE_ENV_COLOR */
-      1575, /* GL_TEXTURE_ENV */
+      1581, /* GL_TEXTURE_ENV_MODE */
+      1580, /* GL_TEXTURE_ENV_COLOR */
+      1579, /* GL_TEXTURE_ENV */
        432, /* GL_EYE_LINEAR */
        980, /* GL_OBJECT_LINEAR */
       1374, /* GL_SPHERE_MAP */
-      1579, /* GL_TEXTURE_GEN_MODE */
+      1583, /* GL_TEXTURE_GEN_MODE */
        982, /* GL_OBJECT_PLANE */
        433, /* GL_EYE_PLANE */
        948, /* GL_NEAREST */
@@ -3926,30 +3934,30 @@ static const unsigned reduced_enums[1284] =
        644, /* GL_LINEAR_MIPMAP_NEAREST */
        951, /* GL_NEAREST_MIPMAP_LINEAR */
        643, /* GL_LINEAR_MIPMAP_LINEAR */
-      1600, /* GL_TEXTURE_MAG_FILTER */
-      1608, /* GL_TEXTURE_MIN_FILTER */
-      1621, /* GL_TEXTURE_WRAP_S */
-      1622, /* GL_TEXTURE_WRAP_T */
+      1604, /* GL_TEXTURE_MAG_FILTER */
+      1612, /* GL_TEXTURE_MIN_FILTER */
+      1625, /* GL_TEXTURE_WRAP_S */
+      1626, /* GL_TEXTURE_WRAP_T */
        117, /* GL_CLAMP */
       1247, /* GL_REPEAT */
       1107, /* GL_POLYGON_OFFSET_UNITS */
       1106, /* GL_POLYGON_OFFSET_POINT */
       1105, /* GL_POLYGON_OFFSET_LINE */
       1221, /* GL_R3_G3_B2 */
-      1671, /* GL_V2F */
-      1672, /* GL_V3F */
+      1675, /* GL_V2F */
+      1676, /* GL_V3F */
        114, /* GL_C4UB_V2F */
        115, /* GL_C4UB_V3F */
        112, /* GL_C3F_V3F */
        945, /* GL_N3F_V3F */
        113, /* GL_C4F_N3F_V3F */
-      1437, /* GL_T2F_V3F */
-      1439, /* GL_T4F_V4F */
-      1435, /* GL_T2F_C4UB_V3F */
-      1433, /* GL_T2F_C3F_V3F */
-      1436, /* GL_T2F_N3F_V3F */
-      1434, /* GL_T2F_C4F_N3F_V3F */
-      1438, /* GL_T4F_C4F_N3F_V4F */
+      1441, /* GL_T2F_V3F */
+      1443, /* GL_T4F_V4F */
+      1439, /* GL_T2F_C4UB_V3F */
+      1437, /* GL_T2F_C3F_V3F */
+      1440, /* GL_T2F_N3F_V3F */
+      1438, /* GL_T2F_C4F_N3F_V3F */
+      1442, /* GL_T4F_C4F_N3F_V4F */
        130, /* GL_CLIP_PLANE0 */
        131, /* GL_CLIP_PLANE1 */
        132, /* GL_CLIP_PLANE2 */
@@ -4009,12 +4017,12 @@ static const unsigned reduced_enums[1284] =
        882, /* GL_MINMAX */
        884, /* GL_MINMAX_FORMAT */
        886, /* GL_MINMAX_SINK */
-      1440, /* GL_TABLE_TOO_LARGE_EXT */
-      1652, /* GL_UNSIGNED_BYTE_3_3_2 */
-      1661, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-      1663, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-      1657, /* GL_UNSIGNED_INT_8_8_8_8 */
-      1654, /* GL_UNSIGNED_INT_10_10_10_2 */
+      1444, /* GL_TABLE_TOO_LARGE_EXT */
+      1656, /* GL_UNSIGNED_BYTE_3_3_2 */
+      1665, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+      1667, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+      1661, /* GL_UNSIGNED_INT_8_8_8_8 */
+      1658, /* GL_UNSIGNED_INT_10_10_10_2 */
       1104, /* GL_POLYGON_OFFSET_FILL */
       1103, /* GL_POLYGON_OFFSET_FACTOR */
       1102, /* GL_POLYGON_OFFSET_BIAS */
@@ -4052,39 +4060,39 @@ static const unsigned reduced_enums[1284] =
       1256, /* GL_RGB10_A2 */
       1274, /* GL_RGBA12 */
       1276, /* GL_RGBA16 */
-      1613, /* GL_TEXTURE_RED_SIZE */
-      1585, /* GL_TEXTURE_GREEN_SIZE */
-      1524, /* GL_TEXTURE_BLUE_SIZE */
-      1511, /* GL_TEXTURE_ALPHA_SIZE */
-      1598, /* GL_TEXTURE_LUMINANCE_SIZE */
-      1589, /* GL_TEXTURE_INTENSITY_SIZE */
+      1617, /* GL_TEXTURE_RED_SIZE */
+      1589, /* GL_TEXTURE_GREEN_SIZE */
+      1528, /* GL_TEXTURE_BLUE_SIZE */
+      1515, /* GL_TEXTURE_ALPHA_SIZE */
+      1602, /* GL_TEXTURE_LUMINANCE_SIZE */
+      1593, /* GL_TEXTURE_INTENSITY_SIZE */
       1249, /* GL_REPLACE_EXT */
       1197, /* GL_PROXY_TEXTURE_1D */
       1200, /* GL_PROXY_TEXTURE_2D */
-      1617, /* GL_TEXTURE_TOO_LARGE_EXT */
-      1610, /* GL_TEXTURE_PRIORITY */
-      1615, /* GL_TEXTURE_RESIDENT */
-      1514, /* GL_TEXTURE_BINDING_1D */
-      1516, /* GL_TEXTURE_BINDING_2D */
-      1518, /* GL_TEXTURE_BINDING_3D */
+      1621, /* GL_TEXTURE_TOO_LARGE_EXT */
+      1614, /* GL_TEXTURE_PRIORITY */
+      1619, /* GL_TEXTURE_RESIDENT */
+      1518, /* GL_TEXTURE_BINDING_1D */
+      1520, /* GL_TEXTURE_BINDING_2D */
+      1522, /* GL_TEXTURE_BINDING_3D */
       1028, /* GL_PACK_SKIP_IMAGES */
       1024, /* GL_PACK_IMAGE_HEIGHT */
-      1646, /* GL_UNPACK_SKIP_IMAGES */
-      1643, /* GL_UNPACK_IMAGE_HEIGHT */
-      1510, /* GL_TEXTURE_3D */
+      1650, /* GL_UNPACK_SKIP_IMAGES */
+      1647, /* GL_UNPACK_IMAGE_HEIGHT */
+      1514, /* GL_TEXTURE_3D */
       1203, /* GL_PROXY_TEXTURE_3D */
-      1572, /* GL_TEXTURE_DEPTH */
-      1620, /* GL_TEXTURE_WRAP_R */
+      1576, /* GL_TEXTURE_DEPTH */
+      1624, /* GL_TEXTURE_WRAP_R */
        794, /* GL_MAX_3D_TEXTURE_SIZE */
-      1676, /* GL_VERTEX_ARRAY */
+      1680, /* GL_VERTEX_ARRAY */
        959, /* GL_NORMAL_ARRAY */
        139, /* GL_COLOR_ARRAY */
        578, /* GL_INDEX_ARRAY */
-      1551, /* GL_TEXTURE_COORD_ARRAY */
+      1555, /* GL_TEXTURE_COORD_ARRAY */
        415, /* GL_EDGE_FLAG_ARRAY */
-      1681, /* GL_VERTEX_ARRAY_SIZE */
-      1683, /* GL_VERTEX_ARRAY_TYPE */
-      1682, /* GL_VERTEX_ARRAY_STRIDE */
+      1685, /* GL_VERTEX_ARRAY_SIZE */
+      1687, /* GL_VERTEX_ARRAY_TYPE */
+      1686, /* GL_VERTEX_ARRAY_STRIDE */
        964, /* GL_NORMAL_ARRAY_TYPE */
        963, /* GL_NORMAL_ARRAY_STRIDE */
        143, /* GL_COLOR_ARRAY_SIZE */
@@ -4092,15 +4100,15 @@ static const unsigned reduced_enums[1284] =
        144, /* GL_COLOR_ARRAY_STRIDE */
        583, /* GL_INDEX_ARRAY_TYPE */
        582, /* GL_INDEX_ARRAY_STRIDE */
-      1555, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-      1557, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-      1556, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
+      1559, /* GL_TEXTURE_COORD_ARRAY_SIZE */
+      1561, /* GL_TEXTURE_COORD_ARRAY_TYPE */
+      1560, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
        419, /* GL_EDGE_FLAG_ARRAY_STRIDE */
-      1680, /* GL_VERTEX_ARRAY_POINTER */
+      1684, /* GL_VERTEX_ARRAY_POINTER */
        962, /* GL_NORMAL_ARRAY_POINTER */
        142, /* GL_COLOR_ARRAY_POINTER */
        581, /* GL_INDEX_ARRAY_POINTER */
-      1554, /* GL_TEXTURE_COORD_ARRAY_POINTER */
+      1558, /* GL_TEXTURE_COORD_ARRAY_POINTER */
        418, /* GL_EDGE_FLAG_ARRAY_POINTER */
        938, /* GL_MULTISAMPLE */
       1306, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
@@ -4121,9 +4129,9 @@ static const unsigned reduced_enums[1284] =
       1123, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
       1118, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
       1114, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
-      1534, /* GL_TEXTURE_COLOR_TABLE_SGI */
+      1538, /* GL_TEXTURE_COLOR_TABLE_SGI */
       1204, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
-      1536, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+      1540, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
         80, /* GL_BLEND_DST_RGB */
         88, /* GL_BLEND_SRC_RGB */
         79, /* GL_BLEND_DST_ALPHA */
@@ -4148,7 +4156,7 @@ static const unsigned reduced_enums[1284] =
         72, /* GL_BGRA */
        816, /* GL_MAX_ELEMENTS_VERTICES */
        815, /* GL_MAX_ELEMENTS_INDICES */
-      1588, /* GL_TEXTURE_INDEX_SIZE_EXT */
+      1592, /* GL_TEXTURE_INDEX_SIZE_EXT */
        136, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
       1086, /* GL_POINT_SIZE_MIN */
       1082, /* GL_POINT_SIZE_MAX */
@@ -4156,10 +4164,10 @@ static const unsigned reduced_enums[1284] =
       1072, /* GL_POINT_DISTANCE_ATTENUATION */
        118, /* GL_CLAMP_TO_BORDER */
        121, /* GL_CLAMP_TO_EDGE */
-      1609, /* GL_TEXTURE_MIN_LOD */
-      1607, /* GL_TEXTURE_MAX_LOD */
-      1513, /* GL_TEXTURE_BASE_LEVEL */
-      1606, /* GL_TEXTURE_MAX_LEVEL */
+      1613, /* GL_TEXTURE_MIN_LOD */
+      1611, /* GL_TEXTURE_MAX_LOD */
+      1517, /* GL_TEXTURE_BASE_LEVEL */
+      1610, /* GL_TEXTURE_MAX_LEVEL */
        572, /* GL_IGNORE_BORDER_HP */
        246, /* GL_CONSTANT_BORDER_HP */
       1250, /* GL_REPLICATE_BORDER_HP */
@@ -4167,51 +4175,51 @@ static const unsigned reduced_enums[1284] =
        987, /* GL_OCCLUSION_TEST_HP */
        988, /* GL_OCCLUSION_TEST_RESULT_HP */
        641, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
-      1528, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-      1530, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-      1532, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-      1533, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-      1531, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-      1529, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
+      1532, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
+      1534, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
+      1536, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
+      1537, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+      1535, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
+      1533, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
        798, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
        799, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
       1149, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
       1151, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
       1148, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
       1150, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
-      1596, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-      1597, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-      1595, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+      1600, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+      1601, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+      1599, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
        518, /* GL_GENERATE_MIPMAP */
        519, /* GL_GENERATE_MIPMAP_HINT */
        481, /* GL_FOG_OFFSET_SGIX */
        482, /* GL_FOG_OFFSET_VALUE_SGIX */
-      1542, /* GL_TEXTURE_COMPARE_SGIX */
-      1541, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-      1592, /* GL_TEXTURE_LEQUAL_R_SGIX */
-      1584, /* GL_TEXTURE_GEQUAL_R_SGIX */
+      1546, /* GL_TEXTURE_COMPARE_SGIX */
+      1545, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
+      1596, /* GL_TEXTURE_LEQUAL_R_SGIX */
+      1588, /* GL_TEXTURE_GEQUAL_R_SGIX */
        323, /* GL_DEPTH_COMPONENT16 */
        326, /* GL_DEPTH_COMPONENT24 */
        329, /* GL_DEPTH_COMPONENT32 */
        274, /* GL_CULL_VERTEX_EXT */
        276, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
        275, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
-      1737, /* GL_WRAP_BORDER_SUN */
-      1535, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
+      1741, /* GL_WRAP_BORDER_SUN */
+      1539, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
        634, /* GL_LIGHT_MODEL_COLOR_CONTROL */
       1345, /* GL_SINGLE_COLOR */
       1333, /* GL_SEPARATE_SPECULAR_COLOR */
       1342, /* GL_SHARED_TEXTURE_PALETTE_EXT */
-      1651, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-      1664, /* GL_UNSIGNED_SHORT_5_6_5 */
-      1665, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-      1662, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-      1660, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-      1658, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-      1656, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-      1604, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-      1605, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-      1603, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+      1655, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+      1668, /* GL_UNSIGNED_SHORT_5_6_5 */
+      1669, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+      1666, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+      1664, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+      1662, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+      1660, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+      1608, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+      1609, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+      1607, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
        889, /* GL_MIRRORED_REPEAT */
       1289, /* GL_RGB_S3TC */
       1266, /* GL_RGB4_S3TC */
@@ -4244,46 +4252,46 @@ static const unsigned reduced_enums[1284] =
        528, /* GL_GL_CURRENT_RASTER_SECONDARY_COLOR */
         28, /* GL_ALIASED_POINT_SIZE_RANGE */
         27, /* GL_ALIASED_LINE_WIDTH_RANGE */
-      1442, /* GL_TEXTURE0 */
-      1444, /* GL_TEXTURE1 */
-      1466, /* GL_TEXTURE2 */
-      1488, /* GL_TEXTURE3 */
-      1494, /* GL_TEXTURE4 */
-      1496, /* GL_TEXTURE5 */
-      1498, /* GL_TEXTURE6 */
-      1500, /* GL_TEXTURE7 */
-      1502, /* GL_TEXTURE8 */
-      1504, /* GL_TEXTURE9 */
-      1445, /* GL_TEXTURE10 */
-      1447, /* GL_TEXTURE11 */
-      1449, /* GL_TEXTURE12 */
-      1451, /* GL_TEXTURE13 */
-      1453, /* GL_TEXTURE14 */
-      1455, /* GL_TEXTURE15 */
-      1457, /* GL_TEXTURE16 */
-      1459, /* GL_TEXTURE17 */
-      1461, /* GL_TEXTURE18 */
-      1463, /* GL_TEXTURE19 */
-      1467, /* GL_TEXTURE20 */
-      1469, /* GL_TEXTURE21 */
-      1471, /* GL_TEXTURE22 */
-      1473, /* GL_TEXTURE23 */
-      1475, /* GL_TEXTURE24 */
-      1477, /* GL_TEXTURE25 */
-      1479, /* GL_TEXTURE26 */
-      1481, /* GL_TEXTURE27 */
-      1483, /* GL_TEXTURE28 */
-      1485, /* GL_TEXTURE29 */
-      1489, /* GL_TEXTURE30 */
-      1491, /* GL_TEXTURE31 */
+      1446, /* GL_TEXTURE0 */
+      1448, /* GL_TEXTURE1 */
+      1470, /* GL_TEXTURE2 */
+      1492, /* GL_TEXTURE3 */
+      1498, /* GL_TEXTURE4 */
+      1500, /* GL_TEXTURE5 */
+      1502, /* GL_TEXTURE6 */
+      1504, /* GL_TEXTURE7 */
+      1506, /* GL_TEXTURE8 */
+      1508, /* GL_TEXTURE9 */
+      1449, /* GL_TEXTURE10 */
+      1451, /* GL_TEXTURE11 */
+      1453, /* GL_TEXTURE12 */
+      1455, /* GL_TEXTURE13 */
+      1457, /* GL_TEXTURE14 */
+      1459, /* GL_TEXTURE15 */
+      1461, /* GL_TEXTURE16 */
+      1463, /* GL_TEXTURE17 */
+      1465, /* GL_TEXTURE18 */
+      1467, /* GL_TEXTURE19 */
+      1471, /* GL_TEXTURE20 */
+      1473, /* GL_TEXTURE21 */
+      1475, /* GL_TEXTURE22 */
+      1477, /* GL_TEXTURE23 */
+      1479, /* GL_TEXTURE24 */
+      1481, /* GL_TEXTURE25 */
+      1483, /* GL_TEXTURE26 */
+      1485, /* GL_TEXTURE27 */
+      1487, /* GL_TEXTURE28 */
+      1489, /* GL_TEXTURE29 */
+      1493, /* GL_TEXTURE30 */
+      1495, /* GL_TEXTURE31 */
         18, /* GL_ACTIVE_TEXTURE */
        124, /* GL_CLIENT_ACTIVE_TEXTURE */
        867, /* GL_MAX_TEXTURE_UNITS */
-      1630, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-      1633, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-      1635, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-      1627, /* GL_TRANSPOSE_COLOR_MATRIX */
-      1430, /* GL_SUBTRACT */
+      1634, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+      1637, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+      1639, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+      1631, /* GL_TRANSPOSE_COLOR_MATRIX */
+      1434, /* GL_SUBTRACT */
        856, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
        222, /* GL_COMPRESSED_ALPHA */
        226, /* GL_COMPRESSED_LUMINANCE */
@@ -4291,18 +4299,18 @@ static const unsigned reduced_enums[1284] =
        224, /* GL_COMPRESSED_INTENSITY */
        230, /* GL_COMPRESSED_RGB */
        231, /* GL_COMPRESSED_RGBA */
-      1549, /* GL_TEXTURE_COMPRESSION_HINT */
-      1611, /* GL_TEXTURE_RECTANGLE_ARB */
-      1521, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
+      1553, /* GL_TEXTURE_COMPRESSION_HINT */
+      1615, /* GL_TEXTURE_RECTANGLE_ARB */
+      1525, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
       1207, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
        854, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
        335, /* GL_DEPTH_STENCIL_NV */
-      1655, /* GL_UNSIGNED_INT_24_8_NV */
+      1659, /* GL_UNSIGNED_INT_24_8_NV */
        863, /* GL_MAX_TEXTURE_LOD_BIAS */
-      1602, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+      1606, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
        864, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
-      1578, /* GL_TEXTURE_FILTER_CONTROL */
-      1593, /* GL_TEXTURE_LOD_BIAS */
+      1582, /* GL_TEXTURE_FILTER_CONTROL */
+      1597, /* GL_TEXTURE_LOD_BIAS */
        207, /* GL_COMBINE4 */
        857, /* GL_MAX_SHININESS_NV */
        858, /* GL_MAX_SPOT_EXPONENT_NV */
@@ -4311,14 +4319,14 @@ static const unsigned reduced_enums[1284] =
        909, /* GL_MODELVIEW1_ARB */
        965, /* GL_NORMAL_MAP */
       1236, /* GL_REFLECTION_MAP */
-      1558, /* GL_TEXTURE_CUBE_MAP */
-      1519, /* GL_TEXTURE_BINDING_CUBE_MAP */
-      1566, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-      1560, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-      1568, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-      1562, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-      1570, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-      1564, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
+      1562, /* GL_TEXTURE_CUBE_MAP */
+      1523, /* GL_TEXTURE_BINDING_CUBE_MAP */
+      1570, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
+      1564, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
+      1572, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
+      1566, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
+      1574, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
+      1568, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
       1205, /* GL_PROXY_TEXTURE_CUBE_MAP */
        810, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
        944, /* GL_MULTISAMPLE_FILTER_HINT_NV */
@@ -4350,26 +4358,26 @@ static const unsigned reduced_enums[1284] =
       1004, /* GL_OPERAND1_ALPHA */
       1010, /* GL_OPERAND2_ALPHA */
       1016, /* GL_OPERAND3_ALPHA_NV */
-      1677, /* GL_VERTEX_ARRAY_BINDING_APPLE */
-      1741, /* GL_YCBCR_422_APPLE */
-      1666, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-      1668, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+      1681, /* GL_VERTEX_ARRAY_BINDING_APPLE */
+      1745, /* GL_YCBCR_422_APPLE */
+      1670, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+      1672, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
       1347, /* GL_SLICE_ACCUM_SUN */
       1212, /* GL_QUAD_MESH_SUN */
-      1639, /* GL_TRIANGLE_MESH_SUN */
-      1715, /* GL_VERTEX_PROGRAM_ARB */
-      1726, /* GL_VERTEX_STATE_PROGRAM_NV */
-      1702, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-      1708, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-      1710, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-      1712, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+      1643, /* GL_TRIANGLE_MESH_SUN */
+      1719, /* GL_VERTEX_PROGRAM_ARB */
+      1730, /* GL_VERTEX_STATE_PROGRAM_NV */
+      1706, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+      1712, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+      1714, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+      1716, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
        301, /* GL_CURRENT_VERTEX_ATTRIB */
       1168, /* GL_PROGRAM_LENGTH_ARB */
       1182, /* GL_PROGRAM_STRING_ARB */
        931, /* GL_MODELVIEW_PROJECTION_NV */
        571, /* GL_IDENTITY_NV */
        616, /* GL_INVERSE_NV */
-      1632, /* GL_TRANSPOSE_NV */
+      1636, /* GL_TRANSPOSE_NV */
        617, /* GL_INVERSE_TRANSPOSE_NV */
        840, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
        839, /* GL_MAX_PROGRAM_MATRICES_ARB */
@@ -4383,33 +4391,33 @@ static const unsigned reduced_enums[1284] =
        783, /* GL_MATRIX7_NV */
        286, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
        283, /* GL_CURRENT_MATRIX_ARB */
-      1718, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-      1721, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+      1722, /* GL_VERTEX_PROGRAM_POINT_SIZE */
+      1725, /* GL_VERTEX_PROGRAM_TWO_SIDE */
       1180, /* GL_PROGRAM_PARAMETER_NV */
-      1706, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+      1710, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
       1184, /* GL_PROGRAM_TARGET_NV */
       1181, /* GL_PROGRAM_RESIDENT_NV */
-      1624, /* GL_TRACK_MATRIX_NV */
-      1625, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-      1716, /* GL_VERTEX_PROGRAM_BINDING_NV */
+      1628, /* GL_TRACK_MATRIX_NV */
+      1629, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+      1720, /* GL_VERTEX_PROGRAM_BINDING_NV */
       1162, /* GL_PROGRAM_ERROR_POSITION_ARB */
        320, /* GL_DEPTH_CLAMP_NV */
-      1684, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-      1691, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-      1692, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-      1693, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-      1694, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-      1695, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-      1696, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-      1697, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-      1698, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-      1699, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-      1685, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-      1686, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-      1687, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-      1688, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-      1689, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-      1690, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+      1688, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+      1695, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+      1696, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+      1697, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+      1698, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+      1699, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+      1700, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+      1701, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+      1702, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+      1703, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+      1689, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+      1690, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+      1691, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+      1692, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+      1693, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+      1694, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
        701, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
        708, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
        709, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
@@ -4442,20 +4450,20 @@ static const unsigned reduced_enums[1284] =
        732, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
        733, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
        734, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
-      1547, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-      1544, /* GL_TEXTURE_COMPRESSED */
+      1551, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
+      1548, /* GL_TEXTURE_COMPRESSED */
        970, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
        240, /* GL_COMPRESSED_TEXTURE_FORMATS */
        879, /* GL_MAX_VERTEX_UNITS_ARB */
         22, /* GL_ACTIVE_VERTEX_UNITS_ARB */
-      1736, /* GL_WEIGHT_SUM_UNITY_ARB */
-      1714, /* GL_VERTEX_BLEND_ARB */
+      1740, /* GL_WEIGHT_SUM_UNITY_ARB */
+      1718, /* GL_VERTEX_BLEND_ARB */
        303, /* GL_CURRENT_WEIGHT_ARB */
-      1735, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-      1734, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-      1733, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-      1732, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-      1729, /* GL_WEIGHT_ARRAY_ARB */
+      1739, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+      1738, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+      1737, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+      1736, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+      1733, /* GL_WEIGHT_ARRAY_ARB */
        346, /* GL_DOT3_RGB */
        347, /* GL_DOT3_RGBA */
        238, /* GL_COMPRESSED_RGB_FXT1_3DFX */
@@ -4500,17 +4508,17 @@ static const unsigned reduced_enums[1284] =
        934, /* GL_MODULATE_ADD_ATI */
        935, /* GL_MODULATE_SIGNED_ADD_ATI */
        936, /* GL_MODULATE_SUBTRACT_ATI */
-      1742, /* GL_YCBCR_MESA */
+      1746, /* GL_YCBCR_MESA */
       1025, /* GL_PACK_INVERT_MESA */
        306, /* GL_DEBUG_OBJECT_MESA */
        307, /* GL_DEBUG_PRINT_MESA */
        305, /* GL_DEBUG_ASSERT_MESA */
        107, /* GL_BUFFER_SIZE */
        109, /* GL_BUFFER_USAGE */
-      1398, /* GL_STENCIL_BACK_FUNC */
+      1399, /* GL_STENCIL_BACK_FUNC */
       1397, /* GL_STENCIL_BACK_FAIL */
-      1399, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-      1400, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
+      1401, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
+      1403, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
        485, /* GL_FRAGMENT_PROGRAM_ARB */
       1159, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
       1187, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
@@ -4552,10 +4560,10 @@ static const unsigned reduced_enums[1284] =
        790, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
        789, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
        787, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
-      1573, /* GL_TEXTURE_DEPTH_SIZE */
+      1577, /* GL_TEXTURE_DEPTH_SIZE */
        339, /* GL_DEPTH_TEXTURE_MODE */
-      1539, /* GL_TEXTURE_COMPARE_MODE */
-      1537, /* GL_TEXTURE_COMPARE_FUNC */
+      1543, /* GL_TEXTURE_COMPARE_MODE */
+      1541, /* GL_TEXTURE_COMPARE_FUNC */
        217, /* GL_COMPARE_R_TO_TEXTURE */
       1093, /* GL_POINT_SPRITE */
        266, /* GL_COORD_REPLACE */
@@ -4565,7 +4573,7 @@ static const unsigned reduced_enums[1284] =
       1216, /* GL_QUERY_RESULT */
       1218, /* GL_QUERY_RESULT_AVAILABLE */
        873, /* GL_MAX_VERTEX_ATTRIBS */
-      1704, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+      1708, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
        337, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
        336, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
        859, /* GL_MAX_TEXTURE_COORDS */
@@ -4573,23 +4581,23 @@ static const unsigned reduced_enums[1284] =
       1164, /* GL_PROGRAM_ERROR_STRING_ARB */
       1166, /* GL_PROGRAM_FORMAT_ASCII_ARB */
       1165, /* GL_PROGRAM_FORMAT_ARB */
-      1618, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+      1622, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
        318, /* GL_DEPTH_BOUNDS_TEST_EXT */
        317, /* GL_DEPTH_BOUNDS_EXT */
         52, /* GL_ARRAY_BUFFER */
        420, /* GL_ELEMENT_ARRAY_BUFFER */
         54, /* GL_ARRAY_BUFFER_BINDING */
        422, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
-      1678, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+      1682, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
        960, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
        140, /* GL_COLOR_ARRAY_BUFFER_BINDING */
        579, /* GL_INDEX_ARRAY_BUFFER_BINDING */
-      1552, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
+      1556, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
        416, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
       1323, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
        463, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
-      1730, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-      1700, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+      1734, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+      1704, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
       1167, /* GL_PROGRAM_INSTRUCTIONS_ARB */
        835, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
       1173, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
@@ -4613,14 +4621,14 @@ static const unsigned reduced_enums[1284] =
        836, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
        832, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
       1188, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-      1629, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+      1633, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
       1226, /* GL_READ_ONLY */
-      1738, /* GL_WRITE_ONLY */
+      1742, /* GL_WRITE_ONLY */
       1228, /* GL_READ_WRITE */
        101, /* GL_BUFFER_ACCESS */
        103, /* GL_BUFFER_MAPPED */
        105, /* GL_BUFFER_MAP_POINTER */
-      1623, /* GL_TIME_ELAPSED_EXT */
+      1627, /* GL_TIME_ELAPSED_EXT */
        746, /* GL_MATRIX0_ARB */
        758, /* GL_MATRIX1_ARB */
        770, /* GL_MATRIX2_ARB */
@@ -4653,9 +4661,9 @@ static const unsigned reduced_enums[1284] =
        769, /* GL_MATRIX29_ARB */
        772, /* GL_MATRIX30_ARB */
        773, /* GL_MATRIX31_ARB */
-      1425, /* GL_STREAM_DRAW */
-      1427, /* GL_STREAM_READ */
-      1423, /* GL_STREAM_COPY */
+      1429, /* GL_STREAM_DRAW */
+      1431, /* GL_STREAM_READ */
+      1427, /* GL_STREAM_COPY */
       1391, /* GL_STATIC_DRAW */
       1393, /* GL_STATIC_READ */
       1389, /* GL_STATIC_COPY */
@@ -4672,12 +4680,12 @@ static const unsigned reduced_enums[1284] =
        838, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
        837, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
        795, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
-      1419, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
+      1423, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
         17, /* GL_ACTIVE_STENCIL_FACE_EXT */
        894, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
       1304, /* GL_SAMPLES_PASSED */
        486, /* GL_FRAGMENT_SHADER */
-      1724, /* GL_VERTEX_SHADER */
+      1728, /* GL_VERTEX_SHADER */
       1178, /* GL_PROGRAM_OBJECT_ARB */
       1336, /* GL_SHADER_OBJECT_ARB */
        819, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
@@ -4715,7 +4723,7 @@ static const unsigned reduced_enums[1284] =
        312, /* GL_DELETE_STATUS */
        221, /* GL_COMPILE_STATUS */
        659, /* GL_LINK_STATUS */
-      1673, /* GL_VALIDATE_STATUS */
+      1677, /* GL_VALIDATE_STATUS */
        591, /* GL_INFO_LOG_LENGTH */
         56, /* GL_ATTACHED_SHADERS */
         20, /* GL_ACTIVE_UNIFORMS */
@@ -4738,12 +4746,12 @@ static const unsigned reduced_enums[1284] =
       1038, /* GL_PALETTE8_RGB5_A1_OES */
        574, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
        573, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
-      1507, /* GL_TEXTURE_1D_ARRAY_EXT */
+      1511, /* GL_TEXTURE_1D_ARRAY_EXT */
       1198, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
-      1509, /* GL_TEXTURE_2D_ARRAY_EXT */
+      1513, /* GL_TEXTURE_2D_ARRAY_EXT */
       1201, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
-      1515, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
-      1517, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
+      1519, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
+      1521, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
        543, /* GL_GL_SRGB */
        544, /* GL_GL_SRGB8 */
        546, /* GL_GL_SRGB_ALPHA */
@@ -4758,10 +4766,10 @@ static const unsigned reduced_enums[1284] =
        525, /* GL_GL_COMPRESSED_SLUMINANCE_ALPHA */
       1095, /* GL_POINT_SPRITE_COORD_ORIGIN */
        667, /* GL_LOWER_LEFT */
-      1670, /* GL_UPPER_LEFT */
-      1401, /* GL_STENCIL_BACK_REF */
-      1402, /* GL_STENCIL_BACK_VALUE_MASK */
-      1403, /* GL_STENCIL_BACK_WRITEMASK */
+      1674, /* GL_UPPER_LEFT */
+      1405, /* GL_STENCIL_BACK_REF */
+      1406, /* GL_STENCIL_BACK_VALUE_MASK */
+      1407, /* GL_STENCIL_BACK_WRITEMASK */
        403, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
       1240, /* GL_RENDERBUFFER_BINDING_EXT */
       1225, /* GL_READ_FRAMEBUFFER_EXT */
@@ -4806,15 +4814,15 @@ static const unsigned reduced_enums[1284] =
       1244, /* GL_RENDERBUFFER_WIDTH_EXT */
       1242, /* GL_RENDERBUFFER_HEIGHT_EXT */
       1243, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */
-      1414, /* GL_STENCIL_INDEX_EXT */
-      1411, /* GL_STENCIL_INDEX1_EXT */
-      1412, /* GL_STENCIL_INDEX4_EXT */
-      1413, /* GL_STENCIL_INDEX8_EXT */
-      1410, /* GL_STENCIL_INDEX16_EXT */
+      1418, /* GL_STENCIL_INDEX_EXT */
+      1415, /* GL_STENCIL_INDEX1_EXT */
+      1416, /* GL_STENCIL_INDEX4_EXT */
+      1417, /* GL_STENCIL_INDEX8_EXT */
+      1414, /* GL_STENCIL_INDEX16_EXT */
        428, /* GL_EVAL_BIT */
       1222, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
        661, /* GL_LIST_BIT */
-      1523, /* GL_TEXTURE_BIT */
+      1527, /* GL_TEXTURE_BIT */
       1319, /* GL_SCISSOR_BIT */
         29, /* GL_ALL_ATTRIB_BITS */
        941, /* GL_MULTISAMPLE_BIT */
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 2f88ec615a..34f279f1f4 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -818,6 +818,10 @@ _mesa_init_exec_table(struct _glapi_table *exec)
 #if FEATURE_EXT_framebuffer_object
    SET_FramebufferTextureLayerEXT(exec, _mesa_FramebufferTextureLayerEXT);
 #endif
+
+   /* GL_ATI_separate_stencil */
+   SET_StencilFuncSeparateATI(exec, _mesa_StencilFuncSeparateATI);
+   SET_StencilOpSeparateATI(exec, _mesa_StencilOpSeparateATI);
 }
 
 
diff --git a/src/mesa/main/stencil.c b/src/mesa/main/stencil.c
index ca7f6eaf88..17464310b1 100644
--- a/src/mesa/main/stencil.c
+++ b/src/mesa/main/stencil.c
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.5.2
+ * Version:  7.1
  *
- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -53,6 +53,48 @@
 #include "mtypes.h"
 
 
+static GLboolean
+validate_stencil_op(GLcontext *ctx, GLenum op)
+{
+   switch (op) {
+   case GL_KEEP:
+   case GL_ZERO:
+   case GL_REPLACE:
+   case GL_INCR:
+   case GL_DECR:
+   case GL_INVERT:
+      return GL_TRUE;
+   case GL_INCR_WRAP_EXT:
+   case GL_DECR_WRAP_EXT:
+      if (ctx->Extensions.EXT_stencil_wrap) {
+         return GL_TRUE;
+      }
+      /* FALL-THROUGH */
+   default:
+      return GL_FALSE;
+   }
+}
+
+
+static GLboolean
+validate_stencil_func(GLcontext *ctx, GLenum func)
+{
+   switch (func) {
+   case GL_NEVER:
+   case GL_LESS:
+   case GL_LEQUAL:
+   case GL_GREATER:
+   case GL_GEQUAL:
+   case GL_EQUAL:
+   case GL_NOTEQUAL:
+   case GL_ALWAYS:
+      return GL_TRUE;
+   default:
+      return GL_FALSE;
+   }
+}
+
+
 /**
  * Set the clear value for the stencil buffer.
  *
@@ -103,34 +145,15 @@ _mesa_StencilFuncSeparateATI( GLenum frontfunc, GLenum backfunc, GLint ref, GLui
    const GLint stencilMax = (1 << ctx->DrawBuffer->Visual.stencilBits) - 1;
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-   switch (frontfunc) {
-      case GL_NEVER:
-      case GL_LESS:
-      case GL_LEQUAL:
-      case GL_GREATER:
-      case GL_GEQUAL:
-      case GL_EQUAL:
-      case GL_NOTEQUAL:
-      case GL_ALWAYS:
-         break;
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glStencilFuncSeparateATI (0x%04x)", frontfunc );
-         return;
+   if (!validate_stencil_func(ctx, frontfunc)) {
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "glStencilFuncSeparateATI(frontfunc)");
+      return;
    }
-
-   switch (backfunc) {
-      case GL_NEVER:
-      case GL_LESS:
-      case GL_LEQUAL:
-      case GL_GREATER:
-      case GL_GEQUAL:
-      case GL_EQUAL:
-      case GL_NOTEQUAL:
-      case GL_ALWAYS:
-         break;
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glStencilFuncSeparateATI (0x%04x)", backfunc );
-         return;
+   if (!validate_stencil_func(ctx, backfunc)) {
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "glStencilFuncSeparateATI(backfunc)");
+      return;
    }
 
    ref = CLAMP( ref, 0, stencilMax );
@@ -157,6 +180,61 @@ _mesa_StencilFuncSeparateATI( GLenum frontfunc, GLenum backfunc, GLint ref, GLui
 }
 
 
+void APIENTRY
+_mesa_StencilOpSeparateATI(GLenum face, GLenum sfail, GLenum zfail, GLenum zpass)
+{
+   GLboolean set = GL_FALSE;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (!validate_stencil_op(ctx, sfail)) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glStencilOpSeparateATI(sfail)");
+      return;
+   }
+   if (!validate_stencil_op(ctx, zfail)) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glStencilOpSeparateATI(zfail)");
+      return;
+   }
+   if (!validate_stencil_op(ctx, zpass)) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glStencilOpSeparateATI(zpass)");
+      return;
+   }
+   if (face != GL_FRONT && face != GL_BACK && face != GL_FRONT_AND_BACK) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glStencilOpSeparateATI(face)");
+      return;
+   }
+
+   if (face != GL_BACK) {
+      /* set front */
+      if (ctx->Stencil.ZFailFunc[0] != zfail ||
+          ctx->Stencil.ZPassFunc[0] != zpass ||
+          ctx->Stencil.FailFunc[0] != sfail){
+         FLUSH_VERTICES(ctx, _NEW_STENCIL);
+         ctx->Stencil.ZFailFunc[0] = zfail;
+         ctx->Stencil.ZPassFunc[0] = zpass;
+         ctx->Stencil.FailFunc[0] = sfail;
+         set = GL_TRUE;
+      }
+   }
+   if (face != GL_FRONT) {
+      /* set back */
+      if (ctx->Stencil.ZFailFunc[1] != zfail ||
+          ctx->Stencil.ZPassFunc[1] != zpass ||
+          ctx->Stencil.FailFunc[1] != sfail) {
+         FLUSH_VERTICES(ctx, _NEW_STENCIL);
+         ctx->Stencil.ZFailFunc[1] = zfail;
+         ctx->Stencil.ZPassFunc[1] = zpass;
+         ctx->Stencil.FailFunc[1] = sfail;
+         set = GL_TRUE;
+      }
+   }
+   if (set && ctx->Driver.StencilOpSeparate) {
+      ctx->Driver.StencilOpSeparate(ctx, face, sfail, zfail, zpass);
+   }
+}
+
+
+
 /**
  * Set the function and reference value for stencil testing.
  *
@@ -177,19 +255,9 @@ _mesa_StencilFunc( GLenum func, GLint ref, GLuint mask )
    const GLint stencilMax = (1 << ctx->DrawBuffer->Visual.stencilBits) - 1;
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-   switch (func) {
-      case GL_NEVER:
-      case GL_LESS:
-      case GL_LEQUAL:
-      case GL_GREATER:
-      case GL_GEQUAL:
-      case GL_EQUAL:
-      case GL_NOTEQUAL:
-      case GL_ALWAYS:
-         break;
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glStencilFunc (0x%04x)", func );
-         return;
+   if (!validate_stencil_func(ctx, func)) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glStencilFunc(func)");
+      return;
    }
 
    ref = CLAMP( ref, 0, stencilMax );
@@ -293,59 +361,17 @@ _mesa_StencilOp(GLenum fail, GLenum zfail, GLenum zpass)
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-   switch (fail) {
-      case GL_KEEP:
-      case GL_ZERO:
-      case GL_REPLACE:
-      case GL_INCR:
-      case GL_DECR:
-      case GL_INVERT:
-         break;
-      case GL_INCR_WRAP_EXT:
-      case GL_DECR_WRAP_EXT:
-         if (ctx->Extensions.EXT_stencil_wrap) {
-            break;
-         }
-         /* FALL-THROUGH */
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glStencilOp");
-         return;
+   if (!validate_stencil_op(ctx, fail)) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glStencilOp(sfail)");
+      return;
    }
-   switch (zfail) {
-      case GL_KEEP:
-      case GL_ZERO:
-      case GL_REPLACE:
-      case GL_INCR:
-      case GL_DECR:
-      case GL_INVERT:
-         break;
-      case GL_INCR_WRAP_EXT:
-      case GL_DECR_WRAP_EXT:
-         if (ctx->Extensions.EXT_stencil_wrap) {
-            break;
-         }
-         /* FALL-THROUGH */
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glStencilOp");
-         return;
+   if (!validate_stencil_op(ctx, zfail)) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glStencilOp(zfail)");
+      return;
    }
-   switch (zpass) {
-      case GL_KEEP:
-      case GL_ZERO:
-      case GL_REPLACE:
-      case GL_INCR:
-      case GL_DECR:
-      case GL_INVERT:
-         break;
-      case GL_INCR_WRAP_EXT:
-      case GL_DECR_WRAP_EXT:
-         if (ctx->Extensions.EXT_stencil_wrap) {
-            break;
-         }
-         /* FALL-THROUGH */
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glStencilOp");
-         return;
+   if (!validate_stencil_op(ctx, zpass)) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glStencilOp(zpass)");
+      return;
    }
 
    if (ctx->Extensions.ATI_separate_stencil) {
@@ -428,59 +454,17 @@ _mesa_StencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLenum zpass)
       return;
    }
 
-   switch (fail) {
-      case GL_KEEP:
-      case GL_ZERO:
-      case GL_REPLACE:
-      case GL_INCR:
-      case GL_DECR:
-      case GL_INVERT:
-         break;
-      case GL_INCR_WRAP_EXT:
-      case GL_DECR_WRAP_EXT:
-         if (ctx->Extensions.EXT_stencil_wrap) {
-            break;
-         }
-         /* FALL-THROUGH */
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glStencilOpSeparate(fail)");
-         return;
+   if (!validate_stencil_op(ctx, fail)) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glStencilOpSeparate(sfail)");
+      return;
    }
-   switch (zfail) {
-      case GL_KEEP:
-      case GL_ZERO:
-      case GL_REPLACE:
-      case GL_INCR:
-      case GL_DECR:
-      case GL_INVERT:
-         break;
-      case GL_INCR_WRAP_EXT:
-      case GL_DECR_WRAP_EXT:
-         if (ctx->Extensions.EXT_stencil_wrap) {
-            break;
-         }
-         /* FALL-THROUGH */
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glStencilOpSeparate(zfail)");
-         return;
+   if (!validate_stencil_op(ctx, zfail)) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glStencilOpSeparate(zfail)");
+      return;
    }
-   switch (zpass) {
-      case GL_KEEP:
-      case GL_ZERO:
-      case GL_REPLACE:
-      case GL_INCR:
-      case GL_DECR:
-      case GL_INVERT:
-         break;
-      case GL_INCR_WRAP_EXT:
-      case GL_DECR_WRAP_EXT:
-         if (ctx->Extensions.EXT_stencil_wrap) {
-            break;
-         }
-         /* FALL-THROUGH */
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glStencilOpSeparate(zpass)");
-         return;
+   if (!validate_stencil_op(ctx, zpass)) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glStencilOpSeparate(zpass)");
+      return;
    }
 
    FLUSH_VERTICES(ctx, _NEW_STENCIL);
@@ -513,20 +497,9 @@ _mesa_StencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
       _mesa_error(ctx, GL_INVALID_ENUM, "glStencilFuncSeparate(face)");
       return;
    }
-
-   switch (func) {
-      case GL_NEVER:
-      case GL_LESS:
-      case GL_LEQUAL:
-      case GL_GREATER:
-      case GL_GEQUAL:
-      case GL_EQUAL:
-      case GL_NOTEQUAL:
-      case GL_ALWAYS:
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glStencilFuncSeparate(func)");
-         return;
+   if (!validate_stencil_func(ctx, func)) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glStencilFuncSeparate(func)");
+      return;
    }
 
    ref = CLAMP(ref, 0, stencilMax);
diff --git a/src/mesa/main/stencil.h b/src/mesa/main/stencil.h
index 0be9810005..15a65dbcac 100644
--- a/src/mesa/main/stencil.h
+++ b/src/mesa/main/stencil.h
@@ -5,9 +5,9 @@
 
 /*
  * Mesa 3-D graphics library
- * Version:  6.5
+ * Version:  7.1
  *
- * Copyright (C) 1999-2005  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -62,6 +62,10 @@ _mesa_StencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLenum zpass);
 extern void GLAPIENTRY
 _mesa_StencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask);
 
+
+extern void APIENTRY
+_mesa_StencilOpSeparateATI(GLenum face, GLenum sfail, GLenum zfail, GLenum zpass);
+
 extern void GLAPIENTRY
 _mesa_StencilFuncSeparateATI(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
 
diff --git a/src/mesa/sparc/glapi_sparc.S b/src/mesa/sparc/glapi_sparc.S
index 8725c7ee4d..91dc8c1792 100644
--- a/src/mesa/sparc/glapi_sparc.S
+++ b/src/mesa/sparc/glapi_sparc.S
@@ -838,6 +838,8 @@ __glapi_sparc_icache_flush: /* %o0 = insn_addr */
 		.globl gl_dispatch_stub_770 ; .type gl_dispatch_stub_770,#function
 		.globl gl_dispatch_stub_771 ; .type gl_dispatch_stub_771,#function
 		.globl gl_dispatch_stub_772 ; .type gl_dispatch_stub_772,#function
+		.globl gl_dispatch_stub_773 ; .type gl_dispatch_stub_773,#function
+		.globl gl_dispatch_stub_774 ; .type gl_dispatch_stub_774,#function
 		.globl _mesa_sparc_glapi_begin ; .type _mesa_sparc_glapi_begin,#function
 _mesa_sparc_glapi_begin:
 
@@ -1614,6 +1616,8 @@ _mesa_sparc_glapi_begin:
 	GL_STUB(gl_dispatch_stub_770, _gloffset__dispatch_stub_770)
 	GL_STUB(gl_dispatch_stub_771, _gloffset__dispatch_stub_771)
 	GL_STUB(gl_dispatch_stub_772, _gloffset__dispatch_stub_772)
+	GL_STUB(gl_dispatch_stub_773, _gloffset__dispatch_stub_773)
+	GL_STUB(gl_dispatch_stub_774, _gloffset__dispatch_stub_774)
 
 		.globl _mesa_sparc_glapi_end ; .type _mesa_sparc_glapi_end,#function
 _mesa_sparc_glapi_end:
diff --git a/src/mesa/x86-64/glapi_x86-64.S b/src/mesa/x86-64/glapi_x86-64.S
index 171e95d1b8..041ced0268 100644
--- a/src/mesa/x86-64/glapi_x86-64.S
+++ b/src/mesa/x86-64/glapi_x86-64.S
@@ -29220,7 +29220,11 @@ GL_PREFIX(_dispatch_stub_771):
 	pushq	%rdi
 	pushq	%rsi
 	pushq	%rdx
+	pushq	%rcx
+	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
+	popq	%rbp
+	popq	%rcx
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
@@ -29236,7 +29240,11 @@ GL_PREFIX(_dispatch_stub_771):
 	pushq	%rdi
 	pushq	%rsi
 	pushq	%rdx
+	pushq	%rcx
+	pushq	%rbp
 	call	_glapi_get_dispatch
+	popq	%rbp
+	popq	%rcx
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
@@ -29258,7 +29266,11 @@ GL_PREFIX(_dispatch_stub_772):
 	pushq	%rdi
 	pushq	%rsi
 	pushq	%rdx
+	pushq	%rcx
+	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
+	popq	%rbp
+	popq	%rcx
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
@@ -29274,7 +29286,11 @@ GL_PREFIX(_dispatch_stub_772):
 	pushq	%rdi
 	pushq	%rsi
 	pushq	%rdx
+	pushq	%rcx
+	pushq	%rbp
 	call	_glapi_get_dispatch
+	popq	%rbp
+	popq	%rcx
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
@@ -29283,6 +29299,82 @@ GL_PREFIX(_dispatch_stub_772):
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(_dispatch_stub_772), .-GL_PREFIX(_dispatch_stub_772)
 
+	.p2align	4,,15
+	.globl	GL_PREFIX(_dispatch_stub_773)
+	.type	GL_PREFIX(_dispatch_stub_773), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_773))
+GL_PREFIX(_dispatch_stub_773):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	6184(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_x86_64_get_dispatch@PLT
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	6184(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	6184(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_glapi_get_dispatch
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	6184(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(_dispatch_stub_773), .-GL_PREFIX(_dispatch_stub_773)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(_dispatch_stub_774)
+	.type	GL_PREFIX(_dispatch_stub_774), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_774))
+GL_PREFIX(_dispatch_stub_774):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	6192(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_x86_64_get_dispatch@PLT
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	6192(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	6192(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_glapi_get_dispatch
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	6192(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(_dispatch_stub_774), .-GL_PREFIX(_dispatch_stub_774)
+
 	.globl GL_PREFIX(ArrayElementEXT) ; .set GL_PREFIX(ArrayElementEXT), GL_PREFIX(ArrayElement)
 	.globl GL_PREFIX(BindTextureEXT) ; .set GL_PREFIX(BindTextureEXT), GL_PREFIX(BindTexture)
 	.globl GL_PREFIX(DrawArraysEXT) ; .set GL_PREFIX(DrawArraysEXT), GL_PREFIX(DrawArrays)
diff --git a/src/mesa/x86/glapi_x86.S b/src/mesa/x86/glapi_x86.S
index 8b7204cdb7..0afb054a14 100644
--- a/src/mesa/x86/glapi_x86.S
+++ b/src/mesa/x86/glapi_x86.S
@@ -948,14 +948,18 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(_dispatch_stub_767, _gloffset_BlitFramebufferEXT, _dispatch_stub_767@40)
 	HIDDEN(GL_PREFIX(_dispatch_stub_767, _dispatch_stub_767@40))
 	GL_STUB(FramebufferTextureLayerEXT, _gloffset_FramebufferTextureLayerEXT, FramebufferTextureLayerEXT@20)
-	GL_STUB(_dispatch_stub_769, _gloffset_ProgramEnvParameters4fvEXT, _dispatch_stub_769@16)
+	GL_STUB(_dispatch_stub_769, _gloffset_StencilFuncSeparateATI, _dispatch_stub_769@16)
 	HIDDEN(GL_PREFIX(_dispatch_stub_769, _dispatch_stub_769@16))
-	GL_STUB(_dispatch_stub_770, _gloffset_ProgramLocalParameters4fvEXT, _dispatch_stub_770@16)
+	GL_STUB(_dispatch_stub_770, _gloffset_StencilOpSeparateATI, _dispatch_stub_770@16)
 	HIDDEN(GL_PREFIX(_dispatch_stub_770, _dispatch_stub_770@16))
-	GL_STUB(_dispatch_stub_771, _gloffset_GetQueryObjecti64vEXT, _dispatch_stub_771@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_771, _dispatch_stub_771@12))
-	GL_STUB(_dispatch_stub_772, _gloffset_GetQueryObjectui64vEXT, _dispatch_stub_772@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_772, _dispatch_stub_772@12))
+	GL_STUB(_dispatch_stub_771, _gloffset_ProgramEnvParameters4fvEXT, _dispatch_stub_771@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_771, _dispatch_stub_771@16))
+	GL_STUB(_dispatch_stub_772, _gloffset_ProgramLocalParameters4fvEXT, _dispatch_stub_772@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_772, _dispatch_stub_772@16))
+	GL_STUB(_dispatch_stub_773, _gloffset_GetQueryObjecti64vEXT, _dispatch_stub_773@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_773, _dispatch_stub_773@12))
+	GL_STUB(_dispatch_stub_774, _gloffset_GetQueryObjectui64vEXT, _dispatch_stub_774@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_774, _dispatch_stub_774@12))
 	GL_STUB_ALIAS(ArrayElementEXT, _gloffset_ArrayElement, ArrayElementEXT@4, ArrayElement, ArrayElement@4)
 	GL_STUB_ALIAS(BindTextureEXT, _gloffset_BindTexture, BindTextureEXT@8, BindTexture, BindTexture@8)
 	GL_STUB_ALIAS(DrawArraysEXT, _gloffset_DrawArrays, DrawArraysEXT@12, DrawArrays, DrawArrays@12)
-- 
cgit v1.2.3


From 9edac96d69b6f9942c170c573c9aba4c35550639 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Tue, 30 Oct 2007 10:24:34 -0600
Subject: Alias glStencilOpSeparateATI with glStencilOpSeparate.

---
 src/mesa/drivers/dri/common/extension_helper.h |  12 +-
 src/mesa/glapi/dispatch.h                      |  17 +--
 src/mesa/glapi/gl_API.xml                      |   4 +-
 src/mesa/glapi/glapioffsets.h                  |  12 +-
 src/mesa/glapi/glapitable.h                    |  11 +-
 src/mesa/glapi/glapitemp.h                     |  33 ++---
 src/mesa/glapi/glprocs.h                       | 196 ++++++++++++-------------
 src/mesa/main/state.c                          |   1 -
 src/mesa/main/stencil.c                        | 101 ++++---------
 src/mesa/main/stencil.h                        |   3 -
 src/mesa/sparc/glapi_sparc.S                   |   2 -
 src/mesa/x86-64/glapi_x86-64.S                 |  46 ------
 src/mesa/x86/glapi_x86.S                       |  13 +-
 13 files changed, 168 insertions(+), 283 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/common/extension_helper.h b/src/mesa/drivers/dri/common/extension_helper.h
index 726d9900c3..065c5d8dae 100644
--- a/src/mesa/drivers/dri/common/extension_helper.h
+++ b/src/mesa/drivers/dri/common/extension_helper.h
@@ -1105,10 +1105,11 @@ static const char IsRenderbufferEXT_names[] =
     "";
 #endif
 
-#if defined(need_GL_VERSION_2_0)
+#if defined(need_GL_VERSION_2_0) || defined(need_GL_ATI_separate_stencil)
 static const char StencilOpSeparate_names[] = 
     "iiii\0" /* Parameter signature */
     "glStencilOpSeparate\0"
+    "glStencilOpSeparateATI\0"
     "";
 #endif
 
@@ -3839,13 +3840,6 @@ static const char Binormal3svEXT_names[] =
     "";
 #endif
 
-#if defined(need_GL_ATI_separate_stencil)
-static const char StencilOpSeparateATI_names[] = 
-    "iiii\0" /* Parameter signature */
-    "glStencilOpSeparateATI\0"
-    "";
-#endif
-
 #if defined(need_GL_EXT_light_texture)
 static const char ApplyTextureEXT_names[] = 
     "i\0" /* Parameter signature */
@@ -5198,7 +5192,7 @@ static const struct dri_extension_function GL_ATI_fragment_shader_functions[] =
 
 #if defined(need_GL_ATI_separate_stencil)
 static const struct dri_extension_function GL_ATI_separate_stencil_functions[] = {
-    { StencilOpSeparateATI_names, StencilOpSeparateATI_remap_index, -1 },
+    { StencilOpSeparate_names, StencilOpSeparate_remap_index, -1 },
     { StencilFuncSeparateATI_names, StencilFuncSeparateATI_remap_index, -1 },
     { NULL, 0, 0 }
 };
diff --git a/src/mesa/glapi/dispatch.h b/src/mesa/glapi/dispatch.h
index e46f159f94..db23e44396 100644
--- a/src/mesa/glapi/dispatch.h
+++ b/src/mesa/glapi/dispatch.h
@@ -2368,9 +2368,6 @@
 #define CALL_StencilFuncSeparateATI(disp, parameters) (*((disp)->StencilFuncSeparateATI)) parameters
 #define GET_StencilFuncSeparateATI(disp) ((disp)->StencilFuncSeparateATI)
 #define SET_StencilFuncSeparateATI(disp, fn) ((disp)->StencilFuncSeparateATI = fn)
-#define CALL_StencilOpSeparateATI(disp, parameters) (*((disp)->StencilOpSeparateATI)) parameters
-#define GET_StencilOpSeparateATI(disp) ((disp)->StencilOpSeparateATI)
-#define SET_StencilOpSeparateATI(disp, fn) ((disp)->StencilOpSeparateATI = fn)
 #define CALL_ProgramEnvParameters4fvEXT(disp, parameters) (*((disp)->ProgramEnvParameters4fvEXT)) parameters
 #define GET_ProgramEnvParameters4fvEXT(disp) ((disp)->ProgramEnvParameters4fvEXT)
 #define SET_ProgramEnvParameters4fvEXT(disp, fn) ((disp)->ProgramEnvParameters4fvEXT = fn)
@@ -2386,7 +2383,7 @@
 
 #else
 
-#define driDispatchRemapTable_size 367
+#define driDispatchRemapTable_size 366
 extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 
 #define AttachShader_remap_index 0
@@ -2751,11 +2748,10 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define BlitFramebufferEXT_remap_index 359
 #define FramebufferTextureLayerEXT_remap_index 360
 #define StencilFuncSeparateATI_remap_index 361
-#define StencilOpSeparateATI_remap_index 362
-#define ProgramEnvParameters4fvEXT_remap_index 363
-#define ProgramLocalParameters4fvEXT_remap_index 364
-#define GetQueryObjecti64vEXT_remap_index 365
-#define GetQueryObjectui64vEXT_remap_index 366
+#define ProgramEnvParameters4fvEXT_remap_index 362
+#define ProgramLocalParameters4fvEXT_remap_index 363
+#define GetQueryObjecti64vEXT_remap_index 364
+#define GetQueryObjectui64vEXT_remap_index 365
 
 #define CALL_AttachShader(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLuint)), driDispatchRemapTable[AttachShader_remap_index], parameters)
 #define GET_AttachShader(disp) GET_by_offset(disp, driDispatchRemapTable[AttachShader_remap_index])
@@ -3843,9 +3839,6 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define CALL_StencilFuncSeparateATI(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLint, GLuint)), driDispatchRemapTable[StencilFuncSeparateATI_remap_index], parameters)
 #define GET_StencilFuncSeparateATI(disp) GET_by_offset(disp, driDispatchRemapTable[StencilFuncSeparateATI_remap_index])
 #define SET_StencilFuncSeparateATI(disp, fn) SET_by_offset(disp, driDispatchRemapTable[StencilFuncSeparateATI_remap_index], fn)
-#define CALL_StencilOpSeparateATI(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLenum, GLenum)), driDispatchRemapTable[StencilOpSeparateATI_remap_index], parameters)
-#define GET_StencilOpSeparateATI(disp) GET_by_offset(disp, driDispatchRemapTable[StencilOpSeparateATI_remap_index])
-#define SET_StencilOpSeparateATI(disp, fn) SET_by_offset(disp, driDispatchRemapTable[StencilOpSeparateATI_remap_index], fn)
 #define CALL_ProgramEnvParameters4fvEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, GLsizei, const GLfloat *)), driDispatchRemapTable[ProgramEnvParameters4fvEXT_remap_index], parameters)
 #define GET_ProgramEnvParameters4fvEXT(disp) GET_by_offset(disp, driDispatchRemapTable[ProgramEnvParameters4fvEXT_remap_index])
 #define SET_ProgramEnvParameters4fvEXT(disp, fn) SET_by_offset(disp, driDispatchRemapTable[ProgramEnvParameters4fvEXT_remap_index], fn)
diff --git a/src/mesa/glapi/gl_API.xml b/src/mesa/glapi/gl_API.xml
index e16ffe870f..3d47e6f2ce 100644
--- a/src/mesa/glapi/gl_API.xml
+++ b/src/mesa/glapi/gl_API.xml
@@ -5138,7 +5138,7 @@
 
     <function name="StencilOpSeparate" offset="assign">
         <param name="face" type="GLenum"/>
-        <param name="fail" type="GLenum"/>
+        <param name="sfail" type="GLenum"/>
         <param name="zfail" type="GLenum"/>
         <param name="zpass" type="GLenum"/>
         <glx ignore="true"/>
@@ -12170,7 +12170,7 @@
         <size name="Get" mode="get"/>
     </enum>
 
-    <function name="StencilOpSeparateATI" offset="assign" static_dispatch="false">
+    <function name="StencilOpSeparateATI" alias="StencilOpSeparate" static_dispatch="false">
         <param name="face" type="GLenum"/>
         <param name="sfail" type="GLenum"/>
         <param name="zfail" type="GLenum"/>
diff --git a/src/mesa/glapi/glapioffsets.h b/src/mesa/glapi/glapioffsets.h
index a2db342ffe..4799fd3076 100644
--- a/src/mesa/glapi/glapioffsets.h
+++ b/src/mesa/glapi/glapioffsets.h
@@ -802,12 +802,11 @@
 #define _gloffset_BlitFramebufferEXT 767
 #define _gloffset_FramebufferTextureLayerEXT 768
 #define _gloffset_StencilFuncSeparateATI 769
-#define _gloffset_StencilOpSeparateATI 770
-#define _gloffset_ProgramEnvParameters4fvEXT 771
-#define _gloffset_ProgramLocalParameters4fvEXT 772
-#define _gloffset_GetQueryObjecti64vEXT 773
-#define _gloffset_GetQueryObjectui64vEXT 774
-#define _gloffset_FIRST_DYNAMIC 775
+#define _gloffset_ProgramEnvParameters4fvEXT 770
+#define _gloffset_ProgramLocalParameters4fvEXT 771
+#define _gloffset_GetQueryObjecti64vEXT 772
+#define _gloffset_GetQueryObjectui64vEXT 773
+#define _gloffset_FIRST_DYNAMIC 774
 
 #else
 
@@ -1173,7 +1172,6 @@
 #define _gloffset_BlitFramebufferEXT driDispatchRemapTable[BlitFramebufferEXT_remap_index]
 #define _gloffset_FramebufferTextureLayerEXT driDispatchRemapTable[FramebufferTextureLayerEXT_remap_index]
 #define _gloffset_StencilFuncSeparateATI driDispatchRemapTable[StencilFuncSeparateATI_remap_index]
-#define _gloffset_StencilOpSeparateATI driDispatchRemapTable[StencilOpSeparateATI_remap_index]
 #define _gloffset_ProgramEnvParameters4fvEXT driDispatchRemapTable[ProgramEnvParameters4fvEXT_remap_index]
 #define _gloffset_ProgramLocalParameters4fvEXT driDispatchRemapTable[ProgramLocalParameters4fvEXT_remap_index]
 #define _gloffset_GetQueryObjecti64vEXT driDispatchRemapTable[GetQueryObjecti64vEXT_remap_index]
diff --git a/src/mesa/glapi/glapitable.h b/src/mesa/glapi/glapitable.h
index 148aa96b88..22c2dc2f69 100644
--- a/src/mesa/glapi/glapitable.h
+++ b/src/mesa/glapi/glapitable.h
@@ -464,7 +464,7 @@ struct _glapi_table
    GLboolean (GLAPIENTRYP IsShader)(GLuint shader); /* 420 */
    void (GLAPIENTRYP StencilFuncSeparate)(GLenum face, GLenum func, GLint ref, GLuint mask); /* 421 */
    void (GLAPIENTRYP StencilMaskSeparate)(GLenum face, GLuint mask); /* 422 */
-   void (GLAPIENTRYP StencilOpSeparate)(GLenum face, GLenum fail, GLenum zfail, GLenum zpass); /* 423 */
+   void (GLAPIENTRYP StencilOpSeparate)(GLenum face, GLenum sfail, GLenum zfail, GLenum zpass); /* 423 */
    void (GLAPIENTRYP UniformMatrix2x3fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 424 */
    void (GLAPIENTRYP UniformMatrix2x4fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 425 */
    void (GLAPIENTRYP UniformMatrix3x2fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 426 */
@@ -811,11 +811,10 @@ struct _glapi_table
    void (GLAPIENTRYP BlitFramebufferEXT)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); /* 767 */
    void (GLAPIENTRYP FramebufferTextureLayerEXT)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); /* 768 */
    void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 769 */
-   void (GLAPIENTRYP StencilOpSeparateATI)(GLenum face, GLenum sfail, GLenum zfail, GLenum zpass); /* 770 */
-   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 771 */
-   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 772 */
-   void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 773 */
-   void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 774 */
+   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 770 */
+   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 771 */
+   void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 772 */
+   void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 773 */
 };
 
 #endif /* !defined( _GLAPI_TABLE_H_ ) */
diff --git a/src/mesa/glapi/glapitemp.h b/src/mesa/glapi/glapitemp.h
index cd420fdee5..6ded362c0e 100644
--- a/src/mesa/glapi/glapitemp.h
+++ b/src/mesa/glapi/glapitemp.h
@@ -2754,9 +2754,16 @@ KEYWORD1 void KEYWORD2 NAME(StencilMaskSeparate)(GLenum face, GLuint mask)
    DISPATCH(StencilMaskSeparate, (face, mask), (F, "glStencilMaskSeparate(0x%x, %d);\n", face, mask));
 }
 
-KEYWORD1 void KEYWORD2 NAME(StencilOpSeparate)(GLenum face, GLenum fail, GLenum zfail, GLenum zpass)
+KEYWORD1 void KEYWORD2 NAME(StencilOpSeparate)(GLenum face, GLenum sfail, GLenum zfail, GLenum zpass)
 {
-   DISPATCH(StencilOpSeparate, (face, fail, zfail, zpass), (F, "glStencilOpSeparate(0x%x, 0x%x, 0x%x, 0x%x);\n", face, fail, zfail, zpass));
+   DISPATCH(StencilOpSeparate, (face, sfail, zfail, zpass), (F, "glStencilOpSeparate(0x%x, 0x%x, 0x%x, 0x%x);\n", face, sfail, zfail, zpass));
+}
+
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_423)(GLenum face, GLenum sfail, GLenum zfail, GLenum zpass);
+
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_423)(GLenum face, GLenum sfail, GLenum zfail, GLenum zpass)
+{
+   DISPATCH(StencilOpSeparate, (face, sfail, zfail, zpass), (F, "glStencilOpSeparateATI(0x%x, 0x%x, 0x%x, 0x%x);\n", face, sfail, zfail, zpass));
 }
 
 KEYWORD1 void KEYWORD2 NAME(UniformMatrix2x3fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value)
@@ -5453,37 +5460,30 @@ KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_769)(GLenum frontfunc, GLenum bac
    DISPATCH(StencilFuncSeparateATI, (frontfunc, backfunc, ref, mask), (F, "glStencilFuncSeparateATI(0x%x, 0x%x, %d, %d);\n", frontfunc, backfunc, ref, mask));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_770)(GLenum face, GLenum sfail, GLenum zfail, GLenum zpass);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_770)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_770)(GLenum face, GLenum sfail, GLenum zfail, GLenum zpass)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_770)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
 {
-   DISPATCH(StencilOpSeparateATI, (face, sfail, zfail, zpass), (F, "glStencilOpSeparateATI(0x%x, 0x%x, 0x%x, 0x%x);\n", face, sfail, zfail, zpass));
+   DISPATCH(ProgramEnvParameters4fvEXT, (target, index, count, params), (F, "glProgramEnvParameters4fvEXT(0x%x, %d, %d, %p);\n", target, index, count, (const void *) params));
 }
 
 KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_771)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
 
 KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_771)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
-{
-   DISPATCH(ProgramEnvParameters4fvEXT, (target, index, count, params), (F, "glProgramEnvParameters4fvEXT(0x%x, %d, %d, %p);\n", target, index, count, (const void *) params));
-}
-
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_772)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
-
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_772)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
 {
    DISPATCH(ProgramLocalParameters4fvEXT, (target, index, count, params), (F, "glProgramLocalParameters4fvEXT(0x%x, %d, %d, %p);\n", target, index, count, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_773)(GLuint id, GLenum pname, GLint64EXT * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_772)(GLuint id, GLenum pname, GLint64EXT * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_773)(GLuint id, GLenum pname, GLint64EXT * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_772)(GLuint id, GLenum pname, GLint64EXT * params)
 {
    DISPATCH(GetQueryObjecti64vEXT, (id, pname, params), (F, "glGetQueryObjecti64vEXT(%d, 0x%x, %p);\n", id, pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_774)(GLuint id, GLenum pname, GLuint64EXT * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_773)(GLuint id, GLenum pname, GLuint64EXT * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_774)(GLuint id, GLenum pname, GLuint64EXT * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_773)(GLuint id, GLenum pname, GLuint64EXT * params)
 {
    DISPATCH(GetQueryObjectui64vEXT, (id, pname, params), (F, "glGetQueryObjectui64vEXT(%d, 0x%x, %p);\n", id, pname, (const void *) params));
 }
@@ -6276,7 +6276,6 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(_dispatch_stub_771),
    TABLE_ENTRY(_dispatch_stub_772),
    TABLE_ENTRY(_dispatch_stub_773),
-   TABLE_ENTRY(_dispatch_stub_774),
    /* A whole bunch of no-op functions.  These might be called
     * when someone tries to call a dynamically-registered
     * extension function without a current rendering context.
diff --git a/src/mesa/glapi/glprocs.h b/src/mesa/glapi/glprocs.h
index 657b74e578..abc22a9a04 100644
--- a/src/mesa/glapi/glprocs.h
+++ b/src/mesa/glapi/glprocs.h
@@ -822,7 +822,6 @@ static const char gl_string_table[] =
     "glBlitFramebufferEXT\0"
     "glFramebufferTextureLayerEXT\0"
     "glStencilFuncSeparateATI\0"
-    "glStencilOpSeparateATI\0"
     "glProgramEnvParameters4fvEXT\0"
     "glProgramLocalParameters4fvEXT\0"
     "glGetQueryObjecti64vEXT\0"
@@ -918,6 +917,7 @@ static const char gl_string_table[] =
     "glMultiTexCoord4iv\0"
     "glMultiTexCoord4s\0"
     "glMultiTexCoord4sv\0"
+    "glStencilOpSeparateATI\0"
     "glLoadTransposeMatrixd\0"
     "glLoadTransposeMatrixf\0"
     "glMultTransposeMatrixd\0"
@@ -1151,7 +1151,6 @@ static const char gl_string_table[] =
 #define gl_dispatch_stub_771 mgl_dispatch_stub_771
 #define gl_dispatch_stub_772 mgl_dispatch_stub_772
 #define gl_dispatch_stub_773 mgl_dispatch_stub_773
-#define gl_dispatch_stub_774 mgl_dispatch_stub_774
 #endif /* USE_MGL_NAMESPACE */
 
 
@@ -1203,7 +1202,6 @@ extern void gl_dispatch_stub_770(void);
 extern void gl_dispatch_stub_771(void);
 extern void gl_dispatch_stub_772(void);
 extern void gl_dispatch_stub_773(void);
-extern void gl_dispatch_stub_774(void);
 #endif /* defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING) */
 
 static const glprocs_table_t static_functions[] = {
@@ -1977,102 +1975,102 @@ static const glprocs_table_t static_functions[] = {
     NAME_FUNC_OFFSET(13449, gl_dispatch_stub_767, gl_dispatch_stub_767, NULL, _gloffset_BlitFramebufferEXT),
     NAME_FUNC_OFFSET(13470, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
     NAME_FUNC_OFFSET(13499, gl_dispatch_stub_769, gl_dispatch_stub_769, NULL, _gloffset_StencilFuncSeparateATI),
-    NAME_FUNC_OFFSET(13524, gl_dispatch_stub_770, gl_dispatch_stub_770, NULL, _gloffset_StencilOpSeparateATI),
-    NAME_FUNC_OFFSET(13547, gl_dispatch_stub_771, gl_dispatch_stub_771, NULL, _gloffset_ProgramEnvParameters4fvEXT),
-    NAME_FUNC_OFFSET(13576, gl_dispatch_stub_772, gl_dispatch_stub_772, NULL, _gloffset_ProgramLocalParameters4fvEXT),
-    NAME_FUNC_OFFSET(13607, gl_dispatch_stub_773, gl_dispatch_stub_773, NULL, _gloffset_GetQueryObjecti64vEXT),
-    NAME_FUNC_OFFSET(13631, gl_dispatch_stub_774, gl_dispatch_stub_774, NULL, _gloffset_GetQueryObjectui64vEXT),
-    NAME_FUNC_OFFSET(13656, glArrayElement, glArrayElement, NULL, _gloffset_ArrayElement),
-    NAME_FUNC_OFFSET(13674, glBindTexture, glBindTexture, NULL, _gloffset_BindTexture),
-    NAME_FUNC_OFFSET(13691, glDrawArrays, glDrawArrays, NULL, _gloffset_DrawArrays),
-    NAME_FUNC_OFFSET(13707, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, _gloffset_AreTexturesResident),
-    NAME_FUNC_OFFSET(13732, glCopyTexImage1D, glCopyTexImage1D, NULL, _gloffset_CopyTexImage1D),
-    NAME_FUNC_OFFSET(13752, glCopyTexImage2D, glCopyTexImage2D, NULL, _gloffset_CopyTexImage2D),
-    NAME_FUNC_OFFSET(13772, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, _gloffset_CopyTexSubImage1D),
-    NAME_FUNC_OFFSET(13795, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, _gloffset_CopyTexSubImage2D),
-    NAME_FUNC_OFFSET(13818, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, _gloffset_DeleteTextures),
-    NAME_FUNC_OFFSET(13838, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, _gloffset_GenTextures),
-    NAME_FUNC_OFFSET(13855, glGetPointerv, glGetPointerv, NULL, _gloffset_GetPointerv),
-    NAME_FUNC_OFFSET(13872, glIsTexture, glIsTextureEXT, glIsTextureEXT, _gloffset_IsTexture),
-    NAME_FUNC_OFFSET(13887, glPrioritizeTextures, glPrioritizeTextures, NULL, _gloffset_PrioritizeTextures),
-    NAME_FUNC_OFFSET(13911, glTexSubImage1D, glTexSubImage1D, NULL, _gloffset_TexSubImage1D),
-    NAME_FUNC_OFFSET(13930, glTexSubImage2D, glTexSubImage2D, NULL, _gloffset_TexSubImage2D),
-    NAME_FUNC_OFFSET(13949, glBlendColor, glBlendColor, NULL, _gloffset_BlendColor),
-    NAME_FUNC_OFFSET(13965, glBlendEquation, glBlendEquation, NULL, _gloffset_BlendEquation),
-    NAME_FUNC_OFFSET(13984, glDrawRangeElements, glDrawRangeElements, NULL, _gloffset_DrawRangeElements),
-    NAME_FUNC_OFFSET(14007, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
-    NAME_FUNC_OFFSET(14023, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
-    NAME_FUNC_OFFSET(14039, glColorTableParameterfv, glColorTableParameterfv, NULL, _gloffset_ColorTableParameterfv),
-    NAME_FUNC_OFFSET(14066, glColorTableParameteriv, glColorTableParameteriv, NULL, _gloffset_ColorTableParameteriv),
-    NAME_FUNC_OFFSET(14093, glCopyColorTable, glCopyColorTable, NULL, _gloffset_CopyColorTable),
-    NAME_FUNC_OFFSET(14113, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
-    NAME_FUNC_OFFSET(14132, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
-    NAME_FUNC_OFFSET(14151, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
-    NAME_FUNC_OFFSET(14181, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
-    NAME_FUNC_OFFSET(14211, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
-    NAME_FUNC_OFFSET(14241, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
-    NAME_FUNC_OFFSET(14271, glColorSubTable, glColorSubTable, NULL, _gloffset_ColorSubTable),
-    NAME_FUNC_OFFSET(14290, glCopyColorSubTable, glCopyColorSubTable, NULL, _gloffset_CopyColorSubTable),
-    NAME_FUNC_OFFSET(14313, glConvolutionFilter1D, glConvolutionFilter1D, NULL, _gloffset_ConvolutionFilter1D),
-    NAME_FUNC_OFFSET(14338, glConvolutionFilter2D, glConvolutionFilter2D, NULL, _gloffset_ConvolutionFilter2D),
-    NAME_FUNC_OFFSET(14363, glConvolutionParameterf, glConvolutionParameterf, NULL, _gloffset_ConvolutionParameterf),
-    NAME_FUNC_OFFSET(14390, glConvolutionParameterfv, glConvolutionParameterfv, NULL, _gloffset_ConvolutionParameterfv),
-    NAME_FUNC_OFFSET(14418, glConvolutionParameteri, glConvolutionParameteri, NULL, _gloffset_ConvolutionParameteri),
-    NAME_FUNC_OFFSET(14445, glConvolutionParameteriv, glConvolutionParameteriv, NULL, _gloffset_ConvolutionParameteriv),
-    NAME_FUNC_OFFSET(14473, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, _gloffset_CopyConvolutionFilter1D),
-    NAME_FUNC_OFFSET(14502, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, _gloffset_CopyConvolutionFilter2D),
-    NAME_FUNC_OFFSET(14531, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, _gloffset_GetConvolutionFilter),
-    NAME_FUNC_OFFSET(14557, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, _gloffset_GetConvolutionParameterfv),
-    NAME_FUNC_OFFSET(14588, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, _gloffset_GetConvolutionParameteriv),
-    NAME_FUNC_OFFSET(14619, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, _gloffset_GetSeparableFilter),
-    NAME_FUNC_OFFSET(14643, glSeparableFilter2D, glSeparableFilter2D, NULL, _gloffset_SeparableFilter2D),
-    NAME_FUNC_OFFSET(14666, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, _gloffset_GetHistogram),
-    NAME_FUNC_OFFSET(14684, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, _gloffset_GetHistogramParameterfv),
-    NAME_FUNC_OFFSET(14713, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, _gloffset_GetHistogramParameteriv),
-    NAME_FUNC_OFFSET(14742, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, _gloffset_GetMinmax),
-    NAME_FUNC_OFFSET(14757, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, _gloffset_GetMinmaxParameterfv),
-    NAME_FUNC_OFFSET(14783, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, _gloffset_GetMinmaxParameteriv),
-    NAME_FUNC_OFFSET(14809, glHistogram, glHistogram, NULL, _gloffset_Histogram),
-    NAME_FUNC_OFFSET(14824, glMinmax, glMinmax, NULL, _gloffset_Minmax),
-    NAME_FUNC_OFFSET(14836, glResetHistogram, glResetHistogram, NULL, _gloffset_ResetHistogram),
-    NAME_FUNC_OFFSET(14856, glResetMinmax, glResetMinmax, NULL, _gloffset_ResetMinmax),
-    NAME_FUNC_OFFSET(14873, glTexImage3D, glTexImage3D, NULL, _gloffset_TexImage3D),
-    NAME_FUNC_OFFSET(14889, glTexSubImage3D, glTexSubImage3D, NULL, _gloffset_TexSubImage3D),
-    NAME_FUNC_OFFSET(14908, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, _gloffset_CopyTexSubImage3D),
-    NAME_FUNC_OFFSET(14931, glActiveTextureARB, glActiveTextureARB, NULL, _gloffset_ActiveTextureARB),
-    NAME_FUNC_OFFSET(14947, glClientActiveTextureARB, glClientActiveTextureARB, NULL, _gloffset_ClientActiveTextureARB),
-    NAME_FUNC_OFFSET(14969, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL, _gloffset_MultiTexCoord1dARB),
-    NAME_FUNC_OFFSET(14987, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL, _gloffset_MultiTexCoord1dvARB),
-    NAME_FUNC_OFFSET(15006, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, _gloffset_MultiTexCoord1fARB),
-    NAME_FUNC_OFFSET(15024, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, _gloffset_MultiTexCoord1fvARB),
-    NAME_FUNC_OFFSET(15043, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL, _gloffset_MultiTexCoord1iARB),
-    NAME_FUNC_OFFSET(15061, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL, _gloffset_MultiTexCoord1ivARB),
-    NAME_FUNC_OFFSET(15080, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL, _gloffset_MultiTexCoord1sARB),
-    NAME_FUNC_OFFSET(15098, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL, _gloffset_MultiTexCoord1svARB),
-    NAME_FUNC_OFFSET(15117, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL, _gloffset_MultiTexCoord2dARB),
-    NAME_FUNC_OFFSET(15135, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL, _gloffset_MultiTexCoord2dvARB),
-    NAME_FUNC_OFFSET(15154, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, _gloffset_MultiTexCoord2fARB),
-    NAME_FUNC_OFFSET(15172, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, _gloffset_MultiTexCoord2fvARB),
-    NAME_FUNC_OFFSET(15191, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL, _gloffset_MultiTexCoord2iARB),
-    NAME_FUNC_OFFSET(15209, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL, _gloffset_MultiTexCoord2ivARB),
-    NAME_FUNC_OFFSET(15228, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL, _gloffset_MultiTexCoord2sARB),
-    NAME_FUNC_OFFSET(15246, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL, _gloffset_MultiTexCoord2svARB),
-    NAME_FUNC_OFFSET(15265, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL, _gloffset_MultiTexCoord3dARB),
-    NAME_FUNC_OFFSET(15283, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL, _gloffset_MultiTexCoord3dvARB),
-    NAME_FUNC_OFFSET(15302, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, _gloffset_MultiTexCoord3fARB),
-    NAME_FUNC_OFFSET(15320, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, _gloffset_MultiTexCoord3fvARB),
-    NAME_FUNC_OFFSET(15339, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL, _gloffset_MultiTexCoord3iARB),
-    NAME_FUNC_OFFSET(15357, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL, _gloffset_MultiTexCoord3ivARB),
-    NAME_FUNC_OFFSET(15376, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL, _gloffset_MultiTexCoord3sARB),
-    NAME_FUNC_OFFSET(15394, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL, _gloffset_MultiTexCoord3svARB),
-    NAME_FUNC_OFFSET(15413, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL, _gloffset_MultiTexCoord4dARB),
-    NAME_FUNC_OFFSET(15431, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL, _gloffset_MultiTexCoord4dvARB),
-    NAME_FUNC_OFFSET(15450, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, _gloffset_MultiTexCoord4fARB),
-    NAME_FUNC_OFFSET(15468, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, _gloffset_MultiTexCoord4fvARB),
-    NAME_FUNC_OFFSET(15487, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL, _gloffset_MultiTexCoord4iARB),
-    NAME_FUNC_OFFSET(15505, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL, _gloffset_MultiTexCoord4ivARB),
-    NAME_FUNC_OFFSET(15524, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL, _gloffset_MultiTexCoord4sARB),
-    NAME_FUNC_OFFSET(15542, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL, _gloffset_MultiTexCoord4svARB),
+    NAME_FUNC_OFFSET(13524, gl_dispatch_stub_770, gl_dispatch_stub_770, NULL, _gloffset_ProgramEnvParameters4fvEXT),
+    NAME_FUNC_OFFSET(13553, gl_dispatch_stub_771, gl_dispatch_stub_771, NULL, _gloffset_ProgramLocalParameters4fvEXT),
+    NAME_FUNC_OFFSET(13584, gl_dispatch_stub_772, gl_dispatch_stub_772, NULL, _gloffset_GetQueryObjecti64vEXT),
+    NAME_FUNC_OFFSET(13608, gl_dispatch_stub_773, gl_dispatch_stub_773, NULL, _gloffset_GetQueryObjectui64vEXT),
+    NAME_FUNC_OFFSET(13633, glArrayElement, glArrayElement, NULL, _gloffset_ArrayElement),
+    NAME_FUNC_OFFSET(13651, glBindTexture, glBindTexture, NULL, _gloffset_BindTexture),
+    NAME_FUNC_OFFSET(13668, glDrawArrays, glDrawArrays, NULL, _gloffset_DrawArrays),
+    NAME_FUNC_OFFSET(13684, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, _gloffset_AreTexturesResident),
+    NAME_FUNC_OFFSET(13709, glCopyTexImage1D, glCopyTexImage1D, NULL, _gloffset_CopyTexImage1D),
+    NAME_FUNC_OFFSET(13729, glCopyTexImage2D, glCopyTexImage2D, NULL, _gloffset_CopyTexImage2D),
+    NAME_FUNC_OFFSET(13749, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, _gloffset_CopyTexSubImage1D),
+    NAME_FUNC_OFFSET(13772, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, _gloffset_CopyTexSubImage2D),
+    NAME_FUNC_OFFSET(13795, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, _gloffset_DeleteTextures),
+    NAME_FUNC_OFFSET(13815, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, _gloffset_GenTextures),
+    NAME_FUNC_OFFSET(13832, glGetPointerv, glGetPointerv, NULL, _gloffset_GetPointerv),
+    NAME_FUNC_OFFSET(13849, glIsTexture, glIsTextureEXT, glIsTextureEXT, _gloffset_IsTexture),
+    NAME_FUNC_OFFSET(13864, glPrioritizeTextures, glPrioritizeTextures, NULL, _gloffset_PrioritizeTextures),
+    NAME_FUNC_OFFSET(13888, glTexSubImage1D, glTexSubImage1D, NULL, _gloffset_TexSubImage1D),
+    NAME_FUNC_OFFSET(13907, glTexSubImage2D, glTexSubImage2D, NULL, _gloffset_TexSubImage2D),
+    NAME_FUNC_OFFSET(13926, glBlendColor, glBlendColor, NULL, _gloffset_BlendColor),
+    NAME_FUNC_OFFSET(13942, glBlendEquation, glBlendEquation, NULL, _gloffset_BlendEquation),
+    NAME_FUNC_OFFSET(13961, glDrawRangeElements, glDrawRangeElements, NULL, _gloffset_DrawRangeElements),
+    NAME_FUNC_OFFSET(13984, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
+    NAME_FUNC_OFFSET(14000, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
+    NAME_FUNC_OFFSET(14016, glColorTableParameterfv, glColorTableParameterfv, NULL, _gloffset_ColorTableParameterfv),
+    NAME_FUNC_OFFSET(14043, glColorTableParameteriv, glColorTableParameteriv, NULL, _gloffset_ColorTableParameteriv),
+    NAME_FUNC_OFFSET(14070, glCopyColorTable, glCopyColorTable, NULL, _gloffset_CopyColorTable),
+    NAME_FUNC_OFFSET(14090, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
+    NAME_FUNC_OFFSET(14109, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
+    NAME_FUNC_OFFSET(14128, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
+    NAME_FUNC_OFFSET(14158, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
+    NAME_FUNC_OFFSET(14188, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
+    NAME_FUNC_OFFSET(14218, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
+    NAME_FUNC_OFFSET(14248, glColorSubTable, glColorSubTable, NULL, _gloffset_ColorSubTable),
+    NAME_FUNC_OFFSET(14267, glCopyColorSubTable, glCopyColorSubTable, NULL, _gloffset_CopyColorSubTable),
+    NAME_FUNC_OFFSET(14290, glConvolutionFilter1D, glConvolutionFilter1D, NULL, _gloffset_ConvolutionFilter1D),
+    NAME_FUNC_OFFSET(14315, glConvolutionFilter2D, glConvolutionFilter2D, NULL, _gloffset_ConvolutionFilter2D),
+    NAME_FUNC_OFFSET(14340, glConvolutionParameterf, glConvolutionParameterf, NULL, _gloffset_ConvolutionParameterf),
+    NAME_FUNC_OFFSET(14367, glConvolutionParameterfv, glConvolutionParameterfv, NULL, _gloffset_ConvolutionParameterfv),
+    NAME_FUNC_OFFSET(14395, glConvolutionParameteri, glConvolutionParameteri, NULL, _gloffset_ConvolutionParameteri),
+    NAME_FUNC_OFFSET(14422, glConvolutionParameteriv, glConvolutionParameteriv, NULL, _gloffset_ConvolutionParameteriv),
+    NAME_FUNC_OFFSET(14450, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, _gloffset_CopyConvolutionFilter1D),
+    NAME_FUNC_OFFSET(14479, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, _gloffset_CopyConvolutionFilter2D),
+    NAME_FUNC_OFFSET(14508, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, _gloffset_GetConvolutionFilter),
+    NAME_FUNC_OFFSET(14534, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, _gloffset_GetConvolutionParameterfv),
+    NAME_FUNC_OFFSET(14565, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, _gloffset_GetConvolutionParameteriv),
+    NAME_FUNC_OFFSET(14596, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, _gloffset_GetSeparableFilter),
+    NAME_FUNC_OFFSET(14620, glSeparableFilter2D, glSeparableFilter2D, NULL, _gloffset_SeparableFilter2D),
+    NAME_FUNC_OFFSET(14643, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, _gloffset_GetHistogram),
+    NAME_FUNC_OFFSET(14661, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, _gloffset_GetHistogramParameterfv),
+    NAME_FUNC_OFFSET(14690, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, _gloffset_GetHistogramParameteriv),
+    NAME_FUNC_OFFSET(14719, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, _gloffset_GetMinmax),
+    NAME_FUNC_OFFSET(14734, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, _gloffset_GetMinmaxParameterfv),
+    NAME_FUNC_OFFSET(14760, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, _gloffset_GetMinmaxParameteriv),
+    NAME_FUNC_OFFSET(14786, glHistogram, glHistogram, NULL, _gloffset_Histogram),
+    NAME_FUNC_OFFSET(14801, glMinmax, glMinmax, NULL, _gloffset_Minmax),
+    NAME_FUNC_OFFSET(14813, glResetHistogram, glResetHistogram, NULL, _gloffset_ResetHistogram),
+    NAME_FUNC_OFFSET(14833, glResetMinmax, glResetMinmax, NULL, _gloffset_ResetMinmax),
+    NAME_FUNC_OFFSET(14850, glTexImage3D, glTexImage3D, NULL, _gloffset_TexImage3D),
+    NAME_FUNC_OFFSET(14866, glTexSubImage3D, glTexSubImage3D, NULL, _gloffset_TexSubImage3D),
+    NAME_FUNC_OFFSET(14885, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, _gloffset_CopyTexSubImage3D),
+    NAME_FUNC_OFFSET(14908, glActiveTextureARB, glActiveTextureARB, NULL, _gloffset_ActiveTextureARB),
+    NAME_FUNC_OFFSET(14924, glClientActiveTextureARB, glClientActiveTextureARB, NULL, _gloffset_ClientActiveTextureARB),
+    NAME_FUNC_OFFSET(14946, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL, _gloffset_MultiTexCoord1dARB),
+    NAME_FUNC_OFFSET(14964, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL, _gloffset_MultiTexCoord1dvARB),
+    NAME_FUNC_OFFSET(14983, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, _gloffset_MultiTexCoord1fARB),
+    NAME_FUNC_OFFSET(15001, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, _gloffset_MultiTexCoord1fvARB),
+    NAME_FUNC_OFFSET(15020, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL, _gloffset_MultiTexCoord1iARB),
+    NAME_FUNC_OFFSET(15038, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL, _gloffset_MultiTexCoord1ivARB),
+    NAME_FUNC_OFFSET(15057, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL, _gloffset_MultiTexCoord1sARB),
+    NAME_FUNC_OFFSET(15075, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL, _gloffset_MultiTexCoord1svARB),
+    NAME_FUNC_OFFSET(15094, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL, _gloffset_MultiTexCoord2dARB),
+    NAME_FUNC_OFFSET(15112, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL, _gloffset_MultiTexCoord2dvARB),
+    NAME_FUNC_OFFSET(15131, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, _gloffset_MultiTexCoord2fARB),
+    NAME_FUNC_OFFSET(15149, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, _gloffset_MultiTexCoord2fvARB),
+    NAME_FUNC_OFFSET(15168, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL, _gloffset_MultiTexCoord2iARB),
+    NAME_FUNC_OFFSET(15186, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL, _gloffset_MultiTexCoord2ivARB),
+    NAME_FUNC_OFFSET(15205, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL, _gloffset_MultiTexCoord2sARB),
+    NAME_FUNC_OFFSET(15223, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL, _gloffset_MultiTexCoord2svARB),
+    NAME_FUNC_OFFSET(15242, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL, _gloffset_MultiTexCoord3dARB),
+    NAME_FUNC_OFFSET(15260, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL, _gloffset_MultiTexCoord3dvARB),
+    NAME_FUNC_OFFSET(15279, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, _gloffset_MultiTexCoord3fARB),
+    NAME_FUNC_OFFSET(15297, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, _gloffset_MultiTexCoord3fvARB),
+    NAME_FUNC_OFFSET(15316, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL, _gloffset_MultiTexCoord3iARB),
+    NAME_FUNC_OFFSET(15334, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL, _gloffset_MultiTexCoord3ivARB),
+    NAME_FUNC_OFFSET(15353, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL, _gloffset_MultiTexCoord3sARB),
+    NAME_FUNC_OFFSET(15371, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL, _gloffset_MultiTexCoord3svARB),
+    NAME_FUNC_OFFSET(15390, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL, _gloffset_MultiTexCoord4dARB),
+    NAME_FUNC_OFFSET(15408, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL, _gloffset_MultiTexCoord4dvARB),
+    NAME_FUNC_OFFSET(15427, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, _gloffset_MultiTexCoord4fARB),
+    NAME_FUNC_OFFSET(15445, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, _gloffset_MultiTexCoord4fvARB),
+    NAME_FUNC_OFFSET(15464, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL, _gloffset_MultiTexCoord4iARB),
+    NAME_FUNC_OFFSET(15482, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL, _gloffset_MultiTexCoord4ivARB),
+    NAME_FUNC_OFFSET(15501, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL, _gloffset_MultiTexCoord4sARB),
+    NAME_FUNC_OFFSET(15519, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL, _gloffset_MultiTexCoord4svARB),
+    NAME_FUNC_OFFSET(15538, glStencilOpSeparate, glStencilOpSeparate, NULL, _gloffset_StencilOpSeparate),
     NAME_FUNC_OFFSET(15561, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, _gloffset_LoadTransposeMatrixdARB),
     NAME_FUNC_OFFSET(15584, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, _gloffset_LoadTransposeMatrixfARB),
     NAME_FUNC_OFFSET(15607, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, _gloffset_MultTransposeMatrixdARB),
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 34f279f1f4..0b1c56fdd5 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -821,7 +821,6 @@ _mesa_init_exec_table(struct _glapi_table *exec)
 
    /* GL_ATI_separate_stencil */
    SET_StencilFuncSeparateATI(exec, _mesa_StencilFuncSeparateATI);
-   SET_StencilOpSeparateATI(exec, _mesa_StencilOpSeparateATI);
 }
 
 
diff --git a/src/mesa/main/stencil.c b/src/mesa/main/stencil.c
index 17464310b1..c1906197de 100644
--- a/src/mesa/main/stencil.c
+++ b/src/mesa/main/stencil.c
@@ -180,61 +180,6 @@ _mesa_StencilFuncSeparateATI( GLenum frontfunc, GLenum backfunc, GLint ref, GLui
 }
 
 
-void APIENTRY
-_mesa_StencilOpSeparateATI(GLenum face, GLenum sfail, GLenum zfail, GLenum zpass)
-{
-   GLboolean set = GL_FALSE;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (!validate_stencil_op(ctx, sfail)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glStencilOpSeparateATI(sfail)");
-      return;
-   }
-   if (!validate_stencil_op(ctx, zfail)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glStencilOpSeparateATI(zfail)");
-      return;
-   }
-   if (!validate_stencil_op(ctx, zpass)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glStencilOpSeparateATI(zpass)");
-      return;
-   }
-   if (face != GL_FRONT && face != GL_BACK && face != GL_FRONT_AND_BACK) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glStencilOpSeparateATI(face)");
-      return;
-   }
-
-   if (face != GL_BACK) {
-      /* set front */
-      if (ctx->Stencil.ZFailFunc[0] != zfail ||
-          ctx->Stencil.ZPassFunc[0] != zpass ||
-          ctx->Stencil.FailFunc[0] != sfail){
-         FLUSH_VERTICES(ctx, _NEW_STENCIL);
-         ctx->Stencil.ZFailFunc[0] = zfail;
-         ctx->Stencil.ZPassFunc[0] = zpass;
-         ctx->Stencil.FailFunc[0] = sfail;
-         set = GL_TRUE;
-      }
-   }
-   if (face != GL_FRONT) {
-      /* set back */
-      if (ctx->Stencil.ZFailFunc[1] != zfail ||
-          ctx->Stencil.ZPassFunc[1] != zpass ||
-          ctx->Stencil.FailFunc[1] != sfail) {
-         FLUSH_VERTICES(ctx, _NEW_STENCIL);
-         ctx->Stencil.ZFailFunc[1] = zfail;
-         ctx->Stencil.ZPassFunc[1] = zpass;
-         ctx->Stencil.FailFunc[1] = sfail;
-         set = GL_TRUE;
-      }
-   }
-   if (set && ctx->Driver.StencilOpSeparate) {
-      ctx->Driver.StencilOpSeparate(ctx, face, sfail, zfail, zpass);
-   }
-}
-
-
-
 /**
  * Set the function and reference value for stencil testing.
  *
@@ -444,17 +389,13 @@ _mesa_ActiveStencilFaceEXT(GLenum face)
  * instead.
  */
 void GLAPIENTRY
-_mesa_StencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLenum zpass)
+_mesa_StencilOpSeparate(GLenum face, GLenum sfail, GLenum zfail, GLenum zpass)
 {
+   GLboolean set = GL_FALSE;
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-   if (face != GL_FRONT && face != GL_BACK && face != GL_FRONT_AND_BACK) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glStencilOpSeparate(face)");
-      return;
-   }
-
-   if (!validate_stencil_op(ctx, fail)) {
+   if (!validate_stencil_op(ctx, sfail)) {
       _mesa_error(ctx, GL_INVALID_ENUM, "glStencilOpSeparate(sfail)");
       return;
    }
@@ -466,21 +407,37 @@ _mesa_StencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLenum zpass)
       _mesa_error(ctx, GL_INVALID_ENUM, "glStencilOpSeparate(zpass)");
       return;
    }
-
-   FLUSH_VERTICES(ctx, _NEW_STENCIL);
+   if (face != GL_FRONT && face != GL_BACK && face != GL_FRONT_AND_BACK) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glStencilOpSeparate(face)");
+      return;
+   }
 
    if (face != GL_BACK) {
-      ctx->Stencil.FailFunc[0] = fail;
-      ctx->Stencil.ZFailFunc[0] = zfail;
-      ctx->Stencil.ZPassFunc[0] = zpass;
+      /* set front */
+      if (ctx->Stencil.ZFailFunc[0] != zfail ||
+          ctx->Stencil.ZPassFunc[0] != zpass ||
+          ctx->Stencil.FailFunc[0] != sfail){
+         FLUSH_VERTICES(ctx, _NEW_STENCIL);
+         ctx->Stencil.ZFailFunc[0] = zfail;
+         ctx->Stencil.ZPassFunc[0] = zpass;
+         ctx->Stencil.FailFunc[0] = sfail;
+         set = GL_TRUE;
+      }
    }
    if (face != GL_FRONT) {
-      ctx->Stencil.FailFunc[1] = fail;
-      ctx->Stencil.ZFailFunc[1] = zfail;
-      ctx->Stencil.ZPassFunc[1] = zpass;
+      /* set back */
+      if (ctx->Stencil.ZFailFunc[1] != zfail ||
+          ctx->Stencil.ZPassFunc[1] != zpass ||
+          ctx->Stencil.FailFunc[1] != sfail) {
+         FLUSH_VERTICES(ctx, _NEW_STENCIL);
+         ctx->Stencil.ZFailFunc[1] = zfail;
+         ctx->Stencil.ZPassFunc[1] = zpass;
+         ctx->Stencil.FailFunc[1] = sfail;
+         set = GL_TRUE;
+      }
    }
-   if (ctx->Driver.StencilOpSeparate) {
-      ctx->Driver.StencilOpSeparate(ctx, face, fail, zfail, zpass);
+   if (set && ctx->Driver.StencilOpSeparate) {
+      ctx->Driver.StencilOpSeparate(ctx, face, sfail, zfail, zpass);
    }
 }
 
diff --git a/src/mesa/main/stencil.h b/src/mesa/main/stencil.h
index 15a65dbcac..252ac932ac 100644
--- a/src/mesa/main/stencil.h
+++ b/src/mesa/main/stencil.h
@@ -63,9 +63,6 @@ extern void GLAPIENTRY
 _mesa_StencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask);
 
 
-extern void APIENTRY
-_mesa_StencilOpSeparateATI(GLenum face, GLenum sfail, GLenum zfail, GLenum zpass);
-
 extern void GLAPIENTRY
 _mesa_StencilFuncSeparateATI(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
 
diff --git a/src/mesa/sparc/glapi_sparc.S b/src/mesa/sparc/glapi_sparc.S
index 91dc8c1792..b214bef54d 100644
--- a/src/mesa/sparc/glapi_sparc.S
+++ b/src/mesa/sparc/glapi_sparc.S
@@ -839,7 +839,6 @@ __glapi_sparc_icache_flush: /* %o0 = insn_addr */
 		.globl gl_dispatch_stub_771 ; .type gl_dispatch_stub_771,#function
 		.globl gl_dispatch_stub_772 ; .type gl_dispatch_stub_772,#function
 		.globl gl_dispatch_stub_773 ; .type gl_dispatch_stub_773,#function
-		.globl gl_dispatch_stub_774 ; .type gl_dispatch_stub_774,#function
 		.globl _mesa_sparc_glapi_begin ; .type _mesa_sparc_glapi_begin,#function
 _mesa_sparc_glapi_begin:
 
@@ -1617,7 +1616,6 @@ _mesa_sparc_glapi_begin:
 	GL_STUB(gl_dispatch_stub_771, _gloffset__dispatch_stub_771)
 	GL_STUB(gl_dispatch_stub_772, _gloffset__dispatch_stub_772)
 	GL_STUB(gl_dispatch_stub_773, _gloffset__dispatch_stub_773)
-	GL_STUB(gl_dispatch_stub_774, _gloffset__dispatch_stub_774)
 
 		.globl _mesa_sparc_glapi_end ; .type _mesa_sparc_glapi_end,#function
 _mesa_sparc_glapi_end:
diff --git a/src/mesa/x86-64/glapi_x86-64.S b/src/mesa/x86-64/glapi_x86-64.S
index 041ced0268..a239a6749d 100644
--- a/src/mesa/x86-64/glapi_x86-64.S
+++ b/src/mesa/x86-64/glapi_x86-64.S
@@ -29266,11 +29266,7 @@ GL_PREFIX(_dispatch_stub_772):
 	pushq	%rdi
 	pushq	%rsi
 	pushq	%rdx
-	pushq	%rcx
-	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
-	popq	%rbp
-	popq	%rcx
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
@@ -29286,11 +29282,7 @@ GL_PREFIX(_dispatch_stub_772):
 	pushq	%rdi
 	pushq	%rsi
 	pushq	%rdx
-	pushq	%rcx
-	pushq	%rbp
 	call	_glapi_get_dispatch
-	popq	%rbp
-	popq	%rcx
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
@@ -29337,44 +29329,6 @@ GL_PREFIX(_dispatch_stub_773):
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(_dispatch_stub_773), .-GL_PREFIX(_dispatch_stub_773)
 
-	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_774)
-	.type	GL_PREFIX(_dispatch_stub_774), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_774))
-GL_PREFIX(_dispatch_stub_774):
-#if defined(GLX_USE_TLS)
-	call	_x86_64_get_dispatch@PLT
-	movq	6192(%rax), %r11
-	jmp	*%r11
-#elif defined(PTHREADS)
-	pushq	%rdi
-	pushq	%rsi
-	pushq	%rdx
-	call	_x86_64_get_dispatch@PLT
-	popq	%rdx
-	popq	%rsi
-	popq	%rdi
-	movq	6192(%rax), %r11
-	jmp	*%r11
-#else
-	movq	_glapi_Dispatch(%rip), %rax
-	testq	%rax, %rax
-	je	1f
-	movq	6192(%rax), %r11
-	jmp	*%r11
-1:
-	pushq	%rdi
-	pushq	%rsi
-	pushq	%rdx
-	call	_glapi_get_dispatch
-	popq	%rdx
-	popq	%rsi
-	popq	%rdi
-	movq	6192(%rax), %r11
-	jmp	*%r11
-#endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_774), .-GL_PREFIX(_dispatch_stub_774)
-
 	.globl GL_PREFIX(ArrayElementEXT) ; .set GL_PREFIX(ArrayElementEXT), GL_PREFIX(ArrayElement)
 	.globl GL_PREFIX(BindTextureEXT) ; .set GL_PREFIX(BindTextureEXT), GL_PREFIX(BindTexture)
 	.globl GL_PREFIX(DrawArraysEXT) ; .set GL_PREFIX(DrawArraysEXT), GL_PREFIX(DrawArrays)
diff --git a/src/mesa/x86/glapi_x86.S b/src/mesa/x86/glapi_x86.S
index 0afb054a14..40ecc20753 100644
--- a/src/mesa/x86/glapi_x86.S
+++ b/src/mesa/x86/glapi_x86.S
@@ -950,16 +950,14 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(FramebufferTextureLayerEXT, _gloffset_FramebufferTextureLayerEXT, FramebufferTextureLayerEXT@20)
 	GL_STUB(_dispatch_stub_769, _gloffset_StencilFuncSeparateATI, _dispatch_stub_769@16)
 	HIDDEN(GL_PREFIX(_dispatch_stub_769, _dispatch_stub_769@16))
-	GL_STUB(_dispatch_stub_770, _gloffset_StencilOpSeparateATI, _dispatch_stub_770@16)
+	GL_STUB(_dispatch_stub_770, _gloffset_ProgramEnvParameters4fvEXT, _dispatch_stub_770@16)
 	HIDDEN(GL_PREFIX(_dispatch_stub_770, _dispatch_stub_770@16))
-	GL_STUB(_dispatch_stub_771, _gloffset_ProgramEnvParameters4fvEXT, _dispatch_stub_771@16)
+	GL_STUB(_dispatch_stub_771, _gloffset_ProgramLocalParameters4fvEXT, _dispatch_stub_771@16)
 	HIDDEN(GL_PREFIX(_dispatch_stub_771, _dispatch_stub_771@16))
-	GL_STUB(_dispatch_stub_772, _gloffset_ProgramLocalParameters4fvEXT, _dispatch_stub_772@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_772, _dispatch_stub_772@16))
-	GL_STUB(_dispatch_stub_773, _gloffset_GetQueryObjecti64vEXT, _dispatch_stub_773@12)
+	GL_STUB(_dispatch_stub_772, _gloffset_GetQueryObjecti64vEXT, _dispatch_stub_772@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_772, _dispatch_stub_772@12))
+	GL_STUB(_dispatch_stub_773, _gloffset_GetQueryObjectui64vEXT, _dispatch_stub_773@12)
 	HIDDEN(GL_PREFIX(_dispatch_stub_773, _dispatch_stub_773@12))
-	GL_STUB(_dispatch_stub_774, _gloffset_GetQueryObjectui64vEXT, _dispatch_stub_774@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_774, _dispatch_stub_774@12))
 	GL_STUB_ALIAS(ArrayElementEXT, _gloffset_ArrayElement, ArrayElementEXT@4, ArrayElement, ArrayElement@4)
 	GL_STUB_ALIAS(BindTextureEXT, _gloffset_BindTexture, BindTextureEXT@8, BindTexture, BindTexture@8)
 	GL_STUB_ALIAS(DrawArraysEXT, _gloffset_DrawArrays, DrawArraysEXT@12, DrawArrays, DrawArrays@12)
@@ -1091,6 +1089,7 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB_ALIAS(MultiTexCoord4iv, _gloffset_MultiTexCoord4ivARB, MultiTexCoord4iv@8, MultiTexCoord4ivARB, MultiTexCoord4ivARB@8)
 	GL_STUB_ALIAS(MultiTexCoord4s, _gloffset_MultiTexCoord4sARB, MultiTexCoord4s@20, MultiTexCoord4sARB, MultiTexCoord4sARB@20)
 	GL_STUB_ALIAS(MultiTexCoord4sv, _gloffset_MultiTexCoord4svARB, MultiTexCoord4sv@8, MultiTexCoord4svARB, MultiTexCoord4svARB@8)
+	GL_STUB_ALIAS(StencilOpSeparateATI, _gloffset_StencilOpSeparate, StencilOpSeparateATI@16, StencilOpSeparate, StencilOpSeparate@16)
 	GL_STUB_ALIAS(LoadTransposeMatrixd, _gloffset_LoadTransposeMatrixdARB, LoadTransposeMatrixd@4, LoadTransposeMatrixdARB, LoadTransposeMatrixdARB@4)
 	GL_STUB_ALIAS(LoadTransposeMatrixf, _gloffset_LoadTransposeMatrixfARB, LoadTransposeMatrixf@4, LoadTransposeMatrixfARB, LoadTransposeMatrixfARB@4)
 	GL_STUB_ALIAS(MultTransposeMatrixd, _gloffset_MultTransposeMatrixdARB, MultTransposeMatrixd@4, MultTransposeMatrixdARB, MultTransposeMatrixdARB@4)
-- 
cgit v1.2.3


From bc029247d9d886f4546a4c3a36737d09c488b7f9 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Fri, 4 Apr 2008 18:59:21 -0600
Subject: mesa: no longer combine vertex/fragment shader parameters/uniforms

GLSL Vertex and fragment shaders now have independent parameter buffers.
A new gl_uniform_list is used to keep track of program uniforms and where
each uniform is located in each shader's parameter buffer.
This makes better use of the space in each buffer and simplifies shader linking.
---
 src/mesa/main/mtypes.h             |   8 +-
 src/mesa/shader/shader_api.c       | 308 ++++++++++++++++++++++---------------
 src/mesa/shader/slang/slang_link.c | 192 +++++++----------------
 src/mesa/sources                   |   1 +
 4 files changed, 239 insertions(+), 270 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 8e49431a8f..50b22d25bf 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1868,6 +1868,7 @@ enum register_file
 /** Vertex and fragment instructions */
 struct prog_instruction;
 struct gl_program_parameter_list;
+struct gl_uniform_list;
 
 
 /**
@@ -2104,7 +2105,7 @@ struct gl_query_state
 
 
 /**
- * A GLSL shader object.
+ * A GLSL vertex or fragment shader object.
  */
 struct gl_shader
 {
@@ -2122,7 +2123,8 @@ struct gl_shader
 
 
 /**
- * A GLSL program object.  Basically a linked collection of "shaders".
+ * A GLSL program object.
+ * Basically a linked collection of vertex and fragment shaders.
  */
 struct gl_shader_program
 {
@@ -2137,7 +2139,7 @@ struct gl_shader_program
    /* post-link info: */
    struct gl_vertex_program *VertexProgram;     /**< Linked vertex program */
    struct gl_fragment_program *FragmentProgram; /**< Linked fragment prog */
-   struct gl_program_parameter_list *Uniforms; /**< Plus constants, etc */
+   struct gl_uniform_list *Uniforms;
    struct gl_program_parameter_list *Varying;
    struct gl_program_parameter_list *Attributes; /**< Vertex attributes */
    GLboolean LinkStatus;   /**< GL_LINK_STATUS */
diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index 4cb8bb8ed1..9c419c9903 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -43,6 +43,7 @@
 #include "prog_parameter.h"
 #include "prog_print.h"
 #include "prog_statevars.h"
+#include "prog_uniform.h"
 #include "shader/shader_api.h"
 #include "shader/slang/slang_compile.h"
 #include "shader/slang/slang_link.h"
@@ -75,25 +76,25 @@ _mesa_clear_shader_program_data(GLcontext *ctx,
                                 struct gl_shader_program *shProg)
 {
    if (shProg->VertexProgram) {
-      if (shProg->VertexProgram->Base.Parameters == shProg->Uniforms) {
-         /* to prevent a double-free in the next call */
-         shProg->VertexProgram->Base.Parameters = NULL;
-      }
+      /* Set ptr to NULL since the param list is shared with the
+       * original/unlinked program.
+       */
+      shProg->VertexProgram->Base.Parameters = NULL;
       ctx->Driver.DeleteProgram(ctx, &shProg->VertexProgram->Base);
       shProg->VertexProgram = NULL;
    }
 
    if (shProg->FragmentProgram) {
-      if (shProg->FragmentProgram->Base.Parameters == shProg->Uniforms) {
-         /* to prevent a double-free in the next call */
-         shProg->FragmentProgram->Base.Parameters = NULL;
-      }
+      /* Set ptr to NULL since the param list is shared with the
+       * original/unlinked program.
+       */
+      shProg->FragmentProgram->Base.Parameters = NULL;
       ctx->Driver.DeleteProgram(ctx, &shProg->FragmentProgram->Base);
       shProg->FragmentProgram = NULL;
    }
 
    if (shProg->Uniforms) {
-      _mesa_free_parameter_list(shProg->Uniforms);
+      _mesa_free_uniform_list(shProg->Uniforms);
       shProg->Uniforms = NULL;
    }
 
@@ -673,39 +674,43 @@ _mesa_get_active_uniform(GLcontext *ctx, GLuint program, GLuint index,
                          GLsizei maxLength, GLsizei *length, GLint *size,
                          GLenum *type, GLchar *nameOut)
 {
-   struct gl_shader_program *shProg
+   const struct gl_shader_program *shProg
       = _mesa_lookup_shader_program(ctx, program);
-   GLuint ind, j;
+   const struct gl_program *prog;
+   GLint progPos;
 
    if (!shProg) {
       _mesa_error(ctx, GL_INVALID_VALUE, "glGetActiveUniform");
       return;
    }
 
-   if (!shProg->Uniforms || index >= shProg->Uniforms->NumParameters) {
+   if (!shProg->Uniforms || index >= shProg->Uniforms->NumUniforms) {
       _mesa_error(ctx, GL_INVALID_VALUE, "glGetActiveUniform(index)");
       return;
    }
 
-   ind = 0;
-   for (j = 0; j < shProg->Uniforms->NumParameters; j++) {
-      if (shProg->Uniforms->Parameters[j].Type == PROGRAM_UNIFORM ||
-          shProg->Uniforms->Parameters[j].Type == PROGRAM_SAMPLER) {
-         if (ind == index) {
-            /* found it */
-            copy_string(nameOut, maxLength, length,
-                        shProg->Uniforms->Parameters[j].Name);
-            if (size)
-               *size = shProg->Uniforms->Parameters[j].Size;
-            if (type)
-               *type = shProg->Uniforms->Parameters[j].DataType;
-            return;
-         }
-         ind++;
+   progPos = shProg->Uniforms->Uniforms[index].VertPos;
+   if (progPos >= 0) {
+      prog = &shProg->VertexProgram->Base;
+   }
+   else {
+      progPos = shProg->Uniforms->Uniforms[index].FragPos;
+      if (progPos >= 0) {
+         prog = &shProg->FragmentProgram->Base;
       }
    }
 
-   _mesa_error(ctx, GL_INVALID_VALUE, "glGetActiveUniform(index)");
+   if (!prog || progPos < 0)
+      return; /* should never happen */
+
+   if (nameOut)
+      copy_string(nameOut, maxLength, length,
+                  prog->Parameters->Parameters[progPos].Name);
+   if (size)
+      *size = prog->Parameters->Parameters[progPos].Size;
+
+   if (type)
+      *type = prog->Parameters->Parameters[progPos].DataType;
 }
 
 
@@ -792,14 +797,10 @@ _mesa_get_programiv(GLcontext *ctx, GLuint program,
                                              PROGRAM_INPUT) + 1;
       break;
    case GL_ACTIVE_UNIFORMS:
-      *params
-         = _mesa_num_parameters_of_type(shProg->Uniforms, PROGRAM_UNIFORM)
-         + _mesa_num_parameters_of_type(shProg->Uniforms, PROGRAM_SAMPLER);
+      *params = shProg->Uniforms ? shProg->Uniforms->NumUniforms : 0;
       break;
    case GL_ACTIVE_UNIFORM_MAX_LENGTH:
-      *params = MAX2(
-             _mesa_longest_parameter_name(shProg->Uniforms, PROGRAM_UNIFORM),
-             _mesa_longest_parameter_name(shProg->Uniforms, PROGRAM_SAMPLER));
+      *params = _mesa_longest_uniform_name(shProg->Uniforms);
       if (*params > 0)
          (*params)++;  /* add one for terminating zero */
       break;
@@ -896,10 +897,23 @@ _mesa_get_uniformfv(GLcontext *ctx, GLuint program, GLint location,
    struct gl_shader_program *shProg
       = _mesa_lookup_shader_program(ctx, program);
    if (shProg) {
-      GLint i;
-      if (location >= 0 && location < shProg->Uniforms->NumParameters) {
-         for (i = 0; i < shProg->Uniforms->Parameters[location].Size; i++) {
-            params[i] = shProg->Uniforms->ParameterValues[location][i];
+      if (location < shProg->Uniforms->NumUniforms) {
+         GLint progPos, i;
+         const struct gl_program *prog;
+
+         progPos = shProg->Uniforms->Uniforms[location].VertPos;
+         if (progPos >= 0) {
+            prog = &shProg->VertexProgram->Base;
+         }
+         else {
+            progPos = shProg->Uniforms->Uniforms[location].FragPos;
+            if (progPos >= 0) {
+               prog = &shProg->FragmentProgram->Base;
+            }
+         }
+
+         for (i = 0; i < prog->Parameters->Parameters[progPos].Size; i++) {
+            params[i] = prog->Parameters->ParameterValues[progPos][i];
          }
       }
       else {
@@ -920,23 +934,10 @@ _mesa_get_uniform_location(GLcontext *ctx, GLuint program, const GLchar *name)
 {
    struct gl_shader_program *shProg
       = _mesa_lookup_shader_program(ctx, program);
-   if (shProg) {
-      GLuint loc;
-      for (loc = 0; loc < shProg->Uniforms->NumParameters; loc++) {
-         const struct gl_program_parameter *u
-            = shProg->Uniforms->Parameters + loc;
-         /* XXX this is a temporary simplification / short-cut.
-          * We need to handle things like "e.c[0].b" as seen in the
-          * GLSL orange book, page 189.
-          */
-         if ((u->Type == PROGRAM_UNIFORM ||
-              u->Type == PROGRAM_SAMPLER) && !strcmp(u->Name, name)) {
-            return loc;
-         }
-      }
-   }
-   return -1;
+   if (!shProg)
+      return -1;
 
+   return _mesa_lookup_uniform(shProg->Uniforms, name);
 }
 
 
@@ -1067,6 +1068,78 @@ update_textures_used(struct gl_program *prog)
 }
 
 
+/**
+ * Set the value of a program's uniform variable.
+ * \param program  the program whose uniform to update
+ * \param location  the location/index of the uniform
+ * \param type  the datatype of the uniform
+ * \param count  the number of uniforms to set
+ * \param elems  number of elements per uniform
+ * \param values  the new values
+ */
+static void
+set_program_uniform(GLcontext *ctx, struct gl_program *program, GLint location,
+                    GLenum type, GLint count, GLint elems, const void *values)
+{
+   if (program->Parameters->Parameters[location].Type == PROGRAM_SAMPLER) {
+      /* This controls which texture unit which is used by a sampler */
+      GLuint texUnit, sampler;
+
+      /* data type for setting samplers must be int */
+      if (type != GL_INT || count != 1) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glUniform(only glUniform1i can be used "
+                     "to set sampler uniforms)");
+         return;
+      }
+
+      sampler = (GLuint) program->Parameters->ParameterValues[location][0];
+      texUnit = ((GLuint *) values)[0];
+
+      /* check that the sampler (tex unit index) is legal */
+      if (texUnit >= ctx->Const.MaxTextureImageUnits) {
+         _mesa_error(ctx, GL_INVALID_VALUE,
+                     "glUniform1(invalid sampler/tex unit index)");
+         return;
+      }
+
+      /* This maps a sampler to a texture unit: */
+      program->SamplerUnits[sampler] = texUnit;
+      update_textures_used(program);
+
+      FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+   }
+   else {
+      /* ordinary uniform variable */
+      GLint k, i;
+
+      if (count * elems > program->Parameters->Parameters[location].Size) {
+         _mesa_error(ctx, GL_INVALID_OPERATION, "glUniform(count too large)");
+         return;
+      }
+
+      for (k = 0; k < count; k++) {
+         GLfloat *uniformVal = program->Parameters->ParameterValues[location + k];
+         if (type == GL_INT ||
+             type == GL_INT_VEC2 ||
+             type == GL_INT_VEC3 ||
+             type == GL_INT_VEC4) {
+            const GLint *iValues = ((const GLint *) values) + k * elems;
+            for (i = 0; i < elems; i++) {
+               uniformVal[i] = (GLfloat) iValues[i];
+            }
+         }
+         else {
+            const GLfloat *fValues = ((const GLfloat *) values) + k * elems;
+            for (i = 0; i < elems; i++) {
+               uniformVal[i] = fValues[i];
+            }
+         }
+      }
+   }
+}
+
+
 /**
  * Called via ctx->Driver.Uniform().
  */
@@ -1075,20 +1148,18 @@ _mesa_uniform(GLcontext *ctx, GLint location, GLsizei count,
               const GLvoid *values, GLenum type)
 {
    struct gl_shader_program *shProg = ctx->Shader.CurrentProgram;
-   GLint elems, i, k;
+   GLint elems;
 
    if (!shProg || !shProg->LinkStatus) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "glUniform(program not linked)");
       return;
    }
 
-   if (location < 0 || location >= (GLint) shProg->Uniforms->NumParameters) {
+   if (location < 0 || location >= (GLint) shProg->Uniforms->NumUniforms) {
       _mesa_error(ctx, GL_INVALID_VALUE, "glUniform(location)");
       return;
    }
 
-   FLUSH_VERTICES(ctx, _NEW_PROGRAM);
-
    if (count < 0) {
       _mesa_error(ctx, GL_INVALID_VALUE, "glUniform(count < 0)");
       return;
@@ -1116,63 +1187,54 @@ _mesa_uniform(GLcontext *ctx, GLint location, GLsizei count,
       return;
    }
 
-   if (count * elems > shProg->Uniforms->Parameters[location].Size) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glUniform(count too large)");
-      return;
-   }
-
-   if (shProg->Uniforms->Parameters[location].Type == PROGRAM_SAMPLER) {
-      /* This controls which texture unit which is used by a sampler */
-      GLuint texUnit, sampler;
-
-      /* data type for setting samplers must be int */
-      if (type != GL_INT || count != 1) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glUniform(only glUniform1i can be used "
-                     "to set sampler uniforms)");
-         return;
-      }
-
-      sampler = (GLuint) shProg->Uniforms->ParameterValues[location][0];
-      texUnit = ((GLuint *) values)[0];
+   FLUSH_VERTICES(ctx, _NEW_PROGRAM);
 
-      /* check that the sampler (tex unit index) is legal */
-      if (texUnit >= ctx->Const.MaxTextureImageUnits) {
-         _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glUniform1(invalid sampler/tex unit index)");
-         return;
+   /* A uniform var may be used by both a vertex shader and a fragment
+    * shader.  We may need to update one or both shader's uniform here:
+    */
+   if (shProg->VertexProgram) {
+      GLint loc = shProg->Uniforms->Uniforms[location].VertPos;
+      if (loc >= 0) {
+         set_program_uniform(ctx, &shProg->VertexProgram->Base,
+                             loc, type, count, elems, values);
       }
+   }
 
-      if (shProg->VertexProgram) {
-         shProg->VertexProgram->Base.SamplerUnits[sampler] = texUnit;
-         update_textures_used(&shProg->VertexProgram->Base);
-      }
-      if (shProg->FragmentProgram) {
-         shProg->FragmentProgram->Base.SamplerUnits[sampler] = texUnit;
-         update_textures_used(&shProg->FragmentProgram->Base);
+   if (shProg->FragmentProgram) {
+      GLint loc = shProg->Uniforms->Uniforms[location].FragPos;
+      if (loc >= 0) {
+         set_program_uniform(ctx, &shProg->FragmentProgram->Base,
+                             loc, type, count, elems, values);
       }
+   }
+}
 
 
-      FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+static void
+set_program_uniform_matrix(GLcontext *ctx, struct gl_program *program,
+                           GLuint location, GLuint rows, GLuint cols,
+                           GLboolean transpose, const GLfloat *values)
+{
+   /*
+    * Note: the _columns_ of a matrix are stored in program registers, not
+    * the rows.
+    */
+   /* XXXX need to test 3x3 and 2x2 matrices... */
+   if (transpose) {
+      GLuint row, col;
+      for (col = 0; col < cols; col++) {
+         GLfloat *v = program->Parameters->ParameterValues[location + col];
+         for (row = 0; row < rows; row++) {
+            v[row] = values[row * cols + col];
+         }
+      }
    }
    else {
-      /* ordinary uniform variable */
-      for (k = 0; k < count; k++) {
-         GLfloat *uniformVal = shProg->Uniforms->ParameterValues[location + k];
-         if (type == GL_INT ||
-             type == GL_INT_VEC2 ||
-             type == GL_INT_VEC3 ||
-             type == GL_INT_VEC4) {
-            const GLint *iValues = ((const GLint *) values) + k * elems;
-            for (i = 0; i < elems; i++) {
-               uniformVal[i] = (GLfloat) iValues[i];
-            }
-         }
-         else {
-            const GLfloat *fValues = ((const GLfloat *) values) + k * elems;
-            for (i = 0; i < elems; i++) {
-               uniformVal[i] = fValues[i];
-            }
+      GLuint row, col;
+      for (col = 0; col < cols; col++) {
+         GLfloat *v = program->Parameters->ParameterValues[location + col];
+         for (row = 0; row < rows; row++) {
+            v[row] = values[col * rows + row];
          }
       }
    }
@@ -1193,7 +1255,7 @@ _mesa_uniform_matrix(GLcontext *ctx, GLint cols, GLint rows,
          "glUniformMatrix(program not linked)");
       return;
    }
-   if (location < 0 || location >= shProg->Uniforms->NumParameters) {
+   if (location < 0 || location >= shProg->Uniforms->NumUniforms) {
       _mesa_error(ctx, GL_INVALID_VALUE, "glUniformMatrix(location)");
       return;
    }
@@ -1204,27 +1266,19 @@ _mesa_uniform_matrix(GLcontext *ctx, GLint cols, GLint rows,
 
    FLUSH_VERTICES(ctx, _NEW_PROGRAM);
 
-   /*
-    * Note: the _columns_ of a matrix are stored in program registers, not
-    * the rows.
-    */
-   /* XXXX need to test 3x3 and 2x2 matrices... */
-   if (transpose) {
-      GLuint row, col;
-      for (col = 0; col < cols; col++) {
-         GLfloat *v = shProg->Uniforms->ParameterValues[location + col];
-         for (row = 0; row < rows; row++) {
-            v[row] = values[row * cols + col];
-         }
+   if (shProg->VertexProgram) {
+      GLint loc = shProg->Uniforms->Uniforms[location].VertPos;
+      if (loc >= 0) {
+         set_program_uniform_matrix(ctx, &shProg->VertexProgram->Base,
+                                    loc, rows, cols, transpose, values);
       }
    }
-   else {
-      GLuint row, col;
-      for (col = 0; col < cols; col++) {
-         GLfloat *v = shProg->Uniforms->ParameterValues[location + col];
-         for (row = 0; row < rows; row++) {
-            v[row] = values[col * rows + row];
-         }
+
+   if (shProg->FragmentProgram) {
+      GLint loc = shProg->Uniforms->Uniforms[location].FragPos;
+      if (loc >= 0) {
+         set_program_uniform_matrix(ctx, &shProg->FragmentProgram->Base,
+                                    loc, rows, cols, transpose, values);
       }
    }
 }
diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c
index 390ae56aa5..addff20421 100644
--- a/src/mesa/shader/slang/slang_link.c
+++ b/src/mesa/shader/slang/slang_link.c
@@ -37,12 +37,17 @@
 #include "shader/prog_parameter.h"
 #include "shader/prog_print.h"
 #include "shader/prog_statevars.h"
+#include "shader/prog_uniform.h"
 #include "shader/shader_api.h"
 #include "slang_link.h"
 
 
 
-
+/**
+ * Linking varying vars involves rearranging varying vars so that the
+ * vertex program's output varyings matches the order of the fragment
+ * program's input varyings.
+ */
 static GLboolean
 link_varying_vars(struct gl_shader_program *shProg, struct gl_program *prog)
 {
@@ -132,148 +137,53 @@ link_varying_vars(struct gl_shader_program *shProg, struct gl_program *prog)
 }
 
 
-static GLboolean
-is_uniform(GLuint file)
-{
-   return (file == PROGRAM_ENV_PARAM ||
-           file == PROGRAM_STATE_VAR ||
-           file == PROGRAM_NAMED_PARAM ||
-           file == PROGRAM_CONSTANT ||
-           file == PROGRAM_SAMPLER ||
-           file == PROGRAM_UNIFORM);
-}
-
-
-static GLuint shProg_NumSamplers = 0; /** XXX temporary */
-
-
-static GLboolean
-link_uniform_vars(struct gl_shader_program *shProg, struct gl_program *prog)
+/**
+ * Build the shProg->Uniforms list.
+ * This is basically a list/index of all uniforms found in either/both of
+ * the vertex and fragment shaders.
+ */
+static void
+link_uniform_vars(struct gl_shader_program *shProg,
+                  struct gl_program *prog,
+                  GLuint *numSamplers)
 {
-   GLuint *map, i;
    GLuint samplerMap[MAX_SAMPLERS];
+   GLuint i;
 
-#if 0
-   printf("================ pre link uniforms ===============\n");
-   _mesa_print_parameter_list(shProg->Uniforms);
-#endif
-
-   map = (GLuint *) malloc(prog->Parameters->NumParameters * sizeof(GLuint));
-   if (!map)
-      return GL_FALSE;
-
-   for (i = 0; i < prog->Parameters->NumParameters; /* incr below*/) {
-      /* see if this uniform is in the linked uniform list */
+   for (i = 0; i < prog->Parameters->NumParameters; i++) {
       const struct gl_program_parameter *p = prog->Parameters->Parameters + i;
-      const GLfloat *pVals = prog->Parameters->ParameterValues[i];
-      GLint j;
-      GLint size;
 
-      /* sanity check */
-      assert(is_uniform(p->Type));
-
-      /* See if this uniform is already in the linked program's list */
-      if (p->Name) {
-         /* this is a named uniform */
-         j = _mesa_lookup_parameter_index(shProg->Uniforms, -1, p->Name);
-      }
-      else {
-         /* this is an unnamed constant */
-         /*GLuint swizzle;*/
-         ASSERT(p->Type == PROGRAM_CONSTANT);
-         if (_mesa_lookup_parameter_constant(shProg->Uniforms, pVals,
-                                             p->Size, &j, NULL)) {
-            assert(j >= 0);
-         }
-         else {
-            j = -1;
-         }
-      }
-
-      if (j >= 0) {
-         /* already in linked program's list */
-         /* check size XXX check this */
-#if 0
-         assert(p->Size == shProg->Uniforms->Parameters[j].Size);
-#endif
-      }
-      else {
-         /* not already in linked list */
-         switch (p->Type) {
-         case PROGRAM_ENV_PARAM:
-            j = _mesa_add_named_parameter(shProg->Uniforms, p->Name, pVals);
-            break;
-         case PROGRAM_CONSTANT:
-            j = _mesa_add_named_constant(shProg->Uniforms, p->Name, pVals, p->Size);
-            break;
-         case PROGRAM_STATE_VAR:
-            j = _mesa_add_state_reference(shProg->Uniforms, p->StateIndexes);
-            break;
-         case PROGRAM_UNIFORM:
-            j = _mesa_add_uniform(shProg->Uniforms, p->Name, p->Size, p->DataType);
-            break;
-         case PROGRAM_SAMPLER:
-            {
-               GLuint sampNum = shProg_NumSamplers++;
-               GLuint oldSampNum;
-               j = _mesa_add_sampler(shProg->Uniforms, p->Name,
-                                     p->DataType, sampNum);
-               oldSampNum = (GLuint) prog->Parameters->ParameterValues[i][0];
-               assert(oldSampNum < MAX_SAMPLERS);
-               samplerMap[oldSampNum] = sampNum;
-            }
-            break;
-         default:
-            _mesa_problem(NULL, "bad parameter type in link_uniform_vars()");
-            return GL_FALSE;
-         }
+      /*
+       * XXX FIX NEEDED HERE
+       * We should also be adding a uniform if p->Type == PROGRAM_STATE_VAR.
+       * For example, modelview matrix, light pos, etc.
+       * Also, we need to update the state-var name-generator code to
+       * generate GLSL-style names, like "gl_LightSource[0].position".
+       * Furthermore, we'll need to fix the state-var's size/datatype info.
+       */
+
+      if (p->Type == PROGRAM_UNIFORM ||
+          p->Type == PROGRAM_SAMPLER) {
+         _mesa_append_uniform(shProg->Uniforms, p->Name, prog->Target, i);
       }
 
-      ASSERT(j >= 0);
-
-      size = p->Size;
-      while (size > 0) {
-         map[i] = j;
-         i++;
-         j++;
-         size -= 4;
+      if (p->Type == PROGRAM_SAMPLER) {
+         /* Allocate a new sampler index */
+         GLuint sampNum = *numSamplers;
+         GLuint oldSampNum = (GLuint) prog->Parameters->ParameterValues[i][0];
+         assert(oldSampNum < MAX_SAMPLERS);
+         samplerMap[oldSampNum] = sampNum;
+         (*numSamplers)++;
       }
-
    }
 
-#if 0
-   printf("================ post link uniforms ===============\n");
-   _mesa_print_parameter_list(shProg->Uniforms);
-#endif
-
-#if 0
-   {
-      GLuint i;
-      for (i = 0; i < prog->Parameters->NumParameters; i++) {
-         printf("map[%d] = %d\n", i, map[i]);
-      }
-      _mesa_print_parameter_list(shProg->Uniforms);
-   }
-#endif
 
-   /* OK, now scan the program/shader instructions looking for uniform vars,
+   /* OK, now scan the program/shader instructions looking for sampler vars,
     * replacing the old index with the new index.
     */
    prog->SamplersUsed = 0x0;
    for (i = 0; i < prog->NumInstructions; i++) {
       struct prog_instruction *inst = prog->Instructions + i;
-      GLuint j;
-
-      if (is_uniform(inst->DstReg.File)) {
-         inst->DstReg.Index = map[ inst->DstReg.Index ];
-      }
-
-      for (j = 0; j < 3; j++) {
-         if (is_uniform(inst->SrcReg[j].File)) {
-            inst->SrcReg[j].Index = map[ inst->SrcReg[j].Index ];
-         }
-      }
-
       if (_mesa_is_tex_instruction(inst->Opcode)) {
          /*
          printf("====== remap sampler from %d to %d\n",
@@ -286,9 +196,6 @@ link_uniform_vars(struct gl_shader_program *shProg, struct gl_program *prog)
       }
    }
 
-   free(map);
-
-   return GL_TRUE;
 }
 
 
@@ -476,13 +383,12 @@ _slang_link(GLcontext *ctx,
 {
    const struct gl_vertex_program *vertProg;
    const struct gl_fragment_program *fragProg;
+   GLuint numSamplers = 0;
    GLuint i;
 
-   shProg_NumSamplers = 0; /** XXX temporary */
-
    _mesa_clear_shader_program_data(ctx, shProg);
 
-   shProg->Uniforms = _mesa_new_parameter_list();
+   shProg->Uniforms = _mesa_new_uniform_list();
    shProg->Varying = _mesa_new_parameter_list();
 
    /**
@@ -519,24 +425,30 @@ _slang_link(GLcontext *ctx,
       shProg->FragmentProgram = NULL;
    }
 
+   /* link varying vars */
    if (shProg->VertexProgram)
       link_varying_vars(shProg, &shProg->VertexProgram->Base);
    if (shProg->FragmentProgram)
       link_varying_vars(shProg, &shProg->FragmentProgram->Base);
 
+   /* link uniform vars */
    if (shProg->VertexProgram)
-      link_uniform_vars(shProg, &shProg->VertexProgram->Base);
+      link_uniform_vars(shProg, &shProg->VertexProgram->Base, &numSamplers);
    if (shProg->FragmentProgram)
-      link_uniform_vars(shProg, &shProg->FragmentProgram->Base);
+      link_uniform_vars(shProg, &shProg->FragmentProgram->Base, &numSamplers);
+
+   /*_mesa_print_uniforms(shProg->Uniforms);*/
 
-   /* The vertex and fragment programs share a common set of uniforms now */
    if (shProg->VertexProgram) {
-      _mesa_free_parameter_list(shProg->VertexProgram->Base.Parameters);
-      shProg->VertexProgram->Base.Parameters = shProg->Uniforms;
+      /* Rather than cloning the parameter list here, just share it.
+       * We need to be careful _mesa_clear_shader_program_data() in
+       * to avoid double-freeing.
+       */
+      shProg->VertexProgram->Base.Parameters = vertProg->Base.Parameters;
    }
    if (shProg->FragmentProgram) {
-      _mesa_free_parameter_list(shProg->FragmentProgram->Base.Parameters);
-      shProg->FragmentProgram->Base.Parameters = shProg->Uniforms;
+      /* see comment just above */
+      shProg->FragmentProgram->Base.Parameters = fragProg->Base.Parameters;
    }
 
    if (shProg->VertexProgram) {
diff --git a/src/mesa/sources b/src/mesa/sources
index d109dce5bc..a4e2026e4b 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -213,6 +213,7 @@ SHADER_SOURCES = \
 	shader/prog_parameter.c \
 	shader/prog_print.c \
 	shader/prog_statevars.c \
+	shader/prog_uniform.c \
 	shader/programopt.c \
 	shader/shader_api.c \
 
-- 
cgit v1.2.3


From 72c8d2f2449d54005eb721fe3853a6009e9b8d17 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 24 Apr 2008 13:36:26 -0600
Subject: mesa: adjust glBitmap coords by a small epsilon

Fixes problem with bitmaps jumping around by one pixel depending on window
size.  The rasterpos is often X.9999 instead of X+1.
Run progs/redbook/drawf and resize window to check.
---
 src/mesa/main/drawpix.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index 0f64f1c1c0..fa422bb3c7 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -377,8 +377,9 @@ _mesa_Bitmap( GLsizei width, GLsizei height,
 
    if (ctx->RenderMode == GL_RENDER) {
       /* Truncate, to satisfy conformance tests (matches SGI's OpenGL). */
-      GLint x = IFLOOR(ctx->Current.RasterPos[0] - xorig);
-      GLint y = IFLOOR(ctx->Current.RasterPos[1] - yorig);
+      const GLfloat epsilon = 0.0001;
+      GLint x = IFLOOR(ctx->Current.RasterPos[0] + epsilon - xorig);
+      GLint y = IFLOOR(ctx->Current.RasterPos[1] + epsilon - yorig);
 
       if (ctx->Unpack.BufferObj->Name) {
          /* unpack from PBO */
-- 
cgit v1.2.3


From 1437b41d9068017dbe981a784285d5773c1d1ead Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 25 Apr 2008 14:15:42 -0600
Subject: gallium: fix typo s/_mesa_unmap_drapix_pbo/_mesa_unmap_drawpix_pbo/

---
 src/mesa/main/bufferobj.c                 | 4 ++--
 src/mesa/main/bufferobj.h                 | 4 ++--
 src/mesa/state_tracker/st_cb_drawpixels.c | 4 ++--
 src/mesa/swrast/s_drawpix.c               | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index e762eb3b63..dc0307feb5 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -551,8 +551,8 @@ _mesa_map_drawpix_pbo(GLcontext *ctx,
  * \sa _mesa_unmap_bitmap_pbo
  */
 void
-_mesa_unmap_drapix_pbo(GLcontext *ctx,
-                       const struct gl_pixelstore_attrib *unpack)
+_mesa_unmap_drawpix_pbo(GLcontext *ctx,
+                        const struct gl_pixelstore_attrib *unpack)
 {
    if (unpack->BufferObj->Name) {
       ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h
index 46525f08ae..024e5a8c3c 100644
--- a/src/mesa/main/bufferobj.h
+++ b/src/mesa/main/bufferobj.h
@@ -101,8 +101,8 @@ _mesa_map_drawpix_pbo(GLcontext *ctx,
                       const GLvoid *pixels);
 
 extern void
-_mesa_unmap_drapix_pbo(GLcontext *ctx,
-                       const struct gl_pixelstore_attrib *unpack);
+_mesa_unmap_drawpix_pbo(GLcontext *ctx,
+                        const struct gl_pixelstore_attrib *unpack);
 
 
 extern void *
diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index 7c87402f27..cdfa041d15 100644
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -349,7 +349,7 @@ make_texture(struct st_context *st,
    pt = st_texture_create(st, PIPE_TEXTURE_2D, pipeFormat, 0, width, height,
 			  1, 0);
    if (!pt) {
-      _mesa_unmap_drapix_pbo(ctx, unpack);
+      _mesa_unmap_drawpix_pbo(ctx, unpack);
       return NULL;
    }
 
@@ -395,7 +395,7 @@ make_texture(struct st_context *st,
       ctx->_ImageTransferState = imageTransferStateSave;
    }
 
-   _mesa_unmap_drapix_pbo(ctx, unpack);
+   _mesa_unmap_drawpix_pbo(ctx, unpack);
 
    return pt;
 }
diff --git a/src/mesa/swrast/s_drawpix.c b/src/mesa/swrast/s_drawpix.c
index fb04d9f746..cbf6617058 100644
--- a/src/mesa/swrast/s_drawpix.c
+++ b/src/mesa/swrast/s_drawpix.c
@@ -877,7 +877,7 @@ end:
 
    RENDER_FINISH(swrast,ctx);
 
-   _mesa_unmap_drapix_pbo(ctx, unpack);
+   _mesa_unmap_drawpix_pbo(ctx, unpack);
 }
 
 
-- 
cgit v1.2.3


From 5fb774ab31b11f3a55d9dc47cee5eeaf5abc5981 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Tue, 29 Apr 2008 12:51:06 -0600
Subject: mesa: added _mesa_scale_and_bias_depth_uint()

---
 src/mesa/main/pixel.c | 15 +++++++++++++++
 src/mesa/main/pixel.h |  3 +++
 2 files changed, 18 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/pixel.c b/src/mesa/main/pixel.c
index eb4fd6e7c9..0e9915dd38 100644
--- a/src/mesa/main/pixel.c
+++ b/src/mesa/main/pixel.c
@@ -1341,6 +1341,21 @@ _mesa_scale_and_bias_depth(const GLcontext *ctx, GLuint n,
 }
 
 
+void
+_mesa_scale_and_bias_depth_uint(const GLcontext *ctx, GLuint n,
+                                GLuint depthValues[])
+{
+   const GLdouble max = (double) 0xffffffff;
+   const GLdouble scale = ctx->Pixel.DepthScale;
+   const GLdouble bias = ctx->Pixel.DepthBias * max;
+   GLuint i;
+   for (i = 0; i < n; i++) {
+      GLdouble d = (GLdouble) depthValues[i] * scale + bias;
+      d = CLAMP(d, 0.0, max);
+      depthValues[i] = (GLuint) d;
+   }
+}
+
 
 /**********************************************************************/
 /*****                    State Management                        *****/
diff --git a/src/mesa/main/pixel.h b/src/mesa/main/pixel.h
index 09155cfd70..3ba5b6689a 100644
--- a/src/mesa/main/pixel.h
+++ b/src/mesa/main/pixel.h
@@ -116,6 +116,9 @@ extern void
 _mesa_scale_and_bias_depth(const GLcontext *ctx, GLuint n,
                            GLfloat depthValues[]);
 
+extern void
+_mesa_scale_and_bias_depth_uint(const GLcontext *ctx, GLuint n,
+                                GLuint depthValues[]);
 
 extern void 
 _mesa_update_pixel( GLcontext *ctx, GLuint newstate );
-- 
cgit v1.2.3


From c32477742facd06c22befcd300e9fdfeafb6995b Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 30 Apr 2008 16:05:01 -0600
Subject: Add support for GL_REPLACE_EXT texture env mode.

GL_REPLACE_EXT comes from the ancient GL_EXT_texture extension.  Found an old demo that
actually uses it.
The values of the GL_REPLACE and GL_REPLACE_EXT tokens is different, unfortunately.
---
 src/mesa/main/texstate.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index cb7da39b51..84acfbd92c 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -238,6 +238,9 @@ calculate_derived_texenv( struct gl_tex_env_combine_state *state,
       return;
    }
 
+   if (mode == GL_REPLACE_EXT)
+      mode = GL_REPLACE;
+
    switch (mode) {
    case GL_REPLACE:
    case GL_MODULATE:
@@ -340,7 +343,9 @@ _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
       switch (pname) {
       case GL_TEXTURE_ENV_MODE:
          {
-            const GLenum mode = (GLenum) (GLint) *param;
+            GLenum mode = (GLenum) (GLint) *param;
+            if (mode == GL_REPLACE_EXT)
+               mode = GL_REPLACE;
 	    if (texUnit->EnvMode == mode)
 	       return;
             if (mode == GL_MODULATE ||
-- 
cgit v1.2.3


From e97bedb302701e2e50cef664690b83a1fe6c95ed Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@tungstengraphics.com>
Date: Thu, 1 May 2008 14:54:56 +0100
Subject: Fix build problem with MSVC

---
 src/mesa/main/context.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 src/mesa/main/context.c

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
old mode 100644
new mode 100755
index d06644f65d..7b8d934170
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1504,15 +1504,19 @@ _mesa_make_current( GLcontext *newCtx, GLframebuffer *drawBuffer,
           * or not bound to a user-created FBO.
           */
          if (!newCtx->DrawBuffer || newCtx->DrawBuffer->Name == 0) {
-            _mesa_reference_framebuffer(&newCtx->DrawBuffer, drawBuffer);
          /* fix up the fb fields - these will end up wrong otherwise
-            if the DRIdrawable changes, and everything relies on them.
-            This is a bit messy (same as needed in _mesa_BindFramebufferEXT) */
+          * if the DRIdrawable changes, and everything relies on them.
+          * This is a bit messy (same as needed in _mesa_BindFramebufferEXT)
+	  */
             int i;
             GLenum buffers[MAX_DRAW_BUFFERS];
+
+            _mesa_reference_framebuffer(&newCtx->DrawBuffer, drawBuffer);
+
             for(i = 0; i < newCtx->Const.MaxDrawBuffers; i++) {
                buffers[i] = newCtx->Color.DrawBuffer[i];
             }
+
             _mesa_drawbuffers(newCtx, newCtx->Const.MaxDrawBuffers, buffers, NULL);
          }
          if (!newCtx->ReadBuffer || newCtx->ReadBuffer->Name == 0) {
-- 
cgit v1.2.3


From f77442fbd3b539aa3da927630c12c3a1a377f6da Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@tungstengraphics.com>
Date: Mon, 5 May 2008 23:09:38 +0100
Subject: fix _mesa_ffs for alternative compilers

---
 src/mesa/main/imports.c | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index d8d35af15e..d798f80e25 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -542,26 +542,24 @@ int
 _mesa_ffs(int i)
 {
 #if (defined(_WIN32) && !defined(__MINGW32__) ) || defined(__IBMC__) || defined(__IBMCPP__)
-   register int bit = 0;
-   if (i != 0) {
-      if ((i & 0xffff) == 0) {
-         bit += 16;
-         i >>= 16;
-      }
-      if ((i & 0xff) == 0) {
-         bit += 8;
-         i >>= 8;
-      }
-      if ((i & 0xf) == 0) {
-         bit += 4;
-         i >>= 4;
-      }
-      while ((i & 1) == 0) {
-         bit++;
-         i >>= 1;
-      }
+   register int bit = 1;
+   if ((i & 0xffff) == 0) {
+      bit += 16;
+      i >>= 16;
+   }
+   if ((i & 0xff) == 0) {
+      bit += 8;
+      i >>= 8;
+   }
+   if ((i & 0xf) == 0) {
+      bit += 4;
+      i >>= 4;
+   }
+   if ((i & 0x3) == 0) {
+      bit += 2;
+      i >>= 2;
    }
-   return bit;
+   return (i) ? (bit + ((i + 1) & 0x01)) : 0;
 #else
    return ffs(i);
 #endif
-- 
cgit v1.2.3


From 10f6ae0355937615d137c79c060b9e5a923f0d65 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Thu, 1 May 2008 19:29:25 -0600
Subject: mesa: comments, whitespace

---
 src/mesa/main/ffvertex_prog.c | 43 +++++++++++++++++++------------------------
 1 file changed, 19 insertions(+), 24 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index f648d081c0..810af9e33e 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -946,35 +946,33 @@ static void build_lighting( struct tnl_program *p )
 	 _bfc1 = _bfc0;
    }
 
-
    /* If no lights, still need to emit the scenecolor.
     */
-      {
-	 struct ureg res0 = register_output( p, VERT_RESULT_COL0 );
-	 emit_op1(p, OPCODE_MOV, res0, 0, _col0);
-      }
+   {
+      struct ureg res0 = register_output( p, VERT_RESULT_COL0 );
+      emit_op1(p, OPCODE_MOV, res0, 0, _col0);
+   }
 
-      if (separate) {
-	 struct ureg res1 = register_output( p, VERT_RESULT_COL1 );
-	 emit_op1(p, OPCODE_MOV, res1, 0, _col1);
-      }
+   if (separate) {
+      struct ureg res1 = register_output( p, VERT_RESULT_COL1 );
+      emit_op1(p, OPCODE_MOV, res1, 0, _col1);
+   }
 
-      if (twoside) {
-	 struct ureg res0 = register_output( p, VERT_RESULT_BFC0 );
-	 emit_op1(p, OPCODE_MOV, res0, 0, _bfc0);
-      }
+   if (twoside) {
+      struct ureg res0 = register_output( p, VERT_RESULT_BFC0 );
+      emit_op1(p, OPCODE_MOV, res0, 0, _bfc0);
+   }
       
-      if (twoside && separate) {
-	 struct ureg res1 = register_output( p, VERT_RESULT_BFC1 );
-	 emit_op1(p, OPCODE_MOV, res1, 0, _bfc1);
-      }
+   if (twoside && separate) {
+      struct ureg res1 = register_output( p, VERT_RESULT_BFC1 );
+      emit_op1(p, OPCODE_MOV, res1, 0, _bfc1);
+   }
       
    if (nr_lights == 0) {
       release_temps(p);
       return;
    }
 
-
    for (i = 0; i < MAX_LIGHTS; i++) {
       if (p->state->unit[i].light_enabled) {
 	 struct ureg half = undef;
@@ -1006,7 +1004,7 @@ static void build_lighting( struct tnl_program *p )
 	    VPpli = get_temp(p); 
 	    half = get_temp(p);
  
-	    /* Calulate VPpli vector
+	    /* Calculate VPpli vector
 	     */
 	    emit_op2(p, OPCODE_SUB, VPpli, 0, Ppli, V); 
 
@@ -1017,15 +1015,13 @@ static void build_lighting( struct tnl_program *p )
 	    emit_op1(p, OPCODE_RSQ, dist, 0, dist);
 	    emit_op2(p, OPCODE_MUL, VPpli, 0, VPpli, dist);
 
-
-	    /* Calculate  attenuation:
+	    /* Calculate attenuation:
 	     */ 
 	    if (!p->state->unit[i].light_spotcutoff_is_180 ||
 		p->state->unit[i].light_attenuated) {
 	       att = calculate_light_attenuation(p, i, VPpli, dist);
 	    }
-	 
-      
+
 	    /* Calculate viewer direction, or use infinite viewer:
 	     */
 	    if (p->state->light_local_viewer) {
@@ -1047,7 +1043,6 @@ static void build_lighting( struct tnl_program *p )
 	 emit_op2(p, OPCODE_DP3, dots, WRITEMASK_X, normal, VPpli);
 	 emit_op2(p, OPCODE_DP3, dots, WRITEMASK_Y, normal, half);
 
-	
 	 /* Front face lighting:
 	  */
 	 {
-- 
cgit v1.2.3


From 103ae5d16fd9fef566096570f731bb634a8025d4 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Tue, 6 May 2008 22:13:06 -0600
Subject: gallium: implement full reference counting for vertex/fragment
 programs

Use _mesa_reference_vert/fragprog() wherever we assign program pointers.
Fixes a memory corruption bug found with glean/api2 test.
Another memory bug involving shaders yet to be fixed...
---
 src/mesa/main/context.c                 |  26 ++++----
 src/mesa/main/mtypes.h                  |   4 +-
 src/mesa/main/state.c                   |  32 ++++++----
 src/mesa/shader/prog_cache.c            |   5 +-
 src/mesa/shader/program.c               | 103 +++++++++++++++++++++-----------
 src/mesa/shader/program.h               |  22 +++++++
 src/mesa/shader/shader_api.c            |   6 +-
 src/mesa/shader/slang/slang_link.c      |  12 ++--
 src/mesa/state_tracker/st_atom_shader.c |   7 ++-
 src/mesa/state_tracker/st_context.c     |   3 +
 src/mesa/state_tracker/st_program.h     |  24 +++++++-
 11 files changed, 170 insertions(+), 74 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 7b8d934170..b9053344b2 100755
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -150,8 +150,6 @@ int MESA_DEBUG_FLAGS = 0;
 /* ubyte -> float conversion */
 GLfloat _mesa_ubyte_to_float_color_tab[256];
 
-static void
-free_shared_state( GLcontext *ctx, struct gl_shared_state *ss );
 
 
 /**
@@ -423,12 +421,14 @@ alloc_shared_state( GLcontext *ctx )
 #endif
 
 #if FEATURE_ARB_vertex_program
-   ss->DefaultVertexProgram = ctx->Driver.NewProgram(ctx, GL_VERTEX_PROGRAM_ARB, 0);
+   ss->DefaultVertexProgram = (struct gl_vertex_program *)
+      ctx->Driver.NewProgram(ctx, GL_VERTEX_PROGRAM_ARB, 0);
    if (!ss->DefaultVertexProgram)
       goto cleanup;
 #endif
 #if FEATURE_ARB_fragment_program
-   ss->DefaultFragmentProgram = ctx->Driver.NewProgram(ctx, GL_FRAGMENT_PROGRAM_ARB, 0);
+   ss->DefaultFragmentProgram = (struct gl_fragment_program *)
+      ctx->Driver.NewProgram(ctx, GL_FRAGMENT_PROGRAM_ARB, 0);
    if (!ss->DefaultFragmentProgram)
       goto cleanup;
 #endif
@@ -513,12 +513,10 @@ alloc_shared_state( GLcontext *ctx )
       _mesa_DeleteHashTable(ss->Programs);
 #endif
 #if FEATURE_ARB_vertex_program
-   if (ss->DefaultVertexProgram)
-      ctx->Driver.DeleteProgram(ctx, ss->DefaultVertexProgram);
+   _mesa_reference_vertprog(ctx, &ss->DefaultVertexProgram, NULL);
 #endif
 #if FEATURE_ARB_fragment_program
-   if (ss->DefaultFragmentProgram)
-      ctx->Driver.DeleteProgram(ctx, ss->DefaultFragmentProgram);
+   _mesa_reference_fragprog(ctx, &ss->DefaultFragmentProgram, NULL);
 #endif
 #if FEATURE_ATI_fragment_shader
    if (ss->DefaultFragmentShader)
@@ -695,10 +693,10 @@ free_shared_state( GLcontext *ctx, struct gl_shared_state *ss )
    _mesa_DeleteHashTable(ss->Programs);
 #endif
 #if FEATURE_ARB_vertex_program
-   ctx->Driver.DeleteProgram(ctx, ss->DefaultVertexProgram);
+   _mesa_reference_vertprog(ctx, &ss->DefaultVertexProgram, NULL);
 #endif
 #if FEATURE_ARB_fragment_program
-   ctx->Driver.DeleteProgram(ctx, ss->DefaultFragmentProgram);
+   _mesa_reference_fragprog(ctx, &ss->DefaultFragmentProgram, NULL);
 #endif
 
 #if FEATURE_ATI_fragment_shader
@@ -1190,6 +1188,14 @@ _mesa_free_context_data( GLcontext *ctx )
       _mesa_unreference_framebuffer(&ctx->ReadBuffer);
    }
 
+   _mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current, NULL);
+   _mesa_reference_vertprog(ctx, &ctx->VertexProgram._Current, NULL);
+   _mesa_reference_vertprog(ctx, &ctx->VertexProgram._TnlProgram, NULL);
+
+   _mesa_reference_fragprog(ctx, &ctx->FragmentProgram.Current, NULL);
+   _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current, NULL);
+   _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._TexEnvProgram, NULL);
+
    _mesa_free_lighting_data( ctx );
    _mesa_free_eval_data( ctx );
    _mesa_free_texture_data( ctx );
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 50b22d25bf..463142fe39 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2203,10 +2203,10 @@ struct gl_shared_state
    /*@{*/
    struct _mesa_HashTable *Programs; /**< All vertex/fragment programs */
 #if FEATURE_ARB_vertex_program
-   struct gl_program *DefaultVertexProgram;
+   struct gl_vertex_program *DefaultVertexProgram;
 #endif
 #if FEATURE_ARB_fragment_program
-   struct gl_program *DefaultFragmentProgram;
+   struct gl_fragment_program *DefaultFragmentProgram;
 #endif
    /*@}*/
 
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 0b1c56fdd5..90379a1772 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -982,16 +982,20 @@ update_program(GLcontext *ctx)
 #endif
    if (shProg && shProg->LinkStatus && shProg->FragmentProgram) {
       /* user-defined fragment shader */
-      ctx->FragmentProgram._Current = shProg->FragmentProgram;
+      _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current,
+                               shProg->FragmentProgram);
    }
    else if (ctx->FragmentProgram._Enabled) {
       /* use user-defined fragment program */
-      ctx->FragmentProgram._Current = ctx->FragmentProgram.Current;
+      _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current,
+                               ctx->FragmentProgram.Current);
    }
    else if (ctx->FragmentProgram._MaintainTexEnvProgram) {
       /* fragment program generated from fixed-function state */
-      ctx->FragmentProgram._Current = _mesa_get_fixed_func_fragment_program(ctx);
-      ctx->FragmentProgram._TexEnvProgram = ctx->FragmentProgram._Current;
+      _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current,
+                               _mesa_get_fixed_func_fragment_program(ctx));
+      _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._TexEnvProgram,
+                               ctx->FragmentProgram._Current);
 
       /* XXX get rid of this confusing stuff someday? */
       ctx->FragmentProgram._Active = ctx->FragmentProgram._Enabled;
@@ -1000,7 +1004,7 @@ update_program(GLcontext *ctx)
    }
    else {
       /* no fragment program */
-      ctx->FragmentProgram._Current = NULL;
+      _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current, NULL);
    }
 
    if (ctx->FragmentProgram._Current != prevFP && ctx->Driver.BindProgram) {
@@ -1013,29 +1017,33 @@ update_program(GLcontext *ctx)
     **/
 #if 1
    /* XXX get rid of this someday? */
-   ctx->VertexProgram._TnlProgram = NULL;
+   _mesa_reference_vertprog(ctx, &ctx->VertexProgram._TnlProgram, NULL);
 #endif
    if (shProg && shProg->LinkStatus && shProg->VertexProgram) {
       /* user-defined vertex shader */
-      ctx->VertexProgram._Current = shProg->VertexProgram;
+      _mesa_reference_vertprog(ctx, &ctx->VertexProgram._Current,
+                               shProg->VertexProgram);
    }
    else if (ctx->VertexProgram._Enabled) {
       /* use user-defined vertex program */
-      ctx->VertexProgram._Current = ctx->VertexProgram.Current;
+      _mesa_reference_vertprog(ctx, &ctx->VertexProgram._Current,
+                               ctx->VertexProgram.Current);
    }
    else if (ctx->VertexProgram._MaintainTnlProgram) {
       /* vertex program generated from fixed-function state */
-      ctx->VertexProgram._Current = _mesa_get_fixed_func_vertex_program(ctx);
-      ctx->VertexProgram._TnlProgram = ctx->VertexProgram._Current;
+      _mesa_reference_vertprog(ctx, &ctx->VertexProgram._Current,
+                               _mesa_get_fixed_func_vertex_program(ctx));
+      _mesa_reference_vertprog(ctx, &ctx->VertexProgram._TnlProgram,
+                               ctx->VertexProgram._Current);
    }
    else {
       /* no vertex program / used fixed-function code */
-      ctx->VertexProgram._Current = NULL;
+      _mesa_reference_vertprog(ctx, &ctx->VertexProgram._Current, NULL);
    }
 
    if (ctx->VertexProgram._Current != prevVP && ctx->Driver.BindProgram) {
       ctx->Driver.BindProgram(ctx, GL_VERTEX_PROGRAM_ARB,
-                              (struct gl_program *) ctx->VertexProgram._Current);
+                           (struct gl_program *) ctx->VertexProgram._Current);
    }
 }
 
diff --git a/src/mesa/shader/prog_cache.c b/src/mesa/shader/prog_cache.c
index dd0241ef24..36a25377c5 100644
--- a/src/mesa/shader/prog_cache.c
+++ b/src/mesa/shader/prog_cache.c
@@ -30,6 +30,7 @@
 #include "main/mtypes.h"
 #include "main/imports.h"
 #include "shader/prog_cache.h"
+#include "shader/program.h"
 
 
 struct cache_item
@@ -109,7 +110,7 @@ clear_cache(GLcontext *ctx, struct gl_program_cache *cache)
       for (c = cache->items[i]; c; c = next) {
 	 next = c->next;
 	 _mesa_free(c->key);
-	 ctx->Driver.DeleteProgram(ctx, c->program);
+         _mesa_reference_program(ctx, &c->program, NULL);
 	 _mesa_free(c);
       }
       cache->items[i] = NULL;
@@ -177,7 +178,7 @@ _mesa_program_cache_insert(GLcontext *ctx,
    c->key = _mesa_malloc(keysize);
    memcpy(c->key, key, keysize);
 
-   c->program = program;
+   c->program = program;  /* no refcount change */
 
    if (cache->n_items > cache->size * 1.5) {
       if (cache->size < 1000)
diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c
index 0ed7f833d2..9a23c5d7d3 100644
--- a/src/mesa/shader/program.c
+++ b/src/mesa/shader/program.c
@@ -60,9 +60,9 @@ _mesa_init_program(GLcontext *ctx)
    ctx->VertexProgram.Enabled = GL_FALSE;
    ctx->VertexProgram.PointSizeEnabled = GL_FALSE;
    ctx->VertexProgram.TwoSideEnabled = GL_FALSE;
-   ctx->VertexProgram.Current = (struct gl_vertex_program *) ctx->Shared->DefaultVertexProgram;
+   _mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current,
+                            ctx->Shared->DefaultVertexProgram);
    assert(ctx->VertexProgram.Current);
-   ctx->VertexProgram.Current->Base.RefCount++;
    for (i = 0; i < MAX_NV_VERTEX_PROGRAM_PARAMS / 4; i++) {
       ctx->VertexProgram.TrackMatrix[i] = GL_NONE;
       ctx->VertexProgram.TrackMatrixTransform[i] = GL_IDENTITY_NV;
@@ -72,9 +72,9 @@ _mesa_init_program(GLcontext *ctx)
 
 #if FEATURE_NV_fragment_program || FEATURE_ARB_fragment_program
    ctx->FragmentProgram.Enabled = GL_FALSE;
-   ctx->FragmentProgram.Current = (struct gl_fragment_program *) ctx->Shared->DefaultFragmentProgram;
+   _mesa_reference_fragprog(ctx, &ctx->FragmentProgram.Current,
+                            ctx->Shared->DefaultFragmentProgram);
    assert(ctx->FragmentProgram.Current);
-   ctx->FragmentProgram.Current->Base.RefCount++;
    ctx->FragmentProgram.Cache = _mesa_new_program_cache();
 #endif
 
@@ -96,19 +96,11 @@ void
 _mesa_free_program_data(GLcontext *ctx)
 {
 #if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program
-   if (ctx->VertexProgram.Current) {
-      ctx->VertexProgram.Current->Base.RefCount--;
-      if (ctx->VertexProgram.Current->Base.RefCount <= 0)
-         ctx->Driver.DeleteProgram(ctx, &(ctx->VertexProgram.Current->Base));
-   }
+   _mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current, NULL);
    _mesa_delete_program_cache(ctx, ctx->VertexProgram.Cache);
 #endif
 #if FEATURE_NV_fragment_program || FEATURE_ARB_fragment_program
-   if (ctx->FragmentProgram.Current) {
-      ctx->FragmentProgram.Current->Base.RefCount--;
-      if (ctx->FragmentProgram.Current->Base.RefCount <= 0)
-         ctx->Driver.DeleteProgram(ctx, &(ctx->FragmentProgram.Current->Base));
-   }
+   _mesa_reference_fragprog(ctx, &ctx->FragmentProgram.Current, NULL);
    _mesa_delete_program_cache(ctx, ctx->FragmentProgram.Cache);
 #endif
    /* XXX probably move this stuff */
@@ -325,6 +317,59 @@ _mesa_lookup_program(GLcontext *ctx, GLuint id)
 }
 
 
+/**
+ * Reference counting for vertex/fragment programs
+ */
+void
+_mesa_reference_program(GLcontext *ctx,
+                        struct gl_program **ptr,
+                        struct gl_program *prog)
+{
+   assert(ptr);
+   if (*ptr && prog) {
+      /* sanity check */
+      ASSERT((*ptr)->Target == prog->Target);
+   }
+   if (*ptr == prog) {
+      return;  /* no change */
+   }
+   if (*ptr) {
+      GLboolean deleteFlag;
+
+      /*_glthread_LOCK_MUTEX((*ptr)->Mutex);*/
+#if 0
+      printf("Program %p %u 0x%x  Refcount-- to %d\n",
+             *ptr, (*ptr)->Id, (*ptr)->Target, (*ptr)->RefCount - 1);
+#endif
+      ASSERT((*ptr)->RefCount > 0);
+      (*ptr)->RefCount--;
+
+      deleteFlag = ((*ptr)->RefCount == 0);
+      /*_glthread_UNLOCK_MUTEX((*ptr)->Mutex);*/
+      
+      if (deleteFlag) {
+         ASSERT(ctx);
+         ctx->Driver.DeleteProgram(ctx, *ptr);
+      }
+
+      *ptr = NULL;
+   }
+
+   assert(!*ptr);
+   if (prog) {
+      /*_glthread_LOCK_MUTEX(prog->Mutex);*/
+      prog->RefCount++;
+#if 0
+      printf("Program %p %u 0x%x  Refcount++ to %d\n",
+             prog, prog->Id, prog->Target, prog->RefCount);
+#endif
+      /*_glthread_UNLOCK_MUTEX(prog->Mutex);*/
+   }
+
+   *ptr = prog;
+}
+
+
 /**
  * Return a copy of a program.
  * XXX Problem here if the program object is actually OO-derivation
@@ -340,8 +385,9 @@ _mesa_clone_program(GLcontext *ctx, const struct gl_program *prog)
       return NULL;
 
    assert(clone->Target == prog->Target);
+   assert(clone->RefCount == 1);
+
    clone->String = (GLubyte *) _mesa_strdup((char *) prog->String);
-   clone->RefCount = 1;
    clone->Format = prog->Format;
    clone->Instructions = _mesa_alloc_instructions(prog->NumInstructions);
    if (!clone->Instructions) {
@@ -704,9 +750,9 @@ _mesa_BindProgram(GLenum target, GLuint id)
       /* Bind a default program */
       newProg = NULL;
       if (target == GL_VERTEX_PROGRAM_ARB) /* == GL_VERTEX_PROGRAM_NV */
-         newProg = ctx->Shared->DefaultVertexProgram;
+         newProg = &ctx->Shared->DefaultVertexProgram->Base;
       else
-         newProg = ctx->Shared->DefaultFragmentProgram;
+         newProg = &ctx->Shared->DefaultFragmentProgram->Base;
    }
    else {
       /* Bind a user program */
@@ -734,26 +780,16 @@ _mesa_BindProgram(GLenum target, GLuint id)
       return;
    }
 
-   /* unbind/delete oldProg */
-   if (curProg->Id != 0) {
-      /* decrement refcount on previously bound fragment program */
-      curProg->RefCount--;
-      /* and delete if refcount goes below one */
-      if (curProg->RefCount <= 0) {
-         /* the program ID was already removed from the hash table */
-         ctx->Driver.DeleteProgram(ctx, curProg);
-      }
-   }
-
    /* bind newProg */
    if (target == GL_VERTEX_PROGRAM_ARB) { /* == GL_VERTEX_PROGRAM_NV */
-      ctx->VertexProgram.Current = (struct gl_vertex_program *) newProg;
+      _mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current,
+                               (struct gl_vertex_program *) newProg);
    }
    else if (target == GL_FRAGMENT_PROGRAM_NV ||
             target == GL_FRAGMENT_PROGRAM_ARB) {
-      ctx->FragmentProgram.Current = (struct gl_fragment_program *) newProg;
+      _mesa_reference_fragprog(ctx, &ctx->FragmentProgram.Current,
+                               (struct gl_fragment_program *) newProg);
    }
-   newProg->RefCount++;
 
    /* Never null pointers */
    ASSERT(ctx->VertexProgram.Current);
@@ -811,10 +847,7 @@ _mesa_DeletePrograms(GLsizei n, const GLuint *ids)
             }
             /* The ID is immediately available for re-use now */
             _mesa_HashRemove(ctx->Shared->Programs, ids[i]);
-            prog->RefCount--;
-            if (prog->RefCount <= 0) {
-               ctx->Driver.DeleteProgram(ctx, prog);
-            }
+            _mesa_reference_program(ctx, &prog, NULL);
          }
       }
    }
diff --git a/src/mesa/shader/program.h b/src/mesa/shader/program.h
index 414a57d39c..08fe576afc 100644
--- a/src/mesa/shader/program.h
+++ b/src/mesa/shader/program.h
@@ -83,6 +83,28 @@ _mesa_delete_program(GLcontext *ctx, struct gl_program *prog);
 extern struct gl_program *
 _mesa_lookup_program(GLcontext *ctx, GLuint id);
 
+extern void
+_mesa_reference_program(GLcontext *ctx,
+                        struct gl_program **ptr,
+                        struct gl_program *prog);
+
+static INLINE void
+_mesa_reference_vertprog(GLcontext *ctx,
+                         struct gl_vertex_program **ptr,
+                         struct gl_vertex_program *prog)
+{
+   _mesa_reference_program(ctx, (struct gl_program **) ptr,
+                           (struct gl_program *) prog);
+}
+
+static INLINE void
+_mesa_reference_fragprog(GLcontext *ctx,
+                         struct gl_fragment_program **ptr,
+                         struct gl_fragment_program *prog)
+{
+   _mesa_reference_program(ctx, (struct gl_program **) ptr,
+                           (struct gl_program *) prog);
+}
 
 extern struct gl_program *
 _mesa_clone_program(GLcontext *ctx, const struct gl_program *prog);
diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index 9c419c9903..f12fa28d97 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -80,8 +80,7 @@ _mesa_clear_shader_program_data(GLcontext *ctx,
        * original/unlinked program.
        */
       shProg->VertexProgram->Base.Parameters = NULL;
-      ctx->Driver.DeleteProgram(ctx, &shProg->VertexProgram->Base);
-      shProg->VertexProgram = NULL;
+      _mesa_reference_vertprog(ctx, &shProg->VertexProgram, NULL);
    }
 
    if (shProg->FragmentProgram) {
@@ -89,8 +88,7 @@ _mesa_clear_shader_program_data(GLcontext *ctx,
        * original/unlinked program.
        */
       shProg->FragmentProgram->Base.Parameters = NULL;
-      ctx->Driver.DeleteProgram(ctx, &shProg->FragmentProgram->Base);
-      shProg->FragmentProgram = NULL;
+      _mesa_reference_fragprog(ctx, &shProg->FragmentProgram, NULL);
    }
 
    if (shProg->Uniforms) {
diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c
index addff20421..ae581553dc 100644
--- a/src/mesa/shader/slang/slang_link.c
+++ b/src/mesa/shader/slang/slang_link.c
@@ -410,19 +410,19 @@ _slang_link(GLcontext *ctx,
     * changing src/dst registers after merging the uniforms and varying vars.
     */
    if (vertProg) {
-      shProg->VertexProgram
-         = vertex_program(_mesa_clone_program(ctx, &vertProg->Base));
+      _mesa_reference_vertprog(ctx, &shProg->VertexProgram,
+                               vertex_program(_mesa_clone_program(ctx, &vertProg->Base)));
    }
    else {
-      shProg->VertexProgram = NULL;
+      _mesa_reference_vertprog(ctx, &shProg->VertexProgram, NULL);
    }
 
    if (fragProg) {
-      shProg->FragmentProgram
-         = fragment_program(_mesa_clone_program(ctx, &fragProg->Base));
+      _mesa_reference_fragprog(ctx, &shProg->FragmentProgram,
+                               fragment_program(_mesa_clone_program(ctx, &fragProg->Base)));
    }
    else {
-      shProg->FragmentProgram = NULL;
+      _mesa_reference_fragprog(ctx, &shProg->FragmentProgram, NULL);
    }
 
    /* link varying vars */
diff --git a/src/mesa/state_tracker/st_atom_shader.c b/src/mesa/state_tracker/st_atom_shader.c
index 652500f52a..7745591afb 100644
--- a/src/mesa/state_tracker/st_atom_shader.c
+++ b/src/mesa/state_tracker/st_atom_shader.c
@@ -39,6 +39,7 @@
 
 #include "main/imports.h"
 #include "main/mtypes.h"
+#include "shader/program.h"
 
 #include "pipe/p_context.h"
 #include "pipe/p_shader_tokens.h"
@@ -264,14 +265,16 @@ update_linkage( struct st_context *st )
     */
    assert(st->ctx->VertexProgram._Current);
    stvp = st_vertex_program(st->ctx->VertexProgram._Current);
+   assert(stvp->Base.Base.Target == GL_VERTEX_PROGRAM_ARB);
 
    assert(st->ctx->FragmentProgram._Current);
    stfp = st_fragment_program(st->ctx->FragmentProgram._Current);
+   assert(stfp->Base.Base.Target == GL_FRAGMENT_PROGRAM_ARB);
 
    xvp = find_translated_vp(st, stvp, stfp);
 
-   st->vp = stvp;
-   st->fp = stfp;
+   st_reference_vertprog(st, &st->vp, stvp);
+   st_reference_fragprog(st, &st->fp, stfp);
 
    cso_set_vertex_shader_handle(st->cso_context, stvp->driver_shader);
    cso_set_fragment_shader_handle(st->cso_context, stfp->driver_shader);
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index c900064f2b..8db55a179f 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -158,6 +158,9 @@ static void st_destroy_context_priv( struct st_context *st )
 {
    uint i;
 
+   st_reference_fragprog(st, &st->fp, NULL);
+   st_reference_vertprog(st, &st->vp, NULL);
+
    draw_destroy(st->draw);
    st_destroy_atoms( st );
    st_destroy_draw( st );
diff --git a/src/mesa/state_tracker/st_program.h b/src/mesa/state_tracker/st_program.h
index d8f26da2ee..bf07a50789 100644
--- a/src/mesa/state_tracker/st_program.h
+++ b/src/mesa/state_tracker/st_program.h
@@ -34,7 +34,8 @@
 #ifndef ST_PROGRAM_H
 #define ST_PROGRAM_H
 
-#include "mtypes.h"
+#include "main/mtypes.h"
+#include "shader/program.h"
 #include "pipe/p_shader_tokens.h"
 
 
@@ -115,6 +116,27 @@ st_vertex_program( struct gl_vertex_program *vp )
 }
 
 
+static INLINE void
+st_reference_vertprog(struct st_context *st,
+                      struct st_vertex_program **ptr,
+                      struct st_vertex_program *prog)
+{
+   _mesa_reference_program(st->ctx,
+                           (struct gl_program **) ptr,
+                           (struct gl_program *) prog);
+}
+
+static INLINE void
+st_reference_fragprog(struct st_context *st,
+                      struct st_fragment_program **ptr,
+                      struct st_fragment_program *prog)
+{
+   _mesa_reference_program(st->ctx,
+                           (struct gl_program **) ptr,
+                           (struct gl_program *) prog);
+}
+
+
 extern void
 st_translate_fragment_program(struct st_context *st,
                               struct st_fragment_program *fp,
-- 
cgit v1.2.3


From 05370685fedab9608d6b5b5de7042dac4289e522 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Tue, 6 May 2008 23:08:02 -0600
Subject: mesa: free shader program data before deleting shader objects.

Picked from master.
Fixes mem corruption seen when glean/api2 test exits.
---
 src/mesa/main/context.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index b9053344b2..893c79f28c 100755
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -630,6 +630,21 @@ delete_arrayobj_cb(GLuint id, void *data, void *userData)
    _mesa_delete_array_object(ctx, arrayObj);
 }
 
+/**
+ * Callback for freeing shader program data. Call it before delete_shader_cb
+ * to avoid memory access error.
+ */
+static void
+free_shader_program_data_cb(GLuint id, void *data, void *userData)
+{
+   GLcontext *ctx = (GLcontext *) userData;
+   struct gl_shader_program *shProg = (struct gl_shader_program *) data;
+
+   if (shProg->Type == GL_SHADER_PROGRAM_MESA) {
+       _mesa_free_shader_program_data(ctx, shProg);
+   }
+}
+
 /**
  * Callback for deleting shader and shader programs objects.
  * Called by _mesa_HashDeleteAll().
@@ -714,6 +729,7 @@ free_shared_state( GLcontext *ctx, struct gl_shared_state *ss )
    _mesa_DeleteHashTable(ss->ArrayObjects);
 
 #if FEATURE_ARB_shader_objects
+   _mesa_HashWalk(ss->ShaderObjects, free_shader_program_data_cb, ctx);
    _mesa_HashDeleteAll(ss->ShaderObjects, delete_shader_cb, ctx);
    _mesa_DeleteHashTable(ss->ShaderObjects);
 #endif
-- 
cgit v1.2.3


From f9e1ef2a5b7951d36db56913b1366cf65b9d0976 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Sun, 18 May 2008 15:21:28 -0600
Subject: alias ProgramEnvParameter4xyARB and ProgramParameter4xyNV (bug
 #12935)

these should be the same functions (as per spec).

cherry-picked from master (86a4810b09097714942bf2b889e6c62357bba931)
---
 src/mesa/glapi/gl_API.xml    |  14 ++-
 src/mesa/main/config.h       |  39 ++++----
 src/mesa/main/dlist.c        | 205 ++++++++++++++++---------------------------
 src/mesa/main/state.c        |   8 +-
 src/mesa/shader/arbprogram.c |  29 +++++-
 src/mesa/shader/nvprogram.c  |  69 ---------------
 src/mesa/shader/nvprogram.h  |  12 ---
 7 files changed, 132 insertions(+), 244 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/glapi/gl_API.xml b/src/mesa/glapi/gl_API.xml
index 3d47e6f2ce..ef4a309cd6 100644
--- a/src/mesa/glapi/gl_API.xml
+++ b/src/mesa/glapi/gl_API.xml
@@ -11275,7 +11275,7 @@
         <glx rop="4183"/>
     </function>
 
-    <function name="ProgramParameter4dNV" offset="assign" vectorequiv="ProgramParameter4dvNV">
+    <function name="ProgramParameter4dNV" alias="ProgramEnvParameter4dARB">
         <param name="target" type="GLenum"/>
         <param name="index" type="GLuint"/>
         <param name="x" type="GLdouble"/>
@@ -11284,14 +11284,13 @@
         <param name="w" type="GLdouble"/>
     </function>
 
-    <function name="ProgramParameter4dvNV" offset="assign">
+    <function name="ProgramParameter4dvNV" alias="ProgramEnvParameter4dvARB">
         <param name="target" type="GLenum"/>
         <param name="index" type="GLuint"/>
-        <param name="params" type="const GLdouble *" count="4"/>
-        <glx rop="4185" doubles_in_order="true"/>
+        <param name="params" type="const GLdouble *"/>
     </function>
 
-    <function name="ProgramParameter4fNV" offset="assign" vectorequiv="ProgramParameter4fvNV">
+    <function name="ProgramParameter4fNV" alias="ProgramEnvParameter4fARB">
         <param name="target" type="GLenum"/>
         <param name="index" type="GLuint"/>
         <param name="x" type="GLfloat"/>
@@ -11300,11 +11299,10 @@
         <param name="w" type="GLfloat"/>
     </function>
 
-    <function name="ProgramParameter4fvNV" offset="assign">
+    <function name="ProgramParameter4fvNV" alias="ProgramEnvParameter4fvARB">
         <param name="target" type="GLenum"/>
         <param name="index" type="GLuint"/>
-        <param name="params" type="const GLfloat *" count="4"/>
-        <glx rop="4184"/>
+        <param name="params" type="const GLfloat *"/>
     </function>
 
     <function name="ProgramParameters4dvNV" offset="assign">
diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index 8c64248845..232e698f50 100644
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -163,25 +163,6 @@
 /** For GL_EXT_texture_lod_bias (typically MAX_TEXTURE_LEVELS - 1) */
 #define MAX_TEXTURE_LOD_BIAS 11.0
 
-/** For GL_NV_vertex_program */
-/*@{*/
-#define MAX_NV_VERTEX_PROGRAM_INSTRUCTIONS 128
-#define MAX_NV_VERTEX_PROGRAM_TEMPS         12
-#define MAX_NV_VERTEX_PROGRAM_PARAMS        128	/* KW: power of two */
-#define MAX_NV_VERTEX_PROGRAM_INPUTS        16
-#define MAX_NV_VERTEX_PROGRAM_OUTPUTS       15
-/*@}*/
-
-/** For GL_NV_fragment_program */
-/*@{*/
-#define MAX_NV_FRAGMENT_PROGRAM_INSTRUCTIONS 1024 /* 72 for GL_ARB_f_p */
-#define MAX_NV_FRAGMENT_PROGRAM_TEMPS         96
-#define MAX_NV_FRAGMENT_PROGRAM_PARAMS        64
-#define MAX_NV_FRAGMENT_PROGRAM_INPUTS        12
-#define MAX_NV_FRAGMENT_PROGRAM_OUTPUTS        3
-#define MAX_NV_FRAGMENT_PROGRAM_WRITE_ONLYS    2
-/*@}*/
-
 /** For GL_ARB_vertex_program */
 /*@{*/
 #define MAX_VERTEX_PROGRAM_ADDRESS_REGS 1
@@ -210,6 +191,26 @@
 #define MAX_SAMPLERS 8
 /*@}*/
 
+/** For GL_NV_vertex_program */
+/*@{*/
+#define MAX_NV_VERTEX_PROGRAM_INSTRUCTIONS 128
+#define MAX_NV_VERTEX_PROGRAM_TEMPS         12
+#define MAX_NV_VERTEX_PROGRAM_PARAMS        MAX_PROGRAM_ENV_PARAMS
+#define MAX_NV_VERTEX_PROGRAM_INPUTS        16
+#define MAX_NV_VERTEX_PROGRAM_OUTPUTS       15
+/*@}*/
+
+/** For GL_NV_fragment_program */
+/*@{*/
+#define MAX_NV_FRAGMENT_PROGRAM_INSTRUCTIONS 1024 /* 72 for GL_ARB_f_p */
+#define MAX_NV_FRAGMENT_PROGRAM_TEMPS         96
+#define MAX_NV_FRAGMENT_PROGRAM_PARAMS        64
+#define MAX_NV_FRAGMENT_PROGRAM_INPUTS        12
+#define MAX_NV_FRAGMENT_PROGRAM_OUTPUTS        3
+#define MAX_NV_FRAGMENT_PROGRAM_WRITE_ONLYS    2
+/*@}*/
+
+
 /** For GL_ARB_vertex_shader */
 /*@{*/
 #define MAX_VERTEX_ATTRIBS 16
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 293ee5fa34..13ebd4dd0d 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -303,7 +303,6 @@ typedef enum
    OPCODE_EXECUTE_PROGRAM_NV,
    OPCODE_REQUEST_RESIDENT_PROGRAMS_NV,
    OPCODE_LOAD_PROGRAM_NV,
-   OPCODE_PROGRAM_PARAMETER4F_NV,
    OPCODE_TRACK_MATRIX_NV,
    /* GL_NV_fragment_program */
    OPCODE_PROGRAM_LOCAL_PARAMETER_ARB,
@@ -4248,77 +4247,111 @@ save_BindProgramNV(GLenum target, GLuint id)
       CALL_BindProgramNV(ctx->Exec, (target, id));
    }
 }
-#endif /* FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program */
 
-#if FEATURE_NV_vertex_program
 static void GLAPIENTRY
-save_ExecuteProgramNV(GLenum target, GLuint id, const GLfloat *params)
+save_ProgramEnvParameter4fARB(GLenum target, GLuint index,
+                              GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
    GET_CURRENT_CONTEXT(ctx);
    Node *n;
    ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = ALLOC_INSTRUCTION(ctx, OPCODE_EXECUTE_PROGRAM_NV, 6);
+   n = ALLOC_INSTRUCTION(ctx, OPCODE_PROGRAM_ENV_PARAMETER_ARB, 6);
    if (n) {
       n[1].e = target;
-      n[2].ui = id;
-      n[3].f = params[0];
-      n[4].f = params[1];
-      n[5].f = params[2];
-      n[6].f = params[3];
+      n[2].ui = index;
+      n[3].f = x;
+      n[4].f = y;
+      n[5].f = z;
+      n[6].f = w;
    }
    if (ctx->ExecuteFlag) {
-      CALL_ExecuteProgramNV(ctx->Exec, (target, id, params));
+      CALL_ProgramEnvParameter4fARB(ctx->Exec, (target, index, x, y, z, w));
    }
 }
 
 
 static void GLAPIENTRY
-save_ProgramParameter4fNV(GLenum target, GLuint index,
-                          GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+save_ProgramEnvParameter4fvARB(GLenum target, GLuint index,
+                               const GLfloat *params)
+{
+   save_ProgramEnvParameter4fARB(target, index, params[0], params[1],
+                                 params[2], params[3]);
+}
+
+
+static void GLAPIENTRY
+save_ProgramEnvParameters4fvEXT(GLenum target, GLuint index, GLsizei count,
+				const GLfloat * params)
 {
    GET_CURRENT_CONTEXT(ctx);
    Node *n;
    ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = ALLOC_INSTRUCTION(ctx, OPCODE_PROGRAM_PARAMETER4F_NV, 6);
-   if (n) {
-      n[1].e = target;
-      n[2].ui = index;
-      n[3].f = x;
-      n[4].f = y;
-      n[5].f = z;
-      n[6].f = w;
+
+   if (count > 0) {
+      GLint i;
+      const GLfloat * p = params;
+
+      for (i = 0 ; i < count ; i++) {
+	 n = ALLOC_INSTRUCTION(ctx, OPCODE_PROGRAM_ENV_PARAMETER_ARB, 6);
+	 if (n) {
+	    n[1].e = target;
+	    n[2].ui = index;
+	    n[3].f = p[0];
+	    n[4].f = p[1];
+	    n[5].f = p[2];
+	    n[6].f = p[3];
+	    p += 4;
+	 }
+      }
    }
+
    if (ctx->ExecuteFlag) {
-      CALL_ProgramParameter4fNV(ctx->Exec, (target, index, x, y, z, w));
+      CALL_ProgramEnvParameters4fvEXT(ctx->Exec, (target, index, count, params));
    }
 }
 
 
 static void GLAPIENTRY
-save_ProgramParameter4fvNV(GLenum target, GLuint index,
-                           const GLfloat *params)
+save_ProgramEnvParameter4dARB(GLenum target, GLuint index,
+                              GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-   save_ProgramParameter4fNV(target, index, params[0], params[1],
-                             params[2], params[3]);
+   save_ProgramEnvParameter4fARB(target, index,
+                                 (GLfloat) x,
+                                 (GLfloat) y, (GLfloat) z, (GLfloat) w);
 }
 
 
 static void GLAPIENTRY
-save_ProgramParameter4dNV(GLenum target, GLuint index,
-                          GLdouble x, GLdouble y, GLdouble z, GLdouble w)
+save_ProgramEnvParameter4dvARB(GLenum target, GLuint index,
+                               const GLdouble *params)
 {
-   save_ProgramParameter4fNV(target, index, (GLfloat) x, (GLfloat) y,
-                             (GLfloat) z, (GLfloat) w);
+   save_ProgramEnvParameter4fARB(target, index,
+                                 (GLfloat) params[0],
+                                 (GLfloat) params[1],
+                                 (GLfloat) params[2], (GLfloat) params[3]);
 }
 
+#endif /* FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program || FEATURE_NV_vertex_program */
 
+#if FEATURE_NV_vertex_program
 static void GLAPIENTRY
-save_ProgramParameter4dvNV(GLenum target, GLuint index,
-                           const GLdouble *params)
+save_ExecuteProgramNV(GLenum target, GLuint id, const GLfloat *params)
 {
-   save_ProgramParameter4fNV(target, index, (GLfloat) params[0],
-                             (GLfloat) params[1], (GLfloat) params[2],
-                             (GLfloat) params[3]);
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION(ctx, OPCODE_EXECUTE_PROGRAM_NV, 6);
+   if (n) {
+      n[1].e = target;
+      n[2].ui = id;
+      n[3].f = params[0];
+      n[4].f = params[1];
+      n[5].f = params[2];
+      n[6].f = params[3];
+   }
+   if (ctx->ExecuteFlag) {
+      CALL_ExecuteProgramNV(ctx->Exec, (target, id, params));
+   }
 }
 
 
@@ -4328,7 +4361,7 @@ save_ProgramParameters4dvNV(GLenum target, GLuint index,
 {
    GLuint i;
    for (i = 0; i < num; i++) {
-      save_ProgramParameter4dvNV(target, index + i, params + 4 * i);
+      save_ProgramEnvParameter4dvARB(target, index + i, params + 4 * i);
    }
 }
 
@@ -4339,7 +4372,7 @@ save_ProgramParameters4fvNV(GLenum target, GLuint index,
 {
    GLuint i;
    for (i = 0; i < num; i++) {
-      save_ProgramParameter4fvNV(target, index + i, params + 4 * i);
+      save_ProgramEnvParameter4fvARB(target, index + i, params + 4 * i);
    }
 }
 
@@ -4667,90 +4700,6 @@ save_ProgramStringARB(GLenum target, GLenum format, GLsizei len,
    }
 }
 
-
-static void GLAPIENTRY
-save_ProgramEnvParameter4fARB(GLenum target, GLuint index,
-                              GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = ALLOC_INSTRUCTION(ctx, OPCODE_PROGRAM_ENV_PARAMETER_ARB, 6);
-   if (n) {
-      n[1].e = target;
-      n[2].ui = index;
-      n[3].f = x;
-      n[4].f = y;
-      n[5].f = z;
-      n[6].f = w;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_ProgramEnvParameter4fARB(ctx->Exec, (target, index, x, y, z, w));
-   }
-}
-
-
-static void GLAPIENTRY
-save_ProgramEnvParameter4fvARB(GLenum target, GLuint index,
-                               const GLfloat *params)
-{
-   save_ProgramEnvParameter4fARB(target, index, params[0], params[1],
-                                 params[2], params[3]);
-}
-
-
-static void GLAPIENTRY
-save_ProgramEnvParameters4fvEXT(GLenum target, GLuint index, GLsizei count,
-				const GLfloat * params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (count > 0) {
-      GLint i;
-      const GLfloat * p = params;
-
-      for (i = 0 ; i < count ; i++) {
-	 n = ALLOC_INSTRUCTION(ctx, OPCODE_PROGRAM_ENV_PARAMETER_ARB, 6);
-	 if (n) {
-	    n[1].e = target;
-	    n[2].ui = index;
-	    n[3].f = p[0];
-	    n[4].f = p[1];
-	    n[5].f = p[2];
-	    n[6].f = p[3];
-	    p += 4;
-	 }
-      }
-   }
-
-   if (ctx->ExecuteFlag) {
-      CALL_ProgramEnvParameters4fvEXT(ctx->Exec, (target, index, count, params));
-   }
-}
-
-
-static void GLAPIENTRY
-save_ProgramEnvParameter4dARB(GLenum target, GLuint index,
-                              GLdouble x, GLdouble y, GLdouble z, GLdouble w)
-{
-   save_ProgramEnvParameter4fARB(target, index,
-                                 (GLfloat) x,
-                                 (GLfloat) y, (GLfloat) z, (GLfloat) w);
-}
-
-
-static void GLAPIENTRY
-save_ProgramEnvParameter4dvARB(GLenum target, GLuint index,
-                               const GLdouble *params)
-{
-   save_ProgramEnvParameter4fARB(target, index,
-                                 (GLfloat) params[0],
-                                 (GLfloat) params[1],
-                                 (GLfloat) params[2], (GLfloat) params[3]);
-}
-
 #endif /* FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program */
 
 
@@ -6425,10 +6374,6 @@ execute_list(GLcontext *ctx, GLuint list)
             CALL_LoadProgramNV(ctx->Exec, (n[1].e, n[2].ui, n[3].i,
                                            (const GLubyte *) n[4].data));
             break;
-         case OPCODE_PROGRAM_PARAMETER4F_NV:
-            CALL_ProgramParameter4fNV(ctx->Exec, (n[1].e, n[2].ui, n[3].f,
-                                                  n[4].f, n[5].f, n[6].f));
-            break;
          case OPCODE_TRACK_MATRIX_NV:
             CALL_TrackMatrixNV(ctx->Exec, (n[1].e, n[2].ui, n[3].e, n[4].e));
             break;
@@ -6459,6 +6404,8 @@ execute_list(GLcontext *ctx, GLuint list)
             CALL_ProgramStringARB(ctx->Exec,
                                   (n[1].e, n[2].e, n[3].i, n[4].data));
             break;
+#endif
+#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program || FEATURE_NV_vertex_program
          case OPCODE_PROGRAM_ENV_PARAMETER_ARB:
             CALL_ProgramEnvParameter4fARB(ctx->Exec, (n[1].e, n[2].ui, n[3].f,
                                                       n[4].f, n[5].f,
@@ -8014,10 +7961,10 @@ _mesa_init_dlist_table(struct _glapi_table *table)
    SET_GetVertexAttribPointervNV(table, _mesa_GetVertexAttribPointervNV);
    SET_IsProgramNV(table, _mesa_IsProgramARB);
    SET_LoadProgramNV(table, save_LoadProgramNV);
-   SET_ProgramParameter4dNV(table, save_ProgramParameter4dNV);
-   SET_ProgramParameter4dvNV(table, save_ProgramParameter4dvNV);
-   SET_ProgramParameter4fNV(table, save_ProgramParameter4fNV);
-   SET_ProgramParameter4fvNV(table, save_ProgramParameter4fvNV);
+   SET_ProgramEnvParameter4dARB(table, save_ProgramEnvParameter4dARB);
+   SET_ProgramEnvParameter4dvARB(table, save_ProgramEnvParameter4dvARB);
+   SET_ProgramEnvParameter4fARB(table, save_ProgramEnvParameter4fARB);
+   SET_ProgramEnvParameter4fvARB(table, save_ProgramEnvParameter4fvARB);
    SET_ProgramParameters4dvNV(table, save_ProgramParameters4dvNV);
    SET_ProgramParameters4fvNV(table, save_ProgramParameters4fvNV);
    SET_TrackMatrixNV(table, save_TrackMatrixNV);
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 90379a1772..f8cb943e64 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -536,10 +536,10 @@ _mesa_init_exec_table(struct _glapi_table *exec)
    SET_GetVertexAttribPointervNV(exec, _mesa_GetVertexAttribPointervNV);
    SET_IsProgramNV(exec, _mesa_IsProgramARB);
    SET_LoadProgramNV(exec, _mesa_LoadProgramNV);
-   SET_ProgramParameter4dNV(exec, _mesa_ProgramParameter4dNV);
-   SET_ProgramParameter4dvNV(exec, _mesa_ProgramParameter4dvNV);
-   SET_ProgramParameter4fNV(exec, _mesa_ProgramParameter4fNV);
-   SET_ProgramParameter4fvNV(exec, _mesa_ProgramParameter4fvNV);
+   SET_ProgramEnvParameter4dARB(exec, _mesa_ProgramEnvParameter4dARB); /* alias to ProgramParameter4dNV */
+   SET_ProgramEnvParameter4dvARB(exec, _mesa_ProgramEnvParameter4dvARB);  /* alias to ProgramParameter4dvNV */
+   SET_ProgramEnvParameter4fARB(exec, _mesa_ProgramEnvParameter4fARB);  /* alias to ProgramParameter4fNV */
+   SET_ProgramEnvParameter4fvARB(exec, _mesa_ProgramEnvParameter4fvARB);  /* alias to ProgramParameter4fvNV */
    SET_ProgramParameters4dvNV(exec, _mesa_ProgramParameters4dvNV);
    SET_ProgramParameters4fvNV(exec, _mesa_ProgramParameters4fvNV);
    SET_TrackMatrixNV(exec, _mesa_TrackMatrixNV);
diff --git a/src/mesa/shader/arbprogram.c b/src/mesa/shader/arbprogram.c
index ee75be315e..1656dc9450 100644
--- a/src/mesa/shader/arbprogram.c
+++ b/src/mesa/shader/arbprogram.c
@@ -247,6 +247,12 @@ _mesa_ProgramStringARB(GLenum target, GLenum format, GLsizei len,
 }
 
 
+/**
+ * Set a program env parameter register.
+ * \note Called from the GL API dispatcher.
+ * Note, this function is also used by the GL_NV_vertex_program extension
+ * (alias to ProgramParameterdNV)
+ */
 void GLAPIENTRY
 _mesa_ProgramEnvParameter4dARB(GLenum target, GLuint index,
                                GLdouble x, GLdouble y, GLdouble z, GLdouble w)
@@ -256,6 +262,12 @@ _mesa_ProgramEnvParameter4dARB(GLenum target, GLuint index,
 }
 
 
+/**
+ * Set a program env parameter register.
+ * \note Called from the GL API dispatcher.
+ * Note, this function is also used by the GL_NV_vertex_program extension
+ * (alias to ProgramParameterdvNV)
+ */
 void GLAPIENTRY
 _mesa_ProgramEnvParameter4dvARB(GLenum target, GLuint index,
                                 const GLdouble *params)
@@ -266,6 +278,12 @@ _mesa_ProgramEnvParameter4dvARB(GLenum target, GLuint index,
 }
 
 
+/**
+ * Set a program env parameter register.
+ * \note Called from the GL API dispatcher.
+ * Note, this function is also used by the GL_NV_vertex_program extension
+ * (alias to ProgramParameterfNV)
+ */
 void GLAPIENTRY
 _mesa_ProgramEnvParameter4fARB(GLenum target, GLuint index,
                                GLfloat x, GLfloat y, GLfloat z, GLfloat w)
@@ -283,8 +301,8 @@ _mesa_ProgramEnvParameter4fARB(GLenum target, GLuint index,
       }
       ASSIGN_4V(ctx->FragmentProgram.Parameters[index], x, y, z, w);
    }
-   else if (target == GL_VERTEX_PROGRAM_ARB
-       && ctx->Extensions.ARB_vertex_program) {
+   else if (target == GL_VERTEX_PROGRAM_ARB /* == GL_VERTEX_PROGRAM_NV */
+       && (ctx->Extensions.ARB_vertex_program || ctx->Extensions.NV_vertex_program)) {
       if (index >= ctx->Const.VertexProgram.MaxEnvParams) {
          _mesa_error(ctx, GL_INVALID_VALUE, "glProgramEnvParameter(index)");
          return;
@@ -297,7 +315,12 @@ _mesa_ProgramEnvParameter4fARB(GLenum target, GLuint index,
    }
 }
 
-
+/**
+ * Set a program env parameter register.
+ * \note Called from the GL API dispatcher.
+ * Note, this function is also used by the GL_NV_vertex_program extension
+ * (alias to ProgramParameterfvNV)
+ */
 void GLAPIENTRY
 _mesa_ProgramEnvParameter4fvARB(GLenum target, GLuint index,
                                    const GLfloat *params)
diff --git a/src/mesa/shader/nvprogram.c b/src/mesa/shader/nvprogram.c
index 337784bfe2..409c61cdc1 100644
--- a/src/mesa/shader/nvprogram.c
+++ b/src/mesa/shader/nvprogram.c
@@ -575,75 +575,6 @@ _mesa_LoadProgramNV(GLenum target, GLuint id, GLsizei len,
 
 
 
-/**
- * Set a program parameter register.
- * \note Called from the GL API dispatcher.
- */
-void GLAPIENTRY
-_mesa_ProgramParameter4dNV(GLenum target, GLuint index,
-                           GLdouble x, GLdouble y, GLdouble z, GLdouble w)
-{
-   _mesa_ProgramParameter4fNV(target, index, 
-		   	      (GLfloat)x, (GLfloat)y, (GLfloat)z, (GLfloat)w);
-}
-
-
-/**
- * Set a program parameter register.
- * \note Called from the GL API dispatcher.
- */
-void GLAPIENTRY
-_mesa_ProgramParameter4dvNV(GLenum target, GLuint index,
-                            const GLdouble *params)
-{
-   _mesa_ProgramParameter4fNV(target, index,
-                              (GLfloat)params[0], (GLfloat)params[1], 
-			      (GLfloat)params[2], (GLfloat)params[3]);
-}
-
-
-/**
- * Set a program parameter register.
- * \note Called from the GL API dispatcher.
- */
-void GLAPIENTRY
-_mesa_ProgramParameter4fNV(GLenum target, GLuint index,
-                           GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (target == GL_VERTEX_PROGRAM_NV && ctx->Extensions.NV_vertex_program) {
-      if (index < MAX_NV_VERTEX_PROGRAM_PARAMS) {
-         FLUSH_VERTICES(ctx, _NEW_PROGRAM);
-         ASSIGN_4V(ctx->VertexProgram.Parameters[index], x, y, z, w);
-      }
-      else {
-         _mesa_error(ctx, GL_INVALID_VALUE, "glProgramParameterNV(index)");
-         return;
-      }
-   }
-   else {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glProgramParameterNV");
-      return;
-   }
-}
-
-
-/**
- * Set a program parameter register.
- * \note Called from the GL API dispatcher.
- */
-void GLAPIENTRY
-_mesa_ProgramParameter4fvNV(GLenum target, GLuint index,
-                            const GLfloat *params)
-{
-   _mesa_ProgramParameter4fNV(target, index,
-                              params[0], params[1], params[2], params[3]);
-}
-
-
-
 /**
  * Set a sequence of program parameter registers.
  * \note Called from the GL API dispatcher.
diff --git a/src/mesa/shader/nvprogram.h b/src/mesa/shader/nvprogram.h
index dcea7727e0..bfac165b5e 100644
--- a/src/mesa/shader/nvprogram.h
+++ b/src/mesa/shader/nvprogram.h
@@ -69,18 +69,6 @@ _mesa_GetVertexAttribPointervNV(GLuint index, GLenum pname, GLvoid **pointer);
 extern void GLAPIENTRY
 _mesa_LoadProgramNV(GLenum target, GLuint id, GLsizei len, const GLubyte *program);
 
-extern void GLAPIENTRY
-_mesa_ProgramParameter4dNV(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-
-extern void GLAPIENTRY
-_mesa_ProgramParameter4dvNV(GLenum target, GLuint index, const GLdouble *params);
-
-extern void GLAPIENTRY
-_mesa_ProgramParameter4fNV(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-
-extern void GLAPIENTRY
-_mesa_ProgramParameter4fvNV(GLenum target, GLuint index, const GLfloat *params);
-
 extern void GLAPIENTRY
 _mesa_ProgramParameters4dvNV(GLenum target, GLuint index, GLuint num, const GLdouble *params);
 
-- 
cgit v1.2.3


From 62f96ddbbc2549bd4d50016f571cd4d1f6f6a7d6 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 19 May 2008 08:59:41 -0600
Subject: Fix program refcounting assertion failure during context tear-down

When purging the program hash table, the refcount _should_ be one since
the program is referenced by the hash table.  Need to explicitly set to
zero before calling delete().

Also, purge high-level shader hash tables before low-level program hash tabl

cherry-picked from master
---
 src/mesa/main/context.c | 46 ++++++++++++++++++++++++----------------------
 1 file changed, 24 insertions(+), 22 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 893c79f28c..2158eb6873 100755
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -593,6 +593,8 @@ delete_program_cb(GLuint id, void *data, void *userData)
 {
    struct gl_program *prog = (struct gl_program *) data;
    GLcontext *ctx = (GLcontext *) userData;
+   ASSERT(prog->RefCount == 1); /* should only be referenced by hash table */
+   prog->RefCount = 0;  /* now going away */
    ctx->Driver.DeleteProgram(ctx, prog);
 }
 
@@ -686,22 +688,11 @@ free_shared_state( GLcontext *ctx, struct gl_shared_state *ss )
    _mesa_HashDeleteAll(ss->DisplayList, delete_displaylist_cb, ctx);
    _mesa_DeleteHashTable(ss->DisplayList);
 
-   /*
-    * Free texture objects
-    */
-   ASSERT(ctx->Driver.DeleteTexture);
-   /* the default textures */
-   ctx->Driver.DeleteTexture(ctx, ss->Default1D);
-   ctx->Driver.DeleteTexture(ctx, ss->Default2D);
-   ctx->Driver.DeleteTexture(ctx, ss->Default3D);
-   ctx->Driver.DeleteTexture(ctx, ss->DefaultCubeMap);
-   ctx->Driver.DeleteTexture(ctx, ss->DefaultRect);
-   ctx->Driver.DeleteTexture(ctx, ss->Default1DArray);
-   ctx->Driver.DeleteTexture(ctx, ss->Default2DArray);
-
-   /* all other textures */
-   _mesa_HashDeleteAll(ss->TexObjects, delete_texture_cb, ctx);
-   _mesa_DeleteHashTable(ss->TexObjects);
+#if FEATURE_ARB_shader_objects
+   _mesa_HashWalk(ss->ShaderObjects, free_shader_program_data_cb, ctx);
+   _mesa_HashDeleteAll(ss->ShaderObjects, delete_shader_cb, ctx);
+   _mesa_DeleteHashTable(ss->ShaderObjects);
+#endif
 
 #if defined(FEATURE_NV_vertex_program) || defined(FEATURE_NV_fragment_program)
    _mesa_HashDeleteAll(ss->Programs, delete_program_cb, ctx);
@@ -728,17 +719,28 @@ free_shared_state( GLcontext *ctx, struct gl_shared_state *ss )
    _mesa_HashDeleteAll(ss->ArrayObjects, delete_arrayobj_cb, ctx);
    _mesa_DeleteHashTable(ss->ArrayObjects);
 
-#if FEATURE_ARB_shader_objects
-   _mesa_HashWalk(ss->ShaderObjects, free_shader_program_data_cb, ctx);
-   _mesa_HashDeleteAll(ss->ShaderObjects, delete_shader_cb, ctx);
-   _mesa_DeleteHashTable(ss->ShaderObjects);
-#endif
-
 #if FEATURE_EXT_framebuffer_object
    _mesa_DeleteHashTable(ss->FrameBuffers);
    _mesa_DeleteHashTable(ss->RenderBuffers);
 #endif
 
+   /*
+    * Free texture objects (after FBOs since some textures might have
+    * been bound to FBOs).
+    */
+   ASSERT(ctx->Driver.DeleteTexture);
+   /* the default textures */
+   ctx->Driver.DeleteTexture(ctx, ss->Default1D);
+   ctx->Driver.DeleteTexture(ctx, ss->Default2D);
+   ctx->Driver.DeleteTexture(ctx, ss->Default3D);
+   ctx->Driver.DeleteTexture(ctx, ss->DefaultCubeMap);
+   ctx->Driver.DeleteTexture(ctx, ss->DefaultRect);
+   ctx->Driver.DeleteTexture(ctx, ss->Default1DArray);
+   ctx->Driver.DeleteTexture(ctx, ss->Default2DArray);
+   /* all other textures */
+   _mesa_HashDeleteAll(ss->TexObjects, delete_texture_cb, ctx);
+   _mesa_DeleteHashTable(ss->TexObjects);
+
    _glthread_DESTROY_MUTEX(ss->Mutex);
 
    _mesa_free(ss);
-- 
cgit v1.2.3


From adc1f88fc9278bdbb3b24a6d48f91a0bd98e9f1c Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Fri, 23 May 2008 09:10:59 +0100
Subject: mesa: do object-space lighting in ffvertex_prog.c

Start pulling over some of the optimizations from the fixed function
paths.
---
 src/mesa/main/ffvertex_prog.c    | 79 +++++++++++++++++++++++++---------------
 src/mesa/shader/prog_statevars.c | 42 +++++++++++++++++----
 src/mesa/shader/prog_statevars.h |  6 ++-
 3 files changed, 88 insertions(+), 39 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index 810af9e33e..adf15b03c2 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -54,6 +54,7 @@ struct state_key {
    unsigned light_color_material_mask:12;
    unsigned light_material_mask:12;
 
+   unsigned need_eye_coords:1;
    unsigned normalize:1;
    unsigned rescale_normals:1;
    unsigned fog_source_is_depth:1;
@@ -167,6 +168,8 @@ static struct state_key *make_state_key( GLcontext *ctx )
     */
    assert(fp);
 
+   key->need_eye_coords = ctx->_NeedEyeCoords;
+
    key->fragprog_inputs_read = fp->Base.InputsRead;
 
    if (ctx->RenderMode == GL_FEEDBACK) {
@@ -310,7 +313,7 @@ struct tnl_program {
    
    struct ureg eye_position;
    struct ureg eye_position_normalized;
-   struct ureg eye_normal;
+   struct ureg transformed_normal;
    struct ureg identity;
 
    GLuint materials;
@@ -653,9 +656,9 @@ static void emit_normalize_vec3( struct tnl_program *p,
 				 struct ureg src )
 {
    struct ureg tmp = get_temp(p);
-   emit_op2(p, OPCODE_DP3, tmp, 0, src, src);
-   emit_op1(p, OPCODE_RSQ, tmp, 0, tmp);
-   emit_op2(p, OPCODE_MUL, dest, 0, src, tmp);
+   emit_op2(p, OPCODE_DP3, tmp, WRITEMASK_X, src, src);
+   emit_op1(p, OPCODE_RSQ, tmp, WRITEMASK_X, tmp);
+   emit_op2(p, OPCODE_MUL, dest, 0, src, swizzle1(tmp, X));
    release_temp(p, tmp);
 }
 
@@ -705,36 +708,53 @@ static struct ureg get_eye_position_normalized( struct tnl_program *p )
 }
 
 
-static struct ureg get_eye_normal( struct tnl_program *p )
+static struct ureg get_transformed_normal( struct tnl_program *p )
 {
-   if (is_undef(p->eye_normal)) {
+   if (is_undef(p->transformed_normal) &&
+       !p->state->need_eye_coords &&
+       !p->state->normalize &&
+       !(p->state->need_eye_coords == p->state->rescale_normals))
+   {
+      p->transformed_normal = register_input(p, VERT_ATTRIB_NORMAL );
+   }
+   else if (is_undef(p->transformed_normal)) 
+   {
       struct ureg normal = register_input(p, VERT_ATTRIB_NORMAL );
       struct ureg mvinv[3];
+      struct ureg transformed_normal = reserve_temp(p);
 
-      register_matrix_param5( p, STATE_MODELVIEW_MATRIX, 0, 0, 2,
-			      STATE_MATRIX_INVTRANS, mvinv );
+      if (p->state->need_eye_coords) {
+         register_matrix_param5( p, STATE_MODELVIEW_MATRIX, 0, 0, 2,
+                                 STATE_MATRIX_INVTRANS, mvinv );
 
-      p->eye_normal = reserve_temp(p);
-
-      /* Transform to eye space:
-       */
-      emit_matrix_transform_vec3( p, p->eye_normal, mvinv, normal );
+         /* Transform to eye space:
+          */
+         emit_matrix_transform_vec3( p, transformed_normal, mvinv, normal );
+         normal = transformed_normal;
+      }
 
       /* Normalize/Rescale:
        */
       if (p->state->normalize) {
-	 emit_normalize_vec3( p, p->eye_normal, p->eye_normal );
+	 emit_normalize_vec3( p, transformed_normal, normal );
+         normal = transformed_normal;
       }
-      else if (p->state->rescale_normals) {
+      else if (p->state->need_eye_coords == p->state->rescale_normals) {
+         /* This is already adjusted for eye/non-eye rendering:
+          */
 	 struct ureg rescale = register_param2(p, STATE_INTERNAL,
-					       STATE_NORMAL_SCALE);
+                                               STATE_NORMAL_SCALE);
 
-	 emit_op2( p, OPCODE_MUL, p->eye_normal, 0, p->eye_normal,
+	 emit_op2( p, OPCODE_MUL, transformed_normal, 0, normal,
 		   swizzle1(rescale, X));
+         normal = transformed_normal;
       }
+      
+      assert(normal.file == PROGRAM_TEMPORARY);
+      p->transformed_normal = normal;
    }
 
-   return p->eye_normal;
+   return p->transformed_normal;
 }
 
 
@@ -856,7 +876,7 @@ static struct ureg calculate_light_attenuation( struct tnl_program *p,
     */
    if (!p->state->unit[i].light_spotcutoff_is_180) {
       struct ureg spot_dir_norm = register_param3(p, STATE_INTERNAL,
-						  STATE_SPOT_DIR_NORMALIZED, i);
+						  STATE_LIGHT_SPOT_DIR_NORMALIZED, i);
       struct ureg spot = get_temp(p);
       struct ureg slt = get_temp(p);
 
@@ -907,7 +927,7 @@ static void build_lighting( struct tnl_program *p )
    const GLboolean twoside = p->state->light_twoside;
    const GLboolean separate = p->state->separate_specular;
    GLuint nr_lights = 0, count = 0;
-   struct ureg normal = get_eye_normal(p);
+   struct ureg normal = get_transformed_normal(p);
    struct ureg lit = get_temp(p);
    struct ureg dots = get_temp(p);
    struct ureg _col0 = undef, _col1 = undef;
@@ -984,20 +1004,21 @@ static void build_lighting( struct tnl_program *p )
 	    /* Can used precomputed constants in this case.
 	     * Attenuation never applies to infinite lights.
 	     */
-	    VPpli = register_param3(p, STATE_LIGHT, i, 
-				    STATE_POSITION_NORMALIZED); 
+	    VPpli = register_param3(p, STATE_INTERNAL, 
+				    STATE_LIGHT_POSITION_NORMALIZED, i); 
             if (p->state->light_local_viewer) {
                 struct ureg eye_hat = get_eye_position_normalized(p);
                 half = get_temp(p);
                 emit_op2(p, OPCODE_SUB, half, 0, VPpli, eye_hat);
                 emit_normalize_vec3(p, half, half);
             } else {
-                half = register_param3(p, STATE_LIGHT, i, STATE_HALF_VECTOR);
+                half = register_param3(p, STATE_INTERNAL, 
+                                       STATE_LIGHT_HALF_VECTOR, i);
             }
 	 } 
 	 else {
-	    struct ureg Ppli = register_param3(p, STATE_LIGHT, i, 
-					       STATE_POSITION); 
+	    struct ureg Ppli = register_param3(p, STATE_INTERNAL, 
+					       STATE_LIGHT_POSITION, i); 
 	    struct ureg V = get_eye_position(p);
 	    struct ureg dist = get_temp(p);
 
@@ -1201,7 +1222,7 @@ static void build_reflect_texgen( struct tnl_program *p,
 				  struct ureg dest,
 				  GLuint writemask )
 {
-   struct ureg normal = get_eye_normal(p);
+   struct ureg normal = get_transformed_normal(p);
    struct ureg eye_hat = get_eye_position_normalized(p);
    struct ureg tmp = get_temp(p);
 
@@ -1219,7 +1240,7 @@ static void build_sphere_texgen( struct tnl_program *p,
 				 struct ureg dest,
 				 GLuint writemask )
 {
-   struct ureg normal = get_eye_normal(p);
+   struct ureg normal = get_transformed_normal(p);
    struct ureg eye_hat = get_eye_position_normalized(p);
    struct ureg tmp = get_temp(p);
    struct ureg half = register_scalar_const(p, .5);
@@ -1338,7 +1359,7 @@ static void build_texture_transform( struct tnl_program *p )
 	    }
 
 	    if (normal_mask) {
-	       struct ureg normal = get_eye_normal(p);
+	       struct ureg normal = get_transformed_normal(p);
 	       emit_op1(p, OPCODE_MOV, out_texgen, normal_mask, normal );
 	    }
 
@@ -1475,7 +1496,7 @@ create_new_program( const struct state_key *key,
    p.program = program;
    p.eye_position = undef;
    p.eye_position_normalized = undef;
-   p.eye_normal = undef;
+   p.transformed_normal = undef;
    p.identity = undef;
    p.temp_in_use = 0;
    
diff --git a/src/mesa/shader/prog_statevars.c b/src/mesa/shader/prog_statevars.c
index ba3c988445..37bd17ba4a 100644
--- a/src/mesa/shader/prog_statevars.c
+++ b/src/mesa/shader/prog_statevars.c
@@ -134,10 +134,6 @@ _mesa_fetch_state(GLcontext *ctx, const gl_state_index state[],
 	       value[3] = 1.0;
             }						  
             return;
-	 case STATE_POSITION_NORMALIZED:
-            COPY_4V(value, ctx->Light.Light[ln].EyePosition);
-	    NORMALIZE_3FV( value );
-            return;
          default:
             _mesa_problem(ctx, "Invalid light state in fetch_state");
             return;
@@ -431,15 +427,46 @@ _mesa_fetch_state(GLcontext *ctx, const gl_state_index state[],
          value[2] = ctx->Fog.Density * ONE_DIV_LN2;
          value[3] = ctx->Fog.Density * ONE_DIV_SQRT_LN2;
          return;
-      case STATE_SPOT_DIR_NORMALIZED: {
+
+      case STATE_LIGHT_SPOT_DIR_NORMALIZED: {
          /* here, state[2] is the light number */
          /* pre-normalize spot dir */
          const GLuint ln = (GLuint) state[2];
-         COPY_3V(value, ctx->Light.Light[ln].EyeDirection);
-         NORMALIZE_3FV(value);
+         COPY_3V(value, ctx->Light.Light[ln]._NormDirection);
          value[3] = ctx->Light.Light[ln]._CosCutoff;
          return;
       }
+
+      case STATE_LIGHT_POSITION: {
+         const GLuint ln = (GLuint) state[2];
+         COPY_4V(value, ctx->Light.Light[ln]._Position);
+         return;
+      }
+
+      case STATE_LIGHT_POSITION_NORMALIZED: {
+         const GLuint ln = (GLuint) state[2];
+         COPY_4V(value, ctx->Light.Light[ln]._Position);
+         NORMALIZE_3FV( value );
+         return;
+      }
+
+      case STATE_LIGHT_HALF_VECTOR: {
+         const GLuint ln = (GLuint) state[2];
+         GLfloat p[3];
+         /* Compute infinite half angle vector:
+          *   halfVector = normalize(normalize(lightPos) + (0, 0, 1))
+          * light.EyePosition.w should be 0 for infinite lights.
+          */
+         COPY_3V(p, ctx->Light.Light[ln]._Position);
+         NORMALIZE_3FV(p);
+         ADD_3V(value, p, ctx->_EyeZDir);
+         NORMALIZE_3FV(value);
+         value[3] = 1.0;
+         return;
+      }						  
+
+
+
       case STATE_PT_SCALE:
          value[0] = ctx->Pixel.RedScale;
          value[1] = ctx->Pixel.GreenScale;
@@ -696,7 +723,6 @@ append_token(char *dst, gl_state_index k)
       append(dst, "normalScale");
       break;
    case STATE_INTERNAL:
-   case STATE_POSITION_NORMALIZED:
       append(dst, "(internal)");
       break;
    case STATE_PT_SCALE:
diff --git a/src/mesa/shader/prog_statevars.h b/src/mesa/shader/prog_statevars.h
index d12142055f..a515fda3aa 100644
--- a/src/mesa/shader/prog_statevars.h
+++ b/src/mesa/shader/prog_statevars.h
@@ -106,9 +106,11 @@ typedef enum gl_state_index_ {
    STATE_INTERNAL,		/* Mesa additions */
    STATE_NORMAL_SCALE,
    STATE_TEXRECT_SCALE,
-   STATE_POSITION_NORMALIZED,   /* normalized light position */
    STATE_FOG_PARAMS_OPTIMIZED,  /* for faster fog calc */
-   STATE_SPOT_DIR_NORMALIZED,   /* pre-normalized spot dir */
+   STATE_LIGHT_SPOT_DIR_NORMALIZED,   /* pre-normalized spot dir */
+   STATE_LIGHT_POSITION,              /* object vs eye space */
+   STATE_LIGHT_POSITION_NORMALIZED,   /* object vs eye space */
+   STATE_LIGHT_HALF_VECTOR,           /* object vs eye space */
    STATE_PT_SCALE,              /**< Pixel transfer RGBA scale */
    STATE_PT_BIAS,               /**< Pixel transfer RGBA bias */
    STATE_PCM_SCALE,             /**< Post color matrix RGBA scale */
-- 
cgit v1.2.3


From 0ac2f7955c01749e122f67ff03e79a0d8bd0f8e5 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Fri, 23 May 2008 19:17:02 +0100
Subject: mesa: don't emit LIT instruction when mat shininess known to be zero

Use a faster path in that case & make gears go faster.
---
 src/mesa/main/ffvertex_prog.c | 133 ++++++++++++++++++++++++++++++++----------
 1 file changed, 102 insertions(+), 31 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index adf15b03c2..623c2a64b5 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -53,6 +53,7 @@ struct state_key {
    unsigned light_color_material:1;
    unsigned light_color_material_mask:12;
    unsigned light_material_mask:12;
+   unsigned material_shininess_is_zero:1;
 
    unsigned need_eye_coords:1;
    unsigned normalize:1;
@@ -155,6 +156,26 @@ tnl_get_per_vertex_fog(GLcontext *ctx)
 #endif
 }
 
+static GLboolean check_active_shininess( GLcontext *ctx,
+                                         const struct state_key *key,
+                                         GLuint side )
+{
+   GLuint bit = 1 << (MAT_ATTRIB_FRONT_SHININESS + side);
+
+   if (key->light_color_material_mask & bit)
+      return GL_TRUE;
+
+   if (key->light_material_mask & bit)
+      return GL_TRUE;
+
+   if (ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_SHININESS + side][0] != 0.0F)
+      return GL_TRUE;
+
+   return GL_FALSE;
+}
+     
+
+
 
 static struct state_key *make_state_key( GLcontext *ctx )
 {
@@ -214,6 +235,17 @@ static struct state_key *make_state_key( GLcontext *ctx )
 	       key->unit[i].light_attenuated = 1;
 	 }
       }
+
+      if (check_active_shininess(ctx, key, 0)) {
+         key->material_shininess_is_zero = 0;
+      }
+      else if (key->light_twoside &&
+               check_active_shininess(ctx, key, 1)) {
+         key->material_shininess_is_zero = 0;
+      }
+      else {
+         key->material_shininess_is_zero = 1;
+      }
    }
 
    if (ctx->Transform.Normalize)
@@ -915,7 +947,26 @@ static struct ureg calculate_light_attenuation( struct tnl_program *p,
 }
 						
 
+static void emit_degenerate_lit( struct tnl_program *p,
+                                 struct ureg lit,
+                                 struct ureg dots )
+{
+   struct ureg id = get_identity_param(p);
+   
+   /* 1, 0, 0, 1 
+    */
+   emit_op1(p, OPCODE_MOV, lit, 0, swizzle(id, Z, X, X, Z)); 
 
+   /* 1, MAX2(in[0], 0), 0, 1
+    */
+   emit_op2(p, OPCODE_MAX, lit, WRITEMASK_Y, lit, swizzle1(dots, X)); 
+
+   /* 1, MAX2(in[0], 0), (in[0] > 0 ? 1 : 0), 1
+    */
+   emit_op2(p, OPCODE_SLT, lit, WRITEMASK_Z, 
+            lit,                /* 0 */
+            swizzle1(dots, X)); /* in[0] */
+}
 
 
 /* Need to add some addtional parameters to allow lighting in object
@@ -941,9 +992,11 @@ static void build_lighting( struct tnl_program *p )
    set_material_flags(p);
 
    {
-      struct ureg shininess = get_material(p, 0, STATE_SHININESS);
-      emit_op1(p, OPCODE_MOV, dots,  WRITEMASK_W, swizzle1(shininess,X));
-      release_temp(p, shininess);
+      if (!p->state->material_shininess_is_zero) {
+         struct ureg shininess = get_material(p, 0, STATE_SHININESS);
+         emit_op1(p, OPCODE_MOV, dots,  WRITEMASK_W, swizzle1(shininess,X));
+         release_temp(p, shininess);
+      }
 
       _col0 = make_temp(p, get_scenecolor(p, 0));
       if (separate)
@@ -954,10 +1007,12 @@ static void build_lighting( struct tnl_program *p )
    }
 
    if (twoside) {
-      struct ureg shininess = get_material(p, 1, STATE_SHININESS);
-      emit_op1(p, OPCODE_MOV, dots, WRITEMASK_Z, 
-	       negate(swizzle1(shininess,X)));
-      release_temp(p, shininess);
+      if (!p->state->material_shininess_is_zero) {
+         struct ureg shininess = get_material(p, 1, STATE_SHININESS);
+         emit_op1(p, OPCODE_MOV, dots, WRITEMASK_Z, 
+                  negate(swizzle1(shininess,X)));
+         release_temp(p, shininess);
+      }
 
       _bfc0 = make_temp(p, get_scenecolor(p, 1));
       if (separate)
@@ -1006,14 +1061,17 @@ static void build_lighting( struct tnl_program *p )
 	     */
 	    VPpli = register_param3(p, STATE_INTERNAL, 
 				    STATE_LIGHT_POSITION_NORMALIZED, i); 
-            if (p->state->light_local_viewer) {
-                struct ureg eye_hat = get_eye_position_normalized(p);
-                half = get_temp(p);
-                emit_op2(p, OPCODE_SUB, half, 0, VPpli, eye_hat);
-                emit_normalize_vec3(p, half, half);
-            } else {
-                half = register_param3(p, STATE_INTERNAL, 
-                                       STATE_LIGHT_HALF_VECTOR, i);
+            
+            if (!p->state->material_shininess_is_zero) {
+               if (p->state->light_local_viewer) {
+                  struct ureg eye_hat = get_eye_position_normalized(p);
+                  half = get_temp(p);
+                  emit_op2(p, OPCODE_SUB, half, 0, VPpli, eye_hat);
+                  emit_normalize_vec3(p, half, half);
+               } else {
+                  half = register_param3(p, STATE_INTERNAL, 
+                                         STATE_LIGHT_HALF_VECTOR, i);
+               }
             }
 	 } 
 	 else {
@@ -1023,7 +1081,6 @@ static void build_lighting( struct tnl_program *p )
 	    struct ureg dist = get_temp(p);
 
 	    VPpli = get_temp(p); 
-	    half = get_temp(p);
  
 	    /* Calculate VPpli vector
 	     */
@@ -1045,16 +1102,20 @@ static void build_lighting( struct tnl_program *p )
 
 	    /* Calculate viewer direction, or use infinite viewer:
 	     */
-	    if (p->state->light_local_viewer) {
-	       struct ureg eye_hat = get_eye_position_normalized(p);
-	       emit_op2(p, OPCODE_SUB, half, 0, VPpli, eye_hat);
-	    }
-	    else {
-	       struct ureg z_dir = swizzle(get_identity_param(p),X,Y,W,Z); 
-	       emit_op2(p, OPCODE_ADD, half, 0, VPpli, z_dir);
-	    }
-
-	    emit_normalize_vec3(p, half, half);
+            if (!p->state->material_shininess_is_zero) {
+               half = get_temp(p);
+
+               if (p->state->light_local_viewer) {
+                  struct ureg eye_hat = get_eye_position_normalized(p);
+                  emit_op2(p, OPCODE_SUB, half, 0, VPpli, eye_hat);
+               }
+               else {
+                  struct ureg z_dir = swizzle(get_identity_param(p),X,Y,W,Z); 
+                  emit_op2(p, OPCODE_ADD, half, 0, VPpli, z_dir);
+               }
+
+               emit_normalize_vec3(p, half, half);
+            }
 
 	    release_temp(p, dist);
 	 }
@@ -1062,7 +1123,9 @@ static void build_lighting( struct tnl_program *p )
 	 /* Calculate dot products:
 	  */
 	 emit_op2(p, OPCODE_DP3, dots, WRITEMASK_X, normal, VPpli);
-	 emit_op2(p, OPCODE_DP3, dots, WRITEMASK_Y, normal, half);
+
+         if (!p->state->material_shininess_is_zero)
+            emit_op2(p, OPCODE_DP3, dots, WRITEMASK_Y, normal, half);
 
 	 /* Front face lighting:
 	  */
@@ -1073,7 +1136,11 @@ static void build_lighting( struct tnl_program *p )
 	    struct ureg res0, res1;
 	    GLuint mask0, mask1;
 
-	    emit_op1(p, OPCODE_LIT, lit, 0, dots);
+            if (p->state->material_shininess_is_zero) {
+               emit_degenerate_lit(p, lit, dots);
+            } else {
+               emit_op1(p, OPCODE_LIT, lit, 0, dots);
+            }
    
 	    if (!is_undef(att)) 
 	       emit_op2(p, OPCODE_MUL, lit, 0, lit, att);
@@ -1099,7 +1166,7 @@ static void build_lighting( struct tnl_program *p )
 	       res1 = _col1;
 	    }
 
-	    emit_op3(p, OPCODE_MAD, _col0, 0, swizzle1(lit,X), ambient, _col0);
+	    emit_op2(p, OPCODE_ADD, _col0, 0, ambient, _col0);
 	    emit_op3(p, OPCODE_MAD, res0, mask0, swizzle1(lit,Y), diffuse, _col0);
 	    emit_op3(p, OPCODE_MAD, res1, mask1, swizzle1(lit,Z), specular, _col1);
       
@@ -1117,7 +1184,11 @@ static void build_lighting( struct tnl_program *p )
 	    struct ureg res0, res1;
 	    GLuint mask0, mask1;
 	       
-	    emit_op1(p, OPCODE_LIT, lit, 0, negate(swizzle(dots,X,Y,W,Z)));
+            if (p->state->material_shininess_is_zero) {
+               emit_degenerate_lit(p, lit, negate(swizzle(dots,X,Y,W,Z)));
+            } else {
+               emit_op1(p, OPCODE_LIT, lit, 0, negate(swizzle(dots,X,Y,W,Z)));
+            }
 
 	    if (!is_undef(att)) 
 	       emit_op2(p, OPCODE_MUL, lit, 0, lit, att);
@@ -1142,7 +1213,7 @@ static void build_lighting( struct tnl_program *p )
 	       mask1 = 0;
 	    }
 
-	    emit_op3(p, OPCODE_MAD, _bfc0, 0, swizzle1(lit,X), ambient, _bfc0);
+	    emit_op2(p, OPCODE_ADD, _bfc0, 0, ambient, _bfc0);
 	    emit_op3(p, OPCODE_MAD, res0, mask0, swizzle1(lit,Y), diffuse, _bfc0);
 	    emit_op3(p, OPCODE_MAD, res1, mask1, swizzle1(lit,Z), specular, _bfc1);
 
-- 
cgit v1.2.3


From e841b92d9c8bf48085b4996df828ae745977f931 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Fri, 23 May 2008 20:05:36 +0100
Subject: mesa: further degenerate the special case lit substitute

---
 src/mesa/main/ffvertex_prog.c | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index 623c2a64b5..90b156f812 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -953,19 +953,19 @@ static void emit_degenerate_lit( struct tnl_program *p,
 {
    struct ureg id = get_identity_param(p);
    
-   /* 1, 0, 0, 1 
+   /* Note that result.x & result.w will not be examined.  Note also that
+    * dots.xyzw == dots.xxxx.
     */
-   emit_op1(p, OPCODE_MOV, lit, 0, swizzle(id, Z, X, X, Z)); 
 
-   /* 1, MAX2(in[0], 0), 0, 1
+   /* result[1] = MAX2(in, 0)
     */
-   emit_op2(p, OPCODE_MAX, lit, WRITEMASK_Y, lit, swizzle1(dots, X)); 
+   emit_op2(p, OPCODE_MAX, lit, 0, id, dots); 
 
-   /* 1, MAX2(in[0], 0), (in[0] > 0 ? 1 : 0), 1
+   /* result[2] = (in > 0 ? 1 : 0)
     */
    emit_op2(p, OPCODE_SLT, lit, WRITEMASK_Z, 
             lit,                /* 0 */
-            swizzle1(dots, X)); /* in[0] */
+            dots); /* in[0] */
 }
 
 
@@ -1122,10 +1122,13 @@ static void build_lighting( struct tnl_program *p )
 
 	 /* Calculate dot products:
 	  */
-	 emit_op2(p, OPCODE_DP3, dots, WRITEMASK_X, normal, VPpli);
-
-         if (!p->state->material_shininess_is_zero)
+         if (p->state->material_shininess_is_zero) {
+            emit_op2(p, OPCODE_DP3, dots, 0, normal, VPpli);
+         }
+         else {
+            emit_op2(p, OPCODE_DP3, dots, WRITEMASK_X, normal, VPpli);
             emit_op2(p, OPCODE_DP3, dots, WRITEMASK_Y, normal, half);
+         }
 
 	 /* Front face lighting:
 	  */
-- 
cgit v1.2.3


From feceb43948f76cc4d4c8ecbb86b1b1f438c6daee Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Fri, 23 May 2008 20:37:50 +0100
Subject: mesa: save a temp on normalizes

---
 src/mesa/main/ffvertex_prog.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index 90b156f812..e36f1f69a4 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -305,7 +305,7 @@ static struct state_key *make_state_key( GLcontext *ctx )
  * generated program with line/function references for each
  * instruction back into this file:
  */
-#define DISASSEM (MESA_VERBOSE&VERBOSE_DISASSEM)
+#define DISASSEM 1
 
 /* Should be tunable by the driver - do we want to do matrix
  * multiplications with DP4's or with MUL/MAD's?  SSE works better
@@ -687,11 +687,9 @@ static void emit_normalize_vec3( struct tnl_program *p,
 				 struct ureg dest,
 				 struct ureg src )
 {
-   struct ureg tmp = get_temp(p);
-   emit_op2(p, OPCODE_DP3, tmp, WRITEMASK_X, src, src);
-   emit_op1(p, OPCODE_RSQ, tmp, WRITEMASK_X, tmp);
-   emit_op2(p, OPCODE_MUL, dest, 0, src, swizzle1(tmp, X));
-   release_temp(p, tmp);
+   emit_op2(p, OPCODE_DP3, dest, WRITEMASK_X, src, src);
+   emit_op1(p, OPCODE_RSQ, dest, WRITEMASK_X, dest);
+   emit_op2(p, OPCODE_MUL, dest, 0, src, swizzle1(dest, X));
 }
 
 static void emit_passthrough( struct tnl_program *p, 
-- 
cgit v1.2.3


From a2b1c46535d02bb4cc154f26481eda264a65abe8 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Sat, 24 May 2008 13:22:39 +0100
Subject: mesa: evaluate _NeedEyeCoords prior to generating internal vertex
 shader

---
 src/mesa/main/state.c | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index f8cb943e64..cdf1249cd0 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -1209,18 +1209,6 @@ _mesa_update_state_locked( GLcontext *ctx )
                     | _NEW_STENCIL | _DD_NEW_SEPARATE_SPECULAR))
       update_tricaps( ctx, new_state );
 
-   if (ctx->FragmentProgram._MaintainTexEnvProgram) {
-      prog_flags |= (_NEW_TEXTURE | _NEW_FOG | _DD_NEW_SEPARATE_SPECULAR);
-   }
-   if (ctx->VertexProgram._MaintainTnlProgram) {
-      prog_flags |= (_NEW_TEXTURE | _NEW_TEXTURE_MATRIX |
-                     _NEW_TRANSFORM | _NEW_POINT |
-                     _NEW_FOG | _NEW_LIGHT);
-   }
-   if (new_state & prog_flags)
-      update_program( ctx );
-
-
    /* ctx->_NeedEyeCoords is now up to date.
     *
     * If the truth value of this variable has changed, update for the
@@ -1233,6 +1221,20 @@ _mesa_update_state_locked( GLcontext *ctx )
    if (new_state & _MESA_NEW_NEED_EYE_COORDS) 
       _mesa_update_tnl_spaces( ctx, new_state );
 
+   if (ctx->FragmentProgram._MaintainTexEnvProgram) {
+      prog_flags |= (_NEW_TEXTURE | _NEW_FOG | _DD_NEW_SEPARATE_SPECULAR);
+   }
+   if (ctx->VertexProgram._MaintainTnlProgram) {
+      prog_flags |= (_NEW_TEXTURE | _NEW_TEXTURE_MATRIX |
+                     _NEW_TRANSFORM | _NEW_POINT |
+                     _NEW_FOG | _NEW_LIGHT |
+                     _MESA_NEW_NEED_EYE_COORDS);
+   }
+   if (new_state & prog_flags)
+      update_program( ctx );
+
+
+
    /*
     * Give the driver a chance to act upon the new_state flags.
     * The driver might plug in different span functions, for example.
-- 
cgit v1.2.3


From e1590abb17f1effd92c136207f363de6cf52df18 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Sat, 24 May 2008 13:23:06 +0100
Subject: mesa: pre-swizzle normal scale state value

---
 src/mesa/main/ffvertex_prog.c    | 3 +--
 src/mesa/shader/prog_statevars.c | 6 +++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index e36f1f69a4..7a099b2376 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -775,8 +775,7 @@ static struct ureg get_transformed_normal( struct tnl_program *p )
 	 struct ureg rescale = register_param2(p, STATE_INTERNAL,
                                                STATE_NORMAL_SCALE);
 
-	 emit_op2( p, OPCODE_MUL, transformed_normal, 0, normal,
-		   swizzle1(rescale, X));
+	 emit_op2( p, OPCODE_MUL, transformed_normal, 0, normal, rescale );
          normal = transformed_normal;
       }
       
diff --git a/src/mesa/shader/prog_statevars.c b/src/mesa/shader/prog_statevars.c
index 37bd17ba4a..44fbfdcd04 100644
--- a/src/mesa/shader/prog_statevars.c
+++ b/src/mesa/shader/prog_statevars.c
@@ -397,7 +397,11 @@ _mesa_fetch_state(GLcontext *ctx, const gl_state_index state[],
    case STATE_INTERNAL:
       switch (state[1]) {
       case STATE_NORMAL_SCALE:
-         ASSIGN_4V(value, ctx->_ModelViewInvScale, 0, 0, 1);
+         ASSIGN_4V(value, 
+                   ctx->_ModelViewInvScale, 
+                   ctx->_ModelViewInvScale, 
+                   ctx->_ModelViewInvScale, 
+                   1);
          return;
       case STATE_TEXRECT_SCALE:
          {
-- 
cgit v1.2.3


From 48a24f0ff7e3aad000b8acc55c16bbeaca58abe6 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Sat, 24 May 2008 16:32:08 +0100
Subject: Revert "mesa: save a temp on normalizes"

This reverts commit feceb43948f76cc4d4c8ecbb86b1b1f438c6daee.
---
 src/mesa/main/ffvertex_prog.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index 7a099b2376..a627a21f65 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -305,7 +305,7 @@ static struct state_key *make_state_key( GLcontext *ctx )
  * generated program with line/function references for each
  * instruction back into this file:
  */
-#define DISASSEM 1
+#define DISASSEM (MESA_VERBOSE&VERBOSE_DISASSEM)
 
 /* Should be tunable by the driver - do we want to do matrix
  * multiplications with DP4's or with MUL/MAD's?  SSE works better
@@ -687,9 +687,11 @@ static void emit_normalize_vec3( struct tnl_program *p,
 				 struct ureg dest,
 				 struct ureg src )
 {
-   emit_op2(p, OPCODE_DP3, dest, WRITEMASK_X, src, src);
-   emit_op1(p, OPCODE_RSQ, dest, WRITEMASK_X, dest);
-   emit_op2(p, OPCODE_MUL, dest, 0, src, swizzle1(dest, X));
+   struct ureg tmp = get_temp(p);
+   emit_op2(p, OPCODE_DP3, tmp, WRITEMASK_X, src, src);
+   emit_op1(p, OPCODE_RSQ, tmp, WRITEMASK_X, tmp);
+   emit_op2(p, OPCODE_MUL, dest, 0, src, swizzle1(tmp, X));
+   release_temp(p, tmp);
 }
 
 static void emit_passthrough( struct tnl_program *p, 
-- 
cgit v1.2.3


From dc1537bc25c7cbff0a41034ece0830146616f036 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Tue, 27 May 2008 09:48:32 +0100
Subject: ffvertex: don't compute whole eye vector if only eye.z is required

---
 src/mesa/main/ffvertex_prog.c | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index a627a21f65..a790d4b142 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -305,7 +305,7 @@ static struct state_key *make_state_key( GLcontext *ctx )
  * generated program with line/function references for each
  * instruction back into this file:
  */
-#define DISASSEM (MESA_VERBOSE&VERBOSE_DISASSEM)
+#define DISASSEM 1
 
 /* Should be tunable by the driver - do we want to do matrix
  * multiplications with DP4's or with MUL/MAD's?  SSE works better
@@ -344,6 +344,7 @@ struct tnl_program {
    GLuint temp_reserved;
    
    struct ureg eye_position;
+   struct ureg eye_position_z;
    struct ureg eye_position_normalized;
    struct ureg transformed_normal;
    struct ureg identity;
@@ -728,6 +729,28 @@ static struct ureg get_eye_position( struct tnl_program *p )
 }
 
 
+static struct ureg get_eye_position_z( struct tnl_program *p )
+{
+   if (!is_undef(p->eye_position)) 
+      return swizzle1(p->eye_position, Z);
+
+   if (is_undef(p->eye_position_z)) {
+      struct ureg pos = register_input( p, VERT_ATTRIB_POS ); 
+      struct ureg modelview[4];
+
+      p->eye_position_z = reserve_temp(p);
+
+      register_matrix_param5( p, STATE_MODELVIEW_MATRIX, 0, 0, 3,
+                              0, modelview );
+
+      emit_op2(p, OPCODE_DP4, p->eye_position_z, 0, pos, modelview[2]);
+   }
+   
+   return p->eye_position_z;
+}
+   
+
+
 static struct ureg get_eye_position_normalized( struct tnl_program *p )
 {
    if (is_undef(p->eye_position_normalized)) {
@@ -1240,7 +1263,7 @@ static void build_fog( struct tnl_program *p )
    struct ureg input;
 
    if (p->state->fog_source_is_depth) {
-      input = swizzle1(get_eye_position(p), Z);
+      input = get_eye_position_z(p);
    }
    else {
       input = swizzle1(register_input(p, VERT_ATTRIB_FOG), X);
@@ -1470,7 +1493,7 @@ static void build_texture_transform( struct tnl_program *p )
 
 static void build_pointsize( struct tnl_program *p )
 {
-   struct ureg eye = get_eye_position(p);
+   struct ureg eye = get_eye_position_z(p);
    struct ureg state_size = register_param1(p, STATE_POINT_SIZE);
    struct ureg state_attenuation = register_param1(p, STATE_POINT_ATTENUATION);
    struct ureg out = register_output(p, VERT_RESULT_PSIZ);
@@ -1568,6 +1591,7 @@ create_new_program( const struct state_key *key,
    p.state = key;
    p.program = program;
    p.eye_position = undef;
+   p.eye_position_z = undef;
    p.eye_position_normalized = undef;
    p.transformed_normal = undef;
    p.identity = undef;
-- 
cgit v1.2.3


From 2109ddafefde26dd20a1c6a25f594984143944a3 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Tue, 27 May 2008 10:35:33 +0100
Subject: ffvertex: emit full LIT when attenuating (needs the 1 in X position)

---
 src/mesa/main/ffvertex_prog.c | 50 +++++++++++++++++++++++++++----------------
 src/mesa/main/light.c         |  1 +
 2 files changed, 32 insertions(+), 19 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index a790d4b142..2ef3286e57 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -1161,15 +1161,6 @@ static void build_lighting( struct tnl_program *p )
 	    struct ureg res0, res1;
 	    GLuint mask0, mask1;
 
-            if (p->state->material_shininess_is_zero) {
-               emit_degenerate_lit(p, lit, dots);
-            } else {
-               emit_op1(p, OPCODE_LIT, lit, 0, dots);
-            }
-   
-	    if (!is_undef(att)) 
-	       emit_op2(p, OPCODE_MUL, lit, 0, lit, att);
-   
 	    
 	    if (count == nr_lights) {
 	       if (separate) {
@@ -1191,7 +1182,21 @@ static void build_lighting( struct tnl_program *p )
 	       res1 = _col1;
 	    }
 
-	    emit_op2(p, OPCODE_ADD, _col0, 0, ambient, _col0);
+
+	    if (!is_undef(att)) {
+               emit_op1(p, OPCODE_LIT, lit, 0, dots);
+               emit_op2(p, OPCODE_MUL, lit, 0, lit, att);
+               emit_op3(p, OPCODE_MAD, _col0, 0, swizzle1(lit,X), ambient, _col0);
+            } 
+            else if (!p->state->material_shininess_is_zero) {
+               emit_op1(p, OPCODE_LIT, lit, 0, dots);
+               emit_op2(p, OPCODE_ADD, _col0, 0, ambient, _col0);
+            } 
+            else {
+               emit_degenerate_lit(p, lit, dots);
+               emit_op2(p, OPCODE_ADD, _col0, 0, ambient, _col0);
+            }
+
 	    emit_op3(p, OPCODE_MAD, res0, mask0, swizzle1(lit,Y), diffuse, _col0);
 	    emit_op3(p, OPCODE_MAD, res1, mask1, swizzle1(lit,Z), specular, _col1);
       
@@ -1209,15 +1214,6 @@ static void build_lighting( struct tnl_program *p )
 	    struct ureg res0, res1;
 	    GLuint mask0, mask1;
 	       
-            if (p->state->material_shininess_is_zero) {
-               emit_degenerate_lit(p, lit, negate(swizzle(dots,X,Y,W,Z)));
-            } else {
-               emit_op1(p, OPCODE_LIT, lit, 0, negate(swizzle(dots,X,Y,W,Z)));
-            }
-
-	    if (!is_undef(att)) 
-	       emit_op2(p, OPCODE_MUL, lit, 0, lit, att);
-
 	    if (count == nr_lights) {
 	       if (separate) {
 		  mask0 = WRITEMASK_XYZ;
@@ -1238,6 +1234,22 @@ static void build_lighting( struct tnl_program *p )
 	       mask1 = 0;
 	    }
 
+            dots = negate(swizzle(dots,X,Y,W,Z));
+
+	    if (!is_undef(att)) {
+               emit_op1(p, OPCODE_LIT, lit, 0, dots);
+	       emit_op2(p, OPCODE_MUL, lit, 0, lit, att);
+               emit_op3(p, OPCODE_MAD, _bfc0, 0, swizzle1(lit,X), ambient, _bfc0);
+            }
+            else if (!p->state->material_shininess_is_zero) {
+               emit_op1(p, OPCODE_LIT, lit, 0, dots);
+               emit_op2(p, OPCODE_ADD, _col0, 0, ambient, _col0);
+            } 
+            else {
+               emit_degenerate_lit(p, lit, dots);
+               emit_op2(p, OPCODE_ADD, _col0, 0, ambient, _col0);
+            }
+
 	    emit_op2(p, OPCODE_ADD, _bfc0, 0, ambient, _bfc0);
 	    emit_op3(p, OPCODE_MAD, res0, mask0, swizzle1(lit,Y), diffuse, _bfc0);
 	    emit_op3(p, OPCODE_MAD, res1, mask1, swizzle1(lit,Z), specular, _bfc1);
diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c
index 6e057614ba..0af647e13c 100644
--- a/src/mesa/main/light.c
+++ b/src/mesa/main/light.c
@@ -1357,6 +1357,7 @@ _mesa_init_lighting( GLcontext *ctx )
    /* Miscellaneous */
    ctx->Light._NeedEyeCoords = GL_FALSE;
    ctx->_NeedEyeCoords = GL_FALSE;
+   ctx->_ForceEyeCoords = GL_TRUE;
    ctx->_ModelViewInvScale = 1.0;
 }
 
-- 
cgit v1.2.3


From 63faab0150c3394bd9532e621947d2a31b9712ea Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Fri, 30 May 2008 14:47:38 +0100
Subject: mesa: undo accidental setting of _ForceEyeCoords

---
 src/mesa/main/light.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c
index 0af647e13c..f9715b4865 100644
--- a/src/mesa/main/light.c
+++ b/src/mesa/main/light.c
@@ -1357,7 +1357,7 @@ _mesa_init_lighting( GLcontext *ctx )
    /* Miscellaneous */
    ctx->Light._NeedEyeCoords = GL_FALSE;
    ctx->_NeedEyeCoords = GL_FALSE;
-   ctx->_ForceEyeCoords = GL_TRUE;
+   ctx->_ForceEyeCoords = GL_FALSE;
    ctx->_ModelViewInvScale = 1.0;
 }
 
-- 
cgit v1.2.3


From 53174afeeb68a79e471185cb463c13ff90af698f Mon Sep 17 00:00:00 2001
From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Sat, 31 May 2008 18:14:09 +0900
Subject: mesa: Apply MSVC portability fixes from Alan Hourihane.

---
 src/mesa/main/api_arrayelt.c                   | 96 +++++++++++++-------------
 src/mesa/main/api_validate.c                   |  2 +-
 src/mesa/main/context.c                        |  2 +-
 src/mesa/main/dlist.c                          |  2 +-
 src/mesa/main/drawpix.c                        |  2 +-
 src/mesa/main/framebuffer.c                    |  2 +-
 src/mesa/main/get.c                            |  4 +-
 src/mesa/main/image.c                          |  6 +-
 src/mesa/main/light.c                          |  2 +-
 src/mesa/main/mipmap.c                         |  2 +-
 src/mesa/main/pixel.c                          |  4 +-
 src/mesa/main/queryobj.c                       |  4 +-
 src/mesa/main/rastpos.c                        |  2 +-
 src/mesa/main/texenvprogram.c                  | 10 +--
 src/mesa/shader/prog_execute.c                 |  6 +-
 src/mesa/shader/prog_statevars.c               | 10 +--
 src/mesa/shader/prog_uniform.c                 |  2 +-
 src/mesa/shader/shader_api.c                   |  6 +-
 src/mesa/state_tracker/st_atom_pixeltransfer.c |  2 +-
 src/mesa/state_tracker/st_atom_scissor.c       |  8 +--
 src/mesa/state_tracker/st_atom_viewport.c      | 12 ++--
 src/mesa/state_tracker/st_cb_bitmap.c          | 38 +++++-----
 src/mesa/vbo/vbo_exec_array.c                  |  2 +-
 src/mesa/vbo/vbo_split_inplace.c               |  2 +-
 24 files changed, 114 insertions(+), 114 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_arrayelt.c b/src/mesa/main/api_arrayelt.c
index 72091b0789..d124c724c9 100644
--- a/src/mesa/main/api_arrayelt.c
+++ b/src/mesa/main/api_arrayelt.c
@@ -166,7 +166,7 @@ static void GLAPIENTRY VertexAttrib1NbvNV(GLuint index, const GLbyte *v)
 
 static void GLAPIENTRY VertexAttrib1bvNV(GLuint index, const GLbyte *v)
 {
-   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, v[0]));
+   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, (GLfloat)v[0]));
 }
 
 static void GLAPIENTRY VertexAttrib2NbvNV(GLuint index, const GLbyte *v)
@@ -176,7 +176,7 @@ static void GLAPIENTRY VertexAttrib2NbvNV(GLuint index, const GLbyte *v)
 
 static void GLAPIENTRY VertexAttrib2bvNV(GLuint index, const GLbyte *v)
 {
-   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, v[0], v[1]));
+   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1]));
 }
 
 static void GLAPIENTRY VertexAttrib3NbvNV(GLuint index, const GLbyte *v)
@@ -188,7 +188,7 @@ static void GLAPIENTRY VertexAttrib3NbvNV(GLuint index, const GLbyte *v)
 
 static void GLAPIENTRY VertexAttrib3bvNV(GLuint index, const GLbyte *v)
 {
-   CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, v[0], v[1], v[2]));
+   CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2]));
 }
 
 static void GLAPIENTRY VertexAttrib4NbvNV(GLuint index, const GLbyte *v)
@@ -201,7 +201,7 @@ static void GLAPIENTRY VertexAttrib4NbvNV(GLuint index, const GLbyte *v)
 
 static void GLAPIENTRY VertexAttrib4bvNV(GLuint index, const GLbyte *v)
 {
-   CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, v[0], v[1], v[2], v[3]));
+   CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2], (GLfloat)v[3]));
 }
 
 /* GL_UNSIGNED_BYTE attributes */
@@ -213,7 +213,7 @@ static void GLAPIENTRY VertexAttrib1NubvNV(GLuint index, const GLubyte *v)
 
 static void GLAPIENTRY VertexAttrib1ubvNV(GLuint index, const GLubyte *v)
 {
-   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, v[0]));
+   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, (GLfloat)v[0]));
 }
 
 static void GLAPIENTRY VertexAttrib2NubvNV(GLuint index, const GLubyte *v)
@@ -224,7 +224,7 @@ static void GLAPIENTRY VertexAttrib2NubvNV(GLuint index, const GLubyte *v)
 
 static void GLAPIENTRY VertexAttrib2ubvNV(GLuint index, const GLubyte *v)
 {
-   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, v[0], v[1]));
+   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1]));
 }
 
 static void GLAPIENTRY VertexAttrib3NubvNV(GLuint index, const GLubyte *v)
@@ -235,7 +235,7 @@ static void GLAPIENTRY VertexAttrib3NubvNV(GLuint index, const GLubyte *v)
 }
 static void GLAPIENTRY VertexAttrib3ubvNV(GLuint index, const GLubyte *v)
 {
-   CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, v[0], v[1], v[2]));
+   CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2]));
 }
 
 static void GLAPIENTRY VertexAttrib4NubvNV(GLuint index, const GLubyte *v)
@@ -248,7 +248,7 @@ static void GLAPIENTRY VertexAttrib4NubvNV(GLuint index, const GLubyte *v)
 
 static void GLAPIENTRY VertexAttrib4ubvNV(GLuint index, const GLubyte *v)
 {
-   CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, v[0], v[1], v[2], v[3]));
+   CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2], (GLfloat)v[3]));
 }
 
 /* GL_SHORT attributes */
@@ -260,7 +260,7 @@ static void GLAPIENTRY VertexAttrib1NsvNV(GLuint index, const GLshort *v)
 
 static void GLAPIENTRY VertexAttrib1svNV(GLuint index, const GLshort *v)
 {
-   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, v[0]));
+   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, (GLfloat)v[0]));
 }
 
 static void GLAPIENTRY VertexAttrib2NsvNV(GLuint index, const GLshort *v)
@@ -271,7 +271,7 @@ static void GLAPIENTRY VertexAttrib2NsvNV(GLuint index, const GLshort *v)
 
 static void GLAPIENTRY VertexAttrib2svNV(GLuint index, const GLshort *v)
 {
-   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, v[0], v[1]));
+   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1]));
 }
 
 static void GLAPIENTRY VertexAttrib3NsvNV(GLuint index, const GLshort *v)
@@ -283,7 +283,7 @@ static void GLAPIENTRY VertexAttrib3NsvNV(GLuint index, const GLshort *v)
 
 static void GLAPIENTRY VertexAttrib3svNV(GLuint index, const GLshort *v)
 {
-   CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, v[0], v[1], v[2]));
+   CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2]));
 }
 
 static void GLAPIENTRY VertexAttrib4NsvNV(GLuint index, const GLshort *v)
@@ -296,7 +296,7 @@ static void GLAPIENTRY VertexAttrib4NsvNV(GLuint index, const GLshort *v)
 
 static void GLAPIENTRY VertexAttrib4svNV(GLuint index, const GLshort *v)
 {
-   CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, v[0], v[1], v[2], v[3]));
+   CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2], (GLfloat)v[3]));
 }
 
 /* GL_UNSIGNED_SHORT attributes */
@@ -308,7 +308,7 @@ static void GLAPIENTRY VertexAttrib1NusvNV(GLuint index, const GLushort *v)
 
 static void GLAPIENTRY VertexAttrib1usvNV(GLuint index, const GLushort *v)
 {
-   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, v[0]));
+   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, (GLfloat)v[0]));
 }
 
 static void GLAPIENTRY VertexAttrib2NusvNV(GLuint index, const GLushort *v)
@@ -319,7 +319,7 @@ static void GLAPIENTRY VertexAttrib2NusvNV(GLuint index, const GLushort *v)
 
 static void GLAPIENTRY VertexAttrib2usvNV(GLuint index, const GLushort *v)
 {
-   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, v[0], v[1]));
+   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1]));
 }
 
 static void GLAPIENTRY VertexAttrib3NusvNV(GLuint index, const GLushort *v)
@@ -331,7 +331,7 @@ static void GLAPIENTRY VertexAttrib3NusvNV(GLuint index, const GLushort *v)
 
 static void GLAPIENTRY VertexAttrib3usvNV(GLuint index, const GLushort *v)
 {
-   CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, v[0], v[1], v[2]));
+   CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2]));
 }
 
 static void GLAPIENTRY VertexAttrib4NusvNV(GLuint index, const GLushort *v)
@@ -344,7 +344,7 @@ static void GLAPIENTRY VertexAttrib4NusvNV(GLuint index, const GLushort *v)
 
 static void GLAPIENTRY VertexAttrib4usvNV(GLuint index, const GLushort *v)
 {
-   CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, v[0], v[1], v[2], v[3]));
+   CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2], (GLfloat)v[3]));
 }
 
 /* GL_INT attributes */
@@ -356,7 +356,7 @@ static void GLAPIENTRY VertexAttrib1NivNV(GLuint index, const GLint *v)
 
 static void GLAPIENTRY VertexAttrib1ivNV(GLuint index, const GLint *v)
 {
-   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, v[0]));
+   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, (GLfloat)v[0]));
 }
 
 static void GLAPIENTRY VertexAttrib2NivNV(GLuint index, const GLint *v)
@@ -367,7 +367,7 @@ static void GLAPIENTRY VertexAttrib2NivNV(GLuint index, const GLint *v)
 
 static void GLAPIENTRY VertexAttrib2ivNV(GLuint index, const GLint *v)
 {
-   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, v[0], v[1]));
+   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1]));
 }
 
 static void GLAPIENTRY VertexAttrib3NivNV(GLuint index, const GLint *v)
@@ -379,7 +379,7 @@ static void GLAPIENTRY VertexAttrib3NivNV(GLuint index, const GLint *v)
 
 static void GLAPIENTRY VertexAttrib3ivNV(GLuint index, const GLint *v)
 {
-   CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, v[0], v[1], v[2]));
+   CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2]));
 }
 
 static void GLAPIENTRY VertexAttrib4NivNV(GLuint index, const GLint *v)
@@ -392,7 +392,7 @@ static void GLAPIENTRY VertexAttrib4NivNV(GLuint index, const GLint *v)
 
 static void GLAPIENTRY VertexAttrib4ivNV(GLuint index, const GLint *v)
 {
-   CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, v[0], v[1], v[2], v[3]));
+   CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2], (GLfloat)v[3]));
 }
 
 /* GL_UNSIGNED_INT attributes */
@@ -404,7 +404,7 @@ static void GLAPIENTRY VertexAttrib1NuivNV(GLuint index, const GLuint *v)
 
 static void GLAPIENTRY VertexAttrib1uivNV(GLuint index, const GLuint *v)
 {
-   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, v[0]));
+   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, (GLfloat)v[0]));
 }
 
 static void GLAPIENTRY VertexAttrib2NuivNV(GLuint index, const GLuint *v)
@@ -415,7 +415,7 @@ static void GLAPIENTRY VertexAttrib2NuivNV(GLuint index, const GLuint *v)
 
 static void GLAPIENTRY VertexAttrib2uivNV(GLuint index, const GLuint *v)
 {
-   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, v[0], v[1]));
+   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1]));
 }
 
 static void GLAPIENTRY VertexAttrib3NuivNV(GLuint index, const GLuint *v)
@@ -427,7 +427,7 @@ static void GLAPIENTRY VertexAttrib3NuivNV(GLuint index, const GLuint *v)
 
 static void GLAPIENTRY VertexAttrib3uivNV(GLuint index, const GLuint *v)
 {
-   CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, v[0], v[1], v[2]));
+   CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2]));
 }
 
 static void GLAPIENTRY VertexAttrib4NuivNV(GLuint index, const GLuint *v)
@@ -440,7 +440,7 @@ static void GLAPIENTRY VertexAttrib4NuivNV(GLuint index, const GLuint *v)
 
 static void GLAPIENTRY VertexAttrib4uivNV(GLuint index, const GLuint *v)
 {
-   CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, v[0], v[1], v[2], v[3]));
+   CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2], (GLfloat)v[3]));
 }
 
 /* GL_FLOAT attributes */
@@ -602,7 +602,7 @@ static void GLAPIENTRY VertexAttrib1NbvARB(GLuint index, const GLbyte *v)
 
 static void GLAPIENTRY VertexAttrib1bvARB(GLuint index, const GLbyte *v)
 {
-   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, v[0]));
+   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, (GLfloat)v[0]));
 }
 
 static void GLAPIENTRY VertexAttrib2NbvARB(GLuint index, const GLbyte *v)
@@ -612,7 +612,7 @@ static void GLAPIENTRY VertexAttrib2NbvARB(GLuint index, const GLbyte *v)
 
 static void GLAPIENTRY VertexAttrib2bvARB(GLuint index, const GLbyte *v)
 {
-   CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, v[0], v[1]));
+   CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1]));
 }
 
 static void GLAPIENTRY VertexAttrib3NbvARB(GLuint index, const GLbyte *v)
@@ -624,7 +624,7 @@ static void GLAPIENTRY VertexAttrib3NbvARB(GLuint index, const GLbyte *v)
 
 static void GLAPIENTRY VertexAttrib3bvARB(GLuint index, const GLbyte *v)
 {
-   CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, v[0], v[1], v[2]));
+   CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2]));
 }
 
 static void GLAPIENTRY VertexAttrib4NbvARB(GLuint index, const GLbyte *v)
@@ -637,7 +637,7 @@ static void GLAPIENTRY VertexAttrib4NbvARB(GLuint index, const GLbyte *v)
 
 static void GLAPIENTRY VertexAttrib4bvARB(GLuint index, const GLbyte *v)
 {
-   CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, v[0], v[1], v[2], v[3]));
+   CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2], (GLfloat)v[3]));
 }
 
 /* GL_UNSIGNED_BYTE attributes */
@@ -649,7 +649,7 @@ static void GLAPIENTRY VertexAttrib1NubvARB(GLuint index, const GLubyte *v)
 
 static void GLAPIENTRY VertexAttrib1ubvARB(GLuint index, const GLubyte *v)
 {
-   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, v[0]));
+   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, (GLfloat)v[0]));
 }
 
 static void GLAPIENTRY VertexAttrib2NubvARB(GLuint index, const GLubyte *v)
@@ -660,7 +660,7 @@ static void GLAPIENTRY VertexAttrib2NubvARB(GLuint index, const GLubyte *v)
 
 static void GLAPIENTRY VertexAttrib2ubvARB(GLuint index, const GLubyte *v)
 {
-   CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, v[0], v[1]));
+   CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1]));
 }
 
 static void GLAPIENTRY VertexAttrib3NubvARB(GLuint index, const GLubyte *v)
@@ -671,7 +671,7 @@ static void GLAPIENTRY VertexAttrib3NubvARB(GLuint index, const GLubyte *v)
 }
 static void GLAPIENTRY VertexAttrib3ubvARB(GLuint index, const GLubyte *v)
 {
-   CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, v[0], v[1], v[2]));
+   CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2]));
 }
 
 static void GLAPIENTRY VertexAttrib4NubvARB(GLuint index, const GLubyte *v)
@@ -684,7 +684,7 @@ static void GLAPIENTRY VertexAttrib4NubvARB(GLuint index, const GLubyte *v)
 
 static void GLAPIENTRY VertexAttrib4ubvARB(GLuint index, const GLubyte *v)
 {
-   CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, v[0], v[1], v[2], v[3]));
+   CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2], (GLfloat)v[3]));
 }
 
 /* GL_SHORT attributes */
@@ -696,7 +696,7 @@ static void GLAPIENTRY VertexAttrib1NsvARB(GLuint index, const GLshort *v)
 
 static void GLAPIENTRY VertexAttrib1svARB(GLuint index, const GLshort *v)
 {
-   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, v[0]));
+   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, (GLfloat)v[0]));
 }
 
 static void GLAPIENTRY VertexAttrib2NsvARB(GLuint index, const GLshort *v)
@@ -707,7 +707,7 @@ static void GLAPIENTRY VertexAttrib2NsvARB(GLuint index, const GLshort *v)
 
 static void GLAPIENTRY VertexAttrib2svARB(GLuint index, const GLshort *v)
 {
-   CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, v[0], v[1]));
+   CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1]));
 }
 
 static void GLAPIENTRY VertexAttrib3NsvARB(GLuint index, const GLshort *v)
@@ -719,7 +719,7 @@ static void GLAPIENTRY VertexAttrib3NsvARB(GLuint index, const GLshort *v)
 
 static void GLAPIENTRY VertexAttrib3svARB(GLuint index, const GLshort *v)
 {
-   CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, v[0], v[1], v[2]));
+   CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2]));
 }
 
 static void GLAPIENTRY VertexAttrib4NsvARB(GLuint index, const GLshort *v)
@@ -732,7 +732,7 @@ static void GLAPIENTRY VertexAttrib4NsvARB(GLuint index, const GLshort *v)
 
 static void GLAPIENTRY VertexAttrib4svARB(GLuint index, const GLshort *v)
 {
-   CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, v[0], v[1], v[2], v[3]));
+   CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2], (GLfloat)v[3]));
 }
 
 /* GL_UNSIGNED_SHORT attributes */
@@ -744,7 +744,7 @@ static void GLAPIENTRY VertexAttrib1NusvARB(GLuint index, const GLushort *v)
 
 static void GLAPIENTRY VertexAttrib1usvARB(GLuint index, const GLushort *v)
 {
-   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, v[0]));
+   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, (GLfloat)v[0]));
 }
 
 static void GLAPIENTRY VertexAttrib2NusvARB(GLuint index, const GLushort *v)
@@ -755,7 +755,7 @@ static void GLAPIENTRY VertexAttrib2NusvARB(GLuint index, const GLushort *v)
 
 static void GLAPIENTRY VertexAttrib2usvARB(GLuint index, const GLushort *v)
 {
-   CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, v[0], v[1]));
+   CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1]));
 }
 
 static void GLAPIENTRY VertexAttrib3NusvARB(GLuint index, const GLushort *v)
@@ -767,7 +767,7 @@ static void GLAPIENTRY VertexAttrib3NusvARB(GLuint index, const GLushort *v)
 
 static void GLAPIENTRY VertexAttrib3usvARB(GLuint index, const GLushort *v)
 {
-   CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, v[0], v[1], v[2]));
+   CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2]));
 }
 
 static void GLAPIENTRY VertexAttrib4NusvARB(GLuint index, const GLushort *v)
@@ -780,7 +780,7 @@ static void GLAPIENTRY VertexAttrib4NusvARB(GLuint index, const GLushort *v)
 
 static void GLAPIENTRY VertexAttrib4usvARB(GLuint index, const GLushort *v)
 {
-   CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, v[0], v[1], v[2], v[3]));
+   CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2], (GLfloat)v[3]));
 }
 
 /* GL_INT attributes */
@@ -792,7 +792,7 @@ static void GLAPIENTRY VertexAttrib1NivARB(GLuint index, const GLint *v)
 
 static void GLAPIENTRY VertexAttrib1ivARB(GLuint index, const GLint *v)
 {
-   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, v[0]));
+   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, (GLfloat)v[0]));
 }
 
 static void GLAPIENTRY VertexAttrib2NivARB(GLuint index, const GLint *v)
@@ -803,7 +803,7 @@ static void GLAPIENTRY VertexAttrib2NivARB(GLuint index, const GLint *v)
 
 static void GLAPIENTRY VertexAttrib2ivARB(GLuint index, const GLint *v)
 {
-   CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, v[0], v[1]));
+   CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1]));
 }
 
 static void GLAPIENTRY VertexAttrib3NivARB(GLuint index, const GLint *v)
@@ -815,7 +815,7 @@ static void GLAPIENTRY VertexAttrib3NivARB(GLuint index, const GLint *v)
 
 static void GLAPIENTRY VertexAttrib3ivARB(GLuint index, const GLint *v)
 {
-   CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, v[0], v[1], v[2]));
+   CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2]));
 }
 
 static void GLAPIENTRY VertexAttrib4NivARB(GLuint index, const GLint *v)
@@ -828,7 +828,7 @@ static void GLAPIENTRY VertexAttrib4NivARB(GLuint index, const GLint *v)
 
 static void GLAPIENTRY VertexAttrib4ivARB(GLuint index, const GLint *v)
 {
-   CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, v[0], v[1], v[2], v[3]));
+   CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2], (GLfloat)v[3]));
 }
 
 /* GL_UNSIGNED_INT attributes */
@@ -840,7 +840,7 @@ static void GLAPIENTRY VertexAttrib1NuivARB(GLuint index, const GLuint *v)
 
 static void GLAPIENTRY VertexAttrib1uivARB(GLuint index, const GLuint *v)
 {
-   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, v[0]));
+   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, (GLfloat)v[0]));
 }
 
 static void GLAPIENTRY VertexAttrib2NuivARB(GLuint index, const GLuint *v)
@@ -851,7 +851,7 @@ static void GLAPIENTRY VertexAttrib2NuivARB(GLuint index, const GLuint *v)
 
 static void GLAPIENTRY VertexAttrib2uivARB(GLuint index, const GLuint *v)
 {
-   CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, v[0], v[1]));
+   CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1]));
 }
 
 static void GLAPIENTRY VertexAttrib3NuivARB(GLuint index, const GLuint *v)
@@ -863,7 +863,7 @@ static void GLAPIENTRY VertexAttrib3NuivARB(GLuint index, const GLuint *v)
 
 static void GLAPIENTRY VertexAttrib3uivARB(GLuint index, const GLuint *v)
 {
-   CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, v[0], v[1], v[2]));
+   CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2]));
 }
 
 static void GLAPIENTRY VertexAttrib4NuivARB(GLuint index, const GLuint *v)
@@ -876,7 +876,7 @@ static void GLAPIENTRY VertexAttrib4NuivARB(GLuint index, const GLuint *v)
 
 static void GLAPIENTRY VertexAttrib4uivARB(GLuint index, const GLuint *v)
 {
-   CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, v[0], v[1], v[2], v[3]));
+   CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2], (GLfloat)v[3]));
 }
 
 /* GL_FLOAT attributes */
diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c
index 64ab324af2..9144b4bc66 100644
--- a/src/mesa/main/api_validate.c
+++ b/src/mesa/main/api_validate.c
@@ -87,7 +87,7 @@ _mesa_validate_DrawElements(GLcontext *ctx,
          indexBytes = count * sizeof(GLushort);
       }
 
-      if (indexBytes > ctx->Array.ElementArrayBufferObj->Size) {
+      if (indexBytes > (GLuint) ctx->Array.ElementArrayBufferObj->Size) {
          _mesa_warning(ctx, "glDrawElements index out of buffer bounds");
          return GL_FALSE;
       }
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 2158eb6873..0053180000 100755
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1532,7 +1532,7 @@ _mesa_make_current( GLcontext *newCtx, GLframebuffer *drawBuffer,
           * if the DRIdrawable changes, and everything relies on them.
           * This is a bit messy (same as needed in _mesa_BindFramebufferEXT)
 	  */
-            int i;
+            unsigned int i;
             GLenum buffers[MAX_DRAW_BUFFERS];
 
             _mesa_reference_framebuffer(&newCtx->DrawBuffer, drawBuffer);
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 13ebd4dd0d..f933580b2d 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -5069,7 +5069,7 @@ save_Indexfv(const GLfloat * v)
 static void GLAPIENTRY
 save_EdgeFlag(GLboolean x)
 {
-   save_Attr1fNV(VERT_ATTRIB_EDGEFLAG, x ? 1.0 : 0.0);
+   save_Attr1fNV(VERT_ATTRIB_EDGEFLAG, x ? (GLfloat)1.0 : (GLfloat)0.0);
 }
 
 static void GLAPIENTRY
diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index fa422bb3c7..016ddd0a81 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -377,7 +377,7 @@ _mesa_Bitmap( GLsizei width, GLsizei height,
 
    if (ctx->RenderMode == GL_RENDER) {
       /* Truncate, to satisfy conformance tests (matches SGI's OpenGL). */
-      const GLfloat epsilon = 0.0001;
+      const GLfloat epsilon = (const GLfloat)0.0001;
       GLint x = IFLOOR(ctx->Current.RasterPos[0] + epsilon - xorig);
       GLint y = IFLOOR(ctx->Current.RasterPos[1] + epsilon - yorig);
 
diff --git a/src/mesa/main/framebuffer.c b/src/mesa/main/framebuffer.c
index c9b30d3252..894d99afd2 100644
--- a/src/mesa/main/framebuffer.c
+++ b/src/mesa/main/framebuffer.c
@@ -67,7 +67,7 @@ compute_depth_max(struct gl_framebuffer *fb)
    fb->_DepthMaxF = (GLfloat) fb->_DepthMax;
 
    /* Minimum resolvable depth value, for polygon offset */
-   fb->_MRD = 1.0 / fb->_DepthMaxF;
+   fb->_MRD = (GLfloat)1.0 / fb->_DepthMaxF;
 }
 
 
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index eb81ee4a52..ee48b78318 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -2124,7 +2124,7 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          params[0] = (GLfloat)(ctx->DrawBuffer->Visual.depthBits);
          break;
       case GL_DEPTH_CLEAR_VALUE:
-         params[0] = ctx->Depth.Clear;
+         params[0] = (GLfloat)ctx->Depth.Clear;
          break;
       case GL_DEPTH_FUNC:
          params[0] = ENUM_TO_FLOAT(ctx->Depth.Func);
@@ -2914,7 +2914,7 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          GLuint i, n = _mesa_get_compressed_formats(ctx, formats, GL_FALSE);
          ASSERT(n <= 100);
          for (i = 0; i < n; i++)
-            params[i] = ENUM_TO_INT(formats[i]);
+            params[i] = (GLfloat)(ENUM_TO_INT(formats[i]));
          }
          break;
       case GL_ARRAY_ELEMENT_LOCK_FIRST_EXT:
diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index 76e105e65e..285c8346a5 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -1169,7 +1169,7 @@ _mesa_apply_stencil_transfer_ops(const GLcontext *ctx, GLuint n,
       GLuint mask = ctx->PixelMaps.StoS.Size - 1;
       GLuint i;
       for (i = 0; i < n; i++) {
-         stencil[i] = ctx->PixelMaps.StoS.Map[ stencil[i] & mask ];
+         stencil[i] = (GLstencil)ctx->PixelMaps.StoS.Map[ stencil[i] & mask ];
       }
    }
 }
@@ -3680,7 +3680,7 @@ _mesa_unpack_stencil_span( const GLcontext *ctx, GLuint n,
          const GLuint mask = ctx->PixelMaps.StoS.Size - 1;
          GLuint i;
          for (i = 0; i < n; i++) {
-            indexes[i] = ctx->PixelMaps.StoS.Map[ indexes[i] & mask ];
+            indexes[i] = (GLuint)ctx->PixelMaps.StoS.Map[ indexes[i] & mask ];
          }
       }
 
@@ -4035,7 +4035,7 @@ _mesa_unpack_depth_span( const GLcontext *ctx, GLuint n,
    if (needClamp) {
       GLuint i;
       for (i = 0; i < n; i++) {
-         depthValues[i] = CLAMP(depthValues[i], 0.0, 1.0);
+         depthValues[i] = (GLfloat)CLAMP(depthValues[i], 0.0, 1.0);
       }
    }
 
diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c
index f9715b4865..f37d1f216f 100644
--- a/src/mesa/main/light.c
+++ b/src/mesa/main/light.c
@@ -1119,7 +1119,7 @@ compute_light_positions( GLcontext *ctx )
       }
       else {
          /* positional light w/ homogeneous coordinate, divide by W */
-         GLfloat wInv = 1.0 / light->_Position[3];
+         GLfloat wInv = (GLfloat)1.0 / light->_Position[3];
          light->_Position[0] *= wInv;
          light->_Position[1] *= wInv;
          light->_Position[2] *= wInv;
diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index d3d1958951..061378f3b7 100644
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -292,7 +292,7 @@ do_row(GLenum datatype, GLuint comps, GLint srcWidth,
       GLfloat *dst = (GLfloat *) dstRow;
       for (i = j = 0, k = k0; i < (GLuint) dstWidth;
            i++, j += colStride, k += colStride) {
-         dst[i] = rowA[j] / 4 + rowA[k] / 4 + rowB[j] / 4 + rowB[k] / 4;
+         dst[i] = (GLfloat)(rowA[j] / 4 + rowA[k] / 4 + rowB[j] / 4 + rowB[k] / 4);
       }
    }
 
diff --git a/src/mesa/main/pixel.c b/src/mesa/main/pixel.c
index 0e9915dd38..7eeae05dbd 100644
--- a/src/mesa/main/pixel.c
+++ b/src/mesa/main/pixel.c
@@ -304,7 +304,7 @@ store_pixelmap(GLcontext *ctx, GLenum map, GLsizei mapsize,
       /* special case */
       ctx->PixelMaps.StoS.Size = mapsize;
       for (i = 0; i < mapsize; i++) {
-         ctx->PixelMaps.StoS.Map[i] = IROUND(values[i]);
+         ctx->PixelMaps.StoS.Map[i] = (GLfloat)IROUND(values[i]);
       }
       break;
    case GL_PIXEL_MAP_I_TO_I:
@@ -1142,7 +1142,7 @@ _mesa_lookup_rgba_ubyte(const struct gl_color_table *table,
                         GLuint n, GLubyte rgba[][4])
 {
    const GLubyte *lut = table->TableUB;
-   const GLfloat scale = (GLfloat) (table->Size - 1) / 255.0;
+   const GLfloat scale = (GLfloat) (table->Size - 1) / (GLfloat)255.0;
    GLuint i;
 
    if (!table->TableUB || table->Size == 0)
diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c
index e30f5480da..a1e32e70ba 100644
--- a/src/mesa/main/queryobj.c
+++ b/src/mesa/main/queryobj.c
@@ -382,7 +382,7 @@ _mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params)
             *params = 0x7fffffff;
          }
          else {
-            *params = q->Result;
+            *params = (GLint)q->Result;
          }
          break;
       case GL_QUERY_RESULT_AVAILABLE_ARB:
@@ -422,7 +422,7 @@ _mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params)
             *params = 0xffffffff;
          }
          else {
-            *params = q->Result;
+            *params = (GLuint)q->Result;
          }
          break;
       case GL_QUERY_RESULT_AVAILABLE_ARB:
diff --git a/src/mesa/main/rastpos.c b/src/mesa/main/rastpos.c
index ee163e0c71..f0500083ec 100644
--- a/src/mesa/main/rastpos.c
+++ b/src/mesa/main/rastpos.c
@@ -63,7 +63,7 @@ rasterpos(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 void GLAPIENTRY
 _mesa_RasterPos2d(GLdouble x, GLdouble y)
 {
-   rasterpos(x, y, 0.0F, 1.0F);
+   rasterpos((GLfloat)x, (GLfloat)y, (GLfloat)0.0, (GLfloat)1.0);
 }
 
 void GLAPIENTRY
diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 644b1f39c7..6877ef96f2 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -904,14 +904,14 @@ emit_texenv(struct texenv_fragment_program *p, GLuint unit)
     */
    if (alpha_shift || rgb_shift) {
       if (rgb_shift == alpha_shift) {
-	 shift = register_scalar_const(p, 1<<rgb_shift);
+	 shift = register_scalar_const(p, (GLfloat)(1<<rgb_shift));
       }
       else {
 	 shift = register_const4f(p, 
-				  1<<rgb_shift,
-				  1<<rgb_shift,
-				  1<<rgb_shift,
-				  1<<alpha_shift);
+				  (GLfloat)(1<<rgb_shift),
+				  (GLfloat)(1<<rgb_shift),
+				  (GLfloat)(1<<rgb_shift),
+				  (GLfloat)(1<<alpha_shift));
       }
       return emit_arith( p, OPCODE_MUL, dest, WRITEMASK_XYZW, 
 			 saturate, out, shift, undef );
diff --git a/src/mesa/shader/prog_execute.c b/src/mesa/shader/prog_execute.c
index 8ce2ca3964..abb143c4b9 100644
--- a/src/mesa/shader/prog_execute.c
+++ b/src/mesa/shader/prog_execute.c
@@ -92,7 +92,7 @@ get_register_pointer(const struct prog_src_register *source,
                 source->File == PROGRAM_CONSTANT ||
                 source->File == PROGRAM_STATE_VAR);
          params = machine->CurProgram->Parameters;
-         if (reg < 0 || reg >= params->NumParameters)
+         if (reg < 0 || reg >= (GLint)params->NumParameters)
             return ZeroVec;
          else
             return params->ParameterValues[reg];
@@ -227,7 +227,7 @@ fetch_vector4_deriv(GLcontext * ctx,
                     const struct gl_program_machine *machine,
                     char xOrY, GLfloat result[4])
 {
-   if (source->File == PROGRAM_INPUT && source->Index < machine->NumDeriv) {
+   if (source->File == PROGRAM_INPUT && source->Index < (GLint)machine->NumDeriv) {
       const GLint col = machine->CurElement;
       const GLfloat w = machine->Attribs[FRAG_ATTRIB_WPOS][col][3];
       const GLfloat invQ = 1.0f / w;
@@ -506,7 +506,7 @@ _mesa_execute_program(GLcontext * ctx,
 {
    const GLuint numInst = program->NumInstructions;
    const GLuint maxExec = 10000;
-   GLint pc, numExec = 0;
+   GLuint pc, numExec = 0;
 
    machine->CurProgram = program;
 
diff --git a/src/mesa/shader/prog_statevars.c b/src/mesa/shader/prog_statevars.c
index 44fbfdcd04..8f48155825 100644
--- a/src/mesa/shader/prog_statevars.c
+++ b/src/mesa/shader/prog_statevars.c
@@ -250,7 +250,7 @@ _mesa_fetch_state(GLcontext *ctx, const gl_state_index state[],
       value[1] = ctx->Fog.Start;
       value[2] = ctx->Fog.End;
       value[3] = (ctx->Fog.End == ctx->Fog.Start)
-         ? 1.0 : 1.0F / (ctx->Fog.End - ctx->Fog.Start);
+         ? 1.0 : (GLfloat)(1.0 / (ctx->Fog.End - ctx->Fog.Start));
       return;
    case STATE_CLIPPLANE:
       {
@@ -411,7 +411,7 @@ _mesa_fetch_state(GLcontext *ctx, const gl_state_index state[],
             if (texObj) {
                struct gl_texture_image *texImage = texObj->Image[0][0];
                ASSIGN_4V(value, 1.0 / texImage->Width,
-                         1.0 / texImage->Height,
+                         (GLfloat)(1.0 / texImage->Height),
                          0.0, 1.0);
             }
          }
@@ -426,10 +426,10 @@ _mesa_fetch_state(GLcontext *ctx, const gl_state_index state[],
           * exp2: 2^-((density/(ln(2)^2) * fogcoord)^2)
           */
          value[0] = (ctx->Fog.End == ctx->Fog.Start)
-            ? 1.0 : -1.0F / (ctx->Fog.End - ctx->Fog.Start);
+            ? 1.0 : (GLfloat)(-1.0F / (ctx->Fog.End - ctx->Fog.Start));
          value[1] = ctx->Fog.End * -value[0];
-         value[2] = ctx->Fog.Density * ONE_DIV_LN2;
-         value[3] = ctx->Fog.Density * ONE_DIV_SQRT_LN2;
+         value[2] = (GLfloat)(ctx->Fog.Density * ONE_DIV_LN2);
+         value[3] = (GLfloat)(ctx->Fog.Density * ONE_DIV_SQRT_LN2);
          return;
 
       case STATE_LIGHT_SPOT_DIR_NORMALIZED: {
diff --git a/src/mesa/shader/prog_uniform.c b/src/mesa/shader/prog_uniform.c
index 20e004b350..d96a916533 100644
--- a/src/mesa/shader/prog_uniform.c
+++ b/src/mesa/shader/prog_uniform.c
@@ -135,7 +135,7 @@ _mesa_longest_uniform_name(const struct gl_uniform_list *list)
    GLuint i;
    for (i = 0; i < list->NumUniforms; i++) {
       GLuint len = _mesa_strlen(list->Uniforms[i].Name);
-      if (len > max)
+      if (len > (GLuint)max)
          max = len;
    }
    return max;
diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index 24ab7568d6..856179e1d5 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -719,7 +719,7 @@ _mesa_get_attached_shaders(GLcontext *ctx, GLuint program, GLsizei maxCount,
    struct gl_shader_program *shProg
       = _mesa_lookup_shader_program(ctx, program);
    if (shProg) {
-      GLint i;
+      GLuint i;
       for (i = 0; i < maxCount && i < shProg->NumShaders; i++) {
          obj[i] = shProg->Shaders[i]->Name;
       }
@@ -893,7 +893,7 @@ _mesa_get_uniformfv(GLcontext *ctx, GLuint program, GLint location,
       = _mesa_lookup_shader_program(ctx, program);
    if (shProg) {
       if (location < shProg->Uniforms->NumUniforms) {
-         GLint progPos, i;
+         GLuint progPos, i;
          const struct gl_program *prog = NULL;
 
          progPos = shProg->Uniforms->Uniforms[location].VertPos;
@@ -1111,7 +1111,7 @@ set_program_uniform(GLcontext *ctx, struct gl_program *program, GLint location,
    }
    else {
       /* ordinary uniform variable */
-      GLint k, i;
+      GLuint k, i;
 
       if (count * elems > program->Parameters->Parameters[location].Size) {
          _mesa_error(ctx, GL_INVALID_OPERATION, "glUniform(count too large)");
diff --git a/src/mesa/state_tracker/st_atom_pixeltransfer.c b/src/mesa/state_tracker/st_atom_pixeltransfer.c
index e500ac8684..e4de875e8c 100644
--- a/src/mesa/state_tracker/st_atom_pixeltransfer.c
+++ b/src/mesa/state_tracker/st_atom_pixeltransfer.c
@@ -77,7 +77,7 @@ is_identity(const GLfloat m[16])
    GLuint i;
    for (i = 0; i < 16; i++) {
       const int row = i % 4, col = i / 4;
-      const float val = (row == col);
+      const float val = (GLfloat)(row == col);
       if (m[i] != val)
          return GL_FALSE;
    }
diff --git a/src/mesa/state_tracker/st_atom_scissor.c b/src/mesa/state_tracker/st_atom_scissor.c
index f5db492403..3fd59e1945 100644
--- a/src/mesa/state_tracker/st_atom_scissor.c
+++ b/src/mesa/state_tracker/st_atom_scissor.c
@@ -52,14 +52,14 @@ update_scissor( struct st_context *st )
    scissor.maxy = fb->Height;
 
    if (st->ctx->Scissor.Enabled) {
-      if (st->ctx->Scissor.X > scissor.minx)
+      if ((GLuint)st->ctx->Scissor.X > scissor.minx)
          scissor.minx = st->ctx->Scissor.X;
-      if (st->ctx->Scissor.Y > scissor.miny)
+      if ((GLuint)st->ctx->Scissor.Y > scissor.miny)
          scissor.miny = st->ctx->Scissor.Y;
 
-      if (st->ctx->Scissor.X + st->ctx->Scissor.Width < scissor.maxx)
+      if ((GLuint)st->ctx->Scissor.X + st->ctx->Scissor.Width < scissor.maxx)
          scissor.maxx = st->ctx->Scissor.X + st->ctx->Scissor.Width;
-      if (st->ctx->Scissor.Y + st->ctx->Scissor.Height < scissor.maxy)
+      if ((GLuint)st->ctx->Scissor.Y + st->ctx->Scissor.Height < scissor.maxy)
          scissor.maxy = st->ctx->Scissor.Y + st->ctx->Scissor.Height;
 
       /* check for null space */
diff --git a/src/mesa/state_tracker/st_atom_viewport.c b/src/mesa/state_tracker/st_atom_viewport.c
index 4b51521470..b105909e96 100644
--- a/src/mesa/state_tracker/st_atom_viewport.c
+++ b/src/mesa/state_tracker/st_atom_viewport.c
@@ -49,7 +49,7 @@ update_viewport( struct st_context *st )
     */
    if (st_fb_orientation(ctx->DrawBuffer) == Y_0_TOP) {
       yScale = -1;
-      yBias = ctx->DrawBuffer->Height ;
+      yBias = (GLfloat)ctx->DrawBuffer->Height;
    }
    else {
       yScale = 1.0;
@@ -59,12 +59,12 @@ update_viewport( struct st_context *st )
    /* _NEW_VIEWPORT 
     */
    {
-      GLfloat x = ctx->Viewport.X;
-      GLfloat y = ctx->Viewport.Y;
+      GLfloat x = (GLfloat)ctx->Viewport.X;
+      GLfloat y = (GLfloat)ctx->Viewport.Y;
       GLfloat z = ctx->Viewport.Near;
-      GLfloat half_width = ctx->Viewport.Width / 2.0;
-      GLfloat half_height = ctx->Viewport.Height / 2.0;
-      GLfloat half_depth = (ctx->Viewport.Far - ctx->Viewport.Near) / 2.0;
+      GLfloat half_width = (GLfloat)ctx->Viewport.Width / 2.0;
+      GLfloat half_height = (GLfloat)ctx->Viewport.Height / 2.0;
+      GLfloat half_depth = (GLfloat)(ctx->Viewport.Far - ctx->Viewport.Near) / 2.0;
       
       st->state.viewport.scale[0] = half_width;
       st->state.viewport.scale[1] = half_height * yScale;
diff --git a/src/mesa/state_tracker/st_cb_bitmap.c b/src/mesa/state_tracker/st_cb_bitmap.c
index 593938f8cf..9763eebe54 100644
--- a/src/mesa/state_tracker/st_cb_bitmap.c
+++ b/src/mesa/state_tracker/st_cb_bitmap.c
@@ -360,18 +360,18 @@ setup_bitmap_vertex_data(struct st_context *st,
 {
    struct pipe_context *pipe = st->pipe;
    const struct gl_framebuffer *fb = st->ctx->DrawBuffer;
-   const GLfloat fb_width = fb->Width;
-   const GLfloat fb_height = fb->Height;
-   const GLfloat x0 = x;
-   const GLfloat x1 = x + width;
-   const GLfloat y0 = y;
-   const GLfloat y1 = y + height;
-   const GLfloat sLeft = 0.0F, sRight = 1.0F;
-   const GLfloat tTop = 0.0, tBot = 1.0 - tTop;
-   const GLfloat clip_x0 = x0 / fb_width * 2.0 - 1.0;
-   const GLfloat clip_y0 = y0 / fb_height * 2.0 - 1.0;
-   const GLfloat clip_x1 = x1 / fb_width * 2.0 - 1.0;
-   const GLfloat clip_y1 = y1 / fb_height * 2.0 - 1.0;
+   const GLfloat fb_width = (GLfloat)fb->Width;
+   const GLfloat fb_height = (GLfloat)fb->Height;
+   const GLfloat x0 = (GLfloat)x;
+   const GLfloat x1 = (GLfloat)(x + width);
+   const GLfloat y0 = (GLfloat)y;
+   const GLfloat y1 = (GLfloat)(y + height);
+   const GLfloat sLeft = (GLfloat)0.0, sRight = (GLfloat)1.0;
+   const GLfloat tTop = (GLfloat)0.0, tBot = (GLfloat)1.0 - tTop;
+   const GLfloat clip_x0 = (GLfloat)(x0 / fb_width * 2.0 - 1.0);
+   const GLfloat clip_y0 = (GLfloat)(y0 / fb_height * 2.0 - 1.0);
+   const GLfloat clip_x1 = (GLfloat)(x1 / fb_width * 2.0 - 1.0);
+   const GLfloat clip_y1 = (GLfloat)(y1 / fb_height * 2.0 - 1.0);
    GLuint i;
    void *buf;
 
@@ -444,8 +444,8 @@ draw_bitmap_quad(GLcontext *ctx, GLint x, GLint y, GLfloat z,
     * it up into chunks.
     */
    maxSize = 1 << (pipe->screen->get_param(pipe->screen, PIPE_CAP_MAX_TEXTURE_2D_LEVELS) - 1);
-   assert(width <= maxSize);
-   assert(height <= maxSize);
+   assert(width <= (GLsizei)maxSize);
+   assert(height <= (GLsizei)maxSize);
 
    cso_save_rasterizer(cso);
    cso_save_samplers(cso);
@@ -488,15 +488,15 @@ draw_bitmap_quad(GLcontext *ctx, GLint x, GLint y, GLfloat z,
    {
       const struct gl_framebuffer *fb = st->ctx->DrawBuffer;
       const GLboolean invert = (st_fb_orientation(fb) == Y_0_TOP);
-      const float width = fb->Width;
-      const float height = fb->Height;
+      const GLfloat width = (GLfloat)fb->Width;
+      const GLfloat height = (GLfloat)fb->Height;
       struct pipe_viewport_state vp;
       vp.scale[0] =  0.5 * width;
-      vp.scale[1] = height * (invert ? -0.5 : 0.5);
+      vp.scale[1] = (GLfloat)(height * (invert ? -0.5 : 0.5));
       vp.scale[2] = 1.0;
       vp.scale[3] = 1.0;
-      vp.translate[0] = 0.5 * width;
-      vp.translate[1] = 0.5 * height;
+      vp.translate[0] = (GLfloat)(0.5 * width);
+      vp.translate[1] = (GLfloat)(0.5 * height);
       vp.translate[2] = 0.0;
       vp.translate[3] = 0.0;
       cso_set_viewport(cso, &vp);
diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c
index a52521db64..dbee2188ee 100644
--- a/src/mesa/vbo/vbo_exec_array.c
+++ b/src/mesa/vbo/vbo_exec_array.c
@@ -41,7 +41,7 @@ static void get_minmax_index( GLuint count, GLuint type,
 			      GLuint *min_index,
 			      GLuint *max_index)
 {
-   GLint i;
+   GLuint i;
 
    switch(type) {
    case GL_UNSIGNED_INT: {
diff --git a/src/mesa/vbo/vbo_split_inplace.c b/src/mesa/vbo/vbo_split_inplace.c
index 958afccd0c..fbc856e93b 100644
--- a/src/mesa/vbo/vbo_split_inplace.c
+++ b/src/mesa/vbo/vbo_split_inplace.c
@@ -58,7 +58,7 @@ struct split_context {
 
 static void flush_vertex( struct split_context *split )
 {
-   GLint min_index, max_index;
+   GLuint min_index, max_index;
 
    if (!split->dstprim_nr) 
       return;
-- 
cgit v1.2.3


From feb722fa98f04a4487b7ec4746bcc8c7296899c8 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 5 Jun 2008 12:01:00 -0600
Subject: mesa: added _mesa_DrawArrays, DrawElements, DrawRangeElements()
 wrappers for VBO funcs

---
 src/mesa/main/varray.h        | 14 ++++++++++++++
 src/mesa/vbo/vbo_exec_array.c | 27 +++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/varray.h b/src/mesa/main/varray.h
index 3589735f68..ba91ecf5f6 100644
--- a/src/mesa/main/varray.h
+++ b/src/mesa/main/varray.h
@@ -147,6 +147,20 @@ _mesa_MultiModeDrawElementsIBM( const GLenum * mode, const GLsizei * count,
 				GLsizei primcount, GLint modestride );
 
 
+
+extern void GLAPIENTRY
+_mesa_DrawArrays(GLenum mode, GLint first, GLsizei count);
+
+extern void GLAPIENTRY
+_mesa_DrawElements(GLenum mode, GLsizei count, GLenum type,
+                   const GLvoid *indices);
+
+extern void GLAPIENTRY
+_mesa_DrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count,
+                        GLenum type, const GLvoid *indices);
+
+
+
 extern void
 _mesa_init_varray( GLcontext * ctx );
 
diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c
index dbee2188ee..e3d2fc51cb 100644
--- a/src/mesa/vbo/vbo_exec_array.c
+++ b/src/mesa/vbo/vbo_exec_array.c
@@ -30,6 +30,7 @@
 #include "main/state.h"
 #include "main/api_validate.h"
 #include "main/api_noop.h"
+#include "main/varray.h"
 #include "glapi/dispatch.h"
 
 #include "vbo_context.h"
@@ -400,3 +401,29 @@ void vbo_exec_array_destroy( struct vbo_exec_context *exec )
 {
    /* nothing to do */
 }
+
+
+/* This API entrypoint is not ordinarily used */
+void GLAPIENTRY
+_mesa_DrawArrays(GLenum mode, GLint first, GLsizei count)
+{
+   vbo_exec_DrawArrays(mode, first, count);
+}
+
+
+/* This API entrypoint is not ordinarily used */
+void GLAPIENTRY
+_mesa_DrawElements(GLenum mode, GLsizei count, GLenum type,
+                   const GLvoid *indices)
+{
+   vbo_exec_DrawElements(mode, count, type, indices);
+}
+
+
+/* This API entrypoint is not ordinarily used */
+void GLAPIENTRY
+_mesa_DrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count,
+                        GLenum type, const GLvoid *indices)
+{
+   vbo_exec_DrawRangeElements(mode, start, end, count, type, indices);
+}
-- 
cgit v1.2.3


From 16e8ee33bd3db1b14a97b3ddd2a7a8833851f8fb Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 5 Jun 2008 12:08:19 -0600
Subject: mesa: remove EXT/NV suffixes from _mesa_PointParameter functions

---
 src/mesa/main/attrib.c | 24 ++++++++++++------------
 src/mesa/main/points.c | 29 ++++++++---------------------
 src/mesa/main/points.h |  8 ++++----
 src/mesa/main/state.c  |  8 ++++----
 4 files changed, 28 insertions(+), 41 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index b422198f92..39666d175a 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -1074,14 +1074,14 @@ _mesa_PopAttrib(void)
                _mesa_PointSize(point->Size);
                _mesa_set_enable(ctx, GL_POINT_SMOOTH, point->SmoothFlag);
                if (ctx->Extensions.EXT_point_parameters) {
-                  _mesa_PointParameterfvEXT(GL_DISTANCE_ATTENUATION_EXT,
-                                            point->Params);
-                  _mesa_PointParameterfEXT(GL_POINT_SIZE_MIN_EXT,
-                                           point->MinSize);
-                  _mesa_PointParameterfEXT(GL_POINT_SIZE_MAX_EXT,
-                                           point->MaxSize);
-                  _mesa_PointParameterfEXT(GL_POINT_FADE_THRESHOLD_SIZE_EXT,
-                                           point->Threshold);
+                  _mesa_PointParameterfv(GL_DISTANCE_ATTENUATION_EXT,
+                                         point->Params);
+                  _mesa_PointParameterf(GL_POINT_SIZE_MIN_EXT,
+                                        point->MinSize);
+                  _mesa_PointParameterf(GL_POINT_SIZE_MAX_EXT,
+                                        point->MaxSize);
+                  _mesa_PointParameterf(GL_POINT_FADE_THRESHOLD_SIZE_EXT,
+                                        point->Threshold);
                }
                if (ctx->Extensions.NV_point_sprite
 		   || ctx->Extensions.ARB_point_sprite) {
@@ -1091,10 +1091,10 @@ _mesa_PopAttrib(void)
                                    (GLint) point->CoordReplace[u]);
                   }
                   _mesa_set_enable(ctx, GL_POINT_SPRITE_NV,point->PointSprite);
-                  _mesa_PointParameteriNV(GL_POINT_SPRITE_R_MODE_NV,
-                                          ctx->Point.SpriteRMode);
-                  _mesa_PointParameterfEXT(GL_POINT_SPRITE_COORD_ORIGIN,
-                                           (GLfloat)ctx->Point.SpriteOrigin);
+                  _mesa_PointParameteri(GL_POINT_SPRITE_R_MODE_NV,
+                                        ctx->Point.SpriteRMode);
+                  _mesa_PointParameterf(GL_POINT_SPRITE_COORD_ORIGIN,
+                                        (GLfloat)ctx->Point.SpriteOrigin);
                }
             }
             break;
diff --git a/src/mesa/main/points.c b/src/mesa/main/points.c
index e83db5de78..fbedbcb22c 100644
--- a/src/mesa/main/points.c
+++ b/src/mesa/main/points.c
@@ -65,45 +65,32 @@ _mesa_PointSize( GLfloat size )
 
 #if _HAVE_FULL_GL
 
-/*
- * Added by GL_NV_point_sprite
- */
+
 void GLAPIENTRY
-_mesa_PointParameteriNV( GLenum pname, GLint param )
+_mesa_PointParameteri( GLenum pname, GLint param )
 {
    const GLfloat value = (GLfloat) param;
-   _mesa_PointParameterfvEXT(pname, &value);
+   _mesa_PointParameterfv(pname, &value);
 }
 
 
-/*
- * Added by GL_NV_point_sprite
- */
 void GLAPIENTRY
-_mesa_PointParameterivNV( GLenum pname, const GLint *params )
+_mesa_PointParameteriv( GLenum pname, const GLint *params )
 {
    const GLfloat value = (GLfloat) params[0];
-   _mesa_PointParameterfvEXT(pname, &value);
+   _mesa_PointParameterfv(pname, &value);
 }
 
 
-
-/*
- * Same for both GL_EXT_point_parameters and GL_ARB_point_parameters.
- */
 void GLAPIENTRY
-_mesa_PointParameterfEXT( GLenum pname, GLfloat param)
+_mesa_PointParameterf( GLenum pname, GLfloat param)
 {
-   _mesa_PointParameterfvEXT(pname, &param);
+   _mesa_PointParameterfv(pname, &param);
 }
 
 
-
-/*
- * Same for both GL_EXT_point_parameters and GL_ARB_point_parameters.
- */
 void GLAPIENTRY
-_mesa_PointParameterfvEXT( GLenum pname, const GLfloat *params)
+_mesa_PointParameterfv( GLenum pname, const GLfloat *params)
 {
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
diff --git a/src/mesa/main/points.h b/src/mesa/main/points.h
index 951ff677db..156641eab9 100644
--- a/src/mesa/main/points.h
+++ b/src/mesa/main/points.h
@@ -39,16 +39,16 @@ extern void GLAPIENTRY
 _mesa_PointSize( GLfloat size );
 
 extern void GLAPIENTRY
-_mesa_PointParameteriNV( GLenum pname, GLint param );
+_mesa_PointParameteri( GLenum pname, GLint param );
 
 extern void GLAPIENTRY
-_mesa_PointParameterivNV( GLenum pname, const GLint *params );
+_mesa_PointParameteriv( GLenum pname, const GLint *params );
 
 extern void GLAPIENTRY
-_mesa_PointParameterfEXT( GLenum pname, GLfloat param );
+_mesa_PointParameterf( GLenum pname, GLfloat param );
 
 extern void GLAPIENTRY
-_mesa_PointParameterfvEXT( GLenum pname, const GLfloat *params );
+_mesa_PointParameterfv( GLenum pname, const GLfloat *params );
 
 extern void 
 _mesa_init_point( GLcontext * ctx );
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index cdf1249cd0..7e8f964bb1 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -457,8 +457,8 @@ _mesa_init_exec_table(struct _glapi_table *exec)
 
    /* 54. GL_EXT_point_parameters */
 #if _HAVE_FULL_GL
-   SET_PointParameterfEXT(exec, _mesa_PointParameterfEXT);
-   SET_PointParameterfvEXT(exec, _mesa_PointParameterfvEXT);
+   SET_PointParameterfEXT(exec, _mesa_PointParameterf);
+   SET_PointParameterfvEXT(exec, _mesa_PointParameterfv);
 #endif
 
    /* 97. GL_EXT_compiled_vertex_array */
@@ -571,8 +571,8 @@ _mesa_init_exec_table(struct _glapi_table *exec)
 
    /* 262. GL_NV_point_sprite */
 #if _HAVE_FULL_GL
-   SET_PointParameteriNV(exec, _mesa_PointParameteriNV);
-   SET_PointParameterivNV(exec, _mesa_PointParameterivNV);
+   SET_PointParameteriNV(exec, _mesa_PointParameteri);
+   SET_PointParameterivNV(exec, _mesa_PointParameteriv);
 #endif
 
    /* 268. GL_EXT_stencil_two_side */
-- 
cgit v1.2.3


From e4fda51404a6a05c4047a639de4ccc3ea9678c2c Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Fri, 6 Jun 2008 15:57:37 +0100
Subject: mesa: turn off ffvertex prog debug

---
 src/mesa/main/ffvertex_prog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index 2ef3286e57..06710f405d 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -305,7 +305,7 @@ static struct state_key *make_state_key( GLcontext *ctx )
  * generated program with line/function references for each
  * instruction back into this file:
  */
-#define DISASSEM 1
+#define DISASSEM 0
 
 /* Should be tunable by the driver - do we want to do matrix
  * multiplications with DP4's or with MUL/MAD's?  SSE works better
-- 
cgit v1.2.3


From f4535f6e5ae63d8c59428cf190a95e0eb4ae233d Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date: Fri, 6 Jun 2008 16:12:55 +0200
Subject: mesa: Add MESA_FORMAT_S8_Z24 texture format 	None of the fetch and
 store functions implemented. 	This atleast stops shadowtex from locking the
 GPU on 	i915 with the linux-dri-x86 target. It most of it looks 
 okay, with the exception of actually displaying the texture.

---
 src/mesa/main/texformat.c          | 35 +++++++++++++++++++++++++++++++++++
 src/mesa/main/texformat.h          |  2 ++
 src/mesa/state_tracker/st_format.c |  6 ++++--
 3 files changed, 41 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c
index 88fbd8f07c..d479bf510e 100644
--- a/src/mesa/main/texformat.c
+++ b/src/mesa/main/texformat.c
@@ -1207,6 +1207,41 @@ const struct gl_texture_format _mesa_texformat_z24_s8 = {
    store_texel_z24_s8			/* StoreTexel */
 };
 
+const struct gl_texture_format _mesa_texformat_s8_z24 = {
+   MESA_FORMAT_S8_Z24,			/* MesaFormat */
+   GL_DEPTH_STENCIL_EXT,		/* BaseFormat */
+   GL_UNSIGNED_NORMALIZED_ARB,		/* DataType */
+   0,					/* RedBits */
+   0,					/* GreenBits */
+   0,					/* BlueBits */
+   0,					/* AlphaBits */
+   0,					/* LuminanceBits */
+   0,					/* IntensityBits */
+   0,					/* IndexBits */
+   24,					/* DepthBits */
+   8,					/* StencilBits */
+   4,					/* TexelBytes */
+#if 0
+   _mesa_texstore_s8_z24,		/* StoreTexImageFunc */
+#else
+   _mesa_texstore_z24_s8,		/* StoreTexImageFunc */
+#endif
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel2D */
+   NULL,				/* FetchTexel3D */
+#if 0
+   fetch_texel_1d_f_s8_z24,		/* FetchTexel1Df */
+   fetch_texel_2d_f_s8_z24,		/* FetchTexel2Df */
+   fetch_texel_3d_f_s8_z24,		/* FetchTexel3Df */
+   store_texel_s8_z24			/* StoreTexel */
+#else
+   fetch_texel_1d_f_z24_s8,		/* FetchTexel1Df */
+   fetch_texel_2d_f_z24_s8,		/* FetchTexel2Df */
+   fetch_texel_3d_f_z24_s8,		/* FetchTexel3Df */
+   store_texel_z24_s8			/* StoreTexel */
+#endif
+};
+
 const struct gl_texture_format _mesa_texformat_z16 = {
    MESA_FORMAT_Z16,			/* MesaFormat */
    GL_DEPTH_COMPONENT,			/* BaseFormat */
diff --git a/src/mesa/main/texformat.h b/src/mesa/main/texformat.h
index 48f0fe99f2..8f4e2feb48 100644
--- a/src/mesa/main/texformat.h
+++ b/src/mesa/main/texformat.h
@@ -84,6 +84,7 @@ enum _format {
    MESA_FORMAT_YCBCR,		/*                     YYYY YYYY UorV UorV */
    MESA_FORMAT_YCBCR_REV,	/*                     UorV UorV YYYY YYYY */
    MESA_FORMAT_Z24_S8,          /* ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ SSSS SSSS */
+   MESA_FORMAT_S8_Z24,          /* SSSS SSSS ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ */
    MESA_FORMAT_Z16,             /*                     ZZZZ ZZZZ ZZZZ ZZZZ */
    MESA_FORMAT_Z32,             /* ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ */
    /*@}*/
@@ -209,6 +210,7 @@ extern const struct gl_texture_format _mesa_texformat_l8;
 extern const struct gl_texture_format _mesa_texformat_i8;
 extern const struct gl_texture_format _mesa_texformat_ci8;
 extern const struct gl_texture_format _mesa_texformat_z24_s8;
+extern const struct gl_texture_format _mesa_texformat_s8_z24;
 extern const struct gl_texture_format _mesa_texformat_z16;
 extern const struct gl_texture_format _mesa_texformat_z32;
 /*@}*/
diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c
index 17a3cfd5a4..1b9325c159 100644
--- a/src/mesa/state_tracker/st_format.c
+++ b/src/mesa/state_tracker/st_format.c
@@ -274,6 +274,8 @@ st_mesa_format_to_pipe_format(GLuint mesaFormat)
       return PIPE_FORMAT_Z32_UNORM;
    case MESA_FORMAT_Z24_S8:
       return PIPE_FORMAT_Z24S8_UNORM;
+   case MESA_FORMAT_S8_Z24:
+      return PIPE_FORMAT_S8Z24_UNORM;
    case MESA_FORMAT_YCBCR:
       return PIPE_FORMAT_YCBCR;
    case MESA_FORMAT_RGB_DXT1:
@@ -559,10 +561,10 @@ translate_gallium_format_to_mesa_format(enum pipe_format format)
       return &_mesa_texformat_z16;
    case PIPE_FORMAT_Z32_UNORM:
       return &_mesa_texformat_z32;
-   case PIPE_FORMAT_S8Z24_UNORM:
-      /* XXX fallthrough OK? */
    case PIPE_FORMAT_Z24S8_UNORM:
       return &_mesa_texformat_z24_s8;
+   case PIPE_FORMAT_S8Z24_UNORM:
+      return &_mesa_texformat_s8_z24;
    case PIPE_FORMAT_YCBCR:
       return &_mesa_texformat_ycbcr;
    case PIPE_FORMAT_YCBCR_REV:
-- 
cgit v1.2.3


From 2e3e5184176debb66bdd7f5f606cf95b7fee91bb Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date: Mon, 9 Jun 2008 16:29:57 +0200
Subject: mesa: Most of the functions of MESA_TEXTURE_S8_Z24 are now supported

---
 src/mesa/main/texformat.c     | 12 +++++-------
 src/mesa/main/texformat_tmp.h | 26 ++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 7 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c
index d479bf510e..17859a9fec 100644
--- a/src/mesa/main/texformat.c
+++ b/src/mesa/main/texformat.c
@@ -1229,17 +1229,10 @@ const struct gl_texture_format _mesa_texformat_s8_z24 = {
    NULL,				/* FetchTexel1D */
    NULL,				/* FetchTexel2D */
    NULL,				/* FetchTexel3D */
-#if 0
    fetch_texel_1d_f_s8_z24,		/* FetchTexel1Df */
    fetch_texel_2d_f_s8_z24,		/* FetchTexel2Df */
    fetch_texel_3d_f_s8_z24,		/* FetchTexel3Df */
    store_texel_s8_z24			/* StoreTexel */
-#else
-   fetch_texel_1d_f_z24_s8,		/* FetchTexel1Df */
-   fetch_texel_2d_f_z24_s8,		/* FetchTexel2Df */
-   fetch_texel_3d_f_z24_s8,		/* FetchTexel3Df */
-   store_texel_z24_s8			/* StoreTexel */
-#endif
 };
 
 const struct gl_texture_format _mesa_texformat_z16 = {
@@ -1675,6 +1668,11 @@ _mesa_format_to_type_and_comps(const struct gl_texture_format *format,
       *comps = 1; /* XXX OK? */
       return;
 
+   case MESA_FORMAT_S8_Z24:
+      *datatype = GL_UNSIGNED_INT;
+      *comps = 1; /* XXX OK? */
+      return;
+
    case MESA_FORMAT_Z16:
       *datatype = GL_UNSIGNED_SHORT;
       *comps = 1;
diff --git a/src/mesa/main/texformat_tmp.h b/src/mesa/main/texformat_tmp.h
index 99785da1a0..63939f4011 100644
--- a/src/mesa/main/texformat_tmp.h
+++ b/src/mesa/main/texformat_tmp.h
@@ -1363,6 +1363,32 @@ static void store_texel_z24_s8(struct gl_texture_image *texImage,
 #endif
 
 
+/* MESA_TEXFORMAT_S8_Z24 ***************************************************/
+
+static void FETCH(f_s8_z24)( const struct gl_texture_image *texImage,
+                             GLint i, GLint j, GLint k, GLfloat *texel )
+{
+   /* only return Z, not stencil data */
+   const GLuint *src = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
+   const GLfloat scale = 1.0F / (GLfloat) 0xffffff;
+   texel[0] = ((*src) & 0x00ffffff) * scale;
+   ASSERT(texImage->TexFormat->MesaFormat == MESA_FORMAT_S8_Z24);
+   ASSERT(texel[0] >= 0.0F);
+   ASSERT(texel[0] <= 1.0F);
+}
+
+#if DIM == 3
+static void store_texel_s8_z24(struct gl_texture_image *texImage,
+                               GLint i, GLint j, GLint k, const void *texel)
+{
+   /* only store Z, not stencil */
+   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
+   GLfloat depth = *((GLfloat *) texel);
+   GLuint zi = (GLuint) (depth * 0xffffff);
+   *dst = zi | (*dst & 0xff000000);
+}
+#endif
+
 
 #undef TEXEL_ADDR
 #undef DIM
-- 
cgit v1.2.3


From 4f15e3eefbd31b4fdcf90c2798d0cb41c893b049 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 9 Jun 2008 14:03:01 -0600
Subject: mesa: chmod a-x context.c

---
 src/mesa/main/context.c | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 src/mesa/main/context.c

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
old mode 100755
new mode 100644
-- 
cgit v1.2.3


From f26baad2e1e8cb3c24fa64cc31869ec7b27d71ff Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 9 Jun 2008 14:14:34 -0600
Subject: mesa: refactor: move glPixelStore function into new pixelstore.c file

---
 src/mesa/main/pixel.c      | 196 ---------------------------------------
 src/mesa/main/pixel.h      |   7 --
 src/mesa/main/pixelstore.c | 226 +++++++++++++++++++++++++++++++++++++++++++++
 src/mesa/main/pixelstore.h |  46 +++++++++
 src/mesa/main/sources      |   2 +
 src/mesa/main/state.c      |   1 +
 src/mesa/sources           |   1 +
 7 files changed, 276 insertions(+), 203 deletions(-)
 create mode 100644 src/mesa/main/pixelstore.c
 create mode 100644 src/mesa/main/pixelstore.h

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/pixel.c b/src/mesa/main/pixel.c
index 7eeae05dbd..1e2d31e172 100644
--- a/src/mesa/main/pixel.c
+++ b/src/mesa/main/pixel.c
@@ -36,8 +36,6 @@
 /*****                    glPixelZoom                             *****/
 /**********************************************************************/
 
-
-
 void GLAPIENTRY
 _mesa_PixelZoom( GLfloat xfactor, GLfloat yfactor )
 {
@@ -54,200 +52,6 @@ _mesa_PixelZoom( GLfloat xfactor, GLfloat yfactor )
 
 
 
-/**********************************************************************/
-/*****                    glPixelStore                            *****/
-/**********************************************************************/
-
-
-void GLAPIENTRY
-_mesa_PixelStorei( GLenum pname, GLint param )
-{
-   /* NOTE: this call can't be compiled into the display list */
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   switch (pname) {
-      case GL_PACK_SWAP_BYTES:
-	 if (param == (GLint)ctx->Pack.SwapBytes)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
-         ctx->Pack.SwapBytes = param ? GL_TRUE : GL_FALSE;
-	 break;
-      case GL_PACK_LSB_FIRST:
-	 if (param == (GLint)ctx->Pack.LsbFirst)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
-         ctx->Pack.LsbFirst = param ? GL_TRUE : GL_FALSE;
-	 break;
-      case GL_PACK_ROW_LENGTH:
-	 if (param<0) {
-	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
-	    return;
-	 }
-	 if (ctx->Pack.RowLength == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
-	 ctx->Pack.RowLength = param;
-	 break;
-      case GL_PACK_IMAGE_HEIGHT:
-         if (param<0) {
-            _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
-	    return;
-	 }
-	 if (ctx->Pack.ImageHeight == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
-	 ctx->Pack.ImageHeight = param;
-         break;
-      case GL_PACK_SKIP_PIXELS:
-	 if (param<0) {
-	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
-	    return;
-	 }
-	 if (ctx->Pack.SkipPixels == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
-	 ctx->Pack.SkipPixels = param;
-	 break;
-      case GL_PACK_SKIP_ROWS:
-	 if (param<0) {
-	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
-	    return;
-	 }
-	 if (ctx->Pack.SkipRows == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
-	 ctx->Pack.SkipRows = param;
-	 break;
-      case GL_PACK_SKIP_IMAGES:
-	 if (param<0) {
-	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
-	    return;
-	 }
-	 if (ctx->Pack.SkipImages == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
-	 ctx->Pack.SkipImages = param;
-	 break;
-      case GL_PACK_ALIGNMENT:
-         if (param!=1 && param!=2 && param!=4 && param!=8) {
-	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
-	    return;
-	 }
-	 if (ctx->Pack.Alignment == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
-	 ctx->Pack.Alignment = param;
-	 break;
-      case GL_PACK_INVERT_MESA:
-         if (!ctx->Extensions.MESA_pack_invert) {
-            _mesa_error( ctx, GL_INVALID_ENUM, "glPixelstore(pname)" );
-            return;
-         }
-         if (ctx->Pack.Invert == param)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
-         ctx->Pack.Invert = param;
-         break;
-
-      case GL_UNPACK_SWAP_BYTES:
-	 if (param == (GLint)ctx->Unpack.SwapBytes)
-	    return;
-	 if ((GLint)ctx->Unpack.SwapBytes == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
-	 ctx->Unpack.SwapBytes = param ? GL_TRUE : GL_FALSE;
-         break;
-      case GL_UNPACK_LSB_FIRST:
-	 if (param == (GLint)ctx->Unpack.LsbFirst)
-	    return;
-	 if ((GLint)ctx->Unpack.LsbFirst == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
-	 ctx->Unpack.LsbFirst = param ? GL_TRUE : GL_FALSE;
-	 break;
-      case GL_UNPACK_ROW_LENGTH:
-	 if (param<0) {
-	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
-	    return;
-	 }
-	 if (ctx->Unpack.RowLength == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
-	 ctx->Unpack.RowLength = param;
-	 break;
-      case GL_UNPACK_IMAGE_HEIGHT:
-         if (param<0) {
-            _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
-	    return;
-	 }
-	 if (ctx->Unpack.ImageHeight == param)
-	    return;
-
-	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
-	 ctx->Unpack.ImageHeight = param;
-         break;
-      case GL_UNPACK_SKIP_PIXELS:
-	 if (param<0) {
-	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
-	    return;
-	 }
-	 if (ctx->Unpack.SkipPixels == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
-	 ctx->Unpack.SkipPixels = param;
-	 break;
-      case GL_UNPACK_SKIP_ROWS:
-	 if (param<0) {
-	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
-	    return;
-	 }
-	 if (ctx->Unpack.SkipRows == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
-	 ctx->Unpack.SkipRows = param;
-	 break;
-      case GL_UNPACK_SKIP_IMAGES:
-	 if (param < 0) {
-	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
-	    return;
-	 }
-	 if (ctx->Unpack.SkipImages == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
-	 ctx->Unpack.SkipImages = param;
-	 break;
-      case GL_UNPACK_ALIGNMENT:
-         if (param!=1 && param!=2 && param!=4 && param!=8) {
-	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore" );
-	    return;
-	 }
-	 if (ctx->Unpack.Alignment == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
-	 ctx->Unpack.Alignment = param;
-	 break;
-      case GL_UNPACK_CLIENT_STORAGE_APPLE:
-         if (param == (GLint)ctx->Unpack.ClientStorage)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
-         ctx->Unpack.ClientStorage = param ? GL_TRUE : GL_FALSE;
-         break;
-      default:
-	 _mesa_error( ctx, GL_INVALID_ENUM, "glPixelStore" );
-	 return;
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_PixelStoref( GLenum pname, GLfloat param )
-{
-   _mesa_PixelStorei( pname, (GLint) param );
-}
-
-
-
 /**********************************************************************/
 /*****                         glPixelMap                         *****/
 /**********************************************************************/
diff --git a/src/mesa/main/pixel.h b/src/mesa/main/pixel.h
index 3ba5b6689a..05bddf5ccf 100644
--- a/src/mesa/main/pixel.h
+++ b/src/mesa/main/pixel.h
@@ -56,13 +56,6 @@ _mesa_PixelMapuiv(GLenum map, GLsizei mapsize, const GLuint *values );
 extern void GLAPIENTRY
 _mesa_PixelMapusv(GLenum map, GLsizei mapsize, const GLushort *values );
 
-extern void GLAPIENTRY
-_mesa_PixelStoref( GLenum pname, GLfloat param );
-
-
-extern void GLAPIENTRY
-_mesa_PixelStorei( GLenum pname, GLint param );
-
 extern void GLAPIENTRY
 _mesa_PixelTransferf( GLenum pname, GLfloat param );
 
diff --git a/src/mesa/main/pixelstore.c b/src/mesa/main/pixelstore.c
new file mode 100644
index 0000000000..f5f054f938
--- /dev/null
+++ b/src/mesa/main/pixelstore.c
@@ -0,0 +1,226 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.1
+ *
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/**
+ * \file pixelstore.c
+ * glPixelStore functions.
+ */
+
+
+#include "glheader.h"
+#include "bufferobj.h"
+#include "colormac.h"
+#include "context.h"
+#include "image.h"
+#include "macros.h"
+#include "pixelstore.h"
+#include "mtypes.h"
+
+
+void GLAPIENTRY
+_mesa_PixelStorei( GLenum pname, GLint param )
+{
+   /* NOTE: this call can't be compiled into the display list */
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   switch (pname) {
+      case GL_PACK_SWAP_BYTES:
+	 if (param == (GLint)ctx->Pack.SwapBytes)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
+         ctx->Pack.SwapBytes = param ? GL_TRUE : GL_FALSE;
+	 break;
+      case GL_PACK_LSB_FIRST:
+	 if (param == (GLint)ctx->Pack.LsbFirst)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
+         ctx->Pack.LsbFirst = param ? GL_TRUE : GL_FALSE;
+	 break;
+      case GL_PACK_ROW_LENGTH:
+	 if (param<0) {
+	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
+	    return;
+	 }
+	 if (ctx->Pack.RowLength == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
+	 ctx->Pack.RowLength = param;
+	 break;
+      case GL_PACK_IMAGE_HEIGHT:
+         if (param<0) {
+            _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
+	    return;
+	 }
+	 if (ctx->Pack.ImageHeight == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
+	 ctx->Pack.ImageHeight = param;
+         break;
+      case GL_PACK_SKIP_PIXELS:
+	 if (param<0) {
+	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
+	    return;
+	 }
+	 if (ctx->Pack.SkipPixels == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
+	 ctx->Pack.SkipPixels = param;
+	 break;
+      case GL_PACK_SKIP_ROWS:
+	 if (param<0) {
+	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
+	    return;
+	 }
+	 if (ctx->Pack.SkipRows == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
+	 ctx->Pack.SkipRows = param;
+	 break;
+      case GL_PACK_SKIP_IMAGES:
+	 if (param<0) {
+	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
+	    return;
+	 }
+	 if (ctx->Pack.SkipImages == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
+	 ctx->Pack.SkipImages = param;
+	 break;
+      case GL_PACK_ALIGNMENT:
+         if (param!=1 && param!=2 && param!=4 && param!=8) {
+	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
+	    return;
+	 }
+	 if (ctx->Pack.Alignment == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
+	 ctx->Pack.Alignment = param;
+	 break;
+      case GL_PACK_INVERT_MESA:
+         if (!ctx->Extensions.MESA_pack_invert) {
+            _mesa_error( ctx, GL_INVALID_ENUM, "glPixelstore(pname)" );
+            return;
+         }
+         if (ctx->Pack.Invert == param)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
+         ctx->Pack.Invert = param;
+         break;
+
+      case GL_UNPACK_SWAP_BYTES:
+	 if (param == (GLint)ctx->Unpack.SwapBytes)
+	    return;
+	 if ((GLint)ctx->Unpack.SwapBytes == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
+	 ctx->Unpack.SwapBytes = param ? GL_TRUE : GL_FALSE;
+         break;
+      case GL_UNPACK_LSB_FIRST:
+	 if (param == (GLint)ctx->Unpack.LsbFirst)
+	    return;
+	 if ((GLint)ctx->Unpack.LsbFirst == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
+	 ctx->Unpack.LsbFirst = param ? GL_TRUE : GL_FALSE;
+	 break;
+      case GL_UNPACK_ROW_LENGTH:
+	 if (param<0) {
+	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
+	    return;
+	 }
+	 if (ctx->Unpack.RowLength == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
+	 ctx->Unpack.RowLength = param;
+	 break;
+      case GL_UNPACK_IMAGE_HEIGHT:
+         if (param<0) {
+            _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
+	    return;
+	 }
+	 if (ctx->Unpack.ImageHeight == param)
+	    return;
+
+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
+	 ctx->Unpack.ImageHeight = param;
+         break;
+      case GL_UNPACK_SKIP_PIXELS:
+	 if (param<0) {
+	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
+	    return;
+	 }
+	 if (ctx->Unpack.SkipPixels == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
+	 ctx->Unpack.SkipPixels = param;
+	 break;
+      case GL_UNPACK_SKIP_ROWS:
+	 if (param<0) {
+	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
+	    return;
+	 }
+	 if (ctx->Unpack.SkipRows == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
+	 ctx->Unpack.SkipRows = param;
+	 break;
+      case GL_UNPACK_SKIP_IMAGES:
+	 if (param < 0) {
+	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
+	    return;
+	 }
+	 if (ctx->Unpack.SkipImages == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
+	 ctx->Unpack.SkipImages = param;
+	 break;
+      case GL_UNPACK_ALIGNMENT:
+         if (param!=1 && param!=2 && param!=4 && param!=8) {
+	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore" );
+	    return;
+	 }
+	 if (ctx->Unpack.Alignment == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
+	 ctx->Unpack.Alignment = param;
+	 break;
+      case GL_UNPACK_CLIENT_STORAGE_APPLE:
+         if (param == (GLint)ctx->Unpack.ClientStorage)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
+         ctx->Unpack.ClientStorage = param ? GL_TRUE : GL_FALSE;
+         break;
+      default:
+	 _mesa_error( ctx, GL_INVALID_ENUM, "glPixelStore" );
+	 return;
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_PixelStoref( GLenum pname, GLfloat param )
+{
+   _mesa_PixelStorei( pname, (GLint) param );
+}
diff --git a/src/mesa/main/pixelstore.h b/src/mesa/main/pixelstore.h
new file mode 100644
index 0000000000..c42f304030
--- /dev/null
+++ b/src/mesa/main/pixelstore.h
@@ -0,0 +1,46 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.1
+ *
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/**
+ * \file pixelstore.h
+ * glPixelStore functions.
+ */
+
+
+#ifndef PIXELSTORE_H
+#define PIXELSTORE_H
+
+
+#include "glheader.h"
+
+
+extern void GLAPIENTRY
+_mesa_PixelStorei( GLenum pname, GLint param );
+
+
+extern void GLAPIENTRY
+_mesa_PixelStoref( GLenum pname, GLfloat param );
+
+
+#endif
diff --git a/src/mesa/main/sources b/src/mesa/main/sources
index dfcff89e4b..ac809b22d2 100644
--- a/src/mesa/main/sources
+++ b/src/mesa/main/sources
@@ -42,6 +42,7 @@ mipmap.c \
 mm.c \
 occlude.c \
 pixel.c \
+pixelstore.c \
 points.c \
 polygon.c \
 rastpos.c \
@@ -115,6 +116,7 @@ mm.h \
 mtypes.h \
 occlude.h \
 pixel.h \
+pixelstore.h \
 points.h \
 polygon.h \
 rastpos.h \
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 7e8f964bb1..13a079a2dc 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -72,6 +72,7 @@
 #include "macros.h"
 #include "matrix.h"
 #include "pixel.h"
+#include "pixelstore.h"
 #include "points.h"
 #include "polygon.h"
 #if FEATURE_ARB_occlusion_query || FEATURE_EXT_timer_query
diff --git a/src/mesa/sources b/src/mesa/sources
index ac0b1c1950..6a1d55f1fe 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -43,6 +43,7 @@ MAIN_SOURCES = \
 	main/mipmap.c \
 	main/mm.c \
 	main/pixel.c \
+	main/pixelstore.c \
 	main/points.c \
 	main/polygon.c \
 	main/queryobj.c \
-- 
cgit v1.2.3


From d960a0621d65ae9977efe9bbb51dce9e1571b114 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 9 Jun 2008 14:22:15 -0600
Subject: mesa: refactor: move glReadPixels code into new readpix.c file

---
 src/mesa/main/drawpix.c | 163 +----------------------------------------
 src/mesa/main/drawpix.h |  12 +--
 src/mesa/main/readpix.c | 191 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/mesa/main/readpix.h |  42 +++++++++++
 src/mesa/main/sources   |   2 +
 src/mesa/main/state.c   |   5 +-
 src/mesa/sources        |   1 +
 7 files changed, 244 insertions(+), 172 deletions(-)
 create mode 100644 src/mesa/main/readpix.c
 create mode 100644 src/mesa/main/readpix.h

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index 016ddd0a81..6db198ea3b 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -30,114 +30,10 @@
 #include "feedback.h"
 #include "framebuffer.h"
 #include "image.h"
+#include "readpix.h"
 #include "state.h"
 
 
-/**
- * Do error checking of the format/type parameters to glReadPixels and
- * glDrawPixels.
- * \param drawing if GL_TRUE do checking for DrawPixels, else do checking
- *                for ReadPixels.
- * \return GL_TRUE if error detected, GL_FALSE if no errors
- */
-static GLboolean
-error_check_format_type(GLcontext *ctx, GLenum format, GLenum type,
-                        GLboolean drawing)
-{
-   const char *readDraw = drawing ? "Draw" : "Read";
-
-   if (ctx->Extensions.EXT_packed_depth_stencil
-       && type == GL_UNSIGNED_INT_24_8_EXT
-       && format != GL_DEPTH_STENCIL_EXT) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "gl%sPixels(format is not GL_DEPTH_STENCIL_EXT)", readDraw);
-      return GL_TRUE;
-   }
-
-   /* basic combinations test */
-   if (!_mesa_is_legal_format_and_type(ctx, format, type)) {
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "gl%sPixels(format or type)", readDraw);
-      return GL_TRUE;
-   }
-
-   /* additional checks */
-   switch (format) {
-   case GL_RED:
-   case GL_GREEN:
-   case GL_BLUE:
-   case GL_ALPHA:
-   case GL_LUMINANCE:
-   case GL_LUMINANCE_ALPHA:
-   case GL_RGB:
-   case GL_BGR:
-   case GL_RGBA:
-   case GL_BGRA:
-   case GL_ABGR_EXT:
-      if (drawing && !ctx->Visual.rgbMode) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                   "glDrawPixels(drawing RGB pixels into color index buffer)");
-         return GL_TRUE;
-      }
-      if (!drawing && !_mesa_dest_buffer_exists(ctx, GL_COLOR)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glReadPixels(no color buffer)");
-         return GL_TRUE;
-      }
-      break;
-   case GL_COLOR_INDEX:
-      if (!drawing && ctx->Visual.rgbMode) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                    "glReadPixels(reading color index format from RGB buffer)");
-         return GL_TRUE;
-      }
-      if (!drawing && !_mesa_dest_buffer_exists(ctx, GL_COLOR)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glReadPixels(no color buffer)");
-         return GL_TRUE;
-      }
-      break;
-   case GL_STENCIL_INDEX:
-      if ((drawing && !_mesa_dest_buffer_exists(ctx, format)) ||
-          (!drawing && !_mesa_source_buffer_exists(ctx, format))) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "gl%sPixels(no stencil buffer)", readDraw);
-         return GL_TRUE;
-      }
-      break;
-   case GL_DEPTH_COMPONENT:
-      if ((drawing && !_mesa_dest_buffer_exists(ctx, format)) ||
-          (!drawing && !_mesa_source_buffer_exists(ctx, format))) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "gl%sPixels(no depth buffer)", readDraw);
-         return GL_TRUE;
-      }
-      break;
-   case GL_DEPTH_STENCIL_EXT:
-      if (!ctx->Extensions.EXT_packed_depth_stencil ||
-          type != GL_UNSIGNED_INT_24_8_EXT) {
-         _mesa_error(ctx, GL_INVALID_ENUM, "gl%sPixels(type)", readDraw);
-         return GL_TRUE;
-      }
-      if ((drawing && !_mesa_dest_buffer_exists(ctx, format)) ||
-          (!drawing && !_mesa_source_buffer_exists(ctx, format))) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "gl%sPixels(no depth or stencil buffer)", readDraw);
-         return GL_TRUE;
-      }
-      break;
-   default:
-      /* this should have been caught in _mesa_is_legal_format_type() */
-      _mesa_problem(ctx, "unexpected format in _mesa_%sPixels", readDraw);
-      return GL_TRUE;
-   }
-
-   /* no errors */
-   return GL_FALSE;
-}
-      
-
-
 #if _HAVE_FULL_GL
 
 /*
@@ -165,7 +61,7 @@ _mesa_DrawPixels( GLsizei width, GLsizei height,
       return;
    }
 
-   if (error_check_format_type(ctx, format, type, GL_TRUE)) {
+   if (_mesa_error_check_format_type(ctx, format, type, GL_TRUE)) {
       /* found an error */
       return;
    }
@@ -287,61 +183,6 @@ _mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height,
 
 
 
-void GLAPIENTRY
-_mesa_ReadPixels( GLint x, GLint y, GLsizei width, GLsizei height,
-		  GLenum format, GLenum type, GLvoid *pixels )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   FLUSH_CURRENT(ctx, 0);
-
-   if (width < 0 || height < 0) {
-      _mesa_error( ctx, GL_INVALID_VALUE,
-                   "glReadPixels(width=%d height=%d)", width, height );
-      return;
-   }
-
-   if (ctx->NewState)
-      _mesa_update_state(ctx);
-
-   if (error_check_format_type(ctx, format, type, GL_FALSE)) {
-      /* found an error */
-      return;
-   }
-
-   if (ctx->ReadBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
-      _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,
-                  "glReadPixels(incomplete framebuffer)" );
-      return;
-   }
-
-   if (!_mesa_source_buffer_exists(ctx, format)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glReadPixels(no readbuffer)");
-      return;
-   }
-
-   if (ctx->Pack.BufferObj->Name) {
-      if (!_mesa_validate_pbo_access(2, &ctx->Pack, width, height, 1,
-                                     format, type, pixels)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glReadPixels(invalid PBO access)");
-         return;
-      }
-
-      if (ctx->Pack.BufferObj->Pointer) {
-         /* buffer is mapped - that's an error */
-         _mesa_error(ctx, GL_INVALID_OPERATION, "glReadPixels(PBO is mapped)");
-         return;
-      }
-   }
-
-   ctx->Driver.ReadPixels(ctx, x, y, width, height,
-			  format, type, &ctx->Pack, pixels);
-}
-
-
-
 void GLAPIENTRY
 _mesa_Bitmap( GLsizei width, GLsizei height,
               GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove,
diff --git a/src/mesa/main/drawpix.h b/src/mesa/main/drawpix.h
index 2a2d7de8d8..6177adad6d 100644
--- a/src/mesa/main/drawpix.h
+++ b/src/mesa/main/drawpix.h
@@ -1,9 +1,8 @@
-
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  7.1
  *
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -28,7 +27,7 @@
 #define DRAWPIXELS_H
 
 
-#include "mtypes.h"
+#include "main/glheader.h"
 
 
 extern void GLAPIENTRY
@@ -36,11 +35,6 @@ _mesa_DrawPixels( GLsizei width, GLsizei height,
                   GLenum format, GLenum type, const GLvoid *pixels );
 
 
-extern void GLAPIENTRY
-_mesa_ReadPixels( GLint x, GLint y, GLsizei width, GLsizei height,
-                  GLenum format, GLenum type, GLvoid *pixels );
-
-
 extern void GLAPIENTRY
 _mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height,
                   GLenum type );
diff --git a/src/mesa/main/readpix.c b/src/mesa/main/readpix.c
new file mode 100644
index 0000000000..dc22808e5b
--- /dev/null
+++ b/src/mesa/main/readpix.c
@@ -0,0 +1,191 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.1
+ *
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include "glheader.h"
+#include "imports.h"
+#include "bufferobj.h"
+#include "context.h"
+#include "readpix.h"
+#include "framebuffer.h"
+#include "image.h"
+#include "state.h"
+
+
+/**
+ * Do error checking of the format/type parameters to glReadPixels and
+ * glDrawPixels.
+ * \param drawing if GL_TRUE do checking for DrawPixels, else do checking
+ *                for ReadPixels.
+ * \return GL_TRUE if error detected, GL_FALSE if no errors
+ */
+GLboolean
+_mesa_error_check_format_type(GLcontext *ctx, GLenum format, GLenum type,
+                              GLboolean drawing)
+{
+   const char *readDraw = drawing ? "Draw" : "Read";
+
+   if (ctx->Extensions.EXT_packed_depth_stencil
+       && type == GL_UNSIGNED_INT_24_8_EXT
+       && format != GL_DEPTH_STENCIL_EXT) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "gl%sPixels(format is not GL_DEPTH_STENCIL_EXT)", readDraw);
+      return GL_TRUE;
+   }
+
+   /* basic combinations test */
+   if (!_mesa_is_legal_format_and_type(ctx, format, type)) {
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "gl%sPixels(format or type)", readDraw);
+      return GL_TRUE;
+   }
+
+   /* additional checks */
+   switch (format) {
+   case GL_RED:
+   case GL_GREEN:
+   case GL_BLUE:
+   case GL_ALPHA:
+   case GL_LUMINANCE:
+   case GL_LUMINANCE_ALPHA:
+   case GL_RGB:
+   case GL_BGR:
+   case GL_RGBA:
+   case GL_BGRA:
+   case GL_ABGR_EXT:
+      if (drawing && !ctx->Visual.rgbMode) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                   "glDrawPixels(drawing RGB pixels into color index buffer)");
+         return GL_TRUE;
+      }
+      if (!drawing && !_mesa_dest_buffer_exists(ctx, GL_COLOR)) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glReadPixels(no color buffer)");
+         return GL_TRUE;
+      }
+      break;
+   case GL_COLOR_INDEX:
+      if (!drawing && ctx->Visual.rgbMode) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                    "glReadPixels(reading color index format from RGB buffer)");
+         return GL_TRUE;
+      }
+      if (!drawing && !_mesa_dest_buffer_exists(ctx, GL_COLOR)) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glReadPixels(no color buffer)");
+         return GL_TRUE;
+      }
+      break;
+   case GL_STENCIL_INDEX:
+      if ((drawing && !_mesa_dest_buffer_exists(ctx, format)) ||
+          (!drawing && !_mesa_source_buffer_exists(ctx, format))) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "gl%sPixels(no stencil buffer)", readDraw);
+         return GL_TRUE;
+      }
+      break;
+   case GL_DEPTH_COMPONENT:
+      if ((drawing && !_mesa_dest_buffer_exists(ctx, format)) ||
+          (!drawing && !_mesa_source_buffer_exists(ctx, format))) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "gl%sPixels(no depth buffer)", readDraw);
+         return GL_TRUE;
+      }
+      break;
+   case GL_DEPTH_STENCIL_EXT:
+      if (!ctx->Extensions.EXT_packed_depth_stencil ||
+          type != GL_UNSIGNED_INT_24_8_EXT) {
+         _mesa_error(ctx, GL_INVALID_ENUM, "gl%sPixels(type)", readDraw);
+         return GL_TRUE;
+      }
+      if ((drawing && !_mesa_dest_buffer_exists(ctx, format)) ||
+          (!drawing && !_mesa_source_buffer_exists(ctx, format))) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "gl%sPixels(no depth or stencil buffer)", readDraw);
+         return GL_TRUE;
+      }
+      break;
+   default:
+      /* this should have been caught in _mesa_is_legal_format_type() */
+      _mesa_problem(ctx, "unexpected format in _mesa_%sPixels", readDraw);
+      return GL_TRUE;
+   }
+
+   /* no errors */
+   return GL_FALSE;
+}
+      
+
+
+void GLAPIENTRY
+_mesa_ReadPixels( GLint x, GLint y, GLsizei width, GLsizei height,
+		  GLenum format, GLenum type, GLvoid *pixels )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   FLUSH_CURRENT(ctx, 0);
+
+   if (width < 0 || height < 0) {
+      _mesa_error( ctx, GL_INVALID_VALUE,
+                   "glReadPixels(width=%d height=%d)", width, height );
+      return;
+   }
+
+   if (ctx->NewState)
+      _mesa_update_state(ctx);
+
+   if (_mesa_error_check_format_type(ctx, format, type, GL_FALSE)) {
+      /* found an error */
+      return;
+   }
+
+   if (ctx->ReadBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
+      _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,
+                  "glReadPixels(incomplete framebuffer)" );
+      return;
+   }
+
+   if (!_mesa_source_buffer_exists(ctx, format)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glReadPixels(no readbuffer)");
+      return;
+   }
+
+   if (ctx->Pack.BufferObj->Name) {
+      if (!_mesa_validate_pbo_access(2, &ctx->Pack, width, height, 1,
+                                     format, type, pixels)) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glReadPixels(invalid PBO access)");
+         return;
+      }
+
+      if (ctx->Pack.BufferObj->Pointer) {
+         /* buffer is mapped - that's an error */
+         _mesa_error(ctx, GL_INVALID_OPERATION, "glReadPixels(PBO is mapped)");
+         return;
+      }
+   }
+
+   ctx->Driver.ReadPixels(ctx, x, y, width, height,
+			  format, type, &ctx->Pack, pixels);
+}
diff --git a/src/mesa/main/readpix.h b/src/mesa/main/readpix.h
new file mode 100644
index 0000000000..1bf02fb8e4
--- /dev/null
+++ b/src/mesa/main/readpix.h
@@ -0,0 +1,42 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.1
+ *
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef READPIXELS_H
+#define READPIXELS_H
+
+
+#include "main/mtypes.h"
+
+
+extern GLboolean
+_mesa_error_check_format_type(GLcontext *ctx, GLenum format, GLenum type,
+                              GLboolean drawing);
+
+extern void GLAPIENTRY
+_mesa_ReadPixels( GLint x, GLint y, GLsizei width, GLsizei height,
+                  GLenum format, GLenum type, GLvoid *pixels );
+
+
+#endif
diff --git a/src/mesa/main/sources b/src/mesa/main/sources
index ac809b22d2..8ef5bd62fa 100644
--- a/src/mesa/main/sources
+++ b/src/mesa/main/sources
@@ -45,6 +45,7 @@ pixel.c \
 pixelstore.c \
 points.c \
 polygon.c \
+readpix.c \
 rastpos.c \
 rbadaptors.c \
 renderbuffer.c \
@@ -121,6 +122,7 @@ points.h \
 polygon.h \
 rastpos.h \
 rbadaptors.h \
+readpix.h \
 renderbuffer.h \
 simple_list.h \
 state.h \
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 13a079a2dc..64f911e699 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.5.1
+ * Version:  7.1
  *
- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -79,6 +79,7 @@
 #include "queryobj.h"
 #endif
 #include "rastpos.h"
+#include "readpix.h"
 #include "state.h"
 #include "stencil.h"
 #include "teximage.h"
diff --git a/src/mesa/sources b/src/mesa/sources
index 6a1d55f1fe..c94f260121 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -49,6 +49,7 @@ MAIN_SOURCES = \
 	main/queryobj.c \
 	main/rastpos.c \
 	main/rbadaptors.c \
+	main/readpix.c \
 	main/renderbuffer.c \
 	main/shaders.c \
 	main/state.c \
-- 
cgit v1.2.3


From 5f91007f996d0b7e3233f221a6b0056203e356d2 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 9 Jun 2008 14:25:23 -0600
Subject: mesa: refactor: new _mesa_init_pixelstore() function

---
 src/mesa/main/context.c    |  2 ++
 src/mesa/main/pixel.c      | 28 ----------------------------
 src/mesa/main/pixelstore.c | 37 +++++++++++++++++++++++++++++++++++++
 src/mesa/main/pixelstore.h |  4 ++++
 4 files changed, 43 insertions(+), 28 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 0053180000..522420592c 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -105,6 +105,7 @@
 #include "macros.h"
 #include "matrix.h"
 #include "pixel.h"
+#include "pixelstore.h"
 #include "points.h"
 #include "polygon.h"
 #include "queryobj.h"
@@ -969,6 +970,7 @@ init_attrib_groups(GLcontext *ctx)
    _mesa_init_matrix( ctx );
    _mesa_init_multisample( ctx );
    _mesa_init_pixel( ctx );
+   _mesa_init_pixelstore( ctx );
    _mesa_init_point( ctx );
    _mesa_init_polygon( ctx );
    _mesa_init_program( ctx );
diff --git a/src/mesa/main/pixel.c b/src/mesa/main/pixel.c
index 1e2d31e172..f14b225c1d 100644
--- a/src/mesa/main/pixel.c
+++ b/src/mesa/main/pixel.c
@@ -1321,34 +1321,6 @@ _mesa_init_pixel( GLcontext *ctx )
    ASSIGN_4V(ctx->Pixel.TextureColorTableScale, 1.0, 1.0, 1.0, 1.0);
    ASSIGN_4V(ctx->Pixel.TextureColorTableBias, 0.0, 0.0, 0.0, 0.0);
 
-   /* Pixel transfer */
-   ctx->Pack.Alignment = 4;
-   ctx->Pack.RowLength = 0;
-   ctx->Pack.ImageHeight = 0;
-   ctx->Pack.SkipPixels = 0;
-   ctx->Pack.SkipRows = 0;
-   ctx->Pack.SkipImages = 0;
-   ctx->Pack.SwapBytes = GL_FALSE;
-   ctx->Pack.LsbFirst = GL_FALSE;
-   ctx->Pack.ClientStorage = GL_FALSE;
-   ctx->Pack.Invert = GL_FALSE;
-#if FEATURE_EXT_pixel_buffer_object
-   ctx->Pack.BufferObj = ctx->Array.NullBufferObj;
-#endif
-   ctx->Unpack.Alignment = 4;
-   ctx->Unpack.RowLength = 0;
-   ctx->Unpack.ImageHeight = 0;
-   ctx->Unpack.SkipPixels = 0;
-   ctx->Unpack.SkipRows = 0;
-   ctx->Unpack.SkipImages = 0;
-   ctx->Unpack.SwapBytes = GL_FALSE;
-   ctx->Unpack.LsbFirst = GL_FALSE;
-   ctx->Unpack.ClientStorage = GL_FALSE;
-   ctx->Unpack.Invert = GL_FALSE;
-#if FEATURE_EXT_pixel_buffer_object
-   ctx->Unpack.BufferObj = ctx->Array.NullBufferObj;
-#endif
-
    /*
     * _mesa_unpack_image() returns image data in this format.  When we
     * execute image commands (glDrawPixels(), glTexImage(), etc) from
diff --git a/src/mesa/main/pixelstore.c b/src/mesa/main/pixelstore.c
index f5f054f938..3bf89bd3e1 100644
--- a/src/mesa/main/pixelstore.c
+++ b/src/mesa/main/pixelstore.c
@@ -224,3 +224,40 @@ _mesa_PixelStoref( GLenum pname, GLfloat param )
 {
    _mesa_PixelStorei( pname, (GLint) param );
 }
+
+
+
+/**
+ * Initialize the context's pixel store state.
+ */
+void
+_mesa_init_pixelstore( GLcontext *ctx )
+{
+   /* Pixel transfer */
+   ctx->Pack.Alignment = 4;
+   ctx->Pack.RowLength = 0;
+   ctx->Pack.ImageHeight = 0;
+   ctx->Pack.SkipPixels = 0;
+   ctx->Pack.SkipRows = 0;
+   ctx->Pack.SkipImages = 0;
+   ctx->Pack.SwapBytes = GL_FALSE;
+   ctx->Pack.LsbFirst = GL_FALSE;
+   ctx->Pack.ClientStorage = GL_FALSE;
+   ctx->Pack.Invert = GL_FALSE;
+#if FEATURE_EXT_pixel_buffer_object
+   ctx->Pack.BufferObj = ctx->Array.NullBufferObj;
+#endif
+   ctx->Unpack.Alignment = 4;
+   ctx->Unpack.RowLength = 0;
+   ctx->Unpack.ImageHeight = 0;
+   ctx->Unpack.SkipPixels = 0;
+   ctx->Unpack.SkipRows = 0;
+   ctx->Unpack.SkipImages = 0;
+   ctx->Unpack.SwapBytes = GL_FALSE;
+   ctx->Unpack.LsbFirst = GL_FALSE;
+   ctx->Unpack.ClientStorage = GL_FALSE;
+   ctx->Unpack.Invert = GL_FALSE;
+#if FEATURE_EXT_pixel_buffer_object
+   ctx->Unpack.BufferObj = ctx->Array.NullBufferObj;
+#endif
+}
diff --git a/src/mesa/main/pixelstore.h b/src/mesa/main/pixelstore.h
index c42f304030..ee963f9ba3 100644
--- a/src/mesa/main/pixelstore.h
+++ b/src/mesa/main/pixelstore.h
@@ -43,4 +43,8 @@ extern void GLAPIENTRY
 _mesa_PixelStoref( GLenum pname, GLfloat param );
 
 
+extern void
+_mesa_init_pixelstore( GLcontext *ctx );
+
+
 #endif
-- 
cgit v1.2.3


From 74c82ebbb399a274dcfb5e82d3471dee59bd5183 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 9 Jun 2008 14:32:27 -0600
Subject: mesa: refactor: move pixel map/scale/bias code into image.c

pixel.c is just the API-related code now.
---
 src/mesa/main/image.c          | 422 ++++++++++++++++++++++++++++++++++++++-
 src/mesa/main/image.h          |  47 ++++-
 src/mesa/main/pixel.c          | 433 ++---------------------------------------
 src/mesa/main/pixel.h          |  60 +-----
 src/mesa/swrast/s_texcombine.c |   2 +-
 5 files changed, 487 insertions(+), 477 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index 285c8346a5..63bcc48e68 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -2,7 +2,7 @@
  * Mesa 3-D graphics library
  * Version:  7.1
  *
- * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -1011,6 +1011,426 @@ _mesa_pack_bitmap( GLint width, GLint height, const GLubyte *source,
 }
 
 
+/**********************************************************************/
+/*****                  Pixel processing functions               ******/
+/**********************************************************************/
+
+/*
+ * Apply scale and bias factors to an array of RGBA pixels.
+ */
+void
+_mesa_scale_and_bias_rgba(GLuint n, GLfloat rgba[][4],
+                          GLfloat rScale, GLfloat gScale,
+                          GLfloat bScale, GLfloat aScale,
+                          GLfloat rBias, GLfloat gBias,
+                          GLfloat bBias, GLfloat aBias)
+{
+   if (rScale != 1.0 || rBias != 0.0) {
+      GLuint i;
+      for (i = 0; i < n; i++) {
+         rgba[i][RCOMP] = rgba[i][RCOMP] * rScale + rBias;
+      }
+   }
+   if (gScale != 1.0 || gBias != 0.0) {
+      GLuint i;
+      for (i = 0; i < n; i++) {
+         rgba[i][GCOMP] = rgba[i][GCOMP] * gScale + gBias;
+      }
+   }
+   if (bScale != 1.0 || bBias != 0.0) {
+      GLuint i;
+      for (i = 0; i < n; i++) {
+         rgba[i][BCOMP] = rgba[i][BCOMP] * bScale + bBias;
+      }
+   }
+   if (aScale != 1.0 || aBias != 0.0) {
+      GLuint i;
+      for (i = 0; i < n; i++) {
+         rgba[i][ACOMP] = rgba[i][ACOMP] * aScale + aBias;
+      }
+   }
+}
+
+
+/*
+ * Apply pixel mapping to an array of floating point RGBA pixels.
+ */
+void
+_mesa_map_rgba( const GLcontext *ctx, GLuint n, GLfloat rgba[][4] )
+{
+   const GLfloat rscale = (GLfloat) (ctx->PixelMaps.RtoR.Size - 1);
+   const GLfloat gscale = (GLfloat) (ctx->PixelMaps.GtoG.Size - 1);
+   const GLfloat bscale = (GLfloat) (ctx->PixelMaps.BtoB.Size - 1);
+   const GLfloat ascale = (GLfloat) (ctx->PixelMaps.AtoA.Size - 1);
+   const GLfloat *rMap = ctx->PixelMaps.RtoR.Map;
+   const GLfloat *gMap = ctx->PixelMaps.GtoG.Map;
+   const GLfloat *bMap = ctx->PixelMaps.BtoB.Map;
+   const GLfloat *aMap = ctx->PixelMaps.AtoA.Map;
+   GLuint i;
+   for (i=0;i<n;i++) {
+      GLfloat r = CLAMP(rgba[i][RCOMP], 0.0F, 1.0F);
+      GLfloat g = CLAMP(rgba[i][GCOMP], 0.0F, 1.0F);
+      GLfloat b = CLAMP(rgba[i][BCOMP], 0.0F, 1.0F);
+      GLfloat a = CLAMP(rgba[i][ACOMP], 0.0F, 1.0F);
+      rgba[i][RCOMP] = rMap[IROUND(r * rscale)];
+      rgba[i][GCOMP] = gMap[IROUND(g * gscale)];
+      rgba[i][BCOMP] = bMap[IROUND(b * bscale)];
+      rgba[i][ACOMP] = aMap[IROUND(a * ascale)];
+   }
+}
+
+
+/*
+ * Apply the color matrix and post color matrix scaling and biasing.
+ */
+void
+_mesa_transform_rgba(const GLcontext *ctx, GLuint n, GLfloat rgba[][4])
+{
+   const GLfloat rs = ctx->Pixel.PostColorMatrixScale[0];
+   const GLfloat rb = ctx->Pixel.PostColorMatrixBias[0];
+   const GLfloat gs = ctx->Pixel.PostColorMatrixScale[1];
+   const GLfloat gb = ctx->Pixel.PostColorMatrixBias[1];
+   const GLfloat bs = ctx->Pixel.PostColorMatrixScale[2];
+   const GLfloat bb = ctx->Pixel.PostColorMatrixBias[2];
+   const GLfloat as = ctx->Pixel.PostColorMatrixScale[3];
+   const GLfloat ab = ctx->Pixel.PostColorMatrixBias[3];
+   const GLfloat *m = ctx->ColorMatrixStack.Top->m;
+   GLuint i;
+   for (i = 0; i < n; i++) {
+      const GLfloat r = rgba[i][RCOMP];
+      const GLfloat g = rgba[i][GCOMP];
+      const GLfloat b = rgba[i][BCOMP];
+      const GLfloat a = rgba[i][ACOMP];
+      rgba[i][RCOMP] = (m[0] * r + m[4] * g + m[ 8] * b + m[12] * a) * rs + rb;
+      rgba[i][GCOMP] = (m[1] * r + m[5] * g + m[ 9] * b + m[13] * a) * gs + gb;
+      rgba[i][BCOMP] = (m[2] * r + m[6] * g + m[10] * b + m[14] * a) * bs + bb;
+      rgba[i][ACOMP] = (m[3] * r + m[7] * g + m[11] * b + m[15] * a) * as + ab;
+   }
+}
+
+
+/**
+ * Apply a color table lookup to an array of floating point RGBA colors.
+ */
+void
+_mesa_lookup_rgba_float(const struct gl_color_table *table,
+                        GLuint n, GLfloat rgba[][4])
+{
+   const GLint max = table->Size - 1;
+   const GLfloat scale = (GLfloat) max;
+   const GLfloat *lut = table->TableF;
+   GLuint i;
+
+   if (!table->TableF || table->Size == 0)
+      return;
+
+   switch (table->_BaseFormat) {
+      case GL_INTENSITY:
+         /* replace RGBA with I */
+         for (i = 0; i < n; i++) {
+            GLint j = IROUND(rgba[i][RCOMP] * scale);
+            GLfloat c = lut[CLAMP(j, 0, max)];
+            rgba[i][RCOMP] =
+            rgba[i][GCOMP] =
+            rgba[i][BCOMP] =
+            rgba[i][ACOMP] = c;
+         }
+         break;
+      case GL_LUMINANCE:
+         /* replace RGB with L */
+         for (i = 0; i < n; i++) {
+            GLint j = IROUND(rgba[i][RCOMP] * scale);
+            GLfloat c = lut[CLAMP(j, 0, max)];
+            rgba[i][RCOMP] =
+            rgba[i][GCOMP] =
+            rgba[i][BCOMP] = c;
+         }
+         break;
+      case GL_ALPHA:
+         /* replace A with A */
+         for (i = 0; i < n; i++) {
+            GLint j = IROUND(rgba[i][ACOMP] * scale);
+            rgba[i][ACOMP] = lut[CLAMP(j, 0, max)];
+         }
+         break;
+      case GL_LUMINANCE_ALPHA:
+         /* replace RGBA with LLLA */
+         for (i = 0; i < n; i++) {
+            GLint jL = IROUND(rgba[i][RCOMP] * scale);
+            GLint jA = IROUND(rgba[i][ACOMP] * scale);
+            GLfloat luminance, alpha;
+            jL = CLAMP(jL, 0, max);
+            jA = CLAMP(jA, 0, max);
+            luminance = lut[jL * 2 + 0];
+            alpha     = lut[jA * 2 + 1];
+            rgba[i][RCOMP] =
+            rgba[i][GCOMP] =
+            rgba[i][BCOMP] = luminance;
+            rgba[i][ACOMP] = alpha;;
+         }
+         break;
+      case GL_RGB:
+         /* replace RGB with RGB */
+         for (i = 0; i < n; i++) {
+            GLint jR = IROUND(rgba[i][RCOMP] * scale);
+            GLint jG = IROUND(rgba[i][GCOMP] * scale);
+            GLint jB = IROUND(rgba[i][BCOMP] * scale);
+            jR = CLAMP(jR, 0, max);
+            jG = CLAMP(jG, 0, max);
+            jB = CLAMP(jB, 0, max);
+            rgba[i][RCOMP] = lut[jR * 3 + 0];
+            rgba[i][GCOMP] = lut[jG * 3 + 1];
+            rgba[i][BCOMP] = lut[jB * 3 + 2];
+         }
+         break;
+      case GL_RGBA:
+         /* replace RGBA with RGBA */
+         for (i = 0; i < n; i++) {
+            GLint jR = IROUND(rgba[i][RCOMP] * scale);
+            GLint jG = IROUND(rgba[i][GCOMP] * scale);
+            GLint jB = IROUND(rgba[i][BCOMP] * scale);
+            GLint jA = IROUND(rgba[i][ACOMP] * scale);
+            jR = CLAMP(jR, 0, max);
+            jG = CLAMP(jG, 0, max);
+            jB = CLAMP(jB, 0, max);
+            jA = CLAMP(jA, 0, max);
+            rgba[i][RCOMP] = lut[jR * 4 + 0];
+            rgba[i][GCOMP] = lut[jG * 4 + 1];
+            rgba[i][BCOMP] = lut[jB * 4 + 2];
+            rgba[i][ACOMP] = lut[jA * 4 + 3];
+         }
+         break;
+      default:
+         _mesa_problem(NULL, "Bad format in _mesa_lookup_rgba_float");
+         return;
+   }
+}
+
+
+
+/**
+ * Apply a color table lookup to an array of ubyte/RGBA colors.
+ */
+void
+_mesa_lookup_rgba_ubyte(const struct gl_color_table *table,
+                        GLuint n, GLubyte rgba[][4])
+{
+   const GLubyte *lut = table->TableUB;
+   const GLfloat scale = (GLfloat) (table->Size - 1) / (GLfloat)255.0;
+   GLuint i;
+
+   if (!table->TableUB || table->Size == 0)
+      return;
+
+   switch (table->_BaseFormat) {
+   case GL_INTENSITY:
+      /* replace RGBA with I */
+      if (table->Size == 256) {
+         for (i = 0; i < n; i++) {
+            const GLubyte c = lut[rgba[i][RCOMP]];
+            rgba[i][RCOMP] =
+            rgba[i][GCOMP] =
+            rgba[i][BCOMP] =
+            rgba[i][ACOMP] = c;
+         }
+      }
+      else {
+         for (i = 0; i < n; i++) {
+            GLint j = IROUND((GLfloat) rgba[i][RCOMP] * scale);
+            rgba[i][RCOMP] =
+            rgba[i][GCOMP] =
+            rgba[i][BCOMP] =
+            rgba[i][ACOMP] = lut[j];
+         }
+      }
+      break;
+   case GL_LUMINANCE:
+      /* replace RGB with L */
+      if (table->Size == 256) {
+         for (i = 0; i < n; i++) {
+            const GLubyte c = lut[rgba[i][RCOMP]];
+            rgba[i][RCOMP] =
+            rgba[i][GCOMP] =
+            rgba[i][BCOMP] = c;
+         }
+      }
+      else {
+         for (i = 0; i < n; i++) {
+            GLint j = IROUND((GLfloat) rgba[i][RCOMP] * scale);
+            rgba[i][RCOMP] =
+            rgba[i][GCOMP] =
+            rgba[i][BCOMP] = lut[j];
+         }
+      }
+      break;
+   case GL_ALPHA:
+      /* replace A with A */
+      if (table->Size == 256) {
+         for (i = 0; i < n; i++) {
+            rgba[i][ACOMP] = lut[rgba[i][ACOMP]];
+         }
+      }
+      else {
+         for (i = 0; i < n; i++) {
+            GLint j = IROUND((GLfloat) rgba[i][ACOMP] * scale);
+            rgba[i][ACOMP] = lut[j];
+         }
+      }
+      break;
+   case GL_LUMINANCE_ALPHA:
+      /* replace RGBA with LLLA */
+      if (table->Size == 256) {
+         for (i = 0; i < n; i++) {
+            GLubyte l = lut[rgba[i][RCOMP] * 2 + 0];
+            GLubyte a = lut[rgba[i][ACOMP] * 2 + 1];;
+            rgba[i][RCOMP] =
+            rgba[i][GCOMP] =
+            rgba[i][BCOMP] = l;
+            rgba[i][ACOMP] = a;
+         }
+      }
+      else {
+         for (i = 0; i < n; i++) {
+            GLint jL = IROUND((GLfloat) rgba[i][RCOMP] * scale);
+            GLint jA = IROUND((GLfloat) rgba[i][ACOMP] * scale);
+            GLubyte luminance = lut[jL * 2 + 0];
+            GLubyte alpha     = lut[jA * 2 + 1];
+            rgba[i][RCOMP] =
+            rgba[i][GCOMP] =
+            rgba[i][BCOMP] = luminance;
+            rgba[i][ACOMP] = alpha;
+         }
+      }
+      break;
+   case GL_RGB:
+      if (table->Size == 256) {
+         for (i = 0; i < n; i++) {
+            rgba[i][RCOMP] = lut[rgba[i][RCOMP] * 3 + 0];
+            rgba[i][GCOMP] = lut[rgba[i][GCOMP] * 3 + 1];
+            rgba[i][BCOMP] = lut[rgba[i][BCOMP] * 3 + 2];
+         }
+      }
+      else {
+         for (i = 0; i < n; i++) {
+            GLint jR = IROUND((GLfloat) rgba[i][RCOMP] * scale);
+            GLint jG = IROUND((GLfloat) rgba[i][GCOMP] * scale);
+            GLint jB = IROUND((GLfloat) rgba[i][BCOMP] * scale);
+            rgba[i][RCOMP] = lut[jR * 3 + 0];
+            rgba[i][GCOMP] = lut[jG * 3 + 1];
+            rgba[i][BCOMP] = lut[jB * 3 + 2];
+         }
+      }
+      break;
+   case GL_RGBA:
+      if (table->Size == 256) {
+         for (i = 0; i < n; i++) {
+            rgba[i][RCOMP] = lut[rgba[i][RCOMP] * 4 + 0];
+            rgba[i][GCOMP] = lut[rgba[i][GCOMP] * 4 + 1];
+            rgba[i][BCOMP] = lut[rgba[i][BCOMP] * 4 + 2];
+            rgba[i][ACOMP] = lut[rgba[i][ACOMP] * 4 + 3];
+         }
+      }
+      else {
+         for (i = 0; i < n; i++) {
+            GLint jR = IROUND((GLfloat) rgba[i][RCOMP] * scale);
+            GLint jG = IROUND((GLfloat) rgba[i][GCOMP] * scale);
+            GLint jB = IROUND((GLfloat) rgba[i][BCOMP] * scale);
+            GLint jA = IROUND((GLfloat) rgba[i][ACOMP] * scale);
+            CLAMPED_FLOAT_TO_CHAN(rgba[i][RCOMP], lut[jR * 4 + 0]);
+            CLAMPED_FLOAT_TO_CHAN(rgba[i][GCOMP], lut[jG * 4 + 1]);
+            CLAMPED_FLOAT_TO_CHAN(rgba[i][BCOMP], lut[jB * 4 + 2]);
+            CLAMPED_FLOAT_TO_CHAN(rgba[i][ACOMP], lut[jA * 4 + 3]);
+         }
+      }
+      break;
+   default:
+      _mesa_problem(NULL, "Bad format in _mesa_lookup_rgba_chan");
+      return;
+   }
+}
+
+
+
+/*
+ * Map color indexes to float rgba values.
+ */
+void
+_mesa_map_ci_to_rgba( const GLcontext *ctx, GLuint n,
+                      const GLuint index[], GLfloat rgba[][4] )
+{
+   GLuint rmask = ctx->PixelMaps.ItoR.Size - 1;
+   GLuint gmask = ctx->PixelMaps.ItoG.Size - 1;
+   GLuint bmask = ctx->PixelMaps.ItoB.Size - 1;
+   GLuint amask = ctx->PixelMaps.ItoA.Size - 1;
+   const GLfloat *rMap = ctx->PixelMaps.ItoR.Map;
+   const GLfloat *gMap = ctx->PixelMaps.ItoG.Map;
+   const GLfloat *bMap = ctx->PixelMaps.ItoB.Map;
+   const GLfloat *aMap = ctx->PixelMaps.ItoA.Map;
+   GLuint i;
+   for (i=0;i<n;i++) {
+      rgba[i][RCOMP] = rMap[index[i] & rmask];
+      rgba[i][GCOMP] = gMap[index[i] & gmask];
+      rgba[i][BCOMP] = bMap[index[i] & bmask];
+      rgba[i][ACOMP] = aMap[index[i] & amask];
+   }
+}
+
+
+/**
+ * Map ubyte color indexes to ubyte/RGBA values.
+ */
+void
+_mesa_map_ci8_to_rgba8(const GLcontext *ctx, GLuint n, const GLubyte index[],
+                       GLubyte rgba[][4])
+{
+   GLuint rmask = ctx->PixelMaps.ItoR.Size - 1;
+   GLuint gmask = ctx->PixelMaps.ItoG.Size - 1;
+   GLuint bmask = ctx->PixelMaps.ItoB.Size - 1;
+   GLuint amask = ctx->PixelMaps.ItoA.Size - 1;
+   const GLubyte *rMap = ctx->PixelMaps.ItoR.Map8;
+   const GLubyte *gMap = ctx->PixelMaps.ItoG.Map8;
+   const GLubyte *bMap = ctx->PixelMaps.ItoB.Map8;
+   const GLubyte *aMap = ctx->PixelMaps.ItoA.Map8;
+   GLuint i;
+   for (i=0;i<n;i++) {
+      rgba[i][RCOMP] = rMap[index[i] & rmask];
+      rgba[i][GCOMP] = gMap[index[i] & gmask];
+      rgba[i][BCOMP] = bMap[index[i] & bmask];
+      rgba[i][ACOMP] = aMap[index[i] & amask];
+   }
+}
+
+
+void
+_mesa_scale_and_bias_depth(const GLcontext *ctx, GLuint n,
+                           GLfloat depthValues[])
+{
+   const GLfloat scale = ctx->Pixel.DepthScale;
+   const GLfloat bias = ctx->Pixel.DepthBias;
+   GLuint i;
+   for (i = 0; i < n; i++) {
+      GLfloat d = depthValues[i] * scale + bias;
+      depthValues[i] = CLAMP(d, 0.0F, 1.0F);
+   }
+}
+
+
+void
+_mesa_scale_and_bias_depth_uint(const GLcontext *ctx, GLuint n,
+                                GLuint depthValues[])
+{
+   const GLdouble max = (double) 0xffffffff;
+   const GLdouble scale = ctx->Pixel.DepthScale;
+   const GLdouble bias = ctx->Pixel.DepthBias * max;
+   GLuint i;
+   for (i = 0; i < n; i++) {
+      GLdouble d = (GLdouble) depthValues[i] * scale + bias;
+      d = CLAMP(d, 0.0, max);
+      depthValues[i] = (GLuint) d;
+   }
+}
+
+
 /**
  * Apply various pixel transfer operations to an array of RGBA pixels
  * as indicated by the transferOps bitmask
diff --git a/src/mesa/main/image.h b/src/mesa/main/image.h
index c379d5fa7d..38e1374c20 100644
--- a/src/mesa/main/image.h
+++ b/src/mesa/main/image.h
@@ -2,7 +2,7 @@
  * Mesa 3-D graphics library
  * Version:  7.1
  *
- * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -111,6 +111,51 @@ _mesa_pack_bitmap( GLint width, GLint height, const GLubyte *source,
                    GLubyte *dest, const struct gl_pixelstore_attrib *packing );
 
 
+/** \name Pixel processing functions */
+/*@{*/
+
+extern void
+_mesa_scale_and_bias_rgba(GLuint n, GLfloat rgba[][4],
+                          GLfloat rScale, GLfloat gScale,
+                          GLfloat bScale, GLfloat aScale,
+                          GLfloat rBias, GLfloat gBias,
+                          GLfloat bBias, GLfloat aBias);
+
+extern void
+_mesa_map_rgba(const GLcontext *ctx, GLuint n, GLfloat rgba[][4]);
+
+
+extern void
+_mesa_transform_rgba(const GLcontext *ctx, GLuint n, GLfloat rgba[][4]);
+
+
+extern void
+_mesa_lookup_rgba_float(const struct gl_color_table *table,
+                        GLuint n, GLfloat rgba[][4]);
+
+extern void
+_mesa_lookup_rgba_ubyte(const struct gl_color_table *table,
+                        GLuint n, GLubyte rgba[][4]);
+
+
+extern void
+_mesa_map_ci_to_rgba(const GLcontext *ctx,
+                     GLuint n, const GLuint index[], GLfloat rgba[][4]);
+
+
+extern void
+_mesa_map_ci8_to_rgba8(const GLcontext *ctx, GLuint n, const GLubyte index[],
+                       GLubyte rgba[][4]);
+
+
+extern void
+_mesa_scale_and_bias_depth(const GLcontext *ctx, GLuint n,
+                           GLfloat depthValues[]);
+
+extern void
+_mesa_scale_and_bias_depth_uint(const GLcontext *ctx, GLuint n,
+                                GLuint depthValues[]);
+
 extern void
 _mesa_apply_rgba_transfer_ops(GLcontext *ctx, GLbitfield transferOps,
                               GLuint n, GLfloat rgba[][4]);
diff --git a/src/mesa/main/pixel.c b/src/mesa/main/pixel.c
index f14b225c1d..c9c4289f69 100644
--- a/src/mesa/main/pixel.c
+++ b/src/mesa/main/pixel.c
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.5.3
+ * Version:  7.1
  *
- * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -22,6 +22,12 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+
+/**
+ * \file pixel.c
+ * Pixel transfer functions (glPixelZoom, glPixelMap, glPixelTransfer)
+ */
+
 #include "glheader.h"
 #include "bufferobj.h"
 #include "colormac.h"
@@ -741,426 +747,6 @@ _mesa_PixelTransferi( GLenum pname, GLint param )
 
 
 
-/**********************************************************************/
-/*****                  Pixel processing functions               ******/
-/**********************************************************************/
-
-/*
- * Apply scale and bias factors to an array of RGBA pixels.
- */
-void
-_mesa_scale_and_bias_rgba(GLuint n, GLfloat rgba[][4],
-                          GLfloat rScale, GLfloat gScale,
-                          GLfloat bScale, GLfloat aScale,
-                          GLfloat rBias, GLfloat gBias,
-                          GLfloat bBias, GLfloat aBias)
-{
-   if (rScale != 1.0 || rBias != 0.0) {
-      GLuint i;
-      for (i = 0; i < n; i++) {
-         rgba[i][RCOMP] = rgba[i][RCOMP] * rScale + rBias;
-      }
-   }
-   if (gScale != 1.0 || gBias != 0.0) {
-      GLuint i;
-      for (i = 0; i < n; i++) {
-         rgba[i][GCOMP] = rgba[i][GCOMP] * gScale + gBias;
-      }
-   }
-   if (bScale != 1.0 || bBias != 0.0) {
-      GLuint i;
-      for (i = 0; i < n; i++) {
-         rgba[i][BCOMP] = rgba[i][BCOMP] * bScale + bBias;
-      }
-   }
-   if (aScale != 1.0 || aBias != 0.0) {
-      GLuint i;
-      for (i = 0; i < n; i++) {
-         rgba[i][ACOMP] = rgba[i][ACOMP] * aScale + aBias;
-      }
-   }
-}
-
-
-/*
- * Apply pixel mapping to an array of floating point RGBA pixels.
- */
-void
-_mesa_map_rgba( const GLcontext *ctx, GLuint n, GLfloat rgba[][4] )
-{
-   const GLfloat rscale = (GLfloat) (ctx->PixelMaps.RtoR.Size - 1);
-   const GLfloat gscale = (GLfloat) (ctx->PixelMaps.GtoG.Size - 1);
-   const GLfloat bscale = (GLfloat) (ctx->PixelMaps.BtoB.Size - 1);
-   const GLfloat ascale = (GLfloat) (ctx->PixelMaps.AtoA.Size - 1);
-   const GLfloat *rMap = ctx->PixelMaps.RtoR.Map;
-   const GLfloat *gMap = ctx->PixelMaps.GtoG.Map;
-   const GLfloat *bMap = ctx->PixelMaps.BtoB.Map;
-   const GLfloat *aMap = ctx->PixelMaps.AtoA.Map;
-   GLuint i;
-   for (i=0;i<n;i++) {
-      GLfloat r = CLAMP(rgba[i][RCOMP], 0.0F, 1.0F);
-      GLfloat g = CLAMP(rgba[i][GCOMP], 0.0F, 1.0F);
-      GLfloat b = CLAMP(rgba[i][BCOMP], 0.0F, 1.0F);
-      GLfloat a = CLAMP(rgba[i][ACOMP], 0.0F, 1.0F);
-      rgba[i][RCOMP] = rMap[IROUND(r * rscale)];
-      rgba[i][GCOMP] = gMap[IROUND(g * gscale)];
-      rgba[i][BCOMP] = bMap[IROUND(b * bscale)];
-      rgba[i][ACOMP] = aMap[IROUND(a * ascale)];
-   }
-}
-
-
-/*
- * Apply the color matrix and post color matrix scaling and biasing.
- */
-void
-_mesa_transform_rgba(const GLcontext *ctx, GLuint n, GLfloat rgba[][4])
-{
-   const GLfloat rs = ctx->Pixel.PostColorMatrixScale[0];
-   const GLfloat rb = ctx->Pixel.PostColorMatrixBias[0];
-   const GLfloat gs = ctx->Pixel.PostColorMatrixScale[1];
-   const GLfloat gb = ctx->Pixel.PostColorMatrixBias[1];
-   const GLfloat bs = ctx->Pixel.PostColorMatrixScale[2];
-   const GLfloat bb = ctx->Pixel.PostColorMatrixBias[2];
-   const GLfloat as = ctx->Pixel.PostColorMatrixScale[3];
-   const GLfloat ab = ctx->Pixel.PostColorMatrixBias[3];
-   const GLfloat *m = ctx->ColorMatrixStack.Top->m;
-   GLuint i;
-   for (i = 0; i < n; i++) {
-      const GLfloat r = rgba[i][RCOMP];
-      const GLfloat g = rgba[i][GCOMP];
-      const GLfloat b = rgba[i][BCOMP];
-      const GLfloat a = rgba[i][ACOMP];
-      rgba[i][RCOMP] = (m[0] * r + m[4] * g + m[ 8] * b + m[12] * a) * rs + rb;
-      rgba[i][GCOMP] = (m[1] * r + m[5] * g + m[ 9] * b + m[13] * a) * gs + gb;
-      rgba[i][BCOMP] = (m[2] * r + m[6] * g + m[10] * b + m[14] * a) * bs + bb;
-      rgba[i][ACOMP] = (m[3] * r + m[7] * g + m[11] * b + m[15] * a) * as + ab;
-   }
-}
-
-
-/**
- * Apply a color table lookup to an array of floating point RGBA colors.
- */
-void
-_mesa_lookup_rgba_float(const struct gl_color_table *table,
-                        GLuint n, GLfloat rgba[][4])
-{
-   const GLint max = table->Size - 1;
-   const GLfloat scale = (GLfloat) max;
-   const GLfloat *lut = table->TableF;
-   GLuint i;
-
-   if (!table->TableF || table->Size == 0)
-      return;
-
-   switch (table->_BaseFormat) {
-      case GL_INTENSITY:
-         /* replace RGBA with I */
-         for (i = 0; i < n; i++) {
-            GLint j = IROUND(rgba[i][RCOMP] * scale);
-            GLfloat c = lut[CLAMP(j, 0, max)];
-            rgba[i][RCOMP] =
-            rgba[i][GCOMP] =
-            rgba[i][BCOMP] =
-            rgba[i][ACOMP] = c;
-         }
-         break;
-      case GL_LUMINANCE:
-         /* replace RGB with L */
-         for (i = 0; i < n; i++) {
-            GLint j = IROUND(rgba[i][RCOMP] * scale);
-            GLfloat c = lut[CLAMP(j, 0, max)];
-            rgba[i][RCOMP] =
-            rgba[i][GCOMP] =
-            rgba[i][BCOMP] = c;
-         }
-         break;
-      case GL_ALPHA:
-         /* replace A with A */
-         for (i = 0; i < n; i++) {
-            GLint j = IROUND(rgba[i][ACOMP] * scale);
-            rgba[i][ACOMP] = lut[CLAMP(j, 0, max)];
-         }
-         break;
-      case GL_LUMINANCE_ALPHA:
-         /* replace RGBA with LLLA */
-         for (i = 0; i < n; i++) {
-            GLint jL = IROUND(rgba[i][RCOMP] * scale);
-            GLint jA = IROUND(rgba[i][ACOMP] * scale);
-            GLfloat luminance, alpha;
-            jL = CLAMP(jL, 0, max);
-            jA = CLAMP(jA, 0, max);
-            luminance = lut[jL * 2 + 0];
-            alpha     = lut[jA * 2 + 1];
-            rgba[i][RCOMP] =
-            rgba[i][GCOMP] =
-            rgba[i][BCOMP] = luminance;
-            rgba[i][ACOMP] = alpha;;
-         }
-         break;
-      case GL_RGB:
-         /* replace RGB with RGB */
-         for (i = 0; i < n; i++) {
-            GLint jR = IROUND(rgba[i][RCOMP] * scale);
-            GLint jG = IROUND(rgba[i][GCOMP] * scale);
-            GLint jB = IROUND(rgba[i][BCOMP] * scale);
-            jR = CLAMP(jR, 0, max);
-            jG = CLAMP(jG, 0, max);
-            jB = CLAMP(jB, 0, max);
-            rgba[i][RCOMP] = lut[jR * 3 + 0];
-            rgba[i][GCOMP] = lut[jG * 3 + 1];
-            rgba[i][BCOMP] = lut[jB * 3 + 2];
-         }
-         break;
-      case GL_RGBA:
-         /* replace RGBA with RGBA */
-         for (i = 0; i < n; i++) {
-            GLint jR = IROUND(rgba[i][RCOMP] * scale);
-            GLint jG = IROUND(rgba[i][GCOMP] * scale);
-            GLint jB = IROUND(rgba[i][BCOMP] * scale);
-            GLint jA = IROUND(rgba[i][ACOMP] * scale);
-            jR = CLAMP(jR, 0, max);
-            jG = CLAMP(jG, 0, max);
-            jB = CLAMP(jB, 0, max);
-            jA = CLAMP(jA, 0, max);
-            rgba[i][RCOMP] = lut[jR * 4 + 0];
-            rgba[i][GCOMP] = lut[jG * 4 + 1];
-            rgba[i][BCOMP] = lut[jB * 4 + 2];
-            rgba[i][ACOMP] = lut[jA * 4 + 3];
-         }
-         break;
-      default:
-         _mesa_problem(NULL, "Bad format in _mesa_lookup_rgba_float");
-         return;
-   }
-}
-
-
-
-/**
- * Apply a color table lookup to an array of ubyte/RGBA colors.
- */
-void
-_mesa_lookup_rgba_ubyte(const struct gl_color_table *table,
-                        GLuint n, GLubyte rgba[][4])
-{
-   const GLubyte *lut = table->TableUB;
-   const GLfloat scale = (GLfloat) (table->Size - 1) / (GLfloat)255.0;
-   GLuint i;
-
-   if (!table->TableUB || table->Size == 0)
-      return;
-
-   switch (table->_BaseFormat) {
-   case GL_INTENSITY:
-      /* replace RGBA with I */
-      if (table->Size == 256) {
-         for (i = 0; i < n; i++) {
-            const GLubyte c = lut[rgba[i][RCOMP]];
-            rgba[i][RCOMP] =
-            rgba[i][GCOMP] =
-            rgba[i][BCOMP] =
-            rgba[i][ACOMP] = c;
-         }
-      }
-      else {
-         for (i = 0; i < n; i++) {
-            GLint j = IROUND((GLfloat) rgba[i][RCOMP] * scale);
-            rgba[i][RCOMP] =
-            rgba[i][GCOMP] =
-            rgba[i][BCOMP] =
-            rgba[i][ACOMP] = lut[j];
-         }
-      }
-      break;
-   case GL_LUMINANCE:
-      /* replace RGB with L */
-      if (table->Size == 256) {
-         for (i = 0; i < n; i++) {
-            const GLubyte c = lut[rgba[i][RCOMP]];
-            rgba[i][RCOMP] =
-            rgba[i][GCOMP] =
-            rgba[i][BCOMP] = c;
-         }
-      }
-      else {
-         for (i = 0; i < n; i++) {
-            GLint j = IROUND((GLfloat) rgba[i][RCOMP] * scale);
-            rgba[i][RCOMP] =
-            rgba[i][GCOMP] =
-            rgba[i][BCOMP] = lut[j];
-         }
-      }
-      break;
-   case GL_ALPHA:
-      /* replace A with A */
-      if (table->Size == 256) {
-         for (i = 0; i < n; i++) {
-            rgba[i][ACOMP] = lut[rgba[i][ACOMP]];
-         }
-      }
-      else {
-         for (i = 0; i < n; i++) {
-            GLint j = IROUND((GLfloat) rgba[i][ACOMP] * scale);
-            rgba[i][ACOMP] = lut[j];
-         }
-      }
-      break;
-   case GL_LUMINANCE_ALPHA:
-      /* replace RGBA with LLLA */
-      if (table->Size == 256) {
-         for (i = 0; i < n; i++) {
-            GLubyte l = lut[rgba[i][RCOMP] * 2 + 0];
-            GLubyte a = lut[rgba[i][ACOMP] * 2 + 1];;
-            rgba[i][RCOMP] =
-            rgba[i][GCOMP] =
-            rgba[i][BCOMP] = l;
-            rgba[i][ACOMP] = a;
-         }
-      }
-      else {
-         for (i = 0; i < n; i++) {
-            GLint jL = IROUND((GLfloat) rgba[i][RCOMP] * scale);
-            GLint jA = IROUND((GLfloat) rgba[i][ACOMP] * scale);
-            GLubyte luminance = lut[jL * 2 + 0];
-            GLubyte alpha     = lut[jA * 2 + 1];
-            rgba[i][RCOMP] =
-            rgba[i][GCOMP] =
-            rgba[i][BCOMP] = luminance;
-            rgba[i][ACOMP] = alpha;
-         }
-      }
-      break;
-   case GL_RGB:
-      if (table->Size == 256) {
-         for (i = 0; i < n; i++) {
-            rgba[i][RCOMP] = lut[rgba[i][RCOMP] * 3 + 0];
-            rgba[i][GCOMP] = lut[rgba[i][GCOMP] * 3 + 1];
-            rgba[i][BCOMP] = lut[rgba[i][BCOMP] * 3 + 2];
-         }
-      }
-      else {
-         for (i = 0; i < n; i++) {
-            GLint jR = IROUND((GLfloat) rgba[i][RCOMP] * scale);
-            GLint jG = IROUND((GLfloat) rgba[i][GCOMP] * scale);
-            GLint jB = IROUND((GLfloat) rgba[i][BCOMP] * scale);
-            rgba[i][RCOMP] = lut[jR * 3 + 0];
-            rgba[i][GCOMP] = lut[jG * 3 + 1];
-            rgba[i][BCOMP] = lut[jB * 3 + 2];
-         }
-      }
-      break;
-   case GL_RGBA:
-      if (table->Size == 256) {
-         for (i = 0; i < n; i++) {
-            rgba[i][RCOMP] = lut[rgba[i][RCOMP] * 4 + 0];
-            rgba[i][GCOMP] = lut[rgba[i][GCOMP] * 4 + 1];
-            rgba[i][BCOMP] = lut[rgba[i][BCOMP] * 4 + 2];
-            rgba[i][ACOMP] = lut[rgba[i][ACOMP] * 4 + 3];
-         }
-      }
-      else {
-         for (i = 0; i < n; i++) {
-            GLint jR = IROUND((GLfloat) rgba[i][RCOMP] * scale);
-            GLint jG = IROUND((GLfloat) rgba[i][GCOMP] * scale);
-            GLint jB = IROUND((GLfloat) rgba[i][BCOMP] * scale);
-            GLint jA = IROUND((GLfloat) rgba[i][ACOMP] * scale);
-            CLAMPED_FLOAT_TO_CHAN(rgba[i][RCOMP], lut[jR * 4 + 0]);
-            CLAMPED_FLOAT_TO_CHAN(rgba[i][GCOMP], lut[jG * 4 + 1]);
-            CLAMPED_FLOAT_TO_CHAN(rgba[i][BCOMP], lut[jB * 4 + 2]);
-            CLAMPED_FLOAT_TO_CHAN(rgba[i][ACOMP], lut[jA * 4 + 3]);
-         }
-      }
-      break;
-   default:
-      _mesa_problem(NULL, "Bad format in _mesa_lookup_rgba_chan");
-      return;
-   }
-}
-
-
-
-/*
- * Map color indexes to float rgba values.
- */
-void
-_mesa_map_ci_to_rgba( const GLcontext *ctx, GLuint n,
-                      const GLuint index[], GLfloat rgba[][4] )
-{
-   GLuint rmask = ctx->PixelMaps.ItoR.Size - 1;
-   GLuint gmask = ctx->PixelMaps.ItoG.Size - 1;
-   GLuint bmask = ctx->PixelMaps.ItoB.Size - 1;
-   GLuint amask = ctx->PixelMaps.ItoA.Size - 1;
-   const GLfloat *rMap = ctx->PixelMaps.ItoR.Map;
-   const GLfloat *gMap = ctx->PixelMaps.ItoG.Map;
-   const GLfloat *bMap = ctx->PixelMaps.ItoB.Map;
-   const GLfloat *aMap = ctx->PixelMaps.ItoA.Map;
-   GLuint i;
-   for (i=0;i<n;i++) {
-      rgba[i][RCOMP] = rMap[index[i] & rmask];
-      rgba[i][GCOMP] = gMap[index[i] & gmask];
-      rgba[i][BCOMP] = bMap[index[i] & bmask];
-      rgba[i][ACOMP] = aMap[index[i] & amask];
-   }
-}
-
-
-/**
- * Map ubyte color indexes to ubyte/RGBA values.
- */
-void
-_mesa_map_ci8_to_rgba8(const GLcontext *ctx, GLuint n, const GLubyte index[],
-                       GLubyte rgba[][4])
-{
-   GLuint rmask = ctx->PixelMaps.ItoR.Size - 1;
-   GLuint gmask = ctx->PixelMaps.ItoG.Size - 1;
-   GLuint bmask = ctx->PixelMaps.ItoB.Size - 1;
-   GLuint amask = ctx->PixelMaps.ItoA.Size - 1;
-   const GLubyte *rMap = ctx->PixelMaps.ItoR.Map8;
-   const GLubyte *gMap = ctx->PixelMaps.ItoG.Map8;
-   const GLubyte *bMap = ctx->PixelMaps.ItoB.Map8;
-   const GLubyte *aMap = ctx->PixelMaps.ItoA.Map8;
-   GLuint i;
-   for (i=0;i<n;i++) {
-      rgba[i][RCOMP] = rMap[index[i] & rmask];
-      rgba[i][GCOMP] = gMap[index[i] & gmask];
-      rgba[i][BCOMP] = bMap[index[i] & bmask];
-      rgba[i][ACOMP] = aMap[index[i] & amask];
-   }
-}
-
-
-void
-_mesa_scale_and_bias_depth(const GLcontext *ctx, GLuint n,
-                           GLfloat depthValues[])
-{
-   const GLfloat scale = ctx->Pixel.DepthScale;
-   const GLfloat bias = ctx->Pixel.DepthBias;
-   GLuint i;
-   for (i = 0; i < n; i++) {
-      GLfloat d = depthValues[i] * scale + bias;
-      depthValues[i] = CLAMP(d, 0.0F, 1.0F);
-   }
-}
-
-
-void
-_mesa_scale_and_bias_depth_uint(const GLcontext *ctx, GLuint n,
-                                GLuint depthValues[])
-{
-   const GLdouble max = (double) 0xffffffff;
-   const GLdouble scale = ctx->Pixel.DepthScale;
-   const GLdouble bias = ctx->Pixel.DepthBias * max;
-   GLuint i;
-   for (i = 0; i < n; i++) {
-      GLdouble d = (GLdouble) depthValues[i] * scale + bias;
-      d = CLAMP(d, 0.0, max);
-      depthValues[i] = (GLuint) d;
-   }
-}
-
-
 /**********************************************************************/
 /*****                    State Management                        *****/
 /**********************************************************************/
@@ -1232,6 +818,9 @@ update_image_transfer_state(GLcontext *ctx)
 }
 
 
+/**
+ * Update meas pixel transfer derived state.
+ */
 void _mesa_update_pixel( GLcontext *ctx, GLuint new_state )
 {
    if (new_state & _NEW_COLOR_MATRIX)
diff --git a/src/mesa/main/pixel.h b/src/mesa/main/pixel.h
index 05bddf5ccf..cb6c5262a3 100644
--- a/src/mesa/main/pixel.h
+++ b/src/mesa/main/pixel.h
@@ -1,13 +1,8 @@
-/**
- * \file pixel.h
- * Pixel operations.
- */
-
 /*
  * Mesa 3-D graphics library
- * Version:  6.5.2
+ * Version:  7.1
  *
- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -28,6 +23,12 @@
  */
 
 
+/**
+ * \file pixel.h
+ * Pixel operations.
+ */
+
+
 #ifndef PIXEL_H
 #define PIXEL_H
 
@@ -68,51 +69,6 @@ _mesa_PixelZoom( GLfloat xfactor, GLfloat yfactor );
 /*@}*/
 
 
-/** \name Pixel processing functions */
-/*@{*/
-
-extern void
-_mesa_scale_and_bias_rgba(GLuint n, GLfloat rgba[][4],
-                          GLfloat rScale, GLfloat gScale,
-                          GLfloat bScale, GLfloat aScale,
-                          GLfloat rBias, GLfloat gBias,
-                          GLfloat bBias, GLfloat aBias);
-
-extern void
-_mesa_map_rgba(const GLcontext *ctx, GLuint n, GLfloat rgba[][4]);
-
-
-extern void
-_mesa_transform_rgba(const GLcontext *ctx, GLuint n, GLfloat rgba[][4]);
-
-
-extern void
-_mesa_lookup_rgba_float(const struct gl_color_table *table,
-                        GLuint n, GLfloat rgba[][4]);
-
-extern void
-_mesa_lookup_rgba_ubyte(const struct gl_color_table *table,
-                        GLuint n, GLubyte rgba[][4]);
-
-
-extern void
-_mesa_map_ci_to_rgba(const GLcontext *ctx,
-                     GLuint n, const GLuint index[], GLfloat rgba[][4]);
-
-
-extern void
-_mesa_map_ci8_to_rgba8(const GLcontext *ctx, GLuint n, const GLubyte index[],
-                       GLubyte rgba[][4]);
-
-
-extern void
-_mesa_scale_and_bias_depth(const GLcontext *ctx, GLuint n,
-                           GLfloat depthValues[]);
-
-extern void
-_mesa_scale_and_bias_depth_uint(const GLcontext *ctx, GLuint n,
-                                GLuint depthValues[]);
-
 extern void 
 _mesa_update_pixel( GLcontext *ctx, GLuint newstate );
 
diff --git a/src/mesa/swrast/s_texcombine.c b/src/mesa/swrast/s_texcombine.c
index 4ac7222daa..4c5e22618e 100644
--- a/src/mesa/swrast/s_texcombine.c
+++ b/src/mesa/swrast/s_texcombine.c
@@ -28,7 +28,7 @@
 #include "colormac.h"
 #include "imports.h"
 #include "macros.h"
-#include "pixel.h"
+#include "image.h"
 
 #include "s_context.h"
 #include "s_texcombine.h"
-- 
cgit v1.2.3


From b36e6f0baf64491772b8e1a1cddf68a7dcf8ee22 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 9 Jun 2008 14:49:04 -0600
Subject: mesa: refactor: move _mesa_init_exec_table() into new api_exec.c file

---
 src/mesa/main/api_exec.c | 826 +++++++++++++++++++++++++++++++++++++++++++++++
 src/mesa/main/api_exec.h |  34 ++
 src/mesa/main/context.c  |   1 +
 src/mesa/main/sources    |   2 +
 src/mesa/main/state.c    | 803 +--------------------------------------------
 src/mesa/main/state.h    |  12 +-
 src/mesa/sources         |   1 +
 7 files changed, 873 insertions(+), 806 deletions(-)
 create mode 100644 src/mesa/main/api_exec.c
 create mode 100644 src/mesa/main/api_exec.h

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
new file mode 100644
index 0000000000..e0f081bdbc
--- /dev/null
+++ b/src/mesa/main/api_exec.c
@@ -0,0 +1,826 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.1
+ *
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/**
+ * \file api_exec.c
+ * Initialize dispatch table with the immidiate mode functions.
+ */
+
+
+#include "glheader.h"
+#include "accum.h"
+#include "api_loopback.h"
+#include "api_exec.h"
+#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
+#include "shader/arbprogram.h"
+#endif
+#if FEATURE_ATI_fragment_shader
+#include "shader/atifragshader.h"
+#endif
+#include "attrib.h"
+#include "blend.h"
+#if FEATURE_ARB_vertex_buffer_object
+#include "bufferobj.h"
+#endif
+#include "arrayobj.h"
+#include "buffers.h"
+#include "clip.h"
+#include "colortab.h"
+#include "context.h"
+#include "convolve.h"
+#include "depth.h"
+#include "dlist.h"
+#include "drawpix.h"
+#include "enable.h"
+#include "eval.h"
+#include "get.h"
+#include "feedback.h"
+#include "fog.h"
+#if FEATURE_EXT_framebuffer_object
+#include "fbobject.h"
+#endif
+#include "ffvertex_prog.h"
+#include "framebuffer.h"
+#include "hint.h"
+#include "histogram.h"
+#include "imports.h"
+#include "light.h"
+#include "lines.h"
+#include "macros.h"
+#include "matrix.h"
+#include "pixel.h"
+#include "pixelstore.h"
+#include "points.h"
+#include "polygon.h"
+#if FEATURE_ARB_occlusion_query || FEATURE_EXT_timer_query
+#include "queryobj.h"
+#endif
+#include "rastpos.h"
+#include "readpix.h"
+#include "state.h"
+#include "stencil.h"
+#include "teximage.h"
+#include "texobj.h"
+#include "texstate.h"
+#include "mtypes.h"
+#include "varray.h"
+#if FEATURE_NV_vertex_program
+#include "shader/nvprogram.h"
+#endif
+#if FEATURE_NV_fragment_program
+#include "shader/nvprogram.h"
+#include "shader/program.h"
+#include "texenvprogram.h"
+#endif
+#if FEATURE_ARB_shader_objects
+#include "shaders.h"
+#endif
+#include "debug.h"
+#include "glapi/dispatch.h"
+
+
+
+/**
+ * Initialize a dispatch table with pointers to Mesa's immediate-mode
+ * commands.
+ *
+ * Pointers to glBegin()/glEnd() object commands and a few others
+ * are provided via the GLvertexformat interface.
+ *
+ * \param ctx  GL context to which \c exec belongs.
+ * \param exec dispatch table.
+ */
+void
+_mesa_init_exec_table(struct _glapi_table *exec)
+{
+#if _HAVE_FULL_GL
+   _mesa_loopback_init_api_table( exec );
+#endif
+
+   /* load the dispatch slots we understand */
+   SET_AlphaFunc(exec, _mesa_AlphaFunc);
+   SET_BlendFunc(exec, _mesa_BlendFunc);
+   SET_Clear(exec, _mesa_Clear);
+   SET_ClearColor(exec, _mesa_ClearColor);
+   SET_ClearStencil(exec, _mesa_ClearStencil);
+   SET_ColorMask(exec, _mesa_ColorMask);
+   SET_CullFace(exec, _mesa_CullFace);
+   SET_Disable(exec, _mesa_Disable);
+   SET_DrawBuffer(exec, _mesa_DrawBuffer);
+   SET_Enable(exec, _mesa_Enable);
+   SET_Finish(exec, _mesa_Finish);
+   SET_Flush(exec, _mesa_Flush);
+   SET_FrontFace(exec, _mesa_FrontFace);
+   SET_Frustum(exec, _mesa_Frustum);
+   SET_GetError(exec, _mesa_GetError);
+   SET_GetFloatv(exec, _mesa_GetFloatv);
+   SET_GetString(exec, _mesa_GetString);
+   SET_InitNames(exec, _mesa_InitNames);
+   SET_LineStipple(exec, _mesa_LineStipple);
+   SET_LineWidth(exec, _mesa_LineWidth);
+   SET_LoadIdentity(exec, _mesa_LoadIdentity);
+   SET_LoadMatrixf(exec, _mesa_LoadMatrixf);
+   SET_LoadName(exec, _mesa_LoadName);
+   SET_LogicOp(exec, _mesa_LogicOp);
+   SET_MatrixMode(exec, _mesa_MatrixMode);
+   SET_MultMatrixf(exec, _mesa_MultMatrixf);
+   SET_Ortho(exec, _mesa_Ortho);
+   SET_PixelStorei(exec, _mesa_PixelStorei);
+   SET_PopMatrix(exec, _mesa_PopMatrix);
+   SET_PopName(exec, _mesa_PopName);
+   SET_PushMatrix(exec, _mesa_PushMatrix);
+   SET_PushName(exec, _mesa_PushName);
+   SET_RasterPos2f(exec, _mesa_RasterPos2f);
+   SET_RasterPos2fv(exec, _mesa_RasterPos2fv);
+   SET_RasterPos2i(exec, _mesa_RasterPos2i);
+   SET_RasterPos2iv(exec, _mesa_RasterPos2iv);
+   SET_ReadBuffer(exec, _mesa_ReadBuffer);
+   SET_RenderMode(exec, _mesa_RenderMode);
+   SET_Rotatef(exec, _mesa_Rotatef);
+   SET_Scalef(exec, _mesa_Scalef);
+   SET_Scissor(exec, _mesa_Scissor);
+   SET_SelectBuffer(exec, _mesa_SelectBuffer);
+   SET_ShadeModel(exec, _mesa_ShadeModel);
+   SET_StencilFunc(exec, _mesa_StencilFunc);
+   SET_StencilMask(exec, _mesa_StencilMask);
+   SET_StencilOp(exec, _mesa_StencilOp);
+   SET_TexEnvfv(exec, _mesa_TexEnvfv);
+   SET_TexEnvi(exec, _mesa_TexEnvi);
+   SET_TexImage2D(exec, _mesa_TexImage2D);
+   SET_TexParameteri(exec, _mesa_TexParameteri);
+   SET_Translatef(exec, _mesa_Translatef);
+   SET_Viewport(exec, _mesa_Viewport);
+#if _HAVE_FULL_GL
+   SET_Accum(exec, _mesa_Accum);
+   SET_Bitmap(exec, _mesa_Bitmap);
+   SET_CallList(exec, _mesa_CallList);
+   SET_CallLists(exec, _mesa_CallLists);
+   SET_ClearAccum(exec, _mesa_ClearAccum);
+   SET_ClearDepth(exec, _mesa_ClearDepth);
+   SET_ClearIndex(exec, _mesa_ClearIndex);
+   SET_ClipPlane(exec, _mesa_ClipPlane);
+   SET_ColorMaterial(exec, _mesa_ColorMaterial);
+   SET_CopyPixels(exec, _mesa_CopyPixels);
+   SET_CullParameterfvEXT(exec, _mesa_CullParameterfvEXT);
+   SET_CullParameterdvEXT(exec, _mesa_CullParameterdvEXT);
+   SET_DeleteLists(exec, _mesa_DeleteLists);
+   SET_DepthFunc(exec, _mesa_DepthFunc);
+   SET_DepthMask(exec, _mesa_DepthMask);
+   SET_DepthRange(exec, _mesa_DepthRange);
+   SET_DrawPixels(exec, _mesa_DrawPixels);
+   SET_EndList(exec, _mesa_EndList);
+   SET_FeedbackBuffer(exec, _mesa_FeedbackBuffer);
+   SET_FogCoordPointerEXT(exec, _mesa_FogCoordPointerEXT);
+   SET_Fogf(exec, _mesa_Fogf);
+   SET_Fogfv(exec, _mesa_Fogfv);
+   SET_Fogi(exec, _mesa_Fogi);
+   SET_Fogiv(exec, _mesa_Fogiv);
+   SET_GenLists(exec, _mesa_GenLists);
+   SET_GetClipPlane(exec, _mesa_GetClipPlane);
+   SET_GetBooleanv(exec, _mesa_GetBooleanv);
+   SET_GetDoublev(exec, _mesa_GetDoublev);
+   SET_GetIntegerv(exec, _mesa_GetIntegerv);
+   SET_GetLightfv(exec, _mesa_GetLightfv);
+   SET_GetLightiv(exec, _mesa_GetLightiv);
+   SET_GetMapdv(exec, _mesa_GetMapdv);
+   SET_GetMapfv(exec, _mesa_GetMapfv);
+   SET_GetMapiv(exec, _mesa_GetMapiv);
+   SET_GetMaterialfv(exec, _mesa_GetMaterialfv);
+   SET_GetMaterialiv(exec, _mesa_GetMaterialiv);
+   SET_GetPixelMapfv(exec, _mesa_GetPixelMapfv);
+   SET_GetPixelMapuiv(exec, _mesa_GetPixelMapuiv);
+   SET_GetPixelMapusv(exec, _mesa_GetPixelMapusv);
+   SET_GetPolygonStipple(exec, _mesa_GetPolygonStipple);
+   SET_GetTexEnvfv(exec, _mesa_GetTexEnvfv);
+   SET_GetTexEnviv(exec, _mesa_GetTexEnviv);
+   SET_GetTexLevelParameterfv(exec, _mesa_GetTexLevelParameterfv);
+   SET_GetTexLevelParameteriv(exec, _mesa_GetTexLevelParameteriv);
+   SET_GetTexParameterfv(exec, _mesa_GetTexParameterfv);
+   SET_GetTexParameteriv(exec, _mesa_GetTexParameteriv);
+   SET_GetTexGendv(exec, _mesa_GetTexGendv);
+   SET_GetTexGenfv(exec, _mesa_GetTexGenfv);
+   SET_GetTexGeniv(exec, _mesa_GetTexGeniv);
+   SET_GetTexImage(exec, _mesa_GetTexImage);
+   SET_Hint(exec, _mesa_Hint);
+   SET_IndexMask(exec, _mesa_IndexMask);
+   SET_IsEnabled(exec, _mesa_IsEnabled);
+   SET_IsList(exec, _mesa_IsList);
+   SET_LightModelf(exec, _mesa_LightModelf);
+   SET_LightModelfv(exec, _mesa_LightModelfv);
+   SET_LightModeli(exec, _mesa_LightModeli);
+   SET_LightModeliv(exec, _mesa_LightModeliv);
+   SET_Lightf(exec, _mesa_Lightf);
+   SET_Lightfv(exec, _mesa_Lightfv);
+   SET_Lighti(exec, _mesa_Lighti);
+   SET_Lightiv(exec, _mesa_Lightiv);
+   SET_ListBase(exec, _mesa_ListBase);
+   SET_LoadMatrixd(exec, _mesa_LoadMatrixd);
+   SET_Map1d(exec, _mesa_Map1d);
+   SET_Map1f(exec, _mesa_Map1f);
+   SET_Map2d(exec, _mesa_Map2d);
+   SET_Map2f(exec, _mesa_Map2f);
+   SET_MapGrid1d(exec, _mesa_MapGrid1d);
+   SET_MapGrid1f(exec, _mesa_MapGrid1f);
+   SET_MapGrid2d(exec, _mesa_MapGrid2d);
+   SET_MapGrid2f(exec, _mesa_MapGrid2f);
+   SET_MultMatrixd(exec, _mesa_MultMatrixd);
+   SET_NewList(exec, _mesa_NewList);
+   SET_PassThrough(exec, _mesa_PassThrough);
+   SET_PixelMapfv(exec, _mesa_PixelMapfv);
+   SET_PixelMapuiv(exec, _mesa_PixelMapuiv);
+   SET_PixelMapusv(exec, _mesa_PixelMapusv);
+   SET_PixelStoref(exec, _mesa_PixelStoref);
+   SET_PixelTransferf(exec, _mesa_PixelTransferf);
+   SET_PixelTransferi(exec, _mesa_PixelTransferi);
+   SET_PixelZoom(exec, _mesa_PixelZoom);
+   SET_PointSize(exec, _mesa_PointSize);
+   SET_PolygonMode(exec, _mesa_PolygonMode);
+   SET_PolygonOffset(exec, _mesa_PolygonOffset);
+   SET_PolygonStipple(exec, _mesa_PolygonStipple);
+   SET_PopAttrib(exec, _mesa_PopAttrib);
+   SET_PushAttrib(exec, _mesa_PushAttrib);
+   SET_RasterPos2d(exec, _mesa_RasterPos2d);
+   SET_RasterPos2dv(exec, _mesa_RasterPos2dv);
+   SET_RasterPos2s(exec, _mesa_RasterPos2s);
+   SET_RasterPos2sv(exec, _mesa_RasterPos2sv);
+   SET_RasterPos3d(exec, _mesa_RasterPos3d);
+   SET_RasterPos3dv(exec, _mesa_RasterPos3dv);
+   SET_RasterPos3f(exec, _mesa_RasterPos3f);
+   SET_RasterPos3fv(exec, _mesa_RasterPos3fv);
+   SET_RasterPos3i(exec, _mesa_RasterPos3i);
+   SET_RasterPos3iv(exec, _mesa_RasterPos3iv);
+   SET_RasterPos3s(exec, _mesa_RasterPos3s);
+   SET_RasterPos3sv(exec, _mesa_RasterPos3sv);
+   SET_RasterPos4d(exec, _mesa_RasterPos4d);
+   SET_RasterPos4dv(exec, _mesa_RasterPos4dv);
+   SET_RasterPos4f(exec, _mesa_RasterPos4f);
+   SET_RasterPos4fv(exec, _mesa_RasterPos4fv);
+   SET_RasterPos4i(exec, _mesa_RasterPos4i);
+   SET_RasterPos4iv(exec, _mesa_RasterPos4iv);
+   SET_RasterPos4s(exec, _mesa_RasterPos4s);
+   SET_RasterPos4sv(exec, _mesa_RasterPos4sv);
+   SET_ReadPixels(exec, _mesa_ReadPixels);
+   SET_Rotated(exec, _mesa_Rotated);
+   SET_Scaled(exec, _mesa_Scaled);
+   SET_SecondaryColorPointerEXT(exec, _mesa_SecondaryColorPointerEXT);
+   SET_TexEnvf(exec, _mesa_TexEnvf);
+   SET_TexEnviv(exec, _mesa_TexEnviv);
+   SET_TexGend(exec, _mesa_TexGend);
+   SET_TexGendv(exec, _mesa_TexGendv);
+   SET_TexGenf(exec, _mesa_TexGenf);
+   SET_TexGenfv(exec, _mesa_TexGenfv);
+   SET_TexGeni(exec, _mesa_TexGeni);
+   SET_TexGeniv(exec, _mesa_TexGeniv);
+   SET_TexImage1D(exec, _mesa_TexImage1D);
+   SET_TexParameterf(exec, _mesa_TexParameterf);
+   SET_TexParameterfv(exec, _mesa_TexParameterfv);
+   SET_TexParameteriv(exec, _mesa_TexParameteriv);
+   SET_Translated(exec, _mesa_Translated);
+#endif
+
+   /* 1.1 */
+   SET_BindTexture(exec, _mesa_BindTexture);
+   SET_DeleteTextures(exec, _mesa_DeleteTextures);
+   SET_GenTextures(exec, _mesa_GenTextures);
+#if _HAVE_FULL_GL
+   SET_AreTexturesResident(exec, _mesa_AreTexturesResident);
+   SET_ColorPointer(exec, _mesa_ColorPointer);
+   SET_CopyTexImage1D(exec, _mesa_CopyTexImage1D);
+   SET_CopyTexImage2D(exec, _mesa_CopyTexImage2D);
+   SET_CopyTexSubImage1D(exec, _mesa_CopyTexSubImage1D);
+   SET_CopyTexSubImage2D(exec, _mesa_CopyTexSubImage2D);
+   SET_DisableClientState(exec, _mesa_DisableClientState);
+   SET_EdgeFlagPointer(exec, _mesa_EdgeFlagPointer);
+   SET_EnableClientState(exec, _mesa_EnableClientState);
+   SET_GetPointerv(exec, _mesa_GetPointerv);
+   SET_IndexPointer(exec, _mesa_IndexPointer);
+   SET_InterleavedArrays(exec, _mesa_InterleavedArrays);
+   SET_IsTexture(exec, _mesa_IsTexture);
+   SET_NormalPointer(exec, _mesa_NormalPointer);
+   SET_PopClientAttrib(exec, _mesa_PopClientAttrib);
+   SET_PrioritizeTextures(exec, _mesa_PrioritizeTextures);
+   SET_PushClientAttrib(exec, _mesa_PushClientAttrib);
+   SET_TexCoordPointer(exec, _mesa_TexCoordPointer);
+   SET_TexSubImage1D(exec, _mesa_TexSubImage1D);
+   SET_TexSubImage2D(exec, _mesa_TexSubImage2D);
+   SET_VertexPointer(exec, _mesa_VertexPointer);
+#endif
+
+   /* 1.2 */
+#if _HAVE_FULL_GL
+   SET_CopyTexSubImage3D(exec, _mesa_CopyTexSubImage3D);
+   SET_TexImage3D(exec, _mesa_TexImage3D);
+   SET_TexSubImage3D(exec, _mesa_TexSubImage3D);
+#endif
+
+   /* OpenGL 1.2  GL_ARB_imaging */
+#if _HAVE_FULL_GL
+   SET_BlendColor(exec, _mesa_BlendColor);
+   SET_BlendEquation(exec, _mesa_BlendEquation);
+   SET_BlendEquationSeparateEXT(exec, _mesa_BlendEquationSeparateEXT);
+   SET_ColorSubTable(exec, _mesa_ColorSubTable);
+   SET_ColorTable(exec, _mesa_ColorTable);
+   SET_ColorTableParameterfv(exec, _mesa_ColorTableParameterfv);
+   SET_ColorTableParameteriv(exec, _mesa_ColorTableParameteriv);
+   SET_ConvolutionFilter1D(exec, _mesa_ConvolutionFilter1D);
+   SET_ConvolutionFilter2D(exec, _mesa_ConvolutionFilter2D);
+   SET_ConvolutionParameterf(exec, _mesa_ConvolutionParameterf);
+   SET_ConvolutionParameterfv(exec, _mesa_ConvolutionParameterfv);
+   SET_ConvolutionParameteri(exec, _mesa_ConvolutionParameteri);
+   SET_ConvolutionParameteriv(exec, _mesa_ConvolutionParameteriv);
+   SET_CopyColorSubTable(exec, _mesa_CopyColorSubTable);
+   SET_CopyColorTable(exec, _mesa_CopyColorTable);
+   SET_CopyConvolutionFilter1D(exec, _mesa_CopyConvolutionFilter1D);
+   SET_CopyConvolutionFilter2D(exec, _mesa_CopyConvolutionFilter2D);
+   SET_GetColorTable(exec, _mesa_GetColorTable);
+   SET_GetColorTableParameterfv(exec, _mesa_GetColorTableParameterfv);
+   SET_GetColorTableParameteriv(exec, _mesa_GetColorTableParameteriv);
+   SET_GetConvolutionFilter(exec, _mesa_GetConvolutionFilter);
+   SET_GetConvolutionParameterfv(exec, _mesa_GetConvolutionParameterfv);
+   SET_GetConvolutionParameteriv(exec, _mesa_GetConvolutionParameteriv);
+   SET_GetHistogram(exec, _mesa_GetHistogram);
+   SET_GetHistogramParameterfv(exec, _mesa_GetHistogramParameterfv);
+   SET_GetHistogramParameteriv(exec, _mesa_GetHistogramParameteriv);
+   SET_GetMinmax(exec, _mesa_GetMinmax);
+   SET_GetMinmaxParameterfv(exec, _mesa_GetMinmaxParameterfv);
+   SET_GetMinmaxParameteriv(exec, _mesa_GetMinmaxParameteriv);
+   SET_GetSeparableFilter(exec, _mesa_GetSeparableFilter);
+   SET_Histogram(exec, _mesa_Histogram);
+   SET_Minmax(exec, _mesa_Minmax);
+   SET_ResetHistogram(exec, _mesa_ResetHistogram);
+   SET_ResetMinmax(exec, _mesa_ResetMinmax);
+   SET_SeparableFilter2D(exec, _mesa_SeparableFilter2D);
+#endif
+
+   /* OpenGL 2.0 */
+   SET_StencilFuncSeparate(exec, _mesa_StencilFuncSeparate);
+   SET_StencilMaskSeparate(exec, _mesa_StencilMaskSeparate);
+   SET_StencilOpSeparate(exec, _mesa_StencilOpSeparate);
+#if FEATURE_ARB_shader_objects
+   SET_AttachShader(exec, _mesa_AttachShader);
+   SET_CreateProgram(exec, _mesa_CreateProgram);
+   SET_CreateShader(exec, _mesa_CreateShader);
+   SET_DeleteProgram(exec, _mesa_DeleteProgram);
+   SET_DeleteShader(exec, _mesa_DeleteShader);
+   SET_DetachShader(exec, _mesa_DetachShader);
+   SET_GetAttachedShaders(exec, _mesa_GetAttachedShaders);
+   SET_GetProgramiv(exec, _mesa_GetProgramiv);
+   SET_GetProgramInfoLog(exec, _mesa_GetProgramInfoLog);
+   SET_GetShaderiv(exec, _mesa_GetShaderiv);
+   SET_GetShaderInfoLog(exec, _mesa_GetShaderInfoLog);
+   SET_IsProgram(exec, _mesa_IsProgram);
+   SET_IsShader(exec, _mesa_IsShader);
+#endif
+
+   /* OpenGL 2.1 */
+#if FEATURE_ARB_shader_objects
+   SET_UniformMatrix2x3fv(exec, _mesa_UniformMatrix2x3fv);
+   SET_UniformMatrix3x2fv(exec, _mesa_UniformMatrix3x2fv);
+   SET_UniformMatrix2x4fv(exec, _mesa_UniformMatrix2x4fv);
+   SET_UniformMatrix4x2fv(exec, _mesa_UniformMatrix4x2fv);
+   SET_UniformMatrix3x4fv(exec, _mesa_UniformMatrix3x4fv);
+   SET_UniformMatrix4x3fv(exec, _mesa_UniformMatrix4x3fv);
+#endif
+
+
+   /* 2. GL_EXT_blend_color */
+#if 0
+/*    SET_BlendColorEXT(exec, _mesa_BlendColorEXT); */
+#endif
+
+   /* 3. GL_EXT_polygon_offset */
+#if _HAVE_FULL_GL
+   SET_PolygonOffsetEXT(exec, _mesa_PolygonOffsetEXT);
+#endif
+
+   /* 6. GL_EXT_texture3d */
+#if 0
+/*    SET_CopyTexSubImage3DEXT(exec, _mesa_CopyTexSubImage3D); */
+/*    SET_TexImage3DEXT(exec, _mesa_TexImage3DEXT); */
+/*    SET_TexSubImage3DEXT(exec, _mesa_TexSubImage3D); */
+#endif
+
+   /* 11. GL_EXT_histogram */
+#if 0
+   SET_GetHistogramEXT(exec, _mesa_GetHistogram);
+   SET_GetHistogramParameterfvEXT(exec, _mesa_GetHistogramParameterfv);
+   SET_GetHistogramParameterivEXT(exec, _mesa_GetHistogramParameteriv);
+   SET_GetMinmaxEXT(exec, _mesa_GetMinmax);
+   SET_GetMinmaxParameterfvEXT(exec, _mesa_GetMinmaxParameterfv);
+   SET_GetMinmaxParameterivEXT(exec, _mesa_GetMinmaxParameteriv);
+#endif
+
+   /* 14. SGI_color_table */
+#if 0
+   SET_ColorTableSGI(exec, _mesa_ColorTable);
+   SET_ColorSubTableSGI(exec, _mesa_ColorSubTable);
+   SET_GetColorTableSGI(exec, _mesa_GetColorTable);
+   SET_GetColorTableParameterfvSGI(exec, _mesa_GetColorTableParameterfv);
+   SET_GetColorTableParameterivSGI(exec, _mesa_GetColorTableParameteriv);
+#endif
+
+   /* 30. GL_EXT_vertex_array */
+#if _HAVE_FULL_GL
+   SET_ColorPointerEXT(exec, _mesa_ColorPointerEXT);
+   SET_EdgeFlagPointerEXT(exec, _mesa_EdgeFlagPointerEXT);
+   SET_IndexPointerEXT(exec, _mesa_IndexPointerEXT);
+   SET_NormalPointerEXT(exec, _mesa_NormalPointerEXT);
+   SET_TexCoordPointerEXT(exec, _mesa_TexCoordPointerEXT);
+   SET_VertexPointerEXT(exec, _mesa_VertexPointerEXT);
+#endif
+
+   /* 37. GL_EXT_blend_minmax */
+#if 0
+   SET_BlendEquationEXT(exec, _mesa_BlendEquationEXT);
+#endif
+
+   /* 54. GL_EXT_point_parameters */
+#if _HAVE_FULL_GL
+   SET_PointParameterfEXT(exec, _mesa_PointParameterf);
+   SET_PointParameterfvEXT(exec, _mesa_PointParameterfv);
+#endif
+
+   /* 97. GL_EXT_compiled_vertex_array */
+#if _HAVE_FULL_GL
+   SET_LockArraysEXT(exec, _mesa_LockArraysEXT);
+   SET_UnlockArraysEXT(exec, _mesa_UnlockArraysEXT);
+#endif
+
+   /* 148. GL_EXT_multi_draw_arrays */
+#if _HAVE_FULL_GL
+   SET_MultiDrawArraysEXT(exec, _mesa_MultiDrawArraysEXT);
+   SET_MultiDrawElementsEXT(exec, _mesa_MultiDrawElementsEXT);
+#endif
+
+   /* 173. GL_INGR_blend_func_separate */
+#if _HAVE_FULL_GL
+   SET_BlendFuncSeparateEXT(exec, _mesa_BlendFuncSeparateEXT);
+#endif
+
+   /* 196. GL_MESA_resize_buffers */
+#if _HAVE_FULL_GL
+   SET_ResizeBuffersMESA(exec, _mesa_ResizeBuffersMESA);
+#endif
+
+   /* 197. GL_MESA_window_pos */
+#if _HAVE_FULL_GL
+   SET_WindowPos2dMESA(exec, _mesa_WindowPos2dMESA);
+   SET_WindowPos2dvMESA(exec, _mesa_WindowPos2dvMESA);
+   SET_WindowPos2fMESA(exec, _mesa_WindowPos2fMESA);
+   SET_WindowPos2fvMESA(exec, _mesa_WindowPos2fvMESA);
+   SET_WindowPos2iMESA(exec, _mesa_WindowPos2iMESA);
+   SET_WindowPos2ivMESA(exec, _mesa_WindowPos2ivMESA);
+   SET_WindowPos2sMESA(exec, _mesa_WindowPos2sMESA);
+   SET_WindowPos2svMESA(exec, _mesa_WindowPos2svMESA);
+   SET_WindowPos3dMESA(exec, _mesa_WindowPos3dMESA);
+   SET_WindowPos3dvMESA(exec, _mesa_WindowPos3dvMESA);
+   SET_WindowPos3fMESA(exec, _mesa_WindowPos3fMESA);
+   SET_WindowPos3fvMESA(exec, _mesa_WindowPos3fvMESA);
+   SET_WindowPos3iMESA(exec, _mesa_WindowPos3iMESA);
+   SET_WindowPos3ivMESA(exec, _mesa_WindowPos3ivMESA);
+   SET_WindowPos3sMESA(exec, _mesa_WindowPos3sMESA);
+   SET_WindowPos3svMESA(exec, _mesa_WindowPos3svMESA);
+   SET_WindowPos4dMESA(exec, _mesa_WindowPos4dMESA);
+   SET_WindowPos4dvMESA(exec, _mesa_WindowPos4dvMESA);
+   SET_WindowPos4fMESA(exec, _mesa_WindowPos4fMESA);
+   SET_WindowPos4fvMESA(exec, _mesa_WindowPos4fvMESA);
+   SET_WindowPos4iMESA(exec, _mesa_WindowPos4iMESA);
+   SET_WindowPos4ivMESA(exec, _mesa_WindowPos4ivMESA);
+   SET_WindowPos4sMESA(exec, _mesa_WindowPos4sMESA);
+   SET_WindowPos4svMESA(exec, _mesa_WindowPos4svMESA);
+#endif
+
+   /* 200. GL_IBM_multimode_draw_arrays */
+#if _HAVE_FULL_GL
+   SET_MultiModeDrawArraysIBM(exec, _mesa_MultiModeDrawArraysIBM);
+   SET_MultiModeDrawElementsIBM(exec, _mesa_MultiModeDrawElementsIBM);
+#endif
+
+   /* 233. GL_NV_vertex_program */
+#if FEATURE_NV_vertex_program
+   SET_BindProgramNV(exec, _mesa_BindProgram);
+   SET_DeleteProgramsNV(exec, _mesa_DeletePrograms);
+   SET_ExecuteProgramNV(exec, _mesa_ExecuteProgramNV);
+   SET_GenProgramsNV(exec, _mesa_GenPrograms);
+   SET_AreProgramsResidentNV(exec, _mesa_AreProgramsResidentNV);
+   SET_RequestResidentProgramsNV(exec, _mesa_RequestResidentProgramsNV);
+   SET_GetProgramParameterfvNV(exec, _mesa_GetProgramParameterfvNV);
+   SET_GetProgramParameterdvNV(exec, _mesa_GetProgramParameterdvNV);
+   SET_GetProgramivNV(exec, _mesa_GetProgramivNV);
+   SET_GetProgramStringNV(exec, _mesa_GetProgramStringNV);
+   SET_GetTrackMatrixivNV(exec, _mesa_GetTrackMatrixivNV);
+   SET_GetVertexAttribdvNV(exec, _mesa_GetVertexAttribdvNV);
+   SET_GetVertexAttribfvNV(exec, _mesa_GetVertexAttribfvNV);
+   SET_GetVertexAttribivNV(exec, _mesa_GetVertexAttribivNV);
+   SET_GetVertexAttribPointervNV(exec, _mesa_GetVertexAttribPointervNV);
+   SET_IsProgramNV(exec, _mesa_IsProgramARB);
+   SET_LoadProgramNV(exec, _mesa_LoadProgramNV);
+   SET_ProgramEnvParameter4dARB(exec, _mesa_ProgramEnvParameter4dARB); /* alias to ProgramParameter4dNV */
+   SET_ProgramEnvParameter4dvARB(exec, _mesa_ProgramEnvParameter4dvARB);  /* alias to ProgramParameter4dvNV */
+   SET_ProgramEnvParameter4fARB(exec, _mesa_ProgramEnvParameter4fARB);  /* alias to ProgramParameter4fNV */
+   SET_ProgramEnvParameter4fvARB(exec, _mesa_ProgramEnvParameter4fvARB);  /* alias to ProgramParameter4fvNV */
+   SET_ProgramParameters4dvNV(exec, _mesa_ProgramParameters4dvNV);
+   SET_ProgramParameters4fvNV(exec, _mesa_ProgramParameters4fvNV);
+   SET_TrackMatrixNV(exec, _mesa_TrackMatrixNV);
+   SET_VertexAttribPointerNV(exec, _mesa_VertexAttribPointerNV);
+   /* glVertexAttrib*NV functions handled in api_loopback.c */
+#endif
+
+   /* 273. GL_APPLE_vertex_array_object */
+   SET_BindVertexArrayAPPLE(exec, _mesa_BindVertexArrayAPPLE);
+   SET_DeleteVertexArraysAPPLE(exec, _mesa_DeleteVertexArraysAPPLE);
+   SET_GenVertexArraysAPPLE(exec, _mesa_GenVertexArraysAPPLE);
+   SET_IsVertexArrayAPPLE(exec, _mesa_IsVertexArrayAPPLE);
+
+   /* 282. GL_NV_fragment_program */
+#if FEATURE_NV_fragment_program
+   SET_ProgramNamedParameter4fNV(exec, _mesa_ProgramNamedParameter4fNV);
+   SET_ProgramNamedParameter4dNV(exec, _mesa_ProgramNamedParameter4dNV);
+   SET_ProgramNamedParameter4fvNV(exec, _mesa_ProgramNamedParameter4fvNV);
+   SET_ProgramNamedParameter4dvNV(exec, _mesa_ProgramNamedParameter4dvNV);
+   SET_GetProgramNamedParameterfvNV(exec, _mesa_GetProgramNamedParameterfvNV);
+   SET_GetProgramNamedParameterdvNV(exec, _mesa_GetProgramNamedParameterdvNV);
+   SET_ProgramLocalParameter4dARB(exec, _mesa_ProgramLocalParameter4dARB);
+   SET_ProgramLocalParameter4dvARB(exec, _mesa_ProgramLocalParameter4dvARB);
+   SET_ProgramLocalParameter4fARB(exec, _mesa_ProgramLocalParameter4fARB);
+   SET_ProgramLocalParameter4fvARB(exec, _mesa_ProgramLocalParameter4fvARB);
+   SET_GetProgramLocalParameterdvARB(exec, _mesa_GetProgramLocalParameterdvARB);
+   SET_GetProgramLocalParameterfvARB(exec, _mesa_GetProgramLocalParameterfvARB);
+#endif
+
+   /* 262. GL_NV_point_sprite */
+#if _HAVE_FULL_GL
+   SET_PointParameteriNV(exec, _mesa_PointParameteri);
+   SET_PointParameterivNV(exec, _mesa_PointParameteriv);
+#endif
+
+   /* 268. GL_EXT_stencil_two_side */
+#if _HAVE_FULL_GL
+   SET_ActiveStencilFaceEXT(exec, _mesa_ActiveStencilFaceEXT);
+#endif
+
+   /* ???. GL_EXT_depth_bounds_test */
+   SET_DepthBoundsEXT(exec, _mesa_DepthBoundsEXT);
+
+   /* ARB 1. GL_ARB_multitexture */
+#if _HAVE_FULL_GL
+   SET_ActiveTextureARB(exec, _mesa_ActiveTextureARB);
+   SET_ClientActiveTextureARB(exec, _mesa_ClientActiveTextureARB);
+#endif
+
+   /* ARB 3. GL_ARB_transpose_matrix */
+#if _HAVE_FULL_GL
+   SET_LoadTransposeMatrixdARB(exec, _mesa_LoadTransposeMatrixdARB);
+   SET_LoadTransposeMatrixfARB(exec, _mesa_LoadTransposeMatrixfARB);
+   SET_MultTransposeMatrixdARB(exec, _mesa_MultTransposeMatrixdARB);
+   SET_MultTransposeMatrixfARB(exec, _mesa_MultTransposeMatrixfARB);
+#endif
+
+   /* ARB 5. GL_ARB_multisample */
+#if _HAVE_FULL_GL
+   SET_SampleCoverageARB(exec, _mesa_SampleCoverageARB);
+#endif
+
+   /* ARB 12. GL_ARB_texture_compression */
+#if _HAVE_FULL_GL
+   SET_CompressedTexImage3DARB(exec, _mesa_CompressedTexImage3DARB);
+   SET_CompressedTexImage2DARB(exec, _mesa_CompressedTexImage2DARB);
+   SET_CompressedTexImage1DARB(exec, _mesa_CompressedTexImage1DARB);
+   SET_CompressedTexSubImage3DARB(exec, _mesa_CompressedTexSubImage3DARB);
+   SET_CompressedTexSubImage2DARB(exec, _mesa_CompressedTexSubImage2DARB);
+   SET_CompressedTexSubImage1DARB(exec, _mesa_CompressedTexSubImage1DARB);
+   SET_GetCompressedTexImageARB(exec, _mesa_GetCompressedTexImageARB);
+#endif
+
+   /* ARB 14. GL_ARB_point_parameters */
+   /* reuse EXT_point_parameters functions */
+
+   /* ARB 26. GL_ARB_vertex_program */
+   /* ARB 27. GL_ARB_fragment_program */
+#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
+   /* glVertexAttrib1sARB aliases glVertexAttrib1sNV */
+   /* glVertexAttrib1fARB aliases glVertexAttrib1fNV */
+   /* glVertexAttrib1dARB aliases glVertexAttrib1dNV */
+   /* glVertexAttrib2sARB aliases glVertexAttrib2sNV */
+   /* glVertexAttrib2fARB aliases glVertexAttrib2fNV */
+   /* glVertexAttrib2dARB aliases glVertexAttrib2dNV */
+   /* glVertexAttrib3sARB aliases glVertexAttrib3sNV */
+   /* glVertexAttrib3fARB aliases glVertexAttrib3fNV */
+   /* glVertexAttrib3dARB aliases glVertexAttrib3dNV */
+   /* glVertexAttrib4sARB aliases glVertexAttrib4sNV */
+   /* glVertexAttrib4fARB aliases glVertexAttrib4fNV */
+   /* glVertexAttrib4dARB aliases glVertexAttrib4dNV */
+   /* glVertexAttrib4NubARB aliases glVertexAttrib4NubNV */
+   /* glVertexAttrib1svARB aliases glVertexAttrib1svNV */
+   /* glVertexAttrib1fvARB aliases glVertexAttrib1fvNV */
+   /* glVertexAttrib1dvARB aliases glVertexAttrib1dvNV */
+   /* glVertexAttrib2svARB aliases glVertexAttrib2svNV */
+   /* glVertexAttrib2fvARB aliases glVertexAttrib2fvNV */
+   /* glVertexAttrib2dvARB aliases glVertexAttrib2dvNV */
+   /* glVertexAttrib3svARB aliases glVertexAttrib3svNV */
+   /* glVertexAttrib3fvARB aliases glVertexAttrib3fvNV */
+   /* glVertexAttrib3dvARB aliases glVertexAttrib3dvNV */
+   /* glVertexAttrib4svARB aliases glVertexAttrib4svNV */
+   /* glVertexAttrib4fvARB aliases glVertexAttrib4fvNV */
+   /* glVertexAttrib4dvARB aliases glVertexAttrib4dvNV */
+   /* glVertexAttrib4NubvARB aliases glVertexAttrib4NubvNV */
+   /* glVertexAttrib4bvARB handled in api_loopback.c */
+   /* glVertexAttrib4ivARB handled in api_loopback.c */
+   /* glVertexAttrib4ubvARB handled in api_loopback.c */
+   /* glVertexAttrib4usvARB handled in api_loopback.c */
+   /* glVertexAttrib4uivARB handled in api_loopback.c */
+   /* glVertexAttrib4NbvARB handled in api_loopback.c */
+   /* glVertexAttrib4NsvARB handled in api_loopback.c */
+   /* glVertexAttrib4NivARB handled in api_loopback.c */
+   /* glVertexAttrib4NusvARB handled in api_loopback.c */
+   /* glVertexAttrib4NuivARB handled in api_loopback.c */
+   SET_VertexAttribPointerARB(exec, _mesa_VertexAttribPointerARB);
+   SET_EnableVertexAttribArrayARB(exec, _mesa_EnableVertexAttribArrayARB);
+   SET_DisableVertexAttribArrayARB(exec, _mesa_DisableVertexAttribArrayARB);
+   SET_ProgramStringARB(exec, _mesa_ProgramStringARB);
+   /* glBindProgramARB aliases glBindProgramNV */
+   /* glDeleteProgramsARB aliases glDeleteProgramsNV */
+   /* glGenProgramsARB aliases glGenProgramsNV */
+   /* glIsProgramARB aliases glIsProgramNV */
+   SET_GetVertexAttribdvARB(exec, _mesa_GetVertexAttribdvARB);
+   SET_GetVertexAttribfvARB(exec, _mesa_GetVertexAttribfvARB);
+   SET_GetVertexAttribivARB(exec, _mesa_GetVertexAttribivARB);
+   /* glGetVertexAttribPointervARB aliases glGetVertexAttribPointervNV */
+   SET_ProgramEnvParameter4dARB(exec, _mesa_ProgramEnvParameter4dARB);
+   SET_ProgramEnvParameter4dvARB(exec, _mesa_ProgramEnvParameter4dvARB);
+   SET_ProgramEnvParameter4fARB(exec, _mesa_ProgramEnvParameter4fARB);
+   SET_ProgramEnvParameter4fvARB(exec, _mesa_ProgramEnvParameter4fvARB);
+   SET_ProgramLocalParameter4dARB(exec, _mesa_ProgramLocalParameter4dARB);
+   SET_ProgramLocalParameter4dvARB(exec, _mesa_ProgramLocalParameter4dvARB);
+   SET_ProgramLocalParameter4fARB(exec, _mesa_ProgramLocalParameter4fARB);
+   SET_ProgramLocalParameter4fvARB(exec, _mesa_ProgramLocalParameter4fvARB);
+   SET_GetProgramEnvParameterdvARB(exec, _mesa_GetProgramEnvParameterdvARB);
+   SET_GetProgramEnvParameterfvARB(exec, _mesa_GetProgramEnvParameterfvARB);
+   SET_GetProgramLocalParameterdvARB(exec, _mesa_GetProgramLocalParameterdvARB);
+   SET_GetProgramLocalParameterfvARB(exec, _mesa_GetProgramLocalParameterfvARB);
+   SET_GetProgramivARB(exec, _mesa_GetProgramivARB);
+   SET_GetProgramStringARB(exec, _mesa_GetProgramStringARB);
+#endif
+
+   /* ARB 28. GL_ARB_vertex_buffer_object */
+#if FEATURE_ARB_vertex_buffer_object
+   SET_BindBufferARB(exec, _mesa_BindBufferARB);
+   SET_BufferDataARB(exec, _mesa_BufferDataARB);
+   SET_BufferSubDataARB(exec, _mesa_BufferSubDataARB);
+   SET_DeleteBuffersARB(exec, _mesa_DeleteBuffersARB);
+   SET_GenBuffersARB(exec, _mesa_GenBuffersARB);
+   SET_GetBufferParameterivARB(exec, _mesa_GetBufferParameterivARB);
+   SET_GetBufferPointervARB(exec, _mesa_GetBufferPointervARB);
+   SET_GetBufferSubDataARB(exec, _mesa_GetBufferSubDataARB);
+   SET_IsBufferARB(exec, _mesa_IsBufferARB);
+   SET_MapBufferARB(exec, _mesa_MapBufferARB);
+   SET_UnmapBufferARB(exec, _mesa_UnmapBufferARB);
+#endif
+
+   /* ARB 29. GL_ARB_occlusion_query */
+#if FEATURE_ARB_occlusion_query
+   SET_GenQueriesARB(exec, _mesa_GenQueriesARB);
+   SET_DeleteQueriesARB(exec, _mesa_DeleteQueriesARB);
+   SET_IsQueryARB(exec, _mesa_IsQueryARB);
+   SET_BeginQueryARB(exec, _mesa_BeginQueryARB);
+   SET_EndQueryARB(exec, _mesa_EndQueryARB);
+   SET_GetQueryivARB(exec, _mesa_GetQueryivARB);
+   SET_GetQueryObjectivARB(exec, _mesa_GetQueryObjectivARB);
+   SET_GetQueryObjectuivARB(exec, _mesa_GetQueryObjectuivARB);
+#endif
+
+   /* ARB 37. GL_ARB_draw_buffers */
+   SET_DrawBuffersARB(exec, _mesa_DrawBuffersARB);
+   
+#if FEATURE_ARB_shader_objects
+   SET_DeleteObjectARB(exec, _mesa_DeleteObjectARB);
+   SET_GetHandleARB(exec, _mesa_GetHandleARB);
+   SET_DetachObjectARB(exec, _mesa_DetachObjectARB);
+   SET_CreateShaderObjectARB(exec, _mesa_CreateShaderObjectARB);
+   SET_ShaderSourceARB(exec, _mesa_ShaderSourceARB);
+   SET_CompileShaderARB(exec, _mesa_CompileShaderARB);
+   SET_CreateProgramObjectARB(exec, _mesa_CreateProgramObjectARB);
+   SET_AttachObjectARB(exec, _mesa_AttachObjectARB);
+   SET_LinkProgramARB(exec, _mesa_LinkProgramARB);
+   SET_UseProgramObjectARB(exec, _mesa_UseProgramObjectARB);
+   SET_ValidateProgramARB(exec, _mesa_ValidateProgramARB);
+   SET_Uniform1fARB(exec, _mesa_Uniform1fARB);
+   SET_Uniform2fARB(exec, _mesa_Uniform2fARB);
+   SET_Uniform3fARB(exec, _mesa_Uniform3fARB);
+   SET_Uniform4fARB(exec, _mesa_Uniform4fARB);
+   SET_Uniform1iARB(exec, _mesa_Uniform1iARB);
+   SET_Uniform2iARB(exec, _mesa_Uniform2iARB);
+   SET_Uniform3iARB(exec, _mesa_Uniform3iARB);
+   SET_Uniform4iARB(exec, _mesa_Uniform4iARB);
+   SET_Uniform1fvARB(exec, _mesa_Uniform1fvARB);
+   SET_Uniform2fvARB(exec, _mesa_Uniform2fvARB);
+   SET_Uniform3fvARB(exec, _mesa_Uniform3fvARB);
+   SET_Uniform4fvARB(exec, _mesa_Uniform4fvARB);
+   SET_Uniform1ivARB(exec, _mesa_Uniform1ivARB);
+   SET_Uniform2ivARB(exec, _mesa_Uniform2ivARB);
+   SET_Uniform3ivARB(exec, _mesa_Uniform3ivARB);
+   SET_Uniform4ivARB(exec, _mesa_Uniform4ivARB);
+   SET_UniformMatrix2fvARB(exec, _mesa_UniformMatrix2fvARB);
+   SET_UniformMatrix3fvARB(exec, _mesa_UniformMatrix3fvARB);
+   SET_UniformMatrix4fvARB(exec, _mesa_UniformMatrix4fvARB);
+   SET_GetObjectParameterfvARB(exec, _mesa_GetObjectParameterfvARB);
+   SET_GetObjectParameterivARB(exec, _mesa_GetObjectParameterivARB);
+   SET_GetInfoLogARB(exec, _mesa_GetInfoLogARB);
+   SET_GetAttachedObjectsARB(exec, _mesa_GetAttachedObjectsARB);
+   SET_GetUniformLocationARB(exec, _mesa_GetUniformLocationARB);
+   SET_GetActiveUniformARB(exec, _mesa_GetActiveUniformARB);
+   SET_GetUniformfvARB(exec, _mesa_GetUniformfvARB);
+   SET_GetUniformivARB(exec, _mesa_GetUniformivARB);
+   SET_GetShaderSourceARB(exec, _mesa_GetShaderSourceARB);
+#endif    /* FEATURE_ARB_shader_objects */
+
+#if FEATURE_ARB_vertex_shader
+   SET_BindAttribLocationARB(exec, _mesa_BindAttribLocationARB);
+   SET_GetActiveAttribARB(exec, _mesa_GetActiveAttribARB);
+   SET_GetAttribLocationARB(exec, _mesa_GetAttribLocationARB);
+#endif    /* FEATURE_ARB_vertex_shader */
+
+  /* GL_ATI_fragment_shader */
+#if FEATURE_ATI_fragment_shader
+   SET_GenFragmentShadersATI(exec, _mesa_GenFragmentShadersATI);
+   SET_BindFragmentShaderATI(exec, _mesa_BindFragmentShaderATI);
+   SET_DeleteFragmentShaderATI(exec, _mesa_DeleteFragmentShaderATI);
+   SET_BeginFragmentShaderATI(exec, _mesa_BeginFragmentShaderATI);
+   SET_EndFragmentShaderATI(exec, _mesa_EndFragmentShaderATI);
+   SET_PassTexCoordATI(exec, _mesa_PassTexCoordATI);
+   SET_SampleMapATI(exec, _mesa_SampleMapATI);
+   SET_ColorFragmentOp1ATI(exec, _mesa_ColorFragmentOp1ATI);
+   SET_ColorFragmentOp2ATI(exec, _mesa_ColorFragmentOp2ATI);
+   SET_ColorFragmentOp3ATI(exec, _mesa_ColorFragmentOp3ATI);
+   SET_AlphaFragmentOp1ATI(exec, _mesa_AlphaFragmentOp1ATI);
+   SET_AlphaFragmentOp2ATI(exec, _mesa_AlphaFragmentOp2ATI);
+   SET_AlphaFragmentOp3ATI(exec, _mesa_AlphaFragmentOp3ATI);
+   SET_SetFragmentShaderConstantATI(exec, _mesa_SetFragmentShaderConstantATI);
+#endif
+
+#if FEATURE_EXT_framebuffer_object
+   SET_IsRenderbufferEXT(exec, _mesa_IsRenderbufferEXT);
+   SET_BindRenderbufferEXT(exec, _mesa_BindRenderbufferEXT);
+   SET_DeleteRenderbuffersEXT(exec, _mesa_DeleteRenderbuffersEXT);
+   SET_GenRenderbuffersEXT(exec, _mesa_GenRenderbuffersEXT);
+   SET_RenderbufferStorageEXT(exec, _mesa_RenderbufferStorageEXT);
+   SET_GetRenderbufferParameterivEXT(exec, _mesa_GetRenderbufferParameterivEXT);
+   SET_IsFramebufferEXT(exec, _mesa_IsFramebufferEXT);
+   SET_BindFramebufferEXT(exec, _mesa_BindFramebufferEXT);
+   SET_DeleteFramebuffersEXT(exec, _mesa_DeleteFramebuffersEXT);
+   SET_GenFramebuffersEXT(exec, _mesa_GenFramebuffersEXT);
+   SET_CheckFramebufferStatusEXT(exec, _mesa_CheckFramebufferStatusEXT);
+   SET_FramebufferTexture1DEXT(exec, _mesa_FramebufferTexture1DEXT);
+   SET_FramebufferTexture2DEXT(exec, _mesa_FramebufferTexture2DEXT);
+   SET_FramebufferTexture3DEXT(exec, _mesa_FramebufferTexture3DEXT);
+   SET_FramebufferRenderbufferEXT(exec, _mesa_FramebufferRenderbufferEXT);
+   SET_GetFramebufferAttachmentParameterivEXT(exec, _mesa_GetFramebufferAttachmentParameterivEXT);
+   SET_GenerateMipmapEXT(exec, _mesa_GenerateMipmapEXT);
+#endif
+
+#if FEATURE_EXT_timer_query
+   SET_GetQueryObjecti64vEXT(exec, _mesa_GetQueryObjecti64vEXT);
+   SET_GetQueryObjectui64vEXT(exec, _mesa_GetQueryObjectui64vEXT);
+#endif
+
+#if FEATURE_EXT_framebuffer_blit
+   SET_BlitFramebufferEXT(exec, _mesa_BlitFramebufferEXT);
+#endif
+
+   /* GL_EXT_gpu_program_parameters */
+#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
+   SET_ProgramEnvParameters4fvEXT(exec, _mesa_ProgramEnvParameters4fvEXT);
+   SET_ProgramLocalParameters4fvEXT(exec, _mesa_ProgramLocalParameters4fvEXT);
+#endif
+
+   /* GL_MESA_texture_array / GL_EXT_texture_array */
+#if FEATURE_EXT_framebuffer_object
+   SET_FramebufferTextureLayerEXT(exec, _mesa_FramebufferTextureLayerEXT);
+#endif
+
+   /* GL_ATI_separate_stencil */
+   SET_StencilFuncSeparateATI(exec, _mesa_StencilFuncSeparateATI);
+}
+
diff --git a/src/mesa/main/api_exec.h b/src/mesa/main/api_exec.h
new file mode 100644
index 0000000000..7f15ea9d00
--- /dev/null
+++ b/src/mesa/main/api_exec.h
@@ -0,0 +1,34 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.1
+ *
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef API_EXEC_H
+#define API_EXEC_H
+
+
+void
+_mesa_init_exec_table(struct _glapi_table *exec);
+
+
+#endif
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 522420592c..465d6b3f89 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -79,6 +79,7 @@
 #include "glheader.h"
 #include "imports.h"
 #include "accum.h"
+#include "api_exec.h"
 #include "arrayobj.h"
 #include "attrib.h"
 #include "blend.h"
diff --git a/src/mesa/main/sources b/src/mesa/main/sources
index 8ef5bd62fa..06f32f2275 100644
--- a/src/mesa/main/sources
+++ b/src/mesa/main/sources
@@ -2,6 +2,7 @@
 MESA_MAIN_SOURCES = \
 accum.c \
 api_arrayelt.c \
+api_exec.c \
 api_loopback.c \
 api_noop.c \
 api_validate.c \
@@ -72,6 +73,7 @@ MESA_MAIN_HEADERS = \
 accum.h \
 api_arrayelt.h \
 api_eval.h \
+api_exec.h \
 api_loopback.h \
 api_noop.h \
 api_validate.h \
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 64f911e699..89920f8443 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -27,809 +27,26 @@
  * \file state.c
  * State management.
  * 
- * This file manages recalculation of derived values in the __GLcontextRec.
- * Also, this is where we initialize the API dispatch table.
+ * This file manages recalculation of derived values in GLcontext.
  */
 
+
 #include "glheader.h"
-#include "accum.h"
-#include "api_loopback.h"
-#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
-#include "shader/arbprogram.h"
-#endif
-#if FEATURE_ATI_fragment_shader
-#include "shader/atifragshader.h"
-#endif
-#include "attrib.h"
-#include "blend.h"
-#if FEATURE_ARB_vertex_buffer_object
-#include "bufferobj.h"
-#endif
-#include "arrayobj.h"
-#include "buffers.h"
-#include "clip.h"
-#include "colortab.h"
+#include "mtypes.h"
 #include "context.h"
-#include "convolve.h"
-#include "depth.h"
-#include "dlist.h"
-#include "drawpix.h"
-#include "enable.h"
-#include "eval.h"
-#include "get.h"
-#include "feedback.h"
-#include "fog.h"
-#if FEATURE_EXT_framebuffer_object
-#include "fbobject.h"
-#endif
+#include "debug.h"
+#include "macros.h"
 #include "ffvertex_prog.h"
 #include "framebuffer.h"
-#include "hint.h"
-#include "histogram.h"
-#include "imports.h"
 #include "light.h"
-#include "lines.h"
-#include "macros.h"
 #include "matrix.h"
 #include "pixel.h"
-#include "pixelstore.h"
-#include "points.h"
-#include "polygon.h"
-#if FEATURE_ARB_occlusion_query || FEATURE_EXT_timer_query
-#include "queryobj.h"
-#endif
-#include "rastpos.h"
-#include "readpix.h"
+#include "shader/program.h"
 #include "state.h"
 #include "stencil.h"
-#include "teximage.h"
+#include "texenvprogram.h"
 #include "texobj.h"
 #include "texstate.h"
-#include "mtypes.h"
-#include "varray.h"
-#if FEATURE_NV_vertex_program
-#include "shader/nvprogram.h"
-#endif
-#if FEATURE_NV_fragment_program
-#include "shader/nvprogram.h"
-#include "shader/program.h"
-#include "texenvprogram.h"
-#endif
-#if FEATURE_ARB_shader_objects
-#include "shaders.h"
-#endif
-#include "debug.h"
-#include "glapi/dispatch.h"
-
-
-
-/**
- * Initialize a dispatch table with pointers to Mesa's immediate-mode
- * commands.
- *
- * Pointers to glBegin()/glEnd() object commands and a few others
- * are provided via the GLvertexformat interface.
- *
- * \param ctx  GL context to which \c exec belongs.
- * \param exec dispatch table.
- */
-void
-_mesa_init_exec_table(struct _glapi_table *exec)
-{
-#if _HAVE_FULL_GL
-   _mesa_loopback_init_api_table( exec );
-#endif
-
-   /* load the dispatch slots we understand */
-   SET_AlphaFunc(exec, _mesa_AlphaFunc);
-   SET_BlendFunc(exec, _mesa_BlendFunc);
-   SET_Clear(exec, _mesa_Clear);
-   SET_ClearColor(exec, _mesa_ClearColor);
-   SET_ClearStencil(exec, _mesa_ClearStencil);
-   SET_ColorMask(exec, _mesa_ColorMask);
-   SET_CullFace(exec, _mesa_CullFace);
-   SET_Disable(exec, _mesa_Disable);
-   SET_DrawBuffer(exec, _mesa_DrawBuffer);
-   SET_Enable(exec, _mesa_Enable);
-   SET_Finish(exec, _mesa_Finish);
-   SET_Flush(exec, _mesa_Flush);
-   SET_FrontFace(exec, _mesa_FrontFace);
-   SET_Frustum(exec, _mesa_Frustum);
-   SET_GetError(exec, _mesa_GetError);
-   SET_GetFloatv(exec, _mesa_GetFloatv);
-   SET_GetString(exec, _mesa_GetString);
-   SET_InitNames(exec, _mesa_InitNames);
-   SET_LineStipple(exec, _mesa_LineStipple);
-   SET_LineWidth(exec, _mesa_LineWidth);
-   SET_LoadIdentity(exec, _mesa_LoadIdentity);
-   SET_LoadMatrixf(exec, _mesa_LoadMatrixf);
-   SET_LoadName(exec, _mesa_LoadName);
-   SET_LogicOp(exec, _mesa_LogicOp);
-   SET_MatrixMode(exec, _mesa_MatrixMode);
-   SET_MultMatrixf(exec, _mesa_MultMatrixf);
-   SET_Ortho(exec, _mesa_Ortho);
-   SET_PixelStorei(exec, _mesa_PixelStorei);
-   SET_PopMatrix(exec, _mesa_PopMatrix);
-   SET_PopName(exec, _mesa_PopName);
-   SET_PushMatrix(exec, _mesa_PushMatrix);
-   SET_PushName(exec, _mesa_PushName);
-   SET_RasterPos2f(exec, _mesa_RasterPos2f);
-   SET_RasterPos2fv(exec, _mesa_RasterPos2fv);
-   SET_RasterPos2i(exec, _mesa_RasterPos2i);
-   SET_RasterPos2iv(exec, _mesa_RasterPos2iv);
-   SET_ReadBuffer(exec, _mesa_ReadBuffer);
-   SET_RenderMode(exec, _mesa_RenderMode);
-   SET_Rotatef(exec, _mesa_Rotatef);
-   SET_Scalef(exec, _mesa_Scalef);
-   SET_Scissor(exec, _mesa_Scissor);
-   SET_SelectBuffer(exec, _mesa_SelectBuffer);
-   SET_ShadeModel(exec, _mesa_ShadeModel);
-   SET_StencilFunc(exec, _mesa_StencilFunc);
-   SET_StencilMask(exec, _mesa_StencilMask);
-   SET_StencilOp(exec, _mesa_StencilOp);
-   SET_TexEnvfv(exec, _mesa_TexEnvfv);
-   SET_TexEnvi(exec, _mesa_TexEnvi);
-   SET_TexImage2D(exec, _mesa_TexImage2D);
-   SET_TexParameteri(exec, _mesa_TexParameteri);
-   SET_Translatef(exec, _mesa_Translatef);
-   SET_Viewport(exec, _mesa_Viewport);
-#if _HAVE_FULL_GL
-   SET_Accum(exec, _mesa_Accum);
-   SET_Bitmap(exec, _mesa_Bitmap);
-   SET_CallList(exec, _mesa_CallList);
-   SET_CallLists(exec, _mesa_CallLists);
-   SET_ClearAccum(exec, _mesa_ClearAccum);
-   SET_ClearDepth(exec, _mesa_ClearDepth);
-   SET_ClearIndex(exec, _mesa_ClearIndex);
-   SET_ClipPlane(exec, _mesa_ClipPlane);
-   SET_ColorMaterial(exec, _mesa_ColorMaterial);
-   SET_CopyPixels(exec, _mesa_CopyPixels);
-   SET_CullParameterfvEXT(exec, _mesa_CullParameterfvEXT);
-   SET_CullParameterdvEXT(exec, _mesa_CullParameterdvEXT);
-   SET_DeleteLists(exec, _mesa_DeleteLists);
-   SET_DepthFunc(exec, _mesa_DepthFunc);
-   SET_DepthMask(exec, _mesa_DepthMask);
-   SET_DepthRange(exec, _mesa_DepthRange);
-   SET_DrawPixels(exec, _mesa_DrawPixels);
-   SET_EndList(exec, _mesa_EndList);
-   SET_FeedbackBuffer(exec, _mesa_FeedbackBuffer);
-   SET_FogCoordPointerEXT(exec, _mesa_FogCoordPointerEXT);
-   SET_Fogf(exec, _mesa_Fogf);
-   SET_Fogfv(exec, _mesa_Fogfv);
-   SET_Fogi(exec, _mesa_Fogi);
-   SET_Fogiv(exec, _mesa_Fogiv);
-   SET_GenLists(exec, _mesa_GenLists);
-   SET_GetClipPlane(exec, _mesa_GetClipPlane);
-   SET_GetBooleanv(exec, _mesa_GetBooleanv);
-   SET_GetDoublev(exec, _mesa_GetDoublev);
-   SET_GetIntegerv(exec, _mesa_GetIntegerv);
-   SET_GetLightfv(exec, _mesa_GetLightfv);
-   SET_GetLightiv(exec, _mesa_GetLightiv);
-   SET_GetMapdv(exec, _mesa_GetMapdv);
-   SET_GetMapfv(exec, _mesa_GetMapfv);
-   SET_GetMapiv(exec, _mesa_GetMapiv);
-   SET_GetMaterialfv(exec, _mesa_GetMaterialfv);
-   SET_GetMaterialiv(exec, _mesa_GetMaterialiv);
-   SET_GetPixelMapfv(exec, _mesa_GetPixelMapfv);
-   SET_GetPixelMapuiv(exec, _mesa_GetPixelMapuiv);
-   SET_GetPixelMapusv(exec, _mesa_GetPixelMapusv);
-   SET_GetPolygonStipple(exec, _mesa_GetPolygonStipple);
-   SET_GetTexEnvfv(exec, _mesa_GetTexEnvfv);
-   SET_GetTexEnviv(exec, _mesa_GetTexEnviv);
-   SET_GetTexLevelParameterfv(exec, _mesa_GetTexLevelParameterfv);
-   SET_GetTexLevelParameteriv(exec, _mesa_GetTexLevelParameteriv);
-   SET_GetTexParameterfv(exec, _mesa_GetTexParameterfv);
-   SET_GetTexParameteriv(exec, _mesa_GetTexParameteriv);
-   SET_GetTexGendv(exec, _mesa_GetTexGendv);
-   SET_GetTexGenfv(exec, _mesa_GetTexGenfv);
-   SET_GetTexGeniv(exec, _mesa_GetTexGeniv);
-   SET_GetTexImage(exec, _mesa_GetTexImage);
-   SET_Hint(exec, _mesa_Hint);
-   SET_IndexMask(exec, _mesa_IndexMask);
-   SET_IsEnabled(exec, _mesa_IsEnabled);
-   SET_IsList(exec, _mesa_IsList);
-   SET_LightModelf(exec, _mesa_LightModelf);
-   SET_LightModelfv(exec, _mesa_LightModelfv);
-   SET_LightModeli(exec, _mesa_LightModeli);
-   SET_LightModeliv(exec, _mesa_LightModeliv);
-   SET_Lightf(exec, _mesa_Lightf);
-   SET_Lightfv(exec, _mesa_Lightfv);
-   SET_Lighti(exec, _mesa_Lighti);
-   SET_Lightiv(exec, _mesa_Lightiv);
-   SET_ListBase(exec, _mesa_ListBase);
-   SET_LoadMatrixd(exec, _mesa_LoadMatrixd);
-   SET_Map1d(exec, _mesa_Map1d);
-   SET_Map1f(exec, _mesa_Map1f);
-   SET_Map2d(exec, _mesa_Map2d);
-   SET_Map2f(exec, _mesa_Map2f);
-   SET_MapGrid1d(exec, _mesa_MapGrid1d);
-   SET_MapGrid1f(exec, _mesa_MapGrid1f);
-   SET_MapGrid2d(exec, _mesa_MapGrid2d);
-   SET_MapGrid2f(exec, _mesa_MapGrid2f);
-   SET_MultMatrixd(exec, _mesa_MultMatrixd);
-   SET_NewList(exec, _mesa_NewList);
-   SET_PassThrough(exec, _mesa_PassThrough);
-   SET_PixelMapfv(exec, _mesa_PixelMapfv);
-   SET_PixelMapuiv(exec, _mesa_PixelMapuiv);
-   SET_PixelMapusv(exec, _mesa_PixelMapusv);
-   SET_PixelStoref(exec, _mesa_PixelStoref);
-   SET_PixelTransferf(exec, _mesa_PixelTransferf);
-   SET_PixelTransferi(exec, _mesa_PixelTransferi);
-   SET_PixelZoom(exec, _mesa_PixelZoom);
-   SET_PointSize(exec, _mesa_PointSize);
-   SET_PolygonMode(exec, _mesa_PolygonMode);
-   SET_PolygonOffset(exec, _mesa_PolygonOffset);
-   SET_PolygonStipple(exec, _mesa_PolygonStipple);
-   SET_PopAttrib(exec, _mesa_PopAttrib);
-   SET_PushAttrib(exec, _mesa_PushAttrib);
-   SET_RasterPos2d(exec, _mesa_RasterPos2d);
-   SET_RasterPos2dv(exec, _mesa_RasterPos2dv);
-   SET_RasterPos2s(exec, _mesa_RasterPos2s);
-   SET_RasterPos2sv(exec, _mesa_RasterPos2sv);
-   SET_RasterPos3d(exec, _mesa_RasterPos3d);
-   SET_RasterPos3dv(exec, _mesa_RasterPos3dv);
-   SET_RasterPos3f(exec, _mesa_RasterPos3f);
-   SET_RasterPos3fv(exec, _mesa_RasterPos3fv);
-   SET_RasterPos3i(exec, _mesa_RasterPos3i);
-   SET_RasterPos3iv(exec, _mesa_RasterPos3iv);
-   SET_RasterPos3s(exec, _mesa_RasterPos3s);
-   SET_RasterPos3sv(exec, _mesa_RasterPos3sv);
-   SET_RasterPos4d(exec, _mesa_RasterPos4d);
-   SET_RasterPos4dv(exec, _mesa_RasterPos4dv);
-   SET_RasterPos4f(exec, _mesa_RasterPos4f);
-   SET_RasterPos4fv(exec, _mesa_RasterPos4fv);
-   SET_RasterPos4i(exec, _mesa_RasterPos4i);
-   SET_RasterPos4iv(exec, _mesa_RasterPos4iv);
-   SET_RasterPos4s(exec, _mesa_RasterPos4s);
-   SET_RasterPos4sv(exec, _mesa_RasterPos4sv);
-   SET_ReadPixels(exec, _mesa_ReadPixels);
-   SET_Rotated(exec, _mesa_Rotated);
-   SET_Scaled(exec, _mesa_Scaled);
-   SET_SecondaryColorPointerEXT(exec, _mesa_SecondaryColorPointerEXT);
-   SET_TexEnvf(exec, _mesa_TexEnvf);
-   SET_TexEnviv(exec, _mesa_TexEnviv);
-   SET_TexGend(exec, _mesa_TexGend);
-   SET_TexGendv(exec, _mesa_TexGendv);
-   SET_TexGenf(exec, _mesa_TexGenf);
-   SET_TexGenfv(exec, _mesa_TexGenfv);
-   SET_TexGeni(exec, _mesa_TexGeni);
-   SET_TexGeniv(exec, _mesa_TexGeniv);
-   SET_TexImage1D(exec, _mesa_TexImage1D);
-   SET_TexParameterf(exec, _mesa_TexParameterf);
-   SET_TexParameterfv(exec, _mesa_TexParameterfv);
-   SET_TexParameteriv(exec, _mesa_TexParameteriv);
-   SET_Translated(exec, _mesa_Translated);
-#endif
-
-   /* 1.1 */
-   SET_BindTexture(exec, _mesa_BindTexture);
-   SET_DeleteTextures(exec, _mesa_DeleteTextures);
-   SET_GenTextures(exec, _mesa_GenTextures);
-#if _HAVE_FULL_GL
-   SET_AreTexturesResident(exec, _mesa_AreTexturesResident);
-   SET_ColorPointer(exec, _mesa_ColorPointer);
-   SET_CopyTexImage1D(exec, _mesa_CopyTexImage1D);
-   SET_CopyTexImage2D(exec, _mesa_CopyTexImage2D);
-   SET_CopyTexSubImage1D(exec, _mesa_CopyTexSubImage1D);
-   SET_CopyTexSubImage2D(exec, _mesa_CopyTexSubImage2D);
-   SET_DisableClientState(exec, _mesa_DisableClientState);
-   SET_EdgeFlagPointer(exec, _mesa_EdgeFlagPointer);
-   SET_EnableClientState(exec, _mesa_EnableClientState);
-   SET_GetPointerv(exec, _mesa_GetPointerv);
-   SET_IndexPointer(exec, _mesa_IndexPointer);
-   SET_InterleavedArrays(exec, _mesa_InterleavedArrays);
-   SET_IsTexture(exec, _mesa_IsTexture);
-   SET_NormalPointer(exec, _mesa_NormalPointer);
-   SET_PopClientAttrib(exec, _mesa_PopClientAttrib);
-   SET_PrioritizeTextures(exec, _mesa_PrioritizeTextures);
-   SET_PushClientAttrib(exec, _mesa_PushClientAttrib);
-   SET_TexCoordPointer(exec, _mesa_TexCoordPointer);
-   SET_TexSubImage1D(exec, _mesa_TexSubImage1D);
-   SET_TexSubImage2D(exec, _mesa_TexSubImage2D);
-   SET_VertexPointer(exec, _mesa_VertexPointer);
-#endif
-
-   /* 1.2 */
-#if _HAVE_FULL_GL
-   SET_CopyTexSubImage3D(exec, _mesa_CopyTexSubImage3D);
-   SET_TexImage3D(exec, _mesa_TexImage3D);
-   SET_TexSubImage3D(exec, _mesa_TexSubImage3D);
-#endif
-
-   /* OpenGL 1.2  GL_ARB_imaging */
-#if _HAVE_FULL_GL
-   SET_BlendColor(exec, _mesa_BlendColor);
-   SET_BlendEquation(exec, _mesa_BlendEquation);
-   SET_BlendEquationSeparateEXT(exec, _mesa_BlendEquationSeparateEXT);
-   SET_ColorSubTable(exec, _mesa_ColorSubTable);
-   SET_ColorTable(exec, _mesa_ColorTable);
-   SET_ColorTableParameterfv(exec, _mesa_ColorTableParameterfv);
-   SET_ColorTableParameteriv(exec, _mesa_ColorTableParameteriv);
-   SET_ConvolutionFilter1D(exec, _mesa_ConvolutionFilter1D);
-   SET_ConvolutionFilter2D(exec, _mesa_ConvolutionFilter2D);
-   SET_ConvolutionParameterf(exec, _mesa_ConvolutionParameterf);
-   SET_ConvolutionParameterfv(exec, _mesa_ConvolutionParameterfv);
-   SET_ConvolutionParameteri(exec, _mesa_ConvolutionParameteri);
-   SET_ConvolutionParameteriv(exec, _mesa_ConvolutionParameteriv);
-   SET_CopyColorSubTable(exec, _mesa_CopyColorSubTable);
-   SET_CopyColorTable(exec, _mesa_CopyColorTable);
-   SET_CopyConvolutionFilter1D(exec, _mesa_CopyConvolutionFilter1D);
-   SET_CopyConvolutionFilter2D(exec, _mesa_CopyConvolutionFilter2D);
-   SET_GetColorTable(exec, _mesa_GetColorTable);
-   SET_GetColorTableParameterfv(exec, _mesa_GetColorTableParameterfv);
-   SET_GetColorTableParameteriv(exec, _mesa_GetColorTableParameteriv);
-   SET_GetConvolutionFilter(exec, _mesa_GetConvolutionFilter);
-   SET_GetConvolutionParameterfv(exec, _mesa_GetConvolutionParameterfv);
-   SET_GetConvolutionParameteriv(exec, _mesa_GetConvolutionParameteriv);
-   SET_GetHistogram(exec, _mesa_GetHistogram);
-   SET_GetHistogramParameterfv(exec, _mesa_GetHistogramParameterfv);
-   SET_GetHistogramParameteriv(exec, _mesa_GetHistogramParameteriv);
-   SET_GetMinmax(exec, _mesa_GetMinmax);
-   SET_GetMinmaxParameterfv(exec, _mesa_GetMinmaxParameterfv);
-   SET_GetMinmaxParameteriv(exec, _mesa_GetMinmaxParameteriv);
-   SET_GetSeparableFilter(exec, _mesa_GetSeparableFilter);
-   SET_Histogram(exec, _mesa_Histogram);
-   SET_Minmax(exec, _mesa_Minmax);
-   SET_ResetHistogram(exec, _mesa_ResetHistogram);
-   SET_ResetMinmax(exec, _mesa_ResetMinmax);
-   SET_SeparableFilter2D(exec, _mesa_SeparableFilter2D);
-#endif
-
-   /* OpenGL 2.0 */
-   SET_StencilFuncSeparate(exec, _mesa_StencilFuncSeparate);
-   SET_StencilMaskSeparate(exec, _mesa_StencilMaskSeparate);
-   SET_StencilOpSeparate(exec, _mesa_StencilOpSeparate);
-#if FEATURE_ARB_shader_objects
-   SET_AttachShader(exec, _mesa_AttachShader);
-   SET_CreateProgram(exec, _mesa_CreateProgram);
-   SET_CreateShader(exec, _mesa_CreateShader);
-   SET_DeleteProgram(exec, _mesa_DeleteProgram);
-   SET_DeleteShader(exec, _mesa_DeleteShader);
-   SET_DetachShader(exec, _mesa_DetachShader);
-   SET_GetAttachedShaders(exec, _mesa_GetAttachedShaders);
-   SET_GetProgramiv(exec, _mesa_GetProgramiv);
-   SET_GetProgramInfoLog(exec, _mesa_GetProgramInfoLog);
-   SET_GetShaderiv(exec, _mesa_GetShaderiv);
-   SET_GetShaderInfoLog(exec, _mesa_GetShaderInfoLog);
-   SET_IsProgram(exec, _mesa_IsProgram);
-   SET_IsShader(exec, _mesa_IsShader);
-#endif
-
-   /* OpenGL 2.1 */
-#if FEATURE_ARB_shader_objects
-   SET_UniformMatrix2x3fv(exec, _mesa_UniformMatrix2x3fv);
-   SET_UniformMatrix3x2fv(exec, _mesa_UniformMatrix3x2fv);
-   SET_UniformMatrix2x4fv(exec, _mesa_UniformMatrix2x4fv);
-   SET_UniformMatrix4x2fv(exec, _mesa_UniformMatrix4x2fv);
-   SET_UniformMatrix3x4fv(exec, _mesa_UniformMatrix3x4fv);
-   SET_UniformMatrix4x3fv(exec, _mesa_UniformMatrix4x3fv);
-#endif
-
-
-   /* 2. GL_EXT_blend_color */
-#if 0
-/*    SET_BlendColorEXT(exec, _mesa_BlendColorEXT); */
-#endif
-
-   /* 3. GL_EXT_polygon_offset */
-#if _HAVE_FULL_GL
-   SET_PolygonOffsetEXT(exec, _mesa_PolygonOffsetEXT);
-#endif
-
-   /* 6. GL_EXT_texture3d */
-#if 0
-/*    SET_CopyTexSubImage3DEXT(exec, _mesa_CopyTexSubImage3D); */
-/*    SET_TexImage3DEXT(exec, _mesa_TexImage3DEXT); */
-/*    SET_TexSubImage3DEXT(exec, _mesa_TexSubImage3D); */
-#endif
-
-   /* 11. GL_EXT_histogram */
-#if 0
-   SET_GetHistogramEXT(exec, _mesa_GetHistogram);
-   SET_GetHistogramParameterfvEXT(exec, _mesa_GetHistogramParameterfv);
-   SET_GetHistogramParameterivEXT(exec, _mesa_GetHistogramParameteriv);
-   SET_GetMinmaxEXT(exec, _mesa_GetMinmax);
-   SET_GetMinmaxParameterfvEXT(exec, _mesa_GetMinmaxParameterfv);
-   SET_GetMinmaxParameterivEXT(exec, _mesa_GetMinmaxParameteriv);
-#endif
-
-   /* 14. SGI_color_table */
-#if 0
-   SET_ColorTableSGI(exec, _mesa_ColorTable);
-   SET_ColorSubTableSGI(exec, _mesa_ColorSubTable);
-   SET_GetColorTableSGI(exec, _mesa_GetColorTable);
-   SET_GetColorTableParameterfvSGI(exec, _mesa_GetColorTableParameterfv);
-   SET_GetColorTableParameterivSGI(exec, _mesa_GetColorTableParameteriv);
-#endif
-
-   /* 30. GL_EXT_vertex_array */
-#if _HAVE_FULL_GL
-   SET_ColorPointerEXT(exec, _mesa_ColorPointerEXT);
-   SET_EdgeFlagPointerEXT(exec, _mesa_EdgeFlagPointerEXT);
-   SET_IndexPointerEXT(exec, _mesa_IndexPointerEXT);
-   SET_NormalPointerEXT(exec, _mesa_NormalPointerEXT);
-   SET_TexCoordPointerEXT(exec, _mesa_TexCoordPointerEXT);
-   SET_VertexPointerEXT(exec, _mesa_VertexPointerEXT);
-#endif
-
-   /* 37. GL_EXT_blend_minmax */
-#if 0
-   SET_BlendEquationEXT(exec, _mesa_BlendEquationEXT);
-#endif
-
-   /* 54. GL_EXT_point_parameters */
-#if _HAVE_FULL_GL
-   SET_PointParameterfEXT(exec, _mesa_PointParameterf);
-   SET_PointParameterfvEXT(exec, _mesa_PointParameterfv);
-#endif
-
-   /* 97. GL_EXT_compiled_vertex_array */
-#if _HAVE_FULL_GL
-   SET_LockArraysEXT(exec, _mesa_LockArraysEXT);
-   SET_UnlockArraysEXT(exec, _mesa_UnlockArraysEXT);
-#endif
-
-   /* 148. GL_EXT_multi_draw_arrays */
-#if _HAVE_FULL_GL
-   SET_MultiDrawArraysEXT(exec, _mesa_MultiDrawArraysEXT);
-   SET_MultiDrawElementsEXT(exec, _mesa_MultiDrawElementsEXT);
-#endif
-
-   /* 173. GL_INGR_blend_func_separate */
-#if _HAVE_FULL_GL
-   SET_BlendFuncSeparateEXT(exec, _mesa_BlendFuncSeparateEXT);
-#endif
-
-   /* 196. GL_MESA_resize_buffers */
-#if _HAVE_FULL_GL
-   SET_ResizeBuffersMESA(exec, _mesa_ResizeBuffersMESA);
-#endif
-
-   /* 197. GL_MESA_window_pos */
-#if _HAVE_FULL_GL
-   SET_WindowPos2dMESA(exec, _mesa_WindowPos2dMESA);
-   SET_WindowPos2dvMESA(exec, _mesa_WindowPos2dvMESA);
-   SET_WindowPos2fMESA(exec, _mesa_WindowPos2fMESA);
-   SET_WindowPos2fvMESA(exec, _mesa_WindowPos2fvMESA);
-   SET_WindowPos2iMESA(exec, _mesa_WindowPos2iMESA);
-   SET_WindowPos2ivMESA(exec, _mesa_WindowPos2ivMESA);
-   SET_WindowPos2sMESA(exec, _mesa_WindowPos2sMESA);
-   SET_WindowPos2svMESA(exec, _mesa_WindowPos2svMESA);
-   SET_WindowPos3dMESA(exec, _mesa_WindowPos3dMESA);
-   SET_WindowPos3dvMESA(exec, _mesa_WindowPos3dvMESA);
-   SET_WindowPos3fMESA(exec, _mesa_WindowPos3fMESA);
-   SET_WindowPos3fvMESA(exec, _mesa_WindowPos3fvMESA);
-   SET_WindowPos3iMESA(exec, _mesa_WindowPos3iMESA);
-   SET_WindowPos3ivMESA(exec, _mesa_WindowPos3ivMESA);
-   SET_WindowPos3sMESA(exec, _mesa_WindowPos3sMESA);
-   SET_WindowPos3svMESA(exec, _mesa_WindowPos3svMESA);
-   SET_WindowPos4dMESA(exec, _mesa_WindowPos4dMESA);
-   SET_WindowPos4dvMESA(exec, _mesa_WindowPos4dvMESA);
-   SET_WindowPos4fMESA(exec, _mesa_WindowPos4fMESA);
-   SET_WindowPos4fvMESA(exec, _mesa_WindowPos4fvMESA);
-   SET_WindowPos4iMESA(exec, _mesa_WindowPos4iMESA);
-   SET_WindowPos4ivMESA(exec, _mesa_WindowPos4ivMESA);
-   SET_WindowPos4sMESA(exec, _mesa_WindowPos4sMESA);
-   SET_WindowPos4svMESA(exec, _mesa_WindowPos4svMESA);
-#endif
-
-   /* 200. GL_IBM_multimode_draw_arrays */
-#if _HAVE_FULL_GL
-   SET_MultiModeDrawArraysIBM(exec, _mesa_MultiModeDrawArraysIBM);
-   SET_MultiModeDrawElementsIBM(exec, _mesa_MultiModeDrawElementsIBM);
-#endif
-
-   /* 233. GL_NV_vertex_program */
-#if FEATURE_NV_vertex_program
-   SET_BindProgramNV(exec, _mesa_BindProgram);
-   SET_DeleteProgramsNV(exec, _mesa_DeletePrograms);
-   SET_ExecuteProgramNV(exec, _mesa_ExecuteProgramNV);
-   SET_GenProgramsNV(exec, _mesa_GenPrograms);
-   SET_AreProgramsResidentNV(exec, _mesa_AreProgramsResidentNV);
-   SET_RequestResidentProgramsNV(exec, _mesa_RequestResidentProgramsNV);
-   SET_GetProgramParameterfvNV(exec, _mesa_GetProgramParameterfvNV);
-   SET_GetProgramParameterdvNV(exec, _mesa_GetProgramParameterdvNV);
-   SET_GetProgramivNV(exec, _mesa_GetProgramivNV);
-   SET_GetProgramStringNV(exec, _mesa_GetProgramStringNV);
-   SET_GetTrackMatrixivNV(exec, _mesa_GetTrackMatrixivNV);
-   SET_GetVertexAttribdvNV(exec, _mesa_GetVertexAttribdvNV);
-   SET_GetVertexAttribfvNV(exec, _mesa_GetVertexAttribfvNV);
-   SET_GetVertexAttribivNV(exec, _mesa_GetVertexAttribivNV);
-   SET_GetVertexAttribPointervNV(exec, _mesa_GetVertexAttribPointervNV);
-   SET_IsProgramNV(exec, _mesa_IsProgramARB);
-   SET_LoadProgramNV(exec, _mesa_LoadProgramNV);
-   SET_ProgramEnvParameter4dARB(exec, _mesa_ProgramEnvParameter4dARB); /* alias to ProgramParameter4dNV */
-   SET_ProgramEnvParameter4dvARB(exec, _mesa_ProgramEnvParameter4dvARB);  /* alias to ProgramParameter4dvNV */
-   SET_ProgramEnvParameter4fARB(exec, _mesa_ProgramEnvParameter4fARB);  /* alias to ProgramParameter4fNV */
-   SET_ProgramEnvParameter4fvARB(exec, _mesa_ProgramEnvParameter4fvARB);  /* alias to ProgramParameter4fvNV */
-   SET_ProgramParameters4dvNV(exec, _mesa_ProgramParameters4dvNV);
-   SET_ProgramParameters4fvNV(exec, _mesa_ProgramParameters4fvNV);
-   SET_TrackMatrixNV(exec, _mesa_TrackMatrixNV);
-   SET_VertexAttribPointerNV(exec, _mesa_VertexAttribPointerNV);
-   /* glVertexAttrib*NV functions handled in api_loopback.c */
-#endif
-
-   /* 273. GL_APPLE_vertex_array_object */
-   SET_BindVertexArrayAPPLE(exec, _mesa_BindVertexArrayAPPLE);
-   SET_DeleteVertexArraysAPPLE(exec, _mesa_DeleteVertexArraysAPPLE);
-   SET_GenVertexArraysAPPLE(exec, _mesa_GenVertexArraysAPPLE);
-   SET_IsVertexArrayAPPLE(exec, _mesa_IsVertexArrayAPPLE);
-
-   /* 282. GL_NV_fragment_program */
-#if FEATURE_NV_fragment_program
-   SET_ProgramNamedParameter4fNV(exec, _mesa_ProgramNamedParameter4fNV);
-   SET_ProgramNamedParameter4dNV(exec, _mesa_ProgramNamedParameter4dNV);
-   SET_ProgramNamedParameter4fvNV(exec, _mesa_ProgramNamedParameter4fvNV);
-   SET_ProgramNamedParameter4dvNV(exec, _mesa_ProgramNamedParameter4dvNV);
-   SET_GetProgramNamedParameterfvNV(exec, _mesa_GetProgramNamedParameterfvNV);
-   SET_GetProgramNamedParameterdvNV(exec, _mesa_GetProgramNamedParameterdvNV);
-   SET_ProgramLocalParameter4dARB(exec, _mesa_ProgramLocalParameter4dARB);
-   SET_ProgramLocalParameter4dvARB(exec, _mesa_ProgramLocalParameter4dvARB);
-   SET_ProgramLocalParameter4fARB(exec, _mesa_ProgramLocalParameter4fARB);
-   SET_ProgramLocalParameter4fvARB(exec, _mesa_ProgramLocalParameter4fvARB);
-   SET_GetProgramLocalParameterdvARB(exec, _mesa_GetProgramLocalParameterdvARB);
-   SET_GetProgramLocalParameterfvARB(exec, _mesa_GetProgramLocalParameterfvARB);
-#endif
-
-   /* 262. GL_NV_point_sprite */
-#if _HAVE_FULL_GL
-   SET_PointParameteriNV(exec, _mesa_PointParameteri);
-   SET_PointParameterivNV(exec, _mesa_PointParameteriv);
-#endif
-
-   /* 268. GL_EXT_stencil_two_side */
-#if _HAVE_FULL_GL
-   SET_ActiveStencilFaceEXT(exec, _mesa_ActiveStencilFaceEXT);
-#endif
-
-   /* ???. GL_EXT_depth_bounds_test */
-   SET_DepthBoundsEXT(exec, _mesa_DepthBoundsEXT);
-
-   /* ARB 1. GL_ARB_multitexture */
-#if _HAVE_FULL_GL
-   SET_ActiveTextureARB(exec, _mesa_ActiveTextureARB);
-   SET_ClientActiveTextureARB(exec, _mesa_ClientActiveTextureARB);
-#endif
-
-   /* ARB 3. GL_ARB_transpose_matrix */
-#if _HAVE_FULL_GL
-   SET_LoadTransposeMatrixdARB(exec, _mesa_LoadTransposeMatrixdARB);
-   SET_LoadTransposeMatrixfARB(exec, _mesa_LoadTransposeMatrixfARB);
-   SET_MultTransposeMatrixdARB(exec, _mesa_MultTransposeMatrixdARB);
-   SET_MultTransposeMatrixfARB(exec, _mesa_MultTransposeMatrixfARB);
-#endif
-
-   /* ARB 5. GL_ARB_multisample */
-#if _HAVE_FULL_GL
-   SET_SampleCoverageARB(exec, _mesa_SampleCoverageARB);
-#endif
-
-   /* ARB 12. GL_ARB_texture_compression */
-#if _HAVE_FULL_GL
-   SET_CompressedTexImage3DARB(exec, _mesa_CompressedTexImage3DARB);
-   SET_CompressedTexImage2DARB(exec, _mesa_CompressedTexImage2DARB);
-   SET_CompressedTexImage1DARB(exec, _mesa_CompressedTexImage1DARB);
-   SET_CompressedTexSubImage3DARB(exec, _mesa_CompressedTexSubImage3DARB);
-   SET_CompressedTexSubImage2DARB(exec, _mesa_CompressedTexSubImage2DARB);
-   SET_CompressedTexSubImage1DARB(exec, _mesa_CompressedTexSubImage1DARB);
-   SET_GetCompressedTexImageARB(exec, _mesa_GetCompressedTexImageARB);
-#endif
-
-   /* ARB 14. GL_ARB_point_parameters */
-   /* reuse EXT_point_parameters functions */
-
-   /* ARB 26. GL_ARB_vertex_program */
-   /* ARB 27. GL_ARB_fragment_program */
-#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
-   /* glVertexAttrib1sARB aliases glVertexAttrib1sNV */
-   /* glVertexAttrib1fARB aliases glVertexAttrib1fNV */
-   /* glVertexAttrib1dARB aliases glVertexAttrib1dNV */
-   /* glVertexAttrib2sARB aliases glVertexAttrib2sNV */
-   /* glVertexAttrib2fARB aliases glVertexAttrib2fNV */
-   /* glVertexAttrib2dARB aliases glVertexAttrib2dNV */
-   /* glVertexAttrib3sARB aliases glVertexAttrib3sNV */
-   /* glVertexAttrib3fARB aliases glVertexAttrib3fNV */
-   /* glVertexAttrib3dARB aliases glVertexAttrib3dNV */
-   /* glVertexAttrib4sARB aliases glVertexAttrib4sNV */
-   /* glVertexAttrib4fARB aliases glVertexAttrib4fNV */
-   /* glVertexAttrib4dARB aliases glVertexAttrib4dNV */
-   /* glVertexAttrib4NubARB aliases glVertexAttrib4NubNV */
-   /* glVertexAttrib1svARB aliases glVertexAttrib1svNV */
-   /* glVertexAttrib1fvARB aliases glVertexAttrib1fvNV */
-   /* glVertexAttrib1dvARB aliases glVertexAttrib1dvNV */
-   /* glVertexAttrib2svARB aliases glVertexAttrib2svNV */
-   /* glVertexAttrib2fvARB aliases glVertexAttrib2fvNV */
-   /* glVertexAttrib2dvARB aliases glVertexAttrib2dvNV */
-   /* glVertexAttrib3svARB aliases glVertexAttrib3svNV */
-   /* glVertexAttrib3fvARB aliases glVertexAttrib3fvNV */
-   /* glVertexAttrib3dvARB aliases glVertexAttrib3dvNV */
-   /* glVertexAttrib4svARB aliases glVertexAttrib4svNV */
-   /* glVertexAttrib4fvARB aliases glVertexAttrib4fvNV */
-   /* glVertexAttrib4dvARB aliases glVertexAttrib4dvNV */
-   /* glVertexAttrib4NubvARB aliases glVertexAttrib4NubvNV */
-   /* glVertexAttrib4bvARB handled in api_loopback.c */
-   /* glVertexAttrib4ivARB handled in api_loopback.c */
-   /* glVertexAttrib4ubvARB handled in api_loopback.c */
-   /* glVertexAttrib4usvARB handled in api_loopback.c */
-   /* glVertexAttrib4uivARB handled in api_loopback.c */
-   /* glVertexAttrib4NbvARB handled in api_loopback.c */
-   /* glVertexAttrib4NsvARB handled in api_loopback.c */
-   /* glVertexAttrib4NivARB handled in api_loopback.c */
-   /* glVertexAttrib4NusvARB handled in api_loopback.c */
-   /* glVertexAttrib4NuivARB handled in api_loopback.c */
-   SET_VertexAttribPointerARB(exec, _mesa_VertexAttribPointerARB);
-   SET_EnableVertexAttribArrayARB(exec, _mesa_EnableVertexAttribArrayARB);
-   SET_DisableVertexAttribArrayARB(exec, _mesa_DisableVertexAttribArrayARB);
-   SET_ProgramStringARB(exec, _mesa_ProgramStringARB);
-   /* glBindProgramARB aliases glBindProgramNV */
-   /* glDeleteProgramsARB aliases glDeleteProgramsNV */
-   /* glGenProgramsARB aliases glGenProgramsNV */
-   /* glIsProgramARB aliases glIsProgramNV */
-   SET_GetVertexAttribdvARB(exec, _mesa_GetVertexAttribdvARB);
-   SET_GetVertexAttribfvARB(exec, _mesa_GetVertexAttribfvARB);
-   SET_GetVertexAttribivARB(exec, _mesa_GetVertexAttribivARB);
-   /* glGetVertexAttribPointervARB aliases glGetVertexAttribPointervNV */
-   SET_ProgramEnvParameter4dARB(exec, _mesa_ProgramEnvParameter4dARB);
-   SET_ProgramEnvParameter4dvARB(exec, _mesa_ProgramEnvParameter4dvARB);
-   SET_ProgramEnvParameter4fARB(exec, _mesa_ProgramEnvParameter4fARB);
-   SET_ProgramEnvParameter4fvARB(exec, _mesa_ProgramEnvParameter4fvARB);
-   SET_ProgramLocalParameter4dARB(exec, _mesa_ProgramLocalParameter4dARB);
-   SET_ProgramLocalParameter4dvARB(exec, _mesa_ProgramLocalParameter4dvARB);
-   SET_ProgramLocalParameter4fARB(exec, _mesa_ProgramLocalParameter4fARB);
-   SET_ProgramLocalParameter4fvARB(exec, _mesa_ProgramLocalParameter4fvARB);
-   SET_GetProgramEnvParameterdvARB(exec, _mesa_GetProgramEnvParameterdvARB);
-   SET_GetProgramEnvParameterfvARB(exec, _mesa_GetProgramEnvParameterfvARB);
-   SET_GetProgramLocalParameterdvARB(exec, _mesa_GetProgramLocalParameterdvARB);
-   SET_GetProgramLocalParameterfvARB(exec, _mesa_GetProgramLocalParameterfvARB);
-   SET_GetProgramivARB(exec, _mesa_GetProgramivARB);
-   SET_GetProgramStringARB(exec, _mesa_GetProgramStringARB);
-#endif
-
-   /* ARB 28. GL_ARB_vertex_buffer_object */
-#if FEATURE_ARB_vertex_buffer_object
-   SET_BindBufferARB(exec, _mesa_BindBufferARB);
-   SET_BufferDataARB(exec, _mesa_BufferDataARB);
-   SET_BufferSubDataARB(exec, _mesa_BufferSubDataARB);
-   SET_DeleteBuffersARB(exec, _mesa_DeleteBuffersARB);
-   SET_GenBuffersARB(exec, _mesa_GenBuffersARB);
-   SET_GetBufferParameterivARB(exec, _mesa_GetBufferParameterivARB);
-   SET_GetBufferPointervARB(exec, _mesa_GetBufferPointervARB);
-   SET_GetBufferSubDataARB(exec, _mesa_GetBufferSubDataARB);
-   SET_IsBufferARB(exec, _mesa_IsBufferARB);
-   SET_MapBufferARB(exec, _mesa_MapBufferARB);
-   SET_UnmapBufferARB(exec, _mesa_UnmapBufferARB);
-#endif
-
-   /* ARB 29. GL_ARB_occlusion_query */
-#if FEATURE_ARB_occlusion_query
-   SET_GenQueriesARB(exec, _mesa_GenQueriesARB);
-   SET_DeleteQueriesARB(exec, _mesa_DeleteQueriesARB);
-   SET_IsQueryARB(exec, _mesa_IsQueryARB);
-   SET_BeginQueryARB(exec, _mesa_BeginQueryARB);
-   SET_EndQueryARB(exec, _mesa_EndQueryARB);
-   SET_GetQueryivARB(exec, _mesa_GetQueryivARB);
-   SET_GetQueryObjectivARB(exec, _mesa_GetQueryObjectivARB);
-   SET_GetQueryObjectuivARB(exec, _mesa_GetQueryObjectuivARB);
-#endif
-
-   /* ARB 37. GL_ARB_draw_buffers */
-   SET_DrawBuffersARB(exec, _mesa_DrawBuffersARB);
-   
-#if FEATURE_ARB_shader_objects
-   SET_DeleteObjectARB(exec, _mesa_DeleteObjectARB);
-   SET_GetHandleARB(exec, _mesa_GetHandleARB);
-   SET_DetachObjectARB(exec, _mesa_DetachObjectARB);
-   SET_CreateShaderObjectARB(exec, _mesa_CreateShaderObjectARB);
-   SET_ShaderSourceARB(exec, _mesa_ShaderSourceARB);
-   SET_CompileShaderARB(exec, _mesa_CompileShaderARB);
-   SET_CreateProgramObjectARB(exec, _mesa_CreateProgramObjectARB);
-   SET_AttachObjectARB(exec, _mesa_AttachObjectARB);
-   SET_LinkProgramARB(exec, _mesa_LinkProgramARB);
-   SET_UseProgramObjectARB(exec, _mesa_UseProgramObjectARB);
-   SET_ValidateProgramARB(exec, _mesa_ValidateProgramARB);
-   SET_Uniform1fARB(exec, _mesa_Uniform1fARB);
-   SET_Uniform2fARB(exec, _mesa_Uniform2fARB);
-   SET_Uniform3fARB(exec, _mesa_Uniform3fARB);
-   SET_Uniform4fARB(exec, _mesa_Uniform4fARB);
-   SET_Uniform1iARB(exec, _mesa_Uniform1iARB);
-   SET_Uniform2iARB(exec, _mesa_Uniform2iARB);
-   SET_Uniform3iARB(exec, _mesa_Uniform3iARB);
-   SET_Uniform4iARB(exec, _mesa_Uniform4iARB);
-   SET_Uniform1fvARB(exec, _mesa_Uniform1fvARB);
-   SET_Uniform2fvARB(exec, _mesa_Uniform2fvARB);
-   SET_Uniform3fvARB(exec, _mesa_Uniform3fvARB);
-   SET_Uniform4fvARB(exec, _mesa_Uniform4fvARB);
-   SET_Uniform1ivARB(exec, _mesa_Uniform1ivARB);
-   SET_Uniform2ivARB(exec, _mesa_Uniform2ivARB);
-   SET_Uniform3ivARB(exec, _mesa_Uniform3ivARB);
-   SET_Uniform4ivARB(exec, _mesa_Uniform4ivARB);
-   SET_UniformMatrix2fvARB(exec, _mesa_UniformMatrix2fvARB);
-   SET_UniformMatrix3fvARB(exec, _mesa_UniformMatrix3fvARB);
-   SET_UniformMatrix4fvARB(exec, _mesa_UniformMatrix4fvARB);
-   SET_GetObjectParameterfvARB(exec, _mesa_GetObjectParameterfvARB);
-   SET_GetObjectParameterivARB(exec, _mesa_GetObjectParameterivARB);
-   SET_GetInfoLogARB(exec, _mesa_GetInfoLogARB);
-   SET_GetAttachedObjectsARB(exec, _mesa_GetAttachedObjectsARB);
-   SET_GetUniformLocationARB(exec, _mesa_GetUniformLocationARB);
-   SET_GetActiveUniformARB(exec, _mesa_GetActiveUniformARB);
-   SET_GetUniformfvARB(exec, _mesa_GetUniformfvARB);
-   SET_GetUniformivARB(exec, _mesa_GetUniformivARB);
-   SET_GetShaderSourceARB(exec, _mesa_GetShaderSourceARB);
-#endif    /* FEATURE_ARB_shader_objects */
-
-#if FEATURE_ARB_vertex_shader
-   SET_BindAttribLocationARB(exec, _mesa_BindAttribLocationARB);
-   SET_GetActiveAttribARB(exec, _mesa_GetActiveAttribARB);
-   SET_GetAttribLocationARB(exec, _mesa_GetAttribLocationARB);
-#endif    /* FEATURE_ARB_vertex_shader */
-
-  /* GL_ATI_fragment_shader */
-#if FEATURE_ATI_fragment_shader
-   SET_GenFragmentShadersATI(exec, _mesa_GenFragmentShadersATI);
-   SET_BindFragmentShaderATI(exec, _mesa_BindFragmentShaderATI);
-   SET_DeleteFragmentShaderATI(exec, _mesa_DeleteFragmentShaderATI);
-   SET_BeginFragmentShaderATI(exec, _mesa_BeginFragmentShaderATI);
-   SET_EndFragmentShaderATI(exec, _mesa_EndFragmentShaderATI);
-   SET_PassTexCoordATI(exec, _mesa_PassTexCoordATI);
-   SET_SampleMapATI(exec, _mesa_SampleMapATI);
-   SET_ColorFragmentOp1ATI(exec, _mesa_ColorFragmentOp1ATI);
-   SET_ColorFragmentOp2ATI(exec, _mesa_ColorFragmentOp2ATI);
-   SET_ColorFragmentOp3ATI(exec, _mesa_ColorFragmentOp3ATI);
-   SET_AlphaFragmentOp1ATI(exec, _mesa_AlphaFragmentOp1ATI);
-   SET_AlphaFragmentOp2ATI(exec, _mesa_AlphaFragmentOp2ATI);
-   SET_AlphaFragmentOp3ATI(exec, _mesa_AlphaFragmentOp3ATI);
-   SET_SetFragmentShaderConstantATI(exec, _mesa_SetFragmentShaderConstantATI);
-#endif
-
-#if FEATURE_EXT_framebuffer_object
-   SET_IsRenderbufferEXT(exec, _mesa_IsRenderbufferEXT);
-   SET_BindRenderbufferEXT(exec, _mesa_BindRenderbufferEXT);
-   SET_DeleteRenderbuffersEXT(exec, _mesa_DeleteRenderbuffersEXT);
-   SET_GenRenderbuffersEXT(exec, _mesa_GenRenderbuffersEXT);
-   SET_RenderbufferStorageEXT(exec, _mesa_RenderbufferStorageEXT);
-   SET_GetRenderbufferParameterivEXT(exec, _mesa_GetRenderbufferParameterivEXT);
-   SET_IsFramebufferEXT(exec, _mesa_IsFramebufferEXT);
-   SET_BindFramebufferEXT(exec, _mesa_BindFramebufferEXT);
-   SET_DeleteFramebuffersEXT(exec, _mesa_DeleteFramebuffersEXT);
-   SET_GenFramebuffersEXT(exec, _mesa_GenFramebuffersEXT);
-   SET_CheckFramebufferStatusEXT(exec, _mesa_CheckFramebufferStatusEXT);
-   SET_FramebufferTexture1DEXT(exec, _mesa_FramebufferTexture1DEXT);
-   SET_FramebufferTexture2DEXT(exec, _mesa_FramebufferTexture2DEXT);
-   SET_FramebufferTexture3DEXT(exec, _mesa_FramebufferTexture3DEXT);
-   SET_FramebufferRenderbufferEXT(exec, _mesa_FramebufferRenderbufferEXT);
-   SET_GetFramebufferAttachmentParameterivEXT(exec, _mesa_GetFramebufferAttachmentParameterivEXT);
-   SET_GenerateMipmapEXT(exec, _mesa_GenerateMipmapEXT);
-#endif
-
-#if FEATURE_EXT_timer_query
-   SET_GetQueryObjecti64vEXT(exec, _mesa_GetQueryObjecti64vEXT);
-   SET_GetQueryObjectui64vEXT(exec, _mesa_GetQueryObjectui64vEXT);
-#endif
-
-#if FEATURE_EXT_framebuffer_blit
-   SET_BlitFramebufferEXT(exec, _mesa_BlitFramebufferEXT);
-#endif
-
-   /* GL_EXT_gpu_program_parameters */
-#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
-   SET_ProgramEnvParameters4fvEXT(exec, _mesa_ProgramEnvParameters4fvEXT);
-   SET_ProgramLocalParameters4fvEXT(exec, _mesa_ProgramLocalParameters4fvEXT);
-#endif
-
-   /* GL_MESA_texture_array / GL_EXT_texture_array */
-#if FEATURE_EXT_framebuffer_object
-   SET_FramebufferTextureLayerEXT(exec, _mesa_FramebufferTextureLayerEXT);
-#endif
-
-   /* GL_ATI_separate_stencil */
-   SET_StencilFuncSeparateATI(exec, _mesa_StencilFuncSeparateATI);
-}
-
-
-
-/**********************************************************************/
-/** \name State update logic */
-/*@{*/
 
 
 /**
@@ -1262,9 +479,3 @@ _mesa_update_state( GLcontext *ctx )
    _mesa_update_state_locked(ctx);
    _mesa_unlock_context_textures(ctx);
 }
-
-
-
-/*@}*/
-
-
diff --git a/src/mesa/main/state.h b/src/mesa/main/state.h
index 5240d4bf93..bb7cb8f32a 100644
--- a/src/mesa/main/state.h
+++ b/src/mesa/main/state.h
@@ -1,13 +1,8 @@
-/**
- * \file state.h
- * State management.
- */
-
 /*
  * Mesa 3-D graphics library
- * Version:  6.3
+ * Version:  7.1
  *
- * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -33,9 +28,6 @@
 
 #include "mtypes.h"
 
-extern void
-_mesa_init_exec_table(struct _glapi_table *exec);
-
 extern void
 _mesa_update_state( GLcontext *ctx );
 
diff --git a/src/mesa/sources b/src/mesa/sources
index c94f260121..21386ef4db 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -2,6 +2,7 @@
 
 MAIN_SOURCES = \
 	main/api_arrayelt.c \
+	main/api_exec.c \
 	main/api_loopback.c \
 	main/api_noop.c \
 	main/api_validate.c \
-- 
cgit v1.2.3


From 4be7296bfcba22a849f949d105ea385e6964cc25 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 9 Jun 2008 14:55:24 -0600
Subject: mesa: refactor: move scissor functions into new scissor.c file

---
 src/mesa/main/api_exec.c |  1 +
 src/mesa/main/attrib.c   |  1 +
 src/mesa/main/buffers.c  | 75 ------------------------------------
 src/mesa/main/buffers.h  | 10 -----
 src/mesa/main/context.c  |  1 +
 src/mesa/main/scissor.c  | 99 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/mesa/main/scissor.h  | 46 ++++++++++++++++++++++
 src/mesa/main/sources    |  2 +
 src/mesa/sources         |  1 +
 9 files changed, 151 insertions(+), 85 deletions(-)
 create mode 100644 src/mesa/main/scissor.c
 create mode 100644 src/mesa/main/scissor.h

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index e0f081bdbc..a9696a6842 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -79,6 +79,7 @@
 #endif
 #include "rastpos.h"
 #include "readpix.h"
+#include "scissor.h"
 #include "state.h"
 #include "stencil.h"
 #include "teximage.h"
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 39666d175a..70b5121a9f 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -43,6 +43,7 @@
 #include "matrix.h"
 #include "points.h"
 #include "polygon.h"
+#include "scissor.h"
 #include "simple_list.h"
 #include "stencil.h"
 #include "texobj.h"
diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c
index 3cbd671bab..5424f442fe 100644
--- a/src/mesa/main/buffers.c
+++ b/src/mesa/main/buffers.c
@@ -699,79 +699,6 @@ _mesa_SampleCoverageARB(GLclampf value, GLboolean invert)
 
 
 
-/**
- * Define the scissor box.
- *
- * \param x, y coordinates of the scissor box lower-left corner.
- * \param width width of the scissor box.
- * \param height height of the scissor box.
- *
- * \sa glScissor().
- *
- * Verifies the parameters and updates __GLcontextRec::Scissor. On a
- * change flushes the vertices and notifies the driver via
- * the dd_function_table::Scissor callback.
- */
-void
-_mesa_set_scissor(GLcontext *ctx, 
-                  GLint x, GLint y, GLsizei width, GLsizei height)
-{
-   if (x == ctx->Scissor.X &&
-       y == ctx->Scissor.Y &&
-       width == ctx->Scissor.Width &&
-       height == ctx->Scissor.Height)
-      return;
-
-   FLUSH_VERTICES(ctx, _NEW_SCISSOR);
-   ctx->Scissor.X = x;
-   ctx->Scissor.Y = y;
-   ctx->Scissor.Width = width;
-   ctx->Scissor.Height = height;
-
-   if (ctx->Driver.Scissor)
-      ctx->Driver.Scissor( ctx, x, y, width, height );
-}
-
-
-void GLAPIENTRY
-_mesa_Scissor( GLint x, GLint y, GLsizei width, GLsizei height )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (width < 0 || height < 0) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glScissor" );
-      return;
-   }
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glScissor %d %d %d %d\n", x, y, width, height);
-
-   _mesa_set_scissor(ctx, x, y, width, height);
-}
-
-
-
-/**********************************************************************/
-/** \name Initialization */
-/*@{*/
-
-/**
- * Initialize the context's scissor state.
- * \param ctx  the GL context.
- */
-void
-_mesa_init_scissor(GLcontext *ctx)
-{
-   /* Scissor group */
-   ctx->Scissor.Enabled = GL_FALSE;
-   ctx->Scissor.X = 0;
-   ctx->Scissor.Y = 0;
-   ctx->Scissor.Width = 0;
-   ctx->Scissor.Height = 0;
-}
-
-
 /**
  * Initialize the context's multisample state.
  * \param ctx  the GL context.
@@ -786,5 +713,3 @@ _mesa_init_multisample(GLcontext *ctx)
    ctx->Multisample.SampleCoverageValue = 1.0;
    ctx->Multisample.SampleCoverageInvert = GL_FALSE;
 }
-
-/*@}*/
diff --git a/src/mesa/main/buffers.h b/src/mesa/main/buffers.h
index 208e7af2b9..50f2f47a04 100644
--- a/src/mesa/main/buffers.h
+++ b/src/mesa/main/buffers.h
@@ -65,22 +65,12 @@ _mesa_ReadBuffer( GLenum mode );
 extern void GLAPIENTRY
 _mesa_ResizeBuffersMESA( void );
 
-extern void GLAPIENTRY
-_mesa_Scissor( GLint x, GLint y, GLsizei width, GLsizei height );
-
 extern void GLAPIENTRY
 _mesa_SampleCoverageARB(GLclampf value, GLboolean invert);
 
-extern void 
-_mesa_init_scissor(GLcontext *ctx);
-
 extern void 
 _mesa_init_multisample(GLcontext *ctx);
 
-extern void
-_mesa_set_scissor(GLcontext *ctx, 
-                  GLint x, GLint y, GLsizei width, GLsizei height);
-
 extern void _mesa_resizebuffers( GLcontext *ctx );
 
 #endif
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 465d6b3f89..7ee6b2ec54 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -111,6 +111,7 @@
 #include "polygon.h"
 #include "queryobj.h"
 #include "rastpos.h"
+#include "scissor.h"
 #include "simple_list.h"
 #include "state.h"
 #include "stencil.h"
diff --git a/src/mesa/main/scissor.c b/src/mesa/main/scissor.c
new file mode 100644
index 0000000000..b5f4cde789
--- /dev/null
+++ b/src/mesa/main/scissor.c
@@ -0,0 +1,99 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.1
+ *
+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "main/glheader.h"
+#include "main/context.h"
+#include "main/scissor.h"
+
+
+/**
+ * Called via glScissor
+ */
+void GLAPIENTRY
+_mesa_Scissor( GLint x, GLint y, GLsizei width, GLsizei height )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (width < 0 || height < 0) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glScissor" );
+      return;
+   }
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glScissor %d %d %d %d\n", x, y, width, height);
+
+   _mesa_set_scissor(ctx, x, y, width, height);
+}
+
+
+/**
+ * Define the scissor box.
+ *
+ * \param x, y coordinates of the scissor box lower-left corner.
+ * \param width width of the scissor box.
+ * \param height height of the scissor box.
+ *
+ * \sa glScissor().
+ *
+ * Verifies the parameters and updates __GLcontextRec::Scissor. On a
+ * change flushes the vertices and notifies the driver via
+ * the dd_function_table::Scissor callback.
+ */
+void
+_mesa_set_scissor(GLcontext *ctx, 
+                  GLint x, GLint y, GLsizei width, GLsizei height)
+{
+   if (x == ctx->Scissor.X &&
+       y == ctx->Scissor.Y &&
+       width == ctx->Scissor.Width &&
+       height == ctx->Scissor.Height)
+      return;
+
+   FLUSH_VERTICES(ctx, _NEW_SCISSOR);
+   ctx->Scissor.X = x;
+   ctx->Scissor.Y = y;
+   ctx->Scissor.Width = width;
+   ctx->Scissor.Height = height;
+
+   if (ctx->Driver.Scissor)
+      ctx->Driver.Scissor( ctx, x, y, width, height );
+}
+
+
+/**
+ * Initialize the context's scissor state.
+ * \param ctx  the GL context.
+ */
+void
+_mesa_init_scissor(GLcontext *ctx)
+{
+   /* Scissor group */
+   ctx->Scissor.Enabled = GL_FALSE;
+   ctx->Scissor.X = 0;
+   ctx->Scissor.Y = 0;
+   ctx->Scissor.Width = 0;
+   ctx->Scissor.Height = 0;
+}
diff --git a/src/mesa/main/scissor.h b/src/mesa/main/scissor.h
new file mode 100644
index 0000000000..b852a2122d
--- /dev/null
+++ b/src/mesa/main/scissor.h
@@ -0,0 +1,46 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.1
+ *
+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef SCISSOR_H
+#define SCISSOR_H
+
+
+#include "main/mtypes.h"
+
+
+extern void GLAPIENTRY
+_mesa_Scissor( GLint x, GLint y, GLsizei width, GLsizei height );
+
+
+extern void
+_mesa_set_scissor(GLcontext *ctx, 
+                  GLint x, GLint y, GLsizei width, GLsizei height);
+
+
+extern void 
+_mesa_init_scissor(GLcontext *ctx);
+
+
+#endif
diff --git a/src/mesa/main/sources b/src/mesa/main/sources
index 06f32f2275..60b6b5dc3f 100644
--- a/src/mesa/main/sources
+++ b/src/mesa/main/sources
@@ -50,6 +50,7 @@ readpix.c \
 rastpos.c \
 rbadaptors.c \
 renderbuffer.c \
+scissor.c \
 state.c \
 stencil.c \
 texcompress.c \
@@ -127,6 +128,7 @@ rbadaptors.h \
 readpix.h \
 renderbuffer.h \
 simple_list.h \
+scissor.h \
 state.h \
 stencil.h \
 texcompress.h \
diff --git a/src/mesa/sources b/src/mesa/sources
index 21386ef4db..f18bbff436 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -52,6 +52,7 @@ MAIN_SOURCES = \
 	main/rbadaptors.c \
 	main/readpix.c \
 	main/renderbuffer.c \
+	main/scissor.c \
 	main/shaders.c \
 	main/state.c \
 	main/stencil.c \
-- 
cgit v1.2.3


From eade430682516a445a2bf765165362dad19594f0 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 9 Jun 2008 15:01:02 -0600
Subject: mesa: refactor: move glClear, glClearColor into new clear.c file.

---
 src/mesa/main/api_exec.c |   1 +
 src/mesa/main/buffers.c  | 144 +-------------------------------------
 src/mesa/main/buffers.h  |  10 ---
 src/mesa/main/clear.c    | 179 +++++++++++++++++++++++++++++++++++++++++++++++
 src/mesa/main/clear.h    |  44 ++++++++++++
 src/mesa/main/sources    |   2 +
 src/mesa/sources         |   1 +
 7 files changed, 228 insertions(+), 153 deletions(-)
 create mode 100644 src/mesa/main/clear.c
 create mode 100644 src/mesa/main/clear.h

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index a9696a6842..382091f580 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -46,6 +46,7 @@
 #endif
 #include "arrayobj.h"
 #include "buffers.h"
+#include "clear.h"
 #include "clip.h"
 #include "colortab.h"
 #include "context.h"
diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c
index 5424f442fe..d617ef9a32 100644
--- a/src/mesa/main/buffers.c
+++ b/src/mesa/main/buffers.c
@@ -25,7 +25,7 @@
 
 /**
  * \file buffers.c
- * General framebuffer-related functions, like glClear, glScissor, etc.
+ * glReadBuffer, DrawBuffer functions.
  */
 
 
@@ -42,148 +42,6 @@
 #define BAD_MASK ~0u
 
 
-#if _HAVE_FULL_GL
-void GLAPIENTRY
-_mesa_ClearIndex( GLfloat c )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (ctx->Color.ClearIndex == (GLuint) c)
-      return;
-
-   FLUSH_VERTICES(ctx, _NEW_COLOR);
-   ctx->Color.ClearIndex = (GLuint) c;
-
-   if (!ctx->Visual.rgbMode && ctx->Driver.ClearIndex) {
-      /* it's OK to call glClearIndex in RGBA mode but it should be a NOP */
-      (*ctx->Driver.ClearIndex)( ctx, ctx->Color.ClearIndex );
-   }
-}
-#endif
-
-
-/**
- * Specify the clear values for the color buffers.
- *
- * \param red red color component.
- * \param green green color component.
- * \param blue blue color component.
- * \param alpha alpha component.
- *
- * \sa glClearColor().
- *
- * Clamps the parameters and updates gl_colorbuffer_attrib::ClearColor.  On a
- * change, flushes the vertices and notifies the driver via the
- * dd_function_table::ClearColor callback.
- */
-void GLAPIENTRY
-_mesa_ClearColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha )
-{
-   GLfloat tmp[4];
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   tmp[0] = CLAMP(red,   0.0F, 1.0F);
-   tmp[1] = CLAMP(green, 0.0F, 1.0F);
-   tmp[2] = CLAMP(blue,  0.0F, 1.0F);
-   tmp[3] = CLAMP(alpha, 0.0F, 1.0F);
-
-   if (TEST_EQ_4V(tmp, ctx->Color.ClearColor))
-      return; /* no change */
-
-   FLUSH_VERTICES(ctx, _NEW_COLOR);
-   COPY_4V(ctx->Color.ClearColor, tmp);
-
-   if (ctx->Visual.rgbMode && ctx->Driver.ClearColor) {
-      /* it's OK to call glClearColor in CI mode but it should be a NOP */
-      (*ctx->Driver.ClearColor)(ctx, ctx->Color.ClearColor);
-   }
-}
-
-
-/**
- * Clear buffers.
- * 
- * \param mask bit-mask indicating the buffers to be cleared.
- *
- * Flushes the vertices and verifies the parameter. If __GLcontextRec::NewState
- * is set then calls _mesa_update_state() to update gl_frame_buffer::_Xmin,
- * etc. If the rasterization mode is set to GL_RENDER then requests the driver
- * to clear the buffers, via the dd_function_table::Clear callback.
- */ 
-void GLAPIENTRY
-_mesa_Clear( GLbitfield mask )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   FLUSH_CURRENT(ctx, 0);
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glClear 0x%x\n", mask);
-
-   if (mask & ~(GL_COLOR_BUFFER_BIT |
-                GL_DEPTH_BUFFER_BIT |
-                GL_STENCIL_BUFFER_BIT |
-                GL_ACCUM_BUFFER_BIT)) {
-      /* invalid bit set */
-      _mesa_error( ctx, GL_INVALID_VALUE, "glClear(0x%x)", mask);
-      return;
-   }
-
-   if (ctx->NewState) {
-      _mesa_update_state( ctx );	/* update _Xmin, etc */
-   }
-
-   if (ctx->DrawBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
-      _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,
-                  "glClear(incomplete framebuffer)");
-      return;
-   }
-
-   if (ctx->DrawBuffer->Width == 0 || ctx->DrawBuffer->Height == 0)
-      return;
-
-   if (ctx->RenderMode == GL_RENDER) {
-      GLbitfield bufferMask;
-
-      /* don't clear depth buffer if depth writing disabled */
-      if (!ctx->Depth.Mask)
-         mask &= ~GL_DEPTH_BUFFER_BIT;
-
-      /* Build the bitmask to send to device driver's Clear function.
-       * Note that the GL_COLOR_BUFFER_BIT flag will expand to 0, 1, 2 or 4
-       * of the BUFFER_BIT_FRONT/BACK_LEFT/RIGHT flags, or one of the
-       * BUFFER_BIT_COLORn flags.
-       */
-      bufferMask = 0;
-      if (mask & GL_COLOR_BUFFER_BIT) {
-         bufferMask |= ctx->DrawBuffer->_ColorDrawBufferMask[0];
-      }
-
-      if ((mask & GL_DEPTH_BUFFER_BIT)
-          && ctx->DrawBuffer->Visual.haveDepthBuffer) {
-         bufferMask |= BUFFER_BIT_DEPTH;
-      }
-
-      if ((mask & GL_STENCIL_BUFFER_BIT)
-          && ctx->DrawBuffer->Visual.haveStencilBuffer) {
-         bufferMask |= BUFFER_BIT_STENCIL;
-      }
-
-      if ((mask & GL_ACCUM_BUFFER_BIT)
-          && ctx->DrawBuffer->Visual.haveAccumBuffer) {
-         bufferMask |= BUFFER_BIT_ACCUM;
-      }
-
-      ASSERT(ctx->Driver.Clear);
-      ctx->Driver.Clear(ctx, bufferMask);
-   }
-}
-
-
-
 /**
  * Return bitmask of BUFFER_BIT_* flags indicating which color buffers are
  * available to the rendering context (for drawing or reading).
diff --git a/src/mesa/main/buffers.h b/src/mesa/main/buffers.h
index 50f2f47a04..ca0e7c411c 100644
--- a/src/mesa/main/buffers.h
+++ b/src/mesa/main/buffers.h
@@ -36,16 +36,6 @@
 #include "mtypes.h"
 
 
-extern void GLAPIENTRY
-_mesa_ClearIndex( GLfloat c );
-
-extern void GLAPIENTRY
-_mesa_ClearColor( GLclampf red, GLclampf green,
-                  GLclampf blue, GLclampf alpha );
-
-extern void GLAPIENTRY
-_mesa_Clear( GLbitfield mask );
-
 extern void GLAPIENTRY
 _mesa_DrawBuffer( GLenum mode );
 
diff --git a/src/mesa/main/clear.c b/src/mesa/main/clear.c
new file mode 100644
index 0000000000..434685984d
--- /dev/null
+++ b/src/mesa/main/clear.c
@@ -0,0 +1,179 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.1
+ *
+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/**
+ * \file clear.c
+ * glClearColor, glClearIndex, glClear() functions.
+ */
+
+
+
+#include "glheader.h"
+#include "clear.h"
+#include "context.h"
+#include "colormac.h"
+#include "state.h"
+
+
+
+#if _HAVE_FULL_GL
+void GLAPIENTRY
+_mesa_ClearIndex( GLfloat c )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (ctx->Color.ClearIndex == (GLuint) c)
+      return;
+
+   FLUSH_VERTICES(ctx, _NEW_COLOR);
+   ctx->Color.ClearIndex = (GLuint) c;
+
+   if (!ctx->Visual.rgbMode && ctx->Driver.ClearIndex) {
+      /* it's OK to call glClearIndex in RGBA mode but it should be a NOP */
+      (*ctx->Driver.ClearIndex)( ctx, ctx->Color.ClearIndex );
+   }
+}
+#endif
+
+
+/**
+ * Specify the clear values for the color buffers.
+ *
+ * \param red red color component.
+ * \param green green color component.
+ * \param blue blue color component.
+ * \param alpha alpha component.
+ *
+ * \sa glClearColor().
+ *
+ * Clamps the parameters and updates gl_colorbuffer_attrib::ClearColor.  On a
+ * change, flushes the vertices and notifies the driver via the
+ * dd_function_table::ClearColor callback.
+ */
+void GLAPIENTRY
+_mesa_ClearColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha )
+{
+   GLfloat tmp[4];
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   tmp[0] = CLAMP(red,   0.0F, 1.0F);
+   tmp[1] = CLAMP(green, 0.0F, 1.0F);
+   tmp[2] = CLAMP(blue,  0.0F, 1.0F);
+   tmp[3] = CLAMP(alpha, 0.0F, 1.0F);
+
+   if (TEST_EQ_4V(tmp, ctx->Color.ClearColor))
+      return; /* no change */
+
+   FLUSH_VERTICES(ctx, _NEW_COLOR);
+   COPY_4V(ctx->Color.ClearColor, tmp);
+
+   if (ctx->Visual.rgbMode && ctx->Driver.ClearColor) {
+      /* it's OK to call glClearColor in CI mode but it should be a NOP */
+      (*ctx->Driver.ClearColor)(ctx, ctx->Color.ClearColor);
+   }
+}
+
+
+/**
+ * Clear buffers.
+ * 
+ * \param mask bit-mask indicating the buffers to be cleared.
+ *
+ * Flushes the vertices and verifies the parameter. If __GLcontextRec::NewState
+ * is set then calls _mesa_update_state() to update gl_frame_buffer::_Xmin,
+ * etc. If the rasterization mode is set to GL_RENDER then requests the driver
+ * to clear the buffers, via the dd_function_table::Clear callback.
+ */ 
+void GLAPIENTRY
+_mesa_Clear( GLbitfield mask )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   FLUSH_CURRENT(ctx, 0);
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glClear 0x%x\n", mask);
+
+   if (mask & ~(GL_COLOR_BUFFER_BIT |
+                GL_DEPTH_BUFFER_BIT |
+                GL_STENCIL_BUFFER_BIT |
+                GL_ACCUM_BUFFER_BIT)) {
+      /* invalid bit set */
+      _mesa_error( ctx, GL_INVALID_VALUE, "glClear(0x%x)", mask);
+      return;
+   }
+
+   if (ctx->NewState) {
+      _mesa_update_state( ctx );	/* update _Xmin, etc */
+   }
+
+   if (ctx->DrawBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
+      _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,
+                  "glClear(incomplete framebuffer)");
+      return;
+   }
+
+   if (ctx->DrawBuffer->Width == 0 || ctx->DrawBuffer->Height == 0)
+      return;
+
+   if (ctx->RenderMode == GL_RENDER) {
+      GLbitfield bufferMask;
+
+      /* don't clear depth buffer if depth writing disabled */
+      if (!ctx->Depth.Mask)
+         mask &= ~GL_DEPTH_BUFFER_BIT;
+
+      /* Build the bitmask to send to device driver's Clear function.
+       * Note that the GL_COLOR_BUFFER_BIT flag will expand to 0, 1, 2 or 4
+       * of the BUFFER_BIT_FRONT/BACK_LEFT/RIGHT flags, or one of the
+       * BUFFER_BIT_COLORn flags.
+       */
+      bufferMask = 0;
+      if (mask & GL_COLOR_BUFFER_BIT) {
+         bufferMask |= ctx->DrawBuffer->_ColorDrawBufferMask[0];
+      }
+
+      if ((mask & GL_DEPTH_BUFFER_BIT)
+          && ctx->DrawBuffer->Visual.haveDepthBuffer) {
+         bufferMask |= BUFFER_BIT_DEPTH;
+      }
+
+      if ((mask & GL_STENCIL_BUFFER_BIT)
+          && ctx->DrawBuffer->Visual.haveStencilBuffer) {
+         bufferMask |= BUFFER_BIT_STENCIL;
+      }
+
+      if ((mask & GL_ACCUM_BUFFER_BIT)
+          && ctx->DrawBuffer->Visual.haveAccumBuffer) {
+         bufferMask |= BUFFER_BIT_ACCUM;
+      }
+
+      ASSERT(ctx->Driver.Clear);
+      ctx->Driver.Clear(ctx, bufferMask);
+   }
+}
diff --git a/src/mesa/main/clear.h b/src/mesa/main/clear.h
new file mode 100644
index 0000000000..9a54ba14bc
--- /dev/null
+++ b/src/mesa/main/clear.h
@@ -0,0 +1,44 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.1
+ *
+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef CLEAR_H
+#define CLEAR_H
+
+
+#include "main/mtypes.h"
+
+
+extern void GLAPIENTRY
+_mesa_ClearIndex( GLfloat c );
+
+extern void GLAPIENTRY
+_mesa_ClearColor( GLclampf red, GLclampf green,
+                  GLclampf blue, GLclampf alpha );
+
+extern void GLAPIENTRY
+_mesa_Clear( GLbitfield mask );
+
+
+#endif
diff --git a/src/mesa/main/sources b/src/mesa/main/sources
index 60b6b5dc3f..8043f4369e 100644
--- a/src/mesa/main/sources
+++ b/src/mesa/main/sources
@@ -11,6 +11,7 @@ attrib.c \
 blend.c \
 bufferobj.c \
 buffers.c \
+clear.c \
 clip.c \
 colortab.c \
 context.c \
@@ -84,6 +85,7 @@ bitset.h \
 blend.h \
 bufferobj.h \
 buffers.h \
+clear.h \
 clip.h \
 colormac.h \
 colortab.h \
diff --git a/src/mesa/sources b/src/mesa/sources
index f18bbff436..95d665e3a1 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -12,6 +12,7 @@ MAIN_SOURCES = \
 	main/blend.c \
 	main/bufferobj.c \
 	main/buffers.c \
+	main/clear.c \
 	main/clip.c \
 	main/colortab.c \
 	main/context.c \
-- 
cgit v1.2.3


From 9091015a9782ad15e58540a8fd61df83ea2bfe31 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 9 Jun 2008 15:04:31 -0600
Subject: mesa: refactor: move _mesa_resizebuffers(), _mesa_ResizeBuffersMESA()
 to framebuffer.c

---
 src/mesa/main/attrib.c      |  1 +
 src/mesa/main/buffers.c     | 79 ---------------------------------------------
 src/mesa/main/buffers.h     |  4 ---
 src/mesa/main/dlist.c       |  1 +
 src/mesa/main/framebuffer.c | 78 ++++++++++++++++++++++++++++++++++++++++++++
 src/mesa/main/framebuffer.h |  8 +++++
 6 files changed, 88 insertions(+), 83 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 70b5121a9f..63754569e6 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -30,6 +30,7 @@
 #include "blend.h"
 #include "buffers.h"
 #include "bufferobj.h"
+#include "clear.h"
 #include "colormac.h"
 #include "colortab.h"
 #include "context.h"
diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c
index d617ef9a32..c767e62286 100644
--- a/src/mesa/main/buffers.c
+++ b/src/mesa/main/buffers.c
@@ -456,83 +456,6 @@ _mesa_ReadBuffer(GLenum buffer)
 }
 
 
-#if _HAVE_FULL_GL
-
-/**
- * XXX THIS IS OBSOLETE - drivers should take care of detecting window
- * size changes and act accordingly, likely calling _mesa_resize_framebuffer().
- *
- * GL_MESA_resize_buffers extension.
- *
- * When this function is called, we'll ask the window system how large
- * the current window is.  If it's a new size, we'll call the driver's
- * ResizeBuffers function.  The driver will then resize its color buffers
- * as needed, and maybe call the swrast's routine for reallocating
- * swrast-managed depth/stencil/accum/etc buffers.
- * \note This function should only be called through the GL API, not
- * from device drivers (as was done in the past).
- */
-
-void _mesa_resizebuffers( GLcontext *ctx )
-{
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH( ctx );
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glResizeBuffersMESA\n");
-
-   if (!ctx->Driver.GetBufferSize) {
-      return;
-   }
-
-   if (ctx->WinSysDrawBuffer) {
-      GLuint newWidth, newHeight;
-      GLframebuffer *buffer = ctx->WinSysDrawBuffer;
-
-      assert(buffer->Name == 0);
-
-      /* ask device driver for size of output buffer */
-      ctx->Driver.GetBufferSize( buffer, &newWidth, &newHeight );
-
-      /* see if size of device driver's color buffer (window) has changed */
-      if (buffer->Width != newWidth || buffer->Height != newHeight) {
-         if (ctx->Driver.ResizeBuffers)
-            ctx->Driver.ResizeBuffers(ctx, buffer, newWidth, newHeight );
-      }
-   }
-
-   if (ctx->WinSysReadBuffer
-       && ctx->WinSysReadBuffer != ctx->WinSysDrawBuffer) {
-      GLuint newWidth, newHeight;
-      GLframebuffer *buffer = ctx->WinSysReadBuffer;
-
-      assert(buffer->Name == 0);
-
-      /* ask device driver for size of read buffer */
-      ctx->Driver.GetBufferSize( buffer, &newWidth, &newHeight );
-
-      /* see if size of device driver's color buffer (window) has changed */
-      if (buffer->Width != newWidth || buffer->Height != newHeight) {
-         if (ctx->Driver.ResizeBuffers)
-            ctx->Driver.ResizeBuffers(ctx, buffer, newWidth, newHeight );
-      }
-   }
-
-   ctx->NewState |= _NEW_BUFFERS;  /* to update scissor / window bounds */
-}
-
-
-/*
- * XXX THIS IS OBSOLETE
- */
-void GLAPIENTRY
-_mesa_ResizeBuffersMESA( void )
-{
-   GET_CURRENT_CONTEXT(ctx);
-
-   if (ctx->Extensions.MESA_resize_buffers)
-      _mesa_resizebuffers( ctx );
-}
-
 
 /*
  * XXX move somewhere else someday?
@@ -553,8 +476,6 @@ _mesa_SampleCoverageARB(GLclampf value, GLboolean invert)
    ctx->NewState |= _NEW_MULTISAMPLE;
 }
 
-#endif /* _HAVE_FULL_GL */
-
 
 
 /**
diff --git a/src/mesa/main/buffers.h b/src/mesa/main/buffers.h
index ca0e7c411c..ba79db6871 100644
--- a/src/mesa/main/buffers.h
+++ b/src/mesa/main/buffers.h
@@ -52,15 +52,11 @@ _mesa_readbuffer_update_fields(GLcontext *ctx, GLenum buffer);
 extern void GLAPIENTRY
 _mesa_ReadBuffer( GLenum mode );
 
-extern void GLAPIENTRY
-_mesa_ResizeBuffersMESA( void );
-
 extern void GLAPIENTRY
 _mesa_SampleCoverageARB(GLclampf value, GLboolean invert);
 
 extern void 
 _mesa_init_multisample(GLcontext *ctx);
 
-extern void _mesa_resizebuffers( GLcontext *ctx );
 
 #endif
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index f933580b2d..07d279da30 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -52,6 +52,7 @@
 #include "eval.h"
 #include "extensions.h"
 #include "feedback.h"
+#include "framebuffer.h"
 #include "get.h"
 #include "glapi/glapi.h"
 #include "hash.h"
diff --git a/src/mesa/main/framebuffer.c b/src/mesa/main/framebuffer.c
index 894d99afd2..96f1b30c9b 100644
--- a/src/mesa/main/framebuffer.c
+++ b/src/mesa/main/framebuffer.c
@@ -338,6 +338,84 @@ _mesa_resize_framebuffer(GLcontext *ctx, struct gl_framebuffer *fb,
 }
 
 
+
+/**
+ * XXX THIS IS OBSOLETE - drivers should take care of detecting window
+ * size changes and act accordingly, likely calling _mesa_resize_framebuffer().
+ *
+ * GL_MESA_resize_buffers extension.
+ *
+ * When this function is called, we'll ask the window system how large
+ * the current window is.  If it's a new size, we'll call the driver's
+ * ResizeBuffers function.  The driver will then resize its color buffers
+ * as needed, and maybe call the swrast's routine for reallocating
+ * swrast-managed depth/stencil/accum/etc buffers.
+ * \note This function should only be called through the GL API, not
+ * from device drivers (as was done in the past).
+ */
+void
+_mesa_resizebuffers( GLcontext *ctx )
+{
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH( ctx );
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glResizeBuffersMESA\n");
+
+   if (!ctx->Driver.GetBufferSize) {
+      return;
+   }
+
+   if (ctx->WinSysDrawBuffer) {
+      GLuint newWidth, newHeight;
+      GLframebuffer *buffer = ctx->WinSysDrawBuffer;
+
+      assert(buffer->Name == 0);
+
+      /* ask device driver for size of output buffer */
+      ctx->Driver.GetBufferSize( buffer, &newWidth, &newHeight );
+
+      /* see if size of device driver's color buffer (window) has changed */
+      if (buffer->Width != newWidth || buffer->Height != newHeight) {
+         if (ctx->Driver.ResizeBuffers)
+            ctx->Driver.ResizeBuffers(ctx, buffer, newWidth, newHeight );
+      }
+   }
+
+   if (ctx->WinSysReadBuffer
+       && ctx->WinSysReadBuffer != ctx->WinSysDrawBuffer) {
+      GLuint newWidth, newHeight;
+      GLframebuffer *buffer = ctx->WinSysReadBuffer;
+
+      assert(buffer->Name == 0);
+
+      /* ask device driver for size of read buffer */
+      ctx->Driver.GetBufferSize( buffer, &newWidth, &newHeight );
+
+      /* see if size of device driver's color buffer (window) has changed */
+      if (buffer->Width != newWidth || buffer->Height != newHeight) {
+         if (ctx->Driver.ResizeBuffers)
+            ctx->Driver.ResizeBuffers(ctx, buffer, newWidth, newHeight );
+      }
+   }
+
+   ctx->NewState |= _NEW_BUFFERS;  /* to update scissor / window bounds */
+}
+
+
+/*
+ * XXX THIS IS OBSOLETE
+ */
+void GLAPIENTRY
+_mesa_ResizeBuffersMESA( void )
+{
+   GET_CURRENT_CONTEXT(ctx);
+
+   if (ctx->Extensions.MESA_resize_buffers)
+      _mesa_resizebuffers( ctx );
+}
+
+
+
 /**
  * Examine all the framebuffer's renderbuffers to update the Width/Height
  * fields of the framebuffer.  If we have renderbuffers with different
diff --git a/src/mesa/main/framebuffer.h b/src/mesa/main/framebuffer.h
index 4d76f3a90f..e9eeed28cb 100644
--- a/src/mesa/main/framebuffer.h
+++ b/src/mesa/main/framebuffer.h
@@ -53,6 +53,14 @@ extern void
 _mesa_resize_framebuffer(GLcontext *ctx, struct gl_framebuffer *fb,
                          GLuint width, GLuint height);
 
+
+extern void
+_mesa_resizebuffers( GLcontext *ctx );
+
+extern void GLAPIENTRY
+_mesa_ResizeBuffersMESA( void );
+
+
 extern void 
 _mesa_update_draw_buffer_bounds(GLcontext *ctx);
 
-- 
cgit v1.2.3


From bce428c4a65fdcb890ea18bf4a1dfb42ed109006 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 9 Jun 2008 15:09:21 -0600
Subject: mesa: refactor: move multisample-related functions into new
 multisample.c file

---
 src/mesa/main/api_exec.c    |  1 +
 src/mesa/main/attrib.c      |  1 +
 src/mesa/main/buffers.c     | 38 --------------------------
 src/mesa/main/buffers.h     |  6 -----
 src/mesa/main/context.c     |  1 +
 src/mesa/main/multisample.c | 66 +++++++++++++++++++++++++++++++++++++++++++++
 src/mesa/main/multisample.h | 38 ++++++++++++++++++++++++++
 src/mesa/main/sources       |  2 ++
 src/mesa/sources            |  1 +
 9 files changed, 110 insertions(+), 44 deletions(-)
 create mode 100644 src/mesa/main/multisample.c
 create mode 100644 src/mesa/main/multisample.h

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index 382091f580..8cdbaada9b 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -71,6 +71,7 @@
 #include "lines.h"
 #include "macros.h"
 #include "matrix.h"
+#include "multisample.h"
 #include "pixel.h"
 #include "pixelstore.h"
 #include "points.h"
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 63754569e6..6ed82da203 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -42,6 +42,7 @@
 #include "light.h"
 #include "lines.h"
 #include "matrix.h"
+#include "multisample.h"
 #include "points.h"
 #include "polygon.h"
 #include "scissor.h"
diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c
index c767e62286..1d07c68633 100644
--- a/src/mesa/main/buffers.c
+++ b/src/mesa/main/buffers.c
@@ -454,41 +454,3 @@ _mesa_ReadBuffer(GLenum buffer)
    if (ctx->Driver.ReadBuffer)
       (*ctx->Driver.ReadBuffer)(ctx, buffer);
 }
-
-
-
-/*
- * XXX move somewhere else someday?
- */
-void GLAPIENTRY
-_mesa_SampleCoverageARB(GLclampf value, GLboolean invert)
-{
-   GET_CURRENT_CONTEXT(ctx);
-
-   if (!ctx->Extensions.ARB_multisample) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glSampleCoverageARB");
-      return;
-   }
-
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH( ctx );
-   ctx->Multisample.SampleCoverageValue = (GLfloat) CLAMP(value, 0.0, 1.0);
-   ctx->Multisample.SampleCoverageInvert = invert;
-   ctx->NewState |= _NEW_MULTISAMPLE;
-}
-
-
-
-/**
- * Initialize the context's multisample state.
- * \param ctx  the GL context.
- */
-void
-_mesa_init_multisample(GLcontext *ctx)
-{
-   ctx->Multisample.Enabled = GL_FALSE;
-   ctx->Multisample.SampleAlphaToCoverage = GL_FALSE;
-   ctx->Multisample.SampleAlphaToOne = GL_FALSE;
-   ctx->Multisample.SampleCoverage = GL_FALSE;
-   ctx->Multisample.SampleCoverageValue = 1.0;
-   ctx->Multisample.SampleCoverageInvert = GL_FALSE;
-}
diff --git a/src/mesa/main/buffers.h b/src/mesa/main/buffers.h
index ba79db6871..53d5fb80d4 100644
--- a/src/mesa/main/buffers.h
+++ b/src/mesa/main/buffers.h
@@ -52,11 +52,5 @@ _mesa_readbuffer_update_fields(GLcontext *ctx, GLenum buffer);
 extern void GLAPIENTRY
 _mesa_ReadBuffer( GLenum mode );
 
-extern void GLAPIENTRY
-_mesa_SampleCoverageARB(GLclampf value, GLboolean invert);
-
-extern void 
-_mesa_init_multisample(GLcontext *ctx);
-
 
 #endif
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 7ee6b2ec54..1b357ae6c2 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -105,6 +105,7 @@
 #include "lines.h"
 #include "macros.h"
 #include "matrix.h"
+#include "multisample.h"
 #include "pixel.h"
 #include "pixelstore.h"
 #include "points.h"
diff --git a/src/mesa/main/multisample.c b/src/mesa/main/multisample.c
new file mode 100644
index 0000000000..e138087436
--- /dev/null
+++ b/src/mesa/main/multisample.c
@@ -0,0 +1,66 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.1
+ *
+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "main/glheader.h"
+#include "main/context.h"
+#include "main/macros.h"
+#include "main/multisample.h"
+
+
+/**
+ * Called via glSampleCoverageARB
+ */
+void GLAPIENTRY
+_mesa_SampleCoverageARB(GLclampf value, GLboolean invert)
+{
+   GET_CURRENT_CONTEXT(ctx);
+
+   if (!ctx->Extensions.ARB_multisample) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glSampleCoverageARB");
+      return;
+   }
+
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH( ctx );
+
+   ctx->Multisample.SampleCoverageValue = (GLfloat) CLAMP(value, 0.0, 1.0);
+   ctx->Multisample.SampleCoverageInvert = invert;
+   ctx->NewState |= _NEW_MULTISAMPLE;
+}
+
+
+/**
+ * Initialize the context's multisample state.
+ * \param ctx  the GL context.
+ */
+void
+_mesa_init_multisample(GLcontext *ctx)
+{
+   ctx->Multisample.Enabled = GL_FALSE;
+   ctx->Multisample.SampleAlphaToCoverage = GL_FALSE;
+   ctx->Multisample.SampleAlphaToOne = GL_FALSE;
+   ctx->Multisample.SampleCoverage = GL_FALSE;
+   ctx->Multisample.SampleCoverageValue = 1.0;
+   ctx->Multisample.SampleCoverageInvert = GL_FALSE;
+}
diff --git a/src/mesa/main/multisample.h b/src/mesa/main/multisample.h
new file mode 100644
index 0000000000..4305900cc4
--- /dev/null
+++ b/src/mesa/main/multisample.h
@@ -0,0 +1,38 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.1
+ *
+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef MULTISAMPLE_H
+#define MULTISAMPLE_H
+
+
+extern void GLAPIENTRY
+_mesa_SampleCoverageARB(GLclampf value, GLboolean invert);
+
+
+extern void
+_mesa_init_multisample(GLcontext *ctx);
+
+
+#endif
diff --git a/src/mesa/main/sources b/src/mesa/main/sources
index 8043f4369e..5379fa08f4 100644
--- a/src/mesa/main/sources
+++ b/src/mesa/main/sources
@@ -42,6 +42,7 @@ lines.c \
 matrix.c \
 mipmap.c \
 mm.c \
+multisample.c \
 occlude.c \
 pixel.c \
 pixelstore.c \
@@ -120,6 +121,7 @@ matrix.h \
 mipmap.h \
 mm.h \
 mtypes.h \
+multisample.h \
 occlude.h \
 pixel.h \
 pixelstore.h \
diff --git a/src/mesa/sources b/src/mesa/sources
index 95d665e3a1..23b03932be 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -44,6 +44,7 @@ MAIN_SOURCES = \
 	main/matrix.c \
 	main/mipmap.c \
 	main/mm.c \
+	main/multisample.c \
 	main/pixel.c \
 	main/pixelstore.c \
 	main/points.c \
-- 
cgit v1.2.3


From eded7f010d344a909cf9c403eb3bdad91804d174 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 9 Jun 2008 15:14:02 -0600
Subject: mesa: refactor: move _mesa_update_minmax/histogram() into image.c

---
 src/mesa/main/histogram.c | 65 ---------------------------------------------
 src/mesa/main/histogram.h |  6 -----
 src/mesa/main/image.c     | 67 ++++++++++++++++++++++++++++++++++++++++++++---
 3 files changed, 64 insertions(+), 74 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/histogram.c b/src/mesa/main/histogram.c
index 6a7f09489c..77c458d540 100644
--- a/src/mesa/main/histogram.c
+++ b/src/mesa/main/histogram.c
@@ -31,71 +31,6 @@
 #include "histogram.h"
 
 
-/**********************************************************************
- * Internal functions
- */
-
-
-/*
- * Update the min/max values from an array of fragment colors.
- */
-void
-_mesa_update_minmax(GLcontext *ctx, GLuint n, const GLfloat rgba[][4])
-{
-   GLuint i;
-   for (i = 0; i < n; i++) {
-      /* update mins */
-      if (rgba[i][RCOMP] < ctx->MinMax.Min[RCOMP])
-         ctx->MinMax.Min[RCOMP] = rgba[i][RCOMP];
-      if (rgba[i][GCOMP] < ctx->MinMax.Min[GCOMP])
-         ctx->MinMax.Min[GCOMP] = rgba[i][GCOMP];
-      if (rgba[i][BCOMP] < ctx->MinMax.Min[BCOMP])
-         ctx->MinMax.Min[BCOMP] = rgba[i][BCOMP];
-      if (rgba[i][ACOMP] < ctx->MinMax.Min[ACOMP])
-         ctx->MinMax.Min[ACOMP] = rgba[i][ACOMP];
-
-      /* update maxs */
-      if (rgba[i][RCOMP] > ctx->MinMax.Max[RCOMP])
-         ctx->MinMax.Max[RCOMP] = rgba[i][RCOMP];
-      if (rgba[i][GCOMP] > ctx->MinMax.Max[GCOMP])
-         ctx->MinMax.Max[GCOMP] = rgba[i][GCOMP];
-      if (rgba[i][BCOMP] > ctx->MinMax.Max[BCOMP])
-         ctx->MinMax.Max[BCOMP] = rgba[i][BCOMP];
-      if (rgba[i][ACOMP] > ctx->MinMax.Max[ACOMP])
-         ctx->MinMax.Max[ACOMP] = rgba[i][ACOMP];
-   }
-}
-
-
-/*
- * Update the histogram values from an array of fragment colors.
- */
-void
-_mesa_update_histogram(GLcontext *ctx, GLuint n, const GLfloat rgba[][4])
-{
-   const GLint max = ctx->Histogram.Width - 1;
-   GLfloat w = (GLfloat) max;
-   GLuint i;
-
-   if (ctx->Histogram.Width == 0)
-      return;
-
-   for (i = 0; i < n; i++) {
-      GLint ri = IROUND(rgba[i][RCOMP] * w);
-      GLint gi = IROUND(rgba[i][GCOMP] * w);
-      GLint bi = IROUND(rgba[i][BCOMP] * w);
-      GLint ai = IROUND(rgba[i][ACOMP] * w);
-      ri = CLAMP(ri, 0, max);
-      gi = CLAMP(gi, 0, max);
-      bi = CLAMP(bi, 0, max);
-      ai = CLAMP(ai, 0, max);
-      ctx->Histogram.Count[ri][RCOMP]++;
-      ctx->Histogram.Count[gi][GCOMP]++;
-      ctx->Histogram.Count[bi][BCOMP]++;
-      ctx->Histogram.Count[ai][ACOMP]++;
-   }
-}
-
 
 /*
  * XXX the packed pixel formats haven't been tested.
diff --git a/src/mesa/main/histogram.h b/src/mesa/main/histogram.h
index 974447231d..367e9b11ba 100644
--- a/src/mesa/main/histogram.h
+++ b/src/mesa/main/histogram.h
@@ -71,12 +71,6 @@ _mesa_ResetHistogram(GLenum target);
 extern void GLAPIENTRY 
 _mesa_ResetMinmax(GLenum target);
 
-extern void
-_mesa_update_minmax(GLcontext *ctx, GLuint n, const GLfloat rgba[][4]);
-
-extern void
-_mesa_update_histogram(GLcontext *ctx, GLuint n, const GLfloat rgba[][4]);
-
 extern void _mesa_init_histogram( GLcontext * ctx );
 
 #else
diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index 63bcc48e68..a6ac821251 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -34,7 +34,6 @@
 #include "context.h"
 #include "image.h"
 #include "imports.h"
-#include "histogram.h"
 #include "macros.h"
 #include "pixel.h"
 
@@ -1431,6 +1430,68 @@ _mesa_scale_and_bias_depth_uint(const GLcontext *ctx, GLuint n,
 }
 
 
+
+/*
+ * Update the min/max values from an array of fragment colors.
+ */
+static void
+update_minmax(GLcontext *ctx, GLuint n, const GLfloat rgba[][4])
+{
+   GLuint i;
+   for (i = 0; i < n; i++) {
+      /* update mins */
+      if (rgba[i][RCOMP] < ctx->MinMax.Min[RCOMP])
+         ctx->MinMax.Min[RCOMP] = rgba[i][RCOMP];
+      if (rgba[i][GCOMP] < ctx->MinMax.Min[GCOMP])
+         ctx->MinMax.Min[GCOMP] = rgba[i][GCOMP];
+      if (rgba[i][BCOMP] < ctx->MinMax.Min[BCOMP])
+         ctx->MinMax.Min[BCOMP] = rgba[i][BCOMP];
+      if (rgba[i][ACOMP] < ctx->MinMax.Min[ACOMP])
+         ctx->MinMax.Min[ACOMP] = rgba[i][ACOMP];
+
+      /* update maxs */
+      if (rgba[i][RCOMP] > ctx->MinMax.Max[RCOMP])
+         ctx->MinMax.Max[RCOMP] = rgba[i][RCOMP];
+      if (rgba[i][GCOMP] > ctx->MinMax.Max[GCOMP])
+         ctx->MinMax.Max[GCOMP] = rgba[i][GCOMP];
+      if (rgba[i][BCOMP] > ctx->MinMax.Max[BCOMP])
+         ctx->MinMax.Max[BCOMP] = rgba[i][BCOMP];
+      if (rgba[i][ACOMP] > ctx->MinMax.Max[ACOMP])
+         ctx->MinMax.Max[ACOMP] = rgba[i][ACOMP];
+   }
+}
+
+
+/*
+ * Update the histogram values from an array of fragment colors.
+ */
+static void
+update_histogram(GLcontext *ctx, GLuint n, const GLfloat rgba[][4])
+{
+   const GLint max = ctx->Histogram.Width - 1;
+   GLfloat w = (GLfloat) max;
+   GLuint i;
+
+   if (ctx->Histogram.Width == 0)
+      return;
+
+   for (i = 0; i < n; i++) {
+      GLint ri = IROUND(rgba[i][RCOMP] * w);
+      GLint gi = IROUND(rgba[i][GCOMP] * w);
+      GLint bi = IROUND(rgba[i][BCOMP] * w);
+      GLint ai = IROUND(rgba[i][ACOMP] * w);
+      ri = CLAMP(ri, 0, max);
+      gi = CLAMP(gi, 0, max);
+      bi = CLAMP(bi, 0, max);
+      ai = CLAMP(ai, 0, max);
+      ctx->Histogram.Count[ri][RCOMP]++;
+      ctx->Histogram.Count[gi][GCOMP]++;
+      ctx->Histogram.Count[bi][BCOMP]++;
+      ctx->Histogram.Count[ai][ACOMP]++;
+   }
+}
+
+
 /**
  * Apply various pixel transfer operations to an array of RGBA pixels
  * as indicated by the transferOps bitmask
@@ -1486,11 +1547,11 @@ _mesa_apply_rgba_transfer_ops(GLcontext *ctx, GLbitfield transferOps,
    }
    /* update histogram count */
    if (transferOps & IMAGE_HISTOGRAM_BIT) {
-      _mesa_update_histogram(ctx, n, (CONST GLfloat (*)[4]) rgba);
+      update_histogram(ctx, n, (CONST GLfloat (*)[4]) rgba);
    }
    /* update min/max values */
    if (transferOps & IMAGE_MIN_MAX_BIT) {
-      _mesa_update_minmax(ctx, n, (CONST GLfloat (*)[4]) rgba);
+      update_minmax(ctx, n, (CONST GLfloat (*)[4]) rgba);
    }
    /* clamping to [0,1] */
    if (transferOps & IMAGE_CLAMP_BIT) {
-- 
cgit v1.2.3


From 0116ec1af36356c0ee845b3d1384e73316052497 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 9 Jun 2008 15:19:08 -0600
Subject: mesa: remove unused api_eval.h header file

---
 src/mesa/main/api_eval.h     | 42 ------------------------------------------
 src/mesa/main/sources        |  1 -
 src/mesa/vbo/vbo_exec_eval.c |  1 -
 3 files changed, 44 deletions(-)
 delete mode 100644 src/mesa/main/api_eval.h

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_eval.h b/src/mesa/main/api_eval.h
deleted file mode 100644
index d6cb38c9f8..0000000000
--- a/src/mesa/main/api_eval.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-/*
- * Mesa 3-D graphics library
- * Version:  3.5
- *
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-#ifndef API_EVAL_H
-#define API_EVAL_H
-
-#include "mtypes.h"
-
-extern void _mesa_EvalPoint1( GLint i );
-extern void _mesa_EvalPoint2( GLint i, GLint j );
-extern void _mesa_EvalCoord1f( GLfloat u );
-extern void _mesa_EvalCoord2f( GLfloat u, GLfloat v );
-extern void _mesa_EvalCoord1fv( const GLfloat *u );
-extern void _mesa_EvalCoord2fv( const GLfloat *u );
-
-#endif
-
-
-
diff --git a/src/mesa/main/sources b/src/mesa/main/sources
index 5379fa08f4..5a6cddf4bd 100644
--- a/src/mesa/main/sources
+++ b/src/mesa/main/sources
@@ -75,7 +75,6 @@ vsnprintf.c
 MESA_MAIN_HEADERS = \
 accum.h \
 api_arrayelt.h \
-api_eval.h \
 api_exec.h \
 api_loopback.h \
 api_noop.h \
diff --git a/src/mesa/vbo/vbo_exec_eval.c b/src/mesa/vbo/vbo_exec_eval.c
index 0ba5585d24..0c691b3a5c 100644
--- a/src/mesa/vbo/vbo_exec_eval.c
+++ b/src/mesa/vbo/vbo_exec_eval.c
@@ -26,7 +26,6 @@
  */
 
 #include "main/glheader.h"
-#include "main/api_eval.h"
 #include "main/context.h"
 #include "main/macros.h"
 #include "math/m_eval.h"
-- 
cgit v1.2.3


From 00d90fe845de46649528e3599c0eb42203e78309 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Tue, 10 Jun 2008 12:07:38 -0600
Subject: gallium: remove stray include of st_context.h

---
 src/mesa/main/renderbuffer.c | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/renderbuffer.c b/src/mesa/main/renderbuffer.c
index d576a7a121..3c37d05b40 100644
--- a/src/mesa/main/renderbuffer.c
+++ b/src/mesa/main/renderbuffer.c
@@ -49,8 +49,6 @@
 
 #include "rbadaptors.h"
 
-#include "state_tracker/st_context.h"
-
 
 /* 32-bit color index format.  Not a public format. */
 #define COLOR_INDEX32 0x424243
-- 
cgit v1.2.3


From 40d1a40f294f1ed2dacfad6f5498322fc08cc2d1 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Tue, 10 Jun 2008 16:13:42 -0600
Subject: mesa: refactor: move #define FEATURE flags into new mfeatures.h file

Also, check the FEATURE flags in many places.
---
 src/mesa/main/api_exec.c    | 140 ++++++++++++++++++++++++++++++--------------
 src/mesa/main/api_exec.h    |   5 +-
 src/mesa/main/api_noop.c    |   9 +++
 src/mesa/main/config.h      |  38 ++----------
 src/mesa/main/context.c     |  50 +++++++++++++++-
 src/mesa/main/mfeatures.h   |  77 ++++++++++++++++++++++++
 src/mesa/main/state.c       |   4 ++
 src/mesa/main/texformat.c   |  26 +++++---
 src/mesa/main/teximage.c    |  21 ++++++-
 src/mesa/main/texobj.c      |   4 ++
 src/mesa/main/texstate.c    |  15 +++--
 src/mesa/main/texstore.c    |  17 +++++-
 src/mesa/vbo/vbo_context.c  |   5 +-
 src/mesa/vbo/vbo_context.h  |   6 +-
 src/mesa/vbo/vbo_exec.c     |   1 -
 src/mesa/vbo/vbo_exec_api.c |   4 ++
 16 files changed, 323 insertions(+), 99 deletions(-)
 create mode 100644 src/mesa/main/mfeatures.h

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index 8cdbaada9b..f7cf42f600 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -30,7 +30,9 @@
 
 
 #include "glheader.h"
+#if FEATURE_accum
 #include "accum.h"
+#endif
 #include "api_loopback.h"
 #include "api_exec.h"
 #if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
@@ -39,25 +41,42 @@
 #if FEATURE_ATI_fragment_shader
 #include "shader/atifragshader.h"
 #endif
+#if FEATURE_attrib_stack
 #include "attrib.h"
+#endif
 #include "blend.h"
 #if FEATURE_ARB_vertex_buffer_object
 #include "bufferobj.h"
 #endif
 #include "arrayobj.h"
+#if FEATURE_draw_read_buffer
 #include "buffers.h"
+#endif
 #include "clear.h"
 #include "clip.h"
+#if FEATURE_colortable
 #include "colortab.h"
+#endif
 #include "context.h"
+#if FEATURE_convolution
 #include "convolve.h"
+#endif
 #include "depth.h"
+#if FEATURE_dlist
 #include "dlist.h"
+#endif
+#if FEATURE_drawpix
 #include "drawpix.h"
+#include "rastpos.h"
+#endif
 #include "enable.h"
+#if FEATURE_evaluators
 #include "eval.h"
+#endif
 #include "get.h"
+#if FEATURE_feadback
 #include "feedback.h"
+#endif
 #include "fog.h"
 #if FEATURE_EXT_framebuffer_object
 #include "fbobject.h"
@@ -65,21 +84,24 @@
 #include "ffvertex_prog.h"
 #include "framebuffer.h"
 #include "hint.h"
+#if FEATURE_histogram
 #include "histogram.h"
+#endif
 #include "imports.h"
 #include "light.h"
 #include "lines.h"
 #include "macros.h"
 #include "matrix.h"
 #include "multisample.h"
+#if FEATURE_pixel_transfer
 #include "pixel.h"
+#endif
 #include "pixelstore.h"
 #include "points.h"
 #include "polygon.h"
 #if FEATURE_ARB_occlusion_query || FEATURE_EXT_timer_query
 #include "queryobj.h"
 #endif
-#include "rastpos.h"
 #include "readpix.h"
 #include "scissor.h"
 #include "state.h"
@@ -131,7 +153,10 @@ _mesa_init_exec_table(struct _glapi_table *exec)
    SET_ColorMask(exec, _mesa_ColorMask);
    SET_CullFace(exec, _mesa_CullFace);
    SET_Disable(exec, _mesa_Disable);
+#if FEATURE_draw_read_buffer
    SET_DrawBuffer(exec, _mesa_DrawBuffer);
+   SET_ReadBuffer(exec, _mesa_ReadBuffer);
+#endif
    SET_Enable(exec, _mesa_Enable);
    SET_Finish(exec, _mesa_Finish);
    SET_Flush(exec, _mesa_Flush);
@@ -140,31 +165,20 @@ _mesa_init_exec_table(struct _glapi_table *exec)
    SET_GetError(exec, _mesa_GetError);
    SET_GetFloatv(exec, _mesa_GetFloatv);
    SET_GetString(exec, _mesa_GetString);
-   SET_InitNames(exec, _mesa_InitNames);
    SET_LineStipple(exec, _mesa_LineStipple);
    SET_LineWidth(exec, _mesa_LineWidth);
    SET_LoadIdentity(exec, _mesa_LoadIdentity);
    SET_LoadMatrixf(exec, _mesa_LoadMatrixf);
-   SET_LoadName(exec, _mesa_LoadName);
    SET_LogicOp(exec, _mesa_LogicOp);
    SET_MatrixMode(exec, _mesa_MatrixMode);
    SET_MultMatrixf(exec, _mesa_MultMatrixf);
    SET_Ortho(exec, _mesa_Ortho);
    SET_PixelStorei(exec, _mesa_PixelStorei);
    SET_PopMatrix(exec, _mesa_PopMatrix);
-   SET_PopName(exec, _mesa_PopName);
    SET_PushMatrix(exec, _mesa_PushMatrix);
-   SET_PushName(exec, _mesa_PushName);
-   SET_RasterPos2f(exec, _mesa_RasterPos2f);
-   SET_RasterPos2fv(exec, _mesa_RasterPos2fv);
-   SET_RasterPos2i(exec, _mesa_RasterPos2i);
-   SET_RasterPos2iv(exec, _mesa_RasterPos2iv);
-   SET_ReadBuffer(exec, _mesa_ReadBuffer);
-   SET_RenderMode(exec, _mesa_RenderMode);
    SET_Rotatef(exec, _mesa_Rotatef);
    SET_Scalef(exec, _mesa_Scalef);
    SET_Scissor(exec, _mesa_Scissor);
-   SET_SelectBuffer(exec, _mesa_SelectBuffer);
    SET_ShadeModel(exec, _mesa_ShadeModel);
    SET_StencilFunc(exec, _mesa_StencilFunc);
    SET_StencilMask(exec, _mesa_StencilMask);
@@ -175,46 +189,57 @@ _mesa_init_exec_table(struct _glapi_table *exec)
    SET_TexParameteri(exec, _mesa_TexParameteri);
    SET_Translatef(exec, _mesa_Translatef);
    SET_Viewport(exec, _mesa_Viewport);
-#if _HAVE_FULL_GL
+#if FEATURE_accum
    SET_Accum(exec, _mesa_Accum);
-   SET_Bitmap(exec, _mesa_Bitmap);
+   SET_ClearAccum(exec, _mesa_ClearAccum);
+#endif
+#if FEATURE_dlist
    SET_CallList(exec, _mesa_CallList);
    SET_CallLists(exec, _mesa_CallLists);
-   SET_ClearAccum(exec, _mesa_ClearAccum);
+   SET_DeleteLists(exec, _mesa_DeleteLists);
+   SET_EndList(exec, _mesa_EndList);
+   SET_GenLists(exec, _mesa_GenLists);
+   SET_IsList(exec, _mesa_IsList);
+   SET_ListBase(exec, _mesa_ListBase);
+   SET_NewList(exec, _mesa_NewList);
+#endif
    SET_ClearDepth(exec, _mesa_ClearDepth);
    SET_ClearIndex(exec, _mesa_ClearIndex);
    SET_ClipPlane(exec, _mesa_ClipPlane);
    SET_ColorMaterial(exec, _mesa_ColorMaterial);
-   SET_CopyPixels(exec, _mesa_CopyPixels);
    SET_CullParameterfvEXT(exec, _mesa_CullParameterfvEXT);
    SET_CullParameterdvEXT(exec, _mesa_CullParameterdvEXT);
-   SET_DeleteLists(exec, _mesa_DeleteLists);
    SET_DepthFunc(exec, _mesa_DepthFunc);
    SET_DepthMask(exec, _mesa_DepthMask);
    SET_DepthRange(exec, _mesa_DepthRange);
+#if FEATURE_drawpix
+   SET_Bitmap(exec, _mesa_Bitmap);
+   SET_CopyPixels(exec, _mesa_CopyPixels);
    SET_DrawPixels(exec, _mesa_DrawPixels);
-   SET_EndList(exec, _mesa_EndList);
+#endif
+#if FEATURE_feadback
+   SET_InitNames(exec, _mesa_InitNames);
    SET_FeedbackBuffer(exec, _mesa_FeedbackBuffer);
+   SET_LoadName(exec, _mesa_LoadName);
+   SET_PassThrough(exec, _mesa_PassThrough);
+   SET_PopName(exec, _mesa_PopName);
+   SET_PushName(exec, _mesa_PushName);
+   SET_SelectBuffer(exec, _mesa_SelectBuffer);
+   SET_RenderMode(exec, _mesa_RenderMode);
+#endif
    SET_FogCoordPointerEXT(exec, _mesa_FogCoordPointerEXT);
    SET_Fogf(exec, _mesa_Fogf);
    SET_Fogfv(exec, _mesa_Fogfv);
    SET_Fogi(exec, _mesa_Fogi);
    SET_Fogiv(exec, _mesa_Fogiv);
-   SET_GenLists(exec, _mesa_GenLists);
    SET_GetClipPlane(exec, _mesa_GetClipPlane);
    SET_GetBooleanv(exec, _mesa_GetBooleanv);
    SET_GetDoublev(exec, _mesa_GetDoublev);
    SET_GetIntegerv(exec, _mesa_GetIntegerv);
    SET_GetLightfv(exec, _mesa_GetLightfv);
    SET_GetLightiv(exec, _mesa_GetLightiv);
-   SET_GetMapdv(exec, _mesa_GetMapdv);
-   SET_GetMapfv(exec, _mesa_GetMapfv);
-   SET_GetMapiv(exec, _mesa_GetMapiv);
    SET_GetMaterialfv(exec, _mesa_GetMaterialfv);
    SET_GetMaterialiv(exec, _mesa_GetMaterialiv);
-   SET_GetPixelMapfv(exec, _mesa_GetPixelMapfv);
-   SET_GetPixelMapuiv(exec, _mesa_GetPixelMapuiv);
-   SET_GetPixelMapusv(exec, _mesa_GetPixelMapusv);
    SET_GetPolygonStipple(exec, _mesa_GetPolygonStipple);
    SET_GetTexEnvfv(exec, _mesa_GetTexEnvfv);
    SET_GetTexEnviv(exec, _mesa_GetTexEnviv);
@@ -222,14 +247,10 @@ _mesa_init_exec_table(struct _glapi_table *exec)
    SET_GetTexLevelParameteriv(exec, _mesa_GetTexLevelParameteriv);
    SET_GetTexParameterfv(exec, _mesa_GetTexParameterfv);
    SET_GetTexParameteriv(exec, _mesa_GetTexParameteriv);
-   SET_GetTexGendv(exec, _mesa_GetTexGendv);
-   SET_GetTexGenfv(exec, _mesa_GetTexGenfv);
-   SET_GetTexGeniv(exec, _mesa_GetTexGeniv);
    SET_GetTexImage(exec, _mesa_GetTexImage);
    SET_Hint(exec, _mesa_Hint);
    SET_IndexMask(exec, _mesa_IndexMask);
    SET_IsEnabled(exec, _mesa_IsEnabled);
-   SET_IsList(exec, _mesa_IsList);
    SET_LightModelf(exec, _mesa_LightModelf);
    SET_LightModelfv(exec, _mesa_LightModelfv);
    SET_LightModeli(exec, _mesa_LightModeli);
@@ -238,8 +259,11 @@ _mesa_init_exec_table(struct _glapi_table *exec)
    SET_Lightfv(exec, _mesa_Lightfv);
    SET_Lighti(exec, _mesa_Lighti);
    SET_Lightiv(exec, _mesa_Lightiv);
-   SET_ListBase(exec, _mesa_ListBase);
    SET_LoadMatrixd(exec, _mesa_LoadMatrixd);
+#if FEATURE_evaluators
+   SET_GetMapdv(exec, _mesa_GetMapdv);
+   SET_GetMapfv(exec, _mesa_GetMapfv);
+   SET_GetMapiv(exec, _mesa_GetMapiv);
    SET_Map1d(exec, _mesa_Map1d);
    SET_Map1f(exec, _mesa_Map1f);
    SET_Map2d(exec, _mesa_Map2d);
@@ -248,22 +272,35 @@ _mesa_init_exec_table(struct _glapi_table *exec)
    SET_MapGrid1f(exec, _mesa_MapGrid1f);
    SET_MapGrid2d(exec, _mesa_MapGrid2d);
    SET_MapGrid2f(exec, _mesa_MapGrid2f);
+#endif
    SET_MultMatrixd(exec, _mesa_MultMatrixd);
-   SET_NewList(exec, _mesa_NewList);
-   SET_PassThrough(exec, _mesa_PassThrough);
+#if FEATURE_pixel_transfer
+   SET_GetPixelMapfv(exec, _mesa_GetPixelMapfv);
+   SET_GetPixelMapuiv(exec, _mesa_GetPixelMapuiv);
+   SET_GetPixelMapusv(exec, _mesa_GetPixelMapusv);
    SET_PixelMapfv(exec, _mesa_PixelMapfv);
    SET_PixelMapuiv(exec, _mesa_PixelMapuiv);
    SET_PixelMapusv(exec, _mesa_PixelMapusv);
-   SET_PixelStoref(exec, _mesa_PixelStoref);
    SET_PixelTransferf(exec, _mesa_PixelTransferf);
    SET_PixelTransferi(exec, _mesa_PixelTransferi);
    SET_PixelZoom(exec, _mesa_PixelZoom);
+#endif
+   SET_PixelStoref(exec, _mesa_PixelStoref);
    SET_PointSize(exec, _mesa_PointSize);
    SET_PolygonMode(exec, _mesa_PolygonMode);
    SET_PolygonOffset(exec, _mesa_PolygonOffset);
    SET_PolygonStipple(exec, _mesa_PolygonStipple);
+#if FEATURE_attrib_stack
    SET_PopAttrib(exec, _mesa_PopAttrib);
    SET_PushAttrib(exec, _mesa_PushAttrib);
+   SET_PopClientAttrib(exec, _mesa_PopClientAttrib);
+   SET_PushClientAttrib(exec, _mesa_PushClientAttrib);
+#endif
+#if FEATURE_drawpix
+   SET_RasterPos2f(exec, _mesa_RasterPos2f);
+   SET_RasterPos2fv(exec, _mesa_RasterPos2fv);
+   SET_RasterPos2i(exec, _mesa_RasterPos2i);
+   SET_RasterPos2iv(exec, _mesa_RasterPos2iv);
    SET_RasterPos2d(exec, _mesa_RasterPos2d);
    SET_RasterPos2dv(exec, _mesa_RasterPos2dv);
    SET_RasterPos2s(exec, _mesa_RasterPos2s);
@@ -284,24 +321,31 @@ _mesa_init_exec_table(struct _glapi_table *exec)
    SET_RasterPos4iv(exec, _mesa_RasterPos4iv);
    SET_RasterPos4s(exec, _mesa_RasterPos4s);
    SET_RasterPos4sv(exec, _mesa_RasterPos4sv);
+#endif
    SET_ReadPixels(exec, _mesa_ReadPixels);
    SET_Rotated(exec, _mesa_Rotated);
    SET_Scaled(exec, _mesa_Scaled);
    SET_SecondaryColorPointerEXT(exec, _mesa_SecondaryColorPointerEXT);
    SET_TexEnvf(exec, _mesa_TexEnvf);
    SET_TexEnviv(exec, _mesa_TexEnviv);
+
+#if FEATURE_texgen
+   SET_GetTexGendv(exec, _mesa_GetTexGendv);
+   SET_GetTexGenfv(exec, _mesa_GetTexGenfv);
+   SET_GetTexGeniv(exec, _mesa_GetTexGeniv);
    SET_TexGend(exec, _mesa_TexGend);
    SET_TexGendv(exec, _mesa_TexGendv);
    SET_TexGenf(exec, _mesa_TexGenf);
    SET_TexGenfv(exec, _mesa_TexGenfv);
    SET_TexGeni(exec, _mesa_TexGeni);
    SET_TexGeniv(exec, _mesa_TexGeniv);
+#endif
+
    SET_TexImage1D(exec, _mesa_TexImage1D);
    SET_TexParameterf(exec, _mesa_TexParameterf);
    SET_TexParameterfv(exec, _mesa_TexParameterfv);
    SET_TexParameteriv(exec, _mesa_TexParameteriv);
    SET_Translated(exec, _mesa_Translated);
-#endif
 
    /* 1.1 */
    SET_BindTexture(exec, _mesa_BindTexture);
@@ -322,9 +366,7 @@ _mesa_init_exec_table(struct _glapi_table *exec)
    SET_InterleavedArrays(exec, _mesa_InterleavedArrays);
    SET_IsTexture(exec, _mesa_IsTexture);
    SET_NormalPointer(exec, _mesa_NormalPointer);
-   SET_PopClientAttrib(exec, _mesa_PopClientAttrib);
    SET_PrioritizeTextures(exec, _mesa_PrioritizeTextures);
-   SET_PushClientAttrib(exec, _mesa_PushClientAttrib);
    SET_TexCoordPointer(exec, _mesa_TexCoordPointer);
    SET_TexSubImage1D(exec, _mesa_TexSubImage1D);
    SET_TexSubImage2D(exec, _mesa_TexSubImage2D);
@@ -339,30 +381,37 @@ _mesa_init_exec_table(struct _glapi_table *exec)
 #endif
 
    /* OpenGL 1.2  GL_ARB_imaging */
-#if _HAVE_FULL_GL
    SET_BlendColor(exec, _mesa_BlendColor);
    SET_BlendEquation(exec, _mesa_BlendEquation);
    SET_BlendEquationSeparateEXT(exec, _mesa_BlendEquationSeparateEXT);
+
+#if FEATURE_colortable
    SET_ColorSubTable(exec, _mesa_ColorSubTable);
    SET_ColorTable(exec, _mesa_ColorTable);
    SET_ColorTableParameterfv(exec, _mesa_ColorTableParameterfv);
    SET_ColorTableParameteriv(exec, _mesa_ColorTableParameteriv);
+   SET_CopyColorSubTable(exec, _mesa_CopyColorSubTable);
+   SET_CopyColorTable(exec, _mesa_CopyColorTable);
+   SET_GetColorTable(exec, _mesa_GetColorTable);
+   SET_GetColorTableParameterfv(exec, _mesa_GetColorTableParameterfv);
+   SET_GetColorTableParameteriv(exec, _mesa_GetColorTableParameteriv);
+#endif
+
+#if FEATURE_convolution
    SET_ConvolutionFilter1D(exec, _mesa_ConvolutionFilter1D);
    SET_ConvolutionFilter2D(exec, _mesa_ConvolutionFilter2D);
    SET_ConvolutionParameterf(exec, _mesa_ConvolutionParameterf);
    SET_ConvolutionParameterfv(exec, _mesa_ConvolutionParameterfv);
    SET_ConvolutionParameteri(exec, _mesa_ConvolutionParameteri);
    SET_ConvolutionParameteriv(exec, _mesa_ConvolutionParameteriv);
-   SET_CopyColorSubTable(exec, _mesa_CopyColorSubTable);
-   SET_CopyColorTable(exec, _mesa_CopyColorTable);
    SET_CopyConvolutionFilter1D(exec, _mesa_CopyConvolutionFilter1D);
    SET_CopyConvolutionFilter2D(exec, _mesa_CopyConvolutionFilter2D);
-   SET_GetColorTable(exec, _mesa_GetColorTable);
-   SET_GetColorTableParameterfv(exec, _mesa_GetColorTableParameterfv);
-   SET_GetColorTableParameteriv(exec, _mesa_GetColorTableParameteriv);
    SET_GetConvolutionFilter(exec, _mesa_GetConvolutionFilter);
    SET_GetConvolutionParameterfv(exec, _mesa_GetConvolutionParameterfv);
    SET_GetConvolutionParameteriv(exec, _mesa_GetConvolutionParameteriv);
+   SET_SeparableFilter2D(exec, _mesa_SeparableFilter2D);
+#endif
+#if FEATURE_histogram
    SET_GetHistogram(exec, _mesa_GetHistogram);
    SET_GetHistogramParameterfv(exec, _mesa_GetHistogramParameterfv);
    SET_GetHistogramParameteriv(exec, _mesa_GetHistogramParameteriv);
@@ -374,7 +423,6 @@ _mesa_init_exec_table(struct _glapi_table *exec)
    SET_Minmax(exec, _mesa_Minmax);
    SET_ResetHistogram(exec, _mesa_ResetHistogram);
    SET_ResetMinmax(exec, _mesa_ResetMinmax);
-   SET_SeparableFilter2D(exec, _mesa_SeparableFilter2D);
 #endif
 
    /* OpenGL 2.0 */
@@ -488,7 +536,7 @@ _mesa_init_exec_table(struct _glapi_table *exec)
 #endif
 
    /* 197. GL_MESA_window_pos */
-#if _HAVE_FULL_GL
+#if FEATURE_drawpix
    SET_WindowPos2dMESA(exec, _mesa_WindowPos2dMESA);
    SET_WindowPos2dvMESA(exec, _mesa_WindowPos2dvMESA);
    SET_WindowPos2fMESA(exec, _mesa_WindowPos2fMESA);
@@ -715,8 +763,10 @@ _mesa_init_exec_table(struct _glapi_table *exec)
 #endif
 
    /* ARB 37. GL_ARB_draw_buffers */
+#if FEATURE_draw_read_buffer
    SET_DrawBuffersARB(exec, _mesa_DrawBuffersARB);
-   
+#endif
+
 #if FEATURE_ARB_shader_objects
    SET_DeleteObjectARB(exec, _mesa_DeleteObjectARB);
    SET_GetHandleARB(exec, _mesa_GetHandleARB);
diff --git a/src/mesa/main/api_exec.h b/src/mesa/main/api_exec.h
index 7f15ea9d00..4bd715053a 100644
--- a/src/mesa/main/api_exec.h
+++ b/src/mesa/main/api_exec.h
@@ -27,7 +27,10 @@
 #define API_EXEC_H
 
 
-void
+struct _glapi_table;
+
+
+extern void
 _mesa_init_exec_table(struct _glapi_table *exec);
 
 
diff --git a/src/mesa/main/api_noop.c b/src/mesa/main/api_noop.c
index 3df64362ea..a1cc3a2a4b 100644
--- a/src/mesa/main/api_noop.c
+++ b/src/mesa/main/api_noop.c
@@ -30,7 +30,9 @@
 #include "context.h"
 #include "light.h"
 #include "macros.h"
+#if FEATURE_dlist
 #include "dlist.h"
+#endif
 #include "glapi/dispatch.h"
 
 
@@ -621,6 +623,8 @@ static void GLAPIENTRY _mesa_noop_Vertex4f( GLfloat a, GLfloat b, GLfloat c, GLf
    (void) a; (void) b; (void) c; (void) d;
 }
 
+
+#if FEATURE_evaluators
 /* Similarly, these have no effect outside begin/end:
  */
 static void GLAPIENTRY _mesa_noop_EvalCoord1f( GLfloat a )
@@ -652,6 +656,7 @@ static void GLAPIENTRY _mesa_noop_EvalPoint2( GLint a, GLint b )
 {
    (void) a; (void) b;
 }
+#endif /* FEATURE_evaluators */
 
 
 /* Begin -- call into driver, should result in the vtxfmt being
@@ -904,20 +909,24 @@ _mesa_noop_vtxfmt_init( GLvertexformat *vfmt )
 {
    vfmt->ArrayElement = _ae_loopback_array_elt;	        /* generic helper */
    vfmt->Begin = _mesa_noop_Begin;
+#if FEATURE_dlist
    vfmt->CallList = _mesa_CallList;
    vfmt->CallLists = _mesa_CallLists;
+#endif
    vfmt->Color3f = _mesa_noop_Color3f;
    vfmt->Color3fv = _mesa_noop_Color3fv;
    vfmt->Color4f = _mesa_noop_Color4f;
    vfmt->Color4fv = _mesa_noop_Color4fv;
    vfmt->EdgeFlag = _mesa_noop_EdgeFlag;
    vfmt->End = _mesa_noop_End;
+#if FEATURE_evaluators
    vfmt->EvalCoord1f = _mesa_noop_EvalCoord1f;
    vfmt->EvalCoord1fv = _mesa_noop_EvalCoord1fv;
    vfmt->EvalCoord2f = _mesa_noop_EvalCoord2f;
    vfmt->EvalCoord2fv = _mesa_noop_EvalCoord2fv;
    vfmt->EvalPoint1 = _mesa_noop_EvalPoint1;
    vfmt->EvalPoint2 = _mesa_noop_EvalPoint2;
+#endif
    vfmt->FogCoordfEXT = _mesa_noop_FogCoordfEXT;
    vfmt->FogCoordfvEXT = _mesa_noop_FogCoordfvEXT;
    vfmt->Indexf = _mesa_noop_Indexf;
diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index 232e698f50..9ff0b708dd 100644
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -31,6 +31,10 @@
 #ifndef MESA_CONFIG_H_INCLUDED
 #define MESA_CONFIG_H_INCLUDED
 
+
+#include "main/mfeatures.h"
+
+
 /**
  * \name OpenGL implementation limits
  */
@@ -283,40 +287,6 @@
 #define ACOMP 3
 
 
-/*
- * Enable/disable features (blocks of code) by setting FEATURE_xyz to 0 or 1.
- */
-#ifndef _HAVE_FULL_GL
-#define _HAVE_FULL_GL 1
-#endif
-
-#define FEATURE_userclip  _HAVE_FULL_GL
-#define FEATURE_texgen  _HAVE_FULL_GL
-#define FEATURE_windowpos  _HAVE_FULL_GL
-#define FEATURE_ARB_occlusion_query  _HAVE_FULL_GL
-#define FEATURE_ARB_fragment_program  _HAVE_FULL_GL
-#define FEATURE_ARB_vertex_buffer_object  _HAVE_FULL_GL
-#define FEATURE_ARB_vertex_program  _HAVE_FULL_GL
-
-#define FEATURE_ARB_vertex_shader _HAVE_FULL_GL
-#define FEATURE_ARB_fragment_shader _HAVE_FULL_GL
-#define FEATURE_ARB_shader_objects (FEATURE_ARB_vertex_shader || FEATURE_ARB_fragment_shader)
-#define FEATURE_ARB_shading_language_100 FEATURE_ARB_shader_objects
-#define FEATURE_ARB_shading_language_120 FEATURE_ARB_shader_objects
-
-#define FEATURE_EXT_framebuffer_blit _HAVE_FULL_GL
-#define FEATURE_EXT_framebuffer_object _HAVE_FULL_GL
-#define FEATURE_EXT_pixel_buffer_object  _HAVE_FULL_GL
-#define FEATURE_EXT_texture_sRGB _HAVE_FULL_GL
-#define FEATURE_EXT_timer_query  _HAVE_FULL_GL
-#define FEATURE_ATI_fragment_shader _HAVE_FULL_GL
-#define FEATURE_MESA_program_debug  _HAVE_FULL_GL
-#define FEATURE_NV_fence  _HAVE_FULL_GL
-#define FEATURE_NV_fragment_program  _HAVE_FULL_GL
-#define FEATURE_NV_vertex_program  _HAVE_FULL_GL
-/*@}*/
-
-
 /**
  * Maximum number of temporary vertices required for clipping.  
  *
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 1b357ae6c2..d975814592 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -78,27 +78,41 @@
 
 #include "glheader.h"
 #include "imports.h"
+#if FEATURE_accum
 #include "accum.h"
+#endif
 #include "api_exec.h"
 #include "arrayobj.h"
+#if FEATURE_attrib_stack
 #include "attrib.h"
+#endif
 #include "blend.h"
 #include "buffers.h"
 #include "bufferobj.h"
+#if FEATURE_colortable
 #include "colortab.h"
+#endif
 #include "context.h"
 #include "debug.h"
 #include "depth.h"
+#if FEATURE_dlist
 #include "dlist.h"
+#endif
+#if FEATURE_evaluators
 #include "eval.h"
+#endif
 #include "enums.h"
 #include "extensions.h"
 #include "fbobject.h"
+#if FEATURE_feedback
 #include "feedback.h"
+#endif
 #include "fog.h"
 #include "framebuffer.h"
 #include "get.h"
+#if FEATURE_histogram
 #include "histogram.h"
+#endif
 #include "hint.h"
 #include "hash.h"
 #include "light.h"
@@ -106,12 +120,16 @@
 #include "macros.h"
 #include "matrix.h"
 #include "multisample.h"
+#if FEATURE_pixel_transfer
 #include "pixel.h"
+#endif
 #include "pixelstore.h"
 #include "points.h"
 #include "polygon.h"
 #include "queryobj.h"
+#if FEATURE_drawpix
 #include "rastpos.h"
+#endif
 #include "scissor.h"
 #include "simple_list.h"
 #include "state.h"
@@ -573,9 +591,11 @@ alloc_shared_state( GLcontext *ctx )
 static void
 delete_displaylist_cb(GLuint id, void *data, void *userData)
 {
+#if FEATURE_dlist
    struct mesa_display_list *list = (struct mesa_display_list *) data;
    GLcontext *ctx = (GLcontext *) userData;
    _mesa_delete_list(ctx, list);
+#endif
 }
 
 /**
@@ -954,31 +974,49 @@ init_attrib_groups(GLcontext *ctx)
    _mesa_init_extensions( ctx );
 
    /* Attribute Groups */
+#if FEATURE_accum
    _mesa_init_accum( ctx );
+#endif
+#if FEATURE_attrib_stack
    _mesa_init_attrib( ctx );
+#endif
    _mesa_init_buffer_objects( ctx );
    _mesa_init_color( ctx );
+#if FEATURE_colortable
    _mesa_init_colortables( ctx );
+#endif
    _mesa_init_current( ctx );
    _mesa_init_depth( ctx );
    _mesa_init_debug( ctx );
+#if FEATURE_dlist
    _mesa_init_display_list( ctx );
+#endif
+#if FEATURE_evaluators
    _mesa_init_eval( ctx );
+#endif
+#if FEATURE_feedback
    _mesa_init_feedback( ctx );
+#endif
    _mesa_init_fog( ctx );
+#if FEATURE_histogram
    _mesa_init_histogram( ctx );
+#endif
    _mesa_init_hint( ctx );
    _mesa_init_line( ctx );
    _mesa_init_lighting( ctx );
    _mesa_init_matrix( ctx );
    _mesa_init_multisample( ctx );
+#if FEATURE_pixel_transfer
    _mesa_init_pixel( ctx );
+#endif
    _mesa_init_pixelstore( ctx );
    _mesa_init_point( ctx );
    _mesa_init_polygon( ctx );
    _mesa_init_program( ctx );
    _mesa_init_query( ctx );
+#if FEATURE_drawpix
    _mesa_init_rastpos( ctx );
+#endif
    _mesa_init_scissor( ctx );
    _mesa_init_shader_state( ctx );
    _mesa_init_stencil( ctx );
@@ -989,8 +1027,12 @@ init_attrib_groups(GLcontext *ctx)
    if (!_mesa_init_texture( ctx ))
       return GL_FALSE;
 
+#if FEATURE_texture_s3tc
    _mesa_init_texture_s3tc( ctx );
+#endif
+#if FEATURE_texture_fxt1
    _mesa_init_texture_fxt1( ctx );
+#endif
 
    /* Miscellaneous */
    ctx->NewState = _NEW_ALL;
@@ -1123,14 +1165,14 @@ _mesa_initialize_context(GLcontext *ctx,
    }
    _mesa_init_exec_table(ctx->Exec);
    ctx->CurrentDispatch = ctx->Exec;
-#if _HAVE_FULL_GL
+#if FEATURE_dlist
    _mesa_init_dlist_table(ctx->Save);
    _mesa_install_save_vtxfmt( ctx, &ctx->ListState.ListVtxfmt );
+#endif
    /* Neutral tnl module stuff */
    _mesa_init_exec_vtxfmt( ctx ); 
    ctx->TnlModule.Current = NULL;
    ctx->TnlModule.SwapCount = 0;
-#endif
 
    ctx->FragmentProgram._MaintainTexEnvProgram
       = (_mesa_getenv("MESA_TEX_PROG") != NULL);
@@ -1220,11 +1262,15 @@ _mesa_free_context_data( GLcontext *ctx )
    _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._TexEnvProgram, NULL);
 
    _mesa_free_lighting_data( ctx );
+#if FEATURE_evaluators
    _mesa_free_eval_data( ctx );
+#endif
    _mesa_free_texture_data( ctx );
    _mesa_free_matrix_data( ctx );
    _mesa_free_viewport_data( ctx );
+#if FEATURE_colortable
    _mesa_free_colortables_data( ctx );
+#endif
    _mesa_free_program_data(ctx);
    _mesa_free_shader_state(ctx);
    _mesa_free_query_data(ctx);
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
new file mode 100644
index 0000000000..228de76af1
--- /dev/null
+++ b/src/mesa/main/mfeatures.h
@@ -0,0 +1,77 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.1
+ *
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/**
+ * \file mfeatures.h
+ * Flags to enable/disable specific parts of the API.
+ */
+
+#ifndef FEATURES_H
+#define FEATURES_H
+
+
+#ifndef _HAVE_FULL_GL
+#define _HAVE_FULL_GL 1
+#endif
+
+#define FEATURE_accum  _HAVE_FULL_GL
+#define FEATURE_attrib_stacks  _HAVE_FULL_GL
+#define FEATURE_colortable  _HAVE_FULL_GL
+#define FEATURE_convolution  _HAVE_FULL_GL
+#define FEATURE_dlist  _HAVE_FULL_GL
+#define FEATURE_draw_read_buffer  _HAVE_FULL_GL
+#define FEATURE_drawpix  _HAVE_FULL_GL
+#define FEATURE_evaluators  _HAVE_FULL_GL
+#define FEATURE_feedback  _HAVE_FULL_GL
+#define FEATURE_histogram  _HAVE_FULL_GL
+#define FEATURE_pixeltransfer  _HAVE_FULL_GL
+#define FEATURE_texgen  _HAVE_FULL_GL
+#define FEATURE_texture_fxt1  _HAVE_FULL_GL
+#define FEATURE_texture_s3tc  _HAVE_FULL_GL
+#define FEATURE_userclip  _HAVE_FULL_GL
+
+#define FEATURE_ARB_occlusion_query  _HAVE_FULL_GL
+#define FEATURE_ARB_fragment_program  _HAVE_FULL_GL
+#define FEATURE_ARB_vertex_buffer_object  _HAVE_FULL_GL
+#define FEATURE_ARB_vertex_program  _HAVE_FULL_GL
+#define FEATURE_ARB_vertex_shader _HAVE_FULL_GL
+#define FEATURE_ARB_fragment_shader _HAVE_FULL_GL
+#define FEATURE_ARB_shader_objects (FEATURE_ARB_vertex_shader || FEATURE_ARB_fragment_shader)
+#define FEATURE_ARB_shading_language_100 FEATURE_ARB_shader_objects
+#define FEATURE_ARB_shading_language_120 FEATURE_ARB_shader_objects
+
+#define FEATURE_EXT_framebuffer_blit _HAVE_FULL_GL
+#define FEATURE_EXT_framebuffer_object _HAVE_FULL_GL
+#define FEATURE_EXT_pixel_buffer_object  _HAVE_FULL_GL
+#define FEATURE_EXT_texture_sRGB _HAVE_FULL_GL
+#define FEATURE_EXT_timer_query  _HAVE_FULL_GL
+#define FEATURE_ATI_fragment_shader _HAVE_FULL_GL
+#define FEATURE_MESA_program_debug  _HAVE_FULL_GL
+#define FEATURE_NV_fence  _HAVE_FULL_GL
+#define FEATURE_NV_fragment_program  _HAVE_FULL_GL
+#define FEATURE_NV_vertex_program  _HAVE_FULL_GL
+
+
+#endif /* FEATURES_H */
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 89920f8443..4d1fdbf47c 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -40,7 +40,9 @@
 #include "framebuffer.h"
 #include "light.h"
 #include "matrix.h"
+#if FEATURE_pixel_transfer
 #include "pixel.h"
+#endif
 #include "shader/program.h"
 #include "state.h"
 #include "stencil.h"
@@ -412,8 +414,10 @@ _mesa_update_state_locked( GLcontext *ctx )
    if (new_state & _NEW_STENCIL)
       _mesa_update_stencil( ctx );
 
+#if FEATURE_pixel_transfer
    if (new_state & _IMAGE_NEW_TRANSFER_STATE)
       _mesa_update_pixel( ctx, new_state );
+#endif
 
    if (new_state & (_NEW_ARRAY | _NEW_PROGRAM))
       update_arrays( ctx );
diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c
index 17859a9fec..a35195a695 100644
--- a/src/mesa/main/texformat.c
+++ b/src/mesa/main/texformat.c
@@ -1449,21 +1449,27 @@ _mesa_choose_tex_format( GLcontext *ctx, GLint internalFormat,
          case GL_COMPRESSED_INTENSITY_ARB:
             return &_mesa_texformat_intensity;
          case GL_COMPRESSED_RGB_ARB:
+#if FEATURE_texture_fxt1
             if (ctx->Extensions.TDFX_texture_compression_FXT1)
                return &_mesa_texformat_rgb_fxt1;
-            else if (ctx->Extensions.EXT_texture_compression_s3tc ||
-                     ctx->Extensions.S3_s3tc)
+#endif
+#if FEATURE_texture_s3tc
+            if (ctx->Extensions.EXT_texture_compression_s3tc ||
+                ctx->Extensions.S3_s3tc)
                return &_mesa_texformat_rgb_dxt1;
-            else
-               return &_mesa_texformat_rgb;
+#endif
+            return &_mesa_texformat_rgb;
          case GL_COMPRESSED_RGBA_ARB:
+#if FEATURE_texture_fxt1
             if (ctx->Extensions.TDFX_texture_compression_FXT1)
                return &_mesa_texformat_rgba_fxt1;
-            else if (ctx->Extensions.EXT_texture_compression_s3tc ||
-                     ctx->Extensions.S3_s3tc)
+#endif
+#if FEATURE_texture_s3tc
+            if (ctx->Extensions.EXT_texture_compression_s3tc ||
+                ctx->Extensions.S3_s3tc)
                return &_mesa_texformat_rgba_dxt3; /* Not rgba_dxt1, see spec */
-            else
-               return &_mesa_texformat_rgba;
+#endif
+            return &_mesa_texformat_rgba;
          default:
             ; /* fallthrough */
       }
@@ -1478,6 +1484,7 @@ _mesa_choose_tex_format( GLcontext *ctx, GLint internalFormat,
       }
    }
 
+#if FEATURE_texture_fxt1
    if (ctx->Extensions.TDFX_texture_compression_FXT1) {
       switch (internalFormat) {
          case GL_COMPRESSED_RGB_FXT1_3DFX:
@@ -1488,7 +1495,9 @@ _mesa_choose_tex_format( GLcontext *ctx, GLint internalFormat,
             ; /* fallthrough */
       }
    }
+#endif
 
+#if FEATURE_texture_s3tc
    if (ctx->Extensions.EXT_texture_compression_s3tc) {
       switch (internalFormat) {
          case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
@@ -1516,6 +1525,7 @@ _mesa_choose_tex_format( GLcontext *ctx, GLint internalFormat,
             ; /* fallthrough */
       }
    }
+#endif
 
    if (ctx->Extensions.ARB_texture_float) {
       switch (internalFormat) {
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 384e145520..eed1937517 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -32,7 +32,9 @@
 #include "glheader.h"
 #include "bufferobj.h"
 #include "context.h"
+#if FEATURE_convolve
 #include "convolve.h"
+#endif
 #include "fbobject.h"
 #include "framebuffer.h"
 #include "image.h"
@@ -2429,9 +2431,11 @@ _mesa_TexImage1D( GLenum target, GLint level, GLint internalFormat,
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
+#if FEATURE_convolve
    if (is_color_format(internalFormat)) {
       _mesa_adjust_image_for_convolution(ctx, 1, &postConvWidth, NULL);
    }
+#endif
 
    if (target == GL_TEXTURE_1D) {
       /* non-proxy target */
@@ -2524,10 +2528,12 @@ _mesa_TexImage2D( GLenum target, GLint level, GLint internalFormat,
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
+#if FEATURE_convolve
    if (is_color_format(internalFormat)) {
       _mesa_adjust_image_for_convolution(ctx, 2, &postConvWidth,
 					 &postConvHeight);
    }
+#endif
 
    if (target == GL_TEXTURE_2D ||
        (ctx->Extensions.ARB_texture_cube_map &&
@@ -2746,10 +2752,12 @@ _mesa_TexSubImage1D( GLenum target, GLint level,
    if (ctx->NewState & _IMAGE_NEW_TRANSFER_STATE)
       _mesa_update_state(ctx);
 
+#if FEATURE_convolve
    /* XXX should test internal format */
    if (is_color_format(format)) {
       _mesa_adjust_image_for_convolution(ctx, 1, &postConvWidth, NULL);
    }
+#endif
 
    if (subtexture_error_check(ctx, 1, target, level, xoffset, 0, 0,
 			       postConvWidth, 1, 1, format, type)) {
@@ -2804,11 +2812,13 @@ _mesa_TexSubImage2D( GLenum target, GLint level,
    if (ctx->NewState & _IMAGE_NEW_TRANSFER_STATE)
       _mesa_update_state(ctx);
 
+#if FEATURE_convolve
    /* XXX should test internal format */
    if (is_color_format(format)) {
       _mesa_adjust_image_for_convolution(ctx, 2, &postConvWidth,
                                          &postConvHeight);
    }
+#endif
 
    if (subtexture_error_check(ctx, 2, target, level, xoffset, yoffset, 0,
 			      postConvWidth, postConvHeight, 1, format, type)) {
@@ -2918,9 +2928,11 @@ _mesa_CopyTexImage1D( GLenum target, GLint level,
    if (ctx->NewState & _IMAGE_NEW_TRANSFER_STATE)
       _mesa_update_state(ctx);
 
+#if FEATURE_convolve
    if (is_color_format(internalFormat)) {
       _mesa_adjust_image_for_convolution(ctx, 1, &postConvWidth, NULL);
    }
+#endif
 
    if (copytexture_error_check(ctx, 1, target, level, internalFormat,
                                postConvWidth, 1, border))
@@ -2981,11 +2993,12 @@ _mesa_CopyTexImage2D( GLenum target, GLint level, GLenum internalFormat,
    if (ctx->NewState & _IMAGE_NEW_TRANSFER_STATE)
       _mesa_update_state(ctx);
 
+#if FEATURE_convolve
    if (is_color_format(internalFormat)) {
       _mesa_adjust_image_for_convolution(ctx, 2, &postConvWidth,
                                          &postConvHeight);
    }
-
+#endif
    if (copytexture_error_check(ctx, 2, target, level, internalFormat,
                                postConvWidth, postConvHeight, border))
       return;
@@ -3047,8 +3060,10 @@ _mesa_CopyTexSubImage1D( GLenum target, GLint level,
    if (ctx->NewState & _IMAGE_NEW_TRANSFER_STATE)
       _mesa_update_state(ctx);
 
+#if FEATURE_convolve
    /* XXX should test internal format */
    _mesa_adjust_image_for_convolution(ctx, 1, &postConvWidth, NULL);
+#endif
 
    if (copytexsubimage_error_check(ctx, 1, target, level,
                                    xoffset, 0, 0, postConvWidth, 1))
@@ -3100,8 +3115,10 @@ _mesa_CopyTexSubImage2D( GLenum target, GLint level,
    if (ctx->NewState & _IMAGE_NEW_TRANSFER_STATE)
       _mesa_update_state(ctx);
 
+#if FEATURE_convolve
    /* XXX should test internal format */
    _mesa_adjust_image_for_convolution(ctx, 2, &postConvWidth, &postConvHeight);
+#endif
 
    if (copytexsubimage_error_check(ctx, 2, target, level, xoffset, yoffset, 0,
                                    postConvWidth, postConvHeight))
@@ -3152,8 +3169,10 @@ _mesa_CopyTexSubImage3D( GLenum target, GLint level,
    if (ctx->NewState & _IMAGE_NEW_TRANSFER_STATE)
       _mesa_update_state(ctx);
 
+#if FEATURE_convolve
    /* XXX should test internal format */
    _mesa_adjust_image_for_convolution(ctx, 2, &postConvWidth, &postConvHeight);
+#endif
 
    if (copytexsubimage_error_check(ctx, 3, target, level, xoffset, yoffset,
                                    zoffset, postConvWidth, postConvHeight))
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index df64002f99..606e62d7a0 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -29,7 +29,9 @@
 
 
 #include "glheader.h"
+#if FEATURE_colortable
 #include "colortab.h"
+#endif
 #include "context.h"
 #include "enums.h"
 #include "fbobject.h"
@@ -153,7 +155,9 @@ _mesa_delete_texture_object( GLcontext *ctx, struct gl_texture_object *texObj )
 
    (void) ctx;
 
+#if FEATURE_colortable
    _mesa_free_colortable_data(&texObj->Palette);
+#endif
 
    /* free the texture images */
    for (face = 0; face < 6; face++) {
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 84acfbd92c..2a83d6df4a 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -30,7 +30,9 @@
 
 #include "glheader.h"
 #include "colormac.h"
+#if FEATURE_colortable
 #include "colortab.h"
+#endif
 #include "context.h"
 #include "enums.h"
 #include "macros.h"
@@ -3213,7 +3215,9 @@ _mesa_init_texture(GLcontext *ctx)
    for (i=0; i<MAX_TEXTURE_UNITS; i++)
       init_texture_unit( ctx, i );
    ctx->Texture.SharedPalette = GL_FALSE;
+#if FEATURE_colortable
    _mesa_init_colortable(&ctx->Texture.Palette);
+#endif
 
    /* Allocate proxy textures */
    if (!alloc_proxy_textures( ctx ))
@@ -3229,8 +3233,6 @@ _mesa_init_texture(GLcontext *ctx)
 void
 _mesa_free_texture_data(GLcontext *ctx)
 {
-   GLuint i;
-
    /* Free proxy texture objects */
    (ctx->Driver.DeleteTexture)(ctx,  ctx->Texture.Proxy1D );
    (ctx->Driver.DeleteTexture)(ctx,  ctx->Texture.Proxy2D );
@@ -3240,6 +3242,11 @@ _mesa_free_texture_data(GLcontext *ctx)
    (ctx->Driver.DeleteTexture)(ctx,  ctx->Texture.Proxy1DArray );
    (ctx->Driver.DeleteTexture)(ctx,  ctx->Texture.Proxy2DArray );
 
-   for (i = 0; i < MAX_TEXTURE_IMAGE_UNITS; i++)
-      _mesa_free_colortable_data( &ctx->Texture.Unit[i].ColorTable );
+#if FEATURE_colortable
+   {
+      GLuint i;
+      for (i = 0; i < MAX_TEXTURE_IMAGE_UNITS; i++)
+         _mesa_free_colortable_data( &ctx->Texture.Unit[i].ColorTable );
+   }
+#endif
 }
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index a6a18910fc..5ac6116950 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -55,7 +55,9 @@
 #include "bufferobj.h"
 #include "colormac.h"
 #include "context.h"
+#if FEATURE_convolve
 #include "convolve.h"
+#endif
 #include "image.h"
 #include "macros.h"
 #include "mipmap.h"
@@ -269,6 +271,16 @@ compute_component_mapping(GLenum inFormat, GLenum outFormat,
 }
 
 
+#if !FEATURE_convolve
+static void
+_mesa_adjust_image_for_convolution(GLcontext *ctx, GLuint dims,
+                                   GLsizei *srcWidth, GLsizei *srcHeight)
+{
+   /* no-op */
+}
+#endif
+
+
 /**
  * Make a temporary (color) texture image with GLfloat components.
  * Apply all needed pixel unpacking and pixel transfer operations.
@@ -368,6 +380,7 @@ make_temp_float_image(GLcontext *ctx, GLuint dims,
             dst += srcWidth * 4;
          }
 
+#if FEATURE_convolve
          /* do convolution */
          {
             GLfloat *src = tempImage + img * (srcWidth * srcHeight * 4);
@@ -389,7 +402,7 @@ make_temp_float_image(GLcontext *ctx, GLuint dims,
                }
             }
          }
-
+#endif
          /* do post-convolution transfer and pack into tempImage */
          {
             const GLint logComponents
@@ -546,6 +559,7 @@ _mesa_make_temp_chan_image(GLcontext *ctx, GLuint dims,
           textureBaseFormat == GL_ALPHA ||
           textureBaseFormat == GL_INTENSITY);
 
+#if FEATURE_convolve
    if ((dims == 1 && ctx->Pixel.Convolution1DEnabled) ||
        (dims >= 2 && ctx->Pixel.Convolution2DEnabled) ||
        (dims >= 2 && ctx->Pixel.Separable2DEnabled)) {
@@ -567,6 +581,7 @@ _mesa_make_temp_chan_image(GLcontext *ctx, GLuint dims,
       transferOps = 0;
       freeSrcImage = GL_TRUE;
    }
+#endif
 
    /* unpack and transfer the source image */
    tempImage = (GLchan *) _mesa_malloc(srcWidth * srcHeight * srcDepth
diff --git a/src/mesa/vbo/vbo_context.c b/src/mesa/vbo/vbo_context.c
index 235cee2429..dc7c534251 100644
--- a/src/mesa/vbo/vbo_context.c
+++ b/src/mesa/vbo/vbo_context.c
@@ -225,9 +225,10 @@ GLboolean _vbo_CreateContext( GLcontext *ctx )
     * vtxfmt mechanism can be removed now.
     */
    vbo_exec_init( ctx );
+#if FEATURE_dlist
    vbo_save_init( ctx );
+#endif
 
-   
    return GL_TRUE;
 }
 
@@ -246,7 +247,9 @@ void _vbo_DestroyContext( GLcontext *ctx )
    }
 
    vbo_exec_destroy(ctx);
+#if FEATURE_dlist
    vbo_save_destroy(ctx);
+#endif
    FREE(vbo_context(ctx));
    ctx->swtnl_im = NULL;
 }
diff --git a/src/mesa/vbo/vbo_context.h b/src/mesa/vbo/vbo_context.h
index 013f81bdd5..bf405eb693 100644
--- a/src/mesa/vbo/vbo_context.h
+++ b/src/mesa/vbo/vbo_context.h
@@ -53,8 +53,10 @@
 
 #include "vbo.h"
 #include "vbo_attrib.h"
-#include "vbo_save.h"
 #include "vbo_exec.h"
+#if FEATURE_dlist
+#include "vbo_save.h"
+#endif
 
 
 struct vbo_context {
@@ -74,7 +76,9 @@ struct vbo_context {
 
 
    struct vbo_exec_context exec;
+#if FEATURE_dlist
    struct vbo_save_context save;
+#endif
 
    /* Callback into the driver.  This must always succeed, the driver
     * is responsible for initiating any fallback actions required:
diff --git a/src/mesa/vbo/vbo_exec.c b/src/mesa/vbo/vbo_exec.c
index 1efa74945d..635f239acc 100644
--- a/src/mesa/vbo/vbo_exec.c
+++ b/src/mesa/vbo/vbo_exec.c
@@ -32,7 +32,6 @@
 #include "main/context.h"
 #include "main/macros.h"
 #include "main/mtypes.h"
-#include "main/dlist.h"
 #include "main/vtxfmt.h"
 
 #include "vbo_context.h"
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c
index 98580170e3..5dd774d839 100644
--- a/src/mesa/vbo/vbo_exec_api.c
+++ b/src/mesa/vbo/vbo_exec_api.c
@@ -34,7 +34,9 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "main/context.h"
 #include "main/macros.h"
 #include "main/vtxfmt.h"
+#if FEATURE_dlist
 #include "main/dlist.h"
+#endif
 #include "main/state.h"
 #include "main/light.h"
 #include "main/api_arrayelt.h"
@@ -569,8 +571,10 @@ static void vbo_exec_vtxfmt_init( struct vbo_exec_context *exec )
 
    vfmt->ArrayElement = _ae_loopback_array_elt;	        /* generic helper */
    vfmt->Begin = vbo_exec_Begin;
+#if FEATURE_dlist
    vfmt->CallList = _mesa_CallList;
    vfmt->CallLists = _mesa_CallLists;
+#endif
    vfmt->End = vbo_exec_End;
    vfmt->EvalCoord1f = vbo_exec_EvalCoord1f;
    vfmt->EvalCoord1fv = vbo_exec_EvalCoord1fv;
-- 
cgit v1.2.3


From e4cfe0854ad968193106048179b9b52ec1768f41 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Tue, 10 Jun 2008 16:43:49 -0600
Subject: mesa: refactor: fix some FEATURE_ typos, mistakes

---
 src/mesa/main/mfeatures.h | 2 +-
 src/mesa/main/rastpos.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index 228de76af1..162bd2fff9 100644
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -46,7 +46,7 @@
 #define FEATURE_evaluators  _HAVE_FULL_GL
 #define FEATURE_feedback  _HAVE_FULL_GL
 #define FEATURE_histogram  _HAVE_FULL_GL
-#define FEATURE_pixeltransfer  _HAVE_FULL_GL
+#define FEATURE_pixel_transfer  _HAVE_FULL_GL
 #define FEATURE_texgen  _HAVE_FULL_GL
 #define FEATURE_texture_fxt1  _HAVE_FULL_GL
 #define FEATURE_texture_s3tc  _HAVE_FULL_GL
diff --git a/src/mesa/main/rastpos.c b/src/mesa/main/rastpos.c
index f0500083ec..155140f3cc 100644
--- a/src/mesa/main/rastpos.c
+++ b/src/mesa/main/rastpos.c
@@ -211,7 +211,7 @@ _mesa_RasterPos4sv(const GLshort *v)
 /***           GL_ARB_window_pos / GL_MESA_window_pos               ***/
 /**********************************************************************/
 
-#if FEATURE_windowpos
+#if FEATURE_drawpix
 /**
  * All glWindowPosMESA and glWindowPosARB commands call this function to
  * update the current raster position.
-- 
cgit v1.2.3


From 27049189d6221fefe43eb55846efaa51742dcdf4 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 11 Jun 2008 19:48:01 -0600
Subject: mesa: refactor: move glTexGen-related functions into new texgen.c
 file

---
 src/mesa/main/api_exec.c |   3 +
 src/mesa/main/attrib.c   |   1 +
 src/mesa/main/sources    |   2 +
 src/mesa/main/texgen.c   | 605 +++++++++++++++++++++++++++++++++++++++++++++++
 src/mesa/main/texgen.h   |  62 +++++
 src/mesa/main/texstate.c | 568 --------------------------------------------
 src/mesa/main/texstate.h |  28 ---
 src/mesa/sources         |   1 +
 8 files changed, 674 insertions(+), 596 deletions(-)
 create mode 100644 src/mesa/main/texgen.c
 create mode 100644 src/mesa/main/texgen.h

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index f7cf42f600..e27c607307 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -107,6 +107,9 @@
 #include "state.h"
 #include "stencil.h"
 #include "teximage.h"
+#if FEATURE_texgen
+#include "texgen.h"
+#endif
 #include "texobj.h"
 #include "texstate.h"
 #include "mtypes.h"
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 6ed82da203..009d71a67c 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -48,6 +48,7 @@
 #include "scissor.h"
 #include "simple_list.h"
 #include "stencil.h"
+#include "texgen.h"
 #include "texobj.h"
 #include "texstate.h"
 #include "mtypes.h"
diff --git a/src/mesa/main/sources b/src/mesa/main/sources
index 5a6cddf4bd..372423096a 100644
--- a/src/mesa/main/sources
+++ b/src/mesa/main/sources
@@ -60,6 +60,7 @@ texcompress_fxt1.c \
 texcompress_s3tc.c \
 texenvprogram.c \
 texformat.c \
+texgen.c \
 teximage.c \
 texobj.c \
 texrender.c \
@@ -138,6 +139,7 @@ texcompress.h \
 texenvprogram.h \
 texformat.h \
 texformat_tmp.h \
+texgen.h \
 teximage.h \
 texobj.h \
 texrender.h \
diff --git a/src/mesa/main/texgen.c b/src/mesa/main/texgen.c
new file mode 100644
index 0000000000..1018c3037b
--- /dev/null
+++ b/src/mesa/main/texgen.c
@@ -0,0 +1,605 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.1
+ *
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/** 
+ * \file texgen.c
+ *
+ * glTexGen-related functions
+ */
+
+
+#include "main/glheader.h"
+#include "main/context.h"
+#include "main/enums.h"
+#include "main/macros.h"
+#include "main/texgen.h"
+#include "math/m_xform.h"
+
+
+#define ENUM_TO_FLOAT(X) ((GLfloat)(GLint)(X))
+#define ENUM_TO_DOUBLE(X) ((GLdouble)(GLint)(X))
+
+
+
+void GLAPIENTRY
+_mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_texture_unit *texUnit;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (MESA_VERBOSE&(VERBOSE_API|VERBOSE_TEXTURE))
+      _mesa_debug(ctx, "glTexGen %s %s %.1f(%s)...\n",
+                  _mesa_lookup_enum_by_nr(coord),
+                  _mesa_lookup_enum_by_nr(pname),
+                  *params,
+		  _mesa_lookup_enum_by_nr((GLenum) (GLint) *params));
+
+   if (ctx->Texture.CurrentUnit >= ctx->Const.MaxTextureCoordUnits) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glTexGen(current unit)");
+      return;
+   }
+
+   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+
+   switch (coord) {
+      case GL_S:
+         if (pname==GL_TEXTURE_GEN_MODE) {
+	    GLenum mode = (GLenum) (GLint) *params;
+	    GLbitfield bits;
+	    switch (mode) {
+	    case GL_OBJECT_LINEAR:
+	       bits = TEXGEN_OBJ_LINEAR;
+	       break;
+	    case GL_EYE_LINEAR:
+	       bits = TEXGEN_EYE_LINEAR;
+	       break;
+	    case GL_REFLECTION_MAP_NV:
+	       bits = TEXGEN_REFLECTION_MAP_NV;
+	       break;
+	    case GL_NORMAL_MAP_NV:
+	       bits = TEXGEN_NORMAL_MAP_NV;
+	       break;
+	    case GL_SPHERE_MAP:
+	       bits = TEXGEN_SPHERE_MAP;
+	       break;
+	    default:
+	       _mesa_error( ctx, GL_INVALID_ENUM, "glTexGenfv(param)" );
+	       return;
+	    }
+	    if (texUnit->GenModeS == mode)
+	       return;
+	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+	    texUnit->GenModeS = mode;
+	    texUnit->_GenBitS = bits;
+	 }
+	 else if (pname==GL_OBJECT_PLANE) {
+	    if (TEST_EQ_4V(texUnit->ObjectPlaneS, params))
+		return;
+	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+            COPY_4FV(texUnit->ObjectPlaneS, params);
+	 }
+	 else if (pname==GL_EYE_PLANE) {
+	    GLfloat tmp[4];
+            /* Transform plane equation by the inverse modelview matrix */
+            if (_math_matrix_is_dirty(ctx->ModelviewMatrixStack.Top)) {
+               _math_matrix_analyse( ctx->ModelviewMatrixStack.Top );
+            }
+            _mesa_transform_vector( tmp, params, ctx->ModelviewMatrixStack.Top->inv );
+	    if (TEST_EQ_4V(texUnit->EyePlaneS, tmp))
+	       return;
+	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+	    COPY_4FV(texUnit->EyePlaneS, tmp);
+	 }
+	 else {
+	    _mesa_error( ctx, GL_INVALID_ENUM, "glTexGenfv(pname)" );
+	    return;
+	 }
+	 break;
+      case GL_T:
+         if (pname==GL_TEXTURE_GEN_MODE) {
+	    GLenum mode = (GLenum) (GLint) *params;
+	    GLbitfield bitt;
+	    switch (mode) {
+               case GL_OBJECT_LINEAR:
+                  bitt = TEXGEN_OBJ_LINEAR;
+                  break;
+               case GL_EYE_LINEAR:
+                  bitt = TEXGEN_EYE_LINEAR;
+                  break;
+               case GL_REFLECTION_MAP_NV:
+                  bitt = TEXGEN_REFLECTION_MAP_NV;
+                  break;
+               case GL_NORMAL_MAP_NV:
+                  bitt = TEXGEN_NORMAL_MAP_NV;
+                  break;
+               case GL_SPHERE_MAP:
+                  bitt = TEXGEN_SPHERE_MAP;
+                  break;
+               default:
+                  _mesa_error( ctx, GL_INVALID_ENUM, "glTexGenfv(param)" );
+                  return;
+	    }
+	    if (texUnit->GenModeT == mode)
+	       return;
+	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+	    texUnit->GenModeT = mode;
+	    texUnit->_GenBitT = bitt;
+	 }
+	 else if (pname==GL_OBJECT_PLANE) {
+	    if (TEST_EQ_4V(texUnit->ObjectPlaneT, params))
+		return;
+	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+            COPY_4FV(texUnit->ObjectPlaneT, params);
+	 }
+	 else if (pname==GL_EYE_PLANE) {
+	    GLfloat tmp[4];
+            /* Transform plane equation by the inverse modelview matrix */
+	    if (_math_matrix_is_dirty(ctx->ModelviewMatrixStack.Top)) {
+               _math_matrix_analyse( ctx->ModelviewMatrixStack.Top );
+            }
+            _mesa_transform_vector( tmp, params, ctx->ModelviewMatrixStack.Top->inv );
+	    if (TEST_EQ_4V(texUnit->EyePlaneT, tmp))
+		return;
+	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+	    COPY_4FV(texUnit->EyePlaneT, tmp);
+	 }
+	 else {
+	    _mesa_error( ctx, GL_INVALID_ENUM, "glTexGenfv(pname)" );
+	    return;
+	 }
+	 break;
+      case GL_R:
+         if (pname==GL_TEXTURE_GEN_MODE) {
+	    GLenum mode = (GLenum) (GLint) *params;
+	    GLbitfield bitr;
+	    switch (mode) {
+	    case GL_OBJECT_LINEAR:
+	       bitr = TEXGEN_OBJ_LINEAR;
+	       break;
+	    case GL_REFLECTION_MAP_NV:
+	       bitr = TEXGEN_REFLECTION_MAP_NV;
+	       break;
+	    case GL_NORMAL_MAP_NV:
+	       bitr = TEXGEN_NORMAL_MAP_NV;
+	       break;
+	    case GL_EYE_LINEAR:
+	       bitr = TEXGEN_EYE_LINEAR;
+	       break;
+	    default:
+	       _mesa_error( ctx, GL_INVALID_ENUM, "glTexGenfv(param)" );
+	       return;
+	    }
+	    if (texUnit->GenModeR == mode)
+	       return;
+	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+	    texUnit->GenModeR = mode;
+	    texUnit->_GenBitR = bitr;
+	 }
+	 else if (pname==GL_OBJECT_PLANE) {
+	    if (TEST_EQ_4V(texUnit->ObjectPlaneR, params))
+		return;
+	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+	    COPY_4FV(texUnit->ObjectPlaneR, params);
+	 }
+	 else if (pname==GL_EYE_PLANE) {
+	    GLfloat tmp[4];
+            /* Transform plane equation by the inverse modelview matrix */
+            if (_math_matrix_is_dirty(ctx->ModelviewMatrixStack.Top)) {
+               _math_matrix_analyse( ctx->ModelviewMatrixStack.Top );
+            }
+            _mesa_transform_vector( tmp, params, ctx->ModelviewMatrixStack.Top->inv );
+	    if (TEST_EQ_4V(texUnit->EyePlaneR, tmp))
+	       return;
+	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+	    COPY_4FV(texUnit->EyePlaneR, tmp);
+	 }
+	 else {
+	    _mesa_error( ctx, GL_INVALID_ENUM, "glTexGenfv(pname)" );
+	    return;
+	 }
+	 break;
+      case GL_Q:
+         if (pname==GL_TEXTURE_GEN_MODE) {
+	    GLenum mode = (GLenum) (GLint) *params;
+	    GLbitfield bitq;
+	    switch (mode) {
+	    case GL_OBJECT_LINEAR:
+	       bitq = TEXGEN_OBJ_LINEAR;
+	       break;
+	    case GL_EYE_LINEAR:
+	       bitq = TEXGEN_EYE_LINEAR;
+	       break;
+	    default:
+	       _mesa_error( ctx, GL_INVALID_ENUM, "glTexGenfv(param)" );
+	       return;
+	    }
+	    if (texUnit->GenModeQ == mode)
+	       return;
+	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+	    texUnit->GenModeQ = mode;
+	    texUnit->_GenBitQ = bitq;
+	 }
+	 else if (pname==GL_OBJECT_PLANE) {
+	    if (TEST_EQ_4V(texUnit->ObjectPlaneQ, params))
+		return;
+	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+            COPY_4FV(texUnit->ObjectPlaneQ, params);
+	 }
+	 else if (pname==GL_EYE_PLANE) {
+	    GLfloat tmp[4];
+            /* Transform plane equation by the inverse modelview matrix */
+            if (_math_matrix_is_dirty(ctx->ModelviewMatrixStack.Top)) {
+               _math_matrix_analyse( ctx->ModelviewMatrixStack.Top );
+            }
+            _mesa_transform_vector( tmp, params, ctx->ModelviewMatrixStack.Top->inv );
+	    if (TEST_EQ_4V(texUnit->EyePlaneQ, tmp))
+	       return;
+	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+	    COPY_4FV(texUnit->EyePlaneQ, tmp);
+	 }
+	 else {
+	    _mesa_error( ctx, GL_INVALID_ENUM, "glTexGenfv(pname)" );
+	    return;
+	 }
+	 break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glTexGenfv(coord)" );
+	 return;
+   }
+
+   if (ctx->Driver.TexGen)
+      ctx->Driver.TexGen( ctx, coord, pname, params );
+}
+
+
+void GLAPIENTRY
+_mesa_TexGeniv(GLenum coord, GLenum pname, const GLint *params )
+{
+   GLfloat p[4];
+   p[0] = (GLfloat) params[0];
+   if (pname == GL_TEXTURE_GEN_MODE) {
+      p[1] = p[2] = p[3] = 0.0F;
+   }
+   else {
+      p[1] = (GLfloat) params[1];
+      p[2] = (GLfloat) params[2];
+      p[3] = (GLfloat) params[3];
+   }
+   _mesa_TexGenfv(coord, pname, p);
+}
+
+
+void GLAPIENTRY
+_mesa_TexGend(GLenum coord, GLenum pname, GLdouble param )
+{
+   GLfloat p = (GLfloat) param;
+   _mesa_TexGenfv( coord, pname, &p );
+}
+
+
+void GLAPIENTRY
+_mesa_TexGendv(GLenum coord, GLenum pname, const GLdouble *params )
+{
+   GLfloat p[4];
+   p[0] = (GLfloat) params[0];
+   if (pname == GL_TEXTURE_GEN_MODE) {
+      p[1] = p[2] = p[3] = 0.0F;
+   }
+   else {
+      p[1] = (GLfloat) params[1];
+      p[2] = (GLfloat) params[2];
+      p[3] = (GLfloat) params[3];
+   }
+   _mesa_TexGenfv( coord, pname, p );
+}
+
+
+void GLAPIENTRY
+_mesa_TexGenf( GLenum coord, GLenum pname, GLfloat param )
+{
+   _mesa_TexGenfv(coord, pname, &param);
+}
+
+
+void GLAPIENTRY
+_mesa_TexGeni( GLenum coord, GLenum pname, GLint param )
+{
+   _mesa_TexGeniv( coord, pname, &param );
+}
+
+
+
+void GLAPIENTRY
+_mesa_GetTexGendv( GLenum coord, GLenum pname, GLdouble *params )
+{
+   const struct gl_texture_unit *texUnit;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (ctx->Texture.CurrentUnit >= ctx->Const.MaxTextureCoordUnits) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexGendv(current unit)");
+      return;
+   }
+
+   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+
+   switch (coord) {
+      case GL_S:
+         if (pname==GL_TEXTURE_GEN_MODE) {
+            params[0] = ENUM_TO_DOUBLE(texUnit->GenModeS);
+	 }
+	 else if (pname==GL_OBJECT_PLANE) {
+            COPY_4V( params, texUnit->ObjectPlaneS );
+	 }
+	 else if (pname==GL_EYE_PLANE) {
+            COPY_4V( params, texUnit->EyePlaneS );
+	 }
+	 else {
+	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGendv(pname)" );
+	    return;
+	 }
+	 break;
+      case GL_T:
+         if (pname==GL_TEXTURE_GEN_MODE) {
+            params[0] = ENUM_TO_DOUBLE(texUnit->GenModeT);
+	 }
+	 else if (pname==GL_OBJECT_PLANE) {
+            COPY_4V( params, texUnit->ObjectPlaneT );
+	 }
+	 else if (pname==GL_EYE_PLANE) {
+            COPY_4V( params, texUnit->EyePlaneT );
+	 }
+	 else {
+	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGendv(pname)" );
+	    return;
+	 }
+	 break;
+      case GL_R:
+         if (pname==GL_TEXTURE_GEN_MODE) {
+            params[0] = ENUM_TO_DOUBLE(texUnit->GenModeR);
+	 }
+	 else if (pname==GL_OBJECT_PLANE) {
+            COPY_4V( params, texUnit->ObjectPlaneR );
+	 }
+	 else if (pname==GL_EYE_PLANE) {
+            COPY_4V( params, texUnit->EyePlaneR );
+	 }
+	 else {
+	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGendv(pname)" );
+	    return;
+	 }
+	 break;
+      case GL_Q:
+         if (pname==GL_TEXTURE_GEN_MODE) {
+            params[0] = ENUM_TO_DOUBLE(texUnit->GenModeQ);
+	 }
+	 else if (pname==GL_OBJECT_PLANE) {
+            COPY_4V( params, texUnit->ObjectPlaneQ );
+	 }
+	 else if (pname==GL_EYE_PLANE) {
+            COPY_4V( params, texUnit->EyePlaneQ );
+	 }
+	 else {
+	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGendv(pname)" );
+	    return;
+	 }
+	 break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGendv(coord)" );
+	 return;
+   }
+}
+
+
+
+void GLAPIENTRY
+_mesa_GetTexGenfv( GLenum coord, GLenum pname, GLfloat *params )
+{
+   const struct gl_texture_unit *texUnit;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (ctx->Texture.CurrentUnit >= ctx->Const.MaxTextureCoordUnits) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexGenfv(current unit)");
+      return;
+   }
+
+   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+
+   switch (coord) {
+      case GL_S:
+         if (pname==GL_TEXTURE_GEN_MODE) {
+            params[0] = ENUM_TO_FLOAT(texUnit->GenModeS);
+	 }
+	 else if (pname==GL_OBJECT_PLANE) {
+            COPY_4V( params, texUnit->ObjectPlaneS );
+	 }
+	 else if (pname==GL_EYE_PLANE) {
+            COPY_4V( params, texUnit->EyePlaneS );
+	 }
+	 else {
+	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGenfv(pname)" );
+	    return;
+	 }
+	 break;
+      case GL_T:
+         if (pname==GL_TEXTURE_GEN_MODE) {
+            params[0] = ENUM_TO_FLOAT(texUnit->GenModeT);
+	 }
+	 else if (pname==GL_OBJECT_PLANE) {
+            COPY_4V( params, texUnit->ObjectPlaneT );
+	 }
+	 else if (pname==GL_EYE_PLANE) {
+            COPY_4V( params, texUnit->EyePlaneT );
+	 }
+	 else {
+	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGenfv(pname)" );
+	    return;
+	 }
+	 break;
+      case GL_R:
+         if (pname==GL_TEXTURE_GEN_MODE) {
+            params[0] = ENUM_TO_FLOAT(texUnit->GenModeR);
+	 }
+	 else if (pname==GL_OBJECT_PLANE) {
+            COPY_4V( params, texUnit->ObjectPlaneR );
+	 }
+	 else if (pname==GL_EYE_PLANE) {
+            COPY_4V( params, texUnit->EyePlaneR );
+	 }
+	 else {
+	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGenfv(pname)" );
+	    return;
+	 }
+	 break;
+      case GL_Q:
+         if (pname==GL_TEXTURE_GEN_MODE) {
+            params[0] = ENUM_TO_FLOAT(texUnit->GenModeQ);
+	 }
+	 else if (pname==GL_OBJECT_PLANE) {
+            COPY_4V( params, texUnit->ObjectPlaneQ );
+	 }
+	 else if (pname==GL_EYE_PLANE) {
+            COPY_4V( params, texUnit->EyePlaneQ );
+	 }
+	 else {
+	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGenfv(pname)" );
+	    return;
+	 }
+	 break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGenfv(coord)" );
+	 return;
+   }
+}
+
+
+
+void GLAPIENTRY
+_mesa_GetTexGeniv( GLenum coord, GLenum pname, GLint *params )
+{
+   const struct gl_texture_unit *texUnit;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (ctx->Texture.CurrentUnit >= ctx->Const.MaxTextureCoordUnits) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexGeniv(current unit)");
+      return;
+   }
+
+   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+
+   switch (coord) {
+      case GL_S:
+         if (pname==GL_TEXTURE_GEN_MODE) {
+            params[0] = texUnit->GenModeS;
+	 }
+	 else if (pname==GL_OBJECT_PLANE) {
+            params[0] = (GLint) texUnit->ObjectPlaneS[0];
+            params[1] = (GLint) texUnit->ObjectPlaneS[1];
+            params[2] = (GLint) texUnit->ObjectPlaneS[2];
+            params[3] = (GLint) texUnit->ObjectPlaneS[3];
+	 }
+	 else if (pname==GL_EYE_PLANE) {
+            params[0] = (GLint) texUnit->EyePlaneS[0];
+            params[1] = (GLint) texUnit->EyePlaneS[1];
+            params[2] = (GLint) texUnit->EyePlaneS[2];
+            params[3] = (GLint) texUnit->EyePlaneS[3];
+	 }
+	 else {
+	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGeniv(pname)" );
+	    return;
+	 }
+	 break;
+      case GL_T:
+         if (pname==GL_TEXTURE_GEN_MODE) {
+            params[0] = texUnit->GenModeT;
+	 }
+	 else if (pname==GL_OBJECT_PLANE) {
+            params[0] = (GLint) texUnit->ObjectPlaneT[0];
+            params[1] = (GLint) texUnit->ObjectPlaneT[1];
+            params[2] = (GLint) texUnit->ObjectPlaneT[2];
+            params[3] = (GLint) texUnit->ObjectPlaneT[3];
+	 }
+	 else if (pname==GL_EYE_PLANE) {
+            params[0] = (GLint) texUnit->EyePlaneT[0];
+            params[1] = (GLint) texUnit->EyePlaneT[1];
+            params[2] = (GLint) texUnit->EyePlaneT[2];
+            params[3] = (GLint) texUnit->EyePlaneT[3];
+	 }
+	 else {
+	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGeniv(pname)" );
+	    return;
+	 }
+	 break;
+      case GL_R:
+         if (pname==GL_TEXTURE_GEN_MODE) {
+            params[0] = texUnit->GenModeR;
+	 }
+	 else if (pname==GL_OBJECT_PLANE) {
+            params[0] = (GLint) texUnit->ObjectPlaneR[0];
+            params[1] = (GLint) texUnit->ObjectPlaneR[1];
+            params[2] = (GLint) texUnit->ObjectPlaneR[2];
+            params[3] = (GLint) texUnit->ObjectPlaneR[3];
+	 }
+	 else if (pname==GL_EYE_PLANE) {
+            params[0] = (GLint) texUnit->EyePlaneR[0];
+            params[1] = (GLint) texUnit->EyePlaneR[1];
+            params[2] = (GLint) texUnit->EyePlaneR[2];
+            params[3] = (GLint) texUnit->EyePlaneR[3];
+	 }
+	 else {
+	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGeniv(pname)" );
+	    return;
+	 }
+	 break;
+      case GL_Q:
+         if (pname==GL_TEXTURE_GEN_MODE) {
+            params[0] = texUnit->GenModeQ;
+	 }
+	 else if (pname==GL_OBJECT_PLANE) {
+            params[0] = (GLint) texUnit->ObjectPlaneQ[0];
+            params[1] = (GLint) texUnit->ObjectPlaneQ[1];
+            params[2] = (GLint) texUnit->ObjectPlaneQ[2];
+            params[3] = (GLint) texUnit->ObjectPlaneQ[3];
+	 }
+	 else if (pname==GL_EYE_PLANE) {
+            params[0] = (GLint) texUnit->EyePlaneQ[0];
+            params[1] = (GLint) texUnit->EyePlaneQ[1];
+            params[2] = (GLint) texUnit->EyePlaneQ[2];
+            params[3] = (GLint) texUnit->EyePlaneQ[3];
+         }
+	 else {
+	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGeniv(pname)" );
+	    return;
+	 }
+	 break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGeniv(coord)" );
+	 return;
+   }
+}
+
+
diff --git a/src/mesa/main/texgen.h b/src/mesa/main/texgen.h
new file mode 100644
index 0000000000..073588efcd
--- /dev/null
+++ b/src/mesa/main/texgen.h
@@ -0,0 +1,62 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.1
+ *
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef TEXGEN_H
+#define TEXGEN_H
+
+
+#include "main/glheader.h"
+
+
+extern void GLAPIENTRY
+_mesa_GetTexGendv( GLenum coord, GLenum pname, GLdouble *params );
+
+extern void GLAPIENTRY
+_mesa_GetTexGenfv( GLenum coord, GLenum pname, GLfloat *params );
+
+extern void GLAPIENTRY
+_mesa_GetTexGeniv( GLenum coord, GLenum pname, GLint *params );
+
+extern void GLAPIENTRY
+_mesa_TexGend( GLenum coord, GLenum pname, GLdouble param );
+
+extern void GLAPIENTRY
+_mesa_TexGendv( GLenum coord, GLenum pname, const GLdouble *params );
+
+extern void GLAPIENTRY
+_mesa_TexGenf( GLenum coord, GLenum pname, GLfloat param );
+
+extern void GLAPIENTRY
+_mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params );
+
+extern void GLAPIENTRY
+_mesa_TexGeni( GLenum coord, GLenum pname, GLint param );
+
+extern void GLAPIENTRY
+_mesa_TexGeniv( GLenum coord, GLenum pname, const GLint *params );
+
+
+
+#endif /* TEXGEN_H */
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 2a83d6df4a..8140787a7b 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -2145,574 +2145,6 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
 
 
 
-
-/**********************************************************************/
-/*                    Texture Coord Generation                        */
-/**********************************************************************/
-
-#if FEATURE_texgen
-void GLAPIENTRY
-_mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   struct gl_texture_unit *texUnit;
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (MESA_VERBOSE&(VERBOSE_API|VERBOSE_TEXTURE))
-      _mesa_debug(ctx, "glTexGen %s %s %.1f(%s)...\n",
-                  _mesa_lookup_enum_by_nr(coord),
-                  _mesa_lookup_enum_by_nr(pname),
-                  *params,
-		  _mesa_lookup_enum_by_nr((GLenum) (GLint) *params));
-
-   if (ctx->Texture.CurrentUnit >= ctx->Const.MaxTextureCoordUnits) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glTexGen(current unit)");
-      return;
-   }
-
-   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
-
-   switch (coord) {
-      case GL_S:
-         if (pname==GL_TEXTURE_GEN_MODE) {
-	    GLenum mode = (GLenum) (GLint) *params;
-	    GLbitfield bits;
-	    switch (mode) {
-	    case GL_OBJECT_LINEAR:
-	       bits = TEXGEN_OBJ_LINEAR;
-	       break;
-	    case GL_EYE_LINEAR:
-	       bits = TEXGEN_EYE_LINEAR;
-	       break;
-	    case GL_REFLECTION_MAP_NV:
-	       bits = TEXGEN_REFLECTION_MAP_NV;
-	       break;
-	    case GL_NORMAL_MAP_NV:
-	       bits = TEXGEN_NORMAL_MAP_NV;
-	       break;
-	    case GL_SPHERE_MAP:
-	       bits = TEXGEN_SPHERE_MAP;
-	       break;
-	    default:
-	       _mesa_error( ctx, GL_INVALID_ENUM, "glTexGenfv(param)" );
-	       return;
-	    }
-	    if (texUnit->GenModeS == mode)
-	       return;
-	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-	    texUnit->GenModeS = mode;
-	    texUnit->_GenBitS = bits;
-	 }
-	 else if (pname==GL_OBJECT_PLANE) {
-	    if (TEST_EQ_4V(texUnit->ObjectPlaneS, params))
-		return;
-	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-            COPY_4FV(texUnit->ObjectPlaneS, params);
-	 }
-	 else if (pname==GL_EYE_PLANE) {
-	    GLfloat tmp[4];
-            /* Transform plane equation by the inverse modelview matrix */
-            if (_math_matrix_is_dirty(ctx->ModelviewMatrixStack.Top)) {
-               _math_matrix_analyse( ctx->ModelviewMatrixStack.Top );
-            }
-            _mesa_transform_vector( tmp, params, ctx->ModelviewMatrixStack.Top->inv );
-	    if (TEST_EQ_4V(texUnit->EyePlaneS, tmp))
-	       return;
-	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-	    COPY_4FV(texUnit->EyePlaneS, tmp);
-	 }
-	 else {
-	    _mesa_error( ctx, GL_INVALID_ENUM, "glTexGenfv(pname)" );
-	    return;
-	 }
-	 break;
-      case GL_T:
-         if (pname==GL_TEXTURE_GEN_MODE) {
-	    GLenum mode = (GLenum) (GLint) *params;
-	    GLbitfield bitt;
-	    switch (mode) {
-               case GL_OBJECT_LINEAR:
-                  bitt = TEXGEN_OBJ_LINEAR;
-                  break;
-               case GL_EYE_LINEAR:
-                  bitt = TEXGEN_EYE_LINEAR;
-                  break;
-               case GL_REFLECTION_MAP_NV:
-                  bitt = TEXGEN_REFLECTION_MAP_NV;
-                  break;
-               case GL_NORMAL_MAP_NV:
-                  bitt = TEXGEN_NORMAL_MAP_NV;
-                  break;
-               case GL_SPHERE_MAP:
-                  bitt = TEXGEN_SPHERE_MAP;
-                  break;
-               default:
-                  _mesa_error( ctx, GL_INVALID_ENUM, "glTexGenfv(param)" );
-                  return;
-	    }
-	    if (texUnit->GenModeT == mode)
-	       return;
-	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-	    texUnit->GenModeT = mode;
-	    texUnit->_GenBitT = bitt;
-	 }
-	 else if (pname==GL_OBJECT_PLANE) {
-	    if (TEST_EQ_4V(texUnit->ObjectPlaneT, params))
-		return;
-	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-            COPY_4FV(texUnit->ObjectPlaneT, params);
-	 }
-	 else if (pname==GL_EYE_PLANE) {
-	    GLfloat tmp[4];
-            /* Transform plane equation by the inverse modelview matrix */
-	    if (_math_matrix_is_dirty(ctx->ModelviewMatrixStack.Top)) {
-               _math_matrix_analyse( ctx->ModelviewMatrixStack.Top );
-            }
-            _mesa_transform_vector( tmp, params, ctx->ModelviewMatrixStack.Top->inv );
-	    if (TEST_EQ_4V(texUnit->EyePlaneT, tmp))
-		return;
-	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-	    COPY_4FV(texUnit->EyePlaneT, tmp);
-	 }
-	 else {
-	    _mesa_error( ctx, GL_INVALID_ENUM, "glTexGenfv(pname)" );
-	    return;
-	 }
-	 break;
-      case GL_R:
-         if (pname==GL_TEXTURE_GEN_MODE) {
-	    GLenum mode = (GLenum) (GLint) *params;
-	    GLbitfield bitr;
-	    switch (mode) {
-	    case GL_OBJECT_LINEAR:
-	       bitr = TEXGEN_OBJ_LINEAR;
-	       break;
-	    case GL_REFLECTION_MAP_NV:
-	       bitr = TEXGEN_REFLECTION_MAP_NV;
-	       break;
-	    case GL_NORMAL_MAP_NV:
-	       bitr = TEXGEN_NORMAL_MAP_NV;
-	       break;
-	    case GL_EYE_LINEAR:
-	       bitr = TEXGEN_EYE_LINEAR;
-	       break;
-	    default:
-	       _mesa_error( ctx, GL_INVALID_ENUM, "glTexGenfv(param)" );
-	       return;
-	    }
-	    if (texUnit->GenModeR == mode)
-	       return;
-	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-	    texUnit->GenModeR = mode;
-	    texUnit->_GenBitR = bitr;
-	 }
-	 else if (pname==GL_OBJECT_PLANE) {
-	    if (TEST_EQ_4V(texUnit->ObjectPlaneR, params))
-		return;
-	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-	    COPY_4FV(texUnit->ObjectPlaneR, params);
-	 }
-	 else if (pname==GL_EYE_PLANE) {
-	    GLfloat tmp[4];
-            /* Transform plane equation by the inverse modelview matrix */
-            if (_math_matrix_is_dirty(ctx->ModelviewMatrixStack.Top)) {
-               _math_matrix_analyse( ctx->ModelviewMatrixStack.Top );
-            }
-            _mesa_transform_vector( tmp, params, ctx->ModelviewMatrixStack.Top->inv );
-	    if (TEST_EQ_4V(texUnit->EyePlaneR, tmp))
-	       return;
-	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-	    COPY_4FV(texUnit->EyePlaneR, tmp);
-	 }
-	 else {
-	    _mesa_error( ctx, GL_INVALID_ENUM, "glTexGenfv(pname)" );
-	    return;
-	 }
-	 break;
-      case GL_Q:
-         if (pname==GL_TEXTURE_GEN_MODE) {
-	    GLenum mode = (GLenum) (GLint) *params;
-	    GLbitfield bitq;
-	    switch (mode) {
-	    case GL_OBJECT_LINEAR:
-	       bitq = TEXGEN_OBJ_LINEAR;
-	       break;
-	    case GL_EYE_LINEAR:
-	       bitq = TEXGEN_EYE_LINEAR;
-	       break;
-	    default:
-	       _mesa_error( ctx, GL_INVALID_ENUM, "glTexGenfv(param)" );
-	       return;
-	    }
-	    if (texUnit->GenModeQ == mode)
-	       return;
-	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-	    texUnit->GenModeQ = mode;
-	    texUnit->_GenBitQ = bitq;
-	 }
-	 else if (pname==GL_OBJECT_PLANE) {
-	    if (TEST_EQ_4V(texUnit->ObjectPlaneQ, params))
-		return;
-	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-            COPY_4FV(texUnit->ObjectPlaneQ, params);
-	 }
-	 else if (pname==GL_EYE_PLANE) {
-	    GLfloat tmp[4];
-            /* Transform plane equation by the inverse modelview matrix */
-            if (_math_matrix_is_dirty(ctx->ModelviewMatrixStack.Top)) {
-               _math_matrix_analyse( ctx->ModelviewMatrixStack.Top );
-            }
-            _mesa_transform_vector( tmp, params, ctx->ModelviewMatrixStack.Top->inv );
-	    if (TEST_EQ_4V(texUnit->EyePlaneQ, tmp))
-	       return;
-	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-	    COPY_4FV(texUnit->EyePlaneQ, tmp);
-	 }
-	 else {
-	    _mesa_error( ctx, GL_INVALID_ENUM, "glTexGenfv(pname)" );
-	    return;
-	 }
-	 break;
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glTexGenfv(coord)" );
-	 return;
-   }
-
-   if (ctx->Driver.TexGen)
-      ctx->Driver.TexGen( ctx, coord, pname, params );
-}
-
-
-void GLAPIENTRY
-_mesa_TexGeniv(GLenum coord, GLenum pname, const GLint *params )
-{
-   GLfloat p[4];
-   p[0] = (GLfloat) params[0];
-   if (pname == GL_TEXTURE_GEN_MODE) {
-      p[1] = p[2] = p[3] = 0.0F;
-   }
-   else {
-      p[1] = (GLfloat) params[1];
-      p[2] = (GLfloat) params[2];
-      p[3] = (GLfloat) params[3];
-   }
-   _mesa_TexGenfv(coord, pname, p);
-}
-
-
-void GLAPIENTRY
-_mesa_TexGend(GLenum coord, GLenum pname, GLdouble param )
-{
-   GLfloat p = (GLfloat) param;
-   _mesa_TexGenfv( coord, pname, &p );
-}
-
-
-void GLAPIENTRY
-_mesa_TexGendv(GLenum coord, GLenum pname, const GLdouble *params )
-{
-   GLfloat p[4];
-   p[0] = (GLfloat) params[0];
-   if (pname == GL_TEXTURE_GEN_MODE) {
-      p[1] = p[2] = p[3] = 0.0F;
-   }
-   else {
-      p[1] = (GLfloat) params[1];
-      p[2] = (GLfloat) params[2];
-      p[3] = (GLfloat) params[3];
-   }
-   _mesa_TexGenfv( coord, pname, p );
-}
-
-
-void GLAPIENTRY
-_mesa_TexGenf( GLenum coord, GLenum pname, GLfloat param )
-{
-   _mesa_TexGenfv(coord, pname, &param);
-}
-
-
-void GLAPIENTRY
-_mesa_TexGeni( GLenum coord, GLenum pname, GLint param )
-{
-   _mesa_TexGeniv( coord, pname, &param );
-}
-
-
-
-void GLAPIENTRY
-_mesa_GetTexGendv( GLenum coord, GLenum pname, GLdouble *params )
-{
-   const struct gl_texture_unit *texUnit;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (ctx->Texture.CurrentUnit >= ctx->Const.MaxTextureCoordUnits) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexGendv(current unit)");
-      return;
-   }
-
-   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
-
-   switch (coord) {
-      case GL_S:
-         if (pname==GL_TEXTURE_GEN_MODE) {
-            params[0] = ENUM_TO_DOUBLE(texUnit->GenModeS);
-	 }
-	 else if (pname==GL_OBJECT_PLANE) {
-            COPY_4V( params, texUnit->ObjectPlaneS );
-	 }
-	 else if (pname==GL_EYE_PLANE) {
-            COPY_4V( params, texUnit->EyePlaneS );
-	 }
-	 else {
-	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGendv(pname)" );
-	    return;
-	 }
-	 break;
-      case GL_T:
-         if (pname==GL_TEXTURE_GEN_MODE) {
-            params[0] = ENUM_TO_DOUBLE(texUnit->GenModeT);
-	 }
-	 else if (pname==GL_OBJECT_PLANE) {
-            COPY_4V( params, texUnit->ObjectPlaneT );
-	 }
-	 else if (pname==GL_EYE_PLANE) {
-            COPY_4V( params, texUnit->EyePlaneT );
-	 }
-	 else {
-	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGendv(pname)" );
-	    return;
-	 }
-	 break;
-      case GL_R:
-         if (pname==GL_TEXTURE_GEN_MODE) {
-            params[0] = ENUM_TO_DOUBLE(texUnit->GenModeR);
-	 }
-	 else if (pname==GL_OBJECT_PLANE) {
-            COPY_4V( params, texUnit->ObjectPlaneR );
-	 }
-	 else if (pname==GL_EYE_PLANE) {
-            COPY_4V( params, texUnit->EyePlaneR );
-	 }
-	 else {
-	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGendv(pname)" );
-	    return;
-	 }
-	 break;
-      case GL_Q:
-         if (pname==GL_TEXTURE_GEN_MODE) {
-            params[0] = ENUM_TO_DOUBLE(texUnit->GenModeQ);
-	 }
-	 else if (pname==GL_OBJECT_PLANE) {
-            COPY_4V( params, texUnit->ObjectPlaneQ );
-	 }
-	 else if (pname==GL_EYE_PLANE) {
-            COPY_4V( params, texUnit->EyePlaneQ );
-	 }
-	 else {
-	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGendv(pname)" );
-	    return;
-	 }
-	 break;
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGendv(coord)" );
-	 return;
-   }
-}
-
-
-
-void GLAPIENTRY
-_mesa_GetTexGenfv( GLenum coord, GLenum pname, GLfloat *params )
-{
-   const struct gl_texture_unit *texUnit;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (ctx->Texture.CurrentUnit >= ctx->Const.MaxTextureCoordUnits) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexGenfv(current unit)");
-      return;
-   }
-
-   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
-
-   switch (coord) {
-      case GL_S:
-         if (pname==GL_TEXTURE_GEN_MODE) {
-            params[0] = ENUM_TO_FLOAT(texUnit->GenModeS);
-	 }
-	 else if (pname==GL_OBJECT_PLANE) {
-            COPY_4V( params, texUnit->ObjectPlaneS );
-	 }
-	 else if (pname==GL_EYE_PLANE) {
-            COPY_4V( params, texUnit->EyePlaneS );
-	 }
-	 else {
-	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGenfv(pname)" );
-	    return;
-	 }
-	 break;
-      case GL_T:
-         if (pname==GL_TEXTURE_GEN_MODE) {
-            params[0] = ENUM_TO_FLOAT(texUnit->GenModeT);
-	 }
-	 else if (pname==GL_OBJECT_PLANE) {
-            COPY_4V( params, texUnit->ObjectPlaneT );
-	 }
-	 else if (pname==GL_EYE_PLANE) {
-            COPY_4V( params, texUnit->EyePlaneT );
-	 }
-	 else {
-	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGenfv(pname)" );
-	    return;
-	 }
-	 break;
-      case GL_R:
-         if (pname==GL_TEXTURE_GEN_MODE) {
-            params[0] = ENUM_TO_FLOAT(texUnit->GenModeR);
-	 }
-	 else if (pname==GL_OBJECT_PLANE) {
-            COPY_4V( params, texUnit->ObjectPlaneR );
-	 }
-	 else if (pname==GL_EYE_PLANE) {
-            COPY_4V( params, texUnit->EyePlaneR );
-	 }
-	 else {
-	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGenfv(pname)" );
-	    return;
-	 }
-	 break;
-      case GL_Q:
-         if (pname==GL_TEXTURE_GEN_MODE) {
-            params[0] = ENUM_TO_FLOAT(texUnit->GenModeQ);
-	 }
-	 else if (pname==GL_OBJECT_PLANE) {
-            COPY_4V( params, texUnit->ObjectPlaneQ );
-	 }
-	 else if (pname==GL_EYE_PLANE) {
-            COPY_4V( params, texUnit->EyePlaneQ );
-	 }
-	 else {
-	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGenfv(pname)" );
-	    return;
-	 }
-	 break;
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGenfv(coord)" );
-	 return;
-   }
-}
-
-
-
-void GLAPIENTRY
-_mesa_GetTexGeniv( GLenum coord, GLenum pname, GLint *params )
-{
-   const struct gl_texture_unit *texUnit;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (ctx->Texture.CurrentUnit >= ctx->Const.MaxTextureCoordUnits) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexGeniv(current unit)");
-      return;
-   }
-
-   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
-
-   switch (coord) {
-      case GL_S:
-         if (pname==GL_TEXTURE_GEN_MODE) {
-            params[0] = texUnit->GenModeS;
-	 }
-	 else if (pname==GL_OBJECT_PLANE) {
-            params[0] = (GLint) texUnit->ObjectPlaneS[0];
-            params[1] = (GLint) texUnit->ObjectPlaneS[1];
-            params[2] = (GLint) texUnit->ObjectPlaneS[2];
-            params[3] = (GLint) texUnit->ObjectPlaneS[3];
-	 }
-	 else if (pname==GL_EYE_PLANE) {
-            params[0] = (GLint) texUnit->EyePlaneS[0];
-            params[1] = (GLint) texUnit->EyePlaneS[1];
-            params[2] = (GLint) texUnit->EyePlaneS[2];
-            params[3] = (GLint) texUnit->EyePlaneS[3];
-	 }
-	 else {
-	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGeniv(pname)" );
-	    return;
-	 }
-	 break;
-      case GL_T:
-         if (pname==GL_TEXTURE_GEN_MODE) {
-            params[0] = texUnit->GenModeT;
-	 }
-	 else if (pname==GL_OBJECT_PLANE) {
-            params[0] = (GLint) texUnit->ObjectPlaneT[0];
-            params[1] = (GLint) texUnit->ObjectPlaneT[1];
-            params[2] = (GLint) texUnit->ObjectPlaneT[2];
-            params[3] = (GLint) texUnit->ObjectPlaneT[3];
-	 }
-	 else if (pname==GL_EYE_PLANE) {
-            params[0] = (GLint) texUnit->EyePlaneT[0];
-            params[1] = (GLint) texUnit->EyePlaneT[1];
-            params[2] = (GLint) texUnit->EyePlaneT[2];
-            params[3] = (GLint) texUnit->EyePlaneT[3];
-	 }
-	 else {
-	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGeniv(pname)" );
-	    return;
-	 }
-	 break;
-      case GL_R:
-         if (pname==GL_TEXTURE_GEN_MODE) {
-            params[0] = texUnit->GenModeR;
-	 }
-	 else if (pname==GL_OBJECT_PLANE) {
-            params[0] = (GLint) texUnit->ObjectPlaneR[0];
-            params[1] = (GLint) texUnit->ObjectPlaneR[1];
-            params[2] = (GLint) texUnit->ObjectPlaneR[2];
-            params[3] = (GLint) texUnit->ObjectPlaneR[3];
-	 }
-	 else if (pname==GL_EYE_PLANE) {
-            params[0] = (GLint) texUnit->EyePlaneR[0];
-            params[1] = (GLint) texUnit->EyePlaneR[1];
-            params[2] = (GLint) texUnit->EyePlaneR[2];
-            params[3] = (GLint) texUnit->EyePlaneR[3];
-	 }
-	 else {
-	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGeniv(pname)" );
-	    return;
-	 }
-	 break;
-      case GL_Q:
-         if (pname==GL_TEXTURE_GEN_MODE) {
-            params[0] = texUnit->GenModeQ;
-	 }
-	 else if (pname==GL_OBJECT_PLANE) {
-            params[0] = (GLint) texUnit->ObjectPlaneQ[0];
-            params[1] = (GLint) texUnit->ObjectPlaneQ[1];
-            params[2] = (GLint) texUnit->ObjectPlaneQ[2];
-            params[3] = (GLint) texUnit->ObjectPlaneQ[3];
-	 }
-	 else if (pname==GL_EYE_PLANE) {
-            params[0] = (GLint) texUnit->EyePlaneQ[0];
-            params[1] = (GLint) texUnit->EyePlaneQ[1];
-            params[2] = (GLint) texUnit->EyePlaneQ[2];
-            params[3] = (GLint) texUnit->EyePlaneQ[3];
-         }
-	 else {
-	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGeniv(pname)" );
-	    return;
-	 }
-	 break;
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGeniv(coord)" );
-	 return;
-   }
-}
-#endif
-
-
 /* GL_ARB_multitexture */
 void GLAPIENTRY
 _mesa_ActiveTextureARB(GLenum texture)
diff --git a/src/mesa/main/texstate.h b/src/mesa/main/texstate.h
index 60145691b8..67bf487dfc 100644
--- a/src/mesa/main/texstate.h
+++ b/src/mesa/main/texstate.h
@@ -54,15 +54,6 @@ _mesa_GetTexEnvfv( GLenum target, GLenum pname, GLfloat *params );
 extern void GLAPIENTRY
 _mesa_GetTexEnviv( GLenum target, GLenum pname, GLint *params );
 
-extern void GLAPIENTRY
-_mesa_GetTexGendv( GLenum coord, GLenum pname, GLdouble *params );
-
-extern void GLAPIENTRY
-_mesa_GetTexGenfv( GLenum coord, GLenum pname, GLfloat *params );
-
-extern void GLAPIENTRY
-_mesa_GetTexGeniv( GLenum coord, GLenum pname, GLint *params );
-
 extern void GLAPIENTRY
 _mesa_GetTexLevelParameterfv( GLenum target, GLint level,
                               GLenum pname, GLfloat *params );
@@ -105,25 +96,6 @@ extern void GLAPIENTRY
 _mesa_TexParameteriv( GLenum target, GLenum pname, const GLint *params );
 
 
-extern void GLAPIENTRY
-_mesa_TexGend( GLenum coord, GLenum pname, GLdouble param );
-
-extern void GLAPIENTRY
-_mesa_TexGendv( GLenum coord, GLenum pname, const GLdouble *params );
-
-extern void GLAPIENTRY
-_mesa_TexGenf( GLenum coord, GLenum pname, GLfloat param );
-
-extern void GLAPIENTRY
-_mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params );
-
-extern void GLAPIENTRY
-_mesa_TexGeni( GLenum coord, GLenum pname, GLint param );
-
-extern void GLAPIENTRY
-_mesa_TexGeniv( GLenum coord, GLenum pname, const GLint *params );
-
-
 /*
  * GL_ARB_multitexture
  */
diff --git a/src/mesa/sources b/src/mesa/sources
index 23b03932be..d5a9103fb3 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -63,6 +63,7 @@ MAIN_SOURCES = \
 	main/texcompress_fxt1.c \
 	main/texenvprogram.c \
 	main/texformat.c \
+	main/texgen.c \
 	main/teximage.c \
 	main/texobj.c \
 	main/texrender.c \
-- 
cgit v1.2.3


From 7ecac78ab53016ae3db3dd601b187cb050037463 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 11 Jun 2008 19:58:30 -0600
Subject: mesa: refactor: move glTexEnv-related functions into new texenv.c
 file

---
 src/mesa/main/api_exec.c |   1 +
 src/mesa/main/attrib.c   |   1 +
 src/mesa/main/sources    |   2 +
 src/mesa/main/texenv.c   | 863 +++++++++++++++++++++++++++++++++++++++++++++++
 src/mesa/main/texenv.h   |  52 +++
 src/mesa/main/texstate.c | 823 --------------------------------------------
 src/mesa/main/texstate.h |  18 -
 src/mesa/sources         |   1 +
 8 files changed, 920 insertions(+), 841 deletions(-)
 create mode 100644 src/mesa/main/texenv.c
 create mode 100644 src/mesa/main/texenv.h

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index e27c607307..10b3f9276f 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -106,6 +106,7 @@
 #include "scissor.h"
 #include "state.h"
 #include "stencil.h"
+#include "texenv.h"
 #include "teximage.h"
 #if FEATURE_texgen
 #include "texgen.h"
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 009d71a67c..48356c75fe 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -48,6 +48,7 @@
 #include "scissor.h"
 #include "simple_list.h"
 #include "stencil.h"
+#include "texenv.h"
 #include "texgen.h"
 #include "texobj.h"
 #include "texstate.h"
diff --git a/src/mesa/main/sources b/src/mesa/main/sources
index 372423096a..04a2101bb9 100644
--- a/src/mesa/main/sources
+++ b/src/mesa/main/sources
@@ -58,6 +58,7 @@ stencil.c \
 texcompress.c \
 texcompress_fxt1.c \
 texcompress_s3tc.c \
+texenv.c \
 texenvprogram.c \
 texformat.c \
 texgen.c \
@@ -136,6 +137,7 @@ scissor.h \
 state.h \
 stencil.h \
 texcompress.h \
+texenv.h \
 texenvprogram.h \
 texformat.h \
 texformat_tmp.h \
diff --git a/src/mesa/main/texenv.c b/src/mesa/main/texenv.c
new file mode 100644
index 0000000000..2b5b15524e
--- /dev/null
+++ b/src/mesa/main/texenv.c
@@ -0,0 +1,863 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.1
+ *
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/** 
+ * \file texenv.c
+ *
+ * glTexEnv-related functions
+ */
+
+
+#include "main/glheader.h"
+#include "main/context.h"
+#include "main/enums.h"
+#include "main/macros.h"
+#include "main/texenv.h"
+#include "math/m_xform.h"
+
+
+#define ENUM_TO_FLOAT(X) ((GLfloat)(GLint)(X))
+
+
+void GLAPIENTRY
+_mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
+{
+   GLuint maxUnit;
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_texture_unit *texUnit;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   maxUnit = (target == GL_POINT_SPRITE_NV && pname == GL_COORD_REPLACE_NV)
+      ? ctx->Const.MaxTextureCoordUnits : ctx->Const.MaxTextureImageUnits;
+   if (ctx->Texture.CurrentUnit >= maxUnit) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glTexEnvfv(current unit)");
+      return;
+   }
+
+   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+
+#define TE_ERROR(errCode, msg, value)				\
+   _mesa_error(ctx, errCode, msg, _mesa_lookup_enum_by_nr(value));
+
+   if (target == GL_TEXTURE_ENV) {
+      switch (pname) {
+      case GL_TEXTURE_ENV_MODE:
+         {
+            GLenum mode = (GLenum) (GLint) *param;
+            if (mode == GL_REPLACE_EXT)
+               mode = GL_REPLACE;
+	    if (texUnit->EnvMode == mode)
+	       return;
+            if (mode == GL_MODULATE ||
+                mode == GL_BLEND ||
+                mode == GL_DECAL ||
+                mode == GL_REPLACE ||
+                (mode == GL_ADD && ctx->Extensions.EXT_texture_env_add) ||
+                (mode == GL_COMBINE &&
+                 (ctx->Extensions.EXT_texture_env_combine ||
+                  ctx->Extensions.ARB_texture_env_combine))) {
+               /* legal */
+               FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+               texUnit->EnvMode = mode;
+            }
+            else {
+               TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
+               return;
+            }
+         }
+         break;
+      case GL_TEXTURE_ENV_COLOR:
+         {
+            GLfloat tmp[4];
+            tmp[0] = CLAMP( param[0], 0.0F, 1.0F );
+            tmp[1] = CLAMP( param[1], 0.0F, 1.0F );
+            tmp[2] = CLAMP( param[2], 0.0F, 1.0F );
+            tmp[3] = CLAMP( param[3], 0.0F, 1.0F );
+            if (TEST_EQ_4V(tmp, texUnit->EnvColor))
+               return;
+            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+            COPY_4FV(texUnit->EnvColor, tmp);
+         }
+         break;
+      case GL_COMBINE_RGB:
+	 if (ctx->Extensions.EXT_texture_env_combine ||
+             ctx->Extensions.ARB_texture_env_combine) {
+	    const GLenum mode = (GLenum) (GLint) *param;
+	    if (texUnit->Combine.ModeRGB == mode)
+	       return;
+	    switch (mode) {
+	    case GL_REPLACE:
+	    case GL_MODULATE:
+	    case GL_ADD:
+	    case GL_ADD_SIGNED:
+	    case GL_INTERPOLATE:
+               /* OK */
+	       break;
+            case GL_SUBTRACT:
+               if (!ctx->Extensions.ARB_texture_env_combine) {
+                  TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
+                  return;
+               }
+               break;
+	    case GL_DOT3_RGB_EXT:
+	    case GL_DOT3_RGBA_EXT:
+	       if (!ctx->Extensions.EXT_texture_env_dot3) {
+                  TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
+		  return;
+	       }
+	       break;
+	    case GL_DOT3_RGB:
+	    case GL_DOT3_RGBA:
+	       if (!ctx->Extensions.ARB_texture_env_dot3) {
+                  TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
+		  return;
+	       }
+	       break;
+	    case GL_MODULATE_ADD_ATI:
+	    case GL_MODULATE_SIGNED_ADD_ATI:
+	    case GL_MODULATE_SUBTRACT_ATI:
+	       if (!ctx->Extensions.ATI_texture_env_combine3) {
+                  TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
+		  return;
+	       }
+	       break;
+	    default:
+               TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
+	       return;
+	    }
+	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+	    texUnit->Combine.ModeRGB = mode;
+	 }
+	 else {
+            TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
+	    return;
+	 }
+         break;
+      case GL_COMBINE_ALPHA:
+	 if (ctx->Extensions.EXT_texture_env_combine ||
+             ctx->Extensions.ARB_texture_env_combine) {
+	    const GLenum mode = (GLenum) (GLint) *param;
+	    if (texUnit->Combine.ModeA == mode)
+	       return;
+            switch (mode) {
+	    case GL_REPLACE:
+	    case GL_MODULATE:
+	    case GL_ADD:
+	    case GL_ADD_SIGNED:
+	    case GL_INTERPOLATE:
+	       /* OK */
+	       break;
+	    case GL_SUBTRACT:
+	       if (!ctx->Extensions.ARB_texture_env_combine) {
+		  TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
+		  return;
+	       }
+	       break;
+	    case GL_MODULATE_ADD_ATI:
+	    case GL_MODULATE_SIGNED_ADD_ATI:
+	    case GL_MODULATE_SUBTRACT_ATI:
+	       if (!ctx->Extensions.ATI_texture_env_combine3) {
+                  TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
+		  return;
+	       }
+	       break;
+	    default:
+	       TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
+	       return;
+	    }
+	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+	    texUnit->Combine.ModeA = mode;
+	 }
+	 else {
+            TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
+	    return;
+	 }
+	 break;
+      case GL_SOURCE0_RGB:
+      case GL_SOURCE1_RGB:
+      case GL_SOURCE2_RGB:
+	 if (ctx->Extensions.EXT_texture_env_combine ||
+	     ctx->Extensions.ARB_texture_env_combine) {
+	    const GLenum source = (GLenum) (GLint) *param;
+	    const GLuint s = pname - GL_SOURCE0_RGB;
+	    if (texUnit->Combine.SourceRGB[s] == source)
+	       return;
+            if (source == GL_TEXTURE ||
+                source == GL_CONSTANT ||
+                source == GL_PRIMARY_COLOR ||
+                source == GL_PREVIOUS ||
+                (ctx->Extensions.ARB_texture_env_crossbar &&
+                 source >= GL_TEXTURE0 &&
+                 source < GL_TEXTURE0 + ctx->Const.MaxTextureUnits) ||
+                (ctx->Extensions.ATI_texture_env_combine3 &&
+                 (source == GL_ZERO || source == GL_ONE))) {
+               /* legal */
+	       FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+	       texUnit->Combine.SourceRGB[s] = source;
+            }
+            else {
+               TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", source);
+	       return;
+	    }
+	 }
+	 else {
+            TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
+	    return;
+	 }
+	 break;
+      case GL_SOURCE0_ALPHA:
+      case GL_SOURCE1_ALPHA:
+      case GL_SOURCE2_ALPHA:
+	 if (ctx->Extensions.EXT_texture_env_combine ||
+             ctx->Extensions.ARB_texture_env_combine) {
+	    const GLenum source = (GLenum) (GLint) *param;
+	    const GLuint s = pname - GL_SOURCE0_ALPHA;
+	    if (texUnit->Combine.SourceA[s] == source)
+	       return;
+            if (source == GL_TEXTURE ||
+                source == GL_CONSTANT ||
+                source == GL_PRIMARY_COLOR ||
+                source == GL_PREVIOUS ||
+                (ctx->Extensions.ARB_texture_env_crossbar &&
+                 source >= GL_TEXTURE0 &&
+                 source < GL_TEXTURE0 + ctx->Const.MaxTextureUnits) ||
+		(ctx->Extensions.ATI_texture_env_combine3 &&
+                 (source == GL_ZERO || source == GL_ONE))) {
+               /* legal */
+	       FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+	       texUnit->Combine.SourceA[s] = source;
+            }
+            else {
+               TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", source);
+	       return;
+	    }
+	 }
+	 else {
+            TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
+	    return;
+	 }
+	 break;
+      case GL_OPERAND0_RGB:
+      case GL_OPERAND1_RGB:
+	 if (ctx->Extensions.EXT_texture_env_combine ||
+	     ctx->Extensions.ARB_texture_env_combine) {
+	    const GLenum operand = (GLenum) (GLint) *param;
+	    const GLuint s = pname - GL_OPERAND0_RGB;
+	    if (texUnit->Combine.OperandRGB[s] == operand)
+	       return;
+	    switch (operand) {
+	    case GL_SRC_COLOR:
+	    case GL_ONE_MINUS_SRC_COLOR:
+	    case GL_SRC_ALPHA:
+	    case GL_ONE_MINUS_SRC_ALPHA:
+	       FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+	       texUnit->Combine.OperandRGB[s] = operand;
+	       break;
+	    default:
+               TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", operand);
+	       return;
+	    }
+	 }
+	 else {
+            TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
+	    return;
+	 }
+	 break;
+      case GL_OPERAND0_ALPHA:
+      case GL_OPERAND1_ALPHA:
+	 if (ctx->Extensions.EXT_texture_env_combine ||
+             ctx->Extensions.ARB_texture_env_combine) {
+	    const GLenum operand = (GLenum) (GLint) *param;
+	    if (texUnit->Combine.OperandA[pname-GL_OPERAND0_ALPHA] == operand)
+	       return;
+	    switch (operand) {
+	    case GL_SRC_ALPHA:
+	    case GL_ONE_MINUS_SRC_ALPHA:
+	       FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+	       texUnit->Combine.OperandA[pname-GL_OPERAND0_ALPHA] = operand;
+	       break;
+	    default:
+               TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", operand);
+	       return;
+	    }
+	 }
+	 else {
+            TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
+	    return;
+	 }
+	 break;
+      case GL_OPERAND2_RGB:
+	 if (ctx->Extensions.ARB_texture_env_combine) {
+	    const GLenum operand = (GLenum) (GLint) *param;
+	    if (texUnit->Combine.OperandRGB[2] == operand)
+	       return;
+	    switch (operand) {
+	    case GL_SRC_COLOR:           /* ARB combine only */
+	    case GL_ONE_MINUS_SRC_COLOR: /* ARB combine only */
+	    case GL_SRC_ALPHA:
+	    case GL_ONE_MINUS_SRC_ALPHA: /* ARB combine only */
+	       FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+	       texUnit->Combine.OperandRGB[2] = operand;
+               break;
+	    default:
+               TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", operand);
+	       return;
+	    }
+	 }
+	 else if (ctx->Extensions.EXT_texture_env_combine) {
+	    const GLenum operand = (GLenum) (GLint) *param;
+	    if (texUnit->Combine.OperandRGB[2] == operand)
+	       return;
+	    /* operand must be GL_SRC_ALPHA which is the initial value - thus
+	       don't need to actually compare the operand to the possible value */
+	    else {
+               TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", operand);
+	       return;
+	    }
+	 }
+	 else {
+            TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
+	    return;
+	 }
+	 break;
+      case GL_OPERAND2_ALPHA:
+	 if (ctx->Extensions.ARB_texture_env_combine) {
+	    const GLenum operand = (GLenum) (GLint) *param;
+	    if (texUnit->Combine.OperandA[2] == operand)
+	       return;
+	    switch (operand) {
+	    case GL_SRC_ALPHA:
+	    case GL_ONE_MINUS_SRC_ALPHA: /* ARB combine only */
+	       FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+	       texUnit->Combine.OperandA[2] = operand;
+	       break;
+	    default:
+               TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", operand);
+	       return;
+	    }
+	 }
+	 else if (ctx->Extensions.EXT_texture_env_combine) {
+	    const GLenum operand = (GLenum) (GLint) *param;
+	    if (texUnit->Combine.OperandA[2] == operand)
+	       return;
+	    /* operand must be GL_SRC_ALPHA which is the initial value - thus
+	       don't need to actually compare the operand to the possible value */
+	    else {
+               TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", operand);
+	       return;
+	    }
+	 }
+	 else {
+            TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
+	    return;
+	 }
+	 break;
+      case GL_RGB_SCALE:
+	 if (ctx->Extensions.EXT_texture_env_combine ||
+             ctx->Extensions.ARB_texture_env_combine) {
+	    GLuint newshift;
+	    if (*param == 1.0) {
+	       newshift = 0;
+	    }
+	    else if (*param == 2.0) {
+	       newshift = 1;
+	    }
+	    else if (*param == 4.0) {
+	       newshift = 2;
+	    }
+	    else {
+	       _mesa_error( ctx, GL_INVALID_VALUE,
+                            "glTexEnv(GL_RGB_SCALE not 1, 2 or 4)" );
+	       return;
+	    }
+	    if (texUnit->Combine.ScaleShiftRGB == newshift)
+	       return;
+	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+	    texUnit->Combine.ScaleShiftRGB = newshift;
+	 }
+	 else {
+            TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
+	    return;
+	 }
+	 break;
+      case GL_ALPHA_SCALE:
+	 if (ctx->Extensions.EXT_texture_env_combine ||
+             ctx->Extensions.ARB_texture_env_combine) {
+	    GLuint newshift;
+	    if (*param == 1.0) {
+	       newshift = 0;
+	    }
+	    else if (*param == 2.0) {
+	       newshift = 1;
+	    }
+	    else if (*param == 4.0) {
+	       newshift = 2;
+	    }
+	    else {
+	       _mesa_error( ctx, GL_INVALID_VALUE,
+                            "glTexEnv(GL_ALPHA_SCALE not 1, 2 or 4)" );
+	       return;
+	    }
+	    if (texUnit->Combine.ScaleShiftA == newshift)
+	       return;
+	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+	    texUnit->Combine.ScaleShiftA = newshift;
+	 }
+	 else {
+            TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
+	    return;
+	 }
+	 break;
+      default:
+	 _mesa_error( ctx, GL_INVALID_ENUM, "glTexEnv(pname)" );
+	 return;
+      }
+   }
+   else if (target == GL_TEXTURE_FILTER_CONTROL_EXT) {
+      /* GL_EXT_texture_lod_bias */
+      if (!ctx->Extensions.EXT_texture_lod_bias) {
+	 _mesa_error( ctx, GL_INVALID_ENUM, "glTexEnv(target=0x%x)", target );
+	 return;
+      }
+      if (pname == GL_TEXTURE_LOD_BIAS_EXT) {
+	 if (texUnit->LodBias == param[0])
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+         texUnit->LodBias = param[0];
+      }
+      else {
+         TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
+	 return;
+      }
+   }
+   else if (target == GL_POINT_SPRITE_NV) {
+      /* GL_ARB_point_sprite / GL_NV_point_sprite */
+      if (!ctx->Extensions.NV_point_sprite
+	  && !ctx->Extensions.ARB_point_sprite) {
+	 _mesa_error( ctx, GL_INVALID_ENUM, "glTexEnv(target=0x%x)", target );
+	 return;
+      }
+      if (pname == GL_COORD_REPLACE_NV) {
+         const GLenum value = (GLenum) param[0];
+         if (value == GL_TRUE || value == GL_FALSE) {
+            /* It's kind of weird to set point state via glTexEnv,
+             * but that's what the spec calls for.
+             */
+            const GLboolean state = (GLboolean) value;
+            if (ctx->Point.CoordReplace[ctx->Texture.CurrentUnit] == state)
+               return;
+            FLUSH_VERTICES(ctx, _NEW_POINT);
+            ctx->Point.CoordReplace[ctx->Texture.CurrentUnit] = state;
+         }
+         else {
+            _mesa_error( ctx, GL_INVALID_VALUE, "glTexEnv(param=0x%x)", value);
+            return;
+         }
+      }
+      else {
+         _mesa_error( ctx, GL_INVALID_ENUM, "glTexEnv(pname=0x%x)", pname );
+         return;
+      }
+   }
+   else {
+      _mesa_error( ctx, GL_INVALID_ENUM, "glTexEnv(target=0x%x)",target );
+      return;
+   }
+
+   if (MESA_VERBOSE&(VERBOSE_API|VERBOSE_TEXTURE))
+      _mesa_debug(ctx, "glTexEnv %s %s %.1f(%s) ...\n",
+                  _mesa_lookup_enum_by_nr(target),
+                  _mesa_lookup_enum_by_nr(pname),
+                  *param,
+                  _mesa_lookup_enum_by_nr((GLenum) (GLint) *param));
+
+   /* Tell device driver about the new texture environment */
+   if (ctx->Driver.TexEnv) {
+      (*ctx->Driver.TexEnv)( ctx, target, pname, param );
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_TexEnvf( GLenum target, GLenum pname, GLfloat param )
+{
+   _mesa_TexEnvfv( target, pname, &param );
+}
+
+
+
+void GLAPIENTRY
+_mesa_TexEnvi( GLenum target, GLenum pname, GLint param )
+{
+   GLfloat p[4];
+   p[0] = (GLfloat) param;
+   p[1] = p[2] = p[3] = 0.0;
+   _mesa_TexEnvfv( target, pname, p );
+}
+
+
+void GLAPIENTRY
+_mesa_TexEnviv( GLenum target, GLenum pname, const GLint *param )
+{
+   GLfloat p[4];
+   if (pname == GL_TEXTURE_ENV_COLOR) {
+      p[0] = INT_TO_FLOAT( param[0] );
+      p[1] = INT_TO_FLOAT( param[1] );
+      p[2] = INT_TO_FLOAT( param[2] );
+      p[3] = INT_TO_FLOAT( param[3] );
+   }
+   else {
+      p[0] = (GLfloat) param[0];
+      p[1] = p[2] = p[3] = 0;  /* init to zero, just to be safe */
+   }
+   _mesa_TexEnvfv( target, pname, p );
+}
+
+
+void GLAPIENTRY
+_mesa_GetTexEnvfv( GLenum target, GLenum pname, GLfloat *params )
+{
+   GLuint maxUnit;
+   const struct gl_texture_unit *texUnit;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   maxUnit = (target == GL_POINT_SPRITE_NV && pname == GL_COORD_REPLACE_NV)
+      ? ctx->Const.MaxTextureCoordUnits : ctx->Const.MaxTextureImageUnits;
+   if (ctx->Texture.CurrentUnit >= maxUnit) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexEnvfv(current unit)");
+      return;
+   }
+
+   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+
+   if (target == GL_TEXTURE_ENV) {
+      switch (pname) {
+         case GL_TEXTURE_ENV_MODE:
+            *params = ENUM_TO_FLOAT(texUnit->EnvMode);
+            break;
+         case GL_TEXTURE_ENV_COLOR:
+            COPY_4FV( params, texUnit->EnvColor );
+            break;
+         case GL_COMBINE_RGB:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+               *params = (GLfloat) texUnit->Combine.ModeRGB;
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
+            }
+            break;
+         case GL_COMBINE_ALPHA:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+               *params = (GLfloat) texUnit->Combine.ModeA;
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
+            }
+            break;
+         case GL_SOURCE0_RGB:
+         case GL_SOURCE1_RGB:
+         case GL_SOURCE2_RGB:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+	       const unsigned rgb_idx = pname - GL_SOURCE0_RGB;
+               *params = (GLfloat) texUnit->Combine.SourceRGB[rgb_idx];
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
+            }
+            break;
+         case GL_SOURCE0_ALPHA:
+         case GL_SOURCE1_ALPHA:
+         case GL_SOURCE2_ALPHA:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+	       const unsigned alpha_idx = pname - GL_SOURCE0_ALPHA;
+               *params = (GLfloat) texUnit->Combine.SourceA[alpha_idx];
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
+            }
+            break;
+         case GL_OPERAND0_RGB:
+         case GL_OPERAND1_RGB:
+         case GL_OPERAND2_RGB:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+	       const unsigned op_rgb = pname - GL_OPERAND0_RGB;
+               *params = (GLfloat) texUnit->Combine.OperandRGB[op_rgb];
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
+            }
+            break;
+         case GL_OPERAND0_ALPHA:
+         case GL_OPERAND1_ALPHA:
+         case GL_OPERAND2_ALPHA:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+	       const unsigned op_alpha = pname - GL_OPERAND0_ALPHA;
+               *params = (GLfloat) texUnit->Combine.OperandA[op_alpha];
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
+            }
+            break;
+         case GL_RGB_SCALE:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+               if (texUnit->Combine.ScaleShiftRGB == 0)
+                  *params = 1.0;
+               else if (texUnit->Combine.ScaleShiftRGB == 1)
+                  *params = 2.0;
+               else
+                  *params = 4.0;
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
+               return;
+            }
+            break;
+         case GL_ALPHA_SCALE:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+               if (texUnit->Combine.ScaleShiftA == 0)
+                  *params = 1.0;
+               else if (texUnit->Combine.ScaleShiftA == 1)
+                  *params = 2.0;
+               else
+                  *params = 4.0;
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
+               return;
+            }
+            break;
+         default:
+            _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname=0x%x)", pname);
+      }
+   }
+   else if (target == GL_TEXTURE_FILTER_CONTROL_EXT) {
+      /* GL_EXT_texture_lod_bias */
+      if (!ctx->Extensions.EXT_texture_lod_bias) {
+	 _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnvfv(target)" );
+	 return;
+      }
+      if (pname == GL_TEXTURE_LOD_BIAS_EXT) {
+         *params = texUnit->LodBias;
+      }
+      else {
+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)" );
+	 return;
+      }
+   }
+   else if (target == GL_POINT_SPRITE_NV) {
+      /* GL_ARB_point_sprite / GL_NV_point_sprite */
+      if (!ctx->Extensions.NV_point_sprite
+	  && !ctx->Extensions.ARB_point_sprite) {
+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnvfv(target)" );
+         return;
+      }
+      if (pname == GL_COORD_REPLACE_NV) {
+         *params = (GLfloat) ctx->Point.CoordReplace[ctx->Texture.CurrentUnit];
+      }
+      else {
+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)" );
+         return;
+      }
+   }
+   else {
+      _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnvfv(target)" );
+      return;
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_GetTexEnviv( GLenum target, GLenum pname, GLint *params )
+{
+   GLuint maxUnit;
+   const struct gl_texture_unit *texUnit;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   maxUnit = (target == GL_POINT_SPRITE_NV && pname == GL_COORD_REPLACE_NV)
+      ? ctx->Const.MaxTextureCoordUnits : ctx->Const.MaxTextureImageUnits;
+   if (ctx->Texture.CurrentUnit >= maxUnit) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexEnviv(current unit)");
+      return;
+   }
+
+   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+
+   if (target == GL_TEXTURE_ENV) {
+      switch (pname) {
+         case GL_TEXTURE_ENV_MODE:
+            *params = (GLint) texUnit->EnvMode;
+            break;
+         case GL_TEXTURE_ENV_COLOR:
+            params[0] = FLOAT_TO_INT( texUnit->EnvColor[0] );
+            params[1] = FLOAT_TO_INT( texUnit->EnvColor[1] );
+            params[2] = FLOAT_TO_INT( texUnit->EnvColor[2] );
+            params[3] = FLOAT_TO_INT( texUnit->EnvColor[3] );
+            break;
+         case GL_COMBINE_RGB:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+               *params = (GLint) texUnit->Combine.ModeRGB;
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)");
+            }
+            break;
+         case GL_COMBINE_ALPHA:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+               *params = (GLint) texUnit->Combine.ModeA;
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)");
+            }
+            break;
+         case GL_SOURCE0_RGB:
+         case GL_SOURCE1_RGB:
+         case GL_SOURCE2_RGB:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+	       const unsigned rgb_idx = pname - GL_SOURCE0_RGB;
+               *params = (GLint) texUnit->Combine.SourceRGB[rgb_idx];
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)");
+            }
+            break;
+         case GL_SOURCE0_ALPHA:
+         case GL_SOURCE1_ALPHA:
+         case GL_SOURCE2_ALPHA:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+	       const unsigned alpha_idx = pname - GL_SOURCE0_ALPHA;
+               *params = (GLint) texUnit->Combine.SourceA[alpha_idx];
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)");
+            }
+            break;
+         case GL_OPERAND0_RGB:
+         case GL_OPERAND1_RGB:
+         case GL_OPERAND2_RGB:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+	       const unsigned op_rgb = pname - GL_OPERAND0_RGB;
+               *params = (GLint) texUnit->Combine.OperandRGB[op_rgb];
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)");
+            }
+            break;
+         case GL_OPERAND0_ALPHA:
+         case GL_OPERAND1_ALPHA:
+         case GL_OPERAND2_ALPHA:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+	       const unsigned op_alpha = pname - GL_OPERAND0_ALPHA;
+               *params = (GLint) texUnit->Combine.OperandA[op_alpha];
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)");
+            }
+            break;
+         case GL_RGB_SCALE:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+               if (texUnit->Combine.ScaleShiftRGB == 0)
+                  *params = 1;
+               else if (texUnit->Combine.ScaleShiftRGB == 1)
+                  *params = 2;
+               else
+                  *params = 4;
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)");
+               return;
+            }
+            break;
+         case GL_ALPHA_SCALE:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+               if (texUnit->Combine.ScaleShiftA == 0)
+                  *params = 1;
+               else if (texUnit->Combine.ScaleShiftA == 1)
+                  *params = 2;
+               else
+                  *params = 4;
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)");
+               return;
+            }
+            break;
+         default:
+            _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname=0x%x)",
+                        pname);
+      }
+   }
+   else if (target == GL_TEXTURE_FILTER_CONTROL_EXT) {
+      /* GL_EXT_texture_lod_bias */
+      if (!ctx->Extensions.EXT_texture_lod_bias) {
+	 _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnviv(target)" );
+	 return;
+      }
+      if (pname == GL_TEXTURE_LOD_BIAS_EXT) {
+         *params = (GLint) texUnit->LodBias;
+      }
+      else {
+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)" );
+	 return;
+      }
+   }
+   else if (target == GL_POINT_SPRITE_NV) {
+      /* GL_ARB_point_sprite / GL_NV_point_sprite */
+      if (!ctx->Extensions.NV_point_sprite
+	  && !ctx->Extensions.ARB_point_sprite) {
+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnviv(target)" );
+         return;
+      }
+      if (pname == GL_COORD_REPLACE_NV) {
+         *params = (GLint) ctx->Point.CoordReplace[ctx->Texture.CurrentUnit];
+      }
+      else {
+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)" );
+         return;
+      }
+   }
+   else {
+      _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnviv(target)" );
+      return;
+   }
+}
+
+
diff --git a/src/mesa/main/texenv.h b/src/mesa/main/texenv.h
new file mode 100644
index 0000000000..bdff7fdb82
--- /dev/null
+++ b/src/mesa/main/texenv.h
@@ -0,0 +1,52 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.1
+ *
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef TEXENV_H
+#define TEXENV_H
+
+
+#include "main/glheader.h"
+
+
+extern void GLAPIENTRY
+_mesa_GetTexEnvfv( GLenum target, GLenum pname, GLfloat *params );
+
+extern void GLAPIENTRY
+_mesa_GetTexEnviv( GLenum target, GLenum pname, GLint *params );
+
+extern void GLAPIENTRY
+_mesa_TexEnvf( GLenum target, GLenum pname, GLfloat param );
+
+extern void GLAPIENTRY
+_mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param );
+
+extern void GLAPIENTRY
+_mesa_TexEnvi( GLenum target, GLenum pname, GLint param );
+
+extern void GLAPIENTRY
+_mesa_TexEnviv( GLenum target, GLenum pname, const GLint *param );
+
+
+#endif /* TEXENV_H */
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 8140787a7b..448fc53912 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -321,829 +321,6 @@ calculate_derived_texenv( struct gl_tex_env_combine_state *state,
 }
 
 
-void GLAPIENTRY
-_mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
-{
-   GLuint maxUnit;
-   GET_CURRENT_CONTEXT(ctx);
-   struct gl_texture_unit *texUnit;
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   maxUnit = (target == GL_POINT_SPRITE_NV && pname == GL_COORD_REPLACE_NV)
-      ? ctx->Const.MaxTextureCoordUnits : ctx->Const.MaxTextureImageUnits;
-   if (ctx->Texture.CurrentUnit >= maxUnit) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glTexEnvfv(current unit)");
-      return;
-   }
-
-   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
-
-#define TE_ERROR(errCode, msg, value)				\
-   _mesa_error(ctx, errCode, msg, _mesa_lookup_enum_by_nr(value));
-
-   if (target == GL_TEXTURE_ENV) {
-      switch (pname) {
-      case GL_TEXTURE_ENV_MODE:
-         {
-            GLenum mode = (GLenum) (GLint) *param;
-            if (mode == GL_REPLACE_EXT)
-               mode = GL_REPLACE;
-	    if (texUnit->EnvMode == mode)
-	       return;
-            if (mode == GL_MODULATE ||
-                mode == GL_BLEND ||
-                mode == GL_DECAL ||
-                mode == GL_REPLACE ||
-                (mode == GL_ADD && ctx->Extensions.EXT_texture_env_add) ||
-                (mode == GL_COMBINE &&
-                 (ctx->Extensions.EXT_texture_env_combine ||
-                  ctx->Extensions.ARB_texture_env_combine))) {
-               /* legal */
-               FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-               texUnit->EnvMode = mode;
-            }
-            else {
-               TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
-               return;
-            }
-         }
-         break;
-      case GL_TEXTURE_ENV_COLOR:
-         {
-            GLfloat tmp[4];
-            tmp[0] = CLAMP( param[0], 0.0F, 1.0F );
-            tmp[1] = CLAMP( param[1], 0.0F, 1.0F );
-            tmp[2] = CLAMP( param[2], 0.0F, 1.0F );
-            tmp[3] = CLAMP( param[3], 0.0F, 1.0F );
-            if (TEST_EQ_4V(tmp, texUnit->EnvColor))
-               return;
-            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-            COPY_4FV(texUnit->EnvColor, tmp);
-         }
-         break;
-      case GL_COMBINE_RGB:
-	 if (ctx->Extensions.EXT_texture_env_combine ||
-             ctx->Extensions.ARB_texture_env_combine) {
-	    const GLenum mode = (GLenum) (GLint) *param;
-	    if (texUnit->Combine.ModeRGB == mode)
-	       return;
-	    switch (mode) {
-	    case GL_REPLACE:
-	    case GL_MODULATE:
-	    case GL_ADD:
-	    case GL_ADD_SIGNED:
-	    case GL_INTERPOLATE:
-               /* OK */
-	       break;
-            case GL_SUBTRACT:
-               if (!ctx->Extensions.ARB_texture_env_combine) {
-                  TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
-                  return;
-               }
-               break;
-	    case GL_DOT3_RGB_EXT:
-	    case GL_DOT3_RGBA_EXT:
-	       if (!ctx->Extensions.EXT_texture_env_dot3) {
-                  TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
-		  return;
-	       }
-	       break;
-	    case GL_DOT3_RGB:
-	    case GL_DOT3_RGBA:
-	       if (!ctx->Extensions.ARB_texture_env_dot3) {
-                  TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
-		  return;
-	       }
-	       break;
-	    case GL_MODULATE_ADD_ATI:
-	    case GL_MODULATE_SIGNED_ADD_ATI:
-	    case GL_MODULATE_SUBTRACT_ATI:
-	       if (!ctx->Extensions.ATI_texture_env_combine3) {
-                  TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
-		  return;
-	       }
-	       break;
-	    default:
-               TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
-	       return;
-	    }
-	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-	    texUnit->Combine.ModeRGB = mode;
-	 }
-	 else {
-            TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
-	    return;
-	 }
-         break;
-      case GL_COMBINE_ALPHA:
-	 if (ctx->Extensions.EXT_texture_env_combine ||
-             ctx->Extensions.ARB_texture_env_combine) {
-	    const GLenum mode = (GLenum) (GLint) *param;
-	    if (texUnit->Combine.ModeA == mode)
-	       return;
-            switch (mode) {
-	    case GL_REPLACE:
-	    case GL_MODULATE:
-	    case GL_ADD:
-	    case GL_ADD_SIGNED:
-	    case GL_INTERPOLATE:
-	       /* OK */
-	       break;
-	    case GL_SUBTRACT:
-	       if (!ctx->Extensions.ARB_texture_env_combine) {
-		  TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
-		  return;
-	       }
-	       break;
-	    case GL_MODULATE_ADD_ATI:
-	    case GL_MODULATE_SIGNED_ADD_ATI:
-	    case GL_MODULATE_SUBTRACT_ATI:
-	       if (!ctx->Extensions.ATI_texture_env_combine3) {
-                  TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
-		  return;
-	       }
-	       break;
-	    default:
-	       TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
-	       return;
-	    }
-	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-	    texUnit->Combine.ModeA = mode;
-	 }
-	 else {
-            TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
-	    return;
-	 }
-	 break;
-      case GL_SOURCE0_RGB:
-      case GL_SOURCE1_RGB:
-      case GL_SOURCE2_RGB:
-	 if (ctx->Extensions.EXT_texture_env_combine ||
-	     ctx->Extensions.ARB_texture_env_combine) {
-	    const GLenum source = (GLenum) (GLint) *param;
-	    const GLuint s = pname - GL_SOURCE0_RGB;
-	    if (texUnit->Combine.SourceRGB[s] == source)
-	       return;
-            if (source == GL_TEXTURE ||
-                source == GL_CONSTANT ||
-                source == GL_PRIMARY_COLOR ||
-                source == GL_PREVIOUS ||
-                (ctx->Extensions.ARB_texture_env_crossbar &&
-                 source >= GL_TEXTURE0 &&
-                 source < GL_TEXTURE0 + ctx->Const.MaxTextureUnits) ||
-                (ctx->Extensions.ATI_texture_env_combine3 &&
-                 (source == GL_ZERO || source == GL_ONE))) {
-               /* legal */
-	       FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-	       texUnit->Combine.SourceRGB[s] = source;
-            }
-            else {
-               TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", source);
-	       return;
-	    }
-	 }
-	 else {
-            TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
-	    return;
-	 }
-	 break;
-      case GL_SOURCE0_ALPHA:
-      case GL_SOURCE1_ALPHA:
-      case GL_SOURCE2_ALPHA:
-	 if (ctx->Extensions.EXT_texture_env_combine ||
-             ctx->Extensions.ARB_texture_env_combine) {
-	    const GLenum source = (GLenum) (GLint) *param;
-	    const GLuint s = pname - GL_SOURCE0_ALPHA;
-	    if (texUnit->Combine.SourceA[s] == source)
-	       return;
-            if (source == GL_TEXTURE ||
-                source == GL_CONSTANT ||
-                source == GL_PRIMARY_COLOR ||
-                source == GL_PREVIOUS ||
-                (ctx->Extensions.ARB_texture_env_crossbar &&
-                 source >= GL_TEXTURE0 &&
-                 source < GL_TEXTURE0 + ctx->Const.MaxTextureUnits) ||
-		(ctx->Extensions.ATI_texture_env_combine3 &&
-                 (source == GL_ZERO || source == GL_ONE))) {
-               /* legal */
-	       FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-	       texUnit->Combine.SourceA[s] = source;
-            }
-            else {
-               TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", source);
-	       return;
-	    }
-	 }
-	 else {
-            TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
-	    return;
-	 }
-	 break;
-      case GL_OPERAND0_RGB:
-      case GL_OPERAND1_RGB:
-	 if (ctx->Extensions.EXT_texture_env_combine ||
-	     ctx->Extensions.ARB_texture_env_combine) {
-	    const GLenum operand = (GLenum) (GLint) *param;
-	    const GLuint s = pname - GL_OPERAND0_RGB;
-	    if (texUnit->Combine.OperandRGB[s] == operand)
-	       return;
-	    switch (operand) {
-	    case GL_SRC_COLOR:
-	    case GL_ONE_MINUS_SRC_COLOR:
-	    case GL_SRC_ALPHA:
-	    case GL_ONE_MINUS_SRC_ALPHA:
-	       FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-	       texUnit->Combine.OperandRGB[s] = operand;
-	       break;
-	    default:
-               TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", operand);
-	       return;
-	    }
-	 }
-	 else {
-            TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
-	    return;
-	 }
-	 break;
-      case GL_OPERAND0_ALPHA:
-      case GL_OPERAND1_ALPHA:
-	 if (ctx->Extensions.EXT_texture_env_combine ||
-             ctx->Extensions.ARB_texture_env_combine) {
-	    const GLenum operand = (GLenum) (GLint) *param;
-	    if (texUnit->Combine.OperandA[pname-GL_OPERAND0_ALPHA] == operand)
-	       return;
-	    switch (operand) {
-	    case GL_SRC_ALPHA:
-	    case GL_ONE_MINUS_SRC_ALPHA:
-	       FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-	       texUnit->Combine.OperandA[pname-GL_OPERAND0_ALPHA] = operand;
-	       break;
-	    default:
-               TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", operand);
-	       return;
-	    }
-	 }
-	 else {
-            TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
-	    return;
-	 }
-	 break;
-      case GL_OPERAND2_RGB:
-	 if (ctx->Extensions.ARB_texture_env_combine) {
-	    const GLenum operand = (GLenum) (GLint) *param;
-	    if (texUnit->Combine.OperandRGB[2] == operand)
-	       return;
-	    switch (operand) {
-	    case GL_SRC_COLOR:           /* ARB combine only */
-	    case GL_ONE_MINUS_SRC_COLOR: /* ARB combine only */
-	    case GL_SRC_ALPHA:
-	    case GL_ONE_MINUS_SRC_ALPHA: /* ARB combine only */
-	       FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-	       texUnit->Combine.OperandRGB[2] = operand;
-               break;
-	    default:
-               TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", operand);
-	       return;
-	    }
-	 }
-	 else if (ctx->Extensions.EXT_texture_env_combine) {
-	    const GLenum operand = (GLenum) (GLint) *param;
-	    if (texUnit->Combine.OperandRGB[2] == operand)
-	       return;
-	    /* operand must be GL_SRC_ALPHA which is the initial value - thus
-	       don't need to actually compare the operand to the possible value */
-	    else {
-               TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", operand);
-	       return;
-	    }
-	 }
-	 else {
-            TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
-	    return;
-	 }
-	 break;
-      case GL_OPERAND2_ALPHA:
-	 if (ctx->Extensions.ARB_texture_env_combine) {
-	    const GLenum operand = (GLenum) (GLint) *param;
-	    if (texUnit->Combine.OperandA[2] == operand)
-	       return;
-	    switch (operand) {
-	    case GL_SRC_ALPHA:
-	    case GL_ONE_MINUS_SRC_ALPHA: /* ARB combine only */
-	       FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-	       texUnit->Combine.OperandA[2] = operand;
-	       break;
-	    default:
-               TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", operand);
-	       return;
-	    }
-	 }
-	 else if (ctx->Extensions.EXT_texture_env_combine) {
-	    const GLenum operand = (GLenum) (GLint) *param;
-	    if (texUnit->Combine.OperandA[2] == operand)
-	       return;
-	    /* operand must be GL_SRC_ALPHA which is the initial value - thus
-	       don't need to actually compare the operand to the possible value */
-	    else {
-               TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", operand);
-	       return;
-	    }
-	 }
-	 else {
-            TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
-	    return;
-	 }
-	 break;
-      case GL_RGB_SCALE:
-	 if (ctx->Extensions.EXT_texture_env_combine ||
-             ctx->Extensions.ARB_texture_env_combine) {
-	    GLuint newshift;
-	    if (*param == 1.0) {
-	       newshift = 0;
-	    }
-	    else if (*param == 2.0) {
-	       newshift = 1;
-	    }
-	    else if (*param == 4.0) {
-	       newshift = 2;
-	    }
-	    else {
-	       _mesa_error( ctx, GL_INVALID_VALUE,
-                            "glTexEnv(GL_RGB_SCALE not 1, 2 or 4)" );
-	       return;
-	    }
-	    if (texUnit->Combine.ScaleShiftRGB == newshift)
-	       return;
-	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-	    texUnit->Combine.ScaleShiftRGB = newshift;
-	 }
-	 else {
-            TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
-	    return;
-	 }
-	 break;
-      case GL_ALPHA_SCALE:
-	 if (ctx->Extensions.EXT_texture_env_combine ||
-             ctx->Extensions.ARB_texture_env_combine) {
-	    GLuint newshift;
-	    if (*param == 1.0) {
-	       newshift = 0;
-	    }
-	    else if (*param == 2.0) {
-	       newshift = 1;
-	    }
-	    else if (*param == 4.0) {
-	       newshift = 2;
-	    }
-	    else {
-	       _mesa_error( ctx, GL_INVALID_VALUE,
-                            "glTexEnv(GL_ALPHA_SCALE not 1, 2 or 4)" );
-	       return;
-	    }
-	    if (texUnit->Combine.ScaleShiftA == newshift)
-	       return;
-	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-	    texUnit->Combine.ScaleShiftA = newshift;
-	 }
-	 else {
-            TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
-	    return;
-	 }
-	 break;
-      default:
-	 _mesa_error( ctx, GL_INVALID_ENUM, "glTexEnv(pname)" );
-	 return;
-      }
-   }
-   else if (target == GL_TEXTURE_FILTER_CONTROL_EXT) {
-      /* GL_EXT_texture_lod_bias */
-      if (!ctx->Extensions.EXT_texture_lod_bias) {
-	 _mesa_error( ctx, GL_INVALID_ENUM, "glTexEnv(target=0x%x)", target );
-	 return;
-      }
-      if (pname == GL_TEXTURE_LOD_BIAS_EXT) {
-	 if (texUnit->LodBias == param[0])
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-         texUnit->LodBias = param[0];
-      }
-      else {
-         TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
-	 return;
-      }
-   }
-   else if (target == GL_POINT_SPRITE_NV) {
-      /* GL_ARB_point_sprite / GL_NV_point_sprite */
-      if (!ctx->Extensions.NV_point_sprite
-	  && !ctx->Extensions.ARB_point_sprite) {
-	 _mesa_error( ctx, GL_INVALID_ENUM, "glTexEnv(target=0x%x)", target );
-	 return;
-      }
-      if (pname == GL_COORD_REPLACE_NV) {
-         const GLenum value = (GLenum) param[0];
-         if (value == GL_TRUE || value == GL_FALSE) {
-            /* It's kind of weird to set point state via glTexEnv,
-             * but that's what the spec calls for.
-             */
-            const GLboolean state = (GLboolean) value;
-            if (ctx->Point.CoordReplace[ctx->Texture.CurrentUnit] == state)
-               return;
-            FLUSH_VERTICES(ctx, _NEW_POINT);
-            ctx->Point.CoordReplace[ctx->Texture.CurrentUnit] = state;
-         }
-         else {
-            _mesa_error( ctx, GL_INVALID_VALUE, "glTexEnv(param=0x%x)", value);
-            return;
-         }
-      }
-      else {
-         _mesa_error( ctx, GL_INVALID_ENUM, "glTexEnv(pname=0x%x)", pname );
-         return;
-      }
-   }
-   else {
-      _mesa_error( ctx, GL_INVALID_ENUM, "glTexEnv(target=0x%x)",target );
-      return;
-   }
-
-   if (MESA_VERBOSE&(VERBOSE_API|VERBOSE_TEXTURE))
-      _mesa_debug(ctx, "glTexEnv %s %s %.1f(%s) ...\n",
-                  _mesa_lookup_enum_by_nr(target),
-                  _mesa_lookup_enum_by_nr(pname),
-                  *param,
-                  _mesa_lookup_enum_by_nr((GLenum) (GLint) *param));
-
-   /* Tell device driver about the new texture environment */
-   if (ctx->Driver.TexEnv) {
-      (*ctx->Driver.TexEnv)( ctx, target, pname, param );
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_TexEnvf( GLenum target, GLenum pname, GLfloat param )
-{
-   _mesa_TexEnvfv( target, pname, &param );
-}
-
-
-
-void GLAPIENTRY
-_mesa_TexEnvi( GLenum target, GLenum pname, GLint param )
-{
-   GLfloat p[4];
-   p[0] = (GLfloat) param;
-   p[1] = p[2] = p[3] = 0.0;
-   _mesa_TexEnvfv( target, pname, p );
-}
-
-
-void GLAPIENTRY
-_mesa_TexEnviv( GLenum target, GLenum pname, const GLint *param )
-{
-   GLfloat p[4];
-   if (pname == GL_TEXTURE_ENV_COLOR) {
-      p[0] = INT_TO_FLOAT( param[0] );
-      p[1] = INT_TO_FLOAT( param[1] );
-      p[2] = INT_TO_FLOAT( param[2] );
-      p[3] = INT_TO_FLOAT( param[3] );
-   }
-   else {
-      p[0] = (GLfloat) param[0];
-      p[1] = p[2] = p[3] = 0;  /* init to zero, just to be safe */
-   }
-   _mesa_TexEnvfv( target, pname, p );
-}
-
-
-void GLAPIENTRY
-_mesa_GetTexEnvfv( GLenum target, GLenum pname, GLfloat *params )
-{
-   GLuint maxUnit;
-   const struct gl_texture_unit *texUnit;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   maxUnit = (target == GL_POINT_SPRITE_NV && pname == GL_COORD_REPLACE_NV)
-      ? ctx->Const.MaxTextureCoordUnits : ctx->Const.MaxTextureImageUnits;
-   if (ctx->Texture.CurrentUnit >= maxUnit) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexEnvfv(current unit)");
-      return;
-   }
-
-   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
-
-   if (target == GL_TEXTURE_ENV) {
-      switch (pname) {
-         case GL_TEXTURE_ENV_MODE:
-            *params = ENUM_TO_FLOAT(texUnit->EnvMode);
-            break;
-         case GL_TEXTURE_ENV_COLOR:
-            COPY_4FV( params, texUnit->EnvColor );
-            break;
-         case GL_COMBINE_RGB:
-            if (ctx->Extensions.EXT_texture_env_combine ||
-                ctx->Extensions.ARB_texture_env_combine) {
-               *params = (GLfloat) texUnit->Combine.ModeRGB;
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
-            }
-            break;
-         case GL_COMBINE_ALPHA:
-            if (ctx->Extensions.EXT_texture_env_combine ||
-                ctx->Extensions.ARB_texture_env_combine) {
-               *params = (GLfloat) texUnit->Combine.ModeA;
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
-            }
-            break;
-         case GL_SOURCE0_RGB:
-         case GL_SOURCE1_RGB:
-         case GL_SOURCE2_RGB:
-            if (ctx->Extensions.EXT_texture_env_combine ||
-                ctx->Extensions.ARB_texture_env_combine) {
-	       const unsigned rgb_idx = pname - GL_SOURCE0_RGB;
-               *params = (GLfloat) texUnit->Combine.SourceRGB[rgb_idx];
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
-            }
-            break;
-         case GL_SOURCE0_ALPHA:
-         case GL_SOURCE1_ALPHA:
-         case GL_SOURCE2_ALPHA:
-            if (ctx->Extensions.EXT_texture_env_combine ||
-                ctx->Extensions.ARB_texture_env_combine) {
-	       const unsigned alpha_idx = pname - GL_SOURCE0_ALPHA;
-               *params = (GLfloat) texUnit->Combine.SourceA[alpha_idx];
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
-            }
-            break;
-         case GL_OPERAND0_RGB:
-         case GL_OPERAND1_RGB:
-         case GL_OPERAND2_RGB:
-            if (ctx->Extensions.EXT_texture_env_combine ||
-                ctx->Extensions.ARB_texture_env_combine) {
-	       const unsigned op_rgb = pname - GL_OPERAND0_RGB;
-               *params = (GLfloat) texUnit->Combine.OperandRGB[op_rgb];
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
-            }
-            break;
-         case GL_OPERAND0_ALPHA:
-         case GL_OPERAND1_ALPHA:
-         case GL_OPERAND2_ALPHA:
-            if (ctx->Extensions.EXT_texture_env_combine ||
-                ctx->Extensions.ARB_texture_env_combine) {
-	       const unsigned op_alpha = pname - GL_OPERAND0_ALPHA;
-               *params = (GLfloat) texUnit->Combine.OperandA[op_alpha];
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
-            }
-            break;
-         case GL_RGB_SCALE:
-            if (ctx->Extensions.EXT_texture_env_combine ||
-                ctx->Extensions.ARB_texture_env_combine) {
-               if (texUnit->Combine.ScaleShiftRGB == 0)
-                  *params = 1.0;
-               else if (texUnit->Combine.ScaleShiftRGB == 1)
-                  *params = 2.0;
-               else
-                  *params = 4.0;
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
-               return;
-            }
-            break;
-         case GL_ALPHA_SCALE:
-            if (ctx->Extensions.EXT_texture_env_combine ||
-                ctx->Extensions.ARB_texture_env_combine) {
-               if (texUnit->Combine.ScaleShiftA == 0)
-                  *params = 1.0;
-               else if (texUnit->Combine.ScaleShiftA == 1)
-                  *params = 2.0;
-               else
-                  *params = 4.0;
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
-               return;
-            }
-            break;
-         default:
-            _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname=0x%x)", pname);
-      }
-   }
-   else if (target == GL_TEXTURE_FILTER_CONTROL_EXT) {
-      /* GL_EXT_texture_lod_bias */
-      if (!ctx->Extensions.EXT_texture_lod_bias) {
-	 _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnvfv(target)" );
-	 return;
-      }
-      if (pname == GL_TEXTURE_LOD_BIAS_EXT) {
-         *params = texUnit->LodBias;
-      }
-      else {
-         _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)" );
-	 return;
-      }
-   }
-   else if (target == GL_POINT_SPRITE_NV) {
-      /* GL_ARB_point_sprite / GL_NV_point_sprite */
-      if (!ctx->Extensions.NV_point_sprite
-	  && !ctx->Extensions.ARB_point_sprite) {
-         _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnvfv(target)" );
-         return;
-      }
-      if (pname == GL_COORD_REPLACE_NV) {
-         *params = (GLfloat) ctx->Point.CoordReplace[ctx->Texture.CurrentUnit];
-      }
-      else {
-         _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)" );
-         return;
-      }
-   }
-   else {
-      _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnvfv(target)" );
-      return;
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_GetTexEnviv( GLenum target, GLenum pname, GLint *params )
-{
-   GLuint maxUnit;
-   const struct gl_texture_unit *texUnit;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   maxUnit = (target == GL_POINT_SPRITE_NV && pname == GL_COORD_REPLACE_NV)
-      ? ctx->Const.MaxTextureCoordUnits : ctx->Const.MaxTextureImageUnits;
-   if (ctx->Texture.CurrentUnit >= maxUnit) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexEnviv(current unit)");
-      return;
-   }
-
-   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
-
-   if (target == GL_TEXTURE_ENV) {
-      switch (pname) {
-         case GL_TEXTURE_ENV_MODE:
-            *params = (GLint) texUnit->EnvMode;
-            break;
-         case GL_TEXTURE_ENV_COLOR:
-            params[0] = FLOAT_TO_INT( texUnit->EnvColor[0] );
-            params[1] = FLOAT_TO_INT( texUnit->EnvColor[1] );
-            params[2] = FLOAT_TO_INT( texUnit->EnvColor[2] );
-            params[3] = FLOAT_TO_INT( texUnit->EnvColor[3] );
-            break;
-         case GL_COMBINE_RGB:
-            if (ctx->Extensions.EXT_texture_env_combine ||
-                ctx->Extensions.ARB_texture_env_combine) {
-               *params = (GLint) texUnit->Combine.ModeRGB;
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)");
-            }
-            break;
-         case GL_COMBINE_ALPHA:
-            if (ctx->Extensions.EXT_texture_env_combine ||
-                ctx->Extensions.ARB_texture_env_combine) {
-               *params = (GLint) texUnit->Combine.ModeA;
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)");
-            }
-            break;
-         case GL_SOURCE0_RGB:
-         case GL_SOURCE1_RGB:
-         case GL_SOURCE2_RGB:
-            if (ctx->Extensions.EXT_texture_env_combine ||
-                ctx->Extensions.ARB_texture_env_combine) {
-	       const unsigned rgb_idx = pname - GL_SOURCE0_RGB;
-               *params = (GLint) texUnit->Combine.SourceRGB[rgb_idx];
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)");
-            }
-            break;
-         case GL_SOURCE0_ALPHA:
-         case GL_SOURCE1_ALPHA:
-         case GL_SOURCE2_ALPHA:
-            if (ctx->Extensions.EXT_texture_env_combine ||
-                ctx->Extensions.ARB_texture_env_combine) {
-	       const unsigned alpha_idx = pname - GL_SOURCE0_ALPHA;
-               *params = (GLint) texUnit->Combine.SourceA[alpha_idx];
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)");
-            }
-            break;
-         case GL_OPERAND0_RGB:
-         case GL_OPERAND1_RGB:
-         case GL_OPERAND2_RGB:
-            if (ctx->Extensions.EXT_texture_env_combine ||
-                ctx->Extensions.ARB_texture_env_combine) {
-	       const unsigned op_rgb = pname - GL_OPERAND0_RGB;
-               *params = (GLint) texUnit->Combine.OperandRGB[op_rgb];
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)");
-            }
-            break;
-         case GL_OPERAND0_ALPHA:
-         case GL_OPERAND1_ALPHA:
-         case GL_OPERAND2_ALPHA:
-            if (ctx->Extensions.EXT_texture_env_combine ||
-                ctx->Extensions.ARB_texture_env_combine) {
-	       const unsigned op_alpha = pname - GL_OPERAND0_ALPHA;
-               *params = (GLint) texUnit->Combine.OperandA[op_alpha];
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)");
-            }
-            break;
-         case GL_RGB_SCALE:
-            if (ctx->Extensions.EXT_texture_env_combine ||
-                ctx->Extensions.ARB_texture_env_combine) {
-               if (texUnit->Combine.ScaleShiftRGB == 0)
-                  *params = 1;
-               else if (texUnit->Combine.ScaleShiftRGB == 1)
-                  *params = 2;
-               else
-                  *params = 4;
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)");
-               return;
-            }
-            break;
-         case GL_ALPHA_SCALE:
-            if (ctx->Extensions.EXT_texture_env_combine ||
-                ctx->Extensions.ARB_texture_env_combine) {
-               if (texUnit->Combine.ScaleShiftA == 0)
-                  *params = 1;
-               else if (texUnit->Combine.ScaleShiftA == 1)
-                  *params = 2;
-               else
-                  *params = 4;
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)");
-               return;
-            }
-            break;
-         default:
-            _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname=0x%x)",
-                        pname);
-      }
-   }
-   else if (target == GL_TEXTURE_FILTER_CONTROL_EXT) {
-      /* GL_EXT_texture_lod_bias */
-      if (!ctx->Extensions.EXT_texture_lod_bias) {
-	 _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnviv(target)" );
-	 return;
-      }
-      if (pname == GL_TEXTURE_LOD_BIAS_EXT) {
-         *params = (GLint) texUnit->LodBias;
-      }
-      else {
-         _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)" );
-	 return;
-      }
-   }
-   else if (target == GL_POINT_SPRITE_NV) {
-      /* GL_ARB_point_sprite / GL_NV_point_sprite */
-      if (!ctx->Extensions.NV_point_sprite
-	  && !ctx->Extensions.ARB_point_sprite) {
-         _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnviv(target)" );
-         return;
-      }
-      if (pname == GL_COORD_REPLACE_NV) {
-         *params = (GLint) ctx->Point.CoordReplace[ctx->Texture.CurrentUnit];
-      }
-      else {
-         _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)" );
-         return;
-      }
-   }
-   else {
-      _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnviv(target)" );
-      return;
-   }
-}
-
-
-
-
 /**********************************************************************/
 /*                       Texture Parameters                           */
 /**********************************************************************/
diff --git a/src/mesa/main/texstate.h b/src/mesa/main/texstate.h
index 67bf487dfc..1f1c2267aa 100644
--- a/src/mesa/main/texstate.h
+++ b/src/mesa/main/texstate.h
@@ -48,12 +48,6 @@ _mesa_print_texunit_state( GLcontext *ctx, GLuint unit );
  */
 /*@{*/
 
-extern void GLAPIENTRY
-_mesa_GetTexEnvfv( GLenum target, GLenum pname, GLfloat *params );
-
-extern void GLAPIENTRY
-_mesa_GetTexEnviv( GLenum target, GLenum pname, GLint *params );
-
 extern void GLAPIENTRY
 _mesa_GetTexLevelParameterfv( GLenum target, GLint level,
                               GLenum pname, GLfloat *params );
@@ -69,18 +63,6 @@ extern void GLAPIENTRY
 _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params );
 
 
-extern void GLAPIENTRY
-_mesa_TexEnvf( GLenum target, GLenum pname, GLfloat param );
-
-extern void GLAPIENTRY
-_mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param );
-
-extern void GLAPIENTRY
-_mesa_TexEnvi( GLenum target, GLenum pname, GLint param );
-
-extern void GLAPIENTRY
-_mesa_TexEnviv( GLenum target, GLenum pname, const GLint *param );
-
 
 extern void GLAPIENTRY
 _mesa_TexParameterfv( GLenum target, GLenum pname, const GLfloat *params );
diff --git a/src/mesa/sources b/src/mesa/sources
index d5a9103fb3..d225d7d15b 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -61,6 +61,7 @@ MAIN_SOURCES = \
 	main/texcompress.c \
 	main/texcompress_s3tc.c \
 	main/texcompress_fxt1.c \
+	main/texenv.c \
 	main/texenvprogram.c \
 	main/texformat.c \
 	main/texgen.c \
-- 
cgit v1.2.3


From 77b794201a96300af4473307a7663500d62296e8 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 11 Jun 2008 20:05:53 -0600
Subject: mesa: refactor: move glTexParameter-related functions into new
 texparam.c file

---
 src/mesa/main/api_exec.c |    1 +
 src/mesa/main/attrib.c   |    1 +
 src/mesa/main/sources    |    2 +
 src/mesa/main/texparam.c | 1038 ++++++++++++++++++++++++++++++++++++++++++++++
 src/mesa/main/texparam.h |   63 +++
 src/mesa/main/texstate.c |  999 --------------------------------------------
 src/mesa/main/texstate.h |   29 --
 src/mesa/sources         |    1 +
 8 files changed, 1106 insertions(+), 1028 deletions(-)
 create mode 100644 src/mesa/main/texparam.c
 create mode 100644 src/mesa/main/texparam.h

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index 10b3f9276f..8ebe4a3e4a 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -112,6 +112,7 @@
 #include "texgen.h"
 #endif
 #include "texobj.h"
+#include "texparam.h"
 #include "texstate.h"
 #include "mtypes.h"
 #include "varray.h"
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 48356c75fe..2e6bb76586 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -51,6 +51,7 @@
 #include "texenv.h"
 #include "texgen.h"
 #include "texobj.h"
+#include "texparam.h"
 #include "texstate.h"
 #include "mtypes.h"
 #include "math/m_xform.h"
diff --git a/src/mesa/main/sources b/src/mesa/main/sources
index 04a2101bb9..468121bd1d 100644
--- a/src/mesa/main/sources
+++ b/src/mesa/main/sources
@@ -64,6 +64,7 @@ texformat.c \
 texgen.c \
 teximage.c \
 texobj.c \
+texparam.c \
 texrender.c \
 texstate.c \
 texstore.c \
@@ -144,6 +145,7 @@ texformat_tmp.h \
 texgen.h \
 teximage.h \
 texobj.h \
+texparam.h \
 texrender.h \
 texstate.h \
 texstore.h \
diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
new file mode 100644
index 0000000000..10ad0ef1d8
--- /dev/null
+++ b/src/mesa/main/texparam.c
@@ -0,0 +1,1038 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.1
+ *
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/** 
+ * \file texparam.c
+ *
+ * glTexParameter-related functions
+ */
+
+
+#include "main/glheader.h"
+#include "main/context.h"
+#include "main/enums.h"
+#include "main/colormac.h"
+#include "main/macros.h"
+#include "main/texcompress.h"
+#include "main/texparam.h"
+#include "main/teximage.h"
+
+
+#define ENUM_TO_FLOAT(X) ((GLfloat)(GLint)(X))
+
+
+/**
+ * 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(GLcontext * ctx, GLenum target, GLenum wrap)
+{
+   const struct gl_extensions * const e = & ctx->Extensions;
+
+   if (wrap == GL_CLAMP || wrap == GL_CLAMP_TO_EDGE ||
+       (wrap == GL_CLAMP_TO_BORDER && e->ARB_texture_border_clamp)) {
+      /* any texture target */
+      return GL_TRUE;
+   }
+   else if (target != GL_TEXTURE_RECTANGLE_NV &&
+	    (wrap == GL_REPEAT ||
+	     (wrap == GL_MIRRORED_REPEAT &&
+	      e->ARB_texture_mirrored_repeat) ||
+	     (wrap == GL_MIRROR_CLAMP_EXT &&
+	      (e->ATI_texture_mirror_once || e->EXT_texture_mirror_clamp)) ||
+	     (wrap == GL_MIRROR_CLAMP_TO_EDGE_EXT &&
+	      (e->ATI_texture_mirror_once || e->EXT_texture_mirror_clamp)) ||
+	     (wrap == GL_MIRROR_CLAMP_TO_BORDER_EXT &&
+	      (e->EXT_texture_mirror_clamp)))) {
+      /* non-rectangle texture */
+      return GL_TRUE;
+   }
+
+   _mesa_error( ctx, GL_INVALID_VALUE, "glTexParameter(param)" );
+   return GL_FALSE;
+}
+
+
+void GLAPIENTRY
+_mesa_TexParameterf( GLenum target, GLenum pname, GLfloat param )
+{
+   _mesa_TexParameterfv(target, pname, &param);
+}
+
+
+void GLAPIENTRY
+_mesa_TexParameterfv( GLenum target, GLenum pname, const GLfloat *params )
+{
+   const GLenum eparam = (GLenum) (GLint) params[0];
+   struct gl_texture_unit *texUnit;
+   struct gl_texture_object *texObj;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (MESA_VERBOSE&(VERBOSE_API|VERBOSE_TEXTURE))
+      _mesa_debug(ctx, "glTexParameter %s %s %.1f(%s)...\n",
+                  _mesa_lookup_enum_by_nr(target),
+                  _mesa_lookup_enum_by_nr(pname),
+                  *params,
+		  _mesa_lookup_enum_by_nr(eparam));
+
+   if (ctx->Texture.CurrentUnit >= ctx->Const.MaxTextureImageUnits) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glTexParameterfv(current unit)");
+      return;
+   }
+
+   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+
+   switch (target) {
+      case GL_TEXTURE_1D:
+         texObj = texUnit->Current1D;
+         break;
+      case GL_TEXTURE_2D:
+         texObj = texUnit->Current2D;
+         break;
+      case GL_TEXTURE_3D:
+         texObj = texUnit->Current3D;
+         break;
+      case GL_TEXTURE_CUBE_MAP:
+         if (!ctx->Extensions.ARB_texture_cube_map) {
+            _mesa_error( ctx, GL_INVALID_ENUM, "glTexParameter(target)" );
+            return;
+         }
+         texObj = texUnit->CurrentCubeMap;
+         break;
+      case GL_TEXTURE_RECTANGLE_NV:
+         if (!ctx->Extensions.NV_texture_rectangle) {
+            _mesa_error( ctx, GL_INVALID_ENUM, "glTexParameter(target)" );
+            return;
+         }
+         texObj = texUnit->CurrentRect;
+         break;
+      case GL_TEXTURE_1D_ARRAY_EXT:
+         if (!ctx->Extensions.MESA_texture_array) {
+            _mesa_error( ctx, GL_INVALID_ENUM, "glTexParameter(target)" );
+            return;
+         }
+         texObj = texUnit->Current1DArray;
+         break;
+      case GL_TEXTURE_2D_ARRAY_EXT:
+         if (!ctx->Extensions.MESA_texture_array) {
+            _mesa_error( ctx, GL_INVALID_ENUM, "glTexParameter(target)" );
+            return;
+         }
+         texObj = texUnit->Current2DArray;
+         break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glTexParameter(target)" );
+         return;
+   }
+
+   switch (pname) {
+      case GL_TEXTURE_MIN_FILTER:
+         /* A small optimization */
+         if (texObj->MinFilter == eparam)
+            return;
+         if (eparam==GL_NEAREST || eparam==GL_LINEAR) {
+            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+            texObj->MinFilter = eparam;
+         }
+         else if ((eparam==GL_NEAREST_MIPMAP_NEAREST ||
+                   eparam==GL_LINEAR_MIPMAP_NEAREST ||
+                   eparam==GL_NEAREST_MIPMAP_LINEAR ||
+                   eparam==GL_LINEAR_MIPMAP_LINEAR) &&
+                  texObj->Target != GL_TEXTURE_RECTANGLE_NV) {
+            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+            texObj->MinFilter = eparam;
+         }
+         else {
+            _mesa_error( ctx, GL_INVALID_VALUE, "glTexParameter(param)" );
+            return;
+         }
+         break;
+      case GL_TEXTURE_MAG_FILTER:
+         /* A small optimization */
+         if (texObj->MagFilter == eparam)
+            return;
+
+         if (eparam==GL_NEAREST || eparam==GL_LINEAR) {
+            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+            texObj->MagFilter = eparam;
+         }
+         else {
+            _mesa_error( ctx, GL_INVALID_VALUE, "glTexParameter(param)" );
+            return;
+         }
+         break;
+      case GL_TEXTURE_WRAP_S:
+         if (texObj->WrapS == eparam)
+            return;
+         if (validate_texture_wrap_mode(ctx, texObj->Target, eparam)) {
+            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+            texObj->WrapS = eparam;
+         }
+         else {
+            return;
+         }
+         break;
+      case GL_TEXTURE_WRAP_T:
+         if (texObj->WrapT == eparam)
+            return;
+         if (validate_texture_wrap_mode(ctx, texObj->Target, eparam)) {
+            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+            texObj->WrapT = eparam;
+         }
+         else {
+            return;
+         }
+         break;
+      case GL_TEXTURE_WRAP_R:
+         if (texObj->WrapR == eparam)
+            return;
+         if (validate_texture_wrap_mode(ctx, texObj->Target, eparam)) {
+            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+            texObj->WrapR = eparam;
+         }
+         else {
+	    return;
+         }
+         break;
+      case GL_TEXTURE_BORDER_COLOR:
+         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+         texObj->BorderColor[RCOMP] = params[0];
+         texObj->BorderColor[GCOMP] = params[1];
+         texObj->BorderColor[BCOMP] = params[2];
+         texObj->BorderColor[ACOMP] = params[3];
+         UNCLAMPED_FLOAT_TO_CHAN(texObj->_BorderChan[RCOMP], params[0]);
+         UNCLAMPED_FLOAT_TO_CHAN(texObj->_BorderChan[GCOMP], params[1]);
+         UNCLAMPED_FLOAT_TO_CHAN(texObj->_BorderChan[BCOMP], params[2]);
+         UNCLAMPED_FLOAT_TO_CHAN(texObj->_BorderChan[ACOMP], params[3]);
+         break;
+      case GL_TEXTURE_MIN_LOD:
+         if (texObj->MinLod == params[0])
+            return;
+         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+         texObj->MinLod = params[0];
+         break;
+      case GL_TEXTURE_MAX_LOD:
+         if (texObj->MaxLod == params[0])
+            return;
+         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+         texObj->MaxLod = params[0];
+         break;
+      case GL_TEXTURE_BASE_LEVEL:
+         if (params[0] < 0.0) {
+            _mesa_error(ctx, GL_INVALID_VALUE, "glTexParameter(param)");
+            return;
+         }
+         if (target == GL_TEXTURE_RECTANGLE_ARB && params[0] != 0.0) {
+            _mesa_error(ctx, GL_INVALID_VALUE, "glTexParameter(param)");
+            return;
+         }
+         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+         texObj->BaseLevel = (GLint) params[0];
+         break;
+      case GL_TEXTURE_MAX_LEVEL:
+         if (params[0] < 0.0) {
+            _mesa_error(ctx, GL_INVALID_VALUE, "glTexParameter(param)");
+            return;
+         }
+         if (target == GL_TEXTURE_RECTANGLE_ARB) {
+            _mesa_error(ctx, GL_INVALID_OPERATION, "glTexParameter(param)");
+            return;
+         }
+         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+         texObj->MaxLevel = (GLint) params[0];
+         break;
+      case GL_TEXTURE_PRIORITY:
+         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+         texObj->Priority = CLAMP( params[0], 0.0F, 1.0F );
+         break;
+      case GL_TEXTURE_MAX_ANISOTROPY_EXT:
+         if (ctx->Extensions.EXT_texture_filter_anisotropic) {
+	    if (params[0] < 1.0) {
+	       _mesa_error(ctx, GL_INVALID_VALUE, "glTexParameter(param)" );
+	       return;
+	    }
+            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+            /* clamp to max, that's what NVIDIA does */
+            texObj->MaxAnisotropy = MIN2(params[0],
+                                         ctx->Const.MaxTextureMaxAnisotropy);
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glTexParameter(pname=GL_TEXTURE_MAX_ANISOTROPY_EXT)");
+            return;
+         }
+         break;
+      case GL_TEXTURE_COMPARE_SGIX:
+         if (ctx->Extensions.SGIX_shadow) {
+            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+            texObj->CompareFlag = params[0] ? GL_TRUE : GL_FALSE;
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glTexParameter(pname=GL_TEXTURE_COMPARE_SGIX)");
+            return;
+         }
+         break;
+      case GL_TEXTURE_COMPARE_OPERATOR_SGIX:
+         if (ctx->Extensions.SGIX_shadow) {
+            GLenum op = (GLenum) params[0];
+            if (op == GL_TEXTURE_LEQUAL_R_SGIX ||
+                op == GL_TEXTURE_GEQUAL_R_SGIX) {
+               FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+               texObj->CompareOperator = op;
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(param)");
+            }
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                    "glTexParameter(pname=GL_TEXTURE_COMPARE_OPERATOR_SGIX)");
+            return;
+         }
+         break;
+      case GL_SHADOW_AMBIENT_SGIX: /* aka GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+         if (ctx->Extensions.SGIX_shadow_ambient) {
+            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+            texObj->ShadowAmbient = CLAMP(params[0], 0.0F, 1.0F);
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glTexParameter(pname=GL_SHADOW_AMBIENT_SGIX)");
+            return;
+         }
+         break;
+      case GL_GENERATE_MIPMAP_SGIS:
+         if (ctx->Extensions.SGIS_generate_mipmap) {
+            texObj->GenerateMipmap = params[0] ? GL_TRUE : GL_FALSE;
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glTexParameter(pname=GL_GENERATE_MIPMAP_SGIS)");
+            return;
+         }
+         break;
+      case GL_TEXTURE_COMPARE_MODE_ARB:
+         if (ctx->Extensions.ARB_shadow) {
+            const GLenum mode = (GLenum) params[0];
+            if (mode == GL_NONE || mode == GL_COMPARE_R_TO_TEXTURE_ARB) {
+               FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+               texObj->CompareMode = mode;
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM,
+                           "glTexParameter(bad GL_TEXTURE_COMPARE_MODE_ARB: 0x%x)", mode);
+               return;
+            }
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glTexParameter(pname=GL_TEXTURE_COMPARE_MODE_ARB)");
+            return;
+         }
+         break;
+      case GL_TEXTURE_COMPARE_FUNC_ARB:
+         if (ctx->Extensions.ARB_shadow) {
+            const GLenum func = (GLenum) params[0];
+            if (func == GL_LEQUAL || func == GL_GEQUAL) {
+               FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+               texObj->CompareFunc = func;
+            }
+            else if (ctx->Extensions.EXT_shadow_funcs &&
+                     (func == GL_EQUAL ||
+                      func == GL_NOTEQUAL ||
+                      func == GL_LESS ||
+                      func == GL_GREATER ||
+                      func == GL_ALWAYS ||
+                      func == GL_NEVER)) {
+               FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+               texObj->CompareFunc = func;
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM,
+                           "glTexParameter(bad GL_TEXTURE_COMPARE_FUNC_ARB)");
+               return;
+            }
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glTexParameter(pname=GL_TEXTURE_COMPARE_FUNC_ARB)");
+            return;
+         }
+         break;
+      case GL_DEPTH_TEXTURE_MODE_ARB:
+         if (ctx->Extensions.ARB_depth_texture) {
+            const GLenum result = (GLenum) params[0];
+            if (result == GL_LUMINANCE || result == GL_INTENSITY
+                || result == GL_ALPHA) {
+               FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+               texObj->DepthMode = result;
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM,
+                          "glTexParameter(bad GL_DEPTH_TEXTURE_MODE_ARB)");
+               return;
+            }
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glTexParameter(pname=GL_DEPTH_TEXTURE_MODE_ARB)");
+            return;
+         }
+         break;
+      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]) {
+               FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+               texObj->LodBias = params[0];
+            }
+         }
+         break;
+
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM,
+                     "glTexParameter(pname=0x%x)", pname);
+         return;
+   }
+
+   texObj->_Complete = GL_FALSE;
+
+   if (ctx->Driver.TexParameter) {
+      (*ctx->Driver.TexParameter)( ctx, target, texObj, pname, params );
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_TexParameteri( GLenum target, GLenum pname, GLint param )
+{
+   GLfloat fparam[4];
+   if (pname == GL_TEXTURE_PRIORITY)
+      fparam[0] = INT_TO_FLOAT(param);
+   else
+      fparam[0] = (GLfloat) param;
+   fparam[1] = fparam[2] = fparam[3] = 0.0;
+   _mesa_TexParameterfv(target, pname, fparam);
+}
+
+
+void GLAPIENTRY
+_mesa_TexParameteriv( GLenum target, GLenum pname, const GLint *params )
+{
+   GLfloat fparam[4];
+   if (pname == GL_TEXTURE_BORDER_COLOR) {
+      fparam[0] = INT_TO_FLOAT(params[0]);
+      fparam[1] = INT_TO_FLOAT(params[1]);
+      fparam[2] = INT_TO_FLOAT(params[2]);
+      fparam[3] = INT_TO_FLOAT(params[3]);
+   }
+   else {
+      if (pname == GL_TEXTURE_PRIORITY)
+         fparam[0] = INT_TO_FLOAT(params[0]);
+      else
+         fparam[0] = (GLfloat) params[0];
+      fparam[1] = fparam[2] = fparam[3] = 0.0F;
+   }
+   _mesa_TexParameterfv(target, pname, fparam);
+}
+
+
+void GLAPIENTRY
+_mesa_GetTexLevelParameterfv( GLenum target, GLint level,
+                              GLenum pname, GLfloat *params )
+{
+   GLint iparam;
+   _mesa_GetTexLevelParameteriv( target, level, pname, &iparam );
+   *params = (GLfloat) iparam;
+}
+
+
+static GLuint
+tex_image_dimensions(GLcontext *ctx, GLenum target)
+{
+   switch (target) {
+      case GL_TEXTURE_1D:
+      case GL_PROXY_TEXTURE_1D:
+         return 1;
+      case GL_TEXTURE_2D:
+      case GL_PROXY_TEXTURE_2D:
+         return 2;
+      case GL_TEXTURE_3D:
+      case GL_PROXY_TEXTURE_3D:
+         return 3;
+      case GL_TEXTURE_CUBE_MAP:
+      case GL_PROXY_TEXTURE_CUBE_MAP:
+      case GL_TEXTURE_CUBE_MAP_POSITIVE_X:
+      case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:
+      case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:
+      case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:
+      case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:
+      case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
+         return ctx->Extensions.ARB_texture_cube_map ? 2 : 0;
+      case GL_TEXTURE_RECTANGLE_NV:
+      case GL_PROXY_TEXTURE_RECTANGLE_NV:
+         return ctx->Extensions.NV_texture_rectangle ? 2 : 0;
+      case GL_TEXTURE_1D_ARRAY_EXT:
+      case GL_PROXY_TEXTURE_1D_ARRAY_EXT:
+         return ctx->Extensions.MESA_texture_array ? 2 : 0;
+      case GL_TEXTURE_2D_ARRAY_EXT:
+      case GL_PROXY_TEXTURE_2D_ARRAY_EXT:
+         return ctx->Extensions.MESA_texture_array ? 3 : 0;
+      default:
+         _mesa_problem(ctx, "bad target in _mesa_tex_target_dimensions()");
+         return 0;
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_GetTexLevelParameteriv( GLenum target, GLint level,
+                              GLenum pname, GLint *params )
+{
+   const struct gl_texture_unit *texUnit;
+   struct gl_texture_object *texObj;
+   const struct gl_texture_image *img = NULL;
+   GLuint dimensions;
+   GLboolean isProxy;
+   GLint maxLevels;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (ctx->Texture.CurrentUnit >= ctx->Const.MaxTextureImageUnits) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glGetTexLevelParameteriv(current unit)");
+      return;
+   }
+
+   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+
+   /* this will catch bad target values */
+   dimensions = tex_image_dimensions(ctx, target);  /* 1, 2 or 3 */
+   if (dimensions == 0) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexLevelParameter[if]v(target)");
+      return;
+   }
+
+   maxLevels = _mesa_max_texture_levels(ctx, target);
+   if (maxLevels == 0) {
+      /* should not happen since <target> was just checked above */
+      _mesa_problem(ctx, "maxLevels=0 in _mesa_GetTexLevelParameter");
+      return;
+   }
+
+   if (level < 0 || level >= maxLevels) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glGetTexLevelParameter[if]v" );
+      return;
+   }
+
+   texObj = _mesa_select_tex_object(ctx, texUnit, target);
+   _mesa_lock_texture(ctx, texObj);
+
+   img = _mesa_select_tex_image(ctx, texObj, target, level);
+   if (!img || !img->TexFormat) {
+      /* undefined texture image */
+      if (pname == GL_TEXTURE_COMPONENTS)
+         *params = 1;
+      else
+         *params = 0;
+      goto out;
+   }
+
+   isProxy = _mesa_is_proxy_texture(target);
+
+   switch (pname) {
+      case GL_TEXTURE_WIDTH:
+         *params = img->Width;
+         break;
+      case GL_TEXTURE_HEIGHT:
+         *params = img->Height;
+         break;
+      case GL_TEXTURE_DEPTH:
+         *params = img->Depth;
+         break;
+      case GL_TEXTURE_INTERNAL_FORMAT:
+         *params = img->InternalFormat;
+         break;
+      case GL_TEXTURE_BORDER:
+         *params = img->Border;
+         break;
+      case GL_TEXTURE_RED_SIZE:
+         if (img->_BaseFormat == GL_RGB || img->_BaseFormat == GL_RGBA)
+            *params = img->TexFormat->RedBits;
+         else
+            *params = 0;
+         break;
+      case GL_TEXTURE_GREEN_SIZE:
+         if (img->_BaseFormat == GL_RGB || img->_BaseFormat == GL_RGBA)
+            *params = img->TexFormat->GreenBits;
+         else
+            *params = 0;
+         break;
+      case GL_TEXTURE_BLUE_SIZE:
+         if (img->_BaseFormat == GL_RGB || img->_BaseFormat == GL_RGBA)
+            *params = img->TexFormat->BlueBits;
+         else
+            *params = 0;
+         break;
+      case GL_TEXTURE_ALPHA_SIZE:
+         if (img->_BaseFormat == GL_ALPHA ||
+             img->_BaseFormat == GL_LUMINANCE_ALPHA ||
+             img->_BaseFormat == GL_RGBA)
+            *params = img->TexFormat->AlphaBits;
+         else
+            *params = 0;
+         break;
+      case GL_TEXTURE_INTENSITY_SIZE:
+         if (img->_BaseFormat != GL_INTENSITY)
+            *params = 0;
+         else if (img->TexFormat->IntensityBits > 0)
+            *params = img->TexFormat->IntensityBits;
+         else /* intensity probably stored as rgb texture */
+            *params = MIN2(img->TexFormat->RedBits, img->TexFormat->GreenBits);
+         break;
+      case GL_TEXTURE_LUMINANCE_SIZE:
+         if (img->_BaseFormat != GL_LUMINANCE &&
+             img->_BaseFormat != GL_LUMINANCE_ALPHA)
+            *params = 0;
+         else if (img->TexFormat->LuminanceBits > 0)
+            *params = img->TexFormat->LuminanceBits;
+         else /* luminance probably stored as rgb texture */
+            *params = MIN2(img->TexFormat->RedBits, img->TexFormat->GreenBits);
+         break;
+      case GL_TEXTURE_INDEX_SIZE_EXT:
+         if (img->_BaseFormat == GL_COLOR_INDEX)
+            *params = img->TexFormat->IndexBits;
+         else
+            *params = 0;
+         break;
+      case GL_TEXTURE_DEPTH_SIZE_ARB:
+         if (ctx->Extensions.SGIX_depth_texture ||
+             ctx->Extensions.ARB_depth_texture)
+            *params = img->TexFormat->DepthBits;
+         else
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glGetTexLevelParameter[if]v(pname)");
+         break;
+      case GL_TEXTURE_STENCIL_SIZE_EXT:
+         if (ctx->Extensions.EXT_packed_depth_stencil) {
+            *params = img->TexFormat->StencilBits;
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glGetTexLevelParameter[if]v(pname)");
+         }
+         break;
+
+      /* GL_ARB_texture_compression */
+      case GL_TEXTURE_COMPRESSED_IMAGE_SIZE:
+         if (ctx->Extensions.ARB_texture_compression) {
+            if (img->IsCompressed && !isProxy) {
+               /* Don't use ctx->Driver.CompressedTextureSize() since that
+                * may returned a padded hardware size.
+                */
+               *params = _mesa_compressed_texture_size(ctx, img->Width,
+                                                   img->Height, img->Depth,
+                                                   img->TexFormat->MesaFormat);
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_OPERATION,
+                           "glGetTexLevelParameter[if]v(pname)");
+            }
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glGetTexLevelParameter[if]v(pname)");
+         }
+         break;
+      case GL_TEXTURE_COMPRESSED:
+         if (ctx->Extensions.ARB_texture_compression) {
+            *params = (GLint) img->IsCompressed;
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glGetTexLevelParameter[if]v(pname)");
+         }
+         break;
+
+      /* GL_ARB_texture_float */
+      case GL_TEXTURE_RED_TYPE_ARB:
+         if (ctx->Extensions.ARB_texture_float) {
+            *params = img->TexFormat->RedBits ? img->TexFormat->DataType : GL_NONE;
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glGetTexLevelParameter[if]v(pname)");
+         }
+         break;
+      case GL_TEXTURE_GREEN_TYPE_ARB:
+         if (ctx->Extensions.ARB_texture_float) {
+            *params = img->TexFormat->GreenBits ? img->TexFormat->DataType : GL_NONE;
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glGetTexLevelParameter[if]v(pname)");
+         }
+         break;
+      case GL_TEXTURE_BLUE_TYPE_ARB:
+         if (ctx->Extensions.ARB_texture_float) {
+            *params = img->TexFormat->BlueBits ? img->TexFormat->DataType : GL_NONE;
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glGetTexLevelParameter[if]v(pname)");
+         }
+         break;
+      case GL_TEXTURE_ALPHA_TYPE_ARB:
+         if (ctx->Extensions.ARB_texture_float) {
+            *params = img->TexFormat->AlphaBits ? img->TexFormat->DataType : GL_NONE;
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glGetTexLevelParameter[if]v(pname)");
+         }
+         break;
+      case GL_TEXTURE_LUMINANCE_TYPE_ARB:
+         if (ctx->Extensions.ARB_texture_float) {
+            *params = img->TexFormat->LuminanceBits ? img->TexFormat->DataType : GL_NONE;
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glGetTexLevelParameter[if]v(pname)");
+         }
+         break;
+      case GL_TEXTURE_INTENSITY_TYPE_ARB:
+         if (ctx->Extensions.ARB_texture_float) {
+            *params = img->TexFormat->IntensityBits ? img->TexFormat->DataType : GL_NONE;
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glGetTexLevelParameter[if]v(pname)");
+         }
+         break;
+      case GL_TEXTURE_DEPTH_TYPE_ARB:
+         if (ctx->Extensions.ARB_texture_float) {
+            *params = img->TexFormat->DepthBits ? img->TexFormat->DataType : GL_NONE;
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glGetTexLevelParameter[if]v(pname)");
+         }
+         break;
+
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM,
+                     "glGetTexLevelParameter[if]v(pname)");
+   }
+
+ out:
+   _mesa_unlock_texture(ctx, texObj);
+}
+
+
+
+void GLAPIENTRY
+_mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params )
+{
+   struct gl_texture_unit *texUnit;
+   struct gl_texture_object *obj;
+   GLboolean error = GL_FALSE;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (ctx->Texture.CurrentUnit >= ctx->Const.MaxTextureImageUnits) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glGetTexParameterfv(current unit)");
+      return;
+   }
+
+   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+
+   obj = _mesa_select_tex_object(ctx, texUnit, target);
+   if (!obj) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexParameterfv(target)");
+      return;
+   }
+
+   _mesa_lock_texture(ctx, obj);
+   switch (pname) {
+      case GL_TEXTURE_MAG_FILTER:
+	 *params = ENUM_TO_FLOAT(obj->MagFilter);
+	 break;
+      case GL_TEXTURE_MIN_FILTER:
+         *params = ENUM_TO_FLOAT(obj->MinFilter);
+         break;
+      case GL_TEXTURE_WRAP_S:
+         *params = ENUM_TO_FLOAT(obj->WrapS);
+         break;
+      case GL_TEXTURE_WRAP_T:
+         *params = ENUM_TO_FLOAT(obj->WrapT);
+         break;
+      case GL_TEXTURE_WRAP_R:
+         *params = ENUM_TO_FLOAT(obj->WrapR);
+         break;
+      case GL_TEXTURE_BORDER_COLOR:
+         params[0] = CLAMP(obj->BorderColor[0], 0.0F, 1.0F);
+         params[1] = CLAMP(obj->BorderColor[1], 0.0F, 1.0F);
+         params[2] = CLAMP(obj->BorderColor[2], 0.0F, 1.0F);
+         params[3] = CLAMP(obj->BorderColor[3], 0.0F, 1.0F);
+         break;
+      case GL_TEXTURE_RESIDENT:
+         {
+            GLboolean resident;
+            if (ctx->Driver.IsTextureResident)
+               resident = ctx->Driver.IsTextureResident(ctx, obj);
+            else
+               resident = GL_TRUE;
+            *params = ENUM_TO_FLOAT(resident);
+         }
+         break;
+      case GL_TEXTURE_PRIORITY:
+         *params = obj->Priority;
+         break;
+      case GL_TEXTURE_MIN_LOD:
+         *params = obj->MinLod;
+         break;
+      case GL_TEXTURE_MAX_LOD:
+         *params = obj->MaxLod;
+         break;
+      case GL_TEXTURE_BASE_LEVEL:
+         *params = (GLfloat) obj->BaseLevel;
+         break;
+      case GL_TEXTURE_MAX_LEVEL:
+         *params = (GLfloat) obj->MaxLevel;
+         break;
+      case GL_TEXTURE_MAX_ANISOTROPY_EXT:
+         if (ctx->Extensions.EXT_texture_filter_anisotropic) {
+            *params = obj->MaxAnisotropy;
+         }
+	 else
+	    error = 1;
+         break;
+      case GL_TEXTURE_COMPARE_SGIX:
+         if (ctx->Extensions.SGIX_shadow) {
+            *params = (GLfloat) obj->CompareFlag;
+         }
+	 else 
+	    error = 1;
+         break;
+      case GL_TEXTURE_COMPARE_OPERATOR_SGIX:
+         if (ctx->Extensions.SGIX_shadow) {
+            *params = (GLfloat) obj->CompareOperator;
+         }
+	 else 
+	    error = 1;
+         break;
+      case GL_SHADOW_AMBIENT_SGIX: /* aka GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+         if (ctx->Extensions.SGIX_shadow_ambient) {
+            *params = obj->ShadowAmbient;
+         }
+	 else 
+	    error = 1;
+         break;
+      case GL_GENERATE_MIPMAP_SGIS:
+         if (ctx->Extensions.SGIS_generate_mipmap) {
+            *params = (GLfloat) obj->GenerateMipmap;
+         }
+	 else 
+	    error = 1;
+         break;
+      case GL_TEXTURE_COMPARE_MODE_ARB:
+         if (ctx->Extensions.ARB_shadow) {
+            *params = (GLfloat) obj->CompareMode;
+         }
+	 else 
+	    error = 1;
+         break;
+      case GL_TEXTURE_COMPARE_FUNC_ARB:
+         if (ctx->Extensions.ARB_shadow) {
+            *params = (GLfloat) obj->CompareFunc;
+         }
+	 else 
+	    error = 1;
+         break;
+      case GL_DEPTH_TEXTURE_MODE_ARB:
+         if (ctx->Extensions.ARB_depth_texture) {
+            *params = (GLfloat) obj->DepthMode;
+         }
+	 else 
+	    error = 1;
+         break;
+      case GL_TEXTURE_LOD_BIAS:
+         if (ctx->Extensions.EXT_texture_lod_bias) {
+            *params = obj->LodBias;
+         }
+	 else 
+	    error = 1;
+         break;
+      default:
+	 error = 1;
+	 break;
+   }
+   if (error)
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexParameterfv(pname=0x%x)",
+		  pname);
+
+   _mesa_unlock_texture(ctx, obj);
+}
+
+
+void GLAPIENTRY
+_mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
+{
+   struct gl_texture_unit *texUnit;
+   struct gl_texture_object *obj;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (ctx->Texture.CurrentUnit >= ctx->Const.MaxTextureImageUnits) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glGetTexParameteriv(current unit)");
+      return;
+   }
+
+   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+
+   obj = _mesa_select_tex_object(ctx, texUnit, target);
+   if (!obj) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexParameteriv(target)");
+      return;
+   }
+
+   switch (pname) {
+      case GL_TEXTURE_MAG_FILTER:
+         *params = (GLint) obj->MagFilter;
+         return;
+      case GL_TEXTURE_MIN_FILTER:
+         *params = (GLint) obj->MinFilter;
+         return;
+      case GL_TEXTURE_WRAP_S:
+         *params = (GLint) obj->WrapS;
+         return;
+      case GL_TEXTURE_WRAP_T:
+         *params = (GLint) obj->WrapT;
+         return;
+      case GL_TEXTURE_WRAP_R:
+         *params = (GLint) obj->WrapR;
+         return;
+      case GL_TEXTURE_BORDER_COLOR:
+         {
+            GLfloat b[4];
+            b[0] = CLAMP(obj->BorderColor[0], 0.0F, 1.0F);
+            b[1] = CLAMP(obj->BorderColor[1], 0.0F, 1.0F);
+            b[2] = CLAMP(obj->BorderColor[2], 0.0F, 1.0F);
+            b[3] = CLAMP(obj->BorderColor[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]);
+            params[3] = FLOAT_TO_INT(b[3]);
+         }
+         return;
+      case GL_TEXTURE_RESIDENT:
+         {
+            GLboolean resident;
+            if (ctx->Driver.IsTextureResident)
+               resident = ctx->Driver.IsTextureResident(ctx, obj);
+            else
+               resident = GL_TRUE;
+            *params = (GLint) resident;
+         }
+         return;
+      case GL_TEXTURE_PRIORITY:
+         *params = FLOAT_TO_INT(obj->Priority);
+         return;
+      case GL_TEXTURE_MIN_LOD:
+         *params = (GLint) obj->MinLod;
+         return;
+      case GL_TEXTURE_MAX_LOD:
+         *params = (GLint) obj->MaxLod;
+         return;
+      case GL_TEXTURE_BASE_LEVEL:
+         *params = obj->BaseLevel;
+         return;
+      case GL_TEXTURE_MAX_LEVEL:
+         *params = obj->MaxLevel;
+         return;
+      case GL_TEXTURE_MAX_ANISOTROPY_EXT:
+         if (ctx->Extensions.EXT_texture_filter_anisotropic) {
+            *params = (GLint) obj->MaxAnisotropy;
+            return;
+         }
+         break;
+      case GL_TEXTURE_COMPARE_SGIX:
+         if (ctx->Extensions.SGIX_shadow) {
+            *params = (GLint) obj->CompareFlag;
+            return;
+         }
+         break;
+      case GL_TEXTURE_COMPARE_OPERATOR_SGIX:
+         if (ctx->Extensions.SGIX_shadow) {
+            *params = (GLint) obj->CompareOperator;
+            return;
+         }
+         break;
+      case GL_SHADOW_AMBIENT_SGIX: /* aka GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+         if (ctx->Extensions.SGIX_shadow_ambient) {
+            *params = (GLint) FLOAT_TO_INT(obj->ShadowAmbient);
+            return;
+         }
+         break;
+      case GL_GENERATE_MIPMAP_SGIS:
+         if (ctx->Extensions.SGIS_generate_mipmap) {
+            *params = (GLint) obj->GenerateMipmap;
+            return;
+         }
+         break;
+      case GL_TEXTURE_COMPARE_MODE_ARB:
+         if (ctx->Extensions.ARB_shadow) {
+            *params = (GLint) obj->CompareMode;
+            return;
+         }
+         break;
+      case GL_TEXTURE_COMPARE_FUNC_ARB:
+         if (ctx->Extensions.ARB_shadow) {
+            *params = (GLint) obj->CompareFunc;
+            return;
+         }
+         break;
+      case GL_DEPTH_TEXTURE_MODE_ARB:
+         if (ctx->Extensions.ARB_depth_texture) {
+            *params = (GLint) obj->DepthMode;
+            return;
+         }
+         break;
+      case GL_TEXTURE_LOD_BIAS:
+         if (ctx->Extensions.EXT_texture_lod_bias) {
+            *params = (GLint) obj->LodBias;
+            return;
+         }
+         break;
+      default:
+         ; /* silence warnings */
+   }
+   /* If we get here, pname was an unrecognized enum */
+   _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexParameteriv(pname=0x%x)", pname);
+}
diff --git a/src/mesa/main/texparam.h b/src/mesa/main/texparam.h
new file mode 100644
index 0000000000..454b96350e
--- /dev/null
+++ b/src/mesa/main/texparam.h
@@ -0,0 +1,63 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.1
+ *
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef TEXPARAM_H
+#define TEXPARAM_H
+
+
+#include "main/glheader.h"
+
+
+extern void GLAPIENTRY
+_mesa_GetTexLevelParameterfv( GLenum target, GLint level,
+                              GLenum pname, GLfloat *params );
+
+extern void GLAPIENTRY
+_mesa_GetTexLevelParameteriv( GLenum target, GLint level,
+                              GLenum pname, GLint *params );
+
+extern void GLAPIENTRY
+_mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params );
+
+extern void GLAPIENTRY
+_mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params );
+
+
+
+extern void GLAPIENTRY
+_mesa_TexParameterfv( GLenum target, GLenum pname, const GLfloat *params );
+
+extern void GLAPIENTRY
+_mesa_TexParameterf( GLenum target, GLenum pname, GLfloat param );
+
+
+extern void GLAPIENTRY
+_mesa_TexParameteri( GLenum target, GLenum pname, GLint param );
+
+extern void GLAPIENTRY
+_mesa_TexParameteriv( GLenum target, GLenum pname, const GLint *params );
+
+
+#endif /* TEXPARAM_H */
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 448fc53912..dbd769d740 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -321,1005 +321,6 @@ calculate_derived_texenv( struct gl_tex_env_combine_state *state,
 }
 
 
-/**********************************************************************/
-/*                       Texture Parameters                           */
-/**********************************************************************/
-
-/**
- * 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(GLcontext * ctx, GLenum target, GLenum wrap)
-{
-   const struct gl_extensions * const e = & ctx->Extensions;
-
-   if (wrap == GL_CLAMP || wrap == GL_CLAMP_TO_EDGE ||
-       (wrap == GL_CLAMP_TO_BORDER && e->ARB_texture_border_clamp)) {
-      /* any texture target */
-      return GL_TRUE;
-   }
-   else if (target != GL_TEXTURE_RECTANGLE_NV &&
-	    (wrap == GL_REPEAT ||
-	     (wrap == GL_MIRRORED_REPEAT &&
-	      e->ARB_texture_mirrored_repeat) ||
-	     (wrap == GL_MIRROR_CLAMP_EXT &&
-	      (e->ATI_texture_mirror_once || e->EXT_texture_mirror_clamp)) ||
-	     (wrap == GL_MIRROR_CLAMP_TO_EDGE_EXT &&
-	      (e->ATI_texture_mirror_once || e->EXT_texture_mirror_clamp)) ||
-	     (wrap == GL_MIRROR_CLAMP_TO_BORDER_EXT &&
-	      (e->EXT_texture_mirror_clamp)))) {
-      /* non-rectangle texture */
-      return GL_TRUE;
-   }
-
-   _mesa_error( ctx, GL_INVALID_VALUE, "glTexParameter(param)" );
-   return GL_FALSE;
-}
-
-
-void GLAPIENTRY
-_mesa_TexParameterf( GLenum target, GLenum pname, GLfloat param )
-{
-   _mesa_TexParameterfv(target, pname, &param);
-}
-
-
-void GLAPIENTRY
-_mesa_TexParameterfv( GLenum target, GLenum pname, const GLfloat *params )
-{
-   const GLenum eparam = (GLenum) (GLint) params[0];
-   struct gl_texture_unit *texUnit;
-   struct gl_texture_object *texObj;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (MESA_VERBOSE&(VERBOSE_API|VERBOSE_TEXTURE))
-      _mesa_debug(ctx, "glTexParameter %s %s %.1f(%s)...\n",
-                  _mesa_lookup_enum_by_nr(target),
-                  _mesa_lookup_enum_by_nr(pname),
-                  *params,
-		  _mesa_lookup_enum_by_nr(eparam));
-
-   if (ctx->Texture.CurrentUnit >= ctx->Const.MaxTextureImageUnits) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glTexParameterfv(current unit)");
-      return;
-   }
-
-   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
-
-   switch (target) {
-      case GL_TEXTURE_1D:
-         texObj = texUnit->Current1D;
-         break;
-      case GL_TEXTURE_2D:
-         texObj = texUnit->Current2D;
-         break;
-      case GL_TEXTURE_3D:
-         texObj = texUnit->Current3D;
-         break;
-      case GL_TEXTURE_CUBE_MAP:
-         if (!ctx->Extensions.ARB_texture_cube_map) {
-            _mesa_error( ctx, GL_INVALID_ENUM, "glTexParameter(target)" );
-            return;
-         }
-         texObj = texUnit->CurrentCubeMap;
-         break;
-      case GL_TEXTURE_RECTANGLE_NV:
-         if (!ctx->Extensions.NV_texture_rectangle) {
-            _mesa_error( ctx, GL_INVALID_ENUM, "glTexParameter(target)" );
-            return;
-         }
-         texObj = texUnit->CurrentRect;
-         break;
-      case GL_TEXTURE_1D_ARRAY_EXT:
-         if (!ctx->Extensions.MESA_texture_array) {
-            _mesa_error( ctx, GL_INVALID_ENUM, "glTexParameter(target)" );
-            return;
-         }
-         texObj = texUnit->Current1DArray;
-         break;
-      case GL_TEXTURE_2D_ARRAY_EXT:
-         if (!ctx->Extensions.MESA_texture_array) {
-            _mesa_error( ctx, GL_INVALID_ENUM, "glTexParameter(target)" );
-            return;
-         }
-         texObj = texUnit->Current2DArray;
-         break;
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glTexParameter(target)" );
-         return;
-   }
-
-   switch (pname) {
-      case GL_TEXTURE_MIN_FILTER:
-         /* A small optimization */
-         if (texObj->MinFilter == eparam)
-            return;
-         if (eparam==GL_NEAREST || eparam==GL_LINEAR) {
-            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-            texObj->MinFilter = eparam;
-         }
-         else if ((eparam==GL_NEAREST_MIPMAP_NEAREST ||
-                   eparam==GL_LINEAR_MIPMAP_NEAREST ||
-                   eparam==GL_NEAREST_MIPMAP_LINEAR ||
-                   eparam==GL_LINEAR_MIPMAP_LINEAR) &&
-                  texObj->Target != GL_TEXTURE_RECTANGLE_NV) {
-            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-            texObj->MinFilter = eparam;
-         }
-         else {
-            _mesa_error( ctx, GL_INVALID_VALUE, "glTexParameter(param)" );
-            return;
-         }
-         break;
-      case GL_TEXTURE_MAG_FILTER:
-         /* A small optimization */
-         if (texObj->MagFilter == eparam)
-            return;
-
-         if (eparam==GL_NEAREST || eparam==GL_LINEAR) {
-            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-            texObj->MagFilter = eparam;
-         }
-         else {
-            _mesa_error( ctx, GL_INVALID_VALUE, "glTexParameter(param)" );
-            return;
-         }
-         break;
-      case GL_TEXTURE_WRAP_S:
-         if (texObj->WrapS == eparam)
-            return;
-         if (validate_texture_wrap_mode(ctx, texObj->Target, eparam)) {
-            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-            texObj->WrapS = eparam;
-         }
-         else {
-            return;
-         }
-         break;
-      case GL_TEXTURE_WRAP_T:
-         if (texObj->WrapT == eparam)
-            return;
-         if (validate_texture_wrap_mode(ctx, texObj->Target, eparam)) {
-            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-            texObj->WrapT = eparam;
-         }
-         else {
-            return;
-         }
-         break;
-      case GL_TEXTURE_WRAP_R:
-         if (texObj->WrapR == eparam)
-            return;
-         if (validate_texture_wrap_mode(ctx, texObj->Target, eparam)) {
-            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-            texObj->WrapR = eparam;
-         }
-         else {
-	    return;
-         }
-         break;
-      case GL_TEXTURE_BORDER_COLOR:
-         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-         texObj->BorderColor[RCOMP] = params[0];
-         texObj->BorderColor[GCOMP] = params[1];
-         texObj->BorderColor[BCOMP] = params[2];
-         texObj->BorderColor[ACOMP] = params[3];
-         UNCLAMPED_FLOAT_TO_CHAN(texObj->_BorderChan[RCOMP], params[0]);
-         UNCLAMPED_FLOAT_TO_CHAN(texObj->_BorderChan[GCOMP], params[1]);
-         UNCLAMPED_FLOAT_TO_CHAN(texObj->_BorderChan[BCOMP], params[2]);
-         UNCLAMPED_FLOAT_TO_CHAN(texObj->_BorderChan[ACOMP], params[3]);
-         break;
-      case GL_TEXTURE_MIN_LOD:
-         if (texObj->MinLod == params[0])
-            return;
-         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-         texObj->MinLod = params[0];
-         break;
-      case GL_TEXTURE_MAX_LOD:
-         if (texObj->MaxLod == params[0])
-            return;
-         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-         texObj->MaxLod = params[0];
-         break;
-      case GL_TEXTURE_BASE_LEVEL:
-         if (params[0] < 0.0) {
-            _mesa_error(ctx, GL_INVALID_VALUE, "glTexParameter(param)");
-            return;
-         }
-         if (target == GL_TEXTURE_RECTANGLE_ARB && params[0] != 0.0) {
-            _mesa_error(ctx, GL_INVALID_VALUE, "glTexParameter(param)");
-            return;
-         }
-         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-         texObj->BaseLevel = (GLint) params[0];
-         break;
-      case GL_TEXTURE_MAX_LEVEL:
-         if (params[0] < 0.0) {
-            _mesa_error(ctx, GL_INVALID_VALUE, "glTexParameter(param)");
-            return;
-         }
-         if (target == GL_TEXTURE_RECTANGLE_ARB) {
-            _mesa_error(ctx, GL_INVALID_OPERATION, "glTexParameter(param)");
-            return;
-         }
-         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-         texObj->MaxLevel = (GLint) params[0];
-         break;
-      case GL_TEXTURE_PRIORITY:
-         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-         texObj->Priority = CLAMP( params[0], 0.0F, 1.0F );
-         break;
-      case GL_TEXTURE_MAX_ANISOTROPY_EXT:
-         if (ctx->Extensions.EXT_texture_filter_anisotropic) {
-	    if (params[0] < 1.0) {
-	       _mesa_error(ctx, GL_INVALID_VALUE, "glTexParameter(param)" );
-	       return;
-	    }
-            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-            /* clamp to max, that's what NVIDIA does */
-            texObj->MaxAnisotropy = MIN2(params[0],
-                                         ctx->Const.MaxTextureMaxAnisotropy);
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glTexParameter(pname=GL_TEXTURE_MAX_ANISOTROPY_EXT)");
-            return;
-         }
-         break;
-      case GL_TEXTURE_COMPARE_SGIX:
-         if (ctx->Extensions.SGIX_shadow) {
-            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-            texObj->CompareFlag = params[0] ? GL_TRUE : GL_FALSE;
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glTexParameter(pname=GL_TEXTURE_COMPARE_SGIX)");
-            return;
-         }
-         break;
-      case GL_TEXTURE_COMPARE_OPERATOR_SGIX:
-         if (ctx->Extensions.SGIX_shadow) {
-            GLenum op = (GLenum) params[0];
-            if (op == GL_TEXTURE_LEQUAL_R_SGIX ||
-                op == GL_TEXTURE_GEQUAL_R_SGIX) {
-               FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-               texObj->CompareOperator = op;
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(param)");
-            }
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                    "glTexParameter(pname=GL_TEXTURE_COMPARE_OPERATOR_SGIX)");
-            return;
-         }
-         break;
-      case GL_SHADOW_AMBIENT_SGIX: /* aka GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
-         if (ctx->Extensions.SGIX_shadow_ambient) {
-            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-            texObj->ShadowAmbient = CLAMP(params[0], 0.0F, 1.0F);
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glTexParameter(pname=GL_SHADOW_AMBIENT_SGIX)");
-            return;
-         }
-         break;
-      case GL_GENERATE_MIPMAP_SGIS:
-         if (ctx->Extensions.SGIS_generate_mipmap) {
-            texObj->GenerateMipmap = params[0] ? GL_TRUE : GL_FALSE;
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glTexParameter(pname=GL_GENERATE_MIPMAP_SGIS)");
-            return;
-         }
-         break;
-      case GL_TEXTURE_COMPARE_MODE_ARB:
-         if (ctx->Extensions.ARB_shadow) {
-            const GLenum mode = (GLenum) params[0];
-            if (mode == GL_NONE || mode == GL_COMPARE_R_TO_TEXTURE_ARB) {
-               FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-               texObj->CompareMode = mode;
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM,
-                           "glTexParameter(bad GL_TEXTURE_COMPARE_MODE_ARB: 0x%x)", mode);
-               return;
-            }
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glTexParameter(pname=GL_TEXTURE_COMPARE_MODE_ARB)");
-            return;
-         }
-         break;
-      case GL_TEXTURE_COMPARE_FUNC_ARB:
-         if (ctx->Extensions.ARB_shadow) {
-            const GLenum func = (GLenum) params[0];
-            if (func == GL_LEQUAL || func == GL_GEQUAL) {
-               FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-               texObj->CompareFunc = func;
-            }
-            else if (ctx->Extensions.EXT_shadow_funcs &&
-                     (func == GL_EQUAL ||
-                      func == GL_NOTEQUAL ||
-                      func == GL_LESS ||
-                      func == GL_GREATER ||
-                      func == GL_ALWAYS ||
-                      func == GL_NEVER)) {
-               FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-               texObj->CompareFunc = func;
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM,
-                           "glTexParameter(bad GL_TEXTURE_COMPARE_FUNC_ARB)");
-               return;
-            }
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glTexParameter(pname=GL_TEXTURE_COMPARE_FUNC_ARB)");
-            return;
-         }
-         break;
-      case GL_DEPTH_TEXTURE_MODE_ARB:
-         if (ctx->Extensions.ARB_depth_texture) {
-            const GLenum result = (GLenum) params[0];
-            if (result == GL_LUMINANCE || result == GL_INTENSITY
-                || result == GL_ALPHA) {
-               FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-               texObj->DepthMode = result;
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM,
-                          "glTexParameter(bad GL_DEPTH_TEXTURE_MODE_ARB)");
-               return;
-            }
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glTexParameter(pname=GL_DEPTH_TEXTURE_MODE_ARB)");
-            return;
-         }
-         break;
-      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]) {
-               FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-               texObj->LodBias = params[0];
-            }
-         }
-         break;
-
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM,
-                     "glTexParameter(pname=0x%x)", pname);
-         return;
-   }
-
-   texObj->_Complete = GL_FALSE;
-
-   if (ctx->Driver.TexParameter) {
-      (*ctx->Driver.TexParameter)( ctx, target, texObj, pname, params );
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_TexParameteri( GLenum target, GLenum pname, GLint param )
-{
-   GLfloat fparam[4];
-   if (pname == GL_TEXTURE_PRIORITY)
-      fparam[0] = INT_TO_FLOAT(param);
-   else
-      fparam[0] = (GLfloat) param;
-   fparam[1] = fparam[2] = fparam[3] = 0.0;
-   _mesa_TexParameterfv(target, pname, fparam);
-}
-
-
-void GLAPIENTRY
-_mesa_TexParameteriv( GLenum target, GLenum pname, const GLint *params )
-{
-   GLfloat fparam[4];
-   if (pname == GL_TEXTURE_BORDER_COLOR) {
-      fparam[0] = INT_TO_FLOAT(params[0]);
-      fparam[1] = INT_TO_FLOAT(params[1]);
-      fparam[2] = INT_TO_FLOAT(params[2]);
-      fparam[3] = INT_TO_FLOAT(params[3]);
-   }
-   else {
-      if (pname == GL_TEXTURE_PRIORITY)
-         fparam[0] = INT_TO_FLOAT(params[0]);
-      else
-         fparam[0] = (GLfloat) params[0];
-      fparam[1] = fparam[2] = fparam[3] = 0.0F;
-   }
-   _mesa_TexParameterfv(target, pname, fparam);
-}
-
-
-void GLAPIENTRY
-_mesa_GetTexLevelParameterfv( GLenum target, GLint level,
-                              GLenum pname, GLfloat *params )
-{
-   GLint iparam;
-   _mesa_GetTexLevelParameteriv( target, level, pname, &iparam );
-   *params = (GLfloat) iparam;
-}
-
-
-static GLuint
-tex_image_dimensions(GLcontext *ctx, GLenum target)
-{
-   switch (target) {
-      case GL_TEXTURE_1D:
-      case GL_PROXY_TEXTURE_1D:
-         return 1;
-      case GL_TEXTURE_2D:
-      case GL_PROXY_TEXTURE_2D:
-         return 2;
-      case GL_TEXTURE_3D:
-      case GL_PROXY_TEXTURE_3D:
-         return 3;
-      case GL_TEXTURE_CUBE_MAP:
-      case GL_PROXY_TEXTURE_CUBE_MAP:
-      case GL_TEXTURE_CUBE_MAP_POSITIVE_X:
-      case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:
-      case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:
-      case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:
-      case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:
-      case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
-         return ctx->Extensions.ARB_texture_cube_map ? 2 : 0;
-      case GL_TEXTURE_RECTANGLE_NV:
-      case GL_PROXY_TEXTURE_RECTANGLE_NV:
-         return ctx->Extensions.NV_texture_rectangle ? 2 : 0;
-      case GL_TEXTURE_1D_ARRAY_EXT:
-      case GL_PROXY_TEXTURE_1D_ARRAY_EXT:
-         return ctx->Extensions.MESA_texture_array ? 2 : 0;
-      case GL_TEXTURE_2D_ARRAY_EXT:
-      case GL_PROXY_TEXTURE_2D_ARRAY_EXT:
-         return ctx->Extensions.MESA_texture_array ? 3 : 0;
-      default:
-         _mesa_problem(ctx, "bad target in _mesa_tex_target_dimensions()");
-         return 0;
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_GetTexLevelParameteriv( GLenum target, GLint level,
-                              GLenum pname, GLint *params )
-{
-   const struct gl_texture_unit *texUnit;
-   struct gl_texture_object *texObj;
-   const struct gl_texture_image *img = NULL;
-   GLuint dimensions;
-   GLboolean isProxy;
-   GLint maxLevels;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (ctx->Texture.CurrentUnit >= ctx->Const.MaxTextureImageUnits) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glGetTexLevelParameteriv(current unit)");
-      return;
-   }
-
-   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
-
-   /* this will catch bad target values */
-   dimensions = tex_image_dimensions(ctx, target);  /* 1, 2 or 3 */
-   if (dimensions == 0) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexLevelParameter[if]v(target)");
-      return;
-   }
-
-   maxLevels = _mesa_max_texture_levels(ctx, target);
-   if (maxLevels == 0) {
-      /* should not happen since <target> was just checked above */
-      _mesa_problem(ctx, "maxLevels=0 in _mesa_GetTexLevelParameter");
-      return;
-   }
-
-   if (level < 0 || level >= maxLevels) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glGetTexLevelParameter[if]v" );
-      return;
-   }
-
-   texObj = _mesa_select_tex_object(ctx, texUnit, target);
-   _mesa_lock_texture(ctx, texObj);
-
-   img = _mesa_select_tex_image(ctx, texObj, target, level);
-   if (!img || !img->TexFormat) {
-      /* undefined texture image */
-      if (pname == GL_TEXTURE_COMPONENTS)
-         *params = 1;
-      else
-         *params = 0;
-      goto out;
-   }
-
-   isProxy = _mesa_is_proxy_texture(target);
-
-   switch (pname) {
-      case GL_TEXTURE_WIDTH:
-         *params = img->Width;
-         break;
-      case GL_TEXTURE_HEIGHT:
-         *params = img->Height;
-         break;
-      case GL_TEXTURE_DEPTH:
-         *params = img->Depth;
-         break;
-      case GL_TEXTURE_INTERNAL_FORMAT:
-         *params = img->InternalFormat;
-         break;
-      case GL_TEXTURE_BORDER:
-         *params = img->Border;
-         break;
-      case GL_TEXTURE_RED_SIZE:
-         if (img->_BaseFormat == GL_RGB || img->_BaseFormat == GL_RGBA)
-            *params = img->TexFormat->RedBits;
-         else
-            *params = 0;
-         break;
-      case GL_TEXTURE_GREEN_SIZE:
-         if (img->_BaseFormat == GL_RGB || img->_BaseFormat == GL_RGBA)
-            *params = img->TexFormat->GreenBits;
-         else
-            *params = 0;
-         break;
-      case GL_TEXTURE_BLUE_SIZE:
-         if (img->_BaseFormat == GL_RGB || img->_BaseFormat == GL_RGBA)
-            *params = img->TexFormat->BlueBits;
-         else
-            *params = 0;
-         break;
-      case GL_TEXTURE_ALPHA_SIZE:
-         if (img->_BaseFormat == GL_ALPHA ||
-             img->_BaseFormat == GL_LUMINANCE_ALPHA ||
-             img->_BaseFormat == GL_RGBA)
-            *params = img->TexFormat->AlphaBits;
-         else
-            *params = 0;
-         break;
-      case GL_TEXTURE_INTENSITY_SIZE:
-         if (img->_BaseFormat != GL_INTENSITY)
-            *params = 0;
-         else if (img->TexFormat->IntensityBits > 0)
-            *params = img->TexFormat->IntensityBits;
-         else /* intensity probably stored as rgb texture */
-            *params = MIN2(img->TexFormat->RedBits, img->TexFormat->GreenBits);
-         break;
-      case GL_TEXTURE_LUMINANCE_SIZE:
-         if (img->_BaseFormat != GL_LUMINANCE &&
-             img->_BaseFormat != GL_LUMINANCE_ALPHA)
-            *params = 0;
-         else if (img->TexFormat->LuminanceBits > 0)
-            *params = img->TexFormat->LuminanceBits;
-         else /* luminance probably stored as rgb texture */
-            *params = MIN2(img->TexFormat->RedBits, img->TexFormat->GreenBits);
-         break;
-      case GL_TEXTURE_INDEX_SIZE_EXT:
-         if (img->_BaseFormat == GL_COLOR_INDEX)
-            *params = img->TexFormat->IndexBits;
-         else
-            *params = 0;
-         break;
-      case GL_TEXTURE_DEPTH_SIZE_ARB:
-         if (ctx->Extensions.SGIX_depth_texture ||
-             ctx->Extensions.ARB_depth_texture)
-            *params = img->TexFormat->DepthBits;
-         else
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glGetTexLevelParameter[if]v(pname)");
-         break;
-      case GL_TEXTURE_STENCIL_SIZE_EXT:
-         if (ctx->Extensions.EXT_packed_depth_stencil) {
-            *params = img->TexFormat->StencilBits;
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glGetTexLevelParameter[if]v(pname)");
-         }
-         break;
-
-      /* GL_ARB_texture_compression */
-      case GL_TEXTURE_COMPRESSED_IMAGE_SIZE:
-         if (ctx->Extensions.ARB_texture_compression) {
-            if (img->IsCompressed && !isProxy) {
-               /* Don't use ctx->Driver.CompressedTextureSize() since that
-                * may returned a padded hardware size.
-                */
-               *params = _mesa_compressed_texture_size(ctx, img->Width,
-                                                   img->Height, img->Depth,
-                                                   img->TexFormat->MesaFormat);
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_OPERATION,
-                           "glGetTexLevelParameter[if]v(pname)");
-            }
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glGetTexLevelParameter[if]v(pname)");
-         }
-         break;
-      case GL_TEXTURE_COMPRESSED:
-         if (ctx->Extensions.ARB_texture_compression) {
-            *params = (GLint) img->IsCompressed;
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glGetTexLevelParameter[if]v(pname)");
-         }
-         break;
-
-      /* GL_ARB_texture_float */
-      case GL_TEXTURE_RED_TYPE_ARB:
-         if (ctx->Extensions.ARB_texture_float) {
-            *params = img->TexFormat->RedBits ? img->TexFormat->DataType : GL_NONE;
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glGetTexLevelParameter[if]v(pname)");
-         }
-         break;
-      case GL_TEXTURE_GREEN_TYPE_ARB:
-         if (ctx->Extensions.ARB_texture_float) {
-            *params = img->TexFormat->GreenBits ? img->TexFormat->DataType : GL_NONE;
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glGetTexLevelParameter[if]v(pname)");
-         }
-         break;
-      case GL_TEXTURE_BLUE_TYPE_ARB:
-         if (ctx->Extensions.ARB_texture_float) {
-            *params = img->TexFormat->BlueBits ? img->TexFormat->DataType : GL_NONE;
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glGetTexLevelParameter[if]v(pname)");
-         }
-         break;
-      case GL_TEXTURE_ALPHA_TYPE_ARB:
-         if (ctx->Extensions.ARB_texture_float) {
-            *params = img->TexFormat->AlphaBits ? img->TexFormat->DataType : GL_NONE;
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glGetTexLevelParameter[if]v(pname)");
-         }
-         break;
-      case GL_TEXTURE_LUMINANCE_TYPE_ARB:
-         if (ctx->Extensions.ARB_texture_float) {
-            *params = img->TexFormat->LuminanceBits ? img->TexFormat->DataType : GL_NONE;
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glGetTexLevelParameter[if]v(pname)");
-         }
-         break;
-      case GL_TEXTURE_INTENSITY_TYPE_ARB:
-         if (ctx->Extensions.ARB_texture_float) {
-            *params = img->TexFormat->IntensityBits ? img->TexFormat->DataType : GL_NONE;
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glGetTexLevelParameter[if]v(pname)");
-         }
-         break;
-      case GL_TEXTURE_DEPTH_TYPE_ARB:
-         if (ctx->Extensions.ARB_texture_float) {
-            *params = img->TexFormat->DepthBits ? img->TexFormat->DataType : GL_NONE;
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glGetTexLevelParameter[if]v(pname)");
-         }
-         break;
-
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM,
-                     "glGetTexLevelParameter[if]v(pname)");
-   }
-
- out:
-   _mesa_unlock_texture(ctx, texObj);
-}
-
-
-
-void GLAPIENTRY
-_mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params )
-{
-   struct gl_texture_unit *texUnit;
-   struct gl_texture_object *obj;
-   GLboolean error = GL_FALSE;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (ctx->Texture.CurrentUnit >= ctx->Const.MaxTextureImageUnits) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glGetTexParameterfv(current unit)");
-      return;
-   }
-
-   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
-
-   obj = _mesa_select_tex_object(ctx, texUnit, target);
-   if (!obj) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexParameterfv(target)");
-      return;
-   }
-
-   _mesa_lock_texture(ctx, obj);
-   switch (pname) {
-      case GL_TEXTURE_MAG_FILTER:
-	 *params = ENUM_TO_FLOAT(obj->MagFilter);
-	 break;
-      case GL_TEXTURE_MIN_FILTER:
-         *params = ENUM_TO_FLOAT(obj->MinFilter);
-         break;
-      case GL_TEXTURE_WRAP_S:
-         *params = ENUM_TO_FLOAT(obj->WrapS);
-         break;
-      case GL_TEXTURE_WRAP_T:
-         *params = ENUM_TO_FLOAT(obj->WrapT);
-         break;
-      case GL_TEXTURE_WRAP_R:
-         *params = ENUM_TO_FLOAT(obj->WrapR);
-         break;
-      case GL_TEXTURE_BORDER_COLOR:
-         params[0] = CLAMP(obj->BorderColor[0], 0.0F, 1.0F);
-         params[1] = CLAMP(obj->BorderColor[1], 0.0F, 1.0F);
-         params[2] = CLAMP(obj->BorderColor[2], 0.0F, 1.0F);
-         params[3] = CLAMP(obj->BorderColor[3], 0.0F, 1.0F);
-         break;
-      case GL_TEXTURE_RESIDENT:
-         {
-            GLboolean resident;
-            if (ctx->Driver.IsTextureResident)
-               resident = ctx->Driver.IsTextureResident(ctx, obj);
-            else
-               resident = GL_TRUE;
-            *params = ENUM_TO_FLOAT(resident);
-         }
-         break;
-      case GL_TEXTURE_PRIORITY:
-         *params = obj->Priority;
-         break;
-      case GL_TEXTURE_MIN_LOD:
-         *params = obj->MinLod;
-         break;
-      case GL_TEXTURE_MAX_LOD:
-         *params = obj->MaxLod;
-         break;
-      case GL_TEXTURE_BASE_LEVEL:
-         *params = (GLfloat) obj->BaseLevel;
-         break;
-      case GL_TEXTURE_MAX_LEVEL:
-         *params = (GLfloat) obj->MaxLevel;
-         break;
-      case GL_TEXTURE_MAX_ANISOTROPY_EXT:
-         if (ctx->Extensions.EXT_texture_filter_anisotropic) {
-            *params = obj->MaxAnisotropy;
-         }
-	 else
-	    error = 1;
-         break;
-      case GL_TEXTURE_COMPARE_SGIX:
-         if (ctx->Extensions.SGIX_shadow) {
-            *params = (GLfloat) obj->CompareFlag;
-         }
-	 else 
-	    error = 1;
-         break;
-      case GL_TEXTURE_COMPARE_OPERATOR_SGIX:
-         if (ctx->Extensions.SGIX_shadow) {
-            *params = (GLfloat) obj->CompareOperator;
-         }
-	 else 
-	    error = 1;
-         break;
-      case GL_SHADOW_AMBIENT_SGIX: /* aka GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
-         if (ctx->Extensions.SGIX_shadow_ambient) {
-            *params = obj->ShadowAmbient;
-         }
-	 else 
-	    error = 1;
-         break;
-      case GL_GENERATE_MIPMAP_SGIS:
-         if (ctx->Extensions.SGIS_generate_mipmap) {
-            *params = (GLfloat) obj->GenerateMipmap;
-         }
-	 else 
-	    error = 1;
-         break;
-      case GL_TEXTURE_COMPARE_MODE_ARB:
-         if (ctx->Extensions.ARB_shadow) {
-            *params = (GLfloat) obj->CompareMode;
-         }
-	 else 
-	    error = 1;
-         break;
-      case GL_TEXTURE_COMPARE_FUNC_ARB:
-         if (ctx->Extensions.ARB_shadow) {
-            *params = (GLfloat) obj->CompareFunc;
-         }
-	 else 
-	    error = 1;
-         break;
-      case GL_DEPTH_TEXTURE_MODE_ARB:
-         if (ctx->Extensions.ARB_depth_texture) {
-            *params = (GLfloat) obj->DepthMode;
-         }
-	 else 
-	    error = 1;
-         break;
-      case GL_TEXTURE_LOD_BIAS:
-         if (ctx->Extensions.EXT_texture_lod_bias) {
-            *params = obj->LodBias;
-         }
-	 else 
-	    error = 1;
-         break;
-      default:
-	 error = 1;
-	 break;
-   }
-   if (error)
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexParameterfv(pname=0x%x)",
-		  pname);
-
-   _mesa_unlock_texture(ctx, obj);
-}
-
-
-void GLAPIENTRY
-_mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
-{
-   struct gl_texture_unit *texUnit;
-   struct gl_texture_object *obj;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (ctx->Texture.CurrentUnit >= ctx->Const.MaxTextureImageUnits) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glGetTexParameteriv(current unit)");
-      return;
-   }
-
-   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
-
-   obj = _mesa_select_tex_object(ctx, texUnit, target);
-   if (!obj) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexParameteriv(target)");
-      return;
-   }
-
-   switch (pname) {
-      case GL_TEXTURE_MAG_FILTER:
-         *params = (GLint) obj->MagFilter;
-         return;
-      case GL_TEXTURE_MIN_FILTER:
-         *params = (GLint) obj->MinFilter;
-         return;
-      case GL_TEXTURE_WRAP_S:
-         *params = (GLint) obj->WrapS;
-         return;
-      case GL_TEXTURE_WRAP_T:
-         *params = (GLint) obj->WrapT;
-         return;
-      case GL_TEXTURE_WRAP_R:
-         *params = (GLint) obj->WrapR;
-         return;
-      case GL_TEXTURE_BORDER_COLOR:
-         {
-            GLfloat b[4];
-            b[0] = CLAMP(obj->BorderColor[0], 0.0F, 1.0F);
-            b[1] = CLAMP(obj->BorderColor[1], 0.0F, 1.0F);
-            b[2] = CLAMP(obj->BorderColor[2], 0.0F, 1.0F);
-            b[3] = CLAMP(obj->BorderColor[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]);
-            params[3] = FLOAT_TO_INT(b[3]);
-         }
-         return;
-      case GL_TEXTURE_RESIDENT:
-         {
-            GLboolean resident;
-            if (ctx->Driver.IsTextureResident)
-               resident = ctx->Driver.IsTextureResident(ctx, obj);
-            else
-               resident = GL_TRUE;
-            *params = (GLint) resident;
-         }
-         return;
-      case GL_TEXTURE_PRIORITY:
-         *params = FLOAT_TO_INT(obj->Priority);
-         return;
-      case GL_TEXTURE_MIN_LOD:
-         *params = (GLint) obj->MinLod;
-         return;
-      case GL_TEXTURE_MAX_LOD:
-         *params = (GLint) obj->MaxLod;
-         return;
-      case GL_TEXTURE_BASE_LEVEL:
-         *params = obj->BaseLevel;
-         return;
-      case GL_TEXTURE_MAX_LEVEL:
-         *params = obj->MaxLevel;
-         return;
-      case GL_TEXTURE_MAX_ANISOTROPY_EXT:
-         if (ctx->Extensions.EXT_texture_filter_anisotropic) {
-            *params = (GLint) obj->MaxAnisotropy;
-            return;
-         }
-         break;
-      case GL_TEXTURE_COMPARE_SGIX:
-         if (ctx->Extensions.SGIX_shadow) {
-            *params = (GLint) obj->CompareFlag;
-            return;
-         }
-         break;
-      case GL_TEXTURE_COMPARE_OPERATOR_SGIX:
-         if (ctx->Extensions.SGIX_shadow) {
-            *params = (GLint) obj->CompareOperator;
-            return;
-         }
-         break;
-      case GL_SHADOW_AMBIENT_SGIX: /* aka GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
-         if (ctx->Extensions.SGIX_shadow_ambient) {
-            *params = (GLint) FLOAT_TO_INT(obj->ShadowAmbient);
-            return;
-         }
-         break;
-      case GL_GENERATE_MIPMAP_SGIS:
-         if (ctx->Extensions.SGIS_generate_mipmap) {
-            *params = (GLint) obj->GenerateMipmap;
-            return;
-         }
-         break;
-      case GL_TEXTURE_COMPARE_MODE_ARB:
-         if (ctx->Extensions.ARB_shadow) {
-            *params = (GLint) obj->CompareMode;
-            return;
-         }
-         break;
-      case GL_TEXTURE_COMPARE_FUNC_ARB:
-         if (ctx->Extensions.ARB_shadow) {
-            *params = (GLint) obj->CompareFunc;
-            return;
-         }
-         break;
-      case GL_DEPTH_TEXTURE_MODE_ARB:
-         if (ctx->Extensions.ARB_depth_texture) {
-            *params = (GLint) obj->DepthMode;
-            return;
-         }
-         break;
-      case GL_TEXTURE_LOD_BIAS:
-         if (ctx->Extensions.EXT_texture_lod_bias) {
-            *params = (GLint) obj->LodBias;
-            return;
-         }
-         break;
-      default:
-         ; /* silence warnings */
-   }
-   /* If we get here, pname was an unrecognized enum */
-   _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexParameteriv(pname=0x%x)", pname);
-}
-
 
 
 /* GL_ARB_multitexture */
diff --git a/src/mesa/main/texstate.h b/src/mesa/main/texstate.h
index 1f1c2267aa..b5003d5d6e 100644
--- a/src/mesa/main/texstate.h
+++ b/src/mesa/main/texstate.h
@@ -48,35 +48,6 @@ _mesa_print_texunit_state( GLcontext *ctx, GLuint unit );
  */
 /*@{*/
 
-extern void GLAPIENTRY
-_mesa_GetTexLevelParameterfv( GLenum target, GLint level,
-                              GLenum pname, GLfloat *params );
-
-extern void GLAPIENTRY
-_mesa_GetTexLevelParameteriv( GLenum target, GLint level,
-                              GLenum pname, GLint *params );
-
-extern void GLAPIENTRY
-_mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params );
-
-extern void GLAPIENTRY
-_mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params );
-
-
-
-extern void GLAPIENTRY
-_mesa_TexParameterfv( GLenum target, GLenum pname, const GLfloat *params );
-
-extern void GLAPIENTRY
-_mesa_TexParameterf( GLenum target, GLenum pname, GLfloat param );
-
-
-extern void GLAPIENTRY
-_mesa_TexParameteri( GLenum target, GLenum pname, GLint param );
-
-extern void GLAPIENTRY
-_mesa_TexParameteriv( GLenum target, GLenum pname, const GLint *params );
-
 
 /*
  * GL_ARB_multitexture
diff --git a/src/mesa/sources b/src/mesa/sources
index d225d7d15b..8c000087c6 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -67,6 +67,7 @@ MAIN_SOURCES = \
 	main/texgen.c \
 	main/teximage.c \
 	main/texobj.c \
+	main/texparam.c \
 	main/texrender.c \
 	main/texstate.c \
 	main/texstore.c \
-- 
cgit v1.2.3


From 222c80893a738b964dc75796d47545d88e6a6973 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 11 Jun 2008 20:13:07 -0600
Subject: mesa: refactor: move various ENUM_TO_x macros into macros.h

---
 src/mesa/main/get.c      | 56 ++++++++++++++++++++++++++++++++++++++++++------
 src/mesa/main/get_gen.py |  4 ----
 src/mesa/main/macros.h   |  7 ++++++
 src/mesa/main/texenv.c   |  2 --
 src/mesa/main/texgen.c   |  4 ----
 src/mesa/main/texparam.c |  3 ---
 src/mesa/main/texstate.c |  3 ---
 7 files changed, 57 insertions(+), 22 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index ee48b78318..ac437a86e2 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -19,10 +19,6 @@
 
 #define INT_TO_BOOLEAN(I)     ( (I) ? GL_TRUE : GL_FALSE )
 
-#define ENUM_TO_BOOLEAN(E)    ( (E) ? GL_TRUE : GL_FALSE )
-#define ENUM_TO_INT(E)        ( (GLint) (E) )
-#define ENUM_TO_FLOAT(E)      ( (GLfloat) (E) )
-
 #define BOOLEAN_TO_INT(B)     ( (GLint) (B) )
 #define BOOLEAN_TO_FLOAT(B)   ( (B) ? 1.0F : 0.0F )
 
@@ -870,6 +866,14 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
       case GL_TEXTURE_3D:
          params[0] = _mesa_IsEnabled(GL_TEXTURE_3D);
          break;
+      case GL_TEXTURE_1D_ARRAY_EXT:
+         CHECK_EXT1(MESA_texture_array, "GetBooleanv");
+         params[0] = _mesa_IsEnabled(GL_TEXTURE_1D_ARRAY_EXT);
+         break;
+      case GL_TEXTURE_2D_ARRAY_EXT:
+         CHECK_EXT1(MESA_texture_array, "GetBooleanv");
+         params[0] = _mesa_IsEnabled(GL_TEXTURE_2D_ARRAY_EXT);
+         break;
       case GL_TEXTURE_BINDING_1D:
          params[0] = INT_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current1D->Name);
          break;
@@ -879,6 +883,14 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
       case GL_TEXTURE_BINDING_3D:
          params[0] = INT_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current3D->Name);
          break;
+      case GL_TEXTURE_BINDING_1D_ARRAY_EXT:
+         CHECK_EXT1(MESA_texture_array, "GetBooleanv");
+         params[0] = INT_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current1DArray->Name);
+         break;
+      case GL_TEXTURE_BINDING_2D_ARRAY_EXT:
+         CHECK_EXT1(MESA_texture_array, "GetBooleanv");
+         params[0] = INT_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current2DArray->Name);
+         break;
       case GL_TEXTURE_ENV_COLOR:
          {
          const GLfloat *color = ctx->Texture.Unit[ctx->Texture.CurrentUnit].EnvColor;
@@ -2124,7 +2136,7 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          params[0] = (GLfloat)(ctx->DrawBuffer->Visual.depthBits);
          break;
       case GL_DEPTH_CLEAR_VALUE:
-         params[0] = (GLfloat)ctx->Depth.Clear;
+         params[0] = ctx->Depth.Clear;
          break;
       case GL_DEPTH_FUNC:
          params[0] = ENUM_TO_FLOAT(ctx->Depth.Func);
@@ -2701,6 +2713,14 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
       case GL_TEXTURE_3D:
          params[0] = BOOLEAN_TO_FLOAT(_mesa_IsEnabled(GL_TEXTURE_3D));
          break;
+      case GL_TEXTURE_1D_ARRAY_EXT:
+         CHECK_EXT1(MESA_texture_array, "GetFloatv");
+         params[0] = BOOLEAN_TO_FLOAT(_mesa_IsEnabled(GL_TEXTURE_1D_ARRAY_EXT));
+         break;
+      case GL_TEXTURE_2D_ARRAY_EXT:
+         CHECK_EXT1(MESA_texture_array, "GetFloatv");
+         params[0] = BOOLEAN_TO_FLOAT(_mesa_IsEnabled(GL_TEXTURE_2D_ARRAY_EXT));
+         break;
       case GL_TEXTURE_BINDING_1D:
          params[0] = (GLfloat)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current1D->Name);
          break;
@@ -2710,6 +2730,14 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
       case GL_TEXTURE_BINDING_3D:
          params[0] = (GLfloat)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current3D->Name);
          break;
+      case GL_TEXTURE_BINDING_1D_ARRAY_EXT:
+         CHECK_EXT1(MESA_texture_array, "GetFloatv");
+         params[0] = (GLfloat)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current1DArray->Name);
+         break;
+      case GL_TEXTURE_BINDING_2D_ARRAY_EXT:
+         CHECK_EXT1(MESA_texture_array, "GetFloatv");
+         params[0] = (GLfloat)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current2DArray->Name);
+         break;
       case GL_TEXTURE_ENV_COLOR:
          {
          const GLfloat *color = ctx->Texture.Unit[ctx->Texture.CurrentUnit].EnvColor;
@@ -2914,7 +2942,7 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          GLuint i, n = _mesa_get_compressed_formats(ctx, formats, GL_FALSE);
          ASSERT(n <= 100);
          for (i = 0; i < n; i++)
-            params[i] = (GLfloat)(ENUM_TO_INT(formats[i]));
+            params[i] = ENUM_TO_INT(formats[i]);
          }
          break;
       case GL_ARRAY_ELEMENT_LOCK_FIRST_EXT:
@@ -4532,6 +4560,14 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
       case GL_TEXTURE_3D:
          params[0] = BOOLEAN_TO_INT(_mesa_IsEnabled(GL_TEXTURE_3D));
          break;
+      case GL_TEXTURE_1D_ARRAY_EXT:
+         CHECK_EXT1(MESA_texture_array, "GetIntegerv");
+         params[0] = BOOLEAN_TO_INT(_mesa_IsEnabled(GL_TEXTURE_1D_ARRAY_EXT));
+         break;
+      case GL_TEXTURE_2D_ARRAY_EXT:
+         CHECK_EXT1(MESA_texture_array, "GetIntegerv");
+         params[0] = BOOLEAN_TO_INT(_mesa_IsEnabled(GL_TEXTURE_2D_ARRAY_EXT));
+         break;
       case GL_TEXTURE_BINDING_1D:
          params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current1D->Name;
          break;
@@ -4541,6 +4577,14 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
       case GL_TEXTURE_BINDING_3D:
          params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current3D->Name;
          break;
+      case GL_TEXTURE_BINDING_1D_ARRAY_EXT:
+         CHECK_EXT1(MESA_texture_array, "GetIntegerv");
+         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current1DArray->Name;
+         break;
+      case GL_TEXTURE_BINDING_2D_ARRAY_EXT:
+         CHECK_EXT1(MESA_texture_array, "GetIntegerv");
+         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current2DArray->Name;
+         break;
       case GL_TEXTURE_ENV_COLOR:
          {
          const GLfloat *color = ctx->Texture.Unit[ctx->Texture.CurrentUnit].EnvColor;
diff --git a/src/mesa/main/get_gen.py b/src/mesa/main/get_gen.py
index 9055433281..c307058da6 100644
--- a/src/mesa/main/get_gen.py
+++ b/src/mesa/main/get_gen.py
@@ -1127,10 +1127,6 @@ def EmitHeader():
 
 #define INT_TO_BOOLEAN(I)     ( (I) ? GL_TRUE : GL_FALSE )
 
-#define ENUM_TO_BOOLEAN(E)    ( (E) ? GL_TRUE : GL_FALSE )
-#define ENUM_TO_INT(E)        ( (GLint) (E) )
-#define ENUM_TO_FLOAT(E)      ( (GLfloat) (E) )
-
 #define BOOLEAN_TO_INT(B)     ( (GLint) (B) )
 #define BOOLEAN_TO_FLOAT(B)   ( (B) ? 1.0F : 0.0F )
 
diff --git a/src/mesa/main/macros.h b/src/mesa/main/macros.h
index fbbcd4e269..2630855a0e 100644
--- a/src/mesa/main/macros.h
+++ b/src/mesa/main/macros.h
@@ -657,4 +657,11 @@ do {                        \
 #define LEN_SQUARED_2FV( V ) ((V)[0]*(V)[0]+(V)[1]*(V)[1])
 
 
+/** casts to silence warnings with some compilers */
+#define ENUM_TO_INT(E)     ((GLint)(E))
+#define ENUM_TO_FLOAT(E)   ((GLfloat)(GLint)(E))
+#define ENUM_TO_DOUBLE(E)  ((GLdouble)(GLint)(E))
+#define ENUM_TO_BOOLEAN(E) ((E) ? GL_TRUE : GL_FALSE)
+
+
 #endif
diff --git a/src/mesa/main/texenv.c b/src/mesa/main/texenv.c
index 2b5b15524e..e072cea136 100644
--- a/src/mesa/main/texenv.c
+++ b/src/mesa/main/texenv.c
@@ -37,8 +37,6 @@
 #include "math/m_xform.h"
 
 
-#define ENUM_TO_FLOAT(X) ((GLfloat)(GLint)(X))
-
 
 void GLAPIENTRY
 _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
diff --git a/src/mesa/main/texgen.c b/src/mesa/main/texgen.c
index 1018c3037b..244c7aaafc 100644
--- a/src/mesa/main/texgen.c
+++ b/src/mesa/main/texgen.c
@@ -37,10 +37,6 @@
 #include "math/m_xform.h"
 
 
-#define ENUM_TO_FLOAT(X) ((GLfloat)(GLint)(X))
-#define ENUM_TO_DOUBLE(X) ((GLdouble)(GLint)(X))
-
-
 
 void GLAPIENTRY
 _mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params )
diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index 10ad0ef1d8..af288c4e18 100644
--- a/src/mesa/main/texparam.c
+++ b/src/mesa/main/texparam.c
@@ -39,9 +39,6 @@
 #include "main/teximage.h"
 
 
-#define ENUM_TO_FLOAT(X) ((GLfloat)(GLint)(X))
-
-
 /**
  * Check if a coordinate wrap mode is supported for the texture target.
  * \return GL_TRUE if legal, GL_FALSE otherwise
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index dbd769d740..421f912849 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -45,9 +45,6 @@
 #include "math/m_xform.h"
 
 
-#define ENUM_TO_FLOAT(X) ((GLfloat)(GLint)(X))
-#define ENUM_TO_DOUBLE(X) ((GLdouble)(GLint)(X))
-
 
 /**
  * Default texture combine environment state.  This is used to initialize
-- 
cgit v1.2.3


From 34ff12ca1fe7153671eea2fe084f3991094ec3ce Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 11 Jun 2008 20:50:26 -0600
Subject: Revert "mesa: further degenerate the special case lit substitute"

This reverts commit e841b92d9c8bf48085b4996df828ae745977f931.

This fixes two specular lighting conform failures.
---
 src/mesa/main/ffvertex_prog.c | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index 06710f405d..d71e0c00fd 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -975,19 +975,19 @@ static void emit_degenerate_lit( struct tnl_program *p,
 {
    struct ureg id = get_identity_param(p);
    
-   /* Note that result.x & result.w will not be examined.  Note also that
-    * dots.xyzw == dots.xxxx.
+   /* 1, 0, 0, 1 
     */
+   emit_op1(p, OPCODE_MOV, lit, 0, swizzle(id, Z, X, X, Z)); 
 
-   /* result[1] = MAX2(in, 0)
+   /* 1, MAX2(in[0], 0), 0, 1
     */
-   emit_op2(p, OPCODE_MAX, lit, 0, id, dots); 
+   emit_op2(p, OPCODE_MAX, lit, WRITEMASK_Y, lit, swizzle1(dots, X)); 
 
-   /* result[2] = (in > 0 ? 1 : 0)
+   /* 1, MAX2(in[0], 0), (in[0] > 0 ? 1 : 0), 1
     */
    emit_op2(p, OPCODE_SLT, lit, WRITEMASK_Z, 
             lit,                /* 0 */
-            dots); /* in[0] */
+            swizzle1(dots, X)); /* in[0] */
 }
 
 
@@ -1144,13 +1144,10 @@ static void build_lighting( struct tnl_program *p )
 
 	 /* Calculate dot products:
 	  */
-         if (p->state->material_shininess_is_zero) {
-            emit_op2(p, OPCODE_DP3, dots, 0, normal, VPpli);
-         }
-         else {
-            emit_op2(p, OPCODE_DP3, dots, WRITEMASK_X, normal, VPpli);
+	 emit_op2(p, OPCODE_DP3, dots, WRITEMASK_X, normal, VPpli);
+
+         if (!p->state->material_shininess_is_zero)
             emit_op2(p, OPCODE_DP3, dots, WRITEMASK_Y, normal, half);
-         }
 
 	 /* Front face lighting:
 	  */
-- 
cgit v1.2.3


From 5ecb2f2d0fca0c5ea847d1968459aa0dd8138f14 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 12 Jun 2008 11:17:20 -0600
Subject: mesa: restore and fix Keith's "further degenerate the special case
 lit substitute"

There was a bug in emit_degenerate_lit() that caused the SLT to produce
unpredictable results in lit.z

Plus, added a bunch of new comments.
---
 src/mesa/main/ffvertex_prog.c | 44 ++++++++++++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 13 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index d71e0c00fd..e6c7c1040f 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -969,25 +969,29 @@ static struct ureg calculate_light_attenuation( struct tnl_program *p,
 }
 						
 
+/**
+ * Compute:
+ *   lit.y = MAX(0, dots.x)
+ *   lit.z = SLT(0, dots.x)
+ */
 static void emit_degenerate_lit( struct tnl_program *p,
                                  struct ureg lit,
                                  struct ureg dots )
 {
-   struct ureg id = get_identity_param(p);
-   
-   /* 1, 0, 0, 1 
+   struct ureg id = get_identity_param(p);  /* id = {0,0,0,1} */
+
+   /* Note that lit.x & lit.w will not be examined.  Note also that
+    * dots.xyzw == dots.xxxx.
     */
-   emit_op1(p, OPCODE_MOV, lit, 0, swizzle(id, Z, X, X, Z)); 
 
-   /* 1, MAX2(in[0], 0), 0, 1
+   /* MAX lit, id, dots;
     */
-   emit_op2(p, OPCODE_MAX, lit, WRITEMASK_Y, lit, swizzle1(dots, X)); 
+   emit_op2(p, OPCODE_MAX, lit, WRITEMASK_XYZW, id, dots); 
 
-   /* 1, MAX2(in[0], 0), (in[0] > 0 ? 1 : 0), 1
+   /* result[2] = (in > 0 ? 1 : 0)
+    * SLT lit.z, id.z, dots;   # lit.z = (0 < dots.z) ? 1 : 0
     */
-   emit_op2(p, OPCODE_SLT, lit, WRITEMASK_Z, 
-            lit,                /* 0 */
-            swizzle1(dots, X)); /* in[0] */
+   emit_op2(p, OPCODE_SLT, lit, WRITEMASK_Z, swizzle1(id,Z), dots);
 }
 
 
@@ -1007,6 +1011,14 @@ static void build_lighting( struct tnl_program *p )
    struct ureg _bfc0 = undef, _bfc1 = undef;
    GLuint i;
 
+   /*
+    * NOTE:
+    * dot.x = dot(normal, VPpli)
+    * dot.y = dot(normal, halfAngle)
+    * dot.z = back.shininess
+    * dot.w = front.shininess
+    */
+
    for (i = 0; i < MAX_LIGHTS; i++) 
       if (p->state->unit[i].light_enabled)
 	 nr_lights++;
@@ -1144,10 +1156,13 @@ static void build_lighting( struct tnl_program *p )
 
 	 /* Calculate dot products:
 	  */
-	 emit_op2(p, OPCODE_DP3, dots, WRITEMASK_X, normal, VPpli);
-
-         if (!p->state->material_shininess_is_zero)
+         if (p->state->material_shininess_is_zero) {
+            emit_op2(p, OPCODE_DP3, dots, 0, normal, VPpli);
+         }
+         else {
+            emit_op2(p, OPCODE_DP3, dots, WRITEMASK_X, normal, VPpli);
             emit_op2(p, OPCODE_DP3, dots, WRITEMASK_Y, normal, half);
+         }
 
 	 /* Front face lighting:
 	  */
@@ -1181,15 +1196,18 @@ static void build_lighting( struct tnl_program *p )
 
 
 	    if (!is_undef(att)) {
+               /* light is attenuated by distance */
                emit_op1(p, OPCODE_LIT, lit, 0, dots);
                emit_op2(p, OPCODE_MUL, lit, 0, lit, att);
                emit_op3(p, OPCODE_MAD, _col0, 0, swizzle1(lit,X), ambient, _col0);
             } 
             else if (!p->state->material_shininess_is_zero) {
+               /* there's a non-zero specular term */
                emit_op1(p, OPCODE_LIT, lit, 0, dots);
                emit_op2(p, OPCODE_ADD, _col0, 0, ambient, _col0);
             } 
             else {
+               /* no attenutation, no specular */
                emit_degenerate_lit(p, lit, dots);
                emit_op2(p, OPCODE_ADD, _col0, 0, ambient, _col0);
             }
-- 
cgit v1.2.3


From e961a5da77cbcdb0e32400ec707c16fcfe9d7083 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 12 Jun 2008 16:55:28 -0600
Subject: mesa: add some #if FEATURE_x tests

---
 src/mesa/main/context.c     |  4 ++--
 src/mesa/main/enable.c      |  5 +++++
 src/mesa/main/texcompress.c | 17 +++++++++++++++++
 src/mesa/main/texformat.c   |  6 ++++++
 src/mesa/main/texformat.h   |  8 ++++++++
 5 files changed, 38 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index d975814592..8f22f6bb78 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -144,9 +144,7 @@
 #include "vtxfmt.h"
 #include "glapi/glthread.h"
 #include "glapi/glapioffsets.h"
-#if FEATURE_NV_vertex_program || FEATURE_NV_fragment_program
 #include "shader/program.h"
-#endif
 #include "shader/shader_api.h"
 #include "shader/atifragshader.h"
 #if _HAVE_FULL_GL
@@ -622,6 +620,7 @@ delete_program_cb(GLuint id, void *data, void *userData)
    ctx->Driver.DeleteProgram(ctx, prog);
 }
 
+#if FEATURE_ATI_fragment_shader
 /**
  * Callback for deleting an ATI fragment shader object.
  * Called by _mesa_HashDeleteAll().
@@ -633,6 +632,7 @@ delete_fragshader_cb(GLuint id, void *data, void *userData)
    GLcontext *ctx = (GLcontext *) userData;
    _mesa_delete_ati_fragment_shader(ctx, shader);
 }
+#endif
 
 /**
  * Callback for deleting a buffer object.  Called by _mesa_HashDeleteAll().
diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index 52dd63f2ce..6b4ad8eea3 100644
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -904,6 +904,7 @@ _mesa_set_enable(GLcontext *ctx, GLenum cap, GLboolean state)
          break;
 
       /* GL_MESA_program_debug */
+#if FEATURE_MESA_program_debug
       case GL_FRAGMENT_PROGRAM_CALLBACK_MESA:
          CHECK_EXTENSION(MESA_program_debug, cap);
          ctx->FragmentProgram.CallbackEnabled = state;
@@ -912,6 +913,7 @@ _mesa_set_enable(GLcontext *ctx, GLenum cap, GLboolean state)
          CHECK_EXTENSION(MESA_program_debug, cap);
          ctx->VertexProgram.CallbackEnabled = state;
          break;
+#endif
 
 #if FEATURE_ATI_fragment_shader
       case GL_FRAGMENT_SHADER_ATI:
@@ -1349,12 +1351,15 @@ _mesa_IsEnabled( GLenum cap )
          return ctx->Depth.BoundsTest;
 
       /* GL_MESA_program_debug */
+#if FEATURE_MESA_program_debug
       case GL_FRAGMENT_PROGRAM_CALLBACK_MESA:
          CHECK_EXTENSION(MESA_program_debug);
          return ctx->FragmentProgram.CallbackEnabled;
       case GL_VERTEX_PROGRAM_CALLBACK_MESA:
          CHECK_EXTENSION(MESA_program_debug);
          return ctx->VertexProgram.CallbackEnabled;
+#endif
+
 #if FEATURE_ATI_fragment_shader
       case GL_FRAGMENT_SHADER_ATI:
 	 CHECK_EXTENSION(ATI_fragment_shader);
diff --git a/src/mesa/main/texcompress.c b/src/mesa/main/texcompress.c
index c44d594d68..5ad936419b 100644
--- a/src/mesa/main/texcompress.c
+++ b/src/mesa/main/texcompress.c
@@ -137,8 +137,10 @@ _mesa_compressed_texture_size( GLcontext *ctx,
 
    ASSERT(depth == 1);
    (void) depth;
+   (void) size;
 
    switch (mesaFormat) {
+#if FEATURE_texture_fxt1
    case MESA_FORMAT_RGB_FXT1:
    case MESA_FORMAT_RGBA_FXT1:
       /* round up width to next multiple of 8, height to next multiple of 4 */
@@ -152,6 +154,8 @@ _mesa_compressed_texture_size( GLcontext *ctx,
       if (size < 16)
          size = 16;
       return size;
+#endif
+#if FEATURE_texture_s3tc
    case MESA_FORMAT_RGB_DXT1:
    case MESA_FORMAT_RGBA_DXT1:
       /* round up width, height to next multiple of 4 */
@@ -178,6 +182,7 @@ _mesa_compressed_texture_size( GLcontext *ctx,
       if (size < 16)
          size = 16;
       return size;
+#endif
    default:
       _mesa_problem(ctx, "bad mesaFormat in _mesa_compressed_texture_size");
       return 0;
@@ -202,12 +207,15 @@ _mesa_compressed_texture_size_glenum(GLcontext *ctx,
    GLuint mesaFormat;
 
    switch (glformat) {
+#if FEATURE_texture_fxt1
    case GL_COMPRESSED_RGB_FXT1_3DFX:
       mesaFormat = MESA_FORMAT_RGB_FXT1;
       break;
    case GL_COMPRESSED_RGBA_FXT1_3DFX:
       mesaFormat = MESA_FORMAT_RGBA_FXT1;
       break;
+#endif
+#if FEATURE_texture_s3tc
    case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
    case GL_RGB_S3TC:
       mesaFormat = MESA_FORMAT_RGB_DXT1;
@@ -224,6 +232,7 @@ _mesa_compressed_texture_size_glenum(GLcontext *ctx,
    case GL_RGBA4_S3TC:
       mesaFormat = MESA_FORMAT_RGBA_DXT5;
       break;
+#endif
    default:
       return 0;
    }
@@ -245,10 +254,13 @@ _mesa_compressed_row_stride(GLuint mesaFormat, GLsizei width)
    GLint stride;
 
    switch (mesaFormat) {
+#if FEATURE_texture_fxt1
    case MESA_FORMAT_RGB_FXT1:
    case MESA_FORMAT_RGBA_FXT1:
       stride = ((width + 7) / 8) * 16; /* 16 bytes per 8x4 tile */
       break;
+#endif
+#if FEATURE_texture_s3tc
    case MESA_FORMAT_RGB_DXT1:
    case MESA_FORMAT_RGBA_DXT1:
       stride = ((width + 3) / 4) * 8; /* 8 bytes per 4x4 tile */
@@ -257,6 +269,7 @@ _mesa_compressed_row_stride(GLuint mesaFormat, GLsizei width)
    case MESA_FORMAT_RGBA_DXT5:
       stride = ((width + 3) / 4) * 16; /* 16 bytes per 4x4 tile */
       break;
+#endif
    default:
       _mesa_problem(NULL, "bad mesaFormat in _mesa_compressed_row_stride");
       return 0;
@@ -293,10 +306,13 @@ _mesa_compressed_image_address(GLint col, GLint row, GLint img,
     */
 
    switch (mesaFormat) {
+#if FEATURE_texture_fxt1
    case MESA_FORMAT_RGB_FXT1:
    case MESA_FORMAT_RGBA_FXT1:
       addr = (GLubyte *) image + 16 * (((width + 7) / 8) * (row / 4) + col / 8);
       break;
+#endif
+#if FEATURE_texture_s3tc
    case MESA_FORMAT_RGB_DXT1:
    case MESA_FORMAT_RGBA_DXT1:
       addr = (GLubyte *) image + 8 * (((width + 3) / 4) * (row / 4) + col / 4);
@@ -305,6 +321,7 @@ _mesa_compressed_image_address(GLint col, GLint row, GLint img,
    case MESA_FORMAT_RGBA_DXT5:
       addr = (GLubyte *) image + 16 * (((width + 3) / 4) * (row / 4) + col / 4);
       break;
+#endif
    default:
       _mesa_problem(NULL, "bad mesaFormat in _mesa_compressed_image_address");
       addr = NULL;
diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c
index a35195a695..ea55002f58 100644
--- a/src/mesa/main/texformat.c
+++ b/src/mesa/main/texformat.c
@@ -1693,6 +1693,7 @@ _mesa_format_to_type_and_comps(const struct gl_texture_format *format,
       *comps = 1;
       return;
 
+#if FEATURE_EXT_texture_sRGB
    case MESA_FORMAT_SRGB8:
       *datatype = GL_UNSIGNED_BYTE;
       *comps = 3;
@@ -1709,9 +1710,13 @@ _mesa_format_to_type_and_comps(const struct gl_texture_format *format,
       *datatype = GL_UNSIGNED_BYTE;
       *comps = 2;
       return;
+#endif
 
+#if FEATURE_texture_fxt1
    case MESA_FORMAT_RGB_FXT1:
    case MESA_FORMAT_RGBA_FXT1:
+#endif
+#if FEATURE_texture_s3tc
    case MESA_FORMAT_RGB_DXT1:
    case MESA_FORMAT_RGBA_DXT1:
    case MESA_FORMAT_RGBA_DXT3:
@@ -1720,6 +1725,7 @@ _mesa_format_to_type_and_comps(const struct gl_texture_format *format,
       *datatype = GL_UNSIGNED_BYTE;
       *comps = 0;
       return;
+#endif
 
    case MESA_FORMAT_RGBA:
       *datatype = CHAN_TYPE;
diff --git a/src/mesa/main/texformat.h b/src/mesa/main/texformat.h
index 8f4e2feb48..3b6d05612d 100644
--- a/src/mesa/main/texformat.h
+++ b/src/mesa/main/texformat.h
@@ -105,12 +105,16 @@ enum _format {
     * \name Compressed texture formats.
     */
    /*@{*/
+#if FEATURE_texture_fxt1
    MESA_FORMAT_RGB_FXT1,
    MESA_FORMAT_RGBA_FXT1,
+#endif
+#if FEATURE_texture_s3tc
    MESA_FORMAT_RGB_DXT1,
    MESA_FORMAT_RGBA_DXT1,
    MESA_FORMAT_RGBA_DXT3,
    MESA_FORMAT_RGBA_DXT5,
+#endif
    /*@}*/
 
    /**
@@ -223,12 +227,16 @@ extern const struct gl_texture_format _mesa_texformat_ycbcr_rev;
 
 /** \name Compressed formats */
 /*@{*/
+#if FEATURE_texture_fxt1
 extern const struct gl_texture_format _mesa_texformat_rgb_fxt1;
 extern const struct gl_texture_format _mesa_texformat_rgba_fxt1;
+#endif
+#if FEATURE_texture_s3tc
 extern const struct gl_texture_format _mesa_texformat_rgb_dxt1;
 extern const struct gl_texture_format _mesa_texformat_rgba_dxt1;
 extern const struct gl_texture_format _mesa_texformat_rgba_dxt3;
 extern const struct gl_texture_format _mesa_texformat_rgba_dxt5;
+#endif
 /*@}*/
 
 /** \name The null format */
-- 
cgit v1.2.3


From 9350fd62b6b8dbee77b0c3c4f23195eaee3045d7 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 13 Jun 2008 09:10:09 -0600
Subject: mesa: fix typo: s/stacks/stack/

---
 src/mesa/main/mfeatures.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index 162bd2fff9..4e60611c48 100644
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -37,7 +37,7 @@
 #endif
 
 #define FEATURE_accum  _HAVE_FULL_GL
-#define FEATURE_attrib_stacks  _HAVE_FULL_GL
+#define FEATURE_attrib_stack  _HAVE_FULL_GL
 #define FEATURE_colortable  _HAVE_FULL_GL
 #define FEATURE_convolution  _HAVE_FULL_GL
 #define FEATURE_dlist  _HAVE_FULL_GL
-- 
cgit v1.2.3


From 2b4e2841a70ddba683158b4310b19c98037a2337 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 13 Jun 2008 13:56:53 -0600
Subject: mesa: check FEATURE_ARB_occlusion_query

---
 src/mesa/main/context.c | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 8f22f6bb78..e2f3ffb17b 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -126,7 +126,9 @@
 #include "pixelstore.h"
 #include "points.h"
 #include "polygon.h"
+#if FEATURE_ARB_occlusion_query
 #include "queryobj.h"
+#endif
 #if FEATURE_drawpix
 #include "rastpos.h"
 #endif
@@ -1013,7 +1015,9 @@ init_attrib_groups(GLcontext *ctx)
    _mesa_init_point( ctx );
    _mesa_init_polygon( ctx );
    _mesa_init_program( ctx );
+#if FEATURE_ARB_occlusion_query
    _mesa_init_query( ctx );
+#endif
 #if FEATURE_drawpix
    _mesa_init_rastpos( ctx );
 #endif
@@ -1213,6 +1217,7 @@ _mesa_create_context(const GLvisual *visual,
 {
    GLcontext *ctx;
 
+   printf("***** enter %s\n", __FUNCTION__);
    ASSERT(visual);
    /*ASSERT(driverContext);*/
 
@@ -1273,7 +1278,9 @@ _mesa_free_context_data( GLcontext *ctx )
 #endif
    _mesa_free_program_data(ctx);
    _mesa_free_shader_state(ctx);
+#if FEATURE_ARB_occlusion_query
    _mesa_free_query_data(ctx);
+#endif
 
 #if FEATURE_ARB_vertex_buffer_object
    _mesa_delete_buffer_object(ctx, ctx->Array.NullBufferObj);
-- 
cgit v1.2.3


From e9a6832737e17fd41d1f9e660239bd0bd2355b0b Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 13 Jun 2008 14:13:25 -0600
Subject: mesa: remove some temp debug code

---
 src/mesa/main/context.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index e2f3ffb17b..086272ca01 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1217,7 +1217,6 @@ _mesa_create_context(const GLvisual *visual,
 {
    GLcontext *ctx;
 
-   printf("***** enter %s\n", __FUNCTION__);
    ASSERT(visual);
    /*ASSERT(driverContext);*/
 
-- 
cgit v1.2.3


From 8b11fa4d4496032246b33182b9285c1181d41f1f Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 13 Jun 2008 16:45:15 -0600
Subject: mesa: move some glapi bits around

Move _glapi_proc typedef from glapitable.h to glapi.h
Also, don't include glapitable.h from glapi.h
Before we were including the huge glapitable.h file in every .c file.
---
 src/mesa/glapi/dispatch.h   | 3 +++
 src/mesa/glapi/gl_table.py  | 1 -
 src/mesa/glapi/glapi.h      | 5 ++++-
 src/mesa/glapi/glapitable.h | 1 -
 src/mesa/main/blend.c       | 1 +
 src/mesa/main/context.c     | 1 +
 src/mesa/main/mtypes.h      | 3 +--
 7 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/glapi/dispatch.h b/src/mesa/glapi/dispatch.h
index 7123156085..98f654f402 100644
--- a/src/mesa/glapi/dispatch.h
+++ b/src/mesa/glapi/dispatch.h
@@ -28,6 +28,9 @@
 #if !defined( _DISPATCH_H_ )
 #  define _DISPATCH_H_
 
+#include "glapitable.h"
+
+
 /**
  * \file dispatch.h
  * Macros for handling GL dispatch tables.
diff --git a/src/mesa/glapi/gl_table.py b/src/mesa/glapi/gl_table.py
index 69f7bd7c7b..7023a4b71a 100644
--- a/src/mesa/glapi/gl_table.py
+++ b/src/mesa/glapi/gl_table.py
@@ -56,7 +56,6 @@ class PrintGlTable(gl_XML.gl_print_base):
 		print '# define GLAPIENTRYP GLAPIENTRY *'
 		print '#endif'
 		print ''
-		print 'typedef void (*_glapi_proc)(void); /* generic function pointer */'
 		print ''
 		print 'struct _glapi_table'
 		print '{'
diff --git a/src/mesa/glapi/glapi.h b/src/mesa/glapi/glapi.h
index ddfb1cffb9..20d35769cf 100644
--- a/src/mesa/glapi/glapi.h
+++ b/src/mesa/glapi/glapi.h
@@ -46,10 +46,13 @@
 
 
 #include "GL/gl.h"
-#include "glapitable.h"
 #include "glthread.h"
 
 
+struct _glapi_table;
+
+typedef void (*_glapi_proc)(void); /* generic function pointer */
+
 typedef void (*_glapi_warning_func)(void *ctx, const char *str, ...);
 
 
diff --git a/src/mesa/glapi/glapitable.h b/src/mesa/glapi/glapitable.h
index 48941f5590..5d9d40a8a2 100644
--- a/src/mesa/glapi/glapitable.h
+++ b/src/mesa/glapi/glapitable.h
@@ -37,7 +37,6 @@
 # define GLAPIENTRYP GLAPIENTRY *
 #endif
 
-typedef void (*_glapi_proc)(void); /* generic function pointer */
 
 struct _glapi_table
 {
diff --git a/src/mesa/main/blend.c b/src/mesa/main/blend.c
index 81bd4c2f32..742247f8e2 100644
--- a/src/mesa/main/blend.c
+++ b/src/mesa/main/blend.c
@@ -36,6 +36,7 @@
 #include "enums.h"
 #include "macros.h"
 #include "mtypes.h"
+#include "glapi/glapitable.h"
 
 
 /**
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 086272ca01..dcc518e9fd 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -146,6 +146,7 @@
 #include "vtxfmt.h"
 #include "glapi/glthread.h"
 #include "glapi/glapioffsets.h"
+#include "glapi/glapitable.h"
 #include "shader/program.h"
 #include "shader/shader_api.h"
 #include "shader/atifragshader.h"
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 463142fe39..8a6c84368a 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -38,8 +38,7 @@
 #include "glheader.h"
 #include <GL/internal/glcore.h>	/* __GLcontextModes (GLvisual) */
 #include "config.h"		/* Hardwired parameters */
-#include "glapi/glapitable.h"
-#include "glapi/glthread.h"
+#include "glapi/glapi.h"
 #include "math/m_matrix.h"	/* GLmatrix */
 #include "bitset.h"
 
-- 
cgit v1.2.3


From 3ccbde627edb420071b08a830dd58ed5daf82ffa Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Tue, 17 Jun 2008 10:11:53 -0600
Subject: mesa: make mm.c use unsigned ints for offsets.

If you have a GPU using this code and it has the offsets up in this space,
this fails.

cherry-picked from master
---
 src/mesa/main/mm.c | 8 ++++----
 src/mesa/main/mm.h | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mm.c b/src/mesa/main/mm.c
index 846c329c70..fb7809ed22 100644
--- a/src/mesa/main/mm.c
+++ b/src/mesa/main/mm.c
@@ -53,7 +53,7 @@ mmDumpMemInfo(const struct mem_block *heap)
 }
 
 struct mem_block *
-mmInit(int ofs, int size)
+mmInit(unsigned int ofs, int size)
 {
    struct mem_block *heap, *block;
   
@@ -91,7 +91,7 @@ mmInit(int ofs, int size)
 
 static struct mem_block *
 SliceBlock(struct mem_block *p, 
-           int startofs, int size, 
+           unsigned int startofs, int size, 
            int reserved, int alignment)
 {
    struct mem_block *newblock;
@@ -164,8 +164,8 @@ mmAllocMem(struct mem_block *heap, int size, int align2, int startSearch)
 {
    struct mem_block *p;
    const int mask = (1 << align2)-1;
-   int startofs = 0;
-   int endofs;
+   unsigned int startofs = 0;
+   unsigned int endofs;
 
    if (!heap || align2 < 0 || size <= 0)
       return NULL;
diff --git a/src/mesa/main/mm.h b/src/mesa/main/mm.h
index 26d59fff13..5ad3ffd6d1 100644
--- a/src/mesa/main/mm.h
+++ b/src/mesa/main/mm.h
@@ -39,7 +39,8 @@ struct mem_block {
    struct mem_block *next, *prev;
    struct mem_block *next_free, *prev_free;
    struct mem_block *heap;
-   int ofs,size;
+   unsigned int ofs;
+   int size;
    unsigned int free:1;
    unsigned int reserved:1;
 };
@@ -50,7 +51,7 @@ struct mem_block {
  * input: total size in bytes
  * return: a heap pointer if OK, NULL if error
  */
-extern struct mem_block *mmInit(int ofs, int size);
+extern struct mem_block *mmInit(unsigned int ofs, int size);
 
 /**
  * Allocate 'size' bytes with 2^align2 bytes alignment,
-- 
cgit v1.2.3


From 3bf8fb64862b882bff8b372f3c2ce08ea8d401a7 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Tue, 17 Jun 2008 16:43:48 -0600
Subject: mesa: fix inconsistent use of GL_UNSIGNED_INT vs.
 GL_UNSIGNED_INT_24_8_EXT for Z unpacking

---
 src/mesa/main/image.c    | 2 +-
 src/mesa/main/texstore.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index a6ac821251..52c4999e16 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -4447,7 +4447,7 @@ _mesa_unpack_depth_span( const GLcontext *ctx, GLuint n,
          DEPTH_VALUES(GLuint, UINT_TO_FLOAT);
          break;
       case GL_UNSIGNED_INT_24_8_EXT: /* GL_EXT_packed_depth_stencil */
-         if (dstType == GL_UNSIGNED_INT &&
+         if (dstType == GL_UNSIGNED_INT_24_8_EXT &&
              depthMax == 0xffffff &&
              ctx->Pixel.DepthScale == 1.0 &&
              ctx->Pixel.DepthBias == 0.0) {
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index 5ac6116950..562e07a0f5 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -2336,7 +2336,7 @@ _mesa_texstore_ycbcr(TEXSTORE_PARAMS)
 GLboolean
 _mesa_texstore_z24_s8(TEXSTORE_PARAMS)
 {
-   const GLuint depthScale = 0xffffff;
+   const GLfloat depthScale = (GLfloat) 0xffffff;
 
    ASSERT(dstFormat == &_mesa_texformat_z24_s8);
    ASSERT(srcFormat == GL_DEPTH_STENCIL_EXT);
@@ -2374,7 +2374,7 @@ _mesa_texstore_z24_s8(TEXSTORE_PARAMS)
             GLint i;
             /* the 24 depth bits will be in the high position: */
             _mesa_unpack_depth_span(ctx, srcWidth,
-                                    GL_UNSIGNED_INT, /* dst type */
+                                    GL_UNSIGNED_INT_24_8_EXT, /* dst type */
                                     dstRow, /* dst addr */
                                     depthScale,
                                     srcType, src, srcPacking);
-- 
cgit v1.2.3


From a1524162bf838920ad965cd44ead97da29408e50 Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date: Wed, 18 Jun 2008 01:39:46 +0200
Subject: mesa: Added _mesa_texstore_s8_z24

---
 src/mesa/main/texformat.c |  4 ----
 src/mesa/main/texstore.c  | 54 +++++++++++++++++++++++++++++++++++++++++++++++
 src/mesa/main/texstore.h  |  1 +
 3 files changed, 55 insertions(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c
index ea55002f58..11e7755960 100644
--- a/src/mesa/main/texformat.c
+++ b/src/mesa/main/texformat.c
@@ -1221,11 +1221,7 @@ const struct gl_texture_format _mesa_texformat_s8_z24 = {
    24,					/* DepthBits */
    8,					/* StencilBits */
    4,					/* TexelBytes */
-#if 0
    _mesa_texstore_s8_z24,		/* StoreTexImageFunc */
-#else
-   _mesa_texstore_z24_s8,		/* StoreTexImageFunc */
-#endif
    NULL,				/* FetchTexel1D */
    NULL,				/* FetchTexel2D */
    NULL,				/* FetchTexel3D */
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index 562e07a0f5..f3629cb0d1 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -2397,6 +2397,60 @@ _mesa_texstore_z24_s8(TEXSTORE_PARAMS)
 }
 
 
+/**
+ * Store a combined depth/stencil texture image.
+ */
+GLboolean
+_mesa_texstore_s8_z24(TEXSTORE_PARAMS)
+{
+   const GLuint depthScale = 0xffffff;
+
+   ASSERT(dstFormat == &_mesa_texformat_s8_z24);
+   ASSERT(srcFormat == GL_DEPTH_STENCIL_EXT);
+   ASSERT(srcType == GL_UNSIGNED_INT_24_8_EXT);
+
+
+   /* general path */
+   const GLint srcRowStride
+      = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType)
+      / sizeof(GLuint);
+   GLint img, row;
+
+   for (img = 0; img < srcDepth; img++) {
+      GLuint *dstRow = (GLuint *) dstAddr
+         + dstImageOffsets[dstZoffset + img]
+         + dstYoffset * dstRowStride / sizeof(GLuint)
+         + dstXoffset;
+      const GLuint *src
+         = (const GLuint *) _mesa_image_address(dims, srcPacking, srcAddr,
+                                                srcWidth, srcHeight,
+                                                srcFormat, srcType,
+                                                img, 0, 0);
+      for (row = 0; row < srcHeight; row++) {
+         GLubyte stencil[MAX_WIDTH];
+         GLint i;
+         /* the 24 depth bits will be in the high position: */
+         _mesa_unpack_depth_span(ctx, srcWidth,
+                                 GL_UNSIGNED_INT, /* dst type */
+                                 dstRow, /* dst addr */
+                                 depthScale,
+                                 srcType, src, srcPacking);
+         /* get the 8-bit stencil values */
+         _mesa_unpack_stencil_span(ctx, srcWidth,
+                                   GL_UNSIGNED_BYTE, /* dst type */
+                                   stencil, /* dst addr */
+                                   srcType, src, srcPacking,
+                                   ctx->_ImageTransferState);
+         /* merge stencil values into depth values */
+         for (i = 0; i < srcWidth; i++)
+            dstRow[i] = stencil[i] << 24;
+
+         src += srcRowStride;
+         dstRow += dstRowStride / sizeof(GLuint);
+      }
+   }
+   return GL_TRUE;
+}
 
 /**
  * Store an image in any of the formats:
diff --git a/src/mesa/main/texstore.h b/src/mesa/main/texstore.h
index da0c7cb78e..c5813fbeee 100644
--- a/src/mesa/main/texstore.h
+++ b/src/mesa/main/texstore.h
@@ -57,6 +57,7 @@ extern GLboolean _mesa_texstore_a8(TEXSTORE_PARAMS);
 extern GLboolean _mesa_texstore_ci8(TEXSTORE_PARAMS);
 extern GLboolean _mesa_texstore_ycbcr(TEXSTORE_PARAMS);
 extern GLboolean _mesa_texstore_z24_s8(TEXSTORE_PARAMS);
+extern GLboolean _mesa_texstore_s8_z24(TEXSTORE_PARAMS);
 extern GLboolean _mesa_texstore_z16(TEXSTORE_PARAMS);
 extern GLboolean _mesa_texstore_z32(TEXSTORE_PARAMS);
 extern GLboolean _mesa_texstore_rgba_float32(TEXSTORE_PARAMS);
-- 
cgit v1.2.3


From 666b771e512a7c91fa43544afec61bda63edc240 Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date: Wed, 18 Jun 2008 11:38:12 +0200
Subject: mesa: _mesa_texstore_s8_z24 now supports depth only uploads

---
 src/mesa/main/texstore.c | 96 +++++++++++++++++++++++++++++++-----------------
 1 file changed, 62 insertions(+), 34 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index f3629cb0d1..d7bfb69443 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -2406,47 +2406,75 @@ _mesa_texstore_s8_z24(TEXSTORE_PARAMS)
    const GLuint depthScale = 0xffffff;
 
    ASSERT(dstFormat == &_mesa_texformat_s8_z24);
-   ASSERT(srcFormat == GL_DEPTH_STENCIL_EXT);
-   ASSERT(srcType == GL_UNSIGNED_INT_24_8_EXT);
+   ASSERT(srcFormat == GL_DEPTH_STENCIL_EXT || srcFormat == GL_DEPTH_COMPONENT);
+   ASSERT(srcFormat != GL_DEPTH_STENCIL_EXT || srcType == GL_UNSIGNED_INT_24_8_EXT);
 
-
-   /* general path */
    const GLint srcRowStride
       = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType)
       / sizeof(GLuint);
    GLint img, row;
 
-   for (img = 0; img < srcDepth; img++) {
-      GLuint *dstRow = (GLuint *) dstAddr
-         + dstImageOffsets[dstZoffset + img]
-         + dstYoffset * dstRowStride / sizeof(GLuint)
-         + dstXoffset;
-      const GLuint *src
-         = (const GLuint *) _mesa_image_address(dims, srcPacking, srcAddr,
-                                                srcWidth, srcHeight,
-                                                srcFormat, srcType,
-                                                img, 0, 0);
-      for (row = 0; row < srcHeight; row++) {
-         GLubyte stencil[MAX_WIDTH];
-         GLint i;
-         /* the 24 depth bits will be in the high position: */
-         _mesa_unpack_depth_span(ctx, srcWidth,
-                                 GL_UNSIGNED_INT, /* dst type */
-                                 dstRow, /* dst addr */
-                                 depthScale,
-                                 srcType, src, srcPacking);
-         /* get the 8-bit stencil values */
-         _mesa_unpack_stencil_span(ctx, srcWidth,
-                                   GL_UNSIGNED_BYTE, /* dst type */
-                                   stencil, /* dst addr */
-                                   srcType, src, srcPacking,
-                                   ctx->_ImageTransferState);
-         /* merge stencil values into depth values */
-         for (i = 0; i < srcWidth; i++)
-            dstRow[i] = stencil[i] << 24;
+   /* Incase we only upload depth we need to preserve the stencil */
+   if (srcFormat == GL_DEPTH_COMPONENT) {
+      for (img = 0; img < srcDepth; img++) {
+         GLuint *dstRow = (GLuint *) dstAddr
+            + dstImageOffsets[dstZoffset + img]
+            + dstYoffset * dstRowStride / sizeof(GLuint)
+            + dstXoffset;
+         const GLuint *src
+            = (const GLuint *) _mesa_image_address(dims, srcPacking, srcAddr,
+                  srcWidth, srcHeight,
+                  srcFormat, srcType,
+                  img, 0, 0);
+         for (row = 0; row < srcHeight; row++) {
+            GLuint depth[MAX_WIDTH];
+            GLint i;
+            _mesa_unpack_depth_span(ctx, srcWidth,
+                                    GL_UNSIGNED_INT, /* dst type */
+                                    depth, /* dst addr */
+                                    depthScale,
+                                    srcType, src, srcPacking);
 
-         src += srcRowStride;
-         dstRow += dstRowStride / sizeof(GLuint);
+            for (i = 0; i < srcWidth; i++)
+               dstRow[i] = depth[i] | (dstRow[i] & 0xFF000000);
+
+            src += srcRowStride;
+            dstRow += dstRowStride / sizeof(GLuint);
+         }
+      }
+   } else {
+      for (img = 0; img < srcDepth; img++) {
+         GLuint *dstRow = (GLuint *) dstAddr
+            + dstImageOffsets[dstZoffset + img]
+            + dstYoffset * dstRowStride / sizeof(GLuint)
+            + dstXoffset;
+         const GLuint *src
+            = (const GLuint *) _mesa_image_address(dims, srcPacking, srcAddr,
+                  srcWidth, srcHeight,
+                  srcFormat, srcType,
+                  img, 0, 0);
+         for (row = 0; row < srcHeight; row++) {
+            GLubyte stencil[MAX_WIDTH];
+            GLint i;
+            /* the 24 depth bits will be in the high position: */
+            _mesa_unpack_depth_span(ctx, srcWidth,
+                                    GL_UNSIGNED_INT, /* dst type */
+                                    dstRow, /* dst addr */
+                                    depthScale,
+                                    srcType, src, srcPacking);
+            /* get the 8-bit stencil values */
+            _mesa_unpack_stencil_span(ctx, srcWidth,
+                                      GL_UNSIGNED_BYTE, /* dst type */
+                                      stencil, /* dst addr */
+                                      srcType, src, srcPacking,
+                                      ctx->_ImageTransferState);
+            /* merge stencil values into depth values */
+            for (i = 0; i < srcWidth; i++)
+               dstRow[i] = stencil[i] << 24;
+
+            src += srcRowStride;
+            dstRow += dstRowStride / sizeof(GLuint);
+         }
       }
    }
    return GL_TRUE;
-- 
cgit v1.2.3


From c366fd83b617db6c8c064802ff4bf120d654507d Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Tue, 17 Jun 2008 11:29:59 -0600
Subject: mesa: add parenthesis

---
 src/mesa/main/dd.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index 37ef2a865b..a24021c63f 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -912,9 +912,9 @@ struct dd_function_table {
    void (*ValidateTnlModule)( GLcontext *ctx, GLuint new_state );
 
 
-#define PRIM_OUTSIDE_BEGIN_END   GL_POLYGON+1
-#define PRIM_INSIDE_UNKNOWN_PRIM GL_POLYGON+2
-#define PRIM_UNKNOWN             GL_POLYGON+3
+#define PRIM_OUTSIDE_BEGIN_END   (GL_POLYGON+1)
+#define PRIM_INSIDE_UNKNOWN_PRIM (GL_POLYGON+2)
+#define PRIM_UNKNOWN             (GL_POLYGON+3)
 
    /**
     * Set by the driver-supplied T&L engine.  
-- 
cgit v1.2.3


From 03d579aa19bcb1facec5ab67b6f7123e9ec9f26e Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Tue, 17 Jun 2008 16:56:32 -0600
Subject: mesa: FEATURE_dispatch to control dispatch table usage

---
 src/mesa/main/context.c   | 2 ++
 src/mesa/main/mfeatures.h | 1 +
 2 files changed, 3 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index dcc518e9fd..439ac6aba5 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1168,7 +1168,9 @@ _mesa_initialize_context(GLcontext *ctx,
       if (ctx->Exec)
          _mesa_free(ctx->Exec);
    }
+#if FEATURE_dispatch
    _mesa_init_exec_table(ctx->Exec);
+#endif
    ctx->CurrentDispatch = ctx->Exec;
 #if FEATURE_dlist
    _mesa_init_dlist_table(ctx->Save);
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index 4e60611c48..6a71954648 100644
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -40,6 +40,7 @@
 #define FEATURE_attrib_stack  _HAVE_FULL_GL
 #define FEATURE_colortable  _HAVE_FULL_GL
 #define FEATURE_convolution  _HAVE_FULL_GL
+#define FEATURE_dispatch  _HAVE_FULL_GL
 #define FEATURE_dlist  _HAVE_FULL_GL
 #define FEATURE_draw_read_buffer  _HAVE_FULL_GL
 #define FEATURE_drawpix  _HAVE_FULL_GL
-- 
cgit v1.2.3


From 19f872f2ecb45d5e95ccd2b434a88781c9b4f451 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 18 Jun 2008 09:30:13 -0600
Subject: mesa: fix ReadBuffer initialization

---
 src/mesa/main/context.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 439ac6aba5..8aab1eebc8 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1011,6 +1011,8 @@ init_attrib_groups(GLcontext *ctx)
    _mesa_init_multisample( ctx );
 #if FEATURE_pixel_transfer
    _mesa_init_pixel( ctx );
+#else
+   ctx->Pixel.ReadBuffer = ctx->Visual.doubleBufferMode ? GL_BACK : GL_FRONT;
 #endif
    _mesa_init_pixelstore( ctx );
    _mesa_init_point( ctx );
-- 
cgit v1.2.3


From b623fa9e2d6f97f9febc978c158d790b26e175a7 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 18 Jun 2008 19:43:06 +0200
Subject: mesa: Fix bug in _mesa_swizzle_ubyte_image

---
 src/mesa/main/texstore.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index d7bfb69443..519a73b960 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -823,7 +823,8 @@ _mesa_swizzle_ubyte_image(GLcontext *ctx,
 
 /*    _mesa_printf("map %d %d %d %d\n", map[0], map[1], map[2], map[3]);  */
 
-   if (srcRowStride == dstRowStride &&
+   if (srcComponents == dstComponents &&
+       srcRowStride == dstRowStride &&
        srcRowStride == srcWidth * srcComponents &&
        dimensions < 3) {
       /* 1 and 2D images only */
-- 
cgit v1.2.3


From 907c0978affb6bc7f8cb077f568829ecfaa89b04 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 20 Jun 2008 08:07:38 -0600
Subject: mesa: test for FEATURE_ATI_fragment_shader

---
 src/mesa/main/context.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 8aab1eebc8..bd90027c8a 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -149,7 +149,9 @@
 #include "glapi/glapitable.h"
 #include "shader/program.h"
 #include "shader/shader_api.h"
+#if FEATURE_ATI_fragment_shader
 #include "shader/atifragshader.h"
+#endif
 #if _HAVE_FULL_GL
 #include "math/m_translate.h"
 #include "math/m_matrix.h"
-- 
cgit v1.2.3


From 95c9fc82f58a8f38d25b3e405891566c8f8a51f6 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 20 Jun 2008 10:47:38 -0600
Subject: mesa: fix some FEATURE_x tests

---
 src/mesa/main/context.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index bd90027c8a..e5264bcaf9 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -441,9 +441,7 @@ alloc_shared_state( GLcontext *ctx )
 
    ss->DisplayList = _mesa_NewHashTable();
    ss->TexObjects = _mesa_NewHashTable();
-#if FEATURE_NV_vertex_program || FEATURE_NV_fragment_program
    ss->Programs = _mesa_NewHashTable();
-#endif
 
 #if FEATURE_ARB_vertex_program
    ss->DefaultVertexProgram = (struct gl_vertex_program *)
@@ -533,10 +531,8 @@ alloc_shared_state( GLcontext *ctx )
       _mesa_DeleteHashTable(ss->DisplayList);
    if (ss->TexObjects)
       _mesa_DeleteHashTable(ss->TexObjects);
-#if FEATURE_NV_vertex_program
    if (ss->Programs)
       _mesa_DeleteHashTable(ss->Programs);
-#endif
 #if FEATURE_ARB_vertex_program
    _mesa_reference_vertprog(ctx, &ss->DefaultVertexProgram, NULL);
 #endif
@@ -723,10 +719,9 @@ free_shared_state( GLcontext *ctx, struct gl_shared_state *ss )
    _mesa_DeleteHashTable(ss->ShaderObjects);
 #endif
 
-#if defined(FEATURE_NV_vertex_program) || defined(FEATURE_NV_fragment_program)
    _mesa_HashDeleteAll(ss->Programs, delete_program_cb, ctx);
    _mesa_DeleteHashTable(ss->Programs);
-#endif
+
 #if FEATURE_ARB_vertex_program
    _mesa_reference_vertprog(ctx, &ss->DefaultVertexProgram, NULL);
 #endif
-- 
cgit v1.2.3


From 9cae37870e66550d8cceac4b4a8765c1936d4ddc Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 20 Jun 2008 11:05:00 -0600
Subject: mesa: revamp glBlendFunc loopback

---
 src/mesa/main/blend.c | 10 +---------
 src/mesa/main/dlist.c |  9 ++++++++-
 2 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/blend.c b/src/mesa/main/blend.c
index 742247f8e2..4d4a897141 100644
--- a/src/mesa/main/blend.c
+++ b/src/mesa/main/blend.c
@@ -46,19 +46,11 @@
  * \param dfactor destination factor operator.
  *
  * \sa glBlendFunc, glBlendFuncSeparateEXT
- *
- * Swizzles the inputs and calls \c glBlendFuncSeparateEXT.  This is done
- * using the \c CurrentDispatch table in the context, so this same function
- * can be used while compiling display lists.  Therefore, there is no need
- * for the display list code to save and restore this function.
  */
 void GLAPIENTRY
 _mesa_BlendFunc( GLenum sfactor, GLenum dfactor )
 {
-   GET_CURRENT_CONTEXT(ctx);
-
-   (*ctx->CurrentDispatch->BlendFuncSeparateEXT)( sfactor, dfactor,
-						  sfactor, dfactor );
+   _mesa_BlendFuncSeparateEXT(sfactor, dfactor, sfactor, dfactor);
 }
 
 
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 07d279da30..c672c0f8b8 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -925,6 +925,13 @@ save_BlendFuncSeparateEXT(GLenum sfactorRGB, GLenum dfactorRGB,
 }
 
 
+static void GLAPIENTRY
+save_BlendFunc(GLenum srcfactor, GLenum dstfactor)
+{
+   save_BlendFuncSeparate(srcfactor, dstfactor, srcfactor, dstfactor);
+}
+
+
 static void GLAPIENTRY
 save_BlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
@@ -7602,7 +7609,7 @@ _mesa_init_dlist_table(struct _glapi_table *table)
    SET_Accum(table, save_Accum);
    SET_AlphaFunc(table, save_AlphaFunc);
    SET_Bitmap(table, save_Bitmap);
-   SET_BlendFunc(table, _mesa_BlendFunc);       /* loops-back to BlendFuncSeparate */
+   SET_BlendFunc(table, _save_BlendFunc);
    SET_CallList(table, _mesa_save_CallList);
    SET_CallLists(table, _mesa_save_CallLists);
    SET_Clear(table, save_Clear);
-- 
cgit v1.2.3


From 39ce3940828fb816d7c1cf7f061d85f7db9a0c28 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 20 Jun 2008 11:15:30 -0600
Subject: mesa: fix errors in prev commit

---
 src/mesa/main/dlist.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index c672c0f8b8..b4ed300b2e 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -928,7 +928,7 @@ save_BlendFuncSeparateEXT(GLenum sfactorRGB, GLenum dfactorRGB,
 static void GLAPIENTRY
 save_BlendFunc(GLenum srcfactor, GLenum dstfactor)
 {
-   save_BlendFuncSeparate(srcfactor, dstfactor, srcfactor, dstfactor);
+   save_BlendFuncSeparateEXT(srcfactor, dstfactor, srcfactor, dstfactor);
 }
 
 
@@ -7609,7 +7609,7 @@ _mesa_init_dlist_table(struct _glapi_table *table)
    SET_Accum(table, save_Accum);
    SET_AlphaFunc(table, save_AlphaFunc);
    SET_Bitmap(table, save_Bitmap);
-   SET_BlendFunc(table, _save_BlendFunc);
+   SET_BlendFunc(table, save_BlendFunc);
    SET_CallList(table, _mesa_save_CallList);
    SET_CallLists(table, _mesa_save_CallLists);
    SET_Clear(table, save_Clear);
-- 
cgit v1.2.3


From 8e0f166eb5edb8537af573d8d33a26ffaf8e66c9 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 20 Jun 2008 11:31:05 -0600
Subject: mesa: refactor: move initialization of DefaultPacking state.

---
 src/mesa/main/pixel.c      | 20 --------------------
 src/mesa/main/pixelstore.c | 20 ++++++++++++++++++++
 2 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/pixel.c b/src/mesa/main/pixel.c
index c9c4289f69..c98506b2bb 100644
--- a/src/mesa/main/pixel.c
+++ b/src/mesa/main/pixel.c
@@ -910,26 +910,6 @@ _mesa_init_pixel( GLcontext *ctx )
    ASSIGN_4V(ctx->Pixel.TextureColorTableScale, 1.0, 1.0, 1.0, 1.0);
    ASSIGN_4V(ctx->Pixel.TextureColorTableBias, 0.0, 0.0, 0.0, 0.0);
 
-   /*
-    * _mesa_unpack_image() returns image data in this format.  When we
-    * execute image commands (glDrawPixels(), glTexImage(), etc) from
-    * within display lists we have to be sure to set the current
-    * unpacking parameters to these values!
-    */
-   ctx->DefaultPacking.Alignment = 1;
-   ctx->DefaultPacking.RowLength = 0;
-   ctx->DefaultPacking.SkipPixels = 0;
-   ctx->DefaultPacking.SkipRows = 0;
-   ctx->DefaultPacking.ImageHeight = 0;
-   ctx->DefaultPacking.SkipImages = 0;
-   ctx->DefaultPacking.SwapBytes = GL_FALSE;
-   ctx->DefaultPacking.LsbFirst = GL_FALSE;
-   ctx->DefaultPacking.ClientStorage = GL_FALSE;
-   ctx->DefaultPacking.Invert = GL_FALSE;
-#if FEATURE_EXT_pixel_buffer_object
-   ctx->DefaultPacking.BufferObj = ctx->Array.NullBufferObj;
-#endif
-
    if (ctx->Visual.doubleBufferMode) {
       ctx->Pixel.ReadBuffer = GL_BACK;
    }
diff --git a/src/mesa/main/pixelstore.c b/src/mesa/main/pixelstore.c
index 3bf89bd3e1..ff1a6344cc 100644
--- a/src/mesa/main/pixelstore.c
+++ b/src/mesa/main/pixelstore.c
@@ -260,4 +260,24 @@ _mesa_init_pixelstore( GLcontext *ctx )
 #if FEATURE_EXT_pixel_buffer_object
    ctx->Unpack.BufferObj = ctx->Array.NullBufferObj;
 #endif
+
+   /*
+    * _mesa_unpack_image() returns image data in this format.  When we
+    * execute image commands (glDrawPixels(), glTexImage(), etc) from
+    * within display lists we have to be sure to set the current
+    * unpacking parameters to these values!
+    */
+   ctx->DefaultPacking.Alignment = 1;
+   ctx->DefaultPacking.RowLength = 0;
+   ctx->DefaultPacking.SkipPixels = 0;
+   ctx->DefaultPacking.SkipRows = 0;
+   ctx->DefaultPacking.ImageHeight = 0;
+   ctx->DefaultPacking.SkipImages = 0;
+   ctx->DefaultPacking.SwapBytes = GL_FALSE;
+   ctx->DefaultPacking.LsbFirst = GL_FALSE;
+   ctx->DefaultPacking.ClientStorage = GL_FALSE;
+   ctx->DefaultPacking.Invert = GL_FALSE;
+#if FEATURE_EXT_pixel_buffer_object
+   ctx->DefaultPacking.BufferObj = ctx->Array.NullBufferObj;
+#endif
 }
-- 
cgit v1.2.3


From 42c468a5dea30d1428205d81798eaf3a0c42ef3a Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 20 Jun 2008 11:32:22 -0600
Subject: mesa: initial support for fixed-pt vertex arrays

---
 src/mesa/main/glheader.h  |  5 +++++
 src/mesa/main/mfeatures.h |  1 +
 src/mesa/main/varray.c    | 20 ++++++++++++++++++++
 3 files changed, 26 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h
index fd4127558a..0f74bc83cc 100644
--- a/src/mesa/main/glheader.h
+++ b/src/mesa/main/glheader.h
@@ -145,6 +145,11 @@
 #include "GL/glext.h"
 
 
+#ifndef GL_FIXED
+#define GL_FIXED 0x140C
+#endif
+
+
 #if !defined(CAPI) && defined(WIN32) && !defined(BUILD_FOR_SNAP)
 #define CAPI _cdecl
 #endif
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index 6a71954648..13397e97ba 100644
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -46,6 +46,7 @@
 #define FEATURE_drawpix  _HAVE_FULL_GL
 #define FEATURE_evaluators  _HAVE_FULL_GL
 #define FEATURE_feedback  _HAVE_FULL_GL
+#define FEATURE_fixedpt 0
 #define FEATURE_histogram  _HAVE_FULL_GL
 #define FEATURE_pixel_transfer  _HAVE_FULL_GL
 #define FEATURE_texgen  _HAVE_FULL_GL
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index fe4a7c684f..9474724c33 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -121,6 +121,11 @@ _mesa_VertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
       case GL_DOUBLE:
          elementSize = size * sizeof(GLdouble);
          break;
+#if FEATURE_fixedpt
+      case GL_FIXED:
+         elementSize = size * sizeof(GLfixed);
+         break;
+#endif
       default:
          _mesa_error( ctx, GL_INVALID_ENUM, "glVertexPointer(type)" );
          return;
@@ -166,6 +171,11 @@ _mesa_NormalPointer(GLenum type, GLsizei stride, const GLvoid *ptr )
       case GL_DOUBLE:
          elementSize = 3 * sizeof(GLdouble);
          break;
+#if FEATURE_fixedpt
+      case GL_FIXED:
+         elementSize = 3 * sizeof(GLfixed);
+         break;
+#endif
       default:
          _mesa_error( ctx, GL_INVALID_ENUM, "glNormalPointer(type)" );
          return;
@@ -224,6 +234,11 @@ _mesa_ColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
       case GL_DOUBLE:
          elementSize = size * sizeof(GLdouble);
          break;
+#if FEATURE_fixedpt
+      case GL_FIXED:
+         elementSize = size * sizeof(GLfixed);
+         break;
+#endif
       default:
          _mesa_error( ctx, GL_INVALID_ENUM, "glColorPointer(type)" );
          return;
@@ -405,6 +420,11 @@ _mesa_TexCoordPointer(GLint size, GLenum type, GLsizei stride,
       case GL_DOUBLE:
          elementSize = size * sizeof(GLdouble);
          break;
+#if FEATURE_fixedpt
+      case GL_FIXED:
+         elementSize = size * sizeof(GLfixed);
+         break;
+#endif
       default:
          _mesa_error( ctx, GL_INVALID_ENUM, "glTexCoordPointer(type)" );
          return;
-- 
cgit v1.2.3


From a9b46b9e4c79665febb21180150ba54731aa4bc9 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 20 Jun 2008 11:49:25 -0600
Subject: mesa: GL_BYTE vertex/texcoord arrays

---
 src/mesa/main/mfeatures.h |  1 +
 src/mesa/main/varray.c    | 10 ++++++++++
 2 files changed, 11 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index 13397e97ba..a305bbd605 100644
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -53,6 +53,7 @@
 #define FEATURE_texture_fxt1  _HAVE_FULL_GL
 #define FEATURE_texture_s3tc  _HAVE_FULL_GL
 #define FEATURE_userclip  _HAVE_FULL_GL
+#define FEATURE_vertex_array_byte 0
 
 #define FEATURE_ARB_occlusion_query  _HAVE_FULL_GL
 #define FEATURE_ARB_fragment_program  _HAVE_FULL_GL
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 9474724c33..220db35855 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -125,6 +125,11 @@ _mesa_VertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
       case GL_FIXED:
          elementSize = size * sizeof(GLfixed);
          break;
+#endif
+#if FEATURE_vertex_array_byte
+      case GL_BYTE:
+         elementSize = size * sizeof(GLbyte);
+         break;
 #endif
       default:
          _mesa_error( ctx, GL_INVALID_ENUM, "glVertexPointer(type)" );
@@ -424,6 +429,11 @@ _mesa_TexCoordPointer(GLint size, GLenum type, GLsizei stride,
       case GL_FIXED:
          elementSize = size * sizeof(GLfixed);
          break;
+#endif
+#if FEATURE_vertex_array_byte
+      case GL_BYTE:
+         elementSize = size * sizeof(GLbyte);
+         break;
 #endif
       default:
          _mesa_error( ctx, GL_INVALID_ENUM, "glTexCoordPointer(type)" );
-- 
cgit v1.2.3


From 36aae1868345567975ce4fa449b547ae3e01dbc3 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 20 Jun 2008 14:29:49 -0600
Subject: mesa: init ctx->RenderMode

---
 src/mesa/main/context.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index e5264bcaf9..be93d844e0 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -996,6 +996,8 @@ init_attrib_groups(GLcontext *ctx)
 #endif
 #if FEATURE_feedback
    _mesa_init_feedback( ctx );
+#else
+   ctx->RenderMode = GL_RENDER;
 #endif
    _mesa_init_fog( ctx );
 #if FEATURE_histogram
-- 
cgit v1.2.3


From 2a5a95d0c08fe07b50385028b6972a4383f2b095 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Fri, 20 Jun 2008 18:29:23 -0600
Subject: gallium: s/feadback/feedback/, duh

---
 src/mesa/main/api_exec.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index 8ebe4a3e4a..0c3c9c4de4 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -74,7 +74,7 @@
 #include "eval.h"
 #endif
 #include "get.h"
-#if FEATURE_feadback
+#if FEATURE_feedback
 #include "feedback.h"
 #endif
 #include "fog.h"
@@ -222,7 +222,7 @@ _mesa_init_exec_table(struct _glapi_table *exec)
    SET_CopyPixels(exec, _mesa_CopyPixels);
    SET_DrawPixels(exec, _mesa_DrawPixels);
 #endif
-#if FEATURE_feadback
+#if FEATURE_feedback
    SET_InitNames(exec, _mesa_InitNames);
    SET_FeedbackBuffer(exec, _mesa_FeedbackBuffer);
    SET_LoadName(exec, _mesa_LoadName);
-- 
cgit v1.2.3


From 8db7ef544c4f1be702e34b97882441df31274f10 Mon Sep 17 00:00:00 2001
From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Tue, 24 Jun 2008 02:37:21 +0900
Subject: mesa: ASSERT macro is already defined by WinCE headers.

Even when just the standard headers are used....
---
 src/mesa/main/glheader.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h
index 0f74bc83cc..9e39a8370e 100644
--- a/src/mesa/main/glheader.h
+++ b/src/mesa/main/glheader.h
@@ -233,6 +233,7 @@
 #endif
 
 
+#if !defined(_WIN32_WCE)
 #if defined(BUILD_FOR_SNAP) && defined(CHECKED)
 #  define ASSERT(X)   _CHECK(X) 
 #elif defined(DEBUG)
@@ -240,6 +241,7 @@
 #else
 #  define ASSERT(X)
 #endif
+#endif
 
 
 #if !defined __GNUC__ || __GNUC__ < 3
-- 
cgit v1.2.3


From c47248bdf8d55f985b199fc6e15b0177305cb6fd Mon Sep 17 00:00:00 2001
From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Tue, 24 Jun 2008 10:18:08 +0900
Subject: mesa: Move variable declarations to the scope top.

---
 src/mesa/main/texstore.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index 519a73b960..113eef69f4 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -2405,16 +2405,15 @@ GLboolean
 _mesa_texstore_s8_z24(TEXSTORE_PARAMS)
 {
    const GLuint depthScale = 0xffffff;
-
-   ASSERT(dstFormat == &_mesa_texformat_s8_z24);
-   ASSERT(srcFormat == GL_DEPTH_STENCIL_EXT || srcFormat == GL_DEPTH_COMPONENT);
-   ASSERT(srcFormat != GL_DEPTH_STENCIL_EXT || srcType == GL_UNSIGNED_INT_24_8_EXT);
-
    const GLint srcRowStride
       = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType)
       / sizeof(GLuint);
    GLint img, row;
 
+   ASSERT(dstFormat == &_mesa_texformat_s8_z24);
+   ASSERT(srcFormat == GL_DEPTH_STENCIL_EXT || srcFormat == GL_DEPTH_COMPONENT);
+   ASSERT(srcFormat != GL_DEPTH_STENCIL_EXT || srcType == GL_UNSIGNED_INT_24_8_EXT);
+
    /* Incase we only upload depth we need to preserve the stencil */
    if (srcFormat == GL_DEPTH_COMPONENT) {
       for (img = 0; img < srcDepth; img++) {
-- 
cgit v1.2.3


From 182b644c71462d86be2f2c79c9ff3fa636b7470a Mon Sep 17 00:00:00 2001
From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Tue, 24 Jun 2008 10:58:55 +0900
Subject: mesa: bsearch implementation for WinCE.

---
 src/mesa/main/imports.c | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index d798f80e25..c46e5beb91 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -765,7 +765,24 @@ void *
 _mesa_bsearch( const void *key, const void *base, size_t nmemb, size_t size, 
                int (*compar)(const void *, const void *) )
 {
+#if defined(_WIN32_WCE)
+   void *mid;
+   int cmp;
+   while (nmemb) {
+      nmemb >>= 1;
+      mid = (char *)base + nmemb * size;
+      cmp = (*compar)(key, mid);
+      if (cmp == 0)
+	 return mid;
+      if (cmp > 0) {
+	 base = (char *)mid + size;
+	 --nmemb;
+      }
+   }
+   return NULL;
+#else
    return bsearch(key, base, nmemb, size, compar);
+#endif
 }
 
 /*@}*/
@@ -781,7 +798,7 @@ _mesa_bsearch( const void *key, const void *base, size_t nmemb, size_t size,
 char *
 _mesa_getenv( const char *var )
 {
-#if defined(_XBOX)
+#if defined(_XBOX) || defined(_WIN32_WCE)
    return NULL;
 #else
    return getenv(var);
-- 
cgit v1.2.3


From 80b359f574cd8565af46e0900d2da9dd0faf4291 Mon Sep 17 00:00:00 2001
From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Tue, 24 Jun 2008 11:33:03 +0900
Subject: mesa: Use _mesa_bsearch.

---
 src/mesa/main/enums.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/enums.c b/src/mesa/main/enums.c
index 6aeb18fa27..8ce6b51d17 100644
--- a/src/mesa/main/enums.c
+++ b/src/mesa/main/enums.c
@@ -4870,8 +4870,8 @@ const char *_mesa_lookup_enum_by_nr( int nr )
 {
    unsigned * i;
 
-   i = (unsigned *)bsearch( & nr, reduced_enums, Elements(reduced_enums),
-                            sizeof(reduced_enums[0]), (cfunc) compar_nr );
+   i = (unsigned *)_mesa_bsearch( & nr, reduced_enums, Elements(reduced_enums),
+                                  sizeof(reduced_enums[0]), (cfunc) compar_nr );
 
    if ( i != NULL ) {
       return & enum_string_table[ all_enums[ *i ].offset ];
@@ -4888,8 +4888,8 @@ int _mesa_lookup_enum_by_name( const char *symbol )
    enum_elt * f = NULL;
 
    if ( symbol != NULL ) {
-      f = (enum_elt *)bsearch( symbol, all_enums, Elements(all_enums),
-			       sizeof( enum_elt ), (cfunc) compar_name );
+      f = (enum_elt *)_mesa_bsearch( symbol, all_enums, Elements(all_enums),
+                                     sizeof( enum_elt ), (cfunc) compar_name );
    }
 
    return (f != NULL) ? f->n : -1;
-- 
cgit v1.2.3


From 18ec140ef27b6488bea9d54e21b08b0a3afbcafe Mon Sep 17 00:00:00 2001
From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Tue, 24 Jun 2008 11:34:46 +0900
Subject: mesa: Use appropriate unsigned/signed, float/integer types.

---
 src/mesa/main/mm.c                        |  4 ++--
 src/mesa/shader/program.c                 |  2 +-
 src/mesa/shader/shader_api.c              |  4 ++--
 src/mesa/shader/slang/slang_compile.c     |  2 +-
 src/mesa/shader/slang/slang_print.c       |  6 +++---
 src/mesa/state_tracker/st_cb_drawpixels.c | 18 +++++++++---------
 src/mesa/state_tracker/st_cb_readpixels.c |  9 +++++----
 src/mesa/state_tracker/st_draw.c          |  2 +-
 src/mesa/state_tracker/st_extensions.c    | 12 ++++++------
 9 files changed, 30 insertions(+), 29 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mm.c b/src/mesa/main/mm.c
index fb7809ed22..9f3aa00aff 100644
--- a/src/mesa/main/mm.c
+++ b/src/mesa/main/mm.c
@@ -164,8 +164,8 @@ mmAllocMem(struct mem_block *heap, int size, int align2, int startSearch)
 {
    struct mem_block *p;
    const int mask = (1 << align2)-1;
-   unsigned int startofs = 0;
-   unsigned int endofs;
+   int startofs = 0;
+   int endofs;
 
    if (!heap || align2 < 0 || size <= 0)
       return NULL;
diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c
index a0817a91ec..b27ed6b7d3 100644
--- a/src/mesa/shader/program.c
+++ b/src/mesa/shader/program.c
@@ -467,7 +467,7 @@ _mesa_insert_instructions(struct gl_program *prog, GLuint start, GLuint count)
    for (i = 0; i < prog->NumInstructions; i++) {
       struct prog_instruction *inst = prog->Instructions + i;
       if (inst->BranchTarget > 0) {
-         if (inst->BranchTarget >= start) {
+         if ((GLuint)inst->BranchTarget >= start) {
             inst->BranchTarget += count;
          }
       }
diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index 856179e1d5..97edb25400 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -1079,7 +1079,7 @@ update_textures_used(struct gl_program *prog)
  */
 static void
 set_program_uniform(GLcontext *ctx, struct gl_program *program, GLint location,
-                    GLenum type, GLint count, GLint elems, const void *values)
+                    GLenum type, GLsizei count, GLint elems, const void *values)
 {
    if (program->Parameters->Parameters[location].Type == PROGRAM_SAMPLER) {
       /* This controls which texture unit which is used by a sampler */
@@ -1111,7 +1111,7 @@ set_program_uniform(GLcontext *ctx, struct gl_program *program, GLint location,
    }
    else {
       /* ordinary uniform variable */
-      GLuint k, i;
+      GLsizei k, i;
 
       if (count * elems > program->Parameters->Parameters[location].Size) {
          _mesa_error(ctx, GL_INVALID_OPERATION, "glUniform(count too large)");
diff --git a/src/mesa/shader/slang/slang_compile.c b/src/mesa/shader/slang/slang_compile.c
index cdea1c5128..8485103129 100644
--- a/src/mesa/shader/slang/slang_compile.c
+++ b/src/mesa/shader/slang/slang_compile.c
@@ -1934,7 +1934,7 @@ compile_with_grammar(grammar id, const char *source, slang_code_unit * unit,
    byte *prod;
    GLuint size, start, version;
    slang_string preprocessed;
-   int maxVersion;
+   GLuint maxVersion;
 
 #if FEATURE_ARB_shading_language_120
    maxVersion = 120;
diff --git a/src/mesa/shader/slang/slang_print.c b/src/mesa/shader/slang/slang_print.c
index f3e127cb13..4a7d4bbbc7 100644
--- a/src/mesa/shader/slang/slang_print.c
+++ b/src/mesa/shader/slang/slang_print.c
@@ -182,14 +182,14 @@ static void
 print_generic2(const slang_operation *op, const char *oper,
                const char *s, int indent)
 {
-   int i;
+   GLuint i;
    if (oper) {
       spaces(indent);
       printf("[%p locals %p] %s %s\n", (void*) op, (void*) op->locals, oper, s);
    }
    for (i = 0; i < op->num_children; i++) {
       spaces(indent);
-      printf("//child %d:\n", i);
+      printf("//child %u:\n", i);
       slang_print_tree(&op->children[i], indent);
    }
 }
@@ -804,7 +804,7 @@ int
 slang_checksum_tree(const slang_operation *op)
 {
    int s = op->num_children;
-   int i;
+   GLuint i;
 
    for (i = 0; i < op->num_children; i++) {
       s += slang_checksum_tree(&op->children[i]);
diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index a486581989..8fdeb5c380 100644
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -517,7 +517,7 @@ draw_textured_quad(GLcontext *ctx, GLint x, GLint y, GLfloat z,
    struct pipe_context *pipe = ctx->st->pipe;
    struct cso_context *cso = ctx->st->cso_context;
    GLfloat x0, y0, x1, y1;
-   GLuint maxSize;
+   GLsizei maxSize;
 
    /* limit checks */
    /* XXX if DrawPixels image is larger than max texture size, break
@@ -574,14 +574,14 @@ draw_textured_quad(GLcontext *ctx, GLint x, GLint y, GLfloat z,
       const float width = ctx->DrawBuffer->Width;
       const float height = ctx->DrawBuffer->Height;
       struct pipe_viewport_state vp;
-      vp.scale[0] =  0.5 * width;
-      vp.scale[1] = -0.5 * height;
-      vp.scale[2] = 1.0;
-      vp.scale[3] = 1.0;
-      vp.translate[0] = 0.5 * width;
-      vp.translate[1] = 0.5 * height;
-      vp.translate[2] = 0.0;
-      vp.translate[3] = 0.0;
+      vp.scale[0] =  0.5f * width;
+      vp.scale[1] = -0.5f * height;
+      vp.scale[2] = 1.0f;
+      vp.scale[3] = 1.0f;
+      vp.translate[0] = 0.5f * width;
+      vp.translate[1] = 0.5f * height;
+      vp.translate[2] = 0.0f;
+      vp.translate[3] = 0.0f;
       cso_set_viewport(cso, &vp);
    }
 
diff --git a/src/mesa/state_tracker/st_cb_readpixels.c b/src/mesa/state_tracker/st_cb_readpixels.c
index 08934af319..c5193631a7 100644
--- a/src/mesa/state_tracker/st_cb_readpixels.c
+++ b/src/mesa/state_tracker/st_cb_readpixels.c
@@ -177,7 +177,8 @@ st_readpixels(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height,
    struct pipe_screen *screen = pipe->screen;
    GLfloat temp[MAX_WIDTH][4];
    const GLbitfield transferOps = ctx->_ImageTransferState;
-   GLint i, yStep, dfStride;
+   GLsizei i, j;
+   GLint yStep, dfStride;
    GLfloat *df;
    struct st_renderbuffer *strb;
    struct gl_pixelstore_attrib clippedPacking = *pack;
@@ -258,7 +259,7 @@ st_readpixels(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height,
           surf->format == PIPE_FORMAT_X8Z24_UNORM) {
          if (format == GL_DEPTH_COMPONENT) {
             for (i = 0; i < height; i++) {
-               GLuint ztemp[MAX_WIDTH], j;
+               GLuint ztemp[MAX_WIDTH];
                GLfloat zfloat[MAX_WIDTH];
                const double scale = 1.0 / ((1 << 24) - 1);
                pipe_get_tile_raw(pipe, surf, x, y, width, 1, ztemp, 0);
@@ -283,7 +284,7 @@ st_readpixels(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height,
       }
       else if (surf->format == PIPE_FORMAT_Z16_UNORM) {
          for (i = 0; i < height; i++) {
-            GLushort ztemp[MAX_WIDTH], j;
+            GLushort ztemp[MAX_WIDTH];
             GLfloat zfloat[MAX_WIDTH];
             const double scale = 1.0 / 0xffff;
             pipe_get_tile_raw(pipe, surf, x, y, width, 1, ztemp, 0);
@@ -298,7 +299,7 @@ st_readpixels(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height,
       }
       else if (surf->format == PIPE_FORMAT_Z32_UNORM) {
          for (i = 0; i < height; i++) {
-            GLuint ztemp[MAX_WIDTH], j;
+            GLuint ztemp[MAX_WIDTH];
             GLfloat zfloat[MAX_WIDTH];
             const double scale = 1.0 / 0xffffffff;
             pipe_get_tile_raw(pipe, surf, x, y, width, 1, ztemp, 0);
diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index 6867d50c87..21911774d7 100644
--- a/src/mesa/state_tracker/st_draw.c
+++ b/src/mesa/state_tracker/st_draw.c
@@ -216,7 +216,7 @@ setup_edgeflags(GLcontext *ctx, GLenum primMode, GLint start, GLint count,
        (ctx->Polygon.FrontMode != GL_FILL ||
         ctx->Polygon.BackMode != GL_FILL)) {
       /* need edge flags */
-      GLuint i;
+      GLint i;
       unsigned *vec;
       struct st_buffer_object *stobj = st_buffer_object(array->BufferObj);
       ubyte *map;
diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index 6f94ba39ae..d804d2b453 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -43,7 +43,7 @@ static int _min(int a, int b)
    return (a < b) ? a : b;
 }
 
-static int _max(int a, int b)
+static float _maxf(float a, float b)
 {
    return (a > b) ? a : b;
 }
@@ -94,17 +94,17 @@ void st_init_limits(struct st_context *st)
               1, MAX_DRAW_BUFFERS);
 
    c->MaxLineWidth
-      = _max(1.0, screen->get_paramf(screen, PIPE_CAP_MAX_LINE_WIDTH));
+      = _maxf(1.0f, screen->get_paramf(screen, PIPE_CAP_MAX_LINE_WIDTH));
    c->MaxLineWidthAA
-      = _max(1.0, screen->get_paramf(screen, PIPE_CAP_MAX_LINE_WIDTH_AA));
+      = _maxf(1.0f, screen->get_paramf(screen, PIPE_CAP_MAX_LINE_WIDTH_AA));
 
    c->MaxPointSize
-      = _max(1.0, screen->get_paramf(screen, PIPE_CAP_MAX_POINT_WIDTH));
+      = _maxf(1.0f, screen->get_paramf(screen, PIPE_CAP_MAX_POINT_WIDTH));
    c->MaxPointSizeAA
-      = _max(1.0, screen->get_paramf(screen, PIPE_CAP_MAX_POINT_WIDTH_AA));
+      = _maxf(1.0f, screen->get_paramf(screen, PIPE_CAP_MAX_POINT_WIDTH_AA));
 
    c->MaxTextureMaxAnisotropy
-      = _max(2.0, screen->get_paramf(screen, PIPE_CAP_MAX_TEXTURE_ANISOTROPY));
+      = _maxf(2.0f, screen->get_paramf(screen, PIPE_CAP_MAX_TEXTURE_ANISOTROPY));
 
    c->MaxTextureLodBias
       = screen->get_paramf(screen, PIPE_CAP_MAX_TEXTURE_LOD_BIAS);
-- 
cgit v1.2.3


From 5c1a78b7a85d23ad1358b34d03a0002a19483655 Mon Sep 17 00:00:00 2001
From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Tue, 24 Jun 2008 13:12:41 +0900
Subject: mesa: More signed/unsigned float/integer fixes.

---
 src/mesa/main/mm.c                        | 20 ++++++++++----------
 src/mesa/main/mm.h                        | 16 ++++++++--------
 src/mesa/state_tracker/st_cb_bitmap.c     | 16 ++++++++--------
 src/mesa/state_tracker/st_cb_drawpixels.c | 24 ++++++++++++------------
 4 files changed, 38 insertions(+), 38 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mm.c b/src/mesa/main/mm.c
index 9f3aa00aff..6f381b02a7 100644
--- a/src/mesa/main/mm.c
+++ b/src/mesa/main/mm.c
@@ -53,11 +53,11 @@ mmDumpMemInfo(const struct mem_block *heap)
 }
 
 struct mem_block *
-mmInit(unsigned int ofs, int size)
+mmInit(unsigned ofs, unsigned size)
 {
    struct mem_block *heap, *block;
   
-   if (size <= 0) 
+   if (!size) 
       return NULL;
 
    heap = (struct mem_block *) _mesa_calloc(sizeof(struct mem_block));
@@ -91,8 +91,8 @@ mmInit(unsigned int ofs, int size)
 
 static struct mem_block *
 SliceBlock(struct mem_block *p, 
-           unsigned int startofs, int size, 
-           int reserved, int alignment)
+           unsigned startofs, unsigned size, 
+           unsigned reserved, unsigned alignment)
 {
    struct mem_block *newblock;
 
@@ -160,14 +160,14 @@ SliceBlock(struct mem_block *p,
 
 
 struct mem_block *
-mmAllocMem(struct mem_block *heap, int size, int align2, int startSearch)
+mmAllocMem(struct mem_block *heap, unsigned size, unsigned align2, unsigned startSearch)
 {
    struct mem_block *p;
-   const int mask = (1 << align2)-1;
-   int startofs = 0;
-   int endofs;
+   const unsigned mask = (1 << align2)-1;
+   unsigned startofs = 0;
+   unsigned endofs;
 
-   if (!heap || align2 < 0 || size <= 0)
+   if (!heap || !align2 || !size)
       return NULL;
 
    for (p = heap->next_free; p != heap; p = p->next_free) {
@@ -193,7 +193,7 @@ mmAllocMem(struct mem_block *heap, int size, int align2, int startSearch)
 
 
 struct mem_block *
-mmFindBlock(struct mem_block *heap, int start)
+mmFindBlock(struct mem_block *heap, unsigned start)
 {
    struct mem_block *p;
 
diff --git a/src/mesa/main/mm.h b/src/mesa/main/mm.h
index 5ad3ffd6d1..df340808ac 100644
--- a/src/mesa/main/mm.h
+++ b/src/mesa/main/mm.h
@@ -39,10 +39,10 @@ struct mem_block {
    struct mem_block *next, *prev;
    struct mem_block *next_free, *prev_free;
    struct mem_block *heap;
-   unsigned int ofs;
-   int size;
-   unsigned int free:1;
-   unsigned int reserved:1;
+   unsigned ofs;
+   unsigned size;
+   unsigned free:1;
+   unsigned reserved:1;
 };
 
 
@@ -51,7 +51,7 @@ struct mem_block {
  * input: total size in bytes
  * return: a heap pointer if OK, NULL if error
  */
-extern struct mem_block *mmInit(unsigned int ofs, int size);
+extern struct mem_block *mmInit(unsigned ofs, unsigned size);
 
 /**
  * Allocate 'size' bytes with 2^align2 bytes alignment,
@@ -63,8 +63,8 @@ extern struct mem_block *mmInit(unsigned int ofs, int size);
  *		startSearch = linear offset from start of heap to begin search
  * return: pointer to the allocated block, 0 if error
  */
-extern struct mem_block *mmAllocMem(struct mem_block *heap, int size, int align2, 
-                            int startSearch);
+extern struct mem_block *mmAllocMem(struct mem_block *heap, unsigned size, 
+                                    unsigned align2, unsigned startSearch);
 
 /**
  * Free block starts at offset
@@ -78,7 +78,7 @@ extern int mmFreeMem(struct mem_block *b);
  * input: pointer to a heap, start offset
  * return: pointer to a block
  */
-extern struct mem_block *mmFindBlock(struct mem_block *heap, int start);
+extern struct mem_block *mmFindBlock(struct mem_block *heap, unsigned start);
 
 /**
  * destroy MM
diff --git a/src/mesa/state_tracker/st_cb_bitmap.c b/src/mesa/state_tracker/st_cb_bitmap.c
index 9e32ee2eb4..6fa3cbd533 100644
--- a/src/mesa/state_tracker/st_cb_bitmap.c
+++ b/src/mesa/state_tracker/st_cb_bitmap.c
@@ -494,14 +494,14 @@ draw_bitmap_quad(GLcontext *ctx, GLint x, GLint y, GLfloat z,
       const GLfloat width = (GLfloat)fb->Width;
       const GLfloat height = (GLfloat)fb->Height;
       struct pipe_viewport_state vp;
-      vp.scale[0] =  0.5 * width;
-      vp.scale[1] = (GLfloat)(height * (invert ? -0.5 : 0.5));
-      vp.scale[2] = 1.0;
-      vp.scale[3] = 1.0;
-      vp.translate[0] = (GLfloat)(0.5 * width);
-      vp.translate[1] = (GLfloat)(0.5 * height);
-      vp.translate[2] = 0.0;
-      vp.translate[3] = 0.0;
+      vp.scale[0] =  0.5f * width;
+      vp.scale[1] = height * (invert ? -0.5f : 0.5f);
+      vp.scale[2] = 1.0f;
+      vp.scale[3] = 1.0f;
+      vp.translate[0] = 0.5f * width;
+      vp.translate[1] = 0.5f * height;
+      vp.translate[2] = 0.0f;
+      vp.translate[3] = 0.0f;
       cso_set_viewport(cso, &vp);
    }
 
diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index 8fdeb5c380..d8f1d2367c 100644
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -425,12 +425,12 @@ draw_quad(GLcontext *ctx, GLfloat x0, GLfloat y0, GLfloat z,
       const struct gl_framebuffer *fb = st->ctx->DrawBuffer;
       const GLfloat fb_width = fb->Width;
       const GLfloat fb_height = fb->Height;
-      const GLfloat clip_x0 = x0 / fb_width * 2.0 - 1.0;
-      const GLfloat clip_y0 = y0 / fb_height * 2.0 - 1.0;
-      const GLfloat clip_x1 = x1 / fb_width * 2.0 - 1.0;
-      const GLfloat clip_y1 = y1 / fb_height * 2.0 - 1.0;
-      const GLfloat sLeft = 0.0F, sRight = 1.0F;
-      const GLfloat tTop = invertTex, tBot = 1.0 - tTop;
+      const GLfloat clip_x0 = x0 / fb_width * 2.0f - 1.0f;
+      const GLfloat clip_y0 = y0 / fb_height * 2.0f - 1.0f;
+      const GLfloat clip_x1 = x1 / fb_width * 2.0f - 1.0f;
+      const GLfloat clip_y1 = y1 / fb_height * 2.0f - 1.0f;
+      const GLfloat sLeft = 0.0f, sRight = 1.0f;
+      const GLfloat tTop = invertTex, tBot = 1.0f - tTop;
       GLuint tex, i;
 
       /* upper-left */
@@ -463,21 +463,21 @@ draw_quad(GLcontext *ctx, GLfloat x0, GLfloat y0, GLfloat z,
       if (color) {
          for (i = 0; i < 4; i++) {
             verts[i][0][2] = z;   /*Z*/
-            verts[i][0][3] = 1.0; /*W*/
+            verts[i][0][3] = 1.0f; /*W*/
             verts[i][1][0] = color[0];
             verts[i][1][1] = color[1];
             verts[i][1][2] = color[2];
             verts[i][1][3] = color[3];
-            verts[i][2][2] = 0.0; /*R*/
-            verts[i][2][3] = 1.0; /*Q*/
+            verts[i][2][2] = 0.0f; /*R*/
+            verts[i][2][3] = 1.0f; /*Q*/
          }
       }
       else {
          for (i = 0; i < 4; i++) {
             verts[i][0][2] = z;   /*Z*/
-            verts[i][0][3] = 1.0; /*W*/
-            verts[i][1][2] = 0.0; /*R*/
-            verts[i][1][3] = 1.0; /*Q*/
+            verts[i][0][3] = 1.0f; /*W*/
+            verts[i][1][2] = 0.0f; /*R*/
+            verts[i][1][3] = 1.0f; /*Q*/
          }
       }
    }
-- 
cgit v1.2.3


From b6f053739f66c1c88db12df4690051c0a54ff0f7 Mon Sep 17 00:00:00 2001
From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Tue, 24 Jun 2008 14:02:24 +0900
Subject: mesa: Replace deprecated __MSC__ macro.

---
 src/mesa/main/imports.h      | 2 +-
 src/mesa/math/m_debug_util.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index ebdfc452a7..813be52e4e 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -332,7 +332,7 @@ static INLINE int iround(float f)
    return r;
 }
 #define IROUND(x)  iround(x)
-#elif defined(USE_X86_ASM) && defined(__MSC__) && defined(__WIN32__)
+#elif defined(USE_X86_ASM) && defined(_MSC_VER)
 static INLINE int iround(float f)
 {
    int r;
diff --git a/src/mesa/math/m_debug_util.h b/src/mesa/math/m_debug_util.h
index f7ce4679b6..776c26475e 100644
--- a/src/mesa/math/m_debug_util.h
+++ b/src/mesa/math/m_debug_util.h
@@ -303,7 +303,7 @@ enum { NIL = 0, ONE = 1, NEG = -1, VAR = 2 };
  */
 #if defined(__GNUC__)
 #  define ALIGN16(type, array)	type array __attribute__ ((aligned (16)))
-#elif defined(__MSC__)
+#elif defined(_MSC_VER)
 #  define ALIGN16(type, array)	type array __declspec(align(16)) /* GH: Does this work? */
 #elif defined(__WATCOMC__)
 #  define ALIGN16(type, array)	                    /* Watcom does not support this */ 
-- 
cgit v1.2.3


From a148025d94505bca08f9baa1689048032bb60e2c Mon Sep 17 00:00:00 2001
From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Tue, 24 Jun 2008 14:18:07 +0900
Subject: mesa: Use standard integer types.

Especially get rid of the non-portable long long.
---
 src/mesa/main/glheader.h         | 35 ++++++++++++++++++++++++++---------
 src/mesa/main/imports.c          | 14 +++++---------
 src/mesa/main/imports.h          |  8 ++------
 src/mesa/main/texcompress_fxt1.c | 13 ++++---------
 4 files changed, 37 insertions(+), 33 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h
index 9e39a8370e..57d7e60ad3 100644
--- a/src/mesa/main/glheader.h
+++ b/src/mesa/main/glheader.h
@@ -69,16 +69,33 @@
 #include <stdarg.h>
 
 
-/* Get typedefs for uintptr_t and friends */
-#if defined(__MINGW32__) || defined(__NetBSD__)
-#  include <stdint.h>
-#elif defined(_WIN32)
-#  include <BaseTsd.h>
-#  if _MSC_VER == 1200
-     typedef UINT_PTR uintptr_t;
-#  endif 
+/* Get standard integer types */
+#if defined(_MSC_VER)
+
+   typedef __int8             int8_t;
+   typedef unsigned __int8    uint8_t;
+   typedef __int16            int16_t;
+   typedef unsigned __int16   uint16_t;
+#  ifndef __eglplatform_h_
+     typedef __int32            int32_t;
+#  endif
+   typedef unsigned __int32   uint32_t;
+   typedef __int64            int64_t;
+   typedef unsigned __int64   uint64_t;
+
+#  if defined(_WIN64)
+     typedef __int64            intptr_t;
+     typedef unsigned __int64   uintptr_t;
+#  else
+     typedef __int32            intptr_t;
+     typedef unsigned __int32   uintptr_t;
+#  endif
+
+#  define INT64_C(__val) __val##i64
+#  define UINT64_C(__val) __val##ui64
+
 #else
-#  include <inttypes.h>
+#  include <stdint.h>
 #endif
 
 #if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__) && !defined(BUILD_FOR_SNAP)
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index c46e5beb91..7231fa699c 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -539,10 +539,10 @@ _mesa_pow(double x, double y)
  * Find the first bit set in a word.
  */
 int
-_mesa_ffs(int i)
+_mesa_ffs(int32_t i)
 {
 #if (defined(_WIN32) && !defined(__MINGW32__) ) || defined(__IBMC__) || defined(__IBMCPP__)
-   register int bit = 1;
+   register int32_t bit = 1;
    if ((i & 0xffff) == 0) {
       bit += 16;
       i >>= 16;
@@ -573,11 +573,7 @@ _mesa_ffs(int i)
  *          if no bits set.
  */
 int
-#ifdef __MINGW32__
-_mesa_ffsll(long val)
-#else
-_mesa_ffsll(long long val)
-#endif
+_mesa_ffsll(int64_t val)
 {
 #ifdef ffsll
    return ffsll(val);
@@ -586,11 +582,11 @@ _mesa_ffsll(long long val)
 
    assert(sizeof(val) == 8);
 
-   bit = _mesa_ffs(val);
+   bit = _mesa_ffs((int32_t)val);
    if (bit != 0)
       return bit;
 
-   bit = _mesa_ffs(val >> 32);
+   bit = _mesa_ffs((int32_t)(val >> 32));
    if (bit != 0)
       return 32 + bit;
 
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index 813be52e4e..d91a1366b0 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -697,14 +697,10 @@ extern double
 _mesa_pow(double x, double y);
 
 extern int
-_mesa_ffs(int i);
+_mesa_ffs(int32_t i);
 
 extern int
-#ifdef __MINGW32__
-_mesa_ffsll(long i);
-#else
-_mesa_ffsll(long long i);
-#endif
+_mesa_ffsll(int64_t i);
 
 extern unsigned int
 _mesa_bitcount(unsigned int n);
diff --git a/src/mesa/main/texcompress_fxt1.c b/src/mesa/main/texcompress_fxt1.c
index b6991f45ed..16a3ba076f 100644
--- a/src/mesa/main/texcompress_fxt1.c
+++ b/src/mesa/main/texcompress_fxt1.c
@@ -298,22 +298,17 @@ const struct gl_texture_format _mesa_texformat_rgba_fxt1 = {
 /*
  * Define a 64-bit unsigned integer type and macros
  */
-#if defined(__GNUC__) && !defined(__cplusplus)
+#if 1
 
 #define FX64_NATIVE 1
 
-#ifdef __MINGW32__
-typedef unsigned long Fx64;
-#else
-typedef unsigned long long Fx64;
-#endif
-
+typedef uint64_t Fx64;
 
 #define FX64_MOV32(a, b) a = b
 #define FX64_OR32(a, b)  a |= b
 #define FX64_SHL(a, c)   a <<= c
 
-#else  /* !__GNUC__ */
+#else
 
 #define FX64_NATIVE 0
 
@@ -335,7 +330,7 @@ typedef struct {
        }                                               \
    } while (0)
 
-#endif /* !__GNUC__ */
+#endif
 
 
 #define F(i) (GLfloat)1 /* can be used to obtain an oblong metric: 0.30 / 0.59 / 0.11 */
-- 
cgit v1.2.3


From d378f7b3dfda3b549e4b02380e492671cc34bb59 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 25 Jun 2008 08:45:14 -0600
Subject: mesa: point size arrays

---
 src/mesa/main/arrayobj.c            |  9 +++++++++
 src/mesa/main/enable.c              | 12 ++++++++++++
 src/mesa/main/ffvertex_prog.c       | 34 ++++++++++++++++++++++++++++++----
 src/mesa/main/glheader.h            | 10 ++++++++++
 src/mesa/main/mfeatures.h           |  1 +
 src/mesa/main/mtypes.h              |  4 ++++
 src/mesa/main/state.c               |  2 +-
 src/mesa/main/varray.c              | 31 +++++++++++++++++++++++++++++++
 src/mesa/main/varray.h              |  4 ++++
 src/mesa/state_tracker/st_program.c |  4 ++++
 src/mesa/vbo/vbo_exec_array.c       |  4 ++++
 11 files changed, 110 insertions(+), 5 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index f08f99d8e1..d62661e2b5 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -164,6 +164,15 @@ _mesa_initialize_array_object( GLcontext *ctx,
       obj->VertexAttrib[i].Normalized = GL_FALSE;
    }
 
+#if FEATURE_point_size_array
+   obj->PointSize.Type = GL_FLOAT;
+   obj->PointSize.Stride = 0;
+   obj->PointSize.StrideB = 0;
+   obj->PointSize.Ptr = NULL;
+   obj->PointSize.Enabled = GL_FALSE;
+   obj->PointSize.BufferObj = ctx->Array.NullBufferObj;
+#endif
+
 #if FEATURE_ARB_vertex_buffer_object
    /* Vertex array buffers */
    obj->Vertex.BufferObj = ctx->Array.NullBufferObj;
diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index 6b4ad8eea3..9dc55d4e69 100644
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -92,6 +92,13 @@ client_state(GLcontext *ctx, GLenum cap, GLboolean state)
          flag = _NEW_ARRAY_COLOR1;
          break;
 
+#if FEATURE_point_size_array
+      case GL_POINT_SIZE_ARRAY_OES:
+         var = &ctx->Array.ArrayObj->PointSize.Enabled;
+         flag = _NEW_ARRAY_POINT_SIZE;
+         break;
+#endif
+
 #if FEATURE_NV_vertex_program
       case GL_VERTEX_ATTRIB_ARRAY0_NV:
       case GL_VERTEX_ATTRIB_ARRAY1_NV:
@@ -652,6 +659,7 @@ _mesa_set_enable(GLcontext *ctx, GLenum cap, GLboolean state)
       case GL_EDGE_FLAG_ARRAY:
       case GL_FOG_COORDINATE_ARRAY_EXT:
       case GL_SECONDARY_COLOR_ARRAY_EXT:
+      case GL_POINT_SIZE_ARRAY_OES:
          client_state( ctx, cap, state );
          return;
 
@@ -1174,6 +1182,10 @@ _mesa_IsEnabled( GLenum cap )
       case GL_SECONDARY_COLOR_ARRAY_EXT:
          CHECK_EXTENSION(EXT_secondary_color);
          return (ctx->Array.ArrayObj->SecondaryColor.Enabled != 0);
+#if FEATURE_point_size_array
+      case GL_POINT_SIZE_ARRAY_OES:
+         return (ctx->Array.ArrayObj->PointSize.Enabled != 0);
+#endif
 
       /* GL_EXT_histogram */
       case GL_HISTOGRAM:
diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index e6c7c1040f..2baae77570 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -63,6 +63,7 @@ struct state_key {
    unsigned separate_specular:1;
    unsigned fog_mode:2;
    unsigned point_attenuated:1;
+   unsigned point_array:1;
    unsigned texture_enabled_global:1;
    unsigned fragprog_inputs_read:12;
 
@@ -264,6 +265,9 @@ static struct state_key *make_state_key( GLcontext *ctx )
    if (ctx->Point._Attenuated)
       key->point_attenuated = 1;
 
+   if (ctx->Array.ArrayObj->PointSize.Enabled)
+      key->point_array = 1;
+
    if (ctx->Texture._TexGenEnabled ||
        ctx->Texture._TexMatEnabled ||
        ctx->Texture._EnabledUnits)
@@ -444,12 +448,18 @@ static void release_temps( struct tnl_program *p )
 
 
 
+/**
+ * \param input  one of VERT_ATTRIB_x tokens.
+ */
 static struct ureg register_input( struct tnl_program *p, GLuint input )
 {
    p->program->Base.InputsRead |= (1<<input);
    return make_ureg(PROGRAM_INPUT, input);
 }
 
+/**
+ * \param input  one of VERT_RESULT_x tokens.
+ */
 static struct ureg register_output( struct tnl_program *p, GLuint output )
 {
    p->program->Base.OutputsWritten |= (1<<output);
@@ -1518,7 +1528,10 @@ static void build_texture_transform( struct tnl_program *p )
 }
 
 
-static void build_pointsize( struct tnl_program *p )
+/**
+ * Point size attenuation computation.
+ */
+static void build_atten_pointsize( struct tnl_program *p )
 {
    struct ureg eye = get_eye_position_z(p);
    struct ureg state_size = register_param1(p, STATE_POINT_SIZE);
@@ -1555,13 +1568,24 @@ static void build_pointsize( struct tnl_program *p )
 /**
  * Emit constant point size.
  */
-static void constant_pointsize( struct tnl_program *p )
+static void build_constant_pointsize( struct tnl_program *p )
 {
    struct ureg state_size = register_param1(p, STATE_POINT_SIZE);
    struct ureg out = register_output(p, VERT_RESULT_PSIZ);
    emit_op1(p, OPCODE_MOV, out, WRITEMASK_X, state_size);
 }
 
+/**
+ * Pass-though per-vertex point size, from user's point size array.
+ */
+static void build_array_pointsize( struct tnl_program *p )
+{
+   struct ureg in = register_input(p, VERT_ATTRIB_POINT_SIZE);
+   struct ureg out = register_output(p, VERT_RESULT_PSIZ);
+   emit_op1(p, OPCODE_MOV, out, WRITEMASK_X, in);
+}
+
+
 static void build_tnl_program( struct tnl_program *p )
 {   /* Emit the program, starting with modelviewproject:
     */
@@ -1589,10 +1613,12 @@ static void build_tnl_program( struct tnl_program *p )
       build_texture_transform(p);
 
    if (p->state->point_attenuated)
-      build_pointsize(p);
+      build_atten_pointsize(p);
+   else if (p->state->point_array)
+      build_array_pointsize(p);
 #if 0
    else
-      constant_pointsize(p);
+      build_constant_pointsize(p);
 #endif
 
    /* Finish up:
diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h
index 57d7e60ad3..3131a356b8 100644
--- a/src/mesa/main/glheader.h
+++ b/src/mesa/main/glheader.h
@@ -167,6 +167,16 @@
 #endif
 
 
+#ifndef GL_OES_point_size_array
+#define GL_POINT_SIZE_ARRAY_OES                                 0x8B9C
+#define GL_POINT_SIZE_ARRAY_TYPE_OES                            0x898A
+#define GL_POINT_SIZE_ARRAY_STRIDE_OES                          0x898B
+#define GL_POINT_SIZE_ARRAY_POINTER_OES                         0x898C
+#define GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES                  0x8B9F
+#endif
+
+
+
 #if !defined(CAPI) && defined(WIN32) && !defined(BUILD_FOR_SNAP)
 #define CAPI _cdecl
 #endif
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index a305bbd605..c3c337ea90 100644
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -49,6 +49,7 @@
 #define FEATURE_fixedpt 0
 #define FEATURE_histogram  _HAVE_FULL_GL
 #define FEATURE_pixel_transfer  _HAVE_FULL_GL
+#define FEATURE_point_size_array 0
 #define FEATURE_texgen  _HAVE_FULL_GL
 #define FEATURE_texture_fxt1  _HAVE_FULL_GL
 #define FEATURE_texture_s3tc  _HAVE_FULL_GL
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 8a6c84368a..dceb7611f2 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -151,6 +151,7 @@ enum
    VERT_ATTRIB_COLOR1 = 4,
    VERT_ATTRIB_FOG = 5,
    VERT_ATTRIB_COLOR_INDEX = 6,
+   VERT_ATTRIB_POINT_SIZE = 6,  /*alias*/
    VERT_ATTRIB_EDGEFLAG = 7,
    VERT_ATTRIB_TEX0 = 8,
    VERT_ATTRIB_TEX1 = 9,
@@ -1707,6 +1708,7 @@ struct gl_array_object
    struct gl_client_array Index;
    struct gl_client_array EdgeFlag;
    struct gl_client_array TexCoord[MAX_TEXTURE_COORD_UNITS];
+   struct gl_client_array PointSize;
    /*@}*/
 
    /** Generic arrays for vertex programs/shaders */
@@ -2748,6 +2750,7 @@ struct gl_matrix_stack
 #define _NEW_ARRAY_FOGCOORD         VERT_BIT_FOG
 #define _NEW_ARRAY_INDEX            VERT_BIT_COLOR_INDEX
 #define _NEW_ARRAY_EDGEFLAG         VERT_BIT_EDGEFLAG
+#define _NEW_ARRAY_POINT_SIZE       VERT_BIT_COLOR_INDEX  /* aliased */
 #define _NEW_ARRAY_TEXCOORD_0       VERT_BIT_TEX0
 #define _NEW_ARRAY_TEXCOORD_1       VERT_BIT_TEX1
 #define _NEW_ARRAY_TEXCOORD_2       VERT_BIT_TEX2
@@ -2765,6 +2768,7 @@ struct gl_matrix_stack
 /*@}*/
 
 
+
 /**
  * \name A bunch of flags that we think might be useful to drivers.
  * 
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 4d1fdbf47c..315253d90a 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -448,7 +448,7 @@ _mesa_update_state_locked( GLcontext *ctx )
       prog_flags |= (_NEW_TEXTURE | _NEW_FOG | _DD_NEW_SEPARATE_SPECULAR);
    }
    if (ctx->VertexProgram._MaintainTnlProgram) {
-      prog_flags |= (_NEW_TEXTURE | _NEW_TEXTURE_MATRIX |
+      prog_flags |= (_NEW_ARRAY | _NEW_TEXTURE | _NEW_TEXTURE_MATRIX |
                      _NEW_TRANSFORM | _NEW_POINT |
                      _NEW_FOG | _NEW_LIGHT |
                      _MESA_NEW_NEED_EYE_COORDS);
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 220db35855..50fe874556 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -468,6 +468,37 @@ _mesa_EdgeFlagPointer(GLsizei stride, const GLvoid *ptr)
 }
 
 
+void GLAPIENTRY
+_mesa_PointSizePointer(GLenum type, GLsizei stride, const GLvoid *ptr)
+{
+   GLsizei elementSize;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (stride < 0) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glPointSizePointer(stride)" );
+      return;
+   }
+
+   switch (type) {
+      case GL_FLOAT:
+         elementSize = sizeof(GLfloat);
+         break;
+#if FEATURE_fixedpt
+      case GL_FIXED:
+         elementSize = sizeof(GLfixed);
+         break;
+#endif
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glPointSizePointer(type)" );
+         return;
+   }
+
+   update_array(ctx, &ctx->Array.ArrayObj->PointSize, _NEW_ARRAY_POINT_SIZE,
+                elementSize, 1, type, stride, GL_FALSE, ptr);
+}
+
+
 #if FEATURE_NV_vertex_program
 void GLAPIENTRY
 _mesa_VertexAttribPointerNV(GLuint index, GLint size, GLenum type,
diff --git a/src/mesa/main/varray.h b/src/mesa/main/varray.h
index ba91ecf5f6..f557940738 100644
--- a/src/mesa/main/varray.h
+++ b/src/mesa/main/varray.h
@@ -111,6 +111,10 @@ _mesa_SecondaryColorPointerEXT(GLint size, GLenum type,
 			       GLsizei stride, const GLvoid *ptr);
 
 
+extern void GLAPIENTRY
+_mesa_PointSizePointer(GLenum type, GLsizei stride, const GLvoid *ptr);
+
+
 extern void GLAPIENTRY
 _mesa_VertexAttribPointerNV(GLuint index, GLint size, GLenum type,
                             GLsizei stride, const GLvoid *pointer);
diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c
index d450c30694..958096f68e 100644
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -136,6 +136,10 @@ st_translate_vertex_program(struct st_context *st,
             vs_input_semantic_name[slot] = TGSI_SEMANTIC_FOG;
             vs_input_semantic_index[slot] = 0;
             break;
+         case VERT_ATTRIB_POINT_SIZE:
+            vs_input_semantic_name[slot] = TGSI_SEMANTIC_PSIZE;
+            vs_input_semantic_index[slot] = 0;
+            break;
          case VERT_ATTRIB_TEX0:
          case VERT_ATTRIB_TEX1:
          case VERT_ATTRIB_TEX2:
diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c
index e3d2fc51cb..bf97956286 100644
--- a/src/mesa/vbo/vbo_exec_array.c
+++ b/src/mesa/vbo/vbo_exec_array.c
@@ -107,6 +107,10 @@ static void bind_array_obj( GLcontext *ctx )
    exec->array.legacy_array[VERT_ATTRIB_COLOR1] = &ctx->Array.ArrayObj->SecondaryColor;
    exec->array.legacy_array[VERT_ATTRIB_FOG] = &ctx->Array.ArrayObj->FogCoord;
    exec->array.legacy_array[VERT_ATTRIB_COLOR_INDEX] = &ctx->Array.ArrayObj->Index;
+   if (ctx->Array.ArrayObj->PointSize.Enabled) {
+      /* this aliases COLOR_INDEX */
+      exec->array.legacy_array[VERT_ATTRIB_POINT_SIZE] = &ctx->Array.ArrayObj->PointSize;
+   }
    exec->array.legacy_array[VERT_ATTRIB_EDGEFLAG] = &ctx->Array.ArrayObj->EdgeFlag;
 
    for (i = 0; i < 8; i++)
-- 
cgit v1.2.3


From 429a08384c2ea66d446e46beb28e33ee3b764d52 Mon Sep 17 00:00:00 2001
From: Roland Scheidegger <sroland@tungstengraphics.com>
Date: Fri, 27 Jun 2008 16:02:43 +0200
Subject: gallium: handle msaa

---
 src/gallium/include/pipe/p_state.h          |  6 +-
 src/gallium/winsys/dri/intel/intel_screen.c |  6 +-
 src/mesa/drivers/dri/common/utils.c         | 97 ++++++++++++++++-------------
 src/mesa/drivers/dri/common/utils.h         |  3 +-
 src/mesa/main/mtypes.h                      |  1 +
 src/mesa/state_tracker/st_cb_fbo.c          |  4 +-
 src/mesa/state_tracker/st_cb_fbo.h          |  2 +-
 src/mesa/state_tracker/st_framebuffer.c     | 18 +++---
 8 files changed, 77 insertions(+), 60 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h
index 2992e2f3b3..5546796936 100644
--- a/src/gallium/include/pipe/p_state.h
+++ b/src/gallium/include/pipe/p_state.h
@@ -276,7 +276,7 @@ struct pipe_surface
    unsigned layout;              /**< PIPE_SURFACE_LAYOUT_x */
    unsigned offset;              /**< offset from start of buffer, in bytes */
    unsigned refcount;
-   unsigned usage;              /**< PIPE_BUFFER_USAGE_*  */
+   unsigned usage;               /**< PIPE_BUFFER_USAGE_*  */
 
    struct pipe_winsys *winsys;   /**< winsys which owns/created the surface */
 
@@ -311,7 +311,9 @@ struct pipe_texture
 
    unsigned last_level:8;    /**< Index of last mipmap level present/defined */
    unsigned compressed:1;
-   
+
+   unsigned nr_samples:8;          /**< for multisampled surfaces, nr of samples */
+
    unsigned tex_usage;          /* PIPE_TEXTURE_USAGE_* */
 
    /* These are also refcounted:
diff --git a/src/gallium/winsys/dri/intel/intel_screen.c b/src/gallium/winsys/dri/intel/intel_screen.c
index 89de188ada..cfecebdb8c 100644
--- a/src/gallium/winsys/dri/intel/intel_screen.c
+++ b/src/gallium/winsys/dri/intel/intel_screen.c
@@ -483,11 +483,13 @@ intelFillInModes(unsigned pixel_bits, unsigned depth_bits,
 
    uint8_t depth_bits_array[3];
    uint8_t stencil_bits_array[3];
+   uint8_t msaa_samples_array[1];
 
 
    depth_bits_array[0] = 0;
    depth_bits_array[1] = depth_bits;
    depth_bits_array[2] = depth_bits;
+   msaa_samples_array[0] = 0;
 
    /* Just like with the accumulation buffer, always provide some modes
     * with a stencil buffer.  It will be a sw fallback, but some apps won't
@@ -521,7 +523,7 @@ intelFillInModes(unsigned pixel_bits, unsigned depth_bits,
    if (!driFillInModes(&m, fb_format, fb_type,
                        depth_bits_array, stencil_bits_array,
                        depth_buffer_factor, back_buffer_modes,
-                       back_buffer_factor, GLX_TRUE_COLOR)) {
+                       back_buffer_factor, msaa_samples_array, 1, GLX_TRUE_COLOR)) {
       fprintf(stderr, "[%s:%u] Error creating FBConfig!\n", __func__,
               __LINE__);
       return NULL;
@@ -529,7 +531,7 @@ intelFillInModes(unsigned pixel_bits, unsigned depth_bits,
    if (!driFillInModes(&m, fb_format, fb_type,
                        depth_bits_array, stencil_bits_array,
                        depth_buffer_factor, back_buffer_modes,
-                       back_buffer_factor, GLX_DIRECT_COLOR)) {
+                       back_buffer_factor, msaa_samples_array, 1, GLX_DIRECT_COLOR)) {
       fprintf(stderr, "[%s:%u] Error creating FBConfig!\n", __func__,
               __LINE__);
       return NULL;
diff --git a/src/mesa/drivers/dri/common/utils.c b/src/mesa/drivers/dri/common/utils.c
index 94db319928..3cf2146dce 100644
--- a/src/mesa/drivers/dri/common/utils.c
+++ b/src/mesa/drivers/dri/common/utils.c
@@ -521,6 +521,9 @@ GLboolean driClipRectToFramebuffer( const GLframebuffer *buffer,
  *                      \c GLX_SWAP_UNDEFINED_OML.  See the
  *                      GLX_OML_swap_method extension spec for more details.
  * \param num_db_modes  Number of entries in \c db_modes.
+ * \param msaa_samples  Array of msaa sample count. 0 represents a visual
+ *                      without a multisample buffer.
+ * \param num_msaa_modes Number of entries in \c msaa_samples.
  * \param visType       GLX visual type.  Usually either \c GLX_TRUE_COLOR or
  *                      \c GLX_DIRECT_COLOR.
  * 
@@ -542,6 +545,7 @@ driFillInModes( __GLcontextModes ** ptr_to_modes,
 		const uint8_t * depth_bits, const uint8_t * stencil_bits,
 		unsigned num_depth_stencil_bits,
 		const GLenum * db_modes, unsigned num_db_modes,
+		const u_int8_t * msaa_samples, unsigned num_msaa_modes,
 		int visType )
 {
    static const uint8_t bits_table[3][4] = {
@@ -607,9 +611,7 @@ driFillInModes( __GLcontextModes ** ptr_to_modes,
    const uint32_t * masks;
    const int index = fb_type & 0x07;
    __GLcontextModes * modes = *ptr_to_modes;
-   unsigned i;
-   unsigned j;
-   unsigned k;
+   unsigned i, j, k, h;
 
 
    if ( bytes_per_pixel[ index ] == 0 ) {
@@ -659,49 +661,54 @@ driFillInModes( __GLcontextModes ** ptr_to_modes,
 
     for ( k = 0 ; k < num_depth_stencil_bits ; k++ ) {
 	for ( i = 0 ; i < num_db_modes ; i++ ) {
-	    for ( j = 0 ; j < 2 ; j++ ) {
-
-		modes->redBits   = bits[0];
-		modes->greenBits = bits[1];
-		modes->blueBits  = bits[2];
-		modes->alphaBits = bits[3];
-		modes->redMask   = masks[0];
-		modes->greenMask = masks[1];
-		modes->blueMask  = masks[2];
-		modes->alphaMask = masks[3];
-		modes->rgbBits   = modes->redBits + modes->greenBits
-		    + modes->blueBits + modes->alphaBits;
-
-		modes->accumRedBits   = 16 * j;
-		modes->accumGreenBits = 16 * j;
-		modes->accumBlueBits  = 16 * j;
-		modes->accumAlphaBits = (masks[3] != 0) ? 16 * j : 0;
-		modes->visualRating = (j == 0) ? GLX_NONE : GLX_SLOW_CONFIG;
-
-		modes->stencilBits = stencil_bits[k];
-		modes->depthBits = depth_bits[k];
-
-		modes->visualType = visType;
-		modes->renderType = GLX_RGBA_BIT;
-		modes->drawableType = GLX_WINDOW_BIT;
-		modes->rgbMode = GL_TRUE;
-
-		if ( db_modes[i] == GLX_NONE ) {
-		    modes->doubleBufferMode = GL_FALSE;
+	    for ( h = 0 ; h < num_msaa_modes; h++ ) {
+		for ( j = 0 ; j < 2 ; j++ ) {
+
+		    modes->redBits   = bits[0];
+		    modes->greenBits = bits[1];
+		    modes->blueBits  = bits[2];
+		    modes->alphaBits = bits[3];
+		    modes->redMask   = masks[0];
+		    modes->greenMask = masks[1];
+		    modes->blueMask  = masks[2];
+		    modes->alphaMask = masks[3];
+		    modes->rgbBits   = modes->redBits + modes->greenBits
+			+ modes->blueBits + modes->alphaBits;
+
+		    modes->accumRedBits   = 16 * j;
+		    modes->accumGreenBits = 16 * j;
+		    modes->accumBlueBits  = 16 * j;
+		    modes->accumAlphaBits = (masks[3] != 0) ? 16 * j : 0;
+		    modes->visualRating = (j == 0) ? GLX_NONE : GLX_SLOW_CONFIG;
+
+		    modes->stencilBits = stencil_bits[k];
+		    modes->depthBits = depth_bits[k];
+
+		    modes->visualType = visType;
+		    modes->renderType = GLX_RGBA_BIT;
+		    modes->drawableType = GLX_WINDOW_BIT;
+		    modes->rgbMode = GL_TRUE;
+
+		    if ( db_modes[i] == GLX_NONE ) {
+			modes->doubleBufferMode = GL_FALSE;
+		    }
+		    else {
+			modes->doubleBufferMode = GL_TRUE;
+			modes->swapMethod = db_modes[i];
+		    }
+
+		    modes->samples = msaa_samples[h];
+		    modes->sampleBuffers = modes->samples ? 1 : 0;
+
+		    modes->haveAccumBuffer = ((modes->accumRedBits +
+					       modes->accumGreenBits +
+					       modes->accumBlueBits +
+					       modes->accumAlphaBits) > 0);
+		    modes->haveDepthBuffer = (modes->depthBits > 0);
+		    modes->haveStencilBuffer = (modes->stencilBits > 0);
+
+		    modes = modes->next;
 		}
-		else {
-		    modes->doubleBufferMode = GL_TRUE;
-		    modes->swapMethod = db_modes[i];
-		}
-
-		modes->haveAccumBuffer = ((modes->accumRedBits +
-					   modes->accumGreenBits +
-					   modes->accumBlueBits +
-					   modes->accumAlphaBits) > 0);
-		modes->haveDepthBuffer = (modes->depthBits > 0);
-		modes->haveStencilBuffer = (modes->stencilBits > 0);
-
-		modes = modes->next;
 	    }
 	}
     }
diff --git a/src/mesa/drivers/dri/common/utils.h b/src/mesa/drivers/dri/common/utils.h
index 1067d0a8bf..20940c21b4 100644
--- a/src/mesa/drivers/dri/common/utils.h
+++ b/src/mesa/drivers/dri/common/utils.h
@@ -115,6 +115,7 @@ extern GLboolean driFillInModes( __GLcontextModes ** modes,
     GLenum fb_format, GLenum fb_type,
     const uint8_t * depth_bits, const uint8_t * stencil_bits,
     unsigned num_depth_stencil_bits,
-    const GLenum * db_modes, unsigned num_db_modes, int visType );
+    const GLenum * db_modes, unsigned num_db_modes,
+    const u_int8_t * msaa_samples, unsigned num_msaa_modes, int visType );
 
 #endif /* DRI_DEBUG_H */
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index dceb7611f2..0a065541e1 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2269,6 +2269,7 @@ struct gl_renderbuffer
    GLubyte IndexBits;
    GLubyte DepthBits;
    GLubyte StencilBits;
+   GLubyte Samples;     /**< Number of samples - 0 if not multisampled */
    GLvoid *Data;        /**< This may not be used by some kinds of RBs */
 
    /* Used to wrap one renderbuffer around another: */
diff --git a/src/mesa/state_tracker/st_cb_fbo.c b/src/mesa/state_tracker/st_cb_fbo.c
index 1067caf9b3..7245798d0d 100644
--- a/src/mesa/state_tracker/st_cb_fbo.c
+++ b/src/mesa/state_tracker/st_cb_fbo.c
@@ -118,6 +118,7 @@ st_renderbuffer_alloc_storage(GLcontext * ctx, struct gl_renderbuffer *rb,
    template.height[0] = height;
    template.depth[0] = 1;
    template.last_level = 0;
+   template.nr_samples = rb->Samples;
 
    if (pf_is_depth_stencil(template.format)) {
       template.tex_usage = PIPE_TEXTURE_USAGE_DEPTH_STENCIL;
@@ -249,7 +250,7 @@ st_new_renderbuffer(GLcontext *ctx, GLuint name)
  * renderbuffer).  The window system code determines the format.
  */
 struct gl_renderbuffer *
-st_new_renderbuffer_fb(enum pipe_format format)
+st_new_renderbuffer_fb(enum pipe_format format, int samples)
 {
    struct st_renderbuffer *strb;
 
@@ -261,6 +262,7 @@ st_new_renderbuffer_fb(enum pipe_format format)
 
    _mesa_init_renderbuffer(&strb->Base, 0);
    strb->Base.ClassID = 0x4242; /* just a unique value */
+   strb->Base.Samples = samples;
    strb->format = format;
 
    switch (format) {
diff --git a/src/mesa/state_tracker/st_cb_fbo.h b/src/mesa/state_tracker/st_cb_fbo.h
index 87b0734a0c..ff56001a4e 100644
--- a/src/mesa/state_tracker/st_cb_fbo.h
+++ b/src/mesa/state_tracker/st_cb_fbo.h
@@ -58,7 +58,7 @@ st_renderbuffer(struct gl_renderbuffer *rb)
 
 
 extern struct gl_renderbuffer *
-st_new_renderbuffer_fb(enum pipe_format format);
+st_new_renderbuffer_fb(enum pipe_format format, int samples);
 
 extern void
 st_init_fbo_functions(struct dd_function_table *functions);
diff --git a/src/mesa/state_tracker/st_framebuffer.c b/src/mesa/state_tracker/st_framebuffer.c
index 1b6e68c2a1..1994a1c826 100644
--- a/src/mesa/state_tracker/st_framebuffer.c
+++ b/src/mesa/state_tracker/st_framebuffer.c
@@ -51,27 +51,29 @@ st_create_framebuffer( const __GLcontextModes *visual,
 {
    struct st_framebuffer *stfb = CALLOC_STRUCT(st_framebuffer);
    if (stfb) {
+      int samples = 0;
       _mesa_initialize_framebuffer(&stfb->Base, visual);
+      if (visual->sampleBuffers) samples = visual->samples;
 
       {
          /* fake frontbuffer */
          /* XXX allocation should only happen in the unusual case
             it's actually needed */
          struct gl_renderbuffer *rb
-            = st_new_renderbuffer_fb(colorFormat);
+            = st_new_renderbuffer_fb(colorFormat, samples);
          _mesa_add_renderbuffer(&stfb->Base, BUFFER_FRONT_LEFT, rb);
       }
 
       if (visual->doubleBufferMode) {
          struct gl_renderbuffer *rb
-            = st_new_renderbuffer_fb(colorFormat);
+            = st_new_renderbuffer_fb(colorFormat, samples);
          _mesa_add_renderbuffer(&stfb->Base, BUFFER_BACK_LEFT, rb);
       }
 
       if (visual->depthBits == 24 && visual->stencilBits == 8) {
          /* combined depth/stencil buffer */
          struct gl_renderbuffer *depthStencilRb
-            = st_new_renderbuffer_fb(depthFormat);
+            = st_new_renderbuffer_fb(depthFormat, samples);
          /* note: bind RB to two attachment points */
          _mesa_add_renderbuffer(&stfb->Base, BUFFER_DEPTH, depthStencilRb);
          _mesa_add_renderbuffer(&stfb->Base, BUFFER_STENCIL, depthStencilRb);
@@ -82,26 +84,26 @@ st_create_framebuffer( const __GLcontextModes *visual,
          if (visual->depthBits == 32) {
             /* 32-bit depth buffer */
             struct gl_renderbuffer *depthRb
-               = st_new_renderbuffer_fb(depthFormat);
+               = st_new_renderbuffer_fb(depthFormat, samples);
             _mesa_add_renderbuffer(&stfb->Base, BUFFER_DEPTH, depthRb);
          }
          else if (visual->depthBits == 24) {
             /* 24-bit depth buffer, ignore stencil bits */
             struct gl_renderbuffer *depthRb
-               = st_new_renderbuffer_fb(depthFormat);
+               = st_new_renderbuffer_fb(depthFormat, samples);
             _mesa_add_renderbuffer(&stfb->Base, BUFFER_DEPTH, depthRb);
          }
          else if (visual->depthBits > 0) {
             /* 16-bit depth buffer */
             struct gl_renderbuffer *depthRb
-               = st_new_renderbuffer_fb(depthFormat);
+               = st_new_renderbuffer_fb(depthFormat, samples);
             _mesa_add_renderbuffer(&stfb->Base, BUFFER_DEPTH, depthRb);
          }
 
          if (visual->stencilBits > 0) {
             /* 8-bit stencil */
             struct gl_renderbuffer *stencilRb
-               = st_new_renderbuffer_fb(stencilFormat);
+               = st_new_renderbuffer_fb(stencilFormat, samples);
             _mesa_add_renderbuffer(&stfb->Base, BUFFER_STENCIL, stencilRb);
          }
       }
@@ -109,7 +111,7 @@ st_create_framebuffer( const __GLcontextModes *visual,
       if (visual->accumRedBits > 0) {
          /* 16-bit/channel accum */
          struct gl_renderbuffer *accumRb
-            = st_new_renderbuffer_fb(DEFAULT_ACCUM_PIPE_FORMAT);
+            = st_new_renderbuffer_fb(DEFAULT_ACCUM_PIPE_FORMAT, 0); /* XXX accum isn't multisampled right? */
          _mesa_add_renderbuffer(&stfb->Base, BUFFER_ACCUM, accumRb);
       }
 
-- 
cgit v1.2.3


From a1ec6efce0f614dfc2fb7af2cab68eca3be43850 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Sat, 28 Jun 2008 16:15:03 -0600
Subject: mesa: check FEATURE_point_size_array

---
 src/mesa/main/ffvertex_prog.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index 2baae77570..5f3def257d 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -265,8 +265,10 @@ static struct state_key *make_state_key( GLcontext *ctx )
    if (ctx->Point._Attenuated)
       key->point_attenuated = 1;
 
+#if FEATURE_point_size_array
    if (ctx->Array.ArrayObj->PointSize.Enabled)
       key->point_array = 1;
+#endif
 
    if (ctx->Texture._TexGenEnabled ||
        ctx->Texture._TexMatEnabled ||
-- 
cgit v1.2.3


From 489fc4d10a57538de59a89e19ce752e4b7253d22 Mon Sep 17 00:00:00 2001
From: Roland Scheidegger <sroland@tungstengraphics.com>
Date: Wed, 2 Jul 2008 20:08:27 +0200
Subject: mesa: fix issues around multisample enable

multisample enable is enabled by default, however gl mandates multisample
rendering rules only apply if there's also a multisampled buffer.
---
 src/mesa/drivers/dri/r300/r300_render.c     |  2 +-
 src/mesa/main/mtypes.h                      |  1 +
 src/mesa/main/multisample.c                 |  2 +-
 src/mesa/main/state.c                       | 17 +++++++++++++++++
 src/mesa/state_tracker/st_atom_rasterizer.c |  2 +-
 src/mesa/swrast/s_points.c                  |  2 +-
 6 files changed, 22 insertions(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/r300/r300_render.c b/src/mesa/drivers/dri/r300/r300_render.c
index eee1e803a0..c809679e6c 100644
--- a/src/mesa/drivers/dri/r300/r300_render.c
+++ b/src/mesa/drivers/dri/r300/r300_render.c
@@ -359,7 +359,7 @@ static int r300Fallback(GLcontext * ctx)
 
 	if (!r300->disable_lowimpact_fallback) {
 		FALLBACK_IF(ctx->Polygon.StippleFlag);
-		FALLBACK_IF(ctx->Multisample.Enabled);
+		FALLBACK_IF(ctx->Multisample._Enabled);
 		FALLBACK_IF(ctx->Line.StippleFlag);
 		FALLBACK_IF(ctx->Line.SmoothFlag);
 		FALLBACK_IF(ctx->Point.SmoothFlag);
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 0a065541e1..00e7d5d395 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -961,6 +961,7 @@ struct gl_list_extensions
 struct gl_multisample_attrib
 {
    GLboolean Enabled;
+   GLboolean _Enabled;   /**< true if Enabled and multisample buffer */
    GLboolean SampleAlphaToCoverage;
    GLboolean SampleAlphaToOne;
    GLboolean SampleCoverage;
diff --git a/src/mesa/main/multisample.c b/src/mesa/main/multisample.c
index e138087436..b9cfad9216 100644
--- a/src/mesa/main/multisample.c
+++ b/src/mesa/main/multisample.c
@@ -57,7 +57,7 @@ _mesa_SampleCoverageARB(GLclampf value, GLboolean invert)
 void
 _mesa_init_multisample(GLcontext *ctx)
 {
-   ctx->Multisample.Enabled = GL_FALSE;
+   ctx->Multisample.Enabled = GL_TRUE;
    ctx->Multisample.SampleAlphaToCoverage = GL_FALSE;
    ctx->Multisample.SampleAlphaToOne = GL_FALSE;
    ctx->Multisample.SampleCoverage = GL_FALSE;
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 315253d90a..344af91e17 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -288,6 +288,20 @@ update_viewport_matrix(GLcontext *ctx)
 }
 
 
+/**
+ * Update derived multisample state.
+ */
+static void
+update_multisample(GLcontext *ctx)
+{
+   ctx->Multisample._Enabled = GL_FALSE;
+   if (ctx->DrawBuffer) {
+      if (ctx->DrawBuffer->Visual.sampleBuffers)
+         ctx->Multisample._Enabled = GL_TRUE;
+   }
+}
+
+
 /**
  * Update derived color/blend/logicop state.
  */
@@ -425,6 +439,9 @@ _mesa_update_state_locked( GLcontext *ctx )
    if (new_state & (_NEW_BUFFERS | _NEW_VIEWPORT))
       update_viewport_matrix(ctx);
 
+   if (new_state & _NEW_MULTISAMPLE)
+      update_multisample( ctx );
+
    if (new_state & _NEW_COLOR)
       update_color( ctx );
 
diff --git a/src/mesa/state_tracker/st_atom_rasterizer.c b/src/mesa/state_tracker/st_atom_rasterizer.c
index 87a91d56d0..ff40bb4312 100644
--- a/src/mesa/state_tracker/st_atom_rasterizer.c
+++ b/src/mesa/state_tracker/st_atom_rasterizer.c
@@ -254,7 +254,7 @@ static void update_raster_state( struct st_context *st )
    raster->line_stipple_factor = ctx->Line.StippleFactor - 1;
 
    /* _NEW_MULTISAMPLE */
-   if (ctx->Multisample.Enabled)
+   if (ctx->Multisample._Enabled)
       raster->multisample = 1;
 
    /* _NEW_SCISSOR */
diff --git a/src/mesa/swrast/s_points.c b/src/mesa/swrast/s_points.c
index c0f32e9c91..f4b3650210 100644
--- a/src/mesa/swrast/s_points.c
+++ b/src/mesa/swrast/s_points.c
@@ -250,7 +250,7 @@ smooth_point(GLcontext *ctx, const SWvertex *vert)
    size = CLAMP(size, ctx->Const.MinPointSizeAA, ctx->Const.MaxPointSizeAA);
 
    /* alpha attenuation / fade factor */
-   if (ctx->Multisample.Enabled) {
+   if (ctx->Multisample._Enabled) {
       if (vert->pointSize >= ctx->Point.Threshold) {
          alphaAtten = 1.0F;
       }
-- 
cgit v1.2.3


From 39b9b05313c8b8fce9b80e96819aded479e382c9 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 2 Jul 2008 17:10:42 -0600
Subject: mesa: additional GLSL built-in constants

---
 src/mesa/main/mfeatures.h              |  1 +
 src/mesa/shader/slang/slang_simplify.c | 32 +++++++++++++++++++-------------
 2 files changed, 20 insertions(+), 13 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index c3c337ea90..b08c017ec8 100644
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -44,6 +44,7 @@
 #define FEATURE_dlist  _HAVE_FULL_GL
 #define FEATURE_draw_read_buffer  _HAVE_FULL_GL
 #define FEATURE_drawpix  _HAVE_FULL_GL
+#define FEATURE_es2_glsl 0
 #define FEATURE_evaluators  _HAVE_FULL_GL
 #define FEATURE_feedback  _HAVE_FULL_GL
 #define FEATURE_fixedpt 0
diff --git a/src/mesa/shader/slang/slang_simplify.c b/src/mesa/shader/slang/slang_simplify.c
index 21d004db88..158d6bc8cf 100644
--- a/src/mesa/shader/slang/slang_simplify.c
+++ b/src/mesa/shader/slang/slang_simplify.c
@@ -49,20 +49,26 @@ _slang_lookup_constant(const char *name)
    struct constant_info {
       const char *Name;
       const GLenum Token;
+      GLint Divisor;
    };
    static const struct constant_info info[] = {
-      { "gl_MaxClipPlanes", GL_MAX_CLIP_PLANES },
-      { "gl_MaxCombinedTextureImageUnits", GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS },
-      { "gl_MaxDrawBuffers", GL_MAX_DRAW_BUFFERS },
-      { "gl_MaxFragmentUniformComponents", GL_MAX_FRAGMENT_UNIFORM_COMPONENTS },
-      { "gl_MaxLights", GL_MAX_LIGHTS },
-      { "gl_MaxTextureUnits", GL_MAX_TEXTURE_UNITS },
-      { "gl_MaxTextureCoords", GL_MAX_TEXTURE_COORDS },
-      { "gl_MaxVertexAttribs", GL_MAX_VERTEX_ATTRIBS },
-      { "gl_MaxVertexUniformComponents", GL_MAX_VERTEX_UNIFORM_COMPONENTS },
-      { "gl_MaxVaryingFloats", GL_MAX_VARYING_FLOATS },
-      { "gl_MaxVertexTextureImageUnits", GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS },
-      { "gl_MaxTextureImageUnits", GL_MAX_TEXTURE_IMAGE_UNITS },
+      { "gl_MaxClipPlanes", GL_MAX_CLIP_PLANES, 1 },
+      { "gl_MaxCombinedTextureImageUnits", GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, 1 },
+      { "gl_MaxDrawBuffers", GL_MAX_DRAW_BUFFERS, 1 },
+      { "gl_MaxFragmentUniformComponents", GL_MAX_FRAGMENT_UNIFORM_COMPONENTS, 1 },
+      { "gl_MaxLights", GL_MAX_LIGHTS, 1 },
+      { "gl_MaxTextureUnits", GL_MAX_TEXTURE_UNITS, 1 },
+      { "gl_MaxTextureCoords", GL_MAX_TEXTURE_COORDS, 1 },
+      { "gl_MaxVertexAttribs", GL_MAX_VERTEX_ATTRIBS, 1 },
+      { "gl_MaxVertexUniformComponents", GL_MAX_VERTEX_UNIFORM_COMPONENTS, 1 },
+      { "gl_MaxVaryingFloats", GL_MAX_VARYING_FLOATS, 1 },
+      { "gl_MaxVertexTextureImageUnits", GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS, 1 },
+      { "gl_MaxTextureImageUnits", GL_MAX_TEXTURE_IMAGE_UNITS, 1 },
+#if FEATURE_es2_glsl
+      { "gl_MaxVertexUniformVectors", GL_MAX_VERTEX_UNIFORM_COMPONENTS, 4 },
+      { "gl_MaxVaryingVectors", GL_MAX_VARYING_FLOATS, 4 },
+      { "gl_MaxFragmentUniformVectors", GL_MAX_FRAGMENT_UNIFORM_COMPONENTS, 4 },
+#endif
       { NULL, 0 }
    };
    GLuint i;
@@ -73,7 +79,7 @@ _slang_lookup_constant(const char *name)
          GLint value = -1.0;
          _mesa_GetIntegerv(info[i].Token, &value);
          ASSERT(value >= 0);  /* sanity check that glGetFloatv worked */
-         return value;
+         return value / info[i].Divisor;
       }
    }
    return -1;
-- 
cgit v1.2.3


From 1ca23061478868d61b9b2e6a30367e8e1de4a456 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 2 Jul 2008 19:18:10 -0600
Subject: mesa: fix vertex array validation test for attribute 0 (vert pos)

We don't actually need vertex array[0] enabled when using a vertex
program/shader.

cherry-picked from master
---
 src/mesa/main/api_validate.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c
index 9144b4bc66..2eb96ae3f4 100644
--- a/src/mesa/main/api_validate.c
+++ b/src/mesa/main/api_validate.c
@@ -59,9 +59,10 @@ _mesa_validate_DrawElements(GLcontext *ctx,
    if (ctx->NewState)
       _mesa_update_state(ctx);
 
-   /* Always need vertex positions */
-   if (!ctx->Array.ArrayObj->Vertex.Enabled
-       && !(ctx->VertexProgram._Enabled && ctx->Array.ArrayObj->VertexAttrib[0].Enabled))
+   /* Always need vertex positions, unless a vertex program is in use */
+   if (!ctx->VertexProgram._Current &&
+       !ctx->Array.ArrayObj->Vertex.Enabled &&
+       !ctx->Array.ArrayObj->VertexAttrib[0].Enabled)
       return GL_FALSE;
 
    /* Vertex buffer object tests */
@@ -177,9 +178,10 @@ _mesa_validate_DrawRangeElements(GLcontext *ctx, GLenum mode,
    if (ctx->NewState)
       _mesa_update_state(ctx);
 
-   /* Always need vertex positions */
-   if (!ctx->Array.ArrayObj->Vertex.Enabled
-       && !(ctx->VertexProgram._Enabled && ctx->Array.ArrayObj->VertexAttrib[0].Enabled))
+   /* Always need vertex positions, unless a vertex program is in use */
+   if (!ctx->VertexProgram._Current &&
+       !ctx->Array.ArrayObj->Vertex.Enabled &&
+       !ctx->Array.ArrayObj->VertexAttrib[0].Enabled)
       return GL_FALSE;
 
    /* Vertex buffer object tests */
@@ -247,8 +249,10 @@ _mesa_validate_DrawArrays(GLcontext *ctx,
    if (ctx->NewState)
       _mesa_update_state(ctx);
 
-   /* Always need vertex positions */
-   if (!ctx->Array.ArrayObj->Vertex.Enabled && !ctx->Array.ArrayObj->VertexAttrib[0].Enabled)
+   /* Always need vertex positions, unless a vertex program is in use */
+   if (!ctx->VertexProgram._Current &&
+       !ctx->Array.ArrayObj->Vertex.Enabled &&
+       !ctx->Array.ArrayObj->VertexAttrib[0].Enabled)
       return GL_FALSE;
 
    if (ctx->Const.CheckArrayBounds) {
-- 
cgit v1.2.3


From 78388c0e374349810fe3fb38cd4103a9544df4bf Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 3 Jul 2008 14:12:27 -0600
Subject: mesa: added case for fixed pt

---
 src/mesa/main/varray.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 50fe874556..a4ef948b58 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -615,6 +615,11 @@ _mesa_VertexAttribPointerARB(GLuint index, GLint size, GLenum type,
       case GL_DOUBLE:
          elementSize = size * sizeof(GLdouble);
          break;
+#if FEATURE_fixedpt
+      case GL_FIXED:
+         elementSize = size * sizeof(GLfixed);
+         break;
+#endif
       default:
          _mesa_error( ctx, GL_INVALID_ENUM, "glVertexAttribPointerARB(type)" );
          return;
-- 
cgit v1.2.3


From d015ffa6ea20f00f23513e63b5c27e5e6d0d3627 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 3 Jul 2008 15:41:45 -0600
Subject: mesa: fix problem freeing framebuffer/renderbuffer objects

Basically, set up no-op Delete() methods for the DummyFrame/Renderbuffer obj
---
 src/mesa/main/context.c  | 34 ++++++++++++++++++++++++++++++++++
 src/mesa/main/fbobject.c | 25 +++++++++++++++++++++++--
 src/mesa/main/fbobject.h |  7 +++++--
 3 files changed, 62 insertions(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index be93d844e0..33f6d2c0d0 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -691,6 +691,37 @@ delete_shader_cb(GLuint id, void *data, void *userData)
    }
 }
 
+/**
+ * Callback for deleting a framebuffer object.  Called by _mesa_HashDeleteAll()
+ */
+static void
+delete_framebuffer_cb(GLuint id, void *data, void *userData)
+{
+   struct gl_framebuffer *fb = (struct gl_framebuffer *) data;
+   /* The fact that the framebuffer is in the hashtable means its refcount
+    * is one, but we're removing from the hashtable now.  So clear refcount.
+    */
+   /*assert(fb->RefCount == 1);*/
+   fb->RefCount = 0;
+
+   /* NOTE: Delete should always be defined but there are two reports
+    * of it being NULL (bugs 13507, 14293).  Work-around for now.
+    */
+   if (fb->Delete)
+      fb->Delete(fb);
+}
+
+/**
+ * Callback for deleting a renderbuffer object. Called by _mesa_HashDeleteAll()
+ */
+static void
+delete_renderbuffer_cb(GLuint id, void *data, void *userData)
+{
+   struct gl_renderbuffer *rb = (struct gl_renderbuffer *) data;
+   rb->RefCount = 0;  /* see comment for FBOs above */
+   rb->Delete(rb);
+}
+
 
 /**
  * Deallocate a shared state object and all children structures.
@@ -744,7 +775,9 @@ free_shared_state( GLcontext *ctx, struct gl_shared_state *ss )
    _mesa_DeleteHashTable(ss->ArrayObjects);
 
 #if FEATURE_EXT_framebuffer_object
+   _mesa_HashDeleteAll(ss->FrameBuffers, delete_framebuffer_cb, ctx);
    _mesa_DeleteHashTable(ss->FrameBuffers);
+   _mesa_HashDeleteAll(ss->RenderBuffers, delete_renderbuffer_cb, ctx);
    _mesa_DeleteHashTable(ss->RenderBuffers);
 #endif
 
@@ -994,6 +1027,7 @@ init_attrib_groups(GLcontext *ctx)
 #if FEATURE_evaluators
    _mesa_init_eval( ctx );
 #endif
+   _mesa_init_fbobjects( ctx );
 #if FEATURE_feedback
    _mesa_init_feedback( ctx );
 #else
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 800f6ee9a3..e4ff575e18 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.5.1
+ * Version:  7.1
  *
- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -66,6 +66,27 @@ static struct gl_renderbuffer DummyRenderbuffer;
     (TARGET) <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z)
 
 
+static void
+delete_dummy_renderbuffer(struct gl_renderbuffer *rb)
+{
+   /* no op */
+}
+
+static void
+delete_dummy_framebuffer(struct gl_framebuffer *fb)
+{
+   /* no op */
+}
+
+
+void
+_mesa_init_fbobjects(GLcontext *ctx)
+{
+   DummyFramebuffer.Delete = delete_dummy_framebuffer;
+   DummyRenderbuffer.Delete = delete_dummy_renderbuffer;
+}
+
+
 /**
  * Helper routine for getting a gl_renderbuffer.
  */
diff --git a/src/mesa/main/fbobject.h b/src/mesa/main/fbobject.h
index 782ad8cb18..b6154719ab 100644
--- a/src/mesa/main/fbobject.h
+++ b/src/mesa/main/fbobject.h
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.5
+ * Version:  7.1
  *
- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -27,6 +27,9 @@
 #define FBOBJECT_H
 
 
+extern void
+_mesa_init_fbobjects(GLcontext *ctx);
+
 extern struct gl_renderbuffer *
 _mesa_lookup_renderbuffer(GLcontext *ctx, GLuint id);
 
-- 
cgit v1.2.3


From bb18a8b2eaaf8eea02c3255ed774751378fc7aa6 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 3 Jul 2008 16:02:13 -0600
Subject: mesa: fix some error codes in _mesa_ShaderSourceARB()

---
 src/mesa/main/shaders.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/shaders.c b/src/mesa/main/shaders.c
index 7bf8808767..b7b2f791a5 100644
--- a/src/mesa/main/shaders.c
+++ b/src/mesa/main/shaders.c
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.5.3
+ * Version:  7.1
  *
- * Copyright (C) 2004-2007  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2004-2008  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -382,7 +382,7 @@ _mesa_ShaderSourceARB(GLhandleARB shaderObj, GLsizei count,
    GLsizei i, totalLength;
    GLcharARB *source;
 
-   if (string == NULL) {
+   if (!shaderObj || string == NULL) {
       _mesa_error(ctx, GL_INVALID_VALUE, "glShaderSourceARB");
       return;
    }
@@ -400,7 +400,7 @@ _mesa_ShaderSourceARB(GLhandleARB shaderObj, GLsizei count,
    for (i = 0; i < count; i++) {
       if (string[i] == NULL) {
          _mesa_free((GLvoid *) offsets);
-         _mesa_error(ctx, GL_INVALID_VALUE, "glShaderSourceARB(null string)");
+         _mesa_error(ctx, GL_INVALID_OPERATION, "glShaderSourceARB(null string)");
          return;
       }
       if (length == NULL || length[i] < 0)
-- 
cgit v1.2.3


From c4b6941e62f5e30a7c479b7b8d6521cc4dd92e3e Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 4 Jul 2008 09:56:08 -0600
Subject: mesa: move assertion

---
 src/mesa/main/fbobject.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index e4ff575e18..56a3131016 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -185,9 +185,9 @@ _mesa_remove_attachment(GLcontext *ctx, struct gl_renderbuffer_attachment *att)
       att->Texture = NULL;
    }
    if (att->Type == GL_TEXTURE || att->Type == GL_RENDERBUFFER_EXT) {
-      ASSERT(att->Renderbuffer);
       ASSERT(!att->Texture);
-      _mesa_reference_renderbuffer(&att->Renderbuffer, NULL);
+      _mesa_reference_renderbuffer(&att->Renderbuffer, NULL); /* unbind */
+      ASSERT(!att->Renderbuffer);
    }
    att->Type = GL_NONE;
    att->Complete = GL_TRUE;
-- 
cgit v1.2.3


From 2fa7b3f78639114aec42fcbbfc29d3645832708b Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 4 Jul 2008 10:29:15 -0600
Subject: mesa: Implement mutex/locking around texture object reference
 counting.

Use new _mesa_reference_texobj() function for referencing/unreferencing
textures.  Add new assertions/tests to try to detect invalid usage of
deleted textures.

cherry-picked from master (9e01b915f1243a3f551cb795b7124bd1e52ca15f)
---
 src/mesa/main/attrib.c      |   1 +
 src/mesa/main/context.c     |  14 +--
 src/mesa/main/fbobject.c    |  17 ++-
 src/mesa/main/framebuffer.c |  13 +--
 src/mesa/main/mtypes.h      |   1 +
 src/mesa/main/texobj.c      | 253 ++++++++++++++++++++++----------------------
 src/mesa/main/texobj.h      |   4 +
 src/mesa/main/texstate.c    | 104 ++++++++----------
 8 files changed, 194 insertions(+), 213 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 2e6bb76586..b990369a9e 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -361,6 +361,7 @@ _mesa_PushAttrib(GLbitfield mask)
 	 ctx->Texture.Unit[u].Current1DArray->RefCount++;
 	 ctx->Texture.Unit[u].Current2DArray->RefCount++;
       }
+
       attr = MALLOC_STRUCT( gl_texture_attrib );
       MEMCPY( attr, &ctx->Texture, sizeof(struct gl_texture_attrib) );
       /* copy state of the currently bound texture objects */
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 33f6d2c0d0..279880cf40 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -500,19 +500,12 @@ alloc_shared_state( GLcontext *ctx )
    if (!ss->Default2DArray)
       goto cleanup;
 
-   /* Effectively bind the default textures to all texture units */
-   ss->Default1D->RefCount += MAX_TEXTURE_IMAGE_UNITS;
-   ss->Default2D->RefCount += MAX_TEXTURE_IMAGE_UNITS;
-   ss->Default3D->RefCount += MAX_TEXTURE_IMAGE_UNITS;
-   ss->DefaultCubeMap->RefCount += MAX_TEXTURE_IMAGE_UNITS;
-   ss->DefaultRect->RefCount += MAX_TEXTURE_IMAGE_UNITS;
-   ss->Default1DArray->RefCount += MAX_TEXTURE_IMAGE_UNITS;
-   ss->Default2DArray->RefCount += MAX_TEXTURE_IMAGE_UNITS;
+   /* sanity check */
+   assert(ss->Default1D->RefCount == 1);
 
    _glthread_INIT_MUTEX(ss->TexMutex);
    ss->TextureStateStamp = 0;
 
-
 #if FEATURE_EXT_framebuffer_object
    ss->FrameBuffers = _mesa_NewHashTable();
    if (!ss->FrameBuffers)
@@ -522,10 +515,9 @@ alloc_shared_state( GLcontext *ctx )
       goto cleanup;
 #endif
 
-
    return GL_TRUE;
 
- cleanup:
+cleanup:
    /* Ran out of memory at some point.  Free everything and return NULL */
    if (ss->DisplayList)
       _mesa_DeleteHashTable(ss->DisplayList);
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 56a3131016..0ae69bdce7 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -172,17 +172,12 @@ _mesa_remove_attachment(GLcontext *ctx, struct gl_renderbuffer_attachment *att)
 {
    if (att->Type == GL_TEXTURE) {
       ASSERT(att->Texture);
-      att->Texture->RefCount--;
-      if (att->Texture->RefCount == 0) {
-	 ctx->Driver.DeleteTexture(ctx, att->Texture);
-      }
-      else {
+      if (ctx->Driver.FinishRenderTexture) {
          /* tell driver that we're done rendering to this texture. */
-         if (ctx->Driver.FinishRenderTexture) {
-            ctx->Driver.FinishRenderTexture(ctx, att);
-         }
+         ctx->Driver.FinishRenderTexture(ctx, att);
       }
-      att->Texture = NULL;
+      _mesa_reference_texobj(&att->Texture, NULL); /* unbind */
+      ASSERT(!att->Texture);
    }
    if (att->Type == GL_TEXTURE || att->Type == GL_RENDERBUFFER_EXT) {
       ASSERT(!att->Texture);
@@ -213,8 +208,8 @@ _mesa_set_texture_attachment(GLcontext *ctx,
       /* new attachment */
       _mesa_remove_attachment(ctx, att);
       att->Type = GL_TEXTURE;
-      att->Texture = texObj;
-      texObj->RefCount++;
+      assert(!att->Texture);
+      _mesa_reference_texobj(&att->Texture, texObj);
    }
 
    /* always update these fields */
diff --git a/src/mesa/main/framebuffer.c b/src/mesa/main/framebuffer.c
index 96f1b30c9b..dab449fc09 100644
--- a/src/mesa/main/framebuffer.c
+++ b/src/mesa/main/framebuffer.c
@@ -38,6 +38,7 @@
 #include "fbobject.h"
 #include "framebuffer.h"
 #include "renderbuffer.h"
+#include "texobj.h"
 
 
 
@@ -192,17 +193,11 @@ _mesa_free_framebuffer_data(struct gl_framebuffer *fb)
          _mesa_reference_renderbuffer(&att->Renderbuffer, NULL);
       }
       if (att->Texture) {
-         /* render to texture */
-         att->Texture->RefCount--;
-         if (att->Texture->RefCount == 0) {
-            GET_CURRENT_CONTEXT(ctx);
-            if (ctx) {
-               ctx->Driver.DeleteTexture(ctx, att->Texture);
-            }
-         }
+         _mesa_reference_texobj(&att->Texture, NULL);
       }
+      ASSERT(!att->Renderbuffer);
+      ASSERT(!att->Texture);
       att->Type = GL_NONE;
-      att->Texture = NULL;
    }
 
    /* unbind _Depth/_StencilBuffer to decr ref counts */
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 00e7d5d395..a38ec02852 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1404,6 +1404,7 @@ struct gl_texture_image
  */
 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. */
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index 606e62d7a0..b77a00dd15 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -5,9 +5,9 @@
 
 /*
  * Mesa 3-D graphics library
- * Version:  6.5
+ * Version:  7.1
  *
- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -108,6 +108,7 @@ _mesa_initialize_texture_object( struct gl_texture_object *obj,
 
    _mesa_bzero(obj, sizeof(*obj));
    /* init the non-zero fields */
+   _glthread_INIT_MUTEX(obj->Mutex);
    obj->RefCount = 1;
    obj->Name = name;
    obj->Target = target;
@@ -155,6 +156,11 @@ _mesa_delete_texture_object( GLcontext *ctx, struct gl_texture_object *texObj )
 
    (void) ctx;
 
+   /* Set Target to an invalid value.  With some assertions elsewhere
+    * we can try to detect possible use of deleted textures.
+    */
+   texObj->Target = 0x99;
+
 #if FEATURE_colortable
    _mesa_free_colortable_data(&texObj->Palette);
 #endif
@@ -168,6 +174,9 @@ _mesa_delete_texture_object( GLcontext *ctx, struct gl_texture_object *texObj )
       }
    }
 
+   /* destroy the mutex -- it may have allocated memory (eg on bsd) */
+   _glthread_DESTROY_MUTEX(texObj->Mutex);
+
    /* free this object */
    _mesa_free(texObj);
 }
@@ -186,6 +195,7 @@ void
 _mesa_copy_texture_object( struct gl_texture_object *dest,
                            const struct gl_texture_object *src )
 {
+   dest->Target = src->Target;
    dest->Name = src->Name;
    dest->Priority = src->Priority;
    dest->BorderColor[0] = src->BorderColor[0];
@@ -217,6 +227,94 @@ _mesa_copy_texture_object( struct gl_texture_object *dest,
 }
 
 
+/**
+ * Check if the given texture object is valid by examining its Target field.
+ * For debugging only.
+ */
+static GLboolean
+valid_texture_object(const struct gl_texture_object *tex)
+{
+   switch (tex->Target) {
+   case 0:
+   case GL_TEXTURE_1D:
+   case GL_TEXTURE_2D:
+   case GL_TEXTURE_3D:
+   case GL_TEXTURE_CUBE_MAP_ARB:
+   case GL_TEXTURE_RECTANGLE_NV:
+   case GL_TEXTURE_1D_ARRAY_EXT:
+   case GL_TEXTURE_2D_ARRAY_EXT:
+      return GL_TRUE;
+   case 0x99:
+      _mesa_problem(NULL, "invalid reference to a deleted texture object");
+      return GL_FALSE;
+   default:
+      _mesa_problem(NULL, "invalid texture object Target value");
+      return GL_FALSE;
+   }
+}
+
+
+/**
+ * Reference (or unreference) a texture object.
+ * If '*ptr', decrement *ptr's refcount (and delete if it becomes zero).
+ * If 'tex' is non-null, increment its refcount.
+ */
+void
+_mesa_reference_texobj(struct gl_texture_object **ptr,
+                       struct gl_texture_object *tex)
+{
+   assert(ptr);
+   if (*ptr == tex) {
+      /* no change */
+      return;
+   }
+
+   if (*ptr) {
+      /* Unreference the old texture */
+      GLboolean deleteFlag = GL_FALSE;
+      struct gl_texture_object *oldTex = *ptr;
+
+      assert(valid_texture_object(oldTex));
+
+      _glthread_LOCK_MUTEX(oldTex->Mutex);
+      ASSERT(oldTex->RefCount > 0);
+      oldTex->RefCount--;
+
+      deleteFlag = (oldTex->RefCount == 0);
+      _glthread_UNLOCK_MUTEX(oldTex->Mutex);
+
+      if (deleteFlag) {
+         GET_CURRENT_CONTEXT(ctx);
+         if (ctx)
+            ctx->Driver.DeleteTexture(ctx, oldTex);
+         else
+            _mesa_problem(NULL, "Unable to delete texture, no context");
+      }
+
+      *ptr = NULL;
+   }
+   assert(!*ptr);
+
+   if (tex) {
+      /* reference new texture */
+      assert(valid_texture_object(tex));
+      _glthread_LOCK_MUTEX(tex->Mutex);
+      if (tex->RefCount == 0) {
+         /* this texture's being deleted (look just above) */
+         /* Not sure this can every really happen.  Warn if it does. */
+         _mesa_problem(NULL, "referencing deleted texture object");
+         *ptr = NULL;
+      }
+      else {
+         tex->RefCount++;
+         *ptr = tex;
+      }
+      _glthread_UNLOCK_MUTEX(tex->Mutex);
+   }
+}
+
+
+
 /**
  * Report why a texture object is incomplete.  
  *
@@ -613,8 +711,7 @@ unbind_texobj_from_fbo(GLcontext *ctx, struct gl_texture_object *texObj)
 
 /**
  * Check if the given texture object is bound to any texture image units and
- * unbind it if so.
- * XXX all RefCount accesses should be protected by a mutex.
+ * unbind it if so (revert to default textures).
  */
 static void
 unbind_texobj_from_texunits(GLcontext *ctx, struct gl_texture_object *texObj)
@@ -623,42 +720,26 @@ unbind_texobj_from_texunits(GLcontext *ctx, struct gl_texture_object *texObj)
 
    for (u = 0; u < MAX_TEXTURE_IMAGE_UNITS; u++) {
       struct gl_texture_unit *unit = &ctx->Texture.Unit[u];
-      struct gl_texture_object **curr = NULL;
-
       if (texObj == unit->Current1D) {
-         curr = &unit->Current1D;
-         unit->Current1D = ctx->Shared->Default1D;
+         _mesa_reference_texobj(&unit->Current1D, ctx->Shared->Default1D);
       }
       else if (texObj == unit->Current2D) {
-         curr = &unit->Current2D;
-         unit->Current2D = ctx->Shared->Default2D;
+         _mesa_reference_texobj(&unit->Current2D, ctx->Shared->Default2D);
       }
       else if (texObj == unit->Current3D) {
-         curr = &unit->Current3D;
-         unit->Current3D = ctx->Shared->Default3D;
+         _mesa_reference_texobj(&unit->Current3D, ctx->Shared->Default3D);
       }
       else if (texObj == unit->CurrentCubeMap) {
-         curr = &unit->CurrentCubeMap;
-         unit->CurrentCubeMap = ctx->Shared->DefaultCubeMap;
+         _mesa_reference_texobj(&unit->CurrentCubeMap, ctx->Shared->DefaultCubeMap);
       }
       else if (texObj == unit->CurrentRect) {
-         curr = &unit->CurrentRect;
-         unit->CurrentRect = ctx->Shared->DefaultRect;
+         _mesa_reference_texobj(&unit->CurrentRect, ctx->Shared->DefaultRect);
       }
       else if (texObj == unit->Current1DArray) {
-         curr = &unit->Current1DArray;
-         unit->CurrentRect = ctx->Shared->Default1DArray;
+         _mesa_reference_texobj(&unit->Current1DArray, ctx->Shared->Default1DArray);
       }
       else if (texObj == unit->Current2DArray) {
-         curr = &unit->Current1DArray;
-         unit->CurrentRect = ctx->Shared->Default2DArray;
-      }
-
-      if (curr) {
-         (*curr)->RefCount++;
-         texObj->RefCount--;
-         if (texObj == unit->_Current)
-            unit->_Current = *curr;
+         _mesa_reference_texobj(&unit->Current2DArray, ctx->Shared->Default2DArray);
       }
    }
 }
@@ -694,8 +775,6 @@ _mesa_DeleteTextures( GLsizei n, const GLuint *textures)
             = _mesa_lookup_texture(ctx, textures[i]);
 
          if (delObj) {
-	    GLboolean deleted;
-
 	    _mesa_lock_texture(ctx, delObj);
 
             /* Check if texture is bound to any framebuffer objects.
@@ -705,10 +784,12 @@ _mesa_DeleteTextures( GLsizei n, const GLuint *textures)
             unbind_texobj_from_fbo(ctx, delObj);
 
             /* Check if this texture is currently bound to any texture units.
-             * If so, unbind it and decrement the reference count.
+             * If so, unbind it.
              */
             unbind_texobj_from_texunits(ctx, delObj);
 
+	    _mesa_unlock_texture(ctx, delObj);
+
             ctx->NewState |= _NEW_TEXTURE;
 
             /* The texture _name_ is now free for re-use.
@@ -718,23 +799,10 @@ _mesa_DeleteTextures( GLsizei n, const GLuint *textures)
             _mesa_HashRemove(ctx->Shared->TexObjects, delObj->Name);
             _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
 
-            /* The actual texture object will not be freed until it's no
-             * longer bound in any context.
-             * XXX all RefCount accesses should be protected by a mutex.
+            /* Unreference the texobj.  If refcount hits zero, the texture
+             * will be deleted.
              */
-            delObj->RefCount--;
-	    deleted = (delObj->RefCount == 0);
-	    _mesa_unlock_texture(ctx, delObj);
-
-	    /* We know that refcount went to zero above, so this is
-	     * the only pointer left to delObj, so we don't have to
-	     * worry about locking any more:
-	     */
-            if (deleted) {
-               ASSERT(delObj->Name != 0); /* Never delete default tex objs */
-               ASSERT(ctx->Driver.DeleteTexture);
-               (*ctx->Driver.DeleteTexture)(ctx, delObj);
-            }
+            _mesa_reference_texobj(&delObj, NULL);
          }
       }
    }
@@ -762,7 +830,6 @@ _mesa_BindTexture( GLenum target, GLuint texName )
    GET_CURRENT_CONTEXT(ctx);
    const GLuint unit = ctx->Texture.CurrentUnit;
    struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
-   struct gl_texture_object *oldTexObj;
    struct gl_texture_object *newTexObj = NULL;
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
@@ -770,62 +837,6 @@ _mesa_BindTexture( GLenum target, GLuint texName )
       _mesa_debug(ctx, "glBindTexture %s %d\n",
                   _mesa_lookup_enum_by_nr(target), (GLint) texName);
 
-   /*
-    * Get pointer to currently bound texture object (oldTexObj)
-    */
-   switch (target) {
-      case GL_TEXTURE_1D:
-         oldTexObj = texUnit->Current1D;
-         break;
-      case GL_TEXTURE_2D:
-         oldTexObj = texUnit->Current2D;
-         break;
-      case GL_TEXTURE_3D:
-         oldTexObj = texUnit->Current3D;
-         break;
-      case GL_TEXTURE_CUBE_MAP_ARB:
-         if (!ctx->Extensions.ARB_texture_cube_map) {
-            _mesa_error( ctx, GL_INVALID_ENUM, "glBindTexture(target)" );
-            return;
-         }
-         oldTexObj = texUnit->CurrentCubeMap;
-         break;
-      case GL_TEXTURE_RECTANGLE_NV:
-         if (!ctx->Extensions.NV_texture_rectangle) {
-            _mesa_error( ctx, GL_INVALID_ENUM, "glBindTexture(target)" );
-            return;
-         }
-         oldTexObj = texUnit->CurrentRect;
-         break;
-      case GL_TEXTURE_1D_ARRAY_EXT:
-         if (!ctx->Extensions.MESA_texture_array) {
-            _mesa_error( ctx, GL_INVALID_ENUM, "glBindTexture(target)" );
-            return;
-         }
-         oldTexObj = texUnit->Current1DArray;
-         break;
-      case GL_TEXTURE_2D_ARRAY_EXT:
-         if (!ctx->Extensions.MESA_texture_array) {
-            _mesa_error( ctx, GL_INVALID_ENUM, "glBindTexture(target)" );
-            return;
-         }
-         oldTexObj = texUnit->Current2DArray;
-         break;
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glBindTexture(target)" );
-         return;
-   }
-
-   if (oldTexObj->Name == texName) {
-      /* XXX this might be wrong.  If the texobj is in use by another
-       * context and a texobj parameter was changed, this might be our
-       * only chance to update this context's hardware state.
-       * Note that some applications re-bind the same texture a lot so we
-       * want to handle that case quickly.
-       */
-      return;   /* rebinding the same texture- no change */
-   }
-
    /*
     * Get pointer to new texture object (newTexObj)
     */
@@ -854,7 +865,8 @@ _mesa_BindTexture( GLenum target, GLuint texName )
             newTexObj = ctx->Shared->Default2DArray;
             break;
          default:
-            ; /* Bad targets are caught above */
+            _mesa_error(ctx, GL_INVALID_ENUM, "glBindTexture(target)");
+            return;
       }
    }
    else {
@@ -900,28 +912,30 @@ _mesa_BindTexture( GLenum target, GLuint texName )
       newTexObj->Target = target;
    }
 
-   /* XXX all RefCount accesses should be protected by a mutex. */
-   newTexObj->RefCount++;
+   assert(valid_texture_object(newTexObj));
 
-   /* do the actual binding, but first flush outstanding vertices:
-    */
+   /* flush before changing binding */
    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
 
+   /* Do the actual binding.  The refcount on the previously bound
+    * texture object will be decremented.  It'll be deleted if the
+    * count hits zero.
+    */
    switch (target) {
       case GL_TEXTURE_1D:
-         texUnit->Current1D = newTexObj;
+         _mesa_reference_texobj(&texUnit->Current1D, newTexObj);
          break;
       case GL_TEXTURE_2D:
-         texUnit->Current2D = newTexObj;
+         _mesa_reference_texobj(&texUnit->Current2D, newTexObj);
          break;
       case GL_TEXTURE_3D:
-         texUnit->Current3D = newTexObj;
+         _mesa_reference_texobj(&texUnit->Current3D, newTexObj);
          break;
       case GL_TEXTURE_CUBE_MAP_ARB:
-         texUnit->CurrentCubeMap = newTexObj;
+         _mesa_reference_texobj(&texUnit->CurrentCubeMap, newTexObj);
          break;
       case GL_TEXTURE_RECTANGLE_NV:
-         texUnit->CurrentRect = newTexObj;
+         _mesa_reference_texobj(&texUnit->CurrentRect, newTexObj);
          break;
       case GL_TEXTURE_1D_ARRAY_EXT:
          texUnit->Current1DArray = newTexObj;
@@ -930,6 +944,7 @@ _mesa_BindTexture( GLenum target, GLuint texName )
          texUnit->Current2DArray = newTexObj;
          break;
       default:
+         /* Bad target should be caught above */
          _mesa_problem(ctx, "bad target in BindTexture");
          return;
    }
@@ -937,18 +952,6 @@ _mesa_BindTexture( GLenum target, GLuint texName )
    /* Pass BindTexture call to device driver */
    if (ctx->Driver.BindTexture)
       (*ctx->Driver.BindTexture)( ctx, target, newTexObj );
-
-   /* Decrement the reference count on the old texture and check if it's
-    * time to delete it.
-    */
-   /* XXX all RefCount accesses should be protected by a mutex. */
-   oldTexObj->RefCount--;
-   ASSERT(oldTexObj->RefCount >= 0);
-   if (oldTexObj->RefCount == 0) {
-      ASSERT(oldTexObj->Name != 0);
-      ASSERT(ctx->Driver.DeleteTexture);
-      (*ctx->Driver.DeleteTexture)( ctx, oldTexObj );
-   }
 }
 
 
diff --git a/src/mesa/main/texobj.h b/src/mesa/main/texobj.h
index 2a2bde3601..d5374c5d6c 100644
--- a/src/mesa/main/texobj.h
+++ b/src/mesa/main/texobj.h
@@ -57,6 +57,10 @@ extern void
 _mesa_copy_texture_object( struct gl_texture_object *dest,
                            const struct gl_texture_object *src );
 
+extern void
+_mesa_reference_texobj(struct gl_texture_object **ptr,
+                       struct gl_texture_object *tex);
+
 extern void
 _mesa_test_texobj_completeness( const GLcontext *ctx,
                                 struct gl_texture_object *obj );
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 421f912849..3bdb55257f 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -62,31 +62,6 @@ static const struct gl_tex_env_combine_state default_combine_state = {
 };
 
 
-/**
- * Copy a texture binding.  Helper used by _mesa_copy_texture_state().
- */
-static void
-copy_texture_binding(const GLcontext *ctx,
-                     struct gl_texture_object **dst,
-                     struct gl_texture_object *src)
-{
-   /* only copy if names differ (per OpenGL SI) */
-   if ((*dst)->Name != src->Name) {
-      /* unbind/delete dest binding which we're changing */
-      (*dst)->RefCount--;
-      if ((*dst)->RefCount == 0) {
-         /* time to delete this texture object */
-         ASSERT((*dst)->Name != 0);
-         ASSERT(ctx->Driver.DeleteTexture);
-         /* XXX cast-away const, unfortunately */
-         (*ctx->Driver.DeleteTexture)((GLcontext *) ctx, *dst);
-      }
-      /* make new binding, incrementing ref count */
-      *dst = src;
-      src->RefCount++;
-   }
-}
-
 
 /**
  * Used by glXCopyContext to copy texture state from one context to another.
@@ -143,20 +118,20 @@ _mesa_copy_texture_state( const GLcontext *src, GLcontext *dst )
       /* copy texture object bindings, not contents of texture objects */
       _mesa_lock_context_textures(dst);
 
-      copy_texture_binding(src, &dst->Texture.Unit[i].Current1D,
-                           src->Texture.Unit[i].Current1D);
-      copy_texture_binding(src, &dst->Texture.Unit[i].Current2D,
-                           src->Texture.Unit[i].Current2D);
-      copy_texture_binding(src, &dst->Texture.Unit[i].Current3D,
-                           src->Texture.Unit[i].Current3D);
-      copy_texture_binding(src, &dst->Texture.Unit[i].CurrentCubeMap,
-                           src->Texture.Unit[i].CurrentCubeMap);
-      copy_texture_binding(src, &dst->Texture.Unit[i].CurrentRect,
-                           src->Texture.Unit[i].CurrentRect);
-      copy_texture_binding(src, &dst->Texture.Unit[i].Current1DArray,
-                           src->Texture.Unit[i].Current1DArray);
-      copy_texture_binding(src, &dst->Texture.Unit[i].Current2DArray,
-                           src->Texture.Unit[i].Current2DArray);
+       _mesa_reference_texobj(&dst->Texture.Unit[i].Current1D,
+                              src->Texture.Unit[i].Current1D);
+       _mesa_reference_texobj(&dst->Texture.Unit[i].Current2D,
+                              src->Texture.Unit[i].Current2D);
+       _mesa_reference_texobj(&dst->Texture.Unit[i].Current3D,
+                              src->Texture.Unit[i].Current3D);
+       _mesa_reference_texobj(&dst->Texture.Unit[i].CurrentCubeMap,
+                              src->Texture.Unit[i].CurrentCubeMap);
+       _mesa_reference_texobj(&dst->Texture.Unit[i].CurrentRect,
+                              src->Texture.Unit[i].CurrentRect);
+       _mesa_reference_texobj(&dst->Texture.Unit[i].Current1DArray,
+                              src->Texture.Unit[i].Current1DArray);
+       _mesa_reference_texobj(&dst->Texture.Unit[i].Current2DArray,
+                              src->Texture.Unit[i].Current2DArray);
 
       _mesa_unlock_context_textures(dst);
    }
@@ -727,6 +702,8 @@ alloc_proxy_textures( GLcontext *ctx )
    if (!ctx->Texture.Proxy2DArray)
       goto cleanup;
 
+   assert(ctx->Texture.Proxy1D->RefCount == 1);
+
    return GL_TRUE;
 
  cleanup:
@@ -786,13 +763,14 @@ init_texture_unit( GLcontext *ctx, GLuint unit )
    ASSIGN_4V( texUnit->EyePlaneR, 0.0, 0.0, 0.0, 0.0 );
    ASSIGN_4V( texUnit->EyePlaneQ, 0.0, 0.0, 0.0, 0.0 );
 
-   texUnit->Current1D = ctx->Shared->Default1D;
-   texUnit->Current2D = ctx->Shared->Default2D;
-   texUnit->Current3D = ctx->Shared->Default3D;
-   texUnit->CurrentCubeMap = ctx->Shared->DefaultCubeMap;
-   texUnit->CurrentRect = ctx->Shared->DefaultRect;
-   texUnit->Current1DArray = ctx->Shared->Default1DArray;
-   texUnit->Current2DArray = ctx->Shared->Default2DArray;
+   /* initialize current texture object ptrs to the shared default objects */
+   _mesa_reference_texobj(&texUnit->Current1D, ctx->Shared->Default1D);
+   _mesa_reference_texobj(&texUnit->Current2D, ctx->Shared->Default2D);
+   _mesa_reference_texobj(&texUnit->Current3D, ctx->Shared->Default3D);
+   _mesa_reference_texobj(&texUnit->CurrentCubeMap, ctx->Shared->DefaultCubeMap);
+   _mesa_reference_texobj(&texUnit->CurrentRect, ctx->Shared->DefaultRect);
+   _mesa_reference_texobj(&texUnit->Current1DArray, ctx->Shared->Default1DArray);
+   _mesa_reference_texobj(&texUnit->Current2DArray, ctx->Shared->Default2DArray);
 }
 
 
@@ -807,25 +785,22 @@ _mesa_init_texture(GLcontext *ctx)
    assert(MAX_TEXTURE_LEVELS >= MAX_3D_TEXTURE_LEVELS);
    assert(MAX_TEXTURE_LEVELS >= MAX_CUBE_TEXTURE_LEVELS);
 
-   /* Effectively bind the default textures to all texture units */
-   ctx->Shared->Default1D->RefCount += MAX_TEXTURE_UNITS;
-   ctx->Shared->Default2D->RefCount += MAX_TEXTURE_UNITS;
-   ctx->Shared->Default3D->RefCount += MAX_TEXTURE_UNITS;
-   ctx->Shared->DefaultCubeMap->RefCount += MAX_TEXTURE_UNITS;
-   ctx->Shared->DefaultRect->RefCount += MAX_TEXTURE_UNITS;
-   ctx->Shared->Default1DArray->RefCount += MAX_TEXTURE_UNITS;
-   ctx->Shared->Default2DArray->RefCount += MAX_TEXTURE_UNITS;
-
    /* Texture group */
    ctx->Texture.CurrentUnit = 0;      /* multitexture */
    ctx->Texture._EnabledUnits = 0;
-   for (i=0; i<MAX_TEXTURE_UNITS; i++)
-      init_texture_unit( ctx, i );
    ctx->Texture.SharedPalette = GL_FALSE;
 #if FEATURE_colortable
    _mesa_init_colortable(&ctx->Texture.Palette);
 #endif
 
+   for (i = 0; i < MAX_TEXTURE_UNITS; i++)
+      init_texture_unit( ctx, i );
+
+   /* After we're done initializing the context's texture state the default
+    * texture objects' refcounts should be at least MAX_TEXTURE_UNITS + 1.
+    */
+   assert(ctx->Shared->Default1D->RefCount >= MAX_TEXTURE_UNITS + 1);
+
    /* Allocate proxy textures */
    if (!alloc_proxy_textures( ctx ))
       return GL_FALSE;
@@ -840,6 +815,20 @@ _mesa_init_texture(GLcontext *ctx)
 void
 _mesa_free_texture_data(GLcontext *ctx)
 {
+   GLuint u;
+
+   /* unreference current textures */
+   for (u = 0; u < MAX_TEXTURE_IMAGE_UNITS; u++) {
+      struct gl_texture_unit *unit = ctx->Texture.Unit + u;
+      _mesa_reference_texobj(&unit->Current1D, NULL);
+      _mesa_reference_texobj(&unit->Current2D, NULL);
+      _mesa_reference_texobj(&unit->Current3D, NULL);
+      _mesa_reference_texobj(&unit->CurrentCubeMap, NULL);
+      _mesa_reference_texobj(&unit->CurrentRect, NULL);
+      _mesa_reference_texobj(&unit->Current1DArray, NULL);
+      _mesa_reference_texobj(&unit->Current2DArray, NULL);
+   }
+
    /* Free proxy texture objects */
    (ctx->Driver.DeleteTexture)(ctx,  ctx->Texture.Proxy1D );
    (ctx->Driver.DeleteTexture)(ctx,  ctx->Texture.Proxy2D );
@@ -849,6 +838,7 @@ _mesa_free_texture_data(GLcontext *ctx)
    (ctx->Driver.DeleteTexture)(ctx,  ctx->Texture.Proxy1DArray );
    (ctx->Driver.DeleteTexture)(ctx,  ctx->Texture.Proxy2DArray );
 
+
 #if FEATURE_colortable
    {
       GLuint i;
-- 
cgit v1.2.3


From 0bc2409e3808df54bf7d228475320e2ec4fe80a1 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 4 Jul 2008 10:37:07 -0600
Subject: mesa: Replace Proxy1D/2D/etc with ProxyTex[] indexed by
 TEXTURE_x_INDEX.

Simplification in colortab.c too.

cherry-picked from master (fe469007037d9d5cdbe1677d8ff7368b276e9e7c)
---
 src/mesa/drivers/dri/tdfx/tdfx_tex.c |   2 +-
 src/mesa/main/colortab.c             | 306 +++++++++++------------------------
 src/mesa/main/mtypes.h               |   4 +
 src/mesa/main/teximage.c             |  58 +++----
 src/mesa/main/texstate.c             |  81 ++++------
 5 files changed, 154 insertions(+), 297 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/tdfx/tdfx_tex.c b/src/mesa/drivers/dri/tdfx/tdfx_tex.c
index 65e665ee39..70ef726437 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_tex.c
+++ b/src/mesa/drivers/dri/tdfx/tdfx_tex.c
@@ -1821,7 +1821,7 @@ tdfxTestProxyTexImage(GLcontext *ctx, GLenum target,
             tdfxTexInfo *ti;
             int memNeeded;
 
-            tObj = ctx->Texture.Proxy2D;
+            tObj = ctx->Texture.ProxyTex[TEXTURE_2D_INDEX];
             if (!tObj->DriverData)
                 tObj->DriverData = fxAllocTexObjData(fxMesa);
             ti = TDFX_TEXTURE_DATA(tObj);
diff --git a/src/mesa/main/colortab.c b/src/mesa/main/colortab.c
index 610acba306..97120398f9 100644
--- a/src/mesa/main/colortab.c
+++ b/src/mesa/main/colortab.c
@@ -1,6 +1,6 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.5.3
+ * Version:  7.1
  *
  * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
  *
@@ -30,6 +30,7 @@
 #include "image.h"
 #include "macros.h"
 #include "state.h"
+#include "teximage.h"
 
 
 /**
@@ -305,49 +306,6 @@ _mesa_ColorTable( GLenum target, GLenum internalFormat,
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); /* too complex */
 
    switch (target) {
-      case GL_TEXTURE_1D:
-         texObj = texUnit->Current1D;
-         table = &texObj->Palette;
-         break;
-      case GL_TEXTURE_2D:
-         texObj = texUnit->Current2D;
-         table = &texObj->Palette;
-         break;
-      case GL_TEXTURE_3D:
-         texObj = texUnit->Current3D;
-         table = &texObj->Palette;
-         break;
-      case GL_TEXTURE_CUBE_MAP_ARB:
-         if (!ctx->Extensions.ARB_texture_cube_map) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glColorTable(target)");
-            return;
-         }
-         texObj = texUnit->CurrentCubeMap;
-         table = &texObj->Palette;
-         break;
-      case GL_PROXY_TEXTURE_1D:
-         texObj = ctx->Texture.Proxy1D;
-         table = &texObj->Palette;
-         proxy = GL_TRUE;
-         break;
-      case GL_PROXY_TEXTURE_2D:
-         texObj = ctx->Texture.Proxy2D;
-         table = &texObj->Palette;
-         proxy = GL_TRUE;
-         break;
-      case GL_PROXY_TEXTURE_3D:
-         texObj = ctx->Texture.Proxy3D;
-         table = &texObj->Palette;
-         proxy = GL_TRUE;
-         break;
-      case GL_PROXY_TEXTURE_CUBE_MAP_ARB:
-         if (!ctx->Extensions.ARB_texture_cube_map) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glColorTable(target)");
-            return;
-         }
-         texObj = ctx->Texture.ProxyCubeMap;
-         table = &texObj->Palette;
-         break;
       case GL_SHARED_TEXTURE_PALETTE_EXT:
          table = &ctx->Texture.Palette;
          break;
@@ -396,8 +354,19 @@ _mesa_ColorTable( GLenum target, GLenum internalFormat,
          proxy = GL_TRUE;
          break;
       default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glColorTable(target)");
-         return;
+         /* try texture targets */
+         {
+            struct gl_texture_object *texobj
+               = _mesa_select_tex_object(ctx, texUnit, target);
+            if (texobj) {
+               table = &texobj->Palette;
+               proxy = _mesa_is_proxy_texture(target);
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glColorTable(target)");
+               return;
+            }
+         }
    }
 
    assert(table);
@@ -499,26 +468,6 @@ _mesa_ColorSubTable( GLenum target, GLsizei start,
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
    switch (target) {
-      case GL_TEXTURE_1D:
-         texObj = texUnit->Current1D;
-         table = &texObj->Palette;
-         break;
-      case GL_TEXTURE_2D:
-         texObj = texUnit->Current2D;
-         table = &texObj->Palette;
-         break;
-      case GL_TEXTURE_3D:
-         texObj = texUnit->Current3D;
-         table = &texObj->Palette;
-         break;
-      case GL_TEXTURE_CUBE_MAP_ARB:
-         if (!ctx->Extensions.ARB_texture_cube_map) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glColorSubTable(target)");
-            return;
-         }
-         texObj = texUnit->CurrentCubeMap;
-         table = &texObj->Palette;
-         break;
       case GL_SHARED_TEXTURE_PALETTE_EXT:
          table = &ctx->Texture.Palette;
          break;
@@ -547,8 +496,15 @@ _mesa_ColorSubTable( GLenum target, GLsizei start,
          bias = ctx->Pixel.ColorTableBias[COLORTABLE_POSTCOLORMATRIX];
          break;
       default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glColorSubTable(target)");
-         return;
+         /* try texture targets */
+         texObj = _mesa_select_tex_object(ctx, texUnit, target);
+         if (texObj && !_mesa_is_proxy_texture(target)) {
+            table = &texObj->Palette;
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glColorSubTable(target)");
+            return;
+         }
    }
 
    assert(table);
@@ -636,22 +592,6 @@ _mesa_GetColorTable( GLenum target, GLenum format,
    }
 
    switch (target) {
-      case GL_TEXTURE_1D:
-         table = &texUnit->Current1D->Palette;
-         break;
-      case GL_TEXTURE_2D:
-         table = &texUnit->Current2D->Palette;
-         break;
-      case GL_TEXTURE_3D:
-         table = &texUnit->Current3D->Palette;
-         break;
-      case GL_TEXTURE_CUBE_MAP_ARB:
-         if (!ctx->Extensions.ARB_texture_cube_map) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTable(target)");
-            return;
-         }
-         table = &texUnit->CurrentCubeMap->Palette;
-         break;
       case GL_SHARED_TEXTURE_PALETTE_EXT:
          table = &ctx->Texture.Palette;
          break;
@@ -672,8 +612,18 @@ _mesa_GetColorTable( GLenum target, GLenum format,
          table = &ctx->ColorTable[COLORTABLE_POSTCOLORMATRIX];
          break;
       default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTable(target)");
-         return;
+         /* try texture targets */
+         {
+            struct gl_texture_object *texobj
+               = _mesa_select_tex_object(ctx, texUnit, target);
+            if (texobj && !_mesa_is_proxy_texture(target)) {
+               table = &texobj->Palette;
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTable(target)");
+               return;
+            }
+         }
    }
 
    ASSERT(table);
@@ -781,65 +731,41 @@ _mesa_GetColorTable( GLenum target, GLenum format,
 void GLAPIENTRY
 _mesa_ColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
+   GLfloat *scale, *bias;
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
    switch (target) {
-      case GL_COLOR_TABLE_SGI:
-         if (pname == GL_COLOR_TABLE_SCALE_SGI) {
-            COPY_4V(ctx->Pixel.ColorTableScale[COLORTABLE_PRECONVOLUTION], params);
-         }
-         else if (pname == GL_COLOR_TABLE_BIAS_SGI) {
-            COPY_4V(ctx->Pixel.ColorTableBias[COLORTABLE_PRECONVOLUTION], params);
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glColorTableParameterfv(pname)");
-            return;
-         }
-         break;
-      case GL_TEXTURE_COLOR_TABLE_SGI:
-         if (!ctx->Extensions.SGI_texture_color_table) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glColorTableParameter(target)");
-            return;
-         }
-         if (pname == GL_COLOR_TABLE_SCALE_SGI) {
-            COPY_4V(ctx->Pixel.TextureColorTableScale, params);
-         }
-         else if (pname == GL_COLOR_TABLE_BIAS_SGI) {
-            COPY_4V(ctx->Pixel.TextureColorTableBias, params);
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glColorTableParameterfv(pname)");
-            return;
-         }
-         break;
-      case GL_POST_CONVOLUTION_COLOR_TABLE_SGI:
-         if (pname == GL_COLOR_TABLE_SCALE_SGI) {
-            COPY_4V(ctx->Pixel.ColorTableScale[COLORTABLE_POSTCONVOLUTION], params);
-         }
-         else if (pname == GL_COLOR_TABLE_BIAS_SGI) {
-            COPY_4V(ctx->Pixel.ColorTableBias[COLORTABLE_POSTCONVOLUTION], params);
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glColorTableParameterfv(pname)");
-            return;
-         }
-         break;
-      case GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI:
-         if (pname == GL_COLOR_TABLE_SCALE_SGI) {
-            COPY_4V(ctx->Pixel.ColorTableScale[COLORTABLE_POSTCOLORMATRIX], params);
-         }
-         else if (pname == GL_COLOR_TABLE_BIAS_SGI) {
-            COPY_4V(ctx->Pixel.ColorTableBias[COLORTABLE_POSTCOLORMATRIX], params);
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glColorTableParameterfv(pname)");
-            return;
-         }
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glColorTableParameter(target)");
-         return;
+   case GL_COLOR_TABLE_SGI:
+      scale = ctx->Pixel.ColorTableScale[COLORTABLE_PRECONVOLUTION];
+      bias  = ctx->Pixel.ColorTableBias[COLORTABLE_PRECONVOLUTION];
+      break;
+   case GL_TEXTURE_COLOR_TABLE_SGI:
+      scale = ctx->Pixel.TextureColorTableScale;
+      bias  = ctx->Pixel.TextureColorTableBias;
+      break;
+   case GL_POST_CONVOLUTION_COLOR_TABLE_SGI:
+      scale = ctx->Pixel.ColorTableScale[COLORTABLE_POSTCONVOLUTION];
+      bias  = ctx->Pixel.ColorTableBias[COLORTABLE_POSTCONVOLUTION];
+      break;
+   case GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI:
+      scale = ctx->Pixel.ColorTableScale[COLORTABLE_POSTCOLORMATRIX];
+      bias  = ctx->Pixel.ColorTableBias[COLORTABLE_POSTCOLORMATRIX];
+      break;
+   default:
+      _mesa_error(ctx, GL_INVALID_ENUM, "glColorTableParameter(target)");
+      return;
+   }
+
+   if (pname == GL_COLOR_TABLE_SCALE_SGI) {
+      COPY_4V(scale, params);
+   }
+   else if (pname == GL_COLOR_TABLE_BIAS_SGI) {
+      COPY_4V(bias, params);
+   }
+   else {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glColorTableParameterfv(pname)");
+      return;
    }
 
    ctx->NewState |= _NEW_PIXEL;
@@ -879,40 +805,6 @@ _mesa_GetColorTableParameterfv( GLenum target, GLenum pname, GLfloat *params )
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
    switch (target) {
-      case GL_TEXTURE_1D:
-         table = &texUnit->Current1D->Palette;
-         break;
-      case GL_TEXTURE_2D:
-         table = &texUnit->Current2D->Palette;
-         break;
-      case GL_TEXTURE_3D:
-         table = &texUnit->Current3D->Palette;
-         break;
-      case GL_TEXTURE_CUBE_MAP_ARB:
-         if (!ctx->Extensions.ARB_texture_cube_map) {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glGetColorTableParameterfv(target)");
-            return;
-         }
-         table = &texUnit->CurrentCubeMap->Palette;
-         break;
-      case GL_PROXY_TEXTURE_1D:
-         table = &ctx->Texture.Proxy1D->Palette;
-         break;
-      case GL_PROXY_TEXTURE_2D:
-         table = &ctx->Texture.Proxy2D->Palette;
-         break;
-      case GL_PROXY_TEXTURE_3D:
-         table = &ctx->Texture.Proxy3D->Palette;
-         break;
-      case GL_PROXY_TEXTURE_CUBE_MAP_ARB:
-         if (!ctx->Extensions.ARB_texture_cube_map) {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glGetColorTableParameterfv(target)");
-            return;
-         }
-         table = &ctx->Texture.ProxyCubeMap->Palette;
-         break;
       case GL_SHARED_TEXTURE_PALETTE_EXT:
          table = &ctx->Texture.Palette;
          break;
@@ -981,8 +873,19 @@ _mesa_GetColorTableParameterfv( GLenum target, GLenum pname, GLfloat *params )
          table = &ctx->ProxyColorTable[COLORTABLE_POSTCOLORMATRIX];
          break;
       default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameterfv(target)");
-         return;
+         /* try texture targets */
+         {
+            struct gl_texture_object *texobj
+               = _mesa_select_tex_object(ctx, texUnit, target);
+            if (texobj) {
+               table = &texobj->Palette;
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM,
+                           "glGetColorTableParameterfv(target)");
+               return;
+            }
+         }
    }
 
    assert(table);
@@ -1029,40 +932,6 @@ _mesa_GetColorTableParameteriv( GLenum target, GLenum pname, GLint *params )
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
    switch (target) {
-      case GL_TEXTURE_1D:
-         table = &texUnit->Current1D->Palette;
-         break;
-      case GL_TEXTURE_2D:
-         table = &texUnit->Current2D->Palette;
-         break;
-      case GL_TEXTURE_3D:
-         table = &texUnit->Current3D->Palette;
-         break;
-      case GL_TEXTURE_CUBE_MAP_ARB:
-         if (!ctx->Extensions.ARB_texture_cube_map) {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glGetColorTableParameteriv(target)");
-            return;
-         }
-         table = &texUnit->CurrentCubeMap->Palette;
-         break;
-      case GL_PROXY_TEXTURE_1D:
-         table = &ctx->Texture.Proxy1D->Palette;
-         break;
-      case GL_PROXY_TEXTURE_2D:
-         table = &ctx->Texture.Proxy2D->Palette;
-         break;
-      case GL_PROXY_TEXTURE_3D:
-         table = &ctx->Texture.Proxy3D->Palette;
-         break;
-      case GL_PROXY_TEXTURE_CUBE_MAP_ARB:
-         if (!ctx->Extensions.ARB_texture_cube_map) {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glGetColorTableParameteriv(target)");
-            return;
-         }
-         table = &ctx->Texture.ProxyCubeMap->Palette;
-         break;
       case GL_SHARED_TEXTURE_PALETTE_EXT:
          table = &ctx->Texture.Palette;
          break;
@@ -1161,8 +1030,19 @@ _mesa_GetColorTableParameteriv( GLenum target, GLenum pname, GLint *params )
          table = &ctx->ProxyColorTable[COLORTABLE_POSTCOLORMATRIX];
          break;
       default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameteriv(target)");
-         return;
+         /* Try texture targets */
+         {
+            struct gl_texture_object *texobj
+               = _mesa_select_tex_object(ctx, texUnit, target);
+            if (texobj) {
+               table = &texobj->Palette;
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM,
+                           "glGetColorTableParameteriv(target)");
+               return;
+            }
+         }
    }
 
    assert(table);
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index a38ec02852..2d6be1983c 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1579,6 +1579,7 @@ struct gl_texture_attrib
 
    struct gl_texture_unit Unit[MAX_TEXTURE_UNITS];
 
+#if 0
    struct gl_texture_object *Proxy1D;
    struct gl_texture_object *Proxy2D;
    struct gl_texture_object *Proxy3D;
@@ -1586,6 +1587,9 @@ struct gl_texture_attrib
    struct gl_texture_object *ProxyRect;
    struct gl_texture_object *Proxy1DArray;
    struct gl_texture_object *Proxy2DArray;
+#else
+   struct gl_texture_object *ProxyTex[NUM_TEXTURE_TARGETS];
+#endif
 
    /** GL_EXT_shared_texture_palette */
    GLboolean SharedPalette;
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index eed1937517..36557f19fd 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -767,15 +767,15 @@ _mesa_select_tex_object(GLcontext *ctx, const struct gl_texture_unit *texUnit,
       case GL_TEXTURE_1D:
          return texUnit->Current1D;
       case GL_PROXY_TEXTURE_1D:
-         return ctx->Texture.Proxy1D;
+         return ctx->Texture.ProxyTex[TEXTURE_1D_INDEX];
       case GL_TEXTURE_2D:
          return texUnit->Current2D;
       case GL_PROXY_TEXTURE_2D:
-         return ctx->Texture.Proxy2D;
+         return ctx->Texture.ProxyTex[TEXTURE_2D_INDEX];
       case GL_TEXTURE_3D:
          return texUnit->Current3D;
       case GL_PROXY_TEXTURE_3D:
-         return ctx->Texture.Proxy3D;
+         return ctx->Texture.ProxyTex[TEXTURE_3D_INDEX];
       case GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB:
       case GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB:
       case GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB:
@@ -787,25 +787,25 @@ _mesa_select_tex_object(GLcontext *ctx, const struct gl_texture_unit *texUnit,
                 ? texUnit->CurrentCubeMap : NULL;
       case GL_PROXY_TEXTURE_CUBE_MAP_ARB:
          return ctx->Extensions.ARB_texture_cube_map
-                ? ctx->Texture.ProxyCubeMap : NULL;
+                ? ctx->Texture.ProxyTex[TEXTURE_CUBE_INDEX] : NULL;
       case GL_TEXTURE_RECTANGLE_NV:
          return ctx->Extensions.NV_texture_rectangle
                 ? texUnit->CurrentRect : NULL;
       case GL_PROXY_TEXTURE_RECTANGLE_NV:
          return ctx->Extensions.NV_texture_rectangle
-                ? ctx->Texture.ProxyRect : NULL;
+                ? ctx->Texture.ProxyTex[TEXTURE_RECT_INDEX] : NULL;
       case GL_TEXTURE_1D_ARRAY_EXT:
          return ctx->Extensions.MESA_texture_array
                 ? texUnit->Current1DArray : NULL;
       case GL_PROXY_TEXTURE_1D_ARRAY_EXT:
          return ctx->Extensions.MESA_texture_array
-                ? ctx->Texture.Proxy1DArray : NULL;
+                ? ctx->Texture.ProxyTex[TEXTURE_1D_ARRAY_INDEX] : NULL;
       case GL_TEXTURE_2D_ARRAY_EXT:
          return ctx->Extensions.MESA_texture_array
                 ? texUnit->Current2DArray : NULL;
       case GL_PROXY_TEXTURE_2D_ARRAY_EXT:
          return ctx->Extensions.MESA_texture_array
-                ? ctx->Texture.Proxy2DArray : NULL;
+                ? ctx->Texture.ProxyTex[TEXTURE_2D_ARRAY_INDEX] : NULL;
       default:
          _mesa_problem(NULL, "bad target in _mesa_select_tex_object()");
          return NULL;
@@ -932,106 +932,106 @@ _mesa_get_proxy_tex_image(GLcontext *ctx, GLenum target, GLint level)
    case GL_PROXY_TEXTURE_1D:
       if (level >= ctx->Const.MaxTextureLevels)
          return NULL;
-      texImage = ctx->Texture.Proxy1D->Image[0][level];
+      texImage = ctx->Texture.ProxyTex[TEXTURE_1D_INDEX]->Image[0][level];
       if (!texImage) {
          texImage = ctx->Driver.NewTextureImage(ctx);
          if (!texImage) {
             _mesa_error(ctx, GL_OUT_OF_MEMORY, "proxy texture allocation");
             return NULL;
          }
-         ctx->Texture.Proxy1D->Image[0][level] = texImage;
+         ctx->Texture.ProxyTex[TEXTURE_1D_INDEX]->Image[0][level] = texImage;
          /* Set the 'back' pointer */
-         texImage->TexObject = ctx->Texture.Proxy1D;
+         texImage->TexObject = ctx->Texture.ProxyTex[TEXTURE_1D_INDEX];
       }
       return texImage;
    case GL_PROXY_TEXTURE_2D:
       if (level >= ctx->Const.MaxTextureLevels)
          return NULL;
-      texImage = ctx->Texture.Proxy2D->Image[0][level];
+      texImage = ctx->Texture.ProxyTex[TEXTURE_2D_INDEX]->Image[0][level];
       if (!texImage) {
          texImage = ctx->Driver.NewTextureImage(ctx);
          if (!texImage) {
             _mesa_error(ctx, GL_OUT_OF_MEMORY, "proxy texture allocation");
             return NULL;
          }
-         ctx->Texture.Proxy2D->Image[0][level] = texImage;
+         ctx->Texture.ProxyTex[TEXTURE_2D_INDEX]->Image[0][level] = texImage;
          /* Set the 'back' pointer */
-         texImage->TexObject = ctx->Texture.Proxy2D;
+         texImage->TexObject = ctx->Texture.ProxyTex[TEXTURE_2D_INDEX];
       }
       return texImage;
    case GL_PROXY_TEXTURE_3D:
       if (level >= ctx->Const.Max3DTextureLevels)
          return NULL;
-      texImage = ctx->Texture.Proxy3D->Image[0][level];
+      texImage = ctx->Texture.ProxyTex[TEXTURE_3D_INDEX]->Image[0][level];
       if (!texImage) {
          texImage = ctx->Driver.NewTextureImage(ctx);
          if (!texImage) {
             _mesa_error(ctx, GL_OUT_OF_MEMORY, "proxy texture allocation");
             return NULL;
          }
-         ctx->Texture.Proxy3D->Image[0][level] = texImage;
+         ctx->Texture.ProxyTex[TEXTURE_3D_INDEX]->Image[0][level] = texImage;
          /* Set the 'back' pointer */
-         texImage->TexObject = ctx->Texture.Proxy3D;
+         texImage->TexObject = ctx->Texture.ProxyTex[TEXTURE_3D_INDEX];
       }
       return texImage;
    case GL_PROXY_TEXTURE_CUBE_MAP:
       if (level >= ctx->Const.MaxCubeTextureLevels)
          return NULL;
-      texImage = ctx->Texture.ProxyCubeMap->Image[0][level];
+      texImage = ctx->Texture.ProxyTex[TEXTURE_CUBE_INDEX]->Image[0][level];
       if (!texImage) {
          texImage = ctx->Driver.NewTextureImage(ctx);
          if (!texImage) {
             _mesa_error(ctx, GL_OUT_OF_MEMORY, "proxy texture allocation");
             return NULL;
          }
-         ctx->Texture.ProxyCubeMap->Image[0][level] = texImage;
+         ctx->Texture.ProxyTex[TEXTURE_CUBE_INDEX]->Image[0][level] = texImage;
          /* Set the 'back' pointer */
-         texImage->TexObject = ctx->Texture.ProxyCubeMap;
+         texImage->TexObject = ctx->Texture.ProxyTex[TEXTURE_CUBE_INDEX];
       }
       return texImage;
    case GL_PROXY_TEXTURE_RECTANGLE_NV:
       if (level > 0)
          return NULL;
-      texImage = ctx->Texture.ProxyRect->Image[0][level];
+      texImage = ctx->Texture.ProxyTex[TEXTURE_RECT_INDEX]->Image[0][level];
       if (!texImage) {
          texImage = ctx->Driver.NewTextureImage(ctx);
          if (!texImage) {
             _mesa_error(ctx, GL_OUT_OF_MEMORY, "proxy texture allocation");
             return NULL;
          }
-         ctx->Texture.ProxyRect->Image[0][level] = texImage;
+         ctx->Texture.ProxyTex[TEXTURE_RECT_INDEX]->Image[0][level] = texImage;
          /* Set the 'back' pointer */
-         texImage->TexObject = ctx->Texture.ProxyRect;
+         texImage->TexObject = ctx->Texture.ProxyTex[TEXTURE_RECT_INDEX];
       }
       return texImage;
    case GL_PROXY_TEXTURE_1D_ARRAY_EXT:
       if (level >= ctx->Const.MaxTextureLevels)
          return NULL;
-      texImage = ctx->Texture.Proxy1DArray->Image[0][level];
+      texImage = ctx->Texture.ProxyTex[TEXTURE_1D_ARRAY_INDEX]->Image[0][level];
       if (!texImage) {
          texImage = ctx->Driver.NewTextureImage(ctx);
          if (!texImage) {
             _mesa_error(ctx, GL_OUT_OF_MEMORY, "proxy texture allocation");
             return NULL;
          }
-         ctx->Texture.Proxy1DArray->Image[0][level] = texImage;
+         ctx->Texture.ProxyTex[TEXTURE_1D_ARRAY_INDEX]->Image[0][level] = texImage;
          /* Set the 'back' pointer */
-         texImage->TexObject = ctx->Texture.Proxy1DArray;
+         texImage->TexObject = ctx->Texture.ProxyTex[TEXTURE_1D_ARRAY_INDEX];
       }
       return texImage;
    case GL_PROXY_TEXTURE_2D_ARRAY_EXT:
       if (level >= ctx->Const.MaxTextureLevels)
          return NULL;
-      texImage = ctx->Texture.Proxy2DArray->Image[0][level];
+      texImage = ctx->Texture.ProxyTex[TEXTURE_2D_ARRAY_INDEX]->Image[0][level];
       if (!texImage) {
          texImage = ctx->Driver.NewTextureImage(ctx);
          if (!texImage) {
             _mesa_error(ctx, GL_OUT_OF_MEMORY, "proxy texture allocation");
             return NULL;
          }
-         ctx->Texture.Proxy2DArray->Image[0][level] = texImage;
+         ctx->Texture.ProxyTex[TEXTURE_2D_ARRAY_INDEX]->Image[0][level] = texImage;
          /* Set the 'back' pointer */
-         texImage->TexObject = ctx->Texture.Proxy2DArray;
+         texImage->TexObject = ctx->Texture.ProxyTex[TEXTURE_2D_ARRAY_INDEX];
       }
       return texImage;
    default:
@@ -2611,7 +2611,7 @@ _mesa_TexImage2D( GLenum target, GLint level, GLint internalFormat,
                               1, border)) {
          /* when error, clear all proxy texture image parameters */
          if (texImage)
-            clear_teximage_fields(ctx->Texture.Proxy2D->Image[0][level]);
+            clear_teximage_fields(ctx->Texture.ProxyTex[TEXTURE_2D_INDEX]->Image[0][level]);
       }
       else {
          /* no error, set the tex image parameters */
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 3bdb55257f..20f9c4512c 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -674,54 +674,32 @@ _mesa_update_texture( GLcontext *ctx, GLuint new_state )
 static GLboolean
 alloc_proxy_textures( GLcontext *ctx )
 {
-   ctx->Texture.Proxy1D = (*ctx->Driver.NewTextureObject)(ctx, 0, GL_TEXTURE_1D);
-   if (!ctx->Texture.Proxy1D)
-      goto cleanup;
-
-   ctx->Texture.Proxy2D = (*ctx->Driver.NewTextureObject)(ctx, 0, GL_TEXTURE_2D);
-   if (!ctx->Texture.Proxy2D)
-      goto cleanup;
-
-   ctx->Texture.Proxy3D = (*ctx->Driver.NewTextureObject)(ctx, 0, GL_TEXTURE_3D);
-   if (!ctx->Texture.Proxy3D)
-      goto cleanup;
-
-   ctx->Texture.ProxyCubeMap = (*ctx->Driver.NewTextureObject)(ctx, 0, GL_TEXTURE_CUBE_MAP_ARB);
-   if (!ctx->Texture.ProxyCubeMap)
-      goto cleanup;
-
-   ctx->Texture.ProxyRect = (*ctx->Driver.NewTextureObject)(ctx, 0, GL_TEXTURE_RECTANGLE_NV);
-   if (!ctx->Texture.ProxyRect)
-      goto cleanup;
-
-   ctx->Texture.Proxy1DArray = (*ctx->Driver.NewTextureObject)(ctx, 0, GL_TEXTURE_1D_ARRAY_EXT);
-   if (!ctx->Texture.Proxy1DArray)
-      goto cleanup;
-
-   ctx->Texture.Proxy2DArray = (*ctx->Driver.NewTextureObject)(ctx, 0, GL_TEXTURE_2D_ARRAY_EXT);
-   if (!ctx->Texture.Proxy2DArray)
-      goto cleanup;
-
-   assert(ctx->Texture.Proxy1D->RefCount == 1);
+   static const GLenum targets[] = {
+      GL_TEXTURE_1D,
+      GL_TEXTURE_2D,
+      GL_TEXTURE_3D,
+      GL_TEXTURE_CUBE_MAP_ARB,
+      GL_TEXTURE_RECTANGLE_NV,
+      GL_TEXTURE_1D_ARRAY_EXT,
+      GL_TEXTURE_2D_ARRAY_EXT
+   };
+   GLint tgt;
+
+   ASSERT(Elements(targets) == NUM_TEXTURE_TARGETS);
+
+   for (tgt = 0; tgt < NUM_TEXTURE_TARGETS; tgt++) {
+      if (!(ctx->Texture.ProxyTex[tgt]
+            = ctx->Driver.NewTextureObject(ctx, 0, targets[tgt]))) {
+         /* out of memory, free what we did allocate */
+         while (--tgt >= 0) {
+            ctx->Driver.DeleteTexture(ctx, ctx->Texture.ProxyTex[tgt]);
+         }
+         return GL_FALSE;
+      }
+   }
 
+   assert(ctx->Texture.ProxyTex[0]->RefCount == 1); /* sanity check */
    return GL_TRUE;
-
- cleanup:
-   if (ctx->Texture.Proxy1D)
-      (ctx->Driver.DeleteTexture)(ctx, ctx->Texture.Proxy1D);
-   if (ctx->Texture.Proxy2D)
-      (ctx->Driver.DeleteTexture)(ctx, ctx->Texture.Proxy2D);
-   if (ctx->Texture.Proxy3D)
-      (ctx->Driver.DeleteTexture)(ctx, ctx->Texture.Proxy3D);
-   if (ctx->Texture.ProxyCubeMap)
-      (ctx->Driver.DeleteTexture)(ctx, ctx->Texture.ProxyCubeMap);
-   if (ctx->Texture.ProxyRect)
-      (ctx->Driver.DeleteTexture)(ctx, ctx->Texture.ProxyRect);
-   if (ctx->Texture.Proxy1DArray)
-      (ctx->Driver.DeleteTexture)(ctx, ctx->Texture.Proxy1DArray);
-   if (ctx->Texture.Proxy2DArray)
-      (ctx->Driver.DeleteTexture)(ctx, ctx->Texture.Proxy2DArray);
-   return GL_FALSE;
 }
 
 
@@ -815,7 +793,7 @@ _mesa_init_texture(GLcontext *ctx)
 void
 _mesa_free_texture_data(GLcontext *ctx)
 {
-   GLuint u;
+   GLuint u, tgt;
 
    /* unreference current textures */
    for (u = 0; u < MAX_TEXTURE_IMAGE_UNITS; u++) {
@@ -830,13 +808,8 @@ _mesa_free_texture_data(GLcontext *ctx)
    }
 
    /* Free proxy texture objects */
-   (ctx->Driver.DeleteTexture)(ctx,  ctx->Texture.Proxy1D );
-   (ctx->Driver.DeleteTexture)(ctx,  ctx->Texture.Proxy2D );
-   (ctx->Driver.DeleteTexture)(ctx,  ctx->Texture.Proxy3D );
-   (ctx->Driver.DeleteTexture)(ctx,  ctx->Texture.ProxyCubeMap );
-   (ctx->Driver.DeleteTexture)(ctx,  ctx->Texture.ProxyRect );
-   (ctx->Driver.DeleteTexture)(ctx,  ctx->Texture.Proxy1DArray );
-   (ctx->Driver.DeleteTexture)(ctx,  ctx->Texture.Proxy2DArray );
+   for (tgt = 0; tgt < NUM_TEXTURE_TARGETS; tgt++)
+      ctx->Driver.DeleteTexture(ctx, ctx->Texture.ProxyTex[tgt]);
 
 
 #if FEATURE_colortable
-- 
cgit v1.2.3


From 072c47483674021425922132cf6d977090077f8e Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Tue, 8 Jul 2008 16:12:01 -0600
Subject: mesa: implement glGetUniformiv() with new ctx->Driver function

The old implementation could overwrite the caller's param buffer.
---
 src/mesa/main/dd.h           |  2 ++
 src/mesa/main/shaders.c      |  7 ++-----
 src/mesa/shader/shader_api.c | 45 ++++++++++++++++++++++++++++++++++++++++----
 3 files changed, 45 insertions(+), 9 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index a24021c63f..7fb0a211d7 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -870,6 +870,8 @@ struct dd_function_table {
                            GLsizei *length, GLcharARB *sourceOut);
    void (*GetUniformfv)(GLcontext *ctx, GLuint program, GLint location,
                         GLfloat *params);
+   void (*GetUniformiv)(GLcontext *ctx, GLuint program, GLint location,
+                        GLint *params);
    GLint (*GetUniformLocation)(GLcontext *ctx, GLuint program,
                                const GLcharARB *name);
    GLboolean (*IsProgram)(GLcontext *ctx, GLuint name);
diff --git a/src/mesa/main/shaders.c b/src/mesa/main/shaders.c
index b7b2f791a5..a2670fda32 100644
--- a/src/mesa/main/shaders.c
+++ b/src/mesa/main/shaders.c
@@ -128,6 +128,7 @@ _mesa_DeleteObjectARB(GLhandleARB obj)
 void GLAPIENTRY
 _mesa_DeleteProgram(GLuint name)
 {
+   printf("%s name=%u\n", __FUNCTION__, name);
    if (name) {
       GET_CURRENT_CONTEXT(ctx);
       ctx->Driver.DeleteProgram2(ctx, name);
@@ -309,11 +310,7 @@ void GLAPIENTRY
 _mesa_GetUniformivARB(GLhandleARB program, GLint location, GLint * params)
 {
    GET_CURRENT_CONTEXT(ctx);
-   GLfloat fparams[16]; /* XXX is 16 enough? */
-   GLuint i;
-   ctx->Driver.GetUniformfv(ctx, program, location, fparams);
-   for (i = 0; i < 16; i++)
-      params[i] = (GLint) fparams[i];  /* XXX correct? */
+   ctx->Driver.GetUniformiv(ctx, program, location, params);
 }
 
 
diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index 182de37b50..c1fbcde61e 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -955,12 +955,15 @@ _mesa_get_shader_source(GLcontext *ctx, GLuint shader, GLsizei maxLength,
 }
 
 
+#define MAX_UNIFORM_ELEMENTS 16
+
 /**
- * Called via ctx->Driver.GetUniformfv().
+ * Helper for GetUniformfv(), GetUniformiv()
+ * Returns number of elements written to 'params' output.
  */
-static void
-_mesa_get_uniformfv(GLcontext *ctx, GLuint program, GLint location,
-                    GLfloat *params)
+static GLuint
+get_uniformfv(GLcontext *ctx, GLuint program, GLint location,
+              GLfloat *params)
 {
    struct gl_shader_program *shProg
       = _mesa_lookup_shader_program(ctx, program);
@@ -984,9 +987,13 @@ _mesa_get_uniformfv(GLcontext *ctx, GLuint program, GLint location,
 
          ASSERT(prog);
          if (prog) {
+            /* See uniformiv() below */                    
+            assert(prog->Parameters->Parameters[progPos].Size <= MAX_UNIFORM_ELEMENTS);
+
             for (i = 0; i < prog->Parameters->Parameters[progPos].Size; i++) {
                params[i] = prog->Parameters->ParameterValues[progPos][i];
             }
+            return prog->Parameters->Parameters[progPos].Size;
          }
       }
       else {
@@ -996,6 +1003,35 @@ _mesa_get_uniformfv(GLcontext *ctx, GLuint program, GLint location,
    else {
       _mesa_error(ctx, GL_INVALID_OPERATION, "glGetUniformfv(program)");
    }
+   return 0;
+}
+
+
+/**
+ * Called via ctx->Driver.GetUniformfv().
+ */
+static void
+_mesa_get_uniformfv(GLcontext *ctx, GLuint program, GLint location,
+                    GLfloat *params)
+{
+   (void) get_uniformfv(ctx, program, location, params);
+}
+
+
+/**
+ * Called via ctx->Driver.GetUniformiv().
+ */
+static void
+_mesa_get_uniformiv(GLcontext *ctx, GLuint program, GLint location,
+                    GLint *params)
+{
+   GLfloat fparams[MAX_UNIFORM_ELEMENTS];
+   GLuint n = get_uniformfv(ctx, program, location, fparams);
+   GLuint i;
+   assert(n <= MAX_UNIFORM_ELEMENTS);
+   for (i = 0; i < n; i++) {
+      params[i] = (GLint) fparams[i];
+   }
 }
 
 
@@ -1413,6 +1449,7 @@ _mesa_init_glsl_driver_functions(struct dd_function_table *driver)
    driver->GetShaderInfoLog = _mesa_get_shader_info_log;
    driver->GetShaderSource = _mesa_get_shader_source;
    driver->GetUniformfv = _mesa_get_uniformfv;
+   driver->GetUniformiv = _mesa_get_uniformiv;
    driver->GetUniformLocation = _mesa_get_uniform_location;
    driver->IsProgram = _mesa_is_program;
    driver->IsShader = _mesa_is_shader;
-- 
cgit v1.2.3


From cdc0b6e5236591ac16ba71867818d63f9f2fd93b Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Tue, 8 Jul 2008 16:58:50 -0600
Subject: mesa: remove debug code

---
 src/mesa/main/shaders.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/shaders.c b/src/mesa/main/shaders.c
index a2670fda32..f0db0d2a81 100644
--- a/src/mesa/main/shaders.c
+++ b/src/mesa/main/shaders.c
@@ -128,7 +128,6 @@ _mesa_DeleteObjectARB(GLhandleARB obj)
 void GLAPIENTRY
 _mesa_DeleteProgram(GLuint name)
 {
-   printf("%s name=%u\n", __FUNCTION__, name);
    if (name) {
       GET_CURRENT_CONTEXT(ctx);
       ctx->Driver.DeleteProgram2(ctx, name);
-- 
cgit v1.2.3


From 520dbdea22442493771763a3a895f9e9039c2a5c Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 9 Jul 2008 08:48:41 -0600
Subject: mesa: check for OpenBSD (bug 15604)

cherry-picked from master
---
 src/mesa/main/execmem.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/execmem.c b/src/mesa/main/execmem.c
index 40f66d7da2..aa40b02205 100644
--- a/src/mesa/main/execmem.c
+++ b/src/mesa/main/execmem.c
@@ -36,7 +36,7 @@
 
 
 
-#if defined(__linux__)
+#if defined(__linux__) || defined(__OpenBSD__)
 
 /*
  * Allocate a large block of memory which can hold code then dole it out
@@ -47,6 +47,16 @@
 #include <sys/mman.h>
 #include "mm.h"
 
+#ifdef MESA_SELINUX
+#include <selinux/selinux.h>
+#endif
+
+
+#ifndef MAP_ANONYMOUS
+#define MAP_ANONYMOUS MAP_ANON
+#endif
+
+
 #define EXEC_HEAP_SIZE (10*1024*1024)
 
 _glthread_DECLARE_STATIC_MUTEX(exec_mutex);
-- 
cgit v1.2.3


From 2f5cd68797ee4a159fa0a5fc4d315e4d3f2f644e Mon Sep 17 00:00:00 2001
From: Blair Sadewitz <blair.sadewitz.gmail.com>
Date: Mon, 14 Jul 2008 08:16:46 -0600
Subject: mesa: also check for __NetBSD__

---
 src/mesa/main/execmem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/execmem.c b/src/mesa/main/execmem.c
index aa40b02205..0fe85af93e 100644
--- a/src/mesa/main/execmem.c
+++ b/src/mesa/main/execmem.c
@@ -36,7 +36,7 @@
 
 
 
-#if defined(__linux__) || defined(__OpenBSD__)
+#if defined(__linux__) || defined(__OpenBSD__) || defined(_NetBSD__)
 
 /*
  * Allocate a large block of memory which can hold code then dole it out
-- 
cgit v1.2.3


From 2833d4e715d613384e413fe113d608b8daf0460d Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 14 Jul 2008 09:55:33 -0600
Subject: mesa: fix stencil state problem when GL_ATI_separate_stencil wasn't
 enabled

In glStencilFunc/Op/Mask() set both the front and back-face state, unless
GL_EXT_stencil_two_side is enabled.  Before, we only set the front+back state
if GL_ATI_separate_stencil was enabled.

Ultimately, we probably should remove GL_EXT_stencil_two_side since it's
incompatible with GL 2.x.
---
 src/mesa/main/stencil.c | 96 +++++++++++++++++++++++++------------------------
 1 file changed, 49 insertions(+), 47 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/stencil.c b/src/mesa/main/stencil.c
index c1906197de..2a4c38b1f2 100644
--- a/src/mesa/main/stencil.c
+++ b/src/mesa/main/stencil.c
@@ -207,7 +207,23 @@ _mesa_StencilFunc( GLenum func, GLint ref, GLuint mask )
 
    ref = CLAMP( ref, 0, stencilMax );
 
-   if (ctx->Extensions.ATI_separate_stencil) {
+   if (ctx->Extensions.EXT_stencil_two_side) {
+      /* only set active face state */
+      const GLint face = ctx->Stencil.ActiveFace;
+      if (ctx->Stencil.Function[face] == func &&
+          ctx->Stencil.ValueMask[face] == mask &&
+          ctx->Stencil.Ref[face] == ref)
+         return;
+      FLUSH_VERTICES(ctx, _NEW_STENCIL);
+      ctx->Stencil.Function[face] = func;
+      ctx->Stencil.Ref[face] = ref;
+      ctx->Stencil.ValueMask[face] = mask;
+      if (ctx->Driver.StencilFuncSeparate) {
+         ctx->Driver.StencilFuncSeparate(ctx, face ? GL_BACK : GL_FRONT,
+                                         func, ref, mask);
+      }
+   }
+   else {
       /* set both front and back state */
       if (ctx->Stencil.Function[0] == func &&
           ctx->Stencil.Function[1] == func &&
@@ -225,22 +241,6 @@ _mesa_StencilFunc( GLenum func, GLint ref, GLuint mask )
                                          func, ref, mask);
       }
    }
-   else {
-      /* only set active face state */
-      const GLint face = ctx->Stencil.ActiveFace;
-      if (ctx->Stencil.Function[face] == func &&
-          ctx->Stencil.ValueMask[face] == mask &&
-          ctx->Stencil.Ref[face] == ref)
-         return;
-      FLUSH_VERTICES(ctx, _NEW_STENCIL);
-      ctx->Stencil.Function[face] = func;
-      ctx->Stencil.Ref[face] = ref;
-      ctx->Stencil.ValueMask[face] = mask;
-      if (ctx->Driver.StencilFuncSeparate) {
-         ctx->Driver.StencilFuncSeparate(ctx, face ? GL_BACK : GL_FRONT,
-                                         func, ref, mask);
-      }
-   }
 }
 
 
@@ -261,26 +261,26 @@ _mesa_StencilMask( GLuint mask )
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-   if (ctx->Extensions.ATI_separate_stencil) {
-      /* set both front and back state */
-      if (ctx->Stencil.WriteMask[0] == mask &&
-          ctx->Stencil.WriteMask[1] == mask)
+   if (ctx->Extensions.EXT_stencil_two_side) {
+      /* only set active face state */
+      const GLint face = ctx->Stencil.ActiveFace;
+      if (ctx->Stencil.WriteMask[face] == mask)
          return;
       FLUSH_VERTICES(ctx, _NEW_STENCIL);
-      ctx->Stencil.WriteMask[0] = ctx->Stencil.WriteMask[1] = mask;
+      ctx->Stencil.WriteMask[face] = mask;
       if (ctx->Driver.StencilMaskSeparate) {
-         ctx->Driver.StencilMaskSeparate(ctx, GL_FRONT_AND_BACK, mask);
+         ctx->Driver.StencilMaskSeparate(ctx, face ? GL_BACK : GL_FRONT, mask);
       }
    }
    else {
-      /* only set active face state */
-      const GLint face = ctx->Stencil.ActiveFace;
-      if (ctx->Stencil.WriteMask[face] == mask)
+      /* set both front and back state */
+      if (ctx->Stencil.WriteMask[0] == mask &&
+          ctx->Stencil.WriteMask[1] == mask)
          return;
       FLUSH_VERTICES(ctx, _NEW_STENCIL);
-      ctx->Stencil.WriteMask[face] = mask;
+      ctx->Stencil.WriteMask[0] = ctx->Stencil.WriteMask[1] = mask;
       if (ctx->Driver.StencilMaskSeparate) {
-         ctx->Driver.StencilMaskSeparate(ctx, face ? GL_BACK : GL_FRONT, mask);
+         ctx->Driver.StencilMaskSeparate(ctx, GL_FRONT_AND_BACK, mask);
       }
    }
 }
@@ -319,7 +319,23 @@ _mesa_StencilOp(GLenum fail, GLenum zfail, GLenum zpass)
       return;
    }
 
-   if (ctx->Extensions.ATI_separate_stencil) {
+   if (ctx->Extensions.EXT_stencil_two_side) {
+      /* only set active face state */
+      const GLint face = ctx->Stencil.ActiveFace;
+      if (ctx->Stencil.ZFailFunc[face] == zfail &&
+          ctx->Stencil.ZPassFunc[face] == zpass &&
+          ctx->Stencil.FailFunc[face] == fail)
+         return;
+      FLUSH_VERTICES(ctx, _NEW_STENCIL);
+      ctx->Stencil.ZFailFunc[face] = zfail;
+      ctx->Stencil.ZPassFunc[face] = zpass;
+      ctx->Stencil.FailFunc[face] = fail;
+      if (ctx->Driver.StencilOpSeparate) {
+         ctx->Driver.StencilOpSeparate(ctx, face ? GL_BACK : GL_FRONT,
+                                       fail, zfail, zpass);
+      }
+   }
+   else {
       /* set both front and back state */
       if (ctx->Stencil.ZFailFunc[0] == zfail &&
           ctx->Stencil.ZFailFunc[1] == zfail &&
@@ -337,22 +353,6 @@ _mesa_StencilOp(GLenum fail, GLenum zfail, GLenum zpass)
                                        fail, zfail, zpass);
       }
    }
-   else {
-      /* only set active face state */
-      const GLint face = ctx->Stencil.ActiveFace;
-      if (ctx->Stencil.ZFailFunc[face] == zfail &&
-          ctx->Stencil.ZPassFunc[face] == zpass &&
-          ctx->Stencil.FailFunc[face] == fail)
-         return;
-      FLUSH_VERTICES(ctx, _NEW_STENCIL);
-      ctx->Stencil.ZFailFunc[face] = zfail;
-      ctx->Stencil.ZPassFunc[face] = zpass;
-      ctx->Stencil.FailFunc[face] = fail;
-      if (ctx->Driver.StencilOpSeparate) {
-         ctx->Driver.StencilOpSeparate(ctx, face ? GL_BACK : GL_FRONT,
-                                       fail, zfail, zpass);
-      }
-   }
 }
 
 
@@ -463,12 +463,14 @@ _mesa_StencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
 
    FLUSH_VERTICES(ctx, _NEW_STENCIL);
 
-   if (face == GL_FRONT || face == GL_FRONT_AND_BACK) {
+   if (face != GL_BACK) {
+      /* set front */
       ctx->Stencil.Function[0] = func;
       ctx->Stencil.Ref[0] = ref;
       ctx->Stencil.ValueMask[0] = mask;
    }
-   if (face == GL_BACK || face == GL_FRONT_AND_BACK) {
+   if (face != GL_FRONT) {
+      /* set back */
       ctx->Stencil.Function[1] = func;
       ctx->Stencil.Ref[1] = ref;
       ctx->Stencil.ValueMask[1] = mask;
-- 
cgit v1.2.3


From 51654783ef0aa48560f70cd3944128a94a87d86b Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 14 Jul 2008 11:20:58 -0600
Subject: mesa: comments about vectors vs components

---
 src/mesa/main/config.h | 4 ++--
 src/mesa/main/mtypes.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index 9ff0b708dd..f8109ec755 100644
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -190,8 +190,8 @@
 #define MAX_PROGRAM_CALL_DEPTH 8
 #define MAX_PROGRAM_TEMPS 128
 #define MAX_PROGRAM_ADDRESS_REGS 2
-#define MAX_UNIFORMS 128
-#define MAX_VARYING 8
+#define MAX_UNIFORMS 128   /**< number of float components */
+#define MAX_VARYING 8      /**< number of float[4] vectors */
 #define MAX_SAMPLERS 8
 /*@}*/
 
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 2d6be1983c..88312da7f0 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2519,7 +2519,7 @@ struct gl_constants
    GLuint MaxRenderbufferSize;
    /* GL_ARB_vertex_shader */
    GLuint MaxVertexTextureImageUnits;
-   GLuint MaxVarying;
+   GLuint MaxVarying;  /**< Number of float[4] vectors */
 };
 
 
-- 
cgit v1.2.3


From 090e212c0c5e54156c3c33f7eecdfe01398a7222 Mon Sep 17 00:00:00 2001
From: Michal Krol <michal@tungstengraphics.com>
Date: Tue, 15 Jul 2008 11:15:27 +0200
Subject: mesa: Silence compiler warnings on Windows.

---
 src/mesa/main/texformat.c | 4 ++--
 src/mesa/main/texrender.c | 8 ++++----
 src/mesa/main/texstore.c  | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c
index 11e7755960..60f36c4a87 100644
--- a/src/mesa/main/texformat.c
+++ b/src/mesa/main/texformat.c
@@ -55,10 +55,10 @@ nonlinear_to_linear(GLubyte cs8)
       for (i = 0; i < 256; i++) {
          const GLfloat cs = UBYTE_TO_FLOAT(i);
          if (cs <= 0.04045) {
-            table[i] = cs / 12.92;
+            table[i] = cs / 12.92f;
          }
          else {
-            table[i] = _mesa_pow((cs + 0.055) / 1.055, 2.4);
+            table[i] = (GLfloat) _mesa_pow((cs + 0.055) / 1.055, 2.4);
          }
       }
       tableReady = GL_TRUE;
diff --git a/src/mesa/main/texrender.c b/src/mesa/main/texrender.c
index 8d5468aff0..163bda4501 100644
--- a/src/mesa/main/texrender.c
+++ b/src/mesa/main/texrender.c
@@ -159,7 +159,7 @@ texture_put_row(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
       const GLuint *zValues = (const GLuint *) values;
       for (i = 0; i < count; i++) {
          if (!mask || mask[i]) {
-            GLfloat flt = (zValues[i] >> 8) * (1.0 / 0xffffff);
+            GLfloat flt = (GLfloat) ((zValues[i] >> 8) * (1.0 / 0xffffff));
             trb->Store(trb->TexImage, x + i, y, z, &flt);
          }
       }
@@ -199,7 +199,7 @@ texture_put_mono_row(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
    }
    else if (rb->DataType == GL_UNSIGNED_INT_24_8_EXT) {
       const GLuint zValue = *((const GLuint *) value);
-      const GLfloat flt = (zValue >> 8) * (1.0 / 0xffffff);
+      const GLfloat flt = (GLfloat) ((zValue >> 8) * (1.0 / 0xffffff));
       for (i = 0; i < count; i++) {
          if (!mask || mask[i]) {
             trb->Store(trb->TexImage, x + i, y, z, &flt);
@@ -244,7 +244,7 @@ texture_put_values(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
       const GLuint *zValues = (const GLuint *) values;
       for (i = 0; i < count; i++) {
          if (!mask || mask[i]) {
-            GLfloat flt = (zValues[i] >> 8) * (1.0 / 0xffffff);
+            GLfloat flt = (GLfloat) ((zValues[i] >> 8) * (1.0 / 0xffffff));
             trb->Store(trb->TexImage, x[i], y[i] + trb->Yoffset, z, &flt);
          }
       }
@@ -283,7 +283,7 @@ texture_put_mono_values(GLcontext *ctx, struct gl_renderbuffer *rb,
    }
    else if (rb->DataType == GL_UNSIGNED_INT_24_8_EXT) {
       const GLuint zValue = *((const GLuint *) value);
-      const GLfloat flt = (zValue >> 8) * (1.0 / 0xffffff);
+      const GLfloat flt = (GLfloat) ((zValue >> 8) * (1.0 / 0xffffff));
       for (i = 0; i < count; i++) {
          if (!mask || mask[i]) {
             trb->Store(trb->TexImage, x[i], y[i] + trb->Yoffset, z, &flt);
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index 113eef69f4..edb1ae965d 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -2377,7 +2377,7 @@ _mesa_texstore_z24_s8(TEXSTORE_PARAMS)
             _mesa_unpack_depth_span(ctx, srcWidth,
                                     GL_UNSIGNED_INT_24_8_EXT, /* dst type */
                                     dstRow, /* dst addr */
-                                    depthScale,
+                                    (GLuint) depthScale,
                                     srcType, src, srcPacking);
             /* get the 8-bit stencil values */
             _mesa_unpack_stencil_span(ctx, srcWidth,
-- 
cgit v1.2.3


From 479a807e01bc980aa2a3c9c56c20ba53cc6e7d60 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 16 Jul 2008 10:23:28 -0600
Subject: mesa: add GL_POLYGON_OFFSET_POINT/LINE/FILL queries, remove
 GL_TEXTURE_ENV_COLOR, GL_TEXTURE_ENV_MODE

Issues found by Bob Ellison.
---
 src/mesa/main/get.c      | 63 +++++++++++++++++++++---------------------------
 src/mesa/main/get_gen.py |  9 +++----
 2 files changed, 30 insertions(+), 42 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index ac437a86e2..4674c44a3f 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -749,6 +749,15 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
       case GL_POLYGON_OFFSET_UNITS:
          params[0] = FLOAT_TO_BOOLEAN(ctx->Polygon.OffsetUnits );
          break;
+      case GL_POLYGON_OFFSET_POINT:
+         params[0] = ctx->Polygon.OffsetPoint;
+         break;
+      case GL_POLYGON_OFFSET_LINE:
+         params[0] = ctx->Polygon.OffsetLine;
+         break;
+      case GL_POLYGON_OFFSET_FILL:
+         params[0] = ctx->Polygon.OffsetFill;
+         break;
       case GL_POLYGON_SMOOTH:
          params[0] = ctx->Polygon.SmoothFlag;
          break;
@@ -891,18 +900,6 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          CHECK_EXT1(MESA_texture_array, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current2DArray->Name);
          break;
-      case GL_TEXTURE_ENV_COLOR:
-         {
-         const GLfloat *color = ctx->Texture.Unit[ctx->Texture.CurrentUnit].EnvColor;
-         params[0] = FLOAT_TO_BOOLEAN(color[0]);
-         params[1] = FLOAT_TO_BOOLEAN(color[1]);
-         params[2] = FLOAT_TO_BOOLEAN(color[2]);
-         params[3] = FLOAT_TO_BOOLEAN(color[3]);
-         }
-         break;
-      case GL_TEXTURE_ENV_MODE:
-         params[0] = ENUM_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].EnvMode);
-         break;
       case GL_TEXTURE_GEN_S:
          params[0] = ((ctx->Texture.Unit[ctx->Texture.CurrentUnit].TexGenEnabled & S_BIT) ? 1 : 0);
          break;
@@ -2596,6 +2593,15 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
       case GL_POLYGON_OFFSET_UNITS:
          params[0] = ctx->Polygon.OffsetUnits ;
          break;
+      case GL_POLYGON_OFFSET_POINT:
+         params[0] = BOOLEAN_TO_FLOAT(ctx->Polygon.OffsetPoint);
+         break;
+      case GL_POLYGON_OFFSET_LINE:
+         params[0] = BOOLEAN_TO_FLOAT(ctx->Polygon.OffsetLine);
+         break;
+      case GL_POLYGON_OFFSET_FILL:
+         params[0] = BOOLEAN_TO_FLOAT(ctx->Polygon.OffsetFill);
+         break;
       case GL_POLYGON_SMOOTH:
          params[0] = BOOLEAN_TO_FLOAT(ctx->Polygon.SmoothFlag);
          break;
@@ -2738,18 +2744,6 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          CHECK_EXT1(MESA_texture_array, "GetFloatv");
          params[0] = (GLfloat)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current2DArray->Name);
          break;
-      case GL_TEXTURE_ENV_COLOR:
-         {
-         const GLfloat *color = ctx->Texture.Unit[ctx->Texture.CurrentUnit].EnvColor;
-         params[0] = color[0];
-         params[1] = color[1];
-         params[2] = color[2];
-         params[3] = color[3];
-         }
-         break;
-      case GL_TEXTURE_ENV_MODE:
-         params[0] = ENUM_TO_FLOAT(ctx->Texture.Unit[ctx->Texture.CurrentUnit].EnvMode);
-         break;
       case GL_TEXTURE_GEN_S:
          params[0] = BOOLEAN_TO_FLOAT(((ctx->Texture.Unit[ctx->Texture.CurrentUnit].TexGenEnabled & S_BIT) ? 1 : 0));
          break;
@@ -4443,6 +4437,15 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
       case GL_POLYGON_OFFSET_UNITS:
          params[0] = IROUND(ctx->Polygon.OffsetUnits );
          break;
+      case GL_POLYGON_OFFSET_POINT:
+         params[0] = BOOLEAN_TO_INT(ctx->Polygon.OffsetPoint);
+         break;
+      case GL_POLYGON_OFFSET_LINE:
+         params[0] = BOOLEAN_TO_INT(ctx->Polygon.OffsetLine);
+         break;
+      case GL_POLYGON_OFFSET_FILL:
+         params[0] = BOOLEAN_TO_INT(ctx->Polygon.OffsetFill);
+         break;
       case GL_POLYGON_SMOOTH:
          params[0] = BOOLEAN_TO_INT(ctx->Polygon.SmoothFlag);
          break;
@@ -4585,18 +4588,6 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          CHECK_EXT1(MESA_texture_array, "GetIntegerv");
          params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current2DArray->Name;
          break;
-      case GL_TEXTURE_ENV_COLOR:
-         {
-         const GLfloat *color = ctx->Texture.Unit[ctx->Texture.CurrentUnit].EnvColor;
-         params[0] = FLOAT_TO_INT(color[0]);
-         params[1] = FLOAT_TO_INT(color[1]);
-         params[2] = FLOAT_TO_INT(color[2]);
-         params[3] = FLOAT_TO_INT(color[3]);
-         }
-         break;
-      case GL_TEXTURE_ENV_MODE:
-         params[0] = ENUM_TO_INT(ctx->Texture.Unit[ctx->Texture.CurrentUnit].EnvMode);
-         break;
       case GL_TEXTURE_GEN_S:
          params[0] = BOOLEAN_TO_INT(((ctx->Texture.Unit[ctx->Texture.CurrentUnit].TexGenEnabled & S_BIT) ? 1 : 0));
          break;
diff --git a/src/mesa/main/get_gen.py b/src/mesa/main/get_gen.py
index c307058da6..653deefa72 100644
--- a/src/mesa/main/get_gen.py
+++ b/src/mesa/main/get_gen.py
@@ -372,6 +372,9 @@ StateVars = [
 	( "GL_POLYGON_OFFSET_BIAS_EXT", GLfloat, ["ctx->Polygon.OffsetUnits"], "", None ),
 	( "GL_POLYGON_OFFSET_FACTOR", GLfloat, ["ctx->Polygon.OffsetFactor "], "", None ),
 	( "GL_POLYGON_OFFSET_UNITS", GLfloat, ["ctx->Polygon.OffsetUnits "], "", None ),
+	( "GL_POLYGON_OFFSET_POINT", GLboolean, ["ctx->Polygon.OffsetPoint"], "", None ),
+	( "GL_POLYGON_OFFSET_LINE", GLboolean, ["ctx->Polygon.OffsetLine"], "", None ),
+	( "GL_POLYGON_OFFSET_FILL", GLboolean, ["ctx->Polygon.OffsetFill"], "", None ),
 	( "GL_POLYGON_SMOOTH", GLboolean, ["ctx->Polygon.SmoothFlag"], "", None ),
 	( "GL_POLYGON_SMOOTH_HINT", GLenum, ["ctx->Hint.PolygonSmooth"], "", None ),
 	( "GL_POLYGON_STIPPLE", GLboolean, ["ctx->Polygon.StippleFlag"], "", None ),
@@ -437,12 +440,6 @@ StateVars = [
 	  ["ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current1DArray->Name"], "", ["MESA_texture_array"] ),
 	( "GL_TEXTURE_BINDING_2D_ARRAY_EXT", GLint,
 	  ["ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current2DArray->Name"], "", ["MESA_texture_array"] ),
-	( "GL_TEXTURE_ENV_COLOR", GLfloatN,
-	  ["color[0]", "color[1]", "color[2]", "color[3]"],
-	  "const GLfloat *color = ctx->Texture.Unit[ctx->Texture.CurrentUnit].EnvColor;",
-	  None ),
-	( "GL_TEXTURE_ENV_MODE", GLenum,
-	  ["ctx->Texture.Unit[ctx->Texture.CurrentUnit].EnvMode"], "", None ),
 	( "GL_TEXTURE_GEN_S", GLboolean,
 	  ["((ctx->Texture.Unit[ctx->Texture.CurrentUnit].TexGenEnabled & S_BIT) ? 1 : 0)"], "", None ),
 	( "GL_TEXTURE_GEN_T", GLboolean,
-- 
cgit v1.2.3


From 7e8f79e39dfb4ba0072e9d34e7fba958e3710f5b Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 21 Jul 2008 14:23:33 -0600
Subject: mesa: remove an error check for NV_v_p that doesn't apply to ARB_v_p

---
 src/mesa/main/varray.c | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index a4ef948b58..a6aa9c34b2 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -583,11 +583,6 @@ _mesa_VertexAttribPointerARB(GLuint index, GLint size, GLenum type,
       return;
    }
 
-   if (type == GL_UNSIGNED_BYTE && size != 4) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glVertexAttribPointerARB(size!=4)");
-      return;
-   }
-
    /* check for valid 'type' and compute StrideB right away */
    /* NOTE: more types are supported here than in the NV extension */
    switch (type) {
-- 
cgit v1.2.3


From 90a3af7d9d0849afcee0d35ed0621fe24e1008a9 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 24 Jul 2008 14:56:54 -0600
Subject: mesa: glsl: only try to link shaders defining main()

---
 src/mesa/main/mtypes.h                |  4 +--
 src/mesa/shader/shader_api.c          |  6 +----
 src/mesa/shader/slang/slang_compile.c | 47 ++++++++++++++++-------------------
 src/mesa/shader/slang/slang_link.c    | 11 ++++----
 4 files changed, 31 insertions(+), 37 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 88312da7f0..a95f02b889 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2123,9 +2123,9 @@ struct gl_shader
 
    const GLchar *Source;  /**< Source code string */
    GLboolean CompileStatus;
-   GLuint NumPrograms;  /**< size of Programs[] array */
-   struct gl_program **Programs;  /**< Post-compile assembly code */
+   struct gl_program *Program;  /**< Post-compile assembly code */
    GLchar *InfoLog;
+   GLboolean Main;  /**< shader defines main() */
 };
 
 
diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index b33dfd6663..e894b7b211 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -262,15 +262,11 @@ _mesa_new_shader(GLcontext *ctx, GLuint name, GLenum type)
 void
 _mesa_free_shader(GLcontext *ctx, struct gl_shader *sh)
 {
-   GLuint i;
    if (sh->Source)
       _mesa_free((void *) sh->Source);
    if (sh->InfoLog)
       _mesa_free(sh->InfoLog);
-   for (i = 0; i < sh->NumPrograms; i++)
-      _mesa_reference_program(ctx, &sh->Programs[i], NULL);
-   if (sh->Programs)
-      _mesa_free(sh->Programs);
+   _mesa_reference_program(ctx, &sh->Program, NULL);
    _mesa_free(sh);
 }
 
diff --git a/src/mesa/shader/slang/slang_compile.c b/src/mesa/shader/slang/slang_compile.c
index fd5d4afacb..862d0741ff 100644
--- a/src/mesa/shader/slang/slang_compile.c
+++ b/src/mesa/shader/slang/slang_compile.c
@@ -1930,7 +1930,7 @@ parse_invariant(slang_parse_ctx * C, slang_output_ctx * O)
 
 static GLboolean
 parse_code_unit(slang_parse_ctx * C, slang_code_unit * unit,
-                struct gl_program *program)
+                struct gl_shader *shader)
 {
    GET_CURRENT_CONTEXT(ctx);
    slang_output_ctx o;
@@ -1954,7 +1954,7 @@ parse_code_unit(slang_parse_ctx * C, slang_code_unit * unit,
    o.structs = &unit->structs;
    o.vars = &unit->vars;
    o.global_pool = &unit->object->varpool;
-   o.program = program;
+   o.program = shader ? shader->Program : NULL;
    o.vartable = _slang_new_var_table(maxRegs);
    _slang_push_var_table(o.vartable);
 
@@ -2007,6 +2007,7 @@ parse_code_unit(slang_parse_ctx * C, slang_code_unit * unit,
 
       _slang_codegen_function(&A, mainFunc);
 
+      shader->Main = GL_TRUE; /* this shader defines main() */
    }
 
    _slang_pop_var_table(o.vartable);
@@ -2020,7 +2021,7 @@ compile_binary(const byte * prod, slang_code_unit * unit,
                GLuint version,
                slang_unit_type type, slang_info_log * infolog,
                slang_code_unit * builtin, slang_code_unit * downlink,
-               struct gl_program *program)
+               struct gl_shader *shader)
 {
    slang_parse_ctx C;
 
@@ -2045,14 +2046,14 @@ compile_binary(const byte * prod, slang_code_unit * unit,
    }
 
    /* parse translation unit */
-   return parse_code_unit(&C, unit, program);
+   return parse_code_unit(&C, unit, shader);
 }
 
 static GLboolean
 compile_with_grammar(grammar id, const char *source, slang_code_unit * unit,
                      slang_unit_type type, slang_info_log * infolog,
                      slang_code_unit * builtin,
-                     struct gl_program *program)
+                     struct gl_shader *shader)
 {
    byte *prod;
    GLuint size, start, version;
@@ -2114,7 +2115,7 @@ compile_with_grammar(grammar id, const char *source, slang_code_unit * unit,
    /* Syntax is okay - translate it to internal representation. */
    if (!compile_binary(prod, unit, version, type, infolog, builtin,
                        &builtin[SLANG_BUILTIN_TOTAL - 1],
-                       program)) {
+                       shader)) {
       grammar_alloc_free(prod);
       return GL_FALSE;
    }
@@ -2153,7 +2154,7 @@ static const byte slang_vertex_builtin_gc[] = {
 static GLboolean
 compile_object(grammar * id, const char *source, slang_code_object * object,
                slang_unit_type type, slang_info_log * infolog,
-               struct gl_program *program)
+               struct gl_shader *shader)
 {
    slang_code_unit *builtins = NULL;
    GLuint base_version = 110;
@@ -2252,7 +2253,7 @@ compile_object(grammar * id, const char *source, slang_code_object * object,
 
    /* compile the actual shader - pass-in built-in library for external shader */
    return compile_with_grammar(*id, source, &object->unit, type, infolog,
-                               builtins, program);
+                               builtins, shader);
 }
 
 
@@ -2261,7 +2262,6 @@ compile_shader(GLcontext *ctx, slang_code_object * object,
                slang_unit_type type, slang_info_log * infolog,
                struct gl_shader *shader)
 {
-   struct gl_program *program = shader->Programs[0];
    GLboolean success;
    grammar id = 0;
 
@@ -2271,12 +2271,12 @@ compile_shader(GLcontext *ctx, slang_code_object * object,
    _mesa_printf("************************************\n");
 #endif
 
-   assert(program);
+   assert(shader->Program);
 
    _slang_code_object_dtr(object);
    _slang_code_object_ctr(object);
 
-   success = compile_object(&id, shader->Source, object, type, infolog, program);
+   success = compile_object(&id, shader->Source, object, type, infolog, shader);
    if (id != 0)
       grammar_destroy(id);
    if (!success)
@@ -2308,21 +2308,18 @@ _slang_compile(GLcontext *ctx, struct gl_shader *shader)
 
    ctx->Shader.MemPool = _slang_new_mempool(1024*1024);
 
-   /* XXX temporary hack */
-   if (!shader->Programs) {
+   shader->Main = GL_FALSE;
+
+   if (!shader->Program) {
       GLenum progTarget;
       if (shader->Type == GL_VERTEX_SHADER)
          progTarget = GL_VERTEX_PROGRAM_ARB;
       else
          progTarget = GL_FRAGMENT_PROGRAM_ARB;
-      shader->Programs
-         = (struct gl_program **) malloc(sizeof(struct gl_program*));
-      shader->Programs[0] = ctx->Driver.NewProgram(ctx, progTarget, 1);
-      shader->NumPrograms = 1;
-
-      shader->Programs[0]->Parameters = _mesa_new_parameter_list();
-      shader->Programs[0]->Varying = _mesa_new_parameter_list();
-      shader->Programs[0]->Attributes = _mesa_new_parameter_list();
+      shader->Program = ctx->Driver.NewProgram(ctx, progTarget, 1);
+      shader->Program->Parameters = _mesa_new_parameter_list();
+      shader->Program->Varying = _mesa_new_parameter_list();
+      shader->Program->Attributes = _mesa_new_parameter_list();
    }
 
    slang_info_log_construct(&info_log);
@@ -2355,13 +2352,13 @@ _slang_compile(GLcontext *ctx, struct gl_shader *shader)
       /* remove any reads of varying (output) registers */
 #if 0
       printf("Pre-remove output reads:\n");
-      _mesa_print_program(shader->Programs[0]);
+      _mesa_print_program(shader->Programs);
 #endif
-      _mesa_remove_output_reads(shader->Programs[0], PROGRAM_VARYING);
-      _mesa_remove_output_reads(shader->Programs[0], PROGRAM_OUTPUT);
+      _mesa_remove_output_reads(shader->Program, PROGRAM_VARYING);
+      _mesa_remove_output_reads(shader->Program, PROGRAM_OUTPUT);
 #if 0
       printf("Post-remove output reads:\n");
-      _mesa_print_program(shader->Programs[0]);
+      _mesa_print_program(shader->Programs);
 #endif
    }
 
diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c
index e9b9bbc43f..1de561930a 100644
--- a/src/mesa/shader/slang/slang_link.c
+++ b/src/mesa/shader/slang/slang_link.c
@@ -401,15 +401,16 @@ _slang_link(GLcontext *ctx,
    shProg->Varying = _mesa_new_parameter_list();
 
    /**
-    * Find attached vertex shader, fragment shader
+    * Find attached vertex, fragment shaders defining main()
     */
    vertProg = NULL;
    fragProg = NULL;
    for (i = 0; i < shProg->NumShaders; i++) {
-      if (shProg->Shaders[i]->Type == GL_VERTEX_SHADER)
-         vertProg = vertex_program(shProg->Shaders[i]->Programs[0]);
-      else if (shProg->Shaders[i]->Type == GL_FRAGMENT_SHADER)
-         fragProg = fragment_program(shProg->Shaders[i]->Programs[0]);
+      struct gl_shader *shader = shProg->Shaders[i];
+      if (shader->Type == GL_VERTEX_SHADER && shader->Main)
+         vertProg = vertex_program(shader->Program);
+      else if (shader->Type == GL_FRAGMENT_SHADER && shader->Main)
+         fragProg = fragment_program(shader->Program);
       else
          _mesa_problem(ctx, "unexpected shader target in slang_link()");
    }
-- 
cgit v1.2.3


From 0216a5843027a679c58c65ff6445f33a34d0e729 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 24 Jul 2008 14:28:43 -0600
Subject: mesa: don't include Mesa version in GL_SHADING_LANGUAGE_VERSION
 string

---
 src/mesa/main/getstring.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/getstring.c b/src/mesa/main/getstring.c
index 973649da0d..ad99de77b9 100644
--- a/src/mesa/main/getstring.c
+++ b/src/mesa/main/getstring.c
@@ -57,8 +57,10 @@ _mesa_GetString( GLenum name )
    static const char *version_2_0 = "2.0 Mesa " MESA_VERSION_STRING;
    static const char *version_2_1 = "2.1 Mesa " MESA_VERSION_STRING;
 
-#if FEATURE_ARB_shading_language_100
-   static const char *sl_version_110 = "1.10 Mesa " MESA_VERSION_STRING;
+#if FEATURE_ARB_shading_language_120_foo /* support not complete! */
+   static const char *sl_version = "1.20";
+#elif FEATURE_ARB_shading_language_100
+   static const char *sl_version = "1.10";
 #endif
 
    if (!ctx)
@@ -147,7 +149,7 @@ _mesa_GetString( GLenum name )
 #if FEATURE_ARB_shading_language_100
       case GL_SHADING_LANGUAGE_VERSION_ARB:
          if (ctx->Extensions.ARB_shading_language_100)
-            return (const GLubyte *) sl_version_110;
+            return (const GLubyte *) sl_version;
          goto error;
 #endif
 #if FEATURE_NV_fragment_program || FEATURE_ARB_fragment_program || \
-- 
cgit v1.2.3


From 643228c506bde965c890f3d0604c273fc729bee7 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 24 Jul 2008 15:12:42 -0600
Subject: mesa: move extensions->version code into separate function

---
 src/mesa/main/getstring.c | 138 ++++++++++++++++++++++++----------------------
 1 file changed, 72 insertions(+), 66 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/getstring.c b/src/mesa/main/getstring.c
index ad99de77b9..89daa0e21d 100644
--- a/src/mesa/main/getstring.c
+++ b/src/mesa/main/getstring.c
@@ -33,6 +33,76 @@
 #include "extensions.h"
 
 
+/**
+ * Examine enabled GL extensions to determine GL version.
+ * \return version string
+ */
+static const char *
+compute_version(const GLcontext *ctx)
+{
+   static const char *version_1_2 = "1.2 Mesa " MESA_VERSION_STRING;
+   static const char *version_1_3 = "1.3 Mesa " MESA_VERSION_STRING;
+   static const char *version_1_4 = "1.4 Mesa " MESA_VERSION_STRING;
+   static const char *version_1_5 = "1.5 Mesa " MESA_VERSION_STRING;
+   static const char *version_2_0 = "2.0 Mesa " MESA_VERSION_STRING;
+   static const char *version_2_1 = "2.1 Mesa " MESA_VERSION_STRING;
+
+   const GLboolean ver_1_3 = (ctx->Extensions.ARB_multisample &&
+                              ctx->Extensions.ARB_multitexture &&
+                              ctx->Extensions.ARB_texture_border_clamp &&
+                              ctx->Extensions.ARB_texture_compression &&
+                              ctx->Extensions.ARB_texture_cube_map &&
+                              ctx->Extensions.EXT_texture_env_add &&
+                              ctx->Extensions.ARB_texture_env_combine &&
+                              ctx->Extensions.ARB_texture_env_dot3);
+   const GLboolean ver_1_4 = (ver_1_3 &&
+                              ctx->Extensions.ARB_depth_texture &&
+                              ctx->Extensions.ARB_shadow &&
+                              ctx->Extensions.ARB_texture_env_crossbar &&
+                              ctx->Extensions.ARB_texture_mirrored_repeat &&
+                              ctx->Extensions.ARB_window_pos &&
+                              ctx->Extensions.EXT_blend_color &&
+                              ctx->Extensions.EXT_blend_func_separate &&
+                              ctx->Extensions.EXT_blend_minmax &&
+                              ctx->Extensions.EXT_blend_subtract &&
+                              ctx->Extensions.EXT_fog_coord &&
+                              ctx->Extensions.EXT_multi_draw_arrays &&
+                              ctx->Extensions.EXT_point_parameters &&
+                              ctx->Extensions.EXT_secondary_color &&
+                              ctx->Extensions.EXT_stencil_wrap &&
+                              ctx->Extensions.EXT_texture_lod_bias &&
+                              ctx->Extensions.SGIS_generate_mipmap);
+   const GLboolean ver_1_5 = (ver_1_4 &&
+                              ctx->Extensions.ARB_occlusion_query &&
+                              ctx->Extensions.ARB_vertex_buffer_object &&
+                              ctx->Extensions.EXT_shadow_funcs);
+   const GLboolean ver_2_0 = (ver_1_5 &&
+                              ctx->Extensions.ARB_draw_buffers &&
+                              ctx->Extensions.ARB_point_sprite &&
+                              ctx->Extensions.ARB_shader_objects &&
+                              ctx->Extensions.ARB_vertex_shader &&
+                              ctx->Extensions.ARB_fragment_shader &&
+                              ctx->Extensions.ARB_texture_non_power_of_two &&
+                              ctx->Extensions.EXT_blend_equation_separate);
+   const GLboolean ver_2_1 = (ver_2_0 &&
+                              ctx->Extensions.ARB_shading_language_120 &&
+                              ctx->Extensions.EXT_pixel_buffer_object &&
+                              ctx->Extensions.EXT_texture_sRGB);
+   if (ver_2_1)
+      return version_2_1;
+   if (ver_2_0)
+      return version_2_0;
+   if (ver_1_5)
+      return version_1_5;
+   if (ver_1_4)
+      return version_1_4;
+   if (ver_1_3)
+      return version_1_3;
+   return version_1_2;
+}
+
+
+
 /**
  * Query string-valued state.  The return value should _not_ be freed by
  * the caller.
@@ -50,12 +120,6 @@ _mesa_GetString( GLenum name )
    GET_CURRENT_CONTEXT(ctx);
    static const char *vendor = "Brian Paul";
    static const char *renderer = "Mesa";
-   static const char *version_1_2 = "1.2 Mesa " MESA_VERSION_STRING;
-   static const char *version_1_3 = "1.3 Mesa " MESA_VERSION_STRING;
-   static const char *version_1_4 = "1.4 Mesa " MESA_VERSION_STRING;
-   static const char *version_1_5 = "1.5 Mesa " MESA_VERSION_STRING;
-   static const char *version_2_0 = "2.0 Mesa " MESA_VERSION_STRING;
-   static const char *version_2_1 = "2.1 Mesa " MESA_VERSION_STRING;
 
 #if FEATURE_ARB_shading_language_120_foo /* support not complete! */
    static const char *sl_version = "1.20";
@@ -81,67 +145,9 @@ _mesa_GetString( GLenum name )
       case GL_VENDOR:
          return (const GLubyte *) vendor;
       case GL_RENDERER:
-          return (const GLubyte *) renderer;
+         return (const GLubyte *) renderer;
       case GL_VERSION:
-         if (ctx->Extensions.ARB_multisample &&
-             ctx->Extensions.ARB_multitexture &&
-             ctx->Extensions.ARB_texture_border_clamp &&
-             ctx->Extensions.ARB_texture_compression &&
-             ctx->Extensions.ARB_texture_cube_map &&
-             ctx->Extensions.EXT_texture_env_add &&
-             ctx->Extensions.ARB_texture_env_combine &&
-             ctx->Extensions.ARB_texture_env_dot3) {
-            if (ctx->Extensions.ARB_depth_texture &&
-                ctx->Extensions.ARB_shadow &&
-                ctx->Extensions.ARB_texture_env_crossbar &&
-                ctx->Extensions.ARB_texture_mirrored_repeat &&
-                ctx->Extensions.ARB_window_pos &&
-                ctx->Extensions.EXT_blend_color &&
-                ctx->Extensions.EXT_blend_func_separate &&
-                ctx->Extensions.EXT_blend_logic_op &&
-                ctx->Extensions.EXT_blend_minmax &&
-                ctx->Extensions.EXT_blend_subtract &&
-                ctx->Extensions.EXT_fog_coord &&
-                ctx->Extensions.EXT_multi_draw_arrays &&
-                ctx->Extensions.EXT_point_parameters && /*aka ARB*/
-                ctx->Extensions.EXT_secondary_color &&
-                ctx->Extensions.EXT_stencil_wrap &&
-                ctx->Extensions.EXT_texture_lod_bias &&
-                ctx->Extensions.SGIS_generate_mipmap) {
-               if (ctx->Extensions.ARB_occlusion_query &&
-                   ctx->Extensions.ARB_vertex_buffer_object &&
-                   ctx->Extensions.EXT_shadow_funcs) {
-                  if (ctx->Extensions.ARB_draw_buffers &&
-                      ctx->Extensions.ARB_point_sprite &&
-                      ctx->Extensions.ARB_shader_objects &&
-                      ctx->Extensions.ARB_vertex_shader &&
-                      ctx->Extensions.ARB_fragment_shader &&
-                      ctx->Extensions.ARB_texture_non_power_of_two &&
-                      ctx->Extensions.EXT_blend_equation_separate) {
-                     if (ctx->Extensions.ARB_shading_language_120 &&
-                         ctx->Extensions.EXT_pixel_buffer_object &&
-                         ctx->Extensions.EXT_texture_sRGB) {
-                        return (const GLubyte *) version_2_1;
-                     }
-                     else {
-                        return (const GLubyte *) version_2_0;
-                     }
-                  }
-                  else {
-                     return (const GLubyte *) version_1_5;
-                  }
-               }
-               else {
-                  return (const GLubyte *) version_1_4;
-               }
-            }
-            else {
-               return (const GLubyte *) version_1_3;
-            }
-         }
-         else {
-            return (const GLubyte *) version_1_2;
-         }
+         return (const GLubyte *) compute_version(ctx);
       case GL_EXTENSIONS:
          if (!ctx->Extensions.String)
             ctx->Extensions.String = _mesa_make_extension_string(ctx);
-- 
cgit v1.2.3


From 2acf917f00b570274b58ad7e58688715730253d0 Mon Sep 17 00:00:00 2001
From: Michal Krol <michal@tungstengraphics.com>
Date: Fri, 25 Jul 2008 10:41:53 +0200
Subject: mesa: Mark as XXX unresolved warnings on windows.

---
 src/mesa/main/texstore.c     | 5 +++++
 src/mesa/shader/shader_api.c | 4 ++++
 2 files changed, 9 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index edb1ae965d..a0ea245507 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -408,6 +408,11 @@ make_temp_float_image(GLcontext *ctx, GLuint dims,
             const GLint logComponents
                = _mesa_components_in_format(logicalBaseFormat);
             const GLfloat *src = convImage;
+
+            /* XXX: Both `convWidth' and `convHeight' are uninitialised -- windows compiler
+             *      will issue warnings for the following line.
+             *      Presumably this happens when `FEATURE_convolve' is defined to `0'.
+             */
             GLfloat *dst = tempImage + img * (convWidth * convHeight * 4);
             for (row = 0; row < convHeight; row++) {
                _mesa_pack_rgba_span_float(ctx, convWidth,
diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index e894b7b211..6423c41c12 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -539,6 +539,10 @@ _mesa_bind_attrib_location(GLcontext *ctx, GLuint program, GLuint index,
       oldIndex = -1;
    }
 
+   /* XXX: `datatype' is uninitialised at this point -- windows compiler
+    *      will issue a warning for the following line.
+    */
+
    /* this will replace the current value if it's already in the list */
    i = _mesa_add_attribute(shProg->Attributes, name, size, datatype, index);
    if (i < 0) {
-- 
cgit v1.2.3


From 72809f377397390fdd110d6b15e8a9a64ada05e6 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 25 Jul 2008 08:34:54 -0600
Subject: mesa: fix issues causing warnings on Windows

---
 src/mesa/main/texstore.c     | 11 ++++-------
 src/mesa/shader/shader_api.c |  7 ++-----
 2 files changed, 6 insertions(+), 12 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index a0ea245507..97fdfd39b2 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -380,12 +380,14 @@ make_temp_float_image(GLcontext *ctx, GLuint dims,
             dst += srcWidth * 4;
          }
 
+         /* size after optional convolution */
+         convWidth = srcWidth;
+         convHeight = srcHeight;
+
 #if FEATURE_convolve
          /* do convolution */
          {
             GLfloat *src = tempImage + img * (srcWidth * srcHeight * 4);
-            convWidth = srcWidth;
-            convHeight = srcHeight;
             if (dims == 1) {
                ASSERT(ctx->Pixel.Convolution1DEnabled);
                _mesa_convolve_1d_image(ctx, &convWidth, src, convImage);
@@ -408,11 +410,6 @@ make_temp_float_image(GLcontext *ctx, GLuint dims,
             const GLint logComponents
                = _mesa_components_in_format(logicalBaseFormat);
             const GLfloat *src = convImage;
-
-            /* XXX: Both `convWidth' and `convHeight' are uninitialised -- windows compiler
-             *      will issue warnings for the following line.
-             *      Presumably this happens when `FEATURE_convolve' is defined to `0'.
-             */
             GLfloat *dst = tempImage + img * (convWidth * convHeight * 4);
             for (row = 0; row < convHeight; row++) {
                _mesa_pack_rgba_span_float(ctx, convWidth,
diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index 6423c41c12..5c18e55dac 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -509,7 +509,7 @@ _mesa_bind_attrib_location(GLcontext *ctx, GLuint program, GLuint index,
    struct gl_shader_program *shProg;
    const GLint size = -1; /* unknown size */
    GLint i, oldIndex;
-   GLenum datatype;
+   GLenum datatype = GL_FLOAT_VEC4;
 
    shProg = _mesa_lookup_shader_program_err(ctx, program,
                                             "glBindAttribLocation");
@@ -539,14 +539,11 @@ _mesa_bind_attrib_location(GLcontext *ctx, GLuint program, GLuint index,
       oldIndex = -1;
    }
 
-   /* XXX: `datatype' is uninitialised at this point -- windows compiler
-    *      will issue a warning for the following line.
-    */
-
    /* this will replace the current value if it's already in the list */
    i = _mesa_add_attribute(shProg->Attributes, name, size, datatype, index);
    if (i < 0) {
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindAttribLocation");
+      return;
    }
 
    if (shProg->VertexProgram && oldIndex >= 0 && oldIndex != index) {
-- 
cgit v1.2.3


From eb80ed0d2eac693012e7e4c2ad772f7f57f74977 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Sun, 3 Aug 2008 11:14:47 -0600
Subject: added null ptr check (fix bug 16959)

---
 src/mesa/main/context.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 279880cf40..27e5e2fcce 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -711,7 +711,8 @@ delete_renderbuffer_cb(GLuint id, void *data, void *userData)
 {
    struct gl_renderbuffer *rb = (struct gl_renderbuffer *) data;
    rb->RefCount = 0;  /* see comment for FBOs above */
-   rb->Delete(rb);
+   if (rb->Delete)
+      rb->Delete(rb);
 }
 
 
-- 
cgit v1.2.3


From d23b54a423b537fc08543299f9df086e831686fc Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 6 Aug 2008 08:39:54 -0600
Subject: fix some FBO/texture queries (bug 15296)

---
 src/mesa/main/fbobject.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 0ae69bdce7..960cc6da22 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -1525,7 +1525,12 @@ _mesa_GetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment,
       return;
    case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT:
       if (att->Type == GL_TEXTURE) {
-	 *params = GL_TEXTURE_CUBE_MAP_POSITIVE_X + att->CubeMapFace;
+         if (att->Texture && att->Texture->Target == GL_TEXTURE_CUBE_MAP) {
+            *params = GL_TEXTURE_CUBE_MAP_POSITIVE_X + att->CubeMapFace;
+         }
+         else {
+            *params = 0;
+         }
       }
       else {
 	 _mesa_error(ctx, GL_INVALID_ENUM,
@@ -1534,7 +1539,12 @@ _mesa_GetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment,
       return;
    case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT:
       if (att->Type == GL_TEXTURE) {
-	 *params = att->Zoffset;
+         if (att->Texture && att->Texture->Target == GL_TEXTURE_3D) {
+            *params = att->Zoffset;
+         }
+         else {
+            *params = 0;
+         }
       }
       else {
 	 _mesa_error(ctx, GL_INVALID_ENUM,
-- 
cgit v1.2.3


From 2c2d6c90fe910e9ba9f84650ce0e80c34f165eac Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 7 Aug 2008 10:29:11 -0600
Subject: mesa: fix glBindTexture comment/error string

---
 src/mesa/main/texobj.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index b77a00dd15..c163a8158f 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -875,9 +875,9 @@ _mesa_BindTexture( GLenum target, GLuint texName )
       if (newTexObj) {
          /* error checking */
          if (newTexObj->Target != 0 && newTexObj->Target != target) {
-            /* the named texture object's dimensions don't match the target */
+            /* the named texture object's target doesn't match the given target */
             _mesa_error( ctx, GL_INVALID_OPERATION,
-                         "glBindTexture(wrong dimensionality)" );
+                         "glBindTexture(target mismatch)" );
             return;
          }
          if (newTexObj->Target == 0 && target == GL_TEXTURE_RECTANGLE_NV) {
-- 
cgit v1.2.3


From 48cf46a29d8bccb0d83ae7e53e4ded44492cdb5f Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 8 Aug 2008 09:08:44 -0600
Subject: mesa: fix out-of-bounds memory reads in swizzle_copy()

---
 src/mesa/main/texstore.c | 118 +++++++++++++++++++++++++++++++++++------------
 1 file changed, 89 insertions(+), 29 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index 97fdfd39b2..9fe989aaeb 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -2,7 +2,7 @@
  * Mesa 3-D graphics library
  * Version:  7.1
  *
- * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -678,56 +678,116 @@ static void
 swizzle_copy(GLubyte *dst, GLuint dstComponents, const GLubyte *src, 
              GLuint srcComponents, const GLubyte *map, GLuint count)
 {
+#define SWZ_CPY(dst, src, count, dstComps, srcComps) \
+   do {                                              \
+      GLuint i;                                      \
+      for (i = 0; i < count; i++) {                  \
+         GLuint j;                                   \
+         if (srcComps == 4) {                        \
+            COPY_4UBV(tmp, src);                     \
+         }                                           \
+         else {                                      \
+            for (j = 0; j < srcComps; j++) {         \
+               tmp[j] = src[j];                      \
+            }                                        \
+         }                                           \
+         src += srcComps;                            \
+         for (j = 0; j < dstComps; j++) {            \
+            dst[j] = tmp[map[j]];                    \
+         }                                           \
+         dst += dstComps;                            \
+      }                                              \
+   } while (0)
+
    GLubyte tmp[6];
-   GLuint i;
 
    tmp[ZERO] = 0x0;
    tmp[ONE] = 0xff;
 
+   ASSERT(srcComponents <= 4);
+   ASSERT(dstComponents <= 4);
+
    switch (dstComponents) {
    case 4:
-      for (i = 0; i < count; i++) {
- 	 COPY_4UBV(tmp, src); 
-	 src += srcComponents;      
-	 dst[0] = tmp[map[0]];
-	 dst[1] = tmp[map[1]];
-	 dst[2] = tmp[map[2]];
-	 dst[3] = tmp[map[3]];
-	 dst += 4;
+      switch (srcComponents) {
+      case 4:
+         SWZ_CPY(dst, src, count, 4, 4);
+         break;
+      case 3:
+         SWZ_CPY(dst, src, count, 4, 3);
+         break;
+      case 2:
+         SWZ_CPY(dst, src, count, 4, 2);
+         break;
+      case 1:
+         SWZ_CPY(dst, src, count, 4, 1);
+         break;
+      default:
+         ;
       }
       break;
    case 3:
-      for (i = 0; i < count; i++) {
- 	 COPY_4UBV(tmp, src); 
-	 src += srcComponents;      
-	 dst[0] = tmp[map[0]];
-	 dst[1] = tmp[map[1]];
-	 dst[2] = tmp[map[2]];
-	 dst += 3;
+      switch (srcComponents) {
+      case 4:
+         SWZ_CPY(dst, src, count, 3, 4);
+         break;
+      case 3:
+         SWZ_CPY(dst, src, count, 3, 3);
+         break;
+      case 2:
+         SWZ_CPY(dst, src, count, 3, 2);
+         break;
+      case 1:
+         SWZ_CPY(dst, src, count, 3, 1);
+         break;
+      default:
+         ;
       }
       break;
    case 2:
-      for (i = 0; i < count; i++) {
- 	 COPY_4UBV(tmp, src); 
-	 src += srcComponents;      
-	 dst[0] = tmp[map[0]];
-	 dst[1] = tmp[map[1]];
-	 dst += 2;
+      switch (srcComponents) {
+      case 4:
+         SWZ_CPY(dst, src, count, 2, 4);
+         break;
+      case 3:
+         SWZ_CPY(dst, src, count, 2, 3);
+         break;
+      case 2:
+         SWZ_CPY(dst, src, count, 2, 2);
+         break;
+      case 1:
+         SWZ_CPY(dst, src, count, 2, 1);
+         break;
+      default:
+         ;
       }
       break;
    case 1:
-      /* XXX investigate valgrind invalid read when running demos/texenv.c */
-      for (i = 0; i < count; i++) {
- 	 COPY_4UBV(tmp, src); 
-	 src += srcComponents;      
-	 dst[0] = tmp[map[0]];
-	 dst += 1;
+      switch (srcComponents) {
+      case 4:
+         SWZ_CPY(dst, src, count, 1, 4);
+         break;
+      case 3:
+         SWZ_CPY(dst, src, count, 1, 3);
+         break;
+      case 2:
+         SWZ_CPY(dst, src, count, 1, 2);
+         break;
+      case 1:
+         SWZ_CPY(dst, src, count, 1, 1);
+         break;
+      default:
+         ;
       }
       break;
+   default:
+      ;
    }
+#undef SWZ_CPY
 }
 
 
+
 static const GLubyte map_identity[6] = { 0, 1, 2, 3, ZERO, ONE };
 static const GLubyte map_3210[6] = { 3, 2, 1, 0, ZERO, ONE };
 
-- 
cgit v1.2.3


From 966e199e409a1b52eef88e48997442250997f45e Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 8 Aug 2008 12:29:48 -0600
Subject: mesa: fix some pixel transfer state tests for depth formats

---
 src/mesa/main/texstore.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index 9fe989aaeb..e821d9f367 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -1160,7 +1160,8 @@ _mesa_texstore_z32(TEXSTORE_PARAMS)
    ASSERT(dstFormat == &_mesa_texformat_z32);
    ASSERT(dstFormat->TexelBytes == sizeof(GLuint));
 
-   if (!ctx->_ImageTransferState &&
+   if (ctx->Pixel.DepthScale == 1.0f &&
+       ctx->Pixel.DepthBias == 0.0f &&
        !srcPacking->SwapBytes &&
        baseInternalFormat == GL_DEPTH_COMPONENT &&
        srcFormat == GL_DEPTH_COMPONENT &&
@@ -1207,7 +1208,8 @@ _mesa_texstore_z16(TEXSTORE_PARAMS)
    ASSERT(dstFormat == &_mesa_texformat_z16);
    ASSERT(dstFormat->TexelBytes == sizeof(GLushort));
 
-   if (!ctx->_ImageTransferState &&
+   if (ctx->Pixel.DepthScale == 1.0f &&
+       ctx->Pixel.DepthBias == 0.0f &&
        !srcPacking->SwapBytes &&
        baseInternalFormat == GL_DEPTH_COMPONENT &&
        srcFormat == GL_DEPTH_COMPONENT &&
@@ -2405,7 +2407,8 @@ _mesa_texstore_z24_s8(TEXSTORE_PARAMS)
    ASSERT(srcFormat == GL_DEPTH_STENCIL_EXT);
    ASSERT(srcType == GL_UNSIGNED_INT_24_8_EXT);
 
-   if (!ctx->_ImageTransferState &&
+   if (ctx->Pixel.DepthScale == 1.0f &&
+       ctx->Pixel.DepthBias == 0.0f &&
        !srcPacking->SwapBytes) {
       /* simple path */
       memcpy_texture(ctx, dims,
@@ -2476,7 +2479,7 @@ _mesa_texstore_s8_z24(TEXSTORE_PARAMS)
    ASSERT(srcFormat == GL_DEPTH_STENCIL_EXT || srcFormat == GL_DEPTH_COMPONENT);
    ASSERT(srcFormat != GL_DEPTH_STENCIL_EXT || srcType == GL_UNSIGNED_INT_24_8_EXT);
 
-   /* Incase we only upload depth we need to preserve the stencil */
+   /* In case we only upload depth we need to preserve the stencil */
    if (srcFormat == GL_DEPTH_COMPONENT) {
       for (img = 0; img < srcDepth; img++) {
          GLuint *dstRow = (GLuint *) dstAddr
@@ -2504,7 +2507,8 @@ _mesa_texstore_s8_z24(TEXSTORE_PARAMS)
             dstRow += dstRowStride / sizeof(GLuint);
          }
       }
-   } else {
+   }
+   else {
       for (img = 0; img < srcDepth; img++) {
          GLuint *dstRow = (GLuint *) dstAddr
             + dstImageOffsets[dstZoffset + img]
-- 
cgit v1.2.3


From 74b14fe6ddbece8bc662aac4d3b2b18d8d853486 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 8 Aug 2008 13:06:54 -0600
Subject: mesa: fix some feature tests

---
 src/mesa/main/context.c  | 6 ------
 src/mesa/main/fbobject.c | 2 ++
 2 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 27e5e2fcce..32460e92c3 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -120,9 +120,7 @@
 #include "macros.h"
 #include "matrix.h"
 #include "multisample.h"
-#if FEATURE_pixel_transfer
 #include "pixel.h"
-#endif
 #include "pixelstore.h"
 #include "points.h"
 #include "polygon.h"
@@ -1035,11 +1033,7 @@ init_attrib_groups(GLcontext *ctx)
    _mesa_init_lighting( ctx );
    _mesa_init_matrix( ctx );
    _mesa_init_multisample( ctx );
-#if FEATURE_pixel_transfer
    _mesa_init_pixel( ctx );
-#else
-   ctx->Pixel.ReadBuffer = ctx->Visual.doubleBufferMode ? GL_BACK : GL_FRONT;
-#endif
    _mesa_init_pixelstore( ctx );
    _mesa_init_point( ctx );
    _mesa_init_polygon( ctx );
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 960cc6da22..b5605a199c 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -508,6 +508,7 @@ _mesa_test_framebuffer_completeness(GLcontext *ctx, struct gl_framebuffer *fb)
       }
    }
 
+#ifndef FEATURE_OES_framebuffer_object
    /* Check that all DrawBuffers are present */
    for (j = 0; j < ctx->Const.MaxDrawBuffers; j++) {
       if (fb->ColorDrawBuffer[j] != GL_NONE) {
@@ -533,6 +534,7 @@ _mesa_test_framebuffer_completeness(GLcontext *ctx, struct gl_framebuffer *fb)
          return;
       }
    }
+#endif
 
    if (numImages == 0) {
       fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT;
-- 
cgit v1.2.3


From af3d9dba562813ffed71691bffd7faf6665c4487 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Tue, 12 Aug 2008 10:00:36 -0600
Subject: mesa: set point state

---
 src/mesa/main/points.c    | 4 ++++
 src/mesa/shader/program.c | 4 ++++
 2 files changed, 8 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/points.c b/src/mesa/main/points.c
index fbedbcb22c..d16344a42c 100644
--- a/src/mesa/main/points.c
+++ b/src/mesa/main/points.c
@@ -244,7 +244,11 @@ _mesa_init_point(GLcontext *ctx)
    ctx->Point.MaxSize
       = MAX2(ctx->Const.MaxPointSize, ctx->Const.MaxPointSizeAA);
    ctx->Point.Threshold = 1.0;
+#if FEATURE_es2_glsl
+   ctx->Point.PointSprite = GL_TRUE; /* GL_ARB/NV_point_sprite */
+#else
    ctx->Point.PointSprite = GL_FALSE; /* GL_ARB/NV_point_sprite */
+#endif
    ctx->Point.SpriteRMode = GL_ZERO; /* GL_NV_point_sprite (only!) */
    ctx->Point.SpriteOrigin = GL_UPPER_LEFT; /* GL_ARB_point_sprite */
    for (i = 0; i < MAX_TEXTURE_UNITS; i++) {
diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c
index 02e23aaa3a..b03dd24d11 100644
--- a/src/mesa/shader/program.c
+++ b/src/mesa/shader/program.c
@@ -58,7 +58,11 @@ _mesa_init_program(GLcontext *ctx)
 
 #if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program
    ctx->VertexProgram.Enabled = GL_FALSE;
+#if FEATURE_es2_glsl
+   ctx->VertexProgram.PointSizeEnabled = GL_TRUE;
+#else
    ctx->VertexProgram.PointSizeEnabled = GL_FALSE;
+#endif
    ctx->VertexProgram.TwoSideEnabled = GL_FALSE;
    _mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current,
                             ctx->Shared->DefaultVertexProgram);
-- 
cgit v1.2.3


From c01fbc7866d7cd5cf4263dffec6d9591470b4c23 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Tue, 12 Aug 2008 17:41:57 -0600
Subject: mesa: texture crop rect state

---
 src/mesa/main/glheader.h |  4 ++++
 src/mesa/main/mtypes.h   |  2 +-
 src/mesa/main/texparam.c | 30 ++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h
index 3131a356b8..f0f97c218c 100644
--- a/src/mesa/main/glheader.h
+++ b/src/mesa/main/glheader.h
@@ -176,6 +176,10 @@
 #endif
 
 
+#ifndef GL_OES_draw_texture
+#define GL_TEXTURE_CROP_RECT_OES  0x8B9D
+#endif
+
 
 #if !defined(CAPI) && defined(WIN32) && !defined(BUILD_FOR_SNAP)
 #define CAPI _cdecl
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index a95f02b889..71a4ca55bc 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1434,6 +1434,7 @@ struct gl_texture_object
    GLenum DepthMode;		/**< GL_ARB_depth_texture */
    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 */
    GLboolean GenerateMipmap;    /**< GL_SGIS_generate_mipmap */
    GLboolean _Complete;		/**< Is texture object complete? */
 
@@ -1443,7 +1444,6 @@ struct gl_texture_object
    /** GL_EXT_paletted_texture */
    struct gl_color_table Palette;
 
-
    /**
     * \name For device driver.
     * Note: instead of attaching driver data to this pointer, it's preferable
diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index af288c4e18..3f3b448dbc 100644
--- a/src/mesa/main/texparam.c
+++ b/src/mesa/main/texparam.c
@@ -409,6 +409,14 @@ _mesa_TexParameterfv( GLenum target, GLenum pname, const GLfloat *params )
             }
          }
          break;
+#ifdef FEATURE_OES_draw_texture
+      case GL_TEXTURE_CROP_RECT_OES:
+         texObj->CropRect[0] = (GLint) params[0];
+         texObj->CropRect[1] = (GLint) params[1];
+         texObj->CropRect[2] = (GLint) params[2];
+         texObj->CropRect[3] = (GLint) params[3];
+         break;
+#endif
 
       default:
          _mesa_error(ctx, GL_INVALID_ENUM,
@@ -447,6 +455,12 @@ _mesa_TexParameteriv( GLenum target, GLenum pname, const GLint *params )
       fparam[2] = INT_TO_FLOAT(params[2]);
       fparam[3] = INT_TO_FLOAT(params[3]);
    }
+   else if (pname == GL_TEXTURE_CROP_RECT_OES) {
+      fparam[0] = (GLfloat) params[0];
+      fparam[1] = (GLfloat) params[1];
+      fparam[2] = (GLfloat) params[2];
+      fparam[3] = (GLfloat) params[3];
+   }
    else {
       if (pname == GL_TEXTURE_PRIORITY)
          fparam[0] = INT_TO_FLOAT(params[0]);
@@ -885,6 +899,14 @@ _mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params )
 	 else 
 	    error = 1;
          break;
+#ifdef FEATURE_OES_draw_texture
+      case GL_TEXTURE_CROP_RECT_OES:
+         params[0] = obj->CropRect[0];
+         params[0] = obj->CropRect[1];
+         params[0] = obj->CropRect[2];
+         params[0] = obj->CropRect[3];
+         break;
+#endif
       default:
 	 error = 1;
 	 break;
@@ -1027,6 +1049,14 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
             return;
          }
          break;
+#ifdef FEATURE_OES_draw_texture
+      case GL_TEXTURE_CROP_RECT_OES:
+         params[0] = obj->CropRect[0];
+         params[0] = obj->CropRect[1];
+         params[0] = obj->CropRect[2];
+         params[0] = obj->CropRect[3];
+         break;
+#endif
       default:
          ; /* silence warnings */
    }
-- 
cgit v1.2.3


From 087ee474ed1dcf9b09c13227d442e6580f828f57 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 18 Aug 2008 08:49:41 -0600
Subject: mesa: rearrange some code in _mesa_BindTexture() to fix error
 detection bug 17173

Also, move GL_TEXTURE_RECTANGLE init code into separate function.
---
 src/mesa/main/texobj.c | 101 +++++++++++++++++++++++++++++--------------------
 1 file changed, 59 insertions(+), 42 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index c163a8158f..2a54ff7ff9 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -141,6 +141,34 @@ _mesa_initialize_texture_object( struct gl_texture_object *obj,
 }
 
 
+/**
+ * Some texture initialization can't be finished until we know which
+ * target it's getting bound to (GL_TEXTURE_1D/2D/etc).
+ */
+static void
+finish_texture_init(GLcontext *ctx, GLenum target,
+                    struct gl_texture_object *obj)
+{
+   assert(obj->Target == 0);
+
+   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;
+      if (ctx->Driver.TexParameter) {
+         static const GLfloat fparam_wrap[1] = {(GLfloat) GL_CLAMP_TO_EDGE};
+         static const GLfloat fparam_filter[1] = {(GLfloat) GL_LINEAR};
+         ctx->Driver.TexParameter(ctx, target, obj, GL_TEXTURE_WRAP_S, fparam_wrap);
+         ctx->Driver.TexParameter(ctx, target, obj, GL_TEXTURE_WRAP_T, fparam_wrap);
+         ctx->Driver.TexParameter(ctx, target, obj, GL_TEXTURE_WRAP_R, fparam_wrap);
+         ctx->Driver.TexParameter(ctx, target, obj, GL_TEXTURE_MIN_FILTER, fparam_filter);
+      }
+   }
+}
+
+
 /**
  * Deallocate a texture object struct.  It should have already been
  * removed from the texture object pool.
@@ -830,44 +858,45 @@ _mesa_BindTexture( GLenum target, GLuint texName )
    GET_CURRENT_CONTEXT(ctx);
    const GLuint unit = ctx->Texture.CurrentUnit;
    struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
-   struct gl_texture_object *newTexObj = NULL;
+   struct gl_texture_object *newTexObj = NULL, *defaultTexObj = NULL;
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
    if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))
       _mesa_debug(ctx, "glBindTexture %s %d\n",
                   _mesa_lookup_enum_by_nr(target), (GLint) texName);
 
+   switch (target) {
+   case GL_TEXTURE_1D:
+      defaultTexObj = ctx->Shared->Default1D;
+      break;
+   case GL_TEXTURE_2D:
+      defaultTexObj = ctx->Shared->Default2D;
+      break;
+   case GL_TEXTURE_3D:
+      defaultTexObj = ctx->Shared->Default3D;
+      break;
+   case GL_TEXTURE_CUBE_MAP_ARB:
+      defaultTexObj = ctx->Shared->DefaultCubeMap;
+      break;
+   case GL_TEXTURE_RECTANGLE_NV:
+      defaultTexObj = ctx->Shared->DefaultRect;
+      break;
+   case GL_TEXTURE_1D_ARRAY_EXT:
+      defaultTexObj = ctx->Shared->Default1DArray;
+      break;
+   case GL_TEXTURE_2D_ARRAY_EXT:
+      defaultTexObj = ctx->Shared->Default2DArray;
+      break;
+   default:
+      _mesa_error(ctx, GL_INVALID_ENUM, "glBindTexture(target)");
+      return;
+   }
+
    /*
     * Get pointer to new texture object (newTexObj)
     */
    if (texName == 0) {
-      /* newTexObj = a default texture object */
-      switch (target) {
-         case GL_TEXTURE_1D:
-            newTexObj = ctx->Shared->Default1D;
-            break;
-         case GL_TEXTURE_2D:
-            newTexObj = ctx->Shared->Default2D;
-            break;
-         case GL_TEXTURE_3D:
-            newTexObj = ctx->Shared->Default3D;
-            break;
-         case GL_TEXTURE_CUBE_MAP_ARB:
-            newTexObj = ctx->Shared->DefaultCubeMap;
-            break;
-         case GL_TEXTURE_RECTANGLE_NV:
-            newTexObj = ctx->Shared->DefaultRect;
-            break;
-         case GL_TEXTURE_1D_ARRAY_EXT:
-            newTexObj = ctx->Shared->Default1DArray;
-            break;
-         case GL_TEXTURE_2D_ARRAY_EXT:
-            newTexObj = ctx->Shared->Default2DArray;
-            break;
-         default:
-            _mesa_error(ctx, GL_INVALID_ENUM, "glBindTexture(target)");
-            return;
-      }
+      newTexObj = defaultTexObj;
    }
    else {
       /* non-default texture object */
@@ -880,20 +909,8 @@ _mesa_BindTexture( GLenum target, GLuint texName )
                          "glBindTexture(target mismatch)" );
             return;
          }
-         if (newTexObj->Target == 0 && target == GL_TEXTURE_RECTANGLE_NV) {
-            /* have to init wrap and filter state here - kind of klunky */
-            newTexObj->WrapS = GL_CLAMP_TO_EDGE;
-            newTexObj->WrapT = GL_CLAMP_TO_EDGE;
-            newTexObj->WrapR = GL_CLAMP_TO_EDGE;
-            newTexObj->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};
-               (*ctx->Driver.TexParameter)( ctx, target, newTexObj, GL_TEXTURE_WRAP_S, fparam_wrap );
-               (*ctx->Driver.TexParameter)( ctx, target, newTexObj, GL_TEXTURE_WRAP_T, fparam_wrap );
-               (*ctx->Driver.TexParameter)( ctx, target, newTexObj, GL_TEXTURE_WRAP_R, fparam_wrap );
-               (*ctx->Driver.TexParameter)( ctx, target, newTexObj, GL_TEXTURE_MIN_FILTER, fparam_filter );
-            }
+         if (newTexObj->Target == 0) {
+            finish_texture_init(ctx, target, newTexObj);
          }
       }
       else {
-- 
cgit v1.2.3


From 815cdcfbc0740c66b901361620c88d99541bdad2 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Tue, 19 Aug 2008 18:14:15 -0600
Subject: mesa: allow for extra per-context init

---
 src/mesa/main/context.c | 4 ++++
 src/mesa/main/context.h | 3 +++
 src/mesa/main/points.c  | 4 ----
 3 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 32460e92c3..ed3faecf0d 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1214,6 +1214,10 @@ _mesa_initialize_context(GLcontext *ctx,
       ctx->FragmentProgram._MaintainTexEnvProgram = GL_TRUE;
    }
 
+#ifdef FEATURE_extra_context_init
+   _mesa_initialize_context_extra(ctx);
+#endif
+
    ctx->FirstTimeCurrent = GL_TRUE;
 
    return GL_TRUE;
diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h
index 099912aa15..9423b66a7d 100644
--- a/src/mesa/main/context.h
+++ b/src/mesa/main/context.h
@@ -114,6 +114,9 @@ _mesa_initialize_context( GLcontext *ctx,
                           const struct dd_function_table *driverFunctions,
                           void *driverContext );
 
+extern void
+_mesa_initialize_context_extra(GLcontext *ctx);
+
 extern void
 _mesa_free_context_data( GLcontext *ctx );
 
diff --git a/src/mesa/main/points.c b/src/mesa/main/points.c
index d16344a42c..fbedbcb22c 100644
--- a/src/mesa/main/points.c
+++ b/src/mesa/main/points.c
@@ -244,11 +244,7 @@ _mesa_init_point(GLcontext *ctx)
    ctx->Point.MaxSize
       = MAX2(ctx->Const.MaxPointSize, ctx->Const.MaxPointSizeAA);
    ctx->Point.Threshold = 1.0;
-#if FEATURE_es2_glsl
-   ctx->Point.PointSprite = GL_TRUE; /* GL_ARB/NV_point_sprite */
-#else
    ctx->Point.PointSprite = GL_FALSE; /* GL_ARB/NV_point_sprite */
-#endif
    ctx->Point.SpriteRMode = GL_ZERO; /* GL_NV_point_sprite (only!) */
    ctx->Point.SpriteOrigin = GL_UPPER_LEFT; /* GL_ARB_point_sprite */
    for (i = 0; i < MAX_TEXTURE_UNITS; i++) {
-- 
cgit v1.2.3


From 4e4cb0274050f300da9801256b66d3be528d549f Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 28 Aug 2008 08:38:27 -0600
Subject: mesa: bump MAX_INSN to 300

---
 src/mesa/main/ffvertex_prog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index 5f3def257d..b93376a564 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -319,7 +319,7 @@ static struct state_key *make_state_key( GLcontext *ctx )
  */
 #define PREFER_DP4 0
 
-#define MAX_INSN 256
+#define MAX_INSN 300
 
 /* Use uregs to represent registers internally, translate to Mesa's
  * expected formats on emit.  
-- 
cgit v1.2.3


From cacf5f21efcbf0ddde90bf8b7fc2b9ba1873302e Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 28 Aug 2008 15:11:04 -0600
Subject: mesa: dynamically grow the fixed function vertex program as needed

Don't use a fixed-size array.  Saves memory in most cases and avoids
potential overflow for long programs.
---
 src/mesa/main/ffvertex_prog.c | 56 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 46 insertions(+), 10 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index b93376a564..e9ddc06980 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -319,7 +319,6 @@ static struct state_key *make_state_key( GLcontext *ctx )
  */
 #define PREFER_DP4 0
 
-#define MAX_INSN 300
 
 /* Use uregs to represent registers internally, translate to Mesa's
  * expected formats on emit.  
@@ -335,16 +334,18 @@ static struct state_key *make_state_key( GLcontext *ctx )
  */
 struct ureg {
    GLuint file:4;
-   GLint idx:8;      /* relative addressing may be negative */
+   GLint idx:9;      /* relative addressing may be negative */
+                     /* sizeof(idx) should == sizeof(prog_src_reg::Index) */
    GLuint negate:1;
    GLuint swz:12;
-   GLuint pad:7;
+   GLuint pad:6;
 };
 
 
 struct tnl_program {
    const struct state_key *state;
    struct gl_vertex_program *program;
+   GLint max_inst;  /** number of instructions allocated for program */
    
    GLuint temp_in_use;
    GLuint temp_reserved;
@@ -362,7 +363,7 @@ struct tnl_program {
 
 static const struct ureg undef = { 
    PROGRAM_UNDEFINED,
-   ~0,
+   0,
    0,
    0,
    0
@@ -558,6 +559,8 @@ static void emit_arg( struct prog_src_register *src,
    src->Abs = 0;
    src->NegateAbs = 0;
    src->RelAddr = 0;
+   /* Check that bitfield sizes aren't exceeded */
+   ASSERT(src->Index == reg.idx);
 }
 
 static void emit_dst( struct prog_dst_register *dst,
@@ -571,6 +574,8 @@ static void emit_dst( struct prog_dst_register *dst,
    dst->CondSwizzle = SWIZZLE_NOOP;
    dst->CondSrc = 0;
    dst->pad = 0;
+   /* Check that bitfield sizes aren't exceeded */
+   ASSERT(dst->Index == reg.idx);
 }
 
 static void debug_insn( struct prog_instruction *inst, const char *fn,
@@ -600,14 +605,37 @@ static void emit_op3fn(struct tnl_program *p,
 		       const char *fn,
 		       GLuint line)
 {
-   GLuint nr = p->program->Base.NumInstructions++;
-   struct prog_instruction *inst = &p->program->Base.Instructions[nr];
+   GLuint nr;
+   struct prog_instruction *inst;
       
-   if (p->program->Base.NumInstructions > MAX_INSN) {
-      _mesa_problem(0, "Out of instructions in emit_op3fn\n");
-      return;
+   assert(p->program->Base.NumInstructions <= p->max_inst);
+
+   if (p->program->Base.NumInstructions == p->max_inst) {
+      /* need to extend the program's instruction array */
+      struct prog_instruction *newInst;
+
+      /* double the size */
+      p->max_inst *= 2;
+
+      newInst = _mesa_alloc_instructions(p->max_inst);
+      if (!newInst) {
+         _mesa_error(NULL, GL_OUT_OF_MEMORY, "vertex program build");
+         return;
+      }
+
+      _mesa_copy_instructions(newInst,
+                              p->program->Base.Instructions,
+                              p->program->Base.NumInstructions);
+
+      _mesa_free_instructions(p->program->Base.Instructions,
+                              p->program->Base.NumInstructions);
+
+      p->program->Base.Instructions = newInst;
    }
       
+   nr = p->program->Base.NumInstructions++;
+
+   inst = &p->program->Base.Instructions[nr];
    inst->Opcode = (enum prog_opcode) op; 
    inst->StringPos = 0;
    inst->Data = 0;
@@ -1621,12 +1649,16 @@ static void build_tnl_program( struct tnl_program *p )
 #if 0
    else
       build_constant_pointsize(p);
+#else
+   (void) build_constant_pointsize;
 #endif
 
    /* Finish up:
     */
    emit_op1(p, OPCODE_END, undef, 0, undef);
 
+   _mesa_print_program(&p->program->Base);
+
    /* Disassemble:
     */
    if (DISASSEM) {
@@ -1657,7 +1689,11 @@ create_new_program( const struct state_key *key,
    else
       p.temp_reserved = ~((1<<max_temps)-1);
 
-   p.program->Base.Instructions = _mesa_alloc_instructions(MAX_INSN);
+   /* Start by allocating 32 instructions.
+    * If we need more, we'll grow the instruction array as needed.
+    */
+   p.max_inst = 32;
+   p.program->Base.Instructions = _mesa_alloc_instructions(p.max_inst);
    p.program->Base.String = NULL;
    p.program->Base.NumInstructions =
    p.program->Base.NumTemporaries =
-- 
cgit v1.2.3


From ee87d7d9ecc5eca261ce58115ae1ed2c273ceda6 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 28 Aug 2008 15:21:44 -0600
Subject: mesa: remove debug code

---
 src/mesa/main/ffvertex_prog.c | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index e9ddc06980..62802ffe5d 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -1657,8 +1657,6 @@ static void build_tnl_program( struct tnl_program *p )
     */
    emit_op1(p, OPCODE_END, undef, 0, undef);
 
-   _mesa_print_program(&p->program->Base);
-
    /* Disassemble:
     */
    if (DISASSEM) {
-- 
cgit v1.2.3


From 39e8860e45fae2968917bdb7fe572c8793bbce30 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 1 Sep 2008 13:10:23 -0600
Subject: mesa: use CALLOC instead of MALLOC to fix valgrind warning

---
 src/mesa/main/arrayobj.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index d62661e2b5..af2feb3553 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -77,7 +77,7 @@ lookup_arrayobj(GLcontext *ctx, GLuint id)
 struct gl_array_object *
 _mesa_new_array_object( GLcontext *ctx, GLuint name )
 {
-   struct gl_array_object *obj = MALLOC_STRUCT(gl_array_object);
+   struct gl_array_object *obj = CALLOC_STRUCT(gl_array_object);
    if (obj)
       _mesa_initialize_array_object(ctx, obj, name);
    return obj;
-- 
cgit v1.2.3


From a28aa1854378f735a6ac5c4b25fd7645cdbc1358 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Tue, 2 Sep 2008 18:10:34 -0600
Subject: fix BUFFER_DEPTH/BUFFER_ACCUM mix-up

---
 src/mesa/main/framebuffer.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/framebuffer.c b/src/mesa/main/framebuffer.c
index dab449fc09..494743f134 100644
--- a/src/mesa/main/framebuffer.c
+++ b/src/mesa/main/framebuffer.c
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.5.1
+ * Version:  7.2
  *
- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -565,13 +565,13 @@ _mesa_update_framebuffer_visual(struct gl_framebuffer *fb)
    if (fb->Attachment[BUFFER_ACCUM].Renderbuffer) {
       fb->Visual.haveAccumBuffer = GL_TRUE;
       fb->Visual.accumRedBits
-         = fb->Attachment[BUFFER_DEPTH].Renderbuffer->RedBits;
+         = fb->Attachment[BUFFER_ACCUM].Renderbuffer->RedBits;
       fb->Visual.accumGreenBits
-         = fb->Attachment[BUFFER_DEPTH].Renderbuffer->GreenBits;
+         = fb->Attachment[BUFFER_ACCUM].Renderbuffer->GreenBits;
       fb->Visual.accumBlueBits
-         = fb->Attachment[BUFFER_DEPTH].Renderbuffer->BlueBits;
+         = fb->Attachment[BUFFER_ACCUM].Renderbuffer->BlueBits;
       fb->Visual.accumAlphaBits
-         = fb->Attachment[BUFFER_DEPTH].Renderbuffer->AlphaBits;
+         = fb->Attachment[BUFFER_ACCUM].Renderbuffer->AlphaBits;
    }
 
    compute_depth_max(fb);
-- 
cgit v1.2.3


From 55e89eecff6a8dc0433eca16e2ea699ec9636d1b Mon Sep 17 00:00:00 2001
From: "Xiang, Haihao" <haihao.xiang@intel.com>
Date: Thu, 4 Sep 2008 11:32:52 +0800
Subject: mesa: merge stencil values into depth values for MESA_FORMAT_S8_Z24

Cherry-picked from master
---
 src/mesa/main/texstore.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index e821d9f367..0fd6a2daae 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -2522,7 +2522,7 @@ _mesa_texstore_s8_z24(TEXSTORE_PARAMS)
          for (row = 0; row < srcHeight; row++) {
             GLubyte stencil[MAX_WIDTH];
             GLint i;
-            /* the 24 depth bits will be in the high position: */
+            /* the 24 depth bits will be in the low position: */
             _mesa_unpack_depth_span(ctx, srcWidth,
                                     GL_UNSIGNED_INT, /* dst type */
                                     dstRow, /* dst addr */
@@ -2536,7 +2536,7 @@ _mesa_texstore_s8_z24(TEXSTORE_PARAMS)
                                       ctx->_ImageTransferState);
             /* merge stencil values into depth values */
             for (i = 0; i < srcWidth; i++)
-               dstRow[i] = stencil[i] << 24;
+               dstRow[i] |= stencil[i] << 24;
 
             src += srcRowStride;
             dstRow += dstRowStride / sizeof(GLuint);
-- 
cgit v1.2.3


From 978f07bebdd5a368b8f900ed9cf77d3464a77ec0 Mon Sep 17 00:00:00 2001
From: Michal Krol <michal@tungstengraphics.com>
Date: Thu, 4 Sep 2008 13:37:15 +0200
Subject: mesa: Silence compiler warnings on Windows.

---
 src/mesa/main/ffvertex_prog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index 62802ffe5d..787672be9f 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -608,7 +608,7 @@ static void emit_op3fn(struct tnl_program *p,
    GLuint nr;
    struct prog_instruction *inst;
       
-   assert(p->program->Base.NumInstructions <= p->max_inst);
+   assert((GLint) p->program->Base.NumInstructions <= p->max_inst);
 
    if (p->program->Base.NumInstructions == p->max_inst) {
       /* need to extend the program's instruction array */
-- 
cgit v1.2.3


From a69fc5129bdf2f245c5bf2e0fe7b542caf7809a9 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 4 Sep 2008 15:25:45 -0600
Subject: mesa: improved gl_buffer_object reference counting

Use new _mesa_reference_buffer_object() function wherever possible.
Fixes buffer object/display list crash reported in ParaView.
---
 src/mesa/main/arrayobj.c     |  31 ++++---
 src/mesa/main/attrib.c       |  87 +++++++++++---------
 src/mesa/main/bufferobj.c    | 188 +++++++++++++++++++++----------------------
 src/mesa/main/bufferobj.h    |  11 +--
 src/mesa/main/varray.c       |  15 ++--
 src/mesa/vbo/vbo_exec_api.c  |   8 +-
 src/mesa/vbo/vbo_exec_draw.c |  26 ++++--
 src/mesa/vbo/vbo_save.c      |  16 ++--
 src/mesa/vbo/vbo_save_api.c  |  17 +++-
 src/mesa/vbo/vbo_save_draw.c |  28 +++++--
 10 files changed, 241 insertions(+), 186 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index af2feb3553..1461239317 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.5
+ * Version:  7.2
  *
- * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  * (C) Copyright IBM Corporation 2006
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -219,6 +219,15 @@ _mesa_remove_array_object( GLcontext *ctx, struct gl_array_object *obj )
 }
 
 
+static void
+unbind_buffer_object( GLcontext *ctx, struct gl_buffer_object *bufObj )
+{
+   if (bufObj != ctx->Array.NullBufferObj) {
+      _mesa_reference_buffer_object(ctx, &bufObj, NULL);
+   }
+}
+
+
 /**********************************************************************/
 /* API Functions                                                      */
 /**********************************************************************/
@@ -320,18 +329,18 @@ _mesa_DeleteVertexArraysAPPLE(GLsizei n, const GLuint *ids)
 	 /* Unbind any buffer objects that might be bound to arrays in
 	  * this array object.
 	  */
-	 _mesa_unbind_buffer_object( ctx, obj->Vertex.BufferObj );
-	 _mesa_unbind_buffer_object( ctx, obj->Normal.BufferObj );
-	 _mesa_unbind_buffer_object( ctx, obj->Color.BufferObj );
-	 _mesa_unbind_buffer_object( ctx, obj->SecondaryColor.BufferObj );
-	 _mesa_unbind_buffer_object( ctx, obj->FogCoord.BufferObj );
-	 _mesa_unbind_buffer_object( ctx, obj->Index.BufferObj );
+	 unbind_buffer_object( ctx, obj->Vertex.BufferObj );
+	 unbind_buffer_object( ctx, obj->Normal.BufferObj );
+	 unbind_buffer_object( ctx, obj->Color.BufferObj );
+	 unbind_buffer_object( ctx, obj->SecondaryColor.BufferObj );
+	 unbind_buffer_object( ctx, obj->FogCoord.BufferObj );
+	 unbind_buffer_object( ctx, obj->Index.BufferObj );
 	 for (i = 0; i < MAX_TEXTURE_UNITS; i++) {
-	    _mesa_unbind_buffer_object( ctx, obj->TexCoord[i].BufferObj );
+	    unbind_buffer_object( ctx, obj->TexCoord[i].BufferObj );
 	 }
-	 _mesa_unbind_buffer_object( ctx, obj->EdgeFlag.BufferObj );
+	 unbind_buffer_object( ctx, obj->EdgeFlag.BufferObj );
 	 for (i = 0; i < VERT_ATTRIB_MAX; i++) {
-	    _mesa_unbind_buffer_object( ctx, obj->VertexAttrib[i].BufferObj );
+	    unbind_buffer_object( ctx, obj->VertexAttrib[i].BufferObj );
 	 }
 #endif
 
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index b990369a9e..4cbb0273ab 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.1
+ * Version:  7.2
  *
- * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -1269,6 +1269,29 @@ adjust_buffer_object_ref_counts(struct gl_array_attrib *array, GLint step)
 }
 
 
+/**
+ * Copy gl_pixelstore_attrib from src to dst, updating buffer
+ * object refcounts.
+ */
+static void
+copy_pixelstore(GLcontext *ctx,
+                struct gl_pixelstore_attrib *dst,
+                const struct gl_pixelstore_attrib *src)
+{
+   dst->Alignment = src->Alignment;
+   dst->RowLength = src->RowLength;
+   dst->SkipPixels = src->SkipPixels;
+   dst->SkipRows = src->SkipRows;
+   dst->ImageHeight = src->ImageHeight;
+   dst->SkipImages = src->SkipImages;
+   dst->SwapBytes = src->SwapBytes;
+   dst->LsbFirst = src->LsbFirst;
+   dst->ClientStorage = src->ClientStorage;
+   dst->Invert = src->Invert;
+   _mesa_reference_buffer_object(ctx, &dst->BufferObj, src->BufferObj);
+}
+
+
 #define GL_CLIENT_PACK_BIT (1<<20)
 #define GL_CLIENT_UNPACK_BIT (1<<21)
 
@@ -1287,31 +1310,29 @@ _mesa_PushClientAttrib(GLbitfield mask)
       return;
    }
 
-   /* Build linked list of attribute nodes which save all attribute */
-   /* groups specified by the mask. */
+   /* Build linked list of attribute nodes which save all attribute
+    * groups specified by the mask.
+    */
    head = NULL;
 
    if (mask & GL_CLIENT_PIXEL_STORE_BIT) {
       struct gl_pixelstore_attrib *attr;
-#if FEATURE_EXT_pixel_buffer_object
-      ctx->Pack.BufferObj->RefCount++;
-      ctx->Unpack.BufferObj->RefCount++;
-#endif
       /* packing attribs */
-      attr = MALLOC_STRUCT( gl_pixelstore_attrib );
-      MEMCPY( attr, &ctx->Pack, sizeof(struct gl_pixelstore_attrib) );
+      attr = CALLOC_STRUCT( gl_pixelstore_attrib );
+      copy_pixelstore(ctx, attr, &ctx->Pack);
       newnode = new_attrib_node( GL_CLIENT_PACK_BIT );
       newnode->data = attr;
       newnode->next = head;
       head = newnode;
       /* unpacking attribs */
       attr = MALLOC_STRUCT( gl_pixelstore_attrib );
-      MEMCPY( attr, &ctx->Unpack, sizeof(struct gl_pixelstore_attrib) );
+      copy_pixelstore(ctx, attr, &ctx->Unpack);
       newnode = new_attrib_node( GL_CLIENT_UNPACK_BIT );
       newnode->data = attr;
       newnode->next = head;
       head = newnode;
    }
+
    if (mask & GL_CLIENT_VERTEX_ARRAY_BIT) {
       struct gl_array_attrib *attr;
       struct gl_array_object *obj;
@@ -1348,7 +1369,7 @@ _mesa_PushClientAttrib(GLbitfield mask)
 void GLAPIENTRY
 _mesa_PopClientAttrib(void)
 {
-   struct gl_attrib_node *attr, *next;
+   struct gl_attrib_node *node, *next;
 
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
@@ -1359,37 +1380,31 @@ _mesa_PopClientAttrib(void)
    }
 
    ctx->ClientAttribStackDepth--;
-   attr = ctx->ClientAttribStack[ctx->ClientAttribStackDepth];
+   node = ctx->ClientAttribStack[ctx->ClientAttribStackDepth];
 
-   while (attr) {
-      switch (attr->kind) {
+   while (node) {
+      switch (node->kind) {
          case GL_CLIENT_PACK_BIT:
-#if FEATURE_EXT_pixel_buffer_object
-            ctx->Pack.BufferObj->RefCount--;
-            if (ctx->Pack.BufferObj->RefCount <= 0) {
-               _mesa_remove_buffer_object( ctx, ctx->Pack.BufferObj );
-               (*ctx->Driver.DeleteBuffer)( ctx, ctx->Pack.BufferObj );
+            {
+               struct gl_pixelstore_attrib *store =
+                  (struct gl_pixelstore_attrib *) node->data;
+               copy_pixelstore(ctx, &ctx->Pack, store);
+               _mesa_reference_buffer_object(ctx, &store->BufferObj, NULL);
             }
-#endif
-            MEMCPY( &ctx->Pack, attr->data,
-                    sizeof(struct gl_pixelstore_attrib) );
 	    ctx->NewState |= _NEW_PACKUNPACK;
             break;
          case GL_CLIENT_UNPACK_BIT:
-#if FEATURE_EXT_pixel_buffer_object
-            ctx->Unpack.BufferObj->RefCount--;
-            if (ctx->Unpack.BufferObj->RefCount <= 0) {
-               _mesa_remove_buffer_object( ctx, ctx->Unpack.BufferObj );
-               (*ctx->Driver.DeleteBuffer)( ctx, ctx->Unpack.BufferObj );
+            {
+               struct gl_pixelstore_attrib *store =
+                  (struct gl_pixelstore_attrib *) node->data;
+               copy_pixelstore(ctx, &ctx->Unpack, store);
+               _mesa_reference_buffer_object(ctx, &store->BufferObj, NULL);
             }
-#endif
-            MEMCPY( &ctx->Unpack, attr->data,
-                    sizeof(struct gl_pixelstore_attrib) );
 	    ctx->NewState |= _NEW_PACKUNPACK;
             break;
          case GL_CLIENT_VERTEX_ARRAY_BIT: {
 	    struct gl_array_attrib * data =
-	      (struct gl_array_attrib *) attr->data;
+	      (struct gl_array_attrib *) node->data;
 
             adjust_buffer_object_ref_counts(&ctx->Array, -1);
 	 
@@ -1424,10 +1439,10 @@ _mesa_PopClientAttrib(void)
             break;
       }
 
-      next = attr->next;
-      FREE( attr->data );
-      FREE( attr );
-      attr = next;
+      next = node->next;
+      FREE( node->data );
+      FREE( node );
+      node = next;
    }
 }
 
diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index dc0307feb5..f1e0932b07 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -1,6 +1,6 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.1
+ * Version:  7.2
  *
  * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  *
@@ -166,22 +166,75 @@ _mesa_delete_buffer_object( GLcontext *ctx, struct gl_buffer_object *bufObj )
 
    if (bufObj->Data)
       _mesa_free(bufObj->Data);
+
+   /* assign strange values here to help w/ debugging */
+   bufObj->RefCount = -1000;
+   bufObj->Name = ~0;
+
    _mesa_free(bufObj);
 }
 
 
+
+/**
+ * Set ptr to bufObj w/ reference counting.
+ */
 void
-_mesa_unbind_buffer_object( GLcontext *ctx, struct gl_buffer_object *bufObj )
+_mesa_reference_buffer_object(GLcontext *ctx,
+                              struct gl_buffer_object **ptr,
+                              struct gl_buffer_object *bufObj)
 {
-   if (bufObj != ctx->Array.NullBufferObj) {
-      bufObj->RefCount--;
-      if (bufObj->RefCount <= 0) {
+   if (*ptr == bufObj)
+      return;
+
+   if (*ptr) {
+      /* Unreference the old texture */
+      GLboolean deleteFlag = GL_FALSE;
+      struct gl_buffer_object *oldObj = *ptr;
+
+      /*_glthread_LOCK_MUTEX(oldObj->Mutex);*/
+      ASSERT(oldObj->RefCount > 0);
+      oldObj->RefCount--;
+#if 0
+      printf("BufferObj %p %d DECR to %d\n",
+             (void *) oldObj, oldObj->Name, oldObj->RefCount);
+#endif
+      deleteFlag = (oldObj->RefCount == 0);
+      /*_glthread_UNLOCK_MUTEX(oldObj->Mutex);*/
+
+      if (deleteFlag) {
+
+         /* some sanity checking: don't delete a buffer still in use */
 	 ASSERT(ctx->Array.ArrayBufferObj != bufObj);
 	 ASSERT(ctx->Array.ElementArrayBufferObj != bufObj);
 	 ASSERT(ctx->Array.ArrayObj->Vertex.BufferObj != bufObj);
 	 ASSERT(ctx->Driver.DeleteBuffer);
-	 ctx->Driver.DeleteBuffer(ctx, bufObj);
+
+         ctx->Driver.DeleteBuffer(ctx, oldObj);
       }
+
+      *ptr = NULL;
+   }
+   ASSERT(!*ptr);
+
+   if (bufObj) {
+      /* reference new texture */
+      /*_glthread_LOCK_MUTEX(tex->Mutex);*/
+      if (bufObj->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 {
+         bufObj->RefCount++;
+#if 0
+         printf("BufferObj %p %d INCR to %d\n",
+                (void *) bufObj, bufObj->Name, bufObj->RefCount);
+#endif
+         *ptr = bufObj;
+      }
+      /*_glthread_UNLOCK_MUTEX(tex->Mutex);*/
    }
 }
 
@@ -203,33 +256,6 @@ _mesa_initialize_buffer_object( struct gl_buffer_object *obj,
 }
 
 
-/**
- * Add the given buffer object to the buffer object pool.
- */
-void
-_mesa_save_buffer_object( GLcontext *ctx, struct gl_buffer_object *obj )
-{
-   if (obj->Name > 0) {
-      /* insert into hash table */
-      _mesa_HashInsert(ctx->Shared->BufferObjects, obj->Name, obj);
-   }
-}
-
-
-/**
- * Remove the given buffer object from the buffer object pool.
- * Do not deallocate the buffer object though.
- */
-void
-_mesa_remove_buffer_object( GLcontext *ctx, struct gl_buffer_object *bufObj )
-{
-   if (bufObj->Name > 0) {
-      /* remove from hash table */
-      _mesa_HashRemove(ctx->Shared->BufferObjects, bufObj->Name);
-   }
-}
-
-
 /**
  * Allocate space for and store data in a buffer object.  Any data that was
  * previously stored in the buffer object is lost.  If \c data is \c NULL,
@@ -400,6 +426,7 @@ _mesa_init_buffer_objects( GLcontext *ctx )
 {
    /* Allocate the default buffer object and set refcount so high that
     * it never gets deleted.
+    * XXX with recent/improved refcounting this may not longer be needed.
     */
    ctx->Array.NullBufferObj = _mesa_new_buffer_object(ctx, 0, 0);
    if (ctx->Array.NullBufferObj)
@@ -621,6 +648,23 @@ _mesa_lookup_bufferobj(GLcontext *ctx, GLuint buffer)
 }
 
 
+/**
+ * If *ptr points to obj, set ptr = the Null/default buffer object.
+ * This is a helper for buffer object deletion.
+ * The GL spec says that deleting a buffer object causes it to get
+ * unbound from all arrays in the current context.
+ */
+static void
+unbind(GLcontext *ctx,
+       struct gl_buffer_object **ptr,
+       struct gl_buffer_object *obj)
+{
+   if (*ptr == obj) {
+      _mesa_reference_buffer_object(ctx, ptr, ctx->Array.NullBufferObj);
+   }
+}
+
+
 
 /**********************************************************************/
 /* API Functions                                                      */
@@ -678,28 +722,16 @@ _mesa_BindBufferARB(GLenum target, GLuint buffer)
             _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindBufferARB");
             return;
          }
-         _mesa_save_buffer_object(ctx, newBufObj);
+          _mesa_HashInsert(ctx->Shared->BufferObjects, buffer, newBufObj);
       }
    }
    
-   /* Make new binding */
-   *bindTarget = newBufObj;
-   newBufObj->RefCount++;
+   /* bind new buffer */
+   _mesa_reference_buffer_object(ctx, bindTarget, newBufObj);
 
    /* Pass BindBuffer call to device driver */
    if (ctx->Driver.BindBuffer && newBufObj)
       ctx->Driver.BindBuffer( ctx, target, newBufObj );
-
-   /* decr ref count on old buffer obj, delete if needed */
-   if (oldBufObj) {
-      oldBufObj->RefCount--;
-      assert(oldBufObj->RefCount >= 0);
-      if (oldBufObj->RefCount == 0) {
-	 assert(oldBufObj->Name != 0);
-	 ASSERT(ctx->Driver.DeleteBuffer);
-	 ctx->Driver.DeleteBuffer( ctx, oldBufObj );
-      }
-   }
 }
 
 
@@ -731,54 +763,18 @@ _mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids)
 
          ASSERT(bufObj->Name == ids[i]);
 
-         if (ctx->Array.ArrayObj->Vertex.BufferObj == bufObj) {
-            bufObj->RefCount--;
-            ctx->Array.ArrayObj->Vertex.BufferObj = ctx->Array.NullBufferObj;
-            ctx->Array.NullBufferObj->RefCount++;
-         }
-         if (ctx->Array.ArrayObj->Normal.BufferObj == bufObj) {
-            bufObj->RefCount--;
-            ctx->Array.ArrayObj->Normal.BufferObj = ctx->Array.NullBufferObj;
-            ctx->Array.NullBufferObj->RefCount++;
-         }
-         if (ctx->Array.ArrayObj->Color.BufferObj == bufObj) {
-            bufObj->RefCount--;
-            ctx->Array.ArrayObj->Color.BufferObj = ctx->Array.NullBufferObj;
-            ctx->Array.NullBufferObj->RefCount++;
-         }
-         if (ctx->Array.ArrayObj->SecondaryColor.BufferObj == bufObj) {
-            bufObj->RefCount--;
-            ctx->Array.ArrayObj->SecondaryColor.BufferObj = ctx->Array.NullBufferObj;
-            ctx->Array.NullBufferObj->RefCount++;
-         }
-         if (ctx->Array.ArrayObj->FogCoord.BufferObj == bufObj) {
-            bufObj->RefCount--;
-            ctx->Array.ArrayObj->FogCoord.BufferObj = ctx->Array.NullBufferObj;
-            ctx->Array.NullBufferObj->RefCount++;
-         }
-         if (ctx->Array.ArrayObj->Index.BufferObj == bufObj) {
-            bufObj->RefCount--;
-            ctx->Array.ArrayObj->Index.BufferObj = ctx->Array.NullBufferObj;
-            ctx->Array.NullBufferObj->RefCount++;
-         }
-         if (ctx->Array.ArrayObj->EdgeFlag.BufferObj == bufObj) {
-            bufObj->RefCount--;
-            ctx->Array.ArrayObj->EdgeFlag.BufferObj = ctx->Array.NullBufferObj;
-            ctx->Array.NullBufferObj->RefCount++;
-         }
+         unbind(ctx, &ctx->Array.ArrayObj->Vertex.BufferObj, bufObj);
+         unbind(ctx, &ctx->Array.ArrayObj->Normal.BufferObj, bufObj);
+         unbind(ctx, &ctx->Array.ArrayObj->Color.BufferObj, bufObj);
+         unbind(ctx, &ctx->Array.ArrayObj->SecondaryColor.BufferObj, bufObj);
+         unbind(ctx, &ctx->Array.ArrayObj->FogCoord.BufferObj, bufObj);
+         unbind(ctx, &ctx->Array.ArrayObj->Index.BufferObj, bufObj);
+         unbind(ctx, &ctx->Array.ArrayObj->EdgeFlag.BufferObj, bufObj);
          for (j = 0; j < MAX_TEXTURE_UNITS; j++) {
-            if (ctx->Array.ArrayObj->TexCoord[j].BufferObj == bufObj) {
-               bufObj->RefCount--;
-               ctx->Array.ArrayObj->TexCoord[j].BufferObj = ctx->Array.NullBufferObj;
-               ctx->Array.NullBufferObj->RefCount++;
-            }
+            unbind(ctx, &ctx->Array.ArrayObj->TexCoord[j].BufferObj, bufObj);
          }
          for (j = 0; j < VERT_ATTRIB_MAX; j++) {
-            if (ctx->Array.ArrayObj->VertexAttrib[j].BufferObj == bufObj) {
-               bufObj->RefCount--;
-               ctx->Array.ArrayObj->VertexAttrib[j].BufferObj = ctx->Array.NullBufferObj;
-               ctx->Array.NullBufferObj->RefCount++;
-            }
+            unbind(ctx, &ctx->Array.ArrayObj->VertexAttrib[j].BufferObj, bufObj);
          }
 
          if (ctx->Array.ArrayBufferObj == bufObj) {
@@ -796,8 +792,8 @@ _mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids)
          }
 
 	 /* The ID is immediately freed for re-use */
-	 _mesa_remove_buffer_object(ctx, bufObj);
-	 _mesa_unbind_buffer_object(ctx, bufObj);
+         _mesa_HashRemove(ctx->Shared->BufferObjects, bufObj->Name);
+         _mesa_reference_buffer_object(ctx, &bufObj, NULL);
       }
    }
 
@@ -846,7 +842,7 @@ _mesa_GenBuffersARB(GLsizei n, GLuint *buffer)
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "glGenBuffersARB");
          return;
       }
-      _mesa_save_buffer_object(ctx, bufObj);
+      _mesa_HashInsert(ctx->Shared->BufferObjects, first + i, bufObj);
       buffer[i] = first + i;
    }
 
diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h
index 024e5a8c3c..2f908c5c35 100644
--- a/src/mesa/main/bufferobj.h
+++ b/src/mesa/main/bufferobj.h
@@ -1,6 +1,6 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.1
+ * Version:  7.2
  *
  * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  *
@@ -52,10 +52,9 @@ _mesa_initialize_buffer_object( struct gl_buffer_object *obj,
 				GLuint name, GLenum target );
 
 extern void
-_mesa_save_buffer_object( GLcontext *ctx, struct gl_buffer_object *obj );
-
-extern void
-_mesa_remove_buffer_object( GLcontext *ctx, struct gl_buffer_object *bufObj );
+_mesa_reference_buffer_object(GLcontext *ctx,
+                              struct gl_buffer_object **ptr,
+                              struct gl_buffer_object *bufObj);
 
 extern void
 _mesa_buffer_data( GLcontext *ctx, GLenum target, GLsizeiptrARB size,
@@ -115,8 +114,6 @@ _mesa_unmap_readpix_pbo(GLcontext *ctx,
                         const struct gl_pixelstore_attrib *pack);
 
 
-extern void
-_mesa_unbind_buffer_object( GLcontext *ctx, struct gl_buffer_object *bufObj );
 
 /*
  * API functions
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index a6aa9c34b2..9f1fcd9d26 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.5.1
+ * Version:  7.2
  *
- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -62,14 +62,9 @@ update_array(GLcontext *ctx, struct gl_client_array *array,
    array->Normalized = normalized;
    array->Ptr = (const GLubyte *) ptr;
 #if FEATURE_ARB_vertex_buffer_object
-   array->BufferObj->RefCount--;
-   if (array->BufferObj->RefCount <= 0) {
-      ASSERT(array->BufferObj->Name);
-      _mesa_remove_buffer_object( ctx, array->BufferObj );
-      (*ctx->Driver.DeleteBuffer)( ctx, array->BufferObj );
-   }
-   array->BufferObj = ctx->Array.ArrayBufferObj;
-   array->BufferObj->RefCount++;
+   _mesa_reference_buffer_object(ctx, &array->BufferObj,
+                                 ctx->Array.ArrayBufferObj);
+
    /* Compute the index of the last array element that's inside the buffer.
     * Later in glDrawArrays we'll check if start + count > _MaxElement to
     * be sure we won't go out of bounds.
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c
index 579bbeb4f3..d70b4bb1a1 100644
--- a/src/mesa/vbo/vbo_exec_api.c
+++ b/src/mesa/vbo/vbo_exec_api.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 
-Copyright 2002 Tungsten Graphics Inc., Cedar Park, Texas.
+Copyright 2002-2008 Tungsten Graphics Inc., Cedar Park, Texas.
 
 All Rights Reserved.
 
@@ -31,6 +31,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
 #include "main/glheader.h"
+#include "main/bufferobj.h"
 #include "main/context.h"
 #include "main/macros.h"
 #include "main/vtxfmt.h"
@@ -695,7 +696,10 @@ void vbo_exec_vtx_init( struct vbo_exec_context *exec )
     * continuously, unless vbo_use_buffer_objects() is called to enable
     * use of real VBOs.
     */
-   exec->vtx.bufferobj = ctx->Array.NullBufferObj;
+   _mesa_reference_buffer_object(ctx,
+                                 &exec->vtx.bufferobj,
+                                 ctx->Array.NullBufferObj);
+
    exec->vtx.buffer_map = ALIGN_MALLOC(VBO_VERT_BUFFER_SIZE * sizeof(GLfloat), 64);
 
    vbo_exec_vtxfmt_init( exec );
diff --git a/src/mesa/vbo/vbo_exec_draw.c b/src/mesa/vbo/vbo_exec_draw.c
index 3609a7452a..f497e9a5a5 100644
--- a/src/mesa/vbo/vbo_exec_draw.c
+++ b/src/mesa/vbo/vbo_exec_draw.c
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  5.1
+ * Version:  7.2
  *
- * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -26,6 +26,7 @@
  */
 
 #include "main/glheader.h"
+#include "main/bufferobj.h"
 #include "main/context.h"
 #include "main/enums.h"
 #include "main/state.h"
@@ -155,8 +156,12 @@ static void vbo_exec_bind_arrays( GLcontext *ctx )
     */
    switch (get_program_mode(exec->ctx)) {
    case VP_NONE:
-      memcpy(arrays,      vbo->legacy_currval, 16 * sizeof(arrays[0]));
-      memcpy(arrays + 16, vbo->mat_currval,    MAT_ATTRIB_MAX * sizeof(arrays[0]));
+      for (attr = 0; attr < 16; attr++) {
+         exec->vtx.inputs[attr] = &vbo->legacy_currval[attr];
+      }
+      for (attr = 0; attr < MAT_ATTRIB_MAX; attr++) {
+         exec->vtx.inputs[attr + 16] = &vbo->mat_currval[attr];
+      }
       map = vbo->map_vp_none;
       break;
    case VP_NV:
@@ -165,8 +170,10 @@ static void vbo_exec_bind_arrays( GLcontext *ctx )
        * occurred.  NV vertex programs cannot access material values,
        * nor attributes greater than VERT_ATTRIB_TEX7.  
        */
-      memcpy(arrays,      vbo->legacy_currval,  16 * sizeof(arrays[0]));
-      memcpy(arrays + 16, vbo->generic_currval, 16 * sizeof(arrays[0]));
+      for (attr = 0; attr < 16; attr++) {
+         exec->vtx.inputs[attr] = &vbo->legacy_currval[attr];
+         exec->vtx.inputs[attr + 16] = &vbo->generic_currval[attr];
+      }
       map = vbo->map_vp_arb;
       break;
    }
@@ -178,6 +185,9 @@ static void vbo_exec_bind_arrays( GLcontext *ctx )
       const GLuint src = map[attr];
 
       if (exec->vtx.attrsz[src]) {
+         /* override the default array set above */
+         exec->vtx.inputs[attr] = &arrays[attr];
+
          if (exec->vtx.bufferobj->Name) {
             /* a real buffer obj: Ptr is an offset, not a pointer*/
             int offset;
@@ -195,7 +205,9 @@ static void vbo_exec_bind_arrays( GLcontext *ctx )
 	 arrays[attr].Stride = exec->vtx.vertex_size * sizeof(GLfloat);
 	 arrays[attr].Type = GL_FLOAT;
 	 arrays[attr].Enabled = 1;
-	 arrays[attr].BufferObj = exec->vtx.bufferobj;
+         _mesa_reference_buffer_object(ctx,
+                                       &arrays[attr].BufferObj,
+                                       exec->vtx.bufferobj);
 	 arrays[attr]._MaxElement = count; /* ??? */
 
 	 data += exec->vtx.attrsz[src] * sizeof(GLfloat);
diff --git a/src/mesa/vbo/vbo_save.c b/src/mesa/vbo/vbo_save.c
index 8dd87141c0..9757c3d9f6 100644
--- a/src/mesa/vbo/vbo_save.c
+++ b/src/mesa/vbo/vbo_save.c
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.3
+ * Version:  7.2
  *
- * Copyright (C) 1999-2005  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -27,6 +27,7 @@
 
 
 #include "main/mtypes.h"
+#include "main/bufferobj.h"
 #include "main/dlist.h"
 #include "main/vtxfmt.h"
 #include "main/imports.h"
@@ -71,19 +72,24 @@ void vbo_save_destroy( GLcontext *ctx )
 {
    struct vbo_context *vbo = vbo_context(ctx);
    struct vbo_save_context *save = &vbo->save;
+   GLuint i;
+
    if (save->prim_store) {
       if ( --save->prim_store->refcount == 0 ) {
          FREE( save->prim_store );
          save->prim_store = NULL;
       }
       if ( --save->vertex_store->refcount == 0 ) {
-         if (save->vertex_store->bufferobj)
-            ctx->Driver.DeleteBuffer( ctx, save->vertex_store->bufferobj );
-
+         _mesa_reference_buffer_object(ctx,
+                                       &save->vertex_store->bufferobj, NULL);
          FREE( save->vertex_store );
          save->vertex_store = NULL;
       }
    }
+
+   for (i = 0; i < VBO_ATTRIB_MAX; i++) {
+      _mesa_reference_buffer_object(ctx, &save->arrays[i].BufferObj, NULL);
+   }
 }
 
 
diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c
index f62be5c14c..88d573f128 100644
--- a/src/mesa/vbo/vbo_save_api.c
+++ b/src/mesa/vbo/vbo_save_api.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 
-Copyright 2002 Tungsten Graphics Inc., Cedar Park, Texas.
+Copyright 2002-2008 Tungsten Graphics Inc., Cedar Park, Texas.
 
 All Rights Reserved.
 
@@ -68,6 +68,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
 #include "main/glheader.h"
+#include "main/bufferobj.h"
 #include "main/context.h"
 #include "main/dlist.h"
 #include "main/enums.h"
@@ -85,6 +86,10 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #endif
 
 
+/* An interesting VBO number/name to help with debugging */
+#define VBO_BUF_ID  12345
+
+
 /*
  * NOTE: Old 'parity' issue is gone, but copying can still be
  * wrong-footed on replay.
@@ -170,7 +175,9 @@ static struct vbo_save_vertex_store *alloc_vertex_store( GLcontext *ctx )
     * user.  Perhaps there could be a special number for internal
     * buffers:
     */
-   vertex_store->bufferobj = ctx->Driver.NewBufferObject(ctx, 1, GL_ARRAY_BUFFER_ARB);
+   vertex_store->bufferobj = ctx->Driver.NewBufferObject(ctx,
+                                                         VBO_BUF_ID,
+                                                         GL_ARRAY_BUFFER_ARB);
 
    ctx->Driver.BufferData( ctx, 
 			   GL_ARRAY_BUFFER_ARB, 
@@ -190,8 +197,9 @@ static void free_vertex_store( GLcontext *ctx, struct vbo_save_vertex_store *ver
 {
    assert(!vertex_store->buffer);
 
-   if (vertex_store->bufferobj)
-      ctx->Driver.DeleteBuffer( ctx, vertex_store->bufferobj );
+   if (vertex_store->bufferobj) {
+      _mesa_reference_buffer_object(ctx, &vertex_store->bufferobj, NULL);
+   }
 
    FREE( vertex_store );
 }
@@ -1139,6 +1147,7 @@ void vbo_save_api_init( struct vbo_save_context *save )
    _save_vtxfmt_init( ctx );
    _save_current_init( ctx );
 
+   /* These will actually get set again when binding/drawing */
    for (i = 0; i < VBO_ATTRIB_MAX; i++)
       save->inputs[i] = &save->arrays[i];
 
diff --git a/src/mesa/vbo/vbo_save_draw.c b/src/mesa/vbo/vbo_save_draw.c
index bf5c6d4eef..ed82f09958 100644
--- a/src/mesa/vbo/vbo_save_draw.c
+++ b/src/mesa/vbo/vbo_save_draw.c
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.1
+ * Version:  7.2
  *
- * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -27,6 +27,7 @@
  */
 
 #include "main/glheader.h"
+#include "main/bufferobj.h"
 #include "main/context.h"
 #include "main/imports.h"
 #include "main/mtypes.h"
@@ -115,8 +116,12 @@ static void vbo_bind_vertex_list( GLcontext *ctx,
     */
    switch (get_program_mode(ctx)) {
    case VP_NONE:
-      memcpy(arrays,      vbo->legacy_currval, 16 * sizeof(arrays[0]));
-      memcpy(arrays + 16, vbo->mat_currval,    MAT_ATTRIB_MAX * sizeof(arrays[0]));
+      for (attr = 0; attr < 16; attr++) {
+         save->inputs[attr] = &vbo->legacy_currval[attr];
+      }
+      for (attr = 0; attr < MAT_ATTRIB_MAX; attr++) {
+         save->inputs[attr + 16] = &vbo->mat_currval[attr];
+      }
       map = vbo->map_vp_none;
       break;
    case VP_NV:
@@ -125,8 +130,10 @@ static void vbo_bind_vertex_list( GLcontext *ctx,
        * occurred.  NV vertex programs cannot access material values,
        * nor attributes greater than VERT_ATTRIB_TEX7.  
        */
-      memcpy(arrays,      vbo->legacy_currval,  16 * sizeof(arrays[0]));
-      memcpy(arrays + 16, vbo->generic_currval, 16 * sizeof(arrays[0]));
+      for (attr = 0; attr < 16; attr++) {
+         save->inputs[attr] = &vbo->legacy_currval[attr];
+         save->inputs[attr + 16] = &vbo->generic_currval[attr];
+      }
       map = vbo->map_vp_arb;
       break;
    }
@@ -135,13 +142,18 @@ static void vbo_bind_vertex_list( GLcontext *ctx,
       GLuint src = map[attr];
 
       if (node->attrsz[src]) {
-	 arrays[attr].Ptr = (const GLubyte *)data;
+         /* override the default array set above */
+         save->inputs[attr] = &arrays[attr];
+
+	 arrays[attr].Ptr = (const GLubyte *) data;
 	 arrays[attr].Size = node->attrsz[src];
 	 arrays[attr].StrideB = node->vertex_size * sizeof(GLfloat);
 	 arrays[attr].Stride = node->vertex_size * sizeof(GLfloat);
 	 arrays[attr].Type = GL_FLOAT;
 	 arrays[attr].Enabled = 1;
-	 arrays[attr].BufferObj = node->vertex_store->bufferobj;
+         _mesa_reference_buffer_object(ctx,
+                                       &arrays[attr].BufferObj,
+                                       node->vertex_store->bufferobj);
 	 arrays[attr]._MaxElement = node->count; /* ??? */
 	 
 	 assert(arrays[attr].BufferObj->Name);
-- 
cgit v1.2.3


From 0f6e76d7f1f46b76ae19b089596ba6770c31dc5a Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 5 Sep 2008 08:07:20 -0600
Subject: mesa: replace MALLOC w/ CALLOC to fix memory error in
 glPushClientAttrib()

---
 src/mesa/main/attrib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 4cbb0273ab..7179fba3db 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -1325,7 +1325,7 @@ _mesa_PushClientAttrib(GLbitfield mask)
       newnode->next = head;
       head = newnode;
       /* unpacking attribs */
-      attr = MALLOC_STRUCT( gl_pixelstore_attrib );
+      attr = CALLOC_STRUCT( gl_pixelstore_attrib );
       copy_pixelstore(ctx, attr, &ctx->Unpack);
       newnode = new_attrib_node( GL_CLIENT_UNPACK_BIT );
       newnode->data = attr;
-- 
cgit v1.2.3


From b6458225039ef4cf5c91080e7547ed73fb264c46 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Thu, 11 Sep 2008 16:36:41 +0100
Subject: mesa: fix srcRowStride vs srcRowBytes conflict

---
 src/mesa/main/mipmap.c | 90 +++++++++++++++++++++++++-------------------------
 1 file changed, 45 insertions(+), 45 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index 1032e9bb72..d35fa6734c 100644
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -452,9 +452,9 @@ make_1d_mipmap(GLenum datatype, GLuint comps, GLint border,
 static void
 make_2d_mipmap(GLenum datatype, GLuint comps, GLint border,
                GLint srcWidth, GLint srcHeight,
-               GLint srcRowStride, const GLubyte *srcPtr,
+               GLint srcRowBytes, const GLubyte *srcPtr,
                GLint dstWidth, GLint dstHeight,
-               GLint dstRowStride, GLubyte *dstPtr)
+               GLint dstRowBytes, GLubyte *dstPtr)
 {
    const GLint bpt = bytes_per_pixel(datatype, comps);
    const GLint srcWidthNB = srcWidth - 2 * border;  /* sizes w/out border */
@@ -464,11 +464,11 @@ make_2d_mipmap(GLenum datatype, GLuint comps, GLint border,
    GLubyte *dst;
    GLint row;
 
-   if (!srcRowStride)
-      srcRowStride = bpt * srcWidth;
+   if (!srcRowBytes)
+      srcRowBytes = bpt * srcWidth;
 
-   if (!dstRowStride)
-      dstRowStride = bpt * dstWidth;
+   if (!dstRowBytes)
+      dstRowBytes = bpt * dstWidth;
 
    /* Compute src and dst pointers, skipping any border */
    srcA = srcPtr + border * ((srcWidth + 1) * bpt);
@@ -541,10 +541,10 @@ make_2d_mipmap(GLenum datatype, GLuint comps, GLint border,
 static void
 make_3d_mipmap(GLenum datatype, GLuint comps, GLint border,
                GLint srcWidth, GLint srcHeight, GLint srcDepth,
-               GLint srcRowStride,
+               GLint srcRowBytes,
                const GLubyte *srcPtr,
                GLint dstWidth, GLint dstHeight, GLint dstDepth,
-               GLint dstRowStride,
+               GLint dstRowBytes,
                GLubyte *dstPtr)
 {
    const GLint bpt = bytes_per_pixel(datatype, comps);
@@ -573,10 +573,10 @@ make_3d_mipmap(GLenum datatype, GLuint comps, GLint border,
    bytesPerSrcImage = srcWidth * srcHeight * bpt;
    bytesPerDstImage = dstWidth * dstHeight * bpt;
 
-   if (!srcRowStride)
-      srcRowStride = srcWidth * bpt;
-   if (!dstRowStride)
-      dstRowStride = dstWidth * bpt;
+   if (!srcRowBytes)
+      srcRowBytes = srcWidth * bpt;
+   if (!dstRowBytes)
+      dstRowBytes = dstWidth * bpt;
 
    /* Offset between adjacent src images to be averaged together */
    srcImageOffset = (srcDepth == dstDepth) ? 0 : bytesPerSrcImage;
@@ -600,13 +600,13 @@ make_3d_mipmap(GLenum datatype, GLuint comps, GLint border,
    for (img = 0; img < dstDepthNB; img++) {
       /* first source image pointer, skipping border */
       const GLubyte *imgSrcA = srcPtr
-         + (bytesPerSrcImage + srcRowStride + border) * bpt * border
+         + (bytesPerSrcImage + srcRowBytes + border) * bpt * border
          + img * (bytesPerSrcImage + srcImageOffset);
       /* second source image pointer, skipping border */
       const GLubyte *imgSrcB = imgSrcA + srcImageOffset;
       /* address of the dest image, skipping border */
       GLubyte *imgDst = dstPtr
-         + (bytesPerDstImage + dstRowStride + border) * bpt * border
+         + (bytesPerDstImage + dstRowBytes + border) * bpt * border
          + img * bytesPerDstImage;
 
       /* setup the four source row pointers and the dest row pointer */
@@ -627,11 +627,11 @@ make_3d_mipmap(GLenum datatype, GLuint comps, GLint border,
          do_row(datatype, comps, srcWidthNB, tmpRowA, tmpRowB,
                 dstWidthNB, dstImgRow);
          /* advance to next rows */
-         srcImgARowA += srcRowStride + srcRowOffset;
-         srcImgARowB += srcRowStride + srcRowOffset;
-         srcImgBRowA += srcRowStride + srcRowOffset;
-         srcImgBRowB += srcRowStride + srcRowOffset;
-         dstImgRow += dstRowStride;
+         srcImgARowA += srcRowBytes + srcRowOffset;
+         srcImgARowB += srcRowBytes + srcRowOffset;
+         srcImgBRowA += srcRowBytes + srcRowOffset;
+         srcImgBRowB += srcRowBytes + srcRowOffset;
+         dstImgRow += dstRowBytes;
       }
    }
 
@@ -664,9 +664,9 @@ make_3d_mipmap(GLenum datatype, GLuint comps, GLint border,
 
             /* do border along [img][row=dstHeight-1][col=0] */
             src = srcPtr + (img * 2 + 1) * bytesPerSrcImage
-                         + (srcHeight - 1) * srcRowStride;
+                         + (srcHeight - 1) * srcRowBytes;
             dst = dstPtr + (img + 1) * bytesPerDstImage
-                         + (dstHeight - 1) * dstRowStride;
+                         + (dstHeight - 1) * dstRowBytes;
             MEMCPY(dst, src, bpt);
 
             /* do border along [img][row=0][col=dstWidth-1] */
@@ -698,9 +698,9 @@ make_3d_mipmap(GLenum datatype, GLuint comps, GLint border,
 
             /* do border along [img][row=dstHeight-1][col=0] */
             src = srcPtr + (img * 2 + 1) * bytesPerSrcImage
-                         + (srcHeight - 1) * srcRowStride;
+                         + (srcHeight - 1) * srcRowBytes;
             dst = dstPtr + (img + 1) * bytesPerDstImage
-                         + (dstHeight - 1) * dstRowStride;
+                         + (dstHeight - 1) * dstRowBytes;
             do_row(datatype, comps, 1, src, src + srcImageOffset, 1, dst);
 
             /* do border along [img][row=0][col=dstWidth-1] */
@@ -731,8 +731,8 @@ make_1d_stack_mipmap(GLenum datatype, GLuint comps, GLint border,
    const GLint srcWidthNB = srcWidth - 2 * border;  /* sizes w/out border */
    const GLint dstWidthNB = dstWidth - 2 * border;
    const GLint dstHeightNB = dstHeight - 2 * border;
-   const GLint srcRowBytes = bpt * srcRowStride;
-   const GLint dstRowBytes = bpt * dstRowStride;
+   const GLint srcRowBytes = bpt * srcRowBytes;
+   const GLint dstRowBytes = bpt * dstRowBytes;
    const GLubyte *src;
    GLubyte *dst;
    GLint row;
@@ -767,10 +767,10 @@ make_1d_stack_mipmap(GLenum datatype, GLuint comps, GLint border,
 static void
 make_2d_stack_mipmap(GLenum datatype, GLuint comps, GLint border,
                      GLint srcWidth, GLint srcHeight,
-                     GLint srcRowStride,
+                     GLint srcRowBytes,
                      const GLubyte *srcPtr,
                      GLint dstWidth, GLint dstHeight, GLint dstDepth,
-                     GLint dstRowStride,
+                     GLint dstRowBytes,
                      GLubyte *dstPtr)
 {
    const GLint bpt = bytes_per_pixel(datatype, comps);
@@ -783,11 +783,11 @@ make_2d_stack_mipmap(GLenum datatype, GLuint comps, GLint border,
    GLint layer;
    GLint row;
 
-   if (!srcRowStride)
-      srcRowStride = bpt * srcWidth;
+   if (!srcRowBytes)
+      srcRowBytes = bpt * srcWidth;
 
-   if (!dstRowStride)
-      dstRowStride = bpt * dstWidth;
+   if (!dstRowBytes)
+      dstRowBytes = bpt * dstWidth;
 
    /* Compute src and dst pointers, skipping any border */
    srcA = srcPtr + border * ((srcWidth + 1) * bpt);
@@ -867,10 +867,10 @@ _mesa_generate_mipmap_level(GLenum target,
                             GLenum datatype, GLuint comps,
                             GLint border,
                             GLint srcWidth, GLint srcHeight, GLint srcDepth,
-                            GLint srcRowStride,
+                            GLint srcRowBytes,
                             const GLubyte *srcData,
                             GLint dstWidth, GLint dstHeight, GLint dstDepth,
-                            GLint dstRowStride,
+                            GLint dstRowBytes,
                             GLubyte *dstData)
 {
    switch (target) {
@@ -887,13 +887,13 @@ _mesa_generate_mipmap_level(GLenum target,
    case GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB:
    case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB:
       make_2d_mipmap(datatype, comps, border,
-                     srcWidth, srcHeight, srcRowStride, srcData,
-                     dstWidth, dstHeight, dstRowStride, dstData);
+                     srcWidth, srcHeight, srcRowBytes, srcData,
+                     dstWidth, dstHeight, dstRowBytes, dstData);
       break;
    case GL_TEXTURE_3D:
       make_3d_mipmap(datatype, comps, border,
-                     srcWidth, srcHeight, srcDepth, srcRowStride, srcData,
-                     dstWidth, dstHeight, dstDepth, dstRowStride, dstData);
+                     srcWidth, srcHeight, srcDepth, srcRowBytes, srcData,
+                     dstWidth, dstHeight, dstDepth, dstRowBytes, dstData);
       break;
    case GL_TEXTURE_1D_ARRAY_EXT:
       make_1d_stack_mipmap(datatype, comps, border,
@@ -902,8 +902,8 @@ _mesa_generate_mipmap_level(GLenum target,
       break;
    case GL_TEXTURE_2D_ARRAY_EXT:
       make_2d_stack_mipmap(datatype, comps, border,
-                           srcWidth, srcHeight, srcRowStride, srcData,
-                           dstWidth, dstHeight, dstDepth, dstRowStride, dstData);
+                           srcWidth, srcHeight, srcRowBytes, srcData,
+                           dstWidth, dstHeight, dstDepth, dstRowBytes, dstData);
       break;
    case GL_TEXTURE_RECTANGLE_NV:
       /* no mipmaps, do nothing */
@@ -1140,14 +1140,14 @@ _mesa_generate_mipmap(GLcontext *ctx, GLenum target,
          GLubyte *temp;
          /* compress image from dstData into dstImage->Data */
          const GLenum srcFormat = convertFormat->BaseFormat;
-         GLint dstRowStride
+         GLint dstRowBytes
             = _mesa_compressed_row_stride(dstImage->TexFormat->MesaFormat, dstWidth);
          ASSERT(srcFormat == GL_RGB || srcFormat == GL_RGBA);
          dstImage->TexFormat->StoreImage(ctx, 2, dstImage->_BaseFormat,
                                          dstImage->TexFormat,
                                          dstImage->Data,
                                          0, 0, 0, /* dstX/Y/Zoffset */
-                                         dstRowStride, 0, /* strides */
+                                         dstRowBytes, 0, /* strides */
                                          dstWidth, dstHeight, 1, /* size */
                                          srcFormat, CHAN_TYPE,
                                          dstData, /* src data, actually */
@@ -1172,7 +1172,7 @@ _mesa_generate_mipmap(GLcontext *ctx, GLenum target,
 void
 _mesa_rescale_teximage2d(GLuint bytesPerPixel,
 			 GLuint srcStrideInPixels,
-			 GLuint dstRowStride,
+			 GLuint dstRowBytes,
 			 GLint srcWidth, GLint srcHeight,
 			 GLint dstWidth, GLint dstHeight,
 			 const GLvoid *srcImage, GLvoid *dstImage)
@@ -1186,7 +1186,7 @@ _mesa_rescale_teximage2d(GLuint bytesPerPixel,
 	 GLint srcCol = col WOP wScale;					\
 	 dst[col] = src[srcRow * srcStrideInPixels + srcCol];		\
       }									\
-      dst = (TYPE *) ((GLubyte *) dst + dstRowStride);			\
+      dst = (TYPE *) ((GLubyte *) dst + dstRowBytes);			\
    }									\
 
 #define RESCALE_IMAGE( TYPE )						\
@@ -1244,7 +1244,7 @@ do {									\
 void
 _mesa_upscale_teximage2d(GLsizei inWidth, GLsizei inHeight,
                          GLsizei outWidth, GLsizei outHeight,
-                         GLint comps, const GLchan *src, GLint srcRowStride,
+                         GLint comps, const GLchan *src, GLint srcRowBytes,
                          GLchan *dest )
 {
    GLint i, j, k;
@@ -1263,7 +1263,7 @@ _mesa_upscale_teximage2d(GLsizei inWidth, GLsizei inHeight,
          const GLint jj = j % inWidth;
          for (k = 0; k < comps; k++) {
             dest[(i * outWidth + j) * comps + k]
-               = src[ii * srcRowStride + jj * comps + k];
+               = src[ii * srcRowBytes + jj * comps + k];
          }
       }
    }
-- 
cgit v1.2.3


From 7ee599d30b9538b41bc082e71f9e800acbf09759 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Thu, 11 Sep 2008 20:08:07 +0100
Subject: mesa: update PointParameter usage

---
 src/mesa/main/attrib.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 1a2c34b710..32d86ce149 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -1109,9 +1109,9 @@ _mesa_PopAttrib(void)
                   }
                   _mesa_set_enable(ctx, GL_POINT_SPRITE_NV,point->PointSprite);
                   if (ctx->Extensions.NV_point_sprite)
-                     _mesa_PointParameteriNV(GL_POINT_SPRITE_R_MODE_NV,
+                     _mesa_PointParameteri(GL_POINT_SPRITE_R_MODE_NV,
                                           ctx->Point.SpriteRMode);
-                  _mesa_PointParameterfEXT(GL_POINT_SPRITE_COORD_ORIGIN,
+                  _mesa_PointParameterf(GL_POINT_SPRITE_COORD_ORIGIN,
                                            (GLfloat)ctx->Point.SpriteOrigin);
                }
             }
-- 
cgit v1.2.3


From af74abab6b9a1e32a1cc5cac7e547b953dcee0ab Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Fri, 12 Sep 2008 10:04:56 +0100
Subject: mesa: get fixed-function program generation working again

---
 src/mesa/main/state.c         | 62 +++++++++++++++++++++++++++++--------------
 src/mesa/main/texenvprogram.c |  3 +++
 2 files changed, 45 insertions(+), 20 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 5827f2211c..e340cd6686 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -219,23 +219,6 @@ update_program(GLcontext *ctx)
                                shProg->FragmentProgram);
    }
    else {
-      if (ctx->VertexProgram._Enabled) {
-         /* use user-defined vertex program */
-         _mesa_reference_vertprog(ctx, &ctx->VertexProgram._Current,
-                                  ctx->VertexProgram.Current);
-      }
-      else if (ctx->VertexProgram._MaintainTnlProgram) {
-         /* Use vertex program generated from fixed-function state.
-          * The _Current pointer will get set in
-          * _tnl_UpdateFixedFunctionProgram() later if appropriate.
-          */
-         _mesa_reference_vertprog(ctx, &ctx->VertexProgram._Current, NULL);
-      }
-      else {
-         /* no vertex program */
-         _mesa_reference_vertprog(ctx, &ctx->VertexProgram._Current, NULL);
-      }
-
       if (ctx->FragmentProgram._Enabled) {
          /* use user-defined vertex program */
          _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current,
@@ -243,15 +226,38 @@ update_program(GLcontext *ctx)
       }
       else if (ctx->FragmentProgram._MaintainTexEnvProgram) {
          /* Use fragment program generated from fixed-function state.
-          * The _Current pointer will get set in _mesa_UpdateTexEnvProgram()
-          * later if appropriate.
           */
-         _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current, NULL);
+         _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current,
+                                  _mesa_get_fixed_func_fragment_program(ctx));
+         _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._TexEnvProgram,
+                                  ctx->FragmentProgram._Current);
       }
       else {
          /* no fragment program */
          _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current, NULL);
       }
+
+      /* Examine vertex program after fragment program as
+       * _mesa_get_fixed_func_vertex_program() needs to know active
+       * fragprog inputs.
+       */
+      if (ctx->VertexProgram._Enabled) {
+         /* use user-defined vertex program */
+         _mesa_reference_vertprog(ctx, &ctx->VertexProgram._Current,
+                                  ctx->VertexProgram.Current);
+      }
+      else if (ctx->VertexProgram._MaintainTnlProgram) {
+         /* Use vertex program generated from fixed-function state.
+          */
+         _mesa_reference_vertprog(ctx, &ctx->VertexProgram._Current,
+                                  _mesa_get_fixed_func_vertex_program(ctx));
+         _mesa_reference_vertprog(ctx, &ctx->VertexProgram._TnlProgram,
+                                  ctx->VertexProgram._Current);
+      }
+      else {
+         /* no vertex program */
+         _mesa_reference_vertprog(ctx, &ctx->VertexProgram._Current, NULL);
+      }
    }
 
    if (ctx->VertexProgram._Current)
@@ -260,12 +266,28 @@ update_program(GLcontext *ctx)
       assert(ctx->FragmentProgram._Current->Base.Parameters);
 
 
+   /* XXX: get rid of _Active flag.
+    */
+#if 1
    ctx->FragmentProgram._Active = ctx->FragmentProgram._Enabled;
    if (ctx->FragmentProgram._MaintainTexEnvProgram &&
        !ctx->FragmentProgram._Enabled) {
       if (ctx->FragmentProgram._UseTexEnvProgram)
 	 ctx->FragmentProgram._Active = GL_TRUE;
    }
+#endif
+
+   /* Let the driver know what's happening:
+    */
+   if (ctx->FragmentProgram._Current != prevFP && ctx->Driver.BindProgram) {
+      ctx->Driver.BindProgram(ctx, GL_FRAGMENT_PROGRAM_ARB,
+                              (struct gl_program *) ctx->FragmentProgram._Current);
+   }
+   
+   if (ctx->VertexProgram._Current != prevVP && ctx->Driver.BindProgram) {
+      ctx->Driver.BindProgram(ctx, GL_VERTEX_PROGRAM_ARB,
+                              (struct gl_program *) ctx->VertexProgram._Current);
+   }
 }
 
 
diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 713ff3d256..25e280bc3f 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -1190,6 +1190,9 @@ _mesa_get_fixed_func_fragment_program(GLcontext *ctx)
  * If _MaintainTexEnvProgram is set we'll generate a fragment program that
  * implements the current texture env/combine mode.
  * This function generates that program and puts it into effect.
+ *
+ * XXX: remove this function.  currently only called by some drivers,
+ * not by mesa core.  We now handle this properly from inside mesa.
  */
 void
 _mesa_UpdateTexEnvProgram( GLcontext *ctx )
-- 
cgit v1.2.3


From cd23c5c5998f3c48153a22bed53986b4293f797a Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Mon, 15 Sep 2008 13:47:25 +0100
Subject: mesa: get another class of degenerate dlists working

Primitive begin in one dlist, end in another.
---
 src/mesa/main/dlist.c       |  7 +++++--
 src/mesa/vbo/vbo_save_api.c | 24 ++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index b4ed300b2e..ffe6dbfe08 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -6737,6 +6737,11 @@ _mesa_EndList(void)
       _mesa_error(ctx, GL_INVALID_OPERATION, "glEndList");
       return;
    }
+   
+   /* Call before emitting END_OF_LIST, in case the driver wants to
+    * emit opcodes itself.
+    */
+   ctx->Driver.EndList(ctx);
 
    (void) ALLOC_INSTRUCTION(ctx, OPCODE_END_OF_LIST, 0);
 
@@ -6750,8 +6755,6 @@ _mesa_EndList(void)
    if (MESA_VERBOSE & VERBOSE_DISPLAY_LIST)
       mesa_print_display_list(ctx->ListState.CurrentListNum);
 
-   ctx->Driver.EndList(ctx);
-
    ctx->ListState.CurrentList = NULL;
    ctx->ListState.CurrentListNum = 0;
    ctx->ListState.CurrentListPtr = NULL;
diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c
index 88d573f128..f93ef3a02a 100644
--- a/src/mesa/vbo/vbo_save_api.c
+++ b/src/mesa/vbo/vbo_save_api.c
@@ -1045,6 +1045,30 @@ void vbo_save_NewList( GLcontext *ctx, GLuint list, GLenum mode )
 void vbo_save_EndList( GLcontext *ctx )
 {
    struct vbo_save_context *save = &vbo_context(ctx)->save;
+
+   /* EndList called inside a (saved) Begin/End pair?
+    */
+   if (ctx->Driver.CurrentSavePrimitive != PRIM_OUTSIDE_BEGIN_END) {
+      GLint i = save->prim_count - 1;
+
+      ctx->Driver.CurrentSavePrimitive = PRIM_OUTSIDE_BEGIN_END;
+      save->prim[i].end = 0;
+      save->prim[i].count = (save->vert_count - 
+                             save->prim[i].start);
+
+      /* Make sure this vertex list gets replayed by the "loopback"
+       * mechanism:
+       */
+      save->dangling_attr_ref = 1;
+      vbo_save_SaveFlushVertices( ctx );
+
+      /* Swap out this vertex format while outside begin/end.  Any color,
+       * etc. received between here and the next begin will be compiled
+       * as opcodes.
+       */   
+      _mesa_install_save_vtxfmt( ctx, &ctx->ListState.ListVtxfmt );
+   }
+
    unmap_vertex_store( ctx, save->vertex_store );
 
    assert(save->vertex_size == 0);
-- 
cgit v1.2.3


From 987c4b35b8f552a88e1b6459adaabbf544d6bbf6 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 15 Sep 2008 09:07:32 -0600
Subject: mesa: remove some assertions that are invalid during context
 tear-down

---
 src/mesa/main/bufferobj.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index f1e0932b07..ecdb4d219c 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -205,11 +205,14 @@ _mesa_reference_buffer_object(GLcontext *ctx,
       if (deleteFlag) {
 
          /* some sanity checking: don't delete a buffer still in use */
+#if 0
+         /* unfortunately, these tests are invalid during context tear-down */
 	 ASSERT(ctx->Array.ArrayBufferObj != bufObj);
 	 ASSERT(ctx->Array.ElementArrayBufferObj != bufObj);
 	 ASSERT(ctx->Array.ArrayObj->Vertex.BufferObj != bufObj);
-	 ASSERT(ctx->Driver.DeleteBuffer);
+#endif
 
+	 ASSERT(ctx->Driver.DeleteBuffer);
          ctx->Driver.DeleteBuffer(ctx, oldObj);
       }
 
-- 
cgit v1.2.3


From b1f5fbe1cb937bc639cc335acfcfb8c09dfeb3ec Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 15 Sep 2008 17:10:04 -0600
Subject: mesa: fix MSAA enable state in update_multisample()

---
 src/mesa/main/state.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 344af91e17..d355f78a0e 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -295,10 +295,10 @@ static void
 update_multisample(GLcontext *ctx)
 {
    ctx->Multisample._Enabled = GL_FALSE;
-   if (ctx->DrawBuffer) {
-      if (ctx->DrawBuffer->Visual.sampleBuffers)
-         ctx->Multisample._Enabled = GL_TRUE;
-   }
+   if (ctx->Multisample.Enabled &&
+       ctx->DrawBuffer &&
+       ctx->DrawBuffer->Visual.sampleBuffers)
+      ctx->Multisample._Enabled = GL_TRUE;
 }
 
 
-- 
cgit v1.2.3


From e53296c928d80c6627a9551345c160533aa1a19e Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Tue, 16 Sep 2008 15:50:44 -0600
Subject: mesa: rework GLSL vertex attribute binding

Calls to glBindAttribLocation() should not take effect until the next time
that glLinkProgram() is called.
gl_shader_program::Attributes now just contains user-defined bindings.
gl_shader_program::VertexProgram->Attributes contains the actual/final bindings.
---
 src/mesa/main/mtypes.h             |   4 +-
 src/mesa/shader/shader_api.c       |  62 +++++++++--------
 src/mesa/shader/slang/slang_link.c | 139 +++++++++++++++++++------------------
 src/mesa/shader/slang/slang_link.h |   8 +--
 4 files changed, 110 insertions(+), 103 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 71a4ca55bc..2fc169493b 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2143,12 +2143,14 @@ struct gl_shader_program
    GLuint NumShaders;          /**< number of attached shaders */
    struct gl_shader **Shaders; /**< List of attached the shaders */
 
+   /** User-defined attribute bindings (glBindAttribLocation) */
+   struct gl_program_parameter_list *Attributes;
+
    /* post-link info: */
    struct gl_vertex_program *VertexProgram;     /**< Linked vertex program */
    struct gl_fragment_program *FragmentProgram; /**< Linked fragment prog */
    struct gl_uniform_list *Uniforms;
    struct gl_program_parameter_list *Varying;
-   struct gl_program_parameter_list *Attributes; /**< Vertex attributes */
    GLboolean LinkStatus;   /**< GL_LINK_STATUS */
    GLboolean Validated;
    GLchar *InfoLog;
diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index a86ef56c65..decdec53ed 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -1,6 +1,6 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.1
+ * Version:  7.2
  *
  * Copyright (C) 2004-2008  Brian Paul   All Rights Reserved.
  *
@@ -497,10 +497,14 @@ _mesa_get_attrib_location(GLcontext *ctx, GLuint program,
    if (!name)
       return -1;
 
-   if (shProg->Attributes) {
-      GLint i = _mesa_lookup_parameter_index(shProg->Attributes, -1, name);
-      if (i >= 0) {
-         return shProg->Attributes->Parameters[i].StateIndexes[0];
+   if (shProg->VertexProgram) {
+      const struct gl_program_parameter_list *attribs =
+         shProg->VertexProgram->Base.Attributes;
+      if (attribs) {
+         GLint i = _mesa_lookup_parameter_index(attribs, -1, name);
+         if (i >= 0) {
+            return attribs->Parameters[i].StateIndexes[0];
+         }
       }
    }
    return -1;
@@ -513,7 +517,7 @@ _mesa_bind_attrib_location(GLcontext *ctx, GLuint program, GLuint index,
 {
    struct gl_shader_program *shProg;
    const GLint size = -1; /* unknown size */
-   GLint i, oldIndex;
+   GLint i;
    GLenum datatype = GL_FLOAT_VEC4;
 
    shProg = _mesa_lookup_shader_program_err(ctx, program,
@@ -536,14 +540,6 @@ _mesa_bind_attrib_location(GLcontext *ctx, GLuint program, GLuint index,
       return;
    }
 
-   if (shProg->LinkStatus) {
-      /* get current index/location for the attribute */
-      oldIndex = _mesa_get_attrib_location(ctx, program, name);
-   }
-   else {
-      oldIndex = -1;
-   }
-
    /* this will replace the current value if it's already in the list */
    i = _mesa_add_attribute(shProg->Attributes, name, size, datatype, index);
    if (i < 0) {
@@ -551,12 +547,10 @@ _mesa_bind_attrib_location(GLcontext *ctx, GLuint program, GLuint index,
       return;
    }
 
-   if (shProg->VertexProgram && oldIndex >= 0 && oldIndex != index) {
-      /* If the index changed, need to search/replace references to that attribute
-       * in the vertex program.
-       */
-      _slang_remap_attribute(&shProg->VertexProgram->Base, oldIndex, index);
-   }
+   /*
+    * Note that this attribute binding won't go into effect until
+    * glLinkProgram is called again.
+    */
 }
 
 
@@ -798,24 +792,29 @@ _mesa_get_active_attrib(GLcontext *ctx, GLuint program, GLuint index,
                         GLsizei maxLength, GLsizei *length, GLint *size,
                         GLenum *type, GLchar *nameOut)
 {
+   const struct gl_program_parameter_list *attribs = NULL;
    struct gl_shader_program *shProg;
 
    shProg = _mesa_lookup_shader_program_err(ctx, program, "glGetActiveAttrib");
    if (!shProg)
       return;
 
-   if (!shProg->Attributes || index >= shProg->Attributes->NumParameters) {
+   if (shProg->VertexProgram)
+      attribs = shProg->VertexProgram->Base.Attributes;
+
+   if (!attribs || index >= attribs->NumParameters) {
       _mesa_error(ctx, GL_INVALID_VALUE, "glGetActiveAttrib(index)");
       return;
    }
 
-   copy_string(nameOut, maxLength, length,
-               shProg->Attributes->Parameters[index].Name);
+   copy_string(nameOut, maxLength, length, attribs->Parameters[index].Name);
+
    if (size)
-      *size = shProg->Attributes->Parameters[index].Size
-         / sizeof_glsl_type(shProg->Attributes->Parameters[index].DataType);
+      *size = attribs->Parameters[index].Size
+         / sizeof_glsl_type(attribs->Parameters[index].DataType);
+
    if (type)
-      *type = shProg->Attributes->Parameters[index].DataType;
+      *type = attribs->Parameters[index].DataType;
 }
 
 
@@ -937,6 +936,7 @@ static void
 _mesa_get_programiv(GLcontext *ctx, GLuint program,
                     GLenum pname, GLint *params)
 {
+   const struct gl_program_parameter_list *attribs;
    struct gl_shader_program *shProg
       = _mesa_lookup_shader_program(ctx, program);
 
@@ -945,6 +945,11 @@ _mesa_get_programiv(GLcontext *ctx, GLuint program,
       return;
    }
 
+   if (shProg->VertexProgram)
+      attribs = shProg->VertexProgram->Base.Attributes;
+   else
+      attribs = NULL;
+
    switch (pname) {
    case GL_DELETE_STATUS:
       *params = shProg->DeletePending;
@@ -962,11 +967,10 @@ _mesa_get_programiv(GLcontext *ctx, GLuint program,
       *params = shProg->NumShaders;
       break;
    case GL_ACTIVE_ATTRIBUTES:
-      *params = shProg->Attributes ? shProg->Attributes->NumParameters : 0;
+      *params = attribs ? attribs->NumParameters : 0;
       break;
    case GL_ACTIVE_ATTRIBUTE_MAX_LENGTH:
-      *params = _mesa_longest_parameter_name(shProg->Attributes,
-                                             PROGRAM_INPUT) + 1;
+      *params = _mesa_longest_parameter_name(attribs, PROGRAM_INPUT) + 1;
       break;
    case GL_ACTIVE_UNIFORMS:
       *params = shProg->Uniforms ? shProg->Uniforms->NumUniforms : 0;
diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c
index 57dbfc2388..30035b4fee 100644
--- a/src/mesa/shader/slang/slang_link.c
+++ b/src/mesa/shader/slang/slang_link.c
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.5.3
+ * Version:  7.2
  *
- * Copyright (C) 2007  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2008  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -215,74 +215,110 @@ link_uniform_vars(struct gl_shader_program *shProg,
  * For example, if the vertex shader declared "attribute vec4 foobar" we'll
  * allocate a generic vertex attribute for "foobar" and plug that value into
  * the vertex program instructions.
+ * But if the user called glBindAttributeLocation(), those bindings will
+ * have priority.
  */
 static GLboolean
 _slang_resolve_attributes(struct gl_shader_program *shProg,
-                          struct gl_program *prog)
+                          const struct gl_program *origProg,
+                          struct gl_program *linkedProg)
 {
+   GLint attribMap[MAX_VERTEX_ATTRIBS];
    GLuint i, j;
    GLbitfield usedAttributes;
 
-   assert(prog->Target == GL_VERTEX_PROGRAM_ARB);
+   assert(origProg != linkedProg);
+   assert(origProg->Target == GL_VERTEX_PROGRAM_ARB);
+   assert(linkedProg->Target == GL_VERTEX_PROGRAM_ARB);
 
    if (!shProg->Attributes)
       shProg->Attributes = _mesa_new_parameter_list();
 
+   if (linkedProg->Attributes) {
+      _mesa_free_parameter_list(linkedProg->Attributes);
+   }
+   linkedProg->Attributes = _mesa_new_parameter_list();
+
+
    /* Build a bitmask indicating which attribute indexes have been
     * explicitly bound by the user with glBindAttributeLocation().
     */
    usedAttributes = 0x0;
    for (i = 0; i < shProg->Attributes->NumParameters; i++) {
       GLint attr = shProg->Attributes->Parameters[i].StateIndexes[0];
-      usedAttributes |= attr;
+      usedAttributes |= (1 << attr);
+   }
+
+   /* initialize the generic attribute map entries to -1 */
+   for (i = 0; i < MAX_VERTEX_ATTRIBS; i++) {
+      attribMap[i] = -1;
    }
 
    /*
     * Scan program for generic attribute references
     */
-   for (i = 0; i < prog->NumInstructions; i++) {
-      struct prog_instruction *inst = prog->Instructions + i;
+   for (i = 0; i < linkedProg->NumInstructions; i++) {
+      struct prog_instruction *inst = linkedProg->Instructions + i;
       for (j = 0; j < 3; j++) {
          if (inst->SrcReg[j].File == PROGRAM_INPUT &&
              inst->SrcReg[j].Index >= VERT_ATTRIB_GENERIC0) {
-            /* this is a generic attrib */
-            const GLint k = inst->SrcReg[j].Index - VERT_ATTRIB_GENERIC0;
-            const char *name = prog->Attributes->Parameters[k].Name;
-            /* See if this attrib name is in the program's attribute list
-             * (i.e. was bound by the user).
+            /*
+             * OK, we've found a generic vertex attribute reference.
              */
-            GLint index = _mesa_lookup_parameter_index(shProg->Attributes,
-                                                          -1, name);
-            GLint attr;
-            if (index >= 0) {
-               /* found, user must have specified a binding */
-               attr = shProg->Attributes->Parameters[index].StateIndexes[0];
-            }
-            else {
-               /* Not found, choose our own attribute number.
-                * Start at 1 since generic attribute 0 always aliases
-                * glVertex/position.
+            const GLint k = inst->SrcReg[j].Index - VERT_ATTRIB_GENERIC0;
+
+            GLint attr = attribMap[k];
+
+            if (attr < 0) {
+               /* Need to figure out attribute mapping now.
+                */
+               const char *name = origProg->Attributes->Parameters[k].Name;
+               const GLint size = origProg->Attributes->Parameters[k].Size;
+               const GLenum type =origProg->Attributes->Parameters[k].DataType;
+               GLint index, attr;
+
+               /* See if there's a user-defined attribute binding for
+                * this name.
                 */
-               GLint size = prog->Attributes->Parameters[k].Size;
-               GLenum datatype = prog->Attributes->Parameters[k].DataType;
-               for (attr = 1; attr < MAX_VERTEX_ATTRIBS; attr++) {
-                  if (((1 << attr) & usedAttributes) == 0)
-                     break;
+               index = _mesa_lookup_parameter_index(shProg->Attributes,
+                                                    -1, name);
+               if (index >= 0) {
+                  /* Found a user-defined binding */
+                  attr = shProg->Attributes->Parameters[index].StateIndexes[0];
                }
-               if (attr == MAX_VERTEX_ATTRIBS) {
-                  /* too many!  XXX record error log */
-                  return GL_FALSE;
+               else {
+                  /* No user-defined binding, choose our own attribute number.
+                   * Start at 1 since generic attribute 0 always aliases
+                   * glVertex/position.
+                   */
+                  for (attr = 1; attr < MAX_VERTEX_ATTRIBS; attr++) {
+                     if (((1 << attr) & usedAttributes) == 0)
+                        break;
+                  }
+                  if (attr == MAX_VERTEX_ATTRIBS) {
+                     link_error(shProg, "Too many vertex attributes");
+                     return GL_FALSE;
+                  }
+
+                  /* mark this attribute as used */
+                  usedAttributes |= (1 << attr);
                }
-               _mesa_add_attribute(shProg->Attributes, name, size, datatype,attr);
 
-	       /* set the attribute as used */
-	       usedAttributes |= 1<<attr;
+               attribMap[k] = attr;
+
+               /* Save the final name->attrib binding so it can be queried
+                * with glGetAttributeLocation().
+                */
+               _mesa_add_attribute(linkedProg->Attributes, name,
+                                   size, type, attr);
             }
 
+            /* update the instruction's src reg */
             inst->SrcReg[j].Index = VERT_ATTRIB_GENERIC0 + attr;
          }
       }
    }
+
    return GL_TRUE;
 }
 
@@ -344,36 +380,6 @@ _slang_update_inputs_outputs(struct gl_program *prog)
 }
 
 
-/**
- * Scan a vertex program looking for instances of
- * (PROGRAM_INPUT, VERT_ATTRIB_GENERIC0 + oldAttrib) and replace with
- * (PROGRAM_INPUT, VERT_ATTRIB_GENERIC0 + newAttrib).
- * This is used when the user calls glBindAttribLocation on an already linked
- * shader program.
- */
-void
-_slang_remap_attribute(struct gl_program *prog, GLuint oldAttrib, GLuint newAttrib)
-{
-   GLuint i, j;
-
-   assert(prog->Target == GL_VERTEX_PROGRAM_ARB);
-
-   for (i = 0; i < prog->NumInstructions; i++) {
-      struct prog_instruction *inst = prog->Instructions + i;
-      for (j = 0; j < 3; j++) {
-         if (inst->SrcReg[j].File == PROGRAM_INPUT) {
-            if (inst->SrcReg[j].Index == VERT_ATTRIB_GENERIC0 + oldAttrib) {
-               inst->SrcReg[j].Index = VERT_ATTRIB_GENERIC0 + newAttrib;
-            }
-         }
-      }
-   }
-
-   _slang_update_inputs_outputs(prog);
-}
-
-
-
 /** cast wrapper */
 static struct gl_vertex_program *
 vertex_program(struct gl_program *prog)
@@ -492,9 +498,8 @@ _slang_link(GLcontext *ctx,
    /*_mesa_print_uniforms(shProg->Uniforms);*/
 
    if (shProg->VertexProgram) {
-      if (!_slang_resolve_attributes(shProg, &shProg->VertexProgram->Base)) {
-         /*goto cleanup;*/
-         _mesa_problem(ctx, "_slang_resolve_attributes() failed");
+      if (!_slang_resolve_attributes(shProg, &vertProg->Base,
+                                     &shProg->VertexProgram->Base)) {
          return;
       }
    }
diff --git a/src/mesa/shader/slang/slang_link.h b/src/mesa/shader/slang/slang_link.h
index 8ef8a6b4b3..2b44d20787 100644
--- a/src/mesa/shader/slang/slang_link.h
+++ b/src/mesa/shader/slang/slang_link.h
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.5.3
+ * Version:  7.2
  *
- * Copyright (C) 2007  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2008  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,10 +32,6 @@ extern void
 _slang_link(GLcontext *ctx, GLhandleARB h,
             struct gl_shader_program *shProg);
 
-extern void
-_slang_remap_attribute(struct gl_program *prog, GLuint oldAttrib,
-                       GLuint newAttrib);
-
 
 #endif
 
-- 
cgit v1.2.3


From d7a7b0a10dd355fbeb7a404091a42d4ab558c820 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 17 Sep 2008 16:48:13 -0600
Subject: mesa: new gl_fragment_program fields indicating use of fog,
 front-facing, point coord

---
 src/mesa/main/mtypes.h             |  5 +++-
 src/mesa/shader/slang/slang_link.c | 50 ++++++++++++++++++++++++--------------
 2 files changed, 36 insertions(+), 19 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 2fc169493b..a5e1cf6a27 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1953,7 +1953,10 @@ struct gl_fragment_program
 {
    struct gl_program Base;   /**< base class */
    GLenum FogOption;
-   GLboolean UsesKill;
+   GLboolean UsesKill;          /**< shader uses KIL instruction */
+   GLboolean UsesPointCoord;    /**< shader uses gl_PointCoord */
+   GLboolean UsesFrontFacing;   /**< shader used gl_FrontFacing */
+   GLboolean UsesFogFragCoord;  /**< shader used gl_FogFragCoord */
 };
 
 
diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c
index a44d001477..dd7d5be6d8 100644
--- a/src/mesa/shader/slang/slang_link.c
+++ b/src/mesa/shader/slang/slang_link.c
@@ -42,6 +42,24 @@
 #include "slang_link.h"
 
 
+/** cast wrapper */
+static struct gl_vertex_program *
+vertex_program(struct gl_program *prog)
+{
+   assert(prog->Target == GL_VERTEX_PROGRAM_ARB);
+   return (struct gl_vertex_program *) prog;
+}
+
+
+/** cast wrapper */
+static struct gl_fragment_program *
+fragment_program(struct gl_program *prog)
+{
+   assert(prog->Target == GL_FRAGMENT_PROGRAM_ARB);
+   return (struct gl_fragment_program *) prog;
+}
+
+
 /**
  * Record a linking error.
  */
@@ -374,6 +392,20 @@ _slang_update_inputs_outputs(struct gl_program *prog)
       for (j = 0; j < numSrc; j++) {
          if (inst->SrcReg[j].File == PROGRAM_INPUT) {
             prog->InputsRead |= 1 << inst->SrcReg[j].Index;
+            if (prog->Target == GL_FRAGMENT_PROGRAM_ARB &&
+                inst->SrcReg[j].Index == FRAG_ATTRIB_FOGC) {
+               /* The fragment shader FOGC input is used for fog,
+                * front-facing and sprite/point coord.
+                */
+               struct gl_fragment_program *fp = fragment_program(prog);
+               const GLint swz = GET_SWZ(inst->SrcReg[j].Swizzle, 0);
+               if (swz == SWIZZLE_X)
+                  fp->UsesFogFragCoord = GL_TRUE;
+               else if (swz == SWIZZLE_Y)
+                  fp->UsesFrontFacing = GL_TRUE;
+               else if (swz == SWIZZLE_Z || swz == SWIZZLE_W)
+                  fp->UsesPointCoord = GL_TRUE;
+            }
          }
          else if (inst->SrcReg[j].File == PROGRAM_ADDRESS) {
             maxAddrReg = MAX2(maxAddrReg, inst->SrcReg[j].Index + 1);
@@ -391,24 +423,6 @@ _slang_update_inputs_outputs(struct gl_program *prog)
 }
 
 
-/** cast wrapper */
-static struct gl_vertex_program *
-vertex_program(struct gl_program *prog)
-{
-   assert(prog->Target == GL_VERTEX_PROGRAM_ARB);
-   return (struct gl_vertex_program *) prog;
-}
-
-
-/** cast wrapper */
-static struct gl_fragment_program *
-fragment_program(struct gl_program *prog)
-{
-   assert(prog->Target == GL_FRAGMENT_PROGRAM_ARB);
-   return (struct gl_fragment_program *) prog;
-}
-
-
 /**
  * Shader linker.  Currently:
  *
-- 
cgit v1.2.3


From 13e7e4b634a94efe14f4d79723844d5fdfe12ad4 Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@tungstengraphics.com>
Date: Fri, 19 Sep 2008 14:55:49 +0100
Subject: mesa: add missing FEATURE_attrib_stack around       call to
 _mesa_free_attrib_data()

---
 src/mesa/main/context.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 96a8c30106..564139a865 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1316,7 +1316,9 @@ _mesa_free_context_data( GLcontext *ctx )
    _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current, NULL);
    _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._TexEnvProgram, NULL);
 
+#if FEATURE_attrib_stack
    _mesa_free_attrib_data(ctx);
+#endif
    _mesa_free_lighting_data( ctx );
 #if FEATURE_evaluators
    _mesa_free_eval_data( ctx );
-- 
cgit v1.2.3


From 5106f1b9acef1c5fa8b97b04c33f00c92dfb4c43 Mon Sep 17 00:00:00 2001
From: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon, 22 Sep 2008 11:48:26 +0200
Subject: Remove incorrect test from mmAllocMem.

0 is a perfectly valid alignment shift, see e.g. driTexturesGone() which was
broken by this.
---
 src/mesa/main/mm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mm.c b/src/mesa/main/mm.c
index 6f381b02a7..d430bcdb84 100644
--- a/src/mesa/main/mm.c
+++ b/src/mesa/main/mm.c
@@ -167,7 +167,7 @@ mmAllocMem(struct mem_block *heap, unsigned size, unsigned align2, unsigned star
    unsigned startofs = 0;
    unsigned endofs;
 
-   if (!heap || !align2 || !size)
+   if (!heap || !size)
       return NULL;
 
    for (p = heap->next_free; p != heap; p = p->next_free) {
-- 
cgit v1.2.3


From a0bd3972b645fbe61c3d1e2bbaa1510e04bad8d8 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Tue, 23 Sep 2008 15:53:19 -0700
Subject: remove leftover merge conflict markers

---
 src/mesa/main/sources | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/sources b/src/mesa/main/sources
index 6a165f1ae2..468121bd1d 100644
--- a/src/mesa/main/sources
+++ b/src/mesa/main/sources
@@ -78,10 +78,6 @@ vsnprintf.c
 MESA_MAIN_HEADERS = \
 accum.h \
 api_arrayelt.h \
-<<<<<<< HEAD:src/mesa/main/sources
-=======
-api_eval.h \
->>>>>>> master:src/mesa/main/sources
 api_exec.h \
 api_loopback.h \
 api_noop.h \
-- 
cgit v1.2.3


From 1ca512c643553bd3504abd258ab80b7a550ab292 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 25 Sep 2008 11:46:27 -0600
Subject: mesa: fix default buffer object access value

---
 src/mesa/main/bufferobj.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index ecdb4d219c..dd4ac4679e 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -38,6 +38,13 @@
 #include "bufferobj.h"
 
 
+#ifdef FEATURE_OES_mapbuffer
+#define DEFAULT_ACCESS GL_WRITE_ONLY;
+#else
+#define DEFAULT_ACCESS GL_READ_WRITE;
+#endif
+
+
 /**
  * Get the buffer object bound to the specified target in a GL context.
  *
@@ -255,7 +262,7 @@ _mesa_initialize_buffer_object( struct gl_buffer_object *obj,
    obj->RefCount = 1;
    obj->Name = name;
    obj->Usage = GL_STATIC_DRAW_ARB;
-   obj->Access = GL_READ_WRITE_ARB;
+   obj->Access = DEFAULT_ACCESS;
 }
 
 
@@ -1037,7 +1044,7 @@ _mesa_UnmapBufferARB(GLenum target)
       status = ctx->Driver.UnmapBuffer( ctx, target, bufObj );
    }
 
-   bufObj->Access = GL_READ_WRITE_ARB; /* initial value, OK? */
+   bufObj->Access = DEFAULT_ACCESS;
    bufObj->Pointer = NULL;
 
    return status;
-- 
cgit v1.2.3


From 006fb638188f083d64a2427cd28979b432622f3e Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 25 Sep 2008 18:27:22 -0600
Subject: mesa: fix swizzle failure, fix typo

---
 src/mesa/main/texenvprogram.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 6877ef96f2..c699c43429 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -375,7 +375,7 @@ static struct ureg get_tex_temp( struct texenv_fragment_program *p )
 {
    int bit;
    
-   /* First try to find availble temp not previously used (to avoid
+   /* First try to find available temp not previously used (to avoid
     * starting a new texture indirection).  According to the spec, the
     * ~p->temps_output isn't necessary, but will keep it there for
     * now:
@@ -575,14 +575,16 @@ static struct ureg register_const4f( struct texenv_fragment_program *p,
 {
    GLfloat values[4];
    GLuint idx, swizzle;
+   struct ureg r;
    values[0] = s0;
    values[1] = s1;
    values[2] = s2;
    values[3] = s3;
    idx = _mesa_add_unnamed_constant( p->program->Base.Parameters, values, 4,
                                      &swizzle );
-   ASSERT(swizzle == SWIZZLE_NOOP);
-   return make_ureg(PROGRAM_CONSTANT, idx);
+   r = make_ureg(PROGRAM_CONSTANT, idx);
+   r.swz = swizzle;
+   return r;
 }
 
 #define register_scalar_const(p, s0)    register_const4f(p, s0, s0, s0, s0)
-- 
cgit v1.2.3


From 3f99f501db2582e241851e63e432c18e2de415be Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 25 Sep 2008 18:40:16 -0600
Subject: mesa: increase MAX_INSTRUCTIONS

---
 src/mesa/main/texenvprogram.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index c699c43429..c64d88faf9 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -37,11 +37,9 @@
 #include "texenvprogram.h"
 
 /**
- * This MAX is probably a bit generous, but that's OK.  There can be
- * up to four instructions per texture unit (TEX + 3 for combine),
- * then there's fog and specular add.
+ * Up to nine instructions per tex unit, plus fog, specular color.
  */
-#define MAX_INSTRUCTIONS ((MAX_TEXTURE_UNITS * 4) + 12)
+#define MAX_INSTRUCTIONS ((MAX_TEXTURE_UNITS * 9) + 12)
 
 #define DISASSEM (MESA_VERBOSE & VERBOSE_DISASSEM)
 
-- 
cgit v1.2.3


From 092748990f75a0348f24a40e92872f08a9958e66 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 25 Sep 2008 19:22:29 -0600
Subject: mesa: fix/simplify initialization of vertex/fragment program limits

Defaults for program length, num ALU instructions, num indirections, etc.
basically indicate no limit for software rendering.  Driver should override
as needed.
---
 src/mesa/main/config.h  |  4 +---
 src/mesa/main/context.c | 53 ++++++++++++++++++++++++-------------------------
 2 files changed, 27 insertions(+), 30 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index f8109ec755..5e9a4f8939 100644
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -176,13 +176,11 @@
 /** For GL_ARB_fragment_program */
 /*@{*/
 #define MAX_FRAGMENT_PROGRAM_ADDRESS_REGS 0
-#define MAX_FRAGMENT_PROGRAM_ALU_INSTRUCTIONS 48
-#define MAX_FRAGMENT_PROGRAM_TEX_INSTRUCTIONS 24
-#define MAX_FRAGMENT_PROGRAM_TEX_INDIRECTIONS  4
 /*@}*/
 
 /** For any program target/extension */
 /*@{*/
+#define MAX_PROGRAM_INSTRUCTIONS  (16 * 1024)
 #define MAX_PROGRAM_LOCAL_PARAMS 128 /* KW: power of two */
 #define MAX_PROGRAM_ENV_PARAMS 128
 #define MAX_PROGRAM_MATRICES 8
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index ed3faecf0d..144da61384 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -819,11 +819,33 @@ _mesa_init_current(GLcontext *ctx)
 
 
 /**
- * Init vertex/fragment program native limits from logical limits.
+ * Init vertex/fragment program limits.
+ * Important: drivers should override these with actual limits.
  */
 static void
-init_natives(struct gl_program_constants *prog)
+init_program_limits(GLenum type, struct gl_program_constants *prog)
 {
+   prog->MaxInstructions = MAX_PROGRAM_INSTRUCTIONS;
+   prog->MaxAluInstructions = MAX_PROGRAM_INSTRUCTIONS;
+   prog->MaxTexInstructions = MAX_PROGRAM_INSTRUCTIONS;
+   prog->MaxTexIndirections = MAX_PROGRAM_INSTRUCTIONS;
+   prog->MaxTemps = MAX_PROGRAM_TEMPS;
+   prog->MaxEnvParams = MAX_PROGRAM_ENV_PARAMS;
+   prog->MaxLocalParams = MAX_PROGRAM_LOCAL_PARAMS;
+   prog->MaxUniformComponents = 4 * MAX_UNIFORMS;
+
+   if (type == GL_VERTEX_PROGRAM_ARB) {
+      prog->MaxParameters = MAX_NV_VERTEX_PROGRAM_PARAMS;
+      prog->MaxAttribs = MAX_NV_VERTEX_PROGRAM_INPUTS;
+      prog->MaxAddressRegs = MAX_VERTEX_PROGRAM_ADDRESS_REGS;
+   }
+   else {
+      prog->MaxParameters = MAX_NV_FRAGMENT_PROGRAM_PARAMS;
+      prog->MaxAttribs = MAX_NV_FRAGMENT_PROGRAM_INPUTS;
+      prog->MaxAddressRegs = MAX_FRAGMENT_PROGRAM_ADDRESS_REGS;
+   }
+
+   /* copy the above limits to init native limits */
    prog->MaxNativeInstructions = prog->MaxInstructions;
    prog->MaxNativeAluInstructions = prog->MaxAluInstructions;
    prog->MaxNativeTexInstructions = prog->MaxTexInstructions;
@@ -885,33 +907,10 @@ _mesa_init_constants(GLcontext *ctx)
    ctx->Const.MaxViewportWidth = MAX_WIDTH;
    ctx->Const.MaxViewportHeight = MAX_HEIGHT;
 #if FEATURE_ARB_vertex_program
-   ctx->Const.VertexProgram.MaxInstructions = MAX_NV_VERTEX_PROGRAM_INSTRUCTIONS;
-   ctx->Const.VertexProgram.MaxAluInstructions = 0;
-   ctx->Const.VertexProgram.MaxTexInstructions = 0;
-   ctx->Const.VertexProgram.MaxTexIndirections = 0;
-   ctx->Const.VertexProgram.MaxAttribs = MAX_NV_VERTEX_PROGRAM_INPUTS;
-   ctx->Const.VertexProgram.MaxTemps = MAX_PROGRAM_TEMPS;
-   ctx->Const.VertexProgram.MaxParameters = MAX_NV_VERTEX_PROGRAM_PARAMS;
-   ctx->Const.VertexProgram.MaxLocalParams = MAX_PROGRAM_LOCAL_PARAMS;
-   ctx->Const.VertexProgram.MaxEnvParams = MAX_PROGRAM_ENV_PARAMS;
-   ctx->Const.VertexProgram.MaxAddressRegs = MAX_VERTEX_PROGRAM_ADDRESS_REGS;
-   ctx->Const.VertexProgram.MaxUniformComponents = 4 * MAX_UNIFORMS;
-   init_natives(&ctx->Const.VertexProgram);
+   init_program_limits(GL_VERTEX_PROGRAM_ARB, &ctx->Const.VertexProgram);
 #endif
-
 #if FEATURE_ARB_fragment_program
-   ctx->Const.FragmentProgram.MaxInstructions = MAX_NV_FRAGMENT_PROGRAM_INSTRUCTIONS;
-   ctx->Const.FragmentProgram.MaxAluInstructions = MAX_FRAGMENT_PROGRAM_ALU_INSTRUCTIONS;
-   ctx->Const.FragmentProgram.MaxTexInstructions = MAX_FRAGMENT_PROGRAM_TEX_INSTRUCTIONS;
-   ctx->Const.FragmentProgram.MaxTexIndirections = MAX_FRAGMENT_PROGRAM_TEX_INDIRECTIONS;
-   ctx->Const.FragmentProgram.MaxAttribs = MAX_NV_FRAGMENT_PROGRAM_INPUTS;
-   ctx->Const.FragmentProgram.MaxTemps = MAX_PROGRAM_TEMPS;
-   ctx->Const.FragmentProgram.MaxParameters = MAX_NV_FRAGMENT_PROGRAM_PARAMS;
-   ctx->Const.FragmentProgram.MaxLocalParams = MAX_PROGRAM_LOCAL_PARAMS;
-   ctx->Const.FragmentProgram.MaxEnvParams = MAX_PROGRAM_ENV_PARAMS;
-   ctx->Const.FragmentProgram.MaxAddressRegs = MAX_FRAGMENT_PROGRAM_ADDRESS_REGS;
-   ctx->Const.FragmentProgram.MaxUniformComponents = 4 * MAX_UNIFORMS;
-   init_natives(&ctx->Const.FragmentProgram);
+   init_program_limits(GL_FRAGMENT_PROGRAM_ARB, &ctx->Const.FragmentProgram);
 #endif
    ctx->Const.MaxProgramMatrices = MAX_PROGRAM_MATRICES;
    ctx->Const.MaxProgramMatrixStackDepth = MAX_PROGRAM_MATRIX_STACK_DEPTH;
-- 
cgit v1.2.3


From 6f83c30dd039380ead8e16936464edd11038bb37 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Wed, 24 Sep 2008 18:56:44 -0500
Subject: mesa: fix indenting

---
 src/mesa/main/texstate.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 24ab2ff9e5..f019377041 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -118,20 +118,20 @@ _mesa_copy_texture_state( const GLcontext *src, GLcontext *dst )
       /* copy texture object bindings, not contents of texture objects */
       _mesa_lock_context_textures(dst);
 
-       _mesa_reference_texobj(&dst->Texture.Unit[i].Current1D,
-                              src->Texture.Unit[i].Current1D);
-       _mesa_reference_texobj(&dst->Texture.Unit[i].Current2D,
-                              src->Texture.Unit[i].Current2D);
-       _mesa_reference_texobj(&dst->Texture.Unit[i].Current3D,
-                              src->Texture.Unit[i].Current3D);
-       _mesa_reference_texobj(&dst->Texture.Unit[i].CurrentCubeMap,
-                              src->Texture.Unit[i].CurrentCubeMap);
-       _mesa_reference_texobj(&dst->Texture.Unit[i].CurrentRect,
-                              src->Texture.Unit[i].CurrentRect);
-       _mesa_reference_texobj(&dst->Texture.Unit[i].Current1DArray,
-                              src->Texture.Unit[i].Current1DArray);
-       _mesa_reference_texobj(&dst->Texture.Unit[i].Current2DArray,
-                              src->Texture.Unit[i].Current2DArray);
+      _mesa_reference_texobj(&dst->Texture.Unit[i].Current1D,
+                             src->Texture.Unit[i].Current1D);
+      _mesa_reference_texobj(&dst->Texture.Unit[i].Current2D,
+                             src->Texture.Unit[i].Current2D);
+      _mesa_reference_texobj(&dst->Texture.Unit[i].Current3D,
+                             src->Texture.Unit[i].Current3D);
+      _mesa_reference_texobj(&dst->Texture.Unit[i].CurrentCubeMap,
+                             src->Texture.Unit[i].CurrentCubeMap);
+      _mesa_reference_texobj(&dst->Texture.Unit[i].CurrentRect,
+                             src->Texture.Unit[i].CurrentRect);
+      _mesa_reference_texobj(&dst->Texture.Unit[i].Current1DArray,
+                             src->Texture.Unit[i].Current1DArray);
+      _mesa_reference_texobj(&dst->Texture.Unit[i].Current2DArray,
+                             src->Texture.Unit[i].Current2DArray);
 
       _mesa_unlock_context_textures(dst);
    }
-- 
cgit v1.2.3


From 6c72bc8089037daed0c471dda62310d1101e08f0 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 25 Sep 2008 11:46:27 -0600
Subject: mesa: fix default buffer object access value

---
 src/mesa/main/bufferobj.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 68491359e8..190e6ab564 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -38,6 +38,13 @@
 #include "bufferobj.h"
 
 
+#ifdef FEATURE_OES_mapbuffer
+#define DEFAULT_ACCESS GL_WRITE_ONLY;
+#else
+#define DEFAULT_ACCESS GL_READ_WRITE;
+#endif
+
+
 /**
  * Get the buffer object bound to the specified target in a GL context.
  *
@@ -255,7 +262,7 @@ _mesa_initialize_buffer_object( struct gl_buffer_object *obj,
    obj->RefCount = 1;
    obj->Name = name;
    obj->Usage = GL_STATIC_DRAW_ARB;
-   obj->Access = GL_READ_WRITE_ARB;
+   obj->Access = DEFAULT_ACCESS;
 }
 
 
@@ -1065,7 +1072,7 @@ _mesa_UnmapBufferARB(GLenum target)
       status = ctx->Driver.UnmapBuffer( ctx, target, bufObj );
    }
 
-   bufObj->Access = GL_READ_WRITE_ARB; /* initial value, OK? */
+   bufObj->Access = DEFAULT_ACCESS;
    bufObj->Pointer = NULL;
 
    return status;
-- 
cgit v1.2.3


From d01269a57f4cfdb859352c933bc546296545dd80 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 25 Sep 2008 18:27:22 -0600
Subject: mesa: fix swizzle failure, fix typo

---
 src/mesa/main/texenvprogram.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 25e280bc3f..4eb743736c 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -388,7 +388,7 @@ static struct ureg get_tex_temp( struct texenv_fragment_program *p )
 {
    int bit;
    
-   /* First try to find availble temp not previously used (to avoid
+   /* First try to find available temp not previously used (to avoid
     * starting a new texture indirection).  According to the spec, the
     * ~p->temps_output isn't necessary, but will keep it there for
     * now:
@@ -588,14 +588,16 @@ static struct ureg register_const4f( struct texenv_fragment_program *p,
 {
    GLfloat values[4];
    GLuint idx, swizzle;
+   struct ureg r;
    values[0] = s0;
    values[1] = s1;
    values[2] = s2;
    values[3] = s3;
    idx = _mesa_add_unnamed_constant( p->program->Base.Parameters, values, 4,
                                      &swizzle );
-   ASSERT(swizzle == SWIZZLE_NOOP);
-   return make_ureg(PROGRAM_CONSTANT, idx);
+   r = make_ureg(PROGRAM_CONSTANT, idx);
+   r.swz = swizzle;
+   return r;
 }
 
 #define register_scalar_const(p, s0)    register_const4f(p, s0, s0, s0, s0)
-- 
cgit v1.2.3


From b5e1a93036b22bd30738abccbb8a2645a515667f Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 25 Sep 2008 18:40:16 -0600
Subject: mesa: increase MAX_INSTRUCTIONS

---
 src/mesa/main/texenvprogram.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 4eb743736c..2bce93eef1 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -48,11 +48,9 @@ struct texenvprog_cache_item
 
 
 /**
- * This MAX is probably a bit generous, but that's OK.  There can be
- * up to four instructions per texture unit (TEX + 3 for combine),
- * then there's fog and specular add.
+ * Up to nine instructions per tex unit, plus fog, specular color.
  */
-#define MAX_INSTRUCTIONS ((MAX_TEXTURE_UNITS * 4) + 12)
+#define MAX_INSTRUCTIONS ((MAX_TEXTURE_UNITS * 9) + 12)
 
 #define DISASSEM (MESA_VERBOSE & VERBOSE_DISASSEM)
 
-- 
cgit v1.2.3


From f51cca72d31aacbae815c70071d2d3a04d55025a Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 25 Sep 2008 19:22:29 -0600
Subject: mesa: fix/simplify initialization of vertex/fragment program limits

Defaults for program length, num ALU instructions, num indirections, etc.
basically indicate no limit for software rendering.  Driver should override
as needed.
---
 src/mesa/main/config.h  |  4 +---
 src/mesa/main/context.c | 53 ++++++++++++++++++++++++-------------------------
 2 files changed, 27 insertions(+), 30 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index 882e2f224a..3b340c476c 100644
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -176,13 +176,11 @@
 /** For GL_ARB_fragment_program */
 /*@{*/
 #define MAX_FRAGMENT_PROGRAM_ADDRESS_REGS 0
-#define MAX_FRAGMENT_PROGRAM_ALU_INSTRUCTIONS 48
-#define MAX_FRAGMENT_PROGRAM_TEX_INSTRUCTIONS 24
-#define MAX_FRAGMENT_PROGRAM_TEX_INDIRECTIONS  4
 /*@}*/
 
 /** For any program target/extension */
 /*@{*/
+#define MAX_PROGRAM_INSTRUCTIONS  (16 * 1024)
 #define MAX_PROGRAM_LOCAL_PARAMS 128 /* KW: power of two */
 #define MAX_PROGRAM_ENV_PARAMS 128
 #define MAX_PROGRAM_MATRICES 8
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 564139a865..c6ff8c13c6 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -819,11 +819,33 @@ _mesa_init_current(GLcontext *ctx)
 
 
 /**
- * Init vertex/fragment program native limits from logical limits.
+ * Init vertex/fragment program limits.
+ * Important: drivers should override these with actual limits.
  */
 static void
-init_natives(struct gl_program_constants *prog)
+init_program_limits(GLenum type, struct gl_program_constants *prog)
 {
+   prog->MaxInstructions = MAX_PROGRAM_INSTRUCTIONS;
+   prog->MaxAluInstructions = MAX_PROGRAM_INSTRUCTIONS;
+   prog->MaxTexInstructions = MAX_PROGRAM_INSTRUCTIONS;
+   prog->MaxTexIndirections = MAX_PROGRAM_INSTRUCTIONS;
+   prog->MaxTemps = MAX_PROGRAM_TEMPS;
+   prog->MaxEnvParams = MAX_PROGRAM_ENV_PARAMS;
+   prog->MaxLocalParams = MAX_PROGRAM_LOCAL_PARAMS;
+   prog->MaxUniformComponents = 4 * MAX_UNIFORMS;
+
+   if (type == GL_VERTEX_PROGRAM_ARB) {
+      prog->MaxParameters = MAX_NV_VERTEX_PROGRAM_PARAMS;
+      prog->MaxAttribs = MAX_NV_VERTEX_PROGRAM_INPUTS;
+      prog->MaxAddressRegs = MAX_VERTEX_PROGRAM_ADDRESS_REGS;
+   }
+   else {
+      prog->MaxParameters = MAX_NV_FRAGMENT_PROGRAM_PARAMS;
+      prog->MaxAttribs = MAX_NV_FRAGMENT_PROGRAM_INPUTS;
+      prog->MaxAddressRegs = MAX_FRAGMENT_PROGRAM_ADDRESS_REGS;
+   }
+
+   /* copy the above limits to init native limits */
    prog->MaxNativeInstructions = prog->MaxInstructions;
    prog->MaxNativeAluInstructions = prog->MaxAluInstructions;
    prog->MaxNativeTexInstructions = prog->MaxTexInstructions;
@@ -885,33 +907,10 @@ _mesa_init_constants(GLcontext *ctx)
    ctx->Const.MaxViewportWidth = MAX_WIDTH;
    ctx->Const.MaxViewportHeight = MAX_HEIGHT;
 #if FEATURE_ARB_vertex_program
-   ctx->Const.VertexProgram.MaxInstructions = MAX_NV_VERTEX_PROGRAM_INSTRUCTIONS;
-   ctx->Const.VertexProgram.MaxAluInstructions = 0;
-   ctx->Const.VertexProgram.MaxTexInstructions = 0;
-   ctx->Const.VertexProgram.MaxTexIndirections = 0;
-   ctx->Const.VertexProgram.MaxAttribs = MAX_NV_VERTEX_PROGRAM_INPUTS;
-   ctx->Const.VertexProgram.MaxTemps = MAX_PROGRAM_TEMPS;
-   ctx->Const.VertexProgram.MaxParameters = MAX_NV_VERTEX_PROGRAM_PARAMS;
-   ctx->Const.VertexProgram.MaxLocalParams = MAX_PROGRAM_LOCAL_PARAMS;
-   ctx->Const.VertexProgram.MaxEnvParams = MAX_PROGRAM_ENV_PARAMS;
-   ctx->Const.VertexProgram.MaxAddressRegs = MAX_VERTEX_PROGRAM_ADDRESS_REGS;
-   ctx->Const.VertexProgram.MaxUniformComponents = 4 * MAX_UNIFORMS;
-   init_natives(&ctx->Const.VertexProgram);
+   init_program_limits(GL_VERTEX_PROGRAM_ARB, &ctx->Const.VertexProgram);
 #endif
-
 #if FEATURE_ARB_fragment_program
-   ctx->Const.FragmentProgram.MaxInstructions = MAX_NV_FRAGMENT_PROGRAM_INSTRUCTIONS;
-   ctx->Const.FragmentProgram.MaxAluInstructions = MAX_FRAGMENT_PROGRAM_ALU_INSTRUCTIONS;
-   ctx->Const.FragmentProgram.MaxTexInstructions = MAX_FRAGMENT_PROGRAM_TEX_INSTRUCTIONS;
-   ctx->Const.FragmentProgram.MaxTexIndirections = MAX_FRAGMENT_PROGRAM_TEX_INDIRECTIONS;
-   ctx->Const.FragmentProgram.MaxAttribs = MAX_NV_FRAGMENT_PROGRAM_INPUTS;
-   ctx->Const.FragmentProgram.MaxTemps = MAX_PROGRAM_TEMPS;
-   ctx->Const.FragmentProgram.MaxParameters = MAX_NV_FRAGMENT_PROGRAM_PARAMS;
-   ctx->Const.FragmentProgram.MaxLocalParams = MAX_PROGRAM_LOCAL_PARAMS;
-   ctx->Const.FragmentProgram.MaxEnvParams = MAX_PROGRAM_ENV_PARAMS;
-   ctx->Const.FragmentProgram.MaxAddressRegs = MAX_FRAGMENT_PROGRAM_ADDRESS_REGS;
-   ctx->Const.FragmentProgram.MaxUniformComponents = 4 * MAX_UNIFORMS;
-   init_natives(&ctx->Const.FragmentProgram);
+   init_program_limits(GL_FRAGMENT_PROGRAM_ARB, &ctx->Const.FragmentProgram);
 #endif
    ctx->Const.MaxProgramMatrices = MAX_PROGRAM_MATRICES;
    ctx->Const.MaxProgramMatrixStackDepth = MAX_PROGRAM_MATRIX_STACK_DEPTH;
-- 
cgit v1.2.3


From 8fd329d04885eba7587bbe7604d3a1088e35de40 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 26 Sep 2008 11:18:06 -0600
Subject: mesa: fix temp register allocation problems.

Complex texcombine modes were running out of registers (>32 registers for 8 tex units).
---
 src/mesa/main/texenvprogram.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index c64d88faf9..97aa87e58c 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -398,6 +398,14 @@ static struct ureg get_tex_temp( struct texenv_fragment_program *p )
 }
 
 
+/** Mark a temp reg as being no longer allocatable. */
+static void reserve_temp( struct texenv_fragment_program *p, struct ureg r )
+{
+   if (r.file == PROGRAM_TEMPORARY)
+      p->temps_output |= (1 << r.idx);
+}
+
+
 static void release_temps(GLcontext *ctx, struct texenv_fragment_program *p )
 {
    GLuint max_temp = ctx->Const.FragmentProgram.MaxTemps;
@@ -491,10 +499,12 @@ emit_op(struct texenv_fragment_program *p,
 
    emit_dst( &inst->DstReg, dest, mask );
 
+#if 0
    /* Accounting for indirection tracking:
     */
    if (dest.file == PROGRAM_TEMPORARY)
       p->temps_output |= 1 << dest.idx;
+#endif
 
    return inst;
 }
@@ -549,6 +559,10 @@ static struct ureg emit_texld( struct texenv_fragment_program *p,
 
    p->program->Base.NumTexInstructions++;
 
+   /* Accounting for indirection tracking:
+    */
+   reserve_temp(p, dest);
+
    /* Is this a texture indirection?
     */
    if ((coord.file == PROGRAM_TEMPORARY &&
@@ -1062,6 +1076,7 @@ create_new_program(GLcontext *ctx, struct state_key *key,
       for (unit = 0 ; unit < ctx->Const.MaxTextureUnits; unit++)
 	 if (key->enabled_units & (1<<unit)) {
 	    p.src_previous = emit_texenv( &p, unit );
+            reserve_temp(&p, p.src_previous); /* don't re-use this temp reg */
 	    release_temps(ctx, &p);	/* release all temps */
 	 }
    }
-- 
cgit v1.2.3


From 5620c20b24dc4f780a2246eb5270c4476b487e0a Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 26 Sep 2008 11:18:06 -0600
Subject: mesa: fix temp register allocation problems.

Complex texcombine modes were running out of registers (>32 registers for 8 tex units).
---
 src/mesa/main/texenvprogram.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 2bce93eef1..f6bbbcfaed 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -411,6 +411,14 @@ static struct ureg get_tex_temp( struct texenv_fragment_program *p )
 }
 
 
+/** Mark a temp reg as being no longer allocatable. */
+static void reserve_temp( struct texenv_fragment_program *p, struct ureg r )
+{
+   if (r.file == PROGRAM_TEMPORARY)
+      p->temps_output |= (1 << r.idx);
+}
+
+
 static void release_temps(GLcontext *ctx, struct texenv_fragment_program *p )
 {
    GLuint max_temp = ctx->Const.FragmentProgram.MaxTemps;
@@ -504,10 +512,12 @@ emit_op(struct texenv_fragment_program *p,
 
    emit_dst( &inst->DstReg, dest, mask );
 
+#if 0
    /* Accounting for indirection tracking:
     */
    if (dest.file == PROGRAM_TEMPORARY)
       p->temps_output |= 1 << dest.idx;
+#endif
 
    return inst;
 }
@@ -562,6 +572,10 @@ static struct ureg emit_texld( struct texenv_fragment_program *p,
 
    p->program->Base.NumTexInstructions++;
 
+   /* Accounting for indirection tracking:
+    */
+   reserve_temp(p, dest);
+
    /* Is this a texture indirection?
     */
    if ((coord.file == PROGRAM_TEMPORARY &&
@@ -1079,6 +1093,7 @@ create_new_program(GLcontext *ctx, struct state_key *key,
       for (unit = 0 ; unit < ctx->Const.MaxTextureUnits; unit++)
 	 if (key->enabled_units & (1<<unit)) {
 	    p.src_previous = emit_texenv( &p, unit );
+            reserve_temp(&p, p.src_previous); /* don't re-use this temp reg */
 	    release_temps(ctx, &p);	/* release all temps */
 	 }
    }
-- 
cgit v1.2.3


From 6280e335706f95ed0ebb089d8f72aeede9b5a1ad Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Fri, 3 Oct 2008 13:51:56 +0100
Subject: mesa: shrink texenvprogram state key struct

---
 src/mesa/main/texenvprogram.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 97aa87e58c..ac49373604 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -44,15 +44,17 @@
 #define DISASSEM (MESA_VERBOSE & VERBOSE_DISASSEM)
 
 struct mode_opt {
-   GLuint Source:4;
-   GLuint Operand:3;
+   GLubyte Source:4;
+   GLubyte Operand:3;
 };
 
 struct state_key {
-   GLbitfield enabled_units;
+   GLuint nr_enabled_units:8;
+   GLuint enabled_units:8;
    GLuint separate_specular:1;
    GLuint fog_enabled:1;
    GLuint fog_mode:2;
+   GLuint inputs_available:12;
 
    struct {
       GLuint enabled:1;
@@ -62,10 +64,10 @@ struct state_key {
 
       GLuint NumArgsRGB:2;
       GLuint ModeRGB:4;
-      struct mode_opt OptRGB[3];
-
       GLuint NumArgsA:2;
       GLuint ModeA:4;
+
+      struct mode_opt OptRGB[3];
       struct mode_opt OptA[3];
    } unit[8];
 };
-- 
cgit v1.2.3


From fa1b533012030cd67148b5bf1e018fd5e30c96f8 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Fri, 3 Oct 2008 13:55:40 +0100
Subject: mesa: add new internal state for tracking current vertex attribs

---
 src/mesa/main/mtypes.h           |  1 +
 src/mesa/main/state.c            |  4 ++++
 src/mesa/shader/prog_statevars.c |  8 ++++++++
 src/mesa/shader/prog_statevars.h |  1 +
 src/mesa/vbo/vbo_exec_api.c      | 44 ++++++++++++++++++++++++----------------
 src/mesa/vbo/vbo_save_draw.c     | 24 ++++++++++++++--------
 6 files changed, 56 insertions(+), 26 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index a5e1cf6a27..bc099dabeb 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2744,6 +2744,7 @@ struct gl_matrix_stack
 #define _NEW_MULTISAMPLE        0x2000000  /**< __GLcontextRec::Multisample */
 #define _NEW_TRACK_MATRIX       0x4000000  /**< __GLcontextRec::VertexProgram */
 #define _NEW_PROGRAM            0x8000000  /**< __GLcontextRec::VertexProgram */
+#define _NEW_CURRENT_ATTRIB     0x10000000  /**< __GLcontextRec::Current */
 #define _NEW_ALL ~0
 /*@}*/
 
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index d355f78a0e..eb8dc2a339 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -407,6 +407,9 @@ _mesa_update_state_locked( GLcontext *ctx )
    GLbitfield new_state = ctx->NewState;
    GLbitfield prog_flags = _NEW_PROGRAM;
 
+   if (new_state == _NEW_CURRENT_ATTRIB) 
+      goto out;
+
    if (MESA_VERBOSE & VERBOSE_STATE)
       _mesa_print_state("_mesa_update_state", new_state);
 
@@ -484,6 +487,7 @@ _mesa_update_state_locked( GLcontext *ctx )
     * Set ctx->NewState to zero to avoid recursion if
     * Driver.UpdateState() has to call FLUSH_VERTICES().  (fixed?)
     */
+ out:
    new_state = ctx->NewState;
    ctx->NewState = 0;
    ctx->Driver.UpdateState(ctx, new_state);
diff --git a/src/mesa/shader/prog_statevars.c b/src/mesa/shader/prog_statevars.c
index 47c46f63ec..9cc33fa2c1 100644
--- a/src/mesa/shader/prog_statevars.c
+++ b/src/mesa/shader/prog_statevars.c
@@ -395,6 +395,12 @@ _mesa_fetch_state(GLcontext *ctx, const gl_state_index state[],
 
    case STATE_INTERNAL:
       switch (state[1]) {
+      case STATE_CURRENT_ATTRIB: {
+         const GLuint idx = (GLuint) state[2];
+         COPY_4V(value, ctx->Current.Attrib[idx]);
+         return;
+      }						  
+
       case STATE_NORMAL_SCALE:
          ASSIGN_4V(value, 
                    ctx->_ModelViewInvScale, 
@@ -565,6 +571,8 @@ _mesa_program_state_flags(const gl_state_index state[STATE_LENGTH])
 
    case STATE_INTERNAL:
       switch (state[1]) {
+      case STATE_CURRENT_ATTRIB:
+         return _NEW_CURRENT_ATTRIB;
 
       case STATE_NORMAL_SCALE:
          return _NEW_MODELVIEW;
diff --git a/src/mesa/shader/prog_statevars.h b/src/mesa/shader/prog_statevars.h
index 7b490e3d63..1f728c64e8 100644
--- a/src/mesa/shader/prog_statevars.h
+++ b/src/mesa/shader/prog_statevars.h
@@ -104,6 +104,7 @@ typedef enum gl_state_index_ {
    STATE_LOCAL,
 
    STATE_INTERNAL,		/* Mesa additions */
+   STATE_CURRENT_ATTRIB,        /* ctx->Current vertex attrib value */
    STATE_NORMAL_SCALE,
    STATE_TEXRECT_SCALE,
    STATE_FOG_PARAMS_OPTIMIZED,  /* for faster fog calc */
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c
index d70b4bb1a1..23f4f8331e 100644
--- a/src/mesa/vbo/vbo_exec_api.c
+++ b/src/mesa/vbo/vbo_exec_api.c
@@ -143,29 +143,37 @@ static void vbo_exec_copy_to_current( struct vbo_exec_context *exec )
 
    for (i = VBO_ATTRIB_POS+1 ; i < VBO_ATTRIB_MAX ; i++) {
       if (exec->vtx.attrsz[i]) {
-	 GLfloat *current = (GLfloat *)vbo->currval[i].Ptr;
-
          /* Note: the exec->vtx.current[i] pointers point into the
           * ctx->Current.Attrib and ctx->Light.Material.Attrib arrays.
           */
-	 COPY_CLEAN_4V(current, 
-		       exec->vtx.attrsz[i], 
-		       exec->vtx.attrptr[i]);
+	 GLfloat *current = (GLfloat *)vbo->currval[i].Ptr;
+         GLfloat tmp[4];
+
+         COPY_CLEAN_4V(tmp, 
+                       exec->vtx.attrsz[i], 
+                       exec->vtx.attrptr[i]);
+         
+         if (memcmp(current, tmp, sizeof(tmp)) != 0)
+         { 
+            memcpy(current, tmp, sizeof(tmp));
 
 	 
-	 /* Given that we explicitly state size here, there is no need
-	  * for the COPY_CLEAN above, could just copy 16 bytes and be
-	  * done.  The only problem is when Mesa accesses ctx->Current
-	  * directly.
-	  */
-	 vbo->currval[i].Size = exec->vtx.attrsz[i];
-
-	 /* This triggers rather too much recalculation of Mesa state
-	  * that doesn't get used (eg light positions).
-	  */
-	 if (i >= VBO_ATTRIB_MAT_FRONT_AMBIENT &&
-	     i <= VBO_ATTRIB_MAT_BACK_INDEXES)
-	    ctx->NewState |= _NEW_LIGHT;
+            /* Given that we explicitly state size here, there is no need
+             * for the COPY_CLEAN above, could just copy 16 bytes and be
+             * done.  The only problem is when Mesa accesses ctx->Current
+             * directly.
+             */
+            vbo->currval[i].Size = exec->vtx.attrsz[i];
+
+            /* This triggers rather too much recalculation of Mesa state
+             * that doesn't get used (eg light positions).
+             */
+            if (i >= VBO_ATTRIB_MAT_FRONT_AMBIENT &&
+                i <= VBO_ATTRIB_MAT_BACK_INDEXES)
+               ctx->NewState |= _NEW_LIGHT;
+            
+            ctx->NewState |= _NEW_CURRENT_ATTRIB;
+         }
       }
    }
 
diff --git a/src/mesa/vbo/vbo_save_draw.c b/src/mesa/vbo/vbo_save_draw.c
index ed82f09958..4c97acddb9 100644
--- a/src/mesa/vbo/vbo_save_draw.c
+++ b/src/mesa/vbo/vbo_save_draw.c
@@ -64,18 +64,26 @@ static void _playback_copy_to_current( GLcontext *ctx,
    for (i = VBO_ATTRIB_POS+1 ; i < VBO_ATTRIB_MAX ; i++) {
       if (node->attrsz[i]) {
 	 GLfloat *current = (GLfloat *)vbo->currval[i].Ptr;
+         GLfloat tmp[4];
 
-	 COPY_CLEAN_4V(current, 
-		       node->attrsz[i], 
-		       data);
+         COPY_CLEAN_4V(tmp, 
+                       node->attrsz[i], 
+                       data);
+         
+         if (memcmp(current, tmp, 4 * sizeof(GLfloat)) != 0)
+         {
+            memcpy(current, tmp, 4 * sizeof(GLfloat));
 
-	 vbo->currval[i].Size = node->attrsz[i];
+            vbo->currval[i].Size = node->attrsz[i];
 
-	 data += node->attrsz[i];
+            if (i >= VBO_ATTRIB_FIRST_MATERIAL &&
+                i <= VBO_ATTRIB_LAST_MATERIAL)
+               ctx->NewState |= _NEW_LIGHT;
+
+            ctx->NewState |= _NEW_CURRENT_ATTRIB;
+         }
 
-	 if (i >= VBO_ATTRIB_FIRST_MATERIAL &&
-	     i <= VBO_ATTRIB_LAST_MATERIAL)
-	    ctx->NewState |= _NEW_LIGHT;
+	 data += node->attrsz[i];
       }
    }
 
-- 
cgit v1.2.3


From 1680ef869625dc1fe9cf481b180382a34e0738e7 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Fri, 3 Oct 2008 17:30:59 +0100
Subject: mesa: avoid generating constant vertex attributes in fixedfunc
 programs

Keep track of enabled/active vertex attributes.
Keep track of potential vertex program outputs.

When generating fragment program, replace references to fragment attributes
which are effectively non-varying and non-computed passthrough attributes with
references to the new CURRENT_ATTRIB tracked state value.

Only downside is slight ugliness in VBO code where we need to validate state
twice in succession.
---
 src/mesa/main/mtypes.h        |  2 +
 src/mesa/main/state.c         | 38 ++++++++++++++++-
 src/mesa/main/state.h         |  3 ++
 src/mesa/main/texenvprogram.c | 94 ++++++++++++++++++++++++++++++++++++++++---
 src/mesa/vbo/vbo_exec_array.c | 41 +++++++++++++++----
 src/mesa/vbo/vbo_exec_draw.c  |  8 ++++
 src/mesa/vbo/vbo_save_draw.c  |  4 ++
 7 files changed, 177 insertions(+), 13 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index bc099dabeb..ca1e369a35 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -3073,6 +3073,8 @@ struct __GLcontextRec
    GLenum RenderMode;        /**< either GL_RENDER, GL_SELECT, GL_FEEDBACK */
    GLbitfield NewState;      /**< bitwise-or of _NEW_* flags */
 
+   GLuint varying_vp_inputs;
+
    /** \name Derived state */
    /*@{*/
    GLbitfield _TriangleCaps;      /**< bitwise-or of DD_* flags */
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index eb8dc2a339..e0eb5f81e2 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -465,7 +465,8 @@ _mesa_update_state_locked( GLcontext *ctx )
       _mesa_update_tnl_spaces( ctx, new_state );
 
    if (ctx->FragmentProgram._MaintainTexEnvProgram) {
-      prog_flags |= (_NEW_TEXTURE | _NEW_FOG | _DD_NEW_SEPARATE_SPECULAR);
+      prog_flags |= (_NEW_ARRAY | _NEW_TEXTURE_MATRIX | _NEW_LIGHT |
+                     _NEW_TEXTURE | _NEW_FOG | _DD_NEW_SEPARATE_SPECULAR);
    }
    if (ctx->VertexProgram._MaintainTnlProgram) {
       prog_flags |= (_NEW_ARRAY | _NEW_TEXTURE | _NEW_TEXTURE_MATRIX |
@@ -504,3 +505,38 @@ _mesa_update_state( GLcontext *ctx )
    _mesa_update_state_locked(ctx);
    _mesa_unlock_context_textures(ctx);
 }
+
+
+
+
+/* Want to figure out which fragment program inputs are actually
+ * constant/current values from ctx->Current.  These should be
+ * referenced as a tracked state variable rather than a fragment
+ * program input, to save the overhead of putting a constant value in
+ * every submitted vertex, transferring it to hardware, interpolating
+ * it across the triangle, etc...
+ *
+ * When there is a VP bound, just use vp->outputs.  But when we're
+ * generating vp from fixed function state, basically want to
+ * calculate:
+ *
+ * vp_out_2_fp_in( vp_in_2_vp_out( varying_inputs ) | 
+ *                 potential_vp_outputs )
+ *
+ * Where potential_vp_outputs is calculated by looking at enabled
+ * texgen, etc.
+ * 
+ * The generated fragment program should then only declare inputs that
+ * may vary or otherwise differ from the ctx->Current values.
+ * Otherwise, the fp should track them as state values instead.
+ */
+void
+_mesa_set_varying_vp_inputs( GLcontext *ctx,
+                             unsigned varying_inputs )
+{
+   if (ctx->varying_vp_inputs != varying_inputs) {
+      ctx->varying_vp_inputs = varying_inputs;
+      ctx->NewState |= _NEW_ARRAY;
+      //_mesa_printf("%s %x\n", __FUNCTION__, varying_inputs);
+   }
+}
diff --git a/src/mesa/main/state.h b/src/mesa/main/state.h
index bb7cb8f32a..dc08043a76 100644
--- a/src/mesa/main/state.h
+++ b/src/mesa/main/state.h
@@ -37,5 +37,8 @@ _mesa_update_state( GLcontext *ctx );
 extern void
 _mesa_update_state_locked( GLcontext *ctx );
 
+void
+_mesa_set_varying_vp_inputs( GLcontext *ctx,
+                             unsigned varying_inputs );
 
 #endif
diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index ac49373604..7cd82f98b0 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -189,6 +189,63 @@ static GLuint translate_tex_src_bit( GLbitfield bit )
    }
 }
 
+#define VERT_BIT_TEX_ANY    (0xff << VERT_ATTRIB_TEX0)
+#define VERT_RESULT_TEX_ANY (0xff << VERT_RESULT_TEX0)
+
+/* Identify all possible varying inputs.  The fragment program will
+ * never reference non-varying inputs, but will track them via state
+ * constants instead.
+ *
+ * This function figures out all the inputs that the fragment program
+ * has access to.  The bitmask is later reduced to just those which
+ * are actually referenced.
+ */
+static GLuint get_fp_input_mask( GLcontext *ctx )
+{
+   GLuint fp_inputs = 0;
+
+   if (1) {
+      GLuint varying_inputs = ctx->varying_vp_inputs;
+
+      /* First look at what values may be computed by the generated
+       * vertex program:
+       */
+      if (ctx->Light.Enabled) {
+         fp_inputs |= FRAG_BIT_COL0;
+
+         if (ctx->_TriangleCaps & DD_SEPARATE_SPECULAR)
+            fp_inputs |= FRAG_BIT_COL1;
+      }
+
+      fp_inputs |= (ctx->Texture._TexGenEnabled |
+                    ctx->Texture._TexMatEnabled) << FRAG_ATTRIB_TEX0;
+
+      /* Then look at what might be varying as a result of enabled
+       * arrays, etc:
+       */
+      if (varying_inputs & VERT_BIT_COLOR0) fp_inputs |= FRAG_BIT_COL0;
+      if (varying_inputs & VERT_BIT_COLOR1) fp_inputs |= FRAG_BIT_COL1;
+
+      fp_inputs |= (((varying_inputs & VERT_BIT_TEX_ANY) >> VERT_ATTRIB_TEX0) 
+                    << FRAG_ATTRIB_TEX0);
+
+   }
+   else {
+      /* calculate from vp->outputs */
+      GLuint vp_outputs = 0;
+
+      if (vp_outputs & (1 << VERT_RESULT_COL0)) fp_inputs |= FRAG_BIT_COL0;
+      if (vp_outputs & (1 << VERT_RESULT_COL1)) fp_inputs |= FRAG_BIT_COL1;
+
+      fp_inputs |= (((vp_outputs & VERT_RESULT_TEX_ANY) 
+                   << VERT_RESULT_TEX0) 
+                  >> FRAG_ATTRIB_TEX0);
+   }
+   
+   return fp_inputs;
+}
+
+
 /**
  * Examine current texture environment state and generate a unique
  * key to identify it.
@@ -196,17 +253,21 @@ static GLuint translate_tex_src_bit( GLbitfield bit )
 static void make_state_key( GLcontext *ctx,  struct state_key *key )
 {
    GLuint i, j;
-	
+   GLuint inputs_referenced = FRAG_BIT_COL0;
+   GLuint inputs_available = get_fp_input_mask( ctx );
+
    memset(key, 0, sizeof(*key));
 
    for (i=0;i<MAX_TEXTURE_UNITS;i++) {
       const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[i];
 		
-      if (!texUnit->_ReallyEnabled)
+      if (!texUnit->_ReallyEnabled) 
          continue;
 
       key->unit[i].enabled = 1;
       key->enabled_units |= (1<<i);
+      key->nr_enabled_units = i+1;
+      inputs_referenced |= FRAG_BIT_TEX(i);
 
       key->unit[i].source_index = 
 	 translate_tex_src_bit(texUnit->_ReallyEnabled);		
@@ -234,13 +295,18 @@ static void make_state_key( GLcontext *ctx,  struct state_key *key )
       }
    }
 	
-   if (ctx->_TriangleCaps & DD_SEPARATE_SPECULAR)
+   if (ctx->_TriangleCaps & DD_SEPARATE_SPECULAR) {
       key->separate_specular = 1;
+      inputs_referenced |= FRAG_BIT_COL1;
+   }
 
    if (ctx->Fog.Enabled) {
       key->fog_enabled = 1;
       key->fog_mode = translate_fog_mode(ctx->Fog.Mode);
+      inputs_referenced |= FRAG_BIT_FOGC; /* maybe */
    }
+
+   key->inputs_available = (inputs_available & inputs_referenced);
 }
 
 /* Use uregs to represent registers internally, translate to Mesa's
@@ -446,11 +512,29 @@ static struct ureg register_param5( struct texenv_fragment_program *p,
 #define register_param3(p,s0,s1,s2)    register_param5(p,s0,s1,s2,0,0)
 #define register_param4(p,s0,s1,s2,s3) register_param5(p,s0,s1,s2,s3,0)
 
+static GLuint frag_to_vert_attrib( GLuint attrib )
+{
+   switch (attrib) {
+   case FRAG_ATTRIB_COL0: return VERT_ATTRIB_COLOR0;
+   case FRAG_ATTRIB_COL1: return VERT_ATTRIB_COLOR1;
+   default:
+      assert(attrib >= FRAG_ATTRIB_TEX0);
+      assert(attrib <= FRAG_ATTRIB_TEX7);
+      return attrib - FRAG_ATTRIB_TEX0 + VERT_ATTRIB_TEX0;
+   }
+}
+
 
 static struct ureg register_input( struct texenv_fragment_program *p, GLuint input )
 {
-   p->program->Base.InputsRead |= (1 << input);
-   return make_ureg(PROGRAM_INPUT, input);
+   if (p->state->inputs_available & (1<<input)) {
+      p->program->Base.InputsRead |= (1 << input);
+      return make_ureg(PROGRAM_INPUT, input);
+   }
+   else {
+      GLuint idx = frag_to_vert_attrib( input );
+      return register_param3( p, STATE_INTERNAL, STATE_CURRENT_ATTRIB, idx );
+   }
 }
 
 
diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c
index 0f9d8da356..3d74f9f431 100644
--- a/src/mesa/vbo/vbo_exec_array.c
+++ b/src/mesa/vbo/vbo_exec_array.c
@@ -127,6 +127,7 @@ static void recalculate_input_bindings( GLcontext *ctx )
    struct vbo_context *vbo = vbo_context(ctx);
    struct vbo_exec_context *exec = &vbo->exec;
    const struct gl_client_array **inputs = &exec->array.inputs[0];
+   GLuint const_inputs = 0;
    GLuint i;
 
    exec->array.program_mode = get_program_mode(ctx);
@@ -141,19 +142,24 @@ static void recalculate_input_bindings( GLcontext *ctx )
       for (i = 0; i <= VERT_ATTRIB_TEX7; i++) {
 	 if (exec->array.legacy_array[i]->Enabled)
 	    inputs[i] = exec->array.legacy_array[i];
-	 else
+	 else {
 	    inputs[i] = &vbo->legacy_currval[i];
+            const_inputs |= 1 << i;
+         }
       }
 
       for (i = 0; i < MAT_ATTRIB_MAX; i++) {
 	 inputs[VERT_ATTRIB_GENERIC0 + i] = &vbo->mat_currval[i];
+         const_inputs |= 1 << (VERT_ATTRIB_GENERIC0 + i);
       }
 
       /* Could use just about anything, just to fill in the empty
        * slots:
        */
-      for (i = MAT_ATTRIB_MAX; i < VERT_ATTRIB_MAX - VERT_ATTRIB_GENERIC0; i++)
+      for (i = MAT_ATTRIB_MAX; i < VERT_ATTRIB_MAX - VERT_ATTRIB_GENERIC0; i++) {
 	 inputs[VERT_ATTRIB_GENERIC0 + i] = &vbo->generic_currval[i];
+         const_inputs |= 1 << (VERT_ATTRIB_GENERIC0 + i);
+      }
 
       break;
    case VP_NV:
@@ -166,15 +172,19 @@ static void recalculate_input_bindings( GLcontext *ctx )
 	    inputs[i] = exec->array.generic_array[i];
 	 else if (exec->array.legacy_array[i]->Enabled)
 	    inputs[i] = exec->array.legacy_array[i];
-	 else
+	 else {
 	    inputs[i] = &vbo->legacy_currval[i];
+            const_inputs |= 1 << i;
+         }
       }
 
       /* Could use just about anything, just to fill in the empty
        * slots:
        */
-      for (i = VERT_ATTRIB_GENERIC0; i < VERT_ATTRIB_MAX; i++)
+      for (i = VERT_ATTRIB_GENERIC0; i < VERT_ATTRIB_MAX; i++) {
 	 inputs[i] = &vbo->generic_currval[i - VERT_ATTRIB_GENERIC0];
+         const_inputs |= 1 << i;
+      }
 
       break;
    case VP_ARB:
@@ -189,25 +199,34 @@ static void recalculate_input_bindings( GLcontext *ctx )
 	 inputs[0] = exec->array.generic_array[0];
       else if (exec->array.legacy_array[0]->Enabled)
 	 inputs[0] = exec->array.legacy_array[0];
-      else
+      else {
 	 inputs[0] = &vbo->legacy_currval[0];
+         const_inputs |= 1 << 0;
+      }
 
 
       for (i = 1; i <= VERT_ATTRIB_TEX7; i++) {
 	 if (exec->array.legacy_array[i]->Enabled)
 	    inputs[i] = exec->array.legacy_array[i];
-	 else
+	 else {
 	    inputs[i] = &vbo->legacy_currval[i];
+            const_inputs |= 1 << i;
+         }
       }
 
       for (i = 0; i < 16; i++) {
 	 if (exec->array.generic_array[i]->Enabled)
 	    inputs[VERT_ATTRIB_GENERIC0 + i] = exec->array.generic_array[i];
-	 else
+	 else {
 	    inputs[VERT_ATTRIB_GENERIC0 + i] = &vbo->generic_currval[i];
+            const_inputs |= 1 << (VERT_ATTRIB_GENERIC0 + i);
+         }
+
       }
       break;
    }
+
+   _mesa_set_varying_vp_inputs( ctx, ~const_inputs );
 }
 
 static void bind_arrays( GLcontext *ctx )
@@ -257,6 +276,11 @@ vbo_exec_DrawArrays(GLenum mode, GLint start, GLsizei count)
 
    bind_arrays( ctx );
 
+   /* Again...
+    */
+   if (ctx->NewState)
+      _mesa_update_state( ctx );
+
    prim[0].begin = 1;
    prim[0].end = 1;
    prim[0].weak = 0;
@@ -297,6 +321,9 @@ vbo_exec_DrawRangeElements(GLenum mode,
 
    bind_arrays( ctx );
 
+   if (ctx->NewState)
+      _mesa_update_state( ctx );
+
    ib.count = count;
    ib.type = type; 
    ib.obj = ctx->Array.ElementArrayBufferObj;
diff --git a/src/mesa/vbo/vbo_exec_draw.c b/src/mesa/vbo/vbo_exec_draw.c
index f497e9a5a5..ad60c9b05f 100644
--- a/src/mesa/vbo/vbo_exec_draw.c
+++ b/src/mesa/vbo/vbo_exec_draw.c
@@ -150,6 +150,7 @@ static void vbo_exec_bind_arrays( GLcontext *ctx )
    GLubyte *data = exec->vtx.buffer_map;
    const GLuint *map;
    GLuint attr;
+   GLuint varying_inputs = 0;
 
    /* Install the default (ie Current) attributes first, then overlay
     * all active ones.
@@ -211,8 +212,11 @@ static void vbo_exec_bind_arrays( GLcontext *ctx )
 	 arrays[attr]._MaxElement = count; /* ??? */
 
 	 data += exec->vtx.attrsz[src] * sizeof(GLfloat);
+         varying_inputs |= 1<<attr;
       }
    }
+
+   _mesa_set_varying_vp_inputs( ctx, varying_inputs );
 }
 
 
@@ -242,6 +246,10 @@ void vbo_exec_vtx_flush( struct vbo_exec_context *exec )
 	  */
 	 vbo_exec_bind_arrays( ctx );
 
+         if (ctx->NewState)
+            _mesa_update_state( ctx );
+
+
 	 ctx->Driver.UnmapBuffer(ctx, target, exec->vtx.bufferobj);
 	 exec->vtx.buffer_map = NULL;
 
diff --git a/src/mesa/vbo/vbo_save_draw.c b/src/mesa/vbo/vbo_save_draw.c
index 4c97acddb9..b015bf2786 100644
--- a/src/mesa/vbo/vbo_save_draw.c
+++ b/src/mesa/vbo/vbo_save_draw.c
@@ -118,6 +118,7 @@ static void vbo_bind_vertex_list( GLcontext *ctx,
    GLuint data = node->buffer_offset;
    const GLuint *map;
    GLuint attr;
+   GLuint varying_inputs = 0;
 
    /* Install the default (ie Current) attributes first, then overlay
     * all active ones.
@@ -167,8 +168,11 @@ static void vbo_bind_vertex_list( GLcontext *ctx,
 	 assert(arrays[attr].BufferObj->Name);
 
 	 data += node->attrsz[src] * sizeof(GLfloat);
+         varying_inputs |= 1<<attr;
       }
    }
+
+   _mesa_set_varying_vp_inputs( ctx, varying_inputs );
 }
 
 static void vbo_save_loopback_vertex_list( GLcontext *ctx,
-- 
cgit v1.2.3


From 0370d6b359016790c6b879c2a4b6661adac20dea Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Sat, 4 Oct 2008 12:41:56 +0100
Subject: mesa: handle vertex program enabled case also in texenvprogram.c

---
 src/mesa/main/texenvprogram.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 7cd82f98b0..ea2ee160e4 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -204,7 +204,7 @@ static GLuint get_fp_input_mask( GLcontext *ctx )
 {
    GLuint fp_inputs = 0;
 
-   if (1) {
+   if (!ctx->VertexProgram._Enabled) {
       GLuint varying_inputs = ctx->varying_vp_inputs;
 
       /* First look at what values may be computed by the generated
@@ -232,14 +232,13 @@ static GLuint get_fp_input_mask( GLcontext *ctx )
    }
    else {
       /* calculate from vp->outputs */
-      GLuint vp_outputs = 0;
+      GLuint vp_outputs = ctx->VertexProgram._Current->Base.OutputsWritten;
 
       if (vp_outputs & (1 << VERT_RESULT_COL0)) fp_inputs |= FRAG_BIT_COL0;
       if (vp_outputs & (1 << VERT_RESULT_COL1)) fp_inputs |= FRAG_BIT_COL1;
 
-      fp_inputs |= (((vp_outputs & VERT_RESULT_TEX_ANY) 
-                   << VERT_RESULT_TEX0) 
-                  >> FRAG_ATTRIB_TEX0);
+      fp_inputs |= (((vp_outputs & VERT_RESULT_TEX_ANY) >> VERT_RESULT_TEX0) 
+                    << FRAG_ATTRIB_TEX0);
    }
    
    return fp_inputs;
-- 
cgit v1.2.3


From f362788eae3d300e4003e8996dc79fc1947a0f60 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 6 Oct 2008 09:27:31 -0600
Subject: mesa: add missing GLcontext param to _mesa_delete_query().

Fixes vtk crash and others.
---
 src/mesa/main/queryobj.c | 2 +-
 src/mesa/main/queryobj.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c
index a1e32e70ba..2d06030030 100644
--- a/src/mesa/main/queryobj.c
+++ b/src/mesa/main/queryobj.c
@@ -95,7 +95,7 @@ _mesa_wait_query(GLcontext *ctx, struct gl_query_object *q)
  * XXX maybe add Delete() method to gl_query_object class and call that instead
  */
 void
-_mesa_delete_query(struct gl_query_object *q)
+_mesa_delete_query(GLcontext *ctx, struct gl_query_object *q)
 {
    _mesa_free(q);
 }
diff --git a/src/mesa/main/queryobj.h b/src/mesa/main/queryobj.h
index c05a1f3da8..9a9774641b 100644
--- a/src/mesa/main/queryobj.h
+++ b/src/mesa/main/queryobj.h
@@ -37,7 +37,7 @@ extern void
 _mesa_free_query_data(GLcontext *ctx);
 
 extern void
-_mesa_delete_query(struct gl_query_object *q);
+_mesa_delete_query(GLcontext *ctx, struct gl_query_object *q);
 
 extern void
 _mesa_begin_query(GLcontext *ctx, struct gl_query_object *q);
-- 
cgit v1.2.3


From d055b2c001a0fb233f98c10d124b43dd2448059e Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Mon, 6 Oct 2008 17:10:45 -0600
Subject: mesa: fix convolve/convolution mix-ups

---
 src/mesa/main/api_exec.c               | 4 ++--
 src/mesa/main/mfeatures.h              | 2 +-
 src/mesa/state_tracker/st_cb_texture.c | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index 0c3c9c4de4..bae3bf11cb 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -58,7 +58,7 @@
 #include "colortab.h"
 #endif
 #include "context.h"
-#if FEATURE_convolution
+#if FEATURE_convolve
 #include "convolve.h"
 #endif
 #include "depth.h"
@@ -402,7 +402,7 @@ _mesa_init_exec_table(struct _glapi_table *exec)
    SET_GetColorTableParameteriv(exec, _mesa_GetColorTableParameteriv);
 #endif
 
-#if FEATURE_convolution
+#if FEATURE_convolve
    SET_ConvolutionFilter1D(exec, _mesa_ConvolutionFilter1D);
    SET_ConvolutionFilter2D(exec, _mesa_ConvolutionFilter2D);
    SET_ConvolutionParameterf(exec, _mesa_ConvolutionParameterf);
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index b08c017ec8..487493f88e 100644
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -39,7 +39,7 @@
 #define FEATURE_accum  _HAVE_FULL_GL
 #define FEATURE_attrib_stack  _HAVE_FULL_GL
 #define FEATURE_colortable  _HAVE_FULL_GL
-#define FEATURE_convolution  _HAVE_FULL_GL
+#define FEATURE_convolve  _HAVE_FULL_GL
 #define FEATURE_dispatch  _HAVE_FULL_GL
 #define FEATURE_dlist  _HAVE_FULL_GL
 #define FEATURE_draw_read_buffer  _HAVE_FULL_GL
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index 958f88bf2c..a018cdee64 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -26,7 +26,7 @@
  **************************************************************************/
 
 #include "main/imports.h"
-#if FEATURE_convolution
+#if FEATURE_convolve
 #include "main/convolve.h"
 #endif
 #include "main/enums.h"
@@ -409,7 +409,7 @@ st_TexImage(GLcontext * ctx,
    stImage->face = _mesa_tex_target_to_face(target);
    stImage->level = level;
 
-#if FEATURE_convolution
+#if FEATURE_convolve
    if (ctx->_ImageTransferState & IMAGE_CONVOLUTION_BIT) {
       _mesa_adjust_image_for_convolution(ctx, dims, &postConvWidth,
                                          &postConvHeight);
-- 
cgit v1.2.3


From 6ff1cf5b82488dc5a07513b0806c23e70f7a665e Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Tue, 7 Oct 2008 12:31:31 +0100
Subject: mesa: protect against segfault in get_fp_input_mask()

---
 src/mesa/main/texenvprogram.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index ea2ee160e4..7049467c22 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -204,7 +204,10 @@ static GLuint get_fp_input_mask( GLcontext *ctx )
 {
    GLuint fp_inputs = 0;
 
-   if (!ctx->VertexProgram._Enabled) {
+   if (!ctx->VertexProgram._Enabled ||
+       !ctx->VertexProgram._Current) {
+
+      /* Fixed function logic */
       GLuint varying_inputs = ctx->varying_vp_inputs;
 
       /* First look at what values may be computed by the generated
-- 
cgit v1.2.3


From 239617fbe22d4dd7b2794510a6665f09602b5adf Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Tue, 7 Oct 2008 11:22:47 -0600
Subject: mesa: replace GLuint with GLbitfield to be clearer about usage

Also, fix up some comments to be doxygen style.
---
 src/mesa/main/mtypes.h        |  2 +-
 src/mesa/main/state.c         |  2 +-
 src/mesa/main/state.h         |  2 +-
 src/mesa/main/texenvprogram.c | 30 ++++++++++++++++--------------
 src/mesa/vbo/vbo_exec_array.c |  2 +-
 src/mesa/vbo/vbo_exec_draw.c  |  2 +-
 src/mesa/vbo/vbo_save_draw.c  |  2 +-
 7 files changed, 22 insertions(+), 20 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index ca1e369a35..dff474d6d0 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -3073,7 +3073,7 @@ struct __GLcontextRec
    GLenum RenderMode;        /**< either GL_RENDER, GL_SELECT, GL_FEEDBACK */
    GLbitfield NewState;      /**< bitwise-or of _NEW_* flags */
 
-   GLuint varying_vp_inputs;
+   GLbitfield varying_vp_inputs;  /**< mask of VERT_BIT_* flags */
 
    /** \name Derived state */
    /*@{*/
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index e0eb5f81e2..b124d48269 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -532,7 +532,7 @@ _mesa_update_state( GLcontext *ctx )
  */
 void
 _mesa_set_varying_vp_inputs( GLcontext *ctx,
-                             unsigned varying_inputs )
+                             GLbitfield varying_inputs )
 {
    if (ctx->varying_vp_inputs != varying_inputs) {
       ctx->varying_vp_inputs = varying_inputs;
diff --git a/src/mesa/main/state.h b/src/mesa/main/state.h
index dc08043a76..79f2f6beb0 100644
--- a/src/mesa/main/state.h
+++ b/src/mesa/main/state.h
@@ -39,6 +39,6 @@ _mesa_update_state_locked( GLcontext *ctx );
 
 void
 _mesa_set_varying_vp_inputs( GLcontext *ctx,
-                             unsigned varying_inputs );
+                             GLbitfield varying_inputs );
 
 #endif
diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 7049467c22..638d6be5ad 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -192,7 +192,8 @@ static GLuint translate_tex_src_bit( GLbitfield bit )
 #define VERT_BIT_TEX_ANY    (0xff << VERT_ATTRIB_TEX0)
 #define VERT_RESULT_TEX_ANY (0xff << VERT_RESULT_TEX0)
 
-/* Identify all possible varying inputs.  The fragment program will
+/**
+ * Identify all possible varying inputs.  The fragment program will
  * never reference non-varying inputs, but will track them via state
  * constants instead.
  *
@@ -200,15 +201,15 @@ static GLuint translate_tex_src_bit( GLbitfield bit )
  * has access to.  The bitmask is later reduced to just those which
  * are actually referenced.
  */
-static GLuint get_fp_input_mask( GLcontext *ctx )
+static GLbitfield get_fp_input_mask( GLcontext *ctx )
 {
-   GLuint fp_inputs = 0;
+   GLbitfield fp_inputs = 0x0;
 
    if (!ctx->VertexProgram._Enabled ||
        !ctx->VertexProgram._Current) {
 
       /* Fixed function logic */
-      GLuint varying_inputs = ctx->varying_vp_inputs;
+      GLbitfield varying_inputs = ctx->varying_vp_inputs;
 
       /* First look at what values may be computed by the generated
        * vertex program:
@@ -235,7 +236,7 @@ static GLuint get_fp_input_mask( GLcontext *ctx )
    }
    else {
       /* calculate from vp->outputs */
-      GLuint vp_outputs = ctx->VertexProgram._Current->Base.OutputsWritten;
+      GLbitfield vp_outputs = ctx->VertexProgram._Current->Base.OutputsWritten;
 
       if (vp_outputs & (1 << VERT_RESULT_COL0)) fp_inputs |= FRAG_BIT_COL0;
       if (vp_outputs & (1 << VERT_RESULT_COL1)) fp_inputs |= FRAG_BIT_COL1;
@@ -255,8 +256,8 @@ static GLuint get_fp_input_mask( GLcontext *ctx )
 static void make_state_key( GLcontext *ctx,  struct state_key *key )
 {
    GLuint i, j;
-   GLuint inputs_referenced = FRAG_BIT_COL0;
-   GLuint inputs_available = get_fp_input_mask( ctx );
+   GLbitfield inputs_referenced = FRAG_BIT_COL0;
+   GLbitfield inputs_available = get_fp_input_mask( ctx );
 
    memset(key, 0, sizeof(*key));
 
@@ -311,7 +312,8 @@ static void make_state_key( GLcontext *ctx,  struct state_key *key )
    key->inputs_available = (inputs_available & inputs_referenced);
 }
 
-/* Use uregs to represent registers internally, translate to Mesa's
+/**
+ * Use uregs to represent registers internally, translate to Mesa's
  * expected formats on emit.  
  *
  * NOTE: These are passed by value extensively in this file rather
@@ -344,16 +346,16 @@ static const struct ureg undef = {
 };
 
 
-/* State used to build the fragment program:
+/** State used to build the fragment program:
  */
 struct texenv_fragment_program {
    struct gl_fragment_program *program;
    GLcontext *ctx;
    struct state_key *state;
 
-   GLbitfield alu_temps;	/* Track texture indirections, see spec. */
-   GLbitfield temps_output;	/* Track texture indirections, see spec. */
-   GLbitfield temp_in_use;	/* Tracks temporary regs which are in use. */
+   GLbitfield alu_temps;	/**< Track texture indirections, see spec. */
+   GLbitfield temps_output;	/**< Track texture indirections, see spec. */
+   GLbitfield temp_in_use;	/**< Tracks temporary regs which are in use. */
    GLboolean error;
 
    struct ureg src_texture[MAX_TEXTURE_UNITS];   
@@ -361,11 +363,11 @@ struct texenv_fragment_program {
     * else undef.
     */
 
-   struct ureg src_previous;	/* Reg containing color from previous 
+   struct ureg src_previous;	/**< Reg containing color from previous 
 				 * stage.  May need to be decl'd.
 				 */
 
-   GLuint last_tex_stage;	/* Number of last enabled texture unit */
+   GLuint last_tex_stage;	/**< Number of last enabled texture unit */
 
    struct ureg half;
    struct ureg one;
diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c
index 3d74f9f431..8871e10cf6 100644
--- a/src/mesa/vbo/vbo_exec_array.c
+++ b/src/mesa/vbo/vbo_exec_array.c
@@ -127,7 +127,7 @@ static void recalculate_input_bindings( GLcontext *ctx )
    struct vbo_context *vbo = vbo_context(ctx);
    struct vbo_exec_context *exec = &vbo->exec;
    const struct gl_client_array **inputs = &exec->array.inputs[0];
-   GLuint const_inputs = 0;
+   GLbitfield const_inputs = 0x0;
    GLuint i;
 
    exec->array.program_mode = get_program_mode(ctx);
diff --git a/src/mesa/vbo/vbo_exec_draw.c b/src/mesa/vbo/vbo_exec_draw.c
index ad60c9b05f..ae43857c8a 100644
--- a/src/mesa/vbo/vbo_exec_draw.c
+++ b/src/mesa/vbo/vbo_exec_draw.c
@@ -150,7 +150,7 @@ static void vbo_exec_bind_arrays( GLcontext *ctx )
    GLubyte *data = exec->vtx.buffer_map;
    const GLuint *map;
    GLuint attr;
-   GLuint varying_inputs = 0;
+   GLbitfield varying_inputs = 0x0;
 
    /* Install the default (ie Current) attributes first, then overlay
     * all active ones.
diff --git a/src/mesa/vbo/vbo_save_draw.c b/src/mesa/vbo/vbo_save_draw.c
index 68f3a965a5..0488c5d718 100644
--- a/src/mesa/vbo/vbo_save_draw.c
+++ b/src/mesa/vbo/vbo_save_draw.c
@@ -118,7 +118,7 @@ static void vbo_bind_vertex_list( GLcontext *ctx,
    GLuint data = node->buffer_offset;
    const GLuint *map;
    GLuint attr;
-   GLuint varying_inputs = 0;
+   GLbitfield varying_inputs = 0x0;
 
    /* Install the default (ie Current) attributes first, then overlay
     * all active ones.
-- 
cgit v1.2.3


From 6d4d51d647c27288aa625560bc080231099c0b01 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 10 Oct 2008 13:39:14 -0600
Subject: mesa: new _mesa_set_vp_override() function for driver-override of
 vertex program

Patch provide by Keith.
Used in state tracker by DrawPixels to indicate that the state tracker (driver)
is using its own vertex program.  This prevents the texenvprogram code from
replacing conventional shader inputs with state vars.
Fixes glDraw/CopyPixels regressions.
---
 src/mesa/main/mtypes.h                    |  2 ++
 src/mesa/main/state.c                     | 29 ++++++++++++++++++++++++++---
 src/mesa/main/state.h                     | 17 +++++++++++------
 src/mesa/main/texenvprogram.c             | 14 ++++++++++++--
 src/mesa/state_tracker/st_cb_drawpixels.c |  6 ++++++
 5 files changed, 57 insertions(+), 11 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index dff474d6d0..fab6ad05ee 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2007,6 +2007,8 @@ struct gl_vertex_program_state
    GLboolean CallbackEnabled;
    GLuint CurrentPosition;
 #endif
+
+   GLboolean _Overriden;
 };
 
 
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index b124d48269..a962f1cb41 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -1,6 +1,6 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.1
+ * Version:  7.3
  *
  * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  *
@@ -466,10 +466,12 @@ _mesa_update_state_locked( GLcontext *ctx )
 
    if (ctx->FragmentProgram._MaintainTexEnvProgram) {
       prog_flags |= (_NEW_ARRAY | _NEW_TEXTURE_MATRIX | _NEW_LIGHT |
+                     _NEW_RENDERMODE |
                      _NEW_TEXTURE | _NEW_FOG | _DD_NEW_SEPARATE_SPECULAR);
    }
    if (ctx->VertexProgram._MaintainTnlProgram) {
       prog_flags |= (_NEW_ARRAY | _NEW_TEXTURE | _NEW_TEXTURE_MATRIX |
+                     _NEW_RENDERMODE |
                      _NEW_TRANSFORM | _NEW_POINT |
                      _NEW_FOG | _NEW_LIGHT |
                      _MESA_NEW_NEED_EYE_COORDS);
@@ -509,7 +511,8 @@ _mesa_update_state( GLcontext *ctx )
 
 
 
-/* Want to figure out which fragment program inputs are actually
+/**
+ * Want to figure out which fragment program inputs are actually
  * constant/current values from ctx->Current.  These should be
  * referenced as a tracked state variable rather than a fragment
  * program input, to save the overhead of putting a constant value in
@@ -537,6 +540,26 @@ _mesa_set_varying_vp_inputs( GLcontext *ctx,
    if (ctx->varying_vp_inputs != varying_inputs) {
       ctx->varying_vp_inputs = varying_inputs;
       ctx->NewState |= _NEW_ARRAY;
-      //_mesa_printf("%s %x\n", __FUNCTION__, varying_inputs);
+      /*_mesa_printf("%s %x\n", __FUNCTION__, varying_inputs);*/
+   }
+}
+
+
+/**
+ * Used by drivers to tell core Mesa that the driver is going to
+ * install/ use its own vertex program.  In particular, this will
+ * prevent generated fragment programs from using state vars instead
+ * of ordinary varyings/inputs.
+ */
+void
+_mesa_set_vp_override(GLcontext *ctx, GLboolean flag)
+{
+   if (ctx->VertexProgram._Overriden != flag) {
+      ctx->VertexProgram._Overriden = flag;
+
+      /* Set one of the bits which will trigger fragment program
+       * regeneration:
+       */
+      ctx->NewState |= _NEW_ARRAY; 
    }
 }
diff --git a/src/mesa/main/state.h b/src/mesa/main/state.h
index 79f2f6beb0..29db08a0b9 100644
--- a/src/mesa/main/state.h
+++ b/src/mesa/main/state.h
@@ -1,6 +1,6 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.1
+ * Version:  7.3
  *
  * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  *
@@ -29,16 +29,21 @@
 #include "mtypes.h"
 
 extern void
-_mesa_update_state( GLcontext *ctx );
+_mesa_update_state(GLcontext *ctx);
 
 /* As above but can only be called between _mesa_lock_context_textures() and 
  * _mesa_unlock_context_textures().
  */
 extern void
-_mesa_update_state_locked( GLcontext *ctx );
+_mesa_update_state_locked(GLcontext *ctx);
+
+
+extern void
+_mesa_set_varying_vp_inputs(GLcontext *ctx, GLbitfield varying_inputs);
+
+
+extern void
+_mesa_set_vp_override(GLcontext *ctx, GLboolean flag);
 
-void
-_mesa_set_varying_vp_inputs( GLcontext *ctx,
-                             GLbitfield varying_inputs );
 
 #endif
diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 638d6be5ad..f3bac86dfe 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -205,8 +205,18 @@ static GLbitfield get_fp_input_mask( GLcontext *ctx )
 {
    GLbitfield fp_inputs = 0x0;
 
-   if (!ctx->VertexProgram._Enabled ||
-       !ctx->VertexProgram._Current) {
+   if (ctx->VertexProgram._Overriden) {
+      /* Somebody's messing with the vertex program and we don't have
+       * a clue what's happening.  Assume that it could be producing
+       * all possible outputs.
+       */
+      fp_inputs = ~0;
+   }
+   else if (ctx->RenderMode == GL_FEEDBACK) {
+      fp_inputs = (FRAG_BIT_COL0 | FRAG_BIT_TEX0);
+   }
+   else if (!ctx->VertexProgram._Enabled ||
+            !ctx->VertexProgram._Current) {
 
       /* Fixed function logic */
       GLbitfield varying_inputs = ctx->varying_vp_inputs;
diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index 00bbcae32a..5b24b9f068 100644
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -35,6 +35,7 @@
 #include "main/bufferobj.h"
 #include "main/macros.h"
 #include "main/texformat.h"
+#include "main/state.h"
 #include "shader/program.h"
 #include "shader/prog_parameter.h"
 #include "shader/prog_print.h"
@@ -835,6 +836,9 @@ st_DrawPixels(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height,
       return;
    }
 
+   _mesa_set_vp_override( ctx, TRUE );
+   _mesa_update_state( ctx );
+
    st_validate_state(st);
 
    if (format == GL_DEPTH_COMPONENT) {
@@ -874,6 +878,8 @@ st_DrawPixels(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height,
       /* blit */
       draw_blit(st, width, height, format, type, pixels);
    }
+
+   _mesa_set_vp_override( ctx, FALSE );
 }
 
 
-- 
cgit v1.2.3


From 568e96b4533c5135f4d7f568a81cdfc0a6dcd7eb Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Tue, 14 Oct 2008 14:15:26 +0100
Subject: mesa: modify fixed function vertex programs not to reference constant
 attributes

---
 src/mesa/main/context.c       |  1 +
 src/mesa/main/ffvertex_prog.c | 70 ++++++++++++++++++++++++-------------------
 2 files changed, 41 insertions(+), 30 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 144da61384..e5ec35c77f 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1064,6 +1064,7 @@ init_attrib_groups(GLcontext *ctx)
    ctx->NewState = _NEW_ALL;
    ctx->ErrorValue = (GLenum) GL_NO_ERROR;
    ctx->_Facing = 0;
+   ctx->varying_vp_inputs = ~0;
 
    return GL_TRUE;
 }
diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index 787672be9f..dff4306322 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -47,17 +47,17 @@
 
 
 struct state_key {
+   unsigned light_color_material_mask:12;
+   unsigned light_material_mask:12;
    unsigned light_global_enabled:1;
    unsigned light_local_viewer:1;
    unsigned light_twoside:1;
    unsigned light_color_material:1;
-   unsigned light_color_material_mask:12;
-   unsigned light_material_mask:12;
    unsigned material_shininess_is_zero:1;
-
    unsigned need_eye_coords:1;
    unsigned normalize:1;
    unsigned rescale_normals:1;
+
    unsigned fog_source_is_depth:1;
    unsigned tnl_do_vertex_fog:1;
    unsigned separate_specular:1;
@@ -67,6 +67,8 @@ struct state_key {
    unsigned texture_enabled_global:1;
    unsigned fragprog_inputs_read:12;
 
+   unsigned varying_vp_inputs;
+
    struct {
       unsigned light_enabled:1;
       unsigned light_eyepos3_is_zero:1;
@@ -193,6 +195,7 @@ static struct state_key *make_state_key( GLcontext *ctx )
    key->need_eye_coords = ctx->_NeedEyeCoords;
 
    key->fragprog_inputs_read = fp->Base.InputsRead;
+   key->varying_vp_inputs = ctx->varying_vp_inputs;
 
    if (ctx->RenderMode == GL_FEEDBACK) {
       /* make sure the vertprog emits color and tex0 */
@@ -450,14 +453,46 @@ static void release_temps( struct tnl_program *p )
 }
 
 
+static struct ureg register_param5(struct tnl_program *p, 
+				   GLint s0,
+				   GLint s1,
+				   GLint s2,
+				   GLint s3,
+                                   GLint s4)
+{
+   gl_state_index tokens[STATE_LENGTH];
+   GLint idx;
+   tokens[0] = s0;
+   tokens[1] = s1;
+   tokens[2] = s2;
+   tokens[3] = s3;
+   tokens[4] = s4;
+   idx = _mesa_add_state_reference( p->program->Base.Parameters, tokens );
+   return make_ureg(PROGRAM_STATE_VAR, idx);
+}
+
+
+#define register_param1(p,s0)          register_param5(p,s0,0,0,0,0)
+#define register_param2(p,s0,s1)       register_param5(p,s0,s1,0,0,0)
+#define register_param3(p,s0,s1,s2)    register_param5(p,s0,s1,s2,0,0)
+#define register_param4(p,s0,s1,s2,s3) register_param5(p,s0,s1,s2,s3,0)
+
+
 
 /**
  * \param input  one of VERT_ATTRIB_x tokens.
  */
 static struct ureg register_input( struct tnl_program *p, GLuint input )
 {
-   p->program->Base.InputsRead |= (1<<input);
-   return make_ureg(PROGRAM_INPUT, input);
+   /* Material attribs are passed here as inputs >= 32
+    */
+   if (input >= 32 || (p->state->varying_vp_inputs & (1<<input))) {
+      p->program->Base.InputsRead |= (1<<input);
+      return make_ureg(PROGRAM_INPUT, input);
+   }
+   else {
+      return register_param3( p, STATE_INTERNAL, STATE_CURRENT_ATTRIB, input );
+   }
 }
 
 /**
@@ -506,31 +541,6 @@ static struct ureg get_identity_param( struct tnl_program *p )
    return p->identity;
 }
 
-static struct ureg register_param5(struct tnl_program *p, 
-				   GLint s0,
-				   GLint s1,
-				   GLint s2,
-				   GLint s3,
-                                   GLint s4)
-{
-   gl_state_index tokens[STATE_LENGTH];
-   GLint idx;
-   tokens[0] = s0;
-   tokens[1] = s1;
-   tokens[2] = s2;
-   tokens[3] = s3;
-   tokens[4] = s4;
-   idx = _mesa_add_state_reference( p->program->Base.Parameters, tokens );
-   return make_ureg(PROGRAM_STATE_VAR, idx);
-}
-
-
-#define register_param1(p,s0)          register_param5(p,s0,0,0,0,0)
-#define register_param2(p,s0,s1)       register_param5(p,s0,s1,0,0,0)
-#define register_param3(p,s0,s1,s2)    register_param5(p,s0,s1,s2,0,0)
-#define register_param4(p,s0,s1,s2,s3) register_param5(p,s0,s1,s2,s3,0)
-
-
 static void register_matrix_param5( struct tnl_program *p,
 				    GLint s0, /* modelview, projection, etc */
 				    GLint s1, /* texture matrix number */
-- 
cgit v1.2.3


From 97e63437dc216c7fdb25220655ecbf26042cfec8 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Mon, 20 Oct 2008 13:03:45 +0100
Subject: mesa: note that texcoords are generated by setup routines when
 pointsprite enabled

---
 src/mesa/main/texenvprogram.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index f3bac86dfe..c279956f2a 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -221,6 +221,12 @@ static GLbitfield get_fp_input_mask( GLcontext *ctx )
       /* Fixed function logic */
       GLbitfield varying_inputs = ctx->varying_vp_inputs;
 
+      /* These get generated in the setup routine regardless of the
+       * vertex program:
+       */
+      if (ctx->Point.PointSprite)
+         varying_inputs |= FRAG_BITS_TEX_ANY;
+
       /* First look at what values may be computed by the generated
        * vertex program:
        */
@@ -248,6 +254,12 @@ static GLbitfield get_fp_input_mask( GLcontext *ctx )
       /* calculate from vp->outputs */
       GLbitfield vp_outputs = ctx->VertexProgram._Current->Base.OutputsWritten;
 
+      /* These get generated in the setup routine regardless of the
+       * vertex program:
+       */
+      if (ctx->Point.PointSprite)
+         vp_outputs |= FRAG_BITS_TEX_ANY;
+
       if (vp_outputs & (1 << VERT_RESULT_COL0)) fp_inputs |= FRAG_BIT_COL0;
       if (vp_outputs & (1 << VERT_RESULT_COL1)) fp_inputs |= FRAG_BIT_COL1;
 
-- 
cgit v1.2.3


From b3cfcd326b1bc21ce163c5b05288cbff5f909cd9 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Sat, 1 Nov 2008 10:57:25 -0600
Subject: mesa: additional debug flags for glsl debug/disassembly

---
 src/mesa/main/debug.c              | 54 ++++++++++++++++++--------------------
 src/mesa/main/mtypes.h             |  4 ++-
 src/mesa/shader/slang/slang_link.c | 39 ++++++++++++++-------------
 src/mesa/shader/slang/slang_log.c  |  9 ++++---
 4 files changed, 53 insertions(+), 53 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/debug.c b/src/mesa/main/debug.c
index 98ca65b96a..77fef32558 100644
--- a/src/mesa/main/debug.c
+++ b/src/mesa/main/debug.c
@@ -150,36 +150,32 @@ void _mesa_print_info( void )
 static void add_debug_flags( const char *debug )
 {
 #ifdef DEBUG
-   if (_mesa_strstr(debug, "varray")) 
-      MESA_VERBOSE |= VERBOSE_VARRAY;
-
-   if (_mesa_strstr(debug, "tex")) 
-      MESA_VERBOSE |= VERBOSE_TEXTURE;
-
-   if (_mesa_strstr(debug, "imm")) 
-      MESA_VERBOSE |= VERBOSE_IMMEDIATE;
-
-   if (_mesa_strstr(debug, "pipe")) 
-      MESA_VERBOSE |= VERBOSE_PIPELINE;
-
-   if (_mesa_strstr(debug, "driver")) 
-      MESA_VERBOSE |= VERBOSE_DRIVER;
-
-   if (_mesa_strstr(debug, "state")) 
-      MESA_VERBOSE |= VERBOSE_STATE;
-
-   if (_mesa_strstr(debug, "api")) 
-      MESA_VERBOSE |= VERBOSE_API;
-
-   if (_mesa_strstr(debug, "list")) 
-      MESA_VERBOSE |= VERBOSE_DISPLAY_LIST;
-
-   if (_mesa_strstr(debug, "lighting")) 
-      MESA_VERBOSE |= VERBOSE_LIGHTING;
+   struct debug_option {
+      const char *name;
+      GLbitfield flag;
+   };
+   static const struct debug_option debug_opt[] = {
+      { "varray",    VERBOSE_VARRAY },
+      { "tex",       VERBOSE_TEXTURE },
+      { "imm",       VERBOSE_IMMEDIATE },
+      { "pipe",      VERBOSE_PIPELINE },
+      { "driver",    VERBOSE_DRIVER },
+      { "state",     VERBOSE_STATE },
+      { "api",       VERBOSE_API },
+      { "list",      VERBOSE_DISPLAY_LIST },
+      { "lighting",  VERBOSE_LIGHTING },
+      { "disassem",  VERBOSE_DISASSEM },
+      { "glsl",      VERBOSE_GLSL },     /* report GLSL compile/link errors */
+      { "glsl_dump", VERBOSE_GLSL_DUMP } /* print shader GPU instructions */
+   };
+   GLuint i;
+
+   MESA_VERBOSE = 0x0;
+   for (i = 0; i < Elements(debug_opt); i++) {
+      if (_mesa_strstr(debug, debug_opt[i].name))
+         MESA_VERBOSE |= debug_opt[i].flag;
+   }
 
-   if (_mesa_strstr(debug, "disassem")) 
-      MESA_VERBOSE |= VERBOSE_DISASSEM;
-   
    /* Debug flag:
     */
    if (_mesa_strstr(debug, "flush")) 
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index fab6ad05ee..732de2bb43 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -3162,7 +3162,9 @@ enum _verbose
    VERBOSE_LIGHTING		= 0x0200,
    VERBOSE_PRIMS		= 0x0400,
    VERBOSE_VERTS		= 0x0800,
-   VERBOSE_DISASSEM		= 0x1000
+   VERBOSE_DISASSEM		= 0x1000,
+   VERBOSE_GLSL			= 0x2000,
+   VERBOSE_GLSL_DUMP		= 0x4000
 };
 
 
diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c
index 202080d9d4..5c8b626ea7 100644
--- a/src/mesa/shader/slang/slang_link.c
+++ b/src/mesa/shader/slang/slang_link.c
@@ -219,6 +219,7 @@ link_uniform_vars(struct gl_shader_program *shProg,
                 inst->Sampler, map[ inst->Sampler ]);
          */
          /* here, texUnit is really samplerUnit */
+         assert(inst->TexSrcUnit < MAX_SAMPLERS);
          inst->TexSrcUnit = samplerMap[inst->TexSrcUnit];
          prog->SamplerTargets[inst->TexSrcUnit] = inst->TexSrcTarget;
          prog->SamplersUsed |= (1 << inst->TexSrcUnit);
@@ -564,32 +565,30 @@ _slang_link(GLcontext *ctx,
       /* notify driver that a new fragment program has been compiled/linked */
       ctx->Driver.ProgramStringNotify(ctx, GL_FRAGMENT_PROGRAM_ARB,
                                       &shProg->FragmentProgram->Base);
-#if 0
-      printf("************** original fragment program\n");
-      _mesa_print_program(&fragProg->Base);
-      _mesa_print_program_parameters(ctx, &fragProg->Base);
-#endif
-#if 0
-      printf("************** linked fragment prog\n");
-      _mesa_print_program(&shProg->FragmentProgram->Base);
-      _mesa_print_program_parameters(ctx, &shProg->FragmentProgram->Base);
-#endif
+      if (MESA_VERBOSE & VERBOSE_GLSL_DUMP) {
+         printf("Mesa original fragment program:\n");
+         _mesa_print_program(&fragProg->Base);
+         _mesa_print_program_parameters(ctx, &fragProg->Base);
+
+         printf("Mesa post-link fragment program:\n");
+         _mesa_print_program(&shProg->FragmentProgram->Base);
+         _mesa_print_program_parameters(ctx, &shProg->FragmentProgram->Base);
+      }
    }
 
    if (vertProg && shProg->VertexProgram) {
       /* notify driver that a new vertex program has been compiled/linked */
       ctx->Driver.ProgramStringNotify(ctx, GL_VERTEX_PROGRAM_ARB,
                                       &shProg->VertexProgram->Base);
-#if 0
-      printf("************** original vertex program\n");
-      _mesa_print_program(&vertProg->Base);
-      _mesa_print_program_parameters(ctx, &vertProg->Base);
-#endif
-#if 0
-      printf("************** linked vertex prog\n");
-      _mesa_print_program(&shProg->VertexProgram->Base);
-      _mesa_print_program_parameters(ctx, &shProg->VertexProgram->Base);
-#endif
+      if (MESA_VERBOSE & VERBOSE_GLSL_DUMP) {
+         printf("Mesa original vertex program:\n");
+         _mesa_print_program(&vertProg->Base);
+         _mesa_print_program_parameters(ctx, &vertProg->Base);
+
+         printf("Mesa post-link vertex program:\n");
+         _mesa_print_program(&shProg->VertexProgram->Base);
+         _mesa_print_program_parameters(ctx, &shProg->VertexProgram->Base);
+      }
    }
 
    shProg->LinkStatus = (shProg->VertexProgram || shProg->FragmentProgram);
diff --git a/src/mesa/shader/slang/slang_log.c b/src/mesa/shader/slang/slang_log.c
index 01591ceba5..dc838c72ad 100644
--- a/src/mesa/shader/slang/slang_log.c
+++ b/src/mesa/shader/slang/slang_log.c
@@ -23,6 +23,7 @@
  */
 
 #include "main/imports.h"
+#include "main/context.h"
 #include "slang_log.h"
 #include "slang_utility.h"
 
@@ -86,9 +87,11 @@ slang_info_log_message(slang_info_log * log, const char *prefix,
    }
    slang_string_concat(log->text, msg);
    slang_string_concat(log->text, "\n");
-#if 0 /* debug */
-   _mesa_printf("Mesa GLSL error/warning: %s\n", log->text);
-#endif
+
+   if (MESA_VERBOSE & VERBOSE_GLSL) {
+      _mesa_printf("Mesa: GLSL %s\n", log->text);
+   }
+
    return 1;
 }
 
-- 
cgit v1.2.3


From eb459814b7e7adc8b5f0062128f4ea4ff68b07cf Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 7 Nov 2008 10:23:22 -0700
Subject: mesa: use _bfc0 instead of _col0 when building back face lighting.

cherry-picked from master: 4550b0562d5b59890fccb0e7eb0dbef967d1ccf9
---
 src/mesa/main/ffvertex_prog.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index dff4306322..9ac8328ef0 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -1308,14 +1308,13 @@ static void build_lighting( struct tnl_program *p )
             }
             else if (!p->state->material_shininess_is_zero) {
                emit_op1(p, OPCODE_LIT, lit, 0, dots);
-               emit_op2(p, OPCODE_ADD, _col0, 0, ambient, _col0);
+               emit_op2(p, OPCODE_ADD, _bfc0, 0, ambient, _bfc0);
             } 
             else {
                emit_degenerate_lit(p, lit, dots);
-               emit_op2(p, OPCODE_ADD, _col0, 0, ambient, _col0);
+               emit_op2(p, OPCODE_ADD, _bfc0, 0, ambient, _bfc0);
             }
 
-	    emit_op2(p, OPCODE_ADD, _bfc0, 0, ambient, _bfc0);
 	    emit_op3(p, OPCODE_MAD, res0, mask0, swizzle1(lit,Y), diffuse, _bfc0);
 	    emit_op3(p, OPCODE_MAD, res1, mask1, swizzle1(lit,Z), specular, _bfc1);
 
-- 
cgit v1.2.3


From 5cfb0a4087352c22a13ca55a98ae3e2e420d4b52 Mon Sep 17 00:00:00 2001
From: "Xiang, Haihao" <haihao.xiang@intel.com>
Date: Tue, 11 Nov 2008 13:36:32 +0800
Subject: mesa: restore the negate flag of dots in build_lighting.

Dots is re-used if more than one light is enabled. Previously
the negate flag of dots may affect next light.
---
 src/mesa/main/ffvertex_prog.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index 9ac8328ef0..b87c443fec 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -1318,6 +1318,9 @@ static void build_lighting( struct tnl_program *p )
 	    emit_op3(p, OPCODE_MAD, res0, mask0, swizzle1(lit,Y), diffuse, _bfc0);
 	    emit_op3(p, OPCODE_MAD, res1, mask1, swizzle1(lit,Z), specular, _bfc1);
 
+            /* restore negate flag for next lighting */
+            dots = negate(dots);
+
 	    release_temp(p, ambient);
 	    release_temp(p, diffuse);
 	    release_temp(p, specular);
-- 
cgit v1.2.3


From 16340f8d4dfbde9cea01637ea225053194b8c640 Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@tungstengraphics.com>
Date: Thu, 13 Nov 2008 13:16:03 +0000
Subject: mesa: fix generation of fixed function state when no vp exists

---
 src/mesa/main/state.c | 84 +++++++++++++++++++++++++--------------------------
 1 file changed, 41 insertions(+), 43 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 5e073a1863..0d452fd879 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -206,56 +206,54 @@ update_program(GLcontext *ctx)
 
    _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current, NULL);
 
-   if (shProg && shProg->LinkStatus) {
+   if (shProg && shProg->LinkStatus && shProg->FragmentProgram) {
       /* Use shader programs */
-      /* XXX this isn't quite right, since we may have either a vertex
-       * _or_ fragment shader (not always both).
-       */
-      _mesa_reference_vertprog(ctx, &ctx->VertexProgram._Current,
-                               shProg->VertexProgram);
       _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current,
                                shProg->FragmentProgram);
    }
+   else if (ctx->FragmentProgram._Enabled) {
+      /* use user-defined vertex program */
+      _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current,
+                               ctx->FragmentProgram.Current);
+   }
+   else if (ctx->FragmentProgram._MaintainTexEnvProgram) {
+      /* Use fragment program generated from fixed-function state.
+       */
+      _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current,
+                               _mesa_get_fixed_func_fragment_program(ctx));
+      _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._TexEnvProgram,
+                               ctx->FragmentProgram._Current);
+   }
    else {
-      if (ctx->FragmentProgram._Enabled) {
-         /* use user-defined vertex program */
-         _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current,
-                                  ctx->FragmentProgram.Current);
-      }
-      else if (ctx->FragmentProgram._MaintainTexEnvProgram) {
-         /* Use fragment program generated from fixed-function state.
-          */
-         _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current,
-                                  _mesa_get_fixed_func_fragment_program(ctx));
-         _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._TexEnvProgram,
-                                  ctx->FragmentProgram._Current);
-      }
-      else {
-         /* no fragment program */
-         _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current, NULL);
-      }
+      /* no fragment program */
+      _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current, NULL);
+   }
 
-      /* Examine vertex program after fragment program as
-       * _mesa_get_fixed_func_vertex_program() needs to know active
-       * fragprog inputs.
+   /* Examine vertex program after fragment program as
+    * _mesa_get_fixed_func_vertex_program() needs to know active
+    * fragprog inputs.
+    */
+   if (shProg && shProg->LinkStatus && shProg->VertexProgram) {
+      /* Use shader programs */
+      _mesa_reference_vertprog(ctx, &ctx->VertexProgram._Current,
+                            shProg->VertexProgram);
+   }
+   else if (ctx->VertexProgram._Enabled) {
+      /* use user-defined vertex program */
+      _mesa_reference_vertprog(ctx, &ctx->VertexProgram._Current,
+                               ctx->VertexProgram.Current);
+   }
+   else if (ctx->VertexProgram._MaintainTnlProgram) {
+      /* Use vertex program generated from fixed-function state.
        */
-      if (ctx->VertexProgram._Enabled) {
-         /* use user-defined vertex program */
-         _mesa_reference_vertprog(ctx, &ctx->VertexProgram._Current,
-                                  ctx->VertexProgram.Current);
-      }
-      else if (ctx->VertexProgram._MaintainTnlProgram) {
-         /* Use vertex program generated from fixed-function state.
-          */
-         _mesa_reference_vertprog(ctx, &ctx->VertexProgram._Current,
-                                  _mesa_get_fixed_func_vertex_program(ctx));
-         _mesa_reference_vertprog(ctx, &ctx->VertexProgram._TnlProgram,
-                                  ctx->VertexProgram._Current);
-      }
-      else {
-         /* no vertex program */
-         _mesa_reference_vertprog(ctx, &ctx->VertexProgram._Current, NULL);
-      }
+      _mesa_reference_vertprog(ctx, &ctx->VertexProgram._Current,
+                               _mesa_get_fixed_func_vertex_program(ctx));
+      _mesa_reference_vertprog(ctx, &ctx->VertexProgram._TnlProgram,
+                               ctx->VertexProgram._Current);
+   }
+   else {
+      /* no vertex program */
+      _mesa_reference_vertprog(ctx, &ctx->VertexProgram._Current, NULL);
    }
 
    /* XXX: get rid of _Active flag.
-- 
cgit v1.2.3


From 5bd093bd7b3711f88e1fd0fc9cdb37a18d7d24b9 Mon Sep 17 00:00:00 2001
From: Roland Scheidegger <sroland@tungstengraphics.com>
Date: Fri, 12 Dec 2008 05:06:48 +0100
Subject: mesa: fixes for srgb, new srgb formats

add some more srgb texture formats, including compressed ones
various fixes relating to srgb formats

issues: _mesa_get_teximage is completely broken for srgb textures,
        both for non-compressed ones (swizzling) and compressed ones
        (shouldn't do standard-to-linear conversion)
        texelFetch function may be broken for little or big endian
        (or both...)
---
 src/mesa/main/texcompress.c      |  71 ++++++++++++---
 src/mesa/main/texcompress_s3tc.c | 184 +++++++++++++++++++++++++++++++++++----
 src/mesa/main/texformat.c        |  65 ++++++++++++--
 src/mesa/main/texformat.h        |  13 +++
 src/mesa/main/texformat_tmp.h    |  26 ++++++
 src/mesa/main/texstore.c         |  51 +++++++----
 src/mesa/main/texstore.h         |   2 +
 7 files changed, 358 insertions(+), 54 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texcompress.c b/src/mesa/main/texcompress.c
index 0653407048..04f0f3ab13 100644
--- a/src/mesa/main/texcompress.c
+++ b/src/mesa/main/texcompress.c
@@ -3,6 +3,7 @@
  * Version:  6.5.1
  *
  * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
+ * Copyright (c) 2008 VMware, Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -84,6 +85,25 @@ _mesa_get_compressed_formats(GLcontext *ctx, GLint *formats, GLboolean all)
             if (all)
                n += 1;
          }
+#if FEATURE_EXT_texture_sRGB
+         if (ctx->Extensions.EXT_texture_sRGB) {
+            if (formats) {
+               if (all) {
+                  /* according to sRGB spec, these should not be returned
+                     via the GL_COMPRESSED_TEXTURE_FORMATS query as they
+                     aren't really general purpose */
+                  formats[n++] = GL_COMPRESSED_SRGB_S3TC_DXT1_EXT;
+                  formats[n++] = GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT;
+                  formats[n++] = GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT;
+                  formats[n++] = GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT;
+               }
+            }
+            else {
+               if (all)
+                  n += 4;
+            }
+         }
+#endif /* FEATURE_EXT_texture_sRGB */
       }
       if (ctx->Extensions.S3_s3tc) {
          if (formats) {
@@ -96,19 +116,6 @@ _mesa_get_compressed_formats(GLcontext *ctx, GLint *formats, GLboolean all)
             n += 4;
          }
       }
-#if FEATURE_EXT_texture_sRGB
-      if (ctx->Extensions.EXT_texture_sRGB) {
-         if (formats) {
-            formats[n++] = GL_COMPRESSED_SRGB_S3TC_DXT1_EXT;
-            formats[n++] = GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT;
-            formats[n++] = GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT;
-            formats[n++] = GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT;
-         }
-         else {
-            n += 4;
-         }
-      }
-#endif /* FEATURE_EXT_texture_sRGB */
    }
    return n;
 }
@@ -156,6 +163,10 @@ _mesa_compressed_texture_size( GLcontext *ctx,
 #if FEATURE_texture_s3tc
    case MESA_FORMAT_RGB_DXT1:
    case MESA_FORMAT_RGBA_DXT1:
+#if FEATURE_EXT_texture_sRGB
+   case MESA_FORMAT_SRGB_DXT1:
+   case MESA_FORMAT_SRGBA_DXT1:
+#endif
       /* round up width, height to next multiple of 4 */
       width = (width + 3) & ~3;
       height = (height + 3) & ~3;
@@ -167,6 +178,10 @@ _mesa_compressed_texture_size( GLcontext *ctx,
       return size;
    case MESA_FORMAT_RGBA_DXT3:
    case MESA_FORMAT_RGBA_DXT5:
+#if FEATURE_EXT_texture_sRGB
+   case MESA_FORMAT_SRGBA_DXT3:
+   case MESA_FORMAT_SRGBA_DXT5:
+#endif
       /* round up width, height to next multiple of 4 */
       width = (width + 3) & ~3;
       height = (height + 3) & ~3;
@@ -226,6 +241,20 @@ _mesa_compressed_texture_size_glenum(GLcontext *ctx,
    case GL_RGBA4_S3TC:
       mesaFormat = MESA_FORMAT_RGBA_DXT5;
       break;
+#if FEATURE_EXT_texture_sRGB
+   case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:
+      mesaFormat = MESA_FORMAT_SRGB_DXT1;
+      break;
+   case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:
+      mesaFormat = MESA_FORMAT_SRGBA_DXT1;
+      break;
+   case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:
+      mesaFormat = MESA_FORMAT_SRGBA_DXT3;
+      break;
+   case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:
+      mesaFormat = MESA_FORMAT_SRGBA_DXT5;
+      break;
+#endif
 #endif
    default:
       return 0;
@@ -257,10 +286,18 @@ _mesa_compressed_row_stride(GLuint mesaFormat, GLsizei width)
 #if FEATURE_texture_s3tc
    case MESA_FORMAT_RGB_DXT1:
    case MESA_FORMAT_RGBA_DXT1:
+#if FEATURE_EXT_texture_sRGB
+   case MESA_FORMAT_SRGB_DXT1:
+   case MESA_FORMAT_SRGBA_DXT1:
+#endif
       stride = ((width + 3) / 4) * 8; /* 8 bytes per 4x4 tile */
       break;
    case MESA_FORMAT_RGBA_DXT3:
    case MESA_FORMAT_RGBA_DXT5:
+#if FEATURE_EXT_texture_sRGB
+   case MESA_FORMAT_SRGBA_DXT3:
+   case MESA_FORMAT_SRGBA_DXT5:
+#endif
       stride = ((width + 3) / 4) * 16; /* 16 bytes per 4x4 tile */
       break;
 #endif
@@ -309,10 +346,18 @@ _mesa_compressed_image_address(GLint col, GLint row, GLint img,
 #if FEATURE_texture_s3tc
    case MESA_FORMAT_RGB_DXT1:
    case MESA_FORMAT_RGBA_DXT1:
+#if FEATURE_EXT_texture_sRGB
+   case MESA_FORMAT_SRGB_DXT1:
+   case MESA_FORMAT_SRGBA_DXT1:
+#endif
       addr = (GLubyte *) image + 8 * (((width + 3) / 4) * (row / 4) + col / 4);
       break;
    case MESA_FORMAT_RGBA_DXT3:
    case MESA_FORMAT_RGBA_DXT5:
+#if FEATURE_EXT_texture_sRGB
+   case MESA_FORMAT_SRGBA_DXT3:
+   case MESA_FORMAT_SRGBA_DXT5:
+#endif
       addr = (GLubyte *) image + 16 * (((width + 3) / 4) * (row / 4) + col / 4);
       break;
 #endif
diff --git a/src/mesa/main/texcompress_s3tc.c b/src/mesa/main/texcompress_s3tc.c
index 4f329cdf59..ccc007c24d 100644
--- a/src/mesa/main/texcompress_s3tc.c
+++ b/src/mesa/main/texcompress_s3tc.c
@@ -3,6 +3,7 @@
  * Version:  6.5.3
  *
  * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
+ * Copyright (c) 2008 VMware, Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -56,6 +57,34 @@
 #define DXTN_LIBNAME "libtxc_dxtn.so"
 #endif
 
+#if FEATURE_EXT_texture_sRGB
+/**
+ * Convert an 8-bit sRGB value from non-linear space to a
+ * linear RGB value in [0, 1].
+ * Implemented with a 256-entry lookup table.
+ */
+static INLINE GLfloat
+nonlinear_to_linear(GLubyte cs8)
+{
+   static GLfloat table[256];
+   static GLboolean tableReady = GL_FALSE;
+   if (!tableReady) {
+      /* compute lookup table now */
+      GLuint i;
+      for (i = 0; i < 256; i++) {
+         const GLfloat cs = UBYTE_TO_FLOAT(i);
+         if (cs <= 0.04045) {
+            table[i] = cs / 12.92f;
+         }
+         else {
+            table[i] = (GLfloat) _mesa_pow((cs + 0.055) / 1.055, 2.4);
+         }
+      }
+      tableReady = GL_TRUE;
+   }
+   return table[cs8];
+}
+#endif /* FEATURE_EXT_texture_sRGB */
 
 typedef void (*dxtFetchTexelFuncExt)( GLint srcRowstride, GLubyte *pixdata, GLint col, GLint row, GLvoid *texelOut );
 
@@ -552,6 +581,59 @@ fetch_texel_2d_f_rgba_dxt5( const struct gl_texture_image *texImage,
    texel[ACOMP] = CHAN_TO_FLOAT(rgba[ACOMP]);
 }
 
+#if FEATURE_EXT_texture_sRGB
+static void
+fetch_texel_2d_f_srgb_dxt1( const struct gl_texture_image *texImage,
+                            GLint i, GLint j, GLint k, GLfloat *texel )
+{
+   /* just sample as GLchan and convert to float here */
+   GLchan rgba[4];
+   fetch_texel_2d_rgb_dxt1(texImage, i, j, k, rgba);
+   texel[RCOMP] = nonlinear_to_linear(rgba[RCOMP]);
+   texel[GCOMP] = nonlinear_to_linear(rgba[GCOMP]);
+   texel[BCOMP] = nonlinear_to_linear(rgba[BCOMP]);
+   texel[ACOMP] = CHAN_TO_FLOAT(rgba[ACOMP]);
+}
+
+static void
+fetch_texel_2d_f_srgba_dxt1( const struct gl_texture_image *texImage,
+                             GLint i, GLint j, GLint k, GLfloat *texel )
+{
+   /* just sample as GLchan and convert to float here */
+   GLchan rgba[4];
+   fetch_texel_2d_rgba_dxt1(texImage, i, j, k, rgba);
+   texel[RCOMP] = nonlinear_to_linear(rgba[RCOMP]);
+   texel[GCOMP] = nonlinear_to_linear(rgba[GCOMP]);
+   texel[BCOMP] = nonlinear_to_linear(rgba[BCOMP]);
+   texel[ACOMP] = CHAN_TO_FLOAT(rgba[ACOMP]);
+}
+
+static void
+fetch_texel_2d_f_srgba_dxt3( const struct gl_texture_image *texImage,
+                             GLint i, GLint j, GLint k, GLfloat *texel )
+{
+   /* just sample as GLchan and convert to float here */
+   GLchan rgba[4];
+   fetch_texel_2d_rgba_dxt3(texImage, i, j, k, rgba);
+   texel[RCOMP] = nonlinear_to_linear(rgba[RCOMP]);
+   texel[GCOMP] = nonlinear_to_linear(rgba[GCOMP]);
+   texel[BCOMP] = nonlinear_to_linear(rgba[BCOMP]);
+   texel[ACOMP] = CHAN_TO_FLOAT(rgba[ACOMP]);
+}
+
+static void
+fetch_texel_2d_f_srgba_dxt5( const struct gl_texture_image *texImage,
+                             GLint i, GLint j, GLint k, GLfloat *texel )
+{
+   /* just sample as GLchan and convert to float here */
+   GLchan rgba[4];
+   fetch_texel_2d_rgba_dxt5(texImage, i, j, k, rgba);
+   texel[RCOMP] = nonlinear_to_linear(rgba[RCOMP]);
+   texel[GCOMP] = nonlinear_to_linear(rgba[GCOMP]);
+   texel[BCOMP] = nonlinear_to_linear(rgba[BCOMP]);
+   texel[ACOMP] = CHAN_TO_FLOAT(rgba[ACOMP]);
+}
+#endif
 
 const struct gl_texture_format _mesa_texformat_rgb_dxt1 = {
    MESA_FORMAT_RGB_DXT1,		/* MesaFormat */
@@ -577,6 +659,78 @@ const struct gl_texture_format _mesa_texformat_rgb_dxt1 = {
    NULL					/* StoreTexel */
 };
 
+const struct gl_texture_format _mesa_texformat_rgba_dxt1 = {
+   MESA_FORMAT_RGBA_DXT1,		/* MesaFormat */
+   GL_RGBA,				/* BaseFormat */
+   GL_UNSIGNED_NORMALIZED_ARB,		/* DataType */
+   4, /*approx*/			/* RedBits */
+   4, /*approx*/			/* GreenBits */
+   4, /*approx*/			/* BlueBits */
+   1, /*approx*/			/* AlphaBits */
+   0,					/* LuminanceBits */
+   0,					/* IntensityBits */
+   0,					/* IndexBits */
+   0,					/* DepthBits */
+   0,					/* StencilBits */
+   0,					/* TexelBytes */
+   texstore_rgba_dxt1,			/* StoreTexImageFunc */
+   NULL, /*impossible*/ 		/* FetchTexel1D */
+   fetch_texel_2d_rgba_dxt1, 		/* FetchTexel2D */
+   NULL, /*impossible*/ 		/* FetchTexel3D */
+   NULL, /*impossible*/ 		/* FetchTexel1Df */
+   fetch_texel_2d_f_rgba_dxt1, 		/* FetchTexel2Df */
+   NULL, /*impossible*/ 		/* FetchTexel3Df */
+   NULL					/* StoreTexel */
+};
+
+const struct gl_texture_format _mesa_texformat_rgba_dxt3 = {
+   MESA_FORMAT_RGBA_DXT3,		/* MesaFormat */
+   GL_RGBA,				/* BaseFormat */
+   GL_UNSIGNED_NORMALIZED_ARB,		/* DataType */
+   4, /*approx*/			/* RedBits */
+   4, /*approx*/			/* GreenBits */
+   4, /*approx*/			/* BlueBits */
+   4, /*approx*/			/* AlphaBits */
+   0,					/* LuminanceBits */
+   0,					/* IntensityBits */
+   0,					/* IndexBits */
+   0,					/* DepthBits */
+   0,					/* StencilBits */
+   0,					/* TexelBytes */
+   texstore_rgba_dxt3,			/* StoreTexImageFunc */
+   NULL, /*impossible*/ 		/* FetchTexel1D */
+   fetch_texel_2d_rgba_dxt3, 		/* FetchTexel2D */
+   NULL, /*impossible*/ 		/* FetchTexel3D */
+   NULL, /*impossible*/ 		/* FetchTexel1Df */
+   fetch_texel_2d_f_rgba_dxt3, 		/* FetchTexel2Df */
+   NULL, /*impossible*/ 		/* FetchTexel3Df */
+   NULL					/* StoreTexel */
+};
+
+const struct gl_texture_format _mesa_texformat_rgba_dxt5 = {
+   MESA_FORMAT_RGBA_DXT5,		/* MesaFormat */
+   GL_RGBA,				/* BaseFormat */
+   GL_UNSIGNED_NORMALIZED_ARB,		/* DataType */
+   4,/*approx*/				/* RedBits */
+   4,/*approx*/				/* GreenBits */
+   4,/*approx*/				/* BlueBits */
+   4,/*approx*/				/* AlphaBits */
+   0,					/* LuminanceBits */
+   0,					/* IntensityBits */
+   0,					/* IndexBits */
+   0,					/* DepthBits */
+   0,					/* StencilBits */
+   0,					/* TexelBytes */
+   texstore_rgba_dxt5,			/* StoreTexImageFunc */
+   NULL, /*impossible*/ 		/* FetchTexel1D */
+   fetch_texel_2d_rgba_dxt5, 		/* FetchTexel2D */
+   NULL, /*impossible*/ 		/* FetchTexel3D */
+   NULL, /*impossible*/ 		/* FetchTexel1Df */
+   fetch_texel_2d_f_rgba_dxt5, 		/* FetchTexel2Df */
+   NULL, /*impossible*/ 		/* FetchTexel3Df */
+   NULL					/* StoreTexel */
+};
+
 #if FEATURE_EXT_texture_sRGB
 const struct gl_texture_format _mesa_texformat_srgb_dxt1 = {
    MESA_FORMAT_SRGB_DXT1,		/* MesaFormat */
@@ -594,17 +748,16 @@ const struct gl_texture_format _mesa_texformat_srgb_dxt1 = {
    0,					/* TexelBytes */
    texstore_rgb_dxt1,			/* StoreTexImageFunc */
    NULL, /*impossible*/ 		/* FetchTexel1D */
-   fetch_texel_2d_rgb_dxt1, 		/* FetchTexel2D */
+   NULL, 				/* FetchTexel2D */
    NULL, /*impossible*/ 		/* FetchTexel3D */
    NULL, /*impossible*/ 		/* FetchTexel1Df */
-   fetch_texel_2d_f_rgb_dxt1, 		/* FetchTexel2Df */
+   fetch_texel_2d_f_srgb_dxt1, 		/* FetchTexel2Df */
    NULL, /*impossible*/ 		/* FetchTexel3Df */
    NULL					/* StoreTexel */
 };
-#endif
 
-const struct gl_texture_format _mesa_texformat_rgba_dxt1 = {
-   MESA_FORMAT_RGBA_DXT1,		/* MesaFormat */
+const struct gl_texture_format _mesa_texformat_srgba_dxt1 = {
+   MESA_FORMAT_SRGBA_DXT1,		/* MesaFormat */
    GL_RGBA,				/* BaseFormat */
    GL_UNSIGNED_NORMALIZED_ARB,		/* DataType */
    4, /*approx*/			/* RedBits */
@@ -619,16 +772,16 @@ const struct gl_texture_format _mesa_texformat_rgba_dxt1 = {
    0,					/* TexelBytes */
    texstore_rgba_dxt1,			/* StoreTexImageFunc */
    NULL, /*impossible*/ 		/* FetchTexel1D */
-   fetch_texel_2d_rgba_dxt1, 		/* FetchTexel2D */
+   NULL, 				/* FetchTexel2D */
    NULL, /*impossible*/ 		/* FetchTexel3D */
    NULL, /*impossible*/ 		/* FetchTexel1Df */
-   fetch_texel_2d_f_rgba_dxt1, 		/* FetchTexel2Df */
+   fetch_texel_2d_f_srgba_dxt1, 	/* FetchTexel2Df */
    NULL, /*impossible*/ 		/* FetchTexel3Df */
    NULL					/* StoreTexel */
 };
 
-const struct gl_texture_format _mesa_texformat_rgba_dxt3 = {
-   MESA_FORMAT_RGBA_DXT3,		/* MesaFormat */
+const struct gl_texture_format _mesa_texformat_srgba_dxt3 = {
+   MESA_FORMAT_SRGBA_DXT3,		/* MesaFormat */
    GL_RGBA,				/* BaseFormat */
    GL_UNSIGNED_NORMALIZED_ARB,		/* DataType */
    4, /*approx*/			/* RedBits */
@@ -643,16 +796,16 @@ const struct gl_texture_format _mesa_texformat_rgba_dxt3 = {
    0,					/* TexelBytes */
    texstore_rgba_dxt3,			/* StoreTexImageFunc */
    NULL, /*impossible*/ 		/* FetchTexel1D */
-   fetch_texel_2d_rgba_dxt3, 		/* FetchTexel2D */
+   NULL, 				/* FetchTexel2D */
    NULL, /*impossible*/ 		/* FetchTexel3D */
    NULL, /*impossible*/ 		/* FetchTexel1Df */
-   fetch_texel_2d_f_rgba_dxt3, 		/* FetchTexel2Df */
+   fetch_texel_2d_f_srgba_dxt3, 	/* FetchTexel2Df */
    NULL, /*impossible*/ 		/* FetchTexel3Df */
    NULL					/* StoreTexel */
 };
 
-const struct gl_texture_format _mesa_texformat_rgba_dxt5 = {
-   MESA_FORMAT_RGBA_DXT5,		/* MesaFormat */
+const struct gl_texture_format _mesa_texformat_srgba_dxt5 = {
+   MESA_FORMAT_SRGBA_DXT5,		/* MesaFormat */
    GL_RGBA,				/* BaseFormat */
    GL_UNSIGNED_NORMALIZED_ARB,		/* DataType */
    4,/*approx*/				/* RedBits */
@@ -667,10 +820,11 @@ const struct gl_texture_format _mesa_texformat_rgba_dxt5 = {
    0,					/* TexelBytes */
    texstore_rgba_dxt5,			/* StoreTexImageFunc */
    NULL, /*impossible*/ 		/* FetchTexel1D */
-   fetch_texel_2d_rgba_dxt5, 		/* FetchTexel2D */
+   NULL, 				/* FetchTexel2D */
    NULL, /*impossible*/ 		/* FetchTexel3D */
    NULL, /*impossible*/ 		/* FetchTexel1Df */
-   fetch_texel_2d_f_rgba_dxt5, 		/* FetchTexel2Df */
+   fetch_texel_2d_f_srgba_dxt5, 	/* FetchTexel2Df */
    NULL, /*impossible*/ 		/* FetchTexel3Df */
    NULL					/* StoreTexel */
 };
+#endif
diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c
index ce2772c299..db3525666a 100644
--- a/src/mesa/main/texformat.c
+++ b/src/mesa/main/texformat.c
@@ -3,6 +3,7 @@
  * Version:  6.5.1
  *
  * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
+ * Copyright (c) 2008 VMware, Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -333,6 +334,30 @@ const struct gl_texture_format _mesa_texformat_srgba8 = {
    store_texel_srgba8			/* StoreTexel */
 };
 
+const struct gl_texture_format _mesa_texformat_sargb8 = {
+   MESA_FORMAT_SARGB8,			/* MesaFormat */
+   GL_RGBA,				/* BaseFormat */
+   GL_UNSIGNED_NORMALIZED_ARB,		/* DataType */
+   8,					/* RedBits */
+   8,					/* GreenBits */
+   8,					/* BlueBits */
+   8,					/* AlphaBits */
+   0,					/* LuminanceBits */
+   0,					/* IntensityBits */
+   0,					/* IndexBits */
+   0,					/* DepthBits */
+   0,					/* StencilBits */
+   4,					/* TexelBytes */
+   _mesa_texstore_sargb8,		/* StoreTexImageFunc */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel2D */
+   NULL,				/* FetchTexel3D */
+   fetch_texel_1d_sargb8,		/* FetchTexel1Df */
+   fetch_texel_2d_sargb8,		/* FetchTexel2Df */
+   fetch_texel_3d_sargb8,		/* FetchTexel3Df */
+   store_texel_sargb8			/* StoreTexel */
+};
+
 const struct gl_texture_format _mesa_texformat_sl8 = {
    MESA_FORMAT_SL8,			/* MesaFormat */
    GL_LUMINANCE,			/* BaseFormat */
@@ -1578,21 +1603,40 @@ _mesa_choose_tex_format( GLcontext *ctx, GLint internalFormat,
          case GL_SLUMINANCE_ALPHA_EXT:
          case GL_SLUMINANCE8_ALPHA8_EXT:
             return &_mesa_texformat_sla8;
-         /* NOTE: not supporting any compression of sRGB at this time */
-         case GL_COMPRESSED_SRGB_EXT:
-            return &_mesa_texformat_srgb8;
-         case GL_COMPRESSED_SRGB_ALPHA_EXT:
-            return &_mesa_texformat_srgba8;
          case GL_COMPRESSED_SLUMINANCE_EXT:
             return &_mesa_texformat_sl8;
          case GL_COMPRESSED_SLUMINANCE_ALPHA_EXT:
             return &_mesa_texformat_sla8;
-         case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:
+         case GL_COMPRESSED_SRGB_EXT:
+#if FEATURE_texture_s3tc
+            if (ctx->Extensions.EXT_texture_compression_s3tc)
+               return &_mesa_texformat_srgb_dxt1;
+#endif
             return &_mesa_texformat_srgb8;
+         case GL_COMPRESSED_SRGB_ALPHA_EXT:
+#if FEATURE_texture_s3tc
+            if (ctx->Extensions.EXT_texture_compression_s3tc)
+               return &_mesa_texformat_srgba_dxt3; /* Not srgba_dxt1, see spec */
+#endif
+            return &_mesa_texformat_srgba8;
+#if FEATURE_texture_s3tc
+         case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:
+            if (ctx->Extensions.EXT_texture_compression_s3tc)
+               return &_mesa_texformat_srgb_dxt1;
+            break;
          case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:
+            if (ctx->Extensions.EXT_texture_compression_s3tc)
+               return &_mesa_texformat_srgba_dxt1;
+            break;
          case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:
+            if (ctx->Extensions.EXT_texture_compression_s3tc)
+               return &_mesa_texformat_srgba_dxt3;
+            break;
          case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:
-            return &_mesa_texformat_srgba8;
+            if (ctx->Extensions.EXT_texture_compression_s3tc)
+               return &_mesa_texformat_srgba_dxt5;
+            break;
+#endif
          default:
             ; /* fallthrough */
       }
@@ -1694,6 +1738,7 @@ _mesa_format_to_type_and_comps(const struct gl_texture_format *format,
       *comps = 3;
       return;
    case MESA_FORMAT_SRGBA8:
+   case MESA_FORMAT_SARGB8:
       *datatype = GL_UNSIGNED_BYTE;
       *comps = 4;
       return;
@@ -1716,6 +1761,12 @@ _mesa_format_to_type_and_comps(const struct gl_texture_format *format,
    case MESA_FORMAT_RGBA_DXT1:
    case MESA_FORMAT_RGBA_DXT3:
    case MESA_FORMAT_RGBA_DXT5:
+#if FEATURE_EXT_texture_sRGB
+   case MESA_FORMAT_SRGB_DXT1:
+   case MESA_FORMAT_SRGBA_DXT1:
+   case MESA_FORMAT_SRGBA_DXT3:
+   case MESA_FORMAT_SRGBA_DXT5:
+#endif
       /* XXX generate error instead? */
       *datatype = GL_UNSIGNED_BYTE;
       *comps = 0;
diff --git a/src/mesa/main/texformat.h b/src/mesa/main/texformat.h
index f34b3b8223..c7a754b0b7 100644
--- a/src/mesa/main/texformat.h
+++ b/src/mesa/main/texformat.h
@@ -3,6 +3,7 @@
  * Version:  6.5.1
  *
  * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
+ * Copyright (c) 2008 VMware, Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -96,9 +97,15 @@ enum _format {
    /*@{*/
    MESA_FORMAT_SRGB8,
    MESA_FORMAT_SRGBA8,
+   MESA_FORMAT_SARGB8,
    MESA_FORMAT_SL8,
    MESA_FORMAT_SLA8,
+#if FEATURE_texture_s3tc
    MESA_FORMAT_SRGB_DXT1,
+   MESA_FORMAT_SRGBA_DXT1,
+   MESA_FORMAT_SRGBA_DXT3,
+   MESA_FORMAT_SRGBA_DXT5,
+#endif
    /*@}*/
 #endif
 
@@ -172,9 +179,15 @@ extern const struct gl_texture_format _mesa_texformat_intensity;
 /*@{*/
 extern const struct gl_texture_format _mesa_texformat_srgb8;
 extern const struct gl_texture_format _mesa_texformat_srgba8;
+extern const struct gl_texture_format _mesa_texformat_sargb8;
 extern const struct gl_texture_format _mesa_texformat_sl8;
 extern const struct gl_texture_format _mesa_texformat_sla8;
+#if FEATURE_texture_s3tc
 extern const struct gl_texture_format _mesa_texformat_srgb_dxt1;
+extern const struct gl_texture_format _mesa_texformat_srgba_dxt1;
+extern const struct gl_texture_format _mesa_texformat_srgba_dxt3;
+extern const struct gl_texture_format _mesa_texformat_srgba_dxt5;
+#endif
 /*@}*/
 #endif
 
diff --git a/src/mesa/main/texformat_tmp.h b/src/mesa/main/texformat_tmp.h
index 7499ba7b36..b1031b0cfe 100644
--- a/src/mesa/main/texformat_tmp.h
+++ b/src/mesa/main/texformat_tmp.h
@@ -3,6 +3,7 @@
  * Version:  6.5.1
  *
  * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
+ * Copyright (c) 2008 VMware, Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -1191,6 +1192,31 @@ static void store_texel_srgba8(struct gl_texture_image *texImage,
    dst[0] = rgba[RCOMP];
    dst[1] = rgba[GCOMP];
    dst[2] = rgba[BCOMP];
+   dst[3] = rgba[ACOMP];
+}
+#endif
+
+/* Fetch texel from 1D, 2D or 3D sargb8 texture, return 4 GLfloats */
+static void FETCH(sargb8)(const struct gl_texture_image *texImage,
+                          GLint i, GLint j, GLint k, GLfloat *texel )
+{
+   const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 4);
+   texel[RCOMP] = nonlinear_to_linear(src[1]);
+   texel[GCOMP] = nonlinear_to_linear(src[2]);
+   texel[BCOMP] = nonlinear_to_linear(src[3]);
+   texel[ACOMP] = UBYTE_TO_FLOAT(src[0]); /* linear! */
+}
+
+#if DIM == 3
+static void store_texel_sargb8(struct gl_texture_image *texImage,
+                               GLint i, GLint j, GLint k, const void *texel)
+{
+   const GLubyte *rgba = (const GLubyte *) texel;
+   GLubyte *dst = TEXEL_ADDR(GLubyte, texImage, i, j, k, 4);
+   dst[0] = rgba[ACOMP];
+   dst[1] = rgba[RCOMP];
+   dst[2] = rgba[GCOMP];
+   dst[3] = rgba[BCOMP];
 }
 #endif
 
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index 7278180a5c..8afb947fa1 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -3,6 +3,7 @@
  * Version:  7.3
  *
  * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ * Copyright (c) 2008 VMware, Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -2662,7 +2663,6 @@ _mesa_texstore_rgba_float16(TEXSTORE_PARAMS)
 GLboolean
 _mesa_texstore_srgb8(TEXSTORE_PARAMS)
 {
-   const GLboolean littleEndian = _mesa_little_endian();
    const struct gl_texture_format *newDstFormat;
    StoreTexImageFunc store;
    GLboolean k;
@@ -2670,14 +2670,8 @@ _mesa_texstore_srgb8(TEXSTORE_PARAMS)
    ASSERT(dstFormat == &_mesa_texformat_srgb8);
 
    /* reuse normal rgb texstore code */
-   if (littleEndian) {
-      newDstFormat = &_mesa_texformat_bgr888;
-      store = _mesa_texstore_bgr888;
-   }
-   else {
-      newDstFormat = &_mesa_texformat_rgb888;
-      store = _mesa_texstore_rgb888;
-   }
+   newDstFormat = &_mesa_texformat_rgb888;
+   store = _mesa_texstore_rgb888;
 
    k = store(ctx, dims, baseInternalFormat,
              newDstFormat, dstAddr,
@@ -2693,17 +2687,13 @@ _mesa_texstore_srgb8(TEXSTORE_PARAMS)
 GLboolean
 _mesa_texstore_srgba8(TEXSTORE_PARAMS)
 {
-   const GLboolean littleEndian = _mesa_little_endian();
    const struct gl_texture_format *newDstFormat;
    GLboolean k;
 
    ASSERT(dstFormat == &_mesa_texformat_srgba8);
 
    /* reuse normal rgba texstore code */
-   if (littleEndian)
-      newDstFormat = &_mesa_texformat_rgba8888_rev;
-   else
-      newDstFormat = &_mesa_texformat_rgba8888;
+   newDstFormat = &_mesa_texformat_rgba8888;
 
    k = _mesa_texstore_rgba8888(ctx, dims, baseInternalFormat,
                                newDstFormat, dstAddr,
@@ -2716,6 +2706,28 @@ _mesa_texstore_srgba8(TEXSTORE_PARAMS)
 }
 
 
+GLboolean
+_mesa_texstore_sargb8(TEXSTORE_PARAMS)
+{
+   const struct gl_texture_format *newDstFormat;
+   GLboolean k;
+
+   ASSERT(dstFormat == &_mesa_texformat_sargb8);
+
+   /* reuse normal rgba texstore code */
+   newDstFormat = &_mesa_texformat_argb8888;
+
+   k = _mesa_texstore_argb8888(ctx, dims, baseInternalFormat,
+                               newDstFormat, dstAddr,
+                               dstXoffset, dstYoffset, dstZoffset,
+                               dstRowStride, dstImageOffsets,
+                               srcWidth, srcHeight, srcDepth,
+                               srcFormat, srcType,
+                               srcAddr, srcPacking);
+   return k;
+}
+
+
 GLboolean
 _mesa_texstore_sl8(TEXSTORE_PARAMS)
 {
@@ -2741,17 +2753,13 @@ _mesa_texstore_sl8(TEXSTORE_PARAMS)
 GLboolean
 _mesa_texstore_sla8(TEXSTORE_PARAMS)
 {
-   const GLboolean littleEndian = _mesa_little_endian();
    const struct gl_texture_format *newDstFormat;
    GLboolean k;
 
    ASSERT(dstFormat == &_mesa_texformat_sla8);
 
    /* reuse normal luminance/alpha texstore code */
-   if (littleEndian)
-      newDstFormat = &_mesa_texformat_al88;
-   else
-      newDstFormat = &_mesa_texformat_al88_rev;
+   newDstFormat = &_mesa_texformat_al88;
 
    k = _mesa_texstore_al88(ctx, dims, baseInternalFormat,
                            newDstFormat, dstAddr,
@@ -3581,6 +3589,7 @@ is_srgb_teximage(const struct gl_texture_image *texImage)
    switch (texImage->TexFormat->MesaFormat) {
    case MESA_FORMAT_SRGB8:
    case MESA_FORMAT_SRGBA8:
+   case MESA_FORMAT_SARGB8:
    case MESA_FORMAT_SL8:
    case MESA_FORMAT_SLA8:
       return GL_TRUE;
@@ -3713,6 +3722,10 @@ _mesa_get_teximage(GLcontext *ctx, GLenum target, GLint level,
                MEMCPY(dest,
                       (const GLubyte *) texImage->Data + row * rowstride,
                       comps * width * sizeof(GLubyte));
+               /* FIXME: isn't it necessary to still do component assigning
+                  according to format/type? */
+               /* FIXME: need to do something else for compressed srgb textures
+                         (currently will return values converted to linear) */
             }
 #endif /* FEATURE_EXT_texture_sRGB */
             else {
diff --git a/src/mesa/main/texstore.h b/src/mesa/main/texstore.h
index c9edf14dbc..8dc1c963cd 100644
--- a/src/mesa/main/texstore.h
+++ b/src/mesa/main/texstore.h
@@ -3,6 +3,7 @@
  * Version:  6.5.1
  *
  * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
+ * Copyright (c) 2008 VMware, Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -71,6 +72,7 @@ extern GLboolean _mesa_texstore_rgba_dxt5(TEXSTORE_PARAMS);
 #if FEATURE_EXT_texture_sRGB
 extern GLboolean _mesa_texstore_srgb8(TEXSTORE_PARAMS);
 extern GLboolean _mesa_texstore_srgba8(TEXSTORE_PARAMS);
+extern GLboolean _mesa_texstore_sargb8(TEXSTORE_PARAMS);
 extern GLboolean _mesa_texstore_sl8(TEXSTORE_PARAMS);
 extern GLboolean _mesa_texstore_sla8(TEXSTORE_PARAMS);
 #endif
-- 
cgit v1.2.3


From cdaaf8e107010624bed4abdf9553c0ef63c8b708 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 17 Dec 2008 10:55:40 -0700
Subject: mesa: fix vertex program test in get_fp_input_mask()

We were accidentally using the fixed-function logic when a vertex shader was
being used.
---
 src/mesa/main/texenvprogram.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index c279956f2a..b99bcb1774 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -215,9 +215,7 @@ static GLbitfield get_fp_input_mask( GLcontext *ctx )
    else if (ctx->RenderMode == GL_FEEDBACK) {
       fp_inputs = (FRAG_BIT_COL0 | FRAG_BIT_TEX0);
    }
-   else if (!ctx->VertexProgram._Enabled ||
-            !ctx->VertexProgram._Current) {
-
+   else if (!ctx->VertexProgram._Current) {
       /* Fixed function logic */
       GLbitfield varying_inputs = ctx->varying_vp_inputs;
 
-- 
cgit v1.2.3


From 8dc88cb64305c591dfadded2b5acbb1e6b04cd7f Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 17 Dec 2008 10:55:40 -0700
Subject: mesa: fix vertex program test in get_fp_input_mask()

We were accidentally using the fixed-function logic when a vertex shader was
being used.
---
 src/mesa/main/texenvprogram.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 3cb103f51f..e160787eb9 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -227,9 +227,7 @@ static GLbitfield get_fp_input_mask( GLcontext *ctx )
    else if (ctx->RenderMode == GL_FEEDBACK) {
       fp_inputs = (FRAG_BIT_COL0 | FRAG_BIT_TEX0);
    }
-   else if (!ctx->VertexProgram._Enabled ||
-            !ctx->VertexProgram._Current) {
-
+   else if (!ctx->VertexProgram._Current) {
       /* Fixed function logic */
       GLbitfield varying_inputs = ctx->varying_vp_inputs;
 
-- 
cgit v1.2.3


From d7296a1a8e846bc4d41ded1c2406b6f5c658188a Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 17 Dec 2008 11:29:06 -0700
Subject: Revert "mesa: fix vertex program test in get_fp_input_mask()"

This reverts commit 8dc88cb64305c591dfadded2b5acbb1e6b04cd7f.

This change broke other things...
---
 src/mesa/main/texenvprogram.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index e160787eb9..3cb103f51f 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -227,7 +227,9 @@ static GLbitfield get_fp_input_mask( GLcontext *ctx )
    else if (ctx->RenderMode == GL_FEEDBACK) {
       fp_inputs = (FRAG_BIT_COL0 | FRAG_BIT_TEX0);
    }
-   else if (!ctx->VertexProgram._Current) {
+   else if (!ctx->VertexProgram._Enabled ||
+            !ctx->VertexProgram._Current) {
+
       /* Fixed function logic */
       GLbitfield varying_inputs = ctx->varying_vp_inputs;
 
-- 
cgit v1.2.3


From a8751f49167df81611390377aa3e84aba1ed3ae3 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 17 Dec 2008 11:29:42 -0700
Subject: Revert "mesa: fix vertex program test in get_fp_input_mask()"

This reverts commit cdaaf8e107010624bed4abdf9553c0ef63c8b708.
---
 src/mesa/main/texenvprogram.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index b99bcb1774..c279956f2a 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -215,7 +215,9 @@ static GLbitfield get_fp_input_mask( GLcontext *ctx )
    else if (ctx->RenderMode == GL_FEEDBACK) {
       fp_inputs = (FRAG_BIT_COL0 | FRAG_BIT_TEX0);
    }
-   else if (!ctx->VertexProgram._Current) {
+   else if (!ctx->VertexProgram._Enabled ||
+            !ctx->VertexProgram._Current) {
+
       /* Fixed function logic */
       GLbitfield varying_inputs = ctx->varying_vp_inputs;
 
-- 
cgit v1.2.3


From 1519b93b7bc519e187d98f99715a01ba866286b1 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 17 Dec 2008 13:17:15 -0700
Subject: mesa: add missing cases for texture array targets

---
 src/mesa/main/texenvprogram.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 3cb103f51f..1560e97c26 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -191,13 +191,17 @@ static GLuint translate_mode( GLenum mode )
 #define TEXTURE_UNKNOWN_INDEX 7
 static GLuint translate_tex_src_bit( GLbitfield bit )
 {
+   /* make sure number of switch cases is correct */
+   assert(NUM_TEXTURE_TARGETS == 7);
    switch (bit) {
-   case TEXTURE_1D_BIT:   return TEXTURE_1D_INDEX;
-   case TEXTURE_2D_BIT:   return TEXTURE_2D_INDEX;
-   case TEXTURE_RECT_BIT: return TEXTURE_RECT_INDEX;
-   case TEXTURE_3D_BIT:   return TEXTURE_3D_INDEX;
-   case TEXTURE_CUBE_BIT: return TEXTURE_CUBE_INDEX;
-   default: return TEXTURE_UNKNOWN_INDEX;
+   case TEXTURE_1D_BIT:         return TEXTURE_1D_INDEX;
+   case TEXTURE_2D_BIT:         return TEXTURE_2D_INDEX;
+   case TEXTURE_3D_BIT:         return TEXTURE_3D_INDEX;
+   case TEXTURE_CUBE_BIT:       return TEXTURE_CUBE_INDEX;
+   case TEXTURE_RECT_BIT:       return TEXTURE_RECT_INDEX;
+   case TEXTURE_1D_ARRAY_BIT:   return TEXTURE_1D_ARRAY_INDEX;
+   case TEXTURE_2D_ARRAY_BIT:   return TEXTURE_2D_ARRAY_INDEX;
+   default:                     return TEXTURE_UNKNOWN_INDEX;
    }
 }
 
-- 
cgit v1.2.3


From f0b0794b3885a2fdfb168ec4521c7b5e942d3228 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 17 Dec 2008 14:04:03 -0700
Subject: mesa: fix fixed-function test in get_fp_input_mask() - again.

The problem we're solving only occured when there was a user-defined
vertex shader but no fragment shader.  Check for that case now.
Fixes glean api2 vertex array failure.
---
 src/mesa/main/texenvprogram.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 1560e97c26..865ef8f9f8 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -219,6 +219,9 @@ static GLuint translate_tex_src_bit( GLbitfield bit )
  */
 static GLbitfield get_fp_input_mask( GLcontext *ctx )
 {
+   const GLboolean vertexShader = (ctx->Shader.CurrentProgram &&
+                                   ctx->Shader.CurrentProgram->VertexProgram);
+   const GLboolean vertexProgram = ctx->VertexProgram._Enabled;
    GLbitfield fp_inputs = 0x0;
 
    if (ctx->VertexProgram._Overriden) {
@@ -231,10 +234,9 @@ static GLbitfield get_fp_input_mask( GLcontext *ctx )
    else if (ctx->RenderMode == GL_FEEDBACK) {
       fp_inputs = (FRAG_BIT_COL0 | FRAG_BIT_TEX0);
    }
-   else if (!ctx->VertexProgram._Enabled ||
+   else if (!(vertexProgram || vertexShader) ||
             !ctx->VertexProgram._Current) {
-
-      /* Fixed function logic */
+      /* Fixed function vertex logic */
       GLbitfield varying_inputs = ctx->varying_vp_inputs;
 
       /* These get generated in the setup routine regardless of the
-- 
cgit v1.2.3


From 35bb2aa96a2499860869c0d307b599b3033b5264 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 17 Dec 2008 13:17:15 -0700
Subject: mesa: add missing cases for texture array targets

---
 src/mesa/main/texenvprogram.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index c279956f2a..0294c107b2 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -179,13 +179,17 @@ static GLuint translate_mode( GLenum mode )
 #define TEXTURE_UNKNOWN_INDEX 7
 static GLuint translate_tex_src_bit( GLbitfield bit )
 {
+   /* make sure number of switch cases is correct */
+   assert(NUM_TEXTURE_TARGETS == 7);
    switch (bit) {
-   case TEXTURE_1D_BIT:   return TEXTURE_1D_INDEX;
-   case TEXTURE_2D_BIT:   return TEXTURE_2D_INDEX;
-   case TEXTURE_RECT_BIT: return TEXTURE_RECT_INDEX;
-   case TEXTURE_3D_BIT:   return TEXTURE_3D_INDEX;
-   case TEXTURE_CUBE_BIT: return TEXTURE_CUBE_INDEX;
-   default: return TEXTURE_UNKNOWN_INDEX;
+   case TEXTURE_1D_BIT:         return TEXTURE_1D_INDEX;
+   case TEXTURE_2D_BIT:         return TEXTURE_2D_INDEX;
+   case TEXTURE_3D_BIT:         return TEXTURE_3D_INDEX;
+   case TEXTURE_CUBE_BIT:       return TEXTURE_CUBE_INDEX;
+   case TEXTURE_RECT_BIT:       return TEXTURE_RECT_INDEX;
+   case TEXTURE_1D_ARRAY_BIT:   return TEXTURE_1D_ARRAY_INDEX;
+   case TEXTURE_2D_ARRAY_BIT:   return TEXTURE_2D_ARRAY_INDEX;
+   default:                     return TEXTURE_UNKNOWN_INDEX;
    }
 }
 
-- 
cgit v1.2.3


From 947d04d08bead28c43f525ea4c1d99a039bed047 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 17 Dec 2008 14:04:03 -0700
Subject: mesa: fix fixed-function test in get_fp_input_mask() - again.

The problem we're solving only occured when there was a user-defined
vertex shader but no fragment shader.  Check for that case now.
Fixes glean api2 vertex array failure.
---
 src/mesa/main/texenvprogram.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 0294c107b2..75f5baa3e1 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -207,6 +207,9 @@ static GLuint translate_tex_src_bit( GLbitfield bit )
  */
 static GLbitfield get_fp_input_mask( GLcontext *ctx )
 {
+   const GLboolean vertexShader = (ctx->Shader.CurrentProgram &&
+                                   ctx->Shader.CurrentProgram->VertexProgram);
+   const GLboolean vertexProgram = ctx->VertexProgram._Enabled;
    GLbitfield fp_inputs = 0x0;
 
    if (ctx->VertexProgram._Overriden) {
@@ -219,10 +222,9 @@ static GLbitfield get_fp_input_mask( GLcontext *ctx )
    else if (ctx->RenderMode == GL_FEEDBACK) {
       fp_inputs = (FRAG_BIT_COL0 | FRAG_BIT_TEX0);
    }
-   else if (!ctx->VertexProgram._Enabled ||
+   else if (!(vertexProgram || vertexShader) ||
             !ctx->VertexProgram._Current) {
-
-      /* Fixed function logic */
+      /* Fixed function vertex logic */
       GLbitfield varying_inputs = ctx->varying_vp_inputs;
 
       /* These get generated in the setup routine regardless of the
-- 
cgit v1.2.3


From 2389c055ed4c26ba5f3979c4a7871a333725dd88 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 17 Dec 2008 19:01:34 -0700
Subject: mesa: choose GLSL vertex shader over ARB/internal vertex program in
 get_fp_input_mask()

This is a work-around the for the fact that we do fragment shader state
validation before vertex shader validation (see comments in state.c) so in
get_fp_input_mask() we can't rely on ctx->VertexProgram._Current being up to
date yet.

This fixes a glean glsl1 test failure.
---
 src/mesa/main/texenvprogram.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 865ef8f9f8..2f90a34220 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -270,7 +270,19 @@ static GLbitfield get_fp_input_mask( GLcontext *ctx )
    }
    else {
       /* calculate from vp->outputs */
-      GLbitfield vp_outputs = ctx->VertexProgram._Current->Base.OutputsWritten;
+      struct gl_vertex_program *vprog;
+      GLbitfield vp_outputs;
+
+      /* Choose GLSL vertex shader over ARB vertex program.  Need this
+       * since vertex shader state validation comes after fragment state
+       * validation (see additional comments in state.c).
+       */
+      if (vertexShader)
+         vprog = ctx->Shader.CurrentProgram->VertexProgram;
+      else
+         vprog = ctx->VertexProgram._Current;
+
+      vp_outputs = vprog->Base.OutputsWritten;
 
       /* These get generated in the setup routine regardless of the
        * vertex program:
-- 
cgit v1.2.3


From f9c76750a7687e9902f2efd91d5551ae0128003c Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 17 Dec 2008 19:01:34 -0700
Subject: mesa: choose GLSL vertex shader over ARB/internal vertex program in
 get_fp_input_mask()

This is a work-around the for the fact that we do fragment shader state
validation before vertex shader validation (see comments in state.c) so in
get_fp_input_mask() we can't rely on ctx->VertexProgram._Current being up to
date yet.

This fixes a glean glsl1 test failure.
---
 src/mesa/main/texenvprogram.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 75f5baa3e1..64b2ab6c13 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -258,7 +258,19 @@ static GLbitfield get_fp_input_mask( GLcontext *ctx )
    }
    else {
       /* calculate from vp->outputs */
-      GLbitfield vp_outputs = ctx->VertexProgram._Current->Base.OutputsWritten;
+      struct gl_vertex_program *vprog;
+      GLbitfield vp_outputs;
+
+      /* Choose GLSL vertex shader over ARB vertex program.  Need this
+       * since vertex shader state validation comes after fragment state
+       * validation (see additional comments in state.c).
+       */
+      if (vertexShader)
+         vprog = ctx->Shader.CurrentProgram->VertexProgram;
+      else
+         vprog = ctx->VertexProgram._Current;
+
+      vp_outputs = vprog->Base.OutputsWritten;
 
       /* These get generated in the setup routine regardless of the
        * vertex program:
-- 
cgit v1.2.3


From a402d48f840f1d51eb46dc15a047589e2b8ca431 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Tue, 7 Oct 2008 18:47:31 -0700
Subject: mesa: Pass the context to query object delete cb to avoid null
 dereference.

---
 src/mesa/main/queryobj.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c
index 2d06030030..e3ba7b6ff7 100644
--- a/src/mesa/main/queryobj.c
+++ b/src/mesa/main/queryobj.c
@@ -546,6 +546,6 @@ delete_queryobj_cb(GLuint id, void *data, void *userData)
 void
 _mesa_free_query_data(GLcontext *ctx)
 {
-   _mesa_HashDeleteAll(ctx->Query.QueryObjects, delete_queryobj_cb, NULL);
+   _mesa_HashDeleteAll(ctx->Query.QueryObjects, delete_queryobj_cb, ctx);
    _mesa_DeleteHashTable(ctx->Query.QueryObjects);
 }
-- 
cgit v1.2.3


From 9585f8daef6681bf1ad62ff4ad9a4102cf5d1abd Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 17 Dec 2008 14:54:46 -0700
Subject: mesa: updated comments

---
 src/mesa/main/mtypes.h | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 556b4ed016..2a48b7c517 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -7,7 +7,7 @@
 
 /*
  * Mesa 3-D graphics library
- * Version:  6.5.3
+ * Version:  7.3
  *
  * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
  *
@@ -1958,14 +1958,15 @@ struct gl_program_state
  */
 struct gl_vertex_program_state
 {
-   GLboolean Enabled;               /**< GL_VERTEX_PROGRAM_ARB/NV */
-   GLboolean _Enabled;              /**< Enabled and valid program? */
+   GLboolean Enabled;               /**< User-set GL_VERTEX_PROGRAM_ARB/NV flag */
+   GLboolean _Enabled;              /**< Enabled and _valid_ user program? */
    GLboolean PointSizeEnabled;      /**< GL_VERTEX_PROGRAM_POINT_SIZE_ARB/NV */
    GLboolean TwoSideEnabled;        /**< GL_VERTEX_PROGRAM_TWO_SIDE_ARB/NV */
-   struct gl_vertex_program *Current;  /**< user-bound vertex program */
+   struct gl_vertex_program *Current;  /**< User-bound vertex program */
 
-   /** Currently enabled and valid program (including internal programs
-    * and compiled shader programs).
+   /** Currently enabled and valid vertex program (including internal programs,
+    * user-defined vertex programs and GLSL vertex shaders).
+    * This is the program we must use when rendering.
     */
    struct gl_vertex_program *_Current;
 
@@ -2001,12 +2002,12 @@ struct gl_vertex_program_state
 struct gl_fragment_program_state
 {
    GLboolean Enabled;     /**< User-set fragment program enable flag */
-   GLboolean _Enabled;    /**< Fragment program enabled and valid? */
-   GLboolean _Active;
+   GLboolean _Enabled;    /**< Enabled and _valid_ user program? */
    struct gl_fragment_program *Current;  /**< User-bound fragment program */
 
-   /** Currently enabled and valid program (including internal programs
-    * and compiled shader programs).
+   /** Currently enabled and valid fragment program (including internal programs,
+    * user-defined fragment programs and GLSL fragment shaders).
+    * This is the program we must use when rendering.
     */
    struct gl_fragment_program *_Current;
 
@@ -2015,6 +2016,7 @@ struct gl_fragment_program_state
    /** Should fixed-function texturing be implemented with a fragment prog? */
    GLboolean _MaintainTexEnvProgram;
    GLboolean _UseTexEnvProgram;
+   GLboolean _Active;     /**< Use internal texenv program? */
 
    /** Program to emulate fixed-function texture env/combine (see above) */
    struct gl_fragment_program *_TexEnvProgram;
-- 
cgit v1.2.3


From 60410fc8587ce2bf09a5dc5d744268aa83701522 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 17 Dec 2008 18:05:03 -0700
Subject: mesa: remove unneeded _mesa_reference_fragprog() call

The subsequent if/else cases always call _mesa_reference_fragprog() anyway.
---
 src/mesa/main/state.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 0d452fd879..3c111759d2 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -190,8 +190,8 @@ update_program(GLcontext *ctx)
 
    /*
     * Set the ctx->VertexProgram._Current and ctx->FragmentProgram._Current
-    * pointers to the programs that should be enabled/used.  These will only
-    * be NULL if we need to use the fixed-function code.
+    * pointers to the programs that should be used for rendering.  If either
+    * is NULL, use fixed-function code paths.
     *
     * These programs may come from several sources.  The priority is as
     * follows:
@@ -204,8 +204,6 @@ update_program(GLcontext *ctx)
     * come up, or matter.
     */
 
-   _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current, NULL);
-
    if (shProg && shProg->LinkStatus && shProg->FragmentProgram) {
       /* Use shader programs */
       _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current,
-- 
cgit v1.2.3


From 9972d7147b1622074669111d72d85467c8c398cc Mon Sep 17 00:00:00 2001
From: José Fonseca <jfonseca@vmware.com>
Date: Tue, 30 Dec 2008 17:21:25 +0000
Subject: mesa: Do not specify types in bitfields.

As advised by gcc -pedantic.
---
 src/mesa/main/texenvprogram.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 2f90a34220..bd33cb4e05 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -55,8 +55,8 @@ struct texenvprog_cache_item
 #define DISASSEM (MESA_VERBOSE & VERBOSE_DISASSEM)
 
 struct mode_opt {
-   GLubyte Source:4;
-   GLubyte Operand:3;
+   GLuint Source:4;
+   GLuint Operand:3;
 };
 
 struct state_key {
-- 
cgit v1.2.3


From a48b004c442ec89905ee1dfdd778c9bca603732c Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 24 Nov 2008 13:04:04 -0700
Subject: mesa: add gl_program::Input/OutputFlags[] array

These arrays will indicate per-input or per-output options for vertex/fragment
programs such as centroid-sampling and invariance.

(cherry picked from commit b730d0d3e9b202b17a0815cb820fc9905f35cb98)
---
 src/mesa/main/config.h             |  2 ++
 src/mesa/main/mtypes.h             |  3 +++
 src/mesa/shader/prog_execute.h     |  6 ++----
 src/mesa/shader/slang/slang_link.c | 42 +++++++++++++++++++++++---------------
 4 files changed, 33 insertions(+), 20 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index 5e9a4f8939..34ab77d13e 100644
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -191,6 +191,8 @@
 #define MAX_UNIFORMS 128   /**< number of float components */
 #define MAX_VARYING 8      /**< number of float[4] vectors */
 #define MAX_SAMPLERS 8
+#define MAX_PROGRAM_INPUTS 32
+#define MAX_PROGRAM_OUTPUTS 32
 /*@}*/
 
 /** For GL_NV_vertex_program */
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 732de2bb43..e241fe188c 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1894,10 +1894,13 @@ struct gl_program
 
    GLbitfield InputsRead;     /**< Bitmask of which input regs are read */
    GLbitfield OutputsWritten; /**< Bitmask of which output regs are written to */
+   GLbitfield InputFlags[MAX_PROGRAM_INPUTS];   /**< PROG_PARAM_BIT_x flags */
+   GLbitfield OutputFlags[MAX_PROGRAM_OUTPUTS]; /**< PROG_PARAM_BIT_x flags */
    GLbitfield TexturesUsed[MAX_TEXTURE_IMAGE_UNITS];  /**< TEXTURE_x_BIT bitmask */
    GLbitfield SamplersUsed;   /**< Bitfield of which samplers are used */
    GLbitfield ShadowSamplers; /**< Texture units used for shadow sampling. */
 
+
    /** Named parameters, constants, etc. from program text */
    struct gl_program_parameter_list *Parameters;
    /** Numbered local parameters */
diff --git a/src/mesa/shader/prog_execute.h b/src/mesa/shader/prog_execute.h
index 18b13e11a4..8ceb7b092e 100644
--- a/src/mesa/shader/prog_execute.h
+++ b/src/mesa/shader/prog_execute.h
@@ -25,6 +25,8 @@
 #ifndef PROG_EXECUTE_H
 #define PROG_EXECUTE_H
 
+#include "main/config.h"
+
 
 typedef void (*FetchTexelLodFunc)(GLcontext *ctx, const GLfloat texcoord[4],
                                   GLfloat lambda, GLuint unit, GLfloat color[4]);
@@ -36,10 +38,6 @@ typedef void (*FetchTexelDerivFunc)(GLcontext *ctx, const GLfloat texcoord[4],
                                     GLuint unit, GLfloat color[4]);
 
 
-/** The larger of VERT_RESULT_MAX, FRAG_RESULT_MAX */
-#define MAX_PROGRAM_OUTPUTS VERT_RESULT_MAX
-
-
 /**
  * Virtual machine state used during execution of vertex/fragment programs.
  */
diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c
index 6b895013af..08d7540372 100644
--- a/src/mesa/shader/slang/slang_link.c
+++ b/src/mesa/shader/slang/slang_link.c
@@ -89,16 +89,39 @@ bits_agree(GLbitfield flags1, GLbitfield flags2, GLbitfield bit)
  * Linking varying vars involves rearranging varying vars so that the
  * vertex program's output varyings matches the order of the fragment
  * program's input varyings.
+ * We'll then rewrite instructions to replace PROGRAM_VARYING with either
+ * PROGRAM_INPUT or PROGRAM_OUTPUT depending on whether it's a vertex or
+ * fragment shader.
+ * This is also where we set program Input/OutputFlags to indicate
+ * which inputs are centroid-sampled, invariant, etc.
  */
 static GLboolean
 link_varying_vars(struct gl_shader_program *shProg, struct gl_program *prog)
 {
    GLuint *map, i, firstVarying, newFile;
+   GLbitfield *inOutFlags;
 
    map = (GLuint *) malloc(prog->Varying->NumParameters * sizeof(GLuint));
    if (!map)
       return GL_FALSE;
 
+   /* Varying variables are treated like other vertex program outputs
+    * (and like other fragment program inputs).  The position of the
+    * first varying differs for vertex/fragment programs...
+    * Also, replace File=PROGRAM_VARYING with File=PROGRAM_INPUT/OUTPUT.
+    */
+   if (prog->Target == GL_VERTEX_PROGRAM_ARB) {
+      firstVarying = VERT_RESULT_VAR0;
+      newFile = PROGRAM_OUTPUT;
+      inOutFlags = prog->OutputFlags;
+   }
+   else {
+      assert(prog->Target == GL_FRAGMENT_PROGRAM_ARB);
+      firstVarying = FRAG_ATTRIB_VAR0;
+      newFile = PROGRAM_INPUT;
+      inOutFlags = prog->InputFlags;
+   }
+
    for (i = 0; i < prog->Varying->NumParameters; i++) {
       /* see if this varying is in the linked varying list */
       const struct gl_program_parameter *var = prog->Varying->Parameters + i;
@@ -132,12 +155,14 @@ link_varying_vars(struct gl_shader_program *shProg, struct gl_program *prog)
                                var->Flags);
       }
 
-      /* map varying[i] to varying[j].
+      /* Map varying[i] to varying[j].
+       * Plus, set prog->Input/OutputFlags[] as described above.
        * Note: the loop here takes care of arrays or large (sz>4) vars.
        */
       {
          GLint sz = var->Size;
          while (sz > 0) {
+            inOutFlags[firstVarying + j] = var->Flags;
             /*printf("Link varying from %d to %d\n", i, j);*/
             map[i++] = j++;
             sz -= 4;
@@ -147,21 +172,6 @@ link_varying_vars(struct gl_shader_program *shProg, struct gl_program *prog)
    }
 
 
-   /* Varying variables are treated like other vertex program outputs
-    * (and like other fragment program inputs).  The position of the
-    * first varying differs for vertex/fragment programs...
-    * Also, replace File=PROGRAM_VARYING with File=PROGRAM_INPUT/OUTPUT.
-    */
-   if (prog->Target == GL_VERTEX_PROGRAM_ARB) {
-      firstVarying = VERT_RESULT_VAR0;
-      newFile = PROGRAM_OUTPUT;
-   }
-   else {
-      assert(prog->Target == GL_FRAGMENT_PROGRAM_ARB);
-      firstVarying = FRAG_ATTRIB_VAR0;
-      newFile = PROGRAM_INPUT;
-   }
-
    /* OK, now scan the program/shader instructions looking for varying vars,
     * replacing the old index with the new index.
     */
-- 
cgit v1.2.3


From 525145a9f6968851ed97fb647261df3d8028e105 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Mon, 1 Dec 2008 18:32:47 -0700
Subject: mesa: fix conditional in save_Lightfv(), bug 18838

(cherry picked from commit 1e2f57425153d73646fde7c91c16aa5559491556)
---
 src/mesa/main/dlist.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index ffe6dbfe08..44341c5228 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -2002,7 +2002,7 @@ save_Lightfv(GLenum light, GLenum pname, const GLfloat *params)
    Node *n;
    ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
    n = ALLOC_INSTRUCTION(ctx, OPCODE_LIGHT, 6);
-   if (OPCODE_LIGHT) {
+   if (n) {
       GLint i, nParams;
       n[1].e = light;
       n[2].e = pname;
-- 
cgit v1.2.3


From 4ebb8f78e780ffa6f5f7082d0e36a792bceca321 Mon Sep 17 00:00:00 2001
From: José Fonseca <jfonseca@vmware.com>
Date: Tue, 6 Jan 2009 16:01:11 +0000
Subject: mesa: Use explicit casts when precision is lost.

Silences MSVC.
---
 src/mesa/main/get.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 4674c44a3f..e4910a633e 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -2133,7 +2133,7 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          params[0] = (GLfloat)(ctx->DrawBuffer->Visual.depthBits);
          break;
       case GL_DEPTH_CLEAR_VALUE:
-         params[0] = ctx->Depth.Clear;
+         params[0] = (GLfloat)(ctx->Depth.Clear);
          break;
       case GL_DEPTH_FUNC:
          params[0] = ENUM_TO_FLOAT(ctx->Depth.Func);
@@ -2936,7 +2936,7 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          GLuint i, n = _mesa_get_compressed_formats(ctx, formats, GL_FALSE);
          ASSERT(n <= 100);
          for (i = 0; i < n; i++)
-            params[i] = ENUM_TO_INT(formats[i]);
+            params[i] = ENUM_TO_FLOAT(formats[i]);
          }
          break;
       case GL_ARRAY_ELEMENT_LOCK_FIRST_EXT:
-- 
cgit v1.2.3


From bec14ebf5e4253cdb9e7610273cdd38360394404 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 6 Jan 2009 14:18:45 -0700
Subject: mesa: fix float->int mapping for glGetIntegerv(GL_DEPTH_CLEAR_VALUE)

(cherry picked from commit 8124faf89d638285d8e9aa93adc3ca7f4ee729f3)

Conflicts:

	src/mesa/main/get.c
---
 src/mesa/main/get.c      | 4 ++--
 src/mesa/main/get_gen.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index e4910a633e..19cc4806f9 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -2133,7 +2133,7 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          params[0] = (GLfloat)(ctx->DrawBuffer->Visual.depthBits);
          break;
       case GL_DEPTH_CLEAR_VALUE:
-         params[0] = (GLfloat)(ctx->Depth.Clear);
+         params[0] = ctx->Depth.Clear;
          break;
       case GL_DEPTH_FUNC:
          params[0] = ENUM_TO_FLOAT(ctx->Depth.Func);
@@ -3977,7 +3977,7 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          params[0] = ctx->DrawBuffer->Visual.depthBits;
          break;
       case GL_DEPTH_CLEAR_VALUE:
-         params[0] = IROUND(ctx->Depth.Clear);
+         params[0] = FLOAT_TO_INT(ctx->Depth.Clear);
          break;
       case GL_DEPTH_FUNC:
          params[0] = ENUM_TO_INT(ctx->Depth.Func);
diff --git a/src/mesa/main/get_gen.py b/src/mesa/main/get_gen.py
index 653deefa72..4c841d05a4 100644
--- a/src/mesa/main/get_gen.py
+++ b/src/mesa/main/get_gen.py
@@ -179,7 +179,7 @@ StateVars = [
 	( "GL_DEPTH_BIAS", GLfloat, ["ctx->Pixel.DepthBias"], "", None ),
 	( "GL_DEPTH_BITS", GLint, ["ctx->DrawBuffer->Visual.depthBits"],
 	  "", None ),
-	( "GL_DEPTH_CLEAR_VALUE", GLfloat, ["ctx->Depth.Clear"], "", None ),
+	( "GL_DEPTH_CLEAR_VALUE", GLfloatN, ["ctx->Depth.Clear"], "", None ),
 	( "GL_DEPTH_FUNC", GLenum, ["ctx->Depth.Func"], "", None ),
 	( "GL_DEPTH_RANGE", GLfloatN,
 	  [ "ctx->Viewport.Near", "ctx->Viewport.Far" ], "", None ),
-- 
cgit v1.2.3


From c3be5e4a050561e25854f38aa221bbf657848762 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Thu, 25 Sep 2008 19:57:34 -0600
Subject: mesa: fix cast/conversion for optional code

(cherry picked from commit 1e3a44fab068f00378613456036716d0c3772969)
---
 src/mesa/main/get.c      | 2 +-
 src/mesa/main/get_gen.py | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 19cc4806f9..80dcea9bca 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -1092,7 +1092,7 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          GLuint i, n = _mesa_get_compressed_formats(ctx, formats, GL_FALSE);
          ASSERT(n <= 100);
          for (i = 0; i < n; i++)
-            params[i] = ENUM_TO_INT(formats[i]);
+            params[i] = ENUM_TO_BOOLEAN(formats[i]);
          }
          break;
       case GL_ARRAY_ELEMENT_LOCK_FIRST_EXT:
diff --git a/src/mesa/main/get_gen.py b/src/mesa/main/get_gen.py
index 4c841d05a4..f99e0a080d 100644
--- a/src/mesa/main/get_gen.py
+++ b/src/mesa/main/get_gen.py
@@ -50,7 +50,8 @@ TypeStrings = {
 #  - the GL state name, such as GL_CURRENT_COLOR
 #  - the state datatype, one of GLint, GLfloat, GLboolean or GLenum
 #  - list of code fragments to get the state, such as ["ctx->Foo.Bar"]
-#  - optional extra code or empty string
+#  - optional extra code or empty string.  If present, "CONVERSION" will be
+#    replaced by ENUM_TO_FLOAT, INT_TO_FLOAT, etc.
 #  - optional extensions to check, or None
 #
 StateVars = [
@@ -532,7 +533,7 @@ StateVars = [
          GLuint i, n = _mesa_get_compressed_formats(ctx, formats, GL_FALSE);
          ASSERT(n <= 100);
          for (i = 0; i < n; i++)
-            params[i] = ENUM_TO_INT(formats[i]);""",
+            params[i] = CONVERSION(formats[i]);""",
 	  ["ARB_texture_compression"] ),
 
 	# GL_EXT_compiled_vertex_array
@@ -1078,10 +1079,11 @@ def EmitGetFunction(stateVars, returnType):
 				assert len(extensions) == 4
 				print ('         CHECK_EXT4(%s, %s, %s, %s, "%s");' %
 					   (extensions[0], extensions[1], extensions[2], extensions[3], function))
+		conversion = ConversionFunc(varType, returnType)
 		if optionalCode:
+			optionalCode = string.replace(optionalCode, "CONVERSION", conversion);	
 			print "         {"
 			print "         " + optionalCode
-		conversion = ConversionFunc(varType, returnType)
 		n = len(state)
 		for i in range(n):
 			if conversion:
-- 
cgit v1.2.3


From d14d494dcda3d80ec2cf452551c680ffb432e306 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 6 Jan 2009 14:21:27 -0700
Subject: mesa: fix GL_DEPTH_CLEAR_VALUE casting

---
 src/mesa/main/get.c      | 6 +++---
 src/mesa/main/get_gen.py | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 80dcea9bca..55b62bc537 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -289,7 +289,7 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          params[0] = INT_TO_BOOLEAN(ctx->DrawBuffer->Visual.depthBits);
          break;
       case GL_DEPTH_CLEAR_VALUE:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Depth.Clear);
+         params[0] = FLOAT_TO_BOOLEAN(((GLfloat) ctx->Depth.Clear));
          break;
       case GL_DEPTH_FUNC:
          params[0] = ENUM_TO_BOOLEAN(ctx->Depth.Func);
@@ -2133,7 +2133,7 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          params[0] = (GLfloat)(ctx->DrawBuffer->Visual.depthBits);
          break;
       case GL_DEPTH_CLEAR_VALUE:
-         params[0] = ctx->Depth.Clear;
+         params[0] = ((GLfloat) ctx->Depth.Clear);
          break;
       case GL_DEPTH_FUNC:
          params[0] = ENUM_TO_FLOAT(ctx->Depth.Func);
@@ -3977,7 +3977,7 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          params[0] = ctx->DrawBuffer->Visual.depthBits;
          break;
       case GL_DEPTH_CLEAR_VALUE:
-         params[0] = FLOAT_TO_INT(ctx->Depth.Clear);
+         params[0] = FLOAT_TO_INT(((GLfloat) ctx->Depth.Clear));
          break;
       case GL_DEPTH_FUNC:
          params[0] = ENUM_TO_INT(ctx->Depth.Func);
diff --git a/src/mesa/main/get_gen.py b/src/mesa/main/get_gen.py
index f99e0a080d..cbac908057 100644
--- a/src/mesa/main/get_gen.py
+++ b/src/mesa/main/get_gen.py
@@ -180,7 +180,7 @@ StateVars = [
 	( "GL_DEPTH_BIAS", GLfloat, ["ctx->Pixel.DepthBias"], "", None ),
 	( "GL_DEPTH_BITS", GLint, ["ctx->DrawBuffer->Visual.depthBits"],
 	  "", None ),
-	( "GL_DEPTH_CLEAR_VALUE", GLfloatN, ["ctx->Depth.Clear"], "", None ),
+	( "GL_DEPTH_CLEAR_VALUE", GLfloatN, ["((GLfloat) ctx->Depth.Clear)"], "", None ),
 	( "GL_DEPTH_FUNC", GLenum, ["ctx->Depth.Func"], "", None ),
 	( "GL_DEPTH_RANGE", GLfloatN,
 	  [ "ctx->Viewport.Near", "ctx->Viewport.Far" ], "", None ),
-- 
cgit v1.2.3


From a055520bfba38b160a79f41a6c9df377150e0a10 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 6 Jan 2009 14:23:07 -0700
Subject: add GL_READ_FRAMEBUFFER_BINDING_EXT case, regenerate get.c file

(cherry picked from commit 816fbeaa813e5cdca314a39677c74c8dc700d35a)

Conflicts:

	src/mesa/main/get.c
---
 src/mesa/main/get.c      | 12 ++++++++++++
 src/mesa/main/get_gen.py |  5 +++++
 2 files changed, 17 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 55b62bc537..8ce9b0ae69 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -1873,6 +1873,10 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          CHECK_EXT1(EXT_framebuffer_object, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Const.MaxRenderbufferSize);
          break;
+      case GL_READ_FRAMEBUFFER_BINDING_EXT:
+         CHECK_EXT1(EXT_framebuffer_blit, "GetBooleanv");
+         params[0] = INT_TO_BOOLEAN(ctx->ReadBuffer->Name);
+         break;
       case GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB:
          CHECK_EXT1(ARB_fragment_shader, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Const.FragmentProgram.MaxUniformComponents);
@@ -3717,6 +3721,10 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          CHECK_EXT1(EXT_framebuffer_object, "GetFloatv");
          params[0] = (GLfloat)(ctx->Const.MaxRenderbufferSize);
          break;
+      case GL_READ_FRAMEBUFFER_BINDING_EXT:
+         CHECK_EXT1(EXT_framebuffer_blit, "GetFloatv");
+         params[0] = (GLfloat)(ctx->ReadBuffer->Name);
+         break;
       case GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB:
          CHECK_EXT1(ARB_fragment_shader, "GetFloatv");
          params[0] = (GLfloat)(ctx->Const.FragmentProgram.MaxUniformComponents);
@@ -5561,6 +5569,10 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          CHECK_EXT1(EXT_framebuffer_object, "GetIntegerv");
          params[0] = ctx->Const.MaxRenderbufferSize;
          break;
+      case GL_READ_FRAMEBUFFER_BINDING_EXT:
+         CHECK_EXT1(EXT_framebuffer_blit, "GetIntegerv");
+         params[0] = ctx->ReadBuffer->Name;
+         break;
       case GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB:
          CHECK_EXT1(ARB_fragment_shader, "GetIntegerv");
          params[0] = ctx->Const.FragmentProgram.MaxUniformComponents;
diff --git a/src/mesa/main/get_gen.py b/src/mesa/main/get_gen.py
index cbac908057..a191b045d3 100644
--- a/src/mesa/main/get_gen.py
+++ b/src/mesa/main/get_gen.py
@@ -981,6 +981,11 @@ StateVars = [
 	  ["ctx->Const.MaxRenderbufferSize"], "",
 	  ["EXT_framebuffer_object"] ),
 
+	# GL_EXT_framebuffer_blit
+	# NOTE: GL_DRAW_FRAMEBUFFER_BINDING_EXT == GL_FRAMEBUFFER_BINDING_EXT
+	( "GL_READ_FRAMEBUFFER_BINDING_EXT", GLint, ["ctx->ReadBuffer->Name"], "",
+	  ["EXT_framebuffer_blit"] ),
+
 	# GL_ARB_fragment_shader
 	( "GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB", GLint,
 	  ["ctx->Const.FragmentProgram.MaxUniformComponents"], "",
-- 
cgit v1.2.3


From f8f9a1b620d31d1a59855fd502caed325d4a324f Mon Sep 17 00:00:00 2001
From: José Fonseca <jfonseca@vmware.com>
Date: Wed, 7 Jan 2009 12:02:06 +0000
Subject: mesa: Add _mesa_snprintf.

On Windows snprintf is renamed as _snprintf.
---
 src/mesa/main/imports.c               | 12 ++++++++++++
 src/mesa/main/imports.h               |  3 +++
 src/mesa/shader/slang/slang_codegen.c |  2 +-
 src/mesa/shader/slang/slang_emit.c    |  4 ++--
 src/mesa/shader/slang/slang_link.c    |  8 ++++----
 5 files changed, 22 insertions(+), 7 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 7231fa699c..27d6df2f85 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -909,6 +909,18 @@ _mesa_sprintf( char *str, const char *fmt, ... )
    return r;
 }
 
+/** Wrapper around vsnprintf() */
+int
+_mesa_snprintf( char *str, size_t size, const char *fmt, ... )
+{
+   int r;
+   va_list args;
+   va_start( args, fmt );  
+   r = vsnprintf( str, size, fmt, args );
+   va_end( args );
+   return r;
+}
+
 /** Wrapper around printf(), using vsprintf() for the formatting. */
 void
 _mesa_printf( const char *fmtString, ... )
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index d91a1366b0..52d679cadd 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -752,6 +752,9 @@ _mesa_strtod( const char *s, char **end );
 extern int
 _mesa_sprintf( char *str, const char *fmt, ... );
 
+extern int
+_mesa_snprintf( char *str, size_t size, const char *fmt, ... );
+
 extern void
 _mesa_printf( const char *fmtString, ... );
 
diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c
index 7a2690b551..cc6d71478d 100644
--- a/src/mesa/shader/slang/slang_codegen.c
+++ b/src/mesa/shader/slang/slang_codegen.c
@@ -1973,7 +1973,7 @@ _slang_make_array_constructor(slang_assemble_ctx *A, slang_operation *oper)
          */
          slang_variable *p = slang_variable_scope_grow(fun->parameters);
          char name[10];
-         snprintf(name, sizeof(name), "p%d", i);
+         _mesa_snprintf(name, sizeof(name), "p%d", i);
          p->a_name = slang_atom_pool_atom(A->atoms, name);
          p->type.qualifier = SLANG_QUAL_CONST;
          p->type.specifier.type = baseType;
diff --git a/src/mesa/shader/slang/slang_emit.c b/src/mesa/shader/slang/slang_emit.c
index 35d323118e..3a837c9c10 100644
--- a/src/mesa/shader/slang/slang_emit.c
+++ b/src/mesa/shader/slang/slang_emit.c
@@ -2096,8 +2096,8 @@ emit_var_ref(slang_emit_info *emitInfo, slang_ir_node *n)
       if (index < 0) {
          /* error */
          char s[100];
-         snprintf(s, sizeof(s), "Undefined variable '%s'",
-                  (char *) n->Var->a_name);
+         _mesa_snprintf(s, sizeof(s), "Undefined variable '%s'",
+                        (char *) n->Var->a_name);
          slang_info_log_error(emitInfo->log, s);
          return NULL;
       }
diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c
index b2fd9554a6..108d11c7df 100644
--- a/src/mesa/shader/slang/slang_link.c
+++ b/src/mesa/shader/slang/slang_link.c
@@ -137,15 +137,15 @@ link_varying_vars(struct gl_shader_program *shProg, struct gl_program *prog)
          }
          if (!bits_agree(var->Flags, v->Flags, PROG_PARAM_BIT_CENTROID)) {
             char msg[100];
-            snprintf(msg, sizeof(msg),
-                     "centroid modifier mismatch for '%s'", var->Name);
+            _mesa_snprintf(msg, sizeof(msg),
+                           "centroid modifier mismatch for '%s'", var->Name);
             link_error(shProg, msg);
             return GL_FALSE;
          }
          if (!bits_agree(var->Flags, v->Flags, PROG_PARAM_BIT_INVARIANT)) {
             char msg[100];
-            snprintf(msg, sizeof(msg),
-                     "invariant modifier mismatch for '%s'", var->Name);
+            _mesa_snprintf(msg, sizeof(msg),
+                           "invariant modifier mismatch for '%s'", var->Name);
             link_error(shProg, msg);
             return GL_FALSE;
          }
-- 
cgit v1.2.3


From ca337076b3be03469f0170c1bf85d9611831886c Mon Sep 17 00:00:00 2001
From: José Fonseca <jfonseca@vmware.com>
Date: Thu, 8 Jan 2009 12:04:03 +0000
Subject: mesa: Fix windows build when UNICODE is defined.

---
 src/mesa/main/dlopen.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/dlopen.c b/src/mesa/main/dlopen.c
index becef8173e..8bc83c094f 100644
--- a/src/mesa/main/dlopen.c
+++ b/src/mesa/main/dlopen.c
@@ -48,7 +48,7 @@ _mesa_dlopen(const char *libname, int flags)
    flags = RTLD_LAZY | RTLD_GLOBAL; /* Overriding flags at this time */
    return dlopen(libname, flags);
 #elif defined(__MINGW32__)
-   return LoadLibrary(libname);
+   return LoadLibraryA(libname);
 #else
    return NULL;
 #endif
-- 
cgit v1.2.3


From 0db6804699e9d01a7957f853ce6ebfccbcd9906f Mon Sep 17 00:00:00 2001
From: José Fonseca <jfonseca@vmware.com>
Date: Tue, 6 Jan 2009 16:01:11 +0000
Subject: mesa: Use explicit casts when precision is lost.

Silences MSVC.
---
 src/mesa/main/get.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index f72aa6a288..8122c9f88f 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -2137,7 +2137,7 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          params[0] = (GLfloat)(ctx->DrawBuffer->Visual.depthBits);
          break;
       case GL_DEPTH_CLEAR_VALUE:
-         params[0] = ctx->Depth.Clear;
+         params[0] = (GLfloat)(ctx->Depth.Clear);
          break;
       case GL_DEPTH_FUNC:
          params[0] = ENUM_TO_FLOAT(ctx->Depth.Func);
-- 
cgit v1.2.3


From 0f5c71afd9b5b2f73721d443c3ccffdf8663aee0 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 6 Jan 2009 14:18:45 -0700
Subject: mesa: fix float->int mapping for glGetIntegerv(GL_DEPTH_CLEAR_VALUE)

(cherry picked from commit 8124faf89d638285d8e9aa93adc3ca7f4ee729f3)

Conflicts:

	src/mesa/main/get.c
---
 src/mesa/main/get.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 8122c9f88f..f72aa6a288 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -2137,7 +2137,7 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          params[0] = (GLfloat)(ctx->DrawBuffer->Visual.depthBits);
          break;
       case GL_DEPTH_CLEAR_VALUE:
-         params[0] = (GLfloat)(ctx->Depth.Clear);
+         params[0] = ctx->Depth.Clear;
          break;
       case GL_DEPTH_FUNC:
          params[0] = ENUM_TO_FLOAT(ctx->Depth.Func);
-- 
cgit v1.2.3


From b57797f3a81bd04a992868c48a6d98d66e692f3d Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 6 Jan 2009 14:21:27 -0700
Subject: mesa: fix GL_DEPTH_CLEAR_VALUE casting

---
 src/mesa/main/get.c      | 6 +++---
 src/mesa/main/get_gen.py | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index f72aa6a288..8ce9b0ae69 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -289,7 +289,7 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          params[0] = INT_TO_BOOLEAN(ctx->DrawBuffer->Visual.depthBits);
          break;
       case GL_DEPTH_CLEAR_VALUE:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Depth.Clear);
+         params[0] = FLOAT_TO_BOOLEAN(((GLfloat) ctx->Depth.Clear));
          break;
       case GL_DEPTH_FUNC:
          params[0] = ENUM_TO_BOOLEAN(ctx->Depth.Func);
@@ -2137,7 +2137,7 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          params[0] = (GLfloat)(ctx->DrawBuffer->Visual.depthBits);
          break;
       case GL_DEPTH_CLEAR_VALUE:
-         params[0] = ctx->Depth.Clear;
+         params[0] = ((GLfloat) ctx->Depth.Clear);
          break;
       case GL_DEPTH_FUNC:
          params[0] = ENUM_TO_FLOAT(ctx->Depth.Func);
@@ -3985,7 +3985,7 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          params[0] = ctx->DrawBuffer->Visual.depthBits;
          break;
       case GL_DEPTH_CLEAR_VALUE:
-         params[0] = FLOAT_TO_INT(ctx->Depth.Clear);
+         params[0] = FLOAT_TO_INT(((GLfloat) ctx->Depth.Clear));
          break;
       case GL_DEPTH_FUNC:
          params[0] = ENUM_TO_INT(ctx->Depth.Func);
diff --git a/src/mesa/main/get_gen.py b/src/mesa/main/get_gen.py
index 152e378b4f..a191b045d3 100644
--- a/src/mesa/main/get_gen.py
+++ b/src/mesa/main/get_gen.py
@@ -180,7 +180,7 @@ StateVars = [
 	( "GL_DEPTH_BIAS", GLfloat, ["ctx->Pixel.DepthBias"], "", None ),
 	( "GL_DEPTH_BITS", GLint, ["ctx->DrawBuffer->Visual.depthBits"],
 	  "", None ),
-	( "GL_DEPTH_CLEAR_VALUE", GLfloatN, ["ctx->Depth.Clear"], "", None ),
+	( "GL_DEPTH_CLEAR_VALUE", GLfloatN, ["((GLfloat) ctx->Depth.Clear)"], "", None ),
 	( "GL_DEPTH_FUNC", GLenum, ["ctx->Depth.Func"], "", None ),
 	( "GL_DEPTH_RANGE", GLfloatN,
 	  [ "ctx->Viewport.Near", "ctx->Viewport.Far" ], "", None ),
-- 
cgit v1.2.3


From 2d3953fd5ff91d9717d806a1fa3c8537efb8b67c Mon Sep 17 00:00:00 2001
From: José Fonseca <jfonseca@vmware.com>
Date: Wed, 7 Jan 2009 12:02:06 +0000
Subject: mesa: Add _mesa_snprintf.

On Windows snprintf is renamed as _snprintf.
---
 src/mesa/main/imports.c               | 12 ++++++++++++
 src/mesa/main/imports.h               |  3 +++
 src/mesa/shader/slang/slang_codegen.c |  2 +-
 src/mesa/shader/slang/slang_emit.c    |  4 ++--
 src/mesa/shader/slang/slang_link.c    |  8 ++++----
 5 files changed, 22 insertions(+), 7 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 6cfd7ccc72..69d55923c3 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -930,6 +930,18 @@ _mesa_sprintf( char *str, const char *fmt, ... )
    return r;
 }
 
+/** Wrapper around vsnprintf() */
+int
+_mesa_snprintf( char *str, size_t size, const char *fmt, ... )
+{
+   int r;
+   va_list args;
+   va_start( args, fmt );  
+   r = vsnprintf( str, size, fmt, args );
+   va_end( args );
+   return r;
+}
+
 /** Wrapper around printf(), using vsprintf() for the formatting. */
 void
 _mesa_printf( const char *fmtString, ... )
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index bab0042071..92d5d0bb4a 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -763,6 +763,9 @@ _mesa_strtod( const char *s, char **end );
 extern int
 _mesa_sprintf( char *str, const char *fmt, ... );
 
+extern int
+_mesa_snprintf( char *str, size_t size, const char *fmt, ... );
+
 extern void
 _mesa_printf( const char *fmtString, ... );
 
diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c
index 8e28be8abd..66615d3afd 100644
--- a/src/mesa/shader/slang/slang_codegen.c
+++ b/src/mesa/shader/slang/slang_codegen.c
@@ -1976,7 +1976,7 @@ _slang_make_array_constructor(slang_assemble_ctx *A, slang_operation *oper)
          */
          slang_variable *p = slang_variable_scope_grow(fun->parameters);
          char name[10];
-         snprintf(name, sizeof(name), "p%d", i);
+         _mesa_snprintf(name, sizeof(name), "p%d", i);
          p->a_name = slang_atom_pool_atom(A->atoms, name);
          p->type.qualifier = SLANG_QUAL_CONST;
          p->type.specifier.type = baseType;
diff --git a/src/mesa/shader/slang/slang_emit.c b/src/mesa/shader/slang/slang_emit.c
index 1c0a7bbbd6..d3b4e64b78 100644
--- a/src/mesa/shader/slang/slang_emit.c
+++ b/src/mesa/shader/slang/slang_emit.c
@@ -2099,8 +2099,8 @@ emit_var_ref(slang_emit_info *emitInfo, slang_ir_node *n)
       if (index < 0) {
          /* error */
          char s[100];
-         snprintf(s, sizeof(s), "Undefined variable '%s'",
-                  (char *) n->Var->a_name);
+         _mesa_snprintf(s, sizeof(s), "Undefined variable '%s'",
+                        (char *) n->Var->a_name);
          slang_info_log_error(emitInfo->log, s);
          return NULL;
       }
diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c
index 3ff94d21a3..3f953d86e7 100644
--- a/src/mesa/shader/slang/slang_link.c
+++ b/src/mesa/shader/slang/slang_link.c
@@ -137,15 +137,15 @@ link_varying_vars(struct gl_shader_program *shProg, struct gl_program *prog)
          }
          if (!bits_agree(var->Flags, v->Flags, PROG_PARAM_BIT_CENTROID)) {
             char msg[100];
-            snprintf(msg, sizeof(msg),
-                     "centroid modifier mismatch for '%s'", var->Name);
+            _mesa_snprintf(msg, sizeof(msg),
+                           "centroid modifier mismatch for '%s'", var->Name);
             link_error(shProg, msg);
             return GL_FALSE;
          }
          if (!bits_agree(var->Flags, v->Flags, PROG_PARAM_BIT_INVARIANT)) {
             char msg[100];
-            snprintf(msg, sizeof(msg),
-                     "invariant modifier mismatch for '%s'", var->Name);
+            _mesa_snprintf(msg, sizeof(msg),
+                           "invariant modifier mismatch for '%s'", var->Name);
             link_error(shProg, msg);
             return GL_FALSE;
          }
-- 
cgit v1.2.3


From 510916f50961a3a9286807e7f75ba716f3e7f967 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Wed, 7 Jan 2009 14:09:07 -0800
Subject: mesa: Remove _Active and _UseTexEnvProgram flags from fragment
 programs.

There was a note in state.c about _Active deserving to die, and there were
potential issues with it due to i965 forgetting to set _UseTexEnvProgram.
Removing both simplifies things.

Reviewed-by: Brian Paul <brianp@vmware.com>
---
 src/mesa/drivers/dri/i915/i915_context.c      |  1 -
 src/mesa/drivers/dri/i915/i915_state.c        |  2 +-
 src/mesa/drivers/dri/intel/intel_pixel_draw.c | 25 ++-----------------------
 src/mesa/main/context.c                       |  1 -
 src/mesa/main/mtypes.h                        |  2 --
 src/mesa/main/state.c                         | 11 -----------
 src/mesa/swrast/s_aalinetemp.h                |  2 +-
 src/mesa/tnl/t_context.c                      |  2 +-
 8 files changed, 5 insertions(+), 41 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/i915/i915_context.c b/src/mesa/drivers/dri/i915/i915_context.c
index 9bff74294d..3d6af38057 100644
--- a/src/mesa/drivers/dri/i915/i915_context.c
+++ b/src/mesa/drivers/dri/i915/i915_context.c
@@ -171,7 +171,6 @@ i915CreateContext(const __GLcontextModes * mesaVis,
    ctx->Const.FragmentProgram.MaxNativeAddressRegs = 0; /* I don't think we have one */
 
    ctx->FragmentProgram._MaintainTexEnvProgram = GL_TRUE;
-   ctx->FragmentProgram._UseTexEnvProgram = GL_TRUE;
 
    driInitExtensions(ctx, i915_extensions, GL_FALSE);
 
diff --git a/src/mesa/drivers/dri/i915/i915_state.c b/src/mesa/drivers/dri/i915/i915_state.c
index 9d04358e4f..a53f120a81 100644
--- a/src/mesa/drivers/dri/i915/i915_state.c
+++ b/src/mesa/drivers/dri/i915/i915_state.c
@@ -569,7 +569,7 @@ i915_update_fog(GLcontext * ctx)
    GLboolean enabled;
    GLboolean try_pixel_fog;
 
-   if (ctx->FragmentProgram._Active) {
+   if (ctx->FragmentProgram._Current) {
       /* Pull in static fog state from program */
       mode = ctx->FragmentProgram._Current->FogOption;
       enabled = (mode != GL_NONE);
diff --git a/src/mesa/drivers/dri/intel/intel_pixel_draw.c b/src/mesa/drivers/dri/intel/intel_pixel_draw.c
index 0d66935ad2..2af839b803 100644
--- a/src/mesa/drivers/dri/intel/intel_pixel_draw.c
+++ b/src/mesa/drivers/dri/intel/intel_pixel_draw.c
@@ -386,27 +386,6 @@ intelDrawPixels(GLcontext * ctx,
    if (INTEL_DEBUG & DEBUG_PIXEL)
       _mesa_printf("%s: fallback to swrast\n", __FUNCTION__);
 
-   if (ctx->FragmentProgram._Current == ctx->FragmentProgram._TexEnvProgram) {
-      /*
-       * We don't want the i915 texenv program to be applied to DrawPixels.
-       * This is really just a performance optimization (mesa will other-
-       * wise happily run the fragment program on each pixel in the image).
-       */
-      struct gl_fragment_program *fpSave = ctx->FragmentProgram._Current;
-   /* can't just set current frag prog to 0 here as on buffer resize
-      we'll get new state checks which will segfault. Remains a hack. */
-      ctx->FragmentProgram._Current = NULL;
-      ctx->FragmentProgram._UseTexEnvProgram = GL_FALSE;
-      ctx->FragmentProgram._Active = GL_FALSE;
-      _swrast_DrawPixels( ctx, x, y, width, height, format, type,
-                          unpack, pixels );
-      ctx->FragmentProgram._Current = fpSave;
-      ctx->FragmentProgram._UseTexEnvProgram = GL_TRUE;
-      ctx->FragmentProgram._Active = GL_TRUE;
-      _swrast_InvalidateState(ctx, _NEW_PROGRAM);
-   }
-   else {
-      _swrast_DrawPixels( ctx, x, y, width, height, format, type,
-                          unpack, pixels );
-   }
+   _swrast_DrawPixels(ctx, x, y, width, height, format, type,
+		      unpack, pixels);
 }
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index ea52b26f0f..8299628218 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1226,7 +1226,6 @@ _mesa_initialize_context(GLcontext *ctx,
 
    ctx->FragmentProgram._MaintainTexEnvProgram
       = (_mesa_getenv("MESA_TEX_PROG") != NULL);
-   ctx->FragmentProgram._UseTexEnvProgram = ctx->FragmentProgram._MaintainTexEnvProgram;
 
    ctx->VertexProgram._MaintainTnlProgram
       = (_mesa_getenv("MESA_TNL_PROG") != NULL);
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index a17bf9c7b0..25dee52ad0 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2014,8 +2014,6 @@ struct gl_fragment_program_state
 
    /** Should fixed-function texturing be implemented with a fragment prog? */
    GLboolean _MaintainTexEnvProgram;
-   GLboolean _UseTexEnvProgram;
-   GLboolean _Active;     /**< Use internal texenv program? */
 
    /** Program to emulate fixed-function texture env/combine (see above) */
    struct gl_fragment_program *_TexEnvProgram;
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 3c111759d2..718cd99847 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -254,17 +254,6 @@ update_program(GLcontext *ctx)
       _mesa_reference_vertprog(ctx, &ctx->VertexProgram._Current, NULL);
    }
 
-   /* XXX: get rid of _Active flag.
-    */
-#if 1
-   ctx->FragmentProgram._Active = ctx->FragmentProgram._Enabled;
-   if (ctx->FragmentProgram._MaintainTexEnvProgram &&
-       !ctx->FragmentProgram._Enabled) {
-      if (ctx->FragmentProgram._UseTexEnvProgram)
-	 ctx->FragmentProgram._Active = GL_TRUE;
-   }
-#endif
-
    /* Let the driver know what's happening:
     */
    if (ctx->FragmentProgram._Current != prevFP && ctx->Driver.BindProgram) {
diff --git a/src/mesa/swrast/s_aalinetemp.h b/src/mesa/swrast/s_aalinetemp.h
index ca08203d83..42ffe9f20c 100644
--- a/src/mesa/swrast/s_aalinetemp.h
+++ b/src/mesa/swrast/s_aalinetemp.h
@@ -76,7 +76,7 @@ NAME(plot)(GLcontext *ctx, struct LineInfo *line, int ix, int iy)
    ATTRIB_LOOP_BEGIN
       GLfloat (*attribArray)[4] = line->span.array->attribs[attr];
       if (attr >= FRAG_ATTRIB_TEX0 && attr < FRAG_ATTRIB_VAR0
-          && !ctx->FragmentProgram._Active) {
+          && !ctx->FragmentProgram._Current) {
          /* texcoord w/ divide by Q */
          const GLuint unit = attr - FRAG_ATTRIB_TEX0;
          const GLfloat invQ = solve_plane_recip(fx, fy, line->attrPlane[attr][3]);
diff --git a/src/mesa/tnl/t_context.c b/src/mesa/tnl/t_context.c
index ce37dc0428..fdf4534b36 100644
--- a/src/mesa/tnl/t_context.c
+++ b/src/mesa/tnl/t_context.c
@@ -140,7 +140,7 @@ _tnl_InvalidateState( GLcontext *ctx, GLuint new_state )
       /* fixed-function fog */
       RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_FOG );
    }
-   else if (ctx->FragmentProgram._Active || ctx->FragmentProgram._Current) {
+   else if (ctx->FragmentProgram._Current) {
       struct gl_fragment_program *fp = ctx->FragmentProgram._Current;
       if (fp) {
          if (fp->FogOption != GL_NONE || (fp->Base.InputsRead & FRAG_BIT_FOGC)) {
-- 
cgit v1.2.3


From f75910e9b781ba912bee791ba938d744c1d8f4f5 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 8 Jan 2009 16:16:36 -0700
Subject: mesa: set version string to 7.3-rc1

---
 src/mesa/main/version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index 81034a35d1..83aefe685a 100644
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -31,7 +31,7 @@
 #define MESA_MAJOR 7
 #define MESA_MINOR 3
 #define MESA_PATCH 0
-#define MESA_VERSION_STRING "7.3-devel"
+#define MESA_VERSION_STRING "7.3-rc1"
 
 /* To make version comparison easy */
 #define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
-- 
cgit v1.2.3


From 263b96e160606975285154c4b8b610fcb8f4c930 Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@vmware.com>
Date: Thu, 15 Jan 2009 11:51:39 +0000
Subject: mesa: check frambuffer complete status before rendering

---
 src/mesa/main/api_validate.c | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c
index bbc5933ab9..5c8955d7c8 100644
--- a/src/mesa/main/api_validate.c
+++ b/src/mesa/main/api_validate.c
@@ -78,6 +78,23 @@ max_buffer_index(GLcontext *ctx, GLuint count, GLenum type,
    return max;
 }
 
+static GLboolean
+check_valid_to_render(GLcontext *ctx, char *function)
+{
+   if (ctx->DrawBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
+      _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,
+                  "glDraw%s(incomplete framebuffer)", function);
+      return GL_FALSE;
+   }
+
+   /* Always need vertex positions, unless a vertex program is in use */
+   if (!ctx->VertexProgram._Current &&
+       !ctx->Array.ArrayObj->Vertex.Enabled &&
+       !ctx->Array.ArrayObj->VertexAttrib[0].Enabled)
+      return GL_FALSE;
+
+   return GL_TRUE;
+}
 
 GLboolean
 _mesa_validate_DrawElements(GLcontext *ctx,
@@ -108,10 +125,7 @@ _mesa_validate_DrawElements(GLcontext *ctx,
    if (ctx->NewState)
       _mesa_update_state(ctx);
 
-   /* Always need vertex positions, unless a vertex program is in use */
-   if (!ctx->VertexProgram._Current &&
-       !ctx->Array.ArrayObj->Vertex.Enabled &&
-       !ctx->Array.ArrayObj->VertexAttrib[0].Enabled)
+   if (!check_valid_to_render(ctx, "Elements"))
       return GL_FALSE;
 
    /* Vertex buffer object tests */
@@ -161,7 +175,6 @@ _mesa_validate_DrawElements(GLcontext *ctx,
    return GL_TRUE;
 }
 
-
 GLboolean
 _mesa_validate_DrawRangeElements(GLcontext *ctx, GLenum mode,
 				 GLuint start, GLuint end,
@@ -196,10 +209,7 @@ _mesa_validate_DrawRangeElements(GLcontext *ctx, GLenum mode,
    if (ctx->NewState)
       _mesa_update_state(ctx);
 
-   /* Always need vertex positions, unless a vertex program is in use */
-   if (!ctx->VertexProgram._Current &&
-       !ctx->Array.ArrayObj->Vertex.Enabled &&
-       !ctx->Array.ArrayObj->VertexAttrib[0].Enabled)
+   if (!check_valid_to_render(ctx, "RangeElements"))
       return GL_FALSE;
 
    /* Vertex buffer object tests */
@@ -267,10 +277,7 @@ _mesa_validate_DrawArrays(GLcontext *ctx,
    if (ctx->NewState)
       _mesa_update_state(ctx);
 
-   /* Always need vertex positions, unless a vertex program is in use */
-   if (!ctx->VertexProgram._Current &&
-       !ctx->Array.ArrayObj->Vertex.Enabled &&
-       !ctx->Array.ArrayObj->VertexAttrib[0].Enabled)
+   if (!check_valid_to_render(ctx, "Arrays"))
       return GL_FALSE;
 
    if (ctx->Const.CheckArrayBounds) {
-- 
cgit v1.2.3


From 5a458977113e4a0d3c389b03801cf6ce580d3935 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 22 Jan 2009 10:14:04 -0700
Subject: mesa: set version to 7.3

---
 Makefile                | 8 ++++----
 src/mesa/main/version.h | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/mesa/main')

diff --git a/Makefile b/Makefile
index ebc52546de..c1e0f67223 100644
--- a/Makefile
+++ b/Makefile
@@ -174,10 +174,10 @@ ultrix-gcc:
 
 # Rules for making release tarballs
 
-DIRECTORY = Mesa-7.3-rc3
-LIB_NAME = MesaLib-7.3-rc3
-DEMO_NAME = MesaDemos-7.3-rc3
-GLUT_NAME = MesaGLUT-7.3-rc3
+DIRECTORY = Mesa-7.3
+LIB_NAME = MesaLib-7.3
+DEMO_NAME = MesaDemos-7.3
+GLUT_NAME = MesaGLUT-7.3
 
 MAIN_FILES = \
 	$(DIRECTORY)/Makefile*						\
diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index 3d874c8ba8..62cd03f5e2 100644
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -31,7 +31,7 @@
 #define MESA_MAJOR 7
 #define MESA_MINOR 3
 #define MESA_PATCH 0
-#define MESA_VERSION_STRING "7.3-rc3"
+#define MESA_VERSION_STRING "7.3"
 
 /* To make version comparison easy */
 #define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
-- 
cgit v1.2.3


From 0e4805685035dc3ea26f169830843cd4cecd1a29 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 22 Jan 2009 10:22:55 -0700
Subject: mesa: master is open for new development, eventually will be Mesa 7.5

---
 Makefile                | 8 ++++----
 src/mesa/main/version.h | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/mesa/main')

diff --git a/Makefile b/Makefile
index c1e0f67223..840b41464f 100644
--- a/Makefile
+++ b/Makefile
@@ -174,10 +174,10 @@ ultrix-gcc:
 
 # Rules for making release tarballs
 
-DIRECTORY = Mesa-7.3
-LIB_NAME = MesaLib-7.3
-DEMO_NAME = MesaDemos-7.3
-GLUT_NAME = MesaGLUT-7.3
+DIRECTORY = Mesa-7.5-devel
+LIB_NAME = MesaLib-7.5-devel
+DEMO_NAME = MesaDemos-7.5-devel
+GLUT_NAME = MesaGLUT-7.5-devel
 
 MAIN_FILES = \
 	$(DIRECTORY)/Makefile*						\
diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index 62cd03f5e2..f5bf6e2c85 100644
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -1,6 +1,6 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.3
+ * Version:  7.5
  *
  * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  *
@@ -29,9 +29,9 @@
 
 /* Mesa version */
 #define MESA_MAJOR 7
-#define MESA_MINOR 3
+#define MESA_MINOR 5
 #define MESA_PATCH 0
-#define MESA_VERSION_STRING "7.3"
+#define MESA_VERSION_STRING "7.5-devel"
 
 /* To make version comparison easy */
 #define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
-- 
cgit v1.2.3


From 596b8fbbbf65cef227ce60216a57d4bbfd627099 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 22 Jan 2009 10:32:08 -0700
Subject: mesa: added _mesa_fprintf() wrapper

---
 src/mesa/main/imports.c | 15 ++++++++++++++-
 src/mesa/main/imports.h |  3 +++
 2 files changed, 17 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 5cf1a2baa4..0c2c894eef 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -955,9 +955,22 @@ _mesa_printf( const char *fmtString, ... )
    va_start( args, fmtString );  
    vsnprintf(s, MAXSTRING, fmtString, args);
    va_end( args );
-   fprintf(stderr,"%s", s);
+   fprintf(stderr, "%s", s);
 }
 
+/** Wrapper around fprintf(), using vsprintf() for the formatting. */
+void
+_mesa_fprintf( FILE *f, const char *fmtString, ... )
+{
+   char s[MAXSTRING];
+   va_list args;
+   va_start( args, fmtString );  
+   vsnprintf(s, MAXSTRING, fmtString, args);
+   va_end( args );
+   fprintf(f, "%s", s);
+}
+
+
 /** Wrapper around vsprintf() */
 int
 _mesa_vsprintf( char *str, const char *fmt, va_list args )
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index 13b571d1cb..ec270a0cb3 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -773,6 +773,9 @@ _mesa_snprintf( char *str, size_t size, const char *fmt, ... );
 extern void
 _mesa_printf( const char *fmtString, ... );
 
+extern void
+_mesa_fprintf( FILE *f, const char *fmtString, ... );
+
 extern int 
 _mesa_vsprintf( char *str, const char *fmt, va_list args );
 
-- 
cgit v1.2.3


From 27d08f0ed28792de9b9f0a977c13ee7ea7c0cf46 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 22 Jan 2009 15:02:00 -0700
Subject: mesa: regenerated GL API files

---
 src/mesa/drivers/dri/common/extension_helper.h |  190 +-
 src/mesa/glapi/dispatch.h                      |  427 +-
 src/mesa/glapi/glapioffsets.h                  |  422 +-
 src/mesa/glapi/glapitable.h                    |  419 +-
 src/mesa/glapi/glapitemp.h                     |  280 +-
 src/mesa/glapi/glprocs.h                       | 1048 ++---
 src/mesa/main/enums.c                          | 5704 ++++++++++++------------
 src/mesa/sparc/glapi_sparc.S                   |   53 +-
 src/mesa/x86-64/glapi_x86-64.S                 | 1996 +++++----
 src/mesa/x86/glapi_x86.S                       |  127 +-
 10 files changed, 5570 insertions(+), 5096 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/common/extension_helper.h b/src/mesa/drivers/dri/common/extension_helper.h
index b977ebf015..0d641f25f7 100644
--- a/src/mesa/drivers/dri/common/extension_helper.h
+++ b/src/mesa/drivers/dri/common/extension_helper.h
@@ -119,9 +119,10 @@ static const char ActiveTextureARB_names[] =
     "";
 #endif
 
-#if defined(need_GL_EXT_framebuffer_blit)
+#if defined(need_GL_ARB_framebuffer_object) || defined(need_GL_EXT_framebuffer_blit)
 static const char BlitFramebufferEXT_names[] = 
     "iiiiiiiiii\0" /* Parameter signature */
+    "glBlitFramebuffer\0"
     "glBlitFramebufferEXT\0"
     "";
 #endif
@@ -433,17 +434,18 @@ static const char Color4ubVertex3fvSUN_names[] =
     "";
 #endif
 
-#if defined(need_GL_EXT_texture_array)
+#if defined(need_GL_ARB_framebuffer_object) || defined(need_GL_EXT_texture_array)
 static const char FramebufferTextureLayerEXT_names[] = 
     "iiiii\0" /* Parameter signature */
+    "glFramebufferTextureLayer\0"
     "glFramebufferTextureLayerEXT\0"
     "";
 #endif
 
 #if defined(need_GL_SGIX_list_priority)
-static const char GetListParameterivSGIX_names[] = 
+static const char GetListParameterfvSGIX_names[] = 
     "iip\0" /* Parameter signature */
-    "glGetListParameterivSGIX\0"
+    "glGetListParameterfvSGIX\0"
     "";
 #endif
 
@@ -777,6 +779,13 @@ static const char VertexAttribs4fvNV_names[] =
     "";
 #endif
 
+#if defined(need_GL_NV_vertex_array_range)
+static const char VertexArrayRangeNV_names[] = 
+    "ip\0" /* Parameter signature */
+    "glVertexArrayRangeNV\0"
+    "";
+#endif
+
 #if defined(need_GL_SGIX_fragment_lighting)
 static const char FragmentLightiSGIX_names[] = 
     "iii\0" /* Parameter signature */
@@ -946,9 +955,10 @@ static const char VertexAttribs3fvNV_names[] =
     "";
 #endif
 
-#if defined(need_GL_EXT_framebuffer_object)
+#if defined(need_GL_ARB_framebuffer_object) || defined(need_GL_EXT_framebuffer_object)
 static const char GenerateMipmapEXT_names[] = 
     "i\0" /* Parameter signature */
+    "glGenerateMipmap\0"
     "glGenerateMipmapEXT\0"
     "";
 #endif
@@ -1077,13 +1087,6 @@ static const char AreTexturesResident_names[] =
     "";
 #endif
 
-#if defined(need_GL_EXT_framebuffer_object)
-static const char IsRenderbufferEXT_names[] = 
-    "i\0" /* Parameter signature */
-    "glIsRenderbufferEXT\0"
-    "";
-#endif
-
 #if defined(need_GL_VERSION_2_0) || defined(need_GL_ATI_separate_stencil)
 static const char StencilOpSeparate_names[] = 
     "iiii\0" /* Parameter signature */
@@ -1171,9 +1174,10 @@ static const char TexCoord2fNormal3fVertex3fSUN_names[] =
     "";
 #endif
 
-#if defined(need_GL_EXT_framebuffer_object)
+#if defined(need_GL_ARB_framebuffer_object) || defined(need_GL_EXT_framebuffer_object)
 static const char RenderbufferStorageEXT_names[] = 
     "iiii\0" /* Parameter signature */
+    "glRenderbufferStorage\0"
     "glRenderbufferStorageEXT\0"
     "";
 #endif
@@ -1364,9 +1368,10 @@ static const char SpriteParameterfvSGIX_names[] =
     "";
 #endif
 
-#if defined(need_GL_EXT_framebuffer_object)
+#if defined(need_GL_ARB_framebuffer_object) || defined(need_GL_EXT_framebuffer_object)
 static const char CheckFramebufferStatusEXT_names[] = 
     "i\0" /* Parameter signature */
+    "glCheckFramebufferStatus\0"
     "glCheckFramebufferStatusEXT\0"
     "";
 #endif
@@ -1554,13 +1559,6 @@ static const char FragmentLightivSGIX_names[] =
     "";
 #endif
 
-#if defined(need_GL_EXT_framebuffer_object)
-static const char DeleteRenderbuffersEXT_names[] = 
-    "ip\0" /* Parameter signature */
-    "glDeleteRenderbuffersEXT\0"
-    "";
-#endif
-
 #if defined(need_GL_EXT_pixel_transform)
 static const char PixelTransformParameterfvEXT_names[] = 
     "iip\0" /* Parameter signature */
@@ -1621,9 +1619,10 @@ static const char WindowPos2dMESA_names[] =
     "";
 #endif
 
-#if defined(need_GL_EXT_framebuffer_object)
+#if defined(need_GL_ARB_framebuffer_object) || defined(need_GL_EXT_framebuffer_object)
 static const char FramebufferTexture3DEXT_names[] = 
     "iiiiii\0" /* Parameter signature */
+    "glFramebufferTexture3D\0"
     "glFramebufferTexture3DEXT\0"
     "";
 #endif
@@ -1673,10 +1672,11 @@ static const char IndexFuncEXT_names[] =
     "";
 #endif
 
-#if defined(need_GL_SGIX_list_priority)
-static const char GetListParameterfvSGIX_names[] = 
-    "iip\0" /* Parameter signature */
-    "glGetListParameterfvSGIX\0"
+#if defined(need_GL_ARB_framebuffer_object) || defined(need_GL_EXT_framebuffer_object)
+static const char FramebufferTexture2DEXT_names[] = 
+    "iiiii\0" /* Parameter signature */
+    "glFramebufferTexture2D\0"
+    "glFramebufferTexture2DEXT\0"
     "";
 #endif
 
@@ -1763,13 +1763,6 @@ static const char DeleteFencesNV_names[] =
     "";
 #endif
 
-#if defined(need_GL_SGIX_polynomial_ffd)
-static const char DeformationMap3dSGIX_names[] = 
-    "iddiiddiiddiip\0" /* Parameter signature */
-    "glDeformationMap3dSGIX\0"
-    "";
-#endif
-
 #if defined(need_GL_VERSION_2_0)
 static const char IsShader_names[] = 
     "i\0" /* Parameter signature */
@@ -1894,6 +1887,13 @@ static const char MatrixIndexuivARB_names[] =
     "";
 #endif
 
+#if defined(need_GL_ARB_framebuffer_object)
+static const char RenderbufferStorageMultisample_names[] = 
+    "iiiii\0" /* Parameter signature */
+    "glRenderbufferStorageMultisample\0"
+    "";
+#endif
+
 #if defined(need_GL_EXT_coordinate_frame)
 static const char Tangent3sEXT_names[] = 
     "iii\0" /* Parameter signature */
@@ -1944,9 +1944,10 @@ static const char VertexAttrib2dvNV_names[] =
     "";
 #endif
 
-#if defined(need_GL_EXT_framebuffer_object)
+#if defined(need_GL_ARB_framebuffer_object) || defined(need_GL_EXT_framebuffer_object)
 static const char FramebufferRenderbufferEXT_names[] = 
     "iiii\0" /* Parameter signature */
+    "glFramebufferRenderbuffer\0"
     "glFramebufferRenderbufferEXT\0"
     "";
 #endif
@@ -1973,9 +1974,10 @@ static const char SetFenceNV_names[] =
     "";
 #endif
 
-#if defined(need_GL_EXT_framebuffer_object)
+#if defined(need_GL_ARB_framebuffer_object) || defined(need_GL_EXT_framebuffer_object)
 static const char FramebufferTexture1DEXT_names[] = 
     "iiiii\0" /* Parameter signature */
+    "glFramebufferTexture1D\0"
     "glFramebufferTexture1DEXT\0"
     "";
 #endif
@@ -2105,9 +2107,10 @@ static const char Tangent3fvEXT_names[] =
     "";
 #endif
 
-#if defined(need_GL_EXT_framebuffer_object)
+#if defined(need_GL_ARB_framebuffer_object) || defined(need_GL_EXT_framebuffer_object)
 static const char BindFramebufferEXT_names[] = 
     "ii\0" /* Parameter signature */
+    "glBindFramebuffer\0"
     "glBindFramebufferEXT\0"
     "";
 #endif
@@ -2488,9 +2491,10 @@ static const char MapParameterivNV_names[] =
     "";
 #endif
 
-#if defined(need_GL_EXT_framebuffer_object)
+#if defined(need_GL_ARB_framebuffer_object) || defined(need_GL_EXT_framebuffer_object)
 static const char GenRenderbuffersEXT_names[] = 
     "ip\0" /* Parameter signature */
+    "glGenRenderbuffers\0"
     "glGenRenderbuffersEXT\0"
     "";
 #endif
@@ -2952,9 +2956,10 @@ static const char WindowPos2ivMESA_names[] =
     "";
 #endif
 
-#if defined(need_GL_EXT_framebuffer_object)
+#if defined(need_GL_ARB_framebuffer_object) || defined(need_GL_EXT_framebuffer_object)
 static const char IsFramebufferEXT_names[] = 
     "i\0" /* Parameter signature */
+    "glIsFramebuffer\0"
     "glIsFramebufferEXT\0"
     "";
 #endif
@@ -3125,13 +3130,6 @@ static const char ReplacementCodeuiSUN_names[] =
     "";
 #endif
 
-#if defined(need_GL_EXT_framebuffer_object)
-static const char FramebufferTexture2DEXT_names[] = 
-    "iiiii\0" /* Parameter signature */
-    "glFramebufferTexture2DEXT\0"
-    "";
-#endif
-
 #if defined(need_GL_NV_vertex_program)
 static const char VertexAttribPointerNV_names[] = 
     "iiiip\0" /* Parameter signature */
@@ -3139,13 +3137,21 @@ static const char VertexAttribPointerNV_names[] =
     "";
 #endif
 
-#if defined(need_GL_EXT_framebuffer_object)
+#if defined(need_GL_ARB_framebuffer_object) || defined(need_GL_EXT_framebuffer_object)
 static const char GetFramebufferAttachmentParameterivEXT_names[] = 
     "iiip\0" /* Parameter signature */
+    "glGetFramebufferAttachmentParameteriv\0"
     "glGetFramebufferAttachmentParameterivEXT\0"
     "";
 #endif
 
+#if defined(need_GL_EXT_pixel_transform)
+static const char PixelTransformParameterfEXT_names[] = 
+    "iif\0" /* Parameter signature */
+    "glPixelTransformParameterfEXT\0"
+    "";
+#endif
+
 #if defined(need_GL_VERSION_1_3)
 static const char MultiTexCoord4dvARB_names[] = 
     "ip\0" /* Parameter signature */
@@ -3264,9 +3270,10 @@ static const char VertexAttrib3fvARB_names[] =
     "";
 #endif
 
-#if defined(need_GL_EXT_framebuffer_object)
+#if defined(need_GL_ARB_framebuffer_object) || defined(need_GL_EXT_framebuffer_object)
 static const char DeleteFramebuffersEXT_names[] = 
     "ip\0" /* Parameter signature */
+    "glDeleteFramebuffers\0"
     "glDeleteFramebuffersEXT\0"
     "";
 #endif
@@ -3360,9 +3367,10 @@ static const char GetPixelTexGenParameterfvSGIS_names[] =
     "";
 #endif
 
-#if defined(need_GL_EXT_framebuffer_object)
+#if defined(need_GL_ARB_framebuffer_object) || defined(need_GL_EXT_framebuffer_object)
 static const char GenFramebuffersEXT_names[] = 
     "ip\0" /* Parameter signature */
+    "glGenFramebuffers\0"
     "glGenFramebuffersEXT\0"
     "";
 #endif
@@ -3374,10 +3382,10 @@ static const char GetProgramParameterdvNV_names[] =
     "";
 #endif
 
-#if defined(need_GL_EXT_pixel_transform)
-static const char PixelTransformParameterfEXT_names[] = 
-    "iif\0" /* Parameter signature */
-    "glPixelTransformParameterfEXT\0"
+#if defined(need_GL_SGIX_instruments)
+static const char PollInstrumentsSGIX_names[] = 
+    "p\0" /* Parameter signature */
+    "glPollInstrumentsSGIX\0"
     "";
 #endif
 
@@ -3709,9 +3717,10 @@ static const char MultiDrawArraysEXT_names[] =
     "";
 #endif
 
-#if defined(need_GL_EXT_framebuffer_object)
+#if defined(need_GL_ARB_framebuffer_object) || defined(need_GL_EXT_framebuffer_object)
 static const char BindRenderbufferEXT_names[] = 
     "ii\0" /* Parameter signature */
+    "glBindRenderbuffer\0"
     "glBindRenderbufferEXT\0"
     "";
 #endif
@@ -4530,6 +4539,13 @@ static const char Minmax_names[] =
     "";
 #endif
 
+#if defined(need_GL_SGIX_polynomial_ffd)
+static const char DeformationMap3dSGIX_names[] = 
+    "iddiiddiiddiip\0" /* Parameter signature */
+    "glDeformationMap3dSGIX\0"
+    "";
+#endif
+
 #if defined(need_GL_VERSION_1_4) || defined(need_GL_EXT_fog_coord)
 static const char FogCoorddvEXT_names[] = 
     "p\0" /* Parameter signature */
@@ -4605,10 +4621,11 @@ static const char WeightdvARB_names[] =
     "";
 #endif
 
-#if defined(need_GL_SGIX_instruments)
-static const char PollInstrumentsSGIX_names[] = 
-    "p\0" /* Parameter signature */
-    "glPollInstrumentsSGIX\0"
+#if defined(need_GL_ARB_framebuffer_object) || defined(need_GL_EXT_framebuffer_object)
+static const char DeleteRenderbuffersEXT_names[] = 
+    "ip\0" /* Parameter signature */
+    "glDeleteRenderbuffers\0"
+    "glDeleteRenderbuffersEXT\0"
     "";
 #endif
 
@@ -4684,9 +4701,10 @@ static const char MultiTexCoord2fvARB_names[] =
     "";
 #endif
 
-#if defined(need_GL_EXT_framebuffer_object)
+#if defined(need_GL_ARB_framebuffer_object) || defined(need_GL_EXT_framebuffer_object)
 static const char GetRenderbufferParameterivEXT_names[] = 
     "iip\0" /* Parameter signature */
+    "glGetRenderbufferParameteriv\0"
     "glGetRenderbufferParameterivEXT\0"
     "";
 #endif
@@ -4742,6 +4760,13 @@ static const char Tangent3svEXT_names[] =
     "";
 #endif
 
+#if defined(need_GL_SGIX_list_priority)
+static const char GetListParameterivSGIX_names[] = 
+    "iip\0" /* Parameter signature */
+    "glGetListParameterivSGIX\0"
+    "";
+#endif
+
 #if defined(need_GL_VERSION_1_5) || defined(need_GL_ARB_vertex_buffer_object)
 static const char BindBufferARB_names[] = 
     "ii\0" /* Parameter signature */
@@ -4823,10 +4848,11 @@ static const char FragmentMaterialivSGIX_names[] =
     "";
 #endif
 
-#if defined(need_GL_NV_vertex_array_range)
-static const char VertexArrayRangeNV_names[] = 
-    "ip\0" /* Parameter signature */
-    "glVertexArrayRangeNV\0"
+#if defined(need_GL_ARB_framebuffer_object) || defined(need_GL_EXT_framebuffer_object)
+static const char IsRenderbufferEXT_names[] = 
+    "i\0" /* Parameter signature */
+    "glIsRenderbuffer\0"
+    "glIsRenderbufferEXT\0"
     "";
 #endif
 
@@ -4892,6 +4918,32 @@ static const struct dri_extension_function GL_ARB_draw_buffers_functions[] = {
 };
 #endif
 
+#if defined(need_GL_ARB_framebuffer_object)
+static const struct dri_extension_function GL_ARB_framebuffer_object_functions[] = {
+    { BlitFramebufferEXT_names, BlitFramebufferEXT_remap_index, -1 },
+    { FramebufferTextureLayerEXT_names, FramebufferTextureLayerEXT_remap_index, -1 },
+    { GenerateMipmapEXT_names, GenerateMipmapEXT_remap_index, -1 },
+    { RenderbufferStorageEXT_names, RenderbufferStorageEXT_remap_index, -1 },
+    { CheckFramebufferStatusEXT_names, CheckFramebufferStatusEXT_remap_index, -1 },
+    { FramebufferTexture3DEXT_names, FramebufferTexture3DEXT_remap_index, -1 },
+    { FramebufferTexture2DEXT_names, FramebufferTexture2DEXT_remap_index, -1 },
+    { RenderbufferStorageMultisample_names, RenderbufferStorageMultisample_remap_index, -1 },
+    { FramebufferRenderbufferEXT_names, FramebufferRenderbufferEXT_remap_index, -1 },
+    { FramebufferTexture1DEXT_names, FramebufferTexture1DEXT_remap_index, -1 },
+    { BindFramebufferEXT_names, BindFramebufferEXT_remap_index, -1 },
+    { GenRenderbuffersEXT_names, GenRenderbuffersEXT_remap_index, -1 },
+    { IsFramebufferEXT_names, IsFramebufferEXT_remap_index, -1 },
+    { GetFramebufferAttachmentParameterivEXT_names, GetFramebufferAttachmentParameterivEXT_remap_index, -1 },
+    { DeleteFramebuffersEXT_names, DeleteFramebuffersEXT_remap_index, -1 },
+    { GenFramebuffersEXT_names, GenFramebuffersEXT_remap_index, -1 },
+    { BindRenderbufferEXT_names, BindRenderbufferEXT_remap_index, -1 },
+    { DeleteRenderbuffersEXT_names, DeleteRenderbuffersEXT_remap_index, -1 },
+    { GetRenderbufferParameterivEXT_names, GetRenderbufferParameterivEXT_remap_index, -1 },
+    { IsRenderbufferEXT_names, IsRenderbufferEXT_remap_index, -1 },
+    { NULL, 0, 0 }
+};
+#endif
+
 #if defined(need_GL_ARB_matrix_palette)
 static const struct dri_extension_function GL_ARB_matrix_palette_functions[] = {
     { MatrixIndexusvARB_names, MatrixIndexusvARB_remap_index, -1 },
@@ -5319,22 +5371,22 @@ static const struct dri_extension_function GL_EXT_framebuffer_blit_functions[] =
 #if defined(need_GL_EXT_framebuffer_object)
 static const struct dri_extension_function GL_EXT_framebuffer_object_functions[] = {
     { GenerateMipmapEXT_names, GenerateMipmapEXT_remap_index, -1 },
-    { IsRenderbufferEXT_names, IsRenderbufferEXT_remap_index, -1 },
     { RenderbufferStorageEXT_names, RenderbufferStorageEXT_remap_index, -1 },
     { CheckFramebufferStatusEXT_names, CheckFramebufferStatusEXT_remap_index, -1 },
-    { DeleteRenderbuffersEXT_names, DeleteRenderbuffersEXT_remap_index, -1 },
     { FramebufferTexture3DEXT_names, FramebufferTexture3DEXT_remap_index, -1 },
+    { FramebufferTexture2DEXT_names, FramebufferTexture2DEXT_remap_index, -1 },
     { FramebufferRenderbufferEXT_names, FramebufferRenderbufferEXT_remap_index, -1 },
     { FramebufferTexture1DEXT_names, FramebufferTexture1DEXT_remap_index, -1 },
     { BindFramebufferEXT_names, BindFramebufferEXT_remap_index, -1 },
     { GenRenderbuffersEXT_names, GenRenderbuffersEXT_remap_index, -1 },
     { IsFramebufferEXT_names, IsFramebufferEXT_remap_index, -1 },
-    { FramebufferTexture2DEXT_names, FramebufferTexture2DEXT_remap_index, -1 },
     { GetFramebufferAttachmentParameterivEXT_names, GetFramebufferAttachmentParameterivEXT_remap_index, -1 },
     { DeleteFramebuffersEXT_names, DeleteFramebuffersEXT_remap_index, -1 },
     { GenFramebuffersEXT_names, GenFramebuffersEXT_remap_index, -1 },
     { BindRenderbufferEXT_names, BindRenderbufferEXT_remap_index, -1 },
+    { DeleteRenderbuffersEXT_names, DeleteRenderbuffersEXT_remap_index, -1 },
     { GetRenderbufferParameterivEXT_names, GetRenderbufferParameterivEXT_remap_index, -1 },
+    { IsRenderbufferEXT_names, IsRenderbufferEXT_remap_index, -1 },
     { NULL, 0, 0 }
 };
 #endif
@@ -5415,8 +5467,8 @@ static const struct dri_extension_function GL_EXT_paletted_texture_functions[] =
 #if defined(need_GL_EXT_pixel_transform)
 static const struct dri_extension_function GL_EXT_pixel_transform_functions[] = {
     { PixelTransformParameterfvEXT_names, PixelTransformParameterfvEXT_remap_index, -1 },
-    { PixelTransformParameteriEXT_names, PixelTransformParameteriEXT_remap_index, -1 },
     { PixelTransformParameterfEXT_names, PixelTransformParameterfEXT_remap_index, -1 },
+    { PixelTransformParameteriEXT_names, PixelTransformParameteriEXT_remap_index, -1 },
     { PixelTransformParameterivEXT_names, PixelTransformParameterivEXT_remap_index, -1 },
     { NULL, 0, 0 }
 };
@@ -5716,8 +5768,8 @@ static const struct dri_extension_function GL_NV_register_combiners2_functions[]
 
 #if defined(need_GL_NV_vertex_array_range)
 static const struct dri_extension_function GL_NV_vertex_array_range_functions[] = {
-    { FlushVertexArrayRangeNV_names, FlushVertexArrayRangeNV_remap_index, -1 },
     { VertexArrayRangeNV_names, VertexArrayRangeNV_remap_index, -1 },
+    { FlushVertexArrayRangeNV_names, FlushVertexArrayRangeNV_remap_index, -1 },
     { NULL, 0, 0 }
 };
 #endif
@@ -5946,11 +5998,11 @@ static const struct dri_extension_function GL_SGIX_instruments_functions[] = {
 #if defined(need_GL_SGIX_list_priority)
 static const struct dri_extension_function GL_SGIX_list_priority_functions[] = {
     { ListParameterfSGIX_names, ListParameterfSGIX_remap_index, -1 },
-    { GetListParameterivSGIX_names, GetListParameterivSGIX_remap_index, -1 },
     { GetListParameterfvSGIX_names, GetListParameterfvSGIX_remap_index, -1 },
     { ListParameteriSGIX_names, ListParameteriSGIX_remap_index, -1 },
     { ListParameterfvSGIX_names, ListParameterfvSGIX_remap_index, -1 },
     { ListParameterivSGIX_names, ListParameterivSGIX_remap_index, -1 },
+    { GetListParameterivSGIX_names, GetListParameterivSGIX_remap_index, -1 },
     { NULL, 0, 0 }
 };
 #endif
@@ -5965,9 +6017,9 @@ static const struct dri_extension_function GL_SGIX_pixel_texture_functions[] = {
 #if defined(need_GL_SGIX_polynomial_ffd)
 static const struct dri_extension_function GL_SGIX_polynomial_ffd_functions[] = {
     { LoadIdentityDeformationMapSGIX_names, LoadIdentityDeformationMapSGIX_remap_index, -1 },
-    { DeformationMap3dSGIX_names, DeformationMap3dSGIX_remap_index, -1 },
     { DeformSGIX_names, DeformSGIX_remap_index, -1 },
     { DeformationMap3fSGIX_names, DeformationMap3fSGIX_remap_index, -1 },
+    { DeformationMap3dSGIX_names, DeformationMap3dSGIX_remap_index, -1 },
     { NULL, 0, 0 }
 };
 #endif
diff --git a/src/mesa/glapi/dispatch.h b/src/mesa/glapi/dispatch.h
index f019aa6aaf..d7f21692ed 100644
--- a/src/mesa/glapi/dispatch.h
+++ b/src/mesa/glapi/dispatch.h
@@ -1743,6 +1743,9 @@
 #define CALL_DrawBuffersARB(disp, parameters) (*((disp)->DrawBuffersARB)) parameters
 #define GET_DrawBuffersARB(disp) ((disp)->DrawBuffersARB)
 #define SET_DrawBuffersARB(disp, fn) ((disp)->DrawBuffersARB = fn)
+#define CALL_RenderbufferStorageMultisample(disp, parameters) (*((disp)->RenderbufferStorageMultisample)) parameters
+#define GET_RenderbufferStorageMultisample(disp) ((disp)->RenderbufferStorageMultisample)
+#define SET_RenderbufferStorageMultisample(disp, fn) ((disp)->RenderbufferStorageMultisample = fn)
 #define CALL_PolygonOffsetEXT(disp, parameters) (*((disp)->PolygonOffsetEXT)) parameters
 #define GET_PolygonOffsetEXT(disp) ((disp)->PolygonOffsetEXT)
 #define SET_PolygonOffsetEXT(disp, fn) ((disp)->PolygonOffsetEXT = fn)
@@ -2373,7 +2376,7 @@
 
 #else
 
-#define driDispatchRemapTable_size 362
+#define driDispatchRemapTable_size 363
 extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 
 #define AttachShader_remap_index 0
@@ -2529,215 +2532,216 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define GetActiveAttribARB_remap_index 150
 #define GetAttribLocationARB_remap_index 151
 #define DrawBuffersARB_remap_index 152
-#define PolygonOffsetEXT_remap_index 153
-#define GetPixelTexGenParameterfvSGIS_remap_index 154
-#define GetPixelTexGenParameterivSGIS_remap_index 155
-#define PixelTexGenParameterfSGIS_remap_index 156
-#define PixelTexGenParameterfvSGIS_remap_index 157
-#define PixelTexGenParameteriSGIS_remap_index 158
-#define PixelTexGenParameterivSGIS_remap_index 159
-#define SampleMaskSGIS_remap_index 160
-#define SamplePatternSGIS_remap_index 161
-#define ColorPointerEXT_remap_index 162
-#define EdgeFlagPointerEXT_remap_index 163
-#define IndexPointerEXT_remap_index 164
-#define NormalPointerEXT_remap_index 165
-#define TexCoordPointerEXT_remap_index 166
-#define VertexPointerEXT_remap_index 167
-#define PointParameterfEXT_remap_index 168
-#define PointParameterfvEXT_remap_index 169
-#define LockArraysEXT_remap_index 170
-#define UnlockArraysEXT_remap_index 171
-#define CullParameterdvEXT_remap_index 172
-#define CullParameterfvEXT_remap_index 173
-#define SecondaryColor3bEXT_remap_index 174
-#define SecondaryColor3bvEXT_remap_index 175
-#define SecondaryColor3dEXT_remap_index 176
-#define SecondaryColor3dvEXT_remap_index 177
-#define SecondaryColor3fEXT_remap_index 178
-#define SecondaryColor3fvEXT_remap_index 179
-#define SecondaryColor3iEXT_remap_index 180
-#define SecondaryColor3ivEXT_remap_index 181
-#define SecondaryColor3sEXT_remap_index 182
-#define SecondaryColor3svEXT_remap_index 183
-#define SecondaryColor3ubEXT_remap_index 184
-#define SecondaryColor3ubvEXT_remap_index 185
-#define SecondaryColor3uiEXT_remap_index 186
-#define SecondaryColor3uivEXT_remap_index 187
-#define SecondaryColor3usEXT_remap_index 188
-#define SecondaryColor3usvEXT_remap_index 189
-#define SecondaryColorPointerEXT_remap_index 190
-#define MultiDrawArraysEXT_remap_index 191
-#define MultiDrawElementsEXT_remap_index 192
-#define FogCoordPointerEXT_remap_index 193
-#define FogCoorddEXT_remap_index 194
-#define FogCoorddvEXT_remap_index 195
-#define FogCoordfEXT_remap_index 196
-#define FogCoordfvEXT_remap_index 197
-#define PixelTexGenSGIX_remap_index 198
-#define BlendFuncSeparateEXT_remap_index 199
-#define FlushVertexArrayRangeNV_remap_index 200
-#define VertexArrayRangeNV_remap_index 201
-#define CombinerInputNV_remap_index 202
-#define CombinerOutputNV_remap_index 203
-#define CombinerParameterfNV_remap_index 204
-#define CombinerParameterfvNV_remap_index 205
-#define CombinerParameteriNV_remap_index 206
-#define CombinerParameterivNV_remap_index 207
-#define FinalCombinerInputNV_remap_index 208
-#define GetCombinerInputParameterfvNV_remap_index 209
-#define GetCombinerInputParameterivNV_remap_index 210
-#define GetCombinerOutputParameterfvNV_remap_index 211
-#define GetCombinerOutputParameterivNV_remap_index 212
-#define GetFinalCombinerInputParameterfvNV_remap_index 213
-#define GetFinalCombinerInputParameterivNV_remap_index 214
-#define ResizeBuffersMESA_remap_index 215
-#define WindowPos2dMESA_remap_index 216
-#define WindowPos2dvMESA_remap_index 217
-#define WindowPos2fMESA_remap_index 218
-#define WindowPos2fvMESA_remap_index 219
-#define WindowPos2iMESA_remap_index 220
-#define WindowPos2ivMESA_remap_index 221
-#define WindowPos2sMESA_remap_index 222
-#define WindowPos2svMESA_remap_index 223
-#define WindowPos3dMESA_remap_index 224
-#define WindowPos3dvMESA_remap_index 225
-#define WindowPos3fMESA_remap_index 226
-#define WindowPos3fvMESA_remap_index 227
-#define WindowPos3iMESA_remap_index 228
-#define WindowPos3ivMESA_remap_index 229
-#define WindowPos3sMESA_remap_index 230
-#define WindowPos3svMESA_remap_index 231
-#define WindowPos4dMESA_remap_index 232
-#define WindowPos4dvMESA_remap_index 233
-#define WindowPos4fMESA_remap_index 234
-#define WindowPos4fvMESA_remap_index 235
-#define WindowPos4iMESA_remap_index 236
-#define WindowPos4ivMESA_remap_index 237
-#define WindowPos4sMESA_remap_index 238
-#define WindowPos4svMESA_remap_index 239
-#define MultiModeDrawArraysIBM_remap_index 240
-#define MultiModeDrawElementsIBM_remap_index 241
-#define DeleteFencesNV_remap_index 242
-#define FinishFenceNV_remap_index 243
-#define GenFencesNV_remap_index 244
-#define GetFenceivNV_remap_index 245
-#define IsFenceNV_remap_index 246
-#define SetFenceNV_remap_index 247
-#define TestFenceNV_remap_index 248
-#define AreProgramsResidentNV_remap_index 249
-#define BindProgramNV_remap_index 250
-#define DeleteProgramsNV_remap_index 251
-#define ExecuteProgramNV_remap_index 252
-#define GenProgramsNV_remap_index 253
-#define GetProgramParameterdvNV_remap_index 254
-#define GetProgramParameterfvNV_remap_index 255
-#define GetProgramStringNV_remap_index 256
-#define GetProgramivNV_remap_index 257
-#define GetTrackMatrixivNV_remap_index 258
-#define GetVertexAttribPointervNV_remap_index 259
-#define GetVertexAttribdvNV_remap_index 260
-#define GetVertexAttribfvNV_remap_index 261
-#define GetVertexAttribivNV_remap_index 262
-#define IsProgramNV_remap_index 263
-#define LoadProgramNV_remap_index 264
-#define ProgramParameters4dvNV_remap_index 265
-#define ProgramParameters4fvNV_remap_index 266
-#define RequestResidentProgramsNV_remap_index 267
-#define TrackMatrixNV_remap_index 268
-#define VertexAttrib1dNV_remap_index 269
-#define VertexAttrib1dvNV_remap_index 270
-#define VertexAttrib1fNV_remap_index 271
-#define VertexAttrib1fvNV_remap_index 272
-#define VertexAttrib1sNV_remap_index 273
-#define VertexAttrib1svNV_remap_index 274
-#define VertexAttrib2dNV_remap_index 275
-#define VertexAttrib2dvNV_remap_index 276
-#define VertexAttrib2fNV_remap_index 277
-#define VertexAttrib2fvNV_remap_index 278
-#define VertexAttrib2sNV_remap_index 279
-#define VertexAttrib2svNV_remap_index 280
-#define VertexAttrib3dNV_remap_index 281
-#define VertexAttrib3dvNV_remap_index 282
-#define VertexAttrib3fNV_remap_index 283
-#define VertexAttrib3fvNV_remap_index 284
-#define VertexAttrib3sNV_remap_index 285
-#define VertexAttrib3svNV_remap_index 286
-#define VertexAttrib4dNV_remap_index 287
-#define VertexAttrib4dvNV_remap_index 288
-#define VertexAttrib4fNV_remap_index 289
-#define VertexAttrib4fvNV_remap_index 290
-#define VertexAttrib4sNV_remap_index 291
-#define VertexAttrib4svNV_remap_index 292
-#define VertexAttrib4ubNV_remap_index 293
-#define VertexAttrib4ubvNV_remap_index 294
-#define VertexAttribPointerNV_remap_index 295
-#define VertexAttribs1dvNV_remap_index 296
-#define VertexAttribs1fvNV_remap_index 297
-#define VertexAttribs1svNV_remap_index 298
-#define VertexAttribs2dvNV_remap_index 299
-#define VertexAttribs2fvNV_remap_index 300
-#define VertexAttribs2svNV_remap_index 301
-#define VertexAttribs3dvNV_remap_index 302
-#define VertexAttribs3fvNV_remap_index 303
-#define VertexAttribs3svNV_remap_index 304
-#define VertexAttribs4dvNV_remap_index 305
-#define VertexAttribs4fvNV_remap_index 306
-#define VertexAttribs4svNV_remap_index 307
-#define VertexAttribs4ubvNV_remap_index 308
-#define AlphaFragmentOp1ATI_remap_index 309
-#define AlphaFragmentOp2ATI_remap_index 310
-#define AlphaFragmentOp3ATI_remap_index 311
-#define BeginFragmentShaderATI_remap_index 312
-#define BindFragmentShaderATI_remap_index 313
-#define ColorFragmentOp1ATI_remap_index 314
-#define ColorFragmentOp2ATI_remap_index 315
-#define ColorFragmentOp3ATI_remap_index 316
-#define DeleteFragmentShaderATI_remap_index 317
-#define EndFragmentShaderATI_remap_index 318
-#define GenFragmentShadersATI_remap_index 319
-#define PassTexCoordATI_remap_index 320
-#define SampleMapATI_remap_index 321
-#define SetFragmentShaderConstantATI_remap_index 322
-#define PointParameteriNV_remap_index 323
-#define PointParameterivNV_remap_index 324
-#define ActiveStencilFaceEXT_remap_index 325
-#define BindVertexArrayAPPLE_remap_index 326
-#define DeleteVertexArraysAPPLE_remap_index 327
-#define GenVertexArraysAPPLE_remap_index 328
-#define IsVertexArrayAPPLE_remap_index 329
-#define GetProgramNamedParameterdvNV_remap_index 330
-#define GetProgramNamedParameterfvNV_remap_index 331
-#define ProgramNamedParameter4dNV_remap_index 332
-#define ProgramNamedParameter4dvNV_remap_index 333
-#define ProgramNamedParameter4fNV_remap_index 334
-#define ProgramNamedParameter4fvNV_remap_index 335
-#define DepthBoundsEXT_remap_index 336
-#define BlendEquationSeparateEXT_remap_index 337
-#define BindFramebufferEXT_remap_index 338
-#define BindRenderbufferEXT_remap_index 339
-#define CheckFramebufferStatusEXT_remap_index 340
-#define DeleteFramebuffersEXT_remap_index 341
-#define DeleteRenderbuffersEXT_remap_index 342
-#define FramebufferRenderbufferEXT_remap_index 343
-#define FramebufferTexture1DEXT_remap_index 344
-#define FramebufferTexture2DEXT_remap_index 345
-#define FramebufferTexture3DEXT_remap_index 346
-#define GenFramebuffersEXT_remap_index 347
-#define GenRenderbuffersEXT_remap_index 348
-#define GenerateMipmapEXT_remap_index 349
-#define GetFramebufferAttachmentParameterivEXT_remap_index 350
-#define GetRenderbufferParameterivEXT_remap_index 351
-#define IsFramebufferEXT_remap_index 352
-#define IsRenderbufferEXT_remap_index 353
-#define RenderbufferStorageEXT_remap_index 354
-#define BlitFramebufferEXT_remap_index 355
-#define FramebufferTextureLayerEXT_remap_index 356
-#define StencilFuncSeparateATI_remap_index 357
-#define ProgramEnvParameters4fvEXT_remap_index 358
-#define ProgramLocalParameters4fvEXT_remap_index 359
-#define GetQueryObjecti64vEXT_remap_index 360
-#define GetQueryObjectui64vEXT_remap_index 361
+#define RenderbufferStorageMultisample_remap_index 153
+#define PolygonOffsetEXT_remap_index 154
+#define GetPixelTexGenParameterfvSGIS_remap_index 155
+#define GetPixelTexGenParameterivSGIS_remap_index 156
+#define PixelTexGenParameterfSGIS_remap_index 157
+#define PixelTexGenParameterfvSGIS_remap_index 158
+#define PixelTexGenParameteriSGIS_remap_index 159
+#define PixelTexGenParameterivSGIS_remap_index 160
+#define SampleMaskSGIS_remap_index 161
+#define SamplePatternSGIS_remap_index 162
+#define ColorPointerEXT_remap_index 163
+#define EdgeFlagPointerEXT_remap_index 164
+#define IndexPointerEXT_remap_index 165
+#define NormalPointerEXT_remap_index 166
+#define TexCoordPointerEXT_remap_index 167
+#define VertexPointerEXT_remap_index 168
+#define PointParameterfEXT_remap_index 169
+#define PointParameterfvEXT_remap_index 170
+#define LockArraysEXT_remap_index 171
+#define UnlockArraysEXT_remap_index 172
+#define CullParameterdvEXT_remap_index 173
+#define CullParameterfvEXT_remap_index 174
+#define SecondaryColor3bEXT_remap_index 175
+#define SecondaryColor3bvEXT_remap_index 176
+#define SecondaryColor3dEXT_remap_index 177
+#define SecondaryColor3dvEXT_remap_index 178
+#define SecondaryColor3fEXT_remap_index 179
+#define SecondaryColor3fvEXT_remap_index 180
+#define SecondaryColor3iEXT_remap_index 181
+#define SecondaryColor3ivEXT_remap_index 182
+#define SecondaryColor3sEXT_remap_index 183
+#define SecondaryColor3svEXT_remap_index 184
+#define SecondaryColor3ubEXT_remap_index 185
+#define SecondaryColor3ubvEXT_remap_index 186
+#define SecondaryColor3uiEXT_remap_index 187
+#define SecondaryColor3uivEXT_remap_index 188
+#define SecondaryColor3usEXT_remap_index 189
+#define SecondaryColor3usvEXT_remap_index 190
+#define SecondaryColorPointerEXT_remap_index 191
+#define MultiDrawArraysEXT_remap_index 192
+#define MultiDrawElementsEXT_remap_index 193
+#define FogCoordPointerEXT_remap_index 194
+#define FogCoorddEXT_remap_index 195
+#define FogCoorddvEXT_remap_index 196
+#define FogCoordfEXT_remap_index 197
+#define FogCoordfvEXT_remap_index 198
+#define PixelTexGenSGIX_remap_index 199
+#define BlendFuncSeparateEXT_remap_index 200
+#define FlushVertexArrayRangeNV_remap_index 201
+#define VertexArrayRangeNV_remap_index 202
+#define CombinerInputNV_remap_index 203
+#define CombinerOutputNV_remap_index 204
+#define CombinerParameterfNV_remap_index 205
+#define CombinerParameterfvNV_remap_index 206
+#define CombinerParameteriNV_remap_index 207
+#define CombinerParameterivNV_remap_index 208
+#define FinalCombinerInputNV_remap_index 209
+#define GetCombinerInputParameterfvNV_remap_index 210
+#define GetCombinerInputParameterivNV_remap_index 211
+#define GetCombinerOutputParameterfvNV_remap_index 212
+#define GetCombinerOutputParameterivNV_remap_index 213
+#define GetFinalCombinerInputParameterfvNV_remap_index 214
+#define GetFinalCombinerInputParameterivNV_remap_index 215
+#define ResizeBuffersMESA_remap_index 216
+#define WindowPos2dMESA_remap_index 217
+#define WindowPos2dvMESA_remap_index 218
+#define WindowPos2fMESA_remap_index 219
+#define WindowPos2fvMESA_remap_index 220
+#define WindowPos2iMESA_remap_index 221
+#define WindowPos2ivMESA_remap_index 222
+#define WindowPos2sMESA_remap_index 223
+#define WindowPos2svMESA_remap_index 224
+#define WindowPos3dMESA_remap_index 225
+#define WindowPos3dvMESA_remap_index 226
+#define WindowPos3fMESA_remap_index 227
+#define WindowPos3fvMESA_remap_index 228
+#define WindowPos3iMESA_remap_index 229
+#define WindowPos3ivMESA_remap_index 230
+#define WindowPos3sMESA_remap_index 231
+#define WindowPos3svMESA_remap_index 232
+#define WindowPos4dMESA_remap_index 233
+#define WindowPos4dvMESA_remap_index 234
+#define WindowPos4fMESA_remap_index 235
+#define WindowPos4fvMESA_remap_index 236
+#define WindowPos4iMESA_remap_index 237
+#define WindowPos4ivMESA_remap_index 238
+#define WindowPos4sMESA_remap_index 239
+#define WindowPos4svMESA_remap_index 240
+#define MultiModeDrawArraysIBM_remap_index 241
+#define MultiModeDrawElementsIBM_remap_index 242
+#define DeleteFencesNV_remap_index 243
+#define FinishFenceNV_remap_index 244
+#define GenFencesNV_remap_index 245
+#define GetFenceivNV_remap_index 246
+#define IsFenceNV_remap_index 247
+#define SetFenceNV_remap_index 248
+#define TestFenceNV_remap_index 249
+#define AreProgramsResidentNV_remap_index 250
+#define BindProgramNV_remap_index 251
+#define DeleteProgramsNV_remap_index 252
+#define ExecuteProgramNV_remap_index 253
+#define GenProgramsNV_remap_index 254
+#define GetProgramParameterdvNV_remap_index 255
+#define GetProgramParameterfvNV_remap_index 256
+#define GetProgramStringNV_remap_index 257
+#define GetProgramivNV_remap_index 258
+#define GetTrackMatrixivNV_remap_index 259
+#define GetVertexAttribPointervNV_remap_index 260
+#define GetVertexAttribdvNV_remap_index 261
+#define GetVertexAttribfvNV_remap_index 262
+#define GetVertexAttribivNV_remap_index 263
+#define IsProgramNV_remap_index 264
+#define LoadProgramNV_remap_index 265
+#define ProgramParameters4dvNV_remap_index 266
+#define ProgramParameters4fvNV_remap_index 267
+#define RequestResidentProgramsNV_remap_index 268
+#define TrackMatrixNV_remap_index 269
+#define VertexAttrib1dNV_remap_index 270
+#define VertexAttrib1dvNV_remap_index 271
+#define VertexAttrib1fNV_remap_index 272
+#define VertexAttrib1fvNV_remap_index 273
+#define VertexAttrib1sNV_remap_index 274
+#define VertexAttrib1svNV_remap_index 275
+#define VertexAttrib2dNV_remap_index 276
+#define VertexAttrib2dvNV_remap_index 277
+#define VertexAttrib2fNV_remap_index 278
+#define VertexAttrib2fvNV_remap_index 279
+#define VertexAttrib2sNV_remap_index 280
+#define VertexAttrib2svNV_remap_index 281
+#define VertexAttrib3dNV_remap_index 282
+#define VertexAttrib3dvNV_remap_index 283
+#define VertexAttrib3fNV_remap_index 284
+#define VertexAttrib3fvNV_remap_index 285
+#define VertexAttrib3sNV_remap_index 286
+#define VertexAttrib3svNV_remap_index 287
+#define VertexAttrib4dNV_remap_index 288
+#define VertexAttrib4dvNV_remap_index 289
+#define VertexAttrib4fNV_remap_index 290
+#define VertexAttrib4fvNV_remap_index 291
+#define VertexAttrib4sNV_remap_index 292
+#define VertexAttrib4svNV_remap_index 293
+#define VertexAttrib4ubNV_remap_index 294
+#define VertexAttrib4ubvNV_remap_index 295
+#define VertexAttribPointerNV_remap_index 296
+#define VertexAttribs1dvNV_remap_index 297
+#define VertexAttribs1fvNV_remap_index 298
+#define VertexAttribs1svNV_remap_index 299
+#define VertexAttribs2dvNV_remap_index 300
+#define VertexAttribs2fvNV_remap_index 301
+#define VertexAttribs2svNV_remap_index 302
+#define VertexAttribs3dvNV_remap_index 303
+#define VertexAttribs3fvNV_remap_index 304
+#define VertexAttribs3svNV_remap_index 305
+#define VertexAttribs4dvNV_remap_index 306
+#define VertexAttribs4fvNV_remap_index 307
+#define VertexAttribs4svNV_remap_index 308
+#define VertexAttribs4ubvNV_remap_index 309
+#define AlphaFragmentOp1ATI_remap_index 310
+#define AlphaFragmentOp2ATI_remap_index 311
+#define AlphaFragmentOp3ATI_remap_index 312
+#define BeginFragmentShaderATI_remap_index 313
+#define BindFragmentShaderATI_remap_index 314
+#define ColorFragmentOp1ATI_remap_index 315
+#define ColorFragmentOp2ATI_remap_index 316
+#define ColorFragmentOp3ATI_remap_index 317
+#define DeleteFragmentShaderATI_remap_index 318
+#define EndFragmentShaderATI_remap_index 319
+#define GenFragmentShadersATI_remap_index 320
+#define PassTexCoordATI_remap_index 321
+#define SampleMapATI_remap_index 322
+#define SetFragmentShaderConstantATI_remap_index 323
+#define PointParameteriNV_remap_index 324
+#define PointParameterivNV_remap_index 325
+#define ActiveStencilFaceEXT_remap_index 326
+#define BindVertexArrayAPPLE_remap_index 327
+#define DeleteVertexArraysAPPLE_remap_index 328
+#define GenVertexArraysAPPLE_remap_index 329
+#define IsVertexArrayAPPLE_remap_index 330
+#define GetProgramNamedParameterdvNV_remap_index 331
+#define GetProgramNamedParameterfvNV_remap_index 332
+#define ProgramNamedParameter4dNV_remap_index 333
+#define ProgramNamedParameter4dvNV_remap_index 334
+#define ProgramNamedParameter4fNV_remap_index 335
+#define ProgramNamedParameter4fvNV_remap_index 336
+#define DepthBoundsEXT_remap_index 337
+#define BlendEquationSeparateEXT_remap_index 338
+#define BindFramebufferEXT_remap_index 339
+#define BindRenderbufferEXT_remap_index 340
+#define CheckFramebufferStatusEXT_remap_index 341
+#define DeleteFramebuffersEXT_remap_index 342
+#define DeleteRenderbuffersEXT_remap_index 343
+#define FramebufferRenderbufferEXT_remap_index 344
+#define FramebufferTexture1DEXT_remap_index 345
+#define FramebufferTexture2DEXT_remap_index 346
+#define FramebufferTexture3DEXT_remap_index 347
+#define GenFramebuffersEXT_remap_index 348
+#define GenRenderbuffersEXT_remap_index 349
+#define GenerateMipmapEXT_remap_index 350
+#define GetFramebufferAttachmentParameterivEXT_remap_index 351
+#define GetRenderbufferParameterivEXT_remap_index 352
+#define IsFramebufferEXT_remap_index 353
+#define IsRenderbufferEXT_remap_index 354
+#define RenderbufferStorageEXT_remap_index 355
+#define BlitFramebufferEXT_remap_index 356
+#define FramebufferTextureLayerEXT_remap_index 357
+#define StencilFuncSeparateATI_remap_index 358
+#define ProgramEnvParameters4fvEXT_remap_index 359
+#define ProgramLocalParameters4fvEXT_remap_index 360
+#define GetQueryObjecti64vEXT_remap_index 361
+#define GetQueryObjectui64vEXT_remap_index 362
 
 #define CALL_AttachShader(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLuint)), driDispatchRemapTable[AttachShader_remap_index], parameters)
 #define GET_AttachShader(disp) GET_by_offset(disp, driDispatchRemapTable[AttachShader_remap_index])
@@ -3198,6 +3202,9 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define CALL_DrawBuffersARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsizei, const GLenum *)), driDispatchRemapTable[DrawBuffersARB_remap_index], parameters)
 #define GET_DrawBuffersARB(disp) GET_by_offset(disp, driDispatchRemapTable[DrawBuffersARB_remap_index])
 #define SET_DrawBuffersARB(disp, fn) SET_by_offset(disp, driDispatchRemapTable[DrawBuffersARB_remap_index], fn)
+#define CALL_RenderbufferStorageMultisample(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLsizei, GLenum, GLsizei, GLsizei)), driDispatchRemapTable[RenderbufferStorageMultisample_remap_index], parameters)
+#define GET_RenderbufferStorageMultisample(disp) GET_by_offset(disp, driDispatchRemapTable[RenderbufferStorageMultisample_remap_index])
+#define SET_RenderbufferStorageMultisample(disp, fn) SET_by_offset(disp, driDispatchRemapTable[RenderbufferStorageMultisample_remap_index], fn)
 #define CALL_PolygonOffsetEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLfloat, GLfloat)), driDispatchRemapTable[PolygonOffsetEXT_remap_index], parameters)
 #define GET_PolygonOffsetEXT(disp) GET_by_offset(disp, driDispatchRemapTable[PolygonOffsetEXT_remap_index])
 #define SET_PolygonOffsetEXT(disp, fn) SET_by_offset(disp, driDispatchRemapTable[PolygonOffsetEXT_remap_index], fn)
diff --git a/src/mesa/glapi/glapioffsets.h b/src/mesa/glapi/glapioffsets.h
index 43c265924b..f412234ac5 100644
--- a/src/mesa/glapi/glapioffsets.h
+++ b/src/mesa/glapi/glapioffsets.h
@@ -593,216 +593,217 @@
 #define _gloffset_GetActiveAttribARB 558
 #define _gloffset_GetAttribLocationARB 559
 #define _gloffset_DrawBuffersARB 560
-#define _gloffset_PolygonOffsetEXT 561
-#define _gloffset_GetPixelTexGenParameterfvSGIS 562
-#define _gloffset_GetPixelTexGenParameterivSGIS 563
-#define _gloffset_PixelTexGenParameterfSGIS 564
-#define _gloffset_PixelTexGenParameterfvSGIS 565
-#define _gloffset_PixelTexGenParameteriSGIS 566
-#define _gloffset_PixelTexGenParameterivSGIS 567
-#define _gloffset_SampleMaskSGIS 568
-#define _gloffset_SamplePatternSGIS 569
-#define _gloffset_ColorPointerEXT 570
-#define _gloffset_EdgeFlagPointerEXT 571
-#define _gloffset_IndexPointerEXT 572
-#define _gloffset_NormalPointerEXT 573
-#define _gloffset_TexCoordPointerEXT 574
-#define _gloffset_VertexPointerEXT 575
-#define _gloffset_PointParameterfEXT 576
-#define _gloffset_PointParameterfvEXT 577
-#define _gloffset_LockArraysEXT 578
-#define _gloffset_UnlockArraysEXT 579
-#define _gloffset_CullParameterdvEXT 580
-#define _gloffset_CullParameterfvEXT 581
-#define _gloffset_SecondaryColor3bEXT 582
-#define _gloffset_SecondaryColor3bvEXT 583
-#define _gloffset_SecondaryColor3dEXT 584
-#define _gloffset_SecondaryColor3dvEXT 585
-#define _gloffset_SecondaryColor3fEXT 586
-#define _gloffset_SecondaryColor3fvEXT 587
-#define _gloffset_SecondaryColor3iEXT 588
-#define _gloffset_SecondaryColor3ivEXT 589
-#define _gloffset_SecondaryColor3sEXT 590
-#define _gloffset_SecondaryColor3svEXT 591
-#define _gloffset_SecondaryColor3ubEXT 592
-#define _gloffset_SecondaryColor3ubvEXT 593
-#define _gloffset_SecondaryColor3uiEXT 594
-#define _gloffset_SecondaryColor3uivEXT 595
-#define _gloffset_SecondaryColor3usEXT 596
-#define _gloffset_SecondaryColor3usvEXT 597
-#define _gloffset_SecondaryColorPointerEXT 598
-#define _gloffset_MultiDrawArraysEXT 599
-#define _gloffset_MultiDrawElementsEXT 600
-#define _gloffset_FogCoordPointerEXT 601
-#define _gloffset_FogCoorddEXT 602
-#define _gloffset_FogCoorddvEXT 603
-#define _gloffset_FogCoordfEXT 604
-#define _gloffset_FogCoordfvEXT 605
-#define _gloffset_PixelTexGenSGIX 606
-#define _gloffset_BlendFuncSeparateEXT 607
-#define _gloffset_FlushVertexArrayRangeNV 608
-#define _gloffset_VertexArrayRangeNV 609
-#define _gloffset_CombinerInputNV 610
-#define _gloffset_CombinerOutputNV 611
-#define _gloffset_CombinerParameterfNV 612
-#define _gloffset_CombinerParameterfvNV 613
-#define _gloffset_CombinerParameteriNV 614
-#define _gloffset_CombinerParameterivNV 615
-#define _gloffset_FinalCombinerInputNV 616
-#define _gloffset_GetCombinerInputParameterfvNV 617
-#define _gloffset_GetCombinerInputParameterivNV 618
-#define _gloffset_GetCombinerOutputParameterfvNV 619
-#define _gloffset_GetCombinerOutputParameterivNV 620
-#define _gloffset_GetFinalCombinerInputParameterfvNV 621
-#define _gloffset_GetFinalCombinerInputParameterivNV 622
-#define _gloffset_ResizeBuffersMESA 623
-#define _gloffset_WindowPos2dMESA 624
-#define _gloffset_WindowPos2dvMESA 625
-#define _gloffset_WindowPos2fMESA 626
-#define _gloffset_WindowPos2fvMESA 627
-#define _gloffset_WindowPos2iMESA 628
-#define _gloffset_WindowPos2ivMESA 629
-#define _gloffset_WindowPos2sMESA 630
-#define _gloffset_WindowPos2svMESA 631
-#define _gloffset_WindowPos3dMESA 632
-#define _gloffset_WindowPos3dvMESA 633
-#define _gloffset_WindowPos3fMESA 634
-#define _gloffset_WindowPos3fvMESA 635
-#define _gloffset_WindowPos3iMESA 636
-#define _gloffset_WindowPos3ivMESA 637
-#define _gloffset_WindowPos3sMESA 638
-#define _gloffset_WindowPos3svMESA 639
-#define _gloffset_WindowPos4dMESA 640
-#define _gloffset_WindowPos4dvMESA 641
-#define _gloffset_WindowPos4fMESA 642
-#define _gloffset_WindowPos4fvMESA 643
-#define _gloffset_WindowPos4iMESA 644
-#define _gloffset_WindowPos4ivMESA 645
-#define _gloffset_WindowPos4sMESA 646
-#define _gloffset_WindowPos4svMESA 647
-#define _gloffset_MultiModeDrawArraysIBM 648
-#define _gloffset_MultiModeDrawElementsIBM 649
-#define _gloffset_DeleteFencesNV 650
-#define _gloffset_FinishFenceNV 651
-#define _gloffset_GenFencesNV 652
-#define _gloffset_GetFenceivNV 653
-#define _gloffset_IsFenceNV 654
-#define _gloffset_SetFenceNV 655
-#define _gloffset_TestFenceNV 656
-#define _gloffset_AreProgramsResidentNV 657
-#define _gloffset_BindProgramNV 658
-#define _gloffset_DeleteProgramsNV 659
-#define _gloffset_ExecuteProgramNV 660
-#define _gloffset_GenProgramsNV 661
-#define _gloffset_GetProgramParameterdvNV 662
-#define _gloffset_GetProgramParameterfvNV 663
-#define _gloffset_GetProgramStringNV 664
-#define _gloffset_GetProgramivNV 665
-#define _gloffset_GetTrackMatrixivNV 666
-#define _gloffset_GetVertexAttribPointervNV 667
-#define _gloffset_GetVertexAttribdvNV 668
-#define _gloffset_GetVertexAttribfvNV 669
-#define _gloffset_GetVertexAttribivNV 670
-#define _gloffset_IsProgramNV 671
-#define _gloffset_LoadProgramNV 672
-#define _gloffset_ProgramParameters4dvNV 673
-#define _gloffset_ProgramParameters4fvNV 674
-#define _gloffset_RequestResidentProgramsNV 675
-#define _gloffset_TrackMatrixNV 676
-#define _gloffset_VertexAttrib1dNV 677
-#define _gloffset_VertexAttrib1dvNV 678
-#define _gloffset_VertexAttrib1fNV 679
-#define _gloffset_VertexAttrib1fvNV 680
-#define _gloffset_VertexAttrib1sNV 681
-#define _gloffset_VertexAttrib1svNV 682
-#define _gloffset_VertexAttrib2dNV 683
-#define _gloffset_VertexAttrib2dvNV 684
-#define _gloffset_VertexAttrib2fNV 685
-#define _gloffset_VertexAttrib2fvNV 686
-#define _gloffset_VertexAttrib2sNV 687
-#define _gloffset_VertexAttrib2svNV 688
-#define _gloffset_VertexAttrib3dNV 689
-#define _gloffset_VertexAttrib3dvNV 690
-#define _gloffset_VertexAttrib3fNV 691
-#define _gloffset_VertexAttrib3fvNV 692
-#define _gloffset_VertexAttrib3sNV 693
-#define _gloffset_VertexAttrib3svNV 694
-#define _gloffset_VertexAttrib4dNV 695
-#define _gloffset_VertexAttrib4dvNV 696
-#define _gloffset_VertexAttrib4fNV 697
-#define _gloffset_VertexAttrib4fvNV 698
-#define _gloffset_VertexAttrib4sNV 699
-#define _gloffset_VertexAttrib4svNV 700
-#define _gloffset_VertexAttrib4ubNV 701
-#define _gloffset_VertexAttrib4ubvNV 702
-#define _gloffset_VertexAttribPointerNV 703
-#define _gloffset_VertexAttribs1dvNV 704
-#define _gloffset_VertexAttribs1fvNV 705
-#define _gloffset_VertexAttribs1svNV 706
-#define _gloffset_VertexAttribs2dvNV 707
-#define _gloffset_VertexAttribs2fvNV 708
-#define _gloffset_VertexAttribs2svNV 709
-#define _gloffset_VertexAttribs3dvNV 710
-#define _gloffset_VertexAttribs3fvNV 711
-#define _gloffset_VertexAttribs3svNV 712
-#define _gloffset_VertexAttribs4dvNV 713
-#define _gloffset_VertexAttribs4fvNV 714
-#define _gloffset_VertexAttribs4svNV 715
-#define _gloffset_VertexAttribs4ubvNV 716
-#define _gloffset_AlphaFragmentOp1ATI 717
-#define _gloffset_AlphaFragmentOp2ATI 718
-#define _gloffset_AlphaFragmentOp3ATI 719
-#define _gloffset_BeginFragmentShaderATI 720
-#define _gloffset_BindFragmentShaderATI 721
-#define _gloffset_ColorFragmentOp1ATI 722
-#define _gloffset_ColorFragmentOp2ATI 723
-#define _gloffset_ColorFragmentOp3ATI 724
-#define _gloffset_DeleteFragmentShaderATI 725
-#define _gloffset_EndFragmentShaderATI 726
-#define _gloffset_GenFragmentShadersATI 727
-#define _gloffset_PassTexCoordATI 728
-#define _gloffset_SampleMapATI 729
-#define _gloffset_SetFragmentShaderConstantATI 730
-#define _gloffset_PointParameteriNV 731
-#define _gloffset_PointParameterivNV 732
-#define _gloffset_ActiveStencilFaceEXT 733
-#define _gloffset_BindVertexArrayAPPLE 734
-#define _gloffset_DeleteVertexArraysAPPLE 735
-#define _gloffset_GenVertexArraysAPPLE 736
-#define _gloffset_IsVertexArrayAPPLE 737
-#define _gloffset_GetProgramNamedParameterdvNV 738
-#define _gloffset_GetProgramNamedParameterfvNV 739
-#define _gloffset_ProgramNamedParameter4dNV 740
-#define _gloffset_ProgramNamedParameter4dvNV 741
-#define _gloffset_ProgramNamedParameter4fNV 742
-#define _gloffset_ProgramNamedParameter4fvNV 743
-#define _gloffset_DepthBoundsEXT 744
-#define _gloffset_BlendEquationSeparateEXT 745
-#define _gloffset_BindFramebufferEXT 746
-#define _gloffset_BindRenderbufferEXT 747
-#define _gloffset_CheckFramebufferStatusEXT 748
-#define _gloffset_DeleteFramebuffersEXT 749
-#define _gloffset_DeleteRenderbuffersEXT 750
-#define _gloffset_FramebufferRenderbufferEXT 751
-#define _gloffset_FramebufferTexture1DEXT 752
-#define _gloffset_FramebufferTexture2DEXT 753
-#define _gloffset_FramebufferTexture3DEXT 754
-#define _gloffset_GenFramebuffersEXT 755
-#define _gloffset_GenRenderbuffersEXT 756
-#define _gloffset_GenerateMipmapEXT 757
-#define _gloffset_GetFramebufferAttachmentParameterivEXT 758
-#define _gloffset_GetRenderbufferParameterivEXT 759
-#define _gloffset_IsFramebufferEXT 760
-#define _gloffset_IsRenderbufferEXT 761
-#define _gloffset_RenderbufferStorageEXT 762
-#define _gloffset_BlitFramebufferEXT 763
-#define _gloffset_FramebufferTextureLayerEXT 764
-#define _gloffset_StencilFuncSeparateATI 765
-#define _gloffset_ProgramEnvParameters4fvEXT 766
-#define _gloffset_ProgramLocalParameters4fvEXT 767
-#define _gloffset_GetQueryObjecti64vEXT 768
-#define _gloffset_GetQueryObjectui64vEXT 769
-#define _gloffset_FIRST_DYNAMIC 770
+#define _gloffset_RenderbufferStorageMultisample 561
+#define _gloffset_PolygonOffsetEXT 562
+#define _gloffset_GetPixelTexGenParameterfvSGIS 563
+#define _gloffset_GetPixelTexGenParameterivSGIS 564
+#define _gloffset_PixelTexGenParameterfSGIS 565
+#define _gloffset_PixelTexGenParameterfvSGIS 566
+#define _gloffset_PixelTexGenParameteriSGIS 567
+#define _gloffset_PixelTexGenParameterivSGIS 568
+#define _gloffset_SampleMaskSGIS 569
+#define _gloffset_SamplePatternSGIS 570
+#define _gloffset_ColorPointerEXT 571
+#define _gloffset_EdgeFlagPointerEXT 572
+#define _gloffset_IndexPointerEXT 573
+#define _gloffset_NormalPointerEXT 574
+#define _gloffset_TexCoordPointerEXT 575
+#define _gloffset_VertexPointerEXT 576
+#define _gloffset_PointParameterfEXT 577
+#define _gloffset_PointParameterfvEXT 578
+#define _gloffset_LockArraysEXT 579
+#define _gloffset_UnlockArraysEXT 580
+#define _gloffset_CullParameterdvEXT 581
+#define _gloffset_CullParameterfvEXT 582
+#define _gloffset_SecondaryColor3bEXT 583
+#define _gloffset_SecondaryColor3bvEXT 584
+#define _gloffset_SecondaryColor3dEXT 585
+#define _gloffset_SecondaryColor3dvEXT 586
+#define _gloffset_SecondaryColor3fEXT 587
+#define _gloffset_SecondaryColor3fvEXT 588
+#define _gloffset_SecondaryColor3iEXT 589
+#define _gloffset_SecondaryColor3ivEXT 590
+#define _gloffset_SecondaryColor3sEXT 591
+#define _gloffset_SecondaryColor3svEXT 592
+#define _gloffset_SecondaryColor3ubEXT 593
+#define _gloffset_SecondaryColor3ubvEXT 594
+#define _gloffset_SecondaryColor3uiEXT 595
+#define _gloffset_SecondaryColor3uivEXT 596
+#define _gloffset_SecondaryColor3usEXT 597
+#define _gloffset_SecondaryColor3usvEXT 598
+#define _gloffset_SecondaryColorPointerEXT 599
+#define _gloffset_MultiDrawArraysEXT 600
+#define _gloffset_MultiDrawElementsEXT 601
+#define _gloffset_FogCoordPointerEXT 602
+#define _gloffset_FogCoorddEXT 603
+#define _gloffset_FogCoorddvEXT 604
+#define _gloffset_FogCoordfEXT 605
+#define _gloffset_FogCoordfvEXT 606
+#define _gloffset_PixelTexGenSGIX 607
+#define _gloffset_BlendFuncSeparateEXT 608
+#define _gloffset_FlushVertexArrayRangeNV 609
+#define _gloffset_VertexArrayRangeNV 610
+#define _gloffset_CombinerInputNV 611
+#define _gloffset_CombinerOutputNV 612
+#define _gloffset_CombinerParameterfNV 613
+#define _gloffset_CombinerParameterfvNV 614
+#define _gloffset_CombinerParameteriNV 615
+#define _gloffset_CombinerParameterivNV 616
+#define _gloffset_FinalCombinerInputNV 617
+#define _gloffset_GetCombinerInputParameterfvNV 618
+#define _gloffset_GetCombinerInputParameterivNV 619
+#define _gloffset_GetCombinerOutputParameterfvNV 620
+#define _gloffset_GetCombinerOutputParameterivNV 621
+#define _gloffset_GetFinalCombinerInputParameterfvNV 622
+#define _gloffset_GetFinalCombinerInputParameterivNV 623
+#define _gloffset_ResizeBuffersMESA 624
+#define _gloffset_WindowPos2dMESA 625
+#define _gloffset_WindowPos2dvMESA 626
+#define _gloffset_WindowPos2fMESA 627
+#define _gloffset_WindowPos2fvMESA 628
+#define _gloffset_WindowPos2iMESA 629
+#define _gloffset_WindowPos2ivMESA 630
+#define _gloffset_WindowPos2sMESA 631
+#define _gloffset_WindowPos2svMESA 632
+#define _gloffset_WindowPos3dMESA 633
+#define _gloffset_WindowPos3dvMESA 634
+#define _gloffset_WindowPos3fMESA 635
+#define _gloffset_WindowPos3fvMESA 636
+#define _gloffset_WindowPos3iMESA 637
+#define _gloffset_WindowPos3ivMESA 638
+#define _gloffset_WindowPos3sMESA 639
+#define _gloffset_WindowPos3svMESA 640
+#define _gloffset_WindowPos4dMESA 641
+#define _gloffset_WindowPos4dvMESA 642
+#define _gloffset_WindowPos4fMESA 643
+#define _gloffset_WindowPos4fvMESA 644
+#define _gloffset_WindowPos4iMESA 645
+#define _gloffset_WindowPos4ivMESA 646
+#define _gloffset_WindowPos4sMESA 647
+#define _gloffset_WindowPos4svMESA 648
+#define _gloffset_MultiModeDrawArraysIBM 649
+#define _gloffset_MultiModeDrawElementsIBM 650
+#define _gloffset_DeleteFencesNV 651
+#define _gloffset_FinishFenceNV 652
+#define _gloffset_GenFencesNV 653
+#define _gloffset_GetFenceivNV 654
+#define _gloffset_IsFenceNV 655
+#define _gloffset_SetFenceNV 656
+#define _gloffset_TestFenceNV 657
+#define _gloffset_AreProgramsResidentNV 658
+#define _gloffset_BindProgramNV 659
+#define _gloffset_DeleteProgramsNV 660
+#define _gloffset_ExecuteProgramNV 661
+#define _gloffset_GenProgramsNV 662
+#define _gloffset_GetProgramParameterdvNV 663
+#define _gloffset_GetProgramParameterfvNV 664
+#define _gloffset_GetProgramStringNV 665
+#define _gloffset_GetProgramivNV 666
+#define _gloffset_GetTrackMatrixivNV 667
+#define _gloffset_GetVertexAttribPointervNV 668
+#define _gloffset_GetVertexAttribdvNV 669
+#define _gloffset_GetVertexAttribfvNV 670
+#define _gloffset_GetVertexAttribivNV 671
+#define _gloffset_IsProgramNV 672
+#define _gloffset_LoadProgramNV 673
+#define _gloffset_ProgramParameters4dvNV 674
+#define _gloffset_ProgramParameters4fvNV 675
+#define _gloffset_RequestResidentProgramsNV 676
+#define _gloffset_TrackMatrixNV 677
+#define _gloffset_VertexAttrib1dNV 678
+#define _gloffset_VertexAttrib1dvNV 679
+#define _gloffset_VertexAttrib1fNV 680
+#define _gloffset_VertexAttrib1fvNV 681
+#define _gloffset_VertexAttrib1sNV 682
+#define _gloffset_VertexAttrib1svNV 683
+#define _gloffset_VertexAttrib2dNV 684
+#define _gloffset_VertexAttrib2dvNV 685
+#define _gloffset_VertexAttrib2fNV 686
+#define _gloffset_VertexAttrib2fvNV 687
+#define _gloffset_VertexAttrib2sNV 688
+#define _gloffset_VertexAttrib2svNV 689
+#define _gloffset_VertexAttrib3dNV 690
+#define _gloffset_VertexAttrib3dvNV 691
+#define _gloffset_VertexAttrib3fNV 692
+#define _gloffset_VertexAttrib3fvNV 693
+#define _gloffset_VertexAttrib3sNV 694
+#define _gloffset_VertexAttrib3svNV 695
+#define _gloffset_VertexAttrib4dNV 696
+#define _gloffset_VertexAttrib4dvNV 697
+#define _gloffset_VertexAttrib4fNV 698
+#define _gloffset_VertexAttrib4fvNV 699
+#define _gloffset_VertexAttrib4sNV 700
+#define _gloffset_VertexAttrib4svNV 701
+#define _gloffset_VertexAttrib4ubNV 702
+#define _gloffset_VertexAttrib4ubvNV 703
+#define _gloffset_VertexAttribPointerNV 704
+#define _gloffset_VertexAttribs1dvNV 705
+#define _gloffset_VertexAttribs1fvNV 706
+#define _gloffset_VertexAttribs1svNV 707
+#define _gloffset_VertexAttribs2dvNV 708
+#define _gloffset_VertexAttribs2fvNV 709
+#define _gloffset_VertexAttribs2svNV 710
+#define _gloffset_VertexAttribs3dvNV 711
+#define _gloffset_VertexAttribs3fvNV 712
+#define _gloffset_VertexAttribs3svNV 713
+#define _gloffset_VertexAttribs4dvNV 714
+#define _gloffset_VertexAttribs4fvNV 715
+#define _gloffset_VertexAttribs4svNV 716
+#define _gloffset_VertexAttribs4ubvNV 717
+#define _gloffset_AlphaFragmentOp1ATI 718
+#define _gloffset_AlphaFragmentOp2ATI 719
+#define _gloffset_AlphaFragmentOp3ATI 720
+#define _gloffset_BeginFragmentShaderATI 721
+#define _gloffset_BindFragmentShaderATI 722
+#define _gloffset_ColorFragmentOp1ATI 723
+#define _gloffset_ColorFragmentOp2ATI 724
+#define _gloffset_ColorFragmentOp3ATI 725
+#define _gloffset_DeleteFragmentShaderATI 726
+#define _gloffset_EndFragmentShaderATI 727
+#define _gloffset_GenFragmentShadersATI 728
+#define _gloffset_PassTexCoordATI 729
+#define _gloffset_SampleMapATI 730
+#define _gloffset_SetFragmentShaderConstantATI 731
+#define _gloffset_PointParameteriNV 732
+#define _gloffset_PointParameterivNV 733
+#define _gloffset_ActiveStencilFaceEXT 734
+#define _gloffset_BindVertexArrayAPPLE 735
+#define _gloffset_DeleteVertexArraysAPPLE 736
+#define _gloffset_GenVertexArraysAPPLE 737
+#define _gloffset_IsVertexArrayAPPLE 738
+#define _gloffset_GetProgramNamedParameterdvNV 739
+#define _gloffset_GetProgramNamedParameterfvNV 740
+#define _gloffset_ProgramNamedParameter4dNV 741
+#define _gloffset_ProgramNamedParameter4dvNV 742
+#define _gloffset_ProgramNamedParameter4fNV 743
+#define _gloffset_ProgramNamedParameter4fvNV 744
+#define _gloffset_DepthBoundsEXT 745
+#define _gloffset_BlendEquationSeparateEXT 746
+#define _gloffset_BindFramebufferEXT 747
+#define _gloffset_BindRenderbufferEXT 748
+#define _gloffset_CheckFramebufferStatusEXT 749
+#define _gloffset_DeleteFramebuffersEXT 750
+#define _gloffset_DeleteRenderbuffersEXT 751
+#define _gloffset_FramebufferRenderbufferEXT 752
+#define _gloffset_FramebufferTexture1DEXT 753
+#define _gloffset_FramebufferTexture2DEXT 754
+#define _gloffset_FramebufferTexture3DEXT 755
+#define _gloffset_GenFramebuffersEXT 756
+#define _gloffset_GenRenderbuffersEXT 757
+#define _gloffset_GenerateMipmapEXT 758
+#define _gloffset_GetFramebufferAttachmentParameterivEXT 759
+#define _gloffset_GetRenderbufferParameterivEXT 760
+#define _gloffset_IsFramebufferEXT 761
+#define _gloffset_IsRenderbufferEXT 762
+#define _gloffset_RenderbufferStorageEXT 763
+#define _gloffset_BlitFramebufferEXT 764
+#define _gloffset_FramebufferTextureLayerEXT 765
+#define _gloffset_StencilFuncSeparateATI 766
+#define _gloffset_ProgramEnvParameters4fvEXT 767
+#define _gloffset_ProgramLocalParameters4fvEXT 768
+#define _gloffset_GetQueryObjecti64vEXT 769
+#define _gloffset_GetQueryObjectui64vEXT 770
+#define _gloffset_FIRST_DYNAMIC 771
 
 #else
 
@@ -959,6 +960,7 @@
 #define _gloffset_GetActiveAttribARB driDispatchRemapTable[GetActiveAttribARB_remap_index]
 #define _gloffset_GetAttribLocationARB driDispatchRemapTable[GetAttribLocationARB_remap_index]
 #define _gloffset_DrawBuffersARB driDispatchRemapTable[DrawBuffersARB_remap_index]
+#define _gloffset_RenderbufferStorageMultisample driDispatchRemapTable[RenderbufferStorageMultisample_remap_index]
 #define _gloffset_PolygonOffsetEXT driDispatchRemapTable[PolygonOffsetEXT_remap_index]
 #define _gloffset_GetPixelTexGenParameterfvSGIS driDispatchRemapTable[GetPixelTexGenParameterfvSGIS_remap_index]
 #define _gloffset_GetPixelTexGenParameterivSGIS driDispatchRemapTable[GetPixelTexGenParameterivSGIS_remap_index]
diff --git a/src/mesa/glapi/glapitable.h b/src/mesa/glapi/glapitable.h
index 5d9d40a8a2..2ae9bf6738 100644
--- a/src/mesa/glapi/glapitable.h
+++ b/src/mesa/glapi/glapitable.h
@@ -601,215 +601,216 @@ struct _glapi_table
    void (GLAPIENTRYP GetActiveAttribARB)(GLhandleARB program, GLuint index, GLsizei bufSize, GLsizei * length, GLint * size, GLenum * type, GLcharARB * name); /* 558 */
    GLint (GLAPIENTRYP GetAttribLocationARB)(GLhandleARB program, const GLcharARB * name); /* 559 */
    void (GLAPIENTRYP DrawBuffersARB)(GLsizei n, const GLenum * bufs); /* 560 */
-   void (GLAPIENTRYP PolygonOffsetEXT)(GLfloat factor, GLfloat bias); /* 561 */
-   void (GLAPIENTRYP GetPixelTexGenParameterfvSGIS)(GLenum pname, GLfloat * params); /* 562 */
-   void (GLAPIENTRYP GetPixelTexGenParameterivSGIS)(GLenum pname, GLint * params); /* 563 */
-   void (GLAPIENTRYP PixelTexGenParameterfSGIS)(GLenum pname, GLfloat param); /* 564 */
-   void (GLAPIENTRYP PixelTexGenParameterfvSGIS)(GLenum pname, const GLfloat * params); /* 565 */
-   void (GLAPIENTRYP PixelTexGenParameteriSGIS)(GLenum pname, GLint param); /* 566 */
-   void (GLAPIENTRYP PixelTexGenParameterivSGIS)(GLenum pname, const GLint * params); /* 567 */
-   void (GLAPIENTRYP SampleMaskSGIS)(GLclampf value, GLboolean invert); /* 568 */
-   void (GLAPIENTRYP SamplePatternSGIS)(GLenum pattern); /* 569 */
-   void (GLAPIENTRYP ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 570 */
-   void (GLAPIENTRYP EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean * pointer); /* 571 */
-   void (GLAPIENTRYP IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 572 */
-   void (GLAPIENTRYP NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 573 */
-   void (GLAPIENTRYP TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 574 */
-   void (GLAPIENTRYP VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 575 */
-   void (GLAPIENTRYP PointParameterfEXT)(GLenum pname, GLfloat param); /* 576 */
-   void (GLAPIENTRYP PointParameterfvEXT)(GLenum pname, const GLfloat * params); /* 577 */
-   void (GLAPIENTRYP LockArraysEXT)(GLint first, GLsizei count); /* 578 */
-   void (GLAPIENTRYP UnlockArraysEXT)(void); /* 579 */
-   void (GLAPIENTRYP CullParameterdvEXT)(GLenum pname, GLdouble * params); /* 580 */
-   void (GLAPIENTRYP CullParameterfvEXT)(GLenum pname, GLfloat * params); /* 581 */
-   void (GLAPIENTRYP SecondaryColor3bEXT)(GLbyte red, GLbyte green, GLbyte blue); /* 582 */
-   void (GLAPIENTRYP SecondaryColor3bvEXT)(const GLbyte * v); /* 583 */
-   void (GLAPIENTRYP SecondaryColor3dEXT)(GLdouble red, GLdouble green, GLdouble blue); /* 584 */
-   void (GLAPIENTRYP SecondaryColor3dvEXT)(const GLdouble * v); /* 585 */
-   void (GLAPIENTRYP SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue); /* 586 */
-   void (GLAPIENTRYP SecondaryColor3fvEXT)(const GLfloat * v); /* 587 */
-   void (GLAPIENTRYP SecondaryColor3iEXT)(GLint red, GLint green, GLint blue); /* 588 */
-   void (GLAPIENTRYP SecondaryColor3ivEXT)(const GLint * v); /* 589 */
-   void (GLAPIENTRYP SecondaryColor3sEXT)(GLshort red, GLshort green, GLshort blue); /* 590 */
-   void (GLAPIENTRYP SecondaryColor3svEXT)(const GLshort * v); /* 591 */
-   void (GLAPIENTRYP SecondaryColor3ubEXT)(GLubyte red, GLubyte green, GLubyte blue); /* 592 */
-   void (GLAPIENTRYP SecondaryColor3ubvEXT)(const GLubyte * v); /* 593 */
-   void (GLAPIENTRYP SecondaryColor3uiEXT)(GLuint red, GLuint green, GLuint blue); /* 594 */
-   void (GLAPIENTRYP SecondaryColor3uivEXT)(const GLuint * v); /* 595 */
-   void (GLAPIENTRYP SecondaryColor3usEXT)(GLushort red, GLushort green, GLushort blue); /* 596 */
-   void (GLAPIENTRYP SecondaryColor3usvEXT)(const GLushort * v); /* 597 */
-   void (GLAPIENTRYP SecondaryColorPointerEXT)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 598 */
-   void (GLAPIENTRYP MultiDrawArraysEXT)(GLenum mode, GLint * first, GLsizei * count, GLsizei primcount); /* 599 */
-   void (GLAPIENTRYP MultiDrawElementsEXT)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount); /* 600 */
-   void (GLAPIENTRYP FogCoordPointerEXT)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 601 */
-   void (GLAPIENTRYP FogCoorddEXT)(GLdouble coord); /* 602 */
-   void (GLAPIENTRYP FogCoorddvEXT)(const GLdouble * coord); /* 603 */
-   void (GLAPIENTRYP FogCoordfEXT)(GLfloat coord); /* 604 */
-   void (GLAPIENTRYP FogCoordfvEXT)(const GLfloat * coord); /* 605 */
-   void (GLAPIENTRYP PixelTexGenSGIX)(GLenum mode); /* 606 */
-   void (GLAPIENTRYP BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); /* 607 */
-   void (GLAPIENTRYP FlushVertexArrayRangeNV)(void); /* 608 */
-   void (GLAPIENTRYP VertexArrayRangeNV)(GLsizei length, const GLvoid * pointer); /* 609 */
-   void (GLAPIENTRYP CombinerInputNV)(GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 610 */
-   void (GLAPIENTRYP CombinerOutputNV)(GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum); /* 611 */
-   void (GLAPIENTRYP CombinerParameterfNV)(GLenum pname, GLfloat param); /* 612 */
-   void (GLAPIENTRYP CombinerParameterfvNV)(GLenum pname, const GLfloat * params); /* 613 */
-   void (GLAPIENTRYP CombinerParameteriNV)(GLenum pname, GLint param); /* 614 */
-   void (GLAPIENTRYP CombinerParameterivNV)(GLenum pname, const GLint * params); /* 615 */
-   void (GLAPIENTRYP FinalCombinerInputNV)(GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 616 */
-   void (GLAPIENTRYP GetCombinerInputParameterfvNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat * params); /* 617 */
-   void (GLAPIENTRYP GetCombinerInputParameterivNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint * params); /* 618 */
-   void (GLAPIENTRYP GetCombinerOutputParameterfvNV)(GLenum stage, GLenum portion, GLenum pname, GLfloat * params); /* 619 */
-   void (GLAPIENTRYP GetCombinerOutputParameterivNV)(GLenum stage, GLenum portion, GLenum pname, GLint * params); /* 620 */
-   void (GLAPIENTRYP GetFinalCombinerInputParameterfvNV)(GLenum variable, GLenum pname, GLfloat * params); /* 621 */
-   void (GLAPIENTRYP GetFinalCombinerInputParameterivNV)(GLenum variable, GLenum pname, GLint * params); /* 622 */
-   void (GLAPIENTRYP ResizeBuffersMESA)(void); /* 623 */
-   void (GLAPIENTRYP WindowPos2dMESA)(GLdouble x, GLdouble y); /* 624 */
-   void (GLAPIENTRYP WindowPos2dvMESA)(const GLdouble * v); /* 625 */
-   void (GLAPIENTRYP WindowPos2fMESA)(GLfloat x, GLfloat y); /* 626 */
-   void (GLAPIENTRYP WindowPos2fvMESA)(const GLfloat * v); /* 627 */
-   void (GLAPIENTRYP WindowPos2iMESA)(GLint x, GLint y); /* 628 */
-   void (GLAPIENTRYP WindowPos2ivMESA)(const GLint * v); /* 629 */
-   void (GLAPIENTRYP WindowPos2sMESA)(GLshort x, GLshort y); /* 630 */
-   void (GLAPIENTRYP WindowPos2svMESA)(const GLshort * v); /* 631 */
-   void (GLAPIENTRYP WindowPos3dMESA)(GLdouble x, GLdouble y, GLdouble z); /* 632 */
-   void (GLAPIENTRYP WindowPos3dvMESA)(const GLdouble * v); /* 633 */
-   void (GLAPIENTRYP WindowPos3fMESA)(GLfloat x, GLfloat y, GLfloat z); /* 634 */
-   void (GLAPIENTRYP WindowPos3fvMESA)(const GLfloat * v); /* 635 */
-   void (GLAPIENTRYP WindowPos3iMESA)(GLint x, GLint y, GLint z); /* 636 */
-   void (GLAPIENTRYP WindowPos3ivMESA)(const GLint * v); /* 637 */
-   void (GLAPIENTRYP WindowPos3sMESA)(GLshort x, GLshort y, GLshort z); /* 638 */
-   void (GLAPIENTRYP WindowPos3svMESA)(const GLshort * v); /* 639 */
-   void (GLAPIENTRYP WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 640 */
-   void (GLAPIENTRYP WindowPos4dvMESA)(const GLdouble * v); /* 641 */
-   void (GLAPIENTRYP WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 642 */
-   void (GLAPIENTRYP WindowPos4fvMESA)(const GLfloat * v); /* 643 */
-   void (GLAPIENTRYP WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w); /* 644 */
-   void (GLAPIENTRYP WindowPos4ivMESA)(const GLint * v); /* 645 */
-   void (GLAPIENTRYP WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w); /* 646 */
-   void (GLAPIENTRYP WindowPos4svMESA)(const GLshort * v); /* 647 */
-   void (GLAPIENTRYP MultiModeDrawArraysIBM)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride); /* 648 */
-   void (GLAPIENTRYP MultiModeDrawElementsIBM)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride); /* 649 */
-   void (GLAPIENTRYP DeleteFencesNV)(GLsizei n, const GLuint * fences); /* 650 */
-   void (GLAPIENTRYP FinishFenceNV)(GLuint fence); /* 651 */
-   void (GLAPIENTRYP GenFencesNV)(GLsizei n, GLuint * fences); /* 652 */
-   void (GLAPIENTRYP GetFenceivNV)(GLuint fence, GLenum pname, GLint * params); /* 653 */
-   GLboolean (GLAPIENTRYP IsFenceNV)(GLuint fence); /* 654 */
-   void (GLAPIENTRYP SetFenceNV)(GLuint fence, GLenum condition); /* 655 */
-   GLboolean (GLAPIENTRYP TestFenceNV)(GLuint fence); /* 656 */
-   GLboolean (GLAPIENTRYP AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences); /* 657 */
-   void (GLAPIENTRYP BindProgramNV)(GLenum target, GLuint program); /* 658 */
-   void (GLAPIENTRYP DeleteProgramsNV)(GLsizei n, const GLuint * programs); /* 659 */
-   void (GLAPIENTRYP ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat * params); /* 660 */
-   void (GLAPIENTRYP GenProgramsNV)(GLsizei n, GLuint * programs); /* 661 */
-   void (GLAPIENTRYP GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params); /* 662 */
-   void (GLAPIENTRYP GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat * params); /* 663 */
-   void (GLAPIENTRYP GetProgramStringNV)(GLuint id, GLenum pname, GLubyte * program); /* 664 */
-   void (GLAPIENTRYP GetProgramivNV)(GLuint id, GLenum pname, GLint * params); /* 665 */
-   void (GLAPIENTRYP GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint * params); /* 666 */
-   void (GLAPIENTRYP GetVertexAttribPointervNV)(GLuint index, GLenum pname, GLvoid ** pointer); /* 667 */
-   void (GLAPIENTRYP GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params); /* 668 */
-   void (GLAPIENTRYP GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat * params); /* 669 */
-   void (GLAPIENTRYP GetVertexAttribivNV)(GLuint index, GLenum pname, GLint * params); /* 670 */
-   GLboolean (GLAPIENTRYP IsProgramNV)(GLuint program); /* 671 */
-   void (GLAPIENTRYP LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte * program); /* 672 */
-   void (GLAPIENTRYP ProgramParameters4dvNV)(GLenum target, GLuint index, GLuint num, const GLdouble * params); /* 673 */
-   void (GLAPIENTRYP ProgramParameters4fvNV)(GLenum target, GLuint index, GLuint num, const GLfloat * params); /* 674 */
-   void (GLAPIENTRYP RequestResidentProgramsNV)(GLsizei n, const GLuint * ids); /* 675 */
-   void (GLAPIENTRYP TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform); /* 676 */
-   void (GLAPIENTRYP VertexAttrib1dNV)(GLuint index, GLdouble x); /* 677 */
-   void (GLAPIENTRYP VertexAttrib1dvNV)(GLuint index, const GLdouble * v); /* 678 */
-   void (GLAPIENTRYP VertexAttrib1fNV)(GLuint index, GLfloat x); /* 679 */
-   void (GLAPIENTRYP VertexAttrib1fvNV)(GLuint index, const GLfloat * v); /* 680 */
-   void (GLAPIENTRYP VertexAttrib1sNV)(GLuint index, GLshort x); /* 681 */
-   void (GLAPIENTRYP VertexAttrib1svNV)(GLuint index, const GLshort * v); /* 682 */
-   void (GLAPIENTRYP VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y); /* 683 */
-   void (GLAPIENTRYP VertexAttrib2dvNV)(GLuint index, const GLdouble * v); /* 684 */
-   void (GLAPIENTRYP VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y); /* 685 */
-   void (GLAPIENTRYP VertexAttrib2fvNV)(GLuint index, const GLfloat * v); /* 686 */
-   void (GLAPIENTRYP VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y); /* 687 */
-   void (GLAPIENTRYP VertexAttrib2svNV)(GLuint index, const GLshort * v); /* 688 */
-   void (GLAPIENTRYP VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 689 */
-   void (GLAPIENTRYP VertexAttrib3dvNV)(GLuint index, const GLdouble * v); /* 690 */
-   void (GLAPIENTRYP VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 691 */
-   void (GLAPIENTRYP VertexAttrib3fvNV)(GLuint index, const GLfloat * v); /* 692 */
-   void (GLAPIENTRYP VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z); /* 693 */
-   void (GLAPIENTRYP VertexAttrib3svNV)(GLuint index, const GLshort * v); /* 694 */
-   void (GLAPIENTRYP VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 695 */
-   void (GLAPIENTRYP VertexAttrib4dvNV)(GLuint index, const GLdouble * v); /* 696 */
-   void (GLAPIENTRYP VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 697 */
-   void (GLAPIENTRYP VertexAttrib4fvNV)(GLuint index, const GLfloat * v); /* 698 */
-   void (GLAPIENTRYP VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 699 */
-   void (GLAPIENTRYP VertexAttrib4svNV)(GLuint index, const GLshort * v); /* 700 */
-   void (GLAPIENTRYP VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 701 */
-   void (GLAPIENTRYP VertexAttrib4ubvNV)(GLuint index, const GLubyte * v); /* 702 */
-   void (GLAPIENTRYP VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 703 */
-   void (GLAPIENTRYP VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 704 */
-   void (GLAPIENTRYP VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 705 */
-   void (GLAPIENTRYP VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v); /* 706 */
-   void (GLAPIENTRYP VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 707 */
-   void (GLAPIENTRYP VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 708 */
-   void (GLAPIENTRYP VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v); /* 709 */
-   void (GLAPIENTRYP VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 710 */
-   void (GLAPIENTRYP VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 711 */
-   void (GLAPIENTRYP VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v); /* 712 */
-   void (GLAPIENTRYP VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 713 */
-   void (GLAPIENTRYP VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 714 */
-   void (GLAPIENTRYP VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v); /* 715 */
-   void (GLAPIENTRYP VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v); /* 716 */
-   void (GLAPIENTRYP AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 717 */
-   void (GLAPIENTRYP AlphaFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 718 */
-   void (GLAPIENTRYP AlphaFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 719 */
-   void (GLAPIENTRYP BeginFragmentShaderATI)(void); /* 720 */
-   void (GLAPIENTRYP BindFragmentShaderATI)(GLuint id); /* 721 */
-   void (GLAPIENTRYP ColorFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 722 */
-   void (GLAPIENTRYP ColorFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 723 */
-   void (GLAPIENTRYP ColorFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 724 */
-   void (GLAPIENTRYP DeleteFragmentShaderATI)(GLuint id); /* 725 */
-   void (GLAPIENTRYP EndFragmentShaderATI)(void); /* 726 */
-   GLuint (GLAPIENTRYP GenFragmentShadersATI)(GLuint range); /* 727 */
-   void (GLAPIENTRYP PassTexCoordATI)(GLuint dst, GLuint coord, GLenum swizzle); /* 728 */
-   void (GLAPIENTRYP SampleMapATI)(GLuint dst, GLuint interp, GLenum swizzle); /* 729 */
-   void (GLAPIENTRYP SetFragmentShaderConstantATI)(GLuint dst, const GLfloat * value); /* 730 */
-   void (GLAPIENTRYP PointParameteriNV)(GLenum pname, GLint param); /* 731 */
-   void (GLAPIENTRYP PointParameterivNV)(GLenum pname, const GLint * params); /* 732 */
-   void (GLAPIENTRYP ActiveStencilFaceEXT)(GLenum face); /* 733 */
-   void (GLAPIENTRYP BindVertexArrayAPPLE)(GLuint array); /* 734 */
-   void (GLAPIENTRYP DeleteVertexArraysAPPLE)(GLsizei n, const GLuint * arrays); /* 735 */
-   void (GLAPIENTRYP GenVertexArraysAPPLE)(GLsizei n, GLuint * arrays); /* 736 */
-   GLboolean (GLAPIENTRYP IsVertexArrayAPPLE)(GLuint array); /* 737 */
-   void (GLAPIENTRYP GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params); /* 738 */
-   void (GLAPIENTRYP GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params); /* 739 */
-   void (GLAPIENTRYP ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 740 */
-   void (GLAPIENTRYP ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 741 */
-   void (GLAPIENTRYP ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 742 */
-   void (GLAPIENTRYP ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 743 */
-   void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 744 */
-   void (GLAPIENTRYP BlendEquationSeparateEXT)(GLenum modeRGB, GLenum modeA); /* 745 */
-   void (GLAPIENTRYP BindFramebufferEXT)(GLenum target, GLuint framebuffer); /* 746 */
-   void (GLAPIENTRYP BindRenderbufferEXT)(GLenum target, GLuint renderbuffer); /* 747 */
-   GLenum (GLAPIENTRYP CheckFramebufferStatusEXT)(GLenum target); /* 748 */
-   void (GLAPIENTRYP DeleteFramebuffersEXT)(GLsizei n, const GLuint * framebuffers); /* 749 */
-   void (GLAPIENTRYP DeleteRenderbuffersEXT)(GLsizei n, const GLuint * renderbuffers); /* 750 */
-   void (GLAPIENTRYP FramebufferRenderbufferEXT)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); /* 751 */
-   void (GLAPIENTRYP FramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 752 */
-   void (GLAPIENTRYP FramebufferTexture2DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 753 */
-   void (GLAPIENTRYP FramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); /* 754 */
-   void (GLAPIENTRYP GenFramebuffersEXT)(GLsizei n, GLuint * framebuffers); /* 755 */
-   void (GLAPIENTRYP GenRenderbuffersEXT)(GLsizei n, GLuint * renderbuffers); /* 756 */
-   void (GLAPIENTRYP GenerateMipmapEXT)(GLenum target); /* 757 */
-   void (GLAPIENTRYP GetFramebufferAttachmentParameterivEXT)(GLenum target, GLenum attachment, GLenum pname, GLint * params); /* 758 */
-   void (GLAPIENTRYP GetRenderbufferParameterivEXT)(GLenum target, GLenum pname, GLint * params); /* 759 */
-   GLboolean (GLAPIENTRYP IsFramebufferEXT)(GLuint framebuffer); /* 760 */
-   GLboolean (GLAPIENTRYP IsRenderbufferEXT)(GLuint renderbuffer); /* 761 */
-   void (GLAPIENTRYP RenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); /* 762 */
-   void (GLAPIENTRYP BlitFramebufferEXT)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); /* 763 */
-   void (GLAPIENTRYP FramebufferTextureLayerEXT)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); /* 764 */
-   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 765 */
-   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 766 */
-   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 767 */
-   void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 768 */
-   void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 769 */
+   void (GLAPIENTRYP RenderbufferStorageMultisample)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); /* 561 */
+   void (GLAPIENTRYP PolygonOffsetEXT)(GLfloat factor, GLfloat bias); /* 562 */
+   void (GLAPIENTRYP GetPixelTexGenParameterfvSGIS)(GLenum pname, GLfloat * params); /* 563 */
+   void (GLAPIENTRYP GetPixelTexGenParameterivSGIS)(GLenum pname, GLint * params); /* 564 */
+   void (GLAPIENTRYP PixelTexGenParameterfSGIS)(GLenum pname, GLfloat param); /* 565 */
+   void (GLAPIENTRYP PixelTexGenParameterfvSGIS)(GLenum pname, const GLfloat * params); /* 566 */
+   void (GLAPIENTRYP PixelTexGenParameteriSGIS)(GLenum pname, GLint param); /* 567 */
+   void (GLAPIENTRYP PixelTexGenParameterivSGIS)(GLenum pname, const GLint * params); /* 568 */
+   void (GLAPIENTRYP SampleMaskSGIS)(GLclampf value, GLboolean invert); /* 569 */
+   void (GLAPIENTRYP SamplePatternSGIS)(GLenum pattern); /* 570 */
+   void (GLAPIENTRYP ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 571 */
+   void (GLAPIENTRYP EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean * pointer); /* 572 */
+   void (GLAPIENTRYP IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 573 */
+   void (GLAPIENTRYP NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 574 */
+   void (GLAPIENTRYP TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 575 */
+   void (GLAPIENTRYP VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 576 */
+   void (GLAPIENTRYP PointParameterfEXT)(GLenum pname, GLfloat param); /* 577 */
+   void (GLAPIENTRYP PointParameterfvEXT)(GLenum pname, const GLfloat * params); /* 578 */
+   void (GLAPIENTRYP LockArraysEXT)(GLint first, GLsizei count); /* 579 */
+   void (GLAPIENTRYP UnlockArraysEXT)(void); /* 580 */
+   void (GLAPIENTRYP CullParameterdvEXT)(GLenum pname, GLdouble * params); /* 581 */
+   void (GLAPIENTRYP CullParameterfvEXT)(GLenum pname, GLfloat * params); /* 582 */
+   void (GLAPIENTRYP SecondaryColor3bEXT)(GLbyte red, GLbyte green, GLbyte blue); /* 583 */
+   void (GLAPIENTRYP SecondaryColor3bvEXT)(const GLbyte * v); /* 584 */
+   void (GLAPIENTRYP SecondaryColor3dEXT)(GLdouble red, GLdouble green, GLdouble blue); /* 585 */
+   void (GLAPIENTRYP SecondaryColor3dvEXT)(const GLdouble * v); /* 586 */
+   void (GLAPIENTRYP SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue); /* 587 */
+   void (GLAPIENTRYP SecondaryColor3fvEXT)(const GLfloat * v); /* 588 */
+   void (GLAPIENTRYP SecondaryColor3iEXT)(GLint red, GLint green, GLint blue); /* 589 */
+   void (GLAPIENTRYP SecondaryColor3ivEXT)(const GLint * v); /* 590 */
+   void (GLAPIENTRYP SecondaryColor3sEXT)(GLshort red, GLshort green, GLshort blue); /* 591 */
+   void (GLAPIENTRYP SecondaryColor3svEXT)(const GLshort * v); /* 592 */
+   void (GLAPIENTRYP SecondaryColor3ubEXT)(GLubyte red, GLubyte green, GLubyte blue); /* 593 */
+   void (GLAPIENTRYP SecondaryColor3ubvEXT)(const GLubyte * v); /* 594 */
+   void (GLAPIENTRYP SecondaryColor3uiEXT)(GLuint red, GLuint green, GLuint blue); /* 595 */
+   void (GLAPIENTRYP SecondaryColor3uivEXT)(const GLuint * v); /* 596 */
+   void (GLAPIENTRYP SecondaryColor3usEXT)(GLushort red, GLushort green, GLushort blue); /* 597 */
+   void (GLAPIENTRYP SecondaryColor3usvEXT)(const GLushort * v); /* 598 */
+   void (GLAPIENTRYP SecondaryColorPointerEXT)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 599 */
+   void (GLAPIENTRYP MultiDrawArraysEXT)(GLenum mode, GLint * first, GLsizei * count, GLsizei primcount); /* 600 */
+   void (GLAPIENTRYP MultiDrawElementsEXT)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount); /* 601 */
+   void (GLAPIENTRYP FogCoordPointerEXT)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 602 */
+   void (GLAPIENTRYP FogCoorddEXT)(GLdouble coord); /* 603 */
+   void (GLAPIENTRYP FogCoorddvEXT)(const GLdouble * coord); /* 604 */
+   void (GLAPIENTRYP FogCoordfEXT)(GLfloat coord); /* 605 */
+   void (GLAPIENTRYP FogCoordfvEXT)(const GLfloat * coord); /* 606 */
+   void (GLAPIENTRYP PixelTexGenSGIX)(GLenum mode); /* 607 */
+   void (GLAPIENTRYP BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); /* 608 */
+   void (GLAPIENTRYP FlushVertexArrayRangeNV)(void); /* 609 */
+   void (GLAPIENTRYP VertexArrayRangeNV)(GLsizei length, const GLvoid * pointer); /* 610 */
+   void (GLAPIENTRYP CombinerInputNV)(GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 611 */
+   void (GLAPIENTRYP CombinerOutputNV)(GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum); /* 612 */
+   void (GLAPIENTRYP CombinerParameterfNV)(GLenum pname, GLfloat param); /* 613 */
+   void (GLAPIENTRYP CombinerParameterfvNV)(GLenum pname, const GLfloat * params); /* 614 */
+   void (GLAPIENTRYP CombinerParameteriNV)(GLenum pname, GLint param); /* 615 */
+   void (GLAPIENTRYP CombinerParameterivNV)(GLenum pname, const GLint * params); /* 616 */
+   void (GLAPIENTRYP FinalCombinerInputNV)(GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 617 */
+   void (GLAPIENTRYP GetCombinerInputParameterfvNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat * params); /* 618 */
+   void (GLAPIENTRYP GetCombinerInputParameterivNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint * params); /* 619 */
+   void (GLAPIENTRYP GetCombinerOutputParameterfvNV)(GLenum stage, GLenum portion, GLenum pname, GLfloat * params); /* 620 */
+   void (GLAPIENTRYP GetCombinerOutputParameterivNV)(GLenum stage, GLenum portion, GLenum pname, GLint * params); /* 621 */
+   void (GLAPIENTRYP GetFinalCombinerInputParameterfvNV)(GLenum variable, GLenum pname, GLfloat * params); /* 622 */
+   void (GLAPIENTRYP GetFinalCombinerInputParameterivNV)(GLenum variable, GLenum pname, GLint * params); /* 623 */
+   void (GLAPIENTRYP ResizeBuffersMESA)(void); /* 624 */
+   void (GLAPIENTRYP WindowPos2dMESA)(GLdouble x, GLdouble y); /* 625 */
+   void (GLAPIENTRYP WindowPos2dvMESA)(const GLdouble * v); /* 626 */
+   void (GLAPIENTRYP WindowPos2fMESA)(GLfloat x, GLfloat y); /* 627 */
+   void (GLAPIENTRYP WindowPos2fvMESA)(const GLfloat * v); /* 628 */
+   void (GLAPIENTRYP WindowPos2iMESA)(GLint x, GLint y); /* 629 */
+   void (GLAPIENTRYP WindowPos2ivMESA)(const GLint * v); /* 630 */
+   void (GLAPIENTRYP WindowPos2sMESA)(GLshort x, GLshort y); /* 631 */
+   void (GLAPIENTRYP WindowPos2svMESA)(const GLshort * v); /* 632 */
+   void (GLAPIENTRYP WindowPos3dMESA)(GLdouble x, GLdouble y, GLdouble z); /* 633 */
+   void (GLAPIENTRYP WindowPos3dvMESA)(const GLdouble * v); /* 634 */
+   void (GLAPIENTRYP WindowPos3fMESA)(GLfloat x, GLfloat y, GLfloat z); /* 635 */
+   void (GLAPIENTRYP WindowPos3fvMESA)(const GLfloat * v); /* 636 */
+   void (GLAPIENTRYP WindowPos3iMESA)(GLint x, GLint y, GLint z); /* 637 */
+   void (GLAPIENTRYP WindowPos3ivMESA)(const GLint * v); /* 638 */
+   void (GLAPIENTRYP WindowPos3sMESA)(GLshort x, GLshort y, GLshort z); /* 639 */
+   void (GLAPIENTRYP WindowPos3svMESA)(const GLshort * v); /* 640 */
+   void (GLAPIENTRYP WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 641 */
+   void (GLAPIENTRYP WindowPos4dvMESA)(const GLdouble * v); /* 642 */
+   void (GLAPIENTRYP WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 643 */
+   void (GLAPIENTRYP WindowPos4fvMESA)(const GLfloat * v); /* 644 */
+   void (GLAPIENTRYP WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w); /* 645 */
+   void (GLAPIENTRYP WindowPos4ivMESA)(const GLint * v); /* 646 */
+   void (GLAPIENTRYP WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w); /* 647 */
+   void (GLAPIENTRYP WindowPos4svMESA)(const GLshort * v); /* 648 */
+   void (GLAPIENTRYP MultiModeDrawArraysIBM)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride); /* 649 */
+   void (GLAPIENTRYP MultiModeDrawElementsIBM)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride); /* 650 */
+   void (GLAPIENTRYP DeleteFencesNV)(GLsizei n, const GLuint * fences); /* 651 */
+   void (GLAPIENTRYP FinishFenceNV)(GLuint fence); /* 652 */
+   void (GLAPIENTRYP GenFencesNV)(GLsizei n, GLuint * fences); /* 653 */
+   void (GLAPIENTRYP GetFenceivNV)(GLuint fence, GLenum pname, GLint * params); /* 654 */
+   GLboolean (GLAPIENTRYP IsFenceNV)(GLuint fence); /* 655 */
+   void (GLAPIENTRYP SetFenceNV)(GLuint fence, GLenum condition); /* 656 */
+   GLboolean (GLAPIENTRYP TestFenceNV)(GLuint fence); /* 657 */
+   GLboolean (GLAPIENTRYP AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences); /* 658 */
+   void (GLAPIENTRYP BindProgramNV)(GLenum target, GLuint program); /* 659 */
+   void (GLAPIENTRYP DeleteProgramsNV)(GLsizei n, const GLuint * programs); /* 660 */
+   void (GLAPIENTRYP ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat * params); /* 661 */
+   void (GLAPIENTRYP GenProgramsNV)(GLsizei n, GLuint * programs); /* 662 */
+   void (GLAPIENTRYP GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params); /* 663 */
+   void (GLAPIENTRYP GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat * params); /* 664 */
+   void (GLAPIENTRYP GetProgramStringNV)(GLuint id, GLenum pname, GLubyte * program); /* 665 */
+   void (GLAPIENTRYP GetProgramivNV)(GLuint id, GLenum pname, GLint * params); /* 666 */
+   void (GLAPIENTRYP GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint * params); /* 667 */
+   void (GLAPIENTRYP GetVertexAttribPointervNV)(GLuint index, GLenum pname, GLvoid ** pointer); /* 668 */
+   void (GLAPIENTRYP GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params); /* 669 */
+   void (GLAPIENTRYP GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat * params); /* 670 */
+   void (GLAPIENTRYP GetVertexAttribivNV)(GLuint index, GLenum pname, GLint * params); /* 671 */
+   GLboolean (GLAPIENTRYP IsProgramNV)(GLuint program); /* 672 */
+   void (GLAPIENTRYP LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte * program); /* 673 */
+   void (GLAPIENTRYP ProgramParameters4dvNV)(GLenum target, GLuint index, GLuint num, const GLdouble * params); /* 674 */
+   void (GLAPIENTRYP ProgramParameters4fvNV)(GLenum target, GLuint index, GLuint num, const GLfloat * params); /* 675 */
+   void (GLAPIENTRYP RequestResidentProgramsNV)(GLsizei n, const GLuint * ids); /* 676 */
+   void (GLAPIENTRYP TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform); /* 677 */
+   void (GLAPIENTRYP VertexAttrib1dNV)(GLuint index, GLdouble x); /* 678 */
+   void (GLAPIENTRYP VertexAttrib1dvNV)(GLuint index, const GLdouble * v); /* 679 */
+   void (GLAPIENTRYP VertexAttrib1fNV)(GLuint index, GLfloat x); /* 680 */
+   void (GLAPIENTRYP VertexAttrib1fvNV)(GLuint index, const GLfloat * v); /* 681 */
+   void (GLAPIENTRYP VertexAttrib1sNV)(GLuint index, GLshort x); /* 682 */
+   void (GLAPIENTRYP VertexAttrib1svNV)(GLuint index, const GLshort * v); /* 683 */
+   void (GLAPIENTRYP VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y); /* 684 */
+   void (GLAPIENTRYP VertexAttrib2dvNV)(GLuint index, const GLdouble * v); /* 685 */
+   void (GLAPIENTRYP VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y); /* 686 */
+   void (GLAPIENTRYP VertexAttrib2fvNV)(GLuint index, const GLfloat * v); /* 687 */
+   void (GLAPIENTRYP VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y); /* 688 */
+   void (GLAPIENTRYP VertexAttrib2svNV)(GLuint index, const GLshort * v); /* 689 */
+   void (GLAPIENTRYP VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 690 */
+   void (GLAPIENTRYP VertexAttrib3dvNV)(GLuint index, const GLdouble * v); /* 691 */
+   void (GLAPIENTRYP VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 692 */
+   void (GLAPIENTRYP VertexAttrib3fvNV)(GLuint index, const GLfloat * v); /* 693 */
+   void (GLAPIENTRYP VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z); /* 694 */
+   void (GLAPIENTRYP VertexAttrib3svNV)(GLuint index, const GLshort * v); /* 695 */
+   void (GLAPIENTRYP VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 696 */
+   void (GLAPIENTRYP VertexAttrib4dvNV)(GLuint index, const GLdouble * v); /* 697 */
+   void (GLAPIENTRYP VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 698 */
+   void (GLAPIENTRYP VertexAttrib4fvNV)(GLuint index, const GLfloat * v); /* 699 */
+   void (GLAPIENTRYP VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 700 */
+   void (GLAPIENTRYP VertexAttrib4svNV)(GLuint index, const GLshort * v); /* 701 */
+   void (GLAPIENTRYP VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 702 */
+   void (GLAPIENTRYP VertexAttrib4ubvNV)(GLuint index, const GLubyte * v); /* 703 */
+   void (GLAPIENTRYP VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 704 */
+   void (GLAPIENTRYP VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 705 */
+   void (GLAPIENTRYP VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 706 */
+   void (GLAPIENTRYP VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v); /* 707 */
+   void (GLAPIENTRYP VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 708 */
+   void (GLAPIENTRYP VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 709 */
+   void (GLAPIENTRYP VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v); /* 710 */
+   void (GLAPIENTRYP VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 711 */
+   void (GLAPIENTRYP VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 712 */
+   void (GLAPIENTRYP VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v); /* 713 */
+   void (GLAPIENTRYP VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 714 */
+   void (GLAPIENTRYP VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 715 */
+   void (GLAPIENTRYP VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v); /* 716 */
+   void (GLAPIENTRYP VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v); /* 717 */
+   void (GLAPIENTRYP AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 718 */
+   void (GLAPIENTRYP AlphaFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 719 */
+   void (GLAPIENTRYP AlphaFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 720 */
+   void (GLAPIENTRYP BeginFragmentShaderATI)(void); /* 721 */
+   void (GLAPIENTRYP BindFragmentShaderATI)(GLuint id); /* 722 */
+   void (GLAPIENTRYP ColorFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 723 */
+   void (GLAPIENTRYP ColorFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 724 */
+   void (GLAPIENTRYP ColorFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 725 */
+   void (GLAPIENTRYP DeleteFragmentShaderATI)(GLuint id); /* 726 */
+   void (GLAPIENTRYP EndFragmentShaderATI)(void); /* 727 */
+   GLuint (GLAPIENTRYP GenFragmentShadersATI)(GLuint range); /* 728 */
+   void (GLAPIENTRYP PassTexCoordATI)(GLuint dst, GLuint coord, GLenum swizzle); /* 729 */
+   void (GLAPIENTRYP SampleMapATI)(GLuint dst, GLuint interp, GLenum swizzle); /* 730 */
+   void (GLAPIENTRYP SetFragmentShaderConstantATI)(GLuint dst, const GLfloat * value); /* 731 */
+   void (GLAPIENTRYP PointParameteriNV)(GLenum pname, GLint param); /* 732 */
+   void (GLAPIENTRYP PointParameterivNV)(GLenum pname, const GLint * params); /* 733 */
+   void (GLAPIENTRYP ActiveStencilFaceEXT)(GLenum face); /* 734 */
+   void (GLAPIENTRYP BindVertexArrayAPPLE)(GLuint array); /* 735 */
+   void (GLAPIENTRYP DeleteVertexArraysAPPLE)(GLsizei n, const GLuint * arrays); /* 736 */
+   void (GLAPIENTRYP GenVertexArraysAPPLE)(GLsizei n, GLuint * arrays); /* 737 */
+   GLboolean (GLAPIENTRYP IsVertexArrayAPPLE)(GLuint array); /* 738 */
+   void (GLAPIENTRYP GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params); /* 739 */
+   void (GLAPIENTRYP GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params); /* 740 */
+   void (GLAPIENTRYP ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 741 */
+   void (GLAPIENTRYP ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 742 */
+   void (GLAPIENTRYP ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 743 */
+   void (GLAPIENTRYP ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 744 */
+   void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 745 */
+   void (GLAPIENTRYP BlendEquationSeparateEXT)(GLenum modeRGB, GLenum modeA); /* 746 */
+   void (GLAPIENTRYP BindFramebufferEXT)(GLenum target, GLuint framebuffer); /* 747 */
+   void (GLAPIENTRYP BindRenderbufferEXT)(GLenum target, GLuint renderbuffer); /* 748 */
+   GLenum (GLAPIENTRYP CheckFramebufferStatusEXT)(GLenum target); /* 749 */
+   void (GLAPIENTRYP DeleteFramebuffersEXT)(GLsizei n, const GLuint * framebuffers); /* 750 */
+   void (GLAPIENTRYP DeleteRenderbuffersEXT)(GLsizei n, const GLuint * renderbuffers); /* 751 */
+   void (GLAPIENTRYP FramebufferRenderbufferEXT)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); /* 752 */
+   void (GLAPIENTRYP FramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 753 */
+   void (GLAPIENTRYP FramebufferTexture2DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 754 */
+   void (GLAPIENTRYP FramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); /* 755 */
+   void (GLAPIENTRYP GenFramebuffersEXT)(GLsizei n, GLuint * framebuffers); /* 756 */
+   void (GLAPIENTRYP GenRenderbuffersEXT)(GLsizei n, GLuint * renderbuffers); /* 757 */
+   void (GLAPIENTRYP GenerateMipmapEXT)(GLenum target); /* 758 */
+   void (GLAPIENTRYP GetFramebufferAttachmentParameterivEXT)(GLenum target, GLenum attachment, GLenum pname, GLint * params); /* 759 */
+   void (GLAPIENTRYP GetRenderbufferParameterivEXT)(GLenum target, GLenum pname, GLint * params); /* 760 */
+   GLboolean (GLAPIENTRYP IsFramebufferEXT)(GLuint framebuffer); /* 761 */
+   GLboolean (GLAPIENTRYP IsRenderbufferEXT)(GLuint renderbuffer); /* 762 */
+   void (GLAPIENTRYP RenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); /* 763 */
+   void (GLAPIENTRYP BlitFramebufferEXT)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); /* 764 */
+   void (GLAPIENTRYP FramebufferTextureLayerEXT)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); /* 765 */
+   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 766 */
+   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 767 */
+   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 768 */
+   void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 769 */
+   void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 770 */
 };
 
 #endif /* !defined( _GLAPI_TABLE_H_ ) */
diff --git a/src/mesa/glapi/glapitemp.h b/src/mesa/glapi/glapitemp.h
index 09259f4704..960d70e081 100644
--- a/src/mesa/glapi/glapitemp.h
+++ b/src/mesa/glapi/glapitemp.h
@@ -4006,63 +4006,68 @@ KEYWORD1 void KEYWORD2 NAME(DrawBuffersATI)(GLsizei n, const GLenum * bufs)
    DISPATCH(DrawBuffersARB, (n, bufs), (F, "glDrawBuffersATI(%d, %p);\n", n, (const void *) bufs));
 }
 
+KEYWORD1 void KEYWORD2 NAME(RenderbufferStorageMultisample)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height)
+{
+   DISPATCH(RenderbufferStorageMultisample, (target, samples, internalformat, width, height), (F, "glRenderbufferStorageMultisample(0x%x, %d, 0x%x, %d, %d);\n", target, samples, internalformat, width, height));
+}
+
 KEYWORD1 void KEYWORD2 NAME(PolygonOffsetEXT)(GLfloat factor, GLfloat bias)
 {
    DISPATCH(PolygonOffsetEXT, (factor, bias), (F, "glPolygonOffsetEXT(%f, %f);\n", factor, bias));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_562)(GLenum pname, GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_563)(GLenum pname, GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_562)(GLenum pname, GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_563)(GLenum pname, GLfloat * params)
 {
    DISPATCH(GetPixelTexGenParameterfvSGIS, (pname, params), (F, "glGetPixelTexGenParameterfvSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_563)(GLenum pname, GLint * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_564)(GLenum pname, GLint * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_563)(GLenum pname, GLint * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_564)(GLenum pname, GLint * params)
 {
    DISPATCH(GetPixelTexGenParameterivSGIS, (pname, params), (F, "glGetPixelTexGenParameterivSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_564)(GLenum pname, GLfloat param);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_565)(GLenum pname, GLfloat param);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_564)(GLenum pname, GLfloat param)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_565)(GLenum pname, GLfloat param)
 {
    DISPATCH(PixelTexGenParameterfSGIS, (pname, param), (F, "glPixelTexGenParameterfSGIS(0x%x, %f);\n", pname, param));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_565)(GLenum pname, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_566)(GLenum pname, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_565)(GLenum pname, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_566)(GLenum pname, const GLfloat * params)
 {
    DISPATCH(PixelTexGenParameterfvSGIS, (pname, params), (F, "glPixelTexGenParameterfvSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_566)(GLenum pname, GLint param);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_567)(GLenum pname, GLint param);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_566)(GLenum pname, GLint param)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_567)(GLenum pname, GLint param)
 {
    DISPATCH(PixelTexGenParameteriSGIS, (pname, param), (F, "glPixelTexGenParameteriSGIS(0x%x, %d);\n", pname, param));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_567)(GLenum pname, const GLint * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_568)(GLenum pname, const GLint * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_567)(GLenum pname, const GLint * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_568)(GLenum pname, const GLint * params)
 {
    DISPATCH(PixelTexGenParameterivSGIS, (pname, params), (F, "glPixelTexGenParameterivSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_568)(GLclampf value, GLboolean invert);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_569)(GLclampf value, GLboolean invert);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_568)(GLclampf value, GLboolean invert)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_569)(GLclampf value, GLboolean invert)
 {
    DISPATCH(SampleMaskSGIS, (value, invert), (F, "glSampleMaskSGIS(%f, %d);\n", value, invert));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_569)(GLenum pattern);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_570)(GLenum pattern);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_569)(GLenum pattern)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_570)(GLenum pattern)
 {
    DISPATCH(SamplePatternSGIS, (pattern), (F, "glSamplePatternSGIS(0x%x);\n", pattern));
 }
@@ -4112,9 +4117,9 @@ KEYWORD1 void KEYWORD2 NAME(PointParameterfEXT)(GLenum pname, GLfloat param)
    DISPATCH(PointParameterfEXT, (pname, param), (F, "glPointParameterfEXT(0x%x, %f);\n", pname, param));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_576)(GLenum pname, GLfloat param);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_577)(GLenum pname, GLfloat param);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_576)(GLenum pname, GLfloat param)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_577)(GLenum pname, GLfloat param)
 {
    DISPATCH(PointParameterfEXT, (pname, param), (F, "glPointParameterfSGIS(0x%x, %f);\n", pname, param));
 }
@@ -4134,9 +4139,9 @@ KEYWORD1 void KEYWORD2 NAME(PointParameterfvEXT)(GLenum pname, const GLfloat * p
    DISPATCH(PointParameterfvEXT, (pname, params), (F, "glPointParameterfvEXT(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_577)(GLenum pname, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_578)(GLenum pname, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_577)(GLenum pname, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_578)(GLenum pname, const GLfloat * params)
 {
    DISPATCH(PointParameterfvEXT, (pname, params), (F, "glPointParameterfvSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
@@ -4151,16 +4156,16 @@ KEYWORD1 void KEYWORD2 NAME(UnlockArraysEXT)(void)
    DISPATCH(UnlockArraysEXT, (), (F, "glUnlockArraysEXT();\n"));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_580)(GLenum pname, GLdouble * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_581)(GLenum pname, GLdouble * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_580)(GLenum pname, GLdouble * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_581)(GLenum pname, GLdouble * params)
 {
    DISPATCH(CullParameterdvEXT, (pname, params), (F, "glCullParameterdvEXT(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_581)(GLenum pname, GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_582)(GLenum pname, GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_581)(GLenum pname, GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_582)(GLenum pname, GLfloat * params)
 {
    DISPATCH(CullParameterfvEXT, (pname, params), (F, "glCullParameterfvEXT(0x%x, %p);\n", pname, (const void *) params));
 }
@@ -4405,9 +4410,9 @@ KEYWORD1 void KEYWORD2 NAME(FogCoordfvEXT)(const GLfloat * coord)
    DISPATCH(FogCoordfvEXT, (coord), (F, "glFogCoordfvEXT(%p);\n", (const void *) coord));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_606)(GLenum mode);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_607)(GLenum mode);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_606)(GLenum mode)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_607)(GLenum mode)
 {
    DISPATCH(PixelTexGenSGIX, (mode), (F, "glPixelTexGenSGIX(0x%x);\n", mode));
 }
@@ -4422,9 +4427,9 @@ KEYWORD1 void KEYWORD2 NAME(BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfac
    DISPATCH(BlendFuncSeparateEXT, (sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha), (F, "glBlendFuncSeparateEXT(0x%x, 0x%x, 0x%x, 0x%x);\n", sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_607)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_608)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_607)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_608)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
 {
    DISPATCH(BlendFuncSeparateEXT, (sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha), (F, "glBlendFuncSeparateINGR(0x%x, 0x%x, 0x%x, 0x%x);\n", sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha));
 }
@@ -4789,65 +4794,65 @@ KEYWORD1 void KEYWORD2 NAME(WindowPos4svMESA)(const GLshort * v)
    DISPATCH(WindowPos4svMESA, (v), (F, "glWindowPos4svMESA(%p);\n", (const void *) v));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_648)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_649)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_648)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_649)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride)
 {
    DISPATCH(MultiModeDrawArraysIBM, (mode, first, count, primcount, modestride), (F, "glMultiModeDrawArraysIBM(%p, %p, %p, %d, %d);\n", (const void *) mode, (const void *) first, (const void *) count, primcount, modestride));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_649)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_650)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_649)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_650)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride)
 {
    DISPATCH(MultiModeDrawElementsIBM, (mode, count, type, indices, primcount, modestride), (F, "glMultiModeDrawElementsIBM(%p, %p, 0x%x, %p, %d, %d);\n", (const void *) mode, (const void *) count, type, (const void *) indices, primcount, modestride));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_650)(GLsizei n, const GLuint * fences);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_651)(GLsizei n, const GLuint * fences);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_650)(GLsizei n, const GLuint * fences)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_651)(GLsizei n, const GLuint * fences)
 {
    DISPATCH(DeleteFencesNV, (n, fences), (F, "glDeleteFencesNV(%d, %p);\n", n, (const void *) fences));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_651)(GLuint fence);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_652)(GLuint fence);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_651)(GLuint fence)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_652)(GLuint fence)
 {
    DISPATCH(FinishFenceNV, (fence), (F, "glFinishFenceNV(%d);\n", fence));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_652)(GLsizei n, GLuint * fences);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_653)(GLsizei n, GLuint * fences);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_652)(GLsizei n, GLuint * fences)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_653)(GLsizei n, GLuint * fences)
 {
    DISPATCH(GenFencesNV, (n, fences), (F, "glGenFencesNV(%d, %p);\n", n, (const void *) fences));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_653)(GLuint fence, GLenum pname, GLint * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_654)(GLuint fence, GLenum pname, GLint * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_653)(GLuint fence, GLenum pname, GLint * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_654)(GLuint fence, GLenum pname, GLint * params)
 {
    DISPATCH(GetFenceivNV, (fence, pname, params), (F, "glGetFenceivNV(%d, 0x%x, %p);\n", fence, pname, (const void *) params));
 }
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_654)(GLuint fence);
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_655)(GLuint fence);
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_654)(GLuint fence)
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_655)(GLuint fence)
 {
    RETURN_DISPATCH(IsFenceNV, (fence), (F, "glIsFenceNV(%d);\n", fence));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_655)(GLuint fence, GLenum condition);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_656)(GLuint fence, GLenum condition);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_655)(GLuint fence, GLenum condition)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_656)(GLuint fence, GLenum condition)
 {
    DISPATCH(SetFenceNV, (fence, condition), (F, "glSetFenceNV(%d, 0x%x);\n", fence, condition));
 }
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_656)(GLuint fence);
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_657)(GLuint fence);
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_656)(GLuint fence)
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_657)(GLuint fence)
 {
    RETURN_DISPATCH(TestFenceNV, (fence), (F, "glTestFenceNV(%d);\n", fence));
 }
@@ -5272,37 +5277,37 @@ KEYWORD1 void KEYWORD2 NAME(PointParameterivNV)(GLenum pname, const GLint * para
    DISPATCH(PointParameterivNV, (pname, params), (F, "glPointParameterivNV(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_733)(GLenum face);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_734)(GLenum face);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_733)(GLenum face)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_734)(GLenum face)
 {
    DISPATCH(ActiveStencilFaceEXT, (face), (F, "glActiveStencilFaceEXT(0x%x);\n", face));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_734)(GLuint array);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_735)(GLuint array);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_734)(GLuint array)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_735)(GLuint array)
 {
    DISPATCH(BindVertexArrayAPPLE, (array), (F, "glBindVertexArrayAPPLE(%d);\n", array));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_735)(GLsizei n, const GLuint * arrays);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_736)(GLsizei n, const GLuint * arrays);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_735)(GLsizei n, const GLuint * arrays)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_736)(GLsizei n, const GLuint * arrays)
 {
    DISPATCH(DeleteVertexArraysAPPLE, (n, arrays), (F, "glDeleteVertexArraysAPPLE(%d, %p);\n", n, (const void *) arrays));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_736)(GLsizei n, GLuint * arrays);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_737)(GLsizei n, GLuint * arrays);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_736)(GLsizei n, GLuint * arrays)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_737)(GLsizei n, GLuint * arrays)
 {
    DISPATCH(GenVertexArraysAPPLE, (n, arrays), (F, "glGenVertexArraysAPPLE(%d, %p);\n", n, (const void *) arrays));
 }
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_737)(GLuint array);
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_738)(GLuint array);
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_737)(GLuint array)
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_738)(GLuint array)
 {
    RETURN_DISPATCH(IsVertexArrayAPPLE, (array), (F, "glIsVertexArrayAPPLE(%d);\n", array));
 }
@@ -5337,9 +5342,9 @@ KEYWORD1 void KEYWORD2 NAME(ProgramNamedParameter4fvNV)(GLuint id, GLsizei len,
    DISPATCH(ProgramNamedParameter4fvNV, (id, len, name, v), (F, "glProgramNamedParameter4fvNV(%d, %d, %p, %p);\n", id, len, (const void *) name, (const void *) v));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_744)(GLclampd zmin, GLclampd zmax);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_745)(GLclampd zmin, GLclampd zmax);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_744)(GLclampd zmin, GLclampd zmax)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_745)(GLclampd zmin, GLclampd zmax)
 {
    DISPATCH(DepthBoundsEXT, (zmin, zmax), (F, "glDepthBoundsEXT(%f, %f);\n", zmin, zmax));
 }
@@ -5349,141 +5354,236 @@ KEYWORD1 void KEYWORD2 NAME(BlendEquationSeparate)(GLenum modeRGB, GLenum modeA)
    DISPATCH(BlendEquationSeparateEXT, (modeRGB, modeA), (F, "glBlendEquationSeparate(0x%x, 0x%x);\n", modeRGB, modeA));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_745)(GLenum modeRGB, GLenum modeA);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_746)(GLenum modeRGB, GLenum modeA);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_745)(GLenum modeRGB, GLenum modeA)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_746)(GLenum modeRGB, GLenum modeA)
 {
    DISPATCH(BlendEquationSeparateEXT, (modeRGB, modeA), (F, "glBlendEquationSeparateEXT(0x%x, 0x%x);\n", modeRGB, modeA));
 }
 
+KEYWORD1 void KEYWORD2 NAME(BindFramebuffer)(GLenum target, GLuint framebuffer)
+{
+   DISPATCH(BindFramebufferEXT, (target, framebuffer), (F, "glBindFramebuffer(0x%x, %d);\n", target, framebuffer));
+}
+
 KEYWORD1 void KEYWORD2 NAME(BindFramebufferEXT)(GLenum target, GLuint framebuffer)
 {
    DISPATCH(BindFramebufferEXT, (target, framebuffer), (F, "glBindFramebufferEXT(0x%x, %d);\n", target, framebuffer));
 }
 
+KEYWORD1 void KEYWORD2 NAME(BindRenderbuffer)(GLenum target, GLuint renderbuffer)
+{
+   DISPATCH(BindRenderbufferEXT, (target, renderbuffer), (F, "glBindRenderbuffer(0x%x, %d);\n", target, renderbuffer));
+}
+
 KEYWORD1 void KEYWORD2 NAME(BindRenderbufferEXT)(GLenum target, GLuint renderbuffer)
 {
    DISPATCH(BindRenderbufferEXT, (target, renderbuffer), (F, "glBindRenderbufferEXT(0x%x, %d);\n", target, renderbuffer));
 }
 
+KEYWORD1 GLenum KEYWORD2 NAME(CheckFramebufferStatus)(GLenum target)
+{
+   RETURN_DISPATCH(CheckFramebufferStatusEXT, (target), (F, "glCheckFramebufferStatus(0x%x);\n", target));
+}
+
 KEYWORD1 GLenum KEYWORD2 NAME(CheckFramebufferStatusEXT)(GLenum target)
 {
    RETURN_DISPATCH(CheckFramebufferStatusEXT, (target), (F, "glCheckFramebufferStatusEXT(0x%x);\n", target));
 }
 
+KEYWORD1 void KEYWORD2 NAME(DeleteFramebuffers)(GLsizei n, const GLuint * framebuffers)
+{
+   DISPATCH(DeleteFramebuffersEXT, (n, framebuffers), (F, "glDeleteFramebuffers(%d, %p);\n", n, (const void *) framebuffers));
+}
+
 KEYWORD1 void KEYWORD2 NAME(DeleteFramebuffersEXT)(GLsizei n, const GLuint * framebuffers)
 {
    DISPATCH(DeleteFramebuffersEXT, (n, framebuffers), (F, "glDeleteFramebuffersEXT(%d, %p);\n", n, (const void *) framebuffers));
 }
 
+KEYWORD1 void KEYWORD2 NAME(DeleteRenderbuffers)(GLsizei n, const GLuint * renderbuffers)
+{
+   DISPATCH(DeleteRenderbuffersEXT, (n, renderbuffers), (F, "glDeleteRenderbuffers(%d, %p);\n", n, (const void *) renderbuffers));
+}
+
 KEYWORD1 void KEYWORD2 NAME(DeleteRenderbuffersEXT)(GLsizei n, const GLuint * renderbuffers)
 {
    DISPATCH(DeleteRenderbuffersEXT, (n, renderbuffers), (F, "glDeleteRenderbuffersEXT(%d, %p);\n", n, (const void *) renderbuffers));
 }
 
+KEYWORD1 void KEYWORD2 NAME(FramebufferRenderbuffer)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
+{
+   DISPATCH(FramebufferRenderbufferEXT, (target, attachment, renderbuffertarget, renderbuffer), (F, "glFramebufferRenderbuffer(0x%x, 0x%x, 0x%x, %d);\n", target, attachment, renderbuffertarget, renderbuffer));
+}
+
 KEYWORD1 void KEYWORD2 NAME(FramebufferRenderbufferEXT)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
 {
    DISPATCH(FramebufferRenderbufferEXT, (target, attachment, renderbuffertarget, renderbuffer), (F, "glFramebufferRenderbufferEXT(0x%x, 0x%x, 0x%x, %d);\n", target, attachment, renderbuffertarget, renderbuffer));
 }
 
+KEYWORD1 void KEYWORD2 NAME(FramebufferTexture1D)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
+{
+   DISPATCH(FramebufferTexture1DEXT, (target, attachment, textarget, texture, level), (F, "glFramebufferTexture1D(0x%x, 0x%x, 0x%x, %d, %d);\n", target, attachment, textarget, texture, level));
+}
+
 KEYWORD1 void KEYWORD2 NAME(FramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
    DISPATCH(FramebufferTexture1DEXT, (target, attachment, textarget, texture, level), (F, "glFramebufferTexture1DEXT(0x%x, 0x%x, 0x%x, %d, %d);\n", target, attachment, textarget, texture, level));
 }
 
+KEYWORD1 void KEYWORD2 NAME(FramebufferTexture2D)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
+{
+   DISPATCH(FramebufferTexture2DEXT, (target, attachment, textarget, texture, level), (F, "glFramebufferTexture2D(0x%x, 0x%x, 0x%x, %d, %d);\n", target, attachment, textarget, texture, level));
+}
+
 KEYWORD1 void KEYWORD2 NAME(FramebufferTexture2DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
    DISPATCH(FramebufferTexture2DEXT, (target, attachment, textarget, texture, level), (F, "glFramebufferTexture2DEXT(0x%x, 0x%x, 0x%x, %d, %d);\n", target, attachment, textarget, texture, level));
 }
 
+KEYWORD1 void KEYWORD2 NAME(FramebufferTexture3D)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset)
+{
+   DISPATCH(FramebufferTexture3DEXT, (target, attachment, textarget, texture, level, zoffset), (F, "glFramebufferTexture3D(0x%x, 0x%x, 0x%x, %d, %d, %d);\n", target, attachment, textarget, texture, level, zoffset));
+}
+
 KEYWORD1 void KEYWORD2 NAME(FramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset)
 {
    DISPATCH(FramebufferTexture3DEXT, (target, attachment, textarget, texture, level, zoffset), (F, "glFramebufferTexture3DEXT(0x%x, 0x%x, 0x%x, %d, %d, %d);\n", target, attachment, textarget, texture, level, zoffset));
 }
 
+KEYWORD1 void KEYWORD2 NAME(GenFramebuffers)(GLsizei n, GLuint * framebuffers)
+{
+   DISPATCH(GenFramebuffersEXT, (n, framebuffers), (F, "glGenFramebuffers(%d, %p);\n", n, (const void *) framebuffers));
+}
+
 KEYWORD1 void KEYWORD2 NAME(GenFramebuffersEXT)(GLsizei n, GLuint * framebuffers)
 {
    DISPATCH(GenFramebuffersEXT, (n, framebuffers), (F, "glGenFramebuffersEXT(%d, %p);\n", n, (const void *) framebuffers));
 }
 
+KEYWORD1 void KEYWORD2 NAME(GenRenderbuffers)(GLsizei n, GLuint * renderbuffers)
+{
+   DISPATCH(GenRenderbuffersEXT, (n, renderbuffers), (F, "glGenRenderbuffers(%d, %p);\n", n, (const void *) renderbuffers));
+}
+
 KEYWORD1 void KEYWORD2 NAME(GenRenderbuffersEXT)(GLsizei n, GLuint * renderbuffers)
 {
    DISPATCH(GenRenderbuffersEXT, (n, renderbuffers), (F, "glGenRenderbuffersEXT(%d, %p);\n", n, (const void *) renderbuffers));
 }
 
+KEYWORD1 void KEYWORD2 NAME(GenerateMipmap)(GLenum target)
+{
+   DISPATCH(GenerateMipmapEXT, (target), (F, "glGenerateMipmap(0x%x);\n", target));
+}
+
 KEYWORD1 void KEYWORD2 NAME(GenerateMipmapEXT)(GLenum target)
 {
    DISPATCH(GenerateMipmapEXT, (target), (F, "glGenerateMipmapEXT(0x%x);\n", target));
 }
 
+KEYWORD1 void KEYWORD2 NAME(GetFramebufferAttachmentParameteriv)(GLenum target, GLenum attachment, GLenum pname, GLint * params)
+{
+   DISPATCH(GetFramebufferAttachmentParameterivEXT, (target, attachment, pname, params), (F, "glGetFramebufferAttachmentParameteriv(0x%x, 0x%x, 0x%x, %p);\n", target, attachment, pname, (const void *) params));
+}
+
 KEYWORD1 void KEYWORD2 NAME(GetFramebufferAttachmentParameterivEXT)(GLenum target, GLenum attachment, GLenum pname, GLint * params)
 {
    DISPATCH(GetFramebufferAttachmentParameterivEXT, (target, attachment, pname, params), (F, "glGetFramebufferAttachmentParameterivEXT(0x%x, 0x%x, 0x%x, %p);\n", target, attachment, pname, (const void *) params));
 }
 
+KEYWORD1 void KEYWORD2 NAME(GetRenderbufferParameteriv)(GLenum target, GLenum pname, GLint * params)
+{
+   DISPATCH(GetRenderbufferParameterivEXT, (target, pname, params), (F, "glGetRenderbufferParameteriv(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
 KEYWORD1 void KEYWORD2 NAME(GetRenderbufferParameterivEXT)(GLenum target, GLenum pname, GLint * params)
 {
    DISPATCH(GetRenderbufferParameterivEXT, (target, pname, params), (F, "glGetRenderbufferParameterivEXT(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
 }
 
+KEYWORD1 GLboolean KEYWORD2 NAME(IsFramebuffer)(GLuint framebuffer)
+{
+   RETURN_DISPATCH(IsFramebufferEXT, (framebuffer), (F, "glIsFramebuffer(%d);\n", framebuffer));
+}
+
 KEYWORD1 GLboolean KEYWORD2 NAME(IsFramebufferEXT)(GLuint framebuffer)
 {
    RETURN_DISPATCH(IsFramebufferEXT, (framebuffer), (F, "glIsFramebufferEXT(%d);\n", framebuffer));
 }
 
+KEYWORD1 GLboolean KEYWORD2 NAME(IsRenderbuffer)(GLuint renderbuffer)
+{
+   RETURN_DISPATCH(IsRenderbufferEXT, (renderbuffer), (F, "glIsRenderbuffer(%d);\n", renderbuffer));
+}
+
 KEYWORD1 GLboolean KEYWORD2 NAME(IsRenderbufferEXT)(GLuint renderbuffer)
 {
    RETURN_DISPATCH(IsRenderbufferEXT, (renderbuffer), (F, "glIsRenderbufferEXT(%d);\n", renderbuffer));
 }
 
+KEYWORD1 void KEYWORD2 NAME(RenderbufferStorage)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)
+{
+   DISPATCH(RenderbufferStorageEXT, (target, internalformat, width, height), (F, "glRenderbufferStorage(0x%x, 0x%x, %d, %d);\n", target, internalformat, width, height));
+}
+
 KEYWORD1 void KEYWORD2 NAME(RenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)
 {
    DISPATCH(RenderbufferStorageEXT, (target, internalformat, width, height), (F, "glRenderbufferStorageEXT(0x%x, 0x%x, %d, %d);\n", target, internalformat, width, height));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_763)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+KEYWORD1 void KEYWORD2 NAME(BlitFramebuffer)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
+{
+   DISPATCH(BlitFramebufferEXT, (srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter), (F, "glBlitFramebuffer(%d, %d, %d, %d, %d, %d, %d, %d, %d, 0x%x);\n", srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter));
+}
+
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_764)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_763)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_764)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
 {
    DISPATCH(BlitFramebufferEXT, (srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter), (F, "glBlitFramebufferEXT(%d, %d, %d, %d, %d, %d, %d, %d, %d, 0x%x);\n", srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter));
 }
 
+KEYWORD1 void KEYWORD2 NAME(FramebufferTextureLayer)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)
+{
+   DISPATCH(FramebufferTextureLayerEXT, (target, attachment, texture, level, layer), (F, "glFramebufferTextureLayer(0x%x, 0x%x, %d, %d, %d);\n", target, attachment, texture, level, layer));
+}
+
 KEYWORD1 void KEYWORD2 NAME(FramebufferTextureLayerEXT)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)
 {
    DISPATCH(FramebufferTextureLayerEXT, (target, attachment, texture, level, layer), (F, "glFramebufferTextureLayerEXT(0x%x, 0x%x, %d, %d, %d);\n", target, attachment, texture, level, layer));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_765)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_766)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_765)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_766)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask)
 {
    DISPATCH(StencilFuncSeparateATI, (frontfunc, backfunc, ref, mask), (F, "glStencilFuncSeparateATI(0x%x, 0x%x, %d, %d);\n", frontfunc, backfunc, ref, mask));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_766)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_767)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_766)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_767)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
 {
    DISPATCH(ProgramEnvParameters4fvEXT, (target, index, count, params), (F, "glProgramEnvParameters4fvEXT(0x%x, %d, %d, %p);\n", target, index, count, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_767)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_768)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_767)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_768)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
 {
    DISPATCH(ProgramLocalParameters4fvEXT, (target, index, count, params), (F, "glProgramLocalParameters4fvEXT(0x%x, %d, %d, %p);\n", target, index, count, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_768)(GLuint id, GLenum pname, GLint64EXT * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_769)(GLuint id, GLenum pname, GLint64EXT * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_768)(GLuint id, GLenum pname, GLint64EXT * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_769)(GLuint id, GLenum pname, GLint64EXT * params)
 {
    DISPATCH(GetQueryObjecti64vEXT, (id, pname, params), (F, "glGetQueryObjecti64vEXT(%d, 0x%x, %p);\n", id, pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_769)(GLuint id, GLenum pname, GLuint64EXT * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_770)(GLuint id, GLenum pname, GLuint64EXT * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_769)(GLuint id, GLenum pname, GLuint64EXT * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_770)(GLuint id, GLenum pname, GLuint64EXT * params)
 {
    DISPATCH(GetQueryObjectui64vEXT, (id, pname, params), (F, "glGetQueryObjectui64vEXT(%d, 0x%x, %p);\n", id, pname, (const void *) params));
 }
@@ -6063,8 +6163,8 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(GetActiveAttribARB),
    TABLE_ENTRY(GetAttribLocationARB),
    TABLE_ENTRY(DrawBuffersARB),
+   TABLE_ENTRY(RenderbufferStorageMultisample),
    TABLE_ENTRY(PolygonOffsetEXT),
-   TABLE_ENTRY(_dispatch_stub_562),
    TABLE_ENTRY(_dispatch_stub_563),
    TABLE_ENTRY(_dispatch_stub_564),
    TABLE_ENTRY(_dispatch_stub_565),
@@ -6072,6 +6172,7 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(_dispatch_stub_567),
    TABLE_ENTRY(_dispatch_stub_568),
    TABLE_ENTRY(_dispatch_stub_569),
+   TABLE_ENTRY(_dispatch_stub_570),
    TABLE_ENTRY(ColorPointerEXT),
    TABLE_ENTRY(EdgeFlagPointerEXT),
    TABLE_ENTRY(IndexPointerEXT),
@@ -6082,8 +6183,8 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(PointParameterfvEXT),
    TABLE_ENTRY(LockArraysEXT),
    TABLE_ENTRY(UnlockArraysEXT),
-   TABLE_ENTRY(_dispatch_stub_580),
    TABLE_ENTRY(_dispatch_stub_581),
+   TABLE_ENTRY(_dispatch_stub_582),
    TABLE_ENTRY(SecondaryColor3bEXT),
    TABLE_ENTRY(SecondaryColor3bvEXT),
    TABLE_ENTRY(SecondaryColor3dEXT),
@@ -6108,7 +6209,7 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(FogCoorddvEXT),
    TABLE_ENTRY(FogCoordfEXT),
    TABLE_ENTRY(FogCoordfvEXT),
-   TABLE_ENTRY(_dispatch_stub_606),
+   TABLE_ENTRY(_dispatch_stub_607),
    TABLE_ENTRY(BlendFuncSeparateEXT),
    TABLE_ENTRY(FlushVertexArrayRangeNV),
    TABLE_ENTRY(VertexArrayRangeNV),
@@ -6150,7 +6251,6 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(WindowPos4ivMESA),
    TABLE_ENTRY(WindowPos4sMESA),
    TABLE_ENTRY(WindowPos4svMESA),
-   TABLE_ENTRY(_dispatch_stub_648),
    TABLE_ENTRY(_dispatch_stub_649),
    TABLE_ENTRY(_dispatch_stub_650),
    TABLE_ENTRY(_dispatch_stub_651),
@@ -6159,6 +6259,7 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(_dispatch_stub_654),
    TABLE_ENTRY(_dispatch_stub_655),
    TABLE_ENTRY(_dispatch_stub_656),
+   TABLE_ENTRY(_dispatch_stub_657),
    TABLE_ENTRY(AreProgramsResidentNV),
    TABLE_ENTRY(BindProgramNV),
    TABLE_ENTRY(DeleteProgramsNV),
@@ -6235,19 +6336,19 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(SetFragmentShaderConstantATI),
    TABLE_ENTRY(PointParameteriNV),
    TABLE_ENTRY(PointParameterivNV),
-   TABLE_ENTRY(_dispatch_stub_733),
    TABLE_ENTRY(_dispatch_stub_734),
    TABLE_ENTRY(_dispatch_stub_735),
    TABLE_ENTRY(_dispatch_stub_736),
    TABLE_ENTRY(_dispatch_stub_737),
+   TABLE_ENTRY(_dispatch_stub_738),
    TABLE_ENTRY(GetProgramNamedParameterdvNV),
    TABLE_ENTRY(GetProgramNamedParameterfvNV),
    TABLE_ENTRY(ProgramNamedParameter4dNV),
    TABLE_ENTRY(ProgramNamedParameter4dvNV),
    TABLE_ENTRY(ProgramNamedParameter4fNV),
    TABLE_ENTRY(ProgramNamedParameter4fvNV),
-   TABLE_ENTRY(_dispatch_stub_744),
    TABLE_ENTRY(_dispatch_stub_745),
+   TABLE_ENTRY(_dispatch_stub_746),
    TABLE_ENTRY(BindFramebufferEXT),
    TABLE_ENTRY(BindRenderbufferEXT),
    TABLE_ENTRY(CheckFramebufferStatusEXT),
@@ -6265,13 +6366,13 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(IsFramebufferEXT),
    TABLE_ENTRY(IsRenderbufferEXT),
    TABLE_ENTRY(RenderbufferStorageEXT),
-   TABLE_ENTRY(_dispatch_stub_763),
+   TABLE_ENTRY(_dispatch_stub_764),
    TABLE_ENTRY(FramebufferTextureLayerEXT),
-   TABLE_ENTRY(_dispatch_stub_765),
    TABLE_ENTRY(_dispatch_stub_766),
    TABLE_ENTRY(_dispatch_stub_767),
    TABLE_ENTRY(_dispatch_stub_768),
    TABLE_ENTRY(_dispatch_stub_769),
+   TABLE_ENTRY(_dispatch_stub_770),
    /* A whole bunch of no-op functions.  These might be called
     * when someone tries to call a dynamically-registered
     * extension function without a current rendering context.
@@ -6639,6 +6740,25 @@ static _glapi_proc UNUSED_TABLE_NAME[] = {
    TABLE_ENTRY(PointParameteri),
    TABLE_ENTRY(PointParameteriv),
    TABLE_ENTRY(BlendEquationSeparate),
+   TABLE_ENTRY(BindFramebuffer),
+   TABLE_ENTRY(BindRenderbuffer),
+   TABLE_ENTRY(CheckFramebufferStatus),
+   TABLE_ENTRY(DeleteFramebuffers),
+   TABLE_ENTRY(DeleteRenderbuffers),
+   TABLE_ENTRY(FramebufferRenderbuffer),
+   TABLE_ENTRY(FramebufferTexture1D),
+   TABLE_ENTRY(FramebufferTexture2D),
+   TABLE_ENTRY(FramebufferTexture3D),
+   TABLE_ENTRY(GenFramebuffers),
+   TABLE_ENTRY(GenRenderbuffers),
+   TABLE_ENTRY(GenerateMipmap),
+   TABLE_ENTRY(GetFramebufferAttachmentParameteriv),
+   TABLE_ENTRY(GetRenderbufferParameteriv),
+   TABLE_ENTRY(IsFramebuffer),
+   TABLE_ENTRY(IsRenderbuffer),
+   TABLE_ENTRY(RenderbufferStorage),
+   TABLE_ENTRY(BlitFramebuffer),
+   TABLE_ENTRY(FramebufferTextureLayer),
 };
 #endif /*UNUSED_TABLE_NAME*/
 
diff --git a/src/mesa/glapi/glprocs.h b/src/mesa/glapi/glprocs.h
index 5a99d505ec..ba652bc3c6 100644
--- a/src/mesa/glapi/glprocs.h
+++ b/src/mesa/glapi/glprocs.h
@@ -613,6 +613,7 @@ static const char gl_string_table[] =
     "glGetActiveAttribARB\0"
     "glGetAttribLocationARB\0"
     "glDrawBuffersARB\0"
+    "glRenderbufferStorageMultisample\0"
     "glPolygonOffsetEXT\0"
     "glGetPixelTexGenParameterfvSGIS\0"
     "glGetPixelTexGenParameterivSGIS\0"
@@ -1101,6 +1102,25 @@ static const char gl_string_table[] =
     "glPointParameteriv\0"
     "glBlendEquationSeparate\0"
     "glBlendEquationSeparateATI\0"
+    "glBindFramebuffer\0"
+    "glBindRenderbuffer\0"
+    "glCheckFramebufferStatus\0"
+    "glDeleteFramebuffers\0"
+    "glDeleteRenderbuffers\0"
+    "glFramebufferRenderbuffer\0"
+    "glFramebufferTexture1D\0"
+    "glFramebufferTexture2D\0"
+    "glFramebufferTexture3D\0"
+    "glGenFramebuffers\0"
+    "glGenRenderbuffers\0"
+    "glGenerateMipmap\0"
+    "glGetFramebufferAttachmentParameteriv\0"
+    "glGetRenderbufferParameteriv\0"
+    "glIsFramebuffer\0"
+    "glIsRenderbuffer\0"
+    "glRenderbufferStorage\0"
+    "glBlitFramebuffer\0"
+    "glFramebufferTextureLayer\0"
     ;
 
 
@@ -1118,7 +1138,6 @@ static const char gl_string_table[] =
 #define gl_dispatch_stub_364 mgl_dispatch_stub_364
 #define gl_dispatch_stub_365 mgl_dispatch_stub_365
 #define gl_dispatch_stub_366 mgl_dispatch_stub_366
-#define gl_dispatch_stub_562 mgl_dispatch_stub_562
 #define gl_dispatch_stub_563 mgl_dispatch_stub_563
 #define gl_dispatch_stub_564 mgl_dispatch_stub_564
 #define gl_dispatch_stub_565 mgl_dispatch_stub_565
@@ -1126,10 +1145,10 @@ static const char gl_string_table[] =
 #define gl_dispatch_stub_567 mgl_dispatch_stub_567
 #define gl_dispatch_stub_568 mgl_dispatch_stub_568
 #define gl_dispatch_stub_569 mgl_dispatch_stub_569
-#define gl_dispatch_stub_580 mgl_dispatch_stub_580
+#define gl_dispatch_stub_570 mgl_dispatch_stub_570
 #define gl_dispatch_stub_581 mgl_dispatch_stub_581
-#define gl_dispatch_stub_606 mgl_dispatch_stub_606
-#define gl_dispatch_stub_648 mgl_dispatch_stub_648
+#define gl_dispatch_stub_582 mgl_dispatch_stub_582
+#define gl_dispatch_stub_607 mgl_dispatch_stub_607
 #define gl_dispatch_stub_649 mgl_dispatch_stub_649
 #define gl_dispatch_stub_650 mgl_dispatch_stub_650
 #define gl_dispatch_stub_651 mgl_dispatch_stub_651
@@ -1138,19 +1157,20 @@ static const char gl_string_table[] =
 #define gl_dispatch_stub_654 mgl_dispatch_stub_654
 #define gl_dispatch_stub_655 mgl_dispatch_stub_655
 #define gl_dispatch_stub_656 mgl_dispatch_stub_656
-#define gl_dispatch_stub_733 mgl_dispatch_stub_733
+#define gl_dispatch_stub_657 mgl_dispatch_stub_657
 #define gl_dispatch_stub_734 mgl_dispatch_stub_734
 #define gl_dispatch_stub_735 mgl_dispatch_stub_735
 #define gl_dispatch_stub_736 mgl_dispatch_stub_736
 #define gl_dispatch_stub_737 mgl_dispatch_stub_737
-#define gl_dispatch_stub_744 mgl_dispatch_stub_744
+#define gl_dispatch_stub_738 mgl_dispatch_stub_738
 #define gl_dispatch_stub_745 mgl_dispatch_stub_745
-#define gl_dispatch_stub_763 mgl_dispatch_stub_763
-#define gl_dispatch_stub_765 mgl_dispatch_stub_765
+#define gl_dispatch_stub_746 mgl_dispatch_stub_746
+#define gl_dispatch_stub_764 mgl_dispatch_stub_764
 #define gl_dispatch_stub_766 mgl_dispatch_stub_766
 #define gl_dispatch_stub_767 mgl_dispatch_stub_767
 #define gl_dispatch_stub_768 mgl_dispatch_stub_768
 #define gl_dispatch_stub_769 mgl_dispatch_stub_769
+#define gl_dispatch_stub_770 mgl_dispatch_stub_770
 #endif /* USE_MGL_NAMESPACE */
 
 
@@ -1169,7 +1189,6 @@ extern void gl_dispatch_stub_363(void);
 extern void gl_dispatch_stub_364(void);
 extern void gl_dispatch_stub_365(void);
 extern void gl_dispatch_stub_366(void);
-extern void gl_dispatch_stub_562(void);
 extern void gl_dispatch_stub_563(void);
 extern void gl_dispatch_stub_564(void);
 extern void gl_dispatch_stub_565(void);
@@ -1177,10 +1196,10 @@ extern void gl_dispatch_stub_566(void);
 extern void gl_dispatch_stub_567(void);
 extern void gl_dispatch_stub_568(void);
 extern void gl_dispatch_stub_569(void);
-extern void gl_dispatch_stub_580(void);
+extern void gl_dispatch_stub_570(void);
 extern void gl_dispatch_stub_581(void);
-extern void gl_dispatch_stub_606(void);
-extern void gl_dispatch_stub_648(void);
+extern void gl_dispatch_stub_582(void);
+extern void gl_dispatch_stub_607(void);
 extern void gl_dispatch_stub_649(void);
 extern void gl_dispatch_stub_650(void);
 extern void gl_dispatch_stub_651(void);
@@ -1189,19 +1208,20 @@ extern void gl_dispatch_stub_653(void);
 extern void gl_dispatch_stub_654(void);
 extern void gl_dispatch_stub_655(void);
 extern void gl_dispatch_stub_656(void);
-extern void gl_dispatch_stub_733(void);
+extern void gl_dispatch_stub_657(void);
 extern void gl_dispatch_stub_734(void);
 extern void gl_dispatch_stub_735(void);
 extern void gl_dispatch_stub_736(void);
 extern void gl_dispatch_stub_737(void);
-extern void gl_dispatch_stub_744(void);
+extern void gl_dispatch_stub_738(void);
 extern void gl_dispatch_stub_745(void);
-extern void gl_dispatch_stub_763(void);
-extern void gl_dispatch_stub_765(void);
+extern void gl_dispatch_stub_746(void);
+extern void gl_dispatch_stub_764(void);
 extern void gl_dispatch_stub_766(void);
 extern void gl_dispatch_stub_767(void);
 extern void gl_dispatch_stub_768(void);
 extern void gl_dispatch_stub_769(void);
+extern void gl_dispatch_stub_770(void);
 #endif /* defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING) */
 
 static const glprocs_table_t static_functions[] = {
@@ -1766,494 +1786,514 @@ static const glprocs_table_t static_functions[] = {
     NAME_FUNC_OFFSET( 8890, glGetActiveAttribARB, glGetActiveAttribARB, NULL, _gloffset_GetActiveAttribARB),
     NAME_FUNC_OFFSET( 8911, glGetAttribLocationARB, glGetAttribLocationARB, NULL, _gloffset_GetAttribLocationARB),
     NAME_FUNC_OFFSET( 8934, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
-    NAME_FUNC_OFFSET( 8951, glPolygonOffsetEXT, glPolygonOffsetEXT, NULL, _gloffset_PolygonOffsetEXT),
-    NAME_FUNC_OFFSET( 8970, gl_dispatch_stub_562, gl_dispatch_stub_562, NULL, _gloffset_GetPixelTexGenParameterfvSGIS),
-    NAME_FUNC_OFFSET( 9002, gl_dispatch_stub_563, gl_dispatch_stub_563, NULL, _gloffset_GetPixelTexGenParameterivSGIS),
-    NAME_FUNC_OFFSET( 9034, gl_dispatch_stub_564, gl_dispatch_stub_564, NULL, _gloffset_PixelTexGenParameterfSGIS),
-    NAME_FUNC_OFFSET( 9062, gl_dispatch_stub_565, gl_dispatch_stub_565, NULL, _gloffset_PixelTexGenParameterfvSGIS),
-    NAME_FUNC_OFFSET( 9091, gl_dispatch_stub_566, gl_dispatch_stub_566, NULL, _gloffset_PixelTexGenParameteriSGIS),
-    NAME_FUNC_OFFSET( 9119, gl_dispatch_stub_567, gl_dispatch_stub_567, NULL, _gloffset_PixelTexGenParameterivSGIS),
-    NAME_FUNC_OFFSET( 9148, gl_dispatch_stub_568, gl_dispatch_stub_568, NULL, _gloffset_SampleMaskSGIS),
-    NAME_FUNC_OFFSET( 9165, gl_dispatch_stub_569, gl_dispatch_stub_569, NULL, _gloffset_SamplePatternSGIS),
-    NAME_FUNC_OFFSET( 9185, glColorPointerEXT, glColorPointerEXT, NULL, _gloffset_ColorPointerEXT),
-    NAME_FUNC_OFFSET( 9203, glEdgeFlagPointerEXT, glEdgeFlagPointerEXT, NULL, _gloffset_EdgeFlagPointerEXT),
-    NAME_FUNC_OFFSET( 9224, glIndexPointerEXT, glIndexPointerEXT, NULL, _gloffset_IndexPointerEXT),
-    NAME_FUNC_OFFSET( 9242, glNormalPointerEXT, glNormalPointerEXT, NULL, _gloffset_NormalPointerEXT),
-    NAME_FUNC_OFFSET( 9261, glTexCoordPointerEXT, glTexCoordPointerEXT, NULL, _gloffset_TexCoordPointerEXT),
-    NAME_FUNC_OFFSET( 9282, glVertexPointerEXT, glVertexPointerEXT, NULL, _gloffset_VertexPointerEXT),
-    NAME_FUNC_OFFSET( 9301, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET( 9322, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET( 9344, glLockArraysEXT, glLockArraysEXT, NULL, _gloffset_LockArraysEXT),
-    NAME_FUNC_OFFSET( 9360, glUnlockArraysEXT, glUnlockArraysEXT, NULL, _gloffset_UnlockArraysEXT),
-    NAME_FUNC_OFFSET( 9378, gl_dispatch_stub_580, gl_dispatch_stub_580, NULL, _gloffset_CullParameterdvEXT),
-    NAME_FUNC_OFFSET( 9399, gl_dispatch_stub_581, gl_dispatch_stub_581, NULL, _gloffset_CullParameterfvEXT),
-    NAME_FUNC_OFFSET( 9420, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
-    NAME_FUNC_OFFSET( 9442, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
-    NAME_FUNC_OFFSET( 9465, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
-    NAME_FUNC_OFFSET( 9487, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
-    NAME_FUNC_OFFSET( 9510, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
-    NAME_FUNC_OFFSET( 9532, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
-    NAME_FUNC_OFFSET( 9555, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
-    NAME_FUNC_OFFSET( 9577, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
-    NAME_FUNC_OFFSET( 9600, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
-    NAME_FUNC_OFFSET( 9622, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
-    NAME_FUNC_OFFSET( 9645, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
-    NAME_FUNC_OFFSET( 9668, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
-    NAME_FUNC_OFFSET( 9692, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
-    NAME_FUNC_OFFSET( 9715, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
-    NAME_FUNC_OFFSET( 9739, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
-    NAME_FUNC_OFFSET( 9762, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
-    NAME_FUNC_OFFSET( 9786, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
-    NAME_FUNC_OFFSET( 9813, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
-    NAME_FUNC_OFFSET( 9834, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
-    NAME_FUNC_OFFSET( 9857, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
-    NAME_FUNC_OFFSET( 9878, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
-    NAME_FUNC_OFFSET( 9893, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
-    NAME_FUNC_OFFSET( 9909, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
-    NAME_FUNC_OFFSET( 9924, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
-    NAME_FUNC_OFFSET( 9940, gl_dispatch_stub_606, gl_dispatch_stub_606, NULL, _gloffset_PixelTexGenSGIX),
-    NAME_FUNC_OFFSET( 9958, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
-    NAME_FUNC_OFFSET( 9981, glFlushVertexArrayRangeNV, glFlushVertexArrayRangeNV, NULL, _gloffset_FlushVertexArrayRangeNV),
-    NAME_FUNC_OFFSET(10007, glVertexArrayRangeNV, glVertexArrayRangeNV, NULL, _gloffset_VertexArrayRangeNV),
-    NAME_FUNC_OFFSET(10028, glCombinerInputNV, glCombinerInputNV, NULL, _gloffset_CombinerInputNV),
-    NAME_FUNC_OFFSET(10046, glCombinerOutputNV, glCombinerOutputNV, NULL, _gloffset_CombinerOutputNV),
-    NAME_FUNC_OFFSET(10065, glCombinerParameterfNV, glCombinerParameterfNV, NULL, _gloffset_CombinerParameterfNV),
-    NAME_FUNC_OFFSET(10088, glCombinerParameterfvNV, glCombinerParameterfvNV, NULL, _gloffset_CombinerParameterfvNV),
-    NAME_FUNC_OFFSET(10112, glCombinerParameteriNV, glCombinerParameteriNV, NULL, _gloffset_CombinerParameteriNV),
-    NAME_FUNC_OFFSET(10135, glCombinerParameterivNV, glCombinerParameterivNV, NULL, _gloffset_CombinerParameterivNV),
-    NAME_FUNC_OFFSET(10159, glFinalCombinerInputNV, glFinalCombinerInputNV, NULL, _gloffset_FinalCombinerInputNV),
-    NAME_FUNC_OFFSET(10182, glGetCombinerInputParameterfvNV, glGetCombinerInputParameterfvNV, NULL, _gloffset_GetCombinerInputParameterfvNV),
-    NAME_FUNC_OFFSET(10214, glGetCombinerInputParameterivNV, glGetCombinerInputParameterivNV, NULL, _gloffset_GetCombinerInputParameterivNV),
-    NAME_FUNC_OFFSET(10246, glGetCombinerOutputParameterfvNV, glGetCombinerOutputParameterfvNV, NULL, _gloffset_GetCombinerOutputParameterfvNV),
-    NAME_FUNC_OFFSET(10279, glGetCombinerOutputParameterivNV, glGetCombinerOutputParameterivNV, NULL, _gloffset_GetCombinerOutputParameterivNV),
-    NAME_FUNC_OFFSET(10312, glGetFinalCombinerInputParameterfvNV, glGetFinalCombinerInputParameterfvNV, NULL, _gloffset_GetFinalCombinerInputParameterfvNV),
-    NAME_FUNC_OFFSET(10349, glGetFinalCombinerInputParameterivNV, glGetFinalCombinerInputParameterivNV, NULL, _gloffset_GetFinalCombinerInputParameterivNV),
-    NAME_FUNC_OFFSET(10386, glResizeBuffersMESA, glResizeBuffersMESA, NULL, _gloffset_ResizeBuffersMESA),
-    NAME_FUNC_OFFSET(10406, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
-    NAME_FUNC_OFFSET(10424, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
-    NAME_FUNC_OFFSET(10443, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
-    NAME_FUNC_OFFSET(10461, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
-    NAME_FUNC_OFFSET(10480, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
-    NAME_FUNC_OFFSET(10498, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
-    NAME_FUNC_OFFSET(10517, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
-    NAME_FUNC_OFFSET(10535, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
-    NAME_FUNC_OFFSET(10554, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
-    NAME_FUNC_OFFSET(10572, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
-    NAME_FUNC_OFFSET(10591, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
-    NAME_FUNC_OFFSET(10609, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
-    NAME_FUNC_OFFSET(10628, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
-    NAME_FUNC_OFFSET(10646, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
-    NAME_FUNC_OFFSET(10665, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
-    NAME_FUNC_OFFSET(10683, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
-    NAME_FUNC_OFFSET(10702, glWindowPos4dMESA, glWindowPos4dMESA, NULL, _gloffset_WindowPos4dMESA),
-    NAME_FUNC_OFFSET(10720, glWindowPos4dvMESA, glWindowPos4dvMESA, NULL, _gloffset_WindowPos4dvMESA),
-    NAME_FUNC_OFFSET(10739, glWindowPos4fMESA, glWindowPos4fMESA, NULL, _gloffset_WindowPos4fMESA),
-    NAME_FUNC_OFFSET(10757, glWindowPos4fvMESA, glWindowPos4fvMESA, NULL, _gloffset_WindowPos4fvMESA),
-    NAME_FUNC_OFFSET(10776, glWindowPos4iMESA, glWindowPos4iMESA, NULL, _gloffset_WindowPos4iMESA),
-    NAME_FUNC_OFFSET(10794, glWindowPos4ivMESA, glWindowPos4ivMESA, NULL, _gloffset_WindowPos4ivMESA),
-    NAME_FUNC_OFFSET(10813, glWindowPos4sMESA, glWindowPos4sMESA, NULL, _gloffset_WindowPos4sMESA),
-    NAME_FUNC_OFFSET(10831, glWindowPos4svMESA, glWindowPos4svMESA, NULL, _gloffset_WindowPos4svMESA),
-    NAME_FUNC_OFFSET(10850, gl_dispatch_stub_648, gl_dispatch_stub_648, NULL, _gloffset_MultiModeDrawArraysIBM),
-    NAME_FUNC_OFFSET(10875, gl_dispatch_stub_649, gl_dispatch_stub_649, NULL, _gloffset_MultiModeDrawElementsIBM),
-    NAME_FUNC_OFFSET(10902, gl_dispatch_stub_650, gl_dispatch_stub_650, NULL, _gloffset_DeleteFencesNV),
-    NAME_FUNC_OFFSET(10919, gl_dispatch_stub_651, gl_dispatch_stub_651, NULL, _gloffset_FinishFenceNV),
-    NAME_FUNC_OFFSET(10935, gl_dispatch_stub_652, gl_dispatch_stub_652, NULL, _gloffset_GenFencesNV),
-    NAME_FUNC_OFFSET(10949, gl_dispatch_stub_653, gl_dispatch_stub_653, NULL, _gloffset_GetFenceivNV),
-    NAME_FUNC_OFFSET(10964, gl_dispatch_stub_654, gl_dispatch_stub_654, NULL, _gloffset_IsFenceNV),
-    NAME_FUNC_OFFSET(10976, gl_dispatch_stub_655, gl_dispatch_stub_655, NULL, _gloffset_SetFenceNV),
-    NAME_FUNC_OFFSET(10989, gl_dispatch_stub_656, gl_dispatch_stub_656, NULL, _gloffset_TestFenceNV),
-    NAME_FUNC_OFFSET(11003, glAreProgramsResidentNV, glAreProgramsResidentNV, NULL, _gloffset_AreProgramsResidentNV),
-    NAME_FUNC_OFFSET(11027, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
-    NAME_FUNC_OFFSET(11043, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
-    NAME_FUNC_OFFSET(11062, glExecuteProgramNV, glExecuteProgramNV, NULL, _gloffset_ExecuteProgramNV),
-    NAME_FUNC_OFFSET(11081, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
-    NAME_FUNC_OFFSET(11097, glGetProgramParameterdvNV, glGetProgramParameterdvNV, NULL, _gloffset_GetProgramParameterdvNV),
-    NAME_FUNC_OFFSET(11123, glGetProgramParameterfvNV, glGetProgramParameterfvNV, NULL, _gloffset_GetProgramParameterfvNV),
-    NAME_FUNC_OFFSET(11149, glGetProgramStringNV, glGetProgramStringNV, NULL, _gloffset_GetProgramStringNV),
-    NAME_FUNC_OFFSET(11170, glGetProgramivNV, glGetProgramivNV, NULL, _gloffset_GetProgramivNV),
-    NAME_FUNC_OFFSET(11187, glGetTrackMatrixivNV, glGetTrackMatrixivNV, NULL, _gloffset_GetTrackMatrixivNV),
-    NAME_FUNC_OFFSET(11208, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
-    NAME_FUNC_OFFSET(11236, glGetVertexAttribdvNV, glGetVertexAttribdvNV, NULL, _gloffset_GetVertexAttribdvNV),
-    NAME_FUNC_OFFSET(11258, glGetVertexAttribfvNV, glGetVertexAttribfvNV, NULL, _gloffset_GetVertexAttribfvNV),
-    NAME_FUNC_OFFSET(11280, glGetVertexAttribivNV, glGetVertexAttribivNV, NULL, _gloffset_GetVertexAttribivNV),
-    NAME_FUNC_OFFSET(11302, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
-    NAME_FUNC_OFFSET(11316, glLoadProgramNV, glLoadProgramNV, NULL, _gloffset_LoadProgramNV),
-    NAME_FUNC_OFFSET(11332, glProgramParameters4dvNV, glProgramParameters4dvNV, NULL, _gloffset_ProgramParameters4dvNV),
-    NAME_FUNC_OFFSET(11357, glProgramParameters4fvNV, glProgramParameters4fvNV, NULL, _gloffset_ProgramParameters4fvNV),
-    NAME_FUNC_OFFSET(11382, glRequestResidentProgramsNV, glRequestResidentProgramsNV, NULL, _gloffset_RequestResidentProgramsNV),
-    NAME_FUNC_OFFSET(11410, glTrackMatrixNV, glTrackMatrixNV, NULL, _gloffset_TrackMatrixNV),
-    NAME_FUNC_OFFSET(11426, glVertexAttrib1dNV, glVertexAttrib1dNV, NULL, _gloffset_VertexAttrib1dNV),
-    NAME_FUNC_OFFSET(11445, glVertexAttrib1dvNV, glVertexAttrib1dvNV, NULL, _gloffset_VertexAttrib1dvNV),
-    NAME_FUNC_OFFSET(11465, glVertexAttrib1fNV, glVertexAttrib1fNV, NULL, _gloffset_VertexAttrib1fNV),
-    NAME_FUNC_OFFSET(11484, glVertexAttrib1fvNV, glVertexAttrib1fvNV, NULL, _gloffset_VertexAttrib1fvNV),
-    NAME_FUNC_OFFSET(11504, glVertexAttrib1sNV, glVertexAttrib1sNV, NULL, _gloffset_VertexAttrib1sNV),
-    NAME_FUNC_OFFSET(11523, glVertexAttrib1svNV, glVertexAttrib1svNV, NULL, _gloffset_VertexAttrib1svNV),
-    NAME_FUNC_OFFSET(11543, glVertexAttrib2dNV, glVertexAttrib2dNV, NULL, _gloffset_VertexAttrib2dNV),
-    NAME_FUNC_OFFSET(11562, glVertexAttrib2dvNV, glVertexAttrib2dvNV, NULL, _gloffset_VertexAttrib2dvNV),
-    NAME_FUNC_OFFSET(11582, glVertexAttrib2fNV, glVertexAttrib2fNV, NULL, _gloffset_VertexAttrib2fNV),
-    NAME_FUNC_OFFSET(11601, glVertexAttrib2fvNV, glVertexAttrib2fvNV, NULL, _gloffset_VertexAttrib2fvNV),
-    NAME_FUNC_OFFSET(11621, glVertexAttrib2sNV, glVertexAttrib2sNV, NULL, _gloffset_VertexAttrib2sNV),
-    NAME_FUNC_OFFSET(11640, glVertexAttrib2svNV, glVertexAttrib2svNV, NULL, _gloffset_VertexAttrib2svNV),
-    NAME_FUNC_OFFSET(11660, glVertexAttrib3dNV, glVertexAttrib3dNV, NULL, _gloffset_VertexAttrib3dNV),
-    NAME_FUNC_OFFSET(11679, glVertexAttrib3dvNV, glVertexAttrib3dvNV, NULL, _gloffset_VertexAttrib3dvNV),
-    NAME_FUNC_OFFSET(11699, glVertexAttrib3fNV, glVertexAttrib3fNV, NULL, _gloffset_VertexAttrib3fNV),
-    NAME_FUNC_OFFSET(11718, glVertexAttrib3fvNV, glVertexAttrib3fvNV, NULL, _gloffset_VertexAttrib3fvNV),
-    NAME_FUNC_OFFSET(11738, glVertexAttrib3sNV, glVertexAttrib3sNV, NULL, _gloffset_VertexAttrib3sNV),
-    NAME_FUNC_OFFSET(11757, glVertexAttrib3svNV, glVertexAttrib3svNV, NULL, _gloffset_VertexAttrib3svNV),
-    NAME_FUNC_OFFSET(11777, glVertexAttrib4dNV, glVertexAttrib4dNV, NULL, _gloffset_VertexAttrib4dNV),
-    NAME_FUNC_OFFSET(11796, glVertexAttrib4dvNV, glVertexAttrib4dvNV, NULL, _gloffset_VertexAttrib4dvNV),
-    NAME_FUNC_OFFSET(11816, glVertexAttrib4fNV, glVertexAttrib4fNV, NULL, _gloffset_VertexAttrib4fNV),
-    NAME_FUNC_OFFSET(11835, glVertexAttrib4fvNV, glVertexAttrib4fvNV, NULL, _gloffset_VertexAttrib4fvNV),
-    NAME_FUNC_OFFSET(11855, glVertexAttrib4sNV, glVertexAttrib4sNV, NULL, _gloffset_VertexAttrib4sNV),
-    NAME_FUNC_OFFSET(11874, glVertexAttrib4svNV, glVertexAttrib4svNV, NULL, _gloffset_VertexAttrib4svNV),
-    NAME_FUNC_OFFSET(11894, glVertexAttrib4ubNV, glVertexAttrib4ubNV, NULL, _gloffset_VertexAttrib4ubNV),
-    NAME_FUNC_OFFSET(11914, glVertexAttrib4ubvNV, glVertexAttrib4ubvNV, NULL, _gloffset_VertexAttrib4ubvNV),
-    NAME_FUNC_OFFSET(11935, glVertexAttribPointerNV, glVertexAttribPointerNV, NULL, _gloffset_VertexAttribPointerNV),
-    NAME_FUNC_OFFSET(11959, glVertexAttribs1dvNV, glVertexAttribs1dvNV, NULL, _gloffset_VertexAttribs1dvNV),
-    NAME_FUNC_OFFSET(11980, glVertexAttribs1fvNV, glVertexAttribs1fvNV, NULL, _gloffset_VertexAttribs1fvNV),
-    NAME_FUNC_OFFSET(12001, glVertexAttribs1svNV, glVertexAttribs1svNV, NULL, _gloffset_VertexAttribs1svNV),
-    NAME_FUNC_OFFSET(12022, glVertexAttribs2dvNV, glVertexAttribs2dvNV, NULL, _gloffset_VertexAttribs2dvNV),
-    NAME_FUNC_OFFSET(12043, glVertexAttribs2fvNV, glVertexAttribs2fvNV, NULL, _gloffset_VertexAttribs2fvNV),
-    NAME_FUNC_OFFSET(12064, glVertexAttribs2svNV, glVertexAttribs2svNV, NULL, _gloffset_VertexAttribs2svNV),
-    NAME_FUNC_OFFSET(12085, glVertexAttribs3dvNV, glVertexAttribs3dvNV, NULL, _gloffset_VertexAttribs3dvNV),
-    NAME_FUNC_OFFSET(12106, glVertexAttribs3fvNV, glVertexAttribs3fvNV, NULL, _gloffset_VertexAttribs3fvNV),
-    NAME_FUNC_OFFSET(12127, glVertexAttribs3svNV, glVertexAttribs3svNV, NULL, _gloffset_VertexAttribs3svNV),
-    NAME_FUNC_OFFSET(12148, glVertexAttribs4dvNV, glVertexAttribs4dvNV, NULL, _gloffset_VertexAttribs4dvNV),
-    NAME_FUNC_OFFSET(12169, glVertexAttribs4fvNV, glVertexAttribs4fvNV, NULL, _gloffset_VertexAttribs4fvNV),
-    NAME_FUNC_OFFSET(12190, glVertexAttribs4svNV, glVertexAttribs4svNV, NULL, _gloffset_VertexAttribs4svNV),
-    NAME_FUNC_OFFSET(12211, glVertexAttribs4ubvNV, glVertexAttribs4ubvNV, NULL, _gloffset_VertexAttribs4ubvNV),
-    NAME_FUNC_OFFSET(12233, glAlphaFragmentOp1ATI, glAlphaFragmentOp1ATI, NULL, _gloffset_AlphaFragmentOp1ATI),
-    NAME_FUNC_OFFSET(12255, glAlphaFragmentOp2ATI, glAlphaFragmentOp2ATI, NULL, _gloffset_AlphaFragmentOp2ATI),
-    NAME_FUNC_OFFSET(12277, glAlphaFragmentOp3ATI, glAlphaFragmentOp3ATI, NULL, _gloffset_AlphaFragmentOp3ATI),
-    NAME_FUNC_OFFSET(12299, glBeginFragmentShaderATI, glBeginFragmentShaderATI, NULL, _gloffset_BeginFragmentShaderATI),
-    NAME_FUNC_OFFSET(12324, glBindFragmentShaderATI, glBindFragmentShaderATI, NULL, _gloffset_BindFragmentShaderATI),
-    NAME_FUNC_OFFSET(12348, glColorFragmentOp1ATI, glColorFragmentOp1ATI, NULL, _gloffset_ColorFragmentOp1ATI),
-    NAME_FUNC_OFFSET(12370, glColorFragmentOp2ATI, glColorFragmentOp2ATI, NULL, _gloffset_ColorFragmentOp2ATI),
-    NAME_FUNC_OFFSET(12392, glColorFragmentOp3ATI, glColorFragmentOp3ATI, NULL, _gloffset_ColorFragmentOp3ATI),
-    NAME_FUNC_OFFSET(12414, glDeleteFragmentShaderATI, glDeleteFragmentShaderATI, NULL, _gloffset_DeleteFragmentShaderATI),
-    NAME_FUNC_OFFSET(12440, glEndFragmentShaderATI, glEndFragmentShaderATI, NULL, _gloffset_EndFragmentShaderATI),
-    NAME_FUNC_OFFSET(12463, glGenFragmentShadersATI, glGenFragmentShadersATI, NULL, _gloffset_GenFragmentShadersATI),
-    NAME_FUNC_OFFSET(12487, glPassTexCoordATI, glPassTexCoordATI, NULL, _gloffset_PassTexCoordATI),
-    NAME_FUNC_OFFSET(12505, glSampleMapATI, glSampleMapATI, NULL, _gloffset_SampleMapATI),
-    NAME_FUNC_OFFSET(12520, glSetFragmentShaderConstantATI, glSetFragmentShaderConstantATI, NULL, _gloffset_SetFragmentShaderConstantATI),
-    NAME_FUNC_OFFSET(12551, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
-    NAME_FUNC_OFFSET(12571, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
-    NAME_FUNC_OFFSET(12592, gl_dispatch_stub_733, gl_dispatch_stub_733, NULL, _gloffset_ActiveStencilFaceEXT),
-    NAME_FUNC_OFFSET(12615, gl_dispatch_stub_734, gl_dispatch_stub_734, NULL, _gloffset_BindVertexArrayAPPLE),
-    NAME_FUNC_OFFSET(12638, gl_dispatch_stub_735, gl_dispatch_stub_735, NULL, _gloffset_DeleteVertexArraysAPPLE),
-    NAME_FUNC_OFFSET(12664, gl_dispatch_stub_736, gl_dispatch_stub_736, NULL, _gloffset_GenVertexArraysAPPLE),
-    NAME_FUNC_OFFSET(12687, gl_dispatch_stub_737, gl_dispatch_stub_737, NULL, _gloffset_IsVertexArrayAPPLE),
-    NAME_FUNC_OFFSET(12708, glGetProgramNamedParameterdvNV, glGetProgramNamedParameterdvNV, NULL, _gloffset_GetProgramNamedParameterdvNV),
-    NAME_FUNC_OFFSET(12739, glGetProgramNamedParameterfvNV, glGetProgramNamedParameterfvNV, NULL, _gloffset_GetProgramNamedParameterfvNV),
-    NAME_FUNC_OFFSET(12770, glProgramNamedParameter4dNV, glProgramNamedParameter4dNV, NULL, _gloffset_ProgramNamedParameter4dNV),
-    NAME_FUNC_OFFSET(12798, glProgramNamedParameter4dvNV, glProgramNamedParameter4dvNV, NULL, _gloffset_ProgramNamedParameter4dvNV),
-    NAME_FUNC_OFFSET(12827, glProgramNamedParameter4fNV, glProgramNamedParameter4fNV, NULL, _gloffset_ProgramNamedParameter4fNV),
-    NAME_FUNC_OFFSET(12855, glProgramNamedParameter4fvNV, glProgramNamedParameter4fvNV, NULL, _gloffset_ProgramNamedParameter4fvNV),
-    NAME_FUNC_OFFSET(12884, gl_dispatch_stub_744, gl_dispatch_stub_744, NULL, _gloffset_DepthBoundsEXT),
-    NAME_FUNC_OFFSET(12901, gl_dispatch_stub_745, gl_dispatch_stub_745, NULL, _gloffset_BlendEquationSeparateEXT),
-    NAME_FUNC_OFFSET(12928, glBindFramebufferEXT, glBindFramebufferEXT, NULL, _gloffset_BindFramebufferEXT),
-    NAME_FUNC_OFFSET(12949, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, _gloffset_BindRenderbufferEXT),
-    NAME_FUNC_OFFSET(12971, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, _gloffset_CheckFramebufferStatusEXT),
-    NAME_FUNC_OFFSET(12999, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, _gloffset_DeleteFramebuffersEXT),
-    NAME_FUNC_OFFSET(13023, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, _gloffset_DeleteRenderbuffersEXT),
-    NAME_FUNC_OFFSET(13048, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, _gloffset_FramebufferRenderbufferEXT),
-    NAME_FUNC_OFFSET(13077, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, _gloffset_FramebufferTexture1DEXT),
-    NAME_FUNC_OFFSET(13103, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, _gloffset_FramebufferTexture2DEXT),
-    NAME_FUNC_OFFSET(13129, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, _gloffset_FramebufferTexture3DEXT),
-    NAME_FUNC_OFFSET(13155, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, _gloffset_GenFramebuffersEXT),
-    NAME_FUNC_OFFSET(13176, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, _gloffset_GenRenderbuffersEXT),
-    NAME_FUNC_OFFSET(13198, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, _gloffset_GenerateMipmapEXT),
-    NAME_FUNC_OFFSET(13218, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, _gloffset_GetFramebufferAttachmentParameterivEXT),
-    NAME_FUNC_OFFSET(13259, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, _gloffset_GetRenderbufferParameterivEXT),
-    NAME_FUNC_OFFSET(13291, glIsFramebufferEXT, glIsFramebufferEXT, NULL, _gloffset_IsFramebufferEXT),
-    NAME_FUNC_OFFSET(13310, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, _gloffset_IsRenderbufferEXT),
-    NAME_FUNC_OFFSET(13330, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, _gloffset_RenderbufferStorageEXT),
-    NAME_FUNC_OFFSET(13355, gl_dispatch_stub_763, gl_dispatch_stub_763, NULL, _gloffset_BlitFramebufferEXT),
-    NAME_FUNC_OFFSET(13376, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
-    NAME_FUNC_OFFSET(13405, gl_dispatch_stub_765, gl_dispatch_stub_765, NULL, _gloffset_StencilFuncSeparateATI),
-    NAME_FUNC_OFFSET(13430, gl_dispatch_stub_766, gl_dispatch_stub_766, NULL, _gloffset_ProgramEnvParameters4fvEXT),
-    NAME_FUNC_OFFSET(13459, gl_dispatch_stub_767, gl_dispatch_stub_767, NULL, _gloffset_ProgramLocalParameters4fvEXT),
-    NAME_FUNC_OFFSET(13490, gl_dispatch_stub_768, gl_dispatch_stub_768, NULL, _gloffset_GetQueryObjecti64vEXT),
-    NAME_FUNC_OFFSET(13514, gl_dispatch_stub_769, gl_dispatch_stub_769, NULL, _gloffset_GetQueryObjectui64vEXT),
-    NAME_FUNC_OFFSET(13539, glArrayElement, glArrayElement, NULL, _gloffset_ArrayElement),
-    NAME_FUNC_OFFSET(13557, glBindTexture, glBindTexture, NULL, _gloffset_BindTexture),
-    NAME_FUNC_OFFSET(13574, glDrawArrays, glDrawArrays, NULL, _gloffset_DrawArrays),
-    NAME_FUNC_OFFSET(13590, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, _gloffset_AreTexturesResident),
-    NAME_FUNC_OFFSET(13615, glCopyTexImage1D, glCopyTexImage1D, NULL, _gloffset_CopyTexImage1D),
-    NAME_FUNC_OFFSET(13635, glCopyTexImage2D, glCopyTexImage2D, NULL, _gloffset_CopyTexImage2D),
-    NAME_FUNC_OFFSET(13655, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, _gloffset_CopyTexSubImage1D),
-    NAME_FUNC_OFFSET(13678, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, _gloffset_CopyTexSubImage2D),
-    NAME_FUNC_OFFSET(13701, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, _gloffset_DeleteTextures),
-    NAME_FUNC_OFFSET(13721, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, _gloffset_GenTextures),
-    NAME_FUNC_OFFSET(13738, glGetPointerv, glGetPointerv, NULL, _gloffset_GetPointerv),
-    NAME_FUNC_OFFSET(13755, glIsTexture, glIsTextureEXT, glIsTextureEXT, _gloffset_IsTexture),
-    NAME_FUNC_OFFSET(13770, glPrioritizeTextures, glPrioritizeTextures, NULL, _gloffset_PrioritizeTextures),
-    NAME_FUNC_OFFSET(13794, glTexSubImage1D, glTexSubImage1D, NULL, _gloffset_TexSubImage1D),
-    NAME_FUNC_OFFSET(13813, glTexSubImage2D, glTexSubImage2D, NULL, _gloffset_TexSubImage2D),
-    NAME_FUNC_OFFSET(13832, glBlendColor, glBlendColor, NULL, _gloffset_BlendColor),
-    NAME_FUNC_OFFSET(13848, glBlendEquation, glBlendEquation, NULL, _gloffset_BlendEquation),
-    NAME_FUNC_OFFSET(13867, glDrawRangeElements, glDrawRangeElements, NULL, _gloffset_DrawRangeElements),
-    NAME_FUNC_OFFSET(13890, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
-    NAME_FUNC_OFFSET(13906, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
-    NAME_FUNC_OFFSET(13922, glColorTableParameterfv, glColorTableParameterfv, NULL, _gloffset_ColorTableParameterfv),
-    NAME_FUNC_OFFSET(13949, glColorTableParameteriv, glColorTableParameteriv, NULL, _gloffset_ColorTableParameteriv),
-    NAME_FUNC_OFFSET(13976, glCopyColorTable, glCopyColorTable, NULL, _gloffset_CopyColorTable),
-    NAME_FUNC_OFFSET(13996, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
-    NAME_FUNC_OFFSET(14015, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
-    NAME_FUNC_OFFSET(14034, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
-    NAME_FUNC_OFFSET(14064, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
-    NAME_FUNC_OFFSET(14094, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
-    NAME_FUNC_OFFSET(14124, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
-    NAME_FUNC_OFFSET(14154, glColorSubTable, glColorSubTable, NULL, _gloffset_ColorSubTable),
-    NAME_FUNC_OFFSET(14173, glCopyColorSubTable, glCopyColorSubTable, NULL, _gloffset_CopyColorSubTable),
-    NAME_FUNC_OFFSET(14196, glConvolutionFilter1D, glConvolutionFilter1D, NULL, _gloffset_ConvolutionFilter1D),
-    NAME_FUNC_OFFSET(14221, glConvolutionFilter2D, glConvolutionFilter2D, NULL, _gloffset_ConvolutionFilter2D),
-    NAME_FUNC_OFFSET(14246, glConvolutionParameterf, glConvolutionParameterf, NULL, _gloffset_ConvolutionParameterf),
-    NAME_FUNC_OFFSET(14273, glConvolutionParameterfv, glConvolutionParameterfv, NULL, _gloffset_ConvolutionParameterfv),
-    NAME_FUNC_OFFSET(14301, glConvolutionParameteri, glConvolutionParameteri, NULL, _gloffset_ConvolutionParameteri),
-    NAME_FUNC_OFFSET(14328, glConvolutionParameteriv, glConvolutionParameteriv, NULL, _gloffset_ConvolutionParameteriv),
-    NAME_FUNC_OFFSET(14356, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, _gloffset_CopyConvolutionFilter1D),
-    NAME_FUNC_OFFSET(14385, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, _gloffset_CopyConvolutionFilter2D),
-    NAME_FUNC_OFFSET(14414, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, _gloffset_GetConvolutionFilter),
-    NAME_FUNC_OFFSET(14440, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, _gloffset_GetConvolutionParameterfv),
-    NAME_FUNC_OFFSET(14471, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, _gloffset_GetConvolutionParameteriv),
-    NAME_FUNC_OFFSET(14502, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, _gloffset_GetSeparableFilter),
-    NAME_FUNC_OFFSET(14526, glSeparableFilter2D, glSeparableFilter2D, NULL, _gloffset_SeparableFilter2D),
-    NAME_FUNC_OFFSET(14549, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, _gloffset_GetHistogram),
-    NAME_FUNC_OFFSET(14567, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, _gloffset_GetHistogramParameterfv),
-    NAME_FUNC_OFFSET(14596, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, _gloffset_GetHistogramParameteriv),
-    NAME_FUNC_OFFSET(14625, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, _gloffset_GetMinmax),
-    NAME_FUNC_OFFSET(14640, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, _gloffset_GetMinmaxParameterfv),
-    NAME_FUNC_OFFSET(14666, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, _gloffset_GetMinmaxParameteriv),
-    NAME_FUNC_OFFSET(14692, glHistogram, glHistogram, NULL, _gloffset_Histogram),
-    NAME_FUNC_OFFSET(14707, glMinmax, glMinmax, NULL, _gloffset_Minmax),
-    NAME_FUNC_OFFSET(14719, glResetHistogram, glResetHistogram, NULL, _gloffset_ResetHistogram),
-    NAME_FUNC_OFFSET(14739, glResetMinmax, glResetMinmax, NULL, _gloffset_ResetMinmax),
-    NAME_FUNC_OFFSET(14756, glTexImage3D, glTexImage3D, NULL, _gloffset_TexImage3D),
-    NAME_FUNC_OFFSET(14772, glTexSubImage3D, glTexSubImage3D, NULL, _gloffset_TexSubImage3D),
-    NAME_FUNC_OFFSET(14791, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, _gloffset_CopyTexSubImage3D),
-    NAME_FUNC_OFFSET(14814, glActiveTextureARB, glActiveTextureARB, NULL, _gloffset_ActiveTextureARB),
-    NAME_FUNC_OFFSET(14830, glClientActiveTextureARB, glClientActiveTextureARB, NULL, _gloffset_ClientActiveTextureARB),
-    NAME_FUNC_OFFSET(14852, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL, _gloffset_MultiTexCoord1dARB),
-    NAME_FUNC_OFFSET(14870, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL, _gloffset_MultiTexCoord1dvARB),
-    NAME_FUNC_OFFSET(14889, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, _gloffset_MultiTexCoord1fARB),
-    NAME_FUNC_OFFSET(14907, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, _gloffset_MultiTexCoord1fvARB),
-    NAME_FUNC_OFFSET(14926, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL, _gloffset_MultiTexCoord1iARB),
-    NAME_FUNC_OFFSET(14944, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL, _gloffset_MultiTexCoord1ivARB),
-    NAME_FUNC_OFFSET(14963, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL, _gloffset_MultiTexCoord1sARB),
-    NAME_FUNC_OFFSET(14981, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL, _gloffset_MultiTexCoord1svARB),
-    NAME_FUNC_OFFSET(15000, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL, _gloffset_MultiTexCoord2dARB),
-    NAME_FUNC_OFFSET(15018, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL, _gloffset_MultiTexCoord2dvARB),
-    NAME_FUNC_OFFSET(15037, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, _gloffset_MultiTexCoord2fARB),
-    NAME_FUNC_OFFSET(15055, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, _gloffset_MultiTexCoord2fvARB),
-    NAME_FUNC_OFFSET(15074, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL, _gloffset_MultiTexCoord2iARB),
-    NAME_FUNC_OFFSET(15092, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL, _gloffset_MultiTexCoord2ivARB),
-    NAME_FUNC_OFFSET(15111, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL, _gloffset_MultiTexCoord2sARB),
-    NAME_FUNC_OFFSET(15129, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL, _gloffset_MultiTexCoord2svARB),
-    NAME_FUNC_OFFSET(15148, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL, _gloffset_MultiTexCoord3dARB),
-    NAME_FUNC_OFFSET(15166, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL, _gloffset_MultiTexCoord3dvARB),
-    NAME_FUNC_OFFSET(15185, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, _gloffset_MultiTexCoord3fARB),
-    NAME_FUNC_OFFSET(15203, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, _gloffset_MultiTexCoord3fvARB),
-    NAME_FUNC_OFFSET(15222, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL, _gloffset_MultiTexCoord3iARB),
-    NAME_FUNC_OFFSET(15240, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL, _gloffset_MultiTexCoord3ivARB),
-    NAME_FUNC_OFFSET(15259, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL, _gloffset_MultiTexCoord3sARB),
-    NAME_FUNC_OFFSET(15277, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL, _gloffset_MultiTexCoord3svARB),
-    NAME_FUNC_OFFSET(15296, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL, _gloffset_MultiTexCoord4dARB),
-    NAME_FUNC_OFFSET(15314, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL, _gloffset_MultiTexCoord4dvARB),
-    NAME_FUNC_OFFSET(15333, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, _gloffset_MultiTexCoord4fARB),
-    NAME_FUNC_OFFSET(15351, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, _gloffset_MultiTexCoord4fvARB),
-    NAME_FUNC_OFFSET(15370, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL, _gloffset_MultiTexCoord4iARB),
-    NAME_FUNC_OFFSET(15388, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL, _gloffset_MultiTexCoord4ivARB),
-    NAME_FUNC_OFFSET(15407, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL, _gloffset_MultiTexCoord4sARB),
-    NAME_FUNC_OFFSET(15425, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL, _gloffset_MultiTexCoord4svARB),
-    NAME_FUNC_OFFSET(15444, glStencilOpSeparate, glStencilOpSeparate, NULL, _gloffset_StencilOpSeparate),
-    NAME_FUNC_OFFSET(15467, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, _gloffset_LoadTransposeMatrixdARB),
-    NAME_FUNC_OFFSET(15490, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, _gloffset_LoadTransposeMatrixfARB),
-    NAME_FUNC_OFFSET(15513, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, _gloffset_MultTransposeMatrixdARB),
-    NAME_FUNC_OFFSET(15536, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB, NULL, _gloffset_MultTransposeMatrixfARB),
-    NAME_FUNC_OFFSET(15559, glSampleCoverageARB, glSampleCoverageARB, NULL, _gloffset_SampleCoverageARB),
-    NAME_FUNC_OFFSET(15576, glCompressedTexImage1DARB, glCompressedTexImage1DARB, NULL, _gloffset_CompressedTexImage1DARB),
-    NAME_FUNC_OFFSET(15599, glCompressedTexImage2DARB, glCompressedTexImage2DARB, NULL, _gloffset_CompressedTexImage2DARB),
-    NAME_FUNC_OFFSET(15622, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, _gloffset_CompressedTexImage3DARB),
-    NAME_FUNC_OFFSET(15645, glCompressedTexSubImage1DARB, glCompressedTexSubImage1DARB, NULL, _gloffset_CompressedTexSubImage1DARB),
-    NAME_FUNC_OFFSET(15671, glCompressedTexSubImage2DARB, glCompressedTexSubImage2DARB, NULL, _gloffset_CompressedTexSubImage2DARB),
-    NAME_FUNC_OFFSET(15697, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, _gloffset_CompressedTexSubImage3DARB),
-    NAME_FUNC_OFFSET(15723, glGetCompressedTexImageARB, glGetCompressedTexImageARB, NULL, _gloffset_GetCompressedTexImageARB),
-    NAME_FUNC_OFFSET(15747, glDisableVertexAttribArrayARB, glDisableVertexAttribArrayARB, NULL, _gloffset_DisableVertexAttribArrayARB),
-    NAME_FUNC_OFFSET(15774, glEnableVertexAttribArrayARB, glEnableVertexAttribArrayARB, NULL, _gloffset_EnableVertexAttribArrayARB),
-    NAME_FUNC_OFFSET(15800, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL, _gloffset_GetVertexAttribdvARB),
-    NAME_FUNC_OFFSET(15820, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL, _gloffset_GetVertexAttribfvARB),
-    NAME_FUNC_OFFSET(15840, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL, _gloffset_GetVertexAttribivARB),
-    NAME_FUNC_OFFSET(15860, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, _gloffset_ProgramEnvParameter4dARB),
-    NAME_FUNC_OFFSET(15883, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, _gloffset_ProgramEnvParameter4dvARB),
-    NAME_FUNC_OFFSET(15907, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, _gloffset_ProgramEnvParameter4fARB),
-    NAME_FUNC_OFFSET(15930, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, _gloffset_ProgramEnvParameter4fvARB),
-    NAME_FUNC_OFFSET(15954, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, _gloffset_VertexAttrib1dARB),
-    NAME_FUNC_OFFSET(15971, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL, _gloffset_VertexAttrib1dvARB),
-    NAME_FUNC_OFFSET(15989, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, _gloffset_VertexAttrib1fARB),
-    NAME_FUNC_OFFSET(16006, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, _gloffset_VertexAttrib1fvARB),
-    NAME_FUNC_OFFSET(16024, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, _gloffset_VertexAttrib1sARB),
-    NAME_FUNC_OFFSET(16041, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL, _gloffset_VertexAttrib1svARB),
-    NAME_FUNC_OFFSET(16059, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, _gloffset_VertexAttrib2dARB),
-    NAME_FUNC_OFFSET(16076, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL, _gloffset_VertexAttrib2dvARB),
-    NAME_FUNC_OFFSET(16094, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, _gloffset_VertexAttrib2fARB),
-    NAME_FUNC_OFFSET(16111, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, _gloffset_VertexAttrib2fvARB),
-    NAME_FUNC_OFFSET(16129, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, _gloffset_VertexAttrib2sARB),
-    NAME_FUNC_OFFSET(16146, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL, _gloffset_VertexAttrib2svARB),
-    NAME_FUNC_OFFSET(16164, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, _gloffset_VertexAttrib3dARB),
-    NAME_FUNC_OFFSET(16181, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL, _gloffset_VertexAttrib3dvARB),
-    NAME_FUNC_OFFSET(16199, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, _gloffset_VertexAttrib3fARB),
-    NAME_FUNC_OFFSET(16216, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, _gloffset_VertexAttrib3fvARB),
-    NAME_FUNC_OFFSET(16234, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, _gloffset_VertexAttrib3sARB),
-    NAME_FUNC_OFFSET(16251, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL, _gloffset_VertexAttrib3svARB),
-    NAME_FUNC_OFFSET(16269, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL, _gloffset_VertexAttrib4NbvARB),
-    NAME_FUNC_OFFSET(16288, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL, _gloffset_VertexAttrib4NivARB),
-    NAME_FUNC_OFFSET(16307, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL, _gloffset_VertexAttrib4NsvARB),
-    NAME_FUNC_OFFSET(16326, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL, _gloffset_VertexAttrib4NubARB),
-    NAME_FUNC_OFFSET(16345, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, _gloffset_VertexAttrib4NubvARB),
-    NAME_FUNC_OFFSET(16365, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, _gloffset_VertexAttrib4NuivARB),
-    NAME_FUNC_OFFSET(16385, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, _gloffset_VertexAttrib4NusvARB),
-    NAME_FUNC_OFFSET(16405, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, _gloffset_VertexAttrib4bvARB),
-    NAME_FUNC_OFFSET(16423, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, _gloffset_VertexAttrib4dARB),
-    NAME_FUNC_OFFSET(16440, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, _gloffset_VertexAttrib4dvARB),
-    NAME_FUNC_OFFSET(16458, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, _gloffset_VertexAttrib4fARB),
-    NAME_FUNC_OFFSET(16475, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, _gloffset_VertexAttrib4fvARB),
-    NAME_FUNC_OFFSET(16493, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, _gloffset_VertexAttrib4ivARB),
-    NAME_FUNC_OFFSET(16511, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, _gloffset_VertexAttrib4sARB),
-    NAME_FUNC_OFFSET(16528, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, _gloffset_VertexAttrib4svARB),
-    NAME_FUNC_OFFSET(16546, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, _gloffset_VertexAttrib4ubvARB),
-    NAME_FUNC_OFFSET(16565, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, _gloffset_VertexAttrib4uivARB),
-    NAME_FUNC_OFFSET(16584, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, _gloffset_VertexAttrib4usvARB),
-    NAME_FUNC_OFFSET(16603, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, _gloffset_VertexAttribPointerARB),
-    NAME_FUNC_OFFSET(16625, glBindBufferARB, glBindBufferARB, NULL, _gloffset_BindBufferARB),
-    NAME_FUNC_OFFSET(16638, glBufferDataARB, glBufferDataARB, NULL, _gloffset_BufferDataARB),
-    NAME_FUNC_OFFSET(16651, glBufferSubDataARB, glBufferSubDataARB, NULL, _gloffset_BufferSubDataARB),
-    NAME_FUNC_OFFSET(16667, glDeleteBuffersARB, glDeleteBuffersARB, NULL, _gloffset_DeleteBuffersARB),
-    NAME_FUNC_OFFSET(16683, glGenBuffersARB, glGenBuffersARB, NULL, _gloffset_GenBuffersARB),
-    NAME_FUNC_OFFSET(16696, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, _gloffset_GetBufferParameterivARB),
-    NAME_FUNC_OFFSET(16719, glGetBufferPointervARB, glGetBufferPointervARB, NULL, _gloffset_GetBufferPointervARB),
-    NAME_FUNC_OFFSET(16739, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, _gloffset_GetBufferSubDataARB),
-    NAME_FUNC_OFFSET(16758, glIsBufferARB, glIsBufferARB, NULL, _gloffset_IsBufferARB),
-    NAME_FUNC_OFFSET(16769, glMapBufferARB, glMapBufferARB, NULL, _gloffset_MapBufferARB),
-    NAME_FUNC_OFFSET(16781, glUnmapBufferARB, glUnmapBufferARB, NULL, _gloffset_UnmapBufferARB),
-    NAME_FUNC_OFFSET(16795, glBeginQueryARB, glBeginQueryARB, NULL, _gloffset_BeginQueryARB),
-    NAME_FUNC_OFFSET(16808, glDeleteQueriesARB, glDeleteQueriesARB, NULL, _gloffset_DeleteQueriesARB),
-    NAME_FUNC_OFFSET(16824, glEndQueryARB, glEndQueryARB, NULL, _gloffset_EndQueryARB),
-    NAME_FUNC_OFFSET(16835, glGenQueriesARB, glGenQueriesARB, NULL, _gloffset_GenQueriesARB),
-    NAME_FUNC_OFFSET(16848, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, _gloffset_GetQueryObjectivARB),
-    NAME_FUNC_OFFSET(16867, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, _gloffset_GetQueryObjectuivARB),
-    NAME_FUNC_OFFSET(16887, glGetQueryivARB, glGetQueryivARB, NULL, _gloffset_GetQueryivARB),
-    NAME_FUNC_OFFSET(16900, glIsQueryARB, glIsQueryARB, NULL, _gloffset_IsQueryARB),
-    NAME_FUNC_OFFSET(16910, glCompileShaderARB, glCompileShaderARB, NULL, _gloffset_CompileShaderARB),
-    NAME_FUNC_OFFSET(16926, glGetActiveUniformARB, glGetActiveUniformARB, NULL, _gloffset_GetActiveUniformARB),
-    NAME_FUNC_OFFSET(16945, glGetShaderSourceARB, glGetShaderSourceARB, NULL, _gloffset_GetShaderSourceARB),
-    NAME_FUNC_OFFSET(16963, glGetUniformLocationARB, glGetUniformLocationARB, NULL, _gloffset_GetUniformLocationARB),
-    NAME_FUNC_OFFSET(16984, glGetUniformfvARB, glGetUniformfvARB, NULL, _gloffset_GetUniformfvARB),
-    NAME_FUNC_OFFSET(16999, glGetUniformivARB, glGetUniformivARB, NULL, _gloffset_GetUniformivARB),
-    NAME_FUNC_OFFSET(17014, glLinkProgramARB, glLinkProgramARB, NULL, _gloffset_LinkProgramARB),
-    NAME_FUNC_OFFSET(17028, glShaderSourceARB, glShaderSourceARB, NULL, _gloffset_ShaderSourceARB),
-    NAME_FUNC_OFFSET(17043, glUniform1fARB, glUniform1fARB, NULL, _gloffset_Uniform1fARB),
-    NAME_FUNC_OFFSET(17055, glUniform1fvARB, glUniform1fvARB, NULL, _gloffset_Uniform1fvARB),
-    NAME_FUNC_OFFSET(17068, glUniform1iARB, glUniform1iARB, NULL, _gloffset_Uniform1iARB),
-    NAME_FUNC_OFFSET(17080, glUniform1ivARB, glUniform1ivARB, NULL, _gloffset_Uniform1ivARB),
-    NAME_FUNC_OFFSET(17093, glUniform2fARB, glUniform2fARB, NULL, _gloffset_Uniform2fARB),
-    NAME_FUNC_OFFSET(17105, glUniform2fvARB, glUniform2fvARB, NULL, _gloffset_Uniform2fvARB),
-    NAME_FUNC_OFFSET(17118, glUniform2iARB, glUniform2iARB, NULL, _gloffset_Uniform2iARB),
-    NAME_FUNC_OFFSET(17130, glUniform2ivARB, glUniform2ivARB, NULL, _gloffset_Uniform2ivARB),
-    NAME_FUNC_OFFSET(17143, glUniform3fARB, glUniform3fARB, NULL, _gloffset_Uniform3fARB),
-    NAME_FUNC_OFFSET(17155, glUniform3fvARB, glUniform3fvARB, NULL, _gloffset_Uniform3fvARB),
-    NAME_FUNC_OFFSET(17168, glUniform3iARB, glUniform3iARB, NULL, _gloffset_Uniform3iARB),
-    NAME_FUNC_OFFSET(17180, glUniform3ivARB, glUniform3ivARB, NULL, _gloffset_Uniform3ivARB),
-    NAME_FUNC_OFFSET(17193, glUniform4fARB, glUniform4fARB, NULL, _gloffset_Uniform4fARB),
-    NAME_FUNC_OFFSET(17205, glUniform4fvARB, glUniform4fvARB, NULL, _gloffset_Uniform4fvARB),
-    NAME_FUNC_OFFSET(17218, glUniform4iARB, glUniform4iARB, NULL, _gloffset_Uniform4iARB),
-    NAME_FUNC_OFFSET(17230, glUniform4ivARB, glUniform4ivARB, NULL, _gloffset_Uniform4ivARB),
-    NAME_FUNC_OFFSET(17243, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, _gloffset_UniformMatrix2fvARB),
-    NAME_FUNC_OFFSET(17262, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, _gloffset_UniformMatrix3fvARB),
-    NAME_FUNC_OFFSET(17281, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, _gloffset_UniformMatrix4fvARB),
-    NAME_FUNC_OFFSET(17300, glUseProgramObjectARB, glUseProgramObjectARB, NULL, _gloffset_UseProgramObjectARB),
-    NAME_FUNC_OFFSET(17313, glValidateProgramARB, glValidateProgramARB, NULL, _gloffset_ValidateProgramARB),
-    NAME_FUNC_OFFSET(17331, glBindAttribLocationARB, glBindAttribLocationARB, NULL, _gloffset_BindAttribLocationARB),
-    NAME_FUNC_OFFSET(17352, glGetActiveAttribARB, glGetActiveAttribARB, NULL, _gloffset_GetActiveAttribARB),
-    NAME_FUNC_OFFSET(17370, glGetAttribLocationARB, glGetAttribLocationARB, NULL, _gloffset_GetAttribLocationARB),
-    NAME_FUNC_OFFSET(17390, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
-    NAME_FUNC_OFFSET(17404, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
-    NAME_FUNC_OFFSET(17421, gl_dispatch_stub_568, gl_dispatch_stub_568, NULL, _gloffset_SampleMaskSGIS),
-    NAME_FUNC_OFFSET(17437, gl_dispatch_stub_569, gl_dispatch_stub_569, NULL, _gloffset_SamplePatternSGIS),
-    NAME_FUNC_OFFSET(17456, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(17474, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(17495, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(17517, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(17536, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(17558, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(17581, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
-    NAME_FUNC_OFFSET(17600, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
-    NAME_FUNC_OFFSET(17620, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
-    NAME_FUNC_OFFSET(17639, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
-    NAME_FUNC_OFFSET(17659, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
-    NAME_FUNC_OFFSET(17678, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
-    NAME_FUNC_OFFSET(17698, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
-    NAME_FUNC_OFFSET(17717, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
-    NAME_FUNC_OFFSET(17737, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
-    NAME_FUNC_OFFSET(17756, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
-    NAME_FUNC_OFFSET(17776, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
-    NAME_FUNC_OFFSET(17796, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
-    NAME_FUNC_OFFSET(17817, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
-    NAME_FUNC_OFFSET(17837, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
-    NAME_FUNC_OFFSET(17858, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
-    NAME_FUNC_OFFSET(17878, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
-    NAME_FUNC_OFFSET(17899, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
-    NAME_FUNC_OFFSET(17923, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
-    NAME_FUNC_OFFSET(17941, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
-    NAME_FUNC_OFFSET(17961, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
-    NAME_FUNC_OFFSET(17979, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
-    NAME_FUNC_OFFSET(17991, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
-    NAME_FUNC_OFFSET(18004, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
-    NAME_FUNC_OFFSET(18016, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
-    NAME_FUNC_OFFSET(18029, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
-    NAME_FUNC_OFFSET(18049, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
-    NAME_FUNC_OFFSET(18073, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
-    NAME_FUNC_OFFSET(18087, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
-    NAME_FUNC_OFFSET(18104, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
-    NAME_FUNC_OFFSET(18119, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
-    NAME_FUNC_OFFSET(18137, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
-    NAME_FUNC_OFFSET(18151, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
-    NAME_FUNC_OFFSET(18168, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
-    NAME_FUNC_OFFSET(18183, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
-    NAME_FUNC_OFFSET(18201, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
-    NAME_FUNC_OFFSET(18215, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
-    NAME_FUNC_OFFSET(18232, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
-    NAME_FUNC_OFFSET(18247, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
-    NAME_FUNC_OFFSET(18265, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
-    NAME_FUNC_OFFSET(18279, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
-    NAME_FUNC_OFFSET(18296, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
-    NAME_FUNC_OFFSET(18311, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
-    NAME_FUNC_OFFSET(18329, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
-    NAME_FUNC_OFFSET(18343, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
-    NAME_FUNC_OFFSET(18360, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
-    NAME_FUNC_OFFSET(18375, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
-    NAME_FUNC_OFFSET(18393, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
-    NAME_FUNC_OFFSET(18407, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
-    NAME_FUNC_OFFSET(18424, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
-    NAME_FUNC_OFFSET(18439, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
-    NAME_FUNC_OFFSET(18457, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
-    NAME_FUNC_OFFSET(18471, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
-    NAME_FUNC_OFFSET(18488, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
-    NAME_FUNC_OFFSET(18503, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
-    NAME_FUNC_OFFSET(18521, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
-    NAME_FUNC_OFFSET(18535, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
-    NAME_FUNC_OFFSET(18552, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
-    NAME_FUNC_OFFSET(18567, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
-    NAME_FUNC_OFFSET(18585, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
-    NAME_FUNC_OFFSET(18602, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
-    NAME_FUNC_OFFSET(18622, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
-    NAME_FUNC_OFFSET(18639, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
-    NAME_FUNC_OFFSET(18665, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
-    NAME_FUNC_OFFSET(18694, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
-    NAME_FUNC_OFFSET(18709, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
-    NAME_FUNC_OFFSET(18727, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
-    NAME_FUNC_OFFSET(18746, gl_dispatch_stub_745, gl_dispatch_stub_745, NULL, _gloffset_BlendEquationSeparateEXT),
-    NAME_FUNC_OFFSET(18770, gl_dispatch_stub_745, gl_dispatch_stub_745, NULL, _gloffset_BlendEquationSeparateEXT),
+    NAME_FUNC_OFFSET( 8951, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, _gloffset_RenderbufferStorageMultisample),
+    NAME_FUNC_OFFSET( 8984, glPolygonOffsetEXT, glPolygonOffsetEXT, NULL, _gloffset_PolygonOffsetEXT),
+    NAME_FUNC_OFFSET( 9003, gl_dispatch_stub_563, gl_dispatch_stub_563, NULL, _gloffset_GetPixelTexGenParameterfvSGIS),
+    NAME_FUNC_OFFSET( 9035, gl_dispatch_stub_564, gl_dispatch_stub_564, NULL, _gloffset_GetPixelTexGenParameterivSGIS),
+    NAME_FUNC_OFFSET( 9067, gl_dispatch_stub_565, gl_dispatch_stub_565, NULL, _gloffset_PixelTexGenParameterfSGIS),
+    NAME_FUNC_OFFSET( 9095, gl_dispatch_stub_566, gl_dispatch_stub_566, NULL, _gloffset_PixelTexGenParameterfvSGIS),
+    NAME_FUNC_OFFSET( 9124, gl_dispatch_stub_567, gl_dispatch_stub_567, NULL, _gloffset_PixelTexGenParameteriSGIS),
+    NAME_FUNC_OFFSET( 9152, gl_dispatch_stub_568, gl_dispatch_stub_568, NULL, _gloffset_PixelTexGenParameterivSGIS),
+    NAME_FUNC_OFFSET( 9181, gl_dispatch_stub_569, gl_dispatch_stub_569, NULL, _gloffset_SampleMaskSGIS),
+    NAME_FUNC_OFFSET( 9198, gl_dispatch_stub_570, gl_dispatch_stub_570, NULL, _gloffset_SamplePatternSGIS),
+    NAME_FUNC_OFFSET( 9218, glColorPointerEXT, glColorPointerEXT, NULL, _gloffset_ColorPointerEXT),
+    NAME_FUNC_OFFSET( 9236, glEdgeFlagPointerEXT, glEdgeFlagPointerEXT, NULL, _gloffset_EdgeFlagPointerEXT),
+    NAME_FUNC_OFFSET( 9257, glIndexPointerEXT, glIndexPointerEXT, NULL, _gloffset_IndexPointerEXT),
+    NAME_FUNC_OFFSET( 9275, glNormalPointerEXT, glNormalPointerEXT, NULL, _gloffset_NormalPointerEXT),
+    NAME_FUNC_OFFSET( 9294, glTexCoordPointerEXT, glTexCoordPointerEXT, NULL, _gloffset_TexCoordPointerEXT),
+    NAME_FUNC_OFFSET( 9315, glVertexPointerEXT, glVertexPointerEXT, NULL, _gloffset_VertexPointerEXT),
+    NAME_FUNC_OFFSET( 9334, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET( 9355, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET( 9377, glLockArraysEXT, glLockArraysEXT, NULL, _gloffset_LockArraysEXT),
+    NAME_FUNC_OFFSET( 9393, glUnlockArraysEXT, glUnlockArraysEXT, NULL, _gloffset_UnlockArraysEXT),
+    NAME_FUNC_OFFSET( 9411, gl_dispatch_stub_581, gl_dispatch_stub_581, NULL, _gloffset_CullParameterdvEXT),
+    NAME_FUNC_OFFSET( 9432, gl_dispatch_stub_582, gl_dispatch_stub_582, NULL, _gloffset_CullParameterfvEXT),
+    NAME_FUNC_OFFSET( 9453, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
+    NAME_FUNC_OFFSET( 9475, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
+    NAME_FUNC_OFFSET( 9498, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
+    NAME_FUNC_OFFSET( 9520, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
+    NAME_FUNC_OFFSET( 9543, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
+    NAME_FUNC_OFFSET( 9565, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
+    NAME_FUNC_OFFSET( 9588, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
+    NAME_FUNC_OFFSET( 9610, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
+    NAME_FUNC_OFFSET( 9633, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
+    NAME_FUNC_OFFSET( 9655, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
+    NAME_FUNC_OFFSET( 9678, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
+    NAME_FUNC_OFFSET( 9701, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
+    NAME_FUNC_OFFSET( 9725, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
+    NAME_FUNC_OFFSET( 9748, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
+    NAME_FUNC_OFFSET( 9772, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
+    NAME_FUNC_OFFSET( 9795, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
+    NAME_FUNC_OFFSET( 9819, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
+    NAME_FUNC_OFFSET( 9846, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
+    NAME_FUNC_OFFSET( 9867, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
+    NAME_FUNC_OFFSET( 9890, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
+    NAME_FUNC_OFFSET( 9911, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
+    NAME_FUNC_OFFSET( 9926, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
+    NAME_FUNC_OFFSET( 9942, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
+    NAME_FUNC_OFFSET( 9957, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
+    NAME_FUNC_OFFSET( 9973, gl_dispatch_stub_607, gl_dispatch_stub_607, NULL, _gloffset_PixelTexGenSGIX),
+    NAME_FUNC_OFFSET( 9991, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
+    NAME_FUNC_OFFSET(10014, glFlushVertexArrayRangeNV, glFlushVertexArrayRangeNV, NULL, _gloffset_FlushVertexArrayRangeNV),
+    NAME_FUNC_OFFSET(10040, glVertexArrayRangeNV, glVertexArrayRangeNV, NULL, _gloffset_VertexArrayRangeNV),
+    NAME_FUNC_OFFSET(10061, glCombinerInputNV, glCombinerInputNV, NULL, _gloffset_CombinerInputNV),
+    NAME_FUNC_OFFSET(10079, glCombinerOutputNV, glCombinerOutputNV, NULL, _gloffset_CombinerOutputNV),
+    NAME_FUNC_OFFSET(10098, glCombinerParameterfNV, glCombinerParameterfNV, NULL, _gloffset_CombinerParameterfNV),
+    NAME_FUNC_OFFSET(10121, glCombinerParameterfvNV, glCombinerParameterfvNV, NULL, _gloffset_CombinerParameterfvNV),
+    NAME_FUNC_OFFSET(10145, glCombinerParameteriNV, glCombinerParameteriNV, NULL, _gloffset_CombinerParameteriNV),
+    NAME_FUNC_OFFSET(10168, glCombinerParameterivNV, glCombinerParameterivNV, NULL, _gloffset_CombinerParameterivNV),
+    NAME_FUNC_OFFSET(10192, glFinalCombinerInputNV, glFinalCombinerInputNV, NULL, _gloffset_FinalCombinerInputNV),
+    NAME_FUNC_OFFSET(10215, glGetCombinerInputParameterfvNV, glGetCombinerInputParameterfvNV, NULL, _gloffset_GetCombinerInputParameterfvNV),
+    NAME_FUNC_OFFSET(10247, glGetCombinerInputParameterivNV, glGetCombinerInputParameterivNV, NULL, _gloffset_GetCombinerInputParameterivNV),
+    NAME_FUNC_OFFSET(10279, glGetCombinerOutputParameterfvNV, glGetCombinerOutputParameterfvNV, NULL, _gloffset_GetCombinerOutputParameterfvNV),
+    NAME_FUNC_OFFSET(10312, glGetCombinerOutputParameterivNV, glGetCombinerOutputParameterivNV, NULL, _gloffset_GetCombinerOutputParameterivNV),
+    NAME_FUNC_OFFSET(10345, glGetFinalCombinerInputParameterfvNV, glGetFinalCombinerInputParameterfvNV, NULL, _gloffset_GetFinalCombinerInputParameterfvNV),
+    NAME_FUNC_OFFSET(10382, glGetFinalCombinerInputParameterivNV, glGetFinalCombinerInputParameterivNV, NULL, _gloffset_GetFinalCombinerInputParameterivNV),
+    NAME_FUNC_OFFSET(10419, glResizeBuffersMESA, glResizeBuffersMESA, NULL, _gloffset_ResizeBuffersMESA),
+    NAME_FUNC_OFFSET(10439, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
+    NAME_FUNC_OFFSET(10457, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
+    NAME_FUNC_OFFSET(10476, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
+    NAME_FUNC_OFFSET(10494, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
+    NAME_FUNC_OFFSET(10513, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
+    NAME_FUNC_OFFSET(10531, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
+    NAME_FUNC_OFFSET(10550, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
+    NAME_FUNC_OFFSET(10568, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
+    NAME_FUNC_OFFSET(10587, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
+    NAME_FUNC_OFFSET(10605, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
+    NAME_FUNC_OFFSET(10624, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
+    NAME_FUNC_OFFSET(10642, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
+    NAME_FUNC_OFFSET(10661, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
+    NAME_FUNC_OFFSET(10679, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
+    NAME_FUNC_OFFSET(10698, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
+    NAME_FUNC_OFFSET(10716, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
+    NAME_FUNC_OFFSET(10735, glWindowPos4dMESA, glWindowPos4dMESA, NULL, _gloffset_WindowPos4dMESA),
+    NAME_FUNC_OFFSET(10753, glWindowPos4dvMESA, glWindowPos4dvMESA, NULL, _gloffset_WindowPos4dvMESA),
+    NAME_FUNC_OFFSET(10772, glWindowPos4fMESA, glWindowPos4fMESA, NULL, _gloffset_WindowPos4fMESA),
+    NAME_FUNC_OFFSET(10790, glWindowPos4fvMESA, glWindowPos4fvMESA, NULL, _gloffset_WindowPos4fvMESA),
+    NAME_FUNC_OFFSET(10809, glWindowPos4iMESA, glWindowPos4iMESA, NULL, _gloffset_WindowPos4iMESA),
+    NAME_FUNC_OFFSET(10827, glWindowPos4ivMESA, glWindowPos4ivMESA, NULL, _gloffset_WindowPos4ivMESA),
+    NAME_FUNC_OFFSET(10846, glWindowPos4sMESA, glWindowPos4sMESA, NULL, _gloffset_WindowPos4sMESA),
+    NAME_FUNC_OFFSET(10864, glWindowPos4svMESA, glWindowPos4svMESA, NULL, _gloffset_WindowPos4svMESA),
+    NAME_FUNC_OFFSET(10883, gl_dispatch_stub_649, gl_dispatch_stub_649, NULL, _gloffset_MultiModeDrawArraysIBM),
+    NAME_FUNC_OFFSET(10908, gl_dispatch_stub_650, gl_dispatch_stub_650, NULL, _gloffset_MultiModeDrawElementsIBM),
+    NAME_FUNC_OFFSET(10935, gl_dispatch_stub_651, gl_dispatch_stub_651, NULL, _gloffset_DeleteFencesNV),
+    NAME_FUNC_OFFSET(10952, gl_dispatch_stub_652, gl_dispatch_stub_652, NULL, _gloffset_FinishFenceNV),
+    NAME_FUNC_OFFSET(10968, gl_dispatch_stub_653, gl_dispatch_stub_653, NULL, _gloffset_GenFencesNV),
+    NAME_FUNC_OFFSET(10982, gl_dispatch_stub_654, gl_dispatch_stub_654, NULL, _gloffset_GetFenceivNV),
+    NAME_FUNC_OFFSET(10997, gl_dispatch_stub_655, gl_dispatch_stub_655, NULL, _gloffset_IsFenceNV),
+    NAME_FUNC_OFFSET(11009, gl_dispatch_stub_656, gl_dispatch_stub_656, NULL, _gloffset_SetFenceNV),
+    NAME_FUNC_OFFSET(11022, gl_dispatch_stub_657, gl_dispatch_stub_657, NULL, _gloffset_TestFenceNV),
+    NAME_FUNC_OFFSET(11036, glAreProgramsResidentNV, glAreProgramsResidentNV, NULL, _gloffset_AreProgramsResidentNV),
+    NAME_FUNC_OFFSET(11060, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
+    NAME_FUNC_OFFSET(11076, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
+    NAME_FUNC_OFFSET(11095, glExecuteProgramNV, glExecuteProgramNV, NULL, _gloffset_ExecuteProgramNV),
+    NAME_FUNC_OFFSET(11114, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
+    NAME_FUNC_OFFSET(11130, glGetProgramParameterdvNV, glGetProgramParameterdvNV, NULL, _gloffset_GetProgramParameterdvNV),
+    NAME_FUNC_OFFSET(11156, glGetProgramParameterfvNV, glGetProgramParameterfvNV, NULL, _gloffset_GetProgramParameterfvNV),
+    NAME_FUNC_OFFSET(11182, glGetProgramStringNV, glGetProgramStringNV, NULL, _gloffset_GetProgramStringNV),
+    NAME_FUNC_OFFSET(11203, glGetProgramivNV, glGetProgramivNV, NULL, _gloffset_GetProgramivNV),
+    NAME_FUNC_OFFSET(11220, glGetTrackMatrixivNV, glGetTrackMatrixivNV, NULL, _gloffset_GetTrackMatrixivNV),
+    NAME_FUNC_OFFSET(11241, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
+    NAME_FUNC_OFFSET(11269, glGetVertexAttribdvNV, glGetVertexAttribdvNV, NULL, _gloffset_GetVertexAttribdvNV),
+    NAME_FUNC_OFFSET(11291, glGetVertexAttribfvNV, glGetVertexAttribfvNV, NULL, _gloffset_GetVertexAttribfvNV),
+    NAME_FUNC_OFFSET(11313, glGetVertexAttribivNV, glGetVertexAttribivNV, NULL, _gloffset_GetVertexAttribivNV),
+    NAME_FUNC_OFFSET(11335, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
+    NAME_FUNC_OFFSET(11349, glLoadProgramNV, glLoadProgramNV, NULL, _gloffset_LoadProgramNV),
+    NAME_FUNC_OFFSET(11365, glProgramParameters4dvNV, glProgramParameters4dvNV, NULL, _gloffset_ProgramParameters4dvNV),
+    NAME_FUNC_OFFSET(11390, glProgramParameters4fvNV, glProgramParameters4fvNV, NULL, _gloffset_ProgramParameters4fvNV),
+    NAME_FUNC_OFFSET(11415, glRequestResidentProgramsNV, glRequestResidentProgramsNV, NULL, _gloffset_RequestResidentProgramsNV),
+    NAME_FUNC_OFFSET(11443, glTrackMatrixNV, glTrackMatrixNV, NULL, _gloffset_TrackMatrixNV),
+    NAME_FUNC_OFFSET(11459, glVertexAttrib1dNV, glVertexAttrib1dNV, NULL, _gloffset_VertexAttrib1dNV),
+    NAME_FUNC_OFFSET(11478, glVertexAttrib1dvNV, glVertexAttrib1dvNV, NULL, _gloffset_VertexAttrib1dvNV),
+    NAME_FUNC_OFFSET(11498, glVertexAttrib1fNV, glVertexAttrib1fNV, NULL, _gloffset_VertexAttrib1fNV),
+    NAME_FUNC_OFFSET(11517, glVertexAttrib1fvNV, glVertexAttrib1fvNV, NULL, _gloffset_VertexAttrib1fvNV),
+    NAME_FUNC_OFFSET(11537, glVertexAttrib1sNV, glVertexAttrib1sNV, NULL, _gloffset_VertexAttrib1sNV),
+    NAME_FUNC_OFFSET(11556, glVertexAttrib1svNV, glVertexAttrib1svNV, NULL, _gloffset_VertexAttrib1svNV),
+    NAME_FUNC_OFFSET(11576, glVertexAttrib2dNV, glVertexAttrib2dNV, NULL, _gloffset_VertexAttrib2dNV),
+    NAME_FUNC_OFFSET(11595, glVertexAttrib2dvNV, glVertexAttrib2dvNV, NULL, _gloffset_VertexAttrib2dvNV),
+    NAME_FUNC_OFFSET(11615, glVertexAttrib2fNV, glVertexAttrib2fNV, NULL, _gloffset_VertexAttrib2fNV),
+    NAME_FUNC_OFFSET(11634, glVertexAttrib2fvNV, glVertexAttrib2fvNV, NULL, _gloffset_VertexAttrib2fvNV),
+    NAME_FUNC_OFFSET(11654, glVertexAttrib2sNV, glVertexAttrib2sNV, NULL, _gloffset_VertexAttrib2sNV),
+    NAME_FUNC_OFFSET(11673, glVertexAttrib2svNV, glVertexAttrib2svNV, NULL, _gloffset_VertexAttrib2svNV),
+    NAME_FUNC_OFFSET(11693, glVertexAttrib3dNV, glVertexAttrib3dNV, NULL, _gloffset_VertexAttrib3dNV),
+    NAME_FUNC_OFFSET(11712, glVertexAttrib3dvNV, glVertexAttrib3dvNV, NULL, _gloffset_VertexAttrib3dvNV),
+    NAME_FUNC_OFFSET(11732, glVertexAttrib3fNV, glVertexAttrib3fNV, NULL, _gloffset_VertexAttrib3fNV),
+    NAME_FUNC_OFFSET(11751, glVertexAttrib3fvNV, glVertexAttrib3fvNV, NULL, _gloffset_VertexAttrib3fvNV),
+    NAME_FUNC_OFFSET(11771, glVertexAttrib3sNV, glVertexAttrib3sNV, NULL, _gloffset_VertexAttrib3sNV),
+    NAME_FUNC_OFFSET(11790, glVertexAttrib3svNV, glVertexAttrib3svNV, NULL, _gloffset_VertexAttrib3svNV),
+    NAME_FUNC_OFFSET(11810, glVertexAttrib4dNV, glVertexAttrib4dNV, NULL, _gloffset_VertexAttrib4dNV),
+    NAME_FUNC_OFFSET(11829, glVertexAttrib4dvNV, glVertexAttrib4dvNV, NULL, _gloffset_VertexAttrib4dvNV),
+    NAME_FUNC_OFFSET(11849, glVertexAttrib4fNV, glVertexAttrib4fNV, NULL, _gloffset_VertexAttrib4fNV),
+    NAME_FUNC_OFFSET(11868, glVertexAttrib4fvNV, glVertexAttrib4fvNV, NULL, _gloffset_VertexAttrib4fvNV),
+    NAME_FUNC_OFFSET(11888, glVertexAttrib4sNV, glVertexAttrib4sNV, NULL, _gloffset_VertexAttrib4sNV),
+    NAME_FUNC_OFFSET(11907, glVertexAttrib4svNV, glVertexAttrib4svNV, NULL, _gloffset_VertexAttrib4svNV),
+    NAME_FUNC_OFFSET(11927, glVertexAttrib4ubNV, glVertexAttrib4ubNV, NULL, _gloffset_VertexAttrib4ubNV),
+    NAME_FUNC_OFFSET(11947, glVertexAttrib4ubvNV, glVertexAttrib4ubvNV, NULL, _gloffset_VertexAttrib4ubvNV),
+    NAME_FUNC_OFFSET(11968, glVertexAttribPointerNV, glVertexAttribPointerNV, NULL, _gloffset_VertexAttribPointerNV),
+    NAME_FUNC_OFFSET(11992, glVertexAttribs1dvNV, glVertexAttribs1dvNV, NULL, _gloffset_VertexAttribs1dvNV),
+    NAME_FUNC_OFFSET(12013, glVertexAttribs1fvNV, glVertexAttribs1fvNV, NULL, _gloffset_VertexAttribs1fvNV),
+    NAME_FUNC_OFFSET(12034, glVertexAttribs1svNV, glVertexAttribs1svNV, NULL, _gloffset_VertexAttribs1svNV),
+    NAME_FUNC_OFFSET(12055, glVertexAttribs2dvNV, glVertexAttribs2dvNV, NULL, _gloffset_VertexAttribs2dvNV),
+    NAME_FUNC_OFFSET(12076, glVertexAttribs2fvNV, glVertexAttribs2fvNV, NULL, _gloffset_VertexAttribs2fvNV),
+    NAME_FUNC_OFFSET(12097, glVertexAttribs2svNV, glVertexAttribs2svNV, NULL, _gloffset_VertexAttribs2svNV),
+    NAME_FUNC_OFFSET(12118, glVertexAttribs3dvNV, glVertexAttribs3dvNV, NULL, _gloffset_VertexAttribs3dvNV),
+    NAME_FUNC_OFFSET(12139, glVertexAttribs3fvNV, glVertexAttribs3fvNV, NULL, _gloffset_VertexAttribs3fvNV),
+    NAME_FUNC_OFFSET(12160, glVertexAttribs3svNV, glVertexAttribs3svNV, NULL, _gloffset_VertexAttribs3svNV),
+    NAME_FUNC_OFFSET(12181, glVertexAttribs4dvNV, glVertexAttribs4dvNV, NULL, _gloffset_VertexAttribs4dvNV),
+    NAME_FUNC_OFFSET(12202, glVertexAttribs4fvNV, glVertexAttribs4fvNV, NULL, _gloffset_VertexAttribs4fvNV),
+    NAME_FUNC_OFFSET(12223, glVertexAttribs4svNV, glVertexAttribs4svNV, NULL, _gloffset_VertexAttribs4svNV),
+    NAME_FUNC_OFFSET(12244, glVertexAttribs4ubvNV, glVertexAttribs4ubvNV, NULL, _gloffset_VertexAttribs4ubvNV),
+    NAME_FUNC_OFFSET(12266, glAlphaFragmentOp1ATI, glAlphaFragmentOp1ATI, NULL, _gloffset_AlphaFragmentOp1ATI),
+    NAME_FUNC_OFFSET(12288, glAlphaFragmentOp2ATI, glAlphaFragmentOp2ATI, NULL, _gloffset_AlphaFragmentOp2ATI),
+    NAME_FUNC_OFFSET(12310, glAlphaFragmentOp3ATI, glAlphaFragmentOp3ATI, NULL, _gloffset_AlphaFragmentOp3ATI),
+    NAME_FUNC_OFFSET(12332, glBeginFragmentShaderATI, glBeginFragmentShaderATI, NULL, _gloffset_BeginFragmentShaderATI),
+    NAME_FUNC_OFFSET(12357, glBindFragmentShaderATI, glBindFragmentShaderATI, NULL, _gloffset_BindFragmentShaderATI),
+    NAME_FUNC_OFFSET(12381, glColorFragmentOp1ATI, glColorFragmentOp1ATI, NULL, _gloffset_ColorFragmentOp1ATI),
+    NAME_FUNC_OFFSET(12403, glColorFragmentOp2ATI, glColorFragmentOp2ATI, NULL, _gloffset_ColorFragmentOp2ATI),
+    NAME_FUNC_OFFSET(12425, glColorFragmentOp3ATI, glColorFragmentOp3ATI, NULL, _gloffset_ColorFragmentOp3ATI),
+    NAME_FUNC_OFFSET(12447, glDeleteFragmentShaderATI, glDeleteFragmentShaderATI, NULL, _gloffset_DeleteFragmentShaderATI),
+    NAME_FUNC_OFFSET(12473, glEndFragmentShaderATI, glEndFragmentShaderATI, NULL, _gloffset_EndFragmentShaderATI),
+    NAME_FUNC_OFFSET(12496, glGenFragmentShadersATI, glGenFragmentShadersATI, NULL, _gloffset_GenFragmentShadersATI),
+    NAME_FUNC_OFFSET(12520, glPassTexCoordATI, glPassTexCoordATI, NULL, _gloffset_PassTexCoordATI),
+    NAME_FUNC_OFFSET(12538, glSampleMapATI, glSampleMapATI, NULL, _gloffset_SampleMapATI),
+    NAME_FUNC_OFFSET(12553, glSetFragmentShaderConstantATI, glSetFragmentShaderConstantATI, NULL, _gloffset_SetFragmentShaderConstantATI),
+    NAME_FUNC_OFFSET(12584, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
+    NAME_FUNC_OFFSET(12604, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
+    NAME_FUNC_OFFSET(12625, gl_dispatch_stub_734, gl_dispatch_stub_734, NULL, _gloffset_ActiveStencilFaceEXT),
+    NAME_FUNC_OFFSET(12648, gl_dispatch_stub_735, gl_dispatch_stub_735, NULL, _gloffset_BindVertexArrayAPPLE),
+    NAME_FUNC_OFFSET(12671, gl_dispatch_stub_736, gl_dispatch_stub_736, NULL, _gloffset_DeleteVertexArraysAPPLE),
+    NAME_FUNC_OFFSET(12697, gl_dispatch_stub_737, gl_dispatch_stub_737, NULL, _gloffset_GenVertexArraysAPPLE),
+    NAME_FUNC_OFFSET(12720, gl_dispatch_stub_738, gl_dispatch_stub_738, NULL, _gloffset_IsVertexArrayAPPLE),
+    NAME_FUNC_OFFSET(12741, glGetProgramNamedParameterdvNV, glGetProgramNamedParameterdvNV, NULL, _gloffset_GetProgramNamedParameterdvNV),
+    NAME_FUNC_OFFSET(12772, glGetProgramNamedParameterfvNV, glGetProgramNamedParameterfvNV, NULL, _gloffset_GetProgramNamedParameterfvNV),
+    NAME_FUNC_OFFSET(12803, glProgramNamedParameter4dNV, glProgramNamedParameter4dNV, NULL, _gloffset_ProgramNamedParameter4dNV),
+    NAME_FUNC_OFFSET(12831, glProgramNamedParameter4dvNV, glProgramNamedParameter4dvNV, NULL, _gloffset_ProgramNamedParameter4dvNV),
+    NAME_FUNC_OFFSET(12860, glProgramNamedParameter4fNV, glProgramNamedParameter4fNV, NULL, _gloffset_ProgramNamedParameter4fNV),
+    NAME_FUNC_OFFSET(12888, glProgramNamedParameter4fvNV, glProgramNamedParameter4fvNV, NULL, _gloffset_ProgramNamedParameter4fvNV),
+    NAME_FUNC_OFFSET(12917, gl_dispatch_stub_745, gl_dispatch_stub_745, NULL, _gloffset_DepthBoundsEXT),
+    NAME_FUNC_OFFSET(12934, gl_dispatch_stub_746, gl_dispatch_stub_746, NULL, _gloffset_BlendEquationSeparateEXT),
+    NAME_FUNC_OFFSET(12961, glBindFramebufferEXT, glBindFramebufferEXT, NULL, _gloffset_BindFramebufferEXT),
+    NAME_FUNC_OFFSET(12982, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, _gloffset_BindRenderbufferEXT),
+    NAME_FUNC_OFFSET(13004, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, _gloffset_CheckFramebufferStatusEXT),
+    NAME_FUNC_OFFSET(13032, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, _gloffset_DeleteFramebuffersEXT),
+    NAME_FUNC_OFFSET(13056, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, _gloffset_DeleteRenderbuffersEXT),
+    NAME_FUNC_OFFSET(13081, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, _gloffset_FramebufferRenderbufferEXT),
+    NAME_FUNC_OFFSET(13110, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, _gloffset_FramebufferTexture1DEXT),
+    NAME_FUNC_OFFSET(13136, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, _gloffset_FramebufferTexture2DEXT),
+    NAME_FUNC_OFFSET(13162, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, _gloffset_FramebufferTexture3DEXT),
+    NAME_FUNC_OFFSET(13188, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, _gloffset_GenFramebuffersEXT),
+    NAME_FUNC_OFFSET(13209, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, _gloffset_GenRenderbuffersEXT),
+    NAME_FUNC_OFFSET(13231, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, _gloffset_GenerateMipmapEXT),
+    NAME_FUNC_OFFSET(13251, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, _gloffset_GetFramebufferAttachmentParameterivEXT),
+    NAME_FUNC_OFFSET(13292, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, _gloffset_GetRenderbufferParameterivEXT),
+    NAME_FUNC_OFFSET(13324, glIsFramebufferEXT, glIsFramebufferEXT, NULL, _gloffset_IsFramebufferEXT),
+    NAME_FUNC_OFFSET(13343, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, _gloffset_IsRenderbufferEXT),
+    NAME_FUNC_OFFSET(13363, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, _gloffset_RenderbufferStorageEXT),
+    NAME_FUNC_OFFSET(13388, gl_dispatch_stub_764, gl_dispatch_stub_764, NULL, _gloffset_BlitFramebufferEXT),
+    NAME_FUNC_OFFSET(13409, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
+    NAME_FUNC_OFFSET(13438, gl_dispatch_stub_766, gl_dispatch_stub_766, NULL, _gloffset_StencilFuncSeparateATI),
+    NAME_FUNC_OFFSET(13463, gl_dispatch_stub_767, gl_dispatch_stub_767, NULL, _gloffset_ProgramEnvParameters4fvEXT),
+    NAME_FUNC_OFFSET(13492, gl_dispatch_stub_768, gl_dispatch_stub_768, NULL, _gloffset_ProgramLocalParameters4fvEXT),
+    NAME_FUNC_OFFSET(13523, gl_dispatch_stub_769, gl_dispatch_stub_769, NULL, _gloffset_GetQueryObjecti64vEXT),
+    NAME_FUNC_OFFSET(13547, gl_dispatch_stub_770, gl_dispatch_stub_770, NULL, _gloffset_GetQueryObjectui64vEXT),
+    NAME_FUNC_OFFSET(13572, glArrayElement, glArrayElement, NULL, _gloffset_ArrayElement),
+    NAME_FUNC_OFFSET(13590, glBindTexture, glBindTexture, NULL, _gloffset_BindTexture),
+    NAME_FUNC_OFFSET(13607, glDrawArrays, glDrawArrays, NULL, _gloffset_DrawArrays),
+    NAME_FUNC_OFFSET(13623, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, _gloffset_AreTexturesResident),
+    NAME_FUNC_OFFSET(13648, glCopyTexImage1D, glCopyTexImage1D, NULL, _gloffset_CopyTexImage1D),
+    NAME_FUNC_OFFSET(13668, glCopyTexImage2D, glCopyTexImage2D, NULL, _gloffset_CopyTexImage2D),
+    NAME_FUNC_OFFSET(13688, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, _gloffset_CopyTexSubImage1D),
+    NAME_FUNC_OFFSET(13711, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, _gloffset_CopyTexSubImage2D),
+    NAME_FUNC_OFFSET(13734, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, _gloffset_DeleteTextures),
+    NAME_FUNC_OFFSET(13754, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, _gloffset_GenTextures),
+    NAME_FUNC_OFFSET(13771, glGetPointerv, glGetPointerv, NULL, _gloffset_GetPointerv),
+    NAME_FUNC_OFFSET(13788, glIsTexture, glIsTextureEXT, glIsTextureEXT, _gloffset_IsTexture),
+    NAME_FUNC_OFFSET(13803, glPrioritizeTextures, glPrioritizeTextures, NULL, _gloffset_PrioritizeTextures),
+    NAME_FUNC_OFFSET(13827, glTexSubImage1D, glTexSubImage1D, NULL, _gloffset_TexSubImage1D),
+    NAME_FUNC_OFFSET(13846, glTexSubImage2D, glTexSubImage2D, NULL, _gloffset_TexSubImage2D),
+    NAME_FUNC_OFFSET(13865, glBlendColor, glBlendColor, NULL, _gloffset_BlendColor),
+    NAME_FUNC_OFFSET(13881, glBlendEquation, glBlendEquation, NULL, _gloffset_BlendEquation),
+    NAME_FUNC_OFFSET(13900, glDrawRangeElements, glDrawRangeElements, NULL, _gloffset_DrawRangeElements),
+    NAME_FUNC_OFFSET(13923, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
+    NAME_FUNC_OFFSET(13939, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
+    NAME_FUNC_OFFSET(13955, glColorTableParameterfv, glColorTableParameterfv, NULL, _gloffset_ColorTableParameterfv),
+    NAME_FUNC_OFFSET(13982, glColorTableParameteriv, glColorTableParameteriv, NULL, _gloffset_ColorTableParameteriv),
+    NAME_FUNC_OFFSET(14009, glCopyColorTable, glCopyColorTable, NULL, _gloffset_CopyColorTable),
+    NAME_FUNC_OFFSET(14029, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
+    NAME_FUNC_OFFSET(14048, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
+    NAME_FUNC_OFFSET(14067, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
+    NAME_FUNC_OFFSET(14097, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
+    NAME_FUNC_OFFSET(14127, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
+    NAME_FUNC_OFFSET(14157, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
+    NAME_FUNC_OFFSET(14187, glColorSubTable, glColorSubTable, NULL, _gloffset_ColorSubTable),
+    NAME_FUNC_OFFSET(14206, glCopyColorSubTable, glCopyColorSubTable, NULL, _gloffset_CopyColorSubTable),
+    NAME_FUNC_OFFSET(14229, glConvolutionFilter1D, glConvolutionFilter1D, NULL, _gloffset_ConvolutionFilter1D),
+    NAME_FUNC_OFFSET(14254, glConvolutionFilter2D, glConvolutionFilter2D, NULL, _gloffset_ConvolutionFilter2D),
+    NAME_FUNC_OFFSET(14279, glConvolutionParameterf, glConvolutionParameterf, NULL, _gloffset_ConvolutionParameterf),
+    NAME_FUNC_OFFSET(14306, glConvolutionParameterfv, glConvolutionParameterfv, NULL, _gloffset_ConvolutionParameterfv),
+    NAME_FUNC_OFFSET(14334, glConvolutionParameteri, glConvolutionParameteri, NULL, _gloffset_ConvolutionParameteri),
+    NAME_FUNC_OFFSET(14361, glConvolutionParameteriv, glConvolutionParameteriv, NULL, _gloffset_ConvolutionParameteriv),
+    NAME_FUNC_OFFSET(14389, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, _gloffset_CopyConvolutionFilter1D),
+    NAME_FUNC_OFFSET(14418, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, _gloffset_CopyConvolutionFilter2D),
+    NAME_FUNC_OFFSET(14447, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, _gloffset_GetConvolutionFilter),
+    NAME_FUNC_OFFSET(14473, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, _gloffset_GetConvolutionParameterfv),
+    NAME_FUNC_OFFSET(14504, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, _gloffset_GetConvolutionParameteriv),
+    NAME_FUNC_OFFSET(14535, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, _gloffset_GetSeparableFilter),
+    NAME_FUNC_OFFSET(14559, glSeparableFilter2D, glSeparableFilter2D, NULL, _gloffset_SeparableFilter2D),
+    NAME_FUNC_OFFSET(14582, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, _gloffset_GetHistogram),
+    NAME_FUNC_OFFSET(14600, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, _gloffset_GetHistogramParameterfv),
+    NAME_FUNC_OFFSET(14629, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, _gloffset_GetHistogramParameteriv),
+    NAME_FUNC_OFFSET(14658, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, _gloffset_GetMinmax),
+    NAME_FUNC_OFFSET(14673, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, _gloffset_GetMinmaxParameterfv),
+    NAME_FUNC_OFFSET(14699, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, _gloffset_GetMinmaxParameteriv),
+    NAME_FUNC_OFFSET(14725, glHistogram, glHistogram, NULL, _gloffset_Histogram),
+    NAME_FUNC_OFFSET(14740, glMinmax, glMinmax, NULL, _gloffset_Minmax),
+    NAME_FUNC_OFFSET(14752, glResetHistogram, glResetHistogram, NULL, _gloffset_ResetHistogram),
+    NAME_FUNC_OFFSET(14772, glResetMinmax, glResetMinmax, NULL, _gloffset_ResetMinmax),
+    NAME_FUNC_OFFSET(14789, glTexImage3D, glTexImage3D, NULL, _gloffset_TexImage3D),
+    NAME_FUNC_OFFSET(14805, glTexSubImage3D, glTexSubImage3D, NULL, _gloffset_TexSubImage3D),
+    NAME_FUNC_OFFSET(14824, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, _gloffset_CopyTexSubImage3D),
+    NAME_FUNC_OFFSET(14847, glActiveTextureARB, glActiveTextureARB, NULL, _gloffset_ActiveTextureARB),
+    NAME_FUNC_OFFSET(14863, glClientActiveTextureARB, glClientActiveTextureARB, NULL, _gloffset_ClientActiveTextureARB),
+    NAME_FUNC_OFFSET(14885, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL, _gloffset_MultiTexCoord1dARB),
+    NAME_FUNC_OFFSET(14903, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL, _gloffset_MultiTexCoord1dvARB),
+    NAME_FUNC_OFFSET(14922, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, _gloffset_MultiTexCoord1fARB),
+    NAME_FUNC_OFFSET(14940, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, _gloffset_MultiTexCoord1fvARB),
+    NAME_FUNC_OFFSET(14959, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL, _gloffset_MultiTexCoord1iARB),
+    NAME_FUNC_OFFSET(14977, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL, _gloffset_MultiTexCoord1ivARB),
+    NAME_FUNC_OFFSET(14996, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL, _gloffset_MultiTexCoord1sARB),
+    NAME_FUNC_OFFSET(15014, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL, _gloffset_MultiTexCoord1svARB),
+    NAME_FUNC_OFFSET(15033, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL, _gloffset_MultiTexCoord2dARB),
+    NAME_FUNC_OFFSET(15051, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL, _gloffset_MultiTexCoord2dvARB),
+    NAME_FUNC_OFFSET(15070, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, _gloffset_MultiTexCoord2fARB),
+    NAME_FUNC_OFFSET(15088, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, _gloffset_MultiTexCoord2fvARB),
+    NAME_FUNC_OFFSET(15107, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL, _gloffset_MultiTexCoord2iARB),
+    NAME_FUNC_OFFSET(15125, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL, _gloffset_MultiTexCoord2ivARB),
+    NAME_FUNC_OFFSET(15144, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL, _gloffset_MultiTexCoord2sARB),
+    NAME_FUNC_OFFSET(15162, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL, _gloffset_MultiTexCoord2svARB),
+    NAME_FUNC_OFFSET(15181, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL, _gloffset_MultiTexCoord3dARB),
+    NAME_FUNC_OFFSET(15199, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL, _gloffset_MultiTexCoord3dvARB),
+    NAME_FUNC_OFFSET(15218, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, _gloffset_MultiTexCoord3fARB),
+    NAME_FUNC_OFFSET(15236, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, _gloffset_MultiTexCoord3fvARB),
+    NAME_FUNC_OFFSET(15255, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL, _gloffset_MultiTexCoord3iARB),
+    NAME_FUNC_OFFSET(15273, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL, _gloffset_MultiTexCoord3ivARB),
+    NAME_FUNC_OFFSET(15292, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL, _gloffset_MultiTexCoord3sARB),
+    NAME_FUNC_OFFSET(15310, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL, _gloffset_MultiTexCoord3svARB),
+    NAME_FUNC_OFFSET(15329, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL, _gloffset_MultiTexCoord4dARB),
+    NAME_FUNC_OFFSET(15347, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL, _gloffset_MultiTexCoord4dvARB),
+    NAME_FUNC_OFFSET(15366, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, _gloffset_MultiTexCoord4fARB),
+    NAME_FUNC_OFFSET(15384, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, _gloffset_MultiTexCoord4fvARB),
+    NAME_FUNC_OFFSET(15403, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL, _gloffset_MultiTexCoord4iARB),
+    NAME_FUNC_OFFSET(15421, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL, _gloffset_MultiTexCoord4ivARB),
+    NAME_FUNC_OFFSET(15440, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL, _gloffset_MultiTexCoord4sARB),
+    NAME_FUNC_OFFSET(15458, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL, _gloffset_MultiTexCoord4svARB),
+    NAME_FUNC_OFFSET(15477, glStencilOpSeparate, glStencilOpSeparate, NULL, _gloffset_StencilOpSeparate),
+    NAME_FUNC_OFFSET(15500, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, _gloffset_LoadTransposeMatrixdARB),
+    NAME_FUNC_OFFSET(15523, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, _gloffset_LoadTransposeMatrixfARB),
+    NAME_FUNC_OFFSET(15546, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, _gloffset_MultTransposeMatrixdARB),
+    NAME_FUNC_OFFSET(15569, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB, NULL, _gloffset_MultTransposeMatrixfARB),
+    NAME_FUNC_OFFSET(15592, glSampleCoverageARB, glSampleCoverageARB, NULL, _gloffset_SampleCoverageARB),
+    NAME_FUNC_OFFSET(15609, glCompressedTexImage1DARB, glCompressedTexImage1DARB, NULL, _gloffset_CompressedTexImage1DARB),
+    NAME_FUNC_OFFSET(15632, glCompressedTexImage2DARB, glCompressedTexImage2DARB, NULL, _gloffset_CompressedTexImage2DARB),
+    NAME_FUNC_OFFSET(15655, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, _gloffset_CompressedTexImage3DARB),
+    NAME_FUNC_OFFSET(15678, glCompressedTexSubImage1DARB, glCompressedTexSubImage1DARB, NULL, _gloffset_CompressedTexSubImage1DARB),
+    NAME_FUNC_OFFSET(15704, glCompressedTexSubImage2DARB, glCompressedTexSubImage2DARB, NULL, _gloffset_CompressedTexSubImage2DARB),
+    NAME_FUNC_OFFSET(15730, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, _gloffset_CompressedTexSubImage3DARB),
+    NAME_FUNC_OFFSET(15756, glGetCompressedTexImageARB, glGetCompressedTexImageARB, NULL, _gloffset_GetCompressedTexImageARB),
+    NAME_FUNC_OFFSET(15780, glDisableVertexAttribArrayARB, glDisableVertexAttribArrayARB, NULL, _gloffset_DisableVertexAttribArrayARB),
+    NAME_FUNC_OFFSET(15807, glEnableVertexAttribArrayARB, glEnableVertexAttribArrayARB, NULL, _gloffset_EnableVertexAttribArrayARB),
+    NAME_FUNC_OFFSET(15833, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL, _gloffset_GetVertexAttribdvARB),
+    NAME_FUNC_OFFSET(15853, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL, _gloffset_GetVertexAttribfvARB),
+    NAME_FUNC_OFFSET(15873, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL, _gloffset_GetVertexAttribivARB),
+    NAME_FUNC_OFFSET(15893, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, _gloffset_ProgramEnvParameter4dARB),
+    NAME_FUNC_OFFSET(15916, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, _gloffset_ProgramEnvParameter4dvARB),
+    NAME_FUNC_OFFSET(15940, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, _gloffset_ProgramEnvParameter4fARB),
+    NAME_FUNC_OFFSET(15963, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, _gloffset_ProgramEnvParameter4fvARB),
+    NAME_FUNC_OFFSET(15987, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, _gloffset_VertexAttrib1dARB),
+    NAME_FUNC_OFFSET(16004, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL, _gloffset_VertexAttrib1dvARB),
+    NAME_FUNC_OFFSET(16022, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, _gloffset_VertexAttrib1fARB),
+    NAME_FUNC_OFFSET(16039, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, _gloffset_VertexAttrib1fvARB),
+    NAME_FUNC_OFFSET(16057, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, _gloffset_VertexAttrib1sARB),
+    NAME_FUNC_OFFSET(16074, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL, _gloffset_VertexAttrib1svARB),
+    NAME_FUNC_OFFSET(16092, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, _gloffset_VertexAttrib2dARB),
+    NAME_FUNC_OFFSET(16109, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL, _gloffset_VertexAttrib2dvARB),
+    NAME_FUNC_OFFSET(16127, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, _gloffset_VertexAttrib2fARB),
+    NAME_FUNC_OFFSET(16144, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, _gloffset_VertexAttrib2fvARB),
+    NAME_FUNC_OFFSET(16162, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, _gloffset_VertexAttrib2sARB),
+    NAME_FUNC_OFFSET(16179, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL, _gloffset_VertexAttrib2svARB),
+    NAME_FUNC_OFFSET(16197, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, _gloffset_VertexAttrib3dARB),
+    NAME_FUNC_OFFSET(16214, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL, _gloffset_VertexAttrib3dvARB),
+    NAME_FUNC_OFFSET(16232, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, _gloffset_VertexAttrib3fARB),
+    NAME_FUNC_OFFSET(16249, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, _gloffset_VertexAttrib3fvARB),
+    NAME_FUNC_OFFSET(16267, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, _gloffset_VertexAttrib3sARB),
+    NAME_FUNC_OFFSET(16284, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL, _gloffset_VertexAttrib3svARB),
+    NAME_FUNC_OFFSET(16302, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL, _gloffset_VertexAttrib4NbvARB),
+    NAME_FUNC_OFFSET(16321, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL, _gloffset_VertexAttrib4NivARB),
+    NAME_FUNC_OFFSET(16340, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL, _gloffset_VertexAttrib4NsvARB),
+    NAME_FUNC_OFFSET(16359, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL, _gloffset_VertexAttrib4NubARB),
+    NAME_FUNC_OFFSET(16378, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, _gloffset_VertexAttrib4NubvARB),
+    NAME_FUNC_OFFSET(16398, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, _gloffset_VertexAttrib4NuivARB),
+    NAME_FUNC_OFFSET(16418, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, _gloffset_VertexAttrib4NusvARB),
+    NAME_FUNC_OFFSET(16438, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, _gloffset_VertexAttrib4bvARB),
+    NAME_FUNC_OFFSET(16456, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, _gloffset_VertexAttrib4dARB),
+    NAME_FUNC_OFFSET(16473, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, _gloffset_VertexAttrib4dvARB),
+    NAME_FUNC_OFFSET(16491, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, _gloffset_VertexAttrib4fARB),
+    NAME_FUNC_OFFSET(16508, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, _gloffset_VertexAttrib4fvARB),
+    NAME_FUNC_OFFSET(16526, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, _gloffset_VertexAttrib4ivARB),
+    NAME_FUNC_OFFSET(16544, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, _gloffset_VertexAttrib4sARB),
+    NAME_FUNC_OFFSET(16561, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, _gloffset_VertexAttrib4svARB),
+    NAME_FUNC_OFFSET(16579, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, _gloffset_VertexAttrib4ubvARB),
+    NAME_FUNC_OFFSET(16598, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, _gloffset_VertexAttrib4uivARB),
+    NAME_FUNC_OFFSET(16617, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, _gloffset_VertexAttrib4usvARB),
+    NAME_FUNC_OFFSET(16636, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, _gloffset_VertexAttribPointerARB),
+    NAME_FUNC_OFFSET(16658, glBindBufferARB, glBindBufferARB, NULL, _gloffset_BindBufferARB),
+    NAME_FUNC_OFFSET(16671, glBufferDataARB, glBufferDataARB, NULL, _gloffset_BufferDataARB),
+    NAME_FUNC_OFFSET(16684, glBufferSubDataARB, glBufferSubDataARB, NULL, _gloffset_BufferSubDataARB),
+    NAME_FUNC_OFFSET(16700, glDeleteBuffersARB, glDeleteBuffersARB, NULL, _gloffset_DeleteBuffersARB),
+    NAME_FUNC_OFFSET(16716, glGenBuffersARB, glGenBuffersARB, NULL, _gloffset_GenBuffersARB),
+    NAME_FUNC_OFFSET(16729, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, _gloffset_GetBufferParameterivARB),
+    NAME_FUNC_OFFSET(16752, glGetBufferPointervARB, glGetBufferPointervARB, NULL, _gloffset_GetBufferPointervARB),
+    NAME_FUNC_OFFSET(16772, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, _gloffset_GetBufferSubDataARB),
+    NAME_FUNC_OFFSET(16791, glIsBufferARB, glIsBufferARB, NULL, _gloffset_IsBufferARB),
+    NAME_FUNC_OFFSET(16802, glMapBufferARB, glMapBufferARB, NULL, _gloffset_MapBufferARB),
+    NAME_FUNC_OFFSET(16814, glUnmapBufferARB, glUnmapBufferARB, NULL, _gloffset_UnmapBufferARB),
+    NAME_FUNC_OFFSET(16828, glBeginQueryARB, glBeginQueryARB, NULL, _gloffset_BeginQueryARB),
+    NAME_FUNC_OFFSET(16841, glDeleteQueriesARB, glDeleteQueriesARB, NULL, _gloffset_DeleteQueriesARB),
+    NAME_FUNC_OFFSET(16857, glEndQueryARB, glEndQueryARB, NULL, _gloffset_EndQueryARB),
+    NAME_FUNC_OFFSET(16868, glGenQueriesARB, glGenQueriesARB, NULL, _gloffset_GenQueriesARB),
+    NAME_FUNC_OFFSET(16881, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, _gloffset_GetQueryObjectivARB),
+    NAME_FUNC_OFFSET(16900, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, _gloffset_GetQueryObjectuivARB),
+    NAME_FUNC_OFFSET(16920, glGetQueryivARB, glGetQueryivARB, NULL, _gloffset_GetQueryivARB),
+    NAME_FUNC_OFFSET(16933, glIsQueryARB, glIsQueryARB, NULL, _gloffset_IsQueryARB),
+    NAME_FUNC_OFFSET(16943, glCompileShaderARB, glCompileShaderARB, NULL, _gloffset_CompileShaderARB),
+    NAME_FUNC_OFFSET(16959, glGetActiveUniformARB, glGetActiveUniformARB, NULL, _gloffset_GetActiveUniformARB),
+    NAME_FUNC_OFFSET(16978, glGetShaderSourceARB, glGetShaderSourceARB, NULL, _gloffset_GetShaderSourceARB),
+    NAME_FUNC_OFFSET(16996, glGetUniformLocationARB, glGetUniformLocationARB, NULL, _gloffset_GetUniformLocationARB),
+    NAME_FUNC_OFFSET(17017, glGetUniformfvARB, glGetUniformfvARB, NULL, _gloffset_GetUniformfvARB),
+    NAME_FUNC_OFFSET(17032, glGetUniformivARB, glGetUniformivARB, NULL, _gloffset_GetUniformivARB),
+    NAME_FUNC_OFFSET(17047, glLinkProgramARB, glLinkProgramARB, NULL, _gloffset_LinkProgramARB),
+    NAME_FUNC_OFFSET(17061, glShaderSourceARB, glShaderSourceARB, NULL, _gloffset_ShaderSourceARB),
+    NAME_FUNC_OFFSET(17076, glUniform1fARB, glUniform1fARB, NULL, _gloffset_Uniform1fARB),
+    NAME_FUNC_OFFSET(17088, glUniform1fvARB, glUniform1fvARB, NULL, _gloffset_Uniform1fvARB),
+    NAME_FUNC_OFFSET(17101, glUniform1iARB, glUniform1iARB, NULL, _gloffset_Uniform1iARB),
+    NAME_FUNC_OFFSET(17113, glUniform1ivARB, glUniform1ivARB, NULL, _gloffset_Uniform1ivARB),
+    NAME_FUNC_OFFSET(17126, glUniform2fARB, glUniform2fARB, NULL, _gloffset_Uniform2fARB),
+    NAME_FUNC_OFFSET(17138, glUniform2fvARB, glUniform2fvARB, NULL, _gloffset_Uniform2fvARB),
+    NAME_FUNC_OFFSET(17151, glUniform2iARB, glUniform2iARB, NULL, _gloffset_Uniform2iARB),
+    NAME_FUNC_OFFSET(17163, glUniform2ivARB, glUniform2ivARB, NULL, _gloffset_Uniform2ivARB),
+    NAME_FUNC_OFFSET(17176, glUniform3fARB, glUniform3fARB, NULL, _gloffset_Uniform3fARB),
+    NAME_FUNC_OFFSET(17188, glUniform3fvARB, glUniform3fvARB, NULL, _gloffset_Uniform3fvARB),
+    NAME_FUNC_OFFSET(17201, glUniform3iARB, glUniform3iARB, NULL, _gloffset_Uniform3iARB),
+    NAME_FUNC_OFFSET(17213, glUniform3ivARB, glUniform3ivARB, NULL, _gloffset_Uniform3ivARB),
+    NAME_FUNC_OFFSET(17226, glUniform4fARB, glUniform4fARB, NULL, _gloffset_Uniform4fARB),
+    NAME_FUNC_OFFSET(17238, glUniform4fvARB, glUniform4fvARB, NULL, _gloffset_Uniform4fvARB),
+    NAME_FUNC_OFFSET(17251, glUniform4iARB, glUniform4iARB, NULL, _gloffset_Uniform4iARB),
+    NAME_FUNC_OFFSET(17263, glUniform4ivARB, glUniform4ivARB, NULL, _gloffset_Uniform4ivARB),
+    NAME_FUNC_OFFSET(17276, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, _gloffset_UniformMatrix2fvARB),
+    NAME_FUNC_OFFSET(17295, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, _gloffset_UniformMatrix3fvARB),
+    NAME_FUNC_OFFSET(17314, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, _gloffset_UniformMatrix4fvARB),
+    NAME_FUNC_OFFSET(17333, glUseProgramObjectARB, glUseProgramObjectARB, NULL, _gloffset_UseProgramObjectARB),
+    NAME_FUNC_OFFSET(17346, glValidateProgramARB, glValidateProgramARB, NULL, _gloffset_ValidateProgramARB),
+    NAME_FUNC_OFFSET(17364, glBindAttribLocationARB, glBindAttribLocationARB, NULL, _gloffset_BindAttribLocationARB),
+    NAME_FUNC_OFFSET(17385, glGetActiveAttribARB, glGetActiveAttribARB, NULL, _gloffset_GetActiveAttribARB),
+    NAME_FUNC_OFFSET(17403, glGetAttribLocationARB, glGetAttribLocationARB, NULL, _gloffset_GetAttribLocationARB),
+    NAME_FUNC_OFFSET(17423, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
+    NAME_FUNC_OFFSET(17437, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
+    NAME_FUNC_OFFSET(17454, gl_dispatch_stub_569, gl_dispatch_stub_569, NULL, _gloffset_SampleMaskSGIS),
+    NAME_FUNC_OFFSET(17470, gl_dispatch_stub_570, gl_dispatch_stub_570, NULL, _gloffset_SamplePatternSGIS),
+    NAME_FUNC_OFFSET(17489, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(17507, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(17528, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(17550, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(17569, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(17591, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(17614, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
+    NAME_FUNC_OFFSET(17633, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
+    NAME_FUNC_OFFSET(17653, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
+    NAME_FUNC_OFFSET(17672, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
+    NAME_FUNC_OFFSET(17692, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
+    NAME_FUNC_OFFSET(17711, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
+    NAME_FUNC_OFFSET(17731, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
+    NAME_FUNC_OFFSET(17750, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
+    NAME_FUNC_OFFSET(17770, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
+    NAME_FUNC_OFFSET(17789, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
+    NAME_FUNC_OFFSET(17809, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
+    NAME_FUNC_OFFSET(17829, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
+    NAME_FUNC_OFFSET(17850, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
+    NAME_FUNC_OFFSET(17870, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
+    NAME_FUNC_OFFSET(17891, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
+    NAME_FUNC_OFFSET(17911, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
+    NAME_FUNC_OFFSET(17932, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
+    NAME_FUNC_OFFSET(17956, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
+    NAME_FUNC_OFFSET(17974, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
+    NAME_FUNC_OFFSET(17994, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
+    NAME_FUNC_OFFSET(18012, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
+    NAME_FUNC_OFFSET(18024, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
+    NAME_FUNC_OFFSET(18037, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
+    NAME_FUNC_OFFSET(18049, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
+    NAME_FUNC_OFFSET(18062, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
+    NAME_FUNC_OFFSET(18082, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
+    NAME_FUNC_OFFSET(18106, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
+    NAME_FUNC_OFFSET(18120, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
+    NAME_FUNC_OFFSET(18137, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
+    NAME_FUNC_OFFSET(18152, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
+    NAME_FUNC_OFFSET(18170, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
+    NAME_FUNC_OFFSET(18184, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
+    NAME_FUNC_OFFSET(18201, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
+    NAME_FUNC_OFFSET(18216, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
+    NAME_FUNC_OFFSET(18234, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
+    NAME_FUNC_OFFSET(18248, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
+    NAME_FUNC_OFFSET(18265, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
+    NAME_FUNC_OFFSET(18280, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
+    NAME_FUNC_OFFSET(18298, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
+    NAME_FUNC_OFFSET(18312, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
+    NAME_FUNC_OFFSET(18329, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
+    NAME_FUNC_OFFSET(18344, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
+    NAME_FUNC_OFFSET(18362, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
+    NAME_FUNC_OFFSET(18376, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
+    NAME_FUNC_OFFSET(18393, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
+    NAME_FUNC_OFFSET(18408, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
+    NAME_FUNC_OFFSET(18426, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
+    NAME_FUNC_OFFSET(18440, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
+    NAME_FUNC_OFFSET(18457, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
+    NAME_FUNC_OFFSET(18472, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
+    NAME_FUNC_OFFSET(18490, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
+    NAME_FUNC_OFFSET(18504, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
+    NAME_FUNC_OFFSET(18521, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
+    NAME_FUNC_OFFSET(18536, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
+    NAME_FUNC_OFFSET(18554, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
+    NAME_FUNC_OFFSET(18568, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
+    NAME_FUNC_OFFSET(18585, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
+    NAME_FUNC_OFFSET(18600, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
+    NAME_FUNC_OFFSET(18618, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
+    NAME_FUNC_OFFSET(18635, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
+    NAME_FUNC_OFFSET(18655, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
+    NAME_FUNC_OFFSET(18672, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
+    NAME_FUNC_OFFSET(18698, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
+    NAME_FUNC_OFFSET(18727, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
+    NAME_FUNC_OFFSET(18742, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
+    NAME_FUNC_OFFSET(18760, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
+    NAME_FUNC_OFFSET(18779, gl_dispatch_stub_746, gl_dispatch_stub_746, NULL, _gloffset_BlendEquationSeparateEXT),
+    NAME_FUNC_OFFSET(18803, gl_dispatch_stub_746, gl_dispatch_stub_746, NULL, _gloffset_BlendEquationSeparateEXT),
+    NAME_FUNC_OFFSET(18830, glBindFramebufferEXT, glBindFramebufferEXT, NULL, _gloffset_BindFramebufferEXT),
+    NAME_FUNC_OFFSET(18848, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, _gloffset_BindRenderbufferEXT),
+    NAME_FUNC_OFFSET(18867, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, _gloffset_CheckFramebufferStatusEXT),
+    NAME_FUNC_OFFSET(18892, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, _gloffset_DeleteFramebuffersEXT),
+    NAME_FUNC_OFFSET(18913, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, _gloffset_DeleteRenderbuffersEXT),
+    NAME_FUNC_OFFSET(18935, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, _gloffset_FramebufferRenderbufferEXT),
+    NAME_FUNC_OFFSET(18961, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, _gloffset_FramebufferTexture1DEXT),
+    NAME_FUNC_OFFSET(18984, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, _gloffset_FramebufferTexture2DEXT),
+    NAME_FUNC_OFFSET(19007, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, _gloffset_FramebufferTexture3DEXT),
+    NAME_FUNC_OFFSET(19030, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, _gloffset_GenFramebuffersEXT),
+    NAME_FUNC_OFFSET(19048, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, _gloffset_GenRenderbuffersEXT),
+    NAME_FUNC_OFFSET(19067, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, _gloffset_GenerateMipmapEXT),
+    NAME_FUNC_OFFSET(19084, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, _gloffset_GetFramebufferAttachmentParameterivEXT),
+    NAME_FUNC_OFFSET(19122, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, _gloffset_GetRenderbufferParameterivEXT),
+    NAME_FUNC_OFFSET(19151, glIsFramebufferEXT, glIsFramebufferEXT, NULL, _gloffset_IsFramebufferEXT),
+    NAME_FUNC_OFFSET(19167, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, _gloffset_IsRenderbufferEXT),
+    NAME_FUNC_OFFSET(19184, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, _gloffset_RenderbufferStorageEXT),
+    NAME_FUNC_OFFSET(19206, gl_dispatch_stub_764, gl_dispatch_stub_764, NULL, _gloffset_BlitFramebufferEXT),
+    NAME_FUNC_OFFSET(19224, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
     NAME_FUNC_OFFSET(-1, NULL, NULL, NULL, 0)
 };
 
diff --git a/src/mesa/main/enums.c b/src/mesa/main/enums.c
index 4796f3027a..a864f5a070 100644
--- a/src/mesa/main/enums.c
+++ b/src/mesa/main/enums.c
@@ -180,21 +180,37 @@ LONGSTRING static const char enum_string_table[] =
    "GL_COLOR_ARRAY_SIZE\0"
    "GL_COLOR_ARRAY_STRIDE\0"
    "GL_COLOR_ARRAY_TYPE\0"
+   "GL_COLOR_ATTACHMENT0\0"
    "GL_COLOR_ATTACHMENT0_EXT\0"
+   "GL_COLOR_ATTACHMENT1\0"
+   "GL_COLOR_ATTACHMENT10\0"
    "GL_COLOR_ATTACHMENT10_EXT\0"
+   "GL_COLOR_ATTACHMENT11\0"
    "GL_COLOR_ATTACHMENT11_EXT\0"
+   "GL_COLOR_ATTACHMENT12\0"
    "GL_COLOR_ATTACHMENT12_EXT\0"
+   "GL_COLOR_ATTACHMENT13\0"
    "GL_COLOR_ATTACHMENT13_EXT\0"
+   "GL_COLOR_ATTACHMENT14\0"
    "GL_COLOR_ATTACHMENT14_EXT\0"
+   "GL_COLOR_ATTACHMENT15\0"
    "GL_COLOR_ATTACHMENT15_EXT\0"
    "GL_COLOR_ATTACHMENT1_EXT\0"
+   "GL_COLOR_ATTACHMENT2\0"
    "GL_COLOR_ATTACHMENT2_EXT\0"
+   "GL_COLOR_ATTACHMENT3\0"
    "GL_COLOR_ATTACHMENT3_EXT\0"
+   "GL_COLOR_ATTACHMENT4\0"
    "GL_COLOR_ATTACHMENT4_EXT\0"
+   "GL_COLOR_ATTACHMENT5\0"
    "GL_COLOR_ATTACHMENT5_EXT\0"
+   "GL_COLOR_ATTACHMENT6\0"
    "GL_COLOR_ATTACHMENT6_EXT\0"
+   "GL_COLOR_ATTACHMENT7\0"
    "GL_COLOR_ATTACHMENT7_EXT\0"
+   "GL_COLOR_ATTACHMENT8\0"
    "GL_COLOR_ATTACHMENT8_EXT\0"
+   "GL_COLOR_ATTACHMENT9\0"
    "GL_COLOR_ATTACHMENT9_EXT\0"
    "GL_COLOR_BUFFER_BIT\0"
    "GL_COLOR_CLEAR_VALUE\0"
@@ -348,6 +364,8 @@ LONGSTRING static const char enum_string_table[] =
    "GL_DECR_WRAP_EXT\0"
    "GL_DELETE_STATUS\0"
    "GL_DEPTH\0"
+   "GL_DEPTH24_STENCIL8\0"
+   "GL_DEPTH_ATTACHMENT\0"
    "GL_DEPTH_ATTACHMENT_EXT\0"
    "GL_DEPTH_BIAS\0"
    "GL_DEPTH_BITS\0"
@@ -369,6 +387,8 @@ LONGSTRING static const char enum_string_table[] =
    "GL_DEPTH_FUNC\0"
    "GL_DEPTH_RANGE\0"
    "GL_DEPTH_SCALE\0"
+   "GL_DEPTH_STENCIL\0"
+   "GL_DEPTH_STENCIL_ATTACHMENT\0"
    "GL_DEPTH_STENCIL_NV\0"
    "GL_DEPTH_STENCIL_TO_BGRA_NV\0"
    "GL_DEPTH_STENCIL_TO_RGBA_NV\0"
@@ -437,6 +457,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_DRAW_BUFFER9\0"
    "GL_DRAW_BUFFER9_ARB\0"
    "GL_DRAW_BUFFER9_ATI\0"
+   "GL_DRAW_FRAMEBUFFER\0"
    "GL_DRAW_FRAMEBUFFER_BINDING_EXT\0"
    "GL_DRAW_FRAMEBUFFER_EXT\0"
    "GL_DRAW_PIXEL_TOKEN\0"
@@ -522,23 +543,44 @@ LONGSTRING static const char enum_string_table[] =
    "GL_FRAGMENT_SHADER\0"
    "GL_FRAGMENT_SHADER_ARB\0"
    "GL_FRAGMENT_SHADER_DERIVATIVE_HINT\0"
+   "GL_FRAMEBUFFER\0"
+   "GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE\0"
+   "GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE\0"
+   "GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING\0"
+   "GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE\0"
+   "GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE\0"
+   "GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE\0"
+   "GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME\0"
    "GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT\0"
+   "GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE\0"
    "GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT\0"
+   "GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE\0"
+   "GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE\0"
    "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT\0"
+   "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE\0"
    "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT\0"
+   "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER\0"
    "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT\0"
+   "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL\0"
    "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT\0"
    "GL_FRAMEBUFFER_BINDING_EXT\0"
+   "GL_FRAMEBUFFER_COMPLETE\0"
    "GL_FRAMEBUFFER_COMPLETE_EXT\0"
+   "GL_FRAMEBUFFER_DEFAULT\0"
    "GL_FRAMEBUFFER_EXT\0"
+   "GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT\0"
    "GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT\0"
    "GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT\0"
    "GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT\0"
    "GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT\0"
    "GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT\0"
+   "GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT\0"
    "GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT\0"
+   "GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE\0"
    "GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT\0"
    "GL_FRAMEBUFFER_STATUS_ERROR_EXT\0"
+   "GL_FRAMEBUFFER_UNDEFINED\0"
+   "GL_FRAMEBUFFER_UNSUPPORTED\0"
    "GL_FRAMEBUFFER_UNSUPPORTED_EXT\0"
    "GL_FRONT\0"
    "GL_FRONT_AND_BACK\0"
@@ -611,6 +653,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_INCR\0"
    "GL_INCR_WRAP\0"
    "GL_INCR_WRAP_EXT\0"
+   "GL_INDEX\0"
    "GL_INDEX_ARRAY\0"
    "GL_INDEX_ARRAY_BUFFER_BINDING\0"
    "GL_INDEX_ARRAY_BUFFER_BINDING_ARB\0"
@@ -646,6 +689,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_INT_VEC4\0"
    "GL_INT_VEC4_ARB\0"
    "GL_INVALID_ENUM\0"
+   "GL_INVALID_FRAMEBUFFER_OPERATION\0"
    "GL_INVALID_FRAMEBUFFER_OPERATION_EXT\0"
    "GL_INVALID_OPERATION\0"
    "GL_INVALID_VALUE\0"
@@ -890,6 +934,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB\0"
    "GL_MAX_RECTANGLE_TEXTURE_SIZE_NV\0"
    "GL_MAX_RENDERBUFFER_SIZE_EXT\0"
+   "GL_MAX_SAMPLES\0"
    "GL_MAX_SHININESS_NV\0"
    "GL_MAX_SPOT_EXPONENT_NV\0"
    "GL_MAX_TEXTURE_COORDS\0"
@@ -1257,6 +1302,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_R3_G3_B2\0"
    "GL_RASTER_POSITION_UNCLIPPED_IBM\0"
    "GL_READ_BUFFER\0"
+   "GL_READ_FRAMEBUFFER\0"
    "GL_READ_FRAMEBUFFER_BINDING_EXT\0"
    "GL_READ_FRAMEBUFFER_EXT\0"
    "GL_READ_ONLY\0"
@@ -1273,10 +1319,21 @@ LONGSTRING static const char enum_string_table[] =
    "GL_REFLECTION_MAP_ARB\0"
    "GL_REFLECTION_MAP_NV\0"
    "GL_RENDER\0"
+   "GL_RENDERBUFFER\0"
+   "GL_RENDERBUFFER_ALPHA_SIZE\0"
    "GL_RENDERBUFFER_BINDING_EXT\0"
+   "GL_RENDERBUFFER_BLUE_SIZE\0"
+   "GL_RENDERBUFFER_DEPTH_SIZE\0"
    "GL_RENDERBUFFER_EXT\0"
+   "GL_RENDERBUFFER_GREEN_SIZE\0"
+   "GL_RENDERBUFFER_HEIGHT\0"
    "GL_RENDERBUFFER_HEIGHT_EXT\0"
+   "GL_RENDERBUFFER_INTERNAL_FORMAT\0"
    "GL_RENDERBUFFER_INTERNAL_FORMAT_EXT\0"
+   "GL_RENDERBUFFER_RED_SIZE\0"
+   "GL_RENDERBUFFER_SAMPLES\0"
+   "GL_RENDERBUFFER_STENCIL_SIZE\0"
+   "GL_RENDERBUFFER_WIDTH\0"
    "GL_RENDERBUFFER_WIDTH_EXT\0"
    "GL_RENDERER\0"
    "GL_RENDER_MODE\0"
@@ -1420,6 +1477,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_SRC_ALPHA\0"
    "GL_SRC_ALPHA_SATURATE\0"
    "GL_SRC_COLOR\0"
+   "GL_SRGB\0"
    "GL_STACK_OVERFLOW\0"
    "GL_STACK_UNDERFLOW\0"
    "GL_STATIC_COPY\0"
@@ -1429,6 +1487,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_STATIC_READ\0"
    "GL_STATIC_READ_ARB\0"
    "GL_STENCIL\0"
+   "GL_STENCIL_ATTACHMENT\0"
    "GL_STENCIL_ATTACHMENT_EXT\0"
    "GL_STENCIL_BACK_FAIL\0"
    "GL_STENCIL_BACK_FAIL_ATI\0"
@@ -1654,6 +1713,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_TEXTURE_RED_SIZE_EXT\0"
    "GL_TEXTURE_RESIDENT\0"
    "GL_TEXTURE_STACK_DEPTH\0"
+   "GL_TEXTURE_STENCIL_SIZE\0"
    "GL_TEXTURE_TOO_LARGE_EXT\0"
    "GL_TEXTURE_UNSIGNED_REMAP_MODE_NV\0"
    "GL_TEXTURE_WIDTH\0"
@@ -1692,10 +1752,12 @@ LONGSTRING static const char enum_string_table[] =
    "GL_UNSIGNED_BYTE_3_3_2\0"
    "GL_UNSIGNED_INT\0"
    "GL_UNSIGNED_INT_10_10_10_2\0"
+   "GL_UNSIGNED_INT_24_8\0"
    "GL_UNSIGNED_INT_24_8_NV\0"
    "GL_UNSIGNED_INT_2_10_10_10_REV\0"
    "GL_UNSIGNED_INT_8_8_8_8\0"
    "GL_UNSIGNED_INT_8_8_8_8_REV\0"
+   "GL_UNSIGNED_NORMALIZED\0"
    "GL_UNSIGNED_SHORT\0"
    "GL_UNSIGNED_SHORT_1_5_5_5_REV\0"
    "GL_UNSIGNED_SHORT_4_4_4_4\0"
@@ -1785,7 +1847,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_ZOOM_Y\0"
    ;
 
-static const enum_elt all_enums[1748] =
+static const enum_elt all_enums[1810] =
 {
    {     0, 0x00000600 }, /* GL_2D */
    {     6, 0x00001407 }, /* GL_2_BYTES */
@@ -1932,2896 +1994,2982 @@ static const enum_elt all_enums[1748] =
    {  2414, 0x00008081 }, /* GL_COLOR_ARRAY_SIZE */
    {  2434, 0x00008083 }, /* GL_COLOR_ARRAY_STRIDE */
    {  2456, 0x00008082 }, /* GL_COLOR_ARRAY_TYPE */
-   {  2476, 0x00008CE0 }, /* GL_COLOR_ATTACHMENT0_EXT */
-   {  2501, 0x00008CEA }, /* GL_COLOR_ATTACHMENT10_EXT */
-   {  2527, 0x00008CEB }, /* GL_COLOR_ATTACHMENT11_EXT */
-   {  2553, 0x00008CEC }, /* GL_COLOR_ATTACHMENT12_EXT */
-   {  2579, 0x00008CED }, /* GL_COLOR_ATTACHMENT13_EXT */
-   {  2605, 0x00008CEE }, /* GL_COLOR_ATTACHMENT14_EXT */
-   {  2631, 0x00008CEF }, /* GL_COLOR_ATTACHMENT15_EXT */
-   {  2657, 0x00008CE1 }, /* GL_COLOR_ATTACHMENT1_EXT */
-   {  2682, 0x00008CE2 }, /* GL_COLOR_ATTACHMENT2_EXT */
-   {  2707, 0x00008CE3 }, /* GL_COLOR_ATTACHMENT3_EXT */
-   {  2732, 0x00008CE4 }, /* GL_COLOR_ATTACHMENT4_EXT */
-   {  2757, 0x00008CE5 }, /* GL_COLOR_ATTACHMENT5_EXT */
-   {  2782, 0x00008CE6 }, /* GL_COLOR_ATTACHMENT6_EXT */
-   {  2807, 0x00008CE7 }, /* GL_COLOR_ATTACHMENT7_EXT */
-   {  2832, 0x00008CE8 }, /* GL_COLOR_ATTACHMENT8_EXT */
-   {  2857, 0x00008CE9 }, /* GL_COLOR_ATTACHMENT9_EXT */
-   {  2882, 0x00004000 }, /* GL_COLOR_BUFFER_BIT */
-   {  2902, 0x00000C22 }, /* GL_COLOR_CLEAR_VALUE */
-   {  2923, 0x00001900 }, /* GL_COLOR_INDEX */
-   {  2938, 0x00001603 }, /* GL_COLOR_INDEXES */
-   {  2955, 0x00000BF2 }, /* GL_COLOR_LOGIC_OP */
-   {  2973, 0x00000B57 }, /* GL_COLOR_MATERIAL */
-   {  2991, 0x00000B55 }, /* GL_COLOR_MATERIAL_FACE */
-   {  3014, 0x00000B56 }, /* GL_COLOR_MATERIAL_PARAMETER */
-   {  3042, 0x000080B1 }, /* GL_COLOR_MATRIX */
-   {  3058, 0x000080B1 }, /* GL_COLOR_MATRIX_SGI */
-   {  3078, 0x000080B2 }, /* GL_COLOR_MATRIX_STACK_DEPTH */
-   {  3106, 0x000080B2 }, /* GL_COLOR_MATRIX_STACK_DEPTH_SGI */
-   {  3138, 0x00008458 }, /* GL_COLOR_SUM */
-   {  3151, 0x00008458 }, /* GL_COLOR_SUM_ARB */
-   {  3168, 0x000080D0 }, /* GL_COLOR_TABLE */
-   {  3183, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE */
-   {  3209, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE_EXT */
-   {  3239, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE_SGI */
-   {  3269, 0x000080D7 }, /* GL_COLOR_TABLE_BIAS */
-   {  3289, 0x000080D7 }, /* GL_COLOR_TABLE_BIAS_SGI */
-   {  3313, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE */
-   {  3338, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE_EXT */
-   {  3367, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE_SGI */
-   {  3396, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT */
-   {  3418, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT_EXT */
-   {  3444, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT_SGI */
-   {  3470, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE */
-   {  3496, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE_EXT */
-   {  3526, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE_SGI */
-   {  3556, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE */
-   {  3586, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE_EXT */
-   {  3620, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE_SGI */
-   {  3654, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE */
-   {  3684, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE_EXT */
-   {  3718, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE_SGI */
-   {  3752, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE */
-   {  3776, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE_EXT */
-   {  3804, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE_SGI */
-   {  3832, 0x000080D6 }, /* GL_COLOR_TABLE_SCALE */
-   {  3853, 0x000080D6 }, /* GL_COLOR_TABLE_SCALE_SGI */
-   {  3878, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH */
-   {  3899, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH_EXT */
-   {  3924, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH_SGI */
-   {  3949, 0x00000C23 }, /* GL_COLOR_WRITEMASK */
-   {  3968, 0x00008570 }, /* GL_COMBINE */
-   {  3979, 0x00008503 }, /* GL_COMBINE4 */
-   {  3991, 0x00008572 }, /* GL_COMBINE_ALPHA */
-   {  4008, 0x00008572 }, /* GL_COMBINE_ALPHA_ARB */
-   {  4029, 0x00008572 }, /* GL_COMBINE_ALPHA_EXT */
-   {  4050, 0x00008570 }, /* GL_COMBINE_ARB */
-   {  4065, 0x00008570 }, /* GL_COMBINE_EXT */
-   {  4080, 0x00008571 }, /* GL_COMBINE_RGB */
-   {  4095, 0x00008571 }, /* GL_COMBINE_RGB_ARB */
-   {  4114, 0x00008571 }, /* GL_COMBINE_RGB_EXT */
-   {  4133, 0x0000884E }, /* GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT */
-   {  4169, 0x0000884E }, /* GL_COMPARE_R_TO_TEXTURE */
-   {  4193, 0x0000884E }, /* GL_COMPARE_R_TO_TEXTURE_ARB */
-   {  4221, 0x00001300 }, /* GL_COMPILE */
-   {  4232, 0x00001301 }, /* GL_COMPILE_AND_EXECUTE */
-   {  4255, 0x00008B81 }, /* GL_COMPILE_STATUS */
-   {  4273, 0x000084E9 }, /* GL_COMPRESSED_ALPHA */
-   {  4293, 0x000084E9 }, /* GL_COMPRESSED_ALPHA_ARB */
-   {  4317, 0x000084EC }, /* GL_COMPRESSED_INTENSITY */
-   {  4341, 0x000084EC }, /* GL_COMPRESSED_INTENSITY_ARB */
-   {  4369, 0x000084EA }, /* GL_COMPRESSED_LUMINANCE */
-   {  4393, 0x000084EB }, /* GL_COMPRESSED_LUMINANCE_ALPHA */
-   {  4423, 0x000084EB }, /* GL_COMPRESSED_LUMINANCE_ALPHA_ARB */
-   {  4457, 0x000084EA }, /* GL_COMPRESSED_LUMINANCE_ARB */
-   {  4485, 0x000084ED }, /* GL_COMPRESSED_RGB */
-   {  4503, 0x000084EE }, /* GL_COMPRESSED_RGBA */
-   {  4522, 0x000084EE }, /* GL_COMPRESSED_RGBA_ARB */
-   {  4545, 0x000086B1 }, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
-   {  4574, 0x000083F1 }, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
-   {  4607, 0x000083F2 }, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
-   {  4640, 0x000083F3 }, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */
-   {  4673, 0x000084ED }, /* GL_COMPRESSED_RGB_ARB */
-   {  4695, 0x000086B0 }, /* GL_COMPRESSED_RGB_FXT1_3DFX */
-   {  4723, 0x000083F0 }, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
-   {  4755, 0x000086A3 }, /* GL_COMPRESSED_TEXTURE_FORMATS */
-   {  4785, 0x00008576 }, /* GL_CONSTANT */
-   {  4797, 0x00008003 }, /* GL_CONSTANT_ALPHA */
-   {  4815, 0x00008003 }, /* GL_CONSTANT_ALPHA_EXT */
-   {  4837, 0x00008576 }, /* GL_CONSTANT_ARB */
-   {  4853, 0x00001207 }, /* GL_CONSTANT_ATTENUATION */
-   {  4877, 0x00008151 }, /* GL_CONSTANT_BORDER_HP */
-   {  4899, 0x00008001 }, /* GL_CONSTANT_COLOR */
-   {  4917, 0x00008001 }, /* GL_CONSTANT_COLOR_EXT */
-   {  4939, 0x00008576 }, /* GL_CONSTANT_EXT */
-   {  4955, 0x00008010 }, /* GL_CONVOLUTION_1D */
-   {  4973, 0x00008011 }, /* GL_CONVOLUTION_2D */
-   {  4991, 0x00008154 }, /* GL_CONVOLUTION_BORDER_COLOR */
-   {  5019, 0x00008154 }, /* GL_CONVOLUTION_BORDER_COLOR_HP */
-   {  5050, 0x00008013 }, /* GL_CONVOLUTION_BORDER_MODE */
-   {  5077, 0x00008013 }, /* GL_CONVOLUTION_BORDER_MODE_EXT */
-   {  5108, 0x00008015 }, /* GL_CONVOLUTION_FILTER_BIAS */
-   {  5135, 0x00008015 }, /* GL_CONVOLUTION_FILTER_BIAS_EXT */
-   {  5166, 0x00008014 }, /* GL_CONVOLUTION_FILTER_SCALE */
-   {  5194, 0x00008014 }, /* GL_CONVOLUTION_FILTER_SCALE_EXT */
-   {  5226, 0x00008017 }, /* GL_CONVOLUTION_FORMAT */
-   {  5248, 0x00008017 }, /* GL_CONVOLUTION_FORMAT_EXT */
-   {  5274, 0x00008019 }, /* GL_CONVOLUTION_HEIGHT */
-   {  5296, 0x00008019 }, /* GL_CONVOLUTION_HEIGHT_EXT */
-   {  5322, 0x00008018 }, /* GL_CONVOLUTION_WIDTH */
-   {  5343, 0x00008018 }, /* GL_CONVOLUTION_WIDTH_EXT */
-   {  5368, 0x00008862 }, /* GL_COORD_REPLACE */
-   {  5385, 0x00008862 }, /* GL_COORD_REPLACE_ARB */
-   {  5406, 0x00008862 }, /* GL_COORD_REPLACE_NV */
-   {  5426, 0x00001503 }, /* GL_COPY */
-   {  5434, 0x0000150C }, /* GL_COPY_INVERTED */
-   {  5451, 0x00000706 }, /* GL_COPY_PIXEL_TOKEN */
-   {  5471, 0x00000B44 }, /* GL_CULL_FACE */
-   {  5484, 0x00000B45 }, /* GL_CULL_FACE_MODE */
-   {  5502, 0x000081AA }, /* GL_CULL_VERTEX_EXT */
-   {  5521, 0x000081AC }, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
-   {  5553, 0x000081AB }, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
-   {  5588, 0x00008626 }, /* GL_CURRENT_ATTRIB_NV */
-   {  5609, 0x00000001 }, /* GL_CURRENT_BIT */
-   {  5624, 0x00000B00 }, /* GL_CURRENT_COLOR */
-   {  5641, 0x00008453 }, /* GL_CURRENT_FOG_COORD */
-   {  5662, 0x00008453 }, /* GL_CURRENT_FOG_COORDINATE */
-   {  5688, 0x00000B01 }, /* GL_CURRENT_INDEX */
-   {  5705, 0x00008641 }, /* GL_CURRENT_MATRIX_ARB */
-   {  5727, 0x00008845 }, /* GL_CURRENT_MATRIX_INDEX_ARB */
-   {  5755, 0x00008641 }, /* GL_CURRENT_MATRIX_NV */
-   {  5776, 0x00008640 }, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
-   {  5810, 0x00008640 }, /* GL_CURRENT_MATRIX_STACK_DEPTH_NV */
-   {  5843, 0x00000B02 }, /* GL_CURRENT_NORMAL */
-   {  5861, 0x00008843 }, /* GL_CURRENT_PALETTE_MATRIX_ARB */
-   {  5891, 0x00008B8D }, /* GL_CURRENT_PROGRAM */
-   {  5910, 0x00008865 }, /* GL_CURRENT_QUERY */
-   {  5927, 0x00008865 }, /* GL_CURRENT_QUERY_ARB */
-   {  5948, 0x00000B04 }, /* GL_CURRENT_RASTER_COLOR */
-   {  5972, 0x00000B09 }, /* GL_CURRENT_RASTER_DISTANCE */
-   {  5999, 0x00000B05 }, /* GL_CURRENT_RASTER_INDEX */
-   {  6023, 0x00000B07 }, /* GL_CURRENT_RASTER_POSITION */
-   {  6050, 0x00000B08 }, /* GL_CURRENT_RASTER_POSITION_VALID */
-   {  6083, 0x00000B06 }, /* GL_CURRENT_RASTER_TEXTURE_COORDS */
-   {  6116, 0x00008459 }, /* GL_CURRENT_SECONDARY_COLOR */
-   {  6143, 0x00000B03 }, /* GL_CURRENT_TEXTURE_COORDS */
-   {  6169, 0x00008626 }, /* GL_CURRENT_VERTEX_ATTRIB */
-   {  6194, 0x00008626 }, /* GL_CURRENT_VERTEX_ATTRIB_ARB */
-   {  6223, 0x000086A8 }, /* GL_CURRENT_WEIGHT_ARB */
-   {  6245, 0x00000900 }, /* GL_CW */
-   {  6251, 0x0000875B }, /* GL_DEBUG_ASSERT_MESA */
-   {  6272, 0x00008759 }, /* GL_DEBUG_OBJECT_MESA */
-   {  6293, 0x0000875A }, /* GL_DEBUG_PRINT_MESA */
-   {  6313, 0x00002101 }, /* GL_DECAL */
-   {  6322, 0x00001E03 }, /* GL_DECR */
-   {  6330, 0x00008508 }, /* GL_DECR_WRAP */
-   {  6343, 0x00008508 }, /* GL_DECR_WRAP_EXT */
-   {  6360, 0x00008B80 }, /* GL_DELETE_STATUS */
-   {  6377, 0x00001801 }, /* GL_DEPTH */
-   {  6386, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT_EXT */
-   {  6410, 0x00000D1F }, /* GL_DEPTH_BIAS */
-   {  6424, 0x00000D56 }, /* GL_DEPTH_BITS */
-   {  6438, 0x00008891 }, /* GL_DEPTH_BOUNDS_EXT */
-   {  6458, 0x00008890 }, /* GL_DEPTH_BOUNDS_TEST_EXT */
-   {  6483, 0x00000100 }, /* GL_DEPTH_BUFFER_BIT */
-   {  6503, 0x0000864F }, /* GL_DEPTH_CLAMP_NV */
-   {  6521, 0x00000B73 }, /* GL_DEPTH_CLEAR_VALUE */
-   {  6542, 0x00001902 }, /* GL_DEPTH_COMPONENT */
-   {  6561, 0x000081A5 }, /* GL_DEPTH_COMPONENT16 */
-   {  6582, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_ARB */
-   {  6607, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_SGIX */
-   {  6633, 0x000081A6 }, /* GL_DEPTH_COMPONENT24 */
-   {  6654, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_ARB */
-   {  6679, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_SGIX */
-   {  6705, 0x000081A7 }, /* GL_DEPTH_COMPONENT32 */
-   {  6726, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_ARB */
-   {  6751, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_SGIX */
-   {  6777, 0x00000B74 }, /* GL_DEPTH_FUNC */
-   {  6791, 0x00000B70 }, /* GL_DEPTH_RANGE */
-   {  6806, 0x00000D1E }, /* GL_DEPTH_SCALE */
-   {  6821, 0x000084F9 }, /* GL_DEPTH_STENCIL_NV */
-   {  6841, 0x0000886F }, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
-   {  6869, 0x0000886E }, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
-   {  6897, 0x00000B71 }, /* GL_DEPTH_TEST */
-   {  6911, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE */
-   {  6933, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE_ARB */
-   {  6959, 0x00000B72 }, /* GL_DEPTH_WRITEMASK */
-   {  6978, 0x00001201 }, /* GL_DIFFUSE */
-   {  6989, 0x00000BD0 }, /* GL_DITHER */
-   {  6999, 0x00000A02 }, /* GL_DOMAIN */
-   {  7009, 0x00001100 }, /* GL_DONT_CARE */
-   {  7022, 0x000086AE }, /* GL_DOT3_RGB */
-   {  7034, 0x000086AF }, /* GL_DOT3_RGBA */
-   {  7047, 0x000086AF }, /* GL_DOT3_RGBA_ARB */
-   {  7064, 0x00008741 }, /* GL_DOT3_RGBA_EXT */
-   {  7081, 0x000086AE }, /* GL_DOT3_RGB_ARB */
-   {  7097, 0x00008740 }, /* GL_DOT3_RGB_EXT */
-   {  7113, 0x0000140A }, /* GL_DOUBLE */
-   {  7123, 0x00000C32 }, /* GL_DOUBLEBUFFER */
-   {  7139, 0x00000C01 }, /* GL_DRAW_BUFFER */
-   {  7154, 0x00008825 }, /* GL_DRAW_BUFFER0 */
-   {  7170, 0x00008825 }, /* GL_DRAW_BUFFER0_ARB */
-   {  7190, 0x00008825 }, /* GL_DRAW_BUFFER0_ATI */
-   {  7210, 0x00008826 }, /* GL_DRAW_BUFFER1 */
-   {  7226, 0x0000882F }, /* GL_DRAW_BUFFER10 */
-   {  7243, 0x0000882F }, /* GL_DRAW_BUFFER10_ARB */
-   {  7264, 0x0000882F }, /* GL_DRAW_BUFFER10_ATI */
-   {  7285, 0x00008830 }, /* GL_DRAW_BUFFER11 */
-   {  7302, 0x00008830 }, /* GL_DRAW_BUFFER11_ARB */
-   {  7323, 0x00008830 }, /* GL_DRAW_BUFFER11_ATI */
-   {  7344, 0x00008831 }, /* GL_DRAW_BUFFER12 */
-   {  7361, 0x00008831 }, /* GL_DRAW_BUFFER12_ARB */
-   {  7382, 0x00008831 }, /* GL_DRAW_BUFFER12_ATI */
-   {  7403, 0x00008832 }, /* GL_DRAW_BUFFER13 */
-   {  7420, 0x00008832 }, /* GL_DRAW_BUFFER13_ARB */
-   {  7441, 0x00008832 }, /* GL_DRAW_BUFFER13_ATI */
-   {  7462, 0x00008833 }, /* GL_DRAW_BUFFER14 */
-   {  7479, 0x00008833 }, /* GL_DRAW_BUFFER14_ARB */
-   {  7500, 0x00008833 }, /* GL_DRAW_BUFFER14_ATI */
-   {  7521, 0x00008834 }, /* GL_DRAW_BUFFER15 */
-   {  7538, 0x00008834 }, /* GL_DRAW_BUFFER15_ARB */
-   {  7559, 0x00008834 }, /* GL_DRAW_BUFFER15_ATI */
-   {  7580, 0x00008826 }, /* GL_DRAW_BUFFER1_ARB */
-   {  7600, 0x00008826 }, /* GL_DRAW_BUFFER1_ATI */
-   {  7620, 0x00008827 }, /* GL_DRAW_BUFFER2 */
-   {  7636, 0x00008827 }, /* GL_DRAW_BUFFER2_ARB */
-   {  7656, 0x00008827 }, /* GL_DRAW_BUFFER2_ATI */
-   {  7676, 0x00008828 }, /* GL_DRAW_BUFFER3 */
-   {  7692, 0x00008828 }, /* GL_DRAW_BUFFER3_ARB */
-   {  7712, 0x00008828 }, /* GL_DRAW_BUFFER3_ATI */
-   {  7732, 0x00008829 }, /* GL_DRAW_BUFFER4 */
-   {  7748, 0x00008829 }, /* GL_DRAW_BUFFER4_ARB */
-   {  7768, 0x00008829 }, /* GL_DRAW_BUFFER4_ATI */
-   {  7788, 0x0000882A }, /* GL_DRAW_BUFFER5 */
-   {  7804, 0x0000882A }, /* GL_DRAW_BUFFER5_ARB */
-   {  7824, 0x0000882A }, /* GL_DRAW_BUFFER5_ATI */
-   {  7844, 0x0000882B }, /* GL_DRAW_BUFFER6 */
-   {  7860, 0x0000882B }, /* GL_DRAW_BUFFER6_ARB */
-   {  7880, 0x0000882B }, /* GL_DRAW_BUFFER6_ATI */
-   {  7900, 0x0000882C }, /* GL_DRAW_BUFFER7 */
-   {  7916, 0x0000882C }, /* GL_DRAW_BUFFER7_ARB */
-   {  7936, 0x0000882C }, /* GL_DRAW_BUFFER7_ATI */
-   {  7956, 0x0000882D }, /* GL_DRAW_BUFFER8 */
-   {  7972, 0x0000882D }, /* GL_DRAW_BUFFER8_ARB */
-   {  7992, 0x0000882D }, /* GL_DRAW_BUFFER8_ATI */
-   {  8012, 0x0000882E }, /* GL_DRAW_BUFFER9 */
-   {  8028, 0x0000882E }, /* GL_DRAW_BUFFER9_ARB */
-   {  8048, 0x0000882E }, /* GL_DRAW_BUFFER9_ATI */
-   {  8068, 0x00008CA6 }, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
-   {  8100, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER_EXT */
-   {  8124, 0x00000705 }, /* GL_DRAW_PIXEL_TOKEN */
-   {  8144, 0x00000304 }, /* GL_DST_ALPHA */
-   {  8157, 0x00000306 }, /* GL_DST_COLOR */
-   {  8170, 0x000088EA }, /* GL_DYNAMIC_COPY */
-   {  8186, 0x000088EA }, /* GL_DYNAMIC_COPY_ARB */
-   {  8206, 0x000088E8 }, /* GL_DYNAMIC_DRAW */
-   {  8222, 0x000088E8 }, /* GL_DYNAMIC_DRAW_ARB */
-   {  8242, 0x000088E9 }, /* GL_DYNAMIC_READ */
-   {  8258, 0x000088E9 }, /* GL_DYNAMIC_READ_ARB */
-   {  8278, 0x00000B43 }, /* GL_EDGE_FLAG */
-   {  8291, 0x00008079 }, /* GL_EDGE_FLAG_ARRAY */
-   {  8310, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
-   {  8344, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB */
-   {  8382, 0x00008093 }, /* GL_EDGE_FLAG_ARRAY_POINTER */
-   {  8409, 0x0000808C }, /* GL_EDGE_FLAG_ARRAY_STRIDE */
-   {  8435, 0x00008893 }, /* GL_ELEMENT_ARRAY_BUFFER */
-   {  8459, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
-   {  8491, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB */
-   {  8527, 0x00001600 }, /* GL_EMISSION */
-   {  8539, 0x00002000 }, /* GL_ENABLE_BIT */
-   {  8553, 0x00000202 }, /* GL_EQUAL */
-   {  8562, 0x00001509 }, /* GL_EQUIV */
-   {  8571, 0x00010000 }, /* GL_EVAL_BIT */
-   {  8583, 0x00000800 }, /* GL_EXP */
-   {  8590, 0x00000801 }, /* GL_EXP2 */
-   {  8598, 0x00001F03 }, /* GL_EXTENSIONS */
-   {  8612, 0x00002400 }, /* GL_EYE_LINEAR */
-   {  8626, 0x00002502 }, /* GL_EYE_PLANE */
-   {  8639, 0x0000855C }, /* GL_EYE_PLANE_ABSOLUTE_NV */
-   {  8664, 0x0000855B }, /* GL_EYE_RADIAL_NV */
-   {  8681, 0x00000000 }, /* GL_FALSE */
-   {  8690, 0x00001101 }, /* GL_FASTEST */
-   {  8701, 0x00001C01 }, /* GL_FEEDBACK */
-   {  8713, 0x00000DF0 }, /* GL_FEEDBACK_BUFFER_POINTER */
-   {  8740, 0x00000DF1 }, /* GL_FEEDBACK_BUFFER_SIZE */
-   {  8764, 0x00000DF2 }, /* GL_FEEDBACK_BUFFER_TYPE */
-   {  8788, 0x00001B02 }, /* GL_FILL */
-   {  8796, 0x00001D00 }, /* GL_FLAT */
-   {  8804, 0x00001406 }, /* GL_FLOAT */
-   {  8813, 0x00008B5A }, /* GL_FLOAT_MAT2 */
-   {  8827, 0x00008B5A }, /* GL_FLOAT_MAT2_ARB */
-   {  8845, 0x00008B5B }, /* GL_FLOAT_MAT3 */
-   {  8859, 0x00008B5B }, /* GL_FLOAT_MAT3_ARB */
-   {  8877, 0x00008B5C }, /* GL_FLOAT_MAT4 */
-   {  8891, 0x00008B5C }, /* GL_FLOAT_MAT4_ARB */
-   {  8909, 0x00008B50 }, /* GL_FLOAT_VEC2 */
-   {  8923, 0x00008B50 }, /* GL_FLOAT_VEC2_ARB */
-   {  8941, 0x00008B51 }, /* GL_FLOAT_VEC3 */
-   {  8955, 0x00008B51 }, /* GL_FLOAT_VEC3_ARB */
-   {  8973, 0x00008B52 }, /* GL_FLOAT_VEC4 */
-   {  8987, 0x00008B52 }, /* GL_FLOAT_VEC4_ARB */
-   {  9005, 0x00000B60 }, /* GL_FOG */
-   {  9012, 0x00000080 }, /* GL_FOG_BIT */
-   {  9023, 0x00000B66 }, /* GL_FOG_COLOR */
-   {  9036, 0x00008451 }, /* GL_FOG_COORD */
-   {  9049, 0x00008451 }, /* GL_FOG_COORDINATE */
-   {  9067, 0x00008457 }, /* GL_FOG_COORDINATE_ARRAY */
-   {  9091, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
-   {  9130, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB */
-   {  9173, 0x00008456 }, /* GL_FOG_COORDINATE_ARRAY_POINTER */
-   {  9205, 0x00008455 }, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
-   {  9236, 0x00008454 }, /* GL_FOG_COORDINATE_ARRAY_TYPE */
-   {  9265, 0x00008450 }, /* GL_FOG_COORDINATE_SOURCE */
-   {  9290, 0x00008457 }, /* GL_FOG_COORD_ARRAY */
-   {  9309, 0x0000889D }, /* GL_FOG_COORD_ARRAY_BUFFER_BINDING */
-   {  9343, 0x00008456 }, /* GL_FOG_COORD_ARRAY_POINTER */
-   {  9370, 0x00008455 }, /* GL_FOG_COORD_ARRAY_STRIDE */
-   {  9396, 0x00008454 }, /* GL_FOG_COORD_ARRAY_TYPE */
-   {  9420, 0x00008450 }, /* GL_FOG_COORD_SRC */
-   {  9437, 0x00000B62 }, /* GL_FOG_DENSITY */
-   {  9452, 0x0000855A }, /* GL_FOG_DISTANCE_MODE_NV */
-   {  9476, 0x00000B64 }, /* GL_FOG_END */
-   {  9487, 0x00000C54 }, /* GL_FOG_HINT */
-   {  9499, 0x00000B61 }, /* GL_FOG_INDEX */
-   {  9512, 0x00000B65 }, /* GL_FOG_MODE */
-   {  9524, 0x00008198 }, /* GL_FOG_OFFSET_SGIX */
-   {  9543, 0x00008199 }, /* GL_FOG_OFFSET_VALUE_SGIX */
-   {  9568, 0x00000B63 }, /* GL_FOG_START */
-   {  9581, 0x00008452 }, /* GL_FRAGMENT_DEPTH */
-   {  9599, 0x00008804 }, /* GL_FRAGMENT_PROGRAM_ARB */
-   {  9623, 0x00008B30 }, /* GL_FRAGMENT_SHADER */
-   {  9642, 0x00008B30 }, /* GL_FRAGMENT_SHADER_ARB */
-   {  9665, 0x00008B8B }, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
-   {  9700, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT */
-   {  9742, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT */
-   {  9784, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT */
-   {  9833, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT */
-   {  9885, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
-   {  9929, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT */
-   {  9973, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING_EXT */
-   { 10000, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE_EXT */
-   { 10028, 0x00008D40 }, /* GL_FRAMEBUFFER_EXT */
-   { 10047, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT */
-   { 10088, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
-   { 10129, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
-   { 10171, 0x00008CD8 }, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
-   { 10222, 0x00008CDA }, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
-   { 10260, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT */
-   { 10309, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
-   { 10351, 0x00008CDE }, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
-   { 10383, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED_EXT */
-   { 10414, 0x00000404 }, /* GL_FRONT */
-   { 10423, 0x00000408 }, /* GL_FRONT_AND_BACK */
-   { 10441, 0x00000B46 }, /* GL_FRONT_FACE */
-   { 10455, 0x00000400 }, /* GL_FRONT_LEFT */
-   { 10469, 0x00000401 }, /* GL_FRONT_RIGHT */
-   { 10484, 0x00008006 }, /* GL_FUNC_ADD */
-   { 10496, 0x00008006 }, /* GL_FUNC_ADD_EXT */
-   { 10512, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT */
-   { 10537, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT_EXT */
-   { 10566, 0x0000800A }, /* GL_FUNC_SUBTRACT */
-   { 10583, 0x0000800A }, /* GL_FUNC_SUBTRACT_EXT */
-   { 10604, 0x00008191 }, /* GL_GENERATE_MIPMAP */
-   { 10623, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT */
-   { 10647, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT_SGIS */
-   { 10676, 0x00008191 }, /* GL_GENERATE_MIPMAP_SGIS */
-   { 10700, 0x00000206 }, /* GL_GEQUAL */
-   { 10710, 0x00008009 }, /* GL_GL_BLEND_EQUATION_RGB */
-   { 10735, 0x00008C4A }, /* GL_GL_COMPRESSED_SLUMINANCE */
-   { 10763, 0x00008C4B }, /* GL_GL_COMPRESSED_SLUMINANCE_ALPHA */
-   { 10797, 0x00008C48 }, /* GL_GL_COMPRESSED_SRGB */
-   { 10819, 0x00008C49 }, /* GL_GL_COMPRESSED_SRGB_ALPHA */
-   { 10847, 0x0000845F }, /* GL_GL_CURRENT_RASTER_SECONDARY_COLOR */
-   { 10884, 0x00008B65 }, /* GL_GL_FLOAT_MAT2x3 */
-   { 10903, 0x00008B66 }, /* GL_GL_FLOAT_MAT2x4 */
-   { 10922, 0x00008B67 }, /* GL_GL_FLOAT_MAT3x2 */
-   { 10941, 0x00008B68 }, /* GL_GL_FLOAT_MAT3x4 */
-   { 10960, 0x00008B69 }, /* GL_GL_FLOAT_MAT4x2 */
-   { 10979, 0x00008B6A }, /* GL_GL_FLOAT_MAT4x3 */
-   { 10998, 0x000088EB }, /* GL_GL_PIXEL_PACK_BUFFER */
-   { 11022, 0x000088ED }, /* GL_GL_PIXEL_PACK_BUFFER_BINDING */
-   { 11054, 0x000088EC }, /* GL_GL_PIXEL_UNPACK_BUFFER */
-   { 11080, 0x000088EF }, /* GL_GL_PIXEL_UNPACK_BUFFER_BINDING */
-   { 11114, 0x00008C46 }, /* GL_GL_SLUMINANCE */
-   { 11131, 0x00008C47 }, /* GL_GL_SLUMINANCE8 */
-   { 11149, 0x00008C45 }, /* GL_GL_SLUMINANCE8_ALPHA8 */
-   { 11174, 0x00008C44 }, /* GL_GL_SLUMINANCE_ALPHA */
-   { 11197, 0x00008C40 }, /* GL_GL_SRGB */
-   { 11208, 0x00008C41 }, /* GL_GL_SRGB8 */
-   { 11220, 0x00008C43 }, /* GL_GL_SRGB8_ALPHA8 */
-   { 11239, 0x00008C42 }, /* GL_GL_SRGB_ALPHA */
-   { 11256, 0x00000204 }, /* GL_GREATER */
-   { 11267, 0x00001904 }, /* GL_GREEN */
-   { 11276, 0x00000D19 }, /* GL_GREEN_BIAS */
-   { 11290, 0x00000D53 }, /* GL_GREEN_BITS */
-   { 11304, 0x00000D18 }, /* GL_GREEN_SCALE */
-   { 11319, 0x00008000 }, /* GL_HINT_BIT */
-   { 11331, 0x00008024 }, /* GL_HISTOGRAM */
-   { 11344, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE */
-   { 11368, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE_EXT */
-   { 11396, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE */
-   { 11419, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE_EXT */
-   { 11446, 0x00008024 }, /* GL_HISTOGRAM_EXT */
-   { 11463, 0x00008027 }, /* GL_HISTOGRAM_FORMAT */
-   { 11483, 0x00008027 }, /* GL_HISTOGRAM_FORMAT_EXT */
-   { 11507, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE */
-   { 11531, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE_EXT */
-   { 11559, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE */
-   { 11587, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE_EXT */
-   { 11619, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE */
-   { 11641, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE_EXT */
-   { 11667, 0x0000802D }, /* GL_HISTOGRAM_SINK */
-   { 11685, 0x0000802D }, /* GL_HISTOGRAM_SINK_EXT */
-   { 11707, 0x00008026 }, /* GL_HISTOGRAM_WIDTH */
-   { 11726, 0x00008026 }, /* GL_HISTOGRAM_WIDTH_EXT */
-   { 11749, 0x0000862A }, /* GL_IDENTITY_NV */
-   { 11764, 0x00008150 }, /* GL_IGNORE_BORDER_HP */
-   { 11784, 0x00008B9B }, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
-   { 11824, 0x00008B9A }, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
-   { 11862, 0x00001E02 }, /* GL_INCR */
-   { 11870, 0x00008507 }, /* GL_INCR_WRAP */
-   { 11883, 0x00008507 }, /* GL_INCR_WRAP_EXT */
-   { 11900, 0x00008077 }, /* GL_INDEX_ARRAY */
-   { 11915, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING */
-   { 11945, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING_ARB */
-   { 11979, 0x00008091 }, /* GL_INDEX_ARRAY_POINTER */
-   { 12002, 0x00008086 }, /* GL_INDEX_ARRAY_STRIDE */
-   { 12024, 0x00008085 }, /* GL_INDEX_ARRAY_TYPE */
-   { 12044, 0x00000D51 }, /* GL_INDEX_BITS */
-   { 12058, 0x00000C20 }, /* GL_INDEX_CLEAR_VALUE */
-   { 12079, 0x00000BF1 }, /* GL_INDEX_LOGIC_OP */
-   { 12097, 0x00000C30 }, /* GL_INDEX_MODE */
-   { 12111, 0x00000D13 }, /* GL_INDEX_OFFSET */
-   { 12127, 0x00000D12 }, /* GL_INDEX_SHIFT */
-   { 12142, 0x00000C21 }, /* GL_INDEX_WRITEMASK */
-   { 12161, 0x00008B84 }, /* GL_INFO_LOG_LENGTH */
-   { 12180, 0x00001404 }, /* GL_INT */
-   { 12187, 0x00008049 }, /* GL_INTENSITY */
-   { 12200, 0x0000804C }, /* GL_INTENSITY12 */
-   { 12215, 0x0000804C }, /* GL_INTENSITY12_EXT */
-   { 12234, 0x0000804D }, /* GL_INTENSITY16 */
-   { 12249, 0x0000804D }, /* GL_INTENSITY16_EXT */
-   { 12268, 0x0000804A }, /* GL_INTENSITY4 */
-   { 12282, 0x0000804A }, /* GL_INTENSITY4_EXT */
-   { 12300, 0x0000804B }, /* GL_INTENSITY8 */
-   { 12314, 0x0000804B }, /* GL_INTENSITY8_EXT */
-   { 12332, 0x00008049 }, /* GL_INTENSITY_EXT */
-   { 12349, 0x00008575 }, /* GL_INTERPOLATE */
-   { 12364, 0x00008575 }, /* GL_INTERPOLATE_ARB */
-   { 12383, 0x00008575 }, /* GL_INTERPOLATE_EXT */
-   { 12402, 0x00008B53 }, /* GL_INT_VEC2 */
-   { 12414, 0x00008B53 }, /* GL_INT_VEC2_ARB */
-   { 12430, 0x00008B54 }, /* GL_INT_VEC3 */
-   { 12442, 0x00008B54 }, /* GL_INT_VEC3_ARB */
-   { 12458, 0x00008B55 }, /* GL_INT_VEC4 */
-   { 12470, 0x00008B55 }, /* GL_INT_VEC4_ARB */
-   { 12486, 0x00000500 }, /* GL_INVALID_ENUM */
-   { 12502, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION_EXT */
-   { 12539, 0x00000502 }, /* GL_INVALID_OPERATION */
-   { 12560, 0x00000501 }, /* GL_INVALID_VALUE */
-   { 12577, 0x0000862B }, /* GL_INVERSE_NV */
-   { 12591, 0x0000862D }, /* GL_INVERSE_TRANSPOSE_NV */
-   { 12615, 0x0000150A }, /* GL_INVERT */
-   { 12625, 0x00001E00 }, /* GL_KEEP */
-   { 12633, 0x00000406 }, /* GL_LEFT */
-   { 12641, 0x00000203 }, /* GL_LEQUAL */
-   { 12651, 0x00000201 }, /* GL_LESS */
-   { 12659, 0x00004000 }, /* GL_LIGHT0 */
-   { 12669, 0x00004001 }, /* GL_LIGHT1 */
-   { 12679, 0x00004002 }, /* GL_LIGHT2 */
-   { 12689, 0x00004003 }, /* GL_LIGHT3 */
-   { 12699, 0x00004004 }, /* GL_LIGHT4 */
-   { 12709, 0x00004005 }, /* GL_LIGHT5 */
-   { 12719, 0x00004006 }, /* GL_LIGHT6 */
-   { 12729, 0x00004007 }, /* GL_LIGHT7 */
-   { 12739, 0x00000B50 }, /* GL_LIGHTING */
-   { 12751, 0x00000040 }, /* GL_LIGHTING_BIT */
-   { 12767, 0x00000B53 }, /* GL_LIGHT_MODEL_AMBIENT */
-   { 12790, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL */
-   { 12819, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL_EXT */
-   { 12852, 0x00000B51 }, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
-   { 12880, 0x00000B52 }, /* GL_LIGHT_MODEL_TWO_SIDE */
-   { 12904, 0x00001B01 }, /* GL_LINE */
-   { 12912, 0x00002601 }, /* GL_LINEAR */
-   { 12922, 0x00001208 }, /* GL_LINEAR_ATTENUATION */
-   { 12944, 0x00008170 }, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
-   { 12974, 0x0000844F }, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
-   { 13005, 0x00002703 }, /* GL_LINEAR_MIPMAP_LINEAR */
-   { 13029, 0x00002701 }, /* GL_LINEAR_MIPMAP_NEAREST */
-   { 13054, 0x00000001 }, /* GL_LINES */
-   { 13063, 0x00000004 }, /* GL_LINE_BIT */
-   { 13075, 0x00000002 }, /* GL_LINE_LOOP */
-   { 13088, 0x00000707 }, /* GL_LINE_RESET_TOKEN */
-   { 13108, 0x00000B20 }, /* GL_LINE_SMOOTH */
-   { 13123, 0x00000C52 }, /* GL_LINE_SMOOTH_HINT */
-   { 13143, 0x00000B24 }, /* GL_LINE_STIPPLE */
-   { 13159, 0x00000B25 }, /* GL_LINE_STIPPLE_PATTERN */
-   { 13183, 0x00000B26 }, /* GL_LINE_STIPPLE_REPEAT */
-   { 13206, 0x00000003 }, /* GL_LINE_STRIP */
-   { 13220, 0x00000702 }, /* GL_LINE_TOKEN */
-   { 13234, 0x00000B21 }, /* GL_LINE_WIDTH */
-   { 13248, 0x00000B23 }, /* GL_LINE_WIDTH_GRANULARITY */
-   { 13274, 0x00000B22 }, /* GL_LINE_WIDTH_RANGE */
-   { 13294, 0x00008B82 }, /* GL_LINK_STATUS */
-   { 13309, 0x00000B32 }, /* GL_LIST_BASE */
-   { 13322, 0x00020000 }, /* GL_LIST_BIT */
-   { 13334, 0x00000B33 }, /* GL_LIST_INDEX */
-   { 13348, 0x00000B30 }, /* GL_LIST_MODE */
-   { 13361, 0x00000101 }, /* GL_LOAD */
-   { 13369, 0x00000BF1 }, /* GL_LOGIC_OP */
-   { 13381, 0x00000BF0 }, /* GL_LOGIC_OP_MODE */
-   { 13398, 0x00008CA1 }, /* GL_LOWER_LEFT */
-   { 13412, 0x00001909 }, /* GL_LUMINANCE */
-   { 13425, 0x00008041 }, /* GL_LUMINANCE12 */
-   { 13440, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12 */
-   { 13463, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12_EXT */
-   { 13490, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4 */
-   { 13512, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4_EXT */
-   { 13538, 0x00008041 }, /* GL_LUMINANCE12_EXT */
-   { 13557, 0x00008042 }, /* GL_LUMINANCE16 */
-   { 13572, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16 */
-   { 13595, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16_EXT */
-   { 13622, 0x00008042 }, /* GL_LUMINANCE16_EXT */
-   { 13641, 0x0000803F }, /* GL_LUMINANCE4 */
-   { 13655, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4 */
-   { 13676, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4_EXT */
-   { 13701, 0x0000803F }, /* GL_LUMINANCE4_EXT */
-   { 13719, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2 */
-   { 13740, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2_EXT */
-   { 13765, 0x00008040 }, /* GL_LUMINANCE8 */
-   { 13779, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8 */
-   { 13800, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8_EXT */
-   { 13825, 0x00008040 }, /* GL_LUMINANCE8_EXT */
-   { 13843, 0x0000190A }, /* GL_LUMINANCE_ALPHA */
-   { 13862, 0x00000D90 }, /* GL_MAP1_COLOR_4 */
-   { 13878, 0x00000DD0 }, /* GL_MAP1_GRID_DOMAIN */
-   { 13898, 0x00000DD1 }, /* GL_MAP1_GRID_SEGMENTS */
-   { 13920, 0x00000D91 }, /* GL_MAP1_INDEX */
-   { 13934, 0x00000D92 }, /* GL_MAP1_NORMAL */
-   { 13949, 0x00000D93 }, /* GL_MAP1_TEXTURE_COORD_1 */
-   { 13973, 0x00000D94 }, /* GL_MAP1_TEXTURE_COORD_2 */
-   { 13997, 0x00000D95 }, /* GL_MAP1_TEXTURE_COORD_3 */
-   { 14021, 0x00000D96 }, /* GL_MAP1_TEXTURE_COORD_4 */
-   { 14045, 0x00000D97 }, /* GL_MAP1_VERTEX_3 */
-   { 14062, 0x00000D98 }, /* GL_MAP1_VERTEX_4 */
-   { 14079, 0x00008660 }, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
-   { 14107, 0x0000866A }, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
-   { 14136, 0x0000866B }, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
-   { 14165, 0x0000866C }, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
-   { 14194, 0x0000866D }, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
-   { 14223, 0x0000866E }, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
-   { 14252, 0x0000866F }, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
-   { 14281, 0x00008661 }, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
-   { 14309, 0x00008662 }, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
-   { 14337, 0x00008663 }, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
-   { 14365, 0x00008664 }, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
-   { 14393, 0x00008665 }, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
-   { 14421, 0x00008666 }, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
-   { 14449, 0x00008667 }, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
-   { 14477, 0x00008668 }, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
-   { 14505, 0x00008669 }, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
-   { 14533, 0x00000DB0 }, /* GL_MAP2_COLOR_4 */
-   { 14549, 0x00000DD2 }, /* GL_MAP2_GRID_DOMAIN */
-   { 14569, 0x00000DD3 }, /* GL_MAP2_GRID_SEGMENTS */
-   { 14591, 0x00000DB1 }, /* GL_MAP2_INDEX */
-   { 14605, 0x00000DB2 }, /* GL_MAP2_NORMAL */
-   { 14620, 0x00000DB3 }, /* GL_MAP2_TEXTURE_COORD_1 */
-   { 14644, 0x00000DB4 }, /* GL_MAP2_TEXTURE_COORD_2 */
-   { 14668, 0x00000DB5 }, /* GL_MAP2_TEXTURE_COORD_3 */
-   { 14692, 0x00000DB6 }, /* GL_MAP2_TEXTURE_COORD_4 */
-   { 14716, 0x00000DB7 }, /* GL_MAP2_VERTEX_3 */
-   { 14733, 0x00000DB8 }, /* GL_MAP2_VERTEX_4 */
-   { 14750, 0x00008670 }, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
-   { 14778, 0x0000867A }, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
-   { 14807, 0x0000867B }, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
-   { 14836, 0x0000867C }, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
-   { 14865, 0x0000867D }, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
-   { 14894, 0x0000867E }, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
-   { 14923, 0x0000867F }, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
-   { 14952, 0x00008671 }, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
-   { 14980, 0x00008672 }, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
-   { 15008, 0x00008673 }, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
-   { 15036, 0x00008674 }, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
-   { 15064, 0x00008675 }, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
-   { 15092, 0x00008676 }, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
-   { 15120, 0x00008677 }, /* GL_MAP2_VERTEX_ATTRIB7_4_NV */
-   { 15148, 0x00008678 }, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
-   { 15176, 0x00008679 }, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
-   { 15204, 0x00000D10 }, /* GL_MAP_COLOR */
-   { 15217, 0x00000D11 }, /* GL_MAP_STENCIL */
-   { 15232, 0x000088C0 }, /* GL_MATRIX0_ARB */
-   { 15247, 0x00008630 }, /* GL_MATRIX0_NV */
-   { 15261, 0x000088CA }, /* GL_MATRIX10_ARB */
-   { 15277, 0x000088CB }, /* GL_MATRIX11_ARB */
-   { 15293, 0x000088CC }, /* GL_MATRIX12_ARB */
-   { 15309, 0x000088CD }, /* GL_MATRIX13_ARB */
-   { 15325, 0x000088CE }, /* GL_MATRIX14_ARB */
-   { 15341, 0x000088CF }, /* GL_MATRIX15_ARB */
-   { 15357, 0x000088D0 }, /* GL_MATRIX16_ARB */
-   { 15373, 0x000088D1 }, /* GL_MATRIX17_ARB */
-   { 15389, 0x000088D2 }, /* GL_MATRIX18_ARB */
-   { 15405, 0x000088D3 }, /* GL_MATRIX19_ARB */
-   { 15421, 0x000088C1 }, /* GL_MATRIX1_ARB */
-   { 15436, 0x00008631 }, /* GL_MATRIX1_NV */
-   { 15450, 0x000088D4 }, /* GL_MATRIX20_ARB */
-   { 15466, 0x000088D5 }, /* GL_MATRIX21_ARB */
-   { 15482, 0x000088D6 }, /* GL_MATRIX22_ARB */
-   { 15498, 0x000088D7 }, /* GL_MATRIX23_ARB */
-   { 15514, 0x000088D8 }, /* GL_MATRIX24_ARB */
-   { 15530, 0x000088D9 }, /* GL_MATRIX25_ARB */
-   { 15546, 0x000088DA }, /* GL_MATRIX26_ARB */
-   { 15562, 0x000088DB }, /* GL_MATRIX27_ARB */
-   { 15578, 0x000088DC }, /* GL_MATRIX28_ARB */
-   { 15594, 0x000088DD }, /* GL_MATRIX29_ARB */
-   { 15610, 0x000088C2 }, /* GL_MATRIX2_ARB */
-   { 15625, 0x00008632 }, /* GL_MATRIX2_NV */
-   { 15639, 0x000088DE }, /* GL_MATRIX30_ARB */
-   { 15655, 0x000088DF }, /* GL_MATRIX31_ARB */
-   { 15671, 0x000088C3 }, /* GL_MATRIX3_ARB */
-   { 15686, 0x00008633 }, /* GL_MATRIX3_NV */
-   { 15700, 0x000088C4 }, /* GL_MATRIX4_ARB */
-   { 15715, 0x00008634 }, /* GL_MATRIX4_NV */
-   { 15729, 0x000088C5 }, /* GL_MATRIX5_ARB */
-   { 15744, 0x00008635 }, /* GL_MATRIX5_NV */
-   { 15758, 0x000088C6 }, /* GL_MATRIX6_ARB */
-   { 15773, 0x00008636 }, /* GL_MATRIX6_NV */
-   { 15787, 0x000088C7 }, /* GL_MATRIX7_ARB */
-   { 15802, 0x00008637 }, /* GL_MATRIX7_NV */
-   { 15816, 0x000088C8 }, /* GL_MATRIX8_ARB */
-   { 15831, 0x000088C9 }, /* GL_MATRIX9_ARB */
-   { 15846, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_ARB */
-   { 15872, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
-   { 15906, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
-   { 15937, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
-   { 15970, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
-   { 16001, 0x00000BA0 }, /* GL_MATRIX_MODE */
-   { 16016, 0x00008840 }, /* GL_MATRIX_PALETTE_ARB */
-   { 16038, 0x00008008 }, /* GL_MAX */
-   { 16045, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE */
-   { 16068, 0x000088FF }, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
-   { 16100, 0x00000D35 }, /* GL_MAX_ATTRIB_STACK_DEPTH */
-   { 16126, 0x00000D3B }, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
-   { 16159, 0x00008177 }, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
-   { 16185, 0x00008178 }, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-   { 16219, 0x00000D32 }, /* GL_MAX_CLIP_PLANES */
-   { 16238, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
-   { 16267, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
-   { 16299, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI */
-   { 16335, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
-   { 16371, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB */
-   { 16411, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT */
-   { 16437, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT_EXT */
-   { 16467, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH */
-   { 16492, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH_EXT */
-   { 16521, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
-   { 16550, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB */
-   { 16583, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS */
-   { 16603, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ARB */
-   { 16627, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ATI */
-   { 16651, 0x000080E9 }, /* GL_MAX_ELEMENTS_INDICES */
-   { 16675, 0x000080E8 }, /* GL_MAX_ELEMENTS_VERTICES */
-   { 16700, 0x00000D30 }, /* GL_MAX_EVAL_ORDER */
-   { 16718, 0x00008008 }, /* GL_MAX_EXT */
-   { 16729, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
-   { 16764, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB */
-   { 16803, 0x00000D31 }, /* GL_MAX_LIGHTS */
-   { 16817, 0x00000B31 }, /* GL_MAX_LIST_NESTING */
-   { 16837, 0x00008841 }, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
-   { 16875, 0x00000D36 }, /* GL_MAX_MODELVIEW_STACK_DEPTH */
-   { 16904, 0x00000D37 }, /* GL_MAX_NAME_STACK_DEPTH */
-   { 16928, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_ARB */
-   { 16956, 0x00000D34 }, /* GL_MAX_PIXEL_MAP_TABLE */
-   { 16979, 0x000088B1 }, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
-   { 17016, 0x0000880B }, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
-   { 17052, 0x000088AD }, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
-   { 17079, 0x000088F5 }, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
-   { 17108, 0x000088B5 }, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
-   { 17142, 0x000088F4 }, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
-   { 17178, 0x000088F6 }, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
-   { 17205, 0x000088A1 }, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
-   { 17237, 0x000088B4 }, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
-   { 17273, 0x000088F8 }, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
-   { 17302, 0x000088F7 }, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
-   { 17331, 0x0000862F }, /* GL_MAX_PROGRAM_MATRICES_ARB */
-   { 17359, 0x0000862E }, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
-   { 17397, 0x000088B3 }, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-   { 17441, 0x0000880E }, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-   { 17484, 0x000088AF }, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
-   { 17518, 0x000088A3 }, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-   { 17557, 0x000088AB }, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
-   { 17594, 0x000088A7 }, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
-   { 17632, 0x00008810 }, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-   { 17675, 0x0000880F }, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-   { 17718, 0x000088A9 }, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
-   { 17748, 0x000088A5 }, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
-   { 17779, 0x0000880D }, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
-   { 17815, 0x0000880C }, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
-   { 17851, 0x00000D38 }, /* GL_MAX_PROJECTION_STACK_DEPTH */
-   { 17881, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
-   { 17915, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_NV */
-   { 17948, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
-   { 17977, 0x00008504 }, /* GL_MAX_SHININESS_NV */
-   { 17997, 0x00008505 }, /* GL_MAX_SPOT_EXPONENT_NV */
-   { 18021, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS */
-   { 18043, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS_ARB */
-   { 18069, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS */
-   { 18096, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS_ARB */
-   { 18127, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS */
-   { 18151, 0x000084FF }, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
-   { 18185, 0x00000D33 }, /* GL_MAX_TEXTURE_SIZE */
-   { 18205, 0x00000D39 }, /* GL_MAX_TEXTURE_STACK_DEPTH */
-   { 18232, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS */
-   { 18253, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS_ARB */
-   { 18278, 0x0000862F }, /* GL_MAX_TRACK_MATRICES_NV */
-   { 18303, 0x0000862E }, /* GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */
-   { 18338, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS */
-   { 18360, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS_ARB */
-   { 18386, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS */
-   { 18408, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS_ARB */
-   { 18434, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
-   { 18468, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
-   { 18506, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
-   { 18539, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB */
-   { 18576, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_ARB */
-   { 18600, 0x00000D3A }, /* GL_MAX_VIEWPORT_DIMS */
-   { 18621, 0x00008007 }, /* GL_MIN */
-   { 18628, 0x0000802E }, /* GL_MINMAX */
-   { 18638, 0x0000802E }, /* GL_MINMAX_EXT */
-   { 18652, 0x0000802F }, /* GL_MINMAX_FORMAT */
-   { 18669, 0x0000802F }, /* GL_MINMAX_FORMAT_EXT */
-   { 18690, 0x00008030 }, /* GL_MINMAX_SINK */
-   { 18705, 0x00008030 }, /* GL_MINMAX_SINK_EXT */
-   { 18724, 0x00008007 }, /* GL_MIN_EXT */
-   { 18735, 0x00008370 }, /* GL_MIRRORED_REPEAT */
-   { 18754, 0x00008370 }, /* GL_MIRRORED_REPEAT_ARB */
-   { 18777, 0x00008370 }, /* GL_MIRRORED_REPEAT_IBM */
-   { 18800, 0x00008742 }, /* GL_MIRROR_CLAMP_ATI */
-   { 18820, 0x00008742 }, /* GL_MIRROR_CLAMP_EXT */
-   { 18840, 0x00008912 }, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
-   { 18870, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_ATI */
-   { 18898, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
-   { 18926, 0x00001700 }, /* GL_MODELVIEW */
-   { 18939, 0x00001700 }, /* GL_MODELVIEW0_ARB */
-   { 18957, 0x0000872A }, /* GL_MODELVIEW10_ARB */
-   { 18976, 0x0000872B }, /* GL_MODELVIEW11_ARB */
-   { 18995, 0x0000872C }, /* GL_MODELVIEW12_ARB */
-   { 19014, 0x0000872D }, /* GL_MODELVIEW13_ARB */
-   { 19033, 0x0000872E }, /* GL_MODELVIEW14_ARB */
-   { 19052, 0x0000872F }, /* GL_MODELVIEW15_ARB */
-   { 19071, 0x00008730 }, /* GL_MODELVIEW16_ARB */
-   { 19090, 0x00008731 }, /* GL_MODELVIEW17_ARB */
-   { 19109, 0x00008732 }, /* GL_MODELVIEW18_ARB */
-   { 19128, 0x00008733 }, /* GL_MODELVIEW19_ARB */
-   { 19147, 0x0000850A }, /* GL_MODELVIEW1_ARB */
-   { 19165, 0x00008734 }, /* GL_MODELVIEW20_ARB */
-   { 19184, 0x00008735 }, /* GL_MODELVIEW21_ARB */
-   { 19203, 0x00008736 }, /* GL_MODELVIEW22_ARB */
-   { 19222, 0x00008737 }, /* GL_MODELVIEW23_ARB */
-   { 19241, 0x00008738 }, /* GL_MODELVIEW24_ARB */
-   { 19260, 0x00008739 }, /* GL_MODELVIEW25_ARB */
-   { 19279, 0x0000873A }, /* GL_MODELVIEW26_ARB */
-   { 19298, 0x0000873B }, /* GL_MODELVIEW27_ARB */
-   { 19317, 0x0000873C }, /* GL_MODELVIEW28_ARB */
-   { 19336, 0x0000873D }, /* GL_MODELVIEW29_ARB */
-   { 19355, 0x00008722 }, /* GL_MODELVIEW2_ARB */
-   { 19373, 0x0000873E }, /* GL_MODELVIEW30_ARB */
-   { 19392, 0x0000873F }, /* GL_MODELVIEW31_ARB */
-   { 19411, 0x00008723 }, /* GL_MODELVIEW3_ARB */
-   { 19429, 0x00008724 }, /* GL_MODELVIEW4_ARB */
-   { 19447, 0x00008725 }, /* GL_MODELVIEW5_ARB */
-   { 19465, 0x00008726 }, /* GL_MODELVIEW6_ARB */
-   { 19483, 0x00008727 }, /* GL_MODELVIEW7_ARB */
-   { 19501, 0x00008728 }, /* GL_MODELVIEW8_ARB */
-   { 19519, 0x00008729 }, /* GL_MODELVIEW9_ARB */
-   { 19537, 0x00000BA6 }, /* GL_MODELVIEW_MATRIX */
-   { 19557, 0x00008629 }, /* GL_MODELVIEW_PROJECTION_NV */
-   { 19584, 0x00000BA3 }, /* GL_MODELVIEW_STACK_DEPTH */
-   { 19609, 0x00002100 }, /* GL_MODULATE */
-   { 19621, 0x00008744 }, /* GL_MODULATE_ADD_ATI */
-   { 19641, 0x00008745 }, /* GL_MODULATE_SIGNED_ADD_ATI */
-   { 19668, 0x00008746 }, /* GL_MODULATE_SUBTRACT_ATI */
-   { 19693, 0x00000103 }, /* GL_MULT */
-   { 19701, 0x0000809D }, /* GL_MULTISAMPLE */
-   { 19716, 0x000086B2 }, /* GL_MULTISAMPLE_3DFX */
-   { 19736, 0x0000809D }, /* GL_MULTISAMPLE_ARB */
-   { 19755, 0x20000000 }, /* GL_MULTISAMPLE_BIT */
-   { 19774, 0x20000000 }, /* GL_MULTISAMPLE_BIT_3DFX */
-   { 19798, 0x20000000 }, /* GL_MULTISAMPLE_BIT_ARB */
-   { 19821, 0x00008534 }, /* GL_MULTISAMPLE_FILTER_HINT_NV */
-   { 19851, 0x00002A25 }, /* GL_N3F_V3F */
-   { 19862, 0x00000D70 }, /* GL_NAME_STACK_DEPTH */
-   { 19882, 0x0000150E }, /* GL_NAND */
-   { 19890, 0x00002600 }, /* GL_NEAREST */
-   { 19901, 0x0000844E }, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
-   { 19932, 0x0000844D }, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
-   { 19964, 0x00002702 }, /* GL_NEAREST_MIPMAP_LINEAR */
-   { 19989, 0x00002700 }, /* GL_NEAREST_MIPMAP_NEAREST */
-   { 20015, 0x00000200 }, /* GL_NEVER */
-   { 20024, 0x00001102 }, /* GL_NICEST */
-   { 20034, 0x00000000 }, /* GL_NONE */
-   { 20042, 0x00001505 }, /* GL_NOOP */
-   { 20050, 0x00001508 }, /* GL_NOR */
-   { 20057, 0x00000BA1 }, /* GL_NORMALIZE */
-   { 20070, 0x00008075 }, /* GL_NORMAL_ARRAY */
-   { 20086, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
-   { 20117, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING_ARB */
-   { 20152, 0x0000808F }, /* GL_NORMAL_ARRAY_POINTER */
-   { 20176, 0x0000807F }, /* GL_NORMAL_ARRAY_STRIDE */
-   { 20199, 0x0000807E }, /* GL_NORMAL_ARRAY_TYPE */
-   { 20220, 0x00008511 }, /* GL_NORMAL_MAP */
-   { 20234, 0x00008511 }, /* GL_NORMAL_MAP_ARB */
-   { 20252, 0x00008511 }, /* GL_NORMAL_MAP_NV */
-   { 20269, 0x00000205 }, /* GL_NOTEQUAL */
-   { 20281, 0x00000000 }, /* GL_NO_ERROR */
-   { 20293, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
-   { 20327, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB */
-   { 20365, 0x00008B89 }, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */
-   { 20397, 0x00008B8A }, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */
-   { 20439, 0x00008B86 }, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */
-   { 20469, 0x00008B87 }, /* GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB */
-   { 20509, 0x00008B85 }, /* GL_OBJECT_ATTACHED_OBJECTS_ARB */
-   { 20540, 0x00008B81 }, /* GL_OBJECT_COMPILE_STATUS_ARB */
-   { 20569, 0x00008B80 }, /* GL_OBJECT_DELETE_STATUS_ARB */
-   { 20597, 0x00008B84 }, /* GL_OBJECT_INFO_LOG_LENGTH_ARB */
-   { 20627, 0x00002401 }, /* GL_OBJECT_LINEAR */
-   { 20644, 0x00008B82 }, /* GL_OBJECT_LINK_STATUS_ARB */
-   { 20670, 0x00002501 }, /* GL_OBJECT_PLANE */
-   { 20686, 0x00008B88 }, /* GL_OBJECT_SHADER_SOURCE_LENGTH_ARB */
-   { 20721, 0x00008B4F }, /* GL_OBJECT_SUBTYPE_ARB */
-   { 20743, 0x00008B4E }, /* GL_OBJECT_TYPE_ARB */
-   { 20762, 0x00008B83 }, /* GL_OBJECT_VALIDATE_STATUS_ARB */
-   { 20792, 0x00008165 }, /* GL_OCCLUSION_TEST_HP */
-   { 20813, 0x00008166 }, /* GL_OCCLUSION_TEST_RESULT_HP */
-   { 20841, 0x00000001 }, /* GL_ONE */
-   { 20848, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA */
-   { 20876, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA_EXT */
-   { 20908, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR */
-   { 20936, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR_EXT */
-   { 20968, 0x00000305 }, /* GL_ONE_MINUS_DST_ALPHA */
-   { 20991, 0x00000307 }, /* GL_ONE_MINUS_DST_COLOR */
-   { 21014, 0x00000303 }, /* GL_ONE_MINUS_SRC_ALPHA */
-   { 21037, 0x00000301 }, /* GL_ONE_MINUS_SRC_COLOR */
-   { 21060, 0x00008598 }, /* GL_OPERAND0_ALPHA */
-   { 21078, 0x00008598 }, /* GL_OPERAND0_ALPHA_ARB */
-   { 21100, 0x00008598 }, /* GL_OPERAND0_ALPHA_EXT */
-   { 21122, 0x00008590 }, /* GL_OPERAND0_RGB */
-   { 21138, 0x00008590 }, /* GL_OPERAND0_RGB_ARB */
-   { 21158, 0x00008590 }, /* GL_OPERAND0_RGB_EXT */
-   { 21178, 0x00008599 }, /* GL_OPERAND1_ALPHA */
-   { 21196, 0x00008599 }, /* GL_OPERAND1_ALPHA_ARB */
-   { 21218, 0x00008599 }, /* GL_OPERAND1_ALPHA_EXT */
-   { 21240, 0x00008591 }, /* GL_OPERAND1_RGB */
-   { 21256, 0x00008591 }, /* GL_OPERAND1_RGB_ARB */
-   { 21276, 0x00008591 }, /* GL_OPERAND1_RGB_EXT */
-   { 21296, 0x0000859A }, /* GL_OPERAND2_ALPHA */
-   { 21314, 0x0000859A }, /* GL_OPERAND2_ALPHA_ARB */
-   { 21336, 0x0000859A }, /* GL_OPERAND2_ALPHA_EXT */
-   { 21358, 0x00008592 }, /* GL_OPERAND2_RGB */
-   { 21374, 0x00008592 }, /* GL_OPERAND2_RGB_ARB */
-   { 21394, 0x00008592 }, /* GL_OPERAND2_RGB_EXT */
-   { 21414, 0x0000859B }, /* GL_OPERAND3_ALPHA_NV */
-   { 21435, 0x00008593 }, /* GL_OPERAND3_RGB_NV */
-   { 21454, 0x00001507 }, /* GL_OR */
-   { 21460, 0x00000A01 }, /* GL_ORDER */
-   { 21469, 0x0000150D }, /* GL_OR_INVERTED */
-   { 21484, 0x0000150B }, /* GL_OR_REVERSE */
-   { 21498, 0x00000505 }, /* GL_OUT_OF_MEMORY */
-   { 21515, 0x00000D05 }, /* GL_PACK_ALIGNMENT */
-   { 21533, 0x0000806C }, /* GL_PACK_IMAGE_HEIGHT */
-   { 21554, 0x00008758 }, /* GL_PACK_INVERT_MESA */
-   { 21574, 0x00000D01 }, /* GL_PACK_LSB_FIRST */
-   { 21592, 0x00000D02 }, /* GL_PACK_ROW_LENGTH */
-   { 21611, 0x0000806B }, /* GL_PACK_SKIP_IMAGES */
-   { 21631, 0x00000D04 }, /* GL_PACK_SKIP_PIXELS */
-   { 21651, 0x00000D03 }, /* GL_PACK_SKIP_ROWS */
-   { 21669, 0x00000D00 }, /* GL_PACK_SWAP_BYTES */
-   { 21688, 0x00008B92 }, /* GL_PALETTE4_R5_G6_B5_OES */
-   { 21713, 0x00008B94 }, /* GL_PALETTE4_RGB5_A1_OES */
-   { 21737, 0x00008B90 }, /* GL_PALETTE4_RGB8_OES */
-   { 21758, 0x00008B93 }, /* GL_PALETTE4_RGBA4_OES */
-   { 21780, 0x00008B91 }, /* GL_PALETTE4_RGBA8_OES */
-   { 21802, 0x00008B97 }, /* GL_PALETTE8_R5_G6_B5_OES */
-   { 21827, 0x00008B99 }, /* GL_PALETTE8_RGB5_A1_OES */
-   { 21851, 0x00008B95 }, /* GL_PALETTE8_RGB8_OES */
-   { 21872, 0x00008B98 }, /* GL_PALETTE8_RGBA4_OES */
-   { 21894, 0x00008B96 }, /* GL_PALETTE8_RGBA8_OES */
-   { 21916, 0x00000700 }, /* GL_PASS_THROUGH_TOKEN */
-   { 21938, 0x00000C50 }, /* GL_PERSPECTIVE_CORRECTION_HINT */
-   { 21969, 0x00000C79 }, /* GL_PIXEL_MAP_A_TO_A */
-   { 21989, 0x00000CB9 }, /* GL_PIXEL_MAP_A_TO_A_SIZE */
-   { 22014, 0x00000C78 }, /* GL_PIXEL_MAP_B_TO_B */
-   { 22034, 0x00000CB8 }, /* GL_PIXEL_MAP_B_TO_B_SIZE */
-   { 22059, 0x00000C77 }, /* GL_PIXEL_MAP_G_TO_G */
-   { 22079, 0x00000CB7 }, /* GL_PIXEL_MAP_G_TO_G_SIZE */
-   { 22104, 0x00000C75 }, /* GL_PIXEL_MAP_I_TO_A */
-   { 22124, 0x00000CB5 }, /* GL_PIXEL_MAP_I_TO_A_SIZE */
-   { 22149, 0x00000C74 }, /* GL_PIXEL_MAP_I_TO_B */
-   { 22169, 0x00000CB4 }, /* GL_PIXEL_MAP_I_TO_B_SIZE */
-   { 22194, 0x00000C73 }, /* GL_PIXEL_MAP_I_TO_G */
-   { 22214, 0x00000CB3 }, /* GL_PIXEL_MAP_I_TO_G_SIZE */
-   { 22239, 0x00000C70 }, /* GL_PIXEL_MAP_I_TO_I */
-   { 22259, 0x00000CB0 }, /* GL_PIXEL_MAP_I_TO_I_SIZE */
-   { 22284, 0x00000C72 }, /* GL_PIXEL_MAP_I_TO_R */
-   { 22304, 0x00000CB2 }, /* GL_PIXEL_MAP_I_TO_R_SIZE */
-   { 22329, 0x00000C76 }, /* GL_PIXEL_MAP_R_TO_R */
-   { 22349, 0x00000CB6 }, /* GL_PIXEL_MAP_R_TO_R_SIZE */
-   { 22374, 0x00000C71 }, /* GL_PIXEL_MAP_S_TO_S */
-   { 22394, 0x00000CB1 }, /* GL_PIXEL_MAP_S_TO_S_SIZE */
-   { 22419, 0x00000020 }, /* GL_PIXEL_MODE_BIT */
-   { 22437, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING_EXT */
-   { 22470, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER_EXT */
-   { 22495, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING_EXT */
-   { 22530, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER_EXT */
-   { 22557, 0x00001B00 }, /* GL_POINT */
-   { 22566, 0x00000000 }, /* GL_POINTS */
-   { 22576, 0x00000002 }, /* GL_POINT_BIT */
-   { 22589, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION */
-   { 22619, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_ARB */
-   { 22653, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_EXT */
-   { 22687, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_SGIS */
-   { 22722, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE */
-   { 22751, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_ARB */
-   { 22784, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_EXT */
-   { 22817, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_SGIS */
-   { 22851, 0x00000B11 }, /* GL_POINT_SIZE */
-   { 22865, 0x00000B13 }, /* GL_POINT_SIZE_GRANULARITY */
-   { 22891, 0x00008127 }, /* GL_POINT_SIZE_MAX */
-   { 22909, 0x00008127 }, /* GL_POINT_SIZE_MAX_ARB */
-   { 22931, 0x00008127 }, /* GL_POINT_SIZE_MAX_EXT */
-   { 22953, 0x00008127 }, /* GL_POINT_SIZE_MAX_SGIS */
-   { 22976, 0x00008126 }, /* GL_POINT_SIZE_MIN */
-   { 22994, 0x00008126 }, /* GL_POINT_SIZE_MIN_ARB */
-   { 23016, 0x00008126 }, /* GL_POINT_SIZE_MIN_EXT */
-   { 23038, 0x00008126 }, /* GL_POINT_SIZE_MIN_SGIS */
-   { 23061, 0x00000B12 }, /* GL_POINT_SIZE_RANGE */
-   { 23081, 0x00000B10 }, /* GL_POINT_SMOOTH */
-   { 23097, 0x00000C51 }, /* GL_POINT_SMOOTH_HINT */
-   { 23118, 0x00008861 }, /* GL_POINT_SPRITE */
-   { 23134, 0x00008861 }, /* GL_POINT_SPRITE_ARB */
-   { 23154, 0x00008CA0 }, /* GL_POINT_SPRITE_COORD_ORIGIN */
-   { 23183, 0x00008861 }, /* GL_POINT_SPRITE_NV */
-   { 23202, 0x00008863 }, /* GL_POINT_SPRITE_R_MODE_NV */
-   { 23228, 0x00000701 }, /* GL_POINT_TOKEN */
-   { 23243, 0x00000009 }, /* GL_POLYGON */
-   { 23254, 0x00000008 }, /* GL_POLYGON_BIT */
-   { 23269, 0x00000B40 }, /* GL_POLYGON_MODE */
-   { 23285, 0x00008039 }, /* GL_POLYGON_OFFSET_BIAS */
-   { 23308, 0x00008038 }, /* GL_POLYGON_OFFSET_FACTOR */
-   { 23333, 0x00008037 }, /* GL_POLYGON_OFFSET_FILL */
-   { 23356, 0x00002A02 }, /* GL_POLYGON_OFFSET_LINE */
-   { 23379, 0x00002A01 }, /* GL_POLYGON_OFFSET_POINT */
-   { 23403, 0x00002A00 }, /* GL_POLYGON_OFFSET_UNITS */
-   { 23427, 0x00000B41 }, /* GL_POLYGON_SMOOTH */
-   { 23445, 0x00000C53 }, /* GL_POLYGON_SMOOTH_HINT */
-   { 23468, 0x00000B42 }, /* GL_POLYGON_STIPPLE */
-   { 23487, 0x00000010 }, /* GL_POLYGON_STIPPLE_BIT */
-   { 23510, 0x00000703 }, /* GL_POLYGON_TOKEN */
-   { 23527, 0x00001203 }, /* GL_POSITION */
-   { 23539, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
-   { 23571, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI */
-   { 23607, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
-   { 23640, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI */
-   { 23677, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
-   { 23708, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI */
-   { 23743, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
-   { 23775, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI */
-   { 23811, 0x000080D2 }, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
-   { 23844, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
-   { 23876, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI */
-   { 23912, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
-   { 23945, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI */
-   { 23982, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS */
-   { 24012, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS_SGI */
-   { 24046, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE */
-   { 24077, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE_SGI */
-   { 24112, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
-   { 24143, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS_EXT */
-   { 24178, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
-   { 24210, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE_EXT */
-   { 24246, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS */
-   { 24276, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS_EXT */
-   { 24310, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE */
-   { 24341, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE_EXT */
-   { 24376, 0x000080D1 }, /* GL_POST_CONVOLUTION_COLOR_TABLE */
-   { 24408, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS */
-   { 24439, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS_EXT */
-   { 24474, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE */
-   { 24506, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE_EXT */
-   { 24542, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS */
-   { 24571, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS_EXT */
-   { 24604, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE */
-   { 24634, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE_EXT */
-   { 24668, 0x0000817B }, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
-   { 24707, 0x00008179 }, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
-   { 24740, 0x0000817C }, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
-   { 24780, 0x0000817A }, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
-   { 24814, 0x00008578 }, /* GL_PREVIOUS */
-   { 24826, 0x00008578 }, /* GL_PREVIOUS_ARB */
-   { 24842, 0x00008578 }, /* GL_PREVIOUS_EXT */
-   { 24858, 0x00008577 }, /* GL_PRIMARY_COLOR */
-   { 24875, 0x00008577 }, /* GL_PRIMARY_COLOR_ARB */
-   { 24896, 0x00008577 }, /* GL_PRIMARY_COLOR_EXT */
-   { 24917, 0x000088B0 }, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
-   { 24950, 0x00008805 }, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
-   { 24982, 0x000088AC }, /* GL_PROGRAM_ATTRIBS_ARB */
-   { 25005, 0x00008677 }, /* GL_PROGRAM_BINDING_ARB */
-   { 25028, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_ARB */
-   { 25058, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_NV */
-   { 25087, 0x00008874 }, /* GL_PROGRAM_ERROR_STRING_ARB */
-   { 25115, 0x00008876 }, /* GL_PROGRAM_FORMAT_ARB */
-   { 25137, 0x00008875 }, /* GL_PROGRAM_FORMAT_ASCII_ARB */
-   { 25165, 0x000088A0 }, /* GL_PROGRAM_INSTRUCTIONS_ARB */
-   { 25193, 0x00008627 }, /* GL_PROGRAM_LENGTH_ARB */
-   { 25215, 0x00008627 }, /* GL_PROGRAM_LENGTH_NV */
-   { 25236, 0x000088B2 }, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-   { 25276, 0x00008808 }, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-   { 25315, 0x000088AE }, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
-   { 25345, 0x000088A2 }, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-   { 25380, 0x000088AA }, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
-   { 25413, 0x000088A6 }, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
-   { 25447, 0x0000880A }, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-   { 25486, 0x00008809 }, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-   { 25525, 0x00008B40 }, /* GL_PROGRAM_OBJECT_ARB */
-   { 25547, 0x000088A8 }, /* GL_PROGRAM_PARAMETERS_ARB */
-   { 25573, 0x00008644 }, /* GL_PROGRAM_PARAMETER_NV */
-   { 25597, 0x00008647 }, /* GL_PROGRAM_RESIDENT_NV */
-   { 25620, 0x00008628 }, /* GL_PROGRAM_STRING_ARB */
-   { 25642, 0x00008628 }, /* GL_PROGRAM_STRING_NV */
-   { 25663, 0x00008646 }, /* GL_PROGRAM_TARGET_NV */
-   { 25684, 0x000088A4 }, /* GL_PROGRAM_TEMPORARIES_ARB */
-   { 25711, 0x00008807 }, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
-   { 25743, 0x00008806 }, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
-   { 25775, 0x000088B6 }, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-   { 25810, 0x00001701 }, /* GL_PROJECTION */
-   { 25824, 0x00000BA7 }, /* GL_PROJECTION_MATRIX */
-   { 25845, 0x00000BA4 }, /* GL_PROJECTION_STACK_DEPTH */
-   { 25871, 0x000080D3 }, /* GL_PROXY_COLOR_TABLE */
-   { 25892, 0x00008025 }, /* GL_PROXY_HISTOGRAM */
-   { 25911, 0x00008025 }, /* GL_PROXY_HISTOGRAM_EXT */
-   { 25934, 0x000080D5 }, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
-   { 25973, 0x000080D4 }, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
-   { 26011, 0x00008063 }, /* GL_PROXY_TEXTURE_1D */
-   { 26031, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
-   { 26061, 0x00008063 }, /* GL_PROXY_TEXTURE_1D_EXT */
-   { 26085, 0x00008064 }, /* GL_PROXY_TEXTURE_2D */
-   { 26105, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
-   { 26135, 0x00008064 }, /* GL_PROXY_TEXTURE_2D_EXT */
-   { 26159, 0x00008070 }, /* GL_PROXY_TEXTURE_3D */
-   { 26179, 0x000080BD }, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
-   { 26212, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP */
-   { 26238, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP_ARB */
-   { 26268, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
-   { 26299, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_NV */
-   { 26329, 0x00002003 }, /* GL_Q */
-   { 26334, 0x00001209 }, /* GL_QUADRATIC_ATTENUATION */
-   { 26359, 0x00000007 }, /* GL_QUADS */
-   { 26368, 0x00008614 }, /* GL_QUAD_MESH_SUN */
-   { 26385, 0x00000008 }, /* GL_QUAD_STRIP */
-   { 26399, 0x00008864 }, /* GL_QUERY_COUNTER_BITS */
-   { 26421, 0x00008864 }, /* GL_QUERY_COUNTER_BITS_ARB */
-   { 26447, 0x00008866 }, /* GL_QUERY_RESULT */
-   { 26463, 0x00008866 }, /* GL_QUERY_RESULT_ARB */
-   { 26483, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE */
-   { 26509, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE_ARB */
-   { 26539, 0x00002002 }, /* GL_R */
-   { 26544, 0x00002A10 }, /* GL_R3_G3_B2 */
-   { 26556, 0x00019262 }, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
-   { 26589, 0x00000C02 }, /* GL_READ_BUFFER */
-   { 26604, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
-   { 26636, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER_EXT */
-   { 26660, 0x000088B8 }, /* GL_READ_ONLY */
-   { 26673, 0x000088B8 }, /* GL_READ_ONLY_ARB */
-   { 26690, 0x000088BA }, /* GL_READ_WRITE */
-   { 26704, 0x000088BA }, /* GL_READ_WRITE_ARB */
-   { 26722, 0x00001903 }, /* GL_RED */
-   { 26729, 0x00008016 }, /* GL_REDUCE */
-   { 26739, 0x00008016 }, /* GL_REDUCE_EXT */
-   { 26753, 0x00000D15 }, /* GL_RED_BIAS */
-   { 26765, 0x00000D52 }, /* GL_RED_BITS */
-   { 26777, 0x00000D14 }, /* GL_RED_SCALE */
-   { 26790, 0x00008512 }, /* GL_REFLECTION_MAP */
-   { 26808, 0x00008512 }, /* GL_REFLECTION_MAP_ARB */
-   { 26830, 0x00008512 }, /* GL_REFLECTION_MAP_NV */
-   { 26851, 0x00001C00 }, /* GL_RENDER */
-   { 26861, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_EXT */
-   { 26889, 0x00008D41 }, /* GL_RENDERBUFFER_EXT */
-   { 26909, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_EXT */
-   { 26936, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */
-   { 26972, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_EXT */
-   { 26998, 0x00001F01 }, /* GL_RENDERER */
-   { 27010, 0x00000C40 }, /* GL_RENDER_MODE */
-   { 27025, 0x00002901 }, /* GL_REPEAT */
-   { 27035, 0x00001E01 }, /* GL_REPLACE */
-   { 27046, 0x00008062 }, /* GL_REPLACE_EXT */
-   { 27061, 0x00008153 }, /* GL_REPLICATE_BORDER_HP */
-   { 27084, 0x0000803A }, /* GL_RESCALE_NORMAL */
-   { 27102, 0x0000803A }, /* GL_RESCALE_NORMAL_EXT */
-   { 27124, 0x00000102 }, /* GL_RETURN */
-   { 27134, 0x00001907 }, /* GL_RGB */
-   { 27141, 0x00008052 }, /* GL_RGB10 */
-   { 27150, 0x00008059 }, /* GL_RGB10_A2 */
-   { 27162, 0x00008059 }, /* GL_RGB10_A2_EXT */
-   { 27178, 0x00008052 }, /* GL_RGB10_EXT */
-   { 27191, 0x00008053 }, /* GL_RGB12 */
-   { 27200, 0x00008053 }, /* GL_RGB12_EXT */
-   { 27213, 0x00008054 }, /* GL_RGB16 */
-   { 27222, 0x00008054 }, /* GL_RGB16_EXT */
-   { 27235, 0x0000804E }, /* GL_RGB2_EXT */
-   { 27247, 0x0000804F }, /* GL_RGB4 */
-   { 27255, 0x0000804F }, /* GL_RGB4_EXT */
-   { 27267, 0x000083A1 }, /* GL_RGB4_S3TC */
-   { 27280, 0x00008050 }, /* GL_RGB5 */
-   { 27288, 0x00008057 }, /* GL_RGB5_A1 */
-   { 27299, 0x00008057 }, /* GL_RGB5_A1_EXT */
-   { 27314, 0x00008050 }, /* GL_RGB5_EXT */
-   { 27326, 0x00008051 }, /* GL_RGB8 */
-   { 27334, 0x00008051 }, /* GL_RGB8_EXT */
-   { 27346, 0x00001908 }, /* GL_RGBA */
-   { 27354, 0x0000805A }, /* GL_RGBA12 */
-   { 27364, 0x0000805A }, /* GL_RGBA12_EXT */
-   { 27378, 0x0000805B }, /* GL_RGBA16 */
-   { 27388, 0x0000805B }, /* GL_RGBA16_EXT */
-   { 27402, 0x00008055 }, /* GL_RGBA2 */
-   { 27411, 0x00008055 }, /* GL_RGBA2_EXT */
-   { 27424, 0x00008056 }, /* GL_RGBA4 */
-   { 27433, 0x000083A5 }, /* GL_RGBA4_DXT5_S3TC */
-   { 27452, 0x00008056 }, /* GL_RGBA4_EXT */
-   { 27465, 0x000083A3 }, /* GL_RGBA4_S3TC */
-   { 27479, 0x00008058 }, /* GL_RGBA8 */
-   { 27488, 0x00008058 }, /* GL_RGBA8_EXT */
-   { 27501, 0x000083A4 }, /* GL_RGBA_DXT5_S3TC */
-   { 27519, 0x00000C31 }, /* GL_RGBA_MODE */
-   { 27532, 0x000083A2 }, /* GL_RGBA_S3TC */
-   { 27545, 0x000083A0 }, /* GL_RGB_S3TC */
-   { 27557, 0x00008573 }, /* GL_RGB_SCALE */
-   { 27570, 0x00008573 }, /* GL_RGB_SCALE_ARB */
-   { 27587, 0x00008573 }, /* GL_RGB_SCALE_EXT */
-   { 27604, 0x00000407 }, /* GL_RIGHT */
-   { 27613, 0x00002000 }, /* GL_S */
-   { 27618, 0x00008B5D }, /* GL_SAMPLER_1D */
-   { 27632, 0x00008B61 }, /* GL_SAMPLER_1D_SHADOW */
-   { 27653, 0x00008B5E }, /* GL_SAMPLER_2D */
-   { 27667, 0x00008B62 }, /* GL_SAMPLER_2D_SHADOW */
-   { 27688, 0x00008B5F }, /* GL_SAMPLER_3D */
-   { 27702, 0x00008B60 }, /* GL_SAMPLER_CUBE */
-   { 27718, 0x000080A9 }, /* GL_SAMPLES */
-   { 27729, 0x000086B4 }, /* GL_SAMPLES_3DFX */
-   { 27745, 0x000080A9 }, /* GL_SAMPLES_ARB */
-   { 27760, 0x00008914 }, /* GL_SAMPLES_PASSED */
-   { 27778, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */
-   { 27800, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
-   { 27828, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */
-   { 27860, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */
-   { 27883, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */
-   { 27910, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */
-   { 27928, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */
-   { 27951, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */
-   { 27973, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */
-   { 27992, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */
-   { 28015, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */
-   { 28041, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */
-   { 28071, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */
-   { 28096, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */
-   { 28125, 0x00080000 }, /* GL_SCISSOR_BIT */
-   { 28140, 0x00000C10 }, /* GL_SCISSOR_BOX */
-   { 28155, 0x00000C11 }, /* GL_SCISSOR_TEST */
-   { 28171, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */
-   { 28196, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
-   { 28236, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */
-   { 28280, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
-   { 28313, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
-   { 28343, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
-   { 28375, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
-   { 28405, 0x00001C02 }, /* GL_SELECT */
-   { 28415, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */
-   { 28443, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */
-   { 28468, 0x00008012 }, /* GL_SEPARABLE_2D */
-   { 28484, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */
-   { 28511, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */
-   { 28542, 0x0000150F }, /* GL_SET */
-   { 28549, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */
-   { 28570, 0x00008B88 }, /* GL_SHADER_SOURCE_LENGTH */
-   { 28594, 0x00008B4F }, /* GL_SHADER_TYPE */
-   { 28609, 0x00000B54 }, /* GL_SHADE_MODEL */
-   { 28624, 0x00008B8C }, /* GL_SHADING_LANGUAGE_VERSION */
-   { 28652, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */
-   { 28675, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */
-   { 28705, 0x00001601 }, /* GL_SHININESS */
-   { 28718, 0x00001402 }, /* GL_SHORT */
-   { 28727, 0x000081F9 }, /* GL_SINGLE_COLOR */
-   { 28743, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */
-   { 28763, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */
-   { 28782, 0x00001D01 }, /* GL_SMOOTH */
-   { 28792, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */
-   { 28825, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */
-   { 28852, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */
-   { 28885, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */
-   { 28912, 0x00008588 }, /* GL_SOURCE0_ALPHA */
-   { 28929, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */
-   { 28950, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */
-   { 28971, 0x00008580 }, /* GL_SOURCE0_RGB */
-   { 28986, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */
-   { 29005, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */
-   { 29024, 0x00008589 }, /* GL_SOURCE1_ALPHA */
-   { 29041, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */
-   { 29062, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */
-   { 29083, 0x00008581 }, /* GL_SOURCE1_RGB */
-   { 29098, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */
-   { 29117, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */
-   { 29136, 0x0000858A }, /* GL_SOURCE2_ALPHA */
-   { 29153, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */
-   { 29174, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */
-   { 29195, 0x00008582 }, /* GL_SOURCE2_RGB */
-   { 29210, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */
-   { 29229, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */
-   { 29248, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */
-   { 29268, 0x00008583 }, /* GL_SOURCE3_RGB_NV */
-   { 29286, 0x00001202 }, /* GL_SPECULAR */
-   { 29298, 0x00002402 }, /* GL_SPHERE_MAP */
-   { 29312, 0x00001206 }, /* GL_SPOT_CUTOFF */
-   { 29327, 0x00001204 }, /* GL_SPOT_DIRECTION */
-   { 29345, 0x00001205 }, /* GL_SPOT_EXPONENT */
-   { 29362, 0x00008588 }, /* GL_SRC0_ALPHA */
-   { 29376, 0x00008580 }, /* GL_SRC0_RGB */
-   { 29388, 0x00008589 }, /* GL_SRC1_ALPHA */
-   { 29402, 0x00008581 }, /* GL_SRC1_RGB */
-   { 29414, 0x0000858A }, /* GL_SRC2_ALPHA */
-   { 29428, 0x00008582 }, /* GL_SRC2_RGB */
-   { 29440, 0x00000302 }, /* GL_SRC_ALPHA */
-   { 29453, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */
-   { 29475, 0x00000300 }, /* GL_SRC_COLOR */
-   { 29488, 0x00000503 }, /* GL_STACK_OVERFLOW */
-   { 29506, 0x00000504 }, /* GL_STACK_UNDERFLOW */
-   { 29525, 0x000088E6 }, /* GL_STATIC_COPY */
-   { 29540, 0x000088E6 }, /* GL_STATIC_COPY_ARB */
-   { 29559, 0x000088E4 }, /* GL_STATIC_DRAW */
-   { 29574, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */
-   { 29593, 0x000088E5 }, /* GL_STATIC_READ */
-   { 29608, 0x000088E5 }, /* GL_STATIC_READ_ARB */
-   { 29627, 0x00001802 }, /* GL_STENCIL */
-   { 29638, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */
-   { 29664, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */
-   { 29685, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */
-   { 29710, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
-   { 29731, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */
-   { 29756, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-   { 29788, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */
-   { 29824, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
-   { 29856, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */
-   { 29892, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
-   { 29912, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
-   { 29939, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
-   { 29965, 0x00000D57 }, /* GL_STENCIL_BITS */
-   { 29981, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
-   { 30003, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
-   { 30026, 0x00000B94 }, /* GL_STENCIL_FAIL */
-   { 30042, 0x00000B92 }, /* GL_STENCIL_FUNC */
-   { 30058, 0x00001901 }, /* GL_STENCIL_INDEX */
-   { 30075, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
-   { 30098, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
-   { 30120, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
-   { 30142, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
-   { 30164, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
-   { 30185, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
-   { 30212, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
-   { 30239, 0x00000B97 }, /* GL_STENCIL_REF */
-   { 30254, 0x00000B90 }, /* GL_STENCIL_TEST */
-   { 30270, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
-   { 30299, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
-   { 30321, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
-   { 30342, 0x00000C33 }, /* GL_STEREO */
-   { 30352, 0x000088E2 }, /* GL_STREAM_COPY */
-   { 30367, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
-   { 30386, 0x000088E0 }, /* GL_STREAM_DRAW */
-   { 30401, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
-   { 30420, 0x000088E1 }, /* GL_STREAM_READ */
-   { 30435, 0x000088E1 }, /* GL_STREAM_READ_ARB */
-   { 30454, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
-   { 30471, 0x000084E7 }, /* GL_SUBTRACT */
-   { 30483, 0x000084E7 }, /* GL_SUBTRACT_ARB */
-   { 30499, 0x00002001 }, /* GL_T */
-   { 30504, 0x00002A2A }, /* GL_T2F_C3F_V3F */
-   { 30519, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
-   { 30538, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
-   { 30554, 0x00002A2B }, /* GL_T2F_N3F_V3F */
-   { 30569, 0x00002A27 }, /* GL_T2F_V3F */
-   { 30580, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
-   { 30599, 0x00002A28 }, /* GL_T4F_V4F */
-   { 30610, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
-   { 30633, 0x00001702 }, /* GL_TEXTURE */
-   { 30644, 0x000084C0 }, /* GL_TEXTURE0 */
-   { 30656, 0x000084C0 }, /* GL_TEXTURE0_ARB */
-   { 30672, 0x000084C1 }, /* GL_TEXTURE1 */
-   { 30684, 0x000084CA }, /* GL_TEXTURE10 */
-   { 30697, 0x000084CA }, /* GL_TEXTURE10_ARB */
-   { 30714, 0x000084CB }, /* GL_TEXTURE11 */
-   { 30727, 0x000084CB }, /* GL_TEXTURE11_ARB */
-   { 30744, 0x000084CC }, /* GL_TEXTURE12 */
-   { 30757, 0x000084CC }, /* GL_TEXTURE12_ARB */
-   { 30774, 0x000084CD }, /* GL_TEXTURE13 */
-   { 30787, 0x000084CD }, /* GL_TEXTURE13_ARB */
-   { 30804, 0x000084CE }, /* GL_TEXTURE14 */
-   { 30817, 0x000084CE }, /* GL_TEXTURE14_ARB */
-   { 30834, 0x000084CF }, /* GL_TEXTURE15 */
-   { 30847, 0x000084CF }, /* GL_TEXTURE15_ARB */
-   { 30864, 0x000084D0 }, /* GL_TEXTURE16 */
-   { 30877, 0x000084D0 }, /* GL_TEXTURE16_ARB */
-   { 30894, 0x000084D1 }, /* GL_TEXTURE17 */
-   { 30907, 0x000084D1 }, /* GL_TEXTURE17_ARB */
-   { 30924, 0x000084D2 }, /* GL_TEXTURE18 */
-   { 30937, 0x000084D2 }, /* GL_TEXTURE18_ARB */
-   { 30954, 0x000084D3 }, /* GL_TEXTURE19 */
-   { 30967, 0x000084D3 }, /* GL_TEXTURE19_ARB */
-   { 30984, 0x000084C1 }, /* GL_TEXTURE1_ARB */
-   { 31000, 0x000084C2 }, /* GL_TEXTURE2 */
-   { 31012, 0x000084D4 }, /* GL_TEXTURE20 */
-   { 31025, 0x000084D4 }, /* GL_TEXTURE20_ARB */
-   { 31042, 0x000084D5 }, /* GL_TEXTURE21 */
-   { 31055, 0x000084D5 }, /* GL_TEXTURE21_ARB */
-   { 31072, 0x000084D6 }, /* GL_TEXTURE22 */
-   { 31085, 0x000084D6 }, /* GL_TEXTURE22_ARB */
-   { 31102, 0x000084D7 }, /* GL_TEXTURE23 */
-   { 31115, 0x000084D7 }, /* GL_TEXTURE23_ARB */
-   { 31132, 0x000084D8 }, /* GL_TEXTURE24 */
-   { 31145, 0x000084D8 }, /* GL_TEXTURE24_ARB */
-   { 31162, 0x000084D9 }, /* GL_TEXTURE25 */
-   { 31175, 0x000084D9 }, /* GL_TEXTURE25_ARB */
-   { 31192, 0x000084DA }, /* GL_TEXTURE26 */
-   { 31205, 0x000084DA }, /* GL_TEXTURE26_ARB */
-   { 31222, 0x000084DB }, /* GL_TEXTURE27 */
-   { 31235, 0x000084DB }, /* GL_TEXTURE27_ARB */
-   { 31252, 0x000084DC }, /* GL_TEXTURE28 */
-   { 31265, 0x000084DC }, /* GL_TEXTURE28_ARB */
-   { 31282, 0x000084DD }, /* GL_TEXTURE29 */
-   { 31295, 0x000084DD }, /* GL_TEXTURE29_ARB */
-   { 31312, 0x000084C2 }, /* GL_TEXTURE2_ARB */
-   { 31328, 0x000084C3 }, /* GL_TEXTURE3 */
-   { 31340, 0x000084DE }, /* GL_TEXTURE30 */
-   { 31353, 0x000084DE }, /* GL_TEXTURE30_ARB */
-   { 31370, 0x000084DF }, /* GL_TEXTURE31 */
-   { 31383, 0x000084DF }, /* GL_TEXTURE31_ARB */
-   { 31400, 0x000084C3 }, /* GL_TEXTURE3_ARB */
-   { 31416, 0x000084C4 }, /* GL_TEXTURE4 */
-   { 31428, 0x000084C4 }, /* GL_TEXTURE4_ARB */
-   { 31444, 0x000084C5 }, /* GL_TEXTURE5 */
-   { 31456, 0x000084C5 }, /* GL_TEXTURE5_ARB */
-   { 31472, 0x000084C6 }, /* GL_TEXTURE6 */
-   { 31484, 0x000084C6 }, /* GL_TEXTURE6_ARB */
-   { 31500, 0x000084C7 }, /* GL_TEXTURE7 */
-   { 31512, 0x000084C7 }, /* GL_TEXTURE7_ARB */
-   { 31528, 0x000084C8 }, /* GL_TEXTURE8 */
-   { 31540, 0x000084C8 }, /* GL_TEXTURE8_ARB */
-   { 31556, 0x000084C9 }, /* GL_TEXTURE9 */
-   { 31568, 0x000084C9 }, /* GL_TEXTURE9_ARB */
-   { 31584, 0x00000DE0 }, /* GL_TEXTURE_1D */
-   { 31598, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
-   { 31622, 0x00000DE1 }, /* GL_TEXTURE_2D */
-   { 31636, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
-   { 31660, 0x0000806F }, /* GL_TEXTURE_3D */
-   { 31674, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
-   { 31696, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
-   { 31722, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
-   { 31744, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
-   { 31766, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
-   { 31798, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
-   { 31820, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
-   { 31852, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
-   { 31874, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
-   { 31902, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
-   { 31934, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
-   { 31967, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
-   { 31999, 0x00040000 }, /* GL_TEXTURE_BIT */
-   { 32014, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
-   { 32035, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
-   { 32060, 0x00001005 }, /* GL_TEXTURE_BORDER */
-   { 32078, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
-   { 32102, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-   { 32133, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
-   { 32163, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-   { 32193, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-   { 32228, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-   { 32259, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-   { 32297, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
-   { 32324, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
-   { 32356, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
-   { 32390, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
-   { 32414, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
-   { 32442, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
-   { 32466, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
-   { 32494, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-   { 32527, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
-   { 32551, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
-   { 32573, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
-   { 32595, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
-   { 32621, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
-   { 32655, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-   { 32688, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
-   { 32725, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
-   { 32753, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
-   { 32785, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
-   { 32808, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
-   { 32846, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
-   { 32888, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
-   { 32919, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-   { 32947, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
-   { 32977, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-   { 33005, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
-   { 33025, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
-   { 33049, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-   { 33080, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
-   { 33115, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-   { 33146, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
-   { 33181, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
-   { 33212, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
-   { 33247, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-   { 33278, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
-   { 33313, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-   { 33344, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
-   { 33379, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-   { 33410, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
-   { 33445, 0x00008071 }, /* GL_TEXTURE_DEPTH */
-   { 33462, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
-   { 33484, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
-   { 33510, 0x00002300 }, /* GL_TEXTURE_ENV */
-   { 33525, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
-   { 33546, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
-   { 33566, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
-   { 33592, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
-   { 33612, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
-   { 33629, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
-   { 33646, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
-   { 33663, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
-   { 33680, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
-   { 33705, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
-   { 33727, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
-   { 33753, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
-   { 33771, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
-   { 33797, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
-   { 33823, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
-   { 33853, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
-   { 33880, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
-   { 33905, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
-   { 33925, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
-   { 33949, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
-   { 33976, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-   { 34003, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-   { 34030, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
-   { 34056, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
-   { 34086, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
-   { 34108, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
-   { 34126, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
-   { 34156, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
-   { 34184, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-   { 34212, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-   { 34240, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
-   { 34261, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
-   { 34280, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
-   { 34302, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
-   { 34321, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
-   { 34341, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
-   { 34366, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
-   { 34390, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
-   { 34410, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
-   { 34434, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
-   { 34454, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
-   { 34477, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
-   { 34502, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
-   { 34536, 0x00001000 }, /* GL_TEXTURE_WIDTH */
-   { 34553, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
-   { 34571, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
-   { 34589, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
-   { 34607, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
-   { 34627, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
-   { 34646, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-   { 34675, 0x00001000 }, /* GL_TRANSFORM_BIT */
-   { 34692, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
-   { 34718, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
-   { 34748, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-   { 34780, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-   { 34810, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
-   { 34844, 0x0000862C }, /* GL_TRANSPOSE_NV */
-   { 34860, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-   { 34891, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
-   { 34926, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-   { 34954, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
-   { 34986, 0x00000004 }, /* GL_TRIANGLES */
-   { 34999, 0x00000006 }, /* GL_TRIANGLE_FAN */
-   { 35015, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
-   { 35036, 0x00000005 }, /* GL_TRIANGLE_STRIP */
-   { 35054, 0x00000001 }, /* GL_TRUE */
-   { 35062, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
-   { 35082, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
-   { 35105, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
-   { 35125, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
-   { 35146, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
-   { 35168, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
-   { 35190, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
-   { 35210, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
-   { 35231, 0x00001401 }, /* GL_UNSIGNED_BYTE */
-   { 35248, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-   { 35275, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
-   { 35298, 0x00001405 }, /* GL_UNSIGNED_INT */
-   { 35314, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
-   { 35341, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
-   { 35365, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-   { 35396, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
-   { 35420, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-   { 35448, 0x00001403 }, /* GL_UNSIGNED_SHORT */
-   { 35466, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-   { 35496, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-   { 35522, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-   { 35552, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-   { 35578, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
-   { 35602, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-   { 35630, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-   { 35658, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
-   { 35685, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-   { 35717, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
-   { 35748, 0x00008CA2 }, /* GL_UPPER_LEFT */
-   { 35762, 0x00002A20 }, /* GL_V2F */
-   { 35769, 0x00002A21 }, /* GL_V3F */
-   { 35776, 0x00008B83 }, /* GL_VALIDATE_STATUS */
-   { 35795, 0x00001F00 }, /* GL_VENDOR */
-   { 35805, 0x00001F02 }, /* GL_VERSION */
-   { 35816, 0x00008074 }, /* GL_VERTEX_ARRAY */
-   { 35832, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
-   { 35862, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-   { 35893, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
-   { 35928, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
-   { 35952, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
-   { 35973, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
-   { 35996, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
-   { 36017, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-   { 36044, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-   { 36072, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-   { 36100, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-   { 36128, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-   { 36156, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-   { 36184, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
-   { 36212, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-   { 36239, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-   { 36266, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-   { 36293, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-   { 36320, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-   { 36347, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-   { 36374, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-   { 36401, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-   { 36428, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-   { 36455, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-   { 36493, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
-   { 36535, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-   { 36566, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
-   { 36601, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
-   { 36635, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
-   { 36673, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-   { 36704, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
-   { 36739, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-   { 36767, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
-   { 36799, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-   { 36829, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
-   { 36863, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
-   { 36891, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
-   { 36923, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
-   { 36943, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
-   { 36965, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
-   { 36994, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
-   { 37015, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-   { 37044, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
-   { 37077, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
-   { 37109, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-   { 37136, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
-   { 37167, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
-   { 37197, 0x00008B31 }, /* GL_VERTEX_SHADER */
-   { 37214, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
-   { 37235, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
-   { 37262, 0x00000BA2 }, /* GL_VIEWPORT */
-   { 37274, 0x00000800 }, /* GL_VIEWPORT_BIT */
-   { 37290, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
-   { 37310, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-   { 37341, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
-   { 37376, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-   { 37404, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-   { 37429, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-   { 37456, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-   { 37481, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
-   { 37505, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
-   { 37524, 0x000088B9 }, /* GL_WRITE_ONLY */
-   { 37538, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
-   { 37556, 0x00001506 }, /* GL_XOR */
-   { 37563, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
-   { 37582, 0x00008757 }, /* GL_YCBCR_MESA */
-   { 37596, 0x00000000 }, /* GL_ZERO */
-   { 37604, 0x00000D16 }, /* GL_ZOOM_X */
-   { 37614, 0x00000D17 }, /* GL_ZOOM_Y */
+   {  2476, 0x00008CE0 }, /* GL_COLOR_ATTACHMENT0 */
+   {  2497, 0x00008CE0 }, /* GL_COLOR_ATTACHMENT0_EXT */
+   {  2522, 0x00008CE1 }, /* GL_COLOR_ATTACHMENT1 */
+   {  2543, 0x00008CEA }, /* GL_COLOR_ATTACHMENT10 */
+   {  2565, 0x00008CEA }, /* GL_COLOR_ATTACHMENT10_EXT */
+   {  2591, 0x00008CEB }, /* GL_COLOR_ATTACHMENT11 */
+   {  2613, 0x00008CEB }, /* GL_COLOR_ATTACHMENT11_EXT */
+   {  2639, 0x00008CEC }, /* GL_COLOR_ATTACHMENT12 */
+   {  2661, 0x00008CEC }, /* GL_COLOR_ATTACHMENT12_EXT */
+   {  2687, 0x00008CED }, /* GL_COLOR_ATTACHMENT13 */
+   {  2709, 0x00008CED }, /* GL_COLOR_ATTACHMENT13_EXT */
+   {  2735, 0x00008CEE }, /* GL_COLOR_ATTACHMENT14 */
+   {  2757, 0x00008CEE }, /* GL_COLOR_ATTACHMENT14_EXT */
+   {  2783, 0x00008CEF }, /* GL_COLOR_ATTACHMENT15 */
+   {  2805, 0x00008CEF }, /* GL_COLOR_ATTACHMENT15_EXT */
+   {  2831, 0x00008CE1 }, /* GL_COLOR_ATTACHMENT1_EXT */
+   {  2856, 0x00008CE2 }, /* GL_COLOR_ATTACHMENT2 */
+   {  2877, 0x00008CE2 }, /* GL_COLOR_ATTACHMENT2_EXT */
+   {  2902, 0x00008CE3 }, /* GL_COLOR_ATTACHMENT3 */
+   {  2923, 0x00008CE3 }, /* GL_COLOR_ATTACHMENT3_EXT */
+   {  2948, 0x00008CE4 }, /* GL_COLOR_ATTACHMENT4 */
+   {  2969, 0x00008CE4 }, /* GL_COLOR_ATTACHMENT4_EXT */
+   {  2994, 0x00008CE5 }, /* GL_COLOR_ATTACHMENT5 */
+   {  3015, 0x00008CE5 }, /* GL_COLOR_ATTACHMENT5_EXT */
+   {  3040, 0x00008CE6 }, /* GL_COLOR_ATTACHMENT6 */
+   {  3061, 0x00008CE6 }, /* GL_COLOR_ATTACHMENT6_EXT */
+   {  3086, 0x00008CE7 }, /* GL_COLOR_ATTACHMENT7 */
+   {  3107, 0x00008CE7 }, /* GL_COLOR_ATTACHMENT7_EXT */
+   {  3132, 0x00008CE8 }, /* GL_COLOR_ATTACHMENT8 */
+   {  3153, 0x00008CE8 }, /* GL_COLOR_ATTACHMENT8_EXT */
+   {  3178, 0x00008CE9 }, /* GL_COLOR_ATTACHMENT9 */
+   {  3199, 0x00008CE9 }, /* GL_COLOR_ATTACHMENT9_EXT */
+   {  3224, 0x00004000 }, /* GL_COLOR_BUFFER_BIT */
+   {  3244, 0x00000C22 }, /* GL_COLOR_CLEAR_VALUE */
+   {  3265, 0x00001900 }, /* GL_COLOR_INDEX */
+   {  3280, 0x00001603 }, /* GL_COLOR_INDEXES */
+   {  3297, 0x00000BF2 }, /* GL_COLOR_LOGIC_OP */
+   {  3315, 0x00000B57 }, /* GL_COLOR_MATERIAL */
+   {  3333, 0x00000B55 }, /* GL_COLOR_MATERIAL_FACE */
+   {  3356, 0x00000B56 }, /* GL_COLOR_MATERIAL_PARAMETER */
+   {  3384, 0x000080B1 }, /* GL_COLOR_MATRIX */
+   {  3400, 0x000080B1 }, /* GL_COLOR_MATRIX_SGI */
+   {  3420, 0x000080B2 }, /* GL_COLOR_MATRIX_STACK_DEPTH */
+   {  3448, 0x000080B2 }, /* GL_COLOR_MATRIX_STACK_DEPTH_SGI */
+   {  3480, 0x00008458 }, /* GL_COLOR_SUM */
+   {  3493, 0x00008458 }, /* GL_COLOR_SUM_ARB */
+   {  3510, 0x000080D0 }, /* GL_COLOR_TABLE */
+   {  3525, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE */
+   {  3551, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE_EXT */
+   {  3581, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE_SGI */
+   {  3611, 0x000080D7 }, /* GL_COLOR_TABLE_BIAS */
+   {  3631, 0x000080D7 }, /* GL_COLOR_TABLE_BIAS_SGI */
+   {  3655, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE */
+   {  3680, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE_EXT */
+   {  3709, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE_SGI */
+   {  3738, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT */
+   {  3760, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT_EXT */
+   {  3786, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT_SGI */
+   {  3812, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE */
+   {  3838, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE_EXT */
+   {  3868, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE_SGI */
+   {  3898, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE */
+   {  3928, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE_EXT */
+   {  3962, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE_SGI */
+   {  3996, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE */
+   {  4026, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE_EXT */
+   {  4060, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE_SGI */
+   {  4094, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE */
+   {  4118, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE_EXT */
+   {  4146, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE_SGI */
+   {  4174, 0x000080D6 }, /* GL_COLOR_TABLE_SCALE */
+   {  4195, 0x000080D6 }, /* GL_COLOR_TABLE_SCALE_SGI */
+   {  4220, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH */
+   {  4241, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH_EXT */
+   {  4266, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH_SGI */
+   {  4291, 0x00000C23 }, /* GL_COLOR_WRITEMASK */
+   {  4310, 0x00008570 }, /* GL_COMBINE */
+   {  4321, 0x00008503 }, /* GL_COMBINE4 */
+   {  4333, 0x00008572 }, /* GL_COMBINE_ALPHA */
+   {  4350, 0x00008572 }, /* GL_COMBINE_ALPHA_ARB */
+   {  4371, 0x00008572 }, /* GL_COMBINE_ALPHA_EXT */
+   {  4392, 0x00008570 }, /* GL_COMBINE_ARB */
+   {  4407, 0x00008570 }, /* GL_COMBINE_EXT */
+   {  4422, 0x00008571 }, /* GL_COMBINE_RGB */
+   {  4437, 0x00008571 }, /* GL_COMBINE_RGB_ARB */
+   {  4456, 0x00008571 }, /* GL_COMBINE_RGB_EXT */
+   {  4475, 0x0000884E }, /* GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT */
+   {  4511, 0x0000884E }, /* GL_COMPARE_R_TO_TEXTURE */
+   {  4535, 0x0000884E }, /* GL_COMPARE_R_TO_TEXTURE_ARB */
+   {  4563, 0x00001300 }, /* GL_COMPILE */
+   {  4574, 0x00001301 }, /* GL_COMPILE_AND_EXECUTE */
+   {  4597, 0x00008B81 }, /* GL_COMPILE_STATUS */
+   {  4615, 0x000084E9 }, /* GL_COMPRESSED_ALPHA */
+   {  4635, 0x000084E9 }, /* GL_COMPRESSED_ALPHA_ARB */
+   {  4659, 0x000084EC }, /* GL_COMPRESSED_INTENSITY */
+   {  4683, 0x000084EC }, /* GL_COMPRESSED_INTENSITY_ARB */
+   {  4711, 0x000084EA }, /* GL_COMPRESSED_LUMINANCE */
+   {  4735, 0x000084EB }, /* GL_COMPRESSED_LUMINANCE_ALPHA */
+   {  4765, 0x000084EB }, /* GL_COMPRESSED_LUMINANCE_ALPHA_ARB */
+   {  4799, 0x000084EA }, /* GL_COMPRESSED_LUMINANCE_ARB */
+   {  4827, 0x000084ED }, /* GL_COMPRESSED_RGB */
+   {  4845, 0x000084EE }, /* GL_COMPRESSED_RGBA */
+   {  4864, 0x000084EE }, /* GL_COMPRESSED_RGBA_ARB */
+   {  4887, 0x000086B1 }, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
+   {  4916, 0x000083F1 }, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
+   {  4949, 0x000083F2 }, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
+   {  4982, 0x000083F3 }, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */
+   {  5015, 0x000084ED }, /* GL_COMPRESSED_RGB_ARB */
+   {  5037, 0x000086B0 }, /* GL_COMPRESSED_RGB_FXT1_3DFX */
+   {  5065, 0x000083F0 }, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
+   {  5097, 0x000086A3 }, /* GL_COMPRESSED_TEXTURE_FORMATS */
+   {  5127, 0x00008576 }, /* GL_CONSTANT */
+   {  5139, 0x00008003 }, /* GL_CONSTANT_ALPHA */
+   {  5157, 0x00008003 }, /* GL_CONSTANT_ALPHA_EXT */
+   {  5179, 0x00008576 }, /* GL_CONSTANT_ARB */
+   {  5195, 0x00001207 }, /* GL_CONSTANT_ATTENUATION */
+   {  5219, 0x00008151 }, /* GL_CONSTANT_BORDER_HP */
+   {  5241, 0x00008001 }, /* GL_CONSTANT_COLOR */
+   {  5259, 0x00008001 }, /* GL_CONSTANT_COLOR_EXT */
+   {  5281, 0x00008576 }, /* GL_CONSTANT_EXT */
+   {  5297, 0x00008010 }, /* GL_CONVOLUTION_1D */
+   {  5315, 0x00008011 }, /* GL_CONVOLUTION_2D */
+   {  5333, 0x00008154 }, /* GL_CONVOLUTION_BORDER_COLOR */
+   {  5361, 0x00008154 }, /* GL_CONVOLUTION_BORDER_COLOR_HP */
+   {  5392, 0x00008013 }, /* GL_CONVOLUTION_BORDER_MODE */
+   {  5419, 0x00008013 }, /* GL_CONVOLUTION_BORDER_MODE_EXT */
+   {  5450, 0x00008015 }, /* GL_CONVOLUTION_FILTER_BIAS */
+   {  5477, 0x00008015 }, /* GL_CONVOLUTION_FILTER_BIAS_EXT */
+   {  5508, 0x00008014 }, /* GL_CONVOLUTION_FILTER_SCALE */
+   {  5536, 0x00008014 }, /* GL_CONVOLUTION_FILTER_SCALE_EXT */
+   {  5568, 0x00008017 }, /* GL_CONVOLUTION_FORMAT */
+   {  5590, 0x00008017 }, /* GL_CONVOLUTION_FORMAT_EXT */
+   {  5616, 0x00008019 }, /* GL_CONVOLUTION_HEIGHT */
+   {  5638, 0x00008019 }, /* GL_CONVOLUTION_HEIGHT_EXT */
+   {  5664, 0x00008018 }, /* GL_CONVOLUTION_WIDTH */
+   {  5685, 0x00008018 }, /* GL_CONVOLUTION_WIDTH_EXT */
+   {  5710, 0x00008862 }, /* GL_COORD_REPLACE */
+   {  5727, 0x00008862 }, /* GL_COORD_REPLACE_ARB */
+   {  5748, 0x00008862 }, /* GL_COORD_REPLACE_NV */
+   {  5768, 0x00001503 }, /* GL_COPY */
+   {  5776, 0x0000150C }, /* GL_COPY_INVERTED */
+   {  5793, 0x00000706 }, /* GL_COPY_PIXEL_TOKEN */
+   {  5813, 0x00000B44 }, /* GL_CULL_FACE */
+   {  5826, 0x00000B45 }, /* GL_CULL_FACE_MODE */
+   {  5844, 0x000081AA }, /* GL_CULL_VERTEX_EXT */
+   {  5863, 0x000081AC }, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
+   {  5895, 0x000081AB }, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
+   {  5930, 0x00008626 }, /* GL_CURRENT_ATTRIB_NV */
+   {  5951, 0x00000001 }, /* GL_CURRENT_BIT */
+   {  5966, 0x00000B00 }, /* GL_CURRENT_COLOR */
+   {  5983, 0x00008453 }, /* GL_CURRENT_FOG_COORD */
+   {  6004, 0x00008453 }, /* GL_CURRENT_FOG_COORDINATE */
+   {  6030, 0x00000B01 }, /* GL_CURRENT_INDEX */
+   {  6047, 0x00008641 }, /* GL_CURRENT_MATRIX_ARB */
+   {  6069, 0x00008845 }, /* GL_CURRENT_MATRIX_INDEX_ARB */
+   {  6097, 0x00008641 }, /* GL_CURRENT_MATRIX_NV */
+   {  6118, 0x00008640 }, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
+   {  6152, 0x00008640 }, /* GL_CURRENT_MATRIX_STACK_DEPTH_NV */
+   {  6185, 0x00000B02 }, /* GL_CURRENT_NORMAL */
+   {  6203, 0x00008843 }, /* GL_CURRENT_PALETTE_MATRIX_ARB */
+   {  6233, 0x00008B8D }, /* GL_CURRENT_PROGRAM */
+   {  6252, 0x00008865 }, /* GL_CURRENT_QUERY */
+   {  6269, 0x00008865 }, /* GL_CURRENT_QUERY_ARB */
+   {  6290, 0x00000B04 }, /* GL_CURRENT_RASTER_COLOR */
+   {  6314, 0x00000B09 }, /* GL_CURRENT_RASTER_DISTANCE */
+   {  6341, 0x00000B05 }, /* GL_CURRENT_RASTER_INDEX */
+   {  6365, 0x00000B07 }, /* GL_CURRENT_RASTER_POSITION */
+   {  6392, 0x00000B08 }, /* GL_CURRENT_RASTER_POSITION_VALID */
+   {  6425, 0x00000B06 }, /* GL_CURRENT_RASTER_TEXTURE_COORDS */
+   {  6458, 0x00008459 }, /* GL_CURRENT_SECONDARY_COLOR */
+   {  6485, 0x00000B03 }, /* GL_CURRENT_TEXTURE_COORDS */
+   {  6511, 0x00008626 }, /* GL_CURRENT_VERTEX_ATTRIB */
+   {  6536, 0x00008626 }, /* GL_CURRENT_VERTEX_ATTRIB_ARB */
+   {  6565, 0x000086A8 }, /* GL_CURRENT_WEIGHT_ARB */
+   {  6587, 0x00000900 }, /* GL_CW */
+   {  6593, 0x0000875B }, /* GL_DEBUG_ASSERT_MESA */
+   {  6614, 0x00008759 }, /* GL_DEBUG_OBJECT_MESA */
+   {  6635, 0x0000875A }, /* GL_DEBUG_PRINT_MESA */
+   {  6655, 0x00002101 }, /* GL_DECAL */
+   {  6664, 0x00001E03 }, /* GL_DECR */
+   {  6672, 0x00008508 }, /* GL_DECR_WRAP */
+   {  6685, 0x00008508 }, /* GL_DECR_WRAP_EXT */
+   {  6702, 0x00008B80 }, /* GL_DELETE_STATUS */
+   {  6719, 0x00001801 }, /* GL_DEPTH */
+   {  6728, 0x000088F0 }, /* GL_DEPTH24_STENCIL8 */
+   {  6748, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT */
+   {  6768, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT_EXT */
+   {  6792, 0x00000D1F }, /* GL_DEPTH_BIAS */
+   {  6806, 0x00000D56 }, /* GL_DEPTH_BITS */
+   {  6820, 0x00008891 }, /* GL_DEPTH_BOUNDS_EXT */
+   {  6840, 0x00008890 }, /* GL_DEPTH_BOUNDS_TEST_EXT */
+   {  6865, 0x00000100 }, /* GL_DEPTH_BUFFER_BIT */
+   {  6885, 0x0000864F }, /* GL_DEPTH_CLAMP_NV */
+   {  6903, 0x00000B73 }, /* GL_DEPTH_CLEAR_VALUE */
+   {  6924, 0x00001902 }, /* GL_DEPTH_COMPONENT */
+   {  6943, 0x000081A5 }, /* GL_DEPTH_COMPONENT16 */
+   {  6964, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_ARB */
+   {  6989, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_SGIX */
+   {  7015, 0x000081A6 }, /* GL_DEPTH_COMPONENT24 */
+   {  7036, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_ARB */
+   {  7061, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_SGIX */
+   {  7087, 0x000081A7 }, /* GL_DEPTH_COMPONENT32 */
+   {  7108, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_ARB */
+   {  7133, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_SGIX */
+   {  7159, 0x00000B74 }, /* GL_DEPTH_FUNC */
+   {  7173, 0x00000B70 }, /* GL_DEPTH_RANGE */
+   {  7188, 0x00000D1E }, /* GL_DEPTH_SCALE */
+   {  7203, 0x000084F9 }, /* GL_DEPTH_STENCIL */
+   {  7220, 0x0000821A }, /* GL_DEPTH_STENCIL_ATTACHMENT */
+   {  7248, 0x000084F9 }, /* GL_DEPTH_STENCIL_NV */
+   {  7268, 0x0000886F }, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
+   {  7296, 0x0000886E }, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
+   {  7324, 0x00000B71 }, /* GL_DEPTH_TEST */
+   {  7338, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE */
+   {  7360, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE_ARB */
+   {  7386, 0x00000B72 }, /* GL_DEPTH_WRITEMASK */
+   {  7405, 0x00001201 }, /* GL_DIFFUSE */
+   {  7416, 0x00000BD0 }, /* GL_DITHER */
+   {  7426, 0x00000A02 }, /* GL_DOMAIN */
+   {  7436, 0x00001100 }, /* GL_DONT_CARE */
+   {  7449, 0x000086AE }, /* GL_DOT3_RGB */
+   {  7461, 0x000086AF }, /* GL_DOT3_RGBA */
+   {  7474, 0x000086AF }, /* GL_DOT3_RGBA_ARB */
+   {  7491, 0x00008741 }, /* GL_DOT3_RGBA_EXT */
+   {  7508, 0x000086AE }, /* GL_DOT3_RGB_ARB */
+   {  7524, 0x00008740 }, /* GL_DOT3_RGB_EXT */
+   {  7540, 0x0000140A }, /* GL_DOUBLE */
+   {  7550, 0x00000C32 }, /* GL_DOUBLEBUFFER */
+   {  7566, 0x00000C01 }, /* GL_DRAW_BUFFER */
+   {  7581, 0x00008825 }, /* GL_DRAW_BUFFER0 */
+   {  7597, 0x00008825 }, /* GL_DRAW_BUFFER0_ARB */
+   {  7617, 0x00008825 }, /* GL_DRAW_BUFFER0_ATI */
+   {  7637, 0x00008826 }, /* GL_DRAW_BUFFER1 */
+   {  7653, 0x0000882F }, /* GL_DRAW_BUFFER10 */
+   {  7670, 0x0000882F }, /* GL_DRAW_BUFFER10_ARB */
+   {  7691, 0x0000882F }, /* GL_DRAW_BUFFER10_ATI */
+   {  7712, 0x00008830 }, /* GL_DRAW_BUFFER11 */
+   {  7729, 0x00008830 }, /* GL_DRAW_BUFFER11_ARB */
+   {  7750, 0x00008830 }, /* GL_DRAW_BUFFER11_ATI */
+   {  7771, 0x00008831 }, /* GL_DRAW_BUFFER12 */
+   {  7788, 0x00008831 }, /* GL_DRAW_BUFFER12_ARB */
+   {  7809, 0x00008831 }, /* GL_DRAW_BUFFER12_ATI */
+   {  7830, 0x00008832 }, /* GL_DRAW_BUFFER13 */
+   {  7847, 0x00008832 }, /* GL_DRAW_BUFFER13_ARB */
+   {  7868, 0x00008832 }, /* GL_DRAW_BUFFER13_ATI */
+   {  7889, 0x00008833 }, /* GL_DRAW_BUFFER14 */
+   {  7906, 0x00008833 }, /* GL_DRAW_BUFFER14_ARB */
+   {  7927, 0x00008833 }, /* GL_DRAW_BUFFER14_ATI */
+   {  7948, 0x00008834 }, /* GL_DRAW_BUFFER15 */
+   {  7965, 0x00008834 }, /* GL_DRAW_BUFFER15_ARB */
+   {  7986, 0x00008834 }, /* GL_DRAW_BUFFER15_ATI */
+   {  8007, 0x00008826 }, /* GL_DRAW_BUFFER1_ARB */
+   {  8027, 0x00008826 }, /* GL_DRAW_BUFFER1_ATI */
+   {  8047, 0x00008827 }, /* GL_DRAW_BUFFER2 */
+   {  8063, 0x00008827 }, /* GL_DRAW_BUFFER2_ARB */
+   {  8083, 0x00008827 }, /* GL_DRAW_BUFFER2_ATI */
+   {  8103, 0x00008828 }, /* GL_DRAW_BUFFER3 */
+   {  8119, 0x00008828 }, /* GL_DRAW_BUFFER3_ARB */
+   {  8139, 0x00008828 }, /* GL_DRAW_BUFFER3_ATI */
+   {  8159, 0x00008829 }, /* GL_DRAW_BUFFER4 */
+   {  8175, 0x00008829 }, /* GL_DRAW_BUFFER4_ARB */
+   {  8195, 0x00008829 }, /* GL_DRAW_BUFFER4_ATI */
+   {  8215, 0x0000882A }, /* GL_DRAW_BUFFER5 */
+   {  8231, 0x0000882A }, /* GL_DRAW_BUFFER5_ARB */
+   {  8251, 0x0000882A }, /* GL_DRAW_BUFFER5_ATI */
+   {  8271, 0x0000882B }, /* GL_DRAW_BUFFER6 */
+   {  8287, 0x0000882B }, /* GL_DRAW_BUFFER6_ARB */
+   {  8307, 0x0000882B }, /* GL_DRAW_BUFFER6_ATI */
+   {  8327, 0x0000882C }, /* GL_DRAW_BUFFER7 */
+   {  8343, 0x0000882C }, /* GL_DRAW_BUFFER7_ARB */
+   {  8363, 0x0000882C }, /* GL_DRAW_BUFFER7_ATI */
+   {  8383, 0x0000882D }, /* GL_DRAW_BUFFER8 */
+   {  8399, 0x0000882D }, /* GL_DRAW_BUFFER8_ARB */
+   {  8419, 0x0000882D }, /* GL_DRAW_BUFFER8_ATI */
+   {  8439, 0x0000882E }, /* GL_DRAW_BUFFER9 */
+   {  8455, 0x0000882E }, /* GL_DRAW_BUFFER9_ARB */
+   {  8475, 0x0000882E }, /* GL_DRAW_BUFFER9_ATI */
+   {  8495, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER */
+   {  8515, 0x00008CA6 }, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
+   {  8547, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER_EXT */
+   {  8571, 0x00000705 }, /* GL_DRAW_PIXEL_TOKEN */
+   {  8591, 0x00000304 }, /* GL_DST_ALPHA */
+   {  8604, 0x00000306 }, /* GL_DST_COLOR */
+   {  8617, 0x000088EA }, /* GL_DYNAMIC_COPY */
+   {  8633, 0x000088EA }, /* GL_DYNAMIC_COPY_ARB */
+   {  8653, 0x000088E8 }, /* GL_DYNAMIC_DRAW */
+   {  8669, 0x000088E8 }, /* GL_DYNAMIC_DRAW_ARB */
+   {  8689, 0x000088E9 }, /* GL_DYNAMIC_READ */
+   {  8705, 0x000088E9 }, /* GL_DYNAMIC_READ_ARB */
+   {  8725, 0x00000B43 }, /* GL_EDGE_FLAG */
+   {  8738, 0x00008079 }, /* GL_EDGE_FLAG_ARRAY */
+   {  8757, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
+   {  8791, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB */
+   {  8829, 0x00008093 }, /* GL_EDGE_FLAG_ARRAY_POINTER */
+   {  8856, 0x0000808C }, /* GL_EDGE_FLAG_ARRAY_STRIDE */
+   {  8882, 0x00008893 }, /* GL_ELEMENT_ARRAY_BUFFER */
+   {  8906, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
+   {  8938, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB */
+   {  8974, 0x00001600 }, /* GL_EMISSION */
+   {  8986, 0x00002000 }, /* GL_ENABLE_BIT */
+   {  9000, 0x00000202 }, /* GL_EQUAL */
+   {  9009, 0x00001509 }, /* GL_EQUIV */
+   {  9018, 0x00010000 }, /* GL_EVAL_BIT */
+   {  9030, 0x00000800 }, /* GL_EXP */
+   {  9037, 0x00000801 }, /* GL_EXP2 */
+   {  9045, 0x00001F03 }, /* GL_EXTENSIONS */
+   {  9059, 0x00002400 }, /* GL_EYE_LINEAR */
+   {  9073, 0x00002502 }, /* GL_EYE_PLANE */
+   {  9086, 0x0000855C }, /* GL_EYE_PLANE_ABSOLUTE_NV */
+   {  9111, 0x0000855B }, /* GL_EYE_RADIAL_NV */
+   {  9128, 0x00000000 }, /* GL_FALSE */
+   {  9137, 0x00001101 }, /* GL_FASTEST */
+   {  9148, 0x00001C01 }, /* GL_FEEDBACK */
+   {  9160, 0x00000DF0 }, /* GL_FEEDBACK_BUFFER_POINTER */
+   {  9187, 0x00000DF1 }, /* GL_FEEDBACK_BUFFER_SIZE */
+   {  9211, 0x00000DF2 }, /* GL_FEEDBACK_BUFFER_TYPE */
+   {  9235, 0x00001B02 }, /* GL_FILL */
+   {  9243, 0x00001D00 }, /* GL_FLAT */
+   {  9251, 0x00001406 }, /* GL_FLOAT */
+   {  9260, 0x00008B5A }, /* GL_FLOAT_MAT2 */
+   {  9274, 0x00008B5A }, /* GL_FLOAT_MAT2_ARB */
+   {  9292, 0x00008B5B }, /* GL_FLOAT_MAT3 */
+   {  9306, 0x00008B5B }, /* GL_FLOAT_MAT3_ARB */
+   {  9324, 0x00008B5C }, /* GL_FLOAT_MAT4 */
+   {  9338, 0x00008B5C }, /* GL_FLOAT_MAT4_ARB */
+   {  9356, 0x00008B50 }, /* GL_FLOAT_VEC2 */
+   {  9370, 0x00008B50 }, /* GL_FLOAT_VEC2_ARB */
+   {  9388, 0x00008B51 }, /* GL_FLOAT_VEC3 */
+   {  9402, 0x00008B51 }, /* GL_FLOAT_VEC3_ARB */
+   {  9420, 0x00008B52 }, /* GL_FLOAT_VEC4 */
+   {  9434, 0x00008B52 }, /* GL_FLOAT_VEC4_ARB */
+   {  9452, 0x00000B60 }, /* GL_FOG */
+   {  9459, 0x00000080 }, /* GL_FOG_BIT */
+   {  9470, 0x00000B66 }, /* GL_FOG_COLOR */
+   {  9483, 0x00008451 }, /* GL_FOG_COORD */
+   {  9496, 0x00008451 }, /* GL_FOG_COORDINATE */
+   {  9514, 0x00008457 }, /* GL_FOG_COORDINATE_ARRAY */
+   {  9538, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
+   {  9577, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB */
+   {  9620, 0x00008456 }, /* GL_FOG_COORDINATE_ARRAY_POINTER */
+   {  9652, 0x00008455 }, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
+   {  9683, 0x00008454 }, /* GL_FOG_COORDINATE_ARRAY_TYPE */
+   {  9712, 0x00008450 }, /* GL_FOG_COORDINATE_SOURCE */
+   {  9737, 0x00008457 }, /* GL_FOG_COORD_ARRAY */
+   {  9756, 0x0000889D }, /* GL_FOG_COORD_ARRAY_BUFFER_BINDING */
+   {  9790, 0x00008456 }, /* GL_FOG_COORD_ARRAY_POINTER */
+   {  9817, 0x00008455 }, /* GL_FOG_COORD_ARRAY_STRIDE */
+   {  9843, 0x00008454 }, /* GL_FOG_COORD_ARRAY_TYPE */
+   {  9867, 0x00008450 }, /* GL_FOG_COORD_SRC */
+   {  9884, 0x00000B62 }, /* GL_FOG_DENSITY */
+   {  9899, 0x0000855A }, /* GL_FOG_DISTANCE_MODE_NV */
+   {  9923, 0x00000B64 }, /* GL_FOG_END */
+   {  9934, 0x00000C54 }, /* GL_FOG_HINT */
+   {  9946, 0x00000B61 }, /* GL_FOG_INDEX */
+   {  9959, 0x00000B65 }, /* GL_FOG_MODE */
+   {  9971, 0x00008198 }, /* GL_FOG_OFFSET_SGIX */
+   {  9990, 0x00008199 }, /* GL_FOG_OFFSET_VALUE_SGIX */
+   { 10015, 0x00000B63 }, /* GL_FOG_START */
+   { 10028, 0x00008452 }, /* GL_FRAGMENT_DEPTH */
+   { 10046, 0x00008804 }, /* GL_FRAGMENT_PROGRAM_ARB */
+   { 10070, 0x00008B30 }, /* GL_FRAGMENT_SHADER */
+   { 10089, 0x00008B30 }, /* GL_FRAGMENT_SHADER_ARB */
+   { 10112, 0x00008B8B }, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
+   { 10147, 0x00008D40 }, /* GL_FRAMEBUFFER */
+   { 10162, 0x00008215 }, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
+   { 10199, 0x00008214 }, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
+   { 10235, 0x00008210 }, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
+   { 10276, 0x00008211 }, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
+   { 10317, 0x00008216 }, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
+   { 10354, 0x00008213 }, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
+   { 10391, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
+   { 10429, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT */
+   { 10471, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
+   { 10509, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT */
+   { 10551, 0x00008212 }, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
+   { 10586, 0x00008217 }, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
+   { 10625, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT */
+   { 10674, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
+   { 10722, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT */
+   { 10774, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+   { 10814, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
+   { 10858, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
+   { 10898, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT */
+   { 10942, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING_EXT */
+   { 10969, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE */
+   { 10993, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE_EXT */
+   { 11021, 0x00008218 }, /* GL_FRAMEBUFFER_DEFAULT */
+   { 11044, 0x00008D40 }, /* GL_FRAMEBUFFER_EXT */
+   { 11063, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
+   { 11100, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT */
+   { 11141, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
+   { 11182, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
+   { 11224, 0x00008CD8 }, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
+   { 11275, 0x00008CDA }, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
+   { 11313, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
+   { 11358, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT */
+   { 11407, 0x00008D56 }, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
+   { 11445, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
+   { 11487, 0x00008CDE }, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
+   { 11519, 0x00008219 }, /* GL_FRAMEBUFFER_UNDEFINED */
+   { 11544, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED */
+   { 11571, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED_EXT */
+   { 11602, 0x00000404 }, /* GL_FRONT */
+   { 11611, 0x00000408 }, /* GL_FRONT_AND_BACK */
+   { 11629, 0x00000B46 }, /* GL_FRONT_FACE */
+   { 11643, 0x00000400 }, /* GL_FRONT_LEFT */
+   { 11657, 0x00000401 }, /* GL_FRONT_RIGHT */
+   { 11672, 0x00008006 }, /* GL_FUNC_ADD */
+   { 11684, 0x00008006 }, /* GL_FUNC_ADD_EXT */
+   { 11700, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT */
+   { 11725, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT_EXT */
+   { 11754, 0x0000800A }, /* GL_FUNC_SUBTRACT */
+   { 11771, 0x0000800A }, /* GL_FUNC_SUBTRACT_EXT */
+   { 11792, 0x00008191 }, /* GL_GENERATE_MIPMAP */
+   { 11811, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT */
+   { 11835, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT_SGIS */
+   { 11864, 0x00008191 }, /* GL_GENERATE_MIPMAP_SGIS */
+   { 11888, 0x00000206 }, /* GL_GEQUAL */
+   { 11898, 0x00008009 }, /* GL_GL_BLEND_EQUATION_RGB */
+   { 11923, 0x00008C4A }, /* GL_GL_COMPRESSED_SLUMINANCE */
+   { 11951, 0x00008C4B }, /* GL_GL_COMPRESSED_SLUMINANCE_ALPHA */
+   { 11985, 0x00008C48 }, /* GL_GL_COMPRESSED_SRGB */
+   { 12007, 0x00008C49 }, /* GL_GL_COMPRESSED_SRGB_ALPHA */
+   { 12035, 0x0000845F }, /* GL_GL_CURRENT_RASTER_SECONDARY_COLOR */
+   { 12072, 0x00008B65 }, /* GL_GL_FLOAT_MAT2x3 */
+   { 12091, 0x00008B66 }, /* GL_GL_FLOAT_MAT2x4 */
+   { 12110, 0x00008B67 }, /* GL_GL_FLOAT_MAT3x2 */
+   { 12129, 0x00008B68 }, /* GL_GL_FLOAT_MAT3x4 */
+   { 12148, 0x00008B69 }, /* GL_GL_FLOAT_MAT4x2 */
+   { 12167, 0x00008B6A }, /* GL_GL_FLOAT_MAT4x3 */
+   { 12186, 0x000088EB }, /* GL_GL_PIXEL_PACK_BUFFER */
+   { 12210, 0x000088ED }, /* GL_GL_PIXEL_PACK_BUFFER_BINDING */
+   { 12242, 0x000088EC }, /* GL_GL_PIXEL_UNPACK_BUFFER */
+   { 12268, 0x000088EF }, /* GL_GL_PIXEL_UNPACK_BUFFER_BINDING */
+   { 12302, 0x00008C46 }, /* GL_GL_SLUMINANCE */
+   { 12319, 0x00008C47 }, /* GL_GL_SLUMINANCE8 */
+   { 12337, 0x00008C45 }, /* GL_GL_SLUMINANCE8_ALPHA8 */
+   { 12362, 0x00008C44 }, /* GL_GL_SLUMINANCE_ALPHA */
+   { 12385, 0x00008C40 }, /* GL_GL_SRGB */
+   { 12396, 0x00008C41 }, /* GL_GL_SRGB8 */
+   { 12408, 0x00008C43 }, /* GL_GL_SRGB8_ALPHA8 */
+   { 12427, 0x00008C42 }, /* GL_GL_SRGB_ALPHA */
+   { 12444, 0x00000204 }, /* GL_GREATER */
+   { 12455, 0x00001904 }, /* GL_GREEN */
+   { 12464, 0x00000D19 }, /* GL_GREEN_BIAS */
+   { 12478, 0x00000D53 }, /* GL_GREEN_BITS */
+   { 12492, 0x00000D18 }, /* GL_GREEN_SCALE */
+   { 12507, 0x00008000 }, /* GL_HINT_BIT */
+   { 12519, 0x00008024 }, /* GL_HISTOGRAM */
+   { 12532, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE */
+   { 12556, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE_EXT */
+   { 12584, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE */
+   { 12607, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE_EXT */
+   { 12634, 0x00008024 }, /* GL_HISTOGRAM_EXT */
+   { 12651, 0x00008027 }, /* GL_HISTOGRAM_FORMAT */
+   { 12671, 0x00008027 }, /* GL_HISTOGRAM_FORMAT_EXT */
+   { 12695, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE */
+   { 12719, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE_EXT */
+   { 12747, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE */
+   { 12775, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE_EXT */
+   { 12807, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE */
+   { 12829, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE_EXT */
+   { 12855, 0x0000802D }, /* GL_HISTOGRAM_SINK */
+   { 12873, 0x0000802D }, /* GL_HISTOGRAM_SINK_EXT */
+   { 12895, 0x00008026 }, /* GL_HISTOGRAM_WIDTH */
+   { 12914, 0x00008026 }, /* GL_HISTOGRAM_WIDTH_EXT */
+   { 12937, 0x0000862A }, /* GL_IDENTITY_NV */
+   { 12952, 0x00008150 }, /* GL_IGNORE_BORDER_HP */
+   { 12972, 0x00008B9B }, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
+   { 13012, 0x00008B9A }, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
+   { 13050, 0x00001E02 }, /* GL_INCR */
+   { 13058, 0x00008507 }, /* GL_INCR_WRAP */
+   { 13071, 0x00008507 }, /* GL_INCR_WRAP_EXT */
+   { 13088, 0x00008222 }, /* GL_INDEX */
+   { 13097, 0x00008077 }, /* GL_INDEX_ARRAY */
+   { 13112, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING */
+   { 13142, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING_ARB */
+   { 13176, 0x00008091 }, /* GL_INDEX_ARRAY_POINTER */
+   { 13199, 0x00008086 }, /* GL_INDEX_ARRAY_STRIDE */
+   { 13221, 0x00008085 }, /* GL_INDEX_ARRAY_TYPE */
+   { 13241, 0x00000D51 }, /* GL_INDEX_BITS */
+   { 13255, 0x00000C20 }, /* GL_INDEX_CLEAR_VALUE */
+   { 13276, 0x00000BF1 }, /* GL_INDEX_LOGIC_OP */
+   { 13294, 0x00000C30 }, /* GL_INDEX_MODE */
+   { 13308, 0x00000D13 }, /* GL_INDEX_OFFSET */
+   { 13324, 0x00000D12 }, /* GL_INDEX_SHIFT */
+   { 13339, 0x00000C21 }, /* GL_INDEX_WRITEMASK */
+   { 13358, 0x00008B84 }, /* GL_INFO_LOG_LENGTH */
+   { 13377, 0x00001404 }, /* GL_INT */
+   { 13384, 0x00008049 }, /* GL_INTENSITY */
+   { 13397, 0x0000804C }, /* GL_INTENSITY12 */
+   { 13412, 0x0000804C }, /* GL_INTENSITY12_EXT */
+   { 13431, 0x0000804D }, /* GL_INTENSITY16 */
+   { 13446, 0x0000804D }, /* GL_INTENSITY16_EXT */
+   { 13465, 0x0000804A }, /* GL_INTENSITY4 */
+   { 13479, 0x0000804A }, /* GL_INTENSITY4_EXT */
+   { 13497, 0x0000804B }, /* GL_INTENSITY8 */
+   { 13511, 0x0000804B }, /* GL_INTENSITY8_EXT */
+   { 13529, 0x00008049 }, /* GL_INTENSITY_EXT */
+   { 13546, 0x00008575 }, /* GL_INTERPOLATE */
+   { 13561, 0x00008575 }, /* GL_INTERPOLATE_ARB */
+   { 13580, 0x00008575 }, /* GL_INTERPOLATE_EXT */
+   { 13599, 0x00008B53 }, /* GL_INT_VEC2 */
+   { 13611, 0x00008B53 }, /* GL_INT_VEC2_ARB */
+   { 13627, 0x00008B54 }, /* GL_INT_VEC3 */
+   { 13639, 0x00008B54 }, /* GL_INT_VEC3_ARB */
+   { 13655, 0x00008B55 }, /* GL_INT_VEC4 */
+   { 13667, 0x00008B55 }, /* GL_INT_VEC4_ARB */
+   { 13683, 0x00000500 }, /* GL_INVALID_ENUM */
+   { 13699, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION */
+   { 13732, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION_EXT */
+   { 13769, 0x00000502 }, /* GL_INVALID_OPERATION */
+   { 13790, 0x00000501 }, /* GL_INVALID_VALUE */
+   { 13807, 0x0000862B }, /* GL_INVERSE_NV */
+   { 13821, 0x0000862D }, /* GL_INVERSE_TRANSPOSE_NV */
+   { 13845, 0x0000150A }, /* GL_INVERT */
+   { 13855, 0x00001E00 }, /* GL_KEEP */
+   { 13863, 0x00000406 }, /* GL_LEFT */
+   { 13871, 0x00000203 }, /* GL_LEQUAL */
+   { 13881, 0x00000201 }, /* GL_LESS */
+   { 13889, 0x00004000 }, /* GL_LIGHT0 */
+   { 13899, 0x00004001 }, /* GL_LIGHT1 */
+   { 13909, 0x00004002 }, /* GL_LIGHT2 */
+   { 13919, 0x00004003 }, /* GL_LIGHT3 */
+   { 13929, 0x00004004 }, /* GL_LIGHT4 */
+   { 13939, 0x00004005 }, /* GL_LIGHT5 */
+   { 13949, 0x00004006 }, /* GL_LIGHT6 */
+   { 13959, 0x00004007 }, /* GL_LIGHT7 */
+   { 13969, 0x00000B50 }, /* GL_LIGHTING */
+   { 13981, 0x00000040 }, /* GL_LIGHTING_BIT */
+   { 13997, 0x00000B53 }, /* GL_LIGHT_MODEL_AMBIENT */
+   { 14020, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL */
+   { 14049, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL_EXT */
+   { 14082, 0x00000B51 }, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
+   { 14110, 0x00000B52 }, /* GL_LIGHT_MODEL_TWO_SIDE */
+   { 14134, 0x00001B01 }, /* GL_LINE */
+   { 14142, 0x00002601 }, /* GL_LINEAR */
+   { 14152, 0x00001208 }, /* GL_LINEAR_ATTENUATION */
+   { 14174, 0x00008170 }, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
+   { 14204, 0x0000844F }, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
+   { 14235, 0x00002703 }, /* GL_LINEAR_MIPMAP_LINEAR */
+   { 14259, 0x00002701 }, /* GL_LINEAR_MIPMAP_NEAREST */
+   { 14284, 0x00000001 }, /* GL_LINES */
+   { 14293, 0x00000004 }, /* GL_LINE_BIT */
+   { 14305, 0x00000002 }, /* GL_LINE_LOOP */
+   { 14318, 0x00000707 }, /* GL_LINE_RESET_TOKEN */
+   { 14338, 0x00000B20 }, /* GL_LINE_SMOOTH */
+   { 14353, 0x00000C52 }, /* GL_LINE_SMOOTH_HINT */
+   { 14373, 0x00000B24 }, /* GL_LINE_STIPPLE */
+   { 14389, 0x00000B25 }, /* GL_LINE_STIPPLE_PATTERN */
+   { 14413, 0x00000B26 }, /* GL_LINE_STIPPLE_REPEAT */
+   { 14436, 0x00000003 }, /* GL_LINE_STRIP */
+   { 14450, 0x00000702 }, /* GL_LINE_TOKEN */
+   { 14464, 0x00000B21 }, /* GL_LINE_WIDTH */
+   { 14478, 0x00000B23 }, /* GL_LINE_WIDTH_GRANULARITY */
+   { 14504, 0x00000B22 }, /* GL_LINE_WIDTH_RANGE */
+   { 14524, 0x00008B82 }, /* GL_LINK_STATUS */
+   { 14539, 0x00000B32 }, /* GL_LIST_BASE */
+   { 14552, 0x00020000 }, /* GL_LIST_BIT */
+   { 14564, 0x00000B33 }, /* GL_LIST_INDEX */
+   { 14578, 0x00000B30 }, /* GL_LIST_MODE */
+   { 14591, 0x00000101 }, /* GL_LOAD */
+   { 14599, 0x00000BF1 }, /* GL_LOGIC_OP */
+   { 14611, 0x00000BF0 }, /* GL_LOGIC_OP_MODE */
+   { 14628, 0x00008CA1 }, /* GL_LOWER_LEFT */
+   { 14642, 0x00001909 }, /* GL_LUMINANCE */
+   { 14655, 0x00008041 }, /* GL_LUMINANCE12 */
+   { 14670, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12 */
+   { 14693, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12_EXT */
+   { 14720, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4 */
+   { 14742, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4_EXT */
+   { 14768, 0x00008041 }, /* GL_LUMINANCE12_EXT */
+   { 14787, 0x00008042 }, /* GL_LUMINANCE16 */
+   { 14802, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16 */
+   { 14825, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16_EXT */
+   { 14852, 0x00008042 }, /* GL_LUMINANCE16_EXT */
+   { 14871, 0x0000803F }, /* GL_LUMINANCE4 */
+   { 14885, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4 */
+   { 14906, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4_EXT */
+   { 14931, 0x0000803F }, /* GL_LUMINANCE4_EXT */
+   { 14949, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2 */
+   { 14970, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2_EXT */
+   { 14995, 0x00008040 }, /* GL_LUMINANCE8 */
+   { 15009, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8 */
+   { 15030, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8_EXT */
+   { 15055, 0x00008040 }, /* GL_LUMINANCE8_EXT */
+   { 15073, 0x0000190A }, /* GL_LUMINANCE_ALPHA */
+   { 15092, 0x00000D90 }, /* GL_MAP1_COLOR_4 */
+   { 15108, 0x00000DD0 }, /* GL_MAP1_GRID_DOMAIN */
+   { 15128, 0x00000DD1 }, /* GL_MAP1_GRID_SEGMENTS */
+   { 15150, 0x00000D91 }, /* GL_MAP1_INDEX */
+   { 15164, 0x00000D92 }, /* GL_MAP1_NORMAL */
+   { 15179, 0x00000D93 }, /* GL_MAP1_TEXTURE_COORD_1 */
+   { 15203, 0x00000D94 }, /* GL_MAP1_TEXTURE_COORD_2 */
+   { 15227, 0x00000D95 }, /* GL_MAP1_TEXTURE_COORD_3 */
+   { 15251, 0x00000D96 }, /* GL_MAP1_TEXTURE_COORD_4 */
+   { 15275, 0x00000D97 }, /* GL_MAP1_VERTEX_3 */
+   { 15292, 0x00000D98 }, /* GL_MAP1_VERTEX_4 */
+   { 15309, 0x00008660 }, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
+   { 15337, 0x0000866A }, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
+   { 15366, 0x0000866B }, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
+   { 15395, 0x0000866C }, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
+   { 15424, 0x0000866D }, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
+   { 15453, 0x0000866E }, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
+   { 15482, 0x0000866F }, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
+   { 15511, 0x00008661 }, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
+   { 15539, 0x00008662 }, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
+   { 15567, 0x00008663 }, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
+   { 15595, 0x00008664 }, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
+   { 15623, 0x00008665 }, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
+   { 15651, 0x00008666 }, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
+   { 15679, 0x00008667 }, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
+   { 15707, 0x00008668 }, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
+   { 15735, 0x00008669 }, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
+   { 15763, 0x00000DB0 }, /* GL_MAP2_COLOR_4 */
+   { 15779, 0x00000DD2 }, /* GL_MAP2_GRID_DOMAIN */
+   { 15799, 0x00000DD3 }, /* GL_MAP2_GRID_SEGMENTS */
+   { 15821, 0x00000DB1 }, /* GL_MAP2_INDEX */
+   { 15835, 0x00000DB2 }, /* GL_MAP2_NORMAL */
+   { 15850, 0x00000DB3 }, /* GL_MAP2_TEXTURE_COORD_1 */
+   { 15874, 0x00000DB4 }, /* GL_MAP2_TEXTURE_COORD_2 */
+   { 15898, 0x00000DB5 }, /* GL_MAP2_TEXTURE_COORD_3 */
+   { 15922, 0x00000DB6 }, /* GL_MAP2_TEXTURE_COORD_4 */
+   { 15946, 0x00000DB7 }, /* GL_MAP2_VERTEX_3 */
+   { 15963, 0x00000DB8 }, /* GL_MAP2_VERTEX_4 */
+   { 15980, 0x00008670 }, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
+   { 16008, 0x0000867A }, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
+   { 16037, 0x0000867B }, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
+   { 16066, 0x0000867C }, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
+   { 16095, 0x0000867D }, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
+   { 16124, 0x0000867E }, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
+   { 16153, 0x0000867F }, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
+   { 16182, 0x00008671 }, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
+   { 16210, 0x00008672 }, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
+   { 16238, 0x00008673 }, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
+   { 16266, 0x00008674 }, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
+   { 16294, 0x00008675 }, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
+   { 16322, 0x00008676 }, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
+   { 16350, 0x00008677 }, /* GL_MAP2_VERTEX_ATTRIB7_4_NV */
+   { 16378, 0x00008678 }, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
+   { 16406, 0x00008679 }, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
+   { 16434, 0x00000D10 }, /* GL_MAP_COLOR */
+   { 16447, 0x00000D11 }, /* GL_MAP_STENCIL */
+   { 16462, 0x000088C0 }, /* GL_MATRIX0_ARB */
+   { 16477, 0x00008630 }, /* GL_MATRIX0_NV */
+   { 16491, 0x000088CA }, /* GL_MATRIX10_ARB */
+   { 16507, 0x000088CB }, /* GL_MATRIX11_ARB */
+   { 16523, 0x000088CC }, /* GL_MATRIX12_ARB */
+   { 16539, 0x000088CD }, /* GL_MATRIX13_ARB */
+   { 16555, 0x000088CE }, /* GL_MATRIX14_ARB */
+   { 16571, 0x000088CF }, /* GL_MATRIX15_ARB */
+   { 16587, 0x000088D0 }, /* GL_MATRIX16_ARB */
+   { 16603, 0x000088D1 }, /* GL_MATRIX17_ARB */
+   { 16619, 0x000088D2 }, /* GL_MATRIX18_ARB */
+   { 16635, 0x000088D3 }, /* GL_MATRIX19_ARB */
+   { 16651, 0x000088C1 }, /* GL_MATRIX1_ARB */
+   { 16666, 0x00008631 }, /* GL_MATRIX1_NV */
+   { 16680, 0x000088D4 }, /* GL_MATRIX20_ARB */
+   { 16696, 0x000088D5 }, /* GL_MATRIX21_ARB */
+   { 16712, 0x000088D6 }, /* GL_MATRIX22_ARB */
+   { 16728, 0x000088D7 }, /* GL_MATRIX23_ARB */
+   { 16744, 0x000088D8 }, /* GL_MATRIX24_ARB */
+   { 16760, 0x000088D9 }, /* GL_MATRIX25_ARB */
+   { 16776, 0x000088DA }, /* GL_MATRIX26_ARB */
+   { 16792, 0x000088DB }, /* GL_MATRIX27_ARB */
+   { 16808, 0x000088DC }, /* GL_MATRIX28_ARB */
+   { 16824, 0x000088DD }, /* GL_MATRIX29_ARB */
+   { 16840, 0x000088C2 }, /* GL_MATRIX2_ARB */
+   { 16855, 0x00008632 }, /* GL_MATRIX2_NV */
+   { 16869, 0x000088DE }, /* GL_MATRIX30_ARB */
+   { 16885, 0x000088DF }, /* GL_MATRIX31_ARB */
+   { 16901, 0x000088C3 }, /* GL_MATRIX3_ARB */
+   { 16916, 0x00008633 }, /* GL_MATRIX3_NV */
+   { 16930, 0x000088C4 }, /* GL_MATRIX4_ARB */
+   { 16945, 0x00008634 }, /* GL_MATRIX4_NV */
+   { 16959, 0x000088C5 }, /* GL_MATRIX5_ARB */
+   { 16974, 0x00008635 }, /* GL_MATRIX5_NV */
+   { 16988, 0x000088C6 }, /* GL_MATRIX6_ARB */
+   { 17003, 0x00008636 }, /* GL_MATRIX6_NV */
+   { 17017, 0x000088C7 }, /* GL_MATRIX7_ARB */
+   { 17032, 0x00008637 }, /* GL_MATRIX7_NV */
+   { 17046, 0x000088C8 }, /* GL_MATRIX8_ARB */
+   { 17061, 0x000088C9 }, /* GL_MATRIX9_ARB */
+   { 17076, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_ARB */
+   { 17102, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
+   { 17136, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
+   { 17167, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
+   { 17200, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
+   { 17231, 0x00000BA0 }, /* GL_MATRIX_MODE */
+   { 17246, 0x00008840 }, /* GL_MATRIX_PALETTE_ARB */
+   { 17268, 0x00008008 }, /* GL_MAX */
+   { 17275, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE */
+   { 17298, 0x000088FF }, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
+   { 17330, 0x00000D35 }, /* GL_MAX_ATTRIB_STACK_DEPTH */
+   { 17356, 0x00000D3B }, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
+   { 17389, 0x00008177 }, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
+   { 17415, 0x00008178 }, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+   { 17449, 0x00000D32 }, /* GL_MAX_CLIP_PLANES */
+   { 17468, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
+   { 17497, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
+   { 17529, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI */
+   { 17565, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
+   { 17601, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB */
+   { 17641, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT */
+   { 17667, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT_EXT */
+   { 17697, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH */
+   { 17722, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH_EXT */
+   { 17751, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
+   { 17780, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB */
+   { 17813, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS */
+   { 17833, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ARB */
+   { 17857, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ATI */
+   { 17881, 0x000080E9 }, /* GL_MAX_ELEMENTS_INDICES */
+   { 17905, 0x000080E8 }, /* GL_MAX_ELEMENTS_VERTICES */
+   { 17930, 0x00000D30 }, /* GL_MAX_EVAL_ORDER */
+   { 17948, 0x00008008 }, /* GL_MAX_EXT */
+   { 17959, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
+   { 17994, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB */
+   { 18033, 0x00000D31 }, /* GL_MAX_LIGHTS */
+   { 18047, 0x00000B31 }, /* GL_MAX_LIST_NESTING */
+   { 18067, 0x00008841 }, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
+   { 18105, 0x00000D36 }, /* GL_MAX_MODELVIEW_STACK_DEPTH */
+   { 18134, 0x00000D37 }, /* GL_MAX_NAME_STACK_DEPTH */
+   { 18158, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_ARB */
+   { 18186, 0x00000D34 }, /* GL_MAX_PIXEL_MAP_TABLE */
+   { 18209, 0x000088B1 }, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
+   { 18246, 0x0000880B }, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
+   { 18282, 0x000088AD }, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
+   { 18309, 0x000088F5 }, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
+   { 18338, 0x000088B5 }, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
+   { 18372, 0x000088F4 }, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
+   { 18408, 0x000088F6 }, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
+   { 18435, 0x000088A1 }, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
+   { 18467, 0x000088B4 }, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
+   { 18503, 0x000088F8 }, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
+   { 18532, 0x000088F7 }, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
+   { 18561, 0x0000862F }, /* GL_MAX_PROGRAM_MATRICES_ARB */
+   { 18589, 0x0000862E }, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
+   { 18627, 0x000088B3 }, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+   { 18671, 0x0000880E }, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+   { 18714, 0x000088AF }, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
+   { 18748, 0x000088A3 }, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+   { 18787, 0x000088AB }, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
+   { 18824, 0x000088A7 }, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
+   { 18862, 0x00008810 }, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+   { 18905, 0x0000880F }, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+   { 18948, 0x000088A9 }, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
+   { 18978, 0x000088A5 }, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
+   { 19009, 0x0000880D }, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
+   { 19045, 0x0000880C }, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
+   { 19081, 0x00000D38 }, /* GL_MAX_PROJECTION_STACK_DEPTH */
+   { 19111, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
+   { 19145, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_NV */
+   { 19178, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
+   { 19207, 0x00008D57 }, /* GL_MAX_SAMPLES */
+   { 19222, 0x00008504 }, /* GL_MAX_SHININESS_NV */
+   { 19242, 0x00008505 }, /* GL_MAX_SPOT_EXPONENT_NV */
+   { 19266, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS */
+   { 19288, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS_ARB */
+   { 19314, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS */
+   { 19341, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS_ARB */
+   { 19372, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS */
+   { 19396, 0x000084FF }, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
+   { 19430, 0x00000D33 }, /* GL_MAX_TEXTURE_SIZE */
+   { 19450, 0x00000D39 }, /* GL_MAX_TEXTURE_STACK_DEPTH */
+   { 19477, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS */
+   { 19498, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS_ARB */
+   { 19523, 0x0000862F }, /* GL_MAX_TRACK_MATRICES_NV */
+   { 19548, 0x0000862E }, /* GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */
+   { 19583, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS */
+   { 19605, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS_ARB */
+   { 19631, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS */
+   { 19653, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS_ARB */
+   { 19679, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
+   { 19713, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
+   { 19751, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
+   { 19784, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB */
+   { 19821, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_ARB */
+   { 19845, 0x00000D3A }, /* GL_MAX_VIEWPORT_DIMS */
+   { 19866, 0x00008007 }, /* GL_MIN */
+   { 19873, 0x0000802E }, /* GL_MINMAX */
+   { 19883, 0x0000802E }, /* GL_MINMAX_EXT */
+   { 19897, 0x0000802F }, /* GL_MINMAX_FORMAT */
+   { 19914, 0x0000802F }, /* GL_MINMAX_FORMAT_EXT */
+   { 19935, 0x00008030 }, /* GL_MINMAX_SINK */
+   { 19950, 0x00008030 }, /* GL_MINMAX_SINK_EXT */
+   { 19969, 0x00008007 }, /* GL_MIN_EXT */
+   { 19980, 0x00008370 }, /* GL_MIRRORED_REPEAT */
+   { 19999, 0x00008370 }, /* GL_MIRRORED_REPEAT_ARB */
+   { 20022, 0x00008370 }, /* GL_MIRRORED_REPEAT_IBM */
+   { 20045, 0x00008742 }, /* GL_MIRROR_CLAMP_ATI */
+   { 20065, 0x00008742 }, /* GL_MIRROR_CLAMP_EXT */
+   { 20085, 0x00008912 }, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
+   { 20115, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_ATI */
+   { 20143, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
+   { 20171, 0x00001700 }, /* GL_MODELVIEW */
+   { 20184, 0x00001700 }, /* GL_MODELVIEW0_ARB */
+   { 20202, 0x0000872A }, /* GL_MODELVIEW10_ARB */
+   { 20221, 0x0000872B }, /* GL_MODELVIEW11_ARB */
+   { 20240, 0x0000872C }, /* GL_MODELVIEW12_ARB */
+   { 20259, 0x0000872D }, /* GL_MODELVIEW13_ARB */
+   { 20278, 0x0000872E }, /* GL_MODELVIEW14_ARB */
+   { 20297, 0x0000872F }, /* GL_MODELVIEW15_ARB */
+   { 20316, 0x00008730 }, /* GL_MODELVIEW16_ARB */
+   { 20335, 0x00008731 }, /* GL_MODELVIEW17_ARB */
+   { 20354, 0x00008732 }, /* GL_MODELVIEW18_ARB */
+   { 20373, 0x00008733 }, /* GL_MODELVIEW19_ARB */
+   { 20392, 0x0000850A }, /* GL_MODELVIEW1_ARB */
+   { 20410, 0x00008734 }, /* GL_MODELVIEW20_ARB */
+   { 20429, 0x00008735 }, /* GL_MODELVIEW21_ARB */
+   { 20448, 0x00008736 }, /* GL_MODELVIEW22_ARB */
+   { 20467, 0x00008737 }, /* GL_MODELVIEW23_ARB */
+   { 20486, 0x00008738 }, /* GL_MODELVIEW24_ARB */
+   { 20505, 0x00008739 }, /* GL_MODELVIEW25_ARB */
+   { 20524, 0x0000873A }, /* GL_MODELVIEW26_ARB */
+   { 20543, 0x0000873B }, /* GL_MODELVIEW27_ARB */
+   { 20562, 0x0000873C }, /* GL_MODELVIEW28_ARB */
+   { 20581, 0x0000873D }, /* GL_MODELVIEW29_ARB */
+   { 20600, 0x00008722 }, /* GL_MODELVIEW2_ARB */
+   { 20618, 0x0000873E }, /* GL_MODELVIEW30_ARB */
+   { 20637, 0x0000873F }, /* GL_MODELVIEW31_ARB */
+   { 20656, 0x00008723 }, /* GL_MODELVIEW3_ARB */
+   { 20674, 0x00008724 }, /* GL_MODELVIEW4_ARB */
+   { 20692, 0x00008725 }, /* GL_MODELVIEW5_ARB */
+   { 20710, 0x00008726 }, /* GL_MODELVIEW6_ARB */
+   { 20728, 0x00008727 }, /* GL_MODELVIEW7_ARB */
+   { 20746, 0x00008728 }, /* GL_MODELVIEW8_ARB */
+   { 20764, 0x00008729 }, /* GL_MODELVIEW9_ARB */
+   { 20782, 0x00000BA6 }, /* GL_MODELVIEW_MATRIX */
+   { 20802, 0x00008629 }, /* GL_MODELVIEW_PROJECTION_NV */
+   { 20829, 0x00000BA3 }, /* GL_MODELVIEW_STACK_DEPTH */
+   { 20854, 0x00002100 }, /* GL_MODULATE */
+   { 20866, 0x00008744 }, /* GL_MODULATE_ADD_ATI */
+   { 20886, 0x00008745 }, /* GL_MODULATE_SIGNED_ADD_ATI */
+   { 20913, 0x00008746 }, /* GL_MODULATE_SUBTRACT_ATI */
+   { 20938, 0x00000103 }, /* GL_MULT */
+   { 20946, 0x0000809D }, /* GL_MULTISAMPLE */
+   { 20961, 0x000086B2 }, /* GL_MULTISAMPLE_3DFX */
+   { 20981, 0x0000809D }, /* GL_MULTISAMPLE_ARB */
+   { 21000, 0x20000000 }, /* GL_MULTISAMPLE_BIT */
+   { 21019, 0x20000000 }, /* GL_MULTISAMPLE_BIT_3DFX */
+   { 21043, 0x20000000 }, /* GL_MULTISAMPLE_BIT_ARB */
+   { 21066, 0x00008534 }, /* GL_MULTISAMPLE_FILTER_HINT_NV */
+   { 21096, 0x00002A25 }, /* GL_N3F_V3F */
+   { 21107, 0x00000D70 }, /* GL_NAME_STACK_DEPTH */
+   { 21127, 0x0000150E }, /* GL_NAND */
+   { 21135, 0x00002600 }, /* GL_NEAREST */
+   { 21146, 0x0000844E }, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
+   { 21177, 0x0000844D }, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
+   { 21209, 0x00002702 }, /* GL_NEAREST_MIPMAP_LINEAR */
+   { 21234, 0x00002700 }, /* GL_NEAREST_MIPMAP_NEAREST */
+   { 21260, 0x00000200 }, /* GL_NEVER */
+   { 21269, 0x00001102 }, /* GL_NICEST */
+   { 21279, 0x00000000 }, /* GL_NONE */
+   { 21287, 0x00001505 }, /* GL_NOOP */
+   { 21295, 0x00001508 }, /* GL_NOR */
+   { 21302, 0x00000BA1 }, /* GL_NORMALIZE */
+   { 21315, 0x00008075 }, /* GL_NORMAL_ARRAY */
+   { 21331, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
+   { 21362, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING_ARB */
+   { 21397, 0x0000808F }, /* GL_NORMAL_ARRAY_POINTER */
+   { 21421, 0x0000807F }, /* GL_NORMAL_ARRAY_STRIDE */
+   { 21444, 0x0000807E }, /* GL_NORMAL_ARRAY_TYPE */
+   { 21465, 0x00008511 }, /* GL_NORMAL_MAP */
+   { 21479, 0x00008511 }, /* GL_NORMAL_MAP_ARB */
+   { 21497, 0x00008511 }, /* GL_NORMAL_MAP_NV */
+   { 21514, 0x00000205 }, /* GL_NOTEQUAL */
+   { 21526, 0x00000000 }, /* GL_NO_ERROR */
+   { 21538, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
+   { 21572, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB */
+   { 21610, 0x00008B89 }, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */
+   { 21642, 0x00008B8A }, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */
+   { 21684, 0x00008B86 }, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */
+   { 21714, 0x00008B87 }, /* GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB */
+   { 21754, 0x00008B85 }, /* GL_OBJECT_ATTACHED_OBJECTS_ARB */
+   { 21785, 0x00008B81 }, /* GL_OBJECT_COMPILE_STATUS_ARB */
+   { 21814, 0x00008B80 }, /* GL_OBJECT_DELETE_STATUS_ARB */
+   { 21842, 0x00008B84 }, /* GL_OBJECT_INFO_LOG_LENGTH_ARB */
+   { 21872, 0x00002401 }, /* GL_OBJECT_LINEAR */
+   { 21889, 0x00008B82 }, /* GL_OBJECT_LINK_STATUS_ARB */
+   { 21915, 0x00002501 }, /* GL_OBJECT_PLANE */
+   { 21931, 0x00008B88 }, /* GL_OBJECT_SHADER_SOURCE_LENGTH_ARB */
+   { 21966, 0x00008B4F }, /* GL_OBJECT_SUBTYPE_ARB */
+   { 21988, 0x00008B4E }, /* GL_OBJECT_TYPE_ARB */
+   { 22007, 0x00008B83 }, /* GL_OBJECT_VALIDATE_STATUS_ARB */
+   { 22037, 0x00008165 }, /* GL_OCCLUSION_TEST_HP */
+   { 22058, 0x00008166 }, /* GL_OCCLUSION_TEST_RESULT_HP */
+   { 22086, 0x00000001 }, /* GL_ONE */
+   { 22093, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA */
+   { 22121, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA_EXT */
+   { 22153, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR */
+   { 22181, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR_EXT */
+   { 22213, 0x00000305 }, /* GL_ONE_MINUS_DST_ALPHA */
+   { 22236, 0x00000307 }, /* GL_ONE_MINUS_DST_COLOR */
+   { 22259, 0x00000303 }, /* GL_ONE_MINUS_SRC_ALPHA */
+   { 22282, 0x00000301 }, /* GL_ONE_MINUS_SRC_COLOR */
+   { 22305, 0x00008598 }, /* GL_OPERAND0_ALPHA */
+   { 22323, 0x00008598 }, /* GL_OPERAND0_ALPHA_ARB */
+   { 22345, 0x00008598 }, /* GL_OPERAND0_ALPHA_EXT */
+   { 22367, 0x00008590 }, /* GL_OPERAND0_RGB */
+   { 22383, 0x00008590 }, /* GL_OPERAND0_RGB_ARB */
+   { 22403, 0x00008590 }, /* GL_OPERAND0_RGB_EXT */
+   { 22423, 0x00008599 }, /* GL_OPERAND1_ALPHA */
+   { 22441, 0x00008599 }, /* GL_OPERAND1_ALPHA_ARB */
+   { 22463, 0x00008599 }, /* GL_OPERAND1_ALPHA_EXT */
+   { 22485, 0x00008591 }, /* GL_OPERAND1_RGB */
+   { 22501, 0x00008591 }, /* GL_OPERAND1_RGB_ARB */
+   { 22521, 0x00008591 }, /* GL_OPERAND1_RGB_EXT */
+   { 22541, 0x0000859A }, /* GL_OPERAND2_ALPHA */
+   { 22559, 0x0000859A }, /* GL_OPERAND2_ALPHA_ARB */
+   { 22581, 0x0000859A }, /* GL_OPERAND2_ALPHA_EXT */
+   { 22603, 0x00008592 }, /* GL_OPERAND2_RGB */
+   { 22619, 0x00008592 }, /* GL_OPERAND2_RGB_ARB */
+   { 22639, 0x00008592 }, /* GL_OPERAND2_RGB_EXT */
+   { 22659, 0x0000859B }, /* GL_OPERAND3_ALPHA_NV */
+   { 22680, 0x00008593 }, /* GL_OPERAND3_RGB_NV */
+   { 22699, 0x00001507 }, /* GL_OR */
+   { 22705, 0x00000A01 }, /* GL_ORDER */
+   { 22714, 0x0000150D }, /* GL_OR_INVERTED */
+   { 22729, 0x0000150B }, /* GL_OR_REVERSE */
+   { 22743, 0x00000505 }, /* GL_OUT_OF_MEMORY */
+   { 22760, 0x00000D05 }, /* GL_PACK_ALIGNMENT */
+   { 22778, 0x0000806C }, /* GL_PACK_IMAGE_HEIGHT */
+   { 22799, 0x00008758 }, /* GL_PACK_INVERT_MESA */
+   { 22819, 0x00000D01 }, /* GL_PACK_LSB_FIRST */
+   { 22837, 0x00000D02 }, /* GL_PACK_ROW_LENGTH */
+   { 22856, 0x0000806B }, /* GL_PACK_SKIP_IMAGES */
+   { 22876, 0x00000D04 }, /* GL_PACK_SKIP_PIXELS */
+   { 22896, 0x00000D03 }, /* GL_PACK_SKIP_ROWS */
+   { 22914, 0x00000D00 }, /* GL_PACK_SWAP_BYTES */
+   { 22933, 0x00008B92 }, /* GL_PALETTE4_R5_G6_B5_OES */
+   { 22958, 0x00008B94 }, /* GL_PALETTE4_RGB5_A1_OES */
+   { 22982, 0x00008B90 }, /* GL_PALETTE4_RGB8_OES */
+   { 23003, 0x00008B93 }, /* GL_PALETTE4_RGBA4_OES */
+   { 23025, 0x00008B91 }, /* GL_PALETTE4_RGBA8_OES */
+   { 23047, 0x00008B97 }, /* GL_PALETTE8_R5_G6_B5_OES */
+   { 23072, 0x00008B99 }, /* GL_PALETTE8_RGB5_A1_OES */
+   { 23096, 0x00008B95 }, /* GL_PALETTE8_RGB8_OES */
+   { 23117, 0x00008B98 }, /* GL_PALETTE8_RGBA4_OES */
+   { 23139, 0x00008B96 }, /* GL_PALETTE8_RGBA8_OES */
+   { 23161, 0x00000700 }, /* GL_PASS_THROUGH_TOKEN */
+   { 23183, 0x00000C50 }, /* GL_PERSPECTIVE_CORRECTION_HINT */
+   { 23214, 0x00000C79 }, /* GL_PIXEL_MAP_A_TO_A */
+   { 23234, 0x00000CB9 }, /* GL_PIXEL_MAP_A_TO_A_SIZE */
+   { 23259, 0x00000C78 }, /* GL_PIXEL_MAP_B_TO_B */
+   { 23279, 0x00000CB8 }, /* GL_PIXEL_MAP_B_TO_B_SIZE */
+   { 23304, 0x00000C77 }, /* GL_PIXEL_MAP_G_TO_G */
+   { 23324, 0x00000CB7 }, /* GL_PIXEL_MAP_G_TO_G_SIZE */
+   { 23349, 0x00000C75 }, /* GL_PIXEL_MAP_I_TO_A */
+   { 23369, 0x00000CB5 }, /* GL_PIXEL_MAP_I_TO_A_SIZE */
+   { 23394, 0x00000C74 }, /* GL_PIXEL_MAP_I_TO_B */
+   { 23414, 0x00000CB4 }, /* GL_PIXEL_MAP_I_TO_B_SIZE */
+   { 23439, 0x00000C73 }, /* GL_PIXEL_MAP_I_TO_G */
+   { 23459, 0x00000CB3 }, /* GL_PIXEL_MAP_I_TO_G_SIZE */
+   { 23484, 0x00000C70 }, /* GL_PIXEL_MAP_I_TO_I */
+   { 23504, 0x00000CB0 }, /* GL_PIXEL_MAP_I_TO_I_SIZE */
+   { 23529, 0x00000C72 }, /* GL_PIXEL_MAP_I_TO_R */
+   { 23549, 0x00000CB2 }, /* GL_PIXEL_MAP_I_TO_R_SIZE */
+   { 23574, 0x00000C76 }, /* GL_PIXEL_MAP_R_TO_R */
+   { 23594, 0x00000CB6 }, /* GL_PIXEL_MAP_R_TO_R_SIZE */
+   { 23619, 0x00000C71 }, /* GL_PIXEL_MAP_S_TO_S */
+   { 23639, 0x00000CB1 }, /* GL_PIXEL_MAP_S_TO_S_SIZE */
+   { 23664, 0x00000020 }, /* GL_PIXEL_MODE_BIT */
+   { 23682, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING_EXT */
+   { 23715, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER_EXT */
+   { 23740, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING_EXT */
+   { 23775, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER_EXT */
+   { 23802, 0x00001B00 }, /* GL_POINT */
+   { 23811, 0x00000000 }, /* GL_POINTS */
+   { 23821, 0x00000002 }, /* GL_POINT_BIT */
+   { 23834, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION */
+   { 23864, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_ARB */
+   { 23898, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_EXT */
+   { 23932, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_SGIS */
+   { 23967, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE */
+   { 23996, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_ARB */
+   { 24029, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_EXT */
+   { 24062, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_SGIS */
+   { 24096, 0x00000B11 }, /* GL_POINT_SIZE */
+   { 24110, 0x00000B13 }, /* GL_POINT_SIZE_GRANULARITY */
+   { 24136, 0x00008127 }, /* GL_POINT_SIZE_MAX */
+   { 24154, 0x00008127 }, /* GL_POINT_SIZE_MAX_ARB */
+   { 24176, 0x00008127 }, /* GL_POINT_SIZE_MAX_EXT */
+   { 24198, 0x00008127 }, /* GL_POINT_SIZE_MAX_SGIS */
+   { 24221, 0x00008126 }, /* GL_POINT_SIZE_MIN */
+   { 24239, 0x00008126 }, /* GL_POINT_SIZE_MIN_ARB */
+   { 24261, 0x00008126 }, /* GL_POINT_SIZE_MIN_EXT */
+   { 24283, 0x00008126 }, /* GL_POINT_SIZE_MIN_SGIS */
+   { 24306, 0x00000B12 }, /* GL_POINT_SIZE_RANGE */
+   { 24326, 0x00000B10 }, /* GL_POINT_SMOOTH */
+   { 24342, 0x00000C51 }, /* GL_POINT_SMOOTH_HINT */
+   { 24363, 0x00008861 }, /* GL_POINT_SPRITE */
+   { 24379, 0x00008861 }, /* GL_POINT_SPRITE_ARB */
+   { 24399, 0x00008CA0 }, /* GL_POINT_SPRITE_COORD_ORIGIN */
+   { 24428, 0x00008861 }, /* GL_POINT_SPRITE_NV */
+   { 24447, 0x00008863 }, /* GL_POINT_SPRITE_R_MODE_NV */
+   { 24473, 0x00000701 }, /* GL_POINT_TOKEN */
+   { 24488, 0x00000009 }, /* GL_POLYGON */
+   { 24499, 0x00000008 }, /* GL_POLYGON_BIT */
+   { 24514, 0x00000B40 }, /* GL_POLYGON_MODE */
+   { 24530, 0x00008039 }, /* GL_POLYGON_OFFSET_BIAS */
+   { 24553, 0x00008038 }, /* GL_POLYGON_OFFSET_FACTOR */
+   { 24578, 0x00008037 }, /* GL_POLYGON_OFFSET_FILL */
+   { 24601, 0x00002A02 }, /* GL_POLYGON_OFFSET_LINE */
+   { 24624, 0x00002A01 }, /* GL_POLYGON_OFFSET_POINT */
+   { 24648, 0x00002A00 }, /* GL_POLYGON_OFFSET_UNITS */
+   { 24672, 0x00000B41 }, /* GL_POLYGON_SMOOTH */
+   { 24690, 0x00000C53 }, /* GL_POLYGON_SMOOTH_HINT */
+   { 24713, 0x00000B42 }, /* GL_POLYGON_STIPPLE */
+   { 24732, 0x00000010 }, /* GL_POLYGON_STIPPLE_BIT */
+   { 24755, 0x00000703 }, /* GL_POLYGON_TOKEN */
+   { 24772, 0x00001203 }, /* GL_POSITION */
+   { 24784, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
+   { 24816, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI */
+   { 24852, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
+   { 24885, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI */
+   { 24922, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
+   { 24953, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI */
+   { 24988, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
+   { 25020, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI */
+   { 25056, 0x000080D2 }, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
+   { 25089, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
+   { 25121, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI */
+   { 25157, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
+   { 25190, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI */
+   { 25227, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS */
+   { 25257, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS_SGI */
+   { 25291, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE */
+   { 25322, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE_SGI */
+   { 25357, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
+   { 25388, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS_EXT */
+   { 25423, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
+   { 25455, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE_EXT */
+   { 25491, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS */
+   { 25521, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS_EXT */
+   { 25555, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE */
+   { 25586, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE_EXT */
+   { 25621, 0x000080D1 }, /* GL_POST_CONVOLUTION_COLOR_TABLE */
+   { 25653, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS */
+   { 25684, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS_EXT */
+   { 25719, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE */
+   { 25751, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE_EXT */
+   { 25787, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS */
+   { 25816, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS_EXT */
+   { 25849, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE */
+   { 25879, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE_EXT */
+   { 25913, 0x0000817B }, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
+   { 25952, 0x00008179 }, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
+   { 25985, 0x0000817C }, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
+   { 26025, 0x0000817A }, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
+   { 26059, 0x00008578 }, /* GL_PREVIOUS */
+   { 26071, 0x00008578 }, /* GL_PREVIOUS_ARB */
+   { 26087, 0x00008578 }, /* GL_PREVIOUS_EXT */
+   { 26103, 0x00008577 }, /* GL_PRIMARY_COLOR */
+   { 26120, 0x00008577 }, /* GL_PRIMARY_COLOR_ARB */
+   { 26141, 0x00008577 }, /* GL_PRIMARY_COLOR_EXT */
+   { 26162, 0x000088B0 }, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
+   { 26195, 0x00008805 }, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
+   { 26227, 0x000088AC }, /* GL_PROGRAM_ATTRIBS_ARB */
+   { 26250, 0x00008677 }, /* GL_PROGRAM_BINDING_ARB */
+   { 26273, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_ARB */
+   { 26303, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_NV */
+   { 26332, 0x00008874 }, /* GL_PROGRAM_ERROR_STRING_ARB */
+   { 26360, 0x00008876 }, /* GL_PROGRAM_FORMAT_ARB */
+   { 26382, 0x00008875 }, /* GL_PROGRAM_FORMAT_ASCII_ARB */
+   { 26410, 0x000088A0 }, /* GL_PROGRAM_INSTRUCTIONS_ARB */
+   { 26438, 0x00008627 }, /* GL_PROGRAM_LENGTH_ARB */
+   { 26460, 0x00008627 }, /* GL_PROGRAM_LENGTH_NV */
+   { 26481, 0x000088B2 }, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+   { 26521, 0x00008808 }, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+   { 26560, 0x000088AE }, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
+   { 26590, 0x000088A2 }, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+   { 26625, 0x000088AA }, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
+   { 26658, 0x000088A6 }, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
+   { 26692, 0x0000880A }, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+   { 26731, 0x00008809 }, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+   { 26770, 0x00008B40 }, /* GL_PROGRAM_OBJECT_ARB */
+   { 26792, 0x000088A8 }, /* GL_PROGRAM_PARAMETERS_ARB */
+   { 26818, 0x00008644 }, /* GL_PROGRAM_PARAMETER_NV */
+   { 26842, 0x00008647 }, /* GL_PROGRAM_RESIDENT_NV */
+   { 26865, 0x00008628 }, /* GL_PROGRAM_STRING_ARB */
+   { 26887, 0x00008628 }, /* GL_PROGRAM_STRING_NV */
+   { 26908, 0x00008646 }, /* GL_PROGRAM_TARGET_NV */
+   { 26929, 0x000088A4 }, /* GL_PROGRAM_TEMPORARIES_ARB */
+   { 26956, 0x00008807 }, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
+   { 26988, 0x00008806 }, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
+   { 27020, 0x000088B6 }, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
+   { 27055, 0x00001701 }, /* GL_PROJECTION */
+   { 27069, 0x00000BA7 }, /* GL_PROJECTION_MATRIX */
+   { 27090, 0x00000BA4 }, /* GL_PROJECTION_STACK_DEPTH */
+   { 27116, 0x000080D3 }, /* GL_PROXY_COLOR_TABLE */
+   { 27137, 0x00008025 }, /* GL_PROXY_HISTOGRAM */
+   { 27156, 0x00008025 }, /* GL_PROXY_HISTOGRAM_EXT */
+   { 27179, 0x000080D5 }, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
+   { 27218, 0x000080D4 }, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
+   { 27256, 0x00008063 }, /* GL_PROXY_TEXTURE_1D */
+   { 27276, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
+   { 27306, 0x00008063 }, /* GL_PROXY_TEXTURE_1D_EXT */
+   { 27330, 0x00008064 }, /* GL_PROXY_TEXTURE_2D */
+   { 27350, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
+   { 27380, 0x00008064 }, /* GL_PROXY_TEXTURE_2D_EXT */
+   { 27404, 0x00008070 }, /* GL_PROXY_TEXTURE_3D */
+   { 27424, 0x000080BD }, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
+   { 27457, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP */
+   { 27483, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP_ARB */
+   { 27513, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
+   { 27544, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_NV */
+   { 27574, 0x00002003 }, /* GL_Q */
+   { 27579, 0x00001209 }, /* GL_QUADRATIC_ATTENUATION */
+   { 27604, 0x00000007 }, /* GL_QUADS */
+   { 27613, 0x00008614 }, /* GL_QUAD_MESH_SUN */
+   { 27630, 0x00000008 }, /* GL_QUAD_STRIP */
+   { 27644, 0x00008864 }, /* GL_QUERY_COUNTER_BITS */
+   { 27666, 0x00008864 }, /* GL_QUERY_COUNTER_BITS_ARB */
+   { 27692, 0x00008866 }, /* GL_QUERY_RESULT */
+   { 27708, 0x00008866 }, /* GL_QUERY_RESULT_ARB */
+   { 27728, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE */
+   { 27754, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE_ARB */
+   { 27784, 0x00002002 }, /* GL_R */
+   { 27789, 0x00002A10 }, /* GL_R3_G3_B2 */
+   { 27801, 0x00019262 }, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
+   { 27834, 0x00000C02 }, /* GL_READ_BUFFER */
+   { 27849, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER */
+   { 27869, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
+   { 27901, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER_EXT */
+   { 27925, 0x000088B8 }, /* GL_READ_ONLY */
+   { 27938, 0x000088B8 }, /* GL_READ_ONLY_ARB */
+   { 27955, 0x000088BA }, /* GL_READ_WRITE */
+   { 27969, 0x000088BA }, /* GL_READ_WRITE_ARB */
+   { 27987, 0x00001903 }, /* GL_RED */
+   { 27994, 0x00008016 }, /* GL_REDUCE */
+   { 28004, 0x00008016 }, /* GL_REDUCE_EXT */
+   { 28018, 0x00000D15 }, /* GL_RED_BIAS */
+   { 28030, 0x00000D52 }, /* GL_RED_BITS */
+   { 28042, 0x00000D14 }, /* GL_RED_SCALE */
+   { 28055, 0x00008512 }, /* GL_REFLECTION_MAP */
+   { 28073, 0x00008512 }, /* GL_REFLECTION_MAP_ARB */
+   { 28095, 0x00008512 }, /* GL_REFLECTION_MAP_NV */
+   { 28116, 0x00001C00 }, /* GL_RENDER */
+   { 28126, 0x00008D41 }, /* GL_RENDERBUFFER */
+   { 28142, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE */
+   { 28169, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_EXT */
+   { 28197, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE */
+   { 28223, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE */
+   { 28250, 0x00008D41 }, /* GL_RENDERBUFFER_EXT */
+   { 28270, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE */
+   { 28297, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT */
+   { 28320, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_EXT */
+   { 28347, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
+   { 28379, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */
+   { 28415, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE */
+   { 28440, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES */
+   { 28464, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE */
+   { 28493, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH */
+   { 28515, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_EXT */
+   { 28541, 0x00001F01 }, /* GL_RENDERER */
+   { 28553, 0x00000C40 }, /* GL_RENDER_MODE */
+   { 28568, 0x00002901 }, /* GL_REPEAT */
+   { 28578, 0x00001E01 }, /* GL_REPLACE */
+   { 28589, 0x00008062 }, /* GL_REPLACE_EXT */
+   { 28604, 0x00008153 }, /* GL_REPLICATE_BORDER_HP */
+   { 28627, 0x0000803A }, /* GL_RESCALE_NORMAL */
+   { 28645, 0x0000803A }, /* GL_RESCALE_NORMAL_EXT */
+   { 28667, 0x00000102 }, /* GL_RETURN */
+   { 28677, 0x00001907 }, /* GL_RGB */
+   { 28684, 0x00008052 }, /* GL_RGB10 */
+   { 28693, 0x00008059 }, /* GL_RGB10_A2 */
+   { 28705, 0x00008059 }, /* GL_RGB10_A2_EXT */
+   { 28721, 0x00008052 }, /* GL_RGB10_EXT */
+   { 28734, 0x00008053 }, /* GL_RGB12 */
+   { 28743, 0x00008053 }, /* GL_RGB12_EXT */
+   { 28756, 0x00008054 }, /* GL_RGB16 */
+   { 28765, 0x00008054 }, /* GL_RGB16_EXT */
+   { 28778, 0x0000804E }, /* GL_RGB2_EXT */
+   { 28790, 0x0000804F }, /* GL_RGB4 */
+   { 28798, 0x0000804F }, /* GL_RGB4_EXT */
+   { 28810, 0x000083A1 }, /* GL_RGB4_S3TC */
+   { 28823, 0x00008050 }, /* GL_RGB5 */
+   { 28831, 0x00008057 }, /* GL_RGB5_A1 */
+   { 28842, 0x00008057 }, /* GL_RGB5_A1_EXT */
+   { 28857, 0x00008050 }, /* GL_RGB5_EXT */
+   { 28869, 0x00008051 }, /* GL_RGB8 */
+   { 28877, 0x00008051 }, /* GL_RGB8_EXT */
+   { 28889, 0x00001908 }, /* GL_RGBA */
+   { 28897, 0x0000805A }, /* GL_RGBA12 */
+   { 28907, 0x0000805A }, /* GL_RGBA12_EXT */
+   { 28921, 0x0000805B }, /* GL_RGBA16 */
+   { 28931, 0x0000805B }, /* GL_RGBA16_EXT */
+   { 28945, 0x00008055 }, /* GL_RGBA2 */
+   { 28954, 0x00008055 }, /* GL_RGBA2_EXT */
+   { 28967, 0x00008056 }, /* GL_RGBA4 */
+   { 28976, 0x000083A5 }, /* GL_RGBA4_DXT5_S3TC */
+   { 28995, 0x00008056 }, /* GL_RGBA4_EXT */
+   { 29008, 0x000083A3 }, /* GL_RGBA4_S3TC */
+   { 29022, 0x00008058 }, /* GL_RGBA8 */
+   { 29031, 0x00008058 }, /* GL_RGBA8_EXT */
+   { 29044, 0x000083A4 }, /* GL_RGBA_DXT5_S3TC */
+   { 29062, 0x00000C31 }, /* GL_RGBA_MODE */
+   { 29075, 0x000083A2 }, /* GL_RGBA_S3TC */
+   { 29088, 0x000083A0 }, /* GL_RGB_S3TC */
+   { 29100, 0x00008573 }, /* GL_RGB_SCALE */
+   { 29113, 0x00008573 }, /* GL_RGB_SCALE_ARB */
+   { 29130, 0x00008573 }, /* GL_RGB_SCALE_EXT */
+   { 29147, 0x00000407 }, /* GL_RIGHT */
+   { 29156, 0x00002000 }, /* GL_S */
+   { 29161, 0x00008B5D }, /* GL_SAMPLER_1D */
+   { 29175, 0x00008B61 }, /* GL_SAMPLER_1D_SHADOW */
+   { 29196, 0x00008B5E }, /* GL_SAMPLER_2D */
+   { 29210, 0x00008B62 }, /* GL_SAMPLER_2D_SHADOW */
+   { 29231, 0x00008B5F }, /* GL_SAMPLER_3D */
+   { 29245, 0x00008B60 }, /* GL_SAMPLER_CUBE */
+   { 29261, 0x000080A9 }, /* GL_SAMPLES */
+   { 29272, 0x000086B4 }, /* GL_SAMPLES_3DFX */
+   { 29288, 0x000080A9 }, /* GL_SAMPLES_ARB */
+   { 29303, 0x00008914 }, /* GL_SAMPLES_PASSED */
+   { 29321, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */
+   { 29343, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
+   { 29371, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */
+   { 29403, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */
+   { 29426, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */
+   { 29453, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */
+   { 29471, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */
+   { 29494, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */
+   { 29516, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */
+   { 29535, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */
+   { 29558, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */
+   { 29584, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */
+   { 29614, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */
+   { 29639, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */
+   { 29668, 0x00080000 }, /* GL_SCISSOR_BIT */
+   { 29683, 0x00000C10 }, /* GL_SCISSOR_BOX */
+   { 29698, 0x00000C11 }, /* GL_SCISSOR_TEST */
+   { 29714, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */
+   { 29739, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
+   { 29779, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */
+   { 29823, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
+   { 29856, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
+   { 29886, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
+   { 29918, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
+   { 29948, 0x00001C02 }, /* GL_SELECT */
+   { 29958, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */
+   { 29986, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */
+   { 30011, 0x00008012 }, /* GL_SEPARABLE_2D */
+   { 30027, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */
+   { 30054, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */
+   { 30085, 0x0000150F }, /* GL_SET */
+   { 30092, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */
+   { 30113, 0x00008B88 }, /* GL_SHADER_SOURCE_LENGTH */
+   { 30137, 0x00008B4F }, /* GL_SHADER_TYPE */
+   { 30152, 0x00000B54 }, /* GL_SHADE_MODEL */
+   { 30167, 0x00008B8C }, /* GL_SHADING_LANGUAGE_VERSION */
+   { 30195, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */
+   { 30218, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */
+   { 30248, 0x00001601 }, /* GL_SHININESS */
+   { 30261, 0x00001402 }, /* GL_SHORT */
+   { 30270, 0x000081F9 }, /* GL_SINGLE_COLOR */
+   { 30286, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */
+   { 30306, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */
+   { 30325, 0x00001D01 }, /* GL_SMOOTH */
+   { 30335, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */
+   { 30368, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */
+   { 30395, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */
+   { 30428, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */
+   { 30455, 0x00008588 }, /* GL_SOURCE0_ALPHA */
+   { 30472, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */
+   { 30493, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */
+   { 30514, 0x00008580 }, /* GL_SOURCE0_RGB */
+   { 30529, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */
+   { 30548, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */
+   { 30567, 0x00008589 }, /* GL_SOURCE1_ALPHA */
+   { 30584, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */
+   { 30605, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */
+   { 30626, 0x00008581 }, /* GL_SOURCE1_RGB */
+   { 30641, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */
+   { 30660, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */
+   { 30679, 0x0000858A }, /* GL_SOURCE2_ALPHA */
+   { 30696, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */
+   { 30717, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */
+   { 30738, 0x00008582 }, /* GL_SOURCE2_RGB */
+   { 30753, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */
+   { 30772, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */
+   { 30791, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */
+   { 30811, 0x00008583 }, /* GL_SOURCE3_RGB_NV */
+   { 30829, 0x00001202 }, /* GL_SPECULAR */
+   { 30841, 0x00002402 }, /* GL_SPHERE_MAP */
+   { 30855, 0x00001206 }, /* GL_SPOT_CUTOFF */
+   { 30870, 0x00001204 }, /* GL_SPOT_DIRECTION */
+   { 30888, 0x00001205 }, /* GL_SPOT_EXPONENT */
+   { 30905, 0x00008588 }, /* GL_SRC0_ALPHA */
+   { 30919, 0x00008580 }, /* GL_SRC0_RGB */
+   { 30931, 0x00008589 }, /* GL_SRC1_ALPHA */
+   { 30945, 0x00008581 }, /* GL_SRC1_RGB */
+   { 30957, 0x0000858A }, /* GL_SRC2_ALPHA */
+   { 30971, 0x00008582 }, /* GL_SRC2_RGB */
+   { 30983, 0x00000302 }, /* GL_SRC_ALPHA */
+   { 30996, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */
+   { 31018, 0x00000300 }, /* GL_SRC_COLOR */
+   { 31031, 0x00008C40 }, /* GL_SRGB */
+   { 31039, 0x00000503 }, /* GL_STACK_OVERFLOW */
+   { 31057, 0x00000504 }, /* GL_STACK_UNDERFLOW */
+   { 31076, 0x000088E6 }, /* GL_STATIC_COPY */
+   { 31091, 0x000088E6 }, /* GL_STATIC_COPY_ARB */
+   { 31110, 0x000088E4 }, /* GL_STATIC_DRAW */
+   { 31125, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */
+   { 31144, 0x000088E5 }, /* GL_STATIC_READ */
+   { 31159, 0x000088E5 }, /* GL_STATIC_READ_ARB */
+   { 31178, 0x00001802 }, /* GL_STENCIL */
+   { 31189, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT */
+   { 31211, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */
+   { 31237, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */
+   { 31258, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */
+   { 31283, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
+   { 31304, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */
+   { 31329, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
+   { 31361, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */
+   { 31397, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
+   { 31429, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */
+   { 31465, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
+   { 31485, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
+   { 31512, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
+   { 31538, 0x00000D57 }, /* GL_STENCIL_BITS */
+   { 31554, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
+   { 31576, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
+   { 31599, 0x00000B94 }, /* GL_STENCIL_FAIL */
+   { 31615, 0x00000B92 }, /* GL_STENCIL_FUNC */
+   { 31631, 0x00001901 }, /* GL_STENCIL_INDEX */
+   { 31648, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
+   { 31671, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
+   { 31693, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
+   { 31715, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
+   { 31737, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
+   { 31758, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
+   { 31785, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
+   { 31812, 0x00000B97 }, /* GL_STENCIL_REF */
+   { 31827, 0x00000B90 }, /* GL_STENCIL_TEST */
+   { 31843, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
+   { 31872, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
+   { 31894, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
+   { 31915, 0x00000C33 }, /* GL_STEREO */
+   { 31925, 0x000088E2 }, /* GL_STREAM_COPY */
+   { 31940, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
+   { 31959, 0x000088E0 }, /* GL_STREAM_DRAW */
+   { 31974, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
+   { 31993, 0x000088E1 }, /* GL_STREAM_READ */
+   { 32008, 0x000088E1 }, /* GL_STREAM_READ_ARB */
+   { 32027, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
+   { 32044, 0x000084E7 }, /* GL_SUBTRACT */
+   { 32056, 0x000084E7 }, /* GL_SUBTRACT_ARB */
+   { 32072, 0x00002001 }, /* GL_T */
+   { 32077, 0x00002A2A }, /* GL_T2F_C3F_V3F */
+   { 32092, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
+   { 32111, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
+   { 32127, 0x00002A2B }, /* GL_T2F_N3F_V3F */
+   { 32142, 0x00002A27 }, /* GL_T2F_V3F */
+   { 32153, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
+   { 32172, 0x00002A28 }, /* GL_T4F_V4F */
+   { 32183, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
+   { 32206, 0x00001702 }, /* GL_TEXTURE */
+   { 32217, 0x000084C0 }, /* GL_TEXTURE0 */
+   { 32229, 0x000084C0 }, /* GL_TEXTURE0_ARB */
+   { 32245, 0x000084C1 }, /* GL_TEXTURE1 */
+   { 32257, 0x000084CA }, /* GL_TEXTURE10 */
+   { 32270, 0x000084CA }, /* GL_TEXTURE10_ARB */
+   { 32287, 0x000084CB }, /* GL_TEXTURE11 */
+   { 32300, 0x000084CB }, /* GL_TEXTURE11_ARB */
+   { 32317, 0x000084CC }, /* GL_TEXTURE12 */
+   { 32330, 0x000084CC }, /* GL_TEXTURE12_ARB */
+   { 32347, 0x000084CD }, /* GL_TEXTURE13 */
+   { 32360, 0x000084CD }, /* GL_TEXTURE13_ARB */
+   { 32377, 0x000084CE }, /* GL_TEXTURE14 */
+   { 32390, 0x000084CE }, /* GL_TEXTURE14_ARB */
+   { 32407, 0x000084CF }, /* GL_TEXTURE15 */
+   { 32420, 0x000084CF }, /* GL_TEXTURE15_ARB */
+   { 32437, 0x000084D0 }, /* GL_TEXTURE16 */
+   { 32450, 0x000084D0 }, /* GL_TEXTURE16_ARB */
+   { 32467, 0x000084D1 }, /* GL_TEXTURE17 */
+   { 32480, 0x000084D1 }, /* GL_TEXTURE17_ARB */
+   { 32497, 0x000084D2 }, /* GL_TEXTURE18 */
+   { 32510, 0x000084D2 }, /* GL_TEXTURE18_ARB */
+   { 32527, 0x000084D3 }, /* GL_TEXTURE19 */
+   { 32540, 0x000084D3 }, /* GL_TEXTURE19_ARB */
+   { 32557, 0x000084C1 }, /* GL_TEXTURE1_ARB */
+   { 32573, 0x000084C2 }, /* GL_TEXTURE2 */
+   { 32585, 0x000084D4 }, /* GL_TEXTURE20 */
+   { 32598, 0x000084D4 }, /* GL_TEXTURE20_ARB */
+   { 32615, 0x000084D5 }, /* GL_TEXTURE21 */
+   { 32628, 0x000084D5 }, /* GL_TEXTURE21_ARB */
+   { 32645, 0x000084D6 }, /* GL_TEXTURE22 */
+   { 32658, 0x000084D6 }, /* GL_TEXTURE22_ARB */
+   { 32675, 0x000084D7 }, /* GL_TEXTURE23 */
+   { 32688, 0x000084D7 }, /* GL_TEXTURE23_ARB */
+   { 32705, 0x000084D8 }, /* GL_TEXTURE24 */
+   { 32718, 0x000084D8 }, /* GL_TEXTURE24_ARB */
+   { 32735, 0x000084D9 }, /* GL_TEXTURE25 */
+   { 32748, 0x000084D9 }, /* GL_TEXTURE25_ARB */
+   { 32765, 0x000084DA }, /* GL_TEXTURE26 */
+   { 32778, 0x000084DA }, /* GL_TEXTURE26_ARB */
+   { 32795, 0x000084DB }, /* GL_TEXTURE27 */
+   { 32808, 0x000084DB }, /* GL_TEXTURE27_ARB */
+   { 32825, 0x000084DC }, /* GL_TEXTURE28 */
+   { 32838, 0x000084DC }, /* GL_TEXTURE28_ARB */
+   { 32855, 0x000084DD }, /* GL_TEXTURE29 */
+   { 32868, 0x000084DD }, /* GL_TEXTURE29_ARB */
+   { 32885, 0x000084C2 }, /* GL_TEXTURE2_ARB */
+   { 32901, 0x000084C3 }, /* GL_TEXTURE3 */
+   { 32913, 0x000084DE }, /* GL_TEXTURE30 */
+   { 32926, 0x000084DE }, /* GL_TEXTURE30_ARB */
+   { 32943, 0x000084DF }, /* GL_TEXTURE31 */
+   { 32956, 0x000084DF }, /* GL_TEXTURE31_ARB */
+   { 32973, 0x000084C3 }, /* GL_TEXTURE3_ARB */
+   { 32989, 0x000084C4 }, /* GL_TEXTURE4 */
+   { 33001, 0x000084C4 }, /* GL_TEXTURE4_ARB */
+   { 33017, 0x000084C5 }, /* GL_TEXTURE5 */
+   { 33029, 0x000084C5 }, /* GL_TEXTURE5_ARB */
+   { 33045, 0x000084C6 }, /* GL_TEXTURE6 */
+   { 33057, 0x000084C6 }, /* GL_TEXTURE6_ARB */
+   { 33073, 0x000084C7 }, /* GL_TEXTURE7 */
+   { 33085, 0x000084C7 }, /* GL_TEXTURE7_ARB */
+   { 33101, 0x000084C8 }, /* GL_TEXTURE8 */
+   { 33113, 0x000084C8 }, /* GL_TEXTURE8_ARB */
+   { 33129, 0x000084C9 }, /* GL_TEXTURE9 */
+   { 33141, 0x000084C9 }, /* GL_TEXTURE9_ARB */
+   { 33157, 0x00000DE0 }, /* GL_TEXTURE_1D */
+   { 33171, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
+   { 33195, 0x00000DE1 }, /* GL_TEXTURE_2D */
+   { 33209, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
+   { 33233, 0x0000806F }, /* GL_TEXTURE_3D */
+   { 33247, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
+   { 33269, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
+   { 33295, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
+   { 33317, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
+   { 33339, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
+   { 33371, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
+   { 33393, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
+   { 33425, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
+   { 33447, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
+   { 33475, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
+   { 33507, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
+   { 33540, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
+   { 33572, 0x00040000 }, /* GL_TEXTURE_BIT */
+   { 33587, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
+   { 33608, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
+   { 33633, 0x00001005 }, /* GL_TEXTURE_BORDER */
+   { 33651, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
+   { 33675, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
+   { 33706, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
+   { 33736, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
+   { 33766, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
+   { 33801, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
+   { 33832, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+   { 33870, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
+   { 33897, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
+   { 33929, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+   { 33963, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
+   { 33987, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
+   { 34015, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
+   { 34039, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
+   { 34067, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
+   { 34100, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
+   { 34124, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
+   { 34146, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
+   { 34168, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
+   { 34194, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
+   { 34228, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
+   { 34261, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
+   { 34298, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
+   { 34326, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
+   { 34358, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
+   { 34381, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
+   { 34419, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
+   { 34461, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
+   { 34492, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
+   { 34520, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
+   { 34550, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
+   { 34578, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
+   { 34598, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
+   { 34622, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
+   { 34653, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
+   { 34688, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
+   { 34719, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
+   { 34754, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
+   { 34785, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
+   { 34820, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
+   { 34851, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
+   { 34886, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
+   { 34917, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
+   { 34952, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
+   { 34983, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
+   { 35018, 0x00008071 }, /* GL_TEXTURE_DEPTH */
+   { 35035, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
+   { 35057, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
+   { 35083, 0x00002300 }, /* GL_TEXTURE_ENV */
+   { 35098, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
+   { 35119, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
+   { 35139, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
+   { 35165, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
+   { 35185, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
+   { 35202, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
+   { 35219, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
+   { 35236, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
+   { 35253, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
+   { 35278, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
+   { 35300, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
+   { 35326, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
+   { 35344, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
+   { 35370, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
+   { 35396, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
+   { 35426, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
+   { 35453, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
+   { 35478, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
+   { 35498, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
+   { 35522, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+   { 35549, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+   { 35576, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+   { 35603, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
+   { 35629, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
+   { 35659, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
+   { 35681, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
+   { 35699, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+   { 35729, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+   { 35757, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+   { 35785, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+   { 35813, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
+   { 35834, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
+   { 35853, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
+   { 35875, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
+   { 35894, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
+   { 35914, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
+   { 35939, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
+   { 35963, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
+   { 35983, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
+   { 36007, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
+   { 36027, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
+   { 36050, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */
+   { 36074, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
+   { 36099, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+   { 36133, 0x00001000 }, /* GL_TEXTURE_WIDTH */
+   { 36150, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
+   { 36168, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
+   { 36186, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
+   { 36204, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
+   { 36224, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
+   { 36243, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+   { 36272, 0x00001000 }, /* GL_TRANSFORM_BIT */
+   { 36289, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
+   { 36315, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
+   { 36345, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+   { 36377, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+   { 36407, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
+   { 36441, 0x0000862C }, /* GL_TRANSPOSE_NV */
+   { 36457, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+   { 36488, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
+   { 36523, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+   { 36551, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
+   { 36583, 0x00000004 }, /* GL_TRIANGLES */
+   { 36596, 0x00000006 }, /* GL_TRIANGLE_FAN */
+   { 36612, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
+   { 36633, 0x00000005 }, /* GL_TRIANGLE_STRIP */
+   { 36651, 0x00000001 }, /* GL_TRUE */
+   { 36659, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
+   { 36679, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
+   { 36702, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
+   { 36722, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
+   { 36743, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
+   { 36765, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
+   { 36787, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
+   { 36807, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
+   { 36828, 0x00001401 }, /* GL_UNSIGNED_BYTE */
+   { 36845, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+   { 36872, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
+   { 36895, 0x00001405 }, /* GL_UNSIGNED_INT */
+   { 36911, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
+   { 36938, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */
+   { 36959, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
+   { 36983, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+   { 37014, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
+   { 37038, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+   { 37066, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */
+   { 37089, 0x00001403 }, /* GL_UNSIGNED_SHORT */
+   { 37107, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+   { 37137, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+   { 37163, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+   { 37193, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+   { 37219, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
+   { 37243, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+   { 37271, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+   { 37299, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
+   { 37326, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+   { 37358, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
+   { 37389, 0x00008CA2 }, /* GL_UPPER_LEFT */
+   { 37403, 0x00002A20 }, /* GL_V2F */
+   { 37410, 0x00002A21 }, /* GL_V3F */
+   { 37417, 0x00008B83 }, /* GL_VALIDATE_STATUS */
+   { 37436, 0x00001F00 }, /* GL_VENDOR */
+   { 37446, 0x00001F02 }, /* GL_VERSION */
+   { 37457, 0x00008074 }, /* GL_VERTEX_ARRAY */
+   { 37473, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
+   { 37503, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+   { 37534, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
+   { 37569, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
+   { 37593, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
+   { 37614, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
+   { 37637, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
+   { 37658, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+   { 37685, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+   { 37713, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+   { 37741, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+   { 37769, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+   { 37797, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+   { 37825, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+   { 37853, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+   { 37880, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+   { 37907, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+   { 37934, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+   { 37961, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+   { 37988, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+   { 38015, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+   { 38042, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+   { 38069, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+   { 38096, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+   { 38134, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
+   { 38176, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+   { 38207, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
+   { 38242, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+   { 38276, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
+   { 38314, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+   { 38345, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
+   { 38380, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+   { 38408, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
+   { 38440, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+   { 38470, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
+   { 38504, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+   { 38532, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
+   { 38564, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
+   { 38584, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
+   { 38606, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
+   { 38635, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
+   { 38656, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
+   { 38685, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
+   { 38718, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
+   { 38750, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+   { 38777, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
+   { 38808, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
+   { 38838, 0x00008B31 }, /* GL_VERTEX_SHADER */
+   { 38855, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
+   { 38876, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
+   { 38903, 0x00000BA2 }, /* GL_VIEWPORT */
+   { 38915, 0x00000800 }, /* GL_VIEWPORT_BIT */
+   { 38931, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
+   { 38951, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+   { 38982, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
+   { 39017, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+   { 39045, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+   { 39070, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+   { 39097, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+   { 39122, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
+   { 39146, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
+   { 39165, 0x000088B9 }, /* GL_WRITE_ONLY */
+   { 39179, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
+   { 39197, 0x00001506 }, /* GL_XOR */
+   { 39204, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
+   { 39223, 0x00008757 }, /* GL_YCBCR_MESA */
+   { 39237, 0x00000000 }, /* GL_ZERO */
+   { 39245, 0x00000D16 }, /* GL_ZOOM_X */
+   { 39255, 0x00000D17 }, /* GL_ZOOM_Y */
 };
 
-static const unsigned reduced_enums[1284] =
+static const unsigned reduced_enums[1308] =
 {
-       434, /* GL_FALSE */
-       643, /* GL_LINES */
-       645, /* GL_LINE_LOOP */
-       652, /* GL_LINE_STRIP */
-      1639, /* GL_TRIANGLES */
-      1642, /* GL_TRIANGLE_STRIP */
-      1640, /* GL_TRIANGLE_FAN */
-      1209, /* GL_QUADS */
-      1211, /* GL_QUAD_STRIP */
-      1097, /* GL_POLYGON */
-      1109, /* GL_POLYGON_STIPPLE_BIT */
-      1062, /* GL_PIXEL_MODE_BIT */
-       630, /* GL_LIGHTING_BIT */
-       456, /* GL_FOG_BIT */
+       455, /* GL_FALSE */
+       687, /* GL_LINES */
+       689, /* GL_LINE_LOOP */
+       696, /* GL_LINE_STRIP */
+      1699, /* GL_TRIANGLES */
+      1702, /* GL_TRIANGLE_STRIP */
+      1700, /* GL_TRIANGLE_FAN */
+      1254, /* GL_QUADS */
+      1256, /* GL_QUAD_STRIP */
+      1142, /* GL_POLYGON */
+      1154, /* GL_POLYGON_STIPPLE_BIT */
+      1107, /* GL_PIXEL_MODE_BIT */
+       674, /* GL_LIGHTING_BIT */
+       477, /* GL_FOG_BIT */
          8, /* GL_ACCUM */
-       662, /* GL_LOAD */
-      1251, /* GL_RETURN */
-       935, /* GL_MULT */
+       706, /* GL_LOAD */
+      1308, /* GL_RETURN */
+       980, /* GL_MULT */
         23, /* GL_ADD */
-       951, /* GL_NEVER */
-       620, /* GL_LESS */
-       424, /* GL_EQUAL */
-       619, /* GL_LEQUAL */
-       545, /* GL_GREATER */
-       966, /* GL_NOTEQUAL */
-       520, /* GL_GEQUAL */
+       996, /* GL_NEVER */
+       664, /* GL_LESS */
+       445, /* GL_EQUAL */
+       663, /* GL_LEQUAL */
+       587, /* GL_GREATER */
+      1011, /* GL_NOTEQUAL */
+       562, /* GL_GEQUAL */
         46, /* GL_ALWAYS */
-      1384, /* GL_SRC_COLOR */
-       995, /* GL_ONE_MINUS_SRC_COLOR */
-      1382, /* GL_SRC_ALPHA */
-       994, /* GL_ONE_MINUS_SRC_ALPHA */
-       405, /* GL_DST_ALPHA */
-       992, /* GL_ONE_MINUS_DST_ALPHA */
-       406, /* GL_DST_COLOR */
-       993, /* GL_ONE_MINUS_DST_COLOR */
-      1383, /* GL_SRC_ALPHA_SATURATE */
-       508, /* GL_FRONT_LEFT */
-       509, /* GL_FRONT_RIGHT */
+      1441, /* GL_SRC_COLOR */
+      1040, /* GL_ONE_MINUS_SRC_COLOR */
+      1439, /* GL_SRC_ALPHA */
+      1039, /* GL_ONE_MINUS_SRC_ALPHA */
+       426, /* GL_DST_ALPHA */
+      1037, /* GL_ONE_MINUS_DST_ALPHA */
+       427, /* GL_DST_COLOR */
+      1038, /* GL_ONE_MINUS_DST_COLOR */
+      1440, /* GL_SRC_ALPHA_SATURATE */
+       550, /* GL_FRONT_LEFT */
+       551, /* GL_FRONT_RIGHT */
         68, /* GL_BACK_LEFT */
         69, /* GL_BACK_RIGHT */
-       505, /* GL_FRONT */
+       547, /* GL_FRONT */
         67, /* GL_BACK */
-       618, /* GL_LEFT */
-      1291, /* GL_RIGHT */
-       506, /* GL_FRONT_AND_BACK */
+       662, /* GL_LEFT */
+      1348, /* GL_RIGHT */
+       548, /* GL_FRONT_AND_BACK */
         62, /* GL_AUX0 */
         63, /* GL_AUX1 */
         64, /* GL_AUX2 */
         65, /* GL_AUX3 */
-       610, /* GL_INVALID_ENUM */
-       613, /* GL_INVALID_VALUE */
-       612, /* GL_INVALID_OPERATION */
-      1385, /* GL_STACK_OVERFLOW */
-      1386, /* GL_STACK_UNDERFLOW */
-      1020, /* GL_OUT_OF_MEMORY */
-       611, /* GL_INVALID_FRAMEBUFFER_OPERATION_EXT */
+       653, /* GL_INVALID_ENUM */
+       657, /* GL_INVALID_VALUE */
+       656, /* GL_INVALID_OPERATION */
+      1443, /* GL_STACK_OVERFLOW */
+      1444, /* GL_STACK_UNDERFLOW */
+      1065, /* GL_OUT_OF_MEMORY */
+       654, /* GL_INVALID_FRAMEBUFFER_OPERATION */
          0, /* GL_2D */
          2, /* GL_3D */
          3, /* GL_3D_COLOR */
          4, /* GL_3D_COLOR_TEXTURE */
          6, /* GL_4D_COLOR_TEXTURE */
-      1040, /* GL_PASS_THROUGH_TOKEN */
-      1096, /* GL_POINT_TOKEN */
-       653, /* GL_LINE_TOKEN */
-      1110, /* GL_POLYGON_TOKEN */
+      1085, /* GL_PASS_THROUGH_TOKEN */
+      1141, /* GL_POINT_TOKEN */
+       697, /* GL_LINE_TOKEN */
+      1155, /* GL_POLYGON_TOKEN */
         73, /* GL_BITMAP_TOKEN */
-       404, /* GL_DRAW_PIXEL_TOKEN */
-       270, /* GL_COPY_PIXEL_TOKEN */
-       646, /* GL_LINE_RESET_TOKEN */
-       427, /* GL_EXP */
-       428, /* GL_EXP2 */
-       303, /* GL_CW */
+       425, /* GL_DRAW_PIXEL_TOKEN */
+       286, /* GL_COPY_PIXEL_TOKEN */
+       690, /* GL_LINE_RESET_TOKEN */
+       448, /* GL_EXP */
+       449, /* GL_EXP2 */
+       319, /* GL_CW */
        115, /* GL_CCW */
        136, /* GL_COEFF */
-      1017, /* GL_ORDER */
-       343, /* GL_DOMAIN */
-       278, /* GL_CURRENT_COLOR */
-       281, /* GL_CURRENT_INDEX */
-       287, /* GL_CURRENT_NORMAL */
-       299, /* GL_CURRENT_TEXTURE_COORDS */
-       292, /* GL_CURRENT_RASTER_COLOR */
-       294, /* GL_CURRENT_RASTER_INDEX */
-       297, /* GL_CURRENT_RASTER_TEXTURE_COORDS */
-       295, /* GL_CURRENT_RASTER_POSITION */
-       296, /* GL_CURRENT_RASTER_POSITION_VALID */
-       293, /* GL_CURRENT_RASTER_DISTANCE */
-      1089, /* GL_POINT_SMOOTH */
-      1078, /* GL_POINT_SIZE */
-      1088, /* GL_POINT_SIZE_RANGE */
-      1079, /* GL_POINT_SIZE_GRANULARITY */
-       647, /* GL_LINE_SMOOTH */
-       654, /* GL_LINE_WIDTH */
-       656, /* GL_LINE_WIDTH_RANGE */
-       655, /* GL_LINE_WIDTH_GRANULARITY */
-       649, /* GL_LINE_STIPPLE */
-       650, /* GL_LINE_STIPPLE_PATTERN */
-       651, /* GL_LINE_STIPPLE_REPEAT */
-       661, /* GL_LIST_MODE */
-       820, /* GL_MAX_LIST_NESTING */
-       658, /* GL_LIST_BASE */
-       660, /* GL_LIST_INDEX */
-      1099, /* GL_POLYGON_MODE */
-      1106, /* GL_POLYGON_SMOOTH */
-      1108, /* GL_POLYGON_STIPPLE */
-       413, /* GL_EDGE_FLAG */
-       271, /* GL_CULL_FACE */
-       272, /* GL_CULL_FACE_MODE */
-       507, /* GL_FRONT_FACE */
-       629, /* GL_LIGHTING */
-       634, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
-       635, /* GL_LIGHT_MODEL_TWO_SIDE */
-       631, /* GL_LIGHT_MODEL_AMBIENT */
-      1337, /* GL_SHADE_MODEL */
-       167, /* GL_COLOR_MATERIAL_FACE */
-       168, /* GL_COLOR_MATERIAL_PARAMETER */
-       166, /* GL_COLOR_MATERIAL */
-       455, /* GL_FOG */
-       477, /* GL_FOG_INDEX */
-       473, /* GL_FOG_DENSITY */
-       481, /* GL_FOG_START */
-       475, /* GL_FOG_END */
-       478, /* GL_FOG_MODE */
-       457, /* GL_FOG_COLOR */
-       332, /* GL_DEPTH_RANGE */
-       337, /* GL_DEPTH_TEST */
-       340, /* GL_DEPTH_WRITEMASK */
-       320, /* GL_DEPTH_CLEAR_VALUE */
-       331, /* GL_DEPTH_FUNC */
+      1062, /* GL_ORDER */
+       363, /* GL_DOMAIN */
+       294, /* GL_CURRENT_COLOR */
+       297, /* GL_CURRENT_INDEX */
+       303, /* GL_CURRENT_NORMAL */
+       315, /* GL_CURRENT_TEXTURE_COORDS */
+       308, /* GL_CURRENT_RASTER_COLOR */
+       310, /* GL_CURRENT_RASTER_INDEX */
+       313, /* GL_CURRENT_RASTER_TEXTURE_COORDS */
+       311, /* GL_CURRENT_RASTER_POSITION */
+       312, /* GL_CURRENT_RASTER_POSITION_VALID */
+       309, /* GL_CURRENT_RASTER_DISTANCE */
+      1134, /* GL_POINT_SMOOTH */
+      1123, /* GL_POINT_SIZE */
+      1133, /* GL_POINT_SIZE_RANGE */
+      1124, /* GL_POINT_SIZE_GRANULARITY */
+       691, /* GL_LINE_SMOOTH */
+       698, /* GL_LINE_WIDTH */
+       700, /* GL_LINE_WIDTH_RANGE */
+       699, /* GL_LINE_WIDTH_GRANULARITY */
+       693, /* GL_LINE_STIPPLE */
+       694, /* GL_LINE_STIPPLE_PATTERN */
+       695, /* GL_LINE_STIPPLE_REPEAT */
+       705, /* GL_LIST_MODE */
+       864, /* GL_MAX_LIST_NESTING */
+       702, /* GL_LIST_BASE */
+       704, /* GL_LIST_INDEX */
+      1144, /* GL_POLYGON_MODE */
+      1151, /* GL_POLYGON_SMOOTH */
+      1153, /* GL_POLYGON_STIPPLE */
+       434, /* GL_EDGE_FLAG */
+       287, /* GL_CULL_FACE */
+       288, /* GL_CULL_FACE_MODE */
+       549, /* GL_FRONT_FACE */
+       673, /* GL_LIGHTING */
+       678, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
+       679, /* GL_LIGHT_MODEL_TWO_SIDE */
+       675, /* GL_LIGHT_MODEL_AMBIENT */
+      1394, /* GL_SHADE_MODEL */
+       183, /* GL_COLOR_MATERIAL_FACE */
+       184, /* GL_COLOR_MATERIAL_PARAMETER */
+       182, /* GL_COLOR_MATERIAL */
+       476, /* GL_FOG */
+       498, /* GL_FOG_INDEX */
+       494, /* GL_FOG_DENSITY */
+       502, /* GL_FOG_START */
+       496, /* GL_FOG_END */
+       499, /* GL_FOG_MODE */
+       478, /* GL_FOG_COLOR */
+       350, /* GL_DEPTH_RANGE */
+       357, /* GL_DEPTH_TEST */
+       360, /* GL_DEPTH_WRITEMASK */
+       338, /* GL_DEPTH_CLEAR_VALUE */
+       349, /* GL_DEPTH_FUNC */
         12, /* GL_ACCUM_CLEAR_VALUE */
-      1420, /* GL_STENCIL_TEST */
-      1408, /* GL_STENCIL_CLEAR_VALUE */
-      1410, /* GL_STENCIL_FUNC */
-      1422, /* GL_STENCIL_VALUE_MASK */
-      1409, /* GL_STENCIL_FAIL */
-      1417, /* GL_STENCIL_PASS_DEPTH_FAIL */
-      1418, /* GL_STENCIL_PASS_DEPTH_PASS */
-      1419, /* GL_STENCIL_REF */
-      1423, /* GL_STENCIL_WRITEMASK */
-       789, /* GL_MATRIX_MODE */
-       956, /* GL_NORMALIZE */
-      1729, /* GL_VIEWPORT */
-       930, /* GL_MODELVIEW_STACK_DEPTH */
-      1189, /* GL_PROJECTION_STACK_DEPTH */
-      1618, /* GL_TEXTURE_STACK_DEPTH */
-       928, /* GL_MODELVIEW_MATRIX */
-      1188, /* GL_PROJECTION_MATRIX */
-      1603, /* GL_TEXTURE_MATRIX */
+      1479, /* GL_STENCIL_TEST */
+      1467, /* GL_STENCIL_CLEAR_VALUE */
+      1469, /* GL_STENCIL_FUNC */
+      1481, /* GL_STENCIL_VALUE_MASK */
+      1468, /* GL_STENCIL_FAIL */
+      1476, /* GL_STENCIL_PASS_DEPTH_FAIL */
+      1477, /* GL_STENCIL_PASS_DEPTH_PASS */
+      1478, /* GL_STENCIL_REF */
+      1482, /* GL_STENCIL_WRITEMASK */
+       833, /* GL_MATRIX_MODE */
+      1001, /* GL_NORMALIZE */
+      1791, /* GL_VIEWPORT */
+       975, /* GL_MODELVIEW_STACK_DEPTH */
+      1234, /* GL_PROJECTION_STACK_DEPTH */
+      1677, /* GL_TEXTURE_STACK_DEPTH */
+       973, /* GL_MODELVIEW_MATRIX */
+      1233, /* GL_PROJECTION_MATRIX */
+      1662, /* GL_TEXTURE_MATRIX */
         60, /* GL_ATTRIB_STACK_DEPTH */
        126, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
         43, /* GL_ALPHA_TEST */
         44, /* GL_ALPHA_TEST_FUNC */
         45, /* GL_ALPHA_TEST_REF */
-       342, /* GL_DITHER */
+       362, /* GL_DITHER */
         77, /* GL_BLEND_DST */
         85, /* GL_BLEND_SRC */
         74, /* GL_BLEND */
-       664, /* GL_LOGIC_OP_MODE */
-       584, /* GL_INDEX_LOGIC_OP */
-       165, /* GL_COLOR_LOGIC_OP */
+       708, /* GL_LOGIC_OP_MODE */
+       627, /* GL_INDEX_LOGIC_OP */
+       181, /* GL_COLOR_LOGIC_OP */
         66, /* GL_AUX_BUFFERS */
-       353, /* GL_DRAW_BUFFER */
-      1221, /* GL_READ_BUFFER */
-      1318, /* GL_SCISSOR_BOX */
-      1319, /* GL_SCISSOR_TEST */
-       583, /* GL_INDEX_CLEAR_VALUE */
-       588, /* GL_INDEX_WRITEMASK */
-       162, /* GL_COLOR_CLEAR_VALUE */
-       204, /* GL_COLOR_WRITEMASK */
-       585, /* GL_INDEX_MODE */
-      1285, /* GL_RGBA_MODE */
-       352, /* GL_DOUBLEBUFFER */
-      1424, /* GL_STEREO */
-      1244, /* GL_RENDER_MODE */
-      1041, /* GL_PERSPECTIVE_CORRECTION_HINT */
-      1090, /* GL_POINT_SMOOTH_HINT */
-       648, /* GL_LINE_SMOOTH_HINT */
-      1107, /* GL_POLYGON_SMOOTH_HINT */
-       476, /* GL_FOG_HINT */
-      1584, /* GL_TEXTURE_GEN_S */
-      1585, /* GL_TEXTURE_GEN_T */
-      1583, /* GL_TEXTURE_GEN_R */
-      1582, /* GL_TEXTURE_GEN_Q */
-      1054, /* GL_PIXEL_MAP_I_TO_I */
-      1060, /* GL_PIXEL_MAP_S_TO_S */
-      1056, /* GL_PIXEL_MAP_I_TO_R */
-      1052, /* GL_PIXEL_MAP_I_TO_G */
-      1050, /* GL_PIXEL_MAP_I_TO_B */
-      1048, /* GL_PIXEL_MAP_I_TO_A */
-      1058, /* GL_PIXEL_MAP_R_TO_R */
-      1046, /* GL_PIXEL_MAP_G_TO_G */
-      1044, /* GL_PIXEL_MAP_B_TO_B */
-      1042, /* GL_PIXEL_MAP_A_TO_A */
-      1055, /* GL_PIXEL_MAP_I_TO_I_SIZE */
-      1061, /* GL_PIXEL_MAP_S_TO_S_SIZE */
-      1057, /* GL_PIXEL_MAP_I_TO_R_SIZE */
-      1053, /* GL_PIXEL_MAP_I_TO_G_SIZE */
-      1051, /* GL_PIXEL_MAP_I_TO_B_SIZE */
-      1049, /* GL_PIXEL_MAP_I_TO_A_SIZE */
-      1059, /* GL_PIXEL_MAP_R_TO_R_SIZE */
-      1047, /* GL_PIXEL_MAP_G_TO_G_SIZE */
-      1045, /* GL_PIXEL_MAP_B_TO_B_SIZE */
-      1043, /* GL_PIXEL_MAP_A_TO_A_SIZE */
-      1651, /* GL_UNPACK_SWAP_BYTES */
-      1646, /* GL_UNPACK_LSB_FIRST */
-      1647, /* GL_UNPACK_ROW_LENGTH */
-      1650, /* GL_UNPACK_SKIP_ROWS */
-      1649, /* GL_UNPACK_SKIP_PIXELS */
-      1644, /* GL_UNPACK_ALIGNMENT */
-      1029, /* GL_PACK_SWAP_BYTES */
-      1024, /* GL_PACK_LSB_FIRST */
-      1025, /* GL_PACK_ROW_LENGTH */
-      1028, /* GL_PACK_SKIP_ROWS */
-      1027, /* GL_PACK_SKIP_PIXELS */
-      1021, /* GL_PACK_ALIGNMENT */
-       742, /* GL_MAP_COLOR */
-       743, /* GL_MAP_STENCIL */
-       587, /* GL_INDEX_SHIFT */
-       586, /* GL_INDEX_OFFSET */
-      1233, /* GL_RED_SCALE */
-      1231, /* GL_RED_BIAS */
-      1746, /* GL_ZOOM_X */
-      1747, /* GL_ZOOM_Y */
-       549, /* GL_GREEN_SCALE */
-       547, /* GL_GREEN_BIAS */
+       373, /* GL_DRAW_BUFFER */
+      1266, /* GL_READ_BUFFER */
+      1375, /* GL_SCISSOR_BOX */
+      1376, /* GL_SCISSOR_TEST */
+       626, /* GL_INDEX_CLEAR_VALUE */
+       631, /* GL_INDEX_WRITEMASK */
+       178, /* GL_COLOR_CLEAR_VALUE */
+       220, /* GL_COLOR_WRITEMASK */
+       628, /* GL_INDEX_MODE */
+      1342, /* GL_RGBA_MODE */
+       372, /* GL_DOUBLEBUFFER */
+      1483, /* GL_STEREO */
+      1301, /* GL_RENDER_MODE */
+      1086, /* GL_PERSPECTIVE_CORRECTION_HINT */
+      1135, /* GL_POINT_SMOOTH_HINT */
+       692, /* GL_LINE_SMOOTH_HINT */
+      1152, /* GL_POLYGON_SMOOTH_HINT */
+       497, /* GL_FOG_HINT */
+      1643, /* GL_TEXTURE_GEN_S */
+      1644, /* GL_TEXTURE_GEN_T */
+      1642, /* GL_TEXTURE_GEN_R */
+      1641, /* GL_TEXTURE_GEN_Q */
+      1099, /* GL_PIXEL_MAP_I_TO_I */
+      1105, /* GL_PIXEL_MAP_S_TO_S */
+      1101, /* GL_PIXEL_MAP_I_TO_R */
+      1097, /* GL_PIXEL_MAP_I_TO_G */
+      1095, /* GL_PIXEL_MAP_I_TO_B */
+      1093, /* GL_PIXEL_MAP_I_TO_A */
+      1103, /* GL_PIXEL_MAP_R_TO_R */
+      1091, /* GL_PIXEL_MAP_G_TO_G */
+      1089, /* GL_PIXEL_MAP_B_TO_B */
+      1087, /* GL_PIXEL_MAP_A_TO_A */
+      1100, /* GL_PIXEL_MAP_I_TO_I_SIZE */
+      1106, /* GL_PIXEL_MAP_S_TO_S_SIZE */
+      1102, /* GL_PIXEL_MAP_I_TO_R_SIZE */
+      1098, /* GL_PIXEL_MAP_I_TO_G_SIZE */
+      1096, /* GL_PIXEL_MAP_I_TO_B_SIZE */
+      1094, /* GL_PIXEL_MAP_I_TO_A_SIZE */
+      1104, /* GL_PIXEL_MAP_R_TO_R_SIZE */
+      1092, /* GL_PIXEL_MAP_G_TO_G_SIZE */
+      1090, /* GL_PIXEL_MAP_B_TO_B_SIZE */
+      1088, /* GL_PIXEL_MAP_A_TO_A_SIZE */
+      1711, /* GL_UNPACK_SWAP_BYTES */
+      1706, /* GL_UNPACK_LSB_FIRST */
+      1707, /* GL_UNPACK_ROW_LENGTH */
+      1710, /* GL_UNPACK_SKIP_ROWS */
+      1709, /* GL_UNPACK_SKIP_PIXELS */
+      1704, /* GL_UNPACK_ALIGNMENT */
+      1074, /* GL_PACK_SWAP_BYTES */
+      1069, /* GL_PACK_LSB_FIRST */
+      1070, /* GL_PACK_ROW_LENGTH */
+      1073, /* GL_PACK_SKIP_ROWS */
+      1072, /* GL_PACK_SKIP_PIXELS */
+      1066, /* GL_PACK_ALIGNMENT */
+       786, /* GL_MAP_COLOR */
+       787, /* GL_MAP_STENCIL */
+       630, /* GL_INDEX_SHIFT */
+       629, /* GL_INDEX_OFFSET */
+      1279, /* GL_RED_SCALE */
+      1277, /* GL_RED_BIAS */
+      1808, /* GL_ZOOM_X */
+      1809, /* GL_ZOOM_Y */
+       591, /* GL_GREEN_SCALE */
+       589, /* GL_GREEN_BIAS */
         91, /* GL_BLUE_SCALE */
         89, /* GL_BLUE_BIAS */
         42, /* GL_ALPHA_SCALE */
         40, /* GL_ALPHA_BIAS */
-       333, /* GL_DEPTH_SCALE */
-       314, /* GL_DEPTH_BIAS */
-       815, /* GL_MAX_EVAL_ORDER */
-       819, /* GL_MAX_LIGHTS */
-       798, /* GL_MAX_CLIP_PLANES */
-       863, /* GL_MAX_TEXTURE_SIZE */
-       825, /* GL_MAX_PIXEL_MAP_TABLE */
-       794, /* GL_MAX_ATTRIB_STACK_DEPTH */
-       822, /* GL_MAX_MODELVIEW_STACK_DEPTH */
-       823, /* GL_MAX_NAME_STACK_DEPTH */
-       851, /* GL_MAX_PROJECTION_STACK_DEPTH */
-       864, /* GL_MAX_TEXTURE_STACK_DEPTH */
-       878, /* GL_MAX_VIEWPORT_DIMS */
-       795, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
-      1431, /* GL_SUBPIXEL_BITS */
-       582, /* GL_INDEX_BITS */
-      1232, /* GL_RED_BITS */
-       548, /* GL_GREEN_BITS */
+       351, /* GL_DEPTH_SCALE */
+       332, /* GL_DEPTH_BIAS */
+       859, /* GL_MAX_EVAL_ORDER */
+       863, /* GL_MAX_LIGHTS */
+       842, /* GL_MAX_CLIP_PLANES */
+       908, /* GL_MAX_TEXTURE_SIZE */
+       869, /* GL_MAX_PIXEL_MAP_TABLE */
+       838, /* GL_MAX_ATTRIB_STACK_DEPTH */
+       866, /* GL_MAX_MODELVIEW_STACK_DEPTH */
+       867, /* GL_MAX_NAME_STACK_DEPTH */
+       895, /* GL_MAX_PROJECTION_STACK_DEPTH */
+       909, /* GL_MAX_TEXTURE_STACK_DEPTH */
+       923, /* GL_MAX_VIEWPORT_DIMS */
+       839, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
+      1490, /* GL_SUBPIXEL_BITS */
+       625, /* GL_INDEX_BITS */
+      1278, /* GL_RED_BITS */
+       590, /* GL_GREEN_BITS */
         90, /* GL_BLUE_BITS */
         41, /* GL_ALPHA_BITS */
-       315, /* GL_DEPTH_BITS */
-      1406, /* GL_STENCIL_BITS */
+       333, /* GL_DEPTH_BITS */
+      1465, /* GL_STENCIL_BITS */
         14, /* GL_ACCUM_RED_BITS */
         13, /* GL_ACCUM_GREEN_BITS */
         10, /* GL_ACCUM_BLUE_BITS */
          9, /* GL_ACCUM_ALPHA_BITS */
-       944, /* GL_NAME_STACK_DEPTH */
+       989, /* GL_NAME_STACK_DEPTH */
         61, /* GL_AUTO_NORMAL */
-       688, /* GL_MAP1_COLOR_4 */
-       691, /* GL_MAP1_INDEX */
-       692, /* GL_MAP1_NORMAL */
-       693, /* GL_MAP1_TEXTURE_COORD_1 */
-       694, /* GL_MAP1_TEXTURE_COORD_2 */
-       695, /* GL_MAP1_TEXTURE_COORD_3 */
-       696, /* GL_MAP1_TEXTURE_COORD_4 */
-       697, /* GL_MAP1_VERTEX_3 */
-       698, /* GL_MAP1_VERTEX_4 */
-       715, /* GL_MAP2_COLOR_4 */
-       718, /* GL_MAP2_INDEX */
-       719, /* GL_MAP2_NORMAL */
-       720, /* GL_MAP2_TEXTURE_COORD_1 */
-       721, /* GL_MAP2_TEXTURE_COORD_2 */
-       722, /* GL_MAP2_TEXTURE_COORD_3 */
-       723, /* GL_MAP2_TEXTURE_COORD_4 */
-       724, /* GL_MAP2_VERTEX_3 */
-       725, /* GL_MAP2_VERTEX_4 */
-       689, /* GL_MAP1_GRID_DOMAIN */
-       690, /* GL_MAP1_GRID_SEGMENTS */
-       716, /* GL_MAP2_GRID_DOMAIN */
-       717, /* GL_MAP2_GRID_SEGMENTS */
-      1508, /* GL_TEXTURE_1D */
-      1510, /* GL_TEXTURE_2D */
-       437, /* GL_FEEDBACK_BUFFER_POINTER */
-       438, /* GL_FEEDBACK_BUFFER_SIZE */
-       439, /* GL_FEEDBACK_BUFFER_TYPE */
-      1328, /* GL_SELECTION_BUFFER_POINTER */
-      1329, /* GL_SELECTION_BUFFER_SIZE */
-      1621, /* GL_TEXTURE_WIDTH */
-      1589, /* GL_TEXTURE_HEIGHT */
-      1545, /* GL_TEXTURE_COMPONENTS */
-      1529, /* GL_TEXTURE_BORDER_COLOR */
-      1528, /* GL_TEXTURE_BORDER */
-       344, /* GL_DONT_CARE */
-       435, /* GL_FASTEST */
-       952, /* GL_NICEST */
+       732, /* GL_MAP1_COLOR_4 */
+       735, /* GL_MAP1_INDEX */
+       736, /* GL_MAP1_NORMAL */
+       737, /* GL_MAP1_TEXTURE_COORD_1 */
+       738, /* GL_MAP1_TEXTURE_COORD_2 */
+       739, /* GL_MAP1_TEXTURE_COORD_3 */
+       740, /* GL_MAP1_TEXTURE_COORD_4 */
+       741, /* GL_MAP1_VERTEX_3 */
+       742, /* GL_MAP1_VERTEX_4 */
+       759, /* GL_MAP2_COLOR_4 */
+       762, /* GL_MAP2_INDEX */
+       763, /* GL_MAP2_NORMAL */
+       764, /* GL_MAP2_TEXTURE_COORD_1 */
+       765, /* GL_MAP2_TEXTURE_COORD_2 */
+       766, /* GL_MAP2_TEXTURE_COORD_3 */
+       767, /* GL_MAP2_TEXTURE_COORD_4 */
+       768, /* GL_MAP2_VERTEX_3 */
+       769, /* GL_MAP2_VERTEX_4 */
+       733, /* GL_MAP1_GRID_DOMAIN */
+       734, /* GL_MAP1_GRID_SEGMENTS */
+       760, /* GL_MAP2_GRID_DOMAIN */
+       761, /* GL_MAP2_GRID_SEGMENTS */
+      1567, /* GL_TEXTURE_1D */
+      1569, /* GL_TEXTURE_2D */
+       458, /* GL_FEEDBACK_BUFFER_POINTER */
+       459, /* GL_FEEDBACK_BUFFER_SIZE */
+       460, /* GL_FEEDBACK_BUFFER_TYPE */
+      1385, /* GL_SELECTION_BUFFER_POINTER */
+      1386, /* GL_SELECTION_BUFFER_SIZE */
+      1681, /* GL_TEXTURE_WIDTH */
+      1648, /* GL_TEXTURE_HEIGHT */
+      1604, /* GL_TEXTURE_COMPONENTS */
+      1588, /* GL_TEXTURE_BORDER_COLOR */
+      1587, /* GL_TEXTURE_BORDER */
+       364, /* GL_DONT_CARE */
+       456, /* GL_FASTEST */
+       997, /* GL_NICEST */
         47, /* GL_AMBIENT */
-       341, /* GL_DIFFUSE */
-      1371, /* GL_SPECULAR */
-      1111, /* GL_POSITION */
-      1374, /* GL_SPOT_DIRECTION */
-      1375, /* GL_SPOT_EXPONENT */
-      1373, /* GL_SPOT_CUTOFF */
-       244, /* GL_CONSTANT_ATTENUATION */
-       638, /* GL_LINEAR_ATTENUATION */
-      1208, /* GL_QUADRATIC_ATTENUATION */
-       218, /* GL_COMPILE */
-       219, /* GL_COMPILE_AND_EXECUTE */
+       361, /* GL_DIFFUSE */
+      1428, /* GL_SPECULAR */
+      1156, /* GL_POSITION */
+      1431, /* GL_SPOT_DIRECTION */
+      1432, /* GL_SPOT_EXPONENT */
+      1430, /* GL_SPOT_CUTOFF */
+       260, /* GL_CONSTANT_ATTENUATION */
+       682, /* GL_LINEAR_ATTENUATION */
+      1253, /* GL_QUADRATIC_ATTENUATION */
+       234, /* GL_COMPILE */
+       235, /* GL_COMPILE_AND_EXECUTE */
        110, /* GL_BYTE */
-      1652, /* GL_UNSIGNED_BYTE */
-      1342, /* GL_SHORT */
-      1661, /* GL_UNSIGNED_SHORT */
-       590, /* GL_INT */
-      1655, /* GL_UNSIGNED_INT */
-       442, /* GL_FLOAT */
+      1712, /* GL_UNSIGNED_BYTE */
+      1399, /* GL_SHORT */
+      1723, /* GL_UNSIGNED_SHORT */
+       633, /* GL_INT */
+      1715, /* GL_UNSIGNED_INT */
+       463, /* GL_FLOAT */
          1, /* GL_2_BYTES */
          5, /* GL_3_BYTES */
          7, /* GL_4_BYTES */
-       351, /* GL_DOUBLE */
+       371, /* GL_DOUBLE */
        122, /* GL_CLEAR */
         49, /* GL_AND */
         51, /* GL_AND_REVERSE */
-       268, /* GL_COPY */
+       284, /* GL_COPY */
         50, /* GL_AND_INVERTED */
-       954, /* GL_NOOP */
-      1742, /* GL_XOR */
-      1016, /* GL_OR */
-       955, /* GL_NOR */
-       425, /* GL_EQUIV */
-       616, /* GL_INVERT */
-      1019, /* GL_OR_REVERSE */
-       269, /* GL_COPY_INVERTED */
-      1018, /* GL_OR_INVERTED */
-       945, /* GL_NAND */
-      1333, /* GL_SET */
-       422, /* GL_EMISSION */
-      1341, /* GL_SHININESS */
+       999, /* GL_NOOP */
+      1804, /* GL_XOR */
+      1061, /* GL_OR */
+      1000, /* GL_NOR */
+       446, /* GL_EQUIV */
+       660, /* GL_INVERT */
+      1064, /* GL_OR_REVERSE */
+       285, /* GL_COPY_INVERTED */
+      1063, /* GL_OR_INVERTED */
+       990, /* GL_NAND */
+      1390, /* GL_SET */
+       443, /* GL_EMISSION */
+      1398, /* GL_SHININESS */
         48, /* GL_AMBIENT_AND_DIFFUSE */
-       164, /* GL_COLOR_INDEXES */
-       895, /* GL_MODELVIEW */
-      1187, /* GL_PROJECTION */
-      1443, /* GL_TEXTURE */
+       180, /* GL_COLOR_INDEXES */
+       940, /* GL_MODELVIEW */
+      1232, /* GL_PROJECTION */
+      1502, /* GL_TEXTURE */
        137, /* GL_COLOR */
-       312, /* GL_DEPTH */
-      1393, /* GL_STENCIL */
-       163, /* GL_COLOR_INDEX */
-      1411, /* GL_STENCIL_INDEX */
-       321, /* GL_DEPTH_COMPONENT */
-      1228, /* GL_RED */
-       546, /* GL_GREEN */
+       328, /* GL_DEPTH */
+      1451, /* GL_STENCIL */
+       179, /* GL_COLOR_INDEX */
+      1470, /* GL_STENCIL_INDEX */
+       339, /* GL_DEPTH_COMPONENT */
+      1274, /* GL_RED */
+       588, /* GL_GREEN */
         88, /* GL_BLUE */
         31, /* GL_ALPHA */
-      1252, /* GL_RGB */
-      1271, /* GL_RGBA */
-       666, /* GL_LUMINANCE */
-       687, /* GL_LUMINANCE_ALPHA */
+      1309, /* GL_RGB */
+      1328, /* GL_RGBA */
+       710, /* GL_LUMINANCE */
+       731, /* GL_LUMINANCE_ALPHA */
         72, /* GL_BITMAP */
-      1067, /* GL_POINT */
-       636, /* GL_LINE */
-       440, /* GL_FILL */
-      1237, /* GL_RENDER */
-       436, /* GL_FEEDBACK */
-      1327, /* GL_SELECT */
-       441, /* GL_FLAT */
-      1346, /* GL_SMOOTH */
-       617, /* GL_KEEP */
-      1246, /* GL_REPLACE */
-       573, /* GL_INCR */
-       308, /* GL_DECR */
-      1676, /* GL_VENDOR */
-      1243, /* GL_RENDERER */
-      1677, /* GL_VERSION */
-       429, /* GL_EXTENSIONS */
-      1292, /* GL_S */
-      1434, /* GL_T */
-      1218, /* GL_R */
-      1207, /* GL_Q */
-       931, /* GL_MODULATE */
-       307, /* GL_DECAL */
-      1579, /* GL_TEXTURE_ENV_MODE */
-      1578, /* GL_TEXTURE_ENV_COLOR */
-      1577, /* GL_TEXTURE_ENV */
-       430, /* GL_EYE_LINEAR */
-       978, /* GL_OBJECT_LINEAR */
-      1372, /* GL_SPHERE_MAP */
-      1581, /* GL_TEXTURE_GEN_MODE */
-       980, /* GL_OBJECT_PLANE */
-       431, /* GL_EYE_PLANE */
-       946, /* GL_NEAREST */
-       637, /* GL_LINEAR */
-       950, /* GL_NEAREST_MIPMAP_NEAREST */
-       642, /* GL_LINEAR_MIPMAP_NEAREST */
-       949, /* GL_NEAREST_MIPMAP_LINEAR */
-       641, /* GL_LINEAR_MIPMAP_LINEAR */
-      1602, /* GL_TEXTURE_MAG_FILTER */
-      1610, /* GL_TEXTURE_MIN_FILTER */
-      1623, /* GL_TEXTURE_WRAP_S */
-      1624, /* GL_TEXTURE_WRAP_T */
+      1112, /* GL_POINT */
+       680, /* GL_LINE */
+       461, /* GL_FILL */
+      1283, /* GL_RENDER */
+       457, /* GL_FEEDBACK */
+      1384, /* GL_SELECT */
+       462, /* GL_FLAT */
+      1403, /* GL_SMOOTH */
+       661, /* GL_KEEP */
+      1303, /* GL_REPLACE */
+       615, /* GL_INCR */
+       324, /* GL_DECR */
+      1738, /* GL_VENDOR */
+      1300, /* GL_RENDERER */
+      1739, /* GL_VERSION */
+       450, /* GL_EXTENSIONS */
+      1349, /* GL_S */
+      1493, /* GL_T */
+      1263, /* GL_R */
+      1252, /* GL_Q */
+       976, /* GL_MODULATE */
+       323, /* GL_DECAL */
+      1638, /* GL_TEXTURE_ENV_MODE */
+      1637, /* GL_TEXTURE_ENV_COLOR */
+      1636, /* GL_TEXTURE_ENV */
+       451, /* GL_EYE_LINEAR */
+      1023, /* GL_OBJECT_LINEAR */
+      1429, /* GL_SPHERE_MAP */
+      1640, /* GL_TEXTURE_GEN_MODE */
+      1025, /* GL_OBJECT_PLANE */
+       452, /* GL_EYE_PLANE */
+       991, /* GL_NEAREST */
+       681, /* GL_LINEAR */
+       995, /* GL_NEAREST_MIPMAP_NEAREST */
+       686, /* GL_LINEAR_MIPMAP_NEAREST */
+       994, /* GL_NEAREST_MIPMAP_LINEAR */
+       685, /* GL_LINEAR_MIPMAP_LINEAR */
+      1661, /* GL_TEXTURE_MAG_FILTER */
+      1669, /* GL_TEXTURE_MIN_FILTER */
+      1683, /* GL_TEXTURE_WRAP_S */
+      1684, /* GL_TEXTURE_WRAP_T */
        116, /* GL_CLAMP */
-      1245, /* GL_REPEAT */
-      1105, /* GL_POLYGON_OFFSET_UNITS */
-      1104, /* GL_POLYGON_OFFSET_POINT */
-      1103, /* GL_POLYGON_OFFSET_LINE */
-      1219, /* GL_R3_G3_B2 */
-      1673, /* GL_V2F */
-      1674, /* GL_V3F */
+      1302, /* GL_REPEAT */
+      1150, /* GL_POLYGON_OFFSET_UNITS */
+      1149, /* GL_POLYGON_OFFSET_POINT */
+      1148, /* GL_POLYGON_OFFSET_LINE */
+      1264, /* GL_R3_G3_B2 */
+      1735, /* GL_V2F */
+      1736, /* GL_V3F */
        113, /* GL_C4UB_V2F */
        114, /* GL_C4UB_V3F */
        111, /* GL_C3F_V3F */
-       943, /* GL_N3F_V3F */
+       988, /* GL_N3F_V3F */
        112, /* GL_C4F_N3F_V3F */
-      1439, /* GL_T2F_V3F */
-      1441, /* GL_T4F_V4F */
-      1437, /* GL_T2F_C4UB_V3F */
-      1435, /* GL_T2F_C3F_V3F */
-      1438, /* GL_T2F_N3F_V3F */
-      1436, /* GL_T2F_C4F_N3F_V3F */
-      1440, /* GL_T4F_C4F_N3F_V4F */
+      1498, /* GL_T2F_V3F */
+      1500, /* GL_T4F_V4F */
+      1496, /* GL_T2F_C4UB_V3F */
+      1494, /* GL_T2F_C3F_V3F */
+      1497, /* GL_T2F_N3F_V3F */
+      1495, /* GL_T2F_C4F_N3F_V3F */
+      1499, /* GL_T4F_C4F_N3F_V4F */
        129, /* GL_CLIP_PLANE0 */
        130, /* GL_CLIP_PLANE1 */
        131, /* GL_CLIP_PLANE2 */
        132, /* GL_CLIP_PLANE3 */
        133, /* GL_CLIP_PLANE4 */
        134, /* GL_CLIP_PLANE5 */
-       621, /* GL_LIGHT0 */
-       622, /* GL_LIGHT1 */
-       623, /* GL_LIGHT2 */
-       624, /* GL_LIGHT3 */
-       625, /* GL_LIGHT4 */
-       626, /* GL_LIGHT5 */
-       627, /* GL_LIGHT6 */
-       628, /* GL_LIGHT7 */
-       550, /* GL_HINT_BIT */
-       246, /* GL_CONSTANT_COLOR */
-       990, /* GL_ONE_MINUS_CONSTANT_COLOR */
-       241, /* GL_CONSTANT_ALPHA */
-       988, /* GL_ONE_MINUS_CONSTANT_ALPHA */
+       665, /* GL_LIGHT0 */
+       666, /* GL_LIGHT1 */
+       667, /* GL_LIGHT2 */
+       668, /* GL_LIGHT3 */
+       669, /* GL_LIGHT4 */
+       670, /* GL_LIGHT5 */
+       671, /* GL_LIGHT6 */
+       672, /* GL_LIGHT7 */
+       592, /* GL_HINT_BIT */
+       262, /* GL_CONSTANT_COLOR */
+      1035, /* GL_ONE_MINUS_CONSTANT_COLOR */
+       257, /* GL_CONSTANT_ALPHA */
+      1033, /* GL_ONE_MINUS_CONSTANT_ALPHA */
         75, /* GL_BLEND_COLOR */
-       510, /* GL_FUNC_ADD */
-       879, /* GL_MIN */
-       791, /* GL_MAX */
+       552, /* GL_FUNC_ADD */
+       924, /* GL_MIN */
+       835, /* GL_MAX */
         80, /* GL_BLEND_EQUATION */
-       514, /* GL_FUNC_SUBTRACT */
-       512, /* GL_FUNC_REVERSE_SUBTRACT */
-       249, /* GL_CONVOLUTION_1D */
-       250, /* GL_CONVOLUTION_2D */
-      1330, /* GL_SEPARABLE_2D */
-       253, /* GL_CONVOLUTION_BORDER_MODE */
-       257, /* GL_CONVOLUTION_FILTER_SCALE */
-       255, /* GL_CONVOLUTION_FILTER_BIAS */
-      1229, /* GL_REDUCE */
-       259, /* GL_CONVOLUTION_FORMAT */
-       263, /* GL_CONVOLUTION_WIDTH */
-       261, /* GL_CONVOLUTION_HEIGHT */
-       806, /* GL_MAX_CONVOLUTION_WIDTH */
-       804, /* GL_MAX_CONVOLUTION_HEIGHT */
-      1144, /* GL_POST_CONVOLUTION_RED_SCALE */
-      1140, /* GL_POST_CONVOLUTION_GREEN_SCALE */
-      1135, /* GL_POST_CONVOLUTION_BLUE_SCALE */
-      1131, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
-      1142, /* GL_POST_CONVOLUTION_RED_BIAS */
-      1138, /* GL_POST_CONVOLUTION_GREEN_BIAS */
-      1133, /* GL_POST_CONVOLUTION_BLUE_BIAS */
-      1129, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
-       551, /* GL_HISTOGRAM */
-      1191, /* GL_PROXY_HISTOGRAM */
-       567, /* GL_HISTOGRAM_WIDTH */
-       557, /* GL_HISTOGRAM_FORMAT */
-       563, /* GL_HISTOGRAM_RED_SIZE */
-       559, /* GL_HISTOGRAM_GREEN_SIZE */
-       554, /* GL_HISTOGRAM_BLUE_SIZE */
-       552, /* GL_HISTOGRAM_ALPHA_SIZE */
-       561, /* GL_HISTOGRAM_LUMINANCE_SIZE */
-       565, /* GL_HISTOGRAM_SINK */
-       880, /* GL_MINMAX */
-       882, /* GL_MINMAX_FORMAT */
-       884, /* GL_MINMAX_SINK */
-      1442, /* GL_TABLE_TOO_LARGE_EXT */
-      1654, /* GL_UNSIGNED_BYTE_3_3_2 */
-      1663, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-      1665, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-      1659, /* GL_UNSIGNED_INT_8_8_8_8 */
-      1656, /* GL_UNSIGNED_INT_10_10_10_2 */
-      1102, /* GL_POLYGON_OFFSET_FILL */
-      1101, /* GL_POLYGON_OFFSET_FACTOR */
-      1100, /* GL_POLYGON_OFFSET_BIAS */
-      1249, /* GL_RESCALE_NORMAL */
+       556, /* GL_FUNC_SUBTRACT */
+       554, /* GL_FUNC_REVERSE_SUBTRACT */
+       265, /* GL_CONVOLUTION_1D */
+       266, /* GL_CONVOLUTION_2D */
+      1387, /* GL_SEPARABLE_2D */
+       269, /* GL_CONVOLUTION_BORDER_MODE */
+       273, /* GL_CONVOLUTION_FILTER_SCALE */
+       271, /* GL_CONVOLUTION_FILTER_BIAS */
+      1275, /* GL_REDUCE */
+       275, /* GL_CONVOLUTION_FORMAT */
+       279, /* GL_CONVOLUTION_WIDTH */
+       277, /* GL_CONVOLUTION_HEIGHT */
+       850, /* GL_MAX_CONVOLUTION_WIDTH */
+       848, /* GL_MAX_CONVOLUTION_HEIGHT */
+      1189, /* GL_POST_CONVOLUTION_RED_SCALE */
+      1185, /* GL_POST_CONVOLUTION_GREEN_SCALE */
+      1180, /* GL_POST_CONVOLUTION_BLUE_SCALE */
+      1176, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
+      1187, /* GL_POST_CONVOLUTION_RED_BIAS */
+      1183, /* GL_POST_CONVOLUTION_GREEN_BIAS */
+      1178, /* GL_POST_CONVOLUTION_BLUE_BIAS */
+      1174, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
+       593, /* GL_HISTOGRAM */
+      1236, /* GL_PROXY_HISTOGRAM */
+       609, /* GL_HISTOGRAM_WIDTH */
+       599, /* GL_HISTOGRAM_FORMAT */
+       605, /* GL_HISTOGRAM_RED_SIZE */
+       601, /* GL_HISTOGRAM_GREEN_SIZE */
+       596, /* GL_HISTOGRAM_BLUE_SIZE */
+       594, /* GL_HISTOGRAM_ALPHA_SIZE */
+       603, /* GL_HISTOGRAM_LUMINANCE_SIZE */
+       607, /* GL_HISTOGRAM_SINK */
+       925, /* GL_MINMAX */
+       927, /* GL_MINMAX_FORMAT */
+       929, /* GL_MINMAX_SINK */
+      1501, /* GL_TABLE_TOO_LARGE_EXT */
+      1714, /* GL_UNSIGNED_BYTE_3_3_2 */
+      1725, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+      1727, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+      1720, /* GL_UNSIGNED_INT_8_8_8_8 */
+      1716, /* GL_UNSIGNED_INT_10_10_10_2 */
+      1147, /* GL_POLYGON_OFFSET_FILL */
+      1146, /* GL_POLYGON_OFFSET_FACTOR */
+      1145, /* GL_POLYGON_OFFSET_BIAS */
+      1306, /* GL_RESCALE_NORMAL */
         36, /* GL_ALPHA4 */
         38, /* GL_ALPHA8 */
         32, /* GL_ALPHA12 */
         34, /* GL_ALPHA16 */
-       677, /* GL_LUMINANCE4 */
-       683, /* GL_LUMINANCE8 */
-       667, /* GL_LUMINANCE12 */
-       673, /* GL_LUMINANCE16 */
-       678, /* GL_LUMINANCE4_ALPHA4 */
-       681, /* GL_LUMINANCE6_ALPHA2 */
-       684, /* GL_LUMINANCE8_ALPHA8 */
-       670, /* GL_LUMINANCE12_ALPHA4 */
-       668, /* GL_LUMINANCE12_ALPHA12 */
-       674, /* GL_LUMINANCE16_ALPHA16 */
-       591, /* GL_INTENSITY */
-       596, /* GL_INTENSITY4 */
-       598, /* GL_INTENSITY8 */
-       592, /* GL_INTENSITY12 */
-       594, /* GL_INTENSITY16 */
-      1261, /* GL_RGB2_EXT */
-      1262, /* GL_RGB4 */
-      1265, /* GL_RGB5 */
-      1269, /* GL_RGB8 */
-      1253, /* GL_RGB10 */
-      1257, /* GL_RGB12 */
-      1259, /* GL_RGB16 */
-      1276, /* GL_RGBA2 */
-      1278, /* GL_RGBA4 */
-      1266, /* GL_RGB5_A1 */
-      1282, /* GL_RGBA8 */
-      1254, /* GL_RGB10_A2 */
-      1272, /* GL_RGBA12 */
-      1274, /* GL_RGBA16 */
-      1615, /* GL_TEXTURE_RED_SIZE */
-      1587, /* GL_TEXTURE_GREEN_SIZE */
-      1526, /* GL_TEXTURE_BLUE_SIZE */
-      1513, /* GL_TEXTURE_ALPHA_SIZE */
-      1600, /* GL_TEXTURE_LUMINANCE_SIZE */
-      1591, /* GL_TEXTURE_INTENSITY_SIZE */
-      1247, /* GL_REPLACE_EXT */
-      1195, /* GL_PROXY_TEXTURE_1D */
-      1198, /* GL_PROXY_TEXTURE_2D */
-      1619, /* GL_TEXTURE_TOO_LARGE_EXT */
-      1612, /* GL_TEXTURE_PRIORITY */
-      1617, /* GL_TEXTURE_RESIDENT */
-      1516, /* GL_TEXTURE_BINDING_1D */
-      1518, /* GL_TEXTURE_BINDING_2D */
-      1520, /* GL_TEXTURE_BINDING_3D */
-      1026, /* GL_PACK_SKIP_IMAGES */
-      1022, /* GL_PACK_IMAGE_HEIGHT */
-      1648, /* GL_UNPACK_SKIP_IMAGES */
-      1645, /* GL_UNPACK_IMAGE_HEIGHT */
-      1512, /* GL_TEXTURE_3D */
-      1201, /* GL_PROXY_TEXTURE_3D */
-      1574, /* GL_TEXTURE_DEPTH */
-      1622, /* GL_TEXTURE_WRAP_R */
-       792, /* GL_MAX_3D_TEXTURE_SIZE */
-      1678, /* GL_VERTEX_ARRAY */
-       957, /* GL_NORMAL_ARRAY */
+       721, /* GL_LUMINANCE4 */
+       727, /* GL_LUMINANCE8 */
+       711, /* GL_LUMINANCE12 */
+       717, /* GL_LUMINANCE16 */
+       722, /* GL_LUMINANCE4_ALPHA4 */
+       725, /* GL_LUMINANCE6_ALPHA2 */
+       728, /* GL_LUMINANCE8_ALPHA8 */
+       714, /* GL_LUMINANCE12_ALPHA4 */
+       712, /* GL_LUMINANCE12_ALPHA12 */
+       718, /* GL_LUMINANCE16_ALPHA16 */
+       634, /* GL_INTENSITY */
+       639, /* GL_INTENSITY4 */
+       641, /* GL_INTENSITY8 */
+       635, /* GL_INTENSITY12 */
+       637, /* GL_INTENSITY16 */
+      1318, /* GL_RGB2_EXT */
+      1319, /* GL_RGB4 */
+      1322, /* GL_RGB5 */
+      1326, /* GL_RGB8 */
+      1310, /* GL_RGB10 */
+      1314, /* GL_RGB12 */
+      1316, /* GL_RGB16 */
+      1333, /* GL_RGBA2 */
+      1335, /* GL_RGBA4 */
+      1323, /* GL_RGB5_A1 */
+      1339, /* GL_RGBA8 */
+      1311, /* GL_RGB10_A2 */
+      1329, /* GL_RGBA12 */
+      1331, /* GL_RGBA16 */
+      1674, /* GL_TEXTURE_RED_SIZE */
+      1646, /* GL_TEXTURE_GREEN_SIZE */
+      1585, /* GL_TEXTURE_BLUE_SIZE */
+      1572, /* GL_TEXTURE_ALPHA_SIZE */
+      1659, /* GL_TEXTURE_LUMINANCE_SIZE */
+      1650, /* GL_TEXTURE_INTENSITY_SIZE */
+      1304, /* GL_REPLACE_EXT */
+      1240, /* GL_PROXY_TEXTURE_1D */
+      1243, /* GL_PROXY_TEXTURE_2D */
+      1679, /* GL_TEXTURE_TOO_LARGE_EXT */
+      1671, /* GL_TEXTURE_PRIORITY */
+      1676, /* GL_TEXTURE_RESIDENT */
+      1575, /* GL_TEXTURE_BINDING_1D */
+      1577, /* GL_TEXTURE_BINDING_2D */
+      1579, /* GL_TEXTURE_BINDING_3D */
+      1071, /* GL_PACK_SKIP_IMAGES */
+      1067, /* GL_PACK_IMAGE_HEIGHT */
+      1708, /* GL_UNPACK_SKIP_IMAGES */
+      1705, /* GL_UNPACK_IMAGE_HEIGHT */
+      1571, /* GL_TEXTURE_3D */
+      1246, /* GL_PROXY_TEXTURE_3D */
+      1633, /* GL_TEXTURE_DEPTH */
+      1682, /* GL_TEXTURE_WRAP_R */
+       836, /* GL_MAX_3D_TEXTURE_SIZE */
+      1740, /* GL_VERTEX_ARRAY */
+      1002, /* GL_NORMAL_ARRAY */
        138, /* GL_COLOR_ARRAY */
-       576, /* GL_INDEX_ARRAY */
-      1553, /* GL_TEXTURE_COORD_ARRAY */
-       414, /* GL_EDGE_FLAG_ARRAY */
-      1683, /* GL_VERTEX_ARRAY_SIZE */
-      1685, /* GL_VERTEX_ARRAY_TYPE */
-      1684, /* GL_VERTEX_ARRAY_STRIDE */
-       962, /* GL_NORMAL_ARRAY_TYPE */
-       961, /* GL_NORMAL_ARRAY_STRIDE */
+       619, /* GL_INDEX_ARRAY */
+      1612, /* GL_TEXTURE_COORD_ARRAY */
+       435, /* GL_EDGE_FLAG_ARRAY */
+      1745, /* GL_VERTEX_ARRAY_SIZE */
+      1747, /* GL_VERTEX_ARRAY_TYPE */
+      1746, /* GL_VERTEX_ARRAY_STRIDE */
+      1007, /* GL_NORMAL_ARRAY_TYPE */
+      1006, /* GL_NORMAL_ARRAY_STRIDE */
        142, /* GL_COLOR_ARRAY_SIZE */
        144, /* GL_COLOR_ARRAY_TYPE */
        143, /* GL_COLOR_ARRAY_STRIDE */
-       581, /* GL_INDEX_ARRAY_TYPE */
-       580, /* GL_INDEX_ARRAY_STRIDE */
-      1557, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-      1559, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-      1558, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
-       418, /* GL_EDGE_FLAG_ARRAY_STRIDE */
-      1682, /* GL_VERTEX_ARRAY_POINTER */
-       960, /* GL_NORMAL_ARRAY_POINTER */
+       624, /* GL_INDEX_ARRAY_TYPE */
+       623, /* GL_INDEX_ARRAY_STRIDE */
+      1616, /* GL_TEXTURE_COORD_ARRAY_SIZE */
+      1618, /* GL_TEXTURE_COORD_ARRAY_TYPE */
+      1617, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
+       439, /* GL_EDGE_FLAG_ARRAY_STRIDE */
+      1744, /* GL_VERTEX_ARRAY_POINTER */
+      1005, /* GL_NORMAL_ARRAY_POINTER */
        141, /* GL_COLOR_ARRAY_POINTER */
-       579, /* GL_INDEX_ARRAY_POINTER */
-      1556, /* GL_TEXTURE_COORD_ARRAY_POINTER */
-       417, /* GL_EDGE_FLAG_ARRAY_POINTER */
-       936, /* GL_MULTISAMPLE */
-      1304, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
-      1306, /* GL_SAMPLE_ALPHA_TO_ONE */
-      1311, /* GL_SAMPLE_COVERAGE */
-      1308, /* GL_SAMPLE_BUFFERS */
-      1299, /* GL_SAMPLES */
-      1315, /* GL_SAMPLE_COVERAGE_VALUE */
-      1313, /* GL_SAMPLE_COVERAGE_INVERT */
-       169, /* GL_COLOR_MATRIX */
-       171, /* GL_COLOR_MATRIX_STACK_DEPTH */
-       800, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
-      1127, /* GL_POST_COLOR_MATRIX_RED_SCALE */
-      1123, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
-      1118, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
-      1114, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
-      1125, /* GL_POST_COLOR_MATRIX_RED_BIAS */
-      1121, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
-      1116, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
-      1112, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
-      1536, /* GL_TEXTURE_COLOR_TABLE_SGI */
-      1202, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
-      1538, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+       622, /* GL_INDEX_ARRAY_POINTER */
+      1615, /* GL_TEXTURE_COORD_ARRAY_POINTER */
+       438, /* GL_EDGE_FLAG_ARRAY_POINTER */
+       981, /* GL_MULTISAMPLE */
+      1361, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
+      1363, /* GL_SAMPLE_ALPHA_TO_ONE */
+      1368, /* GL_SAMPLE_COVERAGE */
+      1365, /* GL_SAMPLE_BUFFERS */
+      1356, /* GL_SAMPLES */
+      1372, /* GL_SAMPLE_COVERAGE_VALUE */
+      1370, /* GL_SAMPLE_COVERAGE_INVERT */
+       185, /* GL_COLOR_MATRIX */
+       187, /* GL_COLOR_MATRIX_STACK_DEPTH */
+       844, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
+      1172, /* GL_POST_COLOR_MATRIX_RED_SCALE */
+      1168, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
+      1163, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
+      1159, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
+      1170, /* GL_POST_COLOR_MATRIX_RED_BIAS */
+      1166, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
+      1161, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
+      1157, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
+      1595, /* GL_TEXTURE_COLOR_TABLE_SGI */
+      1247, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
+      1597, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
         79, /* GL_BLEND_DST_RGB */
         87, /* GL_BLEND_SRC_RGB */
         78, /* GL_BLEND_DST_ALPHA */
         86, /* GL_BLEND_SRC_ALPHA */
-       175, /* GL_COLOR_TABLE */
-      1137, /* GL_POST_CONVOLUTION_COLOR_TABLE */
-      1120, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
-      1190, /* GL_PROXY_COLOR_TABLE */
-      1194, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
-      1193, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
-       199, /* GL_COLOR_TABLE_SCALE */
-       179, /* GL_COLOR_TABLE_BIAS */
-       184, /* GL_COLOR_TABLE_FORMAT */
-       201, /* GL_COLOR_TABLE_WIDTH */
-       196, /* GL_COLOR_TABLE_RED_SIZE */
-       187, /* GL_COLOR_TABLE_GREEN_SIZE */
-       181, /* GL_COLOR_TABLE_BLUE_SIZE */
-       176, /* GL_COLOR_TABLE_ALPHA_SIZE */
-       193, /* GL_COLOR_TABLE_LUMINANCE_SIZE */
-       190, /* GL_COLOR_TABLE_INTENSITY_SIZE */
+       191, /* GL_COLOR_TABLE */
+      1182, /* GL_POST_CONVOLUTION_COLOR_TABLE */
+      1165, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
+      1235, /* GL_PROXY_COLOR_TABLE */
+      1239, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
+      1238, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
+       215, /* GL_COLOR_TABLE_SCALE */
+       195, /* GL_COLOR_TABLE_BIAS */
+       200, /* GL_COLOR_TABLE_FORMAT */
+       217, /* GL_COLOR_TABLE_WIDTH */
+       212, /* GL_COLOR_TABLE_RED_SIZE */
+       203, /* GL_COLOR_TABLE_GREEN_SIZE */
+       197, /* GL_COLOR_TABLE_BLUE_SIZE */
+       192, /* GL_COLOR_TABLE_ALPHA_SIZE */
+       209, /* GL_COLOR_TABLE_LUMINANCE_SIZE */
+       206, /* GL_COLOR_TABLE_INTENSITY_SIZE */
         70, /* GL_BGR */
         71, /* GL_BGRA */
-       814, /* GL_MAX_ELEMENTS_VERTICES */
-       813, /* GL_MAX_ELEMENTS_INDICES */
-      1590, /* GL_TEXTURE_INDEX_SIZE_EXT */
+       858, /* GL_MAX_ELEMENTS_VERTICES */
+       857, /* GL_MAX_ELEMENTS_INDICES */
+      1649, /* GL_TEXTURE_INDEX_SIZE_EXT */
        135, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
-      1084, /* GL_POINT_SIZE_MIN */
-      1080, /* GL_POINT_SIZE_MAX */
-      1074, /* GL_POINT_FADE_THRESHOLD_SIZE */
-      1070, /* GL_POINT_DISTANCE_ATTENUATION */
+      1129, /* GL_POINT_SIZE_MIN */
+      1125, /* GL_POINT_SIZE_MAX */
+      1119, /* GL_POINT_FADE_THRESHOLD_SIZE */
+      1115, /* GL_POINT_DISTANCE_ATTENUATION */
        117, /* GL_CLAMP_TO_BORDER */
        120, /* GL_CLAMP_TO_EDGE */
-      1611, /* GL_TEXTURE_MIN_LOD */
-      1609, /* GL_TEXTURE_MAX_LOD */
-      1515, /* GL_TEXTURE_BASE_LEVEL */
-      1608, /* GL_TEXTURE_MAX_LEVEL */
-       570, /* GL_IGNORE_BORDER_HP */
-       245, /* GL_CONSTANT_BORDER_HP */
-      1248, /* GL_REPLICATE_BORDER_HP */
-       251, /* GL_CONVOLUTION_BORDER_COLOR */
-       985, /* GL_OCCLUSION_TEST_HP */
-       986, /* GL_OCCLUSION_TEST_RESULT_HP */
-       639, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
-      1530, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-      1532, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-      1534, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-      1535, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-      1533, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-      1531, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
-       796, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
-       797, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-      1147, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
-      1149, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
-      1146, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
-      1148, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
-      1598, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-      1599, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-      1597, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
-       516, /* GL_GENERATE_MIPMAP */
-       517, /* GL_GENERATE_MIPMAP_HINT */
-       479, /* GL_FOG_OFFSET_SGIX */
-       480, /* GL_FOG_OFFSET_VALUE_SGIX */
-      1544, /* GL_TEXTURE_COMPARE_SGIX */
-      1543, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-      1594, /* GL_TEXTURE_LEQUAL_R_SGIX */
-      1586, /* GL_TEXTURE_GEQUAL_R_SGIX */
-       322, /* GL_DEPTH_COMPONENT16 */
-       325, /* GL_DEPTH_COMPONENT24 */
-       328, /* GL_DEPTH_COMPONENT32 */
-       273, /* GL_CULL_VERTEX_EXT */
-       275, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
-       274, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
-      1739, /* GL_WRAP_BORDER_SUN */
-      1537, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
-       632, /* GL_LIGHT_MODEL_COLOR_CONTROL */
-      1343, /* GL_SINGLE_COLOR */
-      1331, /* GL_SEPARATE_SPECULAR_COLOR */
-      1340, /* GL_SHARED_TEXTURE_PALETTE_EXT */
-      1653, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-      1666, /* GL_UNSIGNED_SHORT_5_6_5 */
-      1667, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-      1664, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-      1662, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-      1660, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-      1658, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-      1606, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-      1607, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-      1605, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
-       887, /* GL_MIRRORED_REPEAT */
-      1287, /* GL_RGB_S3TC */
-      1264, /* GL_RGB4_S3TC */
-      1286, /* GL_RGBA_S3TC */
-      1281, /* GL_RGBA4_S3TC */
-      1284, /* GL_RGBA_DXT5_S3TC */
-      1279, /* GL_RGBA4_DXT5_S3TC */
-       238, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
-       233, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
-       234, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
-       235, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */
-       948, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
-       947, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
-       640, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
-       466, /* GL_FOG_COORDINATE_SOURCE */
-       458, /* GL_FOG_COORD */
-       482, /* GL_FRAGMENT_DEPTH */
-       279, /* GL_CURRENT_FOG_COORD */
-       465, /* GL_FOG_COORDINATE_ARRAY_TYPE */
-       464, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
-       463, /* GL_FOG_COORDINATE_ARRAY_POINTER */
-       460, /* GL_FOG_COORDINATE_ARRAY */
-       173, /* GL_COLOR_SUM */
-       298, /* GL_CURRENT_SECONDARY_COLOR */
-      1324, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
-      1326, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
-      1325, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
-      1323, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
-      1320, /* GL_SECONDARY_COLOR_ARRAY */
-       526, /* GL_GL_CURRENT_RASTER_SECONDARY_COLOR */
+      1670, /* GL_TEXTURE_MIN_LOD */
+      1668, /* GL_TEXTURE_MAX_LOD */
+      1574, /* GL_TEXTURE_BASE_LEVEL */
+      1667, /* GL_TEXTURE_MAX_LEVEL */
+       612, /* GL_IGNORE_BORDER_HP */
+       261, /* GL_CONSTANT_BORDER_HP */
+      1305, /* GL_REPLICATE_BORDER_HP */
+       267, /* GL_CONVOLUTION_BORDER_COLOR */
+      1030, /* GL_OCCLUSION_TEST_HP */
+      1031, /* GL_OCCLUSION_TEST_RESULT_HP */
+       683, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
+      1589, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
+      1591, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
+      1593, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
+      1594, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+      1592, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
+      1590, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
+       840, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
+       841, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+      1192, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
+      1194, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
+      1191, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
+      1193, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
+      1657, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+      1658, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+      1656, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+       558, /* GL_GENERATE_MIPMAP */
+       559, /* GL_GENERATE_MIPMAP_HINT */
+       500, /* GL_FOG_OFFSET_SGIX */
+       501, /* GL_FOG_OFFSET_VALUE_SGIX */
+      1603, /* GL_TEXTURE_COMPARE_SGIX */
+      1602, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
+      1653, /* GL_TEXTURE_LEQUAL_R_SGIX */
+      1645, /* GL_TEXTURE_GEQUAL_R_SGIX */
+       340, /* GL_DEPTH_COMPONENT16 */
+       343, /* GL_DEPTH_COMPONENT24 */
+       346, /* GL_DEPTH_COMPONENT32 */
+       289, /* GL_CULL_VERTEX_EXT */
+       291, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
+       290, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
+      1801, /* GL_WRAP_BORDER_SUN */
+      1596, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
+       676, /* GL_LIGHT_MODEL_COLOR_CONTROL */
+      1400, /* GL_SINGLE_COLOR */
+      1388, /* GL_SEPARATE_SPECULAR_COLOR */
+      1397, /* GL_SHARED_TEXTURE_PALETTE_EXT */
+       511, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
+       512, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
+       519, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
+       514, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
+       510, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
+       509, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
+       513, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
+       520, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
+       531, /* GL_FRAMEBUFFER_DEFAULT */
+       544, /* GL_FRAMEBUFFER_UNDEFINED */
+       353, /* GL_DEPTH_STENCIL_ATTACHMENT */
+       618, /* GL_INDEX */
+      1713, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+      1728, /* GL_UNSIGNED_SHORT_5_6_5 */
+      1729, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+      1726, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+      1724, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+      1721, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+      1719, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+      1665, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+      1666, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+      1664, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+       932, /* GL_MIRRORED_REPEAT */
+      1344, /* GL_RGB_S3TC */
+      1321, /* GL_RGB4_S3TC */
+      1343, /* GL_RGBA_S3TC */
+      1338, /* GL_RGBA4_S3TC */
+      1341, /* GL_RGBA_DXT5_S3TC */
+      1336, /* GL_RGBA4_DXT5_S3TC */
+       254, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
+       249, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
+       250, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
+       251, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */
+       993, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
+       992, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
+       684, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
+       487, /* GL_FOG_COORDINATE_SOURCE */
+       479, /* GL_FOG_COORD */
+       503, /* GL_FRAGMENT_DEPTH */
+       295, /* GL_CURRENT_FOG_COORD */
+       486, /* GL_FOG_COORDINATE_ARRAY_TYPE */
+       485, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
+       484, /* GL_FOG_COORDINATE_ARRAY_POINTER */
+       481, /* GL_FOG_COORDINATE_ARRAY */
+       189, /* GL_COLOR_SUM */
+       314, /* GL_CURRENT_SECONDARY_COLOR */
+      1381, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
+      1383, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
+      1382, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
+      1380, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
+      1377, /* GL_SECONDARY_COLOR_ARRAY */
+       568, /* GL_GL_CURRENT_RASTER_SECONDARY_COLOR */
         28, /* GL_ALIASED_POINT_SIZE_RANGE */
         27, /* GL_ALIASED_LINE_WIDTH_RANGE */
-      1444, /* GL_TEXTURE0 */
-      1446, /* GL_TEXTURE1 */
-      1468, /* GL_TEXTURE2 */
-      1490, /* GL_TEXTURE3 */
-      1496, /* GL_TEXTURE4 */
-      1498, /* GL_TEXTURE5 */
-      1500, /* GL_TEXTURE6 */
-      1502, /* GL_TEXTURE7 */
-      1504, /* GL_TEXTURE8 */
-      1506, /* GL_TEXTURE9 */
-      1447, /* GL_TEXTURE10 */
-      1449, /* GL_TEXTURE11 */
-      1451, /* GL_TEXTURE12 */
-      1453, /* GL_TEXTURE13 */
-      1455, /* GL_TEXTURE14 */
-      1457, /* GL_TEXTURE15 */
-      1459, /* GL_TEXTURE16 */
-      1461, /* GL_TEXTURE17 */
-      1463, /* GL_TEXTURE18 */
-      1465, /* GL_TEXTURE19 */
-      1469, /* GL_TEXTURE20 */
-      1471, /* GL_TEXTURE21 */
-      1473, /* GL_TEXTURE22 */
-      1475, /* GL_TEXTURE23 */
-      1477, /* GL_TEXTURE24 */
-      1479, /* GL_TEXTURE25 */
-      1481, /* GL_TEXTURE26 */
-      1483, /* GL_TEXTURE27 */
-      1485, /* GL_TEXTURE28 */
-      1487, /* GL_TEXTURE29 */
-      1491, /* GL_TEXTURE30 */
-      1493, /* GL_TEXTURE31 */
+      1503, /* GL_TEXTURE0 */
+      1505, /* GL_TEXTURE1 */
+      1527, /* GL_TEXTURE2 */
+      1549, /* GL_TEXTURE3 */
+      1555, /* GL_TEXTURE4 */
+      1557, /* GL_TEXTURE5 */
+      1559, /* GL_TEXTURE6 */
+      1561, /* GL_TEXTURE7 */
+      1563, /* GL_TEXTURE8 */
+      1565, /* GL_TEXTURE9 */
+      1506, /* GL_TEXTURE10 */
+      1508, /* GL_TEXTURE11 */
+      1510, /* GL_TEXTURE12 */
+      1512, /* GL_TEXTURE13 */
+      1514, /* GL_TEXTURE14 */
+      1516, /* GL_TEXTURE15 */
+      1518, /* GL_TEXTURE16 */
+      1520, /* GL_TEXTURE17 */
+      1522, /* GL_TEXTURE18 */
+      1524, /* GL_TEXTURE19 */
+      1528, /* GL_TEXTURE20 */
+      1530, /* GL_TEXTURE21 */
+      1532, /* GL_TEXTURE22 */
+      1534, /* GL_TEXTURE23 */
+      1536, /* GL_TEXTURE24 */
+      1538, /* GL_TEXTURE25 */
+      1540, /* GL_TEXTURE26 */
+      1542, /* GL_TEXTURE27 */
+      1544, /* GL_TEXTURE28 */
+      1546, /* GL_TEXTURE29 */
+      1550, /* GL_TEXTURE30 */
+      1552, /* GL_TEXTURE31 */
         18, /* GL_ACTIVE_TEXTURE */
        123, /* GL_CLIENT_ACTIVE_TEXTURE */
-       865, /* GL_MAX_TEXTURE_UNITS */
-      1632, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-      1635, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-      1637, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-      1629, /* GL_TRANSPOSE_COLOR_MATRIX */
-      1432, /* GL_SUBTRACT */
-       854, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
-       221, /* GL_COMPRESSED_ALPHA */
-       225, /* GL_COMPRESSED_LUMINANCE */
-       226, /* GL_COMPRESSED_LUMINANCE_ALPHA */
-       223, /* GL_COMPRESSED_INTENSITY */
-       229, /* GL_COMPRESSED_RGB */
-       230, /* GL_COMPRESSED_RGBA */
-      1551, /* GL_TEXTURE_COMPRESSION_HINT */
-      1613, /* GL_TEXTURE_RECTANGLE_ARB */
-      1523, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
-      1205, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
-       852, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
-       334, /* GL_DEPTH_STENCIL_NV */
-      1657, /* GL_UNSIGNED_INT_24_8_NV */
-       861, /* GL_MAX_TEXTURE_LOD_BIAS */
-      1604, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
-       862, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
-      1580, /* GL_TEXTURE_FILTER_CONTROL */
-      1595, /* GL_TEXTURE_LOD_BIAS */
-       206, /* GL_COMBINE4 */
-       855, /* GL_MAX_SHININESS_NV */
-       856, /* GL_MAX_SPOT_EXPONENT_NV */
-       574, /* GL_INCR_WRAP */
-       309, /* GL_DECR_WRAP */
-       907, /* GL_MODELVIEW1_ARB */
-       963, /* GL_NORMAL_MAP */
-      1234, /* GL_REFLECTION_MAP */
-      1560, /* GL_TEXTURE_CUBE_MAP */
-      1521, /* GL_TEXTURE_BINDING_CUBE_MAP */
-      1568, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-      1562, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-      1570, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-      1564, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-      1572, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-      1566, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
-      1203, /* GL_PROXY_TEXTURE_CUBE_MAP */
-       808, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
-       942, /* GL_MULTISAMPLE_FILTER_HINT_NV */
-       474, /* GL_FOG_DISTANCE_MODE_NV */
-       433, /* GL_EYE_RADIAL_NV */
-       432, /* GL_EYE_PLANE_ABSOLUTE_NV */
-       205, /* GL_COMBINE */
-       212, /* GL_COMBINE_RGB */
-       207, /* GL_COMBINE_ALPHA */
-      1288, /* GL_RGB_SCALE */
+       910, /* GL_MAX_TEXTURE_UNITS */
+      1692, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+      1695, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+      1697, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+      1689, /* GL_TRANSPOSE_COLOR_MATRIX */
+      1491, /* GL_SUBTRACT */
+       898, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
+       237, /* GL_COMPRESSED_ALPHA */
+       241, /* GL_COMPRESSED_LUMINANCE */
+       242, /* GL_COMPRESSED_LUMINANCE_ALPHA */
+       239, /* GL_COMPRESSED_INTENSITY */
+       245, /* GL_COMPRESSED_RGB */
+       246, /* GL_COMPRESSED_RGBA */
+      1610, /* GL_TEXTURE_COMPRESSION_HINT */
+      1672, /* GL_TEXTURE_RECTANGLE_ARB */
+      1582, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
+      1250, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
+       896, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
+       352, /* GL_DEPTH_STENCIL */
+      1717, /* GL_UNSIGNED_INT_24_8 */
+       906, /* GL_MAX_TEXTURE_LOD_BIAS */
+      1663, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+       907, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
+      1639, /* GL_TEXTURE_FILTER_CONTROL */
+      1654, /* GL_TEXTURE_LOD_BIAS */
+       222, /* GL_COMBINE4 */
+       900, /* GL_MAX_SHININESS_NV */
+       901, /* GL_MAX_SPOT_EXPONENT_NV */
+       616, /* GL_INCR_WRAP */
+       325, /* GL_DECR_WRAP */
+       952, /* GL_MODELVIEW1_ARB */
+      1008, /* GL_NORMAL_MAP */
+      1280, /* GL_REFLECTION_MAP */
+      1619, /* GL_TEXTURE_CUBE_MAP */
+      1580, /* GL_TEXTURE_BINDING_CUBE_MAP */
+      1627, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
+      1621, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
+      1629, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
+      1623, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
+      1631, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
+      1625, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
+      1248, /* GL_PROXY_TEXTURE_CUBE_MAP */
+       852, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
+       987, /* GL_MULTISAMPLE_FILTER_HINT_NV */
+       495, /* GL_FOG_DISTANCE_MODE_NV */
+       454, /* GL_EYE_RADIAL_NV */
+       453, /* GL_EYE_PLANE_ABSOLUTE_NV */
+       221, /* GL_COMBINE */
+       228, /* GL_COMBINE_RGB */
+       223, /* GL_COMBINE_ALPHA */
+      1345, /* GL_RGB_SCALE */
         24, /* GL_ADD_SIGNED */
-       601, /* GL_INTERPOLATE */
-       240, /* GL_CONSTANT */
-      1153, /* GL_PRIMARY_COLOR */
-      1150, /* GL_PREVIOUS */
-      1354, /* GL_SOURCE0_RGB */
-      1360, /* GL_SOURCE1_RGB */
-      1366, /* GL_SOURCE2_RGB */
-      1370, /* GL_SOURCE3_RGB_NV */
-      1351, /* GL_SOURCE0_ALPHA */
-      1357, /* GL_SOURCE1_ALPHA */
-      1363, /* GL_SOURCE2_ALPHA */
-      1369, /* GL_SOURCE3_ALPHA_NV */
-       999, /* GL_OPERAND0_RGB */
-      1005, /* GL_OPERAND1_RGB */
-      1011, /* GL_OPERAND2_RGB */
-      1015, /* GL_OPERAND3_RGB_NV */
-       996, /* GL_OPERAND0_ALPHA */
-      1002, /* GL_OPERAND1_ALPHA */
-      1008, /* GL_OPERAND2_ALPHA */
-      1014, /* GL_OPERAND3_ALPHA_NV */
-      1679, /* GL_VERTEX_ARRAY_BINDING_APPLE */
-      1743, /* GL_YCBCR_422_APPLE */
-      1668, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-      1670, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-      1345, /* GL_SLICE_ACCUM_SUN */
-      1210, /* GL_QUAD_MESH_SUN */
-      1641, /* GL_TRIANGLE_MESH_SUN */
-      1717, /* GL_VERTEX_PROGRAM_ARB */
-      1728, /* GL_VERTEX_STATE_PROGRAM_NV */
-      1704, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-      1710, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-      1712, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-      1714, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
-       300, /* GL_CURRENT_VERTEX_ATTRIB */
-      1166, /* GL_PROGRAM_LENGTH_ARB */
-      1180, /* GL_PROGRAM_STRING_ARB */
-       929, /* GL_MODELVIEW_PROJECTION_NV */
-       569, /* GL_IDENTITY_NV */
-       614, /* GL_INVERSE_NV */
-      1634, /* GL_TRANSPOSE_NV */
-       615, /* GL_INVERSE_TRANSPOSE_NV */
-       838, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
-       837, /* GL_MAX_PROGRAM_MATRICES_ARB */
-       745, /* GL_MATRIX0_NV */
-       757, /* GL_MATRIX1_NV */
-       769, /* GL_MATRIX2_NV */
-       773, /* GL_MATRIX3_NV */
-       775, /* GL_MATRIX4_NV */
-       777, /* GL_MATRIX5_NV */
-       779, /* GL_MATRIX6_NV */
-       781, /* GL_MATRIX7_NV */
-       285, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
-       282, /* GL_CURRENT_MATRIX_ARB */
-      1720, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-      1723, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-      1178, /* GL_PROGRAM_PARAMETER_NV */
-      1708, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-      1182, /* GL_PROGRAM_TARGET_NV */
-      1179, /* GL_PROGRAM_RESIDENT_NV */
-      1626, /* GL_TRACK_MATRIX_NV */
-      1627, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-      1718, /* GL_VERTEX_PROGRAM_BINDING_NV */
-      1160, /* GL_PROGRAM_ERROR_POSITION_ARB */
-       319, /* GL_DEPTH_CLAMP_NV */
-      1686, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-      1693, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-      1694, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-      1695, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-      1696, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-      1697, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-      1698, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-      1699, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-      1700, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-      1701, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-      1687, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-      1688, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-      1689, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-      1690, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-      1691, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-      1692, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
-       699, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
-       706, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
-       707, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
-       708, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
-       709, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
-       710, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
-       711, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
-       712, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
-       713, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
-       714, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
-       700, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
-       701, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
-       702, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
-       703, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
-       704, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
-       705, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
-       726, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
-       733, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
-       734, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
-       735, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
-       736, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
-       737, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
-       738, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
-      1159, /* GL_PROGRAM_BINDING_ARB */
-       740, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
-       741, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
-       727, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
-       728, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
-       729, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
-       730, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
-       731, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
-       732, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
-      1549, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-      1546, /* GL_TEXTURE_COMPRESSED */
-       968, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
-       239, /* GL_COMPRESSED_TEXTURE_FORMATS */
-       877, /* GL_MAX_VERTEX_UNITS_ARB */
+       644, /* GL_INTERPOLATE */
+       256, /* GL_CONSTANT */
+      1198, /* GL_PRIMARY_COLOR */
+      1195, /* GL_PREVIOUS */
+      1411, /* GL_SOURCE0_RGB */
+      1417, /* GL_SOURCE1_RGB */
+      1423, /* GL_SOURCE2_RGB */
+      1427, /* GL_SOURCE3_RGB_NV */
+      1408, /* GL_SOURCE0_ALPHA */
+      1414, /* GL_SOURCE1_ALPHA */
+      1420, /* GL_SOURCE2_ALPHA */
+      1426, /* GL_SOURCE3_ALPHA_NV */
+      1044, /* GL_OPERAND0_RGB */
+      1050, /* GL_OPERAND1_RGB */
+      1056, /* GL_OPERAND2_RGB */
+      1060, /* GL_OPERAND3_RGB_NV */
+      1041, /* GL_OPERAND0_ALPHA */
+      1047, /* GL_OPERAND1_ALPHA */
+      1053, /* GL_OPERAND2_ALPHA */
+      1059, /* GL_OPERAND3_ALPHA_NV */
+      1741, /* GL_VERTEX_ARRAY_BINDING_APPLE */
+      1805, /* GL_YCBCR_422_APPLE */
+      1730, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+      1732, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+      1402, /* GL_SLICE_ACCUM_SUN */
+      1255, /* GL_QUAD_MESH_SUN */
+      1701, /* GL_TRIANGLE_MESH_SUN */
+      1779, /* GL_VERTEX_PROGRAM_ARB */
+      1790, /* GL_VERTEX_STATE_PROGRAM_NV */
+      1766, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+      1772, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+      1774, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+      1776, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+       316, /* GL_CURRENT_VERTEX_ATTRIB */
+      1211, /* GL_PROGRAM_LENGTH_ARB */
+      1225, /* GL_PROGRAM_STRING_ARB */
+       974, /* GL_MODELVIEW_PROJECTION_NV */
+       611, /* GL_IDENTITY_NV */
+       658, /* GL_INVERSE_NV */
+      1694, /* GL_TRANSPOSE_NV */
+       659, /* GL_INVERSE_TRANSPOSE_NV */
+       882, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
+       881, /* GL_MAX_PROGRAM_MATRICES_ARB */
+       789, /* GL_MATRIX0_NV */
+       801, /* GL_MATRIX1_NV */
+       813, /* GL_MATRIX2_NV */
+       817, /* GL_MATRIX3_NV */
+       819, /* GL_MATRIX4_NV */
+       821, /* GL_MATRIX5_NV */
+       823, /* GL_MATRIX6_NV */
+       825, /* GL_MATRIX7_NV */
+       301, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
+       298, /* GL_CURRENT_MATRIX_ARB */
+      1782, /* GL_VERTEX_PROGRAM_POINT_SIZE */
+      1785, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+      1223, /* GL_PROGRAM_PARAMETER_NV */
+      1770, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+      1227, /* GL_PROGRAM_TARGET_NV */
+      1224, /* GL_PROGRAM_RESIDENT_NV */
+      1686, /* GL_TRACK_MATRIX_NV */
+      1687, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+      1780, /* GL_VERTEX_PROGRAM_BINDING_NV */
+      1205, /* GL_PROGRAM_ERROR_POSITION_ARB */
+       337, /* GL_DEPTH_CLAMP_NV */
+      1748, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+      1755, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+      1756, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+      1757, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+      1758, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+      1759, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+      1760, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+      1761, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+      1762, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+      1763, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+      1749, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+      1750, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+      1751, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+      1752, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+      1753, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+      1754, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+       743, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
+       750, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
+       751, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
+       752, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
+       753, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
+       754, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
+       755, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
+       756, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
+       757, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
+       758, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
+       744, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
+       745, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
+       746, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
+       747, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
+       748, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
+       749, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
+       770, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
+       777, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
+       778, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
+       779, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
+       780, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
+       781, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
+       782, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
+      1204, /* GL_PROGRAM_BINDING_ARB */
+       784, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
+       785, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
+       771, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
+       772, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
+       773, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
+       774, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
+       775, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
+       776, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
+      1608, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
+      1605, /* GL_TEXTURE_COMPRESSED */
+      1013, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
+       255, /* GL_COMPRESSED_TEXTURE_FORMATS */
+       922, /* GL_MAX_VERTEX_UNITS_ARB */
         22, /* GL_ACTIVE_VERTEX_UNITS_ARB */
-      1738, /* GL_WEIGHT_SUM_UNITY_ARB */
-      1716, /* GL_VERTEX_BLEND_ARB */
-       302, /* GL_CURRENT_WEIGHT_ARB */
-      1737, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-      1736, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-      1735, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-      1734, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-      1731, /* GL_WEIGHT_ARRAY_ARB */
-       345, /* GL_DOT3_RGB */
-       346, /* GL_DOT3_RGBA */
-       237, /* GL_COMPRESSED_RGB_FXT1_3DFX */
-       232, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
-       937, /* GL_MULTISAMPLE_3DFX */
-      1309, /* GL_SAMPLE_BUFFERS_3DFX */
-      1300, /* GL_SAMPLES_3DFX */
-       918, /* GL_MODELVIEW2_ARB */
-       921, /* GL_MODELVIEW3_ARB */
-       922, /* GL_MODELVIEW4_ARB */
-       923, /* GL_MODELVIEW5_ARB */
-       924, /* GL_MODELVIEW6_ARB */
-       925, /* GL_MODELVIEW7_ARB */
-       926, /* GL_MODELVIEW8_ARB */
-       927, /* GL_MODELVIEW9_ARB */
-       897, /* GL_MODELVIEW10_ARB */
-       898, /* GL_MODELVIEW11_ARB */
-       899, /* GL_MODELVIEW12_ARB */
-       900, /* GL_MODELVIEW13_ARB */
-       901, /* GL_MODELVIEW14_ARB */
-       902, /* GL_MODELVIEW15_ARB */
-       903, /* GL_MODELVIEW16_ARB */
-       904, /* GL_MODELVIEW17_ARB */
-       905, /* GL_MODELVIEW18_ARB */
-       906, /* GL_MODELVIEW19_ARB */
-       908, /* GL_MODELVIEW20_ARB */
-       909, /* GL_MODELVIEW21_ARB */
-       910, /* GL_MODELVIEW22_ARB */
-       911, /* GL_MODELVIEW23_ARB */
-       912, /* GL_MODELVIEW24_ARB */
-       913, /* GL_MODELVIEW25_ARB */
-       914, /* GL_MODELVIEW26_ARB */
-       915, /* GL_MODELVIEW27_ARB */
-       916, /* GL_MODELVIEW28_ARB */
-       917, /* GL_MODELVIEW29_ARB */
-       919, /* GL_MODELVIEW30_ARB */
-       920, /* GL_MODELVIEW31_ARB */
-       350, /* GL_DOT3_RGB_EXT */
-       348, /* GL_DOT3_RGBA_EXT */
-       891, /* GL_MIRROR_CLAMP_EXT */
-       894, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
-       932, /* GL_MODULATE_ADD_ATI */
-       933, /* GL_MODULATE_SIGNED_ADD_ATI */
-       934, /* GL_MODULATE_SUBTRACT_ATI */
-      1744, /* GL_YCBCR_MESA */
-      1023, /* GL_PACK_INVERT_MESA */
-       305, /* GL_DEBUG_OBJECT_MESA */
-       306, /* GL_DEBUG_PRINT_MESA */
-       304, /* GL_DEBUG_ASSERT_MESA */
+      1800, /* GL_WEIGHT_SUM_UNITY_ARB */
+      1778, /* GL_VERTEX_BLEND_ARB */
+       318, /* GL_CURRENT_WEIGHT_ARB */
+      1799, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+      1798, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+      1797, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+      1796, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+      1793, /* GL_WEIGHT_ARRAY_ARB */
+       365, /* GL_DOT3_RGB */
+       366, /* GL_DOT3_RGBA */
+       253, /* GL_COMPRESSED_RGB_FXT1_3DFX */
+       248, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
+       982, /* GL_MULTISAMPLE_3DFX */
+      1366, /* GL_SAMPLE_BUFFERS_3DFX */
+      1357, /* GL_SAMPLES_3DFX */
+       963, /* GL_MODELVIEW2_ARB */
+       966, /* GL_MODELVIEW3_ARB */
+       967, /* GL_MODELVIEW4_ARB */
+       968, /* GL_MODELVIEW5_ARB */
+       969, /* GL_MODELVIEW6_ARB */
+       970, /* GL_MODELVIEW7_ARB */
+       971, /* GL_MODELVIEW8_ARB */
+       972, /* GL_MODELVIEW9_ARB */
+       942, /* GL_MODELVIEW10_ARB */
+       943, /* GL_MODELVIEW11_ARB */
+       944, /* GL_MODELVIEW12_ARB */
+       945, /* GL_MODELVIEW13_ARB */
+       946, /* GL_MODELVIEW14_ARB */
+       947, /* GL_MODELVIEW15_ARB */
+       948, /* GL_MODELVIEW16_ARB */
+       949, /* GL_MODELVIEW17_ARB */
+       950, /* GL_MODELVIEW18_ARB */
+       951, /* GL_MODELVIEW19_ARB */
+       953, /* GL_MODELVIEW20_ARB */
+       954, /* GL_MODELVIEW21_ARB */
+       955, /* GL_MODELVIEW22_ARB */
+       956, /* GL_MODELVIEW23_ARB */
+       957, /* GL_MODELVIEW24_ARB */
+       958, /* GL_MODELVIEW25_ARB */
+       959, /* GL_MODELVIEW26_ARB */
+       960, /* GL_MODELVIEW27_ARB */
+       961, /* GL_MODELVIEW28_ARB */
+       962, /* GL_MODELVIEW29_ARB */
+       964, /* GL_MODELVIEW30_ARB */
+       965, /* GL_MODELVIEW31_ARB */
+       370, /* GL_DOT3_RGB_EXT */
+       368, /* GL_DOT3_RGBA_EXT */
+       936, /* GL_MIRROR_CLAMP_EXT */
+       939, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
+       977, /* GL_MODULATE_ADD_ATI */
+       978, /* GL_MODULATE_SIGNED_ADD_ATI */
+       979, /* GL_MODULATE_SUBTRACT_ATI */
+      1806, /* GL_YCBCR_MESA */
+      1068, /* GL_PACK_INVERT_MESA */
+       321, /* GL_DEBUG_OBJECT_MESA */
+       322, /* GL_DEBUG_PRINT_MESA */
+       320, /* GL_DEBUG_ASSERT_MESA */
        106, /* GL_BUFFER_SIZE */
        108, /* GL_BUFFER_USAGE */
-      1397, /* GL_STENCIL_BACK_FUNC */
-      1395, /* GL_STENCIL_BACK_FAIL */
-      1399, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-      1401, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
-       483, /* GL_FRAGMENT_PROGRAM_ARB */
-      1157, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
-      1185, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
-      1184, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
-      1169, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-      1175, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-      1174, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-       827, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
-       850, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
-       849, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
-       840, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-       846, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-       845, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-       810, /* GL_MAX_DRAW_BUFFERS */
-       354, /* GL_DRAW_BUFFER0 */
-       357, /* GL_DRAW_BUFFER1 */
-       378, /* GL_DRAW_BUFFER2 */
-       381, /* GL_DRAW_BUFFER3 */
-       384, /* GL_DRAW_BUFFER4 */
-       387, /* GL_DRAW_BUFFER5 */
-       390, /* GL_DRAW_BUFFER6 */
-       393, /* GL_DRAW_BUFFER7 */
-       396, /* GL_DRAW_BUFFER8 */
-       399, /* GL_DRAW_BUFFER9 */
-       358, /* GL_DRAW_BUFFER10 */
-       361, /* GL_DRAW_BUFFER11 */
-       364, /* GL_DRAW_BUFFER12 */
-       367, /* GL_DRAW_BUFFER13 */
-       370, /* GL_DRAW_BUFFER14 */
-       373, /* GL_DRAW_BUFFER15 */
+      1456, /* GL_STENCIL_BACK_FUNC */
+      1454, /* GL_STENCIL_BACK_FAIL */
+      1458, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
+      1460, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
+       504, /* GL_FRAGMENT_PROGRAM_ARB */
+      1202, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
+      1230, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
+      1229, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
+      1214, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+      1220, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+      1219, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+       871, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
+       894, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
+       893, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
+       884, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+       890, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+       889, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+       854, /* GL_MAX_DRAW_BUFFERS */
+       374, /* GL_DRAW_BUFFER0 */
+       377, /* GL_DRAW_BUFFER1 */
+       398, /* GL_DRAW_BUFFER2 */
+       401, /* GL_DRAW_BUFFER3 */
+       404, /* GL_DRAW_BUFFER4 */
+       407, /* GL_DRAW_BUFFER5 */
+       410, /* GL_DRAW_BUFFER6 */
+       413, /* GL_DRAW_BUFFER7 */
+       416, /* GL_DRAW_BUFFER8 */
+       419, /* GL_DRAW_BUFFER9 */
+       378, /* GL_DRAW_BUFFER10 */
+       381, /* GL_DRAW_BUFFER11 */
+       384, /* GL_DRAW_BUFFER12 */
+       387, /* GL_DRAW_BUFFER13 */
+       390, /* GL_DRAW_BUFFER14 */
+       393, /* GL_DRAW_BUFFER15 */
         81, /* GL_BLEND_EQUATION_ALPHA */
-       790, /* GL_MATRIX_PALETTE_ARB */
-       821, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
-       824, /* GL_MAX_PALETTE_MATRICES_ARB */
-       288, /* GL_CURRENT_PALETTE_MATRIX_ARB */
-       784, /* GL_MATRIX_INDEX_ARRAY_ARB */
-       283, /* GL_CURRENT_MATRIX_INDEX_ARB */
-       786, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
-       788, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
-       787, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
-       785, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
-      1575, /* GL_TEXTURE_DEPTH_SIZE */
-       338, /* GL_DEPTH_TEXTURE_MODE */
-      1541, /* GL_TEXTURE_COMPARE_MODE */
-      1539, /* GL_TEXTURE_COMPARE_FUNC */
-       216, /* GL_COMPARE_R_TO_TEXTURE */
-      1091, /* GL_POINT_SPRITE */
-       265, /* GL_COORD_REPLACE */
-      1095, /* GL_POINT_SPRITE_R_MODE_NV */
-      1212, /* GL_QUERY_COUNTER_BITS */
-       290, /* GL_CURRENT_QUERY */
-      1214, /* GL_QUERY_RESULT */
-      1216, /* GL_QUERY_RESULT_AVAILABLE */
-       871, /* GL_MAX_VERTEX_ATTRIBS */
-      1706, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
-       336, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
-       335, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
-       857, /* GL_MAX_TEXTURE_COORDS */
-       859, /* GL_MAX_TEXTURE_IMAGE_UNITS */
-      1162, /* GL_PROGRAM_ERROR_STRING_ARB */
-      1164, /* GL_PROGRAM_FORMAT_ASCII_ARB */
-      1163, /* GL_PROGRAM_FORMAT_ARB */
-      1620, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
-       317, /* GL_DEPTH_BOUNDS_TEST_EXT */
-       316, /* GL_DEPTH_BOUNDS_EXT */
+       834, /* GL_MATRIX_PALETTE_ARB */
+       865, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
+       868, /* GL_MAX_PALETTE_MATRICES_ARB */
+       304, /* GL_CURRENT_PALETTE_MATRIX_ARB */
+       828, /* GL_MATRIX_INDEX_ARRAY_ARB */
+       299, /* GL_CURRENT_MATRIX_INDEX_ARB */
+       830, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
+       832, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
+       831, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
+       829, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
+      1634, /* GL_TEXTURE_DEPTH_SIZE */
+       358, /* GL_DEPTH_TEXTURE_MODE */
+      1600, /* GL_TEXTURE_COMPARE_MODE */
+      1598, /* GL_TEXTURE_COMPARE_FUNC */
+       232, /* GL_COMPARE_R_TO_TEXTURE */
+      1136, /* GL_POINT_SPRITE */
+       281, /* GL_COORD_REPLACE */
+      1140, /* GL_POINT_SPRITE_R_MODE_NV */
+      1257, /* GL_QUERY_COUNTER_BITS */
+       306, /* GL_CURRENT_QUERY */
+      1259, /* GL_QUERY_RESULT */
+      1261, /* GL_QUERY_RESULT_AVAILABLE */
+       916, /* GL_MAX_VERTEX_ATTRIBS */
+      1768, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+       356, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
+       355, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
+       902, /* GL_MAX_TEXTURE_COORDS */
+       904, /* GL_MAX_TEXTURE_IMAGE_UNITS */
+      1207, /* GL_PROGRAM_ERROR_STRING_ARB */
+      1209, /* GL_PROGRAM_FORMAT_ASCII_ARB */
+      1208, /* GL_PROGRAM_FORMAT_ARB */
+      1680, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+       335, /* GL_DEPTH_BOUNDS_TEST_EXT */
+       334, /* GL_DEPTH_BOUNDS_EXT */
         52, /* GL_ARRAY_BUFFER */
-       419, /* GL_ELEMENT_ARRAY_BUFFER */
+       440, /* GL_ELEMENT_ARRAY_BUFFER */
         53, /* GL_ARRAY_BUFFER_BINDING */
-       420, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
-      1680, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-       958, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
+       441, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
+      1742, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+      1003, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
        139, /* GL_COLOR_ARRAY_BUFFER_BINDING */
-       577, /* GL_INDEX_ARRAY_BUFFER_BINDING */
-      1554, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
-       415, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
-      1321, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
-       461, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
-      1732, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-      1702, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-      1165, /* GL_PROGRAM_INSTRUCTIONS_ARB */
-       833, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
-      1171, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-       842, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-      1183, /* GL_PROGRAM_TEMPORARIES_ARB */
-       848, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
-      1173, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
-       844, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
-      1177, /* GL_PROGRAM_PARAMETERS_ARB */
-       847, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
-      1172, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
-       843, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
-      1158, /* GL_PROGRAM_ATTRIBS_ARB */
-       828, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
-      1170, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
-       841, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
-      1156, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
-       826, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
-      1168, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-       839, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-       834, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
-       830, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
-      1186, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-      1631, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-      1224, /* GL_READ_ONLY */
-      1740, /* GL_WRITE_ONLY */
-      1226, /* GL_READ_WRITE */
+       620, /* GL_INDEX_ARRAY_BUFFER_BINDING */
+      1613, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
+       436, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
+      1378, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
+       482, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
+      1794, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+      1764, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+      1210, /* GL_PROGRAM_INSTRUCTIONS_ARB */
+       877, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
+      1216, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+       886, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+      1228, /* GL_PROGRAM_TEMPORARIES_ARB */
+       892, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
+      1218, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
+       888, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
+      1222, /* GL_PROGRAM_PARAMETERS_ARB */
+       891, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
+      1217, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
+       887, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
+      1203, /* GL_PROGRAM_ATTRIBS_ARB */
+       872, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
+      1215, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
+       885, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
+      1201, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
+       870, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
+      1213, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+       883, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+       878, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
+       874, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
+      1231, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
+      1691, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+      1270, /* GL_READ_ONLY */
+      1802, /* GL_WRITE_ONLY */
+      1272, /* GL_READ_WRITE */
        100, /* GL_BUFFER_ACCESS */
        102, /* GL_BUFFER_MAPPED */
        104, /* GL_BUFFER_MAP_POINTER */
-      1625, /* GL_TIME_ELAPSED_EXT */
-       744, /* GL_MATRIX0_ARB */
-       756, /* GL_MATRIX1_ARB */
-       768, /* GL_MATRIX2_ARB */
-       772, /* GL_MATRIX3_ARB */
-       774, /* GL_MATRIX4_ARB */
-       776, /* GL_MATRIX5_ARB */
-       778, /* GL_MATRIX6_ARB */
-       780, /* GL_MATRIX7_ARB */
-       782, /* GL_MATRIX8_ARB */
-       783, /* GL_MATRIX9_ARB */
-       746, /* GL_MATRIX10_ARB */
-       747, /* GL_MATRIX11_ARB */
-       748, /* GL_MATRIX12_ARB */
-       749, /* GL_MATRIX13_ARB */
-       750, /* GL_MATRIX14_ARB */
-       751, /* GL_MATRIX15_ARB */
-       752, /* GL_MATRIX16_ARB */
-       753, /* GL_MATRIX17_ARB */
-       754, /* GL_MATRIX18_ARB */
-       755, /* GL_MATRIX19_ARB */
-       758, /* GL_MATRIX20_ARB */
-       759, /* GL_MATRIX21_ARB */
-       760, /* GL_MATRIX22_ARB */
-       761, /* GL_MATRIX23_ARB */
-       762, /* GL_MATRIX24_ARB */
-       763, /* GL_MATRIX25_ARB */
-       764, /* GL_MATRIX26_ARB */
-       765, /* GL_MATRIX27_ARB */
-       766, /* GL_MATRIX28_ARB */
-       767, /* GL_MATRIX29_ARB */
-       770, /* GL_MATRIX30_ARB */
-       771, /* GL_MATRIX31_ARB */
-      1427, /* GL_STREAM_DRAW */
-      1429, /* GL_STREAM_READ */
-      1425, /* GL_STREAM_COPY */
-      1389, /* GL_STATIC_DRAW */
-      1391, /* GL_STATIC_READ */
-      1387, /* GL_STATIC_COPY */
-       409, /* GL_DYNAMIC_DRAW */
-       411, /* GL_DYNAMIC_READ */
-       407, /* GL_DYNAMIC_COPY */
-       533, /* GL_GL_PIXEL_PACK_BUFFER */
-       535, /* GL_GL_PIXEL_UNPACK_BUFFER */
-       534, /* GL_GL_PIXEL_PACK_BUFFER_BINDING */
-       536, /* GL_GL_PIXEL_UNPACK_BUFFER_BINDING */
-       831, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
-       829, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
-       832, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
-       836, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
-       835, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
-       793, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
-      1421, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
+      1685, /* GL_TIME_ELAPSED_EXT */
+       788, /* GL_MATRIX0_ARB */
+       800, /* GL_MATRIX1_ARB */
+       812, /* GL_MATRIX2_ARB */
+       816, /* GL_MATRIX3_ARB */
+       818, /* GL_MATRIX4_ARB */
+       820, /* GL_MATRIX5_ARB */
+       822, /* GL_MATRIX6_ARB */
+       824, /* GL_MATRIX7_ARB */
+       826, /* GL_MATRIX8_ARB */
+       827, /* GL_MATRIX9_ARB */
+       790, /* GL_MATRIX10_ARB */
+       791, /* GL_MATRIX11_ARB */
+       792, /* GL_MATRIX12_ARB */
+       793, /* GL_MATRIX13_ARB */
+       794, /* GL_MATRIX14_ARB */
+       795, /* GL_MATRIX15_ARB */
+       796, /* GL_MATRIX16_ARB */
+       797, /* GL_MATRIX17_ARB */
+       798, /* GL_MATRIX18_ARB */
+       799, /* GL_MATRIX19_ARB */
+       802, /* GL_MATRIX20_ARB */
+       803, /* GL_MATRIX21_ARB */
+       804, /* GL_MATRIX22_ARB */
+       805, /* GL_MATRIX23_ARB */
+       806, /* GL_MATRIX24_ARB */
+       807, /* GL_MATRIX25_ARB */
+       808, /* GL_MATRIX26_ARB */
+       809, /* GL_MATRIX27_ARB */
+       810, /* GL_MATRIX28_ARB */
+       811, /* GL_MATRIX29_ARB */
+       814, /* GL_MATRIX30_ARB */
+       815, /* GL_MATRIX31_ARB */
+      1486, /* GL_STREAM_DRAW */
+      1488, /* GL_STREAM_READ */
+      1484, /* GL_STREAM_COPY */
+      1447, /* GL_STATIC_DRAW */
+      1449, /* GL_STATIC_READ */
+      1445, /* GL_STATIC_COPY */
+       430, /* GL_DYNAMIC_DRAW */
+       432, /* GL_DYNAMIC_READ */
+       428, /* GL_DYNAMIC_COPY */
+       575, /* GL_GL_PIXEL_PACK_BUFFER */
+       577, /* GL_GL_PIXEL_UNPACK_BUFFER */
+       576, /* GL_GL_PIXEL_PACK_BUFFER_BINDING */
+       578, /* GL_GL_PIXEL_UNPACK_BUFFER_BINDING */
+       329, /* GL_DEPTH24_STENCIL8 */
+      1678, /* GL_TEXTURE_STENCIL_SIZE */
+       875, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
+       873, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
+       876, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
+       880, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
+       879, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
+       837, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
+      1480, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
         17, /* GL_ACTIVE_STENCIL_FACE_EXT */
-       892, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
-      1302, /* GL_SAMPLES_PASSED */
-       484, /* GL_FRAGMENT_SHADER */
-      1726, /* GL_VERTEX_SHADER */
-      1176, /* GL_PROGRAM_OBJECT_ARB */
-      1334, /* GL_SHADER_OBJECT_ARB */
-       817, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
-       875, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
-       869, /* GL_MAX_VARYING_FLOATS */
-       873, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
-       802, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
-       983, /* GL_OBJECT_TYPE_ARB */
-      1336, /* GL_SHADER_TYPE */
-       449, /* GL_FLOAT_VEC2 */
-       451, /* GL_FLOAT_VEC3 */
-       453, /* GL_FLOAT_VEC4 */
-       604, /* GL_INT_VEC2 */
-       606, /* GL_INT_VEC3 */
-       608, /* GL_INT_VEC4 */
+       937, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
+      1359, /* GL_SAMPLES_PASSED */
+       505, /* GL_FRAGMENT_SHADER */
+      1788, /* GL_VERTEX_SHADER */
+      1221, /* GL_PROGRAM_OBJECT_ARB */
+      1391, /* GL_SHADER_OBJECT_ARB */
+       861, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
+       920, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
+       914, /* GL_MAX_VARYING_FLOATS */
+       918, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
+       846, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
+      1028, /* GL_OBJECT_TYPE_ARB */
+      1393, /* GL_SHADER_TYPE */
+       470, /* GL_FLOAT_VEC2 */
+       472, /* GL_FLOAT_VEC3 */
+       474, /* GL_FLOAT_VEC4 */
+       647, /* GL_INT_VEC2 */
+       649, /* GL_INT_VEC3 */
+       651, /* GL_INT_VEC4 */
         92, /* GL_BOOL */
         94, /* GL_BOOL_VEC2 */
         96, /* GL_BOOL_VEC3 */
         98, /* GL_BOOL_VEC4 */
-       443, /* GL_FLOAT_MAT2 */
-       445, /* GL_FLOAT_MAT3 */
-       447, /* GL_FLOAT_MAT4 */
-      1293, /* GL_SAMPLER_1D */
-      1295, /* GL_SAMPLER_2D */
-      1297, /* GL_SAMPLER_3D */
-      1298, /* GL_SAMPLER_CUBE */
-      1294, /* GL_SAMPLER_1D_SHADOW */
-      1296, /* GL_SAMPLER_2D_SHADOW */
-       527, /* GL_GL_FLOAT_MAT2x3 */
-       528, /* GL_GL_FLOAT_MAT2x4 */
-       529, /* GL_GL_FLOAT_MAT3x2 */
-       530, /* GL_GL_FLOAT_MAT3x4 */
-       531, /* GL_GL_FLOAT_MAT4x2 */
-       532, /* GL_GL_FLOAT_MAT4x3 */
-       311, /* GL_DELETE_STATUS */
-       220, /* GL_COMPILE_STATUS */
-       657, /* GL_LINK_STATUS */
-      1675, /* GL_VALIDATE_STATUS */
-       589, /* GL_INFO_LOG_LENGTH */
+       464, /* GL_FLOAT_MAT2 */
+       466, /* GL_FLOAT_MAT3 */
+       468, /* GL_FLOAT_MAT4 */
+      1350, /* GL_SAMPLER_1D */
+      1352, /* GL_SAMPLER_2D */
+      1354, /* GL_SAMPLER_3D */
+      1355, /* GL_SAMPLER_CUBE */
+      1351, /* GL_SAMPLER_1D_SHADOW */
+      1353, /* GL_SAMPLER_2D_SHADOW */
+       569, /* GL_GL_FLOAT_MAT2x3 */
+       570, /* GL_GL_FLOAT_MAT2x4 */
+       571, /* GL_GL_FLOAT_MAT3x2 */
+       572, /* GL_GL_FLOAT_MAT3x4 */
+       573, /* GL_GL_FLOAT_MAT4x2 */
+       574, /* GL_GL_FLOAT_MAT4x3 */
+       327, /* GL_DELETE_STATUS */
+       236, /* GL_COMPILE_STATUS */
+       701, /* GL_LINK_STATUS */
+      1737, /* GL_VALIDATE_STATUS */
+       632, /* GL_INFO_LOG_LENGTH */
         55, /* GL_ATTACHED_SHADERS */
         20, /* GL_ACTIVE_UNIFORMS */
         21, /* GL_ACTIVE_UNIFORM_MAX_LENGTH */
-      1335, /* GL_SHADER_SOURCE_LENGTH */
+      1392, /* GL_SHADER_SOURCE_LENGTH */
         15, /* GL_ACTIVE_ATTRIBUTES */
         16, /* GL_ACTIVE_ATTRIBUTE_MAX_LENGTH */
-       486, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
-      1338, /* GL_SHADING_LANGUAGE_VERSION */
-       289, /* GL_CURRENT_PROGRAM */
-      1032, /* GL_PALETTE4_RGB8_OES */
-      1034, /* GL_PALETTE4_RGBA8_OES */
-      1030, /* GL_PALETTE4_R5_G6_B5_OES */
-      1033, /* GL_PALETTE4_RGBA4_OES */
-      1031, /* GL_PALETTE4_RGB5_A1_OES */
-      1037, /* GL_PALETTE8_RGB8_OES */
-      1039, /* GL_PALETTE8_RGBA8_OES */
-      1035, /* GL_PALETTE8_R5_G6_B5_OES */
-      1038, /* GL_PALETTE8_RGBA4_OES */
-      1036, /* GL_PALETTE8_RGB5_A1_OES */
-       572, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
-       571, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
-      1509, /* GL_TEXTURE_1D_ARRAY_EXT */
-      1196, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
-      1511, /* GL_TEXTURE_2D_ARRAY_EXT */
-      1199, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
-      1517, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
-      1519, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
-       541, /* GL_GL_SRGB */
-       542, /* GL_GL_SRGB8 */
-       544, /* GL_GL_SRGB_ALPHA */
-       543, /* GL_GL_SRGB8_ALPHA8 */
-       540, /* GL_GL_SLUMINANCE_ALPHA */
-       539, /* GL_GL_SLUMINANCE8_ALPHA8 */
-       537, /* GL_GL_SLUMINANCE */
-       538, /* GL_GL_SLUMINANCE8 */
-       524, /* GL_GL_COMPRESSED_SRGB */
-       525, /* GL_GL_COMPRESSED_SRGB_ALPHA */
-       522, /* GL_GL_COMPRESSED_SLUMINANCE */
-       523, /* GL_GL_COMPRESSED_SLUMINANCE_ALPHA */
-      1093, /* GL_POINT_SPRITE_COORD_ORIGIN */
-       665, /* GL_LOWER_LEFT */
-      1672, /* GL_UPPER_LEFT */
-      1403, /* GL_STENCIL_BACK_REF */
-      1404, /* GL_STENCIL_BACK_VALUE_MASK */
-      1405, /* GL_STENCIL_BACK_WRITEMASK */
-       402, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
-      1238, /* GL_RENDERBUFFER_BINDING_EXT */
-      1223, /* GL_READ_FRAMEBUFFER_EXT */
-       403, /* GL_DRAW_FRAMEBUFFER_EXT */
-      1222, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
-       488, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT */
-       487, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT */
-       492, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT */
-       490, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT */
-       489, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT */
-       494, /* GL_FRAMEBUFFER_COMPLETE_EXT */
-       496, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT */
-       501, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT */
-       499, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
-       497, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
-       500, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
-       498, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
-       502, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
-       504, /* GL_FRAMEBUFFER_UNSUPPORTED_EXT */
-       503, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
-       799, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
-       145, /* GL_COLOR_ATTACHMENT0_EXT */
-       152, /* GL_COLOR_ATTACHMENT1_EXT */
-       153, /* GL_COLOR_ATTACHMENT2_EXT */
-       154, /* GL_COLOR_ATTACHMENT3_EXT */
-       155, /* GL_COLOR_ATTACHMENT4_EXT */
-       156, /* GL_COLOR_ATTACHMENT5_EXT */
-       157, /* GL_COLOR_ATTACHMENT6_EXT */
-       158, /* GL_COLOR_ATTACHMENT7_EXT */
-       159, /* GL_COLOR_ATTACHMENT8_EXT */
-       160, /* GL_COLOR_ATTACHMENT9_EXT */
-       146, /* GL_COLOR_ATTACHMENT10_EXT */
-       147, /* GL_COLOR_ATTACHMENT11_EXT */
-       148, /* GL_COLOR_ATTACHMENT12_EXT */
-       149, /* GL_COLOR_ATTACHMENT13_EXT */
-       150, /* GL_COLOR_ATTACHMENT14_EXT */
-       151, /* GL_COLOR_ATTACHMENT15_EXT */
-       313, /* GL_DEPTH_ATTACHMENT_EXT */
-      1394, /* GL_STENCIL_ATTACHMENT_EXT */
-       495, /* GL_FRAMEBUFFER_EXT */
-      1239, /* GL_RENDERBUFFER_EXT */
-      1242, /* GL_RENDERBUFFER_WIDTH_EXT */
-      1240, /* GL_RENDERBUFFER_HEIGHT_EXT */
-      1241, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */
-      1416, /* GL_STENCIL_INDEX_EXT */
-      1413, /* GL_STENCIL_INDEX1_EXT */
-      1414, /* GL_STENCIL_INDEX4_EXT */
-      1415, /* GL_STENCIL_INDEX8_EXT */
-      1412, /* GL_STENCIL_INDEX16_EXT */
-       426, /* GL_EVAL_BIT */
-      1220, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
-       659, /* GL_LIST_BIT */
-      1525, /* GL_TEXTURE_BIT */
-      1317, /* GL_SCISSOR_BIT */
+       507, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
+      1395, /* GL_SHADING_LANGUAGE_VERSION */
+       305, /* GL_CURRENT_PROGRAM */
+      1077, /* GL_PALETTE4_RGB8_OES */
+      1079, /* GL_PALETTE4_RGBA8_OES */
+      1075, /* GL_PALETTE4_R5_G6_B5_OES */
+      1078, /* GL_PALETTE4_RGBA4_OES */
+      1076, /* GL_PALETTE4_RGB5_A1_OES */
+      1082, /* GL_PALETTE8_RGB8_OES */
+      1084, /* GL_PALETTE8_RGBA8_OES */
+      1080, /* GL_PALETTE8_R5_G6_B5_OES */
+      1083, /* GL_PALETTE8_RGBA4_OES */
+      1081, /* GL_PALETTE8_RGB5_A1_OES */
+       614, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
+       613, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
+      1722, /* GL_UNSIGNED_NORMALIZED */
+      1568, /* GL_TEXTURE_1D_ARRAY_EXT */
+      1241, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
+      1570, /* GL_TEXTURE_2D_ARRAY_EXT */
+      1244, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
+      1576, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
+      1578, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
+       583, /* GL_GL_SRGB */
+       584, /* GL_GL_SRGB8 */
+       586, /* GL_GL_SRGB_ALPHA */
+       585, /* GL_GL_SRGB8_ALPHA8 */
+       582, /* GL_GL_SLUMINANCE_ALPHA */
+       581, /* GL_GL_SLUMINANCE8_ALPHA8 */
+       579, /* GL_GL_SLUMINANCE */
+       580, /* GL_GL_SLUMINANCE8 */
+       566, /* GL_GL_COMPRESSED_SRGB */
+       567, /* GL_GL_COMPRESSED_SRGB_ALPHA */
+       564, /* GL_GL_COMPRESSED_SLUMINANCE */
+       565, /* GL_GL_COMPRESSED_SLUMINANCE_ALPHA */
+      1138, /* GL_POINT_SPRITE_COORD_ORIGIN */
+       709, /* GL_LOWER_LEFT */
+      1734, /* GL_UPPER_LEFT */
+      1462, /* GL_STENCIL_BACK_REF */
+      1463, /* GL_STENCIL_BACK_VALUE_MASK */
+      1464, /* GL_STENCIL_BACK_WRITEMASK */
+       423, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
+      1286, /* GL_RENDERBUFFER_BINDING_EXT */
+      1267, /* GL_READ_FRAMEBUFFER */
+       422, /* GL_DRAW_FRAMEBUFFER */
+      1268, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
+      1296, /* GL_RENDERBUFFER_SAMPLES */
+       517, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
+       515, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
+       526, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
+       522, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
+       524, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+       529, /* GL_FRAMEBUFFER_COMPLETE */
+       533, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
+       539, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
+       537, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
+       535, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
+       538, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
+       536, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
+       542, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
+       545, /* GL_FRAMEBUFFER_UNSUPPORTED */
+       543, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
+       843, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
+       145, /* GL_COLOR_ATTACHMENT0 */
+       147, /* GL_COLOR_ATTACHMENT1 */
+       161, /* GL_COLOR_ATTACHMENT2 */
+       163, /* GL_COLOR_ATTACHMENT3 */
+       165, /* GL_COLOR_ATTACHMENT4 */
+       167, /* GL_COLOR_ATTACHMENT5 */
+       169, /* GL_COLOR_ATTACHMENT6 */
+       171, /* GL_COLOR_ATTACHMENT7 */
+       173, /* GL_COLOR_ATTACHMENT8 */
+       175, /* GL_COLOR_ATTACHMENT9 */
+       148, /* GL_COLOR_ATTACHMENT10 */
+       150, /* GL_COLOR_ATTACHMENT11 */
+       152, /* GL_COLOR_ATTACHMENT12 */
+       154, /* GL_COLOR_ATTACHMENT13 */
+       156, /* GL_COLOR_ATTACHMENT14 */
+       158, /* GL_COLOR_ATTACHMENT15 */
+       330, /* GL_DEPTH_ATTACHMENT */
+      1452, /* GL_STENCIL_ATTACHMENT */
+       508, /* GL_FRAMEBUFFER */
+      1284, /* GL_RENDERBUFFER */
+      1298, /* GL_RENDERBUFFER_WIDTH */
+      1291, /* GL_RENDERBUFFER_HEIGHT */
+      1293, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
+      1475, /* GL_STENCIL_INDEX_EXT */
+      1472, /* GL_STENCIL_INDEX1_EXT */
+      1473, /* GL_STENCIL_INDEX4_EXT */
+      1474, /* GL_STENCIL_INDEX8_EXT */
+      1471, /* GL_STENCIL_INDEX16_EXT */
+      1295, /* GL_RENDERBUFFER_RED_SIZE */
+      1290, /* GL_RENDERBUFFER_GREEN_SIZE */
+      1287, /* GL_RENDERBUFFER_BLUE_SIZE */
+      1285, /* GL_RENDERBUFFER_ALPHA_SIZE */
+      1288, /* GL_RENDERBUFFER_DEPTH_SIZE */
+      1297, /* GL_RENDERBUFFER_STENCIL_SIZE */
+       541, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
+       899, /* GL_MAX_SAMPLES */
+       447, /* GL_EVAL_BIT */
+      1265, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
+       703, /* GL_LIST_BIT */
+      1584, /* GL_TEXTURE_BIT */
+      1374, /* GL_SCISSOR_BIT */
         29, /* GL_ALL_ATTRIB_BITS */
-       939, /* GL_MULTISAMPLE_BIT */
+       984, /* GL_MULTISAMPLE_BIT */
         30, /* GL_ALL_CLIENT_ATTRIB_BITS */
 };
 
diff --git a/src/mesa/sparc/glapi_sparc.S b/src/mesa/sparc/glapi_sparc.S
index 3d1d55fd76..7d215939b4 100644
--- a/src/mesa/sparc/glapi_sparc.S
+++ b/src/mesa/sparc/glapi_sparc.S
@@ -626,8 +626,8 @@ __glapi_sparc_icache_flush: /* %o0 = insn_addr */
 		.globl glGetActiveAttribARB ; .type glGetActiveAttribARB,#function
 		.globl glGetAttribLocationARB ; .type glGetAttribLocationARB,#function
 		.globl glDrawBuffersARB ; .type glDrawBuffersARB,#function
+		.globl glRenderbufferStorageMultisample ; .type glRenderbufferStorageMultisample,#function
 		.globl glPolygonOffsetEXT ; .type glPolygonOffsetEXT,#function
-		.globl gl_dispatch_stub_562 ; .type gl_dispatch_stub_562,#function
 		.globl gl_dispatch_stub_563 ; .type gl_dispatch_stub_563,#function
 		.globl gl_dispatch_stub_564 ; .type gl_dispatch_stub_564,#function
 		.globl gl_dispatch_stub_565 ; .type gl_dispatch_stub_565,#function
@@ -635,6 +635,7 @@ __glapi_sparc_icache_flush: /* %o0 = insn_addr */
 		.globl gl_dispatch_stub_567 ; .type gl_dispatch_stub_567,#function
 		.globl gl_dispatch_stub_568 ; .type gl_dispatch_stub_568,#function
 		.globl gl_dispatch_stub_569 ; .type gl_dispatch_stub_569,#function
+		.globl gl_dispatch_stub_570 ; .type gl_dispatch_stub_570,#function
 		.globl glColorPointerEXT ; .type glColorPointerEXT,#function
 		.globl glEdgeFlagPointerEXT ; .type glEdgeFlagPointerEXT,#function
 		.globl glIndexPointerEXT ; .type glIndexPointerEXT,#function
@@ -645,8 +646,8 @@ __glapi_sparc_icache_flush: /* %o0 = insn_addr */
 		.globl glPointParameterfvEXT ; .type glPointParameterfvEXT,#function
 		.globl glLockArraysEXT ; .type glLockArraysEXT,#function
 		.globl glUnlockArraysEXT ; .type glUnlockArraysEXT,#function
-		.globl gl_dispatch_stub_580 ; .type gl_dispatch_stub_580,#function
 		.globl gl_dispatch_stub_581 ; .type gl_dispatch_stub_581,#function
+		.globl gl_dispatch_stub_582 ; .type gl_dispatch_stub_582,#function
 		.globl glSecondaryColor3bEXT ; .type glSecondaryColor3bEXT,#function
 		.globl glSecondaryColor3bvEXT ; .type glSecondaryColor3bvEXT,#function
 		.globl glSecondaryColor3dEXT ; .type glSecondaryColor3dEXT,#function
@@ -671,7 +672,7 @@ __glapi_sparc_icache_flush: /* %o0 = insn_addr */
 		.globl glFogCoorddvEXT ; .type glFogCoorddvEXT,#function
 		.globl glFogCoordfEXT ; .type glFogCoordfEXT,#function
 		.globl glFogCoordfvEXT ; .type glFogCoordfvEXT,#function
-		.globl gl_dispatch_stub_606 ; .type gl_dispatch_stub_606,#function
+		.globl gl_dispatch_stub_607 ; .type gl_dispatch_stub_607,#function
 		.globl glBlendFuncSeparateEXT ; .type glBlendFuncSeparateEXT,#function
 		.globl glFlushVertexArrayRangeNV ; .type glFlushVertexArrayRangeNV,#function
 		.globl glVertexArrayRangeNV ; .type glVertexArrayRangeNV,#function
@@ -713,7 +714,6 @@ __glapi_sparc_icache_flush: /* %o0 = insn_addr */
 		.globl glWindowPos4ivMESA ; .type glWindowPos4ivMESA,#function
 		.globl glWindowPos4sMESA ; .type glWindowPos4sMESA,#function
 		.globl glWindowPos4svMESA ; .type glWindowPos4svMESA,#function
-		.globl gl_dispatch_stub_648 ; .type gl_dispatch_stub_648,#function
 		.globl gl_dispatch_stub_649 ; .type gl_dispatch_stub_649,#function
 		.globl gl_dispatch_stub_650 ; .type gl_dispatch_stub_650,#function
 		.globl gl_dispatch_stub_651 ; .type gl_dispatch_stub_651,#function
@@ -722,6 +722,7 @@ __glapi_sparc_icache_flush: /* %o0 = insn_addr */
 		.globl gl_dispatch_stub_654 ; .type gl_dispatch_stub_654,#function
 		.globl gl_dispatch_stub_655 ; .type gl_dispatch_stub_655,#function
 		.globl gl_dispatch_stub_656 ; .type gl_dispatch_stub_656,#function
+		.globl gl_dispatch_stub_657 ; .type gl_dispatch_stub_657,#function
 		.globl glAreProgramsResidentNV ; .type glAreProgramsResidentNV,#function
 		.globl glBindProgramNV ; .type glBindProgramNV,#function
 		.globl glDeleteProgramsNV ; .type glDeleteProgramsNV,#function
@@ -798,19 +799,19 @@ __glapi_sparc_icache_flush: /* %o0 = insn_addr */
 		.globl glSetFragmentShaderConstantATI ; .type glSetFragmentShaderConstantATI,#function
 		.globl glPointParameteriNV ; .type glPointParameteriNV,#function
 		.globl glPointParameterivNV ; .type glPointParameterivNV,#function
-		.globl gl_dispatch_stub_733 ; .type gl_dispatch_stub_733,#function
 		.globl gl_dispatch_stub_734 ; .type gl_dispatch_stub_734,#function
 		.globl gl_dispatch_stub_735 ; .type gl_dispatch_stub_735,#function
 		.globl gl_dispatch_stub_736 ; .type gl_dispatch_stub_736,#function
 		.globl gl_dispatch_stub_737 ; .type gl_dispatch_stub_737,#function
+		.globl gl_dispatch_stub_738 ; .type gl_dispatch_stub_738,#function
 		.globl glGetProgramNamedParameterdvNV ; .type glGetProgramNamedParameterdvNV,#function
 		.globl glGetProgramNamedParameterfvNV ; .type glGetProgramNamedParameterfvNV,#function
 		.globl glProgramNamedParameter4dNV ; .type glProgramNamedParameter4dNV,#function
 		.globl glProgramNamedParameter4dvNV ; .type glProgramNamedParameter4dvNV,#function
 		.globl glProgramNamedParameter4fNV ; .type glProgramNamedParameter4fNV,#function
 		.globl glProgramNamedParameter4fvNV ; .type glProgramNamedParameter4fvNV,#function
-		.globl gl_dispatch_stub_744 ; .type gl_dispatch_stub_744,#function
 		.globl gl_dispatch_stub_745 ; .type gl_dispatch_stub_745,#function
+		.globl gl_dispatch_stub_746 ; .type gl_dispatch_stub_746,#function
 		.globl glBindFramebufferEXT ; .type glBindFramebufferEXT,#function
 		.globl glBindRenderbufferEXT ; .type glBindRenderbufferEXT,#function
 		.globl glCheckFramebufferStatusEXT ; .type glCheckFramebufferStatusEXT,#function
@@ -828,13 +829,13 @@ __glapi_sparc_icache_flush: /* %o0 = insn_addr */
 		.globl glIsFramebufferEXT ; .type glIsFramebufferEXT,#function
 		.globl glIsRenderbufferEXT ; .type glIsRenderbufferEXT,#function
 		.globl glRenderbufferStorageEXT ; .type glRenderbufferStorageEXT,#function
-		.globl gl_dispatch_stub_763 ; .type gl_dispatch_stub_763,#function
+		.globl gl_dispatch_stub_764 ; .type gl_dispatch_stub_764,#function
 		.globl glFramebufferTextureLayerEXT ; .type glFramebufferTextureLayerEXT,#function
-		.globl gl_dispatch_stub_765 ; .type gl_dispatch_stub_765,#function
 		.globl gl_dispatch_stub_766 ; .type gl_dispatch_stub_766,#function
 		.globl gl_dispatch_stub_767 ; .type gl_dispatch_stub_767,#function
 		.globl gl_dispatch_stub_768 ; .type gl_dispatch_stub_768,#function
 		.globl gl_dispatch_stub_769 ; .type gl_dispatch_stub_769,#function
+		.globl gl_dispatch_stub_770 ; .type gl_dispatch_stub_770,#function
 		.globl _mesa_sparc_glapi_begin ; .type _mesa_sparc_glapi_begin,#function
 _mesa_sparc_glapi_begin:
 
@@ -1399,8 +1400,8 @@ _mesa_sparc_glapi_begin:
 	GL_STUB(glGetActiveAttribARB, _gloffset_GetActiveAttribARB)
 	GL_STUB(glGetAttribLocationARB, _gloffset_GetAttribLocationARB)
 	GL_STUB(glDrawBuffersARB, _gloffset_DrawBuffersARB)
+	GL_STUB(glRenderbufferStorageMultisample, _gloffset_RenderbufferStorageMultisample)
 	GL_STUB(glPolygonOffsetEXT, _gloffset_PolygonOffsetEXT)
-	GL_STUB(gl_dispatch_stub_562, _gloffset__dispatch_stub_562)
 	GL_STUB(gl_dispatch_stub_563, _gloffset__dispatch_stub_563)
 	GL_STUB(gl_dispatch_stub_564, _gloffset__dispatch_stub_564)
 	GL_STUB(gl_dispatch_stub_565, _gloffset__dispatch_stub_565)
@@ -1408,6 +1409,7 @@ _mesa_sparc_glapi_begin:
 	GL_STUB(gl_dispatch_stub_567, _gloffset__dispatch_stub_567)
 	GL_STUB(gl_dispatch_stub_568, _gloffset__dispatch_stub_568)
 	GL_STUB(gl_dispatch_stub_569, _gloffset__dispatch_stub_569)
+	GL_STUB(gl_dispatch_stub_570, _gloffset__dispatch_stub_570)
 	GL_STUB(glColorPointerEXT, _gloffset_ColorPointerEXT)
 	GL_STUB(glEdgeFlagPointerEXT, _gloffset_EdgeFlagPointerEXT)
 	GL_STUB(glIndexPointerEXT, _gloffset_IndexPointerEXT)
@@ -1418,8 +1420,8 @@ _mesa_sparc_glapi_begin:
 	GL_STUB(glPointParameterfvEXT, _gloffset_PointParameterfvEXT)
 	GL_STUB(glLockArraysEXT, _gloffset_LockArraysEXT)
 	GL_STUB(glUnlockArraysEXT, _gloffset_UnlockArraysEXT)
-	GL_STUB(gl_dispatch_stub_580, _gloffset__dispatch_stub_580)
 	GL_STUB(gl_dispatch_stub_581, _gloffset__dispatch_stub_581)
+	GL_STUB(gl_dispatch_stub_582, _gloffset__dispatch_stub_582)
 	GL_STUB(glSecondaryColor3bEXT, _gloffset_SecondaryColor3bEXT)
 	GL_STUB(glSecondaryColor3bvEXT, _gloffset_SecondaryColor3bvEXT)
 	GL_STUB(glSecondaryColor3dEXT, _gloffset_SecondaryColor3dEXT)
@@ -1444,7 +1446,7 @@ _mesa_sparc_glapi_begin:
 	GL_STUB(glFogCoorddvEXT, _gloffset_FogCoorddvEXT)
 	GL_STUB(glFogCoordfEXT, _gloffset_FogCoordfEXT)
 	GL_STUB(glFogCoordfvEXT, _gloffset_FogCoordfvEXT)
-	GL_STUB(gl_dispatch_stub_606, _gloffset__dispatch_stub_606)
+	GL_STUB(gl_dispatch_stub_607, _gloffset__dispatch_stub_607)
 	GL_STUB(glBlendFuncSeparateEXT, _gloffset_BlendFuncSeparateEXT)
 	GL_STUB(glFlushVertexArrayRangeNV, _gloffset_FlushVertexArrayRangeNV)
 	GL_STUB(glVertexArrayRangeNV, _gloffset_VertexArrayRangeNV)
@@ -1486,7 +1488,6 @@ _mesa_sparc_glapi_begin:
 	GL_STUB(glWindowPos4ivMESA, _gloffset_WindowPos4ivMESA)
 	GL_STUB(glWindowPos4sMESA, _gloffset_WindowPos4sMESA)
 	GL_STUB(glWindowPos4svMESA, _gloffset_WindowPos4svMESA)
-	GL_STUB(gl_dispatch_stub_648, _gloffset__dispatch_stub_648)
 	GL_STUB(gl_dispatch_stub_649, _gloffset__dispatch_stub_649)
 	GL_STUB(gl_dispatch_stub_650, _gloffset__dispatch_stub_650)
 	GL_STUB(gl_dispatch_stub_651, _gloffset__dispatch_stub_651)
@@ -1495,6 +1496,7 @@ _mesa_sparc_glapi_begin:
 	GL_STUB(gl_dispatch_stub_654, _gloffset__dispatch_stub_654)
 	GL_STUB(gl_dispatch_stub_655, _gloffset__dispatch_stub_655)
 	GL_STUB(gl_dispatch_stub_656, _gloffset__dispatch_stub_656)
+	GL_STUB(gl_dispatch_stub_657, _gloffset__dispatch_stub_657)
 	GL_STUB(glAreProgramsResidentNV, _gloffset_AreProgramsResidentNV)
 	GL_STUB(glBindProgramNV, _gloffset_BindProgramNV)
 	GL_STUB(glDeleteProgramsNV, _gloffset_DeleteProgramsNV)
@@ -1571,19 +1573,19 @@ _mesa_sparc_glapi_begin:
 	GL_STUB(glSetFragmentShaderConstantATI, _gloffset_SetFragmentShaderConstantATI)
 	GL_STUB(glPointParameteriNV, _gloffset_PointParameteriNV)
 	GL_STUB(glPointParameterivNV, _gloffset_PointParameterivNV)
-	GL_STUB(gl_dispatch_stub_733, _gloffset__dispatch_stub_733)
 	GL_STUB(gl_dispatch_stub_734, _gloffset__dispatch_stub_734)
 	GL_STUB(gl_dispatch_stub_735, _gloffset__dispatch_stub_735)
 	GL_STUB(gl_dispatch_stub_736, _gloffset__dispatch_stub_736)
 	GL_STUB(gl_dispatch_stub_737, _gloffset__dispatch_stub_737)
+	GL_STUB(gl_dispatch_stub_738, _gloffset__dispatch_stub_738)
 	GL_STUB(glGetProgramNamedParameterdvNV, _gloffset_GetProgramNamedParameterdvNV)
 	GL_STUB(glGetProgramNamedParameterfvNV, _gloffset_GetProgramNamedParameterfvNV)
 	GL_STUB(glProgramNamedParameter4dNV, _gloffset_ProgramNamedParameter4dNV)
 	GL_STUB(glProgramNamedParameter4dvNV, _gloffset_ProgramNamedParameter4dvNV)
 	GL_STUB(glProgramNamedParameter4fNV, _gloffset_ProgramNamedParameter4fNV)
 	GL_STUB(glProgramNamedParameter4fvNV, _gloffset_ProgramNamedParameter4fvNV)
-	GL_STUB(gl_dispatch_stub_744, _gloffset__dispatch_stub_744)
 	GL_STUB(gl_dispatch_stub_745, _gloffset__dispatch_stub_745)
+	GL_STUB(gl_dispatch_stub_746, _gloffset__dispatch_stub_746)
 	GL_STUB(glBindFramebufferEXT, _gloffset_BindFramebufferEXT)
 	GL_STUB(glBindRenderbufferEXT, _gloffset_BindRenderbufferEXT)
 	GL_STUB(glCheckFramebufferStatusEXT, _gloffset_CheckFramebufferStatusEXT)
@@ -1601,13 +1603,13 @@ _mesa_sparc_glapi_begin:
 	GL_STUB(glIsFramebufferEXT, _gloffset_IsFramebufferEXT)
 	GL_STUB(glIsRenderbufferEXT, _gloffset_IsRenderbufferEXT)
 	GL_STUB(glRenderbufferStorageEXT, _gloffset_RenderbufferStorageEXT)
-	GL_STUB(gl_dispatch_stub_763, _gloffset__dispatch_stub_763)
+	GL_STUB(gl_dispatch_stub_764, _gloffset__dispatch_stub_764)
 	GL_STUB(glFramebufferTextureLayerEXT, _gloffset_FramebufferTextureLayerEXT)
-	GL_STUB(gl_dispatch_stub_765, _gloffset__dispatch_stub_765)
 	GL_STUB(gl_dispatch_stub_766, _gloffset__dispatch_stub_766)
 	GL_STUB(gl_dispatch_stub_767, _gloffset__dispatch_stub_767)
 	GL_STUB(gl_dispatch_stub_768, _gloffset__dispatch_stub_768)
 	GL_STUB(gl_dispatch_stub_769, _gloffset__dispatch_stub_769)
+	GL_STUB(gl_dispatch_stub_770, _gloffset__dispatch_stub_770)
 
 		.globl _mesa_sparc_glapi_end ; .type _mesa_sparc_glapi_end,#function
 _mesa_sparc_glapi_end:
@@ -1866,3 +1868,22 @@ _mesa_sparc_glapi_end:
 	.globl glPointParameteri ; .type glPointParameteri,#function ; glPointParameteri = glPointParameteriNV
 	.globl glPointParameteriv ; .type glPointParameteriv,#function ; glPointParameteriv = glPointParameterivNV
 	.globl glBlendEquationSeparate ; .type glBlendEquationSeparate,#function ; glBlendEquationSeparate = glBlendEquationSeparateEXT
+	.globl glBindFramebuffer ; .type glBindFramebuffer,#function ; glBindFramebuffer = glBindFramebufferEXT
+	.globl glBindRenderbuffer ; .type glBindRenderbuffer,#function ; glBindRenderbuffer = glBindRenderbufferEXT
+	.globl glCheckFramebufferStatus ; .type glCheckFramebufferStatus,#function ; glCheckFramebufferStatus = glCheckFramebufferStatusEXT
+	.globl glDeleteFramebuffers ; .type glDeleteFramebuffers,#function ; glDeleteFramebuffers = glDeleteFramebuffersEXT
+	.globl glDeleteRenderbuffers ; .type glDeleteRenderbuffers,#function ; glDeleteRenderbuffers = glDeleteRenderbuffersEXT
+	.globl glFramebufferRenderbuffer ; .type glFramebufferRenderbuffer,#function ; glFramebufferRenderbuffer = glFramebufferRenderbufferEXT
+	.globl glFramebufferTexture1D ; .type glFramebufferTexture1D,#function ; glFramebufferTexture1D = glFramebufferTexture1DEXT
+	.globl glFramebufferTexture2D ; .type glFramebufferTexture2D,#function ; glFramebufferTexture2D = glFramebufferTexture2DEXT
+	.globl glFramebufferTexture3D ; .type glFramebufferTexture3D,#function ; glFramebufferTexture3D = glFramebufferTexture3DEXT
+	.globl glGenFramebuffers ; .type glGenFramebuffers,#function ; glGenFramebuffers = glGenFramebuffersEXT
+	.globl glGenRenderbuffers ; .type glGenRenderbuffers,#function ; glGenRenderbuffers = glGenRenderbuffersEXT
+	.globl glGenerateMipmap ; .type glGenerateMipmap,#function ; glGenerateMipmap = glGenerateMipmapEXT
+	.globl glGetFramebufferAttachmentParameteriv ; .type glGetFramebufferAttachmentParameteriv,#function ; glGetFramebufferAttachmentParameteriv = glGetFramebufferAttachmentParameterivEXT
+	.globl glGetRenderbufferParameteriv ; .type glGetRenderbufferParameteriv,#function ; glGetRenderbufferParameteriv = glGetRenderbufferParameterivEXT
+	.globl glIsFramebuffer ; .type glIsFramebuffer,#function ; glIsFramebuffer = glIsFramebufferEXT
+	.globl glIsRenderbuffer ; .type glIsRenderbuffer,#function ; glIsRenderbuffer = glIsRenderbufferEXT
+	.globl glRenderbufferStorage ; .type glRenderbufferStorage,#function ; glRenderbufferStorage = glRenderbufferStorageEXT
+	.globl glBlitFramebuffer ; .type glBlitFramebuffer,#function ; glBlitFramebuffer = glBlitFramebufferEXT
+	.globl glFramebufferTextureLayer ; .type glFramebufferTextureLayer,#function ; glFramebufferTextureLayer = glFramebufferTextureLayerEXT
diff --git a/src/mesa/x86-64/glapi_x86-64.S b/src/mesa/x86-64/glapi_x86-64.S
index cb34061b36..1eb4358b1c 100644
--- a/src/mesa/x86-64/glapi_x86-64.S
+++ b/src/mesa/x86-64/glapi_x86-64.S
@@ -21112,21 +21112,25 @@ GL_PREFIX(DrawBuffersARB):
 	.size	GL_PREFIX(DrawBuffersARB), .-GL_PREFIX(DrawBuffersARB)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(PolygonOffsetEXT)
-	.type	GL_PREFIX(PolygonOffsetEXT), @function
-GL_PREFIX(PolygonOffsetEXT):
+	.globl	GL_PREFIX(RenderbufferStorageMultisample)
+	.type	GL_PREFIX(RenderbufferStorageMultisample), @function
+GL_PREFIX(RenderbufferStorageMultisample):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
 	movq	4488(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
-	subq	$24, %rsp
-	movq	%xmm0, (%rsp)
-	movq	%xmm1, 8(%rsp)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	pushq	%rcx
+	pushq	%r8
 	call	_x86_64_get_dispatch@PLT
-	movq	8(%rsp), %xmm1
-	movq	(%rsp), %xmm0
-	addq	$24, %rsp
+	popq	%r8
+	popq	%rcx
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
 	movq	4488(%rax), %r11
 	jmp	*%r11
 #else
@@ -21136,35 +21140,38 @@ GL_PREFIX(PolygonOffsetEXT):
 	movq	4488(%rax), %r11
 	jmp	*%r11
 1:
-	subq	$24, %rsp
-	movq	%xmm0, (%rsp)
-	movq	%xmm1, 8(%rsp)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	pushq	%rcx
+	pushq	%r8
 	call	_glapi_get_dispatch
-	movq	8(%rsp), %xmm1
-	movq	(%rsp), %xmm0
-	addq	$24, %rsp
+	popq	%r8
+	popq	%rcx
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
 	movq	4488(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(PolygonOffsetEXT), .-GL_PREFIX(PolygonOffsetEXT)
+	.size	GL_PREFIX(RenderbufferStorageMultisample), .-GL_PREFIX(RenderbufferStorageMultisample)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_562)
-	.type	GL_PREFIX(_dispatch_stub_562), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_562))
-GL_PREFIX(_dispatch_stub_562):
+	.globl	GL_PREFIX(PolygonOffsetEXT)
+	.type	GL_PREFIX(PolygonOffsetEXT), @function
+GL_PREFIX(PolygonOffsetEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
 	movq	4496(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
-	pushq	%rdi
-	pushq	%rsi
-	pushq	%rbp
+	subq	$24, %rsp
+	movq	%xmm0, (%rsp)
+	movq	%xmm1, 8(%rsp)
 	call	_x86_64_get_dispatch@PLT
-	popq	%rbp
-	popq	%rsi
-	popq	%rdi
+	movq	8(%rsp), %xmm1
+	movq	(%rsp), %xmm0
+	addq	$24, %rsp
 	movq	4496(%rax), %r11
 	jmp	*%r11
 #else
@@ -21174,17 +21181,17 @@ GL_PREFIX(_dispatch_stub_562):
 	movq	4496(%rax), %r11
 	jmp	*%r11
 1:
-	pushq	%rdi
-	pushq	%rsi
-	pushq	%rbp
+	subq	$24, %rsp
+	movq	%xmm0, (%rsp)
+	movq	%xmm1, 8(%rsp)
 	call	_glapi_get_dispatch
-	popq	%rbp
-	popq	%rsi
-	popq	%rdi
+	movq	8(%rsp), %xmm1
+	movq	(%rsp), %xmm0
+	addq	$24, %rsp
 	movq	4496(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_562), .-GL_PREFIX(_dispatch_stub_562)
+	.size	GL_PREFIX(PolygonOffsetEXT), .-GL_PREFIX(PolygonOffsetEXT)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(_dispatch_stub_563)
@@ -21234,13 +21241,13 @@ GL_PREFIX(_dispatch_stub_564):
 	movq	4512(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
-	subq	$24, %rsp
-	movq	%rdi, (%rsp)
-	movq	%xmm0, 8(%rsp)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
-	movq	8(%rsp), %xmm0
-	movq	(%rsp), %rdi
-	addq	$24, %rsp
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
 	movq	4512(%rax), %r11
 	jmp	*%r11
 #else
@@ -21250,13 +21257,13 @@ GL_PREFIX(_dispatch_stub_564):
 	movq	4512(%rax), %r11
 	jmp	*%r11
 1:
-	subq	$24, %rsp
-	movq	%rdi, (%rsp)
-	movq	%xmm0, 8(%rsp)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
 	call	_glapi_get_dispatch
-	movq	8(%rsp), %xmm0
-	movq	(%rsp), %rdi
-	addq	$24, %rsp
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
 	movq	4512(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
@@ -21272,13 +21279,13 @@ GL_PREFIX(_dispatch_stub_565):
 	movq	4520(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
-	pushq	%rdi
-	pushq	%rsi
-	pushq	%rbp
+	subq	$24, %rsp
+	movq	%rdi, (%rsp)
+	movq	%xmm0, 8(%rsp)
 	call	_x86_64_get_dispatch@PLT
-	popq	%rbp
-	popq	%rsi
-	popq	%rdi
+	movq	8(%rsp), %xmm0
+	movq	(%rsp), %rdi
+	addq	$24, %rsp
 	movq	4520(%rax), %r11
 	jmp	*%r11
 #else
@@ -21288,13 +21295,13 @@ GL_PREFIX(_dispatch_stub_565):
 	movq	4520(%rax), %r11
 	jmp	*%r11
 1:
-	pushq	%rdi
-	pushq	%rsi
-	pushq	%rbp
+	subq	$24, %rsp
+	movq	%rdi, (%rsp)
+	movq	%xmm0, 8(%rsp)
 	call	_glapi_get_dispatch
-	popq	%rbp
-	popq	%rsi
-	popq	%rdi
+	movq	8(%rsp), %xmm0
+	movq	(%rsp), %rdi
+	addq	$24, %rsp
 	movq	4520(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
@@ -21425,7 +21432,11 @@ GL_PREFIX(_dispatch_stub_569):
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
+	popq	%rbp
+	popq	%rsi
 	popq	%rdi
 	movq	4552(%rax), %r11
 	jmp	*%r11
@@ -21437,20 +21448,54 @@ GL_PREFIX(_dispatch_stub_569):
 	jmp	*%r11
 1:
 	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
 	call	_glapi_get_dispatch
+	popq	%rbp
+	popq	%rsi
 	popq	%rdi
 	movq	4552(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(_dispatch_stub_569), .-GL_PREFIX(_dispatch_stub_569)
 
+	.p2align	4,,15
+	.globl	GL_PREFIX(_dispatch_stub_570)
+	.type	GL_PREFIX(_dispatch_stub_570), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_570))
+GL_PREFIX(_dispatch_stub_570):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	4560(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	call	_x86_64_get_dispatch@PLT
+	popq	%rdi
+	movq	4560(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	4560(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	call	_glapi_get_dispatch
+	popq	%rdi
+	movq	4560(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(_dispatch_stub_570), .-GL_PREFIX(_dispatch_stub_570)
+
 	.p2align	4,,15
 	.globl	GL_PREFIX(ColorPointerEXT)
 	.type	GL_PREFIX(ColorPointerEXT), @function
 GL_PREFIX(ColorPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4560(%rax), %r11
+	movq	4568(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21464,13 +21509,13 @@ GL_PREFIX(ColorPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4560(%rax), %r11
+	movq	4568(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4560(%rax), %r11
+	movq	4568(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21484,7 +21529,7 @@ GL_PREFIX(ColorPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4560(%rax), %r11
+	movq	4568(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorPointerEXT), .-GL_PREFIX(ColorPointerEXT)
@@ -21495,7 +21540,7 @@ GL_PREFIX(ColorPointerEXT):
 GL_PREFIX(EdgeFlagPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4568(%rax), %r11
+	movq	4576(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21505,13 +21550,13 @@ GL_PREFIX(EdgeFlagPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4568(%rax), %r11
+	movq	4576(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4568(%rax), %r11
+	movq	4576(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21521,7 +21566,7 @@ GL_PREFIX(EdgeFlagPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4568(%rax), %r11
+	movq	4576(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EdgeFlagPointerEXT), .-GL_PREFIX(EdgeFlagPointerEXT)
@@ -21532,7 +21577,7 @@ GL_PREFIX(EdgeFlagPointerEXT):
 GL_PREFIX(IndexPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4576(%rax), %r11
+	movq	4584(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21546,13 +21591,13 @@ GL_PREFIX(IndexPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4576(%rax), %r11
+	movq	4584(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4576(%rax), %r11
+	movq	4584(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21566,7 +21611,7 @@ GL_PREFIX(IndexPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4576(%rax), %r11
+	movq	4584(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IndexPointerEXT), .-GL_PREFIX(IndexPointerEXT)
@@ -21577,7 +21622,7 @@ GL_PREFIX(IndexPointerEXT):
 GL_PREFIX(NormalPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4584(%rax), %r11
+	movq	4592(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21591,13 +21636,13 @@ GL_PREFIX(NormalPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4584(%rax), %r11
+	movq	4592(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4584(%rax), %r11
+	movq	4592(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21611,7 +21656,7 @@ GL_PREFIX(NormalPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4584(%rax), %r11
+	movq	4592(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(NormalPointerEXT), .-GL_PREFIX(NormalPointerEXT)
@@ -21622,7 +21667,7 @@ GL_PREFIX(NormalPointerEXT):
 GL_PREFIX(TexCoordPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4592(%rax), %r11
+	movq	4600(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21636,13 +21681,13 @@ GL_PREFIX(TexCoordPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4592(%rax), %r11
+	movq	4600(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4592(%rax), %r11
+	movq	4600(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21656,7 +21701,7 @@ GL_PREFIX(TexCoordPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4592(%rax), %r11
+	movq	4600(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexCoordPointerEXT), .-GL_PREFIX(TexCoordPointerEXT)
@@ -21667,7 +21712,7 @@ GL_PREFIX(TexCoordPointerEXT):
 GL_PREFIX(VertexPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4600(%rax), %r11
+	movq	4608(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21681,13 +21726,13 @@ GL_PREFIX(VertexPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4600(%rax), %r11
+	movq	4608(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4600(%rax), %r11
+	movq	4608(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21701,7 +21746,7 @@ GL_PREFIX(VertexPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4600(%rax), %r11
+	movq	4608(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexPointerEXT), .-GL_PREFIX(VertexPointerEXT)
@@ -21712,7 +21757,7 @@ GL_PREFIX(VertexPointerEXT):
 GL_PREFIX(PointParameterfEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4608(%rax), %r11
+	movq	4616(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -21722,13 +21767,13 @@ GL_PREFIX(PointParameterfEXT):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	4608(%rax), %r11
+	movq	4616(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4608(%rax), %r11
+	movq	4616(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -21738,7 +21783,7 @@ GL_PREFIX(PointParameterfEXT):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	4608(%rax), %r11
+	movq	4616(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PointParameterfEXT), .-GL_PREFIX(PointParameterfEXT)
@@ -21749,7 +21794,7 @@ GL_PREFIX(PointParameterfEXT):
 GL_PREFIX(PointParameterfvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4616(%rax), %r11
+	movq	4624(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21759,13 +21804,13 @@ GL_PREFIX(PointParameterfvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4616(%rax), %r11
+	movq	4624(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4616(%rax), %r11
+	movq	4624(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21775,7 +21820,7 @@ GL_PREFIX(PointParameterfvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4616(%rax), %r11
+	movq	4624(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PointParameterfvEXT), .-GL_PREFIX(PointParameterfvEXT)
@@ -21786,7 +21831,7 @@ GL_PREFIX(PointParameterfvEXT):
 GL_PREFIX(LockArraysEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4624(%rax), %r11
+	movq	4632(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21796,13 +21841,13 @@ GL_PREFIX(LockArraysEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4624(%rax), %r11
+	movq	4632(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4624(%rax), %r11
+	movq	4632(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21812,7 +21857,7 @@ GL_PREFIX(LockArraysEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4624(%rax), %r11
+	movq	4632(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(LockArraysEXT), .-GL_PREFIX(LockArraysEXT)
@@ -21823,37 +21868,37 @@ GL_PREFIX(LockArraysEXT):
 GL_PREFIX(UnlockArraysEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4632(%rax), %r11
+	movq	4640(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	4632(%rax), %r11
+	movq	4640(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4632(%rax), %r11
+	movq	4640(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	4632(%rax), %r11
+	movq	4640(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(UnlockArraysEXT), .-GL_PREFIX(UnlockArraysEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_580)
-	.type	GL_PREFIX(_dispatch_stub_580), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_580))
-GL_PREFIX(_dispatch_stub_580):
+	.globl	GL_PREFIX(_dispatch_stub_581)
+	.type	GL_PREFIX(_dispatch_stub_581), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_581))
+GL_PREFIX(_dispatch_stub_581):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4640(%rax), %r11
+	movq	4648(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21863,13 +21908,13 @@ GL_PREFIX(_dispatch_stub_580):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4640(%rax), %r11
+	movq	4648(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4640(%rax), %r11
+	movq	4648(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21879,19 +21924,19 @@ GL_PREFIX(_dispatch_stub_580):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4640(%rax), %r11
+	movq	4648(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_580), .-GL_PREFIX(_dispatch_stub_580)
+	.size	GL_PREFIX(_dispatch_stub_581), .-GL_PREFIX(_dispatch_stub_581)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_581)
-	.type	GL_PREFIX(_dispatch_stub_581), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_581))
-GL_PREFIX(_dispatch_stub_581):
+	.globl	GL_PREFIX(_dispatch_stub_582)
+	.type	GL_PREFIX(_dispatch_stub_582), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_582))
+GL_PREFIX(_dispatch_stub_582):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4648(%rax), %r11
+	movq	4656(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21901,13 +21946,13 @@ GL_PREFIX(_dispatch_stub_581):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4648(%rax), %r11
+	movq	4656(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4648(%rax), %r11
+	movq	4656(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21917,10 +21962,10 @@ GL_PREFIX(_dispatch_stub_581):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4648(%rax), %r11
+	movq	4656(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_581), .-GL_PREFIX(_dispatch_stub_581)
+	.size	GL_PREFIX(_dispatch_stub_582), .-GL_PREFIX(_dispatch_stub_582)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(SecondaryColor3bEXT)
@@ -21928,7 +21973,7 @@ GL_PREFIX(_dispatch_stub_581):
 GL_PREFIX(SecondaryColor3bEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4656(%rax), %r11
+	movq	4664(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21938,13 +21983,13 @@ GL_PREFIX(SecondaryColor3bEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4656(%rax), %r11
+	movq	4664(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4656(%rax), %r11
+	movq	4664(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21954,7 +21999,7 @@ GL_PREFIX(SecondaryColor3bEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4656(%rax), %r11
+	movq	4664(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3bEXT), .-GL_PREFIX(SecondaryColor3bEXT)
@@ -21965,25 +22010,25 @@ GL_PREFIX(SecondaryColor3bEXT):
 GL_PREFIX(SecondaryColor3bvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4664(%rax), %r11
+	movq	4672(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4664(%rax), %r11
+	movq	4672(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4664(%rax), %r11
+	movq	4672(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4664(%rax), %r11
+	movq	4672(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3bvEXT), .-GL_PREFIX(SecondaryColor3bvEXT)
@@ -21994,7 +22039,7 @@ GL_PREFIX(SecondaryColor3bvEXT):
 GL_PREFIX(SecondaryColor3dEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4672(%rax), %r11
+	movq	4680(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -22006,13 +22051,13 @@ GL_PREFIX(SecondaryColor3dEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	4672(%rax), %r11
+	movq	4680(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4672(%rax), %r11
+	movq	4680(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -22024,7 +22069,7 @@ GL_PREFIX(SecondaryColor3dEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	4672(%rax), %r11
+	movq	4680(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3dEXT), .-GL_PREFIX(SecondaryColor3dEXT)
@@ -22035,25 +22080,25 @@ GL_PREFIX(SecondaryColor3dEXT):
 GL_PREFIX(SecondaryColor3dvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4680(%rax), %r11
+	movq	4688(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4680(%rax), %r11
+	movq	4688(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4680(%rax), %r11
+	movq	4688(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4680(%rax), %r11
+	movq	4688(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3dvEXT), .-GL_PREFIX(SecondaryColor3dvEXT)
@@ -22064,7 +22109,7 @@ GL_PREFIX(SecondaryColor3dvEXT):
 GL_PREFIX(SecondaryColor3fEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4688(%rax), %r11
+	movq	4696(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -22076,13 +22121,13 @@ GL_PREFIX(SecondaryColor3fEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	4688(%rax), %r11
+	movq	4696(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4688(%rax), %r11
+	movq	4696(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -22094,7 +22139,7 @@ GL_PREFIX(SecondaryColor3fEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	4688(%rax), %r11
+	movq	4696(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3fEXT), .-GL_PREFIX(SecondaryColor3fEXT)
@@ -22105,25 +22150,25 @@ GL_PREFIX(SecondaryColor3fEXT):
 GL_PREFIX(SecondaryColor3fvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4696(%rax), %r11
+	movq	4704(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4696(%rax), %r11
+	movq	4704(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4696(%rax), %r11
+	movq	4704(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4696(%rax), %r11
+	movq	4704(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3fvEXT), .-GL_PREFIX(SecondaryColor3fvEXT)
@@ -22134,7 +22179,7 @@ GL_PREFIX(SecondaryColor3fvEXT):
 GL_PREFIX(SecondaryColor3iEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4704(%rax), %r11
+	movq	4712(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22144,13 +22189,13 @@ GL_PREFIX(SecondaryColor3iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4704(%rax), %r11
+	movq	4712(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4704(%rax), %r11
+	movq	4712(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22160,7 +22205,7 @@ GL_PREFIX(SecondaryColor3iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4704(%rax), %r11
+	movq	4712(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3iEXT), .-GL_PREFIX(SecondaryColor3iEXT)
@@ -22171,25 +22216,25 @@ GL_PREFIX(SecondaryColor3iEXT):
 GL_PREFIX(SecondaryColor3ivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4712(%rax), %r11
+	movq	4720(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4712(%rax), %r11
+	movq	4720(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4712(%rax), %r11
+	movq	4720(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4712(%rax), %r11
+	movq	4720(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3ivEXT), .-GL_PREFIX(SecondaryColor3ivEXT)
@@ -22200,7 +22245,7 @@ GL_PREFIX(SecondaryColor3ivEXT):
 GL_PREFIX(SecondaryColor3sEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4720(%rax), %r11
+	movq	4728(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22210,13 +22255,13 @@ GL_PREFIX(SecondaryColor3sEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4720(%rax), %r11
+	movq	4728(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4720(%rax), %r11
+	movq	4728(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22226,7 +22271,7 @@ GL_PREFIX(SecondaryColor3sEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4720(%rax), %r11
+	movq	4728(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3sEXT), .-GL_PREFIX(SecondaryColor3sEXT)
@@ -22237,25 +22282,25 @@ GL_PREFIX(SecondaryColor3sEXT):
 GL_PREFIX(SecondaryColor3svEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4728(%rax), %r11
+	movq	4736(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4728(%rax), %r11
+	movq	4736(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4728(%rax), %r11
+	movq	4736(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4728(%rax), %r11
+	movq	4736(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3svEXT), .-GL_PREFIX(SecondaryColor3svEXT)
@@ -22266,7 +22311,7 @@ GL_PREFIX(SecondaryColor3svEXT):
 GL_PREFIX(SecondaryColor3ubEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4736(%rax), %r11
+	movq	4744(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22276,13 +22321,13 @@ GL_PREFIX(SecondaryColor3ubEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4736(%rax), %r11
+	movq	4744(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4736(%rax), %r11
+	movq	4744(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22292,7 +22337,7 @@ GL_PREFIX(SecondaryColor3ubEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4736(%rax), %r11
+	movq	4744(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3ubEXT), .-GL_PREFIX(SecondaryColor3ubEXT)
@@ -22303,25 +22348,25 @@ GL_PREFIX(SecondaryColor3ubEXT):
 GL_PREFIX(SecondaryColor3ubvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4744(%rax), %r11
+	movq	4752(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4744(%rax), %r11
+	movq	4752(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4744(%rax), %r11
+	movq	4752(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4744(%rax), %r11
+	movq	4752(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3ubvEXT), .-GL_PREFIX(SecondaryColor3ubvEXT)
@@ -22332,7 +22377,7 @@ GL_PREFIX(SecondaryColor3ubvEXT):
 GL_PREFIX(SecondaryColor3uiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4752(%rax), %r11
+	movq	4760(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22342,13 +22387,13 @@ GL_PREFIX(SecondaryColor3uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4752(%rax), %r11
+	movq	4760(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4752(%rax), %r11
+	movq	4760(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22358,7 +22403,7 @@ GL_PREFIX(SecondaryColor3uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4752(%rax), %r11
+	movq	4760(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3uiEXT), .-GL_PREFIX(SecondaryColor3uiEXT)
@@ -22369,25 +22414,25 @@ GL_PREFIX(SecondaryColor3uiEXT):
 GL_PREFIX(SecondaryColor3uivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4760(%rax), %r11
+	movq	4768(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4760(%rax), %r11
+	movq	4768(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4760(%rax), %r11
+	movq	4768(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4760(%rax), %r11
+	movq	4768(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3uivEXT), .-GL_PREFIX(SecondaryColor3uivEXT)
@@ -22398,7 +22443,7 @@ GL_PREFIX(SecondaryColor3uivEXT):
 GL_PREFIX(SecondaryColor3usEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4768(%rax), %r11
+	movq	4776(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22408,13 +22453,13 @@ GL_PREFIX(SecondaryColor3usEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4768(%rax), %r11
+	movq	4776(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4768(%rax), %r11
+	movq	4776(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22424,7 +22469,7 @@ GL_PREFIX(SecondaryColor3usEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4768(%rax), %r11
+	movq	4776(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3usEXT), .-GL_PREFIX(SecondaryColor3usEXT)
@@ -22435,25 +22480,25 @@ GL_PREFIX(SecondaryColor3usEXT):
 GL_PREFIX(SecondaryColor3usvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4776(%rax), %r11
+	movq	4784(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4776(%rax), %r11
+	movq	4784(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4776(%rax), %r11
+	movq	4784(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4776(%rax), %r11
+	movq	4784(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3usvEXT), .-GL_PREFIX(SecondaryColor3usvEXT)
@@ -22464,7 +22509,7 @@ GL_PREFIX(SecondaryColor3usvEXT):
 GL_PREFIX(SecondaryColorPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4784(%rax), %r11
+	movq	4792(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22478,13 +22523,13 @@ GL_PREFIX(SecondaryColorPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4784(%rax), %r11
+	movq	4792(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4784(%rax), %r11
+	movq	4792(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22498,7 +22543,7 @@ GL_PREFIX(SecondaryColorPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4784(%rax), %r11
+	movq	4792(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColorPointerEXT), .-GL_PREFIX(SecondaryColorPointerEXT)
@@ -22509,7 +22554,7 @@ GL_PREFIX(SecondaryColorPointerEXT):
 GL_PREFIX(MultiDrawArraysEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4792(%rax), %r11
+	movq	4800(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22523,13 +22568,13 @@ GL_PREFIX(MultiDrawArraysEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4792(%rax), %r11
+	movq	4800(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4792(%rax), %r11
+	movq	4800(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22543,7 +22588,7 @@ GL_PREFIX(MultiDrawArraysEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4792(%rax), %r11
+	movq	4800(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(MultiDrawArraysEXT), .-GL_PREFIX(MultiDrawArraysEXT)
@@ -22554,7 +22599,7 @@ GL_PREFIX(MultiDrawArraysEXT):
 GL_PREFIX(MultiDrawElementsEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4800(%rax), %r11
+	movq	4808(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22568,13 +22613,13 @@ GL_PREFIX(MultiDrawElementsEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4800(%rax), %r11
+	movq	4808(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4800(%rax), %r11
+	movq	4808(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22588,7 +22633,7 @@ GL_PREFIX(MultiDrawElementsEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4800(%rax), %r11
+	movq	4808(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(MultiDrawElementsEXT), .-GL_PREFIX(MultiDrawElementsEXT)
@@ -22599,7 +22644,7 @@ GL_PREFIX(MultiDrawElementsEXT):
 GL_PREFIX(FogCoordPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4808(%rax), %r11
+	movq	4816(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22609,13 +22654,13 @@ GL_PREFIX(FogCoordPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4808(%rax), %r11
+	movq	4816(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4808(%rax), %r11
+	movq	4816(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22625,7 +22670,7 @@ GL_PREFIX(FogCoordPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4808(%rax), %r11
+	movq	4816(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoordPointerEXT), .-GL_PREFIX(FogCoordPointerEXT)
@@ -22636,7 +22681,7 @@ GL_PREFIX(FogCoordPointerEXT):
 GL_PREFIX(FogCoorddEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4816(%rax), %r11
+	movq	4824(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$8, %rsp
@@ -22644,13 +22689,13 @@ GL_PREFIX(FogCoorddEXT):
 	call	_x86_64_get_dispatch@PLT
 	movq	(%rsp), %xmm0
 	addq	$8, %rsp
-	movq	4816(%rax), %r11
+	movq	4824(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4816(%rax), %r11
+	movq	4824(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$8, %rsp
@@ -22658,7 +22703,7 @@ GL_PREFIX(FogCoorddEXT):
 	call	_glapi_get_dispatch
 	movq	(%rsp), %xmm0
 	addq	$8, %rsp
-	movq	4816(%rax), %r11
+	movq	4824(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoorddEXT), .-GL_PREFIX(FogCoorddEXT)
@@ -22669,25 +22714,25 @@ GL_PREFIX(FogCoorddEXT):
 GL_PREFIX(FogCoorddvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4824(%rax), %r11
+	movq	4832(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4824(%rax), %r11
+	movq	4832(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4824(%rax), %r11
+	movq	4832(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4824(%rax), %r11
+	movq	4832(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoorddvEXT), .-GL_PREFIX(FogCoorddvEXT)
@@ -22698,7 +22743,7 @@ GL_PREFIX(FogCoorddvEXT):
 GL_PREFIX(FogCoordfEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4832(%rax), %r11
+	movq	4840(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$8, %rsp
@@ -22706,13 +22751,13 @@ GL_PREFIX(FogCoordfEXT):
 	call	_x86_64_get_dispatch@PLT
 	movq	(%rsp), %xmm0
 	addq	$8, %rsp
-	movq	4832(%rax), %r11
+	movq	4840(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4832(%rax), %r11
+	movq	4840(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$8, %rsp
@@ -22720,7 +22765,7 @@ GL_PREFIX(FogCoordfEXT):
 	call	_glapi_get_dispatch
 	movq	(%rsp), %xmm0
 	addq	$8, %rsp
-	movq	4832(%rax), %r11
+	movq	4840(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoordfEXT), .-GL_PREFIX(FogCoordfEXT)
@@ -22731,58 +22776,58 @@ GL_PREFIX(FogCoordfEXT):
 GL_PREFIX(FogCoordfvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4840(%rax), %r11
+	movq	4848(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4840(%rax), %r11
+	movq	4848(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4840(%rax), %r11
+	movq	4848(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4840(%rax), %r11
+	movq	4848(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoordfvEXT), .-GL_PREFIX(FogCoordfvEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_606)
-	.type	GL_PREFIX(_dispatch_stub_606), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_606))
-GL_PREFIX(_dispatch_stub_606):
+	.globl	GL_PREFIX(_dispatch_stub_607)
+	.type	GL_PREFIX(_dispatch_stub_607), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_607))
+GL_PREFIX(_dispatch_stub_607):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4848(%rax), %r11
+	movq	4856(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4848(%rax), %r11
+	movq	4856(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4848(%rax), %r11
+	movq	4856(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4848(%rax), %r11
+	movq	4856(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_606), .-GL_PREFIX(_dispatch_stub_606)
+	.size	GL_PREFIX(_dispatch_stub_607), .-GL_PREFIX(_dispatch_stub_607)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(BlendFuncSeparateEXT)
@@ -22790,7 +22835,7 @@ GL_PREFIX(_dispatch_stub_606):
 GL_PREFIX(BlendFuncSeparateEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4856(%rax), %r11
+	movq	4864(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22804,13 +22849,13 @@ GL_PREFIX(BlendFuncSeparateEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4856(%rax), %r11
+	movq	4864(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4856(%rax), %r11
+	movq	4864(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22824,7 +22869,7 @@ GL_PREFIX(BlendFuncSeparateEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4856(%rax), %r11
+	movq	4864(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BlendFuncSeparateEXT), .-GL_PREFIX(BlendFuncSeparateEXT)
@@ -22835,25 +22880,25 @@ GL_PREFIX(BlendFuncSeparateEXT):
 GL_PREFIX(FlushVertexArrayRangeNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4864(%rax), %r11
+	movq	4872(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	4864(%rax), %r11
+	movq	4872(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4864(%rax), %r11
+	movq	4872(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	4864(%rax), %r11
+	movq	4872(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FlushVertexArrayRangeNV), .-GL_PREFIX(FlushVertexArrayRangeNV)
@@ -22864,7 +22909,7 @@ GL_PREFIX(FlushVertexArrayRangeNV):
 GL_PREFIX(VertexArrayRangeNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4872(%rax), %r11
+	movq	4880(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22874,13 +22919,13 @@ GL_PREFIX(VertexArrayRangeNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4872(%rax), %r11
+	movq	4880(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4872(%rax), %r11
+	movq	4880(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22890,7 +22935,7 @@ GL_PREFIX(VertexArrayRangeNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4872(%rax), %r11
+	movq	4880(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexArrayRangeNV), .-GL_PREFIX(VertexArrayRangeNV)
@@ -22901,7 +22946,7 @@ GL_PREFIX(VertexArrayRangeNV):
 GL_PREFIX(CombinerInputNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4880(%rax), %r11
+	movq	4888(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22919,13 +22964,13 @@ GL_PREFIX(CombinerInputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4880(%rax), %r11
+	movq	4888(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4880(%rax), %r11
+	movq	4888(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22943,7 +22988,7 @@ GL_PREFIX(CombinerInputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4880(%rax), %r11
+	movq	4888(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerInputNV), .-GL_PREFIX(CombinerInputNV)
@@ -22954,7 +22999,7 @@ GL_PREFIX(CombinerInputNV):
 GL_PREFIX(CombinerOutputNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4888(%rax), %r11
+	movq	4896(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22972,13 +23017,13 @@ GL_PREFIX(CombinerOutputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4888(%rax), %r11
+	movq	4896(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4888(%rax), %r11
+	movq	4896(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22996,7 +23041,7 @@ GL_PREFIX(CombinerOutputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4888(%rax), %r11
+	movq	4896(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerOutputNV), .-GL_PREFIX(CombinerOutputNV)
@@ -23007,7 +23052,7 @@ GL_PREFIX(CombinerOutputNV):
 GL_PREFIX(CombinerParameterfNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4896(%rax), %r11
+	movq	4904(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -23017,13 +23062,13 @@ GL_PREFIX(CombinerParameterfNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	4896(%rax), %r11
+	movq	4904(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4896(%rax), %r11
+	movq	4904(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -23033,7 +23078,7 @@ GL_PREFIX(CombinerParameterfNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	4896(%rax), %r11
+	movq	4904(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerParameterfNV), .-GL_PREFIX(CombinerParameterfNV)
@@ -23044,7 +23089,7 @@ GL_PREFIX(CombinerParameterfNV):
 GL_PREFIX(CombinerParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4904(%rax), %r11
+	movq	4912(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23054,13 +23099,13 @@ GL_PREFIX(CombinerParameterfvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4904(%rax), %r11
+	movq	4912(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4904(%rax), %r11
+	movq	4912(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23070,7 +23115,7 @@ GL_PREFIX(CombinerParameterfvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4904(%rax), %r11
+	movq	4912(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerParameterfvNV), .-GL_PREFIX(CombinerParameterfvNV)
@@ -23081,7 +23126,7 @@ GL_PREFIX(CombinerParameterfvNV):
 GL_PREFIX(CombinerParameteriNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4912(%rax), %r11
+	movq	4920(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23091,13 +23136,13 @@ GL_PREFIX(CombinerParameteriNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4912(%rax), %r11
+	movq	4920(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4912(%rax), %r11
+	movq	4920(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23107,7 +23152,7 @@ GL_PREFIX(CombinerParameteriNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4912(%rax), %r11
+	movq	4920(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerParameteriNV), .-GL_PREFIX(CombinerParameteriNV)
@@ -23118,7 +23163,7 @@ GL_PREFIX(CombinerParameteriNV):
 GL_PREFIX(CombinerParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4920(%rax), %r11
+	movq	4928(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23128,13 +23173,13 @@ GL_PREFIX(CombinerParameterivNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4920(%rax), %r11
+	movq	4928(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4920(%rax), %r11
+	movq	4928(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23144,7 +23189,7 @@ GL_PREFIX(CombinerParameterivNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4920(%rax), %r11
+	movq	4928(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerParameterivNV), .-GL_PREFIX(CombinerParameterivNV)
@@ -23155,7 +23200,7 @@ GL_PREFIX(CombinerParameterivNV):
 GL_PREFIX(FinalCombinerInputNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4928(%rax), %r11
+	movq	4936(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23169,13 +23214,13 @@ GL_PREFIX(FinalCombinerInputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4928(%rax), %r11
+	movq	4936(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4928(%rax), %r11
+	movq	4936(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23189,7 +23234,7 @@ GL_PREFIX(FinalCombinerInputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4928(%rax), %r11
+	movq	4936(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FinalCombinerInputNV), .-GL_PREFIX(FinalCombinerInputNV)
@@ -23200,7 +23245,7 @@ GL_PREFIX(FinalCombinerInputNV):
 GL_PREFIX(GetCombinerInputParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4936(%rax), %r11
+	movq	4944(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23214,13 +23259,13 @@ GL_PREFIX(GetCombinerInputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4936(%rax), %r11
+	movq	4944(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4936(%rax), %r11
+	movq	4944(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23234,7 +23279,7 @@ GL_PREFIX(GetCombinerInputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4936(%rax), %r11
+	movq	4944(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetCombinerInputParameterfvNV), .-GL_PREFIX(GetCombinerInputParameterfvNV)
@@ -23245,7 +23290,7 @@ GL_PREFIX(GetCombinerInputParameterfvNV):
 GL_PREFIX(GetCombinerInputParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4944(%rax), %r11
+	movq	4952(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23259,13 +23304,13 @@ GL_PREFIX(GetCombinerInputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4944(%rax), %r11
+	movq	4952(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4944(%rax), %r11
+	movq	4952(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23279,7 +23324,7 @@ GL_PREFIX(GetCombinerInputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4944(%rax), %r11
+	movq	4952(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetCombinerInputParameterivNV), .-GL_PREFIX(GetCombinerInputParameterivNV)
@@ -23290,7 +23335,7 @@ GL_PREFIX(GetCombinerInputParameterivNV):
 GL_PREFIX(GetCombinerOutputParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4952(%rax), %r11
+	movq	4960(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23304,13 +23349,13 @@ GL_PREFIX(GetCombinerOutputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4952(%rax), %r11
+	movq	4960(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4952(%rax), %r11
+	movq	4960(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23324,7 +23369,7 @@ GL_PREFIX(GetCombinerOutputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4952(%rax), %r11
+	movq	4960(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetCombinerOutputParameterfvNV), .-GL_PREFIX(GetCombinerOutputParameterfvNV)
@@ -23335,7 +23380,7 @@ GL_PREFIX(GetCombinerOutputParameterfvNV):
 GL_PREFIX(GetCombinerOutputParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4960(%rax), %r11
+	movq	4968(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23349,13 +23394,13 @@ GL_PREFIX(GetCombinerOutputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4960(%rax), %r11
+	movq	4968(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4960(%rax), %r11
+	movq	4968(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23369,7 +23414,7 @@ GL_PREFIX(GetCombinerOutputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4960(%rax), %r11
+	movq	4968(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetCombinerOutputParameterivNV), .-GL_PREFIX(GetCombinerOutputParameterivNV)
@@ -23380,7 +23425,7 @@ GL_PREFIX(GetCombinerOutputParameterivNV):
 GL_PREFIX(GetFinalCombinerInputParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4968(%rax), %r11
+	movq	4976(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23390,13 +23435,13 @@ GL_PREFIX(GetFinalCombinerInputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4968(%rax), %r11
+	movq	4976(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4968(%rax), %r11
+	movq	4976(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23406,7 +23451,7 @@ GL_PREFIX(GetFinalCombinerInputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4968(%rax), %r11
+	movq	4976(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetFinalCombinerInputParameterfvNV), .-GL_PREFIX(GetFinalCombinerInputParameterfvNV)
@@ -23417,7 +23462,7 @@ GL_PREFIX(GetFinalCombinerInputParameterfvNV):
 GL_PREFIX(GetFinalCombinerInputParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4976(%rax), %r11
+	movq	4984(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23427,13 +23472,13 @@ GL_PREFIX(GetFinalCombinerInputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4976(%rax), %r11
+	movq	4984(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4976(%rax), %r11
+	movq	4984(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23443,7 +23488,7 @@ GL_PREFIX(GetFinalCombinerInputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4976(%rax), %r11
+	movq	4984(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetFinalCombinerInputParameterivNV), .-GL_PREFIX(GetFinalCombinerInputParameterivNV)
@@ -23454,25 +23499,25 @@ GL_PREFIX(GetFinalCombinerInputParameterivNV):
 GL_PREFIX(ResizeBuffersMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4984(%rax), %r11
+	movq	4992(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	4984(%rax), %r11
+	movq	4992(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4984(%rax), %r11
+	movq	4992(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	4984(%rax), %r11
+	movq	4992(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ResizeBuffersMESA), .-GL_PREFIX(ResizeBuffersMESA)
@@ -23483,7 +23528,7 @@ GL_PREFIX(ResizeBuffersMESA):
 GL_PREFIX(WindowPos2dMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4992(%rax), %r11
+	movq	5000(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -23493,13 +23538,13 @@ GL_PREFIX(WindowPos2dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	4992(%rax), %r11
+	movq	5000(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4992(%rax), %r11
+	movq	5000(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -23509,7 +23554,7 @@ GL_PREFIX(WindowPos2dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	4992(%rax), %r11
+	movq	5000(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2dMESA), .-GL_PREFIX(WindowPos2dMESA)
@@ -23520,25 +23565,25 @@ GL_PREFIX(WindowPos2dMESA):
 GL_PREFIX(WindowPos2dvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5000(%rax), %r11
+	movq	5008(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5000(%rax), %r11
+	movq	5008(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5000(%rax), %r11
+	movq	5008(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5000(%rax), %r11
+	movq	5008(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2dvMESA), .-GL_PREFIX(WindowPos2dvMESA)
@@ -23549,7 +23594,7 @@ GL_PREFIX(WindowPos2dvMESA):
 GL_PREFIX(WindowPos2fMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5008(%rax), %r11
+	movq	5016(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -23559,13 +23604,13 @@ GL_PREFIX(WindowPos2fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5008(%rax), %r11
+	movq	5016(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5008(%rax), %r11
+	movq	5016(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -23575,7 +23620,7 @@ GL_PREFIX(WindowPos2fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5008(%rax), %r11
+	movq	5016(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2fMESA), .-GL_PREFIX(WindowPos2fMESA)
@@ -23586,25 +23631,25 @@ GL_PREFIX(WindowPos2fMESA):
 GL_PREFIX(WindowPos2fvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5016(%rax), %r11
+	movq	5024(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5016(%rax), %r11
+	movq	5024(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5016(%rax), %r11
+	movq	5024(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5016(%rax), %r11
+	movq	5024(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2fvMESA), .-GL_PREFIX(WindowPos2fvMESA)
@@ -23615,7 +23660,7 @@ GL_PREFIX(WindowPos2fvMESA):
 GL_PREFIX(WindowPos2iMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5024(%rax), %r11
+	movq	5032(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23625,13 +23670,13 @@ GL_PREFIX(WindowPos2iMESA):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5024(%rax), %r11
+	movq	5032(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5024(%rax), %r11
+	movq	5032(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23641,7 +23686,7 @@ GL_PREFIX(WindowPos2iMESA):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5024(%rax), %r11
+	movq	5032(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2iMESA), .-GL_PREFIX(WindowPos2iMESA)
@@ -23652,25 +23697,25 @@ GL_PREFIX(WindowPos2iMESA):
 GL_PREFIX(WindowPos2ivMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5032(%rax), %r11
+	movq	5040(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5032(%rax), %r11
+	movq	5040(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5032(%rax), %r11
+	movq	5040(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5032(%rax), %r11
+	movq	5040(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2ivMESA), .-GL_PREFIX(WindowPos2ivMESA)
@@ -23681,7 +23726,7 @@ GL_PREFIX(WindowPos2ivMESA):
 GL_PREFIX(WindowPos2sMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5040(%rax), %r11
+	movq	5048(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23691,13 +23736,13 @@ GL_PREFIX(WindowPos2sMESA):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5040(%rax), %r11
+	movq	5048(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5040(%rax), %r11
+	movq	5048(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23707,7 +23752,7 @@ GL_PREFIX(WindowPos2sMESA):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5040(%rax), %r11
+	movq	5048(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2sMESA), .-GL_PREFIX(WindowPos2sMESA)
@@ -23718,25 +23763,25 @@ GL_PREFIX(WindowPos2sMESA):
 GL_PREFIX(WindowPos2svMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5048(%rax), %r11
+	movq	5056(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5048(%rax), %r11
+	movq	5056(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5048(%rax), %r11
+	movq	5056(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5048(%rax), %r11
+	movq	5056(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2svMESA), .-GL_PREFIX(WindowPos2svMESA)
@@ -23747,7 +23792,7 @@ GL_PREFIX(WindowPos2svMESA):
 GL_PREFIX(WindowPos3dMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5056(%rax), %r11
+	movq	5064(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -23759,13 +23804,13 @@ GL_PREFIX(WindowPos3dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5056(%rax), %r11
+	movq	5064(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5056(%rax), %r11
+	movq	5064(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -23777,7 +23822,7 @@ GL_PREFIX(WindowPos3dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5056(%rax), %r11
+	movq	5064(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3dMESA), .-GL_PREFIX(WindowPos3dMESA)
@@ -23788,25 +23833,25 @@ GL_PREFIX(WindowPos3dMESA):
 GL_PREFIX(WindowPos3dvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5064(%rax), %r11
+	movq	5072(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5064(%rax), %r11
+	movq	5072(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5064(%rax), %r11
+	movq	5072(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5064(%rax), %r11
+	movq	5072(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3dvMESA), .-GL_PREFIX(WindowPos3dvMESA)
@@ -23817,7 +23862,7 @@ GL_PREFIX(WindowPos3dvMESA):
 GL_PREFIX(WindowPos3fMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5072(%rax), %r11
+	movq	5080(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -23829,13 +23874,13 @@ GL_PREFIX(WindowPos3fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5072(%rax), %r11
+	movq	5080(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5072(%rax), %r11
+	movq	5080(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -23847,7 +23892,7 @@ GL_PREFIX(WindowPos3fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5072(%rax), %r11
+	movq	5080(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3fMESA), .-GL_PREFIX(WindowPos3fMESA)
@@ -23858,25 +23903,25 @@ GL_PREFIX(WindowPos3fMESA):
 GL_PREFIX(WindowPos3fvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5080(%rax), %r11
+	movq	5088(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5080(%rax), %r11
+	movq	5088(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5080(%rax), %r11
+	movq	5088(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5080(%rax), %r11
+	movq	5088(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3fvMESA), .-GL_PREFIX(WindowPos3fvMESA)
@@ -23887,7 +23932,7 @@ GL_PREFIX(WindowPos3fvMESA):
 GL_PREFIX(WindowPos3iMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5088(%rax), %r11
+	movq	5096(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23897,13 +23942,13 @@ GL_PREFIX(WindowPos3iMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5088(%rax), %r11
+	movq	5096(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5088(%rax), %r11
+	movq	5096(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23913,7 +23958,7 @@ GL_PREFIX(WindowPos3iMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5088(%rax), %r11
+	movq	5096(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3iMESA), .-GL_PREFIX(WindowPos3iMESA)
@@ -23924,25 +23969,25 @@ GL_PREFIX(WindowPos3iMESA):
 GL_PREFIX(WindowPos3ivMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5096(%rax), %r11
+	movq	5104(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5096(%rax), %r11
+	movq	5104(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5096(%rax), %r11
+	movq	5104(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5096(%rax), %r11
+	movq	5104(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3ivMESA), .-GL_PREFIX(WindowPos3ivMESA)
@@ -23953,7 +23998,7 @@ GL_PREFIX(WindowPos3ivMESA):
 GL_PREFIX(WindowPos3sMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5104(%rax), %r11
+	movq	5112(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23963,13 +24008,13 @@ GL_PREFIX(WindowPos3sMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5104(%rax), %r11
+	movq	5112(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5104(%rax), %r11
+	movq	5112(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23979,7 +24024,7 @@ GL_PREFIX(WindowPos3sMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5104(%rax), %r11
+	movq	5112(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3sMESA), .-GL_PREFIX(WindowPos3sMESA)
@@ -23990,25 +24035,25 @@ GL_PREFIX(WindowPos3sMESA):
 GL_PREFIX(WindowPos3svMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5112(%rax), %r11
+	movq	5120(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5112(%rax), %r11
+	movq	5120(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5112(%rax), %r11
+	movq	5120(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5112(%rax), %r11
+	movq	5120(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3svMESA), .-GL_PREFIX(WindowPos3svMESA)
@@ -24019,7 +24064,7 @@ GL_PREFIX(WindowPos3svMESA):
 GL_PREFIX(WindowPos4dMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5120(%rax), %r11
+	movq	5128(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -24033,13 +24078,13 @@ GL_PREFIX(WindowPos4dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$40, %rsp
-	movq	5120(%rax), %r11
+	movq	5128(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5120(%rax), %r11
+	movq	5128(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -24053,7 +24098,7 @@ GL_PREFIX(WindowPos4dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$40, %rsp
-	movq	5120(%rax), %r11
+	movq	5128(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4dMESA), .-GL_PREFIX(WindowPos4dMESA)
@@ -24064,25 +24109,25 @@ GL_PREFIX(WindowPos4dMESA):
 GL_PREFIX(WindowPos4dvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5128(%rax), %r11
+	movq	5136(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5128(%rax), %r11
+	movq	5136(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5128(%rax), %r11
+	movq	5136(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5128(%rax), %r11
+	movq	5136(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4dvMESA), .-GL_PREFIX(WindowPos4dvMESA)
@@ -24093,7 +24138,7 @@ GL_PREFIX(WindowPos4dvMESA):
 GL_PREFIX(WindowPos4fMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5136(%rax), %r11
+	movq	5144(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -24107,13 +24152,13 @@ GL_PREFIX(WindowPos4fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$40, %rsp
-	movq	5136(%rax), %r11
+	movq	5144(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5136(%rax), %r11
+	movq	5144(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -24127,7 +24172,7 @@ GL_PREFIX(WindowPos4fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$40, %rsp
-	movq	5136(%rax), %r11
+	movq	5144(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4fMESA), .-GL_PREFIX(WindowPos4fMESA)
@@ -24138,25 +24183,25 @@ GL_PREFIX(WindowPos4fMESA):
 GL_PREFIX(WindowPos4fvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5144(%rax), %r11
+	movq	5152(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5144(%rax), %r11
+	movq	5152(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5144(%rax), %r11
+	movq	5152(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5144(%rax), %r11
+	movq	5152(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4fvMESA), .-GL_PREFIX(WindowPos4fvMESA)
@@ -24167,7 +24212,7 @@ GL_PREFIX(WindowPos4fvMESA):
 GL_PREFIX(WindowPos4iMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5152(%rax), %r11
+	movq	5160(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24181,13 +24226,13 @@ GL_PREFIX(WindowPos4iMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5152(%rax), %r11
+	movq	5160(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5152(%rax), %r11
+	movq	5160(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24201,7 +24246,7 @@ GL_PREFIX(WindowPos4iMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5152(%rax), %r11
+	movq	5160(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4iMESA), .-GL_PREFIX(WindowPos4iMESA)
@@ -24212,25 +24257,25 @@ GL_PREFIX(WindowPos4iMESA):
 GL_PREFIX(WindowPos4ivMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5160(%rax), %r11
+	movq	5168(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5160(%rax), %r11
+	movq	5168(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5160(%rax), %r11
+	movq	5168(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5160(%rax), %r11
+	movq	5168(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4ivMESA), .-GL_PREFIX(WindowPos4ivMESA)
@@ -24241,7 +24286,7 @@ GL_PREFIX(WindowPos4ivMESA):
 GL_PREFIX(WindowPos4sMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5168(%rax), %r11
+	movq	5176(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24255,13 +24300,13 @@ GL_PREFIX(WindowPos4sMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5168(%rax), %r11
+	movq	5176(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5168(%rax), %r11
+	movq	5176(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24275,7 +24320,7 @@ GL_PREFIX(WindowPos4sMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5168(%rax), %r11
+	movq	5176(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4sMESA), .-GL_PREFIX(WindowPos4sMESA)
@@ -24284,51 +24329,13 @@ GL_PREFIX(WindowPos4sMESA):
 	.globl	GL_PREFIX(WindowPos4svMESA)
 	.type	GL_PREFIX(WindowPos4svMESA), @function
 GL_PREFIX(WindowPos4svMESA):
-#if defined(GLX_USE_TLS)
-	call	_x86_64_get_dispatch@PLT
-	movq	5176(%rax), %r11
-	jmp	*%r11
-#elif defined(PTHREADS)
-	pushq	%rdi
-	call	_x86_64_get_dispatch@PLT
-	popq	%rdi
-	movq	5176(%rax), %r11
-	jmp	*%r11
-#else
-	movq	_glapi_Dispatch(%rip), %rax
-	testq	%rax, %rax
-	je	1f
-	movq	5176(%rax), %r11
-	jmp	*%r11
-1:
-	pushq	%rdi
-	call	_glapi_get_dispatch
-	popq	%rdi
-	movq	5176(%rax), %r11
-	jmp	*%r11
-#endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(WindowPos4svMESA), .-GL_PREFIX(WindowPos4svMESA)
-
-	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_648)
-	.type	GL_PREFIX(_dispatch_stub_648), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_648))
-GL_PREFIX(_dispatch_stub_648):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
 	movq	5184(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
-	pushq	%rsi
-	pushq	%rdx
-	pushq	%rcx
-	pushq	%r8
 	call	_x86_64_get_dispatch@PLT
-	popq	%r8
-	popq	%rcx
-	popq	%rdx
-	popq	%rsi
 	popq	%rdi
 	movq	5184(%rax), %r11
 	jmp	*%r11
@@ -24340,20 +24347,12 @@ GL_PREFIX(_dispatch_stub_648):
 	jmp	*%r11
 1:
 	pushq	%rdi
-	pushq	%rsi
-	pushq	%rdx
-	pushq	%rcx
-	pushq	%r8
 	call	_glapi_get_dispatch
-	popq	%r8
-	popq	%rcx
-	popq	%rdx
-	popq	%rsi
 	popq	%rdi
 	movq	5184(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_648), .-GL_PREFIX(_dispatch_stub_648)
+	.size	GL_PREFIX(WindowPos4svMESA), .-GL_PREFIX(WindowPos4svMESA)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(_dispatch_stub_649)
@@ -24370,11 +24369,7 @@ GL_PREFIX(_dispatch_stub_649):
 	pushq	%rdx
 	pushq	%rcx
 	pushq	%r8
-	pushq	%r9
-	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
-	popq	%rbp
-	popq	%r9
 	popq	%r8
 	popq	%rcx
 	popq	%rdx
@@ -24394,11 +24389,7 @@ GL_PREFIX(_dispatch_stub_649):
 	pushq	%rdx
 	pushq	%rcx
 	pushq	%r8
-	pushq	%r9
-	pushq	%rbp
 	call	_glapi_get_dispatch
-	popq	%rbp
-	popq	%r9
 	popq	%r8
 	popq	%rcx
 	popq	%rdx
@@ -24421,9 +24412,17 @@ GL_PREFIX(_dispatch_stub_650):
 #elif defined(PTHREADS)
 	pushq	%rdi
 	pushq	%rsi
+	pushq	%rdx
+	pushq	%rcx
+	pushq	%r8
+	pushq	%r9
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
+	popq	%r9
+	popq	%r8
+	popq	%rcx
+	popq	%rdx
 	popq	%rsi
 	popq	%rdi
 	movq	5200(%rax), %r11
@@ -24437,9 +24436,17 @@ GL_PREFIX(_dispatch_stub_650):
 1:
 	pushq	%rdi
 	pushq	%rsi
+	pushq	%rdx
+	pushq	%rcx
+	pushq	%r8
+	pushq	%r9
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
+	popq	%r9
+	popq	%r8
+	popq	%rcx
+	popq	%rdx
 	popq	%rsi
 	popq	%rdi
 	movq	5200(%rax), %r11
@@ -24458,7 +24465,11 @@ GL_PREFIX(_dispatch_stub_651):
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
+	popq	%rbp
+	popq	%rsi
 	popq	%rdi
 	movq	5208(%rax), %r11
 	jmp	*%r11
@@ -24470,7 +24481,11 @@ GL_PREFIX(_dispatch_stub_651):
 	jmp	*%r11
 1:
 	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
 	call	_glapi_get_dispatch
+	popq	%rbp
+	popq	%rsi
 	popq	%rdi
 	movq	5208(%rax), %r11
 	jmp	*%r11
@@ -24488,11 +24503,7 @@ GL_PREFIX(_dispatch_stub_652):
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
-	pushq	%rsi
-	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
-	popq	%rbp
-	popq	%rsi
 	popq	%rdi
 	movq	5216(%rax), %r11
 	jmp	*%r11
@@ -24504,11 +24515,7 @@ GL_PREFIX(_dispatch_stub_652):
 	jmp	*%r11
 1:
 	pushq	%rdi
-	pushq	%rsi
-	pushq	%rbp
 	call	_glapi_get_dispatch
-	popq	%rbp
-	popq	%rsi
 	popq	%rdi
 	movq	5216(%rax), %r11
 	jmp	*%r11
@@ -24527,9 +24534,9 @@ GL_PREFIX(_dispatch_stub_653):
 #elif defined(PTHREADS)
 	pushq	%rdi
 	pushq	%rsi
-	pushq	%rdx
+	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
-	popq	%rdx
+	popq	%rbp
 	popq	%rsi
 	popq	%rdi
 	movq	5224(%rax), %r11
@@ -24543,9 +24550,9 @@ GL_PREFIX(_dispatch_stub_653):
 1:
 	pushq	%rdi
 	pushq	%rsi
-	pushq	%rdx
+	pushq	%rbp
 	call	_glapi_get_dispatch
-	popq	%rdx
+	popq	%rbp
 	popq	%rsi
 	popq	%rdi
 	movq	5224(%rax), %r11
@@ -24564,7 +24571,11 @@ GL_PREFIX(_dispatch_stub_654):
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
 	call	_x86_64_get_dispatch@PLT
+	popq	%rdx
+	popq	%rsi
 	popq	%rdi
 	movq	5232(%rax), %r11
 	jmp	*%r11
@@ -24576,7 +24587,11 @@ GL_PREFIX(_dispatch_stub_654):
 	jmp	*%r11
 1:
 	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
 	call	_glapi_get_dispatch
+	popq	%rdx
+	popq	%rsi
 	popq	%rdi
 	movq	5232(%rax), %r11
 	jmp	*%r11
@@ -24594,11 +24609,7 @@ GL_PREFIX(_dispatch_stub_655):
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
-	pushq	%rsi
-	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
-	popq	%rbp
-	popq	%rsi
 	popq	%rdi
 	movq	5240(%rax), %r11
 	jmp	*%r11
@@ -24610,11 +24621,7 @@ GL_PREFIX(_dispatch_stub_655):
 	jmp	*%r11
 1:
 	pushq	%rdi
-	pushq	%rsi
-	pushq	%rbp
 	call	_glapi_get_dispatch
-	popq	%rbp
-	popq	%rsi
 	popq	%rdi
 	movq	5240(%rax), %r11
 	jmp	*%r11
@@ -24632,7 +24639,11 @@ GL_PREFIX(_dispatch_stub_656):
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
+	popq	%rbp
+	popq	%rsi
 	popq	%rdi
 	movq	5248(%rax), %r11
 	jmp	*%r11
@@ -24644,20 +24655,54 @@ GL_PREFIX(_dispatch_stub_656):
 	jmp	*%r11
 1:
 	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
 	call	_glapi_get_dispatch
+	popq	%rbp
+	popq	%rsi
 	popq	%rdi
 	movq	5248(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(_dispatch_stub_656), .-GL_PREFIX(_dispatch_stub_656)
 
+	.p2align	4,,15
+	.globl	GL_PREFIX(_dispatch_stub_657)
+	.type	GL_PREFIX(_dispatch_stub_657), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_657))
+GL_PREFIX(_dispatch_stub_657):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	5256(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	call	_x86_64_get_dispatch@PLT
+	popq	%rdi
+	movq	5256(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	5256(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	call	_glapi_get_dispatch
+	popq	%rdi
+	movq	5256(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(_dispatch_stub_657), .-GL_PREFIX(_dispatch_stub_657)
+
 	.p2align	4,,15
 	.globl	GL_PREFIX(AreProgramsResidentNV)
 	.type	GL_PREFIX(AreProgramsResidentNV), @function
 GL_PREFIX(AreProgramsResidentNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5256(%rax), %r11
+	movq	5264(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24667,13 +24712,13 @@ GL_PREFIX(AreProgramsResidentNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5256(%rax), %r11
+	movq	5264(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5256(%rax), %r11
+	movq	5264(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24683,7 +24728,7 @@ GL_PREFIX(AreProgramsResidentNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5256(%rax), %r11
+	movq	5264(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AreProgramsResidentNV), .-GL_PREFIX(AreProgramsResidentNV)
@@ -24694,7 +24739,7 @@ GL_PREFIX(AreProgramsResidentNV):
 GL_PREFIX(BindProgramNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5264(%rax), %r11
+	movq	5272(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24704,13 +24749,13 @@ GL_PREFIX(BindProgramNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5264(%rax), %r11
+	movq	5272(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5264(%rax), %r11
+	movq	5272(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24720,7 +24765,7 @@ GL_PREFIX(BindProgramNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5264(%rax), %r11
+	movq	5272(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindProgramNV), .-GL_PREFIX(BindProgramNV)
@@ -24731,7 +24776,7 @@ GL_PREFIX(BindProgramNV):
 GL_PREFIX(DeleteProgramsNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5272(%rax), %r11
+	movq	5280(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24741,13 +24786,13 @@ GL_PREFIX(DeleteProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5272(%rax), %r11
+	movq	5280(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5272(%rax), %r11
+	movq	5280(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24757,7 +24802,7 @@ GL_PREFIX(DeleteProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5272(%rax), %r11
+	movq	5280(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteProgramsNV), .-GL_PREFIX(DeleteProgramsNV)
@@ -24768,7 +24813,7 @@ GL_PREFIX(DeleteProgramsNV):
 GL_PREFIX(ExecuteProgramNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5280(%rax), %r11
+	movq	5288(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24778,13 +24823,13 @@ GL_PREFIX(ExecuteProgramNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5280(%rax), %r11
+	movq	5288(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5280(%rax), %r11
+	movq	5288(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24794,7 +24839,7 @@ GL_PREFIX(ExecuteProgramNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5280(%rax), %r11
+	movq	5288(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ExecuteProgramNV), .-GL_PREFIX(ExecuteProgramNV)
@@ -24805,7 +24850,7 @@ GL_PREFIX(ExecuteProgramNV):
 GL_PREFIX(GenProgramsNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5288(%rax), %r11
+	movq	5296(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24815,13 +24860,13 @@ GL_PREFIX(GenProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5288(%rax), %r11
+	movq	5296(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5288(%rax), %r11
+	movq	5296(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24831,7 +24876,7 @@ GL_PREFIX(GenProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5288(%rax), %r11
+	movq	5296(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenProgramsNV), .-GL_PREFIX(GenProgramsNV)
@@ -24842,7 +24887,7 @@ GL_PREFIX(GenProgramsNV):
 GL_PREFIX(GetProgramParameterdvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5296(%rax), %r11
+	movq	5304(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24856,13 +24901,13 @@ GL_PREFIX(GetProgramParameterdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5296(%rax), %r11
+	movq	5304(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5296(%rax), %r11
+	movq	5304(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24876,7 +24921,7 @@ GL_PREFIX(GetProgramParameterdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5296(%rax), %r11
+	movq	5304(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramParameterdvNV), .-GL_PREFIX(GetProgramParameterdvNV)
@@ -24887,7 +24932,7 @@ GL_PREFIX(GetProgramParameterdvNV):
 GL_PREFIX(GetProgramParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5304(%rax), %r11
+	movq	5312(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24901,13 +24946,13 @@ GL_PREFIX(GetProgramParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5304(%rax), %r11
+	movq	5312(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5304(%rax), %r11
+	movq	5312(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24921,7 +24966,7 @@ GL_PREFIX(GetProgramParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5304(%rax), %r11
+	movq	5312(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramParameterfvNV), .-GL_PREFIX(GetProgramParameterfvNV)
@@ -24932,7 +24977,7 @@ GL_PREFIX(GetProgramParameterfvNV):
 GL_PREFIX(GetProgramStringNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5312(%rax), %r11
+	movq	5320(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24942,13 +24987,13 @@ GL_PREFIX(GetProgramStringNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5312(%rax), %r11
+	movq	5320(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5312(%rax), %r11
+	movq	5320(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24958,7 +25003,7 @@ GL_PREFIX(GetProgramStringNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5312(%rax), %r11
+	movq	5320(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramStringNV), .-GL_PREFIX(GetProgramStringNV)
@@ -24969,7 +25014,7 @@ GL_PREFIX(GetProgramStringNV):
 GL_PREFIX(GetProgramivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5320(%rax), %r11
+	movq	5328(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24979,13 +25024,13 @@ GL_PREFIX(GetProgramivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5320(%rax), %r11
+	movq	5328(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5320(%rax), %r11
+	movq	5328(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24995,7 +25040,7 @@ GL_PREFIX(GetProgramivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5320(%rax), %r11
+	movq	5328(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramivNV), .-GL_PREFIX(GetProgramivNV)
@@ -25006,7 +25051,7 @@ GL_PREFIX(GetProgramivNV):
 GL_PREFIX(GetTrackMatrixivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5328(%rax), %r11
+	movq	5336(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25020,13 +25065,13 @@ GL_PREFIX(GetTrackMatrixivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5328(%rax), %r11
+	movq	5336(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5328(%rax), %r11
+	movq	5336(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25040,7 +25085,7 @@ GL_PREFIX(GetTrackMatrixivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5328(%rax), %r11
+	movq	5336(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetTrackMatrixivNV), .-GL_PREFIX(GetTrackMatrixivNV)
@@ -25051,7 +25096,7 @@ GL_PREFIX(GetTrackMatrixivNV):
 GL_PREFIX(GetVertexAttribPointervNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5336(%rax), %r11
+	movq	5344(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25061,13 +25106,13 @@ GL_PREFIX(GetVertexAttribPointervNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5336(%rax), %r11
+	movq	5344(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5336(%rax), %r11
+	movq	5344(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25077,7 +25122,7 @@ GL_PREFIX(GetVertexAttribPointervNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5336(%rax), %r11
+	movq	5344(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribPointervNV), .-GL_PREFIX(GetVertexAttribPointervNV)
@@ -25088,7 +25133,7 @@ GL_PREFIX(GetVertexAttribPointervNV):
 GL_PREFIX(GetVertexAttribdvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5344(%rax), %r11
+	movq	5352(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25098,13 +25143,13 @@ GL_PREFIX(GetVertexAttribdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5344(%rax), %r11
+	movq	5352(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5344(%rax), %r11
+	movq	5352(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25114,7 +25159,7 @@ GL_PREFIX(GetVertexAttribdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5344(%rax), %r11
+	movq	5352(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribdvNV), .-GL_PREFIX(GetVertexAttribdvNV)
@@ -25125,7 +25170,7 @@ GL_PREFIX(GetVertexAttribdvNV):
 GL_PREFIX(GetVertexAttribfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5352(%rax), %r11
+	movq	5360(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25135,13 +25180,13 @@ GL_PREFIX(GetVertexAttribfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5352(%rax), %r11
+	movq	5360(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5352(%rax), %r11
+	movq	5360(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25151,7 +25196,7 @@ GL_PREFIX(GetVertexAttribfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5352(%rax), %r11
+	movq	5360(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribfvNV), .-GL_PREFIX(GetVertexAttribfvNV)
@@ -25162,7 +25207,7 @@ GL_PREFIX(GetVertexAttribfvNV):
 GL_PREFIX(GetVertexAttribivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5360(%rax), %r11
+	movq	5368(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25172,13 +25217,13 @@ GL_PREFIX(GetVertexAttribivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5360(%rax), %r11
+	movq	5368(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5360(%rax), %r11
+	movq	5368(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25188,7 +25233,7 @@ GL_PREFIX(GetVertexAttribivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5360(%rax), %r11
+	movq	5368(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribivNV), .-GL_PREFIX(GetVertexAttribivNV)
@@ -25199,25 +25244,25 @@ GL_PREFIX(GetVertexAttribivNV):
 GL_PREFIX(IsProgramNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5368(%rax), %r11
+	movq	5376(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5368(%rax), %r11
+	movq	5376(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5368(%rax), %r11
+	movq	5376(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5368(%rax), %r11
+	movq	5376(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsProgramNV), .-GL_PREFIX(IsProgramNV)
@@ -25228,7 +25273,7 @@ GL_PREFIX(IsProgramNV):
 GL_PREFIX(LoadProgramNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5376(%rax), %r11
+	movq	5384(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25242,13 +25287,13 @@ GL_PREFIX(LoadProgramNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5376(%rax), %r11
+	movq	5384(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5376(%rax), %r11
+	movq	5384(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25262,7 +25307,7 @@ GL_PREFIX(LoadProgramNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5376(%rax), %r11
+	movq	5384(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(LoadProgramNV), .-GL_PREFIX(LoadProgramNV)
@@ -25273,7 +25318,7 @@ GL_PREFIX(LoadProgramNV):
 GL_PREFIX(ProgramParameters4dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5384(%rax), %r11
+	movq	5392(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25287,13 +25332,13 @@ GL_PREFIX(ProgramParameters4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5384(%rax), %r11
+	movq	5392(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5384(%rax), %r11
+	movq	5392(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25307,7 +25352,7 @@ GL_PREFIX(ProgramParameters4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5384(%rax), %r11
+	movq	5392(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramParameters4dvNV), .-GL_PREFIX(ProgramParameters4dvNV)
@@ -25318,7 +25363,7 @@ GL_PREFIX(ProgramParameters4dvNV):
 GL_PREFIX(ProgramParameters4fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5392(%rax), %r11
+	movq	5400(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25332,13 +25377,13 @@ GL_PREFIX(ProgramParameters4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5392(%rax), %r11
+	movq	5400(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5392(%rax), %r11
+	movq	5400(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25352,7 +25397,7 @@ GL_PREFIX(ProgramParameters4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5392(%rax), %r11
+	movq	5400(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramParameters4fvNV), .-GL_PREFIX(ProgramParameters4fvNV)
@@ -25363,7 +25408,7 @@ GL_PREFIX(ProgramParameters4fvNV):
 GL_PREFIX(RequestResidentProgramsNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5400(%rax), %r11
+	movq	5408(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25373,13 +25418,13 @@ GL_PREFIX(RequestResidentProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5400(%rax), %r11
+	movq	5408(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5400(%rax), %r11
+	movq	5408(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25389,7 +25434,7 @@ GL_PREFIX(RequestResidentProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5400(%rax), %r11
+	movq	5408(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(RequestResidentProgramsNV), .-GL_PREFIX(RequestResidentProgramsNV)
@@ -25400,7 +25445,7 @@ GL_PREFIX(RequestResidentProgramsNV):
 GL_PREFIX(TrackMatrixNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5408(%rax), %r11
+	movq	5416(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25414,13 +25459,13 @@ GL_PREFIX(TrackMatrixNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5408(%rax), %r11
+	movq	5416(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5408(%rax), %r11
+	movq	5416(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25434,7 +25479,7 @@ GL_PREFIX(TrackMatrixNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5408(%rax), %r11
+	movq	5416(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TrackMatrixNV), .-GL_PREFIX(TrackMatrixNV)
@@ -25445,7 +25490,7 @@ GL_PREFIX(TrackMatrixNV):
 GL_PREFIX(VertexAttrib1dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5416(%rax), %r11
+	movq	5424(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -25455,13 +25500,13 @@ GL_PREFIX(VertexAttrib1dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5416(%rax), %r11
+	movq	5424(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5416(%rax), %r11
+	movq	5424(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -25471,7 +25516,7 @@ GL_PREFIX(VertexAttrib1dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5416(%rax), %r11
+	movq	5424(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1dNV), .-GL_PREFIX(VertexAttrib1dNV)
@@ -25482,7 +25527,7 @@ GL_PREFIX(VertexAttrib1dNV):
 GL_PREFIX(VertexAttrib1dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5424(%rax), %r11
+	movq	5432(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25492,13 +25537,13 @@ GL_PREFIX(VertexAttrib1dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5424(%rax), %r11
+	movq	5432(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5424(%rax), %r11
+	movq	5432(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25508,7 +25553,7 @@ GL_PREFIX(VertexAttrib1dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5424(%rax), %r11
+	movq	5432(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1dvNV), .-GL_PREFIX(VertexAttrib1dvNV)
@@ -25519,7 +25564,7 @@ GL_PREFIX(VertexAttrib1dvNV):
 GL_PREFIX(VertexAttrib1fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5432(%rax), %r11
+	movq	5440(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -25529,13 +25574,13 @@ GL_PREFIX(VertexAttrib1fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5432(%rax), %r11
+	movq	5440(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5432(%rax), %r11
+	movq	5440(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -25545,7 +25590,7 @@ GL_PREFIX(VertexAttrib1fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5432(%rax), %r11
+	movq	5440(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1fNV), .-GL_PREFIX(VertexAttrib1fNV)
@@ -25556,7 +25601,7 @@ GL_PREFIX(VertexAttrib1fNV):
 GL_PREFIX(VertexAttrib1fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5440(%rax), %r11
+	movq	5448(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25566,13 +25611,13 @@ GL_PREFIX(VertexAttrib1fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5440(%rax), %r11
+	movq	5448(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5440(%rax), %r11
+	movq	5448(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25582,7 +25627,7 @@ GL_PREFIX(VertexAttrib1fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5440(%rax), %r11
+	movq	5448(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1fvNV), .-GL_PREFIX(VertexAttrib1fvNV)
@@ -25593,7 +25638,7 @@ GL_PREFIX(VertexAttrib1fvNV):
 GL_PREFIX(VertexAttrib1sNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5448(%rax), %r11
+	movq	5456(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25603,13 +25648,13 @@ GL_PREFIX(VertexAttrib1sNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5448(%rax), %r11
+	movq	5456(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5448(%rax), %r11
+	movq	5456(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25619,7 +25664,7 @@ GL_PREFIX(VertexAttrib1sNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5448(%rax), %r11
+	movq	5456(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1sNV), .-GL_PREFIX(VertexAttrib1sNV)
@@ -25630,7 +25675,7 @@ GL_PREFIX(VertexAttrib1sNV):
 GL_PREFIX(VertexAttrib1svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5456(%rax), %r11
+	movq	5464(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25640,13 +25685,13 @@ GL_PREFIX(VertexAttrib1svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5456(%rax), %r11
+	movq	5464(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5456(%rax), %r11
+	movq	5464(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25656,7 +25701,7 @@ GL_PREFIX(VertexAttrib1svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5456(%rax), %r11
+	movq	5464(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1svNV), .-GL_PREFIX(VertexAttrib1svNV)
@@ -25667,7 +25712,7 @@ GL_PREFIX(VertexAttrib1svNV):
 GL_PREFIX(VertexAttrib2dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5464(%rax), %r11
+	movq	5472(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -25679,13 +25724,13 @@ GL_PREFIX(VertexAttrib2dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5464(%rax), %r11
+	movq	5472(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5464(%rax), %r11
+	movq	5472(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -25697,7 +25742,7 @@ GL_PREFIX(VertexAttrib2dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5464(%rax), %r11
+	movq	5472(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2dNV), .-GL_PREFIX(VertexAttrib2dNV)
@@ -25708,7 +25753,7 @@ GL_PREFIX(VertexAttrib2dNV):
 GL_PREFIX(VertexAttrib2dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5472(%rax), %r11
+	movq	5480(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25718,13 +25763,13 @@ GL_PREFIX(VertexAttrib2dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5472(%rax), %r11
+	movq	5480(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5472(%rax), %r11
+	movq	5480(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25734,7 +25779,7 @@ GL_PREFIX(VertexAttrib2dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5472(%rax), %r11
+	movq	5480(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2dvNV), .-GL_PREFIX(VertexAttrib2dvNV)
@@ -25745,7 +25790,7 @@ GL_PREFIX(VertexAttrib2dvNV):
 GL_PREFIX(VertexAttrib2fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5480(%rax), %r11
+	movq	5488(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -25757,13 +25802,13 @@ GL_PREFIX(VertexAttrib2fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5480(%rax), %r11
+	movq	5488(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5480(%rax), %r11
+	movq	5488(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -25775,7 +25820,7 @@ GL_PREFIX(VertexAttrib2fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5480(%rax), %r11
+	movq	5488(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2fNV), .-GL_PREFIX(VertexAttrib2fNV)
@@ -25786,7 +25831,7 @@ GL_PREFIX(VertexAttrib2fNV):
 GL_PREFIX(VertexAttrib2fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5488(%rax), %r11
+	movq	5496(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25796,13 +25841,13 @@ GL_PREFIX(VertexAttrib2fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5488(%rax), %r11
+	movq	5496(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5488(%rax), %r11
+	movq	5496(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25812,7 +25857,7 @@ GL_PREFIX(VertexAttrib2fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5488(%rax), %r11
+	movq	5496(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2fvNV), .-GL_PREFIX(VertexAttrib2fvNV)
@@ -25823,7 +25868,7 @@ GL_PREFIX(VertexAttrib2fvNV):
 GL_PREFIX(VertexAttrib2sNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5496(%rax), %r11
+	movq	5504(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25833,13 +25878,13 @@ GL_PREFIX(VertexAttrib2sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5496(%rax), %r11
+	movq	5504(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5496(%rax), %r11
+	movq	5504(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25849,7 +25894,7 @@ GL_PREFIX(VertexAttrib2sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5496(%rax), %r11
+	movq	5504(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2sNV), .-GL_PREFIX(VertexAttrib2sNV)
@@ -25860,7 +25905,7 @@ GL_PREFIX(VertexAttrib2sNV):
 GL_PREFIX(VertexAttrib2svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5504(%rax), %r11
+	movq	5512(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25870,13 +25915,13 @@ GL_PREFIX(VertexAttrib2svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5504(%rax), %r11
+	movq	5512(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5504(%rax), %r11
+	movq	5512(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25886,7 +25931,7 @@ GL_PREFIX(VertexAttrib2svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5504(%rax), %r11
+	movq	5512(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2svNV), .-GL_PREFIX(VertexAttrib2svNV)
@@ -25897,7 +25942,7 @@ GL_PREFIX(VertexAttrib2svNV):
 GL_PREFIX(VertexAttrib3dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5512(%rax), %r11
+	movq	5520(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -25911,13 +25956,13 @@ GL_PREFIX(VertexAttrib3dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5512(%rax), %r11
+	movq	5520(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5512(%rax), %r11
+	movq	5520(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -25931,7 +25976,7 @@ GL_PREFIX(VertexAttrib3dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5512(%rax), %r11
+	movq	5520(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3dNV), .-GL_PREFIX(VertexAttrib3dNV)
@@ -25942,7 +25987,7 @@ GL_PREFIX(VertexAttrib3dNV):
 GL_PREFIX(VertexAttrib3dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5520(%rax), %r11
+	movq	5528(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25952,13 +25997,13 @@ GL_PREFIX(VertexAttrib3dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5520(%rax), %r11
+	movq	5528(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5520(%rax), %r11
+	movq	5528(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25968,7 +26013,7 @@ GL_PREFIX(VertexAttrib3dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5520(%rax), %r11
+	movq	5528(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3dvNV), .-GL_PREFIX(VertexAttrib3dvNV)
@@ -25979,7 +26024,7 @@ GL_PREFIX(VertexAttrib3dvNV):
 GL_PREFIX(VertexAttrib3fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5528(%rax), %r11
+	movq	5536(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -25993,13 +26038,13 @@ GL_PREFIX(VertexAttrib3fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5528(%rax), %r11
+	movq	5536(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5528(%rax), %r11
+	movq	5536(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -26013,7 +26058,7 @@ GL_PREFIX(VertexAttrib3fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5528(%rax), %r11
+	movq	5536(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3fNV), .-GL_PREFIX(VertexAttrib3fNV)
@@ -26024,7 +26069,7 @@ GL_PREFIX(VertexAttrib3fNV):
 GL_PREFIX(VertexAttrib3fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5536(%rax), %r11
+	movq	5544(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26034,13 +26079,13 @@ GL_PREFIX(VertexAttrib3fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5536(%rax), %r11
+	movq	5544(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5536(%rax), %r11
+	movq	5544(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26050,7 +26095,7 @@ GL_PREFIX(VertexAttrib3fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5536(%rax), %r11
+	movq	5544(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3fvNV), .-GL_PREFIX(VertexAttrib3fvNV)
@@ -26061,7 +26106,7 @@ GL_PREFIX(VertexAttrib3fvNV):
 GL_PREFIX(VertexAttrib3sNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5544(%rax), %r11
+	movq	5552(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26075,13 +26120,13 @@ GL_PREFIX(VertexAttrib3sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5544(%rax), %r11
+	movq	5552(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5544(%rax), %r11
+	movq	5552(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26095,7 +26140,7 @@ GL_PREFIX(VertexAttrib3sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5544(%rax), %r11
+	movq	5552(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3sNV), .-GL_PREFIX(VertexAttrib3sNV)
@@ -26106,7 +26151,7 @@ GL_PREFIX(VertexAttrib3sNV):
 GL_PREFIX(VertexAttrib3svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5552(%rax), %r11
+	movq	5560(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26116,13 +26161,13 @@ GL_PREFIX(VertexAttrib3svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5552(%rax), %r11
+	movq	5560(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5552(%rax), %r11
+	movq	5560(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26132,7 +26177,7 @@ GL_PREFIX(VertexAttrib3svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5552(%rax), %r11
+	movq	5560(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3svNV), .-GL_PREFIX(VertexAttrib3svNV)
@@ -26143,7 +26188,7 @@ GL_PREFIX(VertexAttrib3svNV):
 GL_PREFIX(VertexAttrib4dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5560(%rax), %r11
+	movq	5568(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -26159,13 +26204,13 @@ GL_PREFIX(VertexAttrib4dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5560(%rax), %r11
+	movq	5568(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5560(%rax), %r11
+	movq	5568(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -26181,7 +26226,7 @@ GL_PREFIX(VertexAttrib4dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5560(%rax), %r11
+	movq	5568(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4dNV), .-GL_PREFIX(VertexAttrib4dNV)
@@ -26192,7 +26237,7 @@ GL_PREFIX(VertexAttrib4dNV):
 GL_PREFIX(VertexAttrib4dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5568(%rax), %r11
+	movq	5576(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26202,13 +26247,13 @@ GL_PREFIX(VertexAttrib4dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5568(%rax), %r11
+	movq	5576(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5568(%rax), %r11
+	movq	5576(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26218,7 +26263,7 @@ GL_PREFIX(VertexAttrib4dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5568(%rax), %r11
+	movq	5576(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4dvNV), .-GL_PREFIX(VertexAttrib4dvNV)
@@ -26229,7 +26274,7 @@ GL_PREFIX(VertexAttrib4dvNV):
 GL_PREFIX(VertexAttrib4fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5576(%rax), %r11
+	movq	5584(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -26245,13 +26290,13 @@ GL_PREFIX(VertexAttrib4fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5576(%rax), %r11
+	movq	5584(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5576(%rax), %r11
+	movq	5584(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -26267,7 +26312,7 @@ GL_PREFIX(VertexAttrib4fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5576(%rax), %r11
+	movq	5584(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4fNV), .-GL_PREFIX(VertexAttrib4fNV)
@@ -26278,7 +26323,7 @@ GL_PREFIX(VertexAttrib4fNV):
 GL_PREFIX(VertexAttrib4fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5584(%rax), %r11
+	movq	5592(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26288,13 +26333,13 @@ GL_PREFIX(VertexAttrib4fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5584(%rax), %r11
+	movq	5592(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5584(%rax), %r11
+	movq	5592(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26304,7 +26349,7 @@ GL_PREFIX(VertexAttrib4fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5584(%rax), %r11
+	movq	5592(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4fvNV), .-GL_PREFIX(VertexAttrib4fvNV)
@@ -26315,7 +26360,7 @@ GL_PREFIX(VertexAttrib4fvNV):
 GL_PREFIX(VertexAttrib4sNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5592(%rax), %r11
+	movq	5600(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26329,13 +26374,13 @@ GL_PREFIX(VertexAttrib4sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5592(%rax), %r11
+	movq	5600(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5592(%rax), %r11
+	movq	5600(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26349,7 +26394,7 @@ GL_PREFIX(VertexAttrib4sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5592(%rax), %r11
+	movq	5600(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4sNV), .-GL_PREFIX(VertexAttrib4sNV)
@@ -26360,7 +26405,7 @@ GL_PREFIX(VertexAttrib4sNV):
 GL_PREFIX(VertexAttrib4svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5600(%rax), %r11
+	movq	5608(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26370,13 +26415,13 @@ GL_PREFIX(VertexAttrib4svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5600(%rax), %r11
+	movq	5608(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5600(%rax), %r11
+	movq	5608(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26386,7 +26431,7 @@ GL_PREFIX(VertexAttrib4svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5600(%rax), %r11
+	movq	5608(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4svNV), .-GL_PREFIX(VertexAttrib4svNV)
@@ -26397,7 +26442,7 @@ GL_PREFIX(VertexAttrib4svNV):
 GL_PREFIX(VertexAttrib4ubNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5608(%rax), %r11
+	movq	5616(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26411,13 +26456,13 @@ GL_PREFIX(VertexAttrib4ubNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5608(%rax), %r11
+	movq	5616(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5608(%rax), %r11
+	movq	5616(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26431,7 +26476,7 @@ GL_PREFIX(VertexAttrib4ubNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5608(%rax), %r11
+	movq	5616(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4ubNV), .-GL_PREFIX(VertexAttrib4ubNV)
@@ -26442,7 +26487,7 @@ GL_PREFIX(VertexAttrib4ubNV):
 GL_PREFIX(VertexAttrib4ubvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5616(%rax), %r11
+	movq	5624(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26452,13 +26497,13 @@ GL_PREFIX(VertexAttrib4ubvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5616(%rax), %r11
+	movq	5624(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5616(%rax), %r11
+	movq	5624(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26468,7 +26513,7 @@ GL_PREFIX(VertexAttrib4ubvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5616(%rax), %r11
+	movq	5624(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4ubvNV), .-GL_PREFIX(VertexAttrib4ubvNV)
@@ -26479,7 +26524,7 @@ GL_PREFIX(VertexAttrib4ubvNV):
 GL_PREFIX(VertexAttribPointerNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5624(%rax), %r11
+	movq	5632(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26493,13 +26538,13 @@ GL_PREFIX(VertexAttribPointerNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5624(%rax), %r11
+	movq	5632(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5624(%rax), %r11
+	movq	5632(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26513,7 +26558,7 @@ GL_PREFIX(VertexAttribPointerNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5624(%rax), %r11
+	movq	5632(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribPointerNV), .-GL_PREFIX(VertexAttribPointerNV)
@@ -26524,7 +26569,7 @@ GL_PREFIX(VertexAttribPointerNV):
 GL_PREFIX(VertexAttribs1dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5632(%rax), %r11
+	movq	5640(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26534,13 +26579,13 @@ GL_PREFIX(VertexAttribs1dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5632(%rax), %r11
+	movq	5640(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5632(%rax), %r11
+	movq	5640(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26550,7 +26595,7 @@ GL_PREFIX(VertexAttribs1dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5632(%rax), %r11
+	movq	5640(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs1dvNV), .-GL_PREFIX(VertexAttribs1dvNV)
@@ -26561,7 +26606,7 @@ GL_PREFIX(VertexAttribs1dvNV):
 GL_PREFIX(VertexAttribs1fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5640(%rax), %r11
+	movq	5648(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26571,13 +26616,13 @@ GL_PREFIX(VertexAttribs1fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5640(%rax), %r11
+	movq	5648(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5640(%rax), %r11
+	movq	5648(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26587,7 +26632,7 @@ GL_PREFIX(VertexAttribs1fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5640(%rax), %r11
+	movq	5648(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs1fvNV), .-GL_PREFIX(VertexAttribs1fvNV)
@@ -26598,7 +26643,7 @@ GL_PREFIX(VertexAttribs1fvNV):
 GL_PREFIX(VertexAttribs1svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5648(%rax), %r11
+	movq	5656(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26608,13 +26653,13 @@ GL_PREFIX(VertexAttribs1svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5648(%rax), %r11
+	movq	5656(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5648(%rax), %r11
+	movq	5656(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26624,7 +26669,7 @@ GL_PREFIX(VertexAttribs1svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5648(%rax), %r11
+	movq	5656(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs1svNV), .-GL_PREFIX(VertexAttribs1svNV)
@@ -26635,7 +26680,7 @@ GL_PREFIX(VertexAttribs1svNV):
 GL_PREFIX(VertexAttribs2dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5656(%rax), %r11
+	movq	5664(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26645,13 +26690,13 @@ GL_PREFIX(VertexAttribs2dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5656(%rax), %r11
+	movq	5664(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5656(%rax), %r11
+	movq	5664(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26661,7 +26706,7 @@ GL_PREFIX(VertexAttribs2dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5656(%rax), %r11
+	movq	5664(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs2dvNV), .-GL_PREFIX(VertexAttribs2dvNV)
@@ -26672,7 +26717,7 @@ GL_PREFIX(VertexAttribs2dvNV):
 GL_PREFIX(VertexAttribs2fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5664(%rax), %r11
+	movq	5672(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26682,13 +26727,13 @@ GL_PREFIX(VertexAttribs2fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5664(%rax), %r11
+	movq	5672(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5664(%rax), %r11
+	movq	5672(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26698,7 +26743,7 @@ GL_PREFIX(VertexAttribs2fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5664(%rax), %r11
+	movq	5672(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs2fvNV), .-GL_PREFIX(VertexAttribs2fvNV)
@@ -26709,7 +26754,7 @@ GL_PREFIX(VertexAttribs2fvNV):
 GL_PREFIX(VertexAttribs2svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5672(%rax), %r11
+	movq	5680(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26719,13 +26764,13 @@ GL_PREFIX(VertexAttribs2svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5672(%rax), %r11
+	movq	5680(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5672(%rax), %r11
+	movq	5680(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26735,7 +26780,7 @@ GL_PREFIX(VertexAttribs2svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5672(%rax), %r11
+	movq	5680(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs2svNV), .-GL_PREFIX(VertexAttribs2svNV)
@@ -26746,7 +26791,7 @@ GL_PREFIX(VertexAttribs2svNV):
 GL_PREFIX(VertexAttribs3dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5680(%rax), %r11
+	movq	5688(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26756,13 +26801,13 @@ GL_PREFIX(VertexAttribs3dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5680(%rax), %r11
+	movq	5688(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5680(%rax), %r11
+	movq	5688(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26772,7 +26817,7 @@ GL_PREFIX(VertexAttribs3dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5680(%rax), %r11
+	movq	5688(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs3dvNV), .-GL_PREFIX(VertexAttribs3dvNV)
@@ -26783,7 +26828,7 @@ GL_PREFIX(VertexAttribs3dvNV):
 GL_PREFIX(VertexAttribs3fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5688(%rax), %r11
+	movq	5696(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26793,13 +26838,13 @@ GL_PREFIX(VertexAttribs3fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5688(%rax), %r11
+	movq	5696(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5688(%rax), %r11
+	movq	5696(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26809,7 +26854,7 @@ GL_PREFIX(VertexAttribs3fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5688(%rax), %r11
+	movq	5696(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs3fvNV), .-GL_PREFIX(VertexAttribs3fvNV)
@@ -26820,7 +26865,7 @@ GL_PREFIX(VertexAttribs3fvNV):
 GL_PREFIX(VertexAttribs3svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5696(%rax), %r11
+	movq	5704(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26830,13 +26875,13 @@ GL_PREFIX(VertexAttribs3svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5696(%rax), %r11
+	movq	5704(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5696(%rax), %r11
+	movq	5704(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26846,7 +26891,7 @@ GL_PREFIX(VertexAttribs3svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5696(%rax), %r11
+	movq	5704(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs3svNV), .-GL_PREFIX(VertexAttribs3svNV)
@@ -26857,7 +26902,7 @@ GL_PREFIX(VertexAttribs3svNV):
 GL_PREFIX(VertexAttribs4dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5704(%rax), %r11
+	movq	5712(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26867,13 +26912,13 @@ GL_PREFIX(VertexAttribs4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5704(%rax), %r11
+	movq	5712(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5704(%rax), %r11
+	movq	5712(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26883,7 +26928,7 @@ GL_PREFIX(VertexAttribs4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5704(%rax), %r11
+	movq	5712(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs4dvNV), .-GL_PREFIX(VertexAttribs4dvNV)
@@ -26894,7 +26939,7 @@ GL_PREFIX(VertexAttribs4dvNV):
 GL_PREFIX(VertexAttribs4fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5712(%rax), %r11
+	movq	5720(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26904,13 +26949,13 @@ GL_PREFIX(VertexAttribs4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5712(%rax), %r11
+	movq	5720(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5712(%rax), %r11
+	movq	5720(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26920,7 +26965,7 @@ GL_PREFIX(VertexAttribs4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5712(%rax), %r11
+	movq	5720(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs4fvNV), .-GL_PREFIX(VertexAttribs4fvNV)
@@ -26931,7 +26976,7 @@ GL_PREFIX(VertexAttribs4fvNV):
 GL_PREFIX(VertexAttribs4svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5720(%rax), %r11
+	movq	5728(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26941,13 +26986,13 @@ GL_PREFIX(VertexAttribs4svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5720(%rax), %r11
+	movq	5728(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5720(%rax), %r11
+	movq	5728(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26957,7 +27002,7 @@ GL_PREFIX(VertexAttribs4svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5720(%rax), %r11
+	movq	5728(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs4svNV), .-GL_PREFIX(VertexAttribs4svNV)
@@ -26968,7 +27013,7 @@ GL_PREFIX(VertexAttribs4svNV):
 GL_PREFIX(VertexAttribs4ubvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5728(%rax), %r11
+	movq	5736(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26978,13 +27023,13 @@ GL_PREFIX(VertexAttribs4ubvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5728(%rax), %r11
+	movq	5736(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5728(%rax), %r11
+	movq	5736(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26994,7 +27039,7 @@ GL_PREFIX(VertexAttribs4ubvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5728(%rax), %r11
+	movq	5736(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs4ubvNV), .-GL_PREFIX(VertexAttribs4ubvNV)
@@ -27005,7 +27050,7 @@ GL_PREFIX(VertexAttribs4ubvNV):
 GL_PREFIX(AlphaFragmentOp1ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5736(%rax), %r11
+	movq	5744(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27023,13 +27068,13 @@ GL_PREFIX(AlphaFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5736(%rax), %r11
+	movq	5744(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5736(%rax), %r11
+	movq	5744(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27047,7 +27092,7 @@ GL_PREFIX(AlphaFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5736(%rax), %r11
+	movq	5744(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AlphaFragmentOp1ATI), .-GL_PREFIX(AlphaFragmentOp1ATI)
@@ -27058,7 +27103,7 @@ GL_PREFIX(AlphaFragmentOp1ATI):
 GL_PREFIX(AlphaFragmentOp2ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5744(%rax), %r11
+	movq	5752(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27076,13 +27121,13 @@ GL_PREFIX(AlphaFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5744(%rax), %r11
+	movq	5752(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5744(%rax), %r11
+	movq	5752(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27100,7 +27145,7 @@ GL_PREFIX(AlphaFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5744(%rax), %r11
+	movq	5752(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AlphaFragmentOp2ATI), .-GL_PREFIX(AlphaFragmentOp2ATI)
@@ -27111,7 +27156,7 @@ GL_PREFIX(AlphaFragmentOp2ATI):
 GL_PREFIX(AlphaFragmentOp3ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5752(%rax), %r11
+	movq	5760(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27129,13 +27174,13 @@ GL_PREFIX(AlphaFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5752(%rax), %r11
+	movq	5760(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5752(%rax), %r11
+	movq	5760(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27153,7 +27198,7 @@ GL_PREFIX(AlphaFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5752(%rax), %r11
+	movq	5760(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AlphaFragmentOp3ATI), .-GL_PREFIX(AlphaFragmentOp3ATI)
@@ -27164,25 +27209,25 @@ GL_PREFIX(AlphaFragmentOp3ATI):
 GL_PREFIX(BeginFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5760(%rax), %r11
+	movq	5768(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	5760(%rax), %r11
+	movq	5768(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5760(%rax), %r11
+	movq	5768(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	5760(%rax), %r11
+	movq	5768(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BeginFragmentShaderATI), .-GL_PREFIX(BeginFragmentShaderATI)
@@ -27193,25 +27238,25 @@ GL_PREFIX(BeginFragmentShaderATI):
 GL_PREFIX(BindFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5768(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5768(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5768(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5768(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindFragmentShaderATI), .-GL_PREFIX(BindFragmentShaderATI)
@@ -27222,7 +27267,7 @@ GL_PREFIX(BindFragmentShaderATI):
 GL_PREFIX(ColorFragmentOp1ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5776(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27240,13 +27285,13 @@ GL_PREFIX(ColorFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5776(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5776(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27264,7 +27309,7 @@ GL_PREFIX(ColorFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5776(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorFragmentOp1ATI), .-GL_PREFIX(ColorFragmentOp1ATI)
@@ -27275,7 +27320,7 @@ GL_PREFIX(ColorFragmentOp1ATI):
 GL_PREFIX(ColorFragmentOp2ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5784(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27293,13 +27338,13 @@ GL_PREFIX(ColorFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5784(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5784(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27317,7 +27362,7 @@ GL_PREFIX(ColorFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5784(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorFragmentOp2ATI), .-GL_PREFIX(ColorFragmentOp2ATI)
@@ -27328,7 +27373,7 @@ GL_PREFIX(ColorFragmentOp2ATI):
 GL_PREFIX(ColorFragmentOp3ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5792(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27346,13 +27391,13 @@ GL_PREFIX(ColorFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5792(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5792(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27370,7 +27415,7 @@ GL_PREFIX(ColorFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5792(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorFragmentOp3ATI), .-GL_PREFIX(ColorFragmentOp3ATI)
@@ -27381,25 +27426,25 @@ GL_PREFIX(ColorFragmentOp3ATI):
 GL_PREFIX(DeleteFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5800(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5800(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5800(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5800(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteFragmentShaderATI), .-GL_PREFIX(DeleteFragmentShaderATI)
@@ -27410,25 +27455,25 @@ GL_PREFIX(DeleteFragmentShaderATI):
 GL_PREFIX(EndFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5808(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	5808(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5808(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	5808(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EndFragmentShaderATI), .-GL_PREFIX(EndFragmentShaderATI)
@@ -27439,25 +27484,25 @@ GL_PREFIX(EndFragmentShaderATI):
 GL_PREFIX(GenFragmentShadersATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5816(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5816(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5816(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5816(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenFragmentShadersATI), .-GL_PREFIX(GenFragmentShadersATI)
@@ -27468,7 +27513,7 @@ GL_PREFIX(GenFragmentShadersATI):
 GL_PREFIX(PassTexCoordATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5824(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27478,13 +27523,13 @@ GL_PREFIX(PassTexCoordATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5824(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5824(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27494,7 +27539,7 @@ GL_PREFIX(PassTexCoordATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5824(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PassTexCoordATI), .-GL_PREFIX(PassTexCoordATI)
@@ -27505,7 +27550,7 @@ GL_PREFIX(PassTexCoordATI):
 GL_PREFIX(SampleMapATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5832(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27515,13 +27560,13 @@ GL_PREFIX(SampleMapATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5832(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5832(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27531,7 +27576,7 @@ GL_PREFIX(SampleMapATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5832(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SampleMapATI), .-GL_PREFIX(SampleMapATI)
@@ -27542,7 +27587,7 @@ GL_PREFIX(SampleMapATI):
 GL_PREFIX(SetFragmentShaderConstantATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5840(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27552,13 +27597,13 @@ GL_PREFIX(SetFragmentShaderConstantATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5840(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5840(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27568,7 +27613,7 @@ GL_PREFIX(SetFragmentShaderConstantATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5840(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SetFragmentShaderConstantATI), .-GL_PREFIX(SetFragmentShaderConstantATI)
@@ -27579,7 +27624,7 @@ GL_PREFIX(SetFragmentShaderConstantATI):
 GL_PREFIX(PointParameteriNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5848(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27589,13 +27634,13 @@ GL_PREFIX(PointParameteriNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5848(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5848(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27605,7 +27650,7 @@ GL_PREFIX(PointParameteriNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5848(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PointParameteriNV), .-GL_PREFIX(PointParameteriNV)
@@ -27616,7 +27661,7 @@ GL_PREFIX(PointParameteriNV):
 GL_PREFIX(PointParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5856(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27626,13 +27671,13 @@ GL_PREFIX(PointParameterivNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5856(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5856(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27642,40 +27687,10 @@ GL_PREFIX(PointParameterivNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5856(%rax), %r11
-	jmp	*%r11
-#endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(PointParameterivNV), .-GL_PREFIX(PointParameterivNV)
-
-	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_733)
-	.type	GL_PREFIX(_dispatch_stub_733), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_733))
-GL_PREFIX(_dispatch_stub_733):
-#if defined(GLX_USE_TLS)
-	call	_x86_64_get_dispatch@PLT
-	movq	5864(%rax), %r11
-	jmp	*%r11
-#elif defined(PTHREADS)
-	pushq	%rdi
-	call	_x86_64_get_dispatch@PLT
-	popq	%rdi
-	movq	5864(%rax), %r11
-	jmp	*%r11
-#else
-	movq	_glapi_Dispatch(%rip), %rax
-	testq	%rax, %rax
-	je	1f
-	movq	5864(%rax), %r11
-	jmp	*%r11
-1:
-	pushq	%rdi
-	call	_glapi_get_dispatch
-	popq	%rdi
 	movq	5864(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_733), .-GL_PREFIX(_dispatch_stub_733)
+	.size	GL_PREFIX(PointParameterivNV), .-GL_PREFIX(PointParameterivNV)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(_dispatch_stub_734)
@@ -27718,11 +27733,7 @@ GL_PREFIX(_dispatch_stub_735):
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
-	pushq	%rsi
-	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
-	popq	%rbp
-	popq	%rsi
 	popq	%rdi
 	movq	5880(%rax), %r11
 	jmp	*%r11
@@ -27734,11 +27745,7 @@ GL_PREFIX(_dispatch_stub_735):
 	jmp	*%r11
 1:
 	pushq	%rdi
-	pushq	%rsi
-	pushq	%rbp
 	call	_glapi_get_dispatch
-	popq	%rbp
-	popq	%rsi
 	popq	%rdi
 	movq	5880(%rax), %r11
 	jmp	*%r11
@@ -27794,7 +27801,11 @@ GL_PREFIX(_dispatch_stub_737):
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
+	popq	%rbp
+	popq	%rsi
 	popq	%rdi
 	movq	5896(%rax), %r11
 	jmp	*%r11
@@ -27806,20 +27817,54 @@ GL_PREFIX(_dispatch_stub_737):
 	jmp	*%r11
 1:
 	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
 	call	_glapi_get_dispatch
+	popq	%rbp
+	popq	%rsi
 	popq	%rdi
 	movq	5896(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(_dispatch_stub_737), .-GL_PREFIX(_dispatch_stub_737)
 
+	.p2align	4,,15
+	.globl	GL_PREFIX(_dispatch_stub_738)
+	.type	GL_PREFIX(_dispatch_stub_738), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_738))
+GL_PREFIX(_dispatch_stub_738):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	5904(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	call	_x86_64_get_dispatch@PLT
+	popq	%rdi
+	movq	5904(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	5904(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	call	_glapi_get_dispatch
+	popq	%rdi
+	movq	5904(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(_dispatch_stub_738), .-GL_PREFIX(_dispatch_stub_738)
+
 	.p2align	4,,15
 	.globl	GL_PREFIX(GetProgramNamedParameterdvNV)
 	.type	GL_PREFIX(GetProgramNamedParameterdvNV), @function
 GL_PREFIX(GetProgramNamedParameterdvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5904(%rax), %r11
+	movq	5912(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27833,13 +27878,13 @@ GL_PREFIX(GetProgramNamedParameterdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5904(%rax), %r11
+	movq	5912(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5904(%rax), %r11
+	movq	5912(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27853,7 +27898,7 @@ GL_PREFIX(GetProgramNamedParameterdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5904(%rax), %r11
+	movq	5912(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramNamedParameterdvNV), .-GL_PREFIX(GetProgramNamedParameterdvNV)
@@ -27864,7 +27909,7 @@ GL_PREFIX(GetProgramNamedParameterdvNV):
 GL_PREFIX(GetProgramNamedParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5912(%rax), %r11
+	movq	5920(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27878,13 +27923,13 @@ GL_PREFIX(GetProgramNamedParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5912(%rax), %r11
+	movq	5920(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5912(%rax), %r11
+	movq	5920(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27898,7 +27943,7 @@ GL_PREFIX(GetProgramNamedParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5912(%rax), %r11
+	movq	5920(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramNamedParameterfvNV), .-GL_PREFIX(GetProgramNamedParameterfvNV)
@@ -27909,7 +27954,7 @@ GL_PREFIX(GetProgramNamedParameterfvNV):
 GL_PREFIX(ProgramNamedParameter4dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5920(%rax), %r11
+	movq	5928(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$56, %rsp
@@ -27929,13 +27974,13 @@ GL_PREFIX(ProgramNamedParameter4dNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	5920(%rax), %r11
+	movq	5928(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5920(%rax), %r11
+	movq	5928(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$56, %rsp
@@ -27955,7 +28000,7 @@ GL_PREFIX(ProgramNamedParameter4dNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	5920(%rax), %r11
+	movq	5928(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4dNV), .-GL_PREFIX(ProgramNamedParameter4dNV)
@@ -27966,7 +28011,7 @@ GL_PREFIX(ProgramNamedParameter4dNV):
 GL_PREFIX(ProgramNamedParameter4dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5928(%rax), %r11
+	movq	5936(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27980,13 +28025,13 @@ GL_PREFIX(ProgramNamedParameter4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5928(%rax), %r11
+	movq	5936(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5928(%rax), %r11
+	movq	5936(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28000,7 +28045,7 @@ GL_PREFIX(ProgramNamedParameter4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5928(%rax), %r11
+	movq	5936(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4dvNV), .-GL_PREFIX(ProgramNamedParameter4dvNV)
@@ -28011,7 +28056,7 @@ GL_PREFIX(ProgramNamedParameter4dvNV):
 GL_PREFIX(ProgramNamedParameter4fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5936(%rax), %r11
+	movq	5944(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$56, %rsp
@@ -28031,13 +28076,13 @@ GL_PREFIX(ProgramNamedParameter4fNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	5936(%rax), %r11
+	movq	5944(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5936(%rax), %r11
+	movq	5944(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$56, %rsp
@@ -28057,7 +28102,7 @@ GL_PREFIX(ProgramNamedParameter4fNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	5936(%rax), %r11
+	movq	5944(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4fNV), .-GL_PREFIX(ProgramNamedParameter4fNV)
@@ -28068,7 +28113,7 @@ GL_PREFIX(ProgramNamedParameter4fNV):
 GL_PREFIX(ProgramNamedParameter4fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5944(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28082,13 +28127,13 @@ GL_PREFIX(ProgramNamedParameter4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5944(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5944(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28102,19 +28147,19 @@ GL_PREFIX(ProgramNamedParameter4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5944(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4fvNV), .-GL_PREFIX(ProgramNamedParameter4fvNV)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_744)
-	.type	GL_PREFIX(_dispatch_stub_744), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_744))
-GL_PREFIX(_dispatch_stub_744):
+	.globl	GL_PREFIX(_dispatch_stub_745)
+	.type	GL_PREFIX(_dispatch_stub_745), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_745))
+GL_PREFIX(_dispatch_stub_745):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5952(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28124,13 +28169,13 @@ GL_PREFIX(_dispatch_stub_744):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5952(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5952(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28140,19 +28185,19 @@ GL_PREFIX(_dispatch_stub_744):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5952(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_744), .-GL_PREFIX(_dispatch_stub_744)
+	.size	GL_PREFIX(_dispatch_stub_745), .-GL_PREFIX(_dispatch_stub_745)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_745)
-	.type	GL_PREFIX(_dispatch_stub_745), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_745))
-GL_PREFIX(_dispatch_stub_745):
+	.globl	GL_PREFIX(_dispatch_stub_746)
+	.type	GL_PREFIX(_dispatch_stub_746), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_746))
+GL_PREFIX(_dispatch_stub_746):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5960(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28162,13 +28207,13 @@ GL_PREFIX(_dispatch_stub_745):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5960(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5960(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28178,10 +28223,10 @@ GL_PREFIX(_dispatch_stub_745):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5960(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_745), .-GL_PREFIX(_dispatch_stub_745)
+	.size	GL_PREFIX(_dispatch_stub_746), .-GL_PREFIX(_dispatch_stub_746)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(BindFramebufferEXT)
@@ -28189,7 +28234,7 @@ GL_PREFIX(_dispatch_stub_745):
 GL_PREFIX(BindFramebufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5968(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28199,13 +28244,13 @@ GL_PREFIX(BindFramebufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5968(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5968(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28215,7 +28260,7 @@ GL_PREFIX(BindFramebufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5968(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindFramebufferEXT), .-GL_PREFIX(BindFramebufferEXT)
@@ -28226,7 +28271,7 @@ GL_PREFIX(BindFramebufferEXT):
 GL_PREFIX(BindRenderbufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5976(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28236,13 +28281,13 @@ GL_PREFIX(BindRenderbufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5976(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5976(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28252,7 +28297,7 @@ GL_PREFIX(BindRenderbufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5976(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindRenderbufferEXT), .-GL_PREFIX(BindRenderbufferEXT)
@@ -28263,25 +28308,25 @@ GL_PREFIX(BindRenderbufferEXT):
 GL_PREFIX(CheckFramebufferStatusEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5984(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5984(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5984(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5984(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CheckFramebufferStatusEXT), .-GL_PREFIX(CheckFramebufferStatusEXT)
@@ -28292,7 +28337,7 @@ GL_PREFIX(CheckFramebufferStatusEXT):
 GL_PREFIX(DeleteFramebuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5992(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28302,13 +28347,13 @@ GL_PREFIX(DeleteFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5992(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5992(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28318,7 +28363,7 @@ GL_PREFIX(DeleteFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5992(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteFramebuffersEXT), .-GL_PREFIX(DeleteFramebuffersEXT)
@@ -28329,7 +28374,7 @@ GL_PREFIX(DeleteFramebuffersEXT):
 GL_PREFIX(DeleteRenderbuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6000(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28339,13 +28384,13 @@ GL_PREFIX(DeleteRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6000(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6000(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28355,7 +28400,7 @@ GL_PREFIX(DeleteRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6000(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteRenderbuffersEXT), .-GL_PREFIX(DeleteRenderbuffersEXT)
@@ -28366,7 +28411,7 @@ GL_PREFIX(DeleteRenderbuffersEXT):
 GL_PREFIX(FramebufferRenderbufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6008(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28380,13 +28425,13 @@ GL_PREFIX(FramebufferRenderbufferEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6008(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6008(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28400,7 +28445,7 @@ GL_PREFIX(FramebufferRenderbufferEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6008(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferRenderbufferEXT), .-GL_PREFIX(FramebufferRenderbufferEXT)
@@ -28411,7 +28456,7 @@ GL_PREFIX(FramebufferRenderbufferEXT):
 GL_PREFIX(FramebufferTexture1DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6016(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28425,13 +28470,13 @@ GL_PREFIX(FramebufferTexture1DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6016(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6016(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28445,7 +28490,7 @@ GL_PREFIX(FramebufferTexture1DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6016(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTexture1DEXT), .-GL_PREFIX(FramebufferTexture1DEXT)
@@ -28456,7 +28501,7 @@ GL_PREFIX(FramebufferTexture1DEXT):
 GL_PREFIX(FramebufferTexture2DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6024(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28470,13 +28515,13 @@ GL_PREFIX(FramebufferTexture2DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6024(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6024(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28490,7 +28535,7 @@ GL_PREFIX(FramebufferTexture2DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6024(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTexture2DEXT), .-GL_PREFIX(FramebufferTexture2DEXT)
@@ -28501,7 +28546,7 @@ GL_PREFIX(FramebufferTexture2DEXT):
 GL_PREFIX(FramebufferTexture3DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6032(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28519,13 +28564,13 @@ GL_PREFIX(FramebufferTexture3DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6032(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6032(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28543,7 +28588,7 @@ GL_PREFIX(FramebufferTexture3DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6032(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTexture3DEXT), .-GL_PREFIX(FramebufferTexture3DEXT)
@@ -28554,7 +28599,7 @@ GL_PREFIX(FramebufferTexture3DEXT):
 GL_PREFIX(GenFramebuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6040(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28564,13 +28609,13 @@ GL_PREFIX(GenFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6040(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6040(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28580,7 +28625,7 @@ GL_PREFIX(GenFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6040(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenFramebuffersEXT), .-GL_PREFIX(GenFramebuffersEXT)
@@ -28591,7 +28636,7 @@ GL_PREFIX(GenFramebuffersEXT):
 GL_PREFIX(GenRenderbuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6048(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28601,13 +28646,13 @@ GL_PREFIX(GenRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6048(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6048(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28617,7 +28662,7 @@ GL_PREFIX(GenRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6048(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenRenderbuffersEXT), .-GL_PREFIX(GenRenderbuffersEXT)
@@ -28628,25 +28673,25 @@ GL_PREFIX(GenRenderbuffersEXT):
 GL_PREFIX(GenerateMipmapEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6056(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6056(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6056(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6056(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenerateMipmapEXT), .-GL_PREFIX(GenerateMipmapEXT)
@@ -28657,7 +28702,7 @@ GL_PREFIX(GenerateMipmapEXT):
 GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6064(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28671,13 +28716,13 @@ GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6064(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6064(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28691,7 +28736,7 @@ GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6064(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetFramebufferAttachmentParameterivEXT), .-GL_PREFIX(GetFramebufferAttachmentParameterivEXT)
@@ -28702,7 +28747,7 @@ GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 GL_PREFIX(GetRenderbufferParameterivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6072(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28712,13 +28757,13 @@ GL_PREFIX(GetRenderbufferParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6072(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6072(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28728,7 +28773,7 @@ GL_PREFIX(GetRenderbufferParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6072(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetRenderbufferParameterivEXT), .-GL_PREFIX(GetRenderbufferParameterivEXT)
@@ -28739,25 +28784,25 @@ GL_PREFIX(GetRenderbufferParameterivEXT):
 GL_PREFIX(IsFramebufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6080(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6080(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6080(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6080(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsFramebufferEXT), .-GL_PREFIX(IsFramebufferEXT)
@@ -28768,25 +28813,25 @@ GL_PREFIX(IsFramebufferEXT):
 GL_PREFIX(IsRenderbufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6088(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6088(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6088(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6088(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsRenderbufferEXT), .-GL_PREFIX(IsRenderbufferEXT)
@@ -28797,7 +28842,7 @@ GL_PREFIX(IsRenderbufferEXT):
 GL_PREFIX(RenderbufferStorageEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6096(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28811,13 +28856,13 @@ GL_PREFIX(RenderbufferStorageEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6096(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6096(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28831,19 +28876,19 @@ GL_PREFIX(RenderbufferStorageEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6096(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(RenderbufferStorageEXT), .-GL_PREFIX(RenderbufferStorageEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_763)
-	.type	GL_PREFIX(_dispatch_stub_763), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_763))
-GL_PREFIX(_dispatch_stub_763):
+	.globl	GL_PREFIX(_dispatch_stub_764)
+	.type	GL_PREFIX(_dispatch_stub_764), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_764))
+GL_PREFIX(_dispatch_stub_764):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6104(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28861,13 +28906,13 @@ GL_PREFIX(_dispatch_stub_763):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6104(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6104(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28885,10 +28930,10 @@ GL_PREFIX(_dispatch_stub_763):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6104(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_763), .-GL_PREFIX(_dispatch_stub_763)
+	.size	GL_PREFIX(_dispatch_stub_764), .-GL_PREFIX(_dispatch_stub_764)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(FramebufferTextureLayerEXT)
@@ -28896,7 +28941,7 @@ GL_PREFIX(_dispatch_stub_763):
 GL_PREFIX(FramebufferTextureLayerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6112(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28910,13 +28955,13 @@ GL_PREFIX(FramebufferTextureLayerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6112(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6112(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28930,19 +28975,19 @@ GL_PREFIX(FramebufferTextureLayerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6112(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTextureLayerEXT), .-GL_PREFIX(FramebufferTextureLayerEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_765)
-	.type	GL_PREFIX(_dispatch_stub_765), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_765))
-GL_PREFIX(_dispatch_stub_765):
+	.globl	GL_PREFIX(_dispatch_stub_766)
+	.type	GL_PREFIX(_dispatch_stub_766), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_766))
+GL_PREFIX(_dispatch_stub_766):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6120(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28956,13 +29001,13 @@ GL_PREFIX(_dispatch_stub_765):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6120(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6120(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28976,19 +29021,19 @@ GL_PREFIX(_dispatch_stub_765):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6120(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_765), .-GL_PREFIX(_dispatch_stub_765)
+	.size	GL_PREFIX(_dispatch_stub_766), .-GL_PREFIX(_dispatch_stub_766)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_766)
-	.type	GL_PREFIX(_dispatch_stub_766), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_766))
-GL_PREFIX(_dispatch_stub_766):
+	.globl	GL_PREFIX(_dispatch_stub_767)
+	.type	GL_PREFIX(_dispatch_stub_767), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_767))
+GL_PREFIX(_dispatch_stub_767):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6128(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29002,13 +29047,13 @@ GL_PREFIX(_dispatch_stub_766):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6128(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6128(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29022,19 +29067,19 @@ GL_PREFIX(_dispatch_stub_766):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6128(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_766), .-GL_PREFIX(_dispatch_stub_766)
+	.size	GL_PREFIX(_dispatch_stub_767), .-GL_PREFIX(_dispatch_stub_767)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_767)
-	.type	GL_PREFIX(_dispatch_stub_767), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_767))
-GL_PREFIX(_dispatch_stub_767):
+	.globl	GL_PREFIX(_dispatch_stub_768)
+	.type	GL_PREFIX(_dispatch_stub_768), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_768))
+GL_PREFIX(_dispatch_stub_768):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6136(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29048,13 +29093,13 @@ GL_PREFIX(_dispatch_stub_767):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6136(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6136(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29068,19 +29113,19 @@ GL_PREFIX(_dispatch_stub_767):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6136(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_767), .-GL_PREFIX(_dispatch_stub_767)
+	.size	GL_PREFIX(_dispatch_stub_768), .-GL_PREFIX(_dispatch_stub_768)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_768)
-	.type	GL_PREFIX(_dispatch_stub_768), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_768))
-GL_PREFIX(_dispatch_stub_768):
+	.globl	GL_PREFIX(_dispatch_stub_769)
+	.type	GL_PREFIX(_dispatch_stub_769), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_769))
+GL_PREFIX(_dispatch_stub_769):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6144(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29090,13 +29135,13 @@ GL_PREFIX(_dispatch_stub_768):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6144(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6144(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29106,19 +29151,19 @@ GL_PREFIX(_dispatch_stub_768):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6144(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_768), .-GL_PREFIX(_dispatch_stub_768)
+	.size	GL_PREFIX(_dispatch_stub_769), .-GL_PREFIX(_dispatch_stub_769)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_769)
-	.type	GL_PREFIX(_dispatch_stub_769), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_769))
-GL_PREFIX(_dispatch_stub_769):
+	.globl	GL_PREFIX(_dispatch_stub_770)
+	.type	GL_PREFIX(_dispatch_stub_770), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_770))
+GL_PREFIX(_dispatch_stub_770):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6152(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29128,13 +29173,13 @@ GL_PREFIX(_dispatch_stub_769):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6152(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6152(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29144,10 +29189,10 @@ GL_PREFIX(_dispatch_stub_769):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6152(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_769), .-GL_PREFIX(_dispatch_stub_769)
+	.size	GL_PREFIX(_dispatch_stub_770), .-GL_PREFIX(_dispatch_stub_770)
 
 	.globl GL_PREFIX(ArrayElementEXT) ; .set GL_PREFIX(ArrayElementEXT), GL_PREFIX(ArrayElement)
 	.globl GL_PREFIX(BindTextureEXT) ; .set GL_PREFIX(BindTextureEXT), GL_PREFIX(BindTexture)
@@ -29402,7 +29447,26 @@ GL_PREFIX(_dispatch_stub_769):
 	.globl GL_PREFIX(IsProgramARB) ; .set GL_PREFIX(IsProgramARB), GL_PREFIX(IsProgramNV)
 	.globl GL_PREFIX(PointParameteri) ; .set GL_PREFIX(PointParameteri), GL_PREFIX(PointParameteriNV)
 	.globl GL_PREFIX(PointParameteriv) ; .set GL_PREFIX(PointParameteriv), GL_PREFIX(PointParameterivNV)
-	.globl GL_PREFIX(BlendEquationSeparate) ; .set GL_PREFIX(BlendEquationSeparate), GL_PREFIX(_dispatch_stub_745)
+	.globl GL_PREFIX(BlendEquationSeparate) ; .set GL_PREFIX(BlendEquationSeparate), GL_PREFIX(_dispatch_stub_746)
+	.globl GL_PREFIX(BindFramebuffer) ; .set GL_PREFIX(BindFramebuffer), GL_PREFIX(BindFramebufferEXT)
+	.globl GL_PREFIX(BindRenderbuffer) ; .set GL_PREFIX(BindRenderbuffer), GL_PREFIX(BindRenderbufferEXT)
+	.globl GL_PREFIX(CheckFramebufferStatus) ; .set GL_PREFIX(CheckFramebufferStatus), GL_PREFIX(CheckFramebufferStatusEXT)
+	.globl GL_PREFIX(DeleteFramebuffers) ; .set GL_PREFIX(DeleteFramebuffers), GL_PREFIX(DeleteFramebuffersEXT)
+	.globl GL_PREFIX(DeleteRenderbuffers) ; .set GL_PREFIX(DeleteRenderbuffers), GL_PREFIX(DeleteRenderbuffersEXT)
+	.globl GL_PREFIX(FramebufferRenderbuffer) ; .set GL_PREFIX(FramebufferRenderbuffer), GL_PREFIX(FramebufferRenderbufferEXT)
+	.globl GL_PREFIX(FramebufferTexture1D) ; .set GL_PREFIX(FramebufferTexture1D), GL_PREFIX(FramebufferTexture1DEXT)
+	.globl GL_PREFIX(FramebufferTexture2D) ; .set GL_PREFIX(FramebufferTexture2D), GL_PREFIX(FramebufferTexture2DEXT)
+	.globl GL_PREFIX(FramebufferTexture3D) ; .set GL_PREFIX(FramebufferTexture3D), GL_PREFIX(FramebufferTexture3DEXT)
+	.globl GL_PREFIX(GenFramebuffers) ; .set GL_PREFIX(GenFramebuffers), GL_PREFIX(GenFramebuffersEXT)
+	.globl GL_PREFIX(GenRenderbuffers) ; .set GL_PREFIX(GenRenderbuffers), GL_PREFIX(GenRenderbuffersEXT)
+	.globl GL_PREFIX(GenerateMipmap) ; .set GL_PREFIX(GenerateMipmap), GL_PREFIX(GenerateMipmapEXT)
+	.globl GL_PREFIX(GetFramebufferAttachmentParameteriv) ; .set GL_PREFIX(GetFramebufferAttachmentParameteriv), GL_PREFIX(GetFramebufferAttachmentParameterivEXT)
+	.globl GL_PREFIX(GetRenderbufferParameteriv) ; .set GL_PREFIX(GetRenderbufferParameteriv), GL_PREFIX(GetRenderbufferParameterivEXT)
+	.globl GL_PREFIX(IsFramebuffer) ; .set GL_PREFIX(IsFramebuffer), GL_PREFIX(IsFramebufferEXT)
+	.globl GL_PREFIX(IsRenderbuffer) ; .set GL_PREFIX(IsRenderbuffer), GL_PREFIX(IsRenderbufferEXT)
+	.globl GL_PREFIX(RenderbufferStorage) ; .set GL_PREFIX(RenderbufferStorage), GL_PREFIX(RenderbufferStorageEXT)
+	.globl GL_PREFIX(BlitFramebuffer) ; .set GL_PREFIX(BlitFramebuffer), GL_PREFIX(_dispatch_stub_764)
+	.globl GL_PREFIX(FramebufferTextureLayer) ; .set GL_PREFIX(FramebufferTextureLayer), GL_PREFIX(FramebufferTextureLayerEXT)
 
 #if defined(GLX_USE_TLS) && defined(__linux__)
 	.section ".note.ABI-tag", "a"
diff --git a/src/mesa/x86/glapi_x86.S b/src/mesa/x86/glapi_x86.S
index b99c2b6520..2e05a74ac6 100644
--- a/src/mesa/x86/glapi_x86.S
+++ b/src/mesa/x86/glapi_x86.S
@@ -712,23 +712,24 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(GetActiveAttribARB, _gloffset_GetActiveAttribARB, GetActiveAttribARB@28)
 	GL_STUB(GetAttribLocationARB, _gloffset_GetAttribLocationARB, GetAttribLocationARB@8)
 	GL_STUB(DrawBuffersARB, _gloffset_DrawBuffersARB, DrawBuffersARB@8)
+	GL_STUB(RenderbufferStorageMultisample, _gloffset_RenderbufferStorageMultisample, RenderbufferStorageMultisample@20)
 	GL_STUB(PolygonOffsetEXT, _gloffset_PolygonOffsetEXT, PolygonOffsetEXT@8)
-	GL_STUB(_dispatch_stub_562, _gloffset_GetPixelTexGenParameterfvSGIS, _dispatch_stub_562@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_562, _dispatch_stub_562@8))
-	GL_STUB(_dispatch_stub_563, _gloffset_GetPixelTexGenParameterivSGIS, _dispatch_stub_563@8)
+	GL_STUB(_dispatch_stub_563, _gloffset_GetPixelTexGenParameterfvSGIS, _dispatch_stub_563@8)
 	HIDDEN(GL_PREFIX(_dispatch_stub_563, _dispatch_stub_563@8))
-	GL_STUB(_dispatch_stub_564, _gloffset_PixelTexGenParameterfSGIS, _dispatch_stub_564@8)
+	GL_STUB(_dispatch_stub_564, _gloffset_GetPixelTexGenParameterivSGIS, _dispatch_stub_564@8)
 	HIDDEN(GL_PREFIX(_dispatch_stub_564, _dispatch_stub_564@8))
-	GL_STUB(_dispatch_stub_565, _gloffset_PixelTexGenParameterfvSGIS, _dispatch_stub_565@8)
+	GL_STUB(_dispatch_stub_565, _gloffset_PixelTexGenParameterfSGIS, _dispatch_stub_565@8)
 	HIDDEN(GL_PREFIX(_dispatch_stub_565, _dispatch_stub_565@8))
-	GL_STUB(_dispatch_stub_566, _gloffset_PixelTexGenParameteriSGIS, _dispatch_stub_566@8)
+	GL_STUB(_dispatch_stub_566, _gloffset_PixelTexGenParameterfvSGIS, _dispatch_stub_566@8)
 	HIDDEN(GL_PREFIX(_dispatch_stub_566, _dispatch_stub_566@8))
-	GL_STUB(_dispatch_stub_567, _gloffset_PixelTexGenParameterivSGIS, _dispatch_stub_567@8)
+	GL_STUB(_dispatch_stub_567, _gloffset_PixelTexGenParameteriSGIS, _dispatch_stub_567@8)
 	HIDDEN(GL_PREFIX(_dispatch_stub_567, _dispatch_stub_567@8))
-	GL_STUB(_dispatch_stub_568, _gloffset_SampleMaskSGIS, _dispatch_stub_568@8)
+	GL_STUB(_dispatch_stub_568, _gloffset_PixelTexGenParameterivSGIS, _dispatch_stub_568@8)
 	HIDDEN(GL_PREFIX(_dispatch_stub_568, _dispatch_stub_568@8))
-	GL_STUB(_dispatch_stub_569, _gloffset_SamplePatternSGIS, _dispatch_stub_569@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_569, _dispatch_stub_569@4))
+	GL_STUB(_dispatch_stub_569, _gloffset_SampleMaskSGIS, _dispatch_stub_569@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_569, _dispatch_stub_569@8))
+	GL_STUB(_dispatch_stub_570, _gloffset_SamplePatternSGIS, _dispatch_stub_570@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_570, _dispatch_stub_570@4))
 	GL_STUB(ColorPointerEXT, _gloffset_ColorPointerEXT, ColorPointerEXT@20)
 	GL_STUB(EdgeFlagPointerEXT, _gloffset_EdgeFlagPointerEXT, EdgeFlagPointerEXT@12)
 	GL_STUB(IndexPointerEXT, _gloffset_IndexPointerEXT, IndexPointerEXT@16)
@@ -739,10 +740,10 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(PointParameterfvEXT, _gloffset_PointParameterfvEXT, PointParameterfvEXT@8)
 	GL_STUB(LockArraysEXT, _gloffset_LockArraysEXT, LockArraysEXT@8)
 	GL_STUB(UnlockArraysEXT, _gloffset_UnlockArraysEXT, UnlockArraysEXT@0)
-	GL_STUB(_dispatch_stub_580, _gloffset_CullParameterdvEXT, _dispatch_stub_580@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_580, _dispatch_stub_580@8))
-	GL_STUB(_dispatch_stub_581, _gloffset_CullParameterfvEXT, _dispatch_stub_581@8)
+	GL_STUB(_dispatch_stub_581, _gloffset_CullParameterdvEXT, _dispatch_stub_581@8)
 	HIDDEN(GL_PREFIX(_dispatch_stub_581, _dispatch_stub_581@8))
+	GL_STUB(_dispatch_stub_582, _gloffset_CullParameterfvEXT, _dispatch_stub_582@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_582, _dispatch_stub_582@8))
 	GL_STUB(SecondaryColor3bEXT, _gloffset_SecondaryColor3bEXT, SecondaryColor3bEXT@12)
 	GL_STUB(SecondaryColor3bvEXT, _gloffset_SecondaryColor3bvEXT, SecondaryColor3bvEXT@4)
 	GL_STUB(SecondaryColor3dEXT, _gloffset_SecondaryColor3dEXT, SecondaryColor3dEXT@24)
@@ -767,8 +768,8 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(FogCoorddvEXT, _gloffset_FogCoorddvEXT, FogCoorddvEXT@4)
 	GL_STUB(FogCoordfEXT, _gloffset_FogCoordfEXT, FogCoordfEXT@4)
 	GL_STUB(FogCoordfvEXT, _gloffset_FogCoordfvEXT, FogCoordfvEXT@4)
-	GL_STUB(_dispatch_stub_606, _gloffset_PixelTexGenSGIX, _dispatch_stub_606@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_606, _dispatch_stub_606@4))
+	GL_STUB(_dispatch_stub_607, _gloffset_PixelTexGenSGIX, _dispatch_stub_607@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_607, _dispatch_stub_607@4))
 	GL_STUB(BlendFuncSeparateEXT, _gloffset_BlendFuncSeparateEXT, BlendFuncSeparateEXT@16)
 	GL_STUB(FlushVertexArrayRangeNV, _gloffset_FlushVertexArrayRangeNV, FlushVertexArrayRangeNV@0)
 	GL_STUB(VertexArrayRangeNV, _gloffset_VertexArrayRangeNV, VertexArrayRangeNV@8)
@@ -810,24 +811,24 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(WindowPos4ivMESA, _gloffset_WindowPos4ivMESA, WindowPos4ivMESA@4)
 	GL_STUB(WindowPos4sMESA, _gloffset_WindowPos4sMESA, WindowPos4sMESA@16)
 	GL_STUB(WindowPos4svMESA, _gloffset_WindowPos4svMESA, WindowPos4svMESA@4)
-	GL_STUB(_dispatch_stub_648, _gloffset_MultiModeDrawArraysIBM, _dispatch_stub_648@20)
-	HIDDEN(GL_PREFIX(_dispatch_stub_648, _dispatch_stub_648@20))
-	GL_STUB(_dispatch_stub_649, _gloffset_MultiModeDrawElementsIBM, _dispatch_stub_649@24)
-	HIDDEN(GL_PREFIX(_dispatch_stub_649, _dispatch_stub_649@24))
-	GL_STUB(_dispatch_stub_650, _gloffset_DeleteFencesNV, _dispatch_stub_650@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_650, _dispatch_stub_650@8))
-	GL_STUB(_dispatch_stub_651, _gloffset_FinishFenceNV, _dispatch_stub_651@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_651, _dispatch_stub_651@4))
-	GL_STUB(_dispatch_stub_652, _gloffset_GenFencesNV, _dispatch_stub_652@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_652, _dispatch_stub_652@8))
-	GL_STUB(_dispatch_stub_653, _gloffset_GetFenceivNV, _dispatch_stub_653@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_653, _dispatch_stub_653@12))
-	GL_STUB(_dispatch_stub_654, _gloffset_IsFenceNV, _dispatch_stub_654@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_654, _dispatch_stub_654@4))
-	GL_STUB(_dispatch_stub_655, _gloffset_SetFenceNV, _dispatch_stub_655@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_655, _dispatch_stub_655@8))
-	GL_STUB(_dispatch_stub_656, _gloffset_TestFenceNV, _dispatch_stub_656@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_656, _dispatch_stub_656@4))
+	GL_STUB(_dispatch_stub_649, _gloffset_MultiModeDrawArraysIBM, _dispatch_stub_649@20)
+	HIDDEN(GL_PREFIX(_dispatch_stub_649, _dispatch_stub_649@20))
+	GL_STUB(_dispatch_stub_650, _gloffset_MultiModeDrawElementsIBM, _dispatch_stub_650@24)
+	HIDDEN(GL_PREFIX(_dispatch_stub_650, _dispatch_stub_650@24))
+	GL_STUB(_dispatch_stub_651, _gloffset_DeleteFencesNV, _dispatch_stub_651@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_651, _dispatch_stub_651@8))
+	GL_STUB(_dispatch_stub_652, _gloffset_FinishFenceNV, _dispatch_stub_652@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_652, _dispatch_stub_652@4))
+	GL_STUB(_dispatch_stub_653, _gloffset_GenFencesNV, _dispatch_stub_653@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_653, _dispatch_stub_653@8))
+	GL_STUB(_dispatch_stub_654, _gloffset_GetFenceivNV, _dispatch_stub_654@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_654, _dispatch_stub_654@12))
+	GL_STUB(_dispatch_stub_655, _gloffset_IsFenceNV, _dispatch_stub_655@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_655, _dispatch_stub_655@4))
+	GL_STUB(_dispatch_stub_656, _gloffset_SetFenceNV, _dispatch_stub_656@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_656, _dispatch_stub_656@8))
+	GL_STUB(_dispatch_stub_657, _gloffset_TestFenceNV, _dispatch_stub_657@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_657, _dispatch_stub_657@4))
 	GL_STUB(AreProgramsResidentNV, _gloffset_AreProgramsResidentNV, AreProgramsResidentNV@12)
 	GL_STUB(BindProgramNV, _gloffset_BindProgramNV, BindProgramNV@8)
 	GL_STUB(DeleteProgramsNV, _gloffset_DeleteProgramsNV, DeleteProgramsNV@8)
@@ -904,26 +905,26 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(SetFragmentShaderConstantATI, _gloffset_SetFragmentShaderConstantATI, SetFragmentShaderConstantATI@8)
 	GL_STUB(PointParameteriNV, _gloffset_PointParameteriNV, PointParameteriNV@8)
 	GL_STUB(PointParameterivNV, _gloffset_PointParameterivNV, PointParameterivNV@8)
-	GL_STUB(_dispatch_stub_733, _gloffset_ActiveStencilFaceEXT, _dispatch_stub_733@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_733, _dispatch_stub_733@4))
-	GL_STUB(_dispatch_stub_734, _gloffset_BindVertexArrayAPPLE, _dispatch_stub_734@4)
+	GL_STUB(_dispatch_stub_734, _gloffset_ActiveStencilFaceEXT, _dispatch_stub_734@4)
 	HIDDEN(GL_PREFIX(_dispatch_stub_734, _dispatch_stub_734@4))
-	GL_STUB(_dispatch_stub_735, _gloffset_DeleteVertexArraysAPPLE, _dispatch_stub_735@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_735, _dispatch_stub_735@8))
-	GL_STUB(_dispatch_stub_736, _gloffset_GenVertexArraysAPPLE, _dispatch_stub_736@8)
+	GL_STUB(_dispatch_stub_735, _gloffset_BindVertexArrayAPPLE, _dispatch_stub_735@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_735, _dispatch_stub_735@4))
+	GL_STUB(_dispatch_stub_736, _gloffset_DeleteVertexArraysAPPLE, _dispatch_stub_736@8)
 	HIDDEN(GL_PREFIX(_dispatch_stub_736, _dispatch_stub_736@8))
-	GL_STUB(_dispatch_stub_737, _gloffset_IsVertexArrayAPPLE, _dispatch_stub_737@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_737, _dispatch_stub_737@4))
+	GL_STUB(_dispatch_stub_737, _gloffset_GenVertexArraysAPPLE, _dispatch_stub_737@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_737, _dispatch_stub_737@8))
+	GL_STUB(_dispatch_stub_738, _gloffset_IsVertexArrayAPPLE, _dispatch_stub_738@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_738, _dispatch_stub_738@4))
 	GL_STUB(GetProgramNamedParameterdvNV, _gloffset_GetProgramNamedParameterdvNV, GetProgramNamedParameterdvNV@16)
 	GL_STUB(GetProgramNamedParameterfvNV, _gloffset_GetProgramNamedParameterfvNV, GetProgramNamedParameterfvNV@16)
 	GL_STUB(ProgramNamedParameter4dNV, _gloffset_ProgramNamedParameter4dNV, ProgramNamedParameter4dNV@44)
 	GL_STUB(ProgramNamedParameter4dvNV, _gloffset_ProgramNamedParameter4dvNV, ProgramNamedParameter4dvNV@16)
 	GL_STUB(ProgramNamedParameter4fNV, _gloffset_ProgramNamedParameter4fNV, ProgramNamedParameter4fNV@28)
 	GL_STUB(ProgramNamedParameter4fvNV, _gloffset_ProgramNamedParameter4fvNV, ProgramNamedParameter4fvNV@16)
-	GL_STUB(_dispatch_stub_744, _gloffset_DepthBoundsEXT, _dispatch_stub_744@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_744, _dispatch_stub_744@16))
-	GL_STUB(_dispatch_stub_745, _gloffset_BlendEquationSeparateEXT, _dispatch_stub_745@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_745, _dispatch_stub_745@8))
+	GL_STUB(_dispatch_stub_745, _gloffset_DepthBoundsEXT, _dispatch_stub_745@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_745, _dispatch_stub_745@16))
+	GL_STUB(_dispatch_stub_746, _gloffset_BlendEquationSeparateEXT, _dispatch_stub_746@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_746, _dispatch_stub_746@8))
 	GL_STUB(BindFramebufferEXT, _gloffset_BindFramebufferEXT, BindFramebufferEXT@8)
 	GL_STUB(BindRenderbufferEXT, _gloffset_BindRenderbufferEXT, BindRenderbufferEXT@8)
 	GL_STUB(CheckFramebufferStatusEXT, _gloffset_CheckFramebufferStatusEXT, CheckFramebufferStatusEXT@4)
@@ -941,19 +942,19 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(IsFramebufferEXT, _gloffset_IsFramebufferEXT, IsFramebufferEXT@4)
 	GL_STUB(IsRenderbufferEXT, _gloffset_IsRenderbufferEXT, IsRenderbufferEXT@4)
 	GL_STUB(RenderbufferStorageEXT, _gloffset_RenderbufferStorageEXT, RenderbufferStorageEXT@16)
-	GL_STUB(_dispatch_stub_763, _gloffset_BlitFramebufferEXT, _dispatch_stub_763@40)
-	HIDDEN(GL_PREFIX(_dispatch_stub_763, _dispatch_stub_763@40))
+	GL_STUB(_dispatch_stub_764, _gloffset_BlitFramebufferEXT, _dispatch_stub_764@40)
+	HIDDEN(GL_PREFIX(_dispatch_stub_764, _dispatch_stub_764@40))
 	GL_STUB(FramebufferTextureLayerEXT, _gloffset_FramebufferTextureLayerEXT, FramebufferTextureLayerEXT@20)
-	GL_STUB(_dispatch_stub_765, _gloffset_StencilFuncSeparateATI, _dispatch_stub_765@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_765, _dispatch_stub_765@16))
-	GL_STUB(_dispatch_stub_766, _gloffset_ProgramEnvParameters4fvEXT, _dispatch_stub_766@16)
+	GL_STUB(_dispatch_stub_766, _gloffset_StencilFuncSeparateATI, _dispatch_stub_766@16)
 	HIDDEN(GL_PREFIX(_dispatch_stub_766, _dispatch_stub_766@16))
-	GL_STUB(_dispatch_stub_767, _gloffset_ProgramLocalParameters4fvEXT, _dispatch_stub_767@16)
+	GL_STUB(_dispatch_stub_767, _gloffset_ProgramEnvParameters4fvEXT, _dispatch_stub_767@16)
 	HIDDEN(GL_PREFIX(_dispatch_stub_767, _dispatch_stub_767@16))
-	GL_STUB(_dispatch_stub_768, _gloffset_GetQueryObjecti64vEXT, _dispatch_stub_768@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_768, _dispatch_stub_768@12))
-	GL_STUB(_dispatch_stub_769, _gloffset_GetQueryObjectui64vEXT, _dispatch_stub_769@12)
+	GL_STUB(_dispatch_stub_768, _gloffset_ProgramLocalParameters4fvEXT, _dispatch_stub_768@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_768, _dispatch_stub_768@16))
+	GL_STUB(_dispatch_stub_769, _gloffset_GetQueryObjecti64vEXT, _dispatch_stub_769@12)
 	HIDDEN(GL_PREFIX(_dispatch_stub_769, _dispatch_stub_769@12))
+	GL_STUB(_dispatch_stub_770, _gloffset_GetQueryObjectui64vEXT, _dispatch_stub_770@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_770, _dispatch_stub_770@12))
 	GL_STUB_ALIAS(ArrayElementEXT, _gloffset_ArrayElement, ArrayElementEXT@4, ArrayElement, ArrayElement@4)
 	GL_STUB_ALIAS(BindTextureEXT, _gloffset_BindTexture, BindTextureEXT@8, BindTexture, BindTexture@8)
 	GL_STUB_ALIAS(DrawArraysEXT, _gloffset_DrawArrays, DrawArraysEXT@12, DrawArrays, DrawArrays@12)
@@ -1269,6 +1270,24 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB_ALIAS(IsProgramARB, _gloffset_IsProgramNV, IsProgramARB@4, IsProgramNV, IsProgramNV@4)
 	GL_STUB_ALIAS(PointParameteri, _gloffset_PointParameteriNV, PointParameteri@8, PointParameteriNV, PointParameteriNV@8)
 	GL_STUB_ALIAS(PointParameteriv, _gloffset_PointParameterivNV, PointParameteriv@8, PointParameterivNV, PointParameterivNV@8)
+	GL_STUB_ALIAS(BindFramebuffer, _gloffset_BindFramebufferEXT, BindFramebuffer@8, BindFramebufferEXT, BindFramebufferEXT@8)
+	GL_STUB_ALIAS(BindRenderbuffer, _gloffset_BindRenderbufferEXT, BindRenderbuffer@8, BindRenderbufferEXT, BindRenderbufferEXT@8)
+	GL_STUB_ALIAS(CheckFramebufferStatus, _gloffset_CheckFramebufferStatusEXT, CheckFramebufferStatus@4, CheckFramebufferStatusEXT, CheckFramebufferStatusEXT@4)
+	GL_STUB_ALIAS(DeleteFramebuffers, _gloffset_DeleteFramebuffersEXT, DeleteFramebuffers@8, DeleteFramebuffersEXT, DeleteFramebuffersEXT@8)
+	GL_STUB_ALIAS(DeleteRenderbuffers, _gloffset_DeleteRenderbuffersEXT, DeleteRenderbuffers@8, DeleteRenderbuffersEXT, DeleteRenderbuffersEXT@8)
+	GL_STUB_ALIAS(FramebufferRenderbuffer, _gloffset_FramebufferRenderbufferEXT, FramebufferRenderbuffer@16, FramebufferRenderbufferEXT, FramebufferRenderbufferEXT@16)
+	GL_STUB_ALIAS(FramebufferTexture1D, _gloffset_FramebufferTexture1DEXT, FramebufferTexture1D@20, FramebufferTexture1DEXT, FramebufferTexture1DEXT@20)
+	GL_STUB_ALIAS(FramebufferTexture2D, _gloffset_FramebufferTexture2DEXT, FramebufferTexture2D@20, FramebufferTexture2DEXT, FramebufferTexture2DEXT@20)
+	GL_STUB_ALIAS(FramebufferTexture3D, _gloffset_FramebufferTexture3DEXT, FramebufferTexture3D@24, FramebufferTexture3DEXT, FramebufferTexture3DEXT@24)
+	GL_STUB_ALIAS(GenFramebuffers, _gloffset_GenFramebuffersEXT, GenFramebuffers@8, GenFramebuffersEXT, GenFramebuffersEXT@8)
+	GL_STUB_ALIAS(GenRenderbuffers, _gloffset_GenRenderbuffersEXT, GenRenderbuffers@8, GenRenderbuffersEXT, GenRenderbuffersEXT@8)
+	GL_STUB_ALIAS(GenerateMipmap, _gloffset_GenerateMipmapEXT, GenerateMipmap@4, GenerateMipmapEXT, GenerateMipmapEXT@4)
+	GL_STUB_ALIAS(GetFramebufferAttachmentParameteriv, _gloffset_GetFramebufferAttachmentParameterivEXT, GetFramebufferAttachmentParameteriv@16, GetFramebufferAttachmentParameterivEXT, GetFramebufferAttachmentParameterivEXT@16)
+	GL_STUB_ALIAS(GetRenderbufferParameteriv, _gloffset_GetRenderbufferParameterivEXT, GetRenderbufferParameteriv@12, GetRenderbufferParameterivEXT, GetRenderbufferParameterivEXT@12)
+	GL_STUB_ALIAS(IsFramebuffer, _gloffset_IsFramebufferEXT, IsFramebuffer@4, IsFramebufferEXT, IsFramebufferEXT@4)
+	GL_STUB_ALIAS(IsRenderbuffer, _gloffset_IsRenderbufferEXT, IsRenderbuffer@4, IsRenderbufferEXT, IsRenderbufferEXT@4)
+	GL_STUB_ALIAS(RenderbufferStorage, _gloffset_RenderbufferStorageEXT, RenderbufferStorage@16, RenderbufferStorageEXT, RenderbufferStorageEXT@16)
+	GL_STUB_ALIAS(FramebufferTextureLayer, _gloffset_FramebufferTextureLayerEXT, FramebufferTextureLayer@20, FramebufferTextureLayerEXT, FramebufferTextureLayerEXT@20)
 
 		GLOBL	GLNAME(gl_dispatch_functions_end)
 		HIDDEN(GLNAME(gl_dispatch_functions_end))
-- 
cgit v1.2.3


From 7d98f5ab6e207586dcac4b165221ea9852fcf035 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 22 Jan 2009 15:04:11 -0700
Subject: mesa: initial extension bits for GL_ARB_framebuffer_object

---
 src/mesa/main/extensions.c | 1 +
 src/mesa/main/mfeatures.h  | 1 +
 src/mesa/main/mtypes.h     | 1 +
 3 files changed, 3 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 9522f04ae5..0cad9887a2 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -49,6 +49,7 @@ static const struct {
    { OFF, "GL_ARB_fragment_program",           F(ARB_fragment_program) },
    { OFF, "GL_ARB_fragment_program_shadow",    F(ARB_fragment_program_shadow) },
    { OFF, "GL_ARB_fragment_shader",            F(ARB_fragment_shader) },
+   { OFF, "GL_ARB_framebuffer_object",         F(ARB_framebuffer_object) },
    { OFF, "GL_ARB_half_float_pixel",           F(ARB_half_float_pixel) },
    { OFF, "GL_ARB_imaging",                    F(ARB_imaging) },
    { OFF, "GL_ARB_multisample",                F(ARB_multisample) },
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index 3819da3d68..8fb32dd7e9 100644
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -60,6 +60,7 @@
 
 #define FEATURE_ARB_occlusion_query  _HAVE_FULL_GL
 #define FEATURE_ARB_fragment_program  _HAVE_FULL_GL
+#define FEATURE_ARB_framebuffer_object  _HAVE_FULL_GL
 #define FEATURE_ARB_vertex_buffer_object  _HAVE_FULL_GL
 #define FEATURE_ARB_vertex_program  _HAVE_FULL_GL
 #define FEATURE_ARB_vertex_shader _HAVE_FULL_GL
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 2014745a7a..faa9cbd624 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2531,6 +2531,7 @@ struct gl_extensions
    GLboolean ARB_fragment_program;
    GLboolean ARB_fragment_program_shadow;
    GLboolean ARB_fragment_shader;
+   GLboolean ARB_framebuffer_object;
    GLboolean ARB_half_float_pixel;
    GLboolean ARB_imaging;
    GLboolean ARB_multisample;
-- 
cgit v1.2.3


From 989edea40913de9347908488db8978eb2efaba63 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 22 Jan 2009 15:05:13 -0700
Subject: mesa: for ARB_fbo, lift restriction that all FBO attachments are same
 size and color format

---
 src/mesa/main/fbobject.c | 68 ++++++++++++++++++++++++++++++++----------------
 1 file changed, 45 insertions(+), 23 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 876d691c65..faf3763b71 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -3,6 +3,7 @@
  * Version:  7.1
  *
  * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2009  VMware, Inc.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,6 +25,8 @@
 
 
 /*
+ * GL_EXT/ARB_framebuffer_object extensions
+ *
  * Authors:
  *   Brian Paul
  */
@@ -34,6 +37,7 @@
 #include "fbobject.h"
 #include "framebuffer.h"
 #include "hash.h"
+#include "macros.h"
 #include "mipmap.h"
 #include "renderbuffer.h"
 #include "state.h"
@@ -416,9 +420,9 @@ fbo_incomplete(const char *msg, int index)
 void
 _mesa_test_framebuffer_completeness(GLcontext *ctx, struct gl_framebuffer *fb)
 {
-   GLuint numImages, width = 0, height = 0;
-   GLenum intFormat = GL_NONE;
-   GLuint w = 0, h = 0;
+   GLuint numImages;
+   GLenum intFormat = GL_NONE; /* color buffers' internal format */
+   GLuint minWidth = ~0, minHeight = ~0, maxWidth = 0, maxHeight = 0;
    GLint i;
    GLuint j;
 
@@ -428,11 +432,17 @@ _mesa_test_framebuffer_completeness(GLcontext *ctx, struct gl_framebuffer *fb)
    fb->Width = 0;
    fb->Height = 0;
 
-   /* Start at -2 to more easily loop over all attachment points */
+   /* Start at -2 to more easily loop over all attachment points.
+    *  -2: depth buffer
+    *  -1: stencil buffer
+    * >=0: color buffer
+    */
    for (i = -2; i < (GLint) ctx->Const.MaxColorAttachments; i++) {
       struct gl_renderbuffer_attachment *att;
       GLenum f;
 
+      /* check for attachment completeness
+       */
       if (i == -2) {
          att = &fb->Attachment[BUFFER_DEPTH];
          test_attachment_completeness(ctx, GL_DEPTH, att);
@@ -461,11 +471,15 @@ _mesa_test_framebuffer_completeness(GLcontext *ctx, struct gl_framebuffer *fb)
          }
       }
 
+      /* get width, height, format of the renderbuffer/texture
+       */
       if (att->Type == GL_TEXTURE) {
          const struct gl_texture_image *texImg
             = att->Texture->Image[att->CubeMapFace][att->TextureLevel];
-         w = texImg->Width;
-         h = texImg->Height;
+         minWidth = MIN2(minWidth, texImg->Width);
+         maxWidth = MAX2(maxWidth, texImg->Width);
+         minHeight = MIN2(minHeight, texImg->Height);
+         maxHeight = MAX2(maxHeight, texImg->Height);
          f = texImg->_BaseFormat;
          numImages++;
          if (f != GL_RGB && f != GL_RGBA && f != GL_DEPTH_COMPONENT
@@ -476,8 +490,10 @@ _mesa_test_framebuffer_completeness(GLcontext *ctx, struct gl_framebuffer *fb)
          }
       }
       else if (att->Type == GL_RENDERBUFFER_EXT) {
-         w = att->Renderbuffer->Width;
-         h = att->Renderbuffer->Height;
+         minWidth = MIN2(minWidth, att->Renderbuffer->Width);
+         maxWidth = MAX2(minWidth, att->Renderbuffer->Width);
+         minHeight = MIN2(minHeight, att->Renderbuffer->Height);
+         maxHeight = MAX2(minHeight, att->Renderbuffer->Height);
          f = att->Renderbuffer->InternalFormat;
          numImages++;
       }
@@ -486,24 +502,27 @@ _mesa_test_framebuffer_completeness(GLcontext *ctx, struct gl_framebuffer *fb)
          continue;
       }
 
+      /* Error-check width, height, format
+       */
       if (numImages == 1) {
-         /* set required width, height and format */
-         width = w;
-         height = h;
+         /* save format */
          if (i >= 0)
             intFormat = f;
       }
       else {
-         /* check that width, height, format are same */
-         if (w != width || h != height) {
-            fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT;
-            fbo_incomplete("width or height mismatch", -1);
-            return;
-         }
-         if (intFormat != GL_NONE && f != intFormat) {
-            fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT;
-            fbo_incomplete("format mismatch", -1);
-            return;
+         if (!ctx->Extensions.ARB_framebuffer_object) {
+            /* check that width, height, format are same */
+            if (minWidth != maxWidth || minHeight != maxHeight) {
+               fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT;
+               fbo_incomplete("width or height mismatch", -1);
+               return;
+            }
+            /* check that all color buffer have same format */
+            if (intFormat != GL_NONE && f != intFormat) {
+               fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT;
+               fbo_incomplete("format mismatch", -1);
+               return;
+            }
          }
       }
    }
@@ -544,10 +563,13 @@ _mesa_test_framebuffer_completeness(GLcontext *ctx, struct gl_framebuffer *fb)
 
    /*
     * If we get here, the framebuffer is complete!
+    * Note that if ARB_framebuffer_object is supported and the attached
+    * renderbuffers/textures are different sizes, the framebuffer width/height
+    * will be set to the smallest width/height.
     */
    fb->_Status = GL_FRAMEBUFFER_COMPLETE_EXT;
-   fb->Width = w;
-   fb->Height = h;
+   fb->Width = minWidth;
+   fb->Height = minHeight;
 }
 
 
-- 
cgit v1.2.3


From 06f3b2e6799ebd66a813ce9345c2ca6bbd0abe7d Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 22 Jan 2009 15:06:17 -0700
Subject: mesa: additional FBO/RB id error checking for ARB_fbo

It's illegal to bind a FBO/RB id that didn't come from glGenRender/Framebuffer().
---
 src/mesa/main/fbobject.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index faf3763b71..f904937078 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -616,6 +616,11 @@ _mesa_BindRenderbufferEXT(GLenum target, GLuint renderbuffer)
          newRb = NULL;
       }
       if (!newRb) {
+         if (ctx->Extensions.ARB_framebuffer_object) {
+            /* All RB IDs must be Gen'd */
+	    _mesa_error(ctx, GL_INVALID_OPERATION, "glBindRenderbuffer(buffer)");
+	    return;
+         }
 	 /* create new renderbuffer object */
 	 newRb = ctx->Driver.NewRenderbuffer(ctx, renderbuffer);
 	 if (!newRb) {
@@ -1018,6 +1023,11 @@ _mesa_BindFramebufferEXT(GLenum target, GLuint framebuffer)
          newFb = NULL;
       }
       if (!newFb) {
+         if (ctx->Extensions.ARB_framebuffer_object) {
+            /* All FBO IDs must be Gen'd */
+	    _mesa_error(ctx, GL_INVALID_OPERATION, "glBindFramebuffer(buffer)");
+	    return;
+         }
 	 /* create new framebuffer object */
 	 newFb = ctx->Driver.NewFramebuffer(ctx, framebuffer);
 	 if (!newFb) {
-- 
cgit v1.2.3


From d9a2cf92468f318e4cd7f1cfdbb3faf53545ecad Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 22 Jan 2009 15:07:10 -0700
Subject: mesa: add new ColorEncoding and ComponentType to gl_renderbuffer

---
 src/mesa/main/mtypes.h       | 6 +++++-
 src/mesa/main/renderbuffer.c | 7 ++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index faa9cbd624..0cd88e7b3a 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2260,7 +2260,9 @@ struct gl_renderbuffer
    GLenum _ActualFormat;  /**< The driver-chosen format */
    GLenum _BaseFormat;    /**< Either GL_RGB, GL_RGBA, GL_DEPTH_COMPONENT or
                                GL_STENCIL_INDEX. */
-   GLenum DataType;      /**< Type of values passed to the Get/Put functions */
+   GLenum ColorEncoding; /**< GL_LINEAR or GL_SRGB */
+   GLenum ComponentType; /**< GL_FLOAT, GL_INT, GL_UNSIGNED_INT,
+                              GL_UNSIGNED_NORMALIZED or GL_INDEX */
    GLubyte RedBits;      /**< Bits of red per pixel */
    GLubyte GreenBits;
    GLubyte BlueBits;
@@ -2268,6 +2270,8 @@ struct gl_renderbuffer
    GLubyte IndexBits;
    GLubyte DepthBits;
    GLubyte StencilBits;
+
+   GLenum DataType;      /**< Type of values passed to the Get/Put functions */
    GLvoid *Data;        /**< This may not be used by some kinds of RBs */
 
    /* Used to wrap one renderbuffer around another: */
diff --git a/src/mesa/main/renderbuffer.c b/src/mesa/main/renderbuffer.c
index 6f1d7c3960..6047ebac4a 100644
--- a/src/mesa/main/renderbuffer.c
+++ b/src/mesa/main/renderbuffer.c
@@ -1487,11 +1487,16 @@ _mesa_init_renderbuffer(struct gl_renderbuffer *rb, GLuint name)
    rb->InternalFormat = GL_NONE;
    rb->_ActualFormat = GL_NONE;
    rb->_BaseFormat = GL_NONE;
-   rb->DataType = GL_NONE;
+
+   rb->ComponentType = GL_UNSIGNED_NORMALIZED; /* ARB_fbo */
+   rb->ColorEncoding = GL_LINEAR; /* ARB_fbo */
+
    rb->RedBits = rb->GreenBits = rb->BlueBits = rb->AlphaBits = 0;
    rb->IndexBits = 0;
    rb->DepthBits = 0;
    rb->StencilBits = 0;
+
+   rb->DataType = GL_NONE;
    rb->Data = NULL;
 
    /* Point back to ourself so that we don't have to check for Wrapped==NULL
-- 
cgit v1.2.3


From 1bc59bf4f85d1649e6c273cca82785965ea94ac9 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 22 Jan 2009 15:07:34 -0700
Subject: mesa: add new ARB_fbo queries, fix some error tests

---
 src/mesa/main/fbobject.c | 107 ++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 97 insertions(+), 10 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index f904937078..5bb9015efe 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -441,6 +441,11 @@ _mesa_test_framebuffer_completeness(GLcontext *ctx, struct gl_framebuffer *fb)
       struct gl_renderbuffer_attachment *att;
       GLenum f;
 
+      /*
+       * XXX for ARB_fbo, only check color buffers that are named by
+       * GL_READ_BUFFER and GL_DRAW_BUFFERi.
+       */
+
       /* check for attachment completeness
        */
       if (i == -2) {
@@ -615,12 +620,13 @@ _mesa_BindRenderbufferEXT(GLenum target, GLuint renderbuffer)
          /* ID was reserved, but no real renderbuffer object made yet */
          newRb = NULL;
       }
+      else if (!newRb && ctx->Extensions.ARB_framebuffer_object) {
+         /* All RB IDs must be Gen'd */
+         _mesa_error(ctx, GL_INVALID_OPERATION, "glBindRenderbuffer(buffer)");
+         return;
+      }
+
       if (!newRb) {
-         if (ctx->Extensions.ARB_framebuffer_object) {
-            /* All RB IDs must be Gen'd */
-	    _mesa_error(ctx, GL_INVALID_OPERATION, "glBindRenderbuffer(buffer)");
-	    return;
-         }
 	 /* create new renderbuffer object */
 	 newRb = ctx->Driver.NewRenderbuffer(ctx, renderbuffer);
 	 if (!newRb) {
@@ -973,6 +979,13 @@ _mesa_BindFramebufferEXT(GLenum target, GLuint framebuffer)
    GLboolean bindReadBuf, bindDrawBuf;
    GET_CURRENT_CONTEXT(ctx);
 
+#ifdef DEBUG
+   if (ctx->Extensions.ARB_framebuffer_object) {
+      ASSERT(ctx->Extensions.EXT_framebuffer_object);
+      ASSERT(ctx->Extensions.EXT_framebuffer_blit);
+   }
+#endif
+
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
    if (!ctx->Extensions.EXT_framebuffer_object) {
@@ -1022,12 +1035,13 @@ _mesa_BindFramebufferEXT(GLenum target, GLuint framebuffer)
          /* ID was reserved, but no real framebuffer object made yet */
          newFb = NULL;
       }
+      else if (!newFb && ctx->Extensions.ARB_framebuffer_object) {
+         /* All FBO IDs must be Gen'd */
+         _mesa_error(ctx, GL_INVALID_OPERATION, "glBindFramebuffer(buffer)");
+         return;
+      }
+
       if (!newFb) {
-         if (ctx->Extensions.ARB_framebuffer_object) {
-            /* All FBO IDs must be Gen'd */
-	    _mesa_error(ctx, GL_INVALID_OPERATION, "glBindFramebuffer(buffer)");
-	    return;
-         }
 	 /* create new framebuffer object */
 	 newFb = ctx->Driver.NewFramebuffer(ctx, framebuffer);
 	 if (!newFb) {
@@ -1573,6 +1587,79 @@ _mesa_GetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment,
 		     "glGetFramebufferAttachmentParameterivEXT(pname)");
       }
       return;
+   case GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING:
+      if (!ctx->Extensions.ARB_framebuffer_object) {
+         _mesa_error(ctx, GL_INVALID_ENUM,
+                     "glGetFramebufferAttachmentParameterivEXT(pname)");
+      }
+      else {
+         *params = att->Renderbuffer->ColorEncoding;
+      }
+      return;
+   case GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE:
+      if (!ctx->Extensions.ARB_framebuffer_object) {
+         _mesa_error(ctx, GL_INVALID_ENUM,
+                     "glGetFramebufferAttachmentParameterivEXT(pname)");
+         return;
+      }
+      else {
+         *params = att->Renderbuffer->ComponentType;
+      }
+      return;
+   case GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE:
+      if (!ctx->Extensions.ARB_framebuffer_object) {
+         _mesa_error(ctx, GL_INVALID_ENUM,
+                     "glGetFramebufferAttachmentParameterivEXT(pname)");
+      }
+      else {
+         *params = att->Renderbuffer->RedBits;
+      }
+      return;
+   case GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE:
+      if (!ctx->Extensions.ARB_framebuffer_object) {
+         _mesa_error(ctx, GL_INVALID_ENUM,
+                     "glGetFramebufferAttachmentParameterivEXT(pname)");
+      }
+      else {
+         *params = att->Renderbuffer->GreenBits;
+      }
+      return;
+   case GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE:
+      if (!ctx->Extensions.ARB_framebuffer_object) {
+         _mesa_error(ctx, GL_INVALID_ENUM,
+                     "glGetFramebufferAttachmentParameterivEXT(pname)");
+      }
+      else {
+         *params = att->Renderbuffer->BlueBits;
+      }
+      return;
+   case GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE:
+      if (!ctx->Extensions.ARB_framebuffer_object) {
+         _mesa_error(ctx, GL_INVALID_ENUM,
+                     "glGetFramebufferAttachmentParameterivEXT(pname)");
+      }
+      else {
+         *params = att->Renderbuffer->AlphaBits;
+      }
+      return;
+   case GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE:
+      if (!ctx->Extensions.ARB_framebuffer_object) {
+         _mesa_error(ctx, GL_INVALID_ENUM,
+                     "glGetFramebufferAttachmentParameterivEXT(pname)");
+      }
+      else {
+         *params = att->Renderbuffer->DepthBits;
+      }
+      return;
+   case GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE:
+      if (!ctx->Extensions.ARB_framebuffer_object) {
+         _mesa_error(ctx, GL_INVALID_ENUM,
+                     "glGetFramebufferAttachmentParameterivEXT(pname)");
+      }
+      else {
+         *params = att->Renderbuffer->StencilBits;
+      }
+      return;
    default:
       _mesa_error(ctx, GL_INVALID_ENUM,
                   "glGetFramebufferAttachmentParameterivEXT(pname)");
-- 
cgit v1.2.3


From 3528f69ce4ba9098ff4d372d7d411b24cf161d61 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 22 Jan 2009 15:13:18 -0700
Subject: mesa: added ctx->Driver.ValidateFramebuffer() callback

Called from the _mesa_test_framebuffer_completeness() function to give the
driver the chance to make a framebuffer as incomplete if it doesn't meet
some specific hardware restriction.
---
 src/mesa/main/dd.h       |  2 ++
 src/mesa/main/fbobject.c | 26 ++++++++++++++++++--------
 2 files changed, 20 insertions(+), 8 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index ddb38030bf..989791f39f 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -808,6 +808,8 @@ struct dd_function_table {
                          struct gl_renderbuffer_attachment *att);
    void (*FinishRenderTexture)(GLcontext *ctx,
                                struct gl_renderbuffer_attachment *att);
+   void (*ValidateFramebuffer)(GLcontext *ctx,
+                               struct gl_framebuffer *fb);
    /*@}*/
 #endif
 #if FEATURE_EXT_framebuffer_blit
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 5bb9015efe..ad4965550a 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -414,6 +414,8 @@ fbo_incomplete(const char *msg, int index)
 /**
  * Test if the given framebuffer object is complete and update its
  * Status field with the results.
+ * Calls the ctx->Driver.ValidateFramebuffer() function to allow the
+ * driver to make hardware-specific validation/completeness checks.
  * Also update the framebuffer's Width and Height fields if the
  * framebuffer is complete.
  */
@@ -566,15 +568,23 @@ _mesa_test_framebuffer_completeness(GLcontext *ctx, struct gl_framebuffer *fb)
       return;
    }
 
-   /*
-    * If we get here, the framebuffer is complete!
-    * Note that if ARB_framebuffer_object is supported and the attached
-    * renderbuffers/textures are different sizes, the framebuffer width/height
-    * will be set to the smallest width/height.
-    */
+   /* Provisionally set status = COMPLETE ... */
    fb->_Status = GL_FRAMEBUFFER_COMPLETE_EXT;
-   fb->Width = minWidth;
-   fb->Height = minHeight;
+
+   /* ... but the driver may say the FB is incomplete: */
+   if (ctx->Driver.ValidateFramebuffer) {
+      ctx->Driver.ValidateFramebuffer(ctx, fb);
+   }
+
+   if (fb->_Status == GL_FRAMEBUFFER_COMPLETE_EXT) {
+      /*
+       * Note that if ARB_framebuffer_object is supported and the attached
+       * renderbuffers/textures are different sizes, the framebuffer
+       * width/height will be set to the smallest width/height.
+       */
+      fb->Width = minWidth;
+      fb->Height = minHeight;
+   }
 }
 
 
-- 
cgit v1.2.3


From 283edbe31177522d006ab37ebaf33a6e31f0a34e Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 22 Jan 2009 15:14:45 -0700
Subject: mesa: update update_framebuffer_size() for ARB_fbo and mixed
 renderbuffer sizes

---
 src/mesa/main/framebuffer.c | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/framebuffer.c b/src/mesa/main/framebuffer.c
index af78363ad3..10d05243fe 100644
--- a/src/mesa/main/framebuffer.c
+++ b/src/mesa/main/framebuffer.c
@@ -35,6 +35,7 @@
 #include "buffers.h"
 #include "context.h"
 #include "depthstencil.h"
+#include "macros.h"
 #include "mtypes.h"
 #include "fbobject.h"
 #include "framebuffer.h"
@@ -418,14 +419,14 @@ _mesa_ResizeBuffersMESA( void )
 /**
  * Examine all the framebuffer's renderbuffers to update the Width/Height
  * fields of the framebuffer.  If we have renderbuffers with different
- * sizes, set the framebuffer's width and height to zero.
+ * sizes, set the framebuffer's width and height to the min size.
  * Note: this is only intended for user-created framebuffers, not
  * window-system framebuffes.
  */
 static void
-update_framebuffer_size(struct gl_framebuffer *fb)
+update_framebuffer_size(GLcontext *ctx, struct gl_framebuffer *fb)
 {
-   GLboolean haveSize = GL_FALSE;
+   GLuint minWidth = ~0, minHeight = ~0;
    GLuint i;
 
    /* user-created framebuffers only */
@@ -435,21 +436,19 @@ update_framebuffer_size(struct gl_framebuffer *fb)
       struct gl_renderbuffer_attachment *att = &fb->Attachment[i];
       const struct gl_renderbuffer *rb = att->Renderbuffer;
       if (rb) {
-         if (haveSize) {
-            if (rb->Width != fb->Width && rb->Height != fb->Height) {
-               /* size mismatch! */
-               fb->Width = 0;
-               fb->Height = 0;
-               return;
-            }
-         }
-         else {
-            fb->Width = rb->Width;
-            fb->Height = rb->Height;
-            haveSize = GL_TRUE;
-         }
+         minWidth = MIN2(minWidth, rb->Width);
+         minHeight = MIN2(minHeight, rb->Height);
       }
    }
+
+   if (minWidth != ~0) {
+      fb->Width = minWidth;
+      fb->Height = minHeight;
+   }
+   else {
+      fb->Width = 0;
+      fb->Height = 0;
+   }
 }
 
 
@@ -469,7 +468,7 @@ _mesa_update_draw_buffer_bounds(GLcontext *ctx)
 
    if (buffer->Name) {
       /* user-created framebuffer size depends on the renderbuffers */
-      update_framebuffer_size(buffer);
+      update_framebuffer_size(ctx, buffer);
    }
 
    buffer->_Xmin = 0;
-- 
cgit v1.2.3


From 1f32c410dd06d73e2ad007a6ce755437884e92c3 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 19 Jan 2009 17:34:19 -0700
Subject: mesa: call fbo_incomplete() if driver marks FBO as incomplete (debug
 only)

---
 src/mesa/main/fbobject.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index ad4965550a..cdfa291e10 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -574,6 +574,9 @@ _mesa_test_framebuffer_completeness(GLcontext *ctx, struct gl_framebuffer *fb)
    /* ... but the driver may say the FB is incomplete: */
    if (ctx->Driver.ValidateFramebuffer) {
       ctx->Driver.ValidateFramebuffer(ctx, fb);
+      if (fb->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
+         fbo_incomplete("driver marked FBO as incomplete", -1);
+      }
    }
 
    if (fb->_Status == GL_FRAMEBUFFER_COMPLETE_EXT) {
-- 
cgit v1.2.3


From 777a2efc7768de659fbc2e9a7541c9cbb3fc1d8b Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 22 Jan 2009 15:17:42 -0700
Subject: mesa: stub for _mesa_RenderbufferStorageMultisample()

---
 src/mesa/main/api_exec.c |  7 +++++++
 src/mesa/main/fbobject.c | 15 ++++++++++++++-
 src/mesa/main/fbobject.h |  5 +++++
 3 files changed, 26 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index bae3bf11cb..f8ee0d59dd 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -880,5 +880,12 @@ _mesa_init_exec_table(struct _glapi_table *exec)
 
    /* GL_ATI_separate_stencil */
    SET_StencilFuncSeparateATI(exec, _mesa_StencilFuncSeparateATI);
+
+#if FEATURE_ARB_framebuffer_object
+   /* The ARB_fbo functions are the union of
+    * GL_EXT_fbo, GL_EXT_framebuffer_blit, GL_EXT_texture_array
+    */
+   SET_RenderbufferStorageMultisample(exec, _mesa_RenderbufferStorageMultisample);
+#endif
 }
 
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index cdfa291e10..dbd9c130d0 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -571,7 +571,10 @@ _mesa_test_framebuffer_completeness(GLcontext *ctx, struct gl_framebuffer *fb)
    /* Provisionally set status = COMPLETE ... */
    fb->_Status = GL_FRAMEBUFFER_COMPLETE_EXT;
 
-   /* ... but the driver may say the FB is incomplete: */
+   /* ... but the driver may say the FB is incomplete.
+    * Drivers will most likely set the status to GL_FRAMEBUFFER_UNSUPPORTED
+    * if anything.
+    */
    if (ctx->Driver.ValidateFramebuffer) {
       ctx->Driver.ValidateFramebuffer(ctx, fb);
       if (fb->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
@@ -878,6 +881,16 @@ _mesa_RenderbufferStorageEXT(GLenum target, GLenum internalFormat,
 }
 
 
+void GLAPIENTRY
+_mesa_RenderbufferStorageMultisample(GLenum target, GLsizei samples,
+                                     GLenum internalformat,
+                                     GLsizei width, GLsizei height)
+{
+
+}
+
+
+
 void GLAPIENTRY
 _mesa_GetRenderbufferParameterivEXT(GLenum target, GLenum pname, GLint *params)
 {
diff --git a/src/mesa/main/fbobject.h b/src/mesa/main/fbobject.h
index b6154719ab..33d16cc5a0 100644
--- a/src/mesa/main/fbobject.h
+++ b/src/mesa/main/fbobject.h
@@ -83,6 +83,11 @@ extern void GLAPIENTRY
 _mesa_RenderbufferStorageEXT(GLenum target, GLenum internalformat,
                              GLsizei width, GLsizei height);
 
+void GLAPIENTRY
+_mesa_RenderbufferStorageMultisample(GLenum target, GLsizei samples,
+                                     GLenum internalformat,
+                                     GLsizei width, GLsizei height);
+
 extern void GLAPIENTRY
 _mesa_GetRenderbufferParameterivEXT(GLenum target, GLenum pname,
                                     GLint *params);
-- 
cgit v1.2.3


From 4fc16fb7e9b72c4535967804c031256637a97197 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 20 Jan 2009 15:17:57 -0700
Subject: mesa: added NumSamples, MaxSamples for ARB_fbo

---
 src/mesa/main/mtypes.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 0cd88e7b3a..f1da638ae6 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2270,6 +2270,7 @@ struct gl_renderbuffer
    GLubyte IndexBits;
    GLubyte DepthBits;
    GLubyte StencilBits;
+   GLubyte NumSamples;
 
    GLenum DataType;      /**< Type of values passed to the Get/Put functions */
    GLvoid *Data;        /**< This may not be used by some kinds of RBs */
@@ -2514,6 +2515,8 @@ struct gl_constants
    /* GL_ARB_vertex_shader */
    GLuint MaxVertexTextureImageUnits;
    GLuint MaxVarying;  /**< Number of float[4] vectors */
+   /* GL_ARB_framebuffer_object */
+   GLuint MaxSamples;
 };
 
 
-- 
cgit v1.2.3


From 515c118a7e6dfab39935cb4159824a715b45ed3a Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 20 Jan 2009 15:19:45 -0700
Subject: mesa: added GL_MAX_SAMPLES query for GL_ARB_fbo

---
 src/mesa/main/get.c      | 12 ++++++++++++
 src/mesa/main/get_gen.py |  6 +++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 8ce9b0ae69..a5909913c8 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -1905,6 +1905,10 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          CHECK_EXT1(ARB_shader_objects, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Shader.CurrentProgram ? ctx->Shader.CurrentProgram->Name : 0);
          break;
+      case GL_MAX_SAMPLES:
+         CHECK_EXT1(ARB_framebuffer_object, "GetBooleanv");
+         params[0] = INT_TO_BOOLEAN(ctx->Const.MaxSamples);
+         break;
       default:
          _mesa_error(ctx, GL_INVALID_ENUM, "glGetBooleanv(pname=0x%x)", pname);
    }
@@ -3753,6 +3757,10 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          CHECK_EXT1(ARB_shader_objects, "GetFloatv");
          params[0] = (GLfloat)(ctx->Shader.CurrentProgram ? ctx->Shader.CurrentProgram->Name : 0);
          break;
+      case GL_MAX_SAMPLES:
+         CHECK_EXT1(ARB_framebuffer_object, "GetFloatv");
+         params[0] = (GLfloat)(ctx->Const.MaxSamples);
+         break;
       default:
          _mesa_error(ctx, GL_INVALID_ENUM, "glGetFloatv(pname=0x%x)", pname);
    }
@@ -5601,6 +5609,10 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          CHECK_EXT1(ARB_shader_objects, "GetIntegerv");
          params[0] = ctx->Shader.CurrentProgram ? ctx->Shader.CurrentProgram->Name : 0;
          break;
+      case GL_MAX_SAMPLES:
+         CHECK_EXT1(ARB_framebuffer_object, "GetIntegerv");
+         params[0] = ctx->Const.MaxSamples;
+         break;
       default:
          _mesa_error(ctx, GL_INVALID_ENUM, "glGetIntegerv(pname=0x%x)", pname);
    }
diff --git a/src/mesa/main/get_gen.py b/src/mesa/main/get_gen.py
index a191b045d3..4bdbfed0bf 100644
--- a/src/mesa/main/get_gen.py
+++ b/src/mesa/main/get_gen.py
@@ -1009,7 +1009,11 @@ StateVars = [
 	# close enough for now.
 	( "GL_CURRENT_PROGRAM", GLint,
 	  ["ctx->Shader.CurrentProgram ? ctx->Shader.CurrentProgram->Name : 0"],
-	  "", ["ARB_shader_objects"] )
+	  "", ["ARB_shader_objects"] ),
+
+	# GL_ARB_framebuffer_object
+	( "GL_MAX_SAMPLES", GLint, ["ctx->Const.MaxSamples"], "",
+	  ["ARB_framebuffer_object"] )
 ]
 
 
-- 
cgit v1.2.3


From 8fb8855b4d495303aabd11a4475cba3723b14bb2 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 20 Jan 2009 15:29:08 -0700
Subject: mesa: init MaxSamples = 0 (no multisampling)

---
 src/mesa/main/context.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 98c23bbd3a..7d616b2325 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -932,6 +932,9 @@ _mesa_init_constants(GLcontext *ctx)
    ctx->Const.MaxVarying = MAX_VARYING;
 #endif
 
+   /* GL_ARB_framebuffer_object */
+   ctx->Const.MaxSamples = 0;
+
    /* sanity checks */
    ASSERT(ctx->Const.MaxTextureUnits == MIN2(ctx->Const.MaxTextureImageUnits,
                                              ctx->Const.MaxTextureCoordUnits));
-- 
cgit v1.2.3


From 4f3514e410c7b743a99f509c176f75b2a3182948 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 22 Jan 2009 15:19:56 -0700
Subject: mesa: refactor glRenderbufferStorage(),
 glRenderbufferStorageMultisample() code

Use a common helper routine for both functions.
---
 src/mesa/main/fbobject.c | 54 ++++++++++++++++++++++++++++++++++++------------
 1 file changed, 41 insertions(+), 13 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index dbd9c130d0..6fe6a15fae 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -786,10 +786,21 @@ _mesa_base_fbo_format(GLcontext *ctx, GLenum internalFormat)
 }
 
 
-void GLAPIENTRY
-_mesa_RenderbufferStorageEXT(GLenum target, GLenum internalFormat,
-                             GLsizei width, GLsizei height)
+/** sentinal value, see below */
+#define NO_SAMPLES 1000
+
+
+/**
+ * Helper function used by _mesa_RenderbufferStorageEXT() and 
+ * _mesa_RenderbufferStorageMultisample().
+ * samples will be NO_SAMPLES if called by _mesa_RenderbufferStorageEXT().
+ */
+static void
+renderbuffer_storage(GLenum target, GLenum internalFormat,
+                     GLsizei width, GLsizei height, GLsizei samples)
 {
+   const char *func = samples == NO_SAMPLES ?
+      "glRenderbufferStorage" : "RenderbufferStorageMultisample";
    struct gl_renderbuffer *rb;
    GLenum baseFormat;
    GET_CURRENT_CONTEXT(ctx);
@@ -797,31 +808,38 @@ _mesa_RenderbufferStorageEXT(GLenum target, GLenum internalFormat,
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
    if (target != GL_RENDERBUFFER_EXT) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glRenderbufferStorageEXT(target)");
+      _mesa_error(ctx, GL_INVALID_ENUM, "%s(target)", func);
       return;
    }
 
    baseFormat = _mesa_base_fbo_format(ctx, internalFormat);
    if (baseFormat == 0) {
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glRenderbufferStorageEXT(internalFormat)");
+      _mesa_error(ctx, GL_INVALID_ENUM, "%s(internalFormat)", func);
       return;
    }
 
    if (width < 1 || width > (GLsizei) ctx->Const.MaxRenderbufferSize) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glRenderbufferStorageEXT(width)");
+      _mesa_error(ctx, GL_INVALID_VALUE, "%s(width)", func);
       return;
    }
 
    if (height < 1 || height > (GLsizei) ctx->Const.MaxRenderbufferSize) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glRenderbufferStorageEXT(height)");
+      _mesa_error(ctx, GL_INVALID_VALUE, "%s(height)", func);
       return;
    }
 
-   rb = ctx->CurrentRenderbuffer;
+   if (samples == NO_SAMPLES) {
+      /* NumSamples == 0 indicates non-multisampling */
+      samples = 0;
+   }
+   else if (samples > ctx->Const.MaxSamples) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "%s(samples)", func);
+      return;
+   }
 
+   rb = ctx->CurrentRenderbuffer;
    if (!rb) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glRenderbufferStorageEXT");
+      _mesa_error(ctx, GL_INVALID_OPERATION, func);
       return;
    }
 
@@ -843,6 +861,7 @@ _mesa_RenderbufferStorageEXT(GLenum target, GLenum internalFormat,
    rb->IndexBits =
    rb->DepthBits =
    rb->StencilBits = 0;
+   rb->NumSamples = samples;
 
    /* Now allocate the storage */
    ASSERT(rb->AllocStorage);
@@ -869,7 +888,8 @@ _mesa_RenderbufferStorageEXT(GLenum target, GLenum internalFormat,
       rb->AlphaBits =
       rb->IndexBits =
       rb->DepthBits =
-      rb->StencilBits = 0;
+      rb->StencilBits =
+      rb->NumSamples = 0;
    }
 
    /*
@@ -881,12 +901,20 @@ _mesa_RenderbufferStorageEXT(GLenum target, GLenum internalFormat,
 }
 
 
+void GLAPIENTRY
+_mesa_RenderbufferStorageEXT(GLenum target, GLenum internalFormat,
+                             GLsizei width, GLsizei height)
+{
+   renderbuffer_storage(target, internalFormat, width, height, NO_SAMPLES);
+}
+
+
 void GLAPIENTRY
 _mesa_RenderbufferStorageMultisample(GLenum target, GLsizei samples,
-                                     GLenum internalformat,
+                                     GLenum internalFormat,
                                      GLsizei width, GLsizei height)
 {
-
+   renderbuffer_storage(target, internalFormat, width, height, samples);
 }
 
 
-- 
cgit v1.2.3


From 23524e87339b25be75580a2dd2ea296b1741bffb Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 20 Jan 2009 16:53:29 -0700
Subject: mesa: update Visual.samples field in
 _mesa_update_framebuffer_visual()

---
 src/mesa/main/framebuffer.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/framebuffer.c b/src/mesa/main/framebuffer.c
index 10d05243fe..079f457503 100644
--- a/src/mesa/main/framebuffer.c
+++ b/src/mesa/main/framebuffer.c
@@ -543,6 +543,7 @@ _mesa_update_framebuffer_visual(struct gl_framebuffer *fb)
             fb->Visual.rgbBits = fb->Visual.redBits
                + fb->Visual.greenBits + fb->Visual.blueBits;
             fb->Visual.floatMode = GL_FALSE;
+            fb->Visual.samples = rb->NumSamples;
             break;
          }
          else if (rb->_BaseFormat == GL_COLOR_INDEX) {
-- 
cgit v1.2.3


From 722d976283f402b1edeb5ed67ad9747d322a262e Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 20 Jan 2009 16:58:49 -0700
Subject: mesa: additional FBO error checking for multisample-related things

Plus some new comments.
---
 src/mesa/main/fbobject.c | 122 +++++++++++++++++++++++++++++++++++++----------
 1 file changed, 98 insertions(+), 24 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 6fe6a15fae..7ac580af72 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -425,6 +425,7 @@ _mesa_test_framebuffer_completeness(GLcontext *ctx, struct gl_framebuffer *fb)
    GLuint numImages;
    GLenum intFormat = GL_NONE; /* color buffers' internal format */
    GLuint minWidth = ~0, minHeight = ~0, maxWidth = 0, maxHeight = 0;
+   GLint numSamples = -1;
    GLint i;
    GLuint j;
 
@@ -509,12 +510,14 @@ _mesa_test_framebuffer_completeness(GLcontext *ctx, struct gl_framebuffer *fb)
          continue;
       }
 
-      /* Error-check width, height, format
+      /* Error-check width, height, format, samples
        */
       if (numImages == 1) {
-         /* save format */
-         if (i >= 0)
+         /* save format, num samples */
+         if (i >= 0) {
             intFormat = f;
+            numSamples = att->Renderbuffer->NumSamples;
+         }
       }
       else {
          if (!ctx->Extensions.ARB_framebuffer_object) {
@@ -531,6 +534,12 @@ _mesa_test_framebuffer_completeness(GLcontext *ctx, struct gl_framebuffer *fb)
                return;
             }
          }
+         if (att->Renderbuffer &&
+             att->Renderbuffer->NumSamples != numSamples) {
+            fbo_incomplete("inconsistant number of samples", i);
+            return;
+         }            
+
       }
    }
 
@@ -833,6 +842,7 @@ renderbuffer_storage(GLenum target, GLenum internalFormat,
       samples = 0;
    }
    else if (samples > ctx->Const.MaxSamples) {
+      /* note: driver may choose to use more samples than what's requested */
       _mesa_error(ctx, GL_INVALID_VALUE, "%s(samples)", func);
       return;
    }
@@ -905,6 +915,10 @@ void GLAPIENTRY
 _mesa_RenderbufferStorageEXT(GLenum target, GLenum internalFormat,
                              GLsizei width, GLsizei height)
 {
+   /* GL_ARB_fbo says calling this function is equivalent to calling
+    * glRenderbufferStorageMultisample() with samples=0.  We pass in
+    * a token value here just for error reporting purposes.
+    */
    renderbuffer_storage(target, internalFormat, width, height, NO_SAMPLES);
 }
 
@@ -922,6 +936,7 @@ _mesa_RenderbufferStorageMultisample(GLenum target, GLsizei samples,
 void GLAPIENTRY
 _mesa_GetRenderbufferParameterivEXT(GLenum target, GLenum pname, GLint *params)
 {
+   struct gl_renderbuffer *rb;
    GET_CURRENT_CONTEXT(ctx);
 
    ASSERT_OUTSIDE_BEGIN_END(ctx);
@@ -932,7 +947,8 @@ _mesa_GetRenderbufferParameterivEXT(GLenum target, GLenum pname, GLint *params)
       return;
    }
 
-   if (!ctx->CurrentRenderbuffer) {
+   rb = ctx->CurrentRenderbuffer;
+   if (!rb) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
                   "glGetRenderbufferParameterivEXT");
       return;
@@ -942,32 +958,38 @@ _mesa_GetRenderbufferParameterivEXT(GLenum target, GLenum pname, GLint *params)
 
    switch (pname) {
    case GL_RENDERBUFFER_WIDTH_EXT:
-      *params = ctx->CurrentRenderbuffer->Width;
+      *params = rb->Width;
       return;
    case GL_RENDERBUFFER_HEIGHT_EXT:
-      *params = ctx->CurrentRenderbuffer->Height;
+      *params = rb->Height;
       return;
    case GL_RENDERBUFFER_INTERNAL_FORMAT_EXT:
-      *params = ctx->CurrentRenderbuffer->InternalFormat;
+      *params = rb->InternalFormat;
       return;
    case GL_RENDERBUFFER_RED_SIZE_EXT:
-      *params = ctx->CurrentRenderbuffer->RedBits;
+      *params = rb->RedBits;
       break;
    case GL_RENDERBUFFER_GREEN_SIZE_EXT:
-      *params = ctx->CurrentRenderbuffer->GreenBits;
+      *params = rb->GreenBits;
       break;
    case GL_RENDERBUFFER_BLUE_SIZE_EXT:
-      *params = ctx->CurrentRenderbuffer->BlueBits;
+      *params = rb->BlueBits;
       break;
    case GL_RENDERBUFFER_ALPHA_SIZE_EXT:
-      *params = ctx->CurrentRenderbuffer->AlphaBits;
+      *params = rb->AlphaBits;
       break;
    case GL_RENDERBUFFER_DEPTH_SIZE_EXT:
-      *params = ctx->CurrentRenderbuffer->DepthBits;
+      *params = rb->DepthBits;
       break;
    case GL_RENDERBUFFER_STENCIL_SIZE_EXT:
-      *params = ctx->CurrentRenderbuffer->StencilBits;
+      *params = rb->StencilBits;
       break;
+   case GL_RENDERBUFFER_SAMPLES:
+      if (ctx->Extensions.ARB_framebuffer_object) {
+         *params = rb->NumSamples;
+         break;
+      }
+      /* fallthrough */
    default:
       _mesa_error(ctx, GL_INVALID_ENUM,
                   "glGetRenderbufferParameterivEXT(target)");
@@ -1763,11 +1785,22 @@ _mesa_GenerateMipmapEXT(GLenum target)
 
 
 #if FEATURE_EXT_framebuffer_blit
+/**
+ * Blit rectangular region, optionally from one framebuffer to another.
+ *
+ * Note, if the src buffer is multisampled and the dest is not, this is
+ * when the samples must be resolved to a single color.
+ */
 void GLAPIENTRY
 _mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
                          GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
                          GLbitfield mask, GLenum filter)
 {
+   const GLbitfield legalMaskBits = (GL_COLOR_BUFFER_BIT |
+                                     GL_DEPTH_BUFFER_BIT |
+                                     GL_STENCIL_BUFFER_BIT);
+   const struct gl_framebuffer *readFb, *drawFb;
+   const struct gl_renderbuffer *colorReadRb, *colorDrawRb;
    GET_CURRENT_CONTEXT(ctx);
 
    ASSERT_OUTSIDE_BEGIN_END(ctx);
@@ -1777,13 +1810,19 @@ _mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
       _mesa_update_state(ctx);
    }
 
-   if (!ctx->ReadBuffer) {
-      /* XXX */
+   readFb = ctx->ReadBuffer;
+   drawFb = ctx->DrawBuffer;
+
+   if (!readFb || !drawFb) {
+      /* This will normally never happen but someday we may want to
+       * support MakeCurrent() with no drawables.
+       */
+      return;
    }
 
    /* check for complete framebuffers */
-   if (ctx->DrawBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT ||
-       ctx->ReadBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
+   if (drawFb->_Status != GL_FRAMEBUFFER_COMPLETE_EXT ||
+       readFb->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
       _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,
                   "glBlitFramebufferEXT(incomplete draw/read buffers)");
       return;
@@ -1794,9 +1833,7 @@ _mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
       return;
    }
 
-   if (mask & ~(GL_COLOR_BUFFER_BIT |
-                GL_DEPTH_BUFFER_BIT |
-                GL_STENCIL_BUFFER_BIT)) {
+   if (mask & ~legalMaskBits) {
       _mesa_error( ctx, GL_INVALID_VALUE, "glBlitFramebufferEXT(mask)");
       return;
    }
@@ -1809,9 +1846,18 @@ _mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
       return;
    }
 
+   /* get color read/draw renderbuffers */
+   if (mask & GL_COLOR_BUFFER_BIT) {
+      colorReadRb = readFb->_ColorReadBuffer;
+      colorDrawRb = drawFb->_ColorDrawBuffers[0];
+   }
+   else {
+      colorReadRb = colorDrawRb = NULL;
+   }
+
    if (mask & GL_STENCIL_BUFFER_BIT) {
-      struct gl_renderbuffer *readRb = ctx->ReadBuffer->_StencilBuffer;
-      struct gl_renderbuffer *drawRb = ctx->DrawBuffer->_StencilBuffer;
+      struct gl_renderbuffer *readRb = readFb->_StencilBuffer;
+      struct gl_renderbuffer *drawRb = drawFb->_StencilBuffer;
       if (readRb->StencilBits != drawRb->StencilBits) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "glBlitFramebufferEXT(stencil buffer size mismatch");
@@ -1820,8 +1866,8 @@ _mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
    }
 
    if (mask & GL_DEPTH_BUFFER_BIT) {
-      struct gl_renderbuffer *readRb = ctx->ReadBuffer->_DepthBuffer;
-      struct gl_renderbuffer *drawRb = ctx->DrawBuffer->_DepthBuffer;
+      struct gl_renderbuffer *readRb = readFb->_DepthBuffer;
+      struct gl_renderbuffer *drawRb = drawFb->_DepthBuffer;
       if (readRb->DepthBits != drawRb->DepthBits) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "glBlitFramebufferEXT(depth buffer size mismatch");
@@ -1829,6 +1875,34 @@ _mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
       }
    }
 
+   if (readFb->Visual.samples > 0 &&
+       drawFb->Visual.samples > 0 &&
+       readFb->Visual.samples != drawFb->Visual.samples) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glBlitFramebufferEXT(mismatched samples");
+      return;
+   }
+
+   /* extra checks for multisample copies... */
+   if (readFb->Visual.samples > 0 || drawFb->Visual.samples > 0) {
+      /* src and dest region sizes must be the same */
+      if (srcX1 - srcX0 != dstX1 - dstX0 ||
+          srcY1 - srcY0 != dstY1 - dstY0) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                "glBlitFramebufferEXT(bad src/dst multisample region sizes");
+         return;
+      }
+
+      /* color formats must match */
+      if (colorReadRb &&
+          colorDrawRb &&
+          colorReadRb->_ActualFormat != colorDrawRb->_ActualFormat) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                "glBlitFramebufferEXT(bad src/dst multisample pixel formats");
+         return;
+      }
+   }
+
    if (!ctx->Extensions.EXT_framebuffer_blit) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "glBlitFramebufferEXT");
       return;
-- 
cgit v1.2.3


From 3059007f0c2e91f4ef207677cdcb6dc42be7ecb2 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 21 Jan 2009 11:06:11 -0700
Subject: mesa: add support for GL_DEPTH_STENCIL_ATTACHMENT point.

Used to set both the depth and stencil attachment points to one renderbuffer
of texture.
---
 src/mesa/main/fbobject.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 7ac580af72..73f891d532 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -128,6 +128,8 @@ _mesa_lookup_framebuffer(GLcontext *ctx, GLuint id)
 /**
  * Given a GL_*_ATTACHMENTn token, return a pointer to the corresponding
  * gl_renderbuffer_attachment object.
+ * If \p attachment is GL_DEPTH_STENCIL_ATTACHMENT, return a pointer to
+ * the depth buffer attachment point.
  */
 struct gl_renderbuffer_attachment *
 _mesa_get_attachment(GLcontext *ctx, struct gl_framebuffer *fb,
@@ -157,6 +159,8 @@ _mesa_get_attachment(GLcontext *ctx, struct gl_framebuffer *fb,
 	 return NULL;
       }
       return &fb->Attachment[BUFFER_COLOR0 + i];
+   case GL_DEPTH_STENCIL_ATTACHMENT:
+      /* fall-through */
    case GL_DEPTH_ATTACHMENT_EXT:
       return &fb->Attachment[BUFFER_DEPTH];
    case GL_STENCIL_ATTACHMENT_EXT:
@@ -267,6 +271,12 @@ _mesa_framebuffer_renderbuffer(GLcontext *ctx, struct gl_framebuffer *fb,
    ASSERT(att);
    if (rb) {
       _mesa_set_renderbuffer_attachment(ctx, att, rb);
+      if (attachment == GL_DEPTH_STENCIL_ATTACHMENT) {
+         /* do stencil attachment here (depth already done above) */
+         att = _mesa_get_attachment(ctx, fb, GL_STENCIL_ATTACHMENT_EXT);
+         assert(att);
+         _mesa_set_renderbuffer_attachment(ctx, att, rb);
+      }
    }
    else {
       _mesa_remove_attachment(ctx, att);
@@ -1361,7 +1371,6 @@ framebuffer_texture(GLcontext *ctx, const char *caller, GLenum target,
          }
       }
 
-
       if ((level < 0) || 
           (level >= _mesa_max_texture_levels(ctx, texObj->Target))) {
          _mesa_error(ctx, GL_INVALID_VALUE,
@@ -1377,6 +1386,18 @@ framebuffer_texture(GLcontext *ctx, const char *caller, GLenum target,
       return;
    }
 
+   if (texObj && attachment == GL_DEPTH_STENCIL_ATTACHMENT) {
+      /* the texture format must be depth+stencil */
+      const struct gl_texture_image *texImg;
+      texImg = texObj->Image[0][texObj->BaseLevel];
+      if (!texImg || texImg->_BaseFormat != GL_DEPTH_STENCIL) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glFramebufferTexture%sEXT(texture is not"
+                     " DEPTH_STENCIL format)", caller);
+         return;
+      }
+   }
+
    FLUSH_VERTICES(ctx, _NEW_BUFFERS);
    /* The above doesn't fully flush the drivers in the way that a
     * glFlush does, but that is required here:
@@ -1535,6 +1556,17 @@ _mesa_FramebufferRenderbufferEXT(GLenum target, GLenum attachment,
       rb = NULL;
    }
 
+   if (attachment == GL_DEPTH_STENCIL_ATTACHMENT) {
+      /* make sure the renderbuffer is a depth/stencil format */
+      if (rb->_BaseFormat != GL_DEPTH_STENCIL) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glFramebufferRenderbufferEXT(renderbuffer"
+                     " is not DEPTH_STENCIL format)");
+         return;
+      }
+   }
+
+
    FLUSH_VERTICES(ctx, _NEW_BUFFERS);
    /* The above doesn't fully flush the drivers in the way that a
     * glFlush does, but that is required here:
@@ -1603,6 +1635,19 @@ _mesa_GetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment,
       return;
    }
 
+   if (attachment == GL_DEPTH_STENCIL_ATTACHMENT) {
+      /* the depth and stencil attachments must point to the same buffer */
+      const struct gl_renderbuffer_attachment *depthAtt, *stencilAtt;
+      depthAtt = _mesa_get_attachment(ctx, buffer, GL_DEPTH_ATTACHMENT);
+      stencilAtt = _mesa_get_attachment(ctx, buffer, GL_STENCIL_ATTACHMENT);
+      if (depthAtt->Renderbuffer != stencilAtt->Renderbuffer) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glGetFramebufferAttachmentParameterivEXT(DEPTH/STENCIL"
+                     " attachments differ)");
+         return;
+      }
+   }
+
    FLUSH_VERTICES(ctx, _NEW_BUFFERS);
    /* The above doesn't fully flush the drivers in the way that a
     * glFlush does, but that is required here:
-- 
cgit v1.2.3


From d0f13fa7d70c57e698cce9fbde399e80f7afcf47 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 21 Jan 2009 11:17:45 -0700
Subject: mesa: fix some renderbuffer/framebuffer delete semantics

Need to unbind buffers if referenced by the current read/draw pointers when
being deleted.
---
 src/mesa/main/fbobject.c | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 73f891d532..85e15a6e94 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -683,6 +683,26 @@ _mesa_BindRenderbufferEXT(GLenum target, GLuint renderbuffer)
 }
 
 
+/**
+ * If the given renderbuffer is anywhere attached to the framebuffer, detach
+ * the renderbuffer.
+ * This is used when a renderbuffer object is deleted.
+ * The spec calls for unbinding.
+ */
+static void
+detach_renderbuffer(GLcontext *ctx,
+                    struct gl_framebuffer *fb,
+                    struct gl_renderbuffer *rb)
+{
+   GLuint i;
+   for (i = 0; i < BUFFER_COUNT; i++) {
+      if (fb->Attachment[i].Renderbuffer == rb) {
+         _mesa_remove_attachment(ctx, &fb->Attachment[i]);
+      }
+   }
+}
+
+
 void GLAPIENTRY
 _mesa_DeleteRenderbuffersEXT(GLsizei n, const GLuint *renderbuffers)
 {
@@ -704,6 +724,13 @@ _mesa_DeleteRenderbuffersEXT(GLsizei n, const GLuint *renderbuffers)
                _mesa_BindRenderbufferEXT(GL_RENDERBUFFER_EXT, 0);
             }
 
+            if (ctx->DrawBuffer->Name) {
+               detach_renderbuffer(ctx, ctx->DrawBuffer, rb);
+            }
+            if (ctx->ReadBuffer->Name && ctx->ReadBuffer != ctx->DrawBuffer) {
+               detach_renderbuffer(ctx, ctx->ReadBuffer, rb);
+            }
+
 	    /* Remove from hash table immediately, to free the ID.
              * But the object will not be freed until it's no longer
              * referenced anywhere else.
@@ -1201,7 +1228,12 @@ _mesa_DeleteFramebuffersEXT(GLsizei n, const GLuint *framebuffers)
             if (fb == ctx->DrawBuffer) {
                /* bind default */
                ASSERT(fb->RefCount >= 2);
-               _mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+               _mesa_BindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, 0);
+            }
+            if (fb == ctx->ReadBuffer) {
+               /* bind default */
+               ASSERT(fb->RefCount >= 2);
+               _mesa_BindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, 0);
             }
 
 	    /* remove from hash table immediately, to free the ID */
-- 
cgit v1.2.3


From 7296636ad03f58c7b7f673109515c1659a36a899 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 21 Jan 2009 16:28:38 -0700
Subject: mesa: avoid calling _mesa_test_framebuffer_completeness() more than
 needed

When we change a FBO's attachments, set _Status=0.
Before using an FBO, check if status != GL_FRAMEBUFFER_COMPLETE.
Also, fix missing GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE status.
---
 src/mesa/main/fbobject.c    | 32 ++++++++++++++++++++++++++++++--
 src/mesa/main/framebuffer.c |  6 ++++--
 2 files changed, 34 insertions(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 85e15a6e94..c16ac0f009 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -125,6 +125,18 @@ _mesa_lookup_framebuffer(GLcontext *ctx, GLuint id)
 }
 
 
+/**
+ * Mark the given framebuffer as invalid.  This will force the
+ * test for framebuffer completeness to be done before the framebuffer
+ * is used.
+ */
+static void
+invalidate_framebuffer(struct gl_framebuffer *fb)
+{
+   fb->_Status = 0; /* "indeterminate" */
+}
+
+
 /**
  * Given a GL_*_ATTACHMENTn token, return a pointer to the corresponding
  * gl_renderbuffer_attachment object.
@@ -234,6 +246,8 @@ _mesa_set_texture_attachment(GLcontext *ctx,
    if (att->Texture->Image[att->CubeMapFace][att->TextureLevel]) {
       ctx->Driver.RenderTexture(ctx, fb, att);
    }
+
+   invalidate_framebuffer(fb);
 }
 
 
@@ -282,6 +296,8 @@ _mesa_framebuffer_renderbuffer(GLcontext *ctx, struct gl_framebuffer *fb,
       _mesa_remove_attachment(ctx, att);
    }
 
+   invalidate_framebuffer(fb);
+
    _glthread_UNLOCK_MUTEX(fb->Mutex);
 }
 
@@ -520,13 +536,17 @@ _mesa_test_framebuffer_completeness(GLcontext *ctx, struct gl_framebuffer *fb)
          continue;
       }
 
+      if (numSamples < 0) {
+         /* first buffer */
+         numSamples = att->Renderbuffer->NumSamples;
+      }
+
       /* Error-check width, height, format, samples
        */
       if (numImages == 1) {
          /* save format, num samples */
          if (i >= 0) {
             intFormat = f;
-            numSamples = att->Renderbuffer->NumSamples;
          }
       }
       else {
@@ -546,6 +566,7 @@ _mesa_test_framebuffer_completeness(GLcontext *ctx, struct gl_framebuffer *fb)
          }
          if (att->Renderbuffer &&
              att->Renderbuffer->NumSamples != numSamples) {
+            fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE;
             fbo_incomplete("inconsistant number of samples", i);
             return;
          }            
@@ -700,6 +721,7 @@ detach_renderbuffer(GLcontext *ctx,
          _mesa_remove_attachment(ctx, &fb->Attachment[i]);
       }
    }
+   invalidate_framebuffer(fb);
 }
 
 
@@ -1322,7 +1344,10 @@ _mesa_CheckFramebufferStatusEXT(GLenum target)
 
    FLUSH_VERTICES(ctx, _NEW_BUFFERS);
 
-   _mesa_test_framebuffer_completeness(ctx, buffer);
+   if (buffer->_Status != GL_FRAMEBUFFER_COMPLETE) {
+      _mesa_test_framebuffer_completeness(ctx, buffer);
+   }
+
    return buffer->_Status;
 }
 
@@ -1445,6 +1470,9 @@ framebuffer_texture(GLcontext *ctx, const char *caller, GLenum target,
    else {
       _mesa_remove_attachment(ctx, att);
    }
+
+   invalidate_framebuffer(fb);
+
    _glthread_UNLOCK_MUTEX(fb->Mutex);
 }
 
diff --git a/src/mesa/main/framebuffer.c b/src/mesa/main/framebuffer.c
index 079f457503..2d7e3b0503 100644
--- a/src/mesa/main/framebuffer.c
+++ b/src/mesa/main/framebuffer.c
@@ -793,8 +793,10 @@ update_framebuffer(GLcontext *ctx, struct gl_framebuffer *fb)
       /* This is a user-created framebuffer.
        * Completeness only matters for user-created framebuffers.
        */
-      _mesa_test_framebuffer_completeness(ctx, fb);
-      _mesa_update_framebuffer_visual(fb);
+      if (fb->_Status != GL_FRAMEBUFFER_COMPLETE) {
+         _mesa_test_framebuffer_completeness(ctx, fb);
+         _mesa_update_framebuffer_visual(fb);
+      }
    }
 
    /* Strictly speaking, we don't need to update the draw-state
-- 
cgit v1.2.3


From 1b199101ffd50e59372e1ecafaae48f369169292 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 19 Jan 2009 16:14:39 -0700
Subject: mesa: enable ARB_fbo for s/w drivers

---
 src/mesa/main/extensions.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 0cad9887a2..188e01c8a4 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -190,6 +190,9 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
 #endif
 #if FEATURE_ARB_fragment_shader
    ctx->Extensions.ARB_fragment_shader = GL_TRUE;
+#endif
+#if FEATURE_ARB_framebuffer_object
+   ctx->Extensions.ARB_framebuffer_object = GL_TRUE;
 #endif
    ctx->Extensions.ARB_half_float_pixel = GL_TRUE;
    ctx->Extensions.ARB_imaging = GL_TRUE;
-- 
cgit v1.2.3


From dde7cb962860e72e1bf3175069767358cc5b3f3c Mon Sep 17 00:00:00 2001
From: Ian Romanick <idr@freedesktop.org>
Date: Fri, 9 Jan 2009 15:43:17 -0800
Subject: Track two sets of back-face stencil state

Track separate back-face stencil state for OpenGL 2.0 /
GL_ATI_separate_stencil and GL_EXT_stencil_two_side.  This allows all
three to be enabled in a driver.  One set of state is set via the 2.0
or ATI functions and is used when STENCIL_TEST_TWO_SIDE_EXT is
disabled.  The other is set by StencilFunc and StencilOp when the
active stencil face is set to BACK.  The GL_EXT_stencil_two_side spec has
more details.

http://opengl.org/registry/specs/EXT/stencil_two_side.txt
---
 src/mesa/drivers/dri/i965/brw_cc.c      |  15 ++---
 src/mesa/drivers/dri/i965/brw_wm.c      |   3 +-
 src/mesa/drivers/dri/r300/r300_render.c |  16 +++--
 src/mesa/drivers/dri/r300/r300_state.c  |  40 ++++--------
 src/mesa/main/enable.c                  |   7 ++-
 src/mesa/main/getstring.c               |  11 +++-
 src/mesa/main/mtypes.h                  |  30 ++++++---
 src/mesa/main/stencil.c                 | 104 +++++++++++++++++---------------
 src/mesa/swrast/s_stencil.c             |   6 +-
 9 files changed, 128 insertions(+), 104 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/i965/brw_cc.c b/src/mesa/drivers/dri/i965/brw_cc.c
index fa8121e02d..abae4b3215 100644
--- a/src/mesa/drivers/dri/i965/brw_cc.c
+++ b/src/mesa/drivers/dri/i965/brw_cc.c
@@ -84,6 +84,7 @@ static void
 cc_unit_populate_key(struct brw_context *brw, struct brw_cc_unit_key *key)
 {
    struct gl_stencil_attrib *stencil = brw->attribs.Stencil;
+   const unsigned back = stencil->_BackFace;
 
    memset(key, 0, sizeof(*key));
 
@@ -100,13 +101,13 @@ cc_unit_populate_key(struct brw_context *brw, struct brw_cc_unit_key *key)
       key->stencil_test_mask[0] = stencil->ValueMask[0];
    }
    if (key->stencil_two_side) {
-      key->stencil_func[1] = stencil->Function[1];
-      key->stencil_fail_op[1] = stencil->FailFunc[1];
-      key->stencil_pass_depth_fail_op[1] = stencil->ZFailFunc[1];
-      key->stencil_pass_depth_pass_op[1] = stencil->ZPassFunc[1];
-      key->stencil_ref[1] = stencil->Ref[1];
-      key->stencil_write_mask[1] = stencil->WriteMask[1];
-      key->stencil_test_mask[1] = stencil->ValueMask[1];
+      key->stencil_func[1] = stencil->Function[back];
+      key->stencil_fail_op[1] = stencil->FailFunc[back];
+      key->stencil_pass_depth_fail_op[1] = stencil->ZFailFunc[back];
+      key->stencil_pass_depth_pass_op[1] = stencil->ZPassFunc[back];
+      key->stencil_ref[1] = stencil->Ref[back];
+      key->stencil_write_mask[1] = stencil->WriteMask[back];
+      key->stencil_test_mask[1] = stencil->ValueMask[back];
    }
 
    if (brw->attribs.Color->_LogicOpEnabled)
diff --git a/src/mesa/drivers/dri/i965/brw_wm.c b/src/mesa/drivers/dri/i965/brw_wm.c
index c50b0d2dd9..24149cf8a1 100644
--- a/src/mesa/drivers/dri/i965/brw_wm.c
+++ b/src/mesa/drivers/dri/i965/brw_wm.c
@@ -189,8 +189,7 @@ static void brw_wm_populate_key( struct brw_context *brw,
       lookup |= IZ_STENCIL_TEST_ENABLE_BIT;
 
       if (brw->attribs.Stencil->WriteMask[0] ||
-	  (brw->attribs.Stencil->_TestTwoSide &&
-	   brw->attribs.Stencil->WriteMask[1]))
+	  brw->attribs.Stencil->WriteMask[brw->attribs.Stencil->_BackFace])
 	 lookup |= IZ_STENCIL_WRITE_ENABLE_BIT;
    }
 
diff --git a/src/mesa/drivers/dri/r300/r300_render.c b/src/mesa/drivers/dri/r300/r300_render.c
index f9266e44c1..16ce4a1199 100644
--- a/src/mesa/drivers/dri/r300/r300_render.c
+++ b/src/mesa/drivers/dri/r300/r300_render.c
@@ -347,6 +347,8 @@ static GLboolean r300RunRender(GLcontext * ctx,
 static int r300Fallback(GLcontext * ctx)
 {
 	r300ContextPtr r300 = R300_CONTEXT(ctx);
+	const unsigned back = ctx->Stencil._BackFace;
+
 	/* Do we need to use new-style shaders?
 	 * Also is there a better way to do this? */
 	if (r300->radeon.radeonScreen->chip_family >= CHIP_FAMILY_RV515) {
@@ -371,12 +373,14 @@ static int r300Fallback(GLcontext * ctx)
 
 	FALLBACK_IF(ctx->RenderMode != GL_RENDER);
 
-	FALLBACK_IF(ctx->Stencil._TestTwoSide
-		    && (ctx->Stencil.Ref[0] != ctx->Stencil.Ref[1]
-			|| ctx->Stencil.ValueMask[0] !=
-			ctx->Stencil.ValueMask[1]
-			|| ctx->Stencil.WriteMask[0] !=
-			ctx->Stencil.WriteMask[1]));
+	/* If GL_EXT_stencil_two_side is disabled, this fallback check can
+	 * be removed.
+	 */
+	FALLBACK_IF(ctx->Stencil.Ref[0] != ctx->Stencil.Ref[back]
+		    || ctx->Stencil.ValueMask[0] !=
+		    ctx->Stencil.ValueMask[back]
+		    || ctx->Stencil.WriteMask[0] !=
+		    ctx->Stencil.WriteMask[back]);
 
 	if (ctx->Extensions.NV_point_sprite || ctx->Extensions.ARB_point_sprite)
 		FALLBACK_IF(ctx->Point.PointSprite);
diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index a63dbac343..d02034f039 100644
--- a/src/mesa/drivers/dri/r300/r300_state.c
+++ b/src/mesa/drivers/dri/r300/r300_state.c
@@ -974,15 +974,9 @@ static void r300StencilFuncSeparate(GLcontext * ctx, GLenum face,
 {
 	r300ContextPtr rmesa = R300_CONTEXT(ctx);
 	GLuint refmask =
-	    (((ctx->Stencil.
-	       Ref[0] & 0xff) << R300_STENCILREF_SHIFT) | ((ctx->
-							    Stencil.
-							    ValueMask
-							    [0] &
-							    0xff)
-							   <<
-							   R300_STENCILMASK_SHIFT));
-
+	    ((ctx->Stencil.Ref[0] & 0xff) << R300_STENCILREF_SHIFT)
+	     | ((ctx->Stencil.ValueMask[0] & 0xff) << R300_STENCILMASK_SHIFT);
+	const unsigned back = ctx->Stencil._BackFace;
 	GLuint flag;
 
 	R300_STATECHANGE(rmesa, zs);
@@ -1000,8 +994,7 @@ static void r300StencilFuncSeparate(GLcontext * ctx, GLenum face,
 	rmesa->hw.zs.cmd[R300_ZS_CNTL_1] |=
 	    (flag << R300_S_FRONT_FUNC_SHIFT);
 
-	if (ctx->Stencil._TestTwoSide)
-		flag = translate_func(ctx->Stencil.Function[1]);
+	flag = translate_func(ctx->Stencil.Function[back]);
 
 	rmesa->hw.zs.cmd[R300_ZS_CNTL_1] |=
 	    (flag << R300_S_BACK_FUNC_SHIFT);
@@ -1026,6 +1019,7 @@ static void r300StencilOpSeparate(GLcontext * ctx, GLenum face,
 				  GLenum fail, GLenum zfail, GLenum zpass)
 {
 	r300ContextPtr rmesa = R300_CONTEXT(ctx);
+	const unsigned back = ctx->Stencil._BackFace;
 
 	R300_STATECHANGE(rmesa, zs);
 	/* It is easier to mask what's left.. */
@@ -1042,23 +1036,13 @@ static void r300StencilOpSeparate(GLcontext * ctx, GLenum face,
 	    | (translate_stencil_op(ctx->Stencil.ZPassFunc[0]) <<
 	       R300_S_FRONT_ZPASS_OP_SHIFT);
 
-	if (ctx->Stencil._TestTwoSide) {
-		rmesa->hw.zs.cmd[R300_ZS_CNTL_1] |=
-		    (translate_stencil_op(ctx->Stencil.FailFunc[1]) <<
-		     R300_S_BACK_SFAIL_OP_SHIFT)
-		    | (translate_stencil_op(ctx->Stencil.ZFailFunc[1]) <<
-		       R300_S_BACK_ZFAIL_OP_SHIFT)
-		    | (translate_stencil_op(ctx->Stencil.ZPassFunc[1]) <<
-		       R300_S_BACK_ZPASS_OP_SHIFT);
-	} else {
-		rmesa->hw.zs.cmd[R300_ZS_CNTL_1] |=
-		    (translate_stencil_op(ctx->Stencil.FailFunc[0]) <<
-		     R300_S_BACK_SFAIL_OP_SHIFT)
-		    | (translate_stencil_op(ctx->Stencil.ZFailFunc[0]) <<
-		       R300_S_BACK_ZFAIL_OP_SHIFT)
-		    | (translate_stencil_op(ctx->Stencil.ZPassFunc[0]) <<
-		       R300_S_BACK_ZPASS_OP_SHIFT);
-	}
+	rmesa->hw.zs.cmd[R300_ZS_CNTL_1] |=
+	    (translate_stencil_op(ctx->Stencil.FailFunc[back]) <<
+	     R300_S_BACK_SFAIL_OP_SHIFT)
+	    | (translate_stencil_op(ctx->Stencil.ZFailFunc[back]) <<
+	       R300_S_BACK_ZFAIL_OP_SHIFT)
+	    | (translate_stencil_op(ctx->Stencil.ZPassFunc[back]) <<
+	       R300_S_BACK_ZPASS_OP_SHIFT);
 }
 
 /* =============================================================
diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index dae576ae5a..1c026174b8 100644
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -922,10 +922,13 @@ _mesa_set_enable(GLcontext *ctx, GLenum cap, GLboolean state)
             return;
          FLUSH_VERTICES(ctx, _NEW_STENCIL);
          ctx->Stencil.TestTwoSide = state;
-         if (state)
+         if (state) {
+            ctx->Stencil._BackFace = 2;
             ctx->_TriangleCaps |= DD_TRI_TWOSTENCIL;
-         else
+         } else {
+            ctx->Stencil._BackFace = 1;
             ctx->_TriangleCaps &= ~DD_TRI_TWOSTENCIL;
+         }
          break;
 
 #if FEATURE_ARB_fragment_program
diff --git a/src/mesa/main/getstring.c b/src/mesa/main/getstring.c
index 94bf5de1e8..a9e22d340a 100644
--- a/src/mesa/main/getstring.c
+++ b/src/mesa/main/getstring.c
@@ -82,7 +82,16 @@ compute_version(const GLcontext *ctx)
                               ctx->Extensions.ARB_vertex_shader &&
                               ctx->Extensions.ARB_fragment_shader &&
                               ctx->Extensions.ARB_texture_non_power_of_two &&
-                              ctx->Extensions.EXT_blend_equation_separate);
+                              ctx->Extensions.EXT_blend_equation_separate &&
+
+			      /* Technically, 2.0 requires the functionality
+			       * of the EXT version.  Enable 2.0 if either
+			       * extension is available, and assume that a
+			       * driver that only exposes the ATI extension
+			       * will fallback to software when necessary.
+			       */
+			      (ctx->Extensions.EXT_stencil_two_side
+			       || ctx->Extensions.ATI_separate_stencil));
    const GLboolean ver_2_1 = (ver_2_0 &&
                               /*ctx->Extensions.ARB_shading_language_120 &&*/
                               ctx->Extensions.EXT_pixel_buffer_object &&
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index f1da638ae6..088d45b156 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1108,20 +1108,34 @@ struct gl_scissor_attrib
 
 /**
  * Stencil attribute group (GL_STENCIL_BUFFER_BIT).
+ *
+ * Three sets of stencil data are tracked so that OpenGL 2.0,
+ * GL_EXT_stencil_two_side, and GL_ATI_separate_stencil can all be supported
+ * simultaneously.  In each of the stencil state arrays, element 0 corresponds
+ * to GL_FRONT.  Element 1 corresponds to the OpenGL 2.0 /
+ * GL_ATI_separate_stencil GL_BACK state.  Element 2 corresponds to the
+ * GL_EXT_stencil_two_side GL_BACK state.
+ *
+ * The derived value \c _BackFace is either 1 or 2 depending on whether or
+ * not GL_STENCIL_TEST_TWO_SIDE_EXT is enabled.
+ *
+ * The derived value \c _TestTwoSide is set when the front-face and back-face
+ * stencil state are different.
  */
 struct gl_stencil_attrib
 {
    GLboolean Enabled;		/**< Enabled flag */
    GLboolean TestTwoSide;	/**< GL_EXT_stencil_two_side */
-   GLubyte ActiveFace;		/**< GL_EXT_stencil_two_side (0 or 1) */
+   GLubyte ActiveFace;		/**< GL_EXT_stencil_two_side (0 or 2) */
    GLboolean _TestTwoSide;
-   GLenum Function[2];		/**< Stencil function */
-   GLenum FailFunc[2];		/**< Fail function */
-   GLenum ZPassFunc[2];		/**< Depth buffer pass function */
-   GLenum ZFailFunc[2];		/**< Depth buffer fail function */
-   GLint Ref[2];		/**< Reference value */
-   GLuint ValueMask[2];		/**< Value mask */
-   GLuint WriteMask[2];		/**< Write mask */
+   GLubyte _BackFace;
+   GLenum Function[3];		/**< Stencil function */
+   GLenum FailFunc[3];		/**< Fail function */
+   GLenum ZPassFunc[3];		/**< Depth buffer pass function */
+   GLenum ZFailFunc[3];		/**< Depth buffer fail function */
+   GLint Ref[3];		/**< Reference value */
+   GLuint ValueMask[3];		/**< Value mask */
+   GLuint WriteMask[3];		/**< Write mask */
    GLuint Clear;		/**< Clear value */
 };
 
diff --git a/src/mesa/main/stencil.c b/src/mesa/main/stencil.c
index 2a4c38b1f2..b4ea9978d8 100644
--- a/src/mesa/main/stencil.c
+++ b/src/mesa/main/stencil.c
@@ -27,21 +27,6 @@
  * \file stencil.c
  * Stencil operations.
  *
- * Note: There's an incompatibility between GL_EXT_stencil_two_side and
- * OpenGL 2.0's two-sided stencil feature.
- *
- * With GL_EXT_stencil_two_side, calling glStencilOp/Func/Mask() only the
- * front OR back face state (as set by glActiveStencilFaceEXT) is set.
- *
- * But with OpenGL 2.0, calling glStencilOp/Func/Mask() sets BOTH the
- * front AND back state.
- *
- * So either we advertise the GL_EXT_stencil_two_side extension, or OpenGL
- * 2.0, but not both.
- *
- * Also, note that GL_ATI_separate_stencil is different as well:
- * glStencilFuncSeparateATI(GLenum frontfunc, GLenum backfunc, ...)  vs.
- * glStencilFuncSeparate(GLenum face, GLenum func, ...).
  */
 
 
@@ -198,6 +183,7 @@ _mesa_StencilFunc( GLenum func, GLint ref, GLuint mask )
 {
    GET_CURRENT_CONTEXT(ctx);
    const GLint stencilMax = (1 << ctx->DrawBuffer->Visual.stencilBits) - 1;
+   const GLint face = ctx->Stencil.ActiveFace;
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
    if (!validate_stencil_func(ctx, func)) {
@@ -207,9 +193,7 @@ _mesa_StencilFunc( GLenum func, GLint ref, GLuint mask )
 
    ref = CLAMP( ref, 0, stencilMax );
 
-   if (ctx->Extensions.EXT_stencil_two_side) {
-      /* only set active face state */
-      const GLint face = ctx->Stencil.ActiveFace;
+   if (face != 0) {
       if (ctx->Stencil.Function[face] == func &&
           ctx->Stencil.ValueMask[face] == mask &&
           ctx->Stencil.Ref[face] == ref)
@@ -218,9 +202,12 @@ _mesa_StencilFunc( GLenum func, GLint ref, GLuint mask )
       ctx->Stencil.Function[face] = func;
       ctx->Stencil.Ref[face] = ref;
       ctx->Stencil.ValueMask[face] = mask;
-      if (ctx->Driver.StencilFuncSeparate) {
-         ctx->Driver.StencilFuncSeparate(ctx, face ? GL_BACK : GL_FRONT,
-                                         func, ref, mask);
+
+      /* Only propagate the change to the driver if EXT_stencil_two_side
+       * is enabled.
+       */
+      if (ctx->Driver.StencilFuncSeparate && ctx->Stencil.TestTwoSide) {
+         ctx->Driver.StencilFuncSeparate(ctx, GL_BACK, func, ref, mask);
       }
    }
    else {
@@ -237,7 +224,9 @@ _mesa_StencilFunc( GLenum func, GLint ref, GLuint mask )
       ctx->Stencil.Ref[0]       = ctx->Stencil.Ref[1]       = ref;
       ctx->Stencil.ValueMask[0] = ctx->Stencil.ValueMask[1] = mask;
       if (ctx->Driver.StencilFuncSeparate) {
-         ctx->Driver.StencilFuncSeparate(ctx, GL_FRONT_AND_BACK,
+         ctx->Driver.StencilFuncSeparate(ctx,
+					 ((ctx->Stencil.TestTwoSide)
+					  ? GL_FRONT : GL_FRONT_AND_BACK),
                                          func, ref, mask);
       }
    }
@@ -259,17 +248,23 @@ void GLAPIENTRY
 _mesa_StencilMask( GLuint mask )
 {
    GET_CURRENT_CONTEXT(ctx);
+   const GLint face = ctx->Stencil.ActiveFace;
+
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-   if (ctx->Extensions.EXT_stencil_two_side) {
-      /* only set active face state */
-      const GLint face = ctx->Stencil.ActiveFace;
+   if (face != 0) {
+      /* Only modify the EXT_stencil_two_side back-face state.
+       */
       if (ctx->Stencil.WriteMask[face] == mask)
          return;
       FLUSH_VERTICES(ctx, _NEW_STENCIL);
       ctx->Stencil.WriteMask[face] = mask;
-      if (ctx->Driver.StencilMaskSeparate) {
-         ctx->Driver.StencilMaskSeparate(ctx, face ? GL_BACK : GL_FRONT, mask);
+
+      /* Only propagate the change to the driver if EXT_stencil_two_side
+       * is enabled.
+       */
+      if (ctx->Driver.StencilMaskSeparate && ctx->Stencil.TestTwoSide) {
+         ctx->Driver.StencilMaskSeparate(ctx, GL_BACK, mask);
       }
    }
    else {
@@ -280,7 +275,10 @@ _mesa_StencilMask( GLuint mask )
       FLUSH_VERTICES(ctx, _NEW_STENCIL);
       ctx->Stencil.WriteMask[0] = ctx->Stencil.WriteMask[1] = mask;
       if (ctx->Driver.StencilMaskSeparate) {
-         ctx->Driver.StencilMaskSeparate(ctx, GL_FRONT_AND_BACK, mask);
+         ctx->Driver.StencilMaskSeparate(ctx,
+					 ((ctx->Stencil.TestTwoSide)
+					  ? GL_FRONT : GL_FRONT_AND_BACK),
+					  mask);
       }
    }
 }
@@ -304,6 +302,8 @@ void GLAPIENTRY
 _mesa_StencilOp(GLenum fail, GLenum zfail, GLenum zpass)
 {
    GET_CURRENT_CONTEXT(ctx);
+   const GLint face = ctx->Stencil.ActiveFace;
+
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
    if (!validate_stencil_op(ctx, fail)) {
@@ -319,9 +319,8 @@ _mesa_StencilOp(GLenum fail, GLenum zfail, GLenum zpass)
       return;
    }
 
-   if (ctx->Extensions.EXT_stencil_two_side) {
+   if (face != 0) {
       /* only set active face state */
-      const GLint face = ctx->Stencil.ActiveFace;
       if (ctx->Stencil.ZFailFunc[face] == zfail &&
           ctx->Stencil.ZPassFunc[face] == zpass &&
           ctx->Stencil.FailFunc[face] == fail)
@@ -330,9 +329,12 @@ _mesa_StencilOp(GLenum fail, GLenum zfail, GLenum zpass)
       ctx->Stencil.ZFailFunc[face] = zfail;
       ctx->Stencil.ZPassFunc[face] = zpass;
       ctx->Stencil.FailFunc[face] = fail;
-      if (ctx->Driver.StencilOpSeparate) {
-         ctx->Driver.StencilOpSeparate(ctx, face ? GL_BACK : GL_FRONT,
-                                       fail, zfail, zpass);
+
+      /* Only propagate the change to the driver if EXT_stencil_two_side
+       * is enabled.
+       */
+      if (ctx->Driver.StencilOpSeparate && ctx->Stencil.TestTwoSide) {
+         ctx->Driver.StencilOpSeparate(ctx, GL_BACK, fail, zfail, zpass);
       }
    }
    else {
@@ -349,7 +351,9 @@ _mesa_StencilOp(GLenum fail, GLenum zfail, GLenum zpass)
       ctx->Stencil.ZPassFunc[0] = ctx->Stencil.ZPassFunc[1] = zpass;
       ctx->Stencil.FailFunc[0]  = ctx->Stencil.FailFunc[1]  = fail;
       if (ctx->Driver.StencilOpSeparate) {
-         ctx->Driver.StencilOpSeparate(ctx, GL_FRONT_AND_BACK,
+         ctx->Driver.StencilOpSeparate(ctx,
+				       ((ctx->Stencil.TestTwoSide)
+					? GL_FRONT : GL_FRONT_AND_BACK),
                                        fail, zfail, zpass);
       }
    }
@@ -372,7 +376,7 @@ _mesa_ActiveStencilFaceEXT(GLenum face)
 
    if (face == GL_FRONT || face == GL_BACK) {
       FLUSH_VERTICES(ctx, _NEW_STENCIL);
-      ctx->Stencil.ActiveFace = (face == GL_FRONT) ? 0 : 1;
+      ctx->Stencil.ActiveFace = (face == GL_FRONT) ? 0 : 2;
    }
    else {
       _mesa_error(ctx, GL_INVALID_ENUM, "glActiveStencilFaceEXT(face)");
@@ -513,19 +517,16 @@ _mesa_StencilMaskSeparate(GLenum face, GLuint mask)
 void
 _mesa_update_stencil(GLcontext *ctx)
 {
-   if (ctx->Extensions.EXT_stencil_two_side) {
-      ctx->Stencil._TestTwoSide = ctx->Stencil.TestTwoSide;
-   }
-   else {
-      ctx->Stencil._TestTwoSide = 
-         (ctx->Stencil.Function[0] != ctx->Stencil.Function[1] ||
-          ctx->Stencil.FailFunc[0] != ctx->Stencil.FailFunc[1] ||
-          ctx->Stencil.ZPassFunc[0] != ctx->Stencil.ZPassFunc[1] ||
-          ctx->Stencil.ZFailFunc[0] != ctx->Stencil.ZFailFunc[1] ||
-          ctx->Stencil.Ref[0] != ctx->Stencil.Ref[1] ||
-          ctx->Stencil.ValueMask[0] != ctx->Stencil.ValueMask[1] ||
-          ctx->Stencil.WriteMask[0] != ctx->Stencil.WriteMask[1]);
-   }
+   const GLint face = ctx->Stencil._BackFace;
+
+   ctx->Stencil._TestTwoSide =
+       (ctx->Stencil.Function[0] != ctx->Stencil.Function[face] ||
+	ctx->Stencil.FailFunc[0] != ctx->Stencil.FailFunc[face] ||
+	ctx->Stencil.ZPassFunc[0] != ctx->Stencil.ZPassFunc[face] ||
+	ctx->Stencil.ZFailFunc[0] != ctx->Stencil.ZFailFunc[face] ||
+	ctx->Stencil.Ref[0] != ctx->Stencil.Ref[face] ||
+	ctx->Stencil.ValueMask[0] != ctx->Stencil.ValueMask[face] ||
+	ctx->Stencil.WriteMask[0] != ctx->Stencil.WriteMask[face]);
 }
 
 
@@ -544,17 +545,24 @@ _mesa_init_stencil(GLcontext *ctx)
    ctx->Stencil.ActiveFace = 0;  /* 0 = GL_FRONT, 1 = GL_BACK */
    ctx->Stencil.Function[0] = GL_ALWAYS;
    ctx->Stencil.Function[1] = GL_ALWAYS;
+   ctx->Stencil.Function[2] = GL_ALWAYS;
    ctx->Stencil.FailFunc[0] = GL_KEEP;
    ctx->Stencil.FailFunc[1] = GL_KEEP;
+   ctx->Stencil.FailFunc[2] = GL_KEEP;
    ctx->Stencil.ZPassFunc[0] = GL_KEEP;
    ctx->Stencil.ZPassFunc[1] = GL_KEEP;
+   ctx->Stencil.ZPassFunc[2] = GL_KEEP;
    ctx->Stencil.ZFailFunc[0] = GL_KEEP;
    ctx->Stencil.ZFailFunc[1] = GL_KEEP;
+   ctx->Stencil.ZFailFunc[2] = GL_KEEP;
    ctx->Stencil.Ref[0] = 0;
    ctx->Stencil.Ref[1] = 0;
+   ctx->Stencil.Ref[2] = 0;
    ctx->Stencil.ValueMask[0] = ~0U;
    ctx->Stencil.ValueMask[1] = ~0U;
+   ctx->Stencil.ValueMask[2] = ~0U;
    ctx->Stencil.WriteMask[0] = ~0U;
    ctx->Stencil.WriteMask[1] = ~0U;
+   ctx->Stencil.WriteMask[2] = ~0U;
    ctx->Stencil.Clear = 0;
 }
diff --git a/src/mesa/swrast/s_stencil.c b/src/mesa/swrast/s_stencil.c
index c925922463..2e84ddec71 100644
--- a/src/mesa/swrast/s_stencil.c
+++ b/src/mesa/swrast/s_stencil.c
@@ -997,10 +997,12 @@ stencil_and_ztest_pixels( GLcontext *ctx, SWspan *span, GLuint face )
 GLboolean
 _swrast_stencil_and_ztest_span(GLcontext *ctx, SWspan *span)
 {
+   const GLuint face = (span->facing == 0) ? 0 : ctx->Stencil._BackFace;
+
    if (span->arrayMask & SPAN_XY)
-      return stencil_and_ztest_pixels(ctx, span, span->facing);
+      return stencil_and_ztest_pixels(ctx, span, face);
    else
-      return stencil_and_ztest_span(ctx, span, span->facing);
+      return stencil_and_ztest_span(ctx, span, face);
 }
 
 
-- 
cgit v1.2.3


From b5fbdef7ec3deb823ad1db8a7b7a731800082f75 Mon Sep 17 00:00:00 2001
From: Ian Romanick <idr@freedesktop.org>
Date: Fri, 9 Jan 2009 15:47:05 -0800
Subject: swrast: Enable GL_EXT_stencil_two_side

---
 src/mesa/drivers/dri/swrast/swrast.c | 2 ++
 src/mesa/main/extensions.c           | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/swrast/swrast.c b/src/mesa/drivers/dri/swrast/swrast.c
index 15b57244dc..4197603871 100644
--- a/src/mesa/drivers/dri/swrast/swrast.c
+++ b/src/mesa/drivers/dri/swrast/swrast.c
@@ -72,6 +72,7 @@
 #define need_GL_EXT_framebuffer_blit
 #define need_GL_EXT_gpu_program_parameters
 #define need_GL_EXT_paletted_texture
+#define need_GL_EXT_stencil_two_side
 #define need_GL_IBM_multimode_draw_arrays
 #define need_GL_MESA_resize_buffers
 #define need_GL_NV_vertex_program
@@ -103,6 +104,7 @@ const struct dri_extension card_extensions[] =
     { "GL_EXT_framebuffer_blit",	GL_EXT_framebuffer_blit_functions },
     { "GL_EXT_gpu_program_parameters",	GL_EXT_gpu_program_parameters_functions },
     { "GL_EXT_paletted_texture",	GL_EXT_paletted_texture_functions },
+    { "GL_EXT_stencil_two_side",	GL_EXT_stencil_two_side_functions },
     { "GL_IBM_multimode_draw_arrays",	GL_IBM_multimode_draw_arrays_functions },
     { "GL_MESA_resize_buffers",		GL_MESA_resize_buffers_functions },
     { "GL_NV_vertex_program",		GL_NV_vertex_program_functions },
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 188e01c8a4..738fda34dd 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -262,7 +262,7 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
    ctx->Extensions.EXT_secondary_color = GL_TRUE;
    ctx->Extensions.EXT_shared_texture_palette = GL_TRUE;
    ctx->Extensions.EXT_stencil_wrap = GL_TRUE;
-   ctx->Extensions.EXT_stencil_two_side = GL_FALSE; /* obsolete */
+   ctx->Extensions.EXT_stencil_two_side = GL_TRUE;
    ctx->Extensions.EXT_texture_env_add = GL_TRUE;
    ctx->Extensions.EXT_texture_env_combine = GL_TRUE;
    ctx->Extensions.EXT_texture_env_dot3 = GL_TRUE;
@@ -410,7 +410,7 @@ _mesa_enable_2_0_extensions(GLcontext *ctx)
 #if FEATURE_ARB_shading_language_100
    ctx->Extensions.ARB_shading_language_100 = GL_TRUE;
 #endif
-   ctx->Extensions.EXT_stencil_two_side = GL_FALSE; /* obsolete */
+   ctx->Extensions.EXT_stencil_two_side = GL_TRUE;
 #if FEATURE_ARB_vertex_shader
    ctx->Extensions.ARB_vertex_shader = GL_TRUE;
 #endif
-- 
cgit v1.2.3


From f7c1a2dacd1643a19fbf975c21ac3e64b708c8d7 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 23 Jan 2009 11:23:12 -0700
Subject: mesa: initial bits for GL_EXT_vertex_array_bgra

---
 src/mesa/main/extensions.c | 1 +
 src/mesa/main/mtypes.h     | 2 ++
 2 files changed, 3 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 188e01c8a4..bdc382bf9d 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -129,6 +129,7 @@ static const struct {
    { OFF, "GL_EXT_texture_sRGB",               F(EXT_texture_sRGB) },
    { OFF, "GL_EXT_timer_query",                F(EXT_timer_query) },
    { ON,  "GL_EXT_vertex_array",               F(EXT_vertex_array) },
+   { OFF, "GL_EXT_vertex_array_bgra",          F(EXT_vertex_array_bgra) },
    { OFF, "GL_EXT_vertex_array_set",           F(EXT_vertex_array_set) },
    { OFF, "GL_3DFX_texture_compression_FXT1",  F(TDFX_texture_compression_FXT1) },
    { OFF, "GL_APPLE_client_storage",           F(APPLE_client_storage) },
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index f1da638ae6..5c31f66ed1 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1661,6 +1661,7 @@ struct gl_client_array
 {
    GLint Size;                  /**< components per element (1,2,3,4) */
    GLenum Type;                 /**< datatype: GL_FLOAT, GL_INT, etc */
+   GLenum Format;               /**< default: GL_RGBA, but may be GL_BGRA */
    GLsizei Stride;		/**< user-specified stride */
    GLsizei StrideB;		/**< actual stride in bytes */
    const GLubyte *Ptr;          /**< Points to array data */
@@ -2611,6 +2612,7 @@ struct gl_extensions
    GLboolean EXT_texture_sRGB;
    GLboolean EXT_timer_query;
    GLboolean EXT_vertex_array;
+   GLboolean EXT_vertex_array_bgra;
    GLboolean EXT_vertex_array_set;
    /* vendor extensions */
    GLboolean APPLE_client_storage;
-- 
cgit v1.2.3


From 76d27a6a1e94e973e5a0a4a22b80158dfecf9151 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 23 Jan 2009 11:24:31 -0700
Subject: mesa: update glColorPointer, etc for GL_EXT_vertex_array_bgra

Add new error checking, set array state appropriately.
---
 src/mesa/main/varray.c | 86 +++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 68 insertions(+), 18 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 9d9b28b518..106252e460 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -52,11 +52,13 @@
 static void
 update_array(GLcontext *ctx, struct gl_client_array *array,
              GLbitfield dirtyBit, GLsizei elementSize,
-             GLint size, GLenum type,
+             GLint size, GLenum type, GLenum format,
              GLsizei stride, GLboolean normalized, const GLvoid *ptr)
 {
+   ASSERT(format == GL_RGBA || format == GL_BGRA);
    array->Size = size;
    array->Type = type;
+   array->Format = format;
    array->Stride = stride;
    array->StrideB = stride ? stride : elementSize;
    array->Normalized = normalized;
@@ -132,7 +134,7 @@ _mesa_VertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
    }
 
    update_array(ctx, &ctx->Array.ArrayObj->Vertex, _NEW_ARRAY_VERTEX,
-                elementSize, size, type, stride, GL_FALSE, ptr);
+                elementSize, size, type, GL_RGBA, stride, GL_FALSE, ptr);
 
    if (ctx->Driver.VertexPointer)
       ctx->Driver.VertexPointer( ctx, size, type, stride, ptr );
@@ -182,7 +184,7 @@ _mesa_NormalPointer(GLenum type, GLsizei stride, const GLvoid *ptr )
    }
 
    update_array(ctx, &ctx->Array.ArrayObj->Normal, _NEW_ARRAY_NORMAL,
-                elementSize, 3, type, stride, GL_TRUE, ptr);
+                elementSize, 3, type, GL_RGBA, stride, GL_TRUE, ptr);
 
    if (ctx->Driver.NormalPointer)
       ctx->Driver.NormalPointer( ctx, type, stride, ptr );
@@ -193,12 +195,15 @@ void GLAPIENTRY
 _mesa_ColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
 {
    GLsizei elementSize;
+   GLenum format;
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
    if (size < 3 || size > 4) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glColorPointer(size)" );
-      return;
+      if (!ctx->Extensions.EXT_vertex_array_bgra || size != GL_BGRA) {
+         _mesa_error(ctx, GL_INVALID_VALUE, "glColorPointer(size)");
+         return;
+      }
    }
    if (stride < 0) {
       _mesa_error( ctx, GL_INVALID_VALUE, "glColorPointer(stride)" );
@@ -209,6 +214,18 @@ _mesa_ColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
       _mesa_debug(ctx, "glColorPointer( sz %d type %s stride %d )\n", size,
                   _mesa_lookup_enum_by_nr( type ), stride);
 
+   if (size == GL_BGRA) {
+      if (type != GL_UNSIGNED_BYTE) {
+         _mesa_error(ctx, GL_INVALID_VALUE, "glColorPointer(GL_BGRA/GLubyte)");
+         return;
+      }
+      format = GL_BGRA;
+      size = 4;
+   }
+   else {
+      format = GL_RGBA;
+   }
+
    switch (type) {
       case GL_BYTE:
          elementSize = size * sizeof(GLbyte);
@@ -245,7 +262,7 @@ _mesa_ColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
    }
 
    update_array(ctx, &ctx->Array.ArrayObj->Color, _NEW_ARRAY_COLOR0,
-                elementSize, size, type, stride, GL_TRUE, ptr);
+                elementSize, size, type, format, stride, GL_TRUE, ptr);
 
    if (ctx->Driver.ColorPointer)
       ctx->Driver.ColorPointer( ctx, size, type, stride, ptr );
@@ -277,7 +294,7 @@ _mesa_FogCoordPointerEXT(GLenum type, GLsizei stride, const GLvoid *ptr)
    }
 
    update_array(ctx, &ctx->Array.ArrayObj->FogCoord, _NEW_ARRAY_FOGCOORD,
-                elementSize, 1, type, stride, GL_FALSE, ptr);
+                elementSize, 1, type, GL_RGBA, stride, GL_FALSE, ptr);
 
    if (ctx->Driver.FogCoordPointer)
       ctx->Driver.FogCoordPointer( ctx, type, stride, ptr );
@@ -318,7 +335,7 @@ _mesa_IndexPointer(GLenum type, GLsizei stride, const GLvoid *ptr)
    }
 
    update_array(ctx, &ctx->Array.ArrayObj->Index, _NEW_ARRAY_INDEX,
-                elementSize, 1, type, stride, GL_FALSE, ptr);
+                elementSize, 1, type, GL_RGBA, stride, GL_FALSE, ptr);
 
    if (ctx->Driver.IndexPointer)
       ctx->Driver.IndexPointer( ctx, type, stride, ptr );
@@ -330,12 +347,15 @@ _mesa_SecondaryColorPointerEXT(GLint size, GLenum type,
 			       GLsizei stride, const GLvoid *ptr)
 {
    GLsizei elementSize;
+   GLenum format;
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
    if (size != 3 && size != 4) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glSecondaryColorPointer(size)" );
-      return;
+      if (!ctx->Extensions.EXT_vertex_array_bgra || size != GL_BGRA) {
+         _mesa_error(ctx, GL_INVALID_VALUE, "glSecondaryColorPointer(size)");
+         return;
+      }
    }
    if (stride < 0) {
       _mesa_error( ctx, GL_INVALID_VALUE, "glSecondaryColorPointer(stride)" );
@@ -346,6 +366,18 @@ _mesa_SecondaryColorPointerEXT(GLint size, GLenum type,
       _mesa_debug(ctx, "glSecondaryColorPointer( sz %d type %s stride %d )\n",
                   size, _mesa_lookup_enum_by_nr( type ), stride);
 
+   if (size == GL_BGRA) {
+      if (type != GL_UNSIGNED_BYTE) {
+         _mesa_error(ctx, GL_INVALID_VALUE, "glColorPointer(GL_BGRA/GLubyte)");
+         return;
+      }
+      format = GL_BGRA;
+      size = 4;
+   }
+   else {
+      format = GL_RGBA;
+   }
+
    switch (type) {
       case GL_BYTE:
          elementSize = size * sizeof(GLbyte);
@@ -377,7 +409,7 @@ _mesa_SecondaryColorPointerEXT(GLint size, GLenum type,
    }
 
    update_array(ctx, &ctx->Array.ArrayObj->SecondaryColor, _NEW_ARRAY_COLOR1,
-                elementSize, size, type, stride, GL_TRUE, ptr);
+                elementSize, size, type, format, stride, GL_TRUE, ptr);
 
    if (ctx->Driver.SecondaryColorPointer)
       ctx->Driver.SecondaryColorPointer( ctx, size, type, stride, ptr );
@@ -437,7 +469,7 @@ _mesa_TexCoordPointer(GLint size, GLenum type, GLsizei stride,
 
    update_array(ctx, &ctx->Array.ArrayObj->TexCoord[unit],
                 _NEW_ARRAY_TEXCOORD(unit),
-                elementSize, size, type, stride, GL_FALSE, ptr);
+                elementSize, size, type, GL_RGBA, stride, GL_FALSE, ptr);
 
    if (ctx->Driver.TexCoordPointer)
       ctx->Driver.TexCoordPointer( ctx, size, type, stride, ptr );
@@ -456,7 +488,8 @@ _mesa_EdgeFlagPointer(GLsizei stride, const GLvoid *ptr)
    }
 
    update_array(ctx, &ctx->Array.ArrayObj->EdgeFlag, _NEW_ARRAY_EDGEFLAG,
-                sizeof(GLboolean), 1, GL_UNSIGNED_BYTE, stride, GL_FALSE, ptr);
+                sizeof(GLboolean), 1, GL_UNSIGNED_BYTE, GL_RGBA,
+                stride, GL_FALSE, ptr);
 
    if (ctx->Driver.EdgeFlagPointer)
       ctx->Driver.EdgeFlagPointer( ctx, stride, ptr );
@@ -490,7 +523,7 @@ _mesa_PointSizePointer(GLenum type, GLsizei stride, const GLvoid *ptr)
    }
 
    update_array(ctx, &ctx->Array.ArrayObj->PointSize, _NEW_ARRAY_POINT_SIZE,
-                elementSize, 1, type, stride, GL_FALSE, ptr);
+                elementSize, 1, type, GL_RGBA, stride, GL_FALSE, ptr);
 }
 
 
@@ -546,7 +579,7 @@ _mesa_VertexAttribPointerNV(GLuint index, GLint size, GLenum type,
 
    update_array(ctx, &ctx->Array.ArrayObj->VertexAttrib[index],
                 _NEW_ARRAY_ATTRIB(index),
-                elementSize, size, type, stride, normalized, ptr);
+                elementSize, size, type, GL_RGBA, stride, normalized, ptr);
 
    if (ctx->Driver.VertexAttribPointer)
       ctx->Driver.VertexAttribPointer( ctx, index, size, type, stride, ptr );
@@ -561,6 +594,7 @@ _mesa_VertexAttribPointerARB(GLuint index, GLint size, GLenum type,
                              GLsizei stride, const GLvoid *ptr)
 {
    GLsizei elementSize;
+   GLenum format;
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
@@ -570,8 +604,10 @@ _mesa_VertexAttribPointerARB(GLuint index, GLint size, GLenum type,
    }
 
    if (size < 1 || size > 4) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glVertexAttribPointerARB(size)");
-      return;
+      if (!ctx->Extensions.EXT_vertex_array_bgra || size != GL_BGRA) {
+         _mesa_error(ctx, GL_INVALID_VALUE, "glVertexAttribPointerARB(size)");
+         return;
+      }
    }
 
    if (stride < 0) {
@@ -579,6 +615,20 @@ _mesa_VertexAttribPointerARB(GLuint index, GLint size, GLenum type,
       return;
    }
 
+   if (size == GL_BGRA) {
+      if (type != GL_UNSIGNED_BYTE) {
+         _mesa_error(ctx, GL_INVALID_VALUE,
+                     "glVertexAttribPointerARB(GL_BGRA/type)");
+         return;
+      }
+      format = GL_BGRA;
+      size = 4;
+      normalized = GL_TRUE;
+   }
+   else {
+      format = GL_RGBA;
+   }
+
    /* check for valid 'type' and compute StrideB right away */
    /* NOTE: more types are supported here than in the NV extension */
    switch (type) {
@@ -618,7 +668,7 @@ _mesa_VertexAttribPointerARB(GLuint index, GLint size, GLenum type,
 
    update_array(ctx, &ctx->Array.ArrayObj->VertexAttrib[index],
                 _NEW_ARRAY_ATTRIB(index),
-                elementSize, size, type, stride, normalized, ptr);
+                elementSize, size, type, GL_RGBA, stride, normalized, ptr);
 
    if (ctx->Driver.VertexAttribPointer)
       ctx->Driver.VertexAttribPointer(ctx, index, size, type, stride, ptr);
-- 
cgit v1.2.3


From 9cf594d698839678290f058078f0eaf569a13ff8 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 23 Jan 2009 11:25:13 -0700
Subject: mesa: improve array initialization code, and set the new
 array->Format field.

---
 src/mesa/main/arrayobj.c | 108 +++++++++++++++--------------------------------
 1 file changed, 33 insertions(+), 75 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index f3f482f8c8..b04095fd16 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -98,6 +98,28 @@ _mesa_delete_array_object( GLcontext *ctx, struct gl_array_object *obj )
 }
 
 
+static void
+init_array(GLcontext *ctx,
+           struct gl_client_array *array, GLint size, GLint type)
+{
+   array->Size = size;
+   array->Type = type;
+   array->Format = GL_RGBA; /* only significant for GL_EXT_vertex_array_bgra */
+   array->Stride = 0;
+   array->StrideB = 0;
+   array->Ptr = NULL;
+   array->Enabled = GL_FALSE;
+   array->Normalized = GL_FALSE;
+#if FEATURE_ARB_vertex_buffer_object
+   /* Vertex array buffers */
+   array->BufferObj = ctx->Array.NullBufferObj;
+#endif
+}
+
+
+/**
+ * Initialize a gl_array_object's arrays.
+ */
 void
 _mesa_initialize_array_object( GLcontext *ctx,
 			       struct gl_array_object *obj,
@@ -107,87 +129,23 @@ _mesa_initialize_array_object( GLcontext *ctx,
 
    obj->Name = name;
 
-   /* Vertex arrays */
-   obj->Vertex.Size = 4;
-   obj->Vertex.Type = GL_FLOAT;
-   obj->Vertex.Stride = 0;
-   obj->Vertex.StrideB = 0;
-   obj->Vertex.Ptr = NULL;
-   obj->Vertex.Enabled = GL_FALSE;
-   obj->Normal.Type = GL_FLOAT;
-   obj->Normal.Stride = 0;
-   obj->Normal.StrideB = 0;
-   obj->Normal.Ptr = NULL;
-   obj->Normal.Enabled = GL_FALSE;
-   obj->Color.Size = 4;
-   obj->Color.Type = GL_FLOAT;
-   obj->Color.Stride = 0;
-   obj->Color.StrideB = 0;
-   obj->Color.Ptr = NULL;
-   obj->Color.Enabled = GL_FALSE;
-   obj->SecondaryColor.Size = 4;
-   obj->SecondaryColor.Type = GL_FLOAT;
-   obj->SecondaryColor.Stride = 0;
-   obj->SecondaryColor.StrideB = 0;
-   obj->SecondaryColor.Ptr = NULL;
-   obj->SecondaryColor.Enabled = GL_FALSE;
-   obj->FogCoord.Size = 1;
-   obj->FogCoord.Type = GL_FLOAT;
-   obj->FogCoord.Stride = 0;
-   obj->FogCoord.StrideB = 0;
-   obj->FogCoord.Ptr = NULL;
-   obj->FogCoord.Enabled = GL_FALSE;
-   obj->Index.Type = GL_FLOAT;
-   obj->Index.Stride = 0;
-   obj->Index.StrideB = 0;
-   obj->Index.Ptr = NULL;
-   obj->Index.Enabled = GL_FALSE;
+   /* Init the individual arrays */
+   init_array(ctx, &obj->Vertex, 4, GL_FLOAT);
+   init_array(ctx, &obj->Normal, 3, GL_FLOAT);
+   init_array(ctx, &obj->Color, 4, GL_FLOAT);
+   init_array(ctx, &obj->SecondaryColor, 4, GL_FLOAT);
+   init_array(ctx, &obj->FogCoord, 1, GL_FLOAT);
+   init_array(ctx, &obj->Index, 1, GL_FLOAT);
    for (i = 0; i < MAX_TEXTURE_COORD_UNITS; i++) {
-      obj->TexCoord[i].Size = 4;
-      obj->TexCoord[i].Type = GL_FLOAT;
-      obj->TexCoord[i].Stride = 0;
-      obj->TexCoord[i].StrideB = 0;
-      obj->TexCoord[i].Ptr = NULL;
-      obj->TexCoord[i].Enabled = GL_FALSE;
+      init_array(ctx, &obj->TexCoord[i], 4, GL_FLOAT);
    }
-   obj->EdgeFlag.Stride = 0;
-   obj->EdgeFlag.StrideB = 0;
-   obj->EdgeFlag.Ptr = NULL;
-   obj->EdgeFlag.Enabled = GL_FALSE;
+   init_array(ctx, &obj->EdgeFlag, 1, GL_BOOL);
    for (i = 0; i < VERT_ATTRIB_MAX; i++) {
-      obj->VertexAttrib[i].Size = 4;
-      obj->VertexAttrib[i].Type = GL_FLOAT;
-      obj->VertexAttrib[i].Stride = 0;
-      obj->VertexAttrib[i].StrideB = 0;
-      obj->VertexAttrib[i].Ptr = NULL;
-      obj->VertexAttrib[i].Enabled = GL_FALSE;
-      obj->VertexAttrib[i].Normalized = GL_FALSE;
+      init_array(ctx, &obj->VertexAttrib[i], 4, GL_FLOAT);
    }
 
 #if FEATURE_point_size_array
-   obj->PointSize.Type = GL_FLOAT;
-   obj->PointSize.Stride = 0;
-   obj->PointSize.StrideB = 0;
-   obj->PointSize.Ptr = NULL;
-   obj->PointSize.Enabled = GL_FALSE;
-   obj->PointSize.BufferObj = ctx->Array.NullBufferObj;
-#endif
-
-#if FEATURE_ARB_vertex_buffer_object
-   /* Vertex array buffers */
-   obj->Vertex.BufferObj = ctx->Array.NullBufferObj;
-   obj->Normal.BufferObj = ctx->Array.NullBufferObj;
-   obj->Color.BufferObj = ctx->Array.NullBufferObj;
-   obj->SecondaryColor.BufferObj = ctx->Array.NullBufferObj;
-   obj->FogCoord.BufferObj = ctx->Array.NullBufferObj;
-   obj->Index.BufferObj = ctx->Array.NullBufferObj;
-   for (i = 0; i < MAX_TEXTURE_COORD_UNITS; i++) {
-      obj->TexCoord[i].BufferObj = ctx->Array.NullBufferObj;
-   }
-   obj->EdgeFlag.BufferObj = ctx->Array.NullBufferObj;
-   for (i = 0; i < VERT_ATTRIB_MAX; i++) {
-      obj->VertexAttrib[i].BufferObj = ctx->Array.NullBufferObj;
-   }
+   init_array(ctx, &obj->PointSize, 1, GL_FLOAT);
 #endif
 }
 
-- 
cgit v1.2.3


From 0bd6d48bcea7de37e027854e9d91c54116fbe90e Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 23 Jan 2009 11:26:51 -0700
Subject: mesa: enable GL_EXT_vertex_array_bgra for sw drivers

---
 src/mesa/main/extensions.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index bdc382bf9d..8010823cf5 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -272,6 +272,7 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
 #if FEATURE_EXT_texture_sRGB
    ctx->Extensions.EXT_texture_sRGB = GL_TRUE;
 #endif
+   ctx->Extensions.EXT_vertex_array_bgra = GL_TRUE;
    ctx->Extensions.IBM_multimode_draw_arrays = GL_TRUE;
    ctx->Extensions.MESA_pack_invert = GL_TRUE;
 #if FEATURE_MESA_program_debug
-- 
cgit v1.2.3


From 0a40033047373d9c16039cff9e63130478e78e0f Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 23 Jan 2009 13:44:12 -0700
Subject: mesa: refactor _mesa_TexEnvfv() code with helper functions

---
 src/mesa/main/texenv.c | 721 +++++++++++++++++++++++++------------------------
 1 file changed, 373 insertions(+), 348 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenv.c b/src/mesa/main/texenv.c
index e072cea136..2f38ee8852 100644
--- a/src/mesa/main/texenv.c
+++ b/src/mesa/main/texenv.c
@@ -1,8 +1,9 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.1
+ * Version:  7.5
  *
  * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -37,6 +38,370 @@
 #include "math/m_xform.h"
 
 
+#define TE_ERROR(errCode, msg, value)				\
+   _mesa_error(ctx, errCode, msg, _mesa_lookup_enum_by_nr(value));
+
+
+/** Set texture env mode */
+static void
+set_env_mode(GLcontext *ctx,
+             struct gl_texture_unit *texUnit,
+             GLenum mode)
+{
+   GLboolean legal;
+
+   if (texUnit->EnvMode == mode)
+      return;
+
+   switch (mode) {
+   case GL_MODULATE:
+   case GL_BLEND:
+   case GL_DECAL:
+   case GL_REPLACE:
+      legal = GL_TRUE;
+      break;
+   case GL_REPLACE_EXT:
+      mode = GL_REPLACE; /* GL_REPLACE_EXT != GL_REPLACE */
+      legal = GL_TRUE;
+      break;
+   case GL_ADD:
+      legal = ctx->Extensions.EXT_texture_env_add;
+      break;
+   case GL_COMBINE:
+      legal = (ctx->Extensions.EXT_texture_env_combine ||
+               ctx->Extensions.ARB_texture_env_combine);
+      break;
+   case GL_COMBINE4_NV:
+      legal = ctx->Extensions.NV_texture_env_combine4;
+      break;
+   default:
+      legal = GL_FALSE;
+   }
+
+   if (legal) {
+      FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+      texUnit->EnvMode = mode;
+   }
+   else {
+      TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
+   }
+}
+
+
+static void
+set_env_color(GLcontext *ctx,
+              struct gl_texture_unit *texUnit,
+              const GLfloat *color)
+{
+   GLfloat tmp[4];
+   tmp[0] = CLAMP(color[0], 0.0F, 1.0F);
+   tmp[1] = CLAMP(color[1], 0.0F, 1.0F);
+   tmp[2] = CLAMP(color[2], 0.0F, 1.0F);
+   tmp[3] = CLAMP(color[3], 0.0F, 1.0F);
+   if (TEST_EQ_4V(tmp, texUnit->EnvColor))
+      return;
+   FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+   COPY_4FV(texUnit->EnvColor, tmp);
+}
+
+
+/** Set an RGB or A combiner mode/function */
+static void
+set_combiner_mode(GLcontext *ctx,
+                  struct gl_texture_unit *texUnit,
+                  GLenum pname, GLenum mode)
+{
+   GLboolean legal;
+
+   if (!ctx->Extensions.EXT_texture_env_combine &&
+       !ctx->Extensions.ARB_texture_env_combine) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glTexEnv(pname)");
+      return;
+   }
+
+   switch (mode) {
+   case GL_REPLACE:
+   case GL_MODULATE:
+   case GL_ADD:
+   case GL_ADD_SIGNED:
+   case GL_INTERPOLATE:
+      legal = GL_TRUE;
+      break;
+   case GL_SUBTRACT:
+      legal = ctx->Extensions.ARB_texture_env_combine;
+      break;
+   case GL_DOT3_RGB_EXT:
+   case GL_DOT3_RGBA_EXT:
+      legal = (ctx->Extensions.EXT_texture_env_dot3 &&
+               pname == GL_COMBINE_RGB);
+      break;
+   case GL_DOT3_RGB:
+   case GL_DOT3_RGBA:
+      legal = (ctx->Extensions.ARB_texture_env_dot3 &&
+               pname == GL_COMBINE_RGB);
+      break;
+   case GL_MODULATE_ADD_ATI:
+   case GL_MODULATE_SIGNED_ADD_ATI:
+   case GL_MODULATE_SUBTRACT_ATI:
+      legal =ctx->Extensions.ATI_texture_env_combine3;
+      break;
+   default:
+      legal = GL_FALSE;
+   }
+
+   if (!legal) {
+      TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
+      return;
+   }
+
+   switch (pname) {
+   case GL_COMBINE_RGB:
+      if (texUnit->Combine.ModeRGB == mode)
+         return;
+      FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+      texUnit->Combine.ModeRGB = mode;
+      break;
+
+   case GL_COMBINE_ALPHA:
+      if (texUnit->Combine.ModeA == mode)
+         return;
+      FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+      texUnit->Combine.ModeA = mode;
+      break;
+   default:
+      TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
+   }
+}
+
+
+
+/** Set an RGB or A combiner source term */
+static void
+set_combiner_source(GLcontext *ctx,
+                    struct gl_texture_unit *texUnit,
+                    GLenum pname, GLenum param)
+{
+   GLuint src;
+   GLboolean alpha, legal;
+
+   if (!ctx->Extensions.EXT_texture_env_combine &&
+       !ctx->Extensions.ARB_texture_env_combine) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glTexEnv(pname)");
+      return;
+   }
+
+   /*
+    * Translate pname to (src, alpha).
+    */
+   switch (pname) {
+   case GL_SOURCE0_RGB:
+      src = 0;
+      alpha = GL_FALSE;
+      break;
+   case GL_SOURCE1_RGB:
+      src = 1;
+      alpha = GL_FALSE;
+      break;
+   case GL_SOURCE2_RGB:
+      src = 2;
+      alpha = GL_FALSE;
+      break;
+   case GL_SOURCE0_ALPHA:
+      src = 0;
+      alpha = GL_TRUE;
+      break;
+   case GL_SOURCE1_ALPHA:
+      src = 1;
+      alpha = GL_TRUE;
+      break;
+   case GL_SOURCE2_ALPHA:
+      src = 2;
+      alpha = GL_TRUE;
+      break;
+   default:
+      TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
+      return;
+   }
+
+   /*
+    * Error-check param (the source term)
+    */
+   switch (param) {
+   case GL_TEXTURE:
+   case GL_CONSTANT:
+   case GL_PRIMARY_COLOR:
+   case GL_PREVIOUS:
+      legal = GL_TRUE;
+      break;
+   case GL_TEXTURE0:
+   case GL_TEXTURE1:
+   case GL_TEXTURE2:
+   case GL_TEXTURE3:
+   case GL_TEXTURE4:
+   case GL_TEXTURE5:
+   case GL_TEXTURE6:
+   case GL_TEXTURE7:
+      legal = (ctx->Extensions.ARB_texture_env_crossbar &&
+               param - GL_TEXTURE0 < ctx->Const.MaxTextureUnits);
+      break;
+   case GL_ZERO:
+   case GL_ONE:
+      legal = ctx->Extensions.ATI_texture_env_combine3;
+      break;
+   default:
+      legal = GL_FALSE;
+   }
+
+   if (!legal) {
+      TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", param);
+      return;
+   }
+
+   FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+
+   assert(src < 4);
+   if (alpha)
+      texUnit->Combine.SourceA[src] = param;
+   else
+      texUnit->Combine.SourceRGB[src] = param;
+}
+
+
+/** Set an RGB or A combiner operand term */
+static void
+set_combiner_operand(GLcontext *ctx,
+                     struct gl_texture_unit *texUnit,
+                     GLenum pname, GLenum param)
+{
+   GLuint op;
+   GLboolean alpha, legal;
+
+   if (!ctx->Extensions.EXT_texture_env_combine &&
+       !ctx->Extensions.ARB_texture_env_combine) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glTexEnv(pname)");
+      return;
+   }
+
+   switch (pname) {
+   case GL_OPERAND0_RGB:
+      op = 0;
+      alpha = GL_FALSE;
+      break;
+   case GL_OPERAND1_RGB:
+      op = 1;
+      alpha = GL_FALSE;
+      break;
+   case GL_OPERAND2_RGB:
+      if (ctx->Extensions.ARB_texture_env_combine) {
+         op = 2;
+         alpha = GL_FALSE;
+      }
+      else {
+         TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
+         return;
+      }
+      break;
+   case GL_OPERAND0_ALPHA:
+      op = 0;
+      alpha = GL_TRUE;
+      break;
+   case GL_OPERAND1_ALPHA:
+      op = 1;
+      alpha = GL_TRUE;
+      break;
+   case GL_OPERAND2_ALPHA:
+      if (ctx->Extensions.ARB_texture_env_combine) {
+         op = 2;
+         alpha = GL_TRUE;
+      }
+      else {
+         TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
+         return;
+      }
+      break;
+   default:
+      TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
+      return;
+   }
+
+   /*
+    * Error-check param (the source operand)
+    */
+   switch (param) {
+   case GL_SRC_COLOR:
+   case GL_ONE_MINUS_SRC_COLOR:
+      legal = !alpha;
+      break;
+   case GL_SRC_ALPHA:
+   case GL_ONE_MINUS_SRC_ALPHA:
+      legal = GL_TRUE;
+      break;
+   default:
+      legal = GL_FALSE;
+   }
+
+   if (!legal) {
+      TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", param);
+      return;
+   }
+
+   FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+
+   if (alpha)
+      texUnit->Combine.OperandA[op] = param;
+   else
+      texUnit->Combine.OperandRGB[op] = param;
+}
+
+
+static void
+set_combiner_scale(GLcontext *ctx,
+                   struct gl_texture_unit *texUnit,
+                   GLenum pname, GLfloat scale)
+{
+   GLuint shift;
+
+   if (!ctx->Extensions.EXT_texture_env_combine &&
+       !ctx->Extensions.ARB_texture_env_combine) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glTexEnv(pname)");
+      return;
+   }
+
+   if (scale == 1.0F) {
+      shift = 0;
+   }
+   else if (scale == 2.0F) {
+      shift = 1;
+   }
+   else if (scale == 4.0F) {
+      shift = 2;
+   }
+   else {
+      _mesa_error( ctx, GL_INVALID_VALUE,
+                   "glTexEnv(GL_RGB_SCALE not 1, 2 or 4)" );
+      return;
+   }
+
+   switch (pname) {
+   case GL_RGB_SCALE:
+      if (texUnit->Combine.ScaleShiftRGB == shift)
+         return;
+      FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+      texUnit->Combine.ScaleShiftRGB = shift;
+      break;
+   case GL_ALPHA_SCALE:
+      if (texUnit->Combine.ScaleShiftA == shift)
+         return;
+      FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+      texUnit->Combine.ScaleShiftA = shift;
+      break;
+   default:
+      TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
+      return;
+   }
+}
+
+
 
 void GLAPIENTRY
 _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
@@ -55,377 +420,37 @@ _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
 
    texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
 
-#define TE_ERROR(errCode, msg, value)				\
-   _mesa_error(ctx, errCode, msg, _mesa_lookup_enum_by_nr(value));
-
    if (target == GL_TEXTURE_ENV) {
       switch (pname) {
       case GL_TEXTURE_ENV_MODE:
-         {
-            GLenum mode = (GLenum) (GLint) *param;
-            if (mode == GL_REPLACE_EXT)
-               mode = GL_REPLACE;
-	    if (texUnit->EnvMode == mode)
-	       return;
-            if (mode == GL_MODULATE ||
-                mode == GL_BLEND ||
-                mode == GL_DECAL ||
-                mode == GL_REPLACE ||
-                (mode == GL_ADD && ctx->Extensions.EXT_texture_env_add) ||
-                (mode == GL_COMBINE &&
-                 (ctx->Extensions.EXT_texture_env_combine ||
-                  ctx->Extensions.ARB_texture_env_combine))) {
-               /* legal */
-               FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-               texUnit->EnvMode = mode;
-            }
-            else {
-               TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
-               return;
-            }
-         }
+         set_env_mode(ctx, texUnit, (GLenum) (GLint) param[0]);
          break;
       case GL_TEXTURE_ENV_COLOR:
-         {
-            GLfloat tmp[4];
-            tmp[0] = CLAMP( param[0], 0.0F, 1.0F );
-            tmp[1] = CLAMP( param[1], 0.0F, 1.0F );
-            tmp[2] = CLAMP( param[2], 0.0F, 1.0F );
-            tmp[3] = CLAMP( param[3], 0.0F, 1.0F );
-            if (TEST_EQ_4V(tmp, texUnit->EnvColor))
-               return;
-            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-            COPY_4FV(texUnit->EnvColor, tmp);
-         }
+         set_env_color(ctx, texUnit, param);
          break;
       case GL_COMBINE_RGB:
-	 if (ctx->Extensions.EXT_texture_env_combine ||
-             ctx->Extensions.ARB_texture_env_combine) {
-	    const GLenum mode = (GLenum) (GLint) *param;
-	    if (texUnit->Combine.ModeRGB == mode)
-	       return;
-	    switch (mode) {
-	    case GL_REPLACE:
-	    case GL_MODULATE:
-	    case GL_ADD:
-	    case GL_ADD_SIGNED:
-	    case GL_INTERPOLATE:
-               /* OK */
-	       break;
-            case GL_SUBTRACT:
-               if (!ctx->Extensions.ARB_texture_env_combine) {
-                  TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
-                  return;
-               }
-               break;
-	    case GL_DOT3_RGB_EXT:
-	    case GL_DOT3_RGBA_EXT:
-	       if (!ctx->Extensions.EXT_texture_env_dot3) {
-                  TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
-		  return;
-	       }
-	       break;
-	    case GL_DOT3_RGB:
-	    case GL_DOT3_RGBA:
-	       if (!ctx->Extensions.ARB_texture_env_dot3) {
-                  TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
-		  return;
-	       }
-	       break;
-	    case GL_MODULATE_ADD_ATI:
-	    case GL_MODULATE_SIGNED_ADD_ATI:
-	    case GL_MODULATE_SUBTRACT_ATI:
-	       if (!ctx->Extensions.ATI_texture_env_combine3) {
-                  TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
-		  return;
-	       }
-	       break;
-	    default:
-               TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
-	       return;
-	    }
-	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-	    texUnit->Combine.ModeRGB = mode;
-	 }
-	 else {
-            TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
-	    return;
-	 }
-         break;
       case GL_COMBINE_ALPHA:
-	 if (ctx->Extensions.EXT_texture_env_combine ||
-             ctx->Extensions.ARB_texture_env_combine) {
-	    const GLenum mode = (GLenum) (GLint) *param;
-	    if (texUnit->Combine.ModeA == mode)
-	       return;
-            switch (mode) {
-	    case GL_REPLACE:
-	    case GL_MODULATE:
-	    case GL_ADD:
-	    case GL_ADD_SIGNED:
-	    case GL_INTERPOLATE:
-	       /* OK */
-	       break;
-	    case GL_SUBTRACT:
-	       if (!ctx->Extensions.ARB_texture_env_combine) {
-		  TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
-		  return;
-	       }
-	       break;
-	    case GL_MODULATE_ADD_ATI:
-	    case GL_MODULATE_SIGNED_ADD_ATI:
-	    case GL_MODULATE_SUBTRACT_ATI:
-	       if (!ctx->Extensions.ATI_texture_env_combine3) {
-                  TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
-		  return;
-	       }
-	       break;
-	    default:
-	       TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
-	       return;
-	    }
-	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-	    texUnit->Combine.ModeA = mode;
-	 }
-	 else {
-            TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
-	    return;
-	 }
+         set_combiner_mode(ctx, texUnit, pname, (GLenum) (GLint) param[0]);
 	 break;
       case GL_SOURCE0_RGB:
       case GL_SOURCE1_RGB:
       case GL_SOURCE2_RGB:
-	 if (ctx->Extensions.EXT_texture_env_combine ||
-	     ctx->Extensions.ARB_texture_env_combine) {
-	    const GLenum source = (GLenum) (GLint) *param;
-	    const GLuint s = pname - GL_SOURCE0_RGB;
-	    if (texUnit->Combine.SourceRGB[s] == source)
-	       return;
-            if (source == GL_TEXTURE ||
-                source == GL_CONSTANT ||
-                source == GL_PRIMARY_COLOR ||
-                source == GL_PREVIOUS ||
-                (ctx->Extensions.ARB_texture_env_crossbar &&
-                 source >= GL_TEXTURE0 &&
-                 source < GL_TEXTURE0 + ctx->Const.MaxTextureUnits) ||
-                (ctx->Extensions.ATI_texture_env_combine3 &&
-                 (source == GL_ZERO || source == GL_ONE))) {
-               /* legal */
-	       FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-	       texUnit->Combine.SourceRGB[s] = source;
-            }
-            else {
-               TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", source);
-	       return;
-	    }
-	 }
-	 else {
-            TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
-	    return;
-	 }
-	 break;
       case GL_SOURCE0_ALPHA:
       case GL_SOURCE1_ALPHA:
       case GL_SOURCE2_ALPHA:
-	 if (ctx->Extensions.EXT_texture_env_combine ||
-             ctx->Extensions.ARB_texture_env_combine) {
-	    const GLenum source = (GLenum) (GLint) *param;
-	    const GLuint s = pname - GL_SOURCE0_ALPHA;
-	    if (texUnit->Combine.SourceA[s] == source)
-	       return;
-            if (source == GL_TEXTURE ||
-                source == GL_CONSTANT ||
-                source == GL_PRIMARY_COLOR ||
-                source == GL_PREVIOUS ||
-                (ctx->Extensions.ARB_texture_env_crossbar &&
-                 source >= GL_TEXTURE0 &&
-                 source < GL_TEXTURE0 + ctx->Const.MaxTextureUnits) ||
-		(ctx->Extensions.ATI_texture_env_combine3 &&
-                 (source == GL_ZERO || source == GL_ONE))) {
-               /* legal */
-	       FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-	       texUnit->Combine.SourceA[s] = source;
-            }
-            else {
-               TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", source);
-	       return;
-	    }
-	 }
-	 else {
-            TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
-	    return;
-	 }
+         set_combiner_source(ctx, texUnit, pname, (GLenum) (GLint) param[0]);
 	 break;
       case GL_OPERAND0_RGB:
       case GL_OPERAND1_RGB:
-	 if (ctx->Extensions.EXT_texture_env_combine ||
-	     ctx->Extensions.ARB_texture_env_combine) {
-	    const GLenum operand = (GLenum) (GLint) *param;
-	    const GLuint s = pname - GL_OPERAND0_RGB;
-	    if (texUnit->Combine.OperandRGB[s] == operand)
-	       return;
-	    switch (operand) {
-	    case GL_SRC_COLOR:
-	    case GL_ONE_MINUS_SRC_COLOR:
-	    case GL_SRC_ALPHA:
-	    case GL_ONE_MINUS_SRC_ALPHA:
-	       FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-	       texUnit->Combine.OperandRGB[s] = operand;
-	       break;
-	    default:
-               TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", operand);
-	       return;
-	    }
-	 }
-	 else {
-            TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
-	    return;
-	 }
-	 break;
+      case GL_OPERAND2_RGB:
       case GL_OPERAND0_ALPHA:
       case GL_OPERAND1_ALPHA:
-	 if (ctx->Extensions.EXT_texture_env_combine ||
-             ctx->Extensions.ARB_texture_env_combine) {
-	    const GLenum operand = (GLenum) (GLint) *param;
-	    if (texUnit->Combine.OperandA[pname-GL_OPERAND0_ALPHA] == operand)
-	       return;
-	    switch (operand) {
-	    case GL_SRC_ALPHA:
-	    case GL_ONE_MINUS_SRC_ALPHA:
-	       FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-	       texUnit->Combine.OperandA[pname-GL_OPERAND0_ALPHA] = operand;
-	       break;
-	    default:
-               TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", operand);
-	       return;
-	    }
-	 }
-	 else {
-            TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
-	    return;
-	 }
-	 break;
-      case GL_OPERAND2_RGB:
-	 if (ctx->Extensions.ARB_texture_env_combine) {
-	    const GLenum operand = (GLenum) (GLint) *param;
-	    if (texUnit->Combine.OperandRGB[2] == operand)
-	       return;
-	    switch (operand) {
-	    case GL_SRC_COLOR:           /* ARB combine only */
-	    case GL_ONE_MINUS_SRC_COLOR: /* ARB combine only */
-	    case GL_SRC_ALPHA:
-	    case GL_ONE_MINUS_SRC_ALPHA: /* ARB combine only */
-	       FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-	       texUnit->Combine.OperandRGB[2] = operand;
-               break;
-	    default:
-               TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", operand);
-	       return;
-	    }
-	 }
-	 else if (ctx->Extensions.EXT_texture_env_combine) {
-	    const GLenum operand = (GLenum) (GLint) *param;
-	    if (texUnit->Combine.OperandRGB[2] == operand)
-	       return;
-	    /* operand must be GL_SRC_ALPHA which is the initial value - thus
-	       don't need to actually compare the operand to the possible value */
-	    else {
-               TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", operand);
-	       return;
-	    }
-	 }
-	 else {
-            TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
-	    return;
-	 }
-	 break;
       case GL_OPERAND2_ALPHA:
-	 if (ctx->Extensions.ARB_texture_env_combine) {
-	    const GLenum operand = (GLenum) (GLint) *param;
-	    if (texUnit->Combine.OperandA[2] == operand)
-	       return;
-	    switch (operand) {
-	    case GL_SRC_ALPHA:
-	    case GL_ONE_MINUS_SRC_ALPHA: /* ARB combine only */
-	       FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-	       texUnit->Combine.OperandA[2] = operand;
-	       break;
-	    default:
-               TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", operand);
-	       return;
-	    }
-	 }
-	 else if (ctx->Extensions.EXT_texture_env_combine) {
-	    const GLenum operand = (GLenum) (GLint) *param;
-	    if (texUnit->Combine.OperandA[2] == operand)
-	       return;
-	    /* operand must be GL_SRC_ALPHA which is the initial value - thus
-	       don't need to actually compare the operand to the possible value */
-	    else {
-               TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", operand);
-	       return;
-	    }
-	 }
-	 else {
-            TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
-	    return;
-	 }
+         set_combiner_operand(ctx, texUnit, pname, (GLenum) (GLint) param[0]);
 	 break;
       case GL_RGB_SCALE:
-	 if (ctx->Extensions.EXT_texture_env_combine ||
-             ctx->Extensions.ARB_texture_env_combine) {
-	    GLuint newshift;
-	    if (*param == 1.0) {
-	       newshift = 0;
-	    }
-	    else if (*param == 2.0) {
-	       newshift = 1;
-	    }
-	    else if (*param == 4.0) {
-	       newshift = 2;
-	    }
-	    else {
-	       _mesa_error( ctx, GL_INVALID_VALUE,
-                            "glTexEnv(GL_RGB_SCALE not 1, 2 or 4)" );
-	       return;
-	    }
-	    if (texUnit->Combine.ScaleShiftRGB == newshift)
-	       return;
-	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-	    texUnit->Combine.ScaleShiftRGB = newshift;
-	 }
-	 else {
-            TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
-	    return;
-	 }
-	 break;
       case GL_ALPHA_SCALE:
-	 if (ctx->Extensions.EXT_texture_env_combine ||
-             ctx->Extensions.ARB_texture_env_combine) {
-	    GLuint newshift;
-	    if (*param == 1.0) {
-	       newshift = 0;
-	    }
-	    else if (*param == 2.0) {
-	       newshift = 1;
-	    }
-	    else if (*param == 4.0) {
-	       newshift = 2;
-	    }
-	    else {
-	       _mesa_error( ctx, GL_INVALID_VALUE,
-                            "glTexEnv(GL_ALPHA_SCALE not 1, 2 or 4)" );
-	       return;
-	    }
-	    if (texUnit->Combine.ScaleShiftA == newshift)
-	       return;
-	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-	    texUnit->Combine.ScaleShiftA = newshift;
-	 }
-	 else {
-            TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
-	    return;
-	 }
+         set_combiner_scale(ctx, texUnit, pname, param[0]);
 	 break;
       default:
 	 _mesa_error( ctx, GL_INVALID_ENUM, "glTexEnv(pname)" );
-- 
cgit v1.2.3


From ad338c14c2aca87199da7ec1ae08ceb5062a9954 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 23 Jan 2009 14:15:45 -0700
Subject: mesa: consolidate glGetTexEnvi/f() code with new get_texenvi() helper

---
 src/mesa/main/texenv.c | 339 ++++++++++++++++++-------------------------------
 1 file changed, 125 insertions(+), 214 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenv.c b/src/mesa/main/texenv.c
index 2f38ee8852..d94bd9f313 100644
--- a/src/mesa/main/texenv.c
+++ b/src/mesa/main/texenv.c
@@ -558,6 +558,112 @@ _mesa_TexEnviv( GLenum target, GLenum pname, const GLint *param )
 }
 
 
+
+/**
+ * Helper for glGetTexEnvi/f()
+ * \return  value of queried pname or -1 if error.
+ */
+static GLint
+get_texenvi(GLcontext *ctx, const struct gl_texture_unit *texUnit,
+            GLenum pname)
+{
+   switch (pname) {
+   case GL_TEXTURE_ENV_MODE:
+      return texUnit->EnvMode;
+      break;
+   case GL_COMBINE_RGB:
+      if (ctx->Extensions.EXT_texture_env_combine ||
+          ctx->Extensions.ARB_texture_env_combine) {
+         return texUnit->Combine.ModeRGB;
+      }
+      else {
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
+      }
+      break;
+   case GL_COMBINE_ALPHA:
+      if (ctx->Extensions.EXT_texture_env_combine ||
+          ctx->Extensions.ARB_texture_env_combine) {
+         return texUnit->Combine.ModeA;
+      }
+      else {
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
+      }
+      break;
+   case GL_SOURCE0_RGB:
+   case GL_SOURCE1_RGB:
+   case GL_SOURCE2_RGB:
+      if (ctx->Extensions.EXT_texture_env_combine ||
+          ctx->Extensions.ARB_texture_env_combine) {
+         const unsigned rgb_idx = pname - GL_SOURCE0_RGB;
+         return texUnit->Combine.SourceRGB[rgb_idx];
+      }
+      else {
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
+      }
+      break;
+   case GL_SOURCE0_ALPHA:
+   case GL_SOURCE1_ALPHA:
+   case GL_SOURCE2_ALPHA:
+      if (ctx->Extensions.EXT_texture_env_combine ||
+          ctx->Extensions.ARB_texture_env_combine) {
+         const unsigned alpha_idx = pname - GL_SOURCE0_ALPHA;
+         return texUnit->Combine.SourceA[alpha_idx];
+      }
+      else {
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
+      }
+      break;
+   case GL_OPERAND0_RGB:
+   case GL_OPERAND1_RGB:
+   case GL_OPERAND2_RGB:
+      if (ctx->Extensions.EXT_texture_env_combine ||
+          ctx->Extensions.ARB_texture_env_combine) {
+         const unsigned op_rgb = pname - GL_OPERAND0_RGB;
+         return texUnit->Combine.OperandRGB[op_rgb];
+      }
+      else {
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
+      }
+      break;
+   case GL_OPERAND0_ALPHA:
+   case GL_OPERAND1_ALPHA:
+   case GL_OPERAND2_ALPHA:
+      if (ctx->Extensions.EXT_texture_env_combine ||
+          ctx->Extensions.ARB_texture_env_combine) {
+         const unsigned op_alpha = pname - GL_OPERAND0_ALPHA;
+         return texUnit->Combine.OperandA[op_alpha];
+      }
+      else {
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
+      }
+      break;
+   case GL_RGB_SCALE:
+      if (ctx->Extensions.EXT_texture_env_combine ||
+          ctx->Extensions.ARB_texture_env_combine) {
+         return 1 << texUnit->Combine.ScaleShiftRGB;
+      }
+      else {
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
+      }
+      break;
+   case GL_ALPHA_SCALE:
+      if (ctx->Extensions.EXT_texture_env_combine ||
+          ctx->Extensions.ARB_texture_env_combine) {
+         return 1 << texUnit->Combine.ScaleShiftA;
+      }
+      else {
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
+      }
+      break;
+   default:
+      ;
+   }
+
+   return -1; /* error */
+}
+
+
+
 void GLAPIENTRY
 _mesa_GetTexEnvfv( GLenum target, GLenum pname, GLfloat *params )
 {
@@ -576,111 +682,14 @@ _mesa_GetTexEnvfv( GLenum target, GLenum pname, GLfloat *params )
    texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
 
    if (target == GL_TEXTURE_ENV) {
-      switch (pname) {
-         case GL_TEXTURE_ENV_MODE:
-            *params = ENUM_TO_FLOAT(texUnit->EnvMode);
-            break;
-         case GL_TEXTURE_ENV_COLOR:
-            COPY_4FV( params, texUnit->EnvColor );
-            break;
-         case GL_COMBINE_RGB:
-            if (ctx->Extensions.EXT_texture_env_combine ||
-                ctx->Extensions.ARB_texture_env_combine) {
-               *params = (GLfloat) texUnit->Combine.ModeRGB;
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
-            }
-            break;
-         case GL_COMBINE_ALPHA:
-            if (ctx->Extensions.EXT_texture_env_combine ||
-                ctx->Extensions.ARB_texture_env_combine) {
-               *params = (GLfloat) texUnit->Combine.ModeA;
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
-            }
-            break;
-         case GL_SOURCE0_RGB:
-         case GL_SOURCE1_RGB:
-         case GL_SOURCE2_RGB:
-            if (ctx->Extensions.EXT_texture_env_combine ||
-                ctx->Extensions.ARB_texture_env_combine) {
-	       const unsigned rgb_idx = pname - GL_SOURCE0_RGB;
-               *params = (GLfloat) texUnit->Combine.SourceRGB[rgb_idx];
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
-            }
-            break;
-         case GL_SOURCE0_ALPHA:
-         case GL_SOURCE1_ALPHA:
-         case GL_SOURCE2_ALPHA:
-            if (ctx->Extensions.EXT_texture_env_combine ||
-                ctx->Extensions.ARB_texture_env_combine) {
-	       const unsigned alpha_idx = pname - GL_SOURCE0_ALPHA;
-               *params = (GLfloat) texUnit->Combine.SourceA[alpha_idx];
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
-            }
-            break;
-         case GL_OPERAND0_RGB:
-         case GL_OPERAND1_RGB:
-         case GL_OPERAND2_RGB:
-            if (ctx->Extensions.EXT_texture_env_combine ||
-                ctx->Extensions.ARB_texture_env_combine) {
-	       const unsigned op_rgb = pname - GL_OPERAND0_RGB;
-               *params = (GLfloat) texUnit->Combine.OperandRGB[op_rgb];
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
-            }
-            break;
-         case GL_OPERAND0_ALPHA:
-         case GL_OPERAND1_ALPHA:
-         case GL_OPERAND2_ALPHA:
-            if (ctx->Extensions.EXT_texture_env_combine ||
-                ctx->Extensions.ARB_texture_env_combine) {
-	       const unsigned op_alpha = pname - GL_OPERAND0_ALPHA;
-               *params = (GLfloat) texUnit->Combine.OperandA[op_alpha];
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
-            }
-            break;
-         case GL_RGB_SCALE:
-            if (ctx->Extensions.EXT_texture_env_combine ||
-                ctx->Extensions.ARB_texture_env_combine) {
-               if (texUnit->Combine.ScaleShiftRGB == 0)
-                  *params = 1.0;
-               else if (texUnit->Combine.ScaleShiftRGB == 1)
-                  *params = 2.0;
-               else
-                  *params = 4.0;
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
-               return;
-            }
-            break;
-         case GL_ALPHA_SCALE:
-            if (ctx->Extensions.EXT_texture_env_combine ||
-                ctx->Extensions.ARB_texture_env_combine) {
-               if (texUnit->Combine.ScaleShiftA == 0)
-                  *params = 1.0;
-               else if (texUnit->Combine.ScaleShiftA == 1)
-                  *params = 2.0;
-               else
-                  *params = 4.0;
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
-               return;
-            }
-            break;
-         default:
-            _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname=0x%x)", pname);
+      if (pname == GL_TEXTURE_ENV_COLOR) {
+         COPY_4FV( params, texUnit->EnvColor );
+      }
+      else {
+         GLint val = get_texenvi(ctx, texUnit, pname);
+         if (val >= 0) {
+            *params = (GLfloat) val;
+         }
       }
    }
    else if (target == GL_TEXTURE_FILTER_CONTROL_EXT) {
@@ -737,115 +746,17 @@ _mesa_GetTexEnviv( GLenum target, GLenum pname, GLint *params )
    texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
 
    if (target == GL_TEXTURE_ENV) {
-      switch (pname) {
-         case GL_TEXTURE_ENV_MODE:
-            *params = (GLint) texUnit->EnvMode;
-            break;
-         case GL_TEXTURE_ENV_COLOR:
-            params[0] = FLOAT_TO_INT( texUnit->EnvColor[0] );
-            params[1] = FLOAT_TO_INT( texUnit->EnvColor[1] );
-            params[2] = FLOAT_TO_INT( texUnit->EnvColor[2] );
-            params[3] = FLOAT_TO_INT( texUnit->EnvColor[3] );
-            break;
-         case GL_COMBINE_RGB:
-            if (ctx->Extensions.EXT_texture_env_combine ||
-                ctx->Extensions.ARB_texture_env_combine) {
-               *params = (GLint) texUnit->Combine.ModeRGB;
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)");
-            }
-            break;
-         case GL_COMBINE_ALPHA:
-            if (ctx->Extensions.EXT_texture_env_combine ||
-                ctx->Extensions.ARB_texture_env_combine) {
-               *params = (GLint) texUnit->Combine.ModeA;
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)");
-            }
-            break;
-         case GL_SOURCE0_RGB:
-         case GL_SOURCE1_RGB:
-         case GL_SOURCE2_RGB:
-            if (ctx->Extensions.EXT_texture_env_combine ||
-                ctx->Extensions.ARB_texture_env_combine) {
-	       const unsigned rgb_idx = pname - GL_SOURCE0_RGB;
-               *params = (GLint) texUnit->Combine.SourceRGB[rgb_idx];
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)");
-            }
-            break;
-         case GL_SOURCE0_ALPHA:
-         case GL_SOURCE1_ALPHA:
-         case GL_SOURCE2_ALPHA:
-            if (ctx->Extensions.EXT_texture_env_combine ||
-                ctx->Extensions.ARB_texture_env_combine) {
-	       const unsigned alpha_idx = pname - GL_SOURCE0_ALPHA;
-               *params = (GLint) texUnit->Combine.SourceA[alpha_idx];
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)");
-            }
-            break;
-         case GL_OPERAND0_RGB:
-         case GL_OPERAND1_RGB:
-         case GL_OPERAND2_RGB:
-            if (ctx->Extensions.EXT_texture_env_combine ||
-                ctx->Extensions.ARB_texture_env_combine) {
-	       const unsigned op_rgb = pname - GL_OPERAND0_RGB;
-               *params = (GLint) texUnit->Combine.OperandRGB[op_rgb];
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)");
-            }
-            break;
-         case GL_OPERAND0_ALPHA:
-         case GL_OPERAND1_ALPHA:
-         case GL_OPERAND2_ALPHA:
-            if (ctx->Extensions.EXT_texture_env_combine ||
-                ctx->Extensions.ARB_texture_env_combine) {
-	       const unsigned op_alpha = pname - GL_OPERAND0_ALPHA;
-               *params = (GLint) texUnit->Combine.OperandA[op_alpha];
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)");
-            }
-            break;
-         case GL_RGB_SCALE:
-            if (ctx->Extensions.EXT_texture_env_combine ||
-                ctx->Extensions.ARB_texture_env_combine) {
-               if (texUnit->Combine.ScaleShiftRGB == 0)
-                  *params = 1;
-               else if (texUnit->Combine.ScaleShiftRGB == 1)
-                  *params = 2;
-               else
-                  *params = 4;
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)");
-               return;
-            }
-            break;
-         case GL_ALPHA_SCALE:
-            if (ctx->Extensions.EXT_texture_env_combine ||
-                ctx->Extensions.ARB_texture_env_combine) {
-               if (texUnit->Combine.ScaleShiftA == 0)
-                  *params = 1;
-               else if (texUnit->Combine.ScaleShiftA == 1)
-                  *params = 2;
-               else
-                  *params = 4;
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)");
-               return;
-            }
-            break;
-         default:
-            _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname=0x%x)",
-                        pname);
+      if (pname == GL_TEXTURE_ENV_COLOR) {
+         params[0] = FLOAT_TO_INT( texUnit->EnvColor[0] );
+         params[1] = FLOAT_TO_INT( texUnit->EnvColor[1] );
+         params[2] = FLOAT_TO_INT( texUnit->EnvColor[2] );
+         params[3] = FLOAT_TO_INT( texUnit->EnvColor[3] );
+      }
+      else {
+         GLint val = get_texenvi(ctx, texUnit, pname);
+         if (val >= 0) {
+            *params = val;
+         }
       }
    }
    else if (target == GL_TEXTURE_FILTER_CONTROL_EXT) {
-- 
cgit v1.2.3


From f5d3027c0a03e26fe90efc067766c996dea05948 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 23 Jan 2009 17:29:26 -0700
Subject: mesa: initial changes for GL_NV_texture_env_combine4

---
 src/mesa/main/extensions.c |  1 +
 src/mesa/main/mtypes.h     | 18 ++++++++----------
 2 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 43c9d4a788..42de564547 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -155,6 +155,7 @@ static const struct {
    { OFF, "GL_NV_fragment_program",            F(NV_fragment_program) },
    { ON,  "GL_NV_light_max_exponent",          F(NV_light_max_exponent) },
    { OFF, "GL_NV_point_sprite",                F(NV_point_sprite) },
+   { OFF, "GL_NV_texture_env_combine4",        F(NV_texture_env_combine4) },
    { OFF, "GL_NV_texture_rectangle",           F(NV_texture_rectangle) },
    { ON,  "GL_NV_texgen_reflection",           F(NV_texgen_reflection) },
    { OFF, "GL_NV_vertex_program",              F(NV_vertex_program) },
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 39c988f3c8..b09c5910f8 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1468,23 +1468,20 @@ struct gl_texture_object
 
 /**
  * Texture combine environment state.
- * 
- * \todo
- * If GL_NV_texture_env_combine4 is ever supported, the arrays in this
- * structure will need to be expanded for 4 elements.
+ * Up to four combiner sources are possible with GL_NV_texture_env_combine4.
  */
 struct gl_tex_env_combine_state
 {
    GLenum ModeRGB;       /**< GL_REPLACE, GL_DECAL, GL_ADD, etc. */
    GLenum ModeA;         /**< GL_REPLACE, GL_DECAL, GL_ADD, etc. */
-   GLenum SourceRGB[3];  /**< GL_PRIMARY_COLOR, GL_TEXTURE, etc. */
-   GLenum SourceA[3];    /**< GL_PRIMARY_COLOR, GL_TEXTURE, etc. */
-   GLenum OperandRGB[3]; /**< SRC_COLOR, ONE_MINUS_SRC_COLOR, etc */
-   GLenum OperandA[3];   /**< SRC_ALPHA, ONE_MINUS_SRC_ALPHA, etc */
+   GLenum SourceRGB[4];  /**< GL_PRIMARY_COLOR, GL_TEXTURE, etc. */
+   GLenum SourceA[4];    /**< GL_PRIMARY_COLOR, GL_TEXTURE, etc. */
+   GLenum OperandRGB[4]; /**< SRC_COLOR, ONE_MINUS_SRC_COLOR, etc */
+   GLenum OperandA[4];   /**< SRC_ALPHA, ONE_MINUS_SRC_ALPHA, etc */
    GLuint ScaleShiftRGB; /**< 0, 1 or 2 */
    GLuint ScaleShiftA;   /**< 0, 1 or 2 */
-   GLuint _NumArgsRGB;   /**< Number of inputs used for the combine mode. */
-   GLuint _NumArgsA;     /**< Number of inputs used for the combine mode. */
+   GLuint _NumArgsRGB;   /**< Number of inputs used for the RGB combiner */
+   GLuint _NumArgsA;     /**< Number of inputs used for the A combiner */
 };
 
 
@@ -2649,6 +2646,7 @@ struct gl_extensions
    GLboolean NV_light_max_exponent;
    GLboolean NV_point_sprite;
    GLboolean NV_texgen_reflection;
+   GLboolean NV_texture_env_combine4;
    GLboolean NV_texture_rectangle;
    GLboolean NV_vertex_program;
    GLboolean NV_vertex_program1_1;
-- 
cgit v1.2.3


From 08fbbdd4dceb8ca7ac15f0ce469f59e13e0ba82b Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 23 Jan 2009 17:30:03 -0700
Subject: mesa: update glTexEnv(), glGetTexEnv() for GL_NV_texture_env_combine4

---
 src/mesa/main/texenv.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 83 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenv.c b/src/mesa/main/texenv.c
index d94bd9f313..097923182a 100644
--- a/src/mesa/main/texenv.c
+++ b/src/mesa/main/texenv.c
@@ -206,6 +206,16 @@ set_combiner_source(GLcontext *ctx,
       src = 2;
       alpha = GL_FALSE;
       break;
+   case GL_SOURCE3_RGB_NV:
+      if (ctx->Extensions.NV_texture_env_combine4) {
+         src = 3;
+         alpha = GL_FALSE;
+      }
+      else {
+         TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
+         return;
+      }
+      break;
    case GL_SOURCE0_ALPHA:
       src = 0;
       alpha = GL_TRUE;
@@ -218,11 +228,23 @@ set_combiner_source(GLcontext *ctx,
       src = 2;
       alpha = GL_TRUE;
       break;
+   case GL_SOURCE3_ALPHA_NV:
+      if (ctx->Extensions.NV_texture_env_combine4) {
+         src = 3;
+         alpha = GL_TRUE;
+      }
+      else {
+         TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
+         return;
+      }
+      break;
    default:
       TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
       return;
    }
 
+   assert(src < 4);
+
    /*
     * Error-check param (the source term)
     */
@@ -245,6 +267,9 @@ set_combiner_source(GLcontext *ctx,
                param - GL_TEXTURE0 < ctx->Const.MaxTextureUnits);
       break;
    case GL_ZERO:
+      legal = (ctx->Extensions.ATI_texture_env_combine3 ||
+               ctx->Extensions.NV_texture_env_combine4);
+      break;
    case GL_ONE:
       legal = ctx->Extensions.ATI_texture_env_combine3;
       break;
@@ -259,7 +284,6 @@ set_combiner_source(GLcontext *ctx,
 
    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
 
-   assert(src < 4);
    if (alpha)
       texUnit->Combine.SourceA[src] = param;
    else
@@ -301,6 +325,16 @@ set_combiner_operand(GLcontext *ctx,
          return;
       }
       break;
+   case GL_OPERAND3_RGB_NV:
+      if (ctx->Extensions.NV_texture_env_combine4) {
+         op = 3;
+         alpha = GL_FALSE;
+      }
+      else {
+         TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
+         return;
+      }
+      break;
    case GL_OPERAND0_ALPHA:
       op = 0;
       alpha = GL_TRUE;
@@ -319,11 +353,23 @@ set_combiner_operand(GLcontext *ctx,
          return;
       }
       break;
+   case GL_OPERAND3_ALPHA_NV:
+      if (ctx->Extensions.NV_texture_env_combine4) {
+         op = 3;
+         alpha = GL_TRUE;
+      }
+      else {
+         TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
+         return;
+      }
+      break;
    default:
       TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
       return;
    }
 
+   assert(op < 4);
+
    /*
     * Error-check param (the source operand)
     */
@@ -397,7 +443,6 @@ set_combiner_scale(GLcontext *ctx,
       break;
    default:
       TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
-      return;
    }
 }
 
@@ -435,17 +480,21 @@ _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
       case GL_SOURCE0_RGB:
       case GL_SOURCE1_RGB:
       case GL_SOURCE2_RGB:
+      case GL_SOURCE3_RGB_NV:
       case GL_SOURCE0_ALPHA:
       case GL_SOURCE1_ALPHA:
       case GL_SOURCE2_ALPHA:
+      case GL_SOURCE3_ALPHA_NV:
          set_combiner_source(ctx, texUnit, pname, (GLenum) (GLint) param[0]);
 	 break;
       case GL_OPERAND0_RGB:
       case GL_OPERAND1_RGB:
       case GL_OPERAND2_RGB:
+      case GL_OPERAND3_RGB_NV:
       case GL_OPERAND0_ALPHA:
       case GL_OPERAND1_ALPHA:
       case GL_OPERAND2_ALPHA:
+      case GL_OPERAND3_ALPHA_NV:
          set_combiner_operand(ctx, texUnit, pname, (GLenum) (GLint) param[0]);
 	 break;
       case GL_RGB_SCALE:
@@ -601,6 +650,14 @@ get_texenvi(GLcontext *ctx, const struct gl_texture_unit *texUnit,
          _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
       }
       break;
+   case GL_SOURCE3_RGB_NV:
+      if (ctx->Extensions.NV_texture_env_combine4) {
+         return texUnit->Combine.SourceRGB[3];
+      }
+      else {
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
+      }
+      break;
    case GL_SOURCE0_ALPHA:
    case GL_SOURCE1_ALPHA:
    case GL_SOURCE2_ALPHA:
@@ -613,6 +670,14 @@ get_texenvi(GLcontext *ctx, const struct gl_texture_unit *texUnit,
          _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
       }
       break;
+   case GL_SOURCE3_ALPHA_NV:
+      if (ctx->Extensions.NV_texture_env_combine4) {
+         return texUnit->Combine.SourceA[3];
+      }
+      else {
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
+      }
+      break;
    case GL_OPERAND0_RGB:
    case GL_OPERAND1_RGB:
    case GL_OPERAND2_RGB:
@@ -625,6 +690,14 @@ get_texenvi(GLcontext *ctx, const struct gl_texture_unit *texUnit,
          _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
       }
       break;
+   case GL_OPERAND3_RGB_NV:
+      if (ctx->Extensions.NV_texture_env_combine4) {
+         return texUnit->Combine.OperandRGB[3];
+      }
+      else {
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
+      }
+      break;
    case GL_OPERAND0_ALPHA:
    case GL_OPERAND1_ALPHA:
    case GL_OPERAND2_ALPHA:
@@ -637,6 +710,14 @@ get_texenvi(GLcontext *ctx, const struct gl_texture_unit *texUnit,
          _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
       }
       break;
+   case GL_OPERAND3_ALPHA_NV:
+      if (ctx->Extensions.NV_texture_env_combine4) {
+         return texUnit->Combine.OperandA[3];
+      }
+      else {
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
+      }
+      break;
    case GL_RGB_SCALE:
       if (ctx->Extensions.EXT_texture_env_combine ||
           ctx->Extensions.ARB_texture_env_combine) {
-- 
cgit v1.2.3


From e082314cab42f43b0438603a282f01920004e6f0 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 23 Jan 2009 17:30:33 -0700
Subject: mesa: update state setup/validation for GL_NV_texture_env_combine4

---
 src/mesa/main/texstate.c | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 9bfb7e0ec2..7cddec0bce 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -53,10 +53,10 @@
  */
 static const struct gl_tex_env_combine_state default_combine_state = {
    GL_MODULATE, GL_MODULATE,
-   { GL_TEXTURE, GL_PREVIOUS, GL_CONSTANT },
-   { GL_TEXTURE, GL_PREVIOUS, GL_CONSTANT },
-   { GL_SRC_COLOR, GL_SRC_COLOR, GL_SRC_ALPHA },
-   { GL_SRC_ALPHA, GL_SRC_ALPHA, GL_SRC_ALPHA },
+   { GL_TEXTURE, GL_PREVIOUS, GL_CONSTANT, GL_CONSTANT },
+   { GL_TEXTURE, GL_PREVIOUS, GL_CONSTANT, GL_CONSTANT },
+   { GL_SRC_COLOR, GL_SRC_COLOR, GL_SRC_ALPHA, GL_SRC_ALPHA },
+   { GL_SRC_ALPHA, GL_SRC_ALPHA, GL_SRC_ALPHA, GL_SRC_ALPHA },
    0, 0,
    2, 2
 };
@@ -551,7 +551,8 @@ update_texture_state( GLcontext *ctx )
       if (texUnit->_ReallyEnabled)
          ctx->Texture._EnabledUnits |= (1 << unit);
 
-      if (texUnit->EnvMode == GL_COMBINE) {
+      if (texUnit->EnvMode == GL_COMBINE ||
+          texUnit->EnvMode == GL_COMBINE4_NV) {
 	 texUnit->_CurrentCombine = & texUnit->Combine;
       }
       else {
@@ -572,9 +573,14 @@ update_texture_state( GLcontext *ctx )
       case GL_REPLACE:
 	 texUnit->_CurrentCombine->_NumArgsRGB = 1;
 	 break;
-      case GL_MODULATE:
       case GL_ADD:
       case GL_ADD_SIGNED:
+         if (texUnit->EnvMode == GL_COMBINE4_NV)
+            texUnit->_CurrentCombine->_NumArgsRGB = 4;
+         else
+            texUnit->_CurrentCombine->_NumArgsRGB = 2;
+         break;
+      case GL_MODULATE:
       case GL_SUBTRACT:
       case GL_DOT3_RGB:
       case GL_DOT3_RGBA:
@@ -598,9 +604,14 @@ update_texture_state( GLcontext *ctx )
       case GL_REPLACE:
 	 texUnit->_CurrentCombine->_NumArgsA = 1;
 	 break;
-      case GL_MODULATE:
       case GL_ADD:
       case GL_ADD_SIGNED:
+         if (texUnit->EnvMode == GL_COMBINE4_NV)
+            texUnit->_CurrentCombine->_NumArgsA = 4;
+         else
+            texUnit->_CurrentCombine->_NumArgsA = 2;
+         break;
+      case GL_MODULATE:
       case GL_SUBTRACT:
 	 texUnit->_CurrentCombine->_NumArgsA = 2;
 	 break;
-- 
cgit v1.2.3


From 6947f85cb5fbc433ba7763530285e470745b009b Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 23 Jan 2009 17:32:09 -0700
Subject: mesa: updated fragment shader codegen for GL_NV_texture_env_combine4

Expand struct fields, increase loops and handle new 4-term ADD modes.
Plus, some new assertions to catch switch/default cases that may be incorrect.
---
 src/mesa/main/texenvprogram.c | 121 +++++++++++++++++++++++++++++++-----------
 1 file changed, 90 insertions(+), 31 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 6a57d50193..066f3bd0be 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -2,6 +2,7 @@
  * 
  * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
  * All Rights Reserved.
+ * Copyright 2009 VMware, Inc.  All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the
@@ -38,6 +39,9 @@
 #include "texenvprogram.h"
 
 
+#define MAX_TERMS 4
+
+
 /*
  * Note on texture units:
  *
@@ -89,13 +93,13 @@ struct state_key {
       GLuint ScaleShiftRGB:2;
       GLuint ScaleShiftA:2;
 
-      GLuint NumArgsRGB:2;
+      GLuint NumArgsRGB:3;
       GLuint ModeRGB:4;
-      struct mode_opt OptRGB[3];
+      struct mode_opt OptRGB[MAX_TERMS];
 
-      GLuint NumArgsA:2;
+      GLuint NumArgsA:3;
       GLuint ModeA:4;
-      struct mode_opt OptA[3];
+      struct mode_opt OptA[MAX_TERMS];
    } unit[8];
 };
 
@@ -131,7 +135,9 @@ static GLuint translate_operand( GLenum operand )
    case GL_ONE_MINUS_SRC_ALPHA: return OPR_ONE_MINUS_SRC_ALPHA;
    case GL_ZERO: return OPR_ZERO;
    case GL_ONE: return OPR_ONE;
-   default:	return OPR_UNKNOWN;
+   default:
+      assert(0);
+      return OPR_UNKNOWN;
    }
 }
 
@@ -147,6 +153,7 @@ static GLuint translate_operand( GLenum operand )
 #define SRC_CONSTANT 9
 #define SRC_PRIMARY_COLOR 10
 #define SRC_PREVIOUS 11
+#define SRC_ZERO     12
 #define SRC_UNKNOWN  15
 
 static GLuint translate_source( GLenum src )
@@ -164,32 +171,49 @@ static GLuint translate_source( GLenum src )
    case GL_CONSTANT: return SRC_CONSTANT;
    case GL_PRIMARY_COLOR: return SRC_PRIMARY_COLOR;
    case GL_PREVIOUS: return SRC_PREVIOUS;
-   default: return SRC_UNKNOWN;
+   case GL_ZERO:
+      return SRC_ZERO;
+   default:
+      assert(0);
+      return SRC_UNKNOWN;
    }
 }
 
-#define MODE_REPLACE       0
-#define MODE_MODULATE      1
-#define MODE_ADD           2
-#define MODE_ADD_SIGNED    3
-#define MODE_INTERPOLATE   4
-#define MODE_SUBTRACT      5
-#define MODE_DOT3_RGB      6
-#define MODE_DOT3_RGB_EXT  7
-#define MODE_DOT3_RGBA     8
-#define MODE_DOT3_RGBA_EXT 9
-#define MODE_MODULATE_ADD_ATI           10
-#define MODE_MODULATE_SIGNED_ADD_ATI    11
-#define MODE_MODULATE_SUBTRACT_ATI      12
-#define MODE_UNKNOWN       15
-
-static GLuint translate_mode( GLenum mode )
+#define MODE_REPLACE                     0  /* r = a0 */
+#define MODE_MODULATE                    1  /* r = a0 * a1 */
+#define MODE_ADD                         2  /* r = a0 + a1 */
+#define MODE_ADD_SIGNED                  3  /* r = a0 + a1 - 0.5 */
+#define MODE_INTERPOLATE                 4  /* r = a0 * a2 + a1 * (1 - a2) */
+#define MODE_SUBTRACT                    5  /* r = a0 - a1 */
+#define MODE_DOT3_RGB                    6  /* r = a0 . a1 */
+#define MODE_DOT3_RGB_EXT                7  /* r = a0 . a1 */
+#define MODE_DOT3_RGBA                   8  /* r = a0 . a1 */
+#define MODE_DOT3_RGBA_EXT               9  /* r = a0 . a1 */
+#define MODE_MODULATE_ADD_ATI           10  /* r = a0 * a2 + a1 */
+#define MODE_MODULATE_SIGNED_ADD_ATI    11  /* r = a0 * a2 + a1 - 0.5 */
+#define MODE_MODULATE_SUBTRACT_ATI      12  /* r = a0 * a2 - a1 */
+#define MODE_ADD_PRODUCTS               13  /* r = a0 * a1 + a2 * a3 */
+#define MODE_ADD_PRODUCTS_SIGNED        14  /* r = a0 * a1 + a2 * a3 - 0.5 */
+#define MODE_UNKNOWN                    15
+
+/**
+ * Translate GL combiner state into a MODE_x value
+ */
+static GLuint translate_mode( GLenum envMode, GLenum mode )
 {
    switch (mode) {
    case GL_REPLACE: return MODE_REPLACE;
    case GL_MODULATE: return MODE_MODULATE;
-   case GL_ADD: return MODE_ADD;
-   case GL_ADD_SIGNED: return MODE_ADD_SIGNED;
+   case GL_ADD:
+      if (envMode == GL_COMBINE4_NV)
+         return MODE_ADD_PRODUCTS;
+      else
+         return MODE_ADD;
+   case GL_ADD_SIGNED:
+      if (envMode == GL_COMBINE4_NV)
+         return MODE_ADD_PRODUCTS_SIGNED;
+      else
+         return MODE_ADD_SIGNED;
    case GL_INTERPOLATE: return MODE_INTERPOLATE;
    case GL_SUBTRACT: return MODE_SUBTRACT;
    case GL_DOT3_RGB: return MODE_DOT3_RGB;
@@ -199,7 +223,9 @@ static GLuint translate_mode( GLenum mode )
    case GL_MODULATE_ADD_ATI: return MODE_MODULATE_ADD_ATI;
    case GL_MODULATE_SIGNED_ADD_ATI: return MODE_MODULATE_SIGNED_ADD_ATI;
    case GL_MODULATE_SUBTRACT_ATI: return MODE_MODULATE_SUBTRACT_ATI;
-   default: return MODE_UNKNOWN;
+   default:
+      assert(0);
+      return MODE_UNKNOWN;
    }
 }
 
@@ -212,7 +238,11 @@ static GLuint translate_tex_src_bit( GLbitfield bit )
    case TEXTURE_RECT_BIT: return TEXTURE_RECT_INDEX;
    case TEXTURE_3D_BIT:   return TEXTURE_3D_INDEX;
    case TEXTURE_CUBE_BIT: return TEXTURE_CUBE_INDEX;
-   default: return TEXTURE_UNKNOWN_INDEX;
+   case TEXTURE_1D_ARRAY_BIT: return TEXTURE_1D_ARRAY_INDEX;
+   case TEXTURE_2D_ARRAY_BIT: return TEXTURE_2D_ARRAY_INDEX;
+   default:
+      assert(0);
+      return TEXTURE_UNKNOWN_INDEX;
    }
 }
 
@@ -248,14 +278,14 @@ static void make_state_key( GLcontext *ctx,  struct state_key *key )
       key->unit[i].NumArgsA = texUnit->_CurrentCombine->_NumArgsA;
 
       key->unit[i].ModeRGB =
-	 translate_mode(texUnit->_CurrentCombine->ModeRGB);
+	 translate_mode(texUnit->EnvMode, texUnit->_CurrentCombine->ModeRGB);
       key->unit[i].ModeA =
-	 translate_mode(texUnit->_CurrentCombine->ModeA);
+	 translate_mode(texUnit->EnvMode, texUnit->_CurrentCombine->ModeA);
 		
       key->unit[i].ScaleShiftRGB = texUnit->_CurrentCombine->ScaleShiftRGB;
       key->unit[i].ScaleShiftA = texUnit->_CurrentCombine->ScaleShiftA;
 
-      for (j=0;j<3;j++) {
+      for (j = 0; j < MAX_TERMS; j++) {
          key->unit[i].OptRGB[j].Operand =
 	    translate_operand(texUnit->_CurrentCombine->OperandRGB[j]);
          key->unit[i].OptA[j].Operand =
@@ -677,12 +707,17 @@ static struct ureg get_source( struct texenv_fragment_program *p,
    case SRC_PRIMARY_COLOR:
       return register_input(p, FRAG_ATTRIB_COL0);
 
+   case SRC_ZERO:
+      return get_zero(p);
+
    case SRC_PREVIOUS:
-   default:
       if (is_undef(p->src_previous))
 	 return register_input(p, FRAG_ATTRIB_COL0);
       else
 	 return p->src_previous;
+
+   default:
+      assert(0);
    }
 }
 
@@ -723,7 +758,9 @@ static struct ureg emit_combine_source( struct texenv_fragment_program *p,
    case OPR_ONE:
       return get_one(p);
    case OPR_SRC_COLOR: 
+      return src;
    default:
+      assert(0);
       return src;
    }
 }
@@ -772,10 +809,12 @@ static struct ureg emit_combine( struct texenv_fragment_program *p,
 				 GLuint mode,
 				 const struct mode_opt *opt)
 {
-   struct ureg src[3];
+   struct ureg src[MAX_TERMS];
    struct ureg tmp, half;
    GLuint i;
 
+   assert(nr <= MAX_TERMS);
+
    tmp = undef; /* silence warning (bug 5318) */
 
    for (i = 0; i < nr; i++)
@@ -851,7 +890,26 @@ static struct ureg emit_combine( struct texenv_fragment_program *p,
       /* Arg0 * Arg2 - Arg1 */
       emit_arith( p, OPCODE_MAD, dest, mask, 0, src[0], src[2], negate(src[1]) );
       return dest;
+   case MODE_ADD_PRODUCTS:
+      /* Arg0 * Arg1 + Arg2 * Arg3 */
+      {
+         struct ureg tmp0 = get_temp(p);
+         emit_arith( p, OPCODE_MUL, tmp0, mask, 0, src[0], src[1], undef );
+         emit_arith( p, OPCODE_MAD, dest, mask, saturate, src[2], src[3], tmp0 );
+      }
+      return dest;
+   case MODE_ADD_PRODUCTS_SIGNED:
+      /* Arg0 * Arg1 + Arg2 * Arg3 - 0.5 */
+      {
+         struct ureg tmp0 = get_temp(p);
+         half = get_half(p);
+         emit_arith( p, OPCODE_MUL, tmp0, mask, 0, src[0], src[1], undef );
+         emit_arith( p, OPCODE_MAD, tmp0, mask, 0, src[2], src[3], tmp0 );
+         emit_arith( p, OPCODE_SUB, dest, mask, saturate, tmp0, half, undef );
+      }
+      return dest;
    default: 
+      assert(0);
       return src[0];
    }
 }
@@ -1007,6 +1065,7 @@ static GLboolean load_texenv_source( struct texenv_fragment_program *p,
       break;
       
    default:
+      /* not a texture src - do nothing */
       break;
    }
  
-- 
cgit v1.2.3


From d4757cd02aeebe1a3072f35b5134ad5e278e3a6f Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 23 Jan 2009 17:32:32 -0700
Subject: mesa: enable GL_NV_texture_env_combine4 for sw drivers

---
 src/mesa/main/extensions.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 42de564547..0b4cbec648 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -285,6 +285,7 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
    ctx->Extensions.NV_blend_square = GL_TRUE;
    /*ctx->Extensions.NV_light_max_exponent = GL_TRUE;*/
    ctx->Extensions.NV_point_sprite = GL_TRUE;
+   ctx->Extensions.NV_texture_env_combine4 = GL_TRUE;
    ctx->Extensions.NV_texture_rectangle = GL_TRUE;
    /*ctx->Extensions.NV_texgen_reflection = GL_TRUE;*/
 #if FEATURE_NV_vertex_program
-- 
cgit v1.2.3


From 523febe12ea2aa6992ed1161d962615a40a04eb6 Mon Sep 17 00:00:00 2001
From: Robert Ellison <papillo@tungstengraphics.com>
Date: Mon, 26 Jan 2009 10:22:34 -0700
Subject: mesa: add missing texture_put_row_rgb() function in texrender.c

The wrap_texture() function doesn't set the renderbuffer PutRowRGB() method,
which is used to implement DrawPixels().  This fix adds an implementation
of this method.
---
 src/mesa/main/texrender.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texrender.c b/src/mesa/main/texrender.c
index 4ae13a7b9b..49de6f5b8a 100644
--- a/src/mesa/main/texrender.c
+++ b/src/mesa/main/texrender.c
@@ -194,6 +194,59 @@ texture_put_row(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
    }
 }
 
+/**
+ * Put row of RGB values into a renderbuffer that wraps a texture image.
+ */
+static void
+texture_put_row_rgb(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+                GLint x, GLint y, const void *values, const GLubyte *mask)
+{
+   const struct texture_renderbuffer *trb
+      = (const struct texture_renderbuffer *) rb;
+   const GLint z = trb->Zoffset;
+   GLuint i;
+
+   y += trb->Yoffset;
+
+   if (rb->DataType == CHAN_TYPE) {
+      const GLchan *rgb = (const GLchan *) values;
+      for (i = 0; i < count; i++) {
+         if (!mask || mask[i]) {
+            trb->Store(trb->TexImage, x + i, y, z, rgb);
+         }
+         rgb += 3;
+      }
+   }
+   else if (rb->DataType == GL_UNSIGNED_SHORT) {
+      const GLushort *zValues = (const GLushort *) values;
+      for (i = 0; i < count; i++) {
+         if (!mask || mask[i]) {
+            trb->Store(trb->TexImage, x + i, y, z, zValues + i);
+         }
+      }
+   }
+   else if (rb->DataType == GL_UNSIGNED_INT) {
+      const GLuint *zValues = (const GLuint *) values;
+      for (i = 0; i < count; i++) {
+         if (!mask || mask[i]) {
+            trb->Store(trb->TexImage, x + i, y, z, zValues + i);
+         }
+      }
+   }
+   else if (rb->DataType == GL_UNSIGNED_INT_24_8_EXT) {
+      const GLuint *zValues = (const GLuint *) values;
+      for (i = 0; i < count; i++) {
+         if (!mask || mask[i]) {
+            GLfloat flt = (GLfloat) ((zValues[i] >> 8) * (1.0 / 0xffffff));
+            trb->Store(trb->TexImage, x + i, y, z, &flt);
+         }
+      }
+   }
+   else {
+      _mesa_problem(ctx, "invalid rb->DataType in texture_put_row");
+   }
+}
+
 
 static void
 texture_put_mono_row(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
@@ -380,6 +433,7 @@ wrap_texture(GLcontext *ctx, struct gl_renderbuffer_attachment *att)
    trb->Base.GetRow = texture_get_row;
    trb->Base.GetValues = texture_get_values;
    trb->Base.PutRow = texture_put_row;
+   trb->Base.PutRowRGB = texture_put_row_rgb;
    trb->Base.PutMonoRow = texture_put_mono_row;
    trb->Base.PutValues = texture_put_values;
    trb->Base.PutMonoValues = texture_put_mono_values;
-- 
cgit v1.2.3


From 38768dbc76f4963587a90823f73a1a2d981f63e6 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 27 Jan 2009 09:49:27 -0700
Subject: mesa: move call to _mesa_update_framebuffer_visual()

Update the visual info in the _mesa_test_framebuffer_completeness()
function when we've determined the FBO to be "complete".

Fixes regression seen in progs/demos/shadowtex.c
---
 src/mesa/main/fbobject.c    | 3 +++
 src/mesa/main/framebuffer.c | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index c16ac0f009..1a191cd288 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -630,6 +630,9 @@ _mesa_test_framebuffer_completeness(GLcontext *ctx, struct gl_framebuffer *fb)
        */
       fb->Width = minWidth;
       fb->Height = minHeight;
+
+      /* finally, update the visual info for the framebuffer */
+      _mesa_update_framebuffer_visual(fb);
    }
 }
 
diff --git a/src/mesa/main/framebuffer.c b/src/mesa/main/framebuffer.c
index 2d7e3b0503..52fd3c9d81 100644
--- a/src/mesa/main/framebuffer.c
+++ b/src/mesa/main/framebuffer.c
@@ -795,7 +795,6 @@ update_framebuffer(GLcontext *ctx, struct gl_framebuffer *fb)
        */
       if (fb->_Status != GL_FRAMEBUFFER_COMPLETE) {
          _mesa_test_framebuffer_completeness(ctx, fb);
-         _mesa_update_framebuffer_visual(fb);
       }
    }
 
-- 
cgit v1.2.3


From 318e53a4bf27499935c874f475af111ffaa71fdd Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 27 Jan 2009 11:07:21 -0700
Subject: mesa: refactor glTexParameter code

---
 src/mesa/main/texparam.c | 827 +++++++++++++++++++++++++++--------------------
 1 file changed, 480 insertions(+), 347 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index a9e752a637..2322d84975 100644
--- a/src/mesa/main/texparam.c
+++ b/src/mesa/main/texparam.c
@@ -1,8 +1,9 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.1
+ * Version:  7.5
  *
  * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2009  VMware, Inc.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -72,404 +73,536 @@ validate_texture_wrap_mode(GLcontext * ctx, GLenum target, GLenum wrap)
 }
 
 
-void GLAPIENTRY
-_mesa_TexParameterf( GLenum target, GLenum pname, GLfloat param )
-{
-   _mesa_TexParameterfv(target, pname, &param);
-}
-
-
-void GLAPIENTRY
-_mesa_TexParameterfv( GLenum target, GLenum pname, const GLfloat *params )
+/**
+ * Get current texture object for given target.
+ * Return NULL if any error.
+ */
+static struct gl_texture_object *
+get_texobj(GLcontext *ctx, GLenum target)
 {
-   const GLenum eparam = (GLenum) (GLint) params[0];
    struct gl_texture_unit *texUnit;
-   struct gl_texture_object *texObj;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (MESA_VERBOSE&(VERBOSE_API|VERBOSE_TEXTURE))
-      _mesa_debug(ctx, "glTexParameter %s %s %.1f(%s)...\n",
-                  _mesa_lookup_enum_by_nr(target),
-                  _mesa_lookup_enum_by_nr(pname),
-                  *params,
-		  _mesa_lookup_enum_by_nr(eparam));
 
    if (ctx->Texture.CurrentUnit >= ctx->Const.MaxTextureImageUnits) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glTexParameterfv(current unit)");
-      return;
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glTexParameter(current unit)");
+      return NULL;
    }
 
    texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
 
    switch (target) {
-      case GL_TEXTURE_1D:
-         texObj = texUnit->Current1D;
-         break;
-      case GL_TEXTURE_2D:
-         texObj = texUnit->Current2D;
-         break;
-      case GL_TEXTURE_3D:
-         texObj = texUnit->Current3D;
-         break;
-      case GL_TEXTURE_CUBE_MAP:
-         if (!ctx->Extensions.ARB_texture_cube_map) {
-            _mesa_error( ctx, GL_INVALID_ENUM, "glTexParameter(target)" );
-            return;
-         }
-         texObj = texUnit->CurrentCubeMap;
-         break;
-      case GL_TEXTURE_RECTANGLE_NV:
-         if (!ctx->Extensions.NV_texture_rectangle) {
-            _mesa_error( ctx, GL_INVALID_ENUM, "glTexParameter(target)" );
-            return;
-         }
-         texObj = texUnit->CurrentRect;
-         break;
-      case GL_TEXTURE_1D_ARRAY_EXT:
-         if (!ctx->Extensions.MESA_texture_array) {
-            _mesa_error( ctx, GL_INVALID_ENUM, "glTexParameter(target)" );
-            return;
-         }
-         texObj = texUnit->Current1DArray;
-         break;
-      case GL_TEXTURE_2D_ARRAY_EXT:
-         if (!ctx->Extensions.MESA_texture_array) {
-            _mesa_error( ctx, GL_INVALID_ENUM, "glTexParameter(target)" );
-            return;
-         }
-         texObj = texUnit->Current2DArray;
-         break;
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glTexParameter(target)" );
-         return;
+   case GL_TEXTURE_1D:
+      return texUnit->Current1D;
+   case GL_TEXTURE_2D:
+      return texUnit->Current2D;
+   case GL_TEXTURE_3D:
+      return texUnit->Current3D;
+   case GL_TEXTURE_CUBE_MAP:
+      if (ctx->Extensions.ARB_texture_cube_map) {
+         return texUnit->CurrentCubeMap;
+      }
+      break;
+   case GL_TEXTURE_RECTANGLE_NV:
+      if (ctx->Extensions.NV_texture_rectangle) {
+         return texUnit->CurrentRect;
+      }
+      break;
+   case GL_TEXTURE_1D_ARRAY_EXT:
+      if (ctx->Extensions.MESA_texture_array) {
+         return texUnit->Current1DArray;
+      }
+      break;
+   case GL_TEXTURE_2D_ARRAY_EXT:
+      if (ctx->Extensions.MESA_texture_array) {
+         return texUnit->Current2DArray;
+      }
+      break;
+   default:
+      ;
    }
 
+   _mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(target)");
+   return NULL;
+}
+
+
+/** Set an integer-valued texture parameter */
+static void
+set_tex_parameteri(GLcontext *ctx,
+                   struct gl_texture_object *texObj,
+                   GLenum pname, const GLint *params)
+{
    switch (pname) {
-      case GL_TEXTURE_MIN_FILTER:
-         /* A small optimization */
-         if (texObj->MinFilter == eparam)
-            return;
-         if (eparam==GL_NEAREST || eparam==GL_LINEAR) {
-            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-            texObj->MinFilter = eparam;
-         }
-         else if ((eparam==GL_NEAREST_MIPMAP_NEAREST ||
-                   eparam==GL_LINEAR_MIPMAP_NEAREST ||
-                   eparam==GL_NEAREST_MIPMAP_LINEAR ||
-                   eparam==GL_LINEAR_MIPMAP_LINEAR) &&
-                  texObj->Target != GL_TEXTURE_RECTANGLE_NV) {
+   case GL_TEXTURE_MIN_FILTER:
+      if (texObj->MinFilter == params[0])
+         return;
+      switch (params[0]) {
+      case GL_NEAREST:
+      case GL_LINEAR:
+         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+         texObj->MinFilter = params[0];
+         return;
+      case GL_NEAREST_MIPMAP_NEAREST:
+      case GL_LINEAR_MIPMAP_NEAREST:
+      case GL_NEAREST_MIPMAP_LINEAR:
+      case GL_LINEAR_MIPMAP_LINEAR:
+         if (texObj->Target != GL_TEXTURE_RECTANGLE_NV) {
             FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-            texObj->MinFilter = eparam;
-         }
-         else {
-            _mesa_error( ctx, GL_INVALID_VALUE, "glTexParameter(param)" );
+            texObj->MinFilter = params[0];
             return;
          }
-         break;
-      case GL_TEXTURE_MAG_FILTER:
-         /* A small optimization */
-         if (texObj->MagFilter == eparam)
-            return;
+         /* fall-through */
+      default:
+         _mesa_error( ctx, GL_INVALID_VALUE, "glTexParameter(param)" );
+      }
+      return;
 
-         if (eparam==GL_NEAREST || eparam==GL_LINEAR) {
-            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-            texObj->MagFilter = eparam;
-         }
-         else {
-            _mesa_error( ctx, GL_INVALID_VALUE, "glTexParameter(param)" );
-            return;
-         }
-         break;
-      case GL_TEXTURE_WRAP_S:
-         if (texObj->WrapS == eparam)
-            return;
-         if (validate_texture_wrap_mode(ctx, texObj->Target, eparam)) {
-            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-            texObj->WrapS = eparam;
-         }
-         else {
-            return;
-         }
-         break;
-      case GL_TEXTURE_WRAP_T:
-         if (texObj->WrapT == eparam)
-            return;
-         if (validate_texture_wrap_mode(ctx, texObj->Target, eparam)) {
-            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-            texObj->WrapT = eparam;
-         }
-         else {
-            return;
-         }
-         break;
-      case GL_TEXTURE_WRAP_R:
-         if (texObj->WrapR == eparam)
-            return;
-         if (validate_texture_wrap_mode(ctx, texObj->Target, eparam)) {
-            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-            texObj->WrapR = eparam;
-         }
-         else {
-	    return;
-         }
-         break;
-      case GL_TEXTURE_BORDER_COLOR:
+   case GL_TEXTURE_MAG_FILTER:
+      if (texObj->MagFilter == params[0])
+         return;
+      switch (params[0]) {
+      case GL_NEAREST:
+      case GL_LINEAR:
          FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-         texObj->BorderColor[RCOMP] = params[0];
-         texObj->BorderColor[GCOMP] = params[1];
-         texObj->BorderColor[BCOMP] = params[2];
-         texObj->BorderColor[ACOMP] = params[3];
-         UNCLAMPED_FLOAT_TO_CHAN(texObj->_BorderChan[RCOMP], params[0]);
-         UNCLAMPED_FLOAT_TO_CHAN(texObj->_BorderChan[GCOMP], params[1]);
-         UNCLAMPED_FLOAT_TO_CHAN(texObj->_BorderChan[BCOMP], params[2]);
-         UNCLAMPED_FLOAT_TO_CHAN(texObj->_BorderChan[ACOMP], params[3]);
-         break;
-      case GL_TEXTURE_MIN_LOD:
-         if (texObj->MinLod == params[0])
-            return;
+         texObj->MagFilter = params[0];
+         return;
+      default:
+         _mesa_error( ctx, GL_INVALID_VALUE, "glTexParameter(param)" );
+      }
+      return;
+
+   case GL_TEXTURE_WRAP_S:
+      if (texObj->WrapS == params[0])
+         return;
+      if (validate_texture_wrap_mode(ctx, texObj->Target, params[0])) {
          FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-         texObj->MinLod = params[0];
-         break;
-      case GL_TEXTURE_MAX_LOD:
-         if (texObj->MaxLod == params[0])
-            return;
+         texObj->WrapS = params[0];
+      }
+      return;
+
+   case GL_TEXTURE_WRAP_T:
+      if (texObj->WrapT == params[0])
+         return;
+      if (validate_texture_wrap_mode(ctx, texObj->Target, params[0])) {
          FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-         texObj->MaxLod = params[0];
-         break;
-      case GL_TEXTURE_BASE_LEVEL:
-         if (params[0] < 0.0) {
-            _mesa_error(ctx, GL_INVALID_VALUE, "glTexParameter(param)");
-            return;
-         }
-         if (target == GL_TEXTURE_RECTANGLE_ARB && params[0] != 0.0) {
-            _mesa_error(ctx, GL_INVALID_VALUE, "glTexParameter(param)");
-            return;
-         }
+         texObj->WrapT = params[0];
+      }
+      return;
+
+   case GL_TEXTURE_WRAP_R:
+      if (texObj->WrapR == params[0])
+         return;
+      if (validate_texture_wrap_mode(ctx, texObj->Target, params[0])) {
          FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-         texObj->BaseLevel = (GLint) params[0];
-         break;
-      case GL_TEXTURE_MAX_LEVEL:
-         if (params[0] < 0.0) {
-            _mesa_error(ctx, GL_INVALID_VALUE, "glTexParameter(param)");
-            return;
-         }
-         if (target == GL_TEXTURE_RECTANGLE_ARB) {
-            _mesa_error(ctx, GL_INVALID_OPERATION, "glTexParameter(param)");
-            return;
-         }
+         texObj->WrapR = params[0];
+      }
+      return;
+
+   case GL_TEXTURE_BASE_LEVEL:
+      if (texObj->BaseLevel == params[0])
+         return;
+      if (params[0] < 0 ||
+          (texObj->Target == GL_TEXTURE_RECTANGLE_ARB && params[0] != 0)) {
+         _mesa_error(ctx, GL_INVALID_VALUE, "glTexParameter(param)");
+         return;
+      }
+      FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+      texObj->BaseLevel = params[0];
+      return;
+
+   case GL_TEXTURE_MAX_LEVEL:
+      if (texObj->MaxLevel == params[0])
+         return;
+      if (params[0] < 0 || texObj->Target == GL_TEXTURE_RECTANGLE_ARB) {
+         _mesa_error(ctx, GL_INVALID_OPERATION, "glTexParameter(param)");
+         return;
+      }
+      FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+      texObj->MaxLevel = params[0];
+      return;
+
+   case GL_TEXTURE_COMPARE_SGIX:
+      if (ctx->Extensions.SGIX_shadow) {
          FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-         texObj->MaxLevel = (GLint) params[0];
-         break;
-      case GL_TEXTURE_PRIORITY:
+         texObj->CompareFlag = params[0] ? GL_TRUE : GL_FALSE;
+      }
+      else {
+         _mesa_error(ctx, GL_INVALID_ENUM,
+                     "glTexParameter(pname=GL_TEXTURE_COMPARE_SGIX)");
+      }
+      return;
+
+   case GL_TEXTURE_COMPARE_OPERATOR_SGIX:
+      if (ctx->Extensions.SGIX_shadow &&
+          (params[0] == GL_TEXTURE_LEQUAL_R_SGIX || 
+           params[0] == GL_TEXTURE_GEQUAL_R_SGIX)) {
          FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-         texObj->Priority = CLAMP( params[0], 0.0F, 1.0F );
-         break;
-      case GL_TEXTURE_MAX_ANISOTROPY_EXT:
-         if (ctx->Extensions.EXT_texture_filter_anisotropic) {
-	    if (params[0] < 1.0) {
-	       _mesa_error(ctx, GL_INVALID_VALUE, "glTexParameter(param)" );
-	       return;
-	    }
-            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-            /* clamp to max, that's what NVIDIA does */
-            texObj->MaxAnisotropy = MIN2(params[0],
-                                         ctx->Const.MaxTextureMaxAnisotropy);
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glTexParameter(pname=GL_TEXTURE_MAX_ANISOTROPY_EXT)");
-            return;
-         }
-         break;
-      case GL_TEXTURE_COMPARE_SGIX:
-         if (ctx->Extensions.SGIX_shadow) {
-            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-            texObj->CompareFlag = params[0] ? GL_TRUE : GL_FALSE;
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glTexParameter(pname=GL_TEXTURE_COMPARE_SGIX)");
-            return;
-         }
-         break;
-      case GL_TEXTURE_COMPARE_OPERATOR_SGIX:
-         if (ctx->Extensions.SGIX_shadow) {
-            GLenum op = (GLenum) params[0];
-            if (op == GL_TEXTURE_LEQUAL_R_SGIX ||
-                op == GL_TEXTURE_GEQUAL_R_SGIX) {
-               FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-               texObj->CompareOperator = op;
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(param)");
-            }
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                    "glTexParameter(pname=GL_TEXTURE_COMPARE_OPERATOR_SGIX)");
-            return;
-         }
-         break;
-      case GL_SHADOW_AMBIENT_SGIX: /* aka GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
-         if (ctx->Extensions.SGIX_shadow_ambient) {
+         texObj->CompareOperator = params[0];
+      }
+      else {
+         _mesa_error(ctx, GL_INVALID_ENUM,
+                     "glTexParameter(GL_TEXTURE_COMPARE_OPERATOR_SGIX)");
+      }
+      return;
+
+   case GL_GENERATE_MIPMAP_SGIS:
+      if (ctx->Extensions.SGIS_generate_mipmap) {
+         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+         texObj->GenerateMipmap = params[0] ? GL_TRUE : GL_FALSE;
+      }
+      else {
+         _mesa_error(ctx, GL_INVALID_ENUM,
+                     "glTexParameter(pname=GL_GENERATE_MIPMAP_SGIS)");
+      }
+      return;
+
+   case GL_TEXTURE_COMPARE_MODE_ARB:
+      if (ctx->Extensions.ARB_shadow &&
+          (params[0] == GL_NONE ||
+           params[0] == GL_COMPARE_R_TO_TEXTURE_ARB)) {
+         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+         texObj->CompareMode = params[0];
+      }
+      else {
+         _mesa_error(ctx, GL_INVALID_ENUM,
+                     "glTexParameter(GL_TEXTURE_COMPARE_MODE_ARB)");
+      }
+      return;
+
+   case GL_TEXTURE_COMPARE_FUNC_ARB:
+      if (ctx->Extensions.ARB_shadow) {
+         switch (params[0]) {
+         case GL_LEQUAL:
+         case GL_GEQUAL:
             FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-            texObj->ShadowAmbient = CLAMP(params[0], 0.0F, 1.0F);
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glTexParameter(pname=GL_SHADOW_AMBIENT_SGIX)");
+            texObj->CompareFunc = params[0];
             return;
-         }
-         break;
-      case GL_GENERATE_MIPMAP_SGIS:
-         if (ctx->Extensions.SGIS_generate_mipmap) {
-            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-            texObj->GenerateMipmap = params[0] ? GL_TRUE : GL_FALSE;
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glTexParameter(pname=GL_GENERATE_MIPMAP_SGIS)");
-            return;
-         }
-         break;
-      case GL_TEXTURE_COMPARE_MODE_ARB:
-         if (ctx->Extensions.ARB_shadow) {
-            const GLenum mode = (GLenum) params[0];
-            if (mode == GL_NONE || mode == GL_COMPARE_R_TO_TEXTURE_ARB) {
+         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_VERTICES(ctx, _NEW_TEXTURE);
-               texObj->CompareMode = mode;
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM,
-                           "glTexParameter(bad GL_TEXTURE_COMPARE_MODE_ARB: 0x%x)", mode);
+               texObj->CompareFunc = params[0];
                return;
             }
-         }
-         else {
+            /* fall-through */
+         default:
             _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glTexParameter(pname=GL_TEXTURE_COMPARE_MODE_ARB)");
-            return;
+                        "glTexParameter(GL_TEXTURE_COMPARE_FUNC_ARB)");
          }
-         break;
-      case GL_TEXTURE_COMPARE_FUNC_ARB:
-         if (ctx->Extensions.ARB_shadow) {
-            const GLenum func = (GLenum) params[0];
-            if (func == GL_LEQUAL || func == GL_GEQUAL) {
-               FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-               texObj->CompareFunc = func;
-            }
-            else if (ctx->Extensions.EXT_shadow_funcs &&
-                     (func == GL_EQUAL ||
-                      func == GL_NOTEQUAL ||
-                      func == GL_LESS ||
-                      func == GL_GREATER ||
-                      func == GL_ALWAYS ||
-                      func == GL_NEVER)) {
-               FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-               texObj->CompareFunc = func;
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM,
-                           "glTexParameter(bad GL_TEXTURE_COMPARE_FUNC_ARB)");
-               return;
-            }
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glTexParameter(pname=GL_TEXTURE_COMPARE_FUNC_ARB)");
-            return;
-         }
-         break;
-      case GL_DEPTH_TEXTURE_MODE_ARB:
-         if (ctx->Extensions.ARB_depth_texture) {
-            const GLenum result = (GLenum) params[0];
-            if (result == GL_LUMINANCE || result == GL_INTENSITY
-                || result == GL_ALPHA) {
-               FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-               texObj->DepthMode = result;
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM,
-                          "glTexParameter(bad GL_DEPTH_TEXTURE_MODE_ARB)");
-               return;
-            }
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glTexParameter(pname=GL_DEPTH_TEXTURE_MODE_ARB)");
+      }
+      else {
+         _mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(param)");
+      }
+      return;
+
+   case GL_DEPTH_TEXTURE_MODE_ARB:
+      if (ctx->Extensions.ARB_depth_texture &&
+          (params[0] == GL_LUMINANCE ||
+           params[0] == GL_INTENSITY ||
+           params[0] == GL_ALPHA)) {
+         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+         texObj->DepthMode = params[0];
+      }
+      else {
+         _mesa_error(ctx, GL_INVALID_ENUM,
+                     "glTexParameter(GL_DEPTH_TEXTURE_MODE_ARB)");
+      }
+      return;
+
+#ifdef FEATURE_OES_draw_texture
+   case GL_TEXTURE_CROP_RECT_OES:
+      texObj->CropRect[0] = params[0];
+      texObj->CropRect[1] = params[1];
+      texObj->CropRect[2] = params[2];
+      texObj->CropRect[3] = params[3];
+      break;
+#endif
+
+   default:
+      _mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(pname=0x%x)", pname);
+   }
+}
+
+
+/** Set a float-valued texture parameter */
+static void
+set_tex_parameterf(GLcontext *ctx,
+                   struct gl_texture_object *texObj,
+                   GLenum pname, const GLfloat *params)
+{
+   switch (pname) {
+   case GL_TEXTURE_MIN_LOD:
+      if (texObj->MinLod == params[0])
+         return;
+      FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+      texObj->MinLod = params[0];
+      return;
+
+   case GL_TEXTURE_MAX_LOD:
+      if (texObj->MaxLod == params[0])
+         return;
+      FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+      texObj->MaxLod = params[0];
+      return;
+
+   case GL_TEXTURE_PRIORITY:
+      FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+      texObj->Priority = CLAMP(params[0], 0.0F, 1.0F);
+      return;
+
+   case GL_TEXTURE_MAX_ANISOTROPY_EXT:
+      if (ctx->Extensions.EXT_texture_filter_anisotropic) {
+         if (params[0] < 1.0) {
+            _mesa_error(ctx, GL_INVALID_VALUE, "glTexParameter(param)" );
             return;
          }
-         break;
-      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]) {
-               FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-               texObj->LodBias = params[0];
-            }
+         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+         /* clamp to max, that's what NVIDIA does */
+         texObj->MaxAnisotropy = MIN2(params[0],
+                                      ctx->Const.MaxTextureMaxAnisotropy);
+      }
+      else {
+         _mesa_error(ctx, GL_INVALID_ENUM,
+                     "glTexParameter(pname=GL_TEXTURE_MAX_ANISOTROPY_EXT)");
+      }
+      return;
+
+   case GL_SHADOW_AMBIENT_SGIX: /* aka GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+      if (ctx->Extensions.SGIX_shadow_ambient) {
+         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+         texObj->ShadowAmbient = CLAMP(params[0], 0.0F, 1.0F);
+      }
+      else {
+         _mesa_error(ctx, GL_INVALID_ENUM,
+                     "glTexParameter(pname=GL_SHADOW_AMBIENT_SGIX)");
+      }
+      return;
+
+   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]) {
+            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+            texObj->LodBias = params[0];
          }
-         break;
+      }
+      break;
+
+   case GL_TEXTURE_BORDER_COLOR:
+      FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+      texObj->BorderColor[RCOMP] = params[0];
+      texObj->BorderColor[GCOMP] = params[1];
+      texObj->BorderColor[BCOMP] = params[2];
+      texObj->BorderColor[ACOMP] = params[3];
+      UNCLAMPED_FLOAT_TO_CHAN(texObj->_BorderChan[RCOMP], params[0]);
+      UNCLAMPED_FLOAT_TO_CHAN(texObj->_BorderChan[GCOMP], params[1]);
+      UNCLAMPED_FLOAT_TO_CHAN(texObj->_BorderChan[BCOMP], params[2]);
+      UNCLAMPED_FLOAT_TO_CHAN(texObj->_BorderChan[ACOMP], params[3]);
+      return;
+
+   default:
+      _mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(pname=0x%x)", pname);
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_TexParameterf(GLenum target, GLenum pname, GLfloat param)
+{
+   struct gl_texture_object *texObj;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   texObj = get_texobj(ctx, target);
+   if (!texObj)
+      return;
+
+   switch (pname) {
+   case GL_TEXTURE_MIN_FILTER:
+   case GL_TEXTURE_MAG_FILTER:
+   case GL_TEXTURE_WRAP_S:
+   case GL_TEXTURE_WRAP_T:
+   case GL_TEXTURE_WRAP_R:
+   case GL_TEXTURE_BASE_LEVEL:
+   case GL_TEXTURE_MAX_LEVEL:
+   case GL_TEXTURE_COMPARE_SGIX:
+   case GL_TEXTURE_COMPARE_OPERATOR_SGIX:
+   case GL_GENERATE_MIPMAP_SGIS:
+   case GL_TEXTURE_COMPARE_MODE_ARB:
+   case GL_TEXTURE_COMPARE_FUNC_ARB:
+   case GL_DEPTH_TEXTURE_MODE_ARB:
+      {
+         /* convert float param to int */
+         GLint p = (GLint) param;
+         set_tex_parameteri(ctx, texObj, pname, &p);
+      }
+      return;
+   default:
+      /* this will generate an error if pname is illegal */
+      set_tex_parameterf(ctx, texObj, pname, &param);
+   }
+
+   texObj->_Complete = GL_FALSE;
+
+   if (ctx->Driver.TexParameter && ctx->ErrorValue == GL_NO_ERROR) {
+      ctx->Driver.TexParameter(ctx, target, texObj, pname, &param);
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_TexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
+{
+   struct gl_texture_object *texObj;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   texObj = get_texobj(ctx, target);
+   if (!texObj)
+      return;
+
+   switch (pname) {
+   case GL_TEXTURE_MIN_FILTER:
+   case GL_TEXTURE_MAG_FILTER:
+   case GL_TEXTURE_WRAP_S:
+   case GL_TEXTURE_WRAP_T:
+   case GL_TEXTURE_WRAP_R:
+   case GL_TEXTURE_BASE_LEVEL:
+   case GL_TEXTURE_MAX_LEVEL:
+   case GL_TEXTURE_COMPARE_SGIX:
+   case GL_TEXTURE_COMPARE_OPERATOR_SGIX:
+   case GL_GENERATE_MIPMAP_SGIS:
+   case GL_TEXTURE_COMPARE_MODE_ARB:
+   case GL_TEXTURE_COMPARE_FUNC_ARB:
+   case GL_DEPTH_TEXTURE_MODE_ARB:
+      {
+         /* convert float param to int */
+         GLint p = (GLint) params[0];
+         set_tex_parameteri(ctx, texObj, pname, &p);
+      }
+      break;
+
 #ifdef FEATURE_OES_draw_texture
-      case GL_TEXTURE_CROP_RECT_OES:
-         texObj->CropRect[0] = (GLint) params[0];
-         texObj->CropRect[1] = (GLint) params[1];
-         texObj->CropRect[2] = (GLint) params[2];
-         texObj->CropRect[3] = (GLint) params[3];
-         break;
+   case GL_TEXTURE_CROP_RECT_OES:
+      {
+         /* convert float params to int */
+         GLint iparams[4];
+         iparams[0] = (GLint) params[0];
+         iparams[1] = (GLint) params[1];
+         iparams[2] = (GLint) params[2];
+         iparams[3] = (GLint) params[3];
+         set_tex_parameteri(ctx, target, iparams);
+      }
+      break;
 #endif
 
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM,
-                     "glTexParameter(pname=0x%x)", pname);
-         return;
+   default:
+      /* this will generate an error if pname is illegal */
+      set_tex_parameterf(ctx, texObj, pname, params);
    }
 
    texObj->_Complete = GL_FALSE;
 
-   if (ctx->Driver.TexParameter) {
-      (*ctx->Driver.TexParameter)( ctx, target, texObj, pname, params );
+   if (ctx->Driver.TexParameter && ctx->ErrorValue == GL_NO_ERROR) {
+      ctx->Driver.TexParameter(ctx, target, texObj, pname, params);
    }
 }
 
 
 void GLAPIENTRY
-_mesa_TexParameteri( GLenum target, GLenum pname, GLint param )
+_mesa_TexParameteri(GLenum target, GLenum pname, GLint param)
 {
-   GLfloat fparam[4];
-   if (pname == GL_TEXTURE_PRIORITY)
-      fparam[0] = INT_TO_FLOAT(param);
-   else
-      fparam[0] = (GLfloat) param;
-   fparam[1] = fparam[2] = fparam[3] = 0.0;
-   _mesa_TexParameterfv(target, pname, fparam);
+   struct gl_texture_object *texObj;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   texObj = get_texobj(ctx, target);
+   if (!texObj)
+      return;
+
+   switch (pname) {
+   case GL_TEXTURE_MIN_LOD:
+   case GL_TEXTURE_MAX_LOD:
+   case GL_TEXTURE_PRIORITY:
+   case GL_TEXTURE_MAX_ANISOTROPY_EXT:
+   case GL_TEXTURE_LOD_BIAS:
+   case GL_SHADOW_AMBIENT_SGIX: /* aka GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+      {
+         GLfloat fparam = (GLfloat) param;
+         /* convert int param to float */
+         set_tex_parameterf(ctx, texObj, pname, &fparam);
+      }
+      break;
+   default:
+      /* this will generate an error if pname is illegal */
+      set_tex_parameteri(ctx, texObj, pname, &param);
+   }
+
+   texObj->_Complete = GL_FALSE;
+
+   if (ctx->Driver.TexParameter && ctx->ErrorValue == GL_NO_ERROR) {
+      GLfloat fparam = (GLfloat) param;
+      ctx->Driver.TexParameter(ctx, target, texObj, pname, &fparam);
+   }
 }
 
 
 void GLAPIENTRY
-_mesa_TexParameteriv( GLenum target, GLenum pname, const GLint *params )
+_mesa_TexParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-   GLfloat fparam[4];
-   if (pname == GL_TEXTURE_BORDER_COLOR) {
-      fparam[0] = INT_TO_FLOAT(params[0]);
-      fparam[1] = INT_TO_FLOAT(params[1]);
-      fparam[2] = INT_TO_FLOAT(params[2]);
-      fparam[3] = INT_TO_FLOAT(params[3]);
-   }
-   else if (pname == GL_TEXTURE_CROP_RECT_OES) {
-      fparam[0] = (GLfloat) params[0];
-      fparam[1] = (GLfloat) params[1];
-      fparam[2] = (GLfloat) params[2];
-      fparam[3] = (GLfloat) params[3];
+   struct gl_texture_object *texObj;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   texObj = get_texobj(ctx, target);
+   if (!texObj)
+      return;
+
+   switch (pname) {
+   case GL_TEXTURE_BORDER_COLOR:
+      {
+         /* convert int params to float */
+         GLfloat fparams[4];
+         fparams[0] = INT_TO_FLOAT(params[0]);
+         fparams[1] = INT_TO_FLOAT(params[1]);
+         fparams[2] = INT_TO_FLOAT(params[2]);
+         fparams[3] = INT_TO_FLOAT(params[3]);
+         set_tex_parameterf(ctx, texObj, pname, fparams);
+      }
+      break;
+   case GL_TEXTURE_MIN_LOD:
+   case GL_TEXTURE_MAX_LOD:
+   case GL_TEXTURE_PRIORITY:
+   case GL_TEXTURE_MAX_ANISOTROPY_EXT:
+   case GL_TEXTURE_LOD_BIAS:
+   case GL_SHADOW_AMBIENT_SGIX: /* aka GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+      {
+         /* convert int param to float */
+         GLfloat fparam = (GLfloat) params[0];
+         set_tex_parameterf(ctx, texObj, pname, &fparam);
+      }
+      break;
+   default:
+      /* this will generate an error if pname is illegal */
+      set_tex_parameteri(ctx, texObj, pname, params);
    }
-   else {
-      if (pname == GL_TEXTURE_PRIORITY)
-         fparam[0] = INT_TO_FLOAT(params[0]);
-      else
-         fparam[0] = (GLfloat) params[0];
-      fparam[1] = fparam[2] = fparam[3] = 0.0F;
+
+   texObj->_Complete = GL_FALSE;
+
+   if (ctx->Driver.TexParameter && ctx->ErrorValue == GL_NO_ERROR) {
+      GLfloat fparams[4];
+      fparams[0] = INT_TO_FLOAT(params[0]);
+      if (pname == GL_TEXTURE_BORDER_COLOR ||
+          pname == GL_TEXTURE_CROP_RECT_OES) {
+         fparams[1] = INT_TO_FLOAT(params[1]);
+         fparams[2] = INT_TO_FLOAT(params[2]);
+         fparams[3] = INT_TO_FLOAT(params[3]);
+      }
+      ctx->Driver.TexParameter(ctx, target, texObj, pname, fparams);
    }
-   _mesa_TexParameterfv(target, pname, fparam);
 }
 
 
-- 
cgit v1.2.3


From 4a89e51c5f88b57040b361b62e80a57c8248ba4b Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 28 Jan 2009 10:27:33 -0700
Subject: mesa: set/get new state for GL_EXT_texture_swizzle

---
 src/mesa/main/extensions.c |   1 +
 src/mesa/main/mtypes.h     |   3 +
 src/mesa/main/texobj.c     |   9 ++
 src/mesa/main/texparam.c   | 219 ++++++++++++++++++++++++++++++++++++++-------
 4 files changed, 198 insertions(+), 34 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 0b4cbec648..053f3697d7 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -127,6 +127,7 @@ static const struct {
    { ON,  "GL_EXT_texture_object",             F(EXT_texture_object) },
    { OFF, "GL_EXT_texture_rectangle",          F(NV_texture_rectangle) },
    { OFF, "GL_EXT_texture_sRGB",               F(EXT_texture_sRGB) },
+   { OFF, "GL_EXT_texture_swizzle",            F(EXT_texture_swizzle) },
    { OFF, "GL_EXT_timer_query",                F(EXT_timer_query) },
    { ON,  "GL_EXT_vertex_array",               F(EXT_vertex_array) },
    { OFF, "GL_EXT_vertex_array_bgra",          F(EXT_vertex_array_bgra) },
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index b09c5910f8..8ab0d26f45 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1446,6 +1446,8 @@ struct gl_texture_object
    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 */
+   GLenum Swizzle[4];           /**< GL_EXT_texture_swizzle */
+   GLuint _Swizzle;             /**< same as Swizzle, but SWIZZLE_* format */
    GLboolean GenerateMipmap;    /**< GL_SGIS_generate_mipmap */
    GLboolean _Complete;		/**< Is texture object complete? */
 
@@ -2621,6 +2623,7 @@ struct gl_extensions
    GLboolean EXT_texture_lod_bias;
    GLboolean EXT_texture_mirror_clamp;
    GLboolean EXT_texture_sRGB;
+   GLboolean EXT_texture_swizzle;
    GLboolean EXT_timer_query;
    GLboolean EXT_vertex_array;
    GLboolean EXT_vertex_array_bgra;
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index 7848f0be35..fad39a0634 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -42,6 +42,8 @@
 #include "texstate.h"
 #include "texobj.h"
 #include "mtypes.h"
+#include "shader/prog_instruction.h"
+
 
 
 /**********************************************************************/
@@ -138,6 +140,11 @@ _mesa_initialize_texture_object( struct gl_texture_object *obj,
    obj->CompareFunc = GL_LEQUAL;       /* ARB_shadow */
    obj->DepthMode = GL_LUMINANCE;      /* ARB_depth_texture */
    obj->ShadowAmbient = 0.0F;          /* ARB/SGIX_shadow_ambient */
+   obj->Swizzle[0] = GL_RED;
+   obj->Swizzle[1] = GL_GREEN;
+   obj->Swizzle[2] = GL_BLUE;
+   obj->Swizzle[3] = GL_ALPHA;
+   obj->_Swizzle = SWIZZLE_NOOP;
 }
 
 
@@ -252,6 +259,8 @@ _mesa_copy_texture_object( struct gl_texture_object *dest,
    dest->GenerateMipmap = src->GenerateMipmap;
    dest->Palette = src->Palette;
    dest->_Complete = src->_Complete;
+   COPY_4V(dest->Swizzle, src->Swizzle);
+   dest->_Swizzle = src->_Swizzle;
 }
 
 
diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index 2322d84975..695bff0097 100644
--- a/src/mesa/main/texparam.c
+++ b/src/mesa/main/texparam.c
@@ -38,6 +38,7 @@
 #include "main/texcompress.h"
 #include "main/texparam.h"
 #include "main/teximage.h"
+#include "shader/prog_instruction.h"
 
 
 /**
@@ -125,6 +126,45 @@ get_texobj(GLcontext *ctx, GLenum target)
 }
 
 
+/**
+ * Convert GL_RED/GREEN/BLUE/ALPHA/ZERO/ONE to SWIZZLE_X/Y/Z/W/ZERO/ONE.
+ * \return -1 if error.
+ */
+static GLint
+comp_to_swizzle(GLenum comp)
+{
+   switch (comp) {
+   case GL_RED:
+      return SWIZZLE_X;
+   case GL_GREEN:
+      return SWIZZLE_Y;
+   case GL_BLUE:
+      return SWIZZLE_Z;
+   case GL_ALPHA:
+      return SWIZZLE_W;
+   case GL_ZERO:
+      return SWIZZLE_ZERO;
+   case GL_ONE:
+      return SWIZZLE_ONE;
+   default:
+      return -1;
+   }
+}
+
+
+static void
+set_swizzle_component(GLuint *swizzle, GLuint comp, GLuint swz)
+{
+   ASSERT(comp < 4);
+   ASSERT(swz <= SWIZZLE_NIL);
+   {
+      GLuint mask = 0x7 << (3 * comp);
+      GLuint s = (*swizzle & ~mask) | (swz << (3 * comp));
+      *swizzle = s;
+   }
+}
+
+
 /** Set an integer-valued texture parameter */
 static void
 set_tex_parameteri(GLcontext *ctx,
@@ -318,9 +358,48 @@ set_tex_parameteri(GLcontext *ctx,
       texObj->CropRect[1] = params[1];
       texObj->CropRect[2] = params[2];
       texObj->CropRect[3] = params[3];
-      break;
+      return;
 #endif
 
+   case GL_TEXTURE_SWIZZLE_R_EXT:
+   case GL_TEXTURE_SWIZZLE_G_EXT:
+   case GL_TEXTURE_SWIZZLE_B_EXT:
+   case GL_TEXTURE_SWIZZLE_A_EXT:
+      if (ctx->Extensions.EXT_texture_swizzle) {
+         const GLuint comp = pname - GL_TEXTURE_SWIZZLE_R_EXT;
+         const GLint swz = comp_to_swizzle(params[0]);
+         ASSERT(comp < 4);
+         if (swz >= 0) {
+            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+            texObj->Swizzle[comp] = params[0];
+            set_swizzle_component(&texObj->_Swizzle, comp, swz);
+            return;
+         }
+      }
+      _mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(pname=0x%x)", pname);
+      return;
+
+   case GL_TEXTURE_SWIZZLE_RGBA_EXT:
+      if (ctx->Extensions.EXT_texture_swizzle) {
+         GLuint comp;
+         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+         for (comp = 0; comp < 4; comp++) {
+            const GLint swz = comp_to_swizzle(params[comp]);
+            if (swz >= 0) {
+               texObj->Swizzle[comp] = params[comp];
+               set_swizzle_component(&texObj->_Swizzle, comp, swz);
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(param=0x%x)",
+                           params[comp]);
+               return;
+            }
+         }
+         return;
+      }
+      _mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(pname=0x%x)", pname);
+      return;
+
    default:
       _mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(pname=0x%x)", pname);
    }
@@ -974,63 +1053,63 @@ _mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params )
             *params = obj->MaxAnisotropy;
          }
 	 else
-	    error = 1;
+	    error = GL_TRUE;
          break;
       case GL_TEXTURE_COMPARE_SGIX:
          if (ctx->Extensions.SGIX_shadow) {
             *params = (GLfloat) obj->CompareFlag;
          }
 	 else 
-	    error = 1;
+	    error = GL_TRUE;
          break;
       case GL_TEXTURE_COMPARE_OPERATOR_SGIX:
          if (ctx->Extensions.SGIX_shadow) {
             *params = (GLfloat) obj->CompareOperator;
          }
 	 else 
-	    error = 1;
+	    error = GL_TRUE;
          break;
       case GL_SHADOW_AMBIENT_SGIX: /* aka GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
          if (ctx->Extensions.SGIX_shadow_ambient) {
             *params = obj->ShadowAmbient;
          }
 	 else 
-	    error = 1;
+	    error = GL_TRUE;
          break;
       case GL_GENERATE_MIPMAP_SGIS:
          if (ctx->Extensions.SGIS_generate_mipmap) {
             *params = (GLfloat) obj->GenerateMipmap;
          }
 	 else 
-	    error = 1;
+	    error = GL_TRUE;
          break;
       case GL_TEXTURE_COMPARE_MODE_ARB:
          if (ctx->Extensions.ARB_shadow) {
             *params = (GLfloat) obj->CompareMode;
          }
 	 else 
-	    error = 1;
+	    error = GL_TRUE;
          break;
       case GL_TEXTURE_COMPARE_FUNC_ARB:
          if (ctx->Extensions.ARB_shadow) {
             *params = (GLfloat) obj->CompareFunc;
          }
 	 else 
-	    error = 1;
+	    error = GL_TRUE;
          break;
       case GL_DEPTH_TEXTURE_MODE_ARB:
          if (ctx->Extensions.ARB_depth_texture) {
             *params = (GLfloat) obj->DepthMode;
          }
 	 else 
-	    error = 1;
+	    error = GL_TRUE;
          break;
       case GL_TEXTURE_LOD_BIAS:
          if (ctx->Extensions.EXT_texture_lod_bias) {
             *params = obj->LodBias;
          }
 	 else 
-	    error = 1;
+	    error = GL_TRUE;
          break;
 #ifdef FEATURE_OES_draw_texture
       case GL_TEXTURE_CROP_RECT_OES:
@@ -1040,10 +1119,37 @@ _mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params )
          params[3] = obj->CropRect[3];
          break;
 #endif
+
+      case GL_TEXTURE_SWIZZLE_R_EXT:
+      case GL_TEXTURE_SWIZZLE_G_EXT:
+      case GL_TEXTURE_SWIZZLE_B_EXT:
+      case GL_TEXTURE_SWIZZLE_A_EXT:
+         if (ctx->Extensions.EXT_texture_swizzle) {
+            GLuint comp = pname - GL_TEXTURE_SWIZZLE_R_EXT;
+            *params = (GLfloat) obj->Swizzle[comp];
+         }
+         else {
+            error = GL_TRUE;
+         }
+         break;
+
+      case GL_TEXTURE_SWIZZLE_RGBA_EXT:
+         if (ctx->Extensions.EXT_texture_swizzle) {
+            GLuint comp;
+            for (comp = 0; comp < 4; comp++) {
+               params[comp] = (GLfloat) obj->Swizzle[comp];
+            }
+         }
+         else {
+            error = GL_TRUE;
+         }
+         break;
+
       default:
-	 error = 1;
+	 error = GL_TRUE;
 	 break;
    }
+
    if (error)
       _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexParameterfv(pname=0x%x)",
 		  pname);
@@ -1057,6 +1163,7 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
 {
    struct gl_texture_unit *texUnit;
    struct gl_texture_object *obj;
+   GLboolean error = GL_FALSE;
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
@@ -1077,19 +1184,19 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
    switch (pname) {
       case GL_TEXTURE_MAG_FILTER:
          *params = (GLint) obj->MagFilter;
-         return;
+         break;;
       case GL_TEXTURE_MIN_FILTER:
          *params = (GLint) obj->MinFilter;
-         return;
+         break;;
       case GL_TEXTURE_WRAP_S:
          *params = (GLint) obj->WrapS;
-         return;
+         break;;
       case GL_TEXTURE_WRAP_T:
          *params = (GLint) obj->WrapT;
-         return;
+         break;;
       case GL_TEXTURE_WRAP_R:
          *params = (GLint) obj->WrapR;
-         return;
+         break;;
       case GL_TEXTURE_BORDER_COLOR:
          {
             GLfloat b[4];
@@ -1102,7 +1209,7 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
             params[2] = FLOAT_TO_INT(b[2]);
             params[3] = FLOAT_TO_INT(b[3]);
          }
-         return;
+         break;;
       case GL_TEXTURE_RESIDENT:
          {
             GLboolean resident;
@@ -1112,74 +1219,92 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
                resident = GL_TRUE;
             *params = (GLint) resident;
          }
-         return;
+         break;;
       case GL_TEXTURE_PRIORITY:
          *params = FLOAT_TO_INT(obj->Priority);
-         return;
+         break;;
       case GL_TEXTURE_MIN_LOD:
          *params = (GLint) obj->MinLod;
-         return;
+         break;;
       case GL_TEXTURE_MAX_LOD:
          *params = (GLint) obj->MaxLod;
-         return;
+         break;;
       case GL_TEXTURE_BASE_LEVEL:
          *params = obj->BaseLevel;
-         return;
+         break;;
       case GL_TEXTURE_MAX_LEVEL:
          *params = obj->MaxLevel;
-         return;
+         break;;
       case GL_TEXTURE_MAX_ANISOTROPY_EXT:
          if (ctx->Extensions.EXT_texture_filter_anisotropic) {
             *params = (GLint) obj->MaxAnisotropy;
-            return;
+         }
+         else {
+            error = GL_TRUE;
          }
          break;
       case GL_TEXTURE_COMPARE_SGIX:
          if (ctx->Extensions.SGIX_shadow) {
             *params = (GLint) obj->CompareFlag;
-            return;
+         }
+         else {
+            error = GL_TRUE;
          }
          break;
       case GL_TEXTURE_COMPARE_OPERATOR_SGIX:
          if (ctx->Extensions.SGIX_shadow) {
             *params = (GLint) obj->CompareOperator;
-            return;
+         }
+         else {
+            error = GL_TRUE;
          }
          break;
       case GL_SHADOW_AMBIENT_SGIX: /* aka GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
          if (ctx->Extensions.SGIX_shadow_ambient) {
             *params = (GLint) FLOAT_TO_INT(obj->ShadowAmbient);
-            return;
+         }
+         else {
+            error = GL_TRUE;
          }
          break;
       case GL_GENERATE_MIPMAP_SGIS:
          if (ctx->Extensions.SGIS_generate_mipmap) {
             *params = (GLint) obj->GenerateMipmap;
-            return;
+         }
+         else {
+            error = GL_TRUE;
          }
          break;
       case GL_TEXTURE_COMPARE_MODE_ARB:
          if (ctx->Extensions.ARB_shadow) {
             *params = (GLint) obj->CompareMode;
-            return;
+         }
+         else {
+            error = GL_TRUE;
          }
          break;
       case GL_TEXTURE_COMPARE_FUNC_ARB:
          if (ctx->Extensions.ARB_shadow) {
             *params = (GLint) obj->CompareFunc;
-            return;
+         }
+         else {
+            error = GL_TRUE;
          }
          break;
       case GL_DEPTH_TEXTURE_MODE_ARB:
          if (ctx->Extensions.ARB_depth_texture) {
             *params = (GLint) obj->DepthMode;
-            return;
+         }
+         else {
+            error = GL_TRUE;
          }
          break;
       case GL_TEXTURE_LOD_BIAS:
          if (ctx->Extensions.EXT_texture_lod_bias) {
             *params = (GLint) obj->LodBias;
-            return;
+         }
+         else {
+            error = GL_TRUE;
          }
          break;
 #ifdef FEATURE_OES_draw_texture
@@ -1190,9 +1315,35 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
          params[3] = obj->CropRect[3];
          break;
 #endif
+      case GL_TEXTURE_SWIZZLE_R_EXT:
+      case GL_TEXTURE_SWIZZLE_G_EXT:
+      case GL_TEXTURE_SWIZZLE_B_EXT:
+      case GL_TEXTURE_SWIZZLE_A_EXT:
+         if (ctx->Extensions.EXT_texture_swizzle) {
+            GLuint comp = pname - GL_TEXTURE_SWIZZLE_R_EXT;
+            *params = obj->Swizzle[comp];
+         }
+         else {
+            error = GL_TRUE;
+         }
+         break;
+
+      case GL_TEXTURE_SWIZZLE_RGBA_EXT:
+         if (ctx->Extensions.EXT_texture_swizzle) {
+            COPY_4V(params, obj->Swizzle);
+         }
+         else {
+            error = GL_TRUE;
+         }
+         break;
+
       default:
          ; /* silence warnings */
    }
-   /* If we get here, pname was an unrecognized enum */
-   _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexParameteriv(pname=0x%x)", pname);
+
+   if (error)
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexParameteriv(pname=0x%x)",
+		  pname);
+
+   _mesa_unlock_texture(ctx, obj);
 }
-- 
cgit v1.2.3


From 54c62ba5c36f3e2b279151f5df851d2ceee15319 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 28 Jan 2009 10:31:05 -0700
Subject: mesa: implement texture swizzling in swrast

And enable GL_EXT_texture_swizzle for software drivers.
---
 src/mesa/main/extensions.c     |  1 +
 src/mesa/swrast/s_fragprog.c   | 39 +++++++++++++++++++++++++++++++--------
 src/mesa/swrast/s_texcombine.c | 39 +++++++++++++++++++++++++++++++++++++++
 src/mesa/swrast/s_triangle.c   |  2 ++
 4 files changed, 73 insertions(+), 8 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 053f3697d7..86144c42ad 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -274,6 +274,7 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
 #if FEATURE_EXT_texture_sRGB
    ctx->Extensions.EXT_texture_sRGB = GL_TRUE;
 #endif
+   ctx->Extensions.EXT_texture_swizzle = GL_TRUE;
    ctx->Extensions.EXT_vertex_array_bgra = GL_TRUE;
    ctx->Extensions.IBM_multimode_draw_arrays = GL_TRUE;
    ctx->Extensions.MESA_pack_invert = GL_TRUE;
diff --git a/src/mesa/swrast/s_fragprog.c b/src/mesa/swrast/s_fragprog.c
index 45ba91ff86..58ef91ec01 100644
--- a/src/mesa/swrast/s_fragprog.c
+++ b/src/mesa/swrast/s_fragprog.c
@@ -32,6 +32,35 @@
 #include "s_span.h"
 
 
+/**
+ * Apply texture object's swizzle (X/Y/Z/W/0/1) to incoming 'texel'
+ * and return results in 'colorOut'.
+ */
+static INLINE void
+swizzle_texel(const GLchan texel[4], GLfloat colorOut[4], GLuint swizzle)
+{
+   if (swizzle == SWIZZLE_NOOP) {
+      colorOut[0] = CHAN_TO_FLOAT(texel[0]);
+      colorOut[1] = CHAN_TO_FLOAT(texel[1]);
+      colorOut[2] = CHAN_TO_FLOAT(texel[2]);
+      colorOut[3] = CHAN_TO_FLOAT(texel[3]);
+   }
+   else {
+      GLfloat vector[6];
+      vector[SWIZZLE_X] = CHAN_TO_FLOAT(texel[0]);
+      vector[SWIZZLE_Y] = CHAN_TO_FLOAT(texel[1]);
+      vector[SWIZZLE_Z] = CHAN_TO_FLOAT(texel[2]);
+      vector[SWIZZLE_W] = CHAN_TO_FLOAT(texel[3]);
+      vector[SWIZZLE_ZERO] = 0.0F;
+      vector[SWIZZLE_ONE] = 1.0F;
+      colorOut[0] = vector[GET_SWZ(swizzle, 0)];
+      colorOut[1] = vector[GET_SWZ(swizzle, 1)];
+      colorOut[2] = vector[GET_SWZ(swizzle, 2)];
+      colorOut[3] = vector[GET_SWZ(swizzle, 3)];
+   }
+}
+
+
 /**
  * Fetch a texel with given lod.
  * Called via machine->FetchTexelLod()
@@ -52,10 +81,7 @@ fetch_texel_lod( GLcontext *ctx, const GLfloat texcoord[4], GLfloat lambda,
       swrast->TextureSample[unit](ctx, texObj, 1,
                                   (const GLfloat (*)[4]) texcoord,
                                   &lambda, &rgba);
-      color[0] = CHAN_TO_FLOAT(rgba[0]);
-      color[1] = CHAN_TO_FLOAT(rgba[1]);
-      color[2] = CHAN_TO_FLOAT(rgba[2]);
-      color[3] = CHAN_TO_FLOAT(rgba[3]);
+      swizzle_texel(rgba, color, texObj->_Swizzle);
    }
    else {
       color[0] = color[1] = color[2] = color[3] = 0.0F;
@@ -97,10 +123,7 @@ fetch_texel_deriv( GLcontext *ctx, const GLfloat texcoord[4],
       swrast->TextureSample[unit](ctx, texObj, 1,
                                   (const GLfloat (*)[4]) texcoord,
                                   &lambda, &rgba);
-      color[0] = CHAN_TO_FLOAT(rgba[0]);
-      color[1] = CHAN_TO_FLOAT(rgba[1]);
-      color[2] = CHAN_TO_FLOAT(rgba[2]);
-      color[3] = CHAN_TO_FLOAT(rgba[3]);
+      swizzle_texel(rgba, color, texObj->_Swizzle);
    }
    else {
       color[0] = color[1] = color[2] = color[3] = 0.0F;
diff --git a/src/mesa/swrast/s_texcombine.c b/src/mesa/swrast/s_texcombine.c
index df6efad66c..1b8775bf30 100644
--- a/src/mesa/swrast/s_texcombine.c
+++ b/src/mesa/swrast/s_texcombine.c
@@ -31,6 +31,7 @@
 #include "main/imports.h"
 #include "main/macros.h"
 #include "main/pixel.h"
+#include "shader/prog_instruction.h"
 
 #include "s_context.h"
 #include "s_texcombine.h"
@@ -815,6 +816,36 @@ texture_combine( const GLcontext *ctx, GLuint unit, GLuint n,
 #undef PROD
 
 
+/**
+ * Apply X/Y/Z/W/0/1 swizzle to an array of colors/texels.
+ * See GL_EXT_texture_swizzle.
+ */
+static void
+swizzle_texels(GLuint swizzle, GLuint count, GLchan (*texels)[4])
+{
+   const GLuint swzR = GET_SWZ(swizzle, 0);
+   const GLuint swzG = GET_SWZ(swizzle, 1);
+   const GLuint swzB = GET_SWZ(swizzle, 2);
+   const GLuint swzA = GET_SWZ(swizzle, 3);
+   GLchan vector[6];
+   GLuint i;
+
+   vector[SWIZZLE_ZERO] = 0;
+   vector[SWIZZLE_ONE] = CHAN_MAX;
+
+   for (i = 0; i < count; i++) {
+      vector[SWIZZLE_X] = texels[i][0];
+      vector[SWIZZLE_Y] = texels[i][1];
+      vector[SWIZZLE_Z] = texels[i][2];
+      vector[SWIZZLE_W] = texels[i][3];
+      texels[i][RCOMP] = vector[swzR];
+      texels[i][GCOMP] = vector[swzG];
+      texels[i][BCOMP] = vector[swzB];
+      texels[i][ACOMP] = vector[swzA];
+   }
+}
+
+
 /**
  * Apply a conventional OpenGL texture env mode (REPLACE, ADD, BLEND,
  * MODULATE, or DECAL) to an array of fragments.
@@ -1241,9 +1272,15 @@ _swrast_texture_span( GLcontext *ctx, SWspan *span )
             _mesa_lookup_rgba_float(&texUnit->ColorTable, span->end, texels);
 #endif
          }
+
+         /* GL_EXT_texture_swizzle */
+         if (curObj->_Swizzle != SWIZZLE_NOOP) {
+            swizzle_texels(curObj->_Swizzle, span->end, texels);
+         }
       }
    }
 
+
    /*
     * OK, now apply the texture (aka texture combine/blend).
     * We modify the span->color.rgba values.
@@ -1262,6 +1299,8 @@ _swrast_texture_span( GLcontext *ctx, SWspan *span )
             const GLchan (*texels)[4] = (const GLchan (*)[4])
                (swrast->TexelBuffer + unit *
                 (span->end * 4 * sizeof(GLchan)));
+
+
             texture_apply( ctx, texUnit, span->end,
                            (CONST GLchan (*)[4]) primary_rgba, texels,
                            span->array->rgba );
diff --git a/src/mesa/swrast/s_triangle.c b/src/mesa/swrast/s_triangle.c
index 5d232487f3..063130714c 100644
--- a/src/mesa/swrast/s_triangle.c
+++ b/src/mesa/swrast/s_triangle.c
@@ -35,6 +35,7 @@
 #include "main/imports.h"
 #include "main/macros.h"
 #include "main/texformat.h"
+#include "shader/prog_instruction.h"
 
 #include "s_aatriangle.h"
 #include "s_context.h"
@@ -1063,6 +1064,7 @@ _swrast_choose_triangle( GLcontext *ctx )
              && ctx->Texture.Unit[0]._ReallyEnabled == TEXTURE_2D_BIT
              && texObj2D->WrapS == GL_REPEAT
              && texObj2D->WrapT == GL_REPEAT
+             && texObj2D->_Swizzle == SWIZZLE_NOOP
              && texImg->_IsPowerOfTwo
              && texImg->Border == 0
              && texImg->Width == texImg->RowStride
-- 
cgit v1.2.3


From 72f0b4a55ba36bb8571b4c11d0098361f766814e Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 28 Jan 2009 10:44:04 -0700
Subject: mesa: additional GL_INVALID_OPERATION tests for texture swizzle

---
 src/mesa/main/texparam.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index 695bff0097..41c914e5b3 100644
--- a/src/mesa/main/texparam.c
+++ b/src/mesa/main/texparam.c
@@ -368,6 +368,11 @@ set_tex_parameteri(GLcontext *ctx,
       if (ctx->Extensions.EXT_texture_swizzle) {
          const GLuint comp = pname - GL_TEXTURE_SWIZZLE_R_EXT;
          const GLint swz = comp_to_swizzle(params[0]);
+         if (swz < 0) {
+            _mesa_error(ctx, GL_INVALID_OPERATION,
+                        "glTexParameter(swizzle 0x%x)", params[0]);
+            return;
+         }
          ASSERT(comp < 4);
          if (swz >= 0) {
             FLUSH_VERTICES(ctx, _NEW_TEXTURE);
@@ -390,8 +395,8 @@ set_tex_parameteri(GLcontext *ctx,
                set_swizzle_component(&texObj->_Swizzle, comp, swz);
             }
             else {
-               _mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(param=0x%x)",
-                           params[comp]);
+               _mesa_error(ctx, GL_INVALID_OPERATION,
+                           "glTexParameter(swizzle 0x%x)", params[comp]);
                return;
             }
          }
-- 
cgit v1.2.3


From 26da28c995557c8b913e5ccfe31b31dc32e6c735 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 28 Jan 2009 16:49:28 -0700
Subject: mesa: remove GL_SGIX_shadow, GL_SGIX_shadow_ambient and
 GL_SGIX_depth_texture

Everyone should be using the newer/better ARB versions of these extensions.
---
 docs/relnotes-7.5.html           |  2 +
 src/mesa/main/attrib.c           | 12 ++---
 src/mesa/main/extensions.c       |  7 +--
 src/mesa/main/mtypes.h           |  7 +--
 src/mesa/main/texobj.c           |  8 +---
 src/mesa/main/texparam.c         | 82 +++++----------------------------
 src/mesa/main/texstate.c         | 10 ----
 src/mesa/shader/prog_statevars.c | 10 ++--
 src/mesa/swrast/s_texfilter.c    | 99 +---------------------------------------
 9 files changed, 29 insertions(+), 208 deletions(-)

(limited to 'src/mesa/main')

diff --git a/docs/relnotes-7.5.html b/docs/relnotes-7.5.html
index ef8759ba6a..621bd4afac 100644
--- a/docs/relnotes-7.5.html
+++ b/docs/relnotes-7.5.html
@@ -48,6 +48,8 @@ including GL_ATI_separate_stencil, GL_EXT_stencil_two_side and OpenGL 2.0
 
 <h2>Changes</h2>
 <ul>
+<li>Remove support for GL_SGIX_shadow, GL_SGIX_shadow_ambient and
+GL_SGIX_depth_texture extensions.  Superseded by the ARB versions.
 </ul>
 
 </body>
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 825c841ee2..3be7fd5a2d 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -820,15 +820,9 @@ pop_texture_group(GLcontext *ctx, struct texture_state *texstate)
             _mesa_TexParameterf(target, GL_TEXTURE_MAX_ANISOTROPY_EXT,
                                 obj->MaxAnisotropy);
          }
-         if (ctx->Extensions.SGIX_shadow) {
-            _mesa_TexParameteri(target, GL_TEXTURE_COMPARE_SGIX,
-                                obj->CompareFlag);
-            _mesa_TexParameteri(target, GL_TEXTURE_COMPARE_OPERATOR_SGIX,
-                                obj->CompareOperator);
-         }
-         if (ctx->Extensions.SGIX_shadow_ambient) {
-            _mesa_TexParameterf(target, GL_SHADOW_AMBIENT_SGIX,
-                                obj->ShadowAmbient);
+         if (ctx->Extensions.ARB_shadow_ambient) {
+            _mesa_TexParameterf(target, GL_TEXTURE_COMPARE_FAIL_VALUE_ARB,
+                                obj->CompareFailValue);
          }
       }
 
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 86144c42ad..4ebdb5d9ae 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -62,7 +62,7 @@ static const struct {
    { OFF, "GL_ARB_shading_language_100",       F(ARB_shading_language_100) },
    { OFF, "GL_ARB_shading_language_120",       F(ARB_shading_language_120) },
    { OFF, "GL_ARB_shadow",                     F(ARB_shadow) },
-   { OFF, "GL_ARB_shadow_ambient",             F(SGIX_shadow_ambient) },
+   { OFF, "GL_ARB_shadow_ambient",             F(ARB_shadow_ambient) },
    { OFF, "GL_ARB_texture_border_clamp",       F(ARB_texture_border_clamp) },
    { OFF, "GL_ARB_texture_compression",        F(ARB_texture_compression) },
    { OFF, "GL_ARB_texture_cube_map",           F(ARB_texture_cube_map) },
@@ -170,8 +170,6 @@ static const struct {
    { ON,  "GL_SGIS_texture_edge_clamp",        F(SGIS_texture_edge_clamp) },
    { ON,  "GL_SGIS_texture_lod",               F(SGIS_texture_lod) },
    { OFF, "GL_SGIX_depth_texture",             F(ARB_depth_texture) },
-   { OFF, "GL_SGIX_shadow",                    F(SGIX_shadow) },
-   { OFF, "GL_SGIX_shadow_ambient",            F(SGIX_shadow_ambient) },
    { OFF, "GL_SUN_multi_draw_arrays",          F(EXT_multi_draw_arrays) },
    { OFF, "GL_S3_s3tc",                        F(S3_s3tc) },
 };
@@ -214,6 +212,7 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
    ctx->Extensions.ARB_shading_language_120 = GL_FALSE; /* not quite done */
 #endif
    ctx->Extensions.ARB_shadow = GL_TRUE;
+   ctx->Extensions.ARB_shadow_ambient = GL_TRUE;
    ctx->Extensions.ARB_texture_border_clamp = GL_TRUE;
    ctx->Extensions.ARB_texture_cube_map = GL_TRUE;
    ctx->Extensions.ARB_texture_env_combine = GL_TRUE;
@@ -302,8 +301,6 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
    ctx->Extensions.SGI_texture_color_table = GL_TRUE;
    ctx->Extensions.SGIS_generate_mipmap = GL_TRUE;
    ctx->Extensions.SGIS_texture_edge_clamp = GL_TRUE;
-   ctx->Extensions.SGIX_shadow = GL_TRUE;
-   ctx->Extensions.SGIX_shadow_ambient = GL_TRUE;
 #if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
    ctx->Extensions.EXT_gpu_program_parameters = GL_TRUE;
 #endif
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 8ab0d26f45..da243eceac 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1433,11 +1433,9 @@ struct gl_texture_object
    GLint BaseLevel;		/**< min mipmap level, OpenGL 1.2 */
    GLint MaxLevel;		/**< max mipmap level, OpenGL 1.2 */
    GLfloat MaxAnisotropy;	/**< GL_EXT_texture_filter_anisotropic */
-   GLboolean CompareFlag;	/**< GL_SGIX_shadow */
-   GLenum CompareOperator;	/**< GL_SGIX_shadow */
-   GLfloat ShadowAmbient;       /**< GL_ARB_shadow_ambient */
    GLenum CompareMode;		/**< GL_ARB_shadow */
    GLenum CompareFunc;		/**< GL_ARB_shadow */
+   GLfloat CompareFailValue;    /**< GL_ARB_shadow_ambient */
    GLenum _Function;		/**< Comparison function derived from 
 				 * \c CompareOperator, \c CompareMode, and
 				 * \c CompareFunc.
@@ -2563,6 +2561,7 @@ struct gl_extensions
    GLboolean ARB_shading_language_100;
    GLboolean ARB_shading_language_120;
    GLboolean ARB_shadow;
+   GLboolean ARB_shadow_ambient; /* or GL_ARB_shadow_ambient */
    GLboolean ARB_texture_border_clamp;
    GLboolean ARB_texture_compression;
    GLboolean ARB_texture_cube_map;
@@ -2660,8 +2659,6 @@ struct gl_extensions
    GLboolean SGIS_generate_mipmap;
    GLboolean SGIS_texture_edge_clamp;
    GLboolean SGIS_texture_lod;
-   GLboolean SGIX_shadow;
-   GLboolean SGIX_shadow_ambient; /* or GL_ARB_shadow_ambient */
    GLboolean TDFX_texture_compression_FXT1;
    GLboolean S3_s3tc;
    /*@}*/
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index fad39a0634..4e6cf439fc 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -134,12 +134,10 @@ _mesa_initialize_texture_object( struct gl_texture_object *obj,
    obj->BaseLevel = 0;
    obj->MaxLevel = 1000;
    obj->MaxAnisotropy = 1.0;
-   obj->CompareFlag = GL_FALSE;                      /* SGIX_shadow */
-   obj->CompareOperator = GL_TEXTURE_LEQUAL_R_SGIX;  /* SGIX_shadow */
    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->ShadowAmbient = 0.0F;          /* ARB/SGIX_shadow_ambient */
    obj->Swizzle[0] = GL_RED;
    obj->Swizzle[1] = GL_GREEN;
    obj->Swizzle[2] = GL_BLUE;
@@ -248,11 +246,9 @@ _mesa_copy_texture_object( struct gl_texture_object *dest,
    dest->BaseLevel = src->BaseLevel;
    dest->MaxLevel = src->MaxLevel;
    dest->MaxAnisotropy = src->MaxAnisotropy;
-   dest->CompareFlag = src->CompareFlag;
-   dest->CompareOperator = src->CompareOperator;
-   dest->ShadowAmbient = src->ShadowAmbient;
    dest->CompareMode = src->CompareMode;
    dest->CompareFunc = src->CompareFunc;
+   dest->CompareFailValue = src->CompareFailValue;
    dest->DepthMode = src->DepthMode;
    dest->_MaxLevel = src->_MaxLevel;
    dest->_MaxLambda = src->_MaxLambda;
diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index 41c914e5b3..f610fa8dda 100644
--- a/src/mesa/main/texparam.c
+++ b/src/mesa/main/texparam.c
@@ -260,30 +260,6 @@ set_tex_parameteri(GLcontext *ctx,
       texObj->MaxLevel = params[0];
       return;
 
-   case GL_TEXTURE_COMPARE_SGIX:
-      if (ctx->Extensions.SGIX_shadow) {
-         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-         texObj->CompareFlag = params[0] ? GL_TRUE : GL_FALSE;
-      }
-      else {
-         _mesa_error(ctx, GL_INVALID_ENUM,
-                     "glTexParameter(pname=GL_TEXTURE_COMPARE_SGIX)");
-      }
-      return;
-
-   case GL_TEXTURE_COMPARE_OPERATOR_SGIX:
-      if (ctx->Extensions.SGIX_shadow &&
-          (params[0] == GL_TEXTURE_LEQUAL_R_SGIX || 
-           params[0] == GL_TEXTURE_GEQUAL_R_SGIX)) {
-         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-         texObj->CompareOperator = params[0];
-      }
-      else {
-         _mesa_error(ctx, GL_INVALID_ENUM,
-                     "glTexParameter(GL_TEXTURE_COMPARE_OPERATOR_SGIX)");
-      }
-      return;
-
    case GL_GENERATE_MIPMAP_SGIS:
       if (ctx->Extensions.SGIS_generate_mipmap) {
          FLUSH_VERTICES(ctx, _NEW_TEXTURE);
@@ -454,14 +430,14 @@ set_tex_parameterf(GLcontext *ctx,
       }
       return;
 
-   case GL_SHADOW_AMBIENT_SGIX: /* aka GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
-      if (ctx->Extensions.SGIX_shadow_ambient) {
+   case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB:
+      if (ctx->Extensions.ARB_shadow_ambient) {
          FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-         texObj->ShadowAmbient = CLAMP(params[0], 0.0F, 1.0F);
+         texObj->CompareFailValue = CLAMP(params[0], 0.0F, 1.0F);
       }
       else {
          _mesa_error(ctx, GL_INVALID_ENUM,
-                     "glTexParameter(pname=GL_SHADOW_AMBIENT_SGIX)");
+                    "glTexParameter(pname=GL_TEXTURE_COMPARE_FAIL_VALUE_ARB)");
       }
       return;
 
@@ -512,8 +488,6 @@ _mesa_TexParameterf(GLenum target, GLenum pname, GLfloat param)
    case GL_TEXTURE_WRAP_R:
    case GL_TEXTURE_BASE_LEVEL:
    case GL_TEXTURE_MAX_LEVEL:
-   case GL_TEXTURE_COMPARE_SGIX:
-   case GL_TEXTURE_COMPARE_OPERATOR_SGIX:
    case GL_GENERATE_MIPMAP_SGIS:
    case GL_TEXTURE_COMPARE_MODE_ARB:
    case GL_TEXTURE_COMPARE_FUNC_ARB:
@@ -556,8 +530,6 @@ _mesa_TexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
    case GL_TEXTURE_WRAP_R:
    case GL_TEXTURE_BASE_LEVEL:
    case GL_TEXTURE_MAX_LEVEL:
-   case GL_TEXTURE_COMPARE_SGIX:
-   case GL_TEXTURE_COMPARE_OPERATOR_SGIX:
    case GL_GENERATE_MIPMAP_SGIS:
    case GL_TEXTURE_COMPARE_MODE_ARB:
    case GL_TEXTURE_COMPARE_FUNC_ARB:
@@ -613,7 +585,7 @@ _mesa_TexParameteri(GLenum target, GLenum pname, GLint param)
    case GL_TEXTURE_PRIORITY:
    case GL_TEXTURE_MAX_ANISOTROPY_EXT:
    case GL_TEXTURE_LOD_BIAS:
-   case GL_SHADOW_AMBIENT_SGIX: /* aka GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+   case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB:
       {
          GLfloat fparam = (GLfloat) param;
          /* convert int param to float */
@@ -662,7 +634,7 @@ _mesa_TexParameteriv(GLenum target, GLenum pname, const GLint *params)
    case GL_TEXTURE_PRIORITY:
    case GL_TEXTURE_MAX_ANISOTROPY_EXT:
    case GL_TEXTURE_LOD_BIAS:
-   case GL_SHADOW_AMBIENT_SGIX: /* aka GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+   case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB:
       {
          /* convert int param to float */
          GLfloat fparam = (GLfloat) params[0];
@@ -1060,23 +1032,9 @@ _mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params )
 	 else
 	    error = GL_TRUE;
          break;
-      case GL_TEXTURE_COMPARE_SGIX:
-         if (ctx->Extensions.SGIX_shadow) {
-            *params = (GLfloat) obj->CompareFlag;
-         }
-	 else 
-	    error = GL_TRUE;
-         break;
-      case GL_TEXTURE_COMPARE_OPERATOR_SGIX:
-         if (ctx->Extensions.SGIX_shadow) {
-            *params = (GLfloat) obj->CompareOperator;
-         }
-	 else 
-	    error = GL_TRUE;
-         break;
-      case GL_SHADOW_AMBIENT_SGIX: /* aka GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
-         if (ctx->Extensions.SGIX_shadow_ambient) {
-            *params = obj->ShadowAmbient;
+      case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB:
+         if (ctx->Extensions.ARB_shadow_ambient) {
+            *params = obj->CompareFailValue;
          }
 	 else 
 	    error = GL_TRUE;
@@ -1248,25 +1206,9 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
             error = GL_TRUE;
          }
          break;
-      case GL_TEXTURE_COMPARE_SGIX:
-         if (ctx->Extensions.SGIX_shadow) {
-            *params = (GLint) obj->CompareFlag;
-         }
-         else {
-            error = GL_TRUE;
-         }
-         break;
-      case GL_TEXTURE_COMPARE_OPERATOR_SGIX:
-         if (ctx->Extensions.SGIX_shadow) {
-            *params = (GLint) obj->CompareOperator;
-         }
-         else {
-            error = GL_TRUE;
-         }
-         break;
-      case GL_SHADOW_AMBIENT_SGIX: /* aka GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
-         if (ctx->Extensions.SGIX_shadow_ambient) {
-            *params = (GLint) FLOAT_TO_INT(obj->ShadowAmbient);
+      case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB:
+         if (ctx->Extensions.ARB_shadow_ambient) {
+            *params = (GLint) FLOAT_TO_INT(obj->CompareFailValue);
          }
          else {
             error = GL_TRUE;
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 7cddec0bce..f7a4d8b323 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -404,16 +404,6 @@ update_texture_compare_function(GLcontext *ctx,
        */
       tObj->_Function = GL_NONE;
    }
-   else if (tObj->CompareFlag) {
-      /* GL_SGIX_shadow */
-      if (tObj->CompareOperator == GL_TEXTURE_LEQUAL_R_SGIX) {
-         tObj->_Function = GL_LEQUAL;
-      }
-      else {
-         ASSERT(tObj->CompareOperator == GL_TEXTURE_GEQUAL_R_SGIX);
-         tObj->_Function = GL_GEQUAL;
-      }
-   }
    else if (tObj->CompareMode == GL_COMPARE_R_TO_TEXTURE_ARB) {
       /* GL_ARB_shadow */
       tObj->_Function = tObj->CompareFunc;
diff --git a/src/mesa/shader/prog_statevars.c b/src/mesa/shader/prog_statevars.c
index 615826b210..3ce60427bf 100644
--- a/src/mesa/shader/prog_statevars.c
+++ b/src/mesa/shader/prog_statevars.c
@@ -493,10 +493,10 @@ _mesa_fetch_state(GLcontext *ctx, const gl_state_index state[],
             const struct gl_texture_object *texObj
                = ctx->Texture.Unit[unit]._Current;
             if (texObj) {
-               value[0] = texObj->ShadowAmbient;
-               value[1] = texObj->ShadowAmbient;
-               value[2] = texObj->ShadowAmbient;
-               value[3] = texObj->ShadowAmbient;
+               value[0] =
+               value[1] =
+               value[2] =
+               value[3] = texObj->CompareFailValue;
             }
          }
          return;
@@ -777,7 +777,7 @@ append_token(char *dst, gl_state_index k)
       append(dst, "PCMbias");
       break;
    case STATE_SHADOW_AMBIENT:
-      append(dst, "ShadowAmbient");
+      append(dst, "CompareFailValue");
       break;
    default:
       /* probably STATE_INTERNAL_DRIVER+i (driver private state) */
diff --git a/src/mesa/swrast/s_texfilter.c b/src/mesa/swrast/s_texfilter.c
index a095b255ab..8d72018cf4 100644
--- a/src/mesa/swrast/s_texfilter.c
+++ b/src/mesa/swrast/s_texfilter.c
@@ -2826,7 +2826,7 @@ sample_depth_texture( GLcontext *ctx,
           tObj->Target == GL_TEXTURE_1D_ARRAY_EXT ||
           tObj->Target == GL_TEXTURE_2D_ARRAY_EXT);
 
-   UNCLAMPED_FLOAT_TO_CHAN(ambient, tObj->ShadowAmbient);
+   UNCLAMPED_FLOAT_TO_CHAN(ambient, tObj->CompareFailValue);
 
    /* XXXX if tObj->MinFilter != tObj->MagFilter, we're ignoring lambda */
 
@@ -3156,103 +3156,6 @@ sample_depth_texture( GLcontext *ctx,
 }
 
 
-#if 0
-/*
- * Experimental depth texture sampling function.
- */
-static void
-sample_depth_texture2(const GLcontext *ctx,
-                     const struct gl_texture_unit *texUnit,
-                     GLuint n, const GLfloat texcoords[][4],
-                     GLchan texel[][4])
-{
-   const struct gl_texture_object *texObj = texUnit->_Current;
-   const GLint baseLevel = texObj->BaseLevel;
-   const struct gl_texture_image *texImage = texObj->Image[0][baseLevel];
-   const GLuint width = texImage->Width;
-   const GLuint height = texImage->Height;
-   GLchan ambient;
-   GLboolean lequal, gequal;
-
-   if (texObj->Target != GL_TEXTURE_2D) {
-      _mesa_problem(ctx, "only 2-D depth textures supported at this time");
-      return;
-   }
-
-   if (texObj->MinFilter != texObj->MagFilter) {
-      _mesa_problem(ctx, "mipmapped depth textures not supported at this time");
-      return;
-   }
-
-   /* XXX the GL_SGIX_shadow extension spec doesn't say what to do if
-    * GL_TEXTURE_COMPARE_SGIX == GL_TRUE but the current texture object
-    * isn't a depth texture.
-    */
-   if (texImage->TexFormat->BaseFormat != GL_DEPTH_COMPONENT) {
-      _mesa_problem(ctx,"GL_TEXTURE_COMPARE_SGIX enabled with non-depth texture");
-      return;
-   }
-
-   UNCLAMPED_FLOAT_TO_CHAN(ambient, tObj->ShadowAmbient);
-
-   if (texObj->CompareOperator == GL_TEXTURE_LEQUAL_R_SGIX) {
-      lequal = GL_TRUE;
-      gequal = GL_FALSE;
-   }
-   else {
-      lequal = GL_FALSE;
-      gequal = GL_TRUE;
-   }
-
-   {
-      GLuint i;
-      for (i = 0; i < n; i++) {
-         const GLint K = 3;
-         GLint col, row, ii, jj, imin, imax, jmin, jmax, samples, count;
-         GLfloat w;
-         GLchan lum;
-         col = nearest_texel_location(texObj->WrapS, img, width,
-                                      texcoords[i][0]);
-         row = nearest_texel_location(texObj->WrapT, img, height,
-                                      texcoords[i][1]);
-
-         imin = col - K;
-         imax = col + K;
-         jmin = row - K;
-         jmax = row + K;
-
-         if (imin < 0)  imin = 0;
-         if (imax >= width)  imax = width - 1;
-         if (jmin < 0)  jmin = 0;
-         if (jmax >= height) jmax = height - 1;
-
-         samples = (imax - imin + 1) * (jmax - jmin + 1);
-         count = 0;
-         for (jj = jmin; jj <= jmax; jj++) {
-            for (ii = imin; ii <= imax; ii++) {
-               GLfloat depthSample;
-               texImage->FetchTexelf(texImage, ii, jj, 0, &depthSample);
-               if ((depthSample <= r[i] && lequal) ||
-                   (depthSample >= r[i] && gequal)) {
-                  count++;
-               }
-            }
-         }
-
-         w = (GLfloat) count / (GLfloat) samples;
-         w = CHAN_MAXF - w * (CHAN_MAXF - (GLfloat) ambient);
-         lum = (GLint) w;
-
-         texel[i][RCOMP] = lum;
-         texel[i][GCOMP] = lum;
-         texel[i][BCOMP] = lum;
-         texel[i][ACOMP] = CHAN_MAX;
-      }
-   }
-}
-#endif
-
-
 /**
  * We use this function when a texture object is in an "incomplete" state.
  * When a fragment program attempts to sample an incomplete texture we
-- 
cgit v1.2.3


From 33fa5e4bfad8005f09ad3c9fc92c40fa863935d1 Mon Sep 17 00:00:00 2001
From: Ian Romanick <idr@freedesktop.org>
Date: Tue, 27 Jan 2009 17:36:03 -0800
Subject: Make GL_ARB_texture_compression mandatory

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
---
 src/mesa/drivers/dri/common/utils.c           |  2 +
 src/mesa/drivers/dri/i810/i810context.c       |  2 -
 src/mesa/drivers/dri/intel/intel_extensions.c |  2 -
 src/mesa/drivers/dri/mach64/mach64_tex.c      |  6 ++
 src/mesa/drivers/dri/mga/mga_xmesa.c          |  2 -
 src/mesa/drivers/dri/r128/r128_context.c      |  2 -
 src/mesa/drivers/dri/r200/r200_context.c      |  2 -
 src/mesa/drivers/dri/r300/r300_context.c      |  2 -
 src/mesa/drivers/dri/radeon/radeon_context.c  |  2 -
 src/mesa/drivers/dri/savage/savage_xmesa.c    |  2 -
 src/mesa/drivers/dri/sis/sis_context.c        |  3 -
 src/mesa/drivers/dri/tdfx/tdfx_context.c      |  2 -
 src/mesa/drivers/glide/fxdd.c                 |  2 -
 src/mesa/main/attrib.c                        |  5 +-
 src/mesa/main/extensions.c                    |  4 +-
 src/mesa/main/get.c                           |  9 ---
 src/mesa/main/get_gen.py                      |  6 +-
 src/mesa/main/hint.c                          |  4 --
 src/mesa/main/texcompress.c                   | 94 +++++++++++++--------------
 src/mesa/main/texformat.c                     | 52 +++++++--------
 src/mesa/main/teximage.c                      | 32 +++++----
 src/mesa/main/texparam.c                      | 38 ++++-------
 22 files changed, 114 insertions(+), 161 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/common/utils.c b/src/mesa/drivers/dri/common/utils.c
index 30c860b96c..7bee525770 100644
--- a/src/mesa/drivers/dri/common/utils.c
+++ b/src/mesa/drivers/dri/common/utils.c
@@ -180,6 +180,7 @@ driGetRendererString( char * buffer, const char * hardware_name,
 
 
 #define need_GL_ARB_multisample
+#define need_GL_ARB_texture_compression
 #define need_GL_ARB_transpose_matrix
 #define need_GL_ARB_window_pos
 #define need_GL_EXT_compiled_vertex_array
@@ -199,6 +200,7 @@ driGetRendererString( char * buffer, const char * hardware_name,
 
 static const struct dri_extension all_mesa_extensions[] = {
    { "GL_ARB_multisample",           GL_ARB_multisample_functions },
+   { "GL_ARB_texture_compression",   GL_ARB_texture_compression_functions },
    { "GL_ARB_transpose_matrix",      GL_ARB_transpose_matrix_functions },
    { "GL_ARB_window_pos",            GL_ARB_window_pos_functions },
    { "GL_EXT_blend_func_separate",   GL_EXT_blend_func_separate_functions },
diff --git a/src/mesa/drivers/dri/i810/i810context.c b/src/mesa/drivers/dri/i810/i810context.c
index c281a4990e..29c7363b49 100644
--- a/src/mesa/drivers/dri/i810/i810context.c
+++ b/src/mesa/drivers/dri/i810/i810context.c
@@ -64,7 +64,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "utils.h"
 
 #define need_GL_ARB_multisample
-#define need_GL_ARB_texture_compression
 #define need_GL_ARB_vertex_buffer_object
 #include "extension_helper.h"
 
@@ -125,7 +124,6 @@ const struct dri_extension card_extensions[] =
 {
     { "GL_ARB_multisample",                GL_ARB_multisample_functions },
     { "GL_ARB_multitexture",               NULL },
-    { "GL_ARB_texture_compression",        GL_ARB_texture_compression_functions },
     { "GL_ARB_texture_env_add",            NULL },
     { "GL_ARB_texture_env_combine",        NULL },
     { "GL_ARB_texture_env_crossbar",       NULL },
diff --git a/src/mesa/drivers/dri/intel/intel_extensions.c b/src/mesa/drivers/dri/intel/intel_extensions.c
index 8f09f8d645..9030af113b 100644
--- a/src/mesa/drivers/dri/intel/intel_extensions.c
+++ b/src/mesa/drivers/dri/intel/intel_extensions.c
@@ -35,7 +35,6 @@
 #define need_GL_ARB_occlusion_query
 #define need_GL_ARB_point_parameters
 #define need_GL_ARB_shader_objects
-#define need_GL_ARB_texture_compression
 #define need_GL_ARB_vertex_buffer_object
 #define need_GL_ARB_vertex_program
 #define need_GL_ARB_vertex_shader
@@ -72,7 +71,6 @@ static const struct dri_extension card_extensions[] = {
    { "GL_ARB_multitexture",               NULL },
    { "GL_ARB_point_parameters",           GL_ARB_point_parameters_functions },
    { "GL_ARB_texture_border_clamp",       NULL },
-   { "GL_ARB_texture_compression",        GL_ARB_texture_compression_functions },
    { "GL_ARB_texture_cube_map",           NULL },
    { "GL_ARB_texture_env_add",            NULL },
    { "GL_ARB_texture_env_combine",        NULL },
diff --git a/src/mesa/drivers/dri/mach64/mach64_tex.c b/src/mesa/drivers/dri/mach64/mach64_tex.c
index 1f9d3c57eb..9fe267eafd 100644
--- a/src/mesa/drivers/dri/mach64/mach64_tex.c
+++ b/src/mesa/drivers/dri/mach64/mach64_tex.c
@@ -152,6 +152,7 @@ mach64ChooseTextureFormat( GLcontext *ctx, GLint internalFormat,
    case GL_ALPHA8:
    case GL_ALPHA12:
    case GL_ALPHA16:
+   case GL_COMPRESSED_ALPHA:
    case 2:
    case GL_LUMINANCE_ALPHA:
    case GL_LUMINANCE4_ALPHA4:
@@ -160,9 +161,11 @@ mach64ChooseTextureFormat( GLcontext *ctx, GLint internalFormat,
    case GL_LUMINANCE12_ALPHA4:
    case GL_LUMINANCE12_ALPHA12:
    case GL_LUMINANCE16_ALPHA16:
+   case GL_COMPRESSED_LUMINANCE_ALPHA:
    case 4:
    case GL_RGBA:
    case GL_RGBA2:
+   case GL_COMPRESSED_RGBA:
       if (mmesa->mach64Screen->cpp == 4)
          return &_mesa_texformat_argb8888;
       else
@@ -193,6 +196,7 @@ mach64ChooseTextureFormat( GLcontext *ctx, GLint internalFormat,
    case GL_RGB10:
    case GL_RGB12:
    case GL_RGB16:
+   case GL_COMPRESSED_RGB:
       if (mmesa->mach64Screen->cpp == 4)
          return &_mesa_texformat_argb8888;
       else
@@ -204,6 +208,7 @@ mach64ChooseTextureFormat( GLcontext *ctx, GLint internalFormat,
    case GL_LUMINANCE8:
    case GL_LUMINANCE12:
    case GL_LUMINANCE16:
+   case GL_COMPRESSED_LUMINANCE:
       if (mmesa->mach64Screen->cpp == 4)
          return &_mesa_texformat_argb8888; /* inefficient but accurate */
       else
@@ -214,6 +219,7 @@ mach64ChooseTextureFormat( GLcontext *ctx, GLint internalFormat,
    case GL_INTENSITY8:
    case GL_INTENSITY12:
    case GL_INTENSITY16:
+   case GL_COMPRESSED_INTENSITY:
       if (mmesa->mach64Screen->cpp == 4)
          return &_mesa_texformat_argb8888; /* inefficient but accurate */
       else
diff --git a/src/mesa/drivers/dri/mga/mga_xmesa.c b/src/mesa/drivers/dri/mga/mga_xmesa.c
index 86da3a2cac..0ebffe9e13 100644
--- a/src/mesa/drivers/dri/mga/mga_xmesa.c
+++ b/src/mesa/drivers/dri/mga/mga_xmesa.c
@@ -70,7 +70,6 @@
 #include "GL/internal/dri_interface.h"
 
 #define need_GL_ARB_multisample
-#define need_GL_ARB_texture_compression
 #define need_GL_ARB_vertex_buffer_object
 #define need_GL_ARB_vertex_program
 #define need_GL_EXT_fog_coord
@@ -386,7 +385,6 @@ static const struct dri_extension g400_extensions[] =
 static const struct dri_extension card_extensions[] =
 {
    { "GL_ARB_multisample",            GL_ARB_multisample_functions },
-   { "GL_ARB_texture_compression",    GL_ARB_texture_compression_functions },
    { "GL_ARB_texture_rectangle",      NULL },
    { "GL_ARB_vertex_buffer_object",   GL_ARB_vertex_buffer_object_functions },
    { "GL_EXT_blend_logic_op",         NULL },
diff --git a/src/mesa/drivers/dri/r128/r128_context.c b/src/mesa/drivers/dri/r128/r128_context.c
index 535a98cc01..9437d900c3 100644
--- a/src/mesa/drivers/dri/r128/r128_context.c
+++ b/src/mesa/drivers/dri/r128/r128_context.c
@@ -66,7 +66,6 @@ int R128_DEBUG = 0;
 #endif
 
 #define need_GL_ARB_multisample
-#define need_GL_ARB_texture_compression
 #define need_GL_ARB_vertex_buffer_object
 #define need_GL_EXT_blend_minmax
 #define need_GL_EXT_fog_coord
@@ -77,7 +76,6 @@ const struct dri_extension card_extensions[] =
 {
     { "GL_ARB_multisample",                GL_ARB_multisample_functions },
     { "GL_ARB_multitexture",               NULL },
-    { "GL_ARB_texture_compression",        GL_ARB_texture_compression_functions },
     { "GL_ARB_texture_env_add",            NULL },
     { "GL_ARB_texture_mirrored_repeat",    NULL },
     { "GL_ARB_vertex_buffer_object",       GL_ARB_vertex_buffer_object_functions },
diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c
index 5531e0a739..cdd96ef2d3 100644
--- a/src/mesa/drivers/dri/r200/r200_context.c
+++ b/src/mesa/drivers/dri/r200/r200_context.c
@@ -63,7 +63,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "r200_vertprog.h"
 
 #define need_GL_ARB_multisample
-#define need_GL_ARB_texture_compression
 #define need_GL_ARB_vertex_buffer_object
 #define need_GL_ARB_vertex_program
 #define need_GL_ATI_fragment_shader
@@ -123,7 +122,6 @@ const struct dri_extension card_extensions[] =
     { "GL_ARB_multisample",                GL_ARB_multisample_functions },
     { "GL_ARB_multitexture",               NULL },
     { "GL_ARB_texture_border_clamp",       NULL },
-    { "GL_ARB_texture_compression",        GL_ARB_texture_compression_functions },
     { "GL_ARB_texture_env_add",            NULL },
     { "GL_ARB_texture_env_combine",        NULL },
     { "GL_ARB_texture_env_dot3",           NULL },
diff --git a/src/mesa/drivers/dri/r300/r300_context.c b/src/mesa/drivers/dri/r300/r300_context.c
index dc4cd5731d..4f7afbc20c 100644
--- a/src/mesa/drivers/dri/r300/r300_context.c
+++ b/src/mesa/drivers/dri/r300/r300_context.c
@@ -80,7 +80,6 @@ int hw_tcl_on = 1;
 #define need_GL_VERSION_2_0
 #define need_GL_ARB_multisample
 #define need_GL_ARB_point_parameters
-#define need_GL_ARB_texture_compression
 #define need_GL_ARB_vertex_buffer_object
 #define need_GL_ARB_vertex_program
 #define need_GL_EXT_blend_equation_separate
@@ -105,7 +104,6 @@ const struct dri_extension card_extensions[] = {
   {"GL_ARB_shadow",			NULL},
   {"GL_ARB_shadow_ambient",		NULL},
   {"GL_ARB_texture_border_clamp",	NULL},
-  {"GL_ARB_texture_compression",	GL_ARB_texture_compression_functions},
   {"GL_ARB_texture_cube_map",		NULL},
   {"GL_ARB_texture_env_add",		NULL},
   {"GL_ARB_texture_env_combine",	NULL},
diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c b/src/mesa/drivers/dri/radeon/radeon_context.c
index 1e992c0b3d..cc34f24214 100644
--- a/src/mesa/drivers/dri/radeon/radeon_context.c
+++ b/src/mesa/drivers/dri/radeon/radeon_context.c
@@ -63,7 +63,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "radeon_maos.h"
 
 #define need_GL_ARB_multisample
-#define need_GL_ARB_texture_compression
 #define need_GL_ARB_vertex_buffer_object
 #define need_GL_EXT_blend_minmax
 #define need_GL_EXT_fog_coord
@@ -117,7 +116,6 @@ const struct dri_extension card_extensions[] =
     { "GL_ARB_multisample",                GL_ARB_multisample_functions },
     { "GL_ARB_multitexture",               NULL },
     { "GL_ARB_texture_border_clamp",       NULL },
-    { "GL_ARB_texture_compression",        GL_ARB_texture_compression_functions },
     { "GL_ARB_texture_env_add",            NULL },
     { "GL_ARB_texture_env_combine",        NULL },
     { "GL_ARB_texture_env_crossbar",       NULL },
diff --git a/src/mesa/drivers/dri/savage/savage_xmesa.c b/src/mesa/drivers/dri/savage/savage_xmesa.c
index a344aab71b..d9dd28a7e6 100644
--- a/src/mesa/drivers/dri/savage/savage_xmesa.c
+++ b/src/mesa/drivers/dri/savage/savage_xmesa.c
@@ -60,7 +60,6 @@
 #include "texmem.h"
 
 #define need_GL_ARB_multisample
-#define need_GL_ARB_texture_compression
 #define need_GL_ARB_vertex_buffer_object
 #define need_GL_EXT_secondary_color
 #include "extension_helper.h"
@@ -135,7 +134,6 @@ static const struct dri_extension card_extensions[] =
 {
     { "GL_ARB_multisample",                GL_ARB_multisample_functions },
     { "GL_ARB_multitexture",               NULL },
-    { "GL_ARB_texture_compression",        GL_ARB_texture_compression_functions },
     { "GL_ARB_vertex_buffer_object",       GL_ARB_vertex_buffer_object_functions },
     { "GL_EXT_stencil_wrap",               NULL },
     { "GL_EXT_texture_lod_bias",           NULL },
diff --git a/src/mesa/drivers/dri/sis/sis_context.c b/src/mesa/drivers/dri/sis/sis_context.c
index 00d17da3ba..ce3a583b3b 100644
--- a/src/mesa/drivers/dri/sis/sis_context.c
+++ b/src/mesa/drivers/dri/sis/sis_context.c
@@ -58,7 +58,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "tnl/t_pipeline.h"
 
 #define need_GL_ARB_multisample
-#define need_GL_ARB_texture_compression
 #define need_GL_ARB_vertex_buffer_object
 #define need_GL_EXT_fog_coord
 #define need_GL_EXT_secondary_color
@@ -77,7 +76,6 @@ struct dri_extension card_extensions[] =
     { "GL_ARB_multisample",                GL_ARB_multisample_functions },
     { "GL_ARB_multitexture",               NULL },
     { "GL_ARB_texture_border_clamp",       NULL },
-    { "GL_ARB_texture_compression",        GL_ARB_texture_compression_functions },
     { "GL_ARB_texture_mirrored_repeat",    NULL },
     { "GL_ARB_vertex_buffer_object",       GL_ARB_vertex_buffer_object_functions },
     /*{ "GL_EXT_fog_coord",                  GL_EXT_fog_coord_functions },*/
@@ -93,7 +91,6 @@ struct dri_extension card_extensions_6326[] =
 {
     { "GL_ARB_multisample",                GL_ARB_multisample_functions },
     /*{ "GL_ARB_texture_border_clamp",       NULL },*/
-    { "GL_ARB_texture_compression",        GL_ARB_texture_compression_functions },
     /*{ "GL_ARB_texture_mirrored_repeat",    NULL },*/
     /*{ "GL_MESA_ycbcr_texture",             NULL },*/
     { NULL,                                NULL }
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_context.c b/src/mesa/drivers/dri/tdfx/tdfx_context.c
index ef688d103d..53672daa97 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_context.c
+++ b/src/mesa/drivers/dri/tdfx/tdfx_context.c
@@ -61,7 +61,6 @@
 #define need_GL_ARB_multisample
 /* #define need_GL_ARB_point_parameters */
 #define need_GL_ARB_occlusion_query
-#define need_GL_ARB_texture_compression
 #define need_GL_ARB_vertex_buffer_object
 /* #define need_GL_ARB_vertex_program */
 #define need_GL_EXT_blend_equation_separate
@@ -122,7 +121,6 @@ const struct dri_extension card_extensions[] =
  */
 const struct dri_extension napalm_extensions[] =
 {
-    { "GL_ARB_texture_compression",        GL_ARB_texture_compression_functions },
     { "GL_ARB_texture_env_combine",        NULL },
     { "GL_EXT_blend_equation_separate",    GL_EXT_blend_equation_separate_functions },
     { "GL_EXT_blend_subtract",             GL_EXT_blend_minmax_functions },
diff --git a/src/mesa/drivers/glide/fxdd.c b/src/mesa/drivers/glide/fxdd.c
index 213ef2382f..f2d52cb493 100644
--- a/src/mesa/drivers/glide/fxdd.c
+++ b/src/mesa/drivers/glide/fxdd.c
@@ -1862,7 +1862,6 @@ fxDDInitExtensions(GLcontext * ctx)
    }
 
    if (fxMesa->type >= GR_SSTTYPE_Voodoo4) {
-      _mesa_enable_extension(ctx, "GL_ARB_texture_compression");
       _mesa_enable_extension(ctx, "GL_3DFX_texture_compression_FXT1");
       _mesa_enable_extension(ctx, "GL_EXT_texture_compression_s3tc");
       _mesa_enable_extension(ctx, "GL_S3_s3tc");
@@ -1894,7 +1893,6 @@ fxDDInitExtensions(GLcontext * ctx)
        * fxSetupSingleTMU_NoLock/fxSetupDoubleTMU_NoLock:
        *    grTexDownloadTable(GR_TEXTABLE_NCC0, &(ti->palette));
        */
-      /*_mesa_enable_extension(ctx, "GL_ARB_texture_compression");*/
       _mesa_enable_extension(ctx, "GL_SGIS_generate_mipmap");
    }
 
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 3be7fd5a2d..36586758a4 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -1006,9 +1006,8 @@ _mesa_PopAttrib(void)
                _mesa_Hint(GL_FOG_HINT, hint->Fog);
                _mesa_Hint(GL_CLIP_VOLUME_CLIPPING_HINT_EXT,
                           hint->ClipVolumeClipping);
-               if (ctx->Extensions.ARB_texture_compression)
-                  _mesa_Hint(GL_TEXTURE_COMPRESSION_HINT_ARB,
-                             hint->TextureCompression);
+	       _mesa_Hint(GL_TEXTURE_COMPRESSION_HINT_ARB,
+			  hint->TextureCompression);
             }
             break;
          case GL_LIGHTING_BIT:
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 4ebdb5d9ae..46ca2ce766 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -64,7 +64,7 @@ static const struct {
    { OFF, "GL_ARB_shadow",                     F(ARB_shadow) },
    { OFF, "GL_ARB_shadow_ambient",             F(ARB_shadow_ambient) },
    { OFF, "GL_ARB_texture_border_clamp",       F(ARB_texture_border_clamp) },
-   { OFF, "GL_ARB_texture_compression",        F(ARB_texture_compression) },
+   { ON,  "GL_ARB_texture_compression",        F(ARB_texture_compression) },
    { OFF, "GL_ARB_texture_cube_map",           F(ARB_texture_cube_map) },
    { OFF, "GL_ARB_texture_env_add",            F(EXT_texture_env_add) },
    { OFF, "GL_ARB_texture_env_combine",        F(ARB_texture_env_combine) },
@@ -345,7 +345,7 @@ _mesa_enable_1_3_extensions(GLcontext *ctx)
    ctx->Extensions.ARB_multisample = GL_TRUE;
    ctx->Extensions.ARB_multitexture = GL_TRUE;
    ctx->Extensions.ARB_texture_border_clamp = GL_TRUE;
-   ctx->Extensions.ARB_texture_compression = GL_TRUE;
+   /*ctx->Extensions.ARB_texture_compression = GL_TRUE;*/
    ctx->Extensions.ARB_texture_cube_map = GL_TRUE;
    ctx->Extensions.ARB_texture_env_combine = GL_TRUE;
    ctx->Extensions.ARB_texture_env_dot3 = GL_TRUE;
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index a5909913c8..d214ddc890 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -1078,15 +1078,12 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          params[0] = INT_TO_BOOLEAN((1 << (ctx->Const.MaxCubeTextureLevels - 1)));
          break;
       case GL_TEXTURE_COMPRESSION_HINT_ARB:
-         CHECK_EXT1(ARB_texture_compression, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Hint.TextureCompression);
          break;
       case GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB:
-         CHECK_EXT1(ARB_texture_compression, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(_mesa_get_compressed_formats(ctx, NULL, GL_FALSE));
          break;
       case GL_COMPRESSED_TEXTURE_FORMATS_ARB:
-         CHECK_EXT1(ARB_texture_compression, "GetBooleanv");
          {
          GLint formats[100];
          GLuint i, n = _mesa_get_compressed_formats(ctx, formats, GL_FALSE);
@@ -2930,15 +2927,12 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          params[0] = (GLfloat)((1 << (ctx->Const.MaxCubeTextureLevels - 1)));
          break;
       case GL_TEXTURE_COMPRESSION_HINT_ARB:
-         CHECK_EXT1(ARB_texture_compression, "GetFloatv");
          params[0] = (GLfloat)(ctx->Hint.TextureCompression);
          break;
       case GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB:
-         CHECK_EXT1(ARB_texture_compression, "GetFloatv");
          params[0] = (GLfloat)(_mesa_get_compressed_formats(ctx, NULL, GL_FALSE));
          break;
       case GL_COMPRESSED_TEXTURE_FORMATS_ARB:
-         CHECK_EXT1(ARB_texture_compression, "GetFloatv");
          {
          GLint formats[100];
          GLuint i, n = _mesa_get_compressed_formats(ctx, formats, GL_FALSE);
@@ -4782,15 +4776,12 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          params[0] = (1 << (ctx->Const.MaxCubeTextureLevels - 1));
          break;
       case GL_TEXTURE_COMPRESSION_HINT_ARB:
-         CHECK_EXT1(ARB_texture_compression, "GetIntegerv");
          params[0] = ctx->Hint.TextureCompression;
          break;
       case GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB:
-         CHECK_EXT1(ARB_texture_compression, "GetIntegerv");
          params[0] = _mesa_get_compressed_formats(ctx, NULL, GL_FALSE);
          break;
       case GL_COMPRESSED_TEXTURE_FORMATS_ARB:
-         CHECK_EXT1(ARB_texture_compression, "GetIntegerv");
          {
          GLint formats[100];
          GLuint i, n = _mesa_get_compressed_formats(ctx, formats, GL_FALSE);
diff --git a/src/mesa/main/get_gen.py b/src/mesa/main/get_gen.py
index 4bdbfed0bf..c4d0aa9cc9 100644
--- a/src/mesa/main/get_gen.py
+++ b/src/mesa/main/get_gen.py
@@ -523,10 +523,10 @@ StateVars = [
 
 	# GL_ARB_texture_compression */
 	( "GL_TEXTURE_COMPRESSION_HINT_ARB", GLint,
-	  ["ctx->Hint.TextureCompression"], "", ["ARB_texture_compression"] ),
+	  ["ctx->Hint.TextureCompression"], "", None ),
 	( "GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB", GLint,
 	  ["_mesa_get_compressed_formats(ctx, NULL, GL_FALSE)"],
-	  "", ["ARB_texture_compression"] ),
+	  "", None ),
 	( "GL_COMPRESSED_TEXTURE_FORMATS_ARB", GLenum,
 	  [],
 	  """GLint formats[100];
@@ -534,7 +534,7 @@ StateVars = [
          ASSERT(n <= 100);
          for (i = 0; i < n; i++)
             params[i] = CONVERSION(formats[i]);""",
-	  ["ARB_texture_compression"] ),
+	  None ),
 
 	# GL_EXT_compiled_vertex_array
 	( "GL_ARRAY_ELEMENT_LOCK_FIRST_EXT", GLint, ["ctx->Array.LockFirst"],
diff --git a/src/mesa/main/hint.c b/src/mesa/main/hint.c
index dcfa9c7363..e2d4129a38 100644
--- a/src/mesa/main/hint.c
+++ b/src/mesa/main/hint.c
@@ -89,10 +89,6 @@ _mesa_Hint( GLenum target, GLenum mode )
 
       /* GL_ARB_texture_compression */
       case GL_TEXTURE_COMPRESSION_HINT_ARB:
-         if (!ctx->Extensions.ARB_texture_compression) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glHint(target)");
-	    return;
-         }
 	 if (ctx->Hint.TextureCompression == mode)
 	    return;
 	 FLUSH_VERTICES(ctx, _NEW_HINT);
diff --git a/src/mesa/main/texcompress.c b/src/mesa/main/texcompress.c
index 3ff633acd2..09eba151c0 100644
--- a/src/mesa/main/texcompress.c
+++ b/src/mesa/main/texcompress.c
@@ -56,60 +56,58 @@ GLuint
 _mesa_get_compressed_formats(GLcontext *ctx, GLint *formats, GLboolean all)
 {
    GLuint n = 0;
-   if (ctx->Extensions.ARB_texture_compression) {
-      if (ctx->Extensions.TDFX_texture_compression_FXT1) {
-         if (formats) {
-            formats[n++] = GL_COMPRESSED_RGB_FXT1_3DFX;
-            formats[n++] = GL_COMPRESSED_RGBA_FXT1_3DFX;
-         }
-         else {
-            n += 2;
-         }
+   if (ctx->Extensions.TDFX_texture_compression_FXT1) {
+      if (formats) {
+         formats[n++] = GL_COMPRESSED_RGB_FXT1_3DFX;
+         formats[n++] = GL_COMPRESSED_RGBA_FXT1_3DFX;
       }
-      if (ctx->Extensions.EXT_texture_compression_s3tc) {
-         if (formats) {
-            formats[n++] = GL_COMPRESSED_RGB_S3TC_DXT1_EXT;
-            /* This format has some restrictions/limitations and so should
-             * not be returned via the GL_COMPRESSED_TEXTURE_FORMATS query.
-             * Specifically, all transparent pixels become black.  NVIDIA
-             * omits this format too.
-             */
-            if (all)
-               formats[n++] = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT;
-            formats[n++] = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;
-            formats[n++] = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
-         }
-         else {
-            n += 3;
-            if (all)
-               n += 1;
-         }
+      else {
+         n += 2;
       }
-      if (ctx->Extensions.S3_s3tc) {
-         if (formats) {
-            formats[n++] = GL_RGB_S3TC;
-            formats[n++] = GL_RGB4_S3TC;
-            formats[n++] = GL_RGBA_S3TC;
-            formats[n++] = GL_RGBA4_S3TC;
-         }
-         else {
-            n += 4;
-         }
+   }
+   if (ctx->Extensions.EXT_texture_compression_s3tc) {
+      if (formats) {
+         formats[n++] = GL_COMPRESSED_RGB_S3TC_DXT1_EXT;
+         /* This format has some restrictions/limitations and so should
+          * not be returned via the GL_COMPRESSED_TEXTURE_FORMATS query.
+          * Specifically, all transparent pixels become black.  NVIDIA
+          * omits this format too.
+          */
+         if (all)
+             formats[n++] = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT;
+         formats[n++] = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;
+         formats[n++] = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
+      }
+      else {
+         n += 3;
+         if (all)
+             n += 1;
+      }
+   }
+   if (ctx->Extensions.S3_s3tc) {
+      if (formats) {
+         formats[n++] = GL_RGB_S3TC;
+         formats[n++] = GL_RGB4_S3TC;
+         formats[n++] = GL_RGBA_S3TC;
+         formats[n++] = GL_RGBA4_S3TC;
+      }
+      else {
+         n += 4;
       }
+   }
 #if FEATURE_EXT_texture_sRGB
-      if (ctx->Extensions.EXT_texture_sRGB) {
-         if (formats) {
-            formats[n++] = GL_COMPRESSED_SRGB_S3TC_DXT1_EXT;
-            formats[n++] = GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT;
-            formats[n++] = GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT;
-            formats[n++] = GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT;
-         }
-         else {
-            n += 4;
-         }
+   if (ctx->Extensions.EXT_texture_sRGB) {
+      if (formats) {
+         formats[n++] = GL_COMPRESSED_SRGB_S3TC_DXT1_EXT;
+         formats[n++] = GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT;
+         formats[n++] = GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT;
+         formats[n++] = GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT;
+      }
+      else {
+         n += 4;
       }
-#endif /* FEATURE_EXT_texture_sRGB */
    }
+#endif /* FEATURE_EXT_texture_sRGB */
    return n;
 }
 
diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c
index 08725846c6..ffbb7fb19d 100644
--- a/src/mesa/main/texformat.c
+++ b/src/mesa/main/texformat.c
@@ -1481,41 +1481,39 @@ _mesa_choose_tex_format( GLcontext *ctx, GLint internalFormat,
       }
    }
 
-   if (ctx->Extensions.ARB_texture_compression) {
-      switch (internalFormat) {
-         case GL_COMPRESSED_ALPHA_ARB:
-            return &_mesa_texformat_alpha;
-         case GL_COMPRESSED_LUMINANCE_ARB:
-            return &_mesa_texformat_luminance;
-         case GL_COMPRESSED_LUMINANCE_ALPHA_ARB:
-            return &_mesa_texformat_luminance_alpha;
-         case GL_COMPRESSED_INTENSITY_ARB:
-            return &_mesa_texformat_intensity;
-         case GL_COMPRESSED_RGB_ARB:
+   switch (internalFormat) {
+      case GL_COMPRESSED_ALPHA_ARB:
+         return &_mesa_texformat_alpha;
+      case GL_COMPRESSED_LUMINANCE_ARB:
+         return &_mesa_texformat_luminance;
+      case GL_COMPRESSED_LUMINANCE_ALPHA_ARB:
+         return &_mesa_texformat_luminance_alpha;
+      case GL_COMPRESSED_INTENSITY_ARB:
+         return &_mesa_texformat_intensity;
+      case GL_COMPRESSED_RGB_ARB:
 #if FEATURE_texture_fxt1
-            if (ctx->Extensions.TDFX_texture_compression_FXT1)
-               return &_mesa_texformat_rgb_fxt1;
+         if (ctx->Extensions.TDFX_texture_compression_FXT1)
+            return &_mesa_texformat_rgb_fxt1;
 #endif
 #if FEATURE_texture_s3tc
-            if (ctx->Extensions.EXT_texture_compression_s3tc ||
-                ctx->Extensions.S3_s3tc)
-               return &_mesa_texformat_rgb_dxt1;
+         if (ctx->Extensions.EXT_texture_compression_s3tc ||
+             ctx->Extensions.S3_s3tc)
+            return &_mesa_texformat_rgb_dxt1;
 #endif
-            return &_mesa_texformat_rgb;
-         case GL_COMPRESSED_RGBA_ARB:
+         return &_mesa_texformat_rgb;
+      case GL_COMPRESSED_RGBA_ARB:
 #if FEATURE_texture_fxt1
-            if (ctx->Extensions.TDFX_texture_compression_FXT1)
-               return &_mesa_texformat_rgba_fxt1;
+         if (ctx->Extensions.TDFX_texture_compression_FXT1)
+            return &_mesa_texformat_rgba_fxt1;
 #endif
 #if FEATURE_texture_s3tc
-            if (ctx->Extensions.EXT_texture_compression_s3tc ||
-                ctx->Extensions.S3_s3tc)
-               return &_mesa_texformat_rgba_dxt3; /* Not rgba_dxt1, see spec */
+         if (ctx->Extensions.EXT_texture_compression_s3tc ||
+             ctx->Extensions.S3_s3tc)
+            return &_mesa_texformat_rgba_dxt3; /* Not rgba_dxt1, see spec */
 #endif
-            return &_mesa_texformat_rgba;
-         default:
-            ; /* fallthrough */
-      }
+         return &_mesa_texformat_rgba;
+      default:
+         ; /* fallthrough */
    }
 
    if (ctx->Extensions.MESA_ycbcr_texture) {
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 9e968ba743..2f594532cc 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -253,23 +253,21 @@ _mesa_base_tex_format( GLcontext *ctx, GLint internalFormat )
       }
    }
 
-   if (ctx->Extensions.ARB_texture_compression) {
-      switch (internalFormat) {
-         case GL_COMPRESSED_ALPHA:
-            return GL_ALPHA;
-         case GL_COMPRESSED_LUMINANCE:
-            return GL_LUMINANCE;
-         case GL_COMPRESSED_LUMINANCE_ALPHA:
-            return GL_LUMINANCE_ALPHA;
-         case GL_COMPRESSED_INTENSITY:
-            return GL_INTENSITY;
-         case GL_COMPRESSED_RGB:
-            return GL_RGB;
-         case GL_COMPRESSED_RGBA:
-            return GL_RGBA;
-         default:
-            ; /* fallthrough */
-      }
+   switch (internalFormat) {
+   case GL_COMPRESSED_ALPHA:
+      return GL_ALPHA;
+   case GL_COMPRESSED_LUMINANCE:
+      return GL_LUMINANCE;
+   case GL_COMPRESSED_LUMINANCE_ALPHA:
+      return GL_LUMINANCE_ALPHA;
+   case GL_COMPRESSED_INTENSITY:
+      return GL_INTENSITY;
+   case GL_COMPRESSED_RGB:
+      return GL_RGB;
+   case GL_COMPRESSED_RGBA:
+      return GL_RGBA;
+   default:
+      ; /* fallthrough */
    }
          
    if (ctx->Extensions.TDFX_texture_compression_FXT1) {
diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index f610fa8dda..8df22fe9e2 100644
--- a/src/mesa/main/texparam.c
+++ b/src/mesa/main/texparam.c
@@ -849,33 +849,21 @@ _mesa_GetTexLevelParameteriv( GLenum target, GLint level,
 
       /* GL_ARB_texture_compression */
       case GL_TEXTURE_COMPRESSED_IMAGE_SIZE:
-         if (ctx->Extensions.ARB_texture_compression) {
-            if (img->IsCompressed && !isProxy) {
-               /* Don't use ctx->Driver.CompressedTextureSize() since that
-                * may returned a padded hardware size.
-                */
-               *params = _mesa_compressed_texture_size(ctx, img->Width,
-                                                   img->Height, img->Depth,
-                                                   img->TexFormat->MesaFormat);
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_OPERATION,
-                           "glGetTexLevelParameter[if]v(pname)");
-            }
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glGetTexLevelParameter[if]v(pname)");
-         }
+	 if (img->IsCompressed && !isProxy) {
+	    /* Don't use ctx->Driver.CompressedTextureSize() since that
+	     * may returned a padded hardware size.
+	     */
+	    *params = _mesa_compressed_texture_size(ctx, img->Width,
+						    img->Height, img->Depth,
+						    img->TexFormat->MesaFormat);
+	 }
+	 else {
+	    _mesa_error(ctx, GL_INVALID_OPERATION,
+			"glGetTexLevelParameter[if]v(pname)");
+	 }
          break;
       case GL_TEXTURE_COMPRESSED:
-         if (ctx->Extensions.ARB_texture_compression) {
-            *params = (GLint) img->IsCompressed;
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glGetTexLevelParameter[if]v(pname)");
-         }
+         *params = (GLint) img->IsCompressed;
          break;
 
       /* GL_ARB_texture_float */
-- 
cgit v1.2.3


From 2b77b1d62e6480f19aac1bde6f730b7da1046ce0 Mon Sep 17 00:00:00 2001
From: Ian Romanick <idr@freedesktop.org>
Date: Tue, 27 Jan 2009 17:50:45 -0800
Subject: Make GL_ARB_multisample mandatory

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
---
 src/mesa/drivers/dri/i810/i810context.c       |  2 --
 src/mesa/drivers/dri/intel/intel_extensions.c |  2 --
 src/mesa/drivers/dri/mach64/mach64_context.c  |  2 --
 src/mesa/drivers/dri/mga/mga_xmesa.c          |  2 --
 src/mesa/drivers/dri/r128/r128_context.c      |  2 --
 src/mesa/drivers/dri/r200/r200_context.c      |  2 --
 src/mesa/drivers/dri/r300/r300_context.c      |  2 --
 src/mesa/drivers/dri/radeon/radeon_context.c  |  2 --
 src/mesa/drivers/dri/savage/savage_xmesa.c    |  2 --
 src/mesa/drivers/dri/sis/sis_context.c        |  3 ---
 src/mesa/drivers/dri/tdfx/tdfx_context.c      |  2 --
 src/mesa/drivers/dri/unichrome/via_context.c  |  2 --
 src/mesa/main/enable.c                        | 10 ----------
 src/mesa/main/extensions.c                    |  4 ++--
 src/mesa/main/get.c                           | 24 ------------------------
 src/mesa/main/get_gen.py                      | 16 ++++++++--------
 src/mesa/main/multisample.c                   |  5 -----
 17 files changed, 10 insertions(+), 74 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/i810/i810context.c b/src/mesa/drivers/dri/i810/i810context.c
index 29c7363b49..540aace3d0 100644
--- a/src/mesa/drivers/dri/i810/i810context.c
+++ b/src/mesa/drivers/dri/i810/i810context.c
@@ -63,7 +63,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "drirenderbuffer.h"
 #include "utils.h"
 
-#define need_GL_ARB_multisample
 #define need_GL_ARB_vertex_buffer_object
 #include "extension_helper.h"
 
@@ -122,7 +121,6 @@ static void i810BufferSize(GLframebuffer *buffer, GLuint *width, GLuint *height)
  */
 const struct dri_extension card_extensions[] =
 {
-    { "GL_ARB_multisample",                GL_ARB_multisample_functions },
     { "GL_ARB_multitexture",               NULL },
     { "GL_ARB_texture_env_add",            NULL },
     { "GL_ARB_texture_env_combine",        NULL },
diff --git a/src/mesa/drivers/dri/intel/intel_extensions.c b/src/mesa/drivers/dri/intel/intel_extensions.c
index 9030af113b..e43e34a858 100644
--- a/src/mesa/drivers/dri/intel/intel_extensions.c
+++ b/src/mesa/drivers/dri/intel/intel_extensions.c
@@ -31,7 +31,6 @@
 
 
 #define need_GL_ARB_framebuffer_object
-#define need_GL_ARB_multisample
 #define need_GL_ARB_occlusion_query
 #define need_GL_ARB_point_parameters
 #define need_GL_ARB_shader_objects
@@ -67,7 +66,6 @@
  * i965_dri.
  */
 static const struct dri_extension card_extensions[] = {
-   { "GL_ARB_multisample",                GL_ARB_multisample_functions },
    { "GL_ARB_multitexture",               NULL },
    { "GL_ARB_point_parameters",           GL_ARB_point_parameters_functions },
    { "GL_ARB_texture_border_clamp",       NULL },
diff --git a/src/mesa/drivers/dri/mach64/mach64_context.c b/src/mesa/drivers/dri/mach64/mach64_context.c
index 99abd209b6..f9667477c5 100644
--- a/src/mesa/drivers/dri/mach64/mach64_context.c
+++ b/src/mesa/drivers/dri/mach64/mach64_context.c
@@ -57,7 +57,6 @@
 #include "utils.h"
 #include "vblank.h"
 
-#define need_GL_ARB_multisample
 #define need_GL_ARB_vertex_buffer_object
 #include "extension_helper.h"
 
@@ -82,7 +81,6 @@ static const struct dri_debug_control debug_control[] =
 
 const struct dri_extension card_extensions[] =
 {
-    { "GL_ARB_multisample",                GL_ARB_multisample_functions },
     { "GL_ARB_multitexture",               NULL },
     { "GL_ARB_vertex_buffer_object",       GL_ARB_vertex_buffer_object_functions },
     { "GL_EXT_texture_edge_clamp",         NULL },
diff --git a/src/mesa/drivers/dri/mga/mga_xmesa.c b/src/mesa/drivers/dri/mga/mga_xmesa.c
index 0ebffe9e13..e41848d269 100644
--- a/src/mesa/drivers/dri/mga/mga_xmesa.c
+++ b/src/mesa/drivers/dri/mga/mga_xmesa.c
@@ -69,7 +69,6 @@
 
 #include "GL/internal/dri_interface.h"
 
-#define need_GL_ARB_multisample
 #define need_GL_ARB_vertex_buffer_object
 #define need_GL_ARB_vertex_program
 #define need_GL_EXT_fog_coord
@@ -384,7 +383,6 @@ static const struct dri_extension g400_extensions[] =
 
 static const struct dri_extension card_extensions[] =
 {
-   { "GL_ARB_multisample",            GL_ARB_multisample_functions },
    { "GL_ARB_texture_rectangle",      NULL },
    { "GL_ARB_vertex_buffer_object",   GL_ARB_vertex_buffer_object_functions },
    { "GL_EXT_blend_logic_op",         NULL },
diff --git a/src/mesa/drivers/dri/r128/r128_context.c b/src/mesa/drivers/dri/r128/r128_context.c
index 9437d900c3..cbd05e3d4c 100644
--- a/src/mesa/drivers/dri/r128/r128_context.c
+++ b/src/mesa/drivers/dri/r128/r128_context.c
@@ -65,7 +65,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 int R128_DEBUG = 0;
 #endif
 
-#define need_GL_ARB_multisample
 #define need_GL_ARB_vertex_buffer_object
 #define need_GL_EXT_blend_minmax
 #define need_GL_EXT_fog_coord
@@ -74,7 +73,6 @@ int R128_DEBUG = 0;
 
 const struct dri_extension card_extensions[] =
 {
-    { "GL_ARB_multisample",                GL_ARB_multisample_functions },
     { "GL_ARB_multitexture",               NULL },
     { "GL_ARB_texture_env_add",            NULL },
     { "GL_ARB_texture_mirrored_repeat",    NULL },
diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c
index cdd96ef2d3..027d9a92dc 100644
--- a/src/mesa/drivers/dri/r200/r200_context.c
+++ b/src/mesa/drivers/dri/r200/r200_context.c
@@ -62,7 +62,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "r200_maos.h"
 #include "r200_vertprog.h"
 
-#define need_GL_ARB_multisample
 #define need_GL_ARB_vertex_buffer_object
 #define need_GL_ARB_vertex_program
 #define need_GL_ATI_fragment_shader
@@ -119,7 +118,6 @@ static const GLubyte *r200GetString( GLcontext *ctx, GLenum name )
  */
 const struct dri_extension card_extensions[] =
 {
-    { "GL_ARB_multisample",                GL_ARB_multisample_functions },
     { "GL_ARB_multitexture",               NULL },
     { "GL_ARB_texture_border_clamp",       NULL },
     { "GL_ARB_texture_env_add",            NULL },
diff --git a/src/mesa/drivers/dri/r300/r300_context.c b/src/mesa/drivers/dri/r300/r300_context.c
index 4f7afbc20c..56b9a3883a 100644
--- a/src/mesa/drivers/dri/r300/r300_context.c
+++ b/src/mesa/drivers/dri/r300/r300_context.c
@@ -78,7 +78,6 @@ int future_hw_tcl_on = 1;
 int hw_tcl_on = 1;
 
 #define need_GL_VERSION_2_0
-#define need_GL_ARB_multisample
 #define need_GL_ARB_point_parameters
 #define need_GL_ARB_vertex_buffer_object
 #define need_GL_ARB_vertex_program
@@ -98,7 +97,6 @@ const struct dri_extension card_extensions[] = {
   /* *INDENT-OFF* */
   {"GL_ARB_depth_texture",		NULL},
   {"GL_ARB_fragment_program",		NULL},
-  {"GL_ARB_multisample",		GL_ARB_multisample_functions},
   {"GL_ARB_multitexture",		NULL},
   {"GL_ARB_point_parameters",		GL_ARB_point_parameters_functions},
   {"GL_ARB_shadow",			NULL},
diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c b/src/mesa/drivers/dri/radeon/radeon_context.c
index cc34f24214..156906e795 100644
--- a/src/mesa/drivers/dri/radeon/radeon_context.c
+++ b/src/mesa/drivers/dri/radeon/radeon_context.c
@@ -62,7 +62,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "radeon_tcl.h"
 #include "radeon_maos.h"
 
-#define need_GL_ARB_multisample
 #define need_GL_ARB_vertex_buffer_object
 #define need_GL_EXT_blend_minmax
 #define need_GL_EXT_fog_coord
@@ -113,7 +112,6 @@ static const GLubyte *radeonGetString( GLcontext *ctx, GLenum name )
  */
 const struct dri_extension card_extensions[] =
 {
-    { "GL_ARB_multisample",                GL_ARB_multisample_functions },
     { "GL_ARB_multitexture",               NULL },
     { "GL_ARB_texture_border_clamp",       NULL },
     { "GL_ARB_texture_env_add",            NULL },
diff --git a/src/mesa/drivers/dri/savage/savage_xmesa.c b/src/mesa/drivers/dri/savage/savage_xmesa.c
index d9dd28a7e6..6ae42b6461 100644
--- a/src/mesa/drivers/dri/savage/savage_xmesa.c
+++ b/src/mesa/drivers/dri/savage/savage_xmesa.c
@@ -59,7 +59,6 @@
 #include "drirenderbuffer.h"
 #include "texmem.h"
 
-#define need_GL_ARB_multisample
 #define need_GL_ARB_vertex_buffer_object
 #define need_GL_EXT_secondary_color
 #include "extension_helper.h"
@@ -132,7 +131,6 @@ struct timeval tv_s1,tv_f1;
 
 static const struct dri_extension card_extensions[] =
 {
-    { "GL_ARB_multisample",                GL_ARB_multisample_functions },
     { "GL_ARB_multitexture",               NULL },
     { "GL_ARB_vertex_buffer_object",       GL_ARB_vertex_buffer_object_functions },
     { "GL_EXT_stencil_wrap",               NULL },
diff --git a/src/mesa/drivers/dri/sis/sis_context.c b/src/mesa/drivers/dri/sis/sis_context.c
index ce3a583b3b..6c40f6db18 100644
--- a/src/mesa/drivers/dri/sis/sis_context.c
+++ b/src/mesa/drivers/dri/sis/sis_context.c
@@ -57,7 +57,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "tnl/tnl.h"
 #include "tnl/t_pipeline.h"
 
-#define need_GL_ARB_multisample
 #define need_GL_ARB_vertex_buffer_object
 #define need_GL_EXT_fog_coord
 #define need_GL_EXT_secondary_color
@@ -73,7 +72,6 @@ int GlobalCmdQueueLen = 0;
 
 struct dri_extension card_extensions[] =
 {
-    { "GL_ARB_multisample",                GL_ARB_multisample_functions },
     { "GL_ARB_multitexture",               NULL },
     { "GL_ARB_texture_border_clamp",       NULL },
     { "GL_ARB_texture_mirrored_repeat",    NULL },
@@ -89,7 +87,6 @@ struct dri_extension card_extensions[] =
 
 struct dri_extension card_extensions_6326[] =
 {
-    { "GL_ARB_multisample",                GL_ARB_multisample_functions },
     /*{ "GL_ARB_texture_border_clamp",       NULL },*/
     /*{ "GL_ARB_texture_mirrored_repeat",    NULL },*/
     /*{ "GL_MESA_ycbcr_texture",             NULL },*/
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_context.c b/src/mesa/drivers/dri/tdfx/tdfx_context.c
index 53672daa97..9d2d57ccc9 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_context.c
+++ b/src/mesa/drivers/dri/tdfx/tdfx_context.c
@@ -58,7 +58,6 @@
 
 #include "utils.h"
 
-#define need_GL_ARB_multisample
 /* #define need_GL_ARB_point_parameters */
 #define need_GL_ARB_occlusion_query
 #define need_GL_ARB_vertex_buffer_object
@@ -81,7 +80,6 @@
  */
 const struct dri_extension card_extensions[] =
 {
-    { "GL_ARB_multisample",                GL_ARB_multisample_functions },
     { "GL_ARB_occlusion_query",            GL_ARB_occlusion_query_functions },
     { "GL_ARB_texture_mirrored_repeat",    NULL },
     { "GL_ARB_vertex_buffer_object",       GL_ARB_vertex_buffer_object_functions },
diff --git a/src/mesa/drivers/dri/unichrome/via_context.c b/src/mesa/drivers/dri/unichrome/via_context.c
index f5bdb65eb0..990671fc49 100644
--- a/src/mesa/drivers/dri/unichrome/via_context.c
+++ b/src/mesa/drivers/dri/unichrome/via_context.c
@@ -62,7 +62,6 @@
 #include "main/macros.h"
 #include "drirenderbuffer.h"
 
-#define need_GL_ARB_multisample
 #define need_GL_ARB_point_parameters
 #define need_GL_ARB_vertex_buffer_object
 #define need_GL_EXT_fog_coord
@@ -366,7 +365,6 @@ void viaReAllocateBuffers(GLcontext *ctx, GLframebuffer *drawbuffer,
  */
 const struct dri_extension card_extensions[] =
 {
-    { "GL_ARB_multisample",                GL_ARB_multisample_functions },
     { "GL_ARB_multitexture",               NULL },
     { "GL_ARB_point_parameters",           GL_ARB_point_parameters_functions },
     { "GL_ARB_texture_env_add",            NULL },
diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index 1c026174b8..1b03410535 100644
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -772,35 +772,30 @@ _mesa_set_enable(GLcontext *ctx, GLenum cap, GLboolean state)
 
       /* GL_ARB_multisample */
       case GL_MULTISAMPLE_ARB:
-         CHECK_EXTENSION(ARB_multisample, cap);
          if (ctx->Multisample.Enabled == state)
             return;
          FLUSH_VERTICES(ctx, _NEW_MULTISAMPLE);
          ctx->Multisample.Enabled = state;
          break;
       case GL_SAMPLE_ALPHA_TO_COVERAGE_ARB:
-         CHECK_EXTENSION(ARB_multisample, cap);
          if (ctx->Multisample.SampleAlphaToCoverage == state)
             return;
          FLUSH_VERTICES(ctx, _NEW_MULTISAMPLE);
          ctx->Multisample.SampleAlphaToCoverage = state;
          break;
       case GL_SAMPLE_ALPHA_TO_ONE_ARB:
-         CHECK_EXTENSION(ARB_multisample, cap);
          if (ctx->Multisample.SampleAlphaToOne == state)
             return;
          FLUSH_VERTICES(ctx, _NEW_MULTISAMPLE);
          ctx->Multisample.SampleAlphaToOne = state;
          break;
       case GL_SAMPLE_COVERAGE_ARB:
-         CHECK_EXTENSION(ARB_multisample, cap);
          if (ctx->Multisample.SampleCoverage == state)
             return;
          FLUSH_VERTICES(ctx, _NEW_MULTISAMPLE);
          ctx->Multisample.SampleCoverage = state;
          break;
       case GL_SAMPLE_COVERAGE_INVERT_ARB:
-         CHECK_EXTENSION(ARB_multisample, cap);
          if (ctx->Multisample.SampleCoverageInvert == state)
             return;
          FLUSH_VERTICES(ctx, _NEW_MULTISAMPLE);
@@ -1284,19 +1279,14 @@ _mesa_IsEnabled( GLenum cap )
 
       /* GL_ARB_multisample */
       case GL_MULTISAMPLE_ARB:
-         CHECK_EXTENSION(ARB_multisample);
          return ctx->Multisample.Enabled;
       case GL_SAMPLE_ALPHA_TO_COVERAGE_ARB:
-         CHECK_EXTENSION(ARB_multisample);
          return ctx->Multisample.SampleAlphaToCoverage;
       case GL_SAMPLE_ALPHA_TO_ONE_ARB:
-         CHECK_EXTENSION(ARB_multisample);
          return ctx->Multisample.SampleAlphaToOne;
       case GL_SAMPLE_COVERAGE_ARB:
-         CHECK_EXTENSION(ARB_multisample);
          return ctx->Multisample.SampleCoverage;
       case GL_SAMPLE_COVERAGE_INVERT_ARB:
-         CHECK_EXTENSION(ARB_multisample);
          return ctx->Multisample.SampleCoverageInvert;
 
       /* GL_IBM_rasterpos_clip */
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 46ca2ce766..3fb06764a6 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -52,7 +52,7 @@ static const struct {
    { OFF, "GL_ARB_framebuffer_object",         F(ARB_framebuffer_object) },
    { OFF, "GL_ARB_half_float_pixel",           F(ARB_half_float_pixel) },
    { OFF, "GL_ARB_imaging",                    F(ARB_imaging) },
-   { OFF, "GL_ARB_multisample",                F(ARB_multisample) },
+   { ON,  "GL_ARB_multisample",                F(ARB_multisample) },
    { OFF, "GL_ARB_multitexture",               F(ARB_multitexture) },
    { OFF, "GL_ARB_occlusion_query",            F(ARB_occlusion_query) },
    { OFF, "GL_ARB_pixel_buffer_object",        F(EXT_pixel_buffer_object) },
@@ -342,7 +342,7 @@ _mesa_enable_imaging_extensions(GLcontext *ctx)
 void
 _mesa_enable_1_3_extensions(GLcontext *ctx)
 {
-   ctx->Extensions.ARB_multisample = GL_TRUE;
+   /*ctx->Extensions.ARB_multisample = GL_TRUE;*/
    ctx->Extensions.ARB_multitexture = GL_TRUE;
    ctx->Extensions.ARB_texture_border_clamp = GL_TRUE;
    /*ctx->Extensions.ARB_texture_compression = GL_TRUE;*/
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index d214ddc890..9aa2b4e1dc 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -1365,35 +1365,27 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          params[0] = FLOAT_TO_BOOLEAN(ctx->Const.MaxTextureMaxAnisotropy);
          break;
       case GL_MULTISAMPLE_ARB:
-         CHECK_EXT1(ARB_multisample, "GetBooleanv");
          params[0] = ctx->Multisample.Enabled;
          break;
       case GL_SAMPLE_ALPHA_TO_COVERAGE_ARB:
-         CHECK_EXT1(ARB_multisample, "GetBooleanv");
          params[0] = ctx->Multisample.SampleAlphaToCoverage;
          break;
       case GL_SAMPLE_ALPHA_TO_ONE_ARB:
-         CHECK_EXT1(ARB_multisample, "GetBooleanv");
          params[0] = ctx->Multisample.SampleAlphaToOne;
          break;
       case GL_SAMPLE_COVERAGE_ARB:
-         CHECK_EXT1(ARB_multisample, "GetBooleanv");
          params[0] = ctx->Multisample.SampleCoverage;
          break;
       case GL_SAMPLE_COVERAGE_VALUE_ARB:
-         CHECK_EXT1(ARB_multisample, "GetBooleanv");
          params[0] = FLOAT_TO_BOOLEAN(ctx->Multisample.SampleCoverageValue);
          break;
       case GL_SAMPLE_COVERAGE_INVERT_ARB:
-         CHECK_EXT1(ARB_multisample, "GetBooleanv");
          params[0] = ctx->Multisample.SampleCoverageInvert;
          break;
       case GL_SAMPLE_BUFFERS_ARB:
-         CHECK_EXT1(ARB_multisample, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->DrawBuffer->Visual.sampleBuffers);
          break;
       case GL_SAMPLES_ARB:
-         CHECK_EXT1(ARB_multisample, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->DrawBuffer->Visual.samples);
          break;
       case GL_RASTER_POSITION_UNCLIPPED_IBM:
@@ -3214,35 +3206,27 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          params[0] = ctx->Const.MaxTextureMaxAnisotropy;
          break;
       case GL_MULTISAMPLE_ARB:
-         CHECK_EXT1(ARB_multisample, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Multisample.Enabled);
          break;
       case GL_SAMPLE_ALPHA_TO_COVERAGE_ARB:
-         CHECK_EXT1(ARB_multisample, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Multisample.SampleAlphaToCoverage);
          break;
       case GL_SAMPLE_ALPHA_TO_ONE_ARB:
-         CHECK_EXT1(ARB_multisample, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Multisample.SampleAlphaToOne);
          break;
       case GL_SAMPLE_COVERAGE_ARB:
-         CHECK_EXT1(ARB_multisample, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Multisample.SampleCoverage);
          break;
       case GL_SAMPLE_COVERAGE_VALUE_ARB:
-         CHECK_EXT1(ARB_multisample, "GetFloatv");
          params[0] = ctx->Multisample.SampleCoverageValue;
          break;
       case GL_SAMPLE_COVERAGE_INVERT_ARB:
-         CHECK_EXT1(ARB_multisample, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Multisample.SampleCoverageInvert);
          break;
       case GL_SAMPLE_BUFFERS_ARB:
-         CHECK_EXT1(ARB_multisample, "GetFloatv");
          params[0] = (GLfloat)(ctx->DrawBuffer->Visual.sampleBuffers);
          break;
       case GL_SAMPLES_ARB:
-         CHECK_EXT1(ARB_multisample, "GetFloatv");
          params[0] = (GLfloat)(ctx->DrawBuffer->Visual.samples);
          break;
       case GL_RASTER_POSITION_UNCLIPPED_IBM:
@@ -5063,35 +5047,27 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          params[0] = IROUND(ctx->Const.MaxTextureMaxAnisotropy);
          break;
       case GL_MULTISAMPLE_ARB:
-         CHECK_EXT1(ARB_multisample, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Multisample.Enabled);
          break;
       case GL_SAMPLE_ALPHA_TO_COVERAGE_ARB:
-         CHECK_EXT1(ARB_multisample, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Multisample.SampleAlphaToCoverage);
          break;
       case GL_SAMPLE_ALPHA_TO_ONE_ARB:
-         CHECK_EXT1(ARB_multisample, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Multisample.SampleAlphaToOne);
          break;
       case GL_SAMPLE_COVERAGE_ARB:
-         CHECK_EXT1(ARB_multisample, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Multisample.SampleCoverage);
          break;
       case GL_SAMPLE_COVERAGE_VALUE_ARB:
-         CHECK_EXT1(ARB_multisample, "GetIntegerv");
          params[0] = IROUND(ctx->Multisample.SampleCoverageValue);
          break;
       case GL_SAMPLE_COVERAGE_INVERT_ARB:
-         CHECK_EXT1(ARB_multisample, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Multisample.SampleCoverageInvert);
          break;
       case GL_SAMPLE_BUFFERS_ARB:
-         CHECK_EXT1(ARB_multisample, "GetIntegerv");
          params[0] = ctx->DrawBuffer->Visual.sampleBuffers;
          break;
       case GL_SAMPLES_ARB:
-         CHECK_EXT1(ARB_multisample, "GetIntegerv");
          params[0] = ctx->DrawBuffer->Visual.samples;
          break;
       case GL_RASTER_POSITION_UNCLIPPED_IBM:
diff --git a/src/mesa/main/get_gen.py b/src/mesa/main/get_gen.py
index c4d0aa9cc9..797f1354aa 100644
--- a/src/mesa/main/get_gen.py
+++ b/src/mesa/main/get_gen.py
@@ -681,21 +681,21 @@ StateVars = [
 
 	# GL_ARB_multisample
 	( "GL_MULTISAMPLE_ARB", GLboolean,
-	  ["ctx->Multisample.Enabled"], "", ["ARB_multisample"] ),
+	  ["ctx->Multisample.Enabled"], "", None ),
 	( "GL_SAMPLE_ALPHA_TO_COVERAGE_ARB", GLboolean,
-	  ["ctx->Multisample.SampleAlphaToCoverage"], "", ["ARB_multisample"] ),
+	  ["ctx->Multisample.SampleAlphaToCoverage"], "", None ),
 	( "GL_SAMPLE_ALPHA_TO_ONE_ARB", GLboolean,
-	  ["ctx->Multisample.SampleAlphaToOne"], "", ["ARB_multisample"] ),
+	  ["ctx->Multisample.SampleAlphaToOne"], "", None ),
 	( "GL_SAMPLE_COVERAGE_ARB", GLboolean,
-	  ["ctx->Multisample.SampleCoverage"], "", ["ARB_multisample"] ),
+	  ["ctx->Multisample.SampleCoverage"], "", None ),
 	( "GL_SAMPLE_COVERAGE_VALUE_ARB", GLfloat,
-	  ["ctx->Multisample.SampleCoverageValue"], "", ["ARB_multisample"] ),
+	  ["ctx->Multisample.SampleCoverageValue"], "", None ),
 	( "GL_SAMPLE_COVERAGE_INVERT_ARB", GLboolean,
-	  ["ctx->Multisample.SampleCoverageInvert"], "", ["ARB_multisample"] ),
+	  ["ctx->Multisample.SampleCoverageInvert"], "", None ),
 	( "GL_SAMPLE_BUFFERS_ARB", GLint,
-	  ["ctx->DrawBuffer->Visual.sampleBuffers"], "", ["ARB_multisample"] ),
+	  ["ctx->DrawBuffer->Visual.sampleBuffers"], "", None ),
 	( "GL_SAMPLES_ARB", GLint,
-	  ["ctx->DrawBuffer->Visual.samples"], "", ["ARB_multisample"] ),
+	  ["ctx->DrawBuffer->Visual.samples"], "", None ),
 
 	# GL_IBM_rasterpos_clip
 	( "GL_RASTER_POSITION_UNCLIPPED_IBM", GLboolean,
diff --git a/src/mesa/main/multisample.c b/src/mesa/main/multisample.c
index b9cfad9216..01b68df7af 100644
--- a/src/mesa/main/multisample.c
+++ b/src/mesa/main/multisample.c
@@ -37,11 +37,6 @@ _mesa_SampleCoverageARB(GLclampf value, GLboolean invert)
 {
    GET_CURRENT_CONTEXT(ctx);
 
-   if (!ctx->Extensions.ARB_multisample) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glSampleCoverageARB");
-      return;
-   }
-
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH( ctx );
 
    ctx->Multisample.SampleCoverageValue = (GLfloat) CLAMP(value, 0.0, 1.0);
-- 
cgit v1.2.3


From 82b9661894315362f857192439bdcbc9db090387 Mon Sep 17 00:00:00 2001
From: Ian Romanick <idr@freedesktop.org>
Date: Tue, 27 Jan 2009 18:04:12 -0800
Subject: Make GL_ARB_vertex_buffer_object mandatory

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
---
 src/mesa/drivers/dri/common/utils.c           |  2 ++
 src/mesa/drivers/dri/i810/i810context.c       |  4 ----
 src/mesa/drivers/dri/intel/intel_extensions.c |  2 --
 src/mesa/drivers/dri/mach64/mach64_context.c  |  4 ----
 src/mesa/drivers/dri/mga/mga_xmesa.c          |  2 --
 src/mesa/drivers/dri/r128/r128_context.c      |  2 --
 src/mesa/drivers/dri/r200/r200_context.c      |  2 --
 src/mesa/drivers/dri/r300/r300_context.c      |  2 --
 src/mesa/drivers/dri/radeon/radeon_context.c  |  2 --
 src/mesa/drivers/dri/savage/savage_xmesa.c    |  2 --
 src/mesa/drivers/dri/sis/sis_context.c        |  2 --
 src/mesa/drivers/dri/tdfx/tdfx_context.c      |  2 --
 src/mesa/drivers/dri/unichrome/via_context.c  |  2 --
 src/mesa/drivers/glide/fxdd.c                 |  1 -
 src/mesa/main/extensions.c                    |  6 +++---
 src/mesa/main/get.c                           | 30 ---------------------------
 src/mesa/main/get_gen.py                      | 20 +++++++++---------
 src/mesa/shader/arbprogram.c                  |  4 ----
 src/mesa/shader/nvprogram.c                   |  4 ----
 19 files changed, 15 insertions(+), 80 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/common/utils.c b/src/mesa/drivers/dri/common/utils.c
index 7bee525770..3fd88ea8fb 100644
--- a/src/mesa/drivers/dri/common/utils.c
+++ b/src/mesa/drivers/dri/common/utils.c
@@ -182,6 +182,7 @@ driGetRendererString( char * buffer, const char * hardware_name,
 #define need_GL_ARB_multisample
 #define need_GL_ARB_texture_compression
 #define need_GL_ARB_transpose_matrix
+#define need_GL_ARB_vertex_buffer_object
 #define need_GL_ARB_window_pos
 #define need_GL_EXT_compiled_vertex_array
 #define need_GL_EXT_polygon_offset
@@ -202,6 +203,7 @@ static const struct dri_extension all_mesa_extensions[] = {
    { "GL_ARB_multisample",           GL_ARB_multisample_functions },
    { "GL_ARB_texture_compression",   GL_ARB_texture_compression_functions },
    { "GL_ARB_transpose_matrix",      GL_ARB_transpose_matrix_functions },
+   { "GL_ARB_vertex_buffer_object",  GL_ARB_vertex_buffer_object_functions},
    { "GL_ARB_window_pos",            GL_ARB_window_pos_functions },
    { "GL_EXT_blend_func_separate",   GL_EXT_blend_func_separate_functions },
    { "GL_EXT_compiled_vertex_array", GL_EXT_compiled_vertex_array_functions },
diff --git a/src/mesa/drivers/dri/i810/i810context.c b/src/mesa/drivers/dri/i810/i810context.c
index 540aace3d0..6785655686 100644
--- a/src/mesa/drivers/dri/i810/i810context.c
+++ b/src/mesa/drivers/dri/i810/i810context.c
@@ -63,9 +63,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "drirenderbuffer.h"
 #include "utils.h"
 
-#define need_GL_ARB_vertex_buffer_object
-#include "extension_helper.h"
-
 #ifndef I810_DEBUG
 int I810_DEBUG = (0);
 #endif
@@ -126,7 +123,6 @@ const struct dri_extension card_extensions[] =
     { "GL_ARB_texture_env_combine",        NULL },
     { "GL_ARB_texture_env_crossbar",       NULL },
     { "GL_ARB_texture_mirrored_repeat",    NULL },
-    { "GL_ARB_vertex_buffer_object",       GL_ARB_vertex_buffer_object_functions },
     { "GL_EXT_stencil_wrap",               NULL },
     { "GL_EXT_texture_edge_clamp",         NULL },
     { "GL_EXT_texture_env_combine",        NULL },
diff --git a/src/mesa/drivers/dri/intel/intel_extensions.c b/src/mesa/drivers/dri/intel/intel_extensions.c
index e43e34a858..c963892d98 100644
--- a/src/mesa/drivers/dri/intel/intel_extensions.c
+++ b/src/mesa/drivers/dri/intel/intel_extensions.c
@@ -34,7 +34,6 @@
 #define need_GL_ARB_occlusion_query
 #define need_GL_ARB_point_parameters
 #define need_GL_ARB_shader_objects
-#define need_GL_ARB_vertex_buffer_object
 #define need_GL_ARB_vertex_program
 #define need_GL_ARB_vertex_shader
 #define need_GL_ARB_window_pos
@@ -76,7 +75,6 @@ static const struct dri_extension card_extensions[] = {
    { "GL_ARB_texture_env_dot3",           NULL },
    { "GL_ARB_texture_mirrored_repeat",    NULL },
    { "GL_ARB_texture_rectangle",          NULL },
-   { "GL_ARB_vertex_buffer_object",       GL_ARB_vertex_buffer_object_functions },
    { "GL_ARB_vertex_program",             GL_ARB_vertex_program_functions },
    { "GL_ARB_window_pos",                 GL_ARB_window_pos_functions },
    { "GL_EXT_blend_color",                GL_EXT_blend_color_functions },
diff --git a/src/mesa/drivers/dri/mach64/mach64_context.c b/src/mesa/drivers/dri/mach64/mach64_context.c
index f9667477c5..4edab846b0 100644
--- a/src/mesa/drivers/dri/mach64/mach64_context.c
+++ b/src/mesa/drivers/dri/mach64/mach64_context.c
@@ -57,9 +57,6 @@
 #include "utils.h"
 #include "vblank.h"
 
-#define need_GL_ARB_vertex_buffer_object
-#include "extension_helper.h"
-
 #ifndef MACH64_DEBUG
 int MACH64_DEBUG = (0);
 #endif
@@ -82,7 +79,6 @@ static const struct dri_debug_control debug_control[] =
 const struct dri_extension card_extensions[] =
 {
     { "GL_ARB_multitexture",               NULL },
-    { "GL_ARB_vertex_buffer_object",       GL_ARB_vertex_buffer_object_functions },
     { "GL_EXT_texture_edge_clamp",         NULL },
     { "GL_MESA_ycbcr_texture",             NULL },
     { "GL_SGIS_generate_mipmap",           NULL },
diff --git a/src/mesa/drivers/dri/mga/mga_xmesa.c b/src/mesa/drivers/dri/mga/mga_xmesa.c
index e41848d269..23ab5bca2d 100644
--- a/src/mesa/drivers/dri/mga/mga_xmesa.c
+++ b/src/mesa/drivers/dri/mga/mga_xmesa.c
@@ -69,7 +69,6 @@
 
 #include "GL/internal/dri_interface.h"
 
-#define need_GL_ARB_vertex_buffer_object
 #define need_GL_ARB_vertex_program
 #define need_GL_EXT_fog_coord
 #define need_GL_EXT_gpu_program_parameters
@@ -384,7 +383,6 @@ static const struct dri_extension g400_extensions[] =
 static const struct dri_extension card_extensions[] =
 {
    { "GL_ARB_texture_rectangle",      NULL },
-   { "GL_ARB_vertex_buffer_object",   GL_ARB_vertex_buffer_object_functions },
    { "GL_EXT_blend_logic_op",         NULL },
    { "GL_EXT_fog_coord",              GL_EXT_fog_coord_functions },
    { "GL_EXT_multi_draw_arrays",      GL_EXT_multi_draw_arrays_functions },
diff --git a/src/mesa/drivers/dri/r128/r128_context.c b/src/mesa/drivers/dri/r128/r128_context.c
index cbd05e3d4c..4d6031f527 100644
--- a/src/mesa/drivers/dri/r128/r128_context.c
+++ b/src/mesa/drivers/dri/r128/r128_context.c
@@ -65,7 +65,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 int R128_DEBUG = 0;
 #endif
 
-#define need_GL_ARB_vertex_buffer_object
 #define need_GL_EXT_blend_minmax
 #define need_GL_EXT_fog_coord
 #define need_GL_EXT_secondary_color
@@ -76,7 +75,6 @@ const struct dri_extension card_extensions[] =
     { "GL_ARB_multitexture",               NULL },
     { "GL_ARB_texture_env_add",            NULL },
     { "GL_ARB_texture_mirrored_repeat",    NULL },
-    { "GL_ARB_vertex_buffer_object",       GL_ARB_vertex_buffer_object_functions },
     { "GL_EXT_blend_subtract",             GL_EXT_blend_minmax_functions },
     { "GL_EXT_fog_coord",                  GL_EXT_fog_coord_functions },
     { "GL_EXT_texture_edge_clamp",         NULL },
diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c
index 027d9a92dc..51b216a5f8 100644
--- a/src/mesa/drivers/dri/r200/r200_context.c
+++ b/src/mesa/drivers/dri/r200/r200_context.c
@@ -62,7 +62,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "r200_maos.h"
 #include "r200_vertprog.h"
 
-#define need_GL_ARB_vertex_buffer_object
 #define need_GL_ARB_vertex_program
 #define need_GL_ATI_fragment_shader
 #define need_GL_EXT_blend_minmax
@@ -125,7 +124,6 @@ const struct dri_extension card_extensions[] =
     { "GL_ARB_texture_env_dot3",           NULL },
     { "GL_ARB_texture_env_crossbar",       NULL },
     { "GL_ARB_texture_mirrored_repeat",    NULL },
-    { "GL_ARB_vertex_buffer_object",       GL_ARB_vertex_buffer_object_functions },
     { "GL_EXT_blend_minmax",               GL_EXT_blend_minmax_functions },
     { "GL_EXT_blend_subtract",             NULL },
     { "GL_EXT_fog_coord",                  GL_EXT_fog_coord_functions },
diff --git a/src/mesa/drivers/dri/r300/r300_context.c b/src/mesa/drivers/dri/r300/r300_context.c
index 56b9a3883a..bdf41e5392 100644
--- a/src/mesa/drivers/dri/r300/r300_context.c
+++ b/src/mesa/drivers/dri/r300/r300_context.c
@@ -79,7 +79,6 @@ int hw_tcl_on = 1;
 
 #define need_GL_VERSION_2_0
 #define need_GL_ARB_point_parameters
-#define need_GL_ARB_vertex_buffer_object
 #define need_GL_ARB_vertex_program
 #define need_GL_EXT_blend_equation_separate
 #define need_GL_EXT_blend_func_separate
@@ -108,7 +107,6 @@ const struct dri_extension card_extensions[] = {
   {"GL_ARB_texture_env_crossbar",	NULL},
   {"GL_ARB_texture_env_dot3",		NULL},
   {"GL_ARB_texture_mirrored_repeat",	NULL},
-  {"GL_ARB_vertex_buffer_object",	GL_ARB_vertex_buffer_object_functions},
   {"GL_ARB_vertex_program",		GL_ARB_vertex_program_functions},
   {"GL_EXT_blend_equation_separate",	GL_EXT_blend_equation_separate_functions},
   {"GL_EXT_blend_func_separate",	GL_EXT_blend_func_separate_functions},
diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c b/src/mesa/drivers/dri/radeon/radeon_context.c
index 156906e795..38066134a9 100644
--- a/src/mesa/drivers/dri/radeon/radeon_context.c
+++ b/src/mesa/drivers/dri/radeon/radeon_context.c
@@ -62,7 +62,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "radeon_tcl.h"
 #include "radeon_maos.h"
 
-#define need_GL_ARB_vertex_buffer_object
 #define need_GL_EXT_blend_minmax
 #define need_GL_EXT_fog_coord
 #define need_GL_EXT_secondary_color
@@ -119,7 +118,6 @@ const struct dri_extension card_extensions[] =
     { "GL_ARB_texture_env_crossbar",       NULL },
     { "GL_ARB_texture_env_dot3",           NULL },
     { "GL_ARB_texture_mirrored_repeat",    NULL },
-    { "GL_ARB_vertex_buffer_object",       GL_ARB_vertex_buffer_object_functions },
     { "GL_EXT_blend_logic_op",             NULL },
     { "GL_EXT_blend_subtract",             GL_EXT_blend_minmax_functions },
     { "GL_EXT_fog_coord",                  GL_EXT_fog_coord_functions },
diff --git a/src/mesa/drivers/dri/savage/savage_xmesa.c b/src/mesa/drivers/dri/savage/savage_xmesa.c
index 6ae42b6461..ab21505cbd 100644
--- a/src/mesa/drivers/dri/savage/savage_xmesa.c
+++ b/src/mesa/drivers/dri/savage/savage_xmesa.c
@@ -59,7 +59,6 @@
 #include "drirenderbuffer.h"
 #include "texmem.h"
 
-#define need_GL_ARB_vertex_buffer_object
 #define need_GL_EXT_secondary_color
 #include "extension_helper.h"
 
@@ -132,7 +131,6 @@ struct timeval tv_s1,tv_f1;
 static const struct dri_extension card_extensions[] =
 {
     { "GL_ARB_multitexture",               NULL },
-    { "GL_ARB_vertex_buffer_object",       GL_ARB_vertex_buffer_object_functions },
     { "GL_EXT_stencil_wrap",               NULL },
     { "GL_EXT_texture_lod_bias",           NULL },
     { "GL_EXT_secondary_color",            GL_EXT_secondary_color_functions },
diff --git a/src/mesa/drivers/dri/sis/sis_context.c b/src/mesa/drivers/dri/sis/sis_context.c
index 6c40f6db18..a070fe3d79 100644
--- a/src/mesa/drivers/dri/sis/sis_context.c
+++ b/src/mesa/drivers/dri/sis/sis_context.c
@@ -57,7 +57,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "tnl/tnl.h"
 #include "tnl/t_pipeline.h"
 
-#define need_GL_ARB_vertex_buffer_object
 #define need_GL_EXT_fog_coord
 #define need_GL_EXT_secondary_color
 #include "extension_helper.h"
@@ -75,7 +74,6 @@ struct dri_extension card_extensions[] =
     { "GL_ARB_multitexture",               NULL },
     { "GL_ARB_texture_border_clamp",       NULL },
     { "GL_ARB_texture_mirrored_repeat",    NULL },
-    { "GL_ARB_vertex_buffer_object",       GL_ARB_vertex_buffer_object_functions },
     /*{ "GL_EXT_fog_coord",                  GL_EXT_fog_coord_functions },*/
     { "GL_EXT_texture_lod_bias",           NULL },
     { "GL_EXT_secondary_color",            GL_EXT_secondary_color_functions },
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_context.c b/src/mesa/drivers/dri/tdfx/tdfx_context.c
index 9d2d57ccc9..1cebb59571 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_context.c
+++ b/src/mesa/drivers/dri/tdfx/tdfx_context.c
@@ -60,7 +60,6 @@
 
 /* #define need_GL_ARB_point_parameters */
 #define need_GL_ARB_occlusion_query
-#define need_GL_ARB_vertex_buffer_object
 /* #define need_GL_ARB_vertex_program */
 #define need_GL_EXT_blend_equation_separate
 #define need_GL_EXT_blend_func_separate
@@ -82,7 +81,6 @@ const struct dri_extension card_extensions[] =
 {
     { "GL_ARB_occlusion_query",            GL_ARB_occlusion_query_functions },
     { "GL_ARB_texture_mirrored_repeat",    NULL },
-    { "GL_ARB_vertex_buffer_object",       GL_ARB_vertex_buffer_object_functions },
 
     { "GL_EXT_blend_func_separate",        GL_EXT_blend_func_separate_functions },
     { "GL_EXT_fog_coord",                  GL_EXT_fog_coord_functions },
diff --git a/src/mesa/drivers/dri/unichrome/via_context.c b/src/mesa/drivers/dri/unichrome/via_context.c
index 990671fc49..cb66c2d89d 100644
--- a/src/mesa/drivers/dri/unichrome/via_context.c
+++ b/src/mesa/drivers/dri/unichrome/via_context.c
@@ -63,7 +63,6 @@
 #include "drirenderbuffer.h"
 
 #define need_GL_ARB_point_parameters
-#define need_GL_ARB_vertex_buffer_object
 #define need_GL_EXT_fog_coord
 #define need_GL_EXT_secondary_color
 #include "extension_helper.h"
@@ -371,7 +370,6 @@ const struct dri_extension card_extensions[] =
     { "GL_ARB_texture_env_combine",        NULL },
 /*    { "GL_ARB_texture_env_dot3",           NULL }, */
     { "GL_ARB_texture_mirrored_repeat",    NULL },
-    { "GL_ARB_vertex_buffer_object",       GL_ARB_vertex_buffer_object_functions },
     { "GL_EXT_fog_coord",                  GL_EXT_fog_coord_functions },
     { "GL_EXT_secondary_color",            GL_EXT_secondary_color_functions },
     { "GL_EXT_stencil_wrap",               NULL },
diff --git a/src/mesa/drivers/glide/fxdd.c b/src/mesa/drivers/glide/fxdd.c
index f2d52cb493..2088f037dc 100644
--- a/src/mesa/drivers/glide/fxdd.c
+++ b/src/mesa/drivers/glide/fxdd.c
@@ -1917,7 +1917,6 @@ fxDDInitExtensions(GLcontext * ctx)
    /* core-level extensions */
    _mesa_enable_extension(ctx, "GL_EXT_multi_draw_arrays");
    _mesa_enable_extension(ctx, "GL_IBM_multimode_draw_arrays");
-   _mesa_enable_extension(ctx, "GL_ARB_vertex_buffer_object");
    /* dangerous */
    if (getenv("MESA_FX_ALLOW_VP")) {
       _mesa_enable_extension(ctx, "GL_ARB_vertex_program");
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 3fb06764a6..0205a529aa 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -75,7 +75,7 @@ static const struct {
    { OFF, "GL_ARB_texture_non_power_of_two",   F(ARB_texture_non_power_of_two)},
    { OFF, "GL_ARB_texture_rectangle",          F(NV_texture_rectangle) },
    { ON,  "GL_ARB_transpose_matrix",           F(ARB_transpose_matrix) },
-   { OFF, "GL_ARB_vertex_buffer_object",       F(ARB_vertex_buffer_object) },
+   { ON,  "GL_ARB_vertex_buffer_object",       F(ARB_vertex_buffer_object) },
    { OFF, "GL_ARB_vertex_program",             F(ARB_vertex_program) },
    { OFF, "GL_ARB_vertex_shader",              F(ARB_vertex_shader) },
    { ON,  "GL_ARB_window_pos",                 F(ARB_window_pos) },
@@ -228,7 +228,7 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
    ctx->Extensions.ARB_vertex_shader = GL_TRUE;
 #endif
 #if FEATURE_ARB_vertex_buffer_object
-   ctx->Extensions.ARB_vertex_buffer_object = GL_TRUE;
+   /*ctx->Extensions.ARB_vertex_buffer_object = GL_TRUE;*/
 #endif
    ctx->Extensions.APPLE_vertex_array_object = GL_TRUE;
 #if FEATURE_ATI_fragment_shader
@@ -389,7 +389,7 @@ void
 _mesa_enable_1_5_extensions(GLcontext *ctx)
 {
    ctx->Extensions.ARB_occlusion_query = GL_TRUE;
-   ctx->Extensions.ARB_vertex_buffer_object = GL_TRUE;
+   /*ctx->Extensions.ARB_vertex_buffer_object = GL_TRUE;*/
    ctx->Extensions.EXT_shadow_funcs = GL_TRUE;
 }
 
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 9aa2b4e1dc..613f067caa 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -1581,43 +1581,33 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          params[0] = FLOAT_TO_BOOLEAN(ctx->Const.MaxSpotExponent);
          break;
       case GL_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXT1(ARB_vertex_buffer_object, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Array.ArrayBufferObj->Name);
          break;
       case GL_VERTEX_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXT1(ARB_vertex_buffer_object, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Array.ArrayObj->Vertex.BufferObj->Name);
          break;
       case GL_NORMAL_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXT1(ARB_vertex_buffer_object, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Array.ArrayObj->Normal.BufferObj->Name);
          break;
       case GL_COLOR_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXT1(ARB_vertex_buffer_object, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Array.ArrayObj->Color.BufferObj->Name);
          break;
       case GL_INDEX_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXT1(ARB_vertex_buffer_object, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Array.ArrayObj->Index.BufferObj->Name);
          break;
       case GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXT1(ARB_vertex_buffer_object, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture].BufferObj->Name);
          break;
       case GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXT1(ARB_vertex_buffer_object, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Array.ArrayObj->EdgeFlag.BufferObj->Name);
          break;
       case GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXT1(ARB_vertex_buffer_object, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Array.ArrayObj->SecondaryColor.BufferObj->Name);
          break;
       case GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXT1(ARB_vertex_buffer_object, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Array.ArrayObj->FogCoord.BufferObj->Name);
          break;
       case GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXT1(ARB_vertex_buffer_object, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Array.ElementArrayBufferObj->Name);
          break;
       case GL_PIXEL_PACK_BUFFER_BINDING_EXT:
@@ -3422,43 +3412,33 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          params[0] = ctx->Const.MaxSpotExponent;
          break;
       case GL_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXT1(ARB_vertex_buffer_object, "GetFloatv");
          params[0] = (GLfloat)(ctx->Array.ArrayBufferObj->Name);
          break;
       case GL_VERTEX_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXT1(ARB_vertex_buffer_object, "GetFloatv");
          params[0] = (GLfloat)(ctx->Array.ArrayObj->Vertex.BufferObj->Name);
          break;
       case GL_NORMAL_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXT1(ARB_vertex_buffer_object, "GetFloatv");
          params[0] = (GLfloat)(ctx->Array.ArrayObj->Normal.BufferObj->Name);
          break;
       case GL_COLOR_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXT1(ARB_vertex_buffer_object, "GetFloatv");
          params[0] = (GLfloat)(ctx->Array.ArrayObj->Color.BufferObj->Name);
          break;
       case GL_INDEX_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXT1(ARB_vertex_buffer_object, "GetFloatv");
          params[0] = (GLfloat)(ctx->Array.ArrayObj->Index.BufferObj->Name);
          break;
       case GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXT1(ARB_vertex_buffer_object, "GetFloatv");
          params[0] = (GLfloat)(ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture].BufferObj->Name);
          break;
       case GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXT1(ARB_vertex_buffer_object, "GetFloatv");
          params[0] = (GLfloat)(ctx->Array.ArrayObj->EdgeFlag.BufferObj->Name);
          break;
       case GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXT1(ARB_vertex_buffer_object, "GetFloatv");
          params[0] = (GLfloat)(ctx->Array.ArrayObj->SecondaryColor.BufferObj->Name);
          break;
       case GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXT1(ARB_vertex_buffer_object, "GetFloatv");
          params[0] = (GLfloat)(ctx->Array.ArrayObj->FogCoord.BufferObj->Name);
          break;
       case GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXT1(ARB_vertex_buffer_object, "GetFloatv");
          params[0] = (GLfloat)(ctx->Array.ElementArrayBufferObj->Name);
          break;
       case GL_PIXEL_PACK_BUFFER_BINDING_EXT:
@@ -5263,43 +5243,33 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          params[0] = IROUND(ctx->Const.MaxSpotExponent);
          break;
       case GL_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXT1(ARB_vertex_buffer_object, "GetIntegerv");
          params[0] = ctx->Array.ArrayBufferObj->Name;
          break;
       case GL_VERTEX_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXT1(ARB_vertex_buffer_object, "GetIntegerv");
          params[0] = ctx->Array.ArrayObj->Vertex.BufferObj->Name;
          break;
       case GL_NORMAL_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXT1(ARB_vertex_buffer_object, "GetIntegerv");
          params[0] = ctx->Array.ArrayObj->Normal.BufferObj->Name;
          break;
       case GL_COLOR_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXT1(ARB_vertex_buffer_object, "GetIntegerv");
          params[0] = ctx->Array.ArrayObj->Color.BufferObj->Name;
          break;
       case GL_INDEX_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXT1(ARB_vertex_buffer_object, "GetIntegerv");
          params[0] = ctx->Array.ArrayObj->Index.BufferObj->Name;
          break;
       case GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXT1(ARB_vertex_buffer_object, "GetIntegerv");
          params[0] = ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture].BufferObj->Name;
          break;
       case GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXT1(ARB_vertex_buffer_object, "GetIntegerv");
          params[0] = ctx->Array.ArrayObj->EdgeFlag.BufferObj->Name;
          break;
       case GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXT1(ARB_vertex_buffer_object, "GetIntegerv");
          params[0] = ctx->Array.ArrayObj->SecondaryColor.BufferObj->Name;
          break;
       case GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXT1(ARB_vertex_buffer_object, "GetIntegerv");
          params[0] = ctx->Array.ArrayObj->FogCoord.BufferObj->Name;
          break;
       case GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXT1(ARB_vertex_buffer_object, "GetIntegerv");
          params[0] = ctx->Array.ElementArrayBufferObj->Name;
          break;
       case GL_PIXEL_PACK_BUFFER_BINDING_EXT:
diff --git a/src/mesa/main/get_gen.py b/src/mesa/main/get_gen.py
index 797f1354aa..78ccee9019 100644
--- a/src/mesa/main/get_gen.py
+++ b/src/mesa/main/get_gen.py
@@ -815,30 +815,30 @@ StateVars = [
 
 	# GL_ARB_vertex_buffer_object
 	( "GL_ARRAY_BUFFER_BINDING_ARB", GLint,
-	  ["ctx->Array.ArrayBufferObj->Name"], "", ["ARB_vertex_buffer_object"] ),
+	  ["ctx->Array.ArrayBufferObj->Name"], "", None ),
 	( "GL_VERTEX_ARRAY_BUFFER_BINDING_ARB", GLint,
-	  ["ctx->Array.ArrayObj->Vertex.BufferObj->Name"], "", ["ARB_vertex_buffer_object"] ),
+	  ["ctx->Array.ArrayObj->Vertex.BufferObj->Name"], "", None ),
 	( "GL_NORMAL_ARRAY_BUFFER_BINDING_ARB", GLint,
-	  ["ctx->Array.ArrayObj->Normal.BufferObj->Name"], "", ["ARB_vertex_buffer_object"] ),
+	  ["ctx->Array.ArrayObj->Normal.BufferObj->Name"], "", None ),
 	( "GL_COLOR_ARRAY_BUFFER_BINDING_ARB", GLint,
-	  ["ctx->Array.ArrayObj->Color.BufferObj->Name"], "", ["ARB_vertex_buffer_object"] ),
+	  ["ctx->Array.ArrayObj->Color.BufferObj->Name"], "", None ),
 	( "GL_INDEX_ARRAY_BUFFER_BINDING_ARB", GLint,
-	  ["ctx->Array.ArrayObj->Index.BufferObj->Name"], "", ["ARB_vertex_buffer_object"] ),
+	  ["ctx->Array.ArrayObj->Index.BufferObj->Name"], "", None ),
 	( "GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB", GLint,
 	  ["ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture].BufferObj->Name"],
-	  "", ["ARB_vertex_buffer_object"] ),
+	  "", None ),
 	( "GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB", GLint,
-	  ["ctx->Array.ArrayObj->EdgeFlag.BufferObj->Name"], "", ["ARB_vertex_buffer_object"] ),
+	  ["ctx->Array.ArrayObj->EdgeFlag.BufferObj->Name"], "", None ),
 	( "GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB", GLint,
 	  ["ctx->Array.ArrayObj->SecondaryColor.BufferObj->Name"],
-	  "", ["ARB_vertex_buffer_object"] ),
+	  "", None ),
 	( "GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB", GLint,
 	  ["ctx->Array.ArrayObj->FogCoord.BufferObj->Name"],
-	  "", ["ARB_vertex_buffer_object"] ),
+	  "", None ),
 	# GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB - not supported
 	( "GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB", GLint,
 	  ["ctx->Array.ElementArrayBufferObj->Name"],
-	  "", ["ARB_vertex_buffer_object"] ),
+	  "", None ),
 
 	# GL_EXT_pixel_buffer_object
 	( "GL_PIXEL_PACK_BUFFER_BINDING_EXT", GLint,
diff --git a/src/mesa/shader/arbprogram.c b/src/mesa/shader/arbprogram.c
index 7c2b747c43..7831e0faf9 100644
--- a/src/mesa/shader/arbprogram.c
+++ b/src/mesa/shader/arbprogram.c
@@ -335,10 +335,6 @@ _mesa_GetVertexAttribfvARB(GLuint index, GLenum pname, GLfloat *params)
          COPY_4V(params, ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index]);
          break;
       case GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB:
-         if (!ctx->Extensions.ARB_vertex_buffer_object) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glGetVertexAttribfvARB(pname)");
-            return;
-         }
          params[0] = (GLfloat) ctx->Array.ArrayObj->VertexAttrib[index].BufferObj->Name;
          break;
       default:
diff --git a/src/mesa/shader/nvprogram.c b/src/mesa/shader/nvprogram.c
index 88272fff3f..16116c4339 100644
--- a/src/mesa/shader/nvprogram.c
+++ b/src/mesa/shader/nvprogram.c
@@ -469,10 +469,6 @@ _mesa_GetVertexAttribivNV(GLuint index, GLenum pname, GLint *params)
          params[3] = (GLint) ctx->Current.Attrib[index][3];
          break;
       case GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB:
-         if (!ctx->Extensions.ARB_vertex_buffer_object) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glGetVertexAttribdvNV");
-            return;
-         }
          params[0] = ctx->Array.ArrayObj->VertexAttrib[index].BufferObj->Name;
          break;
       default:
-- 
cgit v1.2.3


From 474cda6fa912a766821d20b5b21d6eeba6ea9225 Mon Sep 17 00:00:00 2001
From: Ian Romanick <idr@freedesktop.org>
Date: Tue, 27 Jan 2009 18:16:51 -0800
Subject: Make GL_{EXT,SUN}_multi_draw_arrays and GL_IBM_multimode_draw_arrays
 mandatory

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
---
 src/mesa/drivers/dri/common/utils.c           |  4 ++++
 src/mesa/drivers/dri/intel/intel_extensions.c |  2 --
 src/mesa/drivers/dri/mga/mga_xmesa.c          |  2 --
 src/mesa/drivers/dri/r200/r200_context.c      |  2 --
 src/mesa/drivers/dri/r300/r300_context.c      |  2 --
 src/mesa/drivers/dri/swrast/swrast.c          |  2 --
 src/mesa/drivers/dri/tdfx/tdfx_context.c      |  4 ----
 src/mesa/drivers/glide/fxdd.c                 |  2 --
 src/mesa/drivers/x11/xm_api.c                 |  2 --
 src/mesa/main/extensions.c                    | 12 ++++++------
 10 files changed, 10 insertions(+), 24 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/common/utils.c b/src/mesa/drivers/dri/common/utils.c
index 3fd88ea8fb..04d334f278 100644
--- a/src/mesa/drivers/dri/common/utils.c
+++ b/src/mesa/drivers/dri/common/utils.c
@@ -185,9 +185,11 @@ driGetRendererString( char * buffer, const char * hardware_name,
 #define need_GL_ARB_vertex_buffer_object
 #define need_GL_ARB_window_pos
 #define need_GL_EXT_compiled_vertex_array
+#define need_GL_EXT_multi_draw_arrays
 #define need_GL_EXT_polygon_offset
 #define need_GL_EXT_texture_object
 #define need_GL_EXT_vertex_array
+#define need_GL_IBM_multimode_draw_arrays
 #define need_GL_MESA_window_pos
 
 /* These are needed in *all* drivers because Mesa internally implements
@@ -207,9 +209,11 @@ static const struct dri_extension all_mesa_extensions[] = {
    { "GL_ARB_window_pos",            GL_ARB_window_pos_functions },
    { "GL_EXT_blend_func_separate",   GL_EXT_blend_func_separate_functions },
    { "GL_EXT_compiled_vertex_array", GL_EXT_compiled_vertex_array_functions },
+   { "GL_EXT_multi_draw_arrays",     GL_EXT_multi_draw_arrays_functions },
    { "GL_EXT_polygon_offset",        GL_EXT_polygon_offset_functions },
    { "GL_EXT_texture_object",        GL_EXT_texture_object_functions },
    { "GL_EXT_vertex_array",          GL_EXT_vertex_array_functions },
+   { "GL_IBM_multimode_draw_arrays", GL_IBM_multimode_draw_arrays_functions },
    { "GL_MESA_window_pos",           GL_MESA_window_pos_functions },
    { "GL_NV_vertex_program",         GL_NV_vertex_program_functions },
    { NULL,                           NULL }
diff --git a/src/mesa/drivers/dri/intel/intel_extensions.c b/src/mesa/drivers/dri/intel/intel_extensions.c
index c963892d98..549b239bd3 100644
--- a/src/mesa/drivers/dri/intel/intel_extensions.c
+++ b/src/mesa/drivers/dri/intel/intel_extensions.c
@@ -45,7 +45,6 @@
 #define need_GL_EXT_fog_coord
 #define need_GL_EXT_framebuffer_object
 #define need_GL_EXT_framebuffer_blit
-#define need_GL_EXT_multi_draw_arrays
 #define need_GL_EXT_point_parameters
 #define need_GL_EXT_secondary_color
 #define need_GL_EXT_stencil_two_side
@@ -85,7 +84,6 @@ static const struct dri_extension card_extensions[] = {
    { "GL_EXT_blend_subtract",             NULL },
    { "GL_EXT_cull_vertex",                GL_EXT_cull_vertex_functions },
    { "GL_EXT_fog_coord",                  GL_EXT_fog_coord_functions },
-   { "GL_EXT_multi_draw_arrays",          GL_EXT_multi_draw_arrays_functions },
    { "GL_EXT_packed_depth_stencil",       NULL },
    { "GL_EXT_secondary_color",            GL_EXT_secondary_color_functions },
    { "GL_EXT_stencil_wrap",               NULL },
diff --git a/src/mesa/drivers/dri/mga/mga_xmesa.c b/src/mesa/drivers/dri/mga/mga_xmesa.c
index 23ab5bca2d..41fa9b29ff 100644
--- a/src/mesa/drivers/dri/mga/mga_xmesa.c
+++ b/src/mesa/drivers/dri/mga/mga_xmesa.c
@@ -72,7 +72,6 @@
 #define need_GL_ARB_vertex_program
 #define need_GL_EXT_fog_coord
 #define need_GL_EXT_gpu_program_parameters
-#define need_GL_EXT_multi_draw_arrays
 #define need_GL_EXT_secondary_color
 #if 0
 #define need_GL_EXT_paletted_texture
@@ -385,7 +384,6 @@ static const struct dri_extension card_extensions[] =
    { "GL_ARB_texture_rectangle",      NULL },
    { "GL_EXT_blend_logic_op",         NULL },
    { "GL_EXT_fog_coord",              GL_EXT_fog_coord_functions },
-   { "GL_EXT_multi_draw_arrays",      GL_EXT_multi_draw_arrays_functions },
    /* paletted_textures currently doesn't work, but we could fix them later */
 #if defined( need_GL_EXT_paletted_texture )
    { "GL_EXT_shared_texture_palette", NULL },
diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c
index 51b216a5f8..47ecd4b05a 100644
--- a/src/mesa/drivers/dri/r200/r200_context.c
+++ b/src/mesa/drivers/dri/r200/r200_context.c
@@ -66,7 +66,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define need_GL_ATI_fragment_shader
 #define need_GL_EXT_blend_minmax
 #define need_GL_EXT_fog_coord
-#define need_GL_EXT_multi_draw_arrays
 #define need_GL_EXT_secondary_color
 #define need_GL_EXT_blend_equation_separate
 #define need_GL_EXT_blend_func_separate
@@ -127,7 +126,6 @@ const struct dri_extension card_extensions[] =
     { "GL_EXT_blend_minmax",               GL_EXT_blend_minmax_functions },
     { "GL_EXT_blend_subtract",             NULL },
     { "GL_EXT_fog_coord",                  GL_EXT_fog_coord_functions },
-    { "GL_EXT_multi_draw_arrays",          GL_EXT_multi_draw_arrays_functions },
     { "GL_EXT_secondary_color",            GL_EXT_secondary_color_functions },
     { "GL_EXT_stencil_wrap",               NULL },
     { "GL_EXT_texture_edge_clamp",         NULL },
diff --git a/src/mesa/drivers/dri/r300/r300_context.c b/src/mesa/drivers/dri/r300/r300_context.c
index bdf41e5392..e74d29e580 100644
--- a/src/mesa/drivers/dri/r300/r300_context.c
+++ b/src/mesa/drivers/dri/r300/r300_context.c
@@ -85,7 +85,6 @@ int hw_tcl_on = 1;
 #define need_GL_EXT_blend_minmax
 //#define need_GL_EXT_fog_coord
 #define need_GL_EXT_gpu_program_parameters
-#define need_GL_EXT_multi_draw_arrays
 #define need_GL_EXT_secondary_color
 #define need_GL_EXT_stencil_two_side
 #define need_GL_ATI_separate_stencil
@@ -113,7 +112,6 @@ const struct dri_extension card_extensions[] = {
   {"GL_EXT_blend_minmax",		GL_EXT_blend_minmax_functions},
   {"GL_EXT_blend_subtract",		NULL},
 //  {"GL_EXT_fog_coord",			GL_EXT_fog_coord_functions },
-  {"GL_EXT_multi_draw_arrays",		GL_EXT_multi_draw_arrays_functions},
   {"GL_EXT_gpu_program_parameters",     GL_EXT_gpu_program_parameters_functions},
   {"GL_EXT_secondary_color", 		GL_EXT_secondary_color_functions},
   {"GL_EXT_shadow_funcs",		NULL},
diff --git a/src/mesa/drivers/dri/swrast/swrast.c b/src/mesa/drivers/dri/swrast/swrast.c
index 4197603871..07e4ba0710 100644
--- a/src/mesa/drivers/dri/swrast/swrast.c
+++ b/src/mesa/drivers/dri/swrast/swrast.c
@@ -73,7 +73,6 @@
 #define need_GL_EXT_gpu_program_parameters
 #define need_GL_EXT_paletted_texture
 #define need_GL_EXT_stencil_two_side
-#define need_GL_IBM_multimode_draw_arrays
 #define need_GL_MESA_resize_buffers
 #define need_GL_NV_vertex_program
 #define need_GL_NV_fragment_program
@@ -105,7 +104,6 @@ const struct dri_extension card_extensions[] =
     { "GL_EXT_gpu_program_parameters",	GL_EXT_gpu_program_parameters_functions },
     { "GL_EXT_paletted_texture",	GL_EXT_paletted_texture_functions },
     { "GL_EXT_stencil_two_side",	GL_EXT_stencil_two_side_functions },
-    { "GL_IBM_multimode_draw_arrays",	GL_IBM_multimode_draw_arrays_functions },
     { "GL_MESA_resize_buffers",		GL_MESA_resize_buffers_functions },
     { "GL_NV_vertex_program",		GL_NV_vertex_program_functions },
     { "GL_NV_fragment_program",		GL_NV_fragment_program_functions },
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_context.c b/src/mesa/drivers/dri/tdfx/tdfx_context.c
index 1cebb59571..aeb267a64a 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_context.c
+++ b/src/mesa/drivers/dri/tdfx/tdfx_context.c
@@ -65,10 +65,8 @@
 #define need_GL_EXT_blend_func_separate
 #define need_GL_EXT_blend_minmax
 #define need_GL_EXT_fog_coord
-#define need_GL_EXT_multi_draw_arrays
 #define need_GL_EXT_paletted_texture
 /* #define need_GL_EXT_secondary_color */
-#define need_GL_IBM_multimode_draw_arrays
 /* #define need_GL_MESA_program_debug */
 /* #define need_GL_NV_vertex_program */
 #include "extension_helper.h"
@@ -84,13 +82,11 @@ const struct dri_extension card_extensions[] =
 
     { "GL_EXT_blend_func_separate",        GL_EXT_blend_func_separate_functions },
     { "GL_EXT_fog_coord",                  GL_EXT_fog_coord_functions },
-    { "GL_EXT_multi_draw_arrays",          GL_EXT_multi_draw_arrays_functions },
     { "GL_EXT_paletted_texture",           GL_EXT_paletted_texture_functions },
     { "GL_EXT_shared_texture_palette",     NULL },
     { "GL_EXT_stencil_wrap",               NULL },
     { "GL_EXT_texture_env_add",            NULL },
     { "GL_EXT_texture_lod_bias",           NULL },
-    { "GL_IBM_multimode_draw_arrays",      GL_IBM_multimode_draw_arrays_functions },
 
 #ifdef need_GL_ARB_point_parameters
     { "GL_ARB_point_parameters",           GL_ARB_point_parameters_functions },
diff --git a/src/mesa/drivers/glide/fxdd.c b/src/mesa/drivers/glide/fxdd.c
index 2088f037dc..e93ada2893 100644
--- a/src/mesa/drivers/glide/fxdd.c
+++ b/src/mesa/drivers/glide/fxdd.c
@@ -1915,8 +1915,6 @@ fxDDInitExtensions(GLcontext * ctx)
    }
 
    /* core-level extensions */
-   _mesa_enable_extension(ctx, "GL_EXT_multi_draw_arrays");
-   _mesa_enable_extension(ctx, "GL_IBM_multimode_draw_arrays");
    /* dangerous */
    if (getenv("MESA_FX_ALLOW_VP")) {
       _mesa_enable_extension(ctx, "GL_ARB_vertex_program");
diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c
index 18aa8bcc09..00ce3ba723 100644
--- a/src/mesa/drivers/x11/xm_api.c
+++ b/src/mesa/drivers/x11/xm_api.c
@@ -1325,7 +1325,6 @@ xmesa_convert_from_x_visual_type( int visualType )
 #define need_GL_EXT_framebuffer_blit
 #define need_GL_EXT_gpu_program_parameters
 #define need_GL_EXT_paletted_texture
-#define need_GL_IBM_multimode_draw_arrays
 #define need_GL_MESA_resize_buffers
 #define need_GL_NV_vertex_program
 #define need_GL_NV_fragment_program
@@ -1355,7 +1354,6 @@ const struct dri_extension card_extensions[] =
    { "GL_EXT_framebuffer_blit",		GL_EXT_framebuffer_blit_functions },
    { "GL_EXT_gpu_program_parameters",	GL_EXT_gpu_program_parameters_functions },
    { "GL_EXT_paletted_texture",		GL_EXT_paletted_texture_functions },
-   { "GL_IBM_multimode_draw_arrays",	GL_IBM_multimode_draw_arrays_functions },
    { "GL_MESA_resize_buffers",		GL_MESA_resize_buffers_functions },
    { "GL_NV_vertex_program",		GL_NV_vertex_program_functions },
    { "GL_NV_fragment_program",		GL_NV_fragment_program_functions },
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 0205a529aa..ec6ba70800 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -99,7 +99,7 @@ static const struct {
    { OFF, "GL_EXT_fog_coord",                  F(EXT_fog_coord) },
    { OFF, "GL_EXT_gpu_program_parameters",     F(EXT_gpu_program_parameters) },
    { OFF, "GL_EXT_histogram",                  F(EXT_histogram) },
-   { OFF, "GL_EXT_multi_draw_arrays",          F(EXT_multi_draw_arrays) },
+   { ON,  "GL_EXT_multi_draw_arrays",          F(EXT_multi_draw_arrays) },
    { OFF, "GL_EXT_packed_depth_stencil",       F(EXT_packed_depth_stencil) },
    { ON,  "GL_EXT_packed_pixels",              F(EXT_packed_pixels) },
    { OFF, "GL_EXT_paletted_texture",           F(EXT_paletted_texture) },
@@ -141,7 +141,7 @@ static const struct {
    { OFF, "GL_ATI_texture_mirror_once",        F(ATI_texture_mirror_once)},
    { OFF, "GL_ATI_fragment_shader",            F(ATI_fragment_shader)},
    { OFF, "GL_ATI_separate_stencil",           F(ATI_separate_stencil)},
-   { OFF, "GL_IBM_multimode_draw_arrays",      F(IBM_multimode_draw_arrays) },
+   { ON,  "GL_IBM_multimode_draw_arrays",      F(IBM_multimode_draw_arrays) },
    { ON,  "GL_IBM_rasterpos_clip",             F(IBM_rasterpos_clip) },
    { OFF, "GL_IBM_texture_mirrored_repeat",    F(ARB_texture_mirrored_repeat)},
    { OFF, "GL_INGR_blend_func_separate",       F(EXT_blend_func_separate) },
@@ -170,7 +170,7 @@ static const struct {
    { ON,  "GL_SGIS_texture_edge_clamp",        F(SGIS_texture_edge_clamp) },
    { ON,  "GL_SGIS_texture_lod",               F(SGIS_texture_lod) },
    { OFF, "GL_SGIX_depth_texture",             F(ARB_depth_texture) },
-   { OFF, "GL_SUN_multi_draw_arrays",          F(EXT_multi_draw_arrays) },
+   { ON,  "GL_SUN_multi_draw_arrays",          F(EXT_multi_draw_arrays) },
    { OFF, "GL_S3_s3tc",                        F(S3_s3tc) },
 };
 
@@ -253,7 +253,7 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
    ctx->Extensions.EXT_framebuffer_blit = GL_TRUE;
 #endif
    ctx->Extensions.EXT_histogram = GL_TRUE;
-   ctx->Extensions.EXT_multi_draw_arrays = GL_TRUE;
+   /*ctx->Extensions.EXT_multi_draw_arrays = GL_TRUE;*/
    ctx->Extensions.EXT_packed_depth_stencil = GL_TRUE;
    ctx->Extensions.EXT_paletted_texture = GL_TRUE;
 #if FEATURE_EXT_pixel_buffer_object
@@ -275,7 +275,7 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
 #endif
    ctx->Extensions.EXT_texture_swizzle = GL_TRUE;
    ctx->Extensions.EXT_vertex_array_bgra = GL_TRUE;
-   ctx->Extensions.IBM_multimode_draw_arrays = GL_TRUE;
+   /*ctx->Extensions.IBM_multimode_draw_arrays = GL_TRUE;*/
    ctx->Extensions.MESA_pack_invert = GL_TRUE;
 #if FEATURE_MESA_program_debug
    ctx->Extensions.MESA_program_debug = GL_TRUE;
@@ -372,7 +372,7 @@ _mesa_enable_1_4_extensions(GLcontext *ctx)
    ctx->Extensions.EXT_blend_minmax = GL_TRUE;
    ctx->Extensions.EXT_blend_subtract = GL_TRUE;
    ctx->Extensions.EXT_fog_coord = GL_TRUE;
-   ctx->Extensions.EXT_multi_draw_arrays = GL_TRUE;
+   /*ctx->Extensions.EXT_multi_draw_arrays = GL_TRUE;*/
    ctx->Extensions.EXT_point_parameters = GL_TRUE;
    ctx->Extensions.EXT_secondary_color = GL_TRUE;
    ctx->Extensions.EXT_stencil_wrap = GL_TRUE;
-- 
cgit v1.2.3


From 8aa209c766b79144db499063dd1c8482562b07bf Mon Sep 17 00:00:00 2001
From: Ian Romanick <idr@freedesktop.org>
Date: Tue, 27 Jan 2009 19:10:43 -0800
Subject: Make GL_ARB_draw_buffers mandatory

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
---
 src/mesa/drivers/dri/common/utils.c                       |  2 ++
 src/mesa/drivers/dri/ffb/ffb_xmesa.c                      |  2 ++
 src/mesa/drivers/dri/gamma/gamma_context.c                |  2 ++
 src/mesa/drivers/dri/i915/i830_context.c                  |  2 ++
 src/mesa/drivers/dri/i915/i915_context.c                  |  2 ++
 src/mesa/drivers/dri/intel/intel_extensions.c             |  1 -
 src/mesa/drivers/dri/mach64/mach64_context.c              |  1 +
 src/mesa/drivers/dri/mga/mga_xmesa.c                      |  2 ++
 src/mesa/drivers/dri/r128/r128_context.c                  |  2 ++
 src/mesa/drivers/dri/r200/r200_context.c                  |  2 ++
 src/mesa/drivers/dri/r300/r300_context.c                  |  2 ++
 src/mesa/drivers/dri/radeon/radeon_context.c              |  2 ++
 src/mesa/drivers/dri/s3v/s3v_context.c                    |  2 ++
 src/mesa/drivers/dri/savage/savage_xmesa.c                |  4 +++-
 src/mesa/drivers/dri/tdfx/tdfx_context.c                  |  2 ++
 src/mesa/drivers/dri/trident/trident_context.c            |  2 ++
 src/mesa/drivers/dri/unichrome/via_context.c              |  2 ++
 src/mesa/drivers/glide/fxdd.c                             |  2 ++
 src/mesa/drivers/windows/gldirect/dglcontext.c            |  1 +
 src/mesa/drivers/windows/gldirect/dx7/gld_wgl_dx7.c       |  2 ++
 src/mesa/drivers/windows/gldirect/dx8/gld_wgl_dx8.c       |  1 +
 src/mesa/drivers/windows/gldirect/dx9/gld_wgl_dx9.c       |  1 +
 src/mesa/drivers/windows/gldirect/mesasw/gld_wgl_mesasw.c |  1 +
 src/mesa/main/attrib.c                                    | 15 +++++++--------
 src/mesa/main/buffers.c                                   |  4 ----
 src/mesa/main/extensions.c                                |  6 +++---
 src/mesa/main/get.c                                       | 15 ---------------
 src/mesa/main/get_gen.py                                  | 10 +++++-----
 src/mesa/shader/arbprogparse.c                            |  3 +--
 src/mesa/shader/slang/slang_preprocess.c                  |  3 +--
 30 files changed, 57 insertions(+), 41 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/common/utils.c b/src/mesa/drivers/dri/common/utils.c
index 04d334f278..e4d228c575 100644
--- a/src/mesa/drivers/dri/common/utils.c
+++ b/src/mesa/drivers/dri/common/utils.c
@@ -179,6 +179,7 @@ driGetRendererString( char * buffer, const char * hardware_name,
 
 
 
+#define need_GL_ARB_draw_buffers
 #define need_GL_ARB_multisample
 #define need_GL_ARB_texture_compression
 #define need_GL_ARB_transpose_matrix
@@ -202,6 +203,7 @@ driGetRendererString( char * buffer, const char * hardware_name,
 #include "extension_helper.h"
 
 static const struct dri_extension all_mesa_extensions[] = {
+   { "GL_ARB_draw_buffers",          GL_ARB_draw_buffers_functions },
    { "GL_ARB_multisample",           GL_ARB_multisample_functions },
    { "GL_ARB_texture_compression",   GL_ARB_texture_compression_functions },
    { "GL_ARB_transpose_matrix",      GL_ARB_transpose_matrix_functions },
diff --git a/src/mesa/drivers/dri/ffb/ffb_xmesa.c b/src/mesa/drivers/dri/ffb/ffb_xmesa.c
index 679f8561d2..0cdbbd0ace 100644
--- a/src/mesa/drivers/dri/ffb/ffb_xmesa.c
+++ b/src/mesa/drivers/dri/ffb/ffb_xmesa.c
@@ -260,6 +260,8 @@ ffbCreateContext(const __GLcontextModes *mesaVis,
 	ctx->Const.MaxLineWidthAA = 1.0;
 	ctx->Const.LineWidthGranularity = 1.0;
 
+	ctx->Const.MaxDrawBuffers = 1;
+
 	/* Instead of having GCC emit these constants a zillion times
 	 * everywhere in the driver, put them here.
 	 */
diff --git a/src/mesa/drivers/dri/gamma/gamma_context.c b/src/mesa/drivers/dri/gamma/gamma_context.c
index c91bedce3a..b0ac299daa 100644
--- a/src/mesa/drivers/dri/gamma/gamma_context.c
+++ b/src/mesa/drivers/dri/gamma/gamma_context.c
@@ -133,6 +133,8 @@ GLboolean gammaCreateContext( const __GLcontextModes *glVisual,
    ctx->Const.MaxPointSizeAA = 16.0; 
    ctx->Const.PointSizeGranularity = 0.25;
 
+   ctx->Const.MaxDrawBuffers = 1;
+
    gmesa->texHeap = mmInit( 0, gmesa->gammaScreen->textureSize );
 
    make_empty_list(&gmesa->TexObjList);
diff --git a/src/mesa/drivers/dri/i915/i830_context.c b/src/mesa/drivers/dri/i915/i830_context.c
index 09b1ec922f..fdce8af31f 100644
--- a/src/mesa/drivers/dri/i915/i830_context.c
+++ b/src/mesa/drivers/dri/i915/i830_context.c
@@ -97,6 +97,8 @@ i830CreateContext(const __GLcontextModes * mesaVis,
    ctx->Const.MaxTextureRectSize = (1 << 11);
    ctx->Const.MaxTextureUnits = I830_TEX_UNITS;
 
+   ctx->Const.MaxDrawBuffers = 1;
+
    _tnl_init_vertices(ctx, ctx->Const.MaxArrayLockSize + 12,
                       18 * sizeof(GLfloat));
 
diff --git a/src/mesa/drivers/dri/i915/i915_context.c b/src/mesa/drivers/dri/i915/i915_context.c
index 3d6af38057..c224c68b66 100644
--- a/src/mesa/drivers/dri/i915/i915_context.c
+++ b/src/mesa/drivers/dri/i915/i915_context.c
@@ -172,6 +172,8 @@ i915CreateContext(const __GLcontextModes * mesaVis,
 
    ctx->FragmentProgram._MaintainTexEnvProgram = GL_TRUE;
 
+   ctx->Const.MaxDrawBuffers = 1;
+
    driInitExtensions(ctx, i915_extensions, GL_FALSE);
 
 
diff --git a/src/mesa/drivers/dri/intel/intel_extensions.c b/src/mesa/drivers/dri/intel/intel_extensions.c
index 549b239bd3..27d056a3b7 100644
--- a/src/mesa/drivers/dri/intel/intel_extensions.c
+++ b/src/mesa/drivers/dri/intel/intel_extensions.c
@@ -109,7 +109,6 @@ static const struct dri_extension card_extensions[] = {
 /** i965-only extensions */
 static const struct dri_extension brw_extensions[] = {
    { "GL_ARB_depth_texture",              NULL },
-   { "GL_ARB_draw_buffers",               NULL },
    { "GL_ARB_fragment_program",           NULL },
    { "GL_ARB_fragment_program_shadow",    NULL },
    { "GL_ARB_fragment_shader",            NULL },
diff --git a/src/mesa/drivers/dri/mach64/mach64_context.c b/src/mesa/drivers/dri/mach64/mach64_context.c
index 4edab846b0..9c7f513c6f 100644
--- a/src/mesa/drivers/dri/mach64/mach64_context.c
+++ b/src/mesa/drivers/dri/mach64/mach64_context.c
@@ -190,6 +190,7 @@ GLboolean mach64CreateContext( const __GLcontextModes *glVisual,
    ctx->Const.MaxTextureUnits = 2;
    ctx->Const.MaxTextureImageUnits = 2;
    ctx->Const.MaxTextureCoordUnits = 2;
+   ctx->Const.MaxDrawBuffers = 1;
 
    heap = mach64Screen->IsPCI ? MACH64_CARD_HEAP : MACH64_AGP_HEAP;
 
diff --git a/src/mesa/drivers/dri/mga/mga_xmesa.c b/src/mesa/drivers/dri/mga/mga_xmesa.c
index 41fa9b29ff..2d0f387cdc 100644
--- a/src/mesa/drivers/dri/mga/mga_xmesa.c
+++ b/src/mesa/drivers/dri/mga/mga_xmesa.c
@@ -531,6 +531,8 @@ mgaCreateContext( const __GLcontextModes *mesaVis,
    ctx->Const.MaxLineWidthAA = 10.0;
    ctx->Const.LineWidthGranularity = 1.0;
 
+   ctx->Const.MaxDrawBuffers = 1;
+
    mmesa->texture_depth = driQueryOptioni (&mmesa->optionCache,
 					   "texture_depth");
    if (mmesa->texture_depth == DRI_CONF_TEXTURE_DEPTH_FB)
diff --git a/src/mesa/drivers/dri/r128/r128_context.c b/src/mesa/drivers/dri/r128/r128_context.c
index 4d6031f527..f511a67bad 100644
--- a/src/mesa/drivers/dri/r128/r128_context.c
+++ b/src/mesa/drivers/dri/r128/r128_context.c
@@ -223,6 +223,8 @@ GLboolean r128CreateContext( const __GLcontextModes *glVisual,
    ctx->Const.MaxLineWidthAA = 1.0;
    ctx->Const.LineWidthGranularity = 1.0;
 
+   ctx->Const.MaxDrawBuffers = 1;
+
 #if ENABLE_PERF_BOXES
    rmesa->boxes = driQueryOptionb(&rmesa->optionCache, "performance_boxes");
 #endif
diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c
index 47ecd4b05a..c06751516e 100644
--- a/src/mesa/drivers/dri/r200/r200_context.c
+++ b/src/mesa/drivers/dri/r200/r200_context.c
@@ -403,6 +403,8 @@ GLboolean r200CreateContext( const __GLcontextModes *glVisual,
    ctx->Const.VertexProgram.MaxNativeParameters = R200_VSF_MAX_PARAM;
    ctx->Const.VertexProgram.MaxNativeAddressRegs = 1;
 
+   ctx->Const.MaxDrawBuffers = 1;
+
    /* Initialize the software rasterizer and helper modules.
     */
    _swrast_CreateContext( ctx );
diff --git a/src/mesa/drivers/dri/r300/r300_context.c b/src/mesa/drivers/dri/r300/r300_context.c
index e74d29e580..4c14c7eefe 100644
--- a/src/mesa/drivers/dri/r300/r300_context.c
+++ b/src/mesa/drivers/dri/r300/r300_context.c
@@ -311,6 +311,8 @@ GLboolean r300CreateContext(const __GLcontextModes * glVisual,
 #endif
 #endif
 
+	ctx->Const.MaxDrawBuffers = 1;
+
 	/* Initialize the software rasterizer and helper modules.
 	 */
 	_swrast_CreateContext(ctx);
diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c b/src/mesa/drivers/dri/radeon/radeon_context.c
index 38066134a9..ea81a3250b 100644
--- a/src/mesa/drivers/dri/radeon/radeon_context.c
+++ b/src/mesa/drivers/dri/radeon/radeon_context.c
@@ -353,6 +353,8 @@ radeonCreateContext( const __GLcontextModes *glVisual,
 
    rmesa->boxes = 0;
 
+   ctx->Const.MaxDrawBuffers = 1;
+
    /* Initialize the software rasterizer and helper modules.
     */
    _swrast_CreateContext( ctx );
diff --git a/src/mesa/drivers/dri/s3v/s3v_context.c b/src/mesa/drivers/dri/s3v/s3v_context.c
index 14502f95ae..0a3bf7258d 100644
--- a/src/mesa/drivers/dri/s3v/s3v_context.c
+++ b/src/mesa/drivers/dri/s3v/s3v_context.c
@@ -108,6 +108,8 @@ GLboolean s3vCreateContext(const __GLcontextModes *glVisual,
 	ctx->Const.MaxLineWidthAA = 1.0;
 	ctx->Const.LineWidthGranularity = 1.0;
 
+	ctx->Const.MaxDrawBuffers = 1;
+
 	vmesa->texHeap = mmInit( 0, vmesa->s3vScreen->textureSize );
 	DEBUG(("vmesa->s3vScreen->textureSize = 0x%x\n",
 		vmesa->s3vScreen->textureSize));
diff --git a/src/mesa/drivers/dri/savage/savage_xmesa.c b/src/mesa/drivers/dri/savage/savage_xmesa.c
index ab21505cbd..c5decb093a 100644
--- a/src/mesa/drivers/dri/savage/savage_xmesa.c
+++ b/src/mesa/drivers/dri/savage/savage_xmesa.c
@@ -344,7 +344,9 @@ savageCreateContext( const __GLcontextModes *mesaVis,
    ctx->Const.MaxLineWidthAA = 3.0;
    ctx->Const.LineWidthGranularity = 1.0;
 #endif
-   
+
+   ctx->Const.MaxDrawBuffers = 1;
+
    /* Dri stuff
     */
    imesa->hHWContext = driContextPriv->hHWContext;
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_context.c b/src/mesa/drivers/dri/tdfx/tdfx_context.c
index aeb267a64a..20046fcb3a 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_context.c
+++ b/src/mesa/drivers/dri/tdfx/tdfx_context.c
@@ -309,6 +309,8 @@ GLboolean tdfxCreateContext( const __GLcontextModes *mesaVis,
    ctx->Const.MaxLineWidthAA = 1.0;
    ctx->Const.LineWidthGranularity = 1.0;
 
+   ctx->Const.MaxDrawBuffers = 1;
+
    /* Initialize the software rasterizer and helper modules.
     */
    _swrast_CreateContext( ctx );
diff --git a/src/mesa/drivers/dri/trident/trident_context.c b/src/mesa/drivers/dri/trident/trident_context.c
index e134cfcf8e..aefd8a243f 100644
--- a/src/mesa/drivers/dri/trident/trident_context.c
+++ b/src/mesa/drivers/dri/trident/trident_context.c
@@ -128,6 +128,8 @@ tridentCreateContext( const __GLcontextModes *glVisual,
    ctx->Const.MaxPointSizeAA = 16.0; 
    ctx->Const.PointSizeGranularity = 0.25;
 
+   ctx->Const.MaxDrawBuffers = 1;
+
 #if 0
    tmesa->texHeap = mmInit( 0, tmesa->tridentScreen->textureSize );
 
diff --git a/src/mesa/drivers/dri/unichrome/via_context.c b/src/mesa/drivers/dri/unichrome/via_context.c
index cb66c2d89d..6eb19ac079 100644
--- a/src/mesa/drivers/dri/unichrome/via_context.c
+++ b/src/mesa/drivers/dri/unichrome/via_context.c
@@ -573,6 +573,8 @@ viaCreateContext(const __GLcontextModes *visual,
     ctx->Const.MaxPointSizeAA = 1.0;
     ctx->Const.PointSizeGranularity = 1.0;
 
+    ctx->Const.MaxDrawBuffers = 1;
+
     ctx->Driver.GetString = viaGetString;
 
     ctx->DriverCtx = (void *)vmesa;
diff --git a/src/mesa/drivers/glide/fxdd.c b/src/mesa/drivers/glide/fxdd.c
index e93ada2893..338cd37382 100644
--- a/src/mesa/drivers/glide/fxdd.c
+++ b/src/mesa/drivers/glide/fxdd.c
@@ -1773,6 +1773,8 @@ fxDDInitFxMesaContext(fxMesaContext fxMesa)
    ctx->Const.MaxTextureImageUnits = fxMesa->haveTwoTMUs ? 2 : 1;
    ctx->Const.MaxTextureUnits = MAX2(ctx->Const.MaxTextureImageUnits, ctx->Const.MaxTextureCoordUnits);
 
+   ctx->Const.MaxDrawBuffers = 1;
+
    fxMesa->new_state = _NEW_ALL;
    if (!fxMesa->haveHwStencil) {
       /* don't touch stencil if there is none */
diff --git a/src/mesa/drivers/windows/gldirect/dglcontext.c b/src/mesa/drivers/windows/gldirect/dglcontext.c
index 4ad7a76e67..e9c23d1ccb 100644
--- a/src/mesa/drivers/windows/gldirect/dglcontext.c
+++ b/src/mesa/drivers/windows/gldirect/dglcontext.c
@@ -1482,6 +1482,7 @@ SkipPrimaryCreate:
 #else
 	lpCtx->glCtx->Const.MaxTextureSize = 1024;
 #endif
+	lpCtx->glCtx->Const.MaxDrawBuffers = 1;
 
 	// Setup the Display Driver pointers
 	dglSetupDDPointers(lpCtx->glCtx);
diff --git a/src/mesa/drivers/windows/gldirect/dx7/gld_wgl_dx7.c b/src/mesa/drivers/windows/gldirect/dx7/gld_wgl_dx7.c
index 0f8fe33eb1..fa44a952a0 100644
--- a/src/mesa/drivers/windows/gldirect/dx7/gld_wgl_dx7.c
+++ b/src/mesa/drivers/windows/gldirect/dx7/gld_wgl_dx7.c
@@ -1422,6 +1422,8 @@ BOOL gldInitialiseMesa_DX(
 		lpCtx->glCtx->Const.MaxTextureUnits = 1;
 	}
 
+	lpCtx->glCtx->Const.MaxDrawBuffers = 1;
+
 	// max texture size
 //	MaxTextureSize = min(gld->d3dCaps8.MaxTextureHeight, gld->d3dCaps8.MaxTextureWidth);
 	MaxTextureSize = min(gld->d3dCaps.dwMaxTextureHeight, gld->d3dCaps.dwMaxTextureWidth);
diff --git a/src/mesa/drivers/windows/gldirect/dx8/gld_wgl_dx8.c b/src/mesa/drivers/windows/gldirect/dx8/gld_wgl_dx8.c
index 690f68b68f..011d810e97 100644
--- a/src/mesa/drivers/windows/gldirect/dx8/gld_wgl_dx8.c
+++ b/src/mesa/drivers/windows/gldirect/dx8/gld_wgl_dx8.c
@@ -1204,6 +1204,7 @@ BOOL gldInitialiseMesa_DX(
 		MaxTextureSize >>= 1;
 	}
 	lpCtx->glCtx->Const.MaxTextureLevels = (TextureLevels) ? TextureLevels : 8;
+	lpCtx->glCtx->Const.MaxDrawBuffers = 1;
 
 	IDirect3DDevice8_SetRenderState(gld->pDev, D3DRS_LIGHTING, FALSE);
 	IDirect3DDevice8_SetRenderState(gld->pDev, D3DRS_CULLMODE, D3DCULL_NONE);
diff --git a/src/mesa/drivers/windows/gldirect/dx9/gld_wgl_dx9.c b/src/mesa/drivers/windows/gldirect/dx9/gld_wgl_dx9.c
index dc465c5418..a03b865bb4 100644
--- a/src/mesa/drivers/windows/gldirect/dx9/gld_wgl_dx9.c
+++ b/src/mesa/drivers/windows/gldirect/dx9/gld_wgl_dx9.c
@@ -1206,6 +1206,7 @@ BOOL gldInitialiseMesa_DX(
 		MaxTextureSize >>= 1;
 	}
 	lpCtx->glCtx->Const.MaxTextureLevels = (TextureLevels) ? TextureLevels : 8;
+	lpCtx->glCtx->Const.MaxDrawBuffers = 1;
 
 	IDirect3DDevice9_SetRenderState(gld->pDev, D3DRS_LIGHTING, FALSE);
 	IDirect3DDevice9_SetRenderState(gld->pDev, D3DRS_CULLMODE, D3DCULL_NONE);
diff --git a/src/mesa/drivers/windows/gldirect/mesasw/gld_wgl_mesasw.c b/src/mesa/drivers/windows/gldirect/mesasw/gld_wgl_mesasw.c
index b590dc795a..342a742867 100644
--- a/src/mesa/drivers/windows/gldirect/mesasw/gld_wgl_mesasw.c
+++ b/src/mesa/drivers/windows/gldirect/mesasw/gld_wgl_mesasw.c
@@ -1625,6 +1625,7 @@ BOOL gldInitialiseMesa_MesaSW(
 
 	// Added this to force max texture diminsion to 256. KeithH
 	ctx->Const.MaxTextureLevels = 8;
+	ctx->Const.MaxDrawBuffers = 1;
 
 	_mesa_enable_sw_extensions(ctx);
 	_mesa_enable_imaging_extensions(ctx);
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 36586758a4..98173cf786 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -903,14 +903,13 @@ _mesa_PopAttrib(void)
                    * function, but legal for the later.
                    */
                   GLboolean multipleBuffers = GL_FALSE;
-                  if (ctx->Extensions.ARB_draw_buffers) {
-                     GLuint i;
-                     for (i = 1; i < ctx->Const.MaxDrawBuffers; i++) {
-                        if (color->DrawBuffer[i] != GL_NONE) {
-                           multipleBuffers = GL_TRUE;
-                           break;
-                        }
-                     }
+		  GLuint i;
+
+		  for (i = 1; i < ctx->Const.MaxDrawBuffers; i++) {
+		     if (color->DrawBuffer[i] != GL_NONE) {
+			multipleBuffers = GL_TRUE;
+			break;
+		     }
                   }
                   /* Call the API_level functions, not _mesa_drawbuffers()
                    * since we need to do error checking on the pop'd
diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c
index b23d2f612b..dc415c4f20 100644
--- a/src/mesa/main/buffers.c
+++ b/src/mesa/main/buffers.c
@@ -289,10 +289,6 @@ _mesa_DrawBuffersARB(GLsizei n, const GLenum *buffers)
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
-   if (!ctx->Extensions.ARB_draw_buffers) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glDrawBuffersARB");
-      return;
-   }
    if (n < 1 || n > (GLsizei) ctx->Const.MaxDrawBuffers) {
       _mesa_error(ctx, GL_INVALID_VALUE, "glDrawBuffersARB(n)");
       return;
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index ec6ba70800..8c9208af70 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -45,7 +45,7 @@ static const struct {
    int flag_offset;
 } default_extensions[] = {
    { OFF, "GL_ARB_depth_texture",              F(ARB_depth_texture) },
-   { OFF, "GL_ARB_draw_buffers",               F(ARB_draw_buffers) },
+   { ON,  "GL_ARB_draw_buffers",               F(ARB_draw_buffers) },
    { OFF, "GL_ARB_fragment_program",           F(ARB_fragment_program) },
    { OFF, "GL_ARB_fragment_program_shadow",    F(ARB_fragment_program_shadow) },
    { OFF, "GL_ARB_fragment_shader",            F(ARB_fragment_shader) },
@@ -184,7 +184,7 @@ void
 _mesa_enable_sw_extensions(GLcontext *ctx)
 {
    ctx->Extensions.ARB_depth_texture = GL_TRUE;
-   ctx->Extensions.ARB_draw_buffers = GL_TRUE;
+   /*ctx->Extensions.ARB_draw_buffers = GL_TRUE;*/
 #if FEATURE_ARB_fragment_program
    ctx->Extensions.ARB_fragment_program = GL_TRUE;
    ctx->Extensions.ARB_fragment_program_shadow = GL_TRUE;
@@ -401,7 +401,7 @@ _mesa_enable_1_5_extensions(GLcontext *ctx)
 void
 _mesa_enable_2_0_extensions(GLcontext *ctx)
 {
-   ctx->Extensions.ARB_draw_buffers = GL_TRUE;
+   /*ctx->Extensions.ARB_draw_buffers = GL_TRUE;*/
 #if FEATURE_ARB_fragment_shader
    ctx->Extensions.ARB_fragment_shader = GL_TRUE;
 #endif
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 613f067caa..8e04ab9b9d 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -1732,15 +1732,12 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          params[0] = INT_TO_BOOLEAN(ctx->VertexProgram.CurrentPosition);
          break;
       case GL_MAX_DRAW_BUFFERS_ARB:
-         CHECK_EXT1(ARB_draw_buffers, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Const.MaxDrawBuffers);
          break;
       case GL_DRAW_BUFFER0_ARB:
-         CHECK_EXT1(ARB_draw_buffers, "GetBooleanv");
          params[0] = ENUM_TO_BOOLEAN(ctx->DrawBuffer->ColorDrawBuffer[0]);
          break;
       case GL_DRAW_BUFFER1_ARB:
-         CHECK_EXT1(ARB_draw_buffers, "GetBooleanv");
          {
          GLenum buffer;
          if (pname - GL_DRAW_BUFFER0_ARB >= ctx->Const.MaxDrawBuffers) {
@@ -1752,7 +1749,6 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          }
          break;
       case GL_DRAW_BUFFER2_ARB:
-         CHECK_EXT1(ARB_draw_buffers, "GetBooleanv");
          {
          GLenum buffer;
          if (pname - GL_DRAW_BUFFER0_ARB >= ctx->Const.MaxDrawBuffers) {
@@ -1764,7 +1760,6 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          }
          break;
       case GL_DRAW_BUFFER3_ARB:
-         CHECK_EXT1(ARB_draw_buffers, "GetBooleanv");
          {
          GLenum buffer;
          if (pname - GL_DRAW_BUFFER0_ARB >= ctx->Const.MaxDrawBuffers) {
@@ -3563,15 +3558,12 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          params[0] = (GLfloat)(ctx->VertexProgram.CurrentPosition);
          break;
       case GL_MAX_DRAW_BUFFERS_ARB:
-         CHECK_EXT1(ARB_draw_buffers, "GetFloatv");
          params[0] = (GLfloat)(ctx->Const.MaxDrawBuffers);
          break;
       case GL_DRAW_BUFFER0_ARB:
-         CHECK_EXT1(ARB_draw_buffers, "GetFloatv");
          params[0] = ENUM_TO_FLOAT(ctx->DrawBuffer->ColorDrawBuffer[0]);
          break;
       case GL_DRAW_BUFFER1_ARB:
-         CHECK_EXT1(ARB_draw_buffers, "GetFloatv");
          {
          GLenum buffer;
          if (pname - GL_DRAW_BUFFER0_ARB >= ctx->Const.MaxDrawBuffers) {
@@ -3583,7 +3575,6 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          }
          break;
       case GL_DRAW_BUFFER2_ARB:
-         CHECK_EXT1(ARB_draw_buffers, "GetFloatv");
          {
          GLenum buffer;
          if (pname - GL_DRAW_BUFFER0_ARB >= ctx->Const.MaxDrawBuffers) {
@@ -3595,7 +3586,6 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          }
          break;
       case GL_DRAW_BUFFER3_ARB:
-         CHECK_EXT1(ARB_draw_buffers, "GetFloatv");
          {
          GLenum buffer;
          if (pname - GL_DRAW_BUFFER0_ARB >= ctx->Const.MaxDrawBuffers) {
@@ -5394,15 +5384,12 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          params[0] = ctx->VertexProgram.CurrentPosition;
          break;
       case GL_MAX_DRAW_BUFFERS_ARB:
-         CHECK_EXT1(ARB_draw_buffers, "GetIntegerv");
          params[0] = ctx->Const.MaxDrawBuffers;
          break;
       case GL_DRAW_BUFFER0_ARB:
-         CHECK_EXT1(ARB_draw_buffers, "GetIntegerv");
          params[0] = ENUM_TO_INT(ctx->DrawBuffer->ColorDrawBuffer[0]);
          break;
       case GL_DRAW_BUFFER1_ARB:
-         CHECK_EXT1(ARB_draw_buffers, "GetIntegerv");
          {
          GLenum buffer;
          if (pname - GL_DRAW_BUFFER0_ARB >= ctx->Const.MaxDrawBuffers) {
@@ -5414,7 +5401,6 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          }
          break;
       case GL_DRAW_BUFFER2_ARB:
-         CHECK_EXT1(ARB_draw_buffers, "GetIntegerv");
          {
          GLenum buffer;
          if (pname - GL_DRAW_BUFFER0_ARB >= ctx->Const.MaxDrawBuffers) {
@@ -5426,7 +5412,6 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          }
          break;
       case GL_DRAW_BUFFER3_ARB:
-         CHECK_EXT1(ARB_draw_buffers, "GetIntegerv");
          {
          GLenum buffer;
          if (pname - GL_DRAW_BUFFER0_ARB >= ctx->Const.MaxDrawBuffers) {
diff --git a/src/mesa/main/get_gen.py b/src/mesa/main/get_gen.py
index 78ccee9019..83a8f2f786 100644
--- a/src/mesa/main/get_gen.py
+++ b/src/mesa/main/get_gen.py
@@ -914,9 +914,9 @@ StateVars = [
 
 	# GL_ARB_draw_buffers
 	( "GL_MAX_DRAW_BUFFERS_ARB", GLint,
-	  ["ctx->Const.MaxDrawBuffers"], "", ["ARB_draw_buffers"] ),
+	  ["ctx->Const.MaxDrawBuffers"], "", None ),
 	( "GL_DRAW_BUFFER0_ARB", GLenum,
-	  ["ctx->DrawBuffer->ColorDrawBuffer[0]"], "", ["ARB_draw_buffers"] ),
+	  ["ctx->DrawBuffer->ColorDrawBuffer[0]"], "", None ),
 	( "GL_DRAW_BUFFER1_ARB", GLenum,
 	  ["buffer"],
 	  """GLenum buffer;
@@ -924,7 +924,7 @@ StateVars = [
             _mesa_error(ctx, GL_INVALID_ENUM, "glGet(GL_DRAW_BUFFERx_ARB)");
             return;
          }
-         buffer = ctx->DrawBuffer->ColorDrawBuffer[1];""", ["ARB_draw_buffers"] ),
+         buffer = ctx->DrawBuffer->ColorDrawBuffer[1];""", None ),
 	( "GL_DRAW_BUFFER2_ARB", GLenum,
 	  ["buffer"],
 	  """GLenum buffer;
@@ -932,7 +932,7 @@ StateVars = [
             _mesa_error(ctx, GL_INVALID_ENUM, "glGet(GL_DRAW_BUFFERx_ARB)");
             return;
          }
-         buffer = ctx->DrawBuffer->ColorDrawBuffer[2];""", ["ARB_draw_buffers"] ),
+         buffer = ctx->DrawBuffer->ColorDrawBuffer[2];""", None ),
 	( "GL_DRAW_BUFFER3_ARB", GLenum,
 	  ["buffer"],
 	  """GLenum buffer;
@@ -940,7 +940,7 @@ StateVars = [
             _mesa_error(ctx, GL_INVALID_ENUM, "glGet(GL_DRAW_BUFFERx_ARB)");
             return;
          }
-         buffer = ctx->DrawBuffer->ColorDrawBuffer[3];""", ["ARB_draw_buffers"] ),
+         buffer = ctx->DrawBuffer->ColorDrawBuffer[3];""", None ),
 	# XXX Add more GL_DRAW_BUFFERn_ARB entries as needed in the future
 
 	# GL_OES_read_format
diff --git a/src/mesa/shader/arbprogparse.c b/src/mesa/shader/arbprogparse.c
index a3a75c3b0a..c65d886a91 100644
--- a/src/mesa/shader/arbprogparse.c
+++ b/src/mesa/shader/arbprogparse.c
@@ -3616,8 +3616,7 @@ enable_parser_extensions(GLcontext *ctx, grammar id)
    if (ctx->Extensions.NV_texture_rectangle
        && !enable_ext(ctx, id, "texture_rectangle"))
       return GL_FALSE;
-   if (ctx->Extensions.ARB_draw_buffers
-       && !enable_ext(ctx, id, "draw_buffers"))
+   if (!enable_ext(ctx, id, "draw_buffers"))
       return GL_FALSE;
    if (ctx->Extensions.MESA_texture_array
        && !enable_ext(ctx, id, "texture_array"))
diff --git a/src/mesa/shader/slang/slang_preprocess.c b/src/mesa/shader/slang/slang_preprocess.c
index cd79c8b94a..89aaa3a621 100644
--- a/src/mesa/shader/slang/slang_preprocess.c
+++ b/src/mesa/shader/slang/slang_preprocess.c
@@ -508,8 +508,7 @@ static GLvoid
 pp_ext_init(pp_ext *self, const struct gl_extensions *extensions)
 {
    pp_ext_disable_all (self);
-   if (extensions->ARB_draw_buffers)
-      self->ARB_draw_buffers = GL_TRUE;
+   self->ARB_draw_buffers = GL_TRUE;
    if (extensions->NV_texture_rectangle)
       self->ARB_texture_rectangle = GL_TRUE;
 }
-- 
cgit v1.2.3


From 93cbb2c2056d52a86f84417fe8fee81b563144e4 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 22 Jan 2009 10:14:04 -0700
Subject: mesa: set version to 7.3

---
 Makefile                | 8 ++++----
 src/mesa/main/version.h | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/mesa/main')

diff --git a/Makefile b/Makefile
index c1581a0bd2..bee73e6535 100644
--- a/Makefile
+++ b/Makefile
@@ -182,10 +182,10 @@ ultrix-gcc:
 
 # Rules for making release tarballs
 
-DIRECTORY = Mesa-7.3-rc3
-LIB_NAME = MesaLib-7.3-rc3
-DEMO_NAME = MesaDemos-7.3-rc3
-GLUT_NAME = MesaGLUT-7.3-rc3
+DIRECTORY = Mesa-7.3
+LIB_NAME = MesaLib-7.3
+DEMO_NAME = MesaDemos-7.3
+GLUT_NAME = MesaGLUT-7.3
 
 MAIN_FILES = \
 	$(DIRECTORY)/Makefile*						\
diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index 3d874c8ba8..62cd03f5e2 100644
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -31,7 +31,7 @@
 #define MESA_MAJOR 7
 #define MESA_MINOR 3
 #define MESA_PATCH 0
-#define MESA_VERSION_STRING "7.3-rc3"
+#define MESA_VERSION_STRING "7.3"
 
 /* To make version comparison easy */
 #define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
-- 
cgit v1.2.3


From e98ef303512a460c41d2a90455dd8e515924e0ef Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 22 Jan 2009 10:19:39 -0700
Subject: mesa: set version to 7.4 for mesa_7_4_branch

---
 Makefile                | 8 ++++----
 src/mesa/main/version.h | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/mesa/main')

diff --git a/Makefile b/Makefile
index bee73e6535..875f93bd4a 100644
--- a/Makefile
+++ b/Makefile
@@ -182,10 +182,10 @@ ultrix-gcc:
 
 # Rules for making release tarballs
 
-DIRECTORY = Mesa-7.3
-LIB_NAME = MesaLib-7.3
-DEMO_NAME = MesaDemos-7.3
-GLUT_NAME = MesaGLUT-7.3
+DIRECTORY = Mesa-7.4
+LIB_NAME = MesaLib-7.4
+DEMO_NAME = MesaDemos-7.4
+GLUT_NAME = MesaGLUT-7.4
 
 MAIN_FILES = \
 	$(DIRECTORY)/Makefile*						\
diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index 62cd03f5e2..84dcb263c6 100644
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -1,6 +1,6 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.3
+ * Version:  7.4
  *
  * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  *
@@ -29,9 +29,9 @@
 
 /* Mesa version */
 #define MESA_MAJOR 7
-#define MESA_MINOR 3
+#define MESA_MINOR 4
 #define MESA_PATCH 0
-#define MESA_VERSION_STRING "7.3"
+#define MESA_VERSION_STRING "7.4"
 
 /* To make version comparison easy */
 #define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
-- 
cgit v1.2.3


From 2897cee99fb877e1f3cd9a881a61418c9c31867f Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 29 Jan 2009 09:20:18 -0700
Subject: mesa: fix a render to texture FBO validation bug

When glTexImage() is called we need to re-validate any FBOs that point to
the texture (i.e. render-to-texture) since changing the texture's size/format
will effect FBO completeness.

We don't keep a list of all FBOs rendering into each texture (which would be
a bit messy) so we check all FBOs in existance.  To optimize this, the
gl_texture_object->_RenderToTexture flag is used to avoid checking textures
that have never been used as renderbuffers.  So, we only walk over all FBOs
(there's usually only a few) when glTexImage() modifies a RTT texture.

Fixes a bug seen in shadowtex.c when toggling packed depth/stencil mode.
---
 src/mesa/main/fbobject.c |  9 ++++++++
 src/mesa/main/mtypes.h   |  1 +
 src/mesa/main/teximage.c | 55 +++++++++++++++++++++++++++++++++++++++---------
 3 files changed, 55 insertions(+), 10 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 1a191cd288..eec8f1564b 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -1469,6 +1469,15 @@ framebuffer_texture(GLcontext *ctx, const char *caller, GLenum target,
    if (texObj) {
       _mesa_set_texture_attachment(ctx, fb, att, texObj, textarget,
                                    level, zoffset);
+      /* Set the render-to-texture flag.  We'll check this flag in
+       * glTexImage() and friends to determine if we need to revalidate
+       * any FBOs that might be rendering into this texture.
+       * This flag never gets cleared since it's non-trivial to determine
+       * when all FBOs might be done rendering to this texture.  That's OK
+       * though since it's uncommon to render to a texture then repeatedly
+       * call glTexImage() to change images in the texture.
+       */
+      texObj->_RenderToTexture = GL_TRUE;
    }
    else {
       _mesa_remove_attachment(ctx, att);
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index da243eceac..ad9225e5a9 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1448,6 +1448,7 @@ struct gl_texture_object
    GLuint _Swizzle;             /**< same as Swizzle, but SWIZZLE_* format */
    GLboolean GenerateMipmap;    /**< GL_SGIS_generate_mipmap */
    GLboolean _Complete;		/**< Is texture object complete? */
+   GLboolean _RenderToTexture;  /**< Any rendering to this texture? */
 
    /** Actual texture images, indexed by [cube face] and [mipmap level] */
    struct gl_texture_image *Image[MAX_FACES][MAX_TEXTURE_LEVELS];
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 2f594532cc..7b9efb6e41 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -37,6 +37,7 @@
 #endif
 #include "fbobject.h"
 #include "framebuffer.h"
+#include "hash.h"
 #include "image.h"
 #include "imports.h"
 #include "macros.h"
@@ -2378,23 +2379,33 @@ _mesa_GetTexImage( GLenum target, GLint level, GLenum format,
 }
 
 
+/** Callback info for walking over FBO hash table */
+struct cb_info
+{
+   GLcontext *ctx;
+   struct gl_texture_object *texObj;
+   GLuint level, face;
+};
+
 
 /**
- * Check if the given texture image is bound to any framebuffer objects
- * and update/invalidate them.
- * XXX We're only checking the currently bound framebuffer object for now.
- * In the future, perhaps struct gl_texture_image should have a pointer (or
- * list of pointers (yikes)) to the gl_framebuffer(s) which it's bound to.
+ * Check render to texture callback.  Called from _mesa_HashWalk().
  */
 static void
-update_fbo_texture(GLcontext *ctx, struct gl_texture_object *texObj,
-                   GLuint face, GLuint level)
+check_rtt_cb(GLuint key, void *data, void *userData)
 {
-   if (ctx->DrawBuffer->Name) {
+   struct gl_framebuffer *fb = (struct gl_framebuffer *) data;
+   const struct cb_info *info = (struct cb_info *) userData;
+   GLcontext *ctx = info->ctx;
+   const struct gl_texture_object *texObj = info->texObj;
+   const GLuint level = info->level, face = info->face;
+
+   /* If this is a user-created FBO */
+   if (fb->Name) {
       GLuint i;
+      /* check if any of the FBO's attachments point to 'texObj' */
       for (i = 0; i < BUFFER_COUNT; i++) {
-         struct gl_renderbuffer_attachment *att = 
-            ctx->DrawBuffer->Attachment + i;
+         struct gl_renderbuffer_attachment *att = fb->Attachment + i;
          if (att->Type == GL_TEXTURE &&
              att->Texture == texObj &&
              att->TextureLevel == level &&
@@ -2402,12 +2413,36 @@ update_fbo_texture(GLcontext *ctx, struct gl_texture_object *texObj,
             ASSERT(att->Texture->Image[att->CubeMapFace][att->TextureLevel]);
             /* Tell driver about the new renderbuffer texture */
             ctx->Driver.RenderTexture(ctx, ctx->DrawBuffer, att);
+            /* Mark fb status as indeterminate to force re-validation */
+            fb->_Status = 0;
          }
       }
    }
 }
 
 
+/**
+ * When a texture image is specified we have to check if it's bound to
+ * any framebuffer objects (render to texture) in order to detect changes
+ * in size or format since that effects FBO completeness.
+ * Any FBOs rendering into the texture must be re-validated.
+ */
+static void
+update_fbo_texture(GLcontext *ctx, struct gl_texture_object *texObj,
+                   GLuint face, GLuint level)
+{
+   /* Only check this texture if it's been marked as RenderToTexture */
+   if (texObj->_RenderToTexture) {
+      struct cb_info info;
+      info.ctx = ctx;
+      info.texObj = texObj;
+      info.level = level;
+      info.face = face;
+      _mesa_HashWalk(ctx->Shared->FrameBuffers, check_rtt_cb, &info);
+   }
+}
+
+
 
 /*
  * Called from the API.  Note that width includes the border.
-- 
cgit v1.2.3


From 5fec84ad0446d4d6d842f5cf740f9787678113be Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 29 Jan 2009 15:01:09 -0700
Subject: mesa: allow glFramebufferTexture1/2/3D(target =
 GL_READ/DRAW_FRAMEBUFFER)

This is part of GL_EXT_framebuffer_blit and GL_ARB_framebuffer_obbject.
---
 src/mesa/main/fbobject.c | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index eec8f1564b..d08ad33902 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -1367,16 +1367,31 @@ framebuffer_texture(GLcontext *ctx, const char *caller, GLenum target,
    struct gl_renderbuffer_attachment *att;
    struct gl_texture_object *texObj = NULL;
    struct gl_framebuffer *fb;
+   GLboolean error = GL_FALSE;
 
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-   if (target != GL_FRAMEBUFFER_EXT) {
+   switch (target) {
+   case GL_READ_FRAMEBUFFER_EXT:
+      error = !ctx->Extensions.EXT_framebuffer_blit;
+      fb = ctx->ReadBuffer;
+      break;
+   case GL_DRAW_FRAMEBUFFER_EXT:
+      error = !ctx->Extensions.EXT_framebuffer_blit;
+      /* fall-through */
+   case GL_FRAMEBUFFER_EXT:
+      fb = ctx->DrawBuffer;
+      break;
+   default:
+      error = GL_TRUE;
+   }
+
+   if (error) {
       _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glFramebufferTexture%sEXT(target)", caller);
+                  "glFramebufferTexture%sEXT(target=0x%x)", caller, target);
       return;
    }
 
-   fb = ctx->DrawBuffer;
    ASSERT(fb);
 
    /* check framebuffer binding */
@@ -1518,7 +1533,7 @@ _mesa_FramebufferTexture2DEXT(GLenum target, GLenum attachment,
        (textarget != GL_TEXTURE_RECTANGLE_ARB) &&
        (!IS_CUBE_FACE(textarget))) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glFramebufferTexture2DEXT(textarget)");
+                  "glFramebufferTexture2DEXT(textarget=0x%x)", textarget);
       return;
    }
 
-- 
cgit v1.2.3


From 88e0b92a747d9b14885010029133fa1221696e5e Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 30 Jan 2009 15:24:13 -0700
Subject: mesa: remove incorrect refcounting adjustment in
 adjust_buffer_object_ref_counts()

Fixes bug 19835.  However, a more elaborate fix should be implemented someday
which uses proper reference counting for gl_array_object.
---
 src/mesa/main/attrib.c | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 98173cf786..218e0aeb6b 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -1267,9 +1267,6 @@ adjust_buffer_object_ref_counts(struct gl_array_attrib *array, GLint step)
       array->ArrayObj->TexCoord[i].BufferObj->RefCount += step;
    for (i = 0; i < VERT_ATTRIB_MAX; i++)
       array->ArrayObj->VertexAttrib[i].BufferObj->RefCount += step;
-
-   array->ArrayBufferObj->RefCount += step;
-   array->ElementArrayBufferObj->RefCount += step;
 }
 
 
-- 
cgit v1.2.3


From 7c48719a5f22648302bbd0026681770d8cc43914 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 30 Jan 2009 15:34:55 -0700
Subject: mesa: add missing _mesa_reference_texobj() calls for texture array
 targets

---
 src/mesa/main/texobj.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index 4e6cf439fc..0fee21c490 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -984,11 +984,11 @@ _mesa_BindTexture( GLenum target, GLuint texName )
          ASSERT(texUnit->CurrentRect);
          break;
       case GL_TEXTURE_1D_ARRAY_EXT:
-         texUnit->Current1DArray = newTexObj;
+         _mesa_reference_texobj(&texUnit->Current1DArray, newTexObj);
          ASSERT(texUnit->Current1DArray);
          break;
       case GL_TEXTURE_2D_ARRAY_EXT:
-         texUnit->Current2DArray = newTexObj;
+         _mesa_reference_texobj(&texUnit->Current2DArray, newTexObj);
          ASSERT(texUnit->Current2DArray);
          break;
       default:
-- 
cgit v1.2.3


From ea4b183b8c3730ec2c6b5152cad1a68889634487 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 30 Jan 2009 15:50:43 -0700
Subject: mesa: fix incorrect call to clear_teximage_fields() in
 _mesa_TexImage2D()

Fixes failed assertion / segfault for particular proxy texture tests.
---
 src/mesa/main/teximage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 7b9efb6e41..a64e2c111b 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -2636,7 +2636,7 @@ _mesa_TexImage2D( GLenum target, GLint level, GLint internalFormat,
                               1, border)) {
          /* when error, clear all proxy texture image parameters */
          if (texImage)
-            clear_teximage_fields(ctx->Texture.ProxyTex[TEXTURE_2D_INDEX]->Image[0][level]);
+            clear_teximage_fields(texImage);
       }
       else {
          /* no error, set the tex image parameters */
-- 
cgit v1.2.3


From 80684649a6d01f0e0517b14f61cbcad6fa101929 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 30 Jan 2009 15:51:58 -0700
Subject: mesa: simplify the _mesa_get_proxy_tex_image() function

---
 src/mesa/main/teximage.c | 115 +++++++++++++----------------------------------
 1 file changed, 30 insertions(+), 85 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index a64e2c111b..d119d22b54 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -1,8 +1,9 @@
 /*
  * mesa 3-D graphics library
- * Version:  7.1
+ * Version:  7.5
  *
  * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -924,6 +925,7 @@ struct gl_texture_image *
 _mesa_get_proxy_tex_image(GLcontext *ctx, GLenum target, GLint level)
 {
    struct gl_texture_image *texImage;
+   GLuint texIndex;
 
    if (level < 0 )
       return NULL;
@@ -932,111 +934,54 @@ _mesa_get_proxy_tex_image(GLcontext *ctx, GLenum target, GLint level)
    case GL_PROXY_TEXTURE_1D:
       if (level >= ctx->Const.MaxTextureLevels)
          return NULL;
-      texImage = ctx->Texture.ProxyTex[TEXTURE_1D_INDEX]->Image[0][level];
-      if (!texImage) {
-         texImage = ctx->Driver.NewTextureImage(ctx);
-         if (!texImage) {
-            _mesa_error(ctx, GL_OUT_OF_MEMORY, "proxy texture allocation");
-            return NULL;
-         }
-         ctx->Texture.ProxyTex[TEXTURE_1D_INDEX]->Image[0][level] = texImage;
-         /* Set the 'back' pointer */
-         texImage->TexObject = ctx->Texture.ProxyTex[TEXTURE_1D_INDEX];
-      }
-      return texImage;
+      texIndex = TEXTURE_1D_INDEX;
+      break;
    case GL_PROXY_TEXTURE_2D:
       if (level >= ctx->Const.MaxTextureLevels)
          return NULL;
-      texImage = ctx->Texture.ProxyTex[TEXTURE_2D_INDEX]->Image[0][level];
-      if (!texImage) {
-         texImage = ctx->Driver.NewTextureImage(ctx);
-         if (!texImage) {
-            _mesa_error(ctx, GL_OUT_OF_MEMORY, "proxy texture allocation");
-            return NULL;
-         }
-         ctx->Texture.ProxyTex[TEXTURE_2D_INDEX]->Image[0][level] = texImage;
-         /* Set the 'back' pointer */
-         texImage->TexObject = ctx->Texture.ProxyTex[TEXTURE_2D_INDEX];
-      }
-      return texImage;
+      texIndex = TEXTURE_2D_INDEX;
+      break;
    case GL_PROXY_TEXTURE_3D:
       if (level >= ctx->Const.Max3DTextureLevels)
          return NULL;
-      texImage = ctx->Texture.ProxyTex[TEXTURE_3D_INDEX]->Image[0][level];
-      if (!texImage) {
-         texImage = ctx->Driver.NewTextureImage(ctx);
-         if (!texImage) {
-            _mesa_error(ctx, GL_OUT_OF_MEMORY, "proxy texture allocation");
-            return NULL;
-         }
-         ctx->Texture.ProxyTex[TEXTURE_3D_INDEX]->Image[0][level] = texImage;
-         /* Set the 'back' pointer */
-         texImage->TexObject = ctx->Texture.ProxyTex[TEXTURE_3D_INDEX];
-      }
-      return texImage;
+      texIndex = TEXTURE_3D_INDEX;
+      break;
    case GL_PROXY_TEXTURE_CUBE_MAP:
       if (level >= ctx->Const.MaxCubeTextureLevels)
          return NULL;
-      texImage = ctx->Texture.ProxyTex[TEXTURE_CUBE_INDEX]->Image[0][level];
-      if (!texImage) {
-         texImage = ctx->Driver.NewTextureImage(ctx);
-         if (!texImage) {
-            _mesa_error(ctx, GL_OUT_OF_MEMORY, "proxy texture allocation");
-            return NULL;
-         }
-         ctx->Texture.ProxyTex[TEXTURE_CUBE_INDEX]->Image[0][level] = texImage;
-         /* Set the 'back' pointer */
-         texImage->TexObject = ctx->Texture.ProxyTex[TEXTURE_CUBE_INDEX];
-      }
-      return texImage;
+      texIndex = TEXTURE_CUBE_INDEX;
+      break;
    case GL_PROXY_TEXTURE_RECTANGLE_NV:
       if (level > 0)
          return NULL;
-      texImage = ctx->Texture.ProxyTex[TEXTURE_RECT_INDEX]->Image[0][level];
-      if (!texImage) {
-         texImage = ctx->Driver.NewTextureImage(ctx);
-         if (!texImage) {
-            _mesa_error(ctx, GL_OUT_OF_MEMORY, "proxy texture allocation");
-            return NULL;
-         }
-         ctx->Texture.ProxyTex[TEXTURE_RECT_INDEX]->Image[0][level] = texImage;
-         /* Set the 'back' pointer */
-         texImage->TexObject = ctx->Texture.ProxyTex[TEXTURE_RECT_INDEX];
-      }
-      return texImage;
+      texIndex = TEXTURE_RECT_INDEX;
+      break;
    case GL_PROXY_TEXTURE_1D_ARRAY_EXT:
       if (level >= ctx->Const.MaxTextureLevels)
          return NULL;
-      texImage = ctx->Texture.ProxyTex[TEXTURE_1D_ARRAY_INDEX]->Image[0][level];
-      if (!texImage) {
-         texImage = ctx->Driver.NewTextureImage(ctx);
-         if (!texImage) {
-            _mesa_error(ctx, GL_OUT_OF_MEMORY, "proxy texture allocation");
-            return NULL;
-         }
-         ctx->Texture.ProxyTex[TEXTURE_1D_ARRAY_INDEX]->Image[0][level] = texImage;
-         /* Set the 'back' pointer */
-         texImage->TexObject = ctx->Texture.ProxyTex[TEXTURE_1D_ARRAY_INDEX];
-      }
-      return texImage;
+      texIndex = TEXTURE_1D_ARRAY_INDEX;
+      break;
    case GL_PROXY_TEXTURE_2D_ARRAY_EXT:
       if (level >= ctx->Const.MaxTextureLevels)
          return NULL;
-      texImage = ctx->Texture.ProxyTex[TEXTURE_2D_ARRAY_INDEX]->Image[0][level];
-      if (!texImage) {
-         texImage = ctx->Driver.NewTextureImage(ctx);
-         if (!texImage) {
-            _mesa_error(ctx, GL_OUT_OF_MEMORY, "proxy texture allocation");
-            return NULL;
-         }
-         ctx->Texture.ProxyTex[TEXTURE_2D_ARRAY_INDEX]->Image[0][level] = texImage;
-         /* Set the 'back' pointer */
-         texImage->TexObject = ctx->Texture.ProxyTex[TEXTURE_2D_ARRAY_INDEX];
-      }
-      return texImage;
+      texIndex = TEXTURE_2D_ARRAY_INDEX;
+      break;
    default:
       return NULL;
    }
+
+   texImage = ctx->Texture.ProxyTex[texIndex]->Image[0][level];
+   if (!texImage) {
+      texImage = ctx->Driver.NewTextureImage(ctx);
+      if (!texImage) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "proxy texture allocation");
+         return NULL;
+      }
+      ctx->Texture.ProxyTex[texIndex]->Image[0][level] = texImage;
+      /* Set the 'back' pointer */
+      texImage->TexObject = ctx->Texture.ProxyTex[texIndex];
+   }
+   return texImage;
 }
 
 
-- 
cgit v1.2.3


From c6423132ffe2e0b5c6bccc15822c50a60b08a8f8 Mon Sep 17 00:00:00 2001
From: Brian <brianp@vmware.com>
Date: Sat, 31 Jan 2009 11:22:16 -0700
Subject: mesa: remove remnant of GL_SGIX_depth_texture

---
 src/mesa/main/extensions.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 8c9208af70..e38e72dbbe 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -169,7 +169,6 @@ static const struct {
    { OFF, "GL_SGIS_texture_border_clamp",      F(ARB_texture_border_clamp) },
    { ON,  "GL_SGIS_texture_edge_clamp",        F(SGIS_texture_edge_clamp) },
    { ON,  "GL_SGIS_texture_lod",               F(SGIS_texture_lod) },
-   { OFF, "GL_SGIX_depth_texture",             F(ARB_depth_texture) },
    { ON,  "GL_SUN_multi_draw_arrays",          F(EXT_multi_draw_arrays) },
    { OFF, "GL_S3_s3tc",                        F(S3_s3tc) },
 };
-- 
cgit v1.2.3


From 7721bf267b64ef28376f07daae7713814e91af35 Mon Sep 17 00:00:00 2001
From: Brian <brianp@vmware.com>
Date: Sat, 31 Jan 2009 11:39:28 -0700
Subject: mesa: minor comments, clean-ups

---
 src/mesa/main/mtypes.h | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index ad9225e5a9..c740e6d162 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -901,7 +901,7 @@ struct gl_light_attrib
    /*@{*/
    GLboolean _NeedEyeCoords;		
    GLboolean _NeedVertices;		/**< Use fast shader? */
-   GLbitfield  _Flags;		        /**< LIGHT_* flags, see above */
+   GLbitfield _Flags;		        /**< LIGHT_* flags, see above */
    GLfloat _BaseColor[2][3];
    /*@}*/
 };
@@ -1140,7 +1140,8 @@ struct gl_stencil_attrib
 };
 
 
-#define NUM_TEXTURE_TARGETS 7   /* 1D, 2D, 3D, CUBE, RECT, 1D_STACK, and 2D_STACK */
+/** 1D, 2D, 3D, CUBE, RECT, 1D_ARRAY, and 2D_ARRAY targets */
+#define NUM_TEXTURE_TARGETS 7
 
 /**
  * An index for each type of texture object
@@ -2883,21 +2884,25 @@ struct gl_tnl_module
    /*@}*/
 };
 
-/* Strictly this is a tnl/ private concept, but it doesn't seem
+
+/**
+ * Strictly this is a tnl/ private concept, but it doesn't seem
  * worthwhile adding a tnl private structure just to hold this one bit
  * of information:
  */
 #define MESA_DLIST_DANGLING_REFS     0x1 
 
-/* Provide a location where information about a display list can be
+
+/**
+ * Provide a location where information about a display list can be
  * collected.  Could be extended with driverPrivate structures,
  * etc. in the future.
  */
 struct mesa_display_list
 {
-   Node *node;
+   Node *node;   /**< The dlist commands are in a linked list of nodes */
    GLuint id;
-   GLbitfield flags;
+   GLbitfield flags;  /**< MESA_DLIST_x flags */
 };
 
 
-- 
cgit v1.2.3


From 446abc2799a143c32c4c48472f3f964f9288a623 Mon Sep 17 00:00:00 2001
From: Brian <brianp@vmware.com>
Date: Sat, 31 Jan 2009 11:57:22 -0700
Subject: mesa: display list clean-ups

Rename some structs and fields to be more consistant with the rest of mesa.
---
 src/mesa/main/context.c     |  2 +-
 src/mesa/main/dd.h          |  4 ++--
 src/mesa/main/dlist.c       | 38 +++++++++++++++++++++-----------------
 src/mesa/main/dlist.h       |  2 +-
 src/mesa/main/mtypes.h      | 32 ++++++++++++++++----------------
 src/mesa/vbo/vbo_save.h     |  2 +-
 src/mesa/vbo/vbo_save_api.c |  6 +++---
 7 files changed, 45 insertions(+), 41 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 7d616b2325..608942979f 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -581,7 +581,7 @@ static void
 delete_displaylist_cb(GLuint id, void *data, void *userData)
 {
 #if FEATURE_dlist
-   struct mesa_display_list *list = (struct mesa_display_list *) data;
+   struct gl_display_list *list = (struct gl_display_list *) data;
    GLcontext *ctx = (GLcontext *) userData;
    _mesa_delete_list(ctx, list);
 #endif
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index 989791f39f..411b6a7b21 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -34,7 +34,7 @@
 /* THIS FILE ONLY INCLUDED BY mtypes.h !!!!! */
 
 struct gl_pixelstore_attrib;
-struct mesa_display_list;
+struct gl_display_list;
 
 /**
  * Device driver function table.
@@ -999,7 +999,7 @@ struct dd_function_table {
     * Notify the T&L component before and after calling a display list.
     */
    void (*BeginCallList)( GLcontext *ctx, 
-			  struct mesa_display_list *dlist );
+			  struct gl_display_list *dlist );
    /**
     * Called by glEndCallList().
     *
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index d3aee196c7..c03a41aea5 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -370,7 +370,7 @@ typedef enum
  * contiguous nodes in memory.
  * Each node is the union of a variety of data types.
  */
-union node
+union gl_dlist_node
 {
    OpCode opcode;
    GLboolean b;
@@ -387,6 +387,9 @@ union node
 };
 
 
+typedef union gl_dlist_node Node;
+
+
 /**
  * How many nodes to allocate at a time.
  *
@@ -414,13 +417,13 @@ void mesa_print_display_list(GLuint list);
  * Make an empty display list.  This is used by glGenLists() to
  * reserve display list IDs.
  */
-static struct mesa_display_list *
+static struct gl_display_list *
 make_list(GLuint list, GLuint count)
 {
-   struct mesa_display_list *dlist = CALLOC_STRUCT(mesa_display_list);
-   dlist->id = list;
-   dlist->node = (Node *) _mesa_malloc(sizeof(Node) * count);
-   dlist->node[0].opcode = OPCODE_END_OF_LIST;
+   struct gl_display_list *dlist = CALLOC_STRUCT(gl_display_list);
+   dlist->Name = list;
+   dlist->Head = (Node *) _mesa_malloc(sizeof(Node) * count);
+   dlist->Head[0].opcode = OPCODE_END_OF_LIST;
    return dlist;
 }
 
@@ -428,10 +431,10 @@ make_list(GLuint list, GLuint count)
 /**
  * Lookup function to just encapsulate casting.
  */
-static INLINE struct mesa_display_list *
+static INLINE struct gl_display_list *
 lookup_list(GLcontext *ctx, GLuint list)
 {
-   return (struct mesa_display_list *)
+   return (struct gl_display_list *)
       _mesa_HashLookup(ctx->Shared->DisplayList, list);
 }
 
@@ -442,12 +445,12 @@ lookup_list(GLcontext *ctx, GLuint list)
  * \param dlist - display list pointer
  */
 void
-_mesa_delete_list(GLcontext *ctx, struct mesa_display_list *dlist)
+_mesa_delete_list(GLcontext *ctx, struct gl_display_list *dlist)
 {
    Node *n, *block;
    GLboolean done;
 
-   n = block = dlist->node;
+   n = block = dlist->Head;
 
    done = block ? GL_FALSE : GL_TRUE;
    while (!done) {
@@ -596,7 +599,7 @@ _mesa_delete_list(GLcontext *ctx, struct mesa_display_list *dlist)
 static void
 destroy_list(GLcontext *ctx, GLuint list)
 {
-   struct mesa_display_list *dlist;
+   struct gl_display_list *dlist;
 
    if (list == 0)
       return;
@@ -5731,7 +5734,7 @@ islist(GLcontext *ctx, GLuint list)
 static void
 execute_list(GLcontext *ctx, GLuint list)
 {
-   struct mesa_display_list *dlist;
+   struct gl_display_list *dlist;
    Node *n;
    GLboolean done;
 
@@ -5752,7 +5755,7 @@ execute_list(GLcontext *ctx, GLuint list)
    if (ctx->Driver.BeginCallList)
       ctx->Driver.BeginCallList(ctx, dlist);
 
-   n = dlist->node;
+   n = dlist->Head;
 
    done = GL_FALSE;
    while (!done) {
@@ -6757,7 +6760,7 @@ _mesa_NewList(GLuint list, GLenum mode)
    /* Allocate new display list */
    ctx->ListState.CurrentListNum = list;
    ctx->ListState.CurrentList = make_list(list, BLOCK_SIZE);
-   ctx->ListState.CurrentBlock = ctx->ListState.CurrentList->node;
+   ctx->ListState.CurrentBlock = ctx->ListState.CurrentList->Head;
    ctx->ListState.CurrentListPtr = ctx->ListState.CurrentBlock;
    ctx->ListState.CurrentPos = 0;
 
@@ -6805,7 +6808,8 @@ _mesa_EndList(void)
 
    /* Destroy old list, if any */
    destroy_list(ctx, ctx->ListState.CurrentListNum);
-   /* Install the list */
+
+   /* Install the new list */
    _mesa_HashInsert(ctx->Shared->DisplayList, ctx->ListState.CurrentListNum,
                     ctx->ListState.CurrentList);
 
@@ -8209,7 +8213,7 @@ enum_string(GLenum k)
 static void GLAPIENTRY
 print_list(GLcontext *ctx, GLuint list)
 {
-   struct mesa_display_list *dlist;
+   struct gl_display_list *dlist;
    Node *n;
    GLboolean done;
 
@@ -8222,7 +8226,7 @@ print_list(GLcontext *ctx, GLuint list)
    if (!dlist)
       return;
 
-   n = dlist->node;
+   n = dlist->Head;
 
    _mesa_printf("START-LIST %u, address %p\n", list, (void *) n);
 
diff --git a/src/mesa/main/dlist.h b/src/mesa/main/dlist.h
index ef6a10af83..ab7ec2c8db 100644
--- a/src/mesa/main/dlist.h
+++ b/src/mesa/main/dlist.h
@@ -39,7 +39,7 @@
 #if _HAVE_FULL_GL
 
 extern void
-_mesa_delete_list(GLcontext *ctx, struct mesa_display_list *dlist);
+_mesa_delete_list(GLcontext *ctx, struct gl_display_list *dlist);
 
 extern void GLAPIENTRY _mesa_CallList( GLuint list );
 
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index c740e6d162..f6e4724588 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2848,13 +2848,6 @@ struct gl_matrix_stack
 
 
 
-/*
- * Forward declaration of display list data types:
- */
-union node;
-typedef union node Node;
-
-
 /* This has to be included here. */
 #include "dd.h"
 
@@ -2886,11 +2879,17 @@ struct gl_tnl_module
 
 
 /**
- * Strictly this is a tnl/ private concept, but it doesn't seem
+ * Display list flags.
+ * Strictly this is a tnl-private concept, but it doesn't seem
  * worthwhile adding a tnl private structure just to hold this one bit
  * of information:
  */
-#define MESA_DLIST_DANGLING_REFS     0x1 
+#define DLIST_DANGLING_REFS     0x1 
+
+/*
+ * Forward declaration of display list data types:
+ */
+union gl_dlist_node;
 
 
 /**
@@ -2898,11 +2897,12 @@ struct gl_tnl_module
  * collected.  Could be extended with driverPrivate structures,
  * etc. in the future.
  */
-struct mesa_display_list
+struct gl_display_list
 {
-   Node *node;   /**< The dlist commands are in a linked list of nodes */
-   GLuint id;
-   GLbitfield flags;  /**< MESA_DLIST_x flags */
+   GLuint Name;
+   GLbitfield Flags;  /**< DLIST_x flags */
+   /** The dlist commands are in a linked list of nodes */
+   union gl_dlist_node *Head;
 };
 
 
@@ -2913,10 +2913,10 @@ struct gl_dlist_state
 {
    GLuint CallDepth;		/**< Current recursion calling depth */
 
-   struct mesa_display_list *CurrentList;
-   Node *CurrentListPtr;	/**< Head of list being compiled */
+   struct gl_display_list *CurrentList;
    GLuint CurrentListNum;	/**< Number of the list being compiled */
-   Node *CurrentBlock;		/**< Pointer to current block of nodes */
+   union gl_dlist_node *CurrentListPtr;	/**< Head of list being compiled */
+   union gl_dlist_node *CurrentBlock; /**< Pointer to current block of nodes */
    GLuint CurrentPos;		/**< Index into current block of nodes */
 
    GLvertexformat ListVtxfmt;
diff --git a/src/mesa/vbo/vbo_save.h b/src/mesa/vbo/vbo_save.h
index b7e9baabf8..7dda54af48 100644
--- a/src/mesa/vbo/vbo_save.h
+++ b/src/mesa/vbo/vbo_save.h
@@ -166,7 +166,7 @@ void vbo_loopback_vertex_list( GLcontext *ctx,
 void vbo_save_EndList( GLcontext *ctx );
 void vbo_save_NewList( GLcontext *ctx, GLuint list, GLenum mode );
 void vbo_save_EndCallList( GLcontext *ctx );
-void vbo_save_BeginCallList( GLcontext *ctx, struct mesa_display_list *list );
+void vbo_save_BeginCallList( GLcontext *ctx, struct gl_display_list *list );
 void vbo_save_SaveFlushVertices( GLcontext *ctx );
 GLboolean vbo_save_NotifyBegin( GLcontext *ctx, GLenum mode );
 
diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c
index f69a33d817..ddfd276577 100644
--- a/src/mesa/vbo/vbo_save_api.c
+++ b/src/mesa/vbo/vbo_save_api.c
@@ -293,7 +293,7 @@ static void _save_compile_vertex_list( GLcontext *ctx )
 	  node->count == 0);
 
    if (save->dangling_attr_ref)
-      ctx->ListState.CurrentList->flags |= MESA_DLIST_DANGLING_REFS;
+      ctx->ListState.CurrentList->Flags |= DLIST_DANGLING_REFS;
 
    save->vertex_store->used += save->vertex_size * node->count;
    save->prim_store->used += node->prim_count;
@@ -1076,10 +1076,10 @@ void vbo_save_EndList( GLcontext *ctx )
    assert(save->vertex_size == 0);
 }
  
-void vbo_save_BeginCallList( GLcontext *ctx, struct mesa_display_list *dlist )
+void vbo_save_BeginCallList( GLcontext *ctx, struct gl_display_list *dlist )
 {
    struct vbo_save_context *save = &vbo_context(ctx)->save;
-   save->replay_flags |= dlist->flags;
+   save->replay_flags |= dlist->Flags;
 }
 
 void vbo_save_EndCallList( GLcontext *ctx )
-- 
cgit v1.2.3


From 0001deef1108b77cf4879fff4647401fb68c421e Mon Sep 17 00:00:00 2001
From: Brian <brianp@vmware.com>
Date: Sat, 31 Jan 2009 12:10:41 -0700
Subject: mesa: more display list cleanups

Remove some unneeded fields.  Rename some function parameters.
---
 src/mesa/main/dlist.c    | 35 +++++++++++++++--------------------
 src/mesa/main/get.c      |  6 +++---
 src/mesa/main/get_gen.py |  2 +-
 src/mesa/main/mtypes.h   |  9 +++------
 4 files changed, 22 insertions(+), 30 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index c03a41aea5..db1415bc06 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -418,10 +418,10 @@ void mesa_print_display_list(GLuint list);
  * reserve display list IDs.
  */
 static struct gl_display_list *
-make_list(GLuint list, GLuint count)
+make_list(GLuint name, GLuint count)
 {
    struct gl_display_list *dlist = CALLOC_STRUCT(gl_display_list);
-   dlist->Name = list;
+   dlist->Name = name;
    dlist->Head = (Node *) _mesa_malloc(sizeof(Node) * count);
    dlist->Head[0].opcode = OPCODE_END_OF_LIST;
    return dlist;
@@ -2524,12 +2524,12 @@ save_MultMatrixd(const GLdouble * m)
 
 
 static void GLAPIENTRY
-save_NewList(GLuint list, GLenum mode)
+save_NewList(GLuint name, GLenum mode)
 {
    GET_CURRENT_CONTEXT(ctx);
    /* It's an error to call this function while building a display list */
    _mesa_error(ctx, GL_INVALID_OPERATION, "glNewList");
-   (void) list;
+   (void) name;
    (void) mode;
 }
 
@@ -6726,7 +6726,7 @@ _mesa_GenLists(GLsizei range)
  * Begin a new display list.
  */
 void GLAPIENTRY
-_mesa_NewList(GLuint list, GLenum mode)
+_mesa_NewList(GLuint name, GLenum mode)
 {
    GET_CURRENT_CONTEXT(ctx);
    GLint i;
@@ -6735,10 +6735,10 @@ _mesa_NewList(GLuint list, GLenum mode)
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
    if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glNewList %u %s\n", list,
+      _mesa_debug(ctx, "glNewList %u %s\n", name,
                   _mesa_lookup_enum_by_nr(mode));
 
-   if (list == 0) {
+   if (name == 0) {
       _mesa_error(ctx, GL_INVALID_VALUE, "glNewList");
       return;
    }
@@ -6748,7 +6748,7 @@ _mesa_NewList(GLuint list, GLenum mode)
       return;
    }
 
-   if (ctx->ListState.CurrentListPtr) {
+   if (ctx->ListState.CurrentList) {
       /* already compiling a display list */
       _mesa_error(ctx, GL_INVALID_OPERATION, "glNewList");
       return;
@@ -6758,10 +6758,8 @@ _mesa_NewList(GLuint list, GLenum mode)
    ctx->ExecuteFlag = (mode == GL_COMPILE_AND_EXECUTE);
 
    /* Allocate new display list */
-   ctx->ListState.CurrentListNum = list;
-   ctx->ListState.CurrentList = make_list(list, BLOCK_SIZE);
+   ctx->ListState.CurrentList = make_list(name, BLOCK_SIZE);
    ctx->ListState.CurrentBlock = ctx->ListState.CurrentList->Head;
-   ctx->ListState.CurrentListPtr = ctx->ListState.CurrentBlock;
    ctx->ListState.CurrentPos = 0;
 
    /* Reset acumulated list state:
@@ -6773,7 +6771,7 @@ _mesa_NewList(GLuint list, GLenum mode)
       ctx->ListState.ActiveMaterialSize[i] = 0;
 
    ctx->Driver.CurrentSavePrimitive = PRIM_UNKNOWN;
-   ctx->Driver.NewList(ctx, list, mode);
+   ctx->Driver.NewList(ctx, name, mode);
 
    ctx->CurrentDispatch = ctx->Save;
    _glapi_set_dispatch(ctx->CurrentDispatch);
@@ -6794,7 +6792,7 @@ _mesa_EndList(void)
       _mesa_debug(ctx, "glEndList\n");
 
    /* Check that a list is under construction */
-   if (!ctx->ListState.CurrentListPtr) {
+   if (!ctx->ListState.CurrentList) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "glEndList");
       return;
    }
@@ -6807,19 +6805,18 @@ _mesa_EndList(void)
    (void) ALLOC_INSTRUCTION(ctx, OPCODE_END_OF_LIST, 0);
 
    /* Destroy old list, if any */
-   destroy_list(ctx, ctx->ListState.CurrentListNum);
+   destroy_list(ctx, ctx->ListState.CurrentList->Name);
 
    /* Install the new list */
-   _mesa_HashInsert(ctx->Shared->DisplayList, ctx->ListState.CurrentListNum,
+   _mesa_HashInsert(ctx->Shared->DisplayList,
+                    ctx->ListState.CurrentList->Name,
                     ctx->ListState.CurrentList);
 
 
    if (MESA_VERBOSE & VERBOSE_DISPLAY_LIST)
-      mesa_print_display_list(ctx->ListState.CurrentListNum);
+      mesa_print_display_list(ctx->ListState.CurrentList->Name);
 
    ctx->ListState.CurrentList = NULL;
-   ctx->ListState.CurrentListNum = 0;
-   ctx->ListState.CurrentListPtr = NULL;
    ctx->ExecuteFlag = GL_TRUE;
    ctx->CompileFlag = GL_FALSE;
 
@@ -8588,9 +8585,7 @@ _mesa_init_display_list(GLcontext *ctx)
    ctx->ListState.CallDepth = 0;
    ctx->ExecuteFlag = GL_TRUE;
    ctx->CompileFlag = GL_FALSE;
-   ctx->ListState.CurrentListPtr = NULL;
    ctx->ListState.CurrentBlock = NULL;
-   ctx->ListState.CurrentListNum = 0;
    ctx->ListState.CurrentPos = 0;
 
    /* Display List group */
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 8e04ab9b9d..87a821b12d 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -460,7 +460,7 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          params[0] = INT_TO_BOOLEAN(ctx->List.ListBase);
          break;
       case GL_LIST_INDEX:
-         params[0] = INT_TO_BOOLEAN(ctx->ListState.CurrentListNum);
+         params[0] = INT_TO_BOOLEAN((ctx->ListState.CurrentList ? ctx->ListState.CurrentList->Name : 0));
          break;
       case GL_LIST_MODE:
          {
@@ -2286,7 +2286,7 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          params[0] = (GLfloat)(ctx->List.ListBase);
          break;
       case GL_LIST_INDEX:
-         params[0] = (GLfloat)(ctx->ListState.CurrentListNum);
+         params[0] = (GLfloat)((ctx->ListState.CurrentList ? ctx->ListState.CurrentList->Name : 0));
          break;
       case GL_LIST_MODE:
          {
@@ -4112,7 +4112,7 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          params[0] = ctx->List.ListBase;
          break;
       case GL_LIST_INDEX:
-         params[0] = ctx->ListState.CurrentListNum;
+         params[0] = (ctx->ListState.CurrentList ? ctx->ListState.CurrentList->Name : 0);
          break;
       case GL_LIST_MODE:
          {
diff --git a/src/mesa/main/get_gen.py b/src/mesa/main/get_gen.py
index 83a8f2f786..3b2496c663 100644
--- a/src/mesa/main/get_gen.py
+++ b/src/mesa/main/get_gen.py
@@ -254,7 +254,7 @@ StateVars = [
 	  ["ctx->Const.MinLineWidth",
 	   "ctx->Const.MaxLineWidth"], "", None ),
 	( "GL_LIST_BASE", GLint, ["ctx->List.ListBase"], "", None ),
-	( "GL_LIST_INDEX", GLint, ["ctx->ListState.CurrentListNum"], "", None ),
+	( "GL_LIST_INDEX", GLint, ["(ctx->ListState.CurrentList ? ctx->ListState.CurrentList->Name : 0)"], "", None ),
 	( "GL_LIST_MODE", GLenum, ["mode"],
 	  """GLenum mode;
          if (!ctx->CompileFlag)
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index f6e4724588..17dd3e6afd 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2886,9 +2886,8 @@ struct gl_tnl_module
  */
 #define DLIST_DANGLING_REFS     0x1 
 
-/*
- * Forward declaration of display list data types:
- */
+
+/** Opaque declaration of display list payload data type */
 union gl_dlist_node;
 
 
@@ -2913,9 +2912,7 @@ struct gl_dlist_state
 {
    GLuint CallDepth;		/**< Current recursion calling depth */
 
-   struct gl_display_list *CurrentList;
-   GLuint CurrentListNum;	/**< Number of the list being compiled */
-   union gl_dlist_node *CurrentListPtr;	/**< Head of list being compiled */
+   struct gl_display_list *CurrentList; /**< List currently being compiled */
    union gl_dlist_node *CurrentBlock; /**< Pointer to current block of nodes */
    GLuint CurrentPos;		/**< Index into current block of nodes */
 
-- 
cgit v1.2.3


From b5d549e3514af1d299b27d80bd157a65f397fe15 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 3 Feb 2009 09:21:32 -0700
Subject: mesa: simplify delete_wrapper()

---
 src/mesa/main/depthstencil.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/depthstencil.c b/src/mesa/main/depthstencil.c
index 9d208e2997..7be2aacaf2 100644
--- a/src/mesa/main/depthstencil.c
+++ b/src/mesa/main/depthstencil.c
@@ -62,15 +62,9 @@ nop_get_pointer(GLcontext *ctx, struct gl_renderbuffer *rb, GLint x, GLint y)
 static void
 delete_wrapper(struct gl_renderbuffer *rb)
 {
-   struct gl_renderbuffer *dsrb = rb->Wrapped;
-   ASSERT(dsrb);
    ASSERT(rb->_ActualFormat == GL_DEPTH_COMPONENT24 ||
           rb->_ActualFormat == GL_STENCIL_INDEX8_EXT);
-   /* decrement refcount on the wrapped buffer and delete it if necessary */
-   dsrb->RefCount--;
-   if (dsrb->RefCount <= 0) {
-      dsrb->Delete(dsrb);
-   }
+   _mesa_reference_renderbuffer(&rb->Wrapped, NULL);
    _mesa_free(rb);
 }
 
-- 
cgit v1.2.3


From 803504e69fbd85713fc6d93af21f5245852cecab Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 3 Feb 2009 16:33:12 -0700
Subject: mesa: minor error msg improvement

---
 src/mesa/main/teximage.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index d119d22b54..9519d89e4a 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -2168,7 +2168,8 @@ copytexsubimage_error_check2( GLcontext *ctx, GLuint dimensions,
 
    if (!_mesa_source_buffer_exists(ctx, teximage->_BaseFormat)) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
-               "glCopyTexSubImage%dD(missing readbuffer)", dimensions);
+                  "glCopyTexSubImage%dD(missing readbuffer, format=0x%x)",
+                  dimensions, teximage->_BaseFormat);
       return GL_TRUE;
    }
 
-- 
cgit v1.2.3


From 1ca05a066b8d8cb8a99da88743a48f7d97f695fe Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 4 Feb 2009 14:22:12 -0700
Subject: mesa: more info in error messages

---
 src/mesa/main/buffers.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c
index dc415c4f20..7877ee0045 100644
--- a/src/mesa/main/buffers.c
+++ b/src/mesa/main/buffers.c
@@ -247,13 +247,14 @@ _mesa_DrawBuffer(GLenum buffer)
       destMask = draw_buffer_enum_to_bitmask(buffer);
       if (destMask == BAD_MASK) {
          /* totally bogus buffer */
-         _mesa_error(ctx, GL_INVALID_ENUM, "glDrawBuffer(buffer)");
+         _mesa_error(ctx, GL_INVALID_ENUM, "glDrawBuffer(buffer=0x%x)", buffer);
          return;
       }
       destMask &= supportedMask;
       if (destMask == 0x0) {
          /* none of the named color buffers exist! */
-         _mesa_error(ctx, GL_INVALID_OPERATION, "glDrawBuffer(buffer)");
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glDrawBuffer(buffer=0x%x)", buffer);
          return;
       }
    }
-- 
cgit v1.2.3


From b2e779988eeb595187933fe2122d86f8ccfe059c Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 6 Feb 2009 09:57:28 -0700
Subject: mesa: meaningless whitespace change to see if git's working (ignore)

---
 Makefile                              |  1 +
 src/mesa/main/debug.c                 |  4 +--
 src/mesa/main/mtypes.h                | 10 ++++--
 src/mesa/shader/shader_api.c          | 62 +++++++++++++++++++++++++++++++++++
 src/mesa/shader/slang/slang_compile.c | 18 ++++++++--
 src/mesa/shader/slang/slang_link.c    | 20 ++++++-----
 src/mesa/shader/slang/slang_log.c     |  6 ++--
 src/mesa/sources                      |  1 +
 8 files changed, 102 insertions(+), 20 deletions(-)

(limited to 'src/mesa/main')

diff --git a/Makefile b/Makefile
index 419265df80..4d4c6a551a 100644
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,7 @@ default: $(TOP)/configs/current
 doxygen:
 	cd doxygen && $(MAKE)
 
+
 clean:
 	-@touch $(TOP)/configs/current
 	-@for dir in $(SUBDIRS) ; do \
diff --git a/src/mesa/main/debug.c b/src/mesa/main/debug.c
index 77fef32558..65970a53a9 100644
--- a/src/mesa/main/debug.c
+++ b/src/mesa/main/debug.c
@@ -164,9 +164,7 @@ static void add_debug_flags( const char *debug )
       { "api",       VERBOSE_API },
       { "list",      VERBOSE_DISPLAY_LIST },
       { "lighting",  VERBOSE_LIGHTING },
-      { "disassem",  VERBOSE_DISASSEM },
-      { "glsl",      VERBOSE_GLSL },     /* report GLSL compile/link errors */
-      { "glsl_dump", VERBOSE_GLSL_DUMP } /* print shader GPU instructions */
+      { "disassem",  VERBOSE_DISASSEM }
    };
    GLuint i;
 
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 17dd3e6afd..509da06d09 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2162,6 +2162,13 @@ struct gl_shader_program
 };   
 
 
+#define GLSL_DUMP      0x1  /**< Dump shaders to stdout */
+#define GLSL_LOG       0x2  /**< Write shaders to files */
+#define GLSL_OPT       0x4  /**< Force optimizations (override pragmas) */
+#define GLSL_NO_OPT    0x8  /**< Force no optimizations (override pragmas) */
+#define GLSL_UNIFORMS 0x10  /**< Print glUniform calls */
+
+
 /**
  * Context state for GLSL vertex/fragment shaders.
  */
@@ -2173,6 +2180,7 @@ struct gl_shader_state
    GLboolean EmitCondCodes;             /**< Use condition codes? */
    GLboolean EmitComments;              /**< Annotated instructions */
    void *MemPool;
+   GLbitfield Flags;                    /**< Mask of GLSL_x flags */
 };
 
 
@@ -3163,8 +3171,6 @@ enum _verbose
    VERBOSE_PRIMS		= 0x0400,
    VERBOSE_VERTS		= 0x0800,
    VERBOSE_DISASSEM		= 0x1000,
-   VERBOSE_GLSL			= 0x2000,
-   VERBOSE_GLSL_DUMP		= 0x4000
 };
 
 
diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index acee34dc5b..fb2a7e54fe 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -370,6 +370,31 @@ _mesa_lookup_shader_err(GLcontext *ctx, GLuint name, const char *caller)
 }
 
 
+/**
+ * Return mask of GLSL_x flags by examining the MESA_GLSL env var.
+ */
+static GLbitfield
+get_shader_flags(void)
+{
+   GLbitfield flags = 0x0;
+   const char *env = _mesa_getenv("MESA_GLSL");
+
+   if (env) {
+      if (_mesa_strstr(env, "dump"))
+         flags |= GLSL_DUMP;
+      if (_mesa_strstr(env, "log"))
+         flags |= GLSL_LOG;
+      if (_mesa_strstr(env, "nopt"))
+         flags |= GLSL_NO_OPT;
+      else if (_mesa_strstr(env, "opt"))
+         flags |= GLSL_OPT;
+      if (_mesa_strstr(env, "uniform"))
+         flags |= GLSL_UNIFORMS;
+   }
+
+   return flags;
+}
+
 
 /**
  * Initialize context's shader state.
@@ -383,6 +408,7 @@ _mesa_init_shader_state(GLcontext * ctx)
    ctx->Shader.EmitHighLevelInstructions = GL_TRUE;
    ctx->Shader.EmitCondCodes = GL_TRUE; /* XXX probably want GL_FALSE... */
    ctx->Shader.EmitComments = GL_FALSE;
+   ctx->Shader.Flags = get_shader_flags();
 }
 
 
@@ -1613,6 +1639,7 @@ _mesa_uniform(GLcontext *ctx, GLint location, GLsizei count,
    struct gl_shader_program *shProg = ctx->Shader.CurrentProgram;
    struct gl_uniform *uniform;
    GLint elems, offset;
+   GLenum basicType;
 
    if (!shProg || !shProg->LinkStatus) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "glUniform(program not linked)");
@@ -1636,19 +1663,35 @@ _mesa_uniform(GLcontext *ctx, GLint location, GLsizei count,
 
    switch (type) {
    case GL_FLOAT:
+      basicType = GL_FLOAT;
+      elems = 1;
+      break;
    case GL_INT:
+      basicType = GL_INT;
       elems = 1;
       break;
    case GL_FLOAT_VEC2:
+      basicType = GL_FLOAT;
+      elems = 2;
+      break;
    case GL_INT_VEC2:
+      basicType = GL_INT;
       elems = 2;
       break;
    case GL_FLOAT_VEC3:
+      basicType = GL_FLOAT;
+      elems = 3;
+      break;
    case GL_INT_VEC3:
+      basicType = GL_INT;
       elems = 3;
       break;
    case GL_FLOAT_VEC4:
+      basicType = GL_FLOAT;
+      elems = 4;
+      break;
    case GL_INT_VEC4:
+      basicType = GL_INT;
       elems = 4;
       break;
    default:
@@ -1660,6 +1703,25 @@ _mesa_uniform(GLcontext *ctx, GLint location, GLsizei count,
 
    uniform = &shProg->Uniforms->Uniforms[location];
 
+   if (ctx->Shader.Flags & GLSL_UNIFORMS) {
+      GLint i;
+      _mesa_printf("Mesa: set program %u uniform %s (loc %d) to: ",
+                   shProg->Name, uniform->Name, location);
+      if (basicType == GL_INT) {
+         const GLint *v = (const GLint *) values;
+         for (i = 0; i < count * elems; i++) {
+            _mesa_printf("%d ", v[i]);
+         }
+      }
+      else {
+         const GLfloat *v = (const GLfloat *) values;
+         for (i = 0; i < count * elems; i++) {
+            _mesa_printf("%g ", v[i]);
+         }
+      }
+      _mesa_printf("\n");
+   }
+
    /* A uniform var may be used by both a vertex shader and a fragment
     * shader.  We may need to update one or both shader's uniform here:
     */
diff --git a/src/mesa/shader/slang/slang_compile.c b/src/mesa/shader/slang/slang_compile.c
index 40460e0c7e..0c7881dd19 100644
--- a/src/mesa/shader/slang/slang_compile.c
+++ b/src/mesa/shader/slang/slang_compile.c
@@ -32,6 +32,7 @@
 #include "main/context.h"
 #include "shader/program.h"
 #include "shader/programopt.h"
+#include "shader/prog_optimize.h"
 #include "shader/prog_print.h"
 #include "shader/prog_parameter.h"
 #include "shader/grammar/grammar_mesa.h"
@@ -2794,11 +2795,22 @@ _slang_compile(GLcontext *ctx, struct gl_shader *shader)
    _mesa_print_program(shader->Program);
 #endif
 
+   if (success) {
+      if ((ctx->Shader.Flags & GLSL_NO_OPT) == 0) {
+         if ((ctx->Shader.Flags & GLSL_OPT) || shader->Pragmas.Optimize) {
+            /* apply program optimizations */
+            _mesa_remove_extra_moves(shader->Program);
+            _mesa_remove_dead_code(shader->Program);
+            _mesa_consolidate_registers(shader->Program);
+         }
+      }
+   }
+
    shader->CompileStatus = success;
 
-#if 0
-   _mesa_write_shader_to_file(shader);
-#endif
+   if (ctx->Shader.Flags & GLSL_LOG) {
+      _mesa_write_shader_to_file(shader);
+   }
 
    return success;
 }
diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c
index 77bcda0871..4ee1beccd4 100644
--- a/src/mesa/shader/slang/slang_link.c
+++ b/src/mesa/shader/slang/slang_link.c
@@ -675,12 +675,12 @@ _slang_link(GLcontext *ctx,
       /* notify driver that a new fragment program has been compiled/linked */
       ctx->Driver.ProgramStringNotify(ctx, GL_FRAGMENT_PROGRAM_ARB,
                                       &shProg->FragmentProgram->Base);
-      if (MESA_VERBOSE & VERBOSE_GLSL_DUMP) {
-         printf("Mesa original fragment program:\n");
+      if (ctx->Shader.Flags & GLSL_DUMP) {
+         _mesa_printf("Mesa original fragment program:\n");
          _mesa_print_program(&fragProg->Base);
          _mesa_print_program_parameters(ctx, &fragProg->Base);
 
-         printf("Mesa post-link fragment program:\n");
+         _mesa_printf("Mesa post-link fragment program:\n");
          _mesa_print_program(&shProg->FragmentProgram->Base);
          _mesa_print_program_parameters(ctx, &shProg->FragmentProgram->Base);
       }
@@ -693,22 +693,26 @@ _slang_link(GLcontext *ctx,
       /* notify driver that a new vertex program has been compiled/linked */
       ctx->Driver.ProgramStringNotify(ctx, GL_VERTEX_PROGRAM_ARB,
                                       &shProg->VertexProgram->Base);
-      if (MESA_VERBOSE & VERBOSE_GLSL_DUMP) {
-         printf("Mesa original vertex program:\n");
+      if (ctx->Shader.Flags & GLSL_DUMP) {
+         _mesa_printf("Mesa original vertex program:\n");
          _mesa_print_program(&vertProg->Base);
          _mesa_print_program_parameters(ctx, &vertProg->Base);
 
-         printf("Mesa post-link vertex program:\n");
+         _mesa_printf("Mesa post-link vertex program:\n");
          _mesa_print_program(&shProg->VertexProgram->Base);
          _mesa_print_program_parameters(ctx, &shProg->VertexProgram->Base);
       }
    }
 
-   if (MESA_VERBOSE & VERBOSE_GLSL_DUMP) {
-      printf("Varying vars:\n");
+   if (ctx->Shader.Flags & GLSL_DUMP) {
+      _mesa_printf("Varying vars:\n");
       _mesa_print_parameter_list(shProg->Varying);
+      if (shProg->InfoLog) {
+         _mesa_printf("Info Log: %s\n", shProg->InfoLog);
+      }
    }
 
+
    shProg->LinkStatus = (shProg->VertexProgram || shProg->FragmentProgram);
 }
 
diff --git a/src/mesa/shader/slang/slang_log.c b/src/mesa/shader/slang/slang_log.c
index d5576d7ee2..30729ba8d5 100644
--- a/src/mesa/shader/slang/slang_log.c
+++ b/src/mesa/shader/slang/slang_log.c
@@ -77,13 +77,11 @@ slang_info_log_message(slang_info_log * log, const char *prefix,
    slang_string_concat(log->text, msg);
    slang_string_concat(log->text, "\n");
 
-   if (MESA_VERBOSE & VERBOSE_GLSL) {
-      _mesa_printf("Mesa: GLSL %s", log->text);
-   }
-
    return 1;
 }
 
+#define EXIT_SUCCESS 13
+
 int
 slang_info_log_print(slang_info_log * log, const char *msg, ...)
 {
diff --git a/src/mesa/sources b/src/mesa/sources
index 01a3fb89e6..a7210c134d 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -177,6 +177,7 @@ SHADER_SOURCES = \
 	shader/prog_execute.c \
 	shader/prog_instruction.c \
 	shader/prog_noise.c \
+	shader/prog_optimize.c \
 	shader/prog_parameter.c \
 	shader/prog_print.c \
 	shader/prog_statevars.c \
-- 
cgit v1.2.3


From aafcc26642d5243944a1abb816c2657f644c0649 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 6 Feb 2009 10:00:34 -0700
Subject: Revert "mesa: meaningless whitespace change to see if git's working
 (ignore)"

This reverts commit b2e779988eeb595187933fe2122d86f8ccfe059c.

I didn't mean to push this stuff yet.  I'm having a bad git day...
---
 Makefile                              |  1 -
 src/mesa/main/debug.c                 |  4 ++-
 src/mesa/main/mtypes.h                | 10 ++----
 src/mesa/shader/shader_api.c          | 62 -----------------------------------
 src/mesa/shader/slang/slang_compile.c | 18 ++--------
 src/mesa/shader/slang/slang_link.c    | 20 +++++------
 src/mesa/shader/slang/slang_log.c     |  6 ++--
 src/mesa/sources                      |  1 -
 8 files changed, 20 insertions(+), 102 deletions(-)

(limited to 'src/mesa/main')

diff --git a/Makefile b/Makefile
index 4d4c6a551a..419265df80 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,6 @@ default: $(TOP)/configs/current
 doxygen:
 	cd doxygen && $(MAKE)
 
-
 clean:
 	-@touch $(TOP)/configs/current
 	-@for dir in $(SUBDIRS) ; do \
diff --git a/src/mesa/main/debug.c b/src/mesa/main/debug.c
index 65970a53a9..77fef32558 100644
--- a/src/mesa/main/debug.c
+++ b/src/mesa/main/debug.c
@@ -164,7 +164,9 @@ static void add_debug_flags( const char *debug )
       { "api",       VERBOSE_API },
       { "list",      VERBOSE_DISPLAY_LIST },
       { "lighting",  VERBOSE_LIGHTING },
-      { "disassem",  VERBOSE_DISASSEM }
+      { "disassem",  VERBOSE_DISASSEM },
+      { "glsl",      VERBOSE_GLSL },     /* report GLSL compile/link errors */
+      { "glsl_dump", VERBOSE_GLSL_DUMP } /* print shader GPU instructions */
    };
    GLuint i;
 
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 509da06d09..17dd3e6afd 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2162,13 +2162,6 @@ struct gl_shader_program
 };   
 
 
-#define GLSL_DUMP      0x1  /**< Dump shaders to stdout */
-#define GLSL_LOG       0x2  /**< Write shaders to files */
-#define GLSL_OPT       0x4  /**< Force optimizations (override pragmas) */
-#define GLSL_NO_OPT    0x8  /**< Force no optimizations (override pragmas) */
-#define GLSL_UNIFORMS 0x10  /**< Print glUniform calls */
-
-
 /**
  * Context state for GLSL vertex/fragment shaders.
  */
@@ -2180,7 +2173,6 @@ struct gl_shader_state
    GLboolean EmitCondCodes;             /**< Use condition codes? */
    GLboolean EmitComments;              /**< Annotated instructions */
    void *MemPool;
-   GLbitfield Flags;                    /**< Mask of GLSL_x flags */
 };
 
 
@@ -3171,6 +3163,8 @@ enum _verbose
    VERBOSE_PRIMS		= 0x0400,
    VERBOSE_VERTS		= 0x0800,
    VERBOSE_DISASSEM		= 0x1000,
+   VERBOSE_GLSL			= 0x2000,
+   VERBOSE_GLSL_DUMP		= 0x4000
 };
 
 
diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index fb2a7e54fe..acee34dc5b 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -370,31 +370,6 @@ _mesa_lookup_shader_err(GLcontext *ctx, GLuint name, const char *caller)
 }
 
 
-/**
- * Return mask of GLSL_x flags by examining the MESA_GLSL env var.
- */
-static GLbitfield
-get_shader_flags(void)
-{
-   GLbitfield flags = 0x0;
-   const char *env = _mesa_getenv("MESA_GLSL");
-
-   if (env) {
-      if (_mesa_strstr(env, "dump"))
-         flags |= GLSL_DUMP;
-      if (_mesa_strstr(env, "log"))
-         flags |= GLSL_LOG;
-      if (_mesa_strstr(env, "nopt"))
-         flags |= GLSL_NO_OPT;
-      else if (_mesa_strstr(env, "opt"))
-         flags |= GLSL_OPT;
-      if (_mesa_strstr(env, "uniform"))
-         flags |= GLSL_UNIFORMS;
-   }
-
-   return flags;
-}
-
 
 /**
  * Initialize context's shader state.
@@ -408,7 +383,6 @@ _mesa_init_shader_state(GLcontext * ctx)
    ctx->Shader.EmitHighLevelInstructions = GL_TRUE;
    ctx->Shader.EmitCondCodes = GL_TRUE; /* XXX probably want GL_FALSE... */
    ctx->Shader.EmitComments = GL_FALSE;
-   ctx->Shader.Flags = get_shader_flags();
 }
 
 
@@ -1639,7 +1613,6 @@ _mesa_uniform(GLcontext *ctx, GLint location, GLsizei count,
    struct gl_shader_program *shProg = ctx->Shader.CurrentProgram;
    struct gl_uniform *uniform;
    GLint elems, offset;
-   GLenum basicType;
 
    if (!shProg || !shProg->LinkStatus) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "glUniform(program not linked)");
@@ -1663,35 +1636,19 @@ _mesa_uniform(GLcontext *ctx, GLint location, GLsizei count,
 
    switch (type) {
    case GL_FLOAT:
-      basicType = GL_FLOAT;
-      elems = 1;
-      break;
    case GL_INT:
-      basicType = GL_INT;
       elems = 1;
       break;
    case GL_FLOAT_VEC2:
-      basicType = GL_FLOAT;
-      elems = 2;
-      break;
    case GL_INT_VEC2:
-      basicType = GL_INT;
       elems = 2;
       break;
    case GL_FLOAT_VEC3:
-      basicType = GL_FLOAT;
-      elems = 3;
-      break;
    case GL_INT_VEC3:
-      basicType = GL_INT;
       elems = 3;
       break;
    case GL_FLOAT_VEC4:
-      basicType = GL_FLOAT;
-      elems = 4;
-      break;
    case GL_INT_VEC4:
-      basicType = GL_INT;
       elems = 4;
       break;
    default:
@@ -1703,25 +1660,6 @@ _mesa_uniform(GLcontext *ctx, GLint location, GLsizei count,
 
    uniform = &shProg->Uniforms->Uniforms[location];
 
-   if (ctx->Shader.Flags & GLSL_UNIFORMS) {
-      GLint i;
-      _mesa_printf("Mesa: set program %u uniform %s (loc %d) to: ",
-                   shProg->Name, uniform->Name, location);
-      if (basicType == GL_INT) {
-         const GLint *v = (const GLint *) values;
-         for (i = 0; i < count * elems; i++) {
-            _mesa_printf("%d ", v[i]);
-         }
-      }
-      else {
-         const GLfloat *v = (const GLfloat *) values;
-         for (i = 0; i < count * elems; i++) {
-            _mesa_printf("%g ", v[i]);
-         }
-      }
-      _mesa_printf("\n");
-   }
-
    /* A uniform var may be used by both a vertex shader and a fragment
     * shader.  We may need to update one or both shader's uniform here:
     */
diff --git a/src/mesa/shader/slang/slang_compile.c b/src/mesa/shader/slang/slang_compile.c
index 0c7881dd19..40460e0c7e 100644
--- a/src/mesa/shader/slang/slang_compile.c
+++ b/src/mesa/shader/slang/slang_compile.c
@@ -32,7 +32,6 @@
 #include "main/context.h"
 #include "shader/program.h"
 #include "shader/programopt.h"
-#include "shader/prog_optimize.h"
 #include "shader/prog_print.h"
 #include "shader/prog_parameter.h"
 #include "shader/grammar/grammar_mesa.h"
@@ -2795,22 +2794,11 @@ _slang_compile(GLcontext *ctx, struct gl_shader *shader)
    _mesa_print_program(shader->Program);
 #endif
 
-   if (success) {
-      if ((ctx->Shader.Flags & GLSL_NO_OPT) == 0) {
-         if ((ctx->Shader.Flags & GLSL_OPT) || shader->Pragmas.Optimize) {
-            /* apply program optimizations */
-            _mesa_remove_extra_moves(shader->Program);
-            _mesa_remove_dead_code(shader->Program);
-            _mesa_consolidate_registers(shader->Program);
-         }
-      }
-   }
-
    shader->CompileStatus = success;
 
-   if (ctx->Shader.Flags & GLSL_LOG) {
-      _mesa_write_shader_to_file(shader);
-   }
+#if 0
+   _mesa_write_shader_to_file(shader);
+#endif
 
    return success;
 }
diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c
index 4ee1beccd4..77bcda0871 100644
--- a/src/mesa/shader/slang/slang_link.c
+++ b/src/mesa/shader/slang/slang_link.c
@@ -675,12 +675,12 @@ _slang_link(GLcontext *ctx,
       /* notify driver that a new fragment program has been compiled/linked */
       ctx->Driver.ProgramStringNotify(ctx, GL_FRAGMENT_PROGRAM_ARB,
                                       &shProg->FragmentProgram->Base);
-      if (ctx->Shader.Flags & GLSL_DUMP) {
-         _mesa_printf("Mesa original fragment program:\n");
+      if (MESA_VERBOSE & VERBOSE_GLSL_DUMP) {
+         printf("Mesa original fragment program:\n");
          _mesa_print_program(&fragProg->Base);
          _mesa_print_program_parameters(ctx, &fragProg->Base);
 
-         _mesa_printf("Mesa post-link fragment program:\n");
+         printf("Mesa post-link fragment program:\n");
          _mesa_print_program(&shProg->FragmentProgram->Base);
          _mesa_print_program_parameters(ctx, &shProg->FragmentProgram->Base);
       }
@@ -693,26 +693,22 @@ _slang_link(GLcontext *ctx,
       /* notify driver that a new vertex program has been compiled/linked */
       ctx->Driver.ProgramStringNotify(ctx, GL_VERTEX_PROGRAM_ARB,
                                       &shProg->VertexProgram->Base);
-      if (ctx->Shader.Flags & GLSL_DUMP) {
-         _mesa_printf("Mesa original vertex program:\n");
+      if (MESA_VERBOSE & VERBOSE_GLSL_DUMP) {
+         printf("Mesa original vertex program:\n");
          _mesa_print_program(&vertProg->Base);
          _mesa_print_program_parameters(ctx, &vertProg->Base);
 
-         _mesa_printf("Mesa post-link vertex program:\n");
+         printf("Mesa post-link vertex program:\n");
          _mesa_print_program(&shProg->VertexProgram->Base);
          _mesa_print_program_parameters(ctx, &shProg->VertexProgram->Base);
       }
    }
 
-   if (ctx->Shader.Flags & GLSL_DUMP) {
-      _mesa_printf("Varying vars:\n");
+   if (MESA_VERBOSE & VERBOSE_GLSL_DUMP) {
+      printf("Varying vars:\n");
       _mesa_print_parameter_list(shProg->Varying);
-      if (shProg->InfoLog) {
-         _mesa_printf("Info Log: %s\n", shProg->InfoLog);
-      }
    }
 
-
    shProg->LinkStatus = (shProg->VertexProgram || shProg->FragmentProgram);
 }
 
diff --git a/src/mesa/shader/slang/slang_log.c b/src/mesa/shader/slang/slang_log.c
index 30729ba8d5..d5576d7ee2 100644
--- a/src/mesa/shader/slang/slang_log.c
+++ b/src/mesa/shader/slang/slang_log.c
@@ -77,11 +77,13 @@ slang_info_log_message(slang_info_log * log, const char *prefix,
    slang_string_concat(log->text, msg);
    slang_string_concat(log->text, "\n");
 
+   if (MESA_VERBOSE & VERBOSE_GLSL) {
+      _mesa_printf("Mesa: GLSL %s", log->text);
+   }
+
    return 1;
 }
 
-#define EXIT_SUCCESS 13
-
 int
 slang_info_log_print(slang_info_log * log, const char *msg, ...)
 {
diff --git a/src/mesa/sources b/src/mesa/sources
index a7210c134d..01a3fb89e6 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -177,7 +177,6 @@ SHADER_SOURCES = \
 	shader/prog_execute.c \
 	shader/prog_instruction.c \
 	shader/prog_noise.c \
-	shader/prog_optimize.c \
 	shader/prog_parameter.c \
 	shader/prog_print.c \
 	shader/prog_statevars.c \
-- 
cgit v1.2.3


From e01a03d2220199a4541f2cb8b42035237a571aa4 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 6 Feb 2009 10:21:36 -0700
Subject: glsl: new MESA_GLSL env var for GLSL debugging features

Replaces the VERBOSE_GLSL, VERBOSE_GLSL_DUMP flags which only worked in debug
builds.  MESA_GLSL will work both in debug and non-debug builds.
Also add facility to dump glUniform() calls to stdout.
---
 src/mesa/main/debug.c                 |  4 +--
 src/mesa/main/mtypes.h                | 10 ++++--
 src/mesa/shader/shader_api.c          | 62 +++++++++++++++++++++++++++++++++++
 src/mesa/shader/slang/slang_compile.c |  6 ++--
 src/mesa/shader/slang/slang_link.c    | 19 ++++++-----
 src/mesa/shader/slang/slang_log.c     |  4 ---
 6 files changed, 85 insertions(+), 20 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/debug.c b/src/mesa/main/debug.c
index 77fef32558..65970a53a9 100644
--- a/src/mesa/main/debug.c
+++ b/src/mesa/main/debug.c
@@ -164,9 +164,7 @@ static void add_debug_flags( const char *debug )
       { "api",       VERBOSE_API },
       { "list",      VERBOSE_DISPLAY_LIST },
       { "lighting",  VERBOSE_LIGHTING },
-      { "disassem",  VERBOSE_DISASSEM },
-      { "glsl",      VERBOSE_GLSL },     /* report GLSL compile/link errors */
-      { "glsl_dump", VERBOSE_GLSL_DUMP } /* print shader GPU instructions */
+      { "disassem",  VERBOSE_DISASSEM }
    };
    GLuint i;
 
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 17dd3e6afd..509da06d09 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2162,6 +2162,13 @@ struct gl_shader_program
 };   
 
 
+#define GLSL_DUMP      0x1  /**< Dump shaders to stdout */
+#define GLSL_LOG       0x2  /**< Write shaders to files */
+#define GLSL_OPT       0x4  /**< Force optimizations (override pragmas) */
+#define GLSL_NO_OPT    0x8  /**< Force no optimizations (override pragmas) */
+#define GLSL_UNIFORMS 0x10  /**< Print glUniform calls */
+
+
 /**
  * Context state for GLSL vertex/fragment shaders.
  */
@@ -2173,6 +2180,7 @@ struct gl_shader_state
    GLboolean EmitCondCodes;             /**< Use condition codes? */
    GLboolean EmitComments;              /**< Annotated instructions */
    void *MemPool;
+   GLbitfield Flags;                    /**< Mask of GLSL_x flags */
 };
 
 
@@ -3163,8 +3171,6 @@ enum _verbose
    VERBOSE_PRIMS		= 0x0400,
    VERBOSE_VERTS		= 0x0800,
    VERBOSE_DISASSEM		= 0x1000,
-   VERBOSE_GLSL			= 0x2000,
-   VERBOSE_GLSL_DUMP		= 0x4000
 };
 
 
diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index acee34dc5b..fb2a7e54fe 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -370,6 +370,31 @@ _mesa_lookup_shader_err(GLcontext *ctx, GLuint name, const char *caller)
 }
 
 
+/**
+ * Return mask of GLSL_x flags by examining the MESA_GLSL env var.
+ */
+static GLbitfield
+get_shader_flags(void)
+{
+   GLbitfield flags = 0x0;
+   const char *env = _mesa_getenv("MESA_GLSL");
+
+   if (env) {
+      if (_mesa_strstr(env, "dump"))
+         flags |= GLSL_DUMP;
+      if (_mesa_strstr(env, "log"))
+         flags |= GLSL_LOG;
+      if (_mesa_strstr(env, "nopt"))
+         flags |= GLSL_NO_OPT;
+      else if (_mesa_strstr(env, "opt"))
+         flags |= GLSL_OPT;
+      if (_mesa_strstr(env, "uniform"))
+         flags |= GLSL_UNIFORMS;
+   }
+
+   return flags;
+}
+
 
 /**
  * Initialize context's shader state.
@@ -383,6 +408,7 @@ _mesa_init_shader_state(GLcontext * ctx)
    ctx->Shader.EmitHighLevelInstructions = GL_TRUE;
    ctx->Shader.EmitCondCodes = GL_TRUE; /* XXX probably want GL_FALSE... */
    ctx->Shader.EmitComments = GL_FALSE;
+   ctx->Shader.Flags = get_shader_flags();
 }
 
 
@@ -1613,6 +1639,7 @@ _mesa_uniform(GLcontext *ctx, GLint location, GLsizei count,
    struct gl_shader_program *shProg = ctx->Shader.CurrentProgram;
    struct gl_uniform *uniform;
    GLint elems, offset;
+   GLenum basicType;
 
    if (!shProg || !shProg->LinkStatus) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "glUniform(program not linked)");
@@ -1636,19 +1663,35 @@ _mesa_uniform(GLcontext *ctx, GLint location, GLsizei count,
 
    switch (type) {
    case GL_FLOAT:
+      basicType = GL_FLOAT;
+      elems = 1;
+      break;
    case GL_INT:
+      basicType = GL_INT;
       elems = 1;
       break;
    case GL_FLOAT_VEC2:
+      basicType = GL_FLOAT;
+      elems = 2;
+      break;
    case GL_INT_VEC2:
+      basicType = GL_INT;
       elems = 2;
       break;
    case GL_FLOAT_VEC3:
+      basicType = GL_FLOAT;
+      elems = 3;
+      break;
    case GL_INT_VEC3:
+      basicType = GL_INT;
       elems = 3;
       break;
    case GL_FLOAT_VEC4:
+      basicType = GL_FLOAT;
+      elems = 4;
+      break;
    case GL_INT_VEC4:
+      basicType = GL_INT;
       elems = 4;
       break;
    default:
@@ -1660,6 +1703,25 @@ _mesa_uniform(GLcontext *ctx, GLint location, GLsizei count,
 
    uniform = &shProg->Uniforms->Uniforms[location];
 
+   if (ctx->Shader.Flags & GLSL_UNIFORMS) {
+      GLint i;
+      _mesa_printf("Mesa: set program %u uniform %s (loc %d) to: ",
+                   shProg->Name, uniform->Name, location);
+      if (basicType == GL_INT) {
+         const GLint *v = (const GLint *) values;
+         for (i = 0; i < count * elems; i++) {
+            _mesa_printf("%d ", v[i]);
+         }
+      }
+      else {
+         const GLfloat *v = (const GLfloat *) values;
+         for (i = 0; i < count * elems; i++) {
+            _mesa_printf("%g ", v[i]);
+         }
+      }
+      _mesa_printf("\n");
+   }
+
    /* A uniform var may be used by both a vertex shader and a fragment
     * shader.  We may need to update one or both shader's uniform here:
     */
diff --git a/src/mesa/shader/slang/slang_compile.c b/src/mesa/shader/slang/slang_compile.c
index 40460e0c7e..cfed977905 100644
--- a/src/mesa/shader/slang/slang_compile.c
+++ b/src/mesa/shader/slang/slang_compile.c
@@ -2796,9 +2796,9 @@ _slang_compile(GLcontext *ctx, struct gl_shader *shader)
 
    shader->CompileStatus = success;
 
-#if 0
-   _mesa_write_shader_to_file(shader);
-#endif
+   if (ctx->Shader.Flags & GLSL_LOG) {
+      _mesa_write_shader_to_file(shader);
+   }
 
    return success;
 }
diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c
index 77bcda0871..848a64f932 100644
--- a/src/mesa/shader/slang/slang_link.c
+++ b/src/mesa/shader/slang/slang_link.c
@@ -675,12 +675,12 @@ _slang_link(GLcontext *ctx,
       /* notify driver that a new fragment program has been compiled/linked */
       ctx->Driver.ProgramStringNotify(ctx, GL_FRAGMENT_PROGRAM_ARB,
                                       &shProg->FragmentProgram->Base);
-      if (MESA_VERBOSE & VERBOSE_GLSL_DUMP) {
-         printf("Mesa original fragment program:\n");
+      if (ctx->Shader.Flags & GLSL_DUMP) {
+         _mesa_printf("Mesa pre-link fragment program:\n");
          _mesa_print_program(&fragProg->Base);
          _mesa_print_program_parameters(ctx, &fragProg->Base);
 
-         printf("Mesa post-link fragment program:\n");
+         _mesa_printf("Mesa post-link fragment program:\n");
          _mesa_print_program(&shProg->FragmentProgram->Base);
          _mesa_print_program_parameters(ctx, &shProg->FragmentProgram->Base);
       }
@@ -693,20 +693,23 @@ _slang_link(GLcontext *ctx,
       /* notify driver that a new vertex program has been compiled/linked */
       ctx->Driver.ProgramStringNotify(ctx, GL_VERTEX_PROGRAM_ARB,
                                       &shProg->VertexProgram->Base);
-      if (MESA_VERBOSE & VERBOSE_GLSL_DUMP) {
-         printf("Mesa original vertex program:\n");
+      if (ctx->Shader.Flags & GLSL_DUMP) {
+         _mesa_printf("Mesa pre-link vertex program:\n");
          _mesa_print_program(&vertProg->Base);
          _mesa_print_program_parameters(ctx, &vertProg->Base);
 
-         printf("Mesa post-link vertex program:\n");
+         _mesa_printf("Mesa post-link vertex program:\n");
          _mesa_print_program(&shProg->VertexProgram->Base);
          _mesa_print_program_parameters(ctx, &shProg->VertexProgram->Base);
       }
    }
 
-   if (MESA_VERBOSE & VERBOSE_GLSL_DUMP) {
-      printf("Varying vars:\n");
+   if (ctx->Shader.Flags & GLSL_DUMP) {
+      _mesa_printf("Varying vars:\n");
       _mesa_print_parameter_list(shProg->Varying);
+      if (shProg->InfoLog) {
+         _mesa_printf("Info Log: %s\n", shProg->InfoLog);
+      }
    }
 
    shProg->LinkStatus = (shProg->VertexProgram || shProg->FragmentProgram);
diff --git a/src/mesa/shader/slang/slang_log.c b/src/mesa/shader/slang/slang_log.c
index d5576d7ee2..d7d2b4fbfd 100644
--- a/src/mesa/shader/slang/slang_log.c
+++ b/src/mesa/shader/slang/slang_log.c
@@ -77,10 +77,6 @@ slang_info_log_message(slang_info_log * log, const char *prefix,
    slang_string_concat(log->text, msg);
    slang_string_concat(log->text, "\n");
 
-   if (MESA_VERBOSE & VERBOSE_GLSL) {
-      _mesa_printf("Mesa: GLSL %s", log->text);
-   }
-
    return 1;
 }
 
-- 
cgit v1.2.3


From b46611633c5da6fa23ee17bce22939fe20ef194e Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Sat, 7 Feb 2009 11:20:08 -0700
Subject: mesa: fix logic error in computing enableBits in
 update_texture_state()

If we had a vertex shader but no fragment shader (i.e. fixed function) we
didn't get the right enabled texture targets.

Fixes blank/white texture problem.
---
 src/mesa/main/texstate.c | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index f7a4d8b323..be6ce18689 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -488,25 +488,27 @@ update_texture_state( GLcontext *ctx )
       texUnit->_ReallyEnabled = 0;
       texUnit->_GenFlags = 0;
 
-      /* Get the bitmask of texture enables.
+      /* Get the bitmask of texture target enables.
        * enableBits will be a mask of the TEXTURE_*_BIT flags indicating
        * which texture targets are enabled (fixed function) or referenced
        * by a fragment shader/program.  When multiple flags are set, we'll
        * settle on the one with highest priority (see texture_override below).
        */
-      if (fprog || vprog) {
-         enableBits = 0x0;
-         if (fprog)
-            enableBits |= fprog->Base.TexturesUsed[unit];
-         if (vprog)
-            enableBits |= vprog->Base.TexturesUsed[unit];
+      enableBits = 0x0;
+      if (vprog) {
+         enableBits |= vprog->Base.TexturesUsed[unit];
+      }
+      if (fprog) {
+         enableBits |= fprog->Base.TexturesUsed[unit];
       }
       else {
-         if (!texUnit->Enabled)
-            continue;
-         enableBits = texUnit->Enabled;
+         /* fixed-function fragment program */
+         enableBits |= texUnit->Enabled;
       }
 
+      if (enableBits == 0x0)
+         continue;
+
       ASSERT(texUnit->Current1D);
       ASSERT(texUnit->Current2D);
       ASSERT(texUnit->Current3D);
-- 
cgit v1.2.3


From 2a50dde0f5a44b06ba5d07ce96e4da5e264d18ae Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Sat, 7 Feb 2009 11:21:44 -0700
Subject: mesa: minor clean-ups, remove unneeded conditional

---
 src/mesa/main/texstate.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index be6ce18689..df40d61c93 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -468,9 +468,8 @@ update_texture_state( GLcontext *ctx )
       }
    }
 
-   ctx->NewState |= _NEW_TEXTURE; /* TODO: only set this if there are 
-				   * actual changes. 
-				   */
+   /* TODO: only set this if there are actual changes */
+   ctx->NewState |= _NEW_TEXTURE;
 
    ctx->Texture._EnabledUnits = 0;
    ctx->Texture._GenFlags = 0;
@@ -540,8 +539,9 @@ update_texture_state( GLcontext *ctx )
          continue;
       }
 
-      if (texUnit->_ReallyEnabled)
-         ctx->Texture._EnabledUnits |= (1 << unit);
+      /* if we get here, we know this texture unit is enabled */
+
+      ctx->Texture._EnabledUnits |= (1 << unit);
 
       if (texUnit->EnvMode == GL_COMBINE ||
           texUnit->EnvMode == GL_COMBINE4_NV) {
-- 
cgit v1.2.3


From 671fed4d0191734babfe28c7729f2e7cfa7ad8d7 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Sat, 7 Feb 2009 11:40:20 -0700
Subject: mesa: code refactoring: move texcombine code into
 update_tex_combine()

---
 src/mesa/main/texstate.c | 167 ++++++++++++++++++++++++++---------------------
 1 file changed, 92 insertions(+), 75 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index df40d61c93..7761af7589 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -436,6 +436,96 @@ texture_override(GLcontext *ctx,
 }
 
 
+/**
+ * Examine texture unit's combine/env state to update derived state.
+ */
+static void
+update_tex_combine(GLcontext *ctx, struct gl_texture_unit *texUnit)
+{
+   /* Set the texUnit->_CurrentCombine field to point to the user's combiner
+    * state, or the combiner state which is derived from traditional texenv
+    * mode.
+    */
+   if (texUnit->EnvMode == GL_COMBINE ||
+       texUnit->EnvMode == GL_COMBINE4_NV) {
+      texUnit->_CurrentCombine = & texUnit->Combine;
+   }
+   else {
+      const struct gl_texture_object *texObj = texUnit->_Current;
+      GLenum format = texObj->Image[0][texObj->BaseLevel]->_BaseFormat;
+      if (format == GL_COLOR_INDEX) {
+         format = GL_RGBA;  /* a bit of a hack */
+      }
+      else if (format == GL_DEPTH_COMPONENT ||
+               format == GL_DEPTH_STENCIL_EXT) {
+         format = texObj->DepthMode;
+      }
+      calculate_derived_texenv(&texUnit->_EnvMode, texUnit->EnvMode, format);
+      texUnit->_CurrentCombine = & texUnit->_EnvMode;
+   }
+
+   /* Determine number of source RGB terms in the combiner function */
+   switch (texUnit->_CurrentCombine->ModeRGB) {
+   case GL_REPLACE:
+      texUnit->_CurrentCombine->_NumArgsRGB = 1;
+      break;
+   case GL_ADD:
+   case GL_ADD_SIGNED:
+      if (texUnit->EnvMode == GL_COMBINE4_NV)
+         texUnit->_CurrentCombine->_NumArgsRGB = 4;
+      else
+         texUnit->_CurrentCombine->_NumArgsRGB = 2;
+      break;
+   case GL_MODULATE:
+   case GL_SUBTRACT:
+   case GL_DOT3_RGB:
+   case GL_DOT3_RGBA:
+   case GL_DOT3_RGB_EXT:
+   case GL_DOT3_RGBA_EXT:
+      texUnit->_CurrentCombine->_NumArgsRGB = 2;
+      break;
+   case GL_INTERPOLATE:
+   case GL_MODULATE_ADD_ATI:
+   case GL_MODULATE_SIGNED_ADD_ATI:
+   case GL_MODULATE_SUBTRACT_ATI:
+      texUnit->_CurrentCombine->_NumArgsRGB = 3;
+      break;
+   default:
+      texUnit->_CurrentCombine->_NumArgsRGB = 0;
+      _mesa_problem(ctx, "invalid RGB combine mode in update_texture_state");
+      return;
+   }
+
+   /* Determine number of source Alpha terms in the combiner function */
+   switch (texUnit->_CurrentCombine->ModeA) {
+   case GL_REPLACE:
+      texUnit->_CurrentCombine->_NumArgsA = 1;
+      break;
+   case GL_ADD:
+   case GL_ADD_SIGNED:
+      if (texUnit->EnvMode == GL_COMBINE4_NV)
+         texUnit->_CurrentCombine->_NumArgsA = 4;
+      else
+         texUnit->_CurrentCombine->_NumArgsA = 2;
+      break;
+   case GL_MODULATE:
+   case GL_SUBTRACT:
+      texUnit->_CurrentCombine->_NumArgsA = 2;
+      break;
+   case GL_INTERPOLATE:
+   case GL_MODULATE_ADD_ATI:
+   case GL_MODULATE_SIGNED_ADD_ATI:
+   case GL_MODULATE_SUBTRACT_ATI:
+      texUnit->_CurrentCombine->_NumArgsA = 3;
+      break;
+   default:
+      texUnit->_CurrentCombine->_NumArgsA = 0;
+      _mesa_problem(ctx, "invalid Alpha combine mode in update_texture_state");
+      break;
+   }
+}
+
+
 /**
  * \note This routine refers to derived texture matrix values to
  * compute the ENABLE_TEXMAT flags, but is only called on
@@ -543,83 +633,10 @@ update_texture_state( GLcontext *ctx )
 
       ctx->Texture._EnabledUnits |= (1 << unit);
 
-      if (texUnit->EnvMode == GL_COMBINE ||
-          texUnit->EnvMode == GL_COMBINE4_NV) {
-	 texUnit->_CurrentCombine = & texUnit->Combine;
-      }
-      else {
-         const struct gl_texture_object *texObj = texUnit->_Current;
-         GLenum format = texObj->Image[0][texObj->BaseLevel]->_BaseFormat;
-         if (format == GL_COLOR_INDEX) {
-            format = GL_RGBA;  /* a bit of a hack */
-         }
-         else if (format == GL_DEPTH_COMPONENT
-                  || format == GL_DEPTH_STENCIL_EXT) {
-            format = texObj->DepthMode;
-         }
-	 calculate_derived_texenv(&texUnit->_EnvMode, texUnit->EnvMode, format);
-	 texUnit->_CurrentCombine = & texUnit->_EnvMode;
-      }
-
-      switch (texUnit->_CurrentCombine->ModeRGB) {
-      case GL_REPLACE:
-	 texUnit->_CurrentCombine->_NumArgsRGB = 1;
-	 break;
-      case GL_ADD:
-      case GL_ADD_SIGNED:
-         if (texUnit->EnvMode == GL_COMBINE4_NV)
-            texUnit->_CurrentCombine->_NumArgsRGB = 4;
-         else
-            texUnit->_CurrentCombine->_NumArgsRGB = 2;
-         break;
-      case GL_MODULATE:
-      case GL_SUBTRACT:
-      case GL_DOT3_RGB:
-      case GL_DOT3_RGBA:
-      case GL_DOT3_RGB_EXT:
-      case GL_DOT3_RGBA_EXT:
-	 texUnit->_CurrentCombine->_NumArgsRGB = 2;
-	 break;
-      case GL_INTERPOLATE:
-      case GL_MODULATE_ADD_ATI:
-      case GL_MODULATE_SIGNED_ADD_ATI:
-      case GL_MODULATE_SUBTRACT_ATI:
-	 texUnit->_CurrentCombine->_NumArgsRGB = 3;
-	 break;
-      default:
-	 texUnit->_CurrentCombine->_NumArgsRGB = 0;
-         _mesa_problem(ctx, "invalid RGB combine mode in update_texture_state");
-         return;
-      }
-
-      switch (texUnit->_CurrentCombine->ModeA) {
-      case GL_REPLACE:
-	 texUnit->_CurrentCombine->_NumArgsA = 1;
-	 break;
-      case GL_ADD:
-      case GL_ADD_SIGNED:
-         if (texUnit->EnvMode == GL_COMBINE4_NV)
-            texUnit->_CurrentCombine->_NumArgsA = 4;
-         else
-            texUnit->_CurrentCombine->_NumArgsA = 2;
-         break;
-      case GL_MODULATE:
-      case GL_SUBTRACT:
-	 texUnit->_CurrentCombine->_NumArgsA = 2;
-	 break;
-      case GL_INTERPOLATE:
-      case GL_MODULATE_ADD_ATI:
-      case GL_MODULATE_SIGNED_ADD_ATI:
-      case GL_MODULATE_SUBTRACT_ATI:
-	 texUnit->_CurrentCombine->_NumArgsA = 3;
-	 break;
-      default:
-	 texUnit->_CurrentCombine->_NumArgsA = 0;
-         _mesa_problem(ctx, "invalid Alpha combine mode in update_texture_state");
-	 break;
-      }
+      update_tex_combine(ctx, texUnit);
    }
 
+
    /* Determine which texture coordinate sets are actually needed */
    if (fprog) {
       const GLuint coordMask = (1 << MAX_TEXTURE_COORD_UNITS) - 1;
-- 
cgit v1.2.3


From 266fe93a87d5c0c21e9e7960699104e0e8bd54b4 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Sat, 7 Feb 2009 11:49:52 -0700
Subject: mesa: debug code for printing info about textures, writing teximages
 to disk

---
 src/mesa/main/debug.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++
 src/mesa/main/debug.h |  3 ++
 2 files changed, 102 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/debug.c b/src/mesa/main/debug.c
index 65970a53a9..90a3bf1f04 100644
--- a/src/mesa/main/debug.c
+++ b/src/mesa/main/debug.c
@@ -24,9 +24,13 @@
 
 #include "mtypes.h"
 #include "context.h"
+#include "hash.h"
 #include "imports.h"
 #include "debug.h"
 #include "get.h"
+#include "texobj.h"
+#include "texformat.h"
+
 
 /**
  * Primitive names
@@ -219,3 +223,98 @@ _mesa_init_debug( GLcontext *ctx )
       add_debug_flags(c);
 }
 
+
+/*
+ * Write ppm file
+ */
+static void
+write_ppm(const char *filename, const GLubyte *buffer, int width, int height,
+          int comps, int rcomp, int gcomp, int bcomp)
+{
+   FILE *f = fopen( filename, "w" );
+   if (f) {
+      int i, x, y;
+      const GLubyte *ptr = buffer;
+      fprintf(f,"P6\n");
+      fprintf(f,"# ppm-file created by osdemo.c\n");
+      fprintf(f,"%i %i\n", width,height);
+      fprintf(f,"255\n");
+      fclose(f);
+      f = fopen( filename, "ab" );  /* reopen in binary append mode */
+      for (y=height-1; y>=0; y--) {
+         for (x=0; x<width; x++) {
+            i = (y*width + x) * comps;
+            fputc(ptr[i+rcomp], f);   /* write red */
+            fputc(ptr[i+gcomp], f); /* write green */
+            fputc(ptr[i+bcomp], f); /* write blue */
+         }
+      }
+      fclose(f);
+   }
+}
+
+
+/**
+ * Write level[0] image to a ppm file.
+ */
+static void
+write_texture_image(struct gl_texture_object *texObj)
+{
+   const struct gl_texture_image *img = texObj->Image[0][0];
+   if (img) {
+      char s[100];
+
+      /* make filename */
+      sprintf(s, "/tmp/teximage%u.ppm", texObj->Name);
+
+      switch (img->TexFormat->MesaFormat) {
+      case MESA_FORMAT_RGBA8888:
+         write_ppm(s, img->Data, img->Width, img->Height, 4, 3, 2, 1);
+         break;
+      case MESA_FORMAT_ARGB8888:
+         write_ppm(s, img->Data, img->Width, img->Height, 4, 2, 1, 0);
+         break;
+      default:
+         printf("XXXX unsupported mesa tex format %d in %s\n",
+                img->TexFormat->MesaFormat, __FUNCTION__);
+      }
+   }
+}
+
+
+static GLboolean DumpImages;
+
+
+static void
+dump_texture_cb(GLuint id, void *data, void *userData)
+{
+   struct gl_texture_object *texObj = (struct gl_texture_object *) data;
+   (void) userData;
+   int i;
+
+   printf("Texture %u\n", texObj->Name);
+   printf("  Target 0x%x\n", texObj->Target);
+   for (i = 0; i < MAX_TEXTURE_LEVELS; i++) {
+      struct gl_texture_image *texImg = texObj->Image[0][i];
+      if (texImg) {
+         printf("  Image %u: %d x %d x %d at %p\n", i,
+                texImg->Width, texImg->Height, texImg->Depth, texImg->Data);
+         if (DumpImages && i == 0) {
+            write_texture_image(texObj);
+         }
+      }
+   }
+}
+
+
+/**
+ * Print basic info about all texture objext to stdout.
+ * If dumpImages is true, write PPM of level[0] image to a file.
+ */
+void
+_mesa_dump_textures(GLboolean dumpImages)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   DumpImages = dumpImages;
+   _mesa_HashDeleteAll(ctx->Shared->TexObjects, dump_texture_cb, ctx);
+}
diff --git a/src/mesa/main/debug.h b/src/mesa/main/debug.h
index 94d99c384b..1862ec75b7 100644
--- a/src/mesa/main/debug.h
+++ b/src/mesa/main/debug.h
@@ -57,4 +57,7 @@ extern void _mesa_init_debug( GLcontext *ctx );
 
 #endif
 
+extern void
+_mesa_dump_textures(GLboolean dumpImages);
+
 #endif
-- 
cgit v1.2.3


From 5199774dc6a2a65d24ac26fe15715654f2568a02 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Sat, 7 Feb 2009 11:50:24 -0700
Subject: mesa: minor fixes to incomplete texture debug code

---
 src/mesa/main/texobj.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index 0fee21c490..b4e30c8bb7 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -393,8 +393,7 @@ _mesa_test_texobj_completeness( const GLcontext *ctx,
     */
    if ((baseLevel < 0) || (baseLevel > MAX_TEXTURE_LEVELS)) {
       char s[100];
-      _mesa_sprintf(s, "obj %p (%d) base level = %d is invalid",
-              (void *) t, t->Name, baseLevel);
+      _mesa_sprintf(s, "base level = %d is invalid", baseLevel);
       incomplete(t, s);
       t->_Complete = GL_FALSE;
       return;
@@ -403,8 +402,7 @@ _mesa_test_texobj_completeness( const GLcontext *ctx,
    /* Always need the base level image */
    if (!t->Image[0][baseLevel]) {
       char s[100];
-      _mesa_sprintf(s, "obj %p (%d) Image[baseLevel=%d] == NULL",
-              (void *) t, t->Name, baseLevel);
+      _mesa_sprintf(s, "Image[baseLevel=%d] == NULL", baseLevel);
       incomplete(t, s);
       t->_Complete = GL_FALSE;
       return;
-- 
cgit v1.2.3


From 49002698193784dacffcbf993de26fcdd42c523e Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 9 Feb 2009 07:55:08 -0700
Subject: mesa: rework _mesa_reference_framebuffer() to look like
 _mesa_reference_renderbuffer()

_mesa_unreference_framebuffer() is deprecated since _mesa_reference_framebuffer(ptr, NULL)
can be used instead.
---
 src/mesa/main/framebuffer.c | 45 ++++++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 21 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/framebuffer.c b/src/mesa/main/framebuffer.c
index 52fd3c9d81..351bf6959a 100644
--- a/src/mesa/main/framebuffer.c
+++ b/src/mesa/main/framebuffer.c
@@ -223,19 +223,36 @@ _mesa_reference_framebuffer(struct gl_framebuffer **ptr,
       /* no change */
       return;
    }
+
    if (*ptr) {
-      _mesa_unreference_framebuffer(ptr);
+      /* unreference old renderbuffer */
+      GLboolean deleteFlag = GL_FALSE;
+      struct gl_framebuffer *oldFb = *ptr;
+
+      _glthread_LOCK_MUTEX(oldFb->Mutex);
+      ASSERT(oldFb->RefCount > 0);
+      oldFb->RefCount--;
+      deleteFlag = (oldFb->RefCount == 0);
+      _glthread_UNLOCK_MUTEX(oldFb->Mutex);
+      
+      if (deleteFlag)
+         oldFb->Delete(oldFb);
+
+      *ptr = NULL;
    }
    assert(!*ptr);
-   assert(fb);
-   _glthread_LOCK_MUTEX(fb->Mutex);
-   fb->RefCount++;
-   _glthread_UNLOCK_MUTEX(fb->Mutex);
-   *ptr = fb;
+
+   if (fb) {
+      _glthread_LOCK_MUTEX(fb->Mutex);
+      fb->RefCount++;
+      _glthread_UNLOCK_MUTEX(fb->Mutex);
+      *ptr = fb;
+   }
 }
 
 
 /**
+ * XXX this function is deprecated.
  * Undo/remove a reference to a framebuffer object.
  * Decrement the framebuffer object's reference count and delete it when
  * the refcount hits zero.
@@ -244,21 +261,7 @@ _mesa_reference_framebuffer(struct gl_framebuffer **ptr,
 void
 _mesa_unreference_framebuffer(struct gl_framebuffer **fb)
 {
-   assert(fb);
-   if (*fb) {
-      GLboolean deleteFlag = GL_FALSE;
-
-      _glthread_LOCK_MUTEX((*fb)->Mutex);
-      ASSERT((*fb)->RefCount > 0);
-      (*fb)->RefCount--;
-      deleteFlag = ((*fb)->RefCount == 0);
-      _glthread_UNLOCK_MUTEX((*fb)->Mutex);
-      
-      if (deleteFlag)
-         (*fb)->Delete(*fb);
-
-      *fb = NULL;
-   }
+   _mesa_reference_framebuffer(fb, NULL);
 }
 
 
-- 
cgit v1.2.3


From d52294439c80c99a4bfa2c7ecc65efa67f095a3f Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 9 Feb 2009 08:30:55 -0700
Subject: mesa: replace _mesa_unreference_framebuffer() with
 _mesa_reference_framebuffer()

---
 src/mesa/main/context.c  | 8 ++++----
 src/mesa/main/fbobject.c | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 608942979f..62c4473356 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1304,10 +1304,10 @@ _mesa_free_context_data( GLcontext *ctx )
    }
 
    /* unreference WinSysDraw/Read buffers */
-   _mesa_unreference_framebuffer(&ctx->WinSysDrawBuffer);
-   _mesa_unreference_framebuffer(&ctx->WinSysReadBuffer);
-   _mesa_unreference_framebuffer(&ctx->DrawBuffer);
-   _mesa_unreference_framebuffer(&ctx->ReadBuffer);
+   _mesa_reference_framebuffer(&ctx->WinSysDrawBuffer, NULL);
+   _mesa_reference_framebuffer(&ctx->WinSysReadBuffer, NULL);
+   _mesa_reference_framebuffer(&ctx->DrawBuffer, NULL);
+   _mesa_reference_framebuffer(&ctx->ReadBuffer, NULL);
 
    _mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current, NULL);
    _mesa_reference_vertprog(ctx, &ctx->VertexProgram._Current, NULL);
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index d08ad33902..f5e17c7675 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -1268,7 +1268,7 @@ _mesa_DeleteFramebuffersEXT(GLsizei n, const GLuint *framebuffers)
                /* But the object will not be freed until it's no longer
                 * bound in any context.
                 */
-               _mesa_unreference_framebuffer(&fb);
+               _mesa_reference_framebuffer(&fb, NULL);
 	    }
 	 }
       }
-- 
cgit v1.2.3


From 37c768b36aad22ecad48c7caab272354383e26a7 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 9 Feb 2009 13:50:36 -0700
Subject: mesa: add no-change testing for a few more texture parameters

---
 src/mesa/main/texparam.c | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index 8df22fe9e2..db512b21aa 100644
--- a/src/mesa/main/texparam.c
+++ b/src/mesa/main/texparam.c
@@ -262,8 +262,10 @@ set_tex_parameteri(GLcontext *ctx,
 
    case GL_GENERATE_MIPMAP_SGIS:
       if (ctx->Extensions.SGIS_generate_mipmap) {
-         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-         texObj->GenerateMipmap = params[0] ? GL_TRUE : GL_FALSE;
+         if (texObj->GenerateMipmap != params[0]) {
+            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+            texObj->GenerateMipmap = params[0] ? GL_TRUE : GL_FALSE;
+         }
       }
       else {
          _mesa_error(ctx, GL_INVALID_ENUM,
@@ -275,8 +277,10 @@ set_tex_parameteri(GLcontext *ctx,
       if (ctx->Extensions.ARB_shadow &&
           (params[0] == GL_NONE ||
            params[0] == GL_COMPARE_R_TO_TEXTURE_ARB)) {
-         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-         texObj->CompareMode = params[0];
+         if (texObj->CompareMode != params[0]) {
+            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+            texObj->CompareMode = params[0];
+         }
       }
       else {
          _mesa_error(ctx, GL_INVALID_ENUM,
@@ -286,6 +290,8 @@ set_tex_parameteri(GLcontext *ctx,
 
    case GL_TEXTURE_COMPARE_FUNC_ARB:
       if (ctx->Extensions.ARB_shadow) {
+         if (texObj->CompareFunc == params[0])
+            return;
          switch (params[0]) {
          case GL_LEQUAL:
          case GL_GEQUAL:
@@ -319,8 +325,10 @@ set_tex_parameteri(GLcontext *ctx,
           (params[0] == GL_LUMINANCE ||
            params[0] == GL_INTENSITY ||
            params[0] == GL_ALPHA)) {
-         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-         texObj->DepthMode = params[0];
+         if (texObj->DepthMode != params[0]) {
+            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+            texObj->DepthMode = params[0];
+         }
       }
       else {
          _mesa_error(ctx, GL_INVALID_ENUM,
@@ -415,6 +423,8 @@ set_tex_parameterf(GLcontext *ctx,
 
    case GL_TEXTURE_MAX_ANISOTROPY_EXT:
       if (ctx->Extensions.EXT_texture_filter_anisotropic) {
+         if (texObj->MaxAnisotropy == params[0])
+            return;
          if (params[0] < 1.0) {
             _mesa_error(ctx, GL_INVALID_VALUE, "glTexParameter(param)" );
             return;
@@ -432,8 +442,10 @@ set_tex_parameterf(GLcontext *ctx,
 
    case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB:
       if (ctx->Extensions.ARB_shadow_ambient) {
-         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-         texObj->CompareFailValue = CLAMP(params[0], 0.0F, 1.0F);
+         if (texObj->CompareFailValue != params[0]) {
+            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+            texObj->CompareFailValue = CLAMP(params[0], 0.0F, 1.0F);
+         }
       }
       else {
          _mesa_error(ctx, GL_INVALID_ENUM,
-- 
cgit v1.2.3


From aad3f546a046fe40b771e5d5f965b29189821d51 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 9 Feb 2009 13:58:32 -0700
Subject: mesa: avoid setting texObj->_Complete = GL_FALSE when there's no
 state change

Avoid a little bit of unneeded state validation and fixes a bug where the
texture complete flags was set to false, but we didn't signal _NEW_TEXTURE.

Fixes piglit tex1d-2dborder failure.
---
 src/mesa/main/texparam.c | 68 ++++++++++++++++++++++++++----------------------
 1 file changed, 37 insertions(+), 31 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index db512b21aa..865aae8627 100644
--- a/src/mesa/main/texparam.c
+++ b/src/mesa/main/texparam.c
@@ -3,7 +3,7 @@
  * Version:  7.5
  *
  * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
- * Copyright (C) 1999-2009  VMware, Inc.  All Rights Reserved.
+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -165,6 +165,20 @@ set_swizzle_component(GLuint *swizzle, GLuint comp, GLuint swz)
 }
 
 
+/**
+ * This is called just prior to changing any texture object state.
+ * Any pending rendering will be flushed out, we'll set the _NEW_TEXTURE
+ * state flag and then mark the texture object as 'incomplete' so that any
+ * per-texture derived state gets recomputed.
+ */
+static INLINE void
+flush(GLcontext *ctx, struct gl_texture_object *texObj)
+{
+   FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+   texObj->_Complete = GL_FALSE;
+}
+
+
 /** Set an integer-valued texture parameter */
 static void
 set_tex_parameteri(GLcontext *ctx,
@@ -178,7 +192,7 @@ set_tex_parameteri(GLcontext *ctx,
       switch (params[0]) {
       case GL_NEAREST:
       case GL_LINEAR:
-         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+         flush(ctx, texObj);
          texObj->MinFilter = params[0];
          return;
       case GL_NEAREST_MIPMAP_NEAREST:
@@ -186,7 +200,7 @@ set_tex_parameteri(GLcontext *ctx,
       case GL_NEAREST_MIPMAP_LINEAR:
       case GL_LINEAR_MIPMAP_LINEAR:
          if (texObj->Target != GL_TEXTURE_RECTANGLE_NV) {
-            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+            flush(ctx, texObj);
             texObj->MinFilter = params[0];
             return;
          }
@@ -202,7 +216,7 @@ set_tex_parameteri(GLcontext *ctx,
       switch (params[0]) {
       case GL_NEAREST:
       case GL_LINEAR:
-         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+         flush(ctx, texObj);
          texObj->MagFilter = params[0];
          return;
       default:
@@ -214,7 +228,7 @@ set_tex_parameteri(GLcontext *ctx,
       if (texObj->WrapS == params[0])
          return;
       if (validate_texture_wrap_mode(ctx, texObj->Target, params[0])) {
-         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+         flush(ctx, texObj);
          texObj->WrapS = params[0];
       }
       return;
@@ -223,7 +237,7 @@ set_tex_parameteri(GLcontext *ctx,
       if (texObj->WrapT == params[0])
          return;
       if (validate_texture_wrap_mode(ctx, texObj->Target, params[0])) {
-         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+         flush(ctx, texObj);
          texObj->WrapT = params[0];
       }
       return;
@@ -232,7 +246,7 @@ set_tex_parameteri(GLcontext *ctx,
       if (texObj->WrapR == params[0])
          return;
       if (validate_texture_wrap_mode(ctx, texObj->Target, params[0])) {
-         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+         flush(ctx, texObj);
          texObj->WrapR = params[0];
       }
       return;
@@ -245,7 +259,7 @@ set_tex_parameteri(GLcontext *ctx,
          _mesa_error(ctx, GL_INVALID_VALUE, "glTexParameter(param)");
          return;
       }
-      FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+      flush(ctx, texObj);
       texObj->BaseLevel = params[0];
       return;
 
@@ -256,14 +270,14 @@ set_tex_parameteri(GLcontext *ctx,
          _mesa_error(ctx, GL_INVALID_OPERATION, "glTexParameter(param)");
          return;
       }
-      FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+      flush(ctx, texObj);
       texObj->MaxLevel = params[0];
       return;
 
    case GL_GENERATE_MIPMAP_SGIS:
       if (ctx->Extensions.SGIS_generate_mipmap) {
          if (texObj->GenerateMipmap != params[0]) {
-            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+            flush(ctx, texObj);
             texObj->GenerateMipmap = params[0] ? GL_TRUE : GL_FALSE;
          }
       }
@@ -278,7 +292,7 @@ set_tex_parameteri(GLcontext *ctx,
           (params[0] == GL_NONE ||
            params[0] == GL_COMPARE_R_TO_TEXTURE_ARB)) {
          if (texObj->CompareMode != params[0]) {
-            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+            flush(ctx, texObj);
             texObj->CompareMode = params[0];
          }
       }
@@ -295,7 +309,7 @@ set_tex_parameteri(GLcontext *ctx,
          switch (params[0]) {
          case GL_LEQUAL:
          case GL_GEQUAL:
-            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+            flush(ctx, texObj);
             texObj->CompareFunc = params[0];
             return;
          case GL_EQUAL:
@@ -305,7 +319,7 @@ set_tex_parameteri(GLcontext *ctx,
          case GL_ALWAYS:
          case GL_NEVER:
             if (ctx->Extensions.EXT_shadow_funcs) {
-               FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+               flush(ctx, texObj);
                texObj->CompareFunc = params[0];
                return;
             }
@@ -326,7 +340,7 @@ set_tex_parameteri(GLcontext *ctx,
            params[0] == GL_INTENSITY ||
            params[0] == GL_ALPHA)) {
          if (texObj->DepthMode != params[0]) {
-            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+            flush(ctx, texObj);
             texObj->DepthMode = params[0];
          }
       }
@@ -359,7 +373,7 @@ set_tex_parameteri(GLcontext *ctx,
          }
          ASSERT(comp < 4);
          if (swz >= 0) {
-            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+            flush(ctx, texObj);
             texObj->Swizzle[comp] = params[0];
             set_swizzle_component(&texObj->_Swizzle, comp, swz);
             return;
@@ -371,7 +385,7 @@ set_tex_parameteri(GLcontext *ctx,
    case GL_TEXTURE_SWIZZLE_RGBA_EXT:
       if (ctx->Extensions.EXT_texture_swizzle) {
          GLuint comp;
-         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+         flush(ctx, texObj);
          for (comp = 0; comp < 4; comp++) {
             const GLint swz = comp_to_swizzle(params[comp]);
             if (swz >= 0) {
@@ -405,19 +419,19 @@ set_tex_parameterf(GLcontext *ctx,
    case GL_TEXTURE_MIN_LOD:
       if (texObj->MinLod == params[0])
          return;
-      FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+      flush(ctx, texObj);
       texObj->MinLod = params[0];
       return;
 
    case GL_TEXTURE_MAX_LOD:
       if (texObj->MaxLod == params[0])
          return;
-      FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+      flush(ctx, texObj);
       texObj->MaxLod = params[0];
       return;
 
    case GL_TEXTURE_PRIORITY:
-      FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+      flush(ctx, texObj);
       texObj->Priority = CLAMP(params[0], 0.0F, 1.0F);
       return;
 
@@ -429,7 +443,7 @@ set_tex_parameterf(GLcontext *ctx,
             _mesa_error(ctx, GL_INVALID_VALUE, "glTexParameter(param)" );
             return;
          }
-         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+         flush(ctx, texObj);
          /* clamp to max, that's what NVIDIA does */
          texObj->MaxAnisotropy = MIN2(params[0],
                                       ctx->Const.MaxTextureMaxAnisotropy);
@@ -443,7 +457,7 @@ set_tex_parameterf(GLcontext *ctx,
    case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB:
       if (ctx->Extensions.ARB_shadow_ambient) {
          if (texObj->CompareFailValue != params[0]) {
-            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+            flush(ctx, texObj);
             texObj->CompareFailValue = CLAMP(params[0], 0.0F, 1.0F);
          }
       }
@@ -457,14 +471,14 @@ set_tex_parameterf(GLcontext *ctx,
       /* 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]) {
-            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+            flush(ctx, texObj);
             texObj->LodBias = params[0];
          }
       }
       break;
 
    case GL_TEXTURE_BORDER_COLOR:
-      FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+      flush(ctx, texObj);
       texObj->BorderColor[RCOMP] = params[0];
       texObj->BorderColor[GCOMP] = params[1];
       texObj->BorderColor[BCOMP] = params[2];
@@ -515,8 +529,6 @@ _mesa_TexParameterf(GLenum target, GLenum pname, GLfloat param)
       set_tex_parameterf(ctx, texObj, pname, &param);
    }
 
-   texObj->_Complete = GL_FALSE;
-
    if (ctx->Driver.TexParameter && ctx->ErrorValue == GL_NO_ERROR) {
       ctx->Driver.TexParameter(ctx, target, texObj, pname, &param);
    }
@@ -572,8 +584,6 @@ _mesa_TexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
       set_tex_parameterf(ctx, texObj, pname, params);
    }
 
-   texObj->_Complete = GL_FALSE;
-
    if (ctx->Driver.TexParameter && ctx->ErrorValue == GL_NO_ERROR) {
       ctx->Driver.TexParameter(ctx, target, texObj, pname, params);
    }
@@ -609,8 +619,6 @@ _mesa_TexParameteri(GLenum target, GLenum pname, GLint param)
       set_tex_parameteri(ctx, texObj, pname, &param);
    }
 
-   texObj->_Complete = GL_FALSE;
-
    if (ctx->Driver.TexParameter && ctx->ErrorValue == GL_NO_ERROR) {
       GLfloat fparam = (GLfloat) param;
       ctx->Driver.TexParameter(ctx, target, texObj, pname, &fparam);
@@ -658,8 +666,6 @@ _mesa_TexParameteriv(GLenum target, GLenum pname, const GLint *params)
       set_tex_parameteri(ctx, texObj, pname, params);
    }
 
-   texObj->_Complete = GL_FALSE;
-
    if (ctx->Driver.TexParameter && ctx->ErrorValue == GL_NO_ERROR) {
       GLfloat fparams[4];
       fparams[0] = INT_TO_FLOAT(params[0]);
-- 
cgit v1.2.3


From cb3c54ea86344242545dd29f936e53853d3a5ea4 Mon Sep 17 00:00:00 2001
From: Roland Scheidegger <sroland@tungstengraphics.com>
Date: Mon, 9 Feb 2009 17:57:22 +0100
Subject: fix _mesa_get_teximage for srgb textures

---
 src/mesa/main/texstore.c | 63 +++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 52 insertions(+), 11 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index 2b06796aba..6360ca15f8 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -3699,14 +3699,37 @@ is_srgb_teximage(const struct gl_texture_image *texImage)
    case MESA_FORMAT_SARGB8:
    case MESA_FORMAT_SL8:
    case MESA_FORMAT_SLA8:
+   case MESA_FORMAT_SRGB_DXT1:
+   case MESA_FORMAT_SRGBA_DXT1:
+   case MESA_FORMAT_SRGBA_DXT3:
+   case MESA_FORMAT_SRGBA_DXT5:
       return GL_TRUE;
    default:
       return GL_FALSE;
    }
 }
 
-#endif /* FEATURE_EXT_texture_sRGB */
 
+/**
+ * Convert a float value from linear space to a
+ * non-linear sRGB value in [0, 255].
+ * Not terribly efficient.
+ */
+static INLINE GLfloat
+linear_to_nonlinear(GLfloat cl)
+{
+   /* can't have values outside [0, 1] */
+   GLfloat cs;
+   if (cl < 0.0031308) {
+      cs = 12.92 * cl;
+   }
+   else {
+      cs = 1.055 * _mesa_pow(cl, 0.41666) - 0.055;
+   }
+   return cs;
+}
+
+#endif /* FEATURE_EXT_texture_sRGB */
 
 /**
  * This is the software fallback for Driver.GetTexImage().
@@ -3823,16 +3846,34 @@ _mesa_get_teximage(GLcontext *ctx, GLenum target, GLint level,
             }
 #if FEATURE_EXT_texture_sRGB
             else if (is_srgb_teximage(texImage)) {
-               /* no pixel transfer and no non-linear to linear conversion */
-               const GLint comps = texImage->TexFormat->TexelBytes;
-               const GLint rowstride = comps * texImage->RowStride;
-               MEMCPY(dest,
-                      (const GLubyte *) texImage->Data + row * rowstride,
-                      comps * width * sizeof(GLubyte));
-               /* FIXME: isn't it necessary to still do component assigning
-                  according to format/type? */
-               /* FIXME: need to do something else for compressed srgb textures
-                         (currently will return values converted to linear) */
+               /* special case this since need to backconvert values */
+               /* convert row to RGBA format */
+               GLfloat rgba[MAX_WIDTH][4];
+               GLint col;
+               GLbitfield transferOps = 0x0;
+
+               for (col = 0; col < width; col++) {
+                  (*texImage->FetchTexelf)(texImage, col, row, img, rgba[col]);
+                  if (texImage->TexFormat->BaseFormat == GL_LUMINANCE) {
+                     rgba[col][RCOMP] = linear_to_nonlinear(rgba[col][RCOMP]);
+                     rgba[col][GCOMP] = 0.0;
+                     rgba[col][BCOMP] = 0.0;
+                  }
+                  else if (texImage->TexFormat->BaseFormat == GL_LUMINANCE_ALPHA) {
+                     rgba[col][RCOMP] = linear_to_nonlinear(rgba[col][RCOMP]);
+                     rgba[col][GCOMP] = 0.0;
+                     rgba[col][BCOMP] = 0.0;
+                  }
+                  else if (texImage->TexFormat->BaseFormat == GL_RGB ||
+                     texImage->TexFormat->BaseFormat == GL_RGBA) {
+                     rgba[col][RCOMP] = linear_to_nonlinear(rgba[col][RCOMP]);
+                     rgba[col][GCOMP] = linear_to_nonlinear(rgba[col][GCOMP]);
+                     rgba[col][BCOMP] = linear_to_nonlinear(rgba[col][BCOMP]);
+                  }
+               }
+               _mesa_pack_rgba_span_float(ctx, width, (GLfloat (*)[4]) rgba,
+                                          format, type, dest,
+                                          &ctx->Pack, transferOps /*image xfer ops*/);
             }
 #endif /* FEATURE_EXT_texture_sRGB */
             else {
-- 
cgit v1.2.3


From 93da69def4ec6b3a8088cf603f6800d73e0a9793 Mon Sep 17 00:00:00 2001
From: Roland Scheidegger <sroland@tungstengraphics.com>
Date: Mon, 9 Feb 2009 23:10:16 +0100
Subject: mesa: fixes for srgb formats

swizzling in fetch/store srgba/sargb functions fixed (consistent with
equivalent non-srgb formats now).
---
 src/mesa/main/texformat_tmp.h | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texformat_tmp.h b/src/mesa/main/texformat_tmp.h
index 08b6d8f12f..275340cabd 100644
--- a/src/mesa/main/texformat_tmp.h
+++ b/src/mesa/main/texformat_tmp.h
@@ -1223,11 +1223,11 @@ static void store_texel_srgb8(struct gl_texture_image *texImage,
 static void FETCH(srgba8)(const struct gl_texture_image *texImage,
                           GLint i, GLint j, GLint k, GLfloat *texel )
 {
-   const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 4);
-   texel[RCOMP] = nonlinear_to_linear(src[0]);
-   texel[GCOMP] = nonlinear_to_linear(src[1]);
-   texel[BCOMP] = nonlinear_to_linear(src[2]);
-   texel[ACOMP] = UBYTE_TO_FLOAT(src[3]); /* linear! */
+   const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
+   texel[RCOMP] = nonlinear_to_linear( (s >> 24) );
+   texel[GCOMP] = nonlinear_to_linear( (s >> 16) & 0xff );
+   texel[BCOMP] = nonlinear_to_linear( (s >>  8) & 0xff );
+   texel[ACOMP] = UBYTE_TO_FLOAT( (s      ) & 0xff ); /* linear! */
 }
 
 #if DIM == 3
@@ -1235,11 +1235,8 @@ static void store_texel_srgba8(struct gl_texture_image *texImage,
                                GLint i, GLint j, GLint k, const void *texel)
 {
    const GLubyte *rgba = (const GLubyte *) texel;
-   GLubyte *dst = TEXEL_ADDR(GLubyte, texImage, i, j, k, 4);
-   dst[0] = rgba[RCOMP];
-   dst[1] = rgba[GCOMP];
-   dst[2] = rgba[BCOMP];
-   dst[3] = rgba[ACOMP];
+   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
+   *dst = PACK_COLOR_8888(rgba[RCOMP], rgba[GCOMP], rgba[BCOMP], rgba[ACOMP]);
 }
 #endif
 
@@ -1247,11 +1244,11 @@ static void store_texel_srgba8(struct gl_texture_image *texImage,
 static void FETCH(sargb8)(const struct gl_texture_image *texImage,
                           GLint i, GLint j, GLint k, GLfloat *texel )
 {
-   const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 4);
-   texel[RCOMP] = nonlinear_to_linear(src[1]);
-   texel[GCOMP] = nonlinear_to_linear(src[2]);
-   texel[BCOMP] = nonlinear_to_linear(src[3]);
-   texel[ACOMP] = UBYTE_TO_FLOAT(src[0]); /* linear! */
+   const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
+   texel[RCOMP] = nonlinear_to_linear( (s >> 16) & 0xff );
+   texel[GCOMP] = nonlinear_to_linear( (s >>  8) & 0xff );
+   texel[BCOMP] = nonlinear_to_linear( (s      ) & 0xff );
+   texel[ACOMP] = UBYTE_TO_FLOAT( (s >> 24) ); /* linear! */
 }
 
 #if DIM == 3
@@ -1259,11 +1256,8 @@ static void store_texel_sargb8(struct gl_texture_image *texImage,
                                GLint i, GLint j, GLint k, const void *texel)
 {
    const GLubyte *rgba = (const GLubyte *) texel;
-   GLubyte *dst = TEXEL_ADDR(GLubyte, texImage, i, j, k, 4);
-   dst[0] = rgba[ACOMP];
-   dst[1] = rgba[RCOMP];
-   dst[2] = rgba[GCOMP];
-   dst[3] = rgba[BCOMP];
+   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
+   *dst = PACK_COLOR_8888(rgba[ACOMP], rgba[RCOMP], rgba[GCOMP], rgba[BCOMP]);
 }
 #endif
 
-- 
cgit v1.2.3


From 46ae1abbac6837d051c10b2e8b57eab3d4958ff4 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 10 Feb 2009 15:35:25 -0700
Subject: mesa: fix/change state validation order for program/texture state

Program state needs to be updated before texture state since the later depends
on the former.

Fixes piglit texgen failure.  The second time through the modes (press 't'
three times) we disable the fragment program and return to conventional texture
mode.  State validation failed here because update_texture() saw stale fragment
program state.
---
 src/mesa/main/state.c | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 6fe54c753f..2c3177b9e2 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -429,6 +429,18 @@ _mesa_update_state_locked( GLcontext *ctx )
    if (MESA_VERBOSE & VERBOSE_STATE)
       _mesa_print_state("_mesa_update_state", new_state);
 
+   if (ctx->FragmentProgram._MaintainTexEnvProgram) {
+      prog_flags |= (_NEW_TEXTURE | _NEW_FOG | _DD_NEW_SEPARATE_SPECULAR);
+   }
+   if (ctx->VertexProgram._MaintainTnlProgram) {
+      prog_flags |= (_NEW_ARRAY | _NEW_TEXTURE | _NEW_TEXTURE_MATRIX |
+                     _NEW_TRANSFORM | _NEW_POINT |
+                     _NEW_FOG | _NEW_LIGHT |
+                     _MESA_NEW_NEED_EYE_COORDS);
+   }
+   if (new_state & prog_flags)
+      update_program( ctx );
+
    if (new_state & (_NEW_MODELVIEW|_NEW_PROJECTION))
       _mesa_update_modelview_project( ctx, new_state );
 
@@ -488,19 +500,6 @@ _mesa_update_state_locked( GLcontext *ctx )
    if (new_state & _MESA_NEW_NEED_EYE_COORDS) 
       _mesa_update_tnl_spaces( ctx, new_state );
 
-   if (ctx->FragmentProgram._MaintainTexEnvProgram) {
-      prog_flags |= (_NEW_TEXTURE | _NEW_FOG | _DD_NEW_SEPARATE_SPECULAR);
-   }
-   if (ctx->VertexProgram._MaintainTnlProgram) {
-      prog_flags |= (_NEW_ARRAY | _NEW_TEXTURE | _NEW_TEXTURE_MATRIX |
-                     _NEW_TRANSFORM | _NEW_POINT |
-                     _NEW_FOG | _NEW_LIGHT |
-                     _MESA_NEW_NEED_EYE_COORDS);
-   }
-   if (new_state & prog_flags)
-      update_program( ctx );
-
-
 
    /*
     * Give the driver a chance to act upon the new_state flags.
-- 
cgit v1.2.3


From 1ed5fe5cbfb64c57997ec46684748f8ae516d19c Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 10 Feb 2009 15:43:05 -0700
Subject: mesa: s/_IMAGE_NEW_TRANSFER_STATE/_MESA_NEW_TRANSFER_STATE/ to be
 more consistant with other flags

---
 src/mesa/main/mtypes.h   |  8 +++++++-
 src/mesa/main/pixel.c    |  2 +-
 src/mesa/main/state.c    |  2 +-
 src/mesa/main/teximage.c | 22 +++++++++++-----------
 4 files changed, 20 insertions(+), 14 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 509da06d09..92bce76ad5 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2842,6 +2842,10 @@ struct gl_matrix_stack
 /*@}*/
 
 
+/**
+ * Composite state flags
+ */
+/*@{*/
 #define _MESA_NEW_NEED_EYE_COORDS         (_NEW_LIGHT |		\
                                            _NEW_TEXTURE |	\
                                            _NEW_POINT |		\
@@ -2851,7 +2855,9 @@ struct gl_matrix_stack
 #define _MESA_NEW_NEED_NORMALS            (_NEW_LIGHT |		\
                                            _NEW_TEXTURE)
 
-#define _IMAGE_NEW_TRANSFER_STATE         (_NEW_PIXEL | _NEW_COLOR_MATRIX)
+#define _MESA_NEW_TRANSFER_STATE          (_NEW_PIXEL |		\
+                                           _NEW_COLOR_MATRIX)
+/*@}*/
 
 
 
diff --git a/src/mesa/main/pixel.c b/src/mesa/main/pixel.c
index 8d24a201f0..52781e048e 100644
--- a/src/mesa/main/pixel.c
+++ b/src/mesa/main/pixel.c
@@ -828,7 +828,7 @@ void _mesa_update_pixel( GLcontext *ctx, GLuint new_state )
 
    /* References ColorMatrix.type (derived above).
     */
-   if (new_state & _IMAGE_NEW_TRANSFER_STATE)
+   if (new_state & _MESA_NEW_TRANSFER_STATE)
       update_image_transfer_state(ctx);
 }
 
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 2c3177b9e2..19d58b596f 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -463,7 +463,7 @@ _mesa_update_state_locked( GLcontext *ctx )
       _mesa_update_stencil( ctx );
 
 #if FEATURE_pixel_transfer
-   if (new_state & _IMAGE_NEW_TRANSFER_STATE)
+   if (new_state & _MESA_NEW_TRANSFER_STATE)
       _mesa_update_pixel( ctx, new_state );
 #endif
 
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 9519d89e4a..18ca8450d3 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -2420,7 +2420,7 @@ _mesa_TexImage1D( GLenum target, GLint level, GLint internalFormat,
          return;   /* error was recorded */
       }
 
-      if (ctx->NewState & _IMAGE_NEW_TRANSFER_STATE)
+      if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)
 	 _mesa_update_state(ctx);
 
       texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
@@ -2526,7 +2526,7 @@ _mesa_TexImage2D( GLenum target, GLint level, GLint internalFormat,
          return;   /* error was recorded */
       }
 
-      if (ctx->NewState & _IMAGE_NEW_TRANSFER_STATE)
+      if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)
 	 _mesa_update_state(ctx);
 
       texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
@@ -2627,7 +2627,7 @@ _mesa_TexImage3D( GLenum target, GLint level, GLint internalFormat,
          return;   /* error was recorded */
       }
 
-      if (ctx->NewState & _IMAGE_NEW_TRANSFER_STATE)
+      if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)
 	 _mesa_update_state(ctx);
 
       texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
@@ -2720,7 +2720,7 @@ _mesa_TexSubImage1D( GLenum target, GLint level,
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
-   if (ctx->NewState & _IMAGE_NEW_TRANSFER_STATE)
+   if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)
       _mesa_update_state(ctx);
 
 #if FEATURE_convolve
@@ -2780,7 +2780,7 @@ _mesa_TexSubImage2D( GLenum target, GLint level,
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
-   if (ctx->NewState & _IMAGE_NEW_TRANSFER_STATE)
+   if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)
       _mesa_update_state(ctx);
 
 #if FEATURE_convolve
@@ -2840,7 +2840,7 @@ _mesa_TexSubImage3D( GLenum target, GLint level,
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
-   if (ctx->NewState & _IMAGE_NEW_TRANSFER_STATE)
+   if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)
       _mesa_update_state(ctx);
 
    if (subtexture_error_check(ctx, 3, target, level, xoffset, yoffset, zoffset,
@@ -2896,7 +2896,7 @@ _mesa_CopyTexImage1D( GLenum target, GLint level,
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
-   if (ctx->NewState & _IMAGE_NEW_TRANSFER_STATE)
+   if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)
       _mesa_update_state(ctx);
 
 #if FEATURE_convolve
@@ -2961,7 +2961,7 @@ _mesa_CopyTexImage2D( GLenum target, GLint level, GLenum internalFormat,
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
-   if (ctx->NewState & _IMAGE_NEW_TRANSFER_STATE)
+   if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)
       _mesa_update_state(ctx);
 
 #if FEATURE_convolve
@@ -3029,7 +3029,7 @@ _mesa_CopyTexSubImage1D( GLenum target, GLint level,
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
-   if (ctx->NewState & _IMAGE_NEW_TRANSFER_STATE)
+   if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)
       _mesa_update_state(ctx);
 
    if (copytexsubimage_error_check1(ctx, 1, target, level))
@@ -3084,7 +3084,7 @@ _mesa_CopyTexSubImage2D( GLenum target, GLint level,
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
-   if (ctx->NewState & _IMAGE_NEW_TRANSFER_STATE)
+   if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)
       _mesa_update_state(ctx);
 
    if (copytexsubimage_error_check1(ctx, 2, target, level))
@@ -3139,7 +3139,7 @@ _mesa_CopyTexSubImage3D( GLenum target, GLint level,
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
-   if (ctx->NewState & _IMAGE_NEW_TRANSFER_STATE)
+   if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)
       _mesa_update_state(ctx);
 
    if (copytexsubimage_error_check1(ctx, 3, target, level))
-- 
cgit v1.2.3


From 537d3ed6f3112fdf16fd853ada0e0bcc8bd83227 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 10 Feb 2009 16:28:25 -0700
Subject: mesa: another fix for program/texture state validation

This fixes a regression introduced in 46ae1abbac6837d051c10b2e8b57eab3d4958ff4

Break program validation into two steps, do part before texture state
validation and do the rest after:
1. Determine Vertex/Fragment _Enabled state.
2. Update texture state.
3. Determine pointers to current Vertex/Fragment programs (which may involve
generating new "fixed-function" programs).

See comments in the code for more details of the dependencies.
---
 src/mesa/main/state.c | 42 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 36 insertions(+), 6 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 19d58b596f..3cf70d6a3c 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -173,13 +173,16 @@ update_arrays( GLcontext *ctx )
 }
 
 
+/**
+ * Update the following fields:
+ *   ctx->VertexProgram._Enabled
+ *   ctx->FragmentProgram._Enabled
+ *   ctx->ATIFragmentShader._Enabled
+ * This needs to be done before texture state validation.
+ */
 static void
-update_program(GLcontext *ctx)
+update_program_enables(GLcontext *ctx)
 {
-   const struct gl_shader_program *shProg = ctx->Shader.CurrentProgram;
-   const struct gl_vertex_program *prevVP = ctx->VertexProgram._Current;
-   const struct gl_fragment_program *prevFP = ctx->FragmentProgram._Current;
-
    /* These _Enabled flags indicate if the program is enabled AND valid. */
    ctx->VertexProgram._Enabled = ctx->VertexProgram.Enabled
       && ctx->VertexProgram.Current->Base.Instructions;
@@ -187,6 +190,25 @@ update_program(GLcontext *ctx)
       && ctx->FragmentProgram.Current->Base.Instructions;
    ctx->ATIFragmentShader._Enabled = ctx->ATIFragmentShader.Enabled
       && ctx->ATIFragmentShader.Current->Instructions[0];
+}
+
+
+/**
+ * Update vertex/fragment program state.  In particular, update these fields:
+ *   ctx->VertexProgram._Current
+ *   ctx->VertexProgram._TnlProgram,
+ * These point to the highest priority enabled vertex/fragment program or are
+ * NULL if fixed-function processing is to be done.
+ *
+ * This function needs to be called after texture state validation in case
+ * we're generating a fragment program from fixed-function texture state.
+ */
+static void
+update_program(GLcontext *ctx)
+{
+   const struct gl_shader_program *shProg = ctx->Shader.CurrentProgram;
+   const struct gl_vertex_program *prevVP = ctx->VertexProgram._Current;
+   const struct gl_fragment_program *prevFP = ctx->FragmentProgram._Current;
 
    /*
     * Set the ctx->VertexProgram._Current and ctx->FragmentProgram._Current
@@ -429,6 +451,7 @@ _mesa_update_state_locked( GLcontext *ctx )
    if (MESA_VERBOSE & VERBOSE_STATE)
       _mesa_print_state("_mesa_update_state", new_state);
 
+   /* Determine which state flags effect vertex/fragment program state */
    if (ctx->FragmentProgram._MaintainTexEnvProgram) {
       prog_flags |= (_NEW_TEXTURE | _NEW_FOG | _DD_NEW_SEPARATE_SPECULAR);
    }
@@ -438,8 +461,13 @@ _mesa_update_state_locked( GLcontext *ctx )
                      _NEW_FOG | _NEW_LIGHT |
                      _MESA_NEW_NEED_EYE_COORDS);
    }
+
+   /*
+    * Now update derived state info
+    */
+
    if (new_state & prog_flags)
-      update_program( ctx );
+      update_program_enables( ctx );
 
    if (new_state & (_NEW_MODELVIEW|_NEW_PROJECTION))
       _mesa_update_modelview_project( ctx, new_state );
@@ -500,6 +528,8 @@ _mesa_update_state_locked( GLcontext *ctx )
    if (new_state & _MESA_NEW_NEED_EYE_COORDS) 
       _mesa_update_tnl_spaces( ctx, new_state );
 
+   if (new_state & prog_flags)
+      update_program( ctx );
 
    /*
     * Give the driver a chance to act upon the new_state flags.
-- 
cgit v1.2.3


From 9fd26daec24f21dbe17afcb2e2ab272667ee9a69 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 10 Feb 2009 16:30:24 -0700
Subject: mesa: remove the unused _mesa_UpdateTexEnvProgram() function

---
 src/mesa/main/texenvprogram.c | 36 ------------------------------------
 src/mesa/main/texenvprogram.h |  2 --
 2 files changed, 38 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 066f3bd0be..d1f03405c1 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -1261,39 +1261,3 @@ _mesa_get_fixed_func_fragment_program(GLcontext *ctx)
 
    return prog;
 }
-
-
-
-/**
- * If _MaintainTexEnvProgram is set we'll generate a fragment program that
- * implements the current texture env/combine mode.
- * This function generates that program and puts it into effect.
- */
-void
-_mesa_UpdateTexEnvProgram( GLcontext *ctx )
-{
-   const struct gl_fragment_program *prev = ctx->FragmentProgram._Current;
-	
-   ASSERT(ctx->FragmentProgram._MaintainTexEnvProgram);
-
-   /* If a conventional fragment program/shader isn't in effect... */
-   if (!ctx->FragmentProgram._Enabled &&
-       (!ctx->Shader.CurrentProgram ||
-        !ctx->Shader.CurrentProgram->FragmentProgram) ) 
-   {
-      struct gl_fragment_program *newProg;
-
-      newProg = _mesa_get_fixed_func_fragment_program(ctx);
-
-      _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current, newProg);
-      _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._TexEnvProgram, newProg);
-   } 
-
-   /* Tell the driver about the change.  Could define a new target for
-    * this?
-    */
-   if (ctx->FragmentProgram._Current != prev && ctx->Driver.BindProgram) {
-      ctx->Driver.BindProgram(ctx, GL_FRAGMENT_PROGRAM_ARB,
-                         (struct gl_program *) ctx->FragmentProgram._Current);
-   }
-}
diff --git a/src/mesa/main/texenvprogram.h b/src/mesa/main/texenvprogram.h
index a7aa60cf37..0a162d2e7a 100644
--- a/src/mesa/main/texenvprogram.h
+++ b/src/mesa/main/texenvprogram.h
@@ -32,6 +32,4 @@
 extern struct gl_fragment_program *
 _mesa_get_fixed_func_fragment_program(GLcontext *ctx);
 
-extern void _mesa_UpdateTexEnvProgram( GLcontext *ctx );
-
 #endif
-- 
cgit v1.2.3


From 8cadf6c0a152a5945e34ea8f6d9935ee399e6ae1 Mon Sep 17 00:00:00 2001
From: José Fonseca <jfonseca@vmware.com>
Date: Wed, 11 Feb 2009 13:50:43 +0000
Subject: mesa: Move statements after declarations.

---
 src/mesa/main/debug.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/debug.c b/src/mesa/main/debug.c
index 90a3bf1f04..fcef093ac3 100644
--- a/src/mesa/main/debug.c
+++ b/src/mesa/main/debug.c
@@ -289,8 +289,8 @@ static void
 dump_texture_cb(GLuint id, void *data, void *userData)
 {
    struct gl_texture_object *texObj = (struct gl_texture_object *) data;
-   (void) userData;
    int i;
+   (void) userData;
 
    printf("Texture %u\n", texObj->Name);
    printf("  Target 0x%x\n", texObj->Target);
-- 
cgit v1.2.3


From 2218592d47b963791105f5b8fa1a0b3f3a07f674 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 11 Feb 2009 13:52:17 -0700
Subject: mesa: get rid of _math_init()

Only VBO uses the evaluator code so call _math_init_eval() there.

Only TNL uses the transform/translate code so call _math_init_transformation()
and _math_init_translate9) there.

This is a step toward resolving some symbol collisions between Mesa's and
gallium's x86 codegen.
Have VBO and TNL modules call _math_init_transformation()
---
 src/mesa/main/context.c    | 7 -------
 src/mesa/math/m_xform.c    | 8 --------
 src/mesa/math/mathmod.h    | 2 --
 src/mesa/tnl/t_context.c   | 5 +++++
 src/mesa/vbo/vbo_context.c | 3 +++
 5 files changed, 8 insertions(+), 17 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 39c7fa037e..c5b90d9cda 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -151,10 +151,7 @@
 #include "shader/atifragshader.h"
 #endif
 #if _HAVE_FULL_GL
-#include "math/m_translate.h"
 #include "math/m_matrix.h"
-#include "math/m_xform.h"
-#include "math/mathmod.h"
 #endif
 
 #ifdef USE_SPARC_ASM
@@ -387,13 +384,9 @@ one_time_init( GLcontext *ctx )
 
       _mesa_init_sqrt_table();
 
-#if _HAVE_FULL_GL
-      _math_init();
-
       for (i = 0; i < 256; i++) {
          _mesa_ubyte_to_float_color_tab[i] = (float) i / 255.0F;
       }
-#endif
 
 #ifdef USE_SPARC_ASM
       _mesa_init_sparc_glapi_relocs();
diff --git a/src/mesa/math/m_xform.c b/src/mesa/math/m_xform.c
index 901ae5b416..fdc8abd434 100644
--- a/src/mesa/math/m_xform.c
+++ b/src/mesa/math/m_xform.c
@@ -220,11 +220,3 @@ _math_init_transformation( void )
    _mesa_init_all_x86_64_transform_asm();
 #endif
 }
-
-void
-_math_init( void )
-{
-   _math_init_transformation();
-   _math_init_translate();
-   _math_init_eval();
-}
diff --git a/src/mesa/math/mathmod.h b/src/mesa/math/mathmod.h
index 6fbaaea94b..fb0862b5b1 100644
--- a/src/mesa/math/mathmod.h
+++ b/src/mesa/math/mathmod.h
@@ -36,6 +36,4 @@
 #ifndef _MESA_MATH_H_
 #define _MESA_MATH_H_
 
-extern void _math_init( void );
-
 #endif
diff --git a/src/mesa/tnl/t_context.c b/src/mesa/tnl/t_context.c
index 7bfc7b0061..f0d31fdac3 100644
--- a/src/mesa/tnl/t_context.c
+++ b/src/mesa/tnl/t_context.c
@@ -32,6 +32,8 @@
 #include "main/macros.h"
 #include "main/mtypes.h"
 #include "main/light.h"
+#include "math/m_translate.h"
+#include "math/m_xform.h"
 
 #include "tnl.h"
 #include "t_context.h"
@@ -81,6 +83,9 @@ _tnl_CreateContext( GLcontext *ctx )
    /* plug in the VBO drawing function */
    vbo_set_draw_func(ctx, _tnl_draw_prims);
 
+   _math_init_transformation();
+   _math_init_translate();
+
    return GL_TRUE;
 }
 
diff --git a/src/mesa/vbo/vbo_context.c b/src/mesa/vbo/vbo_context.c
index 467ab4e3e5..ca8190fd05 100644
--- a/src/mesa/vbo/vbo_context.c
+++ b/src/mesa/vbo/vbo_context.c
@@ -28,6 +28,7 @@
 #include "main/imports.h"
 #include "main/mtypes.h"
 #include "main/api_arrayelt.h"
+#include "math/m_eval.h"
 #include "vbo.h"
 #include "vbo_context.h"
 
@@ -230,6 +231,8 @@ GLboolean _vbo_CreateContext( GLcontext *ctx )
    vbo_save_init( ctx );
 #endif
 
+   _math_init_eval();
+
    return GL_TRUE;
 }
 
-- 
cgit v1.2.3


From e8cd8be03b9617d75df4e09dc568b6760db1edc4 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 12 Feb 2009 08:58:12 -0700
Subject: mesa: restore FLUSH_VERTICES() in _mesa_notifySwapBuffers()

---
 src/mesa/main/context.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index c5b90d9cda..19ff5e552c 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -183,6 +183,7 @@ GLfloat _mesa_ubyte_to_float_color_tab[256];
 void
 _mesa_notifySwapBuffers(__GLcontext *ctx)
 {
+   FLUSH_VERTICES( ctx, 0 );
    if (ctx->Driver.Flush) {
       ctx->Driver.Flush(ctx);
    }
-- 
cgit v1.2.3


From 987aedd7dc75c095a96cb20b21bbad2f71857776 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 12 Feb 2009 09:17:18 -0700
Subject: mesa: move _mesa_transform_vector() from m_xform.c to m_matrix.c

m_xform.c is omitted from gallium builds but _mesa_transform_vector() is
still needed.
---
 src/mesa/main/texgen.c   |  2 +-
 src/mesa/math/m_matrix.c | 21 +++++++++++++++++++++
 src/mesa/math/m_matrix.h |  3 +++
 src/mesa/math/m_xform.c  | 21 ---------------------
 src/mesa/math/m_xform.h  |  4 ----
 5 files changed, 25 insertions(+), 26 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texgen.c b/src/mesa/main/texgen.c
index 244c7aaafc..d2baecb92a 100644
--- a/src/mesa/main/texgen.c
+++ b/src/mesa/main/texgen.c
@@ -34,7 +34,7 @@
 #include "main/enums.h"
 #include "main/macros.h"
 #include "main/texgen.h"
-#include "math/m_xform.h"
+#include "math/m_matrix.h"
 
 
 
diff --git a/src/mesa/math/m_matrix.c b/src/mesa/math/m_matrix.c
index 84b4cae4ad..58cae88b08 100644
--- a/src/mesa/math/m_matrix.c
+++ b/src/mesa/math/m_matrix.c
@@ -1620,3 +1620,24 @@ _math_transposefd( GLfloat to[16], const GLdouble from[16] )
 
 /*@}*/
 
+
+/**
+ * Transform a 4-element row vector (1x4 matrix) by a 4x4 matrix.  This
+ * function is used for transforming clipping plane equations and spotlight
+ * directions.
+ * Mathematically,  u = v * m.
+ * Input:  v - input vector
+ *         m - transformation matrix
+ * Output:  u - transformed vector
+ */
+void
+_mesa_transform_vector( GLfloat u[4], const GLfloat v[4], const GLfloat m[16] )
+{
+   const GLfloat v0 = v[0], v1 = v[1], v2 = v[2], v3 = v[3];
+#define M(row,col)  m[row + col*4]
+   u[0] = v0 * M(0,0) + v1 * M(1,0) + v2 * M(2,0) + v3 * M(3,0);
+   u[1] = v0 * M(0,1) + v1 * M(1,1) + v2 * M(2,1) + v3 * M(3,1);
+   u[2] = v0 * M(0,2) + v1 * M(1,2) + v2 * M(2,2) + v3 * M(3,2);
+   u[3] = v0 * M(0,3) + v1 * M(1,3) + v2 * M(2,3) + v3 * M(3,3);
+#undef M
+}
diff --git a/src/mesa/math/m_matrix.h b/src/mesa/math/m_matrix.h
index a8d9000e89..3bc5de6cd4 100644
--- a/src/mesa/math/m_matrix.h
+++ b/src/mesa/math/m_matrix.h
@@ -200,6 +200,9 @@ do {								\
 } while (0)
 
 
+extern void
+_mesa_transform_vector(GLfloat u[4], const GLfloat v[4], const GLfloat m[16]);
+
 
 /*@}*/
 
diff --git a/src/mesa/math/m_xform.c b/src/mesa/math/m_xform.c
index 4789a855d4..369f2c6e95 100644
--- a/src/mesa/math/m_xform.c
+++ b/src/mesa/math/m_xform.c
@@ -96,27 +96,6 @@ transform_func *_mesa_transform_tab[5];
 #undef ARGS
 
 
-/*
- * Transform a 4-element row vector (1x4 matrix) by a 4x4 matrix.  This
- * function is used for transforming clipping plane equations and spotlight
- * directions.
- * Mathematically,  u = v * m.
- * Input:  v - input vector
- *         m - transformation matrix
- * Output:  u - transformed vector
- */
-void _mesa_transform_vector( GLfloat u[4], const GLfloat v[4], const GLfloat m[16] )
-{
-   GLfloat v0=v[0], v1=v[1], v2=v[2], v3=v[3];
-#define M(row,col)  m[row + col*4]
-   u[0] = v0 * M(0,0) + v1 * M(1,0) + v2 * M(2,0) + v3 * M(3,0);
-   u[1] = v0 * M(0,1) + v1 * M(1,1) + v2 * M(2,1) + v3 * M(3,1);
-   u[2] = v0 * M(0,2) + v1 * M(1,2) + v2 * M(2,2) + v3 * M(3,2);
-   u[3] = v0 * M(0,3) + v1 * M(1,3) + v2 * M(2,3) + v3 * M(3,3);
-#undef M
-}
-
-
 /*
  * This is called only once.  It initializes several tables with pointers
  * to optimized transformation functions.  This is where we can test for
diff --git a/src/mesa/math/m_xform.h b/src/mesa/math/m_xform.h
index c8144c00ae..7ef76e0b92 100644
--- a/src/mesa/math/m_xform.h
+++ b/src/mesa/math/m_xform.h
@@ -41,10 +41,6 @@
 #endif
 
 
-extern void
-_mesa_transform_vector(GLfloat u[4], CONST GLfloat v[4], CONST GLfloat m[16]);
-
-
 extern void
 _math_init_transformation(void);
 
-- 
cgit v1.2.3


From 19dff5efc1e348d037b1b3cdfb9ac91020ecde4d Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 12 Feb 2009 09:21:50 -0700
Subject: mesa: don't include m_xform.h where not needed

---
 src/mesa/main/attrib.c   | 2 +-
 src/mesa/main/clip.c     | 1 -
 src/mesa/main/dlist.c    | 1 -
 src/mesa/main/enable.c   | 1 -
 src/mesa/main/matrix.c   | 1 -
 src/mesa/main/texenv.c   | 1 -
 src/mesa/main/texstate.c | 1 -
 7 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 218e0aeb6b..add0045959 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -56,7 +56,7 @@
 #include "texstate.h"
 #include "varray.h"
 #include "mtypes.h"
-#include "math/m_xform.h"
+
 
 /**
  * Special struct for saving/restoring texture state (GL_TEXTURE_BIT)
diff --git a/src/mesa/main/clip.c b/src/mesa/main/clip.c
index 43ef55ee3b..96c80e6ef8 100644
--- a/src/mesa/main/clip.c
+++ b/src/mesa/main/clip.c
@@ -29,7 +29,6 @@
 #include "macros.h"
 #include "mtypes.h"
 
-#include "math/m_xform.h"
 #include "math/m_matrix.h"
 
 
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index db1415bc06..76b3315034 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -85,7 +85,6 @@
 #endif
 
 #include "math/m_matrix.h"
-#include "math/m_xform.h"
 
 #include "glapi/dispatch.h"
 
diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index 2b54fac694..7ff3b15c84 100644
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -37,7 +37,6 @@
 #include "mtypes.h"
 #include "enums.h"
 #include "math/m_matrix.h"
-#include "math/m_xform.h"
 #include "api_arrayelt.h"
 
 
diff --git a/src/mesa/main/matrix.c b/src/mesa/main/matrix.c
index 0f96f94909..90d142278d 100644
--- a/src/mesa/main/matrix.c
+++ b/src/mesa/main/matrix.c
@@ -42,7 +42,6 @@
 #include "matrix.h"
 #include "mtypes.h"
 #include "math/m_matrix.h"
-#include "math/m_xform.h"
 
 
 /**
diff --git a/src/mesa/main/texenv.c b/src/mesa/main/texenv.c
index 097923182a..95547a500e 100644
--- a/src/mesa/main/texenv.c
+++ b/src/mesa/main/texenv.c
@@ -35,7 +35,6 @@
 #include "main/enums.h"
 #include "main/macros.h"
 #include "main/texenv.h"
-#include "math/m_xform.h"
 
 
 #define TE_ERROR(errCode, msg, value)				\
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 7761af7589..6586a48646 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -42,7 +42,6 @@
 #include "texstate.h"
 #include "texenvprogram.h"
 #include "mtypes.h"
-#include "math/m_xform.h"
 
 
 
-- 
cgit v1.2.3


From 5de5ab428cf5516d91daa3f193a76b0d87853f55 Mon Sep 17 00:00:00 2001
From: Robert Ellison <papillo@i965-laptop.(none)>
Date: Thu, 12 Feb 2009 13:47:36 -0700
Subject: glDrawBuffers(n==0) is valid

According to the GL spec, calling glDrawBuffers() with n == 0 is a
valid operation (and essentially prevents drawing to any buffers).
But _msa_DrawBuffersARB() was producing a GL_INVALID_VALUE error in
this case.

This fix adjusts the error check, and makes a small change to the
ctx->Driver.DrawBuffer() call below to ensure that, if n == 0,
Driver.DrawBuffer() is called with GL_NONE and that buffers[0] is
*not* referenced in this case (since we don't know whether it is valid).

Internal identifier: 365833
---
 src/mesa/main/buffers.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c
index 818d068a12..85db3868c4 100644
--- a/src/mesa/main/buffers.c
+++ b/src/mesa/main/buffers.c
@@ -290,7 +290,10 @@ _mesa_DrawBuffersARB(GLsizei n, const GLenum *buffers)
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
-   if (n < 1 || n > (GLsizei) ctx->Const.MaxDrawBuffers) {
+   /* Turns out n==0 is a valid input that should not produce an error.
+    * The remaining code below correctly handles the n==0 case.
+    */
+   if (n < 0 || n > (GLsizei) ctx->Const.MaxDrawBuffers) {
       _mesa_error(ctx, GL_INVALID_VALUE, "glDrawBuffersARB(n)");
       return;
    }
@@ -332,12 +335,14 @@ _mesa_DrawBuffersARB(GLsizei n, const GLenum *buffers)
    _mesa_drawbuffers(ctx, n, buffers, destMask);
 
    /*
-    * Call device driver function.
+    * Call device driver function.  Note that n can be equal to 0,
+    * in which case we don't want to reference buffers[0], which
+    * may not be valid.
     */
    if (ctx->Driver.DrawBuffers)
       ctx->Driver.DrawBuffers(ctx, n, buffers);
    else if (ctx->Driver.DrawBuffer)
-      ctx->Driver.DrawBuffer(ctx, buffers[0]);
+      ctx->Driver.DrawBuffer(ctx, n>0? buffers[0]:GL_NONE);
 }
 
 
-- 
cgit v1.2.3


From 6559107c7ae67ae6a94f53728cad85137aaf6312 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 13 Feb 2009 07:44:02 -0700
Subject: mesa: add additional texture size/limit assertions

---
 src/mesa/main/context.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 19ff5e552c..9705fd8a98 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -864,6 +864,9 @@ _mesa_init_constants(GLcontext *ctx)
    assert(MAX_TEXTURE_LEVELS >= MAX_3D_TEXTURE_LEVELS);
    assert(MAX_TEXTURE_LEVELS >= MAX_CUBE_TEXTURE_LEVELS);
 
+   /* Max texture size should be <= max viewport size (render to texture) */
+   assert((1 << (MAX_TEXTURE_LEVELS - 1)) <= MAX_WIDTH);
+
    /* Constants, may be overriden (usually only reduced) by device drivers */
    ctx->Const.MaxTextureLevels = MAX_TEXTURE_LEVELS;
    ctx->Const.Max3DTextureLevels = MAX_3D_TEXTURE_LEVELS;
@@ -960,13 +963,18 @@ check_context_limits(GLcontext *ctx)
    /* number of coord units cannot be greater than number of image units */
    assert(ctx->Const.MaxTextureCoordUnits <= ctx->Const.MaxTextureImageUnits);
 
-   assert(ctx->Const.MaxViewportWidth <= MAX_WIDTH);
-   assert(ctx->Const.MaxViewportHeight <= MAX_WIDTH);
+   assert(ctx->Const.MaxTextureLevels <= MAX_TEXTURE_LEVELS);
+   assert(ctx->Const.Max3DTextureLevels <= MAX_3D_TEXTURE_LEVELS);
+   assert(ctx->Const.MaxCubeTextureLevels <= MAX_CUBE_TEXTURE_LEVELS);
+   assert(ctx->Const.MaxTextureRectSize <= MAX_TEXTURE_RECT_SIZE);
 
    /* make sure largest texture image is <= MAX_WIDTH in size */
-   assert((1 << (ctx->Const.MaxTextureLevels -1 )) <= MAX_WIDTH);
-   assert((1 << (ctx->Const.MaxCubeTextureLevels -1 )) <= MAX_WIDTH);
-   assert((1 << (ctx->Const.Max3DTextureLevels -1 )) <= MAX_WIDTH);
+   assert((1 << (ctx->Const.MaxTextureLevels - 1)) <= MAX_WIDTH);
+   assert((1 << (ctx->Const.MaxCubeTextureLevels - 1)) <= MAX_WIDTH);
+   assert((1 << (ctx->Const.Max3DTextureLevels - 1)) <= MAX_WIDTH);
+
+   assert(ctx->Const.MaxViewportWidth <= MAX_WIDTH);
+   assert(ctx->Const.MaxViewportHeight <= MAX_WIDTH);
 
    assert(ctx->Const.MaxDrawBuffers <= MAX_DRAW_BUFFERS);
 
-- 
cgit v1.2.3


From 88b702e8c47c8930940c396132b2a191d4a3e7ca Mon Sep 17 00:00:00 2001
From: Robert Ellison <papillo@i965-laptop.(none)>
Date: Fri, 13 Feb 2009 15:19:04 -0700
Subject: i965: Eric Anholt's patch for bumping up texture sizes

I'm committing this because it fixes a conform failure; the failure occurs
on the TextureProxy test, where the test attempts to create proxy textures
at every level, but fails at the last level (border == 1, width == 1,
height == 1) because it's beyond MAX_TEXTURE_LEVELS.

Eric's original comment was:

idr said that in his review swrast was ready for it, and the 965 driver is
advertising it already though it has been resulting in many crashes due to
arrays using these defines not being big enough.
---
 src/mesa/main/config.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index c3feffda98..9d0cd18e05 100644
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -101,16 +101,16 @@
 #define MAX_COLOR_TABLE_SIZE 256
 
 /** Number of 1D/2D texture mipmap levels */
-#define MAX_TEXTURE_LEVELS 12
+#define MAX_TEXTURE_LEVELS 13
 
 /** Number of 3D texture mipmap levels */
 #define MAX_3D_TEXTURE_LEVELS 9
 
 /** Number of cube texture mipmap levels - GL_ARB_texture_cube_map */
-#define MAX_CUBE_TEXTURE_LEVELS 12
+#define MAX_CUBE_TEXTURE_LEVELS 13
 
 /** Maximum rectangular texture size - GL_NV_texture_rectangle */
-#define MAX_TEXTURE_RECT_SIZE 2048
+#define MAX_TEXTURE_RECT_SIZE 4096
 
 /** Maximum number of layers in a 1D or 2D array texture - GL_MESA_texture_array */
 #define MAX_ARRAY_TEXTURE_LAYERS 64
@@ -166,7 +166,7 @@
 #define MAX_TEXTURE_MAX_ANISOTROPY 16.0
 
 /** For GL_EXT_texture_lod_bias (typically MAX_TEXTURE_LEVELS - 1) */
-#define MAX_TEXTURE_LOD_BIAS 11.0
+#define MAX_TEXTURE_LOD_BIAS 12.0
 
 /** For GL_ARB_vertex_program */
 /*@{*/
-- 
cgit v1.2.3


From f59719c6c70d6b2a36d329b4cf02a079444cbca7 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 17 Feb 2009 16:12:49 -0700
Subject: mesa: turn on reporting of GLSL version 1.20

The new array features, precision/invariant/centroid qualifiers, etc. were
done a while back.  The glGetString(GL_SHADING_LANGUAGE_VERSION) query returns
"1.20" now (for drivers that support it anyway).
---
 src/mesa/main/extensions.c | 4 ++--
 src/mesa/main/getstring.c  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 1b31e283cd..9c8bd13e69 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -208,7 +208,7 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
    ctx->Extensions.ARB_shading_language_100 = GL_TRUE;
 #endif
 #if FEATURE_ARB_shading_language_120
-   ctx->Extensions.ARB_shading_language_120 = GL_FALSE; /* not quite done */
+   ctx->Extensions.ARB_shading_language_120 = GL_TRUE;
 #endif
    ctx->Extensions.ARB_shadow = GL_TRUE;
    ctx->Extensions.ARB_shadow_ambient = GL_TRUE;
@@ -433,7 +433,7 @@ _mesa_enable_2_1_extensions(GLcontext *ctx)
    ctx->Extensions.EXT_texture_sRGB = GL_TRUE;
 #endif
 #ifdef FEATURE_ARB_shading_language_120
-   ctx->Extensions.ARB_shading_language_120 = GL_FALSE; /* not quite done */
+   ctx->Extensions.ARB_shading_language_120 = GL_TRUE;
 #endif
 }
 
diff --git a/src/mesa/main/getstring.c b/src/mesa/main/getstring.c
index a9e22d340a..a42c44686d 100644
--- a/src/mesa/main/getstring.c
+++ b/src/mesa/main/getstring.c
@@ -93,7 +93,7 @@ compute_version(const GLcontext *ctx)
 			      (ctx->Extensions.EXT_stencil_two_side
 			       || ctx->Extensions.ATI_separate_stencil));
    const GLboolean ver_2_1 = (ver_2_0 &&
-                              /*ctx->Extensions.ARB_shading_language_120 &&*/
+                              ctx->Extensions.ARB_shading_language_120 &&
                               ctx->Extensions.EXT_pixel_buffer_object &&
                               ctx->Extensions.EXT_texture_sRGB);
    if (ver_2_1)
-- 
cgit v1.2.3


From 9f731c8962e536965a04635ef8aa135691b32a35 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 17 Feb 2009 16:47:54 -0700
Subject: mesa: add some debug code to help diagnose incomplete FBO attachments
 (disabled)

---
 src/mesa/main/fbobject.c | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index c3cdc11037..23b3fb68fb 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -302,6 +302,20 @@ _mesa_framebuffer_renderbuffer(GLcontext *ctx, struct gl_framebuffer *fb,
 }
 
 
+/**
+ * For debug only.
+ */
+static void
+att_incomplete(const char *msg)
+{
+#if 0
+   _mesa_printf("attachment incomplete: %s\n", msg);
+#else
+   (void) msg;
+#endif
+}
+
+
 /**
  * Test if an attachment point is complete and update its Complete field.
  * \param format if GL_COLOR, this is a color attachment point,
@@ -323,20 +337,26 @@ test_attachment_completeness(const GLcontext *ctx, GLenum format,
       struct gl_texture_image *texImage;
 
       if (!texObj) {
+         att_incomplete("no texobj");
          att->Complete = GL_FALSE;
          return;
       }
 
       texImage = texObj->Image[att->CubeMapFace][att->TextureLevel];
       if (!texImage) {
+         att_incomplete("no teximage");
          att->Complete = GL_FALSE;
          return;
       }
       if (texImage->Width < 1 || texImage->Height < 1) {
+         att_incomplete("teximage width/height=0");
+         _mesa_printf("texobj = %u\n", texObj->Name);
+         _mesa_printf("level = %d\n", att->TextureLevel);
          att->Complete = GL_FALSE;
          return;
       }
       if (texObj->Target == GL_TEXTURE_3D && att->Zoffset >= texImage->Depth) {
+         att_incomplete("bad z offset");
          att->Complete = GL_FALSE;
          return;
       }
@@ -344,6 +364,7 @@ test_attachment_completeness(const GLcontext *ctx, GLenum format,
       if (format == GL_COLOR) {
          if (texImage->TexFormat->BaseFormat != GL_RGB &&
              texImage->TexFormat->BaseFormat != GL_RGBA) {
+            att_incomplete("bad format");
             att->Complete = GL_FALSE;
             return;
          }
@@ -358,11 +379,13 @@ test_attachment_completeness(const GLcontext *ctx, GLenum format,
          }
          else {
             att->Complete = GL_FALSE;
+            att_incomplete("bad depth format");
             return;
          }
       }
       else {
          /* no such thing as stencil textures */
+         att_incomplete("illegal stencil texture");
          att->Complete = GL_FALSE;
          return;
       }
@@ -372,6 +395,7 @@ test_attachment_completeness(const GLcontext *ctx, GLenum format,
       if (!att->Renderbuffer->InternalFormat ||
           att->Renderbuffer->Width < 1 ||
           att->Renderbuffer->Height < 1) {
+         att_incomplete("0x0 renderbuffer");
          att->Complete = GL_FALSE;
          return;
       }
@@ -381,6 +405,7 @@ test_attachment_completeness(const GLcontext *ctx, GLenum format,
             ASSERT(att->Renderbuffer->RedBits);
             ASSERT(att->Renderbuffer->GreenBits);
             ASSERT(att->Renderbuffer->BlueBits);
+            att_incomplete("bad renderbuffer color format");
             att->Complete = GL_FALSE;
             return;
          }
@@ -395,6 +420,7 @@ test_attachment_completeness(const GLcontext *ctx, GLenum format,
             /* OK */
          }
          else {
+            att_incomplete("bad renderbuffer depth format");
             att->Complete = GL_FALSE;
             return;
          }
@@ -411,6 +437,7 @@ test_attachment_completeness(const GLcontext *ctx, GLenum format,
          }
          else {
             att->Complete = GL_FALSE;
+            att_incomplete("bad renderbuffer stencil format");
             return;
          }
       }
-- 
cgit v1.2.3


From 5b2f8dc01300058d43d8043aa897722f39657e93 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 18 Feb 2009 11:47:40 -0700
Subject: mesa: increase MAX_UNIFORMS to 1024 (of vec4 type)

Old limit was 256.  Note that no arrays are declared to this size.
The only place we have to be careful about raising this limit is the
prog_src/dst_register Index bitfields.  These have been bumped up too.

Added assertions to check we don't exceed the bitfield in the future too.
---
 src/mesa/main/config.h             |  2 +-
 src/mesa/shader/prog_instruction.h | 16 ++++++++++++----
 src/mesa/shader/program.c          |  9 +++++++++
 3 files changed, 22 insertions(+), 5 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index 9d0cd18e05..7044b61e4a 100644
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -189,7 +189,7 @@
 #define MAX_PROGRAM_CALL_DEPTH 8
 #define MAX_PROGRAM_TEMPS 128
 #define MAX_PROGRAM_ADDRESS_REGS 2
-#define MAX_UNIFORMS 256   /**< number of vec4 uniforms */
+#define MAX_UNIFORMS 1024  /**< number of vec4 uniforms */
 #define MAX_VARYING 8      /**< number of float[4] vectors */
 #define MAX_SAMPLERS MAX_TEXTURE_IMAGE_UNITS
 #define MAX_PROGRAM_INPUTS 32
diff --git a/src/mesa/shader/prog_instruction.h b/src/mesa/shader/prog_instruction.h
index c649b3db5e..48e7b04c98 100644
--- a/src/mesa/shader/prog_instruction.h
+++ b/src/mesa/shader/prog_instruction.h
@@ -239,13 +239,22 @@ typedef enum prog_opcode {
 } gl_inst_opcode;
 
 
+/**
+ * Number of bits for the src/dst register Index field.
+ * This limits the size of temp/uniform register files.
+ */
+#define INST_INDEX_BITS 10
+
+
 /**
  * Instruction source register.
  */
 struct prog_src_register
 {
    GLuint File:4;	/**< One of the PROGRAM_* register file values. */
-   GLint Index:9;	/**< May be negative for relative addressing. */
+   GLint Index:(INST_INDEX_BITS+1); /**< Extra bit here for sign bit.
+                                     * May be negative for relative addressing.
+                                     */
    GLuint Swizzle:12;
    GLuint RelAddr:1;
 
@@ -289,7 +298,7 @@ struct prog_src_register
 struct prog_dst_register
 {
    GLuint File:4;      /**< One of the PROGRAM_* register file values */
-   GLuint Index:8;
+   GLuint Index:INST_INDEX_BITS;  /**< Unsigned, never negative */
    GLuint WriteMask:4;
    GLuint RelAddr:1;
 
@@ -322,8 +331,7 @@ struct prog_dst_register
     */
    GLuint CondSrc:1;
    /*@}*/
-
-   GLuint pad:30;
+   GLuint pad:28;
 };
 
 
diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c
index 7a3b827352..00655f0288 100644
--- a/src/mesa/shader/program.c
+++ b/src/mesa/shader/program.c
@@ -53,6 +53,15 @@ _mesa_init_program(GLcontext *ctx)
 {
    GLuint i;
 
+   /*
+    * If this assertion fails, we need to increase the field
+    * size for register indexes.
+    */
+   ASSERT(ctx->Const.VertexProgram.MaxUniformComponents / 4
+          <= (1 << INST_INDEX_BITS));
+   ASSERT(ctx->Const.FragmentProgram.MaxUniformComponents / 4
+          <= (1 << INST_INDEX_BITS));
+
    ctx->Program.ErrorPos = -1;
    ctx->Program.ErrorString = _mesa_strdup("");
 
-- 
cgit v1.2.3


From 5761c64823c10093c0f72bc8a62c99b86362e4e5 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 18 Feb 2009 17:50:24 -0700
Subject: mesa: convert VERT_RESULT_* from #defines to enum, like the others

---
 src/mesa/main/mtypes.h | 45 ++++++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 21 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index be982afe39..3c3214490a 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1,9 +1,9 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.3
+ * Version:  7.5
  *
- * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
- * Copyright (C) 1999-2008  VMware, Inc.  All Rights Reserved.
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -226,24 +226,27 @@ enum
  * Indexes for vertex program result attributes
  */
 /*@{*/
-#define VERT_RESULT_HPOS 0
-#define VERT_RESULT_COL0 1
-#define VERT_RESULT_COL1 2
-#define VERT_RESULT_FOGC 3
-#define VERT_RESULT_TEX0 4
-#define VERT_RESULT_TEX1 5
-#define VERT_RESULT_TEX2 6
-#define VERT_RESULT_TEX3 7
-#define VERT_RESULT_TEX4 8
-#define VERT_RESULT_TEX5 9
-#define VERT_RESULT_TEX6 10
-#define VERT_RESULT_TEX7 11
-#define VERT_RESULT_PSIZ 12
-#define VERT_RESULT_BFC0 13
-#define VERT_RESULT_BFC1 14
-#define VERT_RESULT_EDGE 15
-#define VERT_RESULT_VAR0 16  /**< shader varying */
-#define VERT_RESULT_MAX  (VERT_RESULT_VAR0 + MAX_VARYING)
+enum
+{
+   VERT_RESULT_HPOS = 0,
+   VERT_RESULT_COL0 = 1,
+   VERT_RESULT_COL1 = 2,
+   VERT_RESULT_FOGC = 3,
+   VERT_RESULT_TEX0 = 4,
+   VERT_RESULT_TEX1 = 5,
+   VERT_RESULT_TEX2 = 6,
+   VERT_RESULT_TEX3 = 7,
+   VERT_RESULT_TEX4 = 8,
+   VERT_RESULT_TEX5 = 9,
+   VERT_RESULT_TEX6 = 10,
+   VERT_RESULT_TEX7 = 11,
+   VERT_RESULT_PSIZ = 12,
+   VERT_RESULT_BFC0 = 13,
+   VERT_RESULT_BFC1 = 14,
+   VERT_RESULT_EDGE = 15,
+   VERT_RESULT_VAR0 = 16  /**< shader varying */,
+   VERT_RESULT_MAX = (VERT_RESULT_VAR0 + MAX_VARYING)
+};
 /*@}*/
 
 
-- 
cgit v1.2.3


From 2a968113a925845331f0532a5a20d9fa1502c118 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 19 Feb 2009 14:34:33 -0700
Subject: mesa: initialize ctx->Stencil._BackFace = 1

Back-face stencil operations didn't work correctly because this value was
zero.  It needs to be 1 or 2.  The only place it's set otherwise is in
glEnable/Disable(GL_STENCIL_TEST_TWO_SIDE_EXT).
---
 src/mesa/main/stencil.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/stencil.c b/src/mesa/main/stencil.c
index b4ea9978d8..6d6bbb2286 100644
--- a/src/mesa/main/stencil.c
+++ b/src/mesa/main/stencil.c
@@ -565,4 +565,5 @@ _mesa_init_stencil(GLcontext *ctx)
    ctx->Stencil.WriteMask[1] = ~0U;
    ctx->Stencil.WriteMask[2] = ~0U;
    ctx->Stencil.Clear = 0;
+   ctx->Stencil._BackFace = 1;
 }
-- 
cgit v1.2.3


From a304cc6cca2ee21c3b25041abf882ef0616e5244 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 19 Feb 2009 14:36:58 -0700
Subject: mesa: fix/update/restore comments related to two-sided stencil

---
 src/mesa/main/mtypes.h  |  2 +-
 src/mesa/main/stencil.c | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 3c3214490a..235d6b6bb5 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1133,7 +1133,7 @@ struct gl_stencil_attrib
    GLboolean TestTwoSide;	/**< GL_EXT_stencil_two_side */
    GLubyte ActiveFace;		/**< GL_EXT_stencil_two_side (0 or 2) */
    GLboolean _TestTwoSide;
-   GLubyte _BackFace;
+   GLubyte _BackFace;           /**< Current back stencil state (1 or 2) */
    GLenum Function[3];		/**< Stencil function */
    GLenum FailFunc[3];		/**< Fail function */
    GLenum ZPassFunc[3];		/**< Depth buffer pass function */
diff --git a/src/mesa/main/stencil.c b/src/mesa/main/stencil.c
index 6d6bbb2286..e4a255d0a7 100644
--- a/src/mesa/main/stencil.c
+++ b/src/mesa/main/stencil.c
@@ -27,6 +27,23 @@
  * \file stencil.c
  * Stencil operations.
  *
+ * Note: There's some conflict between GL_EXT_stencil_two_side and
+ * OpenGL 2.0's two-sided stencil feature.
+ *
+ * With GL_EXT_stencil_two_side, calling glStencilOp/Func/Mask() only the
+ * front OR back face state (as set by glActiveStencilFaceEXT) is set.
+ *
+ * But with OpenGL 2.0, calling glStencilOp/Func/Mask() sets BOTH the
+ * front AND back state.
+ *
+ * Also, note that GL_ATI_separate_stencil is different as well:
+ * glStencilFuncSeparateATI(GLenum frontfunc, GLenum backfunc, ...)  vs.
+ * glStencilFuncSeparate(GLenum face, GLenum func, ...).
+ *
+ * This problem is solved by keeping three sets of stencil state:
+ *  state[0] = GL_FRONT state.
+ *  state[1] = OpenGL 2.0 / GL_ATI_separate_stencil GL_BACK state.
+ *  state[2] = GL_EXT_stencil_two_side GL_BACK state.
  */
 
 
@@ -542,7 +559,7 @@ _mesa_init_stencil(GLcontext *ctx)
 {
    ctx->Stencil.Enabled = GL_FALSE;
    ctx->Stencil.TestTwoSide = GL_FALSE;
-   ctx->Stencil.ActiveFace = 0;  /* 0 = GL_FRONT, 1 = GL_BACK */
+   ctx->Stencil.ActiveFace = 0;  /* 0 = GL_FRONT, 2 = GL_BACK */
    ctx->Stencil.Function[0] = GL_ALWAYS;
    ctx->Stencil.Function[1] = GL_ALWAYS;
    ctx->Stencil.Function[2] = GL_ALWAYS;
-- 
cgit v1.2.3


From 44e018c09e7aeba9fd9f4c380da224bd6622c470 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 20 Feb 2009 13:42:08 -0700
Subject: mesa: add TexShadow field to prog_instruction

If the instruction is TEX/TXP/TXL/etc the TexShadow field will be true if
the instruction is a texture fetch with shadow compare.
---
 src/mesa/main/texenvprogram.c      | 19 +++++++++++++------
 src/mesa/shader/arbprogparse.c     |  3 +++
 src/mesa/shader/prog_instruction.h |  3 +++
 src/mesa/shader/prog_print.c       |  2 ++
 4 files changed, 21 insertions(+), 6 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index af51a206a5..d2a9e35dd5 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -736,6 +736,7 @@ static struct ureg emit_texld( struct texenv_fragment_program *p,
 			       GLuint destmask,
 			       GLuint tex_unit,
 			       GLuint tex_idx,
+                               GLuint tex_shadow,
 			       struct ureg coord )
 {
    struct prog_instruction *inst = emit_op( p, op, 
@@ -747,6 +748,7 @@ static struct ureg emit_texld( struct texenv_fragment_program *p,
    
    inst->TexSrcTarget = tex_idx;
    inst->TexSrcUnit = tex_unit;
+   inst->TexShadow = tex_shadow;
 
    p->program->Base.NumTexInstructions++;
 
@@ -1160,22 +1162,27 @@ emit_texenv(struct texenv_fragment_program *p, GLuint unit)
 static void load_texture( struct texenv_fragment_program *p, GLuint unit )
 {
    if (is_undef(p->src_texture[unit])) {
-      GLuint dim = p->state->unit[unit].source_index;
+      GLuint texTarget = p->state->unit[unit].source_index;
       struct ureg texcoord = register_input(p, FRAG_ATTRIB_TEX0+unit);
       struct ureg tmp = get_tex_temp( p );
 
-      if (dim == TEXTURE_UNKNOWN_INDEX)
+      if (texTarget == TEXTURE_UNKNOWN_INDEX)
          program_error(p, "TexSrcBit");
 			  
       /* TODO: Use D0_MASK_XY where possible.
        */
       if (p->state->unit[unit].enabled) {
-	 p->src_texture[unit] = emit_texld( p, OPCODE_TXP,
-					    tmp, WRITEMASK_XYZW, 
-					    unit, dim, texcoord );
+         GLboolean shadow = GL_FALSE;
 
-	 if (p->state->unit[unit].shadow)
+	 if (p->state->unit[unit].shadow) {
 	    p->program->Base.ShadowSamplers |= 1 << unit;
+            shadow = GL_TRUE;
+         }
+
+	 p->src_texture[unit] = emit_texld( p, OPCODE_TXP,
+					    tmp, WRITEMASK_XYZW, 
+					    unit, texTarget, shadow,
+                                            texcoord );
 
          p->program->Base.SamplersUsed |= (1 << unit);
          /* This identity mapping should already be in place
diff --git a/src/mesa/shader/arbprogparse.c b/src/mesa/shader/arbprogparse.c
index 2e0fc3694a..62edb7f595 100644
--- a/src/mesa/shader/arbprogparse.c
+++ b/src/mesa/shader/arbprogparse.c
@@ -3104,6 +3104,9 @@ parse_fp_instruction (GLcontext * ctx, const GLubyte ** inst,
                break;
          }
 
+         if (shadow_tex)
+            fp->TexShadow = 1;
+
          /* Don't test the first time a particular sampler is seen.  Each time
           * after that, make sure the shadow state is the same.
           */
diff --git a/src/mesa/shader/prog_instruction.h b/src/mesa/shader/prog_instruction.h
index 84dd98b498..e3bb7ac01d 100644
--- a/src/mesa/shader/prog_instruction.h
+++ b/src/mesa/shader/prog_instruction.h
@@ -396,6 +396,9 @@ struct prog_instruction
    
    /** Source texture target, one of TEXTURE_{1D,2D,3D,CUBE,RECT}_INDEX */
    GLuint TexSrcTarget:3;
+
+   /** True if tex instruction should do shadow comparison */
+   GLuint TexShadow:1;
    /*@}*/
 
    /**
diff --git a/src/mesa/shader/prog_print.c b/src/mesa/shader/prog_print.c
index 516ea73301..80be51c3c5 100644
--- a/src/mesa/shader/prog_print.c
+++ b/src/mesa/shader/prog_print.c
@@ -592,6 +592,8 @@ _mesa_fprint_instruction_opt(FILE *f,
       default:
          ;
       }
+      if (inst->TexShadow)
+         _mesa_fprintf(f, " SHADOW");
       fprint_comment(f, inst);
       break;
 
-- 
cgit v1.2.3


From 9705cff2033f1771a39ac3bb78eb5fcea522218a Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Sat, 21 Feb 2009 13:23:04 -0700
Subject: mesa: re-org texgen state

New gl_texgen struct allows quite a bit of code reduction.
---
 src/mesa/drivers/dri/r200/r200_texstate.c     |  42 +-
 src/mesa/drivers/dri/radeon/radeon_texstate.c |  24 +-
 src/mesa/main/attrib.c                        |  32 +-
 src/mesa/main/ffvertex_prog.c                 |   8 +-
 src/mesa/main/mtypes.h                        |  40 +-
 src/mesa/main/texgen.c                        | 588 +++++++-------------------
 src/mesa/main/texstate.c                      |  65 ++-
 src/mesa/shader/prog_statevars.c              |  16 +-
 src/mesa/tnl/t_rasterpos.c                    |  24 +-
 src/mesa/tnl/t_vb_texgen.c                    |  24 +-
 10 files changed, 295 insertions(+), 568 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/r200/r200_texstate.c b/src/mesa/drivers/dri/r200/r200_texstate.c
index 3f9a2f4ac1..0ad5651cd4 100644
--- a/src/mesa/drivers/dri/r200/r200_texstate.c
+++ b/src/mesa/drivers/dri/r200/r200_texstate.c
@@ -1366,27 +1366,27 @@ static GLboolean r200_validate_texgen( GLcontext *ctx, GLuint unit )
       fprintf(stderr, "%s unit %d\n", __FUNCTION__, unit);
 
    if (texUnit->TexGenEnabled & S_BIT) {
-      mode = texUnit->GenModeS;
+      mode = texUnit->GenS.Mode;
    } else {
       tgcm |= R200_TEXGEN_COMP_S << (unit * 4);
    }
 
    if (texUnit->TexGenEnabled & T_BIT) {
-      if (texUnit->GenModeT != mode)
+      if (texUnit->GenT.Mode != mode)
 	 mixed_fallback = GL_TRUE;
    } else {
       tgcm |= R200_TEXGEN_COMP_T << (unit * 4);
    }
 
    if (texUnit->TexGenEnabled & R_BIT) {
-      if (texUnit->GenModeR != mode)
+      if (texUnit->GenR.Mode != mode)
 	 mixed_fallback = GL_TRUE;
    } else {
       tgcm |= R200_TEXGEN_COMP_R << (unit * 4);
    }
 
    if (texUnit->TexGenEnabled & Q_BIT) {
-      if (texUnit->GenModeQ != mode)
+      if (texUnit->GenQ.Mode != mode)
 	 mixed_fallback = GL_TRUE;
    } else {
       tgcm |= R200_TEXGEN_COMP_Q << (unit * 4);
@@ -1395,8 +1395,8 @@ static GLboolean r200_validate_texgen( GLcontext *ctx, GLuint unit )
    if (mixed_fallback) {
       if (R200_DEBUG & DEBUG_FALLBACKS)
 	 fprintf(stderr, "fallback mixed texgen, 0x%x (0x%x 0x%x 0x%x 0x%x)\n",
-		 texUnit->TexGenEnabled, texUnit->GenModeS, texUnit->GenModeT,
-		 texUnit->GenModeR, texUnit->GenModeQ);
+		 texUnit->TexGenEnabled, texUnit->GenS.Mode, texUnit->GenT.Mode,
+		 texUnit->GenR.Mode, texUnit->GenQ.Mode);
       return GL_FALSE;
    }
 
@@ -1414,8 +1414,10 @@ static GLboolean r200_validate_texgen( GLcontext *ctx, GLuint unit )
    switch (mode) {
    case GL_OBJECT_LINEAR: {
       GLuint needtgenable = r200_need_dis_texgen( texUnit->TexGenEnabled,
-				texUnit->ObjectPlaneS, texUnit->ObjectPlaneT,
-				texUnit->ObjectPlaneR, texUnit->ObjectPlaneQ );
+                                                  texUnit->GenS.ObjectPlane,
+                                                  texUnit->GenT.ObjectPlane,
+                                                  texUnit->GenR.ObjectPlane,
+                                                  texUnit->GenQ.ObjectPlane );
       if (needtgenable & (S_BIT | T_BIT)) {
 	 if (R200_DEBUG & DEBUG_FALLBACKS)
 	 fprintf(stderr, "fallback mixed texgen / obj plane, 0x%x\n",
@@ -1431,17 +1433,19 @@ static GLboolean r200_validate_texgen( GLcontext *ctx, GLuint unit )
 
       tgi |= R200_TEXGEN_INPUT_OBJ << inputshift;
       set_texgen_matrix( rmesa, unit, 
-	 (texUnit->TexGenEnabled & S_BIT) ? texUnit->ObjectPlaneS : I,
-	 (texUnit->TexGenEnabled & T_BIT) ? texUnit->ObjectPlaneT : I + 4,
-	 (texUnit->TexGenEnabled & R_BIT) ? texUnit->ObjectPlaneR : I + 8,
-	 (texUnit->TexGenEnabled & Q_BIT) ? texUnit->ObjectPlaneQ : I + 12);
+	 (texUnit->TexGenEnabled & S_BIT) ? texUnit->GenS.ObjectPlane : I,
+	 (texUnit->TexGenEnabled & T_BIT) ? texUnit->GenT.ObjectPlane : I + 4,
+	 (texUnit->TexGenEnabled & R_BIT) ? texUnit->GenR.ObjectPlane : I + 8,
+	 (texUnit->TexGenEnabled & Q_BIT) ? texUnit->GenQ.ObjectPlane : I + 12);
       }
       break;
 
    case GL_EYE_LINEAR: {
       GLuint needtgenable = r200_need_dis_texgen( texUnit->TexGenEnabled,
-				texUnit->EyePlaneS, texUnit->EyePlaneT,
-				texUnit->EyePlaneR, texUnit->EyePlaneQ );
+                                                  texUnit->GenS.EyePlane,
+                                                  texUnit->GenT.EyePlane,
+                                                  texUnit->GenR.EyePlane,
+                                                  texUnit->GenQ.EyePlane );
       if (needtgenable & (S_BIT | T_BIT)) {
 	 if (R200_DEBUG & DEBUG_FALLBACKS)
 	 fprintf(stderr, "fallback mixed texgen / eye plane, 0x%x\n",
@@ -1456,10 +1460,10 @@ static GLboolean r200_validate_texgen( GLcontext *ctx, GLuint unit )
       }
       tgi |= R200_TEXGEN_INPUT_EYE << inputshift;
       set_texgen_matrix( rmesa, unit,
-	 (texUnit->TexGenEnabled & S_BIT) ? texUnit->EyePlaneS : I,
-	 (texUnit->TexGenEnabled & T_BIT) ? texUnit->EyePlaneT : I + 4,
-	 (texUnit->TexGenEnabled & R_BIT) ? texUnit->EyePlaneR : I + 8,
-	 (texUnit->TexGenEnabled & Q_BIT) ? texUnit->EyePlaneQ : I + 12);
+	 (texUnit->TexGenEnabled & S_BIT) ? texUnit->GenS.EyePlane : I,
+	 (texUnit->TexGenEnabled & T_BIT) ? texUnit->GenT.EyePlane : I + 4,
+	 (texUnit->TexGenEnabled & R_BIT) ? texUnit->GenR.EyePlane : I + 8,
+	 (texUnit->TexGenEnabled & Q_BIT) ? texUnit->GenQ.EyePlane : I + 12);
       }
       break;
 
@@ -1495,7 +1499,7 @@ static GLboolean r200_validate_texgen( GLcontext *ctx, GLuint unit )
        */
       if (R200_DEBUG & DEBUG_FALLBACKS)
 	 fprintf(stderr, "fallback unsupported texgen, %d\n",
-		 texUnit->GenModeS);
+		 texUnit->GenS.Mode);
       return GL_FALSE;
    }
 
diff --git a/src/mesa/drivers/dri/radeon/radeon_texstate.c b/src/mesa/drivers/dri/radeon/radeon_texstate.c
index 1e2f654add..b165205c09 100644
--- a/src/mesa/drivers/dri/radeon/radeon_texstate.c
+++ b/src/mesa/drivers/dri/radeon/radeon_texstate.c
@@ -1023,11 +1023,11 @@ static GLboolean radeon_validate_texgen( GLcontext *ctx, GLuint unit )
     */
    else if ( (texUnit->TexGenEnabled & S_BIT) &&
 	     (texUnit->TexGenEnabled & T_BIT) &&
-	     (texUnit->GenModeS == texUnit->GenModeT) ) {
+	     (texUnit->GenS.Mode == texUnit->GenT.Mode) ) {
       if ( ((texUnit->TexGenEnabled & R_BIT) &&
-	    (texUnit->GenModeS != texUnit->GenModeR)) ||
+	    (texUnit->GenS.Mode != texUnit->GenR.Mode)) ||
 	   ((texUnit->TexGenEnabled & Q_BIT) &&
-	    (texUnit->GenModeS != texUnit->GenModeQ)) ) {
+	    (texUnit->GenS.Mode != texUnit->GenQ.Mode)) ) {
 	 /* Mixed modes, fallback:
 	  */
 	 if (RADEON_DEBUG & DEBUG_FALLBACKS)
@@ -1051,23 +1051,23 @@ static GLboolean radeon_validate_texgen( GLcontext *ctx, GLuint unit )
       rmesa->hw.tcl.cmd[TCL_OUTPUT_VTXFMT] |= RADEON_Q_BIT(unit);
    }
 
-   switch (texUnit->GenModeS) {
+   switch (texUnit->GenS.Mode) {
    case GL_OBJECT_LINEAR:
       rmesa->TexGenEnabled |= RADEON_TEXGEN_INPUT_OBJ << inputshift;
       set_texgen_matrix( rmesa, unit,
-			 texUnit->ObjectPlaneS,
-			 texUnit->ObjectPlaneT,
-			 texUnit->ObjectPlaneR,
-			 texUnit->ObjectPlaneQ);
+			 texUnit->GenS.ObjectPlane,
+			 texUnit->GenT.ObjectPlane,
+			 texUnit->GenR.ObjectPlane,
+			 texUnit->GenQ.ObjectPlane);
       break;
 
    case GL_EYE_LINEAR:
       rmesa->TexGenEnabled |= RADEON_TEXGEN_INPUT_EYE << inputshift;
       set_texgen_matrix( rmesa, unit,
-			 texUnit->EyePlaneS,
-			 texUnit->EyePlaneT,
-			 texUnit->EyePlaneR,
-			 texUnit->EyePlaneQ);
+			 texUnit->GenS.EyePlane,
+			 texUnit->GenT.EyePlane,
+			 texUnit->GenR.EyePlane,
+			 texUnit->GenQ.EyePlane);
       break;
 
    case GL_REFLECTION_MAP_NV:
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index add0045959..dc33eb1fac 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -699,26 +699,26 @@ pop_texture_group(GLcontext *ctx, struct texture_state *texstate)
       }
       _mesa_TexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, unit->EnvMode);
       _mesa_TexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, unit->EnvColor);
-      _mesa_TexGeni(GL_S, GL_TEXTURE_GEN_MODE, unit->GenModeS);
-      _mesa_TexGeni(GL_T, GL_TEXTURE_GEN_MODE, unit->GenModeT);
-      _mesa_TexGeni(GL_R, GL_TEXTURE_GEN_MODE, unit->GenModeR);
-      _mesa_TexGeni(GL_Q, GL_TEXTURE_GEN_MODE, unit->GenModeQ);
-      _mesa_TexGenfv(GL_S, GL_OBJECT_PLANE, unit->ObjectPlaneS);
-      _mesa_TexGenfv(GL_T, GL_OBJECT_PLANE, unit->ObjectPlaneT);
-      _mesa_TexGenfv(GL_R, GL_OBJECT_PLANE, unit->ObjectPlaneR);
-      _mesa_TexGenfv(GL_Q, GL_OBJECT_PLANE, unit->ObjectPlaneQ);
+      _mesa_TexGeni(GL_S, GL_TEXTURE_GEN_MODE, unit->GenS.Mode);
+      _mesa_TexGeni(GL_T, GL_TEXTURE_GEN_MODE, unit->GenT.Mode);
+      _mesa_TexGeni(GL_R, GL_TEXTURE_GEN_MODE, unit->GenR.Mode);
+      _mesa_TexGeni(GL_Q, GL_TEXTURE_GEN_MODE, unit->GenQ.Mode);
+      _mesa_TexGenfv(GL_S, GL_OBJECT_PLANE, unit->GenS.ObjectPlane);
+      _mesa_TexGenfv(GL_T, GL_OBJECT_PLANE, unit->GenT.ObjectPlane);
+      _mesa_TexGenfv(GL_R, GL_OBJECT_PLANE, unit->GenR.ObjectPlane);
+      _mesa_TexGenfv(GL_Q, GL_OBJECT_PLANE, unit->GenQ.ObjectPlane);
       /* Eye plane done differently to avoid re-transformation */
       {
          struct gl_texture_unit *destUnit = &ctx->Texture.Unit[u];
-         COPY_4FV(destUnit->EyePlaneS, unit->EyePlaneS);
-         COPY_4FV(destUnit->EyePlaneT, unit->EyePlaneT);
-         COPY_4FV(destUnit->EyePlaneR, unit->EyePlaneR);
-         COPY_4FV(destUnit->EyePlaneQ, unit->EyePlaneQ);
+         COPY_4FV(destUnit->GenS.EyePlane, unit->GenS.EyePlane);
+         COPY_4FV(destUnit->GenT.EyePlane, unit->GenT.EyePlane);
+         COPY_4FV(destUnit->GenR.EyePlane, unit->GenR.EyePlane);
+         COPY_4FV(destUnit->GenQ.EyePlane, unit->GenQ.EyePlane);
          if (ctx->Driver.TexGen) {
-            ctx->Driver.TexGen(ctx, GL_S, GL_EYE_PLANE, unit->EyePlaneS);
-            ctx->Driver.TexGen(ctx, GL_T, GL_EYE_PLANE, unit->EyePlaneT);
-            ctx->Driver.TexGen(ctx, GL_R, GL_EYE_PLANE, unit->EyePlaneR);
-            ctx->Driver.TexGen(ctx, GL_Q, GL_EYE_PLANE, unit->EyePlaneQ);
+            ctx->Driver.TexGen(ctx, GL_S, GL_EYE_PLANE, unit->GenS.EyePlane);
+            ctx->Driver.TexGen(ctx, GL_T, GL_EYE_PLANE, unit->GenT.EyePlane);
+            ctx->Driver.TexGen(ctx, GL_R, GL_EYE_PLANE, unit->GenR.EyePlane);
+            ctx->Driver.TexGen(ctx, GL_Q, GL_EYE_PLANE, unit->GenQ.EyePlane);
          }
       }
       _mesa_set_enable(ctx, GL_TEXTURE_GEN_S,
diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index d70b78f258..42c8cc97c0 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -293,16 +293,16 @@ static void make_state_key( GLcontext *ctx, struct state_key *key )
       
 	 key->unit[i].texgen_mode0 = 
 	    translate_texgen( texUnit->TexGenEnabled & (1<<0),
-			      texUnit->GenModeS );
+			      texUnit->GenS.Mode );
 	 key->unit[i].texgen_mode1 = 
 	    translate_texgen( texUnit->TexGenEnabled & (1<<1),
-			      texUnit->GenModeT );
+			      texUnit->GenT.Mode );
 	 key->unit[i].texgen_mode2 = 
 	    translate_texgen( texUnit->TexGenEnabled & (1<<2),
-			      texUnit->GenModeR );
+			      texUnit->GenR.Mode );
 	 key->unit[i].texgen_mode3 = 
 	    translate_texgen( texUnit->TexGenEnabled & (1<<3),
-			      texUnit->GenModeQ );
+			      texUnit->GenQ.Mode );
       }
    }
 }
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 235d6b6bb5..92fe4cb77d 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1492,6 +1492,18 @@ struct gl_tex_env_combine_state
 };
 
 
+/**
+ * Texture coord generation state.
+ */
+struct gl_texgen
+{
+   GLenum Mode;         /**< GL_EYE_LINEAR, GL_SPHERE_MAP, etc */
+   GLbitfield _ModeBit; /**< TEXGEN_x bit corresponding to Mode */
+   GLfloat ObjectPlane[4];
+   GLfloat EyePlane[4];
+};
+
+
 /**
  * Texture unit state.  Contains enable flags, texture environment/function/
  * combiners, texgen state, pointers to current texture objects and
@@ -1504,28 +1516,14 @@ struct gl_texture_unit
 
    GLenum EnvMode;              /**< GL_MODULATE, GL_DECAL, GL_BLEND, etc. */
    GLfloat EnvColor[4];
+
+   struct gl_texgen GenS;
+   struct gl_texgen GenT;
+   struct gl_texgen GenR;
+   struct gl_texgen GenQ;
    GLbitfield TexGenEnabled;	/**< Bitwise-OR of [STRQ]_BIT values */
-   /** \name Tex coord generation mode
-    * Either GL_OBJECT_LINEAR, GL_EYE_LINEAR or GL_SPHERE_MAP. */
-   /*@{*/
-   GLenum GenModeS;		
-   GLenum GenModeT;
-   GLenum GenModeR;
-   GLenum GenModeQ;
-   /*@}*/
-   GLbitfield _GenBitS;
-   GLbitfield _GenBitT;
-   GLbitfield _GenBitR;
-   GLbitfield _GenBitQ;
-   GLbitfield _GenFlags;	/**< bitwise or of _GenBit[STRQ] */
-   GLfloat ObjectPlaneS[4];
-   GLfloat ObjectPlaneT[4];
-   GLfloat ObjectPlaneR[4];
-   GLfloat ObjectPlaneQ[4];
-   GLfloat EyePlaneS[4];
-   GLfloat EyePlaneT[4];
-   GLfloat EyePlaneR[4];
-   GLfloat EyePlaneQ[4];
+   GLbitfield _GenFlags;	/**< Bitwise-OR of Gen[STRQ]._ModeBit */
+
    GLfloat LodBias;		/**< for biasing mipmap levels */
 
    /** 
diff --git a/src/mesa/main/texgen.c b/src/mesa/main/texgen.c
index d2baecb92a..e3feb024c3 100644
--- a/src/mesa/main/texgen.c
+++ b/src/mesa/main/texgen.c
@@ -1,8 +1,9 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.1
+ * Version:  7.5
  *
  * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -37,12 +38,33 @@
 #include "math/m_matrix.h"
 
 
+/**
+ * Return texgen state for given coordinate
+ */
+static struct gl_texgen *
+get_texgen(struct gl_texture_unit *texUnit, GLenum coord)
+{
+   switch (coord) {
+   case GL_S:
+      return &texUnit->GenS;
+   case GL_T:
+      return &texUnit->GenT;
+   case GL_R:
+      return &texUnit->GenR;
+   case GL_Q:
+      return &texUnit->GenQ;
+   default:
+      return NULL;
+   }
+}
+
 
 void GLAPIENTRY
 _mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params )
 {
-   GET_CURRENT_CONTEXT(ctx);
    struct gl_texture_unit *texUnit;
+   struct gl_texgen *texgen;
+   GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
    if (MESA_VERBOSE&(VERBOSE_API|VERBOSE_TEXTURE))
@@ -59,210 +81,79 @@ _mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params )
 
    texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
 
-   switch (coord) {
-      case GL_S:
-         if (pname==GL_TEXTURE_GEN_MODE) {
-	    GLenum mode = (GLenum) (GLint) *params;
-	    GLbitfield bits;
-	    switch (mode) {
-	    case GL_OBJECT_LINEAR:
-	       bits = TEXGEN_OBJ_LINEAR;
-	       break;
-	    case GL_EYE_LINEAR:
-	       bits = TEXGEN_EYE_LINEAR;
-	       break;
-	    case GL_REFLECTION_MAP_NV:
-	       bits = TEXGEN_REFLECTION_MAP_NV;
-	       break;
-	    case GL_NORMAL_MAP_NV:
-	       bits = TEXGEN_NORMAL_MAP_NV;
-	       break;
-	    case GL_SPHERE_MAP:
-	       bits = TEXGEN_SPHERE_MAP;
-	       break;
-	    default:
-	       _mesa_error( ctx, GL_INVALID_ENUM, "glTexGenfv(param)" );
-	       return;
-	    }
-	    if (texUnit->GenModeS == mode)
-	       return;
-	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-	    texUnit->GenModeS = mode;
-	    texUnit->_GenBitS = bits;
-	 }
-	 else if (pname==GL_OBJECT_PLANE) {
-	    if (TEST_EQ_4V(texUnit->ObjectPlaneS, params))
-		return;
-	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-            COPY_4FV(texUnit->ObjectPlaneS, params);
-	 }
-	 else if (pname==GL_EYE_PLANE) {
-	    GLfloat tmp[4];
-            /* Transform plane equation by the inverse modelview matrix */
-            if (_math_matrix_is_dirty(ctx->ModelviewMatrixStack.Top)) {
-               _math_matrix_analyse( ctx->ModelviewMatrixStack.Top );
-            }
-            _mesa_transform_vector( tmp, params, ctx->ModelviewMatrixStack.Top->inv );
-	    if (TEST_EQ_4V(texUnit->EyePlaneS, tmp))
-	       return;
-	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-	    COPY_4FV(texUnit->EyePlaneS, tmp);
-	 }
-	 else {
-	    _mesa_error( ctx, GL_INVALID_ENUM, "glTexGenfv(pname)" );
-	    return;
-	 }
-	 break;
-      case GL_T:
-         if (pname==GL_TEXTURE_GEN_MODE) {
-	    GLenum mode = (GLenum) (GLint) *params;
-	    GLbitfield bitt;
-	    switch (mode) {
-               case GL_OBJECT_LINEAR:
-                  bitt = TEXGEN_OBJ_LINEAR;
-                  break;
-               case GL_EYE_LINEAR:
-                  bitt = TEXGEN_EYE_LINEAR;
-                  break;
-               case GL_REFLECTION_MAP_NV:
-                  bitt = TEXGEN_REFLECTION_MAP_NV;
-                  break;
-               case GL_NORMAL_MAP_NV:
-                  bitt = TEXGEN_NORMAL_MAP_NV;
-                  break;
-               case GL_SPHERE_MAP:
-                  bitt = TEXGEN_SPHERE_MAP;
-                  break;
-               default:
-                  _mesa_error( ctx, GL_INVALID_ENUM, "glTexGenfv(param)" );
-                  return;
-	    }
-	    if (texUnit->GenModeT == mode)
-	       return;
-	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-	    texUnit->GenModeT = mode;
-	    texUnit->_GenBitT = bitt;
-	 }
-	 else if (pname==GL_OBJECT_PLANE) {
-	    if (TEST_EQ_4V(texUnit->ObjectPlaneT, params))
-		return;
-	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-            COPY_4FV(texUnit->ObjectPlaneT, params);
-	 }
-	 else if (pname==GL_EYE_PLANE) {
-	    GLfloat tmp[4];
-            /* Transform plane equation by the inverse modelview matrix */
-	    if (_math_matrix_is_dirty(ctx->ModelviewMatrixStack.Top)) {
-               _math_matrix_analyse( ctx->ModelviewMatrixStack.Top );
-            }
-            _mesa_transform_vector( tmp, params, ctx->ModelviewMatrixStack.Top->inv );
-	    if (TEST_EQ_4V(texUnit->EyePlaneT, tmp))
-		return;
-	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-	    COPY_4FV(texUnit->EyePlaneT, tmp);
-	 }
-	 else {
-	    _mesa_error( ctx, GL_INVALID_ENUM, "glTexGenfv(pname)" );
-	    return;
-	 }
-	 break;
-      case GL_R:
-         if (pname==GL_TEXTURE_GEN_MODE) {
-	    GLenum mode = (GLenum) (GLint) *params;
-	    GLbitfield bitr;
-	    switch (mode) {
-	    case GL_OBJECT_LINEAR:
-	       bitr = TEXGEN_OBJ_LINEAR;
-	       break;
-	    case GL_REFLECTION_MAP_NV:
-	       bitr = TEXGEN_REFLECTION_MAP_NV;
-	       break;
-	    case GL_NORMAL_MAP_NV:
-	       bitr = TEXGEN_NORMAL_MAP_NV;
-	       break;
-	    case GL_EYE_LINEAR:
-	       bitr = TEXGEN_EYE_LINEAR;
-	       break;
-	    default:
-	       _mesa_error( ctx, GL_INVALID_ENUM, "glTexGenfv(param)" );
-	       return;
-	    }
-	    if (texUnit->GenModeR == mode)
-	       return;
-	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-	    texUnit->GenModeR = mode;
-	    texUnit->_GenBitR = bitr;
-	 }
-	 else if (pname==GL_OBJECT_PLANE) {
-	    if (TEST_EQ_4V(texUnit->ObjectPlaneR, params))
-		return;
-	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-	    COPY_4FV(texUnit->ObjectPlaneR, params);
-	 }
-	 else if (pname==GL_EYE_PLANE) {
-	    GLfloat tmp[4];
-            /* Transform plane equation by the inverse modelview matrix */
-            if (_math_matrix_is_dirty(ctx->ModelviewMatrixStack.Top)) {
-               _math_matrix_analyse( ctx->ModelviewMatrixStack.Top );
-            }
-            _mesa_transform_vector( tmp, params, ctx->ModelviewMatrixStack.Top->inv );
-	    if (TEST_EQ_4V(texUnit->EyePlaneR, tmp))
-	       return;
-	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-	    COPY_4FV(texUnit->EyePlaneR, tmp);
-	 }
-	 else {
-	    _mesa_error( ctx, GL_INVALID_ENUM, "glTexGenfv(pname)" );
-	    return;
-	 }
-	 break;
-      case GL_Q:
-         if (pname==GL_TEXTURE_GEN_MODE) {
-	    GLenum mode = (GLenum) (GLint) *params;
-	    GLbitfield bitq;
-	    switch (mode) {
-	    case GL_OBJECT_LINEAR:
-	       bitq = TEXGEN_OBJ_LINEAR;
-	       break;
-	    case GL_EYE_LINEAR:
-	       bitq = TEXGEN_EYE_LINEAR;
-	       break;
-	    default:
-	       _mesa_error( ctx, GL_INVALID_ENUM, "glTexGenfv(param)" );
-	       return;
-	    }
-	    if (texUnit->GenModeQ == mode)
-	       return;
-	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-	    texUnit->GenModeQ = mode;
-	    texUnit->_GenBitQ = bitq;
-	 }
-	 else if (pname==GL_OBJECT_PLANE) {
-	    if (TEST_EQ_4V(texUnit->ObjectPlaneQ, params))
-		return;
-	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-            COPY_4FV(texUnit->ObjectPlaneQ, params);
-	 }
-	 else if (pname==GL_EYE_PLANE) {
-	    GLfloat tmp[4];
-            /* Transform plane equation by the inverse modelview matrix */
-            if (_math_matrix_is_dirty(ctx->ModelviewMatrixStack.Top)) {
-               _math_matrix_analyse( ctx->ModelviewMatrixStack.Top );
-            }
-            _mesa_transform_vector( tmp, params, ctx->ModelviewMatrixStack.Top->inv );
-	    if (TEST_EQ_4V(texUnit->EyePlaneQ, tmp))
-	       return;
-	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-	    COPY_4FV(texUnit->EyePlaneQ, tmp);
-	 }
-	 else {
-	    _mesa_error( ctx, GL_INVALID_ENUM, "glTexGenfv(pname)" );
-	    return;
-	 }
-	 break;
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glTexGenfv(coord)" );
-	 return;
+   texgen = get_texgen(texUnit, coord);
+   if (!texgen) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glTexGen(coord)");
+      return;
+   }
+
+   switch (pname) {
+   case GL_TEXTURE_GEN_MODE:
+      {
+         GLenum mode = (GLenum) (GLint) params[0];
+         GLbitfield bit = 0x0;
+         if (texgen->Mode == mode)
+            return;
+         switch (mode) {
+         case GL_OBJECT_LINEAR:
+            bit = TEXGEN_OBJ_LINEAR;
+            break;
+         case GL_EYE_LINEAR:
+            bit = TEXGEN_EYE_LINEAR;
+            break;
+         case GL_SPHERE_MAP:
+            if (coord == GL_S || coord == GL_T)
+               bit = TEXGEN_SPHERE_MAP;
+            break;
+         case GL_REFLECTION_MAP_NV:
+            if (coord != GL_Q)
+               bit = TEXGEN_REFLECTION_MAP_NV;
+            break;
+         case GL_NORMAL_MAP_NV:
+            if (coord != GL_Q)
+               bit = TEXGEN_NORMAL_MAP_NV;
+            break;
+         default:
+            ; /* nop */
+         }
+         if (!bit) {
+            _mesa_error( ctx, GL_INVALID_ENUM, "glTexGenfv(param)" );
+            return;
+         }
+         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+         texgen->Mode = mode;
+         texgen->_ModeBit = bit;
+      }
+      break;
+
+   case GL_OBJECT_PLANE:
+      {
+         if (TEST_EQ_4V(texgen->ObjectPlane, params))
+            return;
+         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+         COPY_4FV(texgen->ObjectPlane, params);
+      }
+      break;
+
+   case GL_EYE_PLANE:
+      {
+         GLfloat tmp[4];
+         /* Transform plane equation by the inverse modelview matrix */
+         if (_math_matrix_is_dirty(ctx->ModelviewMatrixStack.Top)) {
+            _math_matrix_analyse(ctx->ModelviewMatrixStack.Top);
+         }
+         _mesa_transform_vector(tmp, params,
+                                ctx->ModelviewMatrixStack.Top->inv);
+         if (TEST_EQ_4V(texgen->EyePlane, tmp))
+            return;
+         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+         COPY_4FV(texgen->EyePlane, tmp);
+      }
+      break;
+
+   default:
+      _mesa_error( ctx, GL_INVALID_ENUM, "glTexGenfv(pname)" );
+      return;
    }
 
    if (ctx->Driver.TexGen)
@@ -330,7 +221,8 @@ _mesa_TexGeni( GLenum coord, GLenum pname, GLint param )
 void GLAPIENTRY
 _mesa_GetTexGendv( GLenum coord, GLenum pname, GLdouble *params )
 {
-   const struct gl_texture_unit *texUnit;
+   struct gl_texture_unit *texUnit;
+   struct gl_texgen *texgen;
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
@@ -341,70 +233,24 @@ _mesa_GetTexGendv( GLenum coord, GLenum pname, GLdouble *params )
 
    texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
 
-   switch (coord) {
-      case GL_S:
-         if (pname==GL_TEXTURE_GEN_MODE) {
-            params[0] = ENUM_TO_DOUBLE(texUnit->GenModeS);
-	 }
-	 else if (pname==GL_OBJECT_PLANE) {
-            COPY_4V( params, texUnit->ObjectPlaneS );
-	 }
-	 else if (pname==GL_EYE_PLANE) {
-            COPY_4V( params, texUnit->EyePlaneS );
-	 }
-	 else {
-	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGendv(pname)" );
-	    return;
-	 }
-	 break;
-      case GL_T:
-         if (pname==GL_TEXTURE_GEN_MODE) {
-            params[0] = ENUM_TO_DOUBLE(texUnit->GenModeT);
-	 }
-	 else if (pname==GL_OBJECT_PLANE) {
-            COPY_4V( params, texUnit->ObjectPlaneT );
-	 }
-	 else if (pname==GL_EYE_PLANE) {
-            COPY_4V( params, texUnit->EyePlaneT );
-	 }
-	 else {
-	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGendv(pname)" );
-	    return;
-	 }
-	 break;
-      case GL_R:
-         if (pname==GL_TEXTURE_GEN_MODE) {
-            params[0] = ENUM_TO_DOUBLE(texUnit->GenModeR);
-	 }
-	 else if (pname==GL_OBJECT_PLANE) {
-            COPY_4V( params, texUnit->ObjectPlaneR );
-	 }
-	 else if (pname==GL_EYE_PLANE) {
-            COPY_4V( params, texUnit->EyePlaneR );
-	 }
-	 else {
-	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGendv(pname)" );
-	    return;
-	 }
-	 break;
-      case GL_Q:
-         if (pname==GL_TEXTURE_GEN_MODE) {
-            params[0] = ENUM_TO_DOUBLE(texUnit->GenModeQ);
-	 }
-	 else if (pname==GL_OBJECT_PLANE) {
-            COPY_4V( params, texUnit->ObjectPlaneQ );
-	 }
-	 else if (pname==GL_EYE_PLANE) {
-            COPY_4V( params, texUnit->EyePlaneQ );
-	 }
-	 else {
-	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGendv(pname)" );
-	    return;
-	 }
-	 break;
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGendv(coord)" );
-	 return;
+   texgen = get_texgen(texUnit, coord);
+   if (!texgen) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexGendv(coord)");
+      return;
+   }
+
+   switch (pname) {
+   case GL_TEXTURE_GEN_MODE:
+      params[0] = ENUM_TO_DOUBLE(texgen->Mode);
+      break;
+   case GL_OBJECT_PLANE:
+      COPY_4V(params, texgen->ObjectPlane);
+      break;
+   case GL_EYE_PLANE:
+      COPY_4V(params, texgen->EyePlane);
+      break;
+   default:
+      _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGendv(pname)" );
    }
 }
 
@@ -413,7 +259,8 @@ _mesa_GetTexGendv( GLenum coord, GLenum pname, GLdouble *params )
 void GLAPIENTRY
 _mesa_GetTexGenfv( GLenum coord, GLenum pname, GLfloat *params )
 {
-   const struct gl_texture_unit *texUnit;
+   struct gl_texture_unit *texUnit;
+   struct gl_texgen *texgen;
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
@@ -424,70 +271,24 @@ _mesa_GetTexGenfv( GLenum coord, GLenum pname, GLfloat *params )
 
    texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
 
-   switch (coord) {
-      case GL_S:
-         if (pname==GL_TEXTURE_GEN_MODE) {
-            params[0] = ENUM_TO_FLOAT(texUnit->GenModeS);
-	 }
-	 else if (pname==GL_OBJECT_PLANE) {
-            COPY_4V( params, texUnit->ObjectPlaneS );
-	 }
-	 else if (pname==GL_EYE_PLANE) {
-            COPY_4V( params, texUnit->EyePlaneS );
-	 }
-	 else {
-	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGenfv(pname)" );
-	    return;
-	 }
-	 break;
-      case GL_T:
-         if (pname==GL_TEXTURE_GEN_MODE) {
-            params[0] = ENUM_TO_FLOAT(texUnit->GenModeT);
-	 }
-	 else if (pname==GL_OBJECT_PLANE) {
-            COPY_4V( params, texUnit->ObjectPlaneT );
-	 }
-	 else if (pname==GL_EYE_PLANE) {
-            COPY_4V( params, texUnit->EyePlaneT );
-	 }
-	 else {
-	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGenfv(pname)" );
-	    return;
-	 }
-	 break;
-      case GL_R:
-         if (pname==GL_TEXTURE_GEN_MODE) {
-            params[0] = ENUM_TO_FLOAT(texUnit->GenModeR);
-	 }
-	 else if (pname==GL_OBJECT_PLANE) {
-            COPY_4V( params, texUnit->ObjectPlaneR );
-	 }
-	 else if (pname==GL_EYE_PLANE) {
-            COPY_4V( params, texUnit->EyePlaneR );
-	 }
-	 else {
-	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGenfv(pname)" );
-	    return;
-	 }
-	 break;
-      case GL_Q:
-         if (pname==GL_TEXTURE_GEN_MODE) {
-            params[0] = ENUM_TO_FLOAT(texUnit->GenModeQ);
-	 }
-	 else if (pname==GL_OBJECT_PLANE) {
-            COPY_4V( params, texUnit->ObjectPlaneQ );
-	 }
-	 else if (pname==GL_EYE_PLANE) {
-            COPY_4V( params, texUnit->EyePlaneQ );
-	 }
-	 else {
-	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGenfv(pname)" );
-	    return;
-	 }
-	 break;
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGenfv(coord)" );
-	 return;
+   texgen = get_texgen(texUnit, coord);
+   if (!texgen) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexGenfv(coord)");
+      return;
+   }
+
+   switch (pname) {
+   case GL_TEXTURE_GEN_MODE:
+      params[0] = ENUM_TO_FLOAT(texgen->Mode);
+      break;
+   case GL_OBJECT_PLANE:
+      COPY_4V(params, texgen->ObjectPlane);
+      break;
+   case GL_EYE_PLANE:
+      COPY_4V(params, texgen->EyePlane);
+      break;
+   default:
+      _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGenfv(pname)" );
    }
 }
 
@@ -496,7 +297,8 @@ _mesa_GetTexGenfv( GLenum coord, GLenum pname, GLfloat *params )
 void GLAPIENTRY
 _mesa_GetTexGeniv( GLenum coord, GLenum pname, GLint *params )
 {
-   const struct gl_texture_unit *texUnit;
+   struct gl_texture_unit *texUnit;
+   struct gl_texgen *texgen;
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
@@ -507,94 +309,30 @@ _mesa_GetTexGeniv( GLenum coord, GLenum pname, GLint *params )
 
    texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
 
-   switch (coord) {
-      case GL_S:
-         if (pname==GL_TEXTURE_GEN_MODE) {
-            params[0] = texUnit->GenModeS;
-	 }
-	 else if (pname==GL_OBJECT_PLANE) {
-            params[0] = (GLint) texUnit->ObjectPlaneS[0];
-            params[1] = (GLint) texUnit->ObjectPlaneS[1];
-            params[2] = (GLint) texUnit->ObjectPlaneS[2];
-            params[3] = (GLint) texUnit->ObjectPlaneS[3];
-	 }
-	 else if (pname==GL_EYE_PLANE) {
-            params[0] = (GLint) texUnit->EyePlaneS[0];
-            params[1] = (GLint) texUnit->EyePlaneS[1];
-            params[2] = (GLint) texUnit->EyePlaneS[2];
-            params[3] = (GLint) texUnit->EyePlaneS[3];
-	 }
-	 else {
-	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGeniv(pname)" );
-	    return;
-	 }
-	 break;
-      case GL_T:
-         if (pname==GL_TEXTURE_GEN_MODE) {
-            params[0] = texUnit->GenModeT;
-	 }
-	 else if (pname==GL_OBJECT_PLANE) {
-            params[0] = (GLint) texUnit->ObjectPlaneT[0];
-            params[1] = (GLint) texUnit->ObjectPlaneT[1];
-            params[2] = (GLint) texUnit->ObjectPlaneT[2];
-            params[3] = (GLint) texUnit->ObjectPlaneT[3];
-	 }
-	 else if (pname==GL_EYE_PLANE) {
-            params[0] = (GLint) texUnit->EyePlaneT[0];
-            params[1] = (GLint) texUnit->EyePlaneT[1];
-            params[2] = (GLint) texUnit->EyePlaneT[2];
-            params[3] = (GLint) texUnit->EyePlaneT[3];
-	 }
-	 else {
-	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGeniv(pname)" );
-	    return;
-	 }
-	 break;
-      case GL_R:
-         if (pname==GL_TEXTURE_GEN_MODE) {
-            params[0] = texUnit->GenModeR;
-	 }
-	 else if (pname==GL_OBJECT_PLANE) {
-            params[0] = (GLint) texUnit->ObjectPlaneR[0];
-            params[1] = (GLint) texUnit->ObjectPlaneR[1];
-            params[2] = (GLint) texUnit->ObjectPlaneR[2];
-            params[3] = (GLint) texUnit->ObjectPlaneR[3];
-	 }
-	 else if (pname==GL_EYE_PLANE) {
-            params[0] = (GLint) texUnit->EyePlaneR[0];
-            params[1] = (GLint) texUnit->EyePlaneR[1];
-            params[2] = (GLint) texUnit->EyePlaneR[2];
-            params[3] = (GLint) texUnit->EyePlaneR[3];
-	 }
-	 else {
-	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGeniv(pname)" );
-	    return;
-	 }
-	 break;
-      case GL_Q:
-         if (pname==GL_TEXTURE_GEN_MODE) {
-            params[0] = texUnit->GenModeQ;
-	 }
-	 else if (pname==GL_OBJECT_PLANE) {
-            params[0] = (GLint) texUnit->ObjectPlaneQ[0];
-            params[1] = (GLint) texUnit->ObjectPlaneQ[1];
-            params[2] = (GLint) texUnit->ObjectPlaneQ[2];
-            params[3] = (GLint) texUnit->ObjectPlaneQ[3];
-	 }
-	 else if (pname==GL_EYE_PLANE) {
-            params[0] = (GLint) texUnit->EyePlaneQ[0];
-            params[1] = (GLint) texUnit->EyePlaneQ[1];
-            params[2] = (GLint) texUnit->EyePlaneQ[2];
-            params[3] = (GLint) texUnit->EyePlaneQ[3];
-         }
-	 else {
-	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGeniv(pname)" );
-	    return;
-	 }
-	 break;
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGeniv(coord)" );
-	 return;
+   texgen = get_texgen(texUnit, coord);
+   if (!texgen) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexGeniv(coord)");
+      return;
+   }
+
+   switch (pname) {
+   case GL_TEXTURE_GEN_MODE:
+      params[0] = texgen->Mode;
+      break;
+   case GL_OBJECT_PLANE:
+      params[0] = (GLint) texgen->ObjectPlane[0];
+      params[1] = (GLint) texgen->ObjectPlane[1];
+      params[2] = (GLint) texgen->ObjectPlane[2];
+      params[3] = (GLint) texgen->ObjectPlane[3];
+      break;
+   case GL_EYE_PLANE:
+      params[0] = (GLint) texgen->EyePlane[0];
+      params[1] = (GLint) texgen->EyePlane[1];
+      params[2] = (GLint) texgen->EyePlane[2];
+      params[3] = (GLint) texgen->EyePlane[3];
+      break;
+   default:
+      _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGeniv(pname)" );
    }
 }
 
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 6586a48646..053097cec0 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -85,23 +85,10 @@ _mesa_copy_texture_state( const GLcontext *src, GLcontext *dst )
       dst->Texture.Unit[i].EnvMode = src->Texture.Unit[i].EnvMode;
       COPY_4V(dst->Texture.Unit[i].EnvColor, src->Texture.Unit[i].EnvColor);
       dst->Texture.Unit[i].TexGenEnabled = src->Texture.Unit[i].TexGenEnabled;
-      dst->Texture.Unit[i].GenModeS = src->Texture.Unit[i].GenModeS;
-      dst->Texture.Unit[i].GenModeT = src->Texture.Unit[i].GenModeT;
-      dst->Texture.Unit[i].GenModeR = src->Texture.Unit[i].GenModeR;
-      dst->Texture.Unit[i].GenModeQ = src->Texture.Unit[i].GenModeQ;
-      dst->Texture.Unit[i]._GenBitS = src->Texture.Unit[i]._GenBitS;
-      dst->Texture.Unit[i]._GenBitT = src->Texture.Unit[i]._GenBitT;
-      dst->Texture.Unit[i]._GenBitR = src->Texture.Unit[i]._GenBitR;
-      dst->Texture.Unit[i]._GenBitQ = src->Texture.Unit[i]._GenBitQ;
-      dst->Texture.Unit[i]._GenFlags = src->Texture.Unit[i]._GenFlags;
-      COPY_4V(dst->Texture.Unit[i].ObjectPlaneS, src->Texture.Unit[i].ObjectPlaneS);
-      COPY_4V(dst->Texture.Unit[i].ObjectPlaneT, src->Texture.Unit[i].ObjectPlaneT);
-      COPY_4V(dst->Texture.Unit[i].ObjectPlaneR, src->Texture.Unit[i].ObjectPlaneR);
-      COPY_4V(dst->Texture.Unit[i].ObjectPlaneQ, src->Texture.Unit[i].ObjectPlaneQ);
-      COPY_4V(dst->Texture.Unit[i].EyePlaneS, src->Texture.Unit[i].EyePlaneS);
-      COPY_4V(dst->Texture.Unit[i].EyePlaneT, src->Texture.Unit[i].EyePlaneT);
-      COPY_4V(dst->Texture.Unit[i].EyePlaneR, src->Texture.Unit[i].EyePlaneR);
-      COPY_4V(dst->Texture.Unit[i].EyePlaneQ, src->Texture.Unit[i].EyePlaneQ);
+      dst->Texture.Unit[i].GenS = src->Texture.Unit[i].GenS;
+      dst->Texture.Unit[i].GenT = src->Texture.Unit[i].GenT;
+      dst->Texture.Unit[i].GenR = src->Texture.Unit[i].GenR;
+      dst->Texture.Unit[i].GenQ = src->Texture.Unit[i].GenQ;
       dst->Texture.Unit[i].LodBias = src->Texture.Unit[i].LodBias;
 
       /* GL_EXT_texture_env_combine */
@@ -655,16 +642,16 @@ update_texture_state( GLcontext *ctx )
 
       if (texUnit->TexGenEnabled) {
 	 if (texUnit->TexGenEnabled & S_BIT) {
-	    texUnit->_GenFlags |= texUnit->_GenBitS;
+	    texUnit->_GenFlags |= texUnit->GenS._ModeBit;
 	 }
 	 if (texUnit->TexGenEnabled & T_BIT) {
-	    texUnit->_GenFlags |= texUnit->_GenBitT;
-	 }
-	 if (texUnit->TexGenEnabled & Q_BIT) {
-	    texUnit->_GenFlags |= texUnit->_GenBitQ;
+	    texUnit->_GenFlags |= texUnit->GenT._ModeBit;
 	 }
 	 if (texUnit->TexGenEnabled & R_BIT) {
-	    texUnit->_GenFlags |= texUnit->_GenBitR;
+	    texUnit->_GenFlags |= texUnit->GenR._ModeBit;
+	 }
+	 if (texUnit->TexGenEnabled & Q_BIT) {
+	    texUnit->_GenFlags |= texUnit->GenQ._ModeBit;
 	 }
 
 	 ctx->Texture._TexGenEnabled |= ENABLE_TEXGEN(unit);
@@ -756,24 +743,24 @@ init_texture_unit( GLcontext *ctx, GLuint unit )
    texUnit->_CurrentCombine = & texUnit->_EnvMode;
 
    texUnit->TexGenEnabled = 0;
-   texUnit->GenModeS = GL_EYE_LINEAR;
-   texUnit->GenModeT = GL_EYE_LINEAR;
-   texUnit->GenModeR = GL_EYE_LINEAR;
-   texUnit->GenModeQ = GL_EYE_LINEAR;
-   texUnit->_GenBitS = TEXGEN_EYE_LINEAR;
-   texUnit->_GenBitT = TEXGEN_EYE_LINEAR;
-   texUnit->_GenBitR = TEXGEN_EYE_LINEAR;
-   texUnit->_GenBitQ = TEXGEN_EYE_LINEAR;
+   texUnit->GenS.Mode = GL_EYE_LINEAR;
+   texUnit->GenT.Mode = GL_EYE_LINEAR;
+   texUnit->GenR.Mode = GL_EYE_LINEAR;
+   texUnit->GenQ.Mode = GL_EYE_LINEAR;
+   texUnit->GenS._ModeBit = TEXGEN_EYE_LINEAR;
+   texUnit->GenT._ModeBit = TEXGEN_EYE_LINEAR;
+   texUnit->GenR._ModeBit = TEXGEN_EYE_LINEAR;
+   texUnit->GenQ._ModeBit = TEXGEN_EYE_LINEAR;
 
    /* Yes, these plane coefficients are correct! */
-   ASSIGN_4V( texUnit->ObjectPlaneS, 1.0, 0.0, 0.0, 0.0 );
-   ASSIGN_4V( texUnit->ObjectPlaneT, 0.0, 1.0, 0.0, 0.0 );
-   ASSIGN_4V( texUnit->ObjectPlaneR, 0.0, 0.0, 0.0, 0.0 );
-   ASSIGN_4V( texUnit->ObjectPlaneQ, 0.0, 0.0, 0.0, 0.0 );
-   ASSIGN_4V( texUnit->EyePlaneS, 1.0, 0.0, 0.0, 0.0 );
-   ASSIGN_4V( texUnit->EyePlaneT, 0.0, 1.0, 0.0, 0.0 );
-   ASSIGN_4V( texUnit->EyePlaneR, 0.0, 0.0, 0.0, 0.0 );
-   ASSIGN_4V( texUnit->EyePlaneQ, 0.0, 0.0, 0.0, 0.0 );
+   ASSIGN_4V( texUnit->GenS.ObjectPlane, 1.0, 0.0, 0.0, 0.0 );
+   ASSIGN_4V( texUnit->GenT.ObjectPlane, 0.0, 1.0, 0.0, 0.0 );
+   ASSIGN_4V( texUnit->GenR.ObjectPlane, 0.0, 0.0, 0.0, 0.0 );
+   ASSIGN_4V( texUnit->GenQ.ObjectPlane, 0.0, 0.0, 0.0, 0.0 );
+   ASSIGN_4V( texUnit->GenS.EyePlane, 1.0, 0.0, 0.0, 0.0 );
+   ASSIGN_4V( texUnit->GenT.EyePlane, 0.0, 1.0, 0.0, 0.0 );
+   ASSIGN_4V( texUnit->GenR.EyePlane, 0.0, 0.0, 0.0, 0.0 );
+   ASSIGN_4V( texUnit->GenQ.EyePlane, 0.0, 0.0, 0.0, 0.0 );
 
    /* initialize current texture object ptrs to the shared default objects */
    _mesa_reference_texobj(&texUnit->Current1D, ctx->Shared->Default1D);
diff --git a/src/mesa/shader/prog_statevars.c b/src/mesa/shader/prog_statevars.c
index e1db30b78f..1f7d87ccc9 100644
--- a/src/mesa/shader/prog_statevars.c
+++ b/src/mesa/shader/prog_statevars.c
@@ -206,28 +206,28 @@ _mesa_fetch_state(GLcontext *ctx, const gl_state_index state[],
          /* state[2] is the texgen attribute */
          switch (state[2]) {
          case STATE_TEXGEN_EYE_S:
-            COPY_4V(value, ctx->Texture.Unit[unit].EyePlaneS);
+            COPY_4V(value, ctx->Texture.Unit[unit].GenS.EyePlane);
             return;
          case STATE_TEXGEN_EYE_T:
-            COPY_4V(value, ctx->Texture.Unit[unit].EyePlaneT);
+            COPY_4V(value, ctx->Texture.Unit[unit].GenT.EyePlane);
             return;
          case STATE_TEXGEN_EYE_R:
-            COPY_4V(value, ctx->Texture.Unit[unit].EyePlaneR);
+            COPY_4V(value, ctx->Texture.Unit[unit].GenR.EyePlane);
             return;
          case STATE_TEXGEN_EYE_Q:
-            COPY_4V(value, ctx->Texture.Unit[unit].EyePlaneQ);
+            COPY_4V(value, ctx->Texture.Unit[unit].GenQ.EyePlane);
             return;
          case STATE_TEXGEN_OBJECT_S:
-            COPY_4V(value, ctx->Texture.Unit[unit].ObjectPlaneS);
+            COPY_4V(value, ctx->Texture.Unit[unit].GenS.ObjectPlane);
             return;
          case STATE_TEXGEN_OBJECT_T:
-            COPY_4V(value, ctx->Texture.Unit[unit].ObjectPlaneT);
+            COPY_4V(value, ctx->Texture.Unit[unit].GenT.ObjectPlane);
             return;
          case STATE_TEXGEN_OBJECT_R:
-            COPY_4V(value, ctx->Texture.Unit[unit].ObjectPlaneR);
+            COPY_4V(value, ctx->Texture.Unit[unit].GenR.ObjectPlane);
             return;
          case STATE_TEXGEN_OBJECT_Q:
-            COPY_4V(value, ctx->Texture.Unit[unit].ObjectPlaneQ);
+            COPY_4V(value, ctx->Texture.Unit[unit].GenQ.ObjectPlane);
             return;
          default:
             _mesa_problem(ctx, "Invalid texgen state in fetch_state");
diff --git a/src/mesa/tnl/t_rasterpos.c b/src/mesa/tnl/t_rasterpos.c
index 14d79eab54..04fb1d8f8c 100644
--- a/src/mesa/tnl/t_rasterpos.c
+++ b/src/mesa/tnl/t_rasterpos.c
@@ -301,12 +301,12 @@ compute_texgen(GLcontext *ctx, const GLfloat vObj[4], const GLfloat vEye[4],
       mInv = 0.0F;
 
    if (texUnit->TexGenEnabled & S_BIT) {
-      switch (texUnit->GenModeS) {
+      switch (texUnit->GenS.Mode) {
          case GL_OBJECT_LINEAR:
-            texcoord[0] = DOT4(vObj, texUnit->ObjectPlaneS);
+            texcoord[0] = DOT4(vObj, texUnit->GenS.ObjectPlane);
             break;
          case GL_EYE_LINEAR:
-            texcoord[0] = DOT4(vEye, texUnit->EyePlaneS);
+            texcoord[0] = DOT4(vEye, texUnit->GenS.EyePlane);
             break;
          case GL_SPHERE_MAP:
             texcoord[0] = rx * mInv + 0.5F;
@@ -324,12 +324,12 @@ compute_texgen(GLcontext *ctx, const GLfloat vObj[4], const GLfloat vEye[4],
    }
 
    if (texUnit->TexGenEnabled & T_BIT) {
-      switch (texUnit->GenModeT) {
+      switch (texUnit->GenT.Mode) {
          case GL_OBJECT_LINEAR:
-            texcoord[1] = DOT4(vObj, texUnit->ObjectPlaneT);
+            texcoord[1] = DOT4(vObj, texUnit->GenT.ObjectPlane);
             break;
          case GL_EYE_LINEAR:
-            texcoord[1] = DOT4(vEye, texUnit->EyePlaneT);
+            texcoord[1] = DOT4(vEye, texUnit->GenT.EyePlane);
             break;
          case GL_SPHERE_MAP:
             texcoord[1] = ry * mInv + 0.5F;
@@ -347,12 +347,12 @@ compute_texgen(GLcontext *ctx, const GLfloat vObj[4], const GLfloat vEye[4],
    }
 
    if (texUnit->TexGenEnabled & R_BIT) {
-      switch (texUnit->GenModeR) {
+      switch (texUnit->GenR.Mode) {
          case GL_OBJECT_LINEAR:
-            texcoord[2] = DOT4(vObj, texUnit->ObjectPlaneR);
+            texcoord[2] = DOT4(vObj, texUnit->GenR.ObjectPlane);
             break;
          case GL_EYE_LINEAR:
-            texcoord[2] = DOT4(vEye, texUnit->EyePlaneR);
+            texcoord[2] = DOT4(vEye, texUnit->GenR.EyePlane);
             break;
          case GL_REFLECTION_MAP:
             texcoord[2] = rz;
@@ -367,12 +367,12 @@ compute_texgen(GLcontext *ctx, const GLfloat vObj[4], const GLfloat vEye[4],
    }
 
    if (texUnit->TexGenEnabled & Q_BIT) {
-      switch (texUnit->GenModeQ) {
+      switch (texUnit->GenQ.Mode) {
          case GL_OBJECT_LINEAR:
-            texcoord[3] = DOT4(vObj, texUnit->ObjectPlaneQ);
+            texcoord[3] = DOT4(vObj, texUnit->GenQ.ObjectPlane);
             break;
          case GL_EYE_LINEAR:
-            texcoord[3] = DOT4(vEye, texUnit->EyePlaneQ);
+            texcoord[3] = DOT4(vEye, texUnit->GenQ.EyePlane);
             break;
          default:
             _mesa_problem(ctx, "Bad Q texgen in compute_texgen()");
diff --git a/src/mesa/tnl/t_vb_texgen.c b/src/mesa/tnl/t_vb_texgen.c
index 14d3876e54..7c1819b223 100644
--- a/src/mesa/tnl/t_vb_texgen.c
+++ b/src/mesa/tnl/t_vb_texgen.c
@@ -367,16 +367,16 @@ static void texgen( GLcontext *ctx,
 
    if (texUnit->TexGenEnabled & S_BIT) {
       GLuint i;
-      switch (texUnit->GenModeS) {
+      switch (texUnit->GenS.Mode) {
       case GL_OBJECT_LINEAR:
 	 _mesa_dotprod_tab[obj->size]( (GLfloat *)out->data,
 				       sizeof(out->data[0]), obj,
-				       texUnit->ObjectPlaneS );
+				       texUnit->GenS.ObjectPlane );
 	 break;
       case GL_EYE_LINEAR:
 	 _mesa_dotprod_tab[eye->size]( (GLfloat *)out->data,
 				       sizeof(out->data[0]), eye,
-				       texUnit->EyePlaneS );
+				       texUnit->GenS.EyePlane );
 	 break;
       case GL_SPHERE_MAP:
          for (i = 0; i < count; i++)
@@ -400,16 +400,16 @@ static void texgen( GLcontext *ctx,
 
    if (texUnit->TexGenEnabled & T_BIT) {
       GLuint i;
-      switch (texUnit->GenModeT) {
+      switch (texUnit->GenT.Mode) {
       case GL_OBJECT_LINEAR:
 	 _mesa_dotprod_tab[obj->size]( &(out->data[0][1]),
 				       sizeof(out->data[0]), obj,
-				       texUnit->ObjectPlaneT );
+				       texUnit->GenT.ObjectPlane );
 	 break;
       case GL_EYE_LINEAR:
 	 _mesa_dotprod_tab[eye->size]( &(out->data[0][1]),
 				       sizeof(out->data[0]), eye,
-				       texUnit->EyePlaneT );
+				       texUnit->GenT.EyePlane );
 	 break;
       case GL_SPHERE_MAP:
          for (i = 0; i < count; i++)
@@ -433,16 +433,16 @@ static void texgen( GLcontext *ctx,
 
    if (texUnit->TexGenEnabled & R_BIT) {
       GLuint i;
-      switch (texUnit->GenModeR) {
+      switch (texUnit->GenR.Mode) {
       case GL_OBJECT_LINEAR:
 	 _mesa_dotprod_tab[obj->size]( &(out->data[0][2]),
 				       sizeof(out->data[0]), obj,
-				       texUnit->ObjectPlaneR );
+				       texUnit->GenR.ObjectPlane );
 	 break;
       case GL_EYE_LINEAR:
 	 _mesa_dotprod_tab[eye->size]( &(out->data[0][2]),
 				       sizeof(out->data[0]), eye,
-				       texUnit->EyePlaneR );
+				       texUnit->GenR.EyePlane );
 	 break;
       case GL_REFLECTION_MAP_NV:
 	 for (i=0;i<count;i++)
@@ -461,16 +461,16 @@ static void texgen( GLcontext *ctx,
    }
 
    if (texUnit->TexGenEnabled & Q_BIT) {
-      switch (texUnit->GenModeQ) {
+      switch (texUnit->GenQ.Mode) {
       case GL_OBJECT_LINEAR:
 	 _mesa_dotprod_tab[obj->size]( &(out->data[0][3]),
 				       sizeof(out->data[0]), obj,
-				       texUnit->ObjectPlaneQ );
+				       texUnit->GenQ.ObjectPlane );
 	 break;
       case GL_EYE_LINEAR:
 	 _mesa_dotprod_tab[eye->size]( &(out->data[0][3]),
 				       sizeof(out->data[0]), eye,
-				       texUnit->EyePlaneQ );
+				       texUnit->GenQ.EyePlane );
 	 break;
       default:
 	 _mesa_problem(ctx, "Bad Q texgen");
-- 
cgit v1.2.3


From 4d24b639d160fe485a3e8f7395e7654538be29e0 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Sat, 21 Feb 2009 13:59:29 -0700
Subject: mesa: use an array for default texture objects

Replace Default1D/2D/3D/Cube/etc with DefaultTex[TEXTURE_x_INDEX].
The same should be done with the Current1D/2D/3D/etc pointers...
---
 src/mesa/main/context.c  | 75 +++++++++++++++++-------------------------------
 src/mesa/main/mtypes.h   | 14 ++-------
 src/mesa/main/texobj.c   | 35 +++++++++++++---------
 src/mesa/main/texstate.c | 38 ++++++++++++++----------
 4 files changed, 72 insertions(+), 90 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 9705fd8a98..04848794aa 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -423,6 +423,7 @@ one_time_init( GLcontext *ctx )
 static GLboolean
 alloc_shared_state( GLcontext *ctx )
 {
+   GLuint i;
    struct gl_shared_state *ss = CALLOC_STRUCT(gl_shared_state);
    if (!ss)
       return GL_FALSE;
@@ -464,36 +465,24 @@ alloc_shared_state( GLcontext *ctx )
    ss->ShaderObjects = _mesa_NewHashTable();
 #endif
 
-   ss->Default1D = (*ctx->Driver.NewTextureObject)(ctx, 0, GL_TEXTURE_1D);
-   if (!ss->Default1D)
-      goto cleanup;
-
-   ss->Default2D = (*ctx->Driver.NewTextureObject)(ctx, 0, GL_TEXTURE_2D);
-   if (!ss->Default2D)
-      goto cleanup;
-
-   ss->Default3D = (*ctx->Driver.NewTextureObject)(ctx, 0, GL_TEXTURE_3D);
-   if (!ss->Default3D)
-      goto cleanup;
-
-   ss->DefaultCubeMap = (*ctx->Driver.NewTextureObject)(ctx, 0, GL_TEXTURE_CUBE_MAP_ARB);
-   if (!ss->DefaultCubeMap)
-      goto cleanup;
-
-   ss->DefaultRect = (*ctx->Driver.NewTextureObject)(ctx, 0, GL_TEXTURE_RECTANGLE_NV);
-   if (!ss->DefaultRect)
-      goto cleanup;
-
-   ss->Default1DArray = (*ctx->Driver.NewTextureObject)(ctx, 0, GL_TEXTURE_1D_ARRAY_EXT);
-   if (!ss->Default1DArray)
-      goto cleanup;
-
-   ss->Default2DArray = (*ctx->Driver.NewTextureObject)(ctx, 0, GL_TEXTURE_2D_ARRAY_EXT);
-   if (!ss->Default2DArray)
-      goto cleanup;
+   /* Create default texture objects */
+   for (i = 0; i < NUM_TEXTURE_TARGETS; i++) {
+      static const GLenum targets[NUM_TEXTURE_TARGETS] = {
+         GL_TEXTURE_1D,
+         GL_TEXTURE_2D,
+         GL_TEXTURE_3D,
+         GL_TEXTURE_CUBE_MAP,
+         GL_TEXTURE_RECTANGLE_NV,
+         GL_TEXTURE_1D_ARRAY_EXT,
+         GL_TEXTURE_2D_ARRAY_EXT
+      };
+      ss->DefaultTex[i] = ctx->Driver.NewTextureObject(ctx, 0, targets[i]);
+      if (!ss->DefaultTex[i])
+         goto cleanup;
+   }
 
    /* sanity check */
-   assert(ss->Default1D->RefCount == 1);
+   assert(ss->DefaultTex[TEXTURE_1D_INDEX]->RefCount == 1);
 
    _glthread_INIT_MUTEX(ss->TexMutex);
    ss->TextureStateStamp = 0;
@@ -547,20 +536,10 @@ cleanup:
       _mesa_DeleteHashTable(ss->RenderBuffers);
 #endif
 
-   if (ss->Default1D)
-      (*ctx->Driver.DeleteTexture)(ctx, ss->Default1D);
-   if (ss->Default2D)
-      (*ctx->Driver.DeleteTexture)(ctx, ss->Default2D);
-   if (ss->Default3D)
-      (*ctx->Driver.DeleteTexture)(ctx, ss->Default3D);
-   if (ss->DefaultCubeMap)
-      (*ctx->Driver.DeleteTexture)(ctx, ss->DefaultCubeMap);
-   if (ss->DefaultRect)
-      (*ctx->Driver.DeleteTexture)(ctx, ss->DefaultRect);
-   if (ss->Default1DArray)
-      (*ctx->Driver.DeleteTexture)(ctx, ss->Default1DArray);
-   if (ss->Default2DArray)
-      (*ctx->Driver.DeleteTexture)(ctx, ss->Default2DArray);
+   for (i = 0; i < NUM_TEXTURE_TARGETS; i++) {
+      if (ss->DefaultTex[i])
+         ctx->Driver.DeleteTexture(ctx, ss->DefaultTex[i]);
+   }
 
    _mesa_free(ss);
 
@@ -723,6 +702,8 @@ delete_renderbuffer_cb(GLuint id, void *data, void *userData)
 static void
 free_shared_state( GLcontext *ctx, struct gl_shared_state *ss )
 {
+   GLuint i;
+
    /*
     * Free display lists
     */
@@ -772,13 +753,9 @@ free_shared_state( GLcontext *ctx, struct gl_shared_state *ss )
     */
    ASSERT(ctx->Driver.DeleteTexture);
    /* the default textures */
-   ctx->Driver.DeleteTexture(ctx, ss->Default1D);
-   ctx->Driver.DeleteTexture(ctx, ss->Default2D);
-   ctx->Driver.DeleteTexture(ctx, ss->Default3D);
-   ctx->Driver.DeleteTexture(ctx, ss->DefaultCubeMap);
-   ctx->Driver.DeleteTexture(ctx, ss->DefaultRect);
-   ctx->Driver.DeleteTexture(ctx, ss->Default1DArray);
-   ctx->Driver.DeleteTexture(ctx, ss->Default2DArray);
+   for (i = 0; i < NUM_TEXTURE_TARGETS; i++) {
+      ctx->Driver.DeleteTexture(ctx, ss->DefaultTex[i]);
+   }
    /* all other textures */
    _mesa_HashDeleteAll(ss->TexObjects, delete_texture_cb, ctx);
    _mesa_DeleteHashTable(ss->TexObjects);
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 92fe4cb77d..bd7d6f0784 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2198,18 +2198,8 @@ struct gl_shared_state
    struct _mesa_HashTable *DisplayList;	   /**< Display lists hash table */
    struct _mesa_HashTable *TexObjects;	   /**< Texture objects hash table */
 
-   /**
-    * \name Default texture objects (shared by all multi-texture units)
-    */
-   /*@{*/
-   struct gl_texture_object *Default1D;
-   struct gl_texture_object *Default2D;
-   struct gl_texture_object *Default3D;
-   struct gl_texture_object *DefaultCubeMap;
-   struct gl_texture_object *DefaultRect;
-   struct gl_texture_object *Default1DArray;
-   struct gl_texture_object *Default2DArray;
-   /*@}*/
+   /** Default texture objects (shared by all texture units) */
+   struct gl_texture_object *DefaultTex[NUM_TEXTURE_TARGETS];
 
    /**
     * \name Thread safety and statechange notification for texture
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index b4e30c8bb7..52a651c4b6 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -764,31 +764,38 @@ unbind_texobj_from_texunits(GLcontext *ctx, struct gl_texture_object *texObj)
    for (u = 0; u < MAX_TEXTURE_IMAGE_UNITS; u++) {
       struct gl_texture_unit *unit = &ctx->Texture.Unit[u];
       if (texObj == unit->Current1D) {
-         _mesa_reference_texobj(&unit->Current1D, ctx->Shared->Default1D);
+         _mesa_reference_texobj(&unit->Current1D,
+                                ctx->Shared->DefaultTex[TEXTURE_1D_INDEX]);
          ASSERT(unit->Current1D);
       }
       else if (texObj == unit->Current2D) {
-         _mesa_reference_texobj(&unit->Current2D, ctx->Shared->Default2D);
+         _mesa_reference_texobj(&unit->Current2D,
+                                ctx->Shared->DefaultTex[TEXTURE_2D_INDEX]);
          ASSERT(unit->Current2D);
       }
       else if (texObj == unit->Current3D) {
-         _mesa_reference_texobj(&unit->Current3D, ctx->Shared->Default3D);
+         _mesa_reference_texobj(&unit->Current3D,
+                                ctx->Shared->DefaultTex[TEXTURE_3D_INDEX]);
          ASSERT(unit->Current3D);
       }
       else if (texObj == unit->CurrentCubeMap) {
-         _mesa_reference_texobj(&unit->CurrentCubeMap, ctx->Shared->DefaultCubeMap);
+         _mesa_reference_texobj(&unit->CurrentCubeMap,
+                                ctx->Shared->DefaultTex[TEXTURE_CUBE_INDEX]);
          ASSERT(unit->CurrentCubeMap);
       }
       else if (texObj == unit->CurrentRect) {
-         _mesa_reference_texobj(&unit->CurrentRect, ctx->Shared->DefaultRect);
+         _mesa_reference_texobj(&unit->CurrentRect,
+                                ctx->Shared->DefaultTex[TEXTURE_RECT_INDEX]);
          ASSERT(unit->CurrentRect);
       }
       else if (texObj == unit->Current1DArray) {
-         _mesa_reference_texobj(&unit->Current1DArray, ctx->Shared->Default1DArray);
+         _mesa_reference_texobj(&unit->Current1DArray,
+                             ctx->Shared->DefaultTex[TEXTURE_1D_ARRAY_INDEX]);
          ASSERT(unit->Current1DArray);
       }
       else if (texObj == unit->Current2DArray) {
-         _mesa_reference_texobj(&unit->Current2DArray, ctx->Shared->Default2DArray);
+         _mesa_reference_texobj(&unit->Current2DArray,
+                             ctx->Shared->DefaultTex[TEXTURE_2D_ARRAY_INDEX]);
          ASSERT(unit->Current2DArray);
       }
    }
@@ -889,25 +896,25 @@ _mesa_BindTexture( GLenum target, GLuint texName )
 
    switch (target) {
    case GL_TEXTURE_1D:
-      defaultTexObj = ctx->Shared->Default1D;
+      defaultTexObj = ctx->Shared->DefaultTex[TEXTURE_1D_INDEX];
       break;
    case GL_TEXTURE_2D:
-      defaultTexObj = ctx->Shared->Default2D;
+      defaultTexObj = ctx->Shared->DefaultTex[TEXTURE_2D_INDEX];
       break;
    case GL_TEXTURE_3D:
-      defaultTexObj = ctx->Shared->Default3D;
+      defaultTexObj = ctx->Shared->DefaultTex[TEXTURE_3D_INDEX];
       break;
    case GL_TEXTURE_CUBE_MAP_ARB:
-      defaultTexObj = ctx->Shared->DefaultCubeMap;
+      defaultTexObj = ctx->Shared->DefaultTex[TEXTURE_CUBE_INDEX];
       break;
    case GL_TEXTURE_RECTANGLE_NV:
-      defaultTexObj = ctx->Shared->DefaultRect;
+      defaultTexObj = ctx->Shared->DefaultTex[TEXTURE_RECT_INDEX];
       break;
    case GL_TEXTURE_1D_ARRAY_EXT:
-      defaultTexObj = ctx->Shared->Default1DArray;
+      defaultTexObj = ctx->Shared->DefaultTex[TEXTURE_1D_ARRAY_INDEX];
       break;
    case GL_TEXTURE_2D_ARRAY_EXT:
-      defaultTexObj = ctx->Shared->Default2DArray;
+      defaultTexObj = ctx->Shared->DefaultTex[TEXTURE_2D_ARRAY_INDEX];
       break;
    default:
       _mesa_error(ctx, GL_INVALID_ENUM, "glBindTexture(target)");
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 053097cec0..b9e1a2a687 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -763,13 +763,13 @@ init_texture_unit( GLcontext *ctx, GLuint unit )
    ASSIGN_4V( texUnit->GenQ.EyePlane, 0.0, 0.0, 0.0, 0.0 );
 
    /* initialize current texture object ptrs to the shared default objects */
-   _mesa_reference_texobj(&texUnit->Current1D, ctx->Shared->Default1D);
-   _mesa_reference_texobj(&texUnit->Current2D, ctx->Shared->Default2D);
-   _mesa_reference_texobj(&texUnit->Current3D, ctx->Shared->Default3D);
-   _mesa_reference_texobj(&texUnit->CurrentCubeMap, ctx->Shared->DefaultCubeMap);
-   _mesa_reference_texobj(&texUnit->CurrentRect, ctx->Shared->DefaultRect);
-   _mesa_reference_texobj(&texUnit->Current1DArray, ctx->Shared->Default1DArray);
-   _mesa_reference_texobj(&texUnit->Current2DArray, ctx->Shared->Default2DArray);
+   _mesa_reference_texobj(&texUnit->Current1D, ctx->Shared->DefaultTex[TEXTURE_1D_INDEX]);
+   _mesa_reference_texobj(&texUnit->Current2D, ctx->Shared->DefaultTex[TEXTURE_2D_INDEX]);
+   _mesa_reference_texobj(&texUnit->Current3D, ctx->Shared->DefaultTex[TEXTURE_3D_INDEX]);
+   _mesa_reference_texobj(&texUnit->CurrentCubeMap, ctx->Shared->DefaultTex[TEXTURE_CUBE_INDEX]);
+   _mesa_reference_texobj(&texUnit->CurrentRect, ctx->Shared->DefaultTex[TEXTURE_RECT_INDEX]);
+   _mesa_reference_texobj(&texUnit->Current1DArray, ctx->Shared->DefaultTex[TEXTURE_1D_ARRAY_INDEX]);
+   _mesa_reference_texobj(&texUnit->Current2DArray, ctx->Shared->DefaultTex[TEXTURE_2D_ARRAY_INDEX]);
 }
 
 
@@ -798,7 +798,8 @@ _mesa_init_texture(GLcontext *ctx)
    /* After we're done initializing the context's texture state the default
     * texture objects' refcounts should be at least MAX_TEXTURE_UNITS + 1.
     */
-   assert(ctx->Shared->Default1D->RefCount >= MAX_TEXTURE_UNITS + 1);
+   assert(ctx->Shared->DefaultTex[TEXTURE_1D_INDEX]->RefCount
+          >= MAX_TEXTURE_UNITS + 1);
 
    /* Allocate proxy textures */
    if (!alloc_proxy_textures( ctx ))
@@ -855,12 +856,19 @@ _mesa_update_default_objects_texture(GLcontext *ctx)
    for (i = 0; i < MAX_TEXTURE_UNITS; i++) {
       struct gl_texture_unit *texUnit = &ctx->Texture.Unit[i];
 
-      _mesa_reference_texobj(&texUnit->Current1D, ctx->Shared->Default1D);
-      _mesa_reference_texobj(&texUnit->Current2D, ctx->Shared->Default2D);
-      _mesa_reference_texobj(&texUnit->Current3D, ctx->Shared->Default3D);
-      _mesa_reference_texobj(&texUnit->CurrentCubeMap, ctx->Shared->DefaultCubeMap);
-      _mesa_reference_texobj(&texUnit->CurrentRect, ctx->Shared->DefaultRect);
-      _mesa_reference_texobj(&texUnit->Current1DArray, ctx->Shared->Default1DArray);
-      _mesa_reference_texobj(&texUnit->Current2DArray, ctx->Shared->Default2DArray);
+      _mesa_reference_texobj(&texUnit->Current1D,
+                             ctx->Shared->DefaultTex[TEXTURE_1D_INDEX]);
+      _mesa_reference_texobj(&texUnit->Current2D,
+                             ctx->Shared->DefaultTex[TEXTURE_2D_INDEX]);
+      _mesa_reference_texobj(&texUnit->Current3D,
+                             ctx->Shared->DefaultTex[TEXTURE_3D_INDEX]);
+      _mesa_reference_texobj(&texUnit->CurrentCubeMap,
+                             ctx->Shared->DefaultTex[TEXTURE_CUBE_INDEX]);
+      _mesa_reference_texobj(&texUnit->CurrentRect,
+                             ctx->Shared->DefaultTex[TEXTURE_RECT_INDEX]);
+      _mesa_reference_texobj(&texUnit->Current1DArray,
+                             ctx->Shared->DefaultTex[TEXTURE_1D_ARRAY_INDEX]);
+      _mesa_reference_texobj(&texUnit->Current2DArray,
+                             ctx->Shared->DefaultTex[TEXTURE_2D_ARRAY_INDEX]);
    }
 }
-- 
cgit v1.2.3


From 9818734e0148510967ca9ee0d1aa8b196b509f02 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Sat, 21 Feb 2009 14:53:25 -0700
Subject: mesa: use an array for current texture objects

Use loops to consolidate lots of texture object code.
---
 src/mesa/drivers/dri/common/texmem.c    |  10 +--
 src/mesa/drivers/dri/gamma/gamma_tex.c  |   8 +-
 src/mesa/drivers/dri/mga/mga_texstate.c |   8 +-
 src/mesa/drivers/dri/r300/r300_state.c  |   2 +-
 src/mesa/drivers/dri/s3v/s3v_tex.c      |   8 +-
 src/mesa/drivers/x11/xm_api.c           |   6 +-
 src/mesa/main/attrib.c                  |  38 +++------
 src/mesa/main/get.c                     |  42 +++++-----
 src/mesa/main/get_gen.py                |  14 ++--
 src/mesa/main/mtypes.h                  |  14 ++--
 src/mesa/main/teximage.c                |  14 ++--
 src/mesa/main/texobj.c                  | 136 +++++++++++---------------------
 src/mesa/main/texparam.c                |  14 ++--
 src/mesa/main/texstate.c                | 103 +++++++++---------------
 src/mesa/state_tracker/st_texture.c     |   2 +-
 src/mesa/swrast/s_triangle.c            |  15 ++--
 16 files changed, 169 insertions(+), 265 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/common/texmem.c b/src/mesa/drivers/dri/common/texmem.c
index ff174a251d..041d8c6e97 100644
--- a/src/mesa/drivers/dri/common/texmem.c
+++ b/src/mesa/drivers/dri/common/texmem.c
@@ -1063,31 +1063,31 @@ void driInitTextureObjects( GLcontext *ctx, driTextureObject * swapped,
       ctx->Texture.CurrentUnit = i;
 
       if ( (targets & DRI_TEXMGR_DO_TEXTURE_1D) != 0 ) {
-	 texObj = ctx->Texture.Unit[i].Current1D;
+	 texObj = ctx->Texture.Unit[i].CurrentTex[TEXTURE_1D_INDEX];
 	 ctx->Driver.BindTexture( ctx, GL_TEXTURE_1D, texObj );
 	 move_to_tail( swapped, (driTextureObject *) texObj->DriverData );
       }
 
       if ( (targets & DRI_TEXMGR_DO_TEXTURE_2D) != 0 ) {
-	 texObj = ctx->Texture.Unit[i].Current2D;
+	 texObj = ctx->Texture.Unit[i].CurrentTex[TEXTURE_2D_INDEX];
 	 ctx->Driver.BindTexture( ctx, GL_TEXTURE_2D, texObj );
 	 move_to_tail( swapped, (driTextureObject *) texObj->DriverData );
       }
 
       if ( (targets & DRI_TEXMGR_DO_TEXTURE_3D) != 0 ) {
-	 texObj = ctx->Texture.Unit[i].Current3D;
+	 texObj = ctx->Texture.Unit[i].CurrentTex[TEXTURE_3D_INDEX];
 	 ctx->Driver.BindTexture( ctx, GL_TEXTURE_3D, texObj );
 	 move_to_tail( swapped, (driTextureObject *) texObj->DriverData );
       }
 
       if ( (targets & DRI_TEXMGR_DO_TEXTURE_CUBE) != 0 ) {
-	 texObj = ctx->Texture.Unit[i].CurrentCubeMap;
+	 texObj = ctx->Texture.Unit[i].CurrentTex[TEXTURE_CUBE_INDEX]Map;
 	 ctx->Driver.BindTexture( ctx, GL_TEXTURE_CUBE_MAP_ARB, texObj );
 	 move_to_tail( swapped, (driTextureObject *) texObj->DriverData );
       }
 
       if ( (targets & DRI_TEXMGR_DO_TEXTURE_RECT) != 0 ) {
-	 texObj = ctx->Texture.Unit[i].CurrentRect;
+	 texObj = ctx->Texture.Unit[i].CurrentTex[TEXTURE_RECT_INDEX];
 	 ctx->Driver.BindTexture( ctx, GL_TEXTURE_RECTANGLE_NV, texObj );
 	 move_to_tail( swapped, (driTextureObject *) texObj->DriverData );
       }
diff --git a/src/mesa/drivers/dri/gamma/gamma_tex.c b/src/mesa/drivers/dri/gamma/gamma_tex.c
index 2ffb790f28..ca33c1740f 100644
--- a/src/mesa/drivers/dri/gamma/gamma_tex.c
+++ b/src/mesa/drivers/dri/gamma/gamma_tex.c
@@ -400,19 +400,19 @@ void gammaInitTextureObjects( GLcontext *ctx )
 
    ctx->Texture.CurrentUnit = 0;
 
-   texObj = ctx->Texture.Unit[0].Current1D;
+   texObj = ctx->Texture.Unit[0].CurrentTex[TEXTURE_1D_INDEX];
    gammaBindTexture( ctx, GL_TEXTURE_1D, texObj );
 
-   texObj = ctx->Texture.Unit[0].Current2D;
+   texObj = ctx->Texture.Unit[0].CurrentTex[TEXTURE_2D_INDEX];
    gammaBindTexture( ctx, GL_TEXTURE_2D, texObj );
 
 #if 0
    ctx->Texture.CurrentUnit = 1;
 
-   texObj = ctx->Texture.Unit[1].Current1D;
+   texObj = ctx->Texture.Unit[1].CurrentTex[TEXTURE_1D_INDEX];
    gammaBindTexture( ctx, GL_TEXTURE_1D, texObj );
 
-   texObj = ctx->Texture.Unit[1].Current2D;
+   texObj = ctx->Texture.Unit[1].CurrentTex[TEXTURE_2D_INDEX];
    gammaBindTexture( ctx, GL_TEXTURE_2D, texObj );
 #endif
 
diff --git a/src/mesa/drivers/dri/mga/mga_texstate.c b/src/mesa/drivers/dri/mga/mga_texstate.c
index d4c5b6fd97..ad765d1dd7 100644
--- a/src/mesa/drivers/dri/mga/mga_texstate.c
+++ b/src/mesa/drivers/dri/mga/mga_texstate.c
@@ -206,8 +206,8 @@ static void mgaUpdateTextureEnvG200( GLcontext *ctx, GLuint unit )
    mgaTextureObjectPtr t = (mgaTextureObjectPtr) tObj->DriverData;
    GLenum format = tObj->Image[0][tObj->BaseLevel]->_BaseFormat;
 
-   if (tObj != ctx->Texture.Unit[0].Current2D &&
-       tObj != ctx->Texture.Unit[0].CurrentRect)
+   if (tObj != ctx->Texture.Unit[0].CurrentTex[TEXTURE_2D_INDEX] &&
+       tObj != ctx->Texture.Unit[0].CurrentTex[TEXTURE_RECT_INDEX])
       return;
 
 
@@ -635,8 +635,8 @@ static void mgaUpdateTextureEnvG400( GLcontext *ctx, GLuint unit )
    mgaTextureObjectPtr t = (mgaTextureObjectPtr) tObj->DriverData;
    GLenum format = tObj->Image[0][tObj->BaseLevel]->_BaseFormat;
 
-   if (tObj != ctx->Texture.Unit[source].Current2D &&
-       tObj != ctx->Texture.Unit[source].CurrentRect)
+   if (tObj != ctx->Texture.Unit[source].CurrentTex[TEXTURE_2D_INDEX] &&
+       tObj != ctx->Texture.Unit[source].CurrentTex[TEXTURE_RECT_INDEX])
       return;
 
    switch (ctx->Texture.Unit[source].EnvMode) {
diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index c192fecca4..ade45f581c 100644
--- a/src/mesa/drivers/dri/r300/r300_state.c
+++ b/src/mesa/drivers/dri/r300/r300_state.c
@@ -1199,7 +1199,7 @@ r300FetchStateParameter(GLcontext * ctx,
 
 		case STATE_R300_TEXRECT_FACTOR:{
 				struct gl_texture_object *t =
-				    ctx->Texture.Unit[state[2]].CurrentRect;
+				    ctx->Texture.Unit[state[2]].CurrentTex[TEXTURE_RECT_INDEX];
 
 				if (t && t->Image[0][t->BaseLevel]) {
 					struct gl_texture_image *image =
diff --git a/src/mesa/drivers/dri/s3v/s3v_tex.c b/src/mesa/drivers/dri/s3v/s3v_tex.c
index 8bf2ea9878..db66026363 100644
--- a/src/mesa/drivers/dri/s3v/s3v_tex.c
+++ b/src/mesa/drivers/dri/s3v/s3v_tex.c
@@ -502,20 +502,20 @@ static void s3vInitTextureObjects( GLcontext *ctx )
 #if 1
 	ctx->Texture.CurrentUnit = 0;
 
-	texObj = ctx->Texture.Unit[0].Current1D;
+	texObj = ctx->Texture.Unit[0].CurrentTex[TEXTURE_1D_INDEX];
 	s3vBindTexture( ctx, GL_TEXTURE_1D, texObj );
 
-	texObj = ctx->Texture.Unit[0].Current2D;
+	texObj = ctx->Texture.Unit[0].CurrentTex[TEXTURE_2D_INDEX];
 	s3vBindTexture( ctx, GL_TEXTURE_2D, texObj );
 #endif
 
 #if 0
 	ctx->Texture.CurrentUnit = 1;
 
-	texObj = ctx->Texture.Unit[1].Current1D;
+	texObj = ctx->Texture.Unit[1].CurrentTex[TEXTURE_1D_INDEX];
 	s3vBindTexture( ctx, GL_TEXTURE_1D, texObj );
 
-	texObj = ctx->Texture.Unit[1].Current2D;
+	texObj = ctx->Texture.Unit[1].CurrentTex[TEXTURE_2D_INDEX];
 	s3vBindTexture( ctx, GL_TEXTURE_2D, texObj );
 #endif
 
diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c
index 2a8c3a4fd3..62d30a6987 100644
--- a/src/mesa/drivers/x11/xm_api.c
+++ b/src/mesa/drivers/x11/xm_api.c
@@ -2461,13 +2461,13 @@ XMesaBindTexImage(XMesaDisplay *dpy, XMesaBuffer drawable, int buffer,
 #if 0
    switch (drawable->TextureTarget) {
    case GLX_TEXTURE_1D_EXT:
-      texObj = texUnit->Current1D;
+      texObj = texUnit->CurrentTex[TEXTURE_1D_INDEX];
       break;
    case GLX_TEXTURE_2D_EXT:
-      texObj = texUnit->Current2D;
+      texObj = texUnit->CurrentTex[TEXTURE_2D_INDEX];
       break;
    case GLX_TEXTURE_RECTANGLE_EXT:
-      texObj = texUnit->CurrentRect;
+      texObj = texUnit->CurrentTex[TEXTURE_RECT_INDEX];
       break;
    default:
       return; /* BadMatch error */
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index dc33eb1fac..996033a2d8 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -365,7 +365,7 @@ _mesa_PushAttrib(GLbitfield mask)
 
    if (mask & GL_TEXTURE_BIT) {
       struct texture_state *texstate = CALLOC_STRUCT(texture_state);
-      GLuint u;
+      GLuint u, tex;
 
       if (!texstate) {
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "glPushAttrib(GL_TEXTURE_BIT)");
@@ -381,38 +381,18 @@ _mesa_PushAttrib(GLbitfield mask)
        * accidentally get deleted while referenced in the attribute stack.
        */
       for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {
-         _mesa_reference_texobj(&texstate->SavedTexRef[u][TEXTURE_1D_INDEX],
-                                ctx->Texture.Unit[u].Current1D);
-         _mesa_reference_texobj(&texstate->SavedTexRef[u][TEXTURE_2D_INDEX],
-                                ctx->Texture.Unit[u].Current2D);
-         _mesa_reference_texobj(&texstate->SavedTexRef[u][TEXTURE_3D_INDEX],
-                                ctx->Texture.Unit[u].Current3D);
-         _mesa_reference_texobj(&texstate->SavedTexRef[u][TEXTURE_CUBE_INDEX],
-                                ctx->Texture.Unit[u].CurrentCubeMap);
-         _mesa_reference_texobj(&texstate->SavedTexRef[u][TEXTURE_RECT_INDEX],
-                                ctx->Texture.Unit[u].CurrentRect);
-         _mesa_reference_texobj(&texstate->SavedTexRef[u][TEXTURE_1D_ARRAY_INDEX],
-                                ctx->Texture.Unit[u].Current1DArray);
-         _mesa_reference_texobj(&texstate->SavedTexRef[u][TEXTURE_2D_ARRAY_INDEX],
-                                ctx->Texture.Unit[u].Current2DArray);
+         for (tex = 0; tex < NUM_TEXTURE_TARGETS; tex++) {
+            _mesa_reference_texobj(&texstate->SavedTexRef[u][tex],
+                                   ctx->Texture.Unit[u].CurrentTex[tex]);
+         }
       }
 
       /* copy state/contents of the currently bound texture objects */
       for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {
-         _mesa_copy_texture_object(&texstate->SavedObj[u][TEXTURE_1D_INDEX],
-                                   ctx->Texture.Unit[u].Current1D);
-         _mesa_copy_texture_object(&texstate->SavedObj[u][TEXTURE_2D_INDEX],
-                                   ctx->Texture.Unit[u].Current2D);
-         _mesa_copy_texture_object(&texstate->SavedObj[u][TEXTURE_3D_INDEX],
-                                   ctx->Texture.Unit[u].Current3D);
-         _mesa_copy_texture_object(&texstate->SavedObj[u][TEXTURE_CUBE_INDEX],
-                                   ctx->Texture.Unit[u].CurrentCubeMap);
-         _mesa_copy_texture_object(&texstate->SavedObj[u][TEXTURE_RECT_INDEX],
-                                   ctx->Texture.Unit[u].CurrentRect);
-         _mesa_copy_texture_object(&texstate->SavedObj[u][TEXTURE_1D_ARRAY_INDEX],
-                                   ctx->Texture.Unit[u].Current1DArray);
-         _mesa_copy_texture_object(&texstate->SavedObj[u][TEXTURE_2D_ARRAY_INDEX],
-                                   ctx->Texture.Unit[u].Current2DArray);
+         for (tex = 0; tex < NUM_TEXTURE_TARGETS; tex++) {
+            _mesa_copy_texture_object(&texstate->SavedObj[u][tex],
+                                      ctx->Texture.Unit[u].CurrentTex[tex]);
+         }
       }
 
       _mesa_unlock_context_textures(ctx);
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 87a821b12d..3a8d56140f 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -884,21 +884,21 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          params[0] = _mesa_IsEnabled(GL_TEXTURE_2D_ARRAY_EXT);
          break;
       case GL_TEXTURE_BINDING_1D:
-         params[0] = INT_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current1D->Name);
+         params[0] = INT_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_1D_INDEX]->Name);
          break;
       case GL_TEXTURE_BINDING_2D:
-         params[0] = INT_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current2D->Name);
+         params[0] = INT_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_2D_INDEX]->Name);
          break;
       case GL_TEXTURE_BINDING_3D:
-         params[0] = INT_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current3D->Name);
+         params[0] = INT_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_3D_INDEX]->Name);
          break;
       case GL_TEXTURE_BINDING_1D_ARRAY_EXT:
          CHECK_EXT1(MESA_texture_array, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current1DArray->Name);
+         params[0] = INT_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_1D_ARRAY_INDEX]->Name);
          break;
       case GL_TEXTURE_BINDING_2D_ARRAY_EXT:
          CHECK_EXT1(MESA_texture_array, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current2DArray->Name);
+         params[0] = INT_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_2D_ARRAY_INDEX]->Name);
          break;
       case GL_TEXTURE_GEN_S:
          params[0] = ((ctx->Texture.Unit[ctx->Texture.CurrentUnit].TexGenEnabled & S_BIT) ? 1 : 0);
@@ -1071,7 +1071,7 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          break;
       case GL_TEXTURE_BINDING_CUBE_MAP_ARB:
          CHECK_EXT1(ARB_texture_cube_map, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentCubeMap->Name);
+         params[0] = INT_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_CUBE_INDEX]->Name);
          break;
       case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB:
          CHECK_EXT1(ARB_texture_cube_map, "GetBooleanv");
@@ -1558,7 +1558,7 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          break;
       case GL_TEXTURE_BINDING_RECTANGLE_NV:
          CHECK_EXT1(NV_texture_rectangle, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentRect->Name);
+         params[0] = INT_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_RECT_INDEX]->Name);
          break;
       case GL_MAX_RECTANGLE_TEXTURE_SIZE_NV:
          CHECK_EXT1(NV_texture_rectangle, "GetBooleanv");
@@ -2710,21 +2710,21 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          params[0] = BOOLEAN_TO_FLOAT(_mesa_IsEnabled(GL_TEXTURE_2D_ARRAY_EXT));
          break;
       case GL_TEXTURE_BINDING_1D:
-         params[0] = (GLfloat)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current1D->Name);
+         params[0] = (GLfloat)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_1D_INDEX]->Name);
          break;
       case GL_TEXTURE_BINDING_2D:
-         params[0] = (GLfloat)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current2D->Name);
+         params[0] = (GLfloat)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_2D_INDEX]->Name);
          break;
       case GL_TEXTURE_BINDING_3D:
-         params[0] = (GLfloat)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current3D->Name);
+         params[0] = (GLfloat)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_3D_INDEX]->Name);
          break;
       case GL_TEXTURE_BINDING_1D_ARRAY_EXT:
          CHECK_EXT1(MESA_texture_array, "GetFloatv");
-         params[0] = (GLfloat)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current1DArray->Name);
+         params[0] = (GLfloat)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_1D_ARRAY_INDEX]->Name);
          break;
       case GL_TEXTURE_BINDING_2D_ARRAY_EXT:
          CHECK_EXT1(MESA_texture_array, "GetFloatv");
-         params[0] = (GLfloat)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current2DArray->Name);
+         params[0] = (GLfloat)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_2D_ARRAY_INDEX]->Name);
          break;
       case GL_TEXTURE_GEN_S:
          params[0] = BOOLEAN_TO_FLOAT(((ctx->Texture.Unit[ctx->Texture.CurrentUnit].TexGenEnabled & S_BIT) ? 1 : 0));
@@ -2897,7 +2897,7 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          break;
       case GL_TEXTURE_BINDING_CUBE_MAP_ARB:
          CHECK_EXT1(ARB_texture_cube_map, "GetFloatv");
-         params[0] = (GLfloat)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentCubeMap->Name);
+         params[0] = (GLfloat)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_CUBE_INDEX]->Name);
          break;
       case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB:
          CHECK_EXT1(ARB_texture_cube_map, "GetFloatv");
@@ -3384,7 +3384,7 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          break;
       case GL_TEXTURE_BINDING_RECTANGLE_NV:
          CHECK_EXT1(NV_texture_rectangle, "GetFloatv");
-         params[0] = (GLfloat)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentRect->Name);
+         params[0] = (GLfloat)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_RECT_INDEX]->Name);
          break;
       case GL_MAX_RECTANGLE_TEXTURE_SIZE_NV:
          CHECK_EXT1(NV_texture_rectangle, "GetFloatv");
@@ -4536,21 +4536,21 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          params[0] = BOOLEAN_TO_INT(_mesa_IsEnabled(GL_TEXTURE_2D_ARRAY_EXT));
          break;
       case GL_TEXTURE_BINDING_1D:
-         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current1D->Name;
+         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_1D_INDEX]->Name;
          break;
       case GL_TEXTURE_BINDING_2D:
-         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current2D->Name;
+         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_2D_INDEX]->Name;
          break;
       case GL_TEXTURE_BINDING_3D:
-         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current3D->Name;
+         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_3D_INDEX]->Name;
          break;
       case GL_TEXTURE_BINDING_1D_ARRAY_EXT:
          CHECK_EXT1(MESA_texture_array, "GetIntegerv");
-         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current1DArray->Name;
+         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_1D_ARRAY_INDEX]->Name;
          break;
       case GL_TEXTURE_BINDING_2D_ARRAY_EXT:
          CHECK_EXT1(MESA_texture_array, "GetIntegerv");
-         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current2DArray->Name;
+         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_2D_ARRAY_INDEX]->Name;
          break;
       case GL_TEXTURE_GEN_S:
          params[0] = BOOLEAN_TO_INT(((ctx->Texture.Unit[ctx->Texture.CurrentUnit].TexGenEnabled & S_BIT) ? 1 : 0));
@@ -4723,7 +4723,7 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          break;
       case GL_TEXTURE_BINDING_CUBE_MAP_ARB:
          CHECK_EXT1(ARB_texture_cube_map, "GetIntegerv");
-         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentCubeMap->Name;
+         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_CUBE_INDEX]->Name;
          break;
       case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB:
          CHECK_EXT1(ARB_texture_cube_map, "GetIntegerv");
@@ -5210,7 +5210,7 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          break;
       case GL_TEXTURE_BINDING_RECTANGLE_NV:
          CHECK_EXT1(NV_texture_rectangle, "GetIntegerv");
-         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentRect->Name;
+         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_RECT_INDEX]->Name;
          break;
       case GL_MAX_RECTANGLE_TEXTURE_SIZE_NV:
          CHECK_EXT1(NV_texture_rectangle, "GetIntegerv");
diff --git a/src/mesa/main/get_gen.py b/src/mesa/main/get_gen.py
index 3b2496c663..729f382b4b 100644
--- a/src/mesa/main/get_gen.py
+++ b/src/mesa/main/get_gen.py
@@ -432,15 +432,15 @@ StateVars = [
 	( "GL_TEXTURE_1D_ARRAY_EXT", GLboolean, ["_mesa_IsEnabled(GL_TEXTURE_1D_ARRAY_EXT)"], "", ["MESA_texture_array"] ),
 	( "GL_TEXTURE_2D_ARRAY_EXT", GLboolean, ["_mesa_IsEnabled(GL_TEXTURE_2D_ARRAY_EXT)"], "", ["MESA_texture_array"] ),
 	( "GL_TEXTURE_BINDING_1D", GLint,
-	  ["ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current1D->Name"], "", None ),
+	  ["ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_1D_INDEX]->Name"], "", None ),
 	( "GL_TEXTURE_BINDING_2D", GLint,
-	  ["ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current2D->Name"], "", None ),
+	  ["ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_2D_INDEX]->Name"], "", None ),
 	( "GL_TEXTURE_BINDING_3D", GLint,
-	  ["ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current3D->Name"], "", None ),
+	  ["ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_3D_INDEX]->Name"], "", None ),
 	( "GL_TEXTURE_BINDING_1D_ARRAY_EXT", GLint,
-	  ["ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current1DArray->Name"], "", ["MESA_texture_array"] ),
+	  ["ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_1D_ARRAY_INDEX]->Name"], "", ["MESA_texture_array"] ),
 	( "GL_TEXTURE_BINDING_2D_ARRAY_EXT", GLint,
-	  ["ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current2DArray->Name"], "", ["MESA_texture_array"] ),
+	  ["ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_2D_ARRAY_INDEX]->Name"], "", ["MESA_texture_array"] ),
 	( "GL_TEXTURE_GEN_S", GLboolean,
 	  ["((ctx->Texture.Unit[ctx->Texture.CurrentUnit].TexGenEnabled & S_BIT) ? 1 : 0)"], "", None ),
 	( "GL_TEXTURE_GEN_T", GLboolean,
@@ -515,7 +515,7 @@ StateVars = [
 	( "GL_TEXTURE_CUBE_MAP_ARB", GLboolean,
 	  ["_mesa_IsEnabled(GL_TEXTURE_CUBE_MAP_ARB)"], "", ["ARB_texture_cube_map"] ),
 	( "GL_TEXTURE_BINDING_CUBE_MAP_ARB", GLint,
-	  ["ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentCubeMap->Name"],
+	  ["ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_CUBE_INDEX]->Name"],
 	  "", ["ARB_texture_cube_map"] ),
 	( "GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB", GLint,
 	  ["(1 << (ctx->Const.MaxCubeTextureLevels - 1))"],
@@ -795,7 +795,7 @@ StateVars = [
 	( "GL_TEXTURE_RECTANGLE_NV", GLboolean,
 	  ["_mesa_IsEnabled(GL_TEXTURE_RECTANGLE_NV)"], "", ["NV_texture_rectangle"] ),
 	( "GL_TEXTURE_BINDING_RECTANGLE_NV", GLint,
-	  ["ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentRect->Name"],
+	  ["ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_RECT_INDEX]->Name"],
 	  "", ["NV_texture_rectangle"] ),
 	( "GL_MAX_RECTANGLE_TEXTURE_SIZE_NV", GLint,
 	  ["ctx->Const.MaxTextureRectSize"], "", ["NV_texture_rectangle"] ),
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index bd7d6f0784..06cef3d670 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1543,15 +1543,11 @@ struct gl_texture_unit
     */
    struct gl_tex_env_combine_state *_CurrentCombine;
 
-   struct gl_texture_object *Current1D;
-   struct gl_texture_object *Current2D;
-   struct gl_texture_object *Current3D;
-   struct gl_texture_object *CurrentCubeMap; /**< GL_ARB_texture_cube_map */
-   struct gl_texture_object *CurrentRect;    /**< GL_NV_texture_rectangle */
-   struct gl_texture_object *Current1DArray; /**< GL_MESA_texture_array */
-   struct gl_texture_object *Current2DArray; /**< GL_MESA_texture_array */
-
-   struct gl_texture_object *_Current; /**< Points to really enabled tex obj */
+   /** Current texture object pointers */
+   struct gl_texture_object *CurrentTex[NUM_TEXTURE_TARGETS];
+
+   /** Points to highest priority, complete and enabled texture object */
+   struct gl_texture_object *_Current;
 
    /** GL_SGI_texture_color_table */
    /*@{*/
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 8fd69c4f6a..e3d4404759 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -766,15 +766,15 @@ _mesa_select_tex_object(GLcontext *ctx, const struct gl_texture_unit *texUnit,
 {
    switch (target) {
       case GL_TEXTURE_1D:
-         return texUnit->Current1D;
+         return texUnit->CurrentTex[TEXTURE_1D_INDEX];
       case GL_PROXY_TEXTURE_1D:
          return ctx->Texture.ProxyTex[TEXTURE_1D_INDEX];
       case GL_TEXTURE_2D:
-         return texUnit->Current2D;
+         return texUnit->CurrentTex[TEXTURE_2D_INDEX];
       case GL_PROXY_TEXTURE_2D:
          return ctx->Texture.ProxyTex[TEXTURE_2D_INDEX];
       case GL_TEXTURE_3D:
-         return texUnit->Current3D;
+         return texUnit->CurrentTex[TEXTURE_3D_INDEX];
       case GL_PROXY_TEXTURE_3D:
          return ctx->Texture.ProxyTex[TEXTURE_3D_INDEX];
       case GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB:
@@ -785,25 +785,25 @@ _mesa_select_tex_object(GLcontext *ctx, const struct gl_texture_unit *texUnit,
       case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB:
       case GL_TEXTURE_CUBE_MAP_ARB:
          return ctx->Extensions.ARB_texture_cube_map
-                ? texUnit->CurrentCubeMap : NULL;
+                ? texUnit->CurrentTex[TEXTURE_CUBE_INDEX] : NULL;
       case GL_PROXY_TEXTURE_CUBE_MAP_ARB:
          return ctx->Extensions.ARB_texture_cube_map
                 ? ctx->Texture.ProxyTex[TEXTURE_CUBE_INDEX] : NULL;
       case GL_TEXTURE_RECTANGLE_NV:
          return ctx->Extensions.NV_texture_rectangle
-                ? texUnit->CurrentRect : NULL;
+                ? texUnit->CurrentTex[TEXTURE_RECT_INDEX] : NULL;
       case GL_PROXY_TEXTURE_RECTANGLE_NV:
          return ctx->Extensions.NV_texture_rectangle
                 ? ctx->Texture.ProxyTex[TEXTURE_RECT_INDEX] : NULL;
       case GL_TEXTURE_1D_ARRAY_EXT:
          return ctx->Extensions.MESA_texture_array
-                ? texUnit->Current1DArray : NULL;
+                ? texUnit->CurrentTex[TEXTURE_1D_ARRAY_INDEX] : NULL;
       case GL_PROXY_TEXTURE_1D_ARRAY_EXT:
          return ctx->Extensions.MESA_texture_array
                 ? ctx->Texture.ProxyTex[TEXTURE_1D_ARRAY_INDEX] : NULL;
       case GL_TEXTURE_2D_ARRAY_EXT:
          return ctx->Extensions.MESA_texture_array
-                ? texUnit->Current2DArray : NULL;
+                ? texUnit->CurrentTex[TEXTURE_2D_ARRAY_INDEX] : NULL;
       case GL_PROXY_TEXTURE_2D_ARRAY_EXT:
          return ctx->Extensions.MESA_texture_array
                 ? ctx->Texture.ProxyTex[TEXTURE_2D_ARRAY_INDEX] : NULL;
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index 52a651c4b6..2de2dcc95d 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -759,44 +759,17 @@ unbind_texobj_from_fbo(GLcontext *ctx, struct gl_texture_object *texObj)
 static void
 unbind_texobj_from_texunits(GLcontext *ctx, struct gl_texture_object *texObj)
 {
-   GLuint u;
+   GLuint u, tex;
 
    for (u = 0; u < MAX_TEXTURE_IMAGE_UNITS; u++) {
       struct gl_texture_unit *unit = &ctx->Texture.Unit[u];
-      if (texObj == unit->Current1D) {
-         _mesa_reference_texobj(&unit->Current1D,
-                                ctx->Shared->DefaultTex[TEXTURE_1D_INDEX]);
-         ASSERT(unit->Current1D);
-      }
-      else if (texObj == unit->Current2D) {
-         _mesa_reference_texobj(&unit->Current2D,
-                                ctx->Shared->DefaultTex[TEXTURE_2D_INDEX]);
-         ASSERT(unit->Current2D);
-      }
-      else if (texObj == unit->Current3D) {
-         _mesa_reference_texobj(&unit->Current3D,
-                                ctx->Shared->DefaultTex[TEXTURE_3D_INDEX]);
-         ASSERT(unit->Current3D);
-      }
-      else if (texObj == unit->CurrentCubeMap) {
-         _mesa_reference_texobj(&unit->CurrentCubeMap,
-                                ctx->Shared->DefaultTex[TEXTURE_CUBE_INDEX]);
-         ASSERT(unit->CurrentCubeMap);
-      }
-      else if (texObj == unit->CurrentRect) {
-         _mesa_reference_texobj(&unit->CurrentRect,
-                                ctx->Shared->DefaultTex[TEXTURE_RECT_INDEX]);
-         ASSERT(unit->CurrentRect);
-      }
-      else if (texObj == unit->Current1DArray) {
-         _mesa_reference_texobj(&unit->Current1DArray,
-                             ctx->Shared->DefaultTex[TEXTURE_1D_ARRAY_INDEX]);
-         ASSERT(unit->Current1DArray);
-      }
-      else if (texObj == unit->Current2DArray) {
-         _mesa_reference_texobj(&unit->Current2DArray,
-                             ctx->Shared->DefaultTex[TEXTURE_2D_ARRAY_INDEX]);
-         ASSERT(unit->Current2DArray);
+      for (tex = 0; tex < NUM_TEXTURE_TARGETS; tex++) {
+         if (texObj == unit->CurrentTex[tex]) {
+            _mesa_reference_texobj(&unit->CurrentTex[tex],
+                                   ctx->Shared->DefaultTex[TEXTURE_1D_INDEX]);
+            ASSERT(unit->CurrentTex[tex]);
+            break;
+         }
       }
    }
 }
@@ -866,6 +839,35 @@ _mesa_DeleteTextures( GLsizei n, const GLuint *textures)
 }
 
 
+/**
+ * Convert a GL texture target enum such as GL_TEXTURE_2D or GL_TEXTURE_3D
+ * into the corresponding Mesa texture target index.
+ * Return -1 if target is invalid.
+ */
+static GLint
+target_enum_to_index(GLenum target)
+{
+   switch (target) {
+   case GL_TEXTURE_1D:
+      return TEXTURE_1D_INDEX;
+   case GL_TEXTURE_2D:
+      return TEXTURE_2D_INDEX;
+   case GL_TEXTURE_3D:
+      return TEXTURE_3D_INDEX;
+   case GL_TEXTURE_CUBE_MAP_ARB:
+      return TEXTURE_CUBE_INDEX;
+   case GL_TEXTURE_RECTANGLE_NV:
+      return TEXTURE_RECT_INDEX;
+   case GL_TEXTURE_1D_ARRAY_EXT:
+      return TEXTURE_1D_ARRAY_INDEX;
+   case GL_TEXTURE_2D_ARRAY_EXT:
+      return TEXTURE_2D_ARRAY_INDEX;
+   default:
+      return -1;
+   }
+}
+
+
 /**
  * Bind a named texture to a texturing target.
  * 
@@ -888,38 +890,20 @@ _mesa_BindTexture( GLenum target, GLuint texName )
    const GLuint unit = ctx->Texture.CurrentUnit;
    struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
    struct gl_texture_object *newTexObj = NULL, *defaultTexObj = NULL;
+   GLint targetIndex;
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
    if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))
       _mesa_debug(ctx, "glBindTexture %s %d\n",
                   _mesa_lookup_enum_by_nr(target), (GLint) texName);
 
-   switch (target) {
-   case GL_TEXTURE_1D:
-      defaultTexObj = ctx->Shared->DefaultTex[TEXTURE_1D_INDEX];
-      break;
-   case GL_TEXTURE_2D:
-      defaultTexObj = ctx->Shared->DefaultTex[TEXTURE_2D_INDEX];
-      break;
-   case GL_TEXTURE_3D:
-      defaultTexObj = ctx->Shared->DefaultTex[TEXTURE_3D_INDEX];
-      break;
-   case GL_TEXTURE_CUBE_MAP_ARB:
-      defaultTexObj = ctx->Shared->DefaultTex[TEXTURE_CUBE_INDEX];
-      break;
-   case GL_TEXTURE_RECTANGLE_NV:
-      defaultTexObj = ctx->Shared->DefaultTex[TEXTURE_RECT_INDEX];
-      break;
-   case GL_TEXTURE_1D_ARRAY_EXT:
-      defaultTexObj = ctx->Shared->DefaultTex[TEXTURE_1D_ARRAY_INDEX];
-      break;
-   case GL_TEXTURE_2D_ARRAY_EXT:
-      defaultTexObj = ctx->Shared->DefaultTex[TEXTURE_2D_ARRAY_INDEX];
-      break;
-   default:
+   targetIndex = target_enum_to_index(target);
+   if (targetIndex < 0) {
       _mesa_error(ctx, GL_INVALID_ENUM, "glBindTexture(target)");
       return;
    }
+   assert(targetIndex < NUM_TEXTURE_TARGETS);
+   defaultTexObj = ctx->Shared->DefaultTex[targetIndex];
 
    /*
     * Get pointer to new texture object (newTexObj)
@@ -967,40 +951,8 @@ _mesa_BindTexture( GLenum target, GLuint texName )
     * texture object will be decremented.  It'll be deleted if the
     * count hits zero.
     */
-   switch (target) {
-      case GL_TEXTURE_1D:
-         _mesa_reference_texobj(&texUnit->Current1D, newTexObj);
-         ASSERT(texUnit->Current1D);
-         break;
-      case GL_TEXTURE_2D:
-         _mesa_reference_texobj(&texUnit->Current2D, newTexObj);
-         ASSERT(texUnit->Current2D);
-         break;
-      case GL_TEXTURE_3D:
-         _mesa_reference_texobj(&texUnit->Current3D, newTexObj);
-         ASSERT(texUnit->Current3D);
-         break;
-      case GL_TEXTURE_CUBE_MAP_ARB:
-         _mesa_reference_texobj(&texUnit->CurrentCubeMap, newTexObj);
-         ASSERT(texUnit->CurrentCubeMap);
-         break;
-      case GL_TEXTURE_RECTANGLE_NV:
-         _mesa_reference_texobj(&texUnit->CurrentRect, newTexObj);
-         ASSERT(texUnit->CurrentRect);
-         break;
-      case GL_TEXTURE_1D_ARRAY_EXT:
-         _mesa_reference_texobj(&texUnit->Current1DArray, newTexObj);
-         ASSERT(texUnit->Current1DArray);
-         break;
-      case GL_TEXTURE_2D_ARRAY_EXT:
-         _mesa_reference_texobj(&texUnit->Current2DArray, newTexObj);
-         ASSERT(texUnit->Current2DArray);
-         break;
-      default:
-         /* Bad target should be caught above */
-         _mesa_problem(ctx, "bad target in BindTexture");
-         return;
-   }
+   _mesa_reference_texobj(&texUnit->CurrentTex[targetIndex], newTexObj);
+   ASSERT(texUnit->CurrentTex[targetIndex]);
 
    /* Pass BindTexture call to device driver */
    if (ctx->Driver.BindTexture)
diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index 865aae8627..50f867e1c1 100644
--- a/src/mesa/main/texparam.c
+++ b/src/mesa/main/texparam.c
@@ -92,29 +92,29 @@ get_texobj(GLcontext *ctx, GLenum target)
 
    switch (target) {
    case GL_TEXTURE_1D:
-      return texUnit->Current1D;
+      return texUnit->CurrentTex[TEXTURE_1D_INDEX];
    case GL_TEXTURE_2D:
-      return texUnit->Current2D;
+      return texUnit->CurrentTex[TEXTURE_2D_INDEX];
    case GL_TEXTURE_3D:
-      return texUnit->Current3D;
+      return texUnit->CurrentTex[TEXTURE_3D_INDEX];
    case GL_TEXTURE_CUBE_MAP:
       if (ctx->Extensions.ARB_texture_cube_map) {
-         return texUnit->CurrentCubeMap;
+         return texUnit->CurrentTex[TEXTURE_CUBE_INDEX];
       }
       break;
    case GL_TEXTURE_RECTANGLE_NV:
       if (ctx->Extensions.NV_texture_rectangle) {
-         return texUnit->CurrentRect;
+         return texUnit->CurrentTex[TEXTURE_RECT_INDEX];
       }
       break;
    case GL_TEXTURE_1D_ARRAY_EXT:
       if (ctx->Extensions.MESA_texture_array) {
-         return texUnit->Current1DArray;
+         return texUnit->CurrentTex[TEXTURE_1D_ARRAY_INDEX];
       }
       break;
    case GL_TEXTURE_2D_ARRAY_EXT:
       if (ctx->Extensions.MESA_texture_array) {
-         return texUnit->Current2DArray;
+         return texUnit->CurrentTex[TEXTURE_2D_ARRAY_INDEX];
       }
       break;
    default:
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index b9e1a2a687..27927d60b0 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -68,7 +68,7 @@ static const struct gl_tex_env_combine_state default_combine_state = {
 void
 _mesa_copy_texture_state( const GLcontext *src, GLcontext *dst )
 {
-   GLuint i;
+   GLuint i, tex;
 
    ASSERT(src);
    ASSERT(dst);
@@ -104,20 +104,10 @@ _mesa_copy_texture_state( const GLcontext *src, GLcontext *dst )
       /* copy texture object bindings, not contents of texture objects */
       _mesa_lock_context_textures(dst);
 
-      _mesa_reference_texobj(&dst->Texture.Unit[i].Current1D,
-                             src->Texture.Unit[i].Current1D);
-      _mesa_reference_texobj(&dst->Texture.Unit[i].Current2D,
-                             src->Texture.Unit[i].Current2D);
-      _mesa_reference_texobj(&dst->Texture.Unit[i].Current3D,
-                             src->Texture.Unit[i].Current3D);
-      _mesa_reference_texobj(&dst->Texture.Unit[i].CurrentCubeMap,
-                             src->Texture.Unit[i].CurrentCubeMap);
-      _mesa_reference_texobj(&dst->Texture.Unit[i].CurrentRect,
-                             src->Texture.Unit[i].CurrentRect);
-      _mesa_reference_texobj(&dst->Texture.Unit[i].Current1DArray,
-                             src->Texture.Unit[i].Current1DArray);
-      _mesa_reference_texobj(&dst->Texture.Unit[i].Current2DArray,
-                             src->Texture.Unit[i].Current2DArray);
+      for (tex = 0; tex < NUM_TEXTURE_TARGETS; tex++) {
+         _mesa_reference_texobj(&dst->Texture.Unit[i].CurrentTex[tex],
+                                src->Texture.Unit[i].CurrentTex[tex]);
+      }
 
       _mesa_unlock_context_textures(dst);
    }
@@ -558,6 +548,7 @@ update_texture_state( GLcontext *ctx )
    for (unit = 0; unit < ctx->Const.MaxTextureImageUnits; unit++) {
       struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
       GLbitfield enableBits;
+      GLuint tex;
 
       texUnit->_Current = NULL;
       texUnit->_ReallyEnabled = 0;
@@ -584,32 +575,29 @@ update_texture_state( GLcontext *ctx )
       if (enableBits == 0x0)
          continue;
 
-      ASSERT(texUnit->Current1D);
-      ASSERT(texUnit->Current2D);
-      ASSERT(texUnit->Current3D);
-      ASSERT(texUnit->CurrentCubeMap);
-      ASSERT(texUnit->CurrentRect);
-      ASSERT(texUnit->Current1DArray);
-      ASSERT(texUnit->Current2DArray);
+      for (tex = 0; tex < NUM_TEXTURE_TARGETS; tex++) {
+         ASSERT(texUnit->CurrentTex[tex]);
+      }
 
       /* Look for the highest-priority texture target that's enabled and
        * complete.  That's the one we'll use for texturing.  If we're using
        * a fragment program we're guaranteed that bitcount(enabledBits) <= 1.
        */
-      texture_override(ctx, texUnit, enableBits,
-                       texUnit->Current2DArray, TEXTURE_2D_ARRAY_BIT);
-      texture_override(ctx, texUnit, enableBits,
-                       texUnit->Current1DArray, TEXTURE_1D_ARRAY_BIT);
-      texture_override(ctx, texUnit, enableBits,
-                       texUnit->CurrentCubeMap, TEXTURE_CUBE_BIT);
-      texture_override(ctx, texUnit, enableBits,
-                       texUnit->Current3D, TEXTURE_3D_BIT);
-      texture_override(ctx, texUnit, enableBits,
-                       texUnit->CurrentRect, TEXTURE_RECT_BIT);
-      texture_override(ctx, texUnit, enableBits,
-                       texUnit->Current2D, TEXTURE_2D_BIT);
-      texture_override(ctx, texUnit, enableBits,
-                       texUnit->Current1D, TEXTURE_1D_BIT);
+      for (tex = 0; tex < NUM_TEXTURE_TARGETS; tex++) {
+         /* texture indexes from highest to lowest priority */
+         static const GLuint targets[NUM_TEXTURE_TARGETS] = {
+            TEXTURE_2D_ARRAY_INDEX,
+            TEXTURE_1D_ARRAY_INDEX,
+            TEXTURE_CUBE_INDEX,
+            TEXTURE_3D_INDEX,
+            TEXTURE_RECT_INDEX,
+            TEXTURE_2D_INDEX,
+            TEXTURE_1D_INDEX
+         };
+         GLuint texIndex = targets[tex];
+         texture_override(ctx, texUnit, enableBits,
+                          texUnit->CurrentTex[texIndex], 1 << texIndex);
+      }
 
       if (!texUnit->_ReallyEnabled) {
          continue;
@@ -734,6 +722,7 @@ static void
 init_texture_unit( GLcontext *ctx, GLuint unit )
 {
    struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
+   GLuint tex;
 
    texUnit->EnvMode = GL_MODULATE;
    ASSIGN_4V( texUnit->EnvColor, 0.0, 0.0, 0.0, 0.0 );
@@ -763,13 +752,10 @@ init_texture_unit( GLcontext *ctx, GLuint unit )
    ASSIGN_4V( texUnit->GenQ.EyePlane, 0.0, 0.0, 0.0, 0.0 );
 
    /* initialize current texture object ptrs to the shared default objects */
-   _mesa_reference_texobj(&texUnit->Current1D, ctx->Shared->DefaultTex[TEXTURE_1D_INDEX]);
-   _mesa_reference_texobj(&texUnit->Current2D, ctx->Shared->DefaultTex[TEXTURE_2D_INDEX]);
-   _mesa_reference_texobj(&texUnit->Current3D, ctx->Shared->DefaultTex[TEXTURE_3D_INDEX]);
-   _mesa_reference_texobj(&texUnit->CurrentCubeMap, ctx->Shared->DefaultTex[TEXTURE_CUBE_INDEX]);
-   _mesa_reference_texobj(&texUnit->CurrentRect, ctx->Shared->DefaultTex[TEXTURE_RECT_INDEX]);
-   _mesa_reference_texobj(&texUnit->Current1DArray, ctx->Shared->DefaultTex[TEXTURE_1D_ARRAY_INDEX]);
-   _mesa_reference_texobj(&texUnit->Current2DArray, ctx->Shared->DefaultTex[TEXTURE_2D_ARRAY_INDEX]);
+   for (tex = 0; tex < NUM_TEXTURE_TARGETS; tex++) {
+      _mesa_reference_texobj(&texUnit->CurrentTex[tex],
+                             ctx->Shared->DefaultTex[tex]);
+   }
 }
 
 
@@ -820,13 +806,9 @@ _mesa_free_texture_data(GLcontext *ctx)
    /* unreference current textures */
    for (u = 0; u < MAX_TEXTURE_IMAGE_UNITS; u++) {
       struct gl_texture_unit *unit = ctx->Texture.Unit + u;
-      _mesa_reference_texobj(&unit->Current1D, NULL);
-      _mesa_reference_texobj(&unit->Current2D, NULL);
-      _mesa_reference_texobj(&unit->Current3D, NULL);
-      _mesa_reference_texobj(&unit->CurrentCubeMap, NULL);
-      _mesa_reference_texobj(&unit->CurrentRect, NULL);
-      _mesa_reference_texobj(&unit->Current1DArray, NULL);
-      _mesa_reference_texobj(&unit->Current2DArray, NULL);
+      for (tgt = 0; tgt < NUM_TEXTURE_TARGETS; tgt++) {
+         _mesa_reference_texobj(&unit->CurrentTex[tgt], NULL);
+      }
    }
 
    /* Free proxy texture objects */
@@ -851,24 +833,13 @@ _mesa_free_texture_data(GLcontext *ctx)
 void
 _mesa_update_default_objects_texture(GLcontext *ctx)
 {
-   GLuint i;
+   GLuint i, tex;
 
    for (i = 0; i < MAX_TEXTURE_UNITS; i++) {
       struct gl_texture_unit *texUnit = &ctx->Texture.Unit[i];
-
-      _mesa_reference_texobj(&texUnit->Current1D,
-                             ctx->Shared->DefaultTex[TEXTURE_1D_INDEX]);
-      _mesa_reference_texobj(&texUnit->Current2D,
-                             ctx->Shared->DefaultTex[TEXTURE_2D_INDEX]);
-      _mesa_reference_texobj(&texUnit->Current3D,
-                             ctx->Shared->DefaultTex[TEXTURE_3D_INDEX]);
-      _mesa_reference_texobj(&texUnit->CurrentCubeMap,
-                             ctx->Shared->DefaultTex[TEXTURE_CUBE_INDEX]);
-      _mesa_reference_texobj(&texUnit->CurrentRect,
-                             ctx->Shared->DefaultTex[TEXTURE_RECT_INDEX]);
-      _mesa_reference_texobj(&texUnit->Current1DArray,
-                             ctx->Shared->DefaultTex[TEXTURE_1D_ARRAY_INDEX]);
-      _mesa_reference_texobj(&texUnit->Current2DArray,
-                             ctx->Shared->DefaultTex[TEXTURE_2D_ARRAY_INDEX]);
+      for (tex = 0; tex < NUM_TEXTURE_TARGETS; tex++) {
+         _mesa_reference_texobj(&texUnit->CurrentTex[tex],
+                                ctx->Shared->DefaultTex[tex]);
+      }
    }
 }
diff --git a/src/mesa/state_tracker/st_texture.c b/src/mesa/state_tracker/st_texture.c
index 63a36324d4..fcf76ef82e 100644
--- a/src/mesa/state_tracker/st_texture.c
+++ b/src/mesa/state_tracker/st_texture.c
@@ -429,7 +429,7 @@ st_bind_teximage(struct st_framebuffer *stfb, uint surfIndex,
    }
 
    if (target == ST_TEXTURE_2D) {
-      texObj = texUnit->Current2D;
+      texObj = texUnit->CurrentTex[TEXTURE_2D_INDEX];
       texImage = _mesa_get_tex_image(ctx, texObj, GL_TEXTURE_2D, level);
       stImage = st_texture_image(texImage);
    }
diff --git a/src/mesa/swrast/s_triangle.c b/src/mesa/swrast/s_triangle.c
index 0598052f50..ab08b7325a 100644
--- a/src/mesa/swrast/s_triangle.c
+++ b/src/mesa/swrast/s_triangle.c
@@ -132,7 +132,8 @@ _swrast_culltriangle( GLcontext *ctx,
 
 #define SETUP_CODE							\
    struct gl_renderbuffer *rb = ctx->DrawBuffer->_ColorDrawBuffers[0];	\
-   struct gl_texture_object *obj = ctx->Texture.Unit[0].Current2D;	\
+   struct gl_texture_object *obj = 					\
+      ctx->Texture.Unit[0].CurrentTex[TEXTURE_2D_INDEX];		\
    const GLint b = obj->BaseLevel;					\
    const GLfloat twidth = (GLfloat) obj->Image[0][b]->Width;		\
    const GLfloat theight = (GLfloat) obj->Image[0][b]->Height;		\
@@ -183,7 +184,8 @@ _swrast_culltriangle( GLcontext *ctx,
 
 #define SETUP_CODE							\
    struct gl_renderbuffer *rb = ctx->DrawBuffer->_ColorDrawBuffers[0];	\
-   struct gl_texture_object *obj = ctx->Texture.Unit[0].Current2D;	\
+   struct gl_texture_object *obj = 					\
+      ctx->Texture.Unit[0].CurrentTex[TEXTURE_2D_INDEX];		\
    const GLint b = obj->BaseLevel;					\
    const GLfloat twidth = (GLfloat) obj->Image[0][b]->Width;		\
    const GLfloat theight = (GLfloat) obj->Image[0][b]->Height;		\
@@ -524,7 +526,8 @@ affine_span(GLcontext *ctx, SWspan *span,
 #define SETUP_CODE							\
    struct affine_info info;						\
    struct gl_texture_unit *unit = ctx->Texture.Unit+0;			\
-   struct gl_texture_object *obj = unit->Current2D;			\
+   struct gl_texture_object *obj = 					\
+      ctx->Texture.Unit[0].CurrentTex[TEXTURE_2D_INDEX];		\
    const GLint b = obj->BaseLevel;					\
    const GLfloat twidth = (GLfloat) obj->Image[0][b]->Width;		\
    const GLfloat theight = (GLfloat) obj->Image[0][b]->Height;		\
@@ -794,7 +797,8 @@ fast_persp_span(GLcontext *ctx, SWspan *span,
 #define SETUP_CODE							\
    struct persp_info info;						\
    const struct gl_texture_unit *unit = ctx->Texture.Unit+0;		\
-   const struct gl_texture_object *obj = unit->Current2D;		\
+   struct gl_texture_object *obj = 					\
+      ctx->Texture.Unit[0].CurrentTex[TEXTURE_2D_INDEX];		\
    const GLint b = obj->BaseLevel;					\
    info.texture = (const GLchan *) obj->Image[0][b]->Data;		\
    info.twidth_log2 = obj->Image[0][b]->WidthLog2;			\
@@ -1050,7 +1054,8 @@ _swrast_choose_triangle( GLcontext *ctx )
          const struct gl_texture_image *texImg;
          GLenum minFilter, magFilter, envMode;
          GLint format;
-         texObj2D = ctx->Texture.Unit[0].Current2D;
+         texObj2D = ctx->Texture.Unit[0].CurrentTex[TEXTURE_2D_INDEX];
+
          texImg = texObj2D ? texObj2D->Image[0][texObj2D->BaseLevel] : NULL;
          format = texImg ? texImg->TexFormat->MesaFormat : -1;
          minFilter = texObj2D ? texObj2D->MinFilter : (GLenum) 0;
-- 
cgit v1.2.3


From d059d030342fc232a5b54298c0591f5f814f4adb Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Sat, 21 Feb 2009 15:15:20 -0700
Subject: mesa: use enums for TEXTURE_x_INDEX values

Plus, put them in the order of highest to lowest priority to simplify
the texture_override() loop.
---
 src/mesa/main/context.c  | 11 ++++++-----
 src/mesa/main/mtypes.h   | 37 +++++++++++++++++++------------------
 src/mesa/main/texstate.c | 20 +++-----------------
 3 files changed, 28 insertions(+), 40 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 04848794aa..75b3992a29 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -467,14 +467,15 @@ alloc_shared_state( GLcontext *ctx )
 
    /* Create default texture objects */
    for (i = 0; i < NUM_TEXTURE_TARGETS; i++) {
+      /* NOTE: the order of these enums matches the TEXTURE_x_INDEX values */
       static const GLenum targets[NUM_TEXTURE_TARGETS] = {
-         GL_TEXTURE_1D,
-         GL_TEXTURE_2D,
-         GL_TEXTURE_3D,
+         GL_TEXTURE_2D_ARRAY_EXT,
+         GL_TEXTURE_1D_ARRAY_EXT,
          GL_TEXTURE_CUBE_MAP,
+         GL_TEXTURE_3D,
          GL_TEXTURE_RECTANGLE_NV,
-         GL_TEXTURE_1D_ARRAY_EXT,
-         GL_TEXTURE_2D_ARRAY_EXT
+         GL_TEXTURE_2D,
+         GL_TEXTURE_1D
       };
       ss->DefaultTex[i] = ctx->Driver.NewTextureObject(ctx, 0, targets[i]);
       if (!ss->DefaultTex[i])
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 06cef3d670..302b7aa74f 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1145,34 +1145,35 @@ struct gl_stencil_attrib
 };
 
 
-/** 1D, 2D, 3D, CUBE, RECT, 1D_ARRAY, and 2D_ARRAY targets */
-#define NUM_TEXTURE_TARGETS 7
-
 /**
- * An index for each type of texture object
+ * An index for each type of texture object.  These correspond to the GL
+ * target target enums, such as GL_TEXTURE_2D, GL_TEXTURE_CUBE_MAP, etc.
+ * Note: the order is from highest priority to lowest priority.
  */
-/*@{*/
-#define TEXTURE_1D_INDEX       0
-#define TEXTURE_2D_INDEX       1
-#define TEXTURE_3D_INDEX       2
-#define TEXTURE_CUBE_INDEX     3
-#define TEXTURE_RECT_INDEX     4
-#define TEXTURE_1D_ARRAY_INDEX 5
-#define TEXTURE_2D_ARRAY_INDEX 6
-/*@}*/
+enum {
+   TEXTURE_2D_ARRAY_INDEX,
+   TEXTURE_1D_ARRAY_INDEX,
+   TEXTURE_CUBE_INDEX,
+   TEXTURE_3D_INDEX,
+   TEXTURE_RECT_INDEX,
+   TEXTURE_2D_INDEX,
+   TEXTURE_1D_INDEX,
+   NUM_TEXTURE_TARGETS
+};
+
 
 /**
  * Bit flags for each type of texture object
  * Used for Texture.Unit[]._ReallyEnabled flags.
  */
 /*@{*/
-#define TEXTURE_1D_BIT       (1 << TEXTURE_1D_INDEX)
-#define TEXTURE_2D_BIT       (1 << TEXTURE_2D_INDEX)
-#define TEXTURE_3D_BIT       (1 << TEXTURE_3D_INDEX)
+#define TEXTURE_2D_ARRAY_BIT (1 << TEXTURE_2D_ARRAY_INDEX)
+#define TEXTURE_1D_ARRAY_BIT (1 << TEXTURE_1D_ARRAY_INDEX)
 #define TEXTURE_CUBE_BIT     (1 << TEXTURE_CUBE_INDEX)
+#define TEXTURE_3D_BIT       (1 << TEXTURE_3D_INDEX)
 #define TEXTURE_RECT_BIT     (1 << TEXTURE_RECT_INDEX)
-#define TEXTURE_1D_ARRAY_BIT (1 << TEXTURE_1D_ARRAY_INDEX)
-#define TEXTURE_2D_ARRAY_BIT (1 << TEXTURE_2D_ARRAY_INDEX)
+#define TEXTURE_2D_BIT       (1 << TEXTURE_2D_INDEX)
+#define TEXTURE_1D_BIT       (1 << TEXTURE_1D_INDEX)
 /*@}*/
 
 
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 27927d60b0..3f16d49a41 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -548,7 +548,7 @@ update_texture_state( GLcontext *ctx )
    for (unit = 0; unit < ctx->Const.MaxTextureImageUnits; unit++) {
       struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
       GLbitfield enableBits;
-      GLuint tex;
+      GLuint texIndex;
 
       texUnit->_Current = NULL;
       texUnit->_ReallyEnabled = 0;
@@ -575,26 +575,12 @@ update_texture_state( GLcontext *ctx )
       if (enableBits == 0x0)
          continue;
 
-      for (tex = 0; tex < NUM_TEXTURE_TARGETS; tex++) {
-         ASSERT(texUnit->CurrentTex[tex]);
-      }
-
       /* Look for the highest-priority texture target that's enabled and
        * complete.  That's the one we'll use for texturing.  If we're using
        * a fragment program we're guaranteed that bitcount(enabledBits) <= 1.
+       * Note that the TEXTURE_x_INDEX values are in high to low priority.
        */
-      for (tex = 0; tex < NUM_TEXTURE_TARGETS; tex++) {
-         /* texture indexes from highest to lowest priority */
-         static const GLuint targets[NUM_TEXTURE_TARGETS] = {
-            TEXTURE_2D_ARRAY_INDEX,
-            TEXTURE_1D_ARRAY_INDEX,
-            TEXTURE_CUBE_INDEX,
-            TEXTURE_3D_INDEX,
-            TEXTURE_RECT_INDEX,
-            TEXTURE_2D_INDEX,
-            TEXTURE_1D_INDEX
-         };
-         GLuint texIndex = targets[tex];
+      for (texIndex = 0; texIndex < NUM_TEXTURE_TARGETS; texIndex++) {
          texture_override(ctx, texUnit, enableBits,
                           texUnit->CurrentTex[texIndex], 1 << texIndex);
       }
-- 
cgit v1.2.3


From da46db60a04da87da1277b4316e30bfe4b2c7d8a Mon Sep 17 00:00:00 2001
From: Tom Fogal <tfogal@sci.utah.edu>
Date: Sat, 21 Feb 2009 16:07:04 -0700
Subject: mesa: added extern qualifier

---
 src/mesa/main/fbobject.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/fbobject.h b/src/mesa/main/fbobject.h
index 33d16cc5a0..5409394073 100644
--- a/src/mesa/main/fbobject.h
+++ b/src/mesa/main/fbobject.h
@@ -83,7 +83,7 @@ extern void GLAPIENTRY
 _mesa_RenderbufferStorageEXT(GLenum target, GLenum internalformat,
                              GLsizei width, GLsizei height);
 
-void GLAPIENTRY
+extern void GLAPIENTRY
 _mesa_RenderbufferStorageMultisample(GLenum target, GLsizei samples,
                                      GLenum internalformat,
                                      GLsizei width, GLsizei height);
-- 
cgit v1.2.3


From 0057f5b8cd93ebeb66392defc7285e3e474aa411 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Sun, 22 Feb 2009 14:15:58 -0700
Subject: mesa: remove redundant assertions (same asserts in context.c)

---
 src/mesa/main/texstate.c | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 3f16d49a41..c4ca7c4a19 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -753,9 +753,6 @@ _mesa_init_texture(GLcontext *ctx)
 {
    GLuint i;
 
-   assert(MAX_TEXTURE_LEVELS >= MAX_3D_TEXTURE_LEVELS);
-   assert(MAX_TEXTURE_LEVELS >= MAX_CUBE_TEXTURE_LEVELS);
-
    /* Texture group */
    ctx->Texture.CurrentUnit = 0;      /* multitexture */
    ctx->Texture._EnabledUnits = 0;
-- 
cgit v1.2.3


From 901568d068c0fa9b837c2e163ee7af9358a3caa0 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Sun, 22 Feb 2009 14:20:16 -0700
Subject: mesa: simplify texture combine state copying in
 _mesa_copy_texture_state()

Just copy the whole struct.
---
 src/mesa/main/texstate.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index c4ca7c4a19..5df76983aa 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -92,14 +92,7 @@ _mesa_copy_texture_state( const GLcontext *src, GLcontext *dst )
       dst->Texture.Unit[i].LodBias = src->Texture.Unit[i].LodBias;
 
       /* GL_EXT_texture_env_combine */
-      dst->Texture.Unit[i].Combine.ModeRGB = src->Texture.Unit[i].Combine.ModeRGB;
-      dst->Texture.Unit[i].Combine.ModeA = src->Texture.Unit[i].Combine.ModeA;
-      COPY_3V(dst->Texture.Unit[i].Combine.SourceRGB, src->Texture.Unit[i].Combine.SourceRGB);
-      COPY_3V(dst->Texture.Unit[i].Combine.SourceA, src->Texture.Unit[i].Combine.SourceA);
-      COPY_3V(dst->Texture.Unit[i].Combine.OperandRGB, src->Texture.Unit[i].Combine.OperandRGB);
-      COPY_3V(dst->Texture.Unit[i].Combine.OperandA, src->Texture.Unit[i].Combine.OperandA);
-      dst->Texture.Unit[i].Combine.ScaleShiftRGB = src->Texture.Unit[i].Combine.ScaleShiftRGB;
-      dst->Texture.Unit[i].Combine.ScaleShiftA = src->Texture.Unit[i].Combine.ScaleShiftA;
+      dst->Texture.Unit[i].Combine = src->Texture.Unit[i].Combine;
 
       /* copy texture object bindings, not contents of texture objects */
       _mesa_lock_context_textures(dst);
-- 
cgit v1.2.3


From c7377e2d47c6a1dfa508deee66b686e2c0b6ee27 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Sun, 22 Feb 2009 14:26:44 -0700
Subject: mesa: assorted clean-ups, var renaming, etc.

---
 src/mesa/main/texstate.c | 118 +++++++++++++++++++++++------------------------
 1 file changed, 59 insertions(+), 59 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 5df76983aa..1719effdee 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -1,6 +1,6 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.1
+ * Version:  7.5
  *
  * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
  *
@@ -68,7 +68,7 @@ static const struct gl_tex_env_combine_state default_combine_state = {
 void
 _mesa_copy_texture_state( const GLcontext *src, GLcontext *dst )
 {
-   GLuint i, tex;
+   GLuint u, tex;
 
    ASSERT(src);
    ASSERT(dst);
@@ -80,26 +80,26 @@ _mesa_copy_texture_state( const GLcontext *src, GLcontext *dst )
    dst->Texture.SharedPalette = src->Texture.SharedPalette;
 
    /* per-unit state */
-   for (i = 0; i < src->Const.MaxTextureImageUnits; i++) {
-      dst->Texture.Unit[i].Enabled = src->Texture.Unit[i].Enabled;
-      dst->Texture.Unit[i].EnvMode = src->Texture.Unit[i].EnvMode;
-      COPY_4V(dst->Texture.Unit[i].EnvColor, src->Texture.Unit[i].EnvColor);
-      dst->Texture.Unit[i].TexGenEnabled = src->Texture.Unit[i].TexGenEnabled;
-      dst->Texture.Unit[i].GenS = src->Texture.Unit[i].GenS;
-      dst->Texture.Unit[i].GenT = src->Texture.Unit[i].GenT;
-      dst->Texture.Unit[i].GenR = src->Texture.Unit[i].GenR;
-      dst->Texture.Unit[i].GenQ = src->Texture.Unit[i].GenQ;
-      dst->Texture.Unit[i].LodBias = src->Texture.Unit[i].LodBias;
+   for (u = 0; u < src->Const.MaxTextureImageUnits; u++) {
+      dst->Texture.Unit[u].Enabled = src->Texture.Unit[u].Enabled;
+      dst->Texture.Unit[u].EnvMode = src->Texture.Unit[u].EnvMode;
+      COPY_4V(dst->Texture.Unit[u].EnvColor, src->Texture.Unit[u].EnvColor);
+      dst->Texture.Unit[u].TexGenEnabled = src->Texture.Unit[u].TexGenEnabled;
+      dst->Texture.Unit[u].GenS = src->Texture.Unit[u].GenS;
+      dst->Texture.Unit[u].GenT = src->Texture.Unit[u].GenT;
+      dst->Texture.Unit[u].GenR = src->Texture.Unit[u].GenR;
+      dst->Texture.Unit[u].GenQ = src->Texture.Unit[u].GenQ;
+      dst->Texture.Unit[u].LodBias = src->Texture.Unit[u].LodBias;
 
       /* GL_EXT_texture_env_combine */
-      dst->Texture.Unit[i].Combine = src->Texture.Unit[i].Combine;
+      dst->Texture.Unit[u].Combine = src->Texture.Unit[u].Combine;
 
       /* copy texture object bindings, not contents of texture objects */
       _mesa_lock_context_textures(dst);
 
       for (tex = 0; tex < NUM_TEXTURE_TARGETS; tex++) {
-         _mesa_reference_texobj(&dst->Texture.Unit[i].CurrentTex[tex],
-                                src->Texture.Unit[i].CurrentTex[tex]);
+         _mesa_reference_texobj(&dst->Texture.Unit[u].CurrentTex[tex],
+                                src->Texture.Unit[u].CurrentTex[tex]);
       }
 
       _mesa_unlock_context_textures(dst);
@@ -333,20 +333,20 @@ _mesa_ClientActiveTextureARB(GLenum texture)
 static void
 update_texture_matrices( GLcontext *ctx )
 {
-   GLuint i;
+   GLuint u;
 
-   ctx->Texture._TexMatEnabled = 0;
+   ctx->Texture._TexMatEnabled = 0x0;
 
-   for (i=0; i < ctx->Const.MaxTextureCoordUnits; i++) {
-      if (_math_matrix_is_dirty(ctx->TextureMatrixStack[i].Top)) {
-	 _math_matrix_analyse( ctx->TextureMatrixStack[i].Top );
+   for (u = 0; u < ctx->Const.MaxTextureCoordUnits; u++) {
+      if (_math_matrix_is_dirty(ctx->TextureMatrixStack[u].Top)) {
+	 _math_matrix_analyse( ctx->TextureMatrixStack[u].Top );
 
-	 if (ctx->Texture.Unit[i]._ReallyEnabled &&
-	     ctx->TextureMatrixStack[i].Top->type != MATRIX_IDENTITY)
-	    ctx->Texture._TexMatEnabled |= ENABLE_TEXMAT(i);
+	 if (ctx->Texture.Unit[u]._ReallyEnabled &&
+	     ctx->TextureMatrixStack[u].Top->type != MATRIX_IDENTITY)
+	    ctx->Texture._TexMatEnabled |= ENABLE_TEXMAT(u);
 
 	 if (ctx->Driver.TextureMatrix)
-	    ctx->Driver.TextureMatrix( ctx, i, ctx->TextureMatrixStack[i].Top);
+	    ctx->Driver.TextureMatrix( ctx, u, ctx->TextureMatrixStack[u].Top);
       }
    }
 }
@@ -411,6 +411,8 @@ texture_override(GLcontext *ctx,
 static void
 update_tex_combine(GLcontext *ctx, struct gl_texture_unit *texUnit)
 {
+   struct gl_tex_env_combine_state *combine;
+
    /* Set the texUnit->_CurrentCombine field to point to the user's combiner
     * state, or the combiner state which is derived from traditional texenv
     * mode.
@@ -433,17 +435,19 @@ update_tex_combine(GLcontext *ctx, struct gl_texture_unit *texUnit)
       texUnit->_CurrentCombine = & texUnit->_EnvMode;
    }
 
+   combine = texUnit->_CurrentCombine;
+
    /* Determine number of source RGB terms in the combiner function */
-   switch (texUnit->_CurrentCombine->ModeRGB) {
+   switch (combine->ModeRGB) {
    case GL_REPLACE:
-      texUnit->_CurrentCombine->_NumArgsRGB = 1;
+      combine->_NumArgsRGB = 1;
       break;
    case GL_ADD:
    case GL_ADD_SIGNED:
       if (texUnit->EnvMode == GL_COMBINE4_NV)
-         texUnit->_CurrentCombine->_NumArgsRGB = 4;
+         combine->_NumArgsRGB = 4;
       else
-         texUnit->_CurrentCombine->_NumArgsRGB = 2;
+         combine->_NumArgsRGB = 2;
       break;
    case GL_MODULATE:
    case GL_SUBTRACT:
@@ -451,44 +455,44 @@ update_tex_combine(GLcontext *ctx, struct gl_texture_unit *texUnit)
    case GL_DOT3_RGBA:
    case GL_DOT3_RGB_EXT:
    case GL_DOT3_RGBA_EXT:
-      texUnit->_CurrentCombine->_NumArgsRGB = 2;
+      combine->_NumArgsRGB = 2;
       break;
    case GL_INTERPOLATE:
    case GL_MODULATE_ADD_ATI:
    case GL_MODULATE_SIGNED_ADD_ATI:
    case GL_MODULATE_SUBTRACT_ATI:
-      texUnit->_CurrentCombine->_NumArgsRGB = 3;
+      combine->_NumArgsRGB = 3;
       break;
    default:
-      texUnit->_CurrentCombine->_NumArgsRGB = 0;
+      combine->_NumArgsRGB = 0;
       _mesa_problem(ctx, "invalid RGB combine mode in update_texture_state");
       return;
    }
 
    /* Determine number of source Alpha terms in the combiner function */
-   switch (texUnit->_CurrentCombine->ModeA) {
+   switch (combine->ModeA) {
    case GL_REPLACE:
-      texUnit->_CurrentCombine->_NumArgsA = 1;
+      combine->_NumArgsA = 1;
       break;
    case GL_ADD:
    case GL_ADD_SIGNED:
       if (texUnit->EnvMode == GL_COMBINE4_NV)
-         texUnit->_CurrentCombine->_NumArgsA = 4;
+         combine->_NumArgsA = 4;
       else
-         texUnit->_CurrentCombine->_NumArgsA = 2;
+         combine->_NumArgsA = 2;
       break;
    case GL_MODULATE:
    case GL_SUBTRACT:
-      texUnit->_CurrentCombine->_NumArgsA = 2;
+      combine->_NumArgsA = 2;
       break;
    case GL_INTERPOLATE:
    case GL_MODULATE_ADD_ATI:
    case GL_MODULATE_SIGNED_ADD_ATI:
    case GL_MODULATE_SUBTRACT_ATI:
-      texUnit->_CurrentCombine->_NumArgsA = 3;
+      combine->_NumArgsA = 3;
       break;
    default:
-      texUnit->_CurrentCombine->_NumArgsA = 0;
+      combine->_NumArgsA = 0;
       _mesa_problem(ctx, "invalid Alpha combine mode in update_texture_state");
       break;
    }
@@ -530,10 +534,10 @@ update_texture_state( GLcontext *ctx )
    /* TODO: only set this if there are actual changes */
    ctx->NewState |= _NEW_TEXTURE;
 
-   ctx->Texture._EnabledUnits = 0;
-   ctx->Texture._GenFlags = 0;
-   ctx->Texture._TexMatEnabled = 0;
-   ctx->Texture._TexGenEnabled = 0;
+   ctx->Texture._EnabledUnits = 0x0;
+   ctx->Texture._GenFlags = 0x0;
+   ctx->Texture._TexMatEnabled = 0x0;
+   ctx->Texture._TexGenEnabled = 0x0;
 
    /*
     * Update texture unit state.
@@ -544,8 +548,8 @@ update_texture_state( GLcontext *ctx )
       GLuint texIndex;
 
       texUnit->_Current = NULL;
-      texUnit->_ReallyEnabled = 0;
-      texUnit->_GenFlags = 0;
+      texUnit->_ReallyEnabled = 0x0;
+      texUnit->_GenFlags = 0x0;
 
       /* Get the bitmask of texture target enables.
        * enableBits will be a mask of the TEXTURE_*_BIT flags indicating
@@ -710,7 +714,7 @@ init_texture_unit( GLcontext *ctx, GLuint unit )
    texUnit->_EnvMode = default_combine_state;
    texUnit->_CurrentCombine = & texUnit->_EnvMode;
 
-   texUnit->TexGenEnabled = 0;
+   texUnit->TexGenEnabled = 0x0;
    texUnit->GenS.Mode = GL_EYE_LINEAR;
    texUnit->GenT.Mode = GL_EYE_LINEAR;
    texUnit->GenR.Mode = GL_EYE_LINEAR;
@@ -744,18 +748,18 @@ init_texture_unit( GLcontext *ctx, GLuint unit )
 GLboolean
 _mesa_init_texture(GLcontext *ctx)
 {
-   GLuint i;
+   GLuint u;
 
    /* Texture group */
    ctx->Texture.CurrentUnit = 0;      /* multitexture */
-   ctx->Texture._EnabledUnits = 0;
+   ctx->Texture._EnabledUnits = 0x0;
    ctx->Texture.SharedPalette = GL_FALSE;
 #if FEATURE_colortable
    _mesa_init_colortable(&ctx->Texture.Palette);
 #endif
 
-   for (i = 0; i < MAX_TEXTURE_UNITS; i++)
-      init_texture_unit( ctx, i );
+   for (u = 0; u < MAX_TEXTURE_UNITS; u++)
+      init_texture_unit(ctx, u);
 
    /* After we're done initializing the context's texture state the default
     * texture objects' refcounts should be at least MAX_TEXTURE_UNITS + 1.
@@ -781,9 +785,8 @@ _mesa_free_texture_data(GLcontext *ctx)
 
    /* unreference current textures */
    for (u = 0; u < MAX_TEXTURE_IMAGE_UNITS; u++) {
-      struct gl_texture_unit *unit = ctx->Texture.Unit + u;
       for (tgt = 0; tgt < NUM_TEXTURE_TARGETS; tgt++) {
-         _mesa_reference_texobj(&unit->CurrentTex[tgt], NULL);
+         _mesa_reference_texobj(&ctx->Texture.Unit[u].CurrentTex[tgt], NULL);
       }
    }
 
@@ -792,11 +795,8 @@ _mesa_free_texture_data(GLcontext *ctx)
       ctx->Driver.DeleteTexture(ctx, ctx->Texture.ProxyTex[tgt]);
 
 #if FEATURE_colortable
-   {
-      GLuint i;
-      for (i = 0; i < MAX_TEXTURE_IMAGE_UNITS; i++)
-         _mesa_free_colortable_data( &ctx->Texture.Unit[i].ColorTable );
-   }
+   for (u = 0; u < MAX_TEXTURE_IMAGE_UNITS; u++)
+      _mesa_free_colortable_data(&ctx->Texture.Unit[u].ColorTable);
 #endif
 }
 
@@ -809,10 +809,10 @@ _mesa_free_texture_data(GLcontext *ctx)
 void
 _mesa_update_default_objects_texture(GLcontext *ctx)
 {
-   GLuint i, tex;
+   GLuint u, tex;
 
-   for (i = 0; i < MAX_TEXTURE_UNITS; i++) {
-      struct gl_texture_unit *texUnit = &ctx->Texture.Unit[i];
+   for (u = 0; u < MAX_TEXTURE_UNITS; u++) {
+      struct gl_texture_unit *texUnit = &ctx->Texture.Unit[u];
       for (tex = 0; tex < NUM_TEXTURE_TARGETS; tex++) {
          _mesa_reference_texobj(&texUnit->CurrentTex[tex],
                                 ctx->Shared->DefaultTex[tex]);
-- 
cgit v1.2.3


From d909dbcc43c5c1d51a3946488e68a7cd1fbfe920 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Sun, 22 Feb 2009 14:27:21 -0700
Subject: mesa: remove unused ENABLE_TEXGENx, ENABLE_TEXMATx flags

---
 src/mesa/main/mtypes.h | 31 ++++++++-----------------------
 1 file changed, 8 insertions(+), 23 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 302b7aa74f..73dccf7817 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1208,27 +1208,12 @@ enum {
 /*@}*/
 
 
-/* A selection of state flags to make driver and module's lives easier. */
-#define ENABLE_TEXGEN0        0x1
-#define ENABLE_TEXGEN1        0x2
-#define ENABLE_TEXGEN2        0x4
-#define ENABLE_TEXGEN3        0x8
-#define ENABLE_TEXGEN4        0x10
-#define ENABLE_TEXGEN5        0x20
-#define ENABLE_TEXGEN6        0x40
-#define ENABLE_TEXGEN7        0x80
-
-#define ENABLE_TEXMAT0        0x1	/* Ie. not the identity matrix */
-#define ENABLE_TEXMAT1        0x2
-#define ENABLE_TEXMAT2        0x4
-#define ENABLE_TEXMAT3        0x8
-#define ENABLE_TEXMAT4        0x10
-#define ENABLE_TEXMAT5        0x20
-#define ENABLE_TEXMAT6        0x40
-#define ENABLE_TEXMAT7        0x80
-
-#define ENABLE_TEXGEN(i) (ENABLE_TEXGEN0 << (i))
-#define ENABLE_TEXMAT(i) (ENABLE_TEXMAT0 << (i))
+
+/** Tex-gen enabled for texture unit? */
+#define ENABLE_TEXGEN(unit) (1 << (unit))
+
+/** Non-identity texture matrix for texture unit? */
+#define ENABLE_TEXMAT(unit) (1 << (unit))
 
 
 /**
@@ -1573,8 +1558,8 @@ struct gl_texture_attrib
    GLbitfield _EnabledUnits;  /**< one bit set for each really-enabled unit */
    GLbitfield _EnabledCoordUnits;   /**< one bit per enabled coordinate unit */
    GLbitfield _GenFlags;            /**< for texgen */
-   GLbitfield _TexGenEnabled;
-   GLbitfield _TexMatEnabled;
+   GLbitfield _TexGenEnabled;  /**< Mask of ENABLE_TEXGEN flags */
+   GLbitfield _TexMatEnabled;  /**< Mask of ENABLE_TEXMAT flags */
    /**@}*/
 
    struct gl_texture_unit Unit[MAX_TEXTURE_UNITS];
-- 
cgit v1.2.3


From f2c023291a1f2887294d2aac504f8b82857ad092 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Sun, 22 Feb 2009 15:43:29 -0700
Subject: mesa: move a bunch of compiler-related stuff into new compiler.h
 header

This trims down and cleans up imports.h and glheader.h quite a bit.
---
 src/mesa/drivers/x11/glxapi.c          |   1 +
 src/mesa/glapi/gl_enums.py             |   3 +-
 src/mesa/glapi/glapi.c                 |   2 +
 src/mesa/glapi/glapi_getproc.c         |   1 +
 src/mesa/glapi/glthread.c              |   2 +-
 src/mesa/main/api_exec.c               |   2 +-
 src/mesa/main/compiler.h               | 479 +++++++++++++++++++++++++++++++++
 src/mesa/main/config.h                 |   5 +-
 src/mesa/main/context.c                |   1 +
 src/mesa/main/dispatch.c               |   1 +
 src/mesa/main/dlist.c                  |   1 +
 src/mesa/main/enums.c                  |   3 +-
 src/mesa/main/glheader.h               | 265 +-----------------
 src/mesa/main/imports.h                | 171 +-----------
 src/mesa/main/mtypes.h                 |  16 +-
 src/mesa/main/texobj.c                 |   2 +-
 src/mesa/main/texstate.c               |   1 +
 src/mesa/state_tracker/st_cb_texture.c |   3 +-
 18 files changed, 515 insertions(+), 444 deletions(-)
 create mode 100644 src/mesa/main/compiler.h

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/x11/glxapi.c b/src/mesa/drivers/x11/glxapi.c
index c2ccce6f52..19aca605bc 100644
--- a/src/mesa/drivers/x11/glxapi.c
+++ b/src/mesa/drivers/x11/glxapi.c
@@ -35,6 +35,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "main/glheader.h"
+#include "main/compiler.h"
 #include "glapi/glapi.h"
 #include "glxapi.h"
 
diff --git a/src/mesa/glapi/gl_enums.py b/src/mesa/glapi/gl_enums.py
index 67fec7968a..b32e012663 100644
--- a/src/mesa/glapi/gl_enums.py
+++ b/src/mesa/glapi/gl_enums.py
@@ -43,6 +43,7 @@ class PrintGlEnums(gl_XML.gl_print_base):
 
 	def printRealHeader(self):
 		print '#include "glheader.h"'
+		print '#include "mfeatures.h"'
 		print '#include "enums.h"'
 		print '#include "imports.h"'
 		print ''
@@ -55,8 +56,6 @@ class PrintGlEnums(gl_XML.gl_print_base):
 
 	def print_code(self):
 		print """
-#define Elements(x) sizeof(x)/sizeof(*x)
-
 typedef int (*cfunc)(const void *, const void *);
 
 /**
diff --git a/src/mesa/glapi/glapi.c b/src/mesa/glapi/glapi.c
index 9b5144a88b..e20618abc1 100644
--- a/src/mesa/glapi/glapi.c
+++ b/src/mesa/glapi/glapi.c
@@ -61,6 +61,8 @@
 
 #endif
 
+#include "main/compiler.h"
+
 #include <stdlib.h>
 #include <string.h>
 #ifdef DEBUG
diff --git a/src/mesa/glapi/glapi_getproc.c b/src/mesa/glapi/glapi_getproc.c
index 1238c4cf93..4adc1aece0 100644
--- a/src/mesa/glapi/glapi_getproc.c
+++ b/src/mesa/glapi/glapi_getproc.c
@@ -33,6 +33,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "main/glheader.h"
+#include "main/compiler.h"
 #include "glapi.h"
 #include "glapioffsets.h"
 #include "glapitable.h"
diff --git a/src/mesa/glapi/glthread.c b/src/mesa/glapi/glthread.c
index 56ddf7c25a..e3abb0f4ae 100644
--- a/src/mesa/glapi/glthread.c
+++ b/src/mesa/glapi/glthread.c
@@ -32,7 +32,7 @@
 #include <dix-config.h>
 #endif
 
-#include "main/glheader.h"
+#include "main/compiler.h"
 #include "glthread.h"
 
 
diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index f8ee0d59dd..c2c29c4f3d 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -29,7 +29,7 @@
  */
 
 
-#include "glheader.h"
+#include "mfeatures.h"
 #if FEATURE_accum
 #include "accum.h"
 #endif
diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h
new file mode 100644
index 0000000000..39b19bb776
--- /dev/null
+++ b/src/mesa/main/compiler.h
@@ -0,0 +1,479 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.5
+ *
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/**
+ * \file compiler.h
+ * Compiler-related stuff.
+ */
+
+
+#ifndef COMPILER_H
+#define COMPILER_H
+
+
+#include <assert.h>
+#include <ctype.h>
+#if defined(__alpha__) && defined(CCPML)
+#include <cpml.h> /* use Compaq's Fast Math Library on Alpha */
+#else
+#include <math.h>
+#endif
+#include <limits.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#if defined(__linux__) && defined(__i386__)
+#include <fpu_control.h>
+#endif
+#include <float.h>
+#include <stdarg.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/**
+ * Get standard integer types
+ */
+#if defined(_MSC_VER)
+   typedef __int8             int8_t;
+   typedef unsigned __int8    uint8_t;
+   typedef __int16            int16_t;
+   typedef unsigned __int16   uint16_t;
+#  ifndef __eglplatform_h_
+     typedef __int32            int32_t;
+#  endif
+   typedef unsigned __int32   uint32_t;
+   typedef __int64            int64_t;
+   typedef unsigned __int64   uint64_t;
+
+#  if defined(_WIN64)
+     typedef __int64            intptr_t;
+     typedef unsigned __int64   uintptr_t;
+#  else
+     typedef __int32            intptr_t;
+     typedef unsigned __int32   uintptr_t;
+#  endif
+
+#  define INT64_C(__val) __val##i64
+#  define UINT64_C(__val) __val##ui64
+#else
+#  include <stdint.h>
+#endif
+
+
+/**
+  * Sun compilers define __i386 instead of the gcc-style __i386__
+ */
+#ifdef __SUNPRO_C
+# if !defined(__i386__) && defined(__i386)
+#  define __i386__
+# elif !defined(__amd64__) && defined(__amd64)
+#  define __amd64__
+# elif !defined(__sparc__) && defined(__sparc)
+#  define __sparc__
+# endif
+# if !defined(__volatile)
+#  define __volatile volatile
+# endif
+#endif
+
+
+/**
+ * finite macro.
+ */
+#if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__) && !defined(BUILD_FOR_SNAP)
+#  define __WIN32__
+#  define finite _finite
+#endif
+#if defined(__WATCOMC__)
+#  define finite _finite
+#  pragma disable_message(201) /* Disable unreachable code warnings */
+#endif
+
+
+/**
+ * Disable assorted warnings
+ */
+#if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__)) && !defined(BUILD_FOR_SNAP)
+#  if !defined(__GNUC__) /* mingw environment */
+#    pragma warning( disable : 4068 ) /* unknown pragma */
+#    pragma warning( disable : 4710 ) /* function 'foo' not inlined */
+#    pragma warning( disable : 4711 ) /* function 'foo' selected for automatic inline expansion */
+#    pragma warning( disable : 4127 ) /* conditional expression is constant */
+#    if defined(MESA_MINWARN)
+#      pragma warning( disable : 4244 ) /* '=' : conversion from 'const double ' to 'float ', possible loss of data */
+#      pragma warning( disable : 4018 ) /* '<' : signed/unsigned mismatch */
+#      pragma warning( disable : 4305 ) /* '=' : truncation from 'const double ' to 'float ' */
+#      pragma warning( disable : 4550 ) /* 'function' undefined; assuming extern returning int */
+#      pragma warning( disable : 4761 ) /* integral size mismatch in argument; conversion supplied */
+#    endif
+#  endif
+#endif
+
+
+/**
+ * Function inlining
+ */
+#if defined(__GNUC__)
+#  define INLINE __inline__
+#elif defined(__MSC__)
+#  define INLINE __inline
+#elif defined(_MSC_VER)
+#  define INLINE __inline
+#elif defined(__ICL)
+#  define INLINE __inline
+#elif defined(__INTEL_COMPILER)
+#  define INLINE inline
+#elif defined(__WATCOMC__) && (__WATCOMC__ >= 1100)
+#  define INLINE __inline
+#elif defined(__SUNPRO_C) && defined(__C99FEATURES__)
+#  define INLINE inline
+#  define __inline inline
+#  define __inline__ inline
+#elif (__STDC_VERSION__ >= 199901L) /* C99 */
+#  define INLINE inline
+#else
+#  define INLINE
+#endif
+
+
+/**
+ * PUBLIC/USED macros
+ *
+ * If we build the library with gcc's -fvisibility=hidden flag, we'll
+ * use the PUBLIC macro to mark functions that are to be exported.
+ *
+ * We also need to define a USED attribute, so the optimizer doesn't 
+ * inline a static function that we later use in an alias. - ajax
+ */
+#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303
+#  define PUBLIC __attribute__((visibility("default")))
+#  define USED __attribute__((used))
+#else
+#  define PUBLIC
+#  define USED
+#endif
+
+
+/**
+ * Some compilers don't like some of Mesa's const usage.  In those places use
+ * CONST instead of const.  Pass -DNO_CONST to compilers where this matters.
+ */
+#ifdef NO_CONST
+#  define CONST
+#else
+#  define CONST const
+#endif
+
+
+/**
+ * __builtin_expect macros
+ */
+#if (!defined(__GNUC__) || __GNUC__ < 3) && (!defined(__IBMC__) || __IBMC__ < 900)
+#  define __builtin_expect(x, y) x
+#endif
+
+
+/**
+ * The __FUNCTION__ gcc variable is generally only used for debugging.
+ * If we're not using gcc, define __FUNCTION__ as a cpp symbol here.
+ * Don't define it if using a newer Windows compiler.
+ */
+#ifndef __FUNCTION__
+# if defined(__VMS)
+#  define __FUNCTION__ "VMS$NL:"
+# elif ((!defined __GNUC__) || (__GNUC__ < 2)) && (!defined __xlC__) && \
+      (!defined(_MSC_VER) || _MSC_VER < 1300)
+#  if (__STDC_VERSION__ >= 199901L) /* C99 */ || \
+    (defined(__SUNPRO_C) && defined(__C99FEATURES__))
+#   define __FUNCTION__ __func__
+#  else
+#   define __FUNCTION__ "<unknown>"
+#  endif
+# endif
+#endif
+
+
+/**
+ * Either define MESA_BIG_ENDIAN or MESA_LITTLE_ENDIAN.
+ * Do not use them unless absolutely necessary!
+ * Try to use a runtime test instead.
+ * For now, only used by some DRI hardware drivers for color/texel packing.
+ */
+#if defined(BYTE_ORDER) && defined(BIG_ENDIAN) && BYTE_ORDER == BIG_ENDIAN
+#if defined(__linux__)
+#include <byteswap.h>
+#define CPU_TO_LE32( x )	bswap_32( x )
+#else /*__linux__*/
+#include <sys/endian.h>
+#define CPU_TO_LE32( x )	bswap32( x )
+#endif /*__linux__*/
+#define MESA_BIG_ENDIAN 1
+#else
+#define CPU_TO_LE32( x )	( x )
+#define MESA_LITTLE_ENDIAN 1
+#endif
+#define LE32_TO_CPU( x )	CPU_TO_LE32( x )
+
+
+
+#if !defined(CAPI) && defined(WIN32) && !defined(BUILD_FOR_SNAP)
+#define CAPI _cdecl
+#endif
+
+
+/**
+ * Create a macro so that asm functions can be linked into compilers other
+ * than GNU C
+ */
+#ifndef _ASMAPI
+#if defined(WIN32) && !defined(BUILD_FOR_SNAP)/* was: !defined( __GNUC__ ) && !defined( VMS ) && !defined( __INTEL_COMPILER )*/
+#define _ASMAPI __cdecl
+#else
+#define _ASMAPI
+#endif
+#ifdef	PTR_DECL_IN_FRONT
+#define	_ASMAPIP * _ASMAPI
+#else
+#define	_ASMAPIP _ASMAPI *
+#endif
+#endif
+
+#ifdef USE_X86_ASM
+#define _NORMAPI _ASMAPI
+#define _NORMAPIP _ASMAPIP
+#else
+#define _NORMAPI
+#define _NORMAPIP *
+#endif
+
+
+/* This is a macro on IRIX */
+#ifdef _P
+#undef _P
+#endif
+
+
+/* Turn off macro checking systems used by other libraries */
+#ifdef CHECK
+#undef CHECK
+#endif
+
+
+/**
+ * ASSERT macro
+ */
+#if !defined(_WIN32_WCE)
+#if defined(BUILD_FOR_SNAP) && defined(CHECKED)
+#  define ASSERT(X)   _CHECK(X) 
+#elif defined(DEBUG)
+#  define ASSERT(X)   assert(X)
+#else
+#  define ASSERT(X)
+#endif
+#endif
+
+
+#ifndef NULL
+#define NULL 0
+#endif
+
+
+/**
+ * LONGSTRING macro
+ * gcc -pedantic warns about long string literals, LONGSTRING silences that.
+ */
+#if !defined(__GNUC__) || (__GNUC__ < 2) || \
+    ((__GNUC__ == 2) && (__GNUC_MINOR__ <= 7))
+# define LONGSTRING
+#else
+# define LONGSTRING __extension__
+#endif
+
+
+#ifndef M_PI
+#define M_PI (3.1415926536)
+#endif
+
+#ifndef M_E
+#define M_E (2.7182818284590452354)
+#endif
+
+#ifndef ONE_DIV_LN2
+#define ONE_DIV_LN2 (1.442695040888963456)
+#endif
+
+#ifndef ONE_DIV_SQRT_LN2
+#define ONE_DIV_SQRT_LN2 (1.201122408786449815)
+#endif
+
+#ifndef FLT_MAX_EXP
+#define FLT_MAX_EXP 128
+#endif
+
+
+/**
+ * USE_IEEE: Determine if we're using IEEE floating point
+ */
+#if defined(__i386__) || defined(__386__) || defined(__sparc__) || \
+    defined(__s390x__) || defined(__powerpc__) || \
+    defined(__x86_64__) || \
+    defined(ia64) || defined(__ia64__) || \
+    defined(__hppa__) || defined(hpux) || \
+    defined(__mips) || defined(_MIPS_ARCH) || \
+    defined(__arm__) || \
+    defined(__sh__) || defined(__m32r__) || \
+    (defined(__sun) && defined(_IEEE_754)) || \
+    (defined(__alpha__) && (defined(__IEEE_FLOAT) || !defined(VMS)))
+#define USE_IEEE
+#define IEEE_ONE 0x3f800000
+#endif
+
+
+/**
+ * START/END_FAST_MATH macros:
+ *
+ * START_FAST_MATH: Set x86 FPU to faster, 32-bit precision mode (and save
+ *                  original mode to a temporary).
+ * END_FAST_MATH: Restore x86 FPU to original mode.
+ */
+#if defined(__GNUC__) && defined(__i386__)
+/*
+ * Set the x86 FPU control word to guarentee only 32 bits of precision
+ * are stored in registers.  Allowing the FPU to store more introduces
+ * differences between situations where numbers are pulled out of memory
+ * vs. situations where the compiler is able to optimize register usage.
+ *
+ * In the worst case, we force the compiler to use a memory access to
+ * truncate the float, by specifying the 'volatile' keyword.
+ */
+/* Hardware default: All exceptions masked, extended double precision,
+ * round to nearest (IEEE compliant):
+ */
+#define DEFAULT_X86_FPU		0x037f
+/* All exceptions masked, single precision, round to nearest:
+ */
+#define FAST_X86_FPU		0x003f
+/* The fldcw instruction will cause any pending FP exceptions to be
+ * raised prior to entering the block, and we clear any pending
+ * exceptions before exiting the block.  Hence, asm code has free
+ * reign over the FPU while in the fast math block.
+ */
+#if defined(NO_FAST_MATH)
+#define START_FAST_MATH(x)						\
+do {									\
+   static GLuint mask = DEFAULT_X86_FPU;				\
+   __asm__ ( "fnstcw %0" : "=m" (*&(x)) );				\
+   __asm__ ( "fldcw %0" : : "m" (mask) );				\
+} while (0)
+#else
+#define START_FAST_MATH(x)						\
+do {									\
+   static GLuint mask = FAST_X86_FPU;					\
+   __asm__ ( "fnstcw %0" : "=m" (*&(x)) );				\
+   __asm__ ( "fldcw %0" : : "m" (mask) );				\
+} while (0)
+#endif
+/* Restore original FPU mode, and clear any exceptions that may have
+ * occurred in the FAST_MATH block.
+ */
+#define END_FAST_MATH(x)						\
+do {									\
+   __asm__ ( "fnclex ; fldcw %0" : : "m" (*&(x)) );			\
+} while (0)
+
+#elif defined(__WATCOMC__) && defined(__386__)
+#define DEFAULT_X86_FPU		0x037f /* See GCC comments above */
+#define FAST_X86_FPU		0x003f /* See GCC comments above */
+void _watcom_start_fast_math(unsigned short *x,unsigned short *mask);
+#pragma aux _watcom_start_fast_math =                                   \
+   "fnstcw  word ptr [eax]"                                             \
+   "fldcw   word ptr [ecx]"                                             \
+   parm [eax] [ecx]                                                     \
+   modify exact [];
+void _watcom_end_fast_math(unsigned short *x);
+#pragma aux _watcom_end_fast_math =                                     \
+   "fnclex"                                                             \
+   "fldcw   word ptr [eax]"                                             \
+   parm [eax]                                                           \
+   modify exact [];
+#if defined(NO_FAST_MATH)
+#define START_FAST_MATH(x)                                              \
+do {                                                                    \
+   static GLushort mask = DEFAULT_X86_FPU;	                        \
+   _watcom_start_fast_math(&x,&mask);                                   \
+} while (0)
+#else
+#define START_FAST_MATH(x)                                              \
+do {                                                                    \
+   static GLushort mask = FAST_X86_FPU;                                 \
+   _watcom_start_fast_math(&x,&mask);                                   \
+} while (0)
+#endif
+#define END_FAST_MATH(x)  _watcom_end_fast_math(&x)
+
+#elif defined(_MSC_VER) && defined(_M_IX86)
+#define DEFAULT_X86_FPU		0x037f /* See GCC comments above */
+#define FAST_X86_FPU		0x003f /* See GCC comments above */
+#if defined(NO_FAST_MATH)
+#define START_FAST_MATH(x) do {\
+	static GLuint mask = DEFAULT_X86_FPU;\
+	__asm fnstcw word ptr [x]\
+	__asm fldcw word ptr [mask]\
+} while(0)
+#else
+#define START_FAST_MATH(x) do {\
+	static GLuint mask = FAST_X86_FPU;\
+	__asm fnstcw word ptr [x]\
+	__asm fldcw word ptr [mask]\
+} while(0)
+#endif
+#define END_FAST_MATH(x) do {\
+	__asm fnclex\
+	__asm fldcw word ptr [x]\
+} while(0)
+
+#else
+#define START_FAST_MATH(x)  x = 0
+#define END_FAST_MATH(x)  (void)(x)
+#endif
+
+
+
+#define Elements(x) (sizeof(x)/sizeof(*(x)))
+
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* COMPILER_H */
diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index 7044b61e4a..bb3e980bfa 100644
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -1,6 +1,6 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.3
+ * Version:  7.5
  *
  * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
  * Copyright (C) 2008  VMware, Inc.  All Rights Reserved.
@@ -32,9 +32,6 @@
 #define MESA_CONFIG_H_INCLUDED
 
 
-#include "main/mfeatures.h"
-
-
 /**
  * \name OpenGL implementation limits
  */
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 75b3992a29..a94bbf3fdf 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -77,6 +77,7 @@
 
 
 #include "glheader.h"
+#include "mfeatures.h"
 #include "imports.h"
 #if FEATURE_accum
 #include "accum.h"
diff --git a/src/mesa/main/dispatch.c b/src/mesa/main/dispatch.c
index 34127cb248..bf1a013789 100644
--- a/src/mesa/main/dispatch.c
+++ b/src/mesa/main/dispatch.c
@@ -40,6 +40,7 @@
 #ifndef GLX_USE_APPLEGL
 
 #include "main/glheader.h"
+#include "main/compiler.h"
 #include "glapi/glapi.h"
 #include "glapi/glapitable.h"
 #include "glapi/glthread.h"
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 76b3315034..d4bd56be83 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -33,6 +33,7 @@
 #include "api_arrayelt.h"
 #include "api_loopback.h"
 #include "config.h"
+#include "mfeatures.h"
 #include "attrib.h"
 #include "blend.h"
 #include "buffers.h"
diff --git a/src/mesa/main/enums.c b/src/mesa/main/enums.c
index a864f5a070..ca5db92265 100644
--- a/src/mesa/main/enums.c
+++ b/src/mesa/main/enums.c
@@ -26,6 +26,7 @@
  */
 
 #include "glheader.h"
+#include "mfeatures.h"
 #include "enums.h"
 #include "imports.h"
 
@@ -4973,8 +4974,6 @@ static const unsigned reduced_enums[1308] =
         30, /* GL_ALL_CLIENT_ATTRIB_BITS */
 };
 
-#define Elements(x) sizeof(x)/sizeof(*x)
-
 typedef int (*cfunc)(const void *, const void *);
 
 /**
diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h
index 5657976711..482a36de93 100644
--- a/src/mesa/main/glheader.h
+++ b/src/mesa/main/glheader.h
@@ -1,28 +1,8 @@
-/**
- * \file glheader.h
- * Top-most include file.
- *
- * This is the top-most include file of the Mesa sources.
- * It includes gl.h and all system headers which are needed.
- * Other Mesa source files should \e not directly include any system
- * headers.  This allows system-dependent hacks/workarounds to be
- * collected in one place.
- *
- * \note Actually, a lot of system-dependent stuff is now in imports.[ch].
- *
- * If you touch this file, everything gets recompiled!
- *
- * This file should be included before any other header in the .c files.
- *
- * Put compiler/OS/assembly pragmas and macros here to avoid
- * cluttering other source files.
- */
-
 /*
  * Mesa 3-D graphics library
- * Version:  6.5
+ * Version:  7.5
  *
- * Copyright (C) 1999-2005  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -43,99 +23,22 @@
  */
 
 
-#ifndef GLHEADER_H
-#define GLHEADER_H
-
-#include <assert.h>
-#include <ctype.h>
-#if defined(__alpha__) && defined(CCPML)
-#include <cpml.h> /* use Compaq's Fast Math Library on Alpha */
-#else
-#include <math.h>
-#endif
-#include <limits.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#if defined(__linux__) && defined(__i386__)
-#include <fpu_control.h>
-#endif
-#include <float.h>
-#include <stdarg.h>
-
-
-/* Get standard integer types */
-#if defined(_MSC_VER)
-
-   typedef __int8             int8_t;
-   typedef unsigned __int8    uint8_t;
-   typedef __int16            int16_t;
-   typedef unsigned __int16   uint16_t;
-#  ifndef __eglplatform_h_
-     typedef __int32            int32_t;
-#  endif
-   typedef unsigned __int32   uint32_t;
-   typedef __int64            int64_t;
-   typedef unsigned __int64   uint64_t;
-
-#  if defined(_WIN64)
-     typedef __int64            intptr_t;
-     typedef unsigned __int64   uintptr_t;
-#  else
-     typedef __int32            intptr_t;
-     typedef unsigned __int32   uintptr_t;
-#  endif
-
-#  define INT64_C(__val) __val##i64
-#  define UINT64_C(__val) __val##ui64
-
-#else
-#  include <stdint.h>
-#endif
-
+/**
+ * \file glheader.h
+ * Wrapper for GL/gl.h and GL/glext.h
+ */
 
-/* Sun compilers define __i386 instead of the gcc-style __i386__ */
-#ifdef __SUNPRO_C
-# if !defined(__i386__) && defined(__i386)
-#  define __i386__
-# elif !defined(__amd64__) && defined(__amd64)
-#  define __amd64__
-# elif !defined(__sparc__) && defined(__sparc)
-#  define __sparc__
-# endif
-# if !defined(__volatile)
-#  define __volatile volatile
-# endif
-#endif
 
-#if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__) && !defined(BUILD_FOR_SNAP)
-#  define __WIN32__
-#  define finite _finite
-#endif
+#ifndef GLHEADER_H
+#define GLHEADER_H
 
-#if defined(__WATCOMC__)
-#  define finite _finite
-#  pragma disable_message(201) /* Disable unreachable code warnings */
-#endif
 
 #ifdef WGLAPI
-#	undef WGLAPI
+#undef WGLAPI
 #endif
 
+
 #if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__)) && !defined(BUILD_FOR_SNAP)
-#  if !defined(__GNUC__) /* mingw environment */
-#    pragma warning( disable : 4068 ) /* unknown pragma */
-#    pragma warning( disable : 4710 ) /* function 'foo' not inlined */
-#    pragma warning( disable : 4711 ) /* function 'foo' selected for automatic inline expansion */
-#    pragma warning( disable : 4127 ) /* conditional expression is constant */
-#    if defined(MESA_MINWARN)
-#      pragma warning( disable : 4244 ) /* '=' : conversion from 'const double ' to 'float ', possible loss of data */
-#      pragma warning( disable : 4018 ) /* '<' : signed/unsigned mismatch */
-#      pragma warning( disable : 4305 ) /* '=' : truncation from 'const double ' to 'float ' */
-#      pragma warning( disable : 4550 ) /* 'function' undefined; assuming extern returning int */
-#      pragma warning( disable : 4761 ) /* integral size mismatch in argument; conversion supplied */
-#    endif
-#  endif
 #  if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */
 #    define WGLAPI __declspec(dllexport)
 #  elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL) /* tag specifying we're building for DLL runtime support */
@@ -146,31 +49,10 @@
 #endif /* WIN32 / CYGWIN bracket */
 
 
-/*
- * Either define MESA_BIG_ENDIAN or MESA_LITTLE_ENDIAN.
- * Do not use them unless absolutely necessary!
- * Try to use a runtime test instead.
- * For now, only used by some DRI hardware drivers for color/texel packing.
- */
-#if defined(BYTE_ORDER) && defined(BIG_ENDIAN) && BYTE_ORDER == BIG_ENDIAN
-#if defined(__linux__)
-#include <byteswap.h>
-#define CPU_TO_LE32( x )	bswap_32( x )
-#else /*__linux__*/
-#include <sys/endian.h>
-#define CPU_TO_LE32( x )	bswap32( x )
-#endif /*__linux__*/
-#define MESA_BIG_ENDIAN 1
-#else
-#define CPU_TO_LE32( x )	( x )
-#define MESA_LITTLE_ENDIAN 1
-#endif
-#define LE32_TO_CPU( x )	CPU_TO_LE32( x )
-
-
 #define GL_GLEXT_PROTOTYPES
 #include "GL/gl.h"
 #include "GL/glext.h"
+#include <GL/internal/glcore.h>
 
 
 #ifndef GL_FIXED
@@ -192,129 +74,10 @@
 #endif
 
 
-#if !defined(CAPI) && defined(WIN32) && !defined(BUILD_FOR_SNAP)
-#define CAPI _cdecl
-#endif
-
-
-/* This is a macro on IRIX */
-#ifdef _P
-#undef _P
-#endif
-
-
-/* Turn off macro checking systems used by other libraries */
-#ifdef CHECK
-#undef CHECK
-#endif
-
-
-/* Create a macro so that asm functions can be linked into compilers other
- * than GNU C
- */
-#ifndef _ASMAPI
-#if defined(WIN32) && !defined(BUILD_FOR_SNAP)/* was: !defined( __GNUC__ ) && !defined( VMS ) && !defined( __INTEL_COMPILER )*/
-#define _ASMAPI __cdecl
-#else
-#define _ASMAPI
-#endif
-#ifdef	PTR_DECL_IN_FRONT
-#define	_ASMAPIP * _ASMAPI
-#else
-#define	_ASMAPIP _ASMAPI *
-#endif
-#endif
-
-#ifdef USE_X86_ASM
-#define _NORMAPI _ASMAPI
-#define _NORMAPIP _ASMAPIP
-#else
-#define _NORMAPI
-#define _NORMAPIP *
-#endif
-
-
-/* Function inlining */
-#if defined(__GNUC__)
-#  define INLINE __inline__
-#elif defined(__MSC__)
-#  define INLINE __inline
-#elif defined(_MSC_VER)
-#  define INLINE __inline
-#elif defined(__ICL)
-#  define INLINE __inline
-#elif defined(__INTEL_COMPILER)
-#  define INLINE inline
-#elif defined(__WATCOMC__) && (__WATCOMC__ >= 1100)
-#  define INLINE __inline
-#elif defined(__SUNPRO_C) && defined(__C99FEATURES__)
-#  define INLINE inline
-#  define __inline inline
-#  define __inline__ inline
-#elif (__STDC_VERSION__ >= 199901L) /* C99 */
-#  define INLINE inline
-#else
-#  define INLINE
-#endif
-
-
-/* If we build the library with gcc's -fvisibility=hidden flag, we'll
- * use the PUBLIC macro to mark functions that are to be exported.
- *
- * We also need to define a USED attribute, so the optimizer doesn't 
- * inline a static function that we later use in an alias. - ajax
- */
-#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303
-#  define PUBLIC __attribute__((visibility("default")))
-#  define USED __attribute__((used))
-#else
-#  define PUBLIC
-#  define USED
-#endif
-
-
-/* Some compilers don't like some of Mesa's const usage */
-#ifdef NO_CONST
-#  define CONST
-#else
-#  define CONST const
-#endif
-
-
-#if !defined(_WIN32_WCE)
-#if defined(BUILD_FOR_SNAP) && defined(CHECKED)
-#  define ASSERT(X)   _CHECK(X) 
-#elif defined(DEBUG)
-#  define ASSERT(X)   assert(X)
-#else
-#  define ASSERT(X)
-#endif
-#endif
-
-
-#if (!defined(__GNUC__) || __GNUC__ < 3) && (!defined(__IBMC__) || __IBMC__ < 900)
-#  define __builtin_expect(x, y) x
-#endif
-
-/* The __FUNCTION__ gcc variable is generally only used for debugging.
- * If we're not using gcc, define __FUNCTION__ as a cpp symbol here.
- * Don't define it if using a newer Windows compiler.
+/**
+ * Special, internal token
  */
-#ifndef __FUNCTION__
-# if defined(__VMS)
-#  define __FUNCTION__ "VMS$NL:"
-# elif ((!defined __GNUC__) || (__GNUC__ < 2)) && (!defined __xlC__) && \
-      (!defined(_MSC_VER) || _MSC_VER < 1300)
-#  if (__STDC_VERSION__ >= 199901L) /* C99 */ || \
-    (defined(__SUNPRO_C) && defined(__C99FEATURES__))
-#   define __FUNCTION__ __func__
-#  else
-#   define __FUNCTION__ "<unknown>"
-#  endif
-# endif
-#endif
-
+#define GL_SHADER_PROGRAM_MESA 0x9999
 
-#include "config.h"
 
 #endif /* GLHEADER_H */
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index a421eb5e75..d28860f170 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -1,6 +1,6 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.1
+ * Version:  7.5
  *
  * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  *
@@ -36,10 +36,8 @@
 #define IMPORTS_H
 
 
-/* XXX some of the stuff in glheader.h should be moved into this file.
- */
+#include "compiler.h"
 #include "glheader.h"
-#include <GL/internal/glcore.h>
 
 
 #ifdef __cplusplus
@@ -47,26 +45,6 @@ extern "C" {
 #endif
 
 
-/**********************************************************************/
-/** \name General macros */
-/*@{*/
-
-#ifndef NULL
-#define NULL 0
-#endif
-
-
-/** gcc -pedantic warns about long string literals, LONGSTRING silences that */
-#if !defined(__GNUC__) || (__GNUC__ < 2) || \
-    ((__GNUC__ == 2) && (__GNUC_MINOR__ <= 7))
-# define LONGSTRING
-#else
-# define LONGSTRING __extension__
-#endif
-
-/*@}*/
-
-
 /**********************************************************************/
 /** Memory macros */
 /*@{*/
@@ -130,48 +108,10 @@ typedef union { GLfloat f; GLint i; } fi_type;
 #define MAX_GLUSHORT	0xffff
 #define MAX_GLUINT	0xffffffff
 
-#ifndef M_PI
-#define M_PI (3.1415926536)
-#endif
-
-#ifndef M_E
-#define M_E (2.7182818284590452354)
-#endif
-
-#ifndef ONE_DIV_LN2
-#define ONE_DIV_LN2 (1.442695040888963456)
-#endif
-
-#ifndef ONE_DIV_SQRT_LN2
-#define ONE_DIV_SQRT_LN2 (1.201122408786449815)
-#endif
-
-#ifndef FLT_MAX_EXP
-#define FLT_MAX_EXP 128
-#endif
-
 /* Degrees to radians conversion: */
 #define DEG2RAD (M_PI/180.0)
 
 
-/***
- *** USE_IEEE: Determine if we're using IEEE floating point
- ***/
-#if defined(__i386__) || defined(__386__) || defined(__sparc__) || \
-    defined(__s390x__) || defined(__powerpc__) || \
-    defined(__x86_64__) || \
-    defined(ia64) || defined(__ia64__) || \
-    defined(__hppa__) || defined(hpux) || \
-    defined(__mips) || defined(_MIPS_ARCH) || \
-    defined(__arm__) || \
-    defined(__sh__) || defined(__m32r__) || \
-    (defined(__sun) && defined(_IEEE_754)) || \
-    (defined(__alpha__) && (defined(__IEEE_FLOAT) || !defined(VMS)))
-#define USE_IEEE
-#define IEEE_ONE 0x3f800000
-#endif
-
-
 /***
  *** SQRTF: single-precision square root
  ***/
@@ -508,113 +448,6 @@ _mesa_is_pow_two(int x)
 #endif
 
 
-/***
- *** START_FAST_MATH: Set x86 FPU to faster, 32-bit precision mode (and save
- ***                  original mode to a temporary).
- *** END_FAST_MATH: Restore x86 FPU to original mode.
- ***/
-#if defined(__GNUC__) && defined(__i386__)
-/*
- * Set the x86 FPU control word to guarentee only 32 bits of precision
- * are stored in registers.  Allowing the FPU to store more introduces
- * differences between situations where numbers are pulled out of memory
- * vs. situations where the compiler is able to optimize register usage.
- *
- * In the worst case, we force the compiler to use a memory access to
- * truncate the float, by specifying the 'volatile' keyword.
- */
-/* Hardware default: All exceptions masked, extended double precision,
- * round to nearest (IEEE compliant):
- */
-#define DEFAULT_X86_FPU		0x037f
-/* All exceptions masked, single precision, round to nearest:
- */
-#define FAST_X86_FPU		0x003f
-/* The fldcw instruction will cause any pending FP exceptions to be
- * raised prior to entering the block, and we clear any pending
- * exceptions before exiting the block.  Hence, asm code has free
- * reign over the FPU while in the fast math block.
- */
-#if defined(NO_FAST_MATH)
-#define START_FAST_MATH(x)						\
-do {									\
-   static GLuint mask = DEFAULT_X86_FPU;				\
-   __asm__ ( "fnstcw %0" : "=m" (*&(x)) );				\
-   __asm__ ( "fldcw %0" : : "m" (mask) );				\
-} while (0)
-#else
-#define START_FAST_MATH(x)						\
-do {									\
-   static GLuint mask = FAST_X86_FPU;					\
-   __asm__ ( "fnstcw %0" : "=m" (*&(x)) );				\
-   __asm__ ( "fldcw %0" : : "m" (mask) );				\
-} while (0)
-#endif
-/* Restore original FPU mode, and clear any exceptions that may have
- * occurred in the FAST_MATH block.
- */
-#define END_FAST_MATH(x)						\
-do {									\
-   __asm__ ( "fnclex ; fldcw %0" : : "m" (*&(x)) );			\
-} while (0)
-
-#elif defined(__WATCOMC__) && defined(__386__)
-#define DEFAULT_X86_FPU		0x037f /* See GCC comments above */
-#define FAST_X86_FPU		0x003f /* See GCC comments above */
-void _watcom_start_fast_math(unsigned short *x,unsigned short *mask);
-#pragma aux _watcom_start_fast_math =                                   \
-   "fnstcw  word ptr [eax]"                                             \
-   "fldcw   word ptr [ecx]"                                             \
-   parm [eax] [ecx]                                                     \
-   modify exact [];
-void _watcom_end_fast_math(unsigned short *x);
-#pragma aux _watcom_end_fast_math =                                     \
-   "fnclex"                                                             \
-   "fldcw   word ptr [eax]"                                             \
-   parm [eax]                                                           \
-   modify exact [];
-#if defined(NO_FAST_MATH)
-#define START_FAST_MATH(x)                                              \
-do {                                                                    \
-   static GLushort mask = DEFAULT_X86_FPU;	                            \
-   _watcom_start_fast_math(&x,&mask);                                   \
-} while (0)
-#else
-#define START_FAST_MATH(x)                                              \
-do {                                                                    \
-   static GLushort mask = FAST_X86_FPU;                                 \
-   _watcom_start_fast_math(&x,&mask);                                   \
-} while (0)
-#endif
-#define END_FAST_MATH(x)  _watcom_end_fast_math(&x)
-
-#elif defined(_MSC_VER) && defined(_M_IX86)
-#define DEFAULT_X86_FPU		0x037f /* See GCC comments above */
-#define FAST_X86_FPU		0x003f /* See GCC comments above */
-#if defined(NO_FAST_MATH)
-#define START_FAST_MATH(x) do {\
-	static GLuint mask = DEFAULT_X86_FPU;\
-	__asm fnstcw word ptr [x]\
-	__asm fldcw word ptr [mask]\
-} while(0)
-#else
-#define START_FAST_MATH(x) do {\
-	static GLuint mask = FAST_X86_FPU;\
-	__asm fnstcw word ptr [x]\
-	__asm fldcw word ptr [mask]\
-} while(0)
-#endif
-#define END_FAST_MATH(x) do {\
-	__asm fnclex\
-	__asm fldcw word ptr [x]\
-} while(0)
-
-#else
-#define START_FAST_MATH(x)  x = 0
-#define END_FAST_MATH(x)  (void)(x)
-#endif
-
-
 /**
  * Return 1 if this is a little endian machine, 0 if big endian.
  */
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 73dccf7817..3390fac250 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -34,20 +34,16 @@
 #define TYPES_H
 
 
-#include "glheader.h"
+#include "main/glheader.h"
+#include "main/config.h"
+#include "main/compiler.h"
+#include "main/mfeatures.h"
 #include <GL/internal/glcore.h>	/* __GLcontextModes (GLvisual) */
-#include "config.h"		/* Hardwired parameters */
 #include "glapi/glapi.h"
 #include "math/m_matrix.h"	/* GLmatrix */
 #include "bitset.h"
 
 
-/**
- * Special, internal token
- */
-#define GL_SHADER_PROGRAM_MESA 0x9999
-
-
 /**
  * Color channel data type.
  */
@@ -126,7 +122,6 @@ struct gl_texture_format;
 struct gl_texture_image;
 struct gl_texture_object;
 struct st_context;
-struct pipe_surface;
 typedef struct __GLcontextRec GLcontext;
 typedef struct __GLcontextModesRec GLvisual;
 typedef struct gl_framebuffer GLframebuffer;
@@ -3166,7 +3161,4 @@ enum _debug
 
 
 
-#define Elements(x) sizeof(x)/sizeof(*(x))
-
-
 #endif /* TYPES_H */
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index 2de2dcc95d..9ccb8fa100 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -28,7 +28,7 @@
  */
 
 
-#include "glheader.h"
+#include "mfeatures.h"
 #if FEATURE_colortable
 #include "colortab.h"
 #endif
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 1719effdee..3e6b09baa1 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -29,6 +29,7 @@
  */
 
 #include "glheader.h"
+#include "mfeatures.h"
 #include "colormac.h"
 #if FEATURE_colortable
 #include "colortab.h"
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index 0ece8f9514..3039eb2a87 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -25,12 +25,13 @@
  * 
  **************************************************************************/
 
-#include "main/imports.h"
+#include "main/mfeatures.h"
 #if FEATURE_convolve
 #include "main/convolve.h"
 #endif
 #include "main/enums.h"
 #include "main/image.h"
+#include "main/imports.h"
 #include "main/macros.h"
 #include "main/mipmap.h"
 #include "main/pixel.h"
-- 
cgit v1.2.3


From c74992d840b7a8f7f50e778e692e40681aa166ca Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Sun, 22 Feb 2009 16:18:38 -0700
Subject: mesa: remove unneeded #includes

---
 src/mesa/main/dlopen.c | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/dlopen.c b/src/mesa/main/dlopen.c
index 8bc83c094f..0fc0c21e94 100644
--- a/src/mesa/main/dlopen.c
+++ b/src/mesa/main/dlopen.c
@@ -28,8 +28,6 @@
  */
 
 
-#include "glheader.h"
-#include "imports.h"
 #include "dlopen.h"
 
 #if defined(_GNU_SOURCE) && !defined(__MINGW32__)
-- 
cgit v1.2.3


From 1d5a68970f1d8fcca29ce24e6667a143733197f0 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Sun, 22 Feb 2009 16:19:29 -0700
Subject: mesa: #include, misc clean-ups

---
 src/mesa/main/mtypes.h | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 3390fac250..e80d3db043 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -30,18 +30,17 @@
  * Please try to mark derived values with a leading underscore ('_').
  */
 
-#ifndef TYPES_H
-#define TYPES_H
+#ifndef MTYPES_H
+#define MTYPES_H
 
 
 #include "main/glheader.h"
 #include "main/config.h"
 #include "main/compiler.h"
 #include "main/mfeatures.h"
-#include <GL/internal/glcore.h>	/* __GLcontextModes (GLvisual) */
+#include "main/bitset.h"
 #include "glapi/glapi.h"
 #include "math/m_matrix.h"	/* GLmatrix */
-#include "bitset.h"
 
 
 /**
@@ -3161,4 +3160,4 @@ enum _debug
 
 
 
-#endif /* TYPES_H */
+#endif /* MTYPES_H */
-- 
cgit v1.2.3


From 27a8432e35669920fa8e985819ba3ef8b258127d Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Sun, 22 Feb 2009 16:29:30 -0700
Subject: mesa: remove unneeded #include

---
 src/mesa/main/context.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h
index 54f1af911d..ecc1cec779 100644
--- a/src/mesa/main/context.h
+++ b/src/mesa/main/context.h
@@ -49,11 +49,13 @@
 #define CONTEXT_H
 
 
-#include "glapi/glapi.h"
 #include "imports.h"
 #include "mtypes.h"
 
 
+struct _glapi_table;
+
+
 /** \name Visual-related functions */
 /*@{*/
  
-- 
cgit v1.2.3


From 1456af2f2d7602a1f1fca54d8fe625e25851e441 Mon Sep 17 00:00:00 2001
From: José Fonseca <jfonseca@vmware.com>
Date: Mon, 23 Feb 2009 11:24:46 +0000
Subject: mesa: Fix windows build.

---
 src/mesa/glapi/glthread.h | 6 +++---
 src/mesa/main/dlopen.c    | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/glapi/glthread.h b/src/mesa/glapi/glthread.h
index ae2f79f37d..4da31e5738 100644
--- a/src/mesa/glapi/glthread.h
+++ b/src/mesa/glapi/glthread.h
@@ -299,11 +299,11 @@ typedef benaphore _glthread_Mutex;
  * THREADS not defined
  */
 
-typedef GLuint _glthread_TSD;
+typedef unsigned _glthread_TSD;
 
-typedef GLuint _glthread_Thread;
+typedef unsigned _glthread_Thread;
 
-typedef GLuint _glthread_Mutex;
+typedef unsigned _glthread_Mutex;
 
 #define _glthread_DECLARE_STATIC_MUTEX(name)  static _glthread_Mutex name = 0
 
diff --git a/src/mesa/main/dlopen.c b/src/mesa/main/dlopen.c
index 0fc0c21e94..338246bb59 100644
--- a/src/mesa/main/dlopen.c
+++ b/src/mesa/main/dlopen.c
@@ -33,6 +33,9 @@
 #if defined(_GNU_SOURCE) && !defined(__MINGW32__)
 #include <dlfcn.h>
 #endif
+#if defined(_WIN32)
+#include <windows.h>
+#endif
 
 
 /**
-- 
cgit v1.2.3


From 41172c04306098ab9ecba8b48d7be47c3911a662 Mon Sep 17 00:00:00 2001
From: Tomas Wilhelmsson <tomas.wilhelmsson@gmail.com>
Date: Mon, 23 Feb 2009 08:11:29 -0700
Subject: mesa: fixes for building on Haiku

---
 src/mesa/glapi/glthread.h  | 12 ++++++++++++
 src/mesa/main/dlopen.c     |  5 ++++-
 src/mesa/main/imports.h    |  3 ++-
 src/mesa/x86/gen_matypes.c |  4 ++--
 4 files changed, 20 insertions(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/glapi/glthread.h b/src/mesa/glapi/glthread.h
index 4da31e5738..dfe09a9d59 100644
--- a/src/mesa/glapi/glthread.h
+++ b/src/mesa/glapi/glthread.h
@@ -265,9 +265,21 @@ typedef xmutex_rec _glthread_Mutex;
  */
 #ifdef BEOS_THREADS
 
+/* Problem with OS.h and this file on haiku */
+#ifndef __HAIKU__
 #include <kernel/OS.h>
+#endif
+
 #include <support/TLS.h>
 
+/* The only two typedefs required here
+ * this is cause of the OS.h problem
+ */
+#ifdef __HAIKU__
+typedef int32 thread_id;
+typedef int32 sem_id;
+#endif
+
 typedef struct {
    int32        key;
    int          initMagic;
diff --git a/src/mesa/main/dlopen.c b/src/mesa/main/dlopen.c
index 338246bb59..94bec4a088 100644
--- a/src/mesa/main/dlopen.c
+++ b/src/mesa/main/dlopen.c
@@ -36,7 +36,10 @@
 #if defined(_WIN32)
 #include <windows.h>
 #endif
-
+#if defined(__HAIKU__)
+/* for NULL */
+#include <stdio.h>
+#endif
 
 /**
  * Wrapper for dlopen().
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index d28860f170..4192f037c0 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -265,7 +265,8 @@ static INLINE int iround(float f)
 }
 #define IROUND(x)  iround(x)
 #elif defined(USE_X86_ASM) && defined(__GNUC__) && defined(__i386__) && \
-			(!defined(__BEOS__) || (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)))
+			(!(defined(__BEOS__) || defined(__HAIKU__))  || \
+			(__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)))
 static INLINE int iround(float f)
 {
    int r;
diff --git a/src/mesa/x86/gen_matypes.c b/src/mesa/x86/gen_matypes.c
index afb4b11529..8c690b4f88 100644
--- a/src/mesa/x86/gen_matypes.c
+++ b/src/mesa/x86/gen_matypes.c
@@ -61,7 +61,7 @@ do {									\
    printf( "\n" );							\
 } while (0)
 
-#if defined(__BEOS__) || defined(_LP64)
+#if defined(__BEOS__) || defined(__HAIKU__) || defined(_LP64)
 #define OFFSET( s, t, m )						\
    printf( "#define %s\t%ld\n", s, offsetof( t, m ) );
 #else
@@ -69,7 +69,7 @@ do {									\
    printf( "#define %s\t%d\n", s, offsetof( t, m ) );
 #endif
 
-#if defined(__BEOS__) || defined(_LP64)
+#if defined(__BEOS__) || defined(__HAIKU__) || defined(_LP64)
 #define SIZEOF( s, t )							\
    printf( "#define %s\t%ld\n", s, sizeof(t) );
 #else
-- 
cgit v1.2.3


From 4fc7cde770a66ff5bcf817af33a7b0b2c04354d5 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 23 Feb 2009 13:02:56 -0700
Subject: mesa: include compiler.h, fixes cell build, remove Haiku special case

---
 src/mesa/main/dlopen.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/dlopen.c b/src/mesa/main/dlopen.c
index 94bec4a088..414cfad8e2 100644
--- a/src/mesa/main/dlopen.c
+++ b/src/mesa/main/dlopen.c
@@ -28,6 +28,7 @@
  */
 
 
+#include "compiler.h"
 #include "dlopen.h"
 
 #if defined(_GNU_SOURCE) && !defined(__MINGW32__)
@@ -36,10 +37,7 @@
 #if defined(_WIN32)
 #include <windows.h>
 #endif
-#if defined(__HAIKU__)
-/* for NULL */
-#include <stdio.h>
-#endif
+
 
 /**
  * Wrapper for dlopen().
-- 
cgit v1.2.3


From dd9742dc9ffc976d3caae87c1302b7b5ed7d3838 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 24 Feb 2009 14:30:51 -0700
Subject: mesa: use quotes for #include

---
 src/mesa/main/glheader.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h
index 482a36de93..ad095321e3 100644
--- a/src/mesa/main/glheader.h
+++ b/src/mesa/main/glheader.h
@@ -52,7 +52,7 @@
 #define GL_GLEXT_PROTOTYPES
 #include "GL/gl.h"
 #include "GL/glext.h"
-#include <GL/internal/glcore.h>
+#include "GL/internal/glcore.h"
 
 
 #ifndef GL_FIXED
-- 
cgit v1.2.3


From bfdbbfb0251bcd17c1a559668d0f4a0d36847a84 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 24 Feb 2009 17:53:39 -0700
Subject: mesa: fix merge conflict (in comment)

---
 src/mesa/main/version.h | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index 9287e8515c..f5bf6e2c85 100644
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -1,10 +1,6 @@
 /*
  * Mesa 3-D graphics library
-<<<<<<< HEAD:src/mesa/main/version.h
  * Version:  7.5
-=======
- * Version:  7.4
->>>>>>> origin/gallium-0.2:src/mesa/main/version.h
  *
  * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  *
-- 
cgit v1.2.3


From 857ac1e817808f4b6bf985679162d0e3d709e5b5 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Thu, 26 Feb 2009 05:35:15 -0800
Subject: mesa: Resurrect SPARC asm code.

This rewrites the sparc GLAPI code so that it's PIC friendly and works
with all of the TLS/PTHREADS/64-bit/32-bit combinations properly.

As a result we can turn SPARC asm back on.  Currently it's only
enabled on Linux, as that's the only place where I can test this
stuff out.

For the moment the cliptest SPARC asm routines are disabled as they
are non-working.  The problem is that they use register %g7 as a
temporary which is where the threading libraries store the thread
pointer on SPARC.  I will fix that code up in a future change as it's
a pretty important routine to optimize.

Like x86 we do the runtime patch as a pthread once-invoked initializer
in init_glapi_relocs().

Unlike x86, however, our GLAPI stubs on SPARC are just two instruction
sequences that branch to a trampoline and put the GLAPI offset into a
register.  The trampoline is what we run-time patch.  The stubs thus
all look like:

glFoo:
	ba		__glapi_sparc_foo_stub
	 sethi		GLAPI_OFFSET(glFOO) * PTR_SIZE, %g3

This actually makes generate_entrypoint() a lot simpler on SPARC.  For
this case in generate_entrypoint() we generate stubs using a 'call'
instead of the 'ba' above to make sure it can reach.

In order to get a proper tail call going here, in the unpatched case,
we do several tricks.  To get the current PC, for example, we save the
return address register into a temporary, do a call, save the return
address register written by the call to another temporary, then
restore the original return address register value.  This is to
avoid having to allocate a stack frame.

This is necessary for PIC address formation.

This new GLAPI scheme lets us get rid of the ugly SPARC GLAPI hacks in
__glXInitialize() and one_time_init().

Signed-off-by: David S. Miller <davem@davemloft.net>
---
 configure.ac                   |   13 +
 src/glx/x11/glxext.c           |   86 ---
 src/mesa/glapi/gl_SPARC_asm.py |  228 ++++--
 src/mesa/glapi/glapi.c         |  131 ++++
 src/mesa/glapi/glapi_getproc.c |   78 +-
 src/mesa/main/context.c        |    3 -
 src/mesa/sparc/glapi_sparc.S   | 1645 +++++++++++++---------------------------
 src/mesa/sparc/sparc.c         |   38 +-
 src/mesa/sparc/sparc.h         |    1 -
 9 files changed, 891 insertions(+), 1332 deletions(-)

(limited to 'src/mesa/main')

diff --git a/configure.ac b/configure.ac
index a57e5b3ea7..2f3f0beff1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -307,6 +307,13 @@ if test "x$enable_asm" = xyes; then
             ;;
         esac
         ;;
+    sparc*)
+        case "$host_os" in
+        linux*)
+            asm_arch=sparc
+            ;;
+        esac
+        ;;
     esac
 
     case "$asm_arch" in
@@ -327,6 +334,12 @@ if test "x$enable_asm" = xyes; then
         MESA_ASM_SOURCES='$(PPC_SOURCES)'
         AC_MSG_RESULT([yes, ppc])
         ;;
+    sparc)
+        ASM_FLAGS="-DUSE_SPARC_ASM"
+        MESA_ASM_SOURCES='$(SPARC_SOURCES)'
+        GLAPI_ASM_SOURCES='$(SPARC_API)'
+        AC_MSG_RESULT([yes, sparc])
+        ;;
     *)
         AC_MSG_RESULT([no, platform not supported])
         ;;
diff --git a/src/glx/x11/glxext.c b/src/glx/x11/glxext.c
index be6edf9b19..b296b7c651 100644
--- a/src/glx/x11/glxext.c
+++ b/src/glx/x11/glxext.c
@@ -56,19 +56,6 @@
 void __glXDumpDrawBuffer(__GLXcontext * ctx);
 #endif
 
-#ifdef USE_SPARC_ASM
-static void _glx_mesa_init_sparc_glapi_relocs(void);
-static int _mesa_sparc_needs_init = 1;
-#define INIT_MESA_SPARC do {               \
-   if (_mesa_sparc_needs_init) {           \
-      _glx_mesa_init_sparc_glapi_relocs(); \
-      _mesa_sparc_needs_init = 0;          \
-   }                                       \
-  } while(0)
-#else
-#define INIT_MESA_SPARC do { } while(0)
-#endif
-
 /*
 ** You can set this cell to 1 to force the gl drawing stuff to be
 ** one command per packet
@@ -670,7 +657,6 @@ __glXInitialize(Display * dpy)
    }
 #endif
 
-   INIT_MESA_SPARC;
    /* The one and only long long lock */
    __glXLock();
 
@@ -785,7 +771,6 @@ __glXSetupForCommand(Display * dpy)
 
       if (gc->currentDpy == dpy) {
          /* Use opcode from gc because its right */
-         INIT_MESA_SPARC;
          return gc->majorOpcode;
       }
       else {
@@ -979,74 +964,3 @@ __glXDumpDrawBuffer(__GLXcontext * ctx)
    }
 }
 #endif
-
-#ifdef  USE_SPARC_ASM
-/*
- * This is where our dispatch table's bounds are.
- * And the static mesa_init is taken directly from
- * Mesa's 'sparc.c' initializer.
- *
- * We need something like this here, because this version
- * of openGL/glx never initializes a Mesa context, and so
- * the address of the dispatch table pointer never gets stuffed
- * into the dispatch jump table otherwise.
- *
- * It matters only on SPARC, and only if you are using assembler
- * code instead of C-code indirect dispatch.
- *
- * -- FEM, 04.xii.03
- */
-extern unsigned int _mesa_sparc_glapi_begin;
-extern unsigned int _mesa_sparc_glapi_end;
-extern void __glapi_sparc_icache_flush(unsigned int *);
-
-static void
-_glx_mesa_init_sparc_glapi_relocs(void)
-{
-   unsigned int *insn_ptr, *end_ptr;
-   unsigned long disp_addr;
-
-   insn_ptr = &_mesa_sparc_glapi_begin;
-   end_ptr = &_mesa_sparc_glapi_end;
-   disp_addr = (unsigned long) &_glapi_Dispatch;
-
-   /*
-    * Verbatim from Mesa sparc.c.  It's needed because there doesn't
-    * seem to be a better way to do this:
-    *
-    * UNCONDITIONAL_JUMP ( (*_glapi_Dispatch) + entry_offset )
-    *
-    * This code is patching in the ADDRESS of the pointer to the
-    * dispatch table.  Hence, it must be called exactly once, because
-    * that address is not going to change.
-    *
-    * What it points to can change, but Mesa (and hence, we) assume
-    * that there is only one pointer.
-    *
-    */
-   while (insn_ptr < end_ptr) {
-#if ( defined(__sparc_v9__) && ( !defined(__linux__) || defined(__linux_64__) ) )
-/*
-	This code patches for 64-bit addresses.  This had better
-	not happen for Sparc/Linux, no matter what architecture we
-	are building for.  So, don't do this.
-
-        The 'defined(__linux_64__)' is used here as a placeholder for
-        when we do do 64-bit usermode on sparc linux.
-	*/
-      insn_ptr[0] |= (disp_addr >> (32 + 10));
-      insn_ptr[1] |= ((disp_addr & 0xffffffff) >> 10);
-      __glapi_sparc_icache_flush(&insn_ptr[0]);
-      insn_ptr[2] |= ((disp_addr >> 32) & ((1 << 10) - 1));
-      insn_ptr[3] |= (disp_addr & ((1 << 10) - 1));
-      __glapi_sparc_icache_flush(&insn_ptr[2]);
-      insn_ptr += 11;
-#else
-      insn_ptr[0] |= (disp_addr >> 10);
-      insn_ptr[1] |= (disp_addr & ((1 << 10) - 1));
-      __glapi_sparc_icache_flush(&insn_ptr[0]);
-      insn_ptr += 5;
-#endif
-   }
-}
-#endif /* sparc ASM in use */
diff --git a/src/mesa/glapi/gl_SPARC_asm.py b/src/mesa/glapi/gl_SPARC_asm.py
index 178c00a227..33e752df38 100644
--- a/src/mesa/glapi/gl_SPARC_asm.py
+++ b/src/mesa/glapi/gl_SPARC_asm.py
@@ -39,80 +39,202 @@ class PrintGenericStubs(gl_XML.gl_print_base):
 
 
 	def printRealHeader(self):
-		print '#include "glapioffsets.h"'
+		print '#include "glapi/glapioffsets.h"'
 		print ''
 		print '#ifdef __arch64__'
-		print '#  define GL_STUB(fn,off)\t\t\t\t\\'
-		print 'fn:\t\t\t\t\t\\'
-		print '\tsethi\t%hi(0xDEADBEEF), %g4 ;\t\t\t\\'
-		print '\tsethi\t%hi(0xDEADBEEF), %g1 ;\t\t\t\\'
-		print '\tor\t%g4, %lo(0xDEADBEEF), %g4 ;\t\t\\'
-		print '\tor\t%g1, %lo(0xDEADBEEF), %g1 ;\t\t\\'
-		print '\tsllx\t%g4, 32, %g4 ;\t\t\t\t\\'
-		print '\tldx\t[%g1 + %g4], %g1 ;\t\t\t\\'
-		print '\tsethi\t%hi(8 * off), %g4 ;\t\t\t\\'
-		print '\tor\t%g4, %lo(8 * off), %g4 ;\t\t\\'
-		print '\tldx\t[%g1 + %g4], %g5 ;\t\t\t\\'
-		print '\tjmpl\t%g5, %g0 ;\t\t\t\t\\'
-		print '\tnop'
+		print '#define GL_OFF(N)\t((N) * 8)'
+		print '#define GL_LL\t\tldx'
+		print '#define GL_TIE_LD(SYM)\t%tie_ldx(SYM)'
+		print '#define GL_STACK_SIZE\t128'
 		print '#else'
-		print '#  define GL_STUB(fn,off)\t\t\t\t\\'
-		print 'fn:\t\t\t\t\t\\'
-		print '\tsethi\t%hi(0xDEADBEEF), %g1 ;\t\t\t\\'
-		print '\tld\t[%g1 + %lo(0xDEADBEEF)], %g1 ;\t\t\\'
-		print '\tld\t[%g1 + (4 * off)], %g5 ;\t\t\\'
-		print '\tjmpl\t%g5, %g0 ;\t\t\t\t\\'
-		print '\tnop'
+		print '#define GL_OFF(N)\t((N) * 4)'
+		print '#define GL_LL\t\tld'
+		print '#define GL_TIE_LD(SYM)\t%tie_ld(SYM)'
+		print '#define GL_STACK_SIZE\t64'
 		print '#endif'
 		print ''
-		print '#define GL_STUB_ALIAS(fn,alias) fn = alias'
+		print '#define GLOBL_FN(x) .globl x ; .type x, @function'
+		print '#define HIDDEN(x) .hidden x'
 		print ''
-		print '.text'
-		print '.align 32'
-		print '\t\t.globl __glapi_sparc_icache_flush ; .type __glapi_sparc_icache_flush,#function'
+		print '\t.register %g2, #scratch'
+		print '\t.register %g3, #scratch'
+		print ''
+		print '\t.text'
+		print ''
+		print '\tGLOBL_FN(__glapi_sparc_icache_flush)'
+		print '\tHIDDEN(__glapi_sparc_icache_flush)'
+		print '\t.type\t__glapi_sparc_icache_flush, @function'
 		print '__glapi_sparc_icache_flush: /* %o0 = insn_addr */'
 		print '\tflush\t%o0'
 		print '\tretl'
-		print '\tnop'
+		print '\t nop'
+		print ''
+		print '\t.align\t32'
+		print ''
+		print '\t.type\t__glapi_sparc_get_pc, @function'
+		print '__glapi_sparc_get_pc:'
+		print '\tretl'
+		print '\t add\t%o7, %g2, %g2'
+		print '\t.size\t__glapi_sparc_get_pc, .-__glapi_sparc_get_pc'
+		print ''
+		print '#ifdef GLX_USE_TLS'
+		print ''
+		print '\tGLOBL_FN(__glapi_sparc_get_dispatch)'
+		print '\tHIDDEN(__glapi_sparc_get_dispatch)'
+		print '__glapi_sparc_get_dispatch:'
+		print '\tmov\t%o7, %g1'
+		print '\tsethi\t%hi(_GLOBAL_OFFSET_TABLE_-4), %g2'
+		print '\tcall\t__glapi_sparc_get_pc'
+		print '\tadd\t%g2, %lo(_GLOBAL_OFFSET_TABLE_+4), %g2'
+		print '\tmov\t%g1, %o7'
+		print '\tsethi\t%tie_hi22(_glapi_tls_Dispatch), %g1'
+		print '\tadd\t%g1, %tie_lo10(_glapi_tls_Dispatch), %g1'
+		print '\tGL_LL\t[%g2 + %g1], %g2, GL_TIE_LD(_glapi_tls_Dispatch)'
+		print '\tretl'
+		print '\t mov\t%g2, %o0'
+		print ''
+		print '\t.data'
+		print '\t.align\t32'
+		print ''
+		print '\t/* --> sethi %hi(_glapi_tls_Dispatch), %g1 */'
+		print '\t/* --> or %g1, %lo(_glapi_tls_Dispatch), %g1 */'
+		print '\tGLOBL_FN(__glapi_sparc_tls_stub)'
+		print '\tHIDDEN(__glapi_sparc_tls_stub)'
+		print '__glapi_sparc_tls_stub: /* Call offset in %g3 */'
+		print '\tmov\t%o7, %g1'
+		print '\tsethi\t%hi(_GLOBAL_OFFSET_TABLE_-4), %g2'
+		print '\tcall\t__glapi_sparc_get_pc'
+		print '\tadd\t%g2, %lo(_GLOBAL_OFFSET_TABLE_+4), %g2'
+		print '\tmov\t%g1, %o7'
+		print '\tsrl\t%g3, 10, %g3'
+		print '\tsethi\t%tie_hi22(_glapi_tls_Dispatch), %g1'
+		print '\tadd\t%g1, %tie_lo10(_glapi_tls_Dispatch), %g1'
+		print '\tGL_LL\t[%g2 + %g1], %g2, GL_TIE_LD(_glapi_tls_Dispatch)'
+		print '\tGL_LL\t[%g7+%g2], %g1'
+		print '\tGL_LL\t[%g1 + %g3], %g1'
+		print '\tjmp\t%g1'
+		print '\t nop'
+		print '\t.size\t__glapi_sparc_tls_stub, .-__glapi_sparc_tls_stub'
+		print ''
+		print '#define GL_STUB(fn, off)\t\t\t\t\\'
+		print '\tGLOBL_FN(fn);\t\t\t\t\t\\'
+		print 'fn:\tba\t__glapi_sparc_tls_stub;\t\t\t\\'
+		print '\t sethi\tGL_OFF(off), %g3;\t\t\t\\'
+		print '\t.size\tfn,.-fn;'
+		print ''
+		print '#elif defined(PTHREADS)'
+		print ''
+		print '\t/* 64-bit 0x00 --> sethi %hh(_glapi_Dispatch), %g1 */'
+		print '\t/* 64-bit 0x04 --> sethi %lm(_glapi_Dispatch), %g2 */'
+		print '\t/* 64-bit 0x08 --> or %g1, %hm(_glapi_Dispatch), %g1 */'
+		print '\t/* 64-bit 0x0c --> sllx %g1, 32, %g1 */'
+		print '\t/* 64-bit 0x10 --> add %g1, %g2, %g1 */'
+		print '\t/* 64-bit 0x14 --> ldx [%g1 + %lo(_glapi_Dispatch)], %g1 */'
+		print ''
+		print '\t/* 32-bit 0x00 --> sethi %hi(_glapi_Dispatch), %g1 */'
+		print '\t/* 32-bit 0x04 --> ld [%g1 + %lo(_glapi_Dispatch)], %g1 */'
+		print ''
+		print '\t.data'
+		print '\t.align\t32'
+		print ''
+		print '\tGLOBL_FN(__glapi_sparc_pthread_stub)'
+		print '\tHIDDEN(__glapi_sparc_pthread_stub)'
+		print '__glapi_sparc_pthread_stub: /* Call offset in %g3 */'
+		print '\tmov\t%o7, %g1'
+		print '\tsethi\t%hi(_GLOBAL_OFFSET_TABLE_-4), %g2'
+		print '\tcall\t__glapi_sparc_get_pc'
+		print '\t add\t%g2, %lo(_GLOBAL_OFFSET_TABLE_+4), %g2'
+		print '\tmov\t%g1, %o7'
+		print '\tsethi\t%hi(_glapi_Dispatch), %g1'
+		print '\tor\t%g1, %lo(_glapi_Dispatch), %g1'
+		print '\tsrl\t%g3, 10, %g3'
+		print '\tGL_LL\t[%g2+%g1], %g2'
+		print '\tGL_LL\t[%g2], %g1'
+		print '\tcmp\t%g1, 0'
+		print '\tbe\t2f'
+		print '\t nop'
+		print '1:\tGL_LL\t[%g1 + %g3], %g1'
+		print '\tjmp\t%g1'
+		print '\t nop'
+		print '2:\tsave\t%sp, GL_STACK_SIZE, %sp'
+		print '\tmov\t%g3, %l0'
+		print '\tcall\t_glapi_get_dispatch'
+		print '\t nop'
+		print '\tmov\t%o0, %g1'
+		print '\tmov\t%l0, %g3'
+		print '\tba\t1b'
+		print '\t restore %g0, %g0, %g0'
+		print '\t.size\t__glapi_sparc_pthread_stub, .-__glapi_sparc_pthread_stub'
+		print ''
+		print '#define GL_STUB(fn, off)\t\t\t\\'
+		print '\tGLOBL_FN(fn);\t\t\t\t\\'
+		print 'fn:\tba\t__glapi_sparc_pthread_stub;\t\\'
+		print '\t sethi\tGL_OFF(off), %g3;\t\t\\'
+		print '\t.size\tfn,.-fn;'
+		print ''
+		print '#else /* Non-threaded version. */'
 		print ''
-		print '.data'
-		print '.align 64'
+		print '\t.type	__glapi_sparc_nothread_stub, @function'
+		print '__glapi_sparc_nothread_stub: /* Call offset in %g3 */'
+		print '\tmov\t%o7, %g1'
+		print '\tsethi\t%hi(_GLOBAL_OFFSET_TABLE_-4), %g2'
+		print '\tcall\t__glapi_sparc_get_pc'
+		print '\t add\t%g2, %lo(_GLOBAL_OFFSET_TABLE_+4), %g2'
+		print '\tmov\t%g1, %o7'
+		print '\tsrl\t%g3, 10, %g3'
+		print '\tsethi\t%hi(_glapi_Dispatch), %g1'
+		print '\tor\t%g1, %lo(_glapi_Dispatch), %g1'
+		print '\tGL_LL\t[%g2+%g1], %g2'
+		print '\tGL_LL\t[%g2], %g1'
+		print '\tGL_LL\t[%g1 + %g3], %g1'
+		print '\tjmp\t%g1'
+		print '\t nop'
+		print '\t.size\t__glapi_sparc_nothread_stub, .-__glapi_sparc_nothread_stub'
+		print ''
+		print '#define GL_STUB(fn, off)\t\t\t\\'
+		print '\tGLOBL_FN(fn);\t\t\t\t\\'
+		print 'fn:\tba\t__glapi_sparc_nothread_stub;\t\\'
+		print '\t sethi\tGL_OFF(off), %g3;\t\t\\'
+		print '\t.size\tfn,.-fn;'
+		print ''
+		print '#endif'
+		print ''
+		print '#define GL_STUB_ALIAS(fn, alias)		\\'
+		print '	.globl	fn;				\\'
+		print '	.set	fn, alias'
+		print ''
+		print '\t.text'
+		print '\t.align\t32'
+		print ''
+		print '\t.globl\tgl_dispatch_functions_start'
+		print '\tHIDDEN(gl_dispatch_functions_start)'
+		print 'gl_dispatch_functions_start:'
 		print ''
 		return
 
+	def printRealFooter(self):
+		print ''
+		print '\t.globl\tgl_dispatch_functions_end'
+		print '\tHIDDEN(gl_dispatch_functions_end)'
+		print 'gl_dispatch_functions_end:'
+		return
 
 	def printBody(self, api):
 		for f in api.functionIterateByOffset():
-			if f.is_static_entry_point(f.name):
-				name = f.name
-			else:
-				name = "_dispatch_stub_%u" % (f.offset)
+			name = f.dispatch_name()
 
-			print '\t\t.globl gl%s ; .type gl%s,#function' % (name, name)
+			print '\tGL_STUB(gl%s, _gloffset_%s)' % (name, f.name)
 
-		print '\t\t.globl _mesa_sparc_glapi_begin ; .type _mesa_sparc_glapi_begin,#function'
-		print '_mesa_sparc_glapi_begin:'
-		print ''
+			if not f.is_static_entry_point(f.name):
+				print '\tHIDDEN(gl%s)' % (name)
 
 		for f in api.functionIterateByOffset():
-			if f.is_static_entry_point(f.name):
-				name = f.name
-			else:
-				name = "_dispatch_stub_%u" % (f.offset)
-
-			print '\tGL_STUB(gl%s, _gloffset_%s)' % (name, name)
+			name = f.dispatch_name()
 
-		print ''
-		print '\t\t.globl _mesa_sparc_glapi_end ; .type _mesa_sparc_glapi_end,#function'
-		print '_mesa_sparc_glapi_end:'
-		print ''
-
-
-		for f in api.functionIterateByOffset():
-			for n in f.entry_points:
-				if n != f.name:
-					if f.is_static_entry_point(n):
-						text = '\t.globl gl%s ; .type gl%s,#function ; gl%s = gl%s' % (n, n, n, f.name)
+			if f.is_static_entry_point(f.name):
+				for n in f.entry_points:
+					if n != f.name:
+						text = '\tGL_STUB_ALIAS(gl%s, gl%s)' % (n, f.name)
 
 						if f.has_different_protocol(n):
 							print '#ifndef GLX_INDIRECT_RENDERING'
diff --git a/src/mesa/glapi/glapi.c b/src/mesa/glapi/glapi.c
index e20618abc1..2b105d0f17 100644
--- a/src/mesa/glapi/glapi.c
+++ b/src/mesa/glapi/glapi.c
@@ -318,6 +318,14 @@ extern const GLubyte gl_dispatch_functions_start[];
 # endif
 #endif
 
+#ifdef USE_SPARC_ASM
+#ifdef GLX_USE_TLS
+extern unsigned int __glapi_sparc_tls_stub;
+#else
+extern unsigned int __glapi_sparc_pthread_stub;
+#endif
+#endif
+
 #if !defined(DISPATCH_FUNCTION_SIZE) && !defined(XFree86Server) && !defined(XGLServer)
 # define NEED_FUNCTION_POINTER
 #endif
@@ -344,6 +352,129 @@ init_glapi_relocs( void )
 	curr_func += DISPATCH_FUNCTION_SIZE;
     }
 #endif
+#ifdef USE_SPARC_ASM
+    extern void __glapi_sparc_icache_flush(unsigned int *);
+    static const unsigned int template[] = {
+#ifdef GLX_USE_TLS
+	0x05000000, /* sethi %hi(_glapi_tls_Dispatch), %g2 */
+	0x8730e00a, /* srl %g3, 10, %g3 */
+	0x8410a000, /* or %g2, %lo(_glapi_tls_Dispatch), %g2 */
+#ifdef __arch64__
+	0xc259c002, /* ldx [%g7 + %g2], %g1 */
+	0xc2584003, /* ldx [%g1 + %g3], %g1 */
+#else
+	0xc201c002, /* ld [%g7 + %g2], %g1 */
+	0xc2004003, /* ld [%g1 + %g3], %g1 */
+#endif
+	0x81c04000, /* jmp %g1 */
+	0x01000000, /* nop  */
+#else
+#ifdef __arch64__
+	0x03000000, /* 64-bit 0x00 --> sethi %hh(_glapi_Dispatch), %g1 */
+	0x05000000, /* 64-bit 0x04 --> sethi %lm(_glapi_Dispatch), %g2 */
+	0x82106000, /* 64-bit 0x08 --> or %g1, %hm(_glapi_Dispatch), %g1 */
+	0x8730e00a, /* 64-bit 0x0c --> srl %g3, 10, %g3 */
+	0x83287020, /* 64-bit 0x10 --> sllx %g1, 32, %g1 */
+	0x82004002, /* 64-bit 0x14 --> add %g1, %g2, %g1 */
+	0xc2586000, /* 64-bit 0x18 --> ldx [%g1 + %lo(_glapi_Dispatch)], %g1 */
+#else
+	0x03000000, /* 32-bit 0x00 --> sethi %hi(_glapi_Dispatch), %g1 */
+	0x8730e00a, /* 32-bit 0x04 --> srl %g3, 10, %g3 */
+	0xc2006000, /* 32-bit 0x08 --> ld [%g1 + %lo(_glapi_Dispatch)], %g1 */
+#endif
+	0x80a06000, /*             --> cmp %g1, 0 */
+	0x02800005, /*             --> be +4*5 */
+	0x01000000, /*             -->  nop  */
+#ifdef __arch64__
+	0xc2584003, /* 64-bit      --> ldx [%g1 + %g3], %g1 */
+#else
+	0xc2004003, /* 32-bit      --> ld [%g1 + %g3], %g1 */
+#endif
+	0x81c04000, /*             --> jmp %g1 */
+	0x01000000, /*             --> nop  */
+#ifdef __arch64__
+	0x9de3bf80, /* 64-bit      --> save  %sp, -128, %sp */
+#else
+	0x9de3bfc0, /* 32-bit      --> save  %sp, -64, %sp */
+#endif
+	0xa0100003, /*             --> mov  %g3, %l0 */
+	0x40000000, /*             --> call _glapi_get_dispatch */
+	0x01000000, /*             -->  nop */
+	0x82100008, /*             --> mov %o0, %g1 */
+	0x86100010, /*             --> mov %l0, %g3 */
+	0x10bffff7, /*             --> ba -4*9 */
+	0x81e80000, /*             -->  restore  */
+#endif
+    };
+#ifdef GLX_USE_TLS
+    extern unsigned long __glapi_sparc_get_dispatch(void);
+    unsigned int *code = &__glapi_sparc_tls_stub;
+    unsigned long dispatch = __glapi_sparc_get_dispatch();
+#else
+    unsigned int *code = &__glapi_sparc_pthread_stub;
+    unsigned long dispatch = (unsigned long) &_glapi_Dispatch;
+    unsigned long call_dest = (unsigned long ) &_glapi_get_dispatch;
+    int idx;
+#endif
+
+#if defined(GLX_USE_TLS)
+    code[0] = template[0] | (dispatch >> 10);
+    code[1] = template[1];
+    __glapi_sparc_icache_flush(&code[0]);
+    code[2] = template[2] | (dispatch & 0x3ff);
+    code[3] = template[3];
+    __glapi_sparc_icache_flush(&code[2]);
+    code[4] = template[4];
+    code[5] = template[5];
+    __glapi_sparc_icache_flush(&code[4]);
+    code[6] = template[6];
+    __glapi_sparc_icache_flush(&code[6]);
+#else
+#if defined(__arch64__)
+    code[0] = template[0] | (dispatch >> (32 + 10));
+    code[1] = template[1] | ((dispatch & 0xffffffff) >> 10);
+    __glapi_sparc_icache_flush(&code[0]);
+    code[2] = template[2] | ((dispatch >> 32) & 0x3ff);
+    code[3] = template[3];
+    __glapi_sparc_icache_flush(&code[2]);
+    code[4] = template[4];
+    code[5] = template[5];
+    __glapi_sparc_icache_flush(&code[4]);
+    code[6] = template[6] | (dispatch & 0x3ff);
+    idx = 7;
+#else
+    code[0] = template[0] | (dispatch >> 10);
+    code[1] = template[1];
+    __glapi_sparc_icache_flush(&code[0]);
+    code[2] = template[2] | (dispatch & 0x3ff);
+    idx = 3;
+#endif
+    code[idx + 0] = template[idx + 0];
+    __glapi_sparc_icache_flush(&code[idx - 1]);
+    code[idx + 1] = template[idx + 1];
+    code[idx + 2] = template[idx + 2];
+    __glapi_sparc_icache_flush(&code[idx + 1]);
+    code[idx + 3] = template[idx + 3];
+    code[idx + 4] = template[idx + 4];
+    __glapi_sparc_icache_flush(&code[idx + 3]);
+    code[idx + 5] = template[idx + 5];
+    code[idx + 6] = template[idx + 6];
+    __glapi_sparc_icache_flush(&code[idx + 5]);
+    code[idx + 7] = template[idx + 7];
+    code[idx + 8] = template[idx + 8] |
+	    (((call_dest - ((unsigned long) &code[idx + 8]))
+	      >> 2) & 0x3fffffff);
+    __glapi_sparc_icache_flush(&code[idx + 7]);
+    code[idx + 9] = template[idx + 9];
+    code[idx + 10] = template[idx + 10];
+    __glapi_sparc_icache_flush(&code[idx + 9]);
+    code[idx + 11] = template[idx + 11];
+    code[idx + 12] = template[idx + 12];
+    __glapi_sparc_icache_flush(&code[idx + 11]);
+    code[idx + 13] = template[idx + 13];
+    __glapi_sparc_icache_flush(&code[idx + 13]);
+#endif
+#endif
 }
 #endif /* defined(PTHREADS) || defined(GLX_USE_TLS) */
 
diff --git a/src/mesa/glapi/glapi_getproc.c b/src/mesa/glapi/glapi_getproc.c
index 4adc1aece0..764e2ef98e 100644
--- a/src/mesa/glapi/glapi_getproc.c
+++ b/src/mesa/glapi/glapi_getproc.c
@@ -259,53 +259,30 @@ generate_entrypoint(GLuint functionOffset)
    }
 
    return (_glapi_proc) code;
-#elif defined(USE_SPARC_ASM)
-
-#ifdef __arch64__
-   static const unsigned int insn_template[] = {
-	   0x05000000,	/* sethi	%uhi(_glapi_Dispatch), %g2	*/
-	   0x03000000,	/* sethi	%hi(_glapi_Dispatch), %g1	*/
-	   0x8410a000,	/* or		%g2, %ulo(_glapi_Dispatch), %g2	*/
-	   0x82106000,	/* or		%g1, %lo(_glapi_Dispatch), %g1	*/
-	   0x8528b020,	/* sllx		%g2, 32, %g2			*/
-	   0xc2584002,	/* ldx		[%g1 + %g2], %g1		*/
-	   0x05000000,	/* sethi	%hi(8 * glapioffset), %g2	*/
-	   0x8410a000,	/* or		%g2, %lo(8 * glapioffset), %g2	*/
-	   0xc6584002,	/* ldx		[%g1 + %g2], %g3		*/
-	   0x81c0c000,	/* jmpl		%g3, %g0			*/
-	   0x01000000	/*  nop						*/
+#elif defined(USE_SPARC_ASM) && (defined(PTHREADS) || defined(GLX_USE_TLS))
+   static const unsigned int template[] = {
+      0x07000000, /* sethi %hi(0), %g3 */
+      0x8210000f, /* mov  %o7, %g1 */
+      0x40000000, /* call */
+      0x9e100001, /* mov  %g1, %o7 */
    };
+#ifdef GLX_USE_TLS
+   extern unsigned int __glapi_sparc_tls_stub;
+   unsigned long call_dest = (unsigned long ) &__glapi_sparc_tls_stub;
 #else
-   static const unsigned int insn_template[] = {
-	   0x03000000,	/* sethi	%hi(_glapi_Dispatch), %g1	  */
-	   0xc2006000,	/* ld		[%g1 + %lo(_glapi_Dispatch)], %g1 */
-	   0xc6006000,	/* ld		[%g1 + %lo(4*glapioffset)], %g3	  */
-	   0x81c0c000,	/* jmpl		%g3, %g0			  */
-	   0x01000000	/*  nop						  */
-   };
-#endif /* __arch64__ */
-   unsigned int *code = (unsigned int *) malloc(sizeof(insn_template));
-   unsigned long glapi_addr = (unsigned long) &_glapi_Dispatch;
+   extern unsigned int __glapi_sparc_pthread_stub;
+   unsigned long call_dest = (unsigned long ) &__glapi_sparc_pthread_stub;
+#endif
+   unsigned int *code = (unsigned int *) malloc(sizeof(template));
    if (code) {
-      memcpy(code, insn_template, sizeof(insn_template));
-
-#ifdef __arch64__
-      code[0] |= (glapi_addr >> (32 + 10));
-      code[1] |= ((glapi_addr & 0xffffffff) >> 10);
+      code[0] = template[0] | (functionOffset & 0x3fffff);
+      code[1] = template[1];
       __glapi_sparc_icache_flush(&code[0]);
-      code[2] |= ((glapi_addr >> 32) & ((1 << 10) - 1));
-      code[3] |= (glapi_addr & ((1 << 10) - 1));
+      code[2] = template[2] |
+         (((call_dest - ((unsigned long) &code[2]))
+	   >> 2) & 0x3fffffff);
+      code[3] = template[3];
       __glapi_sparc_icache_flush(&code[2]);
-      code[6] |= ((functionOffset * 8) >> 10);
-      code[7] |= ((functionOffset * 8) & ((1 << 10) - 1));
-      __glapi_sparc_icache_flush(&code[6]);
-#else
-      code[0] |= (glapi_addr >> 10);
-      code[1] |= (glapi_addr & ((1 << 10) - 1));
-      __glapi_sparc_icache_flush(&code[0]);
-      code[2] |= (functionOffset * 4);
-      __glapi_sparc_icache_flush(&code[2]);
-#endif /* __arch64__ */
    }
    return (_glapi_proc) code;
 #else
@@ -337,21 +314,10 @@ fill_in_entrypoint_offset(_glapi_proc entrypoint, GLuint offset)
 #endif
 
 #elif defined(USE_SPARC_ASM)
-
-   /* XXX this hasn't been tested! */
    unsigned int *code = (unsigned int *) entrypoint;
-#ifdef __arch64__
-   code[6] = 0x05000000;  /* sethi	%hi(8 * glapioffset), %g2	*/
-   code[7] = 0x8410a000;  /* or		%g2, %lo(8 * glapioffset), %g2	*/
-   code[6] |= ((offset * 8) >> 10);
-   code[7] |= ((offset * 8) & ((1 << 10) - 1));
-   __glapi_sparc_icache_flush(&code[6]);
-#else /* __arch64__ */
-   code[2] = 0xc6006000;  /* ld		[%g1 + %lo(4*glapioffset)], %g3	  */
-   code[2] |= (offset * 4);
-   __glapi_sparc_icache_flush(&code[2]);
-#endif /* __arch64__ */
-
+   code[0] &= ~0x3fffff;
+   code[0] |= (offset * sizeof(void *)) & 0x3fffff;
+   __glapi_sparc_icache_flush(&code[0]);
 #else
 
    /* an unimplemented architecture */
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index a94bbf3fdf..fb43054cdd 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -390,9 +390,6 @@ one_time_init( GLcontext *ctx )
          _mesa_ubyte_to_float_color_tab[i] = (float) i / 255.0F;
       }
 
-#ifdef USE_SPARC_ASM
-      _mesa_init_sparc_glapi_relocs();
-#endif
       if (_mesa_getenv("MESA_DEBUG")) {
          _glapi_noop_enable_warnings(GL_TRUE);
          _glapi_set_warning_func( (_glapi_warning_func) _mesa_warning );
diff --git a/src/mesa/sparc/glapi_sparc.S b/src/mesa/sparc/glapi_sparc.S
index 7d215939b4..bf70fceef5 100644
--- a/src/mesa/sparc/glapi_sparc.S
+++ b/src/mesa/sparc/glapi_sparc.S
@@ -26,818 +26,176 @@
  * SOFTWARE.
  */
 
-#include "glapioffsets.h"
+#include "glapi/glapioffsets.h"
 
 #ifdef __arch64__
-#  define GL_STUB(fn,off)				\
-fn:					\
-	sethi	%hi(0xDEADBEEF), %g4 ;			\
-	sethi	%hi(0xDEADBEEF), %g1 ;			\
-	or	%g4, %lo(0xDEADBEEF), %g4 ;		\
-	or	%g1, %lo(0xDEADBEEF), %g1 ;		\
-	sllx	%g4, 32, %g4 ;				\
-	ldx	[%g1 + %g4], %g1 ;			\
-	sethi	%hi(8 * off), %g4 ;			\
-	or	%g4, %lo(8 * off), %g4 ;		\
-	ldx	[%g1 + %g4], %g5 ;			\
-	jmpl	%g5, %g0 ;				\
-	nop
+#define GL_OFF(N)	((N) * 8)
+#define GL_LL		ldx
+#define GL_TIE_LD(SYM)	%tie_ldx(SYM)
+#define GL_STACK_SIZE	128
 #else
-#  define GL_STUB(fn,off)				\
-fn:					\
-	sethi	%hi(0xDEADBEEF), %g1 ;			\
-	ld	[%g1 + %lo(0xDEADBEEF)], %g1 ;		\
-	ld	[%g1 + (4 * off)], %g5 ;		\
-	jmpl	%g5, %g0 ;				\
-	nop
+#define GL_OFF(N)	((N) * 4)
+#define GL_LL		ld
+#define GL_TIE_LD(SYM)	%tie_ld(SYM)
+#define GL_STACK_SIZE	64
 #endif
 
-#define GL_STUB_ALIAS(fn,alias) fn = alias
+#define GLOBL_FN(x) .globl x ; .type x, @function
+#define HIDDEN(x) .hidden x
 
-.text
-.align 32
-		.globl __glapi_sparc_icache_flush ; .type __glapi_sparc_icache_flush,#function
+	.register %g2, #scratch
+	.register %g3, #scratch
+
+	.text
+
+	GLOBL_FN(__glapi_sparc_icache_flush)
+	HIDDEN(__glapi_sparc_icache_flush)
+	.type	__glapi_sparc_icache_flush, @function
 __glapi_sparc_icache_flush: /* %o0 = insn_addr */
 	flush	%o0
 	retl
-	nop
+	 nop
+
+	.align	32
+
+	.type	__glapi_sparc_get_pc, @function
+__glapi_sparc_get_pc:
+	retl
+	 add	%o7, %g2, %g2
+	.size	__glapi_sparc_get_pc, .-__glapi_sparc_get_pc
+
+#ifdef GLX_USE_TLS
+
+	GLOBL_FN(__glapi_sparc_get_dispatch)
+	HIDDEN(__glapi_sparc_get_dispatch)
+__glapi_sparc_get_dispatch:
+	mov	%o7, %g1
+	sethi	%hi(_GLOBAL_OFFSET_TABLE_-4), %g2
+	call	__glapi_sparc_get_pc
+	add	%g2, %lo(_GLOBAL_OFFSET_TABLE_+4), %g2
+	mov	%g1, %o7
+	sethi	%tie_hi22(_glapi_tls_Dispatch), %g1
+	add	%g1, %tie_lo10(_glapi_tls_Dispatch), %g1
+	GL_LL	[%g2 + %g1], %g2, GL_TIE_LD(_glapi_tls_Dispatch)
+	retl
+	 mov	%g2, %o0
+
+	.data
+	.align	32
+
+	/* --> sethi %hi(_glapi_tls_Dispatch), %g1 */
+	/* --> or %g1, %lo(_glapi_tls_Dispatch), %g1 */
+	GLOBL_FN(__glapi_sparc_tls_stub)
+	HIDDEN(__glapi_sparc_tls_stub)
+__glapi_sparc_tls_stub: /* Call offset in %g3 */
+	mov	%o7, %g1
+	sethi	%hi(_GLOBAL_OFFSET_TABLE_-4), %g2
+	call	__glapi_sparc_get_pc
+	add	%g2, %lo(_GLOBAL_OFFSET_TABLE_+4), %g2
+	mov	%g1, %o7
+	srl	%g3, 10, %g3
+	sethi	%tie_hi22(_glapi_tls_Dispatch), %g1
+	add	%g1, %tie_lo10(_glapi_tls_Dispatch), %g1
+	GL_LL	[%g2 + %g1], %g2, GL_TIE_LD(_glapi_tls_Dispatch)
+	GL_LL	[%g7+%g2], %g1
+	GL_LL	[%g1 + %g3], %g1
+	jmp	%g1
+	 nop
+	.size	__glapi_sparc_tls_stub, .-__glapi_sparc_tls_stub
+
+#define GL_STUB(fn, off)				\
+	GLOBL_FN(fn);					\
+fn:	ba	__glapi_sparc_tls_stub;			\
+	 sethi	GL_OFF(off), %g3;			\
+	.size	fn,.-fn;
+
+#elif defined(PTHREADS)
+
+	/* 64-bit 0x00 --> sethi %hh(_glapi_Dispatch), %g1 */
+	/* 64-bit 0x04 --> sethi %lm(_glapi_Dispatch), %g2 */
+	/* 64-bit 0x08 --> or %g1, %hm(_glapi_Dispatch), %g1 */
+	/* 64-bit 0x0c --> sllx %g1, 32, %g1 */
+	/* 64-bit 0x10 --> add %g1, %g2, %g1 */
+	/* 64-bit 0x14 --> ldx [%g1 + %lo(_glapi_Dispatch)], %g1 */
 
-.data
-.align 64
+	/* 32-bit 0x00 --> sethi %hi(_glapi_Dispatch), %g1 */
+	/* 32-bit 0x04 --> ld [%g1 + %lo(_glapi_Dispatch)], %g1 */
 
-		.globl glNewList ; .type glNewList,#function
-		.globl glEndList ; .type glEndList,#function
-		.globl glCallList ; .type glCallList,#function
-		.globl glCallLists ; .type glCallLists,#function
-		.globl glDeleteLists ; .type glDeleteLists,#function
-		.globl glGenLists ; .type glGenLists,#function
-		.globl glListBase ; .type glListBase,#function
-		.globl glBegin ; .type glBegin,#function
-		.globl glBitmap ; .type glBitmap,#function
-		.globl glColor3b ; .type glColor3b,#function
-		.globl glColor3bv ; .type glColor3bv,#function
-		.globl glColor3d ; .type glColor3d,#function
-		.globl glColor3dv ; .type glColor3dv,#function
-		.globl glColor3f ; .type glColor3f,#function
-		.globl glColor3fv ; .type glColor3fv,#function
-		.globl glColor3i ; .type glColor3i,#function
-		.globl glColor3iv ; .type glColor3iv,#function
-		.globl glColor3s ; .type glColor3s,#function
-		.globl glColor3sv ; .type glColor3sv,#function
-		.globl glColor3ub ; .type glColor3ub,#function
-		.globl glColor3ubv ; .type glColor3ubv,#function
-		.globl glColor3ui ; .type glColor3ui,#function
-		.globl glColor3uiv ; .type glColor3uiv,#function
-		.globl glColor3us ; .type glColor3us,#function
-		.globl glColor3usv ; .type glColor3usv,#function
-		.globl glColor4b ; .type glColor4b,#function
-		.globl glColor4bv ; .type glColor4bv,#function
-		.globl glColor4d ; .type glColor4d,#function
-		.globl glColor4dv ; .type glColor4dv,#function
-		.globl glColor4f ; .type glColor4f,#function
-		.globl glColor4fv ; .type glColor4fv,#function
-		.globl glColor4i ; .type glColor4i,#function
-		.globl glColor4iv ; .type glColor4iv,#function
-		.globl glColor4s ; .type glColor4s,#function
-		.globl glColor4sv ; .type glColor4sv,#function
-		.globl glColor4ub ; .type glColor4ub,#function
-		.globl glColor4ubv ; .type glColor4ubv,#function
-		.globl glColor4ui ; .type glColor4ui,#function
-		.globl glColor4uiv ; .type glColor4uiv,#function
-		.globl glColor4us ; .type glColor4us,#function
-		.globl glColor4usv ; .type glColor4usv,#function
-		.globl glEdgeFlag ; .type glEdgeFlag,#function
-		.globl glEdgeFlagv ; .type glEdgeFlagv,#function
-		.globl glEnd ; .type glEnd,#function
-		.globl glIndexd ; .type glIndexd,#function
-		.globl glIndexdv ; .type glIndexdv,#function
-		.globl glIndexf ; .type glIndexf,#function
-		.globl glIndexfv ; .type glIndexfv,#function
-		.globl glIndexi ; .type glIndexi,#function
-		.globl glIndexiv ; .type glIndexiv,#function
-		.globl glIndexs ; .type glIndexs,#function
-		.globl glIndexsv ; .type glIndexsv,#function
-		.globl glNormal3b ; .type glNormal3b,#function
-		.globl glNormal3bv ; .type glNormal3bv,#function
-		.globl glNormal3d ; .type glNormal3d,#function
-		.globl glNormal3dv ; .type glNormal3dv,#function
-		.globl glNormal3f ; .type glNormal3f,#function
-		.globl glNormal3fv ; .type glNormal3fv,#function
-		.globl glNormal3i ; .type glNormal3i,#function
-		.globl glNormal3iv ; .type glNormal3iv,#function
-		.globl glNormal3s ; .type glNormal3s,#function
-		.globl glNormal3sv ; .type glNormal3sv,#function
-		.globl glRasterPos2d ; .type glRasterPos2d,#function
-		.globl glRasterPos2dv ; .type glRasterPos2dv,#function
-		.globl glRasterPos2f ; .type glRasterPos2f,#function
-		.globl glRasterPos2fv ; .type glRasterPos2fv,#function
-		.globl glRasterPos2i ; .type glRasterPos2i,#function
-		.globl glRasterPos2iv ; .type glRasterPos2iv,#function
-		.globl glRasterPos2s ; .type glRasterPos2s,#function
-		.globl glRasterPos2sv ; .type glRasterPos2sv,#function
-		.globl glRasterPos3d ; .type glRasterPos3d,#function
-		.globl glRasterPos3dv ; .type glRasterPos3dv,#function
-		.globl glRasterPos3f ; .type glRasterPos3f,#function
-		.globl glRasterPos3fv ; .type glRasterPos3fv,#function
-		.globl glRasterPos3i ; .type glRasterPos3i,#function
-		.globl glRasterPos3iv ; .type glRasterPos3iv,#function
-		.globl glRasterPos3s ; .type glRasterPos3s,#function
-		.globl glRasterPos3sv ; .type glRasterPos3sv,#function
-		.globl glRasterPos4d ; .type glRasterPos4d,#function
-		.globl glRasterPos4dv ; .type glRasterPos4dv,#function
-		.globl glRasterPos4f ; .type glRasterPos4f,#function
-		.globl glRasterPos4fv ; .type glRasterPos4fv,#function
-		.globl glRasterPos4i ; .type glRasterPos4i,#function
-		.globl glRasterPos4iv ; .type glRasterPos4iv,#function
-		.globl glRasterPos4s ; .type glRasterPos4s,#function
-		.globl glRasterPos4sv ; .type glRasterPos4sv,#function
-		.globl glRectd ; .type glRectd,#function
-		.globl glRectdv ; .type glRectdv,#function
-		.globl glRectf ; .type glRectf,#function
-		.globl glRectfv ; .type glRectfv,#function
-		.globl glRecti ; .type glRecti,#function
-		.globl glRectiv ; .type glRectiv,#function
-		.globl glRects ; .type glRects,#function
-		.globl glRectsv ; .type glRectsv,#function
-		.globl glTexCoord1d ; .type glTexCoord1d,#function
-		.globl glTexCoord1dv ; .type glTexCoord1dv,#function
-		.globl glTexCoord1f ; .type glTexCoord1f,#function
-		.globl glTexCoord1fv ; .type glTexCoord1fv,#function
-		.globl glTexCoord1i ; .type glTexCoord1i,#function
-		.globl glTexCoord1iv ; .type glTexCoord1iv,#function
-		.globl glTexCoord1s ; .type glTexCoord1s,#function
-		.globl glTexCoord1sv ; .type glTexCoord1sv,#function
-		.globl glTexCoord2d ; .type glTexCoord2d,#function
-		.globl glTexCoord2dv ; .type glTexCoord2dv,#function
-		.globl glTexCoord2f ; .type glTexCoord2f,#function
-		.globl glTexCoord2fv ; .type glTexCoord2fv,#function
-		.globl glTexCoord2i ; .type glTexCoord2i,#function
-		.globl glTexCoord2iv ; .type glTexCoord2iv,#function
-		.globl glTexCoord2s ; .type glTexCoord2s,#function
-		.globl glTexCoord2sv ; .type glTexCoord2sv,#function
-		.globl glTexCoord3d ; .type glTexCoord3d,#function
-		.globl glTexCoord3dv ; .type glTexCoord3dv,#function
-		.globl glTexCoord3f ; .type glTexCoord3f,#function
-		.globl glTexCoord3fv ; .type glTexCoord3fv,#function
-		.globl glTexCoord3i ; .type glTexCoord3i,#function
-		.globl glTexCoord3iv ; .type glTexCoord3iv,#function
-		.globl glTexCoord3s ; .type glTexCoord3s,#function
-		.globl glTexCoord3sv ; .type glTexCoord3sv,#function
-		.globl glTexCoord4d ; .type glTexCoord4d,#function
-		.globl glTexCoord4dv ; .type glTexCoord4dv,#function
-		.globl glTexCoord4f ; .type glTexCoord4f,#function
-		.globl glTexCoord4fv ; .type glTexCoord4fv,#function
-		.globl glTexCoord4i ; .type glTexCoord4i,#function
-		.globl glTexCoord4iv ; .type glTexCoord4iv,#function
-		.globl glTexCoord4s ; .type glTexCoord4s,#function
-		.globl glTexCoord4sv ; .type glTexCoord4sv,#function
-		.globl glVertex2d ; .type glVertex2d,#function
-		.globl glVertex2dv ; .type glVertex2dv,#function
-		.globl glVertex2f ; .type glVertex2f,#function
-		.globl glVertex2fv ; .type glVertex2fv,#function
-		.globl glVertex2i ; .type glVertex2i,#function
-		.globl glVertex2iv ; .type glVertex2iv,#function
-		.globl glVertex2s ; .type glVertex2s,#function
-		.globl glVertex2sv ; .type glVertex2sv,#function
-		.globl glVertex3d ; .type glVertex3d,#function
-		.globl glVertex3dv ; .type glVertex3dv,#function
-		.globl glVertex3f ; .type glVertex3f,#function
-		.globl glVertex3fv ; .type glVertex3fv,#function
-		.globl glVertex3i ; .type glVertex3i,#function
-		.globl glVertex3iv ; .type glVertex3iv,#function
-		.globl glVertex3s ; .type glVertex3s,#function
-		.globl glVertex3sv ; .type glVertex3sv,#function
-		.globl glVertex4d ; .type glVertex4d,#function
-		.globl glVertex4dv ; .type glVertex4dv,#function
-		.globl glVertex4f ; .type glVertex4f,#function
-		.globl glVertex4fv ; .type glVertex4fv,#function
-		.globl glVertex4i ; .type glVertex4i,#function
-		.globl glVertex4iv ; .type glVertex4iv,#function
-		.globl glVertex4s ; .type glVertex4s,#function
-		.globl glVertex4sv ; .type glVertex4sv,#function
-		.globl glClipPlane ; .type glClipPlane,#function
-		.globl glColorMaterial ; .type glColorMaterial,#function
-		.globl glCullFace ; .type glCullFace,#function
-		.globl glFogf ; .type glFogf,#function
-		.globl glFogfv ; .type glFogfv,#function
-		.globl glFogi ; .type glFogi,#function
-		.globl glFogiv ; .type glFogiv,#function
-		.globl glFrontFace ; .type glFrontFace,#function
-		.globl glHint ; .type glHint,#function
-		.globl glLightf ; .type glLightf,#function
-		.globl glLightfv ; .type glLightfv,#function
-		.globl glLighti ; .type glLighti,#function
-		.globl glLightiv ; .type glLightiv,#function
-		.globl glLightModelf ; .type glLightModelf,#function
-		.globl glLightModelfv ; .type glLightModelfv,#function
-		.globl glLightModeli ; .type glLightModeli,#function
-		.globl glLightModeliv ; .type glLightModeliv,#function
-		.globl glLineStipple ; .type glLineStipple,#function
-		.globl glLineWidth ; .type glLineWidth,#function
-		.globl glMaterialf ; .type glMaterialf,#function
-		.globl glMaterialfv ; .type glMaterialfv,#function
-		.globl glMateriali ; .type glMateriali,#function
-		.globl glMaterialiv ; .type glMaterialiv,#function
-		.globl glPointSize ; .type glPointSize,#function
-		.globl glPolygonMode ; .type glPolygonMode,#function
-		.globl glPolygonStipple ; .type glPolygonStipple,#function
-		.globl glScissor ; .type glScissor,#function
-		.globl glShadeModel ; .type glShadeModel,#function
-		.globl glTexParameterf ; .type glTexParameterf,#function
-		.globl glTexParameterfv ; .type glTexParameterfv,#function
-		.globl glTexParameteri ; .type glTexParameteri,#function
-		.globl glTexParameteriv ; .type glTexParameteriv,#function
-		.globl glTexImage1D ; .type glTexImage1D,#function
-		.globl glTexImage2D ; .type glTexImage2D,#function
-		.globl glTexEnvf ; .type glTexEnvf,#function
-		.globl glTexEnvfv ; .type glTexEnvfv,#function
-		.globl glTexEnvi ; .type glTexEnvi,#function
-		.globl glTexEnviv ; .type glTexEnviv,#function
-		.globl glTexGend ; .type glTexGend,#function
-		.globl glTexGendv ; .type glTexGendv,#function
-		.globl glTexGenf ; .type glTexGenf,#function
-		.globl glTexGenfv ; .type glTexGenfv,#function
-		.globl glTexGeni ; .type glTexGeni,#function
-		.globl glTexGeniv ; .type glTexGeniv,#function
-		.globl glFeedbackBuffer ; .type glFeedbackBuffer,#function
-		.globl glSelectBuffer ; .type glSelectBuffer,#function
-		.globl glRenderMode ; .type glRenderMode,#function
-		.globl glInitNames ; .type glInitNames,#function
-		.globl glLoadName ; .type glLoadName,#function
-		.globl glPassThrough ; .type glPassThrough,#function
-		.globl glPopName ; .type glPopName,#function
-		.globl glPushName ; .type glPushName,#function
-		.globl glDrawBuffer ; .type glDrawBuffer,#function
-		.globl glClear ; .type glClear,#function
-		.globl glClearAccum ; .type glClearAccum,#function
-		.globl glClearIndex ; .type glClearIndex,#function
-		.globl glClearColor ; .type glClearColor,#function
-		.globl glClearStencil ; .type glClearStencil,#function
-		.globl glClearDepth ; .type glClearDepth,#function
-		.globl glStencilMask ; .type glStencilMask,#function
-		.globl glColorMask ; .type glColorMask,#function
-		.globl glDepthMask ; .type glDepthMask,#function
-		.globl glIndexMask ; .type glIndexMask,#function
-		.globl glAccum ; .type glAccum,#function
-		.globl glDisable ; .type glDisable,#function
-		.globl glEnable ; .type glEnable,#function
-		.globl glFinish ; .type glFinish,#function
-		.globl glFlush ; .type glFlush,#function
-		.globl glPopAttrib ; .type glPopAttrib,#function
-		.globl glPushAttrib ; .type glPushAttrib,#function
-		.globl glMap1d ; .type glMap1d,#function
-		.globl glMap1f ; .type glMap1f,#function
-		.globl glMap2d ; .type glMap2d,#function
-		.globl glMap2f ; .type glMap2f,#function
-		.globl glMapGrid1d ; .type glMapGrid1d,#function
-		.globl glMapGrid1f ; .type glMapGrid1f,#function
-		.globl glMapGrid2d ; .type glMapGrid2d,#function
-		.globl glMapGrid2f ; .type glMapGrid2f,#function
-		.globl glEvalCoord1d ; .type glEvalCoord1d,#function
-		.globl glEvalCoord1dv ; .type glEvalCoord1dv,#function
-		.globl glEvalCoord1f ; .type glEvalCoord1f,#function
-		.globl glEvalCoord1fv ; .type glEvalCoord1fv,#function
-		.globl glEvalCoord2d ; .type glEvalCoord2d,#function
-		.globl glEvalCoord2dv ; .type glEvalCoord2dv,#function
-		.globl glEvalCoord2f ; .type glEvalCoord2f,#function
-		.globl glEvalCoord2fv ; .type glEvalCoord2fv,#function
-		.globl glEvalMesh1 ; .type glEvalMesh1,#function
-		.globl glEvalPoint1 ; .type glEvalPoint1,#function
-		.globl glEvalMesh2 ; .type glEvalMesh2,#function
-		.globl glEvalPoint2 ; .type glEvalPoint2,#function
-		.globl glAlphaFunc ; .type glAlphaFunc,#function
-		.globl glBlendFunc ; .type glBlendFunc,#function
-		.globl glLogicOp ; .type glLogicOp,#function
-		.globl glStencilFunc ; .type glStencilFunc,#function
-		.globl glStencilOp ; .type glStencilOp,#function
-		.globl glDepthFunc ; .type glDepthFunc,#function
-		.globl glPixelZoom ; .type glPixelZoom,#function
-		.globl glPixelTransferf ; .type glPixelTransferf,#function
-		.globl glPixelTransferi ; .type glPixelTransferi,#function
-		.globl glPixelStoref ; .type glPixelStoref,#function
-		.globl glPixelStorei ; .type glPixelStorei,#function
-		.globl glPixelMapfv ; .type glPixelMapfv,#function
-		.globl glPixelMapuiv ; .type glPixelMapuiv,#function
-		.globl glPixelMapusv ; .type glPixelMapusv,#function
-		.globl glReadBuffer ; .type glReadBuffer,#function
-		.globl glCopyPixels ; .type glCopyPixels,#function
-		.globl glReadPixels ; .type glReadPixels,#function
-		.globl glDrawPixels ; .type glDrawPixels,#function
-		.globl glGetBooleanv ; .type glGetBooleanv,#function
-		.globl glGetClipPlane ; .type glGetClipPlane,#function
-		.globl glGetDoublev ; .type glGetDoublev,#function
-		.globl glGetError ; .type glGetError,#function
-		.globl glGetFloatv ; .type glGetFloatv,#function
-		.globl glGetIntegerv ; .type glGetIntegerv,#function
-		.globl glGetLightfv ; .type glGetLightfv,#function
-		.globl glGetLightiv ; .type glGetLightiv,#function
-		.globl glGetMapdv ; .type glGetMapdv,#function
-		.globl glGetMapfv ; .type glGetMapfv,#function
-		.globl glGetMapiv ; .type glGetMapiv,#function
-		.globl glGetMaterialfv ; .type glGetMaterialfv,#function
-		.globl glGetMaterialiv ; .type glGetMaterialiv,#function
-		.globl glGetPixelMapfv ; .type glGetPixelMapfv,#function
-		.globl glGetPixelMapuiv ; .type glGetPixelMapuiv,#function
-		.globl glGetPixelMapusv ; .type glGetPixelMapusv,#function
-		.globl glGetPolygonStipple ; .type glGetPolygonStipple,#function
-		.globl glGetString ; .type glGetString,#function
-		.globl glGetTexEnvfv ; .type glGetTexEnvfv,#function
-		.globl glGetTexEnviv ; .type glGetTexEnviv,#function
-		.globl glGetTexGendv ; .type glGetTexGendv,#function
-		.globl glGetTexGenfv ; .type glGetTexGenfv,#function
-		.globl glGetTexGeniv ; .type glGetTexGeniv,#function
-		.globl glGetTexImage ; .type glGetTexImage,#function
-		.globl glGetTexParameterfv ; .type glGetTexParameterfv,#function
-		.globl glGetTexParameteriv ; .type glGetTexParameteriv,#function
-		.globl glGetTexLevelParameterfv ; .type glGetTexLevelParameterfv,#function
-		.globl glGetTexLevelParameteriv ; .type glGetTexLevelParameteriv,#function
-		.globl glIsEnabled ; .type glIsEnabled,#function
-		.globl glIsList ; .type glIsList,#function
-		.globl glDepthRange ; .type glDepthRange,#function
-		.globl glFrustum ; .type glFrustum,#function
-		.globl glLoadIdentity ; .type glLoadIdentity,#function
-		.globl glLoadMatrixf ; .type glLoadMatrixf,#function
-		.globl glLoadMatrixd ; .type glLoadMatrixd,#function
-		.globl glMatrixMode ; .type glMatrixMode,#function
-		.globl glMultMatrixf ; .type glMultMatrixf,#function
-		.globl glMultMatrixd ; .type glMultMatrixd,#function
-		.globl glOrtho ; .type glOrtho,#function
-		.globl glPopMatrix ; .type glPopMatrix,#function
-		.globl glPushMatrix ; .type glPushMatrix,#function
-		.globl glRotated ; .type glRotated,#function
-		.globl glRotatef ; .type glRotatef,#function
-		.globl glScaled ; .type glScaled,#function
-		.globl glScalef ; .type glScalef,#function
-		.globl glTranslated ; .type glTranslated,#function
-		.globl glTranslatef ; .type glTranslatef,#function
-		.globl glViewport ; .type glViewport,#function
-		.globl glArrayElement ; .type glArrayElement,#function
-		.globl glBindTexture ; .type glBindTexture,#function
-		.globl glColorPointer ; .type glColorPointer,#function
-		.globl glDisableClientState ; .type glDisableClientState,#function
-		.globl glDrawArrays ; .type glDrawArrays,#function
-		.globl glDrawElements ; .type glDrawElements,#function
-		.globl glEdgeFlagPointer ; .type glEdgeFlagPointer,#function
-		.globl glEnableClientState ; .type glEnableClientState,#function
-		.globl glIndexPointer ; .type glIndexPointer,#function
-		.globl glIndexub ; .type glIndexub,#function
-		.globl glIndexubv ; .type glIndexubv,#function
-		.globl glInterleavedArrays ; .type glInterleavedArrays,#function
-		.globl glNormalPointer ; .type glNormalPointer,#function
-		.globl glPolygonOffset ; .type glPolygonOffset,#function
-		.globl glTexCoordPointer ; .type glTexCoordPointer,#function
-		.globl glVertexPointer ; .type glVertexPointer,#function
-		.globl glAreTexturesResident ; .type glAreTexturesResident,#function
-		.globl glCopyTexImage1D ; .type glCopyTexImage1D,#function
-		.globl glCopyTexImage2D ; .type glCopyTexImage2D,#function
-		.globl glCopyTexSubImage1D ; .type glCopyTexSubImage1D,#function
-		.globl glCopyTexSubImage2D ; .type glCopyTexSubImage2D,#function
-		.globl glDeleteTextures ; .type glDeleteTextures,#function
-		.globl glGenTextures ; .type glGenTextures,#function
-		.globl glGetPointerv ; .type glGetPointerv,#function
-		.globl glIsTexture ; .type glIsTexture,#function
-		.globl glPrioritizeTextures ; .type glPrioritizeTextures,#function
-		.globl glTexSubImage1D ; .type glTexSubImage1D,#function
-		.globl glTexSubImage2D ; .type glTexSubImage2D,#function
-		.globl glPopClientAttrib ; .type glPopClientAttrib,#function
-		.globl glPushClientAttrib ; .type glPushClientAttrib,#function
-		.globl glBlendColor ; .type glBlendColor,#function
-		.globl glBlendEquation ; .type glBlendEquation,#function
-		.globl glDrawRangeElements ; .type glDrawRangeElements,#function
-		.globl glColorTable ; .type glColorTable,#function
-		.globl glColorTableParameterfv ; .type glColorTableParameterfv,#function
-		.globl glColorTableParameteriv ; .type glColorTableParameteriv,#function
-		.globl glCopyColorTable ; .type glCopyColorTable,#function
-		.globl glGetColorTable ; .type glGetColorTable,#function
-		.globl glGetColorTableParameterfv ; .type glGetColorTableParameterfv,#function
-		.globl glGetColorTableParameteriv ; .type glGetColorTableParameteriv,#function
-		.globl glColorSubTable ; .type glColorSubTable,#function
-		.globl glCopyColorSubTable ; .type glCopyColorSubTable,#function
-		.globl glConvolutionFilter1D ; .type glConvolutionFilter1D,#function
-		.globl glConvolutionFilter2D ; .type glConvolutionFilter2D,#function
-		.globl glConvolutionParameterf ; .type glConvolutionParameterf,#function
-		.globl glConvolutionParameterfv ; .type glConvolutionParameterfv,#function
-		.globl glConvolutionParameteri ; .type glConvolutionParameteri,#function
-		.globl glConvolutionParameteriv ; .type glConvolutionParameteriv,#function
-		.globl glCopyConvolutionFilter1D ; .type glCopyConvolutionFilter1D,#function
-		.globl glCopyConvolutionFilter2D ; .type glCopyConvolutionFilter2D,#function
-		.globl glGetConvolutionFilter ; .type glGetConvolutionFilter,#function
-		.globl glGetConvolutionParameterfv ; .type glGetConvolutionParameterfv,#function
-		.globl glGetConvolutionParameteriv ; .type glGetConvolutionParameteriv,#function
-		.globl glGetSeparableFilter ; .type glGetSeparableFilter,#function
-		.globl glSeparableFilter2D ; .type glSeparableFilter2D,#function
-		.globl glGetHistogram ; .type glGetHistogram,#function
-		.globl glGetHistogramParameterfv ; .type glGetHistogramParameterfv,#function
-		.globl glGetHistogramParameteriv ; .type glGetHistogramParameteriv,#function
-		.globl glGetMinmax ; .type glGetMinmax,#function
-		.globl glGetMinmaxParameterfv ; .type glGetMinmaxParameterfv,#function
-		.globl glGetMinmaxParameteriv ; .type glGetMinmaxParameteriv,#function
-		.globl glHistogram ; .type glHistogram,#function
-		.globl glMinmax ; .type glMinmax,#function
-		.globl glResetHistogram ; .type glResetHistogram,#function
-		.globl glResetMinmax ; .type glResetMinmax,#function
-		.globl glTexImage3D ; .type glTexImage3D,#function
-		.globl glTexSubImage3D ; .type glTexSubImage3D,#function
-		.globl glCopyTexSubImage3D ; .type glCopyTexSubImage3D,#function
-		.globl glActiveTextureARB ; .type glActiveTextureARB,#function
-		.globl glClientActiveTextureARB ; .type glClientActiveTextureARB,#function
-		.globl glMultiTexCoord1dARB ; .type glMultiTexCoord1dARB,#function
-		.globl glMultiTexCoord1dvARB ; .type glMultiTexCoord1dvARB,#function
-		.globl glMultiTexCoord1fARB ; .type glMultiTexCoord1fARB,#function
-		.globl glMultiTexCoord1fvARB ; .type glMultiTexCoord1fvARB,#function
-		.globl glMultiTexCoord1iARB ; .type glMultiTexCoord1iARB,#function
-		.globl glMultiTexCoord1ivARB ; .type glMultiTexCoord1ivARB,#function
-		.globl glMultiTexCoord1sARB ; .type glMultiTexCoord1sARB,#function
-		.globl glMultiTexCoord1svARB ; .type glMultiTexCoord1svARB,#function
-		.globl glMultiTexCoord2dARB ; .type glMultiTexCoord2dARB,#function
-		.globl glMultiTexCoord2dvARB ; .type glMultiTexCoord2dvARB,#function
-		.globl glMultiTexCoord2fARB ; .type glMultiTexCoord2fARB,#function
-		.globl glMultiTexCoord2fvARB ; .type glMultiTexCoord2fvARB,#function
-		.globl glMultiTexCoord2iARB ; .type glMultiTexCoord2iARB,#function
-		.globl glMultiTexCoord2ivARB ; .type glMultiTexCoord2ivARB,#function
-		.globl glMultiTexCoord2sARB ; .type glMultiTexCoord2sARB,#function
-		.globl glMultiTexCoord2svARB ; .type glMultiTexCoord2svARB,#function
-		.globl glMultiTexCoord3dARB ; .type glMultiTexCoord3dARB,#function
-		.globl glMultiTexCoord3dvARB ; .type glMultiTexCoord3dvARB,#function
-		.globl glMultiTexCoord3fARB ; .type glMultiTexCoord3fARB,#function
-		.globl glMultiTexCoord3fvARB ; .type glMultiTexCoord3fvARB,#function
-		.globl glMultiTexCoord3iARB ; .type glMultiTexCoord3iARB,#function
-		.globl glMultiTexCoord3ivARB ; .type glMultiTexCoord3ivARB,#function
-		.globl glMultiTexCoord3sARB ; .type glMultiTexCoord3sARB,#function
-		.globl glMultiTexCoord3svARB ; .type glMultiTexCoord3svARB,#function
-		.globl glMultiTexCoord4dARB ; .type glMultiTexCoord4dARB,#function
-		.globl glMultiTexCoord4dvARB ; .type glMultiTexCoord4dvARB,#function
-		.globl glMultiTexCoord4fARB ; .type glMultiTexCoord4fARB,#function
-		.globl glMultiTexCoord4fvARB ; .type glMultiTexCoord4fvARB,#function
-		.globl glMultiTexCoord4iARB ; .type glMultiTexCoord4iARB,#function
-		.globl glMultiTexCoord4ivARB ; .type glMultiTexCoord4ivARB,#function
-		.globl glMultiTexCoord4sARB ; .type glMultiTexCoord4sARB,#function
-		.globl glMultiTexCoord4svARB ; .type glMultiTexCoord4svARB,#function
-		.globl glAttachShader ; .type glAttachShader,#function
-		.globl glCreateProgram ; .type glCreateProgram,#function
-		.globl glCreateShader ; .type glCreateShader,#function
-		.globl glDeleteProgram ; .type glDeleteProgram,#function
-		.globl glDeleteShader ; .type glDeleteShader,#function
-		.globl glDetachShader ; .type glDetachShader,#function
-		.globl glGetAttachedShaders ; .type glGetAttachedShaders,#function
-		.globl glGetProgramInfoLog ; .type glGetProgramInfoLog,#function
-		.globl glGetProgramiv ; .type glGetProgramiv,#function
-		.globl glGetShaderInfoLog ; .type glGetShaderInfoLog,#function
-		.globl glGetShaderiv ; .type glGetShaderiv,#function
-		.globl glIsProgram ; .type glIsProgram,#function
-		.globl glIsShader ; .type glIsShader,#function
-		.globl glStencilFuncSeparate ; .type glStencilFuncSeparate,#function
-		.globl glStencilMaskSeparate ; .type glStencilMaskSeparate,#function
-		.globl glStencilOpSeparate ; .type glStencilOpSeparate,#function
-		.globl glUniformMatrix2x3fv ; .type glUniformMatrix2x3fv,#function
-		.globl glUniformMatrix2x4fv ; .type glUniformMatrix2x4fv,#function
-		.globl glUniformMatrix3x2fv ; .type glUniformMatrix3x2fv,#function
-		.globl glUniformMatrix3x4fv ; .type glUniformMatrix3x4fv,#function
-		.globl glUniformMatrix4x2fv ; .type glUniformMatrix4x2fv,#function
-		.globl glUniformMatrix4x3fv ; .type glUniformMatrix4x3fv,#function
-		.globl glLoadTransposeMatrixdARB ; .type glLoadTransposeMatrixdARB,#function
-		.globl glLoadTransposeMatrixfARB ; .type glLoadTransposeMatrixfARB,#function
-		.globl glMultTransposeMatrixdARB ; .type glMultTransposeMatrixdARB,#function
-		.globl glMultTransposeMatrixfARB ; .type glMultTransposeMatrixfARB,#function
-		.globl glSampleCoverageARB ; .type glSampleCoverageARB,#function
-		.globl glCompressedTexImage1DARB ; .type glCompressedTexImage1DARB,#function
-		.globl glCompressedTexImage2DARB ; .type glCompressedTexImage2DARB,#function
-		.globl glCompressedTexImage3DARB ; .type glCompressedTexImage3DARB,#function
-		.globl glCompressedTexSubImage1DARB ; .type glCompressedTexSubImage1DARB,#function
-		.globl glCompressedTexSubImage2DARB ; .type glCompressedTexSubImage2DARB,#function
-		.globl glCompressedTexSubImage3DARB ; .type glCompressedTexSubImage3DARB,#function
-		.globl glGetCompressedTexImageARB ; .type glGetCompressedTexImageARB,#function
-		.globl glDisableVertexAttribArrayARB ; .type glDisableVertexAttribArrayARB,#function
-		.globl glEnableVertexAttribArrayARB ; .type glEnableVertexAttribArrayARB,#function
-		.globl glGetProgramEnvParameterdvARB ; .type glGetProgramEnvParameterdvARB,#function
-		.globl glGetProgramEnvParameterfvARB ; .type glGetProgramEnvParameterfvARB,#function
-		.globl glGetProgramLocalParameterdvARB ; .type glGetProgramLocalParameterdvARB,#function
-		.globl glGetProgramLocalParameterfvARB ; .type glGetProgramLocalParameterfvARB,#function
-		.globl glGetProgramStringARB ; .type glGetProgramStringARB,#function
-		.globl glGetProgramivARB ; .type glGetProgramivARB,#function
-		.globl glGetVertexAttribdvARB ; .type glGetVertexAttribdvARB,#function
-		.globl glGetVertexAttribfvARB ; .type glGetVertexAttribfvARB,#function
-		.globl glGetVertexAttribivARB ; .type glGetVertexAttribivARB,#function
-		.globl glProgramEnvParameter4dARB ; .type glProgramEnvParameter4dARB,#function
-		.globl glProgramEnvParameter4dvARB ; .type glProgramEnvParameter4dvARB,#function
-		.globl glProgramEnvParameter4fARB ; .type glProgramEnvParameter4fARB,#function
-		.globl glProgramEnvParameter4fvARB ; .type glProgramEnvParameter4fvARB,#function
-		.globl glProgramLocalParameter4dARB ; .type glProgramLocalParameter4dARB,#function
-		.globl glProgramLocalParameter4dvARB ; .type glProgramLocalParameter4dvARB,#function
-		.globl glProgramLocalParameter4fARB ; .type glProgramLocalParameter4fARB,#function
-		.globl glProgramLocalParameter4fvARB ; .type glProgramLocalParameter4fvARB,#function
-		.globl glProgramStringARB ; .type glProgramStringARB,#function
-		.globl glVertexAttrib1dARB ; .type glVertexAttrib1dARB,#function
-		.globl glVertexAttrib1dvARB ; .type glVertexAttrib1dvARB,#function
-		.globl glVertexAttrib1fARB ; .type glVertexAttrib1fARB,#function
-		.globl glVertexAttrib1fvARB ; .type glVertexAttrib1fvARB,#function
-		.globl glVertexAttrib1sARB ; .type glVertexAttrib1sARB,#function
-		.globl glVertexAttrib1svARB ; .type glVertexAttrib1svARB,#function
-		.globl glVertexAttrib2dARB ; .type glVertexAttrib2dARB,#function
-		.globl glVertexAttrib2dvARB ; .type glVertexAttrib2dvARB,#function
-		.globl glVertexAttrib2fARB ; .type glVertexAttrib2fARB,#function
-		.globl glVertexAttrib2fvARB ; .type glVertexAttrib2fvARB,#function
-		.globl glVertexAttrib2sARB ; .type glVertexAttrib2sARB,#function
-		.globl glVertexAttrib2svARB ; .type glVertexAttrib2svARB,#function
-		.globl glVertexAttrib3dARB ; .type glVertexAttrib3dARB,#function
-		.globl glVertexAttrib3dvARB ; .type glVertexAttrib3dvARB,#function
-		.globl glVertexAttrib3fARB ; .type glVertexAttrib3fARB,#function
-		.globl glVertexAttrib3fvARB ; .type glVertexAttrib3fvARB,#function
-		.globl glVertexAttrib3sARB ; .type glVertexAttrib3sARB,#function
-		.globl glVertexAttrib3svARB ; .type glVertexAttrib3svARB,#function
-		.globl glVertexAttrib4NbvARB ; .type glVertexAttrib4NbvARB,#function
-		.globl glVertexAttrib4NivARB ; .type glVertexAttrib4NivARB,#function
-		.globl glVertexAttrib4NsvARB ; .type glVertexAttrib4NsvARB,#function
-		.globl glVertexAttrib4NubARB ; .type glVertexAttrib4NubARB,#function
-		.globl glVertexAttrib4NubvARB ; .type glVertexAttrib4NubvARB,#function
-		.globl glVertexAttrib4NuivARB ; .type glVertexAttrib4NuivARB,#function
-		.globl glVertexAttrib4NusvARB ; .type glVertexAttrib4NusvARB,#function
-		.globl glVertexAttrib4bvARB ; .type glVertexAttrib4bvARB,#function
-		.globl glVertexAttrib4dARB ; .type glVertexAttrib4dARB,#function
-		.globl glVertexAttrib4dvARB ; .type glVertexAttrib4dvARB,#function
-		.globl glVertexAttrib4fARB ; .type glVertexAttrib4fARB,#function
-		.globl glVertexAttrib4fvARB ; .type glVertexAttrib4fvARB,#function
-		.globl glVertexAttrib4ivARB ; .type glVertexAttrib4ivARB,#function
-		.globl glVertexAttrib4sARB ; .type glVertexAttrib4sARB,#function
-		.globl glVertexAttrib4svARB ; .type glVertexAttrib4svARB,#function
-		.globl glVertexAttrib4ubvARB ; .type glVertexAttrib4ubvARB,#function
-		.globl glVertexAttrib4uivARB ; .type glVertexAttrib4uivARB,#function
-		.globl glVertexAttrib4usvARB ; .type glVertexAttrib4usvARB,#function
-		.globl glVertexAttribPointerARB ; .type glVertexAttribPointerARB,#function
-		.globl glBindBufferARB ; .type glBindBufferARB,#function
-		.globl glBufferDataARB ; .type glBufferDataARB,#function
-		.globl glBufferSubDataARB ; .type glBufferSubDataARB,#function
-		.globl glDeleteBuffersARB ; .type glDeleteBuffersARB,#function
-		.globl glGenBuffersARB ; .type glGenBuffersARB,#function
-		.globl glGetBufferParameterivARB ; .type glGetBufferParameterivARB,#function
-		.globl glGetBufferPointervARB ; .type glGetBufferPointervARB,#function
-		.globl glGetBufferSubDataARB ; .type glGetBufferSubDataARB,#function
-		.globl glIsBufferARB ; .type glIsBufferARB,#function
-		.globl glMapBufferARB ; .type glMapBufferARB,#function
-		.globl glUnmapBufferARB ; .type glUnmapBufferARB,#function
-		.globl glBeginQueryARB ; .type glBeginQueryARB,#function
-		.globl glDeleteQueriesARB ; .type glDeleteQueriesARB,#function
-		.globl glEndQueryARB ; .type glEndQueryARB,#function
-		.globl glGenQueriesARB ; .type glGenQueriesARB,#function
-		.globl glGetQueryObjectivARB ; .type glGetQueryObjectivARB,#function
-		.globl glGetQueryObjectuivARB ; .type glGetQueryObjectuivARB,#function
-		.globl glGetQueryivARB ; .type glGetQueryivARB,#function
-		.globl glIsQueryARB ; .type glIsQueryARB,#function
-		.globl glAttachObjectARB ; .type glAttachObjectARB,#function
-		.globl glCompileShaderARB ; .type glCompileShaderARB,#function
-		.globl glCreateProgramObjectARB ; .type glCreateProgramObjectARB,#function
-		.globl glCreateShaderObjectARB ; .type glCreateShaderObjectARB,#function
-		.globl glDeleteObjectARB ; .type glDeleteObjectARB,#function
-		.globl glDetachObjectARB ; .type glDetachObjectARB,#function
-		.globl glGetActiveUniformARB ; .type glGetActiveUniformARB,#function
-		.globl glGetAttachedObjectsARB ; .type glGetAttachedObjectsARB,#function
-		.globl glGetHandleARB ; .type glGetHandleARB,#function
-		.globl glGetInfoLogARB ; .type glGetInfoLogARB,#function
-		.globl glGetObjectParameterfvARB ; .type glGetObjectParameterfvARB,#function
-		.globl glGetObjectParameterivARB ; .type glGetObjectParameterivARB,#function
-		.globl glGetShaderSourceARB ; .type glGetShaderSourceARB,#function
-		.globl glGetUniformLocationARB ; .type glGetUniformLocationARB,#function
-		.globl glGetUniformfvARB ; .type glGetUniformfvARB,#function
-		.globl glGetUniformivARB ; .type glGetUniformivARB,#function
-		.globl glLinkProgramARB ; .type glLinkProgramARB,#function
-		.globl glShaderSourceARB ; .type glShaderSourceARB,#function
-		.globl glUniform1fARB ; .type glUniform1fARB,#function
-		.globl glUniform1fvARB ; .type glUniform1fvARB,#function
-		.globl glUniform1iARB ; .type glUniform1iARB,#function
-		.globl glUniform1ivARB ; .type glUniform1ivARB,#function
-		.globl glUniform2fARB ; .type glUniform2fARB,#function
-		.globl glUniform2fvARB ; .type glUniform2fvARB,#function
-		.globl glUniform2iARB ; .type glUniform2iARB,#function
-		.globl glUniform2ivARB ; .type glUniform2ivARB,#function
-		.globl glUniform3fARB ; .type glUniform3fARB,#function
-		.globl glUniform3fvARB ; .type glUniform3fvARB,#function
-		.globl glUniform3iARB ; .type glUniform3iARB,#function
-		.globl glUniform3ivARB ; .type glUniform3ivARB,#function
-		.globl glUniform4fARB ; .type glUniform4fARB,#function
-		.globl glUniform4fvARB ; .type glUniform4fvARB,#function
-		.globl glUniform4iARB ; .type glUniform4iARB,#function
-		.globl glUniform4ivARB ; .type glUniform4ivARB,#function
-		.globl glUniformMatrix2fvARB ; .type glUniformMatrix2fvARB,#function
-		.globl glUniformMatrix3fvARB ; .type glUniformMatrix3fvARB,#function
-		.globl glUniformMatrix4fvARB ; .type glUniformMatrix4fvARB,#function
-		.globl glUseProgramObjectARB ; .type glUseProgramObjectARB,#function
-		.globl glValidateProgramARB ; .type glValidateProgramARB,#function
-		.globl glBindAttribLocationARB ; .type glBindAttribLocationARB,#function
-		.globl glGetActiveAttribARB ; .type glGetActiveAttribARB,#function
-		.globl glGetAttribLocationARB ; .type glGetAttribLocationARB,#function
-		.globl glDrawBuffersARB ; .type glDrawBuffersARB,#function
-		.globl glRenderbufferStorageMultisample ; .type glRenderbufferStorageMultisample,#function
-		.globl glPolygonOffsetEXT ; .type glPolygonOffsetEXT,#function
-		.globl gl_dispatch_stub_563 ; .type gl_dispatch_stub_563,#function
-		.globl gl_dispatch_stub_564 ; .type gl_dispatch_stub_564,#function
-		.globl gl_dispatch_stub_565 ; .type gl_dispatch_stub_565,#function
-		.globl gl_dispatch_stub_566 ; .type gl_dispatch_stub_566,#function
-		.globl gl_dispatch_stub_567 ; .type gl_dispatch_stub_567,#function
-		.globl gl_dispatch_stub_568 ; .type gl_dispatch_stub_568,#function
-		.globl gl_dispatch_stub_569 ; .type gl_dispatch_stub_569,#function
-		.globl gl_dispatch_stub_570 ; .type gl_dispatch_stub_570,#function
-		.globl glColorPointerEXT ; .type glColorPointerEXT,#function
-		.globl glEdgeFlagPointerEXT ; .type glEdgeFlagPointerEXT,#function
-		.globl glIndexPointerEXT ; .type glIndexPointerEXT,#function
-		.globl glNormalPointerEXT ; .type glNormalPointerEXT,#function
-		.globl glTexCoordPointerEXT ; .type glTexCoordPointerEXT,#function
-		.globl glVertexPointerEXT ; .type glVertexPointerEXT,#function
-		.globl glPointParameterfEXT ; .type glPointParameterfEXT,#function
-		.globl glPointParameterfvEXT ; .type glPointParameterfvEXT,#function
-		.globl glLockArraysEXT ; .type glLockArraysEXT,#function
-		.globl glUnlockArraysEXT ; .type glUnlockArraysEXT,#function
-		.globl gl_dispatch_stub_581 ; .type gl_dispatch_stub_581,#function
-		.globl gl_dispatch_stub_582 ; .type gl_dispatch_stub_582,#function
-		.globl glSecondaryColor3bEXT ; .type glSecondaryColor3bEXT,#function
-		.globl glSecondaryColor3bvEXT ; .type glSecondaryColor3bvEXT,#function
-		.globl glSecondaryColor3dEXT ; .type glSecondaryColor3dEXT,#function
-		.globl glSecondaryColor3dvEXT ; .type glSecondaryColor3dvEXT,#function
-		.globl glSecondaryColor3fEXT ; .type glSecondaryColor3fEXT,#function
-		.globl glSecondaryColor3fvEXT ; .type glSecondaryColor3fvEXT,#function
-		.globl glSecondaryColor3iEXT ; .type glSecondaryColor3iEXT,#function
-		.globl glSecondaryColor3ivEXT ; .type glSecondaryColor3ivEXT,#function
-		.globl glSecondaryColor3sEXT ; .type glSecondaryColor3sEXT,#function
-		.globl glSecondaryColor3svEXT ; .type glSecondaryColor3svEXT,#function
-		.globl glSecondaryColor3ubEXT ; .type glSecondaryColor3ubEXT,#function
-		.globl glSecondaryColor3ubvEXT ; .type glSecondaryColor3ubvEXT,#function
-		.globl glSecondaryColor3uiEXT ; .type glSecondaryColor3uiEXT,#function
-		.globl glSecondaryColor3uivEXT ; .type glSecondaryColor3uivEXT,#function
-		.globl glSecondaryColor3usEXT ; .type glSecondaryColor3usEXT,#function
-		.globl glSecondaryColor3usvEXT ; .type glSecondaryColor3usvEXT,#function
-		.globl glSecondaryColorPointerEXT ; .type glSecondaryColorPointerEXT,#function
-		.globl glMultiDrawArraysEXT ; .type glMultiDrawArraysEXT,#function
-		.globl glMultiDrawElementsEXT ; .type glMultiDrawElementsEXT,#function
-		.globl glFogCoordPointerEXT ; .type glFogCoordPointerEXT,#function
-		.globl glFogCoorddEXT ; .type glFogCoorddEXT,#function
-		.globl glFogCoorddvEXT ; .type glFogCoorddvEXT,#function
-		.globl glFogCoordfEXT ; .type glFogCoordfEXT,#function
-		.globl glFogCoordfvEXT ; .type glFogCoordfvEXT,#function
-		.globl gl_dispatch_stub_607 ; .type gl_dispatch_stub_607,#function
-		.globl glBlendFuncSeparateEXT ; .type glBlendFuncSeparateEXT,#function
-		.globl glFlushVertexArrayRangeNV ; .type glFlushVertexArrayRangeNV,#function
-		.globl glVertexArrayRangeNV ; .type glVertexArrayRangeNV,#function
-		.globl glCombinerInputNV ; .type glCombinerInputNV,#function
-		.globl glCombinerOutputNV ; .type glCombinerOutputNV,#function
-		.globl glCombinerParameterfNV ; .type glCombinerParameterfNV,#function
-		.globl glCombinerParameterfvNV ; .type glCombinerParameterfvNV,#function
-		.globl glCombinerParameteriNV ; .type glCombinerParameteriNV,#function
-		.globl glCombinerParameterivNV ; .type glCombinerParameterivNV,#function
-		.globl glFinalCombinerInputNV ; .type glFinalCombinerInputNV,#function
-		.globl glGetCombinerInputParameterfvNV ; .type glGetCombinerInputParameterfvNV,#function
-		.globl glGetCombinerInputParameterivNV ; .type glGetCombinerInputParameterivNV,#function
-		.globl glGetCombinerOutputParameterfvNV ; .type glGetCombinerOutputParameterfvNV,#function
-		.globl glGetCombinerOutputParameterivNV ; .type glGetCombinerOutputParameterivNV,#function
-		.globl glGetFinalCombinerInputParameterfvNV ; .type glGetFinalCombinerInputParameterfvNV,#function
-		.globl glGetFinalCombinerInputParameterivNV ; .type glGetFinalCombinerInputParameterivNV,#function
-		.globl glResizeBuffersMESA ; .type glResizeBuffersMESA,#function
-		.globl glWindowPos2dMESA ; .type glWindowPos2dMESA,#function
-		.globl glWindowPos2dvMESA ; .type glWindowPos2dvMESA,#function
-		.globl glWindowPos2fMESA ; .type glWindowPos2fMESA,#function
-		.globl glWindowPos2fvMESA ; .type glWindowPos2fvMESA,#function
-		.globl glWindowPos2iMESA ; .type glWindowPos2iMESA,#function
-		.globl glWindowPos2ivMESA ; .type glWindowPos2ivMESA,#function
-		.globl glWindowPos2sMESA ; .type glWindowPos2sMESA,#function
-		.globl glWindowPos2svMESA ; .type glWindowPos2svMESA,#function
-		.globl glWindowPos3dMESA ; .type glWindowPos3dMESA,#function
-		.globl glWindowPos3dvMESA ; .type glWindowPos3dvMESA,#function
-		.globl glWindowPos3fMESA ; .type glWindowPos3fMESA,#function
-		.globl glWindowPos3fvMESA ; .type glWindowPos3fvMESA,#function
-		.globl glWindowPos3iMESA ; .type glWindowPos3iMESA,#function
-		.globl glWindowPos3ivMESA ; .type glWindowPos3ivMESA,#function
-		.globl glWindowPos3sMESA ; .type glWindowPos3sMESA,#function
-		.globl glWindowPos3svMESA ; .type glWindowPos3svMESA,#function
-		.globl glWindowPos4dMESA ; .type glWindowPos4dMESA,#function
-		.globl glWindowPos4dvMESA ; .type glWindowPos4dvMESA,#function
-		.globl glWindowPos4fMESA ; .type glWindowPos4fMESA,#function
-		.globl glWindowPos4fvMESA ; .type glWindowPos4fvMESA,#function
-		.globl glWindowPos4iMESA ; .type glWindowPos4iMESA,#function
-		.globl glWindowPos4ivMESA ; .type glWindowPos4ivMESA,#function
-		.globl glWindowPos4sMESA ; .type glWindowPos4sMESA,#function
-		.globl glWindowPos4svMESA ; .type glWindowPos4svMESA,#function
-		.globl gl_dispatch_stub_649 ; .type gl_dispatch_stub_649,#function
-		.globl gl_dispatch_stub_650 ; .type gl_dispatch_stub_650,#function
-		.globl gl_dispatch_stub_651 ; .type gl_dispatch_stub_651,#function
-		.globl gl_dispatch_stub_652 ; .type gl_dispatch_stub_652,#function
-		.globl gl_dispatch_stub_653 ; .type gl_dispatch_stub_653,#function
-		.globl gl_dispatch_stub_654 ; .type gl_dispatch_stub_654,#function
-		.globl gl_dispatch_stub_655 ; .type gl_dispatch_stub_655,#function
-		.globl gl_dispatch_stub_656 ; .type gl_dispatch_stub_656,#function
-		.globl gl_dispatch_stub_657 ; .type gl_dispatch_stub_657,#function
-		.globl glAreProgramsResidentNV ; .type glAreProgramsResidentNV,#function
-		.globl glBindProgramNV ; .type glBindProgramNV,#function
-		.globl glDeleteProgramsNV ; .type glDeleteProgramsNV,#function
-		.globl glExecuteProgramNV ; .type glExecuteProgramNV,#function
-		.globl glGenProgramsNV ; .type glGenProgramsNV,#function
-		.globl glGetProgramParameterdvNV ; .type glGetProgramParameterdvNV,#function
-		.globl glGetProgramParameterfvNV ; .type glGetProgramParameterfvNV,#function
-		.globl glGetProgramStringNV ; .type glGetProgramStringNV,#function
-		.globl glGetProgramivNV ; .type glGetProgramivNV,#function
-		.globl glGetTrackMatrixivNV ; .type glGetTrackMatrixivNV,#function
-		.globl glGetVertexAttribPointervNV ; .type glGetVertexAttribPointervNV,#function
-		.globl glGetVertexAttribdvNV ; .type glGetVertexAttribdvNV,#function
-		.globl glGetVertexAttribfvNV ; .type glGetVertexAttribfvNV,#function
-		.globl glGetVertexAttribivNV ; .type glGetVertexAttribivNV,#function
-		.globl glIsProgramNV ; .type glIsProgramNV,#function
-		.globl glLoadProgramNV ; .type glLoadProgramNV,#function
-		.globl glProgramParameters4dvNV ; .type glProgramParameters4dvNV,#function
-		.globl glProgramParameters4fvNV ; .type glProgramParameters4fvNV,#function
-		.globl glRequestResidentProgramsNV ; .type glRequestResidentProgramsNV,#function
-		.globl glTrackMatrixNV ; .type glTrackMatrixNV,#function
-		.globl glVertexAttrib1dNV ; .type glVertexAttrib1dNV,#function
-		.globl glVertexAttrib1dvNV ; .type glVertexAttrib1dvNV,#function
-		.globl glVertexAttrib1fNV ; .type glVertexAttrib1fNV,#function
-		.globl glVertexAttrib1fvNV ; .type glVertexAttrib1fvNV,#function
-		.globl glVertexAttrib1sNV ; .type glVertexAttrib1sNV,#function
-		.globl glVertexAttrib1svNV ; .type glVertexAttrib1svNV,#function
-		.globl glVertexAttrib2dNV ; .type glVertexAttrib2dNV,#function
-		.globl glVertexAttrib2dvNV ; .type glVertexAttrib2dvNV,#function
-		.globl glVertexAttrib2fNV ; .type glVertexAttrib2fNV,#function
-		.globl glVertexAttrib2fvNV ; .type glVertexAttrib2fvNV,#function
-		.globl glVertexAttrib2sNV ; .type glVertexAttrib2sNV,#function
-		.globl glVertexAttrib2svNV ; .type glVertexAttrib2svNV,#function
-		.globl glVertexAttrib3dNV ; .type glVertexAttrib3dNV,#function
-		.globl glVertexAttrib3dvNV ; .type glVertexAttrib3dvNV,#function
-		.globl glVertexAttrib3fNV ; .type glVertexAttrib3fNV,#function
-		.globl glVertexAttrib3fvNV ; .type glVertexAttrib3fvNV,#function
-		.globl glVertexAttrib3sNV ; .type glVertexAttrib3sNV,#function
-		.globl glVertexAttrib3svNV ; .type glVertexAttrib3svNV,#function
-		.globl glVertexAttrib4dNV ; .type glVertexAttrib4dNV,#function
-		.globl glVertexAttrib4dvNV ; .type glVertexAttrib4dvNV,#function
-		.globl glVertexAttrib4fNV ; .type glVertexAttrib4fNV,#function
-		.globl glVertexAttrib4fvNV ; .type glVertexAttrib4fvNV,#function
-		.globl glVertexAttrib4sNV ; .type glVertexAttrib4sNV,#function
-		.globl glVertexAttrib4svNV ; .type glVertexAttrib4svNV,#function
-		.globl glVertexAttrib4ubNV ; .type glVertexAttrib4ubNV,#function
-		.globl glVertexAttrib4ubvNV ; .type glVertexAttrib4ubvNV,#function
-		.globl glVertexAttribPointerNV ; .type glVertexAttribPointerNV,#function
-		.globl glVertexAttribs1dvNV ; .type glVertexAttribs1dvNV,#function
-		.globl glVertexAttribs1fvNV ; .type glVertexAttribs1fvNV,#function
-		.globl glVertexAttribs1svNV ; .type glVertexAttribs1svNV,#function
-		.globl glVertexAttribs2dvNV ; .type glVertexAttribs2dvNV,#function
-		.globl glVertexAttribs2fvNV ; .type glVertexAttribs2fvNV,#function
-		.globl glVertexAttribs2svNV ; .type glVertexAttribs2svNV,#function
-		.globl glVertexAttribs3dvNV ; .type glVertexAttribs3dvNV,#function
-		.globl glVertexAttribs3fvNV ; .type glVertexAttribs3fvNV,#function
-		.globl glVertexAttribs3svNV ; .type glVertexAttribs3svNV,#function
-		.globl glVertexAttribs4dvNV ; .type glVertexAttribs4dvNV,#function
-		.globl glVertexAttribs4fvNV ; .type glVertexAttribs4fvNV,#function
-		.globl glVertexAttribs4svNV ; .type glVertexAttribs4svNV,#function
-		.globl glVertexAttribs4ubvNV ; .type glVertexAttribs4ubvNV,#function
-		.globl glAlphaFragmentOp1ATI ; .type glAlphaFragmentOp1ATI,#function
-		.globl glAlphaFragmentOp2ATI ; .type glAlphaFragmentOp2ATI,#function
-		.globl glAlphaFragmentOp3ATI ; .type glAlphaFragmentOp3ATI,#function
-		.globl glBeginFragmentShaderATI ; .type glBeginFragmentShaderATI,#function
-		.globl glBindFragmentShaderATI ; .type glBindFragmentShaderATI,#function
-		.globl glColorFragmentOp1ATI ; .type glColorFragmentOp1ATI,#function
-		.globl glColorFragmentOp2ATI ; .type glColorFragmentOp2ATI,#function
-		.globl glColorFragmentOp3ATI ; .type glColorFragmentOp3ATI,#function
-		.globl glDeleteFragmentShaderATI ; .type glDeleteFragmentShaderATI,#function
-		.globl glEndFragmentShaderATI ; .type glEndFragmentShaderATI,#function
-		.globl glGenFragmentShadersATI ; .type glGenFragmentShadersATI,#function
-		.globl glPassTexCoordATI ; .type glPassTexCoordATI,#function
-		.globl glSampleMapATI ; .type glSampleMapATI,#function
-		.globl glSetFragmentShaderConstantATI ; .type glSetFragmentShaderConstantATI,#function
-		.globl glPointParameteriNV ; .type glPointParameteriNV,#function
-		.globl glPointParameterivNV ; .type glPointParameterivNV,#function
-		.globl gl_dispatch_stub_734 ; .type gl_dispatch_stub_734,#function
-		.globl gl_dispatch_stub_735 ; .type gl_dispatch_stub_735,#function
-		.globl gl_dispatch_stub_736 ; .type gl_dispatch_stub_736,#function
-		.globl gl_dispatch_stub_737 ; .type gl_dispatch_stub_737,#function
-		.globl gl_dispatch_stub_738 ; .type gl_dispatch_stub_738,#function
-		.globl glGetProgramNamedParameterdvNV ; .type glGetProgramNamedParameterdvNV,#function
-		.globl glGetProgramNamedParameterfvNV ; .type glGetProgramNamedParameterfvNV,#function
-		.globl glProgramNamedParameter4dNV ; .type glProgramNamedParameter4dNV,#function
-		.globl glProgramNamedParameter4dvNV ; .type glProgramNamedParameter4dvNV,#function
-		.globl glProgramNamedParameter4fNV ; .type glProgramNamedParameter4fNV,#function
-		.globl glProgramNamedParameter4fvNV ; .type glProgramNamedParameter4fvNV,#function
-		.globl gl_dispatch_stub_745 ; .type gl_dispatch_stub_745,#function
-		.globl gl_dispatch_stub_746 ; .type gl_dispatch_stub_746,#function
-		.globl glBindFramebufferEXT ; .type glBindFramebufferEXT,#function
-		.globl glBindRenderbufferEXT ; .type glBindRenderbufferEXT,#function
-		.globl glCheckFramebufferStatusEXT ; .type glCheckFramebufferStatusEXT,#function
-		.globl glDeleteFramebuffersEXT ; .type glDeleteFramebuffersEXT,#function
-		.globl glDeleteRenderbuffersEXT ; .type glDeleteRenderbuffersEXT,#function
-		.globl glFramebufferRenderbufferEXT ; .type glFramebufferRenderbufferEXT,#function
-		.globl glFramebufferTexture1DEXT ; .type glFramebufferTexture1DEXT,#function
-		.globl glFramebufferTexture2DEXT ; .type glFramebufferTexture2DEXT,#function
-		.globl glFramebufferTexture3DEXT ; .type glFramebufferTexture3DEXT,#function
-		.globl glGenFramebuffersEXT ; .type glGenFramebuffersEXT,#function
-		.globl glGenRenderbuffersEXT ; .type glGenRenderbuffersEXT,#function
-		.globl glGenerateMipmapEXT ; .type glGenerateMipmapEXT,#function
-		.globl glGetFramebufferAttachmentParameterivEXT ; .type glGetFramebufferAttachmentParameterivEXT,#function
-		.globl glGetRenderbufferParameterivEXT ; .type glGetRenderbufferParameterivEXT,#function
-		.globl glIsFramebufferEXT ; .type glIsFramebufferEXT,#function
-		.globl glIsRenderbufferEXT ; .type glIsRenderbufferEXT,#function
-		.globl glRenderbufferStorageEXT ; .type glRenderbufferStorageEXT,#function
-		.globl gl_dispatch_stub_764 ; .type gl_dispatch_stub_764,#function
-		.globl glFramebufferTextureLayerEXT ; .type glFramebufferTextureLayerEXT,#function
-		.globl gl_dispatch_stub_766 ; .type gl_dispatch_stub_766,#function
-		.globl gl_dispatch_stub_767 ; .type gl_dispatch_stub_767,#function
-		.globl gl_dispatch_stub_768 ; .type gl_dispatch_stub_768,#function
-		.globl gl_dispatch_stub_769 ; .type gl_dispatch_stub_769,#function
-		.globl gl_dispatch_stub_770 ; .type gl_dispatch_stub_770,#function
-		.globl _mesa_sparc_glapi_begin ; .type _mesa_sparc_glapi_begin,#function
-_mesa_sparc_glapi_begin:
+	.data
+	.align	32
+
+	GLOBL_FN(__glapi_sparc_pthread_stub)
+	HIDDEN(__glapi_sparc_pthread_stub)
+__glapi_sparc_pthread_stub: /* Call offset in %g3 */
+	mov	%o7, %g1
+	sethi	%hi(_GLOBAL_OFFSET_TABLE_-4), %g2
+	call	__glapi_sparc_get_pc
+	 add	%g2, %lo(_GLOBAL_OFFSET_TABLE_+4), %g2
+	mov	%g1, %o7
+	sethi	%hi(_glapi_Dispatch), %g1
+	or	%g1, %lo(_glapi_Dispatch), %g1
+	srl	%g3, 10, %g3
+	GL_LL	[%g2+%g1], %g2
+	GL_LL	[%g2], %g1
+	cmp	%g1, 0
+	be	2f
+	 nop
+1:	GL_LL	[%g1 + %g3], %g1
+	jmp	%g1
+	 nop
+2:	save	%sp, GL_STACK_SIZE, %sp
+	mov	%g3, %l0
+	call	_glapi_get_dispatch
+	 nop
+	mov	%o0, %g1
+	mov	%l0, %g3
+	ba	1b
+	 restore %g0, %g0, %g0
+	.size	__glapi_sparc_pthread_stub, .-__glapi_sparc_pthread_stub
+
+#define GL_STUB(fn, off)			\
+	GLOBL_FN(fn);				\
+fn:	ba	__glapi_sparc_pthread_stub;	\
+	 sethi	GL_OFF(off), %g3;		\
+	.size	fn,.-fn;
+
+#else /* Non-threaded version. */
+
+	.type	__glapi_sparc_nothread_stub, @function
+__glapi_sparc_nothread_stub: /* Call offset in %g3 */
+	mov	%o7, %g1
+	sethi	%hi(_GLOBAL_OFFSET_TABLE_-4), %g2
+	call	__glapi_sparc_get_pc
+	 add	%g2, %lo(_GLOBAL_OFFSET_TABLE_+4), %g2
+	mov	%g1, %o7
+	srl	%g3, 10, %g3
+	sethi	%hi(_glapi_Dispatch), %g1
+	or	%g1, %lo(_glapi_Dispatch), %g1
+	GL_LL	[%g2+%g1], %g2
+	GL_LL	[%g2], %g1
+	GL_LL	[%g1 + %g3], %g1
+	jmp	%g1
+	 nop
+	.size	__glapi_sparc_nothread_stub, .-__glapi_sparc_nothread_stub
+
+#define GL_STUB(fn, off)			\
+	GLOBL_FN(fn);				\
+fn:	ba	__glapi_sparc_nothread_stub;	\
+	 sethi	GL_OFF(off), %g3;		\
+	.size	fn,.-fn;
+
+#endif
+
+#define GL_STUB_ALIAS(fn, alias)		\
+	.globl	fn;				\
+	.set	fn, alias
+
+	.text
+	.align	32
+
+	.globl	gl_dispatch_functions_start
+	HIDDEN(gl_dispatch_functions_start)
+gl_dispatch_functions_start:
 
 	GL_STUB(glNewList, _gloffset_NewList)
 	GL_STUB(glEndList, _gloffset_EndList)
@@ -1402,14 +760,22 @@ _mesa_sparc_glapi_begin:
 	GL_STUB(glDrawBuffersARB, _gloffset_DrawBuffersARB)
 	GL_STUB(glRenderbufferStorageMultisample, _gloffset_RenderbufferStorageMultisample)
 	GL_STUB(glPolygonOffsetEXT, _gloffset_PolygonOffsetEXT)
-	GL_STUB(gl_dispatch_stub_563, _gloffset__dispatch_stub_563)
-	GL_STUB(gl_dispatch_stub_564, _gloffset__dispatch_stub_564)
-	GL_STUB(gl_dispatch_stub_565, _gloffset__dispatch_stub_565)
-	GL_STUB(gl_dispatch_stub_566, _gloffset__dispatch_stub_566)
-	GL_STUB(gl_dispatch_stub_567, _gloffset__dispatch_stub_567)
-	GL_STUB(gl_dispatch_stub_568, _gloffset__dispatch_stub_568)
-	GL_STUB(gl_dispatch_stub_569, _gloffset__dispatch_stub_569)
-	GL_STUB(gl_dispatch_stub_570, _gloffset__dispatch_stub_570)
+	GL_STUB(gl_dispatch_stub_563, _gloffset_GetPixelTexGenParameterfvSGIS)
+	HIDDEN(gl_dispatch_stub_563)
+	GL_STUB(gl_dispatch_stub_564, _gloffset_GetPixelTexGenParameterivSGIS)
+	HIDDEN(gl_dispatch_stub_564)
+	GL_STUB(gl_dispatch_stub_565, _gloffset_PixelTexGenParameterfSGIS)
+	HIDDEN(gl_dispatch_stub_565)
+	GL_STUB(gl_dispatch_stub_566, _gloffset_PixelTexGenParameterfvSGIS)
+	HIDDEN(gl_dispatch_stub_566)
+	GL_STUB(gl_dispatch_stub_567, _gloffset_PixelTexGenParameteriSGIS)
+	HIDDEN(gl_dispatch_stub_567)
+	GL_STUB(gl_dispatch_stub_568, _gloffset_PixelTexGenParameterivSGIS)
+	HIDDEN(gl_dispatch_stub_568)
+	GL_STUB(gl_dispatch_stub_569, _gloffset_SampleMaskSGIS)
+	HIDDEN(gl_dispatch_stub_569)
+	GL_STUB(gl_dispatch_stub_570, _gloffset_SamplePatternSGIS)
+	HIDDEN(gl_dispatch_stub_570)
 	GL_STUB(glColorPointerEXT, _gloffset_ColorPointerEXT)
 	GL_STUB(glEdgeFlagPointerEXT, _gloffset_EdgeFlagPointerEXT)
 	GL_STUB(glIndexPointerEXT, _gloffset_IndexPointerEXT)
@@ -1420,8 +786,10 @@ _mesa_sparc_glapi_begin:
 	GL_STUB(glPointParameterfvEXT, _gloffset_PointParameterfvEXT)
 	GL_STUB(glLockArraysEXT, _gloffset_LockArraysEXT)
 	GL_STUB(glUnlockArraysEXT, _gloffset_UnlockArraysEXT)
-	GL_STUB(gl_dispatch_stub_581, _gloffset__dispatch_stub_581)
-	GL_STUB(gl_dispatch_stub_582, _gloffset__dispatch_stub_582)
+	GL_STUB(gl_dispatch_stub_581, _gloffset_CullParameterdvEXT)
+	HIDDEN(gl_dispatch_stub_581)
+	GL_STUB(gl_dispatch_stub_582, _gloffset_CullParameterfvEXT)
+	HIDDEN(gl_dispatch_stub_582)
 	GL_STUB(glSecondaryColor3bEXT, _gloffset_SecondaryColor3bEXT)
 	GL_STUB(glSecondaryColor3bvEXT, _gloffset_SecondaryColor3bvEXT)
 	GL_STUB(glSecondaryColor3dEXT, _gloffset_SecondaryColor3dEXT)
@@ -1446,7 +814,8 @@ _mesa_sparc_glapi_begin:
 	GL_STUB(glFogCoorddvEXT, _gloffset_FogCoorddvEXT)
 	GL_STUB(glFogCoordfEXT, _gloffset_FogCoordfEXT)
 	GL_STUB(glFogCoordfvEXT, _gloffset_FogCoordfvEXT)
-	GL_STUB(gl_dispatch_stub_607, _gloffset__dispatch_stub_607)
+	GL_STUB(gl_dispatch_stub_607, _gloffset_PixelTexGenSGIX)
+	HIDDEN(gl_dispatch_stub_607)
 	GL_STUB(glBlendFuncSeparateEXT, _gloffset_BlendFuncSeparateEXT)
 	GL_STUB(glFlushVertexArrayRangeNV, _gloffset_FlushVertexArrayRangeNV)
 	GL_STUB(glVertexArrayRangeNV, _gloffset_VertexArrayRangeNV)
@@ -1488,15 +857,24 @@ _mesa_sparc_glapi_begin:
 	GL_STUB(glWindowPos4ivMESA, _gloffset_WindowPos4ivMESA)
 	GL_STUB(glWindowPos4sMESA, _gloffset_WindowPos4sMESA)
 	GL_STUB(glWindowPos4svMESA, _gloffset_WindowPos4svMESA)
-	GL_STUB(gl_dispatch_stub_649, _gloffset__dispatch_stub_649)
-	GL_STUB(gl_dispatch_stub_650, _gloffset__dispatch_stub_650)
-	GL_STUB(gl_dispatch_stub_651, _gloffset__dispatch_stub_651)
-	GL_STUB(gl_dispatch_stub_652, _gloffset__dispatch_stub_652)
-	GL_STUB(gl_dispatch_stub_653, _gloffset__dispatch_stub_653)
-	GL_STUB(gl_dispatch_stub_654, _gloffset__dispatch_stub_654)
-	GL_STUB(gl_dispatch_stub_655, _gloffset__dispatch_stub_655)
-	GL_STUB(gl_dispatch_stub_656, _gloffset__dispatch_stub_656)
-	GL_STUB(gl_dispatch_stub_657, _gloffset__dispatch_stub_657)
+	GL_STUB(gl_dispatch_stub_649, _gloffset_MultiModeDrawArraysIBM)
+	HIDDEN(gl_dispatch_stub_649)
+	GL_STUB(gl_dispatch_stub_650, _gloffset_MultiModeDrawElementsIBM)
+	HIDDEN(gl_dispatch_stub_650)
+	GL_STUB(gl_dispatch_stub_651, _gloffset_DeleteFencesNV)
+	HIDDEN(gl_dispatch_stub_651)
+	GL_STUB(gl_dispatch_stub_652, _gloffset_FinishFenceNV)
+	HIDDEN(gl_dispatch_stub_652)
+	GL_STUB(gl_dispatch_stub_653, _gloffset_GenFencesNV)
+	HIDDEN(gl_dispatch_stub_653)
+	GL_STUB(gl_dispatch_stub_654, _gloffset_GetFenceivNV)
+	HIDDEN(gl_dispatch_stub_654)
+	GL_STUB(gl_dispatch_stub_655, _gloffset_IsFenceNV)
+	HIDDEN(gl_dispatch_stub_655)
+	GL_STUB(gl_dispatch_stub_656, _gloffset_SetFenceNV)
+	HIDDEN(gl_dispatch_stub_656)
+	GL_STUB(gl_dispatch_stub_657, _gloffset_TestFenceNV)
+	HIDDEN(gl_dispatch_stub_657)
 	GL_STUB(glAreProgramsResidentNV, _gloffset_AreProgramsResidentNV)
 	GL_STUB(glBindProgramNV, _gloffset_BindProgramNV)
 	GL_STUB(glDeleteProgramsNV, _gloffset_DeleteProgramsNV)
@@ -1573,19 +951,26 @@ _mesa_sparc_glapi_begin:
 	GL_STUB(glSetFragmentShaderConstantATI, _gloffset_SetFragmentShaderConstantATI)
 	GL_STUB(glPointParameteriNV, _gloffset_PointParameteriNV)
 	GL_STUB(glPointParameterivNV, _gloffset_PointParameterivNV)
-	GL_STUB(gl_dispatch_stub_734, _gloffset__dispatch_stub_734)
-	GL_STUB(gl_dispatch_stub_735, _gloffset__dispatch_stub_735)
-	GL_STUB(gl_dispatch_stub_736, _gloffset__dispatch_stub_736)
-	GL_STUB(gl_dispatch_stub_737, _gloffset__dispatch_stub_737)
-	GL_STUB(gl_dispatch_stub_738, _gloffset__dispatch_stub_738)
+	GL_STUB(gl_dispatch_stub_734, _gloffset_ActiveStencilFaceEXT)
+	HIDDEN(gl_dispatch_stub_734)
+	GL_STUB(gl_dispatch_stub_735, _gloffset_BindVertexArrayAPPLE)
+	HIDDEN(gl_dispatch_stub_735)
+	GL_STUB(gl_dispatch_stub_736, _gloffset_DeleteVertexArraysAPPLE)
+	HIDDEN(gl_dispatch_stub_736)
+	GL_STUB(gl_dispatch_stub_737, _gloffset_GenVertexArraysAPPLE)
+	HIDDEN(gl_dispatch_stub_737)
+	GL_STUB(gl_dispatch_stub_738, _gloffset_IsVertexArrayAPPLE)
+	HIDDEN(gl_dispatch_stub_738)
 	GL_STUB(glGetProgramNamedParameterdvNV, _gloffset_GetProgramNamedParameterdvNV)
 	GL_STUB(glGetProgramNamedParameterfvNV, _gloffset_GetProgramNamedParameterfvNV)
 	GL_STUB(glProgramNamedParameter4dNV, _gloffset_ProgramNamedParameter4dNV)
 	GL_STUB(glProgramNamedParameter4dvNV, _gloffset_ProgramNamedParameter4dvNV)
 	GL_STUB(glProgramNamedParameter4fNV, _gloffset_ProgramNamedParameter4fNV)
 	GL_STUB(glProgramNamedParameter4fvNV, _gloffset_ProgramNamedParameter4fvNV)
-	GL_STUB(gl_dispatch_stub_745, _gloffset__dispatch_stub_745)
-	GL_STUB(gl_dispatch_stub_746, _gloffset__dispatch_stub_746)
+	GL_STUB(gl_dispatch_stub_745, _gloffset_DepthBoundsEXT)
+	HIDDEN(gl_dispatch_stub_745)
+	GL_STUB(gl_dispatch_stub_746, _gloffset_BlendEquationSeparateEXT)
+	HIDDEN(gl_dispatch_stub_746)
 	GL_STUB(glBindFramebufferEXT, _gloffset_BindFramebufferEXT)
 	GL_STUB(glBindRenderbufferEXT, _gloffset_BindRenderbufferEXT)
 	GL_STUB(glCheckFramebufferStatusEXT, _gloffset_CheckFramebufferStatusEXT)
@@ -1603,287 +988,353 @@ _mesa_sparc_glapi_begin:
 	GL_STUB(glIsFramebufferEXT, _gloffset_IsFramebufferEXT)
 	GL_STUB(glIsRenderbufferEXT, _gloffset_IsRenderbufferEXT)
 	GL_STUB(glRenderbufferStorageEXT, _gloffset_RenderbufferStorageEXT)
-	GL_STUB(gl_dispatch_stub_764, _gloffset__dispatch_stub_764)
+	GL_STUB(gl_dispatch_stub_764, _gloffset_BlitFramebufferEXT)
+	HIDDEN(gl_dispatch_stub_764)
 	GL_STUB(glFramebufferTextureLayerEXT, _gloffset_FramebufferTextureLayerEXT)
-	GL_STUB(gl_dispatch_stub_766, _gloffset__dispatch_stub_766)
-	GL_STUB(gl_dispatch_stub_767, _gloffset__dispatch_stub_767)
-	GL_STUB(gl_dispatch_stub_768, _gloffset__dispatch_stub_768)
-	GL_STUB(gl_dispatch_stub_769, _gloffset__dispatch_stub_769)
-	GL_STUB(gl_dispatch_stub_770, _gloffset__dispatch_stub_770)
-
-		.globl _mesa_sparc_glapi_end ; .type _mesa_sparc_glapi_end,#function
-_mesa_sparc_glapi_end:
-
-	.globl glArrayElementEXT ; .type glArrayElementEXT,#function ; glArrayElementEXT = glArrayElement
-	.globl glBindTextureEXT ; .type glBindTextureEXT,#function ; glBindTextureEXT = glBindTexture
-	.globl glDrawArraysEXT ; .type glDrawArraysEXT,#function ; glDrawArraysEXT = glDrawArrays
+	GL_STUB(gl_dispatch_stub_766, _gloffset_StencilFuncSeparateATI)
+	HIDDEN(gl_dispatch_stub_766)
+	GL_STUB(gl_dispatch_stub_767, _gloffset_ProgramEnvParameters4fvEXT)
+	HIDDEN(gl_dispatch_stub_767)
+	GL_STUB(gl_dispatch_stub_768, _gloffset_ProgramLocalParameters4fvEXT)
+	HIDDEN(gl_dispatch_stub_768)
+	GL_STUB(gl_dispatch_stub_769, _gloffset_GetQueryObjecti64vEXT)
+	HIDDEN(gl_dispatch_stub_769)
+	GL_STUB(gl_dispatch_stub_770, _gloffset_GetQueryObjectui64vEXT)
+	HIDDEN(gl_dispatch_stub_770)
+	GL_STUB_ALIAS(glArrayElementEXT, glArrayElement)
+	GL_STUB_ALIAS(glBindTextureEXT, glBindTexture)
+	GL_STUB_ALIAS(glDrawArraysEXT, glDrawArrays)
+#ifndef GLX_INDIRECT_RENDERING
+	GL_STUB_ALIAS(glAreTexturesResidentEXT, glAreTexturesResident)
+#endif
+	GL_STUB_ALIAS(glCopyTexImage1DEXT, glCopyTexImage1D)
+	GL_STUB_ALIAS(glCopyTexImage2DEXT, glCopyTexImage2D)
+	GL_STUB_ALIAS(glCopyTexSubImage1DEXT, glCopyTexSubImage1D)
+	GL_STUB_ALIAS(glCopyTexSubImage2DEXT, glCopyTexSubImage2D)
+#ifndef GLX_INDIRECT_RENDERING
+	GL_STUB_ALIAS(glDeleteTexturesEXT, glDeleteTextures)
+#endif
+#ifndef GLX_INDIRECT_RENDERING
+	GL_STUB_ALIAS(glGenTexturesEXT, glGenTextures)
+#endif
+	GL_STUB_ALIAS(glGetPointervEXT, glGetPointerv)
+#ifndef GLX_INDIRECT_RENDERING
+	GL_STUB_ALIAS(glIsTextureEXT, glIsTexture)
+#endif
+	GL_STUB_ALIAS(glPrioritizeTexturesEXT, glPrioritizeTextures)
+	GL_STUB_ALIAS(glTexSubImage1DEXT, glTexSubImage1D)
+	GL_STUB_ALIAS(glTexSubImage2DEXT, glTexSubImage2D)
+	GL_STUB_ALIAS(glBlendColorEXT, glBlendColor)
+	GL_STUB_ALIAS(glBlendEquationEXT, glBlendEquation)
+	GL_STUB_ALIAS(glDrawRangeElementsEXT, glDrawRangeElements)
+	GL_STUB_ALIAS(glColorTableSGI, glColorTable)
+	GL_STUB_ALIAS(glColorTableEXT, glColorTable)
+	GL_STUB_ALIAS(glColorTableParameterfvSGI, glColorTableParameterfv)
+	GL_STUB_ALIAS(glColorTableParameterivSGI, glColorTableParameteriv)
+	GL_STUB_ALIAS(glCopyColorTableSGI, glCopyColorTable)
+#ifndef GLX_INDIRECT_RENDERING
+	GL_STUB_ALIAS(glGetColorTableSGI, glGetColorTable)
+#endif
+#ifndef GLX_INDIRECT_RENDERING
+	GL_STUB_ALIAS(glGetColorTableEXT, glGetColorTable)
+#endif
+#ifndef GLX_INDIRECT_RENDERING
+	GL_STUB_ALIAS(glGetColorTableParameterfvSGI, glGetColorTableParameterfv)
+#endif
 #ifndef GLX_INDIRECT_RENDERING
-	.globl glAreTexturesResidentEXT ; .type glAreTexturesResidentEXT,#function ; glAreTexturesResidentEXT = glAreTexturesResident
+	GL_STUB_ALIAS(glGetColorTableParameterfvEXT, glGetColorTableParameterfv)
 #endif
-	.globl glCopyTexImage1DEXT ; .type glCopyTexImage1DEXT,#function ; glCopyTexImage1DEXT = glCopyTexImage1D
-	.globl glCopyTexImage2DEXT ; .type glCopyTexImage2DEXT,#function ; glCopyTexImage2DEXT = glCopyTexImage2D
-	.globl glCopyTexSubImage1DEXT ; .type glCopyTexSubImage1DEXT,#function ; glCopyTexSubImage1DEXT = glCopyTexSubImage1D
-	.globl glCopyTexSubImage2DEXT ; .type glCopyTexSubImage2DEXT,#function ; glCopyTexSubImage2DEXT = glCopyTexSubImage2D
 #ifndef GLX_INDIRECT_RENDERING
-	.globl glDeleteTexturesEXT ; .type glDeleteTexturesEXT,#function ; glDeleteTexturesEXT = glDeleteTextures
+	GL_STUB_ALIAS(glGetColorTableParameterivSGI, glGetColorTableParameteriv)
 #endif
 #ifndef GLX_INDIRECT_RENDERING
-	.globl glGenTexturesEXT ; .type glGenTexturesEXT,#function ; glGenTexturesEXT = glGenTextures
+	GL_STUB_ALIAS(glGetColorTableParameterivEXT, glGetColorTableParameteriv)
 #endif
-	.globl glGetPointervEXT ; .type glGetPointervEXT,#function ; glGetPointervEXT = glGetPointerv
+	GL_STUB_ALIAS(glColorSubTableEXT, glColorSubTable)
+	GL_STUB_ALIAS(glCopyColorSubTableEXT, glCopyColorSubTable)
+	GL_STUB_ALIAS(glConvolutionFilter1DEXT, glConvolutionFilter1D)
+	GL_STUB_ALIAS(glConvolutionFilter2DEXT, glConvolutionFilter2D)
+	GL_STUB_ALIAS(glConvolutionParameterfEXT, glConvolutionParameterf)
+	GL_STUB_ALIAS(glConvolutionParameterfvEXT, glConvolutionParameterfv)
+	GL_STUB_ALIAS(glConvolutionParameteriEXT, glConvolutionParameteri)
+	GL_STUB_ALIAS(glConvolutionParameterivEXT, glConvolutionParameteriv)
+	GL_STUB_ALIAS(glCopyConvolutionFilter1DEXT, glCopyConvolutionFilter1D)
+	GL_STUB_ALIAS(glCopyConvolutionFilter2DEXT, glCopyConvolutionFilter2D)
 #ifndef GLX_INDIRECT_RENDERING
-	.globl glIsTextureEXT ; .type glIsTextureEXT,#function ; glIsTextureEXT = glIsTexture
+	GL_STUB_ALIAS(glGetConvolutionFilterEXT, glGetConvolutionFilter)
 #endif
-	.globl glPrioritizeTexturesEXT ; .type glPrioritizeTexturesEXT,#function ; glPrioritizeTexturesEXT = glPrioritizeTextures
-	.globl glTexSubImage1DEXT ; .type glTexSubImage1DEXT,#function ; glTexSubImage1DEXT = glTexSubImage1D
-	.globl glTexSubImage2DEXT ; .type glTexSubImage2DEXT,#function ; glTexSubImage2DEXT = glTexSubImage2D
-	.globl glBlendColorEXT ; .type glBlendColorEXT,#function ; glBlendColorEXT = glBlendColor
-	.globl glBlendEquationEXT ; .type glBlendEquationEXT,#function ; glBlendEquationEXT = glBlendEquation
-	.globl glDrawRangeElementsEXT ; .type glDrawRangeElementsEXT,#function ; glDrawRangeElementsEXT = glDrawRangeElements
-	.globl glColorTableEXT ; .type glColorTableEXT,#function ; glColorTableEXT = glColorTable
 #ifndef GLX_INDIRECT_RENDERING
-	.globl glGetColorTableEXT ; .type glGetColorTableEXT,#function ; glGetColorTableEXT = glGetColorTable
+	GL_STUB_ALIAS(glGetConvolutionParameterfvEXT, glGetConvolutionParameterfv)
 #endif
 #ifndef GLX_INDIRECT_RENDERING
-	.globl glGetColorTableParameterfvEXT ; .type glGetColorTableParameterfvEXT,#function ; glGetColorTableParameterfvEXT = glGetColorTableParameterfv
+	GL_STUB_ALIAS(glGetConvolutionParameterivEXT, glGetConvolutionParameteriv)
 #endif
 #ifndef GLX_INDIRECT_RENDERING
-	.globl glGetColorTableParameterivEXT ; .type glGetColorTableParameterivEXT,#function ; glGetColorTableParameterivEXT = glGetColorTableParameteriv
+	GL_STUB_ALIAS(glGetSeparableFilterEXT, glGetSeparableFilter)
 #endif
-	.globl glTexImage3DEXT ; .type glTexImage3DEXT,#function ; glTexImage3DEXT = glTexImage3D
-	.globl glTexSubImage3DEXT ; .type glTexSubImage3DEXT,#function ; glTexSubImage3DEXT = glTexSubImage3D
-	.globl glCopyTexSubImage3DEXT ; .type glCopyTexSubImage3DEXT,#function ; glCopyTexSubImage3DEXT = glCopyTexSubImage3D
-	.globl glActiveTexture ; .type glActiveTexture,#function ; glActiveTexture = glActiveTextureARB
-	.globl glClientActiveTexture ; .type glClientActiveTexture,#function ; glClientActiveTexture = glClientActiveTextureARB
-	.globl glMultiTexCoord1d ; .type glMultiTexCoord1d,#function ; glMultiTexCoord1d = glMultiTexCoord1dARB
-	.globl glMultiTexCoord1dv ; .type glMultiTexCoord1dv,#function ; glMultiTexCoord1dv = glMultiTexCoord1dvARB
-	.globl glMultiTexCoord1f ; .type glMultiTexCoord1f,#function ; glMultiTexCoord1f = glMultiTexCoord1fARB
-	.globl glMultiTexCoord1fv ; .type glMultiTexCoord1fv,#function ; glMultiTexCoord1fv = glMultiTexCoord1fvARB
-	.globl glMultiTexCoord1i ; .type glMultiTexCoord1i,#function ; glMultiTexCoord1i = glMultiTexCoord1iARB
-	.globl glMultiTexCoord1iv ; .type glMultiTexCoord1iv,#function ; glMultiTexCoord1iv = glMultiTexCoord1ivARB
-	.globl glMultiTexCoord1s ; .type glMultiTexCoord1s,#function ; glMultiTexCoord1s = glMultiTexCoord1sARB
-	.globl glMultiTexCoord1sv ; .type glMultiTexCoord1sv,#function ; glMultiTexCoord1sv = glMultiTexCoord1svARB
-	.globl glMultiTexCoord2d ; .type glMultiTexCoord2d,#function ; glMultiTexCoord2d = glMultiTexCoord2dARB
-	.globl glMultiTexCoord2dv ; .type glMultiTexCoord2dv,#function ; glMultiTexCoord2dv = glMultiTexCoord2dvARB
-	.globl glMultiTexCoord2f ; .type glMultiTexCoord2f,#function ; glMultiTexCoord2f = glMultiTexCoord2fARB
-	.globl glMultiTexCoord2fv ; .type glMultiTexCoord2fv,#function ; glMultiTexCoord2fv = glMultiTexCoord2fvARB
-	.globl glMultiTexCoord2i ; .type glMultiTexCoord2i,#function ; glMultiTexCoord2i = glMultiTexCoord2iARB
-	.globl glMultiTexCoord2iv ; .type glMultiTexCoord2iv,#function ; glMultiTexCoord2iv = glMultiTexCoord2ivARB
-	.globl glMultiTexCoord2s ; .type glMultiTexCoord2s,#function ; glMultiTexCoord2s = glMultiTexCoord2sARB
-	.globl glMultiTexCoord2sv ; .type glMultiTexCoord2sv,#function ; glMultiTexCoord2sv = glMultiTexCoord2svARB
-	.globl glMultiTexCoord3d ; .type glMultiTexCoord3d,#function ; glMultiTexCoord3d = glMultiTexCoord3dARB
-	.globl glMultiTexCoord3dv ; .type glMultiTexCoord3dv,#function ; glMultiTexCoord3dv = glMultiTexCoord3dvARB
-	.globl glMultiTexCoord3f ; .type glMultiTexCoord3f,#function ; glMultiTexCoord3f = glMultiTexCoord3fARB
-	.globl glMultiTexCoord3fv ; .type glMultiTexCoord3fv,#function ; glMultiTexCoord3fv = glMultiTexCoord3fvARB
-	.globl glMultiTexCoord3i ; .type glMultiTexCoord3i,#function ; glMultiTexCoord3i = glMultiTexCoord3iARB
-	.globl glMultiTexCoord3iv ; .type glMultiTexCoord3iv,#function ; glMultiTexCoord3iv = glMultiTexCoord3ivARB
-	.globl glMultiTexCoord3s ; .type glMultiTexCoord3s,#function ; glMultiTexCoord3s = glMultiTexCoord3sARB
-	.globl glMultiTexCoord3sv ; .type glMultiTexCoord3sv,#function ; glMultiTexCoord3sv = glMultiTexCoord3svARB
-	.globl glMultiTexCoord4d ; .type glMultiTexCoord4d,#function ; glMultiTexCoord4d = glMultiTexCoord4dARB
-	.globl glMultiTexCoord4dv ; .type glMultiTexCoord4dv,#function ; glMultiTexCoord4dv = glMultiTexCoord4dvARB
-	.globl glMultiTexCoord4f ; .type glMultiTexCoord4f,#function ; glMultiTexCoord4f = glMultiTexCoord4fARB
-	.globl glMultiTexCoord4fv ; .type glMultiTexCoord4fv,#function ; glMultiTexCoord4fv = glMultiTexCoord4fvARB
-	.globl glMultiTexCoord4i ; .type glMultiTexCoord4i,#function ; glMultiTexCoord4i = glMultiTexCoord4iARB
-	.globl glMultiTexCoord4iv ; .type glMultiTexCoord4iv,#function ; glMultiTexCoord4iv = glMultiTexCoord4ivARB
-	.globl glMultiTexCoord4s ; .type glMultiTexCoord4s,#function ; glMultiTexCoord4s = glMultiTexCoord4sARB
-	.globl glMultiTexCoord4sv ; .type glMultiTexCoord4sv,#function ; glMultiTexCoord4sv = glMultiTexCoord4svARB
-	.globl glLoadTransposeMatrixd ; .type glLoadTransposeMatrixd,#function ; glLoadTransposeMatrixd = glLoadTransposeMatrixdARB
-	.globl glLoadTransposeMatrixf ; .type glLoadTransposeMatrixf,#function ; glLoadTransposeMatrixf = glLoadTransposeMatrixfARB
-	.globl glMultTransposeMatrixd ; .type glMultTransposeMatrixd,#function ; glMultTransposeMatrixd = glMultTransposeMatrixdARB
-	.globl glMultTransposeMatrixf ; .type glMultTransposeMatrixf,#function ; glMultTransposeMatrixf = glMultTransposeMatrixfARB
-	.globl glSampleCoverage ; .type glSampleCoverage,#function ; glSampleCoverage = glSampleCoverageARB
-	.globl glCompressedTexImage1D ; .type glCompressedTexImage1D,#function ; glCompressedTexImage1D = glCompressedTexImage1DARB
-	.globl glCompressedTexImage2D ; .type glCompressedTexImage2D,#function ; glCompressedTexImage2D = glCompressedTexImage2DARB
-	.globl glCompressedTexImage3D ; .type glCompressedTexImage3D,#function ; glCompressedTexImage3D = glCompressedTexImage3DARB
-	.globl glCompressedTexSubImage1D ; .type glCompressedTexSubImage1D,#function ; glCompressedTexSubImage1D = glCompressedTexSubImage1DARB
-	.globl glCompressedTexSubImage2D ; .type glCompressedTexSubImage2D,#function ; glCompressedTexSubImage2D = glCompressedTexSubImage2DARB
-	.globl glCompressedTexSubImage3D ; .type glCompressedTexSubImage3D,#function ; glCompressedTexSubImage3D = glCompressedTexSubImage3DARB
-	.globl glGetCompressedTexImage ; .type glGetCompressedTexImage,#function ; glGetCompressedTexImage = glGetCompressedTexImageARB
-	.globl glDisableVertexAttribArray ; .type glDisableVertexAttribArray,#function ; glDisableVertexAttribArray = glDisableVertexAttribArrayARB
-	.globl glEnableVertexAttribArray ; .type glEnableVertexAttribArray,#function ; glEnableVertexAttribArray = glEnableVertexAttribArrayARB
-	.globl glGetVertexAttribdv ; .type glGetVertexAttribdv,#function ; glGetVertexAttribdv = glGetVertexAttribdvARB
-	.globl glGetVertexAttribfv ; .type glGetVertexAttribfv,#function ; glGetVertexAttribfv = glGetVertexAttribfvARB
-	.globl glGetVertexAttribiv ; .type glGetVertexAttribiv,#function ; glGetVertexAttribiv = glGetVertexAttribivARB
-	.globl glProgramParameter4dNV ; .type glProgramParameter4dNV,#function ; glProgramParameter4dNV = glProgramEnvParameter4dARB
-	.globl glProgramParameter4dvNV ; .type glProgramParameter4dvNV,#function ; glProgramParameter4dvNV = glProgramEnvParameter4dvARB
-	.globl glProgramParameter4fNV ; .type glProgramParameter4fNV,#function ; glProgramParameter4fNV = glProgramEnvParameter4fARB
-	.globl glProgramParameter4fvNV ; .type glProgramParameter4fvNV,#function ; glProgramParameter4fvNV = glProgramEnvParameter4fvARB
-	.globl glVertexAttrib1d ; .type glVertexAttrib1d,#function ; glVertexAttrib1d = glVertexAttrib1dARB
-	.globl glVertexAttrib1dv ; .type glVertexAttrib1dv,#function ; glVertexAttrib1dv = glVertexAttrib1dvARB
-	.globl glVertexAttrib1f ; .type glVertexAttrib1f,#function ; glVertexAttrib1f = glVertexAttrib1fARB
-	.globl glVertexAttrib1fv ; .type glVertexAttrib1fv,#function ; glVertexAttrib1fv = glVertexAttrib1fvARB
-	.globl glVertexAttrib1s ; .type glVertexAttrib1s,#function ; glVertexAttrib1s = glVertexAttrib1sARB
-	.globl glVertexAttrib1sv ; .type glVertexAttrib1sv,#function ; glVertexAttrib1sv = glVertexAttrib1svARB
-	.globl glVertexAttrib2d ; .type glVertexAttrib2d,#function ; glVertexAttrib2d = glVertexAttrib2dARB
-	.globl glVertexAttrib2dv ; .type glVertexAttrib2dv,#function ; glVertexAttrib2dv = glVertexAttrib2dvARB
-	.globl glVertexAttrib2f ; .type glVertexAttrib2f,#function ; glVertexAttrib2f = glVertexAttrib2fARB
-	.globl glVertexAttrib2fv ; .type glVertexAttrib2fv,#function ; glVertexAttrib2fv = glVertexAttrib2fvARB
-	.globl glVertexAttrib2s ; .type glVertexAttrib2s,#function ; glVertexAttrib2s = glVertexAttrib2sARB
-	.globl glVertexAttrib2sv ; .type glVertexAttrib2sv,#function ; glVertexAttrib2sv = glVertexAttrib2svARB
-	.globl glVertexAttrib3d ; .type glVertexAttrib3d,#function ; glVertexAttrib3d = glVertexAttrib3dARB
-	.globl glVertexAttrib3dv ; .type glVertexAttrib3dv,#function ; glVertexAttrib3dv = glVertexAttrib3dvARB
-	.globl glVertexAttrib3f ; .type glVertexAttrib3f,#function ; glVertexAttrib3f = glVertexAttrib3fARB
-	.globl glVertexAttrib3fv ; .type glVertexAttrib3fv,#function ; glVertexAttrib3fv = glVertexAttrib3fvARB
-	.globl glVertexAttrib3s ; .type glVertexAttrib3s,#function ; glVertexAttrib3s = glVertexAttrib3sARB
-	.globl glVertexAttrib3sv ; .type glVertexAttrib3sv,#function ; glVertexAttrib3sv = glVertexAttrib3svARB
-	.globl glVertexAttrib4Nbv ; .type glVertexAttrib4Nbv,#function ; glVertexAttrib4Nbv = glVertexAttrib4NbvARB
-	.globl glVertexAttrib4Niv ; .type glVertexAttrib4Niv,#function ; glVertexAttrib4Niv = glVertexAttrib4NivARB
-	.globl glVertexAttrib4Nsv ; .type glVertexAttrib4Nsv,#function ; glVertexAttrib4Nsv = glVertexAttrib4NsvARB
-	.globl glVertexAttrib4Nub ; .type glVertexAttrib4Nub,#function ; glVertexAttrib4Nub = glVertexAttrib4NubARB
-	.globl glVertexAttrib4Nubv ; .type glVertexAttrib4Nubv,#function ; glVertexAttrib4Nubv = glVertexAttrib4NubvARB
-	.globl glVertexAttrib4Nuiv ; .type glVertexAttrib4Nuiv,#function ; glVertexAttrib4Nuiv = glVertexAttrib4NuivARB
-	.globl glVertexAttrib4Nusv ; .type glVertexAttrib4Nusv,#function ; glVertexAttrib4Nusv = glVertexAttrib4NusvARB
-	.globl glVertexAttrib4bv ; .type glVertexAttrib4bv,#function ; glVertexAttrib4bv = glVertexAttrib4bvARB
-	.globl glVertexAttrib4d ; .type glVertexAttrib4d,#function ; glVertexAttrib4d = glVertexAttrib4dARB
-	.globl glVertexAttrib4dv ; .type glVertexAttrib4dv,#function ; glVertexAttrib4dv = glVertexAttrib4dvARB
-	.globl glVertexAttrib4f ; .type glVertexAttrib4f,#function ; glVertexAttrib4f = glVertexAttrib4fARB
-	.globl glVertexAttrib4fv ; .type glVertexAttrib4fv,#function ; glVertexAttrib4fv = glVertexAttrib4fvARB
-	.globl glVertexAttrib4iv ; .type glVertexAttrib4iv,#function ; glVertexAttrib4iv = glVertexAttrib4ivARB
-	.globl glVertexAttrib4s ; .type glVertexAttrib4s,#function ; glVertexAttrib4s = glVertexAttrib4sARB
-	.globl glVertexAttrib4sv ; .type glVertexAttrib4sv,#function ; glVertexAttrib4sv = glVertexAttrib4svARB
-	.globl glVertexAttrib4ubv ; .type glVertexAttrib4ubv,#function ; glVertexAttrib4ubv = glVertexAttrib4ubvARB
-	.globl glVertexAttrib4uiv ; .type glVertexAttrib4uiv,#function ; glVertexAttrib4uiv = glVertexAttrib4uivARB
-	.globl glVertexAttrib4usv ; .type glVertexAttrib4usv,#function ; glVertexAttrib4usv = glVertexAttrib4usvARB
-	.globl glVertexAttribPointer ; .type glVertexAttribPointer,#function ; glVertexAttribPointer = glVertexAttribPointerARB
-	.globl glBindBuffer ; .type glBindBuffer,#function ; glBindBuffer = glBindBufferARB
-	.globl glBufferData ; .type glBufferData,#function ; glBufferData = glBufferDataARB
-	.globl glBufferSubData ; .type glBufferSubData,#function ; glBufferSubData = glBufferSubDataARB
-	.globl glDeleteBuffers ; .type glDeleteBuffers,#function ; glDeleteBuffers = glDeleteBuffersARB
-	.globl glGenBuffers ; .type glGenBuffers,#function ; glGenBuffers = glGenBuffersARB
-	.globl glGetBufferParameteriv ; .type glGetBufferParameteriv,#function ; glGetBufferParameteriv = glGetBufferParameterivARB
-	.globl glGetBufferPointerv ; .type glGetBufferPointerv,#function ; glGetBufferPointerv = glGetBufferPointervARB
-	.globl glGetBufferSubData ; .type glGetBufferSubData,#function ; glGetBufferSubData = glGetBufferSubDataARB
-	.globl glIsBuffer ; .type glIsBuffer,#function ; glIsBuffer = glIsBufferARB
-	.globl glMapBuffer ; .type glMapBuffer,#function ; glMapBuffer = glMapBufferARB
-	.globl glUnmapBuffer ; .type glUnmapBuffer,#function ; glUnmapBuffer = glUnmapBufferARB
-	.globl glBeginQuery ; .type glBeginQuery,#function ; glBeginQuery = glBeginQueryARB
-	.globl glDeleteQueries ; .type glDeleteQueries,#function ; glDeleteQueries = glDeleteQueriesARB
-	.globl glEndQuery ; .type glEndQuery,#function ; glEndQuery = glEndQueryARB
-	.globl glGenQueries ; .type glGenQueries,#function ; glGenQueries = glGenQueriesARB
-	.globl glGetQueryObjectiv ; .type glGetQueryObjectiv,#function ; glGetQueryObjectiv = glGetQueryObjectivARB
-	.globl glGetQueryObjectuiv ; .type glGetQueryObjectuiv,#function ; glGetQueryObjectuiv = glGetQueryObjectuivARB
-	.globl glGetQueryiv ; .type glGetQueryiv,#function ; glGetQueryiv = glGetQueryivARB
-	.globl glIsQuery ; .type glIsQuery,#function ; glIsQuery = glIsQueryARB
-	.globl glCompileShader ; .type glCompileShader,#function ; glCompileShader = glCompileShaderARB
-	.globl glGetActiveUniform ; .type glGetActiveUniform,#function ; glGetActiveUniform = glGetActiveUniformARB
-	.globl glGetShaderSource ; .type glGetShaderSource,#function ; glGetShaderSource = glGetShaderSourceARB
-	.globl glGetUniformLocation ; .type glGetUniformLocation,#function ; glGetUniformLocation = glGetUniformLocationARB
-	.globl glGetUniformfv ; .type glGetUniformfv,#function ; glGetUniformfv = glGetUniformfvARB
-	.globl glGetUniformiv ; .type glGetUniformiv,#function ; glGetUniformiv = glGetUniformivARB
-	.globl glLinkProgram ; .type glLinkProgram,#function ; glLinkProgram = glLinkProgramARB
-	.globl glShaderSource ; .type glShaderSource,#function ; glShaderSource = glShaderSourceARB
-	.globl glUniform1f ; .type glUniform1f,#function ; glUniform1f = glUniform1fARB
-	.globl glUniform1fv ; .type glUniform1fv,#function ; glUniform1fv = glUniform1fvARB
-	.globl glUniform1i ; .type glUniform1i,#function ; glUniform1i = glUniform1iARB
-	.globl glUniform1iv ; .type glUniform1iv,#function ; glUniform1iv = glUniform1ivARB
-	.globl glUniform2f ; .type glUniform2f,#function ; glUniform2f = glUniform2fARB
-	.globl glUniform2fv ; .type glUniform2fv,#function ; glUniform2fv = glUniform2fvARB
-	.globl glUniform2i ; .type glUniform2i,#function ; glUniform2i = glUniform2iARB
-	.globl glUniform2iv ; .type glUniform2iv,#function ; glUniform2iv = glUniform2ivARB
-	.globl glUniform3f ; .type glUniform3f,#function ; glUniform3f = glUniform3fARB
-	.globl glUniform3fv ; .type glUniform3fv,#function ; glUniform3fv = glUniform3fvARB
-	.globl glUniform3i ; .type glUniform3i,#function ; glUniform3i = glUniform3iARB
-	.globl glUniform3iv ; .type glUniform3iv,#function ; glUniform3iv = glUniform3ivARB
-	.globl glUniform4f ; .type glUniform4f,#function ; glUniform4f = glUniform4fARB
-	.globl glUniform4fv ; .type glUniform4fv,#function ; glUniform4fv = glUniform4fvARB
-	.globl glUniform4i ; .type glUniform4i,#function ; glUniform4i = glUniform4iARB
-	.globl glUniform4iv ; .type glUniform4iv,#function ; glUniform4iv = glUniform4ivARB
-	.globl glUniformMatrix2fv ; .type glUniformMatrix2fv,#function ; glUniformMatrix2fv = glUniformMatrix2fvARB
-	.globl glUniformMatrix3fv ; .type glUniformMatrix3fv,#function ; glUniformMatrix3fv = glUniformMatrix3fvARB
-	.globl glUniformMatrix4fv ; .type glUniformMatrix4fv,#function ; glUniformMatrix4fv = glUniformMatrix4fvARB
-	.globl glUseProgram ; .type glUseProgram,#function ; glUseProgram = glUseProgramObjectARB
-	.globl glValidateProgram ; .type glValidateProgram,#function ; glValidateProgram = glValidateProgramARB
-	.globl glBindAttribLocation ; .type glBindAttribLocation,#function ; glBindAttribLocation = glBindAttribLocationARB
-	.globl glGetActiveAttrib ; .type glGetActiveAttrib,#function ; glGetActiveAttrib = glGetActiveAttribARB
-	.globl glGetAttribLocation ; .type glGetAttribLocation,#function ; glGetAttribLocation = glGetAttribLocationARB
-	.globl glDrawBuffers ; .type glDrawBuffers,#function ; glDrawBuffers = glDrawBuffersARB
-	.globl glDrawBuffersATI ; .type glDrawBuffersATI,#function ; glDrawBuffersATI = glDrawBuffersARB
-	.globl glPointParameterf ; .type glPointParameterf,#function ; glPointParameterf = glPointParameterfEXT
-	.globl glPointParameterfARB ; .type glPointParameterfARB,#function ; glPointParameterfARB = glPointParameterfEXT
-	.globl glPointParameterfv ; .type glPointParameterfv,#function ; glPointParameterfv = glPointParameterfvEXT
-	.globl glPointParameterfvARB ; .type glPointParameterfvARB,#function ; glPointParameterfvARB = glPointParameterfvEXT
-	.globl glSecondaryColor3b ; .type glSecondaryColor3b,#function ; glSecondaryColor3b = glSecondaryColor3bEXT
-	.globl glSecondaryColor3bv ; .type glSecondaryColor3bv,#function ; glSecondaryColor3bv = glSecondaryColor3bvEXT
-	.globl glSecondaryColor3d ; .type glSecondaryColor3d,#function ; glSecondaryColor3d = glSecondaryColor3dEXT
-	.globl glSecondaryColor3dv ; .type glSecondaryColor3dv,#function ; glSecondaryColor3dv = glSecondaryColor3dvEXT
-	.globl glSecondaryColor3f ; .type glSecondaryColor3f,#function ; glSecondaryColor3f = glSecondaryColor3fEXT
-	.globl glSecondaryColor3fv ; .type glSecondaryColor3fv,#function ; glSecondaryColor3fv = glSecondaryColor3fvEXT
-	.globl glSecondaryColor3i ; .type glSecondaryColor3i,#function ; glSecondaryColor3i = glSecondaryColor3iEXT
-	.globl glSecondaryColor3iv ; .type glSecondaryColor3iv,#function ; glSecondaryColor3iv = glSecondaryColor3ivEXT
-	.globl glSecondaryColor3s ; .type glSecondaryColor3s,#function ; glSecondaryColor3s = glSecondaryColor3sEXT
-	.globl glSecondaryColor3sv ; .type glSecondaryColor3sv,#function ; glSecondaryColor3sv = glSecondaryColor3svEXT
-	.globl glSecondaryColor3ub ; .type glSecondaryColor3ub,#function ; glSecondaryColor3ub = glSecondaryColor3ubEXT
-	.globl glSecondaryColor3ubv ; .type glSecondaryColor3ubv,#function ; glSecondaryColor3ubv = glSecondaryColor3ubvEXT
-	.globl glSecondaryColor3ui ; .type glSecondaryColor3ui,#function ; glSecondaryColor3ui = glSecondaryColor3uiEXT
-	.globl glSecondaryColor3uiv ; .type glSecondaryColor3uiv,#function ; glSecondaryColor3uiv = glSecondaryColor3uivEXT
-	.globl glSecondaryColor3us ; .type glSecondaryColor3us,#function ; glSecondaryColor3us = glSecondaryColor3usEXT
-	.globl glSecondaryColor3usv ; .type glSecondaryColor3usv,#function ; glSecondaryColor3usv = glSecondaryColor3usvEXT
-	.globl glSecondaryColorPointer ; .type glSecondaryColorPointer,#function ; glSecondaryColorPointer = glSecondaryColorPointerEXT
-	.globl glMultiDrawArrays ; .type glMultiDrawArrays,#function ; glMultiDrawArrays = glMultiDrawArraysEXT
-	.globl glMultiDrawElements ; .type glMultiDrawElements,#function ; glMultiDrawElements = glMultiDrawElementsEXT
-	.globl glFogCoordPointer ; .type glFogCoordPointer,#function ; glFogCoordPointer = glFogCoordPointerEXT
-	.globl glFogCoordd ; .type glFogCoordd,#function ; glFogCoordd = glFogCoorddEXT
-	.globl glFogCoorddv ; .type glFogCoorddv,#function ; glFogCoorddv = glFogCoorddvEXT
-	.globl glFogCoordf ; .type glFogCoordf,#function ; glFogCoordf = glFogCoordfEXT
-	.globl glFogCoordfv ; .type glFogCoordfv,#function ; glFogCoordfv = glFogCoordfvEXT
-	.globl glBlendFuncSeparate ; .type glBlendFuncSeparate,#function ; glBlendFuncSeparate = glBlendFuncSeparateEXT
-	.globl glWindowPos2d ; .type glWindowPos2d,#function ; glWindowPos2d = glWindowPos2dMESA
-	.globl glWindowPos2dARB ; .type glWindowPos2dARB,#function ; glWindowPos2dARB = glWindowPos2dMESA
-	.globl glWindowPos2dv ; .type glWindowPos2dv,#function ; glWindowPos2dv = glWindowPos2dvMESA
-	.globl glWindowPos2dvARB ; .type glWindowPos2dvARB,#function ; glWindowPos2dvARB = glWindowPos2dvMESA
-	.globl glWindowPos2f ; .type glWindowPos2f,#function ; glWindowPos2f = glWindowPos2fMESA
-	.globl glWindowPos2fARB ; .type glWindowPos2fARB,#function ; glWindowPos2fARB = glWindowPos2fMESA
-	.globl glWindowPos2fv ; .type glWindowPos2fv,#function ; glWindowPos2fv = glWindowPos2fvMESA
-	.globl glWindowPos2fvARB ; .type glWindowPos2fvARB,#function ; glWindowPos2fvARB = glWindowPos2fvMESA
-	.globl glWindowPos2i ; .type glWindowPos2i,#function ; glWindowPos2i = glWindowPos2iMESA
-	.globl glWindowPos2iARB ; .type glWindowPos2iARB,#function ; glWindowPos2iARB = glWindowPos2iMESA
-	.globl glWindowPos2iv ; .type glWindowPos2iv,#function ; glWindowPos2iv = glWindowPos2ivMESA
-	.globl glWindowPos2ivARB ; .type glWindowPos2ivARB,#function ; glWindowPos2ivARB = glWindowPos2ivMESA
-	.globl glWindowPos2s ; .type glWindowPos2s,#function ; glWindowPos2s = glWindowPos2sMESA
-	.globl glWindowPos2sARB ; .type glWindowPos2sARB,#function ; glWindowPos2sARB = glWindowPos2sMESA
-	.globl glWindowPos2sv ; .type glWindowPos2sv,#function ; glWindowPos2sv = glWindowPos2svMESA
-	.globl glWindowPos2svARB ; .type glWindowPos2svARB,#function ; glWindowPos2svARB = glWindowPos2svMESA
-	.globl glWindowPos3d ; .type glWindowPos3d,#function ; glWindowPos3d = glWindowPos3dMESA
-	.globl glWindowPos3dARB ; .type glWindowPos3dARB,#function ; glWindowPos3dARB = glWindowPos3dMESA
-	.globl glWindowPos3dv ; .type glWindowPos3dv,#function ; glWindowPos3dv = glWindowPos3dvMESA
-	.globl glWindowPos3dvARB ; .type glWindowPos3dvARB,#function ; glWindowPos3dvARB = glWindowPos3dvMESA
-	.globl glWindowPos3f ; .type glWindowPos3f,#function ; glWindowPos3f = glWindowPos3fMESA
-	.globl glWindowPos3fARB ; .type glWindowPos3fARB,#function ; glWindowPos3fARB = glWindowPos3fMESA
-	.globl glWindowPos3fv ; .type glWindowPos3fv,#function ; glWindowPos3fv = glWindowPos3fvMESA
-	.globl glWindowPos3fvARB ; .type glWindowPos3fvARB,#function ; glWindowPos3fvARB = glWindowPos3fvMESA
-	.globl glWindowPos3i ; .type glWindowPos3i,#function ; glWindowPos3i = glWindowPos3iMESA
-	.globl glWindowPos3iARB ; .type glWindowPos3iARB,#function ; glWindowPos3iARB = glWindowPos3iMESA
-	.globl glWindowPos3iv ; .type glWindowPos3iv,#function ; glWindowPos3iv = glWindowPos3ivMESA
-	.globl glWindowPos3ivARB ; .type glWindowPos3ivARB,#function ; glWindowPos3ivARB = glWindowPos3ivMESA
-	.globl glWindowPos3s ; .type glWindowPos3s,#function ; glWindowPos3s = glWindowPos3sMESA
-	.globl glWindowPos3sARB ; .type glWindowPos3sARB,#function ; glWindowPos3sARB = glWindowPos3sMESA
-	.globl glWindowPos3sv ; .type glWindowPos3sv,#function ; glWindowPos3sv = glWindowPos3svMESA
-	.globl glWindowPos3svARB ; .type glWindowPos3svARB,#function ; glWindowPos3svARB = glWindowPos3svMESA
-	.globl glBindProgramARB ; .type glBindProgramARB,#function ; glBindProgramARB = glBindProgramNV
-	.globl glDeleteProgramsARB ; .type glDeleteProgramsARB,#function ; glDeleteProgramsARB = glDeleteProgramsNV
-	.globl glGenProgramsARB ; .type glGenProgramsARB,#function ; glGenProgramsARB = glGenProgramsNV
-	.globl glGetVertexAttribPointerv ; .type glGetVertexAttribPointerv,#function ; glGetVertexAttribPointerv = glGetVertexAttribPointervNV
-	.globl glGetVertexAttribPointervARB ; .type glGetVertexAttribPointervARB,#function ; glGetVertexAttribPointervARB = glGetVertexAttribPointervNV
-	.globl glIsProgramARB ; .type glIsProgramARB,#function ; glIsProgramARB = glIsProgramNV
-	.globl glPointParameteri ; .type glPointParameteri,#function ; glPointParameteri = glPointParameteriNV
-	.globl glPointParameteriv ; .type glPointParameteriv,#function ; glPointParameteriv = glPointParameterivNV
-	.globl glBlendEquationSeparate ; .type glBlendEquationSeparate,#function ; glBlendEquationSeparate = glBlendEquationSeparateEXT
-	.globl glBindFramebuffer ; .type glBindFramebuffer,#function ; glBindFramebuffer = glBindFramebufferEXT
-	.globl glBindRenderbuffer ; .type glBindRenderbuffer,#function ; glBindRenderbuffer = glBindRenderbufferEXT
-	.globl glCheckFramebufferStatus ; .type glCheckFramebufferStatus,#function ; glCheckFramebufferStatus = glCheckFramebufferStatusEXT
-	.globl glDeleteFramebuffers ; .type glDeleteFramebuffers,#function ; glDeleteFramebuffers = glDeleteFramebuffersEXT
-	.globl glDeleteRenderbuffers ; .type glDeleteRenderbuffers,#function ; glDeleteRenderbuffers = glDeleteRenderbuffersEXT
-	.globl glFramebufferRenderbuffer ; .type glFramebufferRenderbuffer,#function ; glFramebufferRenderbuffer = glFramebufferRenderbufferEXT
-	.globl glFramebufferTexture1D ; .type glFramebufferTexture1D,#function ; glFramebufferTexture1D = glFramebufferTexture1DEXT
-	.globl glFramebufferTexture2D ; .type glFramebufferTexture2D,#function ; glFramebufferTexture2D = glFramebufferTexture2DEXT
-	.globl glFramebufferTexture3D ; .type glFramebufferTexture3D,#function ; glFramebufferTexture3D = glFramebufferTexture3DEXT
-	.globl glGenFramebuffers ; .type glGenFramebuffers,#function ; glGenFramebuffers = glGenFramebuffersEXT
-	.globl glGenRenderbuffers ; .type glGenRenderbuffers,#function ; glGenRenderbuffers = glGenRenderbuffersEXT
-	.globl glGenerateMipmap ; .type glGenerateMipmap,#function ; glGenerateMipmap = glGenerateMipmapEXT
-	.globl glGetFramebufferAttachmentParameteriv ; .type glGetFramebufferAttachmentParameteriv,#function ; glGetFramebufferAttachmentParameteriv = glGetFramebufferAttachmentParameterivEXT
-	.globl glGetRenderbufferParameteriv ; .type glGetRenderbufferParameteriv,#function ; glGetRenderbufferParameteriv = glGetRenderbufferParameterivEXT
-	.globl glIsFramebuffer ; .type glIsFramebuffer,#function ; glIsFramebuffer = glIsFramebufferEXT
-	.globl glIsRenderbuffer ; .type glIsRenderbuffer,#function ; glIsRenderbuffer = glIsRenderbufferEXT
-	.globl glRenderbufferStorage ; .type glRenderbufferStorage,#function ; glRenderbufferStorage = glRenderbufferStorageEXT
-	.globl glBlitFramebuffer ; .type glBlitFramebuffer,#function ; glBlitFramebuffer = glBlitFramebufferEXT
-	.globl glFramebufferTextureLayer ; .type glFramebufferTextureLayer,#function ; glFramebufferTextureLayer = glFramebufferTextureLayerEXT
+	GL_STUB_ALIAS(glSeparableFilter2DEXT, glSeparableFilter2D)
+#ifndef GLX_INDIRECT_RENDERING
+	GL_STUB_ALIAS(glGetHistogramEXT, glGetHistogram)
+#endif
+#ifndef GLX_INDIRECT_RENDERING
+	GL_STUB_ALIAS(glGetHistogramParameterfvEXT, glGetHistogramParameterfv)
+#endif
+#ifndef GLX_INDIRECT_RENDERING
+	GL_STUB_ALIAS(glGetHistogramParameterivEXT, glGetHistogramParameteriv)
+#endif
+#ifndef GLX_INDIRECT_RENDERING
+	GL_STUB_ALIAS(glGetMinmaxEXT, glGetMinmax)
+#endif
+#ifndef GLX_INDIRECT_RENDERING
+	GL_STUB_ALIAS(glGetMinmaxParameterfvEXT, glGetMinmaxParameterfv)
+#endif
+#ifndef GLX_INDIRECT_RENDERING
+	GL_STUB_ALIAS(glGetMinmaxParameterivEXT, glGetMinmaxParameteriv)
+#endif
+	GL_STUB_ALIAS(glHistogramEXT, glHistogram)
+	GL_STUB_ALIAS(glMinmaxEXT, glMinmax)
+	GL_STUB_ALIAS(glResetHistogramEXT, glResetHistogram)
+	GL_STUB_ALIAS(glResetMinmaxEXT, glResetMinmax)
+	GL_STUB_ALIAS(glTexImage3DEXT, glTexImage3D)
+	GL_STUB_ALIAS(glTexSubImage3DEXT, glTexSubImage3D)
+	GL_STUB_ALIAS(glCopyTexSubImage3DEXT, glCopyTexSubImage3D)
+	GL_STUB_ALIAS(glActiveTexture, glActiveTextureARB)
+	GL_STUB_ALIAS(glClientActiveTexture, glClientActiveTextureARB)
+	GL_STUB_ALIAS(glMultiTexCoord1d, glMultiTexCoord1dARB)
+	GL_STUB_ALIAS(glMultiTexCoord1dv, glMultiTexCoord1dvARB)
+	GL_STUB_ALIAS(glMultiTexCoord1f, glMultiTexCoord1fARB)
+	GL_STUB_ALIAS(glMultiTexCoord1fv, glMultiTexCoord1fvARB)
+	GL_STUB_ALIAS(glMultiTexCoord1i, glMultiTexCoord1iARB)
+	GL_STUB_ALIAS(glMultiTexCoord1iv, glMultiTexCoord1ivARB)
+	GL_STUB_ALIAS(glMultiTexCoord1s, glMultiTexCoord1sARB)
+	GL_STUB_ALIAS(glMultiTexCoord1sv, glMultiTexCoord1svARB)
+	GL_STUB_ALIAS(glMultiTexCoord2d, glMultiTexCoord2dARB)
+	GL_STUB_ALIAS(glMultiTexCoord2dv, glMultiTexCoord2dvARB)
+	GL_STUB_ALIAS(glMultiTexCoord2f, glMultiTexCoord2fARB)
+	GL_STUB_ALIAS(glMultiTexCoord2fv, glMultiTexCoord2fvARB)
+	GL_STUB_ALIAS(glMultiTexCoord2i, glMultiTexCoord2iARB)
+	GL_STUB_ALIAS(glMultiTexCoord2iv, glMultiTexCoord2ivARB)
+	GL_STUB_ALIAS(glMultiTexCoord2s, glMultiTexCoord2sARB)
+	GL_STUB_ALIAS(glMultiTexCoord2sv, glMultiTexCoord2svARB)
+	GL_STUB_ALIAS(glMultiTexCoord3d, glMultiTexCoord3dARB)
+	GL_STUB_ALIAS(glMultiTexCoord3dv, glMultiTexCoord3dvARB)
+	GL_STUB_ALIAS(glMultiTexCoord3f, glMultiTexCoord3fARB)
+	GL_STUB_ALIAS(glMultiTexCoord3fv, glMultiTexCoord3fvARB)
+	GL_STUB_ALIAS(glMultiTexCoord3i, glMultiTexCoord3iARB)
+	GL_STUB_ALIAS(glMultiTexCoord3iv, glMultiTexCoord3ivARB)
+	GL_STUB_ALIAS(glMultiTexCoord3s, glMultiTexCoord3sARB)
+	GL_STUB_ALIAS(glMultiTexCoord3sv, glMultiTexCoord3svARB)
+	GL_STUB_ALIAS(glMultiTexCoord4d, glMultiTexCoord4dARB)
+	GL_STUB_ALIAS(glMultiTexCoord4dv, glMultiTexCoord4dvARB)
+	GL_STUB_ALIAS(glMultiTexCoord4f, glMultiTexCoord4fARB)
+	GL_STUB_ALIAS(glMultiTexCoord4fv, glMultiTexCoord4fvARB)
+	GL_STUB_ALIAS(glMultiTexCoord4i, glMultiTexCoord4iARB)
+	GL_STUB_ALIAS(glMultiTexCoord4iv, glMultiTexCoord4ivARB)
+	GL_STUB_ALIAS(glMultiTexCoord4s, glMultiTexCoord4sARB)
+	GL_STUB_ALIAS(glMultiTexCoord4sv, glMultiTexCoord4svARB)
+	GL_STUB_ALIAS(glStencilOpSeparateATI, glStencilOpSeparate)
+	GL_STUB_ALIAS(glLoadTransposeMatrixd, glLoadTransposeMatrixdARB)
+	GL_STUB_ALIAS(glLoadTransposeMatrixf, glLoadTransposeMatrixfARB)
+	GL_STUB_ALIAS(glMultTransposeMatrixd, glMultTransposeMatrixdARB)
+	GL_STUB_ALIAS(glMultTransposeMatrixf, glMultTransposeMatrixfARB)
+	GL_STUB_ALIAS(glSampleCoverage, glSampleCoverageARB)
+	GL_STUB_ALIAS(glCompressedTexImage1D, glCompressedTexImage1DARB)
+	GL_STUB_ALIAS(glCompressedTexImage2D, glCompressedTexImage2DARB)
+	GL_STUB_ALIAS(glCompressedTexImage3D, glCompressedTexImage3DARB)
+	GL_STUB_ALIAS(glCompressedTexSubImage1D, glCompressedTexSubImage1DARB)
+	GL_STUB_ALIAS(glCompressedTexSubImage2D, glCompressedTexSubImage2DARB)
+	GL_STUB_ALIAS(glCompressedTexSubImage3D, glCompressedTexSubImage3DARB)
+	GL_STUB_ALIAS(glGetCompressedTexImage, glGetCompressedTexImageARB)
+	GL_STUB_ALIAS(glDisableVertexAttribArray, glDisableVertexAttribArrayARB)
+	GL_STUB_ALIAS(glEnableVertexAttribArray, glEnableVertexAttribArrayARB)
+	GL_STUB_ALIAS(glGetVertexAttribdv, glGetVertexAttribdvARB)
+	GL_STUB_ALIAS(glGetVertexAttribfv, glGetVertexAttribfvARB)
+	GL_STUB_ALIAS(glGetVertexAttribiv, glGetVertexAttribivARB)
+	GL_STUB_ALIAS(glProgramParameter4dNV, glProgramEnvParameter4dARB)
+	GL_STUB_ALIAS(glProgramParameter4dvNV, glProgramEnvParameter4dvARB)
+	GL_STUB_ALIAS(glProgramParameter4fNV, glProgramEnvParameter4fARB)
+	GL_STUB_ALIAS(glProgramParameter4fvNV, glProgramEnvParameter4fvARB)
+	GL_STUB_ALIAS(glVertexAttrib1d, glVertexAttrib1dARB)
+	GL_STUB_ALIAS(glVertexAttrib1dv, glVertexAttrib1dvARB)
+	GL_STUB_ALIAS(glVertexAttrib1f, glVertexAttrib1fARB)
+	GL_STUB_ALIAS(glVertexAttrib1fv, glVertexAttrib1fvARB)
+	GL_STUB_ALIAS(glVertexAttrib1s, glVertexAttrib1sARB)
+	GL_STUB_ALIAS(glVertexAttrib1sv, glVertexAttrib1svARB)
+	GL_STUB_ALIAS(glVertexAttrib2d, glVertexAttrib2dARB)
+	GL_STUB_ALIAS(glVertexAttrib2dv, glVertexAttrib2dvARB)
+	GL_STUB_ALIAS(glVertexAttrib2f, glVertexAttrib2fARB)
+	GL_STUB_ALIAS(glVertexAttrib2fv, glVertexAttrib2fvARB)
+	GL_STUB_ALIAS(glVertexAttrib2s, glVertexAttrib2sARB)
+	GL_STUB_ALIAS(glVertexAttrib2sv, glVertexAttrib2svARB)
+	GL_STUB_ALIAS(glVertexAttrib3d, glVertexAttrib3dARB)
+	GL_STUB_ALIAS(glVertexAttrib3dv, glVertexAttrib3dvARB)
+	GL_STUB_ALIAS(glVertexAttrib3f, glVertexAttrib3fARB)
+	GL_STUB_ALIAS(glVertexAttrib3fv, glVertexAttrib3fvARB)
+	GL_STUB_ALIAS(glVertexAttrib3s, glVertexAttrib3sARB)
+	GL_STUB_ALIAS(glVertexAttrib3sv, glVertexAttrib3svARB)
+	GL_STUB_ALIAS(glVertexAttrib4Nbv, glVertexAttrib4NbvARB)
+	GL_STUB_ALIAS(glVertexAttrib4Niv, glVertexAttrib4NivARB)
+	GL_STUB_ALIAS(glVertexAttrib4Nsv, glVertexAttrib4NsvARB)
+	GL_STUB_ALIAS(glVertexAttrib4Nub, glVertexAttrib4NubARB)
+	GL_STUB_ALIAS(glVertexAttrib4Nubv, glVertexAttrib4NubvARB)
+	GL_STUB_ALIAS(glVertexAttrib4Nuiv, glVertexAttrib4NuivARB)
+	GL_STUB_ALIAS(glVertexAttrib4Nusv, glVertexAttrib4NusvARB)
+	GL_STUB_ALIAS(glVertexAttrib4bv, glVertexAttrib4bvARB)
+	GL_STUB_ALIAS(glVertexAttrib4d, glVertexAttrib4dARB)
+	GL_STUB_ALIAS(glVertexAttrib4dv, glVertexAttrib4dvARB)
+	GL_STUB_ALIAS(glVertexAttrib4f, glVertexAttrib4fARB)
+	GL_STUB_ALIAS(glVertexAttrib4fv, glVertexAttrib4fvARB)
+	GL_STUB_ALIAS(glVertexAttrib4iv, glVertexAttrib4ivARB)
+	GL_STUB_ALIAS(glVertexAttrib4s, glVertexAttrib4sARB)
+	GL_STUB_ALIAS(glVertexAttrib4sv, glVertexAttrib4svARB)
+	GL_STUB_ALIAS(glVertexAttrib4ubv, glVertexAttrib4ubvARB)
+	GL_STUB_ALIAS(glVertexAttrib4uiv, glVertexAttrib4uivARB)
+	GL_STUB_ALIAS(glVertexAttrib4usv, glVertexAttrib4usvARB)
+	GL_STUB_ALIAS(glVertexAttribPointer, glVertexAttribPointerARB)
+	GL_STUB_ALIAS(glBindBuffer, glBindBufferARB)
+	GL_STUB_ALIAS(glBufferData, glBufferDataARB)
+	GL_STUB_ALIAS(glBufferSubData, glBufferSubDataARB)
+	GL_STUB_ALIAS(glDeleteBuffers, glDeleteBuffersARB)
+	GL_STUB_ALIAS(glGenBuffers, glGenBuffersARB)
+	GL_STUB_ALIAS(glGetBufferParameteriv, glGetBufferParameterivARB)
+	GL_STUB_ALIAS(glGetBufferPointerv, glGetBufferPointervARB)
+	GL_STUB_ALIAS(glGetBufferSubData, glGetBufferSubDataARB)
+	GL_STUB_ALIAS(glIsBuffer, glIsBufferARB)
+	GL_STUB_ALIAS(glMapBuffer, glMapBufferARB)
+	GL_STUB_ALIAS(glUnmapBuffer, glUnmapBufferARB)
+	GL_STUB_ALIAS(glBeginQuery, glBeginQueryARB)
+	GL_STUB_ALIAS(glDeleteQueries, glDeleteQueriesARB)
+	GL_STUB_ALIAS(glEndQuery, glEndQueryARB)
+	GL_STUB_ALIAS(glGenQueries, glGenQueriesARB)
+	GL_STUB_ALIAS(glGetQueryObjectiv, glGetQueryObjectivARB)
+	GL_STUB_ALIAS(glGetQueryObjectuiv, glGetQueryObjectuivARB)
+	GL_STUB_ALIAS(glGetQueryiv, glGetQueryivARB)
+	GL_STUB_ALIAS(glIsQuery, glIsQueryARB)
+	GL_STUB_ALIAS(glCompileShader, glCompileShaderARB)
+	GL_STUB_ALIAS(glGetActiveUniform, glGetActiveUniformARB)
+	GL_STUB_ALIAS(glGetShaderSource, glGetShaderSourceARB)
+	GL_STUB_ALIAS(glGetUniformLocation, glGetUniformLocationARB)
+	GL_STUB_ALIAS(glGetUniformfv, glGetUniformfvARB)
+	GL_STUB_ALIAS(glGetUniformiv, glGetUniformivARB)
+	GL_STUB_ALIAS(glLinkProgram, glLinkProgramARB)
+	GL_STUB_ALIAS(glShaderSource, glShaderSourceARB)
+	GL_STUB_ALIAS(glUniform1f, glUniform1fARB)
+	GL_STUB_ALIAS(glUniform1fv, glUniform1fvARB)
+	GL_STUB_ALIAS(glUniform1i, glUniform1iARB)
+	GL_STUB_ALIAS(glUniform1iv, glUniform1ivARB)
+	GL_STUB_ALIAS(glUniform2f, glUniform2fARB)
+	GL_STUB_ALIAS(glUniform2fv, glUniform2fvARB)
+	GL_STUB_ALIAS(glUniform2i, glUniform2iARB)
+	GL_STUB_ALIAS(glUniform2iv, glUniform2ivARB)
+	GL_STUB_ALIAS(glUniform3f, glUniform3fARB)
+	GL_STUB_ALIAS(glUniform3fv, glUniform3fvARB)
+	GL_STUB_ALIAS(glUniform3i, glUniform3iARB)
+	GL_STUB_ALIAS(glUniform3iv, glUniform3ivARB)
+	GL_STUB_ALIAS(glUniform4f, glUniform4fARB)
+	GL_STUB_ALIAS(glUniform4fv, glUniform4fvARB)
+	GL_STUB_ALIAS(glUniform4i, glUniform4iARB)
+	GL_STUB_ALIAS(glUniform4iv, glUniform4ivARB)
+	GL_STUB_ALIAS(glUniformMatrix2fv, glUniformMatrix2fvARB)
+	GL_STUB_ALIAS(glUniformMatrix3fv, glUniformMatrix3fvARB)
+	GL_STUB_ALIAS(glUniformMatrix4fv, glUniformMatrix4fvARB)
+	GL_STUB_ALIAS(glUseProgram, glUseProgramObjectARB)
+	GL_STUB_ALIAS(glValidateProgram, glValidateProgramARB)
+	GL_STUB_ALIAS(glBindAttribLocation, glBindAttribLocationARB)
+	GL_STUB_ALIAS(glGetActiveAttrib, glGetActiveAttribARB)
+	GL_STUB_ALIAS(glGetAttribLocation, glGetAttribLocationARB)
+	GL_STUB_ALIAS(glDrawBuffers, glDrawBuffersARB)
+	GL_STUB_ALIAS(glDrawBuffersATI, glDrawBuffersARB)
+	GL_STUB_ALIAS(glPointParameterf, glPointParameterfEXT)
+	GL_STUB_ALIAS(glPointParameterfARB, glPointParameterfEXT)
+	GL_STUB_ALIAS(glPointParameterfSGIS, glPointParameterfEXT)
+	GL_STUB_ALIAS(glPointParameterfv, glPointParameterfvEXT)
+	GL_STUB_ALIAS(glPointParameterfvARB, glPointParameterfvEXT)
+	GL_STUB_ALIAS(glPointParameterfvSGIS, glPointParameterfvEXT)
+	GL_STUB_ALIAS(glSecondaryColor3b, glSecondaryColor3bEXT)
+	GL_STUB_ALIAS(glSecondaryColor3bv, glSecondaryColor3bvEXT)
+	GL_STUB_ALIAS(glSecondaryColor3d, glSecondaryColor3dEXT)
+	GL_STUB_ALIAS(glSecondaryColor3dv, glSecondaryColor3dvEXT)
+	GL_STUB_ALIAS(glSecondaryColor3f, glSecondaryColor3fEXT)
+	GL_STUB_ALIAS(glSecondaryColor3fv, glSecondaryColor3fvEXT)
+	GL_STUB_ALIAS(glSecondaryColor3i, glSecondaryColor3iEXT)
+	GL_STUB_ALIAS(glSecondaryColor3iv, glSecondaryColor3ivEXT)
+	GL_STUB_ALIAS(glSecondaryColor3s, glSecondaryColor3sEXT)
+	GL_STUB_ALIAS(glSecondaryColor3sv, glSecondaryColor3svEXT)
+	GL_STUB_ALIAS(glSecondaryColor3ub, glSecondaryColor3ubEXT)
+	GL_STUB_ALIAS(glSecondaryColor3ubv, glSecondaryColor3ubvEXT)
+	GL_STUB_ALIAS(glSecondaryColor3ui, glSecondaryColor3uiEXT)
+	GL_STUB_ALIAS(glSecondaryColor3uiv, glSecondaryColor3uivEXT)
+	GL_STUB_ALIAS(glSecondaryColor3us, glSecondaryColor3usEXT)
+	GL_STUB_ALIAS(glSecondaryColor3usv, glSecondaryColor3usvEXT)
+	GL_STUB_ALIAS(glSecondaryColorPointer, glSecondaryColorPointerEXT)
+	GL_STUB_ALIAS(glMultiDrawArrays, glMultiDrawArraysEXT)
+	GL_STUB_ALIAS(glMultiDrawElements, glMultiDrawElementsEXT)
+	GL_STUB_ALIAS(glFogCoordPointer, glFogCoordPointerEXT)
+	GL_STUB_ALIAS(glFogCoordd, glFogCoorddEXT)
+	GL_STUB_ALIAS(glFogCoorddv, glFogCoorddvEXT)
+	GL_STUB_ALIAS(glFogCoordf, glFogCoordfEXT)
+	GL_STUB_ALIAS(glFogCoordfv, glFogCoordfvEXT)
+	GL_STUB_ALIAS(glBlendFuncSeparate, glBlendFuncSeparateEXT)
+	GL_STUB_ALIAS(glBlendFuncSeparateINGR, glBlendFuncSeparateEXT)
+	GL_STUB_ALIAS(glWindowPos2d, glWindowPos2dMESA)
+	GL_STUB_ALIAS(glWindowPos2dARB, glWindowPos2dMESA)
+	GL_STUB_ALIAS(glWindowPos2dv, glWindowPos2dvMESA)
+	GL_STUB_ALIAS(glWindowPos2dvARB, glWindowPos2dvMESA)
+	GL_STUB_ALIAS(glWindowPos2f, glWindowPos2fMESA)
+	GL_STUB_ALIAS(glWindowPos2fARB, glWindowPos2fMESA)
+	GL_STUB_ALIAS(glWindowPos2fv, glWindowPos2fvMESA)
+	GL_STUB_ALIAS(glWindowPos2fvARB, glWindowPos2fvMESA)
+	GL_STUB_ALIAS(glWindowPos2i, glWindowPos2iMESA)
+	GL_STUB_ALIAS(glWindowPos2iARB, glWindowPos2iMESA)
+	GL_STUB_ALIAS(glWindowPos2iv, glWindowPos2ivMESA)
+	GL_STUB_ALIAS(glWindowPos2ivARB, glWindowPos2ivMESA)
+	GL_STUB_ALIAS(glWindowPos2s, glWindowPos2sMESA)
+	GL_STUB_ALIAS(glWindowPos2sARB, glWindowPos2sMESA)
+	GL_STUB_ALIAS(glWindowPos2sv, glWindowPos2svMESA)
+	GL_STUB_ALIAS(glWindowPos2svARB, glWindowPos2svMESA)
+	GL_STUB_ALIAS(glWindowPos3d, glWindowPos3dMESA)
+	GL_STUB_ALIAS(glWindowPos3dARB, glWindowPos3dMESA)
+	GL_STUB_ALIAS(glWindowPos3dv, glWindowPos3dvMESA)
+	GL_STUB_ALIAS(glWindowPos3dvARB, glWindowPos3dvMESA)
+	GL_STUB_ALIAS(glWindowPos3f, glWindowPos3fMESA)
+	GL_STUB_ALIAS(glWindowPos3fARB, glWindowPos3fMESA)
+	GL_STUB_ALIAS(glWindowPos3fv, glWindowPos3fvMESA)
+	GL_STUB_ALIAS(glWindowPos3fvARB, glWindowPos3fvMESA)
+	GL_STUB_ALIAS(glWindowPos3i, glWindowPos3iMESA)
+	GL_STUB_ALIAS(glWindowPos3iARB, glWindowPos3iMESA)
+	GL_STUB_ALIAS(glWindowPos3iv, glWindowPos3ivMESA)
+	GL_STUB_ALIAS(glWindowPos3ivARB, glWindowPos3ivMESA)
+	GL_STUB_ALIAS(glWindowPos3s, glWindowPos3sMESA)
+	GL_STUB_ALIAS(glWindowPos3sARB, glWindowPos3sMESA)
+	GL_STUB_ALIAS(glWindowPos3sv, glWindowPos3svMESA)
+	GL_STUB_ALIAS(glWindowPos3svARB, glWindowPos3svMESA)
+	GL_STUB_ALIAS(glBindProgramARB, glBindProgramNV)
+	GL_STUB_ALIAS(glDeleteProgramsARB, glDeleteProgramsNV)
+	GL_STUB_ALIAS(glGenProgramsARB, glGenProgramsNV)
+	GL_STUB_ALIAS(glGetVertexAttribPointerv, glGetVertexAttribPointervNV)
+	GL_STUB_ALIAS(glGetVertexAttribPointervARB, glGetVertexAttribPointervNV)
+	GL_STUB_ALIAS(glIsProgramARB, glIsProgramNV)
+	GL_STUB_ALIAS(glPointParameteri, glPointParameteriNV)
+	GL_STUB_ALIAS(glPointParameteriv, glPointParameterivNV)
+	GL_STUB_ALIAS(glBindFramebuffer, glBindFramebufferEXT)
+	GL_STUB_ALIAS(glBindRenderbuffer, glBindRenderbufferEXT)
+	GL_STUB_ALIAS(glCheckFramebufferStatus, glCheckFramebufferStatusEXT)
+	GL_STUB_ALIAS(glDeleteFramebuffers, glDeleteFramebuffersEXT)
+	GL_STUB_ALIAS(glDeleteRenderbuffers, glDeleteRenderbuffersEXT)
+	GL_STUB_ALIAS(glFramebufferRenderbuffer, glFramebufferRenderbufferEXT)
+	GL_STUB_ALIAS(glFramebufferTexture1D, glFramebufferTexture1DEXT)
+	GL_STUB_ALIAS(glFramebufferTexture2D, glFramebufferTexture2DEXT)
+	GL_STUB_ALIAS(glFramebufferTexture3D, glFramebufferTexture3DEXT)
+	GL_STUB_ALIAS(glGenFramebuffers, glGenFramebuffersEXT)
+	GL_STUB_ALIAS(glGenRenderbuffers, glGenRenderbuffersEXT)
+	GL_STUB_ALIAS(glGenerateMipmap, glGenerateMipmapEXT)
+	GL_STUB_ALIAS(glGetFramebufferAttachmentParameteriv, glGetFramebufferAttachmentParameterivEXT)
+	GL_STUB_ALIAS(glGetRenderbufferParameteriv, glGetRenderbufferParameterivEXT)
+	GL_STUB_ALIAS(glIsFramebuffer, glIsFramebufferEXT)
+	GL_STUB_ALIAS(glIsRenderbuffer, glIsRenderbufferEXT)
+	GL_STUB_ALIAS(glRenderbufferStorage, glRenderbufferStorageEXT)
+	GL_STUB_ALIAS(glFramebufferTextureLayer, glFramebufferTextureLayerEXT)
+
+	.globl	gl_dispatch_functions_end
+	HIDDEN(gl_dispatch_functions_end)
+gl_dispatch_functions_end:
diff --git a/src/mesa/sparc/sparc.c b/src/mesa/sparc/sparc.c
index 84e8ac6723..3bde98e34b 100644
--- a/src/mesa/sparc/sparc.c
+++ b/src/mesa/sparc/sparc.c
@@ -109,10 +109,10 @@ void _mesa_init_all_sparc_transform_asm(void)
    ASSIGN_XFORM_GROUP(sparc, 2)
    ASSIGN_XFORM_GROUP(sparc, 3)
    ASSIGN_XFORM_GROUP(sparc, 4)
-
+#if 0
    _mesa_clip_tab[4] = _mesa_sparc_cliptest_points4;
    _mesa_clip_np_tab[4] = _mesa_sparc_cliptest_points4_np;
-
+#endif
 #if 0
    /* disable these too.  See bug 673938 */
    _mesa_normal_tab[NORM_TRANSFORM | NORM_NORMALIZE] =
@@ -140,38 +140,4 @@ void _mesa_init_all_sparc_transform_asm(void)
 #endif
 }
 
-extern unsigned int _mesa_sparc_glapi_begin;
-extern unsigned int _mesa_sparc_glapi_end;
-extern void __glapi_sparc_icache_flush(unsigned int *);
-
-#endif /* USE_SPARC_ASM */
-
-
-void _mesa_init_sparc_glapi_relocs(void)
-{
-#ifdef USE_SPARC_ASM
-	unsigned int *insn_ptr, *end_ptr;
-	unsigned long disp_addr;
-
-	insn_ptr = &_mesa_sparc_glapi_begin;
-	end_ptr = &_mesa_sparc_glapi_end;
-	disp_addr = (unsigned long) &_glapi_Dispatch;
-
-	while (insn_ptr < end_ptr) {
-#ifdef __arch64__
-		insn_ptr[0] |= (disp_addr >> (32 + 10));
-		insn_ptr[1] |= ((disp_addr & 0xffffffff) >> 10);
-		__glapi_sparc_icache_flush(&insn_ptr[0]);
-		insn_ptr[2] |= ((disp_addr >> 32) & ((1 << 10) - 1));
-		insn_ptr[3] |= (disp_addr & ((1 << 10) - 1));
-		__glapi_sparc_icache_flush(&insn_ptr[2]);
-		insn_ptr += 11;
-#else
-		insn_ptr[0] |= (disp_addr >> 10);
-		insn_ptr[1] |= (disp_addr & ((1 << 10) - 1));
-		__glapi_sparc_icache_flush(&insn_ptr[0]);
-		insn_ptr += 5;
-#endif
-	}
 #endif /* USE_SPARC_ASM */
-}
diff --git a/src/mesa/sparc/sparc.h b/src/mesa/sparc/sparc.h
index a98e4d0e40..b9ea336856 100644
--- a/src/mesa/sparc/sparc.h
+++ b/src/mesa/sparc/sparc.h
@@ -32,6 +32,5 @@
 #define SPARC_H
 
 extern void _mesa_init_all_sparc_transform_asm(void);
-extern void _mesa_init_sparc_glapi_relocs(void);
 
 #endif /* !(SPARC_H) */
-- 
cgit v1.2.3


From 16144632354cb310f090c8713a11d3c65696969e Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 26 Feb 2009 14:49:24 -0700
Subject: mesa: avoid extraneous calls to ctx->Driver.BindFramebuffer()

Only call this driver function when we really need to bind different buffers.
---
 src/mesa/main/fbobject.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 23b3fb68fb..151e29053a 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -1229,19 +1229,26 @@ _mesa_BindFramebufferEXT(GLenum target, GLuint framebuffer)
    ASSERT(newFb != &DummyFramebuffer);
 
    /*
-    * XXX check if re-binding same buffer and skip some of this code.
+    * OK, now bind the new Draw/Read framebuffers, if they're changing.
     */
 
    if (bindReadBuf) {
-      _mesa_reference_framebuffer(&ctx->ReadBuffer, newFbread);
+      if (ctx->ReadBuffer == newFbread)
+         bindReadBuf = GL_FALSE; /* no change */
+      else
+         _mesa_reference_framebuffer(&ctx->ReadBuffer, newFbread);
    }
 
    if (bindDrawBuf) {
       /* check if old FB had any texture attachments */
-      check_end_texture_render(ctx, ctx->DrawBuffer);
+      if (ctx->DrawBuffer->Name != 0) {
+         check_end_texture_render(ctx, ctx->DrawBuffer);
+      }
 
-      /* check if time to delete this framebuffer */
-      _mesa_reference_framebuffer(&ctx->DrawBuffer, newFb);
+      if (ctx->DrawBuffer == newFb)
+         bindDrawBuf = GL_FALSE; /* no change */
+      else
+         _mesa_reference_framebuffer(&ctx->DrawBuffer, newFb);
 
       if (newFb->Name != 0) {
          /* check if newly bound framebuffer has any texture attachments */
@@ -1249,7 +1256,7 @@ _mesa_BindFramebufferEXT(GLenum target, GLuint framebuffer)
       }
    }
 
-   if (ctx->Driver.BindFramebuffer) {
+   if ((bindDrawBuf || bindReadBuf) && ctx->Driver.BindFramebuffer) {
       ctx->Driver.BindFramebuffer(ctx, target, newFb, newFbread);
    }
 }
-- 
cgit v1.2.3


From 75e3ccf6a5b639834bcda0ff6f9035b148fca8f1 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 27 Feb 2009 12:30:21 -0700
Subject: mesa: fix incorrect error handling in glBufferDataARB()

If glBufferDataARB() is called while a buffer object is currently mapped
we're supposed to unmap the current buffer, then replace it.  Don't generate
an error.
---
 src/mesa/main/bufferobj.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 016543da01..e4bdc6f1e7 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -951,8 +951,10 @@ _mesa_BufferDataARB(GLenum target, GLsizeiptrARB size,
    }
    
    if (bufObj->Pointer) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glBufferDataARB(buffer is mapped)" );
-      return;
+      /* Unmap the existing buffer.  We'll replace it now.  Not an error. */
+      ctx->Driver.UnmapBuffer(ctx, target, bufObj);
+      bufObj->Access = DEFAULT_ACCESS;
+      bufObj->Pointer = NULL;
    }  
 
    ASSERT(ctx->Driver.BufferData);
-- 
cgit v1.2.3


From 395bcad8c095e78621e7aca18af1dab71fe69813 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 27 Feb 2009 12:41:11 -0700
Subject: mesa: updated comments

---
 src/mesa/main/bufferobj.c | 42 ++++++++++++++++++------------------------
 1 file changed, 18 insertions(+), 24 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index e4bdc6f1e7..1f41565fe2 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -1,8 +1,9 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.2
+ * Version:  7.5
  *
  * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2009  VMware, Inc.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,7 +26,7 @@
 
 /**
  * \file bufferobj.c
- * \brief Functions for the GL_ARB_vertex_buffer_object extension.
+ * \brief Functions for the GL_ARB_vertex/pixel_buffer_object extensions.
  * \author Brian Paul, Ian Romanick
  */
 
@@ -144,8 +145,7 @@ buffer_object_subdata_range_good( GLcontext * ctx, GLenum target,
 /**
  * Allocate and initialize a new buffer object.
  * 
- * This function is intended to be called via
- * \c dd_function_table::NewBufferObject.
+ * Default callback for the \c dd_function_table::NewBufferObject() hook.
  */
 struct gl_buffer_object *
 _mesa_new_buffer_object( GLcontext *ctx, GLuint name, GLenum target )
@@ -163,8 +163,7 @@ _mesa_new_buffer_object( GLcontext *ctx, GLuint name, GLenum target )
 /**
  * Delete a buffer object.
  * 
- * This function is intended to be called via
- * \c dd_function_table::DeleteBuffer.
+ * Default callback for the \c dd_function_table::DeleteBuffer() hook.
  */
 void
 _mesa_delete_buffer_object( GLcontext *ctx, struct gl_buffer_object *bufObj )
@@ -271,9 +270,8 @@ _mesa_initialize_buffer_object( struct gl_buffer_object *obj,
  * previously stored in the buffer object is lost.  If \c data is \c NULL,
  * memory will be allocated, but no copy will occur.
  *
- * This function is intended to be called via
- * \c dd_function_table::BufferData.  This function need not set GL error
- * codes.  The input parameters will have been tested before calling.
+ * This is the default callback for \c dd_function_table::BufferData()
+ * Note that all GL error checking will have been done already.
  *
  * \param ctx     GL context.
  * \param target  Buffer object target on which to operate.
@@ -312,9 +310,8 @@ _mesa_buffer_data( GLcontext *ctx, GLenum target, GLsizeiptrARB size,
  * specified by \c size + \c offset extends beyond the end of the buffer or
  * if \c data is \c NULL, no copy is performed.
  *
- * This function is intended to be called by
- * \c dd_function_table::BufferSubData.  This function need not set GL error
- * codes.  The input parameters will have been tested before calling.
+ * This is the default callback for \c dd_function_table::BufferSubData()
+ * Note that all GL error checking will have been done already.
  *
  * \param ctx     GL context.
  * \param target  Buffer object target on which to operate.
@@ -346,15 +343,14 @@ _mesa_buffer_subdata( GLcontext *ctx, GLenum target, GLintptrARB offset,
  * specified by \c size + \c offset extends beyond the end of the buffer or
  * if \c data is \c NULL, no copy is performed.
  *
- * This function is intended to be called by
- * \c dd_function_table::BufferGetSubData.  This function need not set GL error
- * codes.  The input parameters will have been tested before calling.
+ * This is the default callback for \c dd_function_table::GetBufferSubData()
+ * Note that all GL error checking will have been done already.
  *
  * \param ctx     GL context.
  * \param target  Buffer object target on which to operate.
- * \param offset  Offset of the first byte to be modified.
+ * \param offset  Offset of the first byte to be fetched.
  * \param size    Size, in bytes, of the data range.
- * \param data    Pointer to the data to store in the buffer object.
+ * \param data    Destination for data
  * \param bufObj  Object to be used.
  *
  * \sa glBufferGetSubDataARB, dd_function_table::GetBufferSubData.
@@ -373,9 +369,7 @@ _mesa_buffer_get_subdata( GLcontext *ctx, GLenum target, GLintptrARB offset,
 
 
 /**
- * Fallback function called via ctx->Driver.MapBuffer().
- * Hardware drivers that really implement buffer objects should never use
- * this function.
+ * Default callback for \c dd_function_tabel::MapBuffer().
  *
  * The function parameters will have been already tested for errors.
  *
@@ -407,9 +401,7 @@ _mesa_buffer_map( GLcontext *ctx, GLenum target, GLenum access,
 
 
 /**
- * Fallback function called via ctx->Driver.MapBuffer().
- * Hardware drivers that really implement buffer objects should never use
- * function.
+ * Default callback for \c dd_function_table::MapBuffer().
  *
  * The input parameters will have been already tested for errors.
  *
@@ -446,6 +438,7 @@ _mesa_init_buffer_objects( GLcontext *ctx )
    ctx->Array.ElementArrayBufferObj = ctx->Array.NullBufferObj;
 }
 
+
 /**
  * Bind the specified target to buffer for the specified context.
  */
@@ -796,11 +789,11 @@ _mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids)
    for (i = 0; i < n; i++) {
       struct gl_buffer_object *bufObj = _mesa_lookup_bufferobj(ctx, ids[i]);
       if (bufObj) {
-         /* unbind any vertex pointers bound to this buffer */
          GLuint j;
 
          ASSERT(bufObj->Name == ids[i]);
 
+         /* unbind any vertex pointers bound to this buffer */
          unbind(ctx, &ctx->Array.ArrayObj->Vertex.BufferObj, bufObj);
          unbind(ctx, &ctx->Array.ArrayObj->Normal.BufferObj, bufObj);
          unbind(ctx, &ctx->Array.ArrayObj->Color.BufferObj, bufObj);
@@ -822,6 +815,7 @@ _mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids)
             _mesa_BindBufferARB( GL_ELEMENT_ARRAY_BUFFER_ARB, 0 );
          }
 
+         /* unbind any pixel pack/unpack pointers bound to this buffer */
          if (ctx->Pack.BufferObj == bufObj) {
             _mesa_BindBufferARB( GL_PIXEL_PACK_BUFFER_EXT, 0 );
          }
-- 
cgit v1.2.3


From a7f434b486187129ae8d5507170c42a9ce750258 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 27 Feb 2009 13:04:38 -0700
Subject: mesa: if a buffer object is mapped when glDeleteBuffers() is called,
 unmap it

---
 src/mesa/main/bufferobj.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 1f41565fe2..8df0a5b1a1 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -793,6 +793,11 @@ _mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids)
 
          ASSERT(bufObj->Name == ids[i]);
 
+         if (bufObj->Pointer) {
+            /* if mapped, unmap it now */
+            ctx->Driver.UnmapBuffer(ctx, 0, bufObj);
+         }
+
          /* unbind any vertex pointers bound to this buffer */
          unbind(ctx, &ctx->Array.ArrayObj->Vertex.BufferObj, bufObj);
          unbind(ctx, &ctx->Array.ArrayObj->Normal.BufferObj, bufObj);
-- 
cgit v1.2.3


From 67025f789324163a69771436e852975d3acbcd86 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 27 Feb 2009 13:10:45 -0700
Subject: mesa: set bufObj->Pointer = NULL after unmapping

Also, ctx->Driver.UnmapBuffer can never be null, so remove conditional.
---
 src/mesa/main/bufferobj.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 8df0a5b1a1..c8d160baa9 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -796,6 +796,8 @@ _mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids)
          if (bufObj->Pointer) {
             /* if mapped, unmap it now */
             ctx->Driver.UnmapBuffer(ctx, 0, bufObj);
+            bufObj->Access = DEFAULT_ACCESS;
+            bufObj->Pointer = NULL;
          }
 
          /* unbind any vertex pointers bound to this buffer */
@@ -1069,10 +1071,7 @@ _mesa_UnmapBufferARB(GLenum target)
       return GL_FALSE;
    }
 
-   if (ctx->Driver.UnmapBuffer) {
-      status = ctx->Driver.UnmapBuffer( ctx, target, bufObj );
-   }
-
+   status = ctx->Driver.UnmapBuffer( ctx, target, bufObj );
    bufObj->Access = DEFAULT_ACCESS;
    bufObj->Pointer = NULL;
 
-- 
cgit v1.2.3


From bedd20743b80b5a6d7d9954e4479a44a76c7ea02 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 27 Feb 2009 21:39:04 -0700
Subject: mesa: lots of updated comments, formatting clean-ups

---
 src/mesa/main/mtypes.h | 189 +++++++++++++++++++++++--------------------------
 1 file changed, 89 insertions(+), 100 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index e80d3db043..ee49e5d178 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -623,9 +623,7 @@ struct gl_current_attrib
     * \note Index and Edgeflag current values are stored as floats in the 
     * SIX and SEVEN attribute slots.
     */
-   /*@{*/
    GLfloat Attrib[VERT_ATTRIB_MAX][4];	/**< Position, color, texcoords, etc */
-   /*@}*/
 
    /**
     * \name Current raster position attributes (always valid).
@@ -822,11 +820,11 @@ struct gl_hint_attrib
  */
 struct gl_histogram_attrib
 {
-   GLuint Width;				/**< number of table entries */
-   GLint Format;				/**< GL_ALPHA, GL_RGB, etc */
-   GLuint Count[HISTOGRAM_TABLE_SIZE][4];	/**< the histogram */
-   GLboolean Sink;				/**< terminate image transfer? */
-   GLubyte RedSize;				/**< Bits per counter */
+   GLuint Width;                            /**< number of table entries */
+   GLint Format;                            /**< GL_ALPHA, GL_RGB, etc */
+   GLuint Count[HISTOGRAM_TABLE_SIZE][4];   /**< the histogram */
+   GLboolean Sink;                          /**< terminate image transfer? */
+   GLubyte RedSize;                         /**< Bits per counter */
    GLubyte GreenSize;
    GLubyte BlueSize;
    GLubyte AlphaSize;
@@ -1005,13 +1003,15 @@ struct gl_pixel_attrib
    /*--- Begin Pixel Transfer State ---*/
    /* Fields are in the order in which they're applied... */
 
-   /* Scale & Bias (index shift, offset) */
+   /** Scale & Bias (index shift, offset) */
+   /*@{*/
    GLfloat RedBias, RedScale;
    GLfloat GreenBias, GreenScale;
    GLfloat BlueBias, BlueScale;
    GLfloat AlphaBias, AlphaScale;
    GLfloat DepthBias, DepthScale;
    GLint IndexShift, IndexOffset;
+   /*@}*/
 
    /* Pixel Maps */
    /* Note: actual pixel maps are not part of this attrib group */
@@ -1027,7 +1027,7 @@ struct gl_pixel_attrib
    GLboolean Convolution1DEnabled;
    GLboolean Convolution2DEnabled;
    GLboolean Separable2DEnabled;
-   GLfloat ConvolutionBorderColor[3][4];
+   GLfloat ConvolutionBorderColor[3][4];  /**< RGBA */
    GLenum ConvolutionBorderMode[3];
    GLfloat ConvolutionFilterScale[3][4];  /**< RGBA */
    GLfloat ConvolutionFilterBias[3][4];   /**< RGBA */
@@ -1538,24 +1538,12 @@ struct gl_texture_unit
 };
 
 
-
 /**
  * Texture attribute group (GL_TEXTURE_BIT).
  */
 struct gl_texture_attrib
 {
-   /**
-    * name multitexture 
-    */
-   /**@{*/
-   GLuint CurrentUnit;   /**< Active texture unit [0, MaxTextureImageUnits-1] */
-   GLbitfield _EnabledUnits;  /**< one bit set for each really-enabled unit */
-   GLbitfield _EnabledCoordUnits;   /**< one bit per enabled coordinate unit */
-   GLbitfield _GenFlags;            /**< for texgen */
-   GLbitfield _TexGenEnabled;  /**< Mask of ENABLE_TEXGEN flags */
-   GLbitfield _TexMatEnabled;  /**< Mask of ENABLE_TEXMAT flags */
-   /**@}*/
-
+   GLuint CurrentUnit;   /**< GL_ACTIVE_TEXTURE */
    struct gl_texture_unit Unit[MAX_TEXTURE_UNITS];
 
    struct gl_texture_object *ProxyTex[NUM_TEXTURE_TARGETS];
@@ -1563,6 +1551,15 @@ struct gl_texture_attrib
    /** GL_EXT_shared_texture_palette */
    GLboolean SharedPalette;
    struct gl_color_table Palette;
+
+   /** Per-unit flags */
+   /*@{*/
+   GLbitfield _EnabledUnits;  /**< one bit set for each really-enabled unit */
+   GLbitfield _EnabledCoordUnits;   /**< one bit per enabled coordinate unit */
+   GLbitfield _GenFlags;            /**< for texgen */
+   GLbitfield _TexGenEnabled;  /**< Mask of ENABLE_TEXGEN flags */
+   GLbitfield _TexMatEnabled;  /**< Mask of ENABLE_TEXMAT flags */
+   /*@}*/
 };
 
 
@@ -1624,7 +1621,6 @@ struct gl_buffer_object
 };
 
 
-
 /**
  * Client pixel packing/unpacking attributes
  */
@@ -1634,8 +1630,8 @@ struct gl_pixelstore_attrib
    GLint RowLength;
    GLint SkipPixels;
    GLint SkipRows;
-   GLint ImageHeight;     /**< for GL_EXT_texture3D */
-   GLint SkipImages;      /**< for GL_EXT_texture3D */
+   GLint ImageHeight;
+   GLint SkipImages;
    GLboolean SwapBytes;
    GLboolean LsbFirst;
    GLboolean ClientStorage; /**< GL_APPLE_client_storage */
@@ -1644,7 +1640,6 @@ struct gl_pixelstore_attrib
 };
 
 
-
 /**
  * Client vertex array attributes
  */
@@ -1724,7 +1719,7 @@ struct gl_array_attrib
 struct gl_feedback
 {
    GLenum Type;
-   GLbitfield _Mask;		/* FB_* bits */
+   GLbitfield _Mask;    /**< FB_* bits */
    GLfloat *Buffer;
    GLuint BufferSize;
    GLuint Count;
@@ -1948,14 +1943,14 @@ struct gl_program_state
  */
 struct gl_vertex_program_state
 {
-   GLboolean Enabled;               /**< User-set GL_VERTEX_PROGRAM_ARB/NV flag */
-   GLboolean _Enabled;              /**< Enabled and _valid_ user program? */
-   GLboolean PointSizeEnabled;      /**< GL_VERTEX_PROGRAM_POINT_SIZE_ARB/NV */
-   GLboolean TwoSideEnabled;        /**< GL_VERTEX_PROGRAM_TWO_SIDE_ARB/NV */
+   GLboolean Enabled;            /**< User-set GL_VERTEX_PROGRAM_ARB/NV flag */
+   GLboolean _Enabled;           /**< Enabled and _valid_ user program? */
+   GLboolean PointSizeEnabled;   /**< GL_VERTEX_PROGRAM_POINT_SIZE_ARB/NV */
+   GLboolean TwoSideEnabled;     /**< GL_VERTEX_PROGRAM_TWO_SIDE_ARB/NV */
    struct gl_vertex_program *Current;  /**< User-bound vertex program */
 
-   /** Currently enabled and valid vertex program (including internal programs,
-    * user-defined vertex programs and GLSL vertex shaders).
+   /** Currently enabled and valid vertex program (including internal
+    * programs, user-defined vertex programs and GLSL vertex shaders).
     * This is the program we must use when rendering.
     */
    struct gl_vertex_program *_Current;
@@ -1995,8 +1990,8 @@ struct gl_fragment_program_state
    GLboolean _Enabled;    /**< Enabled and _valid_ user program? */
    struct gl_fragment_program *Current;  /**< User-bound fragment program */
 
-   /** Currently enabled and valid fragment program (including internal programs,
-    * user-defined fragment programs and GLSL fragment shaders).
+   /** Currently enabled and valid fragment program (including internal
+    * programs, user-defined fragment programs and GLSL fragment shaders).
     * This is the program we must use when rendering.
     */
    struct gl_fragment_program *_Current;
@@ -2339,9 +2334,8 @@ struct gl_renderbuffer
 
 
 /**
- * A renderbuffer attachment point points to either a texture object
- * (and specifies a mipmap level, cube face or 3D texture slice) or
- * points to a renderbuffer.
+ * A renderbuffer attachment points to either a texture object (and specifies
+ * a mipmap level, cube face or 3D texture slice) or points to a renderbuffer.
  */
 struct gl_renderbuffer_attachment
 {
@@ -2373,14 +2367,16 @@ struct gl_renderbuffer_attachment
  */
 struct gl_framebuffer
 {
-   _glthread_Mutex Mutex;		   /**< for thread safety */
-   GLuint Name;      /* if zero, this is a window system framebuffer */
+   _glthread_Mutex Mutex;  /**< for thread safety */
+   GLuint Name;            /**< if zero, this is a window system framebuffer */
    GLint RefCount;
    GLboolean DeletePending;
 
-   GLvisual Visual;	/**< The framebuffer's visual.
-                             Immutable if this is a window system buffer.
-                             Computed from attachments if user-made FBO. */
+   /**
+    * The framebuffer's visual. Immutable if this is a window system buffer.
+    * Computed from attachments if user-made FBO.
+    */
+   GLvisual Visual;
 
    GLboolean Initialized;
 
@@ -2399,9 +2395,10 @@ struct gl_framebuffer
    GLfloat _MRD;	/**< minimum resolvable difference in Z values */
    /*@}*/
 
-   GLenum _Status; /* One of the GL_FRAMEBUFFER_(IN)COMPLETE_* tokens */
+   /** One of the GL_FRAMEBUFFER_(IN)COMPLETE_* tokens */
+   GLenum _Status;
 
-   /* Array of all renderbuffer attachments, indexed by BUFFER_* tokens. */
+   /** Array of all renderbuffer attachments, indexed by BUFFER_* tokens. */
    struct gl_renderbuffer_attachment Attachment[BUFFER_COUNT];
 
    /* In unextended OpenGL these vars are part of the GL_COLOR_BUFFER
@@ -2463,52 +2460,58 @@ struct gl_program_constants
  */
 struct gl_constants
 {
-   GLint MaxTextureLevels;		/**< Maximum number of allowed mipmap levels. */ 
-   GLint Max3DTextureLevels;		/**< Maximum number of allowed mipmap levels for 3D texture targets. */
-   GLint MaxCubeTextureLevels;          /**< Maximum number of allowed mipmap levels for GL_ARB_texture_cube_map */
-   GLint MaxArrayTextureLayers;         /**< Maximum number of layers in an array texture. */
-   GLint MaxTextureRectSize;            /* GL_NV_texture_rectangle */
+   GLint MaxTextureLevels;      /**< Max mipmap levels. */ 
+   GLint Max3DTextureLevels;    /**< Max mipmap levels for 3D textures */
+   GLint MaxCubeTextureLevels;  /**< Max mipmap levels for cube textures */
+   GLint MaxArrayTextureLayers; /**< Max layers in array textures */
+   GLint MaxTextureRectSize;    /**< Max rectangle texture size, in pixes */
    GLuint MaxTextureCoordUnits;
    GLuint MaxTextureImageUnits;
-   GLuint MaxTextureUnits;              /**< = MIN(CoordUnits, ImageUnits) */
-   GLfloat MaxTextureMaxAnisotropy;     /**< GL_EXT_texture_filter_anisotropic */
-   GLfloat MaxTextureLodBias;           /**< GL_EXT_texture_lod_bias */
+   GLuint MaxVertexTextureImageUnits;
+   GLuint MaxTextureUnits;           /**< = MIN(CoordUnits, ImageUnits) */
+   GLfloat MaxTextureMaxAnisotropy;  /**< GL_EXT_texture_filter_anisotropic */
+   GLfloat MaxTextureLodBias;        /**< GL_EXT_texture_lod_bias */
+
    GLuint MaxArrayLockSize;
+
    GLint SubPixelBits;
-   GLfloat MinPointSize, MaxPointSize;		/* aliased */
-   GLfloat MinPointSizeAA, MaxPointSizeAA;	/* antialiased */
+
+   GLfloat MinPointSize, MaxPointSize;	     /**< aliased */
+   GLfloat MinPointSizeAA, MaxPointSizeAA;   /**< antialiased */
    GLfloat PointSizeGranularity;
-   GLfloat MinLineWidth, MaxLineWidth;		/* aliased */
-   GLfloat MinLineWidthAA, MaxLineWidthAA;	/* antialiased */
+   GLfloat MinLineWidth, MaxLineWidth;       /**< aliased */
+   GLfloat MinLineWidthAA, MaxLineWidthAA;   /**< antialiased */
    GLfloat LineWidthGranularity;
+
    GLuint MaxColorTableSize;
    GLuint MaxConvolutionWidth;
    GLuint MaxConvolutionHeight;
+
    GLuint MaxClipPlanes;
    GLuint MaxLights;
-   GLfloat MaxShininess;			/* GL_NV_light_max_exponent */
-   GLfloat MaxSpotExponent;			/* GL_NV_light_max_exponent */
+   GLfloat MaxShininess;                     /**< GL_NV_light_max_exponent */
+   GLfloat MaxSpotExponent;                  /**< GL_NV_light_max_exponent */
+
    GLuint MaxViewportWidth, MaxViewportHeight;
-   struct gl_program_constants VertexProgram;    /* GL_ARB_vertex_program */
-   struct gl_program_constants FragmentProgram;  /* GL_ARB_fragment_program */
-   /* shared by vertex and fragment program: */
+
+   struct gl_program_constants VertexProgram;   /**< GL_ARB_vertex_program */
+   struct gl_program_constants FragmentProgram; /**< GL_ARB_fragment_program */
    GLuint MaxProgramMatrices;
    GLuint MaxProgramMatrixStackDepth;
-   /* vertex array / buffer object bounds checking */
+
+   /** vertex array / buffer object bounds checking */
    GLboolean CheckArrayBounds;
-   /* GL_ARB_draw_buffers */
-   GLuint MaxDrawBuffers;
-   /* GL_OES_read_format */
-   GLenum ColorReadFormat;
-   GLenum ColorReadType;
-   /* GL_EXT_framebuffer_object */
-   GLuint MaxColorAttachments;
-   GLuint MaxRenderbufferSize;
-   /* GL_ARB_vertex_shader */
-   GLuint MaxVertexTextureImageUnits;
-   GLuint MaxVarying;  /**< Number of float[4] vectors */
-   /* GL_ARB_framebuffer_object */
-   GLuint MaxSamples;
+
+   GLuint MaxDrawBuffers;    /**< GL_ARB_draw_buffers */
+
+   GLenum ColorReadFormat;   /**< GL_OES_read_format */
+   GLenum ColorReadType;     /**< GL_OES_read_format */
+
+   GLuint MaxColorAttachments;   /**< GL_EXT_framebuffer_object */
+   GLuint MaxRenderbufferSize;   /**< GL_EXT_framebuffer_object */
+   GLuint MaxSamples;            /**< GL_ARB_framebuffer_object */
+
+   GLuint MaxVarying;  /**< Number of float[4] varying parameters */
 };
 
 
@@ -2518,12 +2521,6 @@ struct gl_constants
  */
 struct gl_extensions
 {
-   /**
-    * \name Flags to quickly test if certain extensions are available.
-    * 
-    * Not every extension needs to have such a flag, but it's encouraged.
-    */
-   /*@{*/
    GLboolean dummy;  /* don't remove this! */
    GLboolean ARB_depth_texture;
    GLboolean ARB_draw_buffers;
@@ -2641,8 +2638,7 @@ struct gl_extensions
    GLboolean SGIS_texture_lod;
    GLboolean TDFX_texture_compression_FXT1;
    GLboolean S3_s3tc;
-   /*@}*/
-   /* The extension string */
+   /** The extension string */
    const GLubyte *String;
 };
 
@@ -2662,7 +2658,6 @@ struct gl_matrix_stack
 
 /**
  * \name Bits for image transfer operations 
- *
  * \sa __GLcontextRec::ImageTransferState.
  */
 /*@{*/
@@ -2677,7 +2672,7 @@ struct gl_matrix_stack
 #define IMAGE_POST_COLOR_MATRIX_COLOR_TABLE_BIT   0x100
 #define IMAGE_HISTOGRAM_BIT                       0x200
 #define IMAGE_MIN_MAX_BIT                         0x400
-#define IMAGE_CLAMP_BIT                           0x800 /* extra */
+#define IMAGE_CLAMP_BIT                           0x800
 
 
 /** Pixel Transfer ops up to convolution */
@@ -3040,21 +3035,15 @@ struct __GLcontextRec
 
    struct gl_color_table ColorTable[COLORTABLE_MAX];
    struct gl_color_table ProxyColorTable[COLORTABLE_MAX];
-#if 0
-   struct gl_color_table PostConvolutionColorTable;
-   struct gl_color_table ProxyPostConvolutionColorTable;
-   struct gl_color_table PostColorMatrixColorTable;
-   struct gl_color_table ProxyPostColorMatrixColorTable;
-#endif
-
-   struct gl_program_state Program;        /**< for vertex or fragment progs */
-   struct gl_vertex_program_state VertexProgram;   /**< GL_ARB/NV_vertex_program */
-   struct gl_fragment_program_state FragmentProgram;  /**< GL_ARB/NV_vertex_program */
-   struct gl_ati_fragment_shader_state ATIFragmentShader;  /**< GL_ATI_fragment_shader */
 
-   struct gl_query_state Query;  /**< GL_ARB_occlusion_query */
+   struct gl_program_state Program;  /**< general program state */
+   struct gl_vertex_program_state VertexProgram;
+   struct gl_fragment_program_state FragmentProgram;
+   struct gl_ati_fragment_shader_state ATIFragmentShader;
 
    struct gl_shader_state Shader; /**< GLSL shader object state */
+
+   struct gl_query_state Query;  /**< occlusion, timer queries */
    /*@}*/
 
 #if FEATURE_EXT_framebuffer_object
@@ -3078,9 +3067,9 @@ struct __GLcontextRec
    GLfloat _ModelViewInvScale;
    GLboolean _NeedEyeCoords;
    GLboolean _ForceEyeCoords; 
-   GLenum _CurrentProgram;    /* currently executing program */
+   GLenum _CurrentProgram;    /**< currently executing program */
 
-   GLuint TextureStateTimestamp; /* detect changes to shared state */
+   GLuint TextureStateTimestamp; /**< detect changes to shared state */
 
    struct gl_shine_tab *_ShineTable[2]; /**< Active shine tables */
    struct gl_shine_tab *_ShineTabList;  /**< MRU list of inactive shine tables */
-- 
cgit v1.2.3


From 55399c29511a47bd52c39862a246f29e6f35c3cf Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 27 Feb 2009 21:41:26 -0700
Subject: mesa: move gl_enable_attrib struct to attrib.c, the only place it's
 used

---
 src/mesa/main/attrib.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++
 src/mesa/main/mtypes.h | 78 ----------------------------------------------
 2 files changed, 84 insertions(+), 78 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 996033a2d8..baad214263 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -58,6 +58,90 @@
 #include "mtypes.h"
 
 
+/**
+ * glEnable()/glDisable() attribute group (GL_ENABLE_BIT).
+ */
+struct gl_enable_attrib
+{
+   GLboolean AlphaTest;
+   GLboolean AutoNormal;
+   GLboolean Blend;
+   GLbitfield ClipPlanes;
+   GLboolean ColorMaterial;
+   GLboolean ColorTable[COLORTABLE_MAX];
+   GLboolean Convolution1D;
+   GLboolean Convolution2D;
+   GLboolean Separable2D;
+   GLboolean CullFace;
+   GLboolean DepthTest;
+   GLboolean Dither;
+   GLboolean Fog;
+   GLboolean Histogram;
+   GLboolean Light[MAX_LIGHTS];
+   GLboolean Lighting;
+   GLboolean LineSmooth;
+   GLboolean LineStipple;
+   GLboolean IndexLogicOp;
+   GLboolean ColorLogicOp;
+
+   GLboolean Map1Color4;
+   GLboolean Map1Index;
+   GLboolean Map1Normal;
+   GLboolean Map1TextureCoord1;
+   GLboolean Map1TextureCoord2;
+   GLboolean Map1TextureCoord3;
+   GLboolean Map1TextureCoord4;
+   GLboolean Map1Vertex3;
+   GLboolean Map1Vertex4;
+   GLboolean Map1Attrib[16];  /* GL_NV_vertex_program */
+   GLboolean Map2Color4;
+   GLboolean Map2Index;
+   GLboolean Map2Normal;
+   GLboolean Map2TextureCoord1;
+   GLboolean Map2TextureCoord2;
+   GLboolean Map2TextureCoord3;
+   GLboolean Map2TextureCoord4;
+   GLboolean Map2Vertex3;
+   GLboolean Map2Vertex4;
+   GLboolean Map2Attrib[16];  /* GL_NV_vertex_program */
+
+   GLboolean MinMax;
+   GLboolean Normalize;
+   GLboolean PixelTexture;
+   GLboolean PointSmooth;
+   GLboolean PolygonOffsetPoint;
+   GLboolean PolygonOffsetLine;
+   GLboolean PolygonOffsetFill;
+   GLboolean PolygonSmooth;
+   GLboolean PolygonStipple;
+   GLboolean RescaleNormals;
+   GLboolean Scissor;
+   GLboolean Stencil;
+   GLboolean StencilTwoSide;          /* GL_EXT_stencil_two_side */
+   GLboolean MultisampleEnabled;      /* GL_ARB_multisample */
+   GLboolean SampleAlphaToCoverage;   /* GL_ARB_multisample */
+   GLboolean SampleAlphaToOne;        /* GL_ARB_multisample */
+   GLboolean SampleCoverage;          /* GL_ARB_multisample */
+   GLboolean SampleCoverageInvert;    /* GL_ARB_multisample */
+   GLboolean RasterPositionUnclipped; /* GL_IBM_rasterpos_clip */
+
+   GLbitfield Texture[MAX_TEXTURE_UNITS];
+   GLbitfield TexGen[MAX_TEXTURE_UNITS];
+
+   /* SGI_texture_color_table */
+   GLboolean TextureColorTable[MAX_TEXTURE_UNITS];
+
+   /* GL_ARB_vertex_program / GL_NV_vertex_program */
+   GLboolean VertexProgram;
+   GLboolean VertexProgramPointSize;
+   GLboolean VertexProgramTwoSide;
+
+   /* GL_ARB_point_sprite / GL_NV_point_sprite */
+   GLboolean PointSprite;
+   GLboolean FragmentShaderATI;
+};
+
+
 /**
  * Special struct for saving/restoring texture state (GL_TEXTURE_BIT)
  */
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index ee49e5d178..a758c12d6f 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -655,84 +655,6 @@ struct gl_depthbuffer_attrib
 };
 
 
-/**
- * glEnable()/glDisable() attribute group (GL_ENABLE_BIT).
- */
-struct gl_enable_attrib
-{
-   GLboolean AlphaTest;
-   GLboolean AutoNormal;
-   GLboolean Blend;
-   GLbitfield ClipPlanes;
-   GLboolean ColorMaterial;
-   GLboolean ColorTable[COLORTABLE_MAX];
-   GLboolean Convolution1D;
-   GLboolean Convolution2D;
-   GLboolean Separable2D;
-   GLboolean CullFace;
-   GLboolean DepthTest;
-   GLboolean Dither;
-   GLboolean Fog;
-   GLboolean Histogram;
-   GLboolean Light[MAX_LIGHTS];
-   GLboolean Lighting;
-   GLboolean LineSmooth;
-   GLboolean LineStipple;
-   GLboolean IndexLogicOp;
-   GLboolean ColorLogicOp;
-   GLboolean Map1Color4;
-   GLboolean Map1Index;
-   GLboolean Map1Normal;
-   GLboolean Map1TextureCoord1;
-   GLboolean Map1TextureCoord2;
-   GLboolean Map1TextureCoord3;
-   GLboolean Map1TextureCoord4;
-   GLboolean Map1Vertex3;
-   GLboolean Map1Vertex4;
-   GLboolean Map1Attrib[16];  /* GL_NV_vertex_program */
-   GLboolean Map2Color4;
-   GLboolean Map2Index;
-   GLboolean Map2Normal;
-   GLboolean Map2TextureCoord1;
-   GLboolean Map2TextureCoord2;
-   GLboolean Map2TextureCoord3;
-   GLboolean Map2TextureCoord4;
-   GLboolean Map2Vertex3;
-   GLboolean Map2Vertex4;
-   GLboolean Map2Attrib[16];  /* GL_NV_vertex_program */
-   GLboolean MinMax;
-   GLboolean Normalize;
-   GLboolean PixelTexture;
-   GLboolean PointSmooth;
-   GLboolean PolygonOffsetPoint;
-   GLboolean PolygonOffsetLine;
-   GLboolean PolygonOffsetFill;
-   GLboolean PolygonSmooth;
-   GLboolean PolygonStipple;
-   GLboolean RescaleNormals;
-   GLboolean Scissor;
-   GLboolean Stencil;
-   GLboolean StencilTwoSide;          /* GL_EXT_stencil_two_side */
-   GLboolean MultisampleEnabled;      /* GL_ARB_multisample */
-   GLboolean SampleAlphaToCoverage;   /* GL_ARB_multisample */
-   GLboolean SampleAlphaToOne;        /* GL_ARB_multisample */
-   GLboolean SampleCoverage;          /* GL_ARB_multisample */
-   GLboolean SampleCoverageInvert;    /* GL_ARB_multisample */
-   GLboolean RasterPositionUnclipped; /* GL_IBM_rasterpos_clip */
-   GLuint Texture[MAX_TEXTURE_UNITS];
-   GLuint TexGen[MAX_TEXTURE_UNITS];
-   /* SGI_texture_color_table */
-   GLboolean TextureColorTable[MAX_TEXTURE_UNITS];
-   /* GL_ARB_vertex_program / GL_NV_vertex_program */
-   GLboolean VertexProgram;
-   GLboolean VertexProgramPointSize;
-   GLboolean VertexProgramTwoSide;
-   /* GL_ARB_point_sprite / GL_NV_point_sprite */
-   GLboolean PointSprite;
-   GLboolean FragmentShaderATI;
-};
-
-
 /**
  * Evaluator attribute group (GL_EVAL_BIT).
  */
-- 
cgit v1.2.3


From 7f25d9ebb4856273c46ea4bbba4152b85f610a91 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 27 Feb 2009 22:01:40 -0700
Subject: mesa: move gl_attrib_node struct to attrib.c too

---
 src/mesa/main/attrib.c | 12 ++++++++++++
 src/mesa/main/mtypes.h | 12 +-----------
 2 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index baad214263..de27917709 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -142,6 +142,18 @@ struct gl_enable_attrib
 };
 
 
+/**
+ * Node for the attribute stack.
+ */
+struct gl_attrib_node
+{
+   GLbitfield kind;
+   void *data;
+   struct gl_attrib_node *next;
+};
+
+
+
 /**
  * Special struct for saving/restoring texture state (GL_TEXTURE_BIT)
  */
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index a758c12d6f..315295b5b3 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -115,6 +115,7 @@ typedef int GLfixed;
  */
 /*@{*/
 struct _mesa_HashTable;
+struct gl_attrib_node;
 struct gl_pixelstore_attrib;
 struct gl_program_cache;
 struct gl_texture_format;
@@ -1516,17 +1517,6 @@ struct gl_viewport_attrib
 };
 
 
-/**
- * Node for the attribute stack.
- */
-struct gl_attrib_node
-{
-   GLbitfield kind;
-   void *data;
-   struct gl_attrib_node *next;
-};
-
-
 /**
  * GL_ARB_vertex/pixel_buffer_object buffer object
  */
-- 
cgit v1.2.3


From f6021ab3c631345d013437d53a7bc1a4e2359ad4 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 27 Feb 2009 22:04:58 -0700
Subject: mesa: remove dead code

---
 src/mesa/main/feedback.c | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/feedback.c b/src/mesa/main/feedback.c
index 48c2ccbff3..69b235a3e5 100644
--- a/src/mesa/main/feedback.c
+++ b/src/mesa/main/feedback.c
@@ -126,20 +126,8 @@ void _mesa_feedback_vertex( GLcontext *ctx,
                             GLfloat index,
                             const GLfloat texcoord[4] )
 {
-#if 0
-   {
-      /* snap window x, y to fractional pixel position */
-      const GLint snapMask = ~((FIXED_ONE / (1 << SUB_PIXEL_BITS)) - 1);
-      GLfixed x, y;
-      x = FloatToFixed(win[0]) & snapMask;
-      y = FloatToFixed(win[1]) & snapMask;
-      FEEDBACK_TOKEN(ctx, FixedToFloat(x));
-      FEEDBACK_TOKEN(ctx, FixedToFloat(y) );
-   }
-#else
    FEEDBACK_TOKEN( ctx, win[0] );
    FEEDBACK_TOKEN( ctx, win[1] );
-#endif
    if (ctx->Feedback._Mask & FB_3D) {
       FEEDBACK_TOKEN( ctx, win[2] );
    }
-- 
cgit v1.2.3


From 559aec47015b741e045d57362f7732b3a04f9450 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 27 Feb 2009 22:12:31 -0700
Subject: mesa: comments, whitespace, reformatting

---
 src/mesa/main/feedback.c | 37 ++++++++++++++++++++-----------------
 src/mesa/main/feedback.h | 28 +++++++++++++---------------
 2 files changed, 33 insertions(+), 32 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/feedback.c b/src/mesa/main/feedback.c
index 69b235a3e5..9a62db0be3 100644
--- a/src/mesa/main/feedback.c
+++ b/src/mesa/main/feedback.c
@@ -1,13 +1,9 @@
-/**
- * \file feedback.c
- * Selection and feedback modes functions.
- */
-
 /*
  * Mesa 3-D graphics library
- * Version:  5.1
+ * Version:  7.5
  *
- * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -27,6 +23,11 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+/**
+ * \file feedback.c
+ * Selection and feedback modes functions.
+ */
+
 
 #include "glheader.h"
 #include "colormac.h"
@@ -116,15 +117,15 @@ _mesa_PassThrough( GLfloat token )
 }
 
 
-
-/*
+/**
  * Put a vertex into the feedback buffer.
  */
-void _mesa_feedback_vertex( GLcontext *ctx,
-                            const GLfloat win[4],
-                            const GLfloat color[4],
-                            GLfloat index,
-                            const GLfloat texcoord[4] )
+void
+_mesa_feedback_vertex(GLcontext *ctx,
+                      const GLfloat win[4],
+                      const GLfloat color[4],
+                      GLfloat index,
+                      const GLfloat texcoord[4])
 {
    FEEDBACK_TOKEN( ctx, win[0] );
    FEEDBACK_TOKEN( ctx, win[1] );
@@ -151,7 +152,7 @@ void _mesa_feedback_vertex( GLcontext *ctx,
    }
 }
 
-#endif
+#endif /* _HAVE_FULL_GL */
 
 
 /**********************************************************************/
@@ -217,7 +218,8 @@ _mesa_SelectBuffer( GLsizei size, GLuint *buffer )
  * Sets gl_selection::HitFlag and updates gl_selection::HitMinZ and
  * gl_selection::HitMaxZ.
  */
-void _mesa_update_hitflag( GLcontext *ctx, GLfloat z )
+void
+_mesa_update_hitflag(GLcontext *ctx, GLfloat z)
 {
    ctx->Select.HitFlag = GL_TRUE;
    if (z < ctx->Select.HitMinZ) {
@@ -240,7 +242,8 @@ void _mesa_update_hitflag( GLcontext *ctx, GLfloat z )
  *
  * \sa gl_selection.
  */
-static void write_hit_record( GLcontext *ctx )
+static void
+write_hit_record(GLcontext *ctx)
 {
    GLuint i;
    GLuint zmin, zmax, zscale = (~0u);
diff --git a/src/mesa/main/feedback.h b/src/mesa/main/feedback.h
index 6c448ad631..c6478b02e1 100644
--- a/src/mesa/main/feedback.h
+++ b/src/mesa/main/feedback.h
@@ -1,13 +1,9 @@
-/**
- * \file feedback.h
- * Selection and feedback modes functions.
- */
-
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  7.5
  *
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -27,7 +23,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
 #ifndef FEEDBACK_H
 #define FEEDBACK_H
 
@@ -42,16 +37,19 @@
 	CTX->Feedback.Count++;
 
 
-extern void _mesa_init_feedback( GLcontext * ctx );
+extern void
+_mesa_init_feedback( GLcontext *ctx );
 
-extern void _mesa_feedback_vertex( GLcontext *ctx,
-                                const GLfloat win[4],
-                                const GLfloat color[4],
-				GLfloat index,
-                                const GLfloat texcoord[4] );
+extern void
+_mesa_feedback_vertex( GLcontext *ctx,
+                       const GLfloat win[4],
+                       const GLfloat color[4],
+                       GLfloat index,
+                       const GLfloat texcoord[4] );
 
 
-extern void _mesa_update_hitflag( GLcontext *ctx, GLfloat z );
+extern void
+_mesa_update_hitflag( GLcontext *ctx, GLfloat z );
 
 
 extern void GLAPIENTRY
-- 
cgit v1.2.3


From bf8a187f71bd667a0dc0f70164a897d8e62361a8 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 27 Feb 2009 22:18:33 -0700
Subject: mesa: replace FEEDBACK_TOKEN macro with _mesa_feedback_token() inline
 function

---
 src/mesa/main/drawpix.c      |  8 ++++----
 src/mesa/main/feedback.c     | 31 ++++++++++++++++---------------
 src/mesa/main/feedback.h     | 17 ++++++++++-------
 src/mesa/swrast/s_feedback.c |  8 ++++----
 4 files changed, 34 insertions(+), 30 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index 13cfa0e756..e9de0c097a 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -103,7 +103,7 @@ _mesa_DrawPixels( GLsizei width, GLsizei height,
    else if (ctx->RenderMode == GL_FEEDBACK) {
       /* Feedback the current raster pos info */
       FLUSH_CURRENT( ctx, 0 );
-      FEEDBACK_TOKEN( ctx, (GLfloat) (GLint) GL_DRAW_PIXEL_TOKEN );
+      _mesa_feedback_token( ctx, (GLfloat) (GLint) GL_DRAW_PIXEL_TOKEN );
       _mesa_feedback_vertex( ctx,
                              ctx->Current.RasterPos,
                              ctx->Current.RasterColor,
@@ -166,7 +166,7 @@ _mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height,
    }
    else if (ctx->RenderMode == GL_FEEDBACK) {
       FLUSH_CURRENT( ctx, 0 );
-      FEEDBACK_TOKEN( ctx, (GLfloat) (GLint) GL_COPY_PIXEL_TOKEN );
+      _mesa_feedback_token( ctx, (GLfloat) (GLint) GL_COPY_PIXEL_TOKEN );
       _mesa_feedback_vertex( ctx, 
                              ctx->Current.RasterPos,
                              ctx->Current.RasterColor,
@@ -243,7 +243,7 @@ _mesa_Bitmap( GLsizei width, GLsizei height,
 #if _HAVE_FULL_GL
    else if (ctx->RenderMode == GL_FEEDBACK) {
       FLUSH_CURRENT(ctx, 0);
-      FEEDBACK_TOKEN( ctx, (GLfloat) (GLint) GL_BITMAP_TOKEN );
+      _mesa_feedback_token( ctx, (GLfloat) (GLint) GL_BITMAP_TOKEN );
       _mesa_feedback_vertex( ctx,
                              ctx->Current.RasterPos,
                              ctx->Current.RasterColor,
@@ -311,7 +311,7 @@ _mesa_DrawDepthPixelsMESA( GLsizei width, GLsizei height,
    else if (ctx->RenderMode == GL_FEEDBACK) {
       /* Feedback the current raster pos info */
       FLUSH_CURRENT( ctx, 0 );
-      FEEDBACK_TOKEN( ctx, (GLfloat) (GLint) GL_DRAW_PIXEL_TOKEN );
+      _mesa_feedback_token( ctx, (GLfloat) (GLint) GL_DRAW_PIXEL_TOKEN );
       _mesa_feedback_vertex( ctx,
                              ctx->Current.RasterPos,
                              ctx->Current.RasterColor,
diff --git a/src/mesa/main/feedback.c b/src/mesa/main/feedback.c
index 9a62db0be3..5073ccbef5 100644
--- a/src/mesa/main/feedback.c
+++ b/src/mesa/main/feedback.c
@@ -111,8 +111,8 @@ _mesa_PassThrough( GLfloat token )
 
    if (ctx->RenderMode==GL_FEEDBACK) {
       FLUSH_VERTICES(ctx, 0);
-      FEEDBACK_TOKEN( ctx, (GLfloat) (GLint) GL_PASS_THROUGH_TOKEN );
-      FEEDBACK_TOKEN( ctx, token );
+      _mesa_feedback_token( ctx, (GLfloat) (GLint) GL_PASS_THROUGH_TOKEN );
+      _mesa_feedback_token( ctx, token );
    }
 }
 
@@ -127,31 +127,32 @@ _mesa_feedback_vertex(GLcontext *ctx,
                       GLfloat index,
                       const GLfloat texcoord[4])
 {
-   FEEDBACK_TOKEN( ctx, win[0] );
-   FEEDBACK_TOKEN( ctx, win[1] );
+   _mesa_feedback_token( ctx, win[0] );
+   _mesa_feedback_token( ctx, win[1] );
    if (ctx->Feedback._Mask & FB_3D) {
-      FEEDBACK_TOKEN( ctx, win[2] );
+      _mesa_feedback_token( ctx, win[2] );
    }
    if (ctx->Feedback._Mask & FB_4D) {
-      FEEDBACK_TOKEN( ctx, win[3] );
+      _mesa_feedback_token( ctx, win[3] );
    }
    if (ctx->Feedback._Mask & FB_INDEX) {
-      FEEDBACK_TOKEN( ctx, (GLfloat) index );
+      _mesa_feedback_token( ctx, (GLfloat) index );
    }
    if (ctx->Feedback._Mask & FB_COLOR) {
-      FEEDBACK_TOKEN( ctx, color[0] );
-      FEEDBACK_TOKEN( ctx, color[1] );
-      FEEDBACK_TOKEN( ctx, color[2] );
-      FEEDBACK_TOKEN( ctx, color[3] );
+      _mesa_feedback_token( ctx, color[0] );
+      _mesa_feedback_token( ctx, color[1] );
+      _mesa_feedback_token( ctx, color[2] );
+      _mesa_feedback_token( ctx, color[3] );
    }
    if (ctx->Feedback._Mask & FB_TEXTURE) {
-      FEEDBACK_TOKEN( ctx, texcoord[0] );
-      FEEDBACK_TOKEN( ctx, texcoord[1] );
-      FEEDBACK_TOKEN( ctx, texcoord[2] );
-      FEEDBACK_TOKEN( ctx, texcoord[3] );
+      _mesa_feedback_token( ctx, texcoord[0] );
+      _mesa_feedback_token( ctx, texcoord[1] );
+      _mesa_feedback_token( ctx, texcoord[2] );
+      _mesa_feedback_token( ctx, texcoord[3] );
    }
 }
 
+
 #endif /* _HAVE_FULL_GL */
 
 
diff --git a/src/mesa/main/feedback.h b/src/mesa/main/feedback.h
index c6478b02e1..72c2acd5ed 100644
--- a/src/mesa/main/feedback.h
+++ b/src/mesa/main/feedback.h
@@ -30,13 +30,6 @@
 #include "mtypes.h"
 
 
-#define FEEDBACK_TOKEN( CTX, T )				\
-	if (CTX->Feedback.Count < CTX->Feedback.BufferSize) {	\
-	   CTX->Feedback.Buffer[CTX->Feedback.Count] = (GLfloat) (T); \
-	}							\
-	CTX->Feedback.Count++;
-
-
 extern void
 _mesa_init_feedback( GLcontext *ctx );
 
@@ -48,6 +41,16 @@ _mesa_feedback_vertex( GLcontext *ctx,
                        const GLfloat texcoord[4] );
 
 
+static INLINE void
+_mesa_feedback_token( GLcontext *ctx, GLfloat token )
+{
+   if (ctx->Feedback.Count < ctx->Feedback.BufferSize) {
+      ctx->Feedback.Buffer[ctx->Feedback.Count] = token;
+   }
+   ctx->Feedback.Count++;
+}
+
+
 extern void
 _mesa_update_hitflag( GLcontext *ctx, GLfloat z );
 
diff --git a/src/mesa/swrast/s_feedback.c b/src/mesa/swrast/s_feedback.c
index aa79531277..7bb914b658 100644
--- a/src/mesa/swrast/s_feedback.c
+++ b/src/mesa/swrast/s_feedback.c
@@ -59,8 +59,8 @@ _swrast_feedback_triangle(GLcontext *ctx, const SWvertex *v0,
                           const SWvertex *v1, const SWvertex *v2)
 {
    if (_swrast_culltriangle(ctx, v0, v1, v2)) {
-      FEEDBACK_TOKEN(ctx, (GLfloat) (GLint) GL_POLYGON_TOKEN);
-      FEEDBACK_TOKEN(ctx, (GLfloat) 3); /* three vertices */
+      _mesa_feedback_token(ctx, (GLfloat) (GLint) GL_POLYGON_TOKEN);
+      _mesa_feedback_token(ctx, (GLfloat) 3); /* three vertices */
 
       if (ctx->Light.ShadeModel == GL_SMOOTH) {
          feedback_vertex(ctx, v0, v0);
@@ -86,7 +86,7 @@ _swrast_feedback_line(GLcontext *ctx, const SWvertex *v0,
    if (swrast->StippleCounter == 0)
       token = GL_LINE_RESET_TOKEN;
 
-   FEEDBACK_TOKEN(ctx, (GLfloat) (GLint) token);
+   _mesa_feedback_token(ctx, (GLfloat) (GLint) token);
 
    if (ctx->Light.ShadeModel == GL_SMOOTH) {
       feedback_vertex(ctx, v0, v0);
@@ -104,7 +104,7 @@ _swrast_feedback_line(GLcontext *ctx, const SWvertex *v0,
 void
 _swrast_feedback_point(GLcontext *ctx, const SWvertex *v)
 {
-   FEEDBACK_TOKEN(ctx, (GLfloat) (GLint) GL_POINT_TOKEN);
+   _mesa_feedback_token(ctx, (GLfloat) (GLint) GL_POINT_TOKEN);
    feedback_vertex(ctx, v, v);
 }
 
-- 
cgit v1.2.3


From 8bf25a17d2f8f888e8e8a4f7a2c6d68c6c06f6e8 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 27 Feb 2009 22:21:42 -0700
Subject: mesa: convert macro to inline function

---
 src/mesa/main/feedback.c | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/feedback.c b/src/mesa/main/feedback.c
index 5073ccbef5..beab535b15 100644
--- a/src/mesa/main/feedback.c
+++ b/src/mesa/main/feedback.c
@@ -203,11 +203,14 @@ _mesa_SelectBuffer( GLsizei size, GLuint *buffer )
  * Verifies there is free space in the buffer to write the value and
  * increments the pointer.
  */
-#define WRITE_RECORD( CTX, V )					\
-	if (CTX->Select.BufferCount < CTX->Select.BufferSize) {	\
-	   CTX->Select.Buffer[CTX->Select.BufferCount] = (V);	\
-	}							\
-	CTX->Select.BufferCount++;
+static INLINE void
+write_record(GLcontext *ctx, GLuint value)
+{
+   if (ctx->Select.BufferCount < ctx->Select.BufferSize) {
+      ctx->Select.Buffer[ctx->Select.BufferCount] = value;
+   }
+   ctx->Select.BufferCount++;
+}
 
 
 /**
@@ -256,11 +259,11 @@ write_hit_record(GLcontext *ctx)
    zmin = (GLuint) ((GLfloat) zscale * ctx->Select.HitMinZ);
    zmax = (GLuint) ((GLfloat) zscale * ctx->Select.HitMaxZ);
 
-   WRITE_RECORD( ctx, ctx->Select.NameStackDepth );
-   WRITE_RECORD( ctx, zmin );
-   WRITE_RECORD( ctx, zmax );
+   write_record( ctx, ctx->Select.NameStackDepth );
+   write_record( ctx, zmin );
+   write_record( ctx, zmax );
    for (i = 0; i < ctx->Select.NameStackDepth; i++) {
-      WRITE_RECORD( ctx, ctx->Select.NameStack[i] );
+      write_record( ctx, ctx->Select.NameStack[i] );
    }
 
    ctx->Select.Hits++;
-- 
cgit v1.2.3


From 389d50baff8234fdf4d7bcddeb09658d7d17012d Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 27 Feb 2009 22:26:18 -0700
Subject: mesa: move GLfixed type and related macros to swrast module

Fixed point is only used in swrast and sw-based drivers.
---
 src/mesa/main/mtypes.h      | 32 --------------------------------
 src/mesa/swrast/s_context.h | 28 ++++++++++++++++++++++++++++
 src/mesa/swrast/swrast.h    |  6 ++++++
 3 files changed, 34 insertions(+), 32 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 315295b5b3..2801f61948 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -78,38 +78,6 @@
 #endif
 
 
-/**
- * Fixed point data type.
- */
-typedef int GLfixed;
-/*
- * Fixed point arithmetic macros
- */
-#ifndef FIXED_FRAC_BITS
-#define FIXED_FRAC_BITS 11
-#endif
-
-#define FIXED_SHIFT     FIXED_FRAC_BITS
-#define FIXED_ONE       (1 << FIXED_SHIFT)
-#define FIXED_HALF      (1 << (FIXED_SHIFT-1))
-#define FIXED_FRAC_MASK (FIXED_ONE - 1)
-#define FIXED_INT_MASK  (~FIXED_FRAC_MASK)
-#define FIXED_EPSILON   1
-#define FIXED_SCALE     ((float) FIXED_ONE)
-#define FIXED_DBL_SCALE ((double) FIXED_ONE)
-#define FloatToFixed(X) (IROUND((X) * FIXED_SCALE))
-#define FixedToDouble(X) ((X) * (1.0 / FIXED_DBL_SCALE))
-#define IntToFixed(I)   ((I) << FIXED_SHIFT)
-#define FixedToInt(X)   ((X) >> FIXED_SHIFT)
-#define FixedToUns(X)   (((unsigned int)(X)) >> FIXED_SHIFT)
-#define FixedCeil(X)    (((X) + FIXED_ONE - FIXED_EPSILON) & FIXED_INT_MASK)
-#define FixedFloor(X)   ((X) & FIXED_INT_MASK)
-#define FixedToFloat(X) ((X) * (1.0F / FIXED_SCALE))
-#define PosFloatToFixed(X)      FloatToFixed(X)
-#define SignedFloatToFixed(X)   FloatToFixed(X)
-
-
-
 /**
  * \name Some forward type declarations
  */
diff --git a/src/mesa/swrast/s_context.h b/src/mesa/swrast/s_context.h
index cdd6fa5048..6e8d080704 100644
--- a/src/mesa/swrast/s_context.h
+++ b/src/mesa/swrast/s_context.h
@@ -288,6 +288,34 @@ swrast_render_finish(GLcontext *ctx)
 
 
 
+/*
+ * Fixed point arithmetic macros
+ */
+#ifndef FIXED_FRAC_BITS
+#define FIXED_FRAC_BITS 11
+#endif
+
+#define FIXED_SHIFT     FIXED_FRAC_BITS
+#define FIXED_ONE       (1 << FIXED_SHIFT)
+#define FIXED_HALF      (1 << (FIXED_SHIFT-1))
+#define FIXED_FRAC_MASK (FIXED_ONE - 1)
+#define FIXED_INT_MASK  (~FIXED_FRAC_MASK)
+#define FIXED_EPSILON   1
+#define FIXED_SCALE     ((float) FIXED_ONE)
+#define FIXED_DBL_SCALE ((double) FIXED_ONE)
+#define FloatToFixed(X) (IROUND((X) * FIXED_SCALE))
+#define FixedToDouble(X) ((X) * (1.0 / FIXED_DBL_SCALE))
+#define IntToFixed(I)   ((I) << FIXED_SHIFT)
+#define FixedToInt(X)   ((X) >> FIXED_SHIFT)
+#define FixedToUns(X)   (((unsigned int)(X)) >> FIXED_SHIFT)
+#define FixedCeil(X)    (((X) + FIXED_ONE - FIXED_EPSILON) & FIXED_INT_MASK)
+#define FixedFloor(X)   ((X) & FIXED_INT_MASK)
+#define FixedToFloat(X) ((X) * (1.0F / FIXED_SCALE))
+#define PosFloatToFixed(X)      FloatToFixed(X)
+#define SignedFloatToFixed(X)   FloatToFixed(X)
+
+
+
 /*
  * XXX these macros are just bandages for now in order to make
  * CHAN_BITS==32 compile cleanly.
diff --git a/src/mesa/swrast/swrast.h b/src/mesa/swrast/swrast.h
index 047f7991e6..015f8a05c3 100644
--- a/src/mesa/swrast/swrast.h
+++ b/src/mesa/swrast/swrast.h
@@ -75,6 +75,12 @@ typedef struct {
 } SWvertex;
 
 
+/**
+ * Fixed point data type.
+ */
+typedef int GLfixed;
+
+
 #define FRAG_ATTRIB_CI FRAG_ATTRIB_COL0
 
 
-- 
cgit v1.2.3


From ae5c06b9ce1191afaa95dd784d7315f25ec729ff Mon Sep 17 00:00:00 2001
From: David Miller <davem@davemloft.net>
Date: Fri, 27 Feb 2009 23:34:41 -0800
Subject: mesa: Sparc's IROUND() optimization is invalid.

We can't use the "fstoi" instruction like this.

Unlike other floating point instructions, "fstoi" always rounds
towards zero no matter what rounding mode the FPU has been set to.

This was validated using the following test program:

--------------------
static inline int iround(float f)
{
   int r;
   __asm__ ("fstoi %1, %0" : "=f" (r) : "f" (f));
   return r;
}
#define IROUND(x)  iround(x)

#define IROUND_REF(f)  ((int) (((f) >= 0.0F) ? ((f) + 0.5F) : ((f) - 0.5F)))

int main(void)
{
	float f = -2.0;

	while (f < 3.0f) {
		int sparc_val = IROUND(f);
		int ref_val = IROUND_REF(f);

		if (sparc_val != ref_val)
			printf("DIFFERENT[%f]: REF==%d SPARC==%d\n",
			       f, ref_val, sparc_val);
		f += 0.1f;
	}

	return 0;
}
--------------------

which prints out things like:

--------------------
DIFFERENT[-1.900000]: REF==-2 SPARC==-1
DIFFERENT[-1.800000]: REF==-2 SPARC==-1
DIFFERENT[-1.700000]: REF==-2 SPARC==-1
DIFFERENT[-1.600000]: REF==-2 SPARC==-1
DIFFERENT[-1.000000]: REF==-1 SPARC==0
DIFFERENT[-0.900000]: REF==-1 SPARC==0
DIFFERENT[-0.800000]: REF==-1 SPARC==0
DIFFERENT[-0.700000]: REF==-1 SPARC==0
DIFFERENT[-0.600000]: REF==-1 SPARC==0
DIFFERENT[0.500000]: REF==1 SPARC==0
DIFFERENT[0.600000]: REF==1 SPARC==0
...
--------------------

So we have to remove Sparc's IROUND() definition, it's wrong.

Signed-off-by: David S. Miller <davem@davemloft.net>
---
 src/mesa/main/imports.h | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index 4192f037c0..7b61e22e93 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -256,15 +256,7 @@ static INLINE int GET_FLOAT_BITS( float x )
 /***
  *** IROUND: return (as an integer) float rounded to nearest integer
  ***/
-#if defined(USE_SPARC_ASM) && defined(__GNUC__) && defined(__sparc__)
-static INLINE int iround(float f)
-{
-   int r;
-   __asm__ ("fstoi %1, %0" : "=f" (r) : "f" (f));
-   return r;
-}
-#define IROUND(x)  iround(x)
-#elif defined(USE_X86_ASM) && defined(__GNUC__) && defined(__i386__) && \
+#if defined(USE_X86_ASM) && defined(__GNUC__) && defined(__i386__) && \
 			(!(defined(__BEOS__) || defined(__HAIKU__))  || \
 			(__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)))
 static INLINE int iround(float f)
-- 
cgit v1.2.3


From b7ebc270a4b464eb2136e9c45fdfeed798c007c8 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Sat, 28 Feb 2009 10:08:22 -0700
Subject: mesa: move #include "bitset.h" out of mtypes.h - not needed in core
 Mesa

---
 src/mesa/main/mtypes.h   | 1 -
 src/mesa/tnl/t_context.h | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 2801f61948..f608ac42a8 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -38,7 +38,6 @@
 #include "main/config.h"
 #include "main/compiler.h"
 #include "main/mfeatures.h"
-#include "main/bitset.h"
 #include "glapi/glapi.h"
 #include "math/m_matrix.h"	/* GLmatrix */
 
diff --git a/src/mesa/tnl/t_context.h b/src/mesa/tnl/t_context.h
index 0a6ce04614..c19eb3df3c 100644
--- a/src/mesa/tnl/t_context.h
+++ b/src/mesa/tnl/t_context.h
@@ -50,6 +50,7 @@
 #define _T_CONTEXT_H
 
 #include "main/glheader.h"
+#include "main/bitset.h"
 #include "main/mtypes.h"
 
 #include "math/m_matrix.h"
-- 
cgit v1.2.3


From c50c2e4e986024c728cc35e56e56250e947080a6 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 27 Feb 2009 16:44:28 -0700
Subject: mesa: move _GenFlags = 0x0 to texgen loop

---
 src/mesa/main/texstate.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 3e6b09baa1..e25c9e732c 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -550,7 +550,6 @@ update_texture_state( GLcontext *ctx )
 
       texUnit->_Current = NULL;
       texUnit->_ReallyEnabled = 0x0;
-      texUnit->_GenFlags = 0x0;
 
       /* Get the bitmask of texture target enables.
        * enableBits will be a mask of the TEXTURE_*_BIT flags indicating
@@ -609,6 +608,8 @@ update_texture_state( GLcontext *ctx )
    for (unit = 0; unit < ctx->Const.MaxTextureCoordUnits; unit++) {
       struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
 
+      texUnit->_GenFlags = 0x0;
+
       if (!(ctx->Texture._EnabledCoordUnits & (1 << unit)))
 	 continue;
 
-- 
cgit v1.2.3


From 4c4268dd31ce119d5d3db090adf0935bf3c27831 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Sat, 28 Feb 2009 10:58:57 -0700
Subject: mesa: convert some #defines to enums

This makes debugging with gdb a bit easier.
Ex:
(gdb) p ctx->DrawBuffer.Attachment[BUFFER_STENCIL]

Note however that gdb only seems to recognize enum types that are actually
used to declare a variable somewhere.  For example, gl_buffer_index isn't
used to declare any vars so it's invisible to gdb.  Work around this by
adding a dummy function in context.c that declares some vars with these
new types.
---
 src/mesa/main/context.c |  32 +++++++++++++++
 src/mesa/main/mtypes.h  | 103 +++++++++++++++++++++++++-----------------------
 2 files changed, 86 insertions(+), 49 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index fb43054cdd..97ee925c0b 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -351,6 +351,36 @@ _mesa_destroy_visual( GLvisual *vis )
 /**********************************************************************/
 /*@{*/
 
+
+/**
+ * This is lame.  gdb only seems to recognize enum types that are
+ * actually used somewhere.  We want to be able to print/use enum
+ * values such as TEXTURE_2D_INDEX in gdb.  But we don't actually use
+ * the gl_texture_index type anywhere.  Thus, this lame function.
+ */
+static void
+dummy_enum_func(void)
+{
+   gl_buffer_index bi;
+   gl_colortable_index ci;
+   gl_face_index fi;
+   gl_frag_attrib fa;
+   gl_frag_result fr;
+   gl_texture_index ti;
+   gl_vert_attrib va;
+   gl_vert_result vr;
+
+   (void) bi;
+   (void) ci;
+   (void) fi;
+   (void) fa;
+   (void) fr;
+   (void) ti;
+   (void) va;
+   (void) vr;
+}
+
+
 /**
  * One-time initialization mutex lock.
  *
@@ -406,6 +436,8 @@ one_time_init( GLcontext *ctx )
       alreadyCalled = GL_TRUE;
    }
    _glthread_UNLOCK_MUTEX(OneTimeLock);
+
+   dummy_enum_func();
 }
 
 
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index f608ac42a8..22add9d975 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -103,7 +103,7 @@ typedef struct gl_framebuffer GLframebuffer;
  * In GL_ARB_vertex_shader / OpenGL 2.0 the aliasing is disallowed (the
  * generic attributes are distinct/separate).
  */
-enum
+typedef enum
 {
    VERT_ATTRIB_POS = 0,
    VERT_ATTRIB_WEIGHT = 1,
@@ -139,7 +139,7 @@ enum
    VERT_ATTRIB_GENERIC14 = 30,
    VERT_ATTRIB_GENERIC15 = 31,
    VERT_ATTRIB_MAX = 32
-};
+} gl_vert_attrib;
 
 /**
  * Bitflags for vertex attributes.
@@ -187,8 +187,7 @@ enum
 /**
  * Indexes for vertex program result attributes
  */
-/*@{*/
-enum
+typedef enum
 {
    VERT_RESULT_HPOS = 0,
    VERT_RESULT_COL0 = 1,
@@ -208,14 +207,13 @@ enum
    VERT_RESULT_EDGE = 15,
    VERT_RESULT_VAR0 = 16  /**< shader varying */,
    VERT_RESULT_MAX = (VERT_RESULT_VAR0 + MAX_VARYING)
-};
-/*@}*/
+} gl_vert_result;
 
 
 /**
  * Indexes for fragment program input attributes.
  */
-enum
+typedef enum
 {
    FRAG_ATTRIB_WPOS = 0,
    FRAG_ATTRIB_COL0 = 1,
@@ -231,7 +229,7 @@ enum
    FRAG_ATTRIB_TEX7 = 11,
    FRAG_ATTRIB_VAR0 = 12,  /**< shader varying */
    FRAG_ATTRIB_MAX = (FRAG_ATTRIB_VAR0 + MAX_VARYING)
-};
+} gl_frag_attrib;
 
 /**
  * Bitflags for fragment program input attributes.
@@ -268,41 +266,45 @@ enum
 /**
  * Fragment program results
  */
-enum
+typedef enum
 {
    FRAG_RESULT_COLR = 0,
    FRAG_RESULT_COLH = 1,
    FRAG_RESULT_DEPR = 2,
    FRAG_RESULT_DATA0 = 3,
    FRAG_RESULT_MAX = (FRAG_RESULT_DATA0 + MAX_DRAW_BUFFERS)
-};
+} gl_frag_result;
 
 
 /**
  * Indexes for all renderbuffers
  */
-enum {
-   BUFFER_FRONT_LEFT  = 0,  /* the four standard color buffers */
-   BUFFER_BACK_LEFT   = 1,
-   BUFFER_FRONT_RIGHT = 2,
-   BUFFER_BACK_RIGHT  = 3,
-   BUFFER_AUX0        = 4,  /* optional aux buffer */
-   BUFFER_AUX1        = 5,
-   BUFFER_AUX2        = 6,
-   BUFFER_AUX3        = 7,
-   BUFFER_DEPTH       = 8,
-   BUFFER_STENCIL     = 9,
-   BUFFER_ACCUM       = 10,
-   BUFFER_COLOR0      = 11, /* generic renderbuffers */
-   BUFFER_COLOR1      = 12,
-   BUFFER_COLOR2      = 13,
-   BUFFER_COLOR3      = 14,
-   BUFFER_COLOR4      = 15,
-   BUFFER_COLOR5      = 16,
-   BUFFER_COLOR6      = 17,
-   BUFFER_COLOR7      = 18,
-   BUFFER_COUNT       = 19
-};
+typedef enum
+{
+   /* the four standard color buffers */
+   BUFFER_FRONT_LEFT,
+   BUFFER_BACK_LEFT,
+   BUFFER_FRONT_RIGHT,
+   BUFFER_BACK_RIGHT,
+   /* optional aux buffers */
+   BUFFER_AUX0,
+   BUFFER_AUX1,
+   BUFFER_AUX2,
+   BUFFER_AUX3,
+   BUFFER_DEPTH,
+   BUFFER_STENCIL,
+   BUFFER_ACCUM,
+   /* generic renderbuffers */
+   BUFFER_COLOR0,
+   BUFFER_COLOR1,
+   BUFFER_COLOR2,
+   BUFFER_COLOR3,
+   BUFFER_COLOR4,
+   BUFFER_COLOR5,
+   BUFFER_COLOR6,
+   BUFFER_COLOR7,
+   BUFFER_COUNT
+} gl_buffer_index;
 
 /**
  * Bit flags for all renderbuffers
@@ -349,12 +351,13 @@ enum {
 
 
 /** The pixel transfer path has three color tables: */
-/*@{*/
-#define COLORTABLE_PRECONVOLUTION  0
-#define COLORTABLE_POSTCONVOLUTION 1
-#define COLORTABLE_POSTCOLORMATRIX 2
-#define COLORTABLE_MAX 3
-/*@}*/
+typedef enum
+{
+   COLORTABLE_PRECONVOLUTION,
+   COLORTABLE_POSTCONVOLUTION,
+   COLORTABLE_POSTCOLORMATRIX,
+   COLORTABLE_MAX
+} gl_colortable_index;
 
 
 /**
@@ -1034,7 +1037,8 @@ struct gl_stencil_attrib
  * target target enums, such as GL_TEXTURE_2D, GL_TEXTURE_CUBE_MAP, etc.
  * Note: the order is from highest priority to lowest priority.
  */
-enum {
+typedef enum
+{
    TEXTURE_2D_ARRAY_INDEX,
    TEXTURE_1D_ARRAY_INDEX,
    TEXTURE_CUBE_INDEX,
@@ -1043,7 +1047,7 @@ enum {
    TEXTURE_2D_INDEX,
    TEXTURE_1D_INDEX,
    NUM_TEXTURE_TARGETS
-};
+} gl_texture_index;
 
 
 /**
@@ -1273,15 +1277,16 @@ struct gl_texture_image
 /**
  * Indexes for cube map faces.
  */
-/*@{*/
-#define FACE_POS_X   0
-#define FACE_NEG_X   1
-#define FACE_POS_Y   2
-#define FACE_NEG_Y   3
-#define FACE_POS_Z   4
-#define FACE_NEG_Z   5
-#define MAX_FACES    6
-/*@}*/
+typedef enum
+{
+   FACE_POS_X = 0,
+   FACE_NEG_X = 1,
+   FACE_POS_Y = 2,
+   FACE_NEG_Y = 3,
+   FACE_POS_Z = 4,
+   FACE_NEG_Z = 5,
+   MAX_FACES = 6
+} gl_face_index;
 
 
 /**
-- 
cgit v1.2.3


From 8d475822e6e19fa79719c856a2db5b6a205db1b9 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Sat, 28 Feb 2009 11:49:46 -0700
Subject: mesa: rename, reorder FRAG_RESULT_x tokens

s/FRAG_RESULT_DEPR/FRAG_RESULT_DEPTH/
s/FRAG_RESULT_COLR/FRAG_RESULT/COLOR/
Remove FRAG_RESULT_COLH (NV half-precision) output since we never used it.
Next, we might merge the COLOR and DATA outputs (COLOR0, COLOR1, etc).
---
 src/mesa/drivers/dri/i915/i915_fragprog.c       |  4 +--
 src/mesa/drivers/dri/i965/brw_wm.c              |  2 +-
 src/mesa/drivers/dri/i965/brw_wm_fp.c           |  8 ++---
 src/mesa/drivers/dri/i965/brw_wm_state.c        |  2 +-
 src/mesa/drivers/dri/r300/r300_fragprog.c       |  4 +--
 src/mesa/drivers/dri/r300/r500_fragprog.c       |  4 +--
 src/mesa/drivers/dri/r300/radeon_nqssadce.c     |  2 +-
 src/mesa/drivers/dri/r300/radeon_program_pair.c |  4 +--
 src/mesa/main/mtypes.h                          |  7 ++---
 src/mesa/main/texenvprogram.c                   |  6 ++--
 src/mesa/shader/arbprogparse.c                  |  4 +--
 src/mesa/shader/nvfragparse.c                   | 40 ++++++++-----------------
 src/mesa/shader/nvfragparse.h                   |  5 ----
 src/mesa/shader/prog_debug.c                    | 12 +++-----
 src/mesa/shader/program.c                       |  6 ++--
 src/mesa/shader/programopt.c                    |  6 ++--
 src/mesa/shader/slang/slang_codegen.c           |  4 +--
 src/mesa/shader/slang/slang_link.c              |  2 +-
 src/mesa/state_tracker/st_atom_pixeltransfer.c  |  4 +--
 src/mesa/state_tracker/st_cb_drawpixels.c       | 10 +++----
 src/mesa/state_tracker/st_program.c             | 10 +++----
 src/mesa/swrast/s_context.c                     |  2 +-
 src/mesa/swrast/s_fragprog.c                    | 12 ++++----
 23 files changed, 68 insertions(+), 92 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/i915/i915_fragprog.c b/src/mesa/drivers/dri/i915/i915_fragprog.c
index f091d600c3..52f09a4b1b 100644
--- a/src/mesa/drivers/dri/i915/i915_fragprog.c
+++ b/src/mesa/drivers/dri/i915/i915_fragprog.c
@@ -180,9 +180,9 @@ get_result_vector(struct i915_fragment_program *p,
    switch (inst->DstReg.File) {
    case PROGRAM_OUTPUT:
       switch (inst->DstReg.Index) {
-      case FRAG_RESULT_COLR:
+      case FRAG_RESULT_COLOR:
          return UREG(REG_TYPE_OC, 0);
-      case FRAG_RESULT_DEPR:
+      case FRAG_RESULT_DEPTH:
          p->depth_written = 1;
          return UREG(REG_TYPE_OD, 0);
       default:
diff --git a/src/mesa/drivers/dri/i965/brw_wm.c b/src/mesa/drivers/dri/i965/brw_wm.c
index 10f38e02a4..06a6f3f0f4 100644
--- a/src/mesa/drivers/dri/i965/brw_wm.c
+++ b/src/mesa/drivers/dri/i965/brw_wm.c
@@ -198,7 +198,7 @@ static void brw_wm_populate_key( struct brw_context *brw,
        ctx->Color.AlphaEnabled)
       lookup |= IZ_PS_KILL_ALPHATEST_BIT;
 
-   if (fp->program.Base.OutputsWritten & (1<<FRAG_RESULT_DEPR))
+   if (fp->program.Base.OutputsWritten & (1<<FRAG_RESULT_DEPTH))
       lookup |= IZ_PS_COMPUTES_DEPTH_BIT;
 
    /* _NEW_DEPTH */
diff --git a/src/mesa/drivers/dri/i965/brw_wm_fp.c b/src/mesa/drivers/dri/i965/brw_wm_fp.c
index 977b9dd089..7e88ef0053 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_fp.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_fp.c
@@ -862,7 +862,7 @@ static void precalc_txp( struct brw_wm_compile *c,
 static void emit_fb_write( struct brw_wm_compile *c )
 {
    struct prog_src_register payload_r0_depth = src_reg(PROGRAM_PAYLOAD, PAYLOAD_DEPTH);
-   struct prog_src_register outdepth = src_reg(PROGRAM_OUTPUT, FRAG_RESULT_DEPR);
+   struct prog_src_register outdepth = src_reg(PROGRAM_OUTPUT, FRAG_RESULT_DEPTH);
    struct prog_src_register outcolor;
    GLuint i;
 
@@ -879,7 +879,7 @@ static void emit_fb_write( struct brw_wm_compile *c )
                                     outcolor, payload_r0_depth, outdepth);
          inst->Aux = (i<<1);
          if (c->fp_fragcolor_emitted) {
-            outcolor = src_reg(PROGRAM_OUTPUT, FRAG_RESULT_COLR);
+            outcolor = src_reg(PROGRAM_OUTPUT, FRAG_RESULT_COLOR);
             last_inst = inst = emit_op(c, WM_FB_WRITE, dst_mask(dst_undef(),0),
                                        0, outcolor, payload_r0_depth, outdepth);
             inst->Aux = (i<<1);
@@ -892,7 +892,7 @@ static void emit_fb_write( struct brw_wm_compile *c )
       if (c->fp->program.Base.OutputsWritten & (1 << FRAG_RESULT_DATA0))
          outcolor = src_reg(PROGRAM_OUTPUT, FRAG_RESULT_DATA0);
       else 
-         outcolor = src_reg(PROGRAM_OUTPUT, FRAG_RESULT_COLR);
+         outcolor = src_reg(PROGRAM_OUTPUT, FRAG_RESULT_COLOR);
 
       inst = emit_op(c, WM_FB_WRITE, dst_mask(dst_undef(),0),
                      0, outcolor, payload_r0_depth, outdepth);
@@ -928,7 +928,7 @@ static void validate_dst_regs( struct brw_wm_compile *c,
 {
    if (inst->DstReg.File == PROGRAM_OUTPUT) {
       GLuint idx = inst->DstReg.Index;
-      if (idx == FRAG_RESULT_COLR)
+      if (idx == FRAG_RESULT_COLOR)
          c->fp_fragcolor_emitted = 1;
    }
 }
diff --git a/src/mesa/drivers/dri/i965/brw_wm_state.c b/src/mesa/drivers/dri/i965/brw_wm_state.c
index 3c3b3473d6..f7ea756fb0 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_state.c
@@ -103,7 +103,7 @@ wm_unit_populate_key(struct brw_context *brw, struct brw_wm_unit_key *key)
 
    /* as far as we can tell */
    key->computes_depth =
-      (fp->Base.OutputsWritten & (1 << FRAG_RESULT_DEPR)) != 0;
+      (fp->Base.OutputsWritten & (1 << FRAG_RESULT_DEPTH)) != 0;
 
    /* _NEW_COLOR */
    key->uses_kill = fp->UsesKill || ctx->Color.AlphaEnabled;
diff --git a/src/mesa/drivers/dri/r300/r300_fragprog.c b/src/mesa/drivers/dri/r300/r300_fragprog.c
index 8d030c63fb..32182bb667 100644
--- a/src/mesa/drivers/dri/r300/r300_fragprog.c
+++ b/src/mesa/drivers/dri/r300/r300_fragprog.c
@@ -356,8 +356,8 @@ static void insert_WPOS_trailer(struct r300_fragment_program_compiler *compiler)
 
 static void nqssadce_init(struct nqssadce_state* s)
 {
-	s->Outputs[FRAG_RESULT_COLR].Sourced = WRITEMASK_XYZW;
-	s->Outputs[FRAG_RESULT_DEPR].Sourced = WRITEMASK_W;
+	s->Outputs[FRAG_RESULT_COLOR].Sourced = WRITEMASK_XYZW;
+	s->Outputs[FRAG_RESULT_DEPTH].Sourced = WRITEMASK_W;
 }
 
 
diff --git a/src/mesa/drivers/dri/r300/r500_fragprog.c b/src/mesa/drivers/dri/r300/r500_fragprog.c
index 926ddd5964..07a2a7b17c 100644
--- a/src/mesa/drivers/dri/r300/r500_fragprog.c
+++ b/src/mesa/drivers/dri/r300/r500_fragprog.c
@@ -298,8 +298,8 @@ static void insert_WPOS_trailer(struct r500_fragment_program_compiler *compiler)
 
 static void nqssadce_init(struct nqssadce_state* s)
 {
-	s->Outputs[FRAG_RESULT_COLR].Sourced = WRITEMASK_XYZW;
-	s->Outputs[FRAG_RESULT_DEPR].Sourced = WRITEMASK_W;
+	s->Outputs[FRAG_RESULT_COLOR].Sourced = WRITEMASK_XYZW;
+	s->Outputs[FRAG_RESULT_DEPTH].Sourced = WRITEMASK_W;
 }
 
 static GLboolean is_native_swizzle(GLuint opcode, struct prog_src_register reg)
diff --git a/src/mesa/drivers/dri/r300/radeon_nqssadce.c b/src/mesa/drivers/dri/r300/radeon_nqssadce.c
index 97ce016c99..a083c3d243 100644
--- a/src/mesa/drivers/dri/r300/radeon_nqssadce.c
+++ b/src/mesa/drivers/dri/r300/radeon_nqssadce.c
@@ -191,7 +191,7 @@ static void process_instruction(struct nqssadce_state* s)
 
 	if (inst->Opcode != OPCODE_KIL) {
 		if (s->Descr->RewriteDepthOut) {
-			if (inst->DstReg.File == PROGRAM_OUTPUT && inst->DstReg.Index == FRAG_RESULT_DEPR)
+			if (inst->DstReg.File == PROGRAM_OUTPUT && inst->DstReg.Index == FRAG_RESULT_DEPTH)
 				rewrite_depth_out(inst);
 		}
 
diff --git a/src/mesa/drivers/dri/r300/radeon_program_pair.c b/src/mesa/drivers/dri/r300/radeon_program_pair.c
index 58bc0d5843..365e7c1722 100644
--- a/src/mesa/drivers/dri/r300/radeon_program_pair.c
+++ b/src/mesa/drivers/dri/r300/radeon_program_pair.c
@@ -778,10 +778,10 @@ static void fill_dest_into_pair(struct pair_state *s, struct radeon_pair_instruc
 	struct prog_instruction *inst = s->Program->Instructions + ip;
 
 	if (inst->DstReg.File == PROGRAM_OUTPUT) {
-		if (inst->DstReg.Index == FRAG_RESULT_COLR) {
+		if (inst->DstReg.Index == FRAG_RESULT_COLOR) {
 			pair->RGB.OutputWriteMask |= inst->DstReg.WriteMask & WRITEMASK_XYZ;
 			pair->Alpha.OutputWriteMask |= GET_BIT(inst->DstReg.WriteMask, 3);
-		} else if (inst->DstReg.Index == FRAG_RESULT_DEPR) {
+		} else if (inst->DstReg.Index == FRAG_RESULT_DEPTH) {
 			pair->Alpha.DepthWriteMask |= GET_BIT(inst->DstReg.WriteMask, 3);
 		}
 	} else {
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 22add9d975..f17b9e1e71 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -268,10 +268,9 @@ typedef enum
  */
 typedef enum
 {
-   FRAG_RESULT_COLR = 0,
-   FRAG_RESULT_COLH = 1,
-   FRAG_RESULT_DEPR = 2,
-   FRAG_RESULT_DATA0 = 3,
+   FRAG_RESULT_DEPTH = 0,
+   FRAG_RESULT_COLOR = 1,
+   FRAG_RESULT_DATA0 = 2,
    FRAG_RESULT_MAX = (FRAG_RESULT_DATA0 + MAX_DRAW_BUFFERS)
 } gl_frag_result;
 
diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index d2a9e35dd5..51c13a563d 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -1098,7 +1098,7 @@ emit_texenv(struct texenv_fragment_program *p, GLuint unit)
        rgb_shift)
       dest = get_temp( p );
    else
-      dest = make_ureg(PROGRAM_OUTPUT, FRAG_RESULT_COLR);
+      dest = make_ureg(PROGRAM_OUTPUT, FRAG_RESULT_COLOR);
 
    /* Emit the RGB and A combine ops
     */
@@ -1278,7 +1278,7 @@ create_new_program(GLcontext *ctx, struct state_key *key,
    p.program->Base.Parameters = _mesa_new_parameter_list();
 
    p.program->Base.InputsRead = 0;
-   p.program->Base.OutputsWritten = 1 << FRAG_RESULT_COLR;
+   p.program->Base.OutputsWritten = 1 << FRAG_RESULT_COLOR;
 
    for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++)
       p.src_texture[unit] = undef;
@@ -1313,7 +1313,7 @@ create_new_program(GLcontext *ctx, struct state_key *key,
    }
 
    cf = get_source( &p, SRC_PREVIOUS, 0 );
-   out = make_ureg( PROGRAM_OUTPUT, FRAG_RESULT_COLR );
+   out = make_ureg( PROGRAM_OUTPUT, FRAG_RESULT_COLOR );
 
    if (key->separate_specular) {
       /* Emit specular add.
diff --git a/src/mesa/shader/arbprogparse.c b/src/mesa/shader/arbprogparse.c
index 62edb7f595..ccc0318a53 100644
--- a/src/mesa/shader/arbprogparse.c
+++ b/src/mesa/shader/arbprogparse.c
@@ -1688,7 +1688,7 @@ parse_result_binding(GLcontext *ctx, const GLubyte **inst,
              */
             parse_output_color_num(ctx, inst, Program, &out_color);
             ASSERT(out_color < MAX_DRAW_BUFFERS);
-            *outputReg = FRAG_RESULT_COLR;
+            *outputReg = FRAG_RESULT_COLOR;
          }
          else {
             /* for vtx programs, this is VERTEX_RESULT_POSITION */
@@ -1699,7 +1699,7 @@ parse_result_binding(GLcontext *ctx, const GLubyte **inst,
       case FRAGMENT_RESULT_DEPTH:
          if (Program->Base.Target == GL_FRAGMENT_PROGRAM_ARB) {
             /* for frag programs, this is FRAGMENT_RESULT_DEPTH */
-            *outputReg = FRAG_RESULT_DEPR;
+            *outputReg = FRAG_RESULT_DEPTH;
          }
          else {
             /* for vtx programs, this is VERTEX_RESULT_COLOR */
diff --git a/src/mesa/shader/nvfragparse.c b/src/mesa/shader/nvfragparse.c
index 20e4781372..37418ffb6e 100644
--- a/src/mesa/shader/nvfragparse.c
+++ b/src/mesa/shader/nvfragparse.c
@@ -384,18 +384,12 @@ static const char *InputRegisters[MAX_NV_FRAGMENT_PROGRAM_INPUTS + 1] = {
    "TEX0", "TEX1", "TEX2", "TEX3", "TEX4", "TEX5", "TEX6", "TEX7", NULL
 };
 
+
 static const char *OutputRegisters[MAX_NV_FRAGMENT_PROGRAM_OUTPUTS + 1] = {
-   "COLR", "COLH",
-   /* These are only allows for register combiners */
-   /*
-   "TEX0", "TEX1", "TEX2", "TEX3",
-   */
-   "DEPR", NULL
+   "DEPR", "COLR", "DATA0", NULL
 };
 
 
-
-
 /**********************************************************************/
 
 /**
@@ -828,7 +822,6 @@ static GLboolean
 Parse_OutputReg(struct parse_state *parseState, GLint *outputRegNum)
 {
    GLubyte token[100];
-   GLint j;
 
    /* Match "o[" */
    if (!Parse_String(parseState, "o["))
@@ -839,19 +832,19 @@ Parse_OutputReg(struct parse_state *parseState, GLint *outputRegNum)
       RETURN_ERROR;
 
    /* try to match an output register name */
-   for (j = 0; OutputRegisters[j]; j++) {
-      if (_mesa_strcmp((const char *) token, OutputRegisters[j]) == 0) {
-         static GLuint bothColors = (1 << FRAG_RESULT_COLR) | (1 << FRAG_RESULT_COLH);
-         *outputRegNum = j;
-         parseState->outputsWritten |= (1 << j);
-         if ((parseState->outputsWritten & bothColors) == bothColors) {
-            RETURN_ERROR1("Illegal to write to both o[COLR] and o[COLH]");
-         }
-         break;
-      }
+   if (_mesa_strcmp((char *) token, "COLR") == 0 ||
+       _mesa_strcmp((char *) token, "COLH") == 0) {
+      /* note that we don't distinguish between COLR and COLH */
+      *outputRegNum = FRAG_RESULT_COLOR;
+      parseState->outputsWritten |= (1 << FRAG_RESULT_COLOR);
    }
-   if (!OutputRegisters[j])
+   else if (_mesa_strcmp((char *) token, "DEPR") == 0) {
+      *outputRegNum = FRAG_RESULT_DEPTH;
+      parseState->outputsWritten |= (1 << FRAG_RESULT_DEPTH);
+   }
+   else {
       RETURN_ERROR1("Invalid output register name");
+   }
 
    /* Match ']' */
    if (!Parse_String(parseState, "]"))
@@ -1826,10 +1819,3 @@ _mesa_nv_fragment_input_register_name(GLuint i)
    return InputRegisters[i];
 }
 
-
-const char *
-_mesa_nv_fragment_output_register_name(GLuint i)
-{
-   ASSERT(i < MAX_NV_FRAGMENT_PROGRAM_OUTPUTS);
-   return OutputRegisters[i];
-}
diff --git a/src/mesa/shader/nvfragparse.h b/src/mesa/shader/nvfragparse.h
index de45cf543d..ac97921080 100644
--- a/src/mesa/shader/nvfragparse.h
+++ b/src/mesa/shader/nvfragparse.h
@@ -44,9 +44,4 @@ _mesa_print_nv_fragment_program(const struct gl_fragment_program *program);
 extern const char *
 _mesa_nv_fragment_input_register_name(GLuint i);
 
-
-extern const char *
-_mesa_nv_fragment_output_register_name(GLuint i);
-
-
 #endif
diff --git a/src/mesa/shader/prog_debug.c b/src/mesa/shader/prog_debug.c
index 7bcb2ef734..35ce37d5ce 100644
--- a/src/mesa/shader/prog_debug.c
+++ b/src/mesa/shader/prog_debug.c
@@ -222,20 +222,16 @@ _mesa_GetProgramRegisterfvMESA(GLenum target,
                         "glGetProgramRegisterfvMESA(registerName)");
             return;
          }
-         else if (_mesa_strcmp(reg, "o[COLR]") == 0) {
+         else if (_mesa_strcmp(reg, "o[COLR]") == 0 ||
+                  _mesa_strcmp(reg, "o[COLH]") == 0) {
             /* Fragment output color */
             ctx->Driver.GetProgramRegister(ctx, PROGRAM_OUTPUT,
-                                           FRAG_RESULT_COLR, v);
-         }
-         else if (_mesa_strcmp(reg, "o[COLH]") == 0) {
-            /* Fragment output color */
-            ctx->Driver.GetProgramRegister(ctx, PROGRAM_OUTPUT,
-                                           FRAG_RESULT_COLH, v);
+                                           FRAG_RESULT_COLOR, v);
          }
          else if (_mesa_strcmp(reg, "o[DEPR]") == 0) {
             /* Fragment output depth */
             ctx->Driver.GetProgramRegister(ctx, PROGRAM_OUTPUT,
-                                           FRAG_RESULT_DEPR, v);
+                                           FRAG_RESULT_DEPTH, v);
          }
          else {
             /* try user-defined identifiers */
diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c
index 00655f0288..2e5632710e 100644
--- a/src/mesa/shader/program.c
+++ b/src/mesa/shader/program.c
@@ -738,7 +738,7 @@ _mesa_combine_programs(GLcontext *ctx,
       /* Connect color outputs of fprogA to color inputs of fprogB, via a
        * new temporary register.
        */
-      if ((progA->OutputsWritten & (1 << FRAG_RESULT_COLR)) &&
+      if ((progA->OutputsWritten & (1 << FRAG_RESULT_COLOR)) &&
           (progB_inputsRead & FRAG_BIT_COL0)) {
          GLint tempReg = _mesa_find_free_register(newProg, PROGRAM_TEMPORARY);
          if (tempReg < 0) {
@@ -748,7 +748,7 @@ _mesa_combine_programs(GLcontext *ctx,
          }
          /* replace writes to result.color[0] with tempReg */
          replace_registers(newInst, lenA,
-                           PROGRAM_OUTPUT, FRAG_RESULT_COLR,
+                           PROGRAM_OUTPUT, FRAG_RESULT_COLOR,
                            PROGRAM_TEMPORARY, tempReg);
          /* replace reads from the input color with tempReg */
          replace_registers(newInst + lenA, lenB,
@@ -758,7 +758,7 @@ _mesa_combine_programs(GLcontext *ctx,
 
       /* compute combined program's InputsRead */
       inputsB = progB_inputsRead;
-      if (progA->OutputsWritten & (1 << FRAG_RESULT_COLR)) {
+      if (progA->OutputsWritten & (1 << FRAG_RESULT_COLOR)) {
          inputsB &= ~(1 << FRAG_ATTRIB_COL0);
       }
       newProg->InputsRead = progA->InputsRead | inputsB;
diff --git a/src/mesa/shader/programopt.c b/src/mesa/shader/programopt.c
index 56f1eb832e..05d9bdf7ec 100644
--- a/src/mesa/shader/programopt.c
+++ b/src/mesa/shader/programopt.c
@@ -171,7 +171,7 @@ _mesa_append_fog_code(GLcontext *ctx, struct gl_fragment_program *fprog)
       if (inst->Opcode == OPCODE_END)
          break;
       if (inst->DstReg.File == PROGRAM_OUTPUT &&
-          inst->DstReg.Index == FRAG_RESULT_COLR) {
+          inst->DstReg.Index == FRAG_RESULT_COLOR) {
          /* change the instruction to write to colorTemp w/ clamping */
          inst->DstReg.File = PROGRAM_TEMPORARY;
          inst->DstReg.Index = colorTemp;
@@ -249,7 +249,7 @@ _mesa_append_fog_code(GLcontext *ctx, struct gl_fragment_program *fprog)
    /* LRP result.color.xyz, fogFactorTemp.xxxx, colorTemp, fogColorRef; */
    inst->Opcode = OPCODE_LRP;
    inst->DstReg.File = PROGRAM_OUTPUT;
-   inst->DstReg.Index = FRAG_RESULT_COLR;
+   inst->DstReg.Index = FRAG_RESULT_COLOR;
    inst->DstReg.WriteMask = WRITEMASK_XYZ;
    inst->SrcReg[0].File = PROGRAM_TEMPORARY;
    inst->SrcReg[0].Index = fogFactorTemp;
@@ -264,7 +264,7 @@ _mesa_append_fog_code(GLcontext *ctx, struct gl_fragment_program *fprog)
    /* MOV result.color.w, colorTemp.x;  # copy alpha */
    inst->Opcode = OPCODE_MOV;
    inst->DstReg.File = PROGRAM_OUTPUT;
-   inst->DstReg.Index = FRAG_RESULT_COLR;
+   inst->DstReg.Index = FRAG_RESULT_COLOR;
    inst->DstReg.WriteMask = WRITEMASK_W;
    inst->SrcReg[0].File = PROGRAM_TEMPORARY;
    inst->SrcReg[0].Index = colorTemp;
diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c
index 5e2ce0ce3a..ee24e2e138 100644
--- a/src/mesa/shader/slang/slang_codegen.c
+++ b/src/mesa/shader/slang/slang_codegen.c
@@ -450,8 +450,8 @@ _slang_output_index(const char *name, GLenum target)
       { NULL, 0 }
    };
    static const struct output_info fragOutputs[] = {
-      { "gl_FragColor", FRAG_RESULT_COLR },
-      { "gl_FragDepth", FRAG_RESULT_DEPR },
+      { "gl_FragColor", FRAG_RESULT_COLOR },
+      { "gl_FragDepth", FRAG_RESULT_DEPTH },
       { "gl_FragData", FRAG_RESULT_DATA0 },
       { NULL, 0 }
    };
diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c
index bcabe71bfa..f98434892b 100644
--- a/src/mesa/shader/slang/slang_link.c
+++ b/src/mesa/shader/slang/slang_link.c
@@ -686,7 +686,7 @@ _slang_link(GLcontext *ctx,
    /* check that gl_FragColor and gl_FragData are not both written to */
    if (shProg->FragmentProgram) {
       GLbitfield outputsWritten = shProg->FragmentProgram->Base.OutputsWritten;
-      if ((outputsWritten & ((1 << FRAG_RESULT_COLR))) &&
+      if ((outputsWritten & ((1 << FRAG_RESULT_COLOR))) &&
           (outputsWritten >= (1 << FRAG_RESULT_DATA0))) {
          link_error(shProg, "Fragment program cannot write both gl_FragColor"
                     " and gl_FragData[].\n");
diff --git a/src/mesa/state_tracker/st_atom_pixeltransfer.c b/src/mesa/state_tracker/st_atom_pixeltransfer.c
index ce872458e3..05b69c9d00 100644
--- a/src/mesa/state_tracker/st_atom_pixeltransfer.c
+++ b/src/mesa/state_tracker/st_atom_pixeltransfer.c
@@ -212,7 +212,7 @@ get_pixel_transfer_program(GLcontext *ctx, const struct state_key *key)
    inst[ic].TexSrcTarget = TEXTURE_2D_INDEX;
    ic++;
    fp->Base.InputsRead = (1 << FRAG_ATTRIB_TEX0);
-   fp->Base.OutputsWritten = (1 << FRAG_RESULT_COLR);
+   fp->Base.OutputsWritten = (1 << FRAG_RESULT_COLOR);
    fp->Base.SamplersUsed = 0x1;  /* sampler 0 (bit 0) is used */
 
    if (key->scaleAndBias) {
@@ -400,7 +400,7 @@ get_pixel_transfer_program(GLcontext *ctx, const struct state_key *key)
    {
       struct prog_instruction *last = &inst[ic - 1];
       last->DstReg.File = PROGRAM_OUTPUT;
-      last->DstReg.Index = FRAG_RESULT_COLR;
+      last->DstReg.Index = FRAG_RESULT_COLOR;
    }
 
    /* END; */
diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index c73d0080ca..cc7a9e7890 100644
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -75,7 +75,7 @@ is_passthrough_program(const struct gl_fragment_program *prog)
       if (inst[0].Opcode == OPCODE_MOV &&
           inst[1].Opcode == OPCODE_END &&
           inst[0].DstReg.File == PROGRAM_OUTPUT &&
-          inst[0].DstReg.Index == FRAG_RESULT_COLR &&
+          inst[0].DstReg.Index == FRAG_RESULT_COLOR &&
           inst[0].DstReg.WriteMask == WRITEMASK_XYZW &&
           inst[0].SrcReg[0].File == PROGRAM_INPUT &&
           inst[0].SrcReg[0].Index == FRAG_ATTRIB_COL0 &&
@@ -158,7 +158,7 @@ combined_drawpix_fragment_program(GLcontext *ctx)
 
 /**
  * Create fragment shader that does a TEX() instruction to get a Z
- * value, then writes to FRAG_RESULT_DEPR.
+ * value, then writes to FRAG_RESULT_DEPTH.
  * Pass fragment color through as-is.
  */
 static struct st_fragment_program *
@@ -191,7 +191,7 @@ make_fragment_shader_z(struct st_context *st)
    /* TEX result.depth, fragment.texcoord[0], texture[0], 2D; */
    p->Instructions[ic].Opcode = OPCODE_TEX;
    p->Instructions[ic].DstReg.File = PROGRAM_OUTPUT;
-   p->Instructions[ic].DstReg.Index = FRAG_RESULT_DEPR;
+   p->Instructions[ic].DstReg.Index = FRAG_RESULT_DEPTH;
    p->Instructions[ic].DstReg.WriteMask = WRITEMASK_Z;
    p->Instructions[ic].SrcReg[0].File = PROGRAM_INPUT;
    p->Instructions[ic].SrcReg[0].Index = FRAG_ATTRIB_TEX0;
@@ -202,7 +202,7 @@ make_fragment_shader_z(struct st_context *st)
    /* MOV result.color, fragment.color */
    p->Instructions[ic].Opcode = OPCODE_MOV;
    p->Instructions[ic].DstReg.File = PROGRAM_OUTPUT;
-   p->Instructions[ic].DstReg.Index = FRAG_RESULT_COLR;
+   p->Instructions[ic].DstReg.Index = FRAG_RESULT_COLOR;
    p->Instructions[ic].SrcReg[0].File = PROGRAM_INPUT;
    p->Instructions[ic].SrcReg[0].Index = FRAG_ATTRIB_COL0;
    ic++;
@@ -213,7 +213,7 @@ make_fragment_shader_z(struct st_context *st)
    assert(ic == p->NumInstructions);
 
    p->InputsRead = FRAG_BIT_TEX0 | FRAG_BIT_COL0;
-   p->OutputsWritten = (1 << FRAG_RESULT_COLR) | (1 << FRAG_RESULT_DEPR);
+   p->OutputsWritten = (1 << FRAG_RESULT_COLOR) | (1 << FRAG_RESULT_DEPTH);
    p->SamplersUsed = 0x1;  /* sampler 0 (bit 0) is used */
 
    st->drawpix.z_shader = (struct st_fragment_program *) p;
diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c
index d2535b6a2f..f825204915 100644
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -466,23 +466,23 @@ st_translate_fragment_program(struct st_context *st,
       GLbitfield outputsWritten = stfp->Base.Base.OutputsWritten;
 
       /* if z is written, emit that first */
-      if (outputsWritten & (1 << FRAG_RESULT_DEPR)) {
+      if (outputsWritten & (1 << FRAG_RESULT_DEPTH)) {
          fs_output_semantic_name[fs_num_outputs] = TGSI_SEMANTIC_POSITION;
          fs_output_semantic_index[fs_num_outputs] = 0;
-         outputMapping[FRAG_RESULT_DEPR] = fs_num_outputs;
+         outputMapping[FRAG_RESULT_DEPTH] = fs_num_outputs;
          fs_num_outputs++;
-         outputsWritten &= ~(1 << FRAG_RESULT_DEPR);
+         outputsWritten &= ~(1 << FRAG_RESULT_DEPTH);
       }
 
       /* handle remaning outputs (color) */
       for (attr = 0; attr < FRAG_RESULT_MAX; attr++) {
          if (outputsWritten & (1 << attr)) {
             switch (attr) {
-            case FRAG_RESULT_DEPR:
+            case FRAG_RESULT_DEPTH:
                /* handled above */
                assert(0);
                break;
-            case FRAG_RESULT_COLR:
+            case FRAG_RESULT_COLOR:
                fs_output_semantic_name[fs_num_outputs] = TGSI_SEMANTIC_COLOR;
                fs_output_semantic_index[fs_num_outputs] = numColors;
                outputMapping[attr] = fs_num_outputs;
diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c
index 297940adbd..719e6b8296 100644
--- a/src/mesa/swrast/s_context.c
+++ b/src/mesa/swrast/s_context.c
@@ -206,7 +206,7 @@ _swrast_update_deferred_texture(GLcontext *ctx)
    else {
       const struct gl_fragment_program *fprog
          = ctx->FragmentProgram._Current;
-      if (fprog && (fprog->Base.OutputsWritten & (1 << FRAG_RESULT_DEPR))) {
+      if (fprog && (fprog->Base.OutputsWritten & (1 << FRAG_RESULT_DEPTH))) {
          /* Z comes from fragment program/shader */
          swrast->_DeferredTexture = GL_FALSE;
       }
diff --git a/src/mesa/swrast/s_fragprog.c b/src/mesa/swrast/s_fragprog.c
index c6601f5593..3735f041d6 100644
--- a/src/mesa/swrast/s_fragprog.c
+++ b/src/mesa/swrast/s_fragprog.c
@@ -202,9 +202,9 @@ run_program(GLcontext *ctx, SWspan *span, GLuint start, GLuint end)
          if (_mesa_execute_program(ctx, &program->Base, machine)) {
 
             /* Store result color */
-            if (outputsWritten & (1 << FRAG_RESULT_COLR)) {
+            if (outputsWritten & (1 << FRAG_RESULT_COLOR)) {
                COPY_4V(span->array->attribs[FRAG_ATTRIB_COL0][i],
-                       machine->Outputs[FRAG_RESULT_COLR]);
+                       machine->Outputs[FRAG_RESULT_COLOR]);
             }
             else {
                /* Multiple drawbuffers / render targets
@@ -221,8 +221,8 @@ run_program(GLcontext *ctx, SWspan *span, GLuint start, GLuint end)
             }
 
             /* Store result depth/z */
-            if (outputsWritten & (1 << FRAG_RESULT_DEPR)) {
-               const GLfloat depth = machine->Outputs[FRAG_RESULT_DEPR][2];
+            if (outputsWritten & (1 << FRAG_RESULT_DEPTH)) {
+               const GLfloat depth = machine->Outputs[FRAG_RESULT_DEPTH][2];
                if (depth <= 0.0)
                   span->array->z[i] = 0;
                else if (depth >= 1.0)
@@ -259,12 +259,12 @@ _swrast_exec_fragment_program( GLcontext *ctx, SWspan *span )
 
    run_program(ctx, span, 0, span->end);
 
-   if (program->Base.OutputsWritten & (1 << FRAG_RESULT_COLR)) {
+   if (program->Base.OutputsWritten & (1 << FRAG_RESULT_COLOR)) {
       span->interpMask &= ~SPAN_RGBA;
       span->arrayMask |= SPAN_RGBA;
    }
 
-   if (program->Base.OutputsWritten & (1 << FRAG_RESULT_DEPR)) {
+   if (program->Base.OutputsWritten & (1 << FRAG_RESULT_DEPTH)) {
       span->interpMask &= ~SPAN_Z;
       span->arrayMask |= SPAN_Z;
    }
-- 
cgit v1.2.3


From 555f0a88182e2b1af809b2d97abdac02814a2f28 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Sat, 28 Feb 2009 12:21:18 -0700
Subject: mesa: remove unused AUX buffers

Remove all references to aux buffers 1..3.  Keep AUX0 around for now just
in case, but it'll probably go too someday.  I don't know of any OpenGL
drivers since the IRIX days that support aux color buffers.
---
 src/mesa/drivers/dri/intel/intel_clear.c |  5 +----
 src/mesa/drivers/x11/xm_api.c            |  3 ---
 src/mesa/main/buffers.c                  | 12 ------------
 src/mesa/main/config.h                   |  2 +-
 src/mesa/main/mtypes.h                   | 10 ++--------
 src/mesa/swrast/s_buffers.c              |  5 +----
 6 files changed, 5 insertions(+), 32 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/intel/intel_clear.c b/src/mesa/drivers/dri/intel/intel_clear.c
index c3ba50f355..28281b3861 100644
--- a/src/mesa/drivers/dri/intel/intel_clear.c
+++ b/src/mesa/drivers/dri/intel/intel_clear.c
@@ -247,13 +247,10 @@ static const char *buffer_names[] = {
    [BUFFER_BACK_LEFT] = "back",
    [BUFFER_FRONT_RIGHT] = "front right",
    [BUFFER_BACK_RIGHT] = "back right",
-   [BUFFER_AUX0] = "aux0",
-   [BUFFER_AUX1] = "aux1",
-   [BUFFER_AUX2] = "aux2",
-   [BUFFER_AUX3] = "aux3",
    [BUFFER_DEPTH] = "depth",
    [BUFFER_STENCIL] = "stencil",
    [BUFFER_ACCUM] = "accum",
+   [BUFFER_AUX0] = "aux0",
    [BUFFER_COLOR0] = "color0",
    [BUFFER_COLOR1] = "color1",
    [BUFFER_COLOR2] = "color2",
diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c
index 62d30a6987..908fecc85a 100644
--- a/src/mesa/drivers/x11/xm_api.c
+++ b/src/mesa/drivers/x11/xm_api.c
@@ -2410,11 +2410,8 @@ xbuffer_to_renderbuffer(int buffer)
    case GLX_AUX0_EXT:
       return BUFFER_AUX0;
    case GLX_AUX1_EXT:
-      return BUFFER_AUX1;
    case GLX_AUX2_EXT:
-      return BUFFER_AUX2;
    case GLX_AUX3_EXT:
-      return BUFFER_AUX3;
    case GLX_AUX4_EXT:
    case GLX_AUX5_EXT:
    case GLX_AUX6_EXT:
diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c
index 85db3868c4..1580487ffd 100644
--- a/src/mesa/main/buffers.c
+++ b/src/mesa/main/buffers.c
@@ -119,12 +119,6 @@ draw_buffer_enum_to_bitmask(GLenum buffer)
          return BUFFER_BIT_FRONT_LEFT;
       case GL_AUX0:
          return BUFFER_BIT_AUX0;
-      case GL_AUX1:
-         return BUFFER_BIT_AUX1;
-      case GL_AUX2:
-         return BUFFER_BIT_AUX2;
-      case GL_AUX3:
-         return BUFFER_BIT_AUX3;
       case GL_COLOR_ATTACHMENT0_EXT:
          return BUFFER_BIT_COLOR0;
       case GL_COLOR_ATTACHMENT1_EXT:
@@ -176,12 +170,6 @@ read_buffer_enum_to_index(GLenum buffer)
          return BUFFER_FRONT_LEFT;
       case GL_AUX0:
          return BUFFER_AUX0;
-      case GL_AUX1:
-         return BUFFER_AUX1;
-      case GL_AUX2:
-         return BUFFER_AUX2;
-      case GL_AUX3:
-         return BUFFER_AUX3;
       case GL_COLOR_ATTACHMENT0_EXT:
          return BUFFER_COLOR0;
       case GL_COLOR_ATTACHMENT1_EXT:
diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index bb3e980bfa..282ad9514c 100644
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -68,7 +68,7 @@
 #define MAX_PIXEL_MAP_TABLE 256
 
 /** Maximum number of auxillary color buffers */
-#define MAX_AUX_BUFFERS 4
+#define MAX_AUX_BUFFERS 1
 
 /** Maximum order (degree) of curves */
 #ifdef AMIGA
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index f17b9e1e71..9ee341582c 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -285,14 +285,11 @@ typedef enum
    BUFFER_BACK_LEFT,
    BUFFER_FRONT_RIGHT,
    BUFFER_BACK_RIGHT,
-   /* optional aux buffers */
-   BUFFER_AUX0,
-   BUFFER_AUX1,
-   BUFFER_AUX2,
-   BUFFER_AUX3,
    BUFFER_DEPTH,
    BUFFER_STENCIL,
    BUFFER_ACCUM,
+   /* optional aux buffer */
+   BUFFER_AUX0,
    /* generic renderbuffers */
    BUFFER_COLOR0,
    BUFFER_COLOR1,
@@ -336,9 +333,6 @@ typedef enum
                             BUFFER_BIT_FRONT_RIGHT | \
                             BUFFER_BIT_BACK_RIGHT | \
                             BUFFER_BIT_AUX0 | \
-                            BUFFER_BIT_AUX1 | \
-                            BUFFER_BIT_AUX2 | \
-                            BUFFER_BIT_AUX3 | \
                             BUFFER_BIT_COLOR0 | \
                             BUFFER_BIT_COLOR1 | \
                             BUFFER_BIT_COLOR2 | \
diff --git a/src/mesa/swrast/s_buffers.c b/src/mesa/swrast/s_buffers.c
index af475ad8cb..34ae1b4fcc 100644
--- a/src/mesa/swrast/s_buffers.c
+++ b/src/mesa/swrast/s_buffers.c
@@ -317,10 +317,7 @@ _swrast_Clear(GLcontext *ctx, GLbitfield buffers)
 	 BUFFER_BIT_DEPTH |
 	 BUFFER_BIT_STENCIL |
 	 BUFFER_BIT_ACCUM |
-         BUFFER_BIT_AUX0 |
-         BUFFER_BIT_AUX1 |
-         BUFFER_BIT_AUX2 |
-         BUFFER_BIT_AUX3;
+         BUFFER_BIT_AUX0;
       assert((buffers & (~legalBits)) == 0);
    }
 #endif
-- 
cgit v1.2.3


From ebabdf9920c1628741703704796a9361c1fc07bf Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Sat, 28 Feb 2009 17:02:49 -0700
Subject: mesa: move update_texture_compare_function() call out of loop

---
 src/mesa/main/texstate.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index e25c9e732c..aded127092 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -400,7 +400,6 @@ texture_override(GLcontext *ctx,
       if (texObj->_Complete) {
          texUnit->_ReallyEnabled = textureBit;
          texUnit->_Current = texObj;
-         update_texture_compare_function(ctx, texObj);
       }
    }
 }
@@ -582,6 +581,9 @@ update_texture_state( GLcontext *ctx )
                           texUnit->CurrentTex[texIndex], 1 << texIndex);
       }
 
+      if (texUnit->_Current)
+         update_texture_compare_function(ctx, texUnit->_Current);
+
       if (!texUnit->_ReallyEnabled) {
          continue;
       }
-- 
cgit v1.2.3


From 000c3438c96c5b8f16969c1bcbcce1b6a6321ec9 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Sat, 28 Feb 2009 17:40:41 -0700
Subject: mesa: move texture_override() code into calling loop

We can avoid a few iterations this way.
---
 src/mesa/main/texstate.c | 49 +++++++++++++++++++-----------------------------
 1 file changed, 19 insertions(+), 30 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index aded127092..5ac8579310 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -384,27 +384,6 @@ update_texture_compare_function(GLcontext *ctx,
 }
 
 
-/**
- * Helper function for determining which texture object (1D, 2D, cube, etc)
- * should actually be used.
- */
-static void
-texture_override(GLcontext *ctx,
-                 struct gl_texture_unit *texUnit, GLbitfield enableBits,
-                 struct gl_texture_object *texObj, GLuint textureBit)
-{
-   if (!texUnit->_ReallyEnabled && (enableBits & textureBit)) {
-      if (!texObj->_Complete) {
-         _mesa_test_texobj_completeness(ctx, texObj);
-      }
-      if (texObj->_Complete) {
-         texUnit->_ReallyEnabled = textureBit;
-         texUnit->_Current = texObj;
-      }
-   }
-}
-
-
 /**
  * Examine texture unit's combine/env state to update derived state.
  */
@@ -547,14 +526,11 @@ update_texture_state( GLcontext *ctx )
       GLbitfield enableBits;
       GLuint texIndex;
 
-      texUnit->_Current = NULL;
-      texUnit->_ReallyEnabled = 0x0;
-
       /* Get the bitmask of texture target enables.
        * enableBits will be a mask of the TEXTURE_*_BIT flags indicating
        * which texture targets are enabled (fixed function) or referenced
        * by a fragment shader/program.  When multiple flags are set, we'll
-       * settle on the one with highest priority (see texture_override below).
+       * settle on the one with highest priority (see below).
        */
       enableBits = 0x0;
       if (vprog) {
@@ -571,14 +547,27 @@ update_texture_state( GLcontext *ctx )
       if (enableBits == 0x0)
          continue;
 
-      /* Look for the highest-priority texture target that's enabled and
-       * complete.  That's the one we'll use for texturing.  If we're using
-       * a fragment program we're guaranteed that bitcount(enabledBits) <= 1.
+      texUnit->_Current = NULL;
+      texUnit->_ReallyEnabled = 0x0;
+
+      /* Look for the highest priority texture target that's enabled (or used
+       * by the vert/frag shaders) and "complete".  That's the one we'll use
+       * for texturing.  If we're using vert/frag program we're guaranteed
+       * that bitcount(enabledBits) <= 1.
        * Note that the TEXTURE_x_INDEX values are in high to low priority.
        */
       for (texIndex = 0; texIndex < NUM_TEXTURE_TARGETS; texIndex++) {
-         texture_override(ctx, texUnit, enableBits,
-                          texUnit->CurrentTex[texIndex], 1 << texIndex);
+         if (enableBits & (1 << texIndex)) {
+            struct gl_texture_object *texObj = texUnit->CurrentTex[texIndex];
+            if (!texObj->_Complete) {
+               _mesa_test_texobj_completeness(ctx, texObj);
+            }
+            if (texObj->_Complete) {
+               texUnit->_ReallyEnabled = 1 << texIndex;
+               texUnit->_Current = texObj;
+               break;
+            }
+         }
       }
 
       if (texUnit->_Current)
-- 
cgit v1.2.3


From e30f7657639d53dc87fa35aa2ec02ed13c70f796 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Sat, 28 Feb 2009 18:36:48 -0700
Subject: mesa: clarify comments for per-unit texture bitfields

---
 src/mesa/main/mtypes.h | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 9ee341582c..1e42de85b8 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1440,14 +1440,20 @@ struct gl_texture_attrib
    GLboolean SharedPalette;
    struct gl_color_table Palette;
 
-   /** Per-unit flags */
-   /*@{*/
-   GLbitfield _EnabledUnits;  /**< one bit set for each really-enabled unit */
-   GLbitfield _EnabledCoordUnits;   /**< one bit per enabled coordinate unit */
-   GLbitfield _GenFlags;            /**< for texgen */
-   GLbitfield _TexGenEnabled;  /**< Mask of ENABLE_TEXGEN flags */
-   GLbitfield _TexMatEnabled;  /**< Mask of ENABLE_TEXMAT flags */
-   /*@}*/
+   /** Texture units/samplers used by vertex or fragment texturing */
+   GLbitfield _EnabledUnits;
+
+   /** Texture coord units/sets used for fragment texturing */
+   GLbitfield _EnabledCoordUnits;
+
+   /** Texture coord units that have texgen enabled */
+   GLbitfield _TexGenEnabled;
+
+   /** Texture coord units that have non-identity matrices */
+   GLbitfield _TexMatEnabled;
+
+   /** Bitwise-OR of all Texture.Unit[i]._GenFlags */
+   GLbitfield _GenFlags;
 };
 
 
-- 
cgit v1.2.3


From e68208f26260e5c964bc1c8674c722d0d60db3ee Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 2 Mar 2009 10:58:51 -0700
Subject: mesa: fixed computation of _EnabledCoordUnits

This field should not include vertex textures.  It indicates the coord
inputs for fragment / fixed-function processing.
---
 src/mesa/main/texstate.c | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 5ac8579310..5d53e35910 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -492,6 +492,7 @@ update_texture_state( GLcontext *ctx )
    GLuint unit;
    struct gl_fragment_program *fprog = NULL;
    struct gl_vertex_program *vprog = NULL;
+   GLbitfield enabledFragUnits = 0x0;
 
    if (ctx->Shader.CurrentProgram &&
        ctx->Shader.CurrentProgram->LinkStatus) {
@@ -523,7 +524,9 @@ update_texture_state( GLcontext *ctx )
     */
    for (unit = 0; unit < ctx->Const.MaxTextureImageUnits; unit++) {
       struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
-      GLbitfield enableBits;
+      GLbitfield enabledVertTargets = 0x0;
+      GLbitfield enabledFragTargets = 0x0;
+      GLbitfield enabledTargets = 0x0;
       GLuint texIndex;
 
       /* Get the bitmask of texture target enables.
@@ -532,20 +535,24 @@ update_texture_state( GLcontext *ctx )
        * by a fragment shader/program.  When multiple flags are set, we'll
        * settle on the one with highest priority (see below).
        */
-      enableBits = 0x0;
       if (vprog) {
-         enableBits |= vprog->Base.TexturesUsed[unit];
+         enabledVertTargets |= vprog->Base.TexturesUsed[unit];
       }
+
       if (fprog) {
-         enableBits |= fprog->Base.TexturesUsed[unit];
+         enabledFragTargets |= fprog->Base.TexturesUsed[unit];
       }
       else {
          /* fixed-function fragment program */
-         enableBits |= texUnit->Enabled;
+         enabledFragTargets |= texUnit->Enabled;
       }
 
-      if (enableBits == 0x0)
+      enabledTargets = enabledVertTargets | enabledFragTargets;
+
+      if (enabledTargets == 0x0) {
+         /* neither vertex nor fragment processing uses this unit */
          continue;
+      }
 
       texUnit->_Current = NULL;
       texUnit->_ReallyEnabled = 0x0;
@@ -557,7 +564,7 @@ update_texture_state( GLcontext *ctx )
        * Note that the TEXTURE_x_INDEX values are in high to low priority.
        */
       for (texIndex = 0; texIndex < NUM_TEXTURE_TARGETS; texIndex++) {
-         if (enableBits & (1 << texIndex)) {
+         if (enabledTargets & (1 << texIndex)) {
             struct gl_texture_object *texObj = texUnit->CurrentTex[texIndex];
             if (!texObj->_Complete) {
                _mesa_test_texobj_completeness(ctx, texObj);
@@ -581,6 +588,9 @@ update_texture_state( GLcontext *ctx )
 
       ctx->Texture._EnabledUnits |= (1 << unit);
 
+      if (enabledFragTargets)
+         enabledFragUnits |= (1 << unit);
+
       update_tex_combine(ctx, texUnit);
    }
 
@@ -592,7 +602,7 @@ update_texture_state( GLcontext *ctx )
          = (fprog->Base.InputsRead >> FRAG_ATTRIB_TEX0) & coordMask;
    }
    else {
-      ctx->Texture._EnabledCoordUnits = ctx->Texture._EnabledUnits;
+      ctx->Texture._EnabledCoordUnits = enabledFragUnits;
    }
 
    /* Setup texgen for those texture coordinate sets that are in use */
-- 
cgit v1.2.3


From f352a80aec10c3faf2d84e0b35d59b4edc0395ef Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 2 Mar 2009 11:46:49 -0700
Subject: mesa: add ctx->Stencil._Enabled field

Only true if stenciling is enabled, and there's a stencil buffer.
---
 src/mesa/main/mtypes.h  | 1 +
 src/mesa/main/state.c   | 2 +-
 src/mesa/main/stencil.c | 6 +++++-
 3 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 1e42de85b8..f906de8357 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1012,6 +1012,7 @@ struct gl_stencil_attrib
    GLboolean Enabled;		/**< Enabled flag */
    GLboolean TestTwoSide;	/**< GL_EXT_stencil_two_side */
    GLubyte ActiveFace;		/**< GL_EXT_stencil_two_side (0 or 2) */
+   GLboolean _Enabled;          /**< Enabled and stencil buffer present */
    GLboolean _TestTwoSide;
    GLubyte _BackFace;           /**< Current back stencil state (1 or 2) */
    GLenum Function[3];		/**< Stencil function */
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 0a39279bff..9ea932ea96 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -490,7 +490,7 @@ _mesa_update_state_locked( GLcontext *ctx )
    if (new_state & _NEW_LIGHT)
       _mesa_update_lighting( ctx );
 
-   if (new_state & _NEW_STENCIL)
+   if (new_state & (_NEW_STENCIL | _NEW_BUFFERS))
       _mesa_update_stencil( ctx );
 
 #if FEATURE_pixel_transfer
diff --git a/src/mesa/main/stencil.c b/src/mesa/main/stencil.c
index e4a255d0a7..15c98e2015 100644
--- a/src/mesa/main/stencil.c
+++ b/src/mesa/main/stencil.c
@@ -536,7 +536,11 @@ _mesa_update_stencil(GLcontext *ctx)
 {
    const GLint face = ctx->Stencil._BackFace;
 
-   ctx->Stencil._TestTwoSide =
+   ctx->Stencil._Enabled = (ctx->Stencil.Enabled &&
+                            ctx->DrawBuffer->Visual.stencilBits > 0);
+
+    ctx->Stencil._TestTwoSide =
+       ctx->Stencil._Enabled &&
        (ctx->Stencil.Function[0] != ctx->Stencil.Function[face] ||
 	ctx->Stencil.FailFunc[0] != ctx->Stencil.FailFunc[face] ||
 	ctx->Stencil.ZPassFunc[0] != ctx->Stencil.ZPassFunc[face] ||
-- 
cgit v1.2.3


From 8fec37c0f11e624644da48d612c60e736861a212 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 2 Mar 2009 11:49:19 -0700
Subject: mesa: remove warning/short-circuit of stencil enable w/ no stencil
 buffer

With FBOs one could enable stencil before a stencil buffer is later bound.
---
 src/mesa/main/enable.c | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index 7ff3b15c84..a824705bdc 100644
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -602,11 +602,6 @@ _mesa_set_enable(GLcontext *ctx, GLenum cap, GLboolean state)
          ctx->Texture.SharedPalette = state;
          break;
       case GL_STENCIL_TEST:
-         if (state && ctx->DrawBuffer->Visual.stencilBits == 0) {
-            _mesa_warning(ctx,
-                          "glEnable(GL_STENCIL_TEST) but no stencil buffer");
-            return;
-         }
          if (ctx->Stencil.Enabled == state)
             return;
          FLUSH_VERTICES(ctx, _NEW_STENCIL);
-- 
cgit v1.2.3


From 97dd2ddbd97ba95e8bc8ab572ec05e8081556e1e Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 2 Mar 2009 12:27:16 -0700
Subject: mesa: don't draw arrays if vertex position array is not enabled

For regular GL, we must have vertex positions in order to draw.  But ES2
doesn't have that requirement (positions can be computed from any array
of data).

See bug 19911.
---
 src/mesa/main/api_validate.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c
index 5c8955d7c8..42d1e579e0 100644
--- a/src/mesa/main/api_validate.c
+++ b/src/mesa/main/api_validate.c
@@ -87,11 +87,20 @@ check_valid_to_render(GLcontext *ctx, char *function)
       return GL_FALSE;
    }
 
-   /* Always need vertex positions, unless a vertex program is in use */
-   if (!ctx->VertexProgram._Current &&
-       !ctx->Array.ArrayObj->Vertex.Enabled &&
+#if FEATURE_es2_glsl
+   /* For ES2, we can draw if any vertex array is enabled (and we should
+    * always have a vertex program/shader).
+    */
+   if (ctx->Array.ArrayObj->_Enabled == 0x0 || !ctx->VertexProgram._Current)
+      return GL_FALSE;
+#else
+   /* For regular OpenGL, only draw if we have vertex positions (regardless
+    * of whether or not we have a vertex program/shader).
+    */
+   if (!ctx->Array.ArrayObj->Vertex.Enabled &&
        !ctx->Array.ArrayObj->VertexAttrib[0].Enabled)
       return GL_FALSE;
+#endif
 
    return GL_TRUE;
 }
-- 
cgit v1.2.3


From 7e0f47c1348273ed3bb39d00aa4a9498a28b8d6a Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 2 Mar 2009 14:27:16 -0700
Subject: mesa: use _mesa_reference_texobj() when setting texUnit->Current
 pointer

Fixes piglit copytexsubimage regression.
---
 src/mesa/main/texstate.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 5d53e35910..672a125bf1 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -554,7 +554,6 @@ update_texture_state( GLcontext *ctx )
          continue;
       }
 
-      texUnit->_Current = NULL;
       texUnit->_ReallyEnabled = 0x0;
 
       /* Look for the highest priority texture target that's enabled (or used
@@ -571,7 +570,7 @@ update_texture_state( GLcontext *ctx )
             }
             if (texObj->_Complete) {
                texUnit->_ReallyEnabled = 1 << texIndex;
-               texUnit->_Current = texObj;
+               _mesa_reference_texobj(&texUnit->_Current, texObj);
                break;
             }
          }
-- 
cgit v1.2.3


From e232471baa3a7cfa7a76b9cfe55dfb7da79fedbe Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 2 Mar 2009 15:19:53 -0700
Subject: mesa: fix texture enable regression

Need to clear the _ReallyEnabled field before possibly continuing the loop.
Also, set _Current pointer to NULL if the unit is no longer enabled.

Fixes piglit lodbias regression
---
 src/mesa/main/texstate.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 672a125bf1..b29721eff6 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -549,13 +549,13 @@ update_texture_state( GLcontext *ctx )
 
       enabledTargets = enabledVertTargets | enabledFragTargets;
 
+      texUnit->_ReallyEnabled = 0x0;
+
       if (enabledTargets == 0x0) {
          /* neither vertex nor fragment processing uses this unit */
          continue;
       }
 
-      texUnit->_ReallyEnabled = 0x0;
-
       /* Look for the highest priority texture target that's enabled (or used
        * by the vert/frag shaders) and "complete".  That's the one we'll use
        * for texturing.  If we're using vert/frag program we're guaranteed
@@ -580,6 +580,7 @@ update_texture_state( GLcontext *ctx )
          update_texture_compare_function(ctx, texUnit->_Current);
 
       if (!texUnit->_ReallyEnabled) {
+         _mesa_reference_texobj(&texUnit->_Current, NULL);
          continue;
       }
 
-- 
cgit v1.2.3


From 6c75d7b4e6b04ce9e5e8d188a143cb7a1670c953 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 2 Mar 2009 15:21:50 -0700
Subject: mesa: move call to update_texture_compare_function()

Another conditional can be avoided.
---
 src/mesa/main/texstate.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index b29721eff6..2b07da805c 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -576,9 +576,6 @@ update_texture_state( GLcontext *ctx )
          }
       }
 
-      if (texUnit->_Current)
-         update_texture_compare_function(ctx, texUnit->_Current);
-
       if (!texUnit->_ReallyEnabled) {
          _mesa_reference_texobj(&texUnit->_Current, NULL);
          continue;
@@ -592,6 +589,7 @@ update_texture_state( GLcontext *ctx )
          enabledFragUnits |= (1 << unit);
 
       update_tex_combine(ctx, texUnit);
+      update_texture_compare_function(ctx, texUnit->_Current);
    }
 
 
-- 
cgit v1.2.3


From 433f2ab2ec4685328c3ee4802fab84fd12671eb3 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 2 Mar 2009 17:52:30 -0700
Subject: mesa: more tex image debug/dumping code

---
 src/mesa/main/debug.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/debug.c b/src/mesa/main/debug.c
index fcef093ac3..fdd10dd307 100644
--- a/src/mesa/main/debug.c
+++ b/src/mesa/main/debug.c
@@ -23,6 +23,7 @@
  */
 
 #include "mtypes.h"
+#include "colormac.h"
 #include "context.h"
 #include "hash.h"
 #include "imports.h"
@@ -274,6 +275,27 @@ write_texture_image(struct gl_texture_object *texObj)
       case MESA_FORMAT_ARGB8888:
          write_ppm(s, img->Data, img->Width, img->Height, 4, 2, 1, 0);
          break;
+      case MESA_FORMAT_RGB888:
+         write_ppm(s, img->Data, img->Width, img->Height, 3, 2, 1, 0);
+         break;
+      case MESA_FORMAT_RGB565:
+         {
+            GLubyte *buf2 = (GLubyte *) _mesa_malloc(img->Width * img->Height * 3);
+            GLint i;
+            for (i = 0; i < img->Width * img->Height; i++) {
+               GLint r, g, b;
+               GLushort s = ((GLushort *) img->Data)[i];
+               r = UBYTE_TO_CHAN( ((s >> 8) & 0xf8) | ((s >> 13) & 0x7) );
+               g = UBYTE_TO_CHAN( ((s >> 3) & 0xfc) | ((s >>  9) & 0x3) );
+               b = UBYTE_TO_CHAN( ((s << 3) & 0xf8) | ((s >>  2) & 0x7) );
+               buf2[i*3+1] = r;
+               buf2[i*3+2] = g;
+               buf2[i*3+3] = b;
+            }
+            write_ppm(s, buf2, img->Width, img->Height, 3, 2, 1, 0);
+            _mesa_free(buf2);
+         }
+         break;
       default:
          printf("XXXX unsupported mesa tex format %d in %s\n",
                 img->TexFormat->MesaFormat, __FUNCTION__);
-- 
cgit v1.2.3


From c64a2b708944ec671b1104067245500fcfc6ed94 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keithw@vmware.com>
Date: Tue, 3 Mar 2009 10:41:57 +0000
Subject: mesa: Add BeginVertices driver call

Provides notification to the VBO modules prior to the first immediate call.
Pairs with FlushVertices()
---
 src/mesa/main/dd.h          |  6 ++++++
 src/mesa/main/vtxfmt.c      |  9 ++++++---
 src/mesa/vbo/vbo_exec.c     |  1 +
 src/mesa/vbo/vbo_exec.h     |  2 ++
 src/mesa/vbo/vbo_exec_api.c | 10 ++++++++++
 5 files changed, 25 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index 7fb0a211d7..b1e006901b 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -947,6 +947,12 @@ struct dd_function_table {
    GLuint NeedFlush;
    GLuint SaveNeedFlush;
 
+
+   /* Called prior to any of the GLvertexformat functions being
+    * called.  Paired with Driver.FlushVertices().
+    */
+   void (*BeginVertices)( GLcontext *ctx );
+
    /**
     * If inside glBegin()/glEnd(), it should ASSERT(0).  Otherwise, if
     * FLUSH_STORED_VERTICES bit in \p flags is set flushes any buffered
diff --git a/src/mesa/main/vtxfmt.c b/src/mesa/main/vtxfmt.c
index 0204979003..1f807dc3dc 100644
--- a/src/mesa/main/vtxfmt.c
+++ b/src/mesa/main/vtxfmt.c
@@ -54,9 +54,12 @@
    ASSERT( tnl->Current );						\
    ASSERT( tnl->SwapCount < NUM_VERTEX_FORMAT_ENTRIES );		\
    ASSERT( tmp_offset >= 0 );						\
-									\
-   /* Save the swapped function's dispatch entry so it can be */	\
-   /* restored later. */						\
+                                                                        \
+   if (tnl->SwapCount == 0)                                             \
+      ctx->Driver.BeginVertices( ctx );                                 \
+                                                                        \
+   /* Save the swapped function's dispatch entry so it can be */        \
+   /* restored later. */                                                \
    tnl->Swapped[tnl->SwapCount].location = & (((_glapi_proc *)ctx->Exec)[tmp_offset]); \
    tnl->Swapped[tnl->SwapCount].function = (_glapi_proc)TAG(FUNC);	\
    tnl->SwapCount++;							\
diff --git a/src/mesa/vbo/vbo_exec.c b/src/mesa/vbo/vbo_exec.c
index 635f239acc..e168a89ea5 100644
--- a/src/mesa/vbo/vbo_exec.c
+++ b/src/mesa/vbo/vbo_exec.c
@@ -57,6 +57,7 @@ void vbo_exec_init( GLcontext *ctx )
 
    ctx->Driver.NeedFlush = 0;
    ctx->Driver.CurrentExecPrimitive = PRIM_OUTSIDE_BEGIN_END;
+   ctx->Driver.BeginVertices = vbo_exec_BeginVertices;
    ctx->Driver.FlushVertices = vbo_exec_FlushVertices;
 
    vbo_exec_invalidate_state( ctx, ~0 );
diff --git a/src/mesa/vbo/vbo_exec.h b/src/mesa/vbo/vbo_exec.h
index ddbcbe1181..3ce36657bd 100644
--- a/src/mesa/vbo/vbo_exec.h
+++ b/src/mesa/vbo/vbo_exec.h
@@ -140,6 +140,8 @@ struct vbo_exec_context
 void vbo_exec_init( GLcontext *ctx );
 void vbo_exec_destroy( GLcontext *ctx );
 void vbo_exec_invalidate_state( GLcontext *ctx, GLuint new_state );
+
+void vbo_exec_BeginVertices( GLcontext *ctx );
 void vbo_exec_FlushVertices( GLcontext *ctx, GLuint flags );
 
 
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c
index 23f4f8331e..093e3d2167 100644
--- a/src/mesa/vbo/vbo_exec_api.c
+++ b/src/mesa/vbo/vbo_exec_api.c
@@ -748,6 +748,12 @@ void vbo_exec_vtx_destroy( struct vbo_exec_context *exec )
    }
 }
 
+void vbo_exec_BeginVertices( GLcontext *ctx )
+{
+   struct vbo_exec_context *exec = &vbo_context(ctx)->exec;
+   if (0) _mesa_printf("%s\n", __FUNCTION__);
+//   vbo_exec_vtx_map( exec );
+}
 
 void vbo_exec_FlushVertices( GLcontext *ctx, GLuint flags )
 {
@@ -765,6 +771,10 @@ void vbo_exec_FlushVertices( GLcontext *ctx, GLuint flags )
       reset_attrfv( exec );
    }
 
+   /* Need to do this to ensure BeginVertices gets called again:
+    */
+   _mesa_restore_exec_vtxfmt( ctx );
+
    exec->ctx->Driver.NeedFlush = 0;
 }
 
-- 
cgit v1.2.3


From eb8a1d96424cb732b0a723cb1fdba90958d24e16 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keithw@vmware.com>
Date: Tue, 3 Mar 2009 10:44:35 +0000
Subject: mesa: add MapBufferRange driver callbacks

Will be needed in coming GL extensions (GL_map_buffer_range, GL 3.0).
Will be used by the vbo module to avoid reallocating vbo's at each
draw primitive call.
---
 src/mesa/main/dd.h | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index b1e006901b..b33c26dfed 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -36,6 +36,22 @@
 struct gl_pixelstore_attrib;
 struct mesa_display_list;
 
+#if FEATURE_ARB_vertex_buffer_object
+/* Modifies GL_MAP_UNSYNCHRONIZED_BIT to allow driver to fail (return
+ * NULL) if buffer is unavailable for immediate mapping.
+ *
+ * Does GL_MAP_INVALIDATE_RANGE_BIT do this?  It seems so, but it
+ * would require more book-keeping in the driver than seems necessary
+ * at this point.
+ *
+ * Does GL_MAP_INVALDIATE_BUFFER_BIT do this?  Not really -- we don't
+ * want to provoke the driver to throw away the old storage, we will
+ * respect the contents of already referenced data.
+ */
+#define MESA_MAP_NOWAIT_BIT       0x0040
+#endif
+
+
 /**
  * Device driver function table.
  * Core Mesa uses these function pointers to call into device drivers.
@@ -780,6 +796,16 @@ struct dd_function_table {
    void * (*MapBuffer)( GLcontext *ctx, GLenum target, GLenum access,
 			struct gl_buffer_object *obj );
 
+   /* May return NULL if MESA_MAP_NOWAIT_BIT is set in access:
+    */
+   void * (*MapBufferRange)( GLcontext *ctx, GLenum target,
+                             GLintptr offset, GLsizeiptr length, GLbitfield access,
+                             struct gl_buffer_object *obj);
+
+   void (*FlushMappedBufferRange) (GLcontext *ctx, GLenum target, 
+                                   GLintptr offset, GLsizeiptr length,
+                                   struct gl_buffer_object *obj);
+
    GLboolean (*UnmapBuffer)( GLcontext *ctx, GLenum target,
 			     struct gl_buffer_object *obj );
    /*@}*/
-- 
cgit v1.2.3


From de1caa550700ae38ff791c30f6d482f3efddebd0 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 3 Mar 2009 13:52:24 -0700
Subject: mesa: fix sw fallback state validation bug

When a hw driver fell back to swrast, swrast wasn't always getting informed
of program changes.  When fixed function is translated into shaders, flags
like _NEW_LIGHT, _NEW_TEXTURE, etc. should really signal _NEW_PROGRAM.
In this case, swrast wasn't seeing _NEW_PROGRAM when new fragment shaders
were generated.
---
 src/mesa/main/state.c | 38 ++++++++++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 10 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 9ea932ea96..9d03ee744d 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -202,13 +202,17 @@ update_program_enables(GLcontext *ctx)
  *
  * This function needs to be called after texture state validation in case
  * we're generating a fragment program from fixed-function texture state.
+ *
+ * \return bitfield which will indicate _NEW_PROGRAM state if a new vertex
+ * or fragment program is being used.
  */
-static void
+static GLbitfield
 update_program(GLcontext *ctx)
 {
    const struct gl_shader_program *shProg = ctx->Shader.CurrentProgram;
    const struct gl_vertex_program *prevVP = ctx->VertexProgram._Current;
    const struct gl_fragment_program *prevFP = ctx->FragmentProgram._Current;
+   GLbitfield new_state = 0x0;
 
    /*
     * Set the ctx->VertexProgram._Current and ctx->FragmentProgram._Current
@@ -278,15 +282,23 @@ update_program(GLcontext *ctx)
 
    /* Let the driver know what's happening:
     */
-   if (ctx->FragmentProgram._Current != prevFP && ctx->Driver.BindProgram) {
-      ctx->Driver.BindProgram(ctx, GL_FRAGMENT_PROGRAM_ARB,
-                              (struct gl_program *) ctx->FragmentProgram._Current);
+   if (ctx->FragmentProgram._Current != prevFP) {
+      new_state |= _NEW_PROGRAM;
+      if (ctx->Driver.BindProgram) {
+         ctx->Driver.BindProgram(ctx, GL_FRAGMENT_PROGRAM_ARB,
+                          (struct gl_program *) ctx->FragmentProgram._Current);
+      }
    }
    
-   if (ctx->VertexProgram._Current != prevVP && ctx->Driver.BindProgram) {
-      ctx->Driver.BindProgram(ctx, GL_VERTEX_PROGRAM_ARB,
-                              (struct gl_program *) ctx->VertexProgram._Current);
+   if (ctx->VertexProgram._Current != prevVP) {
+      new_state |= _NEW_PROGRAM;
+      if (ctx->Driver.BindProgram) {
+         ctx->Driver.BindProgram(ctx, GL_VERTEX_PROGRAM_ARB,
+                            (struct gl_program *) ctx->VertexProgram._Current);
+      }
    }
+
+   return new_state;
 }
 
 
@@ -447,6 +459,7 @@ _mesa_update_state_locked( GLcontext *ctx )
 {
    GLbitfield new_state = ctx->NewState;
    GLbitfield prog_flags = _NEW_PROGRAM;
+   GLbitfield new_prog_state = 0x0;
 
    if (new_state == _NEW_CURRENT_ATTRIB) 
       goto out;
@@ -531,8 +544,13 @@ _mesa_update_state_locked( GLcontext *ctx )
    if (new_state & _MESA_NEW_NEED_EYE_COORDS) 
       _mesa_update_tnl_spaces( ctx, new_state );
 
-   if (new_state & prog_flags)
-      update_program( ctx );
+   if (new_state & prog_flags) {
+      /* When we generate programs from fixed-function vertex/fragment state
+       * this call may generate/bind a new program.  If so, we need to
+       * propogate the _NEW_PROGRAM flag to the driver.
+       */
+      new_prog_state |= update_program( ctx );
+   }
 
    /*
     * Give the driver a chance to act upon the new_state flags.
@@ -544,7 +562,7 @@ _mesa_update_state_locked( GLcontext *ctx )
     * Driver.UpdateState() has to call FLUSH_VERTICES().  (fixed?)
     */
  out:
-   new_state = ctx->NewState;
+   new_state = ctx->NewState | new_prog_state;
    ctx->NewState = 0;
    ctx->Driver.UpdateState(ctx, new_state);
    ctx->Array.NewState = 0;
-- 
cgit v1.2.3


From 8ad65a23d14f82461c00b1d8dcc1393167f36ab0 Mon Sep 17 00:00:00 2001
From: José Fonseca <jfonseca@vmware.com>
Date: Wed, 4 Mar 2009 17:49:52 +0000
Subject: mesa: Follow ARB_map_buffer_range more stricly.

Namelly, FlushMappedBufferRange takes a subrange relative to the original
range.
---
 src/mesa/main/mtypes.h                       |  2 ++
 src/mesa/state_tracker/st_cb_bufferobjects.c | 32 ++++++++++++++++++++++------
 src/mesa/vbo/vbo_exec_draw.c                 | 15 +++++++------
 3 files changed, 37 insertions(+), 12 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index f906de8357..baf5850b83 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1499,6 +1499,8 @@ struct gl_buffer_object
    GLenum Usage;
    GLenum Access;
    GLvoid *Pointer;          /**< Only valid while buffer is mapped */
+   GLintptr Offset;          /**< mapped offset */
+   GLsizeiptr Length;        /**< mapped length */
    GLsizeiptrARB Size;       /**< Size of storage in bytes */
    GLubyte *Data;            /**< Location of storage either in RAM or VRAM. */
    GLboolean OnCard;         /**< Is buffer in VRAM? (hardware drivers) */
diff --git a/src/mesa/state_tracker/st_cb_bufferobjects.c b/src/mesa/state_tracker/st_cb_bufferobjects.c
index 45fbe8c76e..3651e4ae7d 100644
--- a/src/mesa/state_tracker/st_cb_bufferobjects.c
+++ b/src/mesa/state_tracker/st_cb_bufferobjects.c
@@ -201,6 +201,10 @@ st_bufferobj_map(GLcontext *ctx, GLenum target, GLenum access,
    }
 
    obj->Pointer = pipe_buffer_map(pipe->screen, st_obj->buffer, flags);
+   if(obj->Pointer) {
+      obj->Offset = 0;
+      obj->Length = obj->Size;
+   }
    return obj->Pointer;
 }
 
@@ -231,11 +235,18 @@ st_bufferobj_map_range(GLcontext *ctx, GLenum target,
    if (access & MESA_MAP_NOWAIT_BIT)
       flags |= PIPE_BUFFER_USAGE_DONTBLOCK;
 
-   map = pipe_buffer_map_range(pipe->screen, st_obj->buffer, offset, length, flags);
-   /* this is expected to point to the buffer start, in order to calculate the
-    * vertices offsets 
-    */
-   obj->Pointer = map ? map - offset : NULL;
+   assert(offset >= 0);
+   assert(length >= 0);
+   assert(offset < obj->Size);
+   assert(offset + length <= obj->Size);
+
+   map = obj->Pointer = pipe_buffer_map_range(pipe->screen, st_obj->buffer, offset, length, flags);
+   if(obj->Pointer) {
+      obj->Offset = 0;
+      obj->Length = obj->Size;
+      map += offset;
+   }
+   
    return map;
 }
 
@@ -248,7 +259,14 @@ st_bufferobj_flush_mapped_range(GLcontext *ctx, GLenum target,
    struct pipe_context *pipe = st_context(ctx)->pipe;
    struct st_buffer_object *st_obj = st_buffer_object(obj);
 
-   pipe_buffer_flush_mapped_range(pipe->screen, st_obj->buffer, offset, length);
+   /* Subrange is relative to mapped range */
+   assert(offset >= 0);
+   assert(length >= 0);
+   assert(offset < obj->Length);
+   assert(offset + length <= obj->Length);
+   
+   pipe_buffer_flush_mapped_range(pipe->screen, st_obj->buffer, 
+                                  obj->Offset + offset, length);
 }
 
 
@@ -263,6 +281,8 @@ st_bufferobj_unmap(GLcontext *ctx, GLenum target, struct gl_buffer_object *obj)
 
    pipe_buffer_unmap(pipe->screen, st_obj->buffer);
    obj->Pointer = NULL;
+   obj->Offset = 0;
+   obj->Length = 0;
    return GL_TRUE;
 }
 
diff --git a/src/mesa/vbo/vbo_exec_draw.c b/src/mesa/vbo/vbo_exec_draw.c
index 6f8d1f8eb0..b378745916 100644
--- a/src/mesa/vbo/vbo_exec_draw.c
+++ b/src/mesa/vbo/vbo_exec_draw.c
@@ -240,13 +240,16 @@ static void vbo_exec_vtx_unmap( struct vbo_exec_context *exec )
 
    if (exec->vtx.bufferobj->Name) {
       GLcontext *ctx = exec->ctx;
-      GLintptr offset = exec->vtx.buffer_used;
-      GLsizeiptr length = (exec->vtx.buffer_ptr - exec->vtx.buffer_map) * sizeof(float);
       
-      if(ctx->Driver.FlushMappedBufferRange)
-         ctx->Driver.FlushMappedBufferRange(ctx, target,
-                                            offset, length,
-                                            exec->vtx.bufferobj);
+      if(ctx->Driver.FlushMappedBufferRange) {
+         GLintptr offset = exec->vtx.buffer_used - exec->vtx.bufferobj->Offset;
+         GLsizeiptr length = (exec->vtx.buffer_ptr - exec->vtx.buffer_map) * sizeof(float);
+
+         if(length)
+            ctx->Driver.FlushMappedBufferRange(ctx, target,
+                                               offset, length,
+                                               exec->vtx.bufferobj);
+      }
 
       exec->vtx.buffer_used += (exec->vtx.buffer_ptr -
                                 exec->vtx.buffer_map) * sizeof(float);
-- 
cgit v1.2.3


From 2cbc4655a892e5924e51a4c59696c776bcf60716 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 4 Mar 2009 16:40:22 -0700
Subject: mesa: new cpuinfo.c file to init/query cpu info and extensions

---
 src/mesa/SConscript     |   1 +
 src/mesa/main/cpuinfo.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/mesa/main/cpuinfo.h |  47 +++++++++++++++++++++
 src/mesa/sources.mak    |   1 +
 4 files changed, 158 insertions(+)
 create mode 100644 src/mesa/main/cpuinfo.c
 create mode 100644 src/mesa/main/cpuinfo.h

(limited to 'src/mesa/main')

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index f8edb25d7a..b2f3d96d93 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -40,6 +40,7 @@ if env['platform'] != 'winddk':
 		'main/colortab.c',
 		'main/context.c',
 		'main/convolve.c',
+		'main/cpuinfo.c',
 		'main/debug.c',
 		'main/depth.c',
 		'main/depthstencil.c',
diff --git a/src/mesa/main/cpuinfo.c b/src/mesa/main/cpuinfo.c
new file mode 100644
index 0000000000..b4bfb40eb1
--- /dev/null
+++ b/src/mesa/main/cpuinfo.c
@@ -0,0 +1,109 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.5
+ *
+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "main/imports.h"
+#include "main/cpuinfo.h"
+
+
+/**
+ * This function should be called before the various "cpu_has_foo" macros
+ * are used.
+ */
+void
+_mesa_get_cpu_features(void)
+{
+#ifdef USE_X86_ASM
+   _mesa_get_x86_features();
+#endif
+}
+
+
+/**
+ * Return a string describing the CPU architexture and extensions that
+ * Mesa is using (such as SSE or Altivec).
+ * \return information string, free it with _mesa_free()
+ */
+char *
+_mesa_get_cpu_string(void)
+{
+#define MAX_STRING 50
+   char *buffer;
+
+   buffer = (char *) _mesa_malloc(MAX_STRING);
+   if (!buffer)
+      return NULL;
+
+   buffer[0] = 0;
+
+#ifdef USE_X86_ASM
+
+   if (_mesa_x86_cpu_features) {
+      strcat(buffer, "x86");
+   }
+
+# ifdef USE_MMX_ASM
+   if (cpu_has_mmx) {
+      strcat(buffer, (cpu_has_mmxext) ? "/MMX+" : "/MMX");
+   }
+# endif
+# ifdef USE_3DNOW_ASM
+   if (cpu_has_3dnow) {
+      strcat(buffer, (cpu_has_3dnowext) ? "/3DNow!+" : "/3DNow!");
+   }
+# endif
+# ifdef USE_SSE_ASM
+   if (cpu_has_xmm) {
+      strcat(buffer, (cpu_has_xmm2) ? "/SSE2" : "/SSE");
+   }
+# endif
+
+#elif defined(USE_SPARC_ASM)
+
+   strcat(buffer, "SPARC");
+
+#elif defined(USE_PPC_ASM)
+
+   if (_mesa_ppc_cpu_features) {
+      strcat(buffer, (cpu_has_64) ? "PowerPC 64" : "PowerPC");
+   }
+
+# ifdef USE_VMX_ASM
+
+   if (cpu_has_vmx) {
+      strcat(buffer, "/Altivec");
+   }
+
+# endif
+
+   if (! cpu_has_fpu) {
+      strcat(buffer, "/No FPU");
+   }
+
+#endif
+
+   assert(_mesa_strlen(buffer) < MAX_STRING);
+
+   return buffer;
+}
diff --git a/src/mesa/main/cpuinfo.h b/src/mesa/main/cpuinfo.h
new file mode 100644
index 0000000000..c41a90b075
--- /dev/null
+++ b/src/mesa/main/cpuinfo.h
@@ -0,0 +1,47 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.5
+ *
+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef CPUINFO_H
+#define CPUINFO_H
+
+
+#if defined(USE_X86_ASM)
+#include "x86/common_x86_asm.h"
+#endif
+
+#if defined(USE_PPC_ASM)
+#include "ppc/common_ppc_features.h"
+#endif
+
+
+extern void
+_mesa_get_cpu_features(void);
+
+
+extern char *
+_mesa_get_cpu_string(void);
+
+
+#endif /* CPUINFO_H */
diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 66b4625bfd..f019ef40ba 100644
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -17,6 +17,7 @@ MAIN_SOURCES = \
 	main/colortab.c \
 	main/context.c \
 	main/convolve.c \
+	main/cpuinfo.c \
 	main/debug.c \
 	main/depth.c \
 	main/depthstencil.c \
-- 
cgit v1.2.3


From 7979c6024ca81257164d3560a0366c1c52529b0e Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 4 Mar 2009 16:43:07 -0700
Subject: mesa: call _mesa_get_cpu_features() during one-time-init

---
 src/mesa/main/context.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 97ee925c0b..27fc26a2a4 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -94,6 +94,7 @@
 #include "colortab.h"
 #endif
 #include "context.h"
+#include "cpuinfo.h"
 #include "debug.h"
 #include "depth.h"
 #if FEATURE_dlist
@@ -414,6 +415,8 @@ one_time_init( GLcontext *ctx )
       assert( sizeof(GLint) == 4 );
       assert( sizeof(GLuint) == 4 );
 
+      _mesa_get_cpu_features();
+
       _mesa_init_sqrt_table();
 
       for (i = 0; i < 256; i++) {
-- 
cgit v1.2.3


From f6159ba4d5da9579de55afb01b4f460f9b8a0327 Mon Sep 17 00:00:00 2001
From: José Fonseca <jfonseca@vmware.com>
Date: Fri, 6 Mar 2009 14:01:24 +0000
Subject: mesa: Fix typo.

Windows threads block if one over-unlocks them.
---
 src/mesa/main/hash.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/hash.c b/src/mesa/main/hash.c
index ffb2c4d946..976f9d999b 100644
--- a/src/mesa/main/hash.c
+++ b/src/mesa/main/hash.c
@@ -300,7 +300,7 @@ _mesa_HashWalk(const struct _mesa_HashTable *table,
    GLuint pos;
    ASSERT(table);
    ASSERT(callback);
-   _glthread_UNLOCK_MUTEX(table2->Mutex);
+   _glthread_LOCK_MUTEX(table2->Mutex);
    for (pos = 0; pos < TABLE_SIZE; pos++) {
       struct HashEntry *entry;
       for (entry = table->Table[pos]; entry; entry = entry->Next) {
-- 
cgit v1.2.3


From 8bbb6b352ad7fabb2cc5ec4b82244d39495e80ac Mon Sep 17 00:00:00 2001
From: José Fonseca <jfonseca@vmware.com>
Date: Fri, 6 Mar 2009 14:02:42 +0000
Subject: mesa: Reads must also be done with lock held.

Otherwise two threads might think each made the refcount go zero.
---
 src/mesa/main/context.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 27fc26a2a4..05b19a4350 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1310,6 +1310,8 @@ _mesa_create_context(const GLvisual *visual,
 void
 _mesa_free_context_data( GLcontext *ctx )
 {
+   GLint RefCount;
+
    if (!_mesa_get_current_context()){
       /* No current context, but we may need one in order to delete
        * texture objs, etc.  So temporarily bind the context now.
@@ -1361,10 +1363,10 @@ _mesa_free_context_data( GLcontext *ctx )
 
    /* Shared context state (display lists, textures, etc) */
    _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
-   ctx->Shared->RefCount--;
-   assert(ctx->Shared->RefCount >= 0);
+   RefCount = --ctx->Shared->RefCount;
    _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
-   if (ctx->Shared->RefCount == 0) {
+   assert(RefCount >= 0);
+   if (RefCount == 0) {
       /* free shared state */
       free_shared_state( ctx, ctx->Shared );
    }
-- 
cgit v1.2.3


From d42cfa6e6ea458a3eb05310d4c25acc777820fea Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 6 Mar 2009 15:55:33 -0700
Subject: mesa: added _mesa_read_shader() function to read shaders from files

Useful for debugging to override an application's shader.
---
 src/mesa/main/shaders.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/shaders.c b/src/mesa/main/shaders.c
index 7491d00c35..be93b45a7d 100644
--- a/src/mesa/main/shaders.c
+++ b/src/mesa/main/shaders.c
@@ -374,6 +374,43 @@ _mesa_LinkProgramARB(GLhandleARB programObj)
 }
 
 
+
+/**
+ * Read shader source code from a file.
+ * Useful for debugging to override an app's shader.
+ */
+static GLcharARB *
+_mesa_read_shader(const char *fname)
+{
+   const int max = 50*1000;
+   FILE *f = fopen(fname, "r");
+   GLcharARB *buffer, *shader;
+   int len;
+
+   if (!f) {
+      _mesa_fprintf(stderr, "Unable to open shader file %s\n", fname);
+      return NULL;
+   }
+
+   buffer = (char *) malloc(max);
+   len = fread(buffer, 1, max, f);
+   buffer[len] = 0;
+
+   fclose(f);
+
+   shader = _mesa_strdup(buffer);
+   free(buffer);
+
+   if (0) {
+      _mesa_fprintf(stderr, "Read shader %s:\n", fname);
+      _mesa_fprintf(stderr, "%s\n", shader);
+   }
+
+   return shader;
+}
+
+
+
 /**
  * Called via glShaderSource() and glShaderSourceARB() API functions.
  * Basically, concatenate the source code strings into one long string
@@ -438,6 +475,20 @@ _mesa_ShaderSourceARB(GLhandleARB shaderObj, GLsizei count,
    source[totalLength - 1] = '\0';
    source[totalLength - 2] = '\0';
 
+#if 0
+   if (0) {
+      GLcharARB *newSource;
+
+      newSource = _mesa_read_shader("newshader.frag");
+      if (newSource) {
+         _mesa_free(source);
+         source = newSource;
+      }
+   }
+#else
+   (void) _mesa_read_shader;
+#endif
+
    ctx->Driver.ShaderSource(ctx, shaderObj, source);
 
    _mesa_free(offsets);
-- 
cgit v1.2.3


From a06dd4de8756d7ebe99ed414c8d8dca5083241b8 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed, 16 Jul 2008 12:47:27 -0700
Subject: Add Solaris to OS'es using PROT_EXEC mmap() to get executable heap
 space

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
---
 src/mesa/main/execmem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/execmem.c b/src/mesa/main/execmem.c
index f95c31862a..b71846c904 100644
--- a/src/mesa/main/execmem.c
+++ b/src/mesa/main/execmem.c
@@ -36,7 +36,7 @@
 
 
 
-#if defined(__linux__) || defined(__OpenBSD__) || defined(_NetBSD__)
+#if defined(__linux__) || defined(__OpenBSD__) || defined(_NetBSD__) || defined(__sun)
 
 /*
  * Allocate a large block of memory which can hold code then dole it out
-- 
cgit v1.2.3


From 0f04a1d3f8989b0a391e6dad80abf06ce151d1f1 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Sat, 7 Mar 2009 11:32:18 -0700
Subject: mesa: remove last of _mesa_unreference_framebuffer() calls

---
 src/mesa/drivers/dri/fb/fb_dri.c               |  2 +-
 src/mesa/drivers/dri/ffb/ffb_xmesa.c           |  2 +-
 src/mesa/drivers/dri/gamma/gamma_xmesa.c       |  2 +-
 src/mesa/drivers/dri/i810/i810screen.c         |  2 +-
 src/mesa/drivers/dri/intel/intel_screen.c      |  2 +-
 src/mesa/drivers/dri/mach64/mach64_screen.c    |  2 +-
 src/mesa/drivers/dri/mga/mga_xmesa.c           |  2 +-
 src/mesa/drivers/dri/r128/r128_screen.c        |  2 +-
 src/mesa/drivers/dri/radeon/radeon_screen.c    |  2 +-
 src/mesa/drivers/dri/s3v/s3v_xmesa.c           |  2 +-
 src/mesa/drivers/dri/savage/savage_xmesa.c     |  2 +-
 src/mesa/drivers/dri/sis/sis_screen.c          |  2 +-
 src/mesa/drivers/dri/swrast/swrast.c           |  2 +-
 src/mesa/drivers/dri/tdfx/tdfx_screen.c        |  2 +-
 src/mesa/drivers/dri/trident/trident_context.c |  2 +-
 src/mesa/drivers/dri/unichrome/via_screen.c    |  2 +-
 src/mesa/drivers/windows/gdi/mesa.def          |  2 +-
 src/mesa/drivers/windows/gdi/wmesa.c           |  2 +-
 src/mesa/main/framebuffer.c                    | 16 ----------------
 src/mesa/main/framebuffer.h                    |  3 ---
 src/mesa/state_tracker/st_framebuffer.c        |  2 +-
 21 files changed, 19 insertions(+), 38 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/fb/fb_dri.c b/src/mesa/drivers/dri/fb/fb_dri.c
index f1194d7ce8..571b8922d5 100644
--- a/src/mesa/drivers/dri/fb/fb_dri.c
+++ b/src/mesa/drivers/dri/fb/fb_dri.c
@@ -480,7 +480,7 @@ fbCreateBuffer( __DRIscreenPrivate *driScrnPriv,
 static void
 fbDestroyBuffer(__DRIdrawablePrivate *driDrawPriv)
 {
-   _mesa_unreference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)));
+   _mesa_reference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)), NULL);
 }
 
 
diff --git a/src/mesa/drivers/dri/ffb/ffb_xmesa.c b/src/mesa/drivers/dri/ffb/ffb_xmesa.c
index 00bdcec7a6..3b9f5c6759 100644
--- a/src/mesa/drivers/dri/ffb/ffb_xmesa.c
+++ b/src/mesa/drivers/dri/ffb/ffb_xmesa.c
@@ -394,7 +394,7 @@ ffbCreateBuffer(__DRIscreenPrivate *driScrnPriv,
 static void
 ffbDestroyBuffer(__DRIdrawablePrivate *driDrawPriv)
 {
-   _mesa_unreference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)));
+   _mesa_reference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)), NULL);
 }
 
 
diff --git a/src/mesa/drivers/dri/gamma/gamma_xmesa.c b/src/mesa/drivers/dri/gamma/gamma_xmesa.c
index 2a28902e1e..7b5b53589c 100644
--- a/src/mesa/drivers/dri/gamma/gamma_xmesa.c
+++ b/src/mesa/drivers/dri/gamma/gamma_xmesa.c
@@ -96,7 +96,7 @@ gammaCreateBuffer( __DRIscreenPrivate *driScrnPriv,
 static void
 gammaDestroyBuffer(__DRIdrawablePrivate *driDrawPriv)
 {
-   _mesa_unreference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)));
+   _mesa_reference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)), NULL);
 }
 
 static void
diff --git a/src/mesa/drivers/dri/i810/i810screen.c b/src/mesa/drivers/dri/i810/i810screen.c
index 9a5a39c1db..6e49f3466c 100644
--- a/src/mesa/drivers/dri/i810/i810screen.c
+++ b/src/mesa/drivers/dri/i810/i810screen.c
@@ -341,7 +341,7 @@ i810CreateBuffer( __DRIscreenPrivate *driScrnPriv,
 static void
 i810DestroyBuffer(__DRIdrawablePrivate *driDrawPriv)
 {
-    _mesa_unreference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)));
+   _mesa_reference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)), NULL);
 }
 
 const struct __DriverAPIRec driDriverAPI = {
diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
index bccdd55f88..e8c074712c 100644
--- a/src/mesa/drivers/dri/intel/intel_screen.c
+++ b/src/mesa/drivers/dri/intel/intel_screen.c
@@ -394,7 +394,7 @@ intelCreateBuffer(__DRIscreenPrivate * driScrnPriv,
 static void
 intelDestroyBuffer(__DRIdrawablePrivate * driDrawPriv)
 {
-   _mesa_unreference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)));
+   _mesa_reference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)), NULL);
 }
 
 
diff --git a/src/mesa/drivers/dri/mach64/mach64_screen.c b/src/mesa/drivers/dri/mach64/mach64_screen.c
index 43e59594dd..6440027ca4 100644
--- a/src/mesa/drivers/dri/mach64/mach64_screen.c
+++ b/src/mesa/drivers/dri/mach64/mach64_screen.c
@@ -374,7 +374,7 @@ mach64CreateBuffer( __DRIscreenPrivate *driScrnPriv,
 static void
 mach64DestroyBuffer(__DRIdrawablePrivate *driDrawPriv)
 {
-   _mesa_unreference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)));
+   _mesa_reference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)), NULL);
 }
 
 
diff --git a/src/mesa/drivers/dri/mga/mga_xmesa.c b/src/mesa/drivers/dri/mga/mga_xmesa.c
index 926534d6df..0dc76fea50 100644
--- a/src/mesa/drivers/dri/mga/mga_xmesa.c
+++ b/src/mesa/drivers/dri/mga/mga_xmesa.c
@@ -816,7 +816,7 @@ mgaCreateBuffer( __DRIscreenPrivate *driScrnPriv,
 static void
 mgaDestroyBuffer(__DRIdrawablePrivate *driDrawPriv)
 {
-   _mesa_unreference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)));
+   _mesa_reference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)), NULL);
 }
 
 static void
diff --git a/src/mesa/drivers/dri/r128/r128_screen.c b/src/mesa/drivers/dri/r128/r128_screen.c
index 7cda4ca5d3..f5bcc2f290 100644
--- a/src/mesa/drivers/dri/r128/r128_screen.c
+++ b/src/mesa/drivers/dri/r128/r128_screen.c
@@ -353,7 +353,7 @@ r128CreateBuffer( __DRIscreenPrivate *driScrnPriv,
 static void
 r128DestroyBuffer(__DRIdrawablePrivate *driDrawPriv)
 {
-   _mesa_unreference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)));
+   _mesa_reference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)), NULL);
 }
 
 
diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c
index 7e1fe9cda4..e964feb9cc 100644
--- a/src/mesa/drivers/dri/radeon/radeon_screen.c
+++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
@@ -1117,7 +1117,7 @@ radeonCreateBuffer( __DRIscreenPrivate *driScrnPriv,
 static void
 radeonDestroyBuffer(__DRIdrawablePrivate *driDrawPriv)
 {
-   _mesa_unreference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)));
+   _mesa_reference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)), NULL);
 }
 
 #if RADEON_COMMON && defined(RADEON_COMMON_FOR_R300)
diff --git a/src/mesa/drivers/dri/s3v/s3v_xmesa.c b/src/mesa/drivers/dri/s3v/s3v_xmesa.c
index b18c8763c3..9639f088b7 100644
--- a/src/mesa/drivers/dri/s3v/s3v_xmesa.c
+++ b/src/mesa/drivers/dri/s3v/s3v_xmesa.c
@@ -131,7 +131,7 @@ s3vCreateBuffer( __DRIscreenPrivate *driScrnPriv,
 static void
 s3vDestroyBuffer(__DRIdrawablePrivate *driDrawPriv)
 {
-   _mesa_unreference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)));
+   _mesa_reference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)), NULL);
 }
 
 static void
diff --git a/src/mesa/drivers/dri/savage/savage_xmesa.c b/src/mesa/drivers/dri/savage/savage_xmesa.c
index 326d595352..a94f1c076c 100644
--- a/src/mesa/drivers/dri/savage/savage_xmesa.c
+++ b/src/mesa/drivers/dri/savage/savage_xmesa.c
@@ -678,7 +678,7 @@ savageCreateBuffer( __DRIscreenPrivate *driScrnPriv,
 static void
 savageDestroyBuffer(__DRIdrawablePrivate *driDrawPriv)
 {
-   _mesa_unreference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)));
+   _mesa_reference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)), NULL);
 }
 
 #if 0
diff --git a/src/mesa/drivers/dri/sis/sis_screen.c b/src/mesa/drivers/dri/sis/sis_screen.c
index 9eb27fef08..b5f04ae28d 100644
--- a/src/mesa/drivers/dri/sis/sis_screen.c
+++ b/src/mesa/drivers/dri/sis/sis_screen.c
@@ -221,7 +221,7 @@ sisCreateBuffer( __DRIscreenPrivate *driScrnPriv,
 static void
 sisDestroyBuffer(__DRIdrawablePrivate *driDrawPriv)
 {
-   _mesa_unreference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)));
+   _mesa_reference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)), NULL);
 }
 
 static void sisCopyBuffer( __DRIdrawablePrivate *dPriv )
diff --git a/src/mesa/drivers/dri/swrast/swrast.c b/src/mesa/drivers/dri/swrast/swrast.c
index 2e7f11327e..fbfa49c99d 100644
--- a/src/mesa/drivers/dri/swrast/swrast.c
+++ b/src/mesa/drivers/dri/swrast/swrast.c
@@ -476,7 +476,7 @@ driDestroyDrawable(__DRIdrawable *buf)
 	_mesa_free(buf->row);
 
 	fb->DeletePending = GL_TRUE;
-	_mesa_unreference_framebuffer(&fb);
+	_mesa_reference_framebuffer(&fb, NULL);
     }
 }
 
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_screen.c b/src/mesa/drivers/dri/tdfx/tdfx_screen.c
index 5f2f5cfff5..58bd48b294 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_screen.c
+++ b/src/mesa/drivers/dri/tdfx/tdfx_screen.c
@@ -232,7 +232,7 @@ tdfxCreateBuffer( __DRIscreenPrivate *driScrnPriv,
 static void
 tdfxDestroyBuffer(__DRIdrawablePrivate *driDrawPriv)
 {
-   _mesa_unreference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)));
+   _mesa_reference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)), NULL);
 }
 
 
diff --git a/src/mesa/drivers/dri/trident/trident_context.c b/src/mesa/drivers/dri/trident/trident_context.c
index aefd8a243f..df558c1beb 100644
--- a/src/mesa/drivers/dri/trident/trident_context.c
+++ b/src/mesa/drivers/dri/trident/trident_context.c
@@ -281,7 +281,7 @@ tridentCreateBuffer( __DRIscreenPrivate *driScrnPriv,
 static void
 tridentDestroyBuffer(__DRIdrawablePrivate *driDrawPriv)
 {
-   _mesa_unreference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)));
+   _mesa_reference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)), NULL);
 }
 
 static void
diff --git a/src/mesa/drivers/dri/unichrome/via_screen.c b/src/mesa/drivers/dri/unichrome/via_screen.c
index e9f566161c..3dbb570571 100644
--- a/src/mesa/drivers/dri/unichrome/via_screen.c
+++ b/src/mesa/drivers/dri/unichrome/via_screen.c
@@ -316,7 +316,7 @@ viaCreateBuffer(__DRIscreenPrivate *driScrnPriv,
 static void
 viaDestroyBuffer(__DRIdrawablePrivate *driDrawPriv)
 {
-   _mesa_unreference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)));
+   _mesa_reference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)), NULL);
 }
 
 static const __DRIconfig **
diff --git a/src/mesa/drivers/windows/gdi/mesa.def b/src/mesa/drivers/windows/gdi/mesa.def
index b386e34aad..ede43ef4c0 100644
--- a/src/mesa/drivers/windows/gdi/mesa.def
+++ b/src/mesa/drivers/windows/gdi/mesa.def
@@ -940,7 +940,7 @@ EXPORTS
 	_mesa_store_texsubimage3d
 	_mesa_strcmp
 	_mesa_test_proxy_teximage
-	_mesa_unreference_framebuffer
+	_mesa_reference_framebuffer
 	_mesa_update_framebuffer_visual
 	_mesa_use_program
 	_mesa_Viewport
diff --git a/src/mesa/drivers/windows/gdi/wmesa.c b/src/mesa/drivers/windows/gdi/wmesa.c
index 80746950c7..d1103f3167 100644
--- a/src/mesa/drivers/windows/gdi/wmesa.c
+++ b/src/mesa/drivers/windows/gdi/wmesa.c
@@ -62,7 +62,7 @@ wmesa_free_framebuffer(HDC hdc)
 	else
 	    prev->next = pwfb->next;
         fb = &pwfb->Base;
-        _mesa_unreference_framebuffer(&fb); 
+        _mesa_reference_framebuffer(&fb, NULL); 
     }
 }
 
diff --git a/src/mesa/main/framebuffer.c b/src/mesa/main/framebuffer.c
index 351bf6959a..b69b92a965 100644
--- a/src/mesa/main/framebuffer.c
+++ b/src/mesa/main/framebuffer.c
@@ -251,22 +251,6 @@ _mesa_reference_framebuffer(struct gl_framebuffer **ptr,
 }
 
 
-/**
- * XXX this function is deprecated.
- * Undo/remove a reference to a framebuffer object.
- * Decrement the framebuffer object's reference count and delete it when
- * the refcount hits zero.
- * Note: we pass the address of a pointer and set it to NULL.
- */
-void
-_mesa_unreference_framebuffer(struct gl_framebuffer **fb)
-{
-   _mesa_reference_framebuffer(fb, NULL);
-}
-
-
-
-
 /**
  * Resize the given framebuffer's renderbuffers to the new width and height.
  * This should only be used for window-system framebuffers, not
diff --git a/src/mesa/main/framebuffer.h b/src/mesa/main/framebuffer.h
index e9eeed28cb..45a4703ba9 100644
--- a/src/mesa/main/framebuffer.h
+++ b/src/mesa/main/framebuffer.h
@@ -46,9 +46,6 @@ extern void
 _mesa_reference_framebuffer(struct gl_framebuffer **ptr,
                             struct gl_framebuffer *fb);
 
-extern void
-_mesa_unreference_framebuffer(struct gl_framebuffer **fb);
-
 extern void
 _mesa_resize_framebuffer(GLcontext *ctx, struct gl_framebuffer *fb,
                          GLuint width, GLuint height);
diff --git a/src/mesa/state_tracker/st_framebuffer.c b/src/mesa/state_tracker/st_framebuffer.c
index d76a1eae09..ae66c1176e 100644
--- a/src/mesa/state_tracker/st_framebuffer.c
+++ b/src/mesa/state_tracker/st_framebuffer.c
@@ -154,7 +154,7 @@ void st_resize_framebuffer( struct st_framebuffer *stfb,
 
 void st_unreference_framebuffer( struct st_framebuffer *stfb )
 {
-   _mesa_unreference_framebuffer((struct gl_framebuffer **) &stfb);
+   _mesa_reference_framebuffer((struct gl_framebuffer **) &stfb, NULL);
 }
 
 
-- 
cgit v1.2.3


From 69e07bdeb42f2454f5052f86119adfb68f253098 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Sat, 7 Mar 2009 11:53:18 -0700
Subject: mesa: remove GL_MESA_program_debug extension

This was never fully fleshed out and hasn't been used.
---
 docs/MESA_shader_debug.spec              |   2 +-
 src/mesa/SConscript                      |   1 -
 src/mesa/drivers/common/driverfuncs.c    |   3 -
 src/mesa/drivers/dri/tdfx/tdfx_context.c |   4 -
 src/mesa/drivers/glide/fxdd.c            |   1 -
 src/mesa/main/dd.h                       |   3 -
 src/mesa/main/enable.c                   |  22 ---
 src/mesa/main/extensions.c               |   4 -
 src/mesa/main/ffvertex_prog.c            |   1 -
 src/mesa/main/get.c                      |  48 ------
 src/mesa/main/get_gen.py                 |  10 --
 src/mesa/main/getstring.c                |  30 ----
 src/mesa/main/mfeatures.h                |   1 -
 src/mesa/main/mtypes.h                   |  15 --
 src/mesa/shader/arbprogparse.c           |   9 --
 src/mesa/shader/nvfragparse.c            |   4 -
 src/mesa/shader/nvvertparse.c            |   7 -
 src/mesa/shader/prog_debug.c             | 255 -------------------------------
 src/mesa/shader/prog_debug.h             |  44 ------
 src/mesa/shader/prog_execute.c           |  41 -----
 src/mesa/shader/prog_instruction.h       |   5 -
 src/mesa/sources.mak                     |   1 -
 src/mesa/swrast/swrast.h                 |   6 -
 23 files changed, 1 insertion(+), 516 deletions(-)
 delete mode 100644 src/mesa/shader/prog_debug.c
 delete mode 100644 src/mesa/shader/prog_debug.h

(limited to 'src/mesa/main')

diff --git a/docs/MESA_shader_debug.spec b/docs/MESA_shader_debug.spec
index 1f7d42ac91..fab92abc76 100644
--- a/docs/MESA_shader_debug.spec
+++ b/docs/MESA_shader_debug.spec
@@ -13,7 +13,7 @@ Contact
 
 Status
 
-    XXX - Not complete yet!!!
+    Obsolete.
 
 Version
 
diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 273ce11280..2e0168e0bc 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -189,7 +189,6 @@ if env['platform'] != 'winddk':
 		'shader/nvvertparse.c',
 		'shader/program.c',
 		'shader/prog_cache.c',
-		'shader/prog_debug.c',
 		'shader/prog_execute.c',
 		'shader/prog_instruction.c',
 		'shader/prog_noise.c',
diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c
index 9bee212c6a..44adaf8682 100644
--- a/src/mesa/drivers/common/driverfuncs.c
+++ b/src/mesa/drivers/common/driverfuncs.c
@@ -134,9 +134,6 @@ _mesa_init_driver_functions(struct dd_function_table *driver)
    driver->BindProgram = NULL;
    driver->NewProgram = _mesa_new_program;
    driver->DeleteProgram = _mesa_delete_program;
-#if FEATURE_MESA_program_debug
-   driver->GetProgramRegister = _mesa_get_program_register;
-#endif /* FEATURE_MESA_program_debug */
 
    /* simple state commands */
    driver->AlphaFunc = NULL;
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_context.c b/src/mesa/drivers/dri/tdfx/tdfx_context.c
index 20046fcb3a..68b5027561 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_context.c
+++ b/src/mesa/drivers/dri/tdfx/tdfx_context.c
@@ -67,7 +67,6 @@
 #define need_GL_EXT_fog_coord
 #define need_GL_EXT_paletted_texture
 /* #define need_GL_EXT_secondary_color */
-/* #define need_GL_MESA_program_debug */
 /* #define need_GL_NV_vertex_program */
 #include "extension_helper.h"
 
@@ -101,9 +100,6 @@ const struct dri_extension card_extensions[] =
 #ifdef need_GL_NV_vertex_program
     { "GL_NV_vertex_program",              GL_NV_vertex_program_functions }
     { "GL_NV_vertex_program1_1",           NULL },
-#endif
-#ifdef need_GL_MESA_program_debug
-    { "GL_MESA_program_debug",             GL_MESA_program_debug_functions },
 #endif
     { NULL,                                NULL }
 };
diff --git a/src/mesa/drivers/glide/fxdd.c b/src/mesa/drivers/glide/fxdd.c
index 1bcf2512a6..2bc60399ea 100644
--- a/src/mesa/drivers/glide/fxdd.c
+++ b/src/mesa/drivers/glide/fxdd.c
@@ -1922,7 +1922,6 @@ fxDDInitExtensions(GLcontext * ctx)
       _mesa_enable_extension(ctx, "GL_ARB_vertex_program");
       _mesa_enable_extension(ctx, "GL_NV_vertex_program");
       _mesa_enable_extension(ctx, "GL_NV_vertex_program1_1");
-      _mesa_enable_extension(ctx, "GL_MESA_program_debug");
    }
 #if 0
    /* this requires _tnl_vertex_cull_stage in the pipeline */
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index a335f77479..d994401e55 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -602,9 +602,6 @@ struct dd_function_table {
    /** Notify driver that a program string has been specified. */
    void (*ProgramStringNotify)(GLcontext *ctx, GLenum target, 
 			       struct gl_program *prog);
-   /** Get value of a program register during program execution. */
-   void (*GetProgramRegister)(GLcontext *ctx, enum register_file file,
-                              GLuint index, GLfloat val[4]);
 
    /** Query if program can be loaded onto hardware */
    GLboolean (*IsProgramNative)(GLcontext *ctx, GLenum target, 
diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index a824705bdc..f432be183c 100644
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -944,18 +944,6 @@ _mesa_set_enable(GLcontext *ctx, GLenum cap, GLboolean state)
          ctx->Depth.BoundsTest = state;
          break;
 
-      /* GL_MESA_program_debug */
-#if FEATURE_MESA_program_debug
-      case GL_FRAGMENT_PROGRAM_CALLBACK_MESA:
-         CHECK_EXTENSION(MESA_program_debug, cap);
-         ctx->FragmentProgram.CallbackEnabled = state;
-         break;
-      case GL_VERTEX_PROGRAM_CALLBACK_MESA:
-         CHECK_EXTENSION(MESA_program_debug, cap);
-         ctx->VertexProgram.CallbackEnabled = state;
-         break;
-#endif
-
 #if FEATURE_ATI_fragment_shader
       case GL_FRAGMENT_SHADER_ATI:
         CHECK_EXTENSION(ATI_fragment_shader, cap);
@@ -1398,16 +1386,6 @@ _mesa_IsEnabled( GLenum cap )
          CHECK_EXTENSION(EXT_depth_bounds_test);
          return ctx->Depth.BoundsTest;
 
-      /* GL_MESA_program_debug */
-#if FEATURE_MESA_program_debug
-      case GL_FRAGMENT_PROGRAM_CALLBACK_MESA:
-         CHECK_EXTENSION(MESA_program_debug);
-         return ctx->FragmentProgram.CallbackEnabled;
-      case GL_VERTEX_PROGRAM_CALLBACK_MESA:
-         CHECK_EXTENSION(MESA_program_debug);
-         return ctx->VertexProgram.CallbackEnabled;
-#endif
-
 #if FEATURE_ATI_fragment_shader
       case GL_FRAGMENT_SHADER_ATI:
 	 CHECK_EXTENSION(ATI_fragment_shader);
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 9c8bd13e69..fbca924ad3 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -147,7 +147,6 @@ static const struct {
    { OFF, "GL_INGR_blend_func_separate",       F(EXT_blend_func_separate) },
    { OFF, "GL_MESA_pack_invert",               F(MESA_pack_invert) },
    { OFF, "GL_MESA_packed_depth_stencil",      F(MESA_packed_depth_stencil) },
-   { OFF, "GL_MESA_program_debug",             F(MESA_program_debug) },
    { OFF, "GL_MESA_resize_buffers",            F(MESA_resize_buffers) },
    { OFF, "GL_MESA_texture_array",             F(MESA_texture_array) },
    { OFF, "GL_MESA_ycbcr_texture",             F(MESA_ycbcr_texture) },
@@ -276,9 +275,6 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
    ctx->Extensions.EXT_vertex_array_bgra = GL_TRUE;
    /*ctx->Extensions.IBM_multimode_draw_arrays = GL_TRUE;*/
    ctx->Extensions.MESA_pack_invert = GL_TRUE;
-#if FEATURE_MESA_program_debug
-   ctx->Extensions.MESA_program_debug = GL_TRUE;
-#endif
    ctx->Extensions.MESA_resize_buffers = GL_TRUE;
    ctx->Extensions.MESA_texture_array = GL_TRUE;
    ctx->Extensions.MESA_ycbcr_texture = GL_TRUE;
diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index 42c8cc97c0..72b880e28e 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -655,7 +655,6 @@ static void emit_op3fn(struct tnl_program *p,
 
    inst = &p->program->Base.Instructions[nr];
    inst->Opcode = (enum prog_opcode) op; 
-   inst->StringPos = 0;
    inst->Data = 0;
    
    emit_arg( &inst->SrcReg[0], src0 );
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 3a8d56140f..0937fd053c 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -1715,22 +1715,6 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          params[0] = FLOAT_TO_BOOLEAN(ctx->Depth.BoundsMin);
          params[1] = FLOAT_TO_BOOLEAN(ctx->Depth.BoundsMax);
          break;
-      case GL_FRAGMENT_PROGRAM_CALLBACK_MESA:
-         CHECK_EXT1(MESA_program_debug, "GetBooleanv");
-         params[0] = ctx->FragmentProgram.CallbackEnabled;
-         break;
-      case GL_VERTEX_PROGRAM_CALLBACK_MESA:
-         CHECK_EXT1(MESA_program_debug, "GetBooleanv");
-         params[0] = ctx->VertexProgram.CallbackEnabled;
-         break;
-      case GL_FRAGMENT_PROGRAM_POSITION_MESA:
-         CHECK_EXT1(MESA_program_debug, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(ctx->FragmentProgram.CurrentPosition);
-         break;
-      case GL_VERTEX_PROGRAM_POSITION_MESA:
-         CHECK_EXT1(MESA_program_debug, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(ctx->VertexProgram.CurrentPosition);
-         break;
       case GL_MAX_DRAW_BUFFERS_ARB:
          params[0] = INT_TO_BOOLEAN(ctx->Const.MaxDrawBuffers);
          break;
@@ -3541,22 +3525,6 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          params[0] = ctx->Depth.BoundsMin;
          params[1] = ctx->Depth.BoundsMax;
          break;
-      case GL_FRAGMENT_PROGRAM_CALLBACK_MESA:
-         CHECK_EXT1(MESA_program_debug, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->FragmentProgram.CallbackEnabled);
-         break;
-      case GL_VERTEX_PROGRAM_CALLBACK_MESA:
-         CHECK_EXT1(MESA_program_debug, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->VertexProgram.CallbackEnabled);
-         break;
-      case GL_FRAGMENT_PROGRAM_POSITION_MESA:
-         CHECK_EXT1(MESA_program_debug, "GetFloatv");
-         params[0] = (GLfloat)(ctx->FragmentProgram.CurrentPosition);
-         break;
-      case GL_VERTEX_PROGRAM_POSITION_MESA:
-         CHECK_EXT1(MESA_program_debug, "GetFloatv");
-         params[0] = (GLfloat)(ctx->VertexProgram.CurrentPosition);
-         break;
       case GL_MAX_DRAW_BUFFERS_ARB:
          params[0] = (GLfloat)(ctx->Const.MaxDrawBuffers);
          break;
@@ -5367,22 +5335,6 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          params[0] = IROUND(ctx->Depth.BoundsMin);
          params[1] = IROUND(ctx->Depth.BoundsMax);
          break;
-      case GL_FRAGMENT_PROGRAM_CALLBACK_MESA:
-         CHECK_EXT1(MESA_program_debug, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->FragmentProgram.CallbackEnabled);
-         break;
-      case GL_VERTEX_PROGRAM_CALLBACK_MESA:
-         CHECK_EXT1(MESA_program_debug, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->VertexProgram.CallbackEnabled);
-         break;
-      case GL_FRAGMENT_PROGRAM_POSITION_MESA:
-         CHECK_EXT1(MESA_program_debug, "GetIntegerv");
-         params[0] = ctx->FragmentProgram.CurrentPosition;
-         break;
-      case GL_VERTEX_PROGRAM_POSITION_MESA:
-         CHECK_EXT1(MESA_program_debug, "GetIntegerv");
-         params[0] = ctx->VertexProgram.CurrentPosition;
-         break;
       case GL_MAX_DRAW_BUFFERS_ARB:
          params[0] = ctx->Const.MaxDrawBuffers;
          break;
diff --git a/src/mesa/main/get_gen.py b/src/mesa/main/get_gen.py
index 729f382b4b..fa695c48f1 100644
--- a/src/mesa/main/get_gen.py
+++ b/src/mesa/main/get_gen.py
@@ -902,16 +902,6 @@ StateVars = [
 	  ["ctx->Depth.BoundsMin", "ctx->Depth.BoundsMax"],
 	  "", ["EXT_depth_bounds_test"] ),
 
-	# GL_MESA_program_debug
-	( "GL_FRAGMENT_PROGRAM_CALLBACK_MESA", GLboolean,
-	  ["ctx->FragmentProgram.CallbackEnabled"], "", ["MESA_program_debug"] ),
-	( "GL_VERTEX_PROGRAM_CALLBACK_MESA", GLboolean,
-	  ["ctx->VertexProgram.CallbackEnabled"], "", ["MESA_program_debug"] ),
-	( "GL_FRAGMENT_PROGRAM_POSITION_MESA", GLint,
-	  ["ctx->FragmentProgram.CurrentPosition"], "", ["MESA_program_debug"] ),
-	( "GL_VERTEX_PROGRAM_POSITION_MESA", GLint,
-	  ["ctx->VertexProgram.CurrentPosition"], "", ["MESA_program_debug"] ),
-
 	# GL_ARB_draw_buffers
 	( "GL_MAX_DRAW_BUFFERS_ARB", GLint,
 	  ["ctx->Const.MaxDrawBuffers"], "", None ),
diff --git a/src/mesa/main/getstring.c b/src/mesa/main/getstring.c
index a42c44686d..41fd786d7d 100644
--- a/src/mesa/main/getstring.c
+++ b/src/mesa/main/getstring.c
@@ -242,36 +242,6 @@ _mesa_GetPointerv( GLenum pname, GLvoid **params )
       case GL_SELECTION_BUFFER_POINTER:
          *params = ctx->Select.Buffer;
          break;
-#if FEATURE_MESA_program_debug
-      case GL_FRAGMENT_PROGRAM_CALLBACK_FUNC_MESA:
-         if (!ctx->Extensions.MESA_program_debug) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glGetPointerv");
-            return;
-         }
-         *params = *(GLvoid **) &ctx->FragmentProgram.Callback;
-         break;
-      case GL_FRAGMENT_PROGRAM_CALLBACK_DATA_MESA:
-         if (!ctx->Extensions.MESA_program_debug) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glGetPointerv");
-            return;
-         }
-         *params = ctx->FragmentProgram.CallbackData;
-         break;
-      case GL_VERTEX_PROGRAM_CALLBACK_FUNC_MESA:
-         if (!ctx->Extensions.MESA_program_debug) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glGetPointerv");
-            return;
-         }
-         *params = *(GLvoid **) &ctx->VertexProgram.Callback;
-         break;
-      case GL_VERTEX_PROGRAM_CALLBACK_DATA_MESA:
-         if (!ctx->Extensions.MESA_program_debug) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glGetPointerv");
-            return;
-         }
-         *params = ctx->VertexProgram.CallbackData;
-         break;
-#endif
       default:
          _mesa_error( ctx, GL_INVALID_ENUM, "glGetPointerv" );
          return;
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index 8fb32dd7e9..f570647942 100644
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -75,7 +75,6 @@
 #define FEATURE_EXT_texture_sRGB _HAVE_FULL_GL
 #define FEATURE_EXT_timer_query  _HAVE_FULL_GL
 #define FEATURE_ATI_fragment_shader _HAVE_FULL_GL
-#define FEATURE_MESA_program_debug  _HAVE_FULL_GL
 #define FEATURE_NV_fence  _HAVE_FULL_GL
 #define FEATURE_NV_fragment_program  _HAVE_FULL_GL
 #define FEATURE_NV_vertex_program  _HAVE_FULL_GL
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index baf5850b83..17f6241e04 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1856,13 +1856,6 @@ struct gl_vertex_program_state
    /** Cache of fixed-function programs */
    struct gl_program_cache *Cache;
 
-#if FEATURE_MESA_program_debug
-   GLprogramcallbackMESA Callback;
-   GLvoid *CallbackData;
-   GLboolean CallbackEnabled;
-   GLuint CurrentPosition;
-#endif
-
    GLboolean _Overriden;
 };
 
@@ -1892,13 +1885,6 @@ struct gl_fragment_program_state
 
    /** Cache of fixed-function programs */
    struct gl_program_cache *Cache;
-
-#if FEATURE_MESA_program_debug
-   GLprogramcallbackMESA Callback;
-   GLvoid *CallbackData;
-   GLboolean CallbackEnabled;
-   GLuint CurrentPosition;
-#endif
 };
 
 
@@ -2502,7 +2488,6 @@ struct gl_extensions
    GLboolean IBM_multimode_draw_arrays;
    GLboolean MESA_pack_invert;
    GLboolean MESA_packed_depth_stencil;
-   GLboolean MESA_program_debug;
    GLboolean MESA_resize_buffers;
    GLboolean MESA_ycbcr_texture;
    GLboolean MESA_texture_array;
diff --git a/src/mesa/shader/arbprogparse.c b/src/mesa/shader/arbprogparse.c
index ccc0318a53..75398cda90 100644
--- a/src/mesa/shader/arbprogparse.c
+++ b/src/mesa/shader/arbprogparse.c
@@ -2752,9 +2752,6 @@ parse_fp_instruction (GLcontext * ctx, const GLubyte ** inst,
 
    _mesa_init_instructions(fp, 1);
 
-   /* Record the position in the program string for debugging */
-   fp->StringPos = Program->Position;
-
    /* OP_ALU_INST or OP_TEX_INST */
    instClass = *(*inst)++;
 
@@ -3194,8 +3191,6 @@ parse_vp_instruction (GLcontext * ctx, const GLubyte ** inst,
    code = *(*inst)++;
 
    _mesa_init_instructions(vp, 1);
-   /* Record the position in the program string for debugging */
-   vp->StringPos = Program->Position;
 
    switch (type) {
          /* XXX: */
@@ -3557,10 +3552,6 @@ parse_instructions(GLcontext * ctx, const GLubyte * inst,
       const GLuint numInst = Program->Base.NumInstructions;
       _mesa_init_instructions(Program->Base.Instructions + numInst, 1);
       Program->Base.Instructions[numInst].Opcode = OPCODE_END;
-      /* YYY Wrong Position in program, whatever, at least not random -> crash
-	 Program->Position = parse_position (&inst);
-      */
-      Program->Base.Instructions[numInst].StringPos = Program->Position;
    }
    Program->Base.NumInstructions++;
 
diff --git a/src/mesa/shader/nvfragparse.c b/src/mesa/shader/nvfragparse.c
index 37418ffb6e..b935cb562a 100644
--- a/src/mesa/shader/nvfragparse.c
+++ b/src/mesa/shader/nvfragparse.c
@@ -1311,8 +1311,6 @@ Parse_InstructionSequence(struct parse_state *parseState,
       }
       else if (Parse_String(parseState, "END")) {
          inst->Opcode = OPCODE_END;
-         inst->StringPos = parseState->curLine - parseState->start;
-         assert(inst->StringPos >= 0);
          parseState->numInst++;
          if (Parse_Token(parseState, token)) {
             RETURN_ERROR1("Code after END opcode.");
@@ -1339,8 +1337,6 @@ Parse_InstructionSequence(struct parse_state *parseState,
          inst->SaturateMode = (instMatch.suffixes & (_S))
             ? SATURATE_ZERO_ONE : SATURATE_OFF;
          inst->CondUpdate = (instMatch.suffixes & (_C)) ? GL_TRUE : GL_FALSE;
-         inst->StringPos = parseState->curLine - parseState->start;
-         assert(inst->StringPos >= 0);
 
          /*
           * parse the input and output operands
diff --git a/src/mesa/shader/nvvertparse.c b/src/mesa/shader/nvvertparse.c
index 08538c0ee4..268b577aec 100644
--- a/src/mesa/shader/nvvertparse.c
+++ b/src/mesa/shader/nvvertparse.c
@@ -799,7 +799,6 @@ Parse_UnaryOpInstruction(struct parse_state *parseState,
       RETURN_ERROR1("ABS illegal for vertex program 1.0");
 
    inst->Opcode = opcode;
-   inst->StringPos = parseState->curLine - parseState->start;
 
    /* dest reg */
    if (!Parse_MaskedDstReg(parseState, &inst->DstReg))
@@ -832,7 +831,6 @@ Parse_BiOpInstruction(struct parse_state *parseState,
       RETURN_ERROR1("SUB illegal for vertex program 1.0");
 
    inst->Opcode = opcode;
-   inst->StringPos = parseState->curLine - parseState->start;
 
    /* dest reg */
    if (!Parse_MaskedDstReg(parseState, &inst->DstReg))
@@ -880,7 +878,6 @@ Parse_TriOpInstruction(struct parse_state *parseState,
                        enum prog_opcode opcode)
 {
    inst->Opcode = opcode;
-   inst->StringPos = parseState->curLine - parseState->start;
 
    /* dest reg */
    if (!Parse_MaskedDstReg(parseState, &inst->DstReg))
@@ -951,7 +948,6 @@ Parse_ScalarInstruction(struct parse_state *parseState,
       RETURN_ERROR1("RCC illegal for vertex program 1.0");
 
    inst->Opcode = opcode;
-   inst->StringPos = parseState->curLine - parseState->start;
 
    /* dest reg */
    if (!Parse_MaskedDstReg(parseState, &inst->DstReg))
@@ -977,7 +973,6 @@ static GLboolean
 Parse_AddressInstruction(struct parse_state *parseState, struct prog_instruction *inst)
 {
    inst->Opcode = OPCODE_ARL;
-   inst->StringPos = parseState->curLine - parseState->start;
 
    /* Make ARB_vp backends happy */
    inst->DstReg.File = PROGRAM_ADDRESS;
@@ -1010,7 +1005,6 @@ Parse_EndInstruction(struct parse_state *parseState, struct prog_instruction *in
    GLubyte token[100];
 
    inst->Opcode = OPCODE_END;
-   inst->StringPos = parseState->curLine - parseState->start;
 
    /* this should fail! */
    if (Parse_Token(parseState, token))
@@ -1044,7 +1038,6 @@ Parse_PrintInstruction(struct parse_state *parseState, struct prog_instruction *
    GLint idx;
 
    inst->Opcode = OPCODE_PRINT;
-   inst->StringPos = parseState->curLine - parseState->start;
 
    /* The first argument is a literal string 'just like this' */
    if (!Parse_String(parseState, "'"))
diff --git a/src/mesa/shader/prog_debug.c b/src/mesa/shader/prog_debug.c
deleted file mode 100644
index 35ce37d5ce..0000000000
--- a/src/mesa/shader/prog_debug.c
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5.3
- *
- * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/macros.h"
-#include "nvfragparse.h"
-#include "nvvertparse.h"
-#include "program.h"
-#include "prog_debug.h"
-#include "prog_parameter.h"
-#include "prog_instruction.h"
-
-
-
-/**
- * Functions for the experimental GL_MESA_program_debug extension.
- */
-
-
-/* XXX temporary */
-GLAPI void GLAPIENTRY
-glProgramCallbackMESA(GLenum target, GLprogramcallbackMESA callback,
-                      GLvoid *data)
-{
-   _mesa_ProgramCallbackMESA(target, callback, data);
-}
-
-
-void
-_mesa_ProgramCallbackMESA(GLenum target, GLprogramcallbackMESA callback,
-                          GLvoid *data)
-{
-   GET_CURRENT_CONTEXT(ctx);
-
-   switch (target) {
-      case GL_FRAGMENT_PROGRAM_ARB:
-         if (!ctx->Extensions.ARB_fragment_program) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glProgramCallbackMESA(target)");
-            return;
-         }
-         ctx->FragmentProgram.Callback = callback;
-         ctx->FragmentProgram.CallbackData = data;
-         break;
-      case GL_FRAGMENT_PROGRAM_NV:
-         if (!ctx->Extensions.NV_fragment_program) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glProgramCallbackMESA(target)");
-            return;
-         }
-         ctx->FragmentProgram.Callback = callback;
-         ctx->FragmentProgram.CallbackData = data;
-         break;
-      case GL_VERTEX_PROGRAM_ARB: /* == GL_VERTEX_PROGRAM_NV */
-         if (!ctx->Extensions.ARB_vertex_program &&
-             !ctx->Extensions.NV_vertex_program) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glProgramCallbackMESA(target)");
-            return;
-         }
-         ctx->VertexProgram.Callback = callback;
-         ctx->VertexProgram.CallbackData = data;
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glProgramCallbackMESA(target)");
-         return;
-   }
-}
-
-
-/* XXX temporary */
-GLAPI void GLAPIENTRY
-glGetProgramRegisterfvMESA(GLenum target,
-                           GLsizei len, const GLubyte *registerName,
-                           GLfloat *v)
-{
-   _mesa_GetProgramRegisterfvMESA(target, len, registerName, v);
-}
-
-
-void
-_mesa_GetProgramRegisterfvMESA(GLenum target,
-                               GLsizei len, const GLubyte *registerName,
-                               GLfloat *v)
-{
-   char reg[1000];
-   GET_CURRENT_CONTEXT(ctx);
-
-   /* We _should_ be inside glBegin/glEnd */
-#if 0
-   if (ctx->Driver.CurrentExecPrimitive == PRIM_OUTSIDE_BEGIN_END) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetProgramRegisterfvMESA");
-      return;
-   }
-#endif
-
-   /* make null-terminated copy of registerName */
-   len = MIN2((unsigned int) len, sizeof(reg) - 1);
-   _mesa_memcpy(reg, registerName, len);
-   reg[len] = 0;
-
-   switch (target) {
-      case GL_VERTEX_PROGRAM_ARB: /* == GL_VERTEX_PROGRAM_NV */
-         if (!ctx->Extensions.ARB_vertex_program &&
-             !ctx->Extensions.NV_vertex_program) {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glGetProgramRegisterfvMESA(target)");
-            return;
-         }
-         if (!ctx->VertexProgram._Enabled) {
-            _mesa_error(ctx, GL_INVALID_OPERATION,
-                        "glGetProgramRegisterfvMESA");
-            return;
-         }
-         /* GL_NV_vertex_program */
-         if (reg[0] == 'R') {
-            /* Temp register */
-            GLint i = _mesa_atoi(reg + 1);
-            if (i >= (GLint)ctx->Const.VertexProgram.MaxTemps) {
-               _mesa_error(ctx, GL_INVALID_VALUE,
-                           "glGetProgramRegisterfvMESA(registerName)");
-               return;
-            }
-            ctx->Driver.GetProgramRegister(ctx, PROGRAM_TEMPORARY, i, v);
-         }
-         else if (reg[0] == 'v' && reg[1] == '[') {
-            /* Vertex Input attribute */
-            GLuint i;
-            for (i = 0; i < ctx->Const.VertexProgram.MaxAttribs; i++) {
-               const char *name = _mesa_nv_vertex_input_register_name(i);
-               char number[10];
-               _mesa_sprintf(number, "%d", i);
-               if (_mesa_strncmp(reg + 2, name, 4) == 0 ||
-                   _mesa_strncmp(reg + 2, number, _mesa_strlen(number)) == 0) {
-                  ctx->Driver.GetProgramRegister(ctx, PROGRAM_INPUT, i, v);
-                  return;
-               }
-            }
-            _mesa_error(ctx, GL_INVALID_VALUE,
-                        "glGetProgramRegisterfvMESA(registerName)");
-            return;
-         }
-         else if (reg[0] == 'o' && reg[1] == '[') {
-            /* Vertex output attribute */
-         }
-         /* GL_ARB_vertex_program */
-         else if (_mesa_strncmp(reg, "vertex.", 7) == 0) {
-
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_VALUE,
-                        "glGetProgramRegisterfvMESA(registerName)");
-            return;
-         }
-         break;
-      case GL_FRAGMENT_PROGRAM_ARB:
-         if (!ctx->Extensions.ARB_fragment_program) {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glGetProgramRegisterfvMESA(target)");
-            return;
-         }
-         if (!ctx->FragmentProgram._Enabled) {
-            _mesa_error(ctx, GL_INVALID_OPERATION,
-                        "glGetProgramRegisterfvMESA");
-            return;
-         }
-         /* XXX to do */
-         break;
-      case GL_FRAGMENT_PROGRAM_NV:
-         if (!ctx->Extensions.NV_fragment_program) {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glGetProgramRegisterfvMESA(target)");
-            return;
-         }
-         if (!ctx->FragmentProgram._Enabled) {
-            _mesa_error(ctx, GL_INVALID_OPERATION,
-                        "glGetProgramRegisterfvMESA");
-            return;
-         }
-         if (reg[0] == 'R') {
-            /* Temp register */
-            GLint i = _mesa_atoi(reg + 1);
-            if (i >= (GLint)ctx->Const.FragmentProgram.MaxTemps) {
-               _mesa_error(ctx, GL_INVALID_VALUE,
-                           "glGetProgramRegisterfvMESA(registerName)");
-               return;
-            }
-            ctx->Driver.GetProgramRegister(ctx, PROGRAM_TEMPORARY,
-                                                   i, v);
-         }
-         else if (reg[0] == 'f' && reg[1] == '[') {
-            /* Fragment input attribute */
-            GLuint i;
-            for (i = 0; i < ctx->Const.FragmentProgram.MaxAttribs; i++) {
-               const char *name = _mesa_nv_fragment_input_register_name(i);
-               if (_mesa_strncmp(reg + 2, name, 4) == 0) {
-                  ctx->Driver.GetProgramRegister(ctx, PROGRAM_INPUT, i, v);
-                  return;
-               }
-            }
-            _mesa_error(ctx, GL_INVALID_VALUE,
-                        "glGetProgramRegisterfvMESA(registerName)");
-            return;
-         }
-         else if (_mesa_strcmp(reg, "o[COLR]") == 0 ||
-                  _mesa_strcmp(reg, "o[COLH]") == 0) {
-            /* Fragment output color */
-            ctx->Driver.GetProgramRegister(ctx, PROGRAM_OUTPUT,
-                                           FRAG_RESULT_COLOR, v);
-         }
-         else if (_mesa_strcmp(reg, "o[DEPR]") == 0) {
-            /* Fragment output depth */
-            ctx->Driver.GetProgramRegister(ctx, PROGRAM_OUTPUT,
-                                           FRAG_RESULT_DEPTH, v);
-         }
-         else {
-            /* try user-defined identifiers */
-            const GLfloat *value = _mesa_lookup_parameter_value(
-                       ctx->FragmentProgram.Current->Base.Parameters, -1, reg);
-            if (value) {
-               COPY_4V(v, value);
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_VALUE,
-                           "glGetProgramRegisterfvMESA(registerName)");
-               return;
-            }
-         }
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM,
-                     "glGetProgramRegisterfvMESA(target)");
-         return;
-   }
-}
diff --git a/src/mesa/shader/prog_debug.h b/src/mesa/shader/prog_debug.h
deleted file mode 100644
index fc400e19de..0000000000
--- a/src/mesa/shader/prog_debug.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5.3
- *
- * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-#ifndef PROG_DEBUG_H
-#define PROG_DEBUG_H 1
-
-
-/*
- * GL_MESA_program_debug
- */
-
-extern void
-_mesa_ProgramCallbackMESA(GLenum target, GLprogramcallbackMESA callback,
-                          GLvoid *data);
-
-extern void
-_mesa_GetProgramRegisterfvMESA(GLenum target, GLsizei len,
-                               const GLubyte *registerName, GLfloat *v);
-
-
-
-#endif /* PROG_DEBUG_H */
diff --git a/src/mesa/shader/prog_execute.c b/src/mesa/shader/prog_execute.c
index a93733c085..a60cda674b 100644
--- a/src/mesa/shader/prog_execute.c
+++ b/src/mesa/shader/prog_execute.c
@@ -186,30 +186,6 @@ get_dst_register_pointer(const struct prog_dst_register *dest,
 
 
 
-#if FEATURE_MESA_program_debug
-static struct gl_program_machine *CurrentMachine = NULL;
-
-/**
- * For GL_MESA_program_debug.
- * Return current value (4*GLfloat) of a program register.
- * Called via ctx->Driver.GetProgramRegister().
- */
-void
-_mesa_get_program_register(GLcontext *ctx, enum register_file file,
-                           GLuint index, GLfloat val[4])
-{
-   if (CurrentMachine) {
-      struct prog_src_register srcReg;
-      const GLfloat *src;
-      srcReg.File = file;
-      srcReg.Index = index;
-      src = get_src_register_pointer(&srcReg, CurrentMachine);
-      COPY_4V(val, src);
-   }
-}
-#endif /* FEATURE_MESA_program_debug */
-
-
 /**
  * Fetch a 4-element float vector from the given source register.
  * Apply swizzling and negating as needed.
@@ -633,10 +609,6 @@ _mesa_execute_program(GLcontext * ctx,
       printf("execute program %u --------------------\n", program->Id);
    }
 
-#if FEATURE_MESA_program_debug
-   CurrentMachine = machine;
-#endif
-
    if (program->Target == GL_VERTEX_PROGRAM_ARB) {
       machine->EnvParams = ctx->VertexProgram.Parameters;
    }
@@ -647,15 +619,6 @@ _mesa_execute_program(GLcontext * ctx,
    for (pc = 0; pc < numInst; pc++) {
       const struct prog_instruction *inst = program->Instructions + pc;
 
-#if FEATURE_MESA_program_debug
-      if (ctx->FragmentProgram.CallbackEnabled &&
-          ctx->FragmentProgram.Callback) {
-         ctx->FragmentProgram.CurrentPosition = inst->StringPos;
-         ctx->FragmentProgram.Callback(program->Target,
-                                       ctx->FragmentProgram.CallbackData);
-      }
-#endif
-
       if (DEBUG_PROG) {
          _mesa_print_instruction(inst);
       }
@@ -1780,9 +1743,5 @@ _mesa_execute_program(GLcontext * ctx,
 
    } /* for pc */
 
-#if FEATURE_MESA_program_debug
-   CurrentMachine = NULL;
-#endif
-
    return GL_TRUE;
 }
diff --git a/src/mesa/shader/prog_instruction.h b/src/mesa/shader/prog_instruction.h
index 95dd7fda7f..4adce11f95 100644
--- a/src/mesa/shader/prog_instruction.h
+++ b/src/mesa/shader/prog_instruction.h
@@ -421,11 +421,6 @@ struct prog_instruction
 
    /** for driver use (try to remove someday) */
    GLint Aux;
-
-   /* XXX obsolete - remove someday */
-#if FEATURE_MESA_program_debug
-   GLshort StringPos;
-#endif
 };
 
 
diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 08ba345009..d8d48476e8 100644
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -220,7 +220,6 @@ SHADER_SOURCES = \
 	shader/nvvertparse.c \
 	shader/program.c \
 	shader/prog_cache.c \
-	shader/prog_debug.c \
 	shader/prog_execute.c \
 	shader/prog_instruction.c \
 	shader/prog_noise.c \
diff --git a/src/mesa/swrast/swrast.h b/src/mesa/swrast/swrast.h
index 015f8a05c3..c319ca62f9 100644
--- a/src/mesa/swrast/swrast.h
+++ b/src/mesa/swrast/swrast.h
@@ -266,12 +266,6 @@ extern void
 _swrast_eject_texture_images(GLcontext *ctx);
 
 
-#if FEATURE_MESA_program_debug
-extern void
-_swrast_get_program_register(GLcontext *, enum register_file file,
-                             GLuint index, GLfloat val[4]);
-#endif /* FEATURE_MESA_program_debug */
-
 
 /**
  * The driver interface for the software rasterizer.
-- 
cgit v1.2.3


From b4026d9be828bd0b6f60158456edf24994efb053 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Sat, 7 Mar 2009 12:02:52 -0700
Subject: mesa: gl_register_file enum typedef

---
 src/mesa/drivers/dri/r200/r200_vertprog.c |  2 +-
 src/mesa/drivers/dri/r300/r300_vertprog.c |  4 ++--
 src/mesa/main/mtypes.h                    | 34 +++++++++++++++----------------
 src/mesa/shader/arbprogparse.c            | 22 ++++++++++----------
 src/mesa/shader/prog_execute.h            |  2 +-
 src/mesa/shader/prog_parameter.c          |  6 +++---
 src/mesa/shader/prog_parameter.h          |  8 ++++----
 src/mesa/shader/prog_print.c              | 16 +++++++--------
 src/mesa/shader/programopt.c              |  2 +-
 src/mesa/shader/programopt.h              |  2 +-
 src/mesa/shader/slang/slang_codegen.c     |  2 +-
 src/mesa/shader/slang/slang_emit.c        |  2 +-
 src/mesa/shader/slang/slang_ir.c          | 10 ++++-----
 src/mesa/shader/slang/slang_ir.h          | 14 ++++++-------
 src/mesa/state_tracker/st_mesa_to_tgsi.c  |  2 +-
 15 files changed, 64 insertions(+), 64 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/r200/r200_vertprog.c b/src/mesa/drivers/dri/r200/r200_vertprog.c
index 562992fbb5..a2561df579 100644
--- a/src/mesa/drivers/dri/r200/r200_vertprog.c
+++ b/src/mesa/drivers/dri/r200/r200_vertprog.c
@@ -202,7 +202,7 @@ static unsigned long t_dst(struct prog_dst_register *dst)
    }
 }
 
-static unsigned long t_src_class(enum register_file file)
+static unsigned long t_src_class(gl_register_file file)
 {
 
    switch(file){
diff --git a/src/mesa/drivers/dri/r300/r300_vertprog.c b/src/mesa/drivers/dri/r300/r300_vertprog.c
index b6a4d30687..0ccb918703 100644
--- a/src/mesa/drivers/dri/r300/r300_vertprog.c
+++ b/src/mesa/drivers/dri/r300/r300_vertprog.c
@@ -126,7 +126,7 @@ static unsigned long t_dst_mask(GLuint mask)
 	return mask & VSF_FLAG_ALL;
 }
 
-static unsigned long t_dst_class(enum register_file file)
+static unsigned long t_dst_class(gl_register_file file)
 {
 
 	switch (file) {
@@ -161,7 +161,7 @@ static unsigned long t_dst_index(struct r300_vertex_program *vp,
 	return dst->Index;
 }
 
-static unsigned long t_src_class(enum register_file file)
+static unsigned long t_src_class(gl_register_file file)
 {
 	switch (file) {
 	case PROGRAM_TEMPORARY:
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 17f6241e04..57b7065b83 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1703,24 +1703,24 @@ struct gl_evaluators
  * be "uniform" variables since they can only be set outside glBegin/End.
  * They're also all stored in the same Parameters array.
  */
-enum register_file
-{
-   PROGRAM_TEMPORARY = 0,   /**< machine->Temporary[] */
-   PROGRAM_LOCAL_PARAM = 1, /**< gl_program->LocalParams[] */
-   PROGRAM_ENV_PARAM = 2,   /**< gl_program->Parameters[] */
-   PROGRAM_STATE_VAR = 3,   /**< gl_program->Parameters[] */
-   PROGRAM_INPUT = 4,       /**< machine->Inputs[] */
-   PROGRAM_OUTPUT = 5,      /**< machine->Outputs[] */
-   PROGRAM_NAMED_PARAM = 6, /**< gl_program->Parameters[] */
-   PROGRAM_CONSTANT = 7,    /**< gl_program->Parameters[] */
-   PROGRAM_UNIFORM = 8,     /**< gl_program->Parameters[] */
-   PROGRAM_VARYING = 9,     /**< machine->Inputs[]/Outputs[] */
-   PROGRAM_WRITE_ONLY = 10, /**< A dummy, write-only register */
-   PROGRAM_ADDRESS = 11,    /**< machine->AddressReg */
-   PROGRAM_SAMPLER = 12,    /**< for shader samplers, compile-time only */
-   PROGRAM_UNDEFINED = 13,  /**< Invalid value */
+typedef enum
+{
+   PROGRAM_TEMPORARY,   /**< machine->Temporary[] */
+   PROGRAM_LOCAL_PARAM, /**< gl_program->LocalParams[] */
+   PROGRAM_ENV_PARAM,   /**< gl_program->Parameters[] */
+   PROGRAM_STATE_VAR,   /**< gl_program->Parameters[] */
+   PROGRAM_INPUT,       /**< machine->Inputs[] */
+   PROGRAM_OUTPUT,      /**< machine->Outputs[] */
+   PROGRAM_NAMED_PARAM, /**< gl_program->Parameters[] */
+   PROGRAM_CONSTANT,    /**< gl_program->Parameters[] */
+   PROGRAM_UNIFORM,     /**< gl_program->Parameters[] */
+   PROGRAM_VARYING,     /**< machine->Inputs[]/Outputs[] */
+   PROGRAM_WRITE_ONLY,  /**< A dummy, write-only register */
+   PROGRAM_ADDRESS,     /**< machine->AddressReg */
+   PROGRAM_SAMPLER,     /**< for shader samplers, compile-time only */
+   PROGRAM_UNDEFINED,   /**< Invalid/TBD value */
    PROGRAM_FILE_MAX
-};
+} gl_register_file;
 
 
 /** Vertex and fragment instructions */
diff --git a/src/mesa/shader/arbprogparse.c b/src/mesa/shader/arbprogparse.c
index 75398cda90..cd6289deb5 100644
--- a/src/mesa/shader/arbprogparse.c
+++ b/src/mesa/shader/arbprogparse.c
@@ -2246,7 +2246,7 @@ parse_declaration (GLcontext * ctx, const GLubyte ** inst, struct var_cache **vc
 static GLuint
 parse_masked_dst_reg (GLcontext * ctx, const GLubyte ** inst,
                       struct var_cache **vc_head, struct arb_program *Program,
-                      enum register_file *File, GLuint *Index, GLint *WriteMask)
+                      gl_register_file *File, GLuint *Index, GLint *WriteMask)
 {
    GLuint tmp, result;
    struct var_cache *dst;
@@ -2478,7 +2478,7 @@ static GLuint
 parse_src_reg (GLcontext * ctx, const GLubyte ** inst,
                struct var_cache **vc_head,
                struct arb_program *Program,
-               enum register_file * File, GLint * Index,
+               gl_register_file * File, GLint * Index,
                GLboolean *IsRelOffset )
 {
    struct var_cache *src;
@@ -2527,7 +2527,7 @@ parse_src_reg (GLcontext * ctx, const GLubyte ** inst,
                   return 1;
                }
 
-               *File = (enum register_file) src->param_binding_type;
+               *File = (gl_register_file) src->param_binding_type;
 
                switch (*(*inst)++) {
                   case ARRAY_INDEX_ABSOLUTE:
@@ -2573,7 +2573,7 @@ parse_src_reg (GLcontext * ctx, const GLubyte ** inst,
                if (parse_param_use (ctx, inst, vc_head, Program, &src))
                   return 1;
 
-               *File = (enum register_file) src->param_binding_type;
+               *File = (gl_register_file) src->param_binding_type;
                *Index = src->param_binding_begin;
                break;
          }
@@ -2598,7 +2598,7 @@ parse_src_reg (GLcontext * ctx, const GLubyte ** inst,
 
                /* XXX: We have to handle offsets someplace in here!  -- or are those above? */
             case vt_param:
-               *File = (enum register_file) src->param_binding_type;
+               *File = (gl_register_file) src->param_binding_type;
                *Index = src->param_binding_begin;
                break;
 
@@ -2623,7 +2623,7 @@ parse_src_reg (GLcontext * ctx, const GLubyte ** inst,
    }
 
    if (*File == PROGRAM_STATE_VAR) {
-      enum register_file file;
+      gl_register_file file;
 
       /* If we're referencing the Program->Parameters[] array, check if the
        * parameter is really a constant/literal.  If so, set File to CONSTANT.
@@ -2652,7 +2652,7 @@ parse_vector_src_reg(GLcontext *ctx, const GLubyte **inst,
                      struct arb_program *program,
                      struct prog_src_register *reg)
 {
-   enum register_file file;
+   gl_register_file file;
    GLint index;
    GLubyte negateMask;
    GLubyte swizzle[4];
@@ -2686,7 +2686,7 @@ parse_scalar_src_reg(GLcontext *ctx, const GLubyte **inst,
                      struct arb_program *program,
                      struct prog_src_register *reg)
 {
-   enum register_file file;
+   gl_register_file file;
    GLint index;
    GLubyte negateMask;
    GLubyte swizzle[4];
@@ -2722,7 +2722,7 @@ parse_dst_reg(GLcontext * ctx, const GLubyte ** inst,
 {
    GLint mask;
    GLuint idx;
-   enum register_file file;
+   gl_register_file file;
 
    if (parse_masked_dst_reg (ctx, inst, vc_head, program, &file, &idx, &mask))
       return 1;
@@ -3013,7 +3013,7 @@ parse_fp_instruction (GLcontext * ctx, const GLubyte ** inst,
 	 {
 	    GLubyte swizzle[4];
 	    GLubyte negateMask;
-            enum register_file file;
+            gl_register_file file;
 	    GLint index;
 
 	    if (parse_src_reg(ctx, inst, vc_head, Program, &file, &index, &rel))
@@ -3354,7 +3354,7 @@ parse_vp_instruction (GLcontext * ctx, const GLubyte ** inst,
 	    GLubyte swizzle[4]; 
 	    GLubyte negateMask;
 	    GLboolean relAddr;
-            enum register_file file;
+            gl_register_file file;
 	    GLint index;
 
 	    if (parse_dst_reg(ctx, inst, vc_head, Program, &vp->DstReg))
diff --git a/src/mesa/shader/prog_execute.h b/src/mesa/shader/prog_execute.h
index 8ceb7b092e..adefc5439d 100644
--- a/src/mesa/shader/prog_execute.h
+++ b/src/mesa/shader/prog_execute.h
@@ -73,7 +73,7 @@ struct gl_program_machine
 
 
 extern void
-_mesa_get_program_register(GLcontext *ctx, enum register_file file,
+_mesa_get_program_register(GLcontext *ctx, gl_register_file file,
                            GLuint index, GLfloat val[4]);
 
 extern GLboolean
diff --git a/src/mesa/shader/prog_parameter.c b/src/mesa/shader/prog_parameter.c
index 8ae961241f..60e9d07423 100644
--- a/src/mesa/shader/prog_parameter.c
+++ b/src/mesa/shader/prog_parameter.c
@@ -78,7 +78,7 @@ _mesa_free_parameter_list(struct gl_program_parameter_list *paramList)
  */
 GLint
 _mesa_add_parameter(struct gl_program_parameter_list *paramList,
-                    enum register_file type, const char *name,
+                    gl_register_file type, const char *name,
                     GLuint size, GLenum datatype, const GLfloat *values,
                     const gl_state_index state[STATE_LENGTH],
                     GLbitfield flags)
@@ -681,7 +681,7 @@ _mesa_combine_parameter_lists(const struct gl_program_parameter_list *listA,
  */
 GLuint
 _mesa_longest_parameter_name(const struct gl_program_parameter_list *list,
-                             enum register_file type)
+                             gl_register_file type)
 {
    GLuint i, maxLen = 0;
    if (!list)
@@ -702,7 +702,7 @@ _mesa_longest_parameter_name(const struct gl_program_parameter_list *list,
  */
 GLuint
 _mesa_num_parameters_of_type(const struct gl_program_parameter_list *list,
-                             enum register_file type)
+                             gl_register_file type)
 {
    GLuint i, count = 0;
    if (list) {
diff --git a/src/mesa/shader/prog_parameter.h b/src/mesa/shader/prog_parameter.h
index 200f2c0045..01f5a0e179 100644
--- a/src/mesa/shader/prog_parameter.h
+++ b/src/mesa/shader/prog_parameter.h
@@ -54,7 +54,7 @@
 struct gl_program_parameter
 {
    const char *Name;        /**< Null-terminated string */
-   enum register_file Type; /**< PROGRAM_NAMED_PARAM, CONSTANT or STATE_VAR */
+   gl_register_file Type;   /**< PROGRAM_NAMED_PARAM, CONSTANT or STATE_VAR */
    GLenum DataType;         /**< GL_FLOAT, GL_FLOAT_VEC2, etc */
    GLuint Size;             /**< Number of components (1..4) */
    GLboolean Used;          /**< Helper flag for GLSL uniform tracking */
@@ -102,7 +102,7 @@ _mesa_num_parameters(const struct gl_program_parameter_list *list)
 
 extern GLint
 _mesa_add_parameter(struct gl_program_parameter_list *paramList,
-                    enum register_file type, const char *name,
+                    gl_register_file type, const char *name,
                     GLuint size, GLenum datatype, const GLfloat *values,
                     const gl_state_index state[STATE_LENGTH],
                     GLbitfield flags);
@@ -161,11 +161,11 @@ _mesa_lookup_parameter_constant(const struct gl_program_parameter_list *list,
 
 extern GLuint
 _mesa_longest_parameter_name(const struct gl_program_parameter_list *list,
-                             enum register_file type);
+                             gl_register_file type);
 
 extern GLuint
 _mesa_num_parameters_of_type(const struct gl_program_parameter_list *list,
-                             enum register_file type);
+                             gl_register_file type);
 
 
 #endif /* PROG_PARAMETER_H */
diff --git a/src/mesa/shader/prog_print.c b/src/mesa/shader/prog_print.c
index 6988e9c052..0a78a0a866 100644
--- a/src/mesa/shader/prog_print.c
+++ b/src/mesa/shader/prog_print.c
@@ -43,7 +43,7 @@
  * Return string name for given program/register file.
  */
 static const char *
-file_string(enum register_file f, gl_prog_print_mode mode)
+file_string(gl_register_file f, gl_prog_print_mode mode)
 {
    switch (f) {
    case PROGRAM_TEMPORARY:
@@ -219,7 +219,7 @@ arb_output_attrib_string(GLint index, GLenum progType)
  * \param prog  pointer to containing program
  */
 static const char *
-reg_string(enum register_file f, GLint index, gl_prog_print_mode mode,
+reg_string(gl_register_file f, GLint index, gl_prog_print_mode mode,
            GLboolean relAddr, const struct gl_program *prog)
 {
    static char str[100];
@@ -432,7 +432,7 @@ fprint_dst_reg(FILE * f,
                const struct gl_program *prog)
 {
    _mesa_fprintf(f, "%s%s",
-                 reg_string((enum register_file) dstReg->File,
+                 reg_string((gl_register_file) dstReg->File,
                             dstReg->Index, mode, dstReg->RelAddr, prog),
                  _mesa_writemask_string(dstReg->WriteMask));
 
@@ -445,7 +445,7 @@ fprint_dst_reg(FILE * f,
 
 #if 0
    _mesa_fprintf(f, "%s[%d]%s",
-                file_string((enum register_file) dstReg->File, mode),
+                file_string((gl_register_file) dstReg->File, mode),
                 dstReg->Index,
                 _mesa_writemask_string(dstReg->WriteMask));
 #endif
@@ -462,14 +462,14 @@ fprint_src_reg(FILE *f,
 
    _mesa_fprintf(f, "%s%s%s%s",
                  abs,
-                 reg_string((enum register_file) srcReg->File,
+                 reg_string((gl_register_file) srcReg->File,
                             srcReg->Index, mode, srcReg->RelAddr, prog),
                  _mesa_swizzle_string(srcReg->Swizzle,
                                       srcReg->NegateBase, GL_FALSE),
                  abs);
 #if 0
    _mesa_fprintf(f, "%s[%d]%s",
-                 file_string((enum register_file) srcReg->File, mode),
+                 file_string((gl_register_file) srcReg->File, mode),
                  srcReg->Index,
                  _mesa_swizzle_string(srcReg->Swizzle,
                                       srcReg->NegateBase, GL_FALSE));
@@ -562,7 +562,7 @@ _mesa_fprint_instruction_opt(FILE *f,
       if (inst->SrcReg[0].File != PROGRAM_UNDEFINED) {
          _mesa_fprintf(f, ", ");
          _mesa_fprintf(f, "%s[%d]%s",
-                      file_string((enum register_file) inst->SrcReg[0].File,
+                      file_string((gl_register_file) inst->SrcReg[0].File,
                                   mode),
                       inst->SrcReg[0].Index,
                       _mesa_swizzle_string(inst->SrcReg[0].Swizzle,
@@ -579,7 +579,7 @@ _mesa_fprint_instruction_opt(FILE *f,
       _mesa_fprintf(f, " ");
       fprint_dst_reg(f, &inst->DstReg, mode, prog);
       _mesa_fprintf(f, ", %s[%d], %s",
-                   file_string((enum register_file) inst->SrcReg[0].File,
+                   file_string((gl_register_file) inst->SrcReg[0].File,
                                mode),
                    inst->SrcReg[0].Index,
                    _mesa_swizzle_string(inst->SrcReg[0].Swizzle,
diff --git a/src/mesa/shader/programopt.c b/src/mesa/shader/programopt.c
index 05d9bdf7ec..e283f8933b 100644
--- a/src/mesa/shader/programopt.c
+++ b/src/mesa/shader/programopt.c
@@ -375,7 +375,7 @@ _mesa_count_texture_instructions(struct gl_program *prog)
  * So, rewrite the program to use a temporary register in this case.
  */
 void
-_mesa_remove_output_reads(struct gl_program *prog, enum register_file type)
+_mesa_remove_output_reads(struct gl_program *prog, gl_register_file type)
 {
    GLuint i;
    GLint outputMap[VERT_RESULT_MAX];
diff --git a/src/mesa/shader/programopt.h b/src/mesa/shader/programopt.h
index 11572e64f5..96acaf9566 100644
--- a/src/mesa/shader/programopt.h
+++ b/src/mesa/shader/programopt.h
@@ -40,6 +40,6 @@ extern void
 _mesa_count_texture_instructions(struct gl_program *prog);
 
 extern void
-_mesa_remove_output_reads(struct gl_program *prog, enum register_file type);
+_mesa_remove_output_reads(struct gl_program *prog, gl_register_file type);
 
 #endif /* PROGRAMOPT_H */
diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c
index ee24e2e138..d8246ae75f 100644
--- a/src/mesa/shader/slang/slang_codegen.c
+++ b/src/mesa/shader/slang/slang_codegen.c
@@ -2998,7 +2998,7 @@ _slang_gen_var_decl(slang_assemble_ctx *A, slang_variable *var,
    slang_ir_node *varDecl, *n;
    slang_ir_storage *store;
    GLint arrayLen, size, totalSize;  /* if array then totalSize > size */
-   enum register_file file;
+   gl_register_file file;
 
    /*assert(!var->declared);*/
    var->declared = GL_TRUE;
diff --git a/src/mesa/shader/slang/slang_emit.c b/src/mesa/shader/slang/slang_emit.c
index 6a47585c7a..94d0c084aa 100644
--- a/src/mesa/shader/slang/slang_emit.c
+++ b/src/mesa/shader/slang/slang_emit.c
@@ -446,7 +446,7 @@ new_instruction(slang_emit_info *emitInfo, gl_inst_opcode opcode)
 
 static struct prog_instruction *
 emit_arl_load(slang_emit_info *emitInfo,
-              enum register_file file, GLint index, GLuint swizzle)
+              gl_register_file file, GLint index, GLuint swizzle)
 {
    struct prog_instruction *inst = new_instruction(emitInfo, OPCODE_ARL);
    inst->SrcReg[0].File = file;
diff --git a/src/mesa/shader/slang/slang_ir.c b/src/mesa/shader/slang/slang_ir.c
index dc4086d888..1c7f7474e7 100644
--- a/src/mesa/shader/slang/slang_ir.c
+++ b/src/mesa/shader/slang/slang_ir.c
@@ -121,7 +121,7 @@ _slang_ir_info(slang_ir_opcode opcode)
 
 void
 _slang_init_ir_storage(slang_ir_storage *st,
-                       enum register_file file, GLint index, GLint size,
+                       gl_register_file file, GLint index, GLint size,
                        GLuint swizzle)
 {
    st->File = file;
@@ -137,7 +137,7 @@ _slang_init_ir_storage(slang_ir_storage *st,
  * Return a new slang_ir_storage object.
  */
 slang_ir_storage *
-_slang_new_ir_storage(enum register_file file, GLint index, GLint size)
+_slang_new_ir_storage(gl_register_file file, GLint index, GLint size)
 {
    slang_ir_storage *st;
    st = (slang_ir_storage *) _slang_alloc(sizeof(slang_ir_storage));
@@ -157,7 +157,7 @@ _slang_new_ir_storage(enum register_file file, GLint index, GLint size)
  * Return a new slang_ir_storage object.
  */
 slang_ir_storage *
-_slang_new_ir_storage_swz(enum register_file file, GLint index, GLint size,
+_slang_new_ir_storage_swz(gl_register_file file, GLint index, GLint size,
                           GLuint swizzle)
 {
    slang_ir_storage *st;
@@ -196,10 +196,10 @@ _slang_new_ir_storage_relative(GLint index, GLint size,
 
 
 slang_ir_storage *
-_slang_new_ir_storage_indirect(enum register_file file,
+_slang_new_ir_storage_indirect(gl_register_file file,
                                GLint index,
                                GLint size,
-                               enum register_file indirectFile,
+                               gl_register_file indirectFile,
                                GLint indirectIndex,
                                GLuint indirectSwizzle)
 {
diff --git a/src/mesa/shader/slang/slang_ir.h b/src/mesa/shader/slang/slang_ir.h
index d77feeadba..0ec38b10a5 100644
--- a/src/mesa/shader/slang/slang_ir.h
+++ b/src/mesa/shader/slang/slang_ir.h
@@ -171,7 +171,7 @@ typedef enum
  */
 struct slang_ir_storage_
 {
-   enum register_file File;  /**< PROGRAM_TEMPORARY, PROGRAM_INPUT, etc */
+   gl_register_file File;  /**< PROGRAM_TEMPORARY, PROGRAM_INPUT, etc */
    GLint Index;    /**< -1 means unallocated */
    GLint Size;     /**< number of floats or ints */
    GLuint Swizzle; /**< Swizzle AND writemask info */
@@ -180,7 +180,7 @@ struct slang_ir_storage_
    GLboolean RelAddr; /* we'll remove this eventually */
 
    GLboolean IsIndirect;
-   enum register_file IndirectFile;
+   gl_register_file IndirectFile;
    GLint IndirectIndex;
    GLuint IndirectSwizzle;
    GLuint TexTarget;  /**< If File==PROGRAM_SAMPLER, one of TEXTURE_x_INDEX */
@@ -235,15 +235,15 @@ _slang_ir_info(slang_ir_opcode opcode);
 
 extern void
 _slang_init_ir_storage(slang_ir_storage *st,
-                       enum register_file file, GLint index, GLint size,
+                       gl_register_file file, GLint index, GLint size,
                        GLuint swizzle);
 
 extern slang_ir_storage *
-_slang_new_ir_storage(enum register_file file, GLint index, GLint size);
+_slang_new_ir_storage(gl_register_file file, GLint index, GLint size);
 
 
 extern slang_ir_storage *
-_slang_new_ir_storage_swz(enum register_file file, GLint index, GLint size,
+_slang_new_ir_storage_swz(gl_register_file file, GLint index, GLint size,
                           GLuint swizzle);
 
 extern slang_ir_storage *
@@ -252,10 +252,10 @@ _slang_new_ir_storage_relative(GLint index, GLint size,
 
 
 extern slang_ir_storage *
-_slang_new_ir_storage_indirect(enum register_file file,
+_slang_new_ir_storage_indirect(gl_register_file file,
                                GLint index,
                                GLint size,
-                               enum register_file indirectFile,
+                               gl_register_file indirectFile,
                                GLint indirectIndex,
                                GLuint indirectSwizzle);
 
diff --git a/src/mesa/state_tracker/st_mesa_to_tgsi.c b/src/mesa/state_tracker/st_mesa_to_tgsi.c
index 8ce0b20113..cbf3f334c0 100644
--- a/src/mesa/state_tracker/st_mesa_to_tgsi.c
+++ b/src/mesa/state_tracker/st_mesa_to_tgsi.c
@@ -48,7 +48,7 @@
  */
 static GLuint
 map_register_file(
-   enum register_file file,
+   gl_register_file file,
    GLuint index,
    const GLuint immediateMapping[],
    GLboolean indirectAccess )
-- 
cgit v1.2.3


From 2c3785159574e6c8640b6af3ce2ef561d095f324 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Sat, 7 Mar 2009 12:33:11 -0700
Subject: mesa: move glViewport and glDepthRange functions into new viewport.c
 file

A bit of refactoring with an eye toward ES2 and GL 3.1
---
 src/mesa/SConscript                            |   1 +
 src/mesa/drivers/dri/s3v/s3v_xmesa.c           |   3 +-
 src/mesa/drivers/dri/trident/trident_context.c |   1 +
 src/mesa/main/api_exec.c                       |   1 +
 src/mesa/main/attrib.c                         |   1 +
 src/mesa/main/context.c                        |   1 +
 src/mesa/main/matrix.c                         | 156 +---------------------
 src/mesa/main/matrix.h                         |  25 +---
 src/mesa/main/state.c                          |   1 +
 src/mesa/main/viewport.c                       | 176 +++++++++++++++++++++++++
 src/mesa/main/viewport.h                       |  52 ++++++++
 src/mesa/sources.mak                           |   1 +
 src/mesa/state_tracker/st_context.c            |   1 +
 src/mesa/state_tracker/st_framebuffer.c        |   1 +
 windows/VC8/mesa/mesa/mesa.vcproj              |   8 ++
 15 files changed, 253 insertions(+), 176 deletions(-)
 create mode 100644 src/mesa/main/viewport.c
 create mode 100644 src/mesa/main/viewport.h

(limited to 'src/mesa/main')

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 2e0168e0bc..691ddcb18f 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -97,6 +97,7 @@ if env['platform'] != 'winddk':
 		'main/texstate.c',
 		'main/texstore.c',
 		'main/varray.c',
+		'main/viewport.c',
 		'main/vtxfmt.c',
 	]
 	
diff --git a/src/mesa/drivers/dri/s3v/s3v_xmesa.c b/src/mesa/drivers/dri/s3v/s3v_xmesa.c
index 9639f088b7..85f1481769 100644
--- a/src/mesa/drivers/dri/s3v/s3v_xmesa.c
+++ b/src/mesa/drivers/dri/s3v/s3v_xmesa.c
@@ -4,11 +4,12 @@
 
 #include "s3v_context.h"
 #include "s3v_vb.h"
+#include "s3v_dri.h"
 #include "main/context.h"
 #include "main/matrix.h"
-#include "s3v_dri.h"
 #include "main/framebuffer.h"
 #include "main/renderbuffer.h"
+#include "main/viewport.h"
 
 #include "swrast/swrast.h"
 #include "swrast_setup/swrast_setup.h"
diff --git a/src/mesa/drivers/dri/trident/trident_context.c b/src/mesa/drivers/dri/trident/trident_context.c
index df558c1beb..b5126b07ea 100644
--- a/src/mesa/drivers/dri/trident/trident_context.c
+++ b/src/mesa/drivers/dri/trident/trident_context.c
@@ -41,6 +41,7 @@
 #include "main/extensions.h"
 #include "main/framebuffer.h"
 #include "main/renderbuffer.h"
+#include "main/viewport.h"
 #if defined(USE_X86_ASM)
 #include "x86/common_x86_asm.h"
 #endif
diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index c2c29c4f3d..e0715817ad 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -116,6 +116,7 @@
 #include "texstate.h"
 #include "mtypes.h"
 #include "varray.h"
+#include "viewport.h"
 #if FEATURE_NV_vertex_program
 #include "shader/nvprogram.h"
 #endif
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index de27917709..1d2c460488 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -55,6 +55,7 @@
 #include "texparam.h"
 #include "texstate.h"
 #include "varray.h"
+#include "viewport.h"
 #include "mtypes.h"
 
 
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 05b19a4350..a27aaf021c 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -143,6 +143,7 @@
 #include "mtypes.h"
 #include "varray.h"
 #include "version.h"
+#include "viewport.h"
 #include "vtxfmt.h"
 #include "glapi/glthread.h"
 #include "glapi/glapioffsets.h"
diff --git a/src/mesa/main/matrix.c b/src/mesa/main/matrix.c
index 90d142278d..aebf48134f 100644
--- a/src/mesa/main/matrix.c
+++ b/src/mesa/main/matrix.c
@@ -1,8 +1,9 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.5.3
+ * Version:  7.5
  *
- * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -535,120 +536,6 @@ _mesa_MultTransposeMatrixdARB( const GLdouble *m )
 }
 #endif
 
-/**
- * Set the viewport.
- * 
- * \param x, y coordinates of the lower-left corner of the viewport rectangle.
- * \param width width of the viewport rectangle.
- * \param height height of the viewport rectangle.
- *
- * \sa Called via glViewport() or display list execution.
- *
- * Flushes the vertices and calls _mesa_set_viewport() with the given
- * parameters.
- */
-void GLAPIENTRY
-_mesa_Viewport( GLint x, GLint y, GLsizei width, GLsizei height )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-   _mesa_set_viewport(ctx, x, y, width, height);
-}
-
-
-/**
- * Set new viewport parameters and update derived state (the _WindowMap
- * matrix).  Usually called from _mesa_Viewport().
- * 
- * \param ctx GL context.
- * \param x, y coordinates of the lower left corner of the viewport rectangle.
- * \param width width of the viewport rectangle.
- * \param height height of the viewport rectangle.
- */
-void
-_mesa_set_viewport( GLcontext *ctx, GLint x, GLint y,
-                    GLsizei width, GLsizei height )
-{
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glViewport %d %d %d %d\n", x, y, width, height);
-
-   if (width < 0 || height < 0) {
-      _mesa_error( ctx,  GL_INVALID_VALUE,
-                   "glViewport(%d, %d, %d, %d)", x, y, width, height );
-      return;
-   }
-
-   /* clamp width and height to the implementation dependent range */
-   width  = CLAMP(width,  1, (GLsizei) ctx->Const.MaxViewportWidth);
-   height = CLAMP(height, 1, (GLsizei) ctx->Const.MaxViewportHeight);
-
-   ctx->Viewport.X = x;
-   ctx->Viewport.Width = width;
-   ctx->Viewport.Y = y;
-   ctx->Viewport.Height = height;
-   ctx->NewState |= _NEW_VIEWPORT;
-
-#if 1
-   /* XXX remove this someday.  Currently the DRI drivers rely on
-    * the WindowMap matrix being up to date in the driver's Viewport
-    * and DepthRange functions.
-    */
-   _math_matrix_viewport(&ctx->Viewport._WindowMap,
-                         ctx->Viewport.X, ctx->Viewport.Y,
-                         ctx->Viewport.Width, ctx->Viewport.Height,
-                         ctx->Viewport.Near, ctx->Viewport.Far,
-                         ctx->DrawBuffer->_DepthMaxF);
-#endif
-
-   if (ctx->Driver.Viewport) {
-      /* Many drivers will use this call to check for window size changes
-       * and reallocate the z/stencil/accum/etc buffers if needed.
-       */
-      (*ctx->Driver.Viewport)( ctx, x, y, width, height );
-   }
-}
-
-
-#if _HAVE_FULL_GL
-/**
- * Called by glDepthRange
- *
- * \param nearval  specifies the Z buffer value which should correspond to
- *                 the near clip plane
- * \param farval  specifies the Z buffer value which should correspond to
- *                the far clip plane
- */
-void GLAPIENTRY
-_mesa_DepthRange( GLclampd nearval, GLclampd farval )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (MESA_VERBOSE&VERBOSE_API)
-      _mesa_debug(ctx, "glDepthRange %f %f\n", nearval, farval);
-
-   ctx->Viewport.Near = (GLfloat) CLAMP( nearval, 0.0, 1.0 );
-   ctx->Viewport.Far = (GLfloat) CLAMP( farval, 0.0, 1.0 );
-   ctx->NewState |= _NEW_VIEWPORT;
-
-#if 1
-   /* XXX remove this someday.  Currently the DRI drivers rely on
-    * the WindowMap matrix being up to date in the driver's Viewport
-    * and DepthRange functions.
-    */
-   _math_matrix_viewport(&ctx->Viewport._WindowMap,
-                         ctx->Viewport.X, ctx->Viewport.Y,
-                         ctx->Viewport.Width, ctx->Viewport.Height,
-                         ctx->Viewport.Near, ctx->Viewport.Far,
-                         ctx->DrawBuffer->_DepthMaxF);
-#endif
-
-   if (ctx->Driver.DepthRange) {
-      (*ctx->Driver.DepthRange)( ctx, nearval, farval );
-   }
-}
-#endif
-
 
 
 /**********************************************************************/
@@ -892,41 +779,4 @@ void _mesa_init_transform( GLcontext *ctx )
 }
 
 
-/** 
- * Initialize the context viewport attribute group.
- *
- * \param ctx GL context.
- * 
- * \todo Move this to a new file with other 'viewport' routines.
- */
-void _mesa_init_viewport( GLcontext *ctx )
-{
-   GLfloat depthMax = 65535.0F; /* sorf of arbitrary */
-
-   /* Viewport group */
-   ctx->Viewport.X = 0;
-   ctx->Viewport.Y = 0;
-   ctx->Viewport.Width = 0;
-   ctx->Viewport.Height = 0;
-   ctx->Viewport.Near = 0.0;
-   ctx->Viewport.Far = 1.0;
-   _math_matrix_ctr(&ctx->Viewport._WindowMap);
-
-   _math_matrix_viewport(&ctx->Viewport._WindowMap, 0, 0, 0, 0,
-                         0.0F, 1.0F, depthMax);
-}
-
-
-/** 
- * Free the context viewport attribute group data.
- *
- * \param ctx GL context.
- * 
- * \todo Move this to a new file with other 'viewport' routines.
- */
-void _mesa_free_viewport_data( GLcontext *ctx )
-{
-   _math_matrix_dtr(&ctx->Viewport._WindowMap);
-}
-
 /*@}*/
diff --git a/src/mesa/main/matrix.h b/src/mesa/main/matrix.h
index 38769867a7..a53d1045c7 100644
--- a/src/mesa/main/matrix.h
+++ b/src/mesa/main/matrix.h
@@ -1,13 +1,9 @@
-/**
- * \file matrix.h
- * Matrix operations.
- */
-
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  7.5
  *
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2009  VMware, Inc.   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -99,15 +95,6 @@ _mesa_MultTransposeMatrixfARB( const GLfloat *m );
 extern void GLAPIENTRY
 _mesa_MultTransposeMatrixdARB( const GLdouble *m );
 
-extern void GLAPIENTRY
-_mesa_Viewport( GLint x, GLint y, GLsizei width, GLsizei height );
-
-extern void 
-_mesa_set_viewport( GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height );
-
-extern void GLAPIENTRY
-_mesa_DepthRange( GLclampd nearval, GLclampd farval );
-
 
 extern void 
 _mesa_init_matrix( GLcontext * ctx );
@@ -115,15 +102,9 @@ _mesa_init_matrix( GLcontext * ctx );
 extern void 
 _mesa_init_transform( GLcontext *ctx );
 
-extern void 
-_mesa_init_viewport( GLcontext *ctx );
-
 extern void
 _mesa_free_matrix_data( GLcontext *ctx );
 
-extern void 
-_mesa_free_viewport_data( GLcontext *ctx );
-
 extern void 
 _mesa_update_modelview_project( GLcontext *ctx, GLuint newstate );
 
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 9d03ee744d..cc37d63636 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -49,6 +49,7 @@
 #include "texenvprogram.h"
 #include "texobj.h"
 #include "texstate.h"
+#include "viewport.h"
 
 
 static void
diff --git a/src/mesa/main/viewport.c b/src/mesa/main/viewport.c
new file mode 100644
index 0000000000..ead856d32c
--- /dev/null
+++ b/src/mesa/main/viewport.c
@@ -0,0 +1,176 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.5
+ *
+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/**
+ * \file viewport.c
+ * glViewport and glDepthRange functions.
+ */
+
+
+#include "context.h"
+#include "macros.h"
+#include "viewport.h"
+
+
+/**
+ * Set the viewport.
+ * \sa Called via glViewport() or display list execution.
+ *
+ * Flushes the vertices and calls _mesa_set_viewport() with the given
+ * parameters.
+ */
+void GLAPIENTRY
+_mesa_Viewport(GLint x, GLint y, GLsizei width, GLsizei height)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+   _mesa_set_viewport(ctx, x, y, width, height);
+}
+
+
+/**
+ * Set new viewport parameters and update derived state (the _WindowMap
+ * matrix).  Usually called from _mesa_Viewport().
+ * 
+ * \param ctx GL context.
+ * \param x, y coordinates of the lower left corner of the viewport rectangle.
+ * \param width width of the viewport rectangle.
+ * \param height height of the viewport rectangle.
+ */
+void
+_mesa_set_viewport(GLcontext *ctx, GLint x, GLint y,
+                    GLsizei width, GLsizei height)
+{
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glViewport %d %d %d %d\n", x, y, width, height);
+
+   if (width < 0 || height < 0) {
+      _mesa_error(ctx,  GL_INVALID_VALUE,
+                   "glViewport(%d, %d, %d, %d)", x, y, width, height);
+      return;
+   }
+
+   /* clamp width and height to the implementation dependent range */
+   width  = CLAMP(width,  1, (GLsizei) ctx->Const.MaxViewportWidth);
+   height = CLAMP(height, 1, (GLsizei) ctx->Const.MaxViewportHeight);
+
+   ctx->Viewport.X = x;
+   ctx->Viewport.Width = width;
+   ctx->Viewport.Y = y;
+   ctx->Viewport.Height = height;
+   ctx->NewState |= _NEW_VIEWPORT;
+
+#if 1
+   /* XXX remove this someday.  Currently the DRI drivers rely on
+    * the WindowMap matrix being up to date in the driver's Viewport
+    * and DepthRange functions.
+    */
+   _math_matrix_viewport(&ctx->Viewport._WindowMap,
+                         ctx->Viewport.X, ctx->Viewport.Y,
+                         ctx->Viewport.Width, ctx->Viewport.Height,
+                         ctx->Viewport.Near, ctx->Viewport.Far,
+                         ctx->DrawBuffer->_DepthMaxF);
+#endif
+
+   if (ctx->Driver.Viewport) {
+      /* Many drivers will use this call to check for window size changes
+       * and reallocate the z/stencil/accum/etc buffers if needed.
+       */
+      ctx->Driver.Viewport(ctx, x, y, width, height);
+   }
+}
+
+
+/**
+ * Called by glDepthRange
+ *
+ * \param nearval  specifies the Z buffer value which should correspond to
+ *                 the near clip plane
+ * \param farval  specifies the Z buffer value which should correspond to
+ *                the far clip plane
+ */
+void GLAPIENTRY
+_mesa_DepthRange(GLclampd nearval, GLclampd farval)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (MESA_VERBOSE&VERBOSE_API)
+      _mesa_debug(ctx, "glDepthRange %f %f\n", nearval, farval);
+
+   ctx->Viewport.Near = (GLfloat) CLAMP(nearval, 0.0, 1.0);
+   ctx->Viewport.Far = (GLfloat) CLAMP(farval, 0.0, 1.0);
+   ctx->NewState |= _NEW_VIEWPORT;
+
+#if 1
+   /* XXX remove this someday.  Currently the DRI drivers rely on
+    * the WindowMap matrix being up to date in the driver's Viewport
+    * and DepthRange functions.
+    */
+   _math_matrix_viewport(&ctx->Viewport._WindowMap,
+                         ctx->Viewport.X, ctx->Viewport.Y,
+                         ctx->Viewport.Width, ctx->Viewport.Height,
+                         ctx->Viewport.Near, ctx->Viewport.Far,
+                         ctx->DrawBuffer->_DepthMaxF);
+#endif
+
+   if (ctx->Driver.DepthRange) {
+      ctx->Driver.DepthRange(ctx, nearval, farval);
+   }
+}
+
+
+
+/** 
+ * Initialize the context viewport attribute group.
+ * \param ctx  the GL context.
+ */
+void _mesa_init_viewport(GLcontext *ctx)
+{
+   GLfloat depthMax = 65535.0F; /* sorf of arbitrary */
+
+   /* Viewport group */
+   ctx->Viewport.X = 0;
+   ctx->Viewport.Y = 0;
+   ctx->Viewport.Width = 0;
+   ctx->Viewport.Height = 0;
+   ctx->Viewport.Near = 0.0;
+   ctx->Viewport.Far = 1.0;
+   _math_matrix_ctr(&ctx->Viewport._WindowMap);
+
+   _math_matrix_viewport(&ctx->Viewport._WindowMap, 0, 0, 0, 0,
+                         0.0F, 1.0F, depthMax);
+}
+
+
+/** 
+ * Free the context viewport attribute group data.
+ * \param ctx  the GL context.
+ */
+void _mesa_free_viewport_data(GLcontext *ctx)
+{
+   _math_matrix_dtr(&ctx->Viewport._WindowMap);
+}
+
diff --git a/src/mesa/main/viewport.h b/src/mesa/main/viewport.h
new file mode 100644
index 0000000000..f08fef2797
--- /dev/null
+++ b/src/mesa/main/viewport.h
@@ -0,0 +1,52 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.5
+ *
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2009  VMware, Inc.   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef VIEWPORT_H
+#define VIEWPORT_H
+
+
+extern void GLAPIENTRY
+_mesa_Viewport(GLint x, GLint y, GLsizei width, GLsizei height);
+
+
+extern void 
+_mesa_set_viewport(GLcontext *ctx, GLint x, GLint y,
+                   GLsizei width, GLsizei height);
+
+
+extern void GLAPIENTRY
+_mesa_DepthRange(GLclampd nearval, GLclampd farval);
+
+
+extern void 
+_mesa_init_viewport(GLcontext *ctx);
+
+
+extern void 
+_mesa_free_viewport_data(GLcontext *ctx);
+
+
+#endif
diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 42d950dfcb..432a5c3c67 100644
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -74,6 +74,7 @@ MAIN_SOURCES = \
 	main/texstate.c \
 	main/texstore.c \
 	main/varray.c \
+	main/viewport.c \
 	main/vtxfmt.c
 
 GLAPI_SOURCES = \
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index 9a17038eaf..2e1f6d4bcf 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -31,6 +31,7 @@
 #include "main/matrix.h"
 #include "main/buffers.h"
 #include "main/scissor.h"
+#include "main/viewport.h"
 #include "vbo/vbo.h"
 #include "shader/shader_api.h"
 #include "glapi/glapi.h"
diff --git a/src/mesa/state_tracker/st_framebuffer.c b/src/mesa/state_tracker/st_framebuffer.c
index ae66c1176e..06fec20eee 100644
--- a/src/mesa/state_tracker/st_framebuffer.c
+++ b/src/mesa/state_tracker/st_framebuffer.c
@@ -33,6 +33,7 @@
 #include "main/matrix.h"
 #include "main/renderbuffer.h"
 #include "main/scissor.h"
+#include "main/viewport.h"
 #include "st_context.h"
 #include "st_cb_fbo.h"
 #include "st_public.h"
diff --git a/windows/VC8/mesa/mesa/mesa.vcproj b/windows/VC8/mesa/mesa/mesa.vcproj
index 0fab29df40..84b373dd42 100644
--- a/windows/VC8/mesa/mesa/mesa.vcproj
+++ b/windows/VC8/mesa/mesa/mesa.vcproj
@@ -1058,6 +1058,10 @@
 				RelativePath="..\..\..\..\src\mesa\main\varray.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\main\viewport.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\vbo\vbo_context.c"
 				>
@@ -1899,6 +1903,10 @@
 				RelativePath="..\..\..\..\src\mesa\main\varray.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\main\viewport.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\vbo\vbo.h"
 				>
-- 
cgit v1.2.3


From 4045a2c7d302352646c1ff2a01cd531aa1b55d31 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Sat, 7 Mar 2009 13:14:37 -0700
Subject: mesa: move shared context state functions to new shared.c file

---
 src/mesa/SConscript               |   1 +
 src/mesa/main/context.c           | 381 ++------------------------------------
 src/mesa/main/shared.c            | 356 +++++++++++++++++++++++++++++++++++
 src/mesa/main/shared.h            |  37 ++++
 src/mesa/sources.mak              |   1 +
 windows/VC8/mesa/mesa/mesa.vcproj |   8 +
 6 files changed, 418 insertions(+), 366 deletions(-)
 create mode 100644 src/mesa/main/shared.c
 create mode 100644 src/mesa/main/shared.h

(limited to 'src/mesa/main')

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 691ddcb18f..d1b9e93c0c 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -81,6 +81,7 @@ if env['platform'] != 'winddk':
 		'main/renderbuffer.c',
 		'main/scissor.c',
 		'main/shaders.c',
+		'main/shared.c',
 		'main/state.c',
 		'main/stencil.c',
 		'main/texcompress.c',
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index a27aaf021c..9fd9e769d2 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -133,6 +133,7 @@
 #include "rastpos.h"
 #endif
 #include "scissor.h"
+#include "shared.h"
 #include "simple_list.h"
 #include "state.h"
 #include "stencil.h"
@@ -445,362 +446,6 @@ one_time_init( GLcontext *ctx )
 }
 
 
-/**
- * Allocate and initialize a shared context state structure.
- * Initializes the display list, texture objects and vertex programs hash
- * tables, allocates the texture objects. If it runs out of memory, frees
- * everything already allocated before returning NULL.
- *
- * \return pointer to a gl_shared_state structure on success, or NULL on
- * failure.
- */
-static GLboolean
-alloc_shared_state( GLcontext *ctx )
-{
-   GLuint i;
-   struct gl_shared_state *ss = CALLOC_STRUCT(gl_shared_state);
-   if (!ss)
-      return GL_FALSE;
-
-   ctx->Shared = ss;
-
-   _glthread_INIT_MUTEX(ss->Mutex);
-
-   ss->DisplayList = _mesa_NewHashTable();
-   ss->TexObjects = _mesa_NewHashTable();
-   ss->Programs = _mesa_NewHashTable();
-
-#if FEATURE_ARB_vertex_program
-   ss->DefaultVertexProgram = (struct gl_vertex_program *)
-      ctx->Driver.NewProgram(ctx, GL_VERTEX_PROGRAM_ARB, 0);
-   if (!ss->DefaultVertexProgram)
-      goto cleanup;
-#endif
-#if FEATURE_ARB_fragment_program
-   ss->DefaultFragmentProgram = (struct gl_fragment_program *)
-      ctx->Driver.NewProgram(ctx, GL_FRAGMENT_PROGRAM_ARB, 0);
-   if (!ss->DefaultFragmentProgram)
-      goto cleanup;
-#endif
-#if FEATURE_ATI_fragment_shader
-   ss->ATIShaders = _mesa_NewHashTable();
-   ss->DefaultFragmentShader = _mesa_new_ati_fragment_shader(ctx, 0);
-   if (!ss->DefaultFragmentShader)
-      goto cleanup;
-#endif
-
-#if FEATURE_ARB_vertex_buffer_object || FEATURE_ARB_pixel_buffer_object
-   ss->BufferObjects = _mesa_NewHashTable();
-#endif
-
-   ss->ArrayObjects = _mesa_NewHashTable();
-
-#if FEATURE_ARB_shader_objects
-   ss->ShaderObjects = _mesa_NewHashTable();
-#endif
-
-   /* Create default texture objects */
-   for (i = 0; i < NUM_TEXTURE_TARGETS; i++) {
-      /* NOTE: the order of these enums matches the TEXTURE_x_INDEX values */
-      static const GLenum targets[NUM_TEXTURE_TARGETS] = {
-         GL_TEXTURE_2D_ARRAY_EXT,
-         GL_TEXTURE_1D_ARRAY_EXT,
-         GL_TEXTURE_CUBE_MAP,
-         GL_TEXTURE_3D,
-         GL_TEXTURE_RECTANGLE_NV,
-         GL_TEXTURE_2D,
-         GL_TEXTURE_1D
-      };
-      ss->DefaultTex[i] = ctx->Driver.NewTextureObject(ctx, 0, targets[i]);
-      if (!ss->DefaultTex[i])
-         goto cleanup;
-   }
-
-   /* sanity check */
-   assert(ss->DefaultTex[TEXTURE_1D_INDEX]->RefCount == 1);
-
-   _glthread_INIT_MUTEX(ss->TexMutex);
-   ss->TextureStateStamp = 0;
-
-#if FEATURE_EXT_framebuffer_object
-   ss->FrameBuffers = _mesa_NewHashTable();
-   if (!ss->FrameBuffers)
-      goto cleanup;
-   ss->RenderBuffers = _mesa_NewHashTable();
-   if (!ss->RenderBuffers)
-      goto cleanup;
-#endif
-
-   return GL_TRUE;
-
-cleanup:
-   /* Ran out of memory at some point.  Free everything and return NULL */
-   if (ss->DisplayList)
-      _mesa_DeleteHashTable(ss->DisplayList);
-   if (ss->TexObjects)
-      _mesa_DeleteHashTable(ss->TexObjects);
-   if (ss->Programs)
-      _mesa_DeleteHashTable(ss->Programs);
-#if FEATURE_ARB_vertex_program
-   _mesa_reference_vertprog(ctx, &ss->DefaultVertexProgram, NULL);
-#endif
-#if FEATURE_ARB_fragment_program
-   _mesa_reference_fragprog(ctx, &ss->DefaultFragmentProgram, NULL);
-#endif
-#if FEATURE_ATI_fragment_shader
-   if (ss->DefaultFragmentShader)
-      _mesa_delete_ati_fragment_shader(ctx, ss->DefaultFragmentShader);
-#endif
-#if FEATURE_ARB_vertex_buffer_object || FEATURE_ARB_pixel_buffer_object
-   if (ss->BufferObjects)
-      _mesa_DeleteHashTable(ss->BufferObjects);
-#endif
-
-   if (ss->ArrayObjects)
-      _mesa_DeleteHashTable (ss->ArrayObjects);
-
-#if FEATURE_ARB_shader_objects
-   if (ss->ShaderObjects)
-      _mesa_DeleteHashTable (ss->ShaderObjects);
-#endif
-
-#if FEATURE_EXT_framebuffer_object
-   if (ss->FrameBuffers)
-      _mesa_DeleteHashTable(ss->FrameBuffers);
-   if (ss->RenderBuffers)
-      _mesa_DeleteHashTable(ss->RenderBuffers);
-#endif
-
-   for (i = 0; i < NUM_TEXTURE_TARGETS; i++) {
-      if (ss->DefaultTex[i])
-         ctx->Driver.DeleteTexture(ctx, ss->DefaultTex[i]);
-   }
-
-   _mesa_free(ss);
-
-   return GL_FALSE;
-}
-
-
-/**
- * Callback for deleting a display list.  Called by _mesa_HashDeleteAll().
- */
-static void
-delete_displaylist_cb(GLuint id, void *data, void *userData)
-{
-#if FEATURE_dlist
-   struct gl_display_list *list = (struct gl_display_list *) data;
-   GLcontext *ctx = (GLcontext *) userData;
-   _mesa_delete_list(ctx, list);
-#endif
-}
-
-/**
- * Callback for deleting a texture object.  Called by _mesa_HashDeleteAll().
- */
-static void
-delete_texture_cb(GLuint id, void *data, void *userData)
-{
-   struct gl_texture_object *texObj = (struct gl_texture_object *) data;
-   GLcontext *ctx = (GLcontext *) userData;
-   ctx->Driver.DeleteTexture(ctx, texObj);
-}
-
-/**
- * Callback for deleting a program object.  Called by _mesa_HashDeleteAll().
- */
-static void
-delete_program_cb(GLuint id, void *data, void *userData)
-{
-   struct gl_program *prog = (struct gl_program *) data;
-   GLcontext *ctx = (GLcontext *) userData;
-   ASSERT(prog->RefCount == 1); /* should only be referenced by hash table */
-   prog->RefCount = 0;  /* now going away */
-   ctx->Driver.DeleteProgram(ctx, prog);
-}
-
-#if FEATURE_ATI_fragment_shader
-/**
- * Callback for deleting an ATI fragment shader object.
- * Called by _mesa_HashDeleteAll().
- */
-static void
-delete_fragshader_cb(GLuint id, void *data, void *userData)
-{
-   struct ati_fragment_shader *shader = (struct ati_fragment_shader *) data;
-   GLcontext *ctx = (GLcontext *) userData;
-   _mesa_delete_ati_fragment_shader(ctx, shader);
-}
-#endif
-
-/**
- * Callback for deleting a buffer object.  Called by _mesa_HashDeleteAll().
- */
-static void
-delete_bufferobj_cb(GLuint id, void *data, void *userData)
-{
-   struct gl_buffer_object *bufObj = (struct gl_buffer_object *) data;
-   GLcontext *ctx = (GLcontext *) userData;
-   ctx->Driver.DeleteBuffer(ctx, bufObj);
-}
-
-/**
- * Callback for deleting an array object.  Called by _mesa_HashDeleteAll().
- */
-static void
-delete_arrayobj_cb(GLuint id, void *data, void *userData)
-{
-   struct gl_array_object *arrayObj = (struct gl_array_object *) data;
-   GLcontext *ctx = (GLcontext *) userData;
-   _mesa_delete_array_object(ctx, arrayObj);
-}
-
-/**
- * Callback for freeing shader program data. Call it before delete_shader_cb
- * to avoid memory access error.
- */
-static void
-free_shader_program_data_cb(GLuint id, void *data, void *userData)
-{
-   GLcontext *ctx = (GLcontext *) userData;
-   struct gl_shader_program *shProg = (struct gl_shader_program *) data;
-
-   if (shProg->Type == GL_SHADER_PROGRAM_MESA) {
-       _mesa_free_shader_program_data(ctx, shProg);
-   }
-}
-
-/**
- * Callback for deleting shader and shader programs objects.
- * Called by _mesa_HashDeleteAll().
- */
-static void
-delete_shader_cb(GLuint id, void *data, void *userData)
-{
-   GLcontext *ctx = (GLcontext *) userData;
-   struct gl_shader *sh = (struct gl_shader *) data;
-   if (sh->Type == GL_FRAGMENT_SHADER || sh->Type == GL_VERTEX_SHADER) {
-      _mesa_free_shader(ctx, sh);
-   }
-   else {
-      struct gl_shader_program *shProg = (struct gl_shader_program *) data;
-      ASSERT(shProg->Type == GL_SHADER_PROGRAM_MESA);
-      _mesa_free_shader_program(ctx, shProg);
-   }
-}
-
-/**
- * Callback for deleting a framebuffer object.  Called by _mesa_HashDeleteAll()
- */
-static void
-delete_framebuffer_cb(GLuint id, void *data, void *userData)
-{
-   struct gl_framebuffer *fb = (struct gl_framebuffer *) data;
-   /* The fact that the framebuffer is in the hashtable means its refcount
-    * is one, but we're removing from the hashtable now.  So clear refcount.
-    */
-   /*assert(fb->RefCount == 1);*/
-   fb->RefCount = 0;
-
-   /* NOTE: Delete should always be defined but there are two reports
-    * of it being NULL (bugs 13507, 14293).  Work-around for now.
-    */
-   if (fb->Delete)
-      fb->Delete(fb);
-}
-
-/**
- * Callback for deleting a renderbuffer object. Called by _mesa_HashDeleteAll()
- */
-static void
-delete_renderbuffer_cb(GLuint id, void *data, void *userData)
-{
-   struct gl_renderbuffer *rb = (struct gl_renderbuffer *) data;
-   rb->RefCount = 0;  /* see comment for FBOs above */
-   if (rb->Delete)
-      rb->Delete(rb);
-}
-
-
-/**
- * Deallocate a shared state object and all children structures.
- *
- * \param ctx GL context.
- * \param ss shared state pointer.
- * 
- * Frees the display lists, the texture objects (calling the driver texture
- * deletion callback to free its private data) and the vertex programs, as well
- * as their hash tables.
- *
- * \sa alloc_shared_state().
- */
-static void
-free_shared_state( GLcontext *ctx, struct gl_shared_state *ss )
-{
-   GLuint i;
-
-   /*
-    * Free display lists
-    */
-   _mesa_HashDeleteAll(ss->DisplayList, delete_displaylist_cb, ctx);
-   _mesa_DeleteHashTable(ss->DisplayList);
-
-#if FEATURE_ARB_shader_objects
-   _mesa_HashWalk(ss->ShaderObjects, free_shader_program_data_cb, ctx);
-   _mesa_HashDeleteAll(ss->ShaderObjects, delete_shader_cb, ctx);
-   _mesa_DeleteHashTable(ss->ShaderObjects);
-#endif
-
-   _mesa_HashDeleteAll(ss->Programs, delete_program_cb, ctx);
-   _mesa_DeleteHashTable(ss->Programs);
-
-#if FEATURE_ARB_vertex_program
-   _mesa_reference_vertprog(ctx, &ss->DefaultVertexProgram, NULL);
-#endif
-#if FEATURE_ARB_fragment_program
-   _mesa_reference_fragprog(ctx, &ss->DefaultFragmentProgram, NULL);
-#endif
-
-#if FEATURE_ATI_fragment_shader
-   _mesa_HashDeleteAll(ss->ATIShaders, delete_fragshader_cb, ctx);
-   _mesa_DeleteHashTable(ss->ATIShaders);
-   _mesa_delete_ati_fragment_shader(ctx, ss->DefaultFragmentShader);
-#endif
-
-#if FEATURE_ARB_vertex_buffer_object || FEATURE_ARB_pixel_buffer_object
-   _mesa_HashDeleteAll(ss->BufferObjects, delete_bufferobj_cb, ctx);
-   _mesa_DeleteHashTable(ss->BufferObjects);
-#endif
-
-   _mesa_HashDeleteAll(ss->ArrayObjects, delete_arrayobj_cb, ctx);
-   _mesa_DeleteHashTable(ss->ArrayObjects);
-
-#if FEATURE_EXT_framebuffer_object
-   _mesa_HashDeleteAll(ss->FrameBuffers, delete_framebuffer_cb, ctx);
-   _mesa_DeleteHashTable(ss->FrameBuffers);
-   _mesa_HashDeleteAll(ss->RenderBuffers, delete_renderbuffer_cb, ctx);
-   _mesa_DeleteHashTable(ss->RenderBuffers);
-#endif
-
-   /*
-    * Free texture objects (after FBOs since some textures might have
-    * been bound to FBOs).
-    */
-   ASSERT(ctx->Driver.DeleteTexture);
-   /* the default textures */
-   for (i = 0; i < NUM_TEXTURE_TARGETS; i++) {
-      ctx->Driver.DeleteTexture(ctx, ss->DefaultTex[i]);
-   }
-   /* all other textures */
-   _mesa_HashDeleteAll(ss->TexObjects, delete_texture_cb, ctx);
-   _mesa_DeleteHashTable(ss->TexObjects);
-
-   _glthread_DESTROY_MUTEX(ss->Mutex);
-
-   _mesa_free(ss);
-}
-
-
 /**
  * Initialize fields of gl_current_attrib (aka ctx->Current.*)
  */
@@ -1180,6 +825,8 @@ _mesa_initialize_context(GLcontext *ctx,
                          const struct dd_function_table *driverFunctions,
                          void *driverContext)
 {
+   struct gl_shared_state *shared;
+
    /*ASSERT(driverContext);*/
    assert(driverFunctions->NewTextureObject);
    assert(driverFunctions->FreeTexImageData);
@@ -1203,20 +850,22 @@ _mesa_initialize_context(GLcontext *ctx,
 
    if (share_list) {
       /* share state with another context */
-      ctx->Shared = share_list->Shared;
+      shared = share_list->Shared;
    }
    else {
       /* allocate new, unshared state */
-      if (!alloc_shared_state( ctx )) {
+      shared = _mesa_alloc_shared_state(ctx);
+      if (!shared)
          return GL_FALSE;
-      }
    }
-   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
-   ctx->Shared->RefCount++;
-   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
+
+   _glthread_LOCK_MUTEX(shared->Mutex);
+   ctx->Shared = shared;
+   shared->RefCount++;
+   _glthread_UNLOCK_MUTEX(shared->Mutex);
 
    if (!init_attrib_groups( ctx )) {
-      free_shared_state(ctx, ctx->Shared);
+      _mesa_free_shared_state(ctx, ctx->Shared);
       return GL_FALSE;
    }
 
@@ -1224,7 +873,7 @@ _mesa_initialize_context(GLcontext *ctx,
    ctx->Exec = alloc_dispatch_table();
    ctx->Save = alloc_dispatch_table();
    if (!ctx->Exec || !ctx->Save) {
-      free_shared_state(ctx, ctx->Shared);
+      _mesa_free_shared_state(ctx, ctx->Shared);
       if (ctx->Exec)
          _mesa_free(ctx->Exec);
    }
@@ -1369,7 +1018,7 @@ _mesa_free_context_data( GLcontext *ctx )
    assert(RefCount >= 0);
    if (RefCount == 0) {
       /* free shared state */
-      free_shared_state( ctx, ctx->Shared );
+      _mesa_free_shared_state( ctx, ctx->Shared );
    }
 
    if (ctx->Extensions.String)
@@ -1753,7 +1402,7 @@ _mesa_share_state(GLcontext *ctx, GLcontext *ctxToShare)
 
       oldSharedState->RefCount--;
       if (oldSharedState->RefCount == 0) {
-         free_shared_state(ctx, oldSharedState);
+         _mesa_free_shared_state(ctx, oldSharedState);
       }
 
       return GL_TRUE;
diff --git a/src/mesa/main/shared.c b/src/mesa/main/shared.c
new file mode 100644
index 0000000000..936ee9061b
--- /dev/null
+++ b/src/mesa/main/shared.c
@@ -0,0 +1,356 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.5
+ *
+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/**
+ * \file shared.c
+ * Shared-context state
+ */
+
+
+
+#include "imports.h"
+#include "mtypes.h"
+#include "hash.h"
+#include "arrayobj.h"
+#include "shared.h"
+#include "shader/program.h"
+#include "shader/shader_api.h"
+#if FEATURE_dlist
+#include "dlist.h"
+#endif
+#if FEATURE_ATI_fragment_shader
+#include "shader/atifragshader.h"
+#endif
+
+
+/**
+ * Allocate and initialize a shared context state structure.
+ * Initializes the display list, texture objects and vertex programs hash
+ * tables, allocates the texture objects. If it runs out of memory, frees
+ * everything already allocated before returning NULL.
+ *
+ * \return pointer to a gl_shared_state structure on success, or NULL on
+ * failure.
+ */
+struct gl_shared_state *
+_mesa_alloc_shared_state(GLcontext *ctx)
+{
+   struct gl_shared_state *shared;
+   GLuint i;
+
+   shared = CALLOC_STRUCT(gl_shared_state);
+   if (!shared)
+      return NULL;
+
+   _glthread_INIT_MUTEX(shared->Mutex);
+
+   shared->DisplayList = _mesa_NewHashTable();
+   shared->TexObjects = _mesa_NewHashTable();
+   shared->Programs = _mesa_NewHashTable();
+
+#if FEATURE_ARB_vertex_program
+   shared->DefaultVertexProgram = (struct gl_vertex_program *)
+      ctx->Driver.NewProgram(ctx, GL_VERTEX_PROGRAM_ARB, 0);
+#endif
+
+#if FEATURE_ARB_fragment_program
+   shared->DefaultFragmentProgram = (struct gl_fragment_program *)
+      ctx->Driver.NewProgram(ctx, GL_FRAGMENT_PROGRAM_ARB, 0);
+#endif
+
+#if FEATURE_ATI_fragment_shader
+   shared->ATIShaders = _mesa_NewHashTable();
+   shared->DefaultFragmentShader = _mesa_new_ati_fragment_shader(ctx, 0);
+#endif
+
+#if FEATURE_ARB_shader_objects
+   shared->ShaderObjects = _mesa_NewHashTable();
+#endif
+
+#if FEATURE_ARB_vertex_buffer_object || FEATURE_ARB_pixel_buffer_object
+   shared->BufferObjects = _mesa_NewHashTable();
+#endif
+
+   shared->ArrayObjects = _mesa_NewHashTable();
+
+   /* Create default texture objects */
+   for (i = 0; i < NUM_TEXTURE_TARGETS; i++) {
+      /* NOTE: the order of these enums matches the TEXTURE_x_INDEX values */
+      static const GLenum targets[NUM_TEXTURE_TARGETS] = {
+         GL_TEXTURE_2D_ARRAY_EXT,
+         GL_TEXTURE_1D_ARRAY_EXT,
+         GL_TEXTURE_CUBE_MAP,
+         GL_TEXTURE_3D,
+         GL_TEXTURE_RECTANGLE_NV,
+         GL_TEXTURE_2D,
+         GL_TEXTURE_1D
+      };
+      shared->DefaultTex[i] = ctx->Driver.NewTextureObject(ctx, 0, targets[i]);
+   }
+
+   /* sanity check */
+   assert(shared->DefaultTex[TEXTURE_1D_INDEX]->RefCount == 1);
+
+   /* Mutex and timestamp for texobj state validation */
+   _glthread_INIT_MUTEX(shared->TexMutex);
+   shared->TextureStateStamp = 0;
+
+#if FEATURE_EXT_framebuffer_object
+   shared->FrameBuffers = _mesa_NewHashTable();
+   shared->RenderBuffers = _mesa_NewHashTable();
+#endif
+
+   return shared;
+}
+
+
+/**
+ * Callback for deleting a display list.  Called by _mesa_HashDeleteAll().
+ */
+static void
+delete_displaylist_cb(GLuint id, void *data, void *userData)
+{
+#if FEATURE_dlist
+   struct gl_display_list *list = (struct gl_display_list *) data;
+   GLcontext *ctx = (GLcontext *) userData;
+   _mesa_delete_list(ctx, list);
+#endif
+}
+
+
+/**
+ * Callback for deleting a texture object.  Called by _mesa_HashDeleteAll().
+ */
+static void
+delete_texture_cb(GLuint id, void *data, void *userData)
+{
+   struct gl_texture_object *texObj = (struct gl_texture_object *) data;
+   GLcontext *ctx = (GLcontext *) userData;
+   ctx->Driver.DeleteTexture(ctx, texObj);
+}
+
+
+/**
+ * Callback for deleting a program object.  Called by _mesa_HashDeleteAll().
+ */
+static void
+delete_program_cb(GLuint id, void *data, void *userData)
+{
+   struct gl_program *prog = (struct gl_program *) data;
+   GLcontext *ctx = (GLcontext *) userData;
+   ASSERT(prog->RefCount == 1); /* should only be referenced by hash table */
+   prog->RefCount = 0;  /* now going away */
+   ctx->Driver.DeleteProgram(ctx, prog);
+}
+
+
+#if FEATURE_ATI_fragment_shader
+/**
+ * Callback for deleting an ATI fragment shader object.
+ * Called by _mesa_HashDeleteAll().
+ */
+static void
+delete_fragshader_cb(GLuint id, void *data, void *userData)
+{
+   struct ati_fragment_shader *shader = (struct ati_fragment_shader *) data;
+   GLcontext *ctx = (GLcontext *) userData;
+   _mesa_delete_ati_fragment_shader(ctx, shader);
+}
+#endif
+
+
+/**
+ * Callback for deleting a buffer object.  Called by _mesa_HashDeleteAll().
+ */
+static void
+delete_bufferobj_cb(GLuint id, void *data, void *userData)
+{
+   struct gl_buffer_object *bufObj = (struct gl_buffer_object *) data;
+   GLcontext *ctx = (GLcontext *) userData;
+   ctx->Driver.DeleteBuffer(ctx, bufObj);
+}
+
+
+/**
+ * Callback for deleting an array object.  Called by _mesa_HashDeleteAll().
+ */
+static void
+delete_arrayobj_cb(GLuint id, void *data, void *userData)
+{
+   struct gl_array_object *arrayObj = (struct gl_array_object *) data;
+   GLcontext *ctx = (GLcontext *) userData;
+   _mesa_delete_array_object(ctx, arrayObj);
+}
+
+
+/**
+ * Callback for freeing shader program data. Call it before delete_shader_cb
+ * to avoid memory access error.
+ */
+static void
+free_shader_program_data_cb(GLuint id, void *data, void *userData)
+{
+   GLcontext *ctx = (GLcontext *) userData;
+   struct gl_shader_program *shProg = (struct gl_shader_program *) data;
+
+   if (shProg->Type == GL_SHADER_PROGRAM_MESA) {
+       _mesa_free_shader_program_data(ctx, shProg);
+   }
+}
+
+
+/**
+ * Callback for deleting shader and shader programs objects.
+ * Called by _mesa_HashDeleteAll().
+ */
+static void
+delete_shader_cb(GLuint id, void *data, void *userData)
+{
+   GLcontext *ctx = (GLcontext *) userData;
+   struct gl_shader *sh = (struct gl_shader *) data;
+   if (sh->Type == GL_FRAGMENT_SHADER || sh->Type == GL_VERTEX_SHADER) {
+      _mesa_free_shader(ctx, sh);
+   }
+   else {
+      struct gl_shader_program *shProg = (struct gl_shader_program *) data;
+      ASSERT(shProg->Type == GL_SHADER_PROGRAM_MESA);
+      _mesa_free_shader_program(ctx, shProg);
+   }
+}
+
+
+/**
+ * Callback for deleting a framebuffer object.  Called by _mesa_HashDeleteAll()
+ */
+static void
+delete_framebuffer_cb(GLuint id, void *data, void *userData)
+{
+   struct gl_framebuffer *fb = (struct gl_framebuffer *) data;
+   /* The fact that the framebuffer is in the hashtable means its refcount
+    * is one, but we're removing from the hashtable now.  So clear refcount.
+    */
+   /*assert(fb->RefCount == 1);*/
+   fb->RefCount = 0;
+
+   /* NOTE: Delete should always be defined but there are two reports
+    * of it being NULL (bugs 13507, 14293).  Work-around for now.
+    */
+   if (fb->Delete)
+      fb->Delete(fb);
+}
+
+
+/**
+ * Callback for deleting a renderbuffer object. Called by _mesa_HashDeleteAll()
+ */
+static void
+delete_renderbuffer_cb(GLuint id, void *data, void *userData)
+{
+   struct gl_renderbuffer *rb = (struct gl_renderbuffer *) data;
+   rb->RefCount = 0;  /* see comment for FBOs above */
+   if (rb->Delete)
+      rb->Delete(rb);
+}
+
+
+/**
+ * Deallocate a shared state object and all children structures.
+ *
+ * \param ctx GL context.
+ * \param ss shared state pointer.
+ * 
+ * Frees the display lists, the texture objects (calling the driver texture
+ * deletion callback to free its private data) and the vertex programs, as well
+ * as their hash tables.
+ *
+ * \sa alloc_shared_state().
+ */
+void
+_mesa_free_shared_state(GLcontext *ctx, struct gl_shared_state *shared)
+{
+   GLuint i;
+
+   /*
+    * Free display lists
+    */
+   _mesa_HashDeleteAll(shared->DisplayList, delete_displaylist_cb, ctx);
+   _mesa_DeleteHashTable(shared->DisplayList);
+
+#if FEATURE_ARB_shader_objects
+   _mesa_HashWalk(shared->ShaderObjects, free_shader_program_data_cb, ctx);
+   _mesa_HashDeleteAll(shared->ShaderObjects, delete_shader_cb, ctx);
+   _mesa_DeleteHashTable(shared->ShaderObjects);
+#endif
+
+   _mesa_HashDeleteAll(shared->Programs, delete_program_cb, ctx);
+   _mesa_DeleteHashTable(shared->Programs);
+
+   _mesa_HashDeleteAll(shared->ArrayObjects, delete_arrayobj_cb, ctx);
+   _mesa_DeleteHashTable(shared->ArrayObjects);
+
+#if FEATURE_ARB_vertex_program
+   _mesa_reference_vertprog(ctx, &shared->DefaultVertexProgram, NULL);
+#endif
+
+#if FEATURE_ARB_fragment_program
+   _mesa_reference_fragprog(ctx, &shared->DefaultFragmentProgram, NULL);
+#endif
+
+#if FEATURE_ATI_fragment_shader
+   _mesa_HashDeleteAll(shared->ATIShaders, delete_fragshader_cb, ctx);
+   _mesa_DeleteHashTable(shared->ATIShaders);
+   _mesa_delete_ati_fragment_shader(ctx, shared->DefaultFragmentShader);
+#endif
+
+#if FEATURE_ARB_vertex_buffer_object || FEATURE_ARB_pixel_buffer_object
+   _mesa_HashDeleteAll(shared->BufferObjects, delete_bufferobj_cb, ctx);
+   _mesa_DeleteHashTable(shared->BufferObjects);
+#endif
+
+#if FEATURE_EXT_framebuffer_object
+   _mesa_HashDeleteAll(shared->FrameBuffers, delete_framebuffer_cb, ctx);
+   _mesa_DeleteHashTable(shared->FrameBuffers);
+   _mesa_HashDeleteAll(shared->RenderBuffers, delete_renderbuffer_cb, ctx);
+   _mesa_DeleteHashTable(shared->RenderBuffers);
+#endif
+
+   /*
+    * Free texture objects (after FBOs since some textures might have
+    * been bound to FBOs).
+    */
+   ASSERT(ctx->Driver.DeleteTexture);
+   /* the default textures */
+   for (i = 0; i < NUM_TEXTURE_TARGETS; i++) {
+      ctx->Driver.DeleteTexture(ctx, shared->DefaultTex[i]);
+   }
+
+   /* all other textures */
+   _mesa_HashDeleteAll(shared->TexObjects, delete_texture_cb, ctx);
+   _mesa_DeleteHashTable(shared->TexObjects);
+
+   _glthread_DESTROY_MUTEX(shared->Mutex);
+   _glthread_DESTROY_MUTEX(shared->TexMutex);
+
+   _mesa_free(shared);
+}
diff --git a/src/mesa/main/shared.h b/src/mesa/main/shared.h
new file mode 100644
index 0000000000..e59177e968
--- /dev/null
+++ b/src/mesa/main/shared.h
@@ -0,0 +1,37 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.5
+ *
+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef SHARED_H
+#define SHARED_H
+
+
+struct gl_shared_state *
+_mesa_alloc_shared_state(GLcontext *ctx);
+
+
+void
+_mesa_free_shared_state(GLcontext *ctx, struct gl_shared_state *shared);
+
+
+#endif
diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 432a5c3c67..6913d9f40f 100644
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -58,6 +58,7 @@ MAIN_SOURCES = \
 	main/renderbuffer.c \
 	main/scissor.c \
 	main/shaders.c \
+	main/shared.c \
 	main/state.c \
 	main/stencil.c \
 	main/texcompress.c \
diff --git a/windows/VC8/mesa/mesa/mesa.vcproj b/windows/VC8/mesa/mesa/mesa.vcproj
index 84b373dd42..51a837f021 100644
--- a/windows/VC8/mesa/mesa/mesa.vcproj
+++ b/windows/VC8/mesa/mesa/mesa.vcproj
@@ -838,6 +838,10 @@
 				RelativePath="..\..\..\..\src\mesa\main\shaders.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\main\shared.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_builtin.c"
 				>
@@ -1703,6 +1707,10 @@
 				RelativePath="..\..\..\..\src\mesa\main\shaders.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\main\shared.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\main\simple_list.h"
 				>
-- 
cgit v1.2.3


From 9457d9ff4482f9b3796e2989e9ac3385d7d5404d Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Sun, 8 Mar 2009 12:07:41 -0600
Subject: mesa: reorder register file enums

---
 src/mesa/main/mtypes.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 57b7065b83..e43a6a82d0 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1706,15 +1706,15 @@ struct gl_evaluators
 typedef enum
 {
    PROGRAM_TEMPORARY,   /**< machine->Temporary[] */
+   PROGRAM_INPUT,       /**< machine->Inputs[] */
+   PROGRAM_OUTPUT,      /**< machine->Outputs[] */
+   PROGRAM_VARYING,     /**< machine->Inputs[]/Outputs[] */
    PROGRAM_LOCAL_PARAM, /**< gl_program->LocalParams[] */
    PROGRAM_ENV_PARAM,   /**< gl_program->Parameters[] */
    PROGRAM_STATE_VAR,   /**< gl_program->Parameters[] */
-   PROGRAM_INPUT,       /**< machine->Inputs[] */
-   PROGRAM_OUTPUT,      /**< machine->Outputs[] */
    PROGRAM_NAMED_PARAM, /**< gl_program->Parameters[] */
    PROGRAM_CONSTANT,    /**< gl_program->Parameters[] */
    PROGRAM_UNIFORM,     /**< gl_program->Parameters[] */
-   PROGRAM_VARYING,     /**< machine->Inputs[]/Outputs[] */
    PROGRAM_WRITE_ONLY,  /**< A dummy, write-only register */
    PROGRAM_ADDRESS,     /**< machine->AddressReg */
    PROGRAM_SAMPLER,     /**< for shader samplers, compile-time only */
-- 
cgit v1.2.3


From 590f6fe05030cb274067a9e58af9d8306d97d0b9 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 11 Mar 2009 19:23:01 -0600
Subject: mesa: remove gl_texture_object::_Function field and associated code

It was only used in one place in swrast.
---
 src/mesa/main/mtypes.h        |  4 ----
 src/mesa/main/texstate.c      | 32 --------------------------------
 src/mesa/swrast/s_texfilter.c |  4 +++-
 3 files changed, 3 insertions(+), 37 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index e43a6a82d0..44547f1b05 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1311,10 +1311,6 @@ struct gl_texture_object
    GLenum CompareMode;		/**< GL_ARB_shadow */
    GLenum CompareFunc;		/**< GL_ARB_shadow */
    GLfloat CompareFailValue;    /**< GL_ARB_shadow_ambient */
-   GLenum _Function;		/**< Comparison function derived from 
-				 * \c CompareOperator, \c CompareMode, and
-				 * \c CompareFunc.
-				 */
    GLenum DepthMode;		/**< GL_ARB_depth_texture */
    GLint _MaxLevel;		/**< actual max mipmap level (q in the spec) */
    GLfloat _MaxLambda;		/**< = _MaxLevel - BaseLevel (q - b in spec) */
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 2b07da805c..d71f9530cb 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -353,37 +353,6 @@ update_texture_matrices( GLcontext *ctx )
 }
 
 
-/**
- * Update texture object's _Function field.  We need to do this
- * whenever any of the texture object's shadow-related fields change
- * or when we start/stop using a fragment program.
- *
- * This function could be expanded someday to update additional per-object
- * fields that depend on assorted state changes.
- */
-static void
-update_texture_compare_function(GLcontext *ctx,
-                                struct gl_texture_object *tObj)
-{
-   /* XXX temporarily disable this test since it breaks the GLSL
-    * shadow2D(), etc. functions.
-    */
-   if (0 /*ctx->FragmentProgram._Current*/) {
-      /* Texel/coordinate comparison is ignored for programs.
-       * See GL_ARB_fragment_program/shader spec for details.
-       */
-      tObj->_Function = GL_NONE;
-   }
-   else if (tObj->CompareMode == GL_COMPARE_R_TO_TEXTURE_ARB) {
-      /* GL_ARB_shadow */
-      tObj->_Function = tObj->CompareFunc;
-   }
-   else {
-      tObj->_Function = GL_NONE;  /* pass depth through as grayscale */
-   }
-}
-
-
 /**
  * Examine texture unit's combine/env state to update derived state.
  */
@@ -589,7 +558,6 @@ update_texture_state( GLcontext *ctx )
          enabledFragUnits |= (1 << unit);
 
       update_tex_combine(ctx, texUnit);
-      update_texture_compare_function(ctx, texUnit->_Current);
    }
 
 
diff --git a/src/mesa/swrast/s_texfilter.c b/src/mesa/swrast/s_texfilter.c
index 8d72018cf4..19317c393a 100644
--- a/src/mesa/swrast/s_texfilter.c
+++ b/src/mesa/swrast/s_texfilter.c
@@ -2830,7 +2830,9 @@ sample_depth_texture( GLcontext *ctx,
 
    /* XXXX if tObj->MinFilter != tObj->MagFilter, we're ignoring lambda */
 
-   function = tObj->_Function;
+   function = (tObj->CompareMode == GL_COMPARE_R_TO_TEXTURE_ARB) ?
+      tObj->CompareFunc : GL_NONE;
+
    if (tObj->MagFilter == GL_NEAREST) {
       GLuint i;
       for (i = 0; i < n; i++) {
-- 
cgit v1.2.3


From 4dfa3757c58255c3ad8c3fe343541d2aa677f44c Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 11 Mar 2009 19:34:41 -0600
Subject: mesa: minor comments

---
 src/mesa/main/mtypes.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 44547f1b05..31313549e5 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -932,12 +932,12 @@ struct gl_pixel_attrib
 
    /*--- End Pixel Transfer State ---*/
 
-   /* Pixel Zoom */
+   /** glPixelZoom */
    GLfloat ZoomX, ZoomY;
 
    /** GL_SGI_texture_color_table */
-   GLfloat TextureColorTableScale[4];
-   GLfloat TextureColorTableBias[4];
+   GLfloat TextureColorTableScale[4]; /**< RGBA */
+   GLfloat TextureColorTableBias[4];  /**< RGBA */
 };
 
 
-- 
cgit v1.2.3


From 548be3846db59ad43934a159c051b359db6e56db Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 11 Mar 2009 20:08:37 -0600
Subject: mesa: remove some last remnants of GL_MESA_program_debug

---
 src/mesa/main/mtypes.h            | 1 -
 src/mesa/shader/arbprogram.c      | 9 +++------
 src/mesa/shader/nvprogram.c       | 9 +++------
 src/mesa/swrast/s_atifragshader.c | 4 ----
 src/mesa/swrast/s_fragprog.c      | 4 ----
 5 files changed, 6 insertions(+), 21 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 31313549e5..f205864191 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2934,7 +2934,6 @@ struct __GLcontextRec
    GLfloat _ModelViewInvScale;
    GLboolean _NeedEyeCoords;
    GLboolean _ForceEyeCoords; 
-   GLenum _CurrentProgram;    /**< currently executing program */
 
    GLuint TextureStateTimestamp; /**< detect changes to shared state */
 
diff --git a/src/mesa/shader/arbprogram.c b/src/mesa/shader/arbprogram.c
index 7831e0faf9..329c0ea0b0 100644
--- a/src/mesa/shader/arbprogram.c
+++ b/src/mesa/shader/arbprogram.c
@@ -597,8 +597,7 @@ _mesa_GetProgramEnvParameterfvARB(GLenum target, GLuint index,
 
    FLUSH_VERTICES(ctx, _NEW_PROGRAM);
 
-   if (!ctx->_CurrentProgram)
-      ASSERT_OUTSIDE_BEGIN_END(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
 
    if (target == GL_FRAGMENT_PROGRAM_ARB
        && ctx->Extensions.ARB_fragment_program) {
@@ -818,8 +817,7 @@ _mesa_GetProgramivARB(GLenum target, GLenum pname, GLint *params)
    struct gl_program *prog;
    GET_CURRENT_CONTEXT(ctx);
 
-   if (!ctx->_CurrentProgram)
-      ASSERT_OUTSIDE_BEGIN_END(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
 
    if (target == GL_VERTEX_PROGRAM_ARB
        && ctx->Extensions.ARB_vertex_program) {
@@ -1000,8 +998,7 @@ _mesa_GetProgramStringARB(GLenum target, GLenum pname, GLvoid *string)
    char *dst = (char *) string;
    GET_CURRENT_CONTEXT(ctx);
 
-   if (!ctx->_CurrentProgram)
-      ASSERT_OUTSIDE_BEGIN_END(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
 
    if (target == GL_VERTEX_PROGRAM_ARB) {
       prog = &(ctx->VertexProgram.Current->Base);
diff --git a/src/mesa/shader/nvprogram.c b/src/mesa/shader/nvprogram.c
index 16116c4339..50358cf107 100644
--- a/src/mesa/shader/nvprogram.c
+++ b/src/mesa/shader/nvprogram.c
@@ -246,8 +246,7 @@ _mesa_GetProgramivNV(GLuint id, GLenum pname, GLint *params)
    struct gl_program *prog;
    GET_CURRENT_CONTEXT(ctx);
 
-   if (!ctx->_CurrentProgram)
-      ASSERT_OUTSIDE_BEGIN_END(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
 
    prog = _mesa_lookup_program(ctx, id);
    if (!prog) {
@@ -283,8 +282,7 @@ _mesa_GetProgramStringNV(GLuint id, GLenum pname, GLubyte *program)
    struct gl_program *prog;
    GET_CURRENT_CONTEXT(ctx);
 
-   if (!ctx->_CurrentProgram)
-      ASSERT_OUTSIDE_BEGIN_END(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
 
    if (pname != GL_PROGRAM_STRING_NV) {
       _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramStringNV(pname)");
@@ -773,8 +771,7 @@ _mesa_GetProgramNamedParameterfvNV(GLuint id, GLsizei len, const GLubyte *name,
 
    GET_CURRENT_CONTEXT(ctx);
 
-   if (!ctx->_CurrentProgram)
-      ASSERT_OUTSIDE_BEGIN_END(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
 
    prog = _mesa_lookup_program(ctx, id);
    if (!prog || prog->Target != GL_FRAGMENT_PROGRAM_NV) {
diff --git a/src/mesa/swrast/s_atifragshader.c b/src/mesa/swrast/s_atifragshader.c
index 21cbd3cf37..458fe18163 100644
--- a/src/mesa/swrast/s_atifragshader.c
+++ b/src/mesa/swrast/s_atifragshader.c
@@ -591,8 +591,6 @@ _swrast_exec_fragment_shader(GLcontext * ctx, SWspan *span)
    /* incoming colors should be floats */
    ASSERT(span->array->ChanType == GL_FLOAT);
 
-   ctx->_CurrentProgram = GL_FRAGMENT_SHADER_ATI;
-
    for (i = 0; i < span->end; i++) {
       if (span->array->mask[i]) {
 	 init_machine(ctx, &machine, shader, span, i);
@@ -608,6 +606,4 @@ _swrast_exec_fragment_shader(GLcontext * ctx, SWspan *span)
 	 }
       }
    }
-
-   ctx->_CurrentProgram = 0;
 }
diff --git a/src/mesa/swrast/s_fragprog.c b/src/mesa/swrast/s_fragprog.c
index 3735f041d6..ae1dea16a0 100644
--- a/src/mesa/swrast/s_fragprog.c
+++ b/src/mesa/swrast/s_fragprog.c
@@ -255,8 +255,6 @@ _swrast_exec_fragment_program( GLcontext *ctx, SWspan *span )
       ASSERT(span->array->ChanType == GL_FLOAT);
    }
 
-   ctx->_CurrentProgram = GL_FRAGMENT_PROGRAM_ARB; /* or NV, doesn't matter */
-
    run_program(ctx, span, 0, span->end);
 
    if (program->Base.OutputsWritten & (1 << FRAG_RESULT_COLOR)) {
@@ -268,7 +266,5 @@ _swrast_exec_fragment_program( GLcontext *ctx, SWspan *span )
       span->interpMask &= ~SPAN_Z;
       span->arrayMask |= SPAN_Z;
    }
-
-   ctx->_CurrentProgram = 0;
 }
 
-- 
cgit v1.2.3


From 6dceeb2eb804d708639d68a13a924d65f366458a Mon Sep 17 00:00:00 2001
From: Robert Ellison <papillo@vmware.com>
Date: Wed, 11 Mar 2009 16:27:38 -0600
Subject: i965: fix polygon face orientation when rendering to FBO

In the i965, the FBO coordinate system is inverted from the standard
OpenGL/Mesa coordinate system; that means that the viewport and the
polygon face orientation have to be inverted if rendering to a FBO.

The viewport was already being handled correctly; but polygon face
was not.  This caused a conform failure when rendering to texture with
two-sided lighting enabled.

This fixes the problem in the i965 driver, and adds to the comment about
the gl_framebuffer "Name" field so that this isn't a surprise to other
driver writers.
---
 src/mesa/drivers/dri/i965/brw_sf.c | 10 ++++++++--
 src/mesa/main/mtypes.h             | 10 +++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/i965/brw_sf.c b/src/mesa/drivers/dri/i965/brw_sf.c
index 8c1711538a..c3c85978f4 100644
--- a/src/mesa/drivers/dri/i965/brw_sf.c
+++ b/src/mesa/drivers/dri/i965/brw_sf.c
@@ -167,8 +167,14 @@ static void upload_sf_prog(struct brw_context *brw)
    key.do_twoside_color = (ctx->Light.Enabled && ctx->Light.Model.TwoSide);
 
    /* _NEW_POLYGON */
-   if (key.do_twoside_color)
-      key.frontface_ccw = (ctx->Polygon.FrontFace == GL_CCW);
+   if (key.do_twoside_color) {
+      /* If we're rendering to a FBO, we have to invert the polygon
+       * face orientation, just as we invert the viewport in
+       * sf_unit_create_from_key().  ctx->DrawBuffer->Name will be
+       * nonzero if we're rendering to such an FBO.
+       */
+      key.frontface_ccw = (ctx->Polygon.FrontFace == GL_CCW) ^ (ctx->DrawBuffer->Name != 0);
+   }
 
    dri_bo_unreference(brw->sf.prog_bo);
    brw->sf.prog_bo = brw_search_cache(&brw->cache, BRW_SF_PROG,
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index f205864191..9080c83da4 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2236,7 +2236,15 @@ struct gl_renderbuffer_attachment
 struct gl_framebuffer
 {
    _glthread_Mutex Mutex;  /**< for thread safety */
-   GLuint Name;            /**< if zero, this is a window system framebuffer */
+   /**
+    * If zero, this is a window system framebuffer.  If non-zero, this
+    * is a FBO framebuffer; note that for some devices (i.e. those with
+    * a natural pixel coordinate system for FBOs that differs from the 
+    * OpenGL/Mesa coordinate system), this means that both the viewport
+    * and polygon face orientation will have to be inverted.
+    */
+   GLuint Name;
+
    GLint RefCount;
    GLboolean DeletePending;
 
-- 
cgit v1.2.3


From 81569c2f697586daab01486ec1da28f0a03b5c6a Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keithw@vmware.com>
Date: Thu, 12 Mar 2009 10:09:51 +0000
Subject: mesa: add missing _glthread_INIT_MUTEX in _mesa_new_framebuffer()

---
 src/mesa/main/framebuffer.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/framebuffer.c b/src/mesa/main/framebuffer.c
index b69b92a965..5a13c88a7a 100644
--- a/src/mesa/main/framebuffer.c
+++ b/src/mesa/main/framebuffer.c
@@ -116,6 +116,7 @@ _mesa_new_framebuffer(GLcontext *ctx, GLuint name)
       fb->ColorReadBuffer = GL_COLOR_ATTACHMENT0_EXT;
       fb->_ColorReadBufferIndex = BUFFER_COLOR0;
       fb->Delete = _mesa_destroy_framebuffer;
+      _glthread_INIT_MUTEX(fb->Mutex);
    }
    return fb;
 }
-- 
cgit v1.2.3


From 114152e068ec919feb0a57a1259c2ada970b9f02 Mon Sep 17 00:00:00 2001
From: Roland Scheidegger <sroland@vmware.com>
Date: Thu, 12 Mar 2009 15:01:16 +0100
Subject: mesa: add support for ATI_envmap_bumpmap

add new entrypoints, new texture format, etc
translate in texenvprogram.c for drivers using the mesa-generated tex env
fragment program
also handled in swrast, but not tested (cannot work due to negative texel
results not handled correctly)
---
 src/mesa/glapi/gl_API.xml        |  50 +++++++++++
 src/mesa/main/api_exec.c         |   6 ++
 src/mesa/main/config.h           |   3 +-
 src/mesa/main/context.c          |   3 +
 src/mesa/main/dlist.c            |  46 +++++++++++
 src/mesa/main/extensions.c       |   2 +
 src/mesa/main/image.c            | 153 +++++++++++++++++++++++++++++++++-
 src/mesa/main/image.h            |   7 ++
 src/mesa/main/macros.h           |   7 +-
 src/mesa/main/mipmap.c           |  14 +++-
 src/mesa/main/mtypes.h           |   5 ++
 src/mesa/main/texenv.c           | 174 ++++++++++++++++++++++++++++++++++++++-
 src/mesa/main/texenv.h           |  11 +++
 src/mesa/main/texenvprogram.c    |  99 ++++++++++++++++++++--
 src/mesa/main/texformat.c        |  42 ++++++++++
 src/mesa/main/texformat.h        |  14 +++-
 src/mesa/main/texformat_tmp.h    |  17 +++-
 src/mesa/main/teximage.c         |  39 ++++++++-
 src/mesa/main/texstate.c         |  20 +++++
 src/mesa/main/texstore.c         |  91 +++++++++++++++++++-
 src/mesa/main/texstore.h         |   2 +-
 src/mesa/shader/prog_statevars.c |  28 +++++++
 src/mesa/shader/prog_statevars.h |   2 +
 src/mesa/swrast/s_texcombine.c   |  95 ++++++++++++++++++++-
 24 files changed, 906 insertions(+), 24 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/glapi/gl_API.xml b/src/mesa/glapi/gl_API.xml
index 8212fc2477..cc3e3ae6bf 100644
--- a/src/mesa/glapi/gl_API.xml
+++ b/src/mesa/glapi/gl_API.xml
@@ -11681,6 +11681,56 @@
     <enum name="DEPTH_STENCIL_TO_BGRA_NV"                 value="0x886F"/>
 </category>
 
+<category name="GL_ATI_envmap_bumpmap" number="244">
+    <enum name="BUMP_ROT_MATRIX_ATI"          count="4"   value="0x8775">
+        <size name="TexBumpParameterfv"/>
+        <size name="TexBumpParameteriv"/>
+        <size name="GetTexBumpParameterfv" mode="get"/>
+        <size name="GetTexBumpParameteriv" mode="get"/>
+    </enum>
+    <enum name="BUMP_ROT_MATRIX_SIZE_ATI"     count="1"   value="0x8776">
+        <size name="GetTexBumpParameterfv" mode="get"/>
+        <size name="GetTexBumpParameteriv" mode="get"/>
+    </enum>
+    <enum name="BUMP_NUM_TEX_UNITS_ATI"       count="1"   value="0x8777">
+        <size name="GetTexBumpParameterfv" mode="get"/>
+        <size name="GetTexBumpParameteriv" mode="get"/>
+    </enum>
+    <enum name="BUMP_TEX_UNITS_ATI"           count="-1"  value="0x8778">
+        <size name="GetTexBumpParameterfv" mode="get"/>
+        <size name="GetTexBumpParameteriv" mode="get"/>
+    </enum>
+    <enum name="DUDV_ATI"                                 value="0x8779"/>
+    <enum name="DU8DV8_ATI"                               value="0x877A"/>
+    <enum name="BUMP_ENVMAP_ATI"                          value="0x877B"/>
+    <enum name="BUMP_TARGET_ATI"              count="1"   value="0x877C">
+        <size name="TexEnviv"/>
+        <size name="TexEnvfv"/>
+        <size name="GetTexEnviv" mode="get"/>
+        <size name="GetTexEnvfv" mode="get"/>
+    </enum>
+    <function name="TexBumpParameterfvATI" offset="assign">
+      <param name="pname" type="GLenum"/>
+      <param name="param" type="const GLfloat *" variable_param="pname"/>
+      <glx ignore="true"/>
+    </function>
+    <function name="TexBumpParameterivATI" offset="assign">
+      <param name="pname" type="GLenum"/>
+      <param name="param" type="const GLint *" variable_param="pname"/>
+      <glx ignore="true"/>
+    </function>
+    <function name="GetTexBumpParameterfvATI" offset="assign">
+      <param name="pname" type="GLenum"/>
+      <param name="param" type="GLfloat *" variable_param="pname"/>
+      <glx ignore="true"/>
+    </function>
+    <function name="GetTexBumpParameterivATI" offset="assign">
+      <param name="pname" type="GLenum"/>
+      <param name="param" type="GLint *" variable_param="pname"/>
+      <glx ignore="true"/>
+    </function>
+</category>
+
 <category name="GL_ATI_fragment_shader" number="245">
     <function name="GenFragmentShadersATI" offset="assign">
       <return type="GLuint"/>
diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index e0715817ad..6f66ff47a0 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -839,6 +839,12 @@ _mesa_init_exec_table(struct _glapi_table *exec)
    SET_SetFragmentShaderConstantATI(exec, _mesa_SetFragmentShaderConstantATI);
 #endif
 
+  /* GL_ATI_envmap_bumpmap */
+   SET_GetTexBumpParameterivATI(exec, _mesa_GetTexBumpParameterivATI);
+   SET_GetTexBumpParameterfvATI(exec, _mesa_GetTexBumpParameterfvATI);
+   SET_TexBumpParameterivATI(exec, _mesa_TexBumpParameterivATI);
+   SET_TexBumpParameterfvATI(exec, _mesa_TexBumpParameterfvATI);
+
 #if FEATURE_EXT_framebuffer_object
    SET_IsRenderbufferEXT(exec, _mesa_IsRenderbufferEXT);
    SET_BindRenderbufferEXT(exec, _mesa_BindRenderbufferEXT);
diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index 282ad9514c..fc31155b35 100644
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -232,7 +232,8 @@
 #define MAX_COLOR_ATTACHMENTS 8
 /*@}*/
 
-
+/** For GL_ATI_envmap_bump - support bump mapping on first 8 units */
+#define SUPPORTED_ATI_BUMP_UNITS 0xff
 
 /**
  * \name Mesa-specific parameters
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 9fd9e769d2..84bf0205a8 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -589,6 +589,9 @@ _mesa_init_constants(GLcontext *ctx)
    /* GL_ARB_framebuffer_object */
    ctx->Const.MaxSamples = 0;
 
+   /* GL_ATI_envmap_bumpmap */
+   ctx->Const.SupportedBumpUnits = SUPPORTED_ATI_BUMP_UNITS;
+
    /* sanity checks */
    ASSERT(ctx->Const.MaxTextureUnits == MIN2(ctx->Const.MaxTextureImageUnits,
                                              ctx->Const.MaxTextureCoordUnits));
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index d4bd56be83..ebcef0268a 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -320,6 +320,8 @@ typedef enum
    /* GL_ARB_draw_buffers */
    OPCODE_DRAW_BUFFERS_ARB,
    /* GL_ATI_fragment_shader */
+   OPCODE_TEX_BUMP_PARAMETER_ATI,
+   /* GL_ATI_fragment_shader */
    OPCODE_BIND_FRAGMENT_SHADER_ATI,
    OPCODE_SET_FRAGMENT_SHADER_CONSTANTS_ATI,
    /* OpenGL 2.0 */
@@ -4803,6 +4805,36 @@ save_DrawBuffersARB(GLsizei count, const GLenum * buffers)
    }
 }
 
+static void GLAPIENTRY
+save_TexBumpParameterfvATI(GLenum pname, const GLfloat *param)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+
+   n = ALLOC_INSTRUCTION(ctx, OPCODE_TEX_BUMP_PARAMETER_ATI, 5);
+   if (n) {
+      n[1].ui = pname;
+      n[2].f = param[0];
+      n[3].f = param[1];
+      n[4].f = param[2];
+      n[5].f = param[3];
+   }
+   if (ctx->ExecuteFlag) {
+      CALL_TexBumpParameterfvATI(ctx->Exec, (pname, param));
+   }
+}
+
+static void GLAPIENTRY
+save_TexBumpParameterivATI(GLenum pname, const GLint *param)
+{
+   GLfloat p[4];
+   p[0] = INT_TO_FLOAT(param[0]);
+   p[1] = INT_TO_FLOAT(param[1]);
+   p[2] = INT_TO_FLOAT(param[2]);
+   p[3] = INT_TO_FLOAT(param[3]);
+   save_TexBumpParameterfvATI(pname, p);
+}
+
 #if FEATURE_ATI_fragment_shader
 static void GLAPIENTRY
 save_BindFragmentShaderATI(GLuint id)
@@ -6505,6 +6537,16 @@ execute_list(GLcontext *ctx, GLuint list)
                                                 n[9].i, n[10].e));
 	    break;
 #endif
+         case OPCODE_TEX_BUMP_PARAMETER_ATI:
+            {
+               GLfloat values[4];
+               GLuint i, pname = n[1].ui;
+
+               for (i = 0; i < 4; i++)
+                  values[i] = n[1 + i].f;
+               CALL_TexBumpParameterfvATI(ctx->Exec, (pname, values));
+            }
+            break;
 #if FEATURE_ATI_fragment_shader
          case OPCODE_BIND_FRAGMENT_SHADER_ATI:
             CALL_BindFragmentShaderATI(ctx->Exec, (n[1].i));
@@ -8043,6 +8085,10 @@ _mesa_init_dlist_table(struct _glapi_table *table)
    SET_VertexAttribPointerNV(table, _mesa_VertexAttribPointerNV);
 #endif
 
+   /* 244. GL_ATI_envmap_bumpmap */
+   SET_TexBumpParameterivATI(table, save_TexBumpParameterivATI);
+   SET_TexBumpParameterfvATI(table, save_TexBumpParameterfvATI);
+
    /* 245. GL_ATI_fragment_shader */
 #if FEATURE_ATI_fragment_shader
    SET_BindFragmentShaderATI(table, save_BindFragmentShaderATI);
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index fbca924ad3..2d2bf51784 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -137,6 +137,7 @@ static const struct {
    { ON,  "GL_APPLE_packed_pixels",            F(APPLE_packed_pixels) },
    { OFF, "GL_APPLE_vertex_array_object",      F(APPLE_vertex_array_object) },
    { OFF, "GL_ATI_blend_equation_separate",    F(EXT_blend_equation_separate) },
+   { OFF, "GL_ATI_envmap_bumpmap",             F(ATI_envmap_bumpmap) },
    { OFF, "GL_ATI_texture_env_combine3",       F(ATI_texture_env_combine3)},
    { OFF, "GL_ATI_texture_mirror_once",        F(ATI_texture_mirror_once)},
    { OFF, "GL_ATI_fragment_shader",            F(ATI_fragment_shader)},
@@ -229,6 +230,7 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
    /*ctx->Extensions.ARB_vertex_buffer_object = GL_TRUE;*/
 #endif
    ctx->Extensions.APPLE_vertex_array_object = GL_TRUE;
+   ctx->Extensions.ATI_envmap_bumpmap = GL_TRUE;
 #if FEATURE_ATI_fragment_shader
    ctx->Extensions.ATI_fragment_shader = GL_TRUE;
 #endif
diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index 4d86c54777..ed0811660d 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -293,6 +293,8 @@ _mesa_components_in_format( GLenum format )
          return 2;
       case GL_DEPTH_STENCIL_EXT:
          return 2;
+      case GL_DUDV_ATI:
+         return 2;
       default:
          return -1;
    }
@@ -503,6 +505,20 @@ _mesa_is_legal_format_and_type( GLcontext *ctx, GLenum format, GLenum type )
             return GL_TRUE;
          else
             return GL_FALSE;
+      case GL_DUDV_ATI:
+      case GL_DU8DV8_ATI:
+         switch (type) {
+            case GL_BYTE:
+            case GL_UNSIGNED_BYTE:
+            case GL_SHORT:
+            case GL_UNSIGNED_SHORT:
+            case GL_INT:
+            case GL_UNSIGNED_INT:
+            case GL_FLOAT:
+               return GL_TRUE;
+            default:
+               return GL_FALSE;
+         }
       default:
          ; /* fall-through */
    }
@@ -1674,8 +1690,19 @@ _mesa_pack_rgba_span_float(GLcontext *ctx, GLuint n, GLfloat rgba[][4],
    GLfloat luminance[MAX_WIDTH];
    const GLint comps = _mesa_components_in_format(dstFormat);
    GLuint i;
-
-   if (dstType != GL_FLOAT || ctx->Color.ClampReadColor == GL_TRUE) {
+   /* clamping only applies to colors, not the dudv values, but still need
+      it if converting to unsigned values (which doesn't make much sense) */
+   if (dstFormat == GL_DUDV_ATI || dstFormat == GL_DU8DV8_ATI) {
+      switch (dstType) {
+         case GL_UNSIGNED_BYTE:
+         case GL_UNSIGNED_SHORT:
+         case GL_UNSIGNED_INT:
+            transferOps |= IMAGE_CLAMP_BIT;
+            break;
+            /* actually might want clamp to [-1,1] otherwise but shouldn't matter? */
+      }
+   }
+   else if (dstType != GL_FLOAT || ctx->Color.ClampReadColor == GL_TRUE) {
       /* need to clamp to [0, 1] */
       transferOps |= IMAGE_CLAMP_BIT;
    }
@@ -1774,6 +1801,13 @@ _mesa_pack_rgba_span_float(GLcontext *ctx, GLuint n, GLfloat rgba[][4],
                      dst[i*4+3] = FLOAT_TO_UBYTE(rgba[i][RCOMP]);
                   }
                   break;
+               case GL_DUDV_ATI:
+               case GL_DU8DV8_ATI:
+                  for (i=0;i<n;i++) {
+                     dst[i*2+0] = FLOAT_TO_UBYTE(rgba[i][RCOMP]);
+                     dst[i*2+1] = FLOAT_TO_UBYTE(rgba[i][GCOMP]);
+                  }
+                  break;
                default:
                   _mesa_problem(ctx, "bad format in _mesa_pack_rgba_span\n");
             }
@@ -1847,6 +1881,13 @@ _mesa_pack_rgba_span_float(GLcontext *ctx, GLuint n, GLfloat rgba[][4],
                      dst[i*4+3] = FLOAT_TO_BYTE(rgba[i][RCOMP]);
                   }
                   break;
+               case GL_DUDV_ATI:
+               case GL_DU8DV8_ATI:
+                  for (i=0;i<n;i++) {
+                     dst[i*2+0] = FLOAT_TO_BYTE(rgba[i][RCOMP]);
+                     dst[i*2+1] = FLOAT_TO_BYTE(rgba[i][GCOMP]);
+                  }
+                  break;
                default:
                   _mesa_problem(ctx, "bad format in _mesa_pack_rgba_span\n");
             }
@@ -1920,6 +1961,13 @@ _mesa_pack_rgba_span_float(GLcontext *ctx, GLuint n, GLfloat rgba[][4],
                      CLAMPED_FLOAT_TO_USHORT(dst[i*4+3], rgba[i][RCOMP]);
                   }
                   break;
+               case GL_DUDV_ATI:
+               case GL_DU8DV8_ATI:
+                  for (i=0;i<n;i++) {
+                     dst[i*2+0] = FLOAT_TO_USHORT(rgba[i][RCOMP]);
+                     dst[i*2+1] = FLOAT_TO_USHORT(rgba[i][GCOMP]);
+                  }
+                  break;
                default:
                   _mesa_problem(ctx, "bad format in _mesa_pack_rgba_span\n");
             }
@@ -1993,6 +2041,13 @@ _mesa_pack_rgba_span_float(GLcontext *ctx, GLuint n, GLfloat rgba[][4],
                      dst[i*4+3] = FLOAT_TO_SHORT(rgba[i][RCOMP]);
                   }
                   break;
+               case GL_DUDV_ATI:
+               case GL_DU8DV8_ATI:
+                  for (i=0;i<n;i++) {
+                     dst[i*2+0] = FLOAT_TO_SHORT(rgba[i][RCOMP]);
+                     dst[i*2+1] = FLOAT_TO_SHORT(rgba[i][GCOMP]);
+                  }
+                  break;
                default:
                   _mesa_problem(ctx, "bad format in _mesa_pack_rgba_span\n");
             }
@@ -2066,6 +2121,13 @@ _mesa_pack_rgba_span_float(GLcontext *ctx, GLuint n, GLfloat rgba[][4],
                      dst[i*4+3] = FLOAT_TO_UINT(rgba[i][RCOMP]);
                   }
                   break;
+               case GL_DUDV_ATI:
+               case GL_DU8DV8_ATI:
+                  for (i=0;i<n;i++) {
+                     dst[i*2+0] = FLOAT_TO_UINT(rgba[i][RCOMP]);
+                     dst[i*2+1] = FLOAT_TO_UINT(rgba[i][GCOMP]);
+                  }
+                  break;
                default:
                   _mesa_problem(ctx, "bad format in _mesa_pack_rgba_span\n");
             }
@@ -2139,6 +2201,13 @@ _mesa_pack_rgba_span_float(GLcontext *ctx, GLuint n, GLfloat rgba[][4],
                      dst[i*4+3] = FLOAT_TO_INT(rgba[i][RCOMP]);
                   }
                   break;
+               case GL_DUDV_ATI:
+               case GL_DU8DV8_ATI:
+                  for (i=0;i<n;i++) {
+                     dst[i*2+0] = FLOAT_TO_INT(rgba[i][RCOMP]);
+                     dst[i*2+1] = FLOAT_TO_INT(rgba[i][GCOMP]);
+                  }
+                  break;
                default:
                   _mesa_problem(ctx, "bad format in _mesa_pack_rgba_span\n");
             }
@@ -2212,6 +2281,13 @@ _mesa_pack_rgba_span_float(GLcontext *ctx, GLuint n, GLfloat rgba[][4],
                      dst[i*4+3] = rgba[i][RCOMP];
                   }
                   break;
+               case GL_DUDV_ATI:
+               case GL_DU8DV8_ATI:
+                  for (i=0;i<n;i++) {
+                     dst[i*2+0] = rgba[i][RCOMP];
+                     dst[i*2+1] = rgba[i][GCOMP];
+                  }
+                  break;
                default:
                   _mesa_problem(ctx, "bad format in _mesa_pack_rgba_span\n");
             }
@@ -2285,6 +2361,13 @@ _mesa_pack_rgba_span_float(GLcontext *ctx, GLuint n, GLfloat rgba[][4],
                      dst[i*4+3] = _mesa_float_to_half(rgba[i][RCOMP]);
                   }
                   break;
+               case GL_DUDV_ATI:
+               case GL_DU8DV8_ATI:
+                  for (i=0;i<n;i++) {
+                     dst[i*2+0] = _mesa_float_to_half(rgba[i][RCOMP]);
+                     dst[i*2+1] = _mesa_float_to_half(rgba[i][GCOMP]);
+                  }
+                  break;
                default:
                   _mesa_problem(ctx, "bad format in _mesa_pack_rgba_span\n");
             }
@@ -2834,7 +2917,8 @@ extract_float_rgba(GLuint n, GLfloat rgba[][4],
           srcFormat == GL_BGR ||
           srcFormat == GL_RGBA ||
           srcFormat == GL_BGRA ||
-          srcFormat == GL_ABGR_EXT);
+          srcFormat == GL_ABGR_EXT ||
+          srcFormat == GL_DUDV_ATI);
 
    ASSERT(srcType == GL_UNSIGNED_BYTE ||
           srcType == GL_BYTE ||
@@ -2949,6 +3033,13 @@ extract_float_rgba(GLuint n, GLfloat rgba[][4],
          aComp = 0;
          stride = 4;
          break;
+      case GL_DUDV_ATI:
+         redIndex = 0;
+         greenIndex = 1;
+         blueIndex = -1;
+         alphaIndex = -1;
+         stride = 2;
+         break;
       default:
          _mesa_problem(NULL, "bad srcFormat in extract float data");
          return;
@@ -3877,6 +3968,62 @@ _mesa_unpack_color_span_float( GLcontext *ctx,
    }
 }
 
+/**
+ * Similar to _mesa_unpack_color_span_float(), but for dudv data instead of rgba,
+ * directly return GLbyte data, no transfer ops apply.
+ */
+void
+_mesa_unpack_dudv_span_byte( GLcontext *ctx,
+                             GLuint n, GLenum dstFormat, GLbyte dest[],
+                             GLenum srcFormat, GLenum srcType,
+                             const GLvoid *source,
+                             const struct gl_pixelstore_attrib *srcPacking,
+                             GLbitfield transferOps )
+{
+   ASSERT(dstFormat == GL_DUDV_ATI);
+   ASSERT(srcFormat == GL_DUDV_ATI);
+
+   ASSERT(srcType == GL_UNSIGNED_BYTE ||
+          srcType == GL_BYTE ||
+          srcType == GL_UNSIGNED_SHORT ||
+          srcType == GL_SHORT ||
+          srcType == GL_UNSIGNED_INT ||
+          srcType == GL_INT ||
+          srcType == GL_HALF_FLOAT_ARB ||
+          srcType == GL_FLOAT);
+
+   /* general solution */
+   {
+      GLint dstComponents;
+      GLfloat rgba[MAX_WIDTH][4];
+
+      dstComponents = _mesa_components_in_format( dstFormat );
+      /* source & dest image formats should have been error checked by now */
+      assert(dstComponents > 0);
+
+      /*
+       * Extract image data and convert to RGBA floats
+       */
+      assert(n <= MAX_WIDTH);
+      extract_float_rgba(n, rgba, srcFormat, srcType, source,
+                         srcPacking->SwapBytes);
+
+
+      /* Now determine which color channels we need to produce.
+       * And determine the dest index (offset) within each color tuple.
+       */
+
+      /* Now pack results in the requested dstFormat */
+      GLbyte *dst = dest;
+      GLuint i;
+      for (i = 0; i < n; i++) {
+         /* not sure - need clamp[-1,1] here? */
+         dst[0] = FLOAT_TO_BYTE(rgba[i][RCOMP]);
+         dst[1] = FLOAT_TO_BYTE(rgba[i][GCOMP]);
+         dst += dstComponents;
+      }
+   }
+}
 
 /*
  * Unpack a row of color index data from a client buffer according to
diff --git a/src/mesa/main/image.h b/src/mesa/main/image.h
index 0e0bbd96d8..b26c27e5a8 100644
--- a/src/mesa/main/image.h
+++ b/src/mesa/main/image.h
@@ -198,6 +198,13 @@ _mesa_unpack_color_span_float( GLcontext *ctx,
                                const struct gl_pixelstore_attrib *srcPacking,
                                GLbitfield transferOps );
 
+extern void
+_mesa_unpack_dudv_span_byte( GLcontext *ctx,
+                             GLuint n, GLenum dstFormat, GLbyte dest[],
+                             GLenum srcFormat, GLenum srcType,
+                             const GLvoid *source,
+                             const struct gl_pixelstore_attrib *srcPacking,
+                             GLbitfield transferOps );
 
 extern void
 _mesa_unpack_index_span( const GLcontext *ctx, GLuint n,
diff --git a/src/mesa/main/macros.h b/src/mesa/main/macros.h
index 2630855a0e..bfd740870e 100644
--- a/src/mesa/main/macros.h
+++ b/src/mesa/main/macros.h
@@ -54,13 +54,16 @@ extern GLfloat _mesa_ubyte_to_float_color_tab[256];
 #define FLOAT_TO_BYTE(X)    ( (((GLint) (255.0F * (X))) - 1) / 2 )
 
 
-/** Convert GLushort in [0,65536] to GLfloat in [0.0,1.0] */
+/** Convert GLushort in [0,65535] to GLfloat in [0.0,1.0] */
 #define USHORT_TO_FLOAT(S)  ((GLfloat) (S) * (1.0F / 65535.0F))
 
+/** Convert GLfloat in [0.0,1.0] to GLushort in [0, 65535] */
+#define FLOAT_TO_USHORT(X)   ((GLuint) ((X) * 65535.0))
+
 /** Convert GLshort in [-32768,32767] to GLfloat in [-1.0,1.0] */
 #define SHORT_TO_FLOAT(S)   ((2.0F * (S) + 1.0F) * (1.0F/65535.0F))
 
-/** Convert GLfloat in [0.0,1.0] to GLshort in [-32768,32767] */
+/** Convert GLfloat in [-1.0,1.0] to GLshort in [-32768,32767] */
 #define FLOAT_TO_SHORT(X)   ( (((GLint) (65535.0F * (X))) - 1) / 2 )
 
 
diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index 3dd4b3391b..af2bf8fe22 100644
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -85,7 +85,7 @@ bytes_per_pixel(GLenum datatype, GLuint comps)
                                 rowC[j][e], rowC[k][e], \
                                 rowD[j][e], rowD[k][e]); \
    } while(0)
-   
+
 #define FILTER_F_3D(e) \
    do { \
       dst[i][e] = (rowA[j][e] + rowA[k][e] \
@@ -226,7 +226,6 @@ do_row(GLenum datatype, GLuint comps, GLint srcWidth,
          dst[i] = (rowA[j] + rowA[k] + rowB[j] + rowB[k]) / 4;
       }
    }
-
    else if (datatype == GL_FLOAT && comps == 4) {
       GLuint i, j, k;
       const GLfloat(*rowA)[4] = (const GLfloat(*)[4]) srcRowA;
@@ -471,6 +470,17 @@ do_row(GLenum datatype, GLuint comps, GLint srcWidth,
          dst[i] = (blue << 5) | (green << 2) | red;
       }
    }
+   else if (datatype == GL_BYTE && comps == 2) {
+      GLuint i, j, k;
+      const GLbyte(*rowA)[2] = (const GLbyte(*)[2]) srcRowA;
+      const GLbyte(*rowB)[2] = (const GLbyte(*)[2]) srcRowB;
+      GLbyte(*dst)[2] = (GLbyte(*)[2]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) >> 2;
+         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) >> 2;
+      }
+   }
    else {
       _mesa_problem(NULL, "bad format in do_row()");
    }
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 9080c83da4..169f1af057 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1390,6 +1390,8 @@ struct gl_texture_unit
    GLbitfield _GenFlags;	/**< Bitwise-OR of Gen[STRQ]._ModeBit */
 
    GLfloat LodBias;		/**< for biasing mipmap levels */
+   GLenum BumpTarget;
+   GLfloat RotMatrix[4]; /* 2x2 matrix */
 
    /** 
     * \name GL_EXT_texture_env_combine 
@@ -2388,6 +2390,8 @@ struct gl_constants
    GLuint MaxSamples;            /**< GL_ARB_framebuffer_object */
 
    GLuint MaxVarying;  /**< Number of float[4] varying parameters */
+
+   GLbitfield SupportedBumpUnits; /**> units supporting GL_ATI_envmap_bumpmap as targets */
 };
 
 
@@ -2484,6 +2488,7 @@ struct gl_extensions
    GLboolean APPLE_client_storage;
    GLboolean APPLE_packed_pixels;
    GLboolean APPLE_vertex_array_object;
+   GLboolean ATI_envmap_bumpmap;
    GLboolean ATI_texture_mirror_once;
    GLboolean ATI_texture_env_combine3;
    GLboolean ATI_fragment_shader;
diff --git a/src/mesa/main/texenv.c b/src/mesa/main/texenv.c
index 95547a500e..c2960fc820 100644
--- a/src/mesa/main/texenv.c
+++ b/src/mesa/main/texenv.c
@@ -142,7 +142,11 @@ set_combiner_mode(GLcontext *ctx,
    case GL_MODULATE_ADD_ATI:
    case GL_MODULATE_SIGNED_ADD_ATI:
    case GL_MODULATE_SUBTRACT_ATI:
-      legal =ctx->Extensions.ATI_texture_env_combine3;
+      legal = ctx->Extensions.ATI_texture_env_combine3;
+      break;
+   case GL_BUMP_ENVMAP_ATI:
+      legal = (ctx->Extensions.ATI_envmap_bumpmap &&
+               pname == GL_COMBINE_RGB);
       break;
    default:
       legal = GL_FALSE;
@@ -500,6 +504,26 @@ _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
       case GL_ALPHA_SCALE:
          set_combiner_scale(ctx, texUnit, pname, param[0]);
 	 break;
+      case GL_BUMP_TARGET_ATI:
+         if (!ctx->Extensions.ATI_envmap_bumpmap) {
+	    _mesa_error( ctx, GL_INVALID_ENUM, "glTexEnv(pname=0x%x)", pname );
+	    return;
+	 }
+	 if (((GLenum) (GLint) param[0] < GL_TEXTURE0) ||
+	 ((GLenum) (GLint) param[0] > GL_TEXTURE31)) {
+	    /* spec doesn't say this but it seems logical */
+	    _mesa_error( ctx, GL_INVALID_ENUM, "glTexEnv(param=0x%x)", (GLenum) (GLint) param[0]);
+	    return;
+	 }
+	 if (!((1 << ((GLenum) (GLint) param[0] - GL_TEXTURE0)) & ctx->Const.SupportedBumpUnits)) {
+	    _mesa_error( ctx, GL_INVALID_VALUE, "glTexEnv(param=0x%x)", (GLenum) (GLint) param[0]);
+	    return;
+	 }
+	 else {
+	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+	    texUnit->BumpTarget = (GLenum) (GLint) param[0];
+	 }
+	 break;
       default:
 	 _mesa_error( ctx, GL_INVALID_ENUM, "glTexEnv(pname)" );
 	 return;
@@ -735,6 +759,16 @@ get_texenvi(GLcontext *ctx, const struct gl_texture_unit *texUnit,
          _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
       }
       break;
+   case GL_BUMP_TARGET_ATI:
+      /* spec doesn't say so, but I think this should be queryable */
+      if (ctx->Extensions.ATI_envmap_bumpmap) {
+         return texUnit->BumpTarget;
+      }
+      else {
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
+      }
+      break;
+
    default:
       ;
    }
@@ -874,4 +908,142 @@ _mesa_GetTexEnviv( GLenum target, GLenum pname, GLint *params )
    }
 }
 
+/* why does ATI_envmap_bumpmap require new entrypoints? Should just
+   reuse TexEnv ones... */
+void GLAPIENTRY
+_mesa_TexBumpParameterivATI( GLenum pname, const GLint *param )
+{
+   GLfloat p[4];
+   if (pname == GL_BUMP_ROT_MATRIX_ATI) {
+      /* hope that conversion is correct here */
+      p[0] = INT_TO_FLOAT( param[0] );
+      p[1] = INT_TO_FLOAT( param[1] );
+      p[2] = INT_TO_FLOAT( param[2] );
+      p[3] = INT_TO_FLOAT( param[3] );
+   }
+   else {
+      p[0] = (GLfloat) param[0];
+      p[1] = p[2] = p[3] = 0;  /* init to zero, just to be safe */
+   }
+   _mesa_TexBumpParameterfvATI( pname, p );
+}
+
+void GLAPIENTRY
+_mesa_TexBumpParameterfvATI( GLenum pname, const GLfloat *param )
+{
+   struct gl_texture_unit *texUnit;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   /* should return error if extension not supported? */
+   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+
+   if (pname == GL_BUMP_ROT_MATRIX_ATI) {
+      if (TEST_EQ_4V(param, texUnit->RotMatrix))
+         return;
+      FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+      COPY_4FV(texUnit->RotMatrix, param);
+   }
+   else {
+      _mesa_error( ctx, GL_INVALID_ENUM, "glTexBumpParameter(pname)" );
+      return;
+   }
+   /* Drivers might want to know about this, instead of dedicated function
+      just shove it into TexEnv where it really belongs anyway */
+   if (ctx->Driver.TexEnv) {
+      (*ctx->Driver.TexEnv)( ctx, 0, pname, param );
+   }
+}
+
+void GLAPIENTRY
+_mesa_GetTexBumpParameterivATI( GLenum pname, GLint *param )
+{
+   const struct gl_texture_unit *texUnit;
+   GLint i;
+   GLint temp = 0;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   /* should return error if extension not supported? */
+   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+
+   if (pname == GL_BUMP_ROT_MATRIX_SIZE_ATI) {
+      /* spec leaves open to support larger matrices.
+         Don't think anyone would ever want to use it
+         (and apps almost certainly would not understand it and
+         thus fail to submit matrices correctly) so hardcode this. */
+      *param = 4;
+   }
+   else if (pname == GL_BUMP_ROT_MATRIX_ATI) {
+      /* hope that conversion is correct here */
+      param[0] = FLOAT_TO_INT(texUnit->RotMatrix[0]);
+      param[1] = FLOAT_TO_INT(texUnit->RotMatrix[1]);
+      param[2] = FLOAT_TO_INT(texUnit->RotMatrix[2]);
+      param[3] = FLOAT_TO_INT(texUnit->RotMatrix[3]);
+   }
+   else if (pname == GL_BUMP_NUM_TEX_UNITS_ATI) {
+      for (i = 0; i < ctx->Const.MaxTextureImageUnits; i++) {
+         if (ctx->Const.SupportedBumpUnits & (1 << i)) {
+            temp++;
+         }
+      }
+      *param = temp;
+   }
+   else if (pname == GL_BUMP_TEX_UNITS_ATI) {
+      for (i = 0; i < ctx->Const.MaxTextureImageUnits; i++) {
+         if (ctx->Const.SupportedBumpUnits & (1 << i)) {
+            *param++ = i + GL_TEXTURE0;
+         }
+      }
+   }
+   else {
+      _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexBumpParameter(pname)" );
+      return;
+   }
+}
+
+void GLAPIENTRY
+_mesa_GetTexBumpParameterfvATI( GLenum pname, GLfloat *param )
+{
+   const struct gl_texture_unit *texUnit;
+   GLint i;
+   GLint temp = 0;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   /* should return error if extension not supported? */
+   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+
+   if (pname == GL_BUMP_ROT_MATRIX_SIZE_ATI) {
+      /* spec leaves open to support larger matrices.
+         Don't think anyone would ever want to use it
+         (and apps might not understand it) so hardcode this. */
+      *param = (GLfloat) 4;
+   }
+   else if (pname == GL_BUMP_ROT_MATRIX_ATI) {
+      param[0] = texUnit->RotMatrix[0];
+      param[1] = texUnit->RotMatrix[1];
+      param[2] = texUnit->RotMatrix[2];
+      param[3] = texUnit->RotMatrix[3];
+   }
+   else if (pname == GL_BUMP_NUM_TEX_UNITS_ATI) {
+      for (i = 0; i < ctx->Const.MaxTextureImageUnits; i++) {
+         if (ctx->Const.SupportedBumpUnits & (1 << i)) {
+            temp++;
+         }
+      }
+      *param = (GLfloat) temp;
+   }
+   else if (pname == GL_BUMP_TEX_UNITS_ATI) {
+      for (i = 0; i < ctx->Const.MaxTextureImageUnits; i++) {
+         if (ctx->Const.SupportedBumpUnits & (1 << i)) {
+            *param++ = (GLfloat) (i + GL_TEXTURE0);
+         }
+      }
+   }
+   else {
+      _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexBumpParameter(pname)" );
+      return;
+   }
+}
 
diff --git a/src/mesa/main/texenv.h b/src/mesa/main/texenv.h
index bdff7fdb82..1e9c5faed7 100644
--- a/src/mesa/main/texenv.h
+++ b/src/mesa/main/texenv.h
@@ -48,5 +48,16 @@ _mesa_TexEnvi( GLenum target, GLenum pname, GLint param );
 extern void GLAPIENTRY
 _mesa_TexEnviv( GLenum target, GLenum pname, const GLint *param );
 
+extern void GLAPIENTRY
+_mesa_TexBumpParameterivATI( GLenum pname, const GLint *param );
+
+extern void GLAPIENTRY
+_mesa_TexBumpParameterfvATI( GLenum pname, const GLfloat *param );
+
+extern void GLAPIENTRY
+_mesa_GetTexBumpParameterivATI( GLenum pname, GLint *param );
+
+extern void GLAPIENTRY
+_mesa_GetTexBumpParameterfvATI( GLenum pname, GLfloat *param );
 
 #endif /* TEXENV_H */
diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 51c13a563d..3fbd119b34 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -94,11 +94,11 @@ struct state_key {
       GLuint ScaleShiftA:2;
 
       GLuint NumArgsRGB:3;
-      GLuint ModeRGB:4;
+      GLuint ModeRGB:5;
       struct mode_opt OptRGB[MAX_TERMS];
 
       GLuint NumArgsA:3;
-      GLuint ModeA:4;
+      GLuint ModeA:5;
       struct mode_opt OptA[MAX_TERMS];
    } unit[8];
 };
@@ -194,7 +194,8 @@ static GLuint translate_source( GLenum src )
 #define MODE_MODULATE_SUBTRACT_ATI      12  /* r = a0 * a2 - a1 */
 #define MODE_ADD_PRODUCTS               13  /* r = a0 * a1 + a2 * a3 */
 #define MODE_ADD_PRODUCTS_SIGNED        14  /* r = a0 * a1 + a2 * a3 - 0.5 */
-#define MODE_UNKNOWN                    15
+#define MODE_BUMP_ENVMAP_ATI            15  /* special */
+#define MODE_UNKNOWN                    16
 
 /**
  * Translate GL combiner state into a MODE_x value
@@ -223,6 +224,7 @@ static GLuint translate_mode( GLenum envMode, GLenum mode )
    case GL_MODULATE_ADD_ATI: return MODE_MODULATE_ADD_ATI;
    case GL_MODULATE_SIGNED_ADD_ATI: return MODE_MODULATE_SIGNED_ADD_ATI;
    case GL_MODULATE_SUBTRACT_ATI: return MODE_MODULATE_SUBTRACT_ATI;
+   case GL_BUMP_ENVMAP_ATI: return MODE_BUMP_ENVMAP_ATI;
    default:
       assert(0);
       return MODE_UNKNOWN;
@@ -383,7 +385,7 @@ static void make_state_key( GLcontext *ctx,  struct state_key *key )
 	 translate_mode(texUnit->EnvMode, texUnit->_CurrentCombine->ModeRGB);
       key->unit[i].ModeA =
 	 translate_mode(texUnit->EnvMode, texUnit->_CurrentCombine->ModeA);
-		
+
       key->unit[i].ScaleShiftRGB = texUnit->_CurrentCombine->ScaleShiftRGB;
       key->unit[i].ScaleShiftA = texUnit->_CurrentCombine->ScaleShiftA;
 
@@ -397,8 +399,18 @@ static void make_state_key( GLcontext *ctx,  struct state_key *key )
          key->unit[i].OptA[j].Source =
 	    translate_source(texUnit->_CurrentCombine->SourceA[j]);
       }
+
+      if (key->unit[i].ModeRGB == MODE_BUMP_ENVMAP_ATI) {
+         /* requires some special translation */
+         key->unit[i].NumArgsRGB = 2;
+         key->unit[i].ScaleShiftRGB = 0;
+         key->unit[i].OptRGB[0].Operand = OPR_SRC_COLOR;
+         key->unit[i].OptRGB[0].Source = SRC_TEXTURE;
+         key->unit[i].OptRGB[1].Operand = OPR_SRC_COLOR;
+         key->unit[i].OptRGB[1].Source = texUnit->BumpTarget - GL_TEXTURE0 + SRC_TEXTURE0;
+       }
    }
-	
+
    if (ctx->_TriangleCaps & DD_SEPARATE_SPECULAR) {
       key->separate_specular = 1;
       inputs_referenced |= FRAG_BIT_COL1;
@@ -464,6 +476,11 @@ struct texenv_fragment_program {
     * else undef.
     */
 
+   struct ureg texcoord_tex[MAX_TEXTURE_COORD_UNITS];
+   /* Reg containing texcoord for a texture unit,
+    * needed for bump mapping, else undef.
+    */
+
    struct ureg src_previous;	/**< Reg containing color from previous 
 				 * stage.  May need to be decl'd.
 				 */
@@ -756,6 +773,7 @@ static struct ureg emit_texld( struct texenv_fragment_program *p,
     */
    reserve_temp(p, dest);
 
+#if 0
    /* Is this a texture indirection?
     */
    if ((coord.file == PROGRAM_TEMPORARY &&
@@ -767,6 +785,7 @@ static struct ureg emit_texld( struct texenv_fragment_program *p,
       p->alu_temps = 0;
       assert(0);		/* KW: texture env crossbar */
    }
+#endif
 
    return dest;
 }
@@ -1052,6 +1071,10 @@ static struct ureg emit_combine( struct texenv_fragment_program *p,
          emit_arith( p, OPCODE_SUB, dest, mask, saturate, tmp0, half, undef );
       }
       return dest;
+   case MODE_BUMP_ENVMAP_ATI:
+      /* special - not handled here */
+      assert(0);
+      return src[0];
    default: 
       assert(0);
       return src[0];
@@ -1074,6 +1097,10 @@ emit_texenv(struct texenv_fragment_program *p, GLuint unit)
    if (!key->unit[unit].enabled) {
       return get_source(p, SRC_PREVIOUS, 0);
    }
+   if (key->unit[unit].ModeRGB == MODE_BUMP_ENVMAP_ATI) {
+      /* this isn't really a env stage delivering a color and handled elsewhere */
+      return get_source(p, SRC_PREVIOUS, 0);
+   }
    
    switch (key->unit[unit].ModeRGB) {
    case MODE_DOT3_RGB_EXT:
@@ -1163,9 +1190,17 @@ static void load_texture( struct texenv_fragment_program *p, GLuint unit )
 {
    if (is_undef(p->src_texture[unit])) {
       GLuint texTarget = p->state->unit[unit].source_index;
-      struct ureg texcoord = register_input(p, FRAG_ATTRIB_TEX0+unit);
+      struct ureg texcoord;
       struct ureg tmp = get_tex_temp( p );
 
+      if (is_undef(p->texcoord_tex[unit])) {
+         texcoord = register_input(p, FRAG_ATTRIB_TEX0+unit);
+      }
+      else {
+         /* might want to reuse this reg for tex output actually */
+         texcoord = p->texcoord_tex[unit];
+      }
+
       if (texTarget == TEXTURE_UNKNOWN_INDEX)
          program_error(p, "TexSrcBit");
 			  
@@ -1233,7 +1268,7 @@ load_texunit_sources( struct texenv_fragment_program *p, int unit )
    GLuint i;
 
    for (i = 0; i < key->unit[unit].NumArgsRGB; i++) {
-      load_texenv_source( p, key->unit[unit].OptRGB[i].Source, unit);
+      load_texenv_source( p, key->unit[unit].OptRGB[i].Source, unit );
    }
 
    for (i = 0; i < key->unit[unit].NumArgsA; i++) {
@@ -1243,6 +1278,40 @@ load_texunit_sources( struct texenv_fragment_program *p, int unit )
    return GL_TRUE;
 }
 
+/**
+ * Generate instructions for loading bump map textures.
+ */
+static GLboolean
+load_texunit_bumpmap( struct texenv_fragment_program *p, int unit )
+{
+   struct state_key *key = p->state;
+   GLuint bumpedUnitNr = key->unit[unit].OptRGB[1].Source - SRC_TEXTURE0;
+   struct ureg texcDst, bumpMapRes;
+   struct ureg constdudvcolor = register_const4f(p, 0.0, 0.0, 0.0, 1.0);
+   struct ureg texcSrc = register_input(p, FRAG_ATTRIB_TEX0 + bumpedUnitNr);
+   struct ureg rotMat0 = register_param3( p, STATE_INTERNAL, STATE_ROT_MATRIX_0, unit );
+   struct ureg rotMat1 = register_param3( p, STATE_INTERNAL, STATE_ROT_MATRIX_1, unit );
+
+   load_texenv_source( p, unit + SRC_TEXTURE0, unit );
+
+   bumpMapRes = get_source(p, key->unit[unit].OptRGB[0].Source, unit);
+   texcDst = get_tex_temp( p );
+   p->texcoord_tex[bumpedUnitNr] = texcDst;
+
+   /* apply rot matrix and add coords to be available in next phase */
+   /* dest = (Arg0.xxxx * rotMat0 + Arg1) + (Arg0.yyyy * rotMat1) */
+   /* note only 2 coords are affected the rest are left unchanged (mul by 0) */
+   emit_arith( p, OPCODE_MAD, texcDst, WRITEMASK_XYZW, 0,
+               swizzle1(bumpMapRes, SWIZZLE_X), rotMat0, texcSrc );
+   emit_arith( p, OPCODE_MAD, texcDst, WRITEMASK_XYZW, 0,
+               swizzle1(bumpMapRes, SWIZZLE_Y), rotMat1, texcDst );
+
+   /* move 0,0,0,1 into bumpmap src if someone (crossbar) is foolish
+      enough to access this later, should optimize away */
+   emit_arith( p, OPCODE_MOV, bumpMapRes, WRITEMASK_XYZW, 0, constdudvcolor, undef, undef );
+
+   return GL_TRUE;
+}
 
 /**
  * Generate a new fragment program which implements the context's
@@ -1267,7 +1336,7 @@ create_new_program(GLcontext *ctx, struct state_key *key,
     */
    p.program->Base.Instructions = instBuffer;
    p.program->Base.Target = GL_FRAGMENT_PROGRAM_ARB;
-   p.program->Base.NumTexIndirections = 1;	/* correct? */
+   p.program->Base.NumTexIndirections = 1;
    p.program->Base.NumTexInstructions = 0;
    p.program->Base.NumAluInstructions = 0;
    p.program->Base.String = NULL;
@@ -1280,8 +1349,10 @@ create_new_program(GLcontext *ctx, struct state_key *key,
    p.program->Base.InputsRead = 0;
    p.program->Base.OutputsWritten = 1 << FRAG_RESULT_COLOR;
 
-   for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++)
+   for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++) {
       p.src_texture[unit] = undef;
+      p.texcoord_tex[unit] = undef;
+   }
 
    p.src_previous = undef;
    p.half = undef;
@@ -1292,6 +1363,16 @@ create_new_program(GLcontext *ctx, struct state_key *key,
    release_temps(ctx, &p);
 
    if (key->enabled_units) {
+       GLboolean needbumpstage = GL_FALSE;
+      /* Zeroth pass - bump map textures first */
+      for (unit = 0 ; unit < ctx->Const.MaxTextureUnits ; unit++)
+	 if (key->unit[unit].enabled && key->unit[unit].ModeRGB == MODE_BUMP_ENVMAP_ATI) {
+	    needbumpstage = GL_TRUE;
+	    load_texunit_bumpmap( &p, unit );
+	 }
+      if (needbumpstage)
+	 p.program->Base.NumTexIndirections++;
+
       /* First pass - to support texture_env_crossbar, first identify
        * all referenced texture sources and emit texld instructions
        * for each:
diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c
index 16d05cc7d0..61a12493a6 100644
--- a/src/mesa/main/texformat.c
+++ b/src/mesa/main/texformat.c
@@ -696,6 +696,33 @@ const struct gl_texture_format _mesa_texformat_intensity_float16 = {
    store_texel_intensity_f16		/* StoreTexel */
 };
 
+const struct gl_texture_format _mesa_texformat_dudv8 = {
+   MESA_FORMAT_DUDV8,			/* MesaFormat */
+   GL_DUDV_ATI,				/* BaseFormat */
+   /* FIXME: spec doesn't say since that parameter didn't exist then,
+      but this should be something like SIGNED_NORMALIZED */
+   GL_UNSIGNED_NORMALIZED_ARB,		/* DataType */
+   /* maybe should add dudvBits field, but spec seems to be
+      lacking the ability to query with GetTexLevelParameter anyway */
+   0,					/* RedBits */
+   0,					/* GreenBits */
+   0,					/* BlueBits */
+   0,					/* AlphaBits */
+   0,					/* LuminanceBits */
+   0,					/* IntensityBits */
+   0,					/* IndexBits */
+   0,					/* DepthBits */
+   0,					/* StencilBits */
+   2,					/* TexelBytes */
+   _mesa_texstore_dudv8,		/* StoreTexImageFunc */
+   NULL,				/* FetchTexel1D */
+   NULL,		/* FetchTexel2D */
+   NULL,				/* FetchTexel3D */
+   NULL,				/* FetchTexel1Df */
+   fetch_texel_2d_dudv8,		/* FetchTexel2Df */
+   NULL,				/* FetchTexel3Df */
+   NULL					/* StoreTexel */
+};
 
 /*@}*/
 
@@ -1634,6 +1661,16 @@ _mesa_choose_tex_format( GLcontext *ctx, GLint internalFormat,
       }
    }
 
+   if (ctx->Extensions.ATI_envmap_bumpmap) {
+      switch (internalFormat) {
+         case GL_DUDV_ATI:
+         case GL_DU8DV8_ATI:
+            return &_mesa_texformat_dudv8;
+         default:
+            ; /* fallthrough */
+      }
+   }
+
 #if FEATURE_EXT_texture_sRGB
    if (ctx->Extensions.EXT_texture_sRGB) {
       switch (internalFormat) {
@@ -1778,6 +1815,11 @@ _mesa_format_to_type_and_comps(const struct gl_texture_format *format,
       *comps = 1;
       return;
 
+   case MESA_FORMAT_DUDV8:
+      *datatype = GL_BYTE;
+      *comps = 2;
+      return;
+
 #if FEATURE_EXT_texture_sRGB
    case MESA_FORMAT_SRGB8:
       *datatype = GL_UNSIGNED_BYTE;
diff --git a/src/mesa/main/texformat.h b/src/mesa/main/texformat.h
index 31364c36b1..7fa70ad4fe 100644
--- a/src/mesa/main/texformat.h
+++ b/src/mesa/main/texformat.h
@@ -161,7 +161,14 @@ enum _format {
    MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32,
    MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16,
    MESA_FORMAT_INTENSITY_FLOAT32,
-   MESA_FORMAT_INTENSITY_FLOAT16
+   MESA_FORMAT_INTENSITY_FLOAT16,
+   /*@}*/
+
+   /**
+    * \name Signed fixed point texture formats.
+    */
+   /*@{*/
+   MESA_FORMAT_DUDV8
    /*@}*/
 };
 
@@ -209,6 +216,11 @@ extern const struct gl_texture_format _mesa_texformat_intensity_float32;
 extern const struct gl_texture_format _mesa_texformat_intensity_float16;
 /*@}*/
 
+/** Signed fixed point texture formats */
+/*@{*/
+extern const struct gl_texture_format _mesa_texformat_dudv8;
+/*@}*/
+
 /** \name Assorted hardware-friendly formats */
 /*@{*/
 extern const struct gl_texture_format _mesa_texformat_rgba8888;
diff --git a/src/mesa/main/texformat_tmp.h b/src/mesa/main/texformat_tmp.h
index 275340cabd..f9f9d5b1f8 100644
--- a/src/mesa/main/texformat_tmp.h
+++ b/src/mesa/main/texformat_tmp.h
@@ -1269,7 +1269,7 @@ static void FETCH(sl8)(const struct gl_texture_image *texImage,
    texel[RCOMP] = 
    texel[GCOMP] = 
    texel[BCOMP] = nonlinear_to_linear(src[0]);
-   texel[ACOMP] = CHAN_MAX;
+   texel[ACOMP] = 1.0F;
 }
 
 #if DIM == 3
@@ -1308,7 +1308,22 @@ static void store_texel_sla8(struct gl_texture_image *texImage,
 
 #endif /* FEATURE_EXT_texture_sRGB */
 
+#if DIM == 2
+/* MESA_FORMAT_DUDV8 ********************************************************/
+
+/* this format by definition produces 0,0,0,1 as rgba values,
+   however we'll return the dudv values as rg and fix up elsewhere */
+static void FETCH(dudv8)(const struct gl_texture_image *texImage,
+                         GLint i, GLint j, GLint k, GLfloat *texel )
+{
+   const GLbyte *src = TEXEL_ADDR(GLbyte, texImage, i, j, k, 2);
+   texel[RCOMP] = BYTE_TO_FLOAT(src[0]);
+   texel[GCOMP] = BYTE_TO_FLOAT(src[1]);
+   texel[BCOMP] = 0;
+   texel[ACOMP] = 0;
 
+}
+#endif
 
 /* MESA_FORMAT_YCBCR *********************************************************/
 
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index e3d4404759..2ed72280ec 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -339,6 +339,17 @@ _mesa_base_tex_format( GLcontext *ctx, GLint internalFormat )
       }
    }
 
+   if (ctx->Extensions.ATI_envmap_bumpmap) {
+      switch (internalFormat) {
+         case GL_DUDV_ATI:
+         case GL_DU8DV8_ATI:
+            return GL_DUDV_ATI;
+         default:
+            ; /* fallthrough */
+      }
+   }
+
+
    if (ctx->Extensions.EXT_packed_depth_stencil) {
       switch (internalFormat) {
          case GL_DEPTH_STENCIL_EXT:
@@ -568,6 +579,20 @@ is_depthstencil_format(GLenum format)
    }
 }
 
+/**
+ * Test if the given image format is a dudv format.
+ */
+static GLboolean
+is_dudv_format(GLenum format)
+{
+   switch (format) {
+      case GL_DUDV_ATI:
+      case GL_DU8DV8_ATI:
+         return GL_TRUE;
+      default:
+         return GL_FALSE;
+   }
+}
 
 
 /**
@@ -1539,7 +1564,8 @@ texture_error_check( GLcontext *ctx, GLenum target,
        (is_index_format(internalFormat) && !indexFormat) ||
        (is_depth_format(internalFormat) != is_depth_format(format)) ||
        (is_ycbcr_format(internalFormat) != is_ycbcr_format(format)) ||
-       (is_depthstencil_format(internalFormat) != is_depthstencil_format(format))) {
+       (is_depthstencil_format(internalFormat) != is_depthstencil_format(format)) ||
+       (is_dudv_format(internalFormat) != is_dudv_format(format))) {
       if (!isProxy)
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "glTexImage(internalFormat/format)");
@@ -2273,6 +2299,12 @@ _mesa_GetTexImage( GLenum target, GLint level, GLenum format,
       return;
    }
 
+   if (!ctx->Extensions.ATI_envmap_bumpmap
+       && is_dudv_format(format)) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(format)");
+      return;
+   }
+
    _mesa_lock_texture(ctx, texObj);
    {
       texImage = _mesa_select_tex_image(ctx, texObj, target, level);
@@ -2313,6 +2345,11 @@ _mesa_GetTexImage( GLenum target, GLint level, GLenum format,
 	 _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");
 	 goto out;
       }
+      else if (is_dudv_format(format)
+	       && !is_dudv_format(texImage->TexFormat->BaseFormat)) {
+	 _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");
+	 goto out;
+      }
 
       if (ctx->Pack.BufferObj->Name) {
 	 /* packing texture image into a PBO */
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index d71f9530cb..a5af622910 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -95,6 +95,11 @@ _mesa_copy_texture_state( const GLcontext *src, GLcontext *dst )
       /* GL_EXT_texture_env_combine */
       dst->Texture.Unit[u].Combine = src->Texture.Unit[u].Combine;
 
+      /* GL_ATI_envmap_bumpmap - need this? */
+      dst->Texture.Unit[u].BumpTarget = src->Texture.Unit[u].BumpTarget;
+      COPY_4V(dst->Texture.Unit[u].RotMatrix, src->Texture.Unit[u].RotMatrix);
+
+
       /* copy texture object bindings, not contents of texture objects */
       _mesa_lock_context_textures(dst);
 
@@ -411,6 +416,10 @@ update_tex_combine(GLcontext *ctx, struct gl_texture_unit *texUnit)
    case GL_MODULATE_SUBTRACT_ATI:
       combine->_NumArgsRGB = 3;
       break;
+   case GL_BUMP_ENVMAP_ATI:
+      /* no real arguments for this case */
+      combine->_NumArgsRGB = 0;
+      break;
    default:
       combine->_NumArgsRGB = 0;
       _mesa_problem(ctx, "invalid RGB combine mode in update_texture_state");
@@ -682,6 +691,7 @@ init_texture_unit( GLcontext *ctx, GLuint unit )
    texUnit->Combine = default_combine_state;
    texUnit->_EnvMode = default_combine_state;
    texUnit->_CurrentCombine = & texUnit->_EnvMode;
+   texUnit->BumpTarget = GL_TEXTURE0;
 
    texUnit->TexGenEnabled = 0x0;
    texUnit->GenS.Mode = GL_EYE_LINEAR;
@@ -702,6 +712,16 @@ init_texture_unit( GLcontext *ctx, GLuint unit )
    ASSIGN_4V( texUnit->GenT.EyePlane, 0.0, 1.0, 0.0, 0.0 );
    ASSIGN_4V( texUnit->GenR.EyePlane, 0.0, 0.0, 0.0, 0.0 );
    ASSIGN_4V( texUnit->GenQ.EyePlane, 0.0, 0.0, 0.0, 0.0 );
+   ASSIGN_4V( texUnit->GenS.ObjectPlane, 1.0, 0.0, 0.0, 0.0 );
+   ASSIGN_4V( texUnit->GenT.ObjectPlane, 0.0, 1.0, 0.0, 0.0 );
+   ASSIGN_4V( texUnit->GenR.ObjectPlane, 0.0, 0.0, 0.0, 0.0 );
+   ASSIGN_4V( texUnit->GenQ.ObjectPlane, 0.0, 0.0, 0.0, 0.0 );
+   ASSIGN_4V( texUnit->GenS.EyePlane, 1.0, 0.0, 0.0, 0.0 );
+   ASSIGN_4V( texUnit->GenT.EyePlane, 0.0, 1.0, 0.0, 0.0 );
+   ASSIGN_4V( texUnit->GenR.EyePlane, 0.0, 0.0, 0.0, 0.0 );
+   ASSIGN_4V( texUnit->GenQ.EyePlane, 0.0, 0.0, 0.0, 0.0 );
+   /* no mention of this in spec, but maybe id matrix expected? */
+   ASSIGN_4V( texUnit->RotMatrix, 1.0, 0.0, 0.0, 1.0 );
 
    /* initialize current texture object ptrs to the shared default objects */
    for (tex = 0; tex < NUM_TEXTURE_TARGETS; tex++) {
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index 6360ca15f8..cc3c6958c7 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -2471,6 +2471,95 @@ _mesa_texstore_ycbcr(TEXSTORE_PARAMS)
    return GL_TRUE;
 }
 
+GLboolean
+_mesa_texstore_dudv8(TEXSTORE_PARAMS)
+{
+   const GLboolean littleEndian = _mesa_little_endian();
+
+   ASSERT(dstFormat == &_mesa_texformat_dudv8);
+   ASSERT(dstFormat->TexelBytes == 2);
+   ASSERT(ctx->Extensions.ATI_envmap_bumpmap);
+   ASSERT((srcFormat == GL_DU8DV8_ATI) ||
+	  (srcFormat == GL_DUDV_ATI));
+   ASSERT(baseInternalFormat == GL_DUDV_ATI);
+
+   if (!srcPacking->SwapBytes && srcType == GL_BYTE &&
+       littleEndian) {
+      /* simple memcpy path */
+      memcpy_texture(ctx, dims,
+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
+                     dstRowStride,
+                     dstImageOffsets,
+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
+                     srcAddr, srcPacking);
+   }
+   else if (srcType == GL_BYTE) {
+
+      GLubyte dstmap[4];
+
+      /* dstmap - how to swizzle from RGBA to dst format:
+       */
+      if (littleEndian) {
+	 dstmap[0] = 0;
+	 dstmap[1] = 3;
+      }
+      else {
+	 dstmap[0] = 3;
+	 dstmap[1] = 0;
+      }
+      dstmap[2] = ZERO;		/* ? */
+      dstmap[3] = ONE;		/* ? */
+      
+      _mesa_swizzle_ubyte_image(ctx, dims,
+				GL_LUMINANCE_ALPHA, /* hack */
+				GL_UNSIGNED_BYTE, /* hack */
+				GL_LUMINANCE_ALPHA, /* hack */
+				dstmap, 2,
+				dstAddr, dstXoffset, dstYoffset, dstZoffset,
+				dstRowStride, dstImageOffsets,
+				srcWidth, srcHeight, srcDepth, srcAddr,
+				srcPacking);      
+   }   
+   else {
+      /* general path - note this is defined for 2d textures only */
+      const GLint components = _mesa_components_in_format(baseInternalFormat);
+      const GLint srcStride = _mesa_image_row_stride(srcPacking,
+                                                 srcWidth, srcFormat, srcType);
+      GLbyte *tempImage, *dst, *src;
+      GLint row;
+
+      tempImage = (GLbyte *) _mesa_malloc(srcWidth * srcHeight * srcDepth
+                                          * components * sizeof(GLbyte));
+      if (!tempImage)
+         return GL_FALSE;
+
+      src = (GLbyte *) _mesa_image_address(dims, srcPacking, srcAddr,
+                                           srcWidth, srcHeight,
+                                           srcFormat, srcType,
+                                           0, 0, 0);
+
+      dst = tempImage;
+      for (row = 0; row < srcHeight; row++) {
+         _mesa_unpack_dudv_span_byte(ctx, srcWidth, baseInternalFormat,
+                                     dst, srcFormat, srcType, src,
+                                     srcPacking, 0);
+         dst += srcWidth * components;
+         src += srcStride;
+      }
+ 
+      src = tempImage;
+      dst = (GLbyte *) dstAddr
+            + dstYoffset * dstRowStride
+            + dstXoffset * dstFormat->TexelBytes;
+      for (row = 0; row < srcHeight; row++) {
+         memcpy(dst, src, srcWidth * dstFormat->TexelBytes);
+         dst += dstRowStride;
+         src += srcWidth * dstFormat->TexelBytes;
+      }
+      _mesa_free((void *) tempImage);
+   }
+   return GL_TRUE;
+}
 
 
 /**
@@ -3882,7 +3971,7 @@ _mesa_get_teximage(GLcontext *ctx, GLenum target, GLint level,
                GLint col;
                GLbitfield transferOps = 0x0;
 
-               if (type == GL_FLOAT && 
+               if (type == GL_FLOAT && texImage->TexFormat->BaseFormat != GL_DUDV_ATI &&
                    ((ctx->Color.ClampReadColor == GL_TRUE) ||
                     (ctx->Color.ClampReadColor == GL_FIXED_ONLY_ARB &&
                      texImage->TexFormat->DataType != GL_FLOAT)))
diff --git a/src/mesa/main/texstore.h b/src/mesa/main/texstore.h
index b03386b2ac..c9e639be4e 100644
--- a/src/mesa/main/texstore.h
+++ b/src/mesa/main/texstore.h
@@ -78,7 +78,7 @@ extern GLboolean _mesa_texstore_sargb8(TEXSTORE_PARAMS);
 extern GLboolean _mesa_texstore_sl8(TEXSTORE_PARAMS);
 extern GLboolean _mesa_texstore_sla8(TEXSTORE_PARAMS);
 #endif
-
+extern GLboolean _mesa_texstore_dudv8(TEXSTORE_PARAMS);
 
 extern GLchan *
 _mesa_make_temp_chan_image(GLcontext *ctx, GLuint dims,
diff --git a/src/mesa/shader/prog_statevars.c b/src/mesa/shader/prog_statevars.c
index 1f7d87ccc9..f51d9e2651 100644
--- a/src/mesa/shader/prog_statevars.c
+++ b/src/mesa/shader/prog_statevars.c
@@ -506,6 +506,26 @@ _mesa_fetch_state(GLcontext *ctx, const gl_state_index state[],
             }
          }
          return;
+      case STATE_ROT_MATRIX_0:
+         {
+            const int unit = (int) state[2];
+            GLfloat *rotMat22 = ctx->Texture.Unit[unit].RotMatrix;
+            value[0] = rotMat22[0]; 
+            value[1] = rotMat22[2];
+            value[2] = 0.0;
+            value[3] = 0.0;
+         }
+         break;
+      case STATE_ROT_MATRIX_1:
+         {
+            const int unit = (int) state[2];
+            GLfloat *rotMat22 = ctx->Texture.Unit[unit].RotMatrix;
+            value[0] = rotMat22[1];
+            value[1] = rotMat22[3];
+            value[2] = 0.0;
+            value[3] = 0.0;
+         }
+         break;
 
          /* XXX: make sure new tokens added here are also handled in the 
           * _mesa_program_state_flags() switch, below.
@@ -591,6 +611,8 @@ _mesa_program_state_flags(const gl_state_index state[STATE_LENGTH])
 
       case STATE_TEXRECT_SCALE:
       case STATE_SHADOW_AMBIENT:
+      case STATE_ROT_MATRIX_0:
+      case STATE_ROT_MATRIX_1:
 	 return _NEW_TEXTURE;
       case STATE_FOG_PARAMS_OPTIMIZED:
 	 return _NEW_FOG;
@@ -806,6 +828,12 @@ append_token(char *dst, gl_state_index k)
    case STATE_SHADOW_AMBIENT:
       append(dst, "CompareFailValue");
       break;
+   case STATE_ROT_MATRIX_0:
+      append(dst, "rotMatrixRow0");
+      break;
+   case STATE_ROT_MATRIX_1:
+      append(dst, "rotMatrixRow1");
+      break;
    default:
       /* probably STATE_INTERNAL_DRIVER+i (driver private state) */
       append(dst, "driverState");
diff --git a/src/mesa/shader/prog_statevars.h b/src/mesa/shader/prog_statevars.h
index d5358a1d04..d563080db1 100644
--- a/src/mesa/shader/prog_statevars.h
+++ b/src/mesa/shader/prog_statevars.h
@@ -117,6 +117,8 @@ typedef enum gl_state_index_ {
    STATE_PCM_SCALE,             /**< Post color matrix RGBA scale */
    STATE_PCM_BIAS,              /**< Post color matrix RGBA bias */
    STATE_SHADOW_AMBIENT,        /**< ARB_shadow_ambient fail value; token[2] is texture unit index */
+   STATE_ROT_MATRIX_0,          /**< ATI_envmap_bumpmap, rot matrix row 0 */
+   STATE_ROT_MATRIX_1,          /**< ATI_envmap_bumpmap, rot matrix row 1 */
    STATE_INTERNAL_DRIVER	/* first available state index for drivers (must be last) */
 } gl_state_index;
 
diff --git a/src/mesa/swrast/s_texcombine.c b/src/mesa/swrast/s_texcombine.c
index 38b5633887..aa28311672 100644
--- a/src/mesa/swrast/s_texcombine.c
+++ b/src/mesa/swrast/s_texcombine.c
@@ -591,6 +591,25 @@ texture_combine( const GLcontext *ctx, GLuint unit, GLuint n,
             }
 	 }
          break;
+      case GL_BUMP_ENVMAP_ATI:
+         {
+            /* this produces a fixed rgba color, and the coord calc is done elsewhere */
+            for (i = 0; i < n; i++) {
+            /* rgba result is 0,0,0,1 */
+#if CHAN_TYPE == GL_FLOAT
+               rgba[i][RCOMP] = 0.0;
+               rgba[i][GCOMP] = 0.0;
+               rgba[i][BCOMP] = 0.0;
+               rgba[i][ACOMP] = 1.0;
+#else
+               rgba[i][RCOMP] = 0;
+               rgba[i][GCOMP] = 0;
+               rgba[i][BCOMP] = 0;
+               rgba[i][ACOMP] = CHAN_MAX;
+#endif
+            }
+	 }
+         return; /* no alpha processing */
       default:
          _mesa_problem(ctx, "invalid combine mode");
    }
@@ -1218,12 +1237,86 @@ _swrast_texture_span( GLcontext *ctx, SWspan *span )
    if (swrast->_AnyTextureCombine)
       MEMCPY(primary_rgba, span->array->rgba, 4 * span->end * sizeof(GLchan));
 
+   /* First must sample all bump maps */
+   for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++) {
+      if (ctx->Texture.Unit[unit]._ReallyEnabled &&
+         ctx->Texture.Unit[unit]._CurrentCombine->ModeRGB == GL_BUMP_ENVMAP_ATI) {
+         const GLfloat (*texcoords)[4]
+            = (const GLfloat (*)[4])
+            span->array->attribs[FRAG_ATTRIB_TEX0 + unit];
+         GLfloat (*targetcoords)[4]
+            = (GLfloat (*)[4])
+            span->array->attribs[FRAG_ATTRIB_TEX0 +
+               ctx->Texture.Unit[unit].BumpTarget - GL_TEXTURE0];
+
+         const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
+         const struct gl_texture_object *curObj = texUnit->_Current;
+         GLfloat *lambda = span->array->lambda[unit];
+         GLchan (*texels)[4] = (GLchan (*)[4])
+            (swrast->TexelBuffer + unit * (span->end * 4 * sizeof(GLchan)));
+         GLuint i;
+         GLfloat rotMatrix00 = ctx->Texture.Unit[unit].RotMatrix[0];
+         GLfloat rotMatrix01 = ctx->Texture.Unit[unit].RotMatrix[1];
+         GLfloat rotMatrix10 = ctx->Texture.Unit[unit].RotMatrix[2];
+         GLfloat rotMatrix11 = ctx->Texture.Unit[unit].RotMatrix[3];
+
+         /* adjust texture lod (lambda) */
+         if (span->arrayMask & SPAN_LAMBDA) {
+            if (texUnit->LodBias + curObj->LodBias != 0.0F) {
+               /* apply LOD bias, but don't clamp yet */
+               const GLfloat bias = CLAMP(texUnit->LodBias + curObj->LodBias,
+                                          -ctx->Const.MaxTextureLodBias,
+                                          ctx->Const.MaxTextureLodBias);
+               GLuint i;
+               for (i = 0; i < span->end; i++) {
+                  lambda[i] += bias;
+               }
+            }
+
+            if (curObj->MinLod != -1000.0 || curObj->MaxLod != 1000.0) {
+               /* apply LOD clamping to lambda */
+               const GLfloat min = curObj->MinLod;
+               const GLfloat max = curObj->MaxLod;
+               GLuint i;
+               for (i = 0; i < span->end; i++) {
+                  GLfloat l = lambda[i];
+                  lambda[i] = CLAMP(l, min, max);
+               }
+            }
+         }
+
+         /* Sample the texture (span->end = number of fragments) */
+         swrast->TextureSample[unit]( ctx, texUnit->_Current, span->end,
+                                      texcoords, lambda, texels );
+
+         /* manipulate the span values of the bump target
+            not sure this can work correctly even ignoring
+            the problem that channel is unsigned */
+         for (i = 0; i < span->end; i++) {
+#if CHAN_TYPE == GL_FLOAT
+            targetcoords[i][0] += (texels[i][0] * rotMatrix00 + texels[i][1] *
+                                  rotMatrix01) / targetcoords[i][3];
+            targetcoords[i][1] += (texels[i][0] * rotMatrix10 + texels[i][1] *
+                                  rotMatrix11) / targetcoords[i][3];
+#else
+            targetcoords[i][0] += (CHAN_TO_FLOAT(texels[i][1]) * rotMatrix00 +
+                                  CHAN_TO_FLOAT(texels[i][1]) * rotMatrix01) /
+                                  targetcoords[i][3];
+            targetcoords[i][1] += (CHAN_TO_FLOAT(texels[i][0]) * rotMatrix10 + 
+                                  CHAN_TO_FLOAT(texels[i][1]) * rotMatrix11) /
+                                  targetcoords[i][3];
+#endif
+         }
+      }
+   }
+
    /*
     * Must do all texture sampling before combining in order to
     * accomodate GL_ARB_texture_env_crossbar.
     */
    for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++) {
-      if (ctx->Texture.Unit[unit]._ReallyEnabled) {
+      if (ctx->Texture.Unit[unit]._ReallyEnabled &&
+         ctx->Texture.Unit[unit]._CurrentCombine->ModeRGB != GL_BUMP_ENVMAP_ATI) {
          const GLfloat (*texcoords)[4]
             = (const GLfloat (*)[4])
             span->array->attribs[FRAG_ATTRIB_TEX0 + unit];
-- 
cgit v1.2.3


From 36010806a10a1d6850a3fb3f997c0fbb58196d21 Mon Sep 17 00:00:00 2001
From: Roland Scheidegger <sroland@vmware.com>
Date: Thu, 12 Mar 2009 15:04:47 +0100
Subject: regenerate glapi

---
 src/glx/x11/indirect.c                         |   40 +
 src/glx/x11/indirect.h                         |    2 +
 src/glx/x11/indirect_init.c                    |    2 +
 src/glx/x11/indirect_size.c                    |    1 +
 src/mesa/drivers/dri/common/extension_helper.h |   38 +
 src/mesa/glapi/dispatch.h                      |  136 +-
 src/mesa/glapi/glapioffsets.h                  |  116 +-
 src/mesa/glapi/glapitable.h                    |  110 +-
 src/mesa/glapi/glapitemp.h                     |   98 +-
 src/mesa/glapi/glprocs.h                       |  750 +--
 src/mesa/main/enums.c                          | 5876 ++++++++++++------------
 src/mesa/sparc/glapi_sparc.S                   |   52 +-
 src/mesa/x86-64/glapi_x86-64.S                 |  706 +--
 src/mesa/x86/glapi_x86.S                       |   54 +-
 14 files changed, 4158 insertions(+), 3823 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/glx/x11/indirect.c b/src/glx/x11/indirect.c
index fb87abc0a5..08d52aeea3 100644
--- a/src/glx/x11/indirect.c
+++ b/src/glx/x11/indirect.c
@@ -7521,6 +7521,26 @@ __indirect_glGetProgramivARB(GLenum target, GLenum pname, GLint * params)
     return;
 }
 
+#define X_GLrop_ProgramEnvParameter4dvARB 4185
+void
+__indirect_glProgramEnvParameter4dARB(GLenum target, GLuint index, GLdouble x,
+                                      GLdouble y, GLdouble z, GLdouble w)
+{
+    __GLXcontext *const gc = __glXGetCurrentContext();
+    const GLuint cmdlen = 44;
+    emit_header(gc->pc, X_GLrop_ProgramEnvParameter4dvARB, cmdlen);
+    (void) memcpy((void *) (gc->pc + 4), (void *) (&target), 4);
+    (void) memcpy((void *) (gc->pc + 8), (void *) (&index), 4);
+    (void) memcpy((void *) (gc->pc + 12), (void *) (&x), 8);
+    (void) memcpy((void *) (gc->pc + 20), (void *) (&y), 8);
+    (void) memcpy((void *) (gc->pc + 28), (void *) (&z), 8);
+    (void) memcpy((void *) (gc->pc + 36), (void *) (&w), 8);
+    gc->pc += cmdlen;
+    if (__builtin_expect(gc->pc > gc->limit, 0)) {
+        (void) __glXFlushRenderBuffer(gc, gc->pc);
+    }
+}
+
 #define X_GLrop_ProgramEnvParameter4dvARB 4185
 void
 __indirect_glProgramEnvParameter4dvARB(GLenum target, GLuint index,
@@ -7538,6 +7558,26 @@ __indirect_glProgramEnvParameter4dvARB(GLenum target, GLuint index,
     }
 }
 
+#define X_GLrop_ProgramEnvParameter4fvARB 4184
+void
+__indirect_glProgramEnvParameter4fARB(GLenum target, GLuint index, GLfloat x,
+                                      GLfloat y, GLfloat z, GLfloat w)
+{
+    __GLXcontext *const gc = __glXGetCurrentContext();
+    const GLuint cmdlen = 28;
+    emit_header(gc->pc, X_GLrop_ProgramEnvParameter4fvARB, cmdlen);
+    (void) memcpy((void *) (gc->pc + 4), (void *) (&target), 4);
+    (void) memcpy((void *) (gc->pc + 8), (void *) (&index), 4);
+    (void) memcpy((void *) (gc->pc + 12), (void *) (&x), 4);
+    (void) memcpy((void *) (gc->pc + 16), (void *) (&y), 4);
+    (void) memcpy((void *) (gc->pc + 20), (void *) (&z), 4);
+    (void) memcpy((void *) (gc->pc + 24), (void *) (&w), 4);
+    gc->pc += cmdlen;
+    if (__builtin_expect(gc->pc > gc->limit, 0)) {
+        (void) __glXFlushRenderBuffer(gc, gc->pc);
+    }
+}
+
 #define X_GLrop_ProgramEnvParameter4fvARB 4184
 void
 __indirect_glProgramEnvParameter4fvARB(GLenum target, GLuint index,
diff --git a/src/glx/x11/indirect.h b/src/glx/x11/indirect.h
index f8c88b36bb..0719a1b302 100644
--- a/src/glx/x11/indirect.h
+++ b/src/glx/x11/indirect.h
@@ -517,7 +517,9 @@ extern HIDDEN void __indirect_glGetProgramivARB(GLenum target, GLenum pname, GLi
 extern HIDDEN void __indirect_glGetVertexAttribdvARB(GLuint index, GLenum pname, GLdouble * params);
 extern HIDDEN void __indirect_glGetVertexAttribfvARB(GLuint index, GLenum pname, GLfloat * params);
 extern HIDDEN void __indirect_glGetVertexAttribivARB(GLuint index, GLenum pname, GLint * params);
+extern HIDDEN void __indirect_glProgramEnvParameter4dARB(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
 extern HIDDEN void __indirect_glProgramEnvParameter4dvARB(GLenum target, GLuint index, const GLdouble * params);
+extern HIDDEN void __indirect_glProgramEnvParameter4fARB(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
 extern HIDDEN void __indirect_glProgramEnvParameter4fvARB(GLenum target, GLuint index, const GLfloat * params);
 extern HIDDEN void __indirect_glProgramLocalParameter4dARB(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
 extern HIDDEN void __indirect_glProgramLocalParameter4dvARB(GLenum target, GLuint index, const GLdouble * params);
diff --git a/src/glx/x11/indirect_init.c b/src/glx/x11/indirect_init.c
index 479184337c..852fe712c6 100644
--- a/src/glx/x11/indirect_init.c
+++ b/src/glx/x11/indirect_init.c
@@ -526,7 +526,9 @@ __GLapi * __glXNewIndirectAPI( void )
     glAPI->GetVertexAttribdvARB = __indirect_glGetVertexAttribdvARB;
     glAPI->GetVertexAttribfvARB = __indirect_glGetVertexAttribfvARB;
     glAPI->GetVertexAttribivARB = __indirect_glGetVertexAttribivARB;
+    glAPI->ProgramEnvParameter4dARB = __indirect_glProgramEnvParameter4dARB;
     glAPI->ProgramEnvParameter4dvARB = __indirect_glProgramEnvParameter4dvARB;
+    glAPI->ProgramEnvParameter4fARB = __indirect_glProgramEnvParameter4fARB;
     glAPI->ProgramEnvParameter4fvARB = __indirect_glProgramEnvParameter4fvARB;
     glAPI->ProgramLocalParameter4dARB = __indirect_glProgramLocalParameter4dARB;
     glAPI->ProgramLocalParameter4dvARB = __indirect_glProgramLocalParameter4dvARB;
diff --git a/src/glx/x11/indirect_size.c b/src/glx/x11/indirect_size.c
index 12214d7fe4..54c039dd6c 100644
--- a/src/glx/x11/indirect_size.c
+++ b/src/glx/x11/indirect_size.c
@@ -240,6 +240,7 @@ __glTexEnvfv_size(GLenum e)
     case GL_OPERAND1_ALPHA:
     case GL_OPERAND2_ALPHA:
     case GL_OPERAND3_ALPHA_NV:
+    case GL_BUMP_TARGET_ATI:
     case GL_COORD_REPLACE_ARB:
 /*      case GL_COORD_REPLACE_NV:*/
         return 1;
diff --git a/src/mesa/drivers/dri/common/extension_helper.h b/src/mesa/drivers/dri/common/extension_helper.h
index 0d641f25f7..8dcaaee307 100644
--- a/src/mesa/drivers/dri/common/extension_helper.h
+++ b/src/mesa/drivers/dri/common/extension_helper.h
@@ -2640,6 +2640,13 @@ static const char GetProgramStringARB_names[] =
     "";
 #endif
 
+#if defined(need_GL_ATI_envmap_bumpmap)
+static const char TexBumpParameterfvATI_names[] = 
+    "ip\0" /* Parameter signature */
+    "glTexBumpParameterfvATI\0"
+    "";
+#endif
+
 #if defined(need_GL_VERSION_2_0) || defined(need_GL_ARB_shader_objects)
 static const char CompileShaderARB_names[] = 
     "i\0" /* Parameter signature */
@@ -2980,6 +2987,13 @@ static const char GetVertexAttribdvARB_names[] =
     "";
 #endif
 
+#if defined(need_GL_ATI_envmap_bumpmap)
+static const char TexBumpParameterivATI_names[] = 
+    "ip\0" /* Parameter signature */
+    "glTexBumpParameterivATI\0"
+    "";
+#endif
+
 #if defined(need_GL_EXT_convolution)
 static const char GetSeparableFilter_names[] = 
     "iiippp\0" /* Parameter signature */
@@ -3891,6 +3905,13 @@ static const char VertexAttrib4dARB_names[] =
     "";
 #endif
 
+#if defined(need_GL_ATI_envmap_bumpmap)
+static const char GetTexBumpParameterfvATI_names[] = 
+    "ip\0" /* Parameter signature */
+    "glGetTexBumpParameterfvATI\0"
+    "";
+#endif
+
 #if defined(need_GL_NV_fragment_program)
 static const char ProgramNamedParameter4dNV_names[] = 
     "iipdddd\0" /* Parameter signature */
@@ -4834,6 +4855,13 @@ static const char VertexAttribs1svNV_names[] =
     "";
 #endif
 
+#if defined(need_GL_ATI_envmap_bumpmap)
+static const char GetTexBumpParameterivATI_names[] = 
+    "ip\0" /* Parameter signature */
+    "glGetTexBumpParameterivATI\0"
+    "";
+#endif
+
 #if defined(need_GL_EXT_coordinate_frame)
 static const char Binormal3bEXT_names[] = 
     "iii\0" /* Parameter signature */
@@ -5198,6 +5226,16 @@ static const struct dri_extension_function GL_ATI_draw_buffers_functions[] = {
 };
 #endif
 
+#if defined(need_GL_ATI_envmap_bumpmap)
+static const struct dri_extension_function GL_ATI_envmap_bumpmap_functions[] = {
+    { TexBumpParameterfvATI_names, TexBumpParameterfvATI_remap_index, -1 },
+    { TexBumpParameterivATI_names, TexBumpParameterivATI_remap_index, -1 },
+    { GetTexBumpParameterfvATI_names, GetTexBumpParameterfvATI_remap_index, -1 },
+    { GetTexBumpParameterivATI_names, GetTexBumpParameterivATI_remap_index, -1 },
+    { NULL, 0, 0 }
+};
+#endif
+
 #if defined(need_GL_ATI_fragment_shader)
 static const struct dri_extension_function GL_ATI_fragment_shader_functions[] = {
     { ColorFragmentOp2ATI_names, ColorFragmentOp2ATI_remap_index, -1 },
diff --git a/src/mesa/glapi/dispatch.h b/src/mesa/glapi/dispatch.h
index d7f21692ed..45b2fa077a 100644
--- a/src/mesa/glapi/dispatch.h
+++ b/src/mesa/glapi/dispatch.h
@@ -2214,6 +2214,18 @@
 #define CALL_VertexAttribs4ubvNV(disp, parameters) (*((disp)->VertexAttribs4ubvNV)) parameters
 #define GET_VertexAttribs4ubvNV(disp) ((disp)->VertexAttribs4ubvNV)
 #define SET_VertexAttribs4ubvNV(disp, fn) ((disp)->VertexAttribs4ubvNV = fn)
+#define CALL_GetTexBumpParameterfvATI(disp, parameters) (*((disp)->GetTexBumpParameterfvATI)) parameters
+#define GET_GetTexBumpParameterfvATI(disp) ((disp)->GetTexBumpParameterfvATI)
+#define SET_GetTexBumpParameterfvATI(disp, fn) ((disp)->GetTexBumpParameterfvATI = fn)
+#define CALL_GetTexBumpParameterivATI(disp, parameters) (*((disp)->GetTexBumpParameterivATI)) parameters
+#define GET_GetTexBumpParameterivATI(disp) ((disp)->GetTexBumpParameterivATI)
+#define SET_GetTexBumpParameterivATI(disp, fn) ((disp)->GetTexBumpParameterivATI = fn)
+#define CALL_TexBumpParameterfvATI(disp, parameters) (*((disp)->TexBumpParameterfvATI)) parameters
+#define GET_TexBumpParameterfvATI(disp) ((disp)->TexBumpParameterfvATI)
+#define SET_TexBumpParameterfvATI(disp, fn) ((disp)->TexBumpParameterfvATI = fn)
+#define CALL_TexBumpParameterivATI(disp, parameters) (*((disp)->TexBumpParameterivATI)) parameters
+#define GET_TexBumpParameterivATI(disp) ((disp)->TexBumpParameterivATI)
+#define SET_TexBumpParameterivATI(disp, fn) ((disp)->TexBumpParameterivATI = fn)
 #define CALL_AlphaFragmentOp1ATI(disp, parameters) (*((disp)->AlphaFragmentOp1ATI)) parameters
 #define GET_AlphaFragmentOp1ATI(disp) ((disp)->AlphaFragmentOp1ATI)
 #define SET_AlphaFragmentOp1ATI(disp, fn) ((disp)->AlphaFragmentOp1ATI = fn)
@@ -2376,7 +2388,7 @@
 
 #else
 
-#define driDispatchRemapTable_size 363
+#define driDispatchRemapTable_size 367
 extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 
 #define AttachShader_remap_index 0
@@ -2689,59 +2701,63 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define VertexAttribs4fvNV_remap_index 307
 #define VertexAttribs4svNV_remap_index 308
 #define VertexAttribs4ubvNV_remap_index 309
-#define AlphaFragmentOp1ATI_remap_index 310
-#define AlphaFragmentOp2ATI_remap_index 311
-#define AlphaFragmentOp3ATI_remap_index 312
-#define BeginFragmentShaderATI_remap_index 313
-#define BindFragmentShaderATI_remap_index 314
-#define ColorFragmentOp1ATI_remap_index 315
-#define ColorFragmentOp2ATI_remap_index 316
-#define ColorFragmentOp3ATI_remap_index 317
-#define DeleteFragmentShaderATI_remap_index 318
-#define EndFragmentShaderATI_remap_index 319
-#define GenFragmentShadersATI_remap_index 320
-#define PassTexCoordATI_remap_index 321
-#define SampleMapATI_remap_index 322
-#define SetFragmentShaderConstantATI_remap_index 323
-#define PointParameteriNV_remap_index 324
-#define PointParameterivNV_remap_index 325
-#define ActiveStencilFaceEXT_remap_index 326
-#define BindVertexArrayAPPLE_remap_index 327
-#define DeleteVertexArraysAPPLE_remap_index 328
-#define GenVertexArraysAPPLE_remap_index 329
-#define IsVertexArrayAPPLE_remap_index 330
-#define GetProgramNamedParameterdvNV_remap_index 331
-#define GetProgramNamedParameterfvNV_remap_index 332
-#define ProgramNamedParameter4dNV_remap_index 333
-#define ProgramNamedParameter4dvNV_remap_index 334
-#define ProgramNamedParameter4fNV_remap_index 335
-#define ProgramNamedParameter4fvNV_remap_index 336
-#define DepthBoundsEXT_remap_index 337
-#define BlendEquationSeparateEXT_remap_index 338
-#define BindFramebufferEXT_remap_index 339
-#define BindRenderbufferEXT_remap_index 340
-#define CheckFramebufferStatusEXT_remap_index 341
-#define DeleteFramebuffersEXT_remap_index 342
-#define DeleteRenderbuffersEXT_remap_index 343
-#define FramebufferRenderbufferEXT_remap_index 344
-#define FramebufferTexture1DEXT_remap_index 345
-#define FramebufferTexture2DEXT_remap_index 346
-#define FramebufferTexture3DEXT_remap_index 347
-#define GenFramebuffersEXT_remap_index 348
-#define GenRenderbuffersEXT_remap_index 349
-#define GenerateMipmapEXT_remap_index 350
-#define GetFramebufferAttachmentParameterivEXT_remap_index 351
-#define GetRenderbufferParameterivEXT_remap_index 352
-#define IsFramebufferEXT_remap_index 353
-#define IsRenderbufferEXT_remap_index 354
-#define RenderbufferStorageEXT_remap_index 355
-#define BlitFramebufferEXT_remap_index 356
-#define FramebufferTextureLayerEXT_remap_index 357
-#define StencilFuncSeparateATI_remap_index 358
-#define ProgramEnvParameters4fvEXT_remap_index 359
-#define ProgramLocalParameters4fvEXT_remap_index 360
-#define GetQueryObjecti64vEXT_remap_index 361
-#define GetQueryObjectui64vEXT_remap_index 362
+#define GetTexBumpParameterfvATI_remap_index 310
+#define GetTexBumpParameterivATI_remap_index 311
+#define TexBumpParameterfvATI_remap_index 312
+#define TexBumpParameterivATI_remap_index 313
+#define AlphaFragmentOp1ATI_remap_index 314
+#define AlphaFragmentOp2ATI_remap_index 315
+#define AlphaFragmentOp3ATI_remap_index 316
+#define BeginFragmentShaderATI_remap_index 317
+#define BindFragmentShaderATI_remap_index 318
+#define ColorFragmentOp1ATI_remap_index 319
+#define ColorFragmentOp2ATI_remap_index 320
+#define ColorFragmentOp3ATI_remap_index 321
+#define DeleteFragmentShaderATI_remap_index 322
+#define EndFragmentShaderATI_remap_index 323
+#define GenFragmentShadersATI_remap_index 324
+#define PassTexCoordATI_remap_index 325
+#define SampleMapATI_remap_index 326
+#define SetFragmentShaderConstantATI_remap_index 327
+#define PointParameteriNV_remap_index 328
+#define PointParameterivNV_remap_index 329
+#define ActiveStencilFaceEXT_remap_index 330
+#define BindVertexArrayAPPLE_remap_index 331
+#define DeleteVertexArraysAPPLE_remap_index 332
+#define GenVertexArraysAPPLE_remap_index 333
+#define IsVertexArrayAPPLE_remap_index 334
+#define GetProgramNamedParameterdvNV_remap_index 335
+#define GetProgramNamedParameterfvNV_remap_index 336
+#define ProgramNamedParameter4dNV_remap_index 337
+#define ProgramNamedParameter4dvNV_remap_index 338
+#define ProgramNamedParameter4fNV_remap_index 339
+#define ProgramNamedParameter4fvNV_remap_index 340
+#define DepthBoundsEXT_remap_index 341
+#define BlendEquationSeparateEXT_remap_index 342
+#define BindFramebufferEXT_remap_index 343
+#define BindRenderbufferEXT_remap_index 344
+#define CheckFramebufferStatusEXT_remap_index 345
+#define DeleteFramebuffersEXT_remap_index 346
+#define DeleteRenderbuffersEXT_remap_index 347
+#define FramebufferRenderbufferEXT_remap_index 348
+#define FramebufferTexture1DEXT_remap_index 349
+#define FramebufferTexture2DEXT_remap_index 350
+#define FramebufferTexture3DEXT_remap_index 351
+#define GenFramebuffersEXT_remap_index 352
+#define GenRenderbuffersEXT_remap_index 353
+#define GenerateMipmapEXT_remap_index 354
+#define GetFramebufferAttachmentParameterivEXT_remap_index 355
+#define GetRenderbufferParameterivEXT_remap_index 356
+#define IsFramebufferEXT_remap_index 357
+#define IsRenderbufferEXT_remap_index 358
+#define RenderbufferStorageEXT_remap_index 359
+#define BlitFramebufferEXT_remap_index 360
+#define FramebufferTextureLayerEXT_remap_index 361
+#define StencilFuncSeparateATI_remap_index 362
+#define ProgramEnvParameters4fvEXT_remap_index 363
+#define ProgramLocalParameters4fvEXT_remap_index 364
+#define GetQueryObjecti64vEXT_remap_index 365
+#define GetQueryObjectui64vEXT_remap_index 366
 
 #define CALL_AttachShader(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLuint)), driDispatchRemapTable[AttachShader_remap_index], parameters)
 #define GET_AttachShader(disp) GET_by_offset(disp, driDispatchRemapTable[AttachShader_remap_index])
@@ -3673,6 +3689,18 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define CALL_VertexAttribs4ubvNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLsizei, const GLubyte *)), driDispatchRemapTable[VertexAttribs4ubvNV_remap_index], parameters)
 #define GET_VertexAttribs4ubvNV(disp) GET_by_offset(disp, driDispatchRemapTable[VertexAttribs4ubvNV_remap_index])
 #define SET_VertexAttribs4ubvNV(disp, fn) SET_by_offset(disp, driDispatchRemapTable[VertexAttribs4ubvNV_remap_index], fn)
+#define CALL_GetTexBumpParameterfvATI(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLfloat *)), driDispatchRemapTable[GetTexBumpParameterfvATI_remap_index], parameters)
+#define GET_GetTexBumpParameterfvATI(disp) GET_by_offset(disp, driDispatchRemapTable[GetTexBumpParameterfvATI_remap_index])
+#define SET_GetTexBumpParameterfvATI(disp, fn) SET_by_offset(disp, driDispatchRemapTable[GetTexBumpParameterfvATI_remap_index], fn)
+#define CALL_GetTexBumpParameterivATI(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint *)), driDispatchRemapTable[GetTexBumpParameterivATI_remap_index], parameters)
+#define GET_GetTexBumpParameterivATI(disp) GET_by_offset(disp, driDispatchRemapTable[GetTexBumpParameterivATI_remap_index])
+#define SET_GetTexBumpParameterivATI(disp, fn) SET_by_offset(disp, driDispatchRemapTable[GetTexBumpParameterivATI_remap_index], fn)
+#define CALL_TexBumpParameterfvATI(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, const GLfloat *)), driDispatchRemapTable[TexBumpParameterfvATI_remap_index], parameters)
+#define GET_TexBumpParameterfvATI(disp) GET_by_offset(disp, driDispatchRemapTable[TexBumpParameterfvATI_remap_index])
+#define SET_TexBumpParameterfvATI(disp, fn) SET_by_offset(disp, driDispatchRemapTable[TexBumpParameterfvATI_remap_index], fn)
+#define CALL_TexBumpParameterivATI(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, const GLint *)), driDispatchRemapTable[TexBumpParameterivATI_remap_index], parameters)
+#define GET_TexBumpParameterivATI(disp) GET_by_offset(disp, driDispatchRemapTable[TexBumpParameterivATI_remap_index])
+#define SET_TexBumpParameterivATI(disp, fn) SET_by_offset(disp, driDispatchRemapTable[TexBumpParameterivATI_remap_index], fn)
 #define CALL_AlphaFragmentOp1ATI(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint)), driDispatchRemapTable[AlphaFragmentOp1ATI_remap_index], parameters)
 #define GET_AlphaFragmentOp1ATI(disp) GET_by_offset(disp, driDispatchRemapTable[AlphaFragmentOp1ATI_remap_index])
 #define SET_AlphaFragmentOp1ATI(disp, fn) SET_by_offset(disp, driDispatchRemapTable[AlphaFragmentOp1ATI_remap_index], fn)
diff --git a/src/mesa/glapi/glapioffsets.h b/src/mesa/glapi/glapioffsets.h
index f412234ac5..14f305f025 100644
--- a/src/mesa/glapi/glapioffsets.h
+++ b/src/mesa/glapi/glapioffsets.h
@@ -750,60 +750,64 @@
 #define _gloffset_VertexAttribs4fvNV 715
 #define _gloffset_VertexAttribs4svNV 716
 #define _gloffset_VertexAttribs4ubvNV 717
-#define _gloffset_AlphaFragmentOp1ATI 718
-#define _gloffset_AlphaFragmentOp2ATI 719
-#define _gloffset_AlphaFragmentOp3ATI 720
-#define _gloffset_BeginFragmentShaderATI 721
-#define _gloffset_BindFragmentShaderATI 722
-#define _gloffset_ColorFragmentOp1ATI 723
-#define _gloffset_ColorFragmentOp2ATI 724
-#define _gloffset_ColorFragmentOp3ATI 725
-#define _gloffset_DeleteFragmentShaderATI 726
-#define _gloffset_EndFragmentShaderATI 727
-#define _gloffset_GenFragmentShadersATI 728
-#define _gloffset_PassTexCoordATI 729
-#define _gloffset_SampleMapATI 730
-#define _gloffset_SetFragmentShaderConstantATI 731
-#define _gloffset_PointParameteriNV 732
-#define _gloffset_PointParameterivNV 733
-#define _gloffset_ActiveStencilFaceEXT 734
-#define _gloffset_BindVertexArrayAPPLE 735
-#define _gloffset_DeleteVertexArraysAPPLE 736
-#define _gloffset_GenVertexArraysAPPLE 737
-#define _gloffset_IsVertexArrayAPPLE 738
-#define _gloffset_GetProgramNamedParameterdvNV 739
-#define _gloffset_GetProgramNamedParameterfvNV 740
-#define _gloffset_ProgramNamedParameter4dNV 741
-#define _gloffset_ProgramNamedParameter4dvNV 742
-#define _gloffset_ProgramNamedParameter4fNV 743
-#define _gloffset_ProgramNamedParameter4fvNV 744
-#define _gloffset_DepthBoundsEXT 745
-#define _gloffset_BlendEquationSeparateEXT 746
-#define _gloffset_BindFramebufferEXT 747
-#define _gloffset_BindRenderbufferEXT 748
-#define _gloffset_CheckFramebufferStatusEXT 749
-#define _gloffset_DeleteFramebuffersEXT 750
-#define _gloffset_DeleteRenderbuffersEXT 751
-#define _gloffset_FramebufferRenderbufferEXT 752
-#define _gloffset_FramebufferTexture1DEXT 753
-#define _gloffset_FramebufferTexture2DEXT 754
-#define _gloffset_FramebufferTexture3DEXT 755
-#define _gloffset_GenFramebuffersEXT 756
-#define _gloffset_GenRenderbuffersEXT 757
-#define _gloffset_GenerateMipmapEXT 758
-#define _gloffset_GetFramebufferAttachmentParameterivEXT 759
-#define _gloffset_GetRenderbufferParameterivEXT 760
-#define _gloffset_IsFramebufferEXT 761
-#define _gloffset_IsRenderbufferEXT 762
-#define _gloffset_RenderbufferStorageEXT 763
-#define _gloffset_BlitFramebufferEXT 764
-#define _gloffset_FramebufferTextureLayerEXT 765
-#define _gloffset_StencilFuncSeparateATI 766
-#define _gloffset_ProgramEnvParameters4fvEXT 767
-#define _gloffset_ProgramLocalParameters4fvEXT 768
-#define _gloffset_GetQueryObjecti64vEXT 769
-#define _gloffset_GetQueryObjectui64vEXT 770
-#define _gloffset_FIRST_DYNAMIC 771
+#define _gloffset_GetTexBumpParameterfvATI 718
+#define _gloffset_GetTexBumpParameterivATI 719
+#define _gloffset_TexBumpParameterfvATI 720
+#define _gloffset_TexBumpParameterivATI 721
+#define _gloffset_AlphaFragmentOp1ATI 722
+#define _gloffset_AlphaFragmentOp2ATI 723
+#define _gloffset_AlphaFragmentOp3ATI 724
+#define _gloffset_BeginFragmentShaderATI 725
+#define _gloffset_BindFragmentShaderATI 726
+#define _gloffset_ColorFragmentOp1ATI 727
+#define _gloffset_ColorFragmentOp2ATI 728
+#define _gloffset_ColorFragmentOp3ATI 729
+#define _gloffset_DeleteFragmentShaderATI 730
+#define _gloffset_EndFragmentShaderATI 731
+#define _gloffset_GenFragmentShadersATI 732
+#define _gloffset_PassTexCoordATI 733
+#define _gloffset_SampleMapATI 734
+#define _gloffset_SetFragmentShaderConstantATI 735
+#define _gloffset_PointParameteriNV 736
+#define _gloffset_PointParameterivNV 737
+#define _gloffset_ActiveStencilFaceEXT 738
+#define _gloffset_BindVertexArrayAPPLE 739
+#define _gloffset_DeleteVertexArraysAPPLE 740
+#define _gloffset_GenVertexArraysAPPLE 741
+#define _gloffset_IsVertexArrayAPPLE 742
+#define _gloffset_GetProgramNamedParameterdvNV 743
+#define _gloffset_GetProgramNamedParameterfvNV 744
+#define _gloffset_ProgramNamedParameter4dNV 745
+#define _gloffset_ProgramNamedParameter4dvNV 746
+#define _gloffset_ProgramNamedParameter4fNV 747
+#define _gloffset_ProgramNamedParameter4fvNV 748
+#define _gloffset_DepthBoundsEXT 749
+#define _gloffset_BlendEquationSeparateEXT 750
+#define _gloffset_BindFramebufferEXT 751
+#define _gloffset_BindRenderbufferEXT 752
+#define _gloffset_CheckFramebufferStatusEXT 753
+#define _gloffset_DeleteFramebuffersEXT 754
+#define _gloffset_DeleteRenderbuffersEXT 755
+#define _gloffset_FramebufferRenderbufferEXT 756
+#define _gloffset_FramebufferTexture1DEXT 757
+#define _gloffset_FramebufferTexture2DEXT 758
+#define _gloffset_FramebufferTexture3DEXT 759
+#define _gloffset_GenFramebuffersEXT 760
+#define _gloffset_GenRenderbuffersEXT 761
+#define _gloffset_GenerateMipmapEXT 762
+#define _gloffset_GetFramebufferAttachmentParameterivEXT 763
+#define _gloffset_GetRenderbufferParameterivEXT 764
+#define _gloffset_IsFramebufferEXT 765
+#define _gloffset_IsRenderbufferEXT 766
+#define _gloffset_RenderbufferStorageEXT 767
+#define _gloffset_BlitFramebufferEXT 768
+#define _gloffset_FramebufferTextureLayerEXT 769
+#define _gloffset_StencilFuncSeparateATI 770
+#define _gloffset_ProgramEnvParameters4fvEXT 771
+#define _gloffset_ProgramLocalParameters4fvEXT 772
+#define _gloffset_GetQueryObjecti64vEXT 773
+#define _gloffset_GetQueryObjectui64vEXT 774
+#define _gloffset_FIRST_DYNAMIC 775
 
 #else
 
@@ -1117,6 +1121,10 @@
 #define _gloffset_VertexAttribs4fvNV driDispatchRemapTable[VertexAttribs4fvNV_remap_index]
 #define _gloffset_VertexAttribs4svNV driDispatchRemapTable[VertexAttribs4svNV_remap_index]
 #define _gloffset_VertexAttribs4ubvNV driDispatchRemapTable[VertexAttribs4ubvNV_remap_index]
+#define _gloffset_GetTexBumpParameterfvATI driDispatchRemapTable[GetTexBumpParameterfvATI_remap_index]
+#define _gloffset_GetTexBumpParameterivATI driDispatchRemapTable[GetTexBumpParameterivATI_remap_index]
+#define _gloffset_TexBumpParameterfvATI driDispatchRemapTable[TexBumpParameterfvATI_remap_index]
+#define _gloffset_TexBumpParameterivATI driDispatchRemapTable[TexBumpParameterivATI_remap_index]
 #define _gloffset_AlphaFragmentOp1ATI driDispatchRemapTable[AlphaFragmentOp1ATI_remap_index]
 #define _gloffset_AlphaFragmentOp2ATI driDispatchRemapTable[AlphaFragmentOp2ATI_remap_index]
 #define _gloffset_AlphaFragmentOp3ATI driDispatchRemapTable[AlphaFragmentOp3ATI_remap_index]
diff --git a/src/mesa/glapi/glapitable.h b/src/mesa/glapi/glapitable.h
index 2ae9bf6738..9ecb036461 100644
--- a/src/mesa/glapi/glapitable.h
+++ b/src/mesa/glapi/glapitable.h
@@ -758,59 +758,63 @@ struct _glapi_table
    void (GLAPIENTRYP VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 715 */
    void (GLAPIENTRYP VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v); /* 716 */
    void (GLAPIENTRYP VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v); /* 717 */
-   void (GLAPIENTRYP AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 718 */
-   void (GLAPIENTRYP AlphaFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 719 */
-   void (GLAPIENTRYP AlphaFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 720 */
-   void (GLAPIENTRYP BeginFragmentShaderATI)(void); /* 721 */
-   void (GLAPIENTRYP BindFragmentShaderATI)(GLuint id); /* 722 */
-   void (GLAPIENTRYP ColorFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 723 */
-   void (GLAPIENTRYP ColorFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 724 */
-   void (GLAPIENTRYP ColorFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 725 */
-   void (GLAPIENTRYP DeleteFragmentShaderATI)(GLuint id); /* 726 */
-   void (GLAPIENTRYP EndFragmentShaderATI)(void); /* 727 */
-   GLuint (GLAPIENTRYP GenFragmentShadersATI)(GLuint range); /* 728 */
-   void (GLAPIENTRYP PassTexCoordATI)(GLuint dst, GLuint coord, GLenum swizzle); /* 729 */
-   void (GLAPIENTRYP SampleMapATI)(GLuint dst, GLuint interp, GLenum swizzle); /* 730 */
-   void (GLAPIENTRYP SetFragmentShaderConstantATI)(GLuint dst, const GLfloat * value); /* 731 */
-   void (GLAPIENTRYP PointParameteriNV)(GLenum pname, GLint param); /* 732 */
-   void (GLAPIENTRYP PointParameterivNV)(GLenum pname, const GLint * params); /* 733 */
-   void (GLAPIENTRYP ActiveStencilFaceEXT)(GLenum face); /* 734 */
-   void (GLAPIENTRYP BindVertexArrayAPPLE)(GLuint array); /* 735 */
-   void (GLAPIENTRYP DeleteVertexArraysAPPLE)(GLsizei n, const GLuint * arrays); /* 736 */
-   void (GLAPIENTRYP GenVertexArraysAPPLE)(GLsizei n, GLuint * arrays); /* 737 */
-   GLboolean (GLAPIENTRYP IsVertexArrayAPPLE)(GLuint array); /* 738 */
-   void (GLAPIENTRYP GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params); /* 739 */
-   void (GLAPIENTRYP GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params); /* 740 */
-   void (GLAPIENTRYP ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 741 */
-   void (GLAPIENTRYP ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 742 */
-   void (GLAPIENTRYP ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 743 */
-   void (GLAPIENTRYP ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 744 */
-   void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 745 */
-   void (GLAPIENTRYP BlendEquationSeparateEXT)(GLenum modeRGB, GLenum modeA); /* 746 */
-   void (GLAPIENTRYP BindFramebufferEXT)(GLenum target, GLuint framebuffer); /* 747 */
-   void (GLAPIENTRYP BindRenderbufferEXT)(GLenum target, GLuint renderbuffer); /* 748 */
-   GLenum (GLAPIENTRYP CheckFramebufferStatusEXT)(GLenum target); /* 749 */
-   void (GLAPIENTRYP DeleteFramebuffersEXT)(GLsizei n, const GLuint * framebuffers); /* 750 */
-   void (GLAPIENTRYP DeleteRenderbuffersEXT)(GLsizei n, const GLuint * renderbuffers); /* 751 */
-   void (GLAPIENTRYP FramebufferRenderbufferEXT)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); /* 752 */
-   void (GLAPIENTRYP FramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 753 */
-   void (GLAPIENTRYP FramebufferTexture2DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 754 */
-   void (GLAPIENTRYP FramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); /* 755 */
-   void (GLAPIENTRYP GenFramebuffersEXT)(GLsizei n, GLuint * framebuffers); /* 756 */
-   void (GLAPIENTRYP GenRenderbuffersEXT)(GLsizei n, GLuint * renderbuffers); /* 757 */
-   void (GLAPIENTRYP GenerateMipmapEXT)(GLenum target); /* 758 */
-   void (GLAPIENTRYP GetFramebufferAttachmentParameterivEXT)(GLenum target, GLenum attachment, GLenum pname, GLint * params); /* 759 */
-   void (GLAPIENTRYP GetRenderbufferParameterivEXT)(GLenum target, GLenum pname, GLint * params); /* 760 */
-   GLboolean (GLAPIENTRYP IsFramebufferEXT)(GLuint framebuffer); /* 761 */
-   GLboolean (GLAPIENTRYP IsRenderbufferEXT)(GLuint renderbuffer); /* 762 */
-   void (GLAPIENTRYP RenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); /* 763 */
-   void (GLAPIENTRYP BlitFramebufferEXT)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); /* 764 */
-   void (GLAPIENTRYP FramebufferTextureLayerEXT)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); /* 765 */
-   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 766 */
-   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 767 */
-   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 768 */
-   void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 769 */
-   void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 770 */
+   void (GLAPIENTRYP GetTexBumpParameterfvATI)(GLenum pname, GLfloat * param); /* 718 */
+   void (GLAPIENTRYP GetTexBumpParameterivATI)(GLenum pname, GLint * param); /* 719 */
+   void (GLAPIENTRYP TexBumpParameterfvATI)(GLenum pname, const GLfloat * param); /* 720 */
+   void (GLAPIENTRYP TexBumpParameterivATI)(GLenum pname, const GLint * param); /* 721 */
+   void (GLAPIENTRYP AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 722 */
+   void (GLAPIENTRYP AlphaFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 723 */
+   void (GLAPIENTRYP AlphaFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 724 */
+   void (GLAPIENTRYP BeginFragmentShaderATI)(void); /* 725 */
+   void (GLAPIENTRYP BindFragmentShaderATI)(GLuint id); /* 726 */
+   void (GLAPIENTRYP ColorFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 727 */
+   void (GLAPIENTRYP ColorFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 728 */
+   void (GLAPIENTRYP ColorFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 729 */
+   void (GLAPIENTRYP DeleteFragmentShaderATI)(GLuint id); /* 730 */
+   void (GLAPIENTRYP EndFragmentShaderATI)(void); /* 731 */
+   GLuint (GLAPIENTRYP GenFragmentShadersATI)(GLuint range); /* 732 */
+   void (GLAPIENTRYP PassTexCoordATI)(GLuint dst, GLuint coord, GLenum swizzle); /* 733 */
+   void (GLAPIENTRYP SampleMapATI)(GLuint dst, GLuint interp, GLenum swizzle); /* 734 */
+   void (GLAPIENTRYP SetFragmentShaderConstantATI)(GLuint dst, const GLfloat * value); /* 735 */
+   void (GLAPIENTRYP PointParameteriNV)(GLenum pname, GLint param); /* 736 */
+   void (GLAPIENTRYP PointParameterivNV)(GLenum pname, const GLint * params); /* 737 */
+   void (GLAPIENTRYP ActiveStencilFaceEXT)(GLenum face); /* 738 */
+   void (GLAPIENTRYP BindVertexArrayAPPLE)(GLuint array); /* 739 */
+   void (GLAPIENTRYP DeleteVertexArraysAPPLE)(GLsizei n, const GLuint * arrays); /* 740 */
+   void (GLAPIENTRYP GenVertexArraysAPPLE)(GLsizei n, GLuint * arrays); /* 741 */
+   GLboolean (GLAPIENTRYP IsVertexArrayAPPLE)(GLuint array); /* 742 */
+   void (GLAPIENTRYP GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params); /* 743 */
+   void (GLAPIENTRYP GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params); /* 744 */
+   void (GLAPIENTRYP ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 745 */
+   void (GLAPIENTRYP ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 746 */
+   void (GLAPIENTRYP ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 747 */
+   void (GLAPIENTRYP ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 748 */
+   void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 749 */
+   void (GLAPIENTRYP BlendEquationSeparateEXT)(GLenum modeRGB, GLenum modeA); /* 750 */
+   void (GLAPIENTRYP BindFramebufferEXT)(GLenum target, GLuint framebuffer); /* 751 */
+   void (GLAPIENTRYP BindRenderbufferEXT)(GLenum target, GLuint renderbuffer); /* 752 */
+   GLenum (GLAPIENTRYP CheckFramebufferStatusEXT)(GLenum target); /* 753 */
+   void (GLAPIENTRYP DeleteFramebuffersEXT)(GLsizei n, const GLuint * framebuffers); /* 754 */
+   void (GLAPIENTRYP DeleteRenderbuffersEXT)(GLsizei n, const GLuint * renderbuffers); /* 755 */
+   void (GLAPIENTRYP FramebufferRenderbufferEXT)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); /* 756 */
+   void (GLAPIENTRYP FramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 757 */
+   void (GLAPIENTRYP FramebufferTexture2DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 758 */
+   void (GLAPIENTRYP FramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); /* 759 */
+   void (GLAPIENTRYP GenFramebuffersEXT)(GLsizei n, GLuint * framebuffers); /* 760 */
+   void (GLAPIENTRYP GenRenderbuffersEXT)(GLsizei n, GLuint * renderbuffers); /* 761 */
+   void (GLAPIENTRYP GenerateMipmapEXT)(GLenum target); /* 762 */
+   void (GLAPIENTRYP GetFramebufferAttachmentParameterivEXT)(GLenum target, GLenum attachment, GLenum pname, GLint * params); /* 763 */
+   void (GLAPIENTRYP GetRenderbufferParameterivEXT)(GLenum target, GLenum pname, GLint * params); /* 764 */
+   GLboolean (GLAPIENTRYP IsFramebufferEXT)(GLuint framebuffer); /* 765 */
+   GLboolean (GLAPIENTRYP IsRenderbufferEXT)(GLuint renderbuffer); /* 766 */
+   void (GLAPIENTRYP RenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); /* 767 */
+   void (GLAPIENTRYP BlitFramebufferEXT)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); /* 768 */
+   void (GLAPIENTRYP FramebufferTextureLayerEXT)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); /* 769 */
+   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 770 */
+   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 771 */
+   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 772 */
+   void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 773 */
+   void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 774 */
 };
 
 #endif /* !defined( _GLAPI_TABLE_H_ ) */
diff --git a/src/mesa/glapi/glapitemp.h b/src/mesa/glapi/glapitemp.h
index 960d70e081..7ccd9707c3 100644
--- a/src/mesa/glapi/glapitemp.h
+++ b/src/mesa/glapi/glapitemp.h
@@ -5187,6 +5187,26 @@ KEYWORD1 void KEYWORD2 NAME(VertexAttribs4ubvNV)(GLuint index, GLsizei n, const
    DISPATCH(VertexAttribs4ubvNV, (index, n, v), (F, "glVertexAttribs4ubvNV(%d, %d, %p);\n", index, n, (const void *) v));
 }
 
+KEYWORD1 void KEYWORD2 NAME(GetTexBumpParameterfvATI)(GLenum pname, GLfloat * param)
+{
+   DISPATCH(GetTexBumpParameterfvATI, (pname, param), (F, "glGetTexBumpParameterfvATI(0x%x, %p);\n", pname, (const void *) param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetTexBumpParameterivATI)(GLenum pname, GLint * param)
+{
+   DISPATCH(GetTexBumpParameterivATI, (pname, param), (F, "glGetTexBumpParameterivATI(0x%x, %p);\n", pname, (const void *) param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexBumpParameterfvATI)(GLenum pname, const GLfloat * param)
+{
+   DISPATCH(TexBumpParameterfvATI, (pname, param), (F, "glTexBumpParameterfvATI(0x%x, %p);\n", pname, (const void *) param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexBumpParameterivATI)(GLenum pname, const GLint * param)
+{
+   DISPATCH(TexBumpParameterivATI, (pname, param), (F, "glTexBumpParameterivATI(0x%x, %p);\n", pname, (const void *) param));
+}
+
 KEYWORD1 void KEYWORD2 NAME(AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod)
 {
    DISPATCH(AlphaFragmentOp1ATI, (op, dst, dstMod, arg1, arg1Rep, arg1Mod), (F, "glAlphaFragmentOp1ATI(0x%x, %d, %d, %d, %d, %d);\n", op, dst, dstMod, arg1, arg1Rep, arg1Mod));
@@ -5277,37 +5297,37 @@ KEYWORD1 void KEYWORD2 NAME(PointParameterivNV)(GLenum pname, const GLint * para
    DISPATCH(PointParameterivNV, (pname, params), (F, "glPointParameterivNV(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_734)(GLenum face);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_738)(GLenum face);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_734)(GLenum face)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_738)(GLenum face)
 {
    DISPATCH(ActiveStencilFaceEXT, (face), (F, "glActiveStencilFaceEXT(0x%x);\n", face));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_735)(GLuint array);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_739)(GLuint array);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_735)(GLuint array)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_739)(GLuint array)
 {
    DISPATCH(BindVertexArrayAPPLE, (array), (F, "glBindVertexArrayAPPLE(%d);\n", array));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_736)(GLsizei n, const GLuint * arrays);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_740)(GLsizei n, const GLuint * arrays);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_736)(GLsizei n, const GLuint * arrays)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_740)(GLsizei n, const GLuint * arrays)
 {
    DISPATCH(DeleteVertexArraysAPPLE, (n, arrays), (F, "glDeleteVertexArraysAPPLE(%d, %p);\n", n, (const void *) arrays));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_737)(GLsizei n, GLuint * arrays);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_741)(GLsizei n, GLuint * arrays);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_737)(GLsizei n, GLuint * arrays)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_741)(GLsizei n, GLuint * arrays)
 {
    DISPATCH(GenVertexArraysAPPLE, (n, arrays), (F, "glGenVertexArraysAPPLE(%d, %p);\n", n, (const void *) arrays));
 }
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_738)(GLuint array);
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_742)(GLuint array);
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_738)(GLuint array)
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_742)(GLuint array)
 {
    RETURN_DISPATCH(IsVertexArrayAPPLE, (array), (F, "glIsVertexArrayAPPLE(%d);\n", array));
 }
@@ -5342,9 +5362,9 @@ KEYWORD1 void KEYWORD2 NAME(ProgramNamedParameter4fvNV)(GLuint id, GLsizei len,
    DISPATCH(ProgramNamedParameter4fvNV, (id, len, name, v), (F, "glProgramNamedParameter4fvNV(%d, %d, %p, %p);\n", id, len, (const void *) name, (const void *) v));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_745)(GLclampd zmin, GLclampd zmax);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_749)(GLclampd zmin, GLclampd zmax);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_745)(GLclampd zmin, GLclampd zmax)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_749)(GLclampd zmin, GLclampd zmax)
 {
    DISPATCH(DepthBoundsEXT, (zmin, zmax), (F, "glDepthBoundsEXT(%f, %f);\n", zmin, zmax));
 }
@@ -5354,9 +5374,9 @@ KEYWORD1 void KEYWORD2 NAME(BlendEquationSeparate)(GLenum modeRGB, GLenum modeA)
    DISPATCH(BlendEquationSeparateEXT, (modeRGB, modeA), (F, "glBlendEquationSeparate(0x%x, 0x%x);\n", modeRGB, modeA));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_746)(GLenum modeRGB, GLenum modeA);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_750)(GLenum modeRGB, GLenum modeA);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_746)(GLenum modeRGB, GLenum modeA)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_750)(GLenum modeRGB, GLenum modeA)
 {
    DISPATCH(BlendEquationSeparateEXT, (modeRGB, modeA), (F, "glBlendEquationSeparateEXT(0x%x, 0x%x);\n", modeRGB, modeA));
 }
@@ -5536,9 +5556,9 @@ KEYWORD1 void KEYWORD2 NAME(BlitFramebuffer)(GLint srcX0, GLint srcY0, GLint src
    DISPATCH(BlitFramebufferEXT, (srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter), (F, "glBlitFramebuffer(%d, %d, %d, %d, %d, %d, %d, %d, %d, 0x%x);\n", srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_764)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_768)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_764)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_768)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
 {
    DISPATCH(BlitFramebufferEXT, (srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter), (F, "glBlitFramebufferEXT(%d, %d, %d, %d, %d, %d, %d, %d, %d, 0x%x);\n", srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter));
 }
@@ -5553,37 +5573,37 @@ KEYWORD1 void KEYWORD2 NAME(FramebufferTextureLayerEXT)(GLenum target, GLenum at
    DISPATCH(FramebufferTextureLayerEXT, (target, attachment, texture, level, layer), (F, "glFramebufferTextureLayerEXT(0x%x, 0x%x, %d, %d, %d);\n", target, attachment, texture, level, layer));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_766)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_770)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_766)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_770)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask)
 {
    DISPATCH(StencilFuncSeparateATI, (frontfunc, backfunc, ref, mask), (F, "glStencilFuncSeparateATI(0x%x, 0x%x, %d, %d);\n", frontfunc, backfunc, ref, mask));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_767)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_771)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_767)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_771)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
 {
    DISPATCH(ProgramEnvParameters4fvEXT, (target, index, count, params), (F, "glProgramEnvParameters4fvEXT(0x%x, %d, %d, %p);\n", target, index, count, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_768)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_772)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_768)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_772)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
 {
    DISPATCH(ProgramLocalParameters4fvEXT, (target, index, count, params), (F, "glProgramLocalParameters4fvEXT(0x%x, %d, %d, %p);\n", target, index, count, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_769)(GLuint id, GLenum pname, GLint64EXT * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_773)(GLuint id, GLenum pname, GLint64EXT * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_769)(GLuint id, GLenum pname, GLint64EXT * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_773)(GLuint id, GLenum pname, GLint64EXT * params)
 {
    DISPATCH(GetQueryObjecti64vEXT, (id, pname, params), (F, "glGetQueryObjecti64vEXT(%d, 0x%x, %p);\n", id, pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_770)(GLuint id, GLenum pname, GLuint64EXT * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_774)(GLuint id, GLenum pname, GLuint64EXT * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_770)(GLuint id, GLenum pname, GLuint64EXT * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_774)(GLuint id, GLenum pname, GLuint64EXT * params)
 {
    DISPATCH(GetQueryObjectui64vEXT, (id, pname, params), (F, "glGetQueryObjectui64vEXT(%d, 0x%x, %p);\n", id, pname, (const void *) params));
 }
@@ -6320,6 +6340,10 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(VertexAttribs4fvNV),
    TABLE_ENTRY(VertexAttribs4svNV),
    TABLE_ENTRY(VertexAttribs4ubvNV),
+   TABLE_ENTRY(GetTexBumpParameterfvATI),
+   TABLE_ENTRY(GetTexBumpParameterivATI),
+   TABLE_ENTRY(TexBumpParameterfvATI),
+   TABLE_ENTRY(TexBumpParameterivATI),
    TABLE_ENTRY(AlphaFragmentOp1ATI),
    TABLE_ENTRY(AlphaFragmentOp2ATI),
    TABLE_ENTRY(AlphaFragmentOp3ATI),
@@ -6336,19 +6360,19 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(SetFragmentShaderConstantATI),
    TABLE_ENTRY(PointParameteriNV),
    TABLE_ENTRY(PointParameterivNV),
-   TABLE_ENTRY(_dispatch_stub_734),
-   TABLE_ENTRY(_dispatch_stub_735),
-   TABLE_ENTRY(_dispatch_stub_736),
-   TABLE_ENTRY(_dispatch_stub_737),
    TABLE_ENTRY(_dispatch_stub_738),
+   TABLE_ENTRY(_dispatch_stub_739),
+   TABLE_ENTRY(_dispatch_stub_740),
+   TABLE_ENTRY(_dispatch_stub_741),
+   TABLE_ENTRY(_dispatch_stub_742),
    TABLE_ENTRY(GetProgramNamedParameterdvNV),
    TABLE_ENTRY(GetProgramNamedParameterfvNV),
    TABLE_ENTRY(ProgramNamedParameter4dNV),
    TABLE_ENTRY(ProgramNamedParameter4dvNV),
    TABLE_ENTRY(ProgramNamedParameter4fNV),
    TABLE_ENTRY(ProgramNamedParameter4fvNV),
-   TABLE_ENTRY(_dispatch_stub_745),
-   TABLE_ENTRY(_dispatch_stub_746),
+   TABLE_ENTRY(_dispatch_stub_749),
+   TABLE_ENTRY(_dispatch_stub_750),
    TABLE_ENTRY(BindFramebufferEXT),
    TABLE_ENTRY(BindRenderbufferEXT),
    TABLE_ENTRY(CheckFramebufferStatusEXT),
@@ -6366,13 +6390,13 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(IsFramebufferEXT),
    TABLE_ENTRY(IsRenderbufferEXT),
    TABLE_ENTRY(RenderbufferStorageEXT),
-   TABLE_ENTRY(_dispatch_stub_764),
-   TABLE_ENTRY(FramebufferTextureLayerEXT),
-   TABLE_ENTRY(_dispatch_stub_766),
-   TABLE_ENTRY(_dispatch_stub_767),
    TABLE_ENTRY(_dispatch_stub_768),
-   TABLE_ENTRY(_dispatch_stub_769),
+   TABLE_ENTRY(FramebufferTextureLayerEXT),
    TABLE_ENTRY(_dispatch_stub_770),
+   TABLE_ENTRY(_dispatch_stub_771),
+   TABLE_ENTRY(_dispatch_stub_772),
+   TABLE_ENTRY(_dispatch_stub_773),
+   TABLE_ENTRY(_dispatch_stub_774),
    /* A whole bunch of no-op functions.  These might be called
     * when someone tries to call a dynamically-registered
     * extension function without a current rendering context.
diff --git a/src/mesa/glapi/glprocs.h b/src/mesa/glapi/glprocs.h
index ba652bc3c6..021a64efcd 100644
--- a/src/mesa/glapi/glprocs.h
+++ b/src/mesa/glapi/glprocs.h
@@ -770,6 +770,10 @@ static const char gl_string_table[] =
     "glVertexAttribs4fvNV\0"
     "glVertexAttribs4svNV\0"
     "glVertexAttribs4ubvNV\0"
+    "glGetTexBumpParameterfvATI\0"
+    "glGetTexBumpParameterivATI\0"
+    "glTexBumpParameterfvATI\0"
+    "glTexBumpParameterivATI\0"
     "glAlphaFragmentOp1ATI\0"
     "glAlphaFragmentOp2ATI\0"
     "glAlphaFragmentOp3ATI\0"
@@ -1158,19 +1162,19 @@ static const char gl_string_table[] =
 #define gl_dispatch_stub_655 mgl_dispatch_stub_655
 #define gl_dispatch_stub_656 mgl_dispatch_stub_656
 #define gl_dispatch_stub_657 mgl_dispatch_stub_657
-#define gl_dispatch_stub_734 mgl_dispatch_stub_734
-#define gl_dispatch_stub_735 mgl_dispatch_stub_735
-#define gl_dispatch_stub_736 mgl_dispatch_stub_736
-#define gl_dispatch_stub_737 mgl_dispatch_stub_737
 #define gl_dispatch_stub_738 mgl_dispatch_stub_738
-#define gl_dispatch_stub_745 mgl_dispatch_stub_745
-#define gl_dispatch_stub_746 mgl_dispatch_stub_746
-#define gl_dispatch_stub_764 mgl_dispatch_stub_764
-#define gl_dispatch_stub_766 mgl_dispatch_stub_766
-#define gl_dispatch_stub_767 mgl_dispatch_stub_767
+#define gl_dispatch_stub_739 mgl_dispatch_stub_739
+#define gl_dispatch_stub_740 mgl_dispatch_stub_740
+#define gl_dispatch_stub_741 mgl_dispatch_stub_741
+#define gl_dispatch_stub_742 mgl_dispatch_stub_742
+#define gl_dispatch_stub_749 mgl_dispatch_stub_749
+#define gl_dispatch_stub_750 mgl_dispatch_stub_750
 #define gl_dispatch_stub_768 mgl_dispatch_stub_768
-#define gl_dispatch_stub_769 mgl_dispatch_stub_769
 #define gl_dispatch_stub_770 mgl_dispatch_stub_770
+#define gl_dispatch_stub_771 mgl_dispatch_stub_771
+#define gl_dispatch_stub_772 mgl_dispatch_stub_772
+#define gl_dispatch_stub_773 mgl_dispatch_stub_773
+#define gl_dispatch_stub_774 mgl_dispatch_stub_774
 #endif /* USE_MGL_NAMESPACE */
 
 
@@ -1209,19 +1213,19 @@ extern void gl_dispatch_stub_654(void);
 extern void gl_dispatch_stub_655(void);
 extern void gl_dispatch_stub_656(void);
 extern void gl_dispatch_stub_657(void);
-extern void gl_dispatch_stub_734(void);
-extern void gl_dispatch_stub_735(void);
-extern void gl_dispatch_stub_736(void);
-extern void gl_dispatch_stub_737(void);
 extern void gl_dispatch_stub_738(void);
-extern void gl_dispatch_stub_745(void);
-extern void gl_dispatch_stub_746(void);
-extern void gl_dispatch_stub_764(void);
-extern void gl_dispatch_stub_766(void);
-extern void gl_dispatch_stub_767(void);
+extern void gl_dispatch_stub_739(void);
+extern void gl_dispatch_stub_740(void);
+extern void gl_dispatch_stub_741(void);
+extern void gl_dispatch_stub_742(void);
+extern void gl_dispatch_stub_749(void);
+extern void gl_dispatch_stub_750(void);
 extern void gl_dispatch_stub_768(void);
-extern void gl_dispatch_stub_769(void);
 extern void gl_dispatch_stub_770(void);
+extern void gl_dispatch_stub_771(void);
+extern void gl_dispatch_stub_772(void);
+extern void gl_dispatch_stub_773(void);
+extern void gl_dispatch_stub_774(void);
 #endif /* defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING) */
 
 static const glprocs_table_t static_functions[] = {
@@ -1943,357 +1947,361 @@ static const glprocs_table_t static_functions[] = {
     NAME_FUNC_OFFSET(12202, glVertexAttribs4fvNV, glVertexAttribs4fvNV, NULL, _gloffset_VertexAttribs4fvNV),
     NAME_FUNC_OFFSET(12223, glVertexAttribs4svNV, glVertexAttribs4svNV, NULL, _gloffset_VertexAttribs4svNV),
     NAME_FUNC_OFFSET(12244, glVertexAttribs4ubvNV, glVertexAttribs4ubvNV, NULL, _gloffset_VertexAttribs4ubvNV),
-    NAME_FUNC_OFFSET(12266, glAlphaFragmentOp1ATI, glAlphaFragmentOp1ATI, NULL, _gloffset_AlphaFragmentOp1ATI),
-    NAME_FUNC_OFFSET(12288, glAlphaFragmentOp2ATI, glAlphaFragmentOp2ATI, NULL, _gloffset_AlphaFragmentOp2ATI),
-    NAME_FUNC_OFFSET(12310, glAlphaFragmentOp3ATI, glAlphaFragmentOp3ATI, NULL, _gloffset_AlphaFragmentOp3ATI),
-    NAME_FUNC_OFFSET(12332, glBeginFragmentShaderATI, glBeginFragmentShaderATI, NULL, _gloffset_BeginFragmentShaderATI),
-    NAME_FUNC_OFFSET(12357, glBindFragmentShaderATI, glBindFragmentShaderATI, NULL, _gloffset_BindFragmentShaderATI),
-    NAME_FUNC_OFFSET(12381, glColorFragmentOp1ATI, glColorFragmentOp1ATI, NULL, _gloffset_ColorFragmentOp1ATI),
-    NAME_FUNC_OFFSET(12403, glColorFragmentOp2ATI, glColorFragmentOp2ATI, NULL, _gloffset_ColorFragmentOp2ATI),
-    NAME_FUNC_OFFSET(12425, glColorFragmentOp3ATI, glColorFragmentOp3ATI, NULL, _gloffset_ColorFragmentOp3ATI),
-    NAME_FUNC_OFFSET(12447, glDeleteFragmentShaderATI, glDeleteFragmentShaderATI, NULL, _gloffset_DeleteFragmentShaderATI),
-    NAME_FUNC_OFFSET(12473, glEndFragmentShaderATI, glEndFragmentShaderATI, NULL, _gloffset_EndFragmentShaderATI),
-    NAME_FUNC_OFFSET(12496, glGenFragmentShadersATI, glGenFragmentShadersATI, NULL, _gloffset_GenFragmentShadersATI),
-    NAME_FUNC_OFFSET(12520, glPassTexCoordATI, glPassTexCoordATI, NULL, _gloffset_PassTexCoordATI),
-    NAME_FUNC_OFFSET(12538, glSampleMapATI, glSampleMapATI, NULL, _gloffset_SampleMapATI),
-    NAME_FUNC_OFFSET(12553, glSetFragmentShaderConstantATI, glSetFragmentShaderConstantATI, NULL, _gloffset_SetFragmentShaderConstantATI),
-    NAME_FUNC_OFFSET(12584, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
-    NAME_FUNC_OFFSET(12604, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
-    NAME_FUNC_OFFSET(12625, gl_dispatch_stub_734, gl_dispatch_stub_734, NULL, _gloffset_ActiveStencilFaceEXT),
-    NAME_FUNC_OFFSET(12648, gl_dispatch_stub_735, gl_dispatch_stub_735, NULL, _gloffset_BindVertexArrayAPPLE),
-    NAME_FUNC_OFFSET(12671, gl_dispatch_stub_736, gl_dispatch_stub_736, NULL, _gloffset_DeleteVertexArraysAPPLE),
-    NAME_FUNC_OFFSET(12697, gl_dispatch_stub_737, gl_dispatch_stub_737, NULL, _gloffset_GenVertexArraysAPPLE),
-    NAME_FUNC_OFFSET(12720, gl_dispatch_stub_738, gl_dispatch_stub_738, NULL, _gloffset_IsVertexArrayAPPLE),
-    NAME_FUNC_OFFSET(12741, glGetProgramNamedParameterdvNV, glGetProgramNamedParameterdvNV, NULL, _gloffset_GetProgramNamedParameterdvNV),
-    NAME_FUNC_OFFSET(12772, glGetProgramNamedParameterfvNV, glGetProgramNamedParameterfvNV, NULL, _gloffset_GetProgramNamedParameterfvNV),
-    NAME_FUNC_OFFSET(12803, glProgramNamedParameter4dNV, glProgramNamedParameter4dNV, NULL, _gloffset_ProgramNamedParameter4dNV),
-    NAME_FUNC_OFFSET(12831, glProgramNamedParameter4dvNV, glProgramNamedParameter4dvNV, NULL, _gloffset_ProgramNamedParameter4dvNV),
-    NAME_FUNC_OFFSET(12860, glProgramNamedParameter4fNV, glProgramNamedParameter4fNV, NULL, _gloffset_ProgramNamedParameter4fNV),
-    NAME_FUNC_OFFSET(12888, glProgramNamedParameter4fvNV, glProgramNamedParameter4fvNV, NULL, _gloffset_ProgramNamedParameter4fvNV),
-    NAME_FUNC_OFFSET(12917, gl_dispatch_stub_745, gl_dispatch_stub_745, NULL, _gloffset_DepthBoundsEXT),
-    NAME_FUNC_OFFSET(12934, gl_dispatch_stub_746, gl_dispatch_stub_746, NULL, _gloffset_BlendEquationSeparateEXT),
-    NAME_FUNC_OFFSET(12961, glBindFramebufferEXT, glBindFramebufferEXT, NULL, _gloffset_BindFramebufferEXT),
-    NAME_FUNC_OFFSET(12982, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, _gloffset_BindRenderbufferEXT),
-    NAME_FUNC_OFFSET(13004, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, _gloffset_CheckFramebufferStatusEXT),
-    NAME_FUNC_OFFSET(13032, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, _gloffset_DeleteFramebuffersEXT),
-    NAME_FUNC_OFFSET(13056, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, _gloffset_DeleteRenderbuffersEXT),
-    NAME_FUNC_OFFSET(13081, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, _gloffset_FramebufferRenderbufferEXT),
-    NAME_FUNC_OFFSET(13110, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, _gloffset_FramebufferTexture1DEXT),
-    NAME_FUNC_OFFSET(13136, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, _gloffset_FramebufferTexture2DEXT),
-    NAME_FUNC_OFFSET(13162, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, _gloffset_FramebufferTexture3DEXT),
-    NAME_FUNC_OFFSET(13188, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, _gloffset_GenFramebuffersEXT),
-    NAME_FUNC_OFFSET(13209, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, _gloffset_GenRenderbuffersEXT),
-    NAME_FUNC_OFFSET(13231, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, _gloffset_GenerateMipmapEXT),
-    NAME_FUNC_OFFSET(13251, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, _gloffset_GetFramebufferAttachmentParameterivEXT),
-    NAME_FUNC_OFFSET(13292, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, _gloffset_GetRenderbufferParameterivEXT),
-    NAME_FUNC_OFFSET(13324, glIsFramebufferEXT, glIsFramebufferEXT, NULL, _gloffset_IsFramebufferEXT),
-    NAME_FUNC_OFFSET(13343, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, _gloffset_IsRenderbufferEXT),
-    NAME_FUNC_OFFSET(13363, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, _gloffset_RenderbufferStorageEXT),
-    NAME_FUNC_OFFSET(13388, gl_dispatch_stub_764, gl_dispatch_stub_764, NULL, _gloffset_BlitFramebufferEXT),
-    NAME_FUNC_OFFSET(13409, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
-    NAME_FUNC_OFFSET(13438, gl_dispatch_stub_766, gl_dispatch_stub_766, NULL, _gloffset_StencilFuncSeparateATI),
-    NAME_FUNC_OFFSET(13463, gl_dispatch_stub_767, gl_dispatch_stub_767, NULL, _gloffset_ProgramEnvParameters4fvEXT),
-    NAME_FUNC_OFFSET(13492, gl_dispatch_stub_768, gl_dispatch_stub_768, NULL, _gloffset_ProgramLocalParameters4fvEXT),
-    NAME_FUNC_OFFSET(13523, gl_dispatch_stub_769, gl_dispatch_stub_769, NULL, _gloffset_GetQueryObjecti64vEXT),
-    NAME_FUNC_OFFSET(13547, gl_dispatch_stub_770, gl_dispatch_stub_770, NULL, _gloffset_GetQueryObjectui64vEXT),
-    NAME_FUNC_OFFSET(13572, glArrayElement, glArrayElement, NULL, _gloffset_ArrayElement),
-    NAME_FUNC_OFFSET(13590, glBindTexture, glBindTexture, NULL, _gloffset_BindTexture),
-    NAME_FUNC_OFFSET(13607, glDrawArrays, glDrawArrays, NULL, _gloffset_DrawArrays),
-    NAME_FUNC_OFFSET(13623, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, _gloffset_AreTexturesResident),
-    NAME_FUNC_OFFSET(13648, glCopyTexImage1D, glCopyTexImage1D, NULL, _gloffset_CopyTexImage1D),
-    NAME_FUNC_OFFSET(13668, glCopyTexImage2D, glCopyTexImage2D, NULL, _gloffset_CopyTexImage2D),
-    NAME_FUNC_OFFSET(13688, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, _gloffset_CopyTexSubImage1D),
-    NAME_FUNC_OFFSET(13711, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, _gloffset_CopyTexSubImage2D),
-    NAME_FUNC_OFFSET(13734, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, _gloffset_DeleteTextures),
-    NAME_FUNC_OFFSET(13754, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, _gloffset_GenTextures),
-    NAME_FUNC_OFFSET(13771, glGetPointerv, glGetPointerv, NULL, _gloffset_GetPointerv),
-    NAME_FUNC_OFFSET(13788, glIsTexture, glIsTextureEXT, glIsTextureEXT, _gloffset_IsTexture),
-    NAME_FUNC_OFFSET(13803, glPrioritizeTextures, glPrioritizeTextures, NULL, _gloffset_PrioritizeTextures),
-    NAME_FUNC_OFFSET(13827, glTexSubImage1D, glTexSubImage1D, NULL, _gloffset_TexSubImage1D),
-    NAME_FUNC_OFFSET(13846, glTexSubImage2D, glTexSubImage2D, NULL, _gloffset_TexSubImage2D),
-    NAME_FUNC_OFFSET(13865, glBlendColor, glBlendColor, NULL, _gloffset_BlendColor),
-    NAME_FUNC_OFFSET(13881, glBlendEquation, glBlendEquation, NULL, _gloffset_BlendEquation),
-    NAME_FUNC_OFFSET(13900, glDrawRangeElements, glDrawRangeElements, NULL, _gloffset_DrawRangeElements),
-    NAME_FUNC_OFFSET(13923, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
-    NAME_FUNC_OFFSET(13939, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
-    NAME_FUNC_OFFSET(13955, glColorTableParameterfv, glColorTableParameterfv, NULL, _gloffset_ColorTableParameterfv),
-    NAME_FUNC_OFFSET(13982, glColorTableParameteriv, glColorTableParameteriv, NULL, _gloffset_ColorTableParameteriv),
-    NAME_FUNC_OFFSET(14009, glCopyColorTable, glCopyColorTable, NULL, _gloffset_CopyColorTable),
-    NAME_FUNC_OFFSET(14029, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
-    NAME_FUNC_OFFSET(14048, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
-    NAME_FUNC_OFFSET(14067, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
-    NAME_FUNC_OFFSET(14097, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
-    NAME_FUNC_OFFSET(14127, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
-    NAME_FUNC_OFFSET(14157, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
-    NAME_FUNC_OFFSET(14187, glColorSubTable, glColorSubTable, NULL, _gloffset_ColorSubTable),
-    NAME_FUNC_OFFSET(14206, glCopyColorSubTable, glCopyColorSubTable, NULL, _gloffset_CopyColorSubTable),
-    NAME_FUNC_OFFSET(14229, glConvolutionFilter1D, glConvolutionFilter1D, NULL, _gloffset_ConvolutionFilter1D),
-    NAME_FUNC_OFFSET(14254, glConvolutionFilter2D, glConvolutionFilter2D, NULL, _gloffset_ConvolutionFilter2D),
-    NAME_FUNC_OFFSET(14279, glConvolutionParameterf, glConvolutionParameterf, NULL, _gloffset_ConvolutionParameterf),
-    NAME_FUNC_OFFSET(14306, glConvolutionParameterfv, glConvolutionParameterfv, NULL, _gloffset_ConvolutionParameterfv),
-    NAME_FUNC_OFFSET(14334, glConvolutionParameteri, glConvolutionParameteri, NULL, _gloffset_ConvolutionParameteri),
-    NAME_FUNC_OFFSET(14361, glConvolutionParameteriv, glConvolutionParameteriv, NULL, _gloffset_ConvolutionParameteriv),
-    NAME_FUNC_OFFSET(14389, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, _gloffset_CopyConvolutionFilter1D),
-    NAME_FUNC_OFFSET(14418, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, _gloffset_CopyConvolutionFilter2D),
-    NAME_FUNC_OFFSET(14447, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, _gloffset_GetConvolutionFilter),
-    NAME_FUNC_OFFSET(14473, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, _gloffset_GetConvolutionParameterfv),
-    NAME_FUNC_OFFSET(14504, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, _gloffset_GetConvolutionParameteriv),
-    NAME_FUNC_OFFSET(14535, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, _gloffset_GetSeparableFilter),
-    NAME_FUNC_OFFSET(14559, glSeparableFilter2D, glSeparableFilter2D, NULL, _gloffset_SeparableFilter2D),
-    NAME_FUNC_OFFSET(14582, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, _gloffset_GetHistogram),
-    NAME_FUNC_OFFSET(14600, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, _gloffset_GetHistogramParameterfv),
-    NAME_FUNC_OFFSET(14629, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, _gloffset_GetHistogramParameteriv),
-    NAME_FUNC_OFFSET(14658, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, _gloffset_GetMinmax),
-    NAME_FUNC_OFFSET(14673, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, _gloffset_GetMinmaxParameterfv),
-    NAME_FUNC_OFFSET(14699, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, _gloffset_GetMinmaxParameteriv),
-    NAME_FUNC_OFFSET(14725, glHistogram, glHistogram, NULL, _gloffset_Histogram),
-    NAME_FUNC_OFFSET(14740, glMinmax, glMinmax, NULL, _gloffset_Minmax),
-    NAME_FUNC_OFFSET(14752, glResetHistogram, glResetHistogram, NULL, _gloffset_ResetHistogram),
-    NAME_FUNC_OFFSET(14772, glResetMinmax, glResetMinmax, NULL, _gloffset_ResetMinmax),
-    NAME_FUNC_OFFSET(14789, glTexImage3D, glTexImage3D, NULL, _gloffset_TexImage3D),
-    NAME_FUNC_OFFSET(14805, glTexSubImage3D, glTexSubImage3D, NULL, _gloffset_TexSubImage3D),
-    NAME_FUNC_OFFSET(14824, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, _gloffset_CopyTexSubImage3D),
-    NAME_FUNC_OFFSET(14847, glActiveTextureARB, glActiveTextureARB, NULL, _gloffset_ActiveTextureARB),
-    NAME_FUNC_OFFSET(14863, glClientActiveTextureARB, glClientActiveTextureARB, NULL, _gloffset_ClientActiveTextureARB),
-    NAME_FUNC_OFFSET(14885, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL, _gloffset_MultiTexCoord1dARB),
-    NAME_FUNC_OFFSET(14903, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL, _gloffset_MultiTexCoord1dvARB),
-    NAME_FUNC_OFFSET(14922, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, _gloffset_MultiTexCoord1fARB),
-    NAME_FUNC_OFFSET(14940, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, _gloffset_MultiTexCoord1fvARB),
-    NAME_FUNC_OFFSET(14959, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL, _gloffset_MultiTexCoord1iARB),
-    NAME_FUNC_OFFSET(14977, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL, _gloffset_MultiTexCoord1ivARB),
-    NAME_FUNC_OFFSET(14996, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL, _gloffset_MultiTexCoord1sARB),
-    NAME_FUNC_OFFSET(15014, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL, _gloffset_MultiTexCoord1svARB),
-    NAME_FUNC_OFFSET(15033, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL, _gloffset_MultiTexCoord2dARB),
-    NAME_FUNC_OFFSET(15051, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL, _gloffset_MultiTexCoord2dvARB),
-    NAME_FUNC_OFFSET(15070, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, _gloffset_MultiTexCoord2fARB),
-    NAME_FUNC_OFFSET(15088, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, _gloffset_MultiTexCoord2fvARB),
-    NAME_FUNC_OFFSET(15107, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL, _gloffset_MultiTexCoord2iARB),
-    NAME_FUNC_OFFSET(15125, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL, _gloffset_MultiTexCoord2ivARB),
-    NAME_FUNC_OFFSET(15144, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL, _gloffset_MultiTexCoord2sARB),
-    NAME_FUNC_OFFSET(15162, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL, _gloffset_MultiTexCoord2svARB),
-    NAME_FUNC_OFFSET(15181, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL, _gloffset_MultiTexCoord3dARB),
-    NAME_FUNC_OFFSET(15199, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL, _gloffset_MultiTexCoord3dvARB),
-    NAME_FUNC_OFFSET(15218, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, _gloffset_MultiTexCoord3fARB),
-    NAME_FUNC_OFFSET(15236, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, _gloffset_MultiTexCoord3fvARB),
-    NAME_FUNC_OFFSET(15255, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL, _gloffset_MultiTexCoord3iARB),
-    NAME_FUNC_OFFSET(15273, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL, _gloffset_MultiTexCoord3ivARB),
-    NAME_FUNC_OFFSET(15292, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL, _gloffset_MultiTexCoord3sARB),
-    NAME_FUNC_OFFSET(15310, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL, _gloffset_MultiTexCoord3svARB),
-    NAME_FUNC_OFFSET(15329, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL, _gloffset_MultiTexCoord4dARB),
-    NAME_FUNC_OFFSET(15347, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL, _gloffset_MultiTexCoord4dvARB),
-    NAME_FUNC_OFFSET(15366, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, _gloffset_MultiTexCoord4fARB),
-    NAME_FUNC_OFFSET(15384, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, _gloffset_MultiTexCoord4fvARB),
-    NAME_FUNC_OFFSET(15403, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL, _gloffset_MultiTexCoord4iARB),
-    NAME_FUNC_OFFSET(15421, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL, _gloffset_MultiTexCoord4ivARB),
-    NAME_FUNC_OFFSET(15440, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL, _gloffset_MultiTexCoord4sARB),
-    NAME_FUNC_OFFSET(15458, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL, _gloffset_MultiTexCoord4svARB),
-    NAME_FUNC_OFFSET(15477, glStencilOpSeparate, glStencilOpSeparate, NULL, _gloffset_StencilOpSeparate),
-    NAME_FUNC_OFFSET(15500, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, _gloffset_LoadTransposeMatrixdARB),
-    NAME_FUNC_OFFSET(15523, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, _gloffset_LoadTransposeMatrixfARB),
-    NAME_FUNC_OFFSET(15546, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, _gloffset_MultTransposeMatrixdARB),
-    NAME_FUNC_OFFSET(15569, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB, NULL, _gloffset_MultTransposeMatrixfARB),
-    NAME_FUNC_OFFSET(15592, glSampleCoverageARB, glSampleCoverageARB, NULL, _gloffset_SampleCoverageARB),
-    NAME_FUNC_OFFSET(15609, glCompressedTexImage1DARB, glCompressedTexImage1DARB, NULL, _gloffset_CompressedTexImage1DARB),
-    NAME_FUNC_OFFSET(15632, glCompressedTexImage2DARB, glCompressedTexImage2DARB, NULL, _gloffset_CompressedTexImage2DARB),
-    NAME_FUNC_OFFSET(15655, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, _gloffset_CompressedTexImage3DARB),
-    NAME_FUNC_OFFSET(15678, glCompressedTexSubImage1DARB, glCompressedTexSubImage1DARB, NULL, _gloffset_CompressedTexSubImage1DARB),
-    NAME_FUNC_OFFSET(15704, glCompressedTexSubImage2DARB, glCompressedTexSubImage2DARB, NULL, _gloffset_CompressedTexSubImage2DARB),
-    NAME_FUNC_OFFSET(15730, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, _gloffset_CompressedTexSubImage3DARB),
-    NAME_FUNC_OFFSET(15756, glGetCompressedTexImageARB, glGetCompressedTexImageARB, NULL, _gloffset_GetCompressedTexImageARB),
-    NAME_FUNC_OFFSET(15780, glDisableVertexAttribArrayARB, glDisableVertexAttribArrayARB, NULL, _gloffset_DisableVertexAttribArrayARB),
-    NAME_FUNC_OFFSET(15807, glEnableVertexAttribArrayARB, glEnableVertexAttribArrayARB, NULL, _gloffset_EnableVertexAttribArrayARB),
-    NAME_FUNC_OFFSET(15833, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL, _gloffset_GetVertexAttribdvARB),
-    NAME_FUNC_OFFSET(15853, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL, _gloffset_GetVertexAttribfvARB),
-    NAME_FUNC_OFFSET(15873, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL, _gloffset_GetVertexAttribivARB),
-    NAME_FUNC_OFFSET(15893, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, _gloffset_ProgramEnvParameter4dARB),
-    NAME_FUNC_OFFSET(15916, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, _gloffset_ProgramEnvParameter4dvARB),
-    NAME_FUNC_OFFSET(15940, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, _gloffset_ProgramEnvParameter4fARB),
-    NAME_FUNC_OFFSET(15963, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, _gloffset_ProgramEnvParameter4fvARB),
-    NAME_FUNC_OFFSET(15987, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, _gloffset_VertexAttrib1dARB),
-    NAME_FUNC_OFFSET(16004, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL, _gloffset_VertexAttrib1dvARB),
-    NAME_FUNC_OFFSET(16022, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, _gloffset_VertexAttrib1fARB),
-    NAME_FUNC_OFFSET(16039, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, _gloffset_VertexAttrib1fvARB),
-    NAME_FUNC_OFFSET(16057, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, _gloffset_VertexAttrib1sARB),
-    NAME_FUNC_OFFSET(16074, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL, _gloffset_VertexAttrib1svARB),
-    NAME_FUNC_OFFSET(16092, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, _gloffset_VertexAttrib2dARB),
-    NAME_FUNC_OFFSET(16109, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL, _gloffset_VertexAttrib2dvARB),
-    NAME_FUNC_OFFSET(16127, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, _gloffset_VertexAttrib2fARB),
-    NAME_FUNC_OFFSET(16144, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, _gloffset_VertexAttrib2fvARB),
-    NAME_FUNC_OFFSET(16162, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, _gloffset_VertexAttrib2sARB),
-    NAME_FUNC_OFFSET(16179, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL, _gloffset_VertexAttrib2svARB),
-    NAME_FUNC_OFFSET(16197, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, _gloffset_VertexAttrib3dARB),
-    NAME_FUNC_OFFSET(16214, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL, _gloffset_VertexAttrib3dvARB),
-    NAME_FUNC_OFFSET(16232, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, _gloffset_VertexAttrib3fARB),
-    NAME_FUNC_OFFSET(16249, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, _gloffset_VertexAttrib3fvARB),
-    NAME_FUNC_OFFSET(16267, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, _gloffset_VertexAttrib3sARB),
-    NAME_FUNC_OFFSET(16284, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL, _gloffset_VertexAttrib3svARB),
-    NAME_FUNC_OFFSET(16302, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL, _gloffset_VertexAttrib4NbvARB),
-    NAME_FUNC_OFFSET(16321, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL, _gloffset_VertexAttrib4NivARB),
-    NAME_FUNC_OFFSET(16340, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL, _gloffset_VertexAttrib4NsvARB),
-    NAME_FUNC_OFFSET(16359, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL, _gloffset_VertexAttrib4NubARB),
-    NAME_FUNC_OFFSET(16378, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, _gloffset_VertexAttrib4NubvARB),
-    NAME_FUNC_OFFSET(16398, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, _gloffset_VertexAttrib4NuivARB),
-    NAME_FUNC_OFFSET(16418, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, _gloffset_VertexAttrib4NusvARB),
-    NAME_FUNC_OFFSET(16438, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, _gloffset_VertexAttrib4bvARB),
-    NAME_FUNC_OFFSET(16456, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, _gloffset_VertexAttrib4dARB),
-    NAME_FUNC_OFFSET(16473, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, _gloffset_VertexAttrib4dvARB),
-    NAME_FUNC_OFFSET(16491, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, _gloffset_VertexAttrib4fARB),
-    NAME_FUNC_OFFSET(16508, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, _gloffset_VertexAttrib4fvARB),
-    NAME_FUNC_OFFSET(16526, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, _gloffset_VertexAttrib4ivARB),
-    NAME_FUNC_OFFSET(16544, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, _gloffset_VertexAttrib4sARB),
-    NAME_FUNC_OFFSET(16561, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, _gloffset_VertexAttrib4svARB),
-    NAME_FUNC_OFFSET(16579, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, _gloffset_VertexAttrib4ubvARB),
-    NAME_FUNC_OFFSET(16598, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, _gloffset_VertexAttrib4uivARB),
-    NAME_FUNC_OFFSET(16617, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, _gloffset_VertexAttrib4usvARB),
-    NAME_FUNC_OFFSET(16636, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, _gloffset_VertexAttribPointerARB),
-    NAME_FUNC_OFFSET(16658, glBindBufferARB, glBindBufferARB, NULL, _gloffset_BindBufferARB),
-    NAME_FUNC_OFFSET(16671, glBufferDataARB, glBufferDataARB, NULL, _gloffset_BufferDataARB),
-    NAME_FUNC_OFFSET(16684, glBufferSubDataARB, glBufferSubDataARB, NULL, _gloffset_BufferSubDataARB),
-    NAME_FUNC_OFFSET(16700, glDeleteBuffersARB, glDeleteBuffersARB, NULL, _gloffset_DeleteBuffersARB),
-    NAME_FUNC_OFFSET(16716, glGenBuffersARB, glGenBuffersARB, NULL, _gloffset_GenBuffersARB),
-    NAME_FUNC_OFFSET(16729, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, _gloffset_GetBufferParameterivARB),
-    NAME_FUNC_OFFSET(16752, glGetBufferPointervARB, glGetBufferPointervARB, NULL, _gloffset_GetBufferPointervARB),
-    NAME_FUNC_OFFSET(16772, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, _gloffset_GetBufferSubDataARB),
-    NAME_FUNC_OFFSET(16791, glIsBufferARB, glIsBufferARB, NULL, _gloffset_IsBufferARB),
-    NAME_FUNC_OFFSET(16802, glMapBufferARB, glMapBufferARB, NULL, _gloffset_MapBufferARB),
-    NAME_FUNC_OFFSET(16814, glUnmapBufferARB, glUnmapBufferARB, NULL, _gloffset_UnmapBufferARB),
-    NAME_FUNC_OFFSET(16828, glBeginQueryARB, glBeginQueryARB, NULL, _gloffset_BeginQueryARB),
-    NAME_FUNC_OFFSET(16841, glDeleteQueriesARB, glDeleteQueriesARB, NULL, _gloffset_DeleteQueriesARB),
-    NAME_FUNC_OFFSET(16857, glEndQueryARB, glEndQueryARB, NULL, _gloffset_EndQueryARB),
-    NAME_FUNC_OFFSET(16868, glGenQueriesARB, glGenQueriesARB, NULL, _gloffset_GenQueriesARB),
-    NAME_FUNC_OFFSET(16881, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, _gloffset_GetQueryObjectivARB),
-    NAME_FUNC_OFFSET(16900, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, _gloffset_GetQueryObjectuivARB),
-    NAME_FUNC_OFFSET(16920, glGetQueryivARB, glGetQueryivARB, NULL, _gloffset_GetQueryivARB),
-    NAME_FUNC_OFFSET(16933, glIsQueryARB, glIsQueryARB, NULL, _gloffset_IsQueryARB),
-    NAME_FUNC_OFFSET(16943, glCompileShaderARB, glCompileShaderARB, NULL, _gloffset_CompileShaderARB),
-    NAME_FUNC_OFFSET(16959, glGetActiveUniformARB, glGetActiveUniformARB, NULL, _gloffset_GetActiveUniformARB),
-    NAME_FUNC_OFFSET(16978, glGetShaderSourceARB, glGetShaderSourceARB, NULL, _gloffset_GetShaderSourceARB),
-    NAME_FUNC_OFFSET(16996, glGetUniformLocationARB, glGetUniformLocationARB, NULL, _gloffset_GetUniformLocationARB),
-    NAME_FUNC_OFFSET(17017, glGetUniformfvARB, glGetUniformfvARB, NULL, _gloffset_GetUniformfvARB),
-    NAME_FUNC_OFFSET(17032, glGetUniformivARB, glGetUniformivARB, NULL, _gloffset_GetUniformivARB),
-    NAME_FUNC_OFFSET(17047, glLinkProgramARB, glLinkProgramARB, NULL, _gloffset_LinkProgramARB),
-    NAME_FUNC_OFFSET(17061, glShaderSourceARB, glShaderSourceARB, NULL, _gloffset_ShaderSourceARB),
-    NAME_FUNC_OFFSET(17076, glUniform1fARB, glUniform1fARB, NULL, _gloffset_Uniform1fARB),
-    NAME_FUNC_OFFSET(17088, glUniform1fvARB, glUniform1fvARB, NULL, _gloffset_Uniform1fvARB),
-    NAME_FUNC_OFFSET(17101, glUniform1iARB, glUniform1iARB, NULL, _gloffset_Uniform1iARB),
-    NAME_FUNC_OFFSET(17113, glUniform1ivARB, glUniform1ivARB, NULL, _gloffset_Uniform1ivARB),
-    NAME_FUNC_OFFSET(17126, glUniform2fARB, glUniform2fARB, NULL, _gloffset_Uniform2fARB),
-    NAME_FUNC_OFFSET(17138, glUniform2fvARB, glUniform2fvARB, NULL, _gloffset_Uniform2fvARB),
-    NAME_FUNC_OFFSET(17151, glUniform2iARB, glUniform2iARB, NULL, _gloffset_Uniform2iARB),
-    NAME_FUNC_OFFSET(17163, glUniform2ivARB, glUniform2ivARB, NULL, _gloffset_Uniform2ivARB),
-    NAME_FUNC_OFFSET(17176, glUniform3fARB, glUniform3fARB, NULL, _gloffset_Uniform3fARB),
-    NAME_FUNC_OFFSET(17188, glUniform3fvARB, glUniform3fvARB, NULL, _gloffset_Uniform3fvARB),
-    NAME_FUNC_OFFSET(17201, glUniform3iARB, glUniform3iARB, NULL, _gloffset_Uniform3iARB),
-    NAME_FUNC_OFFSET(17213, glUniform3ivARB, glUniform3ivARB, NULL, _gloffset_Uniform3ivARB),
-    NAME_FUNC_OFFSET(17226, glUniform4fARB, glUniform4fARB, NULL, _gloffset_Uniform4fARB),
-    NAME_FUNC_OFFSET(17238, glUniform4fvARB, glUniform4fvARB, NULL, _gloffset_Uniform4fvARB),
-    NAME_FUNC_OFFSET(17251, glUniform4iARB, glUniform4iARB, NULL, _gloffset_Uniform4iARB),
-    NAME_FUNC_OFFSET(17263, glUniform4ivARB, glUniform4ivARB, NULL, _gloffset_Uniform4ivARB),
-    NAME_FUNC_OFFSET(17276, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, _gloffset_UniformMatrix2fvARB),
-    NAME_FUNC_OFFSET(17295, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, _gloffset_UniformMatrix3fvARB),
-    NAME_FUNC_OFFSET(17314, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, _gloffset_UniformMatrix4fvARB),
-    NAME_FUNC_OFFSET(17333, glUseProgramObjectARB, glUseProgramObjectARB, NULL, _gloffset_UseProgramObjectARB),
-    NAME_FUNC_OFFSET(17346, glValidateProgramARB, glValidateProgramARB, NULL, _gloffset_ValidateProgramARB),
-    NAME_FUNC_OFFSET(17364, glBindAttribLocationARB, glBindAttribLocationARB, NULL, _gloffset_BindAttribLocationARB),
-    NAME_FUNC_OFFSET(17385, glGetActiveAttribARB, glGetActiveAttribARB, NULL, _gloffset_GetActiveAttribARB),
-    NAME_FUNC_OFFSET(17403, glGetAttribLocationARB, glGetAttribLocationARB, NULL, _gloffset_GetAttribLocationARB),
-    NAME_FUNC_OFFSET(17423, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
-    NAME_FUNC_OFFSET(17437, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
-    NAME_FUNC_OFFSET(17454, gl_dispatch_stub_569, gl_dispatch_stub_569, NULL, _gloffset_SampleMaskSGIS),
-    NAME_FUNC_OFFSET(17470, gl_dispatch_stub_570, gl_dispatch_stub_570, NULL, _gloffset_SamplePatternSGIS),
-    NAME_FUNC_OFFSET(17489, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(17507, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(17528, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(17550, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(17569, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(17591, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(17614, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
-    NAME_FUNC_OFFSET(17633, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
-    NAME_FUNC_OFFSET(17653, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
-    NAME_FUNC_OFFSET(17672, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
-    NAME_FUNC_OFFSET(17692, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
-    NAME_FUNC_OFFSET(17711, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
-    NAME_FUNC_OFFSET(17731, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
-    NAME_FUNC_OFFSET(17750, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
-    NAME_FUNC_OFFSET(17770, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
-    NAME_FUNC_OFFSET(17789, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
-    NAME_FUNC_OFFSET(17809, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
-    NAME_FUNC_OFFSET(17829, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
-    NAME_FUNC_OFFSET(17850, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
-    NAME_FUNC_OFFSET(17870, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
-    NAME_FUNC_OFFSET(17891, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
-    NAME_FUNC_OFFSET(17911, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
-    NAME_FUNC_OFFSET(17932, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
-    NAME_FUNC_OFFSET(17956, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
-    NAME_FUNC_OFFSET(17974, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
-    NAME_FUNC_OFFSET(17994, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
-    NAME_FUNC_OFFSET(18012, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
-    NAME_FUNC_OFFSET(18024, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
-    NAME_FUNC_OFFSET(18037, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
-    NAME_FUNC_OFFSET(18049, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
-    NAME_FUNC_OFFSET(18062, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
-    NAME_FUNC_OFFSET(18082, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
-    NAME_FUNC_OFFSET(18106, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
-    NAME_FUNC_OFFSET(18120, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
-    NAME_FUNC_OFFSET(18137, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
-    NAME_FUNC_OFFSET(18152, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
-    NAME_FUNC_OFFSET(18170, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
-    NAME_FUNC_OFFSET(18184, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
-    NAME_FUNC_OFFSET(18201, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
-    NAME_FUNC_OFFSET(18216, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
-    NAME_FUNC_OFFSET(18234, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
-    NAME_FUNC_OFFSET(18248, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
-    NAME_FUNC_OFFSET(18265, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
-    NAME_FUNC_OFFSET(18280, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
-    NAME_FUNC_OFFSET(18298, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
-    NAME_FUNC_OFFSET(18312, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
-    NAME_FUNC_OFFSET(18329, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
-    NAME_FUNC_OFFSET(18344, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
-    NAME_FUNC_OFFSET(18362, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
-    NAME_FUNC_OFFSET(18376, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
-    NAME_FUNC_OFFSET(18393, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
-    NAME_FUNC_OFFSET(18408, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
-    NAME_FUNC_OFFSET(18426, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
-    NAME_FUNC_OFFSET(18440, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
-    NAME_FUNC_OFFSET(18457, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
-    NAME_FUNC_OFFSET(18472, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
-    NAME_FUNC_OFFSET(18490, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
-    NAME_FUNC_OFFSET(18504, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
-    NAME_FUNC_OFFSET(18521, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
-    NAME_FUNC_OFFSET(18536, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
-    NAME_FUNC_OFFSET(18554, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
-    NAME_FUNC_OFFSET(18568, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
-    NAME_FUNC_OFFSET(18585, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
-    NAME_FUNC_OFFSET(18600, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
-    NAME_FUNC_OFFSET(18618, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
-    NAME_FUNC_OFFSET(18635, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
-    NAME_FUNC_OFFSET(18655, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
-    NAME_FUNC_OFFSET(18672, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
-    NAME_FUNC_OFFSET(18698, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
-    NAME_FUNC_OFFSET(18727, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
-    NAME_FUNC_OFFSET(18742, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
-    NAME_FUNC_OFFSET(18760, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
-    NAME_FUNC_OFFSET(18779, gl_dispatch_stub_746, gl_dispatch_stub_746, NULL, _gloffset_BlendEquationSeparateEXT),
-    NAME_FUNC_OFFSET(18803, gl_dispatch_stub_746, gl_dispatch_stub_746, NULL, _gloffset_BlendEquationSeparateEXT),
-    NAME_FUNC_OFFSET(18830, glBindFramebufferEXT, glBindFramebufferEXT, NULL, _gloffset_BindFramebufferEXT),
-    NAME_FUNC_OFFSET(18848, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, _gloffset_BindRenderbufferEXT),
-    NAME_FUNC_OFFSET(18867, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, _gloffset_CheckFramebufferStatusEXT),
-    NAME_FUNC_OFFSET(18892, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, _gloffset_DeleteFramebuffersEXT),
-    NAME_FUNC_OFFSET(18913, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, _gloffset_DeleteRenderbuffersEXT),
-    NAME_FUNC_OFFSET(18935, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, _gloffset_FramebufferRenderbufferEXT),
-    NAME_FUNC_OFFSET(18961, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, _gloffset_FramebufferTexture1DEXT),
-    NAME_FUNC_OFFSET(18984, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, _gloffset_FramebufferTexture2DEXT),
-    NAME_FUNC_OFFSET(19007, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, _gloffset_FramebufferTexture3DEXT),
-    NAME_FUNC_OFFSET(19030, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, _gloffset_GenFramebuffersEXT),
-    NAME_FUNC_OFFSET(19048, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, _gloffset_GenRenderbuffersEXT),
-    NAME_FUNC_OFFSET(19067, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, _gloffset_GenerateMipmapEXT),
-    NAME_FUNC_OFFSET(19084, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, _gloffset_GetFramebufferAttachmentParameterivEXT),
-    NAME_FUNC_OFFSET(19122, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, _gloffset_GetRenderbufferParameterivEXT),
-    NAME_FUNC_OFFSET(19151, glIsFramebufferEXT, glIsFramebufferEXT, NULL, _gloffset_IsFramebufferEXT),
-    NAME_FUNC_OFFSET(19167, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, _gloffset_IsRenderbufferEXT),
-    NAME_FUNC_OFFSET(19184, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, _gloffset_RenderbufferStorageEXT),
-    NAME_FUNC_OFFSET(19206, gl_dispatch_stub_764, gl_dispatch_stub_764, NULL, _gloffset_BlitFramebufferEXT),
-    NAME_FUNC_OFFSET(19224, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
+    NAME_FUNC_OFFSET(12266, glGetTexBumpParameterfvATI, glGetTexBumpParameterfvATI, NULL, _gloffset_GetTexBumpParameterfvATI),
+    NAME_FUNC_OFFSET(12293, glGetTexBumpParameterivATI, glGetTexBumpParameterivATI, NULL, _gloffset_GetTexBumpParameterivATI),
+    NAME_FUNC_OFFSET(12320, glTexBumpParameterfvATI, glTexBumpParameterfvATI, NULL, _gloffset_TexBumpParameterfvATI),
+    NAME_FUNC_OFFSET(12344, glTexBumpParameterivATI, glTexBumpParameterivATI, NULL, _gloffset_TexBumpParameterivATI),
+    NAME_FUNC_OFFSET(12368, glAlphaFragmentOp1ATI, glAlphaFragmentOp1ATI, NULL, _gloffset_AlphaFragmentOp1ATI),
+    NAME_FUNC_OFFSET(12390, glAlphaFragmentOp2ATI, glAlphaFragmentOp2ATI, NULL, _gloffset_AlphaFragmentOp2ATI),
+    NAME_FUNC_OFFSET(12412, glAlphaFragmentOp3ATI, glAlphaFragmentOp3ATI, NULL, _gloffset_AlphaFragmentOp3ATI),
+    NAME_FUNC_OFFSET(12434, glBeginFragmentShaderATI, glBeginFragmentShaderATI, NULL, _gloffset_BeginFragmentShaderATI),
+    NAME_FUNC_OFFSET(12459, glBindFragmentShaderATI, glBindFragmentShaderATI, NULL, _gloffset_BindFragmentShaderATI),
+    NAME_FUNC_OFFSET(12483, glColorFragmentOp1ATI, glColorFragmentOp1ATI, NULL, _gloffset_ColorFragmentOp1ATI),
+    NAME_FUNC_OFFSET(12505, glColorFragmentOp2ATI, glColorFragmentOp2ATI, NULL, _gloffset_ColorFragmentOp2ATI),
+    NAME_FUNC_OFFSET(12527, glColorFragmentOp3ATI, glColorFragmentOp3ATI, NULL, _gloffset_ColorFragmentOp3ATI),
+    NAME_FUNC_OFFSET(12549, glDeleteFragmentShaderATI, glDeleteFragmentShaderATI, NULL, _gloffset_DeleteFragmentShaderATI),
+    NAME_FUNC_OFFSET(12575, glEndFragmentShaderATI, glEndFragmentShaderATI, NULL, _gloffset_EndFragmentShaderATI),
+    NAME_FUNC_OFFSET(12598, glGenFragmentShadersATI, glGenFragmentShadersATI, NULL, _gloffset_GenFragmentShadersATI),
+    NAME_FUNC_OFFSET(12622, glPassTexCoordATI, glPassTexCoordATI, NULL, _gloffset_PassTexCoordATI),
+    NAME_FUNC_OFFSET(12640, glSampleMapATI, glSampleMapATI, NULL, _gloffset_SampleMapATI),
+    NAME_FUNC_OFFSET(12655, glSetFragmentShaderConstantATI, glSetFragmentShaderConstantATI, NULL, _gloffset_SetFragmentShaderConstantATI),
+    NAME_FUNC_OFFSET(12686, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
+    NAME_FUNC_OFFSET(12706, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
+    NAME_FUNC_OFFSET(12727, gl_dispatch_stub_738, gl_dispatch_stub_738, NULL, _gloffset_ActiveStencilFaceEXT),
+    NAME_FUNC_OFFSET(12750, gl_dispatch_stub_739, gl_dispatch_stub_739, NULL, _gloffset_BindVertexArrayAPPLE),
+    NAME_FUNC_OFFSET(12773, gl_dispatch_stub_740, gl_dispatch_stub_740, NULL, _gloffset_DeleteVertexArraysAPPLE),
+    NAME_FUNC_OFFSET(12799, gl_dispatch_stub_741, gl_dispatch_stub_741, NULL, _gloffset_GenVertexArraysAPPLE),
+    NAME_FUNC_OFFSET(12822, gl_dispatch_stub_742, gl_dispatch_stub_742, NULL, _gloffset_IsVertexArrayAPPLE),
+    NAME_FUNC_OFFSET(12843, glGetProgramNamedParameterdvNV, glGetProgramNamedParameterdvNV, NULL, _gloffset_GetProgramNamedParameterdvNV),
+    NAME_FUNC_OFFSET(12874, glGetProgramNamedParameterfvNV, glGetProgramNamedParameterfvNV, NULL, _gloffset_GetProgramNamedParameterfvNV),
+    NAME_FUNC_OFFSET(12905, glProgramNamedParameter4dNV, glProgramNamedParameter4dNV, NULL, _gloffset_ProgramNamedParameter4dNV),
+    NAME_FUNC_OFFSET(12933, glProgramNamedParameter4dvNV, glProgramNamedParameter4dvNV, NULL, _gloffset_ProgramNamedParameter4dvNV),
+    NAME_FUNC_OFFSET(12962, glProgramNamedParameter4fNV, glProgramNamedParameter4fNV, NULL, _gloffset_ProgramNamedParameter4fNV),
+    NAME_FUNC_OFFSET(12990, glProgramNamedParameter4fvNV, glProgramNamedParameter4fvNV, NULL, _gloffset_ProgramNamedParameter4fvNV),
+    NAME_FUNC_OFFSET(13019, gl_dispatch_stub_749, gl_dispatch_stub_749, NULL, _gloffset_DepthBoundsEXT),
+    NAME_FUNC_OFFSET(13036, gl_dispatch_stub_750, gl_dispatch_stub_750, NULL, _gloffset_BlendEquationSeparateEXT),
+    NAME_FUNC_OFFSET(13063, glBindFramebufferEXT, glBindFramebufferEXT, NULL, _gloffset_BindFramebufferEXT),
+    NAME_FUNC_OFFSET(13084, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, _gloffset_BindRenderbufferEXT),
+    NAME_FUNC_OFFSET(13106, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, _gloffset_CheckFramebufferStatusEXT),
+    NAME_FUNC_OFFSET(13134, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, _gloffset_DeleteFramebuffersEXT),
+    NAME_FUNC_OFFSET(13158, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, _gloffset_DeleteRenderbuffersEXT),
+    NAME_FUNC_OFFSET(13183, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, _gloffset_FramebufferRenderbufferEXT),
+    NAME_FUNC_OFFSET(13212, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, _gloffset_FramebufferTexture1DEXT),
+    NAME_FUNC_OFFSET(13238, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, _gloffset_FramebufferTexture2DEXT),
+    NAME_FUNC_OFFSET(13264, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, _gloffset_FramebufferTexture3DEXT),
+    NAME_FUNC_OFFSET(13290, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, _gloffset_GenFramebuffersEXT),
+    NAME_FUNC_OFFSET(13311, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, _gloffset_GenRenderbuffersEXT),
+    NAME_FUNC_OFFSET(13333, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, _gloffset_GenerateMipmapEXT),
+    NAME_FUNC_OFFSET(13353, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, _gloffset_GetFramebufferAttachmentParameterivEXT),
+    NAME_FUNC_OFFSET(13394, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, _gloffset_GetRenderbufferParameterivEXT),
+    NAME_FUNC_OFFSET(13426, glIsFramebufferEXT, glIsFramebufferEXT, NULL, _gloffset_IsFramebufferEXT),
+    NAME_FUNC_OFFSET(13445, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, _gloffset_IsRenderbufferEXT),
+    NAME_FUNC_OFFSET(13465, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, _gloffset_RenderbufferStorageEXT),
+    NAME_FUNC_OFFSET(13490, gl_dispatch_stub_768, gl_dispatch_stub_768, NULL, _gloffset_BlitFramebufferEXT),
+    NAME_FUNC_OFFSET(13511, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
+    NAME_FUNC_OFFSET(13540, gl_dispatch_stub_770, gl_dispatch_stub_770, NULL, _gloffset_StencilFuncSeparateATI),
+    NAME_FUNC_OFFSET(13565, gl_dispatch_stub_771, gl_dispatch_stub_771, NULL, _gloffset_ProgramEnvParameters4fvEXT),
+    NAME_FUNC_OFFSET(13594, gl_dispatch_stub_772, gl_dispatch_stub_772, NULL, _gloffset_ProgramLocalParameters4fvEXT),
+    NAME_FUNC_OFFSET(13625, gl_dispatch_stub_773, gl_dispatch_stub_773, NULL, _gloffset_GetQueryObjecti64vEXT),
+    NAME_FUNC_OFFSET(13649, gl_dispatch_stub_774, gl_dispatch_stub_774, NULL, _gloffset_GetQueryObjectui64vEXT),
+    NAME_FUNC_OFFSET(13674, glArrayElement, glArrayElement, NULL, _gloffset_ArrayElement),
+    NAME_FUNC_OFFSET(13692, glBindTexture, glBindTexture, NULL, _gloffset_BindTexture),
+    NAME_FUNC_OFFSET(13709, glDrawArrays, glDrawArrays, NULL, _gloffset_DrawArrays),
+    NAME_FUNC_OFFSET(13725, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, _gloffset_AreTexturesResident),
+    NAME_FUNC_OFFSET(13750, glCopyTexImage1D, glCopyTexImage1D, NULL, _gloffset_CopyTexImage1D),
+    NAME_FUNC_OFFSET(13770, glCopyTexImage2D, glCopyTexImage2D, NULL, _gloffset_CopyTexImage2D),
+    NAME_FUNC_OFFSET(13790, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, _gloffset_CopyTexSubImage1D),
+    NAME_FUNC_OFFSET(13813, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, _gloffset_CopyTexSubImage2D),
+    NAME_FUNC_OFFSET(13836, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, _gloffset_DeleteTextures),
+    NAME_FUNC_OFFSET(13856, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, _gloffset_GenTextures),
+    NAME_FUNC_OFFSET(13873, glGetPointerv, glGetPointerv, NULL, _gloffset_GetPointerv),
+    NAME_FUNC_OFFSET(13890, glIsTexture, glIsTextureEXT, glIsTextureEXT, _gloffset_IsTexture),
+    NAME_FUNC_OFFSET(13905, glPrioritizeTextures, glPrioritizeTextures, NULL, _gloffset_PrioritizeTextures),
+    NAME_FUNC_OFFSET(13929, glTexSubImage1D, glTexSubImage1D, NULL, _gloffset_TexSubImage1D),
+    NAME_FUNC_OFFSET(13948, glTexSubImage2D, glTexSubImage2D, NULL, _gloffset_TexSubImage2D),
+    NAME_FUNC_OFFSET(13967, glBlendColor, glBlendColor, NULL, _gloffset_BlendColor),
+    NAME_FUNC_OFFSET(13983, glBlendEquation, glBlendEquation, NULL, _gloffset_BlendEquation),
+    NAME_FUNC_OFFSET(14002, glDrawRangeElements, glDrawRangeElements, NULL, _gloffset_DrawRangeElements),
+    NAME_FUNC_OFFSET(14025, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
+    NAME_FUNC_OFFSET(14041, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
+    NAME_FUNC_OFFSET(14057, glColorTableParameterfv, glColorTableParameterfv, NULL, _gloffset_ColorTableParameterfv),
+    NAME_FUNC_OFFSET(14084, glColorTableParameteriv, glColorTableParameteriv, NULL, _gloffset_ColorTableParameteriv),
+    NAME_FUNC_OFFSET(14111, glCopyColorTable, glCopyColorTable, NULL, _gloffset_CopyColorTable),
+    NAME_FUNC_OFFSET(14131, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
+    NAME_FUNC_OFFSET(14150, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
+    NAME_FUNC_OFFSET(14169, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
+    NAME_FUNC_OFFSET(14199, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
+    NAME_FUNC_OFFSET(14229, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
+    NAME_FUNC_OFFSET(14259, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
+    NAME_FUNC_OFFSET(14289, glColorSubTable, glColorSubTable, NULL, _gloffset_ColorSubTable),
+    NAME_FUNC_OFFSET(14308, glCopyColorSubTable, glCopyColorSubTable, NULL, _gloffset_CopyColorSubTable),
+    NAME_FUNC_OFFSET(14331, glConvolutionFilter1D, glConvolutionFilter1D, NULL, _gloffset_ConvolutionFilter1D),
+    NAME_FUNC_OFFSET(14356, glConvolutionFilter2D, glConvolutionFilter2D, NULL, _gloffset_ConvolutionFilter2D),
+    NAME_FUNC_OFFSET(14381, glConvolutionParameterf, glConvolutionParameterf, NULL, _gloffset_ConvolutionParameterf),
+    NAME_FUNC_OFFSET(14408, glConvolutionParameterfv, glConvolutionParameterfv, NULL, _gloffset_ConvolutionParameterfv),
+    NAME_FUNC_OFFSET(14436, glConvolutionParameteri, glConvolutionParameteri, NULL, _gloffset_ConvolutionParameteri),
+    NAME_FUNC_OFFSET(14463, glConvolutionParameteriv, glConvolutionParameteriv, NULL, _gloffset_ConvolutionParameteriv),
+    NAME_FUNC_OFFSET(14491, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, _gloffset_CopyConvolutionFilter1D),
+    NAME_FUNC_OFFSET(14520, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, _gloffset_CopyConvolutionFilter2D),
+    NAME_FUNC_OFFSET(14549, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, _gloffset_GetConvolutionFilter),
+    NAME_FUNC_OFFSET(14575, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, _gloffset_GetConvolutionParameterfv),
+    NAME_FUNC_OFFSET(14606, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, _gloffset_GetConvolutionParameteriv),
+    NAME_FUNC_OFFSET(14637, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, _gloffset_GetSeparableFilter),
+    NAME_FUNC_OFFSET(14661, glSeparableFilter2D, glSeparableFilter2D, NULL, _gloffset_SeparableFilter2D),
+    NAME_FUNC_OFFSET(14684, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, _gloffset_GetHistogram),
+    NAME_FUNC_OFFSET(14702, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, _gloffset_GetHistogramParameterfv),
+    NAME_FUNC_OFFSET(14731, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, _gloffset_GetHistogramParameteriv),
+    NAME_FUNC_OFFSET(14760, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, _gloffset_GetMinmax),
+    NAME_FUNC_OFFSET(14775, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, _gloffset_GetMinmaxParameterfv),
+    NAME_FUNC_OFFSET(14801, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, _gloffset_GetMinmaxParameteriv),
+    NAME_FUNC_OFFSET(14827, glHistogram, glHistogram, NULL, _gloffset_Histogram),
+    NAME_FUNC_OFFSET(14842, glMinmax, glMinmax, NULL, _gloffset_Minmax),
+    NAME_FUNC_OFFSET(14854, glResetHistogram, glResetHistogram, NULL, _gloffset_ResetHistogram),
+    NAME_FUNC_OFFSET(14874, glResetMinmax, glResetMinmax, NULL, _gloffset_ResetMinmax),
+    NAME_FUNC_OFFSET(14891, glTexImage3D, glTexImage3D, NULL, _gloffset_TexImage3D),
+    NAME_FUNC_OFFSET(14907, glTexSubImage3D, glTexSubImage3D, NULL, _gloffset_TexSubImage3D),
+    NAME_FUNC_OFFSET(14926, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, _gloffset_CopyTexSubImage3D),
+    NAME_FUNC_OFFSET(14949, glActiveTextureARB, glActiveTextureARB, NULL, _gloffset_ActiveTextureARB),
+    NAME_FUNC_OFFSET(14965, glClientActiveTextureARB, glClientActiveTextureARB, NULL, _gloffset_ClientActiveTextureARB),
+    NAME_FUNC_OFFSET(14987, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL, _gloffset_MultiTexCoord1dARB),
+    NAME_FUNC_OFFSET(15005, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL, _gloffset_MultiTexCoord1dvARB),
+    NAME_FUNC_OFFSET(15024, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, _gloffset_MultiTexCoord1fARB),
+    NAME_FUNC_OFFSET(15042, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, _gloffset_MultiTexCoord1fvARB),
+    NAME_FUNC_OFFSET(15061, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL, _gloffset_MultiTexCoord1iARB),
+    NAME_FUNC_OFFSET(15079, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL, _gloffset_MultiTexCoord1ivARB),
+    NAME_FUNC_OFFSET(15098, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL, _gloffset_MultiTexCoord1sARB),
+    NAME_FUNC_OFFSET(15116, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL, _gloffset_MultiTexCoord1svARB),
+    NAME_FUNC_OFFSET(15135, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL, _gloffset_MultiTexCoord2dARB),
+    NAME_FUNC_OFFSET(15153, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL, _gloffset_MultiTexCoord2dvARB),
+    NAME_FUNC_OFFSET(15172, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, _gloffset_MultiTexCoord2fARB),
+    NAME_FUNC_OFFSET(15190, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, _gloffset_MultiTexCoord2fvARB),
+    NAME_FUNC_OFFSET(15209, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL, _gloffset_MultiTexCoord2iARB),
+    NAME_FUNC_OFFSET(15227, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL, _gloffset_MultiTexCoord2ivARB),
+    NAME_FUNC_OFFSET(15246, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL, _gloffset_MultiTexCoord2sARB),
+    NAME_FUNC_OFFSET(15264, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL, _gloffset_MultiTexCoord2svARB),
+    NAME_FUNC_OFFSET(15283, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL, _gloffset_MultiTexCoord3dARB),
+    NAME_FUNC_OFFSET(15301, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL, _gloffset_MultiTexCoord3dvARB),
+    NAME_FUNC_OFFSET(15320, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, _gloffset_MultiTexCoord3fARB),
+    NAME_FUNC_OFFSET(15338, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, _gloffset_MultiTexCoord3fvARB),
+    NAME_FUNC_OFFSET(15357, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL, _gloffset_MultiTexCoord3iARB),
+    NAME_FUNC_OFFSET(15375, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL, _gloffset_MultiTexCoord3ivARB),
+    NAME_FUNC_OFFSET(15394, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL, _gloffset_MultiTexCoord3sARB),
+    NAME_FUNC_OFFSET(15412, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL, _gloffset_MultiTexCoord3svARB),
+    NAME_FUNC_OFFSET(15431, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL, _gloffset_MultiTexCoord4dARB),
+    NAME_FUNC_OFFSET(15449, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL, _gloffset_MultiTexCoord4dvARB),
+    NAME_FUNC_OFFSET(15468, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, _gloffset_MultiTexCoord4fARB),
+    NAME_FUNC_OFFSET(15486, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, _gloffset_MultiTexCoord4fvARB),
+    NAME_FUNC_OFFSET(15505, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL, _gloffset_MultiTexCoord4iARB),
+    NAME_FUNC_OFFSET(15523, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL, _gloffset_MultiTexCoord4ivARB),
+    NAME_FUNC_OFFSET(15542, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL, _gloffset_MultiTexCoord4sARB),
+    NAME_FUNC_OFFSET(15560, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL, _gloffset_MultiTexCoord4svARB),
+    NAME_FUNC_OFFSET(15579, glStencilOpSeparate, glStencilOpSeparate, NULL, _gloffset_StencilOpSeparate),
+    NAME_FUNC_OFFSET(15602, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, _gloffset_LoadTransposeMatrixdARB),
+    NAME_FUNC_OFFSET(15625, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, _gloffset_LoadTransposeMatrixfARB),
+    NAME_FUNC_OFFSET(15648, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, _gloffset_MultTransposeMatrixdARB),
+    NAME_FUNC_OFFSET(15671, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB, NULL, _gloffset_MultTransposeMatrixfARB),
+    NAME_FUNC_OFFSET(15694, glSampleCoverageARB, glSampleCoverageARB, NULL, _gloffset_SampleCoverageARB),
+    NAME_FUNC_OFFSET(15711, glCompressedTexImage1DARB, glCompressedTexImage1DARB, NULL, _gloffset_CompressedTexImage1DARB),
+    NAME_FUNC_OFFSET(15734, glCompressedTexImage2DARB, glCompressedTexImage2DARB, NULL, _gloffset_CompressedTexImage2DARB),
+    NAME_FUNC_OFFSET(15757, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, _gloffset_CompressedTexImage3DARB),
+    NAME_FUNC_OFFSET(15780, glCompressedTexSubImage1DARB, glCompressedTexSubImage1DARB, NULL, _gloffset_CompressedTexSubImage1DARB),
+    NAME_FUNC_OFFSET(15806, glCompressedTexSubImage2DARB, glCompressedTexSubImage2DARB, NULL, _gloffset_CompressedTexSubImage2DARB),
+    NAME_FUNC_OFFSET(15832, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, _gloffset_CompressedTexSubImage3DARB),
+    NAME_FUNC_OFFSET(15858, glGetCompressedTexImageARB, glGetCompressedTexImageARB, NULL, _gloffset_GetCompressedTexImageARB),
+    NAME_FUNC_OFFSET(15882, glDisableVertexAttribArrayARB, glDisableVertexAttribArrayARB, NULL, _gloffset_DisableVertexAttribArrayARB),
+    NAME_FUNC_OFFSET(15909, glEnableVertexAttribArrayARB, glEnableVertexAttribArrayARB, NULL, _gloffset_EnableVertexAttribArrayARB),
+    NAME_FUNC_OFFSET(15935, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL, _gloffset_GetVertexAttribdvARB),
+    NAME_FUNC_OFFSET(15955, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL, _gloffset_GetVertexAttribfvARB),
+    NAME_FUNC_OFFSET(15975, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL, _gloffset_GetVertexAttribivARB),
+    NAME_FUNC_OFFSET(15995, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, _gloffset_ProgramEnvParameter4dARB),
+    NAME_FUNC_OFFSET(16018, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, _gloffset_ProgramEnvParameter4dvARB),
+    NAME_FUNC_OFFSET(16042, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, _gloffset_ProgramEnvParameter4fARB),
+    NAME_FUNC_OFFSET(16065, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, _gloffset_ProgramEnvParameter4fvARB),
+    NAME_FUNC_OFFSET(16089, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, _gloffset_VertexAttrib1dARB),
+    NAME_FUNC_OFFSET(16106, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL, _gloffset_VertexAttrib1dvARB),
+    NAME_FUNC_OFFSET(16124, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, _gloffset_VertexAttrib1fARB),
+    NAME_FUNC_OFFSET(16141, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, _gloffset_VertexAttrib1fvARB),
+    NAME_FUNC_OFFSET(16159, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, _gloffset_VertexAttrib1sARB),
+    NAME_FUNC_OFFSET(16176, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL, _gloffset_VertexAttrib1svARB),
+    NAME_FUNC_OFFSET(16194, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, _gloffset_VertexAttrib2dARB),
+    NAME_FUNC_OFFSET(16211, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL, _gloffset_VertexAttrib2dvARB),
+    NAME_FUNC_OFFSET(16229, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, _gloffset_VertexAttrib2fARB),
+    NAME_FUNC_OFFSET(16246, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, _gloffset_VertexAttrib2fvARB),
+    NAME_FUNC_OFFSET(16264, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, _gloffset_VertexAttrib2sARB),
+    NAME_FUNC_OFFSET(16281, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL, _gloffset_VertexAttrib2svARB),
+    NAME_FUNC_OFFSET(16299, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, _gloffset_VertexAttrib3dARB),
+    NAME_FUNC_OFFSET(16316, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL, _gloffset_VertexAttrib3dvARB),
+    NAME_FUNC_OFFSET(16334, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, _gloffset_VertexAttrib3fARB),
+    NAME_FUNC_OFFSET(16351, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, _gloffset_VertexAttrib3fvARB),
+    NAME_FUNC_OFFSET(16369, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, _gloffset_VertexAttrib3sARB),
+    NAME_FUNC_OFFSET(16386, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL, _gloffset_VertexAttrib3svARB),
+    NAME_FUNC_OFFSET(16404, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL, _gloffset_VertexAttrib4NbvARB),
+    NAME_FUNC_OFFSET(16423, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL, _gloffset_VertexAttrib4NivARB),
+    NAME_FUNC_OFFSET(16442, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL, _gloffset_VertexAttrib4NsvARB),
+    NAME_FUNC_OFFSET(16461, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL, _gloffset_VertexAttrib4NubARB),
+    NAME_FUNC_OFFSET(16480, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, _gloffset_VertexAttrib4NubvARB),
+    NAME_FUNC_OFFSET(16500, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, _gloffset_VertexAttrib4NuivARB),
+    NAME_FUNC_OFFSET(16520, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, _gloffset_VertexAttrib4NusvARB),
+    NAME_FUNC_OFFSET(16540, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, _gloffset_VertexAttrib4bvARB),
+    NAME_FUNC_OFFSET(16558, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, _gloffset_VertexAttrib4dARB),
+    NAME_FUNC_OFFSET(16575, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, _gloffset_VertexAttrib4dvARB),
+    NAME_FUNC_OFFSET(16593, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, _gloffset_VertexAttrib4fARB),
+    NAME_FUNC_OFFSET(16610, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, _gloffset_VertexAttrib4fvARB),
+    NAME_FUNC_OFFSET(16628, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, _gloffset_VertexAttrib4ivARB),
+    NAME_FUNC_OFFSET(16646, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, _gloffset_VertexAttrib4sARB),
+    NAME_FUNC_OFFSET(16663, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, _gloffset_VertexAttrib4svARB),
+    NAME_FUNC_OFFSET(16681, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, _gloffset_VertexAttrib4ubvARB),
+    NAME_FUNC_OFFSET(16700, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, _gloffset_VertexAttrib4uivARB),
+    NAME_FUNC_OFFSET(16719, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, _gloffset_VertexAttrib4usvARB),
+    NAME_FUNC_OFFSET(16738, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, _gloffset_VertexAttribPointerARB),
+    NAME_FUNC_OFFSET(16760, glBindBufferARB, glBindBufferARB, NULL, _gloffset_BindBufferARB),
+    NAME_FUNC_OFFSET(16773, glBufferDataARB, glBufferDataARB, NULL, _gloffset_BufferDataARB),
+    NAME_FUNC_OFFSET(16786, glBufferSubDataARB, glBufferSubDataARB, NULL, _gloffset_BufferSubDataARB),
+    NAME_FUNC_OFFSET(16802, glDeleteBuffersARB, glDeleteBuffersARB, NULL, _gloffset_DeleteBuffersARB),
+    NAME_FUNC_OFFSET(16818, glGenBuffersARB, glGenBuffersARB, NULL, _gloffset_GenBuffersARB),
+    NAME_FUNC_OFFSET(16831, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, _gloffset_GetBufferParameterivARB),
+    NAME_FUNC_OFFSET(16854, glGetBufferPointervARB, glGetBufferPointervARB, NULL, _gloffset_GetBufferPointervARB),
+    NAME_FUNC_OFFSET(16874, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, _gloffset_GetBufferSubDataARB),
+    NAME_FUNC_OFFSET(16893, glIsBufferARB, glIsBufferARB, NULL, _gloffset_IsBufferARB),
+    NAME_FUNC_OFFSET(16904, glMapBufferARB, glMapBufferARB, NULL, _gloffset_MapBufferARB),
+    NAME_FUNC_OFFSET(16916, glUnmapBufferARB, glUnmapBufferARB, NULL, _gloffset_UnmapBufferARB),
+    NAME_FUNC_OFFSET(16930, glBeginQueryARB, glBeginQueryARB, NULL, _gloffset_BeginQueryARB),
+    NAME_FUNC_OFFSET(16943, glDeleteQueriesARB, glDeleteQueriesARB, NULL, _gloffset_DeleteQueriesARB),
+    NAME_FUNC_OFFSET(16959, glEndQueryARB, glEndQueryARB, NULL, _gloffset_EndQueryARB),
+    NAME_FUNC_OFFSET(16970, glGenQueriesARB, glGenQueriesARB, NULL, _gloffset_GenQueriesARB),
+    NAME_FUNC_OFFSET(16983, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, _gloffset_GetQueryObjectivARB),
+    NAME_FUNC_OFFSET(17002, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, _gloffset_GetQueryObjectuivARB),
+    NAME_FUNC_OFFSET(17022, glGetQueryivARB, glGetQueryivARB, NULL, _gloffset_GetQueryivARB),
+    NAME_FUNC_OFFSET(17035, glIsQueryARB, glIsQueryARB, NULL, _gloffset_IsQueryARB),
+    NAME_FUNC_OFFSET(17045, glCompileShaderARB, glCompileShaderARB, NULL, _gloffset_CompileShaderARB),
+    NAME_FUNC_OFFSET(17061, glGetActiveUniformARB, glGetActiveUniformARB, NULL, _gloffset_GetActiveUniformARB),
+    NAME_FUNC_OFFSET(17080, glGetShaderSourceARB, glGetShaderSourceARB, NULL, _gloffset_GetShaderSourceARB),
+    NAME_FUNC_OFFSET(17098, glGetUniformLocationARB, glGetUniformLocationARB, NULL, _gloffset_GetUniformLocationARB),
+    NAME_FUNC_OFFSET(17119, glGetUniformfvARB, glGetUniformfvARB, NULL, _gloffset_GetUniformfvARB),
+    NAME_FUNC_OFFSET(17134, glGetUniformivARB, glGetUniformivARB, NULL, _gloffset_GetUniformivARB),
+    NAME_FUNC_OFFSET(17149, glLinkProgramARB, glLinkProgramARB, NULL, _gloffset_LinkProgramARB),
+    NAME_FUNC_OFFSET(17163, glShaderSourceARB, glShaderSourceARB, NULL, _gloffset_ShaderSourceARB),
+    NAME_FUNC_OFFSET(17178, glUniform1fARB, glUniform1fARB, NULL, _gloffset_Uniform1fARB),
+    NAME_FUNC_OFFSET(17190, glUniform1fvARB, glUniform1fvARB, NULL, _gloffset_Uniform1fvARB),
+    NAME_FUNC_OFFSET(17203, glUniform1iARB, glUniform1iARB, NULL, _gloffset_Uniform1iARB),
+    NAME_FUNC_OFFSET(17215, glUniform1ivARB, glUniform1ivARB, NULL, _gloffset_Uniform1ivARB),
+    NAME_FUNC_OFFSET(17228, glUniform2fARB, glUniform2fARB, NULL, _gloffset_Uniform2fARB),
+    NAME_FUNC_OFFSET(17240, glUniform2fvARB, glUniform2fvARB, NULL, _gloffset_Uniform2fvARB),
+    NAME_FUNC_OFFSET(17253, glUniform2iARB, glUniform2iARB, NULL, _gloffset_Uniform2iARB),
+    NAME_FUNC_OFFSET(17265, glUniform2ivARB, glUniform2ivARB, NULL, _gloffset_Uniform2ivARB),
+    NAME_FUNC_OFFSET(17278, glUniform3fARB, glUniform3fARB, NULL, _gloffset_Uniform3fARB),
+    NAME_FUNC_OFFSET(17290, glUniform3fvARB, glUniform3fvARB, NULL, _gloffset_Uniform3fvARB),
+    NAME_FUNC_OFFSET(17303, glUniform3iARB, glUniform3iARB, NULL, _gloffset_Uniform3iARB),
+    NAME_FUNC_OFFSET(17315, glUniform3ivARB, glUniform3ivARB, NULL, _gloffset_Uniform3ivARB),
+    NAME_FUNC_OFFSET(17328, glUniform4fARB, glUniform4fARB, NULL, _gloffset_Uniform4fARB),
+    NAME_FUNC_OFFSET(17340, glUniform4fvARB, glUniform4fvARB, NULL, _gloffset_Uniform4fvARB),
+    NAME_FUNC_OFFSET(17353, glUniform4iARB, glUniform4iARB, NULL, _gloffset_Uniform4iARB),
+    NAME_FUNC_OFFSET(17365, glUniform4ivARB, glUniform4ivARB, NULL, _gloffset_Uniform4ivARB),
+    NAME_FUNC_OFFSET(17378, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, _gloffset_UniformMatrix2fvARB),
+    NAME_FUNC_OFFSET(17397, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, _gloffset_UniformMatrix3fvARB),
+    NAME_FUNC_OFFSET(17416, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, _gloffset_UniformMatrix4fvARB),
+    NAME_FUNC_OFFSET(17435, glUseProgramObjectARB, glUseProgramObjectARB, NULL, _gloffset_UseProgramObjectARB),
+    NAME_FUNC_OFFSET(17448, glValidateProgramARB, glValidateProgramARB, NULL, _gloffset_ValidateProgramARB),
+    NAME_FUNC_OFFSET(17466, glBindAttribLocationARB, glBindAttribLocationARB, NULL, _gloffset_BindAttribLocationARB),
+    NAME_FUNC_OFFSET(17487, glGetActiveAttribARB, glGetActiveAttribARB, NULL, _gloffset_GetActiveAttribARB),
+    NAME_FUNC_OFFSET(17505, glGetAttribLocationARB, glGetAttribLocationARB, NULL, _gloffset_GetAttribLocationARB),
+    NAME_FUNC_OFFSET(17525, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
+    NAME_FUNC_OFFSET(17539, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
+    NAME_FUNC_OFFSET(17556, gl_dispatch_stub_569, gl_dispatch_stub_569, NULL, _gloffset_SampleMaskSGIS),
+    NAME_FUNC_OFFSET(17572, gl_dispatch_stub_570, gl_dispatch_stub_570, NULL, _gloffset_SamplePatternSGIS),
+    NAME_FUNC_OFFSET(17591, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(17609, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(17630, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(17652, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(17671, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(17693, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(17716, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
+    NAME_FUNC_OFFSET(17735, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
+    NAME_FUNC_OFFSET(17755, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
+    NAME_FUNC_OFFSET(17774, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
+    NAME_FUNC_OFFSET(17794, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
+    NAME_FUNC_OFFSET(17813, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
+    NAME_FUNC_OFFSET(17833, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
+    NAME_FUNC_OFFSET(17852, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
+    NAME_FUNC_OFFSET(17872, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
+    NAME_FUNC_OFFSET(17891, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
+    NAME_FUNC_OFFSET(17911, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
+    NAME_FUNC_OFFSET(17931, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
+    NAME_FUNC_OFFSET(17952, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
+    NAME_FUNC_OFFSET(17972, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
+    NAME_FUNC_OFFSET(17993, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
+    NAME_FUNC_OFFSET(18013, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
+    NAME_FUNC_OFFSET(18034, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
+    NAME_FUNC_OFFSET(18058, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
+    NAME_FUNC_OFFSET(18076, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
+    NAME_FUNC_OFFSET(18096, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
+    NAME_FUNC_OFFSET(18114, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
+    NAME_FUNC_OFFSET(18126, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
+    NAME_FUNC_OFFSET(18139, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
+    NAME_FUNC_OFFSET(18151, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
+    NAME_FUNC_OFFSET(18164, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
+    NAME_FUNC_OFFSET(18184, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
+    NAME_FUNC_OFFSET(18208, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
+    NAME_FUNC_OFFSET(18222, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
+    NAME_FUNC_OFFSET(18239, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
+    NAME_FUNC_OFFSET(18254, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
+    NAME_FUNC_OFFSET(18272, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
+    NAME_FUNC_OFFSET(18286, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
+    NAME_FUNC_OFFSET(18303, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
+    NAME_FUNC_OFFSET(18318, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
+    NAME_FUNC_OFFSET(18336, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
+    NAME_FUNC_OFFSET(18350, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
+    NAME_FUNC_OFFSET(18367, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
+    NAME_FUNC_OFFSET(18382, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
+    NAME_FUNC_OFFSET(18400, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
+    NAME_FUNC_OFFSET(18414, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
+    NAME_FUNC_OFFSET(18431, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
+    NAME_FUNC_OFFSET(18446, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
+    NAME_FUNC_OFFSET(18464, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
+    NAME_FUNC_OFFSET(18478, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
+    NAME_FUNC_OFFSET(18495, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
+    NAME_FUNC_OFFSET(18510, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
+    NAME_FUNC_OFFSET(18528, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
+    NAME_FUNC_OFFSET(18542, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
+    NAME_FUNC_OFFSET(18559, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
+    NAME_FUNC_OFFSET(18574, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
+    NAME_FUNC_OFFSET(18592, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
+    NAME_FUNC_OFFSET(18606, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
+    NAME_FUNC_OFFSET(18623, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
+    NAME_FUNC_OFFSET(18638, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
+    NAME_FUNC_OFFSET(18656, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
+    NAME_FUNC_OFFSET(18670, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
+    NAME_FUNC_OFFSET(18687, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
+    NAME_FUNC_OFFSET(18702, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
+    NAME_FUNC_OFFSET(18720, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
+    NAME_FUNC_OFFSET(18737, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
+    NAME_FUNC_OFFSET(18757, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
+    NAME_FUNC_OFFSET(18774, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
+    NAME_FUNC_OFFSET(18800, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
+    NAME_FUNC_OFFSET(18829, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
+    NAME_FUNC_OFFSET(18844, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
+    NAME_FUNC_OFFSET(18862, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
+    NAME_FUNC_OFFSET(18881, gl_dispatch_stub_750, gl_dispatch_stub_750, NULL, _gloffset_BlendEquationSeparateEXT),
+    NAME_FUNC_OFFSET(18905, gl_dispatch_stub_750, gl_dispatch_stub_750, NULL, _gloffset_BlendEquationSeparateEXT),
+    NAME_FUNC_OFFSET(18932, glBindFramebufferEXT, glBindFramebufferEXT, NULL, _gloffset_BindFramebufferEXT),
+    NAME_FUNC_OFFSET(18950, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, _gloffset_BindRenderbufferEXT),
+    NAME_FUNC_OFFSET(18969, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, _gloffset_CheckFramebufferStatusEXT),
+    NAME_FUNC_OFFSET(18994, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, _gloffset_DeleteFramebuffersEXT),
+    NAME_FUNC_OFFSET(19015, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, _gloffset_DeleteRenderbuffersEXT),
+    NAME_FUNC_OFFSET(19037, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, _gloffset_FramebufferRenderbufferEXT),
+    NAME_FUNC_OFFSET(19063, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, _gloffset_FramebufferTexture1DEXT),
+    NAME_FUNC_OFFSET(19086, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, _gloffset_FramebufferTexture2DEXT),
+    NAME_FUNC_OFFSET(19109, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, _gloffset_FramebufferTexture3DEXT),
+    NAME_FUNC_OFFSET(19132, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, _gloffset_GenFramebuffersEXT),
+    NAME_FUNC_OFFSET(19150, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, _gloffset_GenRenderbuffersEXT),
+    NAME_FUNC_OFFSET(19169, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, _gloffset_GenerateMipmapEXT),
+    NAME_FUNC_OFFSET(19186, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, _gloffset_GetFramebufferAttachmentParameterivEXT),
+    NAME_FUNC_OFFSET(19224, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, _gloffset_GetRenderbufferParameterivEXT),
+    NAME_FUNC_OFFSET(19253, glIsFramebufferEXT, glIsFramebufferEXT, NULL, _gloffset_IsFramebufferEXT),
+    NAME_FUNC_OFFSET(19269, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, _gloffset_IsRenderbufferEXT),
+    NAME_FUNC_OFFSET(19286, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, _gloffset_RenderbufferStorageEXT),
+    NAME_FUNC_OFFSET(19308, gl_dispatch_stub_768, gl_dispatch_stub_768, NULL, _gloffset_BlitFramebufferEXT),
+    NAME_FUNC_OFFSET(19326, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
     NAME_FUNC_OFFSET(-1, NULL, NULL, NULL, 0)
 };
 
diff --git a/src/mesa/main/enums.c b/src/mesa/main/enums.c
index ca5db92265..e63a04e915 100644
--- a/src/mesa/main/enums.c
+++ b/src/mesa/main/enums.c
@@ -146,6 +146,12 @@ LONGSTRING static const char enum_string_table[] =
    "GL_BUFFER_SIZE_ARB\0"
    "GL_BUFFER_USAGE\0"
    "GL_BUFFER_USAGE_ARB\0"
+   "GL_BUMP_ENVMAP_ATI\0"
+   "GL_BUMP_NUM_TEX_UNITS_ATI\0"
+   "GL_BUMP_ROT_MATRIX_ATI\0"
+   "GL_BUMP_ROT_MATRIX_SIZE_ATI\0"
+   "GL_BUMP_TARGET_ATI\0"
+   "GL_BUMP_TEX_UNITS_ATI\0"
    "GL_BYTE\0"
    "GL_C3F_V3F\0"
    "GL_C4F_N3F_V3F\0"
@@ -464,6 +470,8 @@ LONGSTRING static const char enum_string_table[] =
    "GL_DRAW_PIXEL_TOKEN\0"
    "GL_DST_ALPHA\0"
    "GL_DST_COLOR\0"
+   "GL_DU8DV8_ATI\0"
+   "GL_DUDV_ATI\0"
    "GL_DYNAMIC_COPY\0"
    "GL_DYNAMIC_COPY_ARB\0"
    "GL_DYNAMIC_DRAW\0"
@@ -1848,7 +1856,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_ZOOM_Y\0"
    ;
 
-static const enum_elt all_enums[1810] =
+static const enum_elt all_enums[1818] =
 {
    {     0, 0x00000600 }, /* GL_2D */
    {     6, 0x00001407 }, /* GL_2_BYTES */
@@ -1960,3017 +1968,3033 @@ static const enum_elt all_enums[1810] =
    {  1766, 0x00008764 }, /* GL_BUFFER_SIZE_ARB */
    {  1785, 0x00008765 }, /* GL_BUFFER_USAGE */
    {  1801, 0x00008765 }, /* GL_BUFFER_USAGE_ARB */
-   {  1821, 0x00001400 }, /* GL_BYTE */
-   {  1829, 0x00002A24 }, /* GL_C3F_V3F */
-   {  1840, 0x00002A26 }, /* GL_C4F_N3F_V3F */
-   {  1855, 0x00002A22 }, /* GL_C4UB_V2F */
-   {  1867, 0x00002A23 }, /* GL_C4UB_V3F */
-   {  1879, 0x00000901 }, /* GL_CCW */
-   {  1886, 0x00002900 }, /* GL_CLAMP */
-   {  1895, 0x0000812D }, /* GL_CLAMP_TO_BORDER */
-   {  1914, 0x0000812D }, /* GL_CLAMP_TO_BORDER_ARB */
-   {  1937, 0x0000812D }, /* GL_CLAMP_TO_BORDER_SGIS */
-   {  1961, 0x0000812F }, /* GL_CLAMP_TO_EDGE */
-   {  1978, 0x0000812F }, /* GL_CLAMP_TO_EDGE_SGIS */
-   {  2000, 0x00001500 }, /* GL_CLEAR */
-   {  2009, 0x000084E1 }, /* GL_CLIENT_ACTIVE_TEXTURE */
-   {  2034, 0x000084E1 }, /* GL_CLIENT_ACTIVE_TEXTURE_ARB */
-   {  2063, 0xFFFFFFFF }, /* GL_CLIENT_ALL_ATTRIB_BITS */
-   {  2089, 0x00000BB1 }, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
-   {  2118, 0x00000001 }, /* GL_CLIENT_PIXEL_STORE_BIT */
-   {  2144, 0x00000002 }, /* GL_CLIENT_VERTEX_ARRAY_BIT */
-   {  2171, 0x00003000 }, /* GL_CLIP_PLANE0 */
-   {  2186, 0x00003001 }, /* GL_CLIP_PLANE1 */
-   {  2201, 0x00003002 }, /* GL_CLIP_PLANE2 */
-   {  2216, 0x00003003 }, /* GL_CLIP_PLANE3 */
-   {  2231, 0x00003004 }, /* GL_CLIP_PLANE4 */
-   {  2246, 0x00003005 }, /* GL_CLIP_PLANE5 */
-   {  2261, 0x000080F0 }, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
-   {  2294, 0x00000A00 }, /* GL_COEFF */
-   {  2303, 0x00001800 }, /* GL_COLOR */
-   {  2312, 0x00008076 }, /* GL_COLOR_ARRAY */
-   {  2327, 0x00008898 }, /* GL_COLOR_ARRAY_BUFFER_BINDING */
-   {  2357, 0x00008898 }, /* GL_COLOR_ARRAY_BUFFER_BINDING_ARB */
-   {  2391, 0x00008090 }, /* GL_COLOR_ARRAY_POINTER */
-   {  2414, 0x00008081 }, /* GL_COLOR_ARRAY_SIZE */
-   {  2434, 0x00008083 }, /* GL_COLOR_ARRAY_STRIDE */
-   {  2456, 0x00008082 }, /* GL_COLOR_ARRAY_TYPE */
-   {  2476, 0x00008CE0 }, /* GL_COLOR_ATTACHMENT0 */
-   {  2497, 0x00008CE0 }, /* GL_COLOR_ATTACHMENT0_EXT */
-   {  2522, 0x00008CE1 }, /* GL_COLOR_ATTACHMENT1 */
-   {  2543, 0x00008CEA }, /* GL_COLOR_ATTACHMENT10 */
-   {  2565, 0x00008CEA }, /* GL_COLOR_ATTACHMENT10_EXT */
-   {  2591, 0x00008CEB }, /* GL_COLOR_ATTACHMENT11 */
-   {  2613, 0x00008CEB }, /* GL_COLOR_ATTACHMENT11_EXT */
-   {  2639, 0x00008CEC }, /* GL_COLOR_ATTACHMENT12 */
-   {  2661, 0x00008CEC }, /* GL_COLOR_ATTACHMENT12_EXT */
-   {  2687, 0x00008CED }, /* GL_COLOR_ATTACHMENT13 */
-   {  2709, 0x00008CED }, /* GL_COLOR_ATTACHMENT13_EXT */
-   {  2735, 0x00008CEE }, /* GL_COLOR_ATTACHMENT14 */
-   {  2757, 0x00008CEE }, /* GL_COLOR_ATTACHMENT14_EXT */
-   {  2783, 0x00008CEF }, /* GL_COLOR_ATTACHMENT15 */
-   {  2805, 0x00008CEF }, /* GL_COLOR_ATTACHMENT15_EXT */
-   {  2831, 0x00008CE1 }, /* GL_COLOR_ATTACHMENT1_EXT */
-   {  2856, 0x00008CE2 }, /* GL_COLOR_ATTACHMENT2 */
-   {  2877, 0x00008CE2 }, /* GL_COLOR_ATTACHMENT2_EXT */
-   {  2902, 0x00008CE3 }, /* GL_COLOR_ATTACHMENT3 */
-   {  2923, 0x00008CE3 }, /* GL_COLOR_ATTACHMENT3_EXT */
-   {  2948, 0x00008CE4 }, /* GL_COLOR_ATTACHMENT4 */
-   {  2969, 0x00008CE4 }, /* GL_COLOR_ATTACHMENT4_EXT */
-   {  2994, 0x00008CE5 }, /* GL_COLOR_ATTACHMENT5 */
-   {  3015, 0x00008CE5 }, /* GL_COLOR_ATTACHMENT5_EXT */
-   {  3040, 0x00008CE6 }, /* GL_COLOR_ATTACHMENT6 */
-   {  3061, 0x00008CE6 }, /* GL_COLOR_ATTACHMENT6_EXT */
-   {  3086, 0x00008CE7 }, /* GL_COLOR_ATTACHMENT7 */
-   {  3107, 0x00008CE7 }, /* GL_COLOR_ATTACHMENT7_EXT */
-   {  3132, 0x00008CE8 }, /* GL_COLOR_ATTACHMENT8 */
-   {  3153, 0x00008CE8 }, /* GL_COLOR_ATTACHMENT8_EXT */
-   {  3178, 0x00008CE9 }, /* GL_COLOR_ATTACHMENT9 */
-   {  3199, 0x00008CE9 }, /* GL_COLOR_ATTACHMENT9_EXT */
-   {  3224, 0x00004000 }, /* GL_COLOR_BUFFER_BIT */
-   {  3244, 0x00000C22 }, /* GL_COLOR_CLEAR_VALUE */
-   {  3265, 0x00001900 }, /* GL_COLOR_INDEX */
-   {  3280, 0x00001603 }, /* GL_COLOR_INDEXES */
-   {  3297, 0x00000BF2 }, /* GL_COLOR_LOGIC_OP */
-   {  3315, 0x00000B57 }, /* GL_COLOR_MATERIAL */
-   {  3333, 0x00000B55 }, /* GL_COLOR_MATERIAL_FACE */
-   {  3356, 0x00000B56 }, /* GL_COLOR_MATERIAL_PARAMETER */
-   {  3384, 0x000080B1 }, /* GL_COLOR_MATRIX */
-   {  3400, 0x000080B1 }, /* GL_COLOR_MATRIX_SGI */
-   {  3420, 0x000080B2 }, /* GL_COLOR_MATRIX_STACK_DEPTH */
-   {  3448, 0x000080B2 }, /* GL_COLOR_MATRIX_STACK_DEPTH_SGI */
-   {  3480, 0x00008458 }, /* GL_COLOR_SUM */
-   {  3493, 0x00008458 }, /* GL_COLOR_SUM_ARB */
-   {  3510, 0x000080D0 }, /* GL_COLOR_TABLE */
-   {  3525, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE */
-   {  3551, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE_EXT */
-   {  3581, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE_SGI */
-   {  3611, 0x000080D7 }, /* GL_COLOR_TABLE_BIAS */
-   {  3631, 0x000080D7 }, /* GL_COLOR_TABLE_BIAS_SGI */
-   {  3655, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE */
-   {  3680, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE_EXT */
-   {  3709, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE_SGI */
-   {  3738, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT */
-   {  3760, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT_EXT */
-   {  3786, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT_SGI */
-   {  3812, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE */
-   {  3838, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE_EXT */
-   {  3868, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE_SGI */
-   {  3898, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE */
-   {  3928, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE_EXT */
-   {  3962, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE_SGI */
-   {  3996, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE */
-   {  4026, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE_EXT */
-   {  4060, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE_SGI */
-   {  4094, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE */
-   {  4118, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE_EXT */
-   {  4146, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE_SGI */
-   {  4174, 0x000080D6 }, /* GL_COLOR_TABLE_SCALE */
-   {  4195, 0x000080D6 }, /* GL_COLOR_TABLE_SCALE_SGI */
-   {  4220, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH */
-   {  4241, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH_EXT */
-   {  4266, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH_SGI */
-   {  4291, 0x00000C23 }, /* GL_COLOR_WRITEMASK */
-   {  4310, 0x00008570 }, /* GL_COMBINE */
-   {  4321, 0x00008503 }, /* GL_COMBINE4 */
-   {  4333, 0x00008572 }, /* GL_COMBINE_ALPHA */
-   {  4350, 0x00008572 }, /* GL_COMBINE_ALPHA_ARB */
-   {  4371, 0x00008572 }, /* GL_COMBINE_ALPHA_EXT */
-   {  4392, 0x00008570 }, /* GL_COMBINE_ARB */
-   {  4407, 0x00008570 }, /* GL_COMBINE_EXT */
-   {  4422, 0x00008571 }, /* GL_COMBINE_RGB */
-   {  4437, 0x00008571 }, /* GL_COMBINE_RGB_ARB */
-   {  4456, 0x00008571 }, /* GL_COMBINE_RGB_EXT */
-   {  4475, 0x0000884E }, /* GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT */
-   {  4511, 0x0000884E }, /* GL_COMPARE_R_TO_TEXTURE */
-   {  4535, 0x0000884E }, /* GL_COMPARE_R_TO_TEXTURE_ARB */
-   {  4563, 0x00001300 }, /* GL_COMPILE */
-   {  4574, 0x00001301 }, /* GL_COMPILE_AND_EXECUTE */
-   {  4597, 0x00008B81 }, /* GL_COMPILE_STATUS */
-   {  4615, 0x000084E9 }, /* GL_COMPRESSED_ALPHA */
-   {  4635, 0x000084E9 }, /* GL_COMPRESSED_ALPHA_ARB */
-   {  4659, 0x000084EC }, /* GL_COMPRESSED_INTENSITY */
-   {  4683, 0x000084EC }, /* GL_COMPRESSED_INTENSITY_ARB */
-   {  4711, 0x000084EA }, /* GL_COMPRESSED_LUMINANCE */
-   {  4735, 0x000084EB }, /* GL_COMPRESSED_LUMINANCE_ALPHA */
-   {  4765, 0x000084EB }, /* GL_COMPRESSED_LUMINANCE_ALPHA_ARB */
-   {  4799, 0x000084EA }, /* GL_COMPRESSED_LUMINANCE_ARB */
-   {  4827, 0x000084ED }, /* GL_COMPRESSED_RGB */
-   {  4845, 0x000084EE }, /* GL_COMPRESSED_RGBA */
-   {  4864, 0x000084EE }, /* GL_COMPRESSED_RGBA_ARB */
-   {  4887, 0x000086B1 }, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
-   {  4916, 0x000083F1 }, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
-   {  4949, 0x000083F2 }, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
-   {  4982, 0x000083F3 }, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */
-   {  5015, 0x000084ED }, /* GL_COMPRESSED_RGB_ARB */
-   {  5037, 0x000086B0 }, /* GL_COMPRESSED_RGB_FXT1_3DFX */
-   {  5065, 0x000083F0 }, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
-   {  5097, 0x000086A3 }, /* GL_COMPRESSED_TEXTURE_FORMATS */
-   {  5127, 0x00008576 }, /* GL_CONSTANT */
-   {  5139, 0x00008003 }, /* GL_CONSTANT_ALPHA */
-   {  5157, 0x00008003 }, /* GL_CONSTANT_ALPHA_EXT */
-   {  5179, 0x00008576 }, /* GL_CONSTANT_ARB */
-   {  5195, 0x00001207 }, /* GL_CONSTANT_ATTENUATION */
-   {  5219, 0x00008151 }, /* GL_CONSTANT_BORDER_HP */
-   {  5241, 0x00008001 }, /* GL_CONSTANT_COLOR */
-   {  5259, 0x00008001 }, /* GL_CONSTANT_COLOR_EXT */
-   {  5281, 0x00008576 }, /* GL_CONSTANT_EXT */
-   {  5297, 0x00008010 }, /* GL_CONVOLUTION_1D */
-   {  5315, 0x00008011 }, /* GL_CONVOLUTION_2D */
-   {  5333, 0x00008154 }, /* GL_CONVOLUTION_BORDER_COLOR */
-   {  5361, 0x00008154 }, /* GL_CONVOLUTION_BORDER_COLOR_HP */
-   {  5392, 0x00008013 }, /* GL_CONVOLUTION_BORDER_MODE */
-   {  5419, 0x00008013 }, /* GL_CONVOLUTION_BORDER_MODE_EXT */
-   {  5450, 0x00008015 }, /* GL_CONVOLUTION_FILTER_BIAS */
-   {  5477, 0x00008015 }, /* GL_CONVOLUTION_FILTER_BIAS_EXT */
-   {  5508, 0x00008014 }, /* GL_CONVOLUTION_FILTER_SCALE */
-   {  5536, 0x00008014 }, /* GL_CONVOLUTION_FILTER_SCALE_EXT */
-   {  5568, 0x00008017 }, /* GL_CONVOLUTION_FORMAT */
-   {  5590, 0x00008017 }, /* GL_CONVOLUTION_FORMAT_EXT */
-   {  5616, 0x00008019 }, /* GL_CONVOLUTION_HEIGHT */
-   {  5638, 0x00008019 }, /* GL_CONVOLUTION_HEIGHT_EXT */
-   {  5664, 0x00008018 }, /* GL_CONVOLUTION_WIDTH */
-   {  5685, 0x00008018 }, /* GL_CONVOLUTION_WIDTH_EXT */
-   {  5710, 0x00008862 }, /* GL_COORD_REPLACE */
-   {  5727, 0x00008862 }, /* GL_COORD_REPLACE_ARB */
-   {  5748, 0x00008862 }, /* GL_COORD_REPLACE_NV */
-   {  5768, 0x00001503 }, /* GL_COPY */
-   {  5776, 0x0000150C }, /* GL_COPY_INVERTED */
-   {  5793, 0x00000706 }, /* GL_COPY_PIXEL_TOKEN */
-   {  5813, 0x00000B44 }, /* GL_CULL_FACE */
-   {  5826, 0x00000B45 }, /* GL_CULL_FACE_MODE */
-   {  5844, 0x000081AA }, /* GL_CULL_VERTEX_EXT */
-   {  5863, 0x000081AC }, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
-   {  5895, 0x000081AB }, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
-   {  5930, 0x00008626 }, /* GL_CURRENT_ATTRIB_NV */
-   {  5951, 0x00000001 }, /* GL_CURRENT_BIT */
-   {  5966, 0x00000B00 }, /* GL_CURRENT_COLOR */
-   {  5983, 0x00008453 }, /* GL_CURRENT_FOG_COORD */
-   {  6004, 0x00008453 }, /* GL_CURRENT_FOG_COORDINATE */
-   {  6030, 0x00000B01 }, /* GL_CURRENT_INDEX */
-   {  6047, 0x00008641 }, /* GL_CURRENT_MATRIX_ARB */
-   {  6069, 0x00008845 }, /* GL_CURRENT_MATRIX_INDEX_ARB */
-   {  6097, 0x00008641 }, /* GL_CURRENT_MATRIX_NV */
-   {  6118, 0x00008640 }, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
-   {  6152, 0x00008640 }, /* GL_CURRENT_MATRIX_STACK_DEPTH_NV */
-   {  6185, 0x00000B02 }, /* GL_CURRENT_NORMAL */
-   {  6203, 0x00008843 }, /* GL_CURRENT_PALETTE_MATRIX_ARB */
-   {  6233, 0x00008B8D }, /* GL_CURRENT_PROGRAM */
-   {  6252, 0x00008865 }, /* GL_CURRENT_QUERY */
-   {  6269, 0x00008865 }, /* GL_CURRENT_QUERY_ARB */
-   {  6290, 0x00000B04 }, /* GL_CURRENT_RASTER_COLOR */
-   {  6314, 0x00000B09 }, /* GL_CURRENT_RASTER_DISTANCE */
-   {  6341, 0x00000B05 }, /* GL_CURRENT_RASTER_INDEX */
-   {  6365, 0x00000B07 }, /* GL_CURRENT_RASTER_POSITION */
-   {  6392, 0x00000B08 }, /* GL_CURRENT_RASTER_POSITION_VALID */
-   {  6425, 0x00000B06 }, /* GL_CURRENT_RASTER_TEXTURE_COORDS */
-   {  6458, 0x00008459 }, /* GL_CURRENT_SECONDARY_COLOR */
-   {  6485, 0x00000B03 }, /* GL_CURRENT_TEXTURE_COORDS */
-   {  6511, 0x00008626 }, /* GL_CURRENT_VERTEX_ATTRIB */
-   {  6536, 0x00008626 }, /* GL_CURRENT_VERTEX_ATTRIB_ARB */
-   {  6565, 0x000086A8 }, /* GL_CURRENT_WEIGHT_ARB */
-   {  6587, 0x00000900 }, /* GL_CW */
-   {  6593, 0x0000875B }, /* GL_DEBUG_ASSERT_MESA */
-   {  6614, 0x00008759 }, /* GL_DEBUG_OBJECT_MESA */
-   {  6635, 0x0000875A }, /* GL_DEBUG_PRINT_MESA */
-   {  6655, 0x00002101 }, /* GL_DECAL */
-   {  6664, 0x00001E03 }, /* GL_DECR */
-   {  6672, 0x00008508 }, /* GL_DECR_WRAP */
-   {  6685, 0x00008508 }, /* GL_DECR_WRAP_EXT */
-   {  6702, 0x00008B80 }, /* GL_DELETE_STATUS */
-   {  6719, 0x00001801 }, /* GL_DEPTH */
-   {  6728, 0x000088F0 }, /* GL_DEPTH24_STENCIL8 */
-   {  6748, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT */
-   {  6768, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT_EXT */
-   {  6792, 0x00000D1F }, /* GL_DEPTH_BIAS */
-   {  6806, 0x00000D56 }, /* GL_DEPTH_BITS */
-   {  6820, 0x00008891 }, /* GL_DEPTH_BOUNDS_EXT */
-   {  6840, 0x00008890 }, /* GL_DEPTH_BOUNDS_TEST_EXT */
-   {  6865, 0x00000100 }, /* GL_DEPTH_BUFFER_BIT */
-   {  6885, 0x0000864F }, /* GL_DEPTH_CLAMP_NV */
-   {  6903, 0x00000B73 }, /* GL_DEPTH_CLEAR_VALUE */
-   {  6924, 0x00001902 }, /* GL_DEPTH_COMPONENT */
-   {  6943, 0x000081A5 }, /* GL_DEPTH_COMPONENT16 */
-   {  6964, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_ARB */
-   {  6989, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_SGIX */
-   {  7015, 0x000081A6 }, /* GL_DEPTH_COMPONENT24 */
-   {  7036, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_ARB */
-   {  7061, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_SGIX */
-   {  7087, 0x000081A7 }, /* GL_DEPTH_COMPONENT32 */
-   {  7108, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_ARB */
-   {  7133, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_SGIX */
-   {  7159, 0x00000B74 }, /* GL_DEPTH_FUNC */
-   {  7173, 0x00000B70 }, /* GL_DEPTH_RANGE */
-   {  7188, 0x00000D1E }, /* GL_DEPTH_SCALE */
-   {  7203, 0x000084F9 }, /* GL_DEPTH_STENCIL */
-   {  7220, 0x0000821A }, /* GL_DEPTH_STENCIL_ATTACHMENT */
-   {  7248, 0x000084F9 }, /* GL_DEPTH_STENCIL_NV */
-   {  7268, 0x0000886F }, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
-   {  7296, 0x0000886E }, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
-   {  7324, 0x00000B71 }, /* GL_DEPTH_TEST */
-   {  7338, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE */
-   {  7360, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE_ARB */
-   {  7386, 0x00000B72 }, /* GL_DEPTH_WRITEMASK */
-   {  7405, 0x00001201 }, /* GL_DIFFUSE */
-   {  7416, 0x00000BD0 }, /* GL_DITHER */
-   {  7426, 0x00000A02 }, /* GL_DOMAIN */
-   {  7436, 0x00001100 }, /* GL_DONT_CARE */
-   {  7449, 0x000086AE }, /* GL_DOT3_RGB */
-   {  7461, 0x000086AF }, /* GL_DOT3_RGBA */
-   {  7474, 0x000086AF }, /* GL_DOT3_RGBA_ARB */
-   {  7491, 0x00008741 }, /* GL_DOT3_RGBA_EXT */
-   {  7508, 0x000086AE }, /* GL_DOT3_RGB_ARB */
-   {  7524, 0x00008740 }, /* GL_DOT3_RGB_EXT */
-   {  7540, 0x0000140A }, /* GL_DOUBLE */
-   {  7550, 0x00000C32 }, /* GL_DOUBLEBUFFER */
-   {  7566, 0x00000C01 }, /* GL_DRAW_BUFFER */
-   {  7581, 0x00008825 }, /* GL_DRAW_BUFFER0 */
-   {  7597, 0x00008825 }, /* GL_DRAW_BUFFER0_ARB */
-   {  7617, 0x00008825 }, /* GL_DRAW_BUFFER0_ATI */
-   {  7637, 0x00008826 }, /* GL_DRAW_BUFFER1 */
-   {  7653, 0x0000882F }, /* GL_DRAW_BUFFER10 */
-   {  7670, 0x0000882F }, /* GL_DRAW_BUFFER10_ARB */
-   {  7691, 0x0000882F }, /* GL_DRAW_BUFFER10_ATI */
-   {  7712, 0x00008830 }, /* GL_DRAW_BUFFER11 */
-   {  7729, 0x00008830 }, /* GL_DRAW_BUFFER11_ARB */
-   {  7750, 0x00008830 }, /* GL_DRAW_BUFFER11_ATI */
-   {  7771, 0x00008831 }, /* GL_DRAW_BUFFER12 */
-   {  7788, 0x00008831 }, /* GL_DRAW_BUFFER12_ARB */
-   {  7809, 0x00008831 }, /* GL_DRAW_BUFFER12_ATI */
-   {  7830, 0x00008832 }, /* GL_DRAW_BUFFER13 */
-   {  7847, 0x00008832 }, /* GL_DRAW_BUFFER13_ARB */
-   {  7868, 0x00008832 }, /* GL_DRAW_BUFFER13_ATI */
-   {  7889, 0x00008833 }, /* GL_DRAW_BUFFER14 */
-   {  7906, 0x00008833 }, /* GL_DRAW_BUFFER14_ARB */
-   {  7927, 0x00008833 }, /* GL_DRAW_BUFFER14_ATI */
-   {  7948, 0x00008834 }, /* GL_DRAW_BUFFER15 */
-   {  7965, 0x00008834 }, /* GL_DRAW_BUFFER15_ARB */
-   {  7986, 0x00008834 }, /* GL_DRAW_BUFFER15_ATI */
-   {  8007, 0x00008826 }, /* GL_DRAW_BUFFER1_ARB */
-   {  8027, 0x00008826 }, /* GL_DRAW_BUFFER1_ATI */
-   {  8047, 0x00008827 }, /* GL_DRAW_BUFFER2 */
-   {  8063, 0x00008827 }, /* GL_DRAW_BUFFER2_ARB */
-   {  8083, 0x00008827 }, /* GL_DRAW_BUFFER2_ATI */
-   {  8103, 0x00008828 }, /* GL_DRAW_BUFFER3 */
-   {  8119, 0x00008828 }, /* GL_DRAW_BUFFER3_ARB */
-   {  8139, 0x00008828 }, /* GL_DRAW_BUFFER3_ATI */
-   {  8159, 0x00008829 }, /* GL_DRAW_BUFFER4 */
-   {  8175, 0x00008829 }, /* GL_DRAW_BUFFER4_ARB */
-   {  8195, 0x00008829 }, /* GL_DRAW_BUFFER4_ATI */
-   {  8215, 0x0000882A }, /* GL_DRAW_BUFFER5 */
-   {  8231, 0x0000882A }, /* GL_DRAW_BUFFER5_ARB */
-   {  8251, 0x0000882A }, /* GL_DRAW_BUFFER5_ATI */
-   {  8271, 0x0000882B }, /* GL_DRAW_BUFFER6 */
-   {  8287, 0x0000882B }, /* GL_DRAW_BUFFER6_ARB */
-   {  8307, 0x0000882B }, /* GL_DRAW_BUFFER6_ATI */
-   {  8327, 0x0000882C }, /* GL_DRAW_BUFFER7 */
-   {  8343, 0x0000882C }, /* GL_DRAW_BUFFER7_ARB */
-   {  8363, 0x0000882C }, /* GL_DRAW_BUFFER7_ATI */
-   {  8383, 0x0000882D }, /* GL_DRAW_BUFFER8 */
-   {  8399, 0x0000882D }, /* GL_DRAW_BUFFER8_ARB */
-   {  8419, 0x0000882D }, /* GL_DRAW_BUFFER8_ATI */
-   {  8439, 0x0000882E }, /* GL_DRAW_BUFFER9 */
-   {  8455, 0x0000882E }, /* GL_DRAW_BUFFER9_ARB */
-   {  8475, 0x0000882E }, /* GL_DRAW_BUFFER9_ATI */
-   {  8495, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER */
-   {  8515, 0x00008CA6 }, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
-   {  8547, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER_EXT */
-   {  8571, 0x00000705 }, /* GL_DRAW_PIXEL_TOKEN */
-   {  8591, 0x00000304 }, /* GL_DST_ALPHA */
-   {  8604, 0x00000306 }, /* GL_DST_COLOR */
-   {  8617, 0x000088EA }, /* GL_DYNAMIC_COPY */
-   {  8633, 0x000088EA }, /* GL_DYNAMIC_COPY_ARB */
-   {  8653, 0x000088E8 }, /* GL_DYNAMIC_DRAW */
-   {  8669, 0x000088E8 }, /* GL_DYNAMIC_DRAW_ARB */
-   {  8689, 0x000088E9 }, /* GL_DYNAMIC_READ */
-   {  8705, 0x000088E9 }, /* GL_DYNAMIC_READ_ARB */
-   {  8725, 0x00000B43 }, /* GL_EDGE_FLAG */
-   {  8738, 0x00008079 }, /* GL_EDGE_FLAG_ARRAY */
-   {  8757, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
-   {  8791, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB */
-   {  8829, 0x00008093 }, /* GL_EDGE_FLAG_ARRAY_POINTER */
-   {  8856, 0x0000808C }, /* GL_EDGE_FLAG_ARRAY_STRIDE */
-   {  8882, 0x00008893 }, /* GL_ELEMENT_ARRAY_BUFFER */
-   {  8906, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
-   {  8938, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB */
-   {  8974, 0x00001600 }, /* GL_EMISSION */
-   {  8986, 0x00002000 }, /* GL_ENABLE_BIT */
-   {  9000, 0x00000202 }, /* GL_EQUAL */
-   {  9009, 0x00001509 }, /* GL_EQUIV */
-   {  9018, 0x00010000 }, /* GL_EVAL_BIT */
-   {  9030, 0x00000800 }, /* GL_EXP */
-   {  9037, 0x00000801 }, /* GL_EXP2 */
-   {  9045, 0x00001F03 }, /* GL_EXTENSIONS */
-   {  9059, 0x00002400 }, /* GL_EYE_LINEAR */
-   {  9073, 0x00002502 }, /* GL_EYE_PLANE */
-   {  9086, 0x0000855C }, /* GL_EYE_PLANE_ABSOLUTE_NV */
-   {  9111, 0x0000855B }, /* GL_EYE_RADIAL_NV */
-   {  9128, 0x00000000 }, /* GL_FALSE */
-   {  9137, 0x00001101 }, /* GL_FASTEST */
-   {  9148, 0x00001C01 }, /* GL_FEEDBACK */
-   {  9160, 0x00000DF0 }, /* GL_FEEDBACK_BUFFER_POINTER */
-   {  9187, 0x00000DF1 }, /* GL_FEEDBACK_BUFFER_SIZE */
-   {  9211, 0x00000DF2 }, /* GL_FEEDBACK_BUFFER_TYPE */
-   {  9235, 0x00001B02 }, /* GL_FILL */
-   {  9243, 0x00001D00 }, /* GL_FLAT */
-   {  9251, 0x00001406 }, /* GL_FLOAT */
-   {  9260, 0x00008B5A }, /* GL_FLOAT_MAT2 */
-   {  9274, 0x00008B5A }, /* GL_FLOAT_MAT2_ARB */
-   {  9292, 0x00008B5B }, /* GL_FLOAT_MAT3 */
-   {  9306, 0x00008B5B }, /* GL_FLOAT_MAT3_ARB */
-   {  9324, 0x00008B5C }, /* GL_FLOAT_MAT4 */
-   {  9338, 0x00008B5C }, /* GL_FLOAT_MAT4_ARB */
-   {  9356, 0x00008B50 }, /* GL_FLOAT_VEC2 */
-   {  9370, 0x00008B50 }, /* GL_FLOAT_VEC2_ARB */
-   {  9388, 0x00008B51 }, /* GL_FLOAT_VEC3 */
-   {  9402, 0x00008B51 }, /* GL_FLOAT_VEC3_ARB */
-   {  9420, 0x00008B52 }, /* GL_FLOAT_VEC4 */
-   {  9434, 0x00008B52 }, /* GL_FLOAT_VEC4_ARB */
-   {  9452, 0x00000B60 }, /* GL_FOG */
-   {  9459, 0x00000080 }, /* GL_FOG_BIT */
-   {  9470, 0x00000B66 }, /* GL_FOG_COLOR */
-   {  9483, 0x00008451 }, /* GL_FOG_COORD */
-   {  9496, 0x00008451 }, /* GL_FOG_COORDINATE */
-   {  9514, 0x00008457 }, /* GL_FOG_COORDINATE_ARRAY */
-   {  9538, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
-   {  9577, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB */
-   {  9620, 0x00008456 }, /* GL_FOG_COORDINATE_ARRAY_POINTER */
-   {  9652, 0x00008455 }, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
-   {  9683, 0x00008454 }, /* GL_FOG_COORDINATE_ARRAY_TYPE */
-   {  9712, 0x00008450 }, /* GL_FOG_COORDINATE_SOURCE */
-   {  9737, 0x00008457 }, /* GL_FOG_COORD_ARRAY */
-   {  9756, 0x0000889D }, /* GL_FOG_COORD_ARRAY_BUFFER_BINDING */
-   {  9790, 0x00008456 }, /* GL_FOG_COORD_ARRAY_POINTER */
-   {  9817, 0x00008455 }, /* GL_FOG_COORD_ARRAY_STRIDE */
-   {  9843, 0x00008454 }, /* GL_FOG_COORD_ARRAY_TYPE */
-   {  9867, 0x00008450 }, /* GL_FOG_COORD_SRC */
-   {  9884, 0x00000B62 }, /* GL_FOG_DENSITY */
-   {  9899, 0x0000855A }, /* GL_FOG_DISTANCE_MODE_NV */
-   {  9923, 0x00000B64 }, /* GL_FOG_END */
-   {  9934, 0x00000C54 }, /* GL_FOG_HINT */
-   {  9946, 0x00000B61 }, /* GL_FOG_INDEX */
-   {  9959, 0x00000B65 }, /* GL_FOG_MODE */
-   {  9971, 0x00008198 }, /* GL_FOG_OFFSET_SGIX */
-   {  9990, 0x00008199 }, /* GL_FOG_OFFSET_VALUE_SGIX */
-   { 10015, 0x00000B63 }, /* GL_FOG_START */
-   { 10028, 0x00008452 }, /* GL_FRAGMENT_DEPTH */
-   { 10046, 0x00008804 }, /* GL_FRAGMENT_PROGRAM_ARB */
-   { 10070, 0x00008B30 }, /* GL_FRAGMENT_SHADER */
-   { 10089, 0x00008B30 }, /* GL_FRAGMENT_SHADER_ARB */
-   { 10112, 0x00008B8B }, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
-   { 10147, 0x00008D40 }, /* GL_FRAMEBUFFER */
-   { 10162, 0x00008215 }, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
-   { 10199, 0x00008214 }, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
-   { 10235, 0x00008210 }, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
-   { 10276, 0x00008211 }, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
-   { 10317, 0x00008216 }, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
-   { 10354, 0x00008213 }, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
-   { 10391, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
-   { 10429, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT */
-   { 10471, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
-   { 10509, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT */
-   { 10551, 0x00008212 }, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
-   { 10586, 0x00008217 }, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
-   { 10625, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT */
-   { 10674, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
-   { 10722, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT */
-   { 10774, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
-   { 10814, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
-   { 10858, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
-   { 10898, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT */
-   { 10942, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING_EXT */
-   { 10969, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE */
-   { 10993, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE_EXT */
-   { 11021, 0x00008218 }, /* GL_FRAMEBUFFER_DEFAULT */
-   { 11044, 0x00008D40 }, /* GL_FRAMEBUFFER_EXT */
-   { 11063, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
-   { 11100, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT */
-   { 11141, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
-   { 11182, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
-   { 11224, 0x00008CD8 }, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
-   { 11275, 0x00008CDA }, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
-   { 11313, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
-   { 11358, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT */
-   { 11407, 0x00008D56 }, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
-   { 11445, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
-   { 11487, 0x00008CDE }, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
-   { 11519, 0x00008219 }, /* GL_FRAMEBUFFER_UNDEFINED */
-   { 11544, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED */
-   { 11571, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED_EXT */
-   { 11602, 0x00000404 }, /* GL_FRONT */
-   { 11611, 0x00000408 }, /* GL_FRONT_AND_BACK */
-   { 11629, 0x00000B46 }, /* GL_FRONT_FACE */
-   { 11643, 0x00000400 }, /* GL_FRONT_LEFT */
-   { 11657, 0x00000401 }, /* GL_FRONT_RIGHT */
-   { 11672, 0x00008006 }, /* GL_FUNC_ADD */
-   { 11684, 0x00008006 }, /* GL_FUNC_ADD_EXT */
-   { 11700, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT */
-   { 11725, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT_EXT */
-   { 11754, 0x0000800A }, /* GL_FUNC_SUBTRACT */
-   { 11771, 0x0000800A }, /* GL_FUNC_SUBTRACT_EXT */
-   { 11792, 0x00008191 }, /* GL_GENERATE_MIPMAP */
-   { 11811, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT */
-   { 11835, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT_SGIS */
-   { 11864, 0x00008191 }, /* GL_GENERATE_MIPMAP_SGIS */
-   { 11888, 0x00000206 }, /* GL_GEQUAL */
-   { 11898, 0x00008009 }, /* GL_GL_BLEND_EQUATION_RGB */
-   { 11923, 0x00008C4A }, /* GL_GL_COMPRESSED_SLUMINANCE */
-   { 11951, 0x00008C4B }, /* GL_GL_COMPRESSED_SLUMINANCE_ALPHA */
-   { 11985, 0x00008C48 }, /* GL_GL_COMPRESSED_SRGB */
-   { 12007, 0x00008C49 }, /* GL_GL_COMPRESSED_SRGB_ALPHA */
-   { 12035, 0x0000845F }, /* GL_GL_CURRENT_RASTER_SECONDARY_COLOR */
-   { 12072, 0x00008B65 }, /* GL_GL_FLOAT_MAT2x3 */
-   { 12091, 0x00008B66 }, /* GL_GL_FLOAT_MAT2x4 */
-   { 12110, 0x00008B67 }, /* GL_GL_FLOAT_MAT3x2 */
-   { 12129, 0x00008B68 }, /* GL_GL_FLOAT_MAT3x4 */
-   { 12148, 0x00008B69 }, /* GL_GL_FLOAT_MAT4x2 */
-   { 12167, 0x00008B6A }, /* GL_GL_FLOAT_MAT4x3 */
-   { 12186, 0x000088EB }, /* GL_GL_PIXEL_PACK_BUFFER */
-   { 12210, 0x000088ED }, /* GL_GL_PIXEL_PACK_BUFFER_BINDING */
-   { 12242, 0x000088EC }, /* GL_GL_PIXEL_UNPACK_BUFFER */
-   { 12268, 0x000088EF }, /* GL_GL_PIXEL_UNPACK_BUFFER_BINDING */
-   { 12302, 0x00008C46 }, /* GL_GL_SLUMINANCE */
-   { 12319, 0x00008C47 }, /* GL_GL_SLUMINANCE8 */
-   { 12337, 0x00008C45 }, /* GL_GL_SLUMINANCE8_ALPHA8 */
-   { 12362, 0x00008C44 }, /* GL_GL_SLUMINANCE_ALPHA */
-   { 12385, 0x00008C40 }, /* GL_GL_SRGB */
-   { 12396, 0x00008C41 }, /* GL_GL_SRGB8 */
-   { 12408, 0x00008C43 }, /* GL_GL_SRGB8_ALPHA8 */
-   { 12427, 0x00008C42 }, /* GL_GL_SRGB_ALPHA */
-   { 12444, 0x00000204 }, /* GL_GREATER */
-   { 12455, 0x00001904 }, /* GL_GREEN */
-   { 12464, 0x00000D19 }, /* GL_GREEN_BIAS */
-   { 12478, 0x00000D53 }, /* GL_GREEN_BITS */
-   { 12492, 0x00000D18 }, /* GL_GREEN_SCALE */
-   { 12507, 0x00008000 }, /* GL_HINT_BIT */
-   { 12519, 0x00008024 }, /* GL_HISTOGRAM */
-   { 12532, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE */
-   { 12556, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE_EXT */
-   { 12584, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE */
-   { 12607, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE_EXT */
-   { 12634, 0x00008024 }, /* GL_HISTOGRAM_EXT */
-   { 12651, 0x00008027 }, /* GL_HISTOGRAM_FORMAT */
-   { 12671, 0x00008027 }, /* GL_HISTOGRAM_FORMAT_EXT */
-   { 12695, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE */
-   { 12719, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE_EXT */
-   { 12747, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE */
-   { 12775, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE_EXT */
-   { 12807, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE */
-   { 12829, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE_EXT */
-   { 12855, 0x0000802D }, /* GL_HISTOGRAM_SINK */
-   { 12873, 0x0000802D }, /* GL_HISTOGRAM_SINK_EXT */
-   { 12895, 0x00008026 }, /* GL_HISTOGRAM_WIDTH */
-   { 12914, 0x00008026 }, /* GL_HISTOGRAM_WIDTH_EXT */
-   { 12937, 0x0000862A }, /* GL_IDENTITY_NV */
-   { 12952, 0x00008150 }, /* GL_IGNORE_BORDER_HP */
-   { 12972, 0x00008B9B }, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
-   { 13012, 0x00008B9A }, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
-   { 13050, 0x00001E02 }, /* GL_INCR */
-   { 13058, 0x00008507 }, /* GL_INCR_WRAP */
-   { 13071, 0x00008507 }, /* GL_INCR_WRAP_EXT */
-   { 13088, 0x00008222 }, /* GL_INDEX */
-   { 13097, 0x00008077 }, /* GL_INDEX_ARRAY */
-   { 13112, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING */
-   { 13142, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING_ARB */
-   { 13176, 0x00008091 }, /* GL_INDEX_ARRAY_POINTER */
-   { 13199, 0x00008086 }, /* GL_INDEX_ARRAY_STRIDE */
-   { 13221, 0x00008085 }, /* GL_INDEX_ARRAY_TYPE */
-   { 13241, 0x00000D51 }, /* GL_INDEX_BITS */
-   { 13255, 0x00000C20 }, /* GL_INDEX_CLEAR_VALUE */
-   { 13276, 0x00000BF1 }, /* GL_INDEX_LOGIC_OP */
-   { 13294, 0x00000C30 }, /* GL_INDEX_MODE */
-   { 13308, 0x00000D13 }, /* GL_INDEX_OFFSET */
-   { 13324, 0x00000D12 }, /* GL_INDEX_SHIFT */
-   { 13339, 0x00000C21 }, /* GL_INDEX_WRITEMASK */
-   { 13358, 0x00008B84 }, /* GL_INFO_LOG_LENGTH */
-   { 13377, 0x00001404 }, /* GL_INT */
-   { 13384, 0x00008049 }, /* GL_INTENSITY */
-   { 13397, 0x0000804C }, /* GL_INTENSITY12 */
-   { 13412, 0x0000804C }, /* GL_INTENSITY12_EXT */
-   { 13431, 0x0000804D }, /* GL_INTENSITY16 */
-   { 13446, 0x0000804D }, /* GL_INTENSITY16_EXT */
-   { 13465, 0x0000804A }, /* GL_INTENSITY4 */
-   { 13479, 0x0000804A }, /* GL_INTENSITY4_EXT */
-   { 13497, 0x0000804B }, /* GL_INTENSITY8 */
-   { 13511, 0x0000804B }, /* GL_INTENSITY8_EXT */
-   { 13529, 0x00008049 }, /* GL_INTENSITY_EXT */
-   { 13546, 0x00008575 }, /* GL_INTERPOLATE */
-   { 13561, 0x00008575 }, /* GL_INTERPOLATE_ARB */
-   { 13580, 0x00008575 }, /* GL_INTERPOLATE_EXT */
-   { 13599, 0x00008B53 }, /* GL_INT_VEC2 */
-   { 13611, 0x00008B53 }, /* GL_INT_VEC2_ARB */
-   { 13627, 0x00008B54 }, /* GL_INT_VEC3 */
-   { 13639, 0x00008B54 }, /* GL_INT_VEC3_ARB */
-   { 13655, 0x00008B55 }, /* GL_INT_VEC4 */
-   { 13667, 0x00008B55 }, /* GL_INT_VEC4_ARB */
-   { 13683, 0x00000500 }, /* GL_INVALID_ENUM */
-   { 13699, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION */
-   { 13732, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION_EXT */
-   { 13769, 0x00000502 }, /* GL_INVALID_OPERATION */
-   { 13790, 0x00000501 }, /* GL_INVALID_VALUE */
-   { 13807, 0x0000862B }, /* GL_INVERSE_NV */
-   { 13821, 0x0000862D }, /* GL_INVERSE_TRANSPOSE_NV */
-   { 13845, 0x0000150A }, /* GL_INVERT */
-   { 13855, 0x00001E00 }, /* GL_KEEP */
-   { 13863, 0x00000406 }, /* GL_LEFT */
-   { 13871, 0x00000203 }, /* GL_LEQUAL */
-   { 13881, 0x00000201 }, /* GL_LESS */
-   { 13889, 0x00004000 }, /* GL_LIGHT0 */
-   { 13899, 0x00004001 }, /* GL_LIGHT1 */
-   { 13909, 0x00004002 }, /* GL_LIGHT2 */
-   { 13919, 0x00004003 }, /* GL_LIGHT3 */
-   { 13929, 0x00004004 }, /* GL_LIGHT4 */
-   { 13939, 0x00004005 }, /* GL_LIGHT5 */
-   { 13949, 0x00004006 }, /* GL_LIGHT6 */
-   { 13959, 0x00004007 }, /* GL_LIGHT7 */
-   { 13969, 0x00000B50 }, /* GL_LIGHTING */
-   { 13981, 0x00000040 }, /* GL_LIGHTING_BIT */
-   { 13997, 0x00000B53 }, /* GL_LIGHT_MODEL_AMBIENT */
-   { 14020, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL */
-   { 14049, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL_EXT */
-   { 14082, 0x00000B51 }, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
-   { 14110, 0x00000B52 }, /* GL_LIGHT_MODEL_TWO_SIDE */
-   { 14134, 0x00001B01 }, /* GL_LINE */
-   { 14142, 0x00002601 }, /* GL_LINEAR */
-   { 14152, 0x00001208 }, /* GL_LINEAR_ATTENUATION */
-   { 14174, 0x00008170 }, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
-   { 14204, 0x0000844F }, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
-   { 14235, 0x00002703 }, /* GL_LINEAR_MIPMAP_LINEAR */
-   { 14259, 0x00002701 }, /* GL_LINEAR_MIPMAP_NEAREST */
-   { 14284, 0x00000001 }, /* GL_LINES */
-   { 14293, 0x00000004 }, /* GL_LINE_BIT */
-   { 14305, 0x00000002 }, /* GL_LINE_LOOP */
-   { 14318, 0x00000707 }, /* GL_LINE_RESET_TOKEN */
-   { 14338, 0x00000B20 }, /* GL_LINE_SMOOTH */
-   { 14353, 0x00000C52 }, /* GL_LINE_SMOOTH_HINT */
-   { 14373, 0x00000B24 }, /* GL_LINE_STIPPLE */
-   { 14389, 0x00000B25 }, /* GL_LINE_STIPPLE_PATTERN */
-   { 14413, 0x00000B26 }, /* GL_LINE_STIPPLE_REPEAT */
-   { 14436, 0x00000003 }, /* GL_LINE_STRIP */
-   { 14450, 0x00000702 }, /* GL_LINE_TOKEN */
-   { 14464, 0x00000B21 }, /* GL_LINE_WIDTH */
-   { 14478, 0x00000B23 }, /* GL_LINE_WIDTH_GRANULARITY */
-   { 14504, 0x00000B22 }, /* GL_LINE_WIDTH_RANGE */
-   { 14524, 0x00008B82 }, /* GL_LINK_STATUS */
-   { 14539, 0x00000B32 }, /* GL_LIST_BASE */
-   { 14552, 0x00020000 }, /* GL_LIST_BIT */
-   { 14564, 0x00000B33 }, /* GL_LIST_INDEX */
-   { 14578, 0x00000B30 }, /* GL_LIST_MODE */
-   { 14591, 0x00000101 }, /* GL_LOAD */
-   { 14599, 0x00000BF1 }, /* GL_LOGIC_OP */
-   { 14611, 0x00000BF0 }, /* GL_LOGIC_OP_MODE */
-   { 14628, 0x00008CA1 }, /* GL_LOWER_LEFT */
-   { 14642, 0x00001909 }, /* GL_LUMINANCE */
-   { 14655, 0x00008041 }, /* GL_LUMINANCE12 */
-   { 14670, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12 */
-   { 14693, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12_EXT */
-   { 14720, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4 */
-   { 14742, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4_EXT */
-   { 14768, 0x00008041 }, /* GL_LUMINANCE12_EXT */
-   { 14787, 0x00008042 }, /* GL_LUMINANCE16 */
-   { 14802, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16 */
-   { 14825, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16_EXT */
-   { 14852, 0x00008042 }, /* GL_LUMINANCE16_EXT */
-   { 14871, 0x0000803F }, /* GL_LUMINANCE4 */
-   { 14885, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4 */
-   { 14906, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4_EXT */
-   { 14931, 0x0000803F }, /* GL_LUMINANCE4_EXT */
-   { 14949, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2 */
-   { 14970, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2_EXT */
-   { 14995, 0x00008040 }, /* GL_LUMINANCE8 */
-   { 15009, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8 */
-   { 15030, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8_EXT */
-   { 15055, 0x00008040 }, /* GL_LUMINANCE8_EXT */
-   { 15073, 0x0000190A }, /* GL_LUMINANCE_ALPHA */
-   { 15092, 0x00000D90 }, /* GL_MAP1_COLOR_4 */
-   { 15108, 0x00000DD0 }, /* GL_MAP1_GRID_DOMAIN */
-   { 15128, 0x00000DD1 }, /* GL_MAP1_GRID_SEGMENTS */
-   { 15150, 0x00000D91 }, /* GL_MAP1_INDEX */
-   { 15164, 0x00000D92 }, /* GL_MAP1_NORMAL */
-   { 15179, 0x00000D93 }, /* GL_MAP1_TEXTURE_COORD_1 */
-   { 15203, 0x00000D94 }, /* GL_MAP1_TEXTURE_COORD_2 */
-   { 15227, 0x00000D95 }, /* GL_MAP1_TEXTURE_COORD_3 */
-   { 15251, 0x00000D96 }, /* GL_MAP1_TEXTURE_COORD_4 */
-   { 15275, 0x00000D97 }, /* GL_MAP1_VERTEX_3 */
-   { 15292, 0x00000D98 }, /* GL_MAP1_VERTEX_4 */
-   { 15309, 0x00008660 }, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
-   { 15337, 0x0000866A }, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
-   { 15366, 0x0000866B }, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
-   { 15395, 0x0000866C }, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
-   { 15424, 0x0000866D }, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
-   { 15453, 0x0000866E }, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
-   { 15482, 0x0000866F }, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
-   { 15511, 0x00008661 }, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
-   { 15539, 0x00008662 }, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
-   { 15567, 0x00008663 }, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
-   { 15595, 0x00008664 }, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
-   { 15623, 0x00008665 }, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
-   { 15651, 0x00008666 }, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
-   { 15679, 0x00008667 }, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
-   { 15707, 0x00008668 }, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
-   { 15735, 0x00008669 }, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
-   { 15763, 0x00000DB0 }, /* GL_MAP2_COLOR_4 */
-   { 15779, 0x00000DD2 }, /* GL_MAP2_GRID_DOMAIN */
-   { 15799, 0x00000DD3 }, /* GL_MAP2_GRID_SEGMENTS */
-   { 15821, 0x00000DB1 }, /* GL_MAP2_INDEX */
-   { 15835, 0x00000DB2 }, /* GL_MAP2_NORMAL */
-   { 15850, 0x00000DB3 }, /* GL_MAP2_TEXTURE_COORD_1 */
-   { 15874, 0x00000DB4 }, /* GL_MAP2_TEXTURE_COORD_2 */
-   { 15898, 0x00000DB5 }, /* GL_MAP2_TEXTURE_COORD_3 */
-   { 15922, 0x00000DB6 }, /* GL_MAP2_TEXTURE_COORD_4 */
-   { 15946, 0x00000DB7 }, /* GL_MAP2_VERTEX_3 */
-   { 15963, 0x00000DB8 }, /* GL_MAP2_VERTEX_4 */
-   { 15980, 0x00008670 }, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
-   { 16008, 0x0000867A }, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
-   { 16037, 0x0000867B }, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
-   { 16066, 0x0000867C }, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
-   { 16095, 0x0000867D }, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
-   { 16124, 0x0000867E }, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
-   { 16153, 0x0000867F }, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
-   { 16182, 0x00008671 }, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
-   { 16210, 0x00008672 }, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
-   { 16238, 0x00008673 }, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
-   { 16266, 0x00008674 }, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
-   { 16294, 0x00008675 }, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
-   { 16322, 0x00008676 }, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
-   { 16350, 0x00008677 }, /* GL_MAP2_VERTEX_ATTRIB7_4_NV */
-   { 16378, 0x00008678 }, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
-   { 16406, 0x00008679 }, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
-   { 16434, 0x00000D10 }, /* GL_MAP_COLOR */
-   { 16447, 0x00000D11 }, /* GL_MAP_STENCIL */
-   { 16462, 0x000088C0 }, /* GL_MATRIX0_ARB */
-   { 16477, 0x00008630 }, /* GL_MATRIX0_NV */
-   { 16491, 0x000088CA }, /* GL_MATRIX10_ARB */
-   { 16507, 0x000088CB }, /* GL_MATRIX11_ARB */
-   { 16523, 0x000088CC }, /* GL_MATRIX12_ARB */
-   { 16539, 0x000088CD }, /* GL_MATRIX13_ARB */
-   { 16555, 0x000088CE }, /* GL_MATRIX14_ARB */
-   { 16571, 0x000088CF }, /* GL_MATRIX15_ARB */
-   { 16587, 0x000088D0 }, /* GL_MATRIX16_ARB */
-   { 16603, 0x000088D1 }, /* GL_MATRIX17_ARB */
-   { 16619, 0x000088D2 }, /* GL_MATRIX18_ARB */
-   { 16635, 0x000088D3 }, /* GL_MATRIX19_ARB */
-   { 16651, 0x000088C1 }, /* GL_MATRIX1_ARB */
-   { 16666, 0x00008631 }, /* GL_MATRIX1_NV */
-   { 16680, 0x000088D4 }, /* GL_MATRIX20_ARB */
-   { 16696, 0x000088D5 }, /* GL_MATRIX21_ARB */
-   { 16712, 0x000088D6 }, /* GL_MATRIX22_ARB */
-   { 16728, 0x000088D7 }, /* GL_MATRIX23_ARB */
-   { 16744, 0x000088D8 }, /* GL_MATRIX24_ARB */
-   { 16760, 0x000088D9 }, /* GL_MATRIX25_ARB */
-   { 16776, 0x000088DA }, /* GL_MATRIX26_ARB */
-   { 16792, 0x000088DB }, /* GL_MATRIX27_ARB */
-   { 16808, 0x000088DC }, /* GL_MATRIX28_ARB */
-   { 16824, 0x000088DD }, /* GL_MATRIX29_ARB */
-   { 16840, 0x000088C2 }, /* GL_MATRIX2_ARB */
-   { 16855, 0x00008632 }, /* GL_MATRIX2_NV */
-   { 16869, 0x000088DE }, /* GL_MATRIX30_ARB */
-   { 16885, 0x000088DF }, /* GL_MATRIX31_ARB */
-   { 16901, 0x000088C3 }, /* GL_MATRIX3_ARB */
-   { 16916, 0x00008633 }, /* GL_MATRIX3_NV */
-   { 16930, 0x000088C4 }, /* GL_MATRIX4_ARB */
-   { 16945, 0x00008634 }, /* GL_MATRIX4_NV */
-   { 16959, 0x000088C5 }, /* GL_MATRIX5_ARB */
-   { 16974, 0x00008635 }, /* GL_MATRIX5_NV */
-   { 16988, 0x000088C6 }, /* GL_MATRIX6_ARB */
-   { 17003, 0x00008636 }, /* GL_MATRIX6_NV */
-   { 17017, 0x000088C7 }, /* GL_MATRIX7_ARB */
-   { 17032, 0x00008637 }, /* GL_MATRIX7_NV */
-   { 17046, 0x000088C8 }, /* GL_MATRIX8_ARB */
-   { 17061, 0x000088C9 }, /* GL_MATRIX9_ARB */
-   { 17076, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_ARB */
-   { 17102, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
-   { 17136, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
-   { 17167, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
-   { 17200, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
-   { 17231, 0x00000BA0 }, /* GL_MATRIX_MODE */
-   { 17246, 0x00008840 }, /* GL_MATRIX_PALETTE_ARB */
-   { 17268, 0x00008008 }, /* GL_MAX */
-   { 17275, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE */
-   { 17298, 0x000088FF }, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
-   { 17330, 0x00000D35 }, /* GL_MAX_ATTRIB_STACK_DEPTH */
-   { 17356, 0x00000D3B }, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
-   { 17389, 0x00008177 }, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
-   { 17415, 0x00008178 }, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-   { 17449, 0x00000D32 }, /* GL_MAX_CLIP_PLANES */
-   { 17468, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
-   { 17497, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
-   { 17529, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI */
-   { 17565, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
-   { 17601, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB */
-   { 17641, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT */
-   { 17667, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT_EXT */
-   { 17697, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH */
-   { 17722, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH_EXT */
-   { 17751, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
-   { 17780, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB */
-   { 17813, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS */
-   { 17833, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ARB */
-   { 17857, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ATI */
-   { 17881, 0x000080E9 }, /* GL_MAX_ELEMENTS_INDICES */
-   { 17905, 0x000080E8 }, /* GL_MAX_ELEMENTS_VERTICES */
-   { 17930, 0x00000D30 }, /* GL_MAX_EVAL_ORDER */
-   { 17948, 0x00008008 }, /* GL_MAX_EXT */
-   { 17959, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
-   { 17994, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB */
-   { 18033, 0x00000D31 }, /* GL_MAX_LIGHTS */
-   { 18047, 0x00000B31 }, /* GL_MAX_LIST_NESTING */
-   { 18067, 0x00008841 }, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
-   { 18105, 0x00000D36 }, /* GL_MAX_MODELVIEW_STACK_DEPTH */
-   { 18134, 0x00000D37 }, /* GL_MAX_NAME_STACK_DEPTH */
-   { 18158, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_ARB */
-   { 18186, 0x00000D34 }, /* GL_MAX_PIXEL_MAP_TABLE */
-   { 18209, 0x000088B1 }, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
-   { 18246, 0x0000880B }, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
-   { 18282, 0x000088AD }, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
-   { 18309, 0x000088F5 }, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
-   { 18338, 0x000088B5 }, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
-   { 18372, 0x000088F4 }, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
-   { 18408, 0x000088F6 }, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
-   { 18435, 0x000088A1 }, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
-   { 18467, 0x000088B4 }, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
-   { 18503, 0x000088F8 }, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
-   { 18532, 0x000088F7 }, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
-   { 18561, 0x0000862F }, /* GL_MAX_PROGRAM_MATRICES_ARB */
-   { 18589, 0x0000862E }, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
-   { 18627, 0x000088B3 }, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-   { 18671, 0x0000880E }, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-   { 18714, 0x000088AF }, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
-   { 18748, 0x000088A3 }, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-   { 18787, 0x000088AB }, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
-   { 18824, 0x000088A7 }, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
-   { 18862, 0x00008810 }, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-   { 18905, 0x0000880F }, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-   { 18948, 0x000088A9 }, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
-   { 18978, 0x000088A5 }, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
-   { 19009, 0x0000880D }, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
-   { 19045, 0x0000880C }, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
-   { 19081, 0x00000D38 }, /* GL_MAX_PROJECTION_STACK_DEPTH */
-   { 19111, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
-   { 19145, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_NV */
-   { 19178, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
-   { 19207, 0x00008D57 }, /* GL_MAX_SAMPLES */
-   { 19222, 0x00008504 }, /* GL_MAX_SHININESS_NV */
-   { 19242, 0x00008505 }, /* GL_MAX_SPOT_EXPONENT_NV */
-   { 19266, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS */
-   { 19288, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS_ARB */
-   { 19314, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS */
-   { 19341, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS_ARB */
-   { 19372, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS */
-   { 19396, 0x000084FF }, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
-   { 19430, 0x00000D33 }, /* GL_MAX_TEXTURE_SIZE */
-   { 19450, 0x00000D39 }, /* GL_MAX_TEXTURE_STACK_DEPTH */
-   { 19477, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS */
-   { 19498, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS_ARB */
-   { 19523, 0x0000862F }, /* GL_MAX_TRACK_MATRICES_NV */
-   { 19548, 0x0000862E }, /* GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */
-   { 19583, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS */
-   { 19605, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS_ARB */
-   { 19631, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS */
-   { 19653, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS_ARB */
-   { 19679, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
-   { 19713, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
-   { 19751, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
-   { 19784, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB */
-   { 19821, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_ARB */
-   { 19845, 0x00000D3A }, /* GL_MAX_VIEWPORT_DIMS */
-   { 19866, 0x00008007 }, /* GL_MIN */
-   { 19873, 0x0000802E }, /* GL_MINMAX */
-   { 19883, 0x0000802E }, /* GL_MINMAX_EXT */
-   { 19897, 0x0000802F }, /* GL_MINMAX_FORMAT */
-   { 19914, 0x0000802F }, /* GL_MINMAX_FORMAT_EXT */
-   { 19935, 0x00008030 }, /* GL_MINMAX_SINK */
-   { 19950, 0x00008030 }, /* GL_MINMAX_SINK_EXT */
-   { 19969, 0x00008007 }, /* GL_MIN_EXT */
-   { 19980, 0x00008370 }, /* GL_MIRRORED_REPEAT */
-   { 19999, 0x00008370 }, /* GL_MIRRORED_REPEAT_ARB */
-   { 20022, 0x00008370 }, /* GL_MIRRORED_REPEAT_IBM */
-   { 20045, 0x00008742 }, /* GL_MIRROR_CLAMP_ATI */
-   { 20065, 0x00008742 }, /* GL_MIRROR_CLAMP_EXT */
-   { 20085, 0x00008912 }, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
-   { 20115, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_ATI */
-   { 20143, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
-   { 20171, 0x00001700 }, /* GL_MODELVIEW */
-   { 20184, 0x00001700 }, /* GL_MODELVIEW0_ARB */
-   { 20202, 0x0000872A }, /* GL_MODELVIEW10_ARB */
-   { 20221, 0x0000872B }, /* GL_MODELVIEW11_ARB */
-   { 20240, 0x0000872C }, /* GL_MODELVIEW12_ARB */
-   { 20259, 0x0000872D }, /* GL_MODELVIEW13_ARB */
-   { 20278, 0x0000872E }, /* GL_MODELVIEW14_ARB */
-   { 20297, 0x0000872F }, /* GL_MODELVIEW15_ARB */
-   { 20316, 0x00008730 }, /* GL_MODELVIEW16_ARB */
-   { 20335, 0x00008731 }, /* GL_MODELVIEW17_ARB */
-   { 20354, 0x00008732 }, /* GL_MODELVIEW18_ARB */
-   { 20373, 0x00008733 }, /* GL_MODELVIEW19_ARB */
-   { 20392, 0x0000850A }, /* GL_MODELVIEW1_ARB */
-   { 20410, 0x00008734 }, /* GL_MODELVIEW20_ARB */
-   { 20429, 0x00008735 }, /* GL_MODELVIEW21_ARB */
-   { 20448, 0x00008736 }, /* GL_MODELVIEW22_ARB */
-   { 20467, 0x00008737 }, /* GL_MODELVIEW23_ARB */
-   { 20486, 0x00008738 }, /* GL_MODELVIEW24_ARB */
-   { 20505, 0x00008739 }, /* GL_MODELVIEW25_ARB */
-   { 20524, 0x0000873A }, /* GL_MODELVIEW26_ARB */
-   { 20543, 0x0000873B }, /* GL_MODELVIEW27_ARB */
-   { 20562, 0x0000873C }, /* GL_MODELVIEW28_ARB */
-   { 20581, 0x0000873D }, /* GL_MODELVIEW29_ARB */
-   { 20600, 0x00008722 }, /* GL_MODELVIEW2_ARB */
-   { 20618, 0x0000873E }, /* GL_MODELVIEW30_ARB */
-   { 20637, 0x0000873F }, /* GL_MODELVIEW31_ARB */
-   { 20656, 0x00008723 }, /* GL_MODELVIEW3_ARB */
-   { 20674, 0x00008724 }, /* GL_MODELVIEW4_ARB */
-   { 20692, 0x00008725 }, /* GL_MODELVIEW5_ARB */
-   { 20710, 0x00008726 }, /* GL_MODELVIEW6_ARB */
-   { 20728, 0x00008727 }, /* GL_MODELVIEW7_ARB */
-   { 20746, 0x00008728 }, /* GL_MODELVIEW8_ARB */
-   { 20764, 0x00008729 }, /* GL_MODELVIEW9_ARB */
-   { 20782, 0x00000BA6 }, /* GL_MODELVIEW_MATRIX */
-   { 20802, 0x00008629 }, /* GL_MODELVIEW_PROJECTION_NV */
-   { 20829, 0x00000BA3 }, /* GL_MODELVIEW_STACK_DEPTH */
-   { 20854, 0x00002100 }, /* GL_MODULATE */
-   { 20866, 0x00008744 }, /* GL_MODULATE_ADD_ATI */
-   { 20886, 0x00008745 }, /* GL_MODULATE_SIGNED_ADD_ATI */
-   { 20913, 0x00008746 }, /* GL_MODULATE_SUBTRACT_ATI */
-   { 20938, 0x00000103 }, /* GL_MULT */
-   { 20946, 0x0000809D }, /* GL_MULTISAMPLE */
-   { 20961, 0x000086B2 }, /* GL_MULTISAMPLE_3DFX */
-   { 20981, 0x0000809D }, /* GL_MULTISAMPLE_ARB */
-   { 21000, 0x20000000 }, /* GL_MULTISAMPLE_BIT */
-   { 21019, 0x20000000 }, /* GL_MULTISAMPLE_BIT_3DFX */
-   { 21043, 0x20000000 }, /* GL_MULTISAMPLE_BIT_ARB */
-   { 21066, 0x00008534 }, /* GL_MULTISAMPLE_FILTER_HINT_NV */
-   { 21096, 0x00002A25 }, /* GL_N3F_V3F */
-   { 21107, 0x00000D70 }, /* GL_NAME_STACK_DEPTH */
-   { 21127, 0x0000150E }, /* GL_NAND */
-   { 21135, 0x00002600 }, /* GL_NEAREST */
-   { 21146, 0x0000844E }, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
-   { 21177, 0x0000844D }, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
-   { 21209, 0x00002702 }, /* GL_NEAREST_MIPMAP_LINEAR */
-   { 21234, 0x00002700 }, /* GL_NEAREST_MIPMAP_NEAREST */
-   { 21260, 0x00000200 }, /* GL_NEVER */
-   { 21269, 0x00001102 }, /* GL_NICEST */
-   { 21279, 0x00000000 }, /* GL_NONE */
-   { 21287, 0x00001505 }, /* GL_NOOP */
-   { 21295, 0x00001508 }, /* GL_NOR */
-   { 21302, 0x00000BA1 }, /* GL_NORMALIZE */
-   { 21315, 0x00008075 }, /* GL_NORMAL_ARRAY */
-   { 21331, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
-   { 21362, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING_ARB */
-   { 21397, 0x0000808F }, /* GL_NORMAL_ARRAY_POINTER */
-   { 21421, 0x0000807F }, /* GL_NORMAL_ARRAY_STRIDE */
-   { 21444, 0x0000807E }, /* GL_NORMAL_ARRAY_TYPE */
-   { 21465, 0x00008511 }, /* GL_NORMAL_MAP */
-   { 21479, 0x00008511 }, /* GL_NORMAL_MAP_ARB */
-   { 21497, 0x00008511 }, /* GL_NORMAL_MAP_NV */
-   { 21514, 0x00000205 }, /* GL_NOTEQUAL */
-   { 21526, 0x00000000 }, /* GL_NO_ERROR */
-   { 21538, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
-   { 21572, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB */
-   { 21610, 0x00008B89 }, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */
-   { 21642, 0x00008B8A }, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */
-   { 21684, 0x00008B86 }, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */
-   { 21714, 0x00008B87 }, /* GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB */
-   { 21754, 0x00008B85 }, /* GL_OBJECT_ATTACHED_OBJECTS_ARB */
-   { 21785, 0x00008B81 }, /* GL_OBJECT_COMPILE_STATUS_ARB */
-   { 21814, 0x00008B80 }, /* GL_OBJECT_DELETE_STATUS_ARB */
-   { 21842, 0x00008B84 }, /* GL_OBJECT_INFO_LOG_LENGTH_ARB */
-   { 21872, 0x00002401 }, /* GL_OBJECT_LINEAR */
-   { 21889, 0x00008B82 }, /* GL_OBJECT_LINK_STATUS_ARB */
-   { 21915, 0x00002501 }, /* GL_OBJECT_PLANE */
-   { 21931, 0x00008B88 }, /* GL_OBJECT_SHADER_SOURCE_LENGTH_ARB */
-   { 21966, 0x00008B4F }, /* GL_OBJECT_SUBTYPE_ARB */
-   { 21988, 0x00008B4E }, /* GL_OBJECT_TYPE_ARB */
-   { 22007, 0x00008B83 }, /* GL_OBJECT_VALIDATE_STATUS_ARB */
-   { 22037, 0x00008165 }, /* GL_OCCLUSION_TEST_HP */
-   { 22058, 0x00008166 }, /* GL_OCCLUSION_TEST_RESULT_HP */
-   { 22086, 0x00000001 }, /* GL_ONE */
-   { 22093, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA */
-   { 22121, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA_EXT */
-   { 22153, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR */
-   { 22181, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR_EXT */
-   { 22213, 0x00000305 }, /* GL_ONE_MINUS_DST_ALPHA */
-   { 22236, 0x00000307 }, /* GL_ONE_MINUS_DST_COLOR */
-   { 22259, 0x00000303 }, /* GL_ONE_MINUS_SRC_ALPHA */
-   { 22282, 0x00000301 }, /* GL_ONE_MINUS_SRC_COLOR */
-   { 22305, 0x00008598 }, /* GL_OPERAND0_ALPHA */
-   { 22323, 0x00008598 }, /* GL_OPERAND0_ALPHA_ARB */
-   { 22345, 0x00008598 }, /* GL_OPERAND0_ALPHA_EXT */
-   { 22367, 0x00008590 }, /* GL_OPERAND0_RGB */
-   { 22383, 0x00008590 }, /* GL_OPERAND0_RGB_ARB */
-   { 22403, 0x00008590 }, /* GL_OPERAND0_RGB_EXT */
-   { 22423, 0x00008599 }, /* GL_OPERAND1_ALPHA */
-   { 22441, 0x00008599 }, /* GL_OPERAND1_ALPHA_ARB */
-   { 22463, 0x00008599 }, /* GL_OPERAND1_ALPHA_EXT */
-   { 22485, 0x00008591 }, /* GL_OPERAND1_RGB */
-   { 22501, 0x00008591 }, /* GL_OPERAND1_RGB_ARB */
-   { 22521, 0x00008591 }, /* GL_OPERAND1_RGB_EXT */
-   { 22541, 0x0000859A }, /* GL_OPERAND2_ALPHA */
-   { 22559, 0x0000859A }, /* GL_OPERAND2_ALPHA_ARB */
-   { 22581, 0x0000859A }, /* GL_OPERAND2_ALPHA_EXT */
-   { 22603, 0x00008592 }, /* GL_OPERAND2_RGB */
-   { 22619, 0x00008592 }, /* GL_OPERAND2_RGB_ARB */
-   { 22639, 0x00008592 }, /* GL_OPERAND2_RGB_EXT */
-   { 22659, 0x0000859B }, /* GL_OPERAND3_ALPHA_NV */
-   { 22680, 0x00008593 }, /* GL_OPERAND3_RGB_NV */
-   { 22699, 0x00001507 }, /* GL_OR */
-   { 22705, 0x00000A01 }, /* GL_ORDER */
-   { 22714, 0x0000150D }, /* GL_OR_INVERTED */
-   { 22729, 0x0000150B }, /* GL_OR_REVERSE */
-   { 22743, 0x00000505 }, /* GL_OUT_OF_MEMORY */
-   { 22760, 0x00000D05 }, /* GL_PACK_ALIGNMENT */
-   { 22778, 0x0000806C }, /* GL_PACK_IMAGE_HEIGHT */
-   { 22799, 0x00008758 }, /* GL_PACK_INVERT_MESA */
-   { 22819, 0x00000D01 }, /* GL_PACK_LSB_FIRST */
-   { 22837, 0x00000D02 }, /* GL_PACK_ROW_LENGTH */
-   { 22856, 0x0000806B }, /* GL_PACK_SKIP_IMAGES */
-   { 22876, 0x00000D04 }, /* GL_PACK_SKIP_PIXELS */
-   { 22896, 0x00000D03 }, /* GL_PACK_SKIP_ROWS */
-   { 22914, 0x00000D00 }, /* GL_PACK_SWAP_BYTES */
-   { 22933, 0x00008B92 }, /* GL_PALETTE4_R5_G6_B5_OES */
-   { 22958, 0x00008B94 }, /* GL_PALETTE4_RGB5_A1_OES */
-   { 22982, 0x00008B90 }, /* GL_PALETTE4_RGB8_OES */
-   { 23003, 0x00008B93 }, /* GL_PALETTE4_RGBA4_OES */
-   { 23025, 0x00008B91 }, /* GL_PALETTE4_RGBA8_OES */
-   { 23047, 0x00008B97 }, /* GL_PALETTE8_R5_G6_B5_OES */
-   { 23072, 0x00008B99 }, /* GL_PALETTE8_RGB5_A1_OES */
-   { 23096, 0x00008B95 }, /* GL_PALETTE8_RGB8_OES */
-   { 23117, 0x00008B98 }, /* GL_PALETTE8_RGBA4_OES */
-   { 23139, 0x00008B96 }, /* GL_PALETTE8_RGBA8_OES */
-   { 23161, 0x00000700 }, /* GL_PASS_THROUGH_TOKEN */
-   { 23183, 0x00000C50 }, /* GL_PERSPECTIVE_CORRECTION_HINT */
-   { 23214, 0x00000C79 }, /* GL_PIXEL_MAP_A_TO_A */
-   { 23234, 0x00000CB9 }, /* GL_PIXEL_MAP_A_TO_A_SIZE */
-   { 23259, 0x00000C78 }, /* GL_PIXEL_MAP_B_TO_B */
-   { 23279, 0x00000CB8 }, /* GL_PIXEL_MAP_B_TO_B_SIZE */
-   { 23304, 0x00000C77 }, /* GL_PIXEL_MAP_G_TO_G */
-   { 23324, 0x00000CB7 }, /* GL_PIXEL_MAP_G_TO_G_SIZE */
-   { 23349, 0x00000C75 }, /* GL_PIXEL_MAP_I_TO_A */
-   { 23369, 0x00000CB5 }, /* GL_PIXEL_MAP_I_TO_A_SIZE */
-   { 23394, 0x00000C74 }, /* GL_PIXEL_MAP_I_TO_B */
-   { 23414, 0x00000CB4 }, /* GL_PIXEL_MAP_I_TO_B_SIZE */
-   { 23439, 0x00000C73 }, /* GL_PIXEL_MAP_I_TO_G */
-   { 23459, 0x00000CB3 }, /* GL_PIXEL_MAP_I_TO_G_SIZE */
-   { 23484, 0x00000C70 }, /* GL_PIXEL_MAP_I_TO_I */
-   { 23504, 0x00000CB0 }, /* GL_PIXEL_MAP_I_TO_I_SIZE */
-   { 23529, 0x00000C72 }, /* GL_PIXEL_MAP_I_TO_R */
-   { 23549, 0x00000CB2 }, /* GL_PIXEL_MAP_I_TO_R_SIZE */
-   { 23574, 0x00000C76 }, /* GL_PIXEL_MAP_R_TO_R */
-   { 23594, 0x00000CB6 }, /* GL_PIXEL_MAP_R_TO_R_SIZE */
-   { 23619, 0x00000C71 }, /* GL_PIXEL_MAP_S_TO_S */
-   { 23639, 0x00000CB1 }, /* GL_PIXEL_MAP_S_TO_S_SIZE */
-   { 23664, 0x00000020 }, /* GL_PIXEL_MODE_BIT */
-   { 23682, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING_EXT */
-   { 23715, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER_EXT */
-   { 23740, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING_EXT */
-   { 23775, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER_EXT */
-   { 23802, 0x00001B00 }, /* GL_POINT */
-   { 23811, 0x00000000 }, /* GL_POINTS */
-   { 23821, 0x00000002 }, /* GL_POINT_BIT */
-   { 23834, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION */
-   { 23864, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_ARB */
-   { 23898, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_EXT */
-   { 23932, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_SGIS */
-   { 23967, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE */
-   { 23996, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_ARB */
-   { 24029, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_EXT */
-   { 24062, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_SGIS */
-   { 24096, 0x00000B11 }, /* GL_POINT_SIZE */
-   { 24110, 0x00000B13 }, /* GL_POINT_SIZE_GRANULARITY */
-   { 24136, 0x00008127 }, /* GL_POINT_SIZE_MAX */
-   { 24154, 0x00008127 }, /* GL_POINT_SIZE_MAX_ARB */
-   { 24176, 0x00008127 }, /* GL_POINT_SIZE_MAX_EXT */
-   { 24198, 0x00008127 }, /* GL_POINT_SIZE_MAX_SGIS */
-   { 24221, 0x00008126 }, /* GL_POINT_SIZE_MIN */
-   { 24239, 0x00008126 }, /* GL_POINT_SIZE_MIN_ARB */
-   { 24261, 0x00008126 }, /* GL_POINT_SIZE_MIN_EXT */
-   { 24283, 0x00008126 }, /* GL_POINT_SIZE_MIN_SGIS */
-   { 24306, 0x00000B12 }, /* GL_POINT_SIZE_RANGE */
-   { 24326, 0x00000B10 }, /* GL_POINT_SMOOTH */
-   { 24342, 0x00000C51 }, /* GL_POINT_SMOOTH_HINT */
-   { 24363, 0x00008861 }, /* GL_POINT_SPRITE */
-   { 24379, 0x00008861 }, /* GL_POINT_SPRITE_ARB */
-   { 24399, 0x00008CA0 }, /* GL_POINT_SPRITE_COORD_ORIGIN */
-   { 24428, 0x00008861 }, /* GL_POINT_SPRITE_NV */
-   { 24447, 0x00008863 }, /* GL_POINT_SPRITE_R_MODE_NV */
-   { 24473, 0x00000701 }, /* GL_POINT_TOKEN */
-   { 24488, 0x00000009 }, /* GL_POLYGON */
-   { 24499, 0x00000008 }, /* GL_POLYGON_BIT */
-   { 24514, 0x00000B40 }, /* GL_POLYGON_MODE */
-   { 24530, 0x00008039 }, /* GL_POLYGON_OFFSET_BIAS */
-   { 24553, 0x00008038 }, /* GL_POLYGON_OFFSET_FACTOR */
-   { 24578, 0x00008037 }, /* GL_POLYGON_OFFSET_FILL */
-   { 24601, 0x00002A02 }, /* GL_POLYGON_OFFSET_LINE */
-   { 24624, 0x00002A01 }, /* GL_POLYGON_OFFSET_POINT */
-   { 24648, 0x00002A00 }, /* GL_POLYGON_OFFSET_UNITS */
-   { 24672, 0x00000B41 }, /* GL_POLYGON_SMOOTH */
-   { 24690, 0x00000C53 }, /* GL_POLYGON_SMOOTH_HINT */
-   { 24713, 0x00000B42 }, /* GL_POLYGON_STIPPLE */
-   { 24732, 0x00000010 }, /* GL_POLYGON_STIPPLE_BIT */
-   { 24755, 0x00000703 }, /* GL_POLYGON_TOKEN */
-   { 24772, 0x00001203 }, /* GL_POSITION */
-   { 24784, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
-   { 24816, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI */
-   { 24852, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
-   { 24885, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI */
-   { 24922, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
-   { 24953, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI */
-   { 24988, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
-   { 25020, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI */
-   { 25056, 0x000080D2 }, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
-   { 25089, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
-   { 25121, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI */
-   { 25157, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
-   { 25190, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI */
-   { 25227, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS */
-   { 25257, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS_SGI */
-   { 25291, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE */
-   { 25322, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE_SGI */
-   { 25357, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
-   { 25388, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS_EXT */
-   { 25423, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
-   { 25455, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE_EXT */
-   { 25491, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS */
-   { 25521, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS_EXT */
-   { 25555, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE */
-   { 25586, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE_EXT */
-   { 25621, 0x000080D1 }, /* GL_POST_CONVOLUTION_COLOR_TABLE */
-   { 25653, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS */
-   { 25684, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS_EXT */
-   { 25719, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE */
-   { 25751, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE_EXT */
-   { 25787, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS */
-   { 25816, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS_EXT */
-   { 25849, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE */
-   { 25879, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE_EXT */
-   { 25913, 0x0000817B }, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
-   { 25952, 0x00008179 }, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
-   { 25985, 0x0000817C }, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
-   { 26025, 0x0000817A }, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
-   { 26059, 0x00008578 }, /* GL_PREVIOUS */
-   { 26071, 0x00008578 }, /* GL_PREVIOUS_ARB */
-   { 26087, 0x00008578 }, /* GL_PREVIOUS_EXT */
-   { 26103, 0x00008577 }, /* GL_PRIMARY_COLOR */
-   { 26120, 0x00008577 }, /* GL_PRIMARY_COLOR_ARB */
-   { 26141, 0x00008577 }, /* GL_PRIMARY_COLOR_EXT */
-   { 26162, 0x000088B0 }, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
-   { 26195, 0x00008805 }, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
-   { 26227, 0x000088AC }, /* GL_PROGRAM_ATTRIBS_ARB */
-   { 26250, 0x00008677 }, /* GL_PROGRAM_BINDING_ARB */
-   { 26273, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_ARB */
-   { 26303, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_NV */
-   { 26332, 0x00008874 }, /* GL_PROGRAM_ERROR_STRING_ARB */
-   { 26360, 0x00008876 }, /* GL_PROGRAM_FORMAT_ARB */
-   { 26382, 0x00008875 }, /* GL_PROGRAM_FORMAT_ASCII_ARB */
-   { 26410, 0x000088A0 }, /* GL_PROGRAM_INSTRUCTIONS_ARB */
-   { 26438, 0x00008627 }, /* GL_PROGRAM_LENGTH_ARB */
-   { 26460, 0x00008627 }, /* GL_PROGRAM_LENGTH_NV */
-   { 26481, 0x000088B2 }, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-   { 26521, 0x00008808 }, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-   { 26560, 0x000088AE }, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
-   { 26590, 0x000088A2 }, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-   { 26625, 0x000088AA }, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
-   { 26658, 0x000088A6 }, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
-   { 26692, 0x0000880A }, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-   { 26731, 0x00008809 }, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-   { 26770, 0x00008B40 }, /* GL_PROGRAM_OBJECT_ARB */
-   { 26792, 0x000088A8 }, /* GL_PROGRAM_PARAMETERS_ARB */
-   { 26818, 0x00008644 }, /* GL_PROGRAM_PARAMETER_NV */
-   { 26842, 0x00008647 }, /* GL_PROGRAM_RESIDENT_NV */
-   { 26865, 0x00008628 }, /* GL_PROGRAM_STRING_ARB */
-   { 26887, 0x00008628 }, /* GL_PROGRAM_STRING_NV */
-   { 26908, 0x00008646 }, /* GL_PROGRAM_TARGET_NV */
-   { 26929, 0x000088A4 }, /* GL_PROGRAM_TEMPORARIES_ARB */
-   { 26956, 0x00008807 }, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
-   { 26988, 0x00008806 }, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
-   { 27020, 0x000088B6 }, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-   { 27055, 0x00001701 }, /* GL_PROJECTION */
-   { 27069, 0x00000BA7 }, /* GL_PROJECTION_MATRIX */
-   { 27090, 0x00000BA4 }, /* GL_PROJECTION_STACK_DEPTH */
-   { 27116, 0x000080D3 }, /* GL_PROXY_COLOR_TABLE */
-   { 27137, 0x00008025 }, /* GL_PROXY_HISTOGRAM */
-   { 27156, 0x00008025 }, /* GL_PROXY_HISTOGRAM_EXT */
-   { 27179, 0x000080D5 }, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
-   { 27218, 0x000080D4 }, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
-   { 27256, 0x00008063 }, /* GL_PROXY_TEXTURE_1D */
-   { 27276, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
-   { 27306, 0x00008063 }, /* GL_PROXY_TEXTURE_1D_EXT */
-   { 27330, 0x00008064 }, /* GL_PROXY_TEXTURE_2D */
-   { 27350, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
-   { 27380, 0x00008064 }, /* GL_PROXY_TEXTURE_2D_EXT */
-   { 27404, 0x00008070 }, /* GL_PROXY_TEXTURE_3D */
-   { 27424, 0x000080BD }, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
-   { 27457, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP */
-   { 27483, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP_ARB */
-   { 27513, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
-   { 27544, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_NV */
-   { 27574, 0x00002003 }, /* GL_Q */
-   { 27579, 0x00001209 }, /* GL_QUADRATIC_ATTENUATION */
-   { 27604, 0x00000007 }, /* GL_QUADS */
-   { 27613, 0x00008614 }, /* GL_QUAD_MESH_SUN */
-   { 27630, 0x00000008 }, /* GL_QUAD_STRIP */
-   { 27644, 0x00008864 }, /* GL_QUERY_COUNTER_BITS */
-   { 27666, 0x00008864 }, /* GL_QUERY_COUNTER_BITS_ARB */
-   { 27692, 0x00008866 }, /* GL_QUERY_RESULT */
-   { 27708, 0x00008866 }, /* GL_QUERY_RESULT_ARB */
-   { 27728, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE */
-   { 27754, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE_ARB */
-   { 27784, 0x00002002 }, /* GL_R */
-   { 27789, 0x00002A10 }, /* GL_R3_G3_B2 */
-   { 27801, 0x00019262 }, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
-   { 27834, 0x00000C02 }, /* GL_READ_BUFFER */
-   { 27849, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER */
-   { 27869, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
-   { 27901, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER_EXT */
-   { 27925, 0x000088B8 }, /* GL_READ_ONLY */
-   { 27938, 0x000088B8 }, /* GL_READ_ONLY_ARB */
-   { 27955, 0x000088BA }, /* GL_READ_WRITE */
-   { 27969, 0x000088BA }, /* GL_READ_WRITE_ARB */
-   { 27987, 0x00001903 }, /* GL_RED */
-   { 27994, 0x00008016 }, /* GL_REDUCE */
-   { 28004, 0x00008016 }, /* GL_REDUCE_EXT */
-   { 28018, 0x00000D15 }, /* GL_RED_BIAS */
-   { 28030, 0x00000D52 }, /* GL_RED_BITS */
-   { 28042, 0x00000D14 }, /* GL_RED_SCALE */
-   { 28055, 0x00008512 }, /* GL_REFLECTION_MAP */
-   { 28073, 0x00008512 }, /* GL_REFLECTION_MAP_ARB */
-   { 28095, 0x00008512 }, /* GL_REFLECTION_MAP_NV */
-   { 28116, 0x00001C00 }, /* GL_RENDER */
-   { 28126, 0x00008D41 }, /* GL_RENDERBUFFER */
-   { 28142, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE */
-   { 28169, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_EXT */
-   { 28197, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE */
-   { 28223, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE */
-   { 28250, 0x00008D41 }, /* GL_RENDERBUFFER_EXT */
-   { 28270, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE */
-   { 28297, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT */
-   { 28320, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_EXT */
-   { 28347, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
-   { 28379, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */
-   { 28415, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE */
-   { 28440, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES */
-   { 28464, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE */
-   { 28493, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH */
-   { 28515, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_EXT */
-   { 28541, 0x00001F01 }, /* GL_RENDERER */
-   { 28553, 0x00000C40 }, /* GL_RENDER_MODE */
-   { 28568, 0x00002901 }, /* GL_REPEAT */
-   { 28578, 0x00001E01 }, /* GL_REPLACE */
-   { 28589, 0x00008062 }, /* GL_REPLACE_EXT */
-   { 28604, 0x00008153 }, /* GL_REPLICATE_BORDER_HP */
-   { 28627, 0x0000803A }, /* GL_RESCALE_NORMAL */
-   { 28645, 0x0000803A }, /* GL_RESCALE_NORMAL_EXT */
-   { 28667, 0x00000102 }, /* GL_RETURN */
-   { 28677, 0x00001907 }, /* GL_RGB */
-   { 28684, 0x00008052 }, /* GL_RGB10 */
-   { 28693, 0x00008059 }, /* GL_RGB10_A2 */
-   { 28705, 0x00008059 }, /* GL_RGB10_A2_EXT */
-   { 28721, 0x00008052 }, /* GL_RGB10_EXT */
-   { 28734, 0x00008053 }, /* GL_RGB12 */
-   { 28743, 0x00008053 }, /* GL_RGB12_EXT */
-   { 28756, 0x00008054 }, /* GL_RGB16 */
-   { 28765, 0x00008054 }, /* GL_RGB16_EXT */
-   { 28778, 0x0000804E }, /* GL_RGB2_EXT */
-   { 28790, 0x0000804F }, /* GL_RGB4 */
-   { 28798, 0x0000804F }, /* GL_RGB4_EXT */
-   { 28810, 0x000083A1 }, /* GL_RGB4_S3TC */
-   { 28823, 0x00008050 }, /* GL_RGB5 */
-   { 28831, 0x00008057 }, /* GL_RGB5_A1 */
-   { 28842, 0x00008057 }, /* GL_RGB5_A1_EXT */
-   { 28857, 0x00008050 }, /* GL_RGB5_EXT */
-   { 28869, 0x00008051 }, /* GL_RGB8 */
-   { 28877, 0x00008051 }, /* GL_RGB8_EXT */
-   { 28889, 0x00001908 }, /* GL_RGBA */
-   { 28897, 0x0000805A }, /* GL_RGBA12 */
-   { 28907, 0x0000805A }, /* GL_RGBA12_EXT */
-   { 28921, 0x0000805B }, /* GL_RGBA16 */
-   { 28931, 0x0000805B }, /* GL_RGBA16_EXT */
-   { 28945, 0x00008055 }, /* GL_RGBA2 */
-   { 28954, 0x00008055 }, /* GL_RGBA2_EXT */
-   { 28967, 0x00008056 }, /* GL_RGBA4 */
-   { 28976, 0x000083A5 }, /* GL_RGBA4_DXT5_S3TC */
-   { 28995, 0x00008056 }, /* GL_RGBA4_EXT */
-   { 29008, 0x000083A3 }, /* GL_RGBA4_S3TC */
-   { 29022, 0x00008058 }, /* GL_RGBA8 */
-   { 29031, 0x00008058 }, /* GL_RGBA8_EXT */
-   { 29044, 0x000083A4 }, /* GL_RGBA_DXT5_S3TC */
-   { 29062, 0x00000C31 }, /* GL_RGBA_MODE */
-   { 29075, 0x000083A2 }, /* GL_RGBA_S3TC */
-   { 29088, 0x000083A0 }, /* GL_RGB_S3TC */
-   { 29100, 0x00008573 }, /* GL_RGB_SCALE */
-   { 29113, 0x00008573 }, /* GL_RGB_SCALE_ARB */
-   { 29130, 0x00008573 }, /* GL_RGB_SCALE_EXT */
-   { 29147, 0x00000407 }, /* GL_RIGHT */
-   { 29156, 0x00002000 }, /* GL_S */
-   { 29161, 0x00008B5D }, /* GL_SAMPLER_1D */
-   { 29175, 0x00008B61 }, /* GL_SAMPLER_1D_SHADOW */
-   { 29196, 0x00008B5E }, /* GL_SAMPLER_2D */
-   { 29210, 0x00008B62 }, /* GL_SAMPLER_2D_SHADOW */
-   { 29231, 0x00008B5F }, /* GL_SAMPLER_3D */
-   { 29245, 0x00008B60 }, /* GL_SAMPLER_CUBE */
-   { 29261, 0x000080A9 }, /* GL_SAMPLES */
-   { 29272, 0x000086B4 }, /* GL_SAMPLES_3DFX */
-   { 29288, 0x000080A9 }, /* GL_SAMPLES_ARB */
-   { 29303, 0x00008914 }, /* GL_SAMPLES_PASSED */
-   { 29321, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */
-   { 29343, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
-   { 29371, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */
-   { 29403, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */
-   { 29426, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */
-   { 29453, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */
-   { 29471, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */
-   { 29494, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */
-   { 29516, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */
-   { 29535, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */
-   { 29558, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */
-   { 29584, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */
-   { 29614, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */
-   { 29639, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */
-   { 29668, 0x00080000 }, /* GL_SCISSOR_BIT */
-   { 29683, 0x00000C10 }, /* GL_SCISSOR_BOX */
-   { 29698, 0x00000C11 }, /* GL_SCISSOR_TEST */
-   { 29714, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */
-   { 29739, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
-   { 29779, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */
-   { 29823, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
-   { 29856, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
-   { 29886, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
-   { 29918, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
-   { 29948, 0x00001C02 }, /* GL_SELECT */
-   { 29958, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */
-   { 29986, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */
-   { 30011, 0x00008012 }, /* GL_SEPARABLE_2D */
-   { 30027, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */
-   { 30054, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */
-   { 30085, 0x0000150F }, /* GL_SET */
-   { 30092, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */
-   { 30113, 0x00008B88 }, /* GL_SHADER_SOURCE_LENGTH */
-   { 30137, 0x00008B4F }, /* GL_SHADER_TYPE */
-   { 30152, 0x00000B54 }, /* GL_SHADE_MODEL */
-   { 30167, 0x00008B8C }, /* GL_SHADING_LANGUAGE_VERSION */
-   { 30195, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */
-   { 30218, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */
-   { 30248, 0x00001601 }, /* GL_SHININESS */
-   { 30261, 0x00001402 }, /* GL_SHORT */
-   { 30270, 0x000081F9 }, /* GL_SINGLE_COLOR */
-   { 30286, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */
-   { 30306, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */
-   { 30325, 0x00001D01 }, /* GL_SMOOTH */
-   { 30335, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */
-   { 30368, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */
-   { 30395, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */
-   { 30428, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */
-   { 30455, 0x00008588 }, /* GL_SOURCE0_ALPHA */
-   { 30472, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */
-   { 30493, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */
-   { 30514, 0x00008580 }, /* GL_SOURCE0_RGB */
-   { 30529, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */
-   { 30548, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */
-   { 30567, 0x00008589 }, /* GL_SOURCE1_ALPHA */
-   { 30584, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */
-   { 30605, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */
-   { 30626, 0x00008581 }, /* GL_SOURCE1_RGB */
-   { 30641, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */
-   { 30660, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */
-   { 30679, 0x0000858A }, /* GL_SOURCE2_ALPHA */
-   { 30696, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */
-   { 30717, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */
-   { 30738, 0x00008582 }, /* GL_SOURCE2_RGB */
-   { 30753, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */
-   { 30772, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */
-   { 30791, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */
-   { 30811, 0x00008583 }, /* GL_SOURCE3_RGB_NV */
-   { 30829, 0x00001202 }, /* GL_SPECULAR */
-   { 30841, 0x00002402 }, /* GL_SPHERE_MAP */
-   { 30855, 0x00001206 }, /* GL_SPOT_CUTOFF */
-   { 30870, 0x00001204 }, /* GL_SPOT_DIRECTION */
-   { 30888, 0x00001205 }, /* GL_SPOT_EXPONENT */
-   { 30905, 0x00008588 }, /* GL_SRC0_ALPHA */
-   { 30919, 0x00008580 }, /* GL_SRC0_RGB */
-   { 30931, 0x00008589 }, /* GL_SRC1_ALPHA */
-   { 30945, 0x00008581 }, /* GL_SRC1_RGB */
-   { 30957, 0x0000858A }, /* GL_SRC2_ALPHA */
-   { 30971, 0x00008582 }, /* GL_SRC2_RGB */
-   { 30983, 0x00000302 }, /* GL_SRC_ALPHA */
-   { 30996, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */
-   { 31018, 0x00000300 }, /* GL_SRC_COLOR */
-   { 31031, 0x00008C40 }, /* GL_SRGB */
-   { 31039, 0x00000503 }, /* GL_STACK_OVERFLOW */
-   { 31057, 0x00000504 }, /* GL_STACK_UNDERFLOW */
-   { 31076, 0x000088E6 }, /* GL_STATIC_COPY */
-   { 31091, 0x000088E6 }, /* GL_STATIC_COPY_ARB */
-   { 31110, 0x000088E4 }, /* GL_STATIC_DRAW */
-   { 31125, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */
-   { 31144, 0x000088E5 }, /* GL_STATIC_READ */
-   { 31159, 0x000088E5 }, /* GL_STATIC_READ_ARB */
-   { 31178, 0x00001802 }, /* GL_STENCIL */
-   { 31189, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT */
-   { 31211, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */
-   { 31237, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */
-   { 31258, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */
-   { 31283, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
-   { 31304, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */
-   { 31329, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-   { 31361, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */
-   { 31397, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
-   { 31429, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */
-   { 31465, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
-   { 31485, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
-   { 31512, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
-   { 31538, 0x00000D57 }, /* GL_STENCIL_BITS */
-   { 31554, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
-   { 31576, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
-   { 31599, 0x00000B94 }, /* GL_STENCIL_FAIL */
-   { 31615, 0x00000B92 }, /* GL_STENCIL_FUNC */
-   { 31631, 0x00001901 }, /* GL_STENCIL_INDEX */
-   { 31648, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
-   { 31671, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
-   { 31693, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
-   { 31715, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
-   { 31737, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
-   { 31758, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
-   { 31785, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
-   { 31812, 0x00000B97 }, /* GL_STENCIL_REF */
-   { 31827, 0x00000B90 }, /* GL_STENCIL_TEST */
-   { 31843, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
-   { 31872, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
-   { 31894, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
-   { 31915, 0x00000C33 }, /* GL_STEREO */
-   { 31925, 0x000088E2 }, /* GL_STREAM_COPY */
-   { 31940, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
-   { 31959, 0x000088E0 }, /* GL_STREAM_DRAW */
-   { 31974, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
-   { 31993, 0x000088E1 }, /* GL_STREAM_READ */
-   { 32008, 0x000088E1 }, /* GL_STREAM_READ_ARB */
-   { 32027, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
-   { 32044, 0x000084E7 }, /* GL_SUBTRACT */
-   { 32056, 0x000084E7 }, /* GL_SUBTRACT_ARB */
-   { 32072, 0x00002001 }, /* GL_T */
-   { 32077, 0x00002A2A }, /* GL_T2F_C3F_V3F */
-   { 32092, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
-   { 32111, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
-   { 32127, 0x00002A2B }, /* GL_T2F_N3F_V3F */
-   { 32142, 0x00002A27 }, /* GL_T2F_V3F */
-   { 32153, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
-   { 32172, 0x00002A28 }, /* GL_T4F_V4F */
-   { 32183, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
-   { 32206, 0x00001702 }, /* GL_TEXTURE */
-   { 32217, 0x000084C0 }, /* GL_TEXTURE0 */
-   { 32229, 0x000084C0 }, /* GL_TEXTURE0_ARB */
-   { 32245, 0x000084C1 }, /* GL_TEXTURE1 */
-   { 32257, 0x000084CA }, /* GL_TEXTURE10 */
-   { 32270, 0x000084CA }, /* GL_TEXTURE10_ARB */
-   { 32287, 0x000084CB }, /* GL_TEXTURE11 */
-   { 32300, 0x000084CB }, /* GL_TEXTURE11_ARB */
-   { 32317, 0x000084CC }, /* GL_TEXTURE12 */
-   { 32330, 0x000084CC }, /* GL_TEXTURE12_ARB */
-   { 32347, 0x000084CD }, /* GL_TEXTURE13 */
-   { 32360, 0x000084CD }, /* GL_TEXTURE13_ARB */
-   { 32377, 0x000084CE }, /* GL_TEXTURE14 */
-   { 32390, 0x000084CE }, /* GL_TEXTURE14_ARB */
-   { 32407, 0x000084CF }, /* GL_TEXTURE15 */
-   { 32420, 0x000084CF }, /* GL_TEXTURE15_ARB */
-   { 32437, 0x000084D0 }, /* GL_TEXTURE16 */
-   { 32450, 0x000084D0 }, /* GL_TEXTURE16_ARB */
-   { 32467, 0x000084D1 }, /* GL_TEXTURE17 */
-   { 32480, 0x000084D1 }, /* GL_TEXTURE17_ARB */
-   { 32497, 0x000084D2 }, /* GL_TEXTURE18 */
-   { 32510, 0x000084D2 }, /* GL_TEXTURE18_ARB */
-   { 32527, 0x000084D3 }, /* GL_TEXTURE19 */
-   { 32540, 0x000084D3 }, /* GL_TEXTURE19_ARB */
-   { 32557, 0x000084C1 }, /* GL_TEXTURE1_ARB */
-   { 32573, 0x000084C2 }, /* GL_TEXTURE2 */
-   { 32585, 0x000084D4 }, /* GL_TEXTURE20 */
-   { 32598, 0x000084D4 }, /* GL_TEXTURE20_ARB */
-   { 32615, 0x000084D5 }, /* GL_TEXTURE21 */
-   { 32628, 0x000084D5 }, /* GL_TEXTURE21_ARB */
-   { 32645, 0x000084D6 }, /* GL_TEXTURE22 */
-   { 32658, 0x000084D6 }, /* GL_TEXTURE22_ARB */
-   { 32675, 0x000084D7 }, /* GL_TEXTURE23 */
-   { 32688, 0x000084D7 }, /* GL_TEXTURE23_ARB */
-   { 32705, 0x000084D8 }, /* GL_TEXTURE24 */
-   { 32718, 0x000084D8 }, /* GL_TEXTURE24_ARB */
-   { 32735, 0x000084D9 }, /* GL_TEXTURE25 */
-   { 32748, 0x000084D9 }, /* GL_TEXTURE25_ARB */
-   { 32765, 0x000084DA }, /* GL_TEXTURE26 */
-   { 32778, 0x000084DA }, /* GL_TEXTURE26_ARB */
-   { 32795, 0x000084DB }, /* GL_TEXTURE27 */
-   { 32808, 0x000084DB }, /* GL_TEXTURE27_ARB */
-   { 32825, 0x000084DC }, /* GL_TEXTURE28 */
-   { 32838, 0x000084DC }, /* GL_TEXTURE28_ARB */
-   { 32855, 0x000084DD }, /* GL_TEXTURE29 */
-   { 32868, 0x000084DD }, /* GL_TEXTURE29_ARB */
-   { 32885, 0x000084C2 }, /* GL_TEXTURE2_ARB */
-   { 32901, 0x000084C3 }, /* GL_TEXTURE3 */
-   { 32913, 0x000084DE }, /* GL_TEXTURE30 */
-   { 32926, 0x000084DE }, /* GL_TEXTURE30_ARB */
-   { 32943, 0x000084DF }, /* GL_TEXTURE31 */
-   { 32956, 0x000084DF }, /* GL_TEXTURE31_ARB */
-   { 32973, 0x000084C3 }, /* GL_TEXTURE3_ARB */
-   { 32989, 0x000084C4 }, /* GL_TEXTURE4 */
-   { 33001, 0x000084C4 }, /* GL_TEXTURE4_ARB */
-   { 33017, 0x000084C5 }, /* GL_TEXTURE5 */
-   { 33029, 0x000084C5 }, /* GL_TEXTURE5_ARB */
-   { 33045, 0x000084C6 }, /* GL_TEXTURE6 */
-   { 33057, 0x000084C6 }, /* GL_TEXTURE6_ARB */
-   { 33073, 0x000084C7 }, /* GL_TEXTURE7 */
-   { 33085, 0x000084C7 }, /* GL_TEXTURE7_ARB */
-   { 33101, 0x000084C8 }, /* GL_TEXTURE8 */
-   { 33113, 0x000084C8 }, /* GL_TEXTURE8_ARB */
-   { 33129, 0x000084C9 }, /* GL_TEXTURE9 */
-   { 33141, 0x000084C9 }, /* GL_TEXTURE9_ARB */
-   { 33157, 0x00000DE0 }, /* GL_TEXTURE_1D */
-   { 33171, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
-   { 33195, 0x00000DE1 }, /* GL_TEXTURE_2D */
-   { 33209, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
-   { 33233, 0x0000806F }, /* GL_TEXTURE_3D */
-   { 33247, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
-   { 33269, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
-   { 33295, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
-   { 33317, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
-   { 33339, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
-   { 33371, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
-   { 33393, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
-   { 33425, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
-   { 33447, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
-   { 33475, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
-   { 33507, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
-   { 33540, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
-   { 33572, 0x00040000 }, /* GL_TEXTURE_BIT */
-   { 33587, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
-   { 33608, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
-   { 33633, 0x00001005 }, /* GL_TEXTURE_BORDER */
-   { 33651, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
-   { 33675, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-   { 33706, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
-   { 33736, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-   { 33766, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-   { 33801, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-   { 33832, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-   { 33870, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
-   { 33897, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
-   { 33929, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
-   { 33963, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
-   { 33987, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
-   { 34015, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
-   { 34039, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
-   { 34067, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-   { 34100, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
-   { 34124, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
-   { 34146, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
-   { 34168, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
-   { 34194, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
-   { 34228, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-   { 34261, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
-   { 34298, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
-   { 34326, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
-   { 34358, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
-   { 34381, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
-   { 34419, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
-   { 34461, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
-   { 34492, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-   { 34520, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
-   { 34550, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-   { 34578, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
-   { 34598, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
-   { 34622, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-   { 34653, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
-   { 34688, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-   { 34719, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
-   { 34754, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
-   { 34785, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
-   { 34820, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-   { 34851, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
-   { 34886, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-   { 34917, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
-   { 34952, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-   { 34983, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
-   { 35018, 0x00008071 }, /* GL_TEXTURE_DEPTH */
-   { 35035, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
-   { 35057, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
-   { 35083, 0x00002300 }, /* GL_TEXTURE_ENV */
-   { 35098, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
-   { 35119, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
-   { 35139, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
-   { 35165, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
-   { 35185, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
-   { 35202, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
-   { 35219, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
-   { 35236, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
-   { 35253, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
-   { 35278, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
-   { 35300, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
-   { 35326, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
-   { 35344, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
-   { 35370, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
-   { 35396, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
-   { 35426, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
-   { 35453, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
-   { 35478, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
-   { 35498, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
-   { 35522, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
-   { 35549, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-   { 35576, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-   { 35603, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
-   { 35629, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
-   { 35659, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
-   { 35681, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
-   { 35699, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
-   { 35729, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
-   { 35757, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-   { 35785, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-   { 35813, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
-   { 35834, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
-   { 35853, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
-   { 35875, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
-   { 35894, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
-   { 35914, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
-   { 35939, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
-   { 35963, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
-   { 35983, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
-   { 36007, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
-   { 36027, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
-   { 36050, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */
-   { 36074, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
-   { 36099, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
-   { 36133, 0x00001000 }, /* GL_TEXTURE_WIDTH */
-   { 36150, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
-   { 36168, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
-   { 36186, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
-   { 36204, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
-   { 36224, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
-   { 36243, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-   { 36272, 0x00001000 }, /* GL_TRANSFORM_BIT */
-   { 36289, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
-   { 36315, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
-   { 36345, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-   { 36377, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-   { 36407, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
-   { 36441, 0x0000862C }, /* GL_TRANSPOSE_NV */
-   { 36457, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-   { 36488, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
-   { 36523, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-   { 36551, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
-   { 36583, 0x00000004 }, /* GL_TRIANGLES */
-   { 36596, 0x00000006 }, /* GL_TRIANGLE_FAN */
-   { 36612, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
-   { 36633, 0x00000005 }, /* GL_TRIANGLE_STRIP */
-   { 36651, 0x00000001 }, /* GL_TRUE */
-   { 36659, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
-   { 36679, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
-   { 36702, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
-   { 36722, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
-   { 36743, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
-   { 36765, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
-   { 36787, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
-   { 36807, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
-   { 36828, 0x00001401 }, /* GL_UNSIGNED_BYTE */
-   { 36845, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-   { 36872, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
-   { 36895, 0x00001405 }, /* GL_UNSIGNED_INT */
-   { 36911, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
-   { 36938, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */
-   { 36959, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
-   { 36983, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-   { 37014, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
-   { 37038, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-   { 37066, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */
-   { 37089, 0x00001403 }, /* GL_UNSIGNED_SHORT */
-   { 37107, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-   { 37137, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-   { 37163, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-   { 37193, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-   { 37219, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
-   { 37243, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-   { 37271, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-   { 37299, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
-   { 37326, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-   { 37358, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
-   { 37389, 0x00008CA2 }, /* GL_UPPER_LEFT */
-   { 37403, 0x00002A20 }, /* GL_V2F */
-   { 37410, 0x00002A21 }, /* GL_V3F */
-   { 37417, 0x00008B83 }, /* GL_VALIDATE_STATUS */
-   { 37436, 0x00001F00 }, /* GL_VENDOR */
-   { 37446, 0x00001F02 }, /* GL_VERSION */
-   { 37457, 0x00008074 }, /* GL_VERTEX_ARRAY */
-   { 37473, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
-   { 37503, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-   { 37534, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
-   { 37569, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
-   { 37593, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
-   { 37614, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
-   { 37637, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
-   { 37658, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-   { 37685, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-   { 37713, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-   { 37741, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-   { 37769, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-   { 37797, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-   { 37825, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
-   { 37853, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-   { 37880, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-   { 37907, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-   { 37934, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-   { 37961, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-   { 37988, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-   { 38015, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-   { 38042, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-   { 38069, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-   { 38096, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-   { 38134, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
-   { 38176, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-   { 38207, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
-   { 38242, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
-   { 38276, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
-   { 38314, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-   { 38345, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
-   { 38380, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-   { 38408, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
-   { 38440, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-   { 38470, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
-   { 38504, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
-   { 38532, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
-   { 38564, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
-   { 38584, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
-   { 38606, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
-   { 38635, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
-   { 38656, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-   { 38685, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
-   { 38718, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
-   { 38750, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-   { 38777, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
-   { 38808, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
-   { 38838, 0x00008B31 }, /* GL_VERTEX_SHADER */
-   { 38855, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
-   { 38876, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
-   { 38903, 0x00000BA2 }, /* GL_VIEWPORT */
-   { 38915, 0x00000800 }, /* GL_VIEWPORT_BIT */
-   { 38931, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
-   { 38951, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-   { 38982, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
-   { 39017, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-   { 39045, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-   { 39070, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-   { 39097, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-   { 39122, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
-   { 39146, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
-   { 39165, 0x000088B9 }, /* GL_WRITE_ONLY */
-   { 39179, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
-   { 39197, 0x00001506 }, /* GL_XOR */
-   { 39204, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
-   { 39223, 0x00008757 }, /* GL_YCBCR_MESA */
-   { 39237, 0x00000000 }, /* GL_ZERO */
-   { 39245, 0x00000D16 }, /* GL_ZOOM_X */
-   { 39255, 0x00000D17 }, /* GL_ZOOM_Y */
+   {  1821, 0x0000877B }, /* GL_BUMP_ENVMAP_ATI */
+   {  1840, 0x00008777 }, /* GL_BUMP_NUM_TEX_UNITS_ATI */
+   {  1866, 0x00008775 }, /* GL_BUMP_ROT_MATRIX_ATI */
+   {  1889, 0x00008776 }, /* GL_BUMP_ROT_MATRIX_SIZE_ATI */
+   {  1917, 0x0000877C }, /* GL_BUMP_TARGET_ATI */
+   {  1936, 0x00008778 }, /* GL_BUMP_TEX_UNITS_ATI */
+   {  1958, 0x00001400 }, /* GL_BYTE */
+   {  1966, 0x00002A24 }, /* GL_C3F_V3F */
+   {  1977, 0x00002A26 }, /* GL_C4F_N3F_V3F */
+   {  1992, 0x00002A22 }, /* GL_C4UB_V2F */
+   {  2004, 0x00002A23 }, /* GL_C4UB_V3F */
+   {  2016, 0x00000901 }, /* GL_CCW */
+   {  2023, 0x00002900 }, /* GL_CLAMP */
+   {  2032, 0x0000812D }, /* GL_CLAMP_TO_BORDER */
+   {  2051, 0x0000812D }, /* GL_CLAMP_TO_BORDER_ARB */
+   {  2074, 0x0000812D }, /* GL_CLAMP_TO_BORDER_SGIS */
+   {  2098, 0x0000812F }, /* GL_CLAMP_TO_EDGE */
+   {  2115, 0x0000812F }, /* GL_CLAMP_TO_EDGE_SGIS */
+   {  2137, 0x00001500 }, /* GL_CLEAR */
+   {  2146, 0x000084E1 }, /* GL_CLIENT_ACTIVE_TEXTURE */
+   {  2171, 0x000084E1 }, /* GL_CLIENT_ACTIVE_TEXTURE_ARB */
+   {  2200, 0xFFFFFFFF }, /* GL_CLIENT_ALL_ATTRIB_BITS */
+   {  2226, 0x00000BB1 }, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
+   {  2255, 0x00000001 }, /* GL_CLIENT_PIXEL_STORE_BIT */
+   {  2281, 0x00000002 }, /* GL_CLIENT_VERTEX_ARRAY_BIT */
+   {  2308, 0x00003000 }, /* GL_CLIP_PLANE0 */
+   {  2323, 0x00003001 }, /* GL_CLIP_PLANE1 */
+   {  2338, 0x00003002 }, /* GL_CLIP_PLANE2 */
+   {  2353, 0x00003003 }, /* GL_CLIP_PLANE3 */
+   {  2368, 0x00003004 }, /* GL_CLIP_PLANE4 */
+   {  2383, 0x00003005 }, /* GL_CLIP_PLANE5 */
+   {  2398, 0x000080F0 }, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
+   {  2431, 0x00000A00 }, /* GL_COEFF */
+   {  2440, 0x00001800 }, /* GL_COLOR */
+   {  2449, 0x00008076 }, /* GL_COLOR_ARRAY */
+   {  2464, 0x00008898 }, /* GL_COLOR_ARRAY_BUFFER_BINDING */
+   {  2494, 0x00008898 }, /* GL_COLOR_ARRAY_BUFFER_BINDING_ARB */
+   {  2528, 0x00008090 }, /* GL_COLOR_ARRAY_POINTER */
+   {  2551, 0x00008081 }, /* GL_COLOR_ARRAY_SIZE */
+   {  2571, 0x00008083 }, /* GL_COLOR_ARRAY_STRIDE */
+   {  2593, 0x00008082 }, /* GL_COLOR_ARRAY_TYPE */
+   {  2613, 0x00008CE0 }, /* GL_COLOR_ATTACHMENT0 */
+   {  2634, 0x00008CE0 }, /* GL_COLOR_ATTACHMENT0_EXT */
+   {  2659, 0x00008CE1 }, /* GL_COLOR_ATTACHMENT1 */
+   {  2680, 0x00008CEA }, /* GL_COLOR_ATTACHMENT10 */
+   {  2702, 0x00008CEA }, /* GL_COLOR_ATTACHMENT10_EXT */
+   {  2728, 0x00008CEB }, /* GL_COLOR_ATTACHMENT11 */
+   {  2750, 0x00008CEB }, /* GL_COLOR_ATTACHMENT11_EXT */
+   {  2776, 0x00008CEC }, /* GL_COLOR_ATTACHMENT12 */
+   {  2798, 0x00008CEC }, /* GL_COLOR_ATTACHMENT12_EXT */
+   {  2824, 0x00008CED }, /* GL_COLOR_ATTACHMENT13 */
+   {  2846, 0x00008CED }, /* GL_COLOR_ATTACHMENT13_EXT */
+   {  2872, 0x00008CEE }, /* GL_COLOR_ATTACHMENT14 */
+   {  2894, 0x00008CEE }, /* GL_COLOR_ATTACHMENT14_EXT */
+   {  2920, 0x00008CEF }, /* GL_COLOR_ATTACHMENT15 */
+   {  2942, 0x00008CEF }, /* GL_COLOR_ATTACHMENT15_EXT */
+   {  2968, 0x00008CE1 }, /* GL_COLOR_ATTACHMENT1_EXT */
+   {  2993, 0x00008CE2 }, /* GL_COLOR_ATTACHMENT2 */
+   {  3014, 0x00008CE2 }, /* GL_COLOR_ATTACHMENT2_EXT */
+   {  3039, 0x00008CE3 }, /* GL_COLOR_ATTACHMENT3 */
+   {  3060, 0x00008CE3 }, /* GL_COLOR_ATTACHMENT3_EXT */
+   {  3085, 0x00008CE4 }, /* GL_COLOR_ATTACHMENT4 */
+   {  3106, 0x00008CE4 }, /* GL_COLOR_ATTACHMENT4_EXT */
+   {  3131, 0x00008CE5 }, /* GL_COLOR_ATTACHMENT5 */
+   {  3152, 0x00008CE5 }, /* GL_COLOR_ATTACHMENT5_EXT */
+   {  3177, 0x00008CE6 }, /* GL_COLOR_ATTACHMENT6 */
+   {  3198, 0x00008CE6 }, /* GL_COLOR_ATTACHMENT6_EXT */
+   {  3223, 0x00008CE7 }, /* GL_COLOR_ATTACHMENT7 */
+   {  3244, 0x00008CE7 }, /* GL_COLOR_ATTACHMENT7_EXT */
+   {  3269, 0x00008CE8 }, /* GL_COLOR_ATTACHMENT8 */
+   {  3290, 0x00008CE8 }, /* GL_COLOR_ATTACHMENT8_EXT */
+   {  3315, 0x00008CE9 }, /* GL_COLOR_ATTACHMENT9 */
+   {  3336, 0x00008CE9 }, /* GL_COLOR_ATTACHMENT9_EXT */
+   {  3361, 0x00004000 }, /* GL_COLOR_BUFFER_BIT */
+   {  3381, 0x00000C22 }, /* GL_COLOR_CLEAR_VALUE */
+   {  3402, 0x00001900 }, /* GL_COLOR_INDEX */
+   {  3417, 0x00001603 }, /* GL_COLOR_INDEXES */
+   {  3434, 0x00000BF2 }, /* GL_COLOR_LOGIC_OP */
+   {  3452, 0x00000B57 }, /* GL_COLOR_MATERIAL */
+   {  3470, 0x00000B55 }, /* GL_COLOR_MATERIAL_FACE */
+   {  3493, 0x00000B56 }, /* GL_COLOR_MATERIAL_PARAMETER */
+   {  3521, 0x000080B1 }, /* GL_COLOR_MATRIX */
+   {  3537, 0x000080B1 }, /* GL_COLOR_MATRIX_SGI */
+   {  3557, 0x000080B2 }, /* GL_COLOR_MATRIX_STACK_DEPTH */
+   {  3585, 0x000080B2 }, /* GL_COLOR_MATRIX_STACK_DEPTH_SGI */
+   {  3617, 0x00008458 }, /* GL_COLOR_SUM */
+   {  3630, 0x00008458 }, /* GL_COLOR_SUM_ARB */
+   {  3647, 0x000080D0 }, /* GL_COLOR_TABLE */
+   {  3662, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE */
+   {  3688, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE_EXT */
+   {  3718, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE_SGI */
+   {  3748, 0x000080D7 }, /* GL_COLOR_TABLE_BIAS */
+   {  3768, 0x000080D7 }, /* GL_COLOR_TABLE_BIAS_SGI */
+   {  3792, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE */
+   {  3817, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE_EXT */
+   {  3846, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE_SGI */
+   {  3875, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT */
+   {  3897, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT_EXT */
+   {  3923, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT_SGI */
+   {  3949, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE */
+   {  3975, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE_EXT */
+   {  4005, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE_SGI */
+   {  4035, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE */
+   {  4065, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE_EXT */
+   {  4099, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE_SGI */
+   {  4133, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE */
+   {  4163, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE_EXT */
+   {  4197, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE_SGI */
+   {  4231, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE */
+   {  4255, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE_EXT */
+   {  4283, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE_SGI */
+   {  4311, 0x000080D6 }, /* GL_COLOR_TABLE_SCALE */
+   {  4332, 0x000080D6 }, /* GL_COLOR_TABLE_SCALE_SGI */
+   {  4357, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH */
+   {  4378, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH_EXT */
+   {  4403, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH_SGI */
+   {  4428, 0x00000C23 }, /* GL_COLOR_WRITEMASK */
+   {  4447, 0x00008570 }, /* GL_COMBINE */
+   {  4458, 0x00008503 }, /* GL_COMBINE4 */
+   {  4470, 0x00008572 }, /* GL_COMBINE_ALPHA */
+   {  4487, 0x00008572 }, /* GL_COMBINE_ALPHA_ARB */
+   {  4508, 0x00008572 }, /* GL_COMBINE_ALPHA_EXT */
+   {  4529, 0x00008570 }, /* GL_COMBINE_ARB */
+   {  4544, 0x00008570 }, /* GL_COMBINE_EXT */
+   {  4559, 0x00008571 }, /* GL_COMBINE_RGB */
+   {  4574, 0x00008571 }, /* GL_COMBINE_RGB_ARB */
+   {  4593, 0x00008571 }, /* GL_COMBINE_RGB_EXT */
+   {  4612, 0x0000884E }, /* GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT */
+   {  4648, 0x0000884E }, /* GL_COMPARE_R_TO_TEXTURE */
+   {  4672, 0x0000884E }, /* GL_COMPARE_R_TO_TEXTURE_ARB */
+   {  4700, 0x00001300 }, /* GL_COMPILE */
+   {  4711, 0x00001301 }, /* GL_COMPILE_AND_EXECUTE */
+   {  4734, 0x00008B81 }, /* GL_COMPILE_STATUS */
+   {  4752, 0x000084E9 }, /* GL_COMPRESSED_ALPHA */
+   {  4772, 0x000084E9 }, /* GL_COMPRESSED_ALPHA_ARB */
+   {  4796, 0x000084EC }, /* GL_COMPRESSED_INTENSITY */
+   {  4820, 0x000084EC }, /* GL_COMPRESSED_INTENSITY_ARB */
+   {  4848, 0x000084EA }, /* GL_COMPRESSED_LUMINANCE */
+   {  4872, 0x000084EB }, /* GL_COMPRESSED_LUMINANCE_ALPHA */
+   {  4902, 0x000084EB }, /* GL_COMPRESSED_LUMINANCE_ALPHA_ARB */
+   {  4936, 0x000084EA }, /* GL_COMPRESSED_LUMINANCE_ARB */
+   {  4964, 0x000084ED }, /* GL_COMPRESSED_RGB */
+   {  4982, 0x000084EE }, /* GL_COMPRESSED_RGBA */
+   {  5001, 0x000084EE }, /* GL_COMPRESSED_RGBA_ARB */
+   {  5024, 0x000086B1 }, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
+   {  5053, 0x000083F1 }, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
+   {  5086, 0x000083F2 }, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
+   {  5119, 0x000083F3 }, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */
+   {  5152, 0x000084ED }, /* GL_COMPRESSED_RGB_ARB */
+   {  5174, 0x000086B0 }, /* GL_COMPRESSED_RGB_FXT1_3DFX */
+   {  5202, 0x000083F0 }, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
+   {  5234, 0x000086A3 }, /* GL_COMPRESSED_TEXTURE_FORMATS */
+   {  5264, 0x00008576 }, /* GL_CONSTANT */
+   {  5276, 0x00008003 }, /* GL_CONSTANT_ALPHA */
+   {  5294, 0x00008003 }, /* GL_CONSTANT_ALPHA_EXT */
+   {  5316, 0x00008576 }, /* GL_CONSTANT_ARB */
+   {  5332, 0x00001207 }, /* GL_CONSTANT_ATTENUATION */
+   {  5356, 0x00008151 }, /* GL_CONSTANT_BORDER_HP */
+   {  5378, 0x00008001 }, /* GL_CONSTANT_COLOR */
+   {  5396, 0x00008001 }, /* GL_CONSTANT_COLOR_EXT */
+   {  5418, 0x00008576 }, /* GL_CONSTANT_EXT */
+   {  5434, 0x00008010 }, /* GL_CONVOLUTION_1D */
+   {  5452, 0x00008011 }, /* GL_CONVOLUTION_2D */
+   {  5470, 0x00008154 }, /* GL_CONVOLUTION_BORDER_COLOR */
+   {  5498, 0x00008154 }, /* GL_CONVOLUTION_BORDER_COLOR_HP */
+   {  5529, 0x00008013 }, /* GL_CONVOLUTION_BORDER_MODE */
+   {  5556, 0x00008013 }, /* GL_CONVOLUTION_BORDER_MODE_EXT */
+   {  5587, 0x00008015 }, /* GL_CONVOLUTION_FILTER_BIAS */
+   {  5614, 0x00008015 }, /* GL_CONVOLUTION_FILTER_BIAS_EXT */
+   {  5645, 0x00008014 }, /* GL_CONVOLUTION_FILTER_SCALE */
+   {  5673, 0x00008014 }, /* GL_CONVOLUTION_FILTER_SCALE_EXT */
+   {  5705, 0x00008017 }, /* GL_CONVOLUTION_FORMAT */
+   {  5727, 0x00008017 }, /* GL_CONVOLUTION_FORMAT_EXT */
+   {  5753, 0x00008019 }, /* GL_CONVOLUTION_HEIGHT */
+   {  5775, 0x00008019 }, /* GL_CONVOLUTION_HEIGHT_EXT */
+   {  5801, 0x00008018 }, /* GL_CONVOLUTION_WIDTH */
+   {  5822, 0x00008018 }, /* GL_CONVOLUTION_WIDTH_EXT */
+   {  5847, 0x00008862 }, /* GL_COORD_REPLACE */
+   {  5864, 0x00008862 }, /* GL_COORD_REPLACE_ARB */
+   {  5885, 0x00008862 }, /* GL_COORD_REPLACE_NV */
+   {  5905, 0x00001503 }, /* GL_COPY */
+   {  5913, 0x0000150C }, /* GL_COPY_INVERTED */
+   {  5930, 0x00000706 }, /* GL_COPY_PIXEL_TOKEN */
+   {  5950, 0x00000B44 }, /* GL_CULL_FACE */
+   {  5963, 0x00000B45 }, /* GL_CULL_FACE_MODE */
+   {  5981, 0x000081AA }, /* GL_CULL_VERTEX_EXT */
+   {  6000, 0x000081AC }, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
+   {  6032, 0x000081AB }, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
+   {  6067, 0x00008626 }, /* GL_CURRENT_ATTRIB_NV */
+   {  6088, 0x00000001 }, /* GL_CURRENT_BIT */
+   {  6103, 0x00000B00 }, /* GL_CURRENT_COLOR */
+   {  6120, 0x00008453 }, /* GL_CURRENT_FOG_COORD */
+   {  6141, 0x00008453 }, /* GL_CURRENT_FOG_COORDINATE */
+   {  6167, 0x00000B01 }, /* GL_CURRENT_INDEX */
+   {  6184, 0x00008641 }, /* GL_CURRENT_MATRIX_ARB */
+   {  6206, 0x00008845 }, /* GL_CURRENT_MATRIX_INDEX_ARB */
+   {  6234, 0x00008641 }, /* GL_CURRENT_MATRIX_NV */
+   {  6255, 0x00008640 }, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
+   {  6289, 0x00008640 }, /* GL_CURRENT_MATRIX_STACK_DEPTH_NV */
+   {  6322, 0x00000B02 }, /* GL_CURRENT_NORMAL */
+   {  6340, 0x00008843 }, /* GL_CURRENT_PALETTE_MATRIX_ARB */
+   {  6370, 0x00008B8D }, /* GL_CURRENT_PROGRAM */
+   {  6389, 0x00008865 }, /* GL_CURRENT_QUERY */
+   {  6406, 0x00008865 }, /* GL_CURRENT_QUERY_ARB */
+   {  6427, 0x00000B04 }, /* GL_CURRENT_RASTER_COLOR */
+   {  6451, 0x00000B09 }, /* GL_CURRENT_RASTER_DISTANCE */
+   {  6478, 0x00000B05 }, /* GL_CURRENT_RASTER_INDEX */
+   {  6502, 0x00000B07 }, /* GL_CURRENT_RASTER_POSITION */
+   {  6529, 0x00000B08 }, /* GL_CURRENT_RASTER_POSITION_VALID */
+   {  6562, 0x00000B06 }, /* GL_CURRENT_RASTER_TEXTURE_COORDS */
+   {  6595, 0x00008459 }, /* GL_CURRENT_SECONDARY_COLOR */
+   {  6622, 0x00000B03 }, /* GL_CURRENT_TEXTURE_COORDS */
+   {  6648, 0x00008626 }, /* GL_CURRENT_VERTEX_ATTRIB */
+   {  6673, 0x00008626 }, /* GL_CURRENT_VERTEX_ATTRIB_ARB */
+   {  6702, 0x000086A8 }, /* GL_CURRENT_WEIGHT_ARB */
+   {  6724, 0x00000900 }, /* GL_CW */
+   {  6730, 0x0000875B }, /* GL_DEBUG_ASSERT_MESA */
+   {  6751, 0x00008759 }, /* GL_DEBUG_OBJECT_MESA */
+   {  6772, 0x0000875A }, /* GL_DEBUG_PRINT_MESA */
+   {  6792, 0x00002101 }, /* GL_DECAL */
+   {  6801, 0x00001E03 }, /* GL_DECR */
+   {  6809, 0x00008508 }, /* GL_DECR_WRAP */
+   {  6822, 0x00008508 }, /* GL_DECR_WRAP_EXT */
+   {  6839, 0x00008B80 }, /* GL_DELETE_STATUS */
+   {  6856, 0x00001801 }, /* GL_DEPTH */
+   {  6865, 0x000088F0 }, /* GL_DEPTH24_STENCIL8 */
+   {  6885, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT */
+   {  6905, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT_EXT */
+   {  6929, 0x00000D1F }, /* GL_DEPTH_BIAS */
+   {  6943, 0x00000D56 }, /* GL_DEPTH_BITS */
+   {  6957, 0x00008891 }, /* GL_DEPTH_BOUNDS_EXT */
+   {  6977, 0x00008890 }, /* GL_DEPTH_BOUNDS_TEST_EXT */
+   {  7002, 0x00000100 }, /* GL_DEPTH_BUFFER_BIT */
+   {  7022, 0x0000864F }, /* GL_DEPTH_CLAMP_NV */
+   {  7040, 0x00000B73 }, /* GL_DEPTH_CLEAR_VALUE */
+   {  7061, 0x00001902 }, /* GL_DEPTH_COMPONENT */
+   {  7080, 0x000081A5 }, /* GL_DEPTH_COMPONENT16 */
+   {  7101, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_ARB */
+   {  7126, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_SGIX */
+   {  7152, 0x000081A6 }, /* GL_DEPTH_COMPONENT24 */
+   {  7173, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_ARB */
+   {  7198, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_SGIX */
+   {  7224, 0x000081A7 }, /* GL_DEPTH_COMPONENT32 */
+   {  7245, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_ARB */
+   {  7270, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_SGIX */
+   {  7296, 0x00000B74 }, /* GL_DEPTH_FUNC */
+   {  7310, 0x00000B70 }, /* GL_DEPTH_RANGE */
+   {  7325, 0x00000D1E }, /* GL_DEPTH_SCALE */
+   {  7340, 0x000084F9 }, /* GL_DEPTH_STENCIL */
+   {  7357, 0x0000821A }, /* GL_DEPTH_STENCIL_ATTACHMENT */
+   {  7385, 0x000084F9 }, /* GL_DEPTH_STENCIL_NV */
+   {  7405, 0x0000886F }, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
+   {  7433, 0x0000886E }, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
+   {  7461, 0x00000B71 }, /* GL_DEPTH_TEST */
+   {  7475, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE */
+   {  7497, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE_ARB */
+   {  7523, 0x00000B72 }, /* GL_DEPTH_WRITEMASK */
+   {  7542, 0x00001201 }, /* GL_DIFFUSE */
+   {  7553, 0x00000BD0 }, /* GL_DITHER */
+   {  7563, 0x00000A02 }, /* GL_DOMAIN */
+   {  7573, 0x00001100 }, /* GL_DONT_CARE */
+   {  7586, 0x000086AE }, /* GL_DOT3_RGB */
+   {  7598, 0x000086AF }, /* GL_DOT3_RGBA */
+   {  7611, 0x000086AF }, /* GL_DOT3_RGBA_ARB */
+   {  7628, 0x00008741 }, /* GL_DOT3_RGBA_EXT */
+   {  7645, 0x000086AE }, /* GL_DOT3_RGB_ARB */
+   {  7661, 0x00008740 }, /* GL_DOT3_RGB_EXT */
+   {  7677, 0x0000140A }, /* GL_DOUBLE */
+   {  7687, 0x00000C32 }, /* GL_DOUBLEBUFFER */
+   {  7703, 0x00000C01 }, /* GL_DRAW_BUFFER */
+   {  7718, 0x00008825 }, /* GL_DRAW_BUFFER0 */
+   {  7734, 0x00008825 }, /* GL_DRAW_BUFFER0_ARB */
+   {  7754, 0x00008825 }, /* GL_DRAW_BUFFER0_ATI */
+   {  7774, 0x00008826 }, /* GL_DRAW_BUFFER1 */
+   {  7790, 0x0000882F }, /* GL_DRAW_BUFFER10 */
+   {  7807, 0x0000882F }, /* GL_DRAW_BUFFER10_ARB */
+   {  7828, 0x0000882F }, /* GL_DRAW_BUFFER10_ATI */
+   {  7849, 0x00008830 }, /* GL_DRAW_BUFFER11 */
+   {  7866, 0x00008830 }, /* GL_DRAW_BUFFER11_ARB */
+   {  7887, 0x00008830 }, /* GL_DRAW_BUFFER11_ATI */
+   {  7908, 0x00008831 }, /* GL_DRAW_BUFFER12 */
+   {  7925, 0x00008831 }, /* GL_DRAW_BUFFER12_ARB */
+   {  7946, 0x00008831 }, /* GL_DRAW_BUFFER12_ATI */
+   {  7967, 0x00008832 }, /* GL_DRAW_BUFFER13 */
+   {  7984, 0x00008832 }, /* GL_DRAW_BUFFER13_ARB */
+   {  8005, 0x00008832 }, /* GL_DRAW_BUFFER13_ATI */
+   {  8026, 0x00008833 }, /* GL_DRAW_BUFFER14 */
+   {  8043, 0x00008833 }, /* GL_DRAW_BUFFER14_ARB */
+   {  8064, 0x00008833 }, /* GL_DRAW_BUFFER14_ATI */
+   {  8085, 0x00008834 }, /* GL_DRAW_BUFFER15 */
+   {  8102, 0x00008834 }, /* GL_DRAW_BUFFER15_ARB */
+   {  8123, 0x00008834 }, /* GL_DRAW_BUFFER15_ATI */
+   {  8144, 0x00008826 }, /* GL_DRAW_BUFFER1_ARB */
+   {  8164, 0x00008826 }, /* GL_DRAW_BUFFER1_ATI */
+   {  8184, 0x00008827 }, /* GL_DRAW_BUFFER2 */
+   {  8200, 0x00008827 }, /* GL_DRAW_BUFFER2_ARB */
+   {  8220, 0x00008827 }, /* GL_DRAW_BUFFER2_ATI */
+   {  8240, 0x00008828 }, /* GL_DRAW_BUFFER3 */
+   {  8256, 0x00008828 }, /* GL_DRAW_BUFFER3_ARB */
+   {  8276, 0x00008828 }, /* GL_DRAW_BUFFER3_ATI */
+   {  8296, 0x00008829 }, /* GL_DRAW_BUFFER4 */
+   {  8312, 0x00008829 }, /* GL_DRAW_BUFFER4_ARB */
+   {  8332, 0x00008829 }, /* GL_DRAW_BUFFER4_ATI */
+   {  8352, 0x0000882A }, /* GL_DRAW_BUFFER5 */
+   {  8368, 0x0000882A }, /* GL_DRAW_BUFFER5_ARB */
+   {  8388, 0x0000882A }, /* GL_DRAW_BUFFER5_ATI */
+   {  8408, 0x0000882B }, /* GL_DRAW_BUFFER6 */
+   {  8424, 0x0000882B }, /* GL_DRAW_BUFFER6_ARB */
+   {  8444, 0x0000882B }, /* GL_DRAW_BUFFER6_ATI */
+   {  8464, 0x0000882C }, /* GL_DRAW_BUFFER7 */
+   {  8480, 0x0000882C }, /* GL_DRAW_BUFFER7_ARB */
+   {  8500, 0x0000882C }, /* GL_DRAW_BUFFER7_ATI */
+   {  8520, 0x0000882D }, /* GL_DRAW_BUFFER8 */
+   {  8536, 0x0000882D }, /* GL_DRAW_BUFFER8_ARB */
+   {  8556, 0x0000882D }, /* GL_DRAW_BUFFER8_ATI */
+   {  8576, 0x0000882E }, /* GL_DRAW_BUFFER9 */
+   {  8592, 0x0000882E }, /* GL_DRAW_BUFFER9_ARB */
+   {  8612, 0x0000882E }, /* GL_DRAW_BUFFER9_ATI */
+   {  8632, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER */
+   {  8652, 0x00008CA6 }, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
+   {  8684, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER_EXT */
+   {  8708, 0x00000705 }, /* GL_DRAW_PIXEL_TOKEN */
+   {  8728, 0x00000304 }, /* GL_DST_ALPHA */
+   {  8741, 0x00000306 }, /* GL_DST_COLOR */
+   {  8754, 0x0000877A }, /* GL_DU8DV8_ATI */
+   {  8768, 0x00008779 }, /* GL_DUDV_ATI */
+   {  8780, 0x000088EA }, /* GL_DYNAMIC_COPY */
+   {  8796, 0x000088EA }, /* GL_DYNAMIC_COPY_ARB */
+   {  8816, 0x000088E8 }, /* GL_DYNAMIC_DRAW */
+   {  8832, 0x000088E8 }, /* GL_DYNAMIC_DRAW_ARB */
+   {  8852, 0x000088E9 }, /* GL_DYNAMIC_READ */
+   {  8868, 0x000088E9 }, /* GL_DYNAMIC_READ_ARB */
+   {  8888, 0x00000B43 }, /* GL_EDGE_FLAG */
+   {  8901, 0x00008079 }, /* GL_EDGE_FLAG_ARRAY */
+   {  8920, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
+   {  8954, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB */
+   {  8992, 0x00008093 }, /* GL_EDGE_FLAG_ARRAY_POINTER */
+   {  9019, 0x0000808C }, /* GL_EDGE_FLAG_ARRAY_STRIDE */
+   {  9045, 0x00008893 }, /* GL_ELEMENT_ARRAY_BUFFER */
+   {  9069, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
+   {  9101, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB */
+   {  9137, 0x00001600 }, /* GL_EMISSION */
+   {  9149, 0x00002000 }, /* GL_ENABLE_BIT */
+   {  9163, 0x00000202 }, /* GL_EQUAL */
+   {  9172, 0x00001509 }, /* GL_EQUIV */
+   {  9181, 0x00010000 }, /* GL_EVAL_BIT */
+   {  9193, 0x00000800 }, /* GL_EXP */
+   {  9200, 0x00000801 }, /* GL_EXP2 */
+   {  9208, 0x00001F03 }, /* GL_EXTENSIONS */
+   {  9222, 0x00002400 }, /* GL_EYE_LINEAR */
+   {  9236, 0x00002502 }, /* GL_EYE_PLANE */
+   {  9249, 0x0000855C }, /* GL_EYE_PLANE_ABSOLUTE_NV */
+   {  9274, 0x0000855B }, /* GL_EYE_RADIAL_NV */
+   {  9291, 0x00000000 }, /* GL_FALSE */
+   {  9300, 0x00001101 }, /* GL_FASTEST */
+   {  9311, 0x00001C01 }, /* GL_FEEDBACK */
+   {  9323, 0x00000DF0 }, /* GL_FEEDBACK_BUFFER_POINTER */
+   {  9350, 0x00000DF1 }, /* GL_FEEDBACK_BUFFER_SIZE */
+   {  9374, 0x00000DF2 }, /* GL_FEEDBACK_BUFFER_TYPE */
+   {  9398, 0x00001B02 }, /* GL_FILL */
+   {  9406, 0x00001D00 }, /* GL_FLAT */
+   {  9414, 0x00001406 }, /* GL_FLOAT */
+   {  9423, 0x00008B5A }, /* GL_FLOAT_MAT2 */
+   {  9437, 0x00008B5A }, /* GL_FLOAT_MAT2_ARB */
+   {  9455, 0x00008B5B }, /* GL_FLOAT_MAT3 */
+   {  9469, 0x00008B5B }, /* GL_FLOAT_MAT3_ARB */
+   {  9487, 0x00008B5C }, /* GL_FLOAT_MAT4 */
+   {  9501, 0x00008B5C }, /* GL_FLOAT_MAT4_ARB */
+   {  9519, 0x00008B50 }, /* GL_FLOAT_VEC2 */
+   {  9533, 0x00008B50 }, /* GL_FLOAT_VEC2_ARB */
+   {  9551, 0x00008B51 }, /* GL_FLOAT_VEC3 */
+   {  9565, 0x00008B51 }, /* GL_FLOAT_VEC3_ARB */
+   {  9583, 0x00008B52 }, /* GL_FLOAT_VEC4 */
+   {  9597, 0x00008B52 }, /* GL_FLOAT_VEC4_ARB */
+   {  9615, 0x00000B60 }, /* GL_FOG */
+   {  9622, 0x00000080 }, /* GL_FOG_BIT */
+   {  9633, 0x00000B66 }, /* GL_FOG_COLOR */
+   {  9646, 0x00008451 }, /* GL_FOG_COORD */
+   {  9659, 0x00008451 }, /* GL_FOG_COORDINATE */
+   {  9677, 0x00008457 }, /* GL_FOG_COORDINATE_ARRAY */
+   {  9701, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
+   {  9740, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB */
+   {  9783, 0x00008456 }, /* GL_FOG_COORDINATE_ARRAY_POINTER */
+   {  9815, 0x00008455 }, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
+   {  9846, 0x00008454 }, /* GL_FOG_COORDINATE_ARRAY_TYPE */
+   {  9875, 0x00008450 }, /* GL_FOG_COORDINATE_SOURCE */
+   {  9900, 0x00008457 }, /* GL_FOG_COORD_ARRAY */
+   {  9919, 0x0000889D }, /* GL_FOG_COORD_ARRAY_BUFFER_BINDING */
+   {  9953, 0x00008456 }, /* GL_FOG_COORD_ARRAY_POINTER */
+   {  9980, 0x00008455 }, /* GL_FOG_COORD_ARRAY_STRIDE */
+   { 10006, 0x00008454 }, /* GL_FOG_COORD_ARRAY_TYPE */
+   { 10030, 0x00008450 }, /* GL_FOG_COORD_SRC */
+   { 10047, 0x00000B62 }, /* GL_FOG_DENSITY */
+   { 10062, 0x0000855A }, /* GL_FOG_DISTANCE_MODE_NV */
+   { 10086, 0x00000B64 }, /* GL_FOG_END */
+   { 10097, 0x00000C54 }, /* GL_FOG_HINT */
+   { 10109, 0x00000B61 }, /* GL_FOG_INDEX */
+   { 10122, 0x00000B65 }, /* GL_FOG_MODE */
+   { 10134, 0x00008198 }, /* GL_FOG_OFFSET_SGIX */
+   { 10153, 0x00008199 }, /* GL_FOG_OFFSET_VALUE_SGIX */
+   { 10178, 0x00000B63 }, /* GL_FOG_START */
+   { 10191, 0x00008452 }, /* GL_FRAGMENT_DEPTH */
+   { 10209, 0x00008804 }, /* GL_FRAGMENT_PROGRAM_ARB */
+   { 10233, 0x00008B30 }, /* GL_FRAGMENT_SHADER */
+   { 10252, 0x00008B30 }, /* GL_FRAGMENT_SHADER_ARB */
+   { 10275, 0x00008B8B }, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
+   { 10310, 0x00008D40 }, /* GL_FRAMEBUFFER */
+   { 10325, 0x00008215 }, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
+   { 10362, 0x00008214 }, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
+   { 10398, 0x00008210 }, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
+   { 10439, 0x00008211 }, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
+   { 10480, 0x00008216 }, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
+   { 10517, 0x00008213 }, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
+   { 10554, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
+   { 10592, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT */
+   { 10634, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
+   { 10672, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT */
+   { 10714, 0x00008212 }, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
+   { 10749, 0x00008217 }, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
+   { 10788, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT */
+   { 10837, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
+   { 10885, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT */
+   { 10937, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+   { 10977, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
+   { 11021, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
+   { 11061, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT */
+   { 11105, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING_EXT */
+   { 11132, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE */
+   { 11156, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE_EXT */
+   { 11184, 0x00008218 }, /* GL_FRAMEBUFFER_DEFAULT */
+   { 11207, 0x00008D40 }, /* GL_FRAMEBUFFER_EXT */
+   { 11226, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
+   { 11263, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT */
+   { 11304, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
+   { 11345, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
+   { 11387, 0x00008CD8 }, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
+   { 11438, 0x00008CDA }, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
+   { 11476, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
+   { 11521, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT */
+   { 11570, 0x00008D56 }, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
+   { 11608, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
+   { 11650, 0x00008CDE }, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
+   { 11682, 0x00008219 }, /* GL_FRAMEBUFFER_UNDEFINED */
+   { 11707, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED */
+   { 11734, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED_EXT */
+   { 11765, 0x00000404 }, /* GL_FRONT */
+   { 11774, 0x00000408 }, /* GL_FRONT_AND_BACK */
+   { 11792, 0x00000B46 }, /* GL_FRONT_FACE */
+   { 11806, 0x00000400 }, /* GL_FRONT_LEFT */
+   { 11820, 0x00000401 }, /* GL_FRONT_RIGHT */
+   { 11835, 0x00008006 }, /* GL_FUNC_ADD */
+   { 11847, 0x00008006 }, /* GL_FUNC_ADD_EXT */
+   { 11863, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT */
+   { 11888, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT_EXT */
+   { 11917, 0x0000800A }, /* GL_FUNC_SUBTRACT */
+   { 11934, 0x0000800A }, /* GL_FUNC_SUBTRACT_EXT */
+   { 11955, 0x00008191 }, /* GL_GENERATE_MIPMAP */
+   { 11974, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT */
+   { 11998, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT_SGIS */
+   { 12027, 0x00008191 }, /* GL_GENERATE_MIPMAP_SGIS */
+   { 12051, 0x00000206 }, /* GL_GEQUAL */
+   { 12061, 0x00008009 }, /* GL_GL_BLEND_EQUATION_RGB */
+   { 12086, 0x00008C4A }, /* GL_GL_COMPRESSED_SLUMINANCE */
+   { 12114, 0x00008C4B }, /* GL_GL_COMPRESSED_SLUMINANCE_ALPHA */
+   { 12148, 0x00008C48 }, /* GL_GL_COMPRESSED_SRGB */
+   { 12170, 0x00008C49 }, /* GL_GL_COMPRESSED_SRGB_ALPHA */
+   { 12198, 0x0000845F }, /* GL_GL_CURRENT_RASTER_SECONDARY_COLOR */
+   { 12235, 0x00008B65 }, /* GL_GL_FLOAT_MAT2x3 */
+   { 12254, 0x00008B66 }, /* GL_GL_FLOAT_MAT2x4 */
+   { 12273, 0x00008B67 }, /* GL_GL_FLOAT_MAT3x2 */
+   { 12292, 0x00008B68 }, /* GL_GL_FLOAT_MAT3x4 */
+   { 12311, 0x00008B69 }, /* GL_GL_FLOAT_MAT4x2 */
+   { 12330, 0x00008B6A }, /* GL_GL_FLOAT_MAT4x3 */
+   { 12349, 0x000088EB }, /* GL_GL_PIXEL_PACK_BUFFER */
+   { 12373, 0x000088ED }, /* GL_GL_PIXEL_PACK_BUFFER_BINDING */
+   { 12405, 0x000088EC }, /* GL_GL_PIXEL_UNPACK_BUFFER */
+   { 12431, 0x000088EF }, /* GL_GL_PIXEL_UNPACK_BUFFER_BINDING */
+   { 12465, 0x00008C46 }, /* GL_GL_SLUMINANCE */
+   { 12482, 0x00008C47 }, /* GL_GL_SLUMINANCE8 */
+   { 12500, 0x00008C45 }, /* GL_GL_SLUMINANCE8_ALPHA8 */
+   { 12525, 0x00008C44 }, /* GL_GL_SLUMINANCE_ALPHA */
+   { 12548, 0x00008C40 }, /* GL_GL_SRGB */
+   { 12559, 0x00008C41 }, /* GL_GL_SRGB8 */
+   { 12571, 0x00008C43 }, /* GL_GL_SRGB8_ALPHA8 */
+   { 12590, 0x00008C42 }, /* GL_GL_SRGB_ALPHA */
+   { 12607, 0x00000204 }, /* GL_GREATER */
+   { 12618, 0x00001904 }, /* GL_GREEN */
+   { 12627, 0x00000D19 }, /* GL_GREEN_BIAS */
+   { 12641, 0x00000D53 }, /* GL_GREEN_BITS */
+   { 12655, 0x00000D18 }, /* GL_GREEN_SCALE */
+   { 12670, 0x00008000 }, /* GL_HINT_BIT */
+   { 12682, 0x00008024 }, /* GL_HISTOGRAM */
+   { 12695, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE */
+   { 12719, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE_EXT */
+   { 12747, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE */
+   { 12770, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE_EXT */
+   { 12797, 0x00008024 }, /* GL_HISTOGRAM_EXT */
+   { 12814, 0x00008027 }, /* GL_HISTOGRAM_FORMAT */
+   { 12834, 0x00008027 }, /* GL_HISTOGRAM_FORMAT_EXT */
+   { 12858, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE */
+   { 12882, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE_EXT */
+   { 12910, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE */
+   { 12938, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE_EXT */
+   { 12970, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE */
+   { 12992, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE_EXT */
+   { 13018, 0x0000802D }, /* GL_HISTOGRAM_SINK */
+   { 13036, 0x0000802D }, /* GL_HISTOGRAM_SINK_EXT */
+   { 13058, 0x00008026 }, /* GL_HISTOGRAM_WIDTH */
+   { 13077, 0x00008026 }, /* GL_HISTOGRAM_WIDTH_EXT */
+   { 13100, 0x0000862A }, /* GL_IDENTITY_NV */
+   { 13115, 0x00008150 }, /* GL_IGNORE_BORDER_HP */
+   { 13135, 0x00008B9B }, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
+   { 13175, 0x00008B9A }, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
+   { 13213, 0x00001E02 }, /* GL_INCR */
+   { 13221, 0x00008507 }, /* GL_INCR_WRAP */
+   { 13234, 0x00008507 }, /* GL_INCR_WRAP_EXT */
+   { 13251, 0x00008222 }, /* GL_INDEX */
+   { 13260, 0x00008077 }, /* GL_INDEX_ARRAY */
+   { 13275, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING */
+   { 13305, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING_ARB */
+   { 13339, 0x00008091 }, /* GL_INDEX_ARRAY_POINTER */
+   { 13362, 0x00008086 }, /* GL_INDEX_ARRAY_STRIDE */
+   { 13384, 0x00008085 }, /* GL_INDEX_ARRAY_TYPE */
+   { 13404, 0x00000D51 }, /* GL_INDEX_BITS */
+   { 13418, 0x00000C20 }, /* GL_INDEX_CLEAR_VALUE */
+   { 13439, 0x00000BF1 }, /* GL_INDEX_LOGIC_OP */
+   { 13457, 0x00000C30 }, /* GL_INDEX_MODE */
+   { 13471, 0x00000D13 }, /* GL_INDEX_OFFSET */
+   { 13487, 0x00000D12 }, /* GL_INDEX_SHIFT */
+   { 13502, 0x00000C21 }, /* GL_INDEX_WRITEMASK */
+   { 13521, 0x00008B84 }, /* GL_INFO_LOG_LENGTH */
+   { 13540, 0x00001404 }, /* GL_INT */
+   { 13547, 0x00008049 }, /* GL_INTENSITY */
+   { 13560, 0x0000804C }, /* GL_INTENSITY12 */
+   { 13575, 0x0000804C }, /* GL_INTENSITY12_EXT */
+   { 13594, 0x0000804D }, /* GL_INTENSITY16 */
+   { 13609, 0x0000804D }, /* GL_INTENSITY16_EXT */
+   { 13628, 0x0000804A }, /* GL_INTENSITY4 */
+   { 13642, 0x0000804A }, /* GL_INTENSITY4_EXT */
+   { 13660, 0x0000804B }, /* GL_INTENSITY8 */
+   { 13674, 0x0000804B }, /* GL_INTENSITY8_EXT */
+   { 13692, 0x00008049 }, /* GL_INTENSITY_EXT */
+   { 13709, 0x00008575 }, /* GL_INTERPOLATE */
+   { 13724, 0x00008575 }, /* GL_INTERPOLATE_ARB */
+   { 13743, 0x00008575 }, /* GL_INTERPOLATE_EXT */
+   { 13762, 0x00008B53 }, /* GL_INT_VEC2 */
+   { 13774, 0x00008B53 }, /* GL_INT_VEC2_ARB */
+   { 13790, 0x00008B54 }, /* GL_INT_VEC3 */
+   { 13802, 0x00008B54 }, /* GL_INT_VEC3_ARB */
+   { 13818, 0x00008B55 }, /* GL_INT_VEC4 */
+   { 13830, 0x00008B55 }, /* GL_INT_VEC4_ARB */
+   { 13846, 0x00000500 }, /* GL_INVALID_ENUM */
+   { 13862, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION */
+   { 13895, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION_EXT */
+   { 13932, 0x00000502 }, /* GL_INVALID_OPERATION */
+   { 13953, 0x00000501 }, /* GL_INVALID_VALUE */
+   { 13970, 0x0000862B }, /* GL_INVERSE_NV */
+   { 13984, 0x0000862D }, /* GL_INVERSE_TRANSPOSE_NV */
+   { 14008, 0x0000150A }, /* GL_INVERT */
+   { 14018, 0x00001E00 }, /* GL_KEEP */
+   { 14026, 0x00000406 }, /* GL_LEFT */
+   { 14034, 0x00000203 }, /* GL_LEQUAL */
+   { 14044, 0x00000201 }, /* GL_LESS */
+   { 14052, 0x00004000 }, /* GL_LIGHT0 */
+   { 14062, 0x00004001 }, /* GL_LIGHT1 */
+   { 14072, 0x00004002 }, /* GL_LIGHT2 */
+   { 14082, 0x00004003 }, /* GL_LIGHT3 */
+   { 14092, 0x00004004 }, /* GL_LIGHT4 */
+   { 14102, 0x00004005 }, /* GL_LIGHT5 */
+   { 14112, 0x00004006 }, /* GL_LIGHT6 */
+   { 14122, 0x00004007 }, /* GL_LIGHT7 */
+   { 14132, 0x00000B50 }, /* GL_LIGHTING */
+   { 14144, 0x00000040 }, /* GL_LIGHTING_BIT */
+   { 14160, 0x00000B53 }, /* GL_LIGHT_MODEL_AMBIENT */
+   { 14183, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL */
+   { 14212, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL_EXT */
+   { 14245, 0x00000B51 }, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
+   { 14273, 0x00000B52 }, /* GL_LIGHT_MODEL_TWO_SIDE */
+   { 14297, 0x00001B01 }, /* GL_LINE */
+   { 14305, 0x00002601 }, /* GL_LINEAR */
+   { 14315, 0x00001208 }, /* GL_LINEAR_ATTENUATION */
+   { 14337, 0x00008170 }, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
+   { 14367, 0x0000844F }, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
+   { 14398, 0x00002703 }, /* GL_LINEAR_MIPMAP_LINEAR */
+   { 14422, 0x00002701 }, /* GL_LINEAR_MIPMAP_NEAREST */
+   { 14447, 0x00000001 }, /* GL_LINES */
+   { 14456, 0x00000004 }, /* GL_LINE_BIT */
+   { 14468, 0x00000002 }, /* GL_LINE_LOOP */
+   { 14481, 0x00000707 }, /* GL_LINE_RESET_TOKEN */
+   { 14501, 0x00000B20 }, /* GL_LINE_SMOOTH */
+   { 14516, 0x00000C52 }, /* GL_LINE_SMOOTH_HINT */
+   { 14536, 0x00000B24 }, /* GL_LINE_STIPPLE */
+   { 14552, 0x00000B25 }, /* GL_LINE_STIPPLE_PATTERN */
+   { 14576, 0x00000B26 }, /* GL_LINE_STIPPLE_REPEAT */
+   { 14599, 0x00000003 }, /* GL_LINE_STRIP */
+   { 14613, 0x00000702 }, /* GL_LINE_TOKEN */
+   { 14627, 0x00000B21 }, /* GL_LINE_WIDTH */
+   { 14641, 0x00000B23 }, /* GL_LINE_WIDTH_GRANULARITY */
+   { 14667, 0x00000B22 }, /* GL_LINE_WIDTH_RANGE */
+   { 14687, 0x00008B82 }, /* GL_LINK_STATUS */
+   { 14702, 0x00000B32 }, /* GL_LIST_BASE */
+   { 14715, 0x00020000 }, /* GL_LIST_BIT */
+   { 14727, 0x00000B33 }, /* GL_LIST_INDEX */
+   { 14741, 0x00000B30 }, /* GL_LIST_MODE */
+   { 14754, 0x00000101 }, /* GL_LOAD */
+   { 14762, 0x00000BF1 }, /* GL_LOGIC_OP */
+   { 14774, 0x00000BF0 }, /* GL_LOGIC_OP_MODE */
+   { 14791, 0x00008CA1 }, /* GL_LOWER_LEFT */
+   { 14805, 0x00001909 }, /* GL_LUMINANCE */
+   { 14818, 0x00008041 }, /* GL_LUMINANCE12 */
+   { 14833, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12 */
+   { 14856, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12_EXT */
+   { 14883, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4 */
+   { 14905, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4_EXT */
+   { 14931, 0x00008041 }, /* GL_LUMINANCE12_EXT */
+   { 14950, 0x00008042 }, /* GL_LUMINANCE16 */
+   { 14965, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16 */
+   { 14988, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16_EXT */
+   { 15015, 0x00008042 }, /* GL_LUMINANCE16_EXT */
+   { 15034, 0x0000803F }, /* GL_LUMINANCE4 */
+   { 15048, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4 */
+   { 15069, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4_EXT */
+   { 15094, 0x0000803F }, /* GL_LUMINANCE4_EXT */
+   { 15112, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2 */
+   { 15133, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2_EXT */
+   { 15158, 0x00008040 }, /* GL_LUMINANCE8 */
+   { 15172, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8 */
+   { 15193, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8_EXT */
+   { 15218, 0x00008040 }, /* GL_LUMINANCE8_EXT */
+   { 15236, 0x0000190A }, /* GL_LUMINANCE_ALPHA */
+   { 15255, 0x00000D90 }, /* GL_MAP1_COLOR_4 */
+   { 15271, 0x00000DD0 }, /* GL_MAP1_GRID_DOMAIN */
+   { 15291, 0x00000DD1 }, /* GL_MAP1_GRID_SEGMENTS */
+   { 15313, 0x00000D91 }, /* GL_MAP1_INDEX */
+   { 15327, 0x00000D92 }, /* GL_MAP1_NORMAL */
+   { 15342, 0x00000D93 }, /* GL_MAP1_TEXTURE_COORD_1 */
+   { 15366, 0x00000D94 }, /* GL_MAP1_TEXTURE_COORD_2 */
+   { 15390, 0x00000D95 }, /* GL_MAP1_TEXTURE_COORD_3 */
+   { 15414, 0x00000D96 }, /* GL_MAP1_TEXTURE_COORD_4 */
+   { 15438, 0x00000D97 }, /* GL_MAP1_VERTEX_3 */
+   { 15455, 0x00000D98 }, /* GL_MAP1_VERTEX_4 */
+   { 15472, 0x00008660 }, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
+   { 15500, 0x0000866A }, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
+   { 15529, 0x0000866B }, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
+   { 15558, 0x0000866C }, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
+   { 15587, 0x0000866D }, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
+   { 15616, 0x0000866E }, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
+   { 15645, 0x0000866F }, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
+   { 15674, 0x00008661 }, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
+   { 15702, 0x00008662 }, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
+   { 15730, 0x00008663 }, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
+   { 15758, 0x00008664 }, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
+   { 15786, 0x00008665 }, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
+   { 15814, 0x00008666 }, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
+   { 15842, 0x00008667 }, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
+   { 15870, 0x00008668 }, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
+   { 15898, 0x00008669 }, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
+   { 15926, 0x00000DB0 }, /* GL_MAP2_COLOR_4 */
+   { 15942, 0x00000DD2 }, /* GL_MAP2_GRID_DOMAIN */
+   { 15962, 0x00000DD3 }, /* GL_MAP2_GRID_SEGMENTS */
+   { 15984, 0x00000DB1 }, /* GL_MAP2_INDEX */
+   { 15998, 0x00000DB2 }, /* GL_MAP2_NORMAL */
+   { 16013, 0x00000DB3 }, /* GL_MAP2_TEXTURE_COORD_1 */
+   { 16037, 0x00000DB4 }, /* GL_MAP2_TEXTURE_COORD_2 */
+   { 16061, 0x00000DB5 }, /* GL_MAP2_TEXTURE_COORD_3 */
+   { 16085, 0x00000DB6 }, /* GL_MAP2_TEXTURE_COORD_4 */
+   { 16109, 0x00000DB7 }, /* GL_MAP2_VERTEX_3 */
+   { 16126, 0x00000DB8 }, /* GL_MAP2_VERTEX_4 */
+   { 16143, 0x00008670 }, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
+   { 16171, 0x0000867A }, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
+   { 16200, 0x0000867B }, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
+   { 16229, 0x0000867C }, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
+   { 16258, 0x0000867D }, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
+   { 16287, 0x0000867E }, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
+   { 16316, 0x0000867F }, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
+   { 16345, 0x00008671 }, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
+   { 16373, 0x00008672 }, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
+   { 16401, 0x00008673 }, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
+   { 16429, 0x00008674 }, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
+   { 16457, 0x00008675 }, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
+   { 16485, 0x00008676 }, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
+   { 16513, 0x00008677 }, /* GL_MAP2_VERTEX_ATTRIB7_4_NV */
+   { 16541, 0x00008678 }, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
+   { 16569, 0x00008679 }, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
+   { 16597, 0x00000D10 }, /* GL_MAP_COLOR */
+   { 16610, 0x00000D11 }, /* GL_MAP_STENCIL */
+   { 16625, 0x000088C0 }, /* GL_MATRIX0_ARB */
+   { 16640, 0x00008630 }, /* GL_MATRIX0_NV */
+   { 16654, 0x000088CA }, /* GL_MATRIX10_ARB */
+   { 16670, 0x000088CB }, /* GL_MATRIX11_ARB */
+   { 16686, 0x000088CC }, /* GL_MATRIX12_ARB */
+   { 16702, 0x000088CD }, /* GL_MATRIX13_ARB */
+   { 16718, 0x000088CE }, /* GL_MATRIX14_ARB */
+   { 16734, 0x000088CF }, /* GL_MATRIX15_ARB */
+   { 16750, 0x000088D0 }, /* GL_MATRIX16_ARB */
+   { 16766, 0x000088D1 }, /* GL_MATRIX17_ARB */
+   { 16782, 0x000088D2 }, /* GL_MATRIX18_ARB */
+   { 16798, 0x000088D3 }, /* GL_MATRIX19_ARB */
+   { 16814, 0x000088C1 }, /* GL_MATRIX1_ARB */
+   { 16829, 0x00008631 }, /* GL_MATRIX1_NV */
+   { 16843, 0x000088D4 }, /* GL_MATRIX20_ARB */
+   { 16859, 0x000088D5 }, /* GL_MATRIX21_ARB */
+   { 16875, 0x000088D6 }, /* GL_MATRIX22_ARB */
+   { 16891, 0x000088D7 }, /* GL_MATRIX23_ARB */
+   { 16907, 0x000088D8 }, /* GL_MATRIX24_ARB */
+   { 16923, 0x000088D9 }, /* GL_MATRIX25_ARB */
+   { 16939, 0x000088DA }, /* GL_MATRIX26_ARB */
+   { 16955, 0x000088DB }, /* GL_MATRIX27_ARB */
+   { 16971, 0x000088DC }, /* GL_MATRIX28_ARB */
+   { 16987, 0x000088DD }, /* GL_MATRIX29_ARB */
+   { 17003, 0x000088C2 }, /* GL_MATRIX2_ARB */
+   { 17018, 0x00008632 }, /* GL_MATRIX2_NV */
+   { 17032, 0x000088DE }, /* GL_MATRIX30_ARB */
+   { 17048, 0x000088DF }, /* GL_MATRIX31_ARB */
+   { 17064, 0x000088C3 }, /* GL_MATRIX3_ARB */
+   { 17079, 0x00008633 }, /* GL_MATRIX3_NV */
+   { 17093, 0x000088C4 }, /* GL_MATRIX4_ARB */
+   { 17108, 0x00008634 }, /* GL_MATRIX4_NV */
+   { 17122, 0x000088C5 }, /* GL_MATRIX5_ARB */
+   { 17137, 0x00008635 }, /* GL_MATRIX5_NV */
+   { 17151, 0x000088C6 }, /* GL_MATRIX6_ARB */
+   { 17166, 0x00008636 }, /* GL_MATRIX6_NV */
+   { 17180, 0x000088C7 }, /* GL_MATRIX7_ARB */
+   { 17195, 0x00008637 }, /* GL_MATRIX7_NV */
+   { 17209, 0x000088C8 }, /* GL_MATRIX8_ARB */
+   { 17224, 0x000088C9 }, /* GL_MATRIX9_ARB */
+   { 17239, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_ARB */
+   { 17265, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
+   { 17299, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
+   { 17330, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
+   { 17363, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
+   { 17394, 0x00000BA0 }, /* GL_MATRIX_MODE */
+   { 17409, 0x00008840 }, /* GL_MATRIX_PALETTE_ARB */
+   { 17431, 0x00008008 }, /* GL_MAX */
+   { 17438, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE */
+   { 17461, 0x000088FF }, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
+   { 17493, 0x00000D35 }, /* GL_MAX_ATTRIB_STACK_DEPTH */
+   { 17519, 0x00000D3B }, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
+   { 17552, 0x00008177 }, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
+   { 17578, 0x00008178 }, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+   { 17612, 0x00000D32 }, /* GL_MAX_CLIP_PLANES */
+   { 17631, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
+   { 17660, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
+   { 17692, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI */
+   { 17728, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
+   { 17764, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB */
+   { 17804, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT */
+   { 17830, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT_EXT */
+   { 17860, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH */
+   { 17885, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH_EXT */
+   { 17914, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
+   { 17943, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB */
+   { 17976, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS */
+   { 17996, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ARB */
+   { 18020, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ATI */
+   { 18044, 0x000080E9 }, /* GL_MAX_ELEMENTS_INDICES */
+   { 18068, 0x000080E8 }, /* GL_MAX_ELEMENTS_VERTICES */
+   { 18093, 0x00000D30 }, /* GL_MAX_EVAL_ORDER */
+   { 18111, 0x00008008 }, /* GL_MAX_EXT */
+   { 18122, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
+   { 18157, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB */
+   { 18196, 0x00000D31 }, /* GL_MAX_LIGHTS */
+   { 18210, 0x00000B31 }, /* GL_MAX_LIST_NESTING */
+   { 18230, 0x00008841 }, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
+   { 18268, 0x00000D36 }, /* GL_MAX_MODELVIEW_STACK_DEPTH */
+   { 18297, 0x00000D37 }, /* GL_MAX_NAME_STACK_DEPTH */
+   { 18321, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_ARB */
+   { 18349, 0x00000D34 }, /* GL_MAX_PIXEL_MAP_TABLE */
+   { 18372, 0x000088B1 }, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
+   { 18409, 0x0000880B }, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
+   { 18445, 0x000088AD }, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
+   { 18472, 0x000088F5 }, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
+   { 18501, 0x000088B5 }, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
+   { 18535, 0x000088F4 }, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
+   { 18571, 0x000088F6 }, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
+   { 18598, 0x000088A1 }, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
+   { 18630, 0x000088B4 }, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
+   { 18666, 0x000088F8 }, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
+   { 18695, 0x000088F7 }, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
+   { 18724, 0x0000862F }, /* GL_MAX_PROGRAM_MATRICES_ARB */
+   { 18752, 0x0000862E }, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
+   { 18790, 0x000088B3 }, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+   { 18834, 0x0000880E }, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+   { 18877, 0x000088AF }, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
+   { 18911, 0x000088A3 }, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+   { 18950, 0x000088AB }, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
+   { 18987, 0x000088A7 }, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
+   { 19025, 0x00008810 }, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+   { 19068, 0x0000880F }, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+   { 19111, 0x000088A9 }, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
+   { 19141, 0x000088A5 }, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
+   { 19172, 0x0000880D }, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
+   { 19208, 0x0000880C }, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
+   { 19244, 0x00000D38 }, /* GL_MAX_PROJECTION_STACK_DEPTH */
+   { 19274, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
+   { 19308, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_NV */
+   { 19341, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
+   { 19370, 0x00008D57 }, /* GL_MAX_SAMPLES */
+   { 19385, 0x00008504 }, /* GL_MAX_SHININESS_NV */
+   { 19405, 0x00008505 }, /* GL_MAX_SPOT_EXPONENT_NV */
+   { 19429, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS */
+   { 19451, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS_ARB */
+   { 19477, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS */
+   { 19504, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS_ARB */
+   { 19535, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS */
+   { 19559, 0x000084FF }, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
+   { 19593, 0x00000D33 }, /* GL_MAX_TEXTURE_SIZE */
+   { 19613, 0x00000D39 }, /* GL_MAX_TEXTURE_STACK_DEPTH */
+   { 19640, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS */
+   { 19661, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS_ARB */
+   { 19686, 0x0000862F }, /* GL_MAX_TRACK_MATRICES_NV */
+   { 19711, 0x0000862E }, /* GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */
+   { 19746, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS */
+   { 19768, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS_ARB */
+   { 19794, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS */
+   { 19816, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS_ARB */
+   { 19842, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
+   { 19876, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
+   { 19914, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
+   { 19947, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB */
+   { 19984, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_ARB */
+   { 20008, 0x00000D3A }, /* GL_MAX_VIEWPORT_DIMS */
+   { 20029, 0x00008007 }, /* GL_MIN */
+   { 20036, 0x0000802E }, /* GL_MINMAX */
+   { 20046, 0x0000802E }, /* GL_MINMAX_EXT */
+   { 20060, 0x0000802F }, /* GL_MINMAX_FORMAT */
+   { 20077, 0x0000802F }, /* GL_MINMAX_FORMAT_EXT */
+   { 20098, 0x00008030 }, /* GL_MINMAX_SINK */
+   { 20113, 0x00008030 }, /* GL_MINMAX_SINK_EXT */
+   { 20132, 0x00008007 }, /* GL_MIN_EXT */
+   { 20143, 0x00008370 }, /* GL_MIRRORED_REPEAT */
+   { 20162, 0x00008370 }, /* GL_MIRRORED_REPEAT_ARB */
+   { 20185, 0x00008370 }, /* GL_MIRRORED_REPEAT_IBM */
+   { 20208, 0x00008742 }, /* GL_MIRROR_CLAMP_ATI */
+   { 20228, 0x00008742 }, /* GL_MIRROR_CLAMP_EXT */
+   { 20248, 0x00008912 }, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
+   { 20278, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_ATI */
+   { 20306, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
+   { 20334, 0x00001700 }, /* GL_MODELVIEW */
+   { 20347, 0x00001700 }, /* GL_MODELVIEW0_ARB */
+   { 20365, 0x0000872A }, /* GL_MODELVIEW10_ARB */
+   { 20384, 0x0000872B }, /* GL_MODELVIEW11_ARB */
+   { 20403, 0x0000872C }, /* GL_MODELVIEW12_ARB */
+   { 20422, 0x0000872D }, /* GL_MODELVIEW13_ARB */
+   { 20441, 0x0000872E }, /* GL_MODELVIEW14_ARB */
+   { 20460, 0x0000872F }, /* GL_MODELVIEW15_ARB */
+   { 20479, 0x00008730 }, /* GL_MODELVIEW16_ARB */
+   { 20498, 0x00008731 }, /* GL_MODELVIEW17_ARB */
+   { 20517, 0x00008732 }, /* GL_MODELVIEW18_ARB */
+   { 20536, 0x00008733 }, /* GL_MODELVIEW19_ARB */
+   { 20555, 0x0000850A }, /* GL_MODELVIEW1_ARB */
+   { 20573, 0x00008734 }, /* GL_MODELVIEW20_ARB */
+   { 20592, 0x00008735 }, /* GL_MODELVIEW21_ARB */
+   { 20611, 0x00008736 }, /* GL_MODELVIEW22_ARB */
+   { 20630, 0x00008737 }, /* GL_MODELVIEW23_ARB */
+   { 20649, 0x00008738 }, /* GL_MODELVIEW24_ARB */
+   { 20668, 0x00008739 }, /* GL_MODELVIEW25_ARB */
+   { 20687, 0x0000873A }, /* GL_MODELVIEW26_ARB */
+   { 20706, 0x0000873B }, /* GL_MODELVIEW27_ARB */
+   { 20725, 0x0000873C }, /* GL_MODELVIEW28_ARB */
+   { 20744, 0x0000873D }, /* GL_MODELVIEW29_ARB */
+   { 20763, 0x00008722 }, /* GL_MODELVIEW2_ARB */
+   { 20781, 0x0000873E }, /* GL_MODELVIEW30_ARB */
+   { 20800, 0x0000873F }, /* GL_MODELVIEW31_ARB */
+   { 20819, 0x00008723 }, /* GL_MODELVIEW3_ARB */
+   { 20837, 0x00008724 }, /* GL_MODELVIEW4_ARB */
+   { 20855, 0x00008725 }, /* GL_MODELVIEW5_ARB */
+   { 20873, 0x00008726 }, /* GL_MODELVIEW6_ARB */
+   { 20891, 0x00008727 }, /* GL_MODELVIEW7_ARB */
+   { 20909, 0x00008728 }, /* GL_MODELVIEW8_ARB */
+   { 20927, 0x00008729 }, /* GL_MODELVIEW9_ARB */
+   { 20945, 0x00000BA6 }, /* GL_MODELVIEW_MATRIX */
+   { 20965, 0x00008629 }, /* GL_MODELVIEW_PROJECTION_NV */
+   { 20992, 0x00000BA3 }, /* GL_MODELVIEW_STACK_DEPTH */
+   { 21017, 0x00002100 }, /* GL_MODULATE */
+   { 21029, 0x00008744 }, /* GL_MODULATE_ADD_ATI */
+   { 21049, 0x00008745 }, /* GL_MODULATE_SIGNED_ADD_ATI */
+   { 21076, 0x00008746 }, /* GL_MODULATE_SUBTRACT_ATI */
+   { 21101, 0x00000103 }, /* GL_MULT */
+   { 21109, 0x0000809D }, /* GL_MULTISAMPLE */
+   { 21124, 0x000086B2 }, /* GL_MULTISAMPLE_3DFX */
+   { 21144, 0x0000809D }, /* GL_MULTISAMPLE_ARB */
+   { 21163, 0x20000000 }, /* GL_MULTISAMPLE_BIT */
+   { 21182, 0x20000000 }, /* GL_MULTISAMPLE_BIT_3DFX */
+   { 21206, 0x20000000 }, /* GL_MULTISAMPLE_BIT_ARB */
+   { 21229, 0x00008534 }, /* GL_MULTISAMPLE_FILTER_HINT_NV */
+   { 21259, 0x00002A25 }, /* GL_N3F_V3F */
+   { 21270, 0x00000D70 }, /* GL_NAME_STACK_DEPTH */
+   { 21290, 0x0000150E }, /* GL_NAND */
+   { 21298, 0x00002600 }, /* GL_NEAREST */
+   { 21309, 0x0000844E }, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
+   { 21340, 0x0000844D }, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
+   { 21372, 0x00002702 }, /* GL_NEAREST_MIPMAP_LINEAR */
+   { 21397, 0x00002700 }, /* GL_NEAREST_MIPMAP_NEAREST */
+   { 21423, 0x00000200 }, /* GL_NEVER */
+   { 21432, 0x00001102 }, /* GL_NICEST */
+   { 21442, 0x00000000 }, /* GL_NONE */
+   { 21450, 0x00001505 }, /* GL_NOOP */
+   { 21458, 0x00001508 }, /* GL_NOR */
+   { 21465, 0x00000BA1 }, /* GL_NORMALIZE */
+   { 21478, 0x00008075 }, /* GL_NORMAL_ARRAY */
+   { 21494, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
+   { 21525, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING_ARB */
+   { 21560, 0x0000808F }, /* GL_NORMAL_ARRAY_POINTER */
+   { 21584, 0x0000807F }, /* GL_NORMAL_ARRAY_STRIDE */
+   { 21607, 0x0000807E }, /* GL_NORMAL_ARRAY_TYPE */
+   { 21628, 0x00008511 }, /* GL_NORMAL_MAP */
+   { 21642, 0x00008511 }, /* GL_NORMAL_MAP_ARB */
+   { 21660, 0x00008511 }, /* GL_NORMAL_MAP_NV */
+   { 21677, 0x00000205 }, /* GL_NOTEQUAL */
+   { 21689, 0x00000000 }, /* GL_NO_ERROR */
+   { 21701, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
+   { 21735, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB */
+   { 21773, 0x00008B89 }, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */
+   { 21805, 0x00008B8A }, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */
+   { 21847, 0x00008B86 }, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */
+   { 21877, 0x00008B87 }, /* GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB */
+   { 21917, 0x00008B85 }, /* GL_OBJECT_ATTACHED_OBJECTS_ARB */
+   { 21948, 0x00008B81 }, /* GL_OBJECT_COMPILE_STATUS_ARB */
+   { 21977, 0x00008B80 }, /* GL_OBJECT_DELETE_STATUS_ARB */
+   { 22005, 0x00008B84 }, /* GL_OBJECT_INFO_LOG_LENGTH_ARB */
+   { 22035, 0x00002401 }, /* GL_OBJECT_LINEAR */
+   { 22052, 0x00008B82 }, /* GL_OBJECT_LINK_STATUS_ARB */
+   { 22078, 0x00002501 }, /* GL_OBJECT_PLANE */
+   { 22094, 0x00008B88 }, /* GL_OBJECT_SHADER_SOURCE_LENGTH_ARB */
+   { 22129, 0x00008B4F }, /* GL_OBJECT_SUBTYPE_ARB */
+   { 22151, 0x00008B4E }, /* GL_OBJECT_TYPE_ARB */
+   { 22170, 0x00008B83 }, /* GL_OBJECT_VALIDATE_STATUS_ARB */
+   { 22200, 0x00008165 }, /* GL_OCCLUSION_TEST_HP */
+   { 22221, 0x00008166 }, /* GL_OCCLUSION_TEST_RESULT_HP */
+   { 22249, 0x00000001 }, /* GL_ONE */
+   { 22256, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA */
+   { 22284, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA_EXT */
+   { 22316, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR */
+   { 22344, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR_EXT */
+   { 22376, 0x00000305 }, /* GL_ONE_MINUS_DST_ALPHA */
+   { 22399, 0x00000307 }, /* GL_ONE_MINUS_DST_COLOR */
+   { 22422, 0x00000303 }, /* GL_ONE_MINUS_SRC_ALPHA */
+   { 22445, 0x00000301 }, /* GL_ONE_MINUS_SRC_COLOR */
+   { 22468, 0x00008598 }, /* GL_OPERAND0_ALPHA */
+   { 22486, 0x00008598 }, /* GL_OPERAND0_ALPHA_ARB */
+   { 22508, 0x00008598 }, /* GL_OPERAND0_ALPHA_EXT */
+   { 22530, 0x00008590 }, /* GL_OPERAND0_RGB */
+   { 22546, 0x00008590 }, /* GL_OPERAND0_RGB_ARB */
+   { 22566, 0x00008590 }, /* GL_OPERAND0_RGB_EXT */
+   { 22586, 0x00008599 }, /* GL_OPERAND1_ALPHA */
+   { 22604, 0x00008599 }, /* GL_OPERAND1_ALPHA_ARB */
+   { 22626, 0x00008599 }, /* GL_OPERAND1_ALPHA_EXT */
+   { 22648, 0x00008591 }, /* GL_OPERAND1_RGB */
+   { 22664, 0x00008591 }, /* GL_OPERAND1_RGB_ARB */
+   { 22684, 0x00008591 }, /* GL_OPERAND1_RGB_EXT */
+   { 22704, 0x0000859A }, /* GL_OPERAND2_ALPHA */
+   { 22722, 0x0000859A }, /* GL_OPERAND2_ALPHA_ARB */
+   { 22744, 0x0000859A }, /* GL_OPERAND2_ALPHA_EXT */
+   { 22766, 0x00008592 }, /* GL_OPERAND2_RGB */
+   { 22782, 0x00008592 }, /* GL_OPERAND2_RGB_ARB */
+   { 22802, 0x00008592 }, /* GL_OPERAND2_RGB_EXT */
+   { 22822, 0x0000859B }, /* GL_OPERAND3_ALPHA_NV */
+   { 22843, 0x00008593 }, /* GL_OPERAND3_RGB_NV */
+   { 22862, 0x00001507 }, /* GL_OR */
+   { 22868, 0x00000A01 }, /* GL_ORDER */
+   { 22877, 0x0000150D }, /* GL_OR_INVERTED */
+   { 22892, 0x0000150B }, /* GL_OR_REVERSE */
+   { 22906, 0x00000505 }, /* GL_OUT_OF_MEMORY */
+   { 22923, 0x00000D05 }, /* GL_PACK_ALIGNMENT */
+   { 22941, 0x0000806C }, /* GL_PACK_IMAGE_HEIGHT */
+   { 22962, 0x00008758 }, /* GL_PACK_INVERT_MESA */
+   { 22982, 0x00000D01 }, /* GL_PACK_LSB_FIRST */
+   { 23000, 0x00000D02 }, /* GL_PACK_ROW_LENGTH */
+   { 23019, 0x0000806B }, /* GL_PACK_SKIP_IMAGES */
+   { 23039, 0x00000D04 }, /* GL_PACK_SKIP_PIXELS */
+   { 23059, 0x00000D03 }, /* GL_PACK_SKIP_ROWS */
+   { 23077, 0x00000D00 }, /* GL_PACK_SWAP_BYTES */
+   { 23096, 0x00008B92 }, /* GL_PALETTE4_R5_G6_B5_OES */
+   { 23121, 0x00008B94 }, /* GL_PALETTE4_RGB5_A1_OES */
+   { 23145, 0x00008B90 }, /* GL_PALETTE4_RGB8_OES */
+   { 23166, 0x00008B93 }, /* GL_PALETTE4_RGBA4_OES */
+   { 23188, 0x00008B91 }, /* GL_PALETTE4_RGBA8_OES */
+   { 23210, 0x00008B97 }, /* GL_PALETTE8_R5_G6_B5_OES */
+   { 23235, 0x00008B99 }, /* GL_PALETTE8_RGB5_A1_OES */
+   { 23259, 0x00008B95 }, /* GL_PALETTE8_RGB8_OES */
+   { 23280, 0x00008B98 }, /* GL_PALETTE8_RGBA4_OES */
+   { 23302, 0x00008B96 }, /* GL_PALETTE8_RGBA8_OES */
+   { 23324, 0x00000700 }, /* GL_PASS_THROUGH_TOKEN */
+   { 23346, 0x00000C50 }, /* GL_PERSPECTIVE_CORRECTION_HINT */
+   { 23377, 0x00000C79 }, /* GL_PIXEL_MAP_A_TO_A */
+   { 23397, 0x00000CB9 }, /* GL_PIXEL_MAP_A_TO_A_SIZE */
+   { 23422, 0x00000C78 }, /* GL_PIXEL_MAP_B_TO_B */
+   { 23442, 0x00000CB8 }, /* GL_PIXEL_MAP_B_TO_B_SIZE */
+   { 23467, 0x00000C77 }, /* GL_PIXEL_MAP_G_TO_G */
+   { 23487, 0x00000CB7 }, /* GL_PIXEL_MAP_G_TO_G_SIZE */
+   { 23512, 0x00000C75 }, /* GL_PIXEL_MAP_I_TO_A */
+   { 23532, 0x00000CB5 }, /* GL_PIXEL_MAP_I_TO_A_SIZE */
+   { 23557, 0x00000C74 }, /* GL_PIXEL_MAP_I_TO_B */
+   { 23577, 0x00000CB4 }, /* GL_PIXEL_MAP_I_TO_B_SIZE */
+   { 23602, 0x00000C73 }, /* GL_PIXEL_MAP_I_TO_G */
+   { 23622, 0x00000CB3 }, /* GL_PIXEL_MAP_I_TO_G_SIZE */
+   { 23647, 0x00000C70 }, /* GL_PIXEL_MAP_I_TO_I */
+   { 23667, 0x00000CB0 }, /* GL_PIXEL_MAP_I_TO_I_SIZE */
+   { 23692, 0x00000C72 }, /* GL_PIXEL_MAP_I_TO_R */
+   { 23712, 0x00000CB2 }, /* GL_PIXEL_MAP_I_TO_R_SIZE */
+   { 23737, 0x00000C76 }, /* GL_PIXEL_MAP_R_TO_R */
+   { 23757, 0x00000CB6 }, /* GL_PIXEL_MAP_R_TO_R_SIZE */
+   { 23782, 0x00000C71 }, /* GL_PIXEL_MAP_S_TO_S */
+   { 23802, 0x00000CB1 }, /* GL_PIXEL_MAP_S_TO_S_SIZE */
+   { 23827, 0x00000020 }, /* GL_PIXEL_MODE_BIT */
+   { 23845, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING_EXT */
+   { 23878, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER_EXT */
+   { 23903, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING_EXT */
+   { 23938, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER_EXT */
+   { 23965, 0x00001B00 }, /* GL_POINT */
+   { 23974, 0x00000000 }, /* GL_POINTS */
+   { 23984, 0x00000002 }, /* GL_POINT_BIT */
+   { 23997, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION */
+   { 24027, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_ARB */
+   { 24061, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_EXT */
+   { 24095, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_SGIS */
+   { 24130, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE */
+   { 24159, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_ARB */
+   { 24192, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_EXT */
+   { 24225, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_SGIS */
+   { 24259, 0x00000B11 }, /* GL_POINT_SIZE */
+   { 24273, 0x00000B13 }, /* GL_POINT_SIZE_GRANULARITY */
+   { 24299, 0x00008127 }, /* GL_POINT_SIZE_MAX */
+   { 24317, 0x00008127 }, /* GL_POINT_SIZE_MAX_ARB */
+   { 24339, 0x00008127 }, /* GL_POINT_SIZE_MAX_EXT */
+   { 24361, 0x00008127 }, /* GL_POINT_SIZE_MAX_SGIS */
+   { 24384, 0x00008126 }, /* GL_POINT_SIZE_MIN */
+   { 24402, 0x00008126 }, /* GL_POINT_SIZE_MIN_ARB */
+   { 24424, 0x00008126 }, /* GL_POINT_SIZE_MIN_EXT */
+   { 24446, 0x00008126 }, /* GL_POINT_SIZE_MIN_SGIS */
+   { 24469, 0x00000B12 }, /* GL_POINT_SIZE_RANGE */
+   { 24489, 0x00000B10 }, /* GL_POINT_SMOOTH */
+   { 24505, 0x00000C51 }, /* GL_POINT_SMOOTH_HINT */
+   { 24526, 0x00008861 }, /* GL_POINT_SPRITE */
+   { 24542, 0x00008861 }, /* GL_POINT_SPRITE_ARB */
+   { 24562, 0x00008CA0 }, /* GL_POINT_SPRITE_COORD_ORIGIN */
+   { 24591, 0x00008861 }, /* GL_POINT_SPRITE_NV */
+   { 24610, 0x00008863 }, /* GL_POINT_SPRITE_R_MODE_NV */
+   { 24636, 0x00000701 }, /* GL_POINT_TOKEN */
+   { 24651, 0x00000009 }, /* GL_POLYGON */
+   { 24662, 0x00000008 }, /* GL_POLYGON_BIT */
+   { 24677, 0x00000B40 }, /* GL_POLYGON_MODE */
+   { 24693, 0x00008039 }, /* GL_POLYGON_OFFSET_BIAS */
+   { 24716, 0x00008038 }, /* GL_POLYGON_OFFSET_FACTOR */
+   { 24741, 0x00008037 }, /* GL_POLYGON_OFFSET_FILL */
+   { 24764, 0x00002A02 }, /* GL_POLYGON_OFFSET_LINE */
+   { 24787, 0x00002A01 }, /* GL_POLYGON_OFFSET_POINT */
+   { 24811, 0x00002A00 }, /* GL_POLYGON_OFFSET_UNITS */
+   { 24835, 0x00000B41 }, /* GL_POLYGON_SMOOTH */
+   { 24853, 0x00000C53 }, /* GL_POLYGON_SMOOTH_HINT */
+   { 24876, 0x00000B42 }, /* GL_POLYGON_STIPPLE */
+   { 24895, 0x00000010 }, /* GL_POLYGON_STIPPLE_BIT */
+   { 24918, 0x00000703 }, /* GL_POLYGON_TOKEN */
+   { 24935, 0x00001203 }, /* GL_POSITION */
+   { 24947, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
+   { 24979, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI */
+   { 25015, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
+   { 25048, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI */
+   { 25085, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
+   { 25116, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI */
+   { 25151, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
+   { 25183, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI */
+   { 25219, 0x000080D2 }, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
+   { 25252, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
+   { 25284, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI */
+   { 25320, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
+   { 25353, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI */
+   { 25390, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS */
+   { 25420, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS_SGI */
+   { 25454, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE */
+   { 25485, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE_SGI */
+   { 25520, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
+   { 25551, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS_EXT */
+   { 25586, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
+   { 25618, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE_EXT */
+   { 25654, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS */
+   { 25684, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS_EXT */
+   { 25718, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE */
+   { 25749, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE_EXT */
+   { 25784, 0x000080D1 }, /* GL_POST_CONVOLUTION_COLOR_TABLE */
+   { 25816, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS */
+   { 25847, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS_EXT */
+   { 25882, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE */
+   { 25914, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE_EXT */
+   { 25950, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS */
+   { 25979, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS_EXT */
+   { 26012, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE */
+   { 26042, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE_EXT */
+   { 26076, 0x0000817B }, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
+   { 26115, 0x00008179 }, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
+   { 26148, 0x0000817C }, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
+   { 26188, 0x0000817A }, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
+   { 26222, 0x00008578 }, /* GL_PREVIOUS */
+   { 26234, 0x00008578 }, /* GL_PREVIOUS_ARB */
+   { 26250, 0x00008578 }, /* GL_PREVIOUS_EXT */
+   { 26266, 0x00008577 }, /* GL_PRIMARY_COLOR */
+   { 26283, 0x00008577 }, /* GL_PRIMARY_COLOR_ARB */
+   { 26304, 0x00008577 }, /* GL_PRIMARY_COLOR_EXT */
+   { 26325, 0x000088B0 }, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
+   { 26358, 0x00008805 }, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
+   { 26390, 0x000088AC }, /* GL_PROGRAM_ATTRIBS_ARB */
+   { 26413, 0x00008677 }, /* GL_PROGRAM_BINDING_ARB */
+   { 26436, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_ARB */
+   { 26466, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_NV */
+   { 26495, 0x00008874 }, /* GL_PROGRAM_ERROR_STRING_ARB */
+   { 26523, 0x00008876 }, /* GL_PROGRAM_FORMAT_ARB */
+   { 26545, 0x00008875 }, /* GL_PROGRAM_FORMAT_ASCII_ARB */
+   { 26573, 0x000088A0 }, /* GL_PROGRAM_INSTRUCTIONS_ARB */
+   { 26601, 0x00008627 }, /* GL_PROGRAM_LENGTH_ARB */
+   { 26623, 0x00008627 }, /* GL_PROGRAM_LENGTH_NV */
+   { 26644, 0x000088B2 }, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+   { 26684, 0x00008808 }, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+   { 26723, 0x000088AE }, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
+   { 26753, 0x000088A2 }, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+   { 26788, 0x000088AA }, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
+   { 26821, 0x000088A6 }, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
+   { 26855, 0x0000880A }, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+   { 26894, 0x00008809 }, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+   { 26933, 0x00008B40 }, /* GL_PROGRAM_OBJECT_ARB */
+   { 26955, 0x000088A8 }, /* GL_PROGRAM_PARAMETERS_ARB */
+   { 26981, 0x00008644 }, /* GL_PROGRAM_PARAMETER_NV */
+   { 27005, 0x00008647 }, /* GL_PROGRAM_RESIDENT_NV */
+   { 27028, 0x00008628 }, /* GL_PROGRAM_STRING_ARB */
+   { 27050, 0x00008628 }, /* GL_PROGRAM_STRING_NV */
+   { 27071, 0x00008646 }, /* GL_PROGRAM_TARGET_NV */
+   { 27092, 0x000088A4 }, /* GL_PROGRAM_TEMPORARIES_ARB */
+   { 27119, 0x00008807 }, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
+   { 27151, 0x00008806 }, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
+   { 27183, 0x000088B6 }, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
+   { 27218, 0x00001701 }, /* GL_PROJECTION */
+   { 27232, 0x00000BA7 }, /* GL_PROJECTION_MATRIX */
+   { 27253, 0x00000BA4 }, /* GL_PROJECTION_STACK_DEPTH */
+   { 27279, 0x000080D3 }, /* GL_PROXY_COLOR_TABLE */
+   { 27300, 0x00008025 }, /* GL_PROXY_HISTOGRAM */
+   { 27319, 0x00008025 }, /* GL_PROXY_HISTOGRAM_EXT */
+   { 27342, 0x000080D5 }, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
+   { 27381, 0x000080D4 }, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
+   { 27419, 0x00008063 }, /* GL_PROXY_TEXTURE_1D */
+   { 27439, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
+   { 27469, 0x00008063 }, /* GL_PROXY_TEXTURE_1D_EXT */
+   { 27493, 0x00008064 }, /* GL_PROXY_TEXTURE_2D */
+   { 27513, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
+   { 27543, 0x00008064 }, /* GL_PROXY_TEXTURE_2D_EXT */
+   { 27567, 0x00008070 }, /* GL_PROXY_TEXTURE_3D */
+   { 27587, 0x000080BD }, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
+   { 27620, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP */
+   { 27646, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP_ARB */
+   { 27676, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
+   { 27707, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_NV */
+   { 27737, 0x00002003 }, /* GL_Q */
+   { 27742, 0x00001209 }, /* GL_QUADRATIC_ATTENUATION */
+   { 27767, 0x00000007 }, /* GL_QUADS */
+   { 27776, 0x00008614 }, /* GL_QUAD_MESH_SUN */
+   { 27793, 0x00000008 }, /* GL_QUAD_STRIP */
+   { 27807, 0x00008864 }, /* GL_QUERY_COUNTER_BITS */
+   { 27829, 0x00008864 }, /* GL_QUERY_COUNTER_BITS_ARB */
+   { 27855, 0x00008866 }, /* GL_QUERY_RESULT */
+   { 27871, 0x00008866 }, /* GL_QUERY_RESULT_ARB */
+   { 27891, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE */
+   { 27917, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE_ARB */
+   { 27947, 0x00002002 }, /* GL_R */
+   { 27952, 0x00002A10 }, /* GL_R3_G3_B2 */
+   { 27964, 0x00019262 }, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
+   { 27997, 0x00000C02 }, /* GL_READ_BUFFER */
+   { 28012, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER */
+   { 28032, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
+   { 28064, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER_EXT */
+   { 28088, 0x000088B8 }, /* GL_READ_ONLY */
+   { 28101, 0x000088B8 }, /* GL_READ_ONLY_ARB */
+   { 28118, 0x000088BA }, /* GL_READ_WRITE */
+   { 28132, 0x000088BA }, /* GL_READ_WRITE_ARB */
+   { 28150, 0x00001903 }, /* GL_RED */
+   { 28157, 0x00008016 }, /* GL_REDUCE */
+   { 28167, 0x00008016 }, /* GL_REDUCE_EXT */
+   { 28181, 0x00000D15 }, /* GL_RED_BIAS */
+   { 28193, 0x00000D52 }, /* GL_RED_BITS */
+   { 28205, 0x00000D14 }, /* GL_RED_SCALE */
+   { 28218, 0x00008512 }, /* GL_REFLECTION_MAP */
+   { 28236, 0x00008512 }, /* GL_REFLECTION_MAP_ARB */
+   { 28258, 0x00008512 }, /* GL_REFLECTION_MAP_NV */
+   { 28279, 0x00001C00 }, /* GL_RENDER */
+   { 28289, 0x00008D41 }, /* GL_RENDERBUFFER */
+   { 28305, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE */
+   { 28332, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_EXT */
+   { 28360, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE */
+   { 28386, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE */
+   { 28413, 0x00008D41 }, /* GL_RENDERBUFFER_EXT */
+   { 28433, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE */
+   { 28460, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT */
+   { 28483, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_EXT */
+   { 28510, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
+   { 28542, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */
+   { 28578, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE */
+   { 28603, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES */
+   { 28627, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE */
+   { 28656, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH */
+   { 28678, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_EXT */
+   { 28704, 0x00001F01 }, /* GL_RENDERER */
+   { 28716, 0x00000C40 }, /* GL_RENDER_MODE */
+   { 28731, 0x00002901 }, /* GL_REPEAT */
+   { 28741, 0x00001E01 }, /* GL_REPLACE */
+   { 28752, 0x00008062 }, /* GL_REPLACE_EXT */
+   { 28767, 0x00008153 }, /* GL_REPLICATE_BORDER_HP */
+   { 28790, 0x0000803A }, /* GL_RESCALE_NORMAL */
+   { 28808, 0x0000803A }, /* GL_RESCALE_NORMAL_EXT */
+   { 28830, 0x00000102 }, /* GL_RETURN */
+   { 28840, 0x00001907 }, /* GL_RGB */
+   { 28847, 0x00008052 }, /* GL_RGB10 */
+   { 28856, 0x00008059 }, /* GL_RGB10_A2 */
+   { 28868, 0x00008059 }, /* GL_RGB10_A2_EXT */
+   { 28884, 0x00008052 }, /* GL_RGB10_EXT */
+   { 28897, 0x00008053 }, /* GL_RGB12 */
+   { 28906, 0x00008053 }, /* GL_RGB12_EXT */
+   { 28919, 0x00008054 }, /* GL_RGB16 */
+   { 28928, 0x00008054 }, /* GL_RGB16_EXT */
+   { 28941, 0x0000804E }, /* GL_RGB2_EXT */
+   { 28953, 0x0000804F }, /* GL_RGB4 */
+   { 28961, 0x0000804F }, /* GL_RGB4_EXT */
+   { 28973, 0x000083A1 }, /* GL_RGB4_S3TC */
+   { 28986, 0x00008050 }, /* GL_RGB5 */
+   { 28994, 0x00008057 }, /* GL_RGB5_A1 */
+   { 29005, 0x00008057 }, /* GL_RGB5_A1_EXT */
+   { 29020, 0x00008050 }, /* GL_RGB5_EXT */
+   { 29032, 0x00008051 }, /* GL_RGB8 */
+   { 29040, 0x00008051 }, /* GL_RGB8_EXT */
+   { 29052, 0x00001908 }, /* GL_RGBA */
+   { 29060, 0x0000805A }, /* GL_RGBA12 */
+   { 29070, 0x0000805A }, /* GL_RGBA12_EXT */
+   { 29084, 0x0000805B }, /* GL_RGBA16 */
+   { 29094, 0x0000805B }, /* GL_RGBA16_EXT */
+   { 29108, 0x00008055 }, /* GL_RGBA2 */
+   { 29117, 0x00008055 }, /* GL_RGBA2_EXT */
+   { 29130, 0x00008056 }, /* GL_RGBA4 */
+   { 29139, 0x000083A5 }, /* GL_RGBA4_DXT5_S3TC */
+   { 29158, 0x00008056 }, /* GL_RGBA4_EXT */
+   { 29171, 0x000083A3 }, /* GL_RGBA4_S3TC */
+   { 29185, 0x00008058 }, /* GL_RGBA8 */
+   { 29194, 0x00008058 }, /* GL_RGBA8_EXT */
+   { 29207, 0x000083A4 }, /* GL_RGBA_DXT5_S3TC */
+   { 29225, 0x00000C31 }, /* GL_RGBA_MODE */
+   { 29238, 0x000083A2 }, /* GL_RGBA_S3TC */
+   { 29251, 0x000083A0 }, /* GL_RGB_S3TC */
+   { 29263, 0x00008573 }, /* GL_RGB_SCALE */
+   { 29276, 0x00008573 }, /* GL_RGB_SCALE_ARB */
+   { 29293, 0x00008573 }, /* GL_RGB_SCALE_EXT */
+   { 29310, 0x00000407 }, /* GL_RIGHT */
+   { 29319, 0x00002000 }, /* GL_S */
+   { 29324, 0x00008B5D }, /* GL_SAMPLER_1D */
+   { 29338, 0x00008B61 }, /* GL_SAMPLER_1D_SHADOW */
+   { 29359, 0x00008B5E }, /* GL_SAMPLER_2D */
+   { 29373, 0x00008B62 }, /* GL_SAMPLER_2D_SHADOW */
+   { 29394, 0x00008B5F }, /* GL_SAMPLER_3D */
+   { 29408, 0x00008B60 }, /* GL_SAMPLER_CUBE */
+   { 29424, 0x000080A9 }, /* GL_SAMPLES */
+   { 29435, 0x000086B4 }, /* GL_SAMPLES_3DFX */
+   { 29451, 0x000080A9 }, /* GL_SAMPLES_ARB */
+   { 29466, 0x00008914 }, /* GL_SAMPLES_PASSED */
+   { 29484, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */
+   { 29506, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
+   { 29534, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */
+   { 29566, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */
+   { 29589, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */
+   { 29616, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */
+   { 29634, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */
+   { 29657, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */
+   { 29679, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */
+   { 29698, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */
+   { 29721, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */
+   { 29747, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */
+   { 29777, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */
+   { 29802, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */
+   { 29831, 0x00080000 }, /* GL_SCISSOR_BIT */
+   { 29846, 0x00000C10 }, /* GL_SCISSOR_BOX */
+   { 29861, 0x00000C11 }, /* GL_SCISSOR_TEST */
+   { 29877, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */
+   { 29902, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
+   { 29942, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */
+   { 29986, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
+   { 30019, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
+   { 30049, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
+   { 30081, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
+   { 30111, 0x00001C02 }, /* GL_SELECT */
+   { 30121, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */
+   { 30149, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */
+   { 30174, 0x00008012 }, /* GL_SEPARABLE_2D */
+   { 30190, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */
+   { 30217, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */
+   { 30248, 0x0000150F }, /* GL_SET */
+   { 30255, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */
+   { 30276, 0x00008B88 }, /* GL_SHADER_SOURCE_LENGTH */
+   { 30300, 0x00008B4F }, /* GL_SHADER_TYPE */
+   { 30315, 0x00000B54 }, /* GL_SHADE_MODEL */
+   { 30330, 0x00008B8C }, /* GL_SHADING_LANGUAGE_VERSION */
+   { 30358, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */
+   { 30381, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */
+   { 30411, 0x00001601 }, /* GL_SHININESS */
+   { 30424, 0x00001402 }, /* GL_SHORT */
+   { 30433, 0x000081F9 }, /* GL_SINGLE_COLOR */
+   { 30449, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */
+   { 30469, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */
+   { 30488, 0x00001D01 }, /* GL_SMOOTH */
+   { 30498, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */
+   { 30531, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */
+   { 30558, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */
+   { 30591, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */
+   { 30618, 0x00008588 }, /* GL_SOURCE0_ALPHA */
+   { 30635, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */
+   { 30656, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */
+   { 30677, 0x00008580 }, /* GL_SOURCE0_RGB */
+   { 30692, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */
+   { 30711, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */
+   { 30730, 0x00008589 }, /* GL_SOURCE1_ALPHA */
+   { 30747, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */
+   { 30768, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */
+   { 30789, 0x00008581 }, /* GL_SOURCE1_RGB */
+   { 30804, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */
+   { 30823, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */
+   { 30842, 0x0000858A }, /* GL_SOURCE2_ALPHA */
+   { 30859, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */
+   { 30880, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */
+   { 30901, 0x00008582 }, /* GL_SOURCE2_RGB */
+   { 30916, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */
+   { 30935, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */
+   { 30954, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */
+   { 30974, 0x00008583 }, /* GL_SOURCE3_RGB_NV */
+   { 30992, 0x00001202 }, /* GL_SPECULAR */
+   { 31004, 0x00002402 }, /* GL_SPHERE_MAP */
+   { 31018, 0x00001206 }, /* GL_SPOT_CUTOFF */
+   { 31033, 0x00001204 }, /* GL_SPOT_DIRECTION */
+   { 31051, 0x00001205 }, /* GL_SPOT_EXPONENT */
+   { 31068, 0x00008588 }, /* GL_SRC0_ALPHA */
+   { 31082, 0x00008580 }, /* GL_SRC0_RGB */
+   { 31094, 0x00008589 }, /* GL_SRC1_ALPHA */
+   { 31108, 0x00008581 }, /* GL_SRC1_RGB */
+   { 31120, 0x0000858A }, /* GL_SRC2_ALPHA */
+   { 31134, 0x00008582 }, /* GL_SRC2_RGB */
+   { 31146, 0x00000302 }, /* GL_SRC_ALPHA */
+   { 31159, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */
+   { 31181, 0x00000300 }, /* GL_SRC_COLOR */
+   { 31194, 0x00008C40 }, /* GL_SRGB */
+   { 31202, 0x00000503 }, /* GL_STACK_OVERFLOW */
+   { 31220, 0x00000504 }, /* GL_STACK_UNDERFLOW */
+   { 31239, 0x000088E6 }, /* GL_STATIC_COPY */
+   { 31254, 0x000088E6 }, /* GL_STATIC_COPY_ARB */
+   { 31273, 0x000088E4 }, /* GL_STATIC_DRAW */
+   { 31288, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */
+   { 31307, 0x000088E5 }, /* GL_STATIC_READ */
+   { 31322, 0x000088E5 }, /* GL_STATIC_READ_ARB */
+   { 31341, 0x00001802 }, /* GL_STENCIL */
+   { 31352, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT */
+   { 31374, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */
+   { 31400, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */
+   { 31421, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */
+   { 31446, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
+   { 31467, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */
+   { 31492, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
+   { 31524, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */
+   { 31560, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
+   { 31592, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */
+   { 31628, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
+   { 31648, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
+   { 31675, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
+   { 31701, 0x00000D57 }, /* GL_STENCIL_BITS */
+   { 31717, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
+   { 31739, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
+   { 31762, 0x00000B94 }, /* GL_STENCIL_FAIL */
+   { 31778, 0x00000B92 }, /* GL_STENCIL_FUNC */
+   { 31794, 0x00001901 }, /* GL_STENCIL_INDEX */
+   { 31811, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
+   { 31834, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
+   { 31856, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
+   { 31878, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
+   { 31900, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
+   { 31921, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
+   { 31948, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
+   { 31975, 0x00000B97 }, /* GL_STENCIL_REF */
+   { 31990, 0x00000B90 }, /* GL_STENCIL_TEST */
+   { 32006, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
+   { 32035, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
+   { 32057, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
+   { 32078, 0x00000C33 }, /* GL_STEREO */
+   { 32088, 0x000088E2 }, /* GL_STREAM_COPY */
+   { 32103, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
+   { 32122, 0x000088E0 }, /* GL_STREAM_DRAW */
+   { 32137, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
+   { 32156, 0x000088E1 }, /* GL_STREAM_READ */
+   { 32171, 0x000088E1 }, /* GL_STREAM_READ_ARB */
+   { 32190, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
+   { 32207, 0x000084E7 }, /* GL_SUBTRACT */
+   { 32219, 0x000084E7 }, /* GL_SUBTRACT_ARB */
+   { 32235, 0x00002001 }, /* GL_T */
+   { 32240, 0x00002A2A }, /* GL_T2F_C3F_V3F */
+   { 32255, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
+   { 32274, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
+   { 32290, 0x00002A2B }, /* GL_T2F_N3F_V3F */
+   { 32305, 0x00002A27 }, /* GL_T2F_V3F */
+   { 32316, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
+   { 32335, 0x00002A28 }, /* GL_T4F_V4F */
+   { 32346, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
+   { 32369, 0x00001702 }, /* GL_TEXTURE */
+   { 32380, 0x000084C0 }, /* GL_TEXTURE0 */
+   { 32392, 0x000084C0 }, /* GL_TEXTURE0_ARB */
+   { 32408, 0x000084C1 }, /* GL_TEXTURE1 */
+   { 32420, 0x000084CA }, /* GL_TEXTURE10 */
+   { 32433, 0x000084CA }, /* GL_TEXTURE10_ARB */
+   { 32450, 0x000084CB }, /* GL_TEXTURE11 */
+   { 32463, 0x000084CB }, /* GL_TEXTURE11_ARB */
+   { 32480, 0x000084CC }, /* GL_TEXTURE12 */
+   { 32493, 0x000084CC }, /* GL_TEXTURE12_ARB */
+   { 32510, 0x000084CD }, /* GL_TEXTURE13 */
+   { 32523, 0x000084CD }, /* GL_TEXTURE13_ARB */
+   { 32540, 0x000084CE }, /* GL_TEXTURE14 */
+   { 32553, 0x000084CE }, /* GL_TEXTURE14_ARB */
+   { 32570, 0x000084CF }, /* GL_TEXTURE15 */
+   { 32583, 0x000084CF }, /* GL_TEXTURE15_ARB */
+   { 32600, 0x000084D0 }, /* GL_TEXTURE16 */
+   { 32613, 0x000084D0 }, /* GL_TEXTURE16_ARB */
+   { 32630, 0x000084D1 }, /* GL_TEXTURE17 */
+   { 32643, 0x000084D1 }, /* GL_TEXTURE17_ARB */
+   { 32660, 0x000084D2 }, /* GL_TEXTURE18 */
+   { 32673, 0x000084D2 }, /* GL_TEXTURE18_ARB */
+   { 32690, 0x000084D3 }, /* GL_TEXTURE19 */
+   { 32703, 0x000084D3 }, /* GL_TEXTURE19_ARB */
+   { 32720, 0x000084C1 }, /* GL_TEXTURE1_ARB */
+   { 32736, 0x000084C2 }, /* GL_TEXTURE2 */
+   { 32748, 0x000084D4 }, /* GL_TEXTURE20 */
+   { 32761, 0x000084D4 }, /* GL_TEXTURE20_ARB */
+   { 32778, 0x000084D5 }, /* GL_TEXTURE21 */
+   { 32791, 0x000084D5 }, /* GL_TEXTURE21_ARB */
+   { 32808, 0x000084D6 }, /* GL_TEXTURE22 */
+   { 32821, 0x000084D6 }, /* GL_TEXTURE22_ARB */
+   { 32838, 0x000084D7 }, /* GL_TEXTURE23 */
+   { 32851, 0x000084D7 }, /* GL_TEXTURE23_ARB */
+   { 32868, 0x000084D8 }, /* GL_TEXTURE24 */
+   { 32881, 0x000084D8 }, /* GL_TEXTURE24_ARB */
+   { 32898, 0x000084D9 }, /* GL_TEXTURE25 */
+   { 32911, 0x000084D9 }, /* GL_TEXTURE25_ARB */
+   { 32928, 0x000084DA }, /* GL_TEXTURE26 */
+   { 32941, 0x000084DA }, /* GL_TEXTURE26_ARB */
+   { 32958, 0x000084DB }, /* GL_TEXTURE27 */
+   { 32971, 0x000084DB }, /* GL_TEXTURE27_ARB */
+   { 32988, 0x000084DC }, /* GL_TEXTURE28 */
+   { 33001, 0x000084DC }, /* GL_TEXTURE28_ARB */
+   { 33018, 0x000084DD }, /* GL_TEXTURE29 */
+   { 33031, 0x000084DD }, /* GL_TEXTURE29_ARB */
+   { 33048, 0x000084C2 }, /* GL_TEXTURE2_ARB */
+   { 33064, 0x000084C3 }, /* GL_TEXTURE3 */
+   { 33076, 0x000084DE }, /* GL_TEXTURE30 */
+   { 33089, 0x000084DE }, /* GL_TEXTURE30_ARB */
+   { 33106, 0x000084DF }, /* GL_TEXTURE31 */
+   { 33119, 0x000084DF }, /* GL_TEXTURE31_ARB */
+   { 33136, 0x000084C3 }, /* GL_TEXTURE3_ARB */
+   { 33152, 0x000084C4 }, /* GL_TEXTURE4 */
+   { 33164, 0x000084C4 }, /* GL_TEXTURE4_ARB */
+   { 33180, 0x000084C5 }, /* GL_TEXTURE5 */
+   { 33192, 0x000084C5 }, /* GL_TEXTURE5_ARB */
+   { 33208, 0x000084C6 }, /* GL_TEXTURE6 */
+   { 33220, 0x000084C6 }, /* GL_TEXTURE6_ARB */
+   { 33236, 0x000084C7 }, /* GL_TEXTURE7 */
+   { 33248, 0x000084C7 }, /* GL_TEXTURE7_ARB */
+   { 33264, 0x000084C8 }, /* GL_TEXTURE8 */
+   { 33276, 0x000084C8 }, /* GL_TEXTURE8_ARB */
+   { 33292, 0x000084C9 }, /* GL_TEXTURE9 */
+   { 33304, 0x000084C9 }, /* GL_TEXTURE9_ARB */
+   { 33320, 0x00000DE0 }, /* GL_TEXTURE_1D */
+   { 33334, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
+   { 33358, 0x00000DE1 }, /* GL_TEXTURE_2D */
+   { 33372, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
+   { 33396, 0x0000806F }, /* GL_TEXTURE_3D */
+   { 33410, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
+   { 33432, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
+   { 33458, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
+   { 33480, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
+   { 33502, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
+   { 33534, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
+   { 33556, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
+   { 33588, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
+   { 33610, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
+   { 33638, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
+   { 33670, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
+   { 33703, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
+   { 33735, 0x00040000 }, /* GL_TEXTURE_BIT */
+   { 33750, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
+   { 33771, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
+   { 33796, 0x00001005 }, /* GL_TEXTURE_BORDER */
+   { 33814, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
+   { 33838, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
+   { 33869, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
+   { 33899, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
+   { 33929, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
+   { 33964, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
+   { 33995, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+   { 34033, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
+   { 34060, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
+   { 34092, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+   { 34126, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
+   { 34150, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
+   { 34178, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
+   { 34202, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
+   { 34230, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
+   { 34263, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
+   { 34287, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
+   { 34309, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
+   { 34331, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
+   { 34357, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
+   { 34391, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
+   { 34424, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
+   { 34461, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
+   { 34489, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
+   { 34521, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
+   { 34544, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
+   { 34582, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
+   { 34624, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
+   { 34655, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
+   { 34683, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
+   { 34713, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
+   { 34741, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
+   { 34761, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
+   { 34785, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
+   { 34816, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
+   { 34851, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
+   { 34882, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
+   { 34917, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
+   { 34948, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
+   { 34983, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
+   { 35014, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
+   { 35049, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
+   { 35080, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
+   { 35115, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
+   { 35146, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
+   { 35181, 0x00008071 }, /* GL_TEXTURE_DEPTH */
+   { 35198, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
+   { 35220, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
+   { 35246, 0x00002300 }, /* GL_TEXTURE_ENV */
+   { 35261, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
+   { 35282, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
+   { 35302, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
+   { 35328, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
+   { 35348, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
+   { 35365, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
+   { 35382, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
+   { 35399, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
+   { 35416, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
+   { 35441, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
+   { 35463, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
+   { 35489, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
+   { 35507, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
+   { 35533, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
+   { 35559, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
+   { 35589, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
+   { 35616, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
+   { 35641, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
+   { 35661, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
+   { 35685, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+   { 35712, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+   { 35739, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+   { 35766, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
+   { 35792, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
+   { 35822, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
+   { 35844, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
+   { 35862, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+   { 35892, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+   { 35920, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+   { 35948, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+   { 35976, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
+   { 35997, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
+   { 36016, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
+   { 36038, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
+   { 36057, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
+   { 36077, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
+   { 36102, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
+   { 36126, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
+   { 36146, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
+   { 36170, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
+   { 36190, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
+   { 36213, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */
+   { 36237, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
+   { 36262, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+   { 36296, 0x00001000 }, /* GL_TEXTURE_WIDTH */
+   { 36313, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
+   { 36331, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
+   { 36349, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
+   { 36367, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
+   { 36387, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
+   { 36406, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+   { 36435, 0x00001000 }, /* GL_TRANSFORM_BIT */
+   { 36452, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
+   { 36478, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
+   { 36508, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+   { 36540, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+   { 36570, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
+   { 36604, 0x0000862C }, /* GL_TRANSPOSE_NV */
+   { 36620, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+   { 36651, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
+   { 36686, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+   { 36714, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
+   { 36746, 0x00000004 }, /* GL_TRIANGLES */
+   { 36759, 0x00000006 }, /* GL_TRIANGLE_FAN */
+   { 36775, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
+   { 36796, 0x00000005 }, /* GL_TRIANGLE_STRIP */
+   { 36814, 0x00000001 }, /* GL_TRUE */
+   { 36822, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
+   { 36842, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
+   { 36865, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
+   { 36885, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
+   { 36906, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
+   { 36928, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
+   { 36950, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
+   { 36970, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
+   { 36991, 0x00001401 }, /* GL_UNSIGNED_BYTE */
+   { 37008, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+   { 37035, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
+   { 37058, 0x00001405 }, /* GL_UNSIGNED_INT */
+   { 37074, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
+   { 37101, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */
+   { 37122, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
+   { 37146, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+   { 37177, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
+   { 37201, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+   { 37229, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */
+   { 37252, 0x00001403 }, /* GL_UNSIGNED_SHORT */
+   { 37270, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+   { 37300, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+   { 37326, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+   { 37356, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+   { 37382, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
+   { 37406, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+   { 37434, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+   { 37462, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
+   { 37489, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+   { 37521, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
+   { 37552, 0x00008CA2 }, /* GL_UPPER_LEFT */
+   { 37566, 0x00002A20 }, /* GL_V2F */
+   { 37573, 0x00002A21 }, /* GL_V3F */
+   { 37580, 0x00008B83 }, /* GL_VALIDATE_STATUS */
+   { 37599, 0x00001F00 }, /* GL_VENDOR */
+   { 37609, 0x00001F02 }, /* GL_VERSION */
+   { 37620, 0x00008074 }, /* GL_VERTEX_ARRAY */
+   { 37636, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
+   { 37666, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+   { 37697, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
+   { 37732, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
+   { 37756, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
+   { 37777, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
+   { 37800, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
+   { 37821, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+   { 37848, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+   { 37876, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+   { 37904, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+   { 37932, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+   { 37960, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+   { 37988, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+   { 38016, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+   { 38043, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+   { 38070, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+   { 38097, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+   { 38124, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+   { 38151, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+   { 38178, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+   { 38205, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+   { 38232, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+   { 38259, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+   { 38297, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
+   { 38339, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+   { 38370, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
+   { 38405, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+   { 38439, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
+   { 38477, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+   { 38508, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
+   { 38543, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+   { 38571, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
+   { 38603, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+   { 38633, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
+   { 38667, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+   { 38695, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
+   { 38727, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
+   { 38747, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
+   { 38769, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
+   { 38798, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
+   { 38819, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
+   { 38848, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
+   { 38881, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
+   { 38913, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+   { 38940, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
+   { 38971, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
+   { 39001, 0x00008B31 }, /* GL_VERTEX_SHADER */
+   { 39018, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
+   { 39039, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
+   { 39066, 0x00000BA2 }, /* GL_VIEWPORT */
+   { 39078, 0x00000800 }, /* GL_VIEWPORT_BIT */
+   { 39094, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
+   { 39114, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+   { 39145, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
+   { 39180, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+   { 39208, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+   { 39233, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+   { 39260, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+   { 39285, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
+   { 39309, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
+   { 39328, 0x000088B9 }, /* GL_WRITE_ONLY */
+   { 39342, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
+   { 39360, 0x00001506 }, /* GL_XOR */
+   { 39367, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
+   { 39386, 0x00008757 }, /* GL_YCBCR_MESA */
+   { 39400, 0x00000000 }, /* GL_ZERO */
+   { 39408, 0x00000D16 }, /* GL_ZOOM_X */
+   { 39418, 0x00000D17 }, /* GL_ZOOM_Y */
 };
 
-static const unsigned reduced_enums[1308] =
+static const unsigned reduced_enums[1316] =
 {
-       455, /* GL_FALSE */
-       687, /* GL_LINES */
-       689, /* GL_LINE_LOOP */
-       696, /* GL_LINE_STRIP */
-      1699, /* GL_TRIANGLES */
-      1702, /* GL_TRIANGLE_STRIP */
-      1700, /* GL_TRIANGLE_FAN */
-      1254, /* GL_QUADS */
-      1256, /* GL_QUAD_STRIP */
-      1142, /* GL_POLYGON */
-      1154, /* GL_POLYGON_STIPPLE_BIT */
-      1107, /* GL_PIXEL_MODE_BIT */
-       674, /* GL_LIGHTING_BIT */
-       477, /* GL_FOG_BIT */
+       463, /* GL_FALSE */
+       695, /* GL_LINES */
+       697, /* GL_LINE_LOOP */
+       704, /* GL_LINE_STRIP */
+      1707, /* GL_TRIANGLES */
+      1710, /* GL_TRIANGLE_STRIP */
+      1708, /* GL_TRIANGLE_FAN */
+      1262, /* GL_QUADS */
+      1264, /* GL_QUAD_STRIP */
+      1150, /* GL_POLYGON */
+      1162, /* GL_POLYGON_STIPPLE_BIT */
+      1115, /* GL_PIXEL_MODE_BIT */
+       682, /* GL_LIGHTING_BIT */
+       485, /* GL_FOG_BIT */
          8, /* GL_ACCUM */
-       706, /* GL_LOAD */
-      1308, /* GL_RETURN */
-       980, /* GL_MULT */
+       714, /* GL_LOAD */
+      1316, /* GL_RETURN */
+       988, /* GL_MULT */
         23, /* GL_ADD */
-       996, /* GL_NEVER */
-       664, /* GL_LESS */
-       445, /* GL_EQUAL */
-       663, /* GL_LEQUAL */
-       587, /* GL_GREATER */
-      1011, /* GL_NOTEQUAL */
-       562, /* GL_GEQUAL */
+      1004, /* GL_NEVER */
+       672, /* GL_LESS */
+       453, /* GL_EQUAL */
+       671, /* GL_LEQUAL */
+       595, /* GL_GREATER */
+      1019, /* GL_NOTEQUAL */
+       570, /* GL_GEQUAL */
         46, /* GL_ALWAYS */
-      1441, /* GL_SRC_COLOR */
-      1040, /* GL_ONE_MINUS_SRC_COLOR */
-      1439, /* GL_SRC_ALPHA */
-      1039, /* GL_ONE_MINUS_SRC_ALPHA */
-       426, /* GL_DST_ALPHA */
-      1037, /* GL_ONE_MINUS_DST_ALPHA */
-       427, /* GL_DST_COLOR */
-      1038, /* GL_ONE_MINUS_DST_COLOR */
-      1440, /* GL_SRC_ALPHA_SATURATE */
-       550, /* GL_FRONT_LEFT */
-       551, /* GL_FRONT_RIGHT */
+      1449, /* GL_SRC_COLOR */
+      1048, /* GL_ONE_MINUS_SRC_COLOR */
+      1447, /* GL_SRC_ALPHA */
+      1047, /* GL_ONE_MINUS_SRC_ALPHA */
+       432, /* GL_DST_ALPHA */
+      1045, /* GL_ONE_MINUS_DST_ALPHA */
+       433, /* GL_DST_COLOR */
+      1046, /* GL_ONE_MINUS_DST_COLOR */
+      1448, /* GL_SRC_ALPHA_SATURATE */
+       558, /* GL_FRONT_LEFT */
+       559, /* GL_FRONT_RIGHT */
         68, /* GL_BACK_LEFT */
         69, /* GL_BACK_RIGHT */
-       547, /* GL_FRONT */
+       555, /* GL_FRONT */
         67, /* GL_BACK */
-       662, /* GL_LEFT */
-      1348, /* GL_RIGHT */
-       548, /* GL_FRONT_AND_BACK */
+       670, /* GL_LEFT */
+      1356, /* GL_RIGHT */
+       556, /* GL_FRONT_AND_BACK */
         62, /* GL_AUX0 */
         63, /* GL_AUX1 */
         64, /* GL_AUX2 */
         65, /* GL_AUX3 */
-       653, /* GL_INVALID_ENUM */
-       657, /* GL_INVALID_VALUE */
-       656, /* GL_INVALID_OPERATION */
-      1443, /* GL_STACK_OVERFLOW */
-      1444, /* GL_STACK_UNDERFLOW */
-      1065, /* GL_OUT_OF_MEMORY */
-       654, /* GL_INVALID_FRAMEBUFFER_OPERATION */
+       661, /* GL_INVALID_ENUM */
+       665, /* GL_INVALID_VALUE */
+       664, /* GL_INVALID_OPERATION */
+      1451, /* GL_STACK_OVERFLOW */
+      1452, /* GL_STACK_UNDERFLOW */
+      1073, /* GL_OUT_OF_MEMORY */
+       662, /* GL_INVALID_FRAMEBUFFER_OPERATION */
          0, /* GL_2D */
          2, /* GL_3D */
          3, /* GL_3D_COLOR */
          4, /* GL_3D_COLOR_TEXTURE */
          6, /* GL_4D_COLOR_TEXTURE */
-      1085, /* GL_PASS_THROUGH_TOKEN */
-      1141, /* GL_POINT_TOKEN */
-       697, /* GL_LINE_TOKEN */
-      1155, /* GL_POLYGON_TOKEN */
+      1093, /* GL_PASS_THROUGH_TOKEN */
+      1149, /* GL_POINT_TOKEN */
+       705, /* GL_LINE_TOKEN */
+      1163, /* GL_POLYGON_TOKEN */
         73, /* GL_BITMAP_TOKEN */
-       425, /* GL_DRAW_PIXEL_TOKEN */
-       286, /* GL_COPY_PIXEL_TOKEN */
-       690, /* GL_LINE_RESET_TOKEN */
-       448, /* GL_EXP */
-       449, /* GL_EXP2 */
-       319, /* GL_CW */
-       115, /* GL_CCW */
-       136, /* GL_COEFF */
-      1062, /* GL_ORDER */
-       363, /* GL_DOMAIN */
-       294, /* GL_CURRENT_COLOR */
-       297, /* GL_CURRENT_INDEX */
-       303, /* GL_CURRENT_NORMAL */
-       315, /* GL_CURRENT_TEXTURE_COORDS */
-       308, /* GL_CURRENT_RASTER_COLOR */
-       310, /* GL_CURRENT_RASTER_INDEX */
-       313, /* GL_CURRENT_RASTER_TEXTURE_COORDS */
-       311, /* GL_CURRENT_RASTER_POSITION */
-       312, /* GL_CURRENT_RASTER_POSITION_VALID */
-       309, /* GL_CURRENT_RASTER_DISTANCE */
-      1134, /* GL_POINT_SMOOTH */
-      1123, /* GL_POINT_SIZE */
-      1133, /* GL_POINT_SIZE_RANGE */
-      1124, /* GL_POINT_SIZE_GRANULARITY */
-       691, /* GL_LINE_SMOOTH */
-       698, /* GL_LINE_WIDTH */
-       700, /* GL_LINE_WIDTH_RANGE */
-       699, /* GL_LINE_WIDTH_GRANULARITY */
-       693, /* GL_LINE_STIPPLE */
-       694, /* GL_LINE_STIPPLE_PATTERN */
-       695, /* GL_LINE_STIPPLE_REPEAT */
-       705, /* GL_LIST_MODE */
-       864, /* GL_MAX_LIST_NESTING */
-       702, /* GL_LIST_BASE */
-       704, /* GL_LIST_INDEX */
-      1144, /* GL_POLYGON_MODE */
-      1151, /* GL_POLYGON_SMOOTH */
-      1153, /* GL_POLYGON_STIPPLE */
-       434, /* GL_EDGE_FLAG */
-       287, /* GL_CULL_FACE */
-       288, /* GL_CULL_FACE_MODE */
-       549, /* GL_FRONT_FACE */
-       673, /* GL_LIGHTING */
-       678, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
-       679, /* GL_LIGHT_MODEL_TWO_SIDE */
-       675, /* GL_LIGHT_MODEL_AMBIENT */
-      1394, /* GL_SHADE_MODEL */
-       183, /* GL_COLOR_MATERIAL_FACE */
-       184, /* GL_COLOR_MATERIAL_PARAMETER */
-       182, /* GL_COLOR_MATERIAL */
-       476, /* GL_FOG */
-       498, /* GL_FOG_INDEX */
-       494, /* GL_FOG_DENSITY */
-       502, /* GL_FOG_START */
-       496, /* GL_FOG_END */
-       499, /* GL_FOG_MODE */
-       478, /* GL_FOG_COLOR */
-       350, /* GL_DEPTH_RANGE */
-       357, /* GL_DEPTH_TEST */
-       360, /* GL_DEPTH_WRITEMASK */
-       338, /* GL_DEPTH_CLEAR_VALUE */
-       349, /* GL_DEPTH_FUNC */
+       431, /* GL_DRAW_PIXEL_TOKEN */
+       292, /* GL_COPY_PIXEL_TOKEN */
+       698, /* GL_LINE_RESET_TOKEN */
+       456, /* GL_EXP */
+       457, /* GL_EXP2 */
+       325, /* GL_CW */
+       121, /* GL_CCW */
+       142, /* GL_COEFF */
+      1070, /* GL_ORDER */
+       369, /* GL_DOMAIN */
+       300, /* GL_CURRENT_COLOR */
+       303, /* GL_CURRENT_INDEX */
+       309, /* GL_CURRENT_NORMAL */
+       321, /* GL_CURRENT_TEXTURE_COORDS */
+       314, /* GL_CURRENT_RASTER_COLOR */
+       316, /* GL_CURRENT_RASTER_INDEX */
+       319, /* GL_CURRENT_RASTER_TEXTURE_COORDS */
+       317, /* GL_CURRENT_RASTER_POSITION */
+       318, /* GL_CURRENT_RASTER_POSITION_VALID */
+       315, /* GL_CURRENT_RASTER_DISTANCE */
+      1142, /* GL_POINT_SMOOTH */
+      1131, /* GL_POINT_SIZE */
+      1141, /* GL_POINT_SIZE_RANGE */
+      1132, /* GL_POINT_SIZE_GRANULARITY */
+       699, /* GL_LINE_SMOOTH */
+       706, /* GL_LINE_WIDTH */
+       708, /* GL_LINE_WIDTH_RANGE */
+       707, /* GL_LINE_WIDTH_GRANULARITY */
+       701, /* GL_LINE_STIPPLE */
+       702, /* GL_LINE_STIPPLE_PATTERN */
+       703, /* GL_LINE_STIPPLE_REPEAT */
+       713, /* GL_LIST_MODE */
+       872, /* GL_MAX_LIST_NESTING */
+       710, /* GL_LIST_BASE */
+       712, /* GL_LIST_INDEX */
+      1152, /* GL_POLYGON_MODE */
+      1159, /* GL_POLYGON_SMOOTH */
+      1161, /* GL_POLYGON_STIPPLE */
+       442, /* GL_EDGE_FLAG */
+       293, /* GL_CULL_FACE */
+       294, /* GL_CULL_FACE_MODE */
+       557, /* GL_FRONT_FACE */
+       681, /* GL_LIGHTING */
+       686, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
+       687, /* GL_LIGHT_MODEL_TWO_SIDE */
+       683, /* GL_LIGHT_MODEL_AMBIENT */
+      1402, /* GL_SHADE_MODEL */
+       189, /* GL_COLOR_MATERIAL_FACE */
+       190, /* GL_COLOR_MATERIAL_PARAMETER */
+       188, /* GL_COLOR_MATERIAL */
+       484, /* GL_FOG */
+       506, /* GL_FOG_INDEX */
+       502, /* GL_FOG_DENSITY */
+       510, /* GL_FOG_START */
+       504, /* GL_FOG_END */
+       507, /* GL_FOG_MODE */
+       486, /* GL_FOG_COLOR */
+       356, /* GL_DEPTH_RANGE */
+       363, /* GL_DEPTH_TEST */
+       366, /* GL_DEPTH_WRITEMASK */
+       344, /* GL_DEPTH_CLEAR_VALUE */
+       355, /* GL_DEPTH_FUNC */
         12, /* GL_ACCUM_CLEAR_VALUE */
-      1479, /* GL_STENCIL_TEST */
-      1467, /* GL_STENCIL_CLEAR_VALUE */
-      1469, /* GL_STENCIL_FUNC */
-      1481, /* GL_STENCIL_VALUE_MASK */
-      1468, /* GL_STENCIL_FAIL */
-      1476, /* GL_STENCIL_PASS_DEPTH_FAIL */
-      1477, /* GL_STENCIL_PASS_DEPTH_PASS */
-      1478, /* GL_STENCIL_REF */
-      1482, /* GL_STENCIL_WRITEMASK */
-       833, /* GL_MATRIX_MODE */
-      1001, /* GL_NORMALIZE */
-      1791, /* GL_VIEWPORT */
-       975, /* GL_MODELVIEW_STACK_DEPTH */
-      1234, /* GL_PROJECTION_STACK_DEPTH */
-      1677, /* GL_TEXTURE_STACK_DEPTH */
-       973, /* GL_MODELVIEW_MATRIX */
-      1233, /* GL_PROJECTION_MATRIX */
-      1662, /* GL_TEXTURE_MATRIX */
+      1487, /* GL_STENCIL_TEST */
+      1475, /* GL_STENCIL_CLEAR_VALUE */
+      1477, /* GL_STENCIL_FUNC */
+      1489, /* GL_STENCIL_VALUE_MASK */
+      1476, /* GL_STENCIL_FAIL */
+      1484, /* GL_STENCIL_PASS_DEPTH_FAIL */
+      1485, /* GL_STENCIL_PASS_DEPTH_PASS */
+      1486, /* GL_STENCIL_REF */
+      1490, /* GL_STENCIL_WRITEMASK */
+       841, /* GL_MATRIX_MODE */
+      1009, /* GL_NORMALIZE */
+      1799, /* GL_VIEWPORT */
+       983, /* GL_MODELVIEW_STACK_DEPTH */
+      1242, /* GL_PROJECTION_STACK_DEPTH */
+      1685, /* GL_TEXTURE_STACK_DEPTH */
+       981, /* GL_MODELVIEW_MATRIX */
+      1241, /* GL_PROJECTION_MATRIX */
+      1670, /* GL_TEXTURE_MATRIX */
         60, /* GL_ATTRIB_STACK_DEPTH */
-       126, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
+       132, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
         43, /* GL_ALPHA_TEST */
         44, /* GL_ALPHA_TEST_FUNC */
         45, /* GL_ALPHA_TEST_REF */
-       362, /* GL_DITHER */
+       368, /* GL_DITHER */
         77, /* GL_BLEND_DST */
         85, /* GL_BLEND_SRC */
         74, /* GL_BLEND */
-       708, /* GL_LOGIC_OP_MODE */
-       627, /* GL_INDEX_LOGIC_OP */
-       181, /* GL_COLOR_LOGIC_OP */
+       716, /* GL_LOGIC_OP_MODE */
+       635, /* GL_INDEX_LOGIC_OP */
+       187, /* GL_COLOR_LOGIC_OP */
         66, /* GL_AUX_BUFFERS */
-       373, /* GL_DRAW_BUFFER */
-      1266, /* GL_READ_BUFFER */
-      1375, /* GL_SCISSOR_BOX */
-      1376, /* GL_SCISSOR_TEST */
-       626, /* GL_INDEX_CLEAR_VALUE */
-       631, /* GL_INDEX_WRITEMASK */
-       178, /* GL_COLOR_CLEAR_VALUE */
-       220, /* GL_COLOR_WRITEMASK */
-       628, /* GL_INDEX_MODE */
-      1342, /* GL_RGBA_MODE */
-       372, /* GL_DOUBLEBUFFER */
-      1483, /* GL_STEREO */
-      1301, /* GL_RENDER_MODE */
-      1086, /* GL_PERSPECTIVE_CORRECTION_HINT */
-      1135, /* GL_POINT_SMOOTH_HINT */
-       692, /* GL_LINE_SMOOTH_HINT */
-      1152, /* GL_POLYGON_SMOOTH_HINT */
-       497, /* GL_FOG_HINT */
-      1643, /* GL_TEXTURE_GEN_S */
-      1644, /* GL_TEXTURE_GEN_T */
-      1642, /* GL_TEXTURE_GEN_R */
-      1641, /* GL_TEXTURE_GEN_Q */
-      1099, /* GL_PIXEL_MAP_I_TO_I */
-      1105, /* GL_PIXEL_MAP_S_TO_S */
-      1101, /* GL_PIXEL_MAP_I_TO_R */
-      1097, /* GL_PIXEL_MAP_I_TO_G */
-      1095, /* GL_PIXEL_MAP_I_TO_B */
-      1093, /* GL_PIXEL_MAP_I_TO_A */
-      1103, /* GL_PIXEL_MAP_R_TO_R */
-      1091, /* GL_PIXEL_MAP_G_TO_G */
-      1089, /* GL_PIXEL_MAP_B_TO_B */
-      1087, /* GL_PIXEL_MAP_A_TO_A */
-      1100, /* GL_PIXEL_MAP_I_TO_I_SIZE */
-      1106, /* GL_PIXEL_MAP_S_TO_S_SIZE */
-      1102, /* GL_PIXEL_MAP_I_TO_R_SIZE */
-      1098, /* GL_PIXEL_MAP_I_TO_G_SIZE */
-      1096, /* GL_PIXEL_MAP_I_TO_B_SIZE */
-      1094, /* GL_PIXEL_MAP_I_TO_A_SIZE */
-      1104, /* GL_PIXEL_MAP_R_TO_R_SIZE */
-      1092, /* GL_PIXEL_MAP_G_TO_G_SIZE */
-      1090, /* GL_PIXEL_MAP_B_TO_B_SIZE */
-      1088, /* GL_PIXEL_MAP_A_TO_A_SIZE */
-      1711, /* GL_UNPACK_SWAP_BYTES */
-      1706, /* GL_UNPACK_LSB_FIRST */
-      1707, /* GL_UNPACK_ROW_LENGTH */
-      1710, /* GL_UNPACK_SKIP_ROWS */
-      1709, /* GL_UNPACK_SKIP_PIXELS */
-      1704, /* GL_UNPACK_ALIGNMENT */
-      1074, /* GL_PACK_SWAP_BYTES */
-      1069, /* GL_PACK_LSB_FIRST */
-      1070, /* GL_PACK_ROW_LENGTH */
-      1073, /* GL_PACK_SKIP_ROWS */
-      1072, /* GL_PACK_SKIP_PIXELS */
-      1066, /* GL_PACK_ALIGNMENT */
-       786, /* GL_MAP_COLOR */
-       787, /* GL_MAP_STENCIL */
-       630, /* GL_INDEX_SHIFT */
-       629, /* GL_INDEX_OFFSET */
-      1279, /* GL_RED_SCALE */
-      1277, /* GL_RED_BIAS */
-      1808, /* GL_ZOOM_X */
-      1809, /* GL_ZOOM_Y */
-       591, /* GL_GREEN_SCALE */
-       589, /* GL_GREEN_BIAS */
+       379, /* GL_DRAW_BUFFER */
+      1274, /* GL_READ_BUFFER */
+      1383, /* GL_SCISSOR_BOX */
+      1384, /* GL_SCISSOR_TEST */
+       634, /* GL_INDEX_CLEAR_VALUE */
+       639, /* GL_INDEX_WRITEMASK */
+       184, /* GL_COLOR_CLEAR_VALUE */
+       226, /* GL_COLOR_WRITEMASK */
+       636, /* GL_INDEX_MODE */
+      1350, /* GL_RGBA_MODE */
+       378, /* GL_DOUBLEBUFFER */
+      1491, /* GL_STEREO */
+      1309, /* GL_RENDER_MODE */
+      1094, /* GL_PERSPECTIVE_CORRECTION_HINT */
+      1143, /* GL_POINT_SMOOTH_HINT */
+       700, /* GL_LINE_SMOOTH_HINT */
+      1160, /* GL_POLYGON_SMOOTH_HINT */
+       505, /* GL_FOG_HINT */
+      1651, /* GL_TEXTURE_GEN_S */
+      1652, /* GL_TEXTURE_GEN_T */
+      1650, /* GL_TEXTURE_GEN_R */
+      1649, /* GL_TEXTURE_GEN_Q */
+      1107, /* GL_PIXEL_MAP_I_TO_I */
+      1113, /* GL_PIXEL_MAP_S_TO_S */
+      1109, /* GL_PIXEL_MAP_I_TO_R */
+      1105, /* GL_PIXEL_MAP_I_TO_G */
+      1103, /* GL_PIXEL_MAP_I_TO_B */
+      1101, /* GL_PIXEL_MAP_I_TO_A */
+      1111, /* GL_PIXEL_MAP_R_TO_R */
+      1099, /* GL_PIXEL_MAP_G_TO_G */
+      1097, /* GL_PIXEL_MAP_B_TO_B */
+      1095, /* GL_PIXEL_MAP_A_TO_A */
+      1108, /* GL_PIXEL_MAP_I_TO_I_SIZE */
+      1114, /* GL_PIXEL_MAP_S_TO_S_SIZE */
+      1110, /* GL_PIXEL_MAP_I_TO_R_SIZE */
+      1106, /* GL_PIXEL_MAP_I_TO_G_SIZE */
+      1104, /* GL_PIXEL_MAP_I_TO_B_SIZE */
+      1102, /* GL_PIXEL_MAP_I_TO_A_SIZE */
+      1112, /* GL_PIXEL_MAP_R_TO_R_SIZE */
+      1100, /* GL_PIXEL_MAP_G_TO_G_SIZE */
+      1098, /* GL_PIXEL_MAP_B_TO_B_SIZE */
+      1096, /* GL_PIXEL_MAP_A_TO_A_SIZE */
+      1719, /* GL_UNPACK_SWAP_BYTES */
+      1714, /* GL_UNPACK_LSB_FIRST */
+      1715, /* GL_UNPACK_ROW_LENGTH */
+      1718, /* GL_UNPACK_SKIP_ROWS */
+      1717, /* GL_UNPACK_SKIP_PIXELS */
+      1712, /* GL_UNPACK_ALIGNMENT */
+      1082, /* GL_PACK_SWAP_BYTES */
+      1077, /* GL_PACK_LSB_FIRST */
+      1078, /* GL_PACK_ROW_LENGTH */
+      1081, /* GL_PACK_SKIP_ROWS */
+      1080, /* GL_PACK_SKIP_PIXELS */
+      1074, /* GL_PACK_ALIGNMENT */
+       794, /* GL_MAP_COLOR */
+       795, /* GL_MAP_STENCIL */
+       638, /* GL_INDEX_SHIFT */
+       637, /* GL_INDEX_OFFSET */
+      1287, /* GL_RED_SCALE */
+      1285, /* GL_RED_BIAS */
+      1816, /* GL_ZOOM_X */
+      1817, /* GL_ZOOM_Y */
+       599, /* GL_GREEN_SCALE */
+       597, /* GL_GREEN_BIAS */
         91, /* GL_BLUE_SCALE */
         89, /* GL_BLUE_BIAS */
         42, /* GL_ALPHA_SCALE */
         40, /* GL_ALPHA_BIAS */
-       351, /* GL_DEPTH_SCALE */
-       332, /* GL_DEPTH_BIAS */
-       859, /* GL_MAX_EVAL_ORDER */
-       863, /* GL_MAX_LIGHTS */
-       842, /* GL_MAX_CLIP_PLANES */
-       908, /* GL_MAX_TEXTURE_SIZE */
-       869, /* GL_MAX_PIXEL_MAP_TABLE */
-       838, /* GL_MAX_ATTRIB_STACK_DEPTH */
-       866, /* GL_MAX_MODELVIEW_STACK_DEPTH */
-       867, /* GL_MAX_NAME_STACK_DEPTH */
-       895, /* GL_MAX_PROJECTION_STACK_DEPTH */
-       909, /* GL_MAX_TEXTURE_STACK_DEPTH */
-       923, /* GL_MAX_VIEWPORT_DIMS */
-       839, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
-      1490, /* GL_SUBPIXEL_BITS */
-       625, /* GL_INDEX_BITS */
-      1278, /* GL_RED_BITS */
-       590, /* GL_GREEN_BITS */
+       357, /* GL_DEPTH_SCALE */
+       338, /* GL_DEPTH_BIAS */
+       867, /* GL_MAX_EVAL_ORDER */
+       871, /* GL_MAX_LIGHTS */
+       850, /* GL_MAX_CLIP_PLANES */
+       916, /* GL_MAX_TEXTURE_SIZE */
+       877, /* GL_MAX_PIXEL_MAP_TABLE */
+       846, /* GL_MAX_ATTRIB_STACK_DEPTH */
+       874, /* GL_MAX_MODELVIEW_STACK_DEPTH */
+       875, /* GL_MAX_NAME_STACK_DEPTH */
+       903, /* GL_MAX_PROJECTION_STACK_DEPTH */
+       917, /* GL_MAX_TEXTURE_STACK_DEPTH */
+       931, /* GL_MAX_VIEWPORT_DIMS */
+       847, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
+      1498, /* GL_SUBPIXEL_BITS */
+       633, /* GL_INDEX_BITS */
+      1286, /* GL_RED_BITS */
+       598, /* GL_GREEN_BITS */
         90, /* GL_BLUE_BITS */
         41, /* GL_ALPHA_BITS */
-       333, /* GL_DEPTH_BITS */
-      1465, /* GL_STENCIL_BITS */
+       339, /* GL_DEPTH_BITS */
+      1473, /* GL_STENCIL_BITS */
         14, /* GL_ACCUM_RED_BITS */
         13, /* GL_ACCUM_GREEN_BITS */
         10, /* GL_ACCUM_BLUE_BITS */
          9, /* GL_ACCUM_ALPHA_BITS */
-       989, /* GL_NAME_STACK_DEPTH */
+       997, /* GL_NAME_STACK_DEPTH */
         61, /* GL_AUTO_NORMAL */
-       732, /* GL_MAP1_COLOR_4 */
-       735, /* GL_MAP1_INDEX */
-       736, /* GL_MAP1_NORMAL */
-       737, /* GL_MAP1_TEXTURE_COORD_1 */
-       738, /* GL_MAP1_TEXTURE_COORD_2 */
-       739, /* GL_MAP1_TEXTURE_COORD_3 */
-       740, /* GL_MAP1_TEXTURE_COORD_4 */
-       741, /* GL_MAP1_VERTEX_3 */
-       742, /* GL_MAP1_VERTEX_4 */
-       759, /* GL_MAP2_COLOR_4 */
-       762, /* GL_MAP2_INDEX */
-       763, /* GL_MAP2_NORMAL */
-       764, /* GL_MAP2_TEXTURE_COORD_1 */
-       765, /* GL_MAP2_TEXTURE_COORD_2 */
-       766, /* GL_MAP2_TEXTURE_COORD_3 */
-       767, /* GL_MAP2_TEXTURE_COORD_4 */
-       768, /* GL_MAP2_VERTEX_3 */
-       769, /* GL_MAP2_VERTEX_4 */
-       733, /* GL_MAP1_GRID_DOMAIN */
-       734, /* GL_MAP1_GRID_SEGMENTS */
-       760, /* GL_MAP2_GRID_DOMAIN */
-       761, /* GL_MAP2_GRID_SEGMENTS */
-      1567, /* GL_TEXTURE_1D */
-      1569, /* GL_TEXTURE_2D */
-       458, /* GL_FEEDBACK_BUFFER_POINTER */
-       459, /* GL_FEEDBACK_BUFFER_SIZE */
-       460, /* GL_FEEDBACK_BUFFER_TYPE */
-      1385, /* GL_SELECTION_BUFFER_POINTER */
-      1386, /* GL_SELECTION_BUFFER_SIZE */
-      1681, /* GL_TEXTURE_WIDTH */
-      1648, /* GL_TEXTURE_HEIGHT */
-      1604, /* GL_TEXTURE_COMPONENTS */
-      1588, /* GL_TEXTURE_BORDER_COLOR */
-      1587, /* GL_TEXTURE_BORDER */
-       364, /* GL_DONT_CARE */
-       456, /* GL_FASTEST */
-       997, /* GL_NICEST */
+       740, /* GL_MAP1_COLOR_4 */
+       743, /* GL_MAP1_INDEX */
+       744, /* GL_MAP1_NORMAL */
+       745, /* GL_MAP1_TEXTURE_COORD_1 */
+       746, /* GL_MAP1_TEXTURE_COORD_2 */
+       747, /* GL_MAP1_TEXTURE_COORD_3 */
+       748, /* GL_MAP1_TEXTURE_COORD_4 */
+       749, /* GL_MAP1_VERTEX_3 */
+       750, /* GL_MAP1_VERTEX_4 */
+       767, /* GL_MAP2_COLOR_4 */
+       770, /* GL_MAP2_INDEX */
+       771, /* GL_MAP2_NORMAL */
+       772, /* GL_MAP2_TEXTURE_COORD_1 */
+       773, /* GL_MAP2_TEXTURE_COORD_2 */
+       774, /* GL_MAP2_TEXTURE_COORD_3 */
+       775, /* GL_MAP2_TEXTURE_COORD_4 */
+       776, /* GL_MAP2_VERTEX_3 */
+       777, /* GL_MAP2_VERTEX_4 */
+       741, /* GL_MAP1_GRID_DOMAIN */
+       742, /* GL_MAP1_GRID_SEGMENTS */
+       768, /* GL_MAP2_GRID_DOMAIN */
+       769, /* GL_MAP2_GRID_SEGMENTS */
+      1575, /* GL_TEXTURE_1D */
+      1577, /* GL_TEXTURE_2D */
+       466, /* GL_FEEDBACK_BUFFER_POINTER */
+       467, /* GL_FEEDBACK_BUFFER_SIZE */
+       468, /* GL_FEEDBACK_BUFFER_TYPE */
+      1393, /* GL_SELECTION_BUFFER_POINTER */
+      1394, /* GL_SELECTION_BUFFER_SIZE */
+      1689, /* GL_TEXTURE_WIDTH */
+      1656, /* GL_TEXTURE_HEIGHT */
+      1612, /* GL_TEXTURE_COMPONENTS */
+      1596, /* GL_TEXTURE_BORDER_COLOR */
+      1595, /* GL_TEXTURE_BORDER */
+       370, /* GL_DONT_CARE */
+       464, /* GL_FASTEST */
+      1005, /* GL_NICEST */
         47, /* GL_AMBIENT */
-       361, /* GL_DIFFUSE */
-      1428, /* GL_SPECULAR */
-      1156, /* GL_POSITION */
-      1431, /* GL_SPOT_DIRECTION */
-      1432, /* GL_SPOT_EXPONENT */
-      1430, /* GL_SPOT_CUTOFF */
-       260, /* GL_CONSTANT_ATTENUATION */
-       682, /* GL_LINEAR_ATTENUATION */
-      1253, /* GL_QUADRATIC_ATTENUATION */
-       234, /* GL_COMPILE */
-       235, /* GL_COMPILE_AND_EXECUTE */
-       110, /* GL_BYTE */
-      1712, /* GL_UNSIGNED_BYTE */
-      1399, /* GL_SHORT */
-      1723, /* GL_UNSIGNED_SHORT */
-       633, /* GL_INT */
-      1715, /* GL_UNSIGNED_INT */
-       463, /* GL_FLOAT */
+       367, /* GL_DIFFUSE */
+      1436, /* GL_SPECULAR */
+      1164, /* GL_POSITION */
+      1439, /* GL_SPOT_DIRECTION */
+      1440, /* GL_SPOT_EXPONENT */
+      1438, /* GL_SPOT_CUTOFF */
+       266, /* GL_CONSTANT_ATTENUATION */
+       690, /* GL_LINEAR_ATTENUATION */
+      1261, /* GL_QUADRATIC_ATTENUATION */
+       240, /* GL_COMPILE */
+       241, /* GL_COMPILE_AND_EXECUTE */
+       116, /* GL_BYTE */
+      1720, /* GL_UNSIGNED_BYTE */
+      1407, /* GL_SHORT */
+      1731, /* GL_UNSIGNED_SHORT */
+       641, /* GL_INT */
+      1723, /* GL_UNSIGNED_INT */
+       471, /* GL_FLOAT */
          1, /* GL_2_BYTES */
          5, /* GL_3_BYTES */
          7, /* GL_4_BYTES */
-       371, /* GL_DOUBLE */
-       122, /* GL_CLEAR */
+       377, /* GL_DOUBLE */
+       128, /* GL_CLEAR */
         49, /* GL_AND */
         51, /* GL_AND_REVERSE */
-       284, /* GL_COPY */
+       290, /* GL_COPY */
         50, /* GL_AND_INVERTED */
-       999, /* GL_NOOP */
-      1804, /* GL_XOR */
-      1061, /* GL_OR */
-      1000, /* GL_NOR */
-       446, /* GL_EQUIV */
-       660, /* GL_INVERT */
-      1064, /* GL_OR_REVERSE */
-       285, /* GL_COPY_INVERTED */
-      1063, /* GL_OR_INVERTED */
-       990, /* GL_NAND */
-      1390, /* GL_SET */
-       443, /* GL_EMISSION */
-      1398, /* GL_SHININESS */
+      1007, /* GL_NOOP */
+      1812, /* GL_XOR */
+      1069, /* GL_OR */
+      1008, /* GL_NOR */
+       454, /* GL_EQUIV */
+       668, /* GL_INVERT */
+      1072, /* GL_OR_REVERSE */
+       291, /* GL_COPY_INVERTED */
+      1071, /* GL_OR_INVERTED */
+       998, /* GL_NAND */
+      1398, /* GL_SET */
+       451, /* GL_EMISSION */
+      1406, /* GL_SHININESS */
         48, /* GL_AMBIENT_AND_DIFFUSE */
-       180, /* GL_COLOR_INDEXES */
-       940, /* GL_MODELVIEW */
-      1232, /* GL_PROJECTION */
-      1502, /* GL_TEXTURE */
-       137, /* GL_COLOR */
-       328, /* GL_DEPTH */
-      1451, /* GL_STENCIL */
-       179, /* GL_COLOR_INDEX */
-      1470, /* GL_STENCIL_INDEX */
-       339, /* GL_DEPTH_COMPONENT */
-      1274, /* GL_RED */
-       588, /* GL_GREEN */
+       186, /* GL_COLOR_INDEXES */
+       948, /* GL_MODELVIEW */
+      1240, /* GL_PROJECTION */
+      1510, /* GL_TEXTURE */
+       143, /* GL_COLOR */
+       334, /* GL_DEPTH */
+      1459, /* GL_STENCIL */
+       185, /* GL_COLOR_INDEX */
+      1478, /* GL_STENCIL_INDEX */
+       345, /* GL_DEPTH_COMPONENT */
+      1282, /* GL_RED */
+       596, /* GL_GREEN */
         88, /* GL_BLUE */
         31, /* GL_ALPHA */
-      1309, /* GL_RGB */
-      1328, /* GL_RGBA */
-       710, /* GL_LUMINANCE */
-       731, /* GL_LUMINANCE_ALPHA */
+      1317, /* GL_RGB */
+      1336, /* GL_RGBA */
+       718, /* GL_LUMINANCE */
+       739, /* GL_LUMINANCE_ALPHA */
         72, /* GL_BITMAP */
-      1112, /* GL_POINT */
-       680, /* GL_LINE */
-       461, /* GL_FILL */
-      1283, /* GL_RENDER */
-       457, /* GL_FEEDBACK */
-      1384, /* GL_SELECT */
-       462, /* GL_FLAT */
-      1403, /* GL_SMOOTH */
-       661, /* GL_KEEP */
-      1303, /* GL_REPLACE */
-       615, /* GL_INCR */
-       324, /* GL_DECR */
-      1738, /* GL_VENDOR */
-      1300, /* GL_RENDERER */
-      1739, /* GL_VERSION */
-       450, /* GL_EXTENSIONS */
-      1349, /* GL_S */
-      1493, /* GL_T */
-      1263, /* GL_R */
-      1252, /* GL_Q */
-       976, /* GL_MODULATE */
-       323, /* GL_DECAL */
-      1638, /* GL_TEXTURE_ENV_MODE */
-      1637, /* GL_TEXTURE_ENV_COLOR */
-      1636, /* GL_TEXTURE_ENV */
-       451, /* GL_EYE_LINEAR */
-      1023, /* GL_OBJECT_LINEAR */
-      1429, /* GL_SPHERE_MAP */
-      1640, /* GL_TEXTURE_GEN_MODE */
-      1025, /* GL_OBJECT_PLANE */
-       452, /* GL_EYE_PLANE */
-       991, /* GL_NEAREST */
-       681, /* GL_LINEAR */
-       995, /* GL_NEAREST_MIPMAP_NEAREST */
-       686, /* GL_LINEAR_MIPMAP_NEAREST */
-       994, /* GL_NEAREST_MIPMAP_LINEAR */
-       685, /* GL_LINEAR_MIPMAP_LINEAR */
-      1661, /* GL_TEXTURE_MAG_FILTER */
-      1669, /* GL_TEXTURE_MIN_FILTER */
-      1683, /* GL_TEXTURE_WRAP_S */
-      1684, /* GL_TEXTURE_WRAP_T */
-       116, /* GL_CLAMP */
-      1302, /* GL_REPEAT */
-      1150, /* GL_POLYGON_OFFSET_UNITS */
-      1149, /* GL_POLYGON_OFFSET_POINT */
-      1148, /* GL_POLYGON_OFFSET_LINE */
-      1264, /* GL_R3_G3_B2 */
-      1735, /* GL_V2F */
-      1736, /* GL_V3F */
-       113, /* GL_C4UB_V2F */
-       114, /* GL_C4UB_V3F */
-       111, /* GL_C3F_V3F */
-       988, /* GL_N3F_V3F */
-       112, /* GL_C4F_N3F_V3F */
-      1498, /* GL_T2F_V3F */
-      1500, /* GL_T4F_V4F */
-      1496, /* GL_T2F_C4UB_V3F */
-      1494, /* GL_T2F_C3F_V3F */
-      1497, /* GL_T2F_N3F_V3F */
-      1495, /* GL_T2F_C4F_N3F_V3F */
-      1499, /* GL_T4F_C4F_N3F_V4F */
-       129, /* GL_CLIP_PLANE0 */
-       130, /* GL_CLIP_PLANE1 */
-       131, /* GL_CLIP_PLANE2 */
-       132, /* GL_CLIP_PLANE3 */
-       133, /* GL_CLIP_PLANE4 */
-       134, /* GL_CLIP_PLANE5 */
-       665, /* GL_LIGHT0 */
-       666, /* GL_LIGHT1 */
-       667, /* GL_LIGHT2 */
-       668, /* GL_LIGHT3 */
-       669, /* GL_LIGHT4 */
-       670, /* GL_LIGHT5 */
-       671, /* GL_LIGHT6 */
-       672, /* GL_LIGHT7 */
-       592, /* GL_HINT_BIT */
-       262, /* GL_CONSTANT_COLOR */
-      1035, /* GL_ONE_MINUS_CONSTANT_COLOR */
-       257, /* GL_CONSTANT_ALPHA */
-      1033, /* GL_ONE_MINUS_CONSTANT_ALPHA */
+      1120, /* GL_POINT */
+       688, /* GL_LINE */
+       469, /* GL_FILL */
+      1291, /* GL_RENDER */
+       465, /* GL_FEEDBACK */
+      1392, /* GL_SELECT */
+       470, /* GL_FLAT */
+      1411, /* GL_SMOOTH */
+       669, /* GL_KEEP */
+      1311, /* GL_REPLACE */
+       623, /* GL_INCR */
+       330, /* GL_DECR */
+      1746, /* GL_VENDOR */
+      1308, /* GL_RENDERER */
+      1747, /* GL_VERSION */
+       458, /* GL_EXTENSIONS */
+      1357, /* GL_S */
+      1501, /* GL_T */
+      1271, /* GL_R */
+      1260, /* GL_Q */
+       984, /* GL_MODULATE */
+       329, /* GL_DECAL */
+      1646, /* GL_TEXTURE_ENV_MODE */
+      1645, /* GL_TEXTURE_ENV_COLOR */
+      1644, /* GL_TEXTURE_ENV */
+       459, /* GL_EYE_LINEAR */
+      1031, /* GL_OBJECT_LINEAR */
+      1437, /* GL_SPHERE_MAP */
+      1648, /* GL_TEXTURE_GEN_MODE */
+      1033, /* GL_OBJECT_PLANE */
+       460, /* GL_EYE_PLANE */
+       999, /* GL_NEAREST */
+       689, /* GL_LINEAR */
+      1003, /* GL_NEAREST_MIPMAP_NEAREST */
+       694, /* GL_LINEAR_MIPMAP_NEAREST */
+      1002, /* GL_NEAREST_MIPMAP_LINEAR */
+       693, /* GL_LINEAR_MIPMAP_LINEAR */
+      1669, /* GL_TEXTURE_MAG_FILTER */
+      1677, /* GL_TEXTURE_MIN_FILTER */
+      1691, /* GL_TEXTURE_WRAP_S */
+      1692, /* GL_TEXTURE_WRAP_T */
+       122, /* GL_CLAMP */
+      1310, /* GL_REPEAT */
+      1158, /* GL_POLYGON_OFFSET_UNITS */
+      1157, /* GL_POLYGON_OFFSET_POINT */
+      1156, /* GL_POLYGON_OFFSET_LINE */
+      1272, /* GL_R3_G3_B2 */
+      1743, /* GL_V2F */
+      1744, /* GL_V3F */
+       119, /* GL_C4UB_V2F */
+       120, /* GL_C4UB_V3F */
+       117, /* GL_C3F_V3F */
+       996, /* GL_N3F_V3F */
+       118, /* GL_C4F_N3F_V3F */
+      1506, /* GL_T2F_V3F */
+      1508, /* GL_T4F_V4F */
+      1504, /* GL_T2F_C4UB_V3F */
+      1502, /* GL_T2F_C3F_V3F */
+      1505, /* GL_T2F_N3F_V3F */
+      1503, /* GL_T2F_C4F_N3F_V3F */
+      1507, /* GL_T4F_C4F_N3F_V4F */
+       135, /* GL_CLIP_PLANE0 */
+       136, /* GL_CLIP_PLANE1 */
+       137, /* GL_CLIP_PLANE2 */
+       138, /* GL_CLIP_PLANE3 */
+       139, /* GL_CLIP_PLANE4 */
+       140, /* GL_CLIP_PLANE5 */
+       673, /* GL_LIGHT0 */
+       674, /* GL_LIGHT1 */
+       675, /* GL_LIGHT2 */
+       676, /* GL_LIGHT3 */
+       677, /* GL_LIGHT4 */
+       678, /* GL_LIGHT5 */
+       679, /* GL_LIGHT6 */
+       680, /* GL_LIGHT7 */
+       600, /* GL_HINT_BIT */
+       268, /* GL_CONSTANT_COLOR */
+      1043, /* GL_ONE_MINUS_CONSTANT_COLOR */
+       263, /* GL_CONSTANT_ALPHA */
+      1041, /* GL_ONE_MINUS_CONSTANT_ALPHA */
         75, /* GL_BLEND_COLOR */
-       552, /* GL_FUNC_ADD */
-       924, /* GL_MIN */
-       835, /* GL_MAX */
+       560, /* GL_FUNC_ADD */
+       932, /* GL_MIN */
+       843, /* GL_MAX */
         80, /* GL_BLEND_EQUATION */
-       556, /* GL_FUNC_SUBTRACT */
-       554, /* GL_FUNC_REVERSE_SUBTRACT */
-       265, /* GL_CONVOLUTION_1D */
-       266, /* GL_CONVOLUTION_2D */
-      1387, /* GL_SEPARABLE_2D */
-       269, /* GL_CONVOLUTION_BORDER_MODE */
-       273, /* GL_CONVOLUTION_FILTER_SCALE */
-       271, /* GL_CONVOLUTION_FILTER_BIAS */
-      1275, /* GL_REDUCE */
-       275, /* GL_CONVOLUTION_FORMAT */
-       279, /* GL_CONVOLUTION_WIDTH */
-       277, /* GL_CONVOLUTION_HEIGHT */
-       850, /* GL_MAX_CONVOLUTION_WIDTH */
-       848, /* GL_MAX_CONVOLUTION_HEIGHT */
-      1189, /* GL_POST_CONVOLUTION_RED_SCALE */
-      1185, /* GL_POST_CONVOLUTION_GREEN_SCALE */
-      1180, /* GL_POST_CONVOLUTION_BLUE_SCALE */
-      1176, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
-      1187, /* GL_POST_CONVOLUTION_RED_BIAS */
-      1183, /* GL_POST_CONVOLUTION_GREEN_BIAS */
-      1178, /* GL_POST_CONVOLUTION_BLUE_BIAS */
-      1174, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
-       593, /* GL_HISTOGRAM */
-      1236, /* GL_PROXY_HISTOGRAM */
-       609, /* GL_HISTOGRAM_WIDTH */
-       599, /* GL_HISTOGRAM_FORMAT */
-       605, /* GL_HISTOGRAM_RED_SIZE */
-       601, /* GL_HISTOGRAM_GREEN_SIZE */
-       596, /* GL_HISTOGRAM_BLUE_SIZE */
-       594, /* GL_HISTOGRAM_ALPHA_SIZE */
-       603, /* GL_HISTOGRAM_LUMINANCE_SIZE */
-       607, /* GL_HISTOGRAM_SINK */
-       925, /* GL_MINMAX */
-       927, /* GL_MINMAX_FORMAT */
-       929, /* GL_MINMAX_SINK */
-      1501, /* GL_TABLE_TOO_LARGE_EXT */
-      1714, /* GL_UNSIGNED_BYTE_3_3_2 */
-      1725, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-      1727, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-      1720, /* GL_UNSIGNED_INT_8_8_8_8 */
-      1716, /* GL_UNSIGNED_INT_10_10_10_2 */
-      1147, /* GL_POLYGON_OFFSET_FILL */
-      1146, /* GL_POLYGON_OFFSET_FACTOR */
-      1145, /* GL_POLYGON_OFFSET_BIAS */
-      1306, /* GL_RESCALE_NORMAL */
+       564, /* GL_FUNC_SUBTRACT */
+       562, /* GL_FUNC_REVERSE_SUBTRACT */
+       271, /* GL_CONVOLUTION_1D */
+       272, /* GL_CONVOLUTION_2D */
+      1395, /* GL_SEPARABLE_2D */
+       275, /* GL_CONVOLUTION_BORDER_MODE */
+       279, /* GL_CONVOLUTION_FILTER_SCALE */
+       277, /* GL_CONVOLUTION_FILTER_BIAS */
+      1283, /* GL_REDUCE */
+       281, /* GL_CONVOLUTION_FORMAT */
+       285, /* GL_CONVOLUTION_WIDTH */
+       283, /* GL_CONVOLUTION_HEIGHT */
+       858, /* GL_MAX_CONVOLUTION_WIDTH */
+       856, /* GL_MAX_CONVOLUTION_HEIGHT */
+      1197, /* GL_POST_CONVOLUTION_RED_SCALE */
+      1193, /* GL_POST_CONVOLUTION_GREEN_SCALE */
+      1188, /* GL_POST_CONVOLUTION_BLUE_SCALE */
+      1184, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
+      1195, /* GL_POST_CONVOLUTION_RED_BIAS */
+      1191, /* GL_POST_CONVOLUTION_GREEN_BIAS */
+      1186, /* GL_POST_CONVOLUTION_BLUE_BIAS */
+      1182, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
+       601, /* GL_HISTOGRAM */
+      1244, /* GL_PROXY_HISTOGRAM */
+       617, /* GL_HISTOGRAM_WIDTH */
+       607, /* GL_HISTOGRAM_FORMAT */
+       613, /* GL_HISTOGRAM_RED_SIZE */
+       609, /* GL_HISTOGRAM_GREEN_SIZE */
+       604, /* GL_HISTOGRAM_BLUE_SIZE */
+       602, /* GL_HISTOGRAM_ALPHA_SIZE */
+       611, /* GL_HISTOGRAM_LUMINANCE_SIZE */
+       615, /* GL_HISTOGRAM_SINK */
+       933, /* GL_MINMAX */
+       935, /* GL_MINMAX_FORMAT */
+       937, /* GL_MINMAX_SINK */
+      1509, /* GL_TABLE_TOO_LARGE_EXT */
+      1722, /* GL_UNSIGNED_BYTE_3_3_2 */
+      1733, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+      1735, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+      1728, /* GL_UNSIGNED_INT_8_8_8_8 */
+      1724, /* GL_UNSIGNED_INT_10_10_10_2 */
+      1155, /* GL_POLYGON_OFFSET_FILL */
+      1154, /* GL_POLYGON_OFFSET_FACTOR */
+      1153, /* GL_POLYGON_OFFSET_BIAS */
+      1314, /* GL_RESCALE_NORMAL */
         36, /* GL_ALPHA4 */
         38, /* GL_ALPHA8 */
         32, /* GL_ALPHA12 */
         34, /* GL_ALPHA16 */
-       721, /* GL_LUMINANCE4 */
-       727, /* GL_LUMINANCE8 */
-       711, /* GL_LUMINANCE12 */
-       717, /* GL_LUMINANCE16 */
-       722, /* GL_LUMINANCE4_ALPHA4 */
-       725, /* GL_LUMINANCE6_ALPHA2 */
-       728, /* GL_LUMINANCE8_ALPHA8 */
-       714, /* GL_LUMINANCE12_ALPHA4 */
-       712, /* GL_LUMINANCE12_ALPHA12 */
-       718, /* GL_LUMINANCE16_ALPHA16 */
-       634, /* GL_INTENSITY */
-       639, /* GL_INTENSITY4 */
-       641, /* GL_INTENSITY8 */
-       635, /* GL_INTENSITY12 */
-       637, /* GL_INTENSITY16 */
-      1318, /* GL_RGB2_EXT */
-      1319, /* GL_RGB4 */
-      1322, /* GL_RGB5 */
-      1326, /* GL_RGB8 */
-      1310, /* GL_RGB10 */
-      1314, /* GL_RGB12 */
-      1316, /* GL_RGB16 */
-      1333, /* GL_RGBA2 */
-      1335, /* GL_RGBA4 */
-      1323, /* GL_RGB5_A1 */
-      1339, /* GL_RGBA8 */
-      1311, /* GL_RGB10_A2 */
-      1329, /* GL_RGBA12 */
-      1331, /* GL_RGBA16 */
-      1674, /* GL_TEXTURE_RED_SIZE */
-      1646, /* GL_TEXTURE_GREEN_SIZE */
-      1585, /* GL_TEXTURE_BLUE_SIZE */
-      1572, /* GL_TEXTURE_ALPHA_SIZE */
-      1659, /* GL_TEXTURE_LUMINANCE_SIZE */
-      1650, /* GL_TEXTURE_INTENSITY_SIZE */
-      1304, /* GL_REPLACE_EXT */
-      1240, /* GL_PROXY_TEXTURE_1D */
-      1243, /* GL_PROXY_TEXTURE_2D */
-      1679, /* GL_TEXTURE_TOO_LARGE_EXT */
-      1671, /* GL_TEXTURE_PRIORITY */
-      1676, /* GL_TEXTURE_RESIDENT */
-      1575, /* GL_TEXTURE_BINDING_1D */
-      1577, /* GL_TEXTURE_BINDING_2D */
-      1579, /* GL_TEXTURE_BINDING_3D */
-      1071, /* GL_PACK_SKIP_IMAGES */
-      1067, /* GL_PACK_IMAGE_HEIGHT */
-      1708, /* GL_UNPACK_SKIP_IMAGES */
-      1705, /* GL_UNPACK_IMAGE_HEIGHT */
-      1571, /* GL_TEXTURE_3D */
-      1246, /* GL_PROXY_TEXTURE_3D */
-      1633, /* GL_TEXTURE_DEPTH */
-      1682, /* GL_TEXTURE_WRAP_R */
-       836, /* GL_MAX_3D_TEXTURE_SIZE */
-      1740, /* GL_VERTEX_ARRAY */
-      1002, /* GL_NORMAL_ARRAY */
-       138, /* GL_COLOR_ARRAY */
-       619, /* GL_INDEX_ARRAY */
-      1612, /* GL_TEXTURE_COORD_ARRAY */
-       435, /* GL_EDGE_FLAG_ARRAY */
-      1745, /* GL_VERTEX_ARRAY_SIZE */
-      1747, /* GL_VERTEX_ARRAY_TYPE */
-      1746, /* GL_VERTEX_ARRAY_STRIDE */
-      1007, /* GL_NORMAL_ARRAY_TYPE */
-      1006, /* GL_NORMAL_ARRAY_STRIDE */
-       142, /* GL_COLOR_ARRAY_SIZE */
-       144, /* GL_COLOR_ARRAY_TYPE */
-       143, /* GL_COLOR_ARRAY_STRIDE */
-       624, /* GL_INDEX_ARRAY_TYPE */
-       623, /* GL_INDEX_ARRAY_STRIDE */
-      1616, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-      1618, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-      1617, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
-       439, /* GL_EDGE_FLAG_ARRAY_STRIDE */
-      1744, /* GL_VERTEX_ARRAY_POINTER */
-      1005, /* GL_NORMAL_ARRAY_POINTER */
-       141, /* GL_COLOR_ARRAY_POINTER */
-       622, /* GL_INDEX_ARRAY_POINTER */
-      1615, /* GL_TEXTURE_COORD_ARRAY_POINTER */
-       438, /* GL_EDGE_FLAG_ARRAY_POINTER */
-       981, /* GL_MULTISAMPLE */
-      1361, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
-      1363, /* GL_SAMPLE_ALPHA_TO_ONE */
-      1368, /* GL_SAMPLE_COVERAGE */
-      1365, /* GL_SAMPLE_BUFFERS */
-      1356, /* GL_SAMPLES */
-      1372, /* GL_SAMPLE_COVERAGE_VALUE */
-      1370, /* GL_SAMPLE_COVERAGE_INVERT */
-       185, /* GL_COLOR_MATRIX */
-       187, /* GL_COLOR_MATRIX_STACK_DEPTH */
-       844, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
-      1172, /* GL_POST_COLOR_MATRIX_RED_SCALE */
-      1168, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
-      1163, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
-      1159, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
-      1170, /* GL_POST_COLOR_MATRIX_RED_BIAS */
-      1166, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
-      1161, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
-      1157, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
-      1595, /* GL_TEXTURE_COLOR_TABLE_SGI */
-      1247, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
-      1597, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+       729, /* GL_LUMINANCE4 */
+       735, /* GL_LUMINANCE8 */
+       719, /* GL_LUMINANCE12 */
+       725, /* GL_LUMINANCE16 */
+       730, /* GL_LUMINANCE4_ALPHA4 */
+       733, /* GL_LUMINANCE6_ALPHA2 */
+       736, /* GL_LUMINANCE8_ALPHA8 */
+       722, /* GL_LUMINANCE12_ALPHA4 */
+       720, /* GL_LUMINANCE12_ALPHA12 */
+       726, /* GL_LUMINANCE16_ALPHA16 */
+       642, /* GL_INTENSITY */
+       647, /* GL_INTENSITY4 */
+       649, /* GL_INTENSITY8 */
+       643, /* GL_INTENSITY12 */
+       645, /* GL_INTENSITY16 */
+      1326, /* GL_RGB2_EXT */
+      1327, /* GL_RGB4 */
+      1330, /* GL_RGB5 */
+      1334, /* GL_RGB8 */
+      1318, /* GL_RGB10 */
+      1322, /* GL_RGB12 */
+      1324, /* GL_RGB16 */
+      1341, /* GL_RGBA2 */
+      1343, /* GL_RGBA4 */
+      1331, /* GL_RGB5_A1 */
+      1347, /* GL_RGBA8 */
+      1319, /* GL_RGB10_A2 */
+      1337, /* GL_RGBA12 */
+      1339, /* GL_RGBA16 */
+      1682, /* GL_TEXTURE_RED_SIZE */
+      1654, /* GL_TEXTURE_GREEN_SIZE */
+      1593, /* GL_TEXTURE_BLUE_SIZE */
+      1580, /* GL_TEXTURE_ALPHA_SIZE */
+      1667, /* GL_TEXTURE_LUMINANCE_SIZE */
+      1658, /* GL_TEXTURE_INTENSITY_SIZE */
+      1312, /* GL_REPLACE_EXT */
+      1248, /* GL_PROXY_TEXTURE_1D */
+      1251, /* GL_PROXY_TEXTURE_2D */
+      1687, /* GL_TEXTURE_TOO_LARGE_EXT */
+      1679, /* GL_TEXTURE_PRIORITY */
+      1684, /* GL_TEXTURE_RESIDENT */
+      1583, /* GL_TEXTURE_BINDING_1D */
+      1585, /* GL_TEXTURE_BINDING_2D */
+      1587, /* GL_TEXTURE_BINDING_3D */
+      1079, /* GL_PACK_SKIP_IMAGES */
+      1075, /* GL_PACK_IMAGE_HEIGHT */
+      1716, /* GL_UNPACK_SKIP_IMAGES */
+      1713, /* GL_UNPACK_IMAGE_HEIGHT */
+      1579, /* GL_TEXTURE_3D */
+      1254, /* GL_PROXY_TEXTURE_3D */
+      1641, /* GL_TEXTURE_DEPTH */
+      1690, /* GL_TEXTURE_WRAP_R */
+       844, /* GL_MAX_3D_TEXTURE_SIZE */
+      1748, /* GL_VERTEX_ARRAY */
+      1010, /* GL_NORMAL_ARRAY */
+       144, /* GL_COLOR_ARRAY */
+       627, /* GL_INDEX_ARRAY */
+      1620, /* GL_TEXTURE_COORD_ARRAY */
+       443, /* GL_EDGE_FLAG_ARRAY */
+      1753, /* GL_VERTEX_ARRAY_SIZE */
+      1755, /* GL_VERTEX_ARRAY_TYPE */
+      1754, /* GL_VERTEX_ARRAY_STRIDE */
+      1015, /* GL_NORMAL_ARRAY_TYPE */
+      1014, /* GL_NORMAL_ARRAY_STRIDE */
+       148, /* GL_COLOR_ARRAY_SIZE */
+       150, /* GL_COLOR_ARRAY_TYPE */
+       149, /* GL_COLOR_ARRAY_STRIDE */
+       632, /* GL_INDEX_ARRAY_TYPE */
+       631, /* GL_INDEX_ARRAY_STRIDE */
+      1624, /* GL_TEXTURE_COORD_ARRAY_SIZE */
+      1626, /* GL_TEXTURE_COORD_ARRAY_TYPE */
+      1625, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
+       447, /* GL_EDGE_FLAG_ARRAY_STRIDE */
+      1752, /* GL_VERTEX_ARRAY_POINTER */
+      1013, /* GL_NORMAL_ARRAY_POINTER */
+       147, /* GL_COLOR_ARRAY_POINTER */
+       630, /* GL_INDEX_ARRAY_POINTER */
+      1623, /* GL_TEXTURE_COORD_ARRAY_POINTER */
+       446, /* GL_EDGE_FLAG_ARRAY_POINTER */
+       989, /* GL_MULTISAMPLE */
+      1369, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
+      1371, /* GL_SAMPLE_ALPHA_TO_ONE */
+      1376, /* GL_SAMPLE_COVERAGE */
+      1373, /* GL_SAMPLE_BUFFERS */
+      1364, /* GL_SAMPLES */
+      1380, /* GL_SAMPLE_COVERAGE_VALUE */
+      1378, /* GL_SAMPLE_COVERAGE_INVERT */
+       191, /* GL_COLOR_MATRIX */
+       193, /* GL_COLOR_MATRIX_STACK_DEPTH */
+       852, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
+      1180, /* GL_POST_COLOR_MATRIX_RED_SCALE */
+      1176, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
+      1171, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
+      1167, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
+      1178, /* GL_POST_COLOR_MATRIX_RED_BIAS */
+      1174, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
+      1169, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
+      1165, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
+      1603, /* GL_TEXTURE_COLOR_TABLE_SGI */
+      1255, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
+      1605, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
         79, /* GL_BLEND_DST_RGB */
         87, /* GL_BLEND_SRC_RGB */
         78, /* GL_BLEND_DST_ALPHA */
         86, /* GL_BLEND_SRC_ALPHA */
-       191, /* GL_COLOR_TABLE */
-      1182, /* GL_POST_CONVOLUTION_COLOR_TABLE */
-      1165, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
-      1235, /* GL_PROXY_COLOR_TABLE */
-      1239, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
-      1238, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
-       215, /* GL_COLOR_TABLE_SCALE */
-       195, /* GL_COLOR_TABLE_BIAS */
-       200, /* GL_COLOR_TABLE_FORMAT */
-       217, /* GL_COLOR_TABLE_WIDTH */
-       212, /* GL_COLOR_TABLE_RED_SIZE */
-       203, /* GL_COLOR_TABLE_GREEN_SIZE */
-       197, /* GL_COLOR_TABLE_BLUE_SIZE */
-       192, /* GL_COLOR_TABLE_ALPHA_SIZE */
-       209, /* GL_COLOR_TABLE_LUMINANCE_SIZE */
-       206, /* GL_COLOR_TABLE_INTENSITY_SIZE */
+       197, /* GL_COLOR_TABLE */
+      1190, /* GL_POST_CONVOLUTION_COLOR_TABLE */
+      1173, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
+      1243, /* GL_PROXY_COLOR_TABLE */
+      1247, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
+      1246, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
+       221, /* GL_COLOR_TABLE_SCALE */
+       201, /* GL_COLOR_TABLE_BIAS */
+       206, /* GL_COLOR_TABLE_FORMAT */
+       223, /* GL_COLOR_TABLE_WIDTH */
+       218, /* GL_COLOR_TABLE_RED_SIZE */
+       209, /* GL_COLOR_TABLE_GREEN_SIZE */
+       203, /* GL_COLOR_TABLE_BLUE_SIZE */
+       198, /* GL_COLOR_TABLE_ALPHA_SIZE */
+       215, /* GL_COLOR_TABLE_LUMINANCE_SIZE */
+       212, /* GL_COLOR_TABLE_INTENSITY_SIZE */
         70, /* GL_BGR */
         71, /* GL_BGRA */
-       858, /* GL_MAX_ELEMENTS_VERTICES */
-       857, /* GL_MAX_ELEMENTS_INDICES */
-      1649, /* GL_TEXTURE_INDEX_SIZE_EXT */
-       135, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
-      1129, /* GL_POINT_SIZE_MIN */
-      1125, /* GL_POINT_SIZE_MAX */
-      1119, /* GL_POINT_FADE_THRESHOLD_SIZE */
-      1115, /* GL_POINT_DISTANCE_ATTENUATION */
-       117, /* GL_CLAMP_TO_BORDER */
-       120, /* GL_CLAMP_TO_EDGE */
-      1670, /* GL_TEXTURE_MIN_LOD */
-      1668, /* GL_TEXTURE_MAX_LOD */
-      1574, /* GL_TEXTURE_BASE_LEVEL */
-      1667, /* GL_TEXTURE_MAX_LEVEL */
-       612, /* GL_IGNORE_BORDER_HP */
-       261, /* GL_CONSTANT_BORDER_HP */
-      1305, /* GL_REPLICATE_BORDER_HP */
-       267, /* GL_CONVOLUTION_BORDER_COLOR */
-      1030, /* GL_OCCLUSION_TEST_HP */
-      1031, /* GL_OCCLUSION_TEST_RESULT_HP */
-       683, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
-      1589, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-      1591, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-      1593, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-      1594, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-      1592, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-      1590, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
-       840, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
-       841, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-      1192, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
-      1194, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
-      1191, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
-      1193, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
-      1657, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-      1658, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-      1656, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
-       558, /* GL_GENERATE_MIPMAP */
-       559, /* GL_GENERATE_MIPMAP_HINT */
-       500, /* GL_FOG_OFFSET_SGIX */
-       501, /* GL_FOG_OFFSET_VALUE_SGIX */
-      1603, /* GL_TEXTURE_COMPARE_SGIX */
-      1602, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-      1653, /* GL_TEXTURE_LEQUAL_R_SGIX */
-      1645, /* GL_TEXTURE_GEQUAL_R_SGIX */
-       340, /* GL_DEPTH_COMPONENT16 */
-       343, /* GL_DEPTH_COMPONENT24 */
-       346, /* GL_DEPTH_COMPONENT32 */
-       289, /* GL_CULL_VERTEX_EXT */
-       291, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
-       290, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
-      1801, /* GL_WRAP_BORDER_SUN */
-      1596, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
-       676, /* GL_LIGHT_MODEL_COLOR_CONTROL */
-      1400, /* GL_SINGLE_COLOR */
-      1388, /* GL_SEPARATE_SPECULAR_COLOR */
-      1397, /* GL_SHARED_TEXTURE_PALETTE_EXT */
-       511, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
-       512, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
-       519, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
-       514, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
-       510, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
-       509, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
-       513, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
-       520, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
-       531, /* GL_FRAMEBUFFER_DEFAULT */
-       544, /* GL_FRAMEBUFFER_UNDEFINED */
-       353, /* GL_DEPTH_STENCIL_ATTACHMENT */
-       618, /* GL_INDEX */
-      1713, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-      1728, /* GL_UNSIGNED_SHORT_5_6_5 */
-      1729, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-      1726, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-      1724, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-      1721, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-      1719, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-      1665, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-      1666, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-      1664, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
-       932, /* GL_MIRRORED_REPEAT */
-      1344, /* GL_RGB_S3TC */
-      1321, /* GL_RGB4_S3TC */
-      1343, /* GL_RGBA_S3TC */
-      1338, /* GL_RGBA4_S3TC */
-      1341, /* GL_RGBA_DXT5_S3TC */
-      1336, /* GL_RGBA4_DXT5_S3TC */
-       254, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
-       249, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
-       250, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
-       251, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */
-       993, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
-       992, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
-       684, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
-       487, /* GL_FOG_COORDINATE_SOURCE */
-       479, /* GL_FOG_COORD */
-       503, /* GL_FRAGMENT_DEPTH */
-       295, /* GL_CURRENT_FOG_COORD */
-       486, /* GL_FOG_COORDINATE_ARRAY_TYPE */
-       485, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
-       484, /* GL_FOG_COORDINATE_ARRAY_POINTER */
-       481, /* GL_FOG_COORDINATE_ARRAY */
-       189, /* GL_COLOR_SUM */
-       314, /* GL_CURRENT_SECONDARY_COLOR */
-      1381, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
-      1383, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
-      1382, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
-      1380, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
-      1377, /* GL_SECONDARY_COLOR_ARRAY */
-       568, /* GL_GL_CURRENT_RASTER_SECONDARY_COLOR */
+       866, /* GL_MAX_ELEMENTS_VERTICES */
+       865, /* GL_MAX_ELEMENTS_INDICES */
+      1657, /* GL_TEXTURE_INDEX_SIZE_EXT */
+       141, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
+      1137, /* GL_POINT_SIZE_MIN */
+      1133, /* GL_POINT_SIZE_MAX */
+      1127, /* GL_POINT_FADE_THRESHOLD_SIZE */
+      1123, /* GL_POINT_DISTANCE_ATTENUATION */
+       123, /* GL_CLAMP_TO_BORDER */
+       126, /* GL_CLAMP_TO_EDGE */
+      1678, /* GL_TEXTURE_MIN_LOD */
+      1676, /* GL_TEXTURE_MAX_LOD */
+      1582, /* GL_TEXTURE_BASE_LEVEL */
+      1675, /* GL_TEXTURE_MAX_LEVEL */
+       620, /* GL_IGNORE_BORDER_HP */
+       267, /* GL_CONSTANT_BORDER_HP */
+      1313, /* GL_REPLICATE_BORDER_HP */
+       273, /* GL_CONVOLUTION_BORDER_COLOR */
+      1038, /* GL_OCCLUSION_TEST_HP */
+      1039, /* GL_OCCLUSION_TEST_RESULT_HP */
+       691, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
+      1597, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
+      1599, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
+      1601, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
+      1602, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+      1600, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
+      1598, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
+       848, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
+       849, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+      1200, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
+      1202, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
+      1199, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
+      1201, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
+      1665, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+      1666, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+      1664, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+       566, /* GL_GENERATE_MIPMAP */
+       567, /* GL_GENERATE_MIPMAP_HINT */
+       508, /* GL_FOG_OFFSET_SGIX */
+       509, /* GL_FOG_OFFSET_VALUE_SGIX */
+      1611, /* GL_TEXTURE_COMPARE_SGIX */
+      1610, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
+      1661, /* GL_TEXTURE_LEQUAL_R_SGIX */
+      1653, /* GL_TEXTURE_GEQUAL_R_SGIX */
+       346, /* GL_DEPTH_COMPONENT16 */
+       349, /* GL_DEPTH_COMPONENT24 */
+       352, /* GL_DEPTH_COMPONENT32 */
+       295, /* GL_CULL_VERTEX_EXT */
+       297, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
+       296, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
+      1809, /* GL_WRAP_BORDER_SUN */
+      1604, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
+       684, /* GL_LIGHT_MODEL_COLOR_CONTROL */
+      1408, /* GL_SINGLE_COLOR */
+      1396, /* GL_SEPARATE_SPECULAR_COLOR */
+      1405, /* GL_SHARED_TEXTURE_PALETTE_EXT */
+       519, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
+       520, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
+       527, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
+       522, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
+       518, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
+       517, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
+       521, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
+       528, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
+       539, /* GL_FRAMEBUFFER_DEFAULT */
+       552, /* GL_FRAMEBUFFER_UNDEFINED */
+       359, /* GL_DEPTH_STENCIL_ATTACHMENT */
+       626, /* GL_INDEX */
+      1721, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+      1736, /* GL_UNSIGNED_SHORT_5_6_5 */
+      1737, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+      1734, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+      1732, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+      1729, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+      1727, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+      1673, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+      1674, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+      1672, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+       940, /* GL_MIRRORED_REPEAT */
+      1352, /* GL_RGB_S3TC */
+      1329, /* GL_RGB4_S3TC */
+      1351, /* GL_RGBA_S3TC */
+      1346, /* GL_RGBA4_S3TC */
+      1349, /* GL_RGBA_DXT5_S3TC */
+      1344, /* GL_RGBA4_DXT5_S3TC */
+       260, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
+       255, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
+       256, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
+       257, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */
+      1001, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
+      1000, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
+       692, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
+       495, /* GL_FOG_COORDINATE_SOURCE */
+       487, /* GL_FOG_COORD */
+       511, /* GL_FRAGMENT_DEPTH */
+       301, /* GL_CURRENT_FOG_COORD */
+       494, /* GL_FOG_COORDINATE_ARRAY_TYPE */
+       493, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
+       492, /* GL_FOG_COORDINATE_ARRAY_POINTER */
+       489, /* GL_FOG_COORDINATE_ARRAY */
+       195, /* GL_COLOR_SUM */
+       320, /* GL_CURRENT_SECONDARY_COLOR */
+      1389, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
+      1391, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
+      1390, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
+      1388, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
+      1385, /* GL_SECONDARY_COLOR_ARRAY */
+       576, /* GL_GL_CURRENT_RASTER_SECONDARY_COLOR */
         28, /* GL_ALIASED_POINT_SIZE_RANGE */
         27, /* GL_ALIASED_LINE_WIDTH_RANGE */
-      1503, /* GL_TEXTURE0 */
-      1505, /* GL_TEXTURE1 */
-      1527, /* GL_TEXTURE2 */
-      1549, /* GL_TEXTURE3 */
-      1555, /* GL_TEXTURE4 */
-      1557, /* GL_TEXTURE5 */
-      1559, /* GL_TEXTURE6 */
-      1561, /* GL_TEXTURE7 */
-      1563, /* GL_TEXTURE8 */
-      1565, /* GL_TEXTURE9 */
-      1506, /* GL_TEXTURE10 */
-      1508, /* GL_TEXTURE11 */
-      1510, /* GL_TEXTURE12 */
-      1512, /* GL_TEXTURE13 */
-      1514, /* GL_TEXTURE14 */
-      1516, /* GL_TEXTURE15 */
-      1518, /* GL_TEXTURE16 */
-      1520, /* GL_TEXTURE17 */
-      1522, /* GL_TEXTURE18 */
-      1524, /* GL_TEXTURE19 */
-      1528, /* GL_TEXTURE20 */
-      1530, /* GL_TEXTURE21 */
-      1532, /* GL_TEXTURE22 */
-      1534, /* GL_TEXTURE23 */
-      1536, /* GL_TEXTURE24 */
-      1538, /* GL_TEXTURE25 */
-      1540, /* GL_TEXTURE26 */
-      1542, /* GL_TEXTURE27 */
-      1544, /* GL_TEXTURE28 */
-      1546, /* GL_TEXTURE29 */
-      1550, /* GL_TEXTURE30 */
-      1552, /* GL_TEXTURE31 */
+      1511, /* GL_TEXTURE0 */
+      1513, /* GL_TEXTURE1 */
+      1535, /* GL_TEXTURE2 */
+      1557, /* GL_TEXTURE3 */
+      1563, /* GL_TEXTURE4 */
+      1565, /* GL_TEXTURE5 */
+      1567, /* GL_TEXTURE6 */
+      1569, /* GL_TEXTURE7 */
+      1571, /* GL_TEXTURE8 */
+      1573, /* GL_TEXTURE9 */
+      1514, /* GL_TEXTURE10 */
+      1516, /* GL_TEXTURE11 */
+      1518, /* GL_TEXTURE12 */
+      1520, /* GL_TEXTURE13 */
+      1522, /* GL_TEXTURE14 */
+      1524, /* GL_TEXTURE15 */
+      1526, /* GL_TEXTURE16 */
+      1528, /* GL_TEXTURE17 */
+      1530, /* GL_TEXTURE18 */
+      1532, /* GL_TEXTURE19 */
+      1536, /* GL_TEXTURE20 */
+      1538, /* GL_TEXTURE21 */
+      1540, /* GL_TEXTURE22 */
+      1542, /* GL_TEXTURE23 */
+      1544, /* GL_TEXTURE24 */
+      1546, /* GL_TEXTURE25 */
+      1548, /* GL_TEXTURE26 */
+      1550, /* GL_TEXTURE27 */
+      1552, /* GL_TEXTURE28 */
+      1554, /* GL_TEXTURE29 */
+      1558, /* GL_TEXTURE30 */
+      1560, /* GL_TEXTURE31 */
         18, /* GL_ACTIVE_TEXTURE */
-       123, /* GL_CLIENT_ACTIVE_TEXTURE */
-       910, /* GL_MAX_TEXTURE_UNITS */
-      1692, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-      1695, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-      1697, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-      1689, /* GL_TRANSPOSE_COLOR_MATRIX */
-      1491, /* GL_SUBTRACT */
-       898, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
-       237, /* GL_COMPRESSED_ALPHA */
-       241, /* GL_COMPRESSED_LUMINANCE */
-       242, /* GL_COMPRESSED_LUMINANCE_ALPHA */
-       239, /* GL_COMPRESSED_INTENSITY */
-       245, /* GL_COMPRESSED_RGB */
-       246, /* GL_COMPRESSED_RGBA */
-      1610, /* GL_TEXTURE_COMPRESSION_HINT */
-      1672, /* GL_TEXTURE_RECTANGLE_ARB */
-      1582, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
-      1250, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
-       896, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
-       352, /* GL_DEPTH_STENCIL */
-      1717, /* GL_UNSIGNED_INT_24_8 */
-       906, /* GL_MAX_TEXTURE_LOD_BIAS */
-      1663, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
-       907, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
-      1639, /* GL_TEXTURE_FILTER_CONTROL */
-      1654, /* GL_TEXTURE_LOD_BIAS */
-       222, /* GL_COMBINE4 */
-       900, /* GL_MAX_SHININESS_NV */
-       901, /* GL_MAX_SPOT_EXPONENT_NV */
-       616, /* GL_INCR_WRAP */
-       325, /* GL_DECR_WRAP */
-       952, /* GL_MODELVIEW1_ARB */
-      1008, /* GL_NORMAL_MAP */
-      1280, /* GL_REFLECTION_MAP */
-      1619, /* GL_TEXTURE_CUBE_MAP */
-      1580, /* GL_TEXTURE_BINDING_CUBE_MAP */
-      1627, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-      1621, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-      1629, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-      1623, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-      1631, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-      1625, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
-      1248, /* GL_PROXY_TEXTURE_CUBE_MAP */
-       852, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
-       987, /* GL_MULTISAMPLE_FILTER_HINT_NV */
-       495, /* GL_FOG_DISTANCE_MODE_NV */
-       454, /* GL_EYE_RADIAL_NV */
-       453, /* GL_EYE_PLANE_ABSOLUTE_NV */
-       221, /* GL_COMBINE */
-       228, /* GL_COMBINE_RGB */
-       223, /* GL_COMBINE_ALPHA */
-      1345, /* GL_RGB_SCALE */
+       129, /* GL_CLIENT_ACTIVE_TEXTURE */
+       918, /* GL_MAX_TEXTURE_UNITS */
+      1700, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+      1703, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+      1705, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+      1697, /* GL_TRANSPOSE_COLOR_MATRIX */
+      1499, /* GL_SUBTRACT */
+       906, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
+       243, /* GL_COMPRESSED_ALPHA */
+       247, /* GL_COMPRESSED_LUMINANCE */
+       248, /* GL_COMPRESSED_LUMINANCE_ALPHA */
+       245, /* GL_COMPRESSED_INTENSITY */
+       251, /* GL_COMPRESSED_RGB */
+       252, /* GL_COMPRESSED_RGBA */
+      1618, /* GL_TEXTURE_COMPRESSION_HINT */
+      1680, /* GL_TEXTURE_RECTANGLE_ARB */
+      1590, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
+      1258, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
+       904, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
+       358, /* GL_DEPTH_STENCIL */
+      1725, /* GL_UNSIGNED_INT_24_8 */
+       914, /* GL_MAX_TEXTURE_LOD_BIAS */
+      1671, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+       915, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
+      1647, /* GL_TEXTURE_FILTER_CONTROL */
+      1662, /* GL_TEXTURE_LOD_BIAS */
+       228, /* GL_COMBINE4 */
+       908, /* GL_MAX_SHININESS_NV */
+       909, /* GL_MAX_SPOT_EXPONENT_NV */
+       624, /* GL_INCR_WRAP */
+       331, /* GL_DECR_WRAP */
+       960, /* GL_MODELVIEW1_ARB */
+      1016, /* GL_NORMAL_MAP */
+      1288, /* GL_REFLECTION_MAP */
+      1627, /* GL_TEXTURE_CUBE_MAP */
+      1588, /* GL_TEXTURE_BINDING_CUBE_MAP */
+      1635, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
+      1629, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
+      1637, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
+      1631, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
+      1639, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
+      1633, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
+      1256, /* GL_PROXY_TEXTURE_CUBE_MAP */
+       860, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
+       995, /* GL_MULTISAMPLE_FILTER_HINT_NV */
+       503, /* GL_FOG_DISTANCE_MODE_NV */
+       462, /* GL_EYE_RADIAL_NV */
+       461, /* GL_EYE_PLANE_ABSOLUTE_NV */
+       227, /* GL_COMBINE */
+       234, /* GL_COMBINE_RGB */
+       229, /* GL_COMBINE_ALPHA */
+      1353, /* GL_RGB_SCALE */
         24, /* GL_ADD_SIGNED */
-       644, /* GL_INTERPOLATE */
-       256, /* GL_CONSTANT */
-      1198, /* GL_PRIMARY_COLOR */
-      1195, /* GL_PREVIOUS */
-      1411, /* GL_SOURCE0_RGB */
-      1417, /* GL_SOURCE1_RGB */
-      1423, /* GL_SOURCE2_RGB */
-      1427, /* GL_SOURCE3_RGB_NV */
-      1408, /* GL_SOURCE0_ALPHA */
-      1414, /* GL_SOURCE1_ALPHA */
-      1420, /* GL_SOURCE2_ALPHA */
-      1426, /* GL_SOURCE3_ALPHA_NV */
-      1044, /* GL_OPERAND0_RGB */
-      1050, /* GL_OPERAND1_RGB */
-      1056, /* GL_OPERAND2_RGB */
-      1060, /* GL_OPERAND3_RGB_NV */
-      1041, /* GL_OPERAND0_ALPHA */
-      1047, /* GL_OPERAND1_ALPHA */
-      1053, /* GL_OPERAND2_ALPHA */
-      1059, /* GL_OPERAND3_ALPHA_NV */
-      1741, /* GL_VERTEX_ARRAY_BINDING_APPLE */
-      1805, /* GL_YCBCR_422_APPLE */
-      1730, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-      1732, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-      1402, /* GL_SLICE_ACCUM_SUN */
-      1255, /* GL_QUAD_MESH_SUN */
-      1701, /* GL_TRIANGLE_MESH_SUN */
-      1779, /* GL_VERTEX_PROGRAM_ARB */
-      1790, /* GL_VERTEX_STATE_PROGRAM_NV */
-      1766, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-      1772, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-      1774, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-      1776, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
-       316, /* GL_CURRENT_VERTEX_ATTRIB */
-      1211, /* GL_PROGRAM_LENGTH_ARB */
-      1225, /* GL_PROGRAM_STRING_ARB */
-       974, /* GL_MODELVIEW_PROJECTION_NV */
-       611, /* GL_IDENTITY_NV */
-       658, /* GL_INVERSE_NV */
-      1694, /* GL_TRANSPOSE_NV */
-       659, /* GL_INVERSE_TRANSPOSE_NV */
-       882, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
-       881, /* GL_MAX_PROGRAM_MATRICES_ARB */
-       789, /* GL_MATRIX0_NV */
-       801, /* GL_MATRIX1_NV */
-       813, /* GL_MATRIX2_NV */
-       817, /* GL_MATRIX3_NV */
-       819, /* GL_MATRIX4_NV */
-       821, /* GL_MATRIX5_NV */
-       823, /* GL_MATRIX6_NV */
-       825, /* GL_MATRIX7_NV */
-       301, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
-       298, /* GL_CURRENT_MATRIX_ARB */
-      1782, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-      1785, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-      1223, /* GL_PROGRAM_PARAMETER_NV */
-      1770, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-      1227, /* GL_PROGRAM_TARGET_NV */
-      1224, /* GL_PROGRAM_RESIDENT_NV */
-      1686, /* GL_TRACK_MATRIX_NV */
-      1687, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-      1780, /* GL_VERTEX_PROGRAM_BINDING_NV */
-      1205, /* GL_PROGRAM_ERROR_POSITION_ARB */
-       337, /* GL_DEPTH_CLAMP_NV */
-      1748, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-      1755, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-      1756, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-      1757, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-      1758, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-      1759, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-      1760, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-      1761, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-      1762, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-      1763, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-      1749, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-      1750, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-      1751, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-      1752, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-      1753, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-      1754, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
-       743, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
-       750, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
-       751, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
-       752, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
-       753, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
-       754, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
-       755, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
-       756, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
-       757, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
-       758, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
-       744, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
-       745, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
-       746, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
-       747, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
-       748, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
-       749, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
-       770, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
-       777, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
-       778, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
-       779, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
-       780, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
-       781, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
-       782, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
-      1204, /* GL_PROGRAM_BINDING_ARB */
-       784, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
-       785, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
-       771, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
-       772, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
-       773, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
-       774, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
-       775, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
-       776, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
-      1608, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-      1605, /* GL_TEXTURE_COMPRESSED */
-      1013, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
-       255, /* GL_COMPRESSED_TEXTURE_FORMATS */
-       922, /* GL_MAX_VERTEX_UNITS_ARB */
+       652, /* GL_INTERPOLATE */
+       262, /* GL_CONSTANT */
+      1206, /* GL_PRIMARY_COLOR */
+      1203, /* GL_PREVIOUS */
+      1419, /* GL_SOURCE0_RGB */
+      1425, /* GL_SOURCE1_RGB */
+      1431, /* GL_SOURCE2_RGB */
+      1435, /* GL_SOURCE3_RGB_NV */
+      1416, /* GL_SOURCE0_ALPHA */
+      1422, /* GL_SOURCE1_ALPHA */
+      1428, /* GL_SOURCE2_ALPHA */
+      1434, /* GL_SOURCE3_ALPHA_NV */
+      1052, /* GL_OPERAND0_RGB */
+      1058, /* GL_OPERAND1_RGB */
+      1064, /* GL_OPERAND2_RGB */
+      1068, /* GL_OPERAND3_RGB_NV */
+      1049, /* GL_OPERAND0_ALPHA */
+      1055, /* GL_OPERAND1_ALPHA */
+      1061, /* GL_OPERAND2_ALPHA */
+      1067, /* GL_OPERAND3_ALPHA_NV */
+      1749, /* GL_VERTEX_ARRAY_BINDING_APPLE */
+      1813, /* GL_YCBCR_422_APPLE */
+      1738, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+      1740, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+      1410, /* GL_SLICE_ACCUM_SUN */
+      1263, /* GL_QUAD_MESH_SUN */
+      1709, /* GL_TRIANGLE_MESH_SUN */
+      1787, /* GL_VERTEX_PROGRAM_ARB */
+      1798, /* GL_VERTEX_STATE_PROGRAM_NV */
+      1774, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+      1780, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+      1782, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+      1784, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+       322, /* GL_CURRENT_VERTEX_ATTRIB */
+      1219, /* GL_PROGRAM_LENGTH_ARB */
+      1233, /* GL_PROGRAM_STRING_ARB */
+       982, /* GL_MODELVIEW_PROJECTION_NV */
+       619, /* GL_IDENTITY_NV */
+       666, /* GL_INVERSE_NV */
+      1702, /* GL_TRANSPOSE_NV */
+       667, /* GL_INVERSE_TRANSPOSE_NV */
+       890, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
+       889, /* GL_MAX_PROGRAM_MATRICES_ARB */
+       797, /* GL_MATRIX0_NV */
+       809, /* GL_MATRIX1_NV */
+       821, /* GL_MATRIX2_NV */
+       825, /* GL_MATRIX3_NV */
+       827, /* GL_MATRIX4_NV */
+       829, /* GL_MATRIX5_NV */
+       831, /* GL_MATRIX6_NV */
+       833, /* GL_MATRIX7_NV */
+       307, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
+       304, /* GL_CURRENT_MATRIX_ARB */
+      1790, /* GL_VERTEX_PROGRAM_POINT_SIZE */
+      1793, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+      1231, /* GL_PROGRAM_PARAMETER_NV */
+      1778, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+      1235, /* GL_PROGRAM_TARGET_NV */
+      1232, /* GL_PROGRAM_RESIDENT_NV */
+      1694, /* GL_TRACK_MATRIX_NV */
+      1695, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+      1788, /* GL_VERTEX_PROGRAM_BINDING_NV */
+      1213, /* GL_PROGRAM_ERROR_POSITION_ARB */
+       343, /* GL_DEPTH_CLAMP_NV */
+      1756, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+      1763, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+      1764, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+      1765, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+      1766, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+      1767, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+      1768, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+      1769, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+      1770, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+      1771, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+      1757, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+      1758, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+      1759, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+      1760, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+      1761, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+      1762, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+       751, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
+       758, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
+       759, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
+       760, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
+       761, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
+       762, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
+       763, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
+       764, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
+       765, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
+       766, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
+       752, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
+       753, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
+       754, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
+       755, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
+       756, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
+       757, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
+       778, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
+       785, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
+       786, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
+       787, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
+       788, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
+       789, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
+       790, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
+      1212, /* GL_PROGRAM_BINDING_ARB */
+       792, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
+       793, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
+       779, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
+       780, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
+       781, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
+       782, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
+       783, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
+       784, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
+      1616, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
+      1613, /* GL_TEXTURE_COMPRESSED */
+      1021, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
+       261, /* GL_COMPRESSED_TEXTURE_FORMATS */
+       930, /* GL_MAX_VERTEX_UNITS_ARB */
         22, /* GL_ACTIVE_VERTEX_UNITS_ARB */
-      1800, /* GL_WEIGHT_SUM_UNITY_ARB */
-      1778, /* GL_VERTEX_BLEND_ARB */
-       318, /* GL_CURRENT_WEIGHT_ARB */
-      1799, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-      1798, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-      1797, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-      1796, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-      1793, /* GL_WEIGHT_ARRAY_ARB */
-       365, /* GL_DOT3_RGB */
-       366, /* GL_DOT3_RGBA */
-       253, /* GL_COMPRESSED_RGB_FXT1_3DFX */
-       248, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
-       982, /* GL_MULTISAMPLE_3DFX */
-      1366, /* GL_SAMPLE_BUFFERS_3DFX */
-      1357, /* GL_SAMPLES_3DFX */
-       963, /* GL_MODELVIEW2_ARB */
-       966, /* GL_MODELVIEW3_ARB */
-       967, /* GL_MODELVIEW4_ARB */
-       968, /* GL_MODELVIEW5_ARB */
-       969, /* GL_MODELVIEW6_ARB */
-       970, /* GL_MODELVIEW7_ARB */
-       971, /* GL_MODELVIEW8_ARB */
-       972, /* GL_MODELVIEW9_ARB */
-       942, /* GL_MODELVIEW10_ARB */
-       943, /* GL_MODELVIEW11_ARB */
-       944, /* GL_MODELVIEW12_ARB */
-       945, /* GL_MODELVIEW13_ARB */
-       946, /* GL_MODELVIEW14_ARB */
-       947, /* GL_MODELVIEW15_ARB */
-       948, /* GL_MODELVIEW16_ARB */
-       949, /* GL_MODELVIEW17_ARB */
-       950, /* GL_MODELVIEW18_ARB */
-       951, /* GL_MODELVIEW19_ARB */
-       953, /* GL_MODELVIEW20_ARB */
-       954, /* GL_MODELVIEW21_ARB */
-       955, /* GL_MODELVIEW22_ARB */
-       956, /* GL_MODELVIEW23_ARB */
-       957, /* GL_MODELVIEW24_ARB */
-       958, /* GL_MODELVIEW25_ARB */
-       959, /* GL_MODELVIEW26_ARB */
-       960, /* GL_MODELVIEW27_ARB */
-       961, /* GL_MODELVIEW28_ARB */
-       962, /* GL_MODELVIEW29_ARB */
-       964, /* GL_MODELVIEW30_ARB */
-       965, /* GL_MODELVIEW31_ARB */
-       370, /* GL_DOT3_RGB_EXT */
-       368, /* GL_DOT3_RGBA_EXT */
-       936, /* GL_MIRROR_CLAMP_EXT */
-       939, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
-       977, /* GL_MODULATE_ADD_ATI */
-       978, /* GL_MODULATE_SIGNED_ADD_ATI */
-       979, /* GL_MODULATE_SUBTRACT_ATI */
-      1806, /* GL_YCBCR_MESA */
-      1068, /* GL_PACK_INVERT_MESA */
-       321, /* GL_DEBUG_OBJECT_MESA */
-       322, /* GL_DEBUG_PRINT_MESA */
-       320, /* GL_DEBUG_ASSERT_MESA */
+      1808, /* GL_WEIGHT_SUM_UNITY_ARB */
+      1786, /* GL_VERTEX_BLEND_ARB */
+       324, /* GL_CURRENT_WEIGHT_ARB */
+      1807, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+      1806, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+      1805, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+      1804, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+      1801, /* GL_WEIGHT_ARRAY_ARB */
+       371, /* GL_DOT3_RGB */
+       372, /* GL_DOT3_RGBA */
+       259, /* GL_COMPRESSED_RGB_FXT1_3DFX */
+       254, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
+       990, /* GL_MULTISAMPLE_3DFX */
+      1374, /* GL_SAMPLE_BUFFERS_3DFX */
+      1365, /* GL_SAMPLES_3DFX */
+       971, /* GL_MODELVIEW2_ARB */
+       974, /* GL_MODELVIEW3_ARB */
+       975, /* GL_MODELVIEW4_ARB */
+       976, /* GL_MODELVIEW5_ARB */
+       977, /* GL_MODELVIEW6_ARB */
+       978, /* GL_MODELVIEW7_ARB */
+       979, /* GL_MODELVIEW8_ARB */
+       980, /* GL_MODELVIEW9_ARB */
+       950, /* GL_MODELVIEW10_ARB */
+       951, /* GL_MODELVIEW11_ARB */
+       952, /* GL_MODELVIEW12_ARB */
+       953, /* GL_MODELVIEW13_ARB */
+       954, /* GL_MODELVIEW14_ARB */
+       955, /* GL_MODELVIEW15_ARB */
+       956, /* GL_MODELVIEW16_ARB */
+       957, /* GL_MODELVIEW17_ARB */
+       958, /* GL_MODELVIEW18_ARB */
+       959, /* GL_MODELVIEW19_ARB */
+       961, /* GL_MODELVIEW20_ARB */
+       962, /* GL_MODELVIEW21_ARB */
+       963, /* GL_MODELVIEW22_ARB */
+       964, /* GL_MODELVIEW23_ARB */
+       965, /* GL_MODELVIEW24_ARB */
+       966, /* GL_MODELVIEW25_ARB */
+       967, /* GL_MODELVIEW26_ARB */
+       968, /* GL_MODELVIEW27_ARB */
+       969, /* GL_MODELVIEW28_ARB */
+       970, /* GL_MODELVIEW29_ARB */
+       972, /* GL_MODELVIEW30_ARB */
+       973, /* GL_MODELVIEW31_ARB */
+       376, /* GL_DOT3_RGB_EXT */
+       374, /* GL_DOT3_RGBA_EXT */
+       944, /* GL_MIRROR_CLAMP_EXT */
+       947, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
+       985, /* GL_MODULATE_ADD_ATI */
+       986, /* GL_MODULATE_SIGNED_ADD_ATI */
+       987, /* GL_MODULATE_SUBTRACT_ATI */
+      1814, /* GL_YCBCR_MESA */
+      1076, /* GL_PACK_INVERT_MESA */
+       327, /* GL_DEBUG_OBJECT_MESA */
+       328, /* GL_DEBUG_PRINT_MESA */
+       326, /* GL_DEBUG_ASSERT_MESA */
        106, /* GL_BUFFER_SIZE */
        108, /* GL_BUFFER_USAGE */
-      1456, /* GL_STENCIL_BACK_FUNC */
-      1454, /* GL_STENCIL_BACK_FAIL */
-      1458, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-      1460, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
-       504, /* GL_FRAGMENT_PROGRAM_ARB */
-      1202, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
-      1230, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
-      1229, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
-      1214, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-      1220, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-      1219, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-       871, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
-       894, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
-       893, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
-       884, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-       890, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-       889, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-       854, /* GL_MAX_DRAW_BUFFERS */
-       374, /* GL_DRAW_BUFFER0 */
-       377, /* GL_DRAW_BUFFER1 */
-       398, /* GL_DRAW_BUFFER2 */
-       401, /* GL_DRAW_BUFFER3 */
-       404, /* GL_DRAW_BUFFER4 */
-       407, /* GL_DRAW_BUFFER5 */
-       410, /* GL_DRAW_BUFFER6 */
-       413, /* GL_DRAW_BUFFER7 */
-       416, /* GL_DRAW_BUFFER8 */
-       419, /* GL_DRAW_BUFFER9 */
-       378, /* GL_DRAW_BUFFER10 */
-       381, /* GL_DRAW_BUFFER11 */
-       384, /* GL_DRAW_BUFFER12 */
-       387, /* GL_DRAW_BUFFER13 */
-       390, /* GL_DRAW_BUFFER14 */
-       393, /* GL_DRAW_BUFFER15 */
+       112, /* GL_BUMP_ROT_MATRIX_ATI */
+       113, /* GL_BUMP_ROT_MATRIX_SIZE_ATI */
+       111, /* GL_BUMP_NUM_TEX_UNITS_ATI */
+       115, /* GL_BUMP_TEX_UNITS_ATI */
+       435, /* GL_DUDV_ATI */
+       434, /* GL_DU8DV8_ATI */
+       110, /* GL_BUMP_ENVMAP_ATI */
+       114, /* GL_BUMP_TARGET_ATI */
+      1464, /* GL_STENCIL_BACK_FUNC */
+      1462, /* GL_STENCIL_BACK_FAIL */
+      1466, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
+      1468, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
+       512, /* GL_FRAGMENT_PROGRAM_ARB */
+      1210, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
+      1238, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
+      1237, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
+      1222, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+      1228, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+      1227, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+       879, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
+       902, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
+       901, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
+       892, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+       898, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+       897, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+       862, /* GL_MAX_DRAW_BUFFERS */
+       380, /* GL_DRAW_BUFFER0 */
+       383, /* GL_DRAW_BUFFER1 */
+       404, /* GL_DRAW_BUFFER2 */
+       407, /* GL_DRAW_BUFFER3 */
+       410, /* GL_DRAW_BUFFER4 */
+       413, /* GL_DRAW_BUFFER5 */
+       416, /* GL_DRAW_BUFFER6 */
+       419, /* GL_DRAW_BUFFER7 */
+       422, /* GL_DRAW_BUFFER8 */
+       425, /* GL_DRAW_BUFFER9 */
+       384, /* GL_DRAW_BUFFER10 */
+       387, /* GL_DRAW_BUFFER11 */
+       390, /* GL_DRAW_BUFFER12 */
+       393, /* GL_DRAW_BUFFER13 */
+       396, /* GL_DRAW_BUFFER14 */
+       399, /* GL_DRAW_BUFFER15 */
         81, /* GL_BLEND_EQUATION_ALPHA */
-       834, /* GL_MATRIX_PALETTE_ARB */
-       865, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
-       868, /* GL_MAX_PALETTE_MATRICES_ARB */
-       304, /* GL_CURRENT_PALETTE_MATRIX_ARB */
-       828, /* GL_MATRIX_INDEX_ARRAY_ARB */
-       299, /* GL_CURRENT_MATRIX_INDEX_ARB */
-       830, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
-       832, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
-       831, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
-       829, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
-      1634, /* GL_TEXTURE_DEPTH_SIZE */
-       358, /* GL_DEPTH_TEXTURE_MODE */
-      1600, /* GL_TEXTURE_COMPARE_MODE */
-      1598, /* GL_TEXTURE_COMPARE_FUNC */
-       232, /* GL_COMPARE_R_TO_TEXTURE */
-      1136, /* GL_POINT_SPRITE */
-       281, /* GL_COORD_REPLACE */
-      1140, /* GL_POINT_SPRITE_R_MODE_NV */
-      1257, /* GL_QUERY_COUNTER_BITS */
-       306, /* GL_CURRENT_QUERY */
-      1259, /* GL_QUERY_RESULT */
-      1261, /* GL_QUERY_RESULT_AVAILABLE */
-       916, /* GL_MAX_VERTEX_ATTRIBS */
-      1768, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
-       356, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
-       355, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
-       902, /* GL_MAX_TEXTURE_COORDS */
-       904, /* GL_MAX_TEXTURE_IMAGE_UNITS */
-      1207, /* GL_PROGRAM_ERROR_STRING_ARB */
-      1209, /* GL_PROGRAM_FORMAT_ASCII_ARB */
-      1208, /* GL_PROGRAM_FORMAT_ARB */
-      1680, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
-       335, /* GL_DEPTH_BOUNDS_TEST_EXT */
-       334, /* GL_DEPTH_BOUNDS_EXT */
+       842, /* GL_MATRIX_PALETTE_ARB */
+       873, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
+       876, /* GL_MAX_PALETTE_MATRICES_ARB */
+       310, /* GL_CURRENT_PALETTE_MATRIX_ARB */
+       836, /* GL_MATRIX_INDEX_ARRAY_ARB */
+       305, /* GL_CURRENT_MATRIX_INDEX_ARB */
+       838, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
+       840, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
+       839, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
+       837, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
+      1642, /* GL_TEXTURE_DEPTH_SIZE */
+       364, /* GL_DEPTH_TEXTURE_MODE */
+      1608, /* GL_TEXTURE_COMPARE_MODE */
+      1606, /* GL_TEXTURE_COMPARE_FUNC */
+       238, /* GL_COMPARE_R_TO_TEXTURE */
+      1144, /* GL_POINT_SPRITE */
+       287, /* GL_COORD_REPLACE */
+      1148, /* GL_POINT_SPRITE_R_MODE_NV */
+      1265, /* GL_QUERY_COUNTER_BITS */
+       312, /* GL_CURRENT_QUERY */
+      1267, /* GL_QUERY_RESULT */
+      1269, /* GL_QUERY_RESULT_AVAILABLE */
+       924, /* GL_MAX_VERTEX_ATTRIBS */
+      1776, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+       362, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
+       361, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
+       910, /* GL_MAX_TEXTURE_COORDS */
+       912, /* GL_MAX_TEXTURE_IMAGE_UNITS */
+      1215, /* GL_PROGRAM_ERROR_STRING_ARB */
+      1217, /* GL_PROGRAM_FORMAT_ASCII_ARB */
+      1216, /* GL_PROGRAM_FORMAT_ARB */
+      1688, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+       341, /* GL_DEPTH_BOUNDS_TEST_EXT */
+       340, /* GL_DEPTH_BOUNDS_EXT */
         52, /* GL_ARRAY_BUFFER */
-       440, /* GL_ELEMENT_ARRAY_BUFFER */
+       448, /* GL_ELEMENT_ARRAY_BUFFER */
         53, /* GL_ARRAY_BUFFER_BINDING */
-       441, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
-      1742, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-      1003, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
-       139, /* GL_COLOR_ARRAY_BUFFER_BINDING */
-       620, /* GL_INDEX_ARRAY_BUFFER_BINDING */
-      1613, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
-       436, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
-      1378, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
-       482, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
-      1794, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-      1764, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-      1210, /* GL_PROGRAM_INSTRUCTIONS_ARB */
-       877, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
-      1216, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-       886, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-      1228, /* GL_PROGRAM_TEMPORARIES_ARB */
-       892, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
-      1218, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
-       888, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
-      1222, /* GL_PROGRAM_PARAMETERS_ARB */
-       891, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
-      1217, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
-       887, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
-      1203, /* GL_PROGRAM_ATTRIBS_ARB */
-       872, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
-      1215, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
-       885, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
-      1201, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
-       870, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
-      1213, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-       883, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-       878, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
-       874, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
-      1231, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-      1691, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-      1270, /* GL_READ_ONLY */
-      1802, /* GL_WRITE_ONLY */
-      1272, /* GL_READ_WRITE */
+       449, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
+      1750, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+      1011, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
+       145, /* GL_COLOR_ARRAY_BUFFER_BINDING */
+       628, /* GL_INDEX_ARRAY_BUFFER_BINDING */
+      1621, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
+       444, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
+      1386, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
+       490, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
+      1802, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+      1772, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+      1218, /* GL_PROGRAM_INSTRUCTIONS_ARB */
+       885, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
+      1224, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+       894, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+      1236, /* GL_PROGRAM_TEMPORARIES_ARB */
+       900, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
+      1226, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
+       896, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
+      1230, /* GL_PROGRAM_PARAMETERS_ARB */
+       899, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
+      1225, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
+       895, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
+      1211, /* GL_PROGRAM_ATTRIBS_ARB */
+       880, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
+      1223, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
+       893, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
+      1209, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
+       878, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
+      1221, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+       891, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+       886, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
+       882, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
+      1239, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
+      1699, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+      1278, /* GL_READ_ONLY */
+      1810, /* GL_WRITE_ONLY */
+      1280, /* GL_READ_WRITE */
        100, /* GL_BUFFER_ACCESS */
        102, /* GL_BUFFER_MAPPED */
        104, /* GL_BUFFER_MAP_POINTER */
-      1685, /* GL_TIME_ELAPSED_EXT */
-       788, /* GL_MATRIX0_ARB */
-       800, /* GL_MATRIX1_ARB */
-       812, /* GL_MATRIX2_ARB */
-       816, /* GL_MATRIX3_ARB */
-       818, /* GL_MATRIX4_ARB */
-       820, /* GL_MATRIX5_ARB */
-       822, /* GL_MATRIX6_ARB */
-       824, /* GL_MATRIX7_ARB */
-       826, /* GL_MATRIX8_ARB */
-       827, /* GL_MATRIX9_ARB */
-       790, /* GL_MATRIX10_ARB */
-       791, /* GL_MATRIX11_ARB */
-       792, /* GL_MATRIX12_ARB */
-       793, /* GL_MATRIX13_ARB */
-       794, /* GL_MATRIX14_ARB */
-       795, /* GL_MATRIX15_ARB */
-       796, /* GL_MATRIX16_ARB */
-       797, /* GL_MATRIX17_ARB */
-       798, /* GL_MATRIX18_ARB */
-       799, /* GL_MATRIX19_ARB */
-       802, /* GL_MATRIX20_ARB */
-       803, /* GL_MATRIX21_ARB */
-       804, /* GL_MATRIX22_ARB */
-       805, /* GL_MATRIX23_ARB */
-       806, /* GL_MATRIX24_ARB */
-       807, /* GL_MATRIX25_ARB */
-       808, /* GL_MATRIX26_ARB */
-       809, /* GL_MATRIX27_ARB */
-       810, /* GL_MATRIX28_ARB */
-       811, /* GL_MATRIX29_ARB */
-       814, /* GL_MATRIX30_ARB */
-       815, /* GL_MATRIX31_ARB */
-      1486, /* GL_STREAM_DRAW */
-      1488, /* GL_STREAM_READ */
-      1484, /* GL_STREAM_COPY */
-      1447, /* GL_STATIC_DRAW */
-      1449, /* GL_STATIC_READ */
-      1445, /* GL_STATIC_COPY */
-       430, /* GL_DYNAMIC_DRAW */
-       432, /* GL_DYNAMIC_READ */
-       428, /* GL_DYNAMIC_COPY */
-       575, /* GL_GL_PIXEL_PACK_BUFFER */
-       577, /* GL_GL_PIXEL_UNPACK_BUFFER */
-       576, /* GL_GL_PIXEL_PACK_BUFFER_BINDING */
-       578, /* GL_GL_PIXEL_UNPACK_BUFFER_BINDING */
-       329, /* GL_DEPTH24_STENCIL8 */
-      1678, /* GL_TEXTURE_STENCIL_SIZE */
-       875, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
-       873, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
-       876, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
-       880, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
-       879, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
-       837, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
-      1480, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
+      1693, /* GL_TIME_ELAPSED_EXT */
+       796, /* GL_MATRIX0_ARB */
+       808, /* GL_MATRIX1_ARB */
+       820, /* GL_MATRIX2_ARB */
+       824, /* GL_MATRIX3_ARB */
+       826, /* GL_MATRIX4_ARB */
+       828, /* GL_MATRIX5_ARB */
+       830, /* GL_MATRIX6_ARB */
+       832, /* GL_MATRIX7_ARB */
+       834, /* GL_MATRIX8_ARB */
+       835, /* GL_MATRIX9_ARB */
+       798, /* GL_MATRIX10_ARB */
+       799, /* GL_MATRIX11_ARB */
+       800, /* GL_MATRIX12_ARB */
+       801, /* GL_MATRIX13_ARB */
+       802, /* GL_MATRIX14_ARB */
+       803, /* GL_MATRIX15_ARB */
+       804, /* GL_MATRIX16_ARB */
+       805, /* GL_MATRIX17_ARB */
+       806, /* GL_MATRIX18_ARB */
+       807, /* GL_MATRIX19_ARB */
+       810, /* GL_MATRIX20_ARB */
+       811, /* GL_MATRIX21_ARB */
+       812, /* GL_MATRIX22_ARB */
+       813, /* GL_MATRIX23_ARB */
+       814, /* GL_MATRIX24_ARB */
+       815, /* GL_MATRIX25_ARB */
+       816, /* GL_MATRIX26_ARB */
+       817, /* GL_MATRIX27_ARB */
+       818, /* GL_MATRIX28_ARB */
+       819, /* GL_MATRIX29_ARB */
+       822, /* GL_MATRIX30_ARB */
+       823, /* GL_MATRIX31_ARB */
+      1494, /* GL_STREAM_DRAW */
+      1496, /* GL_STREAM_READ */
+      1492, /* GL_STREAM_COPY */
+      1455, /* GL_STATIC_DRAW */
+      1457, /* GL_STATIC_READ */
+      1453, /* GL_STATIC_COPY */
+       438, /* GL_DYNAMIC_DRAW */
+       440, /* GL_DYNAMIC_READ */
+       436, /* GL_DYNAMIC_COPY */
+       583, /* GL_GL_PIXEL_PACK_BUFFER */
+       585, /* GL_GL_PIXEL_UNPACK_BUFFER */
+       584, /* GL_GL_PIXEL_PACK_BUFFER_BINDING */
+       586, /* GL_GL_PIXEL_UNPACK_BUFFER_BINDING */
+       335, /* GL_DEPTH24_STENCIL8 */
+      1686, /* GL_TEXTURE_STENCIL_SIZE */
+       883, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
+       881, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
+       884, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
+       888, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
+       887, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
+       845, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
+      1488, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
         17, /* GL_ACTIVE_STENCIL_FACE_EXT */
-       937, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
-      1359, /* GL_SAMPLES_PASSED */
-       505, /* GL_FRAGMENT_SHADER */
-      1788, /* GL_VERTEX_SHADER */
-      1221, /* GL_PROGRAM_OBJECT_ARB */
-      1391, /* GL_SHADER_OBJECT_ARB */
-       861, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
-       920, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
-       914, /* GL_MAX_VARYING_FLOATS */
-       918, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
-       846, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
-      1028, /* GL_OBJECT_TYPE_ARB */
-      1393, /* GL_SHADER_TYPE */
-       470, /* GL_FLOAT_VEC2 */
-       472, /* GL_FLOAT_VEC3 */
-       474, /* GL_FLOAT_VEC4 */
-       647, /* GL_INT_VEC2 */
-       649, /* GL_INT_VEC3 */
-       651, /* GL_INT_VEC4 */
+       945, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
+      1367, /* GL_SAMPLES_PASSED */
+       513, /* GL_FRAGMENT_SHADER */
+      1796, /* GL_VERTEX_SHADER */
+      1229, /* GL_PROGRAM_OBJECT_ARB */
+      1399, /* GL_SHADER_OBJECT_ARB */
+       869, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
+       928, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
+       922, /* GL_MAX_VARYING_FLOATS */
+       926, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
+       854, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
+      1036, /* GL_OBJECT_TYPE_ARB */
+      1401, /* GL_SHADER_TYPE */
+       478, /* GL_FLOAT_VEC2 */
+       480, /* GL_FLOAT_VEC3 */
+       482, /* GL_FLOAT_VEC4 */
+       655, /* GL_INT_VEC2 */
+       657, /* GL_INT_VEC3 */
+       659, /* GL_INT_VEC4 */
         92, /* GL_BOOL */
         94, /* GL_BOOL_VEC2 */
         96, /* GL_BOOL_VEC3 */
         98, /* GL_BOOL_VEC4 */
-       464, /* GL_FLOAT_MAT2 */
-       466, /* GL_FLOAT_MAT3 */
-       468, /* GL_FLOAT_MAT4 */
-      1350, /* GL_SAMPLER_1D */
-      1352, /* GL_SAMPLER_2D */
-      1354, /* GL_SAMPLER_3D */
-      1355, /* GL_SAMPLER_CUBE */
-      1351, /* GL_SAMPLER_1D_SHADOW */
-      1353, /* GL_SAMPLER_2D_SHADOW */
-       569, /* GL_GL_FLOAT_MAT2x3 */
-       570, /* GL_GL_FLOAT_MAT2x4 */
-       571, /* GL_GL_FLOAT_MAT3x2 */
-       572, /* GL_GL_FLOAT_MAT3x4 */
-       573, /* GL_GL_FLOAT_MAT4x2 */
-       574, /* GL_GL_FLOAT_MAT4x3 */
-       327, /* GL_DELETE_STATUS */
-       236, /* GL_COMPILE_STATUS */
-       701, /* GL_LINK_STATUS */
-      1737, /* GL_VALIDATE_STATUS */
-       632, /* GL_INFO_LOG_LENGTH */
+       472, /* GL_FLOAT_MAT2 */
+       474, /* GL_FLOAT_MAT3 */
+       476, /* GL_FLOAT_MAT4 */
+      1358, /* GL_SAMPLER_1D */
+      1360, /* GL_SAMPLER_2D */
+      1362, /* GL_SAMPLER_3D */
+      1363, /* GL_SAMPLER_CUBE */
+      1359, /* GL_SAMPLER_1D_SHADOW */
+      1361, /* GL_SAMPLER_2D_SHADOW */
+       577, /* GL_GL_FLOAT_MAT2x3 */
+       578, /* GL_GL_FLOAT_MAT2x4 */
+       579, /* GL_GL_FLOAT_MAT3x2 */
+       580, /* GL_GL_FLOAT_MAT3x4 */
+       581, /* GL_GL_FLOAT_MAT4x2 */
+       582, /* GL_GL_FLOAT_MAT4x3 */
+       333, /* GL_DELETE_STATUS */
+       242, /* GL_COMPILE_STATUS */
+       709, /* GL_LINK_STATUS */
+      1745, /* GL_VALIDATE_STATUS */
+       640, /* GL_INFO_LOG_LENGTH */
         55, /* GL_ATTACHED_SHADERS */
         20, /* GL_ACTIVE_UNIFORMS */
         21, /* GL_ACTIVE_UNIFORM_MAX_LENGTH */
-      1392, /* GL_SHADER_SOURCE_LENGTH */
+      1400, /* GL_SHADER_SOURCE_LENGTH */
         15, /* GL_ACTIVE_ATTRIBUTES */
         16, /* GL_ACTIVE_ATTRIBUTE_MAX_LENGTH */
-       507, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
-      1395, /* GL_SHADING_LANGUAGE_VERSION */
-       305, /* GL_CURRENT_PROGRAM */
-      1077, /* GL_PALETTE4_RGB8_OES */
-      1079, /* GL_PALETTE4_RGBA8_OES */
-      1075, /* GL_PALETTE4_R5_G6_B5_OES */
-      1078, /* GL_PALETTE4_RGBA4_OES */
-      1076, /* GL_PALETTE4_RGB5_A1_OES */
-      1082, /* GL_PALETTE8_RGB8_OES */
-      1084, /* GL_PALETTE8_RGBA8_OES */
-      1080, /* GL_PALETTE8_R5_G6_B5_OES */
-      1083, /* GL_PALETTE8_RGBA4_OES */
-      1081, /* GL_PALETTE8_RGB5_A1_OES */
-       614, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
-       613, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
-      1722, /* GL_UNSIGNED_NORMALIZED */
-      1568, /* GL_TEXTURE_1D_ARRAY_EXT */
-      1241, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
-      1570, /* GL_TEXTURE_2D_ARRAY_EXT */
-      1244, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
-      1576, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
-      1578, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
-       583, /* GL_GL_SRGB */
-       584, /* GL_GL_SRGB8 */
-       586, /* GL_GL_SRGB_ALPHA */
-       585, /* GL_GL_SRGB8_ALPHA8 */
-       582, /* GL_GL_SLUMINANCE_ALPHA */
-       581, /* GL_GL_SLUMINANCE8_ALPHA8 */
-       579, /* GL_GL_SLUMINANCE */
-       580, /* GL_GL_SLUMINANCE8 */
-       566, /* GL_GL_COMPRESSED_SRGB */
-       567, /* GL_GL_COMPRESSED_SRGB_ALPHA */
-       564, /* GL_GL_COMPRESSED_SLUMINANCE */
-       565, /* GL_GL_COMPRESSED_SLUMINANCE_ALPHA */
-      1138, /* GL_POINT_SPRITE_COORD_ORIGIN */
-       709, /* GL_LOWER_LEFT */
-      1734, /* GL_UPPER_LEFT */
-      1462, /* GL_STENCIL_BACK_REF */
-      1463, /* GL_STENCIL_BACK_VALUE_MASK */
-      1464, /* GL_STENCIL_BACK_WRITEMASK */
-       423, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
-      1286, /* GL_RENDERBUFFER_BINDING_EXT */
-      1267, /* GL_READ_FRAMEBUFFER */
-       422, /* GL_DRAW_FRAMEBUFFER */
-      1268, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
-      1296, /* GL_RENDERBUFFER_SAMPLES */
-       517, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
-       515, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
-       526, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
-       522, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
-       524, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
-       529, /* GL_FRAMEBUFFER_COMPLETE */
-       533, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
-       539, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
-       537, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
-       535, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
-       538, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
-       536, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
-       542, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
-       545, /* GL_FRAMEBUFFER_UNSUPPORTED */
-       543, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
-       843, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
-       145, /* GL_COLOR_ATTACHMENT0 */
-       147, /* GL_COLOR_ATTACHMENT1 */
-       161, /* GL_COLOR_ATTACHMENT2 */
-       163, /* GL_COLOR_ATTACHMENT3 */
-       165, /* GL_COLOR_ATTACHMENT4 */
-       167, /* GL_COLOR_ATTACHMENT5 */
-       169, /* GL_COLOR_ATTACHMENT6 */
-       171, /* GL_COLOR_ATTACHMENT7 */
-       173, /* GL_COLOR_ATTACHMENT8 */
-       175, /* GL_COLOR_ATTACHMENT9 */
-       148, /* GL_COLOR_ATTACHMENT10 */
-       150, /* GL_COLOR_ATTACHMENT11 */
-       152, /* GL_COLOR_ATTACHMENT12 */
-       154, /* GL_COLOR_ATTACHMENT13 */
-       156, /* GL_COLOR_ATTACHMENT14 */
-       158, /* GL_COLOR_ATTACHMENT15 */
-       330, /* GL_DEPTH_ATTACHMENT */
-      1452, /* GL_STENCIL_ATTACHMENT */
-       508, /* GL_FRAMEBUFFER */
-      1284, /* GL_RENDERBUFFER */
-      1298, /* GL_RENDERBUFFER_WIDTH */
-      1291, /* GL_RENDERBUFFER_HEIGHT */
-      1293, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
-      1475, /* GL_STENCIL_INDEX_EXT */
-      1472, /* GL_STENCIL_INDEX1_EXT */
-      1473, /* GL_STENCIL_INDEX4_EXT */
-      1474, /* GL_STENCIL_INDEX8_EXT */
-      1471, /* GL_STENCIL_INDEX16_EXT */
-      1295, /* GL_RENDERBUFFER_RED_SIZE */
-      1290, /* GL_RENDERBUFFER_GREEN_SIZE */
-      1287, /* GL_RENDERBUFFER_BLUE_SIZE */
-      1285, /* GL_RENDERBUFFER_ALPHA_SIZE */
-      1288, /* GL_RENDERBUFFER_DEPTH_SIZE */
-      1297, /* GL_RENDERBUFFER_STENCIL_SIZE */
-       541, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
-       899, /* GL_MAX_SAMPLES */
-       447, /* GL_EVAL_BIT */
-      1265, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
-       703, /* GL_LIST_BIT */
-      1584, /* GL_TEXTURE_BIT */
-      1374, /* GL_SCISSOR_BIT */
+       515, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
+      1403, /* GL_SHADING_LANGUAGE_VERSION */
+       311, /* GL_CURRENT_PROGRAM */
+      1085, /* GL_PALETTE4_RGB8_OES */
+      1087, /* GL_PALETTE4_RGBA8_OES */
+      1083, /* GL_PALETTE4_R5_G6_B5_OES */
+      1086, /* GL_PALETTE4_RGBA4_OES */
+      1084, /* GL_PALETTE4_RGB5_A1_OES */
+      1090, /* GL_PALETTE8_RGB8_OES */
+      1092, /* GL_PALETTE8_RGBA8_OES */
+      1088, /* GL_PALETTE8_R5_G6_B5_OES */
+      1091, /* GL_PALETTE8_RGBA4_OES */
+      1089, /* GL_PALETTE8_RGB5_A1_OES */
+       622, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
+       621, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
+      1730, /* GL_UNSIGNED_NORMALIZED */
+      1576, /* GL_TEXTURE_1D_ARRAY_EXT */
+      1249, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
+      1578, /* GL_TEXTURE_2D_ARRAY_EXT */
+      1252, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
+      1584, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
+      1586, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
+       591, /* GL_GL_SRGB */
+       592, /* GL_GL_SRGB8 */
+       594, /* GL_GL_SRGB_ALPHA */
+       593, /* GL_GL_SRGB8_ALPHA8 */
+       590, /* GL_GL_SLUMINANCE_ALPHA */
+       589, /* GL_GL_SLUMINANCE8_ALPHA8 */
+       587, /* GL_GL_SLUMINANCE */
+       588, /* GL_GL_SLUMINANCE8 */
+       574, /* GL_GL_COMPRESSED_SRGB */
+       575, /* GL_GL_COMPRESSED_SRGB_ALPHA */
+       572, /* GL_GL_COMPRESSED_SLUMINANCE */
+       573, /* GL_GL_COMPRESSED_SLUMINANCE_ALPHA */
+      1146, /* GL_POINT_SPRITE_COORD_ORIGIN */
+       717, /* GL_LOWER_LEFT */
+      1742, /* GL_UPPER_LEFT */
+      1470, /* GL_STENCIL_BACK_REF */
+      1471, /* GL_STENCIL_BACK_VALUE_MASK */
+      1472, /* GL_STENCIL_BACK_WRITEMASK */
+       429, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
+      1294, /* GL_RENDERBUFFER_BINDING_EXT */
+      1275, /* GL_READ_FRAMEBUFFER */
+       428, /* GL_DRAW_FRAMEBUFFER */
+      1276, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
+      1304, /* GL_RENDERBUFFER_SAMPLES */
+       525, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
+       523, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
+       534, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
+       530, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
+       532, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+       537, /* GL_FRAMEBUFFER_COMPLETE */
+       541, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
+       547, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
+       545, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
+       543, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
+       546, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
+       544, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
+       550, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
+       553, /* GL_FRAMEBUFFER_UNSUPPORTED */
+       551, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
+       851, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
+       151, /* GL_COLOR_ATTACHMENT0 */
+       153, /* GL_COLOR_ATTACHMENT1 */
+       167, /* GL_COLOR_ATTACHMENT2 */
+       169, /* GL_COLOR_ATTACHMENT3 */
+       171, /* GL_COLOR_ATTACHMENT4 */
+       173, /* GL_COLOR_ATTACHMENT5 */
+       175, /* GL_COLOR_ATTACHMENT6 */
+       177, /* GL_COLOR_ATTACHMENT7 */
+       179, /* GL_COLOR_ATTACHMENT8 */
+       181, /* GL_COLOR_ATTACHMENT9 */
+       154, /* GL_COLOR_ATTACHMENT10 */
+       156, /* GL_COLOR_ATTACHMENT11 */
+       158, /* GL_COLOR_ATTACHMENT12 */
+       160, /* GL_COLOR_ATTACHMENT13 */
+       162, /* GL_COLOR_ATTACHMENT14 */
+       164, /* GL_COLOR_ATTACHMENT15 */
+       336, /* GL_DEPTH_ATTACHMENT */
+      1460, /* GL_STENCIL_ATTACHMENT */
+       516, /* GL_FRAMEBUFFER */
+      1292, /* GL_RENDERBUFFER */
+      1306, /* GL_RENDERBUFFER_WIDTH */
+      1299, /* GL_RENDERBUFFER_HEIGHT */
+      1301, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
+      1483, /* GL_STENCIL_INDEX_EXT */
+      1480, /* GL_STENCIL_INDEX1_EXT */
+      1481, /* GL_STENCIL_INDEX4_EXT */
+      1482, /* GL_STENCIL_INDEX8_EXT */
+      1479, /* GL_STENCIL_INDEX16_EXT */
+      1303, /* GL_RENDERBUFFER_RED_SIZE */
+      1298, /* GL_RENDERBUFFER_GREEN_SIZE */
+      1295, /* GL_RENDERBUFFER_BLUE_SIZE */
+      1293, /* GL_RENDERBUFFER_ALPHA_SIZE */
+      1296, /* GL_RENDERBUFFER_DEPTH_SIZE */
+      1305, /* GL_RENDERBUFFER_STENCIL_SIZE */
+       549, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
+       907, /* GL_MAX_SAMPLES */
+       455, /* GL_EVAL_BIT */
+      1273, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
+       711, /* GL_LIST_BIT */
+      1592, /* GL_TEXTURE_BIT */
+      1382, /* GL_SCISSOR_BIT */
         29, /* GL_ALL_ATTRIB_BITS */
-       984, /* GL_MULTISAMPLE_BIT */
+       992, /* GL_MULTISAMPLE_BIT */
         30, /* GL_ALL_CLIENT_ATTRIB_BITS */
 };
 
diff --git a/src/mesa/sparc/glapi_sparc.S b/src/mesa/sparc/glapi_sparc.S
index bf70fceef5..493e094cde 100644
--- a/src/mesa/sparc/glapi_sparc.S
+++ b/src/mesa/sparc/glapi_sparc.S
@@ -935,6 +935,10 @@ gl_dispatch_functions_start:
 	GL_STUB(glVertexAttribs4fvNV, _gloffset_VertexAttribs4fvNV)
 	GL_STUB(glVertexAttribs4svNV, _gloffset_VertexAttribs4svNV)
 	GL_STUB(glVertexAttribs4ubvNV, _gloffset_VertexAttribs4ubvNV)
+	GL_STUB(glGetTexBumpParameterfvATI, _gloffset_GetTexBumpParameterfvATI)
+	GL_STUB(glGetTexBumpParameterivATI, _gloffset_GetTexBumpParameterivATI)
+	GL_STUB(glTexBumpParameterfvATI, _gloffset_TexBumpParameterfvATI)
+	GL_STUB(glTexBumpParameterivATI, _gloffset_TexBumpParameterivATI)
 	GL_STUB(glAlphaFragmentOp1ATI, _gloffset_AlphaFragmentOp1ATI)
 	GL_STUB(glAlphaFragmentOp2ATI, _gloffset_AlphaFragmentOp2ATI)
 	GL_STUB(glAlphaFragmentOp3ATI, _gloffset_AlphaFragmentOp3ATI)
@@ -951,26 +955,26 @@ gl_dispatch_functions_start:
 	GL_STUB(glSetFragmentShaderConstantATI, _gloffset_SetFragmentShaderConstantATI)
 	GL_STUB(glPointParameteriNV, _gloffset_PointParameteriNV)
 	GL_STUB(glPointParameterivNV, _gloffset_PointParameterivNV)
-	GL_STUB(gl_dispatch_stub_734, _gloffset_ActiveStencilFaceEXT)
-	HIDDEN(gl_dispatch_stub_734)
-	GL_STUB(gl_dispatch_stub_735, _gloffset_BindVertexArrayAPPLE)
-	HIDDEN(gl_dispatch_stub_735)
-	GL_STUB(gl_dispatch_stub_736, _gloffset_DeleteVertexArraysAPPLE)
-	HIDDEN(gl_dispatch_stub_736)
-	GL_STUB(gl_dispatch_stub_737, _gloffset_GenVertexArraysAPPLE)
-	HIDDEN(gl_dispatch_stub_737)
-	GL_STUB(gl_dispatch_stub_738, _gloffset_IsVertexArrayAPPLE)
+	GL_STUB(gl_dispatch_stub_738, _gloffset_ActiveStencilFaceEXT)
 	HIDDEN(gl_dispatch_stub_738)
+	GL_STUB(gl_dispatch_stub_739, _gloffset_BindVertexArrayAPPLE)
+	HIDDEN(gl_dispatch_stub_739)
+	GL_STUB(gl_dispatch_stub_740, _gloffset_DeleteVertexArraysAPPLE)
+	HIDDEN(gl_dispatch_stub_740)
+	GL_STUB(gl_dispatch_stub_741, _gloffset_GenVertexArraysAPPLE)
+	HIDDEN(gl_dispatch_stub_741)
+	GL_STUB(gl_dispatch_stub_742, _gloffset_IsVertexArrayAPPLE)
+	HIDDEN(gl_dispatch_stub_742)
 	GL_STUB(glGetProgramNamedParameterdvNV, _gloffset_GetProgramNamedParameterdvNV)
 	GL_STUB(glGetProgramNamedParameterfvNV, _gloffset_GetProgramNamedParameterfvNV)
 	GL_STUB(glProgramNamedParameter4dNV, _gloffset_ProgramNamedParameter4dNV)
 	GL_STUB(glProgramNamedParameter4dvNV, _gloffset_ProgramNamedParameter4dvNV)
 	GL_STUB(glProgramNamedParameter4fNV, _gloffset_ProgramNamedParameter4fNV)
 	GL_STUB(glProgramNamedParameter4fvNV, _gloffset_ProgramNamedParameter4fvNV)
-	GL_STUB(gl_dispatch_stub_745, _gloffset_DepthBoundsEXT)
-	HIDDEN(gl_dispatch_stub_745)
-	GL_STUB(gl_dispatch_stub_746, _gloffset_BlendEquationSeparateEXT)
-	HIDDEN(gl_dispatch_stub_746)
+	GL_STUB(gl_dispatch_stub_749, _gloffset_DepthBoundsEXT)
+	HIDDEN(gl_dispatch_stub_749)
+	GL_STUB(gl_dispatch_stub_750, _gloffset_BlendEquationSeparateEXT)
+	HIDDEN(gl_dispatch_stub_750)
 	GL_STUB(glBindFramebufferEXT, _gloffset_BindFramebufferEXT)
 	GL_STUB(glBindRenderbufferEXT, _gloffset_BindRenderbufferEXT)
 	GL_STUB(glCheckFramebufferStatusEXT, _gloffset_CheckFramebufferStatusEXT)
@@ -988,19 +992,19 @@ gl_dispatch_functions_start:
 	GL_STUB(glIsFramebufferEXT, _gloffset_IsFramebufferEXT)
 	GL_STUB(glIsRenderbufferEXT, _gloffset_IsRenderbufferEXT)
 	GL_STUB(glRenderbufferStorageEXT, _gloffset_RenderbufferStorageEXT)
-	GL_STUB(gl_dispatch_stub_764, _gloffset_BlitFramebufferEXT)
-	HIDDEN(gl_dispatch_stub_764)
-	GL_STUB(glFramebufferTextureLayerEXT, _gloffset_FramebufferTextureLayerEXT)
-	GL_STUB(gl_dispatch_stub_766, _gloffset_StencilFuncSeparateATI)
-	HIDDEN(gl_dispatch_stub_766)
-	GL_STUB(gl_dispatch_stub_767, _gloffset_ProgramEnvParameters4fvEXT)
-	HIDDEN(gl_dispatch_stub_767)
-	GL_STUB(gl_dispatch_stub_768, _gloffset_ProgramLocalParameters4fvEXT)
+	GL_STUB(gl_dispatch_stub_768, _gloffset_BlitFramebufferEXT)
 	HIDDEN(gl_dispatch_stub_768)
-	GL_STUB(gl_dispatch_stub_769, _gloffset_GetQueryObjecti64vEXT)
-	HIDDEN(gl_dispatch_stub_769)
-	GL_STUB(gl_dispatch_stub_770, _gloffset_GetQueryObjectui64vEXT)
+	GL_STUB(glFramebufferTextureLayerEXT, _gloffset_FramebufferTextureLayerEXT)
+	GL_STUB(gl_dispatch_stub_770, _gloffset_StencilFuncSeparateATI)
 	HIDDEN(gl_dispatch_stub_770)
+	GL_STUB(gl_dispatch_stub_771, _gloffset_ProgramEnvParameters4fvEXT)
+	HIDDEN(gl_dispatch_stub_771)
+	GL_STUB(gl_dispatch_stub_772, _gloffset_ProgramLocalParameters4fvEXT)
+	HIDDEN(gl_dispatch_stub_772)
+	GL_STUB(gl_dispatch_stub_773, _gloffset_GetQueryObjecti64vEXT)
+	HIDDEN(gl_dispatch_stub_773)
+	GL_STUB(gl_dispatch_stub_774, _gloffset_GetQueryObjectui64vEXT)
+	HIDDEN(gl_dispatch_stub_774)
 	GL_STUB_ALIAS(glArrayElementEXT, glArrayElement)
 	GL_STUB_ALIAS(glBindTextureEXT, glBindTexture)
 	GL_STUB_ALIAS(glDrawArraysEXT, glDrawArrays)
diff --git a/src/mesa/x86-64/glapi_x86-64.S b/src/mesa/x86-64/glapi_x86-64.S
index 1eb4358b1c..fe05549c1d 100644
--- a/src/mesa/x86-64/glapi_x86-64.S
+++ b/src/mesa/x86-64/glapi_x86-64.S
@@ -27044,13 +27044,161 @@ GL_PREFIX(VertexAttribs4ubvNV):
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs4ubvNV), .-GL_PREFIX(VertexAttribs4ubvNV)
 
+	.p2align	4,,15
+	.globl	GL_PREFIX(GetTexBumpParameterfvATI)
+	.type	GL_PREFIX(GetTexBumpParameterfvATI), @function
+GL_PREFIX(GetTexBumpParameterfvATI):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	5744(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
+	call	_x86_64_get_dispatch@PLT
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
+	movq	5744(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	5744(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
+	call	_glapi_get_dispatch
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
+	movq	5744(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(GetTexBumpParameterfvATI), .-GL_PREFIX(GetTexBumpParameterfvATI)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(GetTexBumpParameterivATI)
+	.type	GL_PREFIX(GetTexBumpParameterivATI), @function
+GL_PREFIX(GetTexBumpParameterivATI):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	5752(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
+	call	_x86_64_get_dispatch@PLT
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
+	movq	5752(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	5752(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
+	call	_glapi_get_dispatch
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
+	movq	5752(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(GetTexBumpParameterivATI), .-GL_PREFIX(GetTexBumpParameterivATI)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(TexBumpParameterfvATI)
+	.type	GL_PREFIX(TexBumpParameterfvATI), @function
+GL_PREFIX(TexBumpParameterfvATI):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	5760(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
+	call	_x86_64_get_dispatch@PLT
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
+	movq	5760(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	5760(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
+	call	_glapi_get_dispatch
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
+	movq	5760(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(TexBumpParameterfvATI), .-GL_PREFIX(TexBumpParameterfvATI)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(TexBumpParameterivATI)
+	.type	GL_PREFIX(TexBumpParameterivATI), @function
+GL_PREFIX(TexBumpParameterivATI):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	5768(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
+	call	_x86_64_get_dispatch@PLT
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
+	movq	5768(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	5768(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
+	call	_glapi_get_dispatch
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
+	movq	5768(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(TexBumpParameterivATI), .-GL_PREFIX(TexBumpParameterivATI)
+
 	.p2align	4,,15
 	.globl	GL_PREFIX(AlphaFragmentOp1ATI)
 	.type	GL_PREFIX(AlphaFragmentOp1ATI), @function
 GL_PREFIX(AlphaFragmentOp1ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5744(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27068,13 +27216,13 @@ GL_PREFIX(AlphaFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5744(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5744(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27092,7 +27240,7 @@ GL_PREFIX(AlphaFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5744(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AlphaFragmentOp1ATI), .-GL_PREFIX(AlphaFragmentOp1ATI)
@@ -27103,7 +27251,7 @@ GL_PREFIX(AlphaFragmentOp1ATI):
 GL_PREFIX(AlphaFragmentOp2ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5752(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27121,13 +27269,13 @@ GL_PREFIX(AlphaFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5752(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5752(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27145,7 +27293,7 @@ GL_PREFIX(AlphaFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5752(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AlphaFragmentOp2ATI), .-GL_PREFIX(AlphaFragmentOp2ATI)
@@ -27156,7 +27304,7 @@ GL_PREFIX(AlphaFragmentOp2ATI):
 GL_PREFIX(AlphaFragmentOp3ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5760(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27174,13 +27322,13 @@ GL_PREFIX(AlphaFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5760(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5760(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27198,7 +27346,7 @@ GL_PREFIX(AlphaFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5760(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AlphaFragmentOp3ATI), .-GL_PREFIX(AlphaFragmentOp3ATI)
@@ -27209,25 +27357,25 @@ GL_PREFIX(AlphaFragmentOp3ATI):
 GL_PREFIX(BeginFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5768(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	5768(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5768(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	5768(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BeginFragmentShaderATI), .-GL_PREFIX(BeginFragmentShaderATI)
@@ -27238,25 +27386,25 @@ GL_PREFIX(BeginFragmentShaderATI):
 GL_PREFIX(BindFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5776(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5776(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5776(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5776(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindFragmentShaderATI), .-GL_PREFIX(BindFragmentShaderATI)
@@ -27267,7 +27415,7 @@ GL_PREFIX(BindFragmentShaderATI):
 GL_PREFIX(ColorFragmentOp1ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5784(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27285,13 +27433,13 @@ GL_PREFIX(ColorFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5784(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5784(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27309,7 +27457,7 @@ GL_PREFIX(ColorFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5784(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorFragmentOp1ATI), .-GL_PREFIX(ColorFragmentOp1ATI)
@@ -27320,7 +27468,7 @@ GL_PREFIX(ColorFragmentOp1ATI):
 GL_PREFIX(ColorFragmentOp2ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5792(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27338,13 +27486,13 @@ GL_PREFIX(ColorFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5792(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5792(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27362,7 +27510,7 @@ GL_PREFIX(ColorFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5792(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorFragmentOp2ATI), .-GL_PREFIX(ColorFragmentOp2ATI)
@@ -27373,7 +27521,7 @@ GL_PREFIX(ColorFragmentOp2ATI):
 GL_PREFIX(ColorFragmentOp3ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5800(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27391,13 +27539,13 @@ GL_PREFIX(ColorFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5800(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5800(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27415,7 +27563,7 @@ GL_PREFIX(ColorFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5800(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorFragmentOp3ATI), .-GL_PREFIX(ColorFragmentOp3ATI)
@@ -27426,25 +27574,25 @@ GL_PREFIX(ColorFragmentOp3ATI):
 GL_PREFIX(DeleteFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5808(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5808(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5808(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5808(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteFragmentShaderATI), .-GL_PREFIX(DeleteFragmentShaderATI)
@@ -27455,25 +27603,25 @@ GL_PREFIX(DeleteFragmentShaderATI):
 GL_PREFIX(EndFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5816(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	5816(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5816(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	5816(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EndFragmentShaderATI), .-GL_PREFIX(EndFragmentShaderATI)
@@ -27484,25 +27632,25 @@ GL_PREFIX(EndFragmentShaderATI):
 GL_PREFIX(GenFragmentShadersATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5824(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5824(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5824(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5824(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenFragmentShadersATI), .-GL_PREFIX(GenFragmentShadersATI)
@@ -27513,7 +27661,7 @@ GL_PREFIX(GenFragmentShadersATI):
 GL_PREFIX(PassTexCoordATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5832(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27523,13 +27671,13 @@ GL_PREFIX(PassTexCoordATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5832(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5832(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27539,7 +27687,7 @@ GL_PREFIX(PassTexCoordATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5832(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PassTexCoordATI), .-GL_PREFIX(PassTexCoordATI)
@@ -27550,7 +27698,7 @@ GL_PREFIX(PassTexCoordATI):
 GL_PREFIX(SampleMapATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5840(%rax), %r11
+	movq	5872(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27560,13 +27708,13 @@ GL_PREFIX(SampleMapATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5840(%rax), %r11
+	movq	5872(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5840(%rax), %r11
+	movq	5872(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27576,7 +27724,7 @@ GL_PREFIX(SampleMapATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5840(%rax), %r11
+	movq	5872(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SampleMapATI), .-GL_PREFIX(SampleMapATI)
@@ -27587,7 +27735,7 @@ GL_PREFIX(SampleMapATI):
 GL_PREFIX(SetFragmentShaderConstantATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5848(%rax), %r11
+	movq	5880(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27597,13 +27745,13 @@ GL_PREFIX(SetFragmentShaderConstantATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5848(%rax), %r11
+	movq	5880(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5848(%rax), %r11
+	movq	5880(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27613,7 +27761,7 @@ GL_PREFIX(SetFragmentShaderConstantATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5848(%rax), %r11
+	movq	5880(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SetFragmentShaderConstantATI), .-GL_PREFIX(SetFragmentShaderConstantATI)
@@ -27624,7 +27772,7 @@ GL_PREFIX(SetFragmentShaderConstantATI):
 GL_PREFIX(PointParameteriNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5856(%rax), %r11
+	movq	5888(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27634,13 +27782,13 @@ GL_PREFIX(PointParameteriNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5856(%rax), %r11
+	movq	5888(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5856(%rax), %r11
+	movq	5888(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27650,7 +27798,7 @@ GL_PREFIX(PointParameteriNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5856(%rax), %r11
+	movq	5888(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PointParameteriNV), .-GL_PREFIX(PointParameteriNV)
@@ -27661,7 +27809,7 @@ GL_PREFIX(PointParameteriNV):
 GL_PREFIX(PointParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5864(%rax), %r11
+	movq	5896(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27671,13 +27819,13 @@ GL_PREFIX(PointParameterivNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5864(%rax), %r11
+	movq	5896(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5864(%rax), %r11
+	movq	5896(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27687,79 +27835,79 @@ GL_PREFIX(PointParameterivNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5864(%rax), %r11
+	movq	5896(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PointParameterivNV), .-GL_PREFIX(PointParameterivNV)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_734)
-	.type	GL_PREFIX(_dispatch_stub_734), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_734))
-GL_PREFIX(_dispatch_stub_734):
+	.globl	GL_PREFIX(_dispatch_stub_738)
+	.type	GL_PREFIX(_dispatch_stub_738), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_738))
+GL_PREFIX(_dispatch_stub_738):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5872(%rax), %r11
+	movq	5904(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5872(%rax), %r11
+	movq	5904(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5872(%rax), %r11
+	movq	5904(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5872(%rax), %r11
+	movq	5904(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_734), .-GL_PREFIX(_dispatch_stub_734)
+	.size	GL_PREFIX(_dispatch_stub_738), .-GL_PREFIX(_dispatch_stub_738)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_735)
-	.type	GL_PREFIX(_dispatch_stub_735), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_735))
-GL_PREFIX(_dispatch_stub_735):
+	.globl	GL_PREFIX(_dispatch_stub_739)
+	.type	GL_PREFIX(_dispatch_stub_739), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_739))
+GL_PREFIX(_dispatch_stub_739):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5880(%rax), %r11
+	movq	5912(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5880(%rax), %r11
+	movq	5912(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5880(%rax), %r11
+	movq	5912(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5880(%rax), %r11
+	movq	5912(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_735), .-GL_PREFIX(_dispatch_stub_735)
+	.size	GL_PREFIX(_dispatch_stub_739), .-GL_PREFIX(_dispatch_stub_739)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_736)
-	.type	GL_PREFIX(_dispatch_stub_736), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_736))
-GL_PREFIX(_dispatch_stub_736):
+	.globl	GL_PREFIX(_dispatch_stub_740)
+	.type	GL_PREFIX(_dispatch_stub_740), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_740))
+GL_PREFIX(_dispatch_stub_740):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5888(%rax), %r11
+	movq	5920(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27769,13 +27917,13 @@ GL_PREFIX(_dispatch_stub_736):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5888(%rax), %r11
+	movq	5920(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5888(%rax), %r11
+	movq	5920(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27785,19 +27933,19 @@ GL_PREFIX(_dispatch_stub_736):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5888(%rax), %r11
+	movq	5920(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_736), .-GL_PREFIX(_dispatch_stub_736)
+	.size	GL_PREFIX(_dispatch_stub_740), .-GL_PREFIX(_dispatch_stub_740)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_737)
-	.type	GL_PREFIX(_dispatch_stub_737), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_737))
-GL_PREFIX(_dispatch_stub_737):
+	.globl	GL_PREFIX(_dispatch_stub_741)
+	.type	GL_PREFIX(_dispatch_stub_741), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_741))
+GL_PREFIX(_dispatch_stub_741):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5896(%rax), %r11
+	movq	5928(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27807,13 +27955,13 @@ GL_PREFIX(_dispatch_stub_737):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5896(%rax), %r11
+	movq	5928(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5896(%rax), %r11
+	movq	5928(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27823,40 +27971,40 @@ GL_PREFIX(_dispatch_stub_737):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5896(%rax), %r11
+	movq	5928(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_737), .-GL_PREFIX(_dispatch_stub_737)
+	.size	GL_PREFIX(_dispatch_stub_741), .-GL_PREFIX(_dispatch_stub_741)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_738)
-	.type	GL_PREFIX(_dispatch_stub_738), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_738))
-GL_PREFIX(_dispatch_stub_738):
+	.globl	GL_PREFIX(_dispatch_stub_742)
+	.type	GL_PREFIX(_dispatch_stub_742), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_742))
+GL_PREFIX(_dispatch_stub_742):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5904(%rax), %r11
+	movq	5936(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5904(%rax), %r11
+	movq	5936(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5904(%rax), %r11
+	movq	5936(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5904(%rax), %r11
+	movq	5936(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_738), .-GL_PREFIX(_dispatch_stub_738)
+	.size	GL_PREFIX(_dispatch_stub_742), .-GL_PREFIX(_dispatch_stub_742)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(GetProgramNamedParameterdvNV)
@@ -27864,7 +28012,7 @@ GL_PREFIX(_dispatch_stub_738):
 GL_PREFIX(GetProgramNamedParameterdvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5912(%rax), %r11
+	movq	5944(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27878,13 +28026,13 @@ GL_PREFIX(GetProgramNamedParameterdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5912(%rax), %r11
+	movq	5944(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5912(%rax), %r11
+	movq	5944(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27898,7 +28046,7 @@ GL_PREFIX(GetProgramNamedParameterdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5912(%rax), %r11
+	movq	5944(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramNamedParameterdvNV), .-GL_PREFIX(GetProgramNamedParameterdvNV)
@@ -27909,7 +28057,7 @@ GL_PREFIX(GetProgramNamedParameterdvNV):
 GL_PREFIX(GetProgramNamedParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5920(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27923,13 +28071,13 @@ GL_PREFIX(GetProgramNamedParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5920(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5920(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27943,7 +28091,7 @@ GL_PREFIX(GetProgramNamedParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5920(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramNamedParameterfvNV), .-GL_PREFIX(GetProgramNamedParameterfvNV)
@@ -27954,7 +28102,7 @@ GL_PREFIX(GetProgramNamedParameterfvNV):
 GL_PREFIX(ProgramNamedParameter4dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5928(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$56, %rsp
@@ -27974,13 +28122,13 @@ GL_PREFIX(ProgramNamedParameter4dNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	5928(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5928(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$56, %rsp
@@ -28000,7 +28148,7 @@ GL_PREFIX(ProgramNamedParameter4dNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	5928(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4dNV), .-GL_PREFIX(ProgramNamedParameter4dNV)
@@ -28011,7 +28159,7 @@ GL_PREFIX(ProgramNamedParameter4dNV):
 GL_PREFIX(ProgramNamedParameter4dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5936(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28025,13 +28173,13 @@ GL_PREFIX(ProgramNamedParameter4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5936(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5936(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28045,7 +28193,7 @@ GL_PREFIX(ProgramNamedParameter4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5936(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4dvNV), .-GL_PREFIX(ProgramNamedParameter4dvNV)
@@ -28056,7 +28204,7 @@ GL_PREFIX(ProgramNamedParameter4dvNV):
 GL_PREFIX(ProgramNamedParameter4fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5944(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$56, %rsp
@@ -28076,13 +28224,13 @@ GL_PREFIX(ProgramNamedParameter4fNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	5944(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5944(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$56, %rsp
@@ -28102,7 +28250,7 @@ GL_PREFIX(ProgramNamedParameter4fNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	5944(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4fNV), .-GL_PREFIX(ProgramNamedParameter4fNV)
@@ -28113,7 +28261,7 @@ GL_PREFIX(ProgramNamedParameter4fNV):
 GL_PREFIX(ProgramNamedParameter4fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5952(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28127,13 +28275,13 @@ GL_PREFIX(ProgramNamedParameter4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5952(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5952(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28147,19 +28295,19 @@ GL_PREFIX(ProgramNamedParameter4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5952(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4fvNV), .-GL_PREFIX(ProgramNamedParameter4fvNV)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_745)
-	.type	GL_PREFIX(_dispatch_stub_745), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_745))
-GL_PREFIX(_dispatch_stub_745):
+	.globl	GL_PREFIX(_dispatch_stub_749)
+	.type	GL_PREFIX(_dispatch_stub_749), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_749))
+GL_PREFIX(_dispatch_stub_749):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5960(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28169,13 +28317,13 @@ GL_PREFIX(_dispatch_stub_745):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5960(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5960(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28185,19 +28333,19 @@ GL_PREFIX(_dispatch_stub_745):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5960(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_745), .-GL_PREFIX(_dispatch_stub_745)
+	.size	GL_PREFIX(_dispatch_stub_749), .-GL_PREFIX(_dispatch_stub_749)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_746)
-	.type	GL_PREFIX(_dispatch_stub_746), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_746))
-GL_PREFIX(_dispatch_stub_746):
+	.globl	GL_PREFIX(_dispatch_stub_750)
+	.type	GL_PREFIX(_dispatch_stub_750), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_750))
+GL_PREFIX(_dispatch_stub_750):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5968(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28207,13 +28355,13 @@ GL_PREFIX(_dispatch_stub_746):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5968(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5968(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28223,10 +28371,10 @@ GL_PREFIX(_dispatch_stub_746):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5968(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_746), .-GL_PREFIX(_dispatch_stub_746)
+	.size	GL_PREFIX(_dispatch_stub_750), .-GL_PREFIX(_dispatch_stub_750)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(BindFramebufferEXT)
@@ -28234,7 +28382,7 @@ GL_PREFIX(_dispatch_stub_746):
 GL_PREFIX(BindFramebufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5976(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28244,13 +28392,13 @@ GL_PREFIX(BindFramebufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5976(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5976(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28260,7 +28408,7 @@ GL_PREFIX(BindFramebufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5976(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindFramebufferEXT), .-GL_PREFIX(BindFramebufferEXT)
@@ -28271,7 +28419,7 @@ GL_PREFIX(BindFramebufferEXT):
 GL_PREFIX(BindRenderbufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5984(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28281,13 +28429,13 @@ GL_PREFIX(BindRenderbufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5984(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5984(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28297,7 +28445,7 @@ GL_PREFIX(BindRenderbufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5984(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindRenderbufferEXT), .-GL_PREFIX(BindRenderbufferEXT)
@@ -28308,25 +28456,25 @@ GL_PREFIX(BindRenderbufferEXT):
 GL_PREFIX(CheckFramebufferStatusEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5992(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5992(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5992(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5992(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CheckFramebufferStatusEXT), .-GL_PREFIX(CheckFramebufferStatusEXT)
@@ -28337,7 +28485,7 @@ GL_PREFIX(CheckFramebufferStatusEXT):
 GL_PREFIX(DeleteFramebuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6000(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28347,13 +28495,13 @@ GL_PREFIX(DeleteFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6000(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6000(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28363,7 +28511,7 @@ GL_PREFIX(DeleteFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6000(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteFramebuffersEXT), .-GL_PREFIX(DeleteFramebuffersEXT)
@@ -28374,7 +28522,7 @@ GL_PREFIX(DeleteFramebuffersEXT):
 GL_PREFIX(DeleteRenderbuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6008(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28384,13 +28532,13 @@ GL_PREFIX(DeleteRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6008(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6008(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28400,7 +28548,7 @@ GL_PREFIX(DeleteRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6008(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteRenderbuffersEXT), .-GL_PREFIX(DeleteRenderbuffersEXT)
@@ -28411,7 +28559,7 @@ GL_PREFIX(DeleteRenderbuffersEXT):
 GL_PREFIX(FramebufferRenderbufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6016(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28425,13 +28573,13 @@ GL_PREFIX(FramebufferRenderbufferEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6016(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6016(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28445,7 +28593,7 @@ GL_PREFIX(FramebufferRenderbufferEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6016(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferRenderbufferEXT), .-GL_PREFIX(FramebufferRenderbufferEXT)
@@ -28456,7 +28604,7 @@ GL_PREFIX(FramebufferRenderbufferEXT):
 GL_PREFIX(FramebufferTexture1DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6024(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28470,13 +28618,13 @@ GL_PREFIX(FramebufferTexture1DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6024(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6024(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28490,7 +28638,7 @@ GL_PREFIX(FramebufferTexture1DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6024(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTexture1DEXT), .-GL_PREFIX(FramebufferTexture1DEXT)
@@ -28501,7 +28649,7 @@ GL_PREFIX(FramebufferTexture1DEXT):
 GL_PREFIX(FramebufferTexture2DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6032(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28515,13 +28663,13 @@ GL_PREFIX(FramebufferTexture2DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6032(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6032(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28535,7 +28683,7 @@ GL_PREFIX(FramebufferTexture2DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6032(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTexture2DEXT), .-GL_PREFIX(FramebufferTexture2DEXT)
@@ -28546,7 +28694,7 @@ GL_PREFIX(FramebufferTexture2DEXT):
 GL_PREFIX(FramebufferTexture3DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6040(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28564,13 +28712,13 @@ GL_PREFIX(FramebufferTexture3DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6040(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6040(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28588,7 +28736,7 @@ GL_PREFIX(FramebufferTexture3DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6040(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTexture3DEXT), .-GL_PREFIX(FramebufferTexture3DEXT)
@@ -28599,7 +28747,7 @@ GL_PREFIX(FramebufferTexture3DEXT):
 GL_PREFIX(GenFramebuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6048(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28609,13 +28757,13 @@ GL_PREFIX(GenFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6048(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6048(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28625,7 +28773,7 @@ GL_PREFIX(GenFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6048(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenFramebuffersEXT), .-GL_PREFIX(GenFramebuffersEXT)
@@ -28636,7 +28784,7 @@ GL_PREFIX(GenFramebuffersEXT):
 GL_PREFIX(GenRenderbuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6056(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28646,13 +28794,13 @@ GL_PREFIX(GenRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6056(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6056(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28662,7 +28810,7 @@ GL_PREFIX(GenRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6056(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenRenderbuffersEXT), .-GL_PREFIX(GenRenderbuffersEXT)
@@ -28673,25 +28821,25 @@ GL_PREFIX(GenRenderbuffersEXT):
 GL_PREFIX(GenerateMipmapEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6064(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6064(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6064(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6064(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenerateMipmapEXT), .-GL_PREFIX(GenerateMipmapEXT)
@@ -28702,7 +28850,7 @@ GL_PREFIX(GenerateMipmapEXT):
 GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6072(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28716,13 +28864,13 @@ GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6072(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6072(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28736,7 +28884,7 @@ GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6072(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetFramebufferAttachmentParameterivEXT), .-GL_PREFIX(GetFramebufferAttachmentParameterivEXT)
@@ -28747,7 +28895,7 @@ GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 GL_PREFIX(GetRenderbufferParameterivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6080(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28757,13 +28905,13 @@ GL_PREFIX(GetRenderbufferParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6080(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6080(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28773,7 +28921,7 @@ GL_PREFIX(GetRenderbufferParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6080(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetRenderbufferParameterivEXT), .-GL_PREFIX(GetRenderbufferParameterivEXT)
@@ -28784,25 +28932,25 @@ GL_PREFIX(GetRenderbufferParameterivEXT):
 GL_PREFIX(IsFramebufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6088(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6088(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6088(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6088(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsFramebufferEXT), .-GL_PREFIX(IsFramebufferEXT)
@@ -28813,25 +28961,25 @@ GL_PREFIX(IsFramebufferEXT):
 GL_PREFIX(IsRenderbufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6096(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6096(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6096(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6096(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsRenderbufferEXT), .-GL_PREFIX(IsRenderbufferEXT)
@@ -28842,7 +28990,7 @@ GL_PREFIX(IsRenderbufferEXT):
 GL_PREFIX(RenderbufferStorageEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6104(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28856,13 +29004,13 @@ GL_PREFIX(RenderbufferStorageEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6104(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6104(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28876,19 +29024,19 @@ GL_PREFIX(RenderbufferStorageEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6104(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(RenderbufferStorageEXT), .-GL_PREFIX(RenderbufferStorageEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_764)
-	.type	GL_PREFIX(_dispatch_stub_764), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_764))
-GL_PREFIX(_dispatch_stub_764):
+	.globl	GL_PREFIX(_dispatch_stub_768)
+	.type	GL_PREFIX(_dispatch_stub_768), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_768))
+GL_PREFIX(_dispatch_stub_768):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6112(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28906,13 +29054,13 @@ GL_PREFIX(_dispatch_stub_764):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6112(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6112(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28930,10 +29078,10 @@ GL_PREFIX(_dispatch_stub_764):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6112(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_764), .-GL_PREFIX(_dispatch_stub_764)
+	.size	GL_PREFIX(_dispatch_stub_768), .-GL_PREFIX(_dispatch_stub_768)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(FramebufferTextureLayerEXT)
@@ -28941,7 +29089,7 @@ GL_PREFIX(_dispatch_stub_764):
 GL_PREFIX(FramebufferTextureLayerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6120(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28955,13 +29103,13 @@ GL_PREFIX(FramebufferTextureLayerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6120(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6120(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28975,19 +29123,19 @@ GL_PREFIX(FramebufferTextureLayerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6120(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTextureLayerEXT), .-GL_PREFIX(FramebufferTextureLayerEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_766)
-	.type	GL_PREFIX(_dispatch_stub_766), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_766))
-GL_PREFIX(_dispatch_stub_766):
+	.globl	GL_PREFIX(_dispatch_stub_770)
+	.type	GL_PREFIX(_dispatch_stub_770), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_770))
+GL_PREFIX(_dispatch_stub_770):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6128(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29001,13 +29149,13 @@ GL_PREFIX(_dispatch_stub_766):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6128(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6128(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29021,19 +29169,19 @@ GL_PREFIX(_dispatch_stub_766):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6128(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_766), .-GL_PREFIX(_dispatch_stub_766)
+	.size	GL_PREFIX(_dispatch_stub_770), .-GL_PREFIX(_dispatch_stub_770)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_767)
-	.type	GL_PREFIX(_dispatch_stub_767), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_767))
-GL_PREFIX(_dispatch_stub_767):
+	.globl	GL_PREFIX(_dispatch_stub_771)
+	.type	GL_PREFIX(_dispatch_stub_771), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_771))
+GL_PREFIX(_dispatch_stub_771):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6136(%rax), %r11
+	movq	6168(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29047,13 +29195,13 @@ GL_PREFIX(_dispatch_stub_767):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6136(%rax), %r11
+	movq	6168(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6136(%rax), %r11
+	movq	6168(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29067,19 +29215,19 @@ GL_PREFIX(_dispatch_stub_767):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6136(%rax), %r11
+	movq	6168(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_767), .-GL_PREFIX(_dispatch_stub_767)
+	.size	GL_PREFIX(_dispatch_stub_771), .-GL_PREFIX(_dispatch_stub_771)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_768)
-	.type	GL_PREFIX(_dispatch_stub_768), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_768))
-GL_PREFIX(_dispatch_stub_768):
+	.globl	GL_PREFIX(_dispatch_stub_772)
+	.type	GL_PREFIX(_dispatch_stub_772), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_772))
+GL_PREFIX(_dispatch_stub_772):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6144(%rax), %r11
+	movq	6176(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29093,13 +29241,13 @@ GL_PREFIX(_dispatch_stub_768):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6144(%rax), %r11
+	movq	6176(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6144(%rax), %r11
+	movq	6176(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29113,19 +29261,19 @@ GL_PREFIX(_dispatch_stub_768):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6144(%rax), %r11
+	movq	6176(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_768), .-GL_PREFIX(_dispatch_stub_768)
+	.size	GL_PREFIX(_dispatch_stub_772), .-GL_PREFIX(_dispatch_stub_772)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_769)
-	.type	GL_PREFIX(_dispatch_stub_769), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_769))
-GL_PREFIX(_dispatch_stub_769):
+	.globl	GL_PREFIX(_dispatch_stub_773)
+	.type	GL_PREFIX(_dispatch_stub_773), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_773))
+GL_PREFIX(_dispatch_stub_773):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6152(%rax), %r11
+	movq	6184(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29135,13 +29283,13 @@ GL_PREFIX(_dispatch_stub_769):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6152(%rax), %r11
+	movq	6184(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6152(%rax), %r11
+	movq	6184(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29151,19 +29299,19 @@ GL_PREFIX(_dispatch_stub_769):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6152(%rax), %r11
+	movq	6184(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_769), .-GL_PREFIX(_dispatch_stub_769)
+	.size	GL_PREFIX(_dispatch_stub_773), .-GL_PREFIX(_dispatch_stub_773)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_770)
-	.type	GL_PREFIX(_dispatch_stub_770), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_770))
-GL_PREFIX(_dispatch_stub_770):
+	.globl	GL_PREFIX(_dispatch_stub_774)
+	.type	GL_PREFIX(_dispatch_stub_774), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_774))
+GL_PREFIX(_dispatch_stub_774):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6160(%rax), %r11
+	movq	6192(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29173,13 +29321,13 @@ GL_PREFIX(_dispatch_stub_770):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6160(%rax), %r11
+	movq	6192(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6160(%rax), %r11
+	movq	6192(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29189,10 +29337,10 @@ GL_PREFIX(_dispatch_stub_770):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6160(%rax), %r11
+	movq	6192(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_770), .-GL_PREFIX(_dispatch_stub_770)
+	.size	GL_PREFIX(_dispatch_stub_774), .-GL_PREFIX(_dispatch_stub_774)
 
 	.globl GL_PREFIX(ArrayElementEXT) ; .set GL_PREFIX(ArrayElementEXT), GL_PREFIX(ArrayElement)
 	.globl GL_PREFIX(BindTextureEXT) ; .set GL_PREFIX(BindTextureEXT), GL_PREFIX(BindTexture)
@@ -29447,7 +29595,7 @@ GL_PREFIX(_dispatch_stub_770):
 	.globl GL_PREFIX(IsProgramARB) ; .set GL_PREFIX(IsProgramARB), GL_PREFIX(IsProgramNV)
 	.globl GL_PREFIX(PointParameteri) ; .set GL_PREFIX(PointParameteri), GL_PREFIX(PointParameteriNV)
 	.globl GL_PREFIX(PointParameteriv) ; .set GL_PREFIX(PointParameteriv), GL_PREFIX(PointParameterivNV)
-	.globl GL_PREFIX(BlendEquationSeparate) ; .set GL_PREFIX(BlendEquationSeparate), GL_PREFIX(_dispatch_stub_746)
+	.globl GL_PREFIX(BlendEquationSeparate) ; .set GL_PREFIX(BlendEquationSeparate), GL_PREFIX(_dispatch_stub_750)
 	.globl GL_PREFIX(BindFramebuffer) ; .set GL_PREFIX(BindFramebuffer), GL_PREFIX(BindFramebufferEXT)
 	.globl GL_PREFIX(BindRenderbuffer) ; .set GL_PREFIX(BindRenderbuffer), GL_PREFIX(BindRenderbufferEXT)
 	.globl GL_PREFIX(CheckFramebufferStatus) ; .set GL_PREFIX(CheckFramebufferStatus), GL_PREFIX(CheckFramebufferStatusEXT)
@@ -29465,7 +29613,7 @@ GL_PREFIX(_dispatch_stub_770):
 	.globl GL_PREFIX(IsFramebuffer) ; .set GL_PREFIX(IsFramebuffer), GL_PREFIX(IsFramebufferEXT)
 	.globl GL_PREFIX(IsRenderbuffer) ; .set GL_PREFIX(IsRenderbuffer), GL_PREFIX(IsRenderbufferEXT)
 	.globl GL_PREFIX(RenderbufferStorage) ; .set GL_PREFIX(RenderbufferStorage), GL_PREFIX(RenderbufferStorageEXT)
-	.globl GL_PREFIX(BlitFramebuffer) ; .set GL_PREFIX(BlitFramebuffer), GL_PREFIX(_dispatch_stub_764)
+	.globl GL_PREFIX(BlitFramebuffer) ; .set GL_PREFIX(BlitFramebuffer), GL_PREFIX(_dispatch_stub_768)
 	.globl GL_PREFIX(FramebufferTextureLayer) ; .set GL_PREFIX(FramebufferTextureLayer), GL_PREFIX(FramebufferTextureLayerEXT)
 
 #if defined(GLX_USE_TLS) && defined(__linux__)
diff --git a/src/mesa/x86/glapi_x86.S b/src/mesa/x86/glapi_x86.S
index 2e05a74ac6..7aa344f214 100644
--- a/src/mesa/x86/glapi_x86.S
+++ b/src/mesa/x86/glapi_x86.S
@@ -889,6 +889,10 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(VertexAttribs4fvNV, _gloffset_VertexAttribs4fvNV, VertexAttribs4fvNV@12)
 	GL_STUB(VertexAttribs4svNV, _gloffset_VertexAttribs4svNV, VertexAttribs4svNV@12)
 	GL_STUB(VertexAttribs4ubvNV, _gloffset_VertexAttribs4ubvNV, VertexAttribs4ubvNV@12)
+	GL_STUB(GetTexBumpParameterfvATI, _gloffset_GetTexBumpParameterfvATI, GetTexBumpParameterfvATI@8)
+	GL_STUB(GetTexBumpParameterivATI, _gloffset_GetTexBumpParameterivATI, GetTexBumpParameterivATI@8)
+	GL_STUB(TexBumpParameterfvATI, _gloffset_TexBumpParameterfvATI, TexBumpParameterfvATI@8)
+	GL_STUB(TexBumpParameterivATI, _gloffset_TexBumpParameterivATI, TexBumpParameterivATI@8)
 	GL_STUB(AlphaFragmentOp1ATI, _gloffset_AlphaFragmentOp1ATI, AlphaFragmentOp1ATI@24)
 	GL_STUB(AlphaFragmentOp2ATI, _gloffset_AlphaFragmentOp2ATI, AlphaFragmentOp2ATI@36)
 	GL_STUB(AlphaFragmentOp3ATI, _gloffset_AlphaFragmentOp3ATI, AlphaFragmentOp3ATI@48)
@@ -905,26 +909,26 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(SetFragmentShaderConstantATI, _gloffset_SetFragmentShaderConstantATI, SetFragmentShaderConstantATI@8)
 	GL_STUB(PointParameteriNV, _gloffset_PointParameteriNV, PointParameteriNV@8)
 	GL_STUB(PointParameterivNV, _gloffset_PointParameterivNV, PointParameterivNV@8)
-	GL_STUB(_dispatch_stub_734, _gloffset_ActiveStencilFaceEXT, _dispatch_stub_734@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_734, _dispatch_stub_734@4))
-	GL_STUB(_dispatch_stub_735, _gloffset_BindVertexArrayAPPLE, _dispatch_stub_735@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_735, _dispatch_stub_735@4))
-	GL_STUB(_dispatch_stub_736, _gloffset_DeleteVertexArraysAPPLE, _dispatch_stub_736@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_736, _dispatch_stub_736@8))
-	GL_STUB(_dispatch_stub_737, _gloffset_GenVertexArraysAPPLE, _dispatch_stub_737@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_737, _dispatch_stub_737@8))
-	GL_STUB(_dispatch_stub_738, _gloffset_IsVertexArrayAPPLE, _dispatch_stub_738@4)
+	GL_STUB(_dispatch_stub_738, _gloffset_ActiveStencilFaceEXT, _dispatch_stub_738@4)
 	HIDDEN(GL_PREFIX(_dispatch_stub_738, _dispatch_stub_738@4))
+	GL_STUB(_dispatch_stub_739, _gloffset_BindVertexArrayAPPLE, _dispatch_stub_739@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_739, _dispatch_stub_739@4))
+	GL_STUB(_dispatch_stub_740, _gloffset_DeleteVertexArraysAPPLE, _dispatch_stub_740@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_740, _dispatch_stub_740@8))
+	GL_STUB(_dispatch_stub_741, _gloffset_GenVertexArraysAPPLE, _dispatch_stub_741@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_741, _dispatch_stub_741@8))
+	GL_STUB(_dispatch_stub_742, _gloffset_IsVertexArrayAPPLE, _dispatch_stub_742@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_742, _dispatch_stub_742@4))
 	GL_STUB(GetProgramNamedParameterdvNV, _gloffset_GetProgramNamedParameterdvNV, GetProgramNamedParameterdvNV@16)
 	GL_STUB(GetProgramNamedParameterfvNV, _gloffset_GetProgramNamedParameterfvNV, GetProgramNamedParameterfvNV@16)
 	GL_STUB(ProgramNamedParameter4dNV, _gloffset_ProgramNamedParameter4dNV, ProgramNamedParameter4dNV@44)
 	GL_STUB(ProgramNamedParameter4dvNV, _gloffset_ProgramNamedParameter4dvNV, ProgramNamedParameter4dvNV@16)
 	GL_STUB(ProgramNamedParameter4fNV, _gloffset_ProgramNamedParameter4fNV, ProgramNamedParameter4fNV@28)
 	GL_STUB(ProgramNamedParameter4fvNV, _gloffset_ProgramNamedParameter4fvNV, ProgramNamedParameter4fvNV@16)
-	GL_STUB(_dispatch_stub_745, _gloffset_DepthBoundsEXT, _dispatch_stub_745@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_745, _dispatch_stub_745@16))
-	GL_STUB(_dispatch_stub_746, _gloffset_BlendEquationSeparateEXT, _dispatch_stub_746@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_746, _dispatch_stub_746@8))
+	GL_STUB(_dispatch_stub_749, _gloffset_DepthBoundsEXT, _dispatch_stub_749@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_749, _dispatch_stub_749@16))
+	GL_STUB(_dispatch_stub_750, _gloffset_BlendEquationSeparateEXT, _dispatch_stub_750@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_750, _dispatch_stub_750@8))
 	GL_STUB(BindFramebufferEXT, _gloffset_BindFramebufferEXT, BindFramebufferEXT@8)
 	GL_STUB(BindRenderbufferEXT, _gloffset_BindRenderbufferEXT, BindRenderbufferEXT@8)
 	GL_STUB(CheckFramebufferStatusEXT, _gloffset_CheckFramebufferStatusEXT, CheckFramebufferStatusEXT@4)
@@ -942,19 +946,19 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(IsFramebufferEXT, _gloffset_IsFramebufferEXT, IsFramebufferEXT@4)
 	GL_STUB(IsRenderbufferEXT, _gloffset_IsRenderbufferEXT, IsRenderbufferEXT@4)
 	GL_STUB(RenderbufferStorageEXT, _gloffset_RenderbufferStorageEXT, RenderbufferStorageEXT@16)
-	GL_STUB(_dispatch_stub_764, _gloffset_BlitFramebufferEXT, _dispatch_stub_764@40)
-	HIDDEN(GL_PREFIX(_dispatch_stub_764, _dispatch_stub_764@40))
+	GL_STUB(_dispatch_stub_768, _gloffset_BlitFramebufferEXT, _dispatch_stub_768@40)
+	HIDDEN(GL_PREFIX(_dispatch_stub_768, _dispatch_stub_768@40))
 	GL_STUB(FramebufferTextureLayerEXT, _gloffset_FramebufferTextureLayerEXT, FramebufferTextureLayerEXT@20)
-	GL_STUB(_dispatch_stub_766, _gloffset_StencilFuncSeparateATI, _dispatch_stub_766@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_766, _dispatch_stub_766@16))
-	GL_STUB(_dispatch_stub_767, _gloffset_ProgramEnvParameters4fvEXT, _dispatch_stub_767@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_767, _dispatch_stub_767@16))
-	GL_STUB(_dispatch_stub_768, _gloffset_ProgramLocalParameters4fvEXT, _dispatch_stub_768@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_768, _dispatch_stub_768@16))
-	GL_STUB(_dispatch_stub_769, _gloffset_GetQueryObjecti64vEXT, _dispatch_stub_769@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_769, _dispatch_stub_769@12))
-	GL_STUB(_dispatch_stub_770, _gloffset_GetQueryObjectui64vEXT, _dispatch_stub_770@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_770, _dispatch_stub_770@12))
+	GL_STUB(_dispatch_stub_770, _gloffset_StencilFuncSeparateATI, _dispatch_stub_770@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_770, _dispatch_stub_770@16))
+	GL_STUB(_dispatch_stub_771, _gloffset_ProgramEnvParameters4fvEXT, _dispatch_stub_771@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_771, _dispatch_stub_771@16))
+	GL_STUB(_dispatch_stub_772, _gloffset_ProgramLocalParameters4fvEXT, _dispatch_stub_772@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_772, _dispatch_stub_772@16))
+	GL_STUB(_dispatch_stub_773, _gloffset_GetQueryObjecti64vEXT, _dispatch_stub_773@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_773, _dispatch_stub_773@12))
+	GL_STUB(_dispatch_stub_774, _gloffset_GetQueryObjectui64vEXT, _dispatch_stub_774@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_774, _dispatch_stub_774@12))
 	GL_STUB_ALIAS(ArrayElementEXT, _gloffset_ArrayElement, ArrayElementEXT@4, ArrayElement, ArrayElement@4)
 	GL_STUB_ALIAS(BindTextureEXT, _gloffset_BindTexture, BindTextureEXT@8, BindTexture, BindTexture@8)
 	GL_STUB_ALIAS(DrawArraysEXT, _gloffset_DrawArrays, DrawArraysEXT@12, DrawArrays, DrawArrays@12)
-- 
cgit v1.2.3


From 862dccd56054196dc5adf1377f682d0138fa1789 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 12 Mar 2009 09:30:08 -0600
Subject: mesa: fix transposed red/blue in store_texel_rgb888/bgr888()
 functions

---
 src/mesa/main/texformat_tmp.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texformat_tmp.h b/src/mesa/main/texformat_tmp.h
index f9f9d5b1f8..d5f0b761e7 100644
--- a/src/mesa/main/texformat_tmp.h
+++ b/src/mesa/main/texformat_tmp.h
@@ -719,9 +719,9 @@ static void store_texel_rgb888(struct gl_texture_image *texImage,
 {
    const GLubyte *rgba = (const GLubyte *) texel;
    GLubyte *dst = TEXEL_ADDR(GLubyte, texImage, i, j, k, 3);
-   dst[0] = rgba[RCOMP];
+   dst[0] = rgba[BCOMP];
    dst[1] = rgba[GCOMP];
-   dst[2] = rgba[BCOMP];
+   dst[2] = rgba[RCOMP];
 }
 #endif
 
@@ -745,9 +745,9 @@ static void store_texel_bgr888(struct gl_texture_image *texImage,
 {
    const GLubyte *rgba = (const GLubyte *) texel;
    GLubyte *dst = TEXEL_ADDR(GLubyte, texImage, i, j, k, 3);
-   dst[0] = rgba[BCOMP];
+   dst[0] = rgba[RCOMP];
    dst[1] = rgba[GCOMP];
-   dst[2] = rgba[RCOMP];
+   dst[2] = rgba[BCOMP];
 }
 #endif
 
-- 
cgit v1.2.3


From 29309b45b011b4c44721b8f7346272fb22a4d4c2 Mon Sep 17 00:00:00 2001
From: Robert Ellison <papillo@vmware.com>
Date: Thu, 12 Mar 2009 11:46:31 -0600
Subject: i965: fix polygon stipple when rendering to FBO

The polygon stipple pattern, like the viewport and the
polygon face orientation, must be inverted on the i965
when rendering to a FBO (which itself has an inverted pixel
coordinate system compared to raw Mesa).

In addition, the polygon stipple offset, which orients
the stipple to the window system, disappears when rendering
to an FBO (because the window system offset doesn't apply,
and there's no associated FBO offset).

With these fixes, the conform triangle and polygon stipple
tests pass when rendering to texture.
---
 src/mesa/drivers/dri/i965/brw_misc_state.c | 35 ++++++++++++++++++++++++++----
 src/mesa/main/mtypes.h                     |  6 ++---
 2 files changed, 34 insertions(+), 7 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/i965/brw_misc_state.c b/src/mesa/drivers/dri/i965/brw_misc_state.c
index 40cb7a341d..5c94a49f60 100644
--- a/src/mesa/drivers/dri/i965/brw_misc_state.c
+++ b/src/mesa/drivers/dri/i965/brw_misc_state.c
@@ -290,8 +290,21 @@ static void upload_polygon_stipple(struct brw_context *brw)
    bps.header.opcode = CMD_POLY_STIPPLE_PATTERN;
    bps.header.length = sizeof(bps)/4-2;
 
-   for (i = 0; i < 32; i++)
-      bps.stipple[i] = ctx->PolygonStipple[31 - i]; /* invert */
+   /* Polygon stipple is provided in OpenGL order, i.e. bottom
+    * row first.  If we're rendering to a window (i.e. the
+    * default frame buffer object, 0), then we need to invert
+    * it to match our pixel layout.  But if we're rendering
+    * to a FBO (i.e. any named frame buffer object), we *don't*
+    * need to invert - we already match the layout.
+    */
+   if (ctx->DrawBuffer->Name == 0) {
+      for (i = 0; i < 32; i++)
+         bps.stipple[i] = ctx->PolygonStipple[31 - i]; /* invert */
+   }
+   else {
+      for (i = 0; i < 32; i++)
+         bps.stipple[i] = ctx->PolygonStipple[i]; /* don't invert */
+   }
 
    BRW_CACHED_BATCH_STRUCT(brw, &bps);
 }
@@ -319,8 +332,22 @@ static void upload_polygon_stipple_offset(struct brw_context *brw)
    bpso.header.opcode = CMD_POLY_STIPPLE_OFFSET;
    bpso.header.length = sizeof(bpso)/4-2;
 
-   bpso.bits0.x_offset = (32 - (dPriv->x & 31)) & 31;
-   bpso.bits0.y_offset = (32 - ((dPriv->y + dPriv->h) & 31)) & 31;
+   /* If we're drawing to a system window (ctx->DrawBuffer->Name == 0),
+    * we have to invert the Y axis in order to match the OpenGL
+    * pixel coordinate system, and our offset must be matched
+    * to the window position.  If we're drawing to a FBO
+    * (ctx->DrawBuffer->Name != 0), then our native pixel coordinate
+    * system works just fine, and there's no window system to
+    * worry about.
+    */
+   if (brw->intel.ctx.DrawBuffer->Name == 0) {
+      bpso.bits0.x_offset = (32 - (dPriv->x & 31)) & 31;
+      bpso.bits0.y_offset = (32 - ((dPriv->y + dPriv->h) & 31)) & 31;
+   }
+   else {
+      bpso.bits0.y_offset = 0;
+      bpso.bits0.x_offset = 0;
+   }
 
    BRW_CACHED_BATCH_STRUCT(brw, &bpso);
 }
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 169f1af057..3913828533 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2241,9 +2241,9 @@ struct gl_framebuffer
    /**
     * If zero, this is a window system framebuffer.  If non-zero, this
     * is a FBO framebuffer; note that for some devices (i.e. those with
-    * a natural pixel coordinate system for FBOs that differs from the 
-    * OpenGL/Mesa coordinate system), this means that both the viewport
-    * and polygon face orientation will have to be inverted.
+    * a natural pixel coordinate system for FBOs that differs from the
+    * OpenGL/Mesa coordinate system), this means that the viewport,
+    * polygon face orientation, and polygon stipple will have to be inverted.
     */
    GLuint Name;
 
-- 
cgit v1.2.3


From 363fc6d64fc8b813f2216b8b28414c6a2c6d2963 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 12 Mar 2009 14:14:58 -0600
Subject: mesa: fix glRead/DrawBuffer(GL_AUXn) error value

If GL_AUX[123] are passed to glRead/DrawBuffer() when those buffers don't
exist, need to generate GL_INVALID_OPERATION, not GL_INVALID_ENUM.

This regression came from commit 555f0a88182e2b1af809b2d97abdac02814a2f28
---
 src/mesa/main/buffers.c | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c
index 1580487ffd..c5f13345f0 100644
--- a/src/mesa/main/buffers.c
+++ b/src/mesa/main/buffers.c
@@ -119,6 +119,10 @@ draw_buffer_enum_to_bitmask(GLenum buffer)
          return BUFFER_BIT_FRONT_LEFT;
       case GL_AUX0:
          return BUFFER_BIT_AUX0;
+      case GL_AUX1:
+      case GL_AUX2:
+      case GL_AUX3:
+         return 1 << BUFFER_COUNT; /* invalid, but not BAD_MASK */
       case GL_COLOR_ATTACHMENT0_EXT:
          return BUFFER_BIT_COLOR0;
       case GL_COLOR_ATTACHMENT1_EXT:
@@ -170,6 +174,10 @@ read_buffer_enum_to_index(GLenum buffer)
          return BUFFER_FRONT_LEFT;
       case GL_AUX0:
          return BUFFER_AUX0;
+      case GL_AUX1:
+      case GL_AUX2:
+      case GL_AUX3:
+         return BUFFER_COUNT; /* invalid, but not -1 */
       case GL_COLOR_ATTACHMENT0_EXT:
          return BUFFER_COLOR0;
       case GL_COLOR_ATTACHMENT1_EXT:
-- 
cgit v1.2.3


From 47053782b8e82f447d7d2fb590da9cced2926021 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 12 Mar 2009 16:13:44 -0600
Subject: mesa: move declarations before code

---
 src/mesa/main/image.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index ed0811660d..5c5f9f6028 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -3996,6 +3996,8 @@ _mesa_unpack_dudv_span_byte( GLcontext *ctx,
    {
       GLint dstComponents;
       GLfloat rgba[MAX_WIDTH][4];
+      GLbyte *dst = dest;
+      GLuint i;
 
       dstComponents = _mesa_components_in_format( dstFormat );
       /* source & dest image formats should have been error checked by now */
@@ -4014,8 +4016,6 @@ _mesa_unpack_dudv_span_byte( GLcontext *ctx,
        */
 
       /* Now pack results in the requested dstFormat */
-      GLbyte *dst = dest;
-      GLuint i;
       for (i = 0; i < n; i++) {
          /* not sure - need clamp[-1,1] here? */
          dst[0] = FLOAT_TO_BYTE(rgba[i][RCOMP]);
-- 
cgit v1.2.3


From 8a8919a7ddd2348c4a4cbcbab2358c49e47e2ea5 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 12 Mar 2009 18:21:07 -0600
Subject: mesa: improve some error messages

---
 src/mesa/main/teximage.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 2ed72280ec..f598ea3d46 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -1552,7 +1552,8 @@ texture_error_check( GLcontext *ctx, GLenum target,
        */
       if (!isProxy) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glTexImage%dD(format or type)", dimensions);
+                     "glTexImage%dD(incompatible format 0x%x, type 0x%x)",
+                     dimensions, format, type);
       }
       return GL_TRUE;
    }
@@ -1568,7 +1569,8 @@ texture_error_check( GLcontext *ctx, GLenum target,
        (is_dudv_format(internalFormat) != is_dudv_format(format))) {
       if (!isProxy)
          _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glTexImage(internalFormat/format)");
+                     "glTexImage%dD(incompatible internalFormat 0x%x, format 0x%x)",
+                     dimensions, internalFormat, format);
       return GL_TRUE;
    }
 
@@ -1742,7 +1744,8 @@ subtexture_error_check( GLcontext *ctx, GLuint dimensions,
 
    if (!_mesa_is_legal_format_and_type(ctx, format, type)) {
       _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glTexSubImage%dD(format or type)", dimensions);
+                  "glTexSubImage%dD(incompatible format 0x%x, type 0x%x)",
+                  dimensions, format, type);
       return GL_TRUE;
    }
 
-- 
cgit v1.2.3


From 1826ff3fb34e9fb19bc8d8dee2cce5280da5e069 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 12 Mar 2009 18:23:41 -0600
Subject: mesa: override_internal_format() function for debug/test purposes
 (disabled)

---
 src/mesa/main/teximage.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index f598ea3d46..bf28986066 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -2440,6 +2440,49 @@ update_fbo_texture(GLcontext *ctx, struct gl_texture_object *texObj,
 }
 
 
+/** Debug helper: override the user-requested internal format */
+static GLenum
+override_internal_format(GLenum internalFormat, GLint width, GLint height)
+{
+#if 0
+   if (internalFormat == GL_RGBA16F_ARB ||
+       internalFormat == GL_RGBA32F_ARB) {
+      printf("Convert rgba float tex to int %d x %d\n", width, height);
+      return GL_RGBA;
+   }
+   else if (internalFormat == GL_RGB16F_ARB ||
+            internalFormat == GL_RGB32F_ARB) {
+      printf("Convert rgb float tex to int %d x %d\n", width, height);
+      return GL_RGB;
+   }
+   else if (internalFormat == GL_LUMINANCE_ALPHA16F_ARB ||
+            internalFormat == GL_LUMINANCE_ALPHA32F_ARB) {
+      printf("Convert luminance float tex to int %d x %d\n", width, height);
+      return GL_LUMINANCE_ALPHA;
+   }
+   else if (internalFormat == GL_LUMINANCE16F_ARB ||
+            internalFormat == GL_LUMINANCE32F_ARB) {
+      printf("Convert luminance float tex to int %d x %d\n", width, height);
+      return GL_LUMINANCE;
+   }
+   else if (internalFormat == GL_ALPHA16F_ARB ||
+            internalFormat == GL_ALPHA32F_ARB) {
+      printf("Convert luminance float tex to int %d x %d\n", width, height);
+      return GL_ALPHA;
+   }
+   /*
+   else if (internalFormat == GL_COMPRESSED_RGBA_S3TC_DXT1_EXT) {
+      internalFormat = GL_RGBA;
+   }
+   */
+   else {
+      return internalFormat;
+   }
+#else
+   return internalFormat;
+#endif
+}
+
 
 /*
  * Called from the API.  Note that width includes the border.
@@ -2453,6 +2496,8 @@ _mesa_TexImage1D( GLenum target, GLint level, GLint internalFormat,
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
+   internalFormat = override_internal_format(internalFormat, width, 1);
+
 #if FEATURE_convolve
    if (_mesa_is_color_format(internalFormat)) {
       _mesa_adjust_image_for_convolution(ctx, 1, &postConvWidth, NULL);
@@ -2550,6 +2595,8 @@ _mesa_TexImage2D( GLenum target, GLint level, GLint internalFormat,
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
+   internalFormat = override_internal_format(internalFormat, width, height);
+
 #if FEATURE_convolve
    if (_mesa_is_color_format(internalFormat)) {
       _mesa_adjust_image_for_convolution(ctx, 2, &postConvWidth,
@@ -2664,6 +2711,8 @@ _mesa_TexImage3D( GLenum target, GLint level, GLint internalFormat,
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
+   internalFormat = override_internal_format(internalFormat, width, height);
+
    if (target == GL_TEXTURE_3D ||
        (ctx->Extensions.MESA_texture_array &&
         target == GL_TEXTURE_2D_ARRAY_EXT)) {
-- 
cgit v1.2.3


From f786e46cf4fbf50a1cacfb81e22ee155ffe6edd3 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 12 Mar 2009 19:42:14 -0600
Subject: mesa: added GL_DU8DV8_ATI case in _mesa_components_in_format()

This gets hit when glTexSubImage2D() is called with format==GL_DU8DV8_ATI.
---
 src/mesa/main/image.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index 5c5f9f6028..804e840820 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -294,6 +294,7 @@ _mesa_components_in_format( GLenum format )
       case GL_DEPTH_STENCIL_EXT:
          return 2;
       case GL_DUDV_ATI:
+      case GL_DU8DV8_ATI:
          return 2;
       default:
          return -1;
-- 
cgit v1.2.3


From 4681a1d1eeb2aa8dfaf3af02c37e9ccd9a523565 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 13 Mar 2009 08:36:51 -0600
Subject: mesa: added 1D/3D fetch_texel functions for DUDV8

---
 src/mesa/main/texformat.c     | 6 +++---
 src/mesa/main/texformat_tmp.h | 7 ++-----
 2 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c
index 61a12493a6..c372b49398 100644
--- a/src/mesa/main/texformat.c
+++ b/src/mesa/main/texformat.c
@@ -716,11 +716,11 @@ const struct gl_texture_format _mesa_texformat_dudv8 = {
    2,					/* TexelBytes */
    _mesa_texstore_dudv8,		/* StoreTexImageFunc */
    NULL,				/* FetchTexel1D */
-   NULL,		/* FetchTexel2D */
+   NULL,				/* FetchTexel2D */
    NULL,				/* FetchTexel3D */
-   NULL,				/* FetchTexel1Df */
+   fetch_texel_1d_dudv8,		/* FetchTexel1Df */
    fetch_texel_2d_dudv8,		/* FetchTexel2Df */
-   NULL,				/* FetchTexel3Df */
+   fetch_texel_3d_dudv8,		/* FetchTexel3Df */
    NULL					/* StoreTexel */
 };
 
diff --git a/src/mesa/main/texformat_tmp.h b/src/mesa/main/texformat_tmp.h
index d5f0b761e7..0f6a172ef0 100644
--- a/src/mesa/main/texformat_tmp.h
+++ b/src/mesa/main/texformat_tmp.h
@@ -1304,11 +1304,9 @@ static void store_texel_sla8(struct gl_texture_image *texImage,
 }
 #endif
 
-
-
 #endif /* FEATURE_EXT_texture_sRGB */
 
-#if DIM == 2
+
 /* MESA_FORMAT_DUDV8 ********************************************************/
 
 /* this format by definition produces 0,0,0,1 as rgba values,
@@ -1321,9 +1319,8 @@ static void FETCH(dudv8)(const struct gl_texture_image *texImage,
    texel[GCOMP] = BYTE_TO_FLOAT(src[1]);
    texel[BCOMP] = 0;
    texel[ACOMP] = 0;
-
 }
-#endif
+
 
 /* MESA_FORMAT_YCBCR *********************************************************/
 
-- 
cgit v1.2.3


From fcb0d8968dfb32d26219f7671866f993be5f548c Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 13 Mar 2009 08:38:32 -0600
Subject: mesa: more info in _mesa_problem() call

---
 src/mesa/main/texstate.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index a5af622910..a490dff5e9 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -183,7 +183,9 @@ calculate_derived_texenv( struct gl_tex_env_combine_state *state,
       break;
       
    default:
-      _mesa_problem(NULL, "Invalid texBaseFormat in calculate_derived_texenv");
+      _mesa_problem(NULL,
+                    "Invalid texBaseFormat 0x%x in calculate_derived_texenv",
+                    texBaseFormat);
       return;
    }
 
-- 
cgit v1.2.3


From ccad1e45289b83d045cf7264f391f7502ef81110 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 13 Mar 2009 08:45:11 -0600
Subject: mesa: add GL_DUDV_ATI cases in calculate_derived_texenv()

---
 src/mesa/main/texstate.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index a490dff5e9..0f91080024 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -179,6 +179,7 @@ calculate_derived_texenv( struct gl_tex_env_combine_state *state,
    case GL_LUMINANCE:
    case GL_RGB:
    case GL_YCBCR_MESA:
+   case GL_DUDV_ATI:
       state->SourceA[0] = GL_PREVIOUS;
       break;
       
@@ -218,6 +219,7 @@ calculate_derived_texenv( struct gl_tex_env_combine_state *state,
 	 break;
       case GL_RGB:
       case GL_YCBCR_MESA:
+      case GL_DUDV_ATI:
 	 mode_rgb = GL_REPLACE;
 	 break;
       case GL_RGBA:
@@ -244,6 +246,7 @@ calculate_derived_texenv( struct gl_tex_env_combine_state *state,
       case GL_LUMINANCE_ALPHA:
       case GL_RGBA:
       case GL_YCBCR_MESA:
+      case GL_DUDV_ATI:
 	 state->SourceRGB[2] = GL_TEXTURE;
 	 state->SourceA[2]   = GL_TEXTURE;
 	 state->SourceRGB[0] = GL_CONSTANT;
-- 
cgit v1.2.3


From 583d29373452764e4c902c3b04543a9056456eeb Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 13 Mar 2009 08:45:39 -0600
Subject: mesa: improve another _mesa_problem() call

---
 src/mesa/main/texstate.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 0f91080024..73f8a5339e 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -262,7 +262,8 @@ calculate_derived_texenv( struct gl_tex_env_combine_state *state,
 
    default:
       _mesa_problem(NULL,
-                    "Invalid texture env mode in calculate_derived_texenv");
+                    "Invalid texture env mode 0x%x in calculate_derived_texenv",
+                    mode);
       return;
    }
    
-- 
cgit v1.2.3


From 1eee1bac1f6d911e6124daafc9b9291666d91cef Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Tue, 17 Mar 2009 09:34:30 -0600
Subject: mesa: update/fix doxygen comments

---
 src/mesa/glapi/glapi_getproc.c   | 2 +-
 src/mesa/main/context.c          | 4 ++--
 src/mesa/main/dlist.c            | 2 +-
 src/mesa/main/execmem.c          | 2 +-
 src/mesa/main/feedback.c         | 4 ++--
 src/mesa/main/imports.c          | 2 +-
 src/mesa/main/mipmap.c           | 2 +-
 src/mesa/main/shared.c           | 2 +-
 src/mesa/main/teximage.c         | 7 +++----
 src/mesa/main/texobj.c           | 2 +-
 src/mesa/shader/prog_parameter.c | 2 +-
 src/mesa/shader/prog_print.c     | 2 +-
 12 files changed, 16 insertions(+), 17 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/glapi/glapi_getproc.c b/src/mesa/glapi/glapi_getproc.c
index 764e2ef98e..ed443c12c8 100644
--- a/src/mesa/glapi/glapi_getproc.c
+++ b/src/mesa/glapi/glapi_getproc.c
@@ -23,7 +23,7 @@
  */
 
 /**
- * \file glapi_getproc.
+ * \file glapi_getproc.c
  *
  * Code for implementing glXGetProcAddress(), etc.
  * This was originally in glapi.c but refactored out.
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 84bf0205a8..b24a3b4409 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -179,7 +179,7 @@ GLfloat _mesa_ubyte_to_float_color_tab[256];
 /**
  * Swap buffers notification callback.
  * 
- * \param gc GL context.
+ * \param ctx GL context.
  *
  * Called by window system just before swapping buffers.
  * We have to finish any pending rendering.
@@ -923,7 +923,7 @@ _mesa_initialize_context(GLcontext *ctx,
  * \param share_list another context to share display lists with or NULL
  * \param driverFunctions points to the dd_function_table into which the
  *        driver has plugged in all its special functions.
- * \param driverCtx points to the device driver's private context state
+ * \param driverContext points to the device driver's private context state
  * 
  * \return pointer to a new __GLcontextRec or NULL if error.
  */
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index ebcef0268a..8f7f703da9 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -707,7 +707,7 @@ unpack_image(GLuint dimensions, GLsizei width, GLsizei height, GLsizei depth,
 /**
  * Allocate space for a display list instruction.
  * \param opcode  the instruction opcode (OPCODE_* value)
- * \param size   instruction size in bytes, not counting opcode.
+ * \param bytes   instruction size in bytes, not counting opcode.
  * \return pointer to the usable data area (not including the internal
  *         opcode).
  */
diff --git a/src/mesa/main/execmem.c b/src/mesa/main/execmem.c
index b71846c904..57c1e117c8 100644
--- a/src/mesa/main/execmem.c
+++ b/src/mesa/main/execmem.c
@@ -24,7 +24,7 @@
 
 
 /**
- * \file exemem.c
+ * \file execmem.c
  * Functions for allocating executable memory.
  *
  * \author Keith Whitwell
diff --git a/src/mesa/main/feedback.c b/src/mesa/main/feedback.c
index beab535b15..818a804540 100644
--- a/src/mesa/main/feedback.c
+++ b/src/mesa/main/feedback.c
@@ -197,8 +197,8 @@ _mesa_SelectBuffer( GLsizei size, GLuint *buffer )
 /**
  * Write a value of a record into the selection buffer.
  * 
- * \param CTX GL context.
- * \param V value.
+ * \param ctx GL context.
+ * \param value value.
  *
  * Verifies there is free space in the buffer to write the value and
  * increments the pointer.
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index cb04594c1f..20b8342064 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -1011,7 +1011,7 @@ _mesa_warning( GLcontext *ctx, const char *fmtString, ... )
  * Prints the message to stderr via fprintf().
  *
  * \param ctx GL context.
- * \param s problem description string.
+ * \param fmtString problem description string.
  */
 void
 _mesa_problem( const GLcontext *ctx, const char *fmtString, ... )
diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index af2bf8fe22..4a79430c34 100644
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -1186,7 +1186,7 @@ make_1d_stack_mipmap(GLenum datatype, GLuint comps, GLint border,
 
 
 /**
- * \bugs
+ * \bug
  * There is quite a bit of refactoring that could be done with this function
  * and \c make_2d_mipmap.
  */
diff --git a/src/mesa/main/shared.c b/src/mesa/main/shared.c
index 936ee9061b..fa45e466b7 100644
--- a/src/mesa/main/shared.c
+++ b/src/mesa/main/shared.c
@@ -278,7 +278,7 @@ delete_renderbuffer_cb(GLuint id, void *data, void *userData)
  * Deallocate a shared state object and all children structures.
  *
  * \param ctx GL context.
- * \param ss shared state pointer.
+ * \param shared shared state pointer.
  * 
  * Frees the display lists, the texture objects (calling the driver texture
  * deletion callback to free its private data) and the vertex programs, as well
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index bf28986066..4f297738df 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -712,7 +712,7 @@ _mesa_new_texture_image( GLcontext *ctx )
  * Free texture image data.
  * This function is a fallback called via ctx->Driver.FreeTexImageData().
  *
- * \param teximage texture image.
+ * \param texImage texture image.
  *
  * Free the texture image data if it's not marked as client data.
  */
@@ -734,7 +734,7 @@ _mesa_free_texture_image_data(GLcontext *ctx,
 /**
  * Free texture image.
  *
- * \param teximage texture image.
+ * \param texImage texture image.
  *
  * Free the texture image structure and the associated image data.
  */
@@ -844,7 +844,7 @@ _mesa_select_tex_object(GLcontext *ctx, const struct gl_texture_unit *texUnit,
  * of the given texture unit.
  *
  * \param ctx GL context.
- * \param texUnit texture unit.
+ * \param texObj texture unit.
  * \param target texture target.
  * \param level image level.
  *
@@ -1852,7 +1852,6 @@ subtexture_error_check2( GLcontext *ctx, GLuint dimensions,
  * \param internalFormat internal format given by the user.
  * \param width image width given by the user.
  * \param height image height given by the user.
- * \param depth image depth given by the user.
  * \param border texture border.
  * 
  * \return GL_TRUE if an error was detected, or GL_FALSE if no errors.
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index 9ccb8fa100..b63f747fe8 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -180,7 +180,7 @@ finish_texture_init(GLcontext *ctx, GLenum target,
  * Called via ctx->Driver.DeleteTexture() if not overriden by a driver.
  *
  * \param shared the shared GL state to which the object belongs.
- * \param texOjb the texture object to delete.
+ * \param texObj the texture object to delete.
  */
 void
 _mesa_delete_texture_object( GLcontext *ctx, struct gl_texture_object *texObj )
diff --git a/src/mesa/shader/prog_parameter.c b/src/mesa/shader/prog_parameter.c
index 60e9d07423..66edae9001 100644
--- a/src/mesa/shader/prog_parameter.c
+++ b/src/mesa/shader/prog_parameter.c
@@ -517,7 +517,7 @@ _mesa_lookup_parameter_index(const struct gl_program_parameter_list *paramList,
  * swizzling to find a match.
  * \param list  the parameter list to search
  * \param v  the float vector to search for
- * \param size  number of element in v
+ * \param vSize  number of element in v
  * \param posOut  returns the position of the constant, if found
  * \param swizzleOut  returns a swizzle mask describing location of the
  *                    vector elements if found.
diff --git a/src/mesa/shader/prog_print.c b/src/mesa/shader/prog_print.c
index 3e006a4927..b832ddb477 100644
--- a/src/mesa/shader/prog_print.c
+++ b/src/mesa/shader/prog_print.c
@@ -213,7 +213,7 @@ arb_output_attrib_string(GLint index, GLenum progType)
  * Return string representation of the given register.
  * Note that some types of registers (like PROGRAM_UNIFORM) aren't defined
  * by the ARB/NV program languages so we've taken some liberties here.
- * \param file  the register file (PROGRAM_INPUT, PROGRAM_TEMPORARY, etc)
+ * \param f  the register file (PROGRAM_INPUT, PROGRAM_TEMPORARY, etc)
  * \param index  number of the register in the register file
  * \param mode  the output format/mode/style
  * \param prog  pointer to containing program
-- 
cgit v1.2.3


From a577471c546732419908893b481948feac5b7241 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 18 Mar 2009 15:39:11 -0600
Subject: mesa: use the IROUND() macro in pixel packing code

It turns out some tests are sensitive to rounding vs. truncating when
converting float color values to integers in glReadPixels().  In particular,
this matters when the destination format is 5/6/5 or 4/4/4/4, etc.
---
 src/mesa/main/image.c | 216 +++++++++++++++++++++++++-------------------------
 1 file changed, 108 insertions(+), 108 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index 804e840820..fa3149d56d 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -2378,9 +2378,9 @@ _mesa_pack_rgba_span_float(GLcontext *ctx, GLuint n, GLfloat rgba[][4],
          if (dstFormat == GL_RGB) {
             GLubyte *dst = (GLubyte *) dstAddr;
             for (i=0;i<n;i++) {
-               dst[i] = (((GLint) (rgba[i][RCOMP] * 7.0F)) << 5)
-                      | (((GLint) (rgba[i][GCOMP] * 7.0F)) << 2)
-                      | (((GLint) (rgba[i][BCOMP] * 3.0F))     );
+               dst[i] = (IROUND(rgba[i][RCOMP] * 7.0F) << 5)
+                      | (IROUND(rgba[i][GCOMP] * 7.0F) << 2)
+                      | (IROUND(rgba[i][BCOMP] * 3.0F)     );
             }
          }
          break;
@@ -2388,9 +2388,9 @@ _mesa_pack_rgba_span_float(GLcontext *ctx, GLuint n, GLfloat rgba[][4],
          if (dstFormat == GL_RGB) {
             GLubyte *dst = (GLubyte *) dstAddr;
             for (i=0;i<n;i++) {
-               dst[i] = (((GLint) (rgba[i][RCOMP] * 7.0F))     )
-                      | (((GLint) (rgba[i][GCOMP] * 7.0F)) << 3)
-                      | (((GLint) (rgba[i][BCOMP] * 3.0F)) << 6);
+               dst[i] = (IROUND(rgba[i][RCOMP] * 7.0F)     )
+                      | (IROUND(rgba[i][GCOMP] * 7.0F) << 3)
+                      | (IROUND(rgba[i][BCOMP] * 3.0F) << 6);
             }
          }
          break;
@@ -2398,9 +2398,9 @@ _mesa_pack_rgba_span_float(GLcontext *ctx, GLuint n, GLfloat rgba[][4],
          if (dstFormat == GL_RGB) {
             GLushort *dst = (GLushort *) dstAddr;
             for (i=0;i<n;i++) {
-               dst[i] = (((GLint) (rgba[i][RCOMP] * 31.0F)) << 11)
-                      | (((GLint) (rgba[i][GCOMP] * 63.0F)) <<  5)
-                      | (((GLint) (rgba[i][BCOMP] * 31.0F))      );
+               dst[i] = (IROUND(rgba[i][RCOMP] * 31.0F) << 11)
+                      | (IROUND(rgba[i][GCOMP] * 63.0F) <<  5)
+                      | (IROUND(rgba[i][BCOMP] * 31.0F)      );
             }
          }
          break;
@@ -2408,9 +2408,9 @@ _mesa_pack_rgba_span_float(GLcontext *ctx, GLuint n, GLfloat rgba[][4],
          if (dstFormat == GL_RGB) {
             GLushort *dst = (GLushort *) dstAddr;
             for (i=0;i<n;i++) {
-               dst[i] = (((GLint) (rgba[i][RCOMP] * 31.0F))      )
-                      | (((GLint) (rgba[i][GCOMP] * 63.0F)) <<  5)
-                      | (((GLint) (rgba[i][BCOMP] * 31.0F)) << 11);
+               dst[i] = (IROUND(rgba[i][RCOMP] * 31.0F)      )
+                      | (IROUND(rgba[i][GCOMP] * 63.0F) <<  5)
+                      | (IROUND(rgba[i][BCOMP] * 31.0F) << 11);
             }
          }
          break;
@@ -2418,28 +2418,28 @@ _mesa_pack_rgba_span_float(GLcontext *ctx, GLuint n, GLfloat rgba[][4],
          if (dstFormat == GL_RGBA) {
             GLushort *dst = (GLushort *) dstAddr;
             for (i=0;i<n;i++) {
-               dst[i] = (((GLint) (rgba[i][RCOMP] * 15.0F)) << 12)
-                      | (((GLint) (rgba[i][GCOMP] * 15.0F)) <<  8)
-                      | (((GLint) (rgba[i][BCOMP] * 15.0F)) <<  4)
-                      | (((GLint) (rgba[i][ACOMP] * 15.0F))      );
+               dst[i] = (IROUND(rgba[i][RCOMP] * 15.0F) << 12)
+                      | (IROUND(rgba[i][GCOMP] * 15.0F) <<  8)
+                      | (IROUND(rgba[i][BCOMP] * 15.0F) <<  4)
+                      | (IROUND(rgba[i][ACOMP] * 15.0F)      );
             }
          }
          else if (dstFormat == GL_BGRA) {
             GLushort *dst = (GLushort *) dstAddr;
             for (i=0;i<n;i++) {
-               dst[i] = (((GLint) (rgba[i][BCOMP] * 15.0F)) << 12)
-                      | (((GLint) (rgba[i][GCOMP] * 15.0F)) <<  8)
-                      | (((GLint) (rgba[i][RCOMP] * 15.0F)) <<  4)
-                      | (((GLint) (rgba[i][ACOMP] * 15.0F))      );
+               dst[i] = (IROUND(rgba[i][BCOMP] * 15.0F) << 12)
+                      | (IROUND(rgba[i][GCOMP] * 15.0F) <<  8)
+                      | (IROUND(rgba[i][RCOMP] * 15.0F) <<  4)
+                      | (IROUND(rgba[i][ACOMP] * 15.0F)      );
             }
          }
          else if (dstFormat == GL_ABGR_EXT) {
             GLushort *dst = (GLushort *) dstAddr;
             for (i=0;i<n;i++) {
-               dst[i] = (((GLint) (rgba[i][ACOMP] * 15.0F)) << 12)
-                      | (((GLint) (rgba[i][BCOMP] * 15.0F)) <<  8)
-                      | (((GLint) (rgba[i][GCOMP] * 15.0F)) <<  4)
-                      | (((GLint) (rgba[i][RCOMP] * 15.0F))      );
+               dst[i] = (IROUND(rgba[i][ACOMP] * 15.0F) << 12)
+                      | (IROUND(rgba[i][BCOMP] * 15.0F) <<  8)
+                      | (IROUND(rgba[i][GCOMP] * 15.0F) <<  4)
+                      | (IROUND(rgba[i][RCOMP] * 15.0F)      );
             }
          }
          break;
@@ -2447,28 +2447,28 @@ _mesa_pack_rgba_span_float(GLcontext *ctx, GLuint n, GLfloat rgba[][4],
          if (dstFormat == GL_RGBA) {
             GLushort *dst = (GLushort *) dstAddr;
             for (i=0;i<n;i++) {
-               dst[i] = (((GLint) (rgba[i][RCOMP] * 15.0F))      )
-                      | (((GLint) (rgba[i][GCOMP] * 15.0F)) <<  4)
-                      | (((GLint) (rgba[i][BCOMP] * 15.0F)) <<  8)
-                      | (((GLint) (rgba[i][ACOMP] * 15.0F)) << 12);
+               dst[i] = (IROUND(rgba[i][RCOMP] * 15.0F)      )
+                      | (IROUND(rgba[i][GCOMP] * 15.0F) <<  4)
+                      | (IROUND(rgba[i][BCOMP] * 15.0F) <<  8)
+                      | (IROUND(rgba[i][ACOMP] * 15.0F) << 12);
             }
          }
          else if (dstFormat == GL_BGRA) {
             GLushort *dst = (GLushort *) dstAddr;
             for (i=0;i<n;i++) {
-               dst[i] = (((GLint) (rgba[i][BCOMP] * 15.0F))      )
-                      | (((GLint) (rgba[i][GCOMP] * 15.0F)) <<  4)
-                      | (((GLint) (rgba[i][RCOMP] * 15.0F)) <<  8)
-                      | (((GLint) (rgba[i][ACOMP] * 15.0F)) << 12);
+               dst[i] = (IROUND(rgba[i][BCOMP] * 15.0F)      )
+                      | (IROUND(rgba[i][GCOMP] * 15.0F) <<  4)
+                      | (IROUND(rgba[i][RCOMP] * 15.0F) <<  8)
+                      | (IROUND(rgba[i][ACOMP] * 15.0F) << 12);
             }
          }
          else if (dstFormat == GL_ABGR_EXT) {
             GLushort *dst = (GLushort *) dstAddr;
             for (i=0;i<n;i++) {
-               dst[i] = (((GLint) (rgba[i][ACOMP] * 15.0F))      )
-                      | (((GLint) (rgba[i][BCOMP] * 15.0F)) <<  4)
-                      | (((GLint) (rgba[i][GCOMP] * 15.0F)) <<  8)
-                      | (((GLint) (rgba[i][RCOMP] * 15.0F)) << 12);
+               dst[i] = (IROUND(rgba[i][ACOMP] * 15.0F)      )
+                      | (IROUND(rgba[i][BCOMP] * 15.0F) <<  4)
+                      | (IROUND(rgba[i][GCOMP] * 15.0F) <<  8)
+                      | (IROUND(rgba[i][RCOMP] * 15.0F) << 12);
             }
          }
          break;
@@ -2476,28 +2476,28 @@ _mesa_pack_rgba_span_float(GLcontext *ctx, GLuint n, GLfloat rgba[][4],
          if (dstFormat == GL_RGBA) {
             GLushort *dst = (GLushort *) dstAddr;
             for (i=0;i<n;i++) {
-               dst[i] = (((GLint) (rgba[i][RCOMP] * 31.0F)) << 11)
-                      | (((GLint) (rgba[i][GCOMP] * 31.0F)) <<  6)
-                      | (((GLint) (rgba[i][BCOMP] * 31.0F)) <<  1)
-                      | (((GLint) (rgba[i][ACOMP] *  1.0F))      );
+               dst[i] = (IROUND(rgba[i][RCOMP] * 31.0F) << 11)
+                      | (IROUND(rgba[i][GCOMP] * 31.0F) <<  6)
+                      | (IROUND(rgba[i][BCOMP] * 31.0F) <<  1)
+                      | (IROUND(rgba[i][ACOMP] *  1.0F)      );
             }
          }
          else if (dstFormat == GL_BGRA) {
             GLushort *dst = (GLushort *) dstAddr;
             for (i=0;i<n;i++) {
-               dst[i] = (((GLint) (rgba[i][BCOMP] * 31.0F)) << 11)
-                      | (((GLint) (rgba[i][GCOMP] * 31.0F)) <<  6)
-                      | (((GLint) (rgba[i][RCOMP] * 31.0F)) <<  1)
-                      | (((GLint) (rgba[i][ACOMP] *  1.0F))      );
+               dst[i] = (IROUND(rgba[i][BCOMP] * 31.0F) << 11)
+                      | (IROUND(rgba[i][GCOMP] * 31.0F) <<  6)
+                      | (IROUND(rgba[i][RCOMP] * 31.0F) <<  1)
+                      | (IROUND(rgba[i][ACOMP] *  1.0F)      );
             }
          }
          else if (dstFormat == GL_ABGR_EXT) {
             GLushort *dst = (GLushort *) dstAddr;
             for (i=0;i<n;i++) {
-               dst[i] = (((GLint) (rgba[i][ACOMP] * 31.0F)) << 11)
-                      | (((GLint) (rgba[i][BCOMP] * 31.0F)) <<  6)
-                      | (((GLint) (rgba[i][GCOMP] * 31.0F)) <<  1)
-                      | (((GLint) (rgba[i][RCOMP] *  1.0F))      );
+               dst[i] = (IROUND(rgba[i][ACOMP] * 31.0F) << 11)
+                      | (IROUND(rgba[i][BCOMP] * 31.0F) <<  6)
+                      | (IROUND(rgba[i][GCOMP] * 31.0F) <<  1)
+                      | (IROUND(rgba[i][RCOMP] *  1.0F)      );
             }
          }
          break;
@@ -2505,28 +2505,28 @@ _mesa_pack_rgba_span_float(GLcontext *ctx, GLuint n, GLfloat rgba[][4],
          if (dstFormat == GL_RGBA) {
             GLushort *dst = (GLushort *) dstAddr;
             for (i=0;i<n;i++) {
-               dst[i] = (((GLint) (rgba[i][RCOMP] * 31.0F))      )
-                      | (((GLint) (rgba[i][GCOMP] * 31.0F)) <<  5)
-                      | (((GLint) (rgba[i][BCOMP] * 31.0F)) << 10)
-                      | (((GLint) (rgba[i][ACOMP] *  1.0F)) << 15);
+               dst[i] = (IROUND(rgba[i][RCOMP] * 31.0F)      )
+                      | (IROUND(rgba[i][GCOMP] * 31.0F) <<  5)
+                      | (IROUND(rgba[i][BCOMP] * 31.0F) << 10)
+                      | (IROUND(rgba[i][ACOMP] *  1.0F) << 15);
             }
          }
          else if (dstFormat == GL_BGRA) {
             GLushort *dst = (GLushort *) dstAddr;
             for (i=0;i<n;i++) {
-               dst[i] = (((GLint) (rgba[i][BCOMP] * 31.0F))      )
-                      | (((GLint) (rgba[i][GCOMP] * 31.0F)) <<  5)
-                      | (((GLint) (rgba[i][RCOMP] * 31.0F)) << 10)
-                      | (((GLint) (rgba[i][ACOMP] *  1.0F)) << 15);
+               dst[i] = (IROUND(rgba[i][BCOMP] * 31.0F)      )
+                      | (IROUND(rgba[i][GCOMP] * 31.0F) <<  5)
+                      | (IROUND(rgba[i][RCOMP] * 31.0F) << 10)
+                      | (IROUND(rgba[i][ACOMP] *  1.0F) << 15);
             }
          }
          else if (dstFormat == GL_ABGR_EXT) {
             GLushort *dst = (GLushort *) dstAddr;
             for (i=0;i<n;i++) {
-               dst[i] = (((GLint) (rgba[i][ACOMP] * 31.0F))      )
-                      | (((GLint) (rgba[i][BCOMP] * 31.0F)) <<  5)
-                      | (((GLint) (rgba[i][GCOMP] * 31.0F)) << 10)
-                      | (((GLint) (rgba[i][RCOMP] *  1.0F)) << 15);
+               dst[i] = (IROUND(rgba[i][ACOMP] * 31.0F)      )
+                      | (IROUND(rgba[i][BCOMP] * 31.0F) <<  5)
+                      | (IROUND(rgba[i][GCOMP] * 31.0F) << 10)
+                      | (IROUND(rgba[i][RCOMP] *  1.0F) << 15);
             }
          }
          break;
@@ -2534,28 +2534,28 @@ _mesa_pack_rgba_span_float(GLcontext *ctx, GLuint n, GLfloat rgba[][4],
          if (dstFormat == GL_RGBA) {
             GLuint *dst = (GLuint *) dstAddr;
             for (i=0;i<n;i++) {
-               dst[i] = (((GLuint) (rgba[i][RCOMP] * 255.0F)) << 24)
-                      | (((GLuint) (rgba[i][GCOMP] * 255.0F)) << 16)
-                      | (((GLuint) (rgba[i][BCOMP] * 255.0F)) <<  8)
-                      | (((GLuint) (rgba[i][ACOMP] * 255.0F))      );
+               dst[i] = (IROUND(rgba[i][RCOMP] * 255.F) << 24)
+                      | (IROUND(rgba[i][GCOMP] * 255.F) << 16)
+                      | (IROUND(rgba[i][BCOMP] * 255.F) <<  8)
+                      | (IROUND(rgba[i][ACOMP] * 255.F)      );
             }
          }
          else if (dstFormat == GL_BGRA) {
             GLuint *dst = (GLuint *) dstAddr;
             for (i=0;i<n;i++) {
-               dst[i] = (((GLuint) (rgba[i][BCOMP] * 255.0F)) << 24)
-                      | (((GLuint) (rgba[i][GCOMP] * 255.0F)) << 16)
-                      | (((GLuint) (rgba[i][RCOMP] * 255.0F)) <<  8)
-                      | (((GLuint) (rgba[i][ACOMP] * 255.0F))      );
+               dst[i] = (IROUND(rgba[i][BCOMP] * 255.F) << 24)
+                      | (IROUND(rgba[i][GCOMP] * 255.F) << 16)
+                      | (IROUND(rgba[i][RCOMP] * 255.F) <<  8)
+                      | (IROUND(rgba[i][ACOMP] * 255.F)      );
             }
          }
          else if (dstFormat == GL_ABGR_EXT) {
             GLuint *dst = (GLuint *) dstAddr;
             for (i=0;i<n;i++) {
-               dst[i] = (((GLuint) (rgba[i][ACOMP] * 255.0F)) << 24)
-                      | (((GLuint) (rgba[i][BCOMP] * 255.0F)) << 16)
-                      | (((GLuint) (rgba[i][GCOMP] * 255.0F)) <<  8)
-                      | (((GLuint) (rgba[i][RCOMP] * 255.0F))      );
+               dst[i] = (IROUND(rgba[i][ACOMP] * 255.F) << 24)
+                      | (IROUND(rgba[i][BCOMP] * 255.F) << 16)
+                      | (IROUND(rgba[i][GCOMP] * 255.F) <<  8)
+                      | (IROUND(rgba[i][RCOMP] * 255.F)      );
             }
          }
          break;
@@ -2563,28 +2563,28 @@ _mesa_pack_rgba_span_float(GLcontext *ctx, GLuint n, GLfloat rgba[][4],
          if (dstFormat == GL_RGBA) {
             GLuint *dst = (GLuint *) dstAddr;
             for (i=0;i<n;i++) {
-               dst[i] = (((GLuint) (rgba[i][RCOMP] * 255.0F))      )
-                      | (((GLuint) (rgba[i][GCOMP] * 255.0F)) <<  8)
-                      | (((GLuint) (rgba[i][BCOMP] * 255.0F)) << 16)
-                      | (((GLuint) (rgba[i][ACOMP] * 255.0F)) << 24);
+               dst[i] = (IROUND(rgba[i][RCOMP] * 255.0F)      )
+                      | (IROUND(rgba[i][GCOMP] * 255.0F) <<  8)
+                      | (IROUND(rgba[i][BCOMP] * 255.0F) << 16)
+                      | (IROUND(rgba[i][ACOMP] * 255.0F) << 24);
             }
          }
          else if (dstFormat == GL_BGRA) {
             GLuint *dst = (GLuint *) dstAddr;
             for (i=0;i<n;i++) {
-               dst[i] = (((GLuint) (rgba[i][BCOMP] * 255.0F))      )
-                      | (((GLuint) (rgba[i][GCOMP] * 255.0F)) <<  8)
-                      | (((GLuint) (rgba[i][RCOMP] * 255.0F)) << 16)
-                      | (((GLuint) (rgba[i][ACOMP] * 255.0F)) << 24);
+               dst[i] = (IROUND(rgba[i][BCOMP] * 255.0F)      )
+                      | (IROUND(rgba[i][GCOMP] * 255.0F) <<  8)
+                      | (IROUND(rgba[i][RCOMP] * 255.0F) << 16)
+                      | (IROUND(rgba[i][ACOMP] * 255.0F) << 24);
             }
          }
          else if (dstFormat == GL_ABGR_EXT) {
             GLuint *dst = (GLuint *) dstAddr;
             for (i=0;i<n;i++) {
-               dst[i] = (((GLuint) (rgba[i][ACOMP] * 255.0F))      )
-                      | (((GLuint) (rgba[i][BCOMP] * 255.0F)) <<  8)
-                      | (((GLuint) (rgba[i][GCOMP] * 255.0F)) << 16)
-                      | (((GLuint) (rgba[i][RCOMP] * 255.0F)) << 24);
+               dst[i] = (IROUND(rgba[i][ACOMP] * 255.0F)      )
+                      | (IROUND(rgba[i][BCOMP] * 255.0F) <<  8)
+                      | (IROUND(rgba[i][GCOMP] * 255.0F) << 16)
+                      | (IROUND(rgba[i][RCOMP] * 255.0F) << 24);
             }
          }
          break;
@@ -2592,28 +2592,28 @@ _mesa_pack_rgba_span_float(GLcontext *ctx, GLuint n, GLfloat rgba[][4],
          if (dstFormat == GL_RGBA) {
             GLuint *dst = (GLuint *) dstAddr;
             for (i=0;i<n;i++) {
-               dst[i] = (((GLuint) (rgba[i][RCOMP] * 1023.0F)) << 22)
-                      | (((GLuint) (rgba[i][GCOMP] * 1023.0F)) << 12)
-                      | (((GLuint) (rgba[i][BCOMP] * 1023.0F)) <<  2)
-                      | (((GLuint) (rgba[i][ACOMP] *    3.0F))      );
+               dst[i] = (IROUND(rgba[i][RCOMP] * 1023.0F) << 22)
+                      | (IROUND(rgba[i][GCOMP] * 1023.0F) << 12)
+                      | (IROUND(rgba[i][BCOMP] * 1023.0F) <<  2)
+                      | (IROUND(rgba[i][ACOMP] *    3.0F)      );
             }
          }
          else if (dstFormat == GL_BGRA) {
             GLuint *dst = (GLuint *) dstAddr;
             for (i=0;i<n;i++) {
-               dst[i] = (((GLuint) (rgba[i][BCOMP] * 1023.0F)) << 22)
-                      | (((GLuint) (rgba[i][GCOMP] * 1023.0F)) << 12)
-                      | (((GLuint) (rgba[i][RCOMP] * 1023.0F)) <<  2)
-                      | (((GLuint) (rgba[i][ACOMP] *    3.0F))      );
+               dst[i] = (IROUND(rgba[i][BCOMP] * 1023.0F) << 22)
+                      | (IROUND(rgba[i][GCOMP] * 1023.0F) << 12)
+                      | (IROUND(rgba[i][RCOMP] * 1023.0F) <<  2)
+                      | (IROUND(rgba[i][ACOMP] *    3.0F)      );
             }
          }
          else if (dstFormat == GL_ABGR_EXT) {
             GLuint *dst = (GLuint *) dstAddr;
             for (i=0;i<n;i++) {
-               dst[i] = (((GLuint) (rgba[i][ACOMP] * 1023.0F)) << 22)
-                      | (((GLuint) (rgba[i][BCOMP] * 1023.0F)) << 12)
-                      | (((GLuint) (rgba[i][GCOMP] * 1023.0F)) <<  2)
-                      | (((GLuint) (rgba[i][RCOMP] *    3.0F))      );
+               dst[i] = (IROUND(rgba[i][ACOMP] * 1023.0F) << 22)
+                      | (IROUND(rgba[i][BCOMP] * 1023.0F) << 12)
+                      | (IROUND(rgba[i][GCOMP] * 1023.0F) <<  2)
+                      | (IROUND(rgba[i][RCOMP] *    3.0F)      );
             }
          }
          break;
@@ -2621,28 +2621,28 @@ _mesa_pack_rgba_span_float(GLcontext *ctx, GLuint n, GLfloat rgba[][4],
          if (dstFormat == GL_RGBA) {
             GLuint *dst = (GLuint *) dstAddr;
             for (i=0;i<n;i++) {
-               dst[i] = (((GLuint) (rgba[i][RCOMP] * 1023.0F))      )
-                      | (((GLuint) (rgba[i][GCOMP] * 1023.0F)) << 10)
-                      | (((GLuint) (rgba[i][BCOMP] * 1023.0F)) << 20)
-                      | (((GLuint) (rgba[i][ACOMP] *    3.0F)) << 30);
+               dst[i] = (IROUND(rgba[i][RCOMP] * 1023.0F)      )
+                      | (IROUND(rgba[i][GCOMP] * 1023.0F) << 10)
+                      | (IROUND(rgba[i][BCOMP] * 1023.0F) << 20)
+                      | (IROUND(rgba[i][ACOMP] *    3.0F) << 30);
             }
          }
          else if (dstFormat == GL_BGRA) {
             GLuint *dst = (GLuint *) dstAddr;
             for (i=0;i<n;i++) {
-               dst[i] = (((GLuint) (rgba[i][BCOMP] * 1023.0F))      )
-                      | (((GLuint) (rgba[i][GCOMP] * 1023.0F)) << 10)
-                      | (((GLuint) (rgba[i][RCOMP] * 1023.0F)) << 20)
-                      | (((GLuint) (rgba[i][ACOMP] *    3.0F)) << 30);
+               dst[i] = (IROUND(rgba[i][BCOMP] * 1023.0F)      )
+                      | (IROUND(rgba[i][GCOMP] * 1023.0F) << 10)
+                      | (IROUND(rgba[i][RCOMP] * 1023.0F) << 20)
+                      | (IROUND(rgba[i][ACOMP] *    3.0F) << 30);
             }
          }
          else if (dstFormat == GL_ABGR_EXT) {
             GLuint *dst = (GLuint *) dstAddr;
             for (i=0;i<n;i++) {
-               dst[i] = (((GLuint) (rgba[i][ACOMP] * 1023.0F))      )
-                      | (((GLuint) (rgba[i][BCOMP] * 1023.0F)) << 10)
-                      | (((GLuint) (rgba[i][GCOMP] * 1023.0F)) << 20)
-                      | (((GLuint) (rgba[i][RCOMP] *    3.0F)) << 30);
+               dst[i] = (IROUND(rgba[i][ACOMP] * 1023.0F)      )
+                      | (IROUND(rgba[i][BCOMP] * 1023.0F) << 10)
+                      | (IROUND(rgba[i][GCOMP] * 1023.0F) << 20)
+                      | (IROUND(rgba[i][RCOMP] *    3.0F) << 30);
             }
          }
          break;
-- 
cgit v1.2.3


From 65fc2ca82a38bc00ae4223124932af6771765041 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 19 Mar 2009 10:25:24 -0600
Subject: glsl: change GLSL #pragma initialization

Initialize the shader's pragma settings before calling the compiler.
Added pragma "Ignore" fields to allow overriding the #pragma directives found
in shader source code.
---
 src/mesa/main/mtypes.h                   |  3 +++
 src/mesa/shader/shader_api.c             |  9 +++++++++
 src/mesa/shader/slang/slang_compile.c    |  4 +++-
 src/mesa/shader/slang/slang_preprocess.c | 23 ++++++++++-------------
 4 files changed, 25 insertions(+), 14 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 3913828533..5293009454 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1956,6 +1956,8 @@ struct gl_query_state
 /** Set by #pragma directives */
 struct gl_sl_pragmas
 {
+   GLboolean IgnoreOptimize;  /**< ignore #pragma optimize(on/off) ? */
+   GLboolean IgnoreDebug;     /**< ignore #pragma debug(on/off) ? */
    GLboolean Optimize;  /**< defaults on */
    GLboolean Debug;     /**< defaults off */
 };
@@ -2026,6 +2028,7 @@ struct gl_shader_state
    GLboolean EmitComments;              /**< Annotated instructions */
    void *MemPool;
    GLbitfield Flags;                    /**< Mask of GLSL_x flags */
+   struct gl_sl_pragmas DefaultPragmas; /**< Default #pragma settings */
 };
 
 
diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index 9900acc75b..61289db2d2 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -410,6 +410,12 @@ _mesa_init_shader_state(GLcontext * ctx)
    ctx->Shader.EmitCondCodes = GL_FALSE;
    ctx->Shader.EmitComments = GL_FALSE;
    ctx->Shader.Flags = get_shader_flags();
+
+   /* Default pragma settings */
+   ctx->Shader.DefaultPragmas.IgnoreOptimize = GL_FALSE;
+   ctx->Shader.DefaultPragmas.IgnoreDebug = GL_FALSE;
+   ctx->Shader.DefaultPragmas.Optimize = GL_TRUE;
+   ctx->Shader.DefaultPragmas.Debug = GL_FALSE;
 }
 
 
@@ -1444,6 +1450,9 @@ _mesa_compile_shader(GLcontext *ctx, GLuint shaderObj)
    if (!sh)
       return;
 
+   /* set default pragma state for shader */
+   sh->Pragmas = ctx->Shader.DefaultPragmas;
+
    /* this call will set the sh->CompileStatus field to indicate if
     * compilation was successful.
     */
diff --git a/src/mesa/shader/slang/slang_compile.c b/src/mesa/shader/slang/slang_compile.c
index 3f46bfd60d..aa08022869 100644
--- a/src/mesa/shader/slang/slang_compile.c
+++ b/src/mesa/shader/slang/slang_compile.c
@@ -2798,7 +2798,9 @@ _slang_compile(GLcontext *ctx, struct gl_shader *shader)
    shader->CompileStatus = success;
 
    if (success) {
-      _mesa_optimize_program(ctx, shader->Program);
+      if (shader->Pragmas.Optimize) {
+         _mesa_optimize_program(ctx, shader->Program);
+      }
    }
 
    if (ctx->Shader.Flags & GLSL_LOG) {
diff --git a/src/mesa/shader/slang/slang_preprocess.c b/src/mesa/shader/slang/slang_preprocess.c
index 89aaa3a621..ff913ad883 100644
--- a/src/mesa/shader/slang/slang_preprocess.c
+++ b/src/mesa/shader/slang/slang_preprocess.c
@@ -530,14 +530,6 @@ pp_ext_set(pp_ext *self, const char *name, GLboolean enable)
 }
 
 
-static void
-pp_pragmas_init(struct gl_sl_pragmas *pragmas)
-{
-   pragmas->Optimize = GL_TRUE;
-   pragmas->Debug = GL_FALSE;
-}
-
-
 /**
  * Called in response to #pragma.  For example, "#pragma debug(on)" would
  * call this function as pp_pragma("debug", "on").
@@ -553,10 +545,12 @@ pp_pragma(struct gl_sl_pragmas *pragmas, const char *pragma, const char *param)
       if (!param)
          return GL_FALSE; /* missing required param */
       if (_mesa_strcmp(param, "on") == 0) {
-         pragmas->Optimize = GL_TRUE;
+         if (!pragmas->IgnoreOptimize)
+            pragmas->Optimize = GL_TRUE;
       }
       else if (_mesa_strcmp(param, "off") == 0) {
-         pragmas->Optimize = GL_FALSE;
+         if (!pragmas->IgnoreOptimize)
+            pragmas->Optimize = GL_FALSE;
       }
       else {
          return GL_FALSE; /* invalid param */
@@ -566,10 +560,12 @@ pp_pragma(struct gl_sl_pragmas *pragmas, const char *pragma, const char *param)
       if (!param)
          return GL_FALSE; /* missing required param */
       if (_mesa_strcmp(param, "on") == 0) {
-         pragmas->Debug = GL_TRUE;
+         if (!pragmas->IgnoreDebug)
+            pragmas->Debug = GL_TRUE;
       }
       else if (_mesa_strcmp(param, "off") == 0) {
-         pragmas->Debug = GL_FALSE;
+         if (!pragmas->IgnoreDebug)
+            pragmas->Debug = GL_FALSE;
       }
       else {
          return GL_FALSE; /* invalid param */
@@ -945,7 +941,6 @@ preprocess_source (slang_string *output, const char *source,
    }
 
    pp_state_init (&state, elog, extensions);
-   pp_pragmas_init (pragmas);
 
    /* add the predefined symbols to the symbol table */
    for (i = 0; predefined[i]; i++) {
@@ -1296,6 +1291,8 @@ error:
  * \param output  the post-process results
  * \param input  the input text
  * \param elog  log to record warnings, errors
+ * \param extensions  out extension settings
+ * \param pragmas  in/out #pragma settings
  * \return GL_TRUE for success, GL_FALSE for error
  */
 GLboolean
-- 
cgit v1.2.3


From 0be8af8a392541acde3f8791a754a260b877ac17 Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@vmware.com>
Date: Tue, 24 Mar 2009 22:59:20 +0000
Subject: mesa: bump MAX_PROGRAM_TEMPS to 256 (there's some big shaders out
 there)

---
 src/mesa/main/config.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index fc31155b35..2a9fdf9ca0 100644
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -184,7 +184,7 @@
 #define MAX_PROGRAM_MATRICES 8
 #define MAX_PROGRAM_MATRIX_STACK_DEPTH 4
 #define MAX_PROGRAM_CALL_DEPTH 8
-#define MAX_PROGRAM_TEMPS 128
+#define MAX_PROGRAM_TEMPS 256
 #define MAX_PROGRAM_ADDRESS_REGS 2
 #define MAX_UNIFORMS 1024  /**< number of vec4 uniforms */
 #define MAX_VARYING 8      /**< number of float[4] vectors */
-- 
cgit v1.2.3


From c6a6cc191813e8343a17b028146a34f193a6ce44 Mon Sep 17 00:00:00 2001
From: Roland Scheidegger <sroland@vmware.com>
Date: Fri, 27 Mar 2009 19:39:52 +0100
Subject: mesa: add new signed rgba texture format

This is a (partial) backport of the signed texture format support in OGL 3.1.
Since it wasn't promoted from an existing extension roll our own.
---
 docs/MESA_texture_signed_rgba.spec        | 214 ++++++++++++++++++++++++++++++
 docs/extensions.html                      |   1 +
 src/mesa/glapi/gl_API.xml                 |   6 +
 src/mesa/main/colortab.c                  |   2 +-
 src/mesa/main/convolve.c                  |   6 +-
 src/mesa/main/extensions.c                |   1 +
 src/mesa/main/histogram.c                 |   2 +-
 src/mesa/main/image.c                     |  17 +--
 src/mesa/main/image.h                     |   2 +-
 src/mesa/main/macros.h                    |  22 +++
 src/mesa/main/mipmap.c                    | 111 ++++++++++++++--
 src/mesa/main/mtypes.h                    |   1 +
 src/mesa/main/texformat.c                 |  44 +++++-
 src/mesa/main/texformat.h                 |   4 +-
 src/mesa/main/texformat_tmp.h             |  22 +++
 src/mesa/main/teximage.c                  |  13 ++
 src/mesa/main/texstore.c                  | 127 +++++++++++++++++-
 src/mesa/main/texstore.h                  |   1 +
 src/mesa/state_tracker/st_cb_readpixels.c |   2 +-
 src/mesa/swrast/s_readpix.c               |   4 +-
 20 files changed, 557 insertions(+), 45 deletions(-)
 create mode 100644 docs/MESA_texture_signed_rgba.spec

(limited to 'src/mesa/main')

diff --git a/docs/MESA_texture_signed_rgba.spec b/docs/MESA_texture_signed_rgba.spec
new file mode 100644
index 0000000000..49c8e9e5dd
--- /dev/null
+++ b/docs/MESA_texture_signed_rgba.spec
@@ -0,0 +1,214 @@
+Name
+
+    MESA_texture_signed_rgba
+
+Name Strings
+
+    GL_MESA_texture_signed_rgba
+
+Contact
+
+
+
+Notice
+
+
+
+IP Status
+
+    No known IP issues
+
+Status
+
+
+
+Version
+
+    0.3, 2009-03-24
+
+Number
+
+    Not assigned ?
+
+Dependencies
+
+    Written based on the wording of the OpenGL 2.0 specification.
+
+    This extension trivially interacts with ARB_texture_float.
+    This extension shares some language with ARB_texture_compression_rgtc
+    but does not depend on it.
+
+Overview
+
+    OpenGL prior to 3.1 does not support any signed texture formats.
+    ARB_texture_compression_rgtc introduces some compressed red and
+    red_green signed formats but no uncompressed ones, which might
+    still be useful. NV_texture_shader adds signed texture formats,
+    but also a lot of functionality which has been superceded by fragment
+    shaders.
+    It is usually possible to get the same functionality
+    using a unsigned format by doing scale and bias in a shader, but this
+    is undesirable since modern hardware has direct support for this.
+    This extension adds a signed 4-channel texture format by backporting
+    the relevant features from OpenGL 3.1, as a means to support this in
+    OpenGL implementations only supporting older versions.
+
+Issues
+
+    1) What should this extension be called?
+
+       RESOLVED: MESA_texture_signed_rgba seems reasonable.
+       The rgba part is there because only 4 channel format is supported.
+
+
+    2) Should the full set of signed formats (alpha, luminance, rgb, etc.)
+       be supported?
+
+       RESOLVED: NO. To keep this extension simple, only add the most
+       universal format, rgba. alpha/luminance can't be trivially supported
+       since OpenGL 3.1 does not support them any longer, and there is some
+       implied dependency on ARB_texture_rg for red/red_green formats so
+       avoid all this. Likewise, only 8 bits per channel is supported.
+
+
+    3) Should this extension use new enums for the texture formats?
+
+       RESOLVED: NO. Same enums as those used in OpenGL 3.1.
+
+
+    4) How are signed integer values mapped to floating-point values?
+
+       RESOLVED: Same as described in issue 5) of
+       ARB_texture_compression_rgtc (quote):
+       A signed 8-bit two's complement value X is computed to
+       a floating-point value Xf with the formula:
+
+                { X / 127.0, X > -128
+           Xf = {
+                { -1.0,      X == -128
+
+       This conversion means -1, 0, and +1 are all exactly representable,
+       however -128 and -127 both map to -1.0.  Mapping -128 to -1.0
+       avoids the numerical awkwardness of have a representable value
+       slightly more negative than -1.0.
+
+       This conversion is intentionally NOT the "byte" conversion listed
+       in Table 2.9 for component conversions.  That conversion says:
+
+           Xf = (2*X + 1) / 255.0
+
+       The Table 2.9 conversion is incapable of exactly representing
+       zero.
+
+       (Difference to ARB_texture_compression_rgtc):
+       This is the same mapping as OpenGL 3.1 uses.
+       This is also different to what NV_texture_shader used.
+       The above mapping should be considered the reference, but there
+       is some leeway so other mappings are allowed for implementations which
+       cannot do this. Particulary the mapping given in NV_texture_shader or
+       the standard OpenGL byte/float mapping is considered acceptable too, as
+       might be a mapping which represents -1.0 by -128, 0.0 by 0 and 1.0 by
+       127 (that is, uses different scale factors for negative and positive
+       numbers).
+       Also, it is ok to store incoming GL_BYTE user data as-is, without
+       converting to GL_FLOAT (using the standard OpenGL float/byte mapping)
+       and converting back (using the mapping described here).
+       Other than those subtle issues there are no other non-standard
+       conversions used, so when using for instance CopyTexImage2D with
+       a framebuffer clamped to [0,1] all converted numbers will be in the range
+       [0, 127] (and not scaled and biased).
+
+
+    5) How will signed components resulting from RGBA8_SNORM texture
+       fetches interact with fragment coloring?
+
+       RESOLVED: Same as described in issue 6) of
+       ARB_texture_compression_rgtc (quote):
+       The specification language for this extension is silent
+       about clamping behavior leaving this to the core specification
+       and other extensions.  The clamping or lack of clamping is left
+       to the core specification and other extensions.
+
+       For assembly program extensions supporting texture fetches
+       (ARB_fragment_program, NV_fragment_program, NV_vertex_program3,
+       etc.) or the OpenGL Shading Language, these signed formats will
+       appear as expected with unclamped signed components as a result
+       of a texture fetch instruction.
+
+       If ARB_color_buffer_float is supported, its clamping controls
+       will apply.
+
+       NV_texture_shader extension, if supported, adds support for
+       fixed-point textures with signed components and relaxed the
+       fixed-function texture environment clamping appropriately.  If the
+       NV_texture_shader extension is supported, its specified behavior
+       for the texture environment applies where intermediate values
+       are clamped to [-1,1] unless stated otherwise as in the case
+       of explicitly clamped to [0,1] for GL_COMBINE.  or clamping the
+       linear interpolation weight to [0,1] for GL_DECAL and GL_BLEND.
+
+       Otherwise, the conventional core texture environment clamps
+       incoming, intermediate, and output color components to [0,1].
+
+       This implies that the conventional texture environment
+       functionality of unextended OpenGL 1.5 or OpenGL 2.0 without
+       using GLSL (and with none of the extensions referred to above)
+       is unable to make proper use of the signed texture formats added
+       by this extension because the conventional texture environment
+       requires texture source colors to be clamped to [0,1].  Texture
+       filtering of these signed formats would be still signed, but
+       negative values generated post-filtering would be clamped to
+       zero by the core texture environment functionality.  The
+       expectation is clearly that this extension would be co-implemented
+       with one of the previously referred to extensions or used with
+       GLSL for the new signed formats to be useful.
+
+
+    6) Should the RGBA_SNORM tokens also be accepted by CopyTexImage
+       functions?
+
+       RESOLVED: YES.
+
+
+    7) What to do with GetTexParameter if ARB_texture_float is supported,
+       in particular what datatype should this return for TEXTURE_RED_TYPE_ARB,
+       TEXTURE_GREEN_TYPE_ARB, TEXTURE_BLUE_TYPE_ARB, TEXTURE_ALPHA_TYPE_ARB?
+
+       RESOLVED: ARB_texture_float states type is either NONE,
+       UNSIGNED_NORMALIZED_ARB, or FLOAT. This extension adds a new enum,
+       SIGNED_NORMALIZED, which will be returned accordingly. This is the
+       same behaviour as in OpenGL 3.1.
+
+
+New Tokens
+
+
+    Accepted by the <internalformat> parameter of
+    TexImage1D, TexImage2D, TexImage3D, CopyTexImage1D, and CopyTexImage2D:
+
+        RGBA_SNORM                                0x8F93
+        RGBA8_SNORM                               0x8F97
+
+    Returned by the <params> parameter of GetTexLevelParameter:
+
+        SIGNED_NORMALIZED                         0x8F9C
+
+
+Additions to Chapter 3 of the OpenGL 2.0 Specification (Rasterization):
+
+ -- Section 3.8.1, Texture Image Specification
+
+    Add to Table 3.16 (page 154): Sized internal formats
+
+    Sized             Base             R    G    B    A    L    I    D
+    Internal Format   Internal Format bits bits bits bits bits bits bits
+    ---------------   --------------- ---- ---- ---- ---- ---- ---- ----
+    RGBA8_SNORM       RGBA             8    8    8    8    0    0    0
+
+
+Dependencies on ARB_texture_float extension:
+
+    If ARB_texture_float is supported, GetTexParameter queries with <value>
+    of TEXTURE_RED_TYPE_ARB, TEXTURE_GREEN_TYPE_ARB, TEXTURE_BLUE_TYPE_ARB or
+    TEXTURE_ALPHA_TYPE_ARB return SIGNED_NORMALIZED if
+    the base internal format is RGBA_SNORM.
diff --git a/docs/extensions.html b/docs/extensions.html
index dbb8ebadaf..91ed20e5ce 100644
--- a/docs/extensions.html
+++ b/docs/extensions.html
@@ -24,6 +24,7 @@ The specifications follow.
 <LI><A HREF="MESA_resize_buffers.spec">MESA_resize_buffers.spec</A>
 <LI><A HREF="MESA_set_3dfx_mode.spec">MESA_set_3dfx_mode.spec</A>
 <LI><A HREF="MESA_sprite_point.spec">MESA_sprite_point.spec</A> (obsolete)
+<LI><A HREF="MESA_texture_signed_rgba.spec">MESA_texture_signed_rgba.spec</A>
 <LI><A HREF="MESA_trace.spec">MESA_trace.spec</A> (obsolete)
 <LI><A HREF="MESA_window_pos.spec">MESA_window_pos.spec</A>
 <LI><A HREF="MESA_ycbcr_texture.spec">MESA_ycbcr_texture.spec</A>
diff --git a/src/mesa/glapi/gl_API.xml b/src/mesa/glapi/gl_API.xml
index cc3e3ae6bf..ef774f2e60 100644
--- a/src/mesa/glapi/gl_API.xml
+++ b/src/mesa/glapi/gl_API.xml
@@ -12326,6 +12326,12 @@
     </function>
 </category>
 
+<category name="GL_MESA_texture_signed_rgba">
+    <enum name="SIGNED_NORMALIZED"                        value="0x8F9C"/>
+    <enum name="RGBA_SNORM"                               value="0x8F93"/>
+    <enum name="RGBA8_SNORM"                              value="0x8F97"/>
+</category>
+
 <category name="GL_MESA_shader_debug">
     <enum name="DEBUG_OBJECT_MESA"                        value="0x8759"/>
     <enum name="DEBUG_PRINT_MESA"                         value="0x875A"/>
diff --git a/src/mesa/main/colortab.c b/src/mesa/main/colortab.c
index bd9cf438b4..b05c0513aa 100644
--- a/src/mesa/main/colortab.c
+++ b/src/mesa/main/colortab.c
@@ -718,7 +718,7 @@ _mesa_GetColorTable( GLenum target, GLenum format,
    }
 
    _mesa_pack_rgba_span_float(ctx, table->Size, rgba,
-                              format, type, data, &ctx->Pack, 0x0);
+                              format, type, data, &ctx->Pack, 0x0, GL_FALSE);
 
    if (ctx->Pack.BufferObj->Name) {
       ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
diff --git a/src/mesa/main/convolve.c b/src/mesa/main/convolve.c
index 814c6a0a5a..63b652bf70 100644
--- a/src/mesa/main/convolve.c
+++ b/src/mesa/main/convolve.c
@@ -626,7 +626,7 @@ _mesa_GetConvolutionFilter(GLenum target, GLenum format, GLenum type,
                                           row, 0);
       GLfloat (*src)[4] = (GLfloat (*)[4]) (filter->Filter + row * filter->Width * 4);
       _mesa_pack_rgba_span_float(ctx, filter->Width, src,
-                                 format, type, dst, &ctx->Pack, 0x0);
+                                 format, type, dst, &ctx->Pack, 0x0, GL_FALSE);
    }
 
    if (ctx->Pack.BufferObj->Name) {
@@ -836,7 +836,7 @@ _mesa_GetSeparableFilter(GLenum target, GLenum format, GLenum type,
                                           format, type, 0);
       _mesa_pack_rgba_span_float(ctx, filter->Width,
                                  (GLfloat (*)[4]) filter->Filter,
-                                 format, type, dst, &ctx->Pack, 0x0);
+                                 format, type, dst, &ctx->Pack, 0x0, GL_FALSE);
    }
 
    /* Column filter */
@@ -845,7 +845,7 @@ _mesa_GetSeparableFilter(GLenum target, GLenum format, GLenum type,
                                           format, type, 0);
       GLfloat (*src)[4] = (GLfloat (*)[4]) (filter->Filter + colStart);
       _mesa_pack_rgba_span_float(ctx, filter->Height, src,
-                                 format, type, dst, &ctx->Pack, 0x0);
+                                 format, type, dst, &ctx->Pack, 0x0, GL_FALSE);
    }
 
    (void) span;  /* unused at this time */
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 2d2bf51784..147d923e64 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -150,6 +150,7 @@ static const struct {
    { OFF, "GL_MESA_packed_depth_stencil",      F(MESA_packed_depth_stencil) },
    { OFF, "GL_MESA_resize_buffers",            F(MESA_resize_buffers) },
    { OFF, "GL_MESA_texture_array",             F(MESA_texture_array) },
+   { OFF, "GL_MESA_texture_signed_rgba",       F(MESA_texture_signed_rgba) },
    { OFF, "GL_MESA_ycbcr_texture",             F(MESA_ycbcr_texture) },
    { ON,  "GL_MESA_window_pos",                F(ARB_window_pos) },
    { OFF, "GL_NV_blend_square",                F(NV_blend_square) },
diff --git a/src/mesa/main/histogram.c b/src/mesa/main/histogram.c
index 905c1ad830..febf8d99c4 100644
--- a/src/mesa/main/histogram.c
+++ b/src/mesa/main/histogram.c
@@ -684,7 +684,7 @@ _mesa_GetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvo
       minmax[1][BCOMP] = CLAMP(ctx->MinMax.Max[BCOMP], 0.0F, 1.0F);
       minmax[1][ACOMP] = CLAMP(ctx->MinMax.Max[ACOMP], 0.0F, 1.0F);
       _mesa_pack_rgba_span_float(ctx, 2, minmax,
-                                 format, type, values, &ctx->Pack, 0x0);
+                                 format, type, values, &ctx->Pack, 0x0, GL_FALSE);
    }
 
    if (ctx->Pack.BufferObj->Name) {
diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index fa3149d56d..44972ae8e2 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -1686,24 +1686,13 @@ _mesa_pack_rgba_span_float(GLcontext *ctx, GLuint n, GLfloat rgba[][4],
                            GLenum dstFormat, GLenum dstType,
                            GLvoid *dstAddr,
                            const struct gl_pixelstore_attrib *dstPacking,
-                           GLbitfield transferOps)
+                           GLbitfield transferOps, GLboolean noClamp)
 {
    GLfloat luminance[MAX_WIDTH];
    const GLint comps = _mesa_components_in_format(dstFormat);
    GLuint i;
-   /* clamping only applies to colors, not the dudv values, but still need
-      it if converting to unsigned values (which doesn't make much sense) */
-   if (dstFormat == GL_DUDV_ATI || dstFormat == GL_DU8DV8_ATI) {
-      switch (dstType) {
-         case GL_UNSIGNED_BYTE:
-         case GL_UNSIGNED_SHORT:
-         case GL_UNSIGNED_INT:
-            transferOps |= IMAGE_CLAMP_BIT;
-            break;
-            /* actually might want clamp to [-1,1] otherwise but shouldn't matter? */
-      }
-   }
-   else if (dstType != GL_FLOAT || ctx->Color.ClampReadColor == GL_TRUE) {
+
+   if ((!noClamp) && (dstType != GL_FLOAT || ctx->Color.ClampReadColor == GL_TRUE)) {
       /* need to clamp to [0, 1] */
       transferOps |= IMAGE_CLAMP_BIT;
    }
diff --git a/src/mesa/main/image.h b/src/mesa/main/image.h
index b26c27e5a8..fb7a5c0e90 100644
--- a/src/mesa/main/image.h
+++ b/src/mesa/main/image.h
@@ -178,7 +178,7 @@ extern void
 _mesa_pack_rgba_span_float( GLcontext *ctx, GLuint n, GLfloat rgba[][4],
                             GLenum dstFormat, GLenum dstType, GLvoid *dstAddr,
                             const struct gl_pixelstore_attrib *dstPacking,
-                            GLbitfield transferOps );
+                            GLbitfield transferOps, GLboolean noClamp );
 
 
 extern void
diff --git a/src/mesa/main/macros.h b/src/mesa/main/macros.h
index bfd740870e..01d59dd42d 100644
--- a/src/mesa/main/macros.h
+++ b/src/mesa/main/macros.h
@@ -54,12 +54,20 @@ extern GLfloat _mesa_ubyte_to_float_color_tab[256];
 #define FLOAT_TO_BYTE(X)    ( (((GLint) (255.0F * (X))) - 1) / 2 )
 
 
+/** Convert GLbyte in [-128,127] to GLfloat in [-1.0,1.0], texture/fb data */
+#define BYTE_TO_FLOAT_TEX(B)    ((B) == -128 ? -1.0 : (B) * (1.0F/127.0F))
+
+/** Convert GLfloat in [-1.0,1.0] to GLbyte in [-128,127], texture/fb data */
+#define FLOAT_TO_BYTE_TEX(X)    ( (GLint) (127.0F * (X)) )
+
+
 /** Convert GLushort in [0,65535] to GLfloat in [0.0,1.0] */
 #define USHORT_TO_FLOAT(S)  ((GLfloat) (S) * (1.0F / 65535.0F))
 
 /** Convert GLfloat in [0.0,1.0] to GLushort in [0, 65535] */
 #define FLOAT_TO_USHORT(X)   ((GLuint) ((X) * 65535.0))
 
+
 /** Convert GLshort in [-32768,32767] to GLfloat in [-1.0,1.0] */
 #define SHORT_TO_FLOAT(S)   ((2.0F * (S) + 1.0F) * (1.0F/65535.0F))
 
@@ -67,6 +75,13 @@ extern GLfloat _mesa_ubyte_to_float_color_tab[256];
 #define FLOAT_TO_SHORT(X)   ( (((GLint) (65535.0F * (X))) - 1) / 2 )
 
 
+/** Convert GLshort in [-32768,32767] to GLfloat in [-1.0,1.0], texture/fb data */
+#define SHORT_TO_FLOAT_TEX(S)    ((S) == -32768 ? -1.0 : (S) * (1.0F/32767.0F))
+
+/** Convert GLfloat in [-1.0,1.0] to GLshort in [-32768,32767], texture/fb data */
+#define FLOAT_TO_SHORT_TEX(X)    ( (GLint) (32767.0F * (X)) )
+
+
 /** Convert GLuint in [0,4294967295] to GLfloat in [0.0,1.0] */
 #define UINT_TO_FLOAT(U)    ((GLfloat) (U) * (1.0F / 4294967295.0F))
 
@@ -85,6 +100,13 @@ extern GLfloat _mesa_ubyte_to_float_color_tab[256];
 #define FLOAT_TO_INT(X)     ( (GLint) (2147483647.0 * (X)) )
 
 
+/** Convert GLint in [-2147483648,2147483647] to GLfloat in [-1.0,1.0], texture/fb data */
+#define INT_TO_FLOAT_TEX(I)    ((I) == -2147483648 ? -1.0 : (I) * (1.0F/2147483647.0))
+
+/** Convert GLfloat in [-1.0,1.0] to GLint in [-2147483648,2147483647], texture/fb data */
+#define FLOAT_TO_INT_TEX(X)    ( (GLint) (2147483647.0F * (X)) )
+
+
 #define BYTE_TO_UBYTE(b)   ((GLubyte) ((b) < 0 ? 0 : (GLubyte) (b)))
 #define SHORT_TO_UBYTE(s)  ((GLubyte) ((s) < 0 ? 0 : (GLubyte) ((s) >> 7)))
 #define USHORT_TO_UBYTE(s) ((GLubyte) ((s) >> 8))
diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index 4a79430c34..7001211a13 100644
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -86,6 +86,21 @@ bytes_per_pixel(GLenum datatype, GLuint comps)
                                 rowD[j][e], rowD[k][e]); \
    } while(0)
 
+#define FILTER_SUM_3D_SIGNED(Aj, Ak, Bj, Bk, Cj, Ck, Dj, Dk) \
+   (Aj + Ak \
+    + Bj + Bk \
+    + Cj + Ck \
+    + Dj + Dk \
+    + 4) / 8
+
+#define FILTER_3D_SIGNED(e) \
+   do { \
+      dst[i][e] = FILTER_SUM_3D_SIGNED(rowA[j][e], rowA[k][e], \
+                                       rowB[j][e], rowB[k][e], \
+                                       rowC[j][e], rowC[k][e], \
+                                       rowD[j][e], rowD[k][e]); \
+   } while(0)
+
 #define FILTER_F_3D(e) \
    do { \
       dst[i][e] = (rowA[j][e] + rowA[k][e] \
@@ -180,6 +195,53 @@ do_row(GLenum datatype, GLuint comps, GLint srcWidth,
       }
    }
 
+   if (datatype == GL_BYTE && comps == 4) {
+      GLuint i, j, k;
+      const GLbyte(*rowA)[4] = (const GLbyte(*)[4]) srcRowA;
+      const GLbyte(*rowB)[4] = (const GLbyte(*)[4]) srcRowB;
+      GLbyte(*dst)[4] = (GLbyte(*)[4]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;
+         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;
+         dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;
+         dst[i][3] = (rowA[j][3] + rowA[k][3] + rowB[j][3] + rowB[k][3]) / 4;
+      }
+   }
+   else if (datatype == GL_BYTE && comps == 3) {
+      GLuint i, j, k;
+      const GLbyte(*rowA)[3] = (const GLbyte(*)[3]) srcRowA;
+      const GLbyte(*rowB)[3] = (const GLbyte(*)[3]) srcRowB;
+      GLbyte(*dst)[3] = (GLbyte(*)[3]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;
+         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;
+         dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;
+      }
+   }
+   else if (datatype == GL_BYTE && comps == 2) {
+      GLuint i, j, k;
+      const GLbyte(*rowA)[2] = (const GLbyte(*)[2]) srcRowA;
+      const GLbyte(*rowB)[2] = (const GLbyte(*)[2]) srcRowB;
+      GLbyte(*dst)[2] = (GLbyte(*)[2]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;
+         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;
+      }
+   }
+   else if (datatype == GL_BYTE && comps == 1) {
+      GLuint i, j, k;
+      const GLbyte *rowA = (const GLbyte *) srcRowA;
+      const GLbyte *rowB = (const GLbyte *) srcRowB;
+      GLbyte *dst = (GLbyte *) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i] = (rowA[j] + rowA[k] + rowB[j] + rowB[k]) / 4;
+      }
+   }
+
    else if (datatype == GL_UNSIGNED_SHORT && comps == 4) {
       GLuint i, j, k;
       const GLushort(*rowA)[4] = (const GLushort(*)[4]) srcRowA;
@@ -470,17 +532,6 @@ do_row(GLenum datatype, GLuint comps, GLint srcWidth,
          dst[i] = (blue << 5) | (green << 2) | red;
       }
    }
-   else if (datatype == GL_BYTE && comps == 2) {
-      GLuint i, j, k;
-      const GLbyte(*rowA)[2] = (const GLbyte(*)[2]) srcRowA;
-      const GLbyte(*rowB)[2] = (const GLbyte(*)[2]) srcRowB;
-      GLbyte(*dst)[2] = (GLbyte(*)[2]) dstRow;
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) >> 2;
-         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) >> 2;
-      }
-   }
    else {
       _mesa_problem(NULL, "bad format in do_row()");
    }
@@ -555,6 +606,44 @@ do_row_3D(GLenum datatype, GLuint comps, GLint srcWidth,
          FILTER_3D(0);
       }
    }
+   if ((datatype == GL_BYTE) && (comps == 4)) {
+      DECLARE_ROW_POINTERS(GLbyte, 4);
+
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         FILTER_3D_SIGNED(0);
+         FILTER_3D_SIGNED(1);
+         FILTER_3D_SIGNED(2);
+         FILTER_3D_SIGNED(3);
+      }
+   }
+   else if ((datatype == GL_BYTE) && (comps == 3)) {
+      DECLARE_ROW_POINTERS(GLbyte, 3);
+
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         FILTER_3D_SIGNED(0);
+         FILTER_3D_SIGNED(1);
+         FILTER_3D_SIGNED(2);
+      }
+   }
+   else if ((datatype == GL_BYTE) && (comps == 2)) {
+      DECLARE_ROW_POINTERS(GLbyte, 2);
+
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         FILTER_3D_SIGNED(0);
+         FILTER_3D_SIGNED(1);
+       }
+   }
+   else if ((datatype == GL_BYTE) && (comps == 1)) {
+      DECLARE_ROW_POINTERS(GLbyte, 1);
+
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         FILTER_3D_SIGNED(0);
+      }
+   }
    else if ((datatype == GL_UNSIGNED_SHORT) && (comps == 4)) {
       DECLARE_ROW_POINTERS(GLushort, 4);
 
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 5293009454..a5d3be3543 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2503,6 +2503,7 @@ struct gl_extensions
    GLboolean MESA_resize_buffers;
    GLboolean MESA_ycbcr_texture;
    GLboolean MESA_texture_array;
+   GLboolean MESA_texture_signed_rgba;
    GLboolean NV_blend_square;
    GLboolean NV_fragment_program;
    GLboolean NV_light_max_exponent;
diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c
index c372b49398..0ceaaf3ece 100644
--- a/src/mesa/main/texformat.c
+++ b/src/mesa/main/texformat.c
@@ -699,9 +699,7 @@ const struct gl_texture_format _mesa_texformat_intensity_float16 = {
 const struct gl_texture_format _mesa_texformat_dudv8 = {
    MESA_FORMAT_DUDV8,			/* MesaFormat */
    GL_DUDV_ATI,				/* BaseFormat */
-   /* FIXME: spec doesn't say since that parameter didn't exist then,
-      but this should be something like SIGNED_NORMALIZED */
-   GL_UNSIGNED_NORMALIZED_ARB,		/* DataType */
+   GL_SIGNED_NORMALIZED,		/* DataType */
    /* maybe should add dudvBits field, but spec seems to be
       lacking the ability to query with GetTexLevelParameter anyway */
    0,					/* RedBits */
@@ -724,6 +722,30 @@ const struct gl_texture_format _mesa_texformat_dudv8 = {
    NULL					/* StoreTexel */
 };
 
+const struct gl_texture_format _mesa_texformat_signed_rgba8888 = {
+   MESA_FORMAT_SIGNED_RGBA8888,		/* MesaFormat */
+   GL_RGBA,				/* BaseFormat */
+   GL_SIGNED_NORMALIZED,		/* DataType */
+   8,					/* RedBits */
+   8,					/* GreenBits */
+   8,					/* BlueBits */
+   8,					/* AlphaBits */
+   0,					/* LuminanceBits */
+   0,					/* IntensityBits */
+   0,					/* IndexBits */
+   0,					/* DepthBits */
+   0,					/* StencilBits */
+   4,					/* TexelBytes */
+   _mesa_texstore_signed_rgba8888,	/* StoreTexImageFunc */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel2D */
+   NULL,				/* FetchTexel3D */
+   fetch_texel_1d_signed_rgba8888,	/* FetchTexel1Df */
+   fetch_texel_2d_signed_rgba8888,	/* FetchTexel2Df */
+   fetch_texel_3d_signed_rgba8888,	/* FetchTexel3Df */
+   store_texel_signed_rgba8888		/* StoreTexel */
+};
+
 /*@}*/
 
 
@@ -1671,6 +1693,17 @@ _mesa_choose_tex_format( GLcontext *ctx, GLint internalFormat,
       }
    }
 
+   if (ctx->Extensions.MESA_texture_signed_rgba) {
+      switch (internalFormat) {
+         case GL_RGBA_SNORM:
+         case GL_RGBA8_SNORM:
+            return &_mesa_texformat_signed_rgba8888;
+         default:
+            ; /* fallthrough */
+      }
+   }
+
+
 #if FEATURE_EXT_texture_sRGB
    if (ctx->Extensions.EXT_texture_sRGB) {
       switch (internalFormat) {
@@ -1820,6 +1853,11 @@ _mesa_format_to_type_and_comps(const struct gl_texture_format *format,
       *comps = 2;
       return;
 
+   case MESA_FORMAT_SIGNED_RGBA8888:
+      *datatype = GL_BYTE;
+      *comps = 4;
+      return;
+
 #if FEATURE_EXT_texture_sRGB
    case MESA_FORMAT_SRGB8:
       *datatype = GL_UNSIGNED_BYTE;
diff --git a/src/mesa/main/texformat.h b/src/mesa/main/texformat.h
index 7fa70ad4fe..3a08339adf 100644
--- a/src/mesa/main/texformat.h
+++ b/src/mesa/main/texformat.h
@@ -168,7 +168,8 @@ enum _format {
     * \name Signed fixed point texture formats.
     */
    /*@{*/
-   MESA_FORMAT_DUDV8
+   MESA_FORMAT_DUDV8,
+   MESA_FORMAT_SIGNED_RGBA8888
    /*@}*/
 };
 
@@ -219,6 +220,7 @@ extern const struct gl_texture_format _mesa_texformat_intensity_float16;
 /** Signed fixed point texture formats */
 /*@{*/
 extern const struct gl_texture_format _mesa_texformat_dudv8;
+extern const struct gl_texture_format _mesa_texformat_signed_rgba8888;
 /*@}*/
 
 /** \name Assorted hardware-friendly formats */
diff --git a/src/mesa/main/texformat_tmp.h b/src/mesa/main/texformat_tmp.h
index 0f6a172ef0..604b1a744c 100644
--- a/src/mesa/main/texformat_tmp.h
+++ b/src/mesa/main/texformat_tmp.h
@@ -1321,6 +1321,28 @@ static void FETCH(dudv8)(const struct gl_texture_image *texImage,
    texel[ACOMP] = 0;
 }
 
+/* MESA_FORMAT_SIGNED_ARGB8888 ***********************************************/
+
+static void FETCH(signed_rgba8888)( const struct gl_texture_image *texImage,
+			            GLint i, GLint j, GLint k, GLfloat *texel )
+{
+   const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
+   texel[RCOMP] = BYTE_TO_FLOAT_TEX( (s >> 24)        );
+   texel[GCOMP] = BYTE_TO_FLOAT_TEX( (s >> 16) & 0xff );
+   texel[BCOMP] = BYTE_TO_FLOAT_TEX( (s >>  8) & 0xff );
+   texel[ACOMP] = BYTE_TO_FLOAT_TEX( (s      ) & 0xff );
+}
+
+#if DIM == 3
+static void store_texel_signed_rgba8888(struct gl_texture_image *texImage,
+                                        GLint i, GLint j, GLint k, const void *texel)
+{
+   const GLbyte *rgba = (const GLbyte *) texel;
+   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
+   *dst = PACK_COLOR_8888(rgba[RCOMP], rgba[GCOMP], rgba[BCOMP], rgba[ACOMP]);
+}
+#endif
+
 
 /* MESA_FORMAT_YCBCR *********************************************************/
 
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 4f297738df..8c03c36c75 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -349,6 +349,15 @@ _mesa_base_tex_format( GLcontext *ctx, GLint internalFormat )
       }
    }
 
+   if (ctx->Extensions.MESA_texture_signed_rgba) {
+      switch (internalFormat) {
+         case GL_RGBA_SNORM:
+         case GL_RGBA8_SNORM:
+            return GL_RGBA;
+         default:
+            ; /* fallthrough */
+      }
+   }
 
    if (ctx->Extensions.EXT_packed_depth_stencil) {
       switch (internalFormat) {
@@ -502,6 +511,10 @@ _mesa_is_color_format(GLenum format)
       case GL_COMPRESSED_SLUMINANCE_ALPHA_EXT:
 #endif /* FEATURE_EXT_texture_sRGB */
          return GL_TRUE;
+      /* signed texture formats */
+      case GL_RGBA_SNORM:
+      case GL_RGBA8_SNORM:
+         return GL_TRUE;
       case GL_YCBCR_MESA:  /* not considered to be RGB */
          /* fall-through */
       default:
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index cc3c6958c7..785fb50622 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -417,7 +417,7 @@ make_temp_float_image(GLcontext *ctx, GLuint dims,
                                           (GLfloat (*)[4]) src,
                                           logicalBaseFormat, GL_FLOAT,
                                           dst, &ctx->DefaultPacking,
-                                          postConvTransferOps);
+                                          postConvTransferOps, GL_FALSE);
                src += convWidth * 4;
                dst += convWidth * logComponents;
             }
@@ -798,6 +798,7 @@ static const GLubyte *
 type_mapping( GLenum srcType )
 {
    switch (srcType) {
+   case GL_BYTE:
    case GL_UNSIGNED_BYTE:
       return map_identity;
    case GL_UNSIGNED_INT_8_8_8_8:
@@ -819,6 +820,7 @@ byteswap_mapping( GLboolean swapBytes,
       return map_identity;
 
    switch (srcType) {
+   case GL_BYTE:
    case GL_UNSIGNED_BYTE:
       return map_identity;
    case GL_UNSIGNED_INT_8_8_8_8:
@@ -2561,6 +2563,99 @@ _mesa_texstore_dudv8(TEXSTORE_PARAMS)
    return GL_TRUE;
 }
 
+/**
+ * Store a texture in MESA_FORMAT_RGBA8888 or MESA_FORMAT_RGBA8888_REV.
+ */
+GLboolean
+_mesa_texstore_signed_rgba8888(TEXSTORE_PARAMS)
+{
+   const GLboolean littleEndian = _mesa_little_endian();
+
+   ASSERT(dstFormat == &_mesa_texformat_signed_rgba8888);
+   ASSERT(dstFormat->TexelBytes == 4);
+
+   if (!ctx->_ImageTransferState &&
+       !srcPacking->SwapBytes &&
+       dstFormat == &_mesa_texformat_signed_rgba8888 &&
+       baseInternalFormat == GL_RGBA &&
+      ((srcFormat == GL_RGBA && srcType == GL_BYTE && !littleEndian) ||
+       (srcFormat == GL_ABGR_EXT && srcType == GL_BYTE && littleEndian))) {
+       /* simple memcpy path */
+      memcpy_texture(ctx, dims,
+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
+                     dstRowStride,
+                     dstImageOffsets,
+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
+                     srcAddr, srcPacking);
+   }
+   else if (!ctx->_ImageTransferState &&
+	    (srcType == GL_BYTE) &&
+	    can_swizzle(baseInternalFormat) &&
+	    can_swizzle(srcFormat)) {
+
+      GLubyte dstmap[4];
+
+      /* dstmap - how to swizzle from RGBA to dst format:
+       */
+      if (littleEndian && dstFormat == &_mesa_texformat_signed_rgba8888) {
+	 dstmap[3] = 0;
+	 dstmap[2] = 1;
+	 dstmap[1] = 2;
+	 dstmap[0] = 3;
+      }
+      else {
+	 dstmap[3] = 3;
+	 dstmap[2] = 2;
+	 dstmap[1] = 1;
+	 dstmap[0] = 0;
+      }
+      
+      _mesa_swizzle_ubyte_image(ctx, dims,
+				srcFormat,
+				srcType,
+				baseInternalFormat,
+				dstmap, 4,
+				dstAddr, dstXoffset, dstYoffset, dstZoffset,
+				dstRowStride, dstImageOffsets,
+				srcWidth, srcHeight, srcDepth, srcAddr,
+				srcPacking);      
+   }
+   else {
+      /* general path */
+      const GLfloat *tempImage = make_temp_float_image(ctx, dims,
+                                                 baseInternalFormat,
+                                                 dstFormat->BaseFormat,
+                                                 srcWidth, srcHeight, srcDepth,
+                                                 srcFormat, srcType, srcAddr,
+                                                 srcPacking);
+      const GLfloat *srcRow = tempImage;
+      GLint img, row, col;
+      if (!tempImage)
+         return GL_FALSE;
+      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
+      for (img = 0; img < srcDepth; img++) {
+         GLubyte *dstRow = (GLubyte *) dstAddr
+            + dstImageOffsets[dstZoffset + img] * dstFormat->TexelBytes
+            + dstYoffset * dstRowStride
+            + dstXoffset * dstFormat->TexelBytes;
+         for (row = 0; row < srcHeight; row++) {
+            GLuint *dstUI = (GLuint *) dstRow;
+            if (dstFormat == &_mesa_texformat_signed_rgba8888) {
+               for (col = 0; col < srcWidth; col++) {
+                  dstUI[col] = PACK_COLOR_8888( FLOAT_TO_BYTE_TEX(srcRow[RCOMP]),
+                                                FLOAT_TO_BYTE_TEX(srcRow[GCOMP]),
+                                                FLOAT_TO_BYTE_TEX(srcRow[BCOMP]),
+                                                FLOAT_TO_BYTE_TEX(srcRow[ACOMP]) );
+                  srcRow += 4;
+               }
+            }
+            dstRow += dstRowStride;
+         }
+      }
+      _mesa_free((void *) tempImage);
+   }
+   return GL_TRUE;
+}
 
 /**
  * Store a combined depth/stencil texture image.
@@ -3820,6 +3915,21 @@ linear_to_nonlinear(GLfloat cl)
 
 #endif /* FEATURE_EXT_texture_sRGB */
 
+static INLINE GLboolean
+type_with_negative_values(GLenum type)
+{
+    switch (type) {
+    case GL_BYTE:
+    case GL_SHORT:
+    case GL_INT:
+    case GL_FLOAT:
+    case GL_HALF_FLOAT_ARB:
+       return GL_TRUE;
+   default:
+      return GL_FALSE;
+    }
+}
+
 /**
  * This is the software fallback for Driver.GetTexImage().
  * All error checking will have been done before this routine is called.
@@ -3962,7 +4072,7 @@ _mesa_get_teximage(GLcontext *ctx, GLenum target, GLint level,
                }
                _mesa_pack_rgba_span_float(ctx, width, (GLfloat (*)[4]) rgba,
                                           format, type, dest,
-                                          &ctx->Pack, transferOps /*image xfer ops*/);
+                                          &ctx->Pack, transferOps, GL_TRUE);
             }
 #endif /* FEATURE_EXT_texture_sRGB */
             else {
@@ -3971,10 +4081,13 @@ _mesa_get_teximage(GLcontext *ctx, GLenum target, GLint level,
                GLint col;
                GLbitfield transferOps = 0x0;
 
-               if (type == GL_FLOAT && texImage->TexFormat->BaseFormat != GL_DUDV_ATI &&
-                   ((ctx->Color.ClampReadColor == GL_TRUE) ||
-                    (ctx->Color.ClampReadColor == GL_FIXED_ONLY_ARB &&
-                     texImage->TexFormat->DataType != GL_FLOAT)))
+               /* clamp does not apply to GetTexImage (final conversion)?
+                  Looks like we need clamp though when going from format containing
+                  negative values to unsigned format */
+
+               if (!type_with_negative_values(type) &&
+                   (texImage->TexFormat->DataType == GL_FLOAT ||
+                   texImage->TexFormat->DataType == GL_SIGNED_NORMALIZED))
                   transferOps |= IMAGE_CLAMP_BIT;
 
                for (col = 0; col < width; col++) {
@@ -4001,7 +4114,7 @@ _mesa_get_teximage(GLcontext *ctx, GLenum target, GLint level,
                }
                _mesa_pack_rgba_span_float(ctx, width, (GLfloat (*)[4]) rgba,
                                           format, type, dest,
-                                          &ctx->Pack, transferOps /*image xfer ops*/);
+                                          &ctx->Pack, transferOps, GL_TRUE);
             } /* format */
          } /* row */
       } /* img */
diff --git a/src/mesa/main/texstore.h b/src/mesa/main/texstore.h
index c9e639be4e..91cb64f377 100644
--- a/src/mesa/main/texstore.h
+++ b/src/mesa/main/texstore.h
@@ -79,6 +79,7 @@ extern GLboolean _mesa_texstore_sl8(TEXSTORE_PARAMS);
 extern GLboolean _mesa_texstore_sla8(TEXSTORE_PARAMS);
 #endif
 extern GLboolean _mesa_texstore_dudv8(TEXSTORE_PARAMS);
+extern GLboolean _mesa_texstore_signed_rgba8888(TEXSTORE_PARAMS);
 
 extern GLchan *
 _mesa_make_temp_chan_image(GLcontext *ctx, GLuint dims,
diff --git a/src/mesa/state_tracker/st_cb_readpixels.c b/src/mesa/state_tracker/st_cb_readpixels.c
index ce7a8cda4e..c11973cdb3 100644
--- a/src/mesa/state_tracker/st_cb_readpixels.c
+++ b/src/mesa/state_tracker/st_cb_readpixels.c
@@ -486,7 +486,7 @@ st_readpixels(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height,
             df += dfStride;
             if (!dfStride) {
                _mesa_pack_rgba_span_float(ctx, width, temp, format, type, dst,
-                                          &clippedPacking, transferOps);
+                                          &clippedPacking, transferOps, GL_FALSE);
                dst += dstStride;
             }
          }
diff --git a/src/mesa/swrast/s_readpix.c b/src/mesa/swrast/s_readpix.c
index e901fc6b5d..524ac4ee21 100644
--- a/src/mesa/swrast/s_readpix.c
+++ b/src/mesa/swrast/s_readpix.c
@@ -396,7 +396,7 @@ read_rgba_pixels( GLcontext *ctx,
                                       format, type, row, 0);
          _mesa_pack_rgba_span_float(ctx, width, (GLfloat (*)[4]) src,
                                     format, type, dest, packing,
-                                    transferOps & IMAGE_POST_CONVOLUTION_BITS);
+                                    transferOps & IMAGE_POST_CONVOLUTION_BITS, GL_FALSE);
          src += width * 4;
       }
       _mesa_free(convImage);
@@ -441,7 +441,7 @@ read_rgba_pixels( GLcontext *ctx,
 
          /* pack the row of RGBA pixels into user's buffer */
          _mesa_pack_rgba_span_float(ctx, width, rgba, format, type, dst,
-                                    packing, transferOps);
+                                    packing, transferOps, GL_FALSE);
 
          dst += dstStride;
       }
-- 
cgit v1.2.3


From 7d00ba195c4d8f58eec8e2ab553225a7e17ad656 Mon Sep 17 00:00:00 2001
From: Roland Scheidegger <sroland@vmware.com>
Date: Sat, 28 Mar 2009 02:03:35 +0100
Subject: glapi regenerate

---
 src/mesa/main/enums.c | 6023 +++++++++++++++++++++++++------------------------
 1 file changed, 3015 insertions(+), 3008 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/enums.c b/src/mesa/main/enums.c
index e63a04e915..c077bc0a89 100644
--- a/src/mesa/main/enums.c
+++ b/src/mesa/main/enums.c
@@ -120,6 +120,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_BLEND_EQUATION_ALPHA\0"
    "GL_BLEND_EQUATION_ALPHA_EXT\0"
    "GL_BLEND_EQUATION_EXT\0"
+   "GL_BLEND_EQUATION_RGB\0"
    "GL_BLEND_EQUATION_RGB_EXT\0"
    "GL_BLEND_SRC\0"
    "GL_BLEND_SRC_ALPHA\0"
@@ -297,6 +298,10 @@ LONGSTRING static const char enum_string_table[] =
    "GL_COMPRESSED_RGB_ARB\0"
    "GL_COMPRESSED_RGB_FXT1_3DFX\0"
    "GL_COMPRESSED_RGB_S3TC_DXT1_EXT\0"
+   "GL_COMPRESSED_SLUMINANCE\0"
+   "GL_COMPRESSED_SLUMINANCE_ALPHA\0"
+   "GL_COMPRESSED_SRGB\0"
+   "GL_COMPRESSED_SRGB_ALPHA\0"
    "GL_COMPRESSED_TEXTURE_FORMATS\0"
    "GL_CONSTANT\0"
    "GL_CONSTANT_ALPHA\0"
@@ -355,6 +360,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_CURRENT_RASTER_INDEX\0"
    "GL_CURRENT_RASTER_POSITION\0"
    "GL_CURRENT_RASTER_POSITION_VALID\0"
+   "GL_CURRENT_RASTER_SECONDARY_COLOR\0"
    "GL_CURRENT_RASTER_TEXTURE_COORDS\0"
    "GL_CURRENT_SECONDARY_COLOR\0"
    "GL_CURRENT_TEXTURE_COORDS\0"
@@ -510,10 +516,16 @@ LONGSTRING static const char enum_string_table[] =
    "GL_FLOAT\0"
    "GL_FLOAT_MAT2\0"
    "GL_FLOAT_MAT2_ARB\0"
+   "GL_FLOAT_MAT2x3\0"
+   "GL_FLOAT_MAT2x4\0"
    "GL_FLOAT_MAT3\0"
    "GL_FLOAT_MAT3_ARB\0"
+   "GL_FLOAT_MAT3x2\0"
+   "GL_FLOAT_MAT3x4\0"
    "GL_FLOAT_MAT4\0"
    "GL_FLOAT_MAT4_ARB\0"
+   "GL_FLOAT_MAT4x2\0"
+   "GL_FLOAT_MAT4x3\0"
    "GL_FLOAT_VEC2\0"
    "GL_FLOAT_VEC2_ARB\0"
    "GL_FLOAT_VEC3\0"
@@ -607,30 +619,6 @@ LONGSTRING static const char enum_string_table[] =
    "GL_GENERATE_MIPMAP_HINT_SGIS\0"
    "GL_GENERATE_MIPMAP_SGIS\0"
    "GL_GEQUAL\0"
-   "GL_GL_BLEND_EQUATION_RGB\0"
-   "GL_GL_COMPRESSED_SLUMINANCE\0"
-   "GL_GL_COMPRESSED_SLUMINANCE_ALPHA\0"
-   "GL_GL_COMPRESSED_SRGB\0"
-   "GL_GL_COMPRESSED_SRGB_ALPHA\0"
-   "GL_GL_CURRENT_RASTER_SECONDARY_COLOR\0"
-   "GL_GL_FLOAT_MAT2x3\0"
-   "GL_GL_FLOAT_MAT2x4\0"
-   "GL_GL_FLOAT_MAT3x2\0"
-   "GL_GL_FLOAT_MAT3x4\0"
-   "GL_GL_FLOAT_MAT4x2\0"
-   "GL_GL_FLOAT_MAT4x3\0"
-   "GL_GL_PIXEL_PACK_BUFFER\0"
-   "GL_GL_PIXEL_PACK_BUFFER_BINDING\0"
-   "GL_GL_PIXEL_UNPACK_BUFFER\0"
-   "GL_GL_PIXEL_UNPACK_BUFFER_BINDING\0"
-   "GL_GL_SLUMINANCE\0"
-   "GL_GL_SLUMINANCE8\0"
-   "GL_GL_SLUMINANCE8_ALPHA8\0"
-   "GL_GL_SLUMINANCE_ALPHA\0"
-   "GL_GL_SRGB\0"
-   "GL_GL_SRGB8\0"
-   "GL_GL_SRGB8_ALPHA8\0"
-   "GL_GL_SRGB_ALPHA\0"
    "GL_GREATER\0"
    "GL_GREEN\0"
    "GL_GREEN_BIAS\0"
@@ -1152,8 +1140,12 @@ LONGSTRING static const char enum_string_table[] =
    "GL_PIXEL_MAP_S_TO_S\0"
    "GL_PIXEL_MAP_S_TO_S_SIZE\0"
    "GL_PIXEL_MODE_BIT\0"
+   "GL_PIXEL_PACK_BUFFER\0"
+   "GL_PIXEL_PACK_BUFFER_BINDING\0"
    "GL_PIXEL_PACK_BUFFER_BINDING_EXT\0"
    "GL_PIXEL_PACK_BUFFER_EXT\0"
+   "GL_PIXEL_UNPACK_BUFFER\0"
+   "GL_PIXEL_UNPACK_BUFFER_BINDING\0"
    "GL_PIXEL_UNPACK_BUFFER_BINDING_EXT\0"
    "GL_PIXEL_UNPACK_BUFFER_EXT\0"
    "GL_POINT\0"
@@ -1385,9 +1377,11 @@ LONGSTRING static const char enum_string_table[] =
    "GL_RGBA4_S3TC\0"
    "GL_RGBA8\0"
    "GL_RGBA8_EXT\0"
+   "GL_RGBA8_SNORM\0"
    "GL_RGBA_DXT5_S3TC\0"
    "GL_RGBA_MODE\0"
    "GL_RGBA_S3TC\0"
+   "GL_RGBA_SNORM\0"
    "GL_RGB_S3TC\0"
    "GL_RGB_SCALE\0"
    "GL_RGB_SCALE_ARB\0"
@@ -1444,9 +1438,14 @@ LONGSTRING static const char enum_string_table[] =
    "GL_SHARED_TEXTURE_PALETTE_EXT\0"
    "GL_SHININESS\0"
    "GL_SHORT\0"
+   "GL_SIGNED_NORMALIZED\0"
    "GL_SINGLE_COLOR\0"
    "GL_SINGLE_COLOR_EXT\0"
    "GL_SLICE_ACCUM_SUN\0"
+   "GL_SLUMINANCE\0"
+   "GL_SLUMINANCE8\0"
+   "GL_SLUMINANCE8_ALPHA8\0"
+   "GL_SLUMINANCE_ALPHA\0"
    "GL_SMOOTH\0"
    "GL_SMOOTH_LINE_WIDTH_GRANULARITY\0"
    "GL_SMOOTH_LINE_WIDTH_RANGE\0"
@@ -1487,6 +1486,9 @@ LONGSTRING static const char enum_string_table[] =
    "GL_SRC_ALPHA_SATURATE\0"
    "GL_SRC_COLOR\0"
    "GL_SRGB\0"
+   "GL_SRGB8\0"
+   "GL_SRGB8_ALPHA8\0"
+   "GL_SRGB_ALPHA\0"
    "GL_STACK_OVERFLOW\0"
    "GL_STACK_UNDERFLOW\0"
    "GL_STATIC_COPY\0"
@@ -1856,7 +1858,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_ZOOM_Y\0"
    ;
 
-static const enum_elt all_enums[1818] =
+static const enum_elt all_enums[1820] =
 {
    {     0, 0x00000600 }, /* GL_2D */
    {     6, 0x00001407 }, /* GL_2_BYTES */
@@ -1942,3059 +1944,3064 @@ static const enum_elt all_enums[1818] =
    {  1320, 0x0000883D }, /* GL_BLEND_EQUATION_ALPHA */
    {  1344, 0x0000883D }, /* GL_BLEND_EQUATION_ALPHA_EXT */
    {  1372, 0x00008009 }, /* GL_BLEND_EQUATION_EXT */
-   {  1394, 0x00008009 }, /* GL_BLEND_EQUATION_RGB_EXT */
-   {  1420, 0x00000BE1 }, /* GL_BLEND_SRC */
-   {  1433, 0x000080CB }, /* GL_BLEND_SRC_ALPHA */
-   {  1452, 0x000080C9 }, /* GL_BLEND_SRC_RGB */
-   {  1469, 0x00001905 }, /* GL_BLUE */
-   {  1477, 0x00000D1B }, /* GL_BLUE_BIAS */
-   {  1490, 0x00000D54 }, /* GL_BLUE_BITS */
-   {  1503, 0x00000D1A }, /* GL_BLUE_SCALE */
-   {  1517, 0x00008B56 }, /* GL_BOOL */
-   {  1525, 0x00008B56 }, /* GL_BOOL_ARB */
-   {  1537, 0x00008B57 }, /* GL_BOOL_VEC2 */
-   {  1550, 0x00008B57 }, /* GL_BOOL_VEC2_ARB */
-   {  1567, 0x00008B58 }, /* GL_BOOL_VEC3 */
-   {  1580, 0x00008B58 }, /* GL_BOOL_VEC3_ARB */
-   {  1597, 0x00008B59 }, /* GL_BOOL_VEC4 */
-   {  1610, 0x00008B59 }, /* GL_BOOL_VEC4_ARB */
-   {  1627, 0x000088BB }, /* GL_BUFFER_ACCESS */
-   {  1644, 0x000088BB }, /* GL_BUFFER_ACCESS_ARB */
-   {  1665, 0x000088BC }, /* GL_BUFFER_MAPPED */
-   {  1682, 0x000088BC }, /* GL_BUFFER_MAPPED_ARB */
-   {  1703, 0x000088BD }, /* GL_BUFFER_MAP_POINTER */
-   {  1725, 0x000088BD }, /* GL_BUFFER_MAP_POINTER_ARB */
-   {  1751, 0x00008764 }, /* GL_BUFFER_SIZE */
-   {  1766, 0x00008764 }, /* GL_BUFFER_SIZE_ARB */
-   {  1785, 0x00008765 }, /* GL_BUFFER_USAGE */
-   {  1801, 0x00008765 }, /* GL_BUFFER_USAGE_ARB */
-   {  1821, 0x0000877B }, /* GL_BUMP_ENVMAP_ATI */
-   {  1840, 0x00008777 }, /* GL_BUMP_NUM_TEX_UNITS_ATI */
-   {  1866, 0x00008775 }, /* GL_BUMP_ROT_MATRIX_ATI */
-   {  1889, 0x00008776 }, /* GL_BUMP_ROT_MATRIX_SIZE_ATI */
-   {  1917, 0x0000877C }, /* GL_BUMP_TARGET_ATI */
-   {  1936, 0x00008778 }, /* GL_BUMP_TEX_UNITS_ATI */
-   {  1958, 0x00001400 }, /* GL_BYTE */
-   {  1966, 0x00002A24 }, /* GL_C3F_V3F */
-   {  1977, 0x00002A26 }, /* GL_C4F_N3F_V3F */
-   {  1992, 0x00002A22 }, /* GL_C4UB_V2F */
-   {  2004, 0x00002A23 }, /* GL_C4UB_V3F */
-   {  2016, 0x00000901 }, /* GL_CCW */
-   {  2023, 0x00002900 }, /* GL_CLAMP */
-   {  2032, 0x0000812D }, /* GL_CLAMP_TO_BORDER */
-   {  2051, 0x0000812D }, /* GL_CLAMP_TO_BORDER_ARB */
-   {  2074, 0x0000812D }, /* GL_CLAMP_TO_BORDER_SGIS */
-   {  2098, 0x0000812F }, /* GL_CLAMP_TO_EDGE */
-   {  2115, 0x0000812F }, /* GL_CLAMP_TO_EDGE_SGIS */
-   {  2137, 0x00001500 }, /* GL_CLEAR */
-   {  2146, 0x000084E1 }, /* GL_CLIENT_ACTIVE_TEXTURE */
-   {  2171, 0x000084E1 }, /* GL_CLIENT_ACTIVE_TEXTURE_ARB */
-   {  2200, 0xFFFFFFFF }, /* GL_CLIENT_ALL_ATTRIB_BITS */
-   {  2226, 0x00000BB1 }, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
-   {  2255, 0x00000001 }, /* GL_CLIENT_PIXEL_STORE_BIT */
-   {  2281, 0x00000002 }, /* GL_CLIENT_VERTEX_ARRAY_BIT */
-   {  2308, 0x00003000 }, /* GL_CLIP_PLANE0 */
-   {  2323, 0x00003001 }, /* GL_CLIP_PLANE1 */
-   {  2338, 0x00003002 }, /* GL_CLIP_PLANE2 */
-   {  2353, 0x00003003 }, /* GL_CLIP_PLANE3 */
-   {  2368, 0x00003004 }, /* GL_CLIP_PLANE4 */
-   {  2383, 0x00003005 }, /* GL_CLIP_PLANE5 */
-   {  2398, 0x000080F0 }, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
-   {  2431, 0x00000A00 }, /* GL_COEFF */
-   {  2440, 0x00001800 }, /* GL_COLOR */
-   {  2449, 0x00008076 }, /* GL_COLOR_ARRAY */
-   {  2464, 0x00008898 }, /* GL_COLOR_ARRAY_BUFFER_BINDING */
-   {  2494, 0x00008898 }, /* GL_COLOR_ARRAY_BUFFER_BINDING_ARB */
-   {  2528, 0x00008090 }, /* GL_COLOR_ARRAY_POINTER */
-   {  2551, 0x00008081 }, /* GL_COLOR_ARRAY_SIZE */
-   {  2571, 0x00008083 }, /* GL_COLOR_ARRAY_STRIDE */
-   {  2593, 0x00008082 }, /* GL_COLOR_ARRAY_TYPE */
-   {  2613, 0x00008CE0 }, /* GL_COLOR_ATTACHMENT0 */
-   {  2634, 0x00008CE0 }, /* GL_COLOR_ATTACHMENT0_EXT */
-   {  2659, 0x00008CE1 }, /* GL_COLOR_ATTACHMENT1 */
-   {  2680, 0x00008CEA }, /* GL_COLOR_ATTACHMENT10 */
-   {  2702, 0x00008CEA }, /* GL_COLOR_ATTACHMENT10_EXT */
-   {  2728, 0x00008CEB }, /* GL_COLOR_ATTACHMENT11 */
-   {  2750, 0x00008CEB }, /* GL_COLOR_ATTACHMENT11_EXT */
-   {  2776, 0x00008CEC }, /* GL_COLOR_ATTACHMENT12 */
-   {  2798, 0x00008CEC }, /* GL_COLOR_ATTACHMENT12_EXT */
-   {  2824, 0x00008CED }, /* GL_COLOR_ATTACHMENT13 */
-   {  2846, 0x00008CED }, /* GL_COLOR_ATTACHMENT13_EXT */
-   {  2872, 0x00008CEE }, /* GL_COLOR_ATTACHMENT14 */
-   {  2894, 0x00008CEE }, /* GL_COLOR_ATTACHMENT14_EXT */
-   {  2920, 0x00008CEF }, /* GL_COLOR_ATTACHMENT15 */
-   {  2942, 0x00008CEF }, /* GL_COLOR_ATTACHMENT15_EXT */
-   {  2968, 0x00008CE1 }, /* GL_COLOR_ATTACHMENT1_EXT */
-   {  2993, 0x00008CE2 }, /* GL_COLOR_ATTACHMENT2 */
-   {  3014, 0x00008CE2 }, /* GL_COLOR_ATTACHMENT2_EXT */
-   {  3039, 0x00008CE3 }, /* GL_COLOR_ATTACHMENT3 */
-   {  3060, 0x00008CE3 }, /* GL_COLOR_ATTACHMENT3_EXT */
-   {  3085, 0x00008CE4 }, /* GL_COLOR_ATTACHMENT4 */
-   {  3106, 0x00008CE4 }, /* GL_COLOR_ATTACHMENT4_EXT */
-   {  3131, 0x00008CE5 }, /* GL_COLOR_ATTACHMENT5 */
-   {  3152, 0x00008CE5 }, /* GL_COLOR_ATTACHMENT5_EXT */
-   {  3177, 0x00008CE6 }, /* GL_COLOR_ATTACHMENT6 */
-   {  3198, 0x00008CE6 }, /* GL_COLOR_ATTACHMENT6_EXT */
-   {  3223, 0x00008CE7 }, /* GL_COLOR_ATTACHMENT7 */
-   {  3244, 0x00008CE7 }, /* GL_COLOR_ATTACHMENT7_EXT */
-   {  3269, 0x00008CE8 }, /* GL_COLOR_ATTACHMENT8 */
-   {  3290, 0x00008CE8 }, /* GL_COLOR_ATTACHMENT8_EXT */
-   {  3315, 0x00008CE9 }, /* GL_COLOR_ATTACHMENT9 */
-   {  3336, 0x00008CE9 }, /* GL_COLOR_ATTACHMENT9_EXT */
-   {  3361, 0x00004000 }, /* GL_COLOR_BUFFER_BIT */
-   {  3381, 0x00000C22 }, /* GL_COLOR_CLEAR_VALUE */
-   {  3402, 0x00001900 }, /* GL_COLOR_INDEX */
-   {  3417, 0x00001603 }, /* GL_COLOR_INDEXES */
-   {  3434, 0x00000BF2 }, /* GL_COLOR_LOGIC_OP */
-   {  3452, 0x00000B57 }, /* GL_COLOR_MATERIAL */
-   {  3470, 0x00000B55 }, /* GL_COLOR_MATERIAL_FACE */
-   {  3493, 0x00000B56 }, /* GL_COLOR_MATERIAL_PARAMETER */
-   {  3521, 0x000080B1 }, /* GL_COLOR_MATRIX */
-   {  3537, 0x000080B1 }, /* GL_COLOR_MATRIX_SGI */
-   {  3557, 0x000080B2 }, /* GL_COLOR_MATRIX_STACK_DEPTH */
-   {  3585, 0x000080B2 }, /* GL_COLOR_MATRIX_STACK_DEPTH_SGI */
-   {  3617, 0x00008458 }, /* GL_COLOR_SUM */
-   {  3630, 0x00008458 }, /* GL_COLOR_SUM_ARB */
-   {  3647, 0x000080D0 }, /* GL_COLOR_TABLE */
-   {  3662, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE */
-   {  3688, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE_EXT */
-   {  3718, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE_SGI */
-   {  3748, 0x000080D7 }, /* GL_COLOR_TABLE_BIAS */
-   {  3768, 0x000080D7 }, /* GL_COLOR_TABLE_BIAS_SGI */
-   {  3792, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE */
-   {  3817, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE_EXT */
-   {  3846, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE_SGI */
-   {  3875, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT */
-   {  3897, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT_EXT */
-   {  3923, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT_SGI */
-   {  3949, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE */
-   {  3975, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE_EXT */
-   {  4005, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE_SGI */
-   {  4035, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE */
-   {  4065, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE_EXT */
-   {  4099, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE_SGI */
-   {  4133, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE */
-   {  4163, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE_EXT */
-   {  4197, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE_SGI */
-   {  4231, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE */
-   {  4255, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE_EXT */
-   {  4283, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE_SGI */
-   {  4311, 0x000080D6 }, /* GL_COLOR_TABLE_SCALE */
-   {  4332, 0x000080D6 }, /* GL_COLOR_TABLE_SCALE_SGI */
-   {  4357, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH */
-   {  4378, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH_EXT */
-   {  4403, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH_SGI */
-   {  4428, 0x00000C23 }, /* GL_COLOR_WRITEMASK */
-   {  4447, 0x00008570 }, /* GL_COMBINE */
-   {  4458, 0x00008503 }, /* GL_COMBINE4 */
-   {  4470, 0x00008572 }, /* GL_COMBINE_ALPHA */
-   {  4487, 0x00008572 }, /* GL_COMBINE_ALPHA_ARB */
-   {  4508, 0x00008572 }, /* GL_COMBINE_ALPHA_EXT */
-   {  4529, 0x00008570 }, /* GL_COMBINE_ARB */
-   {  4544, 0x00008570 }, /* GL_COMBINE_EXT */
-   {  4559, 0x00008571 }, /* GL_COMBINE_RGB */
-   {  4574, 0x00008571 }, /* GL_COMBINE_RGB_ARB */
-   {  4593, 0x00008571 }, /* GL_COMBINE_RGB_EXT */
-   {  4612, 0x0000884E }, /* GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT */
-   {  4648, 0x0000884E }, /* GL_COMPARE_R_TO_TEXTURE */
-   {  4672, 0x0000884E }, /* GL_COMPARE_R_TO_TEXTURE_ARB */
-   {  4700, 0x00001300 }, /* GL_COMPILE */
-   {  4711, 0x00001301 }, /* GL_COMPILE_AND_EXECUTE */
-   {  4734, 0x00008B81 }, /* GL_COMPILE_STATUS */
-   {  4752, 0x000084E9 }, /* GL_COMPRESSED_ALPHA */
-   {  4772, 0x000084E9 }, /* GL_COMPRESSED_ALPHA_ARB */
-   {  4796, 0x000084EC }, /* GL_COMPRESSED_INTENSITY */
-   {  4820, 0x000084EC }, /* GL_COMPRESSED_INTENSITY_ARB */
-   {  4848, 0x000084EA }, /* GL_COMPRESSED_LUMINANCE */
-   {  4872, 0x000084EB }, /* GL_COMPRESSED_LUMINANCE_ALPHA */
-   {  4902, 0x000084EB }, /* GL_COMPRESSED_LUMINANCE_ALPHA_ARB */
-   {  4936, 0x000084EA }, /* GL_COMPRESSED_LUMINANCE_ARB */
-   {  4964, 0x000084ED }, /* GL_COMPRESSED_RGB */
-   {  4982, 0x000084EE }, /* GL_COMPRESSED_RGBA */
-   {  5001, 0x000084EE }, /* GL_COMPRESSED_RGBA_ARB */
-   {  5024, 0x000086B1 }, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
-   {  5053, 0x000083F1 }, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
-   {  5086, 0x000083F2 }, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
-   {  5119, 0x000083F3 }, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */
-   {  5152, 0x000084ED }, /* GL_COMPRESSED_RGB_ARB */
-   {  5174, 0x000086B0 }, /* GL_COMPRESSED_RGB_FXT1_3DFX */
-   {  5202, 0x000083F0 }, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
-   {  5234, 0x000086A3 }, /* GL_COMPRESSED_TEXTURE_FORMATS */
-   {  5264, 0x00008576 }, /* GL_CONSTANT */
-   {  5276, 0x00008003 }, /* GL_CONSTANT_ALPHA */
-   {  5294, 0x00008003 }, /* GL_CONSTANT_ALPHA_EXT */
-   {  5316, 0x00008576 }, /* GL_CONSTANT_ARB */
-   {  5332, 0x00001207 }, /* GL_CONSTANT_ATTENUATION */
-   {  5356, 0x00008151 }, /* GL_CONSTANT_BORDER_HP */
-   {  5378, 0x00008001 }, /* GL_CONSTANT_COLOR */
-   {  5396, 0x00008001 }, /* GL_CONSTANT_COLOR_EXT */
-   {  5418, 0x00008576 }, /* GL_CONSTANT_EXT */
-   {  5434, 0x00008010 }, /* GL_CONVOLUTION_1D */
-   {  5452, 0x00008011 }, /* GL_CONVOLUTION_2D */
-   {  5470, 0x00008154 }, /* GL_CONVOLUTION_BORDER_COLOR */
-   {  5498, 0x00008154 }, /* GL_CONVOLUTION_BORDER_COLOR_HP */
-   {  5529, 0x00008013 }, /* GL_CONVOLUTION_BORDER_MODE */
-   {  5556, 0x00008013 }, /* GL_CONVOLUTION_BORDER_MODE_EXT */
-   {  5587, 0x00008015 }, /* GL_CONVOLUTION_FILTER_BIAS */
-   {  5614, 0x00008015 }, /* GL_CONVOLUTION_FILTER_BIAS_EXT */
-   {  5645, 0x00008014 }, /* GL_CONVOLUTION_FILTER_SCALE */
-   {  5673, 0x00008014 }, /* GL_CONVOLUTION_FILTER_SCALE_EXT */
-   {  5705, 0x00008017 }, /* GL_CONVOLUTION_FORMAT */
-   {  5727, 0x00008017 }, /* GL_CONVOLUTION_FORMAT_EXT */
-   {  5753, 0x00008019 }, /* GL_CONVOLUTION_HEIGHT */
-   {  5775, 0x00008019 }, /* GL_CONVOLUTION_HEIGHT_EXT */
-   {  5801, 0x00008018 }, /* GL_CONVOLUTION_WIDTH */
-   {  5822, 0x00008018 }, /* GL_CONVOLUTION_WIDTH_EXT */
-   {  5847, 0x00008862 }, /* GL_COORD_REPLACE */
-   {  5864, 0x00008862 }, /* GL_COORD_REPLACE_ARB */
-   {  5885, 0x00008862 }, /* GL_COORD_REPLACE_NV */
-   {  5905, 0x00001503 }, /* GL_COPY */
-   {  5913, 0x0000150C }, /* GL_COPY_INVERTED */
-   {  5930, 0x00000706 }, /* GL_COPY_PIXEL_TOKEN */
-   {  5950, 0x00000B44 }, /* GL_CULL_FACE */
-   {  5963, 0x00000B45 }, /* GL_CULL_FACE_MODE */
-   {  5981, 0x000081AA }, /* GL_CULL_VERTEX_EXT */
-   {  6000, 0x000081AC }, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
-   {  6032, 0x000081AB }, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
-   {  6067, 0x00008626 }, /* GL_CURRENT_ATTRIB_NV */
-   {  6088, 0x00000001 }, /* GL_CURRENT_BIT */
-   {  6103, 0x00000B00 }, /* GL_CURRENT_COLOR */
-   {  6120, 0x00008453 }, /* GL_CURRENT_FOG_COORD */
-   {  6141, 0x00008453 }, /* GL_CURRENT_FOG_COORDINATE */
-   {  6167, 0x00000B01 }, /* GL_CURRENT_INDEX */
-   {  6184, 0x00008641 }, /* GL_CURRENT_MATRIX_ARB */
-   {  6206, 0x00008845 }, /* GL_CURRENT_MATRIX_INDEX_ARB */
-   {  6234, 0x00008641 }, /* GL_CURRENT_MATRIX_NV */
-   {  6255, 0x00008640 }, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
-   {  6289, 0x00008640 }, /* GL_CURRENT_MATRIX_STACK_DEPTH_NV */
-   {  6322, 0x00000B02 }, /* GL_CURRENT_NORMAL */
-   {  6340, 0x00008843 }, /* GL_CURRENT_PALETTE_MATRIX_ARB */
-   {  6370, 0x00008B8D }, /* GL_CURRENT_PROGRAM */
-   {  6389, 0x00008865 }, /* GL_CURRENT_QUERY */
-   {  6406, 0x00008865 }, /* GL_CURRENT_QUERY_ARB */
-   {  6427, 0x00000B04 }, /* GL_CURRENT_RASTER_COLOR */
-   {  6451, 0x00000B09 }, /* GL_CURRENT_RASTER_DISTANCE */
-   {  6478, 0x00000B05 }, /* GL_CURRENT_RASTER_INDEX */
-   {  6502, 0x00000B07 }, /* GL_CURRENT_RASTER_POSITION */
-   {  6529, 0x00000B08 }, /* GL_CURRENT_RASTER_POSITION_VALID */
-   {  6562, 0x00000B06 }, /* GL_CURRENT_RASTER_TEXTURE_COORDS */
-   {  6595, 0x00008459 }, /* GL_CURRENT_SECONDARY_COLOR */
-   {  6622, 0x00000B03 }, /* GL_CURRENT_TEXTURE_COORDS */
-   {  6648, 0x00008626 }, /* GL_CURRENT_VERTEX_ATTRIB */
-   {  6673, 0x00008626 }, /* GL_CURRENT_VERTEX_ATTRIB_ARB */
-   {  6702, 0x000086A8 }, /* GL_CURRENT_WEIGHT_ARB */
-   {  6724, 0x00000900 }, /* GL_CW */
-   {  6730, 0x0000875B }, /* GL_DEBUG_ASSERT_MESA */
-   {  6751, 0x00008759 }, /* GL_DEBUG_OBJECT_MESA */
-   {  6772, 0x0000875A }, /* GL_DEBUG_PRINT_MESA */
-   {  6792, 0x00002101 }, /* GL_DECAL */
-   {  6801, 0x00001E03 }, /* GL_DECR */
-   {  6809, 0x00008508 }, /* GL_DECR_WRAP */
-   {  6822, 0x00008508 }, /* GL_DECR_WRAP_EXT */
-   {  6839, 0x00008B80 }, /* GL_DELETE_STATUS */
-   {  6856, 0x00001801 }, /* GL_DEPTH */
-   {  6865, 0x000088F0 }, /* GL_DEPTH24_STENCIL8 */
-   {  6885, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT */
-   {  6905, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT_EXT */
-   {  6929, 0x00000D1F }, /* GL_DEPTH_BIAS */
-   {  6943, 0x00000D56 }, /* GL_DEPTH_BITS */
-   {  6957, 0x00008891 }, /* GL_DEPTH_BOUNDS_EXT */
-   {  6977, 0x00008890 }, /* GL_DEPTH_BOUNDS_TEST_EXT */
-   {  7002, 0x00000100 }, /* GL_DEPTH_BUFFER_BIT */
-   {  7022, 0x0000864F }, /* GL_DEPTH_CLAMP_NV */
-   {  7040, 0x00000B73 }, /* GL_DEPTH_CLEAR_VALUE */
-   {  7061, 0x00001902 }, /* GL_DEPTH_COMPONENT */
-   {  7080, 0x000081A5 }, /* GL_DEPTH_COMPONENT16 */
-   {  7101, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_ARB */
-   {  7126, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_SGIX */
-   {  7152, 0x000081A6 }, /* GL_DEPTH_COMPONENT24 */
-   {  7173, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_ARB */
-   {  7198, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_SGIX */
-   {  7224, 0x000081A7 }, /* GL_DEPTH_COMPONENT32 */
-   {  7245, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_ARB */
-   {  7270, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_SGIX */
-   {  7296, 0x00000B74 }, /* GL_DEPTH_FUNC */
-   {  7310, 0x00000B70 }, /* GL_DEPTH_RANGE */
-   {  7325, 0x00000D1E }, /* GL_DEPTH_SCALE */
-   {  7340, 0x000084F9 }, /* GL_DEPTH_STENCIL */
-   {  7357, 0x0000821A }, /* GL_DEPTH_STENCIL_ATTACHMENT */
-   {  7385, 0x000084F9 }, /* GL_DEPTH_STENCIL_NV */
-   {  7405, 0x0000886F }, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
-   {  7433, 0x0000886E }, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
-   {  7461, 0x00000B71 }, /* GL_DEPTH_TEST */
-   {  7475, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE */
-   {  7497, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE_ARB */
-   {  7523, 0x00000B72 }, /* GL_DEPTH_WRITEMASK */
-   {  7542, 0x00001201 }, /* GL_DIFFUSE */
-   {  7553, 0x00000BD0 }, /* GL_DITHER */
-   {  7563, 0x00000A02 }, /* GL_DOMAIN */
-   {  7573, 0x00001100 }, /* GL_DONT_CARE */
-   {  7586, 0x000086AE }, /* GL_DOT3_RGB */
-   {  7598, 0x000086AF }, /* GL_DOT3_RGBA */
-   {  7611, 0x000086AF }, /* GL_DOT3_RGBA_ARB */
-   {  7628, 0x00008741 }, /* GL_DOT3_RGBA_EXT */
-   {  7645, 0x000086AE }, /* GL_DOT3_RGB_ARB */
-   {  7661, 0x00008740 }, /* GL_DOT3_RGB_EXT */
-   {  7677, 0x0000140A }, /* GL_DOUBLE */
-   {  7687, 0x00000C32 }, /* GL_DOUBLEBUFFER */
-   {  7703, 0x00000C01 }, /* GL_DRAW_BUFFER */
-   {  7718, 0x00008825 }, /* GL_DRAW_BUFFER0 */
-   {  7734, 0x00008825 }, /* GL_DRAW_BUFFER0_ARB */
-   {  7754, 0x00008825 }, /* GL_DRAW_BUFFER0_ATI */
-   {  7774, 0x00008826 }, /* GL_DRAW_BUFFER1 */
-   {  7790, 0x0000882F }, /* GL_DRAW_BUFFER10 */
-   {  7807, 0x0000882F }, /* GL_DRAW_BUFFER10_ARB */
-   {  7828, 0x0000882F }, /* GL_DRAW_BUFFER10_ATI */
-   {  7849, 0x00008830 }, /* GL_DRAW_BUFFER11 */
-   {  7866, 0x00008830 }, /* GL_DRAW_BUFFER11_ARB */
-   {  7887, 0x00008830 }, /* GL_DRAW_BUFFER11_ATI */
-   {  7908, 0x00008831 }, /* GL_DRAW_BUFFER12 */
-   {  7925, 0x00008831 }, /* GL_DRAW_BUFFER12_ARB */
-   {  7946, 0x00008831 }, /* GL_DRAW_BUFFER12_ATI */
-   {  7967, 0x00008832 }, /* GL_DRAW_BUFFER13 */
-   {  7984, 0x00008832 }, /* GL_DRAW_BUFFER13_ARB */
-   {  8005, 0x00008832 }, /* GL_DRAW_BUFFER13_ATI */
-   {  8026, 0x00008833 }, /* GL_DRAW_BUFFER14 */
-   {  8043, 0x00008833 }, /* GL_DRAW_BUFFER14_ARB */
-   {  8064, 0x00008833 }, /* GL_DRAW_BUFFER14_ATI */
-   {  8085, 0x00008834 }, /* GL_DRAW_BUFFER15 */
-   {  8102, 0x00008834 }, /* GL_DRAW_BUFFER15_ARB */
-   {  8123, 0x00008834 }, /* GL_DRAW_BUFFER15_ATI */
-   {  8144, 0x00008826 }, /* GL_DRAW_BUFFER1_ARB */
-   {  8164, 0x00008826 }, /* GL_DRAW_BUFFER1_ATI */
-   {  8184, 0x00008827 }, /* GL_DRAW_BUFFER2 */
-   {  8200, 0x00008827 }, /* GL_DRAW_BUFFER2_ARB */
-   {  8220, 0x00008827 }, /* GL_DRAW_BUFFER2_ATI */
-   {  8240, 0x00008828 }, /* GL_DRAW_BUFFER3 */
-   {  8256, 0x00008828 }, /* GL_DRAW_BUFFER3_ARB */
-   {  8276, 0x00008828 }, /* GL_DRAW_BUFFER3_ATI */
-   {  8296, 0x00008829 }, /* GL_DRAW_BUFFER4 */
-   {  8312, 0x00008829 }, /* GL_DRAW_BUFFER4_ARB */
-   {  8332, 0x00008829 }, /* GL_DRAW_BUFFER4_ATI */
-   {  8352, 0x0000882A }, /* GL_DRAW_BUFFER5 */
-   {  8368, 0x0000882A }, /* GL_DRAW_BUFFER5_ARB */
-   {  8388, 0x0000882A }, /* GL_DRAW_BUFFER5_ATI */
-   {  8408, 0x0000882B }, /* GL_DRAW_BUFFER6 */
-   {  8424, 0x0000882B }, /* GL_DRAW_BUFFER6_ARB */
-   {  8444, 0x0000882B }, /* GL_DRAW_BUFFER6_ATI */
-   {  8464, 0x0000882C }, /* GL_DRAW_BUFFER7 */
-   {  8480, 0x0000882C }, /* GL_DRAW_BUFFER7_ARB */
-   {  8500, 0x0000882C }, /* GL_DRAW_BUFFER7_ATI */
-   {  8520, 0x0000882D }, /* GL_DRAW_BUFFER8 */
-   {  8536, 0x0000882D }, /* GL_DRAW_BUFFER8_ARB */
-   {  8556, 0x0000882D }, /* GL_DRAW_BUFFER8_ATI */
-   {  8576, 0x0000882E }, /* GL_DRAW_BUFFER9 */
-   {  8592, 0x0000882E }, /* GL_DRAW_BUFFER9_ARB */
-   {  8612, 0x0000882E }, /* GL_DRAW_BUFFER9_ATI */
-   {  8632, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER */
-   {  8652, 0x00008CA6 }, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
-   {  8684, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER_EXT */
-   {  8708, 0x00000705 }, /* GL_DRAW_PIXEL_TOKEN */
-   {  8728, 0x00000304 }, /* GL_DST_ALPHA */
-   {  8741, 0x00000306 }, /* GL_DST_COLOR */
-   {  8754, 0x0000877A }, /* GL_DU8DV8_ATI */
-   {  8768, 0x00008779 }, /* GL_DUDV_ATI */
-   {  8780, 0x000088EA }, /* GL_DYNAMIC_COPY */
-   {  8796, 0x000088EA }, /* GL_DYNAMIC_COPY_ARB */
-   {  8816, 0x000088E8 }, /* GL_DYNAMIC_DRAW */
-   {  8832, 0x000088E8 }, /* GL_DYNAMIC_DRAW_ARB */
-   {  8852, 0x000088E9 }, /* GL_DYNAMIC_READ */
-   {  8868, 0x000088E9 }, /* GL_DYNAMIC_READ_ARB */
-   {  8888, 0x00000B43 }, /* GL_EDGE_FLAG */
-   {  8901, 0x00008079 }, /* GL_EDGE_FLAG_ARRAY */
-   {  8920, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
-   {  8954, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB */
-   {  8992, 0x00008093 }, /* GL_EDGE_FLAG_ARRAY_POINTER */
-   {  9019, 0x0000808C }, /* GL_EDGE_FLAG_ARRAY_STRIDE */
-   {  9045, 0x00008893 }, /* GL_ELEMENT_ARRAY_BUFFER */
-   {  9069, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
-   {  9101, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB */
-   {  9137, 0x00001600 }, /* GL_EMISSION */
-   {  9149, 0x00002000 }, /* GL_ENABLE_BIT */
-   {  9163, 0x00000202 }, /* GL_EQUAL */
-   {  9172, 0x00001509 }, /* GL_EQUIV */
-   {  9181, 0x00010000 }, /* GL_EVAL_BIT */
-   {  9193, 0x00000800 }, /* GL_EXP */
-   {  9200, 0x00000801 }, /* GL_EXP2 */
-   {  9208, 0x00001F03 }, /* GL_EXTENSIONS */
-   {  9222, 0x00002400 }, /* GL_EYE_LINEAR */
-   {  9236, 0x00002502 }, /* GL_EYE_PLANE */
-   {  9249, 0x0000855C }, /* GL_EYE_PLANE_ABSOLUTE_NV */
-   {  9274, 0x0000855B }, /* GL_EYE_RADIAL_NV */
-   {  9291, 0x00000000 }, /* GL_FALSE */
-   {  9300, 0x00001101 }, /* GL_FASTEST */
-   {  9311, 0x00001C01 }, /* GL_FEEDBACK */
-   {  9323, 0x00000DF0 }, /* GL_FEEDBACK_BUFFER_POINTER */
-   {  9350, 0x00000DF1 }, /* GL_FEEDBACK_BUFFER_SIZE */
-   {  9374, 0x00000DF2 }, /* GL_FEEDBACK_BUFFER_TYPE */
-   {  9398, 0x00001B02 }, /* GL_FILL */
-   {  9406, 0x00001D00 }, /* GL_FLAT */
-   {  9414, 0x00001406 }, /* GL_FLOAT */
-   {  9423, 0x00008B5A }, /* GL_FLOAT_MAT2 */
-   {  9437, 0x00008B5A }, /* GL_FLOAT_MAT2_ARB */
-   {  9455, 0x00008B5B }, /* GL_FLOAT_MAT3 */
-   {  9469, 0x00008B5B }, /* GL_FLOAT_MAT3_ARB */
-   {  9487, 0x00008B5C }, /* GL_FLOAT_MAT4 */
-   {  9501, 0x00008B5C }, /* GL_FLOAT_MAT4_ARB */
-   {  9519, 0x00008B50 }, /* GL_FLOAT_VEC2 */
-   {  9533, 0x00008B50 }, /* GL_FLOAT_VEC2_ARB */
-   {  9551, 0x00008B51 }, /* GL_FLOAT_VEC3 */
-   {  9565, 0x00008B51 }, /* GL_FLOAT_VEC3_ARB */
-   {  9583, 0x00008B52 }, /* GL_FLOAT_VEC4 */
-   {  9597, 0x00008B52 }, /* GL_FLOAT_VEC4_ARB */
-   {  9615, 0x00000B60 }, /* GL_FOG */
-   {  9622, 0x00000080 }, /* GL_FOG_BIT */
-   {  9633, 0x00000B66 }, /* GL_FOG_COLOR */
-   {  9646, 0x00008451 }, /* GL_FOG_COORD */
-   {  9659, 0x00008451 }, /* GL_FOG_COORDINATE */
-   {  9677, 0x00008457 }, /* GL_FOG_COORDINATE_ARRAY */
-   {  9701, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
-   {  9740, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB */
-   {  9783, 0x00008456 }, /* GL_FOG_COORDINATE_ARRAY_POINTER */
-   {  9815, 0x00008455 }, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
-   {  9846, 0x00008454 }, /* GL_FOG_COORDINATE_ARRAY_TYPE */
-   {  9875, 0x00008450 }, /* GL_FOG_COORDINATE_SOURCE */
-   {  9900, 0x00008457 }, /* GL_FOG_COORD_ARRAY */
-   {  9919, 0x0000889D }, /* GL_FOG_COORD_ARRAY_BUFFER_BINDING */
-   {  9953, 0x00008456 }, /* GL_FOG_COORD_ARRAY_POINTER */
-   {  9980, 0x00008455 }, /* GL_FOG_COORD_ARRAY_STRIDE */
-   { 10006, 0x00008454 }, /* GL_FOG_COORD_ARRAY_TYPE */
-   { 10030, 0x00008450 }, /* GL_FOG_COORD_SRC */
-   { 10047, 0x00000B62 }, /* GL_FOG_DENSITY */
-   { 10062, 0x0000855A }, /* GL_FOG_DISTANCE_MODE_NV */
-   { 10086, 0x00000B64 }, /* GL_FOG_END */
-   { 10097, 0x00000C54 }, /* GL_FOG_HINT */
-   { 10109, 0x00000B61 }, /* GL_FOG_INDEX */
-   { 10122, 0x00000B65 }, /* GL_FOG_MODE */
-   { 10134, 0x00008198 }, /* GL_FOG_OFFSET_SGIX */
-   { 10153, 0x00008199 }, /* GL_FOG_OFFSET_VALUE_SGIX */
-   { 10178, 0x00000B63 }, /* GL_FOG_START */
-   { 10191, 0x00008452 }, /* GL_FRAGMENT_DEPTH */
-   { 10209, 0x00008804 }, /* GL_FRAGMENT_PROGRAM_ARB */
-   { 10233, 0x00008B30 }, /* GL_FRAGMENT_SHADER */
-   { 10252, 0x00008B30 }, /* GL_FRAGMENT_SHADER_ARB */
-   { 10275, 0x00008B8B }, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
-   { 10310, 0x00008D40 }, /* GL_FRAMEBUFFER */
-   { 10325, 0x00008215 }, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
-   { 10362, 0x00008214 }, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
-   { 10398, 0x00008210 }, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
-   { 10439, 0x00008211 }, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
-   { 10480, 0x00008216 }, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
-   { 10517, 0x00008213 }, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
-   { 10554, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
-   { 10592, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT */
-   { 10634, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
-   { 10672, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT */
-   { 10714, 0x00008212 }, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
-   { 10749, 0x00008217 }, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
-   { 10788, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT */
-   { 10837, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
-   { 10885, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT */
-   { 10937, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
-   { 10977, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
-   { 11021, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
-   { 11061, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT */
-   { 11105, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING_EXT */
-   { 11132, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE */
-   { 11156, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE_EXT */
-   { 11184, 0x00008218 }, /* GL_FRAMEBUFFER_DEFAULT */
-   { 11207, 0x00008D40 }, /* GL_FRAMEBUFFER_EXT */
-   { 11226, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
-   { 11263, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT */
-   { 11304, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
-   { 11345, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
-   { 11387, 0x00008CD8 }, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
-   { 11438, 0x00008CDA }, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
-   { 11476, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
-   { 11521, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT */
-   { 11570, 0x00008D56 }, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
-   { 11608, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
-   { 11650, 0x00008CDE }, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
-   { 11682, 0x00008219 }, /* GL_FRAMEBUFFER_UNDEFINED */
-   { 11707, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED */
-   { 11734, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED_EXT */
-   { 11765, 0x00000404 }, /* GL_FRONT */
-   { 11774, 0x00000408 }, /* GL_FRONT_AND_BACK */
-   { 11792, 0x00000B46 }, /* GL_FRONT_FACE */
-   { 11806, 0x00000400 }, /* GL_FRONT_LEFT */
-   { 11820, 0x00000401 }, /* GL_FRONT_RIGHT */
-   { 11835, 0x00008006 }, /* GL_FUNC_ADD */
-   { 11847, 0x00008006 }, /* GL_FUNC_ADD_EXT */
-   { 11863, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT */
-   { 11888, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT_EXT */
-   { 11917, 0x0000800A }, /* GL_FUNC_SUBTRACT */
-   { 11934, 0x0000800A }, /* GL_FUNC_SUBTRACT_EXT */
-   { 11955, 0x00008191 }, /* GL_GENERATE_MIPMAP */
-   { 11974, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT */
-   { 11998, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT_SGIS */
-   { 12027, 0x00008191 }, /* GL_GENERATE_MIPMAP_SGIS */
-   { 12051, 0x00000206 }, /* GL_GEQUAL */
-   { 12061, 0x00008009 }, /* GL_GL_BLEND_EQUATION_RGB */
-   { 12086, 0x00008C4A }, /* GL_GL_COMPRESSED_SLUMINANCE */
-   { 12114, 0x00008C4B }, /* GL_GL_COMPRESSED_SLUMINANCE_ALPHA */
-   { 12148, 0x00008C48 }, /* GL_GL_COMPRESSED_SRGB */
-   { 12170, 0x00008C49 }, /* GL_GL_COMPRESSED_SRGB_ALPHA */
-   { 12198, 0x0000845F }, /* GL_GL_CURRENT_RASTER_SECONDARY_COLOR */
-   { 12235, 0x00008B65 }, /* GL_GL_FLOAT_MAT2x3 */
-   { 12254, 0x00008B66 }, /* GL_GL_FLOAT_MAT2x4 */
-   { 12273, 0x00008B67 }, /* GL_GL_FLOAT_MAT3x2 */
-   { 12292, 0x00008B68 }, /* GL_GL_FLOAT_MAT3x4 */
-   { 12311, 0x00008B69 }, /* GL_GL_FLOAT_MAT4x2 */
-   { 12330, 0x00008B6A }, /* GL_GL_FLOAT_MAT4x3 */
-   { 12349, 0x000088EB }, /* GL_GL_PIXEL_PACK_BUFFER */
-   { 12373, 0x000088ED }, /* GL_GL_PIXEL_PACK_BUFFER_BINDING */
-   { 12405, 0x000088EC }, /* GL_GL_PIXEL_UNPACK_BUFFER */
-   { 12431, 0x000088EF }, /* GL_GL_PIXEL_UNPACK_BUFFER_BINDING */
-   { 12465, 0x00008C46 }, /* GL_GL_SLUMINANCE */
-   { 12482, 0x00008C47 }, /* GL_GL_SLUMINANCE8 */
-   { 12500, 0x00008C45 }, /* GL_GL_SLUMINANCE8_ALPHA8 */
-   { 12525, 0x00008C44 }, /* GL_GL_SLUMINANCE_ALPHA */
-   { 12548, 0x00008C40 }, /* GL_GL_SRGB */
-   { 12559, 0x00008C41 }, /* GL_GL_SRGB8 */
-   { 12571, 0x00008C43 }, /* GL_GL_SRGB8_ALPHA8 */
-   { 12590, 0x00008C42 }, /* GL_GL_SRGB_ALPHA */
-   { 12607, 0x00000204 }, /* GL_GREATER */
-   { 12618, 0x00001904 }, /* GL_GREEN */
-   { 12627, 0x00000D19 }, /* GL_GREEN_BIAS */
-   { 12641, 0x00000D53 }, /* GL_GREEN_BITS */
-   { 12655, 0x00000D18 }, /* GL_GREEN_SCALE */
-   { 12670, 0x00008000 }, /* GL_HINT_BIT */
-   { 12682, 0x00008024 }, /* GL_HISTOGRAM */
-   { 12695, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE */
-   { 12719, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE_EXT */
-   { 12747, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE */
-   { 12770, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE_EXT */
-   { 12797, 0x00008024 }, /* GL_HISTOGRAM_EXT */
-   { 12814, 0x00008027 }, /* GL_HISTOGRAM_FORMAT */
-   { 12834, 0x00008027 }, /* GL_HISTOGRAM_FORMAT_EXT */
-   { 12858, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE */
-   { 12882, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE_EXT */
-   { 12910, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE */
-   { 12938, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE_EXT */
-   { 12970, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE */
-   { 12992, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE_EXT */
-   { 13018, 0x0000802D }, /* GL_HISTOGRAM_SINK */
-   { 13036, 0x0000802D }, /* GL_HISTOGRAM_SINK_EXT */
-   { 13058, 0x00008026 }, /* GL_HISTOGRAM_WIDTH */
-   { 13077, 0x00008026 }, /* GL_HISTOGRAM_WIDTH_EXT */
-   { 13100, 0x0000862A }, /* GL_IDENTITY_NV */
-   { 13115, 0x00008150 }, /* GL_IGNORE_BORDER_HP */
-   { 13135, 0x00008B9B }, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
-   { 13175, 0x00008B9A }, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
-   { 13213, 0x00001E02 }, /* GL_INCR */
-   { 13221, 0x00008507 }, /* GL_INCR_WRAP */
-   { 13234, 0x00008507 }, /* GL_INCR_WRAP_EXT */
-   { 13251, 0x00008222 }, /* GL_INDEX */
-   { 13260, 0x00008077 }, /* GL_INDEX_ARRAY */
-   { 13275, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING */
-   { 13305, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING_ARB */
-   { 13339, 0x00008091 }, /* GL_INDEX_ARRAY_POINTER */
-   { 13362, 0x00008086 }, /* GL_INDEX_ARRAY_STRIDE */
-   { 13384, 0x00008085 }, /* GL_INDEX_ARRAY_TYPE */
-   { 13404, 0x00000D51 }, /* GL_INDEX_BITS */
-   { 13418, 0x00000C20 }, /* GL_INDEX_CLEAR_VALUE */
-   { 13439, 0x00000BF1 }, /* GL_INDEX_LOGIC_OP */
-   { 13457, 0x00000C30 }, /* GL_INDEX_MODE */
-   { 13471, 0x00000D13 }, /* GL_INDEX_OFFSET */
-   { 13487, 0x00000D12 }, /* GL_INDEX_SHIFT */
-   { 13502, 0x00000C21 }, /* GL_INDEX_WRITEMASK */
-   { 13521, 0x00008B84 }, /* GL_INFO_LOG_LENGTH */
-   { 13540, 0x00001404 }, /* GL_INT */
-   { 13547, 0x00008049 }, /* GL_INTENSITY */
-   { 13560, 0x0000804C }, /* GL_INTENSITY12 */
-   { 13575, 0x0000804C }, /* GL_INTENSITY12_EXT */
-   { 13594, 0x0000804D }, /* GL_INTENSITY16 */
-   { 13609, 0x0000804D }, /* GL_INTENSITY16_EXT */
-   { 13628, 0x0000804A }, /* GL_INTENSITY4 */
-   { 13642, 0x0000804A }, /* GL_INTENSITY4_EXT */
-   { 13660, 0x0000804B }, /* GL_INTENSITY8 */
-   { 13674, 0x0000804B }, /* GL_INTENSITY8_EXT */
-   { 13692, 0x00008049 }, /* GL_INTENSITY_EXT */
-   { 13709, 0x00008575 }, /* GL_INTERPOLATE */
-   { 13724, 0x00008575 }, /* GL_INTERPOLATE_ARB */
-   { 13743, 0x00008575 }, /* GL_INTERPOLATE_EXT */
-   { 13762, 0x00008B53 }, /* GL_INT_VEC2 */
-   { 13774, 0x00008B53 }, /* GL_INT_VEC2_ARB */
-   { 13790, 0x00008B54 }, /* GL_INT_VEC3 */
-   { 13802, 0x00008B54 }, /* GL_INT_VEC3_ARB */
-   { 13818, 0x00008B55 }, /* GL_INT_VEC4 */
-   { 13830, 0x00008B55 }, /* GL_INT_VEC4_ARB */
-   { 13846, 0x00000500 }, /* GL_INVALID_ENUM */
-   { 13862, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION */
-   { 13895, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION_EXT */
-   { 13932, 0x00000502 }, /* GL_INVALID_OPERATION */
-   { 13953, 0x00000501 }, /* GL_INVALID_VALUE */
-   { 13970, 0x0000862B }, /* GL_INVERSE_NV */
-   { 13984, 0x0000862D }, /* GL_INVERSE_TRANSPOSE_NV */
-   { 14008, 0x0000150A }, /* GL_INVERT */
-   { 14018, 0x00001E00 }, /* GL_KEEP */
-   { 14026, 0x00000406 }, /* GL_LEFT */
-   { 14034, 0x00000203 }, /* GL_LEQUAL */
-   { 14044, 0x00000201 }, /* GL_LESS */
-   { 14052, 0x00004000 }, /* GL_LIGHT0 */
-   { 14062, 0x00004001 }, /* GL_LIGHT1 */
-   { 14072, 0x00004002 }, /* GL_LIGHT2 */
-   { 14082, 0x00004003 }, /* GL_LIGHT3 */
-   { 14092, 0x00004004 }, /* GL_LIGHT4 */
-   { 14102, 0x00004005 }, /* GL_LIGHT5 */
-   { 14112, 0x00004006 }, /* GL_LIGHT6 */
-   { 14122, 0x00004007 }, /* GL_LIGHT7 */
-   { 14132, 0x00000B50 }, /* GL_LIGHTING */
-   { 14144, 0x00000040 }, /* GL_LIGHTING_BIT */
-   { 14160, 0x00000B53 }, /* GL_LIGHT_MODEL_AMBIENT */
-   { 14183, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL */
-   { 14212, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL_EXT */
-   { 14245, 0x00000B51 }, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
-   { 14273, 0x00000B52 }, /* GL_LIGHT_MODEL_TWO_SIDE */
-   { 14297, 0x00001B01 }, /* GL_LINE */
-   { 14305, 0x00002601 }, /* GL_LINEAR */
-   { 14315, 0x00001208 }, /* GL_LINEAR_ATTENUATION */
-   { 14337, 0x00008170 }, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
-   { 14367, 0x0000844F }, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
-   { 14398, 0x00002703 }, /* GL_LINEAR_MIPMAP_LINEAR */
-   { 14422, 0x00002701 }, /* GL_LINEAR_MIPMAP_NEAREST */
-   { 14447, 0x00000001 }, /* GL_LINES */
-   { 14456, 0x00000004 }, /* GL_LINE_BIT */
-   { 14468, 0x00000002 }, /* GL_LINE_LOOP */
-   { 14481, 0x00000707 }, /* GL_LINE_RESET_TOKEN */
-   { 14501, 0x00000B20 }, /* GL_LINE_SMOOTH */
-   { 14516, 0x00000C52 }, /* GL_LINE_SMOOTH_HINT */
-   { 14536, 0x00000B24 }, /* GL_LINE_STIPPLE */
-   { 14552, 0x00000B25 }, /* GL_LINE_STIPPLE_PATTERN */
-   { 14576, 0x00000B26 }, /* GL_LINE_STIPPLE_REPEAT */
-   { 14599, 0x00000003 }, /* GL_LINE_STRIP */
-   { 14613, 0x00000702 }, /* GL_LINE_TOKEN */
-   { 14627, 0x00000B21 }, /* GL_LINE_WIDTH */
-   { 14641, 0x00000B23 }, /* GL_LINE_WIDTH_GRANULARITY */
-   { 14667, 0x00000B22 }, /* GL_LINE_WIDTH_RANGE */
-   { 14687, 0x00008B82 }, /* GL_LINK_STATUS */
-   { 14702, 0x00000B32 }, /* GL_LIST_BASE */
-   { 14715, 0x00020000 }, /* GL_LIST_BIT */
-   { 14727, 0x00000B33 }, /* GL_LIST_INDEX */
-   { 14741, 0x00000B30 }, /* GL_LIST_MODE */
-   { 14754, 0x00000101 }, /* GL_LOAD */
-   { 14762, 0x00000BF1 }, /* GL_LOGIC_OP */
-   { 14774, 0x00000BF0 }, /* GL_LOGIC_OP_MODE */
-   { 14791, 0x00008CA1 }, /* GL_LOWER_LEFT */
-   { 14805, 0x00001909 }, /* GL_LUMINANCE */
-   { 14818, 0x00008041 }, /* GL_LUMINANCE12 */
-   { 14833, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12 */
-   { 14856, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12_EXT */
-   { 14883, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4 */
-   { 14905, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4_EXT */
-   { 14931, 0x00008041 }, /* GL_LUMINANCE12_EXT */
-   { 14950, 0x00008042 }, /* GL_LUMINANCE16 */
-   { 14965, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16 */
-   { 14988, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16_EXT */
-   { 15015, 0x00008042 }, /* GL_LUMINANCE16_EXT */
-   { 15034, 0x0000803F }, /* GL_LUMINANCE4 */
-   { 15048, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4 */
-   { 15069, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4_EXT */
-   { 15094, 0x0000803F }, /* GL_LUMINANCE4_EXT */
-   { 15112, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2 */
-   { 15133, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2_EXT */
-   { 15158, 0x00008040 }, /* GL_LUMINANCE8 */
-   { 15172, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8 */
-   { 15193, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8_EXT */
-   { 15218, 0x00008040 }, /* GL_LUMINANCE8_EXT */
-   { 15236, 0x0000190A }, /* GL_LUMINANCE_ALPHA */
-   { 15255, 0x00000D90 }, /* GL_MAP1_COLOR_4 */
-   { 15271, 0x00000DD0 }, /* GL_MAP1_GRID_DOMAIN */
-   { 15291, 0x00000DD1 }, /* GL_MAP1_GRID_SEGMENTS */
-   { 15313, 0x00000D91 }, /* GL_MAP1_INDEX */
-   { 15327, 0x00000D92 }, /* GL_MAP1_NORMAL */
-   { 15342, 0x00000D93 }, /* GL_MAP1_TEXTURE_COORD_1 */
-   { 15366, 0x00000D94 }, /* GL_MAP1_TEXTURE_COORD_2 */
-   { 15390, 0x00000D95 }, /* GL_MAP1_TEXTURE_COORD_3 */
-   { 15414, 0x00000D96 }, /* GL_MAP1_TEXTURE_COORD_4 */
-   { 15438, 0x00000D97 }, /* GL_MAP1_VERTEX_3 */
-   { 15455, 0x00000D98 }, /* GL_MAP1_VERTEX_4 */
-   { 15472, 0x00008660 }, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
-   { 15500, 0x0000866A }, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
-   { 15529, 0x0000866B }, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
-   { 15558, 0x0000866C }, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
-   { 15587, 0x0000866D }, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
-   { 15616, 0x0000866E }, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
-   { 15645, 0x0000866F }, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
-   { 15674, 0x00008661 }, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
-   { 15702, 0x00008662 }, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
-   { 15730, 0x00008663 }, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
-   { 15758, 0x00008664 }, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
-   { 15786, 0x00008665 }, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
-   { 15814, 0x00008666 }, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
-   { 15842, 0x00008667 }, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
-   { 15870, 0x00008668 }, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
-   { 15898, 0x00008669 }, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
-   { 15926, 0x00000DB0 }, /* GL_MAP2_COLOR_4 */
-   { 15942, 0x00000DD2 }, /* GL_MAP2_GRID_DOMAIN */
-   { 15962, 0x00000DD3 }, /* GL_MAP2_GRID_SEGMENTS */
-   { 15984, 0x00000DB1 }, /* GL_MAP2_INDEX */
-   { 15998, 0x00000DB2 }, /* GL_MAP2_NORMAL */
-   { 16013, 0x00000DB3 }, /* GL_MAP2_TEXTURE_COORD_1 */
-   { 16037, 0x00000DB4 }, /* GL_MAP2_TEXTURE_COORD_2 */
-   { 16061, 0x00000DB5 }, /* GL_MAP2_TEXTURE_COORD_3 */
-   { 16085, 0x00000DB6 }, /* GL_MAP2_TEXTURE_COORD_4 */
-   { 16109, 0x00000DB7 }, /* GL_MAP2_VERTEX_3 */
-   { 16126, 0x00000DB8 }, /* GL_MAP2_VERTEX_4 */
-   { 16143, 0x00008670 }, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
-   { 16171, 0x0000867A }, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
-   { 16200, 0x0000867B }, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
-   { 16229, 0x0000867C }, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
-   { 16258, 0x0000867D }, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
-   { 16287, 0x0000867E }, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
-   { 16316, 0x0000867F }, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
-   { 16345, 0x00008671 }, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
-   { 16373, 0x00008672 }, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
-   { 16401, 0x00008673 }, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
-   { 16429, 0x00008674 }, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
-   { 16457, 0x00008675 }, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
-   { 16485, 0x00008676 }, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
-   { 16513, 0x00008677 }, /* GL_MAP2_VERTEX_ATTRIB7_4_NV */
-   { 16541, 0x00008678 }, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
-   { 16569, 0x00008679 }, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
-   { 16597, 0x00000D10 }, /* GL_MAP_COLOR */
-   { 16610, 0x00000D11 }, /* GL_MAP_STENCIL */
-   { 16625, 0x000088C0 }, /* GL_MATRIX0_ARB */
-   { 16640, 0x00008630 }, /* GL_MATRIX0_NV */
-   { 16654, 0x000088CA }, /* GL_MATRIX10_ARB */
-   { 16670, 0x000088CB }, /* GL_MATRIX11_ARB */
-   { 16686, 0x000088CC }, /* GL_MATRIX12_ARB */
-   { 16702, 0x000088CD }, /* GL_MATRIX13_ARB */
-   { 16718, 0x000088CE }, /* GL_MATRIX14_ARB */
-   { 16734, 0x000088CF }, /* GL_MATRIX15_ARB */
-   { 16750, 0x000088D0 }, /* GL_MATRIX16_ARB */
-   { 16766, 0x000088D1 }, /* GL_MATRIX17_ARB */
-   { 16782, 0x000088D2 }, /* GL_MATRIX18_ARB */
-   { 16798, 0x000088D3 }, /* GL_MATRIX19_ARB */
-   { 16814, 0x000088C1 }, /* GL_MATRIX1_ARB */
-   { 16829, 0x00008631 }, /* GL_MATRIX1_NV */
-   { 16843, 0x000088D4 }, /* GL_MATRIX20_ARB */
-   { 16859, 0x000088D5 }, /* GL_MATRIX21_ARB */
-   { 16875, 0x000088D6 }, /* GL_MATRIX22_ARB */
-   { 16891, 0x000088D7 }, /* GL_MATRIX23_ARB */
-   { 16907, 0x000088D8 }, /* GL_MATRIX24_ARB */
-   { 16923, 0x000088D9 }, /* GL_MATRIX25_ARB */
-   { 16939, 0x000088DA }, /* GL_MATRIX26_ARB */
-   { 16955, 0x000088DB }, /* GL_MATRIX27_ARB */
-   { 16971, 0x000088DC }, /* GL_MATRIX28_ARB */
-   { 16987, 0x000088DD }, /* GL_MATRIX29_ARB */
-   { 17003, 0x000088C2 }, /* GL_MATRIX2_ARB */
-   { 17018, 0x00008632 }, /* GL_MATRIX2_NV */
-   { 17032, 0x000088DE }, /* GL_MATRIX30_ARB */
-   { 17048, 0x000088DF }, /* GL_MATRIX31_ARB */
-   { 17064, 0x000088C3 }, /* GL_MATRIX3_ARB */
-   { 17079, 0x00008633 }, /* GL_MATRIX3_NV */
-   { 17093, 0x000088C4 }, /* GL_MATRIX4_ARB */
-   { 17108, 0x00008634 }, /* GL_MATRIX4_NV */
-   { 17122, 0x000088C5 }, /* GL_MATRIX5_ARB */
-   { 17137, 0x00008635 }, /* GL_MATRIX5_NV */
-   { 17151, 0x000088C6 }, /* GL_MATRIX6_ARB */
-   { 17166, 0x00008636 }, /* GL_MATRIX6_NV */
-   { 17180, 0x000088C7 }, /* GL_MATRIX7_ARB */
-   { 17195, 0x00008637 }, /* GL_MATRIX7_NV */
-   { 17209, 0x000088C8 }, /* GL_MATRIX8_ARB */
-   { 17224, 0x000088C9 }, /* GL_MATRIX9_ARB */
-   { 17239, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_ARB */
-   { 17265, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
-   { 17299, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
-   { 17330, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
-   { 17363, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
-   { 17394, 0x00000BA0 }, /* GL_MATRIX_MODE */
-   { 17409, 0x00008840 }, /* GL_MATRIX_PALETTE_ARB */
-   { 17431, 0x00008008 }, /* GL_MAX */
-   { 17438, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE */
-   { 17461, 0x000088FF }, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
-   { 17493, 0x00000D35 }, /* GL_MAX_ATTRIB_STACK_DEPTH */
-   { 17519, 0x00000D3B }, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
-   { 17552, 0x00008177 }, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
-   { 17578, 0x00008178 }, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-   { 17612, 0x00000D32 }, /* GL_MAX_CLIP_PLANES */
-   { 17631, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
-   { 17660, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
-   { 17692, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI */
-   { 17728, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
-   { 17764, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB */
-   { 17804, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT */
-   { 17830, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT_EXT */
-   { 17860, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH */
-   { 17885, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH_EXT */
-   { 17914, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
-   { 17943, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB */
-   { 17976, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS */
-   { 17996, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ARB */
-   { 18020, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ATI */
-   { 18044, 0x000080E9 }, /* GL_MAX_ELEMENTS_INDICES */
-   { 18068, 0x000080E8 }, /* GL_MAX_ELEMENTS_VERTICES */
-   { 18093, 0x00000D30 }, /* GL_MAX_EVAL_ORDER */
-   { 18111, 0x00008008 }, /* GL_MAX_EXT */
-   { 18122, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
-   { 18157, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB */
-   { 18196, 0x00000D31 }, /* GL_MAX_LIGHTS */
-   { 18210, 0x00000B31 }, /* GL_MAX_LIST_NESTING */
-   { 18230, 0x00008841 }, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
-   { 18268, 0x00000D36 }, /* GL_MAX_MODELVIEW_STACK_DEPTH */
-   { 18297, 0x00000D37 }, /* GL_MAX_NAME_STACK_DEPTH */
-   { 18321, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_ARB */
-   { 18349, 0x00000D34 }, /* GL_MAX_PIXEL_MAP_TABLE */
-   { 18372, 0x000088B1 }, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
-   { 18409, 0x0000880B }, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
-   { 18445, 0x000088AD }, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
-   { 18472, 0x000088F5 }, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
-   { 18501, 0x000088B5 }, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
-   { 18535, 0x000088F4 }, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
-   { 18571, 0x000088F6 }, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
-   { 18598, 0x000088A1 }, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
-   { 18630, 0x000088B4 }, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
-   { 18666, 0x000088F8 }, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
-   { 18695, 0x000088F7 }, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
-   { 18724, 0x0000862F }, /* GL_MAX_PROGRAM_MATRICES_ARB */
-   { 18752, 0x0000862E }, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
-   { 18790, 0x000088B3 }, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-   { 18834, 0x0000880E }, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-   { 18877, 0x000088AF }, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
-   { 18911, 0x000088A3 }, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-   { 18950, 0x000088AB }, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
-   { 18987, 0x000088A7 }, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
-   { 19025, 0x00008810 }, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-   { 19068, 0x0000880F }, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-   { 19111, 0x000088A9 }, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
-   { 19141, 0x000088A5 }, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
-   { 19172, 0x0000880D }, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
-   { 19208, 0x0000880C }, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
-   { 19244, 0x00000D38 }, /* GL_MAX_PROJECTION_STACK_DEPTH */
-   { 19274, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
-   { 19308, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_NV */
-   { 19341, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
-   { 19370, 0x00008D57 }, /* GL_MAX_SAMPLES */
-   { 19385, 0x00008504 }, /* GL_MAX_SHININESS_NV */
-   { 19405, 0x00008505 }, /* GL_MAX_SPOT_EXPONENT_NV */
-   { 19429, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS */
-   { 19451, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS_ARB */
-   { 19477, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS */
-   { 19504, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS_ARB */
-   { 19535, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS */
-   { 19559, 0x000084FF }, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
-   { 19593, 0x00000D33 }, /* GL_MAX_TEXTURE_SIZE */
-   { 19613, 0x00000D39 }, /* GL_MAX_TEXTURE_STACK_DEPTH */
-   { 19640, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS */
-   { 19661, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS_ARB */
-   { 19686, 0x0000862F }, /* GL_MAX_TRACK_MATRICES_NV */
-   { 19711, 0x0000862E }, /* GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */
-   { 19746, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS */
-   { 19768, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS_ARB */
-   { 19794, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS */
-   { 19816, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS_ARB */
-   { 19842, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
-   { 19876, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
-   { 19914, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
-   { 19947, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB */
-   { 19984, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_ARB */
-   { 20008, 0x00000D3A }, /* GL_MAX_VIEWPORT_DIMS */
-   { 20029, 0x00008007 }, /* GL_MIN */
-   { 20036, 0x0000802E }, /* GL_MINMAX */
-   { 20046, 0x0000802E }, /* GL_MINMAX_EXT */
-   { 20060, 0x0000802F }, /* GL_MINMAX_FORMAT */
-   { 20077, 0x0000802F }, /* GL_MINMAX_FORMAT_EXT */
-   { 20098, 0x00008030 }, /* GL_MINMAX_SINK */
-   { 20113, 0x00008030 }, /* GL_MINMAX_SINK_EXT */
-   { 20132, 0x00008007 }, /* GL_MIN_EXT */
-   { 20143, 0x00008370 }, /* GL_MIRRORED_REPEAT */
-   { 20162, 0x00008370 }, /* GL_MIRRORED_REPEAT_ARB */
-   { 20185, 0x00008370 }, /* GL_MIRRORED_REPEAT_IBM */
-   { 20208, 0x00008742 }, /* GL_MIRROR_CLAMP_ATI */
-   { 20228, 0x00008742 }, /* GL_MIRROR_CLAMP_EXT */
-   { 20248, 0x00008912 }, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
-   { 20278, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_ATI */
-   { 20306, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
-   { 20334, 0x00001700 }, /* GL_MODELVIEW */
-   { 20347, 0x00001700 }, /* GL_MODELVIEW0_ARB */
-   { 20365, 0x0000872A }, /* GL_MODELVIEW10_ARB */
-   { 20384, 0x0000872B }, /* GL_MODELVIEW11_ARB */
-   { 20403, 0x0000872C }, /* GL_MODELVIEW12_ARB */
-   { 20422, 0x0000872D }, /* GL_MODELVIEW13_ARB */
-   { 20441, 0x0000872E }, /* GL_MODELVIEW14_ARB */
-   { 20460, 0x0000872F }, /* GL_MODELVIEW15_ARB */
-   { 20479, 0x00008730 }, /* GL_MODELVIEW16_ARB */
-   { 20498, 0x00008731 }, /* GL_MODELVIEW17_ARB */
-   { 20517, 0x00008732 }, /* GL_MODELVIEW18_ARB */
-   { 20536, 0x00008733 }, /* GL_MODELVIEW19_ARB */
-   { 20555, 0x0000850A }, /* GL_MODELVIEW1_ARB */
-   { 20573, 0x00008734 }, /* GL_MODELVIEW20_ARB */
-   { 20592, 0x00008735 }, /* GL_MODELVIEW21_ARB */
-   { 20611, 0x00008736 }, /* GL_MODELVIEW22_ARB */
-   { 20630, 0x00008737 }, /* GL_MODELVIEW23_ARB */
-   { 20649, 0x00008738 }, /* GL_MODELVIEW24_ARB */
-   { 20668, 0x00008739 }, /* GL_MODELVIEW25_ARB */
-   { 20687, 0x0000873A }, /* GL_MODELVIEW26_ARB */
-   { 20706, 0x0000873B }, /* GL_MODELVIEW27_ARB */
-   { 20725, 0x0000873C }, /* GL_MODELVIEW28_ARB */
-   { 20744, 0x0000873D }, /* GL_MODELVIEW29_ARB */
-   { 20763, 0x00008722 }, /* GL_MODELVIEW2_ARB */
-   { 20781, 0x0000873E }, /* GL_MODELVIEW30_ARB */
-   { 20800, 0x0000873F }, /* GL_MODELVIEW31_ARB */
-   { 20819, 0x00008723 }, /* GL_MODELVIEW3_ARB */
-   { 20837, 0x00008724 }, /* GL_MODELVIEW4_ARB */
-   { 20855, 0x00008725 }, /* GL_MODELVIEW5_ARB */
-   { 20873, 0x00008726 }, /* GL_MODELVIEW6_ARB */
-   { 20891, 0x00008727 }, /* GL_MODELVIEW7_ARB */
-   { 20909, 0x00008728 }, /* GL_MODELVIEW8_ARB */
-   { 20927, 0x00008729 }, /* GL_MODELVIEW9_ARB */
-   { 20945, 0x00000BA6 }, /* GL_MODELVIEW_MATRIX */
-   { 20965, 0x00008629 }, /* GL_MODELVIEW_PROJECTION_NV */
-   { 20992, 0x00000BA3 }, /* GL_MODELVIEW_STACK_DEPTH */
-   { 21017, 0x00002100 }, /* GL_MODULATE */
-   { 21029, 0x00008744 }, /* GL_MODULATE_ADD_ATI */
-   { 21049, 0x00008745 }, /* GL_MODULATE_SIGNED_ADD_ATI */
-   { 21076, 0x00008746 }, /* GL_MODULATE_SUBTRACT_ATI */
-   { 21101, 0x00000103 }, /* GL_MULT */
-   { 21109, 0x0000809D }, /* GL_MULTISAMPLE */
-   { 21124, 0x000086B2 }, /* GL_MULTISAMPLE_3DFX */
-   { 21144, 0x0000809D }, /* GL_MULTISAMPLE_ARB */
-   { 21163, 0x20000000 }, /* GL_MULTISAMPLE_BIT */
-   { 21182, 0x20000000 }, /* GL_MULTISAMPLE_BIT_3DFX */
-   { 21206, 0x20000000 }, /* GL_MULTISAMPLE_BIT_ARB */
-   { 21229, 0x00008534 }, /* GL_MULTISAMPLE_FILTER_HINT_NV */
-   { 21259, 0x00002A25 }, /* GL_N3F_V3F */
-   { 21270, 0x00000D70 }, /* GL_NAME_STACK_DEPTH */
-   { 21290, 0x0000150E }, /* GL_NAND */
-   { 21298, 0x00002600 }, /* GL_NEAREST */
-   { 21309, 0x0000844E }, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
-   { 21340, 0x0000844D }, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
-   { 21372, 0x00002702 }, /* GL_NEAREST_MIPMAP_LINEAR */
-   { 21397, 0x00002700 }, /* GL_NEAREST_MIPMAP_NEAREST */
-   { 21423, 0x00000200 }, /* GL_NEVER */
-   { 21432, 0x00001102 }, /* GL_NICEST */
-   { 21442, 0x00000000 }, /* GL_NONE */
-   { 21450, 0x00001505 }, /* GL_NOOP */
-   { 21458, 0x00001508 }, /* GL_NOR */
-   { 21465, 0x00000BA1 }, /* GL_NORMALIZE */
-   { 21478, 0x00008075 }, /* GL_NORMAL_ARRAY */
-   { 21494, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
-   { 21525, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING_ARB */
-   { 21560, 0x0000808F }, /* GL_NORMAL_ARRAY_POINTER */
-   { 21584, 0x0000807F }, /* GL_NORMAL_ARRAY_STRIDE */
-   { 21607, 0x0000807E }, /* GL_NORMAL_ARRAY_TYPE */
-   { 21628, 0x00008511 }, /* GL_NORMAL_MAP */
-   { 21642, 0x00008511 }, /* GL_NORMAL_MAP_ARB */
-   { 21660, 0x00008511 }, /* GL_NORMAL_MAP_NV */
-   { 21677, 0x00000205 }, /* GL_NOTEQUAL */
-   { 21689, 0x00000000 }, /* GL_NO_ERROR */
-   { 21701, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
-   { 21735, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB */
-   { 21773, 0x00008B89 }, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */
-   { 21805, 0x00008B8A }, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */
-   { 21847, 0x00008B86 }, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */
-   { 21877, 0x00008B87 }, /* GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB */
-   { 21917, 0x00008B85 }, /* GL_OBJECT_ATTACHED_OBJECTS_ARB */
-   { 21948, 0x00008B81 }, /* GL_OBJECT_COMPILE_STATUS_ARB */
-   { 21977, 0x00008B80 }, /* GL_OBJECT_DELETE_STATUS_ARB */
-   { 22005, 0x00008B84 }, /* GL_OBJECT_INFO_LOG_LENGTH_ARB */
-   { 22035, 0x00002401 }, /* GL_OBJECT_LINEAR */
-   { 22052, 0x00008B82 }, /* GL_OBJECT_LINK_STATUS_ARB */
-   { 22078, 0x00002501 }, /* GL_OBJECT_PLANE */
-   { 22094, 0x00008B88 }, /* GL_OBJECT_SHADER_SOURCE_LENGTH_ARB */
-   { 22129, 0x00008B4F }, /* GL_OBJECT_SUBTYPE_ARB */
-   { 22151, 0x00008B4E }, /* GL_OBJECT_TYPE_ARB */
-   { 22170, 0x00008B83 }, /* GL_OBJECT_VALIDATE_STATUS_ARB */
-   { 22200, 0x00008165 }, /* GL_OCCLUSION_TEST_HP */
-   { 22221, 0x00008166 }, /* GL_OCCLUSION_TEST_RESULT_HP */
-   { 22249, 0x00000001 }, /* GL_ONE */
-   { 22256, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA */
-   { 22284, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA_EXT */
-   { 22316, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR */
-   { 22344, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR_EXT */
-   { 22376, 0x00000305 }, /* GL_ONE_MINUS_DST_ALPHA */
-   { 22399, 0x00000307 }, /* GL_ONE_MINUS_DST_COLOR */
-   { 22422, 0x00000303 }, /* GL_ONE_MINUS_SRC_ALPHA */
-   { 22445, 0x00000301 }, /* GL_ONE_MINUS_SRC_COLOR */
-   { 22468, 0x00008598 }, /* GL_OPERAND0_ALPHA */
-   { 22486, 0x00008598 }, /* GL_OPERAND0_ALPHA_ARB */
-   { 22508, 0x00008598 }, /* GL_OPERAND0_ALPHA_EXT */
-   { 22530, 0x00008590 }, /* GL_OPERAND0_RGB */
-   { 22546, 0x00008590 }, /* GL_OPERAND0_RGB_ARB */
-   { 22566, 0x00008590 }, /* GL_OPERAND0_RGB_EXT */
-   { 22586, 0x00008599 }, /* GL_OPERAND1_ALPHA */
-   { 22604, 0x00008599 }, /* GL_OPERAND1_ALPHA_ARB */
-   { 22626, 0x00008599 }, /* GL_OPERAND1_ALPHA_EXT */
-   { 22648, 0x00008591 }, /* GL_OPERAND1_RGB */
-   { 22664, 0x00008591 }, /* GL_OPERAND1_RGB_ARB */
-   { 22684, 0x00008591 }, /* GL_OPERAND1_RGB_EXT */
-   { 22704, 0x0000859A }, /* GL_OPERAND2_ALPHA */
-   { 22722, 0x0000859A }, /* GL_OPERAND2_ALPHA_ARB */
-   { 22744, 0x0000859A }, /* GL_OPERAND2_ALPHA_EXT */
-   { 22766, 0x00008592 }, /* GL_OPERAND2_RGB */
-   { 22782, 0x00008592 }, /* GL_OPERAND2_RGB_ARB */
-   { 22802, 0x00008592 }, /* GL_OPERAND2_RGB_EXT */
-   { 22822, 0x0000859B }, /* GL_OPERAND3_ALPHA_NV */
-   { 22843, 0x00008593 }, /* GL_OPERAND3_RGB_NV */
-   { 22862, 0x00001507 }, /* GL_OR */
-   { 22868, 0x00000A01 }, /* GL_ORDER */
-   { 22877, 0x0000150D }, /* GL_OR_INVERTED */
-   { 22892, 0x0000150B }, /* GL_OR_REVERSE */
-   { 22906, 0x00000505 }, /* GL_OUT_OF_MEMORY */
-   { 22923, 0x00000D05 }, /* GL_PACK_ALIGNMENT */
-   { 22941, 0x0000806C }, /* GL_PACK_IMAGE_HEIGHT */
-   { 22962, 0x00008758 }, /* GL_PACK_INVERT_MESA */
-   { 22982, 0x00000D01 }, /* GL_PACK_LSB_FIRST */
-   { 23000, 0x00000D02 }, /* GL_PACK_ROW_LENGTH */
-   { 23019, 0x0000806B }, /* GL_PACK_SKIP_IMAGES */
-   { 23039, 0x00000D04 }, /* GL_PACK_SKIP_PIXELS */
-   { 23059, 0x00000D03 }, /* GL_PACK_SKIP_ROWS */
-   { 23077, 0x00000D00 }, /* GL_PACK_SWAP_BYTES */
-   { 23096, 0x00008B92 }, /* GL_PALETTE4_R5_G6_B5_OES */
-   { 23121, 0x00008B94 }, /* GL_PALETTE4_RGB5_A1_OES */
-   { 23145, 0x00008B90 }, /* GL_PALETTE4_RGB8_OES */
-   { 23166, 0x00008B93 }, /* GL_PALETTE4_RGBA4_OES */
-   { 23188, 0x00008B91 }, /* GL_PALETTE4_RGBA8_OES */
-   { 23210, 0x00008B97 }, /* GL_PALETTE8_R5_G6_B5_OES */
-   { 23235, 0x00008B99 }, /* GL_PALETTE8_RGB5_A1_OES */
-   { 23259, 0x00008B95 }, /* GL_PALETTE8_RGB8_OES */
-   { 23280, 0x00008B98 }, /* GL_PALETTE8_RGBA4_OES */
-   { 23302, 0x00008B96 }, /* GL_PALETTE8_RGBA8_OES */
-   { 23324, 0x00000700 }, /* GL_PASS_THROUGH_TOKEN */
-   { 23346, 0x00000C50 }, /* GL_PERSPECTIVE_CORRECTION_HINT */
-   { 23377, 0x00000C79 }, /* GL_PIXEL_MAP_A_TO_A */
-   { 23397, 0x00000CB9 }, /* GL_PIXEL_MAP_A_TO_A_SIZE */
-   { 23422, 0x00000C78 }, /* GL_PIXEL_MAP_B_TO_B */
-   { 23442, 0x00000CB8 }, /* GL_PIXEL_MAP_B_TO_B_SIZE */
-   { 23467, 0x00000C77 }, /* GL_PIXEL_MAP_G_TO_G */
-   { 23487, 0x00000CB7 }, /* GL_PIXEL_MAP_G_TO_G_SIZE */
-   { 23512, 0x00000C75 }, /* GL_PIXEL_MAP_I_TO_A */
-   { 23532, 0x00000CB5 }, /* GL_PIXEL_MAP_I_TO_A_SIZE */
-   { 23557, 0x00000C74 }, /* GL_PIXEL_MAP_I_TO_B */
-   { 23577, 0x00000CB4 }, /* GL_PIXEL_MAP_I_TO_B_SIZE */
-   { 23602, 0x00000C73 }, /* GL_PIXEL_MAP_I_TO_G */
-   { 23622, 0x00000CB3 }, /* GL_PIXEL_MAP_I_TO_G_SIZE */
-   { 23647, 0x00000C70 }, /* GL_PIXEL_MAP_I_TO_I */
-   { 23667, 0x00000CB0 }, /* GL_PIXEL_MAP_I_TO_I_SIZE */
-   { 23692, 0x00000C72 }, /* GL_PIXEL_MAP_I_TO_R */
-   { 23712, 0x00000CB2 }, /* GL_PIXEL_MAP_I_TO_R_SIZE */
-   { 23737, 0x00000C76 }, /* GL_PIXEL_MAP_R_TO_R */
-   { 23757, 0x00000CB6 }, /* GL_PIXEL_MAP_R_TO_R_SIZE */
-   { 23782, 0x00000C71 }, /* GL_PIXEL_MAP_S_TO_S */
-   { 23802, 0x00000CB1 }, /* GL_PIXEL_MAP_S_TO_S_SIZE */
-   { 23827, 0x00000020 }, /* GL_PIXEL_MODE_BIT */
-   { 23845, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING_EXT */
-   { 23878, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER_EXT */
-   { 23903, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING_EXT */
-   { 23938, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER_EXT */
-   { 23965, 0x00001B00 }, /* GL_POINT */
-   { 23974, 0x00000000 }, /* GL_POINTS */
-   { 23984, 0x00000002 }, /* GL_POINT_BIT */
-   { 23997, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION */
-   { 24027, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_ARB */
-   { 24061, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_EXT */
-   { 24095, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_SGIS */
-   { 24130, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE */
-   { 24159, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_ARB */
-   { 24192, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_EXT */
-   { 24225, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_SGIS */
-   { 24259, 0x00000B11 }, /* GL_POINT_SIZE */
-   { 24273, 0x00000B13 }, /* GL_POINT_SIZE_GRANULARITY */
-   { 24299, 0x00008127 }, /* GL_POINT_SIZE_MAX */
-   { 24317, 0x00008127 }, /* GL_POINT_SIZE_MAX_ARB */
-   { 24339, 0x00008127 }, /* GL_POINT_SIZE_MAX_EXT */
-   { 24361, 0x00008127 }, /* GL_POINT_SIZE_MAX_SGIS */
-   { 24384, 0x00008126 }, /* GL_POINT_SIZE_MIN */
-   { 24402, 0x00008126 }, /* GL_POINT_SIZE_MIN_ARB */
-   { 24424, 0x00008126 }, /* GL_POINT_SIZE_MIN_EXT */
-   { 24446, 0x00008126 }, /* GL_POINT_SIZE_MIN_SGIS */
-   { 24469, 0x00000B12 }, /* GL_POINT_SIZE_RANGE */
-   { 24489, 0x00000B10 }, /* GL_POINT_SMOOTH */
-   { 24505, 0x00000C51 }, /* GL_POINT_SMOOTH_HINT */
-   { 24526, 0x00008861 }, /* GL_POINT_SPRITE */
-   { 24542, 0x00008861 }, /* GL_POINT_SPRITE_ARB */
-   { 24562, 0x00008CA0 }, /* GL_POINT_SPRITE_COORD_ORIGIN */
-   { 24591, 0x00008861 }, /* GL_POINT_SPRITE_NV */
-   { 24610, 0x00008863 }, /* GL_POINT_SPRITE_R_MODE_NV */
-   { 24636, 0x00000701 }, /* GL_POINT_TOKEN */
-   { 24651, 0x00000009 }, /* GL_POLYGON */
-   { 24662, 0x00000008 }, /* GL_POLYGON_BIT */
-   { 24677, 0x00000B40 }, /* GL_POLYGON_MODE */
-   { 24693, 0x00008039 }, /* GL_POLYGON_OFFSET_BIAS */
-   { 24716, 0x00008038 }, /* GL_POLYGON_OFFSET_FACTOR */
-   { 24741, 0x00008037 }, /* GL_POLYGON_OFFSET_FILL */
-   { 24764, 0x00002A02 }, /* GL_POLYGON_OFFSET_LINE */
-   { 24787, 0x00002A01 }, /* GL_POLYGON_OFFSET_POINT */
-   { 24811, 0x00002A00 }, /* GL_POLYGON_OFFSET_UNITS */
-   { 24835, 0x00000B41 }, /* GL_POLYGON_SMOOTH */
-   { 24853, 0x00000C53 }, /* GL_POLYGON_SMOOTH_HINT */
-   { 24876, 0x00000B42 }, /* GL_POLYGON_STIPPLE */
-   { 24895, 0x00000010 }, /* GL_POLYGON_STIPPLE_BIT */
-   { 24918, 0x00000703 }, /* GL_POLYGON_TOKEN */
-   { 24935, 0x00001203 }, /* GL_POSITION */
-   { 24947, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
-   { 24979, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI */
-   { 25015, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
-   { 25048, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI */
-   { 25085, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
-   { 25116, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI */
-   { 25151, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
-   { 25183, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI */
-   { 25219, 0x000080D2 }, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
-   { 25252, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
-   { 25284, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI */
-   { 25320, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
-   { 25353, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI */
-   { 25390, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS */
-   { 25420, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS_SGI */
-   { 25454, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE */
-   { 25485, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE_SGI */
-   { 25520, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
-   { 25551, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS_EXT */
-   { 25586, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
-   { 25618, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE_EXT */
-   { 25654, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS */
-   { 25684, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS_EXT */
-   { 25718, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE */
-   { 25749, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE_EXT */
-   { 25784, 0x000080D1 }, /* GL_POST_CONVOLUTION_COLOR_TABLE */
-   { 25816, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS */
-   { 25847, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS_EXT */
-   { 25882, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE */
-   { 25914, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE_EXT */
-   { 25950, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS */
-   { 25979, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS_EXT */
-   { 26012, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE */
-   { 26042, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE_EXT */
-   { 26076, 0x0000817B }, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
-   { 26115, 0x00008179 }, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
-   { 26148, 0x0000817C }, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
-   { 26188, 0x0000817A }, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
-   { 26222, 0x00008578 }, /* GL_PREVIOUS */
-   { 26234, 0x00008578 }, /* GL_PREVIOUS_ARB */
-   { 26250, 0x00008578 }, /* GL_PREVIOUS_EXT */
-   { 26266, 0x00008577 }, /* GL_PRIMARY_COLOR */
-   { 26283, 0x00008577 }, /* GL_PRIMARY_COLOR_ARB */
-   { 26304, 0x00008577 }, /* GL_PRIMARY_COLOR_EXT */
-   { 26325, 0x000088B0 }, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
-   { 26358, 0x00008805 }, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
-   { 26390, 0x000088AC }, /* GL_PROGRAM_ATTRIBS_ARB */
-   { 26413, 0x00008677 }, /* GL_PROGRAM_BINDING_ARB */
-   { 26436, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_ARB */
-   { 26466, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_NV */
-   { 26495, 0x00008874 }, /* GL_PROGRAM_ERROR_STRING_ARB */
-   { 26523, 0x00008876 }, /* GL_PROGRAM_FORMAT_ARB */
-   { 26545, 0x00008875 }, /* GL_PROGRAM_FORMAT_ASCII_ARB */
-   { 26573, 0x000088A0 }, /* GL_PROGRAM_INSTRUCTIONS_ARB */
-   { 26601, 0x00008627 }, /* GL_PROGRAM_LENGTH_ARB */
-   { 26623, 0x00008627 }, /* GL_PROGRAM_LENGTH_NV */
-   { 26644, 0x000088B2 }, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-   { 26684, 0x00008808 }, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-   { 26723, 0x000088AE }, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
-   { 26753, 0x000088A2 }, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-   { 26788, 0x000088AA }, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
-   { 26821, 0x000088A6 }, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
-   { 26855, 0x0000880A }, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-   { 26894, 0x00008809 }, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-   { 26933, 0x00008B40 }, /* GL_PROGRAM_OBJECT_ARB */
-   { 26955, 0x000088A8 }, /* GL_PROGRAM_PARAMETERS_ARB */
-   { 26981, 0x00008644 }, /* GL_PROGRAM_PARAMETER_NV */
-   { 27005, 0x00008647 }, /* GL_PROGRAM_RESIDENT_NV */
-   { 27028, 0x00008628 }, /* GL_PROGRAM_STRING_ARB */
-   { 27050, 0x00008628 }, /* GL_PROGRAM_STRING_NV */
-   { 27071, 0x00008646 }, /* GL_PROGRAM_TARGET_NV */
-   { 27092, 0x000088A4 }, /* GL_PROGRAM_TEMPORARIES_ARB */
-   { 27119, 0x00008807 }, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
-   { 27151, 0x00008806 }, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
-   { 27183, 0x000088B6 }, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-   { 27218, 0x00001701 }, /* GL_PROJECTION */
-   { 27232, 0x00000BA7 }, /* GL_PROJECTION_MATRIX */
-   { 27253, 0x00000BA4 }, /* GL_PROJECTION_STACK_DEPTH */
-   { 27279, 0x000080D3 }, /* GL_PROXY_COLOR_TABLE */
-   { 27300, 0x00008025 }, /* GL_PROXY_HISTOGRAM */
-   { 27319, 0x00008025 }, /* GL_PROXY_HISTOGRAM_EXT */
-   { 27342, 0x000080D5 }, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
-   { 27381, 0x000080D4 }, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
-   { 27419, 0x00008063 }, /* GL_PROXY_TEXTURE_1D */
-   { 27439, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
-   { 27469, 0x00008063 }, /* GL_PROXY_TEXTURE_1D_EXT */
-   { 27493, 0x00008064 }, /* GL_PROXY_TEXTURE_2D */
-   { 27513, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
-   { 27543, 0x00008064 }, /* GL_PROXY_TEXTURE_2D_EXT */
-   { 27567, 0x00008070 }, /* GL_PROXY_TEXTURE_3D */
-   { 27587, 0x000080BD }, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
-   { 27620, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP */
-   { 27646, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP_ARB */
-   { 27676, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
-   { 27707, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_NV */
-   { 27737, 0x00002003 }, /* GL_Q */
-   { 27742, 0x00001209 }, /* GL_QUADRATIC_ATTENUATION */
-   { 27767, 0x00000007 }, /* GL_QUADS */
-   { 27776, 0x00008614 }, /* GL_QUAD_MESH_SUN */
-   { 27793, 0x00000008 }, /* GL_QUAD_STRIP */
-   { 27807, 0x00008864 }, /* GL_QUERY_COUNTER_BITS */
-   { 27829, 0x00008864 }, /* GL_QUERY_COUNTER_BITS_ARB */
-   { 27855, 0x00008866 }, /* GL_QUERY_RESULT */
-   { 27871, 0x00008866 }, /* GL_QUERY_RESULT_ARB */
-   { 27891, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE */
-   { 27917, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE_ARB */
-   { 27947, 0x00002002 }, /* GL_R */
-   { 27952, 0x00002A10 }, /* GL_R3_G3_B2 */
-   { 27964, 0x00019262 }, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
-   { 27997, 0x00000C02 }, /* GL_READ_BUFFER */
-   { 28012, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER */
-   { 28032, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
-   { 28064, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER_EXT */
-   { 28088, 0x000088B8 }, /* GL_READ_ONLY */
-   { 28101, 0x000088B8 }, /* GL_READ_ONLY_ARB */
-   { 28118, 0x000088BA }, /* GL_READ_WRITE */
-   { 28132, 0x000088BA }, /* GL_READ_WRITE_ARB */
-   { 28150, 0x00001903 }, /* GL_RED */
-   { 28157, 0x00008016 }, /* GL_REDUCE */
-   { 28167, 0x00008016 }, /* GL_REDUCE_EXT */
-   { 28181, 0x00000D15 }, /* GL_RED_BIAS */
-   { 28193, 0x00000D52 }, /* GL_RED_BITS */
-   { 28205, 0x00000D14 }, /* GL_RED_SCALE */
-   { 28218, 0x00008512 }, /* GL_REFLECTION_MAP */
-   { 28236, 0x00008512 }, /* GL_REFLECTION_MAP_ARB */
-   { 28258, 0x00008512 }, /* GL_REFLECTION_MAP_NV */
-   { 28279, 0x00001C00 }, /* GL_RENDER */
-   { 28289, 0x00008D41 }, /* GL_RENDERBUFFER */
-   { 28305, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE */
-   { 28332, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_EXT */
-   { 28360, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE */
-   { 28386, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE */
-   { 28413, 0x00008D41 }, /* GL_RENDERBUFFER_EXT */
-   { 28433, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE */
-   { 28460, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT */
-   { 28483, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_EXT */
-   { 28510, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
-   { 28542, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */
-   { 28578, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE */
-   { 28603, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES */
-   { 28627, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE */
-   { 28656, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH */
-   { 28678, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_EXT */
-   { 28704, 0x00001F01 }, /* GL_RENDERER */
-   { 28716, 0x00000C40 }, /* GL_RENDER_MODE */
-   { 28731, 0x00002901 }, /* GL_REPEAT */
-   { 28741, 0x00001E01 }, /* GL_REPLACE */
-   { 28752, 0x00008062 }, /* GL_REPLACE_EXT */
-   { 28767, 0x00008153 }, /* GL_REPLICATE_BORDER_HP */
-   { 28790, 0x0000803A }, /* GL_RESCALE_NORMAL */
-   { 28808, 0x0000803A }, /* GL_RESCALE_NORMAL_EXT */
-   { 28830, 0x00000102 }, /* GL_RETURN */
-   { 28840, 0x00001907 }, /* GL_RGB */
-   { 28847, 0x00008052 }, /* GL_RGB10 */
-   { 28856, 0x00008059 }, /* GL_RGB10_A2 */
-   { 28868, 0x00008059 }, /* GL_RGB10_A2_EXT */
-   { 28884, 0x00008052 }, /* GL_RGB10_EXT */
-   { 28897, 0x00008053 }, /* GL_RGB12 */
-   { 28906, 0x00008053 }, /* GL_RGB12_EXT */
-   { 28919, 0x00008054 }, /* GL_RGB16 */
-   { 28928, 0x00008054 }, /* GL_RGB16_EXT */
-   { 28941, 0x0000804E }, /* GL_RGB2_EXT */
-   { 28953, 0x0000804F }, /* GL_RGB4 */
-   { 28961, 0x0000804F }, /* GL_RGB4_EXT */
-   { 28973, 0x000083A1 }, /* GL_RGB4_S3TC */
-   { 28986, 0x00008050 }, /* GL_RGB5 */
-   { 28994, 0x00008057 }, /* GL_RGB5_A1 */
-   { 29005, 0x00008057 }, /* GL_RGB5_A1_EXT */
-   { 29020, 0x00008050 }, /* GL_RGB5_EXT */
-   { 29032, 0x00008051 }, /* GL_RGB8 */
-   { 29040, 0x00008051 }, /* GL_RGB8_EXT */
-   { 29052, 0x00001908 }, /* GL_RGBA */
-   { 29060, 0x0000805A }, /* GL_RGBA12 */
-   { 29070, 0x0000805A }, /* GL_RGBA12_EXT */
-   { 29084, 0x0000805B }, /* GL_RGBA16 */
-   { 29094, 0x0000805B }, /* GL_RGBA16_EXT */
-   { 29108, 0x00008055 }, /* GL_RGBA2 */
-   { 29117, 0x00008055 }, /* GL_RGBA2_EXT */
-   { 29130, 0x00008056 }, /* GL_RGBA4 */
-   { 29139, 0x000083A5 }, /* GL_RGBA4_DXT5_S3TC */
-   { 29158, 0x00008056 }, /* GL_RGBA4_EXT */
-   { 29171, 0x000083A3 }, /* GL_RGBA4_S3TC */
-   { 29185, 0x00008058 }, /* GL_RGBA8 */
-   { 29194, 0x00008058 }, /* GL_RGBA8_EXT */
-   { 29207, 0x000083A4 }, /* GL_RGBA_DXT5_S3TC */
-   { 29225, 0x00000C31 }, /* GL_RGBA_MODE */
-   { 29238, 0x000083A2 }, /* GL_RGBA_S3TC */
-   { 29251, 0x000083A0 }, /* GL_RGB_S3TC */
-   { 29263, 0x00008573 }, /* GL_RGB_SCALE */
-   { 29276, 0x00008573 }, /* GL_RGB_SCALE_ARB */
-   { 29293, 0x00008573 }, /* GL_RGB_SCALE_EXT */
-   { 29310, 0x00000407 }, /* GL_RIGHT */
-   { 29319, 0x00002000 }, /* GL_S */
-   { 29324, 0x00008B5D }, /* GL_SAMPLER_1D */
-   { 29338, 0x00008B61 }, /* GL_SAMPLER_1D_SHADOW */
-   { 29359, 0x00008B5E }, /* GL_SAMPLER_2D */
-   { 29373, 0x00008B62 }, /* GL_SAMPLER_2D_SHADOW */
-   { 29394, 0x00008B5F }, /* GL_SAMPLER_3D */
-   { 29408, 0x00008B60 }, /* GL_SAMPLER_CUBE */
-   { 29424, 0x000080A9 }, /* GL_SAMPLES */
-   { 29435, 0x000086B4 }, /* GL_SAMPLES_3DFX */
-   { 29451, 0x000080A9 }, /* GL_SAMPLES_ARB */
-   { 29466, 0x00008914 }, /* GL_SAMPLES_PASSED */
-   { 29484, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */
-   { 29506, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
-   { 29534, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */
-   { 29566, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */
-   { 29589, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */
-   { 29616, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */
-   { 29634, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */
-   { 29657, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */
-   { 29679, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */
-   { 29698, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */
-   { 29721, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */
-   { 29747, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */
-   { 29777, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */
-   { 29802, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */
-   { 29831, 0x00080000 }, /* GL_SCISSOR_BIT */
-   { 29846, 0x00000C10 }, /* GL_SCISSOR_BOX */
-   { 29861, 0x00000C11 }, /* GL_SCISSOR_TEST */
-   { 29877, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */
-   { 29902, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
-   { 29942, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */
-   { 29986, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
-   { 30019, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
-   { 30049, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
-   { 30081, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
-   { 30111, 0x00001C02 }, /* GL_SELECT */
-   { 30121, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */
-   { 30149, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */
-   { 30174, 0x00008012 }, /* GL_SEPARABLE_2D */
-   { 30190, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */
-   { 30217, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */
-   { 30248, 0x0000150F }, /* GL_SET */
-   { 30255, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */
-   { 30276, 0x00008B88 }, /* GL_SHADER_SOURCE_LENGTH */
-   { 30300, 0x00008B4F }, /* GL_SHADER_TYPE */
-   { 30315, 0x00000B54 }, /* GL_SHADE_MODEL */
-   { 30330, 0x00008B8C }, /* GL_SHADING_LANGUAGE_VERSION */
-   { 30358, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */
-   { 30381, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */
-   { 30411, 0x00001601 }, /* GL_SHININESS */
-   { 30424, 0x00001402 }, /* GL_SHORT */
-   { 30433, 0x000081F9 }, /* GL_SINGLE_COLOR */
-   { 30449, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */
-   { 30469, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */
-   { 30488, 0x00001D01 }, /* GL_SMOOTH */
-   { 30498, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */
-   { 30531, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */
-   { 30558, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */
-   { 30591, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */
-   { 30618, 0x00008588 }, /* GL_SOURCE0_ALPHA */
-   { 30635, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */
-   { 30656, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */
-   { 30677, 0x00008580 }, /* GL_SOURCE0_RGB */
-   { 30692, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */
-   { 30711, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */
-   { 30730, 0x00008589 }, /* GL_SOURCE1_ALPHA */
-   { 30747, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */
-   { 30768, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */
-   { 30789, 0x00008581 }, /* GL_SOURCE1_RGB */
-   { 30804, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */
-   { 30823, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */
-   { 30842, 0x0000858A }, /* GL_SOURCE2_ALPHA */
-   { 30859, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */
-   { 30880, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */
-   { 30901, 0x00008582 }, /* GL_SOURCE2_RGB */
-   { 30916, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */
-   { 30935, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */
-   { 30954, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */
-   { 30974, 0x00008583 }, /* GL_SOURCE3_RGB_NV */
-   { 30992, 0x00001202 }, /* GL_SPECULAR */
-   { 31004, 0x00002402 }, /* GL_SPHERE_MAP */
-   { 31018, 0x00001206 }, /* GL_SPOT_CUTOFF */
-   { 31033, 0x00001204 }, /* GL_SPOT_DIRECTION */
-   { 31051, 0x00001205 }, /* GL_SPOT_EXPONENT */
-   { 31068, 0x00008588 }, /* GL_SRC0_ALPHA */
-   { 31082, 0x00008580 }, /* GL_SRC0_RGB */
-   { 31094, 0x00008589 }, /* GL_SRC1_ALPHA */
-   { 31108, 0x00008581 }, /* GL_SRC1_RGB */
-   { 31120, 0x0000858A }, /* GL_SRC2_ALPHA */
-   { 31134, 0x00008582 }, /* GL_SRC2_RGB */
-   { 31146, 0x00000302 }, /* GL_SRC_ALPHA */
-   { 31159, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */
-   { 31181, 0x00000300 }, /* GL_SRC_COLOR */
-   { 31194, 0x00008C40 }, /* GL_SRGB */
-   { 31202, 0x00000503 }, /* GL_STACK_OVERFLOW */
-   { 31220, 0x00000504 }, /* GL_STACK_UNDERFLOW */
-   { 31239, 0x000088E6 }, /* GL_STATIC_COPY */
-   { 31254, 0x000088E6 }, /* GL_STATIC_COPY_ARB */
-   { 31273, 0x000088E4 }, /* GL_STATIC_DRAW */
-   { 31288, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */
-   { 31307, 0x000088E5 }, /* GL_STATIC_READ */
-   { 31322, 0x000088E5 }, /* GL_STATIC_READ_ARB */
-   { 31341, 0x00001802 }, /* GL_STENCIL */
-   { 31352, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT */
-   { 31374, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */
-   { 31400, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */
-   { 31421, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */
-   { 31446, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
-   { 31467, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */
-   { 31492, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-   { 31524, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */
-   { 31560, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
-   { 31592, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */
-   { 31628, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
-   { 31648, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
-   { 31675, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
-   { 31701, 0x00000D57 }, /* GL_STENCIL_BITS */
-   { 31717, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
-   { 31739, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
-   { 31762, 0x00000B94 }, /* GL_STENCIL_FAIL */
-   { 31778, 0x00000B92 }, /* GL_STENCIL_FUNC */
-   { 31794, 0x00001901 }, /* GL_STENCIL_INDEX */
-   { 31811, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
-   { 31834, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
-   { 31856, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
-   { 31878, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
-   { 31900, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
-   { 31921, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
-   { 31948, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
-   { 31975, 0x00000B97 }, /* GL_STENCIL_REF */
-   { 31990, 0x00000B90 }, /* GL_STENCIL_TEST */
-   { 32006, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
-   { 32035, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
-   { 32057, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
-   { 32078, 0x00000C33 }, /* GL_STEREO */
-   { 32088, 0x000088E2 }, /* GL_STREAM_COPY */
-   { 32103, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
-   { 32122, 0x000088E0 }, /* GL_STREAM_DRAW */
-   { 32137, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
-   { 32156, 0x000088E1 }, /* GL_STREAM_READ */
-   { 32171, 0x000088E1 }, /* GL_STREAM_READ_ARB */
-   { 32190, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
-   { 32207, 0x000084E7 }, /* GL_SUBTRACT */
-   { 32219, 0x000084E7 }, /* GL_SUBTRACT_ARB */
-   { 32235, 0x00002001 }, /* GL_T */
-   { 32240, 0x00002A2A }, /* GL_T2F_C3F_V3F */
-   { 32255, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
-   { 32274, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
-   { 32290, 0x00002A2B }, /* GL_T2F_N3F_V3F */
-   { 32305, 0x00002A27 }, /* GL_T2F_V3F */
-   { 32316, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
-   { 32335, 0x00002A28 }, /* GL_T4F_V4F */
-   { 32346, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
-   { 32369, 0x00001702 }, /* GL_TEXTURE */
-   { 32380, 0x000084C0 }, /* GL_TEXTURE0 */
-   { 32392, 0x000084C0 }, /* GL_TEXTURE0_ARB */
-   { 32408, 0x000084C1 }, /* GL_TEXTURE1 */
-   { 32420, 0x000084CA }, /* GL_TEXTURE10 */
-   { 32433, 0x000084CA }, /* GL_TEXTURE10_ARB */
-   { 32450, 0x000084CB }, /* GL_TEXTURE11 */
-   { 32463, 0x000084CB }, /* GL_TEXTURE11_ARB */
-   { 32480, 0x000084CC }, /* GL_TEXTURE12 */
-   { 32493, 0x000084CC }, /* GL_TEXTURE12_ARB */
-   { 32510, 0x000084CD }, /* GL_TEXTURE13 */
-   { 32523, 0x000084CD }, /* GL_TEXTURE13_ARB */
-   { 32540, 0x000084CE }, /* GL_TEXTURE14 */
-   { 32553, 0x000084CE }, /* GL_TEXTURE14_ARB */
-   { 32570, 0x000084CF }, /* GL_TEXTURE15 */
-   { 32583, 0x000084CF }, /* GL_TEXTURE15_ARB */
-   { 32600, 0x000084D0 }, /* GL_TEXTURE16 */
-   { 32613, 0x000084D0 }, /* GL_TEXTURE16_ARB */
-   { 32630, 0x000084D1 }, /* GL_TEXTURE17 */
-   { 32643, 0x000084D1 }, /* GL_TEXTURE17_ARB */
-   { 32660, 0x000084D2 }, /* GL_TEXTURE18 */
-   { 32673, 0x000084D2 }, /* GL_TEXTURE18_ARB */
-   { 32690, 0x000084D3 }, /* GL_TEXTURE19 */
-   { 32703, 0x000084D3 }, /* GL_TEXTURE19_ARB */
-   { 32720, 0x000084C1 }, /* GL_TEXTURE1_ARB */
-   { 32736, 0x000084C2 }, /* GL_TEXTURE2 */
-   { 32748, 0x000084D4 }, /* GL_TEXTURE20 */
-   { 32761, 0x000084D4 }, /* GL_TEXTURE20_ARB */
-   { 32778, 0x000084D5 }, /* GL_TEXTURE21 */
-   { 32791, 0x000084D5 }, /* GL_TEXTURE21_ARB */
-   { 32808, 0x000084D6 }, /* GL_TEXTURE22 */
-   { 32821, 0x000084D6 }, /* GL_TEXTURE22_ARB */
-   { 32838, 0x000084D7 }, /* GL_TEXTURE23 */
-   { 32851, 0x000084D7 }, /* GL_TEXTURE23_ARB */
-   { 32868, 0x000084D8 }, /* GL_TEXTURE24 */
-   { 32881, 0x000084D8 }, /* GL_TEXTURE24_ARB */
-   { 32898, 0x000084D9 }, /* GL_TEXTURE25 */
-   { 32911, 0x000084D9 }, /* GL_TEXTURE25_ARB */
-   { 32928, 0x000084DA }, /* GL_TEXTURE26 */
-   { 32941, 0x000084DA }, /* GL_TEXTURE26_ARB */
-   { 32958, 0x000084DB }, /* GL_TEXTURE27 */
-   { 32971, 0x000084DB }, /* GL_TEXTURE27_ARB */
-   { 32988, 0x000084DC }, /* GL_TEXTURE28 */
-   { 33001, 0x000084DC }, /* GL_TEXTURE28_ARB */
-   { 33018, 0x000084DD }, /* GL_TEXTURE29 */
-   { 33031, 0x000084DD }, /* GL_TEXTURE29_ARB */
-   { 33048, 0x000084C2 }, /* GL_TEXTURE2_ARB */
-   { 33064, 0x000084C3 }, /* GL_TEXTURE3 */
-   { 33076, 0x000084DE }, /* GL_TEXTURE30 */
-   { 33089, 0x000084DE }, /* GL_TEXTURE30_ARB */
-   { 33106, 0x000084DF }, /* GL_TEXTURE31 */
-   { 33119, 0x000084DF }, /* GL_TEXTURE31_ARB */
-   { 33136, 0x000084C3 }, /* GL_TEXTURE3_ARB */
-   { 33152, 0x000084C4 }, /* GL_TEXTURE4 */
-   { 33164, 0x000084C4 }, /* GL_TEXTURE4_ARB */
-   { 33180, 0x000084C5 }, /* GL_TEXTURE5 */
-   { 33192, 0x000084C5 }, /* GL_TEXTURE5_ARB */
-   { 33208, 0x000084C6 }, /* GL_TEXTURE6 */
-   { 33220, 0x000084C6 }, /* GL_TEXTURE6_ARB */
-   { 33236, 0x000084C7 }, /* GL_TEXTURE7 */
-   { 33248, 0x000084C7 }, /* GL_TEXTURE7_ARB */
-   { 33264, 0x000084C8 }, /* GL_TEXTURE8 */
-   { 33276, 0x000084C8 }, /* GL_TEXTURE8_ARB */
-   { 33292, 0x000084C9 }, /* GL_TEXTURE9 */
-   { 33304, 0x000084C9 }, /* GL_TEXTURE9_ARB */
-   { 33320, 0x00000DE0 }, /* GL_TEXTURE_1D */
-   { 33334, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
-   { 33358, 0x00000DE1 }, /* GL_TEXTURE_2D */
-   { 33372, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
-   { 33396, 0x0000806F }, /* GL_TEXTURE_3D */
-   { 33410, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
-   { 33432, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
-   { 33458, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
-   { 33480, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
-   { 33502, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
-   { 33534, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
-   { 33556, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
-   { 33588, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
-   { 33610, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
-   { 33638, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
-   { 33670, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
-   { 33703, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
-   { 33735, 0x00040000 }, /* GL_TEXTURE_BIT */
-   { 33750, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
-   { 33771, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
-   { 33796, 0x00001005 }, /* GL_TEXTURE_BORDER */
-   { 33814, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
-   { 33838, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-   { 33869, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
-   { 33899, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-   { 33929, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-   { 33964, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-   { 33995, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-   { 34033, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
-   { 34060, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
-   { 34092, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
-   { 34126, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
-   { 34150, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
-   { 34178, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
-   { 34202, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
-   { 34230, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-   { 34263, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
-   { 34287, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
-   { 34309, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
-   { 34331, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
-   { 34357, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
-   { 34391, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-   { 34424, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
-   { 34461, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
-   { 34489, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
-   { 34521, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
-   { 34544, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
-   { 34582, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
-   { 34624, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
-   { 34655, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-   { 34683, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
-   { 34713, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-   { 34741, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
-   { 34761, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
-   { 34785, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-   { 34816, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
-   { 34851, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-   { 34882, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
-   { 34917, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
-   { 34948, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
-   { 34983, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-   { 35014, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
-   { 35049, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-   { 35080, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
-   { 35115, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-   { 35146, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
-   { 35181, 0x00008071 }, /* GL_TEXTURE_DEPTH */
-   { 35198, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
-   { 35220, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
-   { 35246, 0x00002300 }, /* GL_TEXTURE_ENV */
-   { 35261, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
-   { 35282, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
-   { 35302, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
-   { 35328, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
-   { 35348, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
-   { 35365, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
-   { 35382, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
-   { 35399, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
-   { 35416, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
-   { 35441, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
-   { 35463, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
-   { 35489, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
-   { 35507, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
-   { 35533, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
-   { 35559, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
-   { 35589, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
-   { 35616, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
-   { 35641, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
-   { 35661, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
-   { 35685, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
-   { 35712, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-   { 35739, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-   { 35766, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
-   { 35792, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
-   { 35822, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
-   { 35844, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
-   { 35862, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
-   { 35892, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
-   { 35920, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-   { 35948, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-   { 35976, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
-   { 35997, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
-   { 36016, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
-   { 36038, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
-   { 36057, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
-   { 36077, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
-   { 36102, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
-   { 36126, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
-   { 36146, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
-   { 36170, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
-   { 36190, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
-   { 36213, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */
-   { 36237, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
-   { 36262, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
-   { 36296, 0x00001000 }, /* GL_TEXTURE_WIDTH */
-   { 36313, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
-   { 36331, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
-   { 36349, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
-   { 36367, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
-   { 36387, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
-   { 36406, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-   { 36435, 0x00001000 }, /* GL_TRANSFORM_BIT */
-   { 36452, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
-   { 36478, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
-   { 36508, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-   { 36540, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-   { 36570, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
-   { 36604, 0x0000862C }, /* GL_TRANSPOSE_NV */
-   { 36620, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-   { 36651, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
-   { 36686, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-   { 36714, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
-   { 36746, 0x00000004 }, /* GL_TRIANGLES */
-   { 36759, 0x00000006 }, /* GL_TRIANGLE_FAN */
-   { 36775, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
-   { 36796, 0x00000005 }, /* GL_TRIANGLE_STRIP */
-   { 36814, 0x00000001 }, /* GL_TRUE */
-   { 36822, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
-   { 36842, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
-   { 36865, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
-   { 36885, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
-   { 36906, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
-   { 36928, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
-   { 36950, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
-   { 36970, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
-   { 36991, 0x00001401 }, /* GL_UNSIGNED_BYTE */
-   { 37008, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-   { 37035, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
-   { 37058, 0x00001405 }, /* GL_UNSIGNED_INT */
-   { 37074, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
-   { 37101, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */
-   { 37122, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
-   { 37146, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-   { 37177, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
-   { 37201, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-   { 37229, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */
-   { 37252, 0x00001403 }, /* GL_UNSIGNED_SHORT */
-   { 37270, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-   { 37300, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-   { 37326, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-   { 37356, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-   { 37382, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
-   { 37406, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-   { 37434, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-   { 37462, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
-   { 37489, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-   { 37521, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
-   { 37552, 0x00008CA2 }, /* GL_UPPER_LEFT */
-   { 37566, 0x00002A20 }, /* GL_V2F */
-   { 37573, 0x00002A21 }, /* GL_V3F */
-   { 37580, 0x00008B83 }, /* GL_VALIDATE_STATUS */
-   { 37599, 0x00001F00 }, /* GL_VENDOR */
-   { 37609, 0x00001F02 }, /* GL_VERSION */
-   { 37620, 0x00008074 }, /* GL_VERTEX_ARRAY */
-   { 37636, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
-   { 37666, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-   { 37697, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
-   { 37732, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
-   { 37756, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
-   { 37777, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
-   { 37800, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
-   { 37821, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-   { 37848, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-   { 37876, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-   { 37904, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-   { 37932, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-   { 37960, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-   { 37988, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
-   { 38016, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-   { 38043, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-   { 38070, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-   { 38097, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-   { 38124, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-   { 38151, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-   { 38178, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-   { 38205, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-   { 38232, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-   { 38259, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-   { 38297, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
-   { 38339, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-   { 38370, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
-   { 38405, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
-   { 38439, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
-   { 38477, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-   { 38508, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
-   { 38543, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-   { 38571, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
-   { 38603, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-   { 38633, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
-   { 38667, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
-   { 38695, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
-   { 38727, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
-   { 38747, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
-   { 38769, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
-   { 38798, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
-   { 38819, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-   { 38848, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
-   { 38881, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
-   { 38913, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-   { 38940, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
-   { 38971, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
-   { 39001, 0x00008B31 }, /* GL_VERTEX_SHADER */
-   { 39018, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
-   { 39039, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
-   { 39066, 0x00000BA2 }, /* GL_VIEWPORT */
-   { 39078, 0x00000800 }, /* GL_VIEWPORT_BIT */
-   { 39094, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
-   { 39114, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-   { 39145, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
-   { 39180, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-   { 39208, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-   { 39233, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-   { 39260, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-   { 39285, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
-   { 39309, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
-   { 39328, 0x000088B9 }, /* GL_WRITE_ONLY */
-   { 39342, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
-   { 39360, 0x00001506 }, /* GL_XOR */
-   { 39367, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
-   { 39386, 0x00008757 }, /* GL_YCBCR_MESA */
-   { 39400, 0x00000000 }, /* GL_ZERO */
-   { 39408, 0x00000D16 }, /* GL_ZOOM_X */
-   { 39418, 0x00000D17 }, /* GL_ZOOM_Y */
+   {  1394, 0x00008009 }, /* GL_BLEND_EQUATION_RGB */
+   {  1416, 0x00008009 }, /* GL_BLEND_EQUATION_RGB_EXT */
+   {  1442, 0x00000BE1 }, /* GL_BLEND_SRC */
+   {  1455, 0x000080CB }, /* GL_BLEND_SRC_ALPHA */
+   {  1474, 0x000080C9 }, /* GL_BLEND_SRC_RGB */
+   {  1491, 0x00001905 }, /* GL_BLUE */
+   {  1499, 0x00000D1B }, /* GL_BLUE_BIAS */
+   {  1512, 0x00000D54 }, /* GL_BLUE_BITS */
+   {  1525, 0x00000D1A }, /* GL_BLUE_SCALE */
+   {  1539, 0x00008B56 }, /* GL_BOOL */
+   {  1547, 0x00008B56 }, /* GL_BOOL_ARB */
+   {  1559, 0x00008B57 }, /* GL_BOOL_VEC2 */
+   {  1572, 0x00008B57 }, /* GL_BOOL_VEC2_ARB */
+   {  1589, 0x00008B58 }, /* GL_BOOL_VEC3 */
+   {  1602, 0x00008B58 }, /* GL_BOOL_VEC3_ARB */
+   {  1619, 0x00008B59 }, /* GL_BOOL_VEC4 */
+   {  1632, 0x00008B59 }, /* GL_BOOL_VEC4_ARB */
+   {  1649, 0x000088BB }, /* GL_BUFFER_ACCESS */
+   {  1666, 0x000088BB }, /* GL_BUFFER_ACCESS_ARB */
+   {  1687, 0x000088BC }, /* GL_BUFFER_MAPPED */
+   {  1704, 0x000088BC }, /* GL_BUFFER_MAPPED_ARB */
+   {  1725, 0x000088BD }, /* GL_BUFFER_MAP_POINTER */
+   {  1747, 0x000088BD }, /* GL_BUFFER_MAP_POINTER_ARB */
+   {  1773, 0x00008764 }, /* GL_BUFFER_SIZE */
+   {  1788, 0x00008764 }, /* GL_BUFFER_SIZE_ARB */
+   {  1807, 0x00008765 }, /* GL_BUFFER_USAGE */
+   {  1823, 0x00008765 }, /* GL_BUFFER_USAGE_ARB */
+   {  1843, 0x0000877B }, /* GL_BUMP_ENVMAP_ATI */
+   {  1862, 0x00008777 }, /* GL_BUMP_NUM_TEX_UNITS_ATI */
+   {  1888, 0x00008775 }, /* GL_BUMP_ROT_MATRIX_ATI */
+   {  1911, 0x00008776 }, /* GL_BUMP_ROT_MATRIX_SIZE_ATI */
+   {  1939, 0x0000877C }, /* GL_BUMP_TARGET_ATI */
+   {  1958, 0x00008778 }, /* GL_BUMP_TEX_UNITS_ATI */
+   {  1980, 0x00001400 }, /* GL_BYTE */
+   {  1988, 0x00002A24 }, /* GL_C3F_V3F */
+   {  1999, 0x00002A26 }, /* GL_C4F_N3F_V3F */
+   {  2014, 0x00002A22 }, /* GL_C4UB_V2F */
+   {  2026, 0x00002A23 }, /* GL_C4UB_V3F */
+   {  2038, 0x00000901 }, /* GL_CCW */
+   {  2045, 0x00002900 }, /* GL_CLAMP */
+   {  2054, 0x0000812D }, /* GL_CLAMP_TO_BORDER */
+   {  2073, 0x0000812D }, /* GL_CLAMP_TO_BORDER_ARB */
+   {  2096, 0x0000812D }, /* GL_CLAMP_TO_BORDER_SGIS */
+   {  2120, 0x0000812F }, /* GL_CLAMP_TO_EDGE */
+   {  2137, 0x0000812F }, /* GL_CLAMP_TO_EDGE_SGIS */
+   {  2159, 0x00001500 }, /* GL_CLEAR */
+   {  2168, 0x000084E1 }, /* GL_CLIENT_ACTIVE_TEXTURE */
+   {  2193, 0x000084E1 }, /* GL_CLIENT_ACTIVE_TEXTURE_ARB */
+   {  2222, 0xFFFFFFFF }, /* GL_CLIENT_ALL_ATTRIB_BITS */
+   {  2248, 0x00000BB1 }, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
+   {  2277, 0x00000001 }, /* GL_CLIENT_PIXEL_STORE_BIT */
+   {  2303, 0x00000002 }, /* GL_CLIENT_VERTEX_ARRAY_BIT */
+   {  2330, 0x00003000 }, /* GL_CLIP_PLANE0 */
+   {  2345, 0x00003001 }, /* GL_CLIP_PLANE1 */
+   {  2360, 0x00003002 }, /* GL_CLIP_PLANE2 */
+   {  2375, 0x00003003 }, /* GL_CLIP_PLANE3 */
+   {  2390, 0x00003004 }, /* GL_CLIP_PLANE4 */
+   {  2405, 0x00003005 }, /* GL_CLIP_PLANE5 */
+   {  2420, 0x000080F0 }, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
+   {  2453, 0x00000A00 }, /* GL_COEFF */
+   {  2462, 0x00001800 }, /* GL_COLOR */
+   {  2471, 0x00008076 }, /* GL_COLOR_ARRAY */
+   {  2486, 0x00008898 }, /* GL_COLOR_ARRAY_BUFFER_BINDING */
+   {  2516, 0x00008898 }, /* GL_COLOR_ARRAY_BUFFER_BINDING_ARB */
+   {  2550, 0x00008090 }, /* GL_COLOR_ARRAY_POINTER */
+   {  2573, 0x00008081 }, /* GL_COLOR_ARRAY_SIZE */
+   {  2593, 0x00008083 }, /* GL_COLOR_ARRAY_STRIDE */
+   {  2615, 0x00008082 }, /* GL_COLOR_ARRAY_TYPE */
+   {  2635, 0x00008CE0 }, /* GL_COLOR_ATTACHMENT0 */
+   {  2656, 0x00008CE0 }, /* GL_COLOR_ATTACHMENT0_EXT */
+   {  2681, 0x00008CE1 }, /* GL_COLOR_ATTACHMENT1 */
+   {  2702, 0x00008CEA }, /* GL_COLOR_ATTACHMENT10 */
+   {  2724, 0x00008CEA }, /* GL_COLOR_ATTACHMENT10_EXT */
+   {  2750, 0x00008CEB }, /* GL_COLOR_ATTACHMENT11 */
+   {  2772, 0x00008CEB }, /* GL_COLOR_ATTACHMENT11_EXT */
+   {  2798, 0x00008CEC }, /* GL_COLOR_ATTACHMENT12 */
+   {  2820, 0x00008CEC }, /* GL_COLOR_ATTACHMENT12_EXT */
+   {  2846, 0x00008CED }, /* GL_COLOR_ATTACHMENT13 */
+   {  2868, 0x00008CED }, /* GL_COLOR_ATTACHMENT13_EXT */
+   {  2894, 0x00008CEE }, /* GL_COLOR_ATTACHMENT14 */
+   {  2916, 0x00008CEE }, /* GL_COLOR_ATTACHMENT14_EXT */
+   {  2942, 0x00008CEF }, /* GL_COLOR_ATTACHMENT15 */
+   {  2964, 0x00008CEF }, /* GL_COLOR_ATTACHMENT15_EXT */
+   {  2990, 0x00008CE1 }, /* GL_COLOR_ATTACHMENT1_EXT */
+   {  3015, 0x00008CE2 }, /* GL_COLOR_ATTACHMENT2 */
+   {  3036, 0x00008CE2 }, /* GL_COLOR_ATTACHMENT2_EXT */
+   {  3061, 0x00008CE3 }, /* GL_COLOR_ATTACHMENT3 */
+   {  3082, 0x00008CE3 }, /* GL_COLOR_ATTACHMENT3_EXT */
+   {  3107, 0x00008CE4 }, /* GL_COLOR_ATTACHMENT4 */
+   {  3128, 0x00008CE4 }, /* GL_COLOR_ATTACHMENT4_EXT */
+   {  3153, 0x00008CE5 }, /* GL_COLOR_ATTACHMENT5 */
+   {  3174, 0x00008CE5 }, /* GL_COLOR_ATTACHMENT5_EXT */
+   {  3199, 0x00008CE6 }, /* GL_COLOR_ATTACHMENT6 */
+   {  3220, 0x00008CE6 }, /* GL_COLOR_ATTACHMENT6_EXT */
+   {  3245, 0x00008CE7 }, /* GL_COLOR_ATTACHMENT7 */
+   {  3266, 0x00008CE7 }, /* GL_COLOR_ATTACHMENT7_EXT */
+   {  3291, 0x00008CE8 }, /* GL_COLOR_ATTACHMENT8 */
+   {  3312, 0x00008CE8 }, /* GL_COLOR_ATTACHMENT8_EXT */
+   {  3337, 0x00008CE9 }, /* GL_COLOR_ATTACHMENT9 */
+   {  3358, 0x00008CE9 }, /* GL_COLOR_ATTACHMENT9_EXT */
+   {  3383, 0x00004000 }, /* GL_COLOR_BUFFER_BIT */
+   {  3403, 0x00000C22 }, /* GL_COLOR_CLEAR_VALUE */
+   {  3424, 0x00001900 }, /* GL_COLOR_INDEX */
+   {  3439, 0x00001603 }, /* GL_COLOR_INDEXES */
+   {  3456, 0x00000BF2 }, /* GL_COLOR_LOGIC_OP */
+   {  3474, 0x00000B57 }, /* GL_COLOR_MATERIAL */
+   {  3492, 0x00000B55 }, /* GL_COLOR_MATERIAL_FACE */
+   {  3515, 0x00000B56 }, /* GL_COLOR_MATERIAL_PARAMETER */
+   {  3543, 0x000080B1 }, /* GL_COLOR_MATRIX */
+   {  3559, 0x000080B1 }, /* GL_COLOR_MATRIX_SGI */
+   {  3579, 0x000080B2 }, /* GL_COLOR_MATRIX_STACK_DEPTH */
+   {  3607, 0x000080B2 }, /* GL_COLOR_MATRIX_STACK_DEPTH_SGI */
+   {  3639, 0x00008458 }, /* GL_COLOR_SUM */
+   {  3652, 0x00008458 }, /* GL_COLOR_SUM_ARB */
+   {  3669, 0x000080D0 }, /* GL_COLOR_TABLE */
+   {  3684, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE */
+   {  3710, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE_EXT */
+   {  3740, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE_SGI */
+   {  3770, 0x000080D7 }, /* GL_COLOR_TABLE_BIAS */
+   {  3790, 0x000080D7 }, /* GL_COLOR_TABLE_BIAS_SGI */
+   {  3814, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE */
+   {  3839, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE_EXT */
+   {  3868, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE_SGI */
+   {  3897, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT */
+   {  3919, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT_EXT */
+   {  3945, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT_SGI */
+   {  3971, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE */
+   {  3997, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE_EXT */
+   {  4027, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE_SGI */
+   {  4057, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE */
+   {  4087, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE_EXT */
+   {  4121, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE_SGI */
+   {  4155, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE */
+   {  4185, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE_EXT */
+   {  4219, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE_SGI */
+   {  4253, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE */
+   {  4277, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE_EXT */
+   {  4305, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE_SGI */
+   {  4333, 0x000080D6 }, /* GL_COLOR_TABLE_SCALE */
+   {  4354, 0x000080D6 }, /* GL_COLOR_TABLE_SCALE_SGI */
+   {  4379, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH */
+   {  4400, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH_EXT */
+   {  4425, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH_SGI */
+   {  4450, 0x00000C23 }, /* GL_COLOR_WRITEMASK */
+   {  4469, 0x00008570 }, /* GL_COMBINE */
+   {  4480, 0x00008503 }, /* GL_COMBINE4 */
+   {  4492, 0x00008572 }, /* GL_COMBINE_ALPHA */
+   {  4509, 0x00008572 }, /* GL_COMBINE_ALPHA_ARB */
+   {  4530, 0x00008572 }, /* GL_COMBINE_ALPHA_EXT */
+   {  4551, 0x00008570 }, /* GL_COMBINE_ARB */
+   {  4566, 0x00008570 }, /* GL_COMBINE_EXT */
+   {  4581, 0x00008571 }, /* GL_COMBINE_RGB */
+   {  4596, 0x00008571 }, /* GL_COMBINE_RGB_ARB */
+   {  4615, 0x00008571 }, /* GL_COMBINE_RGB_EXT */
+   {  4634, 0x0000884E }, /* GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT */
+   {  4670, 0x0000884E }, /* GL_COMPARE_R_TO_TEXTURE */
+   {  4694, 0x0000884E }, /* GL_COMPARE_R_TO_TEXTURE_ARB */
+   {  4722, 0x00001300 }, /* GL_COMPILE */
+   {  4733, 0x00001301 }, /* GL_COMPILE_AND_EXECUTE */
+   {  4756, 0x00008B81 }, /* GL_COMPILE_STATUS */
+   {  4774, 0x000084E9 }, /* GL_COMPRESSED_ALPHA */
+   {  4794, 0x000084E9 }, /* GL_COMPRESSED_ALPHA_ARB */
+   {  4818, 0x000084EC }, /* GL_COMPRESSED_INTENSITY */
+   {  4842, 0x000084EC }, /* GL_COMPRESSED_INTENSITY_ARB */
+   {  4870, 0x000084EA }, /* GL_COMPRESSED_LUMINANCE */
+   {  4894, 0x000084EB }, /* GL_COMPRESSED_LUMINANCE_ALPHA */
+   {  4924, 0x000084EB }, /* GL_COMPRESSED_LUMINANCE_ALPHA_ARB */
+   {  4958, 0x000084EA }, /* GL_COMPRESSED_LUMINANCE_ARB */
+   {  4986, 0x000084ED }, /* GL_COMPRESSED_RGB */
+   {  5004, 0x000084EE }, /* GL_COMPRESSED_RGBA */
+   {  5023, 0x000084EE }, /* GL_COMPRESSED_RGBA_ARB */
+   {  5046, 0x000086B1 }, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
+   {  5075, 0x000083F1 }, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
+   {  5108, 0x000083F2 }, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
+   {  5141, 0x000083F3 }, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */
+   {  5174, 0x000084ED }, /* GL_COMPRESSED_RGB_ARB */
+   {  5196, 0x000086B0 }, /* GL_COMPRESSED_RGB_FXT1_3DFX */
+   {  5224, 0x000083F0 }, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
+   {  5256, 0x00008C4A }, /* GL_COMPRESSED_SLUMINANCE */
+   {  5281, 0x00008C4B }, /* GL_COMPRESSED_SLUMINANCE_ALPHA */
+   {  5312, 0x00008C48 }, /* GL_COMPRESSED_SRGB */
+   {  5331, 0x00008C49 }, /* GL_COMPRESSED_SRGB_ALPHA */
+   {  5356, 0x000086A3 }, /* GL_COMPRESSED_TEXTURE_FORMATS */
+   {  5386, 0x00008576 }, /* GL_CONSTANT */
+   {  5398, 0x00008003 }, /* GL_CONSTANT_ALPHA */
+   {  5416, 0x00008003 }, /* GL_CONSTANT_ALPHA_EXT */
+   {  5438, 0x00008576 }, /* GL_CONSTANT_ARB */
+   {  5454, 0x00001207 }, /* GL_CONSTANT_ATTENUATION */
+   {  5478, 0x00008151 }, /* GL_CONSTANT_BORDER_HP */
+   {  5500, 0x00008001 }, /* GL_CONSTANT_COLOR */
+   {  5518, 0x00008001 }, /* GL_CONSTANT_COLOR_EXT */
+   {  5540, 0x00008576 }, /* GL_CONSTANT_EXT */
+   {  5556, 0x00008010 }, /* GL_CONVOLUTION_1D */
+   {  5574, 0x00008011 }, /* GL_CONVOLUTION_2D */
+   {  5592, 0x00008154 }, /* GL_CONVOLUTION_BORDER_COLOR */
+   {  5620, 0x00008154 }, /* GL_CONVOLUTION_BORDER_COLOR_HP */
+   {  5651, 0x00008013 }, /* GL_CONVOLUTION_BORDER_MODE */
+   {  5678, 0x00008013 }, /* GL_CONVOLUTION_BORDER_MODE_EXT */
+   {  5709, 0x00008015 }, /* GL_CONVOLUTION_FILTER_BIAS */
+   {  5736, 0x00008015 }, /* GL_CONVOLUTION_FILTER_BIAS_EXT */
+   {  5767, 0x00008014 }, /* GL_CONVOLUTION_FILTER_SCALE */
+   {  5795, 0x00008014 }, /* GL_CONVOLUTION_FILTER_SCALE_EXT */
+   {  5827, 0x00008017 }, /* GL_CONVOLUTION_FORMAT */
+   {  5849, 0x00008017 }, /* GL_CONVOLUTION_FORMAT_EXT */
+   {  5875, 0x00008019 }, /* GL_CONVOLUTION_HEIGHT */
+   {  5897, 0x00008019 }, /* GL_CONVOLUTION_HEIGHT_EXT */
+   {  5923, 0x00008018 }, /* GL_CONVOLUTION_WIDTH */
+   {  5944, 0x00008018 }, /* GL_CONVOLUTION_WIDTH_EXT */
+   {  5969, 0x00008862 }, /* GL_COORD_REPLACE */
+   {  5986, 0x00008862 }, /* GL_COORD_REPLACE_ARB */
+   {  6007, 0x00008862 }, /* GL_COORD_REPLACE_NV */
+   {  6027, 0x00001503 }, /* GL_COPY */
+   {  6035, 0x0000150C }, /* GL_COPY_INVERTED */
+   {  6052, 0x00000706 }, /* GL_COPY_PIXEL_TOKEN */
+   {  6072, 0x00000B44 }, /* GL_CULL_FACE */
+   {  6085, 0x00000B45 }, /* GL_CULL_FACE_MODE */
+   {  6103, 0x000081AA }, /* GL_CULL_VERTEX_EXT */
+   {  6122, 0x000081AC }, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
+   {  6154, 0x000081AB }, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
+   {  6189, 0x00008626 }, /* GL_CURRENT_ATTRIB_NV */
+   {  6210, 0x00000001 }, /* GL_CURRENT_BIT */
+   {  6225, 0x00000B00 }, /* GL_CURRENT_COLOR */
+   {  6242, 0x00008453 }, /* GL_CURRENT_FOG_COORD */
+   {  6263, 0x00008453 }, /* GL_CURRENT_FOG_COORDINATE */
+   {  6289, 0x00000B01 }, /* GL_CURRENT_INDEX */
+   {  6306, 0x00008641 }, /* GL_CURRENT_MATRIX_ARB */
+   {  6328, 0x00008845 }, /* GL_CURRENT_MATRIX_INDEX_ARB */
+   {  6356, 0x00008641 }, /* GL_CURRENT_MATRIX_NV */
+   {  6377, 0x00008640 }, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
+   {  6411, 0x00008640 }, /* GL_CURRENT_MATRIX_STACK_DEPTH_NV */
+   {  6444, 0x00000B02 }, /* GL_CURRENT_NORMAL */
+   {  6462, 0x00008843 }, /* GL_CURRENT_PALETTE_MATRIX_ARB */
+   {  6492, 0x00008B8D }, /* GL_CURRENT_PROGRAM */
+   {  6511, 0x00008865 }, /* GL_CURRENT_QUERY */
+   {  6528, 0x00008865 }, /* GL_CURRENT_QUERY_ARB */
+   {  6549, 0x00000B04 }, /* GL_CURRENT_RASTER_COLOR */
+   {  6573, 0x00000B09 }, /* GL_CURRENT_RASTER_DISTANCE */
+   {  6600, 0x00000B05 }, /* GL_CURRENT_RASTER_INDEX */
+   {  6624, 0x00000B07 }, /* GL_CURRENT_RASTER_POSITION */
+   {  6651, 0x00000B08 }, /* GL_CURRENT_RASTER_POSITION_VALID */
+   {  6684, 0x0000845F }, /* GL_CURRENT_RASTER_SECONDARY_COLOR */
+   {  6718, 0x00000B06 }, /* GL_CURRENT_RASTER_TEXTURE_COORDS */
+   {  6751, 0x00008459 }, /* GL_CURRENT_SECONDARY_COLOR */
+   {  6778, 0x00000B03 }, /* GL_CURRENT_TEXTURE_COORDS */
+   {  6804, 0x00008626 }, /* GL_CURRENT_VERTEX_ATTRIB */
+   {  6829, 0x00008626 }, /* GL_CURRENT_VERTEX_ATTRIB_ARB */
+   {  6858, 0x000086A8 }, /* GL_CURRENT_WEIGHT_ARB */
+   {  6880, 0x00000900 }, /* GL_CW */
+   {  6886, 0x0000875B }, /* GL_DEBUG_ASSERT_MESA */
+   {  6907, 0x00008759 }, /* GL_DEBUG_OBJECT_MESA */
+   {  6928, 0x0000875A }, /* GL_DEBUG_PRINT_MESA */
+   {  6948, 0x00002101 }, /* GL_DECAL */
+   {  6957, 0x00001E03 }, /* GL_DECR */
+   {  6965, 0x00008508 }, /* GL_DECR_WRAP */
+   {  6978, 0x00008508 }, /* GL_DECR_WRAP_EXT */
+   {  6995, 0x00008B80 }, /* GL_DELETE_STATUS */
+   {  7012, 0x00001801 }, /* GL_DEPTH */
+   {  7021, 0x000088F0 }, /* GL_DEPTH24_STENCIL8 */
+   {  7041, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT */
+   {  7061, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT_EXT */
+   {  7085, 0x00000D1F }, /* GL_DEPTH_BIAS */
+   {  7099, 0x00000D56 }, /* GL_DEPTH_BITS */
+   {  7113, 0x00008891 }, /* GL_DEPTH_BOUNDS_EXT */
+   {  7133, 0x00008890 }, /* GL_DEPTH_BOUNDS_TEST_EXT */
+   {  7158, 0x00000100 }, /* GL_DEPTH_BUFFER_BIT */
+   {  7178, 0x0000864F }, /* GL_DEPTH_CLAMP_NV */
+   {  7196, 0x00000B73 }, /* GL_DEPTH_CLEAR_VALUE */
+   {  7217, 0x00001902 }, /* GL_DEPTH_COMPONENT */
+   {  7236, 0x000081A5 }, /* GL_DEPTH_COMPONENT16 */
+   {  7257, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_ARB */
+   {  7282, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_SGIX */
+   {  7308, 0x000081A6 }, /* GL_DEPTH_COMPONENT24 */
+   {  7329, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_ARB */
+   {  7354, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_SGIX */
+   {  7380, 0x000081A7 }, /* GL_DEPTH_COMPONENT32 */
+   {  7401, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_ARB */
+   {  7426, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_SGIX */
+   {  7452, 0x00000B74 }, /* GL_DEPTH_FUNC */
+   {  7466, 0x00000B70 }, /* GL_DEPTH_RANGE */
+   {  7481, 0x00000D1E }, /* GL_DEPTH_SCALE */
+   {  7496, 0x000084F9 }, /* GL_DEPTH_STENCIL */
+   {  7513, 0x0000821A }, /* GL_DEPTH_STENCIL_ATTACHMENT */
+   {  7541, 0x000084F9 }, /* GL_DEPTH_STENCIL_NV */
+   {  7561, 0x0000886F }, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
+   {  7589, 0x0000886E }, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
+   {  7617, 0x00000B71 }, /* GL_DEPTH_TEST */
+   {  7631, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE */
+   {  7653, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE_ARB */
+   {  7679, 0x00000B72 }, /* GL_DEPTH_WRITEMASK */
+   {  7698, 0x00001201 }, /* GL_DIFFUSE */
+   {  7709, 0x00000BD0 }, /* GL_DITHER */
+   {  7719, 0x00000A02 }, /* GL_DOMAIN */
+   {  7729, 0x00001100 }, /* GL_DONT_CARE */
+   {  7742, 0x000086AE }, /* GL_DOT3_RGB */
+   {  7754, 0x000086AF }, /* GL_DOT3_RGBA */
+   {  7767, 0x000086AF }, /* GL_DOT3_RGBA_ARB */
+   {  7784, 0x00008741 }, /* GL_DOT3_RGBA_EXT */
+   {  7801, 0x000086AE }, /* GL_DOT3_RGB_ARB */
+   {  7817, 0x00008740 }, /* GL_DOT3_RGB_EXT */
+   {  7833, 0x0000140A }, /* GL_DOUBLE */
+   {  7843, 0x00000C32 }, /* GL_DOUBLEBUFFER */
+   {  7859, 0x00000C01 }, /* GL_DRAW_BUFFER */
+   {  7874, 0x00008825 }, /* GL_DRAW_BUFFER0 */
+   {  7890, 0x00008825 }, /* GL_DRAW_BUFFER0_ARB */
+   {  7910, 0x00008825 }, /* GL_DRAW_BUFFER0_ATI */
+   {  7930, 0x00008826 }, /* GL_DRAW_BUFFER1 */
+   {  7946, 0x0000882F }, /* GL_DRAW_BUFFER10 */
+   {  7963, 0x0000882F }, /* GL_DRAW_BUFFER10_ARB */
+   {  7984, 0x0000882F }, /* GL_DRAW_BUFFER10_ATI */
+   {  8005, 0x00008830 }, /* GL_DRAW_BUFFER11 */
+   {  8022, 0x00008830 }, /* GL_DRAW_BUFFER11_ARB */
+   {  8043, 0x00008830 }, /* GL_DRAW_BUFFER11_ATI */
+   {  8064, 0x00008831 }, /* GL_DRAW_BUFFER12 */
+   {  8081, 0x00008831 }, /* GL_DRAW_BUFFER12_ARB */
+   {  8102, 0x00008831 }, /* GL_DRAW_BUFFER12_ATI */
+   {  8123, 0x00008832 }, /* GL_DRAW_BUFFER13 */
+   {  8140, 0x00008832 }, /* GL_DRAW_BUFFER13_ARB */
+   {  8161, 0x00008832 }, /* GL_DRAW_BUFFER13_ATI */
+   {  8182, 0x00008833 }, /* GL_DRAW_BUFFER14 */
+   {  8199, 0x00008833 }, /* GL_DRAW_BUFFER14_ARB */
+   {  8220, 0x00008833 }, /* GL_DRAW_BUFFER14_ATI */
+   {  8241, 0x00008834 }, /* GL_DRAW_BUFFER15 */
+   {  8258, 0x00008834 }, /* GL_DRAW_BUFFER15_ARB */
+   {  8279, 0x00008834 }, /* GL_DRAW_BUFFER15_ATI */
+   {  8300, 0x00008826 }, /* GL_DRAW_BUFFER1_ARB */
+   {  8320, 0x00008826 }, /* GL_DRAW_BUFFER1_ATI */
+   {  8340, 0x00008827 }, /* GL_DRAW_BUFFER2 */
+   {  8356, 0x00008827 }, /* GL_DRAW_BUFFER2_ARB */
+   {  8376, 0x00008827 }, /* GL_DRAW_BUFFER2_ATI */
+   {  8396, 0x00008828 }, /* GL_DRAW_BUFFER3 */
+   {  8412, 0x00008828 }, /* GL_DRAW_BUFFER3_ARB */
+   {  8432, 0x00008828 }, /* GL_DRAW_BUFFER3_ATI */
+   {  8452, 0x00008829 }, /* GL_DRAW_BUFFER4 */
+   {  8468, 0x00008829 }, /* GL_DRAW_BUFFER4_ARB */
+   {  8488, 0x00008829 }, /* GL_DRAW_BUFFER4_ATI */
+   {  8508, 0x0000882A }, /* GL_DRAW_BUFFER5 */
+   {  8524, 0x0000882A }, /* GL_DRAW_BUFFER5_ARB */
+   {  8544, 0x0000882A }, /* GL_DRAW_BUFFER5_ATI */
+   {  8564, 0x0000882B }, /* GL_DRAW_BUFFER6 */
+   {  8580, 0x0000882B }, /* GL_DRAW_BUFFER6_ARB */
+   {  8600, 0x0000882B }, /* GL_DRAW_BUFFER6_ATI */
+   {  8620, 0x0000882C }, /* GL_DRAW_BUFFER7 */
+   {  8636, 0x0000882C }, /* GL_DRAW_BUFFER7_ARB */
+   {  8656, 0x0000882C }, /* GL_DRAW_BUFFER7_ATI */
+   {  8676, 0x0000882D }, /* GL_DRAW_BUFFER8 */
+   {  8692, 0x0000882D }, /* GL_DRAW_BUFFER8_ARB */
+   {  8712, 0x0000882D }, /* GL_DRAW_BUFFER8_ATI */
+   {  8732, 0x0000882E }, /* GL_DRAW_BUFFER9 */
+   {  8748, 0x0000882E }, /* GL_DRAW_BUFFER9_ARB */
+   {  8768, 0x0000882E }, /* GL_DRAW_BUFFER9_ATI */
+   {  8788, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER */
+   {  8808, 0x00008CA6 }, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
+   {  8840, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER_EXT */
+   {  8864, 0x00000705 }, /* GL_DRAW_PIXEL_TOKEN */
+   {  8884, 0x00000304 }, /* GL_DST_ALPHA */
+   {  8897, 0x00000306 }, /* GL_DST_COLOR */
+   {  8910, 0x0000877A }, /* GL_DU8DV8_ATI */
+   {  8924, 0x00008779 }, /* GL_DUDV_ATI */
+   {  8936, 0x000088EA }, /* GL_DYNAMIC_COPY */
+   {  8952, 0x000088EA }, /* GL_DYNAMIC_COPY_ARB */
+   {  8972, 0x000088E8 }, /* GL_DYNAMIC_DRAW */
+   {  8988, 0x000088E8 }, /* GL_DYNAMIC_DRAW_ARB */
+   {  9008, 0x000088E9 }, /* GL_DYNAMIC_READ */
+   {  9024, 0x000088E9 }, /* GL_DYNAMIC_READ_ARB */
+   {  9044, 0x00000B43 }, /* GL_EDGE_FLAG */
+   {  9057, 0x00008079 }, /* GL_EDGE_FLAG_ARRAY */
+   {  9076, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
+   {  9110, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB */
+   {  9148, 0x00008093 }, /* GL_EDGE_FLAG_ARRAY_POINTER */
+   {  9175, 0x0000808C }, /* GL_EDGE_FLAG_ARRAY_STRIDE */
+   {  9201, 0x00008893 }, /* GL_ELEMENT_ARRAY_BUFFER */
+   {  9225, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
+   {  9257, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB */
+   {  9293, 0x00001600 }, /* GL_EMISSION */
+   {  9305, 0x00002000 }, /* GL_ENABLE_BIT */
+   {  9319, 0x00000202 }, /* GL_EQUAL */
+   {  9328, 0x00001509 }, /* GL_EQUIV */
+   {  9337, 0x00010000 }, /* GL_EVAL_BIT */
+   {  9349, 0x00000800 }, /* GL_EXP */
+   {  9356, 0x00000801 }, /* GL_EXP2 */
+   {  9364, 0x00001F03 }, /* GL_EXTENSIONS */
+   {  9378, 0x00002400 }, /* GL_EYE_LINEAR */
+   {  9392, 0x00002502 }, /* GL_EYE_PLANE */
+   {  9405, 0x0000855C }, /* GL_EYE_PLANE_ABSOLUTE_NV */
+   {  9430, 0x0000855B }, /* GL_EYE_RADIAL_NV */
+   {  9447, 0x00000000 }, /* GL_FALSE */
+   {  9456, 0x00001101 }, /* GL_FASTEST */
+   {  9467, 0x00001C01 }, /* GL_FEEDBACK */
+   {  9479, 0x00000DF0 }, /* GL_FEEDBACK_BUFFER_POINTER */
+   {  9506, 0x00000DF1 }, /* GL_FEEDBACK_BUFFER_SIZE */
+   {  9530, 0x00000DF2 }, /* GL_FEEDBACK_BUFFER_TYPE */
+   {  9554, 0x00001B02 }, /* GL_FILL */
+   {  9562, 0x00001D00 }, /* GL_FLAT */
+   {  9570, 0x00001406 }, /* GL_FLOAT */
+   {  9579, 0x00008B5A }, /* GL_FLOAT_MAT2 */
+   {  9593, 0x00008B5A }, /* GL_FLOAT_MAT2_ARB */
+   {  9611, 0x00008B65 }, /* GL_FLOAT_MAT2x3 */
+   {  9627, 0x00008B66 }, /* GL_FLOAT_MAT2x4 */
+   {  9643, 0x00008B5B }, /* GL_FLOAT_MAT3 */
+   {  9657, 0x00008B5B }, /* GL_FLOAT_MAT3_ARB */
+   {  9675, 0x00008B67 }, /* GL_FLOAT_MAT3x2 */
+   {  9691, 0x00008B68 }, /* GL_FLOAT_MAT3x4 */
+   {  9707, 0x00008B5C }, /* GL_FLOAT_MAT4 */
+   {  9721, 0x00008B5C }, /* GL_FLOAT_MAT4_ARB */
+   {  9739, 0x00008B69 }, /* GL_FLOAT_MAT4x2 */
+   {  9755, 0x00008B6A }, /* GL_FLOAT_MAT4x3 */
+   {  9771, 0x00008B50 }, /* GL_FLOAT_VEC2 */
+   {  9785, 0x00008B50 }, /* GL_FLOAT_VEC2_ARB */
+   {  9803, 0x00008B51 }, /* GL_FLOAT_VEC3 */
+   {  9817, 0x00008B51 }, /* GL_FLOAT_VEC3_ARB */
+   {  9835, 0x00008B52 }, /* GL_FLOAT_VEC4 */
+   {  9849, 0x00008B52 }, /* GL_FLOAT_VEC4_ARB */
+   {  9867, 0x00000B60 }, /* GL_FOG */
+   {  9874, 0x00000080 }, /* GL_FOG_BIT */
+   {  9885, 0x00000B66 }, /* GL_FOG_COLOR */
+   {  9898, 0x00008451 }, /* GL_FOG_COORD */
+   {  9911, 0x00008451 }, /* GL_FOG_COORDINATE */
+   {  9929, 0x00008457 }, /* GL_FOG_COORDINATE_ARRAY */
+   {  9953, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
+   {  9992, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB */
+   { 10035, 0x00008456 }, /* GL_FOG_COORDINATE_ARRAY_POINTER */
+   { 10067, 0x00008455 }, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
+   { 10098, 0x00008454 }, /* GL_FOG_COORDINATE_ARRAY_TYPE */
+   { 10127, 0x00008450 }, /* GL_FOG_COORDINATE_SOURCE */
+   { 10152, 0x00008457 }, /* GL_FOG_COORD_ARRAY */
+   { 10171, 0x0000889D }, /* GL_FOG_COORD_ARRAY_BUFFER_BINDING */
+   { 10205, 0x00008456 }, /* GL_FOG_COORD_ARRAY_POINTER */
+   { 10232, 0x00008455 }, /* GL_FOG_COORD_ARRAY_STRIDE */
+   { 10258, 0x00008454 }, /* GL_FOG_COORD_ARRAY_TYPE */
+   { 10282, 0x00008450 }, /* GL_FOG_COORD_SRC */
+   { 10299, 0x00000B62 }, /* GL_FOG_DENSITY */
+   { 10314, 0x0000855A }, /* GL_FOG_DISTANCE_MODE_NV */
+   { 10338, 0x00000B64 }, /* GL_FOG_END */
+   { 10349, 0x00000C54 }, /* GL_FOG_HINT */
+   { 10361, 0x00000B61 }, /* GL_FOG_INDEX */
+   { 10374, 0x00000B65 }, /* GL_FOG_MODE */
+   { 10386, 0x00008198 }, /* GL_FOG_OFFSET_SGIX */
+   { 10405, 0x00008199 }, /* GL_FOG_OFFSET_VALUE_SGIX */
+   { 10430, 0x00000B63 }, /* GL_FOG_START */
+   { 10443, 0x00008452 }, /* GL_FRAGMENT_DEPTH */
+   { 10461, 0x00008804 }, /* GL_FRAGMENT_PROGRAM_ARB */
+   { 10485, 0x00008B30 }, /* GL_FRAGMENT_SHADER */
+   { 10504, 0x00008B30 }, /* GL_FRAGMENT_SHADER_ARB */
+   { 10527, 0x00008B8B }, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
+   { 10562, 0x00008D40 }, /* GL_FRAMEBUFFER */
+   { 10577, 0x00008215 }, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
+   { 10614, 0x00008214 }, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
+   { 10650, 0x00008210 }, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
+   { 10691, 0x00008211 }, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
+   { 10732, 0x00008216 }, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
+   { 10769, 0x00008213 }, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
+   { 10806, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
+   { 10844, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT */
+   { 10886, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
+   { 10924, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT */
+   { 10966, 0x00008212 }, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
+   { 11001, 0x00008217 }, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
+   { 11040, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT */
+   { 11089, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
+   { 11137, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT */
+   { 11189, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+   { 11229, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
+   { 11273, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
+   { 11313, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT */
+   { 11357, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING_EXT */
+   { 11384, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE */
+   { 11408, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE_EXT */
+   { 11436, 0x00008218 }, /* GL_FRAMEBUFFER_DEFAULT */
+   { 11459, 0x00008D40 }, /* GL_FRAMEBUFFER_EXT */
+   { 11478, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
+   { 11515, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT */
+   { 11556, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
+   { 11597, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
+   { 11639, 0x00008CD8 }, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
+   { 11690, 0x00008CDA }, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
+   { 11728, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
+   { 11773, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT */
+   { 11822, 0x00008D56 }, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
+   { 11860, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
+   { 11902, 0x00008CDE }, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
+   { 11934, 0x00008219 }, /* GL_FRAMEBUFFER_UNDEFINED */
+   { 11959, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED */
+   { 11986, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED_EXT */
+   { 12017, 0x00000404 }, /* GL_FRONT */
+   { 12026, 0x00000408 }, /* GL_FRONT_AND_BACK */
+   { 12044, 0x00000B46 }, /* GL_FRONT_FACE */
+   { 12058, 0x00000400 }, /* GL_FRONT_LEFT */
+   { 12072, 0x00000401 }, /* GL_FRONT_RIGHT */
+   { 12087, 0x00008006 }, /* GL_FUNC_ADD */
+   { 12099, 0x00008006 }, /* GL_FUNC_ADD_EXT */
+   { 12115, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT */
+   { 12140, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT_EXT */
+   { 12169, 0x0000800A }, /* GL_FUNC_SUBTRACT */
+   { 12186, 0x0000800A }, /* GL_FUNC_SUBTRACT_EXT */
+   { 12207, 0x00008191 }, /* GL_GENERATE_MIPMAP */
+   { 12226, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT */
+   { 12250, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT_SGIS */
+   { 12279, 0x00008191 }, /* GL_GENERATE_MIPMAP_SGIS */
+   { 12303, 0x00000206 }, /* GL_GEQUAL */
+   { 12313, 0x00000204 }, /* GL_GREATER */
+   { 12324, 0x00001904 }, /* GL_GREEN */
+   { 12333, 0x00000D19 }, /* GL_GREEN_BIAS */
+   { 12347, 0x00000D53 }, /* GL_GREEN_BITS */
+   { 12361, 0x00000D18 }, /* GL_GREEN_SCALE */
+   { 12376, 0x00008000 }, /* GL_HINT_BIT */
+   { 12388, 0x00008024 }, /* GL_HISTOGRAM */
+   { 12401, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE */
+   { 12425, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE_EXT */
+   { 12453, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE */
+   { 12476, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE_EXT */
+   { 12503, 0x00008024 }, /* GL_HISTOGRAM_EXT */
+   { 12520, 0x00008027 }, /* GL_HISTOGRAM_FORMAT */
+   { 12540, 0x00008027 }, /* GL_HISTOGRAM_FORMAT_EXT */
+   { 12564, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE */
+   { 12588, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE_EXT */
+   { 12616, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE */
+   { 12644, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE_EXT */
+   { 12676, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE */
+   { 12698, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE_EXT */
+   { 12724, 0x0000802D }, /* GL_HISTOGRAM_SINK */
+   { 12742, 0x0000802D }, /* GL_HISTOGRAM_SINK_EXT */
+   { 12764, 0x00008026 }, /* GL_HISTOGRAM_WIDTH */
+   { 12783, 0x00008026 }, /* GL_HISTOGRAM_WIDTH_EXT */
+   { 12806, 0x0000862A }, /* GL_IDENTITY_NV */
+   { 12821, 0x00008150 }, /* GL_IGNORE_BORDER_HP */
+   { 12841, 0x00008B9B }, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
+   { 12881, 0x00008B9A }, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
+   { 12919, 0x00001E02 }, /* GL_INCR */
+   { 12927, 0x00008507 }, /* GL_INCR_WRAP */
+   { 12940, 0x00008507 }, /* GL_INCR_WRAP_EXT */
+   { 12957, 0x00008222 }, /* GL_INDEX */
+   { 12966, 0x00008077 }, /* GL_INDEX_ARRAY */
+   { 12981, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING */
+   { 13011, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING_ARB */
+   { 13045, 0x00008091 }, /* GL_INDEX_ARRAY_POINTER */
+   { 13068, 0x00008086 }, /* GL_INDEX_ARRAY_STRIDE */
+   { 13090, 0x00008085 }, /* GL_INDEX_ARRAY_TYPE */
+   { 13110, 0x00000D51 }, /* GL_INDEX_BITS */
+   { 13124, 0x00000C20 }, /* GL_INDEX_CLEAR_VALUE */
+   { 13145, 0x00000BF1 }, /* GL_INDEX_LOGIC_OP */
+   { 13163, 0x00000C30 }, /* GL_INDEX_MODE */
+   { 13177, 0x00000D13 }, /* GL_INDEX_OFFSET */
+   { 13193, 0x00000D12 }, /* GL_INDEX_SHIFT */
+   { 13208, 0x00000C21 }, /* GL_INDEX_WRITEMASK */
+   { 13227, 0x00008B84 }, /* GL_INFO_LOG_LENGTH */
+   { 13246, 0x00001404 }, /* GL_INT */
+   { 13253, 0x00008049 }, /* GL_INTENSITY */
+   { 13266, 0x0000804C }, /* GL_INTENSITY12 */
+   { 13281, 0x0000804C }, /* GL_INTENSITY12_EXT */
+   { 13300, 0x0000804D }, /* GL_INTENSITY16 */
+   { 13315, 0x0000804D }, /* GL_INTENSITY16_EXT */
+   { 13334, 0x0000804A }, /* GL_INTENSITY4 */
+   { 13348, 0x0000804A }, /* GL_INTENSITY4_EXT */
+   { 13366, 0x0000804B }, /* GL_INTENSITY8 */
+   { 13380, 0x0000804B }, /* GL_INTENSITY8_EXT */
+   { 13398, 0x00008049 }, /* GL_INTENSITY_EXT */
+   { 13415, 0x00008575 }, /* GL_INTERPOLATE */
+   { 13430, 0x00008575 }, /* GL_INTERPOLATE_ARB */
+   { 13449, 0x00008575 }, /* GL_INTERPOLATE_EXT */
+   { 13468, 0x00008B53 }, /* GL_INT_VEC2 */
+   { 13480, 0x00008B53 }, /* GL_INT_VEC2_ARB */
+   { 13496, 0x00008B54 }, /* GL_INT_VEC3 */
+   { 13508, 0x00008B54 }, /* GL_INT_VEC3_ARB */
+   { 13524, 0x00008B55 }, /* GL_INT_VEC4 */
+   { 13536, 0x00008B55 }, /* GL_INT_VEC4_ARB */
+   { 13552, 0x00000500 }, /* GL_INVALID_ENUM */
+   { 13568, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION */
+   { 13601, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION_EXT */
+   { 13638, 0x00000502 }, /* GL_INVALID_OPERATION */
+   { 13659, 0x00000501 }, /* GL_INVALID_VALUE */
+   { 13676, 0x0000862B }, /* GL_INVERSE_NV */
+   { 13690, 0x0000862D }, /* GL_INVERSE_TRANSPOSE_NV */
+   { 13714, 0x0000150A }, /* GL_INVERT */
+   { 13724, 0x00001E00 }, /* GL_KEEP */
+   { 13732, 0x00000406 }, /* GL_LEFT */
+   { 13740, 0x00000203 }, /* GL_LEQUAL */
+   { 13750, 0x00000201 }, /* GL_LESS */
+   { 13758, 0x00004000 }, /* GL_LIGHT0 */
+   { 13768, 0x00004001 }, /* GL_LIGHT1 */
+   { 13778, 0x00004002 }, /* GL_LIGHT2 */
+   { 13788, 0x00004003 }, /* GL_LIGHT3 */
+   { 13798, 0x00004004 }, /* GL_LIGHT4 */
+   { 13808, 0x00004005 }, /* GL_LIGHT5 */
+   { 13818, 0x00004006 }, /* GL_LIGHT6 */
+   { 13828, 0x00004007 }, /* GL_LIGHT7 */
+   { 13838, 0x00000B50 }, /* GL_LIGHTING */
+   { 13850, 0x00000040 }, /* GL_LIGHTING_BIT */
+   { 13866, 0x00000B53 }, /* GL_LIGHT_MODEL_AMBIENT */
+   { 13889, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL */
+   { 13918, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL_EXT */
+   { 13951, 0x00000B51 }, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
+   { 13979, 0x00000B52 }, /* GL_LIGHT_MODEL_TWO_SIDE */
+   { 14003, 0x00001B01 }, /* GL_LINE */
+   { 14011, 0x00002601 }, /* GL_LINEAR */
+   { 14021, 0x00001208 }, /* GL_LINEAR_ATTENUATION */
+   { 14043, 0x00008170 }, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
+   { 14073, 0x0000844F }, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
+   { 14104, 0x00002703 }, /* GL_LINEAR_MIPMAP_LINEAR */
+   { 14128, 0x00002701 }, /* GL_LINEAR_MIPMAP_NEAREST */
+   { 14153, 0x00000001 }, /* GL_LINES */
+   { 14162, 0x00000004 }, /* GL_LINE_BIT */
+   { 14174, 0x00000002 }, /* GL_LINE_LOOP */
+   { 14187, 0x00000707 }, /* GL_LINE_RESET_TOKEN */
+   { 14207, 0x00000B20 }, /* GL_LINE_SMOOTH */
+   { 14222, 0x00000C52 }, /* GL_LINE_SMOOTH_HINT */
+   { 14242, 0x00000B24 }, /* GL_LINE_STIPPLE */
+   { 14258, 0x00000B25 }, /* GL_LINE_STIPPLE_PATTERN */
+   { 14282, 0x00000B26 }, /* GL_LINE_STIPPLE_REPEAT */
+   { 14305, 0x00000003 }, /* GL_LINE_STRIP */
+   { 14319, 0x00000702 }, /* GL_LINE_TOKEN */
+   { 14333, 0x00000B21 }, /* GL_LINE_WIDTH */
+   { 14347, 0x00000B23 }, /* GL_LINE_WIDTH_GRANULARITY */
+   { 14373, 0x00000B22 }, /* GL_LINE_WIDTH_RANGE */
+   { 14393, 0x00008B82 }, /* GL_LINK_STATUS */
+   { 14408, 0x00000B32 }, /* GL_LIST_BASE */
+   { 14421, 0x00020000 }, /* GL_LIST_BIT */
+   { 14433, 0x00000B33 }, /* GL_LIST_INDEX */
+   { 14447, 0x00000B30 }, /* GL_LIST_MODE */
+   { 14460, 0x00000101 }, /* GL_LOAD */
+   { 14468, 0x00000BF1 }, /* GL_LOGIC_OP */
+   { 14480, 0x00000BF0 }, /* GL_LOGIC_OP_MODE */
+   { 14497, 0x00008CA1 }, /* GL_LOWER_LEFT */
+   { 14511, 0x00001909 }, /* GL_LUMINANCE */
+   { 14524, 0x00008041 }, /* GL_LUMINANCE12 */
+   { 14539, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12 */
+   { 14562, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12_EXT */
+   { 14589, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4 */
+   { 14611, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4_EXT */
+   { 14637, 0x00008041 }, /* GL_LUMINANCE12_EXT */
+   { 14656, 0x00008042 }, /* GL_LUMINANCE16 */
+   { 14671, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16 */
+   { 14694, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16_EXT */
+   { 14721, 0x00008042 }, /* GL_LUMINANCE16_EXT */
+   { 14740, 0x0000803F }, /* GL_LUMINANCE4 */
+   { 14754, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4 */
+   { 14775, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4_EXT */
+   { 14800, 0x0000803F }, /* GL_LUMINANCE4_EXT */
+   { 14818, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2 */
+   { 14839, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2_EXT */
+   { 14864, 0x00008040 }, /* GL_LUMINANCE8 */
+   { 14878, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8 */
+   { 14899, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8_EXT */
+   { 14924, 0x00008040 }, /* GL_LUMINANCE8_EXT */
+   { 14942, 0x0000190A }, /* GL_LUMINANCE_ALPHA */
+   { 14961, 0x00000D90 }, /* GL_MAP1_COLOR_4 */
+   { 14977, 0x00000DD0 }, /* GL_MAP1_GRID_DOMAIN */
+   { 14997, 0x00000DD1 }, /* GL_MAP1_GRID_SEGMENTS */
+   { 15019, 0x00000D91 }, /* GL_MAP1_INDEX */
+   { 15033, 0x00000D92 }, /* GL_MAP1_NORMAL */
+   { 15048, 0x00000D93 }, /* GL_MAP1_TEXTURE_COORD_1 */
+   { 15072, 0x00000D94 }, /* GL_MAP1_TEXTURE_COORD_2 */
+   { 15096, 0x00000D95 }, /* GL_MAP1_TEXTURE_COORD_3 */
+   { 15120, 0x00000D96 }, /* GL_MAP1_TEXTURE_COORD_4 */
+   { 15144, 0x00000D97 }, /* GL_MAP1_VERTEX_3 */
+   { 15161, 0x00000D98 }, /* GL_MAP1_VERTEX_4 */
+   { 15178, 0x00008660 }, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
+   { 15206, 0x0000866A }, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
+   { 15235, 0x0000866B }, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
+   { 15264, 0x0000866C }, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
+   { 15293, 0x0000866D }, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
+   { 15322, 0x0000866E }, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
+   { 15351, 0x0000866F }, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
+   { 15380, 0x00008661 }, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
+   { 15408, 0x00008662 }, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
+   { 15436, 0x00008663 }, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
+   { 15464, 0x00008664 }, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
+   { 15492, 0x00008665 }, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
+   { 15520, 0x00008666 }, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
+   { 15548, 0x00008667 }, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
+   { 15576, 0x00008668 }, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
+   { 15604, 0x00008669 }, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
+   { 15632, 0x00000DB0 }, /* GL_MAP2_COLOR_4 */
+   { 15648, 0x00000DD2 }, /* GL_MAP2_GRID_DOMAIN */
+   { 15668, 0x00000DD3 }, /* GL_MAP2_GRID_SEGMENTS */
+   { 15690, 0x00000DB1 }, /* GL_MAP2_INDEX */
+   { 15704, 0x00000DB2 }, /* GL_MAP2_NORMAL */
+   { 15719, 0x00000DB3 }, /* GL_MAP2_TEXTURE_COORD_1 */
+   { 15743, 0x00000DB4 }, /* GL_MAP2_TEXTURE_COORD_2 */
+   { 15767, 0x00000DB5 }, /* GL_MAP2_TEXTURE_COORD_3 */
+   { 15791, 0x00000DB6 }, /* GL_MAP2_TEXTURE_COORD_4 */
+   { 15815, 0x00000DB7 }, /* GL_MAP2_VERTEX_3 */
+   { 15832, 0x00000DB8 }, /* GL_MAP2_VERTEX_4 */
+   { 15849, 0x00008670 }, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
+   { 15877, 0x0000867A }, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
+   { 15906, 0x0000867B }, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
+   { 15935, 0x0000867C }, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
+   { 15964, 0x0000867D }, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
+   { 15993, 0x0000867E }, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
+   { 16022, 0x0000867F }, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
+   { 16051, 0x00008671 }, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
+   { 16079, 0x00008672 }, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
+   { 16107, 0x00008673 }, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
+   { 16135, 0x00008674 }, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
+   { 16163, 0x00008675 }, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
+   { 16191, 0x00008676 }, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
+   { 16219, 0x00008677 }, /* GL_MAP2_VERTEX_ATTRIB7_4_NV */
+   { 16247, 0x00008678 }, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
+   { 16275, 0x00008679 }, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
+   { 16303, 0x00000D10 }, /* GL_MAP_COLOR */
+   { 16316, 0x00000D11 }, /* GL_MAP_STENCIL */
+   { 16331, 0x000088C0 }, /* GL_MATRIX0_ARB */
+   { 16346, 0x00008630 }, /* GL_MATRIX0_NV */
+   { 16360, 0x000088CA }, /* GL_MATRIX10_ARB */
+   { 16376, 0x000088CB }, /* GL_MATRIX11_ARB */
+   { 16392, 0x000088CC }, /* GL_MATRIX12_ARB */
+   { 16408, 0x000088CD }, /* GL_MATRIX13_ARB */
+   { 16424, 0x000088CE }, /* GL_MATRIX14_ARB */
+   { 16440, 0x000088CF }, /* GL_MATRIX15_ARB */
+   { 16456, 0x000088D0 }, /* GL_MATRIX16_ARB */
+   { 16472, 0x000088D1 }, /* GL_MATRIX17_ARB */
+   { 16488, 0x000088D2 }, /* GL_MATRIX18_ARB */
+   { 16504, 0x000088D3 }, /* GL_MATRIX19_ARB */
+   { 16520, 0x000088C1 }, /* GL_MATRIX1_ARB */
+   { 16535, 0x00008631 }, /* GL_MATRIX1_NV */
+   { 16549, 0x000088D4 }, /* GL_MATRIX20_ARB */
+   { 16565, 0x000088D5 }, /* GL_MATRIX21_ARB */
+   { 16581, 0x000088D6 }, /* GL_MATRIX22_ARB */
+   { 16597, 0x000088D7 }, /* GL_MATRIX23_ARB */
+   { 16613, 0x000088D8 }, /* GL_MATRIX24_ARB */
+   { 16629, 0x000088D9 }, /* GL_MATRIX25_ARB */
+   { 16645, 0x000088DA }, /* GL_MATRIX26_ARB */
+   { 16661, 0x000088DB }, /* GL_MATRIX27_ARB */
+   { 16677, 0x000088DC }, /* GL_MATRIX28_ARB */
+   { 16693, 0x000088DD }, /* GL_MATRIX29_ARB */
+   { 16709, 0x000088C2 }, /* GL_MATRIX2_ARB */
+   { 16724, 0x00008632 }, /* GL_MATRIX2_NV */
+   { 16738, 0x000088DE }, /* GL_MATRIX30_ARB */
+   { 16754, 0x000088DF }, /* GL_MATRIX31_ARB */
+   { 16770, 0x000088C3 }, /* GL_MATRIX3_ARB */
+   { 16785, 0x00008633 }, /* GL_MATRIX3_NV */
+   { 16799, 0x000088C4 }, /* GL_MATRIX4_ARB */
+   { 16814, 0x00008634 }, /* GL_MATRIX4_NV */
+   { 16828, 0x000088C5 }, /* GL_MATRIX5_ARB */
+   { 16843, 0x00008635 }, /* GL_MATRIX5_NV */
+   { 16857, 0x000088C6 }, /* GL_MATRIX6_ARB */
+   { 16872, 0x00008636 }, /* GL_MATRIX6_NV */
+   { 16886, 0x000088C7 }, /* GL_MATRIX7_ARB */
+   { 16901, 0x00008637 }, /* GL_MATRIX7_NV */
+   { 16915, 0x000088C8 }, /* GL_MATRIX8_ARB */
+   { 16930, 0x000088C9 }, /* GL_MATRIX9_ARB */
+   { 16945, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_ARB */
+   { 16971, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
+   { 17005, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
+   { 17036, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
+   { 17069, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
+   { 17100, 0x00000BA0 }, /* GL_MATRIX_MODE */
+   { 17115, 0x00008840 }, /* GL_MATRIX_PALETTE_ARB */
+   { 17137, 0x00008008 }, /* GL_MAX */
+   { 17144, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE */
+   { 17167, 0x000088FF }, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
+   { 17199, 0x00000D35 }, /* GL_MAX_ATTRIB_STACK_DEPTH */
+   { 17225, 0x00000D3B }, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
+   { 17258, 0x00008177 }, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
+   { 17284, 0x00008178 }, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+   { 17318, 0x00000D32 }, /* GL_MAX_CLIP_PLANES */
+   { 17337, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
+   { 17366, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
+   { 17398, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI */
+   { 17434, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
+   { 17470, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB */
+   { 17510, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT */
+   { 17536, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT_EXT */
+   { 17566, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH */
+   { 17591, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH_EXT */
+   { 17620, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
+   { 17649, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB */
+   { 17682, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS */
+   { 17702, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ARB */
+   { 17726, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ATI */
+   { 17750, 0x000080E9 }, /* GL_MAX_ELEMENTS_INDICES */
+   { 17774, 0x000080E8 }, /* GL_MAX_ELEMENTS_VERTICES */
+   { 17799, 0x00000D30 }, /* GL_MAX_EVAL_ORDER */
+   { 17817, 0x00008008 }, /* GL_MAX_EXT */
+   { 17828, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
+   { 17863, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB */
+   { 17902, 0x00000D31 }, /* GL_MAX_LIGHTS */
+   { 17916, 0x00000B31 }, /* GL_MAX_LIST_NESTING */
+   { 17936, 0x00008841 }, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
+   { 17974, 0x00000D36 }, /* GL_MAX_MODELVIEW_STACK_DEPTH */
+   { 18003, 0x00000D37 }, /* GL_MAX_NAME_STACK_DEPTH */
+   { 18027, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_ARB */
+   { 18055, 0x00000D34 }, /* GL_MAX_PIXEL_MAP_TABLE */
+   { 18078, 0x000088B1 }, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
+   { 18115, 0x0000880B }, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
+   { 18151, 0x000088AD }, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
+   { 18178, 0x000088F5 }, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
+   { 18207, 0x000088B5 }, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
+   { 18241, 0x000088F4 }, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
+   { 18277, 0x000088F6 }, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
+   { 18304, 0x000088A1 }, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
+   { 18336, 0x000088B4 }, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
+   { 18372, 0x000088F8 }, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
+   { 18401, 0x000088F7 }, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
+   { 18430, 0x0000862F }, /* GL_MAX_PROGRAM_MATRICES_ARB */
+   { 18458, 0x0000862E }, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
+   { 18496, 0x000088B3 }, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+   { 18540, 0x0000880E }, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+   { 18583, 0x000088AF }, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
+   { 18617, 0x000088A3 }, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+   { 18656, 0x000088AB }, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
+   { 18693, 0x000088A7 }, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
+   { 18731, 0x00008810 }, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+   { 18774, 0x0000880F }, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+   { 18817, 0x000088A9 }, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
+   { 18847, 0x000088A5 }, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
+   { 18878, 0x0000880D }, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
+   { 18914, 0x0000880C }, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
+   { 18950, 0x00000D38 }, /* GL_MAX_PROJECTION_STACK_DEPTH */
+   { 18980, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
+   { 19014, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_NV */
+   { 19047, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
+   { 19076, 0x00008D57 }, /* GL_MAX_SAMPLES */
+   { 19091, 0x00008504 }, /* GL_MAX_SHININESS_NV */
+   { 19111, 0x00008505 }, /* GL_MAX_SPOT_EXPONENT_NV */
+   { 19135, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS */
+   { 19157, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS_ARB */
+   { 19183, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS */
+   { 19210, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS_ARB */
+   { 19241, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS */
+   { 19265, 0x000084FF }, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
+   { 19299, 0x00000D33 }, /* GL_MAX_TEXTURE_SIZE */
+   { 19319, 0x00000D39 }, /* GL_MAX_TEXTURE_STACK_DEPTH */
+   { 19346, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS */
+   { 19367, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS_ARB */
+   { 19392, 0x0000862F }, /* GL_MAX_TRACK_MATRICES_NV */
+   { 19417, 0x0000862E }, /* GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */
+   { 19452, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS */
+   { 19474, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS_ARB */
+   { 19500, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS */
+   { 19522, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS_ARB */
+   { 19548, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
+   { 19582, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
+   { 19620, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
+   { 19653, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB */
+   { 19690, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_ARB */
+   { 19714, 0x00000D3A }, /* GL_MAX_VIEWPORT_DIMS */
+   { 19735, 0x00008007 }, /* GL_MIN */
+   { 19742, 0x0000802E }, /* GL_MINMAX */
+   { 19752, 0x0000802E }, /* GL_MINMAX_EXT */
+   { 19766, 0x0000802F }, /* GL_MINMAX_FORMAT */
+   { 19783, 0x0000802F }, /* GL_MINMAX_FORMAT_EXT */
+   { 19804, 0x00008030 }, /* GL_MINMAX_SINK */
+   { 19819, 0x00008030 }, /* GL_MINMAX_SINK_EXT */
+   { 19838, 0x00008007 }, /* GL_MIN_EXT */
+   { 19849, 0x00008370 }, /* GL_MIRRORED_REPEAT */
+   { 19868, 0x00008370 }, /* GL_MIRRORED_REPEAT_ARB */
+   { 19891, 0x00008370 }, /* GL_MIRRORED_REPEAT_IBM */
+   { 19914, 0x00008742 }, /* GL_MIRROR_CLAMP_ATI */
+   { 19934, 0x00008742 }, /* GL_MIRROR_CLAMP_EXT */
+   { 19954, 0x00008912 }, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
+   { 19984, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_ATI */
+   { 20012, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
+   { 20040, 0x00001700 }, /* GL_MODELVIEW */
+   { 20053, 0x00001700 }, /* GL_MODELVIEW0_ARB */
+   { 20071, 0x0000872A }, /* GL_MODELVIEW10_ARB */
+   { 20090, 0x0000872B }, /* GL_MODELVIEW11_ARB */
+   { 20109, 0x0000872C }, /* GL_MODELVIEW12_ARB */
+   { 20128, 0x0000872D }, /* GL_MODELVIEW13_ARB */
+   { 20147, 0x0000872E }, /* GL_MODELVIEW14_ARB */
+   { 20166, 0x0000872F }, /* GL_MODELVIEW15_ARB */
+   { 20185, 0x00008730 }, /* GL_MODELVIEW16_ARB */
+   { 20204, 0x00008731 }, /* GL_MODELVIEW17_ARB */
+   { 20223, 0x00008732 }, /* GL_MODELVIEW18_ARB */
+   { 20242, 0x00008733 }, /* GL_MODELVIEW19_ARB */
+   { 20261, 0x0000850A }, /* GL_MODELVIEW1_ARB */
+   { 20279, 0x00008734 }, /* GL_MODELVIEW20_ARB */
+   { 20298, 0x00008735 }, /* GL_MODELVIEW21_ARB */
+   { 20317, 0x00008736 }, /* GL_MODELVIEW22_ARB */
+   { 20336, 0x00008737 }, /* GL_MODELVIEW23_ARB */
+   { 20355, 0x00008738 }, /* GL_MODELVIEW24_ARB */
+   { 20374, 0x00008739 }, /* GL_MODELVIEW25_ARB */
+   { 20393, 0x0000873A }, /* GL_MODELVIEW26_ARB */
+   { 20412, 0x0000873B }, /* GL_MODELVIEW27_ARB */
+   { 20431, 0x0000873C }, /* GL_MODELVIEW28_ARB */
+   { 20450, 0x0000873D }, /* GL_MODELVIEW29_ARB */
+   { 20469, 0x00008722 }, /* GL_MODELVIEW2_ARB */
+   { 20487, 0x0000873E }, /* GL_MODELVIEW30_ARB */
+   { 20506, 0x0000873F }, /* GL_MODELVIEW31_ARB */
+   { 20525, 0x00008723 }, /* GL_MODELVIEW3_ARB */
+   { 20543, 0x00008724 }, /* GL_MODELVIEW4_ARB */
+   { 20561, 0x00008725 }, /* GL_MODELVIEW5_ARB */
+   { 20579, 0x00008726 }, /* GL_MODELVIEW6_ARB */
+   { 20597, 0x00008727 }, /* GL_MODELVIEW7_ARB */
+   { 20615, 0x00008728 }, /* GL_MODELVIEW8_ARB */
+   { 20633, 0x00008729 }, /* GL_MODELVIEW9_ARB */
+   { 20651, 0x00000BA6 }, /* GL_MODELVIEW_MATRIX */
+   { 20671, 0x00008629 }, /* GL_MODELVIEW_PROJECTION_NV */
+   { 20698, 0x00000BA3 }, /* GL_MODELVIEW_STACK_DEPTH */
+   { 20723, 0x00002100 }, /* GL_MODULATE */
+   { 20735, 0x00008744 }, /* GL_MODULATE_ADD_ATI */
+   { 20755, 0x00008745 }, /* GL_MODULATE_SIGNED_ADD_ATI */
+   { 20782, 0x00008746 }, /* GL_MODULATE_SUBTRACT_ATI */
+   { 20807, 0x00000103 }, /* GL_MULT */
+   { 20815, 0x0000809D }, /* GL_MULTISAMPLE */
+   { 20830, 0x000086B2 }, /* GL_MULTISAMPLE_3DFX */
+   { 20850, 0x0000809D }, /* GL_MULTISAMPLE_ARB */
+   { 20869, 0x20000000 }, /* GL_MULTISAMPLE_BIT */
+   { 20888, 0x20000000 }, /* GL_MULTISAMPLE_BIT_3DFX */
+   { 20912, 0x20000000 }, /* GL_MULTISAMPLE_BIT_ARB */
+   { 20935, 0x00008534 }, /* GL_MULTISAMPLE_FILTER_HINT_NV */
+   { 20965, 0x00002A25 }, /* GL_N3F_V3F */
+   { 20976, 0x00000D70 }, /* GL_NAME_STACK_DEPTH */
+   { 20996, 0x0000150E }, /* GL_NAND */
+   { 21004, 0x00002600 }, /* GL_NEAREST */
+   { 21015, 0x0000844E }, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
+   { 21046, 0x0000844D }, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
+   { 21078, 0x00002702 }, /* GL_NEAREST_MIPMAP_LINEAR */
+   { 21103, 0x00002700 }, /* GL_NEAREST_MIPMAP_NEAREST */
+   { 21129, 0x00000200 }, /* GL_NEVER */
+   { 21138, 0x00001102 }, /* GL_NICEST */
+   { 21148, 0x00000000 }, /* GL_NONE */
+   { 21156, 0x00001505 }, /* GL_NOOP */
+   { 21164, 0x00001508 }, /* GL_NOR */
+   { 21171, 0x00000BA1 }, /* GL_NORMALIZE */
+   { 21184, 0x00008075 }, /* GL_NORMAL_ARRAY */
+   { 21200, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
+   { 21231, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING_ARB */
+   { 21266, 0x0000808F }, /* GL_NORMAL_ARRAY_POINTER */
+   { 21290, 0x0000807F }, /* GL_NORMAL_ARRAY_STRIDE */
+   { 21313, 0x0000807E }, /* GL_NORMAL_ARRAY_TYPE */
+   { 21334, 0x00008511 }, /* GL_NORMAL_MAP */
+   { 21348, 0x00008511 }, /* GL_NORMAL_MAP_ARB */
+   { 21366, 0x00008511 }, /* GL_NORMAL_MAP_NV */
+   { 21383, 0x00000205 }, /* GL_NOTEQUAL */
+   { 21395, 0x00000000 }, /* GL_NO_ERROR */
+   { 21407, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
+   { 21441, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB */
+   { 21479, 0x00008B89 }, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */
+   { 21511, 0x00008B8A }, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */
+   { 21553, 0x00008B86 }, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */
+   { 21583, 0x00008B87 }, /* GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB */
+   { 21623, 0x00008B85 }, /* GL_OBJECT_ATTACHED_OBJECTS_ARB */
+   { 21654, 0x00008B81 }, /* GL_OBJECT_COMPILE_STATUS_ARB */
+   { 21683, 0x00008B80 }, /* GL_OBJECT_DELETE_STATUS_ARB */
+   { 21711, 0x00008B84 }, /* GL_OBJECT_INFO_LOG_LENGTH_ARB */
+   { 21741, 0x00002401 }, /* GL_OBJECT_LINEAR */
+   { 21758, 0x00008B82 }, /* GL_OBJECT_LINK_STATUS_ARB */
+   { 21784, 0x00002501 }, /* GL_OBJECT_PLANE */
+   { 21800, 0x00008B88 }, /* GL_OBJECT_SHADER_SOURCE_LENGTH_ARB */
+   { 21835, 0x00008B4F }, /* GL_OBJECT_SUBTYPE_ARB */
+   { 21857, 0x00008B4E }, /* GL_OBJECT_TYPE_ARB */
+   { 21876, 0x00008B83 }, /* GL_OBJECT_VALIDATE_STATUS_ARB */
+   { 21906, 0x00008165 }, /* GL_OCCLUSION_TEST_HP */
+   { 21927, 0x00008166 }, /* GL_OCCLUSION_TEST_RESULT_HP */
+   { 21955, 0x00000001 }, /* GL_ONE */
+   { 21962, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA */
+   { 21990, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA_EXT */
+   { 22022, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR */
+   { 22050, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR_EXT */
+   { 22082, 0x00000305 }, /* GL_ONE_MINUS_DST_ALPHA */
+   { 22105, 0x00000307 }, /* GL_ONE_MINUS_DST_COLOR */
+   { 22128, 0x00000303 }, /* GL_ONE_MINUS_SRC_ALPHA */
+   { 22151, 0x00000301 }, /* GL_ONE_MINUS_SRC_COLOR */
+   { 22174, 0x00008598 }, /* GL_OPERAND0_ALPHA */
+   { 22192, 0x00008598 }, /* GL_OPERAND0_ALPHA_ARB */
+   { 22214, 0x00008598 }, /* GL_OPERAND0_ALPHA_EXT */
+   { 22236, 0x00008590 }, /* GL_OPERAND0_RGB */
+   { 22252, 0x00008590 }, /* GL_OPERAND0_RGB_ARB */
+   { 22272, 0x00008590 }, /* GL_OPERAND0_RGB_EXT */
+   { 22292, 0x00008599 }, /* GL_OPERAND1_ALPHA */
+   { 22310, 0x00008599 }, /* GL_OPERAND1_ALPHA_ARB */
+   { 22332, 0x00008599 }, /* GL_OPERAND1_ALPHA_EXT */
+   { 22354, 0x00008591 }, /* GL_OPERAND1_RGB */
+   { 22370, 0x00008591 }, /* GL_OPERAND1_RGB_ARB */
+   { 22390, 0x00008591 }, /* GL_OPERAND1_RGB_EXT */
+   { 22410, 0x0000859A }, /* GL_OPERAND2_ALPHA */
+   { 22428, 0x0000859A }, /* GL_OPERAND2_ALPHA_ARB */
+   { 22450, 0x0000859A }, /* GL_OPERAND2_ALPHA_EXT */
+   { 22472, 0x00008592 }, /* GL_OPERAND2_RGB */
+   { 22488, 0x00008592 }, /* GL_OPERAND2_RGB_ARB */
+   { 22508, 0x00008592 }, /* GL_OPERAND2_RGB_EXT */
+   { 22528, 0x0000859B }, /* GL_OPERAND3_ALPHA_NV */
+   { 22549, 0x00008593 }, /* GL_OPERAND3_RGB_NV */
+   { 22568, 0x00001507 }, /* GL_OR */
+   { 22574, 0x00000A01 }, /* GL_ORDER */
+   { 22583, 0x0000150D }, /* GL_OR_INVERTED */
+   { 22598, 0x0000150B }, /* GL_OR_REVERSE */
+   { 22612, 0x00000505 }, /* GL_OUT_OF_MEMORY */
+   { 22629, 0x00000D05 }, /* GL_PACK_ALIGNMENT */
+   { 22647, 0x0000806C }, /* GL_PACK_IMAGE_HEIGHT */
+   { 22668, 0x00008758 }, /* GL_PACK_INVERT_MESA */
+   { 22688, 0x00000D01 }, /* GL_PACK_LSB_FIRST */
+   { 22706, 0x00000D02 }, /* GL_PACK_ROW_LENGTH */
+   { 22725, 0x0000806B }, /* GL_PACK_SKIP_IMAGES */
+   { 22745, 0x00000D04 }, /* GL_PACK_SKIP_PIXELS */
+   { 22765, 0x00000D03 }, /* GL_PACK_SKIP_ROWS */
+   { 22783, 0x00000D00 }, /* GL_PACK_SWAP_BYTES */
+   { 22802, 0x00008B92 }, /* GL_PALETTE4_R5_G6_B5_OES */
+   { 22827, 0x00008B94 }, /* GL_PALETTE4_RGB5_A1_OES */
+   { 22851, 0x00008B90 }, /* GL_PALETTE4_RGB8_OES */
+   { 22872, 0x00008B93 }, /* GL_PALETTE4_RGBA4_OES */
+   { 22894, 0x00008B91 }, /* GL_PALETTE4_RGBA8_OES */
+   { 22916, 0x00008B97 }, /* GL_PALETTE8_R5_G6_B5_OES */
+   { 22941, 0x00008B99 }, /* GL_PALETTE8_RGB5_A1_OES */
+   { 22965, 0x00008B95 }, /* GL_PALETTE8_RGB8_OES */
+   { 22986, 0x00008B98 }, /* GL_PALETTE8_RGBA4_OES */
+   { 23008, 0x00008B96 }, /* GL_PALETTE8_RGBA8_OES */
+   { 23030, 0x00000700 }, /* GL_PASS_THROUGH_TOKEN */
+   { 23052, 0x00000C50 }, /* GL_PERSPECTIVE_CORRECTION_HINT */
+   { 23083, 0x00000C79 }, /* GL_PIXEL_MAP_A_TO_A */
+   { 23103, 0x00000CB9 }, /* GL_PIXEL_MAP_A_TO_A_SIZE */
+   { 23128, 0x00000C78 }, /* GL_PIXEL_MAP_B_TO_B */
+   { 23148, 0x00000CB8 }, /* GL_PIXEL_MAP_B_TO_B_SIZE */
+   { 23173, 0x00000C77 }, /* GL_PIXEL_MAP_G_TO_G */
+   { 23193, 0x00000CB7 }, /* GL_PIXEL_MAP_G_TO_G_SIZE */
+   { 23218, 0x00000C75 }, /* GL_PIXEL_MAP_I_TO_A */
+   { 23238, 0x00000CB5 }, /* GL_PIXEL_MAP_I_TO_A_SIZE */
+   { 23263, 0x00000C74 }, /* GL_PIXEL_MAP_I_TO_B */
+   { 23283, 0x00000CB4 }, /* GL_PIXEL_MAP_I_TO_B_SIZE */
+   { 23308, 0x00000C73 }, /* GL_PIXEL_MAP_I_TO_G */
+   { 23328, 0x00000CB3 }, /* GL_PIXEL_MAP_I_TO_G_SIZE */
+   { 23353, 0x00000C70 }, /* GL_PIXEL_MAP_I_TO_I */
+   { 23373, 0x00000CB0 }, /* GL_PIXEL_MAP_I_TO_I_SIZE */
+   { 23398, 0x00000C72 }, /* GL_PIXEL_MAP_I_TO_R */
+   { 23418, 0x00000CB2 }, /* GL_PIXEL_MAP_I_TO_R_SIZE */
+   { 23443, 0x00000C76 }, /* GL_PIXEL_MAP_R_TO_R */
+   { 23463, 0x00000CB6 }, /* GL_PIXEL_MAP_R_TO_R_SIZE */
+   { 23488, 0x00000C71 }, /* GL_PIXEL_MAP_S_TO_S */
+   { 23508, 0x00000CB1 }, /* GL_PIXEL_MAP_S_TO_S_SIZE */
+   { 23533, 0x00000020 }, /* GL_PIXEL_MODE_BIT */
+   { 23551, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER */
+   { 23572, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING */
+   { 23601, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING_EXT */
+   { 23634, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER_EXT */
+   { 23659, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER */
+   { 23682, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
+   { 23713, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING_EXT */
+   { 23748, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER_EXT */
+   { 23775, 0x00001B00 }, /* GL_POINT */
+   { 23784, 0x00000000 }, /* GL_POINTS */
+   { 23794, 0x00000002 }, /* GL_POINT_BIT */
+   { 23807, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION */
+   { 23837, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_ARB */
+   { 23871, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_EXT */
+   { 23905, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_SGIS */
+   { 23940, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE */
+   { 23969, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_ARB */
+   { 24002, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_EXT */
+   { 24035, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_SGIS */
+   { 24069, 0x00000B11 }, /* GL_POINT_SIZE */
+   { 24083, 0x00000B13 }, /* GL_POINT_SIZE_GRANULARITY */
+   { 24109, 0x00008127 }, /* GL_POINT_SIZE_MAX */
+   { 24127, 0x00008127 }, /* GL_POINT_SIZE_MAX_ARB */
+   { 24149, 0x00008127 }, /* GL_POINT_SIZE_MAX_EXT */
+   { 24171, 0x00008127 }, /* GL_POINT_SIZE_MAX_SGIS */
+   { 24194, 0x00008126 }, /* GL_POINT_SIZE_MIN */
+   { 24212, 0x00008126 }, /* GL_POINT_SIZE_MIN_ARB */
+   { 24234, 0x00008126 }, /* GL_POINT_SIZE_MIN_EXT */
+   { 24256, 0x00008126 }, /* GL_POINT_SIZE_MIN_SGIS */
+   { 24279, 0x00000B12 }, /* GL_POINT_SIZE_RANGE */
+   { 24299, 0x00000B10 }, /* GL_POINT_SMOOTH */
+   { 24315, 0x00000C51 }, /* GL_POINT_SMOOTH_HINT */
+   { 24336, 0x00008861 }, /* GL_POINT_SPRITE */
+   { 24352, 0x00008861 }, /* GL_POINT_SPRITE_ARB */
+   { 24372, 0x00008CA0 }, /* GL_POINT_SPRITE_COORD_ORIGIN */
+   { 24401, 0x00008861 }, /* GL_POINT_SPRITE_NV */
+   { 24420, 0x00008863 }, /* GL_POINT_SPRITE_R_MODE_NV */
+   { 24446, 0x00000701 }, /* GL_POINT_TOKEN */
+   { 24461, 0x00000009 }, /* GL_POLYGON */
+   { 24472, 0x00000008 }, /* GL_POLYGON_BIT */
+   { 24487, 0x00000B40 }, /* GL_POLYGON_MODE */
+   { 24503, 0x00008039 }, /* GL_POLYGON_OFFSET_BIAS */
+   { 24526, 0x00008038 }, /* GL_POLYGON_OFFSET_FACTOR */
+   { 24551, 0x00008037 }, /* GL_POLYGON_OFFSET_FILL */
+   { 24574, 0x00002A02 }, /* GL_POLYGON_OFFSET_LINE */
+   { 24597, 0x00002A01 }, /* GL_POLYGON_OFFSET_POINT */
+   { 24621, 0x00002A00 }, /* GL_POLYGON_OFFSET_UNITS */
+   { 24645, 0x00000B41 }, /* GL_POLYGON_SMOOTH */
+   { 24663, 0x00000C53 }, /* GL_POLYGON_SMOOTH_HINT */
+   { 24686, 0x00000B42 }, /* GL_POLYGON_STIPPLE */
+   { 24705, 0x00000010 }, /* GL_POLYGON_STIPPLE_BIT */
+   { 24728, 0x00000703 }, /* GL_POLYGON_TOKEN */
+   { 24745, 0x00001203 }, /* GL_POSITION */
+   { 24757, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
+   { 24789, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI */
+   { 24825, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
+   { 24858, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI */
+   { 24895, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
+   { 24926, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI */
+   { 24961, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
+   { 24993, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI */
+   { 25029, 0x000080D2 }, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
+   { 25062, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
+   { 25094, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI */
+   { 25130, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
+   { 25163, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI */
+   { 25200, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS */
+   { 25230, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS_SGI */
+   { 25264, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE */
+   { 25295, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE_SGI */
+   { 25330, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
+   { 25361, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS_EXT */
+   { 25396, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
+   { 25428, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE_EXT */
+   { 25464, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS */
+   { 25494, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS_EXT */
+   { 25528, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE */
+   { 25559, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE_EXT */
+   { 25594, 0x000080D1 }, /* GL_POST_CONVOLUTION_COLOR_TABLE */
+   { 25626, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS */
+   { 25657, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS_EXT */
+   { 25692, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE */
+   { 25724, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE_EXT */
+   { 25760, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS */
+   { 25789, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS_EXT */
+   { 25822, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE */
+   { 25852, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE_EXT */
+   { 25886, 0x0000817B }, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
+   { 25925, 0x00008179 }, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
+   { 25958, 0x0000817C }, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
+   { 25998, 0x0000817A }, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
+   { 26032, 0x00008578 }, /* GL_PREVIOUS */
+   { 26044, 0x00008578 }, /* GL_PREVIOUS_ARB */
+   { 26060, 0x00008578 }, /* GL_PREVIOUS_EXT */
+   { 26076, 0x00008577 }, /* GL_PRIMARY_COLOR */
+   { 26093, 0x00008577 }, /* GL_PRIMARY_COLOR_ARB */
+   { 26114, 0x00008577 }, /* GL_PRIMARY_COLOR_EXT */
+   { 26135, 0x000088B0 }, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
+   { 26168, 0x00008805 }, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
+   { 26200, 0x000088AC }, /* GL_PROGRAM_ATTRIBS_ARB */
+   { 26223, 0x00008677 }, /* GL_PROGRAM_BINDING_ARB */
+   { 26246, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_ARB */
+   { 26276, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_NV */
+   { 26305, 0x00008874 }, /* GL_PROGRAM_ERROR_STRING_ARB */
+   { 26333, 0x00008876 }, /* GL_PROGRAM_FORMAT_ARB */
+   { 26355, 0x00008875 }, /* GL_PROGRAM_FORMAT_ASCII_ARB */
+   { 26383, 0x000088A0 }, /* GL_PROGRAM_INSTRUCTIONS_ARB */
+   { 26411, 0x00008627 }, /* GL_PROGRAM_LENGTH_ARB */
+   { 26433, 0x00008627 }, /* GL_PROGRAM_LENGTH_NV */
+   { 26454, 0x000088B2 }, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+   { 26494, 0x00008808 }, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+   { 26533, 0x000088AE }, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
+   { 26563, 0x000088A2 }, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+   { 26598, 0x000088AA }, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
+   { 26631, 0x000088A6 }, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
+   { 26665, 0x0000880A }, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+   { 26704, 0x00008809 }, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+   { 26743, 0x00008B40 }, /* GL_PROGRAM_OBJECT_ARB */
+   { 26765, 0x000088A8 }, /* GL_PROGRAM_PARAMETERS_ARB */
+   { 26791, 0x00008644 }, /* GL_PROGRAM_PARAMETER_NV */
+   { 26815, 0x00008647 }, /* GL_PROGRAM_RESIDENT_NV */
+   { 26838, 0x00008628 }, /* GL_PROGRAM_STRING_ARB */
+   { 26860, 0x00008628 }, /* GL_PROGRAM_STRING_NV */
+   { 26881, 0x00008646 }, /* GL_PROGRAM_TARGET_NV */
+   { 26902, 0x000088A4 }, /* GL_PROGRAM_TEMPORARIES_ARB */
+   { 26929, 0x00008807 }, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
+   { 26961, 0x00008806 }, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
+   { 26993, 0x000088B6 }, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
+   { 27028, 0x00001701 }, /* GL_PROJECTION */
+   { 27042, 0x00000BA7 }, /* GL_PROJECTION_MATRIX */
+   { 27063, 0x00000BA4 }, /* GL_PROJECTION_STACK_DEPTH */
+   { 27089, 0x000080D3 }, /* GL_PROXY_COLOR_TABLE */
+   { 27110, 0x00008025 }, /* GL_PROXY_HISTOGRAM */
+   { 27129, 0x00008025 }, /* GL_PROXY_HISTOGRAM_EXT */
+   { 27152, 0x000080D5 }, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
+   { 27191, 0x000080D4 }, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
+   { 27229, 0x00008063 }, /* GL_PROXY_TEXTURE_1D */
+   { 27249, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
+   { 27279, 0x00008063 }, /* GL_PROXY_TEXTURE_1D_EXT */
+   { 27303, 0x00008064 }, /* GL_PROXY_TEXTURE_2D */
+   { 27323, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
+   { 27353, 0x00008064 }, /* GL_PROXY_TEXTURE_2D_EXT */
+   { 27377, 0x00008070 }, /* GL_PROXY_TEXTURE_3D */
+   { 27397, 0x000080BD }, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
+   { 27430, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP */
+   { 27456, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP_ARB */
+   { 27486, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
+   { 27517, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_NV */
+   { 27547, 0x00002003 }, /* GL_Q */
+   { 27552, 0x00001209 }, /* GL_QUADRATIC_ATTENUATION */
+   { 27577, 0x00000007 }, /* GL_QUADS */
+   { 27586, 0x00008614 }, /* GL_QUAD_MESH_SUN */
+   { 27603, 0x00000008 }, /* GL_QUAD_STRIP */
+   { 27617, 0x00008864 }, /* GL_QUERY_COUNTER_BITS */
+   { 27639, 0x00008864 }, /* GL_QUERY_COUNTER_BITS_ARB */
+   { 27665, 0x00008866 }, /* GL_QUERY_RESULT */
+   { 27681, 0x00008866 }, /* GL_QUERY_RESULT_ARB */
+   { 27701, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE */
+   { 27727, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE_ARB */
+   { 27757, 0x00002002 }, /* GL_R */
+   { 27762, 0x00002A10 }, /* GL_R3_G3_B2 */
+   { 27774, 0x00019262 }, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
+   { 27807, 0x00000C02 }, /* GL_READ_BUFFER */
+   { 27822, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER */
+   { 27842, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
+   { 27874, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER_EXT */
+   { 27898, 0x000088B8 }, /* GL_READ_ONLY */
+   { 27911, 0x000088B8 }, /* GL_READ_ONLY_ARB */
+   { 27928, 0x000088BA }, /* GL_READ_WRITE */
+   { 27942, 0x000088BA }, /* GL_READ_WRITE_ARB */
+   { 27960, 0x00001903 }, /* GL_RED */
+   { 27967, 0x00008016 }, /* GL_REDUCE */
+   { 27977, 0x00008016 }, /* GL_REDUCE_EXT */
+   { 27991, 0x00000D15 }, /* GL_RED_BIAS */
+   { 28003, 0x00000D52 }, /* GL_RED_BITS */
+   { 28015, 0x00000D14 }, /* GL_RED_SCALE */
+   { 28028, 0x00008512 }, /* GL_REFLECTION_MAP */
+   { 28046, 0x00008512 }, /* GL_REFLECTION_MAP_ARB */
+   { 28068, 0x00008512 }, /* GL_REFLECTION_MAP_NV */
+   { 28089, 0x00001C00 }, /* GL_RENDER */
+   { 28099, 0x00008D41 }, /* GL_RENDERBUFFER */
+   { 28115, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE */
+   { 28142, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_EXT */
+   { 28170, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE */
+   { 28196, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE */
+   { 28223, 0x00008D41 }, /* GL_RENDERBUFFER_EXT */
+   { 28243, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE */
+   { 28270, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT */
+   { 28293, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_EXT */
+   { 28320, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
+   { 28352, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */
+   { 28388, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE */
+   { 28413, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES */
+   { 28437, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE */
+   { 28466, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH */
+   { 28488, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_EXT */
+   { 28514, 0x00001F01 }, /* GL_RENDERER */
+   { 28526, 0x00000C40 }, /* GL_RENDER_MODE */
+   { 28541, 0x00002901 }, /* GL_REPEAT */
+   { 28551, 0x00001E01 }, /* GL_REPLACE */
+   { 28562, 0x00008062 }, /* GL_REPLACE_EXT */
+   { 28577, 0x00008153 }, /* GL_REPLICATE_BORDER_HP */
+   { 28600, 0x0000803A }, /* GL_RESCALE_NORMAL */
+   { 28618, 0x0000803A }, /* GL_RESCALE_NORMAL_EXT */
+   { 28640, 0x00000102 }, /* GL_RETURN */
+   { 28650, 0x00001907 }, /* GL_RGB */
+   { 28657, 0x00008052 }, /* GL_RGB10 */
+   { 28666, 0x00008059 }, /* GL_RGB10_A2 */
+   { 28678, 0x00008059 }, /* GL_RGB10_A2_EXT */
+   { 28694, 0x00008052 }, /* GL_RGB10_EXT */
+   { 28707, 0x00008053 }, /* GL_RGB12 */
+   { 28716, 0x00008053 }, /* GL_RGB12_EXT */
+   { 28729, 0x00008054 }, /* GL_RGB16 */
+   { 28738, 0x00008054 }, /* GL_RGB16_EXT */
+   { 28751, 0x0000804E }, /* GL_RGB2_EXT */
+   { 28763, 0x0000804F }, /* GL_RGB4 */
+   { 28771, 0x0000804F }, /* GL_RGB4_EXT */
+   { 28783, 0x000083A1 }, /* GL_RGB4_S3TC */
+   { 28796, 0x00008050 }, /* GL_RGB5 */
+   { 28804, 0x00008057 }, /* GL_RGB5_A1 */
+   { 28815, 0x00008057 }, /* GL_RGB5_A1_EXT */
+   { 28830, 0x00008050 }, /* GL_RGB5_EXT */
+   { 28842, 0x00008051 }, /* GL_RGB8 */
+   { 28850, 0x00008051 }, /* GL_RGB8_EXT */
+   { 28862, 0x00001908 }, /* GL_RGBA */
+   { 28870, 0x0000805A }, /* GL_RGBA12 */
+   { 28880, 0x0000805A }, /* GL_RGBA12_EXT */
+   { 28894, 0x0000805B }, /* GL_RGBA16 */
+   { 28904, 0x0000805B }, /* GL_RGBA16_EXT */
+   { 28918, 0x00008055 }, /* GL_RGBA2 */
+   { 28927, 0x00008055 }, /* GL_RGBA2_EXT */
+   { 28940, 0x00008056 }, /* GL_RGBA4 */
+   { 28949, 0x000083A5 }, /* GL_RGBA4_DXT5_S3TC */
+   { 28968, 0x00008056 }, /* GL_RGBA4_EXT */
+   { 28981, 0x000083A3 }, /* GL_RGBA4_S3TC */
+   { 28995, 0x00008058 }, /* GL_RGBA8 */
+   { 29004, 0x00008058 }, /* GL_RGBA8_EXT */
+   { 29017, 0x00008F97 }, /* GL_RGBA8_SNORM */
+   { 29032, 0x000083A4 }, /* GL_RGBA_DXT5_S3TC */
+   { 29050, 0x00000C31 }, /* GL_RGBA_MODE */
+   { 29063, 0x000083A2 }, /* GL_RGBA_S3TC */
+   { 29076, 0x00008F93 }, /* GL_RGBA_SNORM */
+   { 29090, 0x000083A0 }, /* GL_RGB_S3TC */
+   { 29102, 0x00008573 }, /* GL_RGB_SCALE */
+   { 29115, 0x00008573 }, /* GL_RGB_SCALE_ARB */
+   { 29132, 0x00008573 }, /* GL_RGB_SCALE_EXT */
+   { 29149, 0x00000407 }, /* GL_RIGHT */
+   { 29158, 0x00002000 }, /* GL_S */
+   { 29163, 0x00008B5D }, /* GL_SAMPLER_1D */
+   { 29177, 0x00008B61 }, /* GL_SAMPLER_1D_SHADOW */
+   { 29198, 0x00008B5E }, /* GL_SAMPLER_2D */
+   { 29212, 0x00008B62 }, /* GL_SAMPLER_2D_SHADOW */
+   { 29233, 0x00008B5F }, /* GL_SAMPLER_3D */
+   { 29247, 0x00008B60 }, /* GL_SAMPLER_CUBE */
+   { 29263, 0x000080A9 }, /* GL_SAMPLES */
+   { 29274, 0x000086B4 }, /* GL_SAMPLES_3DFX */
+   { 29290, 0x000080A9 }, /* GL_SAMPLES_ARB */
+   { 29305, 0x00008914 }, /* GL_SAMPLES_PASSED */
+   { 29323, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */
+   { 29345, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
+   { 29373, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */
+   { 29405, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */
+   { 29428, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */
+   { 29455, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */
+   { 29473, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */
+   { 29496, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */
+   { 29518, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */
+   { 29537, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */
+   { 29560, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */
+   { 29586, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */
+   { 29616, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */
+   { 29641, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */
+   { 29670, 0x00080000 }, /* GL_SCISSOR_BIT */
+   { 29685, 0x00000C10 }, /* GL_SCISSOR_BOX */
+   { 29700, 0x00000C11 }, /* GL_SCISSOR_TEST */
+   { 29716, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */
+   { 29741, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
+   { 29781, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */
+   { 29825, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
+   { 29858, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
+   { 29888, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
+   { 29920, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
+   { 29950, 0x00001C02 }, /* GL_SELECT */
+   { 29960, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */
+   { 29988, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */
+   { 30013, 0x00008012 }, /* GL_SEPARABLE_2D */
+   { 30029, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */
+   { 30056, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */
+   { 30087, 0x0000150F }, /* GL_SET */
+   { 30094, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */
+   { 30115, 0x00008B88 }, /* GL_SHADER_SOURCE_LENGTH */
+   { 30139, 0x00008B4F }, /* GL_SHADER_TYPE */
+   { 30154, 0x00000B54 }, /* GL_SHADE_MODEL */
+   { 30169, 0x00008B8C }, /* GL_SHADING_LANGUAGE_VERSION */
+   { 30197, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */
+   { 30220, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */
+   { 30250, 0x00001601 }, /* GL_SHININESS */
+   { 30263, 0x00001402 }, /* GL_SHORT */
+   { 30272, 0x00008F9C }, /* GL_SIGNED_NORMALIZED */
+   { 30293, 0x000081F9 }, /* GL_SINGLE_COLOR */
+   { 30309, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */
+   { 30329, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */
+   { 30348, 0x00008C46 }, /* GL_SLUMINANCE */
+   { 30362, 0x00008C47 }, /* GL_SLUMINANCE8 */
+   { 30377, 0x00008C45 }, /* GL_SLUMINANCE8_ALPHA8 */
+   { 30399, 0x00008C44 }, /* GL_SLUMINANCE_ALPHA */
+   { 30419, 0x00001D01 }, /* GL_SMOOTH */
+   { 30429, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */
+   { 30462, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */
+   { 30489, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */
+   { 30522, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */
+   { 30549, 0x00008588 }, /* GL_SOURCE0_ALPHA */
+   { 30566, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */
+   { 30587, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */
+   { 30608, 0x00008580 }, /* GL_SOURCE0_RGB */
+   { 30623, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */
+   { 30642, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */
+   { 30661, 0x00008589 }, /* GL_SOURCE1_ALPHA */
+   { 30678, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */
+   { 30699, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */
+   { 30720, 0x00008581 }, /* GL_SOURCE1_RGB */
+   { 30735, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */
+   { 30754, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */
+   { 30773, 0x0000858A }, /* GL_SOURCE2_ALPHA */
+   { 30790, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */
+   { 30811, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */
+   { 30832, 0x00008582 }, /* GL_SOURCE2_RGB */
+   { 30847, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */
+   { 30866, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */
+   { 30885, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */
+   { 30905, 0x00008583 }, /* GL_SOURCE3_RGB_NV */
+   { 30923, 0x00001202 }, /* GL_SPECULAR */
+   { 30935, 0x00002402 }, /* GL_SPHERE_MAP */
+   { 30949, 0x00001206 }, /* GL_SPOT_CUTOFF */
+   { 30964, 0x00001204 }, /* GL_SPOT_DIRECTION */
+   { 30982, 0x00001205 }, /* GL_SPOT_EXPONENT */
+   { 30999, 0x00008588 }, /* GL_SRC0_ALPHA */
+   { 31013, 0x00008580 }, /* GL_SRC0_RGB */
+   { 31025, 0x00008589 }, /* GL_SRC1_ALPHA */
+   { 31039, 0x00008581 }, /* GL_SRC1_RGB */
+   { 31051, 0x0000858A }, /* GL_SRC2_ALPHA */
+   { 31065, 0x00008582 }, /* GL_SRC2_RGB */
+   { 31077, 0x00000302 }, /* GL_SRC_ALPHA */
+   { 31090, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */
+   { 31112, 0x00000300 }, /* GL_SRC_COLOR */
+   { 31125, 0x00008C40 }, /* GL_SRGB */
+   { 31133, 0x00008C41 }, /* GL_SRGB8 */
+   { 31142, 0x00008C43 }, /* GL_SRGB8_ALPHA8 */
+   { 31158, 0x00008C42 }, /* GL_SRGB_ALPHA */
+   { 31172, 0x00000503 }, /* GL_STACK_OVERFLOW */
+   { 31190, 0x00000504 }, /* GL_STACK_UNDERFLOW */
+   { 31209, 0x000088E6 }, /* GL_STATIC_COPY */
+   { 31224, 0x000088E6 }, /* GL_STATIC_COPY_ARB */
+   { 31243, 0x000088E4 }, /* GL_STATIC_DRAW */
+   { 31258, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */
+   { 31277, 0x000088E5 }, /* GL_STATIC_READ */
+   { 31292, 0x000088E5 }, /* GL_STATIC_READ_ARB */
+   { 31311, 0x00001802 }, /* GL_STENCIL */
+   { 31322, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT */
+   { 31344, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */
+   { 31370, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */
+   { 31391, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */
+   { 31416, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
+   { 31437, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */
+   { 31462, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
+   { 31494, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */
+   { 31530, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
+   { 31562, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */
+   { 31598, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
+   { 31618, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
+   { 31645, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
+   { 31671, 0x00000D57 }, /* GL_STENCIL_BITS */
+   { 31687, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
+   { 31709, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
+   { 31732, 0x00000B94 }, /* GL_STENCIL_FAIL */
+   { 31748, 0x00000B92 }, /* GL_STENCIL_FUNC */
+   { 31764, 0x00001901 }, /* GL_STENCIL_INDEX */
+   { 31781, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
+   { 31804, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
+   { 31826, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
+   { 31848, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
+   { 31870, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
+   { 31891, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
+   { 31918, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
+   { 31945, 0x00000B97 }, /* GL_STENCIL_REF */
+   { 31960, 0x00000B90 }, /* GL_STENCIL_TEST */
+   { 31976, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
+   { 32005, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
+   { 32027, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
+   { 32048, 0x00000C33 }, /* GL_STEREO */
+   { 32058, 0x000088E2 }, /* GL_STREAM_COPY */
+   { 32073, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
+   { 32092, 0x000088E0 }, /* GL_STREAM_DRAW */
+   { 32107, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
+   { 32126, 0x000088E1 }, /* GL_STREAM_READ */
+   { 32141, 0x000088E1 }, /* GL_STREAM_READ_ARB */
+   { 32160, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
+   { 32177, 0x000084E7 }, /* GL_SUBTRACT */
+   { 32189, 0x000084E7 }, /* GL_SUBTRACT_ARB */
+   { 32205, 0x00002001 }, /* GL_T */
+   { 32210, 0x00002A2A }, /* GL_T2F_C3F_V3F */
+   { 32225, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
+   { 32244, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
+   { 32260, 0x00002A2B }, /* GL_T2F_N3F_V3F */
+   { 32275, 0x00002A27 }, /* GL_T2F_V3F */
+   { 32286, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
+   { 32305, 0x00002A28 }, /* GL_T4F_V4F */
+   { 32316, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
+   { 32339, 0x00001702 }, /* GL_TEXTURE */
+   { 32350, 0x000084C0 }, /* GL_TEXTURE0 */
+   { 32362, 0x000084C0 }, /* GL_TEXTURE0_ARB */
+   { 32378, 0x000084C1 }, /* GL_TEXTURE1 */
+   { 32390, 0x000084CA }, /* GL_TEXTURE10 */
+   { 32403, 0x000084CA }, /* GL_TEXTURE10_ARB */
+   { 32420, 0x000084CB }, /* GL_TEXTURE11 */
+   { 32433, 0x000084CB }, /* GL_TEXTURE11_ARB */
+   { 32450, 0x000084CC }, /* GL_TEXTURE12 */
+   { 32463, 0x000084CC }, /* GL_TEXTURE12_ARB */
+   { 32480, 0x000084CD }, /* GL_TEXTURE13 */
+   { 32493, 0x000084CD }, /* GL_TEXTURE13_ARB */
+   { 32510, 0x000084CE }, /* GL_TEXTURE14 */
+   { 32523, 0x000084CE }, /* GL_TEXTURE14_ARB */
+   { 32540, 0x000084CF }, /* GL_TEXTURE15 */
+   { 32553, 0x000084CF }, /* GL_TEXTURE15_ARB */
+   { 32570, 0x000084D0 }, /* GL_TEXTURE16 */
+   { 32583, 0x000084D0 }, /* GL_TEXTURE16_ARB */
+   { 32600, 0x000084D1 }, /* GL_TEXTURE17 */
+   { 32613, 0x000084D1 }, /* GL_TEXTURE17_ARB */
+   { 32630, 0x000084D2 }, /* GL_TEXTURE18 */
+   { 32643, 0x000084D2 }, /* GL_TEXTURE18_ARB */
+   { 32660, 0x000084D3 }, /* GL_TEXTURE19 */
+   { 32673, 0x000084D3 }, /* GL_TEXTURE19_ARB */
+   { 32690, 0x000084C1 }, /* GL_TEXTURE1_ARB */
+   { 32706, 0x000084C2 }, /* GL_TEXTURE2 */
+   { 32718, 0x000084D4 }, /* GL_TEXTURE20 */
+   { 32731, 0x000084D4 }, /* GL_TEXTURE20_ARB */
+   { 32748, 0x000084D5 }, /* GL_TEXTURE21 */
+   { 32761, 0x000084D5 }, /* GL_TEXTURE21_ARB */
+   { 32778, 0x000084D6 }, /* GL_TEXTURE22 */
+   { 32791, 0x000084D6 }, /* GL_TEXTURE22_ARB */
+   { 32808, 0x000084D7 }, /* GL_TEXTURE23 */
+   { 32821, 0x000084D7 }, /* GL_TEXTURE23_ARB */
+   { 32838, 0x000084D8 }, /* GL_TEXTURE24 */
+   { 32851, 0x000084D8 }, /* GL_TEXTURE24_ARB */
+   { 32868, 0x000084D9 }, /* GL_TEXTURE25 */
+   { 32881, 0x000084D9 }, /* GL_TEXTURE25_ARB */
+   { 32898, 0x000084DA }, /* GL_TEXTURE26 */
+   { 32911, 0x000084DA }, /* GL_TEXTURE26_ARB */
+   { 32928, 0x000084DB }, /* GL_TEXTURE27 */
+   { 32941, 0x000084DB }, /* GL_TEXTURE27_ARB */
+   { 32958, 0x000084DC }, /* GL_TEXTURE28 */
+   { 32971, 0x000084DC }, /* GL_TEXTURE28_ARB */
+   { 32988, 0x000084DD }, /* GL_TEXTURE29 */
+   { 33001, 0x000084DD }, /* GL_TEXTURE29_ARB */
+   { 33018, 0x000084C2 }, /* GL_TEXTURE2_ARB */
+   { 33034, 0x000084C3 }, /* GL_TEXTURE3 */
+   { 33046, 0x000084DE }, /* GL_TEXTURE30 */
+   { 33059, 0x000084DE }, /* GL_TEXTURE30_ARB */
+   { 33076, 0x000084DF }, /* GL_TEXTURE31 */
+   { 33089, 0x000084DF }, /* GL_TEXTURE31_ARB */
+   { 33106, 0x000084C3 }, /* GL_TEXTURE3_ARB */
+   { 33122, 0x000084C4 }, /* GL_TEXTURE4 */
+   { 33134, 0x000084C4 }, /* GL_TEXTURE4_ARB */
+   { 33150, 0x000084C5 }, /* GL_TEXTURE5 */
+   { 33162, 0x000084C5 }, /* GL_TEXTURE5_ARB */
+   { 33178, 0x000084C6 }, /* GL_TEXTURE6 */
+   { 33190, 0x000084C6 }, /* GL_TEXTURE6_ARB */
+   { 33206, 0x000084C7 }, /* GL_TEXTURE7 */
+   { 33218, 0x000084C7 }, /* GL_TEXTURE7_ARB */
+   { 33234, 0x000084C8 }, /* GL_TEXTURE8 */
+   { 33246, 0x000084C8 }, /* GL_TEXTURE8_ARB */
+   { 33262, 0x000084C9 }, /* GL_TEXTURE9 */
+   { 33274, 0x000084C9 }, /* GL_TEXTURE9_ARB */
+   { 33290, 0x00000DE0 }, /* GL_TEXTURE_1D */
+   { 33304, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
+   { 33328, 0x00000DE1 }, /* GL_TEXTURE_2D */
+   { 33342, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
+   { 33366, 0x0000806F }, /* GL_TEXTURE_3D */
+   { 33380, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
+   { 33402, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
+   { 33428, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
+   { 33450, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
+   { 33472, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
+   { 33504, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
+   { 33526, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
+   { 33558, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
+   { 33580, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
+   { 33608, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
+   { 33640, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
+   { 33673, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
+   { 33705, 0x00040000 }, /* GL_TEXTURE_BIT */
+   { 33720, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
+   { 33741, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
+   { 33766, 0x00001005 }, /* GL_TEXTURE_BORDER */
+   { 33784, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
+   { 33808, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
+   { 33839, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
+   { 33869, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
+   { 33899, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
+   { 33934, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
+   { 33965, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+   { 34003, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
+   { 34030, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
+   { 34062, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+   { 34096, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
+   { 34120, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
+   { 34148, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
+   { 34172, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
+   { 34200, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
+   { 34233, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
+   { 34257, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
+   { 34279, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
+   { 34301, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
+   { 34327, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
+   { 34361, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
+   { 34394, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
+   { 34431, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
+   { 34459, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
+   { 34491, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
+   { 34514, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
+   { 34552, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
+   { 34594, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
+   { 34625, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
+   { 34653, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
+   { 34683, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
+   { 34711, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
+   { 34731, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
+   { 34755, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
+   { 34786, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
+   { 34821, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
+   { 34852, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
+   { 34887, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
+   { 34918, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
+   { 34953, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
+   { 34984, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
+   { 35019, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
+   { 35050, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
+   { 35085, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
+   { 35116, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
+   { 35151, 0x00008071 }, /* GL_TEXTURE_DEPTH */
+   { 35168, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
+   { 35190, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
+   { 35216, 0x00002300 }, /* GL_TEXTURE_ENV */
+   { 35231, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
+   { 35252, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
+   { 35272, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
+   { 35298, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
+   { 35318, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
+   { 35335, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
+   { 35352, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
+   { 35369, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
+   { 35386, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
+   { 35411, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
+   { 35433, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
+   { 35459, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
+   { 35477, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
+   { 35503, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
+   { 35529, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
+   { 35559, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
+   { 35586, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
+   { 35611, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
+   { 35631, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
+   { 35655, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+   { 35682, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+   { 35709, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+   { 35736, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
+   { 35762, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
+   { 35792, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
+   { 35814, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
+   { 35832, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+   { 35862, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+   { 35890, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+   { 35918, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+   { 35946, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
+   { 35967, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
+   { 35986, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
+   { 36008, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
+   { 36027, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
+   { 36047, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
+   { 36072, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
+   { 36096, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
+   { 36116, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
+   { 36140, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
+   { 36160, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
+   { 36183, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */
+   { 36207, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
+   { 36232, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+   { 36266, 0x00001000 }, /* GL_TEXTURE_WIDTH */
+   { 36283, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
+   { 36301, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
+   { 36319, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
+   { 36337, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
+   { 36357, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
+   { 36376, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+   { 36405, 0x00001000 }, /* GL_TRANSFORM_BIT */
+   { 36422, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
+   { 36448, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
+   { 36478, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+   { 36510, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+   { 36540, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
+   { 36574, 0x0000862C }, /* GL_TRANSPOSE_NV */
+   { 36590, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+   { 36621, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
+   { 36656, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+   { 36684, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
+   { 36716, 0x00000004 }, /* GL_TRIANGLES */
+   { 36729, 0x00000006 }, /* GL_TRIANGLE_FAN */
+   { 36745, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
+   { 36766, 0x00000005 }, /* GL_TRIANGLE_STRIP */
+   { 36784, 0x00000001 }, /* GL_TRUE */
+   { 36792, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
+   { 36812, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
+   { 36835, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
+   { 36855, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
+   { 36876, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
+   { 36898, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
+   { 36920, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
+   { 36940, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
+   { 36961, 0x00001401 }, /* GL_UNSIGNED_BYTE */
+   { 36978, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+   { 37005, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
+   { 37028, 0x00001405 }, /* GL_UNSIGNED_INT */
+   { 37044, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
+   { 37071, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */
+   { 37092, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
+   { 37116, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+   { 37147, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
+   { 37171, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+   { 37199, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */
+   { 37222, 0x00001403 }, /* GL_UNSIGNED_SHORT */
+   { 37240, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+   { 37270, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+   { 37296, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+   { 37326, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+   { 37352, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
+   { 37376, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+   { 37404, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+   { 37432, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
+   { 37459, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+   { 37491, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
+   { 37522, 0x00008CA2 }, /* GL_UPPER_LEFT */
+   { 37536, 0x00002A20 }, /* GL_V2F */
+   { 37543, 0x00002A21 }, /* GL_V3F */
+   { 37550, 0x00008B83 }, /* GL_VALIDATE_STATUS */
+   { 37569, 0x00001F00 }, /* GL_VENDOR */
+   { 37579, 0x00001F02 }, /* GL_VERSION */
+   { 37590, 0x00008074 }, /* GL_VERTEX_ARRAY */
+   { 37606, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
+   { 37636, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+   { 37667, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
+   { 37702, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
+   { 37726, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
+   { 37747, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
+   { 37770, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
+   { 37791, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+   { 37818, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+   { 37846, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+   { 37874, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+   { 37902, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+   { 37930, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+   { 37958, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+   { 37986, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+   { 38013, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+   { 38040, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+   { 38067, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+   { 38094, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+   { 38121, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+   { 38148, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+   { 38175, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+   { 38202, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+   { 38229, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+   { 38267, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
+   { 38309, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+   { 38340, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
+   { 38375, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+   { 38409, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
+   { 38447, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+   { 38478, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
+   { 38513, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+   { 38541, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
+   { 38573, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+   { 38603, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
+   { 38637, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+   { 38665, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
+   { 38697, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
+   { 38717, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
+   { 38739, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
+   { 38768, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
+   { 38789, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
+   { 38818, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
+   { 38851, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
+   { 38883, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+   { 38910, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
+   { 38941, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
+   { 38971, 0x00008B31 }, /* GL_VERTEX_SHADER */
+   { 38988, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
+   { 39009, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
+   { 39036, 0x00000BA2 }, /* GL_VIEWPORT */
+   { 39048, 0x00000800 }, /* GL_VIEWPORT_BIT */
+   { 39064, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
+   { 39084, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+   { 39115, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
+   { 39150, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+   { 39178, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+   { 39203, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+   { 39230, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+   { 39255, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
+   { 39279, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
+   { 39298, 0x000088B9 }, /* GL_WRITE_ONLY */
+   { 39312, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
+   { 39330, 0x00001506 }, /* GL_XOR */
+   { 39337, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
+   { 39356, 0x00008757 }, /* GL_YCBCR_MESA */
+   { 39370, 0x00000000 }, /* GL_ZERO */
+   { 39378, 0x00000D16 }, /* GL_ZOOM_X */
+   { 39388, 0x00000D17 }, /* GL_ZOOM_Y */
 };
 
-static const unsigned reduced_enums[1316] =
+static const unsigned reduced_enums[1319] =
 {
-       463, /* GL_FALSE */
-       695, /* GL_LINES */
-       697, /* GL_LINE_LOOP */
-       704, /* GL_LINE_STRIP */
-      1707, /* GL_TRIANGLES */
-      1710, /* GL_TRIANGLE_STRIP */
-      1708, /* GL_TRIANGLE_FAN */
-      1262, /* GL_QUADS */
-      1264, /* GL_QUAD_STRIP */
-      1150, /* GL_POLYGON */
-      1162, /* GL_POLYGON_STIPPLE_BIT */
-      1115, /* GL_PIXEL_MODE_BIT */
-       682, /* GL_LIGHTING_BIT */
-       485, /* GL_FOG_BIT */
+       469, /* GL_FALSE */
+       683, /* GL_LINES */
+       685, /* GL_LINE_LOOP */
+       692, /* GL_LINE_STRIP */
+      1709, /* GL_TRIANGLES */
+      1712, /* GL_TRIANGLE_STRIP */
+      1710, /* GL_TRIANGLE_FAN */
+      1254, /* GL_QUADS */
+      1256, /* GL_QUAD_STRIP */
+      1142, /* GL_POLYGON */
+      1154, /* GL_POLYGON_STIPPLE_BIT */
+      1103, /* GL_PIXEL_MODE_BIT */
+       670, /* GL_LIGHTING_BIT */
+       497, /* GL_FOG_BIT */
          8, /* GL_ACCUM */
-       714, /* GL_LOAD */
-      1316, /* GL_RETURN */
-       988, /* GL_MULT */
+       702, /* GL_LOAD */
+      1308, /* GL_RETURN */
+       976, /* GL_MULT */
         23, /* GL_ADD */
-      1004, /* GL_NEVER */
-       672, /* GL_LESS */
-       453, /* GL_EQUAL */
-       671, /* GL_LEQUAL */
-       595, /* GL_GREATER */
-      1019, /* GL_NOTEQUAL */
-       570, /* GL_GEQUAL */
+       992, /* GL_NEVER */
+       660, /* GL_LESS */
+       459, /* GL_EQUAL */
+       659, /* GL_LEQUAL */
+       583, /* GL_GREATER */
+      1007, /* GL_NOTEQUAL */
+       582, /* GL_GEQUAL */
         46, /* GL_ALWAYS */
-      1449, /* GL_SRC_COLOR */
-      1048, /* GL_ONE_MINUS_SRC_COLOR */
-      1447, /* GL_SRC_ALPHA */
-      1047, /* GL_ONE_MINUS_SRC_ALPHA */
-       432, /* GL_DST_ALPHA */
-      1045, /* GL_ONE_MINUS_DST_ALPHA */
-       433, /* GL_DST_COLOR */
-      1046, /* GL_ONE_MINUS_DST_COLOR */
-      1448, /* GL_SRC_ALPHA_SATURATE */
-       558, /* GL_FRONT_LEFT */
-       559, /* GL_FRONT_RIGHT */
+      1448, /* GL_SRC_COLOR */
+      1036, /* GL_ONE_MINUS_SRC_COLOR */
+      1446, /* GL_SRC_ALPHA */
+      1035, /* GL_ONE_MINUS_SRC_ALPHA */
+       438, /* GL_DST_ALPHA */
+      1033, /* GL_ONE_MINUS_DST_ALPHA */
+       439, /* GL_DST_COLOR */
+      1034, /* GL_ONE_MINUS_DST_COLOR */
+      1447, /* GL_SRC_ALPHA_SATURATE */
+       570, /* GL_FRONT_LEFT */
+       571, /* GL_FRONT_RIGHT */
         68, /* GL_BACK_LEFT */
         69, /* GL_BACK_RIGHT */
-       555, /* GL_FRONT */
+       567, /* GL_FRONT */
         67, /* GL_BACK */
-       670, /* GL_LEFT */
-      1356, /* GL_RIGHT */
-       556, /* GL_FRONT_AND_BACK */
+       658, /* GL_LEFT */
+      1350, /* GL_RIGHT */
+       568, /* GL_FRONT_AND_BACK */
         62, /* GL_AUX0 */
         63, /* GL_AUX1 */
         64, /* GL_AUX2 */
         65, /* GL_AUX3 */
-       661, /* GL_INVALID_ENUM */
-       665, /* GL_INVALID_VALUE */
-       664, /* GL_INVALID_OPERATION */
-      1451, /* GL_STACK_OVERFLOW */
-      1452, /* GL_STACK_UNDERFLOW */
-      1073, /* GL_OUT_OF_MEMORY */
-       662, /* GL_INVALID_FRAMEBUFFER_OPERATION */
+       649, /* GL_INVALID_ENUM */
+       653, /* GL_INVALID_VALUE */
+       652, /* GL_INVALID_OPERATION */
+      1453, /* GL_STACK_OVERFLOW */
+      1454, /* GL_STACK_UNDERFLOW */
+      1061, /* GL_OUT_OF_MEMORY */
+       650, /* GL_INVALID_FRAMEBUFFER_OPERATION */
          0, /* GL_2D */
          2, /* GL_3D */
          3, /* GL_3D_COLOR */
          4, /* GL_3D_COLOR_TEXTURE */
          6, /* GL_4D_COLOR_TEXTURE */
-      1093, /* GL_PASS_THROUGH_TOKEN */
-      1149, /* GL_POINT_TOKEN */
-       705, /* GL_LINE_TOKEN */
-      1163, /* GL_POLYGON_TOKEN */
+      1081, /* GL_PASS_THROUGH_TOKEN */
+      1141, /* GL_POINT_TOKEN */
+       693, /* GL_LINE_TOKEN */
+      1155, /* GL_POLYGON_TOKEN */
         73, /* GL_BITMAP_TOKEN */
-       431, /* GL_DRAW_PIXEL_TOKEN */
-       292, /* GL_COPY_PIXEL_TOKEN */
-       698, /* GL_LINE_RESET_TOKEN */
-       456, /* GL_EXP */
-       457, /* GL_EXP2 */
-       325, /* GL_CW */
-       121, /* GL_CCW */
-       142, /* GL_COEFF */
-      1070, /* GL_ORDER */
-       369, /* GL_DOMAIN */
-       300, /* GL_CURRENT_COLOR */
-       303, /* GL_CURRENT_INDEX */
-       309, /* GL_CURRENT_NORMAL */
-       321, /* GL_CURRENT_TEXTURE_COORDS */
-       314, /* GL_CURRENT_RASTER_COLOR */
-       316, /* GL_CURRENT_RASTER_INDEX */
-       319, /* GL_CURRENT_RASTER_TEXTURE_COORDS */
-       317, /* GL_CURRENT_RASTER_POSITION */
-       318, /* GL_CURRENT_RASTER_POSITION_VALID */
-       315, /* GL_CURRENT_RASTER_DISTANCE */
-      1142, /* GL_POINT_SMOOTH */
-      1131, /* GL_POINT_SIZE */
-      1141, /* GL_POINT_SIZE_RANGE */
-      1132, /* GL_POINT_SIZE_GRANULARITY */
-       699, /* GL_LINE_SMOOTH */
-       706, /* GL_LINE_WIDTH */
-       708, /* GL_LINE_WIDTH_RANGE */
-       707, /* GL_LINE_WIDTH_GRANULARITY */
-       701, /* GL_LINE_STIPPLE */
-       702, /* GL_LINE_STIPPLE_PATTERN */
-       703, /* GL_LINE_STIPPLE_REPEAT */
-       713, /* GL_LIST_MODE */
-       872, /* GL_MAX_LIST_NESTING */
-       710, /* GL_LIST_BASE */
-       712, /* GL_LIST_INDEX */
-      1152, /* GL_POLYGON_MODE */
-      1159, /* GL_POLYGON_SMOOTH */
-      1161, /* GL_POLYGON_STIPPLE */
-       442, /* GL_EDGE_FLAG */
-       293, /* GL_CULL_FACE */
-       294, /* GL_CULL_FACE_MODE */
-       557, /* GL_FRONT_FACE */
-       681, /* GL_LIGHTING */
-       686, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
-       687, /* GL_LIGHT_MODEL_TWO_SIDE */
-       683, /* GL_LIGHT_MODEL_AMBIENT */
-      1402, /* GL_SHADE_MODEL */
-       189, /* GL_COLOR_MATERIAL_FACE */
-       190, /* GL_COLOR_MATERIAL_PARAMETER */
-       188, /* GL_COLOR_MATERIAL */
-       484, /* GL_FOG */
-       506, /* GL_FOG_INDEX */
-       502, /* GL_FOG_DENSITY */
-       510, /* GL_FOG_START */
-       504, /* GL_FOG_END */
-       507, /* GL_FOG_MODE */
-       486, /* GL_FOG_COLOR */
-       356, /* GL_DEPTH_RANGE */
-       363, /* GL_DEPTH_TEST */
-       366, /* GL_DEPTH_WRITEMASK */
-       344, /* GL_DEPTH_CLEAR_VALUE */
-       355, /* GL_DEPTH_FUNC */
+       437, /* GL_DRAW_PIXEL_TOKEN */
+       297, /* GL_COPY_PIXEL_TOKEN */
+       686, /* GL_LINE_RESET_TOKEN */
+       462, /* GL_EXP */
+       463, /* GL_EXP2 */
+       331, /* GL_CW */
+       122, /* GL_CCW */
+       143, /* GL_COEFF */
+      1058, /* GL_ORDER */
+       375, /* GL_DOMAIN */
+       305, /* GL_CURRENT_COLOR */
+       308, /* GL_CURRENT_INDEX */
+       314, /* GL_CURRENT_NORMAL */
+       327, /* GL_CURRENT_TEXTURE_COORDS */
+       319, /* GL_CURRENT_RASTER_COLOR */
+       321, /* GL_CURRENT_RASTER_INDEX */
+       325, /* GL_CURRENT_RASTER_TEXTURE_COORDS */
+       322, /* GL_CURRENT_RASTER_POSITION */
+       323, /* GL_CURRENT_RASTER_POSITION_VALID */
+       320, /* GL_CURRENT_RASTER_DISTANCE */
+      1134, /* GL_POINT_SMOOTH */
+      1123, /* GL_POINT_SIZE */
+      1133, /* GL_POINT_SIZE_RANGE */
+      1124, /* GL_POINT_SIZE_GRANULARITY */
+       687, /* GL_LINE_SMOOTH */
+       694, /* GL_LINE_WIDTH */
+       696, /* GL_LINE_WIDTH_RANGE */
+       695, /* GL_LINE_WIDTH_GRANULARITY */
+       689, /* GL_LINE_STIPPLE */
+       690, /* GL_LINE_STIPPLE_PATTERN */
+       691, /* GL_LINE_STIPPLE_REPEAT */
+       701, /* GL_LIST_MODE */
+       860, /* GL_MAX_LIST_NESTING */
+       698, /* GL_LIST_BASE */
+       700, /* GL_LIST_INDEX */
+      1144, /* GL_POLYGON_MODE */
+      1151, /* GL_POLYGON_SMOOTH */
+      1153, /* GL_POLYGON_STIPPLE */
+       448, /* GL_EDGE_FLAG */
+       298, /* GL_CULL_FACE */
+       299, /* GL_CULL_FACE_MODE */
+       569, /* GL_FRONT_FACE */
+       669, /* GL_LIGHTING */
+       674, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
+       675, /* GL_LIGHT_MODEL_TWO_SIDE */
+       671, /* GL_LIGHT_MODEL_AMBIENT */
+      1396, /* GL_SHADE_MODEL */
+       190, /* GL_COLOR_MATERIAL_FACE */
+       191, /* GL_COLOR_MATERIAL_PARAMETER */
+       189, /* GL_COLOR_MATERIAL */
+       496, /* GL_FOG */
+       518, /* GL_FOG_INDEX */
+       514, /* GL_FOG_DENSITY */
+       522, /* GL_FOG_START */
+       516, /* GL_FOG_END */
+       519, /* GL_FOG_MODE */
+       498, /* GL_FOG_COLOR */
+       362, /* GL_DEPTH_RANGE */
+       369, /* GL_DEPTH_TEST */
+       372, /* GL_DEPTH_WRITEMASK */
+       350, /* GL_DEPTH_CLEAR_VALUE */
+       361, /* GL_DEPTH_FUNC */
         12, /* GL_ACCUM_CLEAR_VALUE */
-      1487, /* GL_STENCIL_TEST */
-      1475, /* GL_STENCIL_CLEAR_VALUE */
-      1477, /* GL_STENCIL_FUNC */
-      1489, /* GL_STENCIL_VALUE_MASK */
-      1476, /* GL_STENCIL_FAIL */
-      1484, /* GL_STENCIL_PASS_DEPTH_FAIL */
-      1485, /* GL_STENCIL_PASS_DEPTH_PASS */
-      1486, /* GL_STENCIL_REF */
-      1490, /* GL_STENCIL_WRITEMASK */
-       841, /* GL_MATRIX_MODE */
-      1009, /* GL_NORMALIZE */
-      1799, /* GL_VIEWPORT */
-       983, /* GL_MODELVIEW_STACK_DEPTH */
-      1242, /* GL_PROJECTION_STACK_DEPTH */
-      1685, /* GL_TEXTURE_STACK_DEPTH */
-       981, /* GL_MODELVIEW_MATRIX */
-      1241, /* GL_PROJECTION_MATRIX */
-      1670, /* GL_TEXTURE_MATRIX */
+      1489, /* GL_STENCIL_TEST */
+      1477, /* GL_STENCIL_CLEAR_VALUE */
+      1479, /* GL_STENCIL_FUNC */
+      1491, /* GL_STENCIL_VALUE_MASK */
+      1478, /* GL_STENCIL_FAIL */
+      1486, /* GL_STENCIL_PASS_DEPTH_FAIL */
+      1487, /* GL_STENCIL_PASS_DEPTH_PASS */
+      1488, /* GL_STENCIL_REF */
+      1492, /* GL_STENCIL_WRITEMASK */
+       829, /* GL_MATRIX_MODE */
+       997, /* GL_NORMALIZE */
+      1801, /* GL_VIEWPORT */
+       971, /* GL_MODELVIEW_STACK_DEPTH */
+      1234, /* GL_PROJECTION_STACK_DEPTH */
+      1687, /* GL_TEXTURE_STACK_DEPTH */
+       969, /* GL_MODELVIEW_MATRIX */
+      1233, /* GL_PROJECTION_MATRIX */
+      1672, /* GL_TEXTURE_MATRIX */
         60, /* GL_ATTRIB_STACK_DEPTH */
-       132, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
+       133, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
         43, /* GL_ALPHA_TEST */
         44, /* GL_ALPHA_TEST_FUNC */
         45, /* GL_ALPHA_TEST_REF */
-       368, /* GL_DITHER */
+       374, /* GL_DITHER */
         77, /* GL_BLEND_DST */
-        85, /* GL_BLEND_SRC */
+        86, /* GL_BLEND_SRC */
         74, /* GL_BLEND */
-       716, /* GL_LOGIC_OP_MODE */
-       635, /* GL_INDEX_LOGIC_OP */
-       187, /* GL_COLOR_LOGIC_OP */
+       704, /* GL_LOGIC_OP_MODE */
+       623, /* GL_INDEX_LOGIC_OP */
+       188, /* GL_COLOR_LOGIC_OP */
         66, /* GL_AUX_BUFFERS */
-       379, /* GL_DRAW_BUFFER */
-      1274, /* GL_READ_BUFFER */
-      1383, /* GL_SCISSOR_BOX */
-      1384, /* GL_SCISSOR_TEST */
-       634, /* GL_INDEX_CLEAR_VALUE */
-       639, /* GL_INDEX_WRITEMASK */
-       184, /* GL_COLOR_CLEAR_VALUE */
-       226, /* GL_COLOR_WRITEMASK */
-       636, /* GL_INDEX_MODE */
-      1350, /* GL_RGBA_MODE */
-       378, /* GL_DOUBLEBUFFER */
-      1491, /* GL_STEREO */
-      1309, /* GL_RENDER_MODE */
-      1094, /* GL_PERSPECTIVE_CORRECTION_HINT */
-      1143, /* GL_POINT_SMOOTH_HINT */
-       700, /* GL_LINE_SMOOTH_HINT */
-      1160, /* GL_POLYGON_SMOOTH_HINT */
-       505, /* GL_FOG_HINT */
-      1651, /* GL_TEXTURE_GEN_S */
-      1652, /* GL_TEXTURE_GEN_T */
-      1650, /* GL_TEXTURE_GEN_R */
-      1649, /* GL_TEXTURE_GEN_Q */
-      1107, /* GL_PIXEL_MAP_I_TO_I */
-      1113, /* GL_PIXEL_MAP_S_TO_S */
-      1109, /* GL_PIXEL_MAP_I_TO_R */
-      1105, /* GL_PIXEL_MAP_I_TO_G */
-      1103, /* GL_PIXEL_MAP_I_TO_B */
-      1101, /* GL_PIXEL_MAP_I_TO_A */
-      1111, /* GL_PIXEL_MAP_R_TO_R */
-      1099, /* GL_PIXEL_MAP_G_TO_G */
-      1097, /* GL_PIXEL_MAP_B_TO_B */
-      1095, /* GL_PIXEL_MAP_A_TO_A */
-      1108, /* GL_PIXEL_MAP_I_TO_I_SIZE */
-      1114, /* GL_PIXEL_MAP_S_TO_S_SIZE */
-      1110, /* GL_PIXEL_MAP_I_TO_R_SIZE */
-      1106, /* GL_PIXEL_MAP_I_TO_G_SIZE */
-      1104, /* GL_PIXEL_MAP_I_TO_B_SIZE */
-      1102, /* GL_PIXEL_MAP_I_TO_A_SIZE */
-      1112, /* GL_PIXEL_MAP_R_TO_R_SIZE */
-      1100, /* GL_PIXEL_MAP_G_TO_G_SIZE */
-      1098, /* GL_PIXEL_MAP_B_TO_B_SIZE */
-      1096, /* GL_PIXEL_MAP_A_TO_A_SIZE */
-      1719, /* GL_UNPACK_SWAP_BYTES */
-      1714, /* GL_UNPACK_LSB_FIRST */
-      1715, /* GL_UNPACK_ROW_LENGTH */
-      1718, /* GL_UNPACK_SKIP_ROWS */
-      1717, /* GL_UNPACK_SKIP_PIXELS */
-      1712, /* GL_UNPACK_ALIGNMENT */
-      1082, /* GL_PACK_SWAP_BYTES */
-      1077, /* GL_PACK_LSB_FIRST */
-      1078, /* GL_PACK_ROW_LENGTH */
-      1081, /* GL_PACK_SKIP_ROWS */
-      1080, /* GL_PACK_SKIP_PIXELS */
-      1074, /* GL_PACK_ALIGNMENT */
-       794, /* GL_MAP_COLOR */
-       795, /* GL_MAP_STENCIL */
-       638, /* GL_INDEX_SHIFT */
-       637, /* GL_INDEX_OFFSET */
-      1287, /* GL_RED_SCALE */
-      1285, /* GL_RED_BIAS */
-      1816, /* GL_ZOOM_X */
-      1817, /* GL_ZOOM_Y */
-       599, /* GL_GREEN_SCALE */
-       597, /* GL_GREEN_BIAS */
-        91, /* GL_BLUE_SCALE */
-        89, /* GL_BLUE_BIAS */
+       385, /* GL_DRAW_BUFFER */
+      1266, /* GL_READ_BUFFER */
+      1377, /* GL_SCISSOR_BOX */
+      1378, /* GL_SCISSOR_TEST */
+       622, /* GL_INDEX_CLEAR_VALUE */
+       627, /* GL_INDEX_WRITEMASK */
+       185, /* GL_COLOR_CLEAR_VALUE */
+       227, /* GL_COLOR_WRITEMASK */
+       624, /* GL_INDEX_MODE */
+      1343, /* GL_RGBA_MODE */
+       384, /* GL_DOUBLEBUFFER */
+      1493, /* GL_STEREO */
+      1301, /* GL_RENDER_MODE */
+      1082, /* GL_PERSPECTIVE_CORRECTION_HINT */
+      1135, /* GL_POINT_SMOOTH_HINT */
+       688, /* GL_LINE_SMOOTH_HINT */
+      1152, /* GL_POLYGON_SMOOTH_HINT */
+       517, /* GL_FOG_HINT */
+      1653, /* GL_TEXTURE_GEN_S */
+      1654, /* GL_TEXTURE_GEN_T */
+      1652, /* GL_TEXTURE_GEN_R */
+      1651, /* GL_TEXTURE_GEN_Q */
+      1095, /* GL_PIXEL_MAP_I_TO_I */
+      1101, /* GL_PIXEL_MAP_S_TO_S */
+      1097, /* GL_PIXEL_MAP_I_TO_R */
+      1093, /* GL_PIXEL_MAP_I_TO_G */
+      1091, /* GL_PIXEL_MAP_I_TO_B */
+      1089, /* GL_PIXEL_MAP_I_TO_A */
+      1099, /* GL_PIXEL_MAP_R_TO_R */
+      1087, /* GL_PIXEL_MAP_G_TO_G */
+      1085, /* GL_PIXEL_MAP_B_TO_B */
+      1083, /* GL_PIXEL_MAP_A_TO_A */
+      1096, /* GL_PIXEL_MAP_I_TO_I_SIZE */
+      1102, /* GL_PIXEL_MAP_S_TO_S_SIZE */
+      1098, /* GL_PIXEL_MAP_I_TO_R_SIZE */
+      1094, /* GL_PIXEL_MAP_I_TO_G_SIZE */
+      1092, /* GL_PIXEL_MAP_I_TO_B_SIZE */
+      1090, /* GL_PIXEL_MAP_I_TO_A_SIZE */
+      1100, /* GL_PIXEL_MAP_R_TO_R_SIZE */
+      1088, /* GL_PIXEL_MAP_G_TO_G_SIZE */
+      1086, /* GL_PIXEL_MAP_B_TO_B_SIZE */
+      1084, /* GL_PIXEL_MAP_A_TO_A_SIZE */
+      1721, /* GL_UNPACK_SWAP_BYTES */
+      1716, /* GL_UNPACK_LSB_FIRST */
+      1717, /* GL_UNPACK_ROW_LENGTH */
+      1720, /* GL_UNPACK_SKIP_ROWS */
+      1719, /* GL_UNPACK_SKIP_PIXELS */
+      1714, /* GL_UNPACK_ALIGNMENT */
+      1070, /* GL_PACK_SWAP_BYTES */
+      1065, /* GL_PACK_LSB_FIRST */
+      1066, /* GL_PACK_ROW_LENGTH */
+      1069, /* GL_PACK_SKIP_ROWS */
+      1068, /* GL_PACK_SKIP_PIXELS */
+      1062, /* GL_PACK_ALIGNMENT */
+       782, /* GL_MAP_COLOR */
+       783, /* GL_MAP_STENCIL */
+       626, /* GL_INDEX_SHIFT */
+       625, /* GL_INDEX_OFFSET */
+      1279, /* GL_RED_SCALE */
+      1277, /* GL_RED_BIAS */
+      1818, /* GL_ZOOM_X */
+      1819, /* GL_ZOOM_Y */
+       587, /* GL_GREEN_SCALE */
+       585, /* GL_GREEN_BIAS */
+        92, /* GL_BLUE_SCALE */
+        90, /* GL_BLUE_BIAS */
         42, /* GL_ALPHA_SCALE */
         40, /* GL_ALPHA_BIAS */
-       357, /* GL_DEPTH_SCALE */
-       338, /* GL_DEPTH_BIAS */
-       867, /* GL_MAX_EVAL_ORDER */
-       871, /* GL_MAX_LIGHTS */
-       850, /* GL_MAX_CLIP_PLANES */
-       916, /* GL_MAX_TEXTURE_SIZE */
-       877, /* GL_MAX_PIXEL_MAP_TABLE */
-       846, /* GL_MAX_ATTRIB_STACK_DEPTH */
-       874, /* GL_MAX_MODELVIEW_STACK_DEPTH */
-       875, /* GL_MAX_NAME_STACK_DEPTH */
-       903, /* GL_MAX_PROJECTION_STACK_DEPTH */
-       917, /* GL_MAX_TEXTURE_STACK_DEPTH */
-       931, /* GL_MAX_VIEWPORT_DIMS */
-       847, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
-      1498, /* GL_SUBPIXEL_BITS */
-       633, /* GL_INDEX_BITS */
-      1286, /* GL_RED_BITS */
-       598, /* GL_GREEN_BITS */
-        90, /* GL_BLUE_BITS */
+       363, /* GL_DEPTH_SCALE */
+       344, /* GL_DEPTH_BIAS */
+       855, /* GL_MAX_EVAL_ORDER */
+       859, /* GL_MAX_LIGHTS */
+       838, /* GL_MAX_CLIP_PLANES */
+       904, /* GL_MAX_TEXTURE_SIZE */
+       865, /* GL_MAX_PIXEL_MAP_TABLE */
+       834, /* GL_MAX_ATTRIB_STACK_DEPTH */
+       862, /* GL_MAX_MODELVIEW_STACK_DEPTH */
+       863, /* GL_MAX_NAME_STACK_DEPTH */
+       891, /* GL_MAX_PROJECTION_STACK_DEPTH */
+       905, /* GL_MAX_TEXTURE_STACK_DEPTH */
+       919, /* GL_MAX_VIEWPORT_DIMS */
+       835, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
+      1500, /* GL_SUBPIXEL_BITS */
+       621, /* GL_INDEX_BITS */
+      1278, /* GL_RED_BITS */
+       586, /* GL_GREEN_BITS */
+        91, /* GL_BLUE_BITS */
         41, /* GL_ALPHA_BITS */
-       339, /* GL_DEPTH_BITS */
-      1473, /* GL_STENCIL_BITS */
+       345, /* GL_DEPTH_BITS */
+      1475, /* GL_STENCIL_BITS */
         14, /* GL_ACCUM_RED_BITS */
         13, /* GL_ACCUM_GREEN_BITS */
         10, /* GL_ACCUM_BLUE_BITS */
          9, /* GL_ACCUM_ALPHA_BITS */
-       997, /* GL_NAME_STACK_DEPTH */
+       985, /* GL_NAME_STACK_DEPTH */
         61, /* GL_AUTO_NORMAL */
-       740, /* GL_MAP1_COLOR_4 */
-       743, /* GL_MAP1_INDEX */
-       744, /* GL_MAP1_NORMAL */
-       745, /* GL_MAP1_TEXTURE_COORD_1 */
-       746, /* GL_MAP1_TEXTURE_COORD_2 */
-       747, /* GL_MAP1_TEXTURE_COORD_3 */
-       748, /* GL_MAP1_TEXTURE_COORD_4 */
-       749, /* GL_MAP1_VERTEX_3 */
-       750, /* GL_MAP1_VERTEX_4 */
-       767, /* GL_MAP2_COLOR_4 */
-       770, /* GL_MAP2_INDEX */
-       771, /* GL_MAP2_NORMAL */
-       772, /* GL_MAP2_TEXTURE_COORD_1 */
-       773, /* GL_MAP2_TEXTURE_COORD_2 */
-       774, /* GL_MAP2_TEXTURE_COORD_3 */
-       775, /* GL_MAP2_TEXTURE_COORD_4 */
-       776, /* GL_MAP2_VERTEX_3 */
-       777, /* GL_MAP2_VERTEX_4 */
-       741, /* GL_MAP1_GRID_DOMAIN */
-       742, /* GL_MAP1_GRID_SEGMENTS */
-       768, /* GL_MAP2_GRID_DOMAIN */
-       769, /* GL_MAP2_GRID_SEGMENTS */
-      1575, /* GL_TEXTURE_1D */
-      1577, /* GL_TEXTURE_2D */
-       466, /* GL_FEEDBACK_BUFFER_POINTER */
-       467, /* GL_FEEDBACK_BUFFER_SIZE */
-       468, /* GL_FEEDBACK_BUFFER_TYPE */
-      1393, /* GL_SELECTION_BUFFER_POINTER */
-      1394, /* GL_SELECTION_BUFFER_SIZE */
-      1689, /* GL_TEXTURE_WIDTH */
-      1656, /* GL_TEXTURE_HEIGHT */
-      1612, /* GL_TEXTURE_COMPONENTS */
-      1596, /* GL_TEXTURE_BORDER_COLOR */
-      1595, /* GL_TEXTURE_BORDER */
-       370, /* GL_DONT_CARE */
-       464, /* GL_FASTEST */
-      1005, /* GL_NICEST */
+       728, /* GL_MAP1_COLOR_4 */
+       731, /* GL_MAP1_INDEX */
+       732, /* GL_MAP1_NORMAL */
+       733, /* GL_MAP1_TEXTURE_COORD_1 */
+       734, /* GL_MAP1_TEXTURE_COORD_2 */
+       735, /* GL_MAP1_TEXTURE_COORD_3 */
+       736, /* GL_MAP1_TEXTURE_COORD_4 */
+       737, /* GL_MAP1_VERTEX_3 */
+       738, /* GL_MAP1_VERTEX_4 */
+       755, /* GL_MAP2_COLOR_4 */
+       758, /* GL_MAP2_INDEX */
+       759, /* GL_MAP2_NORMAL */
+       760, /* GL_MAP2_TEXTURE_COORD_1 */
+       761, /* GL_MAP2_TEXTURE_COORD_2 */
+       762, /* GL_MAP2_TEXTURE_COORD_3 */
+       763, /* GL_MAP2_TEXTURE_COORD_4 */
+       764, /* GL_MAP2_VERTEX_3 */
+       765, /* GL_MAP2_VERTEX_4 */
+       729, /* GL_MAP1_GRID_DOMAIN */
+       730, /* GL_MAP1_GRID_SEGMENTS */
+       756, /* GL_MAP2_GRID_DOMAIN */
+       757, /* GL_MAP2_GRID_SEGMENTS */
+      1577, /* GL_TEXTURE_1D */
+      1579, /* GL_TEXTURE_2D */
+       472, /* GL_FEEDBACK_BUFFER_POINTER */
+       473, /* GL_FEEDBACK_BUFFER_SIZE */
+       474, /* GL_FEEDBACK_BUFFER_TYPE */
+      1387, /* GL_SELECTION_BUFFER_POINTER */
+      1388, /* GL_SELECTION_BUFFER_SIZE */
+      1691, /* GL_TEXTURE_WIDTH */
+      1658, /* GL_TEXTURE_HEIGHT */
+      1614, /* GL_TEXTURE_COMPONENTS */
+      1598, /* GL_TEXTURE_BORDER_COLOR */
+      1597, /* GL_TEXTURE_BORDER */
+       376, /* GL_DONT_CARE */
+       470, /* GL_FASTEST */
+       993, /* GL_NICEST */
         47, /* GL_AMBIENT */
-       367, /* GL_DIFFUSE */
-      1436, /* GL_SPECULAR */
-      1164, /* GL_POSITION */
-      1439, /* GL_SPOT_DIRECTION */
-      1440, /* GL_SPOT_EXPONENT */
-      1438, /* GL_SPOT_CUTOFF */
-       266, /* GL_CONSTANT_ATTENUATION */
-       690, /* GL_LINEAR_ATTENUATION */
-      1261, /* GL_QUADRATIC_ATTENUATION */
-       240, /* GL_COMPILE */
-       241, /* GL_COMPILE_AND_EXECUTE */
-       116, /* GL_BYTE */
-      1720, /* GL_UNSIGNED_BYTE */
-      1407, /* GL_SHORT */
-      1731, /* GL_UNSIGNED_SHORT */
-       641, /* GL_INT */
-      1723, /* GL_UNSIGNED_INT */
-       471, /* GL_FLOAT */
+       373, /* GL_DIFFUSE */
+      1435, /* GL_SPECULAR */
+      1156, /* GL_POSITION */
+      1438, /* GL_SPOT_DIRECTION */
+      1439, /* GL_SPOT_EXPONENT */
+      1437, /* GL_SPOT_CUTOFF */
+       271, /* GL_CONSTANT_ATTENUATION */
+       678, /* GL_LINEAR_ATTENUATION */
+      1253, /* GL_QUADRATIC_ATTENUATION */
+       241, /* GL_COMPILE */
+       242, /* GL_COMPILE_AND_EXECUTE */
+       117, /* GL_BYTE */
+      1722, /* GL_UNSIGNED_BYTE */
+      1401, /* GL_SHORT */
+      1733, /* GL_UNSIGNED_SHORT */
+       629, /* GL_INT */
+      1725, /* GL_UNSIGNED_INT */
+       477, /* GL_FLOAT */
          1, /* GL_2_BYTES */
          5, /* GL_3_BYTES */
          7, /* GL_4_BYTES */
-       377, /* GL_DOUBLE */
-       128, /* GL_CLEAR */
+       383, /* GL_DOUBLE */
+       129, /* GL_CLEAR */
         49, /* GL_AND */
         51, /* GL_AND_REVERSE */
-       290, /* GL_COPY */
+       295, /* GL_COPY */
         50, /* GL_AND_INVERTED */
-      1007, /* GL_NOOP */
-      1812, /* GL_XOR */
-      1069, /* GL_OR */
-      1008, /* GL_NOR */
-       454, /* GL_EQUIV */
-       668, /* GL_INVERT */
-      1072, /* GL_OR_REVERSE */
-       291, /* GL_COPY_INVERTED */
-      1071, /* GL_OR_INVERTED */
-       998, /* GL_NAND */
-      1398, /* GL_SET */
-       451, /* GL_EMISSION */
-      1406, /* GL_SHININESS */
+       995, /* GL_NOOP */
+      1814, /* GL_XOR */
+      1057, /* GL_OR */
+       996, /* GL_NOR */
+       460, /* GL_EQUIV */
+       656, /* GL_INVERT */
+      1060, /* GL_OR_REVERSE */
+       296, /* GL_COPY_INVERTED */
+      1059, /* GL_OR_INVERTED */
+       986, /* GL_NAND */
+      1392, /* GL_SET */
+       457, /* GL_EMISSION */
+      1400, /* GL_SHININESS */
         48, /* GL_AMBIENT_AND_DIFFUSE */
-       186, /* GL_COLOR_INDEXES */
-       948, /* GL_MODELVIEW */
-      1240, /* GL_PROJECTION */
-      1510, /* GL_TEXTURE */
-       143, /* GL_COLOR */
-       334, /* GL_DEPTH */
-      1459, /* GL_STENCIL */
-       185, /* GL_COLOR_INDEX */
-      1478, /* GL_STENCIL_INDEX */
-       345, /* GL_DEPTH_COMPONENT */
-      1282, /* GL_RED */
-       596, /* GL_GREEN */
-        88, /* GL_BLUE */
+       187, /* GL_COLOR_INDEXES */
+       936, /* GL_MODELVIEW */
+      1232, /* GL_PROJECTION */
+      1512, /* GL_TEXTURE */
+       144, /* GL_COLOR */
+       340, /* GL_DEPTH */
+      1461, /* GL_STENCIL */
+       186, /* GL_COLOR_INDEX */
+      1480, /* GL_STENCIL_INDEX */
+       351, /* GL_DEPTH_COMPONENT */
+      1274, /* GL_RED */
+       584, /* GL_GREEN */
+        89, /* GL_BLUE */
         31, /* GL_ALPHA */
-      1317, /* GL_RGB */
-      1336, /* GL_RGBA */
-       718, /* GL_LUMINANCE */
-       739, /* GL_LUMINANCE_ALPHA */
+      1309, /* GL_RGB */
+      1328, /* GL_RGBA */
+       706, /* GL_LUMINANCE */
+       727, /* GL_LUMINANCE_ALPHA */
         72, /* GL_BITMAP */
-      1120, /* GL_POINT */
-       688, /* GL_LINE */
-       469, /* GL_FILL */
-      1291, /* GL_RENDER */
-       465, /* GL_FEEDBACK */
-      1392, /* GL_SELECT */
-       470, /* GL_FLAT */
-      1411, /* GL_SMOOTH */
-       669, /* GL_KEEP */
-      1311, /* GL_REPLACE */
-       623, /* GL_INCR */
-       330, /* GL_DECR */
-      1746, /* GL_VENDOR */
-      1308, /* GL_RENDERER */
-      1747, /* GL_VERSION */
-       458, /* GL_EXTENSIONS */
-      1357, /* GL_S */
-      1501, /* GL_T */
-      1271, /* GL_R */
-      1260, /* GL_Q */
-       984, /* GL_MODULATE */
-       329, /* GL_DECAL */
-      1646, /* GL_TEXTURE_ENV_MODE */
-      1645, /* GL_TEXTURE_ENV_COLOR */
-      1644, /* GL_TEXTURE_ENV */
-       459, /* GL_EYE_LINEAR */
-      1031, /* GL_OBJECT_LINEAR */
-      1437, /* GL_SPHERE_MAP */
-      1648, /* GL_TEXTURE_GEN_MODE */
-      1033, /* GL_OBJECT_PLANE */
-       460, /* GL_EYE_PLANE */
-       999, /* GL_NEAREST */
-       689, /* GL_LINEAR */
-      1003, /* GL_NEAREST_MIPMAP_NEAREST */
-       694, /* GL_LINEAR_MIPMAP_NEAREST */
-      1002, /* GL_NEAREST_MIPMAP_LINEAR */
-       693, /* GL_LINEAR_MIPMAP_LINEAR */
-      1669, /* GL_TEXTURE_MAG_FILTER */
-      1677, /* GL_TEXTURE_MIN_FILTER */
-      1691, /* GL_TEXTURE_WRAP_S */
-      1692, /* GL_TEXTURE_WRAP_T */
-       122, /* GL_CLAMP */
-      1310, /* GL_REPEAT */
-      1158, /* GL_POLYGON_OFFSET_UNITS */
-      1157, /* GL_POLYGON_OFFSET_POINT */
-      1156, /* GL_POLYGON_OFFSET_LINE */
-      1272, /* GL_R3_G3_B2 */
-      1743, /* GL_V2F */
-      1744, /* GL_V3F */
-       119, /* GL_C4UB_V2F */
-       120, /* GL_C4UB_V3F */
-       117, /* GL_C3F_V3F */
-       996, /* GL_N3F_V3F */
-       118, /* GL_C4F_N3F_V3F */
-      1506, /* GL_T2F_V3F */
-      1508, /* GL_T4F_V4F */
-      1504, /* GL_T2F_C4UB_V3F */
-      1502, /* GL_T2F_C3F_V3F */
-      1505, /* GL_T2F_N3F_V3F */
-      1503, /* GL_T2F_C4F_N3F_V3F */
-      1507, /* GL_T4F_C4F_N3F_V4F */
-       135, /* GL_CLIP_PLANE0 */
-       136, /* GL_CLIP_PLANE1 */
-       137, /* GL_CLIP_PLANE2 */
-       138, /* GL_CLIP_PLANE3 */
-       139, /* GL_CLIP_PLANE4 */
-       140, /* GL_CLIP_PLANE5 */
-       673, /* GL_LIGHT0 */
-       674, /* GL_LIGHT1 */
-       675, /* GL_LIGHT2 */
-       676, /* GL_LIGHT3 */
-       677, /* GL_LIGHT4 */
-       678, /* GL_LIGHT5 */
-       679, /* GL_LIGHT6 */
-       680, /* GL_LIGHT7 */
-       600, /* GL_HINT_BIT */
-       268, /* GL_CONSTANT_COLOR */
-      1043, /* GL_ONE_MINUS_CONSTANT_COLOR */
-       263, /* GL_CONSTANT_ALPHA */
-      1041, /* GL_ONE_MINUS_CONSTANT_ALPHA */
+      1112, /* GL_POINT */
+       676, /* GL_LINE */
+       475, /* GL_FILL */
+      1283, /* GL_RENDER */
+       471, /* GL_FEEDBACK */
+      1386, /* GL_SELECT */
+       476, /* GL_FLAT */
+      1410, /* GL_SMOOTH */
+       657, /* GL_KEEP */
+      1303, /* GL_REPLACE */
+       611, /* GL_INCR */
+       336, /* GL_DECR */
+      1748, /* GL_VENDOR */
+      1300, /* GL_RENDERER */
+      1749, /* GL_VERSION */
+       464, /* GL_EXTENSIONS */
+      1351, /* GL_S */
+      1503, /* GL_T */
+      1263, /* GL_R */
+      1252, /* GL_Q */
+       972, /* GL_MODULATE */
+       335, /* GL_DECAL */
+      1648, /* GL_TEXTURE_ENV_MODE */
+      1647, /* GL_TEXTURE_ENV_COLOR */
+      1646, /* GL_TEXTURE_ENV */
+       465, /* GL_EYE_LINEAR */
+      1019, /* GL_OBJECT_LINEAR */
+      1436, /* GL_SPHERE_MAP */
+      1650, /* GL_TEXTURE_GEN_MODE */
+      1021, /* GL_OBJECT_PLANE */
+       466, /* GL_EYE_PLANE */
+       987, /* GL_NEAREST */
+       677, /* GL_LINEAR */
+       991, /* GL_NEAREST_MIPMAP_NEAREST */
+       682, /* GL_LINEAR_MIPMAP_NEAREST */
+       990, /* GL_NEAREST_MIPMAP_LINEAR */
+       681, /* GL_LINEAR_MIPMAP_LINEAR */
+      1671, /* GL_TEXTURE_MAG_FILTER */
+      1679, /* GL_TEXTURE_MIN_FILTER */
+      1693, /* GL_TEXTURE_WRAP_S */
+      1694, /* GL_TEXTURE_WRAP_T */
+       123, /* GL_CLAMP */
+      1302, /* GL_REPEAT */
+      1150, /* GL_POLYGON_OFFSET_UNITS */
+      1149, /* GL_POLYGON_OFFSET_POINT */
+      1148, /* GL_POLYGON_OFFSET_LINE */
+      1264, /* GL_R3_G3_B2 */
+      1745, /* GL_V2F */
+      1746, /* GL_V3F */
+       120, /* GL_C4UB_V2F */
+       121, /* GL_C4UB_V3F */
+       118, /* GL_C3F_V3F */
+       984, /* GL_N3F_V3F */
+       119, /* GL_C4F_N3F_V3F */
+      1508, /* GL_T2F_V3F */
+      1510, /* GL_T4F_V4F */
+      1506, /* GL_T2F_C4UB_V3F */
+      1504, /* GL_T2F_C3F_V3F */
+      1507, /* GL_T2F_N3F_V3F */
+      1505, /* GL_T2F_C4F_N3F_V3F */
+      1509, /* GL_T4F_C4F_N3F_V4F */
+       136, /* GL_CLIP_PLANE0 */
+       137, /* GL_CLIP_PLANE1 */
+       138, /* GL_CLIP_PLANE2 */
+       139, /* GL_CLIP_PLANE3 */
+       140, /* GL_CLIP_PLANE4 */
+       141, /* GL_CLIP_PLANE5 */
+       661, /* GL_LIGHT0 */
+       662, /* GL_LIGHT1 */
+       663, /* GL_LIGHT2 */
+       664, /* GL_LIGHT3 */
+       665, /* GL_LIGHT4 */
+       666, /* GL_LIGHT5 */
+       667, /* GL_LIGHT6 */
+       668, /* GL_LIGHT7 */
+       588, /* GL_HINT_BIT */
+       273, /* GL_CONSTANT_COLOR */
+      1031, /* GL_ONE_MINUS_CONSTANT_COLOR */
+       268, /* GL_CONSTANT_ALPHA */
+      1029, /* GL_ONE_MINUS_CONSTANT_ALPHA */
         75, /* GL_BLEND_COLOR */
-       560, /* GL_FUNC_ADD */
-       932, /* GL_MIN */
-       843, /* GL_MAX */
+       572, /* GL_FUNC_ADD */
+       920, /* GL_MIN */
+       831, /* GL_MAX */
         80, /* GL_BLEND_EQUATION */
-       564, /* GL_FUNC_SUBTRACT */
-       562, /* GL_FUNC_REVERSE_SUBTRACT */
-       271, /* GL_CONVOLUTION_1D */
-       272, /* GL_CONVOLUTION_2D */
-      1395, /* GL_SEPARABLE_2D */
-       275, /* GL_CONVOLUTION_BORDER_MODE */
-       279, /* GL_CONVOLUTION_FILTER_SCALE */
-       277, /* GL_CONVOLUTION_FILTER_BIAS */
-      1283, /* GL_REDUCE */
-       281, /* GL_CONVOLUTION_FORMAT */
-       285, /* GL_CONVOLUTION_WIDTH */
-       283, /* GL_CONVOLUTION_HEIGHT */
-       858, /* GL_MAX_CONVOLUTION_WIDTH */
-       856, /* GL_MAX_CONVOLUTION_HEIGHT */
-      1197, /* GL_POST_CONVOLUTION_RED_SCALE */
-      1193, /* GL_POST_CONVOLUTION_GREEN_SCALE */
-      1188, /* GL_POST_CONVOLUTION_BLUE_SCALE */
-      1184, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
-      1195, /* GL_POST_CONVOLUTION_RED_BIAS */
-      1191, /* GL_POST_CONVOLUTION_GREEN_BIAS */
-      1186, /* GL_POST_CONVOLUTION_BLUE_BIAS */
-      1182, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
-       601, /* GL_HISTOGRAM */
-      1244, /* GL_PROXY_HISTOGRAM */
-       617, /* GL_HISTOGRAM_WIDTH */
-       607, /* GL_HISTOGRAM_FORMAT */
-       613, /* GL_HISTOGRAM_RED_SIZE */
-       609, /* GL_HISTOGRAM_GREEN_SIZE */
-       604, /* GL_HISTOGRAM_BLUE_SIZE */
-       602, /* GL_HISTOGRAM_ALPHA_SIZE */
-       611, /* GL_HISTOGRAM_LUMINANCE_SIZE */
-       615, /* GL_HISTOGRAM_SINK */
-       933, /* GL_MINMAX */
-       935, /* GL_MINMAX_FORMAT */
-       937, /* GL_MINMAX_SINK */
-      1509, /* GL_TABLE_TOO_LARGE_EXT */
-      1722, /* GL_UNSIGNED_BYTE_3_3_2 */
-      1733, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-      1735, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-      1728, /* GL_UNSIGNED_INT_8_8_8_8 */
-      1724, /* GL_UNSIGNED_INT_10_10_10_2 */
-      1155, /* GL_POLYGON_OFFSET_FILL */
-      1154, /* GL_POLYGON_OFFSET_FACTOR */
-      1153, /* GL_POLYGON_OFFSET_BIAS */
-      1314, /* GL_RESCALE_NORMAL */
+       576, /* GL_FUNC_SUBTRACT */
+       574, /* GL_FUNC_REVERSE_SUBTRACT */
+       276, /* GL_CONVOLUTION_1D */
+       277, /* GL_CONVOLUTION_2D */
+      1389, /* GL_SEPARABLE_2D */
+       280, /* GL_CONVOLUTION_BORDER_MODE */
+       284, /* GL_CONVOLUTION_FILTER_SCALE */
+       282, /* GL_CONVOLUTION_FILTER_BIAS */
+      1275, /* GL_REDUCE */
+       286, /* GL_CONVOLUTION_FORMAT */
+       290, /* GL_CONVOLUTION_WIDTH */
+       288, /* GL_CONVOLUTION_HEIGHT */
+       846, /* GL_MAX_CONVOLUTION_WIDTH */
+       844, /* GL_MAX_CONVOLUTION_HEIGHT */
+      1189, /* GL_POST_CONVOLUTION_RED_SCALE */
+      1185, /* GL_POST_CONVOLUTION_GREEN_SCALE */
+      1180, /* GL_POST_CONVOLUTION_BLUE_SCALE */
+      1176, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
+      1187, /* GL_POST_CONVOLUTION_RED_BIAS */
+      1183, /* GL_POST_CONVOLUTION_GREEN_BIAS */
+      1178, /* GL_POST_CONVOLUTION_BLUE_BIAS */
+      1174, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
+       589, /* GL_HISTOGRAM */
+      1236, /* GL_PROXY_HISTOGRAM */
+       605, /* GL_HISTOGRAM_WIDTH */
+       595, /* GL_HISTOGRAM_FORMAT */
+       601, /* GL_HISTOGRAM_RED_SIZE */
+       597, /* GL_HISTOGRAM_GREEN_SIZE */
+       592, /* GL_HISTOGRAM_BLUE_SIZE */
+       590, /* GL_HISTOGRAM_ALPHA_SIZE */
+       599, /* GL_HISTOGRAM_LUMINANCE_SIZE */
+       603, /* GL_HISTOGRAM_SINK */
+       921, /* GL_MINMAX */
+       923, /* GL_MINMAX_FORMAT */
+       925, /* GL_MINMAX_SINK */
+      1511, /* GL_TABLE_TOO_LARGE_EXT */
+      1724, /* GL_UNSIGNED_BYTE_3_3_2 */
+      1735, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+      1737, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+      1730, /* GL_UNSIGNED_INT_8_8_8_8 */
+      1726, /* GL_UNSIGNED_INT_10_10_10_2 */
+      1147, /* GL_POLYGON_OFFSET_FILL */
+      1146, /* GL_POLYGON_OFFSET_FACTOR */
+      1145, /* GL_POLYGON_OFFSET_BIAS */
+      1306, /* GL_RESCALE_NORMAL */
         36, /* GL_ALPHA4 */
         38, /* GL_ALPHA8 */
         32, /* GL_ALPHA12 */
         34, /* GL_ALPHA16 */
-       729, /* GL_LUMINANCE4 */
-       735, /* GL_LUMINANCE8 */
-       719, /* GL_LUMINANCE12 */
-       725, /* GL_LUMINANCE16 */
-       730, /* GL_LUMINANCE4_ALPHA4 */
-       733, /* GL_LUMINANCE6_ALPHA2 */
-       736, /* GL_LUMINANCE8_ALPHA8 */
-       722, /* GL_LUMINANCE12_ALPHA4 */
-       720, /* GL_LUMINANCE12_ALPHA12 */
-       726, /* GL_LUMINANCE16_ALPHA16 */
-       642, /* GL_INTENSITY */
-       647, /* GL_INTENSITY4 */
-       649, /* GL_INTENSITY8 */
-       643, /* GL_INTENSITY12 */
-       645, /* GL_INTENSITY16 */
-      1326, /* GL_RGB2_EXT */
-      1327, /* GL_RGB4 */
-      1330, /* GL_RGB5 */
-      1334, /* GL_RGB8 */
-      1318, /* GL_RGB10 */
-      1322, /* GL_RGB12 */
-      1324, /* GL_RGB16 */
-      1341, /* GL_RGBA2 */
-      1343, /* GL_RGBA4 */
-      1331, /* GL_RGB5_A1 */
-      1347, /* GL_RGBA8 */
-      1319, /* GL_RGB10_A2 */
-      1337, /* GL_RGBA12 */
-      1339, /* GL_RGBA16 */
-      1682, /* GL_TEXTURE_RED_SIZE */
-      1654, /* GL_TEXTURE_GREEN_SIZE */
-      1593, /* GL_TEXTURE_BLUE_SIZE */
-      1580, /* GL_TEXTURE_ALPHA_SIZE */
-      1667, /* GL_TEXTURE_LUMINANCE_SIZE */
-      1658, /* GL_TEXTURE_INTENSITY_SIZE */
-      1312, /* GL_REPLACE_EXT */
-      1248, /* GL_PROXY_TEXTURE_1D */
-      1251, /* GL_PROXY_TEXTURE_2D */
-      1687, /* GL_TEXTURE_TOO_LARGE_EXT */
-      1679, /* GL_TEXTURE_PRIORITY */
-      1684, /* GL_TEXTURE_RESIDENT */
-      1583, /* GL_TEXTURE_BINDING_1D */
-      1585, /* GL_TEXTURE_BINDING_2D */
-      1587, /* GL_TEXTURE_BINDING_3D */
-      1079, /* GL_PACK_SKIP_IMAGES */
-      1075, /* GL_PACK_IMAGE_HEIGHT */
-      1716, /* GL_UNPACK_SKIP_IMAGES */
-      1713, /* GL_UNPACK_IMAGE_HEIGHT */
-      1579, /* GL_TEXTURE_3D */
-      1254, /* GL_PROXY_TEXTURE_3D */
-      1641, /* GL_TEXTURE_DEPTH */
-      1690, /* GL_TEXTURE_WRAP_R */
-       844, /* GL_MAX_3D_TEXTURE_SIZE */
-      1748, /* GL_VERTEX_ARRAY */
-      1010, /* GL_NORMAL_ARRAY */
-       144, /* GL_COLOR_ARRAY */
-       627, /* GL_INDEX_ARRAY */
-      1620, /* GL_TEXTURE_COORD_ARRAY */
-       443, /* GL_EDGE_FLAG_ARRAY */
-      1753, /* GL_VERTEX_ARRAY_SIZE */
-      1755, /* GL_VERTEX_ARRAY_TYPE */
-      1754, /* GL_VERTEX_ARRAY_STRIDE */
-      1015, /* GL_NORMAL_ARRAY_TYPE */
-      1014, /* GL_NORMAL_ARRAY_STRIDE */
-       148, /* GL_COLOR_ARRAY_SIZE */
-       150, /* GL_COLOR_ARRAY_TYPE */
-       149, /* GL_COLOR_ARRAY_STRIDE */
-       632, /* GL_INDEX_ARRAY_TYPE */
-       631, /* GL_INDEX_ARRAY_STRIDE */
-      1624, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-      1626, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-      1625, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
-       447, /* GL_EDGE_FLAG_ARRAY_STRIDE */
-      1752, /* GL_VERTEX_ARRAY_POINTER */
-      1013, /* GL_NORMAL_ARRAY_POINTER */
-       147, /* GL_COLOR_ARRAY_POINTER */
-       630, /* GL_INDEX_ARRAY_POINTER */
-      1623, /* GL_TEXTURE_COORD_ARRAY_POINTER */
-       446, /* GL_EDGE_FLAG_ARRAY_POINTER */
-       989, /* GL_MULTISAMPLE */
-      1369, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
-      1371, /* GL_SAMPLE_ALPHA_TO_ONE */
-      1376, /* GL_SAMPLE_COVERAGE */
-      1373, /* GL_SAMPLE_BUFFERS */
-      1364, /* GL_SAMPLES */
-      1380, /* GL_SAMPLE_COVERAGE_VALUE */
-      1378, /* GL_SAMPLE_COVERAGE_INVERT */
-       191, /* GL_COLOR_MATRIX */
-       193, /* GL_COLOR_MATRIX_STACK_DEPTH */
-       852, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
-      1180, /* GL_POST_COLOR_MATRIX_RED_SCALE */
-      1176, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
-      1171, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
-      1167, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
-      1178, /* GL_POST_COLOR_MATRIX_RED_BIAS */
-      1174, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
-      1169, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
-      1165, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
-      1603, /* GL_TEXTURE_COLOR_TABLE_SGI */
-      1255, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
-      1605, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+       717, /* GL_LUMINANCE4 */
+       723, /* GL_LUMINANCE8 */
+       707, /* GL_LUMINANCE12 */
+       713, /* GL_LUMINANCE16 */
+       718, /* GL_LUMINANCE4_ALPHA4 */
+       721, /* GL_LUMINANCE6_ALPHA2 */
+       724, /* GL_LUMINANCE8_ALPHA8 */
+       710, /* GL_LUMINANCE12_ALPHA4 */
+       708, /* GL_LUMINANCE12_ALPHA12 */
+       714, /* GL_LUMINANCE16_ALPHA16 */
+       630, /* GL_INTENSITY */
+       635, /* GL_INTENSITY4 */
+       637, /* GL_INTENSITY8 */
+       631, /* GL_INTENSITY12 */
+       633, /* GL_INTENSITY16 */
+      1318, /* GL_RGB2_EXT */
+      1319, /* GL_RGB4 */
+      1322, /* GL_RGB5 */
+      1326, /* GL_RGB8 */
+      1310, /* GL_RGB10 */
+      1314, /* GL_RGB12 */
+      1316, /* GL_RGB16 */
+      1333, /* GL_RGBA2 */
+      1335, /* GL_RGBA4 */
+      1323, /* GL_RGB5_A1 */
+      1339, /* GL_RGBA8 */
+      1311, /* GL_RGB10_A2 */
+      1329, /* GL_RGBA12 */
+      1331, /* GL_RGBA16 */
+      1684, /* GL_TEXTURE_RED_SIZE */
+      1656, /* GL_TEXTURE_GREEN_SIZE */
+      1595, /* GL_TEXTURE_BLUE_SIZE */
+      1582, /* GL_TEXTURE_ALPHA_SIZE */
+      1669, /* GL_TEXTURE_LUMINANCE_SIZE */
+      1660, /* GL_TEXTURE_INTENSITY_SIZE */
+      1304, /* GL_REPLACE_EXT */
+      1240, /* GL_PROXY_TEXTURE_1D */
+      1243, /* GL_PROXY_TEXTURE_2D */
+      1689, /* GL_TEXTURE_TOO_LARGE_EXT */
+      1681, /* GL_TEXTURE_PRIORITY */
+      1686, /* GL_TEXTURE_RESIDENT */
+      1585, /* GL_TEXTURE_BINDING_1D */
+      1587, /* GL_TEXTURE_BINDING_2D */
+      1589, /* GL_TEXTURE_BINDING_3D */
+      1067, /* GL_PACK_SKIP_IMAGES */
+      1063, /* GL_PACK_IMAGE_HEIGHT */
+      1718, /* GL_UNPACK_SKIP_IMAGES */
+      1715, /* GL_UNPACK_IMAGE_HEIGHT */
+      1581, /* GL_TEXTURE_3D */
+      1246, /* GL_PROXY_TEXTURE_3D */
+      1643, /* GL_TEXTURE_DEPTH */
+      1692, /* GL_TEXTURE_WRAP_R */
+       832, /* GL_MAX_3D_TEXTURE_SIZE */
+      1750, /* GL_VERTEX_ARRAY */
+       998, /* GL_NORMAL_ARRAY */
+       145, /* GL_COLOR_ARRAY */
+       615, /* GL_INDEX_ARRAY */
+      1622, /* GL_TEXTURE_COORD_ARRAY */
+       449, /* GL_EDGE_FLAG_ARRAY */
+      1755, /* GL_VERTEX_ARRAY_SIZE */
+      1757, /* GL_VERTEX_ARRAY_TYPE */
+      1756, /* GL_VERTEX_ARRAY_STRIDE */
+      1003, /* GL_NORMAL_ARRAY_TYPE */
+      1002, /* GL_NORMAL_ARRAY_STRIDE */
+       149, /* GL_COLOR_ARRAY_SIZE */
+       151, /* GL_COLOR_ARRAY_TYPE */
+       150, /* GL_COLOR_ARRAY_STRIDE */
+       620, /* GL_INDEX_ARRAY_TYPE */
+       619, /* GL_INDEX_ARRAY_STRIDE */
+      1626, /* GL_TEXTURE_COORD_ARRAY_SIZE */
+      1628, /* GL_TEXTURE_COORD_ARRAY_TYPE */
+      1627, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
+       453, /* GL_EDGE_FLAG_ARRAY_STRIDE */
+      1754, /* GL_VERTEX_ARRAY_POINTER */
+      1001, /* GL_NORMAL_ARRAY_POINTER */
+       148, /* GL_COLOR_ARRAY_POINTER */
+       618, /* GL_INDEX_ARRAY_POINTER */
+      1625, /* GL_TEXTURE_COORD_ARRAY_POINTER */
+       452, /* GL_EDGE_FLAG_ARRAY_POINTER */
+       977, /* GL_MULTISAMPLE */
+      1363, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
+      1365, /* GL_SAMPLE_ALPHA_TO_ONE */
+      1370, /* GL_SAMPLE_COVERAGE */
+      1367, /* GL_SAMPLE_BUFFERS */
+      1358, /* GL_SAMPLES */
+      1374, /* GL_SAMPLE_COVERAGE_VALUE */
+      1372, /* GL_SAMPLE_COVERAGE_INVERT */
+       192, /* GL_COLOR_MATRIX */
+       194, /* GL_COLOR_MATRIX_STACK_DEPTH */
+       840, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
+      1172, /* GL_POST_COLOR_MATRIX_RED_SCALE */
+      1168, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
+      1163, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
+      1159, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
+      1170, /* GL_POST_COLOR_MATRIX_RED_BIAS */
+      1166, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
+      1161, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
+      1157, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
+      1605, /* GL_TEXTURE_COLOR_TABLE_SGI */
+      1247, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
+      1607, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
         79, /* GL_BLEND_DST_RGB */
-        87, /* GL_BLEND_SRC_RGB */
+        88, /* GL_BLEND_SRC_RGB */
         78, /* GL_BLEND_DST_ALPHA */
-        86, /* GL_BLEND_SRC_ALPHA */
-       197, /* GL_COLOR_TABLE */
-      1190, /* GL_POST_CONVOLUTION_COLOR_TABLE */
-      1173, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
-      1243, /* GL_PROXY_COLOR_TABLE */
-      1247, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
-      1246, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
-       221, /* GL_COLOR_TABLE_SCALE */
-       201, /* GL_COLOR_TABLE_BIAS */
-       206, /* GL_COLOR_TABLE_FORMAT */
-       223, /* GL_COLOR_TABLE_WIDTH */
-       218, /* GL_COLOR_TABLE_RED_SIZE */
-       209, /* GL_COLOR_TABLE_GREEN_SIZE */
-       203, /* GL_COLOR_TABLE_BLUE_SIZE */
-       198, /* GL_COLOR_TABLE_ALPHA_SIZE */
-       215, /* GL_COLOR_TABLE_LUMINANCE_SIZE */
-       212, /* GL_COLOR_TABLE_INTENSITY_SIZE */
+        87, /* GL_BLEND_SRC_ALPHA */
+       198, /* GL_COLOR_TABLE */
+      1182, /* GL_POST_CONVOLUTION_COLOR_TABLE */
+      1165, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
+      1235, /* GL_PROXY_COLOR_TABLE */
+      1239, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
+      1238, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
+       222, /* GL_COLOR_TABLE_SCALE */
+       202, /* GL_COLOR_TABLE_BIAS */
+       207, /* GL_COLOR_TABLE_FORMAT */
+       224, /* GL_COLOR_TABLE_WIDTH */
+       219, /* GL_COLOR_TABLE_RED_SIZE */
+       210, /* GL_COLOR_TABLE_GREEN_SIZE */
+       204, /* GL_COLOR_TABLE_BLUE_SIZE */
+       199, /* GL_COLOR_TABLE_ALPHA_SIZE */
+       216, /* GL_COLOR_TABLE_LUMINANCE_SIZE */
+       213, /* GL_COLOR_TABLE_INTENSITY_SIZE */
         70, /* GL_BGR */
         71, /* GL_BGRA */
-       866, /* GL_MAX_ELEMENTS_VERTICES */
-       865, /* GL_MAX_ELEMENTS_INDICES */
-      1657, /* GL_TEXTURE_INDEX_SIZE_EXT */
-       141, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
-      1137, /* GL_POINT_SIZE_MIN */
-      1133, /* GL_POINT_SIZE_MAX */
-      1127, /* GL_POINT_FADE_THRESHOLD_SIZE */
-      1123, /* GL_POINT_DISTANCE_ATTENUATION */
-       123, /* GL_CLAMP_TO_BORDER */
-       126, /* GL_CLAMP_TO_EDGE */
-      1678, /* GL_TEXTURE_MIN_LOD */
-      1676, /* GL_TEXTURE_MAX_LOD */
-      1582, /* GL_TEXTURE_BASE_LEVEL */
-      1675, /* GL_TEXTURE_MAX_LEVEL */
-       620, /* GL_IGNORE_BORDER_HP */
-       267, /* GL_CONSTANT_BORDER_HP */
-      1313, /* GL_REPLICATE_BORDER_HP */
-       273, /* GL_CONVOLUTION_BORDER_COLOR */
-      1038, /* GL_OCCLUSION_TEST_HP */
-      1039, /* GL_OCCLUSION_TEST_RESULT_HP */
-       691, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
-      1597, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-      1599, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-      1601, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-      1602, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-      1600, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-      1598, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
-       848, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
-       849, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-      1200, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
-      1202, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
-      1199, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
-      1201, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
-      1665, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-      1666, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-      1664, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
-       566, /* GL_GENERATE_MIPMAP */
-       567, /* GL_GENERATE_MIPMAP_HINT */
-       508, /* GL_FOG_OFFSET_SGIX */
-       509, /* GL_FOG_OFFSET_VALUE_SGIX */
-      1611, /* GL_TEXTURE_COMPARE_SGIX */
-      1610, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-      1661, /* GL_TEXTURE_LEQUAL_R_SGIX */
-      1653, /* GL_TEXTURE_GEQUAL_R_SGIX */
-       346, /* GL_DEPTH_COMPONENT16 */
-       349, /* GL_DEPTH_COMPONENT24 */
-       352, /* GL_DEPTH_COMPONENT32 */
-       295, /* GL_CULL_VERTEX_EXT */
-       297, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
-       296, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
-      1809, /* GL_WRAP_BORDER_SUN */
-      1604, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
-       684, /* GL_LIGHT_MODEL_COLOR_CONTROL */
-      1408, /* GL_SINGLE_COLOR */
-      1396, /* GL_SEPARATE_SPECULAR_COLOR */
-      1405, /* GL_SHARED_TEXTURE_PALETTE_EXT */
-       519, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
-       520, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
-       527, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
-       522, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
-       518, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
-       517, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
-       521, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
-       528, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
-       539, /* GL_FRAMEBUFFER_DEFAULT */
-       552, /* GL_FRAMEBUFFER_UNDEFINED */
-       359, /* GL_DEPTH_STENCIL_ATTACHMENT */
-       626, /* GL_INDEX */
-      1721, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-      1736, /* GL_UNSIGNED_SHORT_5_6_5 */
-      1737, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-      1734, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-      1732, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-      1729, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-      1727, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-      1673, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-      1674, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-      1672, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
-       940, /* GL_MIRRORED_REPEAT */
-      1352, /* GL_RGB_S3TC */
-      1329, /* GL_RGB4_S3TC */
-      1351, /* GL_RGBA_S3TC */
-      1346, /* GL_RGBA4_S3TC */
-      1349, /* GL_RGBA_DXT5_S3TC */
-      1344, /* GL_RGBA4_DXT5_S3TC */
-       260, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
-       255, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
-       256, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
-       257, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */
-      1001, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
-      1000, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
-       692, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
-       495, /* GL_FOG_COORDINATE_SOURCE */
-       487, /* GL_FOG_COORD */
-       511, /* GL_FRAGMENT_DEPTH */
-       301, /* GL_CURRENT_FOG_COORD */
-       494, /* GL_FOG_COORDINATE_ARRAY_TYPE */
-       493, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
-       492, /* GL_FOG_COORDINATE_ARRAY_POINTER */
-       489, /* GL_FOG_COORDINATE_ARRAY */
-       195, /* GL_COLOR_SUM */
-       320, /* GL_CURRENT_SECONDARY_COLOR */
-      1389, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
-      1391, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
-      1390, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
-      1388, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
-      1385, /* GL_SECONDARY_COLOR_ARRAY */
-       576, /* GL_GL_CURRENT_RASTER_SECONDARY_COLOR */
+       854, /* GL_MAX_ELEMENTS_VERTICES */
+       853, /* GL_MAX_ELEMENTS_INDICES */
+      1659, /* GL_TEXTURE_INDEX_SIZE_EXT */
+       142, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
+      1129, /* GL_POINT_SIZE_MIN */
+      1125, /* GL_POINT_SIZE_MAX */
+      1119, /* GL_POINT_FADE_THRESHOLD_SIZE */
+      1115, /* GL_POINT_DISTANCE_ATTENUATION */
+       124, /* GL_CLAMP_TO_BORDER */
+       127, /* GL_CLAMP_TO_EDGE */
+      1680, /* GL_TEXTURE_MIN_LOD */
+      1678, /* GL_TEXTURE_MAX_LOD */
+      1584, /* GL_TEXTURE_BASE_LEVEL */
+      1677, /* GL_TEXTURE_MAX_LEVEL */
+       608, /* GL_IGNORE_BORDER_HP */
+       272, /* GL_CONSTANT_BORDER_HP */
+      1305, /* GL_REPLICATE_BORDER_HP */
+       278, /* GL_CONVOLUTION_BORDER_COLOR */
+      1026, /* GL_OCCLUSION_TEST_HP */
+      1027, /* GL_OCCLUSION_TEST_RESULT_HP */
+       679, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
+      1599, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
+      1601, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
+      1603, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
+      1604, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+      1602, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
+      1600, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
+       836, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
+       837, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+      1192, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
+      1194, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
+      1191, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
+      1193, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
+      1667, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+      1668, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+      1666, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+       578, /* GL_GENERATE_MIPMAP */
+       579, /* GL_GENERATE_MIPMAP_HINT */
+       520, /* GL_FOG_OFFSET_SGIX */
+       521, /* GL_FOG_OFFSET_VALUE_SGIX */
+      1613, /* GL_TEXTURE_COMPARE_SGIX */
+      1612, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
+      1663, /* GL_TEXTURE_LEQUAL_R_SGIX */
+      1655, /* GL_TEXTURE_GEQUAL_R_SGIX */
+       352, /* GL_DEPTH_COMPONENT16 */
+       355, /* GL_DEPTH_COMPONENT24 */
+       358, /* GL_DEPTH_COMPONENT32 */
+       300, /* GL_CULL_VERTEX_EXT */
+       302, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
+       301, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
+      1811, /* GL_WRAP_BORDER_SUN */
+      1606, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
+       672, /* GL_LIGHT_MODEL_COLOR_CONTROL */
+      1403, /* GL_SINGLE_COLOR */
+      1390, /* GL_SEPARATE_SPECULAR_COLOR */
+      1399, /* GL_SHARED_TEXTURE_PALETTE_EXT */
+       531, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
+       532, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
+       539, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
+       534, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
+       530, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
+       529, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
+       533, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
+       540, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
+       551, /* GL_FRAMEBUFFER_DEFAULT */
+       564, /* GL_FRAMEBUFFER_UNDEFINED */
+       365, /* GL_DEPTH_STENCIL_ATTACHMENT */
+       614, /* GL_INDEX */
+      1723, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+      1738, /* GL_UNSIGNED_SHORT_5_6_5 */
+      1739, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+      1736, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+      1734, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+      1731, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+      1729, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+      1675, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+      1676, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+      1674, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+       928, /* GL_MIRRORED_REPEAT */
+      1346, /* GL_RGB_S3TC */
+      1321, /* GL_RGB4_S3TC */
+      1344, /* GL_RGBA_S3TC */
+      1338, /* GL_RGBA4_S3TC */
+      1342, /* GL_RGBA_DXT5_S3TC */
+      1336, /* GL_RGBA4_DXT5_S3TC */
+       261, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
+       256, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
+       257, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
+       258, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */
+       989, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
+       988, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
+       680, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
+       507, /* GL_FOG_COORDINATE_SOURCE */
+       499, /* GL_FOG_COORD */
+       523, /* GL_FRAGMENT_DEPTH */
+       306, /* GL_CURRENT_FOG_COORD */
+       506, /* GL_FOG_COORDINATE_ARRAY_TYPE */
+       505, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
+       504, /* GL_FOG_COORDINATE_ARRAY_POINTER */
+       501, /* GL_FOG_COORDINATE_ARRAY */
+       196, /* GL_COLOR_SUM */
+       326, /* GL_CURRENT_SECONDARY_COLOR */
+      1383, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
+      1385, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
+      1384, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
+      1382, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
+      1379, /* GL_SECONDARY_COLOR_ARRAY */
+       324, /* GL_CURRENT_RASTER_SECONDARY_COLOR */
         28, /* GL_ALIASED_POINT_SIZE_RANGE */
         27, /* GL_ALIASED_LINE_WIDTH_RANGE */
-      1511, /* GL_TEXTURE0 */
-      1513, /* GL_TEXTURE1 */
-      1535, /* GL_TEXTURE2 */
-      1557, /* GL_TEXTURE3 */
-      1563, /* GL_TEXTURE4 */
-      1565, /* GL_TEXTURE5 */
-      1567, /* GL_TEXTURE6 */
-      1569, /* GL_TEXTURE7 */
-      1571, /* GL_TEXTURE8 */
-      1573, /* GL_TEXTURE9 */
-      1514, /* GL_TEXTURE10 */
-      1516, /* GL_TEXTURE11 */
-      1518, /* GL_TEXTURE12 */
-      1520, /* GL_TEXTURE13 */
-      1522, /* GL_TEXTURE14 */
-      1524, /* GL_TEXTURE15 */
-      1526, /* GL_TEXTURE16 */
-      1528, /* GL_TEXTURE17 */
-      1530, /* GL_TEXTURE18 */
-      1532, /* GL_TEXTURE19 */
-      1536, /* GL_TEXTURE20 */
-      1538, /* GL_TEXTURE21 */
-      1540, /* GL_TEXTURE22 */
-      1542, /* GL_TEXTURE23 */
-      1544, /* GL_TEXTURE24 */
-      1546, /* GL_TEXTURE25 */
-      1548, /* GL_TEXTURE26 */
-      1550, /* GL_TEXTURE27 */
-      1552, /* GL_TEXTURE28 */
-      1554, /* GL_TEXTURE29 */
-      1558, /* GL_TEXTURE30 */
-      1560, /* GL_TEXTURE31 */
+      1513, /* GL_TEXTURE0 */
+      1515, /* GL_TEXTURE1 */
+      1537, /* GL_TEXTURE2 */
+      1559, /* GL_TEXTURE3 */
+      1565, /* GL_TEXTURE4 */
+      1567, /* GL_TEXTURE5 */
+      1569, /* GL_TEXTURE6 */
+      1571, /* GL_TEXTURE7 */
+      1573, /* GL_TEXTURE8 */
+      1575, /* GL_TEXTURE9 */
+      1516, /* GL_TEXTURE10 */
+      1518, /* GL_TEXTURE11 */
+      1520, /* GL_TEXTURE12 */
+      1522, /* GL_TEXTURE13 */
+      1524, /* GL_TEXTURE14 */
+      1526, /* GL_TEXTURE15 */
+      1528, /* GL_TEXTURE16 */
+      1530, /* GL_TEXTURE17 */
+      1532, /* GL_TEXTURE18 */
+      1534, /* GL_TEXTURE19 */
+      1538, /* GL_TEXTURE20 */
+      1540, /* GL_TEXTURE21 */
+      1542, /* GL_TEXTURE22 */
+      1544, /* GL_TEXTURE23 */
+      1546, /* GL_TEXTURE24 */
+      1548, /* GL_TEXTURE25 */
+      1550, /* GL_TEXTURE26 */
+      1552, /* GL_TEXTURE27 */
+      1554, /* GL_TEXTURE28 */
+      1556, /* GL_TEXTURE29 */
+      1560, /* GL_TEXTURE30 */
+      1562, /* GL_TEXTURE31 */
         18, /* GL_ACTIVE_TEXTURE */
-       129, /* GL_CLIENT_ACTIVE_TEXTURE */
-       918, /* GL_MAX_TEXTURE_UNITS */
-      1700, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-      1703, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-      1705, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-      1697, /* GL_TRANSPOSE_COLOR_MATRIX */
-      1499, /* GL_SUBTRACT */
-       906, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
-       243, /* GL_COMPRESSED_ALPHA */
-       247, /* GL_COMPRESSED_LUMINANCE */
-       248, /* GL_COMPRESSED_LUMINANCE_ALPHA */
-       245, /* GL_COMPRESSED_INTENSITY */
-       251, /* GL_COMPRESSED_RGB */
-       252, /* GL_COMPRESSED_RGBA */
-      1618, /* GL_TEXTURE_COMPRESSION_HINT */
-      1680, /* GL_TEXTURE_RECTANGLE_ARB */
-      1590, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
-      1258, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
-       904, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
-       358, /* GL_DEPTH_STENCIL */
-      1725, /* GL_UNSIGNED_INT_24_8 */
-       914, /* GL_MAX_TEXTURE_LOD_BIAS */
-      1671, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
-       915, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
-      1647, /* GL_TEXTURE_FILTER_CONTROL */
-      1662, /* GL_TEXTURE_LOD_BIAS */
-       228, /* GL_COMBINE4 */
-       908, /* GL_MAX_SHININESS_NV */
-       909, /* GL_MAX_SPOT_EXPONENT_NV */
-       624, /* GL_INCR_WRAP */
-       331, /* GL_DECR_WRAP */
-       960, /* GL_MODELVIEW1_ARB */
-      1016, /* GL_NORMAL_MAP */
-      1288, /* GL_REFLECTION_MAP */
-      1627, /* GL_TEXTURE_CUBE_MAP */
-      1588, /* GL_TEXTURE_BINDING_CUBE_MAP */
-      1635, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-      1629, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-      1637, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-      1631, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-      1639, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-      1633, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
-      1256, /* GL_PROXY_TEXTURE_CUBE_MAP */
-       860, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
-       995, /* GL_MULTISAMPLE_FILTER_HINT_NV */
-       503, /* GL_FOG_DISTANCE_MODE_NV */
-       462, /* GL_EYE_RADIAL_NV */
-       461, /* GL_EYE_PLANE_ABSOLUTE_NV */
-       227, /* GL_COMBINE */
-       234, /* GL_COMBINE_RGB */
-       229, /* GL_COMBINE_ALPHA */
-      1353, /* GL_RGB_SCALE */
+       130, /* GL_CLIENT_ACTIVE_TEXTURE */
+       906, /* GL_MAX_TEXTURE_UNITS */
+      1702, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+      1705, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+      1707, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+      1699, /* GL_TRANSPOSE_COLOR_MATRIX */
+      1501, /* GL_SUBTRACT */
+       894, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
+       244, /* GL_COMPRESSED_ALPHA */
+       248, /* GL_COMPRESSED_LUMINANCE */
+       249, /* GL_COMPRESSED_LUMINANCE_ALPHA */
+       246, /* GL_COMPRESSED_INTENSITY */
+       252, /* GL_COMPRESSED_RGB */
+       253, /* GL_COMPRESSED_RGBA */
+      1620, /* GL_TEXTURE_COMPRESSION_HINT */
+      1682, /* GL_TEXTURE_RECTANGLE_ARB */
+      1592, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
+      1250, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
+       892, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
+       364, /* GL_DEPTH_STENCIL */
+      1727, /* GL_UNSIGNED_INT_24_8 */
+       902, /* GL_MAX_TEXTURE_LOD_BIAS */
+      1673, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+       903, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
+      1649, /* GL_TEXTURE_FILTER_CONTROL */
+      1664, /* GL_TEXTURE_LOD_BIAS */
+       229, /* GL_COMBINE4 */
+       896, /* GL_MAX_SHININESS_NV */
+       897, /* GL_MAX_SPOT_EXPONENT_NV */
+       612, /* GL_INCR_WRAP */
+       337, /* GL_DECR_WRAP */
+       948, /* GL_MODELVIEW1_ARB */
+      1004, /* GL_NORMAL_MAP */
+      1280, /* GL_REFLECTION_MAP */
+      1629, /* GL_TEXTURE_CUBE_MAP */
+      1590, /* GL_TEXTURE_BINDING_CUBE_MAP */
+      1637, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
+      1631, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
+      1639, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
+      1633, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
+      1641, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
+      1635, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
+      1248, /* GL_PROXY_TEXTURE_CUBE_MAP */
+       848, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
+       983, /* GL_MULTISAMPLE_FILTER_HINT_NV */
+       515, /* GL_FOG_DISTANCE_MODE_NV */
+       468, /* GL_EYE_RADIAL_NV */
+       467, /* GL_EYE_PLANE_ABSOLUTE_NV */
+       228, /* GL_COMBINE */
+       235, /* GL_COMBINE_RGB */
+       230, /* GL_COMBINE_ALPHA */
+      1347, /* GL_RGB_SCALE */
         24, /* GL_ADD_SIGNED */
-       652, /* GL_INTERPOLATE */
-       262, /* GL_CONSTANT */
-      1206, /* GL_PRIMARY_COLOR */
-      1203, /* GL_PREVIOUS */
-      1419, /* GL_SOURCE0_RGB */
-      1425, /* GL_SOURCE1_RGB */
-      1431, /* GL_SOURCE2_RGB */
-      1435, /* GL_SOURCE3_RGB_NV */
-      1416, /* GL_SOURCE0_ALPHA */
-      1422, /* GL_SOURCE1_ALPHA */
-      1428, /* GL_SOURCE2_ALPHA */
-      1434, /* GL_SOURCE3_ALPHA_NV */
-      1052, /* GL_OPERAND0_RGB */
-      1058, /* GL_OPERAND1_RGB */
-      1064, /* GL_OPERAND2_RGB */
-      1068, /* GL_OPERAND3_RGB_NV */
-      1049, /* GL_OPERAND0_ALPHA */
-      1055, /* GL_OPERAND1_ALPHA */
-      1061, /* GL_OPERAND2_ALPHA */
-      1067, /* GL_OPERAND3_ALPHA_NV */
-      1749, /* GL_VERTEX_ARRAY_BINDING_APPLE */
-      1813, /* GL_YCBCR_422_APPLE */
-      1738, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-      1740, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-      1410, /* GL_SLICE_ACCUM_SUN */
-      1263, /* GL_QUAD_MESH_SUN */
-      1709, /* GL_TRIANGLE_MESH_SUN */
-      1787, /* GL_VERTEX_PROGRAM_ARB */
-      1798, /* GL_VERTEX_STATE_PROGRAM_NV */
-      1774, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-      1780, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-      1782, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-      1784, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
-       322, /* GL_CURRENT_VERTEX_ATTRIB */
-      1219, /* GL_PROGRAM_LENGTH_ARB */
-      1233, /* GL_PROGRAM_STRING_ARB */
-       982, /* GL_MODELVIEW_PROJECTION_NV */
-       619, /* GL_IDENTITY_NV */
-       666, /* GL_INVERSE_NV */
-      1702, /* GL_TRANSPOSE_NV */
-       667, /* GL_INVERSE_TRANSPOSE_NV */
-       890, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
-       889, /* GL_MAX_PROGRAM_MATRICES_ARB */
-       797, /* GL_MATRIX0_NV */
-       809, /* GL_MATRIX1_NV */
-       821, /* GL_MATRIX2_NV */
-       825, /* GL_MATRIX3_NV */
-       827, /* GL_MATRIX4_NV */
-       829, /* GL_MATRIX5_NV */
-       831, /* GL_MATRIX6_NV */
-       833, /* GL_MATRIX7_NV */
-       307, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
-       304, /* GL_CURRENT_MATRIX_ARB */
-      1790, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-      1793, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-      1231, /* GL_PROGRAM_PARAMETER_NV */
-      1778, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-      1235, /* GL_PROGRAM_TARGET_NV */
-      1232, /* GL_PROGRAM_RESIDENT_NV */
-      1694, /* GL_TRACK_MATRIX_NV */
-      1695, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-      1788, /* GL_VERTEX_PROGRAM_BINDING_NV */
-      1213, /* GL_PROGRAM_ERROR_POSITION_ARB */
-       343, /* GL_DEPTH_CLAMP_NV */
-      1756, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-      1763, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-      1764, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-      1765, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-      1766, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-      1767, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-      1768, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-      1769, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-      1770, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-      1771, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-      1757, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-      1758, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-      1759, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-      1760, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-      1761, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-      1762, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
-       751, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
-       758, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
-       759, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
-       760, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
-       761, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
-       762, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
-       763, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
-       764, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
-       765, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
-       766, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
-       752, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
-       753, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
-       754, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
-       755, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
-       756, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
-       757, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
-       778, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
-       785, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
-       786, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
-       787, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
-       788, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
-       789, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
-       790, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
-      1212, /* GL_PROGRAM_BINDING_ARB */
-       792, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
-       793, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
-       779, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
-       780, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
-       781, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
-       782, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
-       783, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
-       784, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
-      1616, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-      1613, /* GL_TEXTURE_COMPRESSED */
-      1021, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
-       261, /* GL_COMPRESSED_TEXTURE_FORMATS */
-       930, /* GL_MAX_VERTEX_UNITS_ARB */
+       640, /* GL_INTERPOLATE */
+       267, /* GL_CONSTANT */
+      1198, /* GL_PRIMARY_COLOR */
+      1195, /* GL_PREVIOUS */
+      1418, /* GL_SOURCE0_RGB */
+      1424, /* GL_SOURCE1_RGB */
+      1430, /* GL_SOURCE2_RGB */
+      1434, /* GL_SOURCE3_RGB_NV */
+      1415, /* GL_SOURCE0_ALPHA */
+      1421, /* GL_SOURCE1_ALPHA */
+      1427, /* GL_SOURCE2_ALPHA */
+      1433, /* GL_SOURCE3_ALPHA_NV */
+      1040, /* GL_OPERAND0_RGB */
+      1046, /* GL_OPERAND1_RGB */
+      1052, /* GL_OPERAND2_RGB */
+      1056, /* GL_OPERAND3_RGB_NV */
+      1037, /* GL_OPERAND0_ALPHA */
+      1043, /* GL_OPERAND1_ALPHA */
+      1049, /* GL_OPERAND2_ALPHA */
+      1055, /* GL_OPERAND3_ALPHA_NV */
+      1751, /* GL_VERTEX_ARRAY_BINDING_APPLE */
+      1815, /* GL_YCBCR_422_APPLE */
+      1740, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+      1742, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+      1405, /* GL_SLICE_ACCUM_SUN */
+      1255, /* GL_QUAD_MESH_SUN */
+      1711, /* GL_TRIANGLE_MESH_SUN */
+      1789, /* GL_VERTEX_PROGRAM_ARB */
+      1800, /* GL_VERTEX_STATE_PROGRAM_NV */
+      1776, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+      1782, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+      1784, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+      1786, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+       328, /* GL_CURRENT_VERTEX_ATTRIB */
+      1211, /* GL_PROGRAM_LENGTH_ARB */
+      1225, /* GL_PROGRAM_STRING_ARB */
+       970, /* GL_MODELVIEW_PROJECTION_NV */
+       607, /* GL_IDENTITY_NV */
+       654, /* GL_INVERSE_NV */
+      1704, /* GL_TRANSPOSE_NV */
+       655, /* GL_INVERSE_TRANSPOSE_NV */
+       878, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
+       877, /* GL_MAX_PROGRAM_MATRICES_ARB */
+       785, /* GL_MATRIX0_NV */
+       797, /* GL_MATRIX1_NV */
+       809, /* GL_MATRIX2_NV */
+       813, /* GL_MATRIX3_NV */
+       815, /* GL_MATRIX4_NV */
+       817, /* GL_MATRIX5_NV */
+       819, /* GL_MATRIX6_NV */
+       821, /* GL_MATRIX7_NV */
+       312, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
+       309, /* GL_CURRENT_MATRIX_ARB */
+      1792, /* GL_VERTEX_PROGRAM_POINT_SIZE */
+      1795, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+      1223, /* GL_PROGRAM_PARAMETER_NV */
+      1780, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+      1227, /* GL_PROGRAM_TARGET_NV */
+      1224, /* GL_PROGRAM_RESIDENT_NV */
+      1696, /* GL_TRACK_MATRIX_NV */
+      1697, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+      1790, /* GL_VERTEX_PROGRAM_BINDING_NV */
+      1205, /* GL_PROGRAM_ERROR_POSITION_ARB */
+       349, /* GL_DEPTH_CLAMP_NV */
+      1758, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+      1765, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+      1766, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+      1767, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+      1768, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+      1769, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+      1770, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+      1771, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+      1772, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+      1773, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+      1759, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+      1760, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+      1761, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+      1762, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+      1763, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+      1764, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+       739, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
+       746, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
+       747, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
+       748, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
+       749, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
+       750, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
+       751, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
+       752, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
+       753, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
+       754, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
+       740, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
+       741, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
+       742, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
+       743, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
+       744, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
+       745, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
+       766, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
+       773, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
+       774, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
+       775, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
+       776, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
+       777, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
+       778, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
+      1204, /* GL_PROGRAM_BINDING_ARB */
+       780, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
+       781, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
+       767, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
+       768, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
+       769, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
+       770, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
+       771, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
+       772, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
+      1618, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
+      1615, /* GL_TEXTURE_COMPRESSED */
+      1009, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
+       266, /* GL_COMPRESSED_TEXTURE_FORMATS */
+       918, /* GL_MAX_VERTEX_UNITS_ARB */
         22, /* GL_ACTIVE_VERTEX_UNITS_ARB */
-      1808, /* GL_WEIGHT_SUM_UNITY_ARB */
-      1786, /* GL_VERTEX_BLEND_ARB */
-       324, /* GL_CURRENT_WEIGHT_ARB */
-      1807, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-      1806, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-      1805, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-      1804, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-      1801, /* GL_WEIGHT_ARRAY_ARB */
-       371, /* GL_DOT3_RGB */
-       372, /* GL_DOT3_RGBA */
-       259, /* GL_COMPRESSED_RGB_FXT1_3DFX */
-       254, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
-       990, /* GL_MULTISAMPLE_3DFX */
-      1374, /* GL_SAMPLE_BUFFERS_3DFX */
-      1365, /* GL_SAMPLES_3DFX */
-       971, /* GL_MODELVIEW2_ARB */
-       974, /* GL_MODELVIEW3_ARB */
-       975, /* GL_MODELVIEW4_ARB */
-       976, /* GL_MODELVIEW5_ARB */
-       977, /* GL_MODELVIEW6_ARB */
-       978, /* GL_MODELVIEW7_ARB */
-       979, /* GL_MODELVIEW8_ARB */
-       980, /* GL_MODELVIEW9_ARB */
-       950, /* GL_MODELVIEW10_ARB */
-       951, /* GL_MODELVIEW11_ARB */
-       952, /* GL_MODELVIEW12_ARB */
-       953, /* GL_MODELVIEW13_ARB */
-       954, /* GL_MODELVIEW14_ARB */
-       955, /* GL_MODELVIEW15_ARB */
-       956, /* GL_MODELVIEW16_ARB */
-       957, /* GL_MODELVIEW17_ARB */
-       958, /* GL_MODELVIEW18_ARB */
-       959, /* GL_MODELVIEW19_ARB */
-       961, /* GL_MODELVIEW20_ARB */
-       962, /* GL_MODELVIEW21_ARB */
-       963, /* GL_MODELVIEW22_ARB */
-       964, /* GL_MODELVIEW23_ARB */
-       965, /* GL_MODELVIEW24_ARB */
-       966, /* GL_MODELVIEW25_ARB */
-       967, /* GL_MODELVIEW26_ARB */
-       968, /* GL_MODELVIEW27_ARB */
-       969, /* GL_MODELVIEW28_ARB */
-       970, /* GL_MODELVIEW29_ARB */
-       972, /* GL_MODELVIEW30_ARB */
-       973, /* GL_MODELVIEW31_ARB */
-       376, /* GL_DOT3_RGB_EXT */
-       374, /* GL_DOT3_RGBA_EXT */
-       944, /* GL_MIRROR_CLAMP_EXT */
-       947, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
-       985, /* GL_MODULATE_ADD_ATI */
-       986, /* GL_MODULATE_SIGNED_ADD_ATI */
-       987, /* GL_MODULATE_SUBTRACT_ATI */
-      1814, /* GL_YCBCR_MESA */
-      1076, /* GL_PACK_INVERT_MESA */
-       327, /* GL_DEBUG_OBJECT_MESA */
-       328, /* GL_DEBUG_PRINT_MESA */
-       326, /* GL_DEBUG_ASSERT_MESA */
-       106, /* GL_BUFFER_SIZE */
-       108, /* GL_BUFFER_USAGE */
-       112, /* GL_BUMP_ROT_MATRIX_ATI */
-       113, /* GL_BUMP_ROT_MATRIX_SIZE_ATI */
-       111, /* GL_BUMP_NUM_TEX_UNITS_ATI */
-       115, /* GL_BUMP_TEX_UNITS_ATI */
-       435, /* GL_DUDV_ATI */
-       434, /* GL_DU8DV8_ATI */
-       110, /* GL_BUMP_ENVMAP_ATI */
-       114, /* GL_BUMP_TARGET_ATI */
-      1464, /* GL_STENCIL_BACK_FUNC */
-      1462, /* GL_STENCIL_BACK_FAIL */
-      1466, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-      1468, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
-       512, /* GL_FRAGMENT_PROGRAM_ARB */
-      1210, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
-      1238, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
-      1237, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
-      1222, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-      1228, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-      1227, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-       879, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
-       902, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
-       901, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
-       892, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-       898, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-       897, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-       862, /* GL_MAX_DRAW_BUFFERS */
-       380, /* GL_DRAW_BUFFER0 */
-       383, /* GL_DRAW_BUFFER1 */
-       404, /* GL_DRAW_BUFFER2 */
-       407, /* GL_DRAW_BUFFER3 */
-       410, /* GL_DRAW_BUFFER4 */
-       413, /* GL_DRAW_BUFFER5 */
-       416, /* GL_DRAW_BUFFER6 */
-       419, /* GL_DRAW_BUFFER7 */
-       422, /* GL_DRAW_BUFFER8 */
-       425, /* GL_DRAW_BUFFER9 */
-       384, /* GL_DRAW_BUFFER10 */
-       387, /* GL_DRAW_BUFFER11 */
-       390, /* GL_DRAW_BUFFER12 */
-       393, /* GL_DRAW_BUFFER13 */
-       396, /* GL_DRAW_BUFFER14 */
-       399, /* GL_DRAW_BUFFER15 */
+      1810, /* GL_WEIGHT_SUM_UNITY_ARB */
+      1788, /* GL_VERTEX_BLEND_ARB */
+       330, /* GL_CURRENT_WEIGHT_ARB */
+      1809, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+      1808, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+      1807, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+      1806, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+      1803, /* GL_WEIGHT_ARRAY_ARB */
+       377, /* GL_DOT3_RGB */
+       378, /* GL_DOT3_RGBA */
+       260, /* GL_COMPRESSED_RGB_FXT1_3DFX */
+       255, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
+       978, /* GL_MULTISAMPLE_3DFX */
+      1368, /* GL_SAMPLE_BUFFERS_3DFX */
+      1359, /* GL_SAMPLES_3DFX */
+       959, /* GL_MODELVIEW2_ARB */
+       962, /* GL_MODELVIEW3_ARB */
+       963, /* GL_MODELVIEW4_ARB */
+       964, /* GL_MODELVIEW5_ARB */
+       965, /* GL_MODELVIEW6_ARB */
+       966, /* GL_MODELVIEW7_ARB */
+       967, /* GL_MODELVIEW8_ARB */
+       968, /* GL_MODELVIEW9_ARB */
+       938, /* GL_MODELVIEW10_ARB */
+       939, /* GL_MODELVIEW11_ARB */
+       940, /* GL_MODELVIEW12_ARB */
+       941, /* GL_MODELVIEW13_ARB */
+       942, /* GL_MODELVIEW14_ARB */
+       943, /* GL_MODELVIEW15_ARB */
+       944, /* GL_MODELVIEW16_ARB */
+       945, /* GL_MODELVIEW17_ARB */
+       946, /* GL_MODELVIEW18_ARB */
+       947, /* GL_MODELVIEW19_ARB */
+       949, /* GL_MODELVIEW20_ARB */
+       950, /* GL_MODELVIEW21_ARB */
+       951, /* GL_MODELVIEW22_ARB */
+       952, /* GL_MODELVIEW23_ARB */
+       953, /* GL_MODELVIEW24_ARB */
+       954, /* GL_MODELVIEW25_ARB */
+       955, /* GL_MODELVIEW26_ARB */
+       956, /* GL_MODELVIEW27_ARB */
+       957, /* GL_MODELVIEW28_ARB */
+       958, /* GL_MODELVIEW29_ARB */
+       960, /* GL_MODELVIEW30_ARB */
+       961, /* GL_MODELVIEW31_ARB */
+       382, /* GL_DOT3_RGB_EXT */
+       380, /* GL_DOT3_RGBA_EXT */
+       932, /* GL_MIRROR_CLAMP_EXT */
+       935, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
+       973, /* GL_MODULATE_ADD_ATI */
+       974, /* GL_MODULATE_SIGNED_ADD_ATI */
+       975, /* GL_MODULATE_SUBTRACT_ATI */
+      1816, /* GL_YCBCR_MESA */
+      1064, /* GL_PACK_INVERT_MESA */
+       333, /* GL_DEBUG_OBJECT_MESA */
+       334, /* GL_DEBUG_PRINT_MESA */
+       332, /* GL_DEBUG_ASSERT_MESA */
+       107, /* GL_BUFFER_SIZE */
+       109, /* GL_BUFFER_USAGE */
+       113, /* GL_BUMP_ROT_MATRIX_ATI */
+       114, /* GL_BUMP_ROT_MATRIX_SIZE_ATI */
+       112, /* GL_BUMP_NUM_TEX_UNITS_ATI */
+       116, /* GL_BUMP_TEX_UNITS_ATI */
+       441, /* GL_DUDV_ATI */
+       440, /* GL_DU8DV8_ATI */
+       111, /* GL_BUMP_ENVMAP_ATI */
+       115, /* GL_BUMP_TARGET_ATI */
+      1466, /* GL_STENCIL_BACK_FUNC */
+      1464, /* GL_STENCIL_BACK_FAIL */
+      1468, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
+      1470, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
+       524, /* GL_FRAGMENT_PROGRAM_ARB */
+      1202, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
+      1230, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
+      1229, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
+      1214, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+      1220, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+      1219, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+       867, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
+       890, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
+       889, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
+       880, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+       886, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+       885, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+       850, /* GL_MAX_DRAW_BUFFERS */
+       386, /* GL_DRAW_BUFFER0 */
+       389, /* GL_DRAW_BUFFER1 */
+       410, /* GL_DRAW_BUFFER2 */
+       413, /* GL_DRAW_BUFFER3 */
+       416, /* GL_DRAW_BUFFER4 */
+       419, /* GL_DRAW_BUFFER5 */
+       422, /* GL_DRAW_BUFFER6 */
+       425, /* GL_DRAW_BUFFER7 */
+       428, /* GL_DRAW_BUFFER8 */
+       431, /* GL_DRAW_BUFFER9 */
+       390, /* GL_DRAW_BUFFER10 */
+       393, /* GL_DRAW_BUFFER11 */
+       396, /* GL_DRAW_BUFFER12 */
+       399, /* GL_DRAW_BUFFER13 */
+       402, /* GL_DRAW_BUFFER14 */
+       405, /* GL_DRAW_BUFFER15 */
         81, /* GL_BLEND_EQUATION_ALPHA */
-       842, /* GL_MATRIX_PALETTE_ARB */
-       873, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
-       876, /* GL_MAX_PALETTE_MATRICES_ARB */
-       310, /* GL_CURRENT_PALETTE_MATRIX_ARB */
-       836, /* GL_MATRIX_INDEX_ARRAY_ARB */
-       305, /* GL_CURRENT_MATRIX_INDEX_ARB */
-       838, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
-       840, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
-       839, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
-       837, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
-      1642, /* GL_TEXTURE_DEPTH_SIZE */
-       364, /* GL_DEPTH_TEXTURE_MODE */
-      1608, /* GL_TEXTURE_COMPARE_MODE */
-      1606, /* GL_TEXTURE_COMPARE_FUNC */
-       238, /* GL_COMPARE_R_TO_TEXTURE */
-      1144, /* GL_POINT_SPRITE */
-       287, /* GL_COORD_REPLACE */
-      1148, /* GL_POINT_SPRITE_R_MODE_NV */
-      1265, /* GL_QUERY_COUNTER_BITS */
-       312, /* GL_CURRENT_QUERY */
-      1267, /* GL_QUERY_RESULT */
-      1269, /* GL_QUERY_RESULT_AVAILABLE */
-       924, /* GL_MAX_VERTEX_ATTRIBS */
-      1776, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
-       362, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
-       361, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
-       910, /* GL_MAX_TEXTURE_COORDS */
-       912, /* GL_MAX_TEXTURE_IMAGE_UNITS */
-      1215, /* GL_PROGRAM_ERROR_STRING_ARB */
-      1217, /* GL_PROGRAM_FORMAT_ASCII_ARB */
-      1216, /* GL_PROGRAM_FORMAT_ARB */
-      1688, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
-       341, /* GL_DEPTH_BOUNDS_TEST_EXT */
-       340, /* GL_DEPTH_BOUNDS_EXT */
+       830, /* GL_MATRIX_PALETTE_ARB */
+       861, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
+       864, /* GL_MAX_PALETTE_MATRICES_ARB */
+       315, /* GL_CURRENT_PALETTE_MATRIX_ARB */
+       824, /* GL_MATRIX_INDEX_ARRAY_ARB */
+       310, /* GL_CURRENT_MATRIX_INDEX_ARB */
+       826, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
+       828, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
+       827, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
+       825, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
+      1644, /* GL_TEXTURE_DEPTH_SIZE */
+       370, /* GL_DEPTH_TEXTURE_MODE */
+      1610, /* GL_TEXTURE_COMPARE_MODE */
+      1608, /* GL_TEXTURE_COMPARE_FUNC */
+       239, /* GL_COMPARE_R_TO_TEXTURE */
+      1136, /* GL_POINT_SPRITE */
+       292, /* GL_COORD_REPLACE */
+      1140, /* GL_POINT_SPRITE_R_MODE_NV */
+      1257, /* GL_QUERY_COUNTER_BITS */
+       317, /* GL_CURRENT_QUERY */
+      1259, /* GL_QUERY_RESULT */
+      1261, /* GL_QUERY_RESULT_AVAILABLE */
+       912, /* GL_MAX_VERTEX_ATTRIBS */
+      1778, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+       368, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
+       367, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
+       898, /* GL_MAX_TEXTURE_COORDS */
+       900, /* GL_MAX_TEXTURE_IMAGE_UNITS */
+      1207, /* GL_PROGRAM_ERROR_STRING_ARB */
+      1209, /* GL_PROGRAM_FORMAT_ASCII_ARB */
+      1208, /* GL_PROGRAM_FORMAT_ARB */
+      1690, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+       347, /* GL_DEPTH_BOUNDS_TEST_EXT */
+       346, /* GL_DEPTH_BOUNDS_EXT */
         52, /* GL_ARRAY_BUFFER */
-       448, /* GL_ELEMENT_ARRAY_BUFFER */
+       454, /* GL_ELEMENT_ARRAY_BUFFER */
         53, /* GL_ARRAY_BUFFER_BINDING */
-       449, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
-      1750, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-      1011, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
-       145, /* GL_COLOR_ARRAY_BUFFER_BINDING */
-       628, /* GL_INDEX_ARRAY_BUFFER_BINDING */
-      1621, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
-       444, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
-      1386, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
-       490, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
-      1802, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-      1772, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-      1218, /* GL_PROGRAM_INSTRUCTIONS_ARB */
-       885, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
-      1224, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-       894, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-      1236, /* GL_PROGRAM_TEMPORARIES_ARB */
-       900, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
-      1226, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
-       896, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
-      1230, /* GL_PROGRAM_PARAMETERS_ARB */
-       899, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
-      1225, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
-       895, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
-      1211, /* GL_PROGRAM_ATTRIBS_ARB */
-       880, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
-      1223, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
-       893, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
-      1209, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
-       878, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
-      1221, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-       891, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-       886, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
-       882, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
-      1239, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-      1699, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-      1278, /* GL_READ_ONLY */
-      1810, /* GL_WRITE_ONLY */
-      1280, /* GL_READ_WRITE */
-       100, /* GL_BUFFER_ACCESS */
-       102, /* GL_BUFFER_MAPPED */
-       104, /* GL_BUFFER_MAP_POINTER */
-      1693, /* GL_TIME_ELAPSED_EXT */
-       796, /* GL_MATRIX0_ARB */
-       808, /* GL_MATRIX1_ARB */
-       820, /* GL_MATRIX2_ARB */
-       824, /* GL_MATRIX3_ARB */
-       826, /* GL_MATRIX4_ARB */
-       828, /* GL_MATRIX5_ARB */
-       830, /* GL_MATRIX6_ARB */
-       832, /* GL_MATRIX7_ARB */
-       834, /* GL_MATRIX8_ARB */
-       835, /* GL_MATRIX9_ARB */
-       798, /* GL_MATRIX10_ARB */
-       799, /* GL_MATRIX11_ARB */
-       800, /* GL_MATRIX12_ARB */
-       801, /* GL_MATRIX13_ARB */
-       802, /* GL_MATRIX14_ARB */
-       803, /* GL_MATRIX15_ARB */
-       804, /* GL_MATRIX16_ARB */
-       805, /* GL_MATRIX17_ARB */
-       806, /* GL_MATRIX18_ARB */
-       807, /* GL_MATRIX19_ARB */
-       810, /* GL_MATRIX20_ARB */
-       811, /* GL_MATRIX21_ARB */
-       812, /* GL_MATRIX22_ARB */
-       813, /* GL_MATRIX23_ARB */
-       814, /* GL_MATRIX24_ARB */
-       815, /* GL_MATRIX25_ARB */
-       816, /* GL_MATRIX26_ARB */
-       817, /* GL_MATRIX27_ARB */
-       818, /* GL_MATRIX28_ARB */
-       819, /* GL_MATRIX29_ARB */
-       822, /* GL_MATRIX30_ARB */
-       823, /* GL_MATRIX31_ARB */
-      1494, /* GL_STREAM_DRAW */
-      1496, /* GL_STREAM_READ */
-      1492, /* GL_STREAM_COPY */
-      1455, /* GL_STATIC_DRAW */
-      1457, /* GL_STATIC_READ */
-      1453, /* GL_STATIC_COPY */
-       438, /* GL_DYNAMIC_DRAW */
-       440, /* GL_DYNAMIC_READ */
-       436, /* GL_DYNAMIC_COPY */
-       583, /* GL_GL_PIXEL_PACK_BUFFER */
-       585, /* GL_GL_PIXEL_UNPACK_BUFFER */
-       584, /* GL_GL_PIXEL_PACK_BUFFER_BINDING */
-       586, /* GL_GL_PIXEL_UNPACK_BUFFER_BINDING */
-       335, /* GL_DEPTH24_STENCIL8 */
-      1686, /* GL_TEXTURE_STENCIL_SIZE */
-       883, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
-       881, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
-       884, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
-       888, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
-       887, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
-       845, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
-      1488, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
+       455, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
+      1752, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+       999, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
+       146, /* GL_COLOR_ARRAY_BUFFER_BINDING */
+       616, /* GL_INDEX_ARRAY_BUFFER_BINDING */
+      1623, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
+       450, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
+      1380, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
+       502, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
+      1804, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+      1774, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+      1210, /* GL_PROGRAM_INSTRUCTIONS_ARB */
+       873, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
+      1216, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+       882, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+      1228, /* GL_PROGRAM_TEMPORARIES_ARB */
+       888, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
+      1218, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
+       884, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
+      1222, /* GL_PROGRAM_PARAMETERS_ARB */
+       887, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
+      1217, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
+       883, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
+      1203, /* GL_PROGRAM_ATTRIBS_ARB */
+       868, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
+      1215, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
+       881, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
+      1201, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
+       866, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
+      1213, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+       879, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+       874, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
+       870, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
+      1231, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
+      1701, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+      1270, /* GL_READ_ONLY */
+      1812, /* GL_WRITE_ONLY */
+      1272, /* GL_READ_WRITE */
+       101, /* GL_BUFFER_ACCESS */
+       103, /* GL_BUFFER_MAPPED */
+       105, /* GL_BUFFER_MAP_POINTER */
+      1695, /* GL_TIME_ELAPSED_EXT */
+       784, /* GL_MATRIX0_ARB */
+       796, /* GL_MATRIX1_ARB */
+       808, /* GL_MATRIX2_ARB */
+       812, /* GL_MATRIX3_ARB */
+       814, /* GL_MATRIX4_ARB */
+       816, /* GL_MATRIX5_ARB */
+       818, /* GL_MATRIX6_ARB */
+       820, /* GL_MATRIX7_ARB */
+       822, /* GL_MATRIX8_ARB */
+       823, /* GL_MATRIX9_ARB */
+       786, /* GL_MATRIX10_ARB */
+       787, /* GL_MATRIX11_ARB */
+       788, /* GL_MATRIX12_ARB */
+       789, /* GL_MATRIX13_ARB */
+       790, /* GL_MATRIX14_ARB */
+       791, /* GL_MATRIX15_ARB */
+       792, /* GL_MATRIX16_ARB */
+       793, /* GL_MATRIX17_ARB */
+       794, /* GL_MATRIX18_ARB */
+       795, /* GL_MATRIX19_ARB */
+       798, /* GL_MATRIX20_ARB */
+       799, /* GL_MATRIX21_ARB */
+       800, /* GL_MATRIX22_ARB */
+       801, /* GL_MATRIX23_ARB */
+       802, /* GL_MATRIX24_ARB */
+       803, /* GL_MATRIX25_ARB */
+       804, /* GL_MATRIX26_ARB */
+       805, /* GL_MATRIX27_ARB */
+       806, /* GL_MATRIX28_ARB */
+       807, /* GL_MATRIX29_ARB */
+       810, /* GL_MATRIX30_ARB */
+       811, /* GL_MATRIX31_ARB */
+      1496, /* GL_STREAM_DRAW */
+      1498, /* GL_STREAM_READ */
+      1494, /* GL_STREAM_COPY */
+      1457, /* GL_STATIC_DRAW */
+      1459, /* GL_STATIC_READ */
+      1455, /* GL_STATIC_COPY */
+       444, /* GL_DYNAMIC_DRAW */
+       446, /* GL_DYNAMIC_READ */
+       442, /* GL_DYNAMIC_COPY */
+      1104, /* GL_PIXEL_PACK_BUFFER */
+      1108, /* GL_PIXEL_UNPACK_BUFFER */
+      1105, /* GL_PIXEL_PACK_BUFFER_BINDING */
+      1109, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
+       341, /* GL_DEPTH24_STENCIL8 */
+      1688, /* GL_TEXTURE_STENCIL_SIZE */
+       871, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
+       869, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
+       872, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
+       876, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
+       875, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
+       833, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
+      1490, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
         17, /* GL_ACTIVE_STENCIL_FACE_EXT */
-       945, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
-      1367, /* GL_SAMPLES_PASSED */
-       513, /* GL_FRAGMENT_SHADER */
-      1796, /* GL_VERTEX_SHADER */
-      1229, /* GL_PROGRAM_OBJECT_ARB */
-      1399, /* GL_SHADER_OBJECT_ARB */
-       869, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
-       928, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
-       922, /* GL_MAX_VARYING_FLOATS */
-       926, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
-       854, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
-      1036, /* GL_OBJECT_TYPE_ARB */
-      1401, /* GL_SHADER_TYPE */
-       478, /* GL_FLOAT_VEC2 */
-       480, /* GL_FLOAT_VEC3 */
-       482, /* GL_FLOAT_VEC4 */
-       655, /* GL_INT_VEC2 */
-       657, /* GL_INT_VEC3 */
-       659, /* GL_INT_VEC4 */
-        92, /* GL_BOOL */
-        94, /* GL_BOOL_VEC2 */
-        96, /* GL_BOOL_VEC3 */
-        98, /* GL_BOOL_VEC4 */
-       472, /* GL_FLOAT_MAT2 */
-       474, /* GL_FLOAT_MAT3 */
-       476, /* GL_FLOAT_MAT4 */
-      1358, /* GL_SAMPLER_1D */
-      1360, /* GL_SAMPLER_2D */
-      1362, /* GL_SAMPLER_3D */
-      1363, /* GL_SAMPLER_CUBE */
-      1359, /* GL_SAMPLER_1D_SHADOW */
-      1361, /* GL_SAMPLER_2D_SHADOW */
-       577, /* GL_GL_FLOAT_MAT2x3 */
-       578, /* GL_GL_FLOAT_MAT2x4 */
-       579, /* GL_GL_FLOAT_MAT3x2 */
-       580, /* GL_GL_FLOAT_MAT3x4 */
-       581, /* GL_GL_FLOAT_MAT4x2 */
-       582, /* GL_GL_FLOAT_MAT4x3 */
-       333, /* GL_DELETE_STATUS */
-       242, /* GL_COMPILE_STATUS */
-       709, /* GL_LINK_STATUS */
-      1745, /* GL_VALIDATE_STATUS */
-       640, /* GL_INFO_LOG_LENGTH */
+       933, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
+      1361, /* GL_SAMPLES_PASSED */
+       525, /* GL_FRAGMENT_SHADER */
+      1798, /* GL_VERTEX_SHADER */
+      1221, /* GL_PROGRAM_OBJECT_ARB */
+      1393, /* GL_SHADER_OBJECT_ARB */
+       857, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
+       916, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
+       910, /* GL_MAX_VARYING_FLOATS */
+       914, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
+       842, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
+      1024, /* GL_OBJECT_TYPE_ARB */
+      1395, /* GL_SHADER_TYPE */
+       490, /* GL_FLOAT_VEC2 */
+       492, /* GL_FLOAT_VEC3 */
+       494, /* GL_FLOAT_VEC4 */
+       643, /* GL_INT_VEC2 */
+       645, /* GL_INT_VEC3 */
+       647, /* GL_INT_VEC4 */
+        93, /* GL_BOOL */
+        95, /* GL_BOOL_VEC2 */
+        97, /* GL_BOOL_VEC3 */
+        99, /* GL_BOOL_VEC4 */
+       478, /* GL_FLOAT_MAT2 */
+       482, /* GL_FLOAT_MAT3 */
+       486, /* GL_FLOAT_MAT4 */
+      1352, /* GL_SAMPLER_1D */
+      1354, /* GL_SAMPLER_2D */
+      1356, /* GL_SAMPLER_3D */
+      1357, /* GL_SAMPLER_CUBE */
+      1353, /* GL_SAMPLER_1D_SHADOW */
+      1355, /* GL_SAMPLER_2D_SHADOW */
+       480, /* GL_FLOAT_MAT2x3 */
+       481, /* GL_FLOAT_MAT2x4 */
+       484, /* GL_FLOAT_MAT3x2 */
+       485, /* GL_FLOAT_MAT3x4 */
+       488, /* GL_FLOAT_MAT4x2 */
+       489, /* GL_FLOAT_MAT4x3 */
+       339, /* GL_DELETE_STATUS */
+       243, /* GL_COMPILE_STATUS */
+       697, /* GL_LINK_STATUS */
+      1747, /* GL_VALIDATE_STATUS */
+       628, /* GL_INFO_LOG_LENGTH */
         55, /* GL_ATTACHED_SHADERS */
         20, /* GL_ACTIVE_UNIFORMS */
         21, /* GL_ACTIVE_UNIFORM_MAX_LENGTH */
-      1400, /* GL_SHADER_SOURCE_LENGTH */
+      1394, /* GL_SHADER_SOURCE_LENGTH */
         15, /* GL_ACTIVE_ATTRIBUTES */
         16, /* GL_ACTIVE_ATTRIBUTE_MAX_LENGTH */
-       515, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
-      1403, /* GL_SHADING_LANGUAGE_VERSION */
-       311, /* GL_CURRENT_PROGRAM */
-      1085, /* GL_PALETTE4_RGB8_OES */
-      1087, /* GL_PALETTE4_RGBA8_OES */
-      1083, /* GL_PALETTE4_R5_G6_B5_OES */
-      1086, /* GL_PALETTE4_RGBA4_OES */
-      1084, /* GL_PALETTE4_RGB5_A1_OES */
-      1090, /* GL_PALETTE8_RGB8_OES */
-      1092, /* GL_PALETTE8_RGBA8_OES */
-      1088, /* GL_PALETTE8_R5_G6_B5_OES */
-      1091, /* GL_PALETTE8_RGBA4_OES */
-      1089, /* GL_PALETTE8_RGB5_A1_OES */
-       622, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
-       621, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
-      1730, /* GL_UNSIGNED_NORMALIZED */
-      1576, /* GL_TEXTURE_1D_ARRAY_EXT */
-      1249, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
-      1578, /* GL_TEXTURE_2D_ARRAY_EXT */
-      1252, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
-      1584, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
-      1586, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
-       591, /* GL_GL_SRGB */
-       592, /* GL_GL_SRGB8 */
-       594, /* GL_GL_SRGB_ALPHA */
-       593, /* GL_GL_SRGB8_ALPHA8 */
-       590, /* GL_GL_SLUMINANCE_ALPHA */
-       589, /* GL_GL_SLUMINANCE8_ALPHA8 */
-       587, /* GL_GL_SLUMINANCE */
-       588, /* GL_GL_SLUMINANCE8 */
-       574, /* GL_GL_COMPRESSED_SRGB */
-       575, /* GL_GL_COMPRESSED_SRGB_ALPHA */
-       572, /* GL_GL_COMPRESSED_SLUMINANCE */
-       573, /* GL_GL_COMPRESSED_SLUMINANCE_ALPHA */
-      1146, /* GL_POINT_SPRITE_COORD_ORIGIN */
-       717, /* GL_LOWER_LEFT */
-      1742, /* GL_UPPER_LEFT */
-      1470, /* GL_STENCIL_BACK_REF */
-      1471, /* GL_STENCIL_BACK_VALUE_MASK */
-      1472, /* GL_STENCIL_BACK_WRITEMASK */
-       429, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
-      1294, /* GL_RENDERBUFFER_BINDING_EXT */
-      1275, /* GL_READ_FRAMEBUFFER */
-       428, /* GL_DRAW_FRAMEBUFFER */
-      1276, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
-      1304, /* GL_RENDERBUFFER_SAMPLES */
-       525, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
-       523, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
-       534, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
-       530, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
-       532, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
-       537, /* GL_FRAMEBUFFER_COMPLETE */
-       541, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
-       547, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
-       545, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
-       543, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
-       546, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
-       544, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
-       550, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
-       553, /* GL_FRAMEBUFFER_UNSUPPORTED */
-       551, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
-       851, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
-       151, /* GL_COLOR_ATTACHMENT0 */
-       153, /* GL_COLOR_ATTACHMENT1 */
-       167, /* GL_COLOR_ATTACHMENT2 */
-       169, /* GL_COLOR_ATTACHMENT3 */
-       171, /* GL_COLOR_ATTACHMENT4 */
-       173, /* GL_COLOR_ATTACHMENT5 */
-       175, /* GL_COLOR_ATTACHMENT6 */
-       177, /* GL_COLOR_ATTACHMENT7 */
-       179, /* GL_COLOR_ATTACHMENT8 */
-       181, /* GL_COLOR_ATTACHMENT9 */
-       154, /* GL_COLOR_ATTACHMENT10 */
-       156, /* GL_COLOR_ATTACHMENT11 */
-       158, /* GL_COLOR_ATTACHMENT12 */
-       160, /* GL_COLOR_ATTACHMENT13 */
-       162, /* GL_COLOR_ATTACHMENT14 */
-       164, /* GL_COLOR_ATTACHMENT15 */
-       336, /* GL_DEPTH_ATTACHMENT */
-      1460, /* GL_STENCIL_ATTACHMENT */
-       516, /* GL_FRAMEBUFFER */
-      1292, /* GL_RENDERBUFFER */
-      1306, /* GL_RENDERBUFFER_WIDTH */
-      1299, /* GL_RENDERBUFFER_HEIGHT */
-      1301, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
-      1483, /* GL_STENCIL_INDEX_EXT */
-      1480, /* GL_STENCIL_INDEX1_EXT */
-      1481, /* GL_STENCIL_INDEX4_EXT */
-      1482, /* GL_STENCIL_INDEX8_EXT */
-      1479, /* GL_STENCIL_INDEX16_EXT */
-      1303, /* GL_RENDERBUFFER_RED_SIZE */
-      1298, /* GL_RENDERBUFFER_GREEN_SIZE */
-      1295, /* GL_RENDERBUFFER_BLUE_SIZE */
-      1293, /* GL_RENDERBUFFER_ALPHA_SIZE */
-      1296, /* GL_RENDERBUFFER_DEPTH_SIZE */
-      1305, /* GL_RENDERBUFFER_STENCIL_SIZE */
-       549, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
-       907, /* GL_MAX_SAMPLES */
-       455, /* GL_EVAL_BIT */
-      1273, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
-       711, /* GL_LIST_BIT */
-      1592, /* GL_TEXTURE_BIT */
-      1382, /* GL_SCISSOR_BIT */
+       527, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
+      1397, /* GL_SHADING_LANGUAGE_VERSION */
+       316, /* GL_CURRENT_PROGRAM */
+      1073, /* GL_PALETTE4_RGB8_OES */
+      1075, /* GL_PALETTE4_RGBA8_OES */
+      1071, /* GL_PALETTE4_R5_G6_B5_OES */
+      1074, /* GL_PALETTE4_RGBA4_OES */
+      1072, /* GL_PALETTE4_RGB5_A1_OES */
+      1078, /* GL_PALETTE8_RGB8_OES */
+      1080, /* GL_PALETTE8_RGBA8_OES */
+      1076, /* GL_PALETTE8_R5_G6_B5_OES */
+      1079, /* GL_PALETTE8_RGBA4_OES */
+      1077, /* GL_PALETTE8_RGB5_A1_OES */
+       610, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
+       609, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
+      1732, /* GL_UNSIGNED_NORMALIZED */
+      1578, /* GL_TEXTURE_1D_ARRAY_EXT */
+      1241, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
+      1580, /* GL_TEXTURE_2D_ARRAY_EXT */
+      1244, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
+      1586, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
+      1588, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
+      1449, /* GL_SRGB */
+      1450, /* GL_SRGB8 */
+      1452, /* GL_SRGB_ALPHA */
+      1451, /* GL_SRGB8_ALPHA8 */
+      1409, /* GL_SLUMINANCE_ALPHA */
+      1408, /* GL_SLUMINANCE8_ALPHA8 */
+      1406, /* GL_SLUMINANCE */
+      1407, /* GL_SLUMINANCE8 */
+       264, /* GL_COMPRESSED_SRGB */
+       265, /* GL_COMPRESSED_SRGB_ALPHA */
+       262, /* GL_COMPRESSED_SLUMINANCE */
+       263, /* GL_COMPRESSED_SLUMINANCE_ALPHA */
+      1138, /* GL_POINT_SPRITE_COORD_ORIGIN */
+       705, /* GL_LOWER_LEFT */
+      1744, /* GL_UPPER_LEFT */
+      1472, /* GL_STENCIL_BACK_REF */
+      1473, /* GL_STENCIL_BACK_VALUE_MASK */
+      1474, /* GL_STENCIL_BACK_WRITEMASK */
+       435, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
+      1286, /* GL_RENDERBUFFER_BINDING_EXT */
+      1267, /* GL_READ_FRAMEBUFFER */
+       434, /* GL_DRAW_FRAMEBUFFER */
+      1268, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
+      1296, /* GL_RENDERBUFFER_SAMPLES */
+       537, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
+       535, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
+       546, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
+       542, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
+       544, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+       549, /* GL_FRAMEBUFFER_COMPLETE */
+       553, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
+       559, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
+       557, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
+       555, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
+       558, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
+       556, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
+       562, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
+       565, /* GL_FRAMEBUFFER_UNSUPPORTED */
+       563, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
+       839, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
+       152, /* GL_COLOR_ATTACHMENT0 */
+       154, /* GL_COLOR_ATTACHMENT1 */
+       168, /* GL_COLOR_ATTACHMENT2 */
+       170, /* GL_COLOR_ATTACHMENT3 */
+       172, /* GL_COLOR_ATTACHMENT4 */
+       174, /* GL_COLOR_ATTACHMENT5 */
+       176, /* GL_COLOR_ATTACHMENT6 */
+       178, /* GL_COLOR_ATTACHMENT7 */
+       180, /* GL_COLOR_ATTACHMENT8 */
+       182, /* GL_COLOR_ATTACHMENT9 */
+       155, /* GL_COLOR_ATTACHMENT10 */
+       157, /* GL_COLOR_ATTACHMENT11 */
+       159, /* GL_COLOR_ATTACHMENT12 */
+       161, /* GL_COLOR_ATTACHMENT13 */
+       163, /* GL_COLOR_ATTACHMENT14 */
+       165, /* GL_COLOR_ATTACHMENT15 */
+       342, /* GL_DEPTH_ATTACHMENT */
+      1462, /* GL_STENCIL_ATTACHMENT */
+       528, /* GL_FRAMEBUFFER */
+      1284, /* GL_RENDERBUFFER */
+      1298, /* GL_RENDERBUFFER_WIDTH */
+      1291, /* GL_RENDERBUFFER_HEIGHT */
+      1293, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
+      1485, /* GL_STENCIL_INDEX_EXT */
+      1482, /* GL_STENCIL_INDEX1_EXT */
+      1483, /* GL_STENCIL_INDEX4_EXT */
+      1484, /* GL_STENCIL_INDEX8_EXT */
+      1481, /* GL_STENCIL_INDEX16_EXT */
+      1295, /* GL_RENDERBUFFER_RED_SIZE */
+      1290, /* GL_RENDERBUFFER_GREEN_SIZE */
+      1287, /* GL_RENDERBUFFER_BLUE_SIZE */
+      1285, /* GL_RENDERBUFFER_ALPHA_SIZE */
+      1288, /* GL_RENDERBUFFER_DEPTH_SIZE */
+      1297, /* GL_RENDERBUFFER_STENCIL_SIZE */
+       561, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
+       895, /* GL_MAX_SAMPLES */
+      1345, /* GL_RGBA_SNORM */
+      1341, /* GL_RGBA8_SNORM */
+      1402, /* GL_SIGNED_NORMALIZED */
+       461, /* GL_EVAL_BIT */
+      1265, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
+       699, /* GL_LIST_BIT */
+      1594, /* GL_TEXTURE_BIT */
+      1376, /* GL_SCISSOR_BIT */
         29, /* GL_ALL_ATTRIB_BITS */
-       992, /* GL_MULTISAMPLE_BIT */
+       980, /* GL_MULTISAMPLE_BIT */
         30, /* GL_ALL_CLIENT_ATTRIB_BITS */
 };
 
-- 
cgit v1.2.3


From bb386a1ecae6d7f805af44df463b0e4d661eef85 Mon Sep 17 00:00:00 2001
From: Roland Scheidegger <sroland@vmware.com>
Date: Fri, 27 Mar 2009 21:59:33 +0100
Subject: mesa: add _rev signed rgba texture format

---
 src/mesa/main/texformat.c     | 25 +++++++++++++++++++++++++
 src/mesa/main/texformat.h     |  4 +++-
 src/mesa/main/texformat_tmp.h | 23 ++++++++++++++++++++++-
 src/mesa/main/texstore.c      | 31 ++++++++++++++++++++++++++++---
 4 files changed, 78 insertions(+), 5 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c
index 0ceaaf3ece..ee531c45c6 100644
--- a/src/mesa/main/texformat.c
+++ b/src/mesa/main/texformat.c
@@ -746,6 +746,30 @@ const struct gl_texture_format _mesa_texformat_signed_rgba8888 = {
    store_texel_signed_rgba8888		/* StoreTexel */
 };
 
+const struct gl_texture_format _mesa_texformat_signed_rgba8888_rev = {
+   MESA_FORMAT_SIGNED_RGBA8888_REV,	/* MesaFormat */
+   GL_RGBA,				/* BaseFormat */
+   GL_SIGNED_NORMALIZED,		/* DataType */
+   8,					/* RedBits */
+   8,					/* GreenBits */
+   8,					/* BlueBits */
+   8,					/* AlphaBits */
+   0,					/* LuminanceBits */
+   0,					/* IntensityBits */
+   0,					/* IndexBits */
+   0,					/* DepthBits */
+   0,					/* StencilBits */
+   4,					/* TexelBytes */
+   _mesa_texstore_signed_rgba8888,	/* StoreTexImageFunc */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel2D */
+   NULL,				/* FetchTexel3D */
+   fetch_texel_1d_signed_rgba8888_rev,	/* FetchTexel1Df */
+   fetch_texel_2d_signed_rgba8888_rev,	/* FetchTexel2Df */
+   fetch_texel_3d_signed_rgba8888_rev,	/* FetchTexel3Df */
+   store_texel_signed_rgba8888_rev		/* StoreTexel */
+};
+
 /*@}*/
 
 
@@ -1854,6 +1878,7 @@ _mesa_format_to_type_and_comps(const struct gl_texture_format *format,
       return;
 
    case MESA_FORMAT_SIGNED_RGBA8888:
+   case MESA_FORMAT_SIGNED_RGBA8888_REV:
       *datatype = GL_BYTE;
       *comps = 4;
       return;
diff --git a/src/mesa/main/texformat.h b/src/mesa/main/texformat.h
index 3a08339adf..5aa1d756cb 100644
--- a/src/mesa/main/texformat.h
+++ b/src/mesa/main/texformat.h
@@ -169,7 +169,8 @@ enum _format {
     */
    /*@{*/
    MESA_FORMAT_DUDV8,
-   MESA_FORMAT_SIGNED_RGBA8888
+   MESA_FORMAT_SIGNED_RGBA8888,
+   MESA_FORMAT_SIGNED_RGBA8888_REV
    /*@}*/
 };
 
@@ -221,6 +222,7 @@ extern const struct gl_texture_format _mesa_texformat_intensity_float16;
 /*@{*/
 extern const struct gl_texture_format _mesa_texformat_dudv8;
 extern const struct gl_texture_format _mesa_texformat_signed_rgba8888;
+extern const struct gl_texture_format _mesa_texformat_signed_rgba8888_rev;
 /*@}*/
 
 /** \name Assorted hardware-friendly formats */
diff --git a/src/mesa/main/texformat_tmp.h b/src/mesa/main/texformat_tmp.h
index 604b1a744c..ae57baf922 100644
--- a/src/mesa/main/texformat_tmp.h
+++ b/src/mesa/main/texformat_tmp.h
@@ -1321,7 +1321,7 @@ static void FETCH(dudv8)(const struct gl_texture_image *texImage,
    texel[ACOMP] = 0;
 }
 
-/* MESA_FORMAT_SIGNED_ARGB8888 ***********************************************/
+/* MESA_FORMAT_SIGNED_RGBA8888 ***********************************************/
 
 static void FETCH(signed_rgba8888)( const struct gl_texture_image *texImage,
 			            GLint i, GLint j, GLint k, GLfloat *texel )
@@ -1343,6 +1343,27 @@ static void store_texel_signed_rgba8888(struct gl_texture_image *texImage,
 }
 #endif
 
+static void FETCH(signed_rgba8888_rev)( const struct gl_texture_image *texImage,
+                                        GLint i, GLint j, GLint k, GLfloat *texel )
+{
+   const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
+   texel[RCOMP] = BYTE_TO_FLOAT_TEX( (s      ) & 0xff );
+   texel[GCOMP] = BYTE_TO_FLOAT_TEX( (s >>  8) & 0xff );
+   texel[BCOMP] = BYTE_TO_FLOAT_TEX( (s >> 16) & 0xff );
+   texel[ACOMP] = BYTE_TO_FLOAT_TEX( (s >> 24)        );
+}
+
+#if DIM == 3
+static void store_texel_signed_rgba8888_rev(struct gl_texture_image *texImage,
+                                            GLint i, GLint j, GLint k, const void *texel)
+{
+   const GLubyte *rgba = (const GLubyte *) texel;
+   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
+   *dst = PACK_COLOR_8888_REV(rgba[RCOMP], rgba[GCOMP], rgba[BCOMP], rgba[ACOMP]);
+}
+#endif
+
+
 
 /* MESA_FORMAT_YCBCR *********************************************************/
 
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index 785fb50622..7e7e0ac07a 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -2564,14 +2564,15 @@ _mesa_texstore_dudv8(TEXSTORE_PARAMS)
 }
 
 /**
- * Store a texture in MESA_FORMAT_RGBA8888 or MESA_FORMAT_RGBA8888_REV.
+ * Store a texture in MESA_FORMAT_SIGNED_RGBA8888 or MESA_FORMAT_SIGNED_RGBA8888_REV
  */
 GLboolean
 _mesa_texstore_signed_rgba8888(TEXSTORE_PARAMS)
 {
    const GLboolean littleEndian = _mesa_little_endian();
 
-   ASSERT(dstFormat == &_mesa_texformat_signed_rgba8888);
+   ASSERT(dstFormat == &_mesa_texformat_signed_rgba8888 ||
+          dstFormat == &_mesa_texformat_signed_rgba8888_rev);
    ASSERT(dstFormat->TexelBytes == 4);
 
    if (!ctx->_ImageTransferState &&
@@ -2588,6 +2589,20 @@ _mesa_texstore_signed_rgba8888(TEXSTORE_PARAMS)
                      srcWidth, srcHeight, srcDepth, srcFormat, srcType,
                      srcAddr, srcPacking);
    }
+   else if (!ctx->_ImageTransferState &&
+       !srcPacking->SwapBytes &&
+       dstFormat == &_mesa_texformat_signed_rgba8888_rev &&
+       baseInternalFormat == GL_RGBA &&
+      ((srcFormat == GL_RGBA && srcType == GL_BYTE && littleEndian) ||
+       (srcFormat == GL_ABGR_EXT && srcType == GL_BYTE && !littleEndian))) {
+      /* simple memcpy path */
+      memcpy_texture(ctx, dims,
+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
+                     dstRowStride,
+                     dstImageOffsets,
+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
+                     srcAddr, srcPacking);
+   }
    else if (!ctx->_ImageTransferState &&
 	    (srcType == GL_BYTE) &&
 	    can_swizzle(baseInternalFormat) &&
@@ -2597,7 +2612,8 @@ _mesa_texstore_signed_rgba8888(TEXSTORE_PARAMS)
 
       /* dstmap - how to swizzle from RGBA to dst format:
        */
-      if (littleEndian && dstFormat == &_mesa_texformat_signed_rgba8888) {
+      if ((littleEndian && dstFormat == &_mesa_texformat_signed_rgba8888) ||
+	  (!littleEndian && dstFormat == &_mesa_texformat_signed_rgba8888_rev)) {
 	 dstmap[3] = 0;
 	 dstmap[2] = 1;
 	 dstmap[1] = 2;
@@ -2649,6 +2665,15 @@ _mesa_texstore_signed_rgba8888(TEXSTORE_PARAMS)
                   srcRow += 4;
                }
             }
+            else {
+               for (col = 0; col < srcWidth; col++) {
+                  dstUI[col] = PACK_COLOR_8888_REV( FLOAT_TO_BYTE_TEX(srcRow[RCOMP]),
+                                                    FLOAT_TO_BYTE_TEX(srcRow[GCOMP]),
+                                                    FLOAT_TO_BYTE_TEX(srcRow[BCOMP]),
+                                                    FLOAT_TO_BYTE_TEX(srcRow[ACOMP]) );
+                  srcRow += 4;
+               }
+            }
             dstRow += dstRowStride;
          }
       }
-- 
cgit v1.2.3


From 02a579f2e7abc832dd46956048d1116f7dc3dd92 Mon Sep 17 00:00:00 2001
From: Roland Scheidegger <sroland@vmware.com>
Date: Sat, 28 Mar 2009 01:19:49 +0100
Subject: mesa: fix a glGetTexImage issue with base-converted texture formats

need to respect the user-supplied base format, not the one derived from
the texture format actually used.
---
 src/mesa/main/texformat.c |  1 +
 src/mesa/main/texstore.c  | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c
index ee531c45c6..0d60e5ebd3 100644
--- a/src/mesa/main/texformat.c
+++ b/src/mesa/main/texformat.c
@@ -382,6 +382,7 @@ const struct gl_texture_format _mesa_texformat_sl8 = {
    store_texel_sl8			/* StoreTexel */
 };
 
+/* Note: this format name looks like a misnomer, make it sal8? */
 const struct gl_texture_format _mesa_texformat_sla8 = {
    MESA_FORMAT_SLA8,			/* MesaFormat */
    GL_LUMINANCE_ALPHA,			/* BaseFormat */
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index 7e7e0ac07a..a94df532c6 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -4078,18 +4078,18 @@ _mesa_get_teximage(GLcontext *ctx, GLenum target, GLint level,
 
                for (col = 0; col < width; col++) {
                   (*texImage->FetchTexelf)(texImage, col, row, img, rgba[col]);
-                  if (texImage->TexFormat->BaseFormat == GL_LUMINANCE) {
+                  if (texImage->_BaseFormat == GL_LUMINANCE) {
                      rgba[col][RCOMP] = linear_to_nonlinear(rgba[col][RCOMP]);
                      rgba[col][GCOMP] = 0.0;
                      rgba[col][BCOMP] = 0.0;
                   }
-                  else if (texImage->TexFormat->BaseFormat == GL_LUMINANCE_ALPHA) {
+                  else if (texImage->_BaseFormat == GL_LUMINANCE_ALPHA) {
                      rgba[col][RCOMP] = linear_to_nonlinear(rgba[col][RCOMP]);
                      rgba[col][GCOMP] = 0.0;
                      rgba[col][BCOMP] = 0.0;
                   }
-                  else if (texImage->TexFormat->BaseFormat == GL_RGB ||
-                     texImage->TexFormat->BaseFormat == GL_RGBA) {
+                  else if (texImage->_BaseFormat == GL_RGB ||
+                     texImage->_BaseFormat == GL_RGBA) {
                      rgba[col][RCOMP] = linear_to_nonlinear(rgba[col][RCOMP]);
                      rgba[col][GCOMP] = linear_to_nonlinear(rgba[col][GCOMP]);
                      rgba[col][BCOMP] = linear_to_nonlinear(rgba[col][BCOMP]);
@@ -4117,21 +4117,21 @@ _mesa_get_teximage(GLcontext *ctx, GLenum target, GLint level,
 
                for (col = 0; col < width; col++) {
                   (*texImage->FetchTexelf)(texImage, col, row, img, rgba[col]);
-                  if (texImage->TexFormat->BaseFormat == GL_ALPHA) {
+                  if (texImage->_BaseFormat == GL_ALPHA) {
                      rgba[col][RCOMP] = 0.0;
                      rgba[col][GCOMP] = 0.0;
                      rgba[col][BCOMP] = 0.0;
                   }
-                  else if (texImage->TexFormat->BaseFormat == GL_LUMINANCE) {
+                  else if (texImage->_BaseFormat == GL_LUMINANCE) {
                      rgba[col][GCOMP] = 0.0;
                      rgba[col][BCOMP] = 0.0;
                      rgba[col][ACOMP] = 1.0;
                   }
-                  else if (texImage->TexFormat->BaseFormat == GL_LUMINANCE_ALPHA) {
+                  else if (texImage->_BaseFormat == GL_LUMINANCE_ALPHA) {
                      rgba[col][GCOMP] = 0.0;
                      rgba[col][BCOMP] = 0.0;
                   }
-                  else if (texImage->TexFormat->BaseFormat == GL_INTENSITY) {
+                  else if (texImage->_BaseFormat == GL_INTENSITY) {
                      rgba[col][GCOMP] = 0.0;
                      rgba[col][BCOMP] = 0.0;
                      rgba[col][ACOMP] = 1.0;
-- 
cgit v1.2.3


From 4d89eff0b6fd6902a2fccb87c474d6a8f6d61526 Mon Sep 17 00:00:00 2001
From: Roland Scheidegger <sroland@vmware.com>
Date: Tue, 31 Mar 2009 03:18:35 +0200
Subject: fix ugly copy/paste error in mipmap generation code

---
 src/mesa/main/mipmap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index 7001211a13..bc8658beff 100644
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -195,7 +195,7 @@ do_row(GLenum datatype, GLuint comps, GLint srcWidth,
       }
    }
 
-   if (datatype == GL_BYTE && comps == 4) {
+   else if (datatype == GL_BYTE && comps == 4) {
       GLuint i, j, k;
       const GLbyte(*rowA)[4] = (const GLbyte(*)[4]) srcRowA;
       const GLbyte(*rowB)[4] = (const GLbyte(*)[4]) srcRowB;
-- 
cgit v1.2.3


From 093ad509fcee5cb3a890663fc80ed671dcaf4000 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Tue, 31 Mar 2009 15:08:49 -0700
Subject: Updated CPU_TO_LE32 to work on darwin

---
 src/mesa/main/compiler.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h
index 39b19bb776..93103fe878 100644
--- a/src/mesa/main/compiler.h
+++ b/src/mesa/main/compiler.h
@@ -230,7 +230,10 @@ extern "C" {
 #if defined(__linux__)
 #include <byteswap.h>
 #define CPU_TO_LE32( x )	bswap_32( x )
-#else /*__linux__*/
+#elif defined(__APPLE__)
+#include <CoreFoundation/CFByteOrder.h>
+#define CPU_TO_LE32( x )	CFSwapInt32HostToLittle( x )
+#else /*__linux__ __APPLE__*/
 #include <sys/endian.h>
 #define CPU_TO_LE32( x )	bswap32( x )
 #endif /*__linux__*/
-- 
cgit v1.2.3


From 53d507562b252718d95fd99812f5d21c9ae79713 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 31 Mar 2009 15:47:05 -0600
Subject: mesa: minor reformatting, whitespace changes

---
 src/mesa/main/ffvertex_prog.c | 51 ++++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 25 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index 72b880e28e..859f72b458 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -363,7 +363,7 @@ struct tnl_program {
 };
 
 
-static const struct ureg undef = { 
+static const struct ureg undef = {
    PROGRAM_UNDEFINED,
    0,
    0,
@@ -398,7 +398,7 @@ static struct ureg negate( struct ureg reg )
 {
    reg.negate ^= 1;
    return reg;
-} 
+}
 
 
 static struct ureg swizzle( struct ureg reg, int x, int y, int z, int w )
@@ -407,7 +407,6 @@ static struct ureg swizzle( struct ureg reg, int x, int y, int z, int w )
 			   GET_SWZ(reg.swz, y),
 			   GET_SWZ(reg.swz, z),
 			   GET_SWZ(reg.swz, w));
-
    return reg;
 }
 
@@ -898,8 +897,7 @@ static void build_hpos( struct tnl_program *p )
 
 static GLuint material_attrib( GLuint side, GLuint property )
 {
-   return ((property - STATE_AMBIENT) * 2 + 
-	   side);
+   return (property - STATE_AMBIENT) * 2 + side;
 }
 
 
@@ -960,7 +958,7 @@ static struct ureg get_scenecolor( struct tnl_program *p, GLuint side )
       struct ureg material_ambient = get_material(p, side, STATE_AMBIENT);
       struct ureg material_diffuse = get_material(p, side, STATE_DIFFUSE);
       struct ureg tmp = make_temp(p, material_diffuse);
-      emit_op3(p, OPCODE_MAD, tmp,  WRITEMASK_XYZ, lm_ambient, 
+      emit_op3(p, OPCODE_MAD, tmp, WRITEMASK_XYZ, lm_ambient, 
 	       material_ambient, material_emission);
       return tmp;
    }
@@ -978,7 +976,7 @@ static struct ureg get_lightprod( struct tnl_program *p, GLuint light,
 	 register_param3(p, STATE_LIGHT, light, property);
       struct ureg material_value = get_material(p, side, property);
       struct ureg tmp = get_temp(p);
-      emit_op2(p, OPCODE_MUL, tmp,  0, light_value, material_value);
+      emit_op2(p, OPCODE_MUL, tmp, 0, light_value, material_value);
       return tmp;
    }
    else
@@ -1015,7 +1013,6 @@ static struct ureg calculate_light_attenuation( struct tnl_program *p,
    /* Calculate distance attenuation:
     */
    if (p->state->unit[i].light_attenuated) {
-
       /* 1/d,d,d,1/d */
       emit_op1(p, OPCODE_RCP, dist, WRITEMASK_YZ, dist); 
       /* 1,d,d*d,1/d */
@@ -1028,7 +1025,8 @@ static struct ureg calculate_light_attenuation( struct tnl_program *p,
 	 emit_op1(p, OPCODE_RCP, dist, 0, dist); 
 	 /* spot-atten * dist-atten */
 	 emit_op2(p, OPCODE_MUL, att, 0, dist, att);	
-      } else {
+      }
+      else {
 	 /* dist-atten */
 	 emit_op1(p, OPCODE_RCP, att, 0, dist); 
       }
@@ -1082,10 +1080,10 @@ static void build_lighting( struct tnl_program *p )
 
    /*
     * NOTE:
-    * dot.x = dot(normal, VPpli)
-    * dot.y = dot(normal, halfAngle)
-    * dot.z = back.shininess
-    * dot.w = front.shininess
+    * dots.x = dot(normal, VPpli)
+    * dots.y = dot(normal, halfAngle)
+    * dots.z = back.shininess
+    * dots.w = front.shininess
     */
 
    for (i = 0; i < MAX_LIGHTS; i++) 
@@ -1097,7 +1095,7 @@ static void build_lighting( struct tnl_program *p )
    {
       if (!p->state->material_shininess_is_zero) {
          struct ureg shininess = get_material(p, 0, STATE_SHININESS);
-         emit_op1(p, OPCODE_MOV, dots,  WRITEMASK_W, swizzle1(shininess,X));
+         emit_op1(p, OPCODE_MOV, dots, WRITEMASK_W, swizzle1(shininess,X));
          release_temp(p, shininess);
       }
 
@@ -1106,7 +1104,6 @@ static void build_lighting( struct tnl_program *p )
 	 _col1 = make_temp(p, get_identity_param(p));
       else
 	 _col1 = _col0;
-
    }
 
    if (twoside) {
@@ -1171,12 +1168,13 @@ static void build_lighting( struct tnl_program *p )
                   half = get_temp(p);
                   emit_op2(p, OPCODE_SUB, half, 0, VPpli, eye_hat);
                   emit_normalize_vec3(p, half, half);
-               } else {
+               }
+               else {
                   half = register_param3(p, STATE_INTERNAL, 
                                          STATE_LIGHT_HALF_VECTOR, i);
                }
             }
-	 } 
+	 }
 	 else {
 	    struct ureg Ppli = register_param3(p, STATE_INTERNAL, 
 					       STATE_LIGHT_POSITION, i); 
@@ -1255,7 +1253,8 @@ static void build_lighting( struct tnl_program *p )
 		  res0 = _col0;
 		  res1 = register_output( p, VERT_RESULT_COL0 );
 	       }
-	    } else {
+	    }
+            else {
 	       mask0 = 0;
 	       mask1 = 0;
 	       res0 = _col0;
@@ -1267,12 +1266,12 @@ static void build_lighting( struct tnl_program *p )
                emit_op1(p, OPCODE_LIT, lit, 0, dots);
                emit_op2(p, OPCODE_MUL, lit, 0, lit, att);
                emit_op3(p, OPCODE_MAD, _col0, 0, swizzle1(lit,X), ambient, _col0);
-            } 
+            }
             else if (!p->state->material_shininess_is_zero) {
                /* there's a non-zero specular term */
                emit_op1(p, OPCODE_LIT, lit, 0, dots);
                emit_op2(p, OPCODE_ADD, _col0, 0, ambient, _col0);
-            } 
+            }
             else {
                /* no attenutation, no specular */
                emit_degenerate_lit(p, lit, dots);
@@ -1309,7 +1308,8 @@ static void build_lighting( struct tnl_program *p )
 		  res0 = _bfc0;
 		  res1 = register_output( p, VERT_RESULT_BFC0 );
 	       }
-	    } else {
+	    }
+            else {
 	       res0 = _bfc0;
 	       res1 = _bfc1;
 	       mask0 = 0;
@@ -1325,8 +1325,8 @@ static void build_lighting( struct tnl_program *p )
             }
             else if (!p->state->material_shininess_is_zero) {
                emit_op1(p, OPCODE_LIT, lit, 0, dots);
-               emit_op2(p, OPCODE_ADD, _bfc0, 0, ambient, _bfc0);
-            } 
+               emit_op2(p, OPCODE_ADD, _bfc0, 0, ambient, _bfc0); /**/
+            }
             else {
                emit_degenerate_lit(p, lit, dots);
                emit_op2(p, OPCODE_ADD, _bfc0, 0, ambient, _bfc0);
@@ -1578,7 +1578,7 @@ static void build_texture_transform( struct tnl_program *p )
 	 }
 
 	 release_temps(p);
-      } 
+      }
       else {
 	 emit_passthrough(p, VERT_ATTRIB_TEX0+i, VERT_RESULT_TEX0+i);
       }
@@ -1647,7 +1647,8 @@ static void build_array_pointsize( struct tnl_program *p )
 
 
 static void build_tnl_program( struct tnl_program *p )
-{   /* Emit the program, starting with modelviewproject:
+{
+   /* Emit the program, starting with modelviewproject:
     */
    build_hpos(p);
 
-- 
cgit v1.2.3


From 919f57078b289a273e0e46ee2214a9f042b11b1f Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 31 Mar 2009 16:13:14 -0600
Subject: mesa: fix bug in GPU codegen for fixed-function two-sided lighting

The 'dots' register wasn't getting properly un-negated and un-swizzled
after emitting the code for back-face lighting.  So, if more than one
light source was enabled, the specular exponent for the next light source
was wrong.

During execution we were evaluating pow(x, y) where y was negative instead
of positive.  This led to the outcome being zero or NaN.

This fixes the occasional black triangles seen in isosurf when hacked to
enable two-sided lighting.
---
 src/mesa/main/ffvertex_prog.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index 859f72b458..03f42704a7 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -1108,6 +1108,9 @@ static void build_lighting( struct tnl_program *p )
 
    if (twoside) {
       if (!p->state->material_shininess_is_zero) {
+         /* Note that we negate the back-face specular exponent here.
+          * The negation will be un-done later in the back-face code below.
+          */
          struct ureg shininess = get_material(p, 1, STATE_SHININESS);
          emit_op1(p, OPCODE_MOV, dots, WRITEMASK_Z, 
                   negate(swizzle1(shininess,X)));
@@ -1316,6 +1319,11 @@ static void build_lighting( struct tnl_program *p )
 	       mask1 = 0;
 	    }
 
+            /* For the back face we need to negate the X and Y component
+             * dot products.  dots.Z has the negated back-face specular
+             * exponent.  We swizzle that into the W position.  This
+             * negation makes the back-face specular term positive again.
+             */
             dots = negate(swizzle(dots,X,Y,W,Z));
 
 	    if (!is_undef(att)) {
@@ -1334,8 +1342,10 @@ static void build_lighting( struct tnl_program *p )
 
 	    emit_op3(p, OPCODE_MAD, res0, mask0, swizzle1(lit,Y), diffuse, _bfc0);
 	    emit_op3(p, OPCODE_MAD, res1, mask1, swizzle1(lit,Z), specular, _bfc1);
-            /* restore negate flag for next lighting */
-            dots = negate(dots);
+            /* restore dots to its original state for subsequent lights
+             * by negating and swizzling again.
+             */
+            dots = negate(swizzle(dots,X,Y,W,Z));
 
 	    release_temp(p, ambient);
 	    release_temp(p, diffuse);
-- 
cgit v1.2.3


From e4b27b4a69f28ca71944fef5f809023bed630a95 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 1 Apr 2009 17:34:16 -0600
Subject: mesa: fix a recursive display list problem

This fixes an issue when compiling glCallList() into another display list
when the mode is GL_COMPILE_AND_EXECUTE.

Before, the call to glCallList() called _mesa_save_CallList() which called
neutral_CallList() which then called _mesa_save_CallList() again.  In the
end, the parent display list contained two calls to the child display list
instead of one.

Let's be on the lookout for regressions caused by this change for a while
before we cherry-pick this elsewhere.
---
 src/mesa/main/dlist.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 8f7f703da9..537ff5881f 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -975,7 +975,7 @@ _mesa_save_CallList(GLuint list)
    ctx->Driver.CurrentSavePrimitive = PRIM_UNKNOWN;
 
    if (ctx->ExecuteFlag) {
-      CALL_CallList(ctx->Exec, (list));
+      _mesa_CallList(list);
    }
 }
 
-- 
cgit v1.2.3


From 49fb750a6884c3f647f46270ffce8652f664f908 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 1 Apr 2009 19:50:28 -0600
Subject: glsl: implement compiling/linking of separate compilation units

A shader program may consist of multiple shaders (source code units).
If we find there are unresolved functions after compiling the unit that
defines main(), we'll concatenate all the respective vertex or fragment
shaders then recompile.

This isn't foolproof but should work in most cases.
---
 src/mesa/main/mtypes.h                |   1 +
 src/mesa/shader/slang/slang_codegen.c |  19 +++--
 src/mesa/shader/slang/slang_codegen.h |   1 +
 src/mesa/shader/slang/slang_compile.c |   2 +
 src/mesa/shader/slang/slang_emit.c    |   7 +-
 src/mesa/shader/slang/slang_link.c    | 132 +++++++++++++++++++++++++++++-----
 6 files changed, 139 insertions(+), 23 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index a5d3be3543..e77dd1d226 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1974,6 +1974,7 @@ struct gl_shader
    GLboolean DeletePending;
    GLboolean CompileStatus;
    GLboolean Main;  /**< shader defines main() */
+   GLboolean UnresolvedRefs;
    const GLchar *Source;  /**< Source code string */
    struct gl_program *Program;  /**< Post-compile assembly code */
    GLchar *InfoLog;
diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c
index a7cfc45e6f..6d693c9027 100644
--- a/src/mesa/shader/slang/slang_codegen.c
+++ b/src/mesa/shader/slang/slang_codegen.c
@@ -2199,12 +2199,13 @@ _slang_gen_function_call_name(slang_assemble_ctx *A, const char *name,
                            name);
       return NULL;
    }
+
    if (!fun->body) {
-      slang_info_log_error(A->log,
-                           "Function '%s' prototyped but not defined.  "
-                           "Separate compilation units not supported.",
-                           name);
-      return NULL;
+      /* The function body may be in another compilation unit.
+       * We'll try concatenating the shaders and recompile at link time.
+       */
+      A->UnresolvedRefs = GL_TRUE;
+      return new_node1(IR_NOP, NULL);
    }
 
    /* type checking to be sure function's return type matches 'dest' type */
@@ -4648,6 +4649,14 @@ _slang_codegen_function(slang_assemble_ctx * A, slang_function * fun)
    printf("************* End codegen function ************\n\n");
 #endif
 
+   if (A->UnresolvedRefs) {
+      /* Can't codegen at this time.
+       * At link time we'll concatenate all the vertex shaders and/or all
+       * the fragment shaders and try recompiling.
+       */
+      return GL_TRUE;
+   }
+
    /* Emit program instructions */
    success = _slang_emit_code(n, A->vartable, A->program, A->pragmas, GL_TRUE, A->log);
    _slang_free_ir_tree(n);
diff --git a/src/mesa/shader/slang/slang_codegen.h b/src/mesa/shader/slang/slang_codegen.h
index e812c1f7ea..d80013ad34 100644
--- a/src/mesa/shader/slang/slang_codegen.h
+++ b/src/mesa/shader/slang/slang_codegen.h
@@ -43,6 +43,7 @@ typedef struct slang_assemble_ctx_
    struct slang_ir_node_ *CurLoop;
    struct slang_function_ *CurFunction;
    GLuint UnrollLoop;
+   GLboolean UnresolvedRefs;
 } slang_assemble_ctx;
 
 
diff --git a/src/mesa/shader/slang/slang_compile.c b/src/mesa/shader/slang/slang_compile.c
index fb7128841c..6348f799aa 100644
--- a/src/mesa/shader/slang/slang_compile.c
+++ b/src/mesa/shader/slang/slang_compile.c
@@ -2435,6 +2435,8 @@ parse_code_unit(slang_parse_ctx * C, slang_code_unit * unit,
       _slang_codegen_function(&A, mainFunc);
 
       shader->Main = GL_TRUE; /* this shader defines main() */
+
+      shader->UnresolvedRefs = A.UnresolvedRefs;
    }
 
    _slang_pop_var_table(o.vartable);
diff --git a/src/mesa/shader/slang/slang_emit.c b/src/mesa/shader/slang/slang_emit.c
index 1b1edb4460..8493c490fb 100644
--- a/src/mesa/shader/slang/slang_emit.c
+++ b/src/mesa/shader/slang/slang_emit.c
@@ -62,6 +62,8 @@ typedef struct
 
    GLuint MaxInstructions;  /**< size of prog->Instructions[] buffer */
 
+   GLboolean UnresolvedFunctions;
+
    /* code-gen options */
    GLboolean EmitHighLevelInstructions;
    GLboolean EmitCondCodes;
@@ -872,6 +874,7 @@ emit_compare(slang_emit_info *emitInfo, slang_ir_node *n)
    emit(emitInfo, n->Children[1]);
 
    if (n->Children[0]->Store->Size != n->Children[1]->Store->Size) {
+      /* XXX this error should have been caught in slang_codegen.c */
       slang_info_log_error(emitInfo->log, "invalid operands to == or !=");
       n->Store = NULL;
       return NULL;
@@ -1356,7 +1359,8 @@ emit_copy(slang_emit_info *emitInfo, slang_ir_node *n)
    inst = emit(emitInfo, n->Children[1]);
 
    if (!n->Children[1]->Store || n->Children[1]->Store->Index < 0) {
-      if (!emitInfo->log->text) {
+      if (!emitInfo->log->text && !emitInfo->UnresolvedFunctions) {
+         /* XXX this error should have been caught in slang_codegen.c */
          slang_info_log_error(emitInfo->log, "invalid assignment");
       }
       return NULL;
@@ -2155,6 +2159,7 @@ emit_var_ref(slang_emit_info *emitInfo, slang_ir_node *n)
       if (index < 0) {
          /* error */
          char s[100];
+         /* XXX isn't this really an out of memory/resources error? */
          _mesa_snprintf(s, sizeof(s), "Undefined variable '%s'",
                         (char *) n->Var->a_name);
          slang_info_log_error(emitInfo->log, s);
diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c
index f98434892b..e2daf72e7d 100644
--- a/src/mesa/shader/slang/slang_link.c
+++ b/src/mesa/shader/slang/slang_link.c
@@ -534,6 +534,106 @@ _slang_update_inputs_outputs(struct gl_program *prog)
 }
 
 
+
+
+
+/**
+ * Return a new shader whose source code is the concatenation of
+ * all the shader sources of the given type.
+ */
+static struct gl_shader *
+concat_shaders(struct gl_shader_program *shProg, GLenum shaderType)
+{
+   struct gl_shader *newShader;
+   const struct gl_shader *firstShader = NULL;
+   GLuint shaderLengths[100];
+   GLchar *source;
+   GLuint totalLen = 0, len = 0;
+   GLuint i;
+
+   /* compute total size of new shader source code */
+   for (i = 0; i < shProg->NumShaders; i++) {
+      const struct gl_shader *shader = shProg->Shaders[i];
+      if (shader->Type == shaderType) {
+         shaderLengths[i] = _mesa_strlen(shader->Source);
+         totalLen += shaderLengths[i];
+         if (!firstShader)
+            firstShader = shader;
+      }
+   }
+
+   source = (GLchar *) _mesa_malloc(totalLen + 1);
+   if (!source)
+      return NULL;
+
+   /* concatenate shaders */
+   for (i = 0; i < shProg->NumShaders; i++) {
+      const struct gl_shader *shader = shProg->Shaders[i];
+      if (shader->Type == shaderType) {
+         _mesa_memcpy(source + len, shader->Source, shaderLengths[i]);
+         len += shaderLengths[i];
+      }
+   }
+   source[len] = '\0';
+   /*
+   _mesa_printf("---NEW CONCATENATED SHADER---:\n%s\n------------\n", source);
+   */
+
+   newShader = CALLOC_STRUCT(gl_shader);
+   newShader->Type = shaderType;
+   newShader->Source = source;
+   newShader->Pragmas = firstShader->Pragmas;
+
+   return newShader;
+}
+
+
+/**
+ * Search the shader program's list of shaders to find the one that
+ * defines main().
+ * This will involve shader concatenation and recompilation if needed.
+ */
+static struct gl_shader *
+get_main_shader(GLcontext *ctx,
+                struct gl_shader_program *shProg, GLenum type)
+{
+   struct gl_shader *shader = NULL;
+   GLuint i;
+
+   /*
+    * Look for a shader that defines main() and has no unresolved references.
+    */
+   for (i = 0; i < shProg->NumShaders; i++) {
+      shader = shProg->Shaders[i];
+      if (shader->Type == type &&
+          shader->Main &&
+          !shader->UnresolvedRefs) {
+         /* All set! */
+         return shader;
+      }
+   }
+
+   /*
+    * There must have been unresolved references during the original
+    * compilation.  Try concatenating all the shaders of the given type
+    * and recompile that.
+    */
+   shader = concat_shaders(shProg, type);
+
+   _slang_compile(ctx, shader);
+
+   /* Finally, check if recompiling failed */
+   if (!shader->CompileStatus ||
+       !shader->Main ||
+       shader->UnresolvedRefs) {
+      link_error(shProg, "Unresolved symbols");
+      return NULL;
+   }
+
+   return shader;
+}
+
+
 /**
  * Shader linker.  Currently:
  *
@@ -557,6 +657,9 @@ _slang_link(GLcontext *ctx,
 
    _mesa_clear_shader_program_data(ctx, shProg);
 
+   /* Initialize LinkStatus to "success".  Will be cleared if error. */
+   shProg->LinkStatus = GL_TRUE;
+
    /* check that all programs compiled successfully */
    for (i = 0; i < shProg->NumShaders; i++) {
       if (!shProg->Shaders[i]->CompileStatus) {
@@ -568,24 +671,19 @@ _slang_link(GLcontext *ctx,
    shProg->Uniforms = _mesa_new_uniform_list();
    shProg->Varying = _mesa_new_parameter_list();
 
-   /**
-    * Find attached vertex, fragment shaders defining main()
+   /*
+    * Find the vertex and fragment shaders which define main()
     */
-   vertProg = NULL;
-   fragProg = NULL;
-   for (i = 0; i < shProg->NumShaders; i++) {
-      struct gl_shader *shader = shProg->Shaders[i];
-      if (shader->Type == GL_VERTEX_SHADER) {
-         if (shader->Main)
-            vertProg = vertex_program(shader->Program);
-      }
-      else if (shader->Type == GL_FRAGMENT_SHADER) {
-         if (shader->Main)
-            fragProg = fragment_program(shader->Program);
-      }
-      else {
-         _mesa_problem(ctx, "unexpected shader target in slang_link()");
-      }
+   {
+      struct gl_shader *vertShader, *fragShader;
+      vertShader = get_main_shader(ctx, shProg, GL_VERTEX_SHADER);
+      fragShader = get_main_shader(ctx, shProg, GL_FRAGMENT_SHADER);
+      if (vertShader)
+         vertProg = vertex_program(vertShader->Program);
+      if (fragShader)
+         fragProg = fragment_program(fragShader->Program);
+      if (!shProg->LinkStatus)
+         return;
    }
 
 #if FEATURE_es2_glsl
-- 
cgit v1.2.3


From de2afd8688ceb45013d15be7c6e0995199b80e5a Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Sun, 8 Mar 2009 13:49:57 -0600
Subject: swrast: do texture sampling/combining in floating point

The code's cleaner and a step toward supporting float-valued texture sampling.
Some optimizations for common cases can be added and re-enabled...
---
 src/mesa/main/colormac.h          |   9 -
 src/mesa/swrast/s_atifragshader.c |   7 +-
 src/mesa/swrast/s_context.c       |   4 +-
 src/mesa/swrast/s_context.h       |   4 +-
 src/mesa/swrast/s_fragprog.c      |  19 +-
 src/mesa/swrast/s_texcombine.c    | 827 +++++++++++++++-----------------------
 src/mesa/swrast/s_texfilter.c     | 414 +++++++++----------
 src/mesa/tnl/t_vb_program.c       |   7 +-
 8 files changed, 512 insertions(+), 779 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/colormac.h b/src/mesa/main/colormac.h
index 74692e9a98..815624ee50 100644
--- a/src/mesa/main/colormac.h
+++ b/src/mesa/main/colormac.h
@@ -71,9 +71,6 @@
 /** \def COPY_CHAN4
  * Copy a GLchan[4] array */
 
-/** \def CHAN_PRODUCT
- * Scaled product (usually approximated) between two GLchan arguments */
-
 #if CHAN_BITS == 8
 
 #define BYTE_TO_CHAN(b)   ((b) < 0 ? 0 : (GLchan) (b))
@@ -91,8 +88,6 @@
 
 #define COPY_CHAN4(DST, SRC)  COPY_4UBV(DST, SRC)
 
-#define CHAN_PRODUCT(a, b)  ((GLubyte) (((GLint)(a) * ((GLint)(b) + 1)) >> 8))
-
 #elif CHAN_BITS == 16
 
 #define BYTE_TO_CHAN(b)   ((b) < 0 ? 0 : (((GLchan) (b)) * 516))
@@ -110,8 +105,6 @@
 
 #define COPY_CHAN4(DST, SRC)  COPY_4V(DST, SRC)
 
-#define CHAN_PRODUCT(a, b) ((GLchan) ((((GLuint) (a)) * ((GLuint) (b))) / 65535))
-
 #elif CHAN_BITS == 32
 
 /* XXX floating-point color channels not fully thought-out */
@@ -130,8 +123,6 @@
 
 #define COPY_CHAN4(DST, SRC)  COPY_4V(DST, SRC)
 
-#define CHAN_PRODUCT(a, b)    ((a) * (b))
-
 #else
 
 #error unexpected CHAN_BITS size
diff --git a/src/mesa/swrast/s_atifragshader.c b/src/mesa/swrast/s_atifragshader.c
index 458fe18163..5fefae6c42 100644
--- a/src/mesa/swrast/s_atifragshader.c
+++ b/src/mesa/swrast/s_atifragshader.c
@@ -47,17 +47,12 @@ static void
 fetch_texel(GLcontext * ctx, const GLfloat texcoord[4], GLfloat lambda,
 	    GLuint unit, GLfloat color[4])
 {
-   GLchan rgba[4];
    SWcontext *swrast = SWRAST_CONTEXT(ctx);
 
    /* XXX use a float-valued TextureSample routine here!!! */
    swrast->TextureSample[unit](ctx, ctx->Texture.Unit[unit]._Current,
                                1, (const GLfloat(*)[4]) texcoord,
-                               &lambda, &rgba);
-   color[0] = CHAN_TO_FLOAT(rgba[0]);
-   color[1] = CHAN_TO_FLOAT(rgba[1]);
-   color[2] = CHAN_TO_FLOAT(rgba[2]);
-   color[3] = CHAN_TO_FLOAT(rgba[3]);
+                               &lambda, (GLfloat (*)[4]) color);
 }
 
 static void
diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c
index 4dbccbb2d5..0257abc34a 100644
--- a/src/mesa/swrast/s_context.c
+++ b/src/mesa/swrast/s_context.c
@@ -820,8 +820,8 @@ _swrast_CreateContext( GLcontext *ctx )
    swrast->PointSpan.facing = 0;
    swrast->PointSpan.array = swrast->SpanArrays;
 
-   swrast->TexelBuffer = (GLchan *) MALLOC(ctx->Const.MaxTextureImageUnits *
-                                           MAX_WIDTH * 4 * sizeof(GLchan));
+   swrast->TexelBuffer = (GLfloat *) MALLOC(ctx->Const.MaxTextureImageUnits *
+                                           MAX_WIDTH * 4 * sizeof(GLfloat));
    if (!swrast->TexelBuffer) {
       FREE(swrast->SpanArrays);
       FREE(swrast);
diff --git a/src/mesa/swrast/s_context.h b/src/mesa/swrast/s_context.h
index 6e8d080704..4cf57c6fc6 100644
--- a/src/mesa/swrast/s_context.h
+++ b/src/mesa/swrast/s_context.h
@@ -52,7 +52,7 @@
 typedef void (*texture_sample_func)(GLcontext *ctx,
                                     const struct gl_texture_object *tObj,
                                     GLuint n, const GLfloat texcoords[][4],
-                                    const GLfloat lambda[], GLchan rgba[][4]);
+                                    const GLfloat lambda[], GLfloat rgba[][4]);
 
 typedef void (_ASMAPIP blend_func)( GLcontext *ctx, GLuint n,
                                     const GLubyte mask[],
@@ -221,7 +221,7 @@ typedef struct
    /** Buffer for saving the sampled texture colors.
     * Needed for GL_ARB_texture_env_crossbar implementation.
     */
-   GLchan *TexelBuffer;
+   GLfloat *TexelBuffer;
 
    validate_texture_image_func ValidateTextureImage;
 
diff --git a/src/mesa/swrast/s_fragprog.c b/src/mesa/swrast/s_fragprog.c
index ae1dea16a0..5f032bbd69 100644
--- a/src/mesa/swrast/s_fragprog.c
+++ b/src/mesa/swrast/s_fragprog.c
@@ -37,20 +37,17 @@
  * and return results in 'colorOut'.
  */
 static INLINE void
-swizzle_texel(const GLchan texel[4], GLfloat colorOut[4], GLuint swizzle)
+swizzle_texel(const GLfloat texel[4], GLfloat colorOut[4], GLuint swizzle)
 {
    if (swizzle == SWIZZLE_NOOP) {
-      colorOut[0] = CHAN_TO_FLOAT(texel[0]);
-      colorOut[1] = CHAN_TO_FLOAT(texel[1]);
-      colorOut[2] = CHAN_TO_FLOAT(texel[2]);
-      colorOut[3] = CHAN_TO_FLOAT(texel[3]);
+      COPY_4V(colorOut, texel);
    }
    else {
       GLfloat vector[6];
-      vector[SWIZZLE_X] = CHAN_TO_FLOAT(texel[0]);
-      vector[SWIZZLE_Y] = CHAN_TO_FLOAT(texel[1]);
-      vector[SWIZZLE_Z] = CHAN_TO_FLOAT(texel[2]);
-      vector[SWIZZLE_W] = CHAN_TO_FLOAT(texel[3]);
+      vector[SWIZZLE_X] = texel[0];
+      vector[SWIZZLE_Y] = texel[1];
+      vector[SWIZZLE_Z] = texel[2];
+      vector[SWIZZLE_W] = texel[3];
       vector[SWIZZLE_ZERO] = 0.0F;
       vector[SWIZZLE_ONE] = 1.0F;
       colorOut[0] = vector[GET_SWZ(swizzle, 0)];
@@ -73,7 +70,7 @@ fetch_texel_lod( GLcontext *ctx, const GLfloat texcoord[4], GLfloat lambda,
 
    if (texObj) {
       SWcontext *swrast = SWRAST_CONTEXT(ctx);
-      GLchan rgba[4];
+      GLfloat rgba[4];
 
       lambda = CLAMP(lambda, texObj->MinLod, texObj->MaxLod);
 
@@ -108,7 +105,7 @@ fetch_texel_deriv( GLcontext *ctx, const GLfloat texcoord[4],
       const GLfloat texW = (GLfloat) texImg->WidthScale;
       const GLfloat texH = (GLfloat) texImg->HeightScale;
       GLfloat lambda;
-      GLchan rgba[4];
+      GLfloat rgba[4];
 
       lambda = _swrast_compute_lambda(texdx[0], texdy[0], /* ds/dx, ds/dy */
                                       texdx[1], texdy[1], /* dt/dx, dt/dy */
diff --git a/src/mesa/swrast/s_texcombine.c b/src/mesa/swrast/s_texcombine.c
index aa28311672..c48a6fb114 100644
--- a/src/mesa/swrast/s_texcombine.c
+++ b/src/mesa/swrast/s_texcombine.c
@@ -37,13 +37,7 @@
 #include "s_texcombine.h"
 
 
-#define PROD(A,B)   ( (GLuint)(A) * ((GLuint)(B)+1) )
-#define S_PROD(A,B) ( (GLint)(A) * ((GLint)(B)+1) )
-#if CHAN_BITS == 32
-typedef GLfloat ChanTemp;
-#else
-typedef GLuint ChanTemp;
-#endif
+#define MAX_COMBINER_TERMS 4
 
 
 /**
@@ -63,32 +57,36 @@ typedef GLuint ChanTemp;
  */
 static void
 texture_combine( const GLcontext *ctx, GLuint unit, GLuint n,
-                 CONST GLchan (*primary_rgba)[4],
-                 CONST GLchan *texelBuffer,
-                 GLchan (*rgba)[4] )
+                 CONST GLfloat (*primary_rgba)[4],
+                 CONST GLfloat *texelBuffer,
+                 GLchan (*rgbaChan)[4] )
 {
    const struct gl_texture_unit *textureUnit = &(ctx->Texture.Unit[unit]);
-   const GLchan (*argRGB [4])[4];
-   const GLchan (*argA [4])[4];
+   const GLfloat (*argRGB [MAX_COMBINER_TERMS])[4];
+   const GLfloat (*argA [MAX_COMBINER_TERMS])[4];
    const GLint RGBshift = textureUnit->_CurrentCombine->ScaleShiftRGB;
    const GLuint Ashift   = textureUnit->_CurrentCombine->ScaleShiftA;
-#if CHAN_TYPE == GL_FLOAT
-   const GLchan RGBmult = (GLfloat) (1 << RGBshift);
-   const GLchan Amult = (GLfloat) (1 << Ashift);
-#else
-   const GLint half = (CHAN_MAX + 1) / 2;
-#endif
-   static const GLchan one[4] = { CHAN_MAX, CHAN_MAX, CHAN_MAX, CHAN_MAX };
-   static const GLchan zero[4] = { 0, 0, 0, 0 };
+   const GLfloat RGBmult = (GLfloat) (1 << RGBshift);
+   const GLfloat Amult = (GLfloat) (1 << Ashift);
+   static const GLfloat one[4] = { 1, 1, 1, 1 };
+   static const GLfloat zero[4] = { 0, 0, 0, 0 };
    const GLuint numColorArgs = textureUnit->_CurrentCombine->_NumArgsRGB;
    const GLuint numAlphaArgs = textureUnit->_CurrentCombine->_NumArgsA;
-   GLchan ccolor[4][MAX_WIDTH][4];
+   GLfloat ccolor[MAX_COMBINER_TERMS][MAX_WIDTH][4]; /* temp color buffers */
+   GLfloat rgba[MAX_WIDTH][4];
    GLuint i, j;
 
    ASSERT(ctx->Extensions.EXT_texture_env_combine ||
           ctx->Extensions.ARB_texture_env_combine);
    ASSERT(CONST_SWRAST_CONTEXT(ctx)->_AnyTextureCombine);
 
+   for (i = 0; i < n; i++) {
+      rgba[i][RCOMP] = CHAN_TO_FLOAT(rgbaChan[i][RCOMP]);
+      rgba[i][GCOMP] = CHAN_TO_FLOAT(rgbaChan[i][GCOMP]);
+      rgba[i][BCOMP] = CHAN_TO_FLOAT(rgbaChan[i][BCOMP]);
+      rgba[i][ACOMP] = CHAN_TO_FLOAT(rgbaChan[i][ACOMP]);
+   }
+
    /*
    printf("modeRGB 0x%x  modeA 0x%x  srcRGB1 0x%x  srcA1 0x%x  srcRGB2 0x%x  srcA2 0x%x\n",
           textureUnit->_CurrentCombine->ModeRGB,
@@ -107,39 +105,47 @@ texture_combine( const GLcontext *ctx, GLuint unit, GLuint n,
 
       switch (srcRGB) {
          case GL_TEXTURE:
-            argRGB[j] = (const GLchan (*)[4])
-               (texelBuffer + unit * (n * 4 * sizeof(GLchan)));
+            argRGB[j] = (const GLfloat (*)[4])
+               (texelBuffer + unit * (n * 4 * sizeof(GLfloat)));
             break;
          case GL_PRIMARY_COLOR:
             argRGB[j] = primary_rgba;
             break;
          case GL_PREVIOUS:
-            argRGB[j] = (const GLchan (*)[4]) rgba;
+            argRGB[j] = (const GLfloat (*)[4]) rgba;
             break;
          case GL_CONSTANT:
             {
-               GLchan (*c)[4] = ccolor[j];
-               GLchan red, green, blue, alpha;
-               UNCLAMPED_FLOAT_TO_CHAN(red,   textureUnit->EnvColor[0]);
-               UNCLAMPED_FLOAT_TO_CHAN(green, textureUnit->EnvColor[1]);
-               UNCLAMPED_FLOAT_TO_CHAN(blue,  textureUnit->EnvColor[2]);
-               UNCLAMPED_FLOAT_TO_CHAN(alpha, textureUnit->EnvColor[3]);
+               GLfloat (*c)[4] = ccolor[j];
+               GLfloat red   = textureUnit->EnvColor[0];
+               GLfloat green = textureUnit->EnvColor[1];
+               GLfloat blue  = textureUnit->EnvColor[2];
+               GLfloat alpha = textureUnit->EnvColor[3];
                for (i = 0; i < n; i++) {
-                  c[i][RCOMP] = red;
-                  c[i][GCOMP] = green;
-                  c[i][BCOMP] = blue;
-                  c[i][ACOMP] = alpha;
+                  ASSIGN_4V(c[i], red, green, blue, alpha);
                }
-               argRGB[j] = (const GLchan (*)[4]) ccolor[j];
+               argRGB[j] = (const GLfloat (*)[4]) ccolor[j];
             }
             break;
 	 /* GL_ATI_texture_env_combine3 allows GL_ZERO & GL_ONE as sources.
 	  */
 	 case GL_ZERO:
-            argRGB[j] = & zero;
+            {
+               GLfloat (*c)[4] = ccolor[j];
+               for (i = 0; i < n; i++) {
+                  ASSIGN_4V(c[i], 0.0F, 0.0F, 0.0F, 0.0F);
+               }
+               argRGB[j] = (const GLfloat (*)[4]) ccolor[j];
+            }
             break;
 	 case GL_ONE:
-            argRGB[j] = & one;
+            {
+               GLfloat (*c)[4] = ccolor[j];
+               for (i = 0; i < n; i++) {
+                  ASSIGN_4V(c[i], 1.0F, 1.0F, 1.0F, 1.0F);
+               }
+               argRGB[j] = (const GLfloat (*)[4]) ccolor[j];
+            }
             break;
          default:
             /* ARB_texture_env_crossbar source */
@@ -148,23 +154,23 @@ texture_combine( const GLcontext *ctx, GLuint unit, GLuint n,
                ASSERT(srcUnit < ctx->Const.MaxTextureUnits);
                if (!ctx->Texture.Unit[srcUnit]._ReallyEnabled)
                   return;
-               argRGB[j] = (const GLchan (*)[4])
-                  (texelBuffer + srcUnit * (n * 4 * sizeof(GLchan)));
+               argRGB[j] = (const GLfloat (*)[4])
+                  (texelBuffer + srcUnit * (n * 4 * sizeof(GLfloat)));
             }
       }
 
       if (textureUnit->_CurrentCombine->OperandRGB[j] != GL_SRC_COLOR) {
-         const GLchan (*src)[4] = argRGB[j];
-         GLchan (*dst)[4] = ccolor[j];
+         const GLfloat (*src)[4] = argRGB[j];
+         GLfloat (*dst)[4] = ccolor[j];
 
          /* point to new arg[j] storage */
-         argRGB[j] = (const GLchan (*)[4]) ccolor[j];
+         argRGB[j] = (const GLfloat (*)[4]) ccolor[j];
 
          if (textureUnit->_CurrentCombine->OperandRGB[j] == GL_ONE_MINUS_SRC_COLOR) {
             for (i = 0; i < n; i++) {
-               dst[i][RCOMP] = CHAN_MAX - src[i][RCOMP];
-               dst[i][GCOMP] = CHAN_MAX - src[i][GCOMP];
-               dst[i][BCOMP] = CHAN_MAX - src[i][BCOMP];
+               dst[i][RCOMP] = 1.0F - src[i][RCOMP];
+               dst[i][GCOMP] = 1.0F - src[i][GCOMP];
+               dst[i][BCOMP] = 1.0F - src[i][BCOMP];
             }
          }
          else if (textureUnit->_CurrentCombine->OperandRGB[j] == GL_SRC_ALPHA) {
@@ -177,9 +183,9 @@ texture_combine( const GLcontext *ctx, GLuint unit, GLuint n,
          else {
             ASSERT(textureUnit->_CurrentCombine->OperandRGB[j] ==GL_ONE_MINUS_SRC_ALPHA);
             for (i = 0; i < n; i++) {
-               dst[i][RCOMP] = CHAN_MAX - src[i][ACOMP];
-               dst[i][GCOMP] = CHAN_MAX - src[i][ACOMP];
-               dst[i][BCOMP] = CHAN_MAX - src[i][ACOMP];
+               dst[i][RCOMP] = 1.0F - src[i][ACOMP];
+               dst[i][GCOMP] = 1.0F - src[i][ACOMP];
+               dst[i][BCOMP] = 1.0F - src[i][ACOMP];
             }
          }
       }
@@ -193,22 +199,22 @@ texture_combine( const GLcontext *ctx, GLuint unit, GLuint n,
 
       switch (srcA) {
          case GL_TEXTURE:
-            argA[j] = (const GLchan (*)[4])
-               (texelBuffer + unit * (n * 4 * sizeof(GLchan)));
+            argA[j] = (const GLfloat (*)[4])
+               (texelBuffer + unit * (n * 4 * sizeof(GLfloat)));
             break;
          case GL_PRIMARY_COLOR:
             argA[j] = primary_rgba;
             break;
          case GL_PREVIOUS:
-            argA[j] = (const GLchan (*)[4]) rgba;
+            argA[j] = (const GLfloat (*)[4]) rgba;
             break;
          case GL_CONSTANT:
             {
-               GLchan alpha, (*c)[4] = ccolor[j];
-               UNCLAMPED_FLOAT_TO_CHAN(alpha, textureUnit->EnvColor[3]);
+               GLfloat alpha, (*c)[4] = ccolor[j];
+               alpha = textureUnit->EnvColor[3];
                for (i = 0; i < n; i++)
                   c[i][ACOMP] = alpha;
-               argA[j] = (const GLchan (*)[4]) ccolor[j];
+               argA[j] = (const GLfloat (*)[4]) ccolor[j];
             }
             break;
 	 /* GL_ATI_texture_env_combine3 allows GL_ZERO & GL_ONE as sources.
@@ -226,17 +232,17 @@ texture_combine( const GLcontext *ctx, GLuint unit, GLuint n,
                ASSERT(srcUnit < ctx->Const.MaxTextureUnits);
                if (!ctx->Texture.Unit[srcUnit]._ReallyEnabled)
                   return;
-               argA[j] = (const GLchan (*)[4])
-                  (texelBuffer + srcUnit * (n * 4 * sizeof(GLchan)));
+               argA[j] = (const GLfloat (*)[4])
+                  (texelBuffer + srcUnit * (n * 4 * sizeof(GLfloat)));
             }
       }
 
       if (textureUnit->_CurrentCombine->OperandA[j] == GL_ONE_MINUS_SRC_ALPHA) {
-         const GLchan (*src)[4] = argA[j];
-         GLchan (*dst)[4] = ccolor[j];
-         argA[j] = (const GLchan (*)[4]) ccolor[j];
+         const GLfloat (*src)[4] = argA[j];
+         GLfloat (*dst)[4] = ccolor[j];
+         argA[j] = (const GLfloat (*)[4]) ccolor[j];
          for (i = 0; i < n; i++) {
-            dst[i][ACOMP] = CHAN_MAX - src[i][ACOMP];
+            dst[i][ACOMP] = 1.0F - src[i][ACOMP];
          }
       }
    }
@@ -247,21 +253,12 @@ texture_combine( const GLcontext *ctx, GLuint unit, GLuint n,
    switch (textureUnit->_CurrentCombine->ModeRGB) {
       case GL_REPLACE:
          {
-            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argRGB[0];
+            const GLfloat (*arg0)[4] = (const GLfloat (*)[4]) argRGB[0];
             if (RGBshift) {
                for (i = 0; i < n; i++) {
-#if CHAN_TYPE == GL_FLOAT
                   rgba[i][RCOMP] = arg0[i][RCOMP] * RGBmult;
                   rgba[i][GCOMP] = arg0[i][GCOMP] * RGBmult;
                   rgba[i][BCOMP] = arg0[i][BCOMP] * RGBmult;
-#else
-                  GLuint r = (GLuint) arg0[i][RCOMP] << RGBshift;
-                  GLuint g = (GLuint) arg0[i][GCOMP] << RGBshift;
-                  GLuint b = (GLuint) arg0[i][BCOMP] << RGBshift;
-                  rgba[i][RCOMP] = MIN2(r, CHAN_MAX);
-                  rgba[i][GCOMP] = MIN2(g, CHAN_MAX);
-                  rgba[i][BCOMP] = MIN2(b, CHAN_MAX);
-#endif
                }
             }
             else {
@@ -275,179 +272,91 @@ texture_combine( const GLcontext *ctx, GLuint unit, GLuint n,
          break;
       case GL_MODULATE:
          {
-            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argRGB[0];
-            const GLchan (*arg1)[4] = (const GLchan (*)[4]) argRGB[1];
-#if CHAN_TYPE != GL_FLOAT
-            const GLint shift = CHAN_BITS - RGBshift;
-#endif
+            const GLfloat (*arg0)[4] = (const GLfloat (*)[4]) argRGB[0];
+            const GLfloat (*arg1)[4] = (const GLfloat (*)[4]) argRGB[1];
             for (i = 0; i < n; i++) {
-#if CHAN_TYPE == GL_FLOAT
                rgba[i][RCOMP] = arg0[i][RCOMP] * arg1[i][RCOMP] * RGBmult;
                rgba[i][GCOMP] = arg0[i][GCOMP] * arg1[i][GCOMP] * RGBmult;
                rgba[i][BCOMP] = arg0[i][BCOMP] * arg1[i][BCOMP] * RGBmult;
-#else
-               GLuint r = PROD(arg0[i][RCOMP], arg1[i][RCOMP]) >> shift;
-               GLuint g = PROD(arg0[i][GCOMP], arg1[i][GCOMP]) >> shift;
-               GLuint b = PROD(arg0[i][BCOMP], arg1[i][BCOMP]) >> shift;
-               rgba[i][RCOMP] = (GLchan) MIN2(r, CHAN_MAX);
-               rgba[i][GCOMP] = (GLchan) MIN2(g, CHAN_MAX);
-               rgba[i][BCOMP] = (GLchan) MIN2(b, CHAN_MAX);
-#endif
             }
          }
          break;
       case GL_ADD:
          if (textureUnit->EnvMode == GL_COMBINE4_NV) {
             /* (a * b) + (c * d) */
-            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argRGB[0];
-            const GLchan (*arg1)[4] = (const GLchan (*)[4]) argRGB[1];
-            const GLchan (*arg2)[4] = (const GLchan (*)[4]) argRGB[2];
-            const GLchan (*arg3)[4] = (const GLchan (*)[4]) argRGB[3];
+            const GLfloat (*arg0)[4] = (const GLfloat (*)[4]) argRGB[0];
+            const GLfloat (*arg1)[4] = (const GLfloat (*)[4]) argRGB[1];
+            const GLfloat (*arg2)[4] = (const GLfloat (*)[4]) argRGB[2];
+            const GLfloat (*arg3)[4] = (const GLfloat (*)[4]) argRGB[3];
             for (i = 0; i < n; i++) {
-#if CHAN_TYPE == GL_FLOAT
                rgba[i][RCOMP] = (arg0[i][RCOMP] * arg1[i][RCOMP] +
                                  arg2[i][RCOMP] * arg3[i][RCOMP]) * RGBmult;
                rgba[i][GCOMP] = (arg0[i][GCOMP] * arg1[i][GCOMP] +
                                  arg2[i][GCOMP] * arg3[i][GCOMP]) * RGBmult;
                rgba[i][BCOMP] = (arg0[i][BCOMP] * arg1[i][BCOMP] +
                                  arg2[i][BCOMP] * arg3[i][BCOMP]) * RGBmult;
-#else
-               const GLint shift = CHAN_BITS - RGBshift;
-               GLint r = (PROD(arg0[i][RCOMP], arg1[i][RCOMP]) >> shift) +
-                         (PROD(arg2[i][RCOMP], arg3[i][RCOMP]) >> shift);
-               GLint g = (PROD(arg0[i][GCOMP], arg1[i][GCOMP]) >> shift) +
-                         (PROD(arg2[i][GCOMP], arg3[i][GCOMP]) >> shift);
-               GLint b = (PROD(arg0[i][BCOMP], arg1[i][BCOMP]) >> shift) +
-                         (PROD(arg2[i][BCOMP], arg3[i][BCOMP]) >> shift);
-               rgba[i][RCOMP] = (GLchan) MIN2(r, CHAN_MAX);
-               rgba[i][GCOMP] = (GLchan) MIN2(g, CHAN_MAX);
-               rgba[i][BCOMP] = (GLchan) MIN2(b, CHAN_MAX);
-#endif
             }
          }
          else {
             /* 2-term addition */
-            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argRGB[0];
-            const GLchan (*arg1)[4] = (const GLchan (*)[4]) argRGB[1];
+            const GLfloat (*arg0)[4] = (const GLfloat (*)[4]) argRGB[0];
+            const GLfloat (*arg1)[4] = (const GLfloat (*)[4]) argRGB[1];
             for (i = 0; i < n; i++) {
-#if CHAN_TYPE == GL_FLOAT
                rgba[i][RCOMP] = (arg0[i][RCOMP] + arg1[i][RCOMP]) * RGBmult;
                rgba[i][GCOMP] = (arg0[i][GCOMP] + arg1[i][GCOMP]) * RGBmult;
                rgba[i][BCOMP] = (arg0[i][BCOMP] + arg1[i][BCOMP]) * RGBmult;
-#else
-               GLint r = ((GLint) arg0[i][RCOMP] + (GLint) arg1[i][RCOMP]) << RGBshift;
-               GLint g = ((GLint) arg0[i][GCOMP] + (GLint) arg1[i][GCOMP]) << RGBshift;
-               GLint b = ((GLint) arg0[i][BCOMP] + (GLint) arg1[i][BCOMP]) << RGBshift;
-               rgba[i][RCOMP] = (GLchan) MIN2(r, CHAN_MAX);
-               rgba[i][GCOMP] = (GLchan) MIN2(g, CHAN_MAX);
-               rgba[i][BCOMP] = (GLchan) MIN2(b, CHAN_MAX);
-#endif
             }
          }
          break;
       case GL_ADD_SIGNED:
          if (textureUnit->EnvMode == GL_COMBINE4_NV) {
             /* (a * b) + (c * d) - 0.5 */
-            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argRGB[0];
-            const GLchan (*arg1)[4] = (const GLchan (*)[4]) argRGB[1];
-            const GLchan (*arg2)[4] = (const GLchan (*)[4]) argRGB[2];
-            const GLchan (*arg3)[4] = (const GLchan (*)[4]) argRGB[3];
+            const GLfloat (*arg0)[4] = (const GLfloat (*)[4]) argRGB[0];
+            const GLfloat (*arg1)[4] = (const GLfloat (*)[4]) argRGB[1];
+            const GLfloat (*arg2)[4] = (const GLfloat (*)[4]) argRGB[2];
+            const GLfloat (*arg3)[4] = (const GLfloat (*)[4]) argRGB[3];
             for (i = 0; i < n; i++) {
-#if CHAN_TYPE == GL_FLOAT
                rgba[i][RCOMP] = (arg0[i][RCOMP] + arg1[i][RCOMP] *
                                  arg2[i][RCOMP] + arg3[i][RCOMP] - 0.5) * RGBmult;
                rgba[i][GCOMP] = (arg0[i][GCOMP] + arg1[i][GCOMP] *
                                  arg2[i][GCOMP] + arg3[i][GCOMP] - 0.5) * RGBmult;
                rgba[i][BCOMP] = (arg0[i][BCOMP] + arg1[i][BCOMP] *
                                  arg2[i][BCOMP] + arg3[i][BCOMP] - 0.5) * RGBmult;
-#else
-               GLint r = (((PROD(arg0[i][RCOMP], arg1[i][RCOMP]) +
-                            PROD(arg2[i][RCOMP], arg3[i][RCOMP])) >> CHAN_BITS) - half)
-                          << RGBshift;
-               GLint g = (((PROD(arg0[i][GCOMP], arg1[i][GCOMP]) +
-                            PROD(arg2[i][GCOMP], arg3[i][GCOMP])) >> CHAN_BITS) - half)
-                          << RGBshift;
-               GLint b = (((PROD(arg0[i][BCOMP], arg1[i][BCOMP]) +
-                            PROD(arg2[i][BCOMP], arg3[i][BCOMP])) >> CHAN_BITS) - half)
-                          << RGBshift;
-               rgba[i][RCOMP] = (GLchan) CLAMP(r, 0, CHAN_MAX);
-               rgba[i][GCOMP] = (GLchan) CLAMP(g, 0, CHAN_MAX);
-               rgba[i][BCOMP] = (GLchan) CLAMP(b, 0, CHAN_MAX);
-#endif
             }
          }
          else {
-            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argRGB[0];
-            const GLchan (*arg1)[4] = (const GLchan (*)[4]) argRGB[1];
+            const GLfloat (*arg0)[4] = (const GLfloat (*)[4]) argRGB[0];
+            const GLfloat (*arg1)[4] = (const GLfloat (*)[4]) argRGB[1];
             for (i = 0; i < n; i++) {
-#if CHAN_TYPE == GL_FLOAT
                rgba[i][RCOMP] = (arg0[i][RCOMP] + arg1[i][RCOMP] - 0.5) * RGBmult;
                rgba[i][GCOMP] = (arg0[i][GCOMP] + arg1[i][GCOMP] - 0.5) * RGBmult;
                rgba[i][BCOMP] = (arg0[i][BCOMP] + arg1[i][BCOMP] - 0.5) * RGBmult;
-#else
-               GLint r = (GLint) arg0[i][RCOMP] + (GLint) arg1[i][RCOMP] - half;
-               GLint g = (GLint) arg0[i][GCOMP] + (GLint) arg1[i][GCOMP] - half;
-               GLint b = (GLint) arg0[i][BCOMP] + (GLint) arg1[i][BCOMP] - half;
-               r = (r < 0) ? 0 : r << RGBshift;
-               g = (g < 0) ? 0 : g << RGBshift;
-               b = (b < 0) ? 0 : b << RGBshift;
-               rgba[i][RCOMP] = (GLchan) MIN2(r, CHAN_MAX);
-               rgba[i][GCOMP] = (GLchan) MIN2(g, CHAN_MAX);
-               rgba[i][BCOMP] = (GLchan) MIN2(b, CHAN_MAX);
-#endif
             }
          }
          break;
       case GL_INTERPOLATE:
          {
-            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argRGB[0];
-            const GLchan (*arg1)[4] = (const GLchan (*)[4]) argRGB[1];
-            const GLchan (*arg2)[4] = (const GLchan (*)[4]) argRGB[2];
-#if CHAN_TYPE != GL_FLOAT
-            const GLint shift = CHAN_BITS - RGBshift;
-#endif
+            const GLfloat (*arg0)[4] = (const GLfloat (*)[4]) argRGB[0];
+            const GLfloat (*arg1)[4] = (const GLfloat (*)[4]) argRGB[1];
+            const GLfloat (*arg2)[4] = (const GLfloat (*)[4]) argRGB[2];
             for (i = 0; i < n; i++) {
-#if CHAN_TYPE == GL_FLOAT
                rgba[i][RCOMP] = (arg0[i][RCOMP] * arg2[i][RCOMP] +
-                      arg1[i][RCOMP] * (CHAN_MAXF - arg2[i][RCOMP])) * RGBmult;
+                      arg1[i][RCOMP] * (1.0F - arg2[i][RCOMP])) * RGBmult;
                rgba[i][GCOMP] = (arg0[i][GCOMP] * arg2[i][GCOMP] +
-                      arg1[i][GCOMP] * (CHAN_MAXF - arg2[i][GCOMP])) * RGBmult;
+                      arg1[i][GCOMP] * (1.0F - arg2[i][GCOMP])) * RGBmult;
                rgba[i][BCOMP] = (arg0[i][BCOMP] * arg2[i][BCOMP] +
-                      arg1[i][BCOMP] * (CHAN_MAXF - arg2[i][BCOMP])) * RGBmult;
-#else
-               GLuint r = (PROD(arg0[i][RCOMP], arg2[i][RCOMP])
-                           + PROD(arg1[i][RCOMP], CHAN_MAX - arg2[i][RCOMP]))
-                              >> shift;
-               GLuint g = (PROD(arg0[i][GCOMP], arg2[i][GCOMP])
-                           + PROD(arg1[i][GCOMP], CHAN_MAX - arg2[i][GCOMP]))
-                              >> shift;
-               GLuint b = (PROD(arg0[i][BCOMP], arg2[i][BCOMP])
-                           + PROD(arg1[i][BCOMP], CHAN_MAX - arg2[i][BCOMP]))
-                              >> shift;
-               rgba[i][RCOMP] = (GLchan) MIN2(r, CHAN_MAX);
-               rgba[i][GCOMP] = (GLchan) MIN2(g, CHAN_MAX);
-               rgba[i][BCOMP] = (GLchan) MIN2(b, CHAN_MAX);
-#endif
+                      arg1[i][BCOMP] * (1.0F - arg2[i][BCOMP])) * RGBmult;
             }
          }
          break;
       case GL_SUBTRACT:
          {
-            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argRGB[0];
-            const GLchan (*arg1)[4] = (const GLchan (*)[4]) argRGB[1];
+            const GLfloat (*arg0)[4] = (const GLfloat (*)[4]) argRGB[0];
+            const GLfloat (*arg1)[4] = (const GLfloat (*)[4]) argRGB[1];
             for (i = 0; i < n; i++) {
-#if CHAN_TYPE == GL_FLOAT
                rgba[i][RCOMP] = (arg0[i][RCOMP] - arg1[i][RCOMP]) * RGBmult;
                rgba[i][GCOMP] = (arg0[i][GCOMP] - arg1[i][GCOMP]) * RGBmult;
                rgba[i][BCOMP] = (arg0[i][BCOMP] - arg1[i][BCOMP]) * RGBmult;
-#else
-               GLint r = ((GLint) arg0[i][RCOMP] - (GLint) arg1[i][RCOMP]) << RGBshift;
-               GLint g = ((GLint) arg0[i][GCOMP] - (GLint) arg1[i][GCOMP]) << RGBshift;
-               GLint b = ((GLint) arg0[i][BCOMP] - (GLint) arg1[i][BCOMP]) << RGBshift;
-               rgba[i][RCOMP] = (GLchan) CLAMP(r, 0, CHAN_MAX);
-               rgba[i][GCOMP] = (GLchan) CLAMP(g, 0, CHAN_MAX);
-               rgba[i][BCOMP] = (GLchan) CLAMP(b, 0, CHAN_MAX);
-#endif
             }
          }
          break;
@@ -455,25 +364,15 @@ texture_combine( const GLcontext *ctx, GLuint unit, GLuint n,
       case GL_DOT3_RGBA_EXT:
          {
             /* Do not scale the result by 1 2 or 4 */
-            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argRGB[0];
-            const GLchan (*arg1)[4] = (const GLchan (*)[4]) argRGB[1];
+            const GLfloat (*arg0)[4] = (const GLfloat (*)[4]) argRGB[0];
+            const GLfloat (*arg1)[4] = (const GLfloat (*)[4]) argRGB[1];
             for (i = 0; i < n; i++) {
-#if CHAN_TYPE == GL_FLOAT
-               GLchan dot = ((arg0[i][RCOMP]-0.5F) * (arg1[i][RCOMP]-0.5F) +
+               GLfloat dot = ((arg0[i][RCOMP]-0.5F) * (arg1[i][RCOMP]-0.5F) +
                              (arg0[i][GCOMP]-0.5F) * (arg1[i][GCOMP]-0.5F) +
                              (arg0[i][BCOMP]-0.5F) * (arg1[i][BCOMP]-0.5F))
                             * 4.0F;
-               dot = CLAMP(dot, 0.0F, CHAN_MAXF);
-#else
-               GLint dot = (S_PROD((GLint)arg0[i][RCOMP] - half,
-				   (GLint)arg1[i][RCOMP] - half) +
-			    S_PROD((GLint)arg0[i][GCOMP] - half,
-				   (GLint)arg1[i][GCOMP] - half) +
-			    S_PROD((GLint)arg0[i][BCOMP] - half,
-				   (GLint)arg1[i][BCOMP] - half)) >> 6;
-               dot = CLAMP(dot, 0, CHAN_MAX);
-#endif
-               rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = (GLchan) dot;
+               dot = CLAMP(dot, 0.0F, 1.0F);
+               rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = (GLfloat) dot;
             }
          }
          break;
@@ -481,113 +380,60 @@ texture_combine( const GLcontext *ctx, GLuint unit, GLuint n,
       case GL_DOT3_RGBA:
          {
             /* DO scale the result by 1 2 or 4 */
-            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argRGB[0];
-            const GLchan (*arg1)[4] = (const GLchan (*)[4]) argRGB[1];
+            const GLfloat (*arg0)[4] = (const GLfloat (*)[4]) argRGB[0];
+            const GLfloat (*arg1)[4] = (const GLfloat (*)[4]) argRGB[1];
             for (i = 0; i < n; i++) {
-#if CHAN_TYPE == GL_FLOAT
-               GLchan dot = ((arg0[i][RCOMP]-0.5F) * (arg1[i][RCOMP]-0.5F) +
+               GLfloat dot = ((arg0[i][RCOMP]-0.5F) * (arg1[i][RCOMP]-0.5F) +
                              (arg0[i][GCOMP]-0.5F) * (arg1[i][GCOMP]-0.5F) +
                              (arg0[i][BCOMP]-0.5F) * (arg1[i][BCOMP]-0.5F))
                             * 4.0F * RGBmult;
-               dot = CLAMP(dot, 0.0, CHAN_MAXF);
-#else
-               GLint dot = (S_PROD((GLint)arg0[i][RCOMP] - half,
-				   (GLint)arg1[i][RCOMP] - half) +
-			    S_PROD((GLint)arg0[i][GCOMP] - half,
-				   (GLint)arg1[i][GCOMP] - half) +
-			    S_PROD((GLint)arg0[i][BCOMP] - half,
-				   (GLint)arg1[i][BCOMP] - half)) >> 6;
-               dot <<= RGBshift;
-               dot = CLAMP(dot, 0, CHAN_MAX);
-#endif
-               rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = (GLchan) dot;
+               dot = CLAMP(dot, 0.0, 1.0F);
+               rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = (GLfloat) dot;
             }
          }
          break;
       case GL_MODULATE_ADD_ATI:
          {
-            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argRGB[0];
-            const GLchan (*arg1)[4] = (const GLchan (*)[4]) argRGB[1];
-            const GLchan (*arg2)[4] = (const GLchan (*)[4]) argRGB[2];
-#if CHAN_TYPE != GL_FLOAT
-            const GLint shift = CHAN_BITS - RGBshift;
-#endif
+            const GLfloat (*arg0)[4] = (const GLfloat (*)[4]) argRGB[0];
+            const GLfloat (*arg1)[4] = (const GLfloat (*)[4]) argRGB[1];
+            const GLfloat (*arg2)[4] = (const GLfloat (*)[4]) argRGB[2];
             for (i = 0; i < n; i++) {
-#if CHAN_TYPE == GL_FLOAT
-               rgba[i][RCOMP] = ((arg0[i][RCOMP] * arg2[i][RCOMP]) + arg1[i][RCOMP]) * RGBmult;
-               rgba[i][GCOMP] = ((arg0[i][GCOMP] * arg2[i][GCOMP]) + arg1[i][GCOMP]) * RGBmult;
-               rgba[i][BCOMP] = ((arg0[i][BCOMP] * arg2[i][BCOMP]) + arg1[i][BCOMP]) * RGBmult;
-#else
-               GLuint r = (PROD(arg0[i][RCOMP], arg2[i][RCOMP])
-                           + ((GLuint) arg1[i][RCOMP] << CHAN_BITS)) >> shift;
-               GLuint g = (PROD(arg0[i][GCOMP], arg2[i][GCOMP])
-                           + ((GLuint) arg1[i][GCOMP] << CHAN_BITS)) >> shift;
-               GLuint b = (PROD(arg0[i][BCOMP], arg2[i][BCOMP])
-                           + ((GLuint) arg1[i][BCOMP] << CHAN_BITS)) >> shift;
-               rgba[i][RCOMP] = (GLchan) MIN2(r, CHAN_MAX);
-               rgba[i][GCOMP] = (GLchan) MIN2(g, CHAN_MAX);
-               rgba[i][BCOMP] = (GLchan) MIN2(b, CHAN_MAX);
-#endif
+               rgba[i][RCOMP] = ((arg0[i][RCOMP] * arg2[i][RCOMP]) +
+                                 arg1[i][RCOMP]) * RGBmult;
+               rgba[i][GCOMP] = ((arg0[i][GCOMP] * arg2[i][GCOMP]) +
+                                 arg1[i][GCOMP]) * RGBmult;
+               rgba[i][BCOMP] = ((arg0[i][BCOMP] * arg2[i][BCOMP]) +
+                                 arg1[i][BCOMP]) * RGBmult;
             }
 	 }
          break;
       case GL_MODULATE_SIGNED_ADD_ATI:
          {
-            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argRGB[0];
-            const GLchan (*arg1)[4] = (const GLchan (*)[4]) argRGB[1];
-            const GLchan (*arg2)[4] = (const GLchan (*)[4]) argRGB[2];
-#if CHAN_TYPE != GL_FLOAT
-            const GLint shift = CHAN_BITS - RGBshift;
-#endif
+            const GLfloat (*arg0)[4] = (const GLfloat (*)[4]) argRGB[0];
+            const GLfloat (*arg1)[4] = (const GLfloat (*)[4]) argRGB[1];
+            const GLfloat (*arg2)[4] = (const GLfloat (*)[4]) argRGB[2];
             for (i = 0; i < n; i++) {
-#if CHAN_TYPE == GL_FLOAT
-               rgba[i][RCOMP] = ((arg0[i][RCOMP] * arg2[i][RCOMP]) + arg1[i][RCOMP] - 0.5) * RGBmult;
-               rgba[i][GCOMP] = ((arg0[i][GCOMP] * arg2[i][GCOMP]) + arg1[i][GCOMP] - 0.5) * RGBmult;
-               rgba[i][BCOMP] = ((arg0[i][BCOMP] * arg2[i][BCOMP]) + arg1[i][BCOMP] - 0.5) * RGBmult;
-#else
-               GLint r = (S_PROD(arg0[i][RCOMP], arg2[i][RCOMP])
-			  + (((GLint) arg1[i][RCOMP] - half) << CHAN_BITS))
-		    >> shift;
-               GLint g = (S_PROD(arg0[i][GCOMP], arg2[i][GCOMP])
-			  + (((GLint) arg1[i][GCOMP] - half) << CHAN_BITS))
-		    >> shift;
-               GLint b = (S_PROD(arg0[i][BCOMP], arg2[i][BCOMP])
-			  + (((GLint) arg1[i][BCOMP] - half) << CHAN_BITS))
-		    >> shift;
-               rgba[i][RCOMP] = (GLchan) CLAMP(r, 0, CHAN_MAX);
-               rgba[i][GCOMP] = (GLchan) CLAMP(g, 0, CHAN_MAX);
-               rgba[i][BCOMP] = (GLchan) CLAMP(b, 0, CHAN_MAX);
-#endif
+               rgba[i][RCOMP] = ((arg0[i][RCOMP] * arg2[i][RCOMP]) +
+                                 arg1[i][RCOMP] - 0.5) * RGBmult;
+               rgba[i][GCOMP] = ((arg0[i][GCOMP] * arg2[i][GCOMP]) +
+                                 arg1[i][GCOMP] - 0.5) * RGBmult;
+               rgba[i][BCOMP] = ((arg0[i][BCOMP] * arg2[i][BCOMP]) +
+                                 arg1[i][BCOMP] - 0.5) * RGBmult;
             }
 	 }
          break;
       case GL_MODULATE_SUBTRACT_ATI:
          {
-            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argRGB[0];
-            const GLchan (*arg1)[4] = (const GLchan (*)[4]) argRGB[1];
-            const GLchan (*arg2)[4] = (const GLchan (*)[4]) argRGB[2];
-#if CHAN_TYPE != GL_FLOAT
-            const GLint shift = CHAN_BITS - RGBshift;
-#endif
+            const GLfloat (*arg0)[4] = (const GLfloat (*)[4]) argRGB[0];
+            const GLfloat (*arg1)[4] = (const GLfloat (*)[4]) argRGB[1];
+            const GLfloat (*arg2)[4] = (const GLfloat (*)[4]) argRGB[2];
             for (i = 0; i < n; i++) {
-#if CHAN_TYPE == GL_FLOAT
-               rgba[i][RCOMP] = ((arg0[i][RCOMP] * arg2[i][RCOMP]) - arg1[i][RCOMP]) * RGBmult;
-               rgba[i][GCOMP] = ((arg0[i][GCOMP] * arg2[i][GCOMP]) - arg1[i][GCOMP]) * RGBmult;
-               rgba[i][BCOMP] = ((arg0[i][BCOMP] * arg2[i][BCOMP]) - arg1[i][BCOMP]) * RGBmult;
-#else
-               GLint r = (S_PROD(arg0[i][RCOMP], arg2[i][RCOMP])
-			  - ((GLint) arg1[i][RCOMP] << CHAN_BITS))
-		    >> shift;
-               GLint g = (S_PROD(arg0[i][GCOMP], arg2[i][GCOMP])
-			  - ((GLint) arg1[i][GCOMP] << CHAN_BITS))
-		    >> shift;
-               GLint b = (S_PROD(arg0[i][BCOMP], arg2[i][BCOMP])
-			  - ((GLint) arg1[i][BCOMP] << CHAN_BITS))
-		    >> shift;
-               rgba[i][RCOMP] = (GLchan) CLAMP(r, 0, CHAN_MAX);
-               rgba[i][GCOMP] = (GLchan) CLAMP(g, 0, CHAN_MAX);
-               rgba[i][BCOMP] = (GLchan) CLAMP(b, 0, CHAN_MAX);
-#endif
+               rgba[i][RCOMP] = ((arg0[i][RCOMP] * arg2[i][RCOMP]) -
+                                 arg1[i][RCOMP]) * RGBmult;
+               rgba[i][GCOMP] = ((arg0[i][GCOMP] * arg2[i][GCOMP]) -
+                                 arg1[i][GCOMP]) * RGBmult;
+               rgba[i][BCOMP] = ((arg0[i][BCOMP] * arg2[i][BCOMP]) -
+                                 arg1[i][BCOMP]) * RGBmult;
             }
 	 }
          break;
@@ -617,15 +463,11 @@ texture_combine( const GLcontext *ctx, GLuint unit, GLuint n,
    switch (textureUnit->_CurrentCombine->ModeA) {
       case GL_REPLACE:
          {
-            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argA[0];
+            const GLfloat (*arg0)[4] = (const GLfloat (*)[4]) argA[0];
             if (Ashift) {
                for (i = 0; i < n; i++) {
-#if CHAN_TYPE == GL_FLOAT
-                  GLchan a = arg0[i][ACOMP] * Amult;
-#else
-                  GLuint a = (GLuint) arg0[i][ACOMP] << Ashift;
-#endif
-                  rgba[i][ACOMP] = (GLchan) MIN2(a, CHAN_MAX);
+                  GLfloat a = arg0[i][ACOMP] * Amult;
+                  rgba[i][ACOMP] = (GLfloat) MIN2(a, 1.0F);
                }
             }
             else {
@@ -637,182 +479,107 @@ texture_combine( const GLcontext *ctx, GLuint unit, GLuint n,
          break;
       case GL_MODULATE:
          {
-            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argA[0];
-            const GLchan (*arg1)[4] = (const GLchan (*)[4]) argA[1];
-#if CHAN_TYPE != GL_FLOAT
-            const GLint shift = CHAN_BITS - Ashift;
-#endif
+            const GLfloat (*arg0)[4] = (const GLfloat (*)[4]) argA[0];
+            const GLfloat (*arg1)[4] = (const GLfloat (*)[4]) argA[1];
             for (i = 0; i < n; i++) {
-#if CHAN_TYPE == GL_FLOAT
                rgba[i][ACOMP] = arg0[i][ACOMP] * arg1[i][ACOMP] * Amult;
-#else
-               GLuint a = (PROD(arg0[i][ACOMP], arg1[i][ACOMP]) >> shift);
-               rgba[i][ACOMP] = (GLchan) MIN2(a, CHAN_MAX);
-#endif
             }
          }
          break;
       case GL_ADD:
          if (textureUnit->EnvMode == GL_COMBINE4_NV) {
             /* (a * b) + (c * d) */
-            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argA[0];
-            const GLchan (*arg1)[4] = (const GLchan (*)[4]) argA[1];
-            const GLchan (*arg2)[4] = (const GLchan (*)[4]) argA[2];
-            const GLchan (*arg3)[4] = (const GLchan (*)[4]) argA[3];
+            const GLfloat (*arg0)[4] = (const GLfloat (*)[4]) argA[0];
+            const GLfloat (*arg1)[4] = (const GLfloat (*)[4]) argA[1];
+            const GLfloat (*arg2)[4] = (const GLfloat (*)[4]) argA[2];
+            const GLfloat (*arg3)[4] = (const GLfloat (*)[4]) argA[3];
             for (i = 0; i < n; i++) {
-#if CHAN_TYPE == GL_FLOAT
                rgba[i][ACOMP] = (arg0[i][ACOMP] * arg1[i][ACOMP] +
                                  arg2[i][ACOMP] * arg3[i][ACOMP]) * Amult;
-#else
-               const GLint shift = CHAN_BITS - Ashift;
-               GLint a = (PROD(arg0[i][ACOMP], arg1[i][ACOMP]) >> shift) +
-                         (PROD(arg2[i][ACOMP], arg3[i][ACOMP]) >> shift);
-               rgba[i][ACOMP] = (GLchan) MIN2(a, CHAN_MAX);
-#endif
             }
          }
          else {
             /* two-term add */
-            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argA[0];
-            const GLchan (*arg1)[4] = (const GLchan (*)[4]) argA[1];
+            const GLfloat (*arg0)[4] = (const GLfloat (*)[4]) argA[0];
+            const GLfloat (*arg1)[4] = (const GLfloat (*)[4]) argA[1];
             for (i = 0; i < n; i++) {
-#if CHAN_TYPE == GL_FLOAT
                rgba[i][ACOMP] = (arg0[i][ACOMP] + arg1[i][ACOMP]) * Amult;
-#else
-               GLint a = ((GLint) arg0[i][ACOMP] + arg1[i][ACOMP]) << Ashift;
-               rgba[i][ACOMP] = (GLchan) MIN2(a, CHAN_MAX);
-#endif
             }
          }
          break;
       case GL_ADD_SIGNED:
          if (textureUnit->EnvMode == GL_COMBINE4_NV) {
             /* (a * b) + (c * d) - 0.5 */
-            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argA[0];
-            const GLchan (*arg1)[4] = (const GLchan (*)[4]) argA[1];
-            const GLchan (*arg2)[4] = (const GLchan (*)[4]) argA[2];
-            const GLchan (*arg3)[4] = (const GLchan (*)[4]) argA[3];
+            const GLfloat (*arg0)[4] = (const GLfloat (*)[4]) argA[0];
+            const GLfloat (*arg1)[4] = (const GLfloat (*)[4]) argA[1];
+            const GLfloat (*arg2)[4] = (const GLfloat (*)[4]) argA[2];
+            const GLfloat (*arg3)[4] = (const GLfloat (*)[4]) argA[3];
             for (i = 0; i < n; i++) {
-#if CHAN_TYPE == GL_FLOAT
                rgba[i][ACOMP] = (arg0[i][ACOMP] * arg1[i][ACOMP] +
                                  arg2[i][ACOMP] * arg3[i][ACOMP] -
                                  0.5) * Amult;
-#else
-               GLint a = (((PROD(arg0[i][ACOMP], arg1[i][ACOMP]) +
-                            PROD(arg2[i][ACOMP], arg3[i][ACOMP])) >> CHAN_BITS) - half)
-                          << Ashift;
-               rgba[i][ACOMP] = (GLchan) CLAMP(a, 0, CHAN_MAX);
-#endif
             }
          }
          else {
             /* a + b - 0.5 */
-            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argA[0];
-            const GLchan (*arg1)[4] = (const GLchan (*)[4]) argA[1];
+            const GLfloat (*arg0)[4] = (const GLfloat (*)[4]) argA[0];
+            const GLfloat (*arg1)[4] = (const GLfloat (*)[4]) argA[1];
             for (i = 0; i < n; i++) {
-#if CHAN_TYPE == GL_FLOAT
                rgba[i][ACOMP] = (arg0[i][ACOMP] + arg1[i][ACOMP] - 0.5F) * Amult;
-#else
-               GLint a = (GLint) arg0[i][ACOMP] + (GLint) arg1[i][ACOMP] -half;
-               a = (a < 0) ? 0 : a << Ashift;
-               rgba[i][ACOMP] = (GLchan) CLAMP(a, 0, CHAN_MAX);
-#endif
             }
          }
          break;
       case GL_INTERPOLATE:
          {
-            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argA[0];
-            const GLchan (*arg1)[4] = (const GLchan (*)[4]) argA[1];
-            const GLchan (*arg2)[4] = (const GLchan (*)[4]) argA[2];
-#if CHAN_TYPE != GL_FLOAT
-            const GLint shift = CHAN_BITS - Ashift;
-#endif
+            const GLfloat (*arg0)[4] = (const GLfloat (*)[4]) argA[0];
+            const GLfloat (*arg1)[4] = (const GLfloat (*)[4]) argA[1];
+            const GLfloat (*arg2)[4] = (const GLfloat (*)[4]) argA[2];
             for (i=0; i<n; i++) {
-#if CHAN_TYPE == GL_FLOAT
                rgba[i][ACOMP] = (arg0[i][ACOMP] * arg2[i][ACOMP] +
-                                 arg1[i][ACOMP] * (CHAN_MAXF - arg2[i][ACOMP]))
+                                 arg1[i][ACOMP] * (1.0F - arg2[i][ACOMP]))
                                 * Amult;
-#else
-               GLuint a = (PROD(arg0[i][ACOMP], arg2[i][ACOMP])
-                           + PROD(arg1[i][ACOMP], CHAN_MAX - arg2[i][ACOMP]))
-                              >> shift;
-               rgba[i][ACOMP] = (GLchan) MIN2(a, CHAN_MAX);
-#endif
             }
          }
          break;
       case GL_SUBTRACT:
          {
-            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argA[0];
-            const GLchan (*arg1)[4] = (const GLchan (*)[4]) argA[1];
+            const GLfloat (*arg0)[4] = (const GLfloat (*)[4]) argA[0];
+            const GLfloat (*arg1)[4] = (const GLfloat (*)[4]) argA[1];
             for (i = 0; i < n; i++) {
-#if CHAN_TYPE == GL_FLOAT
                rgba[i][ACOMP] = (arg0[i][ACOMP] - arg1[i][ACOMP]) * Amult;
-#else
-               GLint a = ((GLint) arg0[i][ACOMP] - (GLint) arg1[i][ACOMP]) << Ashift;
-               rgba[i][ACOMP] = (GLchan) CLAMP(a, 0, CHAN_MAX);
-#endif
             }
          }
          break;
       case GL_MODULATE_ADD_ATI:
          {
-            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argA[0];
-            const GLchan (*arg1)[4] = (const GLchan (*)[4]) argA[1];
-            const GLchan (*arg2)[4] = (const GLchan (*)[4]) argA[2];
-#if CHAN_TYPE != GL_FLOAT
-            const GLint shift = CHAN_BITS - Ashift;
-#endif
+            const GLfloat (*arg0)[4] = (const GLfloat (*)[4]) argA[0];
+            const GLfloat (*arg1)[4] = (const GLfloat (*)[4]) argA[1];
+            const GLfloat (*arg2)[4] = (const GLfloat (*)[4]) argA[2];
             for (i = 0; i < n; i++) {
-#if CHAN_TYPE == GL_FLOAT
-               rgba[i][ACOMP] = ((arg0[i][ACOMP] * arg2[i][ACOMP]) + arg1[i][ACOMP]) * Amult;
-#else
-               GLint a = (PROD(arg0[i][ACOMP], arg2[i][ACOMP])
-			   + ((GLuint) arg1[i][ACOMP] << CHAN_BITS))
-		    >> shift;
-               rgba[i][ACOMP] = (GLchan) CLAMP(a, 0, CHAN_MAX);
-#endif
+               rgba[i][ACOMP] = ((arg0[i][ACOMP] * arg2[i][ACOMP])
+                                 + arg1[i][ACOMP]) * Amult;
             }
          }
          break;
       case GL_MODULATE_SIGNED_ADD_ATI:
          {
-            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argA[0];
-            const GLchan (*arg1)[4] = (const GLchan (*)[4]) argA[1];
-            const GLchan (*arg2)[4] = (const GLchan (*)[4]) argA[2];
-#if CHAN_TYPE != GL_FLOAT
-            const GLint shift = CHAN_BITS - Ashift;
-#endif
+            const GLfloat (*arg0)[4] = (const GLfloat (*)[4]) argA[0];
+            const GLfloat (*arg1)[4] = (const GLfloat (*)[4]) argA[1];
+            const GLfloat (*arg2)[4] = (const GLfloat (*)[4]) argA[2];
             for (i = 0; i < n; i++) {
-#if CHAN_TYPE == GL_FLOAT
-               rgba[i][ACOMP] = ((arg0[i][ACOMP] * arg2[i][ACOMP]) + arg1[i][ACOMP] - 0.5F) * Amult;
-#else
-               GLint a = (S_PROD(arg0[i][ACOMP], arg2[i][ACOMP])
-			  + (((GLint) arg1[i][ACOMP] - half) << CHAN_BITS))
-		    >> shift;
-               rgba[i][ACOMP] = (GLchan) CLAMP(a, 0, CHAN_MAX);
-#endif
+               rgba[i][ACOMP] = ((arg0[i][ACOMP] * arg2[i][ACOMP]) +
+                                 arg1[i][ACOMP] - 0.5F) * Amult;
             }
          }
          break;
       case GL_MODULATE_SUBTRACT_ATI:
          {
-            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argA[0];
-            const GLchan (*arg1)[4] = (const GLchan (*)[4]) argA[1];
-            const GLchan (*arg2)[4] = (const GLchan (*)[4]) argA[2];
-#if CHAN_TYPE != GL_FLOAT
-            const GLint shift = CHAN_BITS - Ashift;
-#endif
+            const GLfloat (*arg0)[4] = (const GLfloat (*)[4]) argA[0];
+            const GLfloat (*arg1)[4] = (const GLfloat (*)[4]) argA[1];
+            const GLfloat (*arg2)[4] = (const GLfloat (*)[4]) argA[2];
             for (i = 0; i < n; i++) {
-#if CHAN_TYPE == GL_FLOAT
-               rgba[i][ACOMP] = ((arg0[i][ACOMP] * arg2[i][ACOMP]) - arg1[i][ACOMP]) * Amult;
-#else
-               GLint a = (S_PROD(arg0[i][ACOMP], arg2[i][ACOMP]) 
-			  - ((GLint) arg1[i][ACOMP] << CHAN_BITS))
-		    >> shift;
-               rgba[i][ACOMP] = (GLchan) CLAMP(a, 0, CHAN_MAX);
-#endif
+               rgba[i][ACOMP] = ((arg0[i][ACOMP] * arg2[i][ACOMP])
+                                 - arg1[i][ACOMP]) * Amult;
             }
          }
          break;
@@ -831,8 +598,15 @@ texture_combine( const GLcontext *ctx, GLuint unit, GLuint n,
 	 rgba[i][ACOMP] = rgba[i][RCOMP];
       }
    }
+
+   for (i = 0; i < n; i++) {
+      UNCLAMPED_FLOAT_TO_CHAN(rgbaChan[i][RCOMP], rgba[i][RCOMP]);
+      UNCLAMPED_FLOAT_TO_CHAN(rgbaChan[i][GCOMP], rgba[i][GCOMP]);
+      UNCLAMPED_FLOAT_TO_CHAN(rgbaChan[i][BCOMP], rgba[i][BCOMP]);
+      UNCLAMPED_FLOAT_TO_CHAN(rgbaChan[i][ACOMP], rgba[i][ACOMP]);
+   }
 }
-#undef PROD
+
 
 
 /**
@@ -840,17 +614,17 @@ texture_combine( const GLcontext *ctx, GLuint unit, GLuint n,
  * See GL_EXT_texture_swizzle.
  */
 static void
-swizzle_texels(GLuint swizzle, GLuint count, GLchan (*texels)[4])
+swizzle_texels(GLuint swizzle, GLuint count, GLfloat (*texels)[4])
 {
    const GLuint swzR = GET_SWZ(swizzle, 0);
    const GLuint swzG = GET_SWZ(swizzle, 1);
    const GLuint swzB = GET_SWZ(swizzle, 2);
    const GLuint swzA = GET_SWZ(swizzle, 3);
-   GLchan vector[6];
+   GLfloat vector[6];
    GLuint i;
 
    vector[SWIZZLE_ZERO] = 0;
-   vector[SWIZZLE_ONE] = CHAN_MAX;
+   vector[SWIZZLE_ONE] = 1.0F;
 
    for (i = 0; i < count; i++) {
       vector[SWIZZLE_X] = texels[i][0];
@@ -880,13 +654,15 @@ static void
 texture_apply( const GLcontext *ctx,
                const struct gl_texture_unit *texUnit,
                GLuint n,
-               CONST GLchan primary_rgba[][4], CONST GLchan texel[][4],
-               GLchan rgba[][4] )
+               CONST GLfloat primary_rgba[][4], CONST GLfloat texel[][4],
+               GLchan rgbaChan[][4] )
 {
    GLint baseLevel;
    GLuint i;
-   GLchan Rc, Gc, Bc, Ac;
+   GLfloat Rc, Gc, Bc, Ac;
    GLenum format;
+   GLfloat rgba[MAX_WIDTH][4];
+
    (void) primary_rgba;
 
    ASSERT(texUnit);
@@ -904,6 +680,16 @@ texture_apply( const GLcontext *ctx,
       format = texUnit->_Current->DepthMode;
    }
 
+   if (texUnit->EnvMode != GL_REPLACE) {
+      /* convert GLchan colors to GLfloat */
+      for (i = 0; i < n; i++) {
+         rgba[i][RCOMP] = CHAN_TO_FLOAT(rgbaChan[i][RCOMP]);
+         rgba[i][GCOMP] = CHAN_TO_FLOAT(rgbaChan[i][GCOMP]);
+         rgba[i][BCOMP] = CHAN_TO_FLOAT(rgbaChan[i][BCOMP]);
+         rgba[i][ACOMP] = CHAN_TO_FLOAT(rgbaChan[i][ACOMP]);
+      }
+   }
+
    switch (texUnit->EnvMode) {
       case GL_REPLACE:
 	 switch (format) {
@@ -917,14 +703,14 @@ texture_apply( const GLcontext *ctx,
 	    case GL_LUMINANCE:
 	       for (i=0;i<n;i++) {
 		  /* Cv = Lt */
-                  GLchan Lt = texel[i][RCOMP];
+                  GLfloat Lt = texel[i][RCOMP];
                   rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = Lt;
                   /* Av = Af */
 	       }
 	       break;
 	    case GL_LUMINANCE_ALPHA:
 	       for (i=0;i<n;i++) {
-                  GLchan Lt = texel[i][RCOMP];
+                  GLfloat Lt = texel[i][RCOMP];
 		  /* Cv = Lt */
 		  rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = Lt;
 		  /* Av = At */
@@ -934,7 +720,7 @@ texture_apply( const GLcontext *ctx,
 	    case GL_INTENSITY:
 	       for (i=0;i<n;i++) {
 		  /* Cv = It */
-                  GLchan It = texel[i][RCOMP];
+                  GLfloat It = texel[i][RCOMP];
                   rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = It;
                   /* Av = It */
                   rgba[i][ACOMP] = It;
@@ -971,58 +757,58 @@ texture_apply( const GLcontext *ctx,
 	       for (i=0;i<n;i++) {
 		  /* Cv = Cf */
 		  /* Av = AfAt */
-		  rgba[i][ACOMP] = CHAN_PRODUCT( rgba[i][ACOMP], texel[i][ACOMP] );
+		  rgba[i][ACOMP] = rgba[i][ACOMP] * texel[i][ACOMP];
 	       }
 	       break;
 	    case GL_LUMINANCE:
 	       for (i=0;i<n;i++) {
 		  /* Cv = LtCf */
-                  GLchan Lt = texel[i][RCOMP];
-		  rgba[i][RCOMP] = CHAN_PRODUCT( rgba[i][RCOMP], Lt );
-		  rgba[i][GCOMP] = CHAN_PRODUCT( rgba[i][GCOMP], Lt );
-		  rgba[i][BCOMP] = CHAN_PRODUCT( rgba[i][BCOMP], Lt );
+                  GLfloat Lt = texel[i][RCOMP];
+		  rgba[i][RCOMP] = rgba[i][RCOMP] * Lt;
+		  rgba[i][GCOMP] = rgba[i][GCOMP] * Lt;
+		  rgba[i][BCOMP] = rgba[i][BCOMP] * Lt;
 		  /* Av = Af */
 	       }
 	       break;
 	    case GL_LUMINANCE_ALPHA:
 	       for (i=0;i<n;i++) {
 		  /* Cv = CfLt */
-                  GLchan Lt = texel[i][RCOMP];
-		  rgba[i][RCOMP] = CHAN_PRODUCT( rgba[i][RCOMP], Lt );
-		  rgba[i][GCOMP] = CHAN_PRODUCT( rgba[i][GCOMP], Lt );
-		  rgba[i][BCOMP] = CHAN_PRODUCT( rgba[i][BCOMP], Lt );
+                  GLfloat Lt = texel[i][RCOMP];
+		  rgba[i][RCOMP] = rgba[i][RCOMP] * Lt;
+		  rgba[i][GCOMP] = rgba[i][GCOMP] * Lt;
+		  rgba[i][BCOMP] = rgba[i][BCOMP] * Lt;
 		  /* Av = AfAt */
-		  rgba[i][ACOMP] = CHAN_PRODUCT( rgba[i][ACOMP], texel[i][ACOMP] );
+		  rgba[i][ACOMP] = rgba[i][ACOMP] * texel[i][ACOMP];
 	       }
 	       break;
 	    case GL_INTENSITY:
 	       for (i=0;i<n;i++) {
 		  /* Cv = CfIt */
-                  GLchan It = texel[i][RCOMP];
-		  rgba[i][RCOMP] = CHAN_PRODUCT( rgba[i][RCOMP], It );
-		  rgba[i][GCOMP] = CHAN_PRODUCT( rgba[i][GCOMP], It );
-		  rgba[i][BCOMP] = CHAN_PRODUCT( rgba[i][BCOMP], It );
+                  GLfloat It = texel[i][RCOMP];
+		  rgba[i][RCOMP] = rgba[i][RCOMP] * It;
+		  rgba[i][GCOMP] = rgba[i][GCOMP] * It;
+		  rgba[i][BCOMP] = rgba[i][BCOMP] * It;
 		  /* Av = AfIt */
-		  rgba[i][ACOMP] = CHAN_PRODUCT( rgba[i][ACOMP], It );
+		  rgba[i][ACOMP] = rgba[i][ACOMP] * It;
 	       }
 	       break;
 	    case GL_RGB:
 	       for (i=0;i<n;i++) {
 		  /* Cv = CfCt */
-		  rgba[i][RCOMP] = CHAN_PRODUCT( rgba[i][RCOMP], texel[i][RCOMP] );
-		  rgba[i][GCOMP] = CHAN_PRODUCT( rgba[i][GCOMP], texel[i][GCOMP] );
-		  rgba[i][BCOMP] = CHAN_PRODUCT( rgba[i][BCOMP], texel[i][BCOMP] );
+		  rgba[i][RCOMP] = rgba[i][RCOMP] * texel[i][RCOMP];
+		  rgba[i][GCOMP] = rgba[i][GCOMP] * texel[i][GCOMP];
+		  rgba[i][BCOMP] = rgba[i][BCOMP] * texel[i][BCOMP];
 		  /* Av = Af */
 	       }
 	       break;
 	    case GL_RGBA:
 	       for (i=0;i<n;i++) {
 		  /* Cv = CfCt */
-		  rgba[i][RCOMP] = CHAN_PRODUCT( rgba[i][RCOMP], texel[i][RCOMP] );
-		  rgba[i][GCOMP] = CHAN_PRODUCT( rgba[i][GCOMP], texel[i][GCOMP] );
-		  rgba[i][BCOMP] = CHAN_PRODUCT( rgba[i][BCOMP], texel[i][BCOMP] );
+		  rgba[i][RCOMP] = rgba[i][RCOMP] * texel[i][RCOMP];
+		  rgba[i][GCOMP] = rgba[i][GCOMP] * texel[i][GCOMP];
+		  rgba[i][BCOMP] = rgba[i][BCOMP] * texel[i][BCOMP];
 		  /* Av = AfAt */
-		  rgba[i][ACOMP] = CHAN_PRODUCT( rgba[i][ACOMP], texel[i][ACOMP] );
+		  rgba[i][ACOMP] = rgba[i][ACOMP] * texel[i][ACOMP];
 	       }
 	       break;
             default:
@@ -1051,10 +837,10 @@ texture_apply( const GLcontext *ctx,
 	    case GL_RGBA:
 	       for (i=0;i<n;i++) {
 		  /* Cv = Cf(1-At) + CtAt */
-		  GLchan t = texel[i][ACOMP], s = CHAN_MAX - t;
-		  rgba[i][RCOMP] = CHAN_PRODUCT(rgba[i][RCOMP], s) + CHAN_PRODUCT(texel[i][RCOMP],t);
-		  rgba[i][GCOMP] = CHAN_PRODUCT(rgba[i][GCOMP], s) + CHAN_PRODUCT(texel[i][GCOMP],t);
-		  rgba[i][BCOMP] = CHAN_PRODUCT(rgba[i][BCOMP], s) + CHAN_PRODUCT(texel[i][BCOMP],t);
+		  GLfloat t = texel[i][ACOMP], s = 1.0F - t;
+		  rgba[i][RCOMP] = rgba[i][RCOMP] * s + texel[i][RCOMP] * t;
+		  rgba[i][GCOMP] = rgba[i][GCOMP] * s + texel[i][GCOMP] * t;
+		  rgba[i][BCOMP] = rgba[i][BCOMP] * s + texel[i][BCOMP] * t;
 		  /* Av = Af */
 	       }
 	       break;
@@ -1065,67 +851,73 @@ texture_apply( const GLcontext *ctx,
 	 break;
 
       case GL_BLEND:
-         UNCLAMPED_FLOAT_TO_CHAN(Rc, texUnit->EnvColor[0]);
-         UNCLAMPED_FLOAT_TO_CHAN(Gc, texUnit->EnvColor[1]);
-         UNCLAMPED_FLOAT_TO_CHAN(Bc, texUnit->EnvColor[2]);
-         UNCLAMPED_FLOAT_TO_CHAN(Ac, texUnit->EnvColor[3]);
+         Rc = texUnit->EnvColor[0];
+         Gc = texUnit->EnvColor[1];
+         Bc = texUnit->EnvColor[2];
+         Ac = texUnit->EnvColor[3];
 	 switch (format) {
 	    case GL_ALPHA:
 	       for (i=0;i<n;i++) {
 		  /* Cv = Cf */
 		  /* Av = AfAt */
-                  rgba[i][ACOMP] = CHAN_PRODUCT(rgba[i][ACOMP], texel[i][ACOMP]);
+                  rgba[i][ACOMP] = rgba[i][ACOMP] * texel[i][ACOMP];
 	       }
 	       break;
             case GL_LUMINANCE:
 	       for (i=0;i<n;i++) {
 		  /* Cv = Cf(1-Lt) + CcLt */
-		  GLchan Lt = texel[i][RCOMP], s = CHAN_MAX - Lt;
-		  rgba[i][RCOMP] = CHAN_PRODUCT(rgba[i][RCOMP], s) + CHAN_PRODUCT(Rc, Lt);
-		  rgba[i][GCOMP] = CHAN_PRODUCT(rgba[i][GCOMP], s) + CHAN_PRODUCT(Gc, Lt);
-		  rgba[i][BCOMP] = CHAN_PRODUCT(rgba[i][BCOMP], s) + CHAN_PRODUCT(Bc, Lt);
+		  GLfloat Lt = texel[i][RCOMP], s = 1.0F - Lt;
+		  rgba[i][RCOMP] = rgba[i][RCOMP] * s + Rc * Lt;
+		  rgba[i][GCOMP] = rgba[i][GCOMP] * s + Gc * Lt;
+		  rgba[i][BCOMP] = rgba[i][BCOMP] * s + Bc * Lt;
 		  /* Av = Af */
 	       }
 	       break;
 	    case GL_LUMINANCE_ALPHA:
 	       for (i=0;i<n;i++) {
 		  /* Cv = Cf(1-Lt) + CcLt */
-		  GLchan Lt = texel[i][RCOMP], s = CHAN_MAX - Lt;
-		  rgba[i][RCOMP] = CHAN_PRODUCT(rgba[i][RCOMP], s) + CHAN_PRODUCT(Rc, Lt);
-		  rgba[i][GCOMP] = CHAN_PRODUCT(rgba[i][GCOMP], s) + CHAN_PRODUCT(Gc, Lt);
-		  rgba[i][BCOMP] = CHAN_PRODUCT(rgba[i][BCOMP], s) + CHAN_PRODUCT(Bc, Lt);
+		  GLfloat Lt = texel[i][RCOMP], s = 1.0F - Lt;
+		  rgba[i][RCOMP] = rgba[i][RCOMP] * s + Rc * Lt;
+		  rgba[i][GCOMP] = rgba[i][GCOMP] * s + Gc * Lt;
+		  rgba[i][BCOMP] = rgba[i][BCOMP] * s + Bc * Lt;
 		  /* Av = AfAt */
-		  rgba[i][ACOMP] = CHAN_PRODUCT(rgba[i][ACOMP],texel[i][ACOMP]);
+		  rgba[i][ACOMP] = rgba[i][ACOMP] * texel[i][ACOMP];
 	       }
 	       break;
             case GL_INTENSITY:
 	       for (i=0;i<n;i++) {
 		  /* Cv = Cf(1-It) + CcIt */
-		  GLchan It = texel[i][RCOMP], s = CHAN_MAX - It;
-		  rgba[i][RCOMP] = CHAN_PRODUCT(rgba[i][RCOMP], s) + CHAN_PRODUCT(Rc, It);
-		  rgba[i][GCOMP] = CHAN_PRODUCT(rgba[i][GCOMP], s) + CHAN_PRODUCT(Gc, It);
-		  rgba[i][BCOMP] = CHAN_PRODUCT(rgba[i][BCOMP], s) + CHAN_PRODUCT(Bc, It);
+		  GLfloat It = texel[i][RCOMP], s = 1.0F - It;
+		  rgba[i][RCOMP] = rgba[i][RCOMP] * s + Rc * It;
+		  rgba[i][GCOMP] = rgba[i][GCOMP] * s + Gc * It;
+		  rgba[i][BCOMP] = rgba[i][BCOMP] * s + Bc * It;
                   /* Av = Af(1-It) + Ac*It */
-                  rgba[i][ACOMP] = CHAN_PRODUCT(rgba[i][ACOMP], s) + CHAN_PRODUCT(Ac, It);
+                  rgba[i][ACOMP] = rgba[i][ACOMP] * s + Ac * It;
                }
                break;
 	    case GL_RGB:
 	       for (i=0;i<n;i++) {
 		  /* Cv = Cf(1-Ct) + CcCt */
-		  rgba[i][RCOMP] = CHAN_PRODUCT(rgba[i][RCOMP], (CHAN_MAX-texel[i][RCOMP])) + CHAN_PRODUCT(Rc,texel[i][RCOMP]);
-		  rgba[i][GCOMP] = CHAN_PRODUCT(rgba[i][GCOMP], (CHAN_MAX-texel[i][GCOMP])) + CHAN_PRODUCT(Gc,texel[i][GCOMP]);
-		  rgba[i][BCOMP] = CHAN_PRODUCT(rgba[i][BCOMP], (CHAN_MAX-texel[i][BCOMP])) + CHAN_PRODUCT(Bc,texel[i][BCOMP]);
+		  rgba[i][RCOMP] = rgba[i][RCOMP] * (1.0F - texel[i][RCOMP])
+                     + Rc * texel[i][RCOMP];
+		  rgba[i][GCOMP] = rgba[i][GCOMP] * (1.0F - texel[i][GCOMP])
+                     + Gc * texel[i][GCOMP];
+		  rgba[i][BCOMP] = rgba[i][BCOMP] * (1.0F - texel[i][BCOMP])
+                     + Bc * texel[i][BCOMP];
 		  /* Av = Af */
 	       }
 	       break;
 	    case GL_RGBA:
 	       for (i=0;i<n;i++) {
 		  /* Cv = Cf(1-Ct) + CcCt */
-		  rgba[i][RCOMP] = CHAN_PRODUCT(rgba[i][RCOMP], (CHAN_MAX-texel[i][RCOMP])) + CHAN_PRODUCT(Rc,texel[i][RCOMP]);
-		  rgba[i][GCOMP] = CHAN_PRODUCT(rgba[i][GCOMP], (CHAN_MAX-texel[i][GCOMP])) + CHAN_PRODUCT(Gc,texel[i][GCOMP]);
-		  rgba[i][BCOMP] = CHAN_PRODUCT(rgba[i][BCOMP], (CHAN_MAX-texel[i][BCOMP])) + CHAN_PRODUCT(Bc,texel[i][BCOMP]);
+		  rgba[i][RCOMP] = rgba[i][RCOMP] * (1.0F - texel[i][RCOMP])
+                     + Rc * texel[i][RCOMP];
+		  rgba[i][GCOMP] = rgba[i][GCOMP] * (1.0F - texel[i][GCOMP])
+                     + Gc * texel[i][GCOMP];
+		  rgba[i][BCOMP] = rgba[i][BCOMP] * (1.0F - texel[i][BCOMP])
+                     + Bc * texel[i][BCOMP];
 		  /* Av = AfAt */
-		  rgba[i][ACOMP] = CHAN_PRODUCT(rgba[i][ACOMP],texel[i][ACOMP]);
+		  rgba[i][ACOMP] = rgba[i][ACOMP] * texel[i][ACOMP];
 	       }
 	       break;
             default:
@@ -1134,7 +926,7 @@ texture_apply( const GLcontext *ctx,
 	 }
 	 break;
 
-     /* XXX don't clamp results if GLchan is float??? */
+     /* XXX don't clamp results if GLfloat is float??? */
 
       case GL_ADD:  /* GL_EXT_texture_add_env */
          switch (format) {
@@ -1143,66 +935,66 @@ texture_apply( const GLcontext *ctx,
                   /* Rv = Rf */
                   /* Gv = Gf */
                   /* Bv = Bf */
-                  rgba[i][ACOMP] = CHAN_PRODUCT(rgba[i][ACOMP], texel[i][ACOMP]);
+                  rgba[i][ACOMP] = rgba[i][ACOMP] * texel[i][ACOMP];
                }
                break;
             case GL_LUMINANCE:
                for (i=0;i<n;i++) {
-                  ChanTemp Lt = texel[i][RCOMP];
-                  ChanTemp r = rgba[i][RCOMP] + Lt;
-                  ChanTemp g = rgba[i][GCOMP] + Lt;
-                  ChanTemp b = rgba[i][BCOMP] + Lt;
-                  rgba[i][RCOMP] = MIN2(r, CHAN_MAX);
-                  rgba[i][GCOMP] = MIN2(g, CHAN_MAX);
-                  rgba[i][BCOMP] = MIN2(b, CHAN_MAX);
+                  GLfloat Lt = texel[i][RCOMP];
+                  GLfloat r = rgba[i][RCOMP] + Lt;
+                  GLfloat g = rgba[i][GCOMP] + Lt;
+                  GLfloat b = rgba[i][BCOMP] + Lt;
+                  rgba[i][RCOMP] = MIN2(r, 1.0F);
+                  rgba[i][GCOMP] = MIN2(g, 1.0F);
+                  rgba[i][BCOMP] = MIN2(b, 1.0F);
                   /* Av = Af */
                }
                break;
             case GL_LUMINANCE_ALPHA:
                for (i=0;i<n;i++) {
-                  ChanTemp Lt = texel[i][RCOMP];
-                  ChanTemp r = rgba[i][RCOMP] + Lt;
-                  ChanTemp g = rgba[i][GCOMP] + Lt;
-                  ChanTemp b = rgba[i][BCOMP] + Lt;
-                  rgba[i][RCOMP] = MIN2(r, CHAN_MAX);
-                  rgba[i][GCOMP] = MIN2(g, CHAN_MAX);
-                  rgba[i][BCOMP] = MIN2(b, CHAN_MAX);
-                  rgba[i][ACOMP] = CHAN_PRODUCT(rgba[i][ACOMP], texel[i][ACOMP]);
+                  GLfloat Lt = texel[i][RCOMP];
+                  GLfloat r = rgba[i][RCOMP] + Lt;
+                  GLfloat g = rgba[i][GCOMP] + Lt;
+                  GLfloat b = rgba[i][BCOMP] + Lt;
+                  rgba[i][RCOMP] = MIN2(r, 1.0F);
+                  rgba[i][GCOMP] = MIN2(g, 1.0F);
+                  rgba[i][BCOMP] = MIN2(b, 1.0F);
+                  rgba[i][ACOMP] = rgba[i][ACOMP] * texel[i][ACOMP];
                }
                break;
             case GL_INTENSITY:
                for (i=0;i<n;i++) {
-                  GLchan It = texel[i][RCOMP];
-                  ChanTemp r = rgba[i][RCOMP] + It;
-                  ChanTemp g = rgba[i][GCOMP] + It;
-                  ChanTemp b = rgba[i][BCOMP] + It;
-                  ChanTemp a = rgba[i][ACOMP] + It;
-                  rgba[i][RCOMP] = MIN2(r, CHAN_MAX);
-                  rgba[i][GCOMP] = MIN2(g, CHAN_MAX);
-                  rgba[i][BCOMP] = MIN2(b, CHAN_MAX);
-                  rgba[i][ACOMP] = MIN2(a, CHAN_MAX);
+                  GLfloat It = texel[i][RCOMP];
+                  GLfloat r = rgba[i][RCOMP] + It;
+                  GLfloat g = rgba[i][GCOMP] + It;
+                  GLfloat b = rgba[i][BCOMP] + It;
+                  GLfloat a = rgba[i][ACOMP] + It;
+                  rgba[i][RCOMP] = MIN2(r, 1.0F);
+                  rgba[i][GCOMP] = MIN2(g, 1.0F);
+                  rgba[i][BCOMP] = MIN2(b, 1.0F);
+                  rgba[i][ACOMP] = MIN2(a, 1.0F);
                }
                break;
 	    case GL_RGB:
 	       for (i=0;i<n;i++) {
-                  ChanTemp r = rgba[i][RCOMP] + texel[i][RCOMP];
-                  ChanTemp g = rgba[i][GCOMP] + texel[i][GCOMP];
-                  ChanTemp b = rgba[i][BCOMP] + texel[i][BCOMP];
-		  rgba[i][RCOMP] = MIN2(r, CHAN_MAX);
-		  rgba[i][GCOMP] = MIN2(g, CHAN_MAX);
-		  rgba[i][BCOMP] = MIN2(b, CHAN_MAX);
+                  GLfloat r = rgba[i][RCOMP] + texel[i][RCOMP];
+                  GLfloat g = rgba[i][GCOMP] + texel[i][GCOMP];
+                  GLfloat b = rgba[i][BCOMP] + texel[i][BCOMP];
+		  rgba[i][RCOMP] = MIN2(r, 1.0F);
+		  rgba[i][GCOMP] = MIN2(g, 1.0F);
+		  rgba[i][BCOMP] = MIN2(b, 1.0F);
 		  /* Av = Af */
 	       }
 	       break;
 	    case GL_RGBA:
 	       for (i=0;i<n;i++) {
-                  ChanTemp r = rgba[i][RCOMP] + texel[i][RCOMP];
-                  ChanTemp g = rgba[i][GCOMP] + texel[i][GCOMP];
-                  ChanTemp b = rgba[i][BCOMP] + texel[i][BCOMP];
-		  rgba[i][RCOMP] = MIN2(r, CHAN_MAX);
-		  rgba[i][GCOMP] = MIN2(g, CHAN_MAX);
-		  rgba[i][BCOMP] = MIN2(b, CHAN_MAX);
-                  rgba[i][ACOMP] = CHAN_PRODUCT(rgba[i][ACOMP], texel[i][ACOMP]);
+                  GLfloat r = rgba[i][RCOMP] + texel[i][RCOMP];
+                  GLfloat g = rgba[i][GCOMP] + texel[i][GCOMP];
+                  GLfloat b = rgba[i][BCOMP] + texel[i][BCOMP];
+		  rgba[i][RCOMP] = MIN2(r, 1.0F);
+		  rgba[i][GCOMP] = MIN2(g, 1.0F);
+		  rgba[i][BCOMP] = MIN2(b, 1.0F);
+                  rgba[i][ACOMP] = rgba[i][ACOMP] * texel[i][ACOMP];
                }
                break;
             default:
@@ -1215,6 +1007,14 @@ texture_apply( const GLcontext *ctx,
          _mesa_problem(ctx, "Bad env mode in texture_apply");
          return;
    }
+
+   /* convert GLfloat colors to GLchan */
+   for (i = 0; i < n; i++) {
+      CLAMPED_FLOAT_TO_CHAN(rgbaChan[i][RCOMP], rgba[i][RCOMP]);
+      CLAMPED_FLOAT_TO_CHAN(rgbaChan[i][GCOMP], rgba[i][GCOMP]);
+      CLAMPED_FLOAT_TO_CHAN(rgbaChan[i][BCOMP], rgba[i][BCOMP]);
+      CLAMPED_FLOAT_TO_CHAN(rgbaChan[i][ACOMP], rgba[i][ACOMP]);
+   }
 }
 
 
@@ -1226,7 +1026,7 @@ void
 _swrast_texture_span( GLcontext *ctx, SWspan *span )
 {
    SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   GLchan primary_rgba[MAX_WIDTH][4];
+   GLfloat primary_rgba[MAX_WIDTH][4];
    GLuint unit;
 
    ASSERT(span->end < MAX_WIDTH);
@@ -1234,8 +1034,15 @@ _swrast_texture_span( GLcontext *ctx, SWspan *span )
    /*
     * Save copy of the incoming fragment colors (the GL_PRIMARY_COLOR)
     */
-   if (swrast->_AnyTextureCombine)
-      MEMCPY(primary_rgba, span->array->rgba, 4 * span->end * sizeof(GLchan));
+   if (swrast->_AnyTextureCombine) {
+      GLuint i;
+      for (i = 0; i < span->end; i++) {
+         primary_rgba[i][RCOMP] = CHAN_TO_FLOAT(span->array->rgba[i][RCOMP]);
+         primary_rgba[i][GCOMP] = CHAN_TO_FLOAT(span->array->rgba[i][GCOMP]);
+         primary_rgba[i][BCOMP] = CHAN_TO_FLOAT(span->array->rgba[i][BCOMP]);
+         primary_rgba[i][ACOMP] = CHAN_TO_FLOAT(span->array->rgba[i][ACOMP]);
+      }
+   }
 
    /* First must sample all bump maps */
    for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++) {
@@ -1323,8 +1130,8 @@ _swrast_texture_span( GLcontext *ctx, SWspan *span )
          const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
          const struct gl_texture_object *curObj = texUnit->_Current;
          GLfloat *lambda = span->array->lambda[unit];
-         GLchan (*texels)[4] = (GLchan (*)[4])
-            (swrast->TexelBuffer + unit * (span->end * 4 * sizeof(GLchan)));
+         GLfloat (*texels)[4] = (GLfloat (*)[4])
+            (swrast->TexelBuffer + unit * (span->end * 4 * sizeof(GLfloat)));
 
          /* adjust texture lod (lambda) */
          if (span->arrayMask & SPAN_LAMBDA) {
@@ -1357,13 +1164,7 @@ _swrast_texture_span( GLcontext *ctx, SWspan *span )
 
          /* GL_SGI_texture_color_table */
          if (texUnit->ColorTableEnabled) {
-#if CHAN_TYPE == GL_UNSIGNED_BYTE
-            _mesa_lookup_rgba_ubyte(&texUnit->ColorTable, span->end, texels);
-#elif CHAN_TYPE == GL_UNSIGNED_SHORT
-            _mesa_lookup_rgba_ubyte(&texUnit->ColorTable, span->end, texels);
-#else
             _mesa_lookup_rgba_float(&texUnit->ColorTable, span->end, texels);
-#endif
          }
 
          /* GL_EXT_texture_swizzle */
@@ -1383,19 +1184,19 @@ _swrast_texture_span( GLcontext *ctx, SWspan *span )
          const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
          if (texUnit->_CurrentCombine != &texUnit->_EnvMode ) {
             texture_combine( ctx, unit, span->end,
-                             (CONST GLchan (*)[4]) primary_rgba,
+                             (CONST GLfloat (*)[4]) primary_rgba,
                              swrast->TexelBuffer,
                              span->array->rgba );
          }
          else {
             /* conventional texture blend */
-            const GLchan (*texels)[4] = (const GLchan (*)[4])
+            const GLfloat (*texels)[4] = (const GLfloat (*)[4])
                (swrast->TexelBuffer + unit *
-                (span->end * 4 * sizeof(GLchan)));
+                (span->end * 4 * sizeof(GLfloat)));
 
 
             texture_apply( ctx, texUnit, span->end,
-                           (CONST GLchan (*)[4]) primary_rgba, texels,
+                           (CONST GLfloat (*)[4]) primary_rgba, texels,
                            span->array->rgba );
          }
       }
diff --git a/src/mesa/swrast/s_texfilter.c b/src/mesa/swrast/s_texfilter.c
index 19317c393a..b76de045f8 100644
--- a/src/mesa/swrast/s_texfilter.c
+++ b/src/mesa/swrast/s_texfilter.c
@@ -133,27 +133,12 @@ ilerp_3d(GLint ia, GLint ib, GLint ic,
  * Do linear interpolation of colors.
  */
 static INLINE void
-lerp_rgba(GLchan result[4], GLfloat t, const GLchan a[4], const GLchan b[4])
+lerp_rgba(GLfloat result[4], GLfloat t, const GLfloat a[4], const GLfloat b[4])
 {
-#if CHAN_TYPE == GL_FLOAT
    result[0] = LERP(t, a[0], b[0]);
    result[1] = LERP(t, a[1], b[1]);
    result[2] = LERP(t, a[2], b[2]);
    result[3] = LERP(t, a[3], b[3]);
-#elif CHAN_TYPE == GL_UNSIGNED_SHORT
-   result[0] = (GLchan) (LERP(t, a[0], b[0]) + 0.5);
-   result[1] = (GLchan) (LERP(t, a[1], b[1]) + 0.5);
-   result[2] = (GLchan) (LERP(t, a[2], b[2]) + 0.5);
-   result[3] = (GLchan) (LERP(t, a[3], b[3]) + 0.5);
-#else
-   /* fixed point interpolants in [0, ILERP_SCALE] */
-   const GLint it = IROUND_POS(t * ILERP_SCALE);
-   ASSERT(CHAN_TYPE == GL_UNSIGNED_BYTE);
-   result[0] = ILERP(it, a[0], b[0]);
-   result[1] = ILERP(it, a[1], b[1]);
-   result[2] = ILERP(it, a[2], b[2]);
-   result[3] = ILERP(it, a[3], b[3]);
-#endif
 }
 
 
@@ -161,29 +146,14 @@ lerp_rgba(GLchan result[4], GLfloat t, const GLchan a[4], const GLchan b[4])
  * Do bilinear interpolation of colors.
  */
 static INLINE void
-lerp_rgba_2d(GLchan result[4], GLfloat a, GLfloat b,
-             const GLchan t00[4], const GLchan t10[4],
-             const GLchan t01[4], const GLchan t11[4])
+lerp_rgba_2d(GLfloat result[4], GLfloat a, GLfloat b,
+             const GLfloat t00[4], const GLfloat t10[4],
+             const GLfloat t01[4], const GLfloat t11[4])
 {
-#if CHAN_TYPE == GL_FLOAT
    result[0] = lerp_2d(a, b, t00[0], t10[0], t01[0], t11[0]);
    result[1] = lerp_2d(a, b, t00[1], t10[1], t01[1], t11[1]);
    result[2] = lerp_2d(a, b, t00[2], t10[2], t01[2], t11[2]);
    result[3] = lerp_2d(a, b, t00[3], t10[3], t01[3], t11[3]);
-#elif CHAN_TYPE == GL_UNSIGNED_SHORT
-   result[0] = (GLchan) (lerp_2d(a, b, t00[0], t10[0], t01[0], t11[0]) + 0.5);
-   result[1] = (GLchan) (lerp_2d(a, b, t00[1], t10[1], t01[1], t11[1]) + 0.5);
-   result[2] = (GLchan) (lerp_2d(a, b, t00[2], t10[2], t01[2], t11[2]) + 0.5);
-   result[3] = (GLchan) (lerp_2d(a, b, t00[3], t10[3], t01[3], t11[3]) + 0.5);
-#else
-   const GLint ia = IROUND_POS(a * ILERP_SCALE);
-   const GLint ib = IROUND_POS(b * ILERP_SCALE);
-   ASSERT(CHAN_TYPE == GL_UNSIGNED_BYTE);
-   result[0] = ilerp_2d(ia, ib, t00[0], t10[0], t01[0], t11[0]);
-   result[1] = ilerp_2d(ia, ib, t00[1], t10[1], t01[1], t11[1]);
-   result[2] = ilerp_2d(ia, ib, t00[2], t10[2], t01[2], t11[2]);
-   result[3] = ilerp_2d(ia, ib, t00[3], t10[3], t01[3], t11[3]);
-#endif
 }
 
 
@@ -191,34 +161,18 @@ lerp_rgba_2d(GLchan result[4], GLfloat a, GLfloat b,
  * Do trilinear interpolation of colors.
  */
 static INLINE void
-lerp_rgba_3d(GLchan result[4], GLfloat a, GLfloat b, GLfloat c,
-             const GLchan t000[4], const GLchan t100[4],
-             const GLchan t010[4], const GLchan t110[4],
-             const GLchan t001[4], const GLchan t101[4],
-             const GLchan t011[4], const GLchan t111[4])
+lerp_rgba_3d(GLfloat result[4], GLfloat a, GLfloat b, GLfloat c,
+             const GLfloat t000[4], const GLfloat t100[4],
+             const GLfloat t010[4], const GLfloat t110[4],
+             const GLfloat t001[4], const GLfloat t101[4],
+             const GLfloat t011[4], const GLfloat t111[4])
 {
    GLuint k;
    /* compiler should unroll these short loops */
-#if CHAN_TYPE == GL_FLOAT
    for (k = 0; k < 4; k++) {
       result[k] = lerp_3d(a, b, c, t000[k], t100[k], t010[k], t110[k],
                                    t001[k], t101[k], t011[k], t111[k]);
    }
-#elif CHAN_TYPE == GL_UNSIGNED_SHORT
-   for (k = 0; k < 4; k++) {
-      result[k] = (GLchan)(lerp_3d(a, b, c,
-                                   t000[k], t100[k], t010[k], t110[k],
-                                   t001[k], t101[k], t011[k], t111[k]) + 0.5F);
-   }
-#else
-   GLint ia = IROUND_POS(a * ILERP_SCALE);
-   GLint ib = IROUND_POS(b * ILERP_SCALE);
-   GLint ic = IROUND_POS(c * ILERP_SCALE);
-   for (k = 0; k < 4; k++) {
-      result[k] = ilerp_3d(ia, ib, ic, t000[k], t100[k], t010[k], t110[k],
-                                       t001[k], t101[k], t011[k], t111[k]);
-   }
-#endif
 }
 
 
@@ -671,7 +625,7 @@ static INLINE void
 sample_1d_nearest(GLcontext *ctx,
                   const struct gl_texture_object *tObj,
                   const struct gl_texture_image *img,
-                  const GLfloat texcoord[4], GLchan rgba[4])
+                  const GLfloat texcoord[4], GLfloat rgba[4])
 {
    const GLint width = img->Width2;  /* without border, power of two */
    GLint i;
@@ -680,10 +634,10 @@ sample_1d_nearest(GLcontext *ctx,
    i += img->Border;
    if (i < 0 || i >= (GLint) img->Width) {
       /* Need this test for GL_CLAMP_TO_BORDER mode */
-      COPY_CHAN4(rgba, tObj->_BorderChan);
+      COPY_4V(rgba, tObj->BorderColor);
    }
    else {
-      img->FetchTexelc(img, i, 0, 0, rgba);
+      img->FetchTexelf(img, i, 0, 0, rgba);
    }
 }
 
@@ -695,13 +649,13 @@ static INLINE void
 sample_1d_linear(GLcontext *ctx,
                  const struct gl_texture_object *tObj,
                  const struct gl_texture_image *img,
-                 const GLfloat texcoord[4], GLchan rgba[4])
+                 const GLfloat texcoord[4], GLfloat rgba[4])
 {
    const GLint width = img->Width2;
    GLint i0, i1;
    GLbitfield useBorderColor = 0x0;
    GLfloat a;
-   GLchan t0[4], t1[4];  /* texels */
+   GLfloat t0[4], t1[4];  /* texels */
 
    linear_texel_locations(tObj->WrapS, img, width, texcoord[0], &i0, &i1, &a);
 
@@ -716,16 +670,16 @@ sample_1d_linear(GLcontext *ctx,
 
    /* fetch texel colors */
    if (useBorderColor & I0BIT) {
-      COPY_CHAN4(t0, tObj->_BorderChan);
+      COPY_4V(t0, tObj->BorderColor);
    }
    else {
-      img->FetchTexelc(img, i0, 0, 0, t0);
+      img->FetchTexelf(img, i0, 0, 0, t0);
    }
    if (useBorderColor & I1BIT) {
-      COPY_CHAN4(t1, tObj->_BorderChan);
+      COPY_4V(t1, tObj->BorderColor);
    }
    else {
-      img->FetchTexelc(img, i1, 0, 0, t1);
+      img->FetchTexelf(img, i1, 0, 0, t1);
    }
 
    lerp_rgba(rgba, a, t0, t1);
@@ -736,7 +690,7 @@ static void
 sample_1d_nearest_mipmap_nearest(GLcontext *ctx,
                                  const struct gl_texture_object *tObj,
                                  GLuint n, const GLfloat texcoord[][4],
-                                 const GLfloat lambda[], GLchan rgba[][4])
+                                 const GLfloat lambda[], GLfloat rgba[][4])
 {
    GLuint i;
    ASSERT(lambda != NULL);
@@ -751,7 +705,7 @@ static void
 sample_1d_linear_mipmap_nearest(GLcontext *ctx,
                                 const struct gl_texture_object *tObj,
                                 GLuint n, const GLfloat texcoord[][4],
-                                const GLfloat lambda[], GLchan rgba[][4])
+                                const GLfloat lambda[], GLfloat rgba[][4])
 {
    GLuint i;
    ASSERT(lambda != NULL);
@@ -766,7 +720,7 @@ static void
 sample_1d_nearest_mipmap_linear(GLcontext *ctx,
                                 const struct gl_texture_object *tObj,
                                 GLuint n, const GLfloat texcoord[][4],
-                                const GLfloat lambda[], GLchan rgba[][4])
+                                const GLfloat lambda[], GLfloat rgba[][4])
 {
    GLuint i;
    ASSERT(lambda != NULL);
@@ -777,7 +731,7 @@ sample_1d_nearest_mipmap_linear(GLcontext *ctx,
                            texcoord[i], rgba[i]);
       }
       else {
-         GLchan t0[4], t1[4];
+         GLfloat t0[4], t1[4];
          const GLfloat f = FRAC(lambda[i]);
          sample_1d_nearest(ctx, tObj, tObj->Image[0][level  ], texcoord[i], t0);
          sample_1d_nearest(ctx, tObj, tObj->Image[0][level+1], texcoord[i], t1);
@@ -791,7 +745,7 @@ static void
 sample_1d_linear_mipmap_linear(GLcontext *ctx,
                                const struct gl_texture_object *tObj,
                                GLuint n, const GLfloat texcoord[][4],
-                               const GLfloat lambda[], GLchan rgba[][4])
+                               const GLfloat lambda[], GLfloat rgba[][4])
 {
    GLuint i;
    ASSERT(lambda != NULL);
@@ -802,7 +756,7 @@ sample_1d_linear_mipmap_linear(GLcontext *ctx,
                           texcoord[i], rgba[i]);
       }
       else {
-         GLchan t0[4], t1[4];
+         GLfloat t0[4], t1[4];
          const GLfloat f = FRAC(lambda[i]);
          sample_1d_linear(ctx, tObj, tObj->Image[0][level  ], texcoord[i], t0);
          sample_1d_linear(ctx, tObj, tObj->Image[0][level+1], texcoord[i], t1);
@@ -817,7 +771,7 @@ static void
 sample_nearest_1d( GLcontext *ctx,
                    const struct gl_texture_object *tObj, GLuint n,
                    const GLfloat texcoords[][4], const GLfloat lambda[],
-                   GLchan rgba[][4] )
+                   GLfloat rgba[][4] )
 {
    GLuint i;
    struct gl_texture_image *image = tObj->Image[0][tObj->BaseLevel];
@@ -833,7 +787,7 @@ static void
 sample_linear_1d( GLcontext *ctx,
                   const struct gl_texture_object *tObj, GLuint n,
                   const GLfloat texcoords[][4], const GLfloat lambda[],
-                  GLchan rgba[][4] )
+                  GLfloat rgba[][4] )
 {
    GLuint i;
    struct gl_texture_image *image = tObj->Image[0][tObj->BaseLevel];
@@ -849,7 +803,7 @@ static void
 sample_lambda_1d( GLcontext *ctx,
                   const struct gl_texture_object *tObj, GLuint n,
                   const GLfloat texcoords[][4],
-                  const GLfloat lambda[], GLchan rgba[][4] )
+                  const GLfloat lambda[], GLfloat rgba[][4] )
 {
    GLuint minStart, minEnd;  /* texels with minification */
    GLuint magStart, magEnd;  /* texels with magnification */
@@ -929,7 +883,7 @@ sample_2d_nearest(GLcontext *ctx,
                   const struct gl_texture_object *tObj,
                   const struct gl_texture_image *img,
                   const GLfloat texcoord[4],
-                  GLchan rgba[])
+                  GLfloat rgba[])
 {
    const GLint width = img->Width2;    /* without border, power of two */
    const GLint height = img->Height2;  /* without border, power of two */
@@ -945,10 +899,10 @@ sample_2d_nearest(GLcontext *ctx,
 
    if (i < 0 || i >= (GLint) img->Width || j < 0 || j >= (GLint) img->Height) {
       /* Need this test for GL_CLAMP_TO_BORDER mode */
-      COPY_CHAN4(rgba, tObj->_BorderChan);
+      COPY_4V(rgba, tObj->BorderColor);
    }
    else {
-      img->FetchTexelc(img, i, j, 0, rgba);
+      img->FetchTexelf(img, i, j, 0, rgba);
    }
 }
 
@@ -962,14 +916,14 @@ sample_2d_linear(GLcontext *ctx,
                  const struct gl_texture_object *tObj,
                  const struct gl_texture_image *img,
                  const GLfloat texcoord[4],
-                 GLchan rgba[])
+                 GLfloat rgba[])
 {
    const GLint width = img->Width2;
    const GLint height = img->Height2;
    GLint i0, j0, i1, j1;
    GLbitfield useBorderColor = 0x0;
    GLfloat a, b;
-   GLchan t00[4], t10[4], t01[4], t11[4]; /* sampled texel colors */
+   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);
@@ -989,28 +943,28 @@ sample_2d_linear(GLcontext *ctx,
 
    /* fetch four texel colors */
    if (useBorderColor & (I0BIT | J0BIT)) {
-      COPY_CHAN4(t00, tObj->_BorderChan);
+      COPY_4V(t00, tObj->BorderColor);
    }
    else {
-      img->FetchTexelc(img, i0, j0, 0, t00);
+      img->FetchTexelf(img, i0, j0, 0, t00);
    }
    if (useBorderColor & (I1BIT | J0BIT)) {
-      COPY_CHAN4(t10, tObj->_BorderChan);
+      COPY_4V(t10, tObj->BorderColor);
    }
    else {
-      img->FetchTexelc(img, i1, j0, 0, t10);
+      img->FetchTexelf(img, i1, j0, 0, t10);
    }
    if (useBorderColor & (I0BIT | J1BIT)) {
-      COPY_CHAN4(t01, tObj->_BorderChan);
+      COPY_4V(t01, tObj->BorderColor);
    }
    else {
-      img->FetchTexelc(img, i0, j1, 0, t01);
+      img->FetchTexelf(img, i0, j1, 0, t01);
    }
    if (useBorderColor & (I1BIT | J1BIT)) {
-      COPY_CHAN4(t11, tObj->_BorderChan);
+      COPY_4V(t11, tObj->BorderColor);
    }
    else {
-      img->FetchTexelc(img, i1, j1, 0, t11);
+      img->FetchTexelf(img, i1, j1, 0, t11);
    }
 
    lerp_rgba_2d(rgba, a, b, t00, t10, t01, t11);
@@ -1026,13 +980,13 @@ sample_2d_linear_repeat(GLcontext *ctx,
                         const struct gl_texture_object *tObj,
                         const struct gl_texture_image *img,
                         const GLfloat texcoord[4],
-                        GLchan rgba[])
+                        GLfloat rgba[])
 {
    const GLint width = img->Width2;
    const GLint height = img->Height2;
    GLint i0, j0, i1, j1;
    GLfloat wi, wj;
-   GLchan t00[4], t10[4], t01[4], t11[4]; /* sampled texel colors */
+   GLfloat t00[4], t10[4], t01[4], t11[4]; /* sampled texel colors */
 
    (void) ctx;
 
@@ -1045,10 +999,10 @@ sample_2d_linear_repeat(GLcontext *ctx,
    linear_repeat_texel_location(width,  texcoord[0], &i0, &i1, &wi);
    linear_repeat_texel_location(height, texcoord[1], &j0, &j1, &wj);
 
-   img->FetchTexelc(img, i0, j0, 0, t00);
-   img->FetchTexelc(img, i1, j0, 0, t10);
-   img->FetchTexelc(img, i0, j1, 0, t01);
-   img->FetchTexelc(img, i1, j1, 0, t11);
+   img->FetchTexelf(img, i0, j0, 0, t00);
+   img->FetchTexelf(img, i1, j0, 0, t10);
+   img->FetchTexelf(img, i0, j1, 0, t01);
+   img->FetchTexelf(img, i1, j1, 0, t11);
 
    lerp_rgba_2d(rgba, wi, wj, t00, t10, t01, t11);
 }
@@ -1058,7 +1012,7 @@ static void
 sample_2d_nearest_mipmap_nearest(GLcontext *ctx,
                                  const struct gl_texture_object *tObj,
                                  GLuint n, const GLfloat texcoord[][4],
-                                 const GLfloat lambda[], GLchan rgba[][4])
+                                 const GLfloat lambda[], GLfloat rgba[][4])
 {
    GLuint i;
    for (i = 0; i < n; i++) {
@@ -1072,7 +1026,7 @@ static void
 sample_2d_linear_mipmap_nearest(GLcontext *ctx,
                                 const struct gl_texture_object *tObj,
                                 GLuint n, const GLfloat texcoord[][4],
-                                const GLfloat lambda[], GLchan rgba[][4])
+                                const GLfloat lambda[], GLfloat rgba[][4])
 {
    GLuint i;
    ASSERT(lambda != NULL);
@@ -1087,7 +1041,7 @@ static void
 sample_2d_nearest_mipmap_linear(GLcontext *ctx,
                                 const struct gl_texture_object *tObj,
                                 GLuint n, const GLfloat texcoord[][4],
-                                const GLfloat lambda[], GLchan rgba[][4])
+                                const GLfloat lambda[], GLfloat rgba[][4])
 {
    GLuint i;
    ASSERT(lambda != NULL);
@@ -1098,7 +1052,7 @@ sample_2d_nearest_mipmap_linear(GLcontext *ctx,
                            texcoord[i], rgba[i]);
       }
       else {
-         GLchan t0[4], t1[4];  /* texels */
+         GLfloat t0[4], t1[4];  /* texels */
          const GLfloat f = FRAC(lambda[i]);
          sample_2d_nearest(ctx, tObj, tObj->Image[0][level  ], texcoord[i], t0);
          sample_2d_nearest(ctx, tObj, tObj->Image[0][level+1], texcoord[i], t1);
@@ -1112,7 +1066,7 @@ static void
 sample_2d_linear_mipmap_linear( GLcontext *ctx,
                                 const struct gl_texture_object *tObj,
                                 GLuint n, const GLfloat texcoord[][4],
-                                const GLfloat lambda[], GLchan rgba[][4] )
+                                const GLfloat lambda[], GLfloat rgba[][4] )
 {
    GLuint i;
    ASSERT(lambda != NULL);
@@ -1123,7 +1077,7 @@ sample_2d_linear_mipmap_linear( GLcontext *ctx,
                           texcoord[i], rgba[i]);
       }
       else {
-         GLchan t0[4], t1[4];  /* texels */
+         GLfloat t0[4], t1[4];  /* texels */
          const GLfloat f = FRAC(lambda[i]);
          sample_2d_linear(ctx, tObj, tObj->Image[0][level  ], texcoord[i], t0);
          sample_2d_linear(ctx, tObj, tObj->Image[0][level+1], texcoord[i], t1);
@@ -1137,7 +1091,7 @@ static void
 sample_2d_linear_mipmap_linear_repeat(GLcontext *ctx,
                                       const struct gl_texture_object *tObj,
                                       GLuint n, const GLfloat texcoord[][4],
-                                      const GLfloat lambda[], GLchan rgba[][4])
+                                      const GLfloat lambda[], GLfloat rgba[][4])
 {
    GLuint i;
    ASSERT(lambda != NULL);
@@ -1150,7 +1104,7 @@ sample_2d_linear_mipmap_linear_repeat(GLcontext *ctx,
                                  texcoord[i], rgba[i]);
       }
       else {
-         GLchan t0[4], t1[4];  /* texels */
+         GLfloat t0[4], t1[4];  /* texels */
          const GLfloat f = FRAC(lambda[i]);
          sample_2d_linear_repeat(ctx, tObj, tObj->Image[0][level  ],
                                  texcoord[i], t0);
@@ -1167,7 +1121,7 @@ static void
 sample_nearest_2d(GLcontext *ctx,
                   const struct gl_texture_object *tObj, GLuint n,
                   const GLfloat texcoords[][4],
-                  const GLfloat lambda[], GLchan rgba[][4])
+                  const GLfloat lambda[], GLfloat rgba[][4])
 {
    GLuint i;
    struct gl_texture_image *image = tObj->Image[0][tObj->BaseLevel];
@@ -1183,7 +1137,7 @@ static void
 sample_linear_2d(GLcontext *ctx,
                  const struct gl_texture_object *tObj, GLuint n,
                  const GLfloat texcoords[][4],
-                 const GLfloat lambda[], GLchan rgba[][4])
+                 const GLfloat lambda[], GLfloat rgba[][4])
 {
    GLuint i;
    struct gl_texture_image *image = tObj->Image[0][tObj->BaseLevel];
@@ -1279,7 +1233,7 @@ opt_sample_rgba_2d(GLcontext *ctx,
       const GLint row = IFLOOR(texcoords[i][1] * height) & rowMask;
       const GLint pos = (row << shift) | col;
       const GLchan *texel = ((GLchan *) img->Data) + (pos << 2);    /* pos*4 */
-      COPY_CHAN4(rgba[i], texel);
+      COPY_4V(rgba[i], texel);
    }
 }
 
@@ -1289,7 +1243,7 @@ static void
 sample_lambda_2d(GLcontext *ctx,
                  const struct gl_texture_object *tObj,
                  GLuint n, const GLfloat texcoords[][4],
-                 const GLfloat lambda[], GLchan rgba[][4])
+                 const GLfloat lambda[], GLfloat rgba[][4])
 {
    const struct gl_texture_image *tImg = tObj->Image[0][tObj->BaseLevel];
    GLuint minStart, minEnd;  /* texels with minification */
@@ -1312,6 +1266,7 @@ sample_lambda_2d(GLcontext *ctx,
       case GL_NEAREST:
          if (repeatNoBorderPOT) {
             switch (tImg->TexFormat->MesaFormat) {
+#if 0
             case MESA_FORMAT_RGB:
                opt_sample_rgb_2d(ctx, tObj, m, texcoords + minStart,
                                  NULL, rgba + minStart);
@@ -1320,6 +1275,7 @@ sample_lambda_2d(GLcontext *ctx,
 	       opt_sample_rgba_2d(ctx, tObj, m, texcoords + minStart,
                                   NULL, rgba + minStart);
                break;
+#endif
             default:
                sample_nearest_2d(ctx, tObj, m, texcoords + minStart,
                                  NULL, rgba + minStart );
@@ -1369,6 +1325,7 @@ sample_lambda_2d(GLcontext *ctx,
       case GL_NEAREST:
          if (repeatNoBorderPOT) {
             switch (tImg->TexFormat->MesaFormat) {
+#if 0
             case MESA_FORMAT_RGB:
                opt_sample_rgb_2d(ctx, tObj, m, texcoords + magStart,
                                  NULL, rgba + magStart);
@@ -1377,6 +1334,7 @@ sample_lambda_2d(GLcontext *ctx,
 	       opt_sample_rgba_2d(ctx, tObj, m, texcoords + magStart,
                                   NULL, rgba + magStart);
                break;
+#endif
             default:
                sample_nearest_2d(ctx, tObj, m, texcoords + magStart,
                                  NULL, rgba + magStart );
@@ -1411,7 +1369,7 @@ sample_3d_nearest(GLcontext *ctx,
                   const struct gl_texture_object *tObj,
                   const struct gl_texture_image *img,
                   const GLfloat texcoord[4],
-                  GLchan rgba[4])
+                  GLfloat rgba[4])
 {
    const GLint width = img->Width2;     /* without border, power of two */
    const GLint height = img->Height2;   /* without border, power of two */
@@ -1427,10 +1385,10 @@ sample_3d_nearest(GLcontext *ctx,
        j < 0 || j >= (GLint) img->Height ||
        k < 0 || k >= (GLint) img->Depth) {
       /* Need this test for GL_CLAMP_TO_BORDER mode */
-      COPY_CHAN4(rgba, tObj->_BorderChan);
+      COPY_4V(rgba, tObj->BorderColor);
    }
    else {
-      img->FetchTexelc(img, i, j, k, rgba);
+      img->FetchTexelf(img, i, j, k, rgba);
    }
 }
 
@@ -1443,7 +1401,7 @@ sample_3d_linear(GLcontext *ctx,
                  const struct gl_texture_object *tObj,
                  const struct gl_texture_image *img,
                  const GLfloat texcoord[4],
-                 GLchan rgba[4])
+                 GLfloat rgba[4])
 {
    const GLint width = img->Width2;
    const GLint height = img->Height2;
@@ -1451,8 +1409,8 @@ sample_3d_linear(GLcontext *ctx,
    GLint i0, j0, k0, i1, j1, k1;
    GLbitfield useBorderColor = 0x0;
    GLfloat a, b, c;
-   GLchan t000[4], t010[4], t001[4], t011[4];
-   GLchan t100[4], t110[4], t101[4], t111[4];
+   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);
@@ -1478,53 +1436,53 @@ sample_3d_linear(GLcontext *ctx,
 
    /* Fetch texels */
    if (useBorderColor & (I0BIT | J0BIT | K0BIT)) {
-      COPY_CHAN4(t000, tObj->_BorderChan);
+      COPY_4V(t000, tObj->BorderColor);
    }
    else {
-      img->FetchTexelc(img, i0, j0, k0, t000);
+      img->FetchTexelf(img, i0, j0, k0, t000);
    }
    if (useBorderColor & (I1BIT | J0BIT | K0BIT)) {
-      COPY_CHAN4(t100, tObj->_BorderChan);
+      COPY_4V(t100, tObj->BorderColor);
    }
    else {
-      img->FetchTexelc(img, i1, j0, k0, t100);
+      img->FetchTexelf(img, i1, j0, k0, t100);
    }
    if (useBorderColor & (I0BIT | J1BIT | K0BIT)) {
-      COPY_CHAN4(t010, tObj->_BorderChan);
+      COPY_4V(t010, tObj->BorderColor);
    }
    else {
-      img->FetchTexelc(img, i0, j1, k0, t010);
+      img->FetchTexelf(img, i0, j1, k0, t010);
    }
    if (useBorderColor & (I1BIT | J1BIT | K0BIT)) {
-      COPY_CHAN4(t110, tObj->_BorderChan);
+      COPY_4V(t110, tObj->BorderColor);
    }
    else {
-      img->FetchTexelc(img, i1, j1, k0, t110);
+      img->FetchTexelf(img, i1, j1, k0, t110);
    }
 
    if (useBorderColor & (I0BIT | J0BIT | K1BIT)) {
-      COPY_CHAN4(t001, tObj->_BorderChan);
+      COPY_4V(t001, tObj->BorderColor);
    }
    else {
-      img->FetchTexelc(img, i0, j0, k1, t001);
+      img->FetchTexelf(img, i0, j0, k1, t001);
    }
    if (useBorderColor & (I1BIT | J0BIT | K1BIT)) {
-      COPY_CHAN4(t101, tObj->_BorderChan);
+      COPY_4V(t101, tObj->BorderColor);
    }
    else {
-      img->FetchTexelc(img, i1, j0, k1, t101);
+      img->FetchTexelf(img, i1, j0, k1, t101);
    }
    if (useBorderColor & (I0BIT | J1BIT | K1BIT)) {
-      COPY_CHAN4(t011, tObj->_BorderChan);
+      COPY_4V(t011, tObj->BorderColor);
    }
    else {
-      img->FetchTexelc(img, i0, j1, k1, t011);
+      img->FetchTexelf(img, i0, j1, k1, t011);
    }
    if (useBorderColor & (I1BIT | J1BIT | K1BIT)) {
-      COPY_CHAN4(t111, tObj->_BorderChan);
+      COPY_4V(t111, tObj->BorderColor);
    }
    else {
-      img->FetchTexelc(img, i1, j1, k1, t111);
+      img->FetchTexelf(img, i1, j1, k1, t111);
    }
 
    /* trilinear interpolation of samples */
@@ -1536,7 +1494,7 @@ static void
 sample_3d_nearest_mipmap_nearest(GLcontext *ctx,
                                  const struct gl_texture_object *tObj,
                                  GLuint n, const GLfloat texcoord[][4],
-                                 const GLfloat lambda[], GLchan rgba[][4] )
+                                 const GLfloat lambda[], GLfloat rgba[][4] )
 {
    GLuint i;
    for (i = 0; i < n; i++) {
@@ -1550,7 +1508,7 @@ static void
 sample_3d_linear_mipmap_nearest(GLcontext *ctx,
                                 const struct gl_texture_object *tObj,
                                 GLuint n, const GLfloat texcoord[][4],
-                                const GLfloat lambda[], GLchan rgba[][4])
+                                const GLfloat lambda[], GLfloat rgba[][4])
 {
    GLuint i;
    ASSERT(lambda != NULL);
@@ -1565,7 +1523,7 @@ static void
 sample_3d_nearest_mipmap_linear(GLcontext *ctx,
                                 const struct gl_texture_object *tObj,
                                 GLuint n, const GLfloat texcoord[][4],
-                                const GLfloat lambda[], GLchan rgba[][4])
+                                const GLfloat lambda[], GLfloat rgba[][4])
 {
    GLuint i;
    ASSERT(lambda != NULL);
@@ -1576,7 +1534,7 @@ sample_3d_nearest_mipmap_linear(GLcontext *ctx,
                            texcoord[i], rgba[i]);
       }
       else {
-         GLchan t0[4], t1[4];  /* texels */
+         GLfloat t0[4], t1[4];  /* texels */
          const GLfloat f = FRAC(lambda[i]);
          sample_3d_nearest(ctx, tObj, tObj->Image[0][level  ], texcoord[i], t0);
          sample_3d_nearest(ctx, tObj, tObj->Image[0][level+1], texcoord[i], t1);
@@ -1590,7 +1548,7 @@ static void
 sample_3d_linear_mipmap_linear(GLcontext *ctx,
                                const struct gl_texture_object *tObj,
                                GLuint n, const GLfloat texcoord[][4],
-                               const GLfloat lambda[], GLchan rgba[][4])
+                               const GLfloat lambda[], GLfloat rgba[][4])
 {
    GLuint i;
    ASSERT(lambda != NULL);
@@ -1601,7 +1559,7 @@ sample_3d_linear_mipmap_linear(GLcontext *ctx,
                           texcoord[i], rgba[i]);
       }
       else {
-         GLchan t0[4], t1[4];  /* texels */
+         GLfloat t0[4], t1[4];  /* texels */
          const GLfloat f = FRAC(lambda[i]);
          sample_3d_linear(ctx, tObj, tObj->Image[0][level  ], texcoord[i], t0);
          sample_3d_linear(ctx, tObj, tObj->Image[0][level+1], texcoord[i], t1);
@@ -1616,7 +1574,7 @@ static void
 sample_nearest_3d(GLcontext *ctx,
                   const struct gl_texture_object *tObj, GLuint n,
                   const GLfloat texcoords[][4], const GLfloat lambda[],
-                  GLchan rgba[][4])
+                  GLfloat rgba[][4])
 {
    GLuint i;
    struct gl_texture_image *image = tObj->Image[0][tObj->BaseLevel];
@@ -1632,7 +1590,7 @@ static void
 sample_linear_3d(GLcontext *ctx,
                  const struct gl_texture_object *tObj, GLuint n,
                  const GLfloat texcoords[][4],
-		 const GLfloat lambda[], GLchan rgba[][4])
+		 const GLfloat lambda[], GLfloat rgba[][4])
 {
    GLuint i;
    struct gl_texture_image *image = tObj->Image[0][tObj->BaseLevel];
@@ -1648,7 +1606,7 @@ static void
 sample_lambda_3d(GLcontext *ctx,
                  const struct gl_texture_object *tObj, GLuint n,
                  const GLfloat texcoords[][4], const GLfloat lambda[],
-                 GLchan rgba[][4])
+                 GLfloat rgba[][4])
 {
    GLuint minStart, minEnd;  /* texels with minification */
    GLuint magStart, magEnd;  /* texels with magnification */
@@ -1799,7 +1757,7 @@ static void
 sample_nearest_cube(GLcontext *ctx,
 		    const struct gl_texture_object *tObj, GLuint n,
                     const GLfloat texcoords[][4], const GLfloat lambda[],
-                    GLchan rgba[][4])
+                    GLfloat rgba[][4])
 {
    GLuint i;
    (void) lambda;
@@ -1817,7 +1775,7 @@ static void
 sample_linear_cube(GLcontext *ctx,
 		   const struct gl_texture_object *tObj, GLuint n,
                    const GLfloat texcoords[][4],
-		   const GLfloat lambda[], GLchan rgba[][4])
+		   const GLfloat lambda[], GLfloat rgba[][4])
 {
    GLuint i;
    (void) lambda;
@@ -1835,7 +1793,7 @@ static void
 sample_cube_nearest_mipmap_nearest(GLcontext *ctx,
                                    const struct gl_texture_object *tObj,
                                    GLuint n, const GLfloat texcoord[][4],
-                                   const GLfloat lambda[], GLchan rgba[][4])
+                                   const GLfloat lambda[], GLfloat rgba[][4])
 {
    GLuint i;
    ASSERT(lambda != NULL);
@@ -1864,7 +1822,7 @@ static void
 sample_cube_linear_mipmap_nearest(GLcontext *ctx,
                                   const struct gl_texture_object *tObj,
                                   GLuint n, const GLfloat texcoord[][4],
-                                  const GLfloat lambda[], GLchan rgba[][4])
+                                  const GLfloat lambda[], GLfloat rgba[][4])
 {
    GLuint i;
    ASSERT(lambda != NULL);
@@ -1883,7 +1841,7 @@ static void
 sample_cube_nearest_mipmap_linear(GLcontext *ctx,
                                   const struct gl_texture_object *tObj,
                                   GLuint n, const GLfloat texcoord[][4],
-                                  const GLfloat lambda[], GLchan rgba[][4])
+                                  const GLfloat lambda[], GLfloat rgba[][4])
 {
    GLuint i;
    ASSERT(lambda != NULL);
@@ -1898,7 +1856,7 @@ sample_cube_nearest_mipmap_linear(GLcontext *ctx,
                            newCoord, rgba[i]);
       }
       else {
-         GLchan t0[4], t1[4];  /* texels */
+         GLfloat t0[4], t1[4];  /* texels */
          const GLfloat f = FRAC(lambda[i]);
          sample_2d_nearest(ctx, tObj, images[level  ], newCoord, t0);
          sample_2d_nearest(ctx, tObj, images[level+1], newCoord, t1);
@@ -1912,7 +1870,7 @@ static void
 sample_cube_linear_mipmap_linear(GLcontext *ctx,
                                  const struct gl_texture_object *tObj,
                                  GLuint n, const GLfloat texcoord[][4],
-                                 const GLfloat lambda[], GLchan rgba[][4])
+                                 const GLfloat lambda[], GLfloat rgba[][4])
 {
    GLuint i;
    ASSERT(lambda != NULL);
@@ -1927,7 +1885,7 @@ sample_cube_linear_mipmap_linear(GLcontext *ctx,
                           newCoord, rgba[i]);
       }
       else {
-         GLchan t0[4], t1[4];
+         GLfloat t0[4], t1[4];
          const GLfloat f = FRAC(lambda[i]);
          sample_2d_linear(ctx, tObj, images[level  ], newCoord, t0);
          sample_2d_linear(ctx, tObj, images[level+1], newCoord, t1);
@@ -1942,7 +1900,7 @@ static void
 sample_lambda_cube(GLcontext *ctx,
 		   const struct gl_texture_object *tObj, GLuint n,
 		   const GLfloat texcoords[][4], const GLfloat lambda[],
-		   GLchan rgba[][4])
+		   GLfloat rgba[][4])
 {
    GLuint minStart, minEnd;  /* texels with minification */
    GLuint magStart, magEnd;  /* texels with magnification */
@@ -2076,7 +2034,7 @@ static void
 sample_nearest_rect(GLcontext *ctx,
 		    const struct gl_texture_object *tObj, GLuint n,
                     const GLfloat texcoords[][4], const GLfloat lambda[],
-                    GLchan rgba[][4])
+                    GLfloat rgba[][4])
 {
    const struct gl_texture_image *img = tObj->Image[0][0];
    const GLint width = img->Width;
@@ -2099,9 +2057,9 @@ sample_nearest_rect(GLcontext *ctx,
       col = clamp_rect_coord_nearest(tObj->WrapS, texcoords[i][0], width);
       row = clamp_rect_coord_nearest(tObj->WrapT, texcoords[i][1], height);
       if (col < 0 || col >= width || row < 0 || row >= height)
-         COPY_CHAN4(rgba[i], tObj->_BorderChan);
+         COPY_4V(rgba[i], tObj->BorderColor);
       else
-         img->FetchTexelc(img, col, row, 0, rgba[i]);
+         img->FetchTexelf(img, col, row, 0, rgba[i]);
    }
 }
 
@@ -2110,7 +2068,7 @@ static void
 sample_linear_rect(GLcontext *ctx,
 		   const struct gl_texture_object *tObj, GLuint n,
                    const GLfloat texcoords[][4],
-		   const GLfloat lambda[], GLchan rgba[][4])
+		   const GLfloat lambda[], GLfloat rgba[][4])
 {
    const struct gl_texture_image *img = tObj->Image[0][0];
    const GLint width = img->Width;
@@ -2130,7 +2088,7 @@ sample_linear_rect(GLcontext *ctx,
 
    for (i = 0; i < n; i++) {
       GLint i0, j0, i1, j1;
-      GLchan t00[4], t01[4], t10[4], t11[4];
+      GLfloat t00[4], t01[4], t10[4], t11[4];
       GLfloat a, b;
       GLbitfield useBorderColor = 0x0;
 
@@ -2147,24 +2105,24 @@ sample_linear_rect(GLcontext *ctx,
 
       /* get four texel samples */
       if (useBorderColor & (I0BIT | J0BIT))
-         COPY_CHAN4(t00, tObj->_BorderChan);
+         COPY_4V(t00, tObj->BorderColor);
       else
-         img->FetchTexelc(img, i0, j0, 0, t00);
+         img->FetchTexelf(img, i0, j0, 0, t00);
 
       if (useBorderColor & (I1BIT | J0BIT))
-         COPY_CHAN4(t10, tObj->_BorderChan);
+         COPY_4V(t10, tObj->BorderColor);
       else
-         img->FetchTexelc(img, i1, j0, 0, t10);
+         img->FetchTexelf(img, i1, j0, 0, t10);
 
       if (useBorderColor & (I0BIT | J1BIT))
-         COPY_CHAN4(t01, tObj->_BorderChan);
+         COPY_4V(t01, tObj->BorderColor);
       else
-         img->FetchTexelc(img, i0, j1, 0, t01);
+         img->FetchTexelf(img, i0, j1, 0, t01);
 
       if (useBorderColor & (I1BIT | J1BIT))
-         COPY_CHAN4(t11, tObj->_BorderChan);
+         COPY_4V(t11, tObj->BorderColor);
       else
-         img->FetchTexelc(img, i1, j1, 0, t11);
+         img->FetchTexelf(img, i1, j1, 0, t11);
 
       lerp_rgba_2d(rgba[i], a, b, t00, t10, t01, t11);
    }
@@ -2176,7 +2134,7 @@ static void
 sample_lambda_rect(GLcontext *ctx,
 		   const struct gl_texture_object *tObj, GLuint n,
 		   const GLfloat texcoords[][4], const GLfloat lambda[],
-		   GLchan rgba[][4])
+		   GLfloat rgba[][4])
 {
    GLuint minStart, minEnd, magStart, magEnd;
 
@@ -2222,7 +2180,7 @@ sample_2d_array_nearest(GLcontext *ctx,
                         const struct gl_texture_object *tObj,
                         const struct gl_texture_image *img,
                         const GLfloat texcoord[4],
-                        GLchan rgba[4])
+                        GLfloat rgba[4])
 {
    const GLint width = img->Width2;     /* without border, power of two */
    const GLint height = img->Height2;   /* without border, power of two */
@@ -2239,10 +2197,10 @@ sample_2d_array_nearest(GLcontext *ctx,
        j < 0 || j >= (GLint) img->Height ||
        array < 0 || array >= (GLint) img->Depth) {
       /* Need this test for GL_CLAMP_TO_BORDER mode */
-      COPY_CHAN4(rgba, tObj->_BorderChan);
+      COPY_4V(rgba, tObj->BorderColor);
    }
    else {
-      img->FetchTexelc(img, i, j, array, rgba);
+      img->FetchTexelf(img, i, j, array, rgba);
    }
 }
 
@@ -2255,7 +2213,7 @@ sample_2d_array_linear(GLcontext *ctx,
                        const struct gl_texture_object *tObj,
                        const struct gl_texture_image *img,
                        const GLfloat texcoord[4],
-                       GLchan rgba[4])
+                       GLfloat rgba[4])
 {
    const GLint width = img->Width2;
    const GLint height = img->Height2;
@@ -2264,14 +2222,14 @@ sample_2d_array_linear(GLcontext *ctx,
    GLint array;
    GLbitfield useBorderColor = 0x0;
    GLfloat a, b;
-   GLchan t00[4], t01[4], t10[4], t11[4];
+   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);
    array = clamp_rect_coord_nearest(tObj->WrapR, texcoord[2], depth);
 
    if (array < 0 || array >= depth) {
-      COPY_CHAN4(rgba, tObj->_BorderChan);
+      COPY_4V(rgba, tObj->BorderColor);
    }
    else {
       if (img->Border) {
@@ -2290,28 +2248,28 @@ sample_2d_array_linear(GLcontext *ctx,
 
       /* Fetch texels */
       if (useBorderColor & (I0BIT | J0BIT)) {
-	 COPY_CHAN4(t00, tObj->_BorderChan);
+	 COPY_4V(t00, tObj->BorderColor);
       }
       else {
-	 img->FetchTexelc(img, i0, j0, array, t00);
+	 img->FetchTexelf(img, i0, j0, array, t00);
       }
       if (useBorderColor & (I1BIT | J0BIT)) {
-	 COPY_CHAN4(t10, tObj->_BorderChan);
+	 COPY_4V(t10, tObj->BorderColor);
       }
       else {
-	 img->FetchTexelc(img, i1, j0, array, t10);
+	 img->FetchTexelf(img, i1, j0, array, t10);
       }
       if (useBorderColor & (I0BIT | J1BIT)) {
-	 COPY_CHAN4(t01, tObj->_BorderChan);
+	 COPY_4V(t01, tObj->BorderColor);
       }
       else {
-	 img->FetchTexelc(img, i0, j1, array, t01);
+	 img->FetchTexelf(img, i0, j1, array, t01);
       }
       if (useBorderColor & (I1BIT | J1BIT)) {
-	 COPY_CHAN4(t11, tObj->_BorderChan);
+	 COPY_4V(t11, tObj->BorderColor);
       }
       else {
-	 img->FetchTexelc(img, i1, j1, array, t11);
+	 img->FetchTexelf(img, i1, j1, array, t11);
       }
       
       /* trilinear interpolation of samples */
@@ -2324,7 +2282,7 @@ static void
 sample_2d_array_nearest_mipmap_nearest(GLcontext *ctx,
                                        const struct gl_texture_object *tObj,
                                        GLuint n, const GLfloat texcoord[][4],
-                                       const GLfloat lambda[], GLchan rgba[][4])
+                                       const GLfloat lambda[], GLfloat rgba[][4])
 {
    GLuint i;
    for (i = 0; i < n; i++) {
@@ -2339,7 +2297,7 @@ static void
 sample_2d_array_linear_mipmap_nearest(GLcontext *ctx,
                                       const struct gl_texture_object *tObj,
                                       GLuint n, const GLfloat texcoord[][4],
-                                      const GLfloat lambda[], GLchan rgba[][4])
+                                      const GLfloat lambda[], GLfloat rgba[][4])
 {
    GLuint i;
    ASSERT(lambda != NULL);
@@ -2355,7 +2313,7 @@ static void
 sample_2d_array_nearest_mipmap_linear(GLcontext *ctx,
                                       const struct gl_texture_object *tObj,
                                       GLuint n, const GLfloat texcoord[][4],
-                                      const GLfloat lambda[], GLchan rgba[][4])
+                                      const GLfloat lambda[], GLfloat rgba[][4])
 {
    GLuint i;
    ASSERT(lambda != NULL);
@@ -2366,7 +2324,7 @@ sample_2d_array_nearest_mipmap_linear(GLcontext *ctx,
                                  texcoord[i], rgba[i]);
       }
       else {
-         GLchan t0[4], t1[4];  /* texels */
+         GLfloat t0[4], t1[4];  /* texels */
          const GLfloat f = FRAC(lambda[i]);
          sample_2d_array_nearest(ctx, tObj, tObj->Image[0][level  ],
                                  texcoord[i], t0);
@@ -2382,7 +2340,7 @@ static void
 sample_2d_array_linear_mipmap_linear(GLcontext *ctx,
                                      const struct gl_texture_object *tObj,
                                      GLuint n, const GLfloat texcoord[][4],
-                                     const GLfloat lambda[], GLchan rgba[][4])
+                                     const GLfloat lambda[], GLfloat rgba[][4])
 {
    GLuint i;
    ASSERT(lambda != NULL);
@@ -2393,7 +2351,7 @@ sample_2d_array_linear_mipmap_linear(GLcontext *ctx,
                           texcoord[i], rgba[i]);
       }
       else {
-         GLchan t0[4], t1[4];  /* texels */
+         GLfloat t0[4], t1[4];  /* texels */
          const GLfloat f = FRAC(lambda[i]);
          sample_2d_array_linear(ctx, tObj, tObj->Image[0][level  ],
                                 texcoord[i], t0);
@@ -2410,7 +2368,7 @@ static void
 sample_nearest_2d_array(GLcontext *ctx,
                         const struct gl_texture_object *tObj, GLuint n,
                         const GLfloat texcoords[][4], const GLfloat lambda[],
-                        GLchan rgba[][4])
+                        GLfloat rgba[][4])
 {
    GLuint i;
    struct gl_texture_image *image = tObj->Image[0][tObj->BaseLevel];
@@ -2427,7 +2385,7 @@ static void
 sample_linear_2d_array(GLcontext *ctx,
                        const struct gl_texture_object *tObj, GLuint n,
                        const GLfloat texcoords[][4],
-                       const GLfloat lambda[], GLchan rgba[][4])
+                       const GLfloat lambda[], GLfloat rgba[][4])
 {
    GLuint i;
    struct gl_texture_image *image = tObj->Image[0][tObj->BaseLevel];
@@ -2443,7 +2401,7 @@ static void
 sample_lambda_2d_array(GLcontext *ctx,
                        const struct gl_texture_object *tObj, GLuint n,
                        const GLfloat texcoords[][4], const GLfloat lambda[],
-                       GLchan rgba[][4])
+                       GLfloat rgba[][4])
 {
    GLuint minStart, minEnd;  /* texels with minification */
    GLuint magStart, magEnd;  /* texels with magnification */
@@ -2532,7 +2490,7 @@ sample_1d_array_nearest(GLcontext *ctx,
                         const struct gl_texture_object *tObj,
                         const struct gl_texture_image *img,
                         const GLfloat texcoord[4],
-                        GLchan rgba[4])
+                        GLfloat rgba[4])
 {
    const GLint width = img->Width2;     /* without border, power of two */
    const GLint height = img->Height;
@@ -2546,10 +2504,10 @@ sample_1d_array_nearest(GLcontext *ctx,
    if (i < 0 || i >= (GLint) img->Width ||
        array < 0 || array >= (GLint) img->Height) {
       /* Need this test for GL_CLAMP_TO_BORDER mode */
-      COPY_CHAN4(rgba, tObj->_BorderChan);
+      COPY_4V(rgba, tObj->BorderColor);
    }
    else {
-      img->FetchTexelc(img, i, array, 0, rgba);
+      img->FetchTexelf(img, i, array, 0, rgba);
    }
 }
 
@@ -2562,7 +2520,7 @@ sample_1d_array_linear(GLcontext *ctx,
                        const struct gl_texture_object *tObj,
                        const struct gl_texture_image *img,
                        const GLfloat texcoord[4],
-                       GLchan rgba[4])
+                       GLfloat rgba[4])
 {
    const GLint width = img->Width2;
    const GLint height = img->Height;
@@ -2570,7 +2528,7 @@ sample_1d_array_linear(GLcontext *ctx,
    GLint array;
    GLbitfield useBorderColor = 0x0;
    GLfloat a;
-   GLchan t0[4], t1[4];
+   GLfloat t0[4], t1[4];
 
    linear_texel_locations(tObj->WrapS, img, width, texcoord[0], &i0, &i1, &a);
    array = clamp_rect_coord_nearest(tObj->WrapT, texcoord[1], height);
@@ -2589,16 +2547,16 @@ sample_1d_array_linear(GLcontext *ctx,
 
    /* Fetch texels */
    if (useBorderColor & (I0BIT | K0BIT)) {
-      COPY_CHAN4(t0, tObj->_BorderChan);
+      COPY_4V(t0, tObj->BorderColor);
    }
    else {
-      img->FetchTexelc(img, i0, array, 0, t0);
+      img->FetchTexelf(img, i0, array, 0, t0);
    }
    if (useBorderColor & (I1BIT | K0BIT)) {
-      COPY_CHAN4(t1, tObj->_BorderChan);
+      COPY_4V(t1, tObj->BorderColor);
    }
    else {
-      img->FetchTexelc(img, i1, array, 0, t1);
+      img->FetchTexelf(img, i1, array, 0, t1);
    }
 
    /* bilinear interpolation of samples */
@@ -2610,7 +2568,7 @@ static void
 sample_1d_array_nearest_mipmap_nearest(GLcontext *ctx,
                                        const struct gl_texture_object *tObj,
                                        GLuint n, const GLfloat texcoord[][4],
-                                       const GLfloat lambda[], GLchan rgba[][4])
+                                       const GLfloat lambda[], GLfloat rgba[][4])
 {
    GLuint i;
    for (i = 0; i < n; i++) {
@@ -2625,7 +2583,7 @@ static void
 sample_1d_array_linear_mipmap_nearest(GLcontext *ctx,
                                       const struct gl_texture_object *tObj,
                                       GLuint n, const GLfloat texcoord[][4],
-                                      const GLfloat lambda[], GLchan rgba[][4])
+                                      const GLfloat lambda[], GLfloat rgba[][4])
 {
    GLuint i;
    ASSERT(lambda != NULL);
@@ -2641,7 +2599,7 @@ static void
 sample_1d_array_nearest_mipmap_linear(GLcontext *ctx,
                                       const struct gl_texture_object *tObj,
                                       GLuint n, const GLfloat texcoord[][4],
-                                      const GLfloat lambda[], GLchan rgba[][4])
+                                      const GLfloat lambda[], GLfloat rgba[][4])
 {
    GLuint i;
    ASSERT(lambda != NULL);
@@ -2652,7 +2610,7 @@ sample_1d_array_nearest_mipmap_linear(GLcontext *ctx,
                                  texcoord[i], rgba[i]);
       }
       else {
-         GLchan t0[4], t1[4];  /* texels */
+         GLfloat t0[4], t1[4];  /* texels */
          const GLfloat f = FRAC(lambda[i]);
          sample_1d_array_nearest(ctx, tObj, tObj->Image[0][level  ], texcoord[i], t0);
          sample_1d_array_nearest(ctx, tObj, tObj->Image[0][level+1], texcoord[i], t1);
@@ -2666,7 +2624,7 @@ static void
 sample_1d_array_linear_mipmap_linear(GLcontext *ctx,
                                      const struct gl_texture_object *tObj,
                                      GLuint n, const GLfloat texcoord[][4],
-                                     const GLfloat lambda[], GLchan rgba[][4])
+                                     const GLfloat lambda[], GLfloat rgba[][4])
 {
    GLuint i;
    ASSERT(lambda != NULL);
@@ -2677,7 +2635,7 @@ sample_1d_array_linear_mipmap_linear(GLcontext *ctx,
                           texcoord[i], rgba[i]);
       }
       else {
-         GLchan t0[4], t1[4];  /* texels */
+         GLfloat t0[4], t1[4];  /* texels */
          const GLfloat f = FRAC(lambda[i]);
          sample_1d_array_linear(ctx, tObj, tObj->Image[0][level  ], texcoord[i], t0);
          sample_1d_array_linear(ctx, tObj, tObj->Image[0][level+1], texcoord[i], t1);
@@ -2692,7 +2650,7 @@ static void
 sample_nearest_1d_array(GLcontext *ctx,
                         const struct gl_texture_object *tObj, GLuint n,
                         const GLfloat texcoords[][4], const GLfloat lambda[],
-                        GLchan rgba[][4])
+                        GLfloat rgba[][4])
 {
    GLuint i;
    struct gl_texture_image *image = tObj->Image[0][tObj->BaseLevel];
@@ -2708,7 +2666,7 @@ static void
 sample_linear_1d_array(GLcontext *ctx,
                        const struct gl_texture_object *tObj, GLuint n,
                        const GLfloat texcoords[][4],
-                       const GLfloat lambda[], GLchan rgba[][4])
+                       const GLfloat lambda[], GLfloat rgba[][4])
 {
    GLuint i;
    struct gl_texture_image *image = tObj->Image[0][tObj->BaseLevel];
@@ -2724,7 +2682,7 @@ static void
 sample_lambda_1d_array(GLcontext *ctx,
                        const struct gl_texture_object *tObj, GLuint n,
                        const GLfloat texcoords[][4], const GLfloat lambda[],
-                       GLchan rgba[][4])
+                       GLfloat rgba[][4])
 {
    GLuint minStart, minEnd;  /* texels with minification */
    GLuint magStart, magEnd;  /* texels with magnification */
@@ -2802,7 +2760,7 @@ static void
 sample_depth_texture( GLcontext *ctx,
                       const struct gl_texture_object *tObj, GLuint n,
                       const GLfloat texcoords[][4], const GLfloat lambda[],
-                      GLchan texel[][4] )
+                      GLfloat texel[][4] )
 {
    const GLint baseLevel = tObj->BaseLevel;
    const struct gl_texture_image *img = tObj->Image[0][baseLevel];
@@ -2811,9 +2769,9 @@ sample_depth_texture( GLcontext *ctx,
    const GLint depth = img->Depth;
    const GLuint compare_coord = (tObj->Target == GL_TEXTURE_2D_ARRAY_EXT)
        ? 3 : 2;
-   GLchan ambient;
+   GLfloat ambient;
    GLenum function;
-   GLchan result;
+   GLfloat result;
 
    (void) lambda;
 
@@ -2826,7 +2784,7 @@ sample_depth_texture( GLcontext *ctx,
           tObj->Target == GL_TEXTURE_1D_ARRAY_EXT ||
           tObj->Target == GL_TEXTURE_2D_ARRAY_EXT);
 
-   UNCLAMPED_FLOAT_TO_CHAN(ambient, tObj->CompareFailValue);
+   ambient = tObj->CompareFailValue;
 
    /* XXXX if tObj->MinFilter != tObj->MagFilter, we're ignoring lambda */
 
@@ -2889,31 +2847,31 @@ sample_depth_texture( GLcontext *ctx,
 
          switch (function) {
          case GL_LEQUAL:
-            result = (texcoords[i][compare_coord] <= depthSample) ? CHAN_MAX : ambient;
+            result = (texcoords[i][compare_coord] <= depthSample) ? 1.0F : ambient;
             break;
          case GL_GEQUAL:
-            result = (texcoords[i][compare_coord] >= depthSample) ? CHAN_MAX : ambient;
+            result = (texcoords[i][compare_coord] >= depthSample) ? 1.0F : ambient;
             break;
          case GL_LESS:
-            result = (texcoords[i][compare_coord] < depthSample) ? CHAN_MAX : ambient;
+            result = (texcoords[i][compare_coord] < depthSample) ? 1.0F : ambient;
             break;
          case GL_GREATER:
-            result = (texcoords[i][compare_coord] > depthSample) ? CHAN_MAX : ambient;
+            result = (texcoords[i][compare_coord] > depthSample) ? 1.0F : ambient;
             break;
          case GL_EQUAL:
-            result = (texcoords[i][compare_coord] == depthSample) ? CHAN_MAX : ambient;
+            result = (texcoords[i][compare_coord] == depthSample) ? 1.0F : ambient;
             break;
          case GL_NOTEQUAL:
-            result = (texcoords[i][compare_coord] != depthSample) ? CHAN_MAX : ambient;
+            result = (texcoords[i][compare_coord] != depthSample) ? 1.0F : ambient;
             break;
          case GL_ALWAYS:
-            result = CHAN_MAX;
+            result = 1.0F;
             break;
          case GL_NEVER:
             result = ambient;
             break;
          case GL_NONE:
-            CLAMPED_FLOAT_TO_CHAN(result, depthSample);
+            result = depthSample;
             break;
          default:
             _mesa_problem(ctx, "Bad compare func in sample_depth_texture");
@@ -2922,22 +2880,13 @@ sample_depth_texture( GLcontext *ctx,
 
          switch (tObj->DepthMode) {
          case GL_LUMINANCE:
-            texel[i][RCOMP] = result;
-            texel[i][GCOMP] = result;
-            texel[i][BCOMP] = result;
-            texel[i][ACOMP] = CHAN_MAX;
+            ASSIGN_4V(texel[i], result, result, result, 1.0F);
             break;
          case GL_INTENSITY:
-            texel[i][RCOMP] = result;
-            texel[i][GCOMP] = result;
-            texel[i][BCOMP] = result;
-            texel[i][ACOMP] = result;
+            ASSIGN_4V(texel[i], result, result, result, result);
             break;
          case GL_ALPHA:
-            texel[i][RCOMP] = 0;
-            texel[i][GCOMP] = 0;
-            texel[i][BCOMP] = 0;
-            texel[i][ACOMP] = result;
+            ASSIGN_4V(texel[i], 0.0F, 0.0F, 0.0F, result);
             break;
          default:
             _mesa_problem(ctx, "Bad depth texture mode");
@@ -3074,42 +3023,42 @@ sample_depth_texture( GLcontext *ctx,
                if (depth01 <= texcoords[i][compare_coord])  luminance -= d;
                if (depth10 <= texcoords[i][compare_coord])  luminance -= d;
                if (depth11 <= texcoords[i][compare_coord])  luminance -= d;
-               result = (GLchan) luminance;
+               result = (GLfloat) luminance;
                break;
             case GL_GEQUAL:
                if (depth00 >= texcoords[i][compare_coord])  luminance -= d;
                if (depth01 >= texcoords[i][compare_coord])  luminance -= d;
                if (depth10 >= texcoords[i][compare_coord])  luminance -= d;
                if (depth11 >= texcoords[i][compare_coord])  luminance -= d;
-               result = (GLchan) luminance;
+               result = (GLfloat) luminance;
                break;
             case GL_LESS:
                if (depth00 < texcoords[i][compare_coord])  luminance -= d;
                if (depth01 < texcoords[i][compare_coord])  luminance -= d;
                if (depth10 < texcoords[i][compare_coord])  luminance -= d;
                if (depth11 < texcoords[i][compare_coord])  luminance -= d;
-               result = (GLchan) luminance;
+               result = (GLfloat) luminance;
                break;
             case GL_GREATER:
                if (depth00 > texcoords[i][compare_coord])  luminance -= d;
                if (depth01 > texcoords[i][compare_coord])  luminance -= d;
                if (depth10 > texcoords[i][compare_coord])  luminance -= d;
                if (depth11 > texcoords[i][compare_coord])  luminance -= d;
-               result = (GLchan) luminance;
+               result = (GLfloat) luminance;
                break;
             case GL_EQUAL:
                if (depth00 == texcoords[i][compare_coord])  luminance -= d;
                if (depth01 == texcoords[i][compare_coord])  luminance -= d;
                if (depth10 == texcoords[i][compare_coord])  luminance -= d;
                if (depth11 == texcoords[i][compare_coord])  luminance -= d;
-               result = (GLchan) luminance;
+               result = (GLfloat) luminance;
                break;
             case GL_NOTEQUAL:
                if (depth00 != texcoords[i][compare_coord])  luminance -= d;
                if (depth01 != texcoords[i][compare_coord])  luminance -= d;
                if (depth10 != texcoords[i][compare_coord])  luminance -= d;
                if (depth11 != texcoords[i][compare_coord])  luminance -= d;
-               result = (GLchan) luminance;
+               result = (GLfloat) luminance;
                break;
             case GL_ALWAYS:
                result = 0;
@@ -3168,7 +3117,7 @@ static void
 null_sample_func( GLcontext *ctx,
 		  const struct gl_texture_object *tObj, GLuint n,
 		  const GLfloat texcoords[][4], const GLfloat lambda[],
-		  GLchan rgba[][4])
+		  GLfloat rgba[][4])
 {
    GLuint i;
    (void) ctx;
@@ -3225,6 +3174,7 @@ _swrast_choose_texture_sample_func( GLcontext *ctx,
          }
          else {
             /* check for a few optimized cases */
+#if 0
             const struct gl_texture_image *img = t->Image[0][t->BaseLevel];
             ASSERT(t->MinFilter == GL_NEAREST);
             if (t->WrapS == GL_REPEAT &&
@@ -3241,6 +3191,10 @@ _swrast_choose_texture_sample_func( GLcontext *ctx,
                      img->TexFormat->MesaFormat == MESA_FORMAT_RGBA) {
                return &opt_sample_rgba_2d;
             }
+#else
+            if (0)
+               ;
+#endif
             else {
                return &sample_nearest_2d;
             }
diff --git a/src/mesa/tnl/t_vb_program.c b/src/mesa/tnl/t_vb_program.c
index f99401ca6d..1795f62c32 100644
--- a/src/mesa/tnl/t_vb_program.c
+++ b/src/mesa/tnl/t_vb_program.c
@@ -176,17 +176,12 @@ static void
 vp_fetch_texel(GLcontext *ctx, const GLfloat texcoord[4], GLfloat lambda,
                GLuint unit, GLfloat color[4])
 {
-   GLchan rgba[4];
    SWcontext *swrast = SWRAST_CONTEXT(ctx);
 
    /* XXX use a float-valued TextureSample routine here!!! */
    swrast->TextureSample[unit](ctx, ctx->Texture.Unit[unit]._Current,
                                1, (const GLfloat (*)[4]) texcoord,
-                               &lambda, &rgba);
-   color[0] = CHAN_TO_FLOAT(rgba[0]);
-   color[1] = CHAN_TO_FLOAT(rgba[1]);
-   color[2] = CHAN_TO_FLOAT(rgba[2]);
-   color[3] = CHAN_TO_FLOAT(rgba[3]);
+                               &lambda,  (GLfloat (*)[4]) color);
 }
 
 
-- 
cgit v1.2.3


From bd9b2be8284fda3f8aac235908ded118b5648a38 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Sun, 8 Mar 2009 17:58:54 -0600
Subject: mesa: texture combine clean-ups

Use MAX_COMBINER_TERMS instead of 4.
Rename some vars.
Update comments.
---
 src/mesa/main/mtypes.h         |  15 +++--
 src/mesa/main/texenv.c         |  50 +++++++--------
 src/mesa/main/texenvprogram.c  |  13 ++--
 src/mesa/swrast/s_fragprog.c   |   2 -
 src/mesa/swrast/s_texcombine.c | 140 ++++++++++++++++++++---------------------
 5 files changed, 108 insertions(+), 112 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index e77dd1d226..c1f06885ec 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1338,18 +1338,23 @@ struct gl_texture_object
 };
 
 
+/** Up to four combiner sources are possible with GL_NV_texture_env_combine4 */
+#define MAX_COMBINER_TERMS 4
+
+
 /**
  * Texture combine environment state.
- * Up to four combiner sources are possible with GL_NV_texture_env_combine4.
  */
 struct gl_tex_env_combine_state
 {
    GLenum ModeRGB;       /**< GL_REPLACE, GL_DECAL, GL_ADD, etc. */
    GLenum ModeA;         /**< GL_REPLACE, GL_DECAL, GL_ADD, etc. */
-   GLenum SourceRGB[4];  /**< GL_PRIMARY_COLOR, GL_TEXTURE, etc. */
-   GLenum SourceA[4];    /**< GL_PRIMARY_COLOR, GL_TEXTURE, etc. */
-   GLenum OperandRGB[4]; /**< SRC_COLOR, ONE_MINUS_SRC_COLOR, etc */
-   GLenum OperandA[4];   /**< SRC_ALPHA, ONE_MINUS_SRC_ALPHA, etc */
+   /** Source terms: GL_PRIMARY_COLOR, GL_TEXTURE, etc */
+   GLenum SourceRGB[MAX_COMBINER_TERMS];
+   GLenum SourceA[MAX_COMBINER_TERMS];
+   /** Source operands: GL_SRC_COLOR, GL_ONE_MINUS_SRC_COLOR, etc */
+   GLenum OperandRGB[MAX_COMBINER_TERMS];
+   GLenum OperandA[MAX_COMBINER_TERMS];
    GLuint ScaleShiftRGB; /**< 0, 1 or 2 */
    GLuint ScaleShiftA;   /**< 0, 1 or 2 */
    GLuint _NumArgsRGB;   /**< Number of inputs used for the RGB combiner */
diff --git a/src/mesa/main/texenv.c b/src/mesa/main/texenv.c
index c2960fc820..4d511f2f7e 100644
--- a/src/mesa/main/texenv.c
+++ b/src/mesa/main/texenv.c
@@ -184,7 +184,7 @@ set_combiner_source(GLcontext *ctx,
                     struct gl_texture_unit *texUnit,
                     GLenum pname, GLenum param)
 {
-   GLuint src;
+   GLuint term;
    GLboolean alpha, legal;
 
    if (!ctx->Extensions.EXT_texture_env_combine &&
@@ -194,24 +194,24 @@ set_combiner_source(GLcontext *ctx,
    }
 
    /*
-    * Translate pname to (src, alpha).
+    * Translate pname to (term, alpha).
     */
    switch (pname) {
    case GL_SOURCE0_RGB:
-      src = 0;
+      term = 0;
       alpha = GL_FALSE;
       break;
    case GL_SOURCE1_RGB:
-      src = 1;
+      term = 1;
       alpha = GL_FALSE;
       break;
    case GL_SOURCE2_RGB:
-      src = 2;
+      term = 2;
       alpha = GL_FALSE;
       break;
    case GL_SOURCE3_RGB_NV:
       if (ctx->Extensions.NV_texture_env_combine4) {
-         src = 3;
+         term = 3;
          alpha = GL_FALSE;
       }
       else {
@@ -220,20 +220,20 @@ set_combiner_source(GLcontext *ctx,
       }
       break;
    case GL_SOURCE0_ALPHA:
-      src = 0;
+      term = 0;
       alpha = GL_TRUE;
       break;
    case GL_SOURCE1_ALPHA:
-      src = 1;
+      term = 1;
       alpha = GL_TRUE;
       break;
    case GL_SOURCE2_ALPHA:
-      src = 2;
+      term = 2;
       alpha = GL_TRUE;
       break;
    case GL_SOURCE3_ALPHA_NV:
       if (ctx->Extensions.NV_texture_env_combine4) {
-         src = 3;
+         term = 3;
          alpha = GL_TRUE;
       }
       else {
@@ -246,7 +246,7 @@ set_combiner_source(GLcontext *ctx,
       return;
    }
 
-   assert(src < 4);
+   assert(term < MAX_COMBINER_TERMS);
 
    /*
     * Error-check param (the source term)
@@ -288,9 +288,9 @@ set_combiner_source(GLcontext *ctx,
    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
 
    if (alpha)
-      texUnit->Combine.SourceA[src] = param;
+      texUnit->Combine.SourceA[term] = param;
    else
-      texUnit->Combine.SourceRGB[src] = param;
+      texUnit->Combine.SourceRGB[term] = param;
 }
 
 
@@ -300,7 +300,7 @@ set_combiner_operand(GLcontext *ctx,
                      struct gl_texture_unit *texUnit,
                      GLenum pname, GLenum param)
 {
-   GLuint op;
+   GLuint term;
    GLboolean alpha, legal;
 
    if (!ctx->Extensions.EXT_texture_env_combine &&
@@ -311,16 +311,16 @@ set_combiner_operand(GLcontext *ctx,
 
    switch (pname) {
    case GL_OPERAND0_RGB:
-      op = 0;
+      term = 0;
       alpha = GL_FALSE;
       break;
    case GL_OPERAND1_RGB:
-      op = 1;
+      term = 1;
       alpha = GL_FALSE;
       break;
    case GL_OPERAND2_RGB:
       if (ctx->Extensions.ARB_texture_env_combine) {
-         op = 2;
+         term = 2;
          alpha = GL_FALSE;
       }
       else {
@@ -330,7 +330,7 @@ set_combiner_operand(GLcontext *ctx,
       break;
    case GL_OPERAND3_RGB_NV:
       if (ctx->Extensions.NV_texture_env_combine4) {
-         op = 3;
+         term = 3;
          alpha = GL_FALSE;
       }
       else {
@@ -339,16 +339,16 @@ set_combiner_operand(GLcontext *ctx,
       }
       break;
    case GL_OPERAND0_ALPHA:
-      op = 0;
+      term = 0;
       alpha = GL_TRUE;
       break;
    case GL_OPERAND1_ALPHA:
-      op = 1;
+      term = 1;
       alpha = GL_TRUE;
       break;
    case GL_OPERAND2_ALPHA:
       if (ctx->Extensions.ARB_texture_env_combine) {
-         op = 2;
+         term = 2;
          alpha = GL_TRUE;
       }
       else {
@@ -358,7 +358,7 @@ set_combiner_operand(GLcontext *ctx,
       break;
    case GL_OPERAND3_ALPHA_NV:
       if (ctx->Extensions.NV_texture_env_combine4) {
-         op = 3;
+         term = 3;
          alpha = GL_TRUE;
       }
       else {
@@ -371,7 +371,7 @@ set_combiner_operand(GLcontext *ctx,
       return;
    }
 
-   assert(op < 4);
+   assert(term < MAX_COMBINER_TERMS);
 
    /*
     * Error-check param (the source operand)
@@ -397,9 +397,9 @@ set_combiner_operand(GLcontext *ctx,
    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
 
    if (alpha)
-      texUnit->Combine.OperandA[op] = param;
+      texUnit->Combine.OperandA[term] = param;
    else
-      texUnit->Combine.OperandRGB[op] = param;
+      texUnit->Combine.OperandRGB[term] = param;
 }
 
 
diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 3fbd119b34..4a124bf27e 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -39,9 +39,6 @@
 #include "texenvprogram.h"
 
 
-#define MAX_TERMS 4
-
-
 /*
  * Note on texture units:
  *
@@ -95,11 +92,11 @@ struct state_key {
 
       GLuint NumArgsRGB:3;
       GLuint ModeRGB:5;
-      struct mode_opt OptRGB[MAX_TERMS];
+      struct mode_opt OptRGB[MAX_COMBINER_TERMS];
 
       GLuint NumArgsA:3;
       GLuint ModeA:5;
-      struct mode_opt OptA[MAX_TERMS];
+      struct mode_opt OptA[MAX_COMBINER_TERMS];
    } unit[8];
 };
 
@@ -389,7 +386,7 @@ static void make_state_key( GLcontext *ctx,  struct state_key *key )
       key->unit[i].ScaleShiftRGB = texUnit->_CurrentCombine->ScaleShiftRGB;
       key->unit[i].ScaleShiftA = texUnit->_CurrentCombine->ScaleShiftA;
 
-      for (j = 0; j < MAX_TERMS; j++) {
+      for (j = 0; j < MAX_COMBINER_TERMS; j++) {
          key->unit[i].OptRGB[j].Operand =
 	    translate_operand(texUnit->_CurrentCombine->OperandRGB[j]);
          key->unit[i].OptA[j].Operand =
@@ -972,11 +969,11 @@ static struct ureg emit_combine( struct texenv_fragment_program *p,
 				 GLuint mode,
 				 const struct mode_opt *opt)
 {
-   struct ureg src[MAX_TERMS];
+   struct ureg src[MAX_COMBINER_TERMS];
    struct ureg tmp, half;
    GLuint i;
 
-   assert(nr <= MAX_TERMS);
+   assert(nr <= MAX_COMBINER_TERMS);
 
    tmp = undef; /* silence warning (bug 5318) */
 
diff --git a/src/mesa/swrast/s_fragprog.c b/src/mesa/swrast/s_fragprog.c
index 5f032bbd69..b71fb9eae9 100644
--- a/src/mesa/swrast/s_fragprog.c
+++ b/src/mesa/swrast/s_fragprog.c
@@ -74,7 +74,6 @@ fetch_texel_lod( GLcontext *ctx, const GLfloat texcoord[4], GLfloat lambda,
 
       lambda = CLAMP(lambda, texObj->MinLod, texObj->MaxLod);
 
-      /* XXX use a float-valued TextureSample routine here!!! */
       swrast->TextureSample[unit](ctx, texObj, 1,
                                   (const GLfloat (*)[4]) texcoord,
                                   &lambda, &rgba);
@@ -116,7 +115,6 @@ fetch_texel_deriv( GLcontext *ctx, const GLfloat texcoord[4],
 
       lambda = CLAMP(lambda, texObj->MinLod, texObj->MaxLod);
 
-      /* XXX use a float-valued TextureSample routine here!!! */
       swrast->TextureSample[unit](ctx, texObj, 1,
                                   (const GLfloat (*)[4]) texcoord,
                                   &lambda, &rgba);
diff --git a/src/mesa/swrast/s_texcombine.c b/src/mesa/swrast/s_texcombine.c
index 27c5c15cf1..76b95e8ae7 100644
--- a/src/mesa/swrast/s_texcombine.c
+++ b/src/mesa/swrast/s_texcombine.c
@@ -37,23 +37,23 @@
 #include "s_texcombine.h"
 
 
-#define MAX_COMBINER_TERMS 4
-
-
 /**
- * Do texture application for GL_ARB/EXT_texture_env_combine.
- * This function also supports GL_{EXT,ARB}_texture_env_dot3 and
- * GL_ATI_texture_env_combine3.  Since "classic" texture environments are
- * implemented using GL_ARB_texture_env_combine-like state, this same function
- * is used for classic texture environment application as well.
+ * Do texture application for:
+ *  GL_EXT_texture_env_combine
+ *  GL_ARB_texture_env_combine
+ *  GL_EXT_texture_env_dot3
+ *  GL_ARB_texture_env_dot3
+ *  GL_ATI_texture_env_combine3
+ *  GL_NV_texture_env_combine4
+ *  conventional GL texture env modes
  *
  * \param ctx          rendering context
- * \param textureUnit  the texture unit to apply
+ * \param unit         the texture combiner unit
  * \param n            number of fragments to process (span width)
  * \param primary_rgba incoming fragment color array
  * \param texelBuffer  pointer to texel colors for all texture units
  * 
- * \param rgba         incoming colors, which get modified here
+ * \param rgba         incoming/result fragment colors
  */
 static void
 texture_combine( const GLcontext *ctx, GLuint unit, GLuint n,
@@ -65,16 +65,14 @@ texture_combine( const GLcontext *ctx, GLuint unit, GLuint n,
    const struct gl_tex_env_combine_state *combine = textureUnit->_CurrentCombine;
    const GLfloat (*argRGB [MAX_COMBINER_TERMS])[4];
    const GLfloat (*argA [MAX_COMBINER_TERMS])[4];
-   const GLfloat RGBmult = (GLfloat) (1 << combine->ScaleShiftRGB);
-   const GLfloat Amult = (GLfloat) (1 << combine->ScaleShiftA);
-   const GLuint numColorArgs = combine->_NumArgsRGB;
-   const GLuint numAlphaArgs = combine->_NumArgsA;
+   const GLfloat scaleRGB = (GLfloat) (1 << combine->ScaleShiftRGB);
+   const GLfloat scaleA = (GLfloat) (1 << combine->ScaleShiftA);
+   const GLuint numArgsRGB = combine->_NumArgsRGB;
+   const GLuint numArgsA = combine->_NumArgsA;
    GLfloat ccolor[MAX_COMBINER_TERMS][MAX_WIDTH][4]; /* temp color buffers */
    GLfloat rgba[MAX_WIDTH][4];
    GLuint i, term;
 
-   ASSERT(ctx->Extensions.EXT_texture_env_combine ||
-          ctx->Extensions.ARB_texture_env_combine);
    ASSERT(CONST_SWRAST_CONTEXT(ctx)->_AnyTextureCombine);
 
    for (i = 0; i < n; i++) {
@@ -97,7 +95,7 @@ texture_combine( const GLcontext *ctx, GLuint unit, GLuint n,
    /*
     * Do operand setup for up to 4 operands.  Loop over the terms.
     */
-   for (term = 0; term < numColorArgs; term++) {
+   for (term = 0; term < numArgsRGB; term++) {
       const GLenum srcRGB = combine->SourceRGB[term];
       const GLenum operandRGB = combine->OperandRGB[term];
 
@@ -193,9 +191,9 @@ texture_combine( const GLcontext *ctx, GLuint unit, GLuint n,
    }
 
    /*
-    * Set up the argA[i] pointers
+    * Set up the argA[term] pointers
     */
-   for (term = 0; term < numAlphaArgs; term++) {
+   for (term = 0; term < numArgsA; term++) {
       const GLenum srcA = combine->SourceA[term];
       const GLenum operandA = combine->OperandA[term];
 
@@ -269,16 +267,16 @@ texture_combine( const GLcontext *ctx, GLuint unit, GLuint n,
       switch (combine->ModeRGB) {
       case GL_REPLACE:
          for (i = 0; i < n; i++) {
-            rgba[i][RCOMP] = arg0[i][RCOMP] * RGBmult;
-            rgba[i][GCOMP] = arg0[i][GCOMP] * RGBmult;
-            rgba[i][BCOMP] = arg0[i][BCOMP] * RGBmult;
+            rgba[i][RCOMP] = arg0[i][RCOMP] * scaleRGB;
+            rgba[i][GCOMP] = arg0[i][GCOMP] * scaleRGB;
+            rgba[i][BCOMP] = arg0[i][BCOMP] * scaleRGB;
          }
          break;
       case GL_MODULATE:
          for (i = 0; i < n; i++) {
-            rgba[i][RCOMP] = arg0[i][RCOMP] * arg1[i][RCOMP] * RGBmult;
-            rgba[i][GCOMP] = arg0[i][GCOMP] * arg1[i][GCOMP] * RGBmult;
-            rgba[i][BCOMP] = arg0[i][BCOMP] * arg1[i][BCOMP] * RGBmult;
+            rgba[i][RCOMP] = arg0[i][RCOMP] * arg1[i][RCOMP] * scaleRGB;
+            rgba[i][GCOMP] = arg0[i][GCOMP] * arg1[i][GCOMP] * scaleRGB;
+            rgba[i][BCOMP] = arg0[i][BCOMP] * arg1[i][BCOMP] * scaleRGB;
          }
          break;
       case GL_ADD:
@@ -286,19 +284,19 @@ texture_combine( const GLcontext *ctx, GLuint unit, GLuint n,
             /* (a * b) + (c * d) */
             for (i = 0; i < n; i++) {
                rgba[i][RCOMP] = (arg0[i][RCOMP] * arg1[i][RCOMP] +
-                                 arg2[i][RCOMP] * arg3[i][RCOMP]) * RGBmult;
+                                 arg2[i][RCOMP] * arg3[i][RCOMP]) * scaleRGB;
                rgba[i][GCOMP] = (arg0[i][GCOMP] * arg1[i][GCOMP] +
-                                 arg2[i][GCOMP] * arg3[i][GCOMP]) * RGBmult;
+                                 arg2[i][GCOMP] * arg3[i][GCOMP]) * scaleRGB;
                rgba[i][BCOMP] = (arg0[i][BCOMP] * arg1[i][BCOMP] +
-                                 arg2[i][BCOMP] * arg3[i][BCOMP]) * RGBmult;
+                                 arg2[i][BCOMP] * arg3[i][BCOMP]) * scaleRGB;
             }
          }
          else {
             /* 2-term addition */
             for (i = 0; i < n; i++) {
-               rgba[i][RCOMP] = (arg0[i][RCOMP] + arg1[i][RCOMP]) * RGBmult;
-               rgba[i][GCOMP] = (arg0[i][GCOMP] + arg1[i][GCOMP]) * RGBmult;
-               rgba[i][BCOMP] = (arg0[i][BCOMP] + arg1[i][BCOMP]) * RGBmult;
+               rgba[i][RCOMP] = (arg0[i][RCOMP] + arg1[i][RCOMP]) * scaleRGB;
+               rgba[i][GCOMP] = (arg0[i][GCOMP] + arg1[i][GCOMP]) * scaleRGB;
+               rgba[i][BCOMP] = (arg0[i][BCOMP] + arg1[i][BCOMP]) * scaleRGB;
             }
          }
          break;
@@ -307,45 +305,45 @@ texture_combine( const GLcontext *ctx, GLuint unit, GLuint n,
             /* (a * b) + (c * d) - 0.5 */
             for (i = 0; i < n; i++) {
                rgba[i][RCOMP] = (arg0[i][RCOMP] + arg1[i][RCOMP] *
-                                 arg2[i][RCOMP] + arg3[i][RCOMP] - 0.5) * RGBmult;
+                                 arg2[i][RCOMP] + arg3[i][RCOMP] - 0.5) * scaleRGB;
                rgba[i][GCOMP] = (arg0[i][GCOMP] + arg1[i][GCOMP] *
-                                 arg2[i][GCOMP] + arg3[i][GCOMP] - 0.5) * RGBmult;
+                                 arg2[i][GCOMP] + arg3[i][GCOMP] - 0.5) * scaleRGB;
                rgba[i][BCOMP] = (arg0[i][BCOMP] + arg1[i][BCOMP] *
-                                 arg2[i][BCOMP] + arg3[i][BCOMP] - 0.5) * RGBmult;
+                                 arg2[i][BCOMP] + arg3[i][BCOMP] - 0.5) * scaleRGB;
             }
          }
          else {
             for (i = 0; i < n; i++) {
-               rgba[i][RCOMP] = (arg0[i][RCOMP] + arg1[i][RCOMP] - 0.5) * RGBmult;
-               rgba[i][GCOMP] = (arg0[i][GCOMP] + arg1[i][GCOMP] - 0.5) * RGBmult;
-               rgba[i][BCOMP] = (arg0[i][BCOMP] + arg1[i][BCOMP] - 0.5) * RGBmult;
+               rgba[i][RCOMP] = (arg0[i][RCOMP] + arg1[i][RCOMP] - 0.5) * scaleRGB;
+               rgba[i][GCOMP] = (arg0[i][GCOMP] + arg1[i][GCOMP] - 0.5) * scaleRGB;
+               rgba[i][BCOMP] = (arg0[i][BCOMP] + arg1[i][BCOMP] - 0.5) * scaleRGB;
             }
          }
          break;
       case GL_INTERPOLATE:
          for (i = 0; i < n; i++) {
             rgba[i][RCOMP] = (arg0[i][RCOMP] * arg2[i][RCOMP] +
-                          arg1[i][RCOMP] * (1.0F - arg2[i][RCOMP])) * RGBmult;
+                          arg1[i][RCOMP] * (1.0F - arg2[i][RCOMP])) * scaleRGB;
             rgba[i][GCOMP] = (arg0[i][GCOMP] * arg2[i][GCOMP] +
-                          arg1[i][GCOMP] * (1.0F - arg2[i][GCOMP])) * RGBmult;
+                          arg1[i][GCOMP] * (1.0F - arg2[i][GCOMP])) * scaleRGB;
             rgba[i][BCOMP] = (arg0[i][BCOMP] * arg2[i][BCOMP] +
-                          arg1[i][BCOMP] * (1.0F - arg2[i][BCOMP])) * RGBmult;
+                          arg1[i][BCOMP] * (1.0F - arg2[i][BCOMP])) * scaleRGB;
          }
          break;
       case GL_SUBTRACT:
          for (i = 0; i < n; i++) {
-            rgba[i][RCOMP] = (arg0[i][RCOMP] - arg1[i][RCOMP]) * RGBmult;
-            rgba[i][GCOMP] = (arg0[i][GCOMP] - arg1[i][GCOMP]) * RGBmult;
-            rgba[i][BCOMP] = (arg0[i][BCOMP] - arg1[i][BCOMP]) * RGBmult;
+            rgba[i][RCOMP] = (arg0[i][RCOMP] - arg1[i][RCOMP]) * scaleRGB;
+            rgba[i][GCOMP] = (arg0[i][GCOMP] - arg1[i][GCOMP]) * scaleRGB;
+            rgba[i][BCOMP] = (arg0[i][BCOMP] - arg1[i][BCOMP]) * scaleRGB;
          }
          break;
       case GL_DOT3_RGB_EXT:
       case GL_DOT3_RGBA_EXT:
          /* Do not scale the result by 1 2 or 4 */
          for (i = 0; i < n; i++) {
-            GLfloat dot = ((arg0[i][RCOMP]-0.5F) * (arg1[i][RCOMP]-0.5F) +
-                           (arg0[i][GCOMP]-0.5F) * (arg1[i][GCOMP]-0.5F) +
-                           (arg0[i][BCOMP]-0.5F) * (arg1[i][BCOMP]-0.5F))
+            GLfloat dot = ((arg0[i][RCOMP] - 0.5F) * (arg1[i][RCOMP] - 0.5F) +
+                           (arg0[i][GCOMP] - 0.5F) * (arg1[i][GCOMP] - 0.5F) +
+                           (arg0[i][BCOMP] - 0.5F) * (arg1[i][BCOMP] - 0.5F))
                * 4.0F;
             dot = CLAMP(dot, 0.0F, 1.0F);
             rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = (GLfloat) dot;
@@ -355,10 +353,10 @@ texture_combine( const GLcontext *ctx, GLuint unit, GLuint n,
       case GL_DOT3_RGBA:
          /* DO scale the result by 1 2 or 4 */
          for (i = 0; i < n; i++) {
-            GLfloat dot = ((arg0[i][RCOMP]-0.5F) * (arg1[i][RCOMP]-0.5F) +
-                           (arg0[i][GCOMP]-0.5F) * (arg1[i][GCOMP]-0.5F) +
-                           (arg0[i][BCOMP]-0.5F) * (arg1[i][BCOMP]-0.5F))
-               * 4.0F * RGBmult;
+            GLfloat dot = ((arg0[i][RCOMP] - 0.5F) * (arg1[i][RCOMP] - 0.5F) +
+                           (arg0[i][GCOMP] - 0.5F) * (arg1[i][GCOMP] - 0.5F) +
+                           (arg0[i][BCOMP] - 0.5F) * (arg1[i][BCOMP] - 0.5F))
+               * 4.0F * scaleRGB;
             dot = CLAMP(dot, 0.0, 1.0F);
             rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = (GLfloat) dot;
          }
@@ -366,31 +364,31 @@ texture_combine( const GLcontext *ctx, GLuint unit, GLuint n,
       case GL_MODULATE_ADD_ATI:
          for (i = 0; i < n; i++) {
             rgba[i][RCOMP] = ((arg0[i][RCOMP] * arg2[i][RCOMP]) +
-                              arg1[i][RCOMP]) * RGBmult;
+                              arg1[i][RCOMP]) * scaleRGB;
             rgba[i][GCOMP] = ((arg0[i][GCOMP] * arg2[i][GCOMP]) +
-                              arg1[i][GCOMP]) * RGBmult;
+                              arg1[i][GCOMP]) * scaleRGB;
             rgba[i][BCOMP] = ((arg0[i][BCOMP] * arg2[i][BCOMP]) +
-                              arg1[i][BCOMP]) * RGBmult;
+                              arg1[i][BCOMP]) * scaleRGB;
 	 }
          break;
       case GL_MODULATE_SIGNED_ADD_ATI:
          for (i = 0; i < n; i++) {
             rgba[i][RCOMP] = ((arg0[i][RCOMP] * arg2[i][RCOMP]) +
-                              arg1[i][RCOMP] - 0.5) * RGBmult;
+                              arg1[i][RCOMP] - 0.5) * scaleRGB;
             rgba[i][GCOMP] = ((arg0[i][GCOMP] * arg2[i][GCOMP]) +
-                              arg1[i][GCOMP] - 0.5) * RGBmult;
+                              arg1[i][GCOMP] - 0.5) * scaleRGB;
             rgba[i][BCOMP] = ((arg0[i][BCOMP] * arg2[i][BCOMP]) +
-                              arg1[i][BCOMP] - 0.5) * RGBmult;
+                              arg1[i][BCOMP] - 0.5) * scaleRGB;
 	 }
          break;
       case GL_MODULATE_SUBTRACT_ATI:
          for (i = 0; i < n; i++) {
             rgba[i][RCOMP] = ((arg0[i][RCOMP] * arg2[i][RCOMP]) -
-                              arg1[i][RCOMP]) * RGBmult;
+                              arg1[i][RCOMP]) * scaleRGB;
             rgba[i][GCOMP] = ((arg0[i][GCOMP] * arg2[i][GCOMP]) -
-                              arg1[i][GCOMP]) * RGBmult;
+                              arg1[i][GCOMP]) * scaleRGB;
             rgba[i][BCOMP] = ((arg0[i][BCOMP] * arg2[i][BCOMP]) -
-                              arg1[i][BCOMP]) * RGBmult;
+                              arg1[i][BCOMP]) * scaleRGB;
 	 }
          break;
       case GL_BUMP_ENVMAP_ATI:
@@ -427,13 +425,13 @@ texture_combine( const GLcontext *ctx, GLuint unit, GLuint n,
       switch (combine->ModeA) {
       case GL_REPLACE:
          for (i = 0; i < n; i++) {
-            GLfloat a = arg0[i][ACOMP] * Amult;
+            GLfloat a = arg0[i][ACOMP] * scaleA;
             rgba[i][ACOMP] = (GLfloat) MIN2(a, 1.0F);
          }
          break;
       case GL_MODULATE:
          for (i = 0; i < n; i++) {
-            rgba[i][ACOMP] = arg0[i][ACOMP] * arg1[i][ACOMP] * Amult;
+            rgba[i][ACOMP] = arg0[i][ACOMP] * arg1[i][ACOMP] * scaleA;
          }
          break;
       case GL_ADD:
@@ -441,13 +439,13 @@ texture_combine( const GLcontext *ctx, GLuint unit, GLuint n,
             /* (a * b) + (c * d) */
             for (i = 0; i < n; i++) {
                rgba[i][ACOMP] = (arg0[i][ACOMP] * arg1[i][ACOMP] +
-                                 arg2[i][ACOMP] * arg3[i][ACOMP]) * Amult;
+                                 arg2[i][ACOMP] * arg3[i][ACOMP]) * scaleA;
             }
          }
          else {
             /* two-term add */
             for (i = 0; i < n; i++) {
-               rgba[i][ACOMP] = (arg0[i][ACOMP] + arg1[i][ACOMP]) * Amult;
+               rgba[i][ACOMP] = (arg0[i][ACOMP] + arg1[i][ACOMP]) * scaleA;
             }
          }
          break;
@@ -457,13 +455,13 @@ texture_combine( const GLcontext *ctx, GLuint unit, GLuint n,
             for (i = 0; i < n; i++) {
                rgba[i][ACOMP] = (arg0[i][ACOMP] * arg1[i][ACOMP] +
                                  arg2[i][ACOMP] * arg3[i][ACOMP] -
-                                 0.5) * Amult;
+                                 0.5) * scaleA;
             }
          }
          else {
             /* a + b - 0.5 */
             for (i = 0; i < n; i++) {
-               rgba[i][ACOMP] = (arg0[i][ACOMP] + arg1[i][ACOMP] - 0.5F) * Amult;
+               rgba[i][ACOMP] = (arg0[i][ACOMP] + arg1[i][ACOMP] - 0.5F) * scaleA;
             }
          }
          break;
@@ -471,30 +469,30 @@ texture_combine( const GLcontext *ctx, GLuint unit, GLuint n,
          for (i=0; i<n; i++) {
             rgba[i][ACOMP] = (arg0[i][ACOMP] * arg2[i][ACOMP] +
                               arg1[i][ACOMP] * (1.0F - arg2[i][ACOMP]))
-               * Amult;
+               * scaleA;
          }
          break;
       case GL_SUBTRACT:
          for (i = 0; i < n; i++) {
-            rgba[i][ACOMP] = (arg0[i][ACOMP] - arg1[i][ACOMP]) * Amult;
+            rgba[i][ACOMP] = (arg0[i][ACOMP] - arg1[i][ACOMP]) * scaleA;
          }
          break;
       case GL_MODULATE_ADD_ATI:
          for (i = 0; i < n; i++) {
             rgba[i][ACOMP] = ((arg0[i][ACOMP] * arg2[i][ACOMP])
-                              + arg1[i][ACOMP]) * Amult;
+                              + arg1[i][ACOMP]) * scaleA;
          }
          break;
       case GL_MODULATE_SIGNED_ADD_ATI:
          for (i = 0; i < n; i++) {
             rgba[i][ACOMP] = ((arg0[i][ACOMP] * arg2[i][ACOMP]) +
-                              arg1[i][ACOMP] - 0.5F) * Amult;
+                              arg1[i][ACOMP] - 0.5F) * scaleA;
          }
          break;
       case GL_MODULATE_SUBTRACT_ATI:
          for (i = 0; i < n; i++) {
             rgba[i][ACOMP] = ((arg0[i][ACOMP] * arg2[i][ACOMP])
-                              - arg1[i][ACOMP]) * Amult;
+                              - arg1[i][ACOMP]) * scaleA;
          }
          break;
       default:
@@ -841,8 +839,6 @@ texture_apply( const GLcontext *ctx,
 	 }
 	 break;
 
-     /* XXX don't clamp results if GLfloat is float??? */
-
       case GL_ADD:  /* GL_EXT_texture_add_env */
          switch (format) {
             case GL_ALPHA:
-- 
cgit v1.2.3


From cb5bd7d4d49d84f694c9851c0a5a08f158bd3e43 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Sun, 8 Mar 2009 20:53:41 -0600
Subject: mesa: switch texel fetch functions from GLchan to GLfloat

---
 src/mesa/main/texformat.c     | 252 ++++++++++++++++++------------------
 src/mesa/main/texformat_tmp.h | 294 ++++++++++++++++++++----------------------
 2 files changed, 266 insertions(+), 280 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c
index 0d60e5ebd3..3286922f6f 100644
--- a/src/mesa/main/texformat.c
+++ b/src/mesa/main/texformat.c
@@ -793,12 +793,12 @@ const struct gl_texture_format _mesa_texformat_rgba8888 = {
    0,					/* StencilBits */
    4,					/* TexelBytes */
    _mesa_texstore_rgba8888,		/* StoreTexImageFunc */
-   fetch_texel_1d_rgba8888,		/* FetchTexel1D */
-   fetch_texel_2d_rgba8888,		/* FetchTexel2D */
-   fetch_texel_3d_rgba8888,		/* FetchTexel3D */
-   NULL,				/* FetchTexel1Df */
-   NULL,				/* FetchTexel2Df */
-   NULL,				/* FetchTexel3Df */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel2D */
+   NULL,				/* FetchTexel3D */
+   fetch_texel_1d_f_rgba8888,		/* FetchTexel1Df */
+   fetch_texel_2d_f_rgba8888,		/* FetchTexel2Df */
+   fetch_texel_3d_f_rgba8888,		/* FetchTexel3Df */
    store_texel_rgba8888			/* StoreTexel */
 };
 
@@ -817,12 +817,12 @@ const struct gl_texture_format _mesa_texformat_rgba8888_rev = {
    0,					/* StencilBits */
    4,					/* TexelBytes */
    _mesa_texstore_rgba8888,		/* StoreTexImageFunc */
-   fetch_texel_1d_rgba8888_rev,		/* FetchTexel1D */
-   fetch_texel_2d_rgba8888_rev,		/* FetchTexel2D */
-   fetch_texel_3d_rgba8888_rev,		/* FetchTexel3D */
-   NULL,				/* FetchTexel1Df */
-   NULL,				/* FetchTexel2Df */
-   NULL,				/* FetchTexel3Df */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel2D */
+   NULL,				/* FetchTexel3D */
+   fetch_texel_1d_f_rgba8888_rev,	/* FetchTexel1Df */
+   fetch_texel_2d_f_rgba8888_rev,	/* FetchTexel2Df */
+   fetch_texel_3d_f_rgba8888_rev,	/* FetchTexel3Df */
    store_texel_rgba8888_rev		/* StoreTexel */
 };
 
@@ -841,12 +841,12 @@ const struct gl_texture_format _mesa_texformat_argb8888 = {
    0,					/* StencilBits */
    4,					/* TexelBytes */
    _mesa_texstore_argb8888,		/* StoreTexImageFunc */
-   fetch_texel_1d_argb8888,		/* FetchTexel1D */
-   fetch_texel_2d_argb8888,		/* FetchTexel2D */
-   fetch_texel_3d_argb8888,		/* FetchTexel3D */
-   NULL,				/* FetchTexel1Df */
-   NULL,				/* FetchTexel2Df */
-   NULL,				/* FetchTexel3Df */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel2D */
+   NULL,				/* FetchTexel3D */
+   fetch_texel_1d_f_argb8888,		/* FetchTexel1Df */
+   fetch_texel_2d_f_argb8888,		/* FetchTexel2Df */
+   fetch_texel_3d_f_argb8888,		/* FetchTexel3Df */
    store_texel_argb8888			/* StoreTexel */
 };
 
@@ -865,12 +865,12 @@ const struct gl_texture_format _mesa_texformat_argb8888_rev = {
    0,					/* StencilBits */
    4,					/* TexelBytes */
    _mesa_texstore_argb8888,		/* StoreTexImageFunc */
-   fetch_texel_1d_argb8888_rev,		/* FetchTexel1D */
-   fetch_texel_2d_argb8888_rev,		/* FetchTexel2D */
-   fetch_texel_3d_argb8888_rev,		/* FetchTexel3D */
-   NULL,				/* FetchTexel1Df */
-   NULL,				/* FetchTexel2Df */
-   NULL,				/* FetchTexel3Df */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel2D */
+   NULL,				/* FetchTexel3D */
+   fetch_texel_1d_f_argb8888_rev,	/* FetchTexel1Df */
+   fetch_texel_2d_f_argb8888_rev,	/* FetchTexel2Df */
+   fetch_texel_3d_f_argb8888_rev,	/* FetchTexel3Df */
    store_texel_argb8888_rev		/* StoreTexel */
 };
 
@@ -889,12 +889,12 @@ const struct gl_texture_format _mesa_texformat_rgb888 = {
    0,					/* StencilBits */
    3,					/* TexelBytes */
    _mesa_texstore_rgb888,		/* StoreTexImageFunc */
-   fetch_texel_1d_rgb888,		/* FetchTexel1D */
-   fetch_texel_2d_rgb888,		/* FetchTexel2D */
-   fetch_texel_3d_rgb888,		/* FetchTexel3D */
-   NULL,				/* FetchTexel1Df */
-   NULL,				/* FetchTexel2Df */
-   NULL,				/* FetchTexel3Df */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel2D */
+   NULL,				/* FetchTexel3D */
+   fetch_texel_1d_f_rgb888,		/* FetchTexel1Df */
+   fetch_texel_2d_f_rgb888,		/* FetchTexel2Df */
+   fetch_texel_3d_f_rgb888,		/* FetchTexel3Df */
    store_texel_rgb888			/* StoreTexel */
 };
 
@@ -913,12 +913,12 @@ const struct gl_texture_format _mesa_texformat_bgr888 = {
    0,					/* StencilBits */
    3,					/* TexelBytes */
    _mesa_texstore_bgr888,		/* StoreTexImageFunc */
-   fetch_texel_1d_bgr888,		/* FetchTexel1D */
-   fetch_texel_2d_bgr888,		/* FetchTexel2D */
-   fetch_texel_3d_bgr888,		/* FetchTexel3D */
-   NULL,				/* FetchTexel1Df */
-   NULL,				/* FetchTexel2Df */
-   NULL,				/* FetchTexel3Df */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel2D */
+   NULL,				/* FetchTexel3D */
+   fetch_texel_1d_f_bgr888,		/* FetchTexel1Df */
+   fetch_texel_2d_f_bgr888,		/* FetchTexel2Df */
+   fetch_texel_3d_f_bgr888,		/* FetchTexel3Df */
    store_texel_bgr888			/* StoreTexel */
 };
 
@@ -937,12 +937,12 @@ const struct gl_texture_format _mesa_texformat_rgb565 = {
    0,					/* StencilBits */
    2,					/* TexelBytes */
    _mesa_texstore_rgb565,		/* StoreTexImageFunc */
-   fetch_texel_1d_rgb565,		/* FetchTexel1D */
-   fetch_texel_2d_rgb565,		/* FetchTexel2D */
-   fetch_texel_3d_rgb565,		/* FetchTexel3D */
-   NULL,				/* FetchTexel1Df */
-   NULL,				/* FetchTexel2Df */
-   NULL,				/* FetchTexel3Df */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel2D */
+   NULL,				/* FetchTexel3D */
+   fetch_texel_1d_f_rgb565,		/* FetchTexel1Df */
+   fetch_texel_2d_f_rgb565,		/* FetchTexel2Df */
+   fetch_texel_3d_f_rgb565,		/* FetchTexel3Df */
    store_texel_rgb565			/* StoreTexel */
 };
 
@@ -961,12 +961,12 @@ const struct gl_texture_format _mesa_texformat_rgb565_rev = {
    0,					/* StencilBits */
    2,					/* TexelBytes */
    _mesa_texstore_rgb565,		/* StoreTexImageFunc */
-   fetch_texel_1d_rgb565_rev,		/* FetchTexel1D */
-   fetch_texel_2d_rgb565_rev,		/* FetchTexel2D */
-   fetch_texel_3d_rgb565_rev,		/* FetchTexel3D */
-   NULL,				/* FetchTexel1Df */
-   NULL,				/* FetchTexel2Df */
-   NULL,				/* FetchTexel3Df */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel2D */
+   NULL,				/* FetchTexel3D */
+   fetch_texel_1d_f_rgb565_rev,		/* FetchTexel1Df */
+   fetch_texel_2d_f_rgb565_rev,		/* FetchTexel2Df */
+   fetch_texel_3d_f_rgb565_rev,		/* FetchTexel3Df */
    store_texel_rgb565_rev		/* StoreTexel */
 };
 
@@ -985,12 +985,12 @@ const struct gl_texture_format _mesa_texformat_rgba4444 = {
    0,					/* StencilBits */
    2,					/* TexelBytes */
    _mesa_texstore_rgba4444,		/* StoreTexImageFunc */
-   fetch_texel_1d_rgba4444,		/* FetchTexel1D */
-   fetch_texel_2d_rgba4444,		/* FetchTexel2D */
-   fetch_texel_3d_rgba4444,		/* FetchTexel3D */
-   NULL,				/* FetchTexel1Df */
-   NULL,				/* FetchTexel2Df */
-   NULL,				/* FetchTexel3Df */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel2D */
+   NULL,				/* FetchTexel3D */
+   fetch_texel_1d_f_rgba4444,		/* FetchTexel1Df */
+   fetch_texel_2d_f_rgba4444,		/* FetchTexel2Df */
+   fetch_texel_3d_f_rgba4444,		/* FetchTexel3Df */
    store_texel_rgba4444			/* StoreTexel */
 };
 
@@ -1009,12 +1009,12 @@ const struct gl_texture_format _mesa_texformat_argb4444 = {
    0,					/* StencilBits */
    2,					/* TexelBytes */
    _mesa_texstore_argb4444,		/* StoreTexImageFunc */
-   fetch_texel_1d_argb4444,		/* FetchTexel1D */
-   fetch_texel_2d_argb4444,		/* FetchTexel2D */
-   fetch_texel_3d_argb4444,		/* FetchTexel3D */
-   NULL,				/* FetchTexel1Df */
-   NULL,				/* FetchTexel2Df */
-   NULL,				/* FetchTexel3Df */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel2D */
+   NULL,				/* FetchTexel3D */
+   fetch_texel_1d_f_argb4444,		/* FetchTexel1Df */
+   fetch_texel_2d_f_argb4444,		/* FetchTexel2Df */
+   fetch_texel_3d_f_argb4444,		/* FetchTexel3Df */
    store_texel_argb4444			/* StoreTexel */
 };
 
@@ -1033,12 +1033,12 @@ const struct gl_texture_format _mesa_texformat_argb4444_rev = {
    0,					/* StencilBits */
    2,					/* TexelBytes */
    _mesa_texstore_argb4444,		/* StoreTexImageFunc */
-   fetch_texel_1d_argb4444_rev,		/* FetchTexel1D */
-   fetch_texel_2d_argb4444_rev,		/* FetchTexel2D */
-   fetch_texel_3d_argb4444_rev,		/* FetchTexel3D */
-   NULL,				/* FetchTexel1Df */
-   NULL,				/* FetchTexel2Df */
-   NULL,				/* FetchTexel3Df */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel2D */
+   NULL,				/* FetchTexel3D */
+   fetch_texel_1d_f_argb4444_rev,	/* FetchTexel1Df */
+   fetch_texel_2d_f_argb4444_rev,	/* FetchTexel2Df */
+   fetch_texel_3d_f_argb4444_rev,	/* FetchTexel3Df */
    store_texel_argb4444_rev		/* StoreTexel */
 };
 
@@ -1057,12 +1057,12 @@ const struct gl_texture_format _mesa_texformat_rgba5551 = {
    0,					/* StencilBits */
    2,					/* TexelBytes */
    _mesa_texstore_rgba5551,		/* StoreTexImageFunc */
-   fetch_texel_1d_rgba5551,		/* FetchTexel1D */
-   fetch_texel_2d_rgba5551,		/* FetchTexel2D */
-   fetch_texel_3d_rgba5551,		/* FetchTexel3D */
-   NULL,				/* FetchTexel1Df */
-   NULL,				/* FetchTexel2Df */
-   NULL,				/* FetchTexel3Df */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel2D */
+   NULL,				/* FetchTexel3D */
+   fetch_texel_1d_f_rgba5551,		/* FetchTexel1Df */
+   fetch_texel_2d_f_rgba5551,		/* FetchTexel2Df */
+   fetch_texel_3d_f_rgba5551,		/* FetchTexel3Df */
    store_texel_rgba5551			/* StoreTexel */
 };
 
@@ -1081,12 +1081,12 @@ const struct gl_texture_format _mesa_texformat_argb1555 = {
    0,					/* StencilBits */
    2,					/* TexelBytes */
    _mesa_texstore_argb1555,		/* StoreTexImageFunc */
-   fetch_texel_1d_argb1555,		/* FetchTexel1D */
-   fetch_texel_2d_argb1555,		/* FetchTexel2D */
-   fetch_texel_3d_argb1555,		/* FetchTexel3D */
-   NULL,				/* FetchTexel1Df */
-   NULL,				/* FetchTexel2Df */
-   NULL,				/* FetchTexel3Df */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel2D */
+   NULL,				/* FetchTexel3D */
+   fetch_texel_1d_f_argb1555,		/* FetchTexel1Df */
+   fetch_texel_2d_f_argb1555,		/* FetchTexel2Df */
+   fetch_texel_3d_f_argb1555,		/* FetchTexel3Df */
    store_texel_argb1555			/* StoreTexel */
 };
 
@@ -1105,12 +1105,12 @@ const struct gl_texture_format _mesa_texformat_argb1555_rev = {
    0,					/* StencilBits */
    2,					/* TexelBytes */
    _mesa_texstore_argb1555,		/* StoreTexImageFunc */
-   fetch_texel_1d_argb1555_rev,		/* FetchTexel1D */
-   fetch_texel_2d_argb1555_rev,		/* FetchTexel2D */
-   fetch_texel_3d_argb1555_rev,		/* FetchTexel3D */
-   NULL,				/* FetchTexel1Df */
-   NULL,				/* FetchTexel2Df */
-   NULL,				/* FetchTexel3Df */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel2D */
+   NULL,				/* FetchTexel3D */
+   fetch_texel_1d_f_argb1555_rev,	/* FetchTexel1Df */
+   fetch_texel_2d_f_argb1555_rev,	/* FetchTexel2Df */
+   fetch_texel_3d_f_argb1555_rev,	/* FetchTexel3Df */
    store_texel_argb1555_rev		/* StoreTexel */
 };
 
@@ -1129,12 +1129,12 @@ const struct gl_texture_format _mesa_texformat_al88 = {
    0,					/* StencilBits */
    2,					/* TexelBytes */
    _mesa_texstore_al88,			/* StoreTexImageFunc */
-   fetch_texel_1d_al88,			/* FetchTexel1D */
-   fetch_texel_2d_al88,			/* FetchTexel2D */
-   fetch_texel_3d_al88,			/* FetchTexel3D */
-   NULL,				/* FetchTexel1Df */
-   NULL,				/* FetchTexel2Df */
-   NULL,				/* FetchTexel3Df */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel2D */
+   NULL,				/* FetchTexel3D */
+   fetch_texel_1d_f_al88,		/* FetchTexel1Df */
+   fetch_texel_2d_f_al88,		/* FetchTexel2Df */
+   fetch_texel_3d_f_al88,		/* FetchTexel3Df */
    store_texel_al88			/* StoreTexel */
 };
 
@@ -1153,12 +1153,12 @@ const struct gl_texture_format _mesa_texformat_al88_rev = {
    0,					/* StencilBits */
    2,					/* TexelBytes */
    _mesa_texstore_al88,			/* StoreTexImageFunc */
-   fetch_texel_1d_al88_rev,		/* FetchTexel1D */
-   fetch_texel_2d_al88_rev,		/* FetchTexel2D */
-   fetch_texel_3d_al88_rev,		/* FetchTexel3D */
-   NULL,				/* FetchTexel1Df */
-   NULL,				/* FetchTexel2Df */
-   NULL,				/* FetchTexel3Df */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel2D */
+   NULL,				/* FetchTexel3D */
+   fetch_texel_1d_f_al88_rev,		/* FetchTexel1Df */
+   fetch_texel_2d_f_al88_rev,		/* FetchTexel2Df */
+   fetch_texel_3d_f_al88_rev,		/* FetchTexel3Df */
    store_texel_al88_rev			/* StoreTexel */
 };
 
@@ -1177,12 +1177,12 @@ const struct gl_texture_format _mesa_texformat_rgb332 = {
    0,					/* StencilBits */
    1,					/* TexelBytes */
    _mesa_texstore_rgb332,		/* StoreTexImageFunc */
-   fetch_texel_1d_rgb332,		/* FetchTexel1D */
-   fetch_texel_2d_rgb332,		/* FetchTexel2D */
-   fetch_texel_3d_rgb332,		/* FetchTexel3D */
-   NULL,				/* FetchTexel1Df */
-   NULL,				/* FetchTexel2Df */
-   NULL,				/* FetchTexel3Df */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel2D */
+   NULL,				/* FetchTexel3D */
+   fetch_texel_1d_f_rgb332,		/* FetchTexel1Df */
+   fetch_texel_2d_f_rgb332,		/* FetchTexel2Df */
+   fetch_texel_3d_f_rgb332,		/* FetchTexel3Df */
    store_texel_rgb332			/* StoreTexel */
 };
 
@@ -1201,12 +1201,12 @@ const struct gl_texture_format _mesa_texformat_a8 = {
    0,					/* StencilBits */
    1,					/* TexelBytes */
    _mesa_texstore_a8,			/* StoreTexImageFunc */
-   fetch_texel_1d_a8,			/* FetchTexel1D */
-   fetch_texel_2d_a8,			/* FetchTexel2D */
-   fetch_texel_3d_a8,			/* FetchTexel3D */
-   NULL,				/* FetchTexel1Df */
-   NULL,				/* FetchTexel2Df */
-   NULL,				/* FetchTexel3Df */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel2D */
+   NULL,				/* FetchTexel3D */
+   fetch_texel_1d_f_a8,			/* FetchTexel1Df */
+   fetch_texel_2d_f_a8,			/* FetchTexel2Df */
+   fetch_texel_3d_f_a8,			/* FetchTexel3Df */
    store_texel_a8			/* StoreTexel */
 };
 
@@ -1225,12 +1225,12 @@ const struct gl_texture_format _mesa_texformat_l8 = {
    0,					/* StencilBits */
    1,					/* TexelBytes */
    _mesa_texstore_a8,/*yes*/		/* StoreTexImageFunc */
-   fetch_texel_1d_l8,			/* FetchTexel1D */
-   fetch_texel_2d_l8,			/* FetchTexel2D */
-   fetch_texel_3d_l8,			/* FetchTexel3D */
-   NULL,				/* FetchTexel1Df */
-   NULL,				/* FetchTexel2Df */
-   NULL,				/* FetchTexel3Df */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel2D */
+   NULL,				/* FetchTexel3D */
+   fetch_texel_1d_f_l8,			/* FetchTexel1Df */
+   fetch_texel_2d_f_l8,			/* FetchTexel2Df */
+   fetch_texel_3d_f_l8,			/* FetchTexel3Df */
    store_texel_l8			/* StoreTexel */
 };
 
@@ -1249,12 +1249,12 @@ const struct gl_texture_format _mesa_texformat_i8 = {
    0,					/* StencilBits */
    1,					/* TexelBytes */
    _mesa_texstore_a8,/*yes*/		/* StoreTexImageFunc */
-   fetch_texel_1d_i8,			/* FetchTexel1D */
-   fetch_texel_2d_i8,			/* FetchTexel2D */
-   fetch_texel_3d_i8,			/* FetchTexel3D */
-   NULL,				/* FetchTexel1Df */
-   NULL,				/* FetchTexel2Df */
-   NULL,				/* FetchTexel3Df */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel2D */
+   NULL,				/* FetchTexel3D */
+   fetch_texel_1d_f_i8,			/* FetchTexel1Df */
+   fetch_texel_2d_f_i8,			/* FetchTexel2Df */
+   fetch_texel_3d_f_i8,			/* FetchTexel3Df */
    store_texel_i8			/* StoreTexel */
 };
 
@@ -1273,12 +1273,12 @@ const struct gl_texture_format _mesa_texformat_ci8 = {
    0,					/* StencilBits */
    1,					/* TexelBytes */
    _mesa_texstore_ci8,			/* StoreTexImageFunc */
-   fetch_texel_1d_ci8,			/* FetchTexel1D */
-   fetch_texel_2d_ci8,			/* FetchTexel2D */
-   fetch_texel_3d_ci8,			/* FetchTexel3D */
-   NULL,				/* FetchTexel1Df */
-   NULL,				/* FetchTexel2Df */
-   NULL,				/* FetchTexel3Df */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel2D */
+   NULL,				/* FetchTexel3D */
+   fetch_texel_1d_f_ci8,		/* FetchTexel1Df */
+   fetch_texel_2d_f_ci8,		/* FetchTexel2Df */
+   fetch_texel_3d_f_ci8,		/* FetchTexel3Df */
    store_texel_ci8			/* StoreTexel */
 };
 
diff --git a/src/mesa/main/texformat_tmp.h b/src/mesa/main/texformat_tmp.h
index ae57baf922..b9e34f71e8 100644
--- a/src/mesa/main/texformat_tmp.h
+++ b/src/mesa/main/texformat_tmp.h
@@ -606,17 +606,19 @@ static void store_texel_intensity_f16(struct gl_texture_image *texImage,
 
 /* MESA_FORMAT_RGBA8888 ******************************************************/
 
-/* Fetch texel from 1D, 2D or 3D rgba8888 texture, return 4 GLchans */
-static void FETCH(rgba8888)( const struct gl_texture_image *texImage,
-			     GLint i, GLint j, GLint k, GLchan *texel )
+/* Fetch texel from 1D, 2D or 3D rgba8888 texture, return 4 GLfloats */
+static void FETCH(f_rgba8888)( const struct gl_texture_image *texImage,
+                               GLint i, GLint j, GLint k, GLfloat *texel )
 {
    const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   texel[RCOMP] = UBYTE_TO_CHAN( (s >> 24)        );
-   texel[GCOMP] = UBYTE_TO_CHAN( (s >> 16) & 0xff );
-   texel[BCOMP] = UBYTE_TO_CHAN( (s >>  8) & 0xff );
-   texel[ACOMP] = UBYTE_TO_CHAN( (s      ) & 0xff );
+   texel[RCOMP] = UBYTE_TO_FLOAT( (s >> 24)        );
+   texel[GCOMP] = UBYTE_TO_FLOAT( (s >> 16) & 0xff );
+   texel[BCOMP] = UBYTE_TO_FLOAT( (s >>  8) & 0xff );
+   texel[ACOMP] = UBYTE_TO_FLOAT( (s      ) & 0xff );
 }
 
+
+
 #if DIM == 3
 static void store_texel_rgba8888(struct gl_texture_image *texImage,
                                  GLint i, GLint j, GLint k, const void *texel)
@@ -631,14 +633,14 @@ static void store_texel_rgba8888(struct gl_texture_image *texImage,
 /* MESA_FORMAT_RGBA888_REV ***************************************************/
 
 /* Fetch texel from 1D, 2D or 3D abgr8888 texture, return 4 GLchans */
-static void FETCH(rgba8888_rev)( const struct gl_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, GLchan *texel )
+static void FETCH(f_rgba8888_rev)( const struct gl_texture_image *texImage,
+                                   GLint i, GLint j, GLint k, GLfloat *texel )
 {
    const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   texel[RCOMP] = UBYTE_TO_CHAN( (s      ) & 0xff );
-   texel[GCOMP] = UBYTE_TO_CHAN( (s >>  8) & 0xff );
-   texel[BCOMP] = UBYTE_TO_CHAN( (s >> 16) & 0xff );
-   texel[ACOMP] = UBYTE_TO_CHAN( (s >> 24)        );
+   texel[RCOMP] = UBYTE_TO_FLOAT( (s      ) & 0xff );
+   texel[GCOMP] = UBYTE_TO_FLOAT( (s >>  8) & 0xff );
+   texel[BCOMP] = UBYTE_TO_FLOAT( (s >> 16) & 0xff );
+   texel[ACOMP] = UBYTE_TO_FLOAT( (s >> 24)        );
 }
 
 #if DIM == 3
@@ -655,14 +657,14 @@ static void store_texel_rgba8888_rev(struct gl_texture_image *texImage,
 /* MESA_FORMAT_ARGB8888 ******************************************************/
 
 /* Fetch texel from 1D, 2D or 3D argb8888 texture, return 4 GLchans */
-static void FETCH(argb8888)( const struct gl_texture_image *texImage,
-			     GLint i, GLint j, GLint k, GLchan *texel )
+static void FETCH(f_argb8888)( const struct gl_texture_image *texImage,
+                               GLint i, GLint j, GLint k, GLfloat *texel )
 {
    const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   texel[RCOMP] = UBYTE_TO_CHAN( (s >> 16) & 0xff );
-   texel[GCOMP] = UBYTE_TO_CHAN( (s >>  8) & 0xff );
-   texel[BCOMP] = UBYTE_TO_CHAN( (s      ) & 0xff );
-   texel[ACOMP] = UBYTE_TO_CHAN( (s >> 24)        );
+   texel[RCOMP] = UBYTE_TO_FLOAT( (s >> 16) & 0xff );
+   texel[GCOMP] = UBYTE_TO_FLOAT( (s >>  8) & 0xff );
+   texel[BCOMP] = UBYTE_TO_FLOAT( (s      ) & 0xff );
+   texel[ACOMP] = UBYTE_TO_FLOAT( (s >> 24)        );
 }
 
 #if DIM == 3
@@ -678,15 +680,15 @@ static void store_texel_argb8888(struct gl_texture_image *texImage,
 
 /* MESA_FORMAT_ARGB8888_REV **************************************************/
 
-/* Fetch texel from 1D, 2D or 3D argb8888_rev texture, return 4 GLchans */
-static void FETCH(argb8888_rev)( const struct gl_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, GLchan *texel )
+/* Fetch texel from 1D, 2D or 3D argb8888_rev texture, return 4 GLfloats */
+static void FETCH(f_argb8888_rev)( const struct gl_texture_image *texImage,
+                                   GLint i, GLint j, GLint k, GLfloat *texel )
 {
    const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   texel[RCOMP] = UBYTE_TO_CHAN( (s >>  8) & 0xff );
-   texel[GCOMP] = UBYTE_TO_CHAN( (s >> 16) & 0xff );
-   texel[BCOMP] = UBYTE_TO_CHAN( (s >> 24)        );
-   texel[ACOMP] = UBYTE_TO_CHAN( (s      ) & 0xff );
+   texel[RCOMP] = UBYTE_TO_FLOAT( (s >>  8) & 0xff );
+   texel[GCOMP] = UBYTE_TO_FLOAT( (s >> 16) & 0xff );
+   texel[BCOMP] = UBYTE_TO_FLOAT( (s >> 24)        );
+   texel[ACOMP] = UBYTE_TO_FLOAT( (s      ) & 0xff );
 }
 
 #if DIM == 3
@@ -703,14 +705,14 @@ static void store_texel_argb8888_rev(struct gl_texture_image *texImage,
 /* MESA_FORMAT_RGB888 ********************************************************/
 
 /* Fetch texel from 1D, 2D or 3D rgb888 texture, return 4 GLchans */
-static void FETCH(rgb888)( const struct gl_texture_image *texImage,
-			   GLint i, GLint j, GLint k, GLchan *texel )
+static void FETCH(f_rgb888)( const struct gl_texture_image *texImage,
+                             GLint i, GLint j, GLint k, GLfloat *texel )
 {
    const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 3);
-   texel[RCOMP] = UBYTE_TO_CHAN( src[2] );
-   texel[GCOMP] = UBYTE_TO_CHAN( src[1] );
-   texel[BCOMP] = UBYTE_TO_CHAN( src[0] );
-   texel[ACOMP] = CHAN_MAX;
+   texel[RCOMP] = UBYTE_TO_FLOAT( src[2] );
+   texel[GCOMP] = UBYTE_TO_FLOAT( src[1] );
+   texel[BCOMP] = UBYTE_TO_FLOAT( src[0] );
+   texel[ACOMP] = 1.0F;
 }
 
 #if DIM == 3
@@ -729,14 +731,14 @@ static void store_texel_rgb888(struct gl_texture_image *texImage,
 /* MESA_FORMAT_BGR888 ********************************************************/
 
 /* Fetch texel from 1D, 2D or 3D bgr888 texture, return 4 GLchans */
-static void FETCH(bgr888)( const struct gl_texture_image *texImage,
-			   GLint i, GLint j, GLint k, GLchan *texel )
+static void FETCH(f_bgr888)( const struct gl_texture_image *texImage,
+                             GLint i, GLint j, GLint k, GLfloat *texel )
 {
    const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 3);
-   texel[RCOMP] = UBYTE_TO_CHAN( src[0] );
-   texel[GCOMP] = UBYTE_TO_CHAN( src[1] );
-   texel[BCOMP] = UBYTE_TO_CHAN( src[2] );
-   texel[ACOMP] = CHAN_MAX;
+   texel[RCOMP] = UBYTE_TO_FLOAT( src[0] );
+   texel[GCOMP] = UBYTE_TO_FLOAT( src[1] );
+   texel[BCOMP] = UBYTE_TO_FLOAT( src[2] );
+   texel[ACOMP] = 1.0F;
 }
 
 #if DIM == 3
@@ -758,15 +760,15 @@ static void store_texel_bgr888(struct gl_texture_image *texImage,
 /* MESA_FORMAT_RGB565 ********************************************************/
 
 /* Fetch texel from 1D, 2D or 3D rgb565 texture, return 4 GLchans */
-static void FETCH(rgb565)( const struct gl_texture_image *texImage,
-			   GLint i, GLint j, GLint k, GLchan *texel )
+static void FETCH(f_rgb565)( const struct gl_texture_image *texImage,
+                             GLint i, GLint j, GLint k, GLfloat *texel )
 {
    const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
    const GLushort s = *src;
-   texel[RCOMP] = UBYTE_TO_CHAN( ((s >> 8) & 0xf8) | ((s >> 13) & 0x7) );
-   texel[GCOMP] = UBYTE_TO_CHAN( ((s >> 3) & 0xfc) | ((s >>  9) & 0x3) );
-   texel[BCOMP] = UBYTE_TO_CHAN( ((s << 3) & 0xf8) | ((s >>  2) & 0x7) );
-   texel[ACOMP] = CHAN_MAX;
+   texel[RCOMP] = ((s >> 11) & 0x1f) * (1.0F / 31.0F);
+   texel[GCOMP] = ((s >> 5 ) & 0x3f) * (1.0F / 63.0F);
+   texel[BCOMP] = ((s      ) & 0x1f) * (1.0F / 31.0F);
+   texel[ACOMP] = 1.0F;
 }
 
 #if DIM == 3
@@ -783,15 +785,15 @@ static void store_texel_rgb565(struct gl_texture_image *texImage,
 /* MESA_FORMAT_RGB565_REV ****************************************************/
 
 /* Fetch texel from 1D, 2D or 3D rgb565_rev texture, return 4 GLchans */
-static void FETCH(rgb565_rev)( const struct gl_texture_image *texImage,
-                               GLint i, GLint j, GLint k, GLchan *texel )
+static void FETCH(f_rgb565_rev)( const struct gl_texture_image *texImage,
+                                 GLint i, GLint j, GLint k, GLfloat *texel )
 {
    const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
    const GLushort s = (*src >> 8) | (*src << 8); /* byte swap */
-   texel[RCOMP] = UBYTE_TO_CHAN( ((s >> 8) & 0xf8) | ((s >> 13) & 0x7) );
-   texel[GCOMP] = UBYTE_TO_CHAN( ((s >> 3) & 0xfc) | ((s >>  9) & 0x3) );
-   texel[BCOMP] = UBYTE_TO_CHAN( ((s << 3) & 0xf8) | ((s >>  2) & 0x7) );
-   texel[ACOMP] = CHAN_MAX;
+   texel[RCOMP] = UBYTE_TO_FLOAT( ((s >> 8) & 0xf8) | ((s >> 13) & 0x7) );
+   texel[GCOMP] = UBYTE_TO_FLOAT( ((s >> 3) & 0xfc) | ((s >>  9) & 0x3) );
+   texel[BCOMP] = UBYTE_TO_FLOAT( ((s << 3) & 0xf8) | ((s >>  2) & 0x7) );
+   texel[ACOMP] = 1.0F;
 }
 
 #if DIM == 3
@@ -807,15 +809,15 @@ static void store_texel_rgb565_rev(struct gl_texture_image *texImage,
 /* MESA_FORMAT_RGBA4444 ******************************************************/
 
 /* Fetch texel from 1D, 2D or 3D argb444 texture, return 4 GLchans */
-static void FETCH(rgba4444)( const struct gl_texture_image *texImage,
-			     GLint i, GLint j, GLint k, GLchan *texel )
+static void FETCH(f_rgba4444)( const struct gl_texture_image *texImage,
+                               GLint i, GLint j, GLint k, GLfloat *texel )
 {
    const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
    const GLushort s = *src;
-   texel[RCOMP] = UBYTE_TO_CHAN( ((s >> 12) & 0xf) | ((s >> 8) & 0xf0) );
-   texel[GCOMP] = UBYTE_TO_CHAN( ((s >>  8) & 0xf) | ((s >> 4) & 0xf0) );
-   texel[BCOMP] = UBYTE_TO_CHAN( ((s >>  4) & 0xf) | ((s     ) & 0xf0) );
-   texel[ACOMP] = UBYTE_TO_CHAN( ((s      ) & 0xf) | ((s << 4) & 0xf0) );
+   texel[RCOMP] = ((s >> 12) & 0xf) * (1.0F / 15.0F);
+   texel[GCOMP] = ((s >>  8) & 0xf) * (1.0F / 15.0F);
+   texel[BCOMP] = ((s >>  4) & 0xf) * (1.0F / 15.0F);
+   texel[ACOMP] = ((s      ) & 0xf) * (1.0F / 15.0F);
 }
 
 #if DIM == 3
@@ -832,15 +834,15 @@ static void store_texel_rgba4444(struct gl_texture_image *texImage,
 /* MESA_FORMAT_ARGB4444 ******************************************************/
 
 /* Fetch texel from 1D, 2D or 3D argb444 texture, return 4 GLchans */
-static void FETCH(argb4444)( const struct gl_texture_image *texImage,
-			     GLint i, GLint j, GLint k, GLchan *texel )
+static void FETCH(f_argb4444)( const struct gl_texture_image *texImage,
+                               GLint i, GLint j, GLint k, GLfloat *texel )
 {
    const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
    const GLushort s = *src;
-   texel[RCOMP] = UBYTE_TO_CHAN( ((s >>  8) & 0xf) | ((s >> 4) & 0xf0) );
-   texel[GCOMP] = UBYTE_TO_CHAN( ((s >>  4) & 0xf) | ((s     ) & 0xf0) );
-   texel[BCOMP] = UBYTE_TO_CHAN( ((s      ) & 0xf) | ((s << 4) & 0xf0) );
-   texel[ACOMP] = UBYTE_TO_CHAN( ((s >> 12) & 0xf) | ((s >> 8) & 0xf0) );
+   texel[RCOMP] = ((s >>  8) & 0xf) * (1.0F / 15.0F);
+   texel[GCOMP] = ((s >>  4) & 0xf) * (1.0F / 15.0F);
+   texel[BCOMP] = ((s      ) & 0xf) * (1.0F / 15.0F);
+   texel[ACOMP] = ((s >> 12) & 0xf) * (1.0F / 15.0F);
 }
 
 #if DIM == 3
@@ -857,14 +859,14 @@ static void store_texel_argb4444(struct gl_texture_image *texImage,
 /* MESA_FORMAT_ARGB4444_REV **************************************************/
 
 /* Fetch texel from 1D, 2D or 3D argb4444_rev texture, return 4 GLchans */
-static void FETCH(argb4444_rev)( const struct gl_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, GLchan *texel )
+static void FETCH(f_argb4444_rev)( const struct gl_texture_image *texImage,
+                                   GLint i, GLint j, GLint k, GLfloat *texel )
 {
    const GLushort s = *TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   texel[RCOMP] = UBYTE_TO_CHAN( ((s      ) & 0xf) | ((s << 4) & 0xf0) );
-   texel[GCOMP] = UBYTE_TO_CHAN( ((s >> 12) & 0xf) | ((s >> 8) & 0xf0) );
-   texel[BCOMP] = UBYTE_TO_CHAN( ((s >>  8) & 0xf) | ((s >> 4) & 0xf0) );
-   texel[ACOMP] = UBYTE_TO_CHAN( ((s >>  4) & 0xf) | ((s     ) & 0xf0) );
+   texel[RCOMP] = ((s      ) & 0xf) * (1.0F / 15.0F);
+   texel[GCOMP] = ((s >> 12) & 0xf) * (1.0F / 15.0F);
+   texel[BCOMP] = ((s >>  8) & 0xf) * (1.0F / 15.0F);
+   texel[ACOMP] = ((s >>  4) & 0xf) * (1.0F / 15.0F);
 }
 
 #if DIM == 3
@@ -880,15 +882,15 @@ static void store_texel_argb4444_rev(struct gl_texture_image *texImage,
 /* MESA_FORMAT_RGBA5551 ******************************************************/
 
 /* Fetch texel from 1D, 2D or 3D argb1555 texture, return 4 GLchans */
-static void FETCH(rgba5551)( const struct gl_texture_image *texImage,
-			     GLint i, GLint j, GLint k, GLchan *texel )
+static void FETCH(f_rgba5551)( const struct gl_texture_image *texImage,
+                               GLint i, GLint j, GLint k, GLfloat *texel )
 {
    const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
    const GLushort s = *src;
-   texel[RCOMP] = UBYTE_TO_CHAN( ((s >>  8) & 0xf8) | ((s >> 13) & 0x7) );
-   texel[GCOMP] = UBYTE_TO_CHAN( ((s >>  3) & 0xf8) | ((s >>  8) & 0x7) );
-   texel[BCOMP] = UBYTE_TO_CHAN( ((s <<  2) & 0xf8) | ((s >>  3) & 0x7) );
-   texel[ACOMP] = UBYTE_TO_CHAN( ((s) & 0x01) ? 255 : 0);
+   texel[RCOMP] = ((s >> 11) & 0x1f) * (1.0F / 31.0F);
+   texel[GCOMP] = ((s >>  6) & 0x1f) * (1.0F / 31.0F);
+   texel[BCOMP] = ((s >>  1) & 0x1f) * (1.0F / 31.0F);
+   texel[ACOMP] = ((s      ) & 0x01) * 1.0F;
 }
 
 #if DIM == 3
@@ -904,15 +906,15 @@ static void store_texel_rgba5551(struct gl_texture_image *texImage,
 /* MESA_FORMAT_ARGB1555 ******************************************************/
 
 /* Fetch texel from 1D, 2D or 3D argb1555 texture, return 4 GLchans */
-static void FETCH(argb1555)( const struct gl_texture_image *texImage,
-			     GLint i, GLint j, GLint k, GLchan *texel )
+static void FETCH(f_argb1555)( const struct gl_texture_image *texImage,
+			     GLint i, GLint j, GLint k, GLfloat *texel )
 {
    const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
    const GLushort s = *src;
-   texel[RCOMP] = UBYTE_TO_CHAN( ((s >>  7) & 0xf8) | ((s >> 12) & 0x7) );
-   texel[GCOMP] = UBYTE_TO_CHAN( ((s >>  2) & 0xf8) | ((s >>  7) & 0x7) );
-   texel[BCOMP] = UBYTE_TO_CHAN( ((s <<  3) & 0xf8) | ((s >>  2) & 0x7) );
-   texel[ACOMP] = UBYTE_TO_CHAN( ((s >> 15) & 0x01) * 255 );
+   texel[RCOMP] = ((s >> 10) & 0x1f) * (1.0F / 31.0F);
+   texel[GCOMP] = ((s >>  5) & 0x1f) * (1.0F / 31.0F);
+   texel[BCOMP] = ((s >>  0) & 0x1f) * (1.0F / 31.0F);
+   texel[ACOMP] = ((s >> 15) & 0x01) * 1.0F;
 }
 
 #if DIM == 3
@@ -929,15 +931,15 @@ static void store_texel_argb1555(struct gl_texture_image *texImage,
 /* MESA_FORMAT_ARGB1555_REV **************************************************/
 
 /* Fetch texel from 1D, 2D or 3D argb1555_rev texture, return 4 GLchans */
-static void FETCH(argb1555_rev)( const struct gl_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, GLchan *texel )
+static void FETCH(f_argb1555_rev)( const struct gl_texture_image *texImage,
+                                   GLint i, GLint j, GLint k, GLfloat *texel )
 {
    const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
    const GLushort s = (*src << 8) | (*src >> 8); /* byteswap */
-   texel[RCOMP] = UBYTE_TO_CHAN( ((s >>  7) & 0xf8) | ((s >> 12) & 0x7) );
-   texel[GCOMP] = UBYTE_TO_CHAN( ((s >>  2) & 0xf8) | ((s >>  7) & 0x7) );
-   texel[BCOMP] = UBYTE_TO_CHAN( ((s <<  3) & 0xf8) | ((s >>  2) & 0x7) );
-   texel[ACOMP] = UBYTE_TO_CHAN( ((s >> 15) & 0x01) * 255 );
+   texel[RCOMP] = UBYTE_TO_FLOAT( ((s >>  7) & 0xf8) | ((s >> 12) & 0x7) );
+   texel[GCOMP] = UBYTE_TO_FLOAT( ((s >>  2) & 0xf8) | ((s >>  7) & 0x7) );
+   texel[BCOMP] = UBYTE_TO_FLOAT( ((s <<  3) & 0xf8) | ((s >>  2) & 0x7) );
+   texel[ACOMP] = UBYTE_TO_FLOAT( ((s >> 15) & 0x01) * 255 );
 }
 
 #if DIM == 3
@@ -954,14 +956,14 @@ static void store_texel_argb1555_rev(struct gl_texture_image *texImage,
 /* MESA_FORMAT_AL88 **********************************************************/
 
 /* Fetch texel from 1D, 2D or 3D al88 texture, return 4 GLchans */
-static void FETCH(al88)( const struct gl_texture_image *texImage,
-			 GLint i, GLint j, GLint k, GLchan *texel )
+static void FETCH(f_al88)( const struct gl_texture_image *texImage,
+                           GLint i, GLint j, GLint k, GLfloat *texel )
 {
    const GLushort s = *TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
    texel[RCOMP] = 
    texel[GCOMP] = 
-   texel[BCOMP] = UBYTE_TO_CHAN( s & 0xff );
-   texel[ACOMP] = UBYTE_TO_CHAN( s >> 8 );
+   texel[BCOMP] = UBYTE_TO_FLOAT( s & 0xff );
+   texel[ACOMP] = UBYTE_TO_FLOAT( s >> 8 );
 }
 
 #if DIM == 3
@@ -978,14 +980,14 @@ static void store_texel_al88(struct gl_texture_image *texImage,
 /* MESA_FORMAT_AL88_REV ******************************************************/
 
 /* Fetch texel from 1D, 2D or 3D al88_rev texture, return 4 GLchans */
-static void FETCH(al88_rev)( const struct gl_texture_image *texImage,
-                             GLint i, GLint j, GLint k, GLchan *texel )
+static void FETCH(f_al88_rev)( const struct gl_texture_image *texImage,
+                               GLint i, GLint j, GLint k, GLfloat *texel )
 {
    const GLushort s = *TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
    texel[RCOMP] = 
    texel[GCOMP] = 
-   texel[BCOMP] = UBYTE_TO_CHAN( s >> 8 );
-   texel[ACOMP] = UBYTE_TO_CHAN( s & 0xff );
+   texel[BCOMP] = UBYTE_TO_FLOAT( s >> 8 );
+   texel[ACOMP] = UBYTE_TO_FLOAT( s & 0xff );
 }
 
 #if DIM == 3
@@ -1002,17 +1004,15 @@ static void store_texel_al88_rev(struct gl_texture_image *texImage,
 /* MESA_FORMAT_RGB332 ********************************************************/
 
 /* Fetch texel from 1D, 2D or 3D rgb332 texture, return 4 GLchans */
-static void FETCH(rgb332)( const struct gl_texture_image *texImage,
-			   GLint i, GLint j, GLint k, GLchan *texel )
+static void FETCH(f_rgb332)( const struct gl_texture_image *texImage,
+                             GLint i, GLint j, GLint k, GLfloat *texel )
 {
-   static const GLubyte lut2to8[4] = {0, 85, 170, 255};
-   static const GLubyte lut3to8[8] = {0, 36, 73, 109, 146, 182, 219, 255};
    const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);
    const GLubyte s = *src;
-   texel[RCOMP] = UBYTE_TO_CHAN( lut3to8[(s >> 5) & 0x7] );
-   texel[GCOMP] = UBYTE_TO_CHAN( lut3to8[(s >> 2) & 0x7] );
-   texel[BCOMP] = UBYTE_TO_CHAN( lut2to8[(s     ) & 0x3] );
-   texel[ACOMP] = CHAN_MAX;
+   texel[RCOMP] = ((s >> 5) & 0x7) * (1.0F / 7.0F);
+   texel[GCOMP] = ((s >> 2) & 0x7) * (1.0F / 7.0F);
+   texel[BCOMP] = ((s     ) & 0x3) * (1.0F / 3.0F);
+   texel[ACOMP] = 1.0F;
 }
 
 #if DIM == 3
@@ -1029,14 +1029,14 @@ static void store_texel_rgb332(struct gl_texture_image *texImage,
 /* MESA_FORMAT_A8 ************************************************************/
 
 /* Fetch texel from 1D, 2D or 3D a8 texture, return 4 GLchans */
-static void FETCH(a8)( const struct gl_texture_image *texImage,
-		       GLint i, GLint j, GLint k, GLchan *texel )
+static void FETCH(f_a8)( const struct gl_texture_image *texImage,
+                         GLint i, GLint j, GLint k, GLfloat *texel )
 {
    const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);
    texel[RCOMP] =
    texel[GCOMP] =
-   texel[BCOMP] = 0;
-   texel[ACOMP] = UBYTE_TO_CHAN( src[0] );
+   texel[BCOMP] = 0.0F;
+   texel[ACOMP] = UBYTE_TO_FLOAT( src[0] );
 }
 
 #if DIM == 3
@@ -1053,14 +1053,14 @@ static void store_texel_a8(struct gl_texture_image *texImage,
 /* MESA_FORMAT_L8 ************************************************************/
 
 /* Fetch texel from 1D, 2D or 3D l8 texture, return 4 GLchans */
-static void FETCH(l8)( const struct gl_texture_image *texImage,
-		       GLint i, GLint j, GLint k, GLchan *texel )
+static void FETCH(f_l8)( const struct gl_texture_image *texImage,
+                         GLint i, GLint j, GLint k, GLfloat *texel )
 {
    const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);
    texel[RCOMP] =
    texel[GCOMP] =
-   texel[BCOMP] = UBYTE_TO_CHAN( src[0] );
-   texel[ACOMP] = CHAN_MAX;
+   texel[BCOMP] = UBYTE_TO_FLOAT( src[0] );
+   texel[ACOMP] = 1.0F;
 }
 
 #if DIM == 3
@@ -1077,14 +1077,14 @@ static void store_texel_l8(struct gl_texture_image *texImage,
 /* MESA_FORMAT_I8 ************************************************************/
 
 /* Fetch texel from 1D, 2D or 3D i8 texture, return 4 GLchans */
-static void FETCH(i8)( const struct gl_texture_image *texImage,
-		       GLint i, GLint j, GLint k, GLchan *texel )
+static void FETCH(f_i8)( const struct gl_texture_image *texImage,
+                         GLint i, GLint j, GLint k, GLfloat *texel )
 {
    const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);
    texel[RCOMP] =
    texel[GCOMP] =
    texel[BCOMP] =
-   texel[ACOMP] = UBYTE_TO_CHAN( src[0] );
+   texel[ACOMP] = UBYTE_TO_FLOAT( src[0] );
 }
 
 #if DIM == 3
@@ -1103,12 +1103,11 @@ static void store_texel_i8(struct gl_texture_image *texImage,
 /* Fetch CI texel from 1D, 2D or 3D ci8 texture, lookup the index in a
  * color table, and return 4 GLchans.
  */
-static void FETCH(ci8)( const struct gl_texture_image *texImage,
-			GLint i, GLint j, GLint k, GLchan *texel )
+static void FETCH(f_ci8)( const struct gl_texture_image *texImage,
+                          GLint i, GLint j, GLint k, GLfloat *texel )
 {
    const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);
    const struct gl_color_table *palette;
-   GLubyte texelUB[4];
    GLuint index;
    GET_CURRENT_CONTEXT(ctx);
 
@@ -1125,61 +1124,48 @@ static void FETCH(ci8)( const struct gl_texture_image *texImage,
    index = (*src) & (palette->Size - 1);
 
    {
-      const GLubyte *table = palette->TableUB;
+      const GLfloat *table = palette->TableF;
       switch (palette->_BaseFormat) {
       case GL_ALPHA:
-         texelUB[RCOMP] =
-         texelUB[GCOMP] =
-         texelUB[BCOMP] = 0;
-         texelUB[ACOMP] = table[index];
+         texel[RCOMP] =
+         texel[GCOMP] =
+         texel[BCOMP] = 0.0F;
+         texel[ACOMP] = table[index];
          break;;
       case GL_LUMINANCE:
-         texelUB[RCOMP] =
-         texelUB[GCOMP] =
-         texelUB[BCOMP] = table[index];
-         texelUB[ACOMP] = 255;
+         texel[RCOMP] =
+         texel[GCOMP] =
+         texel[BCOMP] = table[index];
+         texel[ACOMP] = 1.0F;
          break;
       case GL_INTENSITY:
-         texelUB[RCOMP] =
-         texelUB[GCOMP] =
-         texelUB[BCOMP] =
-         texelUB[ACOMP] = table[index];
+         texel[RCOMP] =
+         texel[GCOMP] =
+         texel[BCOMP] =
+         texel[ACOMP] = table[index];
          break;;
       case GL_LUMINANCE_ALPHA:
-         texelUB[RCOMP] =
-         texelUB[GCOMP] =
-         texelUB[BCOMP] = table[index * 2 + 0];
-         texelUB[ACOMP] = table[index * 2 + 1];
+         texel[RCOMP] =
+         texel[GCOMP] =
+         texel[BCOMP] = table[index * 2 + 0];
+         texel[ACOMP] = table[index * 2 + 1];
          break;;
       case GL_RGB:
-         texelUB[RCOMP] = table[index * 3 + 0];
-         texelUB[GCOMP] = table[index * 3 + 1];
-         texelUB[BCOMP] = table[index * 3 + 2];
-         texelUB[ACOMP] = 255;
+         texel[RCOMP] = table[index * 3 + 0];
+         texel[GCOMP] = table[index * 3 + 1];
+         texel[BCOMP] = table[index * 3 + 2];
+         texel[ACOMP] = 1.0F;
          break;;
       case GL_RGBA:
-         texelUB[RCOMP] = table[index * 4 + 0];
-         texelUB[GCOMP] = table[index * 4 + 1];
-         texelUB[BCOMP] = table[index * 4 + 2];
-         texelUB[ACOMP] = table[index * 4 + 3];
+         texel[RCOMP] = table[index * 4 + 0];
+         texel[GCOMP] = table[index * 4 + 1];
+         texel[BCOMP] = table[index * 4 + 2];
+         texel[ACOMP] = table[index * 4 + 3];
          break;;
       default:
          _mesa_problem(ctx, "Bad palette format in fetch_texel_ci8");
          return;
       }
-#if CHAN_TYPE == GL_UNSIGNED_BYTE
-      COPY_4UBV(texel, texelUB);
-#elif CHAN_TYPE == GL_UNSIGNED_SHORT
-      texel[0] = UBYTE_TO_USHORT(texelUB[0]);
-      texel[1] = UBYTE_TO_USHORT(texelUB[1]);
-      texel[2] = UBYTE_TO_USHORT(texelUB[2]);
-      texel[3] = UBYTE_TO_USHORT(texelUB[3]);
-#else
-      texel[0] = UBYTE_TO_FLOAT(texelUB[0]);
-      texel[1] = UBYTE_TO_FLOAT(texelUB[1]);
-      texel[2] = UBYTE_TO_FLOAT(texelUB[2]);
-      texel[3] = UBYTE_TO_FLOAT(texelUB[3]);
-#endif
    }
 }
 
-- 
cgit v1.2.3


From 611128365dad65216a4d4be973393ba2c526bd18 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 9 Mar 2009 20:34:24 -0600
Subject: mesa: convert more texture fetch functions to return GLfloat

---
 src/mesa/main/texformat.c     |  84 +++++++++++++++---------------
 src/mesa/main/texformat_tmp.h | 117 +++++++++++++++++++-----------------------
 2 files changed, 94 insertions(+), 107 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c
index 3286922f6f..c709004784 100644
--- a/src/mesa/main/texformat.c
+++ b/src/mesa/main/texformat.c
@@ -154,9 +154,9 @@ const struct gl_texture_format _mesa_texformat_rgba = {
    0,					/* StencilBits */
    4 * sizeof(GLchan),			/* TexelBytes */
    _mesa_texstore_rgba,			/* StoreTexImageFunc */
-   fetch_texel_1d_rgba,			/* FetchTexel1D */
-   fetch_texel_2d_rgba,			/* FetchTexel2D */
-   fetch_texel_3d_rgba,			/* FetchTexel3D */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel2D */
+   NULL,				/* FetchTexel3D */
    fetch_texel_1d_f_rgba,		/* FetchTexel1Df */
    fetch_texel_2d_f_rgba,		/* FetchTexel2Df */
    fetch_texel_3d_f_rgba,		/* FetchTexel3Df */
@@ -178,9 +178,9 @@ const struct gl_texture_format _mesa_texformat_rgb = {
    0,					/* StencilBits */
    3 * sizeof(GLchan),			/* TexelBytes */
    _mesa_texstore_rgba,/*yes*/		/* StoreTexImageFunc */
-   fetch_texel_1d_rgb,			/* FetchTexel1D */
-   fetch_texel_2d_rgb,			/* FetchTexel2D */
-   fetch_texel_3d_rgb,			/* FetchTexel3D */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel2D */
+   NULL,				/* FetchTexel3D */
    fetch_texel_1d_f_rgb,		/* FetchTexel1Df */
    fetch_texel_2d_f_rgb,		/* FetchTexel2Df */
    fetch_texel_3d_f_rgb,		/* FetchTexel3Df */
@@ -202,12 +202,12 @@ const struct gl_texture_format _mesa_texformat_alpha = {
    0,					/* StencilBits */
    sizeof(GLchan),			/* TexelBytes */
    _mesa_texstore_rgba,/*yes*/		/* StoreTexImageFunc */
-   fetch_texel_1d_alpha,		/* FetchTexel1D */
-   fetch_texel_2d_alpha,		/* FetchTexel2D */
-   fetch_texel_3d_alpha,		/* FetchTexel3D */
-   NULL,				/* FetchTexel1Df */
-   NULL,				/* FetchTexel2Df */
-   NULL,				/* FetchTexel3Df */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel2D */
+   NULL,				/* FetchTexel3D */
+   fetch_texel_1d_f_alpha,		/* FetchTexel1Df */
+   fetch_texel_2d_f_alpha,		/* FetchTexel2Df */
+   fetch_texel_3d_f_alpha,		/* FetchTexel3Df */
    store_texel_alpha			/* StoreTexel */
 };
 
@@ -226,12 +226,12 @@ const struct gl_texture_format _mesa_texformat_luminance = {
    0,					/* StencilBits */
    sizeof(GLchan),			/* TexelBytes */
    _mesa_texstore_rgba,/*yes*/		/* StoreTexImageFunc */
-   fetch_texel_1d_luminance,		/* FetchTexel1D */
-   fetch_texel_2d_luminance,		/* FetchTexel2D */
-   fetch_texel_3d_luminance,		/* FetchTexel3D */
-   NULL,				/* FetchTexel1Df */
-   NULL,				/* FetchTexel2Df */
-   NULL,				/* FetchTexel3Df */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel2D */
+   NULL,				/* FetchTexel3D */
+   fetch_texel_1d_f_luminance,		/* FetchTexel1Df */
+   fetch_texel_2d_f_luminance,		/* FetchTexel2Df */
+   fetch_texel_3d_f_luminance,		/* FetchTexel3Df */
    store_texel_luminance		/* StoreTexel */
 };
 
@@ -250,12 +250,12 @@ const struct gl_texture_format _mesa_texformat_luminance_alpha = {
    0,					/* StencilBits */
    2 * sizeof(GLchan),			/* TexelBytes */
    _mesa_texstore_rgba,/*yes*/		/* StoreTexImageFunc */
-   fetch_texel_1d_luminance_alpha,	/* FetchTexel1D */
-   fetch_texel_2d_luminance_alpha,	/* FetchTexel2D */
-   fetch_texel_3d_luminance_alpha,	/* FetchTexel3D */
-   NULL,				/* FetchTexel1Df */
-   NULL,				/* FetchTexel2Df */
-   NULL,				/* FetchTexel3Df */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel2D */
+   NULL,				/* FetchTexel3D */
+   fetch_texel_1d_f_luminance_alpha,	/* FetchTexel1Df */
+   fetch_texel_2d_f_luminance_alpha,	/* FetchTexel2Df */
+   fetch_texel_3d_f_luminance_alpha,	/* FetchTexel3Df */
    store_texel_luminance_alpha		/* StoreTexel */
 };
 
@@ -274,12 +274,12 @@ const struct gl_texture_format _mesa_texformat_intensity = {
    0,					/* StencilBits */
    sizeof(GLchan),			/* TexelBytes */
    _mesa_texstore_rgba,/*yes*/		/* StoreTexImageFunc */
-   fetch_texel_1d_intensity,		/* FetchTexel1D */
-   fetch_texel_2d_intensity,		/* FetchTexel2D */
-   fetch_texel_3d_intensity,		/* FetchTexel3D */
-   NULL,				/* FetchTexel1Df */
-   NULL,				/* FetchTexel2Df */
-   NULL,				/* FetchTexel3Df */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel2D */
+   NULL,				/* FetchTexel3D */
+   fetch_texel_1d_f_intensity,		/* FetchTexel1Df */
+   fetch_texel_2d_f_intensity,		/* FetchTexel2Df */
+   fetch_texel_3d_f_intensity,		/* FetchTexel3Df */
    store_texel_intensity		/* StoreTexel */
 };
 
@@ -1297,12 +1297,12 @@ const struct gl_texture_format _mesa_texformat_ycbcr = {
    0,					/* StencilBits */
    2,					/* TexelBytes */
    _mesa_texstore_ycbcr,		/* StoreTexImageFunc */
-   fetch_texel_1d_ycbcr,		/* FetchTexel1D */
-   fetch_texel_2d_ycbcr,		/* FetchTexel2D */
-   fetch_texel_3d_ycbcr,		/* FetchTexel3D */
-   NULL,				/* FetchTexel1Df */
-   NULL,				/* FetchTexel2Df */
-   NULL,				/* FetchTexel3Df */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel2D */
+   NULL,				/* FetchTexel3D */
+   fetch_texel_1d_f_ycbcr,		/* FetchTexel1Df */
+   fetch_texel_2d_f_ycbcr,		/* FetchTexel2Df */
+   fetch_texel_3d_f_ycbcr,		/* FetchTexel3Df */
    store_texel_ycbcr			/* StoreTexel */
 };
 
@@ -1321,12 +1321,12 @@ const struct gl_texture_format _mesa_texformat_ycbcr_rev = {
    0,					/* StencilBits */
    2,					/* TexelBytes */
    _mesa_texstore_ycbcr,		/* StoreTexImageFunc */
-   fetch_texel_1d_ycbcr_rev,		/* FetchTexel1D */
-   fetch_texel_2d_ycbcr_rev,		/* FetchTexel2D */
-   fetch_texel_3d_ycbcr_rev,		/* FetchTexel3D */
-   NULL,				/* FetchTexel1Df */
-   NULL,				/* FetchTexel2Df */
-   NULL,				/* FetchTexel3Df */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel2D */
+   NULL,				/* FetchTexel3D */
+   fetch_texel_1d_f_ycbcr_rev,		/* FetchTexel1Df */
+   fetch_texel_2d_f_ycbcr_rev,		/* FetchTexel2Df */
+   fetch_texel_3d_f_ycbcr_rev,		/* FetchTexel3Df */
    store_texel_ycbcr_rev		/* StoreTexel */
 };
 
diff --git a/src/mesa/main/texformat_tmp.h b/src/mesa/main/texformat_tmp.h
index b9e34f71e8..f98e857629 100644
--- a/src/mesa/main/texformat_tmp.h
+++ b/src/mesa/main/texformat_tmp.h
@@ -72,14 +72,6 @@
 
 /* MESA_FORMAT_RGBA **********************************************************/
 
-/* Fetch texel from 1D, 2D or 3D RGBA texture, returning 4 GLchans */
-static void FETCH(rgba)( const struct gl_texture_image *texImage,
-			 GLint i, GLint j, GLint k, GLchan *texel )
-{
-   const GLchan *src = TEXEL_ADDR(GLchan, texImage, i, j, k, 4);
-   COPY_CHAN4( texel, src );
-}
-
 /* Fetch texel from 1D, 2D or 3D RGBA texture, returning 4 GLfloats */
 static void FETCH(f_rgba)( const struct gl_texture_image *texImage,
                            GLint i, GLint j, GLint k, GLfloat *texel )
@@ -107,17 +99,6 @@ static void store_texel_rgba(struct gl_texture_image *texImage,
 
 /* MESA_FORMAT_RGB ***********************************************************/
 
-/* Fetch texel from 1D, 2D or 3D RGB texture, returning 4 GLchans */
-static void FETCH(rgb)( const struct gl_texture_image *texImage,
-			GLint i, GLint j, GLint k, GLchan *texel )
-{
-   const GLchan *src = TEXEL_ADDR(GLchan, texImage, i, j, k, 3);
-   texel[RCOMP] = src[0];
-   texel[GCOMP] = src[1];
-   texel[BCOMP] = src[2];
-   texel[ACOMP] = CHAN_MAX;
-}
-
 /* Fetch texel from 1D, 2D or 3D RGB texture, returning 4 GLfloats */
 static void FETCH(f_rgb)( const struct gl_texture_image *texImage,
                           GLint i, GLint j, GLint k, GLfloat *texel )
@@ -144,14 +125,14 @@ static void store_texel_rgb(struct gl_texture_image *texImage,
 /* MESA_FORMAT_ALPHA *********************************************************/
 
 /* Fetch texel from 1D, 2D or 3D ALPHA texture, returning 4 GLchans */
-static void FETCH(alpha)( const struct gl_texture_image *texImage,
-			  GLint i, GLint j, GLint k, GLchan *texel )
+static void FETCH(f_alpha)( const struct gl_texture_image *texImage,
+			  GLint i, GLint j, GLint k, GLfloat *texel )
 {
    const GLchan *src = TEXEL_ADDR(GLchan, texImage, i, j, k, 1);
    texel[RCOMP] =
    texel[GCOMP] =
-   texel[BCOMP] = 0;
-   texel[ACOMP] = src[0];
+   texel[BCOMP] = 0.0F;
+   texel[ACOMP] = CHAN_TO_FLOAT(src[0]);
 }
 
 #if DIM == 3
@@ -167,14 +148,14 @@ static void store_texel_alpha(struct gl_texture_image *texImage,
 /* MESA_FORMAT_LUMINANCE *****************************************************/
 
 /* Fetch texel from 1D, 2D or 3D LUMIN texture, returning 4 GLchans */
-static void FETCH(luminance)( const struct gl_texture_image *texImage,
-			      GLint i, GLint j, GLint k, GLchan *texel )
+static void FETCH(f_luminance)( const struct gl_texture_image *texImage,
+                                GLint i, GLint j, GLint k, GLfloat *texel )
 {
    const GLchan *src = TEXEL_ADDR(GLchan, texImage, i, j, k, 1);
    texel[RCOMP] =
    texel[GCOMP] =
-   texel[BCOMP] = src[0];
-   texel[ACOMP] = CHAN_MAX;
+   texel[BCOMP] = CHAN_TO_FLOAT(src[0]);
+   texel[ACOMP] = 1.0F;
 }
 
 #if DIM == 3
@@ -190,14 +171,14 @@ static void store_texel_luminance(struct gl_texture_image *texImage,
 /* MESA_FORMAT_LUMINANCE_ALPHA ***********************************************/
 
 /* Fetch texel from 1D, 2D or 3D L_A texture, returning 4 GLchans */
-static void FETCH(luminance_alpha)( const struct gl_texture_image *texImage,
-				    GLint i, GLint j, GLint k, GLchan *texel )
+static void FETCH(f_luminance_alpha)(const struct gl_texture_image *texImage,
+                                     GLint i, GLint j, GLint k, GLfloat *texel)
 {
    const GLchan *src = TEXEL_ADDR(GLchan, texImage, i, j, k, 2);
-   texel[RCOMP] = src[0];
-   texel[GCOMP] = src[0];
-   texel[BCOMP] = src[0];
-   texel[ACOMP] = src[1];
+   texel[RCOMP] =
+   texel[GCOMP] =
+   texel[BCOMP] = CHAN_TO_FLOAT(src[0]);
+   texel[ACOMP] = CHAN_TO_FLOAT(src[1]);
 }
 
 #if DIM == 3
@@ -214,14 +195,14 @@ static void store_texel_luminance_alpha(struct gl_texture_image *texImage,
 /* MESA_FORMAT_INTENSITY *****************************************************/
 
 /* Fetch texel from 1D, 2D or 3D INT. texture, returning 4 GLchans */
-static void FETCH(intensity)( const struct gl_texture_image *texImage,
-			      GLint i, GLint j, GLint k, GLchan *texel )
+static void FETCH(f_intensity)( const struct gl_texture_image *texImage,
+                                GLint i, GLint j, GLint k, GLfloat *texel )
 {
    const GLchan *src = TEXEL_ADDR(GLchan, texImage, i, j, k, 1);
-   texel[RCOMP] = src[0];
-   texel[GCOMP] = src[0];
-   texel[BCOMP] = src[0];
-   texel[ACOMP] = src[0];
+   texel[RCOMP] =
+   texel[GCOMP] =
+   texel[BCOMP] =
+   texel[ACOMP] = CHAN_TO_FLOAT(src[0]);
 }
 
 #if DIM == 3
@@ -1356,8 +1337,8 @@ static void store_texel_signed_rgba8888_rev(struct gl_texture_image *texImage,
 /* Fetch texel from 1D, 2D or 3D ycbcr texture, return 4 GLchans */
 /* We convert YCbCr to RGB here */
 /* XXX this may break if GLchan != GLubyte */
-static void FETCH(ycbcr)( const struct gl_texture_image *texImage,
-                          GLint i, GLint j, GLint k, GLchan *texel )
+static void FETCH(f_ycbcr)( const struct gl_texture_image *texImage,
+                            GLint i, GLint j, GLint k, GLfloat *texel )
 {
    const GLushort *src0 = TEXEL_ADDR(GLushort, texImage, (i & ~1), j, k, 1); /* even */
    const GLushort *src1 = src0 + 1;                               /* odd */
@@ -1365,23 +1346,26 @@ static void FETCH(ycbcr)( const struct gl_texture_image *texImage,
    const GLubyte cb = *src0 & 0xff;         /* chroma U */
    const GLubyte y1 = (*src1 >> 8) & 0xff;  /* luminance */
    const GLubyte cr = *src1 & 0xff;         /* chroma V */
-   GLint r, g, b;
+   GLfloat r, g, b;
    if (i & 1) {
       /* odd pixel: use y1,cr,cb */
-      r = (GLint) (1.164 * (y1-16) + 1.596 * (cr-128));
-      g = (GLint) (1.164 * (y1-16) - 0.813 * (cr-128) - 0.391 * (cb-128));
-      b = (GLint) (1.164 * (y1-16) + 2.018 * (cb-128));
+      r = 1.164 * (y1-16) + 1.596 * (cr-128);
+      g = 1.164 * (y1-16) - 0.813 * (cr-128) - 0.391 * (cb-128);
+      b = 1.164 * (y1-16) + 2.018 * (cb-128);
    }
    else {
       /* even pixel: use y0,cr,cb */
-      r = (GLint) (1.164 * (y0-16) + 1.596 * (cr-128));
-      g = (GLint) (1.164 * (y0-16) - 0.813 * (cr-128) - 0.391 * (cb-128));
-      b = (GLint) (1.164 * (y0-16) + 2.018 * (cb-128));
+      r = 1.164 * (y0-16) + 1.596 * (cr-128);
+      g = 1.164 * (y0-16) - 0.813 * (cr-128) - 0.391 * (cb-128);
+      b = 1.164 * (y0-16) + 2.018 * (cb-128);
    }
-   texel[RCOMP] = CLAMP(r, 0, CHAN_MAX);
-   texel[GCOMP] = CLAMP(g, 0, CHAN_MAX);
-   texel[BCOMP] = CLAMP(b, 0, CHAN_MAX);
-   texel[ACOMP] = CHAN_MAX;
+   r *= (1.0 / 255.0F);
+   g *= (1.0 / 255.0F);
+   b *= (1.0 / 255.0F);
+   texel[RCOMP] = CLAMP(r, 0.0F, 1.0F);
+   texel[GCOMP] = CLAMP(g, 0.0F, 1.0F);
+   texel[BCOMP] = CLAMP(b, 0.0F, 1.0F);
+   texel[ACOMP] = 1.0F;
 }
 
 #if DIM == 3
@@ -1403,8 +1387,8 @@ static void store_texel_ycbcr(struct gl_texture_image *texImage,
 /* Fetch texel from 1D, 2D or 3D ycbcr_rev texture, return 4 GLchans */
 /* We convert YCbCr to RGB here */
 /* XXX this may break if GLchan != GLubyte */
-static void FETCH(ycbcr_rev)( const struct gl_texture_image *texImage,
-                              GLint i, GLint j, GLint k, GLchan *texel )
+static void FETCH(f_ycbcr_rev)( const struct gl_texture_image *texImage,
+                                GLint i, GLint j, GLint k, GLfloat *texel )
 {
    const GLushort *src0 = TEXEL_ADDR(GLushort, texImage, (i & ~1), j, k, 1); /* even */
    const GLushort *src1 = src0 + 1;                               /* odd */
@@ -1412,23 +1396,26 @@ static void FETCH(ycbcr_rev)( const struct gl_texture_image *texImage,
    const GLubyte cr = (*src0 >> 8) & 0xff;  /* chroma V */
    const GLubyte y1 = *src1 & 0xff;         /* luminance */
    const GLubyte cb = (*src1 >> 8) & 0xff;  /* chroma U */
-   GLint r, g, b;
+   GLfloat r, g, b;
    if (i & 1) {
       /* odd pixel: use y1,cr,cb */
-      r = (GLint) (1.164 * (y1-16) + 1.596 * (cr-128));
-      g = (GLint) (1.164 * (y1-16) - 0.813 * (cr-128) - 0.391 * (cb-128));
-      b = (GLint) (1.164 * (y1-16) + 2.018 * (cb-128));
+      r = 1.164 * (y1-16) + 1.596 * (cr-128);
+      g = 1.164 * (y1-16) - 0.813 * (cr-128) - 0.391 * (cb-128);
+      b = 1.164 * (y1-16) + 2.018 * (cb-128);
    }
    else {
       /* even pixel: use y0,cr,cb */
-      r = (GLint) (1.164 * (y0-16) + 1.596 * (cr-128));
-      g = (GLint) (1.164 * (y0-16) - 0.813 * (cr-128) - 0.391 * (cb-128));
-      b = (GLint) (1.164 * (y0-16) + 2.018 * (cb-128));
+      r = 1.164 * (y0-16) + 1.596 * (cr-128);
+      g = 1.164 * (y0-16) - 0.813 * (cr-128) - 0.391 * (cb-128);
+      b = 1.164 * (y0-16) + 2.018 * (cb-128);
    }
-   texel[RCOMP] = CLAMP(r, 0, CHAN_MAX);
-   texel[GCOMP] = CLAMP(g, 0, CHAN_MAX);
-   texel[BCOMP] = CLAMP(b, 0, CHAN_MAX);
-   texel[ACOMP] = CHAN_MAX;
+   r *= (1.0 / 255.0F);
+   g *= (1.0 / 255.0F);
+   b *= (1.0 / 255.0F);
+   texel[RCOMP] = CLAMP(r, 0.0F, 1.0F);
+   texel[GCOMP] = CLAMP(g, 0.0F, 1.0F);
+   texel[BCOMP] = CLAMP(b, 0.0F, 1.0F);
+   texel[ACOMP] = 1.0F;
 }
 
 #if DIM == 3
-- 
cgit v1.2.3


From efe3d10aea305c89e66decfb5a9012feb7a4695c Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 9 Mar 2009 20:51:21 -0600
Subject: mesa: simplify ycbcr->rgb conversion code

---
 src/mesa/main/texformat_tmp.h | 46 +++++++++++++------------------------------
 1 file changed, 14 insertions(+), 32 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texformat_tmp.h b/src/mesa/main/texformat_tmp.h
index f98e857629..d0d3804608 100644
--- a/src/mesa/main/texformat_tmp.h
+++ b/src/mesa/main/texformat_tmp.h
@@ -1334,9 +1334,9 @@ static void store_texel_signed_rgba8888_rev(struct gl_texture_image *texImage,
 
 /* MESA_FORMAT_YCBCR *********************************************************/
 
-/* Fetch texel from 1D, 2D or 3D ycbcr texture, return 4 GLchans */
-/* We convert YCbCr to RGB here */
-/* XXX this may break if GLchan != GLubyte */
+/* Fetch texel from 1D, 2D or 3D ycbcr texture, return 4 GLfloats.
+ * We convert YCbCr to RGB here.
+ */
 static void FETCH(f_ycbcr)( const struct gl_texture_image *texImage,
                             GLint i, GLint j, GLint k, GLfloat *texel )
 {
@@ -1346,19 +1346,10 @@ static void FETCH(f_ycbcr)( const struct gl_texture_image *texImage,
    const GLubyte cb = *src0 & 0xff;         /* chroma U */
    const GLubyte y1 = (*src1 >> 8) & 0xff;  /* luminance */
    const GLubyte cr = *src1 & 0xff;         /* chroma V */
-   GLfloat r, g, b;
-   if (i & 1) {
-      /* odd pixel: use y1,cr,cb */
-      r = 1.164 * (y1-16) + 1.596 * (cr-128);
-      g = 1.164 * (y1-16) - 0.813 * (cr-128) - 0.391 * (cb-128);
-      b = 1.164 * (y1-16) + 2.018 * (cb-128);
-   }
-   else {
-      /* even pixel: use y0,cr,cb */
-      r = 1.164 * (y0-16) + 1.596 * (cr-128);
-      g = 1.164 * (y0-16) - 0.813 * (cr-128) - 0.391 * (cb-128);
-      b = 1.164 * (y0-16) + 2.018 * (cb-128);
-   }
+   const GLfloat y = (i & 1) ? y1 : y0;     /* choose even/odd luminance */
+   GLfloat r = 1.164 * (y - 16) + 1.596 * (cr - 128);
+   GLfloat g = 1.164 * (y - 16) - 0.813 * (cr - 128) - 0.391 * (cb - 128);
+   GLfloat b = 1.164 * (y - 16) + 2.018 * (cb - 128);
    r *= (1.0 / 255.0F);
    g *= (1.0 / 255.0F);
    b *= (1.0 / 255.0F);
@@ -1384,9 +1375,9 @@ static void store_texel_ycbcr(struct gl_texture_image *texImage,
 
 /* MESA_FORMAT_YCBCR_REV *****************************************************/
 
-/* Fetch texel from 1D, 2D or 3D ycbcr_rev texture, return 4 GLchans */
-/* We convert YCbCr to RGB here */
-/* XXX this may break if GLchan != GLubyte */
+/* Fetch texel from 1D, 2D or 3D ycbcr_rev texture, return 4 GLfloats.
+ * We convert YCbCr to RGB here.
+ */
 static void FETCH(f_ycbcr_rev)( const struct gl_texture_image *texImage,
                                 GLint i, GLint j, GLint k, GLfloat *texel )
 {
@@ -1396,19 +1387,10 @@ static void FETCH(f_ycbcr_rev)( const struct gl_texture_image *texImage,
    const GLubyte cr = (*src0 >> 8) & 0xff;  /* chroma V */
    const GLubyte y1 = *src1 & 0xff;         /* luminance */
    const GLubyte cb = (*src1 >> 8) & 0xff;  /* chroma U */
-   GLfloat r, g, b;
-   if (i & 1) {
-      /* odd pixel: use y1,cr,cb */
-      r = 1.164 * (y1-16) + 1.596 * (cr-128);
-      g = 1.164 * (y1-16) - 0.813 * (cr-128) - 0.391 * (cb-128);
-      b = 1.164 * (y1-16) + 2.018 * (cb-128);
-   }
-   else {
-      /* even pixel: use y0,cr,cb */
-      r = 1.164 * (y0-16) + 1.596 * (cr-128);
-      g = 1.164 * (y0-16) - 0.813 * (cr-128) - 0.391 * (cb-128);
-      b = 1.164 * (y0-16) + 2.018 * (cb-128);
-   }
+   const GLfloat y = (i & 1) ? y1 : y0;     /* choose even/odd luminance */
+   GLfloat r = 1.164 * (y - 16) + 1.596 * (cr - 128);
+   GLfloat g = 1.164 * (y - 16) - 0.813 * (cr - 128) - 0.391 * (cb - 128);
+   GLfloat b = 1.164 * (y - 16) + 2.018 * (cb - 128);
    r *= (1.0 / 255.0F);
    g *= (1.0 / 255.0F);
    b *= (1.0 / 255.0F);
-- 
cgit v1.2.3


From 7fbae9f41d79fc410f6c6638e26be0ff2be545bd Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 11 Mar 2009 19:09:19 -0600
Subject: mesa: get rid of gl_texture_object::_BorderChan

---
 src/mesa/main/mtypes.h   | 1 -
 src/mesa/main/texparam.c | 4 ----
 2 files changed, 5 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index c1f06885ec..10f0d067e3 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1296,7 +1296,6 @@ struct gl_texture_object
    GLenum Target;               /**< GL_TEXTURE_1D, GL_TEXTURE_2D, etc. */
    GLfloat Priority;		/**< in [0,1] */
    GLfloat BorderColor[4];	/**< unclamped */
-   GLchan _BorderChan[4];	/**< clamped, as GLchan */
    GLenum WrapS;		/**< S-axis texture image wrap mode */
    GLenum WrapT;		/**< T-axis texture image wrap mode */
    GLenum WrapR;		/**< R-axis texture image wrap mode */
diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index 50f867e1c1..15c4aa3121 100644
--- a/src/mesa/main/texparam.c
+++ b/src/mesa/main/texparam.c
@@ -483,10 +483,6 @@ set_tex_parameterf(GLcontext *ctx,
       texObj->BorderColor[GCOMP] = params[1];
       texObj->BorderColor[BCOMP] = params[2];
       texObj->BorderColor[ACOMP] = params[3];
-      UNCLAMPED_FLOAT_TO_CHAN(texObj->_BorderChan[RCOMP], params[0]);
-      UNCLAMPED_FLOAT_TO_CHAN(texObj->_BorderChan[GCOMP], params[1]);
-      UNCLAMPED_FLOAT_TO_CHAN(texObj->_BorderChan[BCOMP], params[2]);
-      UNCLAMPED_FLOAT_TO_CHAN(texObj->_BorderChan[ACOMP], params[3]);
       return;
 
    default:
-- 
cgit v1.2.3


From f6a3f1f52a969c8d990a3a41e816af4864eea45c Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 2 Apr 2009 13:05:22 -0600
Subject: mesa: don't call ctx->Driver.Draw/CopyPixels() if width or height is
 zero

---
 src/mesa/main/drawpix.c | 52 ++++++++++++++++++++++++++-----------------------
 1 file changed, 28 insertions(+), 24 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index e9de0c097a..6682b5e725 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -77,28 +77,30 @@ _mesa_DrawPixels( GLsizei width, GLsizei height,
    }
 
    if (ctx->RenderMode == GL_RENDER) {
-      /* Round, to satisfy conformance tests (matches SGI's OpenGL) */
-      GLint x = IROUND(ctx->Current.RasterPos[0]);
-      GLint y = IROUND(ctx->Current.RasterPos[1]);
-
-      if (ctx->Unpack.BufferObj->Name) {
-         /* unpack from PBO */
-         if (!_mesa_validate_pbo_access(2, &ctx->Unpack, width, height, 1,
-                                        format, type, pixels)) {
-            _mesa_error(ctx, GL_INVALID_OPERATION,
-                        "glDrawPixels(invalid PBO access)");
-            return;
+      if (width > 0 && height > 0) {
+         /* Round, to satisfy conformance tests (matches SGI's OpenGL) */
+         GLint x = IROUND(ctx->Current.RasterPos[0]);
+         GLint y = IROUND(ctx->Current.RasterPos[1]);
+
+         if (ctx->Unpack.BufferObj->Name) {
+            /* unpack from PBO */
+            if (!_mesa_validate_pbo_access(2, &ctx->Unpack, width, height, 1,
+                                           format, type, pixels)) {
+               _mesa_error(ctx, GL_INVALID_OPERATION,
+                           "glDrawPixels(invalid PBO access)");
+               return;
+            }
+            if (ctx->Unpack.BufferObj->Pointer) {
+               /* buffer is mapped - that's an error */
+               _mesa_error(ctx, GL_INVALID_OPERATION,
+                           "glDrawPixels(PBO is mapped)");
+               return;
+            }
          }
-         if (ctx->Unpack.BufferObj->Pointer) {
-            /* buffer is mapped - that's an error */
-            _mesa_error(ctx, GL_INVALID_OPERATION,
-                        "glDrawPixels(PBO is mapped)");
-            return;
-         }
-      }
 
-      ctx->Driver.DrawPixels(ctx, x, y, width, height, format, type,
-			     &ctx->Unpack, pixels);
+         ctx->Driver.DrawPixels(ctx, x, y, width, height, format, type,
+                                &ctx->Unpack, pixels);
+      }
    }
    else if (ctx->RenderMode == GL_FEEDBACK) {
       /* Feedback the current raster pos info */
@@ -159,10 +161,12 @@ _mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height,
 
    if (ctx->RenderMode == GL_RENDER) {
       /* Round to satisfy conformance tests (matches SGI's OpenGL) */
-      GLint destx = IROUND(ctx->Current.RasterPos[0]);
-      GLint desty = IROUND(ctx->Current.RasterPos[1]);
-      ctx->Driver.CopyPixels( ctx, srcx, srcy, width, height, destx, desty,
-			      type );
+      if (width > 0 && height > 0) {
+         GLint destx = IROUND(ctx->Current.RasterPos[0]);
+         GLint desty = IROUND(ctx->Current.RasterPos[1]);
+         ctx->Driver.CopyPixels( ctx, srcx, srcy, width, height, destx, desty,
+                                 type );
+      }
    }
    else if (ctx->RenderMode == GL_FEEDBACK) {
       FLUSH_CURRENT( ctx, 0 );
-- 
cgit v1.2.3


From 7b9bf395433b5fa9d5a95186891a29d49e0b47c0 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 2 Apr 2009 13:05:55 -0600
Subject: mesa: don't call ctx->Driver.ReadPixels() if width or height is zero

---
 src/mesa/main/readpix.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/readpix.c b/src/mesa/main/readpix.c
index dfdd297b6e..2326776ecb 100644
--- a/src/mesa/main/readpix.c
+++ b/src/mesa/main/readpix.c
@@ -170,6 +170,9 @@ _mesa_ReadPixels( GLint x, GLint y, GLsizei width, GLsizei height,
       return;
    }
 
+   if (width == 0 || height == 0)
+      return; /* nothing to do */
+
    if (ctx->Pack.BufferObj->Name) {
       if (!_mesa_validate_pbo_access(2, &ctx->Pack, width, height, 1,
                                      format, type, pixels)) {
-- 
cgit v1.2.3


From ebc1478e501d43e0de54e7b6c3edfbc81d7d20c6 Mon Sep 17 00:00:00 2001
From: Roland Scheidegger <sroland@vmware.com>
Date: Thu, 2 Apr 2009 23:38:34 +0200
Subject: mesa: fix TexParameter functions

premature return in TexParameterf caused mesa to never call Driver.TexParameter
breaking drivers relying on this (fix bug #20966).
While here, also fix using ctx->ErrorValue when deciding to call
Driver.TexParameter. Errors are sticky and uncleared errors thus would cause
this to no longer get called. Since we thus need return value of
set_tex_parameter[if] can also optimize this to only call when value changed.
---
 src/mesa/main/texparam.c | 148 +++++++++++++++++++++++++++--------------------
 1 file changed, 86 insertions(+), 62 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index 15c4aa3121..515a35cdfc 100644
--- a/src/mesa/main/texparam.c
+++ b/src/mesa/main/texparam.c
@@ -179,8 +179,11 @@ flush(GLcontext *ctx, struct gl_texture_object *texObj)
 }
 
 
-/** Set an integer-valued texture parameter */
-static void
+/**
+ * Set an integer-valued texture parameter
+ * \return GL_TRUE if legal AND the value changed, GL_FALSE otherwise
+ */
+static GLboolean
 set_tex_parameteri(GLcontext *ctx,
                    struct gl_texture_object *texObj,
                    GLenum pname, const GLint *params)
@@ -188,13 +191,13 @@ set_tex_parameteri(GLcontext *ctx,
    switch (pname) {
    case GL_TEXTURE_MIN_FILTER:
       if (texObj->MinFilter == params[0])
-         return;
+         return GL_FALSE;
       switch (params[0]) {
       case GL_NEAREST:
       case GL_LINEAR:
          flush(ctx, texObj);
          texObj->MinFilter = params[0];
-         return;
+         return GL_TRUE;
       case GL_NEAREST_MIPMAP_NEAREST:
       case GL_LINEAR_MIPMAP_NEAREST:
       case GL_NEAREST_MIPMAP_LINEAR:
@@ -202,90 +205,95 @@ set_tex_parameteri(GLcontext *ctx,
          if (texObj->Target != GL_TEXTURE_RECTANGLE_NV) {
             flush(ctx, texObj);
             texObj->MinFilter = params[0];
-            return;
+            return GL_TRUE;
          }
          /* fall-through */
       default:
          _mesa_error( ctx, GL_INVALID_VALUE, "glTexParameter(param)" );
       }
-      return;
+      return GL_FALSE;
 
    case GL_TEXTURE_MAG_FILTER:
       if (texObj->MagFilter == params[0])
-         return;
+         return GL_FALSE;
       switch (params[0]) {
       case GL_NEAREST:
       case GL_LINEAR:
          flush(ctx, texObj);
          texObj->MagFilter = params[0];
-         return;
+         return GL_TRUE;
       default:
          _mesa_error( ctx, GL_INVALID_VALUE, "glTexParameter(param)" );
       }
-      return;
+      return GL_FALSE;
 
    case GL_TEXTURE_WRAP_S:
       if (texObj->WrapS == params[0])
-         return;
+         return GL_FALSE;
       if (validate_texture_wrap_mode(ctx, texObj->Target, params[0])) {
          flush(ctx, texObj);
          texObj->WrapS = params[0];
+         return GL_TRUE;
       }
-      return;
+      return GL_FALSE;
 
    case GL_TEXTURE_WRAP_T:
       if (texObj->WrapT == params[0])
-         return;
+         return GL_FALSE;
       if (validate_texture_wrap_mode(ctx, texObj->Target, params[0])) {
          flush(ctx, texObj);
          texObj->WrapT = params[0];
+         return GL_TRUE;
       }
-      return;
+      return GL_FALSE;
 
    case GL_TEXTURE_WRAP_R:
       if (texObj->WrapR == params[0])
-         return;
+         return GL_FALSE;
       if (validate_texture_wrap_mode(ctx, texObj->Target, params[0])) {
          flush(ctx, texObj);
          texObj->WrapR = params[0];
+         return GL_TRUE;
       }
-      return;
+      return GL_FALSE;
 
    case GL_TEXTURE_BASE_LEVEL:
       if (texObj->BaseLevel == params[0])
-         return;
+         return GL_FALSE;
       if (params[0] < 0 ||
           (texObj->Target == GL_TEXTURE_RECTANGLE_ARB && params[0] != 0)) {
          _mesa_error(ctx, GL_INVALID_VALUE, "glTexParameter(param)");
-         return;
+         return GL_FALSE;
       }
       flush(ctx, texObj);
       texObj->BaseLevel = params[0];
-      return;
+      return GL_TRUE;
 
    case GL_TEXTURE_MAX_LEVEL:
       if (texObj->MaxLevel == params[0])
-         return;
+         return GL_FALSE;
       if (params[0] < 0 || texObj->Target == GL_TEXTURE_RECTANGLE_ARB) {
          _mesa_error(ctx, GL_INVALID_OPERATION, "glTexParameter(param)");
-         return;
+         return GL_FALSE;
       }
       flush(ctx, texObj);
       texObj->MaxLevel = params[0];
-      return;
+      return GL_TRUE;
 
    case GL_GENERATE_MIPMAP_SGIS:
       if (ctx->Extensions.SGIS_generate_mipmap) {
          if (texObj->GenerateMipmap != params[0]) {
             flush(ctx, texObj);
             texObj->GenerateMipmap = params[0] ? GL_TRUE : GL_FALSE;
+            return GL_TRUE;
          }
+         return GL_FALSE;
       }
       else {
          _mesa_error(ctx, GL_INVALID_ENUM,
                      "glTexParameter(pname=GL_GENERATE_MIPMAP_SGIS)");
       }
-      return;
+      return GL_FALSE;
 
    case GL_TEXTURE_COMPARE_MODE_ARB:
       if (ctx->Extensions.ARB_shadow &&
@@ -294,24 +302,26 @@ set_tex_parameteri(GLcontext *ctx,
          if (texObj->CompareMode != params[0]) {
             flush(ctx, texObj);
             texObj->CompareMode = params[0];
+            return GL_TRUE;
          }
+         return GL_FALSE;
       }
       else {
          _mesa_error(ctx, GL_INVALID_ENUM,
                      "glTexParameter(GL_TEXTURE_COMPARE_MODE_ARB)");
       }
-      return;
+      return GL_FALSE;
 
    case GL_TEXTURE_COMPARE_FUNC_ARB:
       if (ctx->Extensions.ARB_shadow) {
          if (texObj->CompareFunc == params[0])
-            return;
+            return GL_FALSE;
          switch (params[0]) {
          case GL_LEQUAL:
          case GL_GEQUAL:
             flush(ctx, texObj);
             texObj->CompareFunc = params[0];
-            return;
+            return GL_TRUE;
          case GL_EQUAL:
          case GL_NOTEQUAL:
          case GL_LESS:
@@ -321,7 +331,7 @@ set_tex_parameteri(GLcontext *ctx,
             if (ctx->Extensions.EXT_shadow_funcs) {
                flush(ctx, texObj);
                texObj->CompareFunc = params[0];
-               return;
+               return GL_TRUE;
             }
             /* fall-through */
          default:
@@ -332,7 +342,7 @@ set_tex_parameteri(GLcontext *ctx,
       else {
          _mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(param)");
       }
-      return;
+      return GL_FALSE;
 
    case GL_DEPTH_TEXTURE_MODE_ARB:
       if (ctx->Extensions.ARB_depth_texture &&
@@ -342,13 +352,14 @@ set_tex_parameteri(GLcontext *ctx,
          if (texObj->DepthMode != params[0]) {
             flush(ctx, texObj);
             texObj->DepthMode = params[0];
+            return GL_TRUE;
          }
       }
       else {
          _mesa_error(ctx, GL_INVALID_ENUM,
                      "glTexParameter(GL_DEPTH_TEXTURE_MODE_ARB)");
       }
-      return;
+      return GL_FALSE;
 
 #ifdef FEATURE_OES_draw_texture
    case GL_TEXTURE_CROP_RECT_OES:
@@ -356,7 +367,7 @@ set_tex_parameteri(GLcontext *ctx,
       texObj->CropRect[1] = params[1];
       texObj->CropRect[2] = params[2];
       texObj->CropRect[3] = params[3];
-      return;
+      return GL_TRUE;
 #endif
 
    case GL_TEXTURE_SWIZZLE_R_EXT:
@@ -369,18 +380,18 @@ set_tex_parameteri(GLcontext *ctx,
          if (swz < 0) {
             _mesa_error(ctx, GL_INVALID_OPERATION,
                         "glTexParameter(swizzle 0x%x)", params[0]);
-            return;
+            return GL_FALSE;
          }
          ASSERT(comp < 4);
          if (swz >= 0) {
             flush(ctx, texObj);
             texObj->Swizzle[comp] = params[0];
             set_swizzle_component(&texObj->_Swizzle, comp, swz);
-            return;
+            return GL_TRUE;
          }
       }
       _mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(pname=0x%x)", pname);
-      return;
+      return GL_FALSE;
 
    case GL_TEXTURE_SWIZZLE_RGBA_EXT:
       if (ctx->Extensions.EXT_texture_swizzle) {
@@ -395,22 +406,26 @@ set_tex_parameteri(GLcontext *ctx,
             else {
                _mesa_error(ctx, GL_INVALID_OPERATION,
                            "glTexParameter(swizzle 0x%x)", params[comp]);
-               return;
+               return GL_FALSE;
             }
          }
-         return;
+         return GL_TRUE;
       }
       _mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(pname=0x%x)", pname);
-      return;
+      return GL_FALSE;
 
    default:
       _mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(pname=0x%x)", pname);
    }
+   return GL_FALSE;
 }
 
 
-/** Set a float-valued texture parameter */
-static void
+/**
+ * Set a float-valued texture parameter
+ * \return GL_TRUE if legal AND the value changed, GL_FALSE otherwise
+ */
+static GLboolean
 set_tex_parameterf(GLcontext *ctx,
                    struct gl_texture_object *texObj,
                    GLenum pname, const GLfloat *params)
@@ -418,54 +433,56 @@ set_tex_parameterf(GLcontext *ctx,
    switch (pname) {
    case GL_TEXTURE_MIN_LOD:
       if (texObj->MinLod == params[0])
-         return;
+         return GL_FALSE;
       flush(ctx, texObj);
       texObj->MinLod = params[0];
-      return;
+      return GL_TRUE;
 
    case GL_TEXTURE_MAX_LOD:
       if (texObj->MaxLod == params[0])
-         return;
+         return GL_FALSE;
       flush(ctx, texObj);
       texObj->MaxLod = params[0];
-      return;
+      return GL_TRUE;
 
    case GL_TEXTURE_PRIORITY:
       flush(ctx, texObj);
       texObj->Priority = CLAMP(params[0], 0.0F, 1.0F);
-      return;
+      return GL_TRUE;
 
    case GL_TEXTURE_MAX_ANISOTROPY_EXT:
       if (ctx->Extensions.EXT_texture_filter_anisotropic) {
          if (texObj->MaxAnisotropy == params[0])
-            return;
+            return GL_FALSE;
          if (params[0] < 1.0) {
             _mesa_error(ctx, GL_INVALID_VALUE, "glTexParameter(param)" );
-            return;
+            return GL_FALSE;
          }
          flush(ctx, texObj);
          /* clamp to max, that's what NVIDIA does */
          texObj->MaxAnisotropy = MIN2(params[0],
                                       ctx->Const.MaxTextureMaxAnisotropy);
+         return GL_TRUE;
       }
       else {
          _mesa_error(ctx, GL_INVALID_ENUM,
                      "glTexParameter(pname=GL_TEXTURE_MAX_ANISOTROPY_EXT)");
       }
-      return;
+      return GL_FALSE;
 
    case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB:
       if (ctx->Extensions.ARB_shadow_ambient) {
          if (texObj->CompareFailValue != params[0]) {
             flush(ctx, texObj);
             texObj->CompareFailValue = CLAMP(params[0], 0.0F, 1.0F);
+            return GL_TRUE;
          }
       }
       else {
          _mesa_error(ctx, GL_INVALID_ENUM,
                     "glTexParameter(pname=GL_TEXTURE_COMPARE_FAIL_VALUE_ARB)");
       }
-      return;
+      return GL_FALSE;
 
    case GL_TEXTURE_LOD_BIAS:
       /* NOTE: this is really part of OpenGL 1.4, not EXT_texture_lod_bias */
@@ -473,7 +490,9 @@ set_tex_parameterf(GLcontext *ctx,
          if (texObj->LodBias != params[0]) {
             flush(ctx, texObj);
             texObj->LodBias = params[0];
+            return GL_TRUE;
          }
+         return GL_FALSE;
       }
       break;
 
@@ -483,17 +502,19 @@ set_tex_parameterf(GLcontext *ctx,
       texObj->BorderColor[GCOMP] = params[1];
       texObj->BorderColor[BCOMP] = params[2];
       texObj->BorderColor[ACOMP] = params[3];
-      return;
+      return GL_TRUE;
 
    default:
       _mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(pname=0x%x)", pname);
    }
+   return GL_FALSE;
 }
 
 
 void GLAPIENTRY
 _mesa_TexParameterf(GLenum target, GLenum pname, GLfloat param)
 {
+   GLboolean need_update;
    struct gl_texture_object *texObj;
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
@@ -517,15 +538,15 @@ _mesa_TexParameterf(GLenum target, GLenum pname, GLfloat param)
       {
          /* convert float param to int */
          GLint p = (GLint) param;
-         set_tex_parameteri(ctx, texObj, pname, &p);
+         need_update = set_tex_parameteri(ctx, texObj, pname, &p);
       }
-      return;
+      break;
    default:
       /* this will generate an error if pname is illegal */
-      set_tex_parameterf(ctx, texObj, pname, &param);
+      need_update = set_tex_parameterf(ctx, texObj, pname, &param);
    }
 
-   if (ctx->Driver.TexParameter && ctx->ErrorValue == GL_NO_ERROR) {
+   if (ctx->Driver.TexParameter && need_update) {
       ctx->Driver.TexParameter(ctx, target, texObj, pname, &param);
    }
 }
@@ -534,6 +555,7 @@ _mesa_TexParameterf(GLenum target, GLenum pname, GLfloat param)
 void GLAPIENTRY
 _mesa_TexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
+   GLboolean need_update;
    struct gl_texture_object *texObj;
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
@@ -557,7 +579,7 @@ _mesa_TexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
       {
          /* convert float param to int */
          GLint p = (GLint) params[0];
-         set_tex_parameteri(ctx, texObj, pname, &p);
+         need_update = set_tex_parameteri(ctx, texObj, pname, &p);
       }
       break;
 
@@ -570,17 +592,17 @@ _mesa_TexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
          iparams[1] = (GLint) params[1];
          iparams[2] = (GLint) params[2];
          iparams[3] = (GLint) params[3];
-         set_tex_parameteri(ctx, target, iparams);
+         need_update = set_tex_parameteri(ctx, target, iparams);
       }
       break;
 #endif
 
    default:
       /* this will generate an error if pname is illegal */
-      set_tex_parameterf(ctx, texObj, pname, params);
+      need_update = set_tex_parameterf(ctx, texObj, pname, params);
    }
 
-   if (ctx->Driver.TexParameter && ctx->ErrorValue == GL_NO_ERROR) {
+   if (ctx->Driver.TexParameter && need_update) {
       ctx->Driver.TexParameter(ctx, target, texObj, pname, params);
    }
 }
@@ -589,6 +611,7 @@ _mesa_TexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 void GLAPIENTRY
 _mesa_TexParameteri(GLenum target, GLenum pname, GLint param)
 {
+   GLboolean need_update;
    struct gl_texture_object *texObj;
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
@@ -607,15 +630,15 @@ _mesa_TexParameteri(GLenum target, GLenum pname, GLint param)
       {
          GLfloat fparam = (GLfloat) param;
          /* convert int param to float */
-         set_tex_parameterf(ctx, texObj, pname, &fparam);
+         need_update = set_tex_parameterf(ctx, texObj, pname, &fparam);
       }
       break;
    default:
       /* this will generate an error if pname is illegal */
-      set_tex_parameteri(ctx, texObj, pname, &param);
+      need_update = set_tex_parameteri(ctx, texObj, pname, &param);
    }
 
-   if (ctx->Driver.TexParameter && ctx->ErrorValue == GL_NO_ERROR) {
+   if (ctx->Driver.TexParameter && need_update) {
       GLfloat fparam = (GLfloat) param;
       ctx->Driver.TexParameter(ctx, target, texObj, pname, &fparam);
    }
@@ -625,6 +648,7 @@ _mesa_TexParameteri(GLenum target, GLenum pname, GLint param)
 void GLAPIENTRY
 _mesa_TexParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
+   GLboolean need_update;
    struct gl_texture_object *texObj;
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
@@ -642,7 +666,7 @@ _mesa_TexParameteriv(GLenum target, GLenum pname, const GLint *params)
          fparams[1] = INT_TO_FLOAT(params[1]);
          fparams[2] = INT_TO_FLOAT(params[2]);
          fparams[3] = INT_TO_FLOAT(params[3]);
-         set_tex_parameterf(ctx, texObj, pname, fparams);
+         need_update = set_tex_parameterf(ctx, texObj, pname, fparams);
       }
       break;
    case GL_TEXTURE_MIN_LOD:
@@ -654,15 +678,15 @@ _mesa_TexParameteriv(GLenum target, GLenum pname, const GLint *params)
       {
          /* convert int param to float */
          GLfloat fparam = (GLfloat) params[0];
-         set_tex_parameterf(ctx, texObj, pname, &fparam);
+         need_update = set_tex_parameterf(ctx, texObj, pname, &fparam);
       }
       break;
    default:
       /* this will generate an error if pname is illegal */
-      set_tex_parameteri(ctx, texObj, pname, params);
+      need_update = set_tex_parameteri(ctx, texObj, pname, params);
    }
 
-   if (ctx->Driver.TexParameter && ctx->ErrorValue == GL_NO_ERROR) {
+   if (ctx->Driver.TexParameter && need_update) {
       GLfloat fparams[4];
       fparams[0] = INT_TO_FLOAT(params[0]);
       if (pname == GL_TEXTURE_BORDER_COLOR ||
-- 
cgit v1.2.3


From 264058f38af00519e9f180f237a771566117cd8b Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 27 Mar 2009 14:49:01 -0600
Subject: mesa: more error message info

---
 src/mesa/main/matrix.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/matrix.c b/src/mesa/main/matrix.c
index aebf48134f..7388276c45 100644
--- a/src/mesa/main/matrix.c
+++ b/src/mesa/main/matrix.c
@@ -161,7 +161,8 @@ _mesa_MatrixMode( GLenum mode )
       break;
    case GL_TEXTURE:
       if (ctx->Texture.CurrentUnit >= ctx->Const.MaxTextureCoordUnits) {
-         _mesa_error(ctx, GL_INVALID_OPERATION, "glMatrixMode(texcoord unit)");
+         _mesa_error(ctx, GL_INVALID_OPERATION, "glMatrixMode(invalid unit %d)",
+                     ctx->Texture.CurrentUnit);
          return;
       }
       ctx->CurrentStack = &ctx->TextureMatrixStack[ctx->Texture.CurrentUnit];
-- 
cgit v1.2.3


From 650d147289014e8a98f65fbbcd1855b2a4f19d2f Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 3 Apr 2009 09:55:10 -0600
Subject: mesa: don't normalize spot light direction until validation time

In glLight() we're only supposed to transform the direction by the modelview
matrix, not normalized it too.
---
 src/mesa/main/light.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c
index a15c1f0be0..f72841b8cc 100644
--- a/src/mesa/main/light.c
+++ b/src/mesa/main/light.c
@@ -209,7 +209,6 @@ _mesa_Lightfv( GLenum light, GLenum pname, const GLfloat *params )
 	 _math_matrix_analyse(ctx->ModelviewMatrixStack.Top);
       }
       TRANSFORM_DIRECTION(temp, params, ctx->ModelviewMatrixStack.Top->m);
-      NORMALIZE_3FV(temp);
       params = temp;
       break;
    case GL_SPOT_EXPONENT:
@@ -1137,12 +1136,18 @@ compute_light_positions( GLcontext *ctx )
       }
 
       if (light->_Flags & LIGHT_SPOT) {
+         /* Note: we normalize the spot direction now */
+
 	 if (ctx->_NeedEyeCoords) {
 	    COPY_3V( light->_NormDirection, light->EyeDirection );
+            NORMALIZE_3FV( light->_NormDirection );
 	 }
          else {
+            GLfloat spotDir[3];
+            COPY_3V(spotDir, light->EyeDirection);
+            NORMALIZE_3FV(spotDir);
 	    TRANSFORM_NORMAL( light->_NormDirection,
-			      light->EyeDirection,
+			      spotDir,
 			      ctx->ModelviewMatrixStack.Top->m);
 	 }
 
-- 
cgit v1.2.3


From 7391ba1e9d81f15465059db25d1279eefdbeb1a9 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 3 Apr 2009 10:08:20 -0600
Subject: mesa: rename some gl_light fields to be clearer

EyeDirection -> SpotDirection
_NormDirection -> _NormSpotDirection
---
 src/mesa/drivers/dri/r200/r200_state.c        |  8 ++++----
 src/mesa/drivers/dri/radeon/radeon_lighting.c |  8 ++++----
 src/mesa/drivers/dri/radeon/radeon_state.c    |  8 ++++----
 src/mesa/main/attrib.c                        |  2 +-
 src/mesa/main/light.c                         | 26 +++++++++++++-------------
 src/mesa/main/mtypes.h                        |  4 ++--
 src/mesa/shader/prog_statevars.c              |  4 ++--
 src/mesa/tnl/t_rasterpos.c                    |  2 +-
 src/mesa/tnl/t_vb_lighttmp.h                  |  6 +++---
 src/mesa/x86/gen_matypes.c                    |  4 ++--
 10 files changed, 36 insertions(+), 36 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/r200/r200_state.c b/src/mesa/drivers/dri/r200/r200_state.c
index 0eaaaf69ac..2fcc87c0f5 100644
--- a/src/mesa/drivers/dri/r200/r200_state.c
+++ b/src/mesa/drivers/dri/r200/r200_state.c
@@ -1210,7 +1210,7 @@ void r200UpdateMaterial( GLcontext *ctx )
  *       _VP_inf_norm
  *       _h_inf_norm
  *       _Position
- *       _NormDirection
+ *       _NormSpotDirection
  *       _ModelViewInvScale
  *       _NeedEyeCoords
  *       _EyeZDir
@@ -1267,9 +1267,9 @@ static void update_light( GLcontext *ctx )
 	       fcmd[LIT_DIRECTION_W] = 0;
 	    } else {
 	       COPY_4V( &fcmd[LIT_POSITION_X], l->_Position );
-	       fcmd[LIT_DIRECTION_X] = -l->_NormDirection[0];
-	       fcmd[LIT_DIRECTION_Y] = -l->_NormDirection[1];
-	       fcmd[LIT_DIRECTION_Z] = -l->_NormDirection[2];
+	       fcmd[LIT_DIRECTION_X] = -l->_NormSpotDirection[0];
+	       fcmd[LIT_DIRECTION_Y] = -l->_NormSpotDirection[1];
+	       fcmd[LIT_DIRECTION_Z] = -l->_NormSpotDirection[2];
 	       fcmd[LIT_DIRECTION_W] = 0;
 	    }
 
diff --git a/src/mesa/drivers/dri/radeon/radeon_lighting.c b/src/mesa/drivers/dri/radeon/radeon_lighting.c
index 6d9ccfa24d..ac3b94e4a6 100644
--- a/src/mesa/drivers/dri/radeon/radeon_lighting.c
+++ b/src/mesa/drivers/dri/radeon/radeon_lighting.c
@@ -246,7 +246,7 @@ void radeonUpdateMaterial( GLcontext *ctx )
  *       _VP_inf_norm
  *       _h_inf_norm
  *       _Position
- *       _NormDirection
+ *       _NormSpotDirection
  *       _ModelViewInvScale
  *       _NeedEyeCoords
  *       _EyeZDir
@@ -308,9 +308,9 @@ void radeonUpdateLighting( GLcontext *ctx )
 	       fcmd[LIT_DIRECTION_W] = 0;
 	    } else {
 	       COPY_4V( &fcmd[LIT_POSITION_X], l->_Position );
-	       fcmd[LIT_DIRECTION_X] = -l->_NormDirection[0];
-	       fcmd[LIT_DIRECTION_Y] = -l->_NormDirection[1];
-	       fcmd[LIT_DIRECTION_Z] = -l->_NormDirection[2];
+	       fcmd[LIT_DIRECTION_X] = -l->_NormSpotDirection[0];
+	       fcmd[LIT_DIRECTION_Y] = -l->_NormSpotDirection[1];
+	       fcmd[LIT_DIRECTION_Z] = -l->_NormSpotDirection[2];
 	       fcmd[LIT_DIRECTION_W] = 0;
 	    }
 
diff --git a/src/mesa/drivers/dri/radeon/radeon_state.c b/src/mesa/drivers/dri/radeon/radeon_state.c
index 32bcff3360..b6561001e7 100644
--- a/src/mesa/drivers/dri/radeon/radeon_state.c
+++ b/src/mesa/drivers/dri/radeon/radeon_state.c
@@ -967,7 +967,7 @@ void radeonUpdateMaterial( GLcontext *ctx )
  *       _VP_inf_norm
  *       _h_inf_norm
  *       _Position
- *       _NormDirection
+ *       _NormSpotDirection
  *       _ModelViewInvScale
  *       _NeedEyeCoords
  *       _EyeZDir
@@ -1028,9 +1028,9 @@ static void update_light( GLcontext *ctx )
 	       fcmd[LIT_DIRECTION_W] = 0;
 	    } else {
 	       COPY_4V( &fcmd[LIT_POSITION_X], l->_Position );
-	       fcmd[LIT_DIRECTION_X] = -l->_NormDirection[0];
-	       fcmd[LIT_DIRECTION_Y] = -l->_NormDirection[1];
-	       fcmd[LIT_DIRECTION_Z] = -l->_NormDirection[2];
+	       fcmd[LIT_DIRECTION_X] = -l->_NormSpotDirection[0];
+	       fcmd[LIT_DIRECTION_Y] = -l->_NormSpotDirection[1];
+	       fcmd[LIT_DIRECTION_Z] = -l->_NormSpotDirection[2];
 	       fcmd[LIT_DIRECTION_W] = 0;
 	    }
 
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 1d2c460488..d5d0a552db 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -1104,7 +1104,7 @@ _mesa_PopAttrib(void)
 		  _mesa_light(ctx, i, GL_DIFFUSE, l->Diffuse);
 		  _mesa_light(ctx, i, GL_SPECULAR, l->Specular );
 		  _mesa_light(ctx, i, GL_POSITION, l->EyePosition);
-		  _mesa_light(ctx, i, GL_SPOT_DIRECTION, l->EyeDirection);
+		  _mesa_light(ctx, i, GL_SPOT_DIRECTION, l->SpotDirection);
 		  _mesa_light(ctx, i, GL_SPOT_EXPONENT, &l->SpotExponent);
 		  _mesa_light(ctx, i, GL_SPOT_CUTOFF, &l->SpotCutoff);
 		  _mesa_light(ctx, i, GL_CONSTANT_ATTENUATION,
diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c
index f72841b8cc..ac604fd12c 100644
--- a/src/mesa/main/light.c
+++ b/src/mesa/main/light.c
@@ -110,10 +110,10 @@ _mesa_light(GLcontext *ctx, GLuint lnum, GLenum pname, const GLfloat *params)
       break;
    case GL_SPOT_DIRECTION:
       /* NOTE: Direction already transformed by inverse ModelView! */
-      if (TEST_EQ_3V(light->EyeDirection, params))
+      if (TEST_EQ_3V(light->SpotDirection, params))
 	 return;
       FLUSH_VERTICES(ctx, _NEW_LIGHT);
-      COPY_3V(light->EyeDirection, params);
+      COPY_3V(light->SpotDirection, params);
       break;
    case GL_SPOT_EXPONENT:
       ASSERT(params[0] >= 0.0);
@@ -325,7 +325,7 @@ _mesa_GetLightfv( GLenum light, GLenum pname, GLfloat *params )
          COPY_4V( params, ctx->Light.Light[l].EyePosition );
          break;
       case GL_SPOT_DIRECTION:
-         COPY_3V( params, ctx->Light.Light[l].EyeDirection );
+         COPY_3V( params, ctx->Light.Light[l].SpotDirection );
          break;
       case GL_SPOT_EXPONENT:
          params[0] = ctx->Light.Light[l].SpotExponent;
@@ -387,9 +387,9 @@ _mesa_GetLightiv( GLenum light, GLenum pname, GLint *params )
          params[3] = (GLint) ctx->Light.Light[l].EyePosition[3];
          break;
       case GL_SPOT_DIRECTION:
-         params[0] = (GLint) ctx->Light.Light[l].EyeDirection[0];
-         params[1] = (GLint) ctx->Light.Light[l].EyeDirection[1];
-         params[2] = (GLint) ctx->Light.Light[l].EyeDirection[2];
+         params[0] = (GLint) ctx->Light.Light[l].SpotDirection[0];
+         params[1] = (GLint) ctx->Light.Light[l].SpotDirection[1];
+         params[2] = (GLint) ctx->Light.Light[l].SpotDirection[2];
          break;
       case GL_SPOT_EXPONENT:
          params[0] = (GLint) ctx->Light.Light[l].SpotExponent;
@@ -1139,23 +1139,23 @@ compute_light_positions( GLcontext *ctx )
          /* Note: we normalize the spot direction now */
 
 	 if (ctx->_NeedEyeCoords) {
-	    COPY_3V( light->_NormDirection, light->EyeDirection );
-            NORMALIZE_3FV( light->_NormDirection );
+	    COPY_3V( light->_NormSpotDirection, light->SpotDirection );
+            NORMALIZE_3FV( light->_NormSpotDirection );
 	 }
          else {
             GLfloat spotDir[3];
-            COPY_3V(spotDir, light->EyeDirection);
+            COPY_3V(spotDir, light->SpotDirection);
             NORMALIZE_3FV(spotDir);
-	    TRANSFORM_NORMAL( light->_NormDirection,
+	    TRANSFORM_NORMAL( light->_NormSpotDirection,
 			      spotDir,
 			      ctx->ModelviewMatrixStack.Top->m);
 	 }
 
-	 NORMALIZE_3FV( light->_NormDirection );
+	 NORMALIZE_3FV( light->_NormSpotDirection );
 
 	 if (!(light->_Flags & LIGHT_POSITIONAL)) {
 	    GLfloat PV_dot_dir = - DOT3(light->_VP_inf_norm,
-					light->_NormDirection);
+					light->_NormSpotDirection);
 
 	    if (PV_dot_dir > light->_CosCutoff) {
 	       double x = PV_dot_dir * (EXP_TABLE_SIZE-1);
@@ -1279,7 +1279,7 @@ init_light( struct gl_light *l, GLuint n )
       ASSIGN_4V( l->Specular, 0.0, 0.0, 0.0, 1.0 );
    }
    ASSIGN_4V( l->EyePosition, 0.0, 0.0, 1.0, 0.0 );
-   ASSIGN_3V( l->EyeDirection, 0.0, 0.0, -1.0 );
+   ASSIGN_3V( l->SpotDirection, 0.0, 0.0, -1.0 );
    l->SpotExponent = 0.0;
    _mesa_invalidate_spot_exp_table( l );
    l->SpotCutoff = 180.0;
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 10f0d067e3..3f31590000 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -460,7 +460,7 @@ struct gl_light
    GLfloat Diffuse[4];		/**< diffuse color */
    GLfloat Specular[4];		/**< specular color */
    GLfloat EyePosition[4];	/**< position in eye coordinates */
-   GLfloat EyeDirection[4];	/**< spotlight dir in eye coordinates */
+   GLfloat SpotDirection[4];	/**< spotlight direction in eye coordinates */
    GLfloat SpotExponent;
    GLfloat SpotCutoff;		/**< in degrees */
    GLfloat _CosCutoffNeg;	/**< = cos(SpotCutoff) */
@@ -479,7 +479,7 @@ struct gl_light
    GLfloat _Position[4];	/**< position in eye/obj coordinates */
    GLfloat _VP_inf_norm[3];	/**< Norm direction to infinite light */
    GLfloat _h_inf_norm[3];	/**< Norm( _VP_inf_norm + <0,0,1> ) */
-   GLfloat _NormDirection[4];	/**< normalized spotlight direction */
+   GLfloat _NormSpotDirection[4]; /**< normalized spotlight direction */
    GLfloat _VP_inf_spot_attenuation;
 
    GLfloat _SpotExpTable[EXP_TABLE_SIZE][2];  /**< to replace a pow() call */
diff --git a/src/mesa/shader/prog_statevars.c b/src/mesa/shader/prog_statevars.c
index b93e987f04..37a3f1fc8c 100644
--- a/src/mesa/shader/prog_statevars.c
+++ b/src/mesa/shader/prog_statevars.c
@@ -112,7 +112,7 @@ _mesa_fetch_state(GLcontext *ctx, const gl_state_index state[],
             value[3] = ctx->Light.Light[ln].SpotExponent;
             return;
          case STATE_SPOT_DIRECTION:
-            COPY_3V(value, ctx->Light.Light[ln].EyeDirection);
+            COPY_3V(value, ctx->Light.Light[ln].SpotDirection);
             value[3] = ctx->Light.Light[ln]._CosCutoff;
             return;
          case STATE_SPOT_CUTOFF:
@@ -449,7 +449,7 @@ _mesa_fetch_state(GLcontext *ctx, const gl_state_index state[],
             /* here, state[2] is the light number */
             /* pre-normalize spot dir */
             const GLuint ln = (GLuint) state[2];
-            COPY_3V(value, ctx->Light.Light[ln]._NormDirection);
+            COPY_3V(value, ctx->Light.Light[ln]._NormSpotDirection);
             value[3] = ctx->Light.Light[ln]._CosCutoff;
          }
          return;
diff --git a/src/mesa/tnl/t_rasterpos.c b/src/mesa/tnl/t_rasterpos.c
index 04fb1d8f8c..f1fdddf0f5 100644
--- a/src/mesa/tnl/t_rasterpos.c
+++ b/src/mesa/tnl/t_rasterpos.c
@@ -167,7 +167,7 @@ shade_rastpos(GLcontext *ctx,
 				light->QuadraticAttenuation));
 
 	 if (light->_Flags & LIGHT_SPOT) {
-	    GLfloat PV_dot_dir = - DOT3(VP, light->_NormDirection);
+	    GLfloat PV_dot_dir = - DOT3(VP, light->_NormSpotDirection);
 
 	    if (PV_dot_dir<light->_CosCutoff) {
 	       continue;
diff --git a/src/mesa/tnl/t_vb_lighttmp.h b/src/mesa/tnl/t_vb_lighttmp.h
index a78f27761f..124ca3c74f 100644
--- a/src/mesa/tnl/t_vb_lighttmp.h
+++ b/src/mesa/tnl/t_vb_lighttmp.h
@@ -141,7 +141,7 @@ static void TAG(light_rgba_spec)( GLcontext *ctx,
 
 	    /* spotlight attenuation */
 	    if (light->_Flags & LIGHT_SPOT) {
-	       GLfloat PV_dot_dir = - DOT3(VP, light->_NormDirection);
+	       GLfloat PV_dot_dir = - DOT3(VP, light->_NormSpotDirection);
 
 	       if (PV_dot_dir<light->_CosCutoff) {
 		  continue; /* this light makes no contribution */
@@ -325,7 +325,7 @@ static void TAG(light_rgba)( GLcontext *ctx,
 
 	    /* spotlight attenuation */
 	    if (light->_Flags & LIGHT_SPOT) {
-	       GLfloat PV_dot_dir = - DOT3(VP, light->_NormDirection);
+	       GLfloat PV_dot_dir = - DOT3(VP, light->_NormSpotDirection);
 
 	       if (PV_dot_dir<light->_CosCutoff) {
 		  continue; /* this light makes no contribution */
@@ -721,7 +721,7 @@ static void TAG(light_ci)( GLcontext *ctx,
 
 	    /* spotlight attenuation */
 	    if (light->_Flags & LIGHT_SPOT) {
-	       GLfloat PV_dot_dir = - DOT3(VP, light->_NormDirection);
+	       GLfloat PV_dot_dir = - DOT3(VP, light->_NormSpotDirection);
 	       if (PV_dot_dir < light->_CosCutoff) {
 		  continue; /* this light makes no contribution */
 	       }
diff --git a/src/mesa/x86/gen_matypes.c b/src/mesa/x86/gen_matypes.c
index 8c690b4f88..d56b701aa8 100644
--- a/src/mesa/x86/gen_matypes.c
+++ b/src/mesa/x86/gen_matypes.c
@@ -197,7 +197,7 @@ int main( int argc, char **argv )
    OFFSET( "LIGHT_DIFFUSE           ", struct gl_light, Diffuse );
    OFFSET( "LIGHT_SPECULAR          ", struct gl_light, Specular );
    OFFSET( "LIGHT_EYE_POSITION      ", struct gl_light, EyePosition );
-   OFFSET( "LIGHT_EYE_DIRECTION     ", struct gl_light, EyeDirection );
+   OFFSET( "LIGHT_SPOT_DIRECTION    ", struct gl_light, SpotDirection );
    OFFSET( "LIGHT_SPOT_EXPONENT     ", struct gl_light, SpotExponent );
    OFFSET( "LIGHT_SPOT_CUTOFF       ", struct gl_light, SpotCutoff );
    OFFSET( "LIGHT_COS_CUTOFF        ", struct gl_light, _CosCutoff );
@@ -211,7 +211,7 @@ int main( int argc, char **argv )
    OFFSET( "LIGHT_POSITION          ", struct gl_light, _Position );
    OFFSET( "LIGHT_VP_INF_NORM       ", struct gl_light, _VP_inf_norm );
    OFFSET( "LIGHT_H_INF_NORM        ", struct gl_light, _h_inf_norm );
-   OFFSET( "LIGHT_NORM_DIRECTION    ", struct gl_light, _NormDirection );
+   OFFSET( "LIGHT_NORM_DIRECTION    ", struct gl_light, _NormSpotDirection );
    OFFSET( "LIGHT_VP_INF_SPOT_ATTEN ", struct gl_light, _VP_inf_spot_attenuation );
    printf( "\n" );
    OFFSET( "LIGHT_SPOT_EXP_TABLE    ", struct gl_light, _SpotExpTable );
-- 
cgit v1.2.3


From a5ce781282b674002379d699a7f2e1ebf3a46df1 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 3 Apr 2009 16:37:36 -0600
Subject: mesa: remove extra semicolons

---
 src/mesa/main/texformat_tmp.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texformat_tmp.h b/src/mesa/main/texformat_tmp.h
index d0d3804608..ef5bb34db6 100644
--- a/src/mesa/main/texformat_tmp.h
+++ b/src/mesa/main/texformat_tmp.h
@@ -1112,7 +1112,7 @@ static void FETCH(f_ci8)( const struct gl_texture_image *texImage,
          texel[GCOMP] =
          texel[BCOMP] = 0.0F;
          texel[ACOMP] = table[index];
-         break;;
+         break;
       case GL_LUMINANCE:
          texel[RCOMP] =
          texel[GCOMP] =
@@ -1124,25 +1124,25 @@ static void FETCH(f_ci8)( const struct gl_texture_image *texImage,
          texel[GCOMP] =
          texel[BCOMP] =
          texel[ACOMP] = table[index];
-         break;;
+         break;
       case GL_LUMINANCE_ALPHA:
          texel[RCOMP] =
          texel[GCOMP] =
          texel[BCOMP] = table[index * 2 + 0];
          texel[ACOMP] = table[index * 2 + 1];
-         break;;
+         break;
       case GL_RGB:
          texel[RCOMP] = table[index * 3 + 0];
          texel[GCOMP] = table[index * 3 + 1];
          texel[BCOMP] = table[index * 3 + 2];
          texel[ACOMP] = 1.0F;
-         break;;
+         break;
       case GL_RGBA:
          texel[RCOMP] = table[index * 4 + 0];
          texel[GCOMP] = table[index * 4 + 1];
          texel[BCOMP] = table[index * 4 + 2];
          texel[ACOMP] = table[index * 4 + 3];
-         break;;
+         break;
       default:
          _mesa_problem(ctx, "Bad palette format in fetch_texel_ci8");
          return;
-- 
cgit v1.2.3


From b7cb6650c1603cd9e6f26b32f5e0fae8377d59b8 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 3 Apr 2009 16:51:04 -0600
Subject: mesa: whitespace and comment clean-up

---
 src/mesa/main/texstore.c | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index a94df532c6..c65b9a99d8 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -3940,21 +3940,26 @@ linear_to_nonlinear(GLfloat cl)
 
 #endif /* FEATURE_EXT_texture_sRGB */
 
+
+/**
+ * Can the given type represent negative values?
+ */
 static INLINE GLboolean
 type_with_negative_values(GLenum type)
 {
-    switch (type) {
-    case GL_BYTE:
-    case GL_SHORT:
-    case GL_INT:
-    case GL_FLOAT:
-    case GL_HALF_FLOAT_ARB:
-       return GL_TRUE;
+   switch (type) {
+   case GL_BYTE:
+   case GL_SHORT:
+   case GL_INT:
+   case GL_FLOAT:
+   case GL_HALF_FLOAT_ARB:
+      return GL_TRUE;
    default:
       return GL_FALSE;
-    }
+   }
 }
 
+
 /**
  * This is the software fallback for Driver.GetTexImage().
  * All error checking will have been done before this routine is called.
@@ -4107,9 +4112,9 @@ _mesa_get_teximage(GLcontext *ctx, GLenum target, GLint level,
                GLbitfield transferOps = 0x0;
 
                /* clamp does not apply to GetTexImage (final conversion)?
-                  Looks like we need clamp though when going from format containing
-                  negative values to unsigned format */
-
+                * Looks like we need clamp though when going from format
+                * containing negative values to unsigned format.
+                */
                if (!type_with_negative_values(type) &&
                    (texImage->TexFormat->DataType == GL_FLOAT ||
                    texImage->TexFormat->DataType == GL_SIGNED_NORMALIZED))
-- 
cgit v1.2.3


From 35d88e1ac2cd34d5cc62f521654d79f5b24fcdf8 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 3 Apr 2009 17:10:31 -0600
Subject: mesa: clamp colors to [0,1] for glGetTexImage() when format is
 GL_LUMINANCE

For luminance, we add R+G+B and it seems we should always clamp in case.
---
 src/mesa/main/texstore.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index c65b9a99d8..28e9d5c3ec 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -4115,9 +4115,11 @@ _mesa_get_teximage(GLcontext *ctx, GLenum target, GLint level,
                 * Looks like we need clamp though when going from format
                 * containing negative values to unsigned format.
                 */
-               if (!type_with_negative_values(type) &&
-                   (texImage->TexFormat->DataType == GL_FLOAT ||
-                   texImage->TexFormat->DataType == GL_SIGNED_NORMALIZED))
+               if (format == GL_LUMINANCE || format == GL_LUMINANCE_ALPHA)
+                  transferOps |= IMAGE_CLAMP_BIT;
+               else if (!type_with_negative_values(type) &&
+                        (texImage->TexFormat->DataType == GL_FLOAT ||
+                         texImage->TexFormat->DataType == GL_SIGNED_NORMALIZED))
                   transferOps |= IMAGE_CLAMP_BIT;
 
                for (col = 0; col < width; col++) {
@@ -4144,7 +4146,7 @@ _mesa_get_teximage(GLcontext *ctx, GLenum target, GLint level,
                }
                _mesa_pack_rgba_span_float(ctx, width, (GLfloat (*)[4]) rgba,
                                           format, type, dest,
-                                          &ctx->Pack, transferOps, GL_TRUE);
+                                          &ctx->Pack, transferOps, GL_FALSE);
             } /* format */
          } /* row */
       } /* img */
-- 
cgit v1.2.3


From c7eb423c49ef3e0e071deaab04dad55254f2fa30 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 3 Apr 2009 17:28:35 -0600
Subject: mesa: remove the noClamp parameter to _mesa_pack_rgba_span_float()

It was only set to GL_TRUE in one place where it isn't really needed
(glGetTexImage(sRGB format)).
---
 src/mesa/main/colortab.c                  | 2 +-
 src/mesa/main/convolve.c                  | 6 +++---
 src/mesa/main/histogram.c                 | 2 +-
 src/mesa/main/image.c                     | 9 ++++++---
 src/mesa/main/image.h                     | 2 +-
 src/mesa/main/texstore.c                  | 6 +++---
 src/mesa/state_tracker/st_cb_readpixels.c | 2 +-
 src/mesa/swrast/s_readpix.c               | 4 ++--
 8 files changed, 18 insertions(+), 15 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/colortab.c b/src/mesa/main/colortab.c
index b05c0513aa..bd9cf438b4 100644
--- a/src/mesa/main/colortab.c
+++ b/src/mesa/main/colortab.c
@@ -718,7 +718,7 @@ _mesa_GetColorTable( GLenum target, GLenum format,
    }
 
    _mesa_pack_rgba_span_float(ctx, table->Size, rgba,
-                              format, type, data, &ctx->Pack, 0x0, GL_FALSE);
+                              format, type, data, &ctx->Pack, 0x0);
 
    if (ctx->Pack.BufferObj->Name) {
       ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
diff --git a/src/mesa/main/convolve.c b/src/mesa/main/convolve.c
index 63b652bf70..814c6a0a5a 100644
--- a/src/mesa/main/convolve.c
+++ b/src/mesa/main/convolve.c
@@ -626,7 +626,7 @@ _mesa_GetConvolutionFilter(GLenum target, GLenum format, GLenum type,
                                           row, 0);
       GLfloat (*src)[4] = (GLfloat (*)[4]) (filter->Filter + row * filter->Width * 4);
       _mesa_pack_rgba_span_float(ctx, filter->Width, src,
-                                 format, type, dst, &ctx->Pack, 0x0, GL_FALSE);
+                                 format, type, dst, &ctx->Pack, 0x0);
    }
 
    if (ctx->Pack.BufferObj->Name) {
@@ -836,7 +836,7 @@ _mesa_GetSeparableFilter(GLenum target, GLenum format, GLenum type,
                                           format, type, 0);
       _mesa_pack_rgba_span_float(ctx, filter->Width,
                                  (GLfloat (*)[4]) filter->Filter,
-                                 format, type, dst, &ctx->Pack, 0x0, GL_FALSE);
+                                 format, type, dst, &ctx->Pack, 0x0);
    }
 
    /* Column filter */
@@ -845,7 +845,7 @@ _mesa_GetSeparableFilter(GLenum target, GLenum format, GLenum type,
                                           format, type, 0);
       GLfloat (*src)[4] = (GLfloat (*)[4]) (filter->Filter + colStart);
       _mesa_pack_rgba_span_float(ctx, filter->Height, src,
-                                 format, type, dst, &ctx->Pack, 0x0, GL_FALSE);
+                                 format, type, dst, &ctx->Pack, 0x0);
    }
 
    (void) span;  /* unused at this time */
diff --git a/src/mesa/main/histogram.c b/src/mesa/main/histogram.c
index febf8d99c4..905c1ad830 100644
--- a/src/mesa/main/histogram.c
+++ b/src/mesa/main/histogram.c
@@ -684,7 +684,7 @@ _mesa_GetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvo
       minmax[1][BCOMP] = CLAMP(ctx->MinMax.Max[BCOMP], 0.0F, 1.0F);
       minmax[1][ACOMP] = CLAMP(ctx->MinMax.Max[ACOMP], 0.0F, 1.0F);
       _mesa_pack_rgba_span_float(ctx, 2, minmax,
-                                 format, type, values, &ctx->Pack, 0x0, GL_FALSE);
+                                 format, type, values, &ctx->Pack, 0x0);
    }
 
    if (ctx->Pack.BufferObj->Name) {
diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index 44972ae8e2..5cb110f3a5 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -1677,7 +1677,6 @@ _mesa_apply_stencil_transfer_ops(const GLcontext *ctx, GLuint n,
  * Used to pack an array [][4] of RGBA float colors as specified
  * by the dstFormat, dstType and dstPacking.  Used by glReadPixels,
  * glGetConvolutionFilter(), etc.
- * Incoming colors will be clamped to [0,1] if needed.
  * Note: the rgba values will be modified by this function when any pixel
  * transfer ops are enabled.
  */
@@ -1686,13 +1685,17 @@ _mesa_pack_rgba_span_float(GLcontext *ctx, GLuint n, GLfloat rgba[][4],
                            GLenum dstFormat, GLenum dstType,
                            GLvoid *dstAddr,
                            const struct gl_pixelstore_attrib *dstPacking,
-                           GLbitfield transferOps, GLboolean noClamp)
+                           GLbitfield transferOps)
 {
    GLfloat luminance[MAX_WIDTH];
    const GLint comps = _mesa_components_in_format(dstFormat);
    GLuint i;
 
-   if ((!noClamp) && (dstType != GL_FLOAT || ctx->Color.ClampReadColor == GL_TRUE)) {
+   /* XXX
+    * This test should probably go away.  Have the caller set/clear the
+    * IMAGE_CLAMP_BIT as needed.
+    */
+   if (dstType != GL_FLOAT || ctx->Color.ClampReadColor == GL_TRUE) {
       /* need to clamp to [0, 1] */
       transferOps |= IMAGE_CLAMP_BIT;
    }
diff --git a/src/mesa/main/image.h b/src/mesa/main/image.h
index fb7a5c0e90..b26c27e5a8 100644
--- a/src/mesa/main/image.h
+++ b/src/mesa/main/image.h
@@ -178,7 +178,7 @@ extern void
 _mesa_pack_rgba_span_float( GLcontext *ctx, GLuint n, GLfloat rgba[][4],
                             GLenum dstFormat, GLenum dstType, GLvoid *dstAddr,
                             const struct gl_pixelstore_attrib *dstPacking,
-                            GLbitfield transferOps, GLboolean noClamp );
+                            GLbitfield transferOps );
 
 
 extern void
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index 28e9d5c3ec..bde69b1148 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -417,7 +417,7 @@ make_temp_float_image(GLcontext *ctx, GLuint dims,
                                           (GLfloat (*)[4]) src,
                                           logicalBaseFormat, GL_FLOAT,
                                           dst, &ctx->DefaultPacking,
-                                          postConvTransferOps, GL_FALSE);
+                                          postConvTransferOps);
                src += convWidth * 4;
                dst += convWidth * logComponents;
             }
@@ -4102,7 +4102,7 @@ _mesa_get_teximage(GLcontext *ctx, GLenum target, GLint level,
                }
                _mesa_pack_rgba_span_float(ctx, width, (GLfloat (*)[4]) rgba,
                                           format, type, dest,
-                                          &ctx->Pack, transferOps, GL_TRUE);
+                                          &ctx->Pack, transferOps);
             }
 #endif /* FEATURE_EXT_texture_sRGB */
             else {
@@ -4146,7 +4146,7 @@ _mesa_get_teximage(GLcontext *ctx, GLenum target, GLint level,
                }
                _mesa_pack_rgba_span_float(ctx, width, (GLfloat (*)[4]) rgba,
                                           format, type, dest,
-                                          &ctx->Pack, transferOps, GL_FALSE);
+                                          &ctx->Pack, transferOps);
             } /* format */
          } /* row */
       } /* img */
diff --git a/src/mesa/state_tracker/st_cb_readpixels.c b/src/mesa/state_tracker/st_cb_readpixels.c
index c11973cdb3..ce7a8cda4e 100644
--- a/src/mesa/state_tracker/st_cb_readpixels.c
+++ b/src/mesa/state_tracker/st_cb_readpixels.c
@@ -486,7 +486,7 @@ st_readpixels(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height,
             df += dfStride;
             if (!dfStride) {
                _mesa_pack_rgba_span_float(ctx, width, temp, format, type, dst,
-                                          &clippedPacking, transferOps, GL_FALSE);
+                                          &clippedPacking, transferOps);
                dst += dstStride;
             }
          }
diff --git a/src/mesa/swrast/s_readpix.c b/src/mesa/swrast/s_readpix.c
index 524ac4ee21..e901fc6b5d 100644
--- a/src/mesa/swrast/s_readpix.c
+++ b/src/mesa/swrast/s_readpix.c
@@ -396,7 +396,7 @@ read_rgba_pixels( GLcontext *ctx,
                                       format, type, row, 0);
          _mesa_pack_rgba_span_float(ctx, width, (GLfloat (*)[4]) src,
                                     format, type, dest, packing,
-                                    transferOps & IMAGE_POST_CONVOLUTION_BITS, GL_FALSE);
+                                    transferOps & IMAGE_POST_CONVOLUTION_BITS);
          src += width * 4;
       }
       _mesa_free(convImage);
@@ -441,7 +441,7 @@ read_rgba_pixels( GLcontext *ctx,
 
          /* pack the row of RGBA pixels into user's buffer */
          _mesa_pack_rgba_span_float(ctx, width, rgba, format, type, dst,
-                                    packing, transferOps, GL_FALSE);
+                                    packing, transferOps);
 
          dst += dstStride;
       }
-- 
cgit v1.2.3


From a4bec69e7271eda0137874973aa8c7d44175fedf Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 3 Apr 2009 17:42:22 -0600
Subject: mesa: move glGetTexImage(), glGetCompresssedTexImage() code into new
 file

---
 src/mesa/SConscript                    |   1 +
 src/mesa/drivers/common/driverfuncs.c  |   1 +
 src/mesa/main/sources                  |   1 +
 src/mesa/main/texgetimage.c            | 356 +++++++++++++++++++++++++++++++++
 src/mesa/main/texgetimage.h            |  46 +++++
 src/mesa/main/texstore.c               | 324 +-----------------------------
 src/mesa/main/texstore.h               |  13 --
 src/mesa/sources.mak                   |   1 +
 src/mesa/state_tracker/st_cb_texture.c |   1 +
 9 files changed, 409 insertions(+), 335 deletions(-)
 create mode 100644 src/mesa/main/texgetimage.c
 create mode 100644 src/mesa/main/texgetimage.h

(limited to 'src/mesa/main')

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index d1b9e93c0c..9ffc15eeb7 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -91,6 +91,7 @@ if env['platform'] != 'winddk':
 		'main/texenvprogram.c',
 		'main/texformat.c',
 		'main/texgen.c',
+		'main/texgetimage.c',
 		'main/teximage.c',
 		'main/texobj.c',
 		'main/texparam.c',
diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c
index 44adaf8682..276da41f4e 100644
--- a/src/mesa/drivers/common/driverfuncs.c
+++ b/src/mesa/drivers/common/driverfuncs.c
@@ -34,6 +34,7 @@
 #include "main/renderbuffer.h"
 #include "main/texcompress.h"
 #include "main/texformat.h"
+#include "main/texgetimage.h"
 #include "main/teximage.h"
 #include "main/texobj.h"
 #include "main/texstore.h"
diff --git a/src/mesa/main/sources b/src/mesa/main/sources
index 4e58702c74..5d9d99040e 100644
--- a/src/mesa/main/sources
+++ b/src/mesa/main/sources
@@ -63,6 +63,7 @@ texenv.c \
 texenvprogram.c \
 texformat.c \
 texgen.c \
+texgetimage.c \
 teximage.c \
 texobj.c \
 texparam.c \
diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c
new file mode 100644
index 0000000000..70a25080cb
--- /dev/null
+++ b/src/mesa/main/texgetimage.c
@@ -0,0 +1,356 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.5
+ *
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ * Copyright (c) 2009 VMware, Inc.
+ *
+ * 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.
+ */
+
+
+/**
+ * Code for glGetTexImage() and glGetCompressedTexImage().
+ */
+
+
+#include "glheader.h"
+#include "context.h"
+#include "image.h"
+#include "texcompress.h"
+#include "texformat.h"
+#include "texgetimage.h"
+
+
+
+#if FEATURE_EXT_texture_sRGB
+
+/**
+ * Test if given texture image is an sRGB format.
+ */
+static GLboolean
+is_srgb_teximage(const struct gl_texture_image *texImage)
+{
+   switch (texImage->TexFormat->MesaFormat) {
+   case MESA_FORMAT_SRGB8:
+   case MESA_FORMAT_SRGBA8:
+   case MESA_FORMAT_SARGB8:
+   case MESA_FORMAT_SL8:
+   case MESA_FORMAT_SLA8:
+   case MESA_FORMAT_SRGB_DXT1:
+   case MESA_FORMAT_SRGBA_DXT1:
+   case MESA_FORMAT_SRGBA_DXT3:
+   case MESA_FORMAT_SRGBA_DXT5:
+      return GL_TRUE;
+   default:
+      return GL_FALSE;
+   }
+}
+
+
+/**
+ * Convert a float value from linear space to a
+ * non-linear sRGB value in [0, 255].
+ * Not terribly efficient.
+ */
+static INLINE GLfloat
+linear_to_nonlinear(GLfloat cl)
+{
+   /* can't have values outside [0, 1] */
+   GLfloat cs;
+   if (cl < 0.0031308) {
+      cs = 12.92 * cl;
+   }
+   else {
+      cs = 1.055 * _mesa_pow(cl, 0.41666) - 0.055;
+   }
+   return cs;
+}
+
+#endif /* FEATURE_EXT_texture_sRGB */
+
+
+/**
+ * Can the given type represent negative values?
+ */
+static INLINE GLboolean
+type_with_negative_values(GLenum type)
+{
+   switch (type) {
+   case GL_BYTE:
+   case GL_SHORT:
+   case GL_INT:
+   case GL_FLOAT:
+   case GL_HALF_FLOAT_ARB:
+      return GL_TRUE;
+   default:
+      return GL_FALSE;
+   }
+}
+
+
+/**
+ * This is the software fallback for Driver.GetTexImage().
+ * All error checking will have been done before this routine is called.
+ */
+void
+_mesa_get_teximage(GLcontext *ctx, GLenum target, GLint level,
+                   GLenum format, GLenum type, GLvoid *pixels,
+                   struct gl_texture_object *texObj,
+                   struct gl_texture_image *texImage)
+{
+   const GLuint dimensions = (target == GL_TEXTURE_3D) ? 3 : 2;
+
+   if (ctx->Pack.BufferObj->Name) {
+      /* Packing texture image into a PBO.
+       * Map the (potentially) VRAM-based buffer into our process space so
+       * we can write into it with the code below.
+       * A hardware driver might use a sophisticated blit to move the
+       * texture data to the PBO if the PBO is in VRAM along with the texture.
+       */
+      GLubyte *buf = (GLubyte *)
+         ctx->Driver.MapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
+                               GL_WRITE_ONLY_ARB, ctx->Pack.BufferObj);
+      if (!buf) {
+         /* buffer is already mapped - that's an error */
+         _mesa_error(ctx, GL_INVALID_OPERATION,"glGetTexImage(PBO is mapped)");
+         return;
+      }
+      /* <pixels> was an offset into the PBO.
+       * Now make it a real, client-side pointer inside the mapped region.
+       */
+      pixels = ADD_POINTERS(buf, pixels);
+   }
+   else if (!pixels) {
+      /* not an error */
+      return;
+   }
+
+   {
+      const GLint width = texImage->Width;
+      const GLint height = texImage->Height;
+      const GLint depth = texImage->Depth;
+      GLint img, row;
+      for (img = 0; img < depth; img++) {
+         for (row = 0; row < height; row++) {
+            /* compute destination address in client memory */
+            GLvoid *dest = _mesa_image_address( dimensions, &ctx->Pack, pixels,
+                                                width, height, format, type,
+                                                img, row, 0);
+            assert(dest);
+
+            if (format == GL_COLOR_INDEX) {
+               GLuint indexRow[MAX_WIDTH];
+               GLint col;
+               /* Can't use FetchTexel here because that returns RGBA */
+               if (texImage->TexFormat->IndexBits == 8) {
+                  const GLubyte *src = (const GLubyte *) texImage->Data;
+                  src += width * (img * texImage->Height + row);
+                  for (col = 0; col < width; col++) {
+                     indexRow[col] = src[col];
+                  }
+               }
+               else if (texImage->TexFormat->IndexBits == 16) {
+                  const GLushort *src = (const GLushort *) texImage->Data;
+                  src += width * (img * texImage->Height + row);
+                  for (col = 0; col < width; col++) {
+                     indexRow[col] = src[col];
+                  }
+               }
+               else {
+                  _mesa_problem(ctx,
+                                "Color index problem in _mesa_GetTexImage");
+               }
+               _mesa_pack_index_span(ctx, width, type, dest,
+                                     indexRow, &ctx->Pack,
+                                     0 /* no image transfer */);
+            }
+            else if (format == GL_DEPTH_COMPONENT) {
+               GLfloat depthRow[MAX_WIDTH];
+               GLint col;
+               for (col = 0; col < width; col++) {
+                  (*texImage->FetchTexelf)(texImage, col, row, img,
+                                           depthRow + col);
+               }
+               _mesa_pack_depth_span(ctx, width, dest, type,
+                                     depthRow, &ctx->Pack);
+            }
+            else if (format == GL_DEPTH_STENCIL_EXT) {
+               /* XXX Note: we're bypassing texImage->FetchTexel()! */
+               const GLuint *src = (const GLuint *) texImage->Data;
+               src += width * row + width * height * img;
+               _mesa_memcpy(dest, src, width * sizeof(GLuint));
+               if (ctx->Pack.SwapBytes) {
+                  _mesa_swap4((GLuint *) dest, width);
+               }
+            }
+            else if (format == GL_YCBCR_MESA) {
+               /* No pixel transfer */
+               const GLint rowstride = texImage->RowStride;
+               MEMCPY(dest,
+                      (const GLushort *) texImage->Data + row * rowstride,
+                      width * sizeof(GLushort));
+               /* check for byte swapping */
+               if ((texImage->TexFormat->MesaFormat == MESA_FORMAT_YCBCR
+                    && type == GL_UNSIGNED_SHORT_8_8_REV_MESA) ||
+                   (texImage->TexFormat->MesaFormat == MESA_FORMAT_YCBCR_REV
+                    && type == GL_UNSIGNED_SHORT_8_8_MESA)) {
+                  if (!ctx->Pack.SwapBytes)
+                     _mesa_swap2((GLushort *) dest, width);
+               }
+               else if (ctx->Pack.SwapBytes) {
+                  _mesa_swap2((GLushort *) dest, width);
+               }
+            }
+#if FEATURE_EXT_texture_sRGB
+            else if (is_srgb_teximage(texImage)) {
+               /* special case this since need to backconvert values */
+               /* convert row to RGBA format */
+               GLfloat rgba[MAX_WIDTH][4];
+               GLint col;
+               GLbitfield transferOps = 0x0;
+
+               for (col = 0; col < width; col++) {
+                  (*texImage->FetchTexelf)(texImage, col, row, img, rgba[col]);
+                  if (texImage->_BaseFormat == GL_LUMINANCE) {
+                     rgba[col][RCOMP] = linear_to_nonlinear(rgba[col][RCOMP]);
+                     rgba[col][GCOMP] = 0.0;
+                     rgba[col][BCOMP] = 0.0;
+                  }
+                  else if (texImage->_BaseFormat == GL_LUMINANCE_ALPHA) {
+                     rgba[col][RCOMP] = linear_to_nonlinear(rgba[col][RCOMP]);
+                     rgba[col][GCOMP] = 0.0;
+                     rgba[col][BCOMP] = 0.0;
+                  }
+                  else if (texImage->_BaseFormat == GL_RGB ||
+                     texImage->_BaseFormat == GL_RGBA) {
+                     rgba[col][RCOMP] = linear_to_nonlinear(rgba[col][RCOMP]);
+                     rgba[col][GCOMP] = linear_to_nonlinear(rgba[col][GCOMP]);
+                     rgba[col][BCOMP] = linear_to_nonlinear(rgba[col][BCOMP]);
+                  }
+               }
+               _mesa_pack_rgba_span_float(ctx, width, (GLfloat (*)[4]) rgba,
+                                          format, type, dest,
+                                          &ctx->Pack, transferOps);
+            }
+#endif /* FEATURE_EXT_texture_sRGB */
+            else {
+               /* general case:  convert row to RGBA format */
+               GLfloat rgba[MAX_WIDTH][4];
+               GLint col;
+               GLbitfield transferOps = 0x0;
+
+               /* clamp does not apply to GetTexImage (final conversion)?
+                * Looks like we need clamp though when going from format
+                * containing negative values to unsigned format.
+                */
+               if (format == GL_LUMINANCE || format == GL_LUMINANCE_ALPHA)
+                  transferOps |= IMAGE_CLAMP_BIT;
+               else if (!type_with_negative_values(type) &&
+                        (texImage->TexFormat->DataType == GL_FLOAT ||
+                         texImage->TexFormat->DataType == GL_SIGNED_NORMALIZED))
+                  transferOps |= IMAGE_CLAMP_BIT;
+
+               for (col = 0; col < width; col++) {
+                  (*texImage->FetchTexelf)(texImage, col, row, img, rgba[col]);
+                  if (texImage->_BaseFormat == GL_ALPHA) {
+                     rgba[col][RCOMP] = 0.0;
+                     rgba[col][GCOMP] = 0.0;
+                     rgba[col][BCOMP] = 0.0;
+                  }
+                  else if (texImage->_BaseFormat == GL_LUMINANCE) {
+                     rgba[col][GCOMP] = 0.0;
+                     rgba[col][BCOMP] = 0.0;
+                     rgba[col][ACOMP] = 1.0;
+                  }
+                  else if (texImage->_BaseFormat == GL_LUMINANCE_ALPHA) {
+                     rgba[col][GCOMP] = 0.0;
+                     rgba[col][BCOMP] = 0.0;
+                  }
+                  else if (texImage->_BaseFormat == GL_INTENSITY) {
+                     rgba[col][GCOMP] = 0.0;
+                     rgba[col][BCOMP] = 0.0;
+                     rgba[col][ACOMP] = 1.0;
+                  }
+               }
+               _mesa_pack_rgba_span_float(ctx, width, (GLfloat (*)[4]) rgba,
+                                          format, type, dest,
+                                          &ctx->Pack, transferOps);
+            } /* format */
+         } /* row */
+      } /* img */
+   }
+
+   if (ctx->Pack.BufferObj->Name) {
+      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
+                              ctx->Pack.BufferObj);
+   }
+}
+
+
+
+/**
+ * This is the software fallback for Driver.GetCompressedTexImage().
+ * All error checking will have been done before this routine is called.
+ */
+void
+_mesa_get_compressed_teximage(GLcontext *ctx, GLenum target, GLint level,
+                              GLvoid *img,
+                              struct gl_texture_object *texObj,
+                              struct gl_texture_image *texImage)
+{
+   GLuint size;
+
+   if (ctx->Pack.BufferObj->Name) {
+      /* pack texture image into a PBO */
+      GLubyte *buf;
+      if ((const GLubyte *) img + texImage->CompressedSize >
+          (const GLubyte *) ctx->Pack.BufferObj->Size) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glGetCompressedTexImage(invalid PBO access)");
+         return;
+      }
+      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
+                                              GL_WRITE_ONLY_ARB,
+                                              ctx->Pack.BufferObj);
+      if (!buf) {
+         /* buffer is already mapped - that's an error */
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glGetCompressedTexImage(PBO is mapped)");
+         return;
+      }
+      img = ADD_POINTERS(buf, img);
+   }
+   else if (!img) {
+      /* not an error */
+      return;
+   }
+
+   /* don't use texImage->CompressedSize since that may be padded out */
+   size = _mesa_compressed_texture_size(ctx, texImage->Width, texImage->Height,
+                                        texImage->Depth,
+                                        texImage->TexFormat->MesaFormat);
+
+   /* just memcpy, no pixelstore or pixel transfer */
+   _mesa_memcpy(img, texImage->Data, size);
+
+   if (ctx->Pack.BufferObj->Name) {
+      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
+                              ctx->Pack.BufferObj);
+   }
+}
diff --git a/src/mesa/main/texgetimage.h b/src/mesa/main/texgetimage.h
new file mode 100644
index 0000000000..01f486e8f0
--- /dev/null
+++ b/src/mesa/main/texgetimage.h
@@ -0,0 +1,46 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.5
+ *
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ * Copyright (c) 2009 VMware, Inc.
+ *
+ * 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 TEXGETIMAGE_H
+#define TEXGETIMAGE_H
+
+
+extern void
+_mesa_get_teximage(GLcontext *ctx, GLenum target, GLint level,
+                   GLenum format, GLenum type, GLvoid *pixels,
+                   struct gl_texture_object *texObj,
+                   struct gl_texture_image *texImage);
+
+
+extern void
+_mesa_get_compressed_teximage(GLcontext *ctx, GLenum target, GLint level,
+                              GLvoid *img,
+                              struct gl_texture_object *texObj,
+                              struct gl_texture_image *texImage);
+
+
+
+#endif /* TEXGETIMAGE_H */
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index bde69b1148..f3739f950b 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -1,9 +1,9 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.3
+ * Version:  7.5
  *
  * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
- * Copyright (c) 2008 VMware, Inc.
+ * Copyright (c) 2008-2009  VMware, Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -3890,323 +3890,3 @@ _mesa_store_compressed_texsubimage3d(GLcontext *ctx, GLenum target,
    (void) texObj;
    (void) texImage;
 }
-
-
-
-
-#if FEATURE_EXT_texture_sRGB
-
-/**
- * Test if given texture image is an sRGB format.
- */
-static GLboolean
-is_srgb_teximage(const struct gl_texture_image *texImage)
-{
-   switch (texImage->TexFormat->MesaFormat) {
-   case MESA_FORMAT_SRGB8:
-   case MESA_FORMAT_SRGBA8:
-   case MESA_FORMAT_SARGB8:
-   case MESA_FORMAT_SL8:
-   case MESA_FORMAT_SLA8:
-   case MESA_FORMAT_SRGB_DXT1:
-   case MESA_FORMAT_SRGBA_DXT1:
-   case MESA_FORMAT_SRGBA_DXT3:
-   case MESA_FORMAT_SRGBA_DXT5:
-      return GL_TRUE;
-   default:
-      return GL_FALSE;
-   }
-}
-
-
-/**
- * Convert a float value from linear space to a
- * non-linear sRGB value in [0, 255].
- * Not terribly efficient.
- */
-static INLINE GLfloat
-linear_to_nonlinear(GLfloat cl)
-{
-   /* can't have values outside [0, 1] */
-   GLfloat cs;
-   if (cl < 0.0031308) {
-      cs = 12.92 * cl;
-   }
-   else {
-      cs = 1.055 * _mesa_pow(cl, 0.41666) - 0.055;
-   }
-   return cs;
-}
-
-#endif /* FEATURE_EXT_texture_sRGB */
-
-
-/**
- * Can the given type represent negative values?
- */
-static INLINE GLboolean
-type_with_negative_values(GLenum type)
-{
-   switch (type) {
-   case GL_BYTE:
-   case GL_SHORT:
-   case GL_INT:
-   case GL_FLOAT:
-   case GL_HALF_FLOAT_ARB:
-      return GL_TRUE;
-   default:
-      return GL_FALSE;
-   }
-}
-
-
-/**
- * This is the software fallback for Driver.GetTexImage().
- * All error checking will have been done before this routine is called.
- */
-void
-_mesa_get_teximage(GLcontext *ctx, GLenum target, GLint level,
-                   GLenum format, GLenum type, GLvoid *pixels,
-                   struct gl_texture_object *texObj,
-                   struct gl_texture_image *texImage)
-{
-   const GLuint dimensions = (target == GL_TEXTURE_3D) ? 3 : 2;
-
-   if (ctx->Pack.BufferObj->Name) {
-      /* Packing texture image into a PBO.
-       * Map the (potentially) VRAM-based buffer into our process space so
-       * we can write into it with the code below.
-       * A hardware driver might use a sophisticated blit to move the
-       * texture data to the PBO if the PBO is in VRAM along with the texture.
-       */
-      GLubyte *buf = (GLubyte *)
-         ctx->Driver.MapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                               GL_WRITE_ONLY_ARB, ctx->Pack.BufferObj);
-      if (!buf) {
-         /* buffer is already mapped - that's an error */
-         _mesa_error(ctx, GL_INVALID_OPERATION,"glGetTexImage(PBO is mapped)");
-         return;
-      }
-      /* <pixels> was an offset into the PBO.
-       * Now make it a real, client-side pointer inside the mapped region.
-       */
-      pixels = ADD_POINTERS(buf, pixels);
-   }
-   else if (!pixels) {
-      /* not an error */
-      return;
-   }
-
-   {
-      const GLint width = texImage->Width;
-      const GLint height = texImage->Height;
-      const GLint depth = texImage->Depth;
-      GLint img, row;
-      for (img = 0; img < depth; img++) {
-         for (row = 0; row < height; row++) {
-            /* compute destination address in client memory */
-            GLvoid *dest = _mesa_image_address( dimensions, &ctx->Pack, pixels,
-                                                width, height, format, type,
-                                                img, row, 0);
-            assert(dest);
-
-            if (format == GL_COLOR_INDEX) {
-               GLuint indexRow[MAX_WIDTH];
-               GLint col;
-               /* Can't use FetchTexel here because that returns RGBA */
-               if (texImage->TexFormat->IndexBits == 8) {
-                  const GLubyte *src = (const GLubyte *) texImage->Data;
-                  src += width * (img * texImage->Height + row);
-                  for (col = 0; col < width; col++) {
-                     indexRow[col] = src[col];
-                  }
-               }
-               else if (texImage->TexFormat->IndexBits == 16) {
-                  const GLushort *src = (const GLushort *) texImage->Data;
-                  src += width * (img * texImage->Height + row);
-                  for (col = 0; col < width; col++) {
-                     indexRow[col] = src[col];
-                  }
-               }
-               else {
-                  _mesa_problem(ctx,
-                                "Color index problem in _mesa_GetTexImage");
-               }
-               _mesa_pack_index_span(ctx, width, type, dest,
-                                     indexRow, &ctx->Pack,
-                                     0 /* no image transfer */);
-            }
-            else if (format == GL_DEPTH_COMPONENT) {
-               GLfloat depthRow[MAX_WIDTH];
-               GLint col;
-               for (col = 0; col < width; col++) {
-                  (*texImage->FetchTexelf)(texImage, col, row, img,
-                                           depthRow + col);
-               }
-               _mesa_pack_depth_span(ctx, width, dest, type,
-                                     depthRow, &ctx->Pack);
-            }
-            else if (format == GL_DEPTH_STENCIL_EXT) {
-               /* XXX Note: we're bypassing texImage->FetchTexel()! */
-               const GLuint *src = (const GLuint *) texImage->Data;
-               src += width * row + width * height * img;
-               _mesa_memcpy(dest, src, width * sizeof(GLuint));
-               if (ctx->Pack.SwapBytes) {
-                  _mesa_swap4((GLuint *) dest, width);
-               }
-            }
-            else if (format == GL_YCBCR_MESA) {
-               /* No pixel transfer */
-               const GLint rowstride = texImage->RowStride;
-               MEMCPY(dest,
-                      (const GLushort *) texImage->Data + row * rowstride,
-                      width * sizeof(GLushort));
-               /* check for byte swapping */
-               if ((texImage->TexFormat->MesaFormat == MESA_FORMAT_YCBCR
-                    && type == GL_UNSIGNED_SHORT_8_8_REV_MESA) ||
-                   (texImage->TexFormat->MesaFormat == MESA_FORMAT_YCBCR_REV
-                    && type == GL_UNSIGNED_SHORT_8_8_MESA)) {
-                  if (!ctx->Pack.SwapBytes)
-                     _mesa_swap2((GLushort *) dest, width);
-               }
-               else if (ctx->Pack.SwapBytes) {
-                  _mesa_swap2((GLushort *) dest, width);
-               }
-            }
-#if FEATURE_EXT_texture_sRGB
-            else if (is_srgb_teximage(texImage)) {
-               /* special case this since need to backconvert values */
-               /* convert row to RGBA format */
-               GLfloat rgba[MAX_WIDTH][4];
-               GLint col;
-               GLbitfield transferOps = 0x0;
-
-               for (col = 0; col < width; col++) {
-                  (*texImage->FetchTexelf)(texImage, col, row, img, rgba[col]);
-                  if (texImage->_BaseFormat == GL_LUMINANCE) {
-                     rgba[col][RCOMP] = linear_to_nonlinear(rgba[col][RCOMP]);
-                     rgba[col][GCOMP] = 0.0;
-                     rgba[col][BCOMP] = 0.0;
-                  }
-                  else if (texImage->_BaseFormat == GL_LUMINANCE_ALPHA) {
-                     rgba[col][RCOMP] = linear_to_nonlinear(rgba[col][RCOMP]);
-                     rgba[col][GCOMP] = 0.0;
-                     rgba[col][BCOMP] = 0.0;
-                  }
-                  else if (texImage->_BaseFormat == GL_RGB ||
-                     texImage->_BaseFormat == GL_RGBA) {
-                     rgba[col][RCOMP] = linear_to_nonlinear(rgba[col][RCOMP]);
-                     rgba[col][GCOMP] = linear_to_nonlinear(rgba[col][GCOMP]);
-                     rgba[col][BCOMP] = linear_to_nonlinear(rgba[col][BCOMP]);
-                  }
-               }
-               _mesa_pack_rgba_span_float(ctx, width, (GLfloat (*)[4]) rgba,
-                                          format, type, dest,
-                                          &ctx->Pack, transferOps);
-            }
-#endif /* FEATURE_EXT_texture_sRGB */
-            else {
-               /* general case:  convert row to RGBA format */
-               GLfloat rgba[MAX_WIDTH][4];
-               GLint col;
-               GLbitfield transferOps = 0x0;
-
-               /* clamp does not apply to GetTexImage (final conversion)?
-                * Looks like we need clamp though when going from format
-                * containing negative values to unsigned format.
-                */
-               if (format == GL_LUMINANCE || format == GL_LUMINANCE_ALPHA)
-                  transferOps |= IMAGE_CLAMP_BIT;
-               else if (!type_with_negative_values(type) &&
-                        (texImage->TexFormat->DataType == GL_FLOAT ||
-                         texImage->TexFormat->DataType == GL_SIGNED_NORMALIZED))
-                  transferOps |= IMAGE_CLAMP_BIT;
-
-               for (col = 0; col < width; col++) {
-                  (*texImage->FetchTexelf)(texImage, col, row, img, rgba[col]);
-                  if (texImage->_BaseFormat == GL_ALPHA) {
-                     rgba[col][RCOMP] = 0.0;
-                     rgba[col][GCOMP] = 0.0;
-                     rgba[col][BCOMP] = 0.0;
-                  }
-                  else if (texImage->_BaseFormat == GL_LUMINANCE) {
-                     rgba[col][GCOMP] = 0.0;
-                     rgba[col][BCOMP] = 0.0;
-                     rgba[col][ACOMP] = 1.0;
-                  }
-                  else if (texImage->_BaseFormat == GL_LUMINANCE_ALPHA) {
-                     rgba[col][GCOMP] = 0.0;
-                     rgba[col][BCOMP] = 0.0;
-                  }
-                  else if (texImage->_BaseFormat == GL_INTENSITY) {
-                     rgba[col][GCOMP] = 0.0;
-                     rgba[col][BCOMP] = 0.0;
-                     rgba[col][ACOMP] = 1.0;
-                  }
-               }
-               _mesa_pack_rgba_span_float(ctx, width, (GLfloat (*)[4]) rgba,
-                                          format, type, dest,
-                                          &ctx->Pack, transferOps);
-            } /* format */
-         } /* row */
-      } /* img */
-   }
-
-   if (ctx->Pack.BufferObj->Name) {
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                              ctx->Pack.BufferObj);
-   }
-}
-
-
-
-/**
- * This is the software fallback for Driver.GetCompressedTexImage().
- * All error checking will have been done before this routine is called.
- */
-void
-_mesa_get_compressed_teximage(GLcontext *ctx, GLenum target, GLint level,
-                              GLvoid *img,
-                              struct gl_texture_object *texObj,
-                              struct gl_texture_image *texImage)
-{
-   GLuint size;
-
-   if (ctx->Pack.BufferObj->Name) {
-      /* pack texture image into a PBO */
-      GLubyte *buf;
-      if ((const GLubyte *) img + texImage->CompressedSize >
-          (const GLubyte *) ctx->Pack.BufferObj->Size) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetCompressedTexImage(invalid PBO access)");
-         return;
-      }
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                                              GL_WRITE_ONLY_ARB,
-                                              ctx->Pack.BufferObj);
-      if (!buf) {
-         /* buffer is already mapped - that's an error */
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetCompressedTexImage(PBO is mapped)");
-         return;
-      }
-      img = ADD_POINTERS(buf, img);
-   }
-   else if (!img) {
-      /* not an error */
-      return;
-   }
-
-   /* don't use texImage->CompressedSize since that may be padded out */
-   size = _mesa_compressed_texture_size(ctx, texImage->Width, texImage->Height,
-                                        texImage->Depth,
-                                        texImage->TexFormat->MesaFormat);
-
-   /* just memcpy, no pixelstore or pixel transfer */
-   _mesa_memcpy(img, texImage->Data, size);
-
-   if (ctx->Pack.BufferObj->Name) {
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                              ctx->Pack.BufferObj);
-   }
-}
diff --git a/src/mesa/main/texstore.h b/src/mesa/main/texstore.h
index 91cb64f377..313f2d6a59 100644
--- a/src/mesa/main/texstore.h
+++ b/src/mesa/main/texstore.h
@@ -210,19 +210,6 @@ _mesa_store_compressed_texsubimage3d(GLcontext *ctx, GLenum target,
                                 struct gl_texture_image *texImage);
 
 
-extern void
-_mesa_get_teximage(GLcontext *ctx, GLenum target, GLint level,
-                   GLenum format, GLenum type, GLvoid *pixels,
-                   struct gl_texture_object *texObj,
-                   struct gl_texture_image *texImage);
-
-
-extern void
-_mesa_get_compressed_teximage(GLcontext *ctx, GLenum target, GLint level,
-                              GLvoid *img,
-                              struct gl_texture_object *texObj,
-                              struct gl_texture_image *texImage);
-
 extern const GLvoid *
 _mesa_validate_pbo_teximage(GLcontext *ctx, GLuint dimensions,
 			    GLsizei width, GLsizei height, GLsizei depth,
diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 6913d9f40f..78ca60f3ca 100644
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -68,6 +68,7 @@ MAIN_SOURCES = \
 	main/texenvprogram.c \
 	main/texformat.c \
 	main/texgen.c \
+	main/texgetimage.c \
 	main/teximage.c \
 	main/texobj.c \
 	main/texparam.c \
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index d353241a7e..4d8adcd9cd 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -37,6 +37,7 @@
 #include "main/pixel.h"
 #include "main/texcompress.h"
 #include "main/texformat.h"
+#include "main/texgetimage.h"
 #include "main/teximage.h"
 #include "main/texobj.h"
 #include "main/texstore.h"
-- 
cgit v1.2.3


From d03053688f7370064ded6dfc4912841eae39a4a9 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 7 Apr 2009 13:17:42 -0600
Subject: mesa: fix incorrect component ordering for sRGB8 texture fetch/store

This format is layered on MESA_FORMAT_RGB888 so the component order is
actually BGR.
Fixes glean pixelFormat failures.
---
 src/mesa/main/texformat_tmp.h | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texformat_tmp.h b/src/mesa/main/texformat_tmp.h
index ef5bb34db6..f3b2fb9c9c 100644
--- a/src/mesa/main/texformat_tmp.h
+++ b/src/mesa/main/texformat_tmp.h
@@ -1164,14 +1164,15 @@ static void store_texel_ci8(struct gl_texture_image *texImage,
 #if FEATURE_EXT_texture_sRGB
 
 /* Fetch texel from 1D, 2D or 3D srgb8 texture, return 4 GLfloats */
+/* Note: component order is same as for MESA_FORMAT_RGB888 */
 static void FETCH(srgb8)(const struct gl_texture_image *texImage,
                          GLint i, GLint j, GLint k, GLfloat *texel )
 {
    const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 3);
-   texel[RCOMP] = nonlinear_to_linear(src[0]);
+   texel[RCOMP] = nonlinear_to_linear(src[2]);
    texel[GCOMP] = nonlinear_to_linear(src[1]);
-   texel[BCOMP] = nonlinear_to_linear(src[2]);
-   texel[ACOMP] = CHAN_MAX;
+   texel[BCOMP] = nonlinear_to_linear(src[0]);
+   texel[ACOMP] = 1.0F;
 }
 
 #if DIM == 3
@@ -1180,9 +1181,9 @@ static void store_texel_srgb8(struct gl_texture_image *texImage,
 {
    const GLubyte *rgba = (const GLubyte *) texel;
    GLubyte *dst = TEXEL_ADDR(GLubyte, texImage, i, j, k, 3);
-   dst[0] = rgba[RCOMP]; /* no conversion */
+   dst[0] = rgba[BCOMP]; /* no conversion */
    dst[1] = rgba[GCOMP];
-   dst[2] = rgba[BCOMP];
+   dst[2] = rgba[RCOMP];
 }
 #endif
 
-- 
cgit v1.2.3


From ac1ff1b9fe19077e53ff4cd14a1b083232c8bf72 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 7 Apr 2009 17:31:14 -0600
Subject: mesa: add another special/optimized case in _mesa_unpack_depth_span()

---
 src/mesa/main/image.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index 5cb110f3a5..ddae456fa1 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -4546,6 +4546,17 @@ _mesa_unpack_depth_span( const GLcontext *ctx, GLuint n,
          }
          return;
       }
+      if (srcType == GL_UNSIGNED_INT_24_8
+          && dstType == GL_UNSIGNED_INT
+          && depthMax == 0xffffff) {
+         const GLuint *src = (const GLuint *) source;
+         GLuint *dst = (GLuint *) dest;
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            dst[i] = src[i] >> 8;
+         }
+         return;
+      }
       /* XXX may want to add additional cases here someday */
    }
 
-- 
cgit v1.2.3


From 629700ed7eaaf63d2037a11b2931c91fdc22944a Mon Sep 17 00:00:00 2001
From: José Fonseca <jfonseca@vmware.com>
Date: Wed, 8 Apr 2009 11:32:43 +0100
Subject: mesa: Don't attempt to free the dummy program.

---
 src/mesa/main/shared.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/shared.c b/src/mesa/main/shared.c
index fa45e466b7..193ac8970c 100644
--- a/src/mesa/main/shared.c
+++ b/src/mesa/main/shared.c
@@ -159,9 +159,11 @@ delete_program_cb(GLuint id, void *data, void *userData)
 {
    struct gl_program *prog = (struct gl_program *) data;
    GLcontext *ctx = (GLcontext *) userData;
-   ASSERT(prog->RefCount == 1); /* should only be referenced by hash table */
-   prog->RefCount = 0;  /* now going away */
-   ctx->Driver.DeleteProgram(ctx, prog);
+   if(prog != &_mesa_DummyProgram) {
+      ASSERT(prog->RefCount == 1); /* should only be referenced by hash table */
+      prog->RefCount = 0;  /* now going away */
+      ctx->Driver.DeleteProgram(ctx, prog);
+   }
 }
 
 
-- 
cgit v1.2.3


From 23ad86cfb91c294ce85a3116d4b825aaa3988a6e Mon Sep 17 00:00:00 2001
From: Robert Ellison <papillo@vmware.com>
Date: Wed, 8 Apr 2009 10:58:33 -0600
Subject: Mesa: allow suppression of debug messages in a debug build

For testing, it's very useful to be able to test on a debug build,
while suppressing the debug messages (messages that are by default
suppressed in a release build), in order to see the same behavior
that users of release builds will see.

For example, the "piglit" test suite will flag an error on
programs that produce unexpected output, which means that a
debug build will always fail due to the extra debug messages.

This change introduces a new value to the MESA_DEBUG
environment variable.  In a debug build, explicitly setting MESA_DEBUG
to "0" will suppress all debug messages (both from _mesa_debug() and
from _mesa_warning()).  (The former behavior was that debug
messages were never suppressed in debug builds.)

Behavior of non-debug builds has not changed.  In such a build,
_mesa_debug() messages are always suppressed, and _mesa_warning()
messages will be suppressed unless MESA_DEBUG is set *to any value*.
---
 src/mesa/main/imports.c | 42 ++++++++++++++++++++++++++++++++----------
 1 file changed, 32 insertions(+), 10 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 20b8342064..2ac93a5237 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -979,6 +979,35 @@ _mesa_vsprintf( char *str, const char *fmt, va_list args )
 /** \name Diagnostics */
 /*@{*/
 
+static void
+output_if_debug(const char *prefixString, const char *outputString)
+{
+   static int debug = -1;
+
+   /* Check the MESA_DEBUG environment variable if it hasn't
+    * been checked yet.  We only have to check it once...
+    */
+   if (debug == -1) {
+      char *env = _mesa_getenv("MESA_DEBUG");
+
+      /* In a debug build, we print warning messages *unless*
+       * MESA_DEBUG is 0.  In a non-debug build, we don't
+       * print warning messages *unless* MESA_DEBUG is
+       * set *to any value*.
+       */
+#ifdef DEBUG
+      debug = (env != NULL && _mesa_atoi(env) == 0) ? 0 : 1;
+#else
+      debug = (env != NULL) ? 1 : 0;
+#endif
+   }
+
+   /* Now only print the string if we're required to do so. */
+   if (debug) {
+      fprintf(stderr, "%s: %s\n", prefixString, outputString);
+   }
+}
+
 /**
  * Report a warning (a recoverable error condition) to stderr if
  * either DEBUG is defined or the MESA_DEBUG env var is set.
@@ -989,21 +1018,14 @@ _mesa_vsprintf( char *str, const char *fmt, va_list args )
 void
 _mesa_warning( GLcontext *ctx, const char *fmtString, ... )
 {
-   GLboolean debug;
    char str[MAXSTRING];
    va_list args;
    (void) ctx;
    va_start( args, fmtString );  
    (void) vsnprintf( str, MAXSTRING, fmtString, args );
    va_end( args );
-#ifdef DEBUG
-   debug = GL_TRUE; /* always print warning */
-#else
-   debug = _mesa_getenv("MESA_DEBUG") ? GL_TRUE : GL_FALSE;
-#endif
-   if (debug) {
-      fprintf(stderr, "Mesa warning: %s\n", str);
-   }
+
+   output_if_debug("Mesa warning", str);
 }
 
 /**
@@ -1123,7 +1145,7 @@ _mesa_debug( const GLcontext *ctx, const char *fmtString, ... )
    va_start(args, fmtString);
    vsnprintf(s, MAXSTRING, fmtString, args);
    va_end(args);
-   fprintf(stderr, "Mesa: %s", s);
+   output_if_debug("Mesa", s);
 #endif /* DEBUG */
    (void) ctx;
    (void) fmtString;
-- 
cgit v1.2.3


From b3c1c5cf2c5848d794a5690c7296b9b927412353 Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@vmware.com>
Date: Thu, 9 Apr 2009 00:12:17 +0200
Subject: mesa: Report name for missing s3tc functions

---
 src/mesa/main/texcompress_s3tc.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texcompress_s3tc.c b/src/mesa/main/texcompress_s3tc.c
index d17e18da6b..a1c0f18f36 100644
--- a/src/mesa/main/texcompress_s3tc.c
+++ b/src/mesa/main/texcompress_s3tc.c
@@ -205,7 +205,7 @@ texstore_rgb_dxt1(TEXSTORE_PARAMS)
                               dst, dstRowStride);
    }
    else {
-      _mesa_warning(ctx, "external dxt library not available");
+      _mesa_warning(ctx, "external dxt library not available: texstore_rgb_dxt1");
    }
 
    if (tempImage)
@@ -267,7 +267,7 @@ texstore_rgba_dxt1(TEXSTORE_PARAMS)
                               dst, dstRowStride);
    }
    else {
-      _mesa_warning(ctx, "external dxt library not available");
+      _mesa_warning(ctx, "external dxt library not available: texstore_rgba_dxt1");
    }
 
    if (tempImage)
@@ -328,7 +328,7 @@ texstore_rgba_dxt3(TEXSTORE_PARAMS)
                               dst, dstRowStride);
    }
    else {
-      _mesa_warning(ctx, "external dxt library not available");
+      _mesa_warning(ctx, "external dxt library not available: texstore_rgba_dxt3");
    }
 
    if (tempImage)
@@ -389,7 +389,7 @@ texstore_rgba_dxt5(TEXSTORE_PARAMS)
                               dst, dstRowStride);
    }
    else {
-      _mesa_warning(ctx, "external dxt library not available");
+      _mesa_warning(ctx, "external dxt library not available: texstore_rgba_dxt5");
    }
 
    if (tempImage)
@@ -410,7 +410,7 @@ fetch_texel_2d_rgb_dxt1( const struct gl_texture_image *texImage,
                          (GLubyte *)(texImage)->Data, i, j, texel);
    }
    else
-      _mesa_debug(NULL, "attempted to decode s3tc texture without library available\n");
+      _mesa_debug(NULL, "attempted to decode s3tc texture without library available: fetch_texel_2d_rgb_dxt1");
 }
 
 
@@ -438,7 +438,7 @@ fetch_texel_2d_rgba_dxt1( const struct gl_texture_image *texImage,
                           (GLubyte *)(texImage)->Data, i, j, texel);
    }
    else
-      _mesa_debug(NULL, "attempted to decode s3tc texture without library available\n");
+      _mesa_debug(NULL, "attempted to decode s3tc texture without library available: fetch_texel_2d_rgba_dxt1\n");
 }
 
 
@@ -467,7 +467,7 @@ fetch_texel_2d_rgba_dxt3( const struct gl_texture_image *texImage,
                           i, j, texel);
    }
    else
-      _mesa_debug(NULL, "attempted to decode s3tc texture without library available\n");
+      _mesa_debug(NULL, "attempted to decode s3tc texture without library available: fetch_texel_2d_rgba_dxt3\n");
 }
 
 
@@ -495,7 +495,7 @@ fetch_texel_2d_rgba_dxt5( const struct gl_texture_image *texImage,
                           i, j, texel);
    }
    else
-      _mesa_debug(NULL, "attempted to decode s3tc texture without library available\n");
+      _mesa_debug(NULL, "attempted to decode s3tc texture without library available: fetch_texel_2d_rgba_dxt5\n");
 }
 
 
-- 
cgit v1.2.3


From deff09921563419a77bd1aad0054afa34214ed1a Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 9 Apr 2009 10:53:01 -0600
Subject: mesa: fix potential recursive locking deadlock in _mesa_HashWalk()

If the walk callback called _mesa_HashRemove() we'd deadlock.
---
 src/mesa/main/hash.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/hash.c b/src/mesa/main/hash.c
index 976f9d999b..08c64568c8 100644
--- a/src/mesa/main/hash.c
+++ b/src/mesa/main/hash.c
@@ -63,6 +63,7 @@ struct _mesa_HashTable {
    struct HashEntry *Table[TABLE_SIZE];  /**< the lookup table */
    GLuint MaxKey;                        /**< highest key inserted so far */
    _glthread_Mutex Mutex;                /**< mutual exclusion lock */
+   _glthread_Mutex WalkMutex;            /**< for _mesa_HashWalk() */
    GLboolean InDeleteAll;                /**< Debug check */
 };
 
@@ -79,6 +80,7 @@ _mesa_NewHashTable(void)
    struct _mesa_HashTable *table = CALLOC_STRUCT(_mesa_HashTable);
    if (table) {
       _glthread_INIT_MUTEX(table->Mutex);
+      _glthread_INIT_MUTEX(table->WalkMutex);
    }
    return table;
 }
@@ -111,6 +113,7 @@ _mesa_DeleteHashTable(struct _mesa_HashTable *table)
       }
    }
    _glthread_DESTROY_MUTEX(table->Mutex);
+   _glthread_DESTROY_MUTEX(table->WalkMutex);
    _mesa_free(table);
 }
 
@@ -285,6 +288,11 @@ _mesa_HashDeleteAll(struct _mesa_HashTable *table,
 
 /**
  * Walk over all entries in a hash table, calling callback function for each.
+ * Note: we use a separate mutex in this function to avoid a recursive
+ * locking deadlock (in case the callback calls _mesa_HashRemove()) and to
+ * prevent multiple threads/contexts from getting tangled up.
+ * A lock-less version of this function could be used when the table will
+ * not be modified.
  * \param table  the hash table to walk
  * \param callback  the callback function
  * \param userData  arbitrary pointer to pass along to the callback
@@ -300,14 +308,16 @@ _mesa_HashWalk(const struct _mesa_HashTable *table,
    GLuint pos;
    ASSERT(table);
    ASSERT(callback);
-   _glthread_LOCK_MUTEX(table2->Mutex);
+   _glthread_LOCK_MUTEX(table2->WalkMutex);
    for (pos = 0; pos < TABLE_SIZE; pos++) {
-      struct HashEntry *entry;
-      for (entry = table->Table[pos]; entry; entry = entry->Next) {
+      struct HashEntry *entry, *next;
+      for (entry = table->Table[pos]; entry; entry = next) {
+         /* save 'next' pointer now in case the callback deletes the entry */
+         next = entry->Next;
          callback(entry->Key, entry->Data, userData);
       }
    }
-   _glthread_UNLOCK_MUTEX(table2->Mutex);
+   _glthread_UNLOCK_MUTEX(table2->WalkMutex);
 }
 
 
-- 
cgit v1.2.3


From cdc7f681c87b0b6379de04066c25fdeb6de96405 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 14 Apr 2009 19:44:16 -0600
Subject: mesa: use standard offsetof() macro

---
 src/mesa/main/extensions.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 147d923e64..5c4bea9cf6 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -31,7 +31,7 @@
 #include "mtypes.h"
 
 
-#define F(x) (int)(uintptr_t)&(((struct gl_extensions *)0)->x)
+#define F(x) offsetof(struct gl_extensions, x)
 #define ON GL_TRUE
 #define OFF GL_FALSE
 
-- 
cgit v1.2.3


From 62c45ec951829563b92a95cce5b9621e70c971a4 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 14 Apr 2009 19:56:59 -0600
Subject: mesa: move #define for GL_PROGRAM_BINARY_LENGTH_OES

---
 src/mesa/main/glheader.h     | 5 +++++
 src/mesa/shader/shader_api.c | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h
index ad095321e3..81d4ccf919 100644
--- a/src/mesa/main/glheader.h
+++ b/src/mesa/main/glheader.h
@@ -74,6 +74,11 @@
 #endif
 
 
+#ifndef GL_PROGRAM_BINARY_LENGTH_OES
+#define GL_PROGRAM_BINARY_LENGTH_OES 0x8741
+#endif
+
+
 /**
  * Special, internal token
  */
diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index 61289db2d2..75e38960e9 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -51,11 +51,6 @@
 #include "glapi/dispatch.h"
 
 
-#ifndef GL_PROGRAM_BINARY_LENGTH_OES
-#define GL_PROGRAM_BINARY_LENGTH_OES 0x8741
-#endif
-
-
 /**
  * Allocate a new gl_shader_program object, initialize it.
  */
-- 
cgit v1.2.3


From 0115a4f8f1952b166eaad09f317ff8bc465e0f28 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 14 Apr 2009 20:00:28 -0600
Subject: mesa: remove unused matrixType param from ctx->Driver.UniformMatrix()
 functions

---
 src/mesa/main/dd.h           |  2 +-
 src/mesa/main/shaders.c      | 27 +++++++++------------------
 src/mesa/shader/shader_api.c |  2 +-
 3 files changed, 11 insertions(+), 20 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index d994401e55..32b1d4e9fa 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -911,7 +911,7 @@ struct dd_function_table {
    void (*Uniform)(GLcontext *ctx, GLint location, GLsizei count,
                    const GLvoid *values, GLenum type);
    void (*UniformMatrix)(GLcontext *ctx, GLint cols, GLint rows,
-                         GLenum matrixType, GLint location, GLsizei count,
+                         GLint location, GLsizei count,
                          GLboolean transpose, const GLfloat *values);
    void (*UseProgram)(GLcontext *ctx, GLuint program);
    void (*ValidateProgram)(GLcontext *ctx, GLuint program);
diff --git a/src/mesa/main/shaders.c b/src/mesa/main/shaders.c
index be93b45a7d..bc76b91291 100644
--- a/src/mesa/main/shaders.c
+++ b/src/mesa/main/shaders.c
@@ -638,8 +638,7 @@ _mesa_UniformMatrix2fvARB(GLint location, GLsizei count, GLboolean transpose,
                           const GLfloat * value)
 {
    GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.UniformMatrix(ctx, 2, 2, GL_FLOAT_MAT2,
-                             location, count, transpose, value);
+   ctx->Driver.UniformMatrix(ctx, 2, 2, location, count, transpose, value);
 }
 
 void GLAPIENTRY
@@ -647,8 +646,7 @@ _mesa_UniformMatrix3fvARB(GLint location, GLsizei count, GLboolean transpose,
                           const GLfloat * value)
 {
    GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.UniformMatrix(ctx, 3, 3, GL_FLOAT_MAT3,
-                             location, count, transpose, value);
+   ctx->Driver.UniformMatrix(ctx, 3, 3, location, count, transpose, value);
 }
 
 void GLAPIENTRY
@@ -656,8 +654,7 @@ _mesa_UniformMatrix4fvARB(GLint location, GLsizei count, GLboolean transpose,
                           const GLfloat * value)
 {
    GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.UniformMatrix(ctx, 4, 4, GL_FLOAT_MAT4,
-                             location, count, transpose, value);
+   ctx->Driver.UniformMatrix(ctx, 4, 4, location, count, transpose, value);
 }
 
 
@@ -669,8 +666,7 @@ _mesa_UniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose,
                          const GLfloat *value)
 {
    GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.UniformMatrix(ctx, 2, 3, GL_FLOAT_MAT2x3,
-                             location, count, transpose, value);
+   ctx->Driver.UniformMatrix(ctx, 2, 3, location, count, transpose, value);
 }
 
 void GLAPIENTRY
@@ -678,8 +674,7 @@ _mesa_UniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose,
                          const GLfloat *value)
 {
    GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.UniformMatrix(ctx, 3, 2, GL_FLOAT_MAT3x2,
-                             location, count, transpose, value);
+   ctx->Driver.UniformMatrix(ctx, 3, 2, location, count, transpose, value);
 }
 
 void GLAPIENTRY
@@ -687,8 +682,7 @@ _mesa_UniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose,
                          const GLfloat *value)
 {
    GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.UniformMatrix(ctx, 2, 4, GL_FLOAT_MAT2x4,
-                             location, count, transpose, value);
+   ctx->Driver.UniformMatrix(ctx, 2, 4, location, count, transpose, value);
 }
 
 void GLAPIENTRY
@@ -696,8 +690,7 @@ _mesa_UniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose,
                          const GLfloat *value)
 {
    GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.UniformMatrix(ctx, 4, 2, GL_FLOAT_MAT4x2,
-                             location, count, transpose, value);
+   ctx->Driver.UniformMatrix(ctx, 4, 2, location, count, transpose, value);
 }
 
 void GLAPIENTRY
@@ -705,8 +698,7 @@ _mesa_UniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose,
                          const GLfloat *value)
 {
    GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.UniformMatrix(ctx, 3, 4, GL_FLOAT_MAT3x4,
-                             location, count, transpose, value);
+   ctx->Driver.UniformMatrix(ctx, 3, 4, location, count, transpose, value);
 }
 
 void GLAPIENTRY
@@ -714,8 +706,7 @@ _mesa_UniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose,
                          const GLfloat *value)
 {
    GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.UniformMatrix(ctx, 4, 3, GL_FLOAT_MAT4x3,
-                             location, count, transpose, value);
+   ctx->Driver.UniformMatrix(ctx, 4, 3, location, count, transpose, value);
 }
 
 
diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index 75e38960e9..9038f7d1de 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -1897,7 +1897,7 @@ set_program_uniform_matrix(GLcontext *ctx, struct gl_program *program,
  */
 static void
 _mesa_uniform_matrix(GLcontext *ctx, GLint cols, GLint rows,
-                     GLenum matrixType, GLint location, GLsizei count,
+                     GLint location, GLsizei count,
                      GLboolean transpose, const GLfloat *values)
 {
    struct gl_shader_program *shProg = ctx->Shader.CurrentProgram;
-- 
cgit v1.2.3


From 7db7ff878d3e5a6b345228e6eaee4797bb68b360 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 14 Apr 2009 22:14:30 -0600
Subject: mesa: merge the prog_src_register::NegateBase and NegateAbs fields

There's really no need for two negation fields.  This came from the
GL_NV_fragment_program extension.  The new, unified Negate bitfield applies
after the absolute value step.
---
 src/mesa/drivers/dri/i915/i915_fragprog.c         | 10 ++---
 src/mesa/drivers/dri/i965/brw_vs_constval.c       |  2 +-
 src/mesa/drivers/dri/i965/brw_vs_emit.c           |  8 ++--
 src/mesa/drivers/dri/i965/brw_wm_fp.c             | 13 +++---
 src/mesa/drivers/dri/i965/brw_wm_glsl.c           |  6 +--
 src/mesa/drivers/dri/i965/brw_wm_pass0.c          |  2 +-
 src/mesa/drivers/dri/r200/r200_vertprog.c         | 34 ++++++++--------
 src/mesa/drivers/dri/r300/r300_fragprog.c         |  4 +-
 src/mesa/drivers/dri/r300/r300_fragprog_swizzle.c | 17 ++++----
 src/mesa/drivers/dri/r300/r300_vertprog.c         | 49 +++++++++--------------
 src/mesa/drivers/dri/r300/r500_fragprog.c         | 19 +++++----
 src/mesa/drivers/dri/r300/radeon_nqssadce.c       |  7 ++--
 src/mesa/drivers/dri/r300/radeon_program_alu.c    | 20 +++++----
 src/mesa/drivers/dri/r300/radeon_program_pair.c   | 11 +++--
 src/mesa/main/ffvertex_prog.c                     |  3 +-
 src/mesa/main/texenvprogram.c                     |  3 +-
 src/mesa/shader/arbprogparse.c                    |  8 ++--
 src/mesa/shader/nvfragparse.c                     | 33 ++++++++-------
 src/mesa/shader/nvvertparse.c                     | 10 ++---
 src/mesa/shader/prog_execute.c                    | 27 ++++---------
 src/mesa/shader/prog_instruction.h                | 32 +++------------
 src/mesa/shader/prog_print.c                      | 20 ++++-----
 src/mesa/shader/programopt.c                      |  2 +-
 src/mesa/shader/slang/slang_emit.c                |  2 +-
 src/mesa/state_tracker/st_cb_bitmap.c             |  2 +-
 src/mesa/state_tracker/st_mesa_to_tgsi.c          | 20 ++++-----
 26 files changed, 156 insertions(+), 208 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/i915/i915_fragprog.c b/src/mesa/drivers/dri/i915/i915_fragprog.c
index 52f09a4b1b..a5158de945 100644
--- a/src/mesa/drivers/dri/i915/i915_fragprog.c
+++ b/src/mesa/drivers/dri/i915/i915_fragprog.c
@@ -162,12 +162,12 @@ src_vector(struct i915_fragment_program *p,
                  GET_SWZ(source->Swizzle, 1),
                  GET_SWZ(source->Swizzle, 2), GET_SWZ(source->Swizzle, 3));
 
-   if (source->NegateBase)
+   if (source->Negate)
       src = negate(src,
-                   GET_BIT(source->NegateBase, 0),
-                   GET_BIT(source->NegateBase, 1),
-                   GET_BIT(source->NegateBase, 2),
-                   GET_BIT(source->NegateBase, 3));
+                   GET_BIT(source->Negate, 0),
+                   GET_BIT(source->Negate, 1),
+                   GET_BIT(source->Negate, 2),
+                   GET_BIT(source->Negate, 3));
 
    return src;
 }
diff --git a/src/mesa/drivers/dri/i965/brw_vs_constval.c b/src/mesa/drivers/dri/i965/brw_vs_constval.c
index d29eb17f8c..2637344b48 100644
--- a/src/mesa/drivers/dri/i965/brw_vs_constval.c
+++ b/src/mesa/drivers/dri/i965/brw_vs_constval.c
@@ -96,7 +96,7 @@ static GLubyte get_active( struct tracker *t,
 			   struct prog_src_register src )
 {
    GLuint i;
-   GLubyte active = src.NegateBase; /* NOTE! */
+   GLubyte active = src.Negate; /* NOTE! */
 
    if (src.RelAddr)
       return 0xf;
diff --git a/src/mesa/drivers/dri/i965/brw_vs_emit.c b/src/mesa/drivers/dri/i965/brw_vs_emit.c
index 2ee63129bc..42f6a99142 100644
--- a/src/mesa/drivers/dri/i965/brw_vs_emit.c
+++ b/src/mesa/drivers/dri/i965/brw_vs_emit.c
@@ -899,7 +899,7 @@ static struct brw_reg get_arg( struct brw_vs_compile *c,
 
    /* Note this is ok for non-swizzle instructions: 
     */
-   reg.negate = src->NegateBase ? 1 : 0;   
+   reg.negate = src->Negate ? 1 : 0;   
 
    return reg;
 }
@@ -945,7 +945,7 @@ static void emit_swz( struct brw_vs_compile *c,
    GLuint ones_mask = 0;
    GLuint src_mask = 0;
    GLubyte src_swz[4];
-   GLboolean need_tmp = (src.NegateBase &&
+   GLboolean need_tmp = (src.Negate &&
 			 dst.file != BRW_GENERAL_REGISTER_FILE);
    struct brw_reg tmp = dst;
    GLuint i;
@@ -997,8 +997,8 @@ static void emit_swz( struct brw_vs_compile *c,
    if (ones_mask) 
       brw_MOV(p, brw_writemask(tmp, ones_mask), brw_imm_f(1));
 
-   if (src.NegateBase)
-      brw_MOV(p, brw_writemask(tmp, src.NegateBase), negate(tmp));
+   if (src.Negate)
+      brw_MOV(p, brw_writemask(tmp, src.Negate), negate(tmp));
    
    if (need_tmp) {
       brw_MOV(p, dst, tmp);
diff --git a/src/mesa/drivers/dri/i965/brw_wm_fp.c b/src/mesa/drivers/dri/i965/brw_wm_fp.c
index a7f5f1b9a2..1798d842c7 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_fp.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_fp.c
@@ -80,9 +80,8 @@ static struct prog_src_register src_reg(GLuint file, GLuint idx)
    reg.Index = idx;
    reg.Swizzle = SWIZZLE_NOOP;
    reg.RelAddr = 0;
-   reg.NegateBase = 0;
+   reg.Negate = NEGATE_NONE;
    reg.Abs = 0;
-   reg.NegateAbs = 0;
    return reg;
 }
 
@@ -569,7 +568,7 @@ static void precalc_dst( struct brw_wm_compile *c,
 		    src_undef(),
 		    src_undef());
       /* Avoid letting negation flag of src0 affect our 1 constant. */
-      swz->SrcReg[0].NegateBase &= ~NEGATE_X;
+      swz->SrcReg[0].Negate &= ~NEGATE_X;
    }
    if (dst.WriteMask & WRITEMASK_W) {
       /* dst.w = mov src1.w
@@ -604,7 +603,7 @@ static void precalc_lit( struct brw_wm_compile *c,
 		    src_undef(),
 		    src_undef());
       /* Avoid letting the negation flag of src0 affect our 1 constant. */
-      swz->SrcReg[0].NegateBase = 0;
+      swz->SrcReg[0].Negate = NEGATE_NONE;
    }
 
    if (dst.WriteMask & WRITEMASK_YZ) {
@@ -651,7 +650,7 @@ static void precalc_tex( struct brw_wm_compile *c,
                      src0,
                      src_undef(),
                      src_undef());
-       out->SrcReg[0].NegateBase = 0;
+       out->SrcReg[0].Negate = NEGATE_NONE;
        out->SrcReg[0].Abs = 1;
 
        /* tmp0 = MAX(coord.X, coord.Y) */
@@ -1050,14 +1049,14 @@ void brw_wm_pass_fp( struct brw_wm_compile *c )
       case OPCODE_ABS:
 	 out = emit_insn(c, inst);
 	 out->Opcode = OPCODE_MOV;
-	 out->SrcReg[0].NegateBase = 0;
+	 out->SrcReg[0].Negate = NEGATE_NONE;
 	 out->SrcReg[0].Abs = 1;
 	 break;
 
       case OPCODE_SUB: 
 	 out = emit_insn(c, inst);
 	 out->Opcode = OPCODE_ADD;
-	 out->SrcReg[1].NegateBase ^= 0xf;
+	 out->SrcReg[1].Negate ^= NEGATE_XYZW;
 	 break;
 
       case OPCODE_SCS: 
diff --git a/src/mesa/drivers/dri/i965/brw_wm_glsl.c b/src/mesa/drivers/dri/i965/brw_wm_glsl.c
index 49fea2e41a..385efd2dd3 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_glsl.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_glsl.c
@@ -340,7 +340,7 @@ get_src_reg_const(struct brw_wm_compile *c,
    const_reg = stride(const_reg, 0, 1, 0);
    const_reg.subnr = component * 4;
 
-   if (src->NegateBase)
+   if (src->Negate & (1 << component))
       const_reg = negate(const_reg);
    if (src->Abs)
       const_reg = brw_abs(const_reg);
@@ -377,7 +377,7 @@ static struct brw_reg get_src_reg(struct brw_wm_compile *c,
     else {
        /* other type of source register */
        return get_reg(c, src->File, src->Index, component, nr, 
-                      src->NegateBase, src->Abs);
+                      src->Negate, src->Abs);
     }
 }
 
@@ -402,7 +402,7 @@ static struct brw_reg get_src_reg_imm(struct brw_wm_compile *c,
        const GLfloat *param =
           c->fp->program.Base.Parameters->ParameterValues[src->Index];
        GLfloat value = param[component];
-       if (src->NegateBase)
+       if (src->Negate & (1 << channel))
           value = -value;
        if (src->Abs)
           value = FABSF(value);
diff --git a/src/mesa/drivers/dri/i965/brw_wm_pass0.c b/src/mesa/drivers/dri/i965/brw_wm_pass0.c
index 2debd0678a..92142764f5 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_pass0.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_pass0.c
@@ -322,7 +322,7 @@ static struct brw_wm_ref *get_new_ref( struct brw_wm_compile *c,
       newref->value->lastuse = newref;
    }
 
-   if (src.NegateBase & (1<<i))
+   if (src.Negate & (1 << i))
       newref->hw_reg.negate ^= 1;
 
    if (src.Abs) {
diff --git a/src/mesa/drivers/dri/r200/r200_vertprog.c b/src/mesa/drivers/dri/r200/r200_vertprog.c
index a2561df579..4ce93b5145 100644
--- a/src/mesa/drivers/dri/r200/r200_vertprog.c
+++ b/src/mesa/drivers/dri/r200/r200_vertprog.c
@@ -290,7 +290,7 @@ static unsigned long t_src(struct r200_vertex_program *vp, struct prog_src_regis
 			t_swizzle(GET_SWZ(src->Swizzle, 2)),
 			t_swizzle(GET_SWZ(src->Swizzle, 3)),
 			t_src_class(src->File),
-			src->NegateBase) | (src->RelAddr << 4);
+			src->Negate) | (src->RelAddr << 4);
 }
 
 static unsigned long t_src_scalar(struct r200_vertex_program *vp, struct prog_src_register *src)
@@ -302,7 +302,7 @@ static unsigned long t_src_scalar(struct r200_vertex_program *vp, struct prog_sr
 			t_swizzle(GET_SWZ(src->Swizzle, 0)),
 			t_swizzle(GET_SWZ(src->Swizzle, 0)),
 			t_src_class(src->File),
-			src->NegateBase ? VSF_FLAG_ALL : VSF_FLAG_NONE) | (src->RelAddr << 4);
+			src->Negate ? VSF_FLAG_ALL : VSF_FLAG_NONE) | (src->RelAddr << 4);
 }
 
 static unsigned long t_opcode(enum prog_opcode opcode)
@@ -700,7 +700,7 @@ static GLboolean r200_translate_vertex_program(GLcontext *ctx, struct r200_verte
 		   t_swizzle(GET_SWZ(src[1].Swizzle, 0)),
 		   SWIZZLE_ZERO,
 		   t_src_class(src[0].File),
-		   src[0].NegateBase) | (src[0].RelAddr << 4);
+		   src[0].Negate) | (src[0].RelAddr << 4);
 	    o_inst->src1 = UNUSED_SRC_0;
 	    o_inst->src2 = UNUSED_SRC_0;
 	 }
@@ -712,12 +712,12 @@ static GLboolean r200_translate_vertex_program(GLcontext *ctx, struct r200_verte
 		   t_swizzle(GET_SWZ(src[0].Swizzle, 0)),
 		   SWIZZLE_ZERO, SWIZZLE_ZERO, SWIZZLE_ZERO,
 		   t_src_class(src[0].File),
-		   src[0].NegateBase ? VSF_FLAG_ALL : VSF_FLAG_NONE) | (src[0].RelAddr << 4);
+		   src[0].Negate ? VSF_FLAG_ALL : VSF_FLAG_NONE) | (src[0].RelAddr << 4);
 	    o_inst->src1 = MAKE_VSF_SOURCE(t_src_index(vp, &src[1]),
 		   SWIZZLE_ZERO, SWIZZLE_ZERO,
 		   t_swizzle(GET_SWZ(src[1].Swizzle, 0)), SWIZZLE_ZERO,
 		   t_src_class(src[1].File),
-		   src[1].NegateBase ? VSF_FLAG_ALL : VSF_FLAG_NONE) | (src[1].RelAddr << 4);
+		   src[1].Negate ? VSF_FLAG_ALL : VSF_FLAG_NONE) | (src[1].RelAddr << 4);
 	    o_inst->src2 = UNUSED_SRC_1;
 	    o_inst++;
 
@@ -766,11 +766,11 @@ if ((o_inst - vp->instr) == 31) {
 o_inst->src1 = MAKE_VSF_SOURCE(t_src_index(vp, &src[1]),
 			SWIZZLE_X, SWIZZLE_X, SWIZZLE_X, SWIZZLE_X,
 			t_src_class(src[1].File),
-			src[1].NegateBase) | (src[1].RelAddr << 4);
+			src[1].Negate) | (src[1].RelAddr << 4);
 o_inst->src2 = MAKE_VSF_SOURCE(t_src_index(vp, &src[1]),
 			SWIZZLE_Y, SWIZZLE_Y, SWIZZLE_Y, SWIZZLE_Y,
 			t_src_class(src[1].File),
-			src[1].NegateBase) | (src[1].RelAddr << 4);
+			src[1].Negate) | (src[1].RelAddr << 4);
 }
 else {
 	 o_inst->src1 = t_src(vp, &src[1]);
@@ -792,7 +792,7 @@ else {
 		t_swizzle(GET_SWZ(src[0].Swizzle, 2)),
 		SWIZZLE_ZERO,
 		t_src_class(src[0].File),
-		src[0].NegateBase) | (src[0].RelAddr << 4);
+		src[0].Negate) | (src[0].RelAddr << 4);
 
 	 o_inst->src1 = MAKE_VSF_SOURCE(t_src_index(vp, &src[1]),
 		t_swizzle(GET_SWZ(src[1].Swizzle, 0)),
@@ -800,7 +800,7 @@ else {
 		t_swizzle(GET_SWZ(src[1].Swizzle, 2)),
 		SWIZZLE_ZERO,
 		t_src_class(src[1].File),
-		src[1].NegateBase) | (src[1].RelAddr << 4);
+		src[1].Negate) | (src[1].RelAddr << 4);
 
 	 o_inst->src2 = UNUSED_SRC_1;
 	 goto next;
@@ -815,7 +815,7 @@ else {
 		t_swizzle(GET_SWZ(src[0].Swizzle, 2)),
 		VSF_IN_COMPONENT_ONE,
 		t_src_class(src[0].File),
-		src[0].NegateBase) | (src[0].RelAddr << 4);
+		src[0].Negate) | (src[0].RelAddr << 4);
 	 o_inst->src1 = t_src(vp, &src[1]);
 	 o_inst->src2 = UNUSED_SRC_1;
 	 goto next;
@@ -831,7 +831,7 @@ else {
 		t_swizzle(GET_SWZ(src[1].Swizzle, 2)),
 		t_swizzle(GET_SWZ(src[1].Swizzle, 3)),
 		t_src_class(src[1].File),
-		(!src[1].NegateBase) ? VSF_FLAG_ALL : VSF_FLAG_NONE) | (src[1].RelAddr << 4);
+		(!src[1].Negate) ? VSF_FLAG_ALL : VSF_FLAG_NONE) | (src[1].RelAddr << 4);
 	 o_inst->src2 = UNUSED_SRC_1;
 	 goto next;
 
@@ -846,7 +846,7 @@ else {
 		t_swizzle(GET_SWZ(src[0].Swizzle, 2)),
 		t_swizzle(GET_SWZ(src[0].Swizzle, 3)),
 		t_src_class(src[0].File),
-		(!src[0].NegateBase) ? VSF_FLAG_ALL : VSF_FLAG_NONE) | (src[0].RelAddr << 4);
+		(!src[0].Negate) ? VSF_FLAG_ALL : VSF_FLAG_NONE) | (src[0].RelAddr << 4);
 	 o_inst->src2 = UNUSED_SRC_1;
 	 goto next;
 
@@ -874,7 +874,7 @@ else {
 		VSF_IN_COMPONENT_W,
 		VSF_IN_CLASS_TMP,
 		/* Not 100% sure about this */
-		(!src[0].NegateBase) ? VSF_FLAG_ALL : VSF_FLAG_NONE/*VSF_FLAG_ALL*/);
+		(!src[0].Negate) ? VSF_FLAG_ALL : VSF_FLAG_NONE/*VSF_FLAG_ALL*/);
 
 	 o_inst->src2 = UNUSED_SRC_0;
 	 u_temp_i--;
@@ -899,7 +899,7 @@ else {
 		t_swizzle(GET_SWZ(src[0].Swizzle, 0)), // x
 		t_swizzle(GET_SWZ(src[0].Swizzle, 3)), // w
 		t_src_class(src[0].File),
-		src[0].NegateBase) | (src[0].RelAddr << 4);
+		src[0].Negate) | (src[0].RelAddr << 4);
 
 	 o_inst->src1 = MAKE_VSF_SOURCE(t_src_index(vp, &src[1]),
 		t_swizzle(GET_SWZ(src[1].Swizzle, 2)), // z
@@ -907,7 +907,7 @@ else {
 		t_swizzle(GET_SWZ(src[1].Swizzle, 1)), // y
 		t_swizzle(GET_SWZ(src[1].Swizzle, 3)), // w
 		t_src_class(src[1].File),
-		src[1].NegateBase) | (src[1].RelAddr << 4);
+		src[1].Negate) | (src[1].RelAddr << 4);
 
 	 o_inst->src2 = UNUSED_SRC_1;
 	 o_inst++;
@@ -922,7 +922,7 @@ else {
 		t_swizzle(GET_SWZ(src[1].Swizzle, 0)), // x
 		t_swizzle(GET_SWZ(src[1].Swizzle, 3)), // w
 		t_src_class(src[1].File),
-		(!src[1].NegateBase) ? VSF_FLAG_ALL : VSF_FLAG_NONE) | (src[1].RelAddr << 4);
+		(!src[1].Negate) ? VSF_FLAG_ALL : VSF_FLAG_NONE) | (src[1].RelAddr << 4);
 
 	 o_inst->src1 = MAKE_VSF_SOURCE(t_src_index(vp, &src[0]),
 		t_swizzle(GET_SWZ(src[0].Swizzle, 2)), // z
@@ -930,7 +930,7 @@ else {
 		t_swizzle(GET_SWZ(src[0].Swizzle, 1)), // y
 		t_swizzle(GET_SWZ(src[0].Swizzle, 3)), // w
 		t_src_class(src[0].File),
-		src[0].NegateBase) | (src[0].RelAddr << 4);
+		src[0].Negate) | (src[0].RelAddr << 4);
 
 	 o_inst->src2 = MAKE_VSF_SOURCE(u_temp_i+1,
 		VSF_IN_COMPONENT_X,
diff --git a/src/mesa/drivers/dri/r300/r300_fragprog.c b/src/mesa/drivers/dri/r300/r300_fragprog.c
index 32182bb667..873cde4414 100644
--- a/src/mesa/drivers/dri/r300/r300_fragprog.c
+++ b/src/mesa/drivers/dri/r300/r300_fragprog.c
@@ -214,9 +214,9 @@ static GLboolean transform_TEX(
 		 *   r  < tex  <=>      -tex+r < 0
 		 *   r >= tex  <=> not (-tex+r < 0 */
 		if (comparefunc == GL_LESS || comparefunc == GL_GEQUAL)
-			tgt[1].SrcReg[2].NegateBase = tgt[0].SrcReg[2].NegateBase ^ NEGATE_XYZW;
+			tgt[1].SrcReg[2].Negate = tgt[0].SrcReg[2].Negate ^ NEGATE_XYZW;
 		else
-			tgt[1].SrcReg[0].NegateBase = tgt[0].SrcReg[0].NegateBase ^ NEGATE_XYZW;
+			tgt[1].SrcReg[0].Negate = tgt[0].SrcReg[0].Negate ^ NEGATE_XYZW;
 
 		tgt[2].Opcode = OPCODE_CMP;
 		tgt[2].DstReg = orig_inst->DstReg;
diff --git a/src/mesa/drivers/dri/r300/r300_fragprog_swizzle.c b/src/mesa/drivers/dri/r300/r300_fragprog_swizzle.c
index a86d2bd471..191853ac1f 100644
--- a/src/mesa/drivers/dri/r300/r300_fragprog_swizzle.c
+++ b/src/mesa/drivers/dri/r300/r300_fragprog_swizzle.c
@@ -92,7 +92,7 @@ static const struct swizzle_data* lookup_native_swizzle(GLuint swizzle)
 GLboolean r300FPIsNativeSwizzle(GLuint opcode, struct prog_src_register reg)
 {
 	if (reg.Abs)
-		reg.NegateBase = 0;
+		reg.Negate = NEGATE_NONE;
 
 	if (opcode == OPCODE_KIL ||
 	    opcode == OPCODE_TEX ||
@@ -100,7 +100,8 @@ GLboolean r300FPIsNativeSwizzle(GLuint opcode, struct prog_src_register reg)
 	    opcode == OPCODE_TXP) {
 		int j;
 
-		if (reg.Abs || reg.NegateBase != (15*reg.NegateAbs))
+		if (reg.Abs || (reg.Negate != NEGATE_XYZW &&
+                                reg.Negate != NEGATE_NONE))
 			return GL_FALSE;
 
 		for(j = 0; j < 4; ++j) {
@@ -121,7 +122,7 @@ GLboolean r300FPIsNativeSwizzle(GLuint opcode, struct prog_src_register reg)
 		if (GET_SWZ(reg.Swizzle, j) != SWIZZLE_NIL)
 			relevant |= 1 << j;
 
-	if ((reg.NegateBase & relevant) && (reg.NegateBase & relevant) != relevant)
+	if ((reg.Negate & relevant) && (reg.Negate & relevant) != relevant)
 		return GL_FALSE;
 
 	if (!lookup_native_swizzle(reg.Swizzle))
@@ -137,7 +138,7 @@ GLboolean r300FPIsNativeSwizzle(GLuint opcode, struct prog_src_register reg)
 void r300FPBuildSwizzle(struct nqssadce_state *s, struct prog_dst_register dst, struct prog_src_register src)
 {
 	if (src.Abs)
-		src.NegateBase = 0;
+		src.Negate = NEGATE_NONE;
 
 	while(dst.WriteMask) {
 		const struct swizzle_data *best_swizzle = 0;
@@ -170,11 +171,11 @@ void r300FPBuildSwizzle(struct nqssadce_state *s, struct prog_dst_register dst,
 			}
 		}
 
-		if ((src.NegateBase & best_matchmask) != 0) {
-			best_matchmask &= src.NegateBase;
-			rgbnegate = !src.NegateAbs;
+		if ((src.Negate & best_matchmask) != 0) {
+			best_matchmask &= src.Negate;
+			rgbnegate = !src.Negate;
 		} else {
-			rgbnegate = src.NegateAbs;
+			rgbnegate = src.Negate;
 		}
 
 		struct prog_instruction *inst;
diff --git a/src/mesa/drivers/dri/r300/r300_vertprog.c b/src/mesa/drivers/dri/r300/r300_vertprog.c
index 50806575ce..146daa367c 100644
--- a/src/mesa/drivers/dri/r300/r300_vertprog.c
+++ b/src/mesa/drivers/dri/r300/r300_vertprog.c
@@ -245,7 +245,7 @@ static unsigned long t_src_index(struct r300_vertex_program *vp,
 static unsigned long t_src(struct r300_vertex_program *vp,
 			   struct prog_src_register *src)
 {
-	/* src->NegateBase uses the NEGATE_ flags from program_instruction.h,
+	/* src->Negate uses the NEGATE_ flags from program_instruction.h,
 	 * which equal our VSF_FLAGS_ values, so it's safe to just pass it here.
 	 */
 	return PVS_SRC_OPERAND(t_src_index(vp, src),
@@ -254,13 +254,13 @@ static unsigned long t_src(struct r300_vertex_program *vp,
 			       t_swizzle(GET_SWZ(src->Swizzle, 2)),
 			       t_swizzle(GET_SWZ(src->Swizzle, 3)),
 			       t_src_class(src->File),
-			       src->NegateBase) | (src->RelAddr << 4);
+			       src->Negate) | (src->RelAddr << 4);
 }
 
 static unsigned long t_src_scalar(struct r300_vertex_program *vp,
 				  struct prog_src_register *src)
 {
-	/* src->NegateBase uses the NEGATE_ flags from program_instruction.h,
+	/* src->Negate uses the NEGATE_ flags from program_instruction.h,
 	 * which equal our VSF_FLAGS_ values, so it's safe to just pass it here.
 	 */
 	return PVS_SRC_OPERAND(t_src_index(vp, src),
@@ -269,8 +269,7 @@ static unsigned long t_src_scalar(struct r300_vertex_program *vp,
 			       t_swizzle(GET_SWZ(src->Swizzle, 0)),
 			       t_swizzle(GET_SWZ(src->Swizzle, 0)),
 			       t_src_class(src->File),
-			       src->
-			       NegateBase ? VSF_FLAG_ALL : VSF_FLAG_NONE) |
+			       src->Negate ? VSF_FLAG_ALL : VSF_FLAG_NONE) |
 	    (src->RelAddr << 4);
 }
 
@@ -307,7 +306,7 @@ static GLuint *r300TranslateOpcodeABS(struct r300_vertex_program *vp,
 				  t_swizzle(GET_SWZ(src[0].Swizzle, 3)),
 				  t_src_class(src[0].File),
 				  (!src[0].
-				   NegateBase) ? VSF_FLAG_ALL : VSF_FLAG_NONE) |
+				   Negate) ? VSF_FLAG_ALL : VSF_FLAG_NONE) |
 	    (src[0].RelAddr << 4);
 	inst[3] = 0;
 
@@ -369,8 +368,7 @@ static GLuint *r300TranslateOpcodeDP3(struct r300_vertex_program *vp,
 				  t_swizzle(GET_SWZ(src[0].Swizzle, 2)),
 				  SWIZZLE_ZERO,
 				  t_src_class(src[0].File),
-				  src[0].
-				  NegateBase ? VSF_FLAG_XYZ : VSF_FLAG_NONE) |
+				  src[0].Negate ? VSF_FLAG_XYZ : VSF_FLAG_NONE) |
 	    (src[0].RelAddr << 4);
 	inst[2] =
 	    PVS_SRC_OPERAND(t_src_index(vp, &src[1]),
@@ -378,8 +376,7 @@ static GLuint *r300TranslateOpcodeDP3(struct r300_vertex_program *vp,
 			    t_swizzle(GET_SWZ(src[1].Swizzle, 1)),
 			    t_swizzle(GET_SWZ(src[1].Swizzle, 2)), SWIZZLE_ZERO,
 			    t_src_class(src[1].File),
-			    src[1].
-			    NegateBase ? VSF_FLAG_XYZ : VSF_FLAG_NONE) |
+			    src[1].Negate ? VSF_FLAG_XYZ : VSF_FLAG_NONE) |
 	    (src[1].RelAddr << 4);
 	inst[3] = __CONST(1, SWIZZLE_ZERO);
 
@@ -422,8 +419,7 @@ static GLuint *r300TranslateOpcodeDPH(struct r300_vertex_program *vp,
 				  t_swizzle(GET_SWZ(src[0].Swizzle, 2)),
 				  PVS_SRC_SELECT_FORCE_1,
 				  t_src_class(src[0].File),
-				  src[0].
-				  NegateBase ? VSF_FLAG_XYZ : VSF_FLAG_NONE) |
+				  src[0].Negate ? VSF_FLAG_XYZ : VSF_FLAG_NONE) |
 	    (src[0].RelAddr << 4);
 	inst[2] = t_src(vp, &src[1]);
 	inst[3] = __CONST(1, SWIZZLE_ZERO);
@@ -519,7 +515,7 @@ static GLuint *r300TranslateOpcodeFLR(struct r300_vertex_program *vp,
 				  PVS_SRC_SELECT_W, PVS_SRC_REG_TEMPORARY,
 				  /* Not 100% sure about this */
 				  (!src[0].
-				   NegateBase) ? VSF_FLAG_ALL : VSF_FLAG_NONE
+				   Negate) ? VSF_FLAG_ALL : VSF_FLAG_NONE
 				  /*VSF_FLAG_ALL */ );
 	inst[3] = __CONST(0, SWIZZLE_ZERO);
 	(*u_temp_i)--;
@@ -564,8 +560,7 @@ static GLuint *r300TranslateOpcodeLG2(struct r300_vertex_program *vp,
 				  t_swizzle(GET_SWZ(src[0].Swizzle, 0)),
 				  t_swizzle(GET_SWZ(src[0].Swizzle, 0)),
 				  t_src_class(src[0].File),
-				  src[0].
-				  NegateBase ? VSF_FLAG_ALL : VSF_FLAG_NONE) |
+				  src[0].Negate ? VSF_FLAG_ALL : VSF_FLAG_NONE) |
 	    (src[0].RelAddr << 4);
 	inst[2] = __CONST(0, SWIZZLE_ZERO);
 	inst[3] = __CONST(0, SWIZZLE_ZERO);
@@ -592,24 +587,21 @@ static GLuint *r300TranslateOpcodeLIT(struct r300_vertex_program *vp,
 				  PVS_SRC_SELECT_FORCE_0,	// Z
 				  t_swizzle(GET_SWZ(src[0].Swizzle, 1)),	// Y
 				  t_src_class(src[0].File),
-				  src[0].
-				  NegateBase ? VSF_FLAG_ALL : VSF_FLAG_NONE) |
+				  src[0].Negate ? VSF_FLAG_ALL : VSF_FLAG_NONE) |
 	    (src[0].RelAddr << 4);
 	inst[2] = PVS_SRC_OPERAND(t_src_index(vp, &src[0]), t_swizzle(GET_SWZ(src[0].Swizzle, 1)),	// Y
 				  t_swizzle(GET_SWZ(src[0].Swizzle, 3)),	// W
 				  PVS_SRC_SELECT_FORCE_0,	// Z
 				  t_swizzle(GET_SWZ(src[0].Swizzle, 0)),	// X
 				  t_src_class(src[0].File),
-				  src[0].
-				  NegateBase ? VSF_FLAG_ALL : VSF_FLAG_NONE) |
+				  src[0].Negate ? VSF_FLAG_ALL : VSF_FLAG_NONE) |
 	    (src[0].RelAddr << 4);
 	inst[3] = PVS_SRC_OPERAND(t_src_index(vp, &src[0]), t_swizzle(GET_SWZ(src[0].Swizzle, 1)),	// Y
 				  t_swizzle(GET_SWZ(src[0].Swizzle, 0)),	// X
 				  PVS_SRC_SELECT_FORCE_0,	// Z
 				  t_swizzle(GET_SWZ(src[0].Swizzle, 3)),	// W
 				  t_src_class(src[0].File),
-				  src[0].
-				  NegateBase ? VSF_FLAG_ALL : VSF_FLAG_NONE) |
+				  src[0].Negate ? VSF_FLAG_ALL : VSF_FLAG_NONE) |
 	    (src[0].RelAddr << 4);
 
 	return inst;
@@ -837,7 +829,7 @@ static GLuint *r300TranslateOpcodeSUB(struct r300_vertex_program *vp,
 				  t_swizzle(GET_SWZ(src[1].Swizzle, 3)),
 				  t_src_class(src[1].File),
 				  (!src[1].
-				   NegateBase) ? VSF_FLAG_ALL : VSF_FLAG_NONE) |
+				   Negate) ? VSF_FLAG_ALL : VSF_FLAG_NONE) |
 	    (src[1].RelAddr << 4);
 	inst[3] = 0;
 #else
@@ -857,7 +849,7 @@ static GLuint *r300TranslateOpcodeSUB(struct r300_vertex_program *vp,
 				  t_swizzle(GET_SWZ(src[1].Swizzle, 3)),
 				  t_src_class(src[1].File),
 				  (!src[1].
-				   NegateBase) ? VSF_FLAG_ALL : VSF_FLAG_NONE) |
+				   Negate) ? VSF_FLAG_ALL : VSF_FLAG_NONE) |
 	    (src[1].RelAddr << 4);
 #endif
 
@@ -905,16 +897,14 @@ static GLuint *r300TranslateOpcodeXPD(struct r300_vertex_program *vp,
 				  t_swizzle(GET_SWZ(src[0].Swizzle, 0)),	// X
 				  t_swizzle(GET_SWZ(src[0].Swizzle, 3)),	// W
 				  t_src_class(src[0].File),
-				  src[0].
-				  NegateBase ? VSF_FLAG_ALL : VSF_FLAG_NONE) |
+				  src[0].Negate ? VSF_FLAG_ALL : VSF_FLAG_NONE) |
 	    (src[0].RelAddr << 4);
 	inst[2] = PVS_SRC_OPERAND(t_src_index(vp, &src[1]), t_swizzle(GET_SWZ(src[1].Swizzle, 2)),	// Z
 				  t_swizzle(GET_SWZ(src[1].Swizzle, 0)),	// X
 				  t_swizzle(GET_SWZ(src[1].Swizzle, 1)),	// Y
 				  t_swizzle(GET_SWZ(src[1].Swizzle, 3)),	// W
 				  t_src_class(src[1].File),
-				  src[1].
-				  NegateBase ? VSF_FLAG_ALL : VSF_FLAG_NONE) |
+				  src[1].Negate ? VSF_FLAG_ALL : VSF_FLAG_NONE) |
 	    (src[1].RelAddr << 4);
 	inst[3] = __CONST(1, SWIZZLE_ZERO);
 	inst += 4;
@@ -931,15 +921,14 @@ static GLuint *r300TranslateOpcodeXPD(struct r300_vertex_program *vp,
 				  t_swizzle(GET_SWZ(src[1].Swizzle, 3)),	// W
 				  t_src_class(src[1].File),
 				  (!src[1].
-				   NegateBase) ? VSF_FLAG_ALL : VSF_FLAG_NONE) |
+				   Negate) ? VSF_FLAG_ALL : VSF_FLAG_NONE) |
 	    (src[1].RelAddr << 4);
 	inst[2] = PVS_SRC_OPERAND(t_src_index(vp, &src[0]), t_swizzle(GET_SWZ(src[0].Swizzle, 2)),	// Z
 				  t_swizzle(GET_SWZ(src[0].Swizzle, 0)),	// X
 				  t_swizzle(GET_SWZ(src[0].Swizzle, 1)),	// Y
 				  t_swizzle(GET_SWZ(src[0].Swizzle, 3)),	// W
 				  t_src_class(src[0].File),
-				  src[0].
-				  NegateBase ? VSF_FLAG_ALL : VSF_FLAG_NONE) |
+				  src[0].Negate ? VSF_FLAG_ALL : VSF_FLAG_NONE) |
 	    (src[0].RelAddr << 4);
 	inst[3] =
 	    PVS_SRC_OPERAND(*u_temp_i, PVS_SRC_SELECT_X, PVS_SRC_SELECT_Y,
diff --git a/src/mesa/drivers/dri/r300/r500_fragprog.c b/src/mesa/drivers/dri/r300/r500_fragprog.c
index 07a2a7b17c..292573de89 100644
--- a/src/mesa/drivers/dri/r300/r500_fragprog.c
+++ b/src/mesa/drivers/dri/r300/r500_fragprog.c
@@ -156,9 +156,9 @@ static GLboolean transform_TEX(
 		 *   r  < tex  <=>      -tex+r < 0
 		 *   r >= tex  <=> not (-tex+r < 0 */
 		if (comparefunc == GL_LESS || comparefunc == GL_GEQUAL)
-			tgt[1].SrcReg[2].NegateBase = tgt[0].SrcReg[2].NegateBase ^ NEGATE_XYZW;
+			tgt[1].SrcReg[2].Negate = tgt[0].SrcReg[2].Negate ^ NEGATE_XYZW;
 		else
-			tgt[1].SrcReg[0].NegateBase = tgt[0].SrcReg[0].NegateBase ^ NEGATE_XYZW;
+			tgt[1].SrcReg[0].Negate = tgt[0].SrcReg[0].Negate ^ NEGATE_XYZW;
 
 		tgt[2].Opcode = OPCODE_CMP;
 		tgt[2].DstReg = orig_inst->DstReg;
@@ -314,8 +314,8 @@ static GLboolean is_native_swizzle(GLuint opcode, struct prog_src_register reg)
 		if (reg.Abs)
 			return GL_FALSE;
 
-		if (reg.NegateAbs)
-			reg.NegateBase ^= 15;
+		if (reg.Negate)
+			reg.Negate ^= NEGATE_XYZW;
 
 		if (opcode == OPCODE_KIL) {
 			if (reg.Swizzle != SWIZZLE_NOOP)
@@ -324,7 +324,7 @@ static GLboolean is_native_swizzle(GLuint opcode, struct prog_src_register reg)
 			for(i = 0; i < 4; ++i) {
 				GLuint swz = GET_SWZ(reg.Swizzle, i);
 				if (swz == SWIZZLE_NIL) {
-					reg.NegateBase &= ~(1 << i);
+					reg.Negate &= ~(1 << i);
 					continue;
 				}
 				if (swz >= 4)
@@ -332,15 +332,14 @@ static GLboolean is_native_swizzle(GLuint opcode, struct prog_src_register reg)
 			}
 		}
 
-		if (reg.NegateBase)
+		if (reg.Negate)
 			return GL_FALSE;
 
 		return GL_TRUE;
 	} else if (opcode == OPCODE_DDX || opcode == OPCODE_DDY) {
 		/* DDX/MDH and DDY/MDV explicitly ignore incoming swizzles;
 		 * if it doesn't fit perfectly into a .xyzw case... */
-		if (reg.Swizzle == SWIZZLE_NOOP && !reg.Abs
-				&& !reg.NegateBase && !reg.NegateAbs)
+		if (reg.Swizzle == SWIZZLE_NOOP && !reg.Abs && !reg.Negate)
 			return GL_TRUE;
 
 		return GL_FALSE;
@@ -355,7 +354,7 @@ static GLboolean is_native_swizzle(GLuint opcode, struct prog_src_register reg)
 			if (swz != SWIZZLE_NIL && swz != SWIZZLE_ZERO)
 				relevant |= 1 << i;
 		}
-		if ((reg.NegateBase & relevant) && ((reg.NegateBase & relevant) != relevant))
+		if ((reg.Negate & relevant) && ((reg.Negate & relevant) != relevant))
 			return GL_FALSE;
 
 		return GL_TRUE;
@@ -379,7 +378,7 @@ static void nqssadce_build_swizzle(struct nqssadce_state *s,
 		GLuint swz = GET_SWZ(src.Swizzle, i);
 		if (swz == SWIZZLE_NIL)
 			continue;
-		negatebase[GET_BIT(src.NegateBase, i)] |= 1 << i;
+		negatebase[GET_BIT(src.Negate, i)] |= 1 << i;
 	}
 
 	_mesa_insert_instructions(s->Program, s->IP, (negatebase[0] ? 1 : 0) + (negatebase[1] ? 1 : 0));
diff --git a/src/mesa/drivers/dri/r300/radeon_nqssadce.c b/src/mesa/drivers/dri/r300/radeon_nqssadce.c
index a083c3d243..4a2e1cba40 100644
--- a/src/mesa/drivers/dri/r300/radeon_nqssadce.c
+++ b/src/mesa/drivers/dri/r300/radeon_nqssadce.c
@@ -61,12 +61,12 @@ static struct prog_src_register lmul_swizzle(GLuint swizzle, struct prog_src_reg
 	struct prog_src_register tmp = srcreg;
 	int i;
 	tmp.Swizzle = 0;
-	tmp.NegateBase = 0;
+	tmp.Negate = NEGATE_NONE;
 	for(i = 0; i < 4; ++i) {
 		GLuint swz = GET_SWZ(swizzle, i);
 		if (swz < 4) {
 			tmp.Swizzle |= GET_SWZ(srcreg.Swizzle, swz) << (i*3);
-			tmp.NegateBase |= GET_BIT(srcreg.NegateBase, swz) << i;
+			tmp.Negate |= GET_BIT(srcreg.Negate, swz) << i;
 		} else {
 			tmp.Swizzle |= swz << (i*3);
 		}
@@ -103,9 +103,8 @@ static struct prog_instruction* track_used_srcreg(struct nqssadce_state* s,
 		inst->SrcReg[src].File = PROGRAM_TEMPORARY;
 		inst->SrcReg[src].Index = dstreg.Index;
 		inst->SrcReg[src].Swizzle = 0;
-		inst->SrcReg[src].NegateBase = 0;
+		inst->SrcReg[src].Negate = NEGATE_NONE;
 		inst->SrcReg[src].Abs = 0;
-		inst->SrcReg[src].NegateAbs = 0;
 		for(i = 0; i < 4; ++i) {
 			if (GET_BIT(sourced, i))
 				inst->SrcReg[src].Swizzle |= i << (3*i);
diff --git a/src/mesa/drivers/dri/r300/radeon_program_alu.c b/src/mesa/drivers/dri/r300/radeon_program_alu.c
index 1ef71e74dc..ebc5c913b2 100644
--- a/src/mesa/drivers/dri/r300/radeon_program_alu.c
+++ b/src/mesa/drivers/dri/r300/radeon_program_alu.c
@@ -89,8 +89,9 @@ static void set_swizzle(struct prog_src_register *SrcReg, int coordinate, int sw
 
 static void set_negate_base(struct prog_src_register *SrcReg, int coordinate, int negate)
 {
-	SrcReg->NegateBase &= ~(1 << coordinate);
-	SrcReg->NegateBase |= (negate << coordinate);
+	/* XXX note sure about this negation logic here */
+	SrcReg->Negate &= ~(1 << coordinate);
+	SrcReg->Negate |= (negate << coordinate);
 }
 
 static struct prog_dst_register dstreg(int file, int index)
@@ -156,15 +157,14 @@ static struct prog_src_register absolute(struct prog_src_register reg)
 {
 	struct prog_src_register newreg = reg;
 	newreg.Abs = 1;
-	newreg.NegateBase = 0;
-	newreg.NegateAbs = 0;
+	newreg.Negate = NEGATE_NONE;
 	return newreg;
 }
 
 static struct prog_src_register negate(struct prog_src_register reg)
 {
 	struct prog_src_register newreg = reg;
-	newreg.NegateAbs = !newreg.NegateAbs;
+	newreg.Negate = newreg.Negate ^ NEGATE_XYZW;
 	return newreg;
 }
 
@@ -189,8 +189,7 @@ static void transform_ABS(struct radeon_transform_context* t,
 {
 	struct prog_src_register src = inst->SrcReg[0];
 	src.Abs = 1;
-	src.NegateBase = 0;
-	src.NegateAbs = 0;
+	src.Negate = NEGATE_NONE;
 	emit1(t->Program, OPCODE_MOV, inst->SaturateMode, inst->DstReg, src);
 }
 
@@ -198,14 +197,13 @@ static void transform_DPH(struct radeon_transform_context* t,
 	struct prog_instruction* inst)
 {
 	struct prog_src_register src0 = inst->SrcReg[0];
-	if (src0.NegateAbs) {
+	if (src0.Negate) {
 		if (src0.Abs) {
 			int tempreg = radeonFindFreeTemporary(t);
 			emit1(t->Program, OPCODE_MOV, 0, dstreg(PROGRAM_TEMPORARY, tempreg), src0);
 			src0 = srcreg(src0.File, src0.Index);
 		} else {
-			src0.NegateAbs = 0;
-			src0.NegateBase ^= NEGATE_XYZW;
+			src0.Negate ^= NEGATE_XYZW;
 		}
 	}
 	set_swizzle(&src0, 3, SWIZZLE_ONE);
@@ -649,7 +647,7 @@ GLboolean radeonTransformDeriv(struct radeon_transform_context* t,
 
 	B.Swizzle = MAKE_SWIZZLE4(SWIZZLE_ONE, SWIZZLE_ONE,
 						SWIZZLE_ONE, SWIZZLE_ONE);
-	B.NegateBase = NEGATE_XYZW;
+	B.Negate = NEGATE_XYZW;
 
 	emit2(t->Program, inst->Opcode, inst->SaturateMode, inst->DstReg,
 		inst->SrcReg[0], B);
diff --git a/src/mesa/drivers/dri/r300/radeon_program_pair.c b/src/mesa/drivers/dri/r300/radeon_program_pair.c
index f398404f9f..ecc82ff8a8 100644
--- a/src/mesa/drivers/dri/r300/radeon_program_pair.c
+++ b/src/mesa/drivers/dri/r300/radeon_program_pair.c
@@ -255,8 +255,7 @@ static void final_rewrite(struct pair_state *s, struct prog_instruction *inst)
 		inst->SrcReg[2] = inst->SrcReg[1];
 		inst->SrcReg[1].File = PROGRAM_BUILTIN;
 		inst->SrcReg[1].Swizzle = SWIZZLE_1111;
-		inst->SrcReg[1].NegateBase = 0;
-		inst->SrcReg[1].NegateAbs = 0;
+		inst->SrcReg[1].Negate = NEGATE_NONE;
 		inst->Opcode = OPCODE_MAD;
 		break;
 	case OPCODE_CMP:
@@ -730,7 +729,7 @@ static GLboolean fill_instruction_into_pair(struct pair_state *s, struct radeon_
 					srcrgb = GL_TRUE;
 				else if (swz < 4)
 					srcalpha = GL_TRUE;
-				if (swz != SWIZZLE_NIL && GET_BIT(inst->SrcReg[i].NegateBase, j))
+				if (swz != SWIZZLE_NIL && GET_BIT(inst->SrcReg[i].Negate, j))
 					negatebase = 1;
 			}
 			source = alloc_pair_source(s, pair, inst->SrcReg[i], srcrgb, srcalpha);
@@ -739,12 +738,12 @@ static GLboolean fill_instruction_into_pair(struct pair_state *s, struct radeon_
 			pair->RGB.Arg[i].Source = source;
 			pair->RGB.Arg[i].Swizzle = inst->SrcReg[i].Swizzle & 0x1ff;
 			pair->RGB.Arg[i].Abs = inst->SrcReg[i].Abs;
-			pair->RGB.Arg[i].Negate = (negatebase & ~pair->RGB.Arg[i].Abs) ^ inst->SrcReg[i].NegateAbs;
+			pair->RGB.Arg[i].Negate = (negatebase & ~pair->RGB.Arg[i].Abs) ^ inst->SrcReg[i].Negate;
 		}
 		if (pairinst->NeedAlpha) {
 			GLboolean srcrgb = GL_FALSE;
 			GLboolean srcalpha = GL_FALSE;
-			GLuint negatebase = GET_BIT(inst->SrcReg[i].NegateBase, pairinst->IsTranscendent ? 0 : 3);
+			GLuint negatebase = GET_BIT(inst->SrcReg[i].Negate, pairinst->IsTranscendent ? 0 : 3);
 			GLuint swz = GET_SWZ(inst->SrcReg[i].Swizzle, pairinst->IsTranscendent ? 0 : 3);
 			if (swz < 3)
 				srcrgb = GL_TRUE;
@@ -756,7 +755,7 @@ static GLboolean fill_instruction_into_pair(struct pair_state *s, struct radeon_
 			pair->Alpha.Arg[i].Source = source;
 			pair->Alpha.Arg[i].Swizzle = swz;
 			pair->Alpha.Arg[i].Abs = inst->SrcReg[i].Abs;
-			pair->Alpha.Arg[i].Negate = (negatebase & ~pair->RGB.Arg[i].Abs) ^ inst->SrcReg[i].NegateAbs;
+			pair->Alpha.Arg[i].Negate = (negatebase & ~pair->RGB.Arg[i].Abs) ^ inst->SrcReg[i].Negate;
 		}
 	}
 
diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index 03f42704a7..1ce5685af4 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -570,9 +570,8 @@ static void emit_arg( struct prog_src_register *src,
    src->File = reg.file;
    src->Index = reg.idx;
    src->Swizzle = reg.swz;
-   src->NegateBase = reg.negate ? NEGATE_XYZW : 0;
+   src->Negate = reg.negate ? NEGATE_XYZW : NEGATE_NONE;
    src->Abs = 0;
-   src->NegateAbs = 0;
    src->RelAddr = 0;
    /* Check that bitfield sizes aren't exceeded */
    ASSERT(src->Index == reg.idx);
diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 4a124bf27e..a70d069bd9 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -663,9 +663,8 @@ static void emit_arg( struct prog_src_register *reg,
    reg->File = ureg.file;
    reg->Index = ureg.idx;
    reg->Swizzle = ureg.swz;
-   reg->NegateBase = ureg.negatebase ? 0xf : 0x0;
+   reg->Negate = ureg.negatebase ? NEGATE_XYZW : NEGATE_NONE;
    reg->Abs = ureg.abs;
-   reg->NegateAbs = ureg.negateabs;
 }
 
 static void emit_dst( struct prog_dst_register *dst,
diff --git a/src/mesa/shader/arbprogparse.c b/src/mesa/shader/arbprogparse.c
index 35253daa2e..b47bf360cf 100644
--- a/src/mesa/shader/arbprogparse.c
+++ b/src/mesa/shader/arbprogparse.c
@@ -2669,7 +2669,7 @@ parse_vector_src_reg(GLcontext *ctx, const GLubyte **inst,
    reg->File = file;
    reg->Index = index;
    reg->Swizzle = MAKE_SWIZZLE4(swizzle[0], swizzle[1], swizzle[2], swizzle[3]);
-   reg->NegateBase = negateMask;
+   reg->Negate = negateMask;
    reg->RelAddr = isRelOffset;
    return 0;
 }
@@ -2703,7 +2703,7 @@ parse_scalar_src_reg(GLcontext *ctx, const GLubyte **inst,
    reg->File = file;
    reg->Index = index;
    reg->Swizzle = (swizzle[0] << 0);
-   reg->NegateBase = negateMask;
+   reg->Negate = negateMask;
    reg->RelAddr = isRelOffset;
    return 0;
 }
@@ -3019,7 +3019,7 @@ parse_fp_instruction (GLcontext * ctx, const GLubyte ** inst,
 	    parse_extended_swizzle_mask(inst, swizzle, &negateMask);
 	    fp->SrcReg[0].File = file;
 	    fp->SrcReg[0].Index = index;
-	    fp->SrcReg[0].NegateBase = negateMask;
+	    fp->SrcReg[0].Negate = negateMask;
 	    fp->SrcReg[0].Swizzle = MAKE_SWIZZLE4(swizzle[0],
                                                   swizzle[1],
                                                   swizzle[2],
@@ -3363,7 +3363,7 @@ parse_vp_instruction (GLcontext * ctx, const GLubyte ** inst,
 	    parse_extended_swizzle_mask (inst, swizzle, &negateMask);
 	    vp->SrcReg[0].File = file;
 	    vp->SrcReg[0].Index = index;
-	    vp->SrcReg[0].NegateBase = negateMask;
+	    vp->SrcReg[0].Negate = negateMask;
 	    vp->SrcReg[0].Swizzle = MAKE_SWIZZLE4(swizzle[0],
                                                   swizzle[1],
                                                   swizzle[2],
diff --git a/src/mesa/shader/nvfragparse.c b/src/mesa/shader/nvfragparse.c
index 56b7c29bea..0fd55524ab 100644
--- a/src/mesa/shader/nvfragparse.c
+++ b/src/mesa/shader/nvfragparse.c
@@ -957,6 +957,7 @@ Parse_VectorSrc(struct parse_state *parseState,
    GLfloat sign = 1.0F;
    GLubyte token[100];
    GLint idx;
+   GLuint negateBase, negateAbs;
 
    /*
     * First, take care of +/- and absolute value stuff.
@@ -968,21 +969,23 @@ Parse_VectorSrc(struct parse_state *parseState,
 
    if (Parse_String(parseState, "|")) {
       srcReg->Abs = GL_TRUE;
-      srcReg->NegateAbs = (sign < 0.0F) ? GL_TRUE : GL_FALSE;
+      negateAbs = (sign < 0.0F) ? NEGATE_XYZW : NEGATE_NONE;
 
       if (Parse_String(parseState, "-"))
-         srcReg->NegateBase = NEGATE_XYZW;
+         negateBase = NEGATE_XYZW;
       else if (Parse_String(parseState, "+"))
-         srcReg->NegateBase = NEGATE_NONE;
+         negateBase = NEGATE_NONE;
       else
-         srcReg->NegateBase = NEGATE_NONE;
+         negateBase = NEGATE_NONE;
    }
    else {
       srcReg->Abs = GL_FALSE;
-      srcReg->NegateAbs = GL_FALSE;
-      srcReg->NegateBase = (sign < 0.0F) ? NEGATE_XYZW : NEGATE_NONE;
+      negateAbs = NEGATE_NONE;
+      negateBase = (sign < 0.0F) ? NEGATE_XYZW : NEGATE_NONE;
    }
 
+   srcReg->Negate = srcReg->Abs ? negateAbs : negateBase;
+
    /* This should be the real src vector/register name */
    if (!Peek_Token(parseState, token))
       RETURN_ERROR;
@@ -1083,6 +1086,7 @@ Parse_ScalarSrcReg(struct parse_state *parseState,
    GLfloat sign = 1.0F;
    GLboolean needSuffix = GL_TRUE;
    GLint idx;
+   GLuint negateBase, negateAbs;
 
    /*
     * First, take care of +/- and absolute value stuff.
@@ -1094,21 +1098,23 @@ Parse_ScalarSrcReg(struct parse_state *parseState,
 
    if (Parse_String(parseState, "|")) {
       srcReg->Abs = GL_TRUE;
-      srcReg->NegateAbs = (sign < 0.0F) ? GL_TRUE : GL_FALSE;
+      negateAbs = (sign < 0.0F) ? NEGATE_XYZW : NEGATE_NONE;
 
       if (Parse_String(parseState, "-"))
-         srcReg->NegateBase = NEGATE_XYZW;
+         negateBase = NEGATE_XYZW;
       else if (Parse_String(parseState, "+"))
-         srcReg->NegateBase = NEGATE_NONE;
+         negateBase = NEGATE_NONE;
       else
-         srcReg->NegateBase = NEGATE_NONE;
+         negateBase = NEGATE_NONE;
    }
    else {
       srcReg->Abs = GL_FALSE;
-      srcReg->NegateAbs = GL_FALSE;
-      srcReg->NegateBase = (sign < 0.0F) ? NEGATE_XYZW : NEGATE_NONE;
+      negateAbs = NEGATE_NONE;
+      negateBase = (sign < 0.0F) ? NEGATE_XYZW : NEGATE_NONE;
    }
 
+   srcReg->Negate = srcReg->Abs ? negateAbs : negateBase;
+
    if (!Peek_Token(parseState, token))
       RETURN_ERROR;
 
@@ -1247,9 +1253,8 @@ Parse_PrintInstruction(struct parse_state *parseState,
    }
 
    inst->SrcReg[0].Swizzle = SWIZZLE_NOOP;
-   inst->SrcReg[0].NegateBase = NEGATE_NONE;
    inst->SrcReg[0].Abs = GL_FALSE;
-   inst->SrcReg[0].NegateAbs = GL_FALSE;
+   inst->SrcReg[0].Negate = NEGATE_NONE;
 
    return GL_TRUE;
 }
diff --git a/src/mesa/shader/nvvertparse.c b/src/mesa/shader/nvvertparse.c
index 624262395b..f5e2df2670 100644
--- a/src/mesa/shader/nvvertparse.c
+++ b/src/mesa/shader/nvvertparse.c
@@ -641,12 +641,12 @@ Parse_SwizzleSrcReg(struct parse_state *parseState, struct prog_src_register *sr
       RETURN_ERROR;
    if (token[0] == '-') {
       (void) Parse_String(parseState, "-");
-      srcReg->NegateBase = NEGATE_XYZW;
+      srcReg->Negate = NEGATE_XYZW;
       if (!Peek_Token(parseState, token))
          RETURN_ERROR;
    }
    else {
-      srcReg->NegateBase = NEGATE_NONE;
+      srcReg->Negate = NEGATE_NONE;
    }
 
    /* Src reg can be R<n>, c[n], c[n +/- offset], or a named vertex attrib */
@@ -734,13 +734,13 @@ Parse_ScalarSrcReg(struct parse_state *parseState, struct prog_src_register *src
    if (!Peek_Token(parseState, token))
       RETURN_ERROR;
    if (token[0] == '-') {
-      srcReg->NegateBase = NEGATE_XYZW;
+      srcReg->Negate = NEGATE_XYZW;
       (void) Parse_String(parseState, "-"); /* consume '-' */
       if (!Peek_Token(parseState, token))
          RETURN_ERROR;
    }
    else {
-      srcReg->NegateBase = NEGATE_NONE;
+      srcReg->Negate = NEGATE_NONE;
    }
 
    /* Src reg can be R<n>, c[n], c[n +/- offset], or a named vertex attrib */
@@ -1062,7 +1062,7 @@ Parse_PrintInstruction(struct parse_state *parseState, struct prog_instruction *
          RETURN_ERROR;
 
       srcReg->RelAddr = GL_FALSE;
-      srcReg->NegateBase = NEGATE_NONE;
+      srcReg->Negate = NEGATE_NONE;
       srcReg->Swizzle = SWIZZLE_NOOP;
 
       /* Register can be R<n>, c[n], c[n +/- offset], a named vertex attrib,
diff --git a/src/mesa/shader/prog_execute.c b/src/mesa/shader/prog_execute.c
index bdac1d4f8a..68a59350a1 100644
--- a/src/mesa/shader/prog_execute.c
+++ b/src/mesa/shader/prog_execute.c
@@ -212,19 +212,14 @@ fetch_vector4(const struct prog_src_register *source,
       result[3] = src[GET_SWZ(source->Swizzle, 3)];
    }
 
-   if (source->NegateBase) {
-      result[0] = -result[0];
-      result[1] = -result[1];
-      result[2] = -result[2];
-      result[3] = -result[3];
-   }
    if (source->Abs) {
       result[0] = FABSF(result[0]);
       result[1] = FABSF(result[1]);
       result[2] = FABSF(result[2]);
       result[3] = FABSF(result[3]);
    }
-   if (source->NegateAbs) {
+   if (source->Negate) {
+      ASSERT(source->Negate == NEGATE_XYZW);
       result[0] = -result[0];
       result[1] = -result[1];
       result[2] = -result[2];
@@ -259,7 +254,7 @@ fetch_vector4ui(const struct prog_src_register *source,
       result[3] = src[GET_SWZ(source->Swizzle, 3)];
    }
 
-   /* Note: no NegateBase, Abs, NegateAbs here */
+   /* Note: no Negate or Abs here */
 }
 
 
@@ -299,19 +294,14 @@ fetch_vector4_deriv(GLcontext * ctx,
       result[2] = deriv[GET_SWZ(source->Swizzle, 2)];
       result[3] = deriv[GET_SWZ(source->Swizzle, 3)];
       
-      if (source->NegateBase) {
-         result[0] = -result[0];
-         result[1] = -result[1];
-         result[2] = -result[2];
-         result[3] = -result[3];
-      }
       if (source->Abs) {
          result[0] = FABSF(result[0]);
          result[1] = FABSF(result[1]);
          result[2] = FABSF(result[2]);
          result[3] = FABSF(result[3]);
       }
-      if (source->NegateAbs) {
+      if (source->Negate) {
+         ASSERT(source->Negate == NEGATE_XYZW);
          result[0] = -result[0];
          result[1] = -result[1];
          result[2] = -result[2];
@@ -336,13 +326,10 @@ fetch_vector1(const struct prog_src_register *source,
 
    result[0] = src[GET_SWZ(source->Swizzle, 0)];
 
-   if (source->NegateBase) {
-      result[0] = -result[0];
-   }
    if (source->Abs) {
       result[0] = FABSF(result[0]);
    }
-   if (source->NegateAbs) {
+   if (source->Negate) {
       result[0] = -result[0];
    }
 }
@@ -1514,7 +1501,7 @@ _mesa_execute_program(GLcontext * ctx,
                   ASSERT(swz <= 3);
                   result[i] = src[swz];
                }
-               if (source->NegateBase & (1 << i))
+               if (source->Negate & (1 << i))
                   result[i] = -result[i];
             }
             store_vector4(inst, machine, result);
diff --git a/src/mesa/shader/prog_instruction.h b/src/mesa/shader/prog_instruction.h
index 4adce11f95..3109f6cbae 100644
--- a/src/mesa/shader/prog_instruction.h
+++ b/src/mesa/shader/prog_instruction.h
@@ -261,37 +261,15 @@ struct prog_src_register
    GLuint Swizzle:12;
    GLuint RelAddr:1;
 
-   /**
-    * \name Source register "sign" control.
-    *
-    * The ARB and NV extensions allow varrying degrees of control over the
-    * sign of the source vector components.  These values allow enough control
-    * for all flavors of the extensions.
-    */
-   /*@{*/
-   /**
-    * Per-component negation for the SWZ instruction.  For non-SWZ
-    * instructions the only possible values are NEGATE_XYZW and NEGATE_NONE.
-    *
-    * \since
-    * ARB_vertex_program, ARB_fragment_program
-    */
-   GLuint NegateBase:4;
-
-   /**
-    * Take the component-wise absolute value.
-    *
-    * \since
-    * NV_fragment_program, NV_fragment_program_option, NV_vertex_program2,
-    * NV_vertex_program2_option.
-    */
+   /** Take the component-wise absolute value */
    GLuint Abs:1;
 
    /**
-    * Post-absolute value negation (all components).
+    * Post-Abs negation.
+    * This will either be NEGATE_NONE or NEGATE_XYZW, except for the SWZ
+    * instruction which allows per-component negation.
     */
-   GLuint NegateAbs:1;
-   /*@}*/
+   GLuint Negate:4;
 };
 
 
diff --git a/src/mesa/shader/prog_print.c b/src/mesa/shader/prog_print.c
index b832ddb477..d73c619fea 100644
--- a/src/mesa/shader/prog_print.c
+++ b/src/mesa/shader/prog_print.c
@@ -325,19 +325,19 @@ reg_string(gl_register_file f, GLint index, gl_prog_print_mode mode,
  * \param extended  if true, also allow 0, 1 values
  */
 const char *
-_mesa_swizzle_string(GLuint swizzle, GLuint negateBase, GLboolean extended)
+_mesa_swizzle_string(GLuint swizzle, GLuint negateMask, GLboolean extended)
 {
    static const char swz[] = "xyzw01!?";  /* See SWIZZLE_x definitions */
    static char s[20];
    GLuint i = 0;
 
-   if (!extended && swizzle == SWIZZLE_NOOP && negateBase == 0)
+   if (!extended && swizzle == SWIZZLE_NOOP && negateMask == 0)
       return ""; /* no swizzle/negation */
 
    if (!extended)
       s[i++] = '.';
 
-   if (negateBase & NEGATE_X)
+   if (negateMask & NEGATE_X)
       s[i++] = '-';
    s[i++] = swz[GET_SWZ(swizzle, 0)];
 
@@ -345,7 +345,7 @@ _mesa_swizzle_string(GLuint swizzle, GLuint negateBase, GLboolean extended)
       s[i++] = ',';
    }
 
-   if (negateBase & NEGATE_Y)
+   if (negateMask & NEGATE_Y)
       s[i++] = '-';
    s[i++] = swz[GET_SWZ(swizzle, 1)];
 
@@ -353,7 +353,7 @@ _mesa_swizzle_string(GLuint swizzle, GLuint negateBase, GLboolean extended)
       s[i++] = ',';
    }
 
-   if (negateBase & NEGATE_Z)
+   if (negateMask & NEGATE_Z)
       s[i++] = '-';
    s[i++] = swz[GET_SWZ(swizzle, 2)];
 
@@ -361,7 +361,7 @@ _mesa_swizzle_string(GLuint swizzle, GLuint negateBase, GLboolean extended)
       s[i++] = ',';
    }
 
-   if (negateBase & NEGATE_W)
+   if (negateMask & NEGATE_W)
       s[i++] = '-';
    s[i++] = swz[GET_SWZ(swizzle, 3)];
 
@@ -465,14 +465,14 @@ fprint_src_reg(FILE *f,
                  reg_string((gl_register_file) srcReg->File,
                             srcReg->Index, mode, srcReg->RelAddr, prog),
                  _mesa_swizzle_string(srcReg->Swizzle,
-                                      srcReg->NegateBase, GL_FALSE),
+                                      srcReg->Negate, GL_FALSE),
                  abs);
 #if 0
    _mesa_fprintf(f, "%s[%d]%s",
                  file_string((gl_register_file) srcReg->File, mode),
                  srcReg->Index,
                  _mesa_swizzle_string(srcReg->Swizzle,
-                                      srcReg->NegateBase, GL_FALSE));
+                                      srcReg->Negate, GL_FALSE));
 #endif
 }
 
@@ -566,7 +566,7 @@ _mesa_fprint_instruction_opt(FILE *f,
                                   mode),
                       inst->SrcReg[0].Index,
                       _mesa_swizzle_string(inst->SrcReg[0].Swizzle,
-                                           inst->SrcReg[0].NegateBase, GL_FALSE));
+                                           inst->SrcReg[0].Negate, GL_FALSE));
       }
       if (inst->Comment)
          _mesa_fprintf(f, "  # %s", inst->Comment);
@@ -583,7 +583,7 @@ _mesa_fprint_instruction_opt(FILE *f,
                                mode),
                    inst->SrcReg[0].Index,
                    _mesa_swizzle_string(inst->SrcReg[0].Swizzle,
-                                        inst->SrcReg[0].NegateBase, GL_TRUE));
+                                        inst->SrcReg[0].Negate, GL_TRUE));
       fprint_comment(f, inst);
       break;
    case OPCODE_TEX:
diff --git a/src/mesa/shader/programopt.c b/src/mesa/shader/programopt.c
index e283f8933b..ecd98dc85c 100644
--- a/src/mesa/shader/programopt.c
+++ b/src/mesa/shader/programopt.c
@@ -241,7 +241,7 @@ _mesa_append_fog_code(GLcontext *ctx, struct gl_fragment_program *fprog)
       inst->DstReg.WriteMask = WRITEMASK_X;
       inst->SrcReg[0].File = PROGRAM_TEMPORARY;
       inst->SrcReg[0].Index = fogFactorTemp;
-      inst->SrcReg[0].NegateBase = NEGATE_XYZW;
+      inst->SrcReg[0].Negate = NEGATE_XYZW;
       inst->SrcReg[0].Swizzle = SWIZZLE_XXXX;
       inst->SaturateMode = SATURATE_ZERO_ONE;
       inst++;
diff --git a/src/mesa/shader/slang/slang_emit.c b/src/mesa/shader/slang/slang_emit.c
index 8493c490fb..3f455e0640 100644
--- a/src/mesa/shader/slang/slang_emit.c
+++ b/src/mesa/shader/slang/slang_emit.c
@@ -1135,7 +1135,7 @@ emit_negation(slang_emit_info *emitInfo, slang_ir_node *n)
                            n->Children[0]->Store,
                            NULL,
                            NULL);
-   inst->SrcReg[0].NegateBase = NEGATE_XYZW;
+   inst->SrcReg[0].Negate = NEGATE_XYZW;
    return inst;
 }
 
diff --git a/src/mesa/state_tracker/st_cb_bitmap.c b/src/mesa/state_tracker/st_cb_bitmap.c
index 3b2ad00f5c..fa4f4082a7 100644
--- a/src/mesa/state_tracker/st_cb_bitmap.c
+++ b/src/mesa/state_tracker/st_cb_bitmap.c
@@ -147,7 +147,7 @@ make_bitmap_fragment_program(GLcontext *ctx, GLuint samplerIndex)
       p->Instructions[ic].SrcReg[0].Swizzle = SWIZZLE_XXXX;
 
    p->Instructions[ic].SrcReg[0].Index = 0;
-   p->Instructions[ic].SrcReg[0].NegateBase = NEGATE_XYZW;
+   p->Instructions[ic].SrcReg[0].Negate = NEGATE_XYZW;
    ic++;
 
    /* END; */
diff --git a/src/mesa/state_tracker/st_mesa_to_tgsi.c b/src/mesa/state_tracker/st_mesa_to_tgsi.c
index ffa607dd87..43c9afccc3 100644
--- a/src/mesa/state_tracker/st_mesa_to_tgsi.c
+++ b/src/mesa/state_tracker/st_mesa_to_tgsi.c
@@ -275,8 +275,8 @@ compile_instruction(
       /* swizzle (ext swizzle also depends on negation) */
       {
          GLuint swz[4];
-         GLboolean extended = (inst->SrcReg[i].NegateBase != NEGATE_NONE &&
-                               inst->SrcReg[i].NegateBase != NEGATE_XYZW);
+         GLboolean extended = (inst->SrcReg[i].Negate != NEGATE_NONE &&
+                               inst->SrcReg[i].Negate != NEGATE_XYZW);
          for( j = 0; j < 4; j++ ) {
             swz[j] = GET_SWZ( inst->SrcReg[i].Swizzle, j );
             if (swz[j] > SWIZZLE_W)
@@ -296,20 +296,20 @@ compile_instruction(
          }
       }
 
-      if( inst->SrcReg[i].NegateBase == NEGATE_XYZW ) {
+      if( inst->SrcReg[i].Negate == NEGATE_XYZW ) {
          fullsrc->SrcRegister.Negate = 1;
       }
-      else if( inst->SrcReg[i].NegateBase != NEGATE_NONE ) {
-         if( inst->SrcReg[i].NegateBase & NEGATE_X ) {
+      else if( inst->SrcReg[i].Negate != NEGATE_NONE ) {
+         if( inst->SrcReg[i].Negate & NEGATE_X ) {
             fullsrc->SrcRegisterExtSwz.NegateX = 1;
          }
-         if( inst->SrcReg[i].NegateBase & NEGATE_Y ) {
+         if( inst->SrcReg[i].Negate & NEGATE_Y ) {
             fullsrc->SrcRegisterExtSwz.NegateY = 1;
          }
-         if( inst->SrcReg[i].NegateBase & NEGATE_Z ) {
+         if( inst->SrcReg[i].Negate & NEGATE_Z ) {
             fullsrc->SrcRegisterExtSwz.NegateZ = 1;
          }
-         if( inst->SrcReg[i].NegateBase & NEGATE_W ) {
+         if( inst->SrcReg[i].Negate & NEGATE_W ) {
             fullsrc->SrcRegisterExtSwz.NegateW = 1;
          }
       }
@@ -318,10 +318,6 @@ compile_instruction(
          fullsrc->SrcRegisterExtMod.Absolute = 1;
       }
 
-      if( inst->SrcReg[i].NegateAbs ) {
-         fullsrc->SrcRegisterExtMod.Negate = 1;
-      }
-
       if( inst->SrcReg[i].RelAddr ) {
          fullsrc->SrcRegister.Indirect = 1;
 
-- 
cgit v1.2.3


From c710430f3ac05c0c6a528bb7b4f82383a26103d1 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Fri, 10 Apr 2009 16:47:14 -0700
Subject: mesa: Update texenv program when _NEW_ARRAYS is updated as well.

This fixes a regression in fbotest1 on 915, where a transition from
color+vertex array enabled to texcoord0+vertex array enabled wouldn't trigger
program update on the second _mesa_update_state of DrawArrays, and we'd sample
a constant texcoord of 0,0,0,1 instead of the array.

The double state update in DrawArrays from
1680ef869625dc1fe9cf481b180382a34e0738e7 still needs fixing.
---
 src/mesa/main/state.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index cc37d63636..4f9088dd22 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -470,7 +470,8 @@ _mesa_update_state_locked( GLcontext *ctx )
 
    /* Determine which state flags effect vertex/fragment program state */
    if (ctx->FragmentProgram._MaintainTexEnvProgram) {
-      prog_flags |= (_NEW_TEXTURE | _NEW_FOG | _DD_NEW_SEPARATE_SPECULAR);
+      prog_flags |= (_NEW_TEXTURE | _NEW_FOG | _DD_NEW_SEPARATE_SPECULAR |
+		     _NEW_ARRAY);
    }
    if (ctx->VertexProgram._MaintainTnlProgram) {
       prog_flags |= (_NEW_ARRAY | _NEW_TEXTURE | _NEW_TEXTURE_MATRIX |
-- 
cgit v1.2.3


From d82876e850960eb5e3799c4ab02b618c4b548fd8 Mon Sep 17 00:00:00 2001
From: Lars Henning Wendt <lhwendt@igd.fhg.de>
Date: Thu, 16 Apr 2009 10:14:17 -0600
Subject: mesa: fix bad mask bit in clip plane restore code for glPopAttrib()

---
 src/mesa/main/attrib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index d5d0a552db..e43fa96dd3 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -1265,7 +1265,7 @@ _mesa_PopAttrib(void)
 
                /* restore clip planes */
                for (i = 0; i < MAX_CLIP_PLANES; i++) {
-                  const GLuint mask = 1 << 1;
+                  const GLuint mask = 1 << i;
                   const GLfloat *eyePlane = xform->EyeUserPlane[i];
                   COPY_4V(ctx->Transform.EyeUserPlane[i], eyePlane);
                   if (xform->ClipPlanesEnabled & mask) {
-- 
cgit v1.2.3


From 08ac96e55b6e4f30d75307b796a271b824ffd4ac Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 16 Apr 2009 16:29:45 -0600
Subject: mesa: minor tweak to error message

---
 src/mesa/main/matrix.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/matrix.c b/src/mesa/main/matrix.c
index 7388276c45..39b4967a58 100644
--- a/src/mesa/main/matrix.c
+++ b/src/mesa/main/matrix.c
@@ -161,7 +161,7 @@ _mesa_MatrixMode( GLenum mode )
       break;
    case GL_TEXTURE:
       if (ctx->Texture.CurrentUnit >= ctx->Const.MaxTextureCoordUnits) {
-         _mesa_error(ctx, GL_INVALID_OPERATION, "glMatrixMode(invalid unit %d)",
+         _mesa_error(ctx, GL_INVALID_OPERATION, "glMatrixMode(invalid tex unit %d)",
                      ctx->Texture.CurrentUnit);
          return;
       }
-- 
cgit v1.2.3


From 36b0f26721652639351522915d9a57f9d4a8bcde Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 17 Apr 2009 16:04:41 -0600
Subject: mesa: suppress extra newline

---
 src/mesa/main/context.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index b24a3b4409..4cff36adfa 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -434,7 +434,7 @@ one_time_init( GLcontext *ctx )
       }
 
 #if defined(DEBUG) && defined(__DATE__) && defined(__TIME__)
-      _mesa_debug(ctx, "Mesa %s DEBUG build %s %s\n",
+      _mesa_debug(ctx, "Mesa %s DEBUG build %s %s",
                   MESA_VERSION_STRING, __DATE__, __TIME__);
 #endif
 
-- 
cgit v1.2.3


From 64e331eb529e66ef678804594c8a3266c97e645f Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 21 Apr 2009 15:56:45 -0600
Subject: mesa: new _NEW_PROGRAM_CONSTANTS flag

This state flag will be used to indicate that vertex/fragment program
constants have changed.  _NEW_PROGRAM will be used to indicate changes
to the vertex/fragment shader itself, or misc related state.

_NEW_PROGRAM_CONSTANTS is also set whenever a program parameter that's
tracking GL state has changed.  For example, if the projection matrix is
in the parameter list, calling glFrustum() will cause _NEW_PROGRAM_CONSTANTS
to be set.  This will let to remove the need for dynamic state atoms in
some drivers.

For now, we still set _NEW_PROGRAM in all the places we used to.  We'll no
longer set _NEW_PROGRAM in glUniform() after drivers/etc have been updated.
---
 src/mesa/main/mtypes.h       |  1 +
 src/mesa/main/state.c        | 36 +++++++++++++++++++++++++++++++++++-
 src/mesa/shader/arbprogram.c | 10 ++++------
 src/mesa/shader/nvprogram.c  |  2 +-
 src/mesa/shader/shader_api.c |  4 ++--
 5 files changed, 43 insertions(+), 10 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 3f31590000..30c7cca3b5 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2615,6 +2615,7 @@ struct gl_matrix_stack
 #define _NEW_TRACK_MATRIX       0x4000000  /**< __GLcontextRec::VertexProgram */
 #define _NEW_PROGRAM            0x8000000  /**< __GLcontextRec::VertexProgram */
 #define _NEW_CURRENT_ATTRIB     0x10000000  /**< __GLcontextRec::Current */
+#define _NEW_PROGRAM_CONSTANTS  0x20000000
 #define _NEW_ALL ~0
 /*@}*/
 
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 4f9088dd22..f18fc8f683 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -44,6 +44,7 @@
 #include "pixel.h"
 #endif
 #include "shader/program.h"
+#include "shader/prog_parameter.h"
 #include "state.h"
 #include "stencil.h"
 #include "texenvprogram.h"
@@ -303,6 +304,36 @@ update_program(GLcontext *ctx)
 }
 
 
+/**
+ * Examine shader constants and return either _NEW_PROGRAM_CONSTANTS or 0.
+ */
+static GLbitfield
+update_program_constants(GLcontext *ctx)
+{
+   GLbitfield new_state = 0x0;
+
+   if (ctx->FragmentProgram._Current) {
+      const struct gl_program_parameter_list *params =
+         ctx->FragmentProgram._Current->Base.Parameters;
+      if (params && params->StateFlags & ctx->NewState) {
+         new_state |= _NEW_PROGRAM_CONSTANTS;
+      }
+   }
+
+   if (ctx->VertexProgram._Current) {
+      const struct gl_program_parameter_list *params =
+         ctx->VertexProgram._Current->Base.Parameters;
+      if (params && params->StateFlags & ctx->NewState) {
+         new_state |= _NEW_PROGRAM_CONSTANTS;
+      }
+   }
+
+   return new_state;
+}
+
+
+
+
 static void
 update_viewport_matrix(GLcontext *ctx)
 {
@@ -554,6 +585,10 @@ _mesa_update_state_locked( GLcontext *ctx )
       new_prog_state |= update_program( ctx );
    }
 
+
+ out:
+   new_prog_state |= update_program_constants(ctx);
+
    /*
     * Give the driver a chance to act upon the new_state flags.
     * The driver might plug in different span functions, for example.
@@ -563,7 +598,6 @@ _mesa_update_state_locked( GLcontext *ctx )
     * Set ctx->NewState to zero to avoid recursion if
     * Driver.UpdateState() has to call FLUSH_VERTICES().  (fixed?)
     */
- out:
    new_state = ctx->NewState | new_prog_state;
    ctx->NewState = 0;
    ctx->Driver.UpdateState(ctx, new_state);
diff --git a/src/mesa/shader/arbprogram.c b/src/mesa/shader/arbprogram.c
index 329c0ea0b0..981565ab8f 100644
--- a/src/mesa/shader/arbprogram.c
+++ b/src/mesa/shader/arbprogram.c
@@ -489,7 +489,7 @@ _mesa_ProgramEnvParameter4fARB(GLenum target, GLuint index,
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-   FLUSH_VERTICES(ctx, _NEW_PROGRAM);
+   FLUSH_VERTICES(ctx, _NEW_PROGRAM | _NEW_PROGRAM_CONSTANTS);
 
    if (target == GL_FRAGMENT_PROGRAM_ARB
        && ctx->Extensions.ARB_fragment_program) {
@@ -537,7 +537,7 @@ _mesa_ProgramEnvParameters4fvEXT(GLenum target, GLuint index, GLsizei count,
    GLfloat * dest;
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-   FLUSH_VERTICES(ctx, _NEW_PROGRAM);
+   FLUSH_VERTICES(ctx, _NEW_PROGRAM | _NEW_PROGRAM_CONSTANTS);
 
    if (count <= 0) {
       _mesa_error(ctx, GL_INVALID_VALUE, "glProgramEnvParameters4fv(count)");
@@ -595,8 +595,6 @@ _mesa_GetProgramEnvParameterfvARB(GLenum target, GLuint index,
 {
    GET_CURRENT_CONTEXT(ctx);
 
-   FLUSH_VERTICES(ctx, _NEW_PROGRAM);
-
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
    if (target == GL_FRAGMENT_PROGRAM_ARB
@@ -633,7 +631,7 @@ _mesa_ProgramLocalParameter4fARB(GLenum target, GLuint index,
    struct gl_program *prog;
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-   FLUSH_VERTICES(ctx, _NEW_PROGRAM);
+   FLUSH_VERTICES(ctx, _NEW_PROGRAM | _NEW_PROGRAM_CONSTANTS);
 
    if ((target == GL_FRAGMENT_PROGRAM_NV
         && ctx->Extensions.NV_fragment_program) ||
@@ -687,7 +685,7 @@ _mesa_ProgramLocalParameters4fvEXT(GLenum target, GLuint index, GLsizei count,
    GLint i;
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-   FLUSH_VERTICES(ctx, _NEW_PROGRAM);
+   FLUSH_VERTICES(ctx, _NEW_PROGRAM | _NEW_PROGRAM_CONSTANTS);
 
    if (count <= 0) {
       _mesa_error(ctx, GL_INVALID_VALUE, "glProgramLocalParameters4fv(count)");
diff --git a/src/mesa/shader/nvprogram.c b/src/mesa/shader/nvprogram.c
index 50358cf107..5142c2a4a5 100644
--- a/src/mesa/shader/nvprogram.c
+++ b/src/mesa/shader/nvprogram.c
@@ -706,7 +706,7 @@ _mesa_ProgramNamedParameter4fNV(GLuint id, GLsizei len, const GLubyte *name,
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-   FLUSH_VERTICES(ctx, _NEW_PROGRAM);
+   FLUSH_VERTICES(ctx, _NEW_PROGRAM | _NEW_PROGRAM_CONSTANTS);
 
    prog = _mesa_lookup_program(ctx, id);
    if (!prog || prog->Target != GL_FRAGMENT_PROGRAM_NV) {
diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index 9038f7d1de..644cd39185 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -1789,7 +1789,7 @@ _mesa_uniform(GLcontext *ctx, GLint location, GLsizei count,
       return;
    }
 
-   FLUSH_VERTICES(ctx, _NEW_PROGRAM);
+   FLUSH_VERTICES(ctx, _NEW_PROGRAM | _NEW_PROGRAM_CONSTANTS);
 
    uniform = &shProg->Uniforms->Uniforms[location];
 
@@ -1929,7 +1929,7 @@ _mesa_uniform_matrix(GLcontext *ctx, GLint cols, GLint rows,
       return;
    }
 
-   FLUSH_VERTICES(ctx, _NEW_PROGRAM);
+   FLUSH_VERTICES(ctx, _NEW_PROGRAM | _NEW_PROGRAM_CONSTANTS);
 
    uniform = &shProg->Uniforms->Uniforms[location];
 
-- 
cgit v1.2.3


From 009749b4a8c3ec54f47f3f85552e5ae275ab6ae6 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keithw@vmware.com>
Date: Tue, 21 Apr 2009 16:55:57 +0100
Subject: mesa: protect driver.flush() with FLUSH_CURRENT

Need to do this to ensure vbo code unmaps its buffers before calling
the driver, which may be sitting on top of a memory manager which
objects to firing commands from a mapped buffer.
---
 src/mesa/main/context.c  |  3 ++-
 src/mesa/main/fbobject.c | 13 ++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 4cff36adfa..5726dbd983 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -187,7 +187,7 @@ GLfloat _mesa_ubyte_to_float_color_tab[256];
 void
 _mesa_notifySwapBuffers(__GLcontext *ctx)
 {
-   FLUSH_VERTICES( ctx, 0 );
+   FLUSH_CURRENT( ctx, 0 );
    if (ctx->Driver.Flush) {
       ctx->Driver.Flush(ctx);
    }
@@ -1514,6 +1514,7 @@ _mesa_Flush(void)
 {
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+   FLUSH_CURRENT( ctx, 0 );
    if (ctx->Driver.Flush) {
       ctx->Driver.Flush(ctx);
    }
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 151e29053a..9c5a5908a2 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -692,7 +692,7 @@ _mesa_BindRenderbufferEXT(GLenum target, GLuint renderbuffer)
       return;
    }
 
-   FLUSH_VERTICES(ctx, _NEW_BUFFERS);
+   FLUSH_CURRENT(ctx, _NEW_BUFFERS);
    /* The above doesn't fully flush the drivers in the way that a
     * glFlush does, but that is required here:
     */
@@ -1187,8 +1187,7 @@ _mesa_BindFramebufferEXT(GLenum target, GLuint framebuffer)
       return;
    }
 
-   FLUSH_VERTICES(ctx, _NEW_BUFFERS);
-
+   FLUSH_CURRENT(ctx, _NEW_BUFFERS);
    if (ctx->Driver.Flush) {  
       ctx->Driver.Flush(ctx);
    }
@@ -1269,7 +1268,7 @@ _mesa_DeleteFramebuffersEXT(GLsizei n, const GLuint *framebuffers)
    GET_CURRENT_CONTEXT(ctx);
 
    ASSERT_OUTSIDE_BEGIN_END(ctx);
-   FLUSH_VERTICES(ctx, _NEW_BUFFERS);
+   FLUSH_CURRENT(ctx, _NEW_BUFFERS);
    /* The above doesn't fully flush the drivers in the way that a
     * glFlush does, but that is required here:
     */
@@ -1507,7 +1506,7 @@ framebuffer_texture(GLcontext *ctx, const char *caller, GLenum target,
       }
    }
 
-   FLUSH_VERTICES(ctx, _NEW_BUFFERS);
+   FLUSH_CURRENT(ctx, _NEW_BUFFERS);
    /* The above doesn't fully flush the drivers in the way that a
     * glFlush does, but that is required here:
     */
@@ -1688,7 +1687,7 @@ _mesa_FramebufferRenderbufferEXT(GLenum target, GLenum attachment,
    }
 
 
-   FLUSH_VERTICES(ctx, _NEW_BUFFERS);
+   FLUSH_CURRENT(ctx, _NEW_BUFFERS);
    /* The above doesn't fully flush the drivers in the way that a
     * glFlush does, but that is required here:
     */
@@ -1769,7 +1768,7 @@ _mesa_GetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment,
       }
    }
 
-   FLUSH_VERTICES(ctx, _NEW_BUFFERS);
+   FLUSH_CURRENT(ctx, _NEW_BUFFERS);
    /* The above doesn't fully flush the drivers in the way that a
     * glFlush does, but that is required here:
     */
-- 
cgit v1.2.3


From 8ee6ab6acb8f89fbc87865751573fcbffb4695ef Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 22 Apr 2009 15:02:01 -0600
Subject: mesa: fix _mesa_dump_textures(), add null ptr check

Calling _mesa_dump_textures() deleted the textures... oops!!!
---
 src/mesa/main/debug.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/debug.c b/src/mesa/main/debug.c
index fdd10dd307..2eabcdaf49 100644
--- a/src/mesa/main/debug.c
+++ b/src/mesa/main/debug.c
@@ -3,6 +3,7 @@
  * Version:  6.5
  *
  * Copyright (C) 1999-2005  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -262,7 +263,7 @@ static void
 write_texture_image(struct gl_texture_object *texObj)
 {
    const struct gl_texture_image *img = texObj->Image[0][0];
-   if (img) {
+   if (img && img->Data) {
       char s[100];
 
       /* make filename */
@@ -338,5 +339,5 @@ _mesa_dump_textures(GLboolean dumpImages)
 {
    GET_CURRENT_CONTEXT(ctx);
    DumpImages = dumpImages;
-   _mesa_HashDeleteAll(ctx->Shared->TexObjects, dump_texture_cb, ctx);
+   _mesa_HashWalk(ctx->Shared->TexObjects, dump_texture_cb, ctx);
 }
-- 
cgit v1.2.3


From 725d50601c2c010ce427a23a6e023f79df8a3a22 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 22 Apr 2009 16:38:04 -0600
Subject: mesa: fix comment typo

---
 src/mesa/main/pixel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/pixel.c b/src/mesa/main/pixel.c
index 52781e048e..57ae9c721a 100644
--- a/src/mesa/main/pixel.c
+++ b/src/mesa/main/pixel.c
@@ -819,7 +819,7 @@ update_image_transfer_state(GLcontext *ctx)
 
 
 /**
- * Update meas pixel transfer derived state.
+ * Update mesa pixel transfer derived state.
  */
 void _mesa_update_pixel( GLcontext *ctx, GLuint new_state )
 {
-- 
cgit v1.2.3


From 6b0c9366a3f13d74c00666cb7c26b65732f6b1aa Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 22 Apr 2009 16:41:05 -0600
Subject: mesa: minor state-update changes in histogram code

Call FLUSH_VERTICES() in _mesa_Histogram().
No need to signal _NEW_PIXEL in ResetHistogram(), ResetMinmax().
---
 src/mesa/main/histogram.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/histogram.c b/src/mesa/main/histogram.c
index 905c1ad830..5fee4fd0e3 100644
--- a/src/mesa/main/histogram.c
+++ b/src/mesa/main/histogram.c
@@ -975,6 +975,8 @@ _mesa_Histogram(GLenum target, GLsizei width, GLenum internalFormat, GLboolean s
       }
    }
 
+   FLUSH_VERTICES(ctx, _NEW_PIXEL);
+
    /* reset histograms */
    for (i = 0; i < HISTOGRAM_TABLE_SIZE; i++) {
       ctx->Histogram.Count[i][0] = 0;
@@ -1002,8 +1004,6 @@ _mesa_Histogram(GLenum target, GLsizei width, GLenum internalFormat, GLboolean s
       ctx->Histogram.AlphaSize     = 8 * sizeof(GLuint);
       ctx->Histogram.LuminanceSize = 8 * sizeof(GLuint);
    }
-
-   ctx->NewState |= _NEW_PIXEL;
 }
 
 
@@ -1058,8 +1058,6 @@ _mesa_ResetHistogram(GLenum target)
       ctx->Histogram.Count[i][2] = 0;
       ctx->Histogram.Count[i][3] = 0;
    }
-
-   ctx->NewState |= _NEW_PIXEL;
 }
 
 
@@ -1083,7 +1081,6 @@ _mesa_ResetMinmax(GLenum target)
    ctx->MinMax.Min[GCOMP] = 1000;    ctx->MinMax.Max[GCOMP] = -1000;
    ctx->MinMax.Min[BCOMP] = 1000;    ctx->MinMax.Max[BCOMP] = -1000;
    ctx->MinMax.Min[ACOMP] = 1000;    ctx->MinMax.Max[ACOMP] = -1000;
-   ctx->NewState |= _NEW_PIXEL;
 }
 
 
-- 
cgit v1.2.3


From 1d0039959302fddd560dc7f9642f312e588cce0e Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 23 Apr 2009 17:54:34 -0600
Subject: mesa: more informative error messages

---
 src/mesa/main/texparam.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index 515a35cdfc..e60ab6aa12 100644
--- a/src/mesa/main/texparam.c
+++ b/src/mesa/main/texparam.c
@@ -69,7 +69,7 @@ validate_texture_wrap_mode(GLcontext * ctx, GLenum target, GLenum wrap)
       return GL_TRUE;
    }
 
-   _mesa_error( ctx, GL_INVALID_VALUE, "glTexParameter(param)" );
+   _mesa_error( ctx, GL_INVALID_VALUE, "glTexParameter(param=0x%x)", wrap );
    return GL_FALSE;
 }
 
@@ -209,7 +209,8 @@ set_tex_parameteri(GLcontext *ctx,
          }
          /* fall-through */
       default:
-         _mesa_error( ctx, GL_INVALID_VALUE, "glTexParameter(param)" );
+         _mesa_error( ctx, GL_INVALID_VALUE, "glTexParameter(param=0x%x)",
+                      params[0] );
       }
       return GL_FALSE;
 
@@ -223,7 +224,8 @@ set_tex_parameteri(GLcontext *ctx,
          texObj->MagFilter = params[0];
          return GL_TRUE;
       default:
-         _mesa_error( ctx, GL_INVALID_VALUE, "glTexParameter(param)" );
+         _mesa_error( ctx, GL_INVALID_VALUE, "glTexParameter(param=0x%x)",
+                      params[0]);
       }
       return GL_FALSE;
 
@@ -262,7 +264,8 @@ set_tex_parameteri(GLcontext *ctx,
          return GL_FALSE;
       if (params[0] < 0 ||
           (texObj->Target == GL_TEXTURE_RECTANGLE_ARB && params[0] != 0)) {
-         _mesa_error(ctx, GL_INVALID_VALUE, "glTexParameter(param)");
+         _mesa_error(ctx, GL_INVALID_VALUE,
+                     "glTexParameter(param=%d)", params[0]);
          return GL_FALSE;
       }
       flush(ctx, texObj);
@@ -273,7 +276,8 @@ set_tex_parameteri(GLcontext *ctx,
       if (texObj->MaxLevel == params[0])
          return GL_FALSE;
       if (params[0] < 0 || texObj->Target == GL_TEXTURE_RECTANGLE_ARB) {
-         _mesa_error(ctx, GL_INVALID_OPERATION, "glTexParameter(param)");
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glTexParameter(param=%d)", params[0]);
          return GL_FALSE;
       }
       flush(ctx, texObj);
@@ -340,7 +344,7 @@ set_tex_parameteri(GLcontext *ctx,
          }
       }
       else {
-         _mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(param)");
+         _mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(pname=0x%x)", pname);
       }
       return GL_FALSE;
 
-- 
cgit v1.2.3


From 1c9786894cc3ce66665ca507a6daf6a829e5af89 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 24 Apr 2009 10:46:40 -0600
Subject: mesa: fix up error/warning/debug output newlines

As of commit 23ad86cfb91c294ce85a3116d4b825aaa3988a6e all messages go
through output_if_debug().

Add new parameter to output_if_debug() to indicate whether to emit a newline.

_mesa_warning() and _mesa_error() calls should not end their strings with \n.
_mesa_debug() calls should end their text with \n.
---
 src/mesa/main/context.c |  2 +-
 src/mesa/main/imports.c | 35 ++++++++++++++++++++++++++---------
 2 files changed, 27 insertions(+), 10 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 5726dbd983..4469c8e1fa 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -434,7 +434,7 @@ one_time_init( GLcontext *ctx )
       }
 
 #if defined(DEBUG) && defined(__DATE__) && defined(__TIME__)
-      _mesa_debug(ctx, "Mesa %s DEBUG build %s %s",
+      _mesa_debug(ctx, "Mesa %s DEBUG build %s %s\n",
                   MESA_VERSION_STRING, __DATE__, __TIME__);
 #endif
 
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 2ac93a5237..8797f36695 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -980,7 +980,8 @@ _mesa_vsprintf( char *str, const char *fmt, va_list args )
 /*@{*/
 
 static void
-output_if_debug(const char *prefixString, const char *outputString)
+output_if_debug(const char *prefixString, const char *outputString,
+                GLboolean newline)
 {
    static int debug = -1;
 
@@ -1004,16 +1005,19 @@ output_if_debug(const char *prefixString, const char *outputString)
 
    /* Now only print the string if we're required to do so. */
    if (debug) {
-      fprintf(stderr, "%s: %s\n", prefixString, outputString);
+      fprintf(stderr, "%s: %s", prefixString, outputString);
+      if (newline)
+         fprintf(stderr, "\n");
    }
 }
 
+
 /**
  * Report a warning (a recoverable error condition) to stderr if
  * either DEBUG is defined or the MESA_DEBUG env var is set.
  *
  * \param ctx GL context.
- * \param fmtString printf() alike format string.
+ * \param fmtString printf()-like format string.
  */
 void
 _mesa_warning( GLcontext *ctx, const char *fmtString, ... )
@@ -1025,11 +1029,12 @@ _mesa_warning( GLcontext *ctx, const char *fmtString, ... )
    (void) vsnprintf( str, MAXSTRING, fmtString, args );
    va_end( args );
 
-   output_if_debug("Mesa warning", str);
+   output_if_debug("Mesa warning", str, GL_TRUE);
 }
 
+
 /**
- * Report an internla implementation problem.
+ * Report an internal implementation problem.
  * Prints the message to stderr via fprintf().
  *
  * \param ctx GL context.
@@ -1050,8 +1055,9 @@ _mesa_problem( const GLcontext *ctx, const char *fmtString, ... )
    fprintf(stderr, "Please report at bugzilla.freedesktop.org\n");
 }
 
+
 /**
- * Record an OpenGL state error.  These usually occur when the users
+ * Record an OpenGL state error.  These usually occur when the user
  * passes invalid parameters to a GL function.
  *
  * If debugging is enabled (either at compile-time via the DEBUG macro, or
@@ -1123,11 +1129,22 @@ _mesa_error( GLcontext *ctx, GLenum error, const char *fmtString, ... )
 	    errstr = "unknown";
 	    break;
       }
-      _mesa_debug(ctx, "User error: %s in %s\n", errstr, where);
+
+      {
+         char s[MAXSTRING], s2[MAXSTRING];
+         va_list args;
+         va_start(args, fmtString);
+         vsnprintf(s, MAXSTRING, fmtString, args);
+         va_end(args);
+
+         snprintf(s2, MAXSTRING, "%s in %s", errstr, s);
+         output_if_debug("Mesa: User error", s2, GL_TRUE);
+      }
    }
 
    _mesa_record_error(ctx, error);
-}  
+}
+
 
 /**
  * Report debug information.  Print error message to stderr via fprintf().
@@ -1145,7 +1162,7 @@ _mesa_debug( const GLcontext *ctx, const char *fmtString, ... )
    va_start(args, fmtString);
    vsnprintf(s, MAXSTRING, fmtString, args);
    va_end(args);
-   output_if_debug("Mesa", s);
+   output_if_debug("Mesa", s, GL_FALSE);
 #endif /* DEBUG */
    (void) ctx;
    (void) fmtString;
-- 
cgit v1.2.3


From 99b77d05d2e8c4af5f7d752d6827c21fd6c4d5ee Mon Sep 17 00:00:00 2001
From: José Fonseca <jfonseca@vmware.com>
Date: Mon, 27 Apr 2009 13:09:58 +0100
Subject: mesa: Call _mesa_snprintf instead of snprintf.

snprintf not directly available on Windows.
---
 src/mesa/main/imports.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 8797f36695..615f7c9a6d 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -1137,7 +1137,7 @@ _mesa_error( GLcontext *ctx, GLenum error, const char *fmtString, ... )
          vsnprintf(s, MAXSTRING, fmtString, args);
          va_end(args);
 
-         snprintf(s2, MAXSTRING, "%s in %s", errstr, s);
+         _mesa_snprintf(s2, MAXSTRING, "%s in %s", errstr, s);
          output_if_debug("Mesa: User error", s2, GL_TRUE);
       }
    }
-- 
cgit v1.2.3


From c0bff53334194f9d1aada23510123f1591d5512e Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keithw@vmware.com>
Date: Tue, 28 Apr 2009 17:49:50 +0100
Subject: mesa/main: protect driver.finish with FLUSH_CURRENT

Already doing this for driver.flush()
---
 src/mesa/main/context.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 4469c8e1fa..016284de9a 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1497,6 +1497,7 @@ _mesa_Finish(void)
 {
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+   FLUSH_CURRENT( ctx, 0 );
    if (ctx->Driver.Finish) {
       ctx->Driver.Finish(ctx);
    }
-- 
cgit v1.2.3


From 8a488b1be720247339f5c86fea5d2bff3d0fe084 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 1 May 2009 09:19:59 -0600
Subject: mesa: remove -devel suffix from version

---
 src/mesa/main/version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index f5bf6e2c85..ba027465d4 100644
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -31,7 +31,7 @@
 #define MESA_MAJOR 7
 #define MESA_MINOR 5
 #define MESA_PATCH 0
-#define MESA_VERSION_STRING "7.5-devel"
+#define MESA_VERSION_STRING "7.5"
 
 /* To make version comparison easy */
 #define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
-- 
cgit v1.2.3


From 666e5bf4a6728484b4bc0c7e2583f141f1f2b2b7 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 1 May 2009 09:22:20 -0600
Subject: mesa: bump version to 7.6 (devel)

---
 Makefile                | 2 +-
 configs/default         | 2 +-
 src/mesa/main/version.h | 7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/mesa/main')

diff --git a/Makefile b/Makefile
index a77825e8f9..ab41116795 100644
--- a/Makefile
+++ b/Makefile
@@ -181,7 +181,7 @@ ultrix-gcc:
 
 # Rules for making release tarballs
 
-VERSION=7.5-devel
+VERSION=7.6-devel
 DIRECTORY = Mesa-$(VERSION)
 LIB_NAME = MesaLib-$(VERSION)
 DEMO_NAME = MesaDemos-$(VERSION)
diff --git a/configs/default b/configs/default
index b5ef80afb3..9c479fccdf 100644
--- a/configs/default
+++ b/configs/default
@@ -9,7 +9,7 @@ CONFIG_NAME = default
 
 # Version info
 MESA_MAJOR=7
-MESA_MINOR=5
+MESA_MINOR=6
 MESA_TINY=0
 MESA_VERSION = $(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY)
 
diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index f5bf6e2c85..d4d3dd1a94 100644
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -1,8 +1,9 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.5
+ * Version:  7.6
  *
  * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -29,9 +30,9 @@
 
 /* Mesa version */
 #define MESA_MAJOR 7
-#define MESA_MINOR 5
+#define MESA_MINOR 6
 #define MESA_PATCH 0
-#define MESA_VERSION_STRING "7.5-devel"
+#define MESA_VERSION_STRING "7.6-devel"
 
 /* To make version comparison easy */
 #define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
-- 
cgit v1.2.3


From 3f25219c7bf0f090502489928f0f018e62c4f6cf Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 1 May 2009 09:30:32 -0600
Subject: mesa: create/use a fallback texture when bound texture is incomplete

When a GLSL sampler reads from an incomplete texture it should
return (0,0,0,1).  Instead of jumping through hoops in all the drivers
to make this happen, just create/install a fallback texture with those
texel values.

Fixes piglit/fp-incomplete-tex on i965 and more importantly, fixes some
GPU lockups when trying to sample from missing surfaces.  If a binding
table entry is NULL, it seems that sampling sometimes works, but not
always (lockup).

Todo: create a fallback texture for each type of texture target?
---
 src/mesa/main/mtypes.h   |  3 +++
 src/mesa/main/texobj.c   | 53 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/mesa/main/texobj.h   |  3 +++
 src/mesa/main/texstate.c |  9 ++++++--
 4 files changed, 66 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 30c7cca3b5..38c3b1bb40 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2050,6 +2050,9 @@ struct gl_shared_state
    /** Default texture objects (shared by all texture units) */
    struct gl_texture_object *DefaultTex[NUM_TEXTURE_TARGETS];
 
+   /** Fallback texture used when a bound texture is incomplete */
+   struct gl_texture_object *FallbackTex;
+
    /**
     * \name Thread safety and statechange notification for texture
     * objects. 
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index b63f747fe8..0024efc0e6 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -662,6 +662,59 @@ _mesa_test_texobj_completeness( const GLcontext *ctx,
    }
 }
 
+
+/**
+ * Return pointer to a default/fallback texture.
+ * The texture is a 2D 8x8 RGBA texture with all texels = (0,0,0,1).
+ * That's the value a sampler should get when sampling from an
+ * incomplete texture.
+ */
+struct gl_texture_object *
+_mesa_get_fallback_texture(GLcontext *ctx)
+{
+   if (!ctx->Shared->FallbackTex) {
+      /* create fallback texture now */
+      static GLubyte texels[8 * 8][4];
+      struct gl_texture_object *texObj;
+      struct gl_texture_image *texImage;
+      GLuint i;
+
+      for (i = 0; i < 8 * 8; i++) {
+         texels[i][0] =
+         texels[i][1] =
+         texels[i][2] = 0x0;
+         texels[i][3] = 0xff;
+      }
+
+      /* create texture object */
+      texObj = ctx->Driver.NewTextureObject(ctx, 0, GL_TEXTURE_2D);
+      assert(texObj->RefCount == 1);
+      texObj->MinFilter = GL_NEAREST;
+      texObj->MagFilter = GL_NEAREST;
+
+      /* create level[0] texture image */
+      texImage = _mesa_get_tex_image(ctx, texObj, GL_TEXTURE_2D, 0);
+
+      /* init the image fields */
+      _mesa_init_teximage_fields(ctx, GL_TEXTURE_2D, texImage,
+                                    8, 8, 1, 0, GL_RGBA); 
+
+      /* set image data */
+      ctx->Driver.TexImage2D(ctx, GL_TEXTURE_2D, 0, GL_RGBA,
+                             8, 8, 0,
+                             GL_RGBA, GL_UNSIGNED_BYTE, texels,
+                             &ctx->DefaultPacking, texObj, texImage);
+
+      _mesa_test_texobj_completeness(ctx, texObj);
+      assert(texObj->_Complete);
+
+      ctx->Shared->FallbackTex = texObj;
+   }
+   return ctx->Shared->FallbackTex;
+}
+
+
+
 /*@}*/
 
 
diff --git a/src/mesa/main/texobj.h b/src/mesa/main/texobj.h
index d5374c5d6c..2599c0816a 100644
--- a/src/mesa/main/texobj.h
+++ b/src/mesa/main/texobj.h
@@ -65,6 +65,9 @@ extern void
 _mesa_test_texobj_completeness( const GLcontext *ctx,
                                 struct gl_texture_object *obj );
 
+extern struct gl_texture_object *
+_mesa_get_fallback_texture(GLcontext *ctx);
+
 extern void
 _mesa_unlock_context_textures( GLcontext *ctx );
 
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 73f8a5339e..32d55ba8d5 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -561,8 +561,13 @@ update_texture_state( GLcontext *ctx )
       }
 
       if (!texUnit->_ReallyEnabled) {
-         _mesa_reference_texobj(&texUnit->_Current, NULL);
-         continue;
+         /* If we get here it means the shader (or fixed-function state)
+          * is expecting a texture object, but there isn't one (or it's
+          * incomplete).  Use the fallback texture.
+          */
+         struct gl_texture_object *texObj = _mesa_get_fallback_texture(ctx);
+         texUnit->_ReallyEnabled = 1 << TEXTURE_2D_INDEX;
+         _mesa_reference_texobj(&texUnit->_Current, texObj);
       }
 
       /* if we get here, we know this texture unit is enabled */
-- 
cgit v1.2.3


From 30b3d800917cc5b41ec508fd38a0ae1da8624a36 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 1 May 2009 12:12:43 -0600
Subject: mesa: fix comment

---
 src/mesa/main/mtypes.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 38c3b1bb40..cf71077728 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1028,7 +1028,7 @@ struct gl_stencil_attrib
 
 /**
  * An index for each type of texture object.  These correspond to the GL
- * target target enums, such as GL_TEXTURE_2D, GL_TEXTURE_CUBE_MAP, etc.
+ * texture target enums, such as GL_TEXTURE_2D, GL_TEXTURE_CUBE_MAP, etc.
  * Note: the order is from highest priority to lowest priority.
  */
 typedef enum
-- 
cgit v1.2.3


From 63f01309801c5a900d8d7f5ccd63413e33ff9bff Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 1 May 2009 18:04:07 -0600
Subject: mesa: fix state validation bug for glCopyTex[Sub]Image()

We need to make sure the framebuffer state is up to date to make sure we
read pixels from the right buffer when doing a texture image copy.
---
 src/mesa/main/teximage.c | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 8c03c36c75..76b46d700b 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -51,6 +51,17 @@
 #include "mtypes.h"
 
 
+/**
+ * State changes which we care about for glCopyTex[Sub]Image() calls.
+ * In particular, we care about pixel transfer state and buffer state
+ * (such as glReadBuffer to make sure we read from the right renderbuffer).
+ */
+#define NEW_COPY_TEX_STATE (_MESA_NEW_TRANSFER_STATE | \
+                            _NEW_BUFFERS | \
+                            _NEW_PIXEL)
+
+
+
 /**
  * We allocate texture memory on 512-byte boundaries so we can use MMX/SSE
  * elsewhere.
@@ -3008,7 +3019,7 @@ _mesa_CopyTexImage1D( GLenum target, GLint level,
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
-   if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)
+   if (ctx->NewState & NEW_COPY_TEX_STATE)
       _mesa_update_state(ctx);
 
 #if FEATURE_convolve
@@ -3073,7 +3084,7 @@ _mesa_CopyTexImage2D( GLenum target, GLint level, GLenum internalFormat,
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
-   if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)
+   if (ctx->NewState & NEW_COPY_TEX_STATE)
       _mesa_update_state(ctx);
 
 #if FEATURE_convolve
@@ -3141,7 +3152,7 @@ _mesa_CopyTexSubImage1D( GLenum target, GLint level,
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
-   if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)
+   if (ctx->NewState & NEW_COPY_TEX_STATE)
       _mesa_update_state(ctx);
 
    if (copytexsubimage_error_check1(ctx, 1, target, level))
@@ -3196,7 +3207,7 @@ _mesa_CopyTexSubImage2D( GLenum target, GLint level,
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
-   if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)
+   if (ctx->NewState & NEW_COPY_TEX_STATE)
       _mesa_update_state(ctx);
 
    if (copytexsubimage_error_check1(ctx, 2, target, level))
@@ -3251,7 +3262,7 @@ _mesa_CopyTexSubImage3D( GLenum target, GLint level,
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
-   if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)
+   if (ctx->NewState & NEW_COPY_TEX_STATE)
       _mesa_update_state(ctx);
 
    if (copytexsubimage_error_check1(ctx, 3, target, level))
-- 
cgit v1.2.3


From 62043b27575c378c027251316421e4699f461108 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 1 May 2009 18:31:04 -0600
Subject: mesa: in glReadBufer() set _NEW_BUFFERS, not _NEW_PIXEL

Since GL_READ_BUFFER is historically part of the gl_pixel_attrib group
it made sense to signal changes with _NEW_PIXEL.  But now with FBOs it's
also part of the framebuffer state.

Now _NEW_PIXEL strictly indicates pixels transfer state changes.

This change avoids framebuffer state validation when any random bit of
pixel-transfer state is set.

DRI drivers updated too:  don't check _NEW_COLOR when updating framebuffer
state.  I think that was just copied from the Xlib driver because we care
about dither enable/disable state there.
---
 src/mesa/drivers/dri/intel/intel_buffers.c | 2 +-
 src/mesa/drivers/dri/r200/r200_state.c     | 2 +-
 src/mesa/drivers/dri/r300/r300_state.c     | 2 +-
 src/mesa/drivers/dri/radeon/radeon_state.c | 2 +-
 src/mesa/drivers/x11/xm_dd.c               | 3 ++-
 src/mesa/main/buffers.c                    | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/intel/intel_buffers.c b/src/mesa/drivers/dri/intel/intel_buffers.c
index b86cafea24..4f4ea45b74 100644
--- a/src/mesa/drivers/dri/intel/intel_buffers.c
+++ b/src/mesa/drivers/dri/intel/intel_buffers.c
@@ -157,7 +157,7 @@ intel_draw_buffer(GLcontext * ctx, struct gl_framebuffer *fb)
    /* Do this here, not core Mesa, since this function is called from
     * many places within the driver.
     */
-   if (ctx->NewState & (_NEW_BUFFERS | _NEW_COLOR | _NEW_PIXEL)) {
+   if (ctx->NewState & _NEW_BUFFERS) {
       /* this updates the DrawBuffer->_NumColorDrawBuffers fields, etc */
       _mesa_update_framebuffer(ctx);
       /* this updates the DrawBuffer's Width/Height if it's a FBO */
diff --git a/src/mesa/drivers/dri/r200/r200_state.c b/src/mesa/drivers/dri/r200/r200_state.c
index 28ba5f49bc..81ee1ed022 100644
--- a/src/mesa/drivers/dri/r200/r200_state.c
+++ b/src/mesa/drivers/dri/r200/r200_state.c
@@ -2480,7 +2480,7 @@ void r200ValidateState( GLcontext *ctx )
    r200ContextPtr rmesa = R200_CONTEXT(ctx);
    GLuint new_state = rmesa->NewGLState;
 
-   if (new_state & (_NEW_BUFFERS | _NEW_COLOR | _NEW_PIXEL)) {
+   if (new_state & _NEW_BUFFERS) {
      r200UpdateDrawBuffer(ctx);
    }
 
diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index b96ba4ed94..07299f3b36 100644
--- a/src/mesa/drivers/dri/r300/r300_state.c
+++ b/src/mesa/drivers/dri/r300/r300_state.c
@@ -2589,7 +2589,7 @@ static void r300InvalidateState(GLcontext * ctx, GLuint new_state)
 	_tnl_InvalidateState(ctx, new_state);
 	_ae_invalidate_state(ctx, new_state);
 
-	if (new_state & (_NEW_BUFFERS | _NEW_COLOR | _NEW_PIXEL)) {
+	if (new_state & _NEW_BUFFERS) {
 		r300UpdateDrawBuffer(ctx);
 	}
 
diff --git a/src/mesa/drivers/dri/radeon/radeon_state.c b/src/mesa/drivers/dri/radeon/radeon_state.c
index b6561001e7..4432f85691 100644
--- a/src/mesa/drivers/dri/radeon/radeon_state.c
+++ b/src/mesa/drivers/dri/radeon/radeon_state.c
@@ -2255,7 +2255,7 @@ void radeonValidateState( GLcontext *ctx )
    radeonContextPtr rmesa = RADEON_CONTEXT(ctx);
    GLuint new_state = rmesa->NewGLState;
 
-   if (new_state & (_NEW_BUFFERS | _NEW_COLOR | _NEW_PIXEL)) {
+   if (new_state & _NEW_BUFFERS) {
      radeonUpdateDrawBuffer(ctx);
    }
 
diff --git a/src/mesa/drivers/x11/xm_dd.c b/src/mesa/drivers/x11/xm_dd.c
index 305df548fa..9a01465bdf 100644
--- a/src/mesa/drivers/x11/xm_dd.c
+++ b/src/mesa/drivers/x11/xm_dd.c
@@ -912,8 +912,9 @@ xmesa_update_state( GLcontext *ctx, GLbitfield new_state )
    /*
     * GL_DITHER, GL_READ/DRAW_BUFFER, buffer binding state, etc. effect
     * renderbuffer span/clear funcs.
+    * Check _NEW_COLOR to detect dither enable/disable.
     */
-   if (new_state & (_NEW_COLOR | _NEW_PIXEL | _NEW_BUFFERS)) {
+   if (new_state & (_NEW_COLOR | _NEW_BUFFERS)) {
       XMesaBuffer xmbuf = XMESA_BUFFER(ctx->DrawBuffer);
       struct xmesa_renderbuffer *front_xrb, *back_xrb;
 
diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c
index c5f13345f0..d8b5f3b1f4 100644
--- a/src/mesa/main/buffers.c
+++ b/src/mesa/main/buffers.c
@@ -443,7 +443,7 @@ _mesa_readbuffer(GLcontext *ctx, GLenum buffer, GLint bufferIndex)
    fb->ColorReadBuffer = buffer;
    fb->_ColorReadBufferIndex = bufferIndex;
 
-   ctx->NewState |= _NEW_PIXEL;
+   ctx->NewState |= _NEW_BUFFERS;
 }
 
 
-- 
cgit v1.2.3


From 22b417b75ce0e6658a5d1e0e80cb6c3fdf631774 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keithw@vmware.com>
Date: Fri, 1 May 2009 18:20:42 +0100
Subject: mesa/main: set PREFER_DP4 to match position_invarient code

This is a quick fix for z fighting in quake4 caused by the mismatch
between vertex transformation here and in the position_invarient code.
Full fix would be to make this driver-tunable and adjust both
position_invarient and ffvertex_prog.c code to respect driver
preferences.
---
 src/mesa/main/ffvertex_prog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index 1ce5685af4..82e1c4af66 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -319,7 +319,7 @@ static void make_state_key( GLcontext *ctx, struct state_key *key )
  * multiplications with DP4's or with MUL/MAD's?  SSE works better
  * with the latter, drivers may differ.
  */
-#define PREFER_DP4 0
+#define PREFER_DP4 1
 
 
 /* Use uregs to represent registers internally, translate to Mesa's
-- 
cgit v1.2.3


From 113403ef51e2ec764db061aabf569d6f1a1a3ef0 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keithw@vmware.com>
Date: Tue, 5 May 2009 12:12:28 +0100
Subject: mesa: more complete fix for transform_invarient glitches

Add a new flag mvp_with_dp4 in the context, and use that to switch
both ffvertex.c and programopt.c vertex transformation code to
either DP4 or MUL/MAD implementations.
---
 src/mesa/main/context.c             |  13 ++++
 src/mesa/main/context.h             |   4 ++
 src/mesa/main/ffvertex_prog.c       |  16 +++--
 src/mesa/main/mtypes.h              |   6 ++
 src/mesa/shader/programopt.c        | 119 +++++++++++++++++++++++++++++++++++-
 src/mesa/state_tracker/st_context.c |   6 ++
 6 files changed, 153 insertions(+), 11 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 016284de9a..d780f91f04 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1522,4 +1522,17 @@ _mesa_Flush(void)
 }
 
 
+/**
+ * Set mvp_with_dp4 flag.  If a driver has a preference for DP4 over
+ * MUL/MAD, or vice versa, call this function to register that.
+ * Otherwise we default to MUL/MAD.
+ */
+void
+_mesa_set_mvp_with_dp4( GLcontext *ctx,
+                        GLboolean flag )
+{
+   ctx->mvp_with_dp4 = flag;
+}
+
+
 /*@}*/
diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h
index ecc1cec779..5b57d88029 100644
--- a/src/mesa/main/context.h
+++ b/src/mesa/main/context.h
@@ -151,6 +151,10 @@ extern struct _glapi_table *
 _mesa_get_dispatch(GLcontext *ctx);
 
 
+void
+_mesa_set_mvp_with_dp4( GLcontext *ctx,
+                        GLboolean flag );
+
 
 /** \name Miscellaneous */
 /*@{*/
diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index 82e1c4af66..43325b1352 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -315,12 +315,6 @@ static void make_state_key( GLcontext *ctx, struct state_key *key )
  */
 #define DISASSEM 0
 
-/* Should be tunable by the driver - do we want to do matrix
- * multiplications with DP4's or with MUL/MAD's?  SSE works better
- * with the latter, drivers may differ.
- */
-#define PREFER_DP4 1
-
 
 /* Use uregs to represent registers internally, translate to Mesa's
  * expected formats on emit.  
@@ -348,6 +342,7 @@ struct tnl_program {
    const struct state_key *state;
    struct gl_vertex_program *program;
    GLint max_inst;  /** number of instructions allocated for program */
+   GLboolean mvp_with_dp4;
    
    GLuint temp_in_use;
    GLuint temp_reserved;
@@ -775,7 +770,7 @@ static struct ureg get_eye_position( struct tnl_program *p )
 
       p->eye_position = reserve_temp(p);
 
-      if (PREFER_DP4) {
+      if (p->mvp_with_dp4) {
 	 register_matrix_param5( p, STATE_MODELVIEW_MATRIX, 0, 0, 3,
                                  0, modelview );
 
@@ -881,7 +876,7 @@ static void build_hpos( struct tnl_program *p )
    struct ureg hpos = register_output( p, VERT_RESULT_HPOS );
    struct ureg mvp[4];
 
-   if (PREFER_DP4) {
+   if (p->mvp_with_dp4) {
       register_matrix_param5( p, STATE_MVP_MATRIX, 0, 0, 3, 
 			      0, mvp );
       emit_matrix_transform_vec4( p, hpos, mvp, pos );
@@ -1574,7 +1569,7 @@ static void build_texture_transform( struct tnl_program *p )
 	    struct ureg in = (!is_undef(out_texgen) ? 
 			      out_texgen : 
 			      register_input(p, VERT_ATTRIB_TEX0+i));
-	    if (PREFER_DP4) {
+	    if (p->mvp_with_dp4) {
 	       register_matrix_param5( p, STATE_TEXTURE_MATRIX, i, 0, 3,
 				       0, texmat );
 	       emit_matrix_transform_vec4( p, out, texmat, in );
@@ -1708,6 +1703,7 @@ static void build_tnl_program( struct tnl_program *p )
 static void
 create_new_program( const struct state_key *key,
                     struct gl_vertex_program *program,
+                    GLboolean mvp_with_dp4,
                     GLuint max_temps)
 {
    struct tnl_program p;
@@ -1721,6 +1717,7 @@ create_new_program( const struct state_key *key,
    p.transformed_normal = undef;
    p.identity = undef;
    p.temp_in_use = 0;
+   p.mvp_with_dp4 = mvp_with_dp4;
    
    if (max_temps >= sizeof(int) * 8)
       p.temp_reserved = 0;
@@ -1776,6 +1773,7 @@ _mesa_get_fixed_func_vertex_program(GLcontext *ctx)
          return NULL;
 
       create_new_program( &key, prog,
+                          ctx->mvp_with_dp4,
                           ctx->Const.VertexProgram.MaxTemps );
 
 #if 0
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index cf71077728..587dc80146 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2980,6 +2980,12 @@ struct __GLcontextRec
    /** software compression/decompression supported or not */
    GLboolean Mesa_DXTn;
 
+   /** 
+    * Use dp4 (rather than mul/mad) instructions for position
+    * transformation?
+    */
+   GLboolean mvp_with_dp4;
+
    /** Core tnl module support */
    struct gl_tnl_module TnlModule;
 
diff --git a/src/mesa/shader/programopt.c b/src/mesa/shader/programopt.c
index ecd98dc85c..f70c75cec8 100644
--- a/src/mesa/shader/programopt.c
+++ b/src/mesa/shader/programopt.c
@@ -45,8 +45,8 @@
  * into a vertex program.
  * May be used to implement the position_invariant option.
  */
-void
-_mesa_insert_mvp_code(GLcontext *ctx, struct gl_vertex_program *vprog)
+static void
+_mesa_insert_mvp_dp4_code(GLcontext *ctx, struct gl_vertex_program *vprog)
 {
    struct prog_instruction *newInst;
    const GLuint origLen = vprog->Base.NumInstructions;
@@ -113,6 +113,121 @@ _mesa_insert_mvp_code(GLcontext *ctx, struct gl_vertex_program *vprog)
 }
 
 
+static void
+_mesa_insert_mvp_mad_code(GLcontext *ctx, struct gl_vertex_program *vprog)
+{
+   struct prog_instruction *newInst;
+   const GLuint origLen = vprog->Base.NumInstructions;
+   const GLuint newLen = origLen + 4;
+   GLuint hposTemp;
+   GLuint i;
+
+   /*
+    * Setup state references for the modelview/projection matrix.
+    * XXX we should check if these state vars are already declared.
+    */
+   static const gl_state_index mvpState[4][STATE_LENGTH] = {
+      { STATE_MVP_MATRIX, 0, 0, 0, STATE_MATRIX_TRANSPOSE },
+      { STATE_MVP_MATRIX, 0, 1, 1, STATE_MATRIX_TRANSPOSE },
+      { STATE_MVP_MATRIX, 0, 2, 2, STATE_MATRIX_TRANSPOSE },
+      { STATE_MVP_MATRIX, 0, 3, 3, STATE_MATRIX_TRANSPOSE },
+   };
+   GLint mvpRef[4];
+
+   for (i = 0; i < 4; i++) {
+      mvpRef[i] = _mesa_add_state_reference(vprog->Base.Parameters,
+                                            mvpState[i]);
+   }
+
+   /* Alloc storage for new instructions */
+   newInst = _mesa_alloc_instructions(newLen);
+   if (!newInst) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY,
+                  "glProgramString(inserting position_invariant code)");
+      return;
+   }
+
+   /* TEMP hposTemp; */
+   hposTemp = vprog->Base.NumTemporaries++;
+
+   /*
+    * Generated instructions:
+    *    emit_op2(p, OPCODE_MUL, tmp, 0, swizzle1(src,X), mat[0]);
+    *    emit_op3(p, OPCODE_MAD, tmp, 0, swizzle1(src,Y), mat[1], tmp);
+    *    emit_op3(p, OPCODE_MAD, tmp, 0, swizzle1(src,Z), mat[2], tmp);
+    *    emit_op3(p, OPCODE_MAD, dest, 0, swizzle1(src,W), mat[3], tmp);
+    */
+   _mesa_init_instructions(newInst, 4);
+
+   newInst[0].Opcode = OPCODE_MUL;
+   newInst[0].DstReg.File = PROGRAM_TEMPORARY;
+   newInst[0].DstReg.Index = hposTemp;
+   newInst[0].DstReg.WriteMask = WRITEMASK_XYZW;
+   newInst[0].SrcReg[0].File = PROGRAM_INPUT;
+   newInst[0].SrcReg[0].Index = VERT_ATTRIB_POS;
+   newInst[0].SrcReg[0].Swizzle = SWIZZLE_XXXX;
+   newInst[0].SrcReg[1].File = PROGRAM_STATE_VAR;
+   newInst[0].SrcReg[1].Index = mvpRef[0];
+   newInst[0].SrcReg[1].Swizzle = SWIZZLE_NOOP;
+
+   for (i = 1; i <= 2; i++) {
+      newInst[i].Opcode = OPCODE_MAD;
+      newInst[i].DstReg.File = PROGRAM_TEMPORARY;
+      newInst[i].DstReg.Index = hposTemp;
+      newInst[i].DstReg.WriteMask = WRITEMASK_XYZW;
+      newInst[i].SrcReg[0].File = PROGRAM_INPUT;
+      newInst[i].SrcReg[0].Index = VERT_ATTRIB_POS;
+      newInst[i].SrcReg[0].Swizzle = MAKE_SWIZZLE4(i,i,i,i);
+      newInst[i].SrcReg[1].File = PROGRAM_STATE_VAR;
+      newInst[i].SrcReg[1].Index = mvpRef[i];
+      newInst[i].SrcReg[1].Swizzle = SWIZZLE_NOOP;
+      newInst[i].SrcReg[2].File = PROGRAM_TEMPORARY;
+      newInst[i].SrcReg[2].Index = hposTemp;
+      newInst[1].SrcReg[2].Swizzle = SWIZZLE_NOOP;
+   }
+
+   newInst[3].Opcode = OPCODE_MAD;
+   newInst[3].DstReg.File = PROGRAM_OUTPUT;
+   newInst[3].DstReg.Index = VERT_RESULT_HPOS;
+   newInst[3].DstReg.WriteMask = WRITEMASK_XYZW;
+   newInst[3].SrcReg[0].File = PROGRAM_INPUT;
+   newInst[3].SrcReg[0].Index = VERT_ATTRIB_POS;
+   newInst[3].SrcReg[0].Swizzle = SWIZZLE_WWWW;
+   newInst[3].SrcReg[1].File = PROGRAM_STATE_VAR;
+   newInst[3].SrcReg[1].Index = mvpRef[3];
+   newInst[3].SrcReg[1].Swizzle = SWIZZLE_NOOP;
+   newInst[3].SrcReg[2].File = PROGRAM_TEMPORARY;
+   newInst[3].SrcReg[2].Index = hposTemp;
+   newInst[3].SrcReg[2].Swizzle = SWIZZLE_NOOP;
+
+
+   /* Append original instructions after new instructions */
+   _mesa_copy_instructions (newInst + 4, vprog->Base.Instructions, origLen);
+
+   /* free old instructions */
+   _mesa_free_instructions(vprog->Base.Instructions, origLen);
+
+   /* install new instructions */
+   vprog->Base.Instructions = newInst;
+   vprog->Base.NumInstructions = newLen;
+   vprog->Base.InputsRead |= VERT_BIT_POS;
+   vprog->Base.OutputsWritten |= (1 << VERT_RESULT_HPOS);
+}
+
+
+void
+_mesa_insert_mvp_code(GLcontext *ctx, struct gl_vertex_program *vprog)
+{
+   if (ctx->mvp_with_dp4) 
+      _mesa_insert_mvp_dp4_code( ctx, vprog );
+   else
+      _mesa_insert_mvp_mad_code( ctx, vprog );
+}
+      
+
+
+
+
 
 /**
  * Append extra instructions onto the given fragment program to implement
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index 92a630eff9..2a1f21c51c 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -177,6 +177,12 @@ struct st_context *st_create_context(struct pipe_context *pipe,
 
    ctx = _mesa_create_context(visual, shareCtx, &funcs, NULL);
 
+   /* XXX: need a capability bit in gallium to query if the pipe
+    * driver prefers DP4 or MUL/MAD for vertex transformation.
+    */
+   if (debug_get_bool_option("MESA_MVP_DP4", FALSE))
+      _mesa_set_mvp_with_dp4( ctx, GL_TRUE );
+
    return st_create_context_priv(ctx, pipe);
 }
 
-- 
cgit v1.2.3


From c0d3761c167c2d952e92c46cf3a0e26461985ada Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 5 May 2009 16:17:55 -0600
Subject: mesa: minor simplification in enable_texture(), updated comments

---
 src/mesa/main/enable.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index f432be183c..2e7baa48ff 100644
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -222,14 +222,16 @@ get_texcoord_unit(GLcontext *ctx)
 
 /**
  * Helper function to enable or disable a texture target.
+ * \param bit  one of the TEXTURE_x_BIT values
+ * \return GL_TRUE if state is changing or GL_FALSE if no change
  */
 static GLboolean
-enable_texture(GLcontext *ctx, GLboolean state, GLbitfield bit)
+enable_texture(GLcontext *ctx, GLboolean state, GLbitfield texBit)
 {
    const GLuint curr = ctx->Texture.CurrentUnit;
    struct gl_texture_unit *texUnit = &ctx->Texture.Unit[curr];
-   const GLuint newenabled = (!state)
-       ? (texUnit->Enabled & ~bit) :  (texUnit->Enabled | bit);
+   const GLbitfield newenabled = state
+      ? (texUnit->Enabled | texBit) : (texUnit->Enabled & ~texBit);
 
    if (!ctx->DrawBuffer->Visual.rgbMode || texUnit->Enabled == newenabled)
        return GL_FALSE;
-- 
cgit v1.2.3


From 01e16befd4809e3e93ee7855a4a5d7df9fe010d9 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 5 May 2009 16:21:20 -0600
Subject: mesa: only use fallback texture when using shaders, not
 fixed-function

The semantics are a little different for shaders vs. fixed-function when
trying to use an incomplete texture.  The fallback texture returning
(0,0,0,1) should only be used with shaders.

Fixes glean fbo test regression.
---
 src/mesa/main/texstate.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 32d55ba8d5..9664bd58bc 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -560,10 +560,10 @@ update_texture_state( GLcontext *ctx )
          }
       }
 
-      if (!texUnit->_ReallyEnabled) {
-         /* If we get here it means the shader (or fixed-function state)
-          * is expecting a texture object, but there isn't one (or it's
-          * incomplete).  Use the fallback texture.
+      if (fprog && !texUnit->_ReallyEnabled) {
+         /* If we get here it means the shader is expecting a texture
+          * object, but there isn't one (or it's incomplete).  Use the
+          * fallback texture.
           */
          struct gl_texture_object *texObj = _mesa_get_fallback_texture(ctx);
          texUnit->_ReallyEnabled = 1 << TEXTURE_2D_INDEX;
-- 
cgit v1.2.3


From a0edbfb28fb2e670c657d52190a7e8b1ccf4f46e Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 5 May 2009 16:29:04 -0600
Subject: mesa: only use fallback texture when using shaders, not
 fixed-function

The semantics are a little different for shaders vs. fixed-function when
trying to use an incomplete texture.  The fallback texture returning
(0,0,0,1) should only be used with shaders.

Fixes glean fbo test regression.
---
 src/mesa/main/texstate.c | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 9664bd58bc..5453331c67 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -560,14 +560,20 @@ update_texture_state( GLcontext *ctx )
          }
       }
 
-      if (fprog && !texUnit->_ReallyEnabled) {
-         /* If we get here it means the shader is expecting a texture
-          * object, but there isn't one (or it's incomplete).  Use the
-          * fallback texture.
-          */
-         struct gl_texture_object *texObj = _mesa_get_fallback_texture(ctx);
-         texUnit->_ReallyEnabled = 1 << TEXTURE_2D_INDEX;
-         _mesa_reference_texobj(&texUnit->_Current, texObj);
+      if (!texUnit->_ReallyEnabled) {
+         if (fprog) {
+            /* If we get here it means the shader is expecting a texture
+             * object, but there isn't one (or it's incomplete).  Use the
+             * fallback texture.
+             */
+            struct gl_texture_object *texObj = _mesa_get_fallback_texture(ctx);
+            texUnit->_ReallyEnabled = 1 << TEXTURE_2D_INDEX;
+            _mesa_reference_texobj(&texUnit->_Current, texObj);
+         }
+         else {
+            /* fixed-function: texture unit is really disabled */
+            continue;
+         }
       }
 
       /* if we get here, we know this texture unit is enabled */
-- 
cgit v1.2.3


From 823815a48556940cc27867717658afda93733ce8 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 5 May 2009 16:30:30 -0600
Subject: Revert "mesa: only use fallback texture when using shaders, not
 fixed-function"

This reverts commit a0edbfb28fb2e670c657d52190a7e8b1ccf4f46e.

This patch didn't completely fix the problem.  The next patch will.
---
 src/mesa/main/texstate.c | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 5453331c67..9664bd58bc 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -560,20 +560,14 @@ update_texture_state( GLcontext *ctx )
          }
       }
 
-      if (!texUnit->_ReallyEnabled) {
-         if (fprog) {
-            /* If we get here it means the shader is expecting a texture
-             * object, but there isn't one (or it's incomplete).  Use the
-             * fallback texture.
-             */
-            struct gl_texture_object *texObj = _mesa_get_fallback_texture(ctx);
-            texUnit->_ReallyEnabled = 1 << TEXTURE_2D_INDEX;
-            _mesa_reference_texobj(&texUnit->_Current, texObj);
-         }
-         else {
-            /* fixed-function: texture unit is really disabled */
-            continue;
-         }
+      if (fprog && !texUnit->_ReallyEnabled) {
+         /* If we get here it means the shader is expecting a texture
+          * object, but there isn't one (or it's incomplete).  Use the
+          * fallback texture.
+          */
+         struct gl_texture_object *texObj = _mesa_get_fallback_texture(ctx);
+         texUnit->_ReallyEnabled = 1 << TEXTURE_2D_INDEX;
+         _mesa_reference_texobj(&texUnit->_Current, texObj);
       }
 
       /* if we get here, we know this texture unit is enabled */
-- 
cgit v1.2.3


From 51325f44d1e7e62b47795a79f8038d10dc5bc30b Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 5 May 2009 16:29:04 -0600
Subject: mesa: only use fallback texture when using shaders, not
 fixed-function (take two)

The semantics are a little different for shaders vs. fixed-function when
trying to use an incomplete texture.  The fallback texture returning
(0,0,0,1) should only be used with shaders.  For fixed function, the texture
unit is truly disabled/ignored.

Fixes glean fbo test regression.
---
 src/mesa/main/texstate.c | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 9664bd58bc..5453331c67 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -560,14 +560,20 @@ update_texture_state( GLcontext *ctx )
          }
       }
 
-      if (fprog && !texUnit->_ReallyEnabled) {
-         /* If we get here it means the shader is expecting a texture
-          * object, but there isn't one (or it's incomplete).  Use the
-          * fallback texture.
-          */
-         struct gl_texture_object *texObj = _mesa_get_fallback_texture(ctx);
-         texUnit->_ReallyEnabled = 1 << TEXTURE_2D_INDEX;
-         _mesa_reference_texobj(&texUnit->_Current, texObj);
+      if (!texUnit->_ReallyEnabled) {
+         if (fprog) {
+            /* If we get here it means the shader is expecting a texture
+             * object, but there isn't one (or it's incomplete).  Use the
+             * fallback texture.
+             */
+            struct gl_texture_object *texObj = _mesa_get_fallback_texture(ctx);
+            texUnit->_ReallyEnabled = 1 << TEXTURE_2D_INDEX;
+            _mesa_reference_texobj(&texUnit->_Current, texObj);
+         }
+         else {
+            /* fixed-function: texture unit is really disabled */
+            continue;
+         }
       }
 
       /* if we get here, we know this texture unit is enabled */
-- 
cgit v1.2.3


From a13df193c23f9202ade6f16643e3ef529cff772b Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 6 May 2009 12:23:28 -0600
Subject: mesa: use elementBuf local var instead of
 ctx->Array.ElementArrayBufferObj

Makes no real difference, but more consistant.
---
 src/mesa/main/api_validate.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c
index 42d1e579e0..1986cbecbb 100644
--- a/src/mesa/main/api_validate.c
+++ b/src/mesa/main/api_validate.c
@@ -72,7 +72,7 @@ max_buffer_index(GLcontext *ctx, GLuint count, GLenum type,
    if (map) {
       ctx->Driver.UnmapBuffer(ctx,
                               GL_ELEMENT_ARRAY_BUFFER_ARB,
-                              ctx->Array.ElementArrayBufferObj);
+                              elementBuf);
    }
 
    return max;
-- 
cgit v1.2.3


From 88af3f8783452dcf50a9e2e82076f52b2044f643 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 6 May 2009 12:27:38 -0600
Subject: mesa: new comments, minor reformatting

---
 src/mesa/main/api_validate.c | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c
index 1986cbecbb..dfe754dee5 100644
--- a/src/mesa/main/api_validate.c
+++ b/src/mesa/main/api_validate.c
@@ -44,10 +44,8 @@ max_buffer_index(GLcontext *ctx, GLuint count, GLenum type,
 
    if (elementBuf->Name) {
       /* elements are in a user-defined buffer object.  need to map it */
-      map = ctx->Driver.MapBuffer(ctx,
-                                  GL_ELEMENT_ARRAY_BUFFER_ARB,
-                                  GL_READ_ONLY,
-                                  elementBuf);
+      map = ctx->Driver.MapBuffer(ctx, GL_ELEMENT_ARRAY_BUFFER,
+                                  GL_READ_ONLY, elementBuf);
       /* Actual address is the sum of pointers */
       indices = (const GLvoid *) ADD_POINTERS(map, (const GLubyte *) indices);
    }
@@ -70,14 +68,16 @@ max_buffer_index(GLcontext *ctx, GLuint count, GLenum type,
    }
 
    if (map) {
-      ctx->Driver.UnmapBuffer(ctx,
-                              GL_ELEMENT_ARRAY_BUFFER_ARB,
-                              elementBuf);
+      ctx->Driver.UnmapBuffer(ctx, GL_ELEMENT_ARRAY_BUFFER_ARB, elementBuf);
    }
 
    return max;
 }
 
+
+/**
+ * Check if OK to render by examining framebuffer status and vertex arrays.
+ */
 static GLboolean
 check_valid_to_render(GLcontext *ctx, char *function)
 {
@@ -105,6 +105,12 @@ check_valid_to_render(GLcontext *ctx, char *function)
    return GL_TRUE;
 }
 
+
+/**
+ * Error checking for glDrawElements().  Includes parameter checking
+ * and VBO bounds checking.
+ * \return GL_TRUE if OK to render, GL_FALSE if error found
+ */
 GLboolean
 _mesa_validate_DrawElements(GLcontext *ctx,
 			    GLenum mode, GLsizei count, GLenum type,
@@ -184,6 +190,12 @@ _mesa_validate_DrawElements(GLcontext *ctx,
    return GL_TRUE;
 }
 
+
+/**
+ * Error checking for glDrawRangeElements().  Includes parameter checking
+ * and VBO bounds checking.
+ * \return GL_TRUE if OK to render, GL_FALSE if error found
+ */
 GLboolean
 _mesa_validate_DrawRangeElements(GLcontext *ctx, GLenum mode,
 				 GLuint start, GLuint end,
@@ -265,6 +277,7 @@ _mesa_validate_DrawRangeElements(GLcontext *ctx, GLenum mode,
 /**
  * Called from the tnl module to error check the function parameters and
  * verify that we really can draw something.
+ * \return GL_TRUE if OK to render, GL_FALSE if error found
  */
 GLboolean
 _mesa_validate_DrawArrays(GLcontext *ctx,
-- 
cgit v1.2.3


From bb1fb2a5444c6b7d83ccb47949f60ed9fb4f0f93 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 6 May 2009 12:37:10 -0600
Subject: mesa: code consolidation in glDraw[Range]Elements() validation

---
 src/mesa/main/api_validate.c | 48 ++++++++++++++++++++------------------------
 1 file changed, 22 insertions(+), 26 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c
index dfe754dee5..ad150eea80 100644
--- a/src/mesa/main/api_validate.c
+++ b/src/mesa/main/api_validate.c
@@ -30,6 +30,26 @@
 #include "state.h"
 
 
+
+/**
+ * \return  number of bytes in array [count] of type.
+ */
+static GLsizei
+index_bytes(GLenum type, GLsizei count)
+{
+   if (type == GL_UNSIGNED_INT) {
+      return count * sizeof(GLuint);
+   }
+   else if (type == GL_UNSIGNED_BYTE) {
+      return count * sizeof(GLubyte);
+   }
+   else {
+      ASSERT(type == GL_UNSIGNED_SHORT);
+      return count * sizeof(GLushort);
+   }
+}
+
+
 /**
  * Find the max index in the given element/index buffer
  */
@@ -146,7 +166,6 @@ _mesa_validate_DrawElements(GLcontext *ctx,
    /* Vertex buffer object tests */
    if (ctx->Array.ElementArrayBufferObj->Name) {
       /* use indices in the buffer object */
-      GLuint indexBytes;
 
       if (!ctx->Array.ElementArrayBufferObj->Size) {
          _mesa_warning(ctx,
@@ -154,19 +173,8 @@ _mesa_validate_DrawElements(GLcontext *ctx,
          return GL_FALSE;
       }
 
-      if (type == GL_UNSIGNED_INT) {
-         indexBytes = count * sizeof(GLuint);
-      }
-      else if (type == GL_UNSIGNED_BYTE) {
-         indexBytes = count * sizeof(GLubyte);
-      }
-      else {
-         ASSERT(type == GL_UNSIGNED_SHORT);
-         indexBytes = count * sizeof(GLushort);
-      }
-
       /* make sure count doesn't go outside buffer bounds */
-      if (indexBytes > (GLuint) ctx->Array.ElementArrayBufferObj->Size) {
+      if (index_bytes(type, count) > ctx->Array.ElementArrayBufferObj->Size) {
          _mesa_warning(ctx, "glDrawElements index out of buffer bounds");
          return GL_FALSE;
       }
@@ -236,21 +244,9 @@ _mesa_validate_DrawRangeElements(GLcontext *ctx, GLenum mode,
    /* Vertex buffer object tests */
    if (ctx->Array.ElementArrayBufferObj->Name) {
       /* use indices in the buffer object */
-      GLuint indexBytes;
-
-      if (type == GL_UNSIGNED_INT) {
-         indexBytes = count * sizeof(GLuint);
-      }
-      else if (type == GL_UNSIGNED_BYTE) {
-         indexBytes = count * sizeof(GLubyte);
-      }
-      else {
-         ASSERT(type == GL_UNSIGNED_SHORT);
-         indexBytes = count * sizeof(GLushort);
-      }
 
       /* make sure count doesn't go outside buffer bounds */
-      if (indexBytes > ctx->Array.ElementArrayBufferObj->Size) {
+      if (index_bytes(type, count) > ctx->Array.ElementArrayBufferObj->Size) {
          _mesa_warning(ctx, "glDrawRangeElements index out of buffer bounds");
          return GL_FALSE;
       }
-- 
cgit v1.2.3


From 58544a28ad561d7d9e16deb048443c2d2b5c12d8 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 6 May 2009 12:38:11 -0600
Subject: mesa: remove unnecessary buffer size check

---
 src/mesa/main/api_validate.c | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c
index ad150eea80..27049486ee 100644
--- a/src/mesa/main/api_validate.c
+++ b/src/mesa/main/api_validate.c
@@ -166,13 +166,6 @@ _mesa_validate_DrawElements(GLcontext *ctx,
    /* Vertex buffer object tests */
    if (ctx->Array.ElementArrayBufferObj->Name) {
       /* use indices in the buffer object */
-
-      if (!ctx->Array.ElementArrayBufferObj->Size) {
-         _mesa_warning(ctx,
-                       "glDrawElements called with empty array elements buffer");
-         return GL_FALSE;
-      }
-
       /* make sure count doesn't go outside buffer bounds */
       if (index_bytes(type, count) > ctx->Array.ElementArrayBufferObj->Size) {
          _mesa_warning(ctx, "glDrawElements index out of buffer bounds");
@@ -244,7 +237,6 @@ _mesa_validate_DrawRangeElements(GLcontext *ctx, GLenum mode,
    /* Vertex buffer object tests */
    if (ctx->Array.ElementArrayBufferObj->Name) {
       /* use indices in the buffer object */
-
       /* make sure count doesn't go outside buffer bounds */
       if (index_bytes(type, count) > ctx->Array.ElementArrayBufferObj->Size) {
          _mesa_warning(ctx, "glDrawRangeElements index out of buffer bounds");
-- 
cgit v1.2.3


From cc7170464493453ec8213decd21df95121b236e2 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 7 May 2009 09:36:21 -0600
Subject: mesa: unmap buffer objects during context tear-down

---
 src/mesa/main/shared.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/shared.c b/src/mesa/main/shared.c
index 193ac8970c..ae8dd2a836 100644
--- a/src/mesa/main/shared.c
+++ b/src/mesa/main/shared.c
@@ -190,6 +190,10 @@ delete_bufferobj_cb(GLuint id, void *data, void *userData)
 {
    struct gl_buffer_object *bufObj = (struct gl_buffer_object *) data;
    GLcontext *ctx = (GLcontext *) userData;
+   if (bufObj->Pointer) {
+      ctx->Driver.UnmapBuffer(ctx, 0, bufObj);
+      bufObj->Pointer = NULL;
+   }
    ctx->Driver.DeleteBuffer(ctx, bufObj);
 }
 
-- 
cgit v1.2.3


From 74bec42b45910e2ff6bf1a8cc0eeb2bc5c705767 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 6 May 2009 09:01:47 -0600
Subject: mesa: limit number of error raised by invalid
 GL_TEXTURE_MAX_ANISOTROPY_EXT

---
 src/mesa/main/texparam.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index e60ab6aa12..2195a334d3 100644
--- a/src/mesa/main/texparam.c
+++ b/src/mesa/main/texparam.c
@@ -469,8 +469,10 @@ set_tex_parameterf(GLcontext *ctx,
          return GL_TRUE;
       }
       else {
-         _mesa_error(ctx, GL_INVALID_ENUM,
-                     "glTexParameter(pname=GL_TEXTURE_MAX_ANISOTROPY_EXT)");
+         static GLuint count = 0;
+         if (count++ < 10)
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glTexParameter(pname=GL_TEXTURE_MAX_ANISOTROPY_EXT)");
       }
       return GL_FALSE;
 
-- 
cgit v1.2.3


From 87ba2285fe11dfe068798e5f8ea8e089a5d8b28b Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 6 May 2009 09:56:26 -0600
Subject: mesa: add GL_DOUBLE case in _mesa_sizeof_type()

---
 src/mesa/main/image.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index ddae456fa1..ea76ed04e4 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -181,6 +181,8 @@ _mesa_sizeof_type( GLenum type )
 	 return sizeof(GLint);
       case GL_FLOAT:
 	 return sizeof(GLfloat);
+      case GL_DOUBLE:
+	 return sizeof(GLdouble);
       case GL_HALF_FLOAT_ARB:
 	 return sizeof(GLhalfARB);
       default:
-- 
cgit v1.2.3


From b102c1d8f9ea359879e6c1c4fd8c80c00d21cad5 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 6 May 2009 12:48:21 -0600
Subject: mesa: fix/add comments

---
 src/mesa/main/mtypes.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 587dc80146..bdb1081ca8 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1542,9 +1542,8 @@ struct gl_client_array
    GLboolean Enabled;		/**< Enabled flag is a boolean */
    GLboolean Normalized;        /**< GL_ARB_vertex_program */
 
-   /**< GL_ARB_vertex_buffer_object */
-   struct gl_buffer_object *BufferObj;
-   GLuint _MaxElement;
+   struct gl_buffer_object *BufferObj;/**< GL_ARB_vertex_buffer_object */
+   GLuint _MaxElement;          /**< max element index into array buffer */
 };
 
 
-- 
cgit v1.2.3


From a6c8e900af981e011e51268a2724e5ff4a3ff1eb Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 6 May 2009 12:56:15 -0600
Subject: mesa: use local var to make code a bit more concise

---
 src/mesa/main/state.c | 73 ++++++++++++++++++++++++++-------------------------
 1 file changed, 37 insertions(+), 36 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index f18fc8f683..47e1aaa728 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -69,17 +69,18 @@ update_separate_specular(GLcontext *ctx)
 static void
 update_arrays( GLcontext *ctx )
 {
+   const struct gl_array_object *arrayObj = ctx->Array.ArrayObj;
    GLuint i, min;
 
    /* find min of _MaxElement values for all enabled arrays */
 
    /* 0 */
    if (ctx->VertexProgram._Current
-       && ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_POS].Enabled) {
-      min = ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_POS]._MaxElement;
+       && arrayObj->VertexAttrib[VERT_ATTRIB_POS].Enabled) {
+      min = arrayObj->VertexAttrib[VERT_ATTRIB_POS]._MaxElement;
    }
-   else if (ctx->Array.ArrayObj->Vertex.Enabled) {
-      min = ctx->Array.ArrayObj->Vertex._MaxElement;
+   else if (arrayObj->Vertex.Enabled) {
+      min = arrayObj->Vertex._MaxElement;
    }
    else {
       /* can't draw anything without vertex positions! */
@@ -88,86 +89,86 @@ update_arrays( GLcontext *ctx )
 
    /* 1 */
    if (ctx->VertexProgram._Enabled
-       && ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_WEIGHT].Enabled) {
-      min = MIN2(min, ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_WEIGHT]._MaxElement);
+       && arrayObj->VertexAttrib[VERT_ATTRIB_WEIGHT].Enabled) {
+      min = MIN2(min, arrayObj->VertexAttrib[VERT_ATTRIB_WEIGHT]._MaxElement);
    }
    /* no conventional vertex weight array */
 
    /* 2 */
    if (ctx->VertexProgram._Enabled
-       && ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_NORMAL].Enabled) {
-      min = MIN2(min, ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_NORMAL]._MaxElement);
+       && arrayObj->VertexAttrib[VERT_ATTRIB_NORMAL].Enabled) {
+      min = MIN2(min, arrayObj->VertexAttrib[VERT_ATTRIB_NORMAL]._MaxElement);
    }
-   else if (ctx->Array.ArrayObj->Normal.Enabled) {
-      min = MIN2(min, ctx->Array.ArrayObj->Normal._MaxElement);
+   else if (arrayObj->Normal.Enabled) {
+      min = MIN2(min, arrayObj->Normal._MaxElement);
    }
 
    /* 3 */
    if (ctx->VertexProgram._Enabled
-       && ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_COLOR0].Enabled) {
-      min = MIN2(min, ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_COLOR0]._MaxElement);
+       && arrayObj->VertexAttrib[VERT_ATTRIB_COLOR0].Enabled) {
+      min = MIN2(min, arrayObj->VertexAttrib[VERT_ATTRIB_COLOR0]._MaxElement);
    }
-   else if (ctx->Array.ArrayObj->Color.Enabled) {
-      min = MIN2(min, ctx->Array.ArrayObj->Color._MaxElement);
+   else if (arrayObj->Color.Enabled) {
+      min = MIN2(min, arrayObj->Color._MaxElement);
    }
 
    /* 4 */
    if (ctx->VertexProgram._Enabled
-       && ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_COLOR1].Enabled) {
-      min = MIN2(min, ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_COLOR1]._MaxElement);
+       && arrayObj->VertexAttrib[VERT_ATTRIB_COLOR1].Enabled) {
+      min = MIN2(min, arrayObj->VertexAttrib[VERT_ATTRIB_COLOR1]._MaxElement);
    }
-   else if (ctx->Array.ArrayObj->SecondaryColor.Enabled) {
-      min = MIN2(min, ctx->Array.ArrayObj->SecondaryColor._MaxElement);
+   else if (arrayObj->SecondaryColor.Enabled) {
+      min = MIN2(min, arrayObj->SecondaryColor._MaxElement);
    }
 
    /* 5 */
    if (ctx->VertexProgram._Enabled
-       && ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_FOG].Enabled) {
-      min = MIN2(min, ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_FOG]._MaxElement);
+       && arrayObj->VertexAttrib[VERT_ATTRIB_FOG].Enabled) {
+      min = MIN2(min, arrayObj->VertexAttrib[VERT_ATTRIB_FOG]._MaxElement);
    }
-   else if (ctx->Array.ArrayObj->FogCoord.Enabled) {
-      min = MIN2(min, ctx->Array.ArrayObj->FogCoord._MaxElement);
+   else if (arrayObj->FogCoord.Enabled) {
+      min = MIN2(min, arrayObj->FogCoord._MaxElement);
    }
 
    /* 6 */
    if (ctx->VertexProgram._Enabled
-       && ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_COLOR_INDEX].Enabled) {
-      min = MIN2(min, ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_COLOR_INDEX]._MaxElement);
+       && arrayObj->VertexAttrib[VERT_ATTRIB_COLOR_INDEX].Enabled) {
+      min = MIN2(min, arrayObj->VertexAttrib[VERT_ATTRIB_COLOR_INDEX]._MaxElement);
    }
-   else if (ctx->Array.ArrayObj->Index.Enabled) {
-      min = MIN2(min, ctx->Array.ArrayObj->Index._MaxElement);
+   else if (arrayObj->Index.Enabled) {
+      min = MIN2(min, arrayObj->Index._MaxElement);
    }
 
 
    /* 7 */
    if (ctx->VertexProgram._Enabled
-       && ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_EDGEFLAG].Enabled) {
-      min = MIN2(min, ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_EDGEFLAG]._MaxElement);
+       && arrayObj->VertexAttrib[VERT_ATTRIB_EDGEFLAG].Enabled) {
+      min = MIN2(min, arrayObj->VertexAttrib[VERT_ATTRIB_EDGEFLAG]._MaxElement);
    }
 
    /* 8..15 */
    for (i = VERT_ATTRIB_TEX0; i <= VERT_ATTRIB_TEX7; i++) {
       if (ctx->VertexProgram._Enabled
-          && ctx->Array.ArrayObj->VertexAttrib[i].Enabled) {
-         min = MIN2(min, ctx->Array.ArrayObj->VertexAttrib[i]._MaxElement);
+          && arrayObj->VertexAttrib[i].Enabled) {
+         min = MIN2(min, arrayObj->VertexAttrib[i]._MaxElement);
       }
       else if (i - VERT_ATTRIB_TEX0 < ctx->Const.MaxTextureCoordUnits
-               && ctx->Array.ArrayObj->TexCoord[i - VERT_ATTRIB_TEX0].Enabled) {
-         min = MIN2(min, ctx->Array.ArrayObj->TexCoord[i - VERT_ATTRIB_TEX0]._MaxElement);
+               && arrayObj->TexCoord[i - VERT_ATTRIB_TEX0].Enabled) {
+         min = MIN2(min, arrayObj->TexCoord[i - VERT_ATTRIB_TEX0]._MaxElement);
       }
    }
 
    /* 16..31 */
    if (ctx->VertexProgram._Current) {
       for (i = VERT_ATTRIB_GENERIC0; i < VERT_ATTRIB_MAX; i++) {
-         if (ctx->Array.ArrayObj->VertexAttrib[i].Enabled) {
-            min = MIN2(min, ctx->Array.ArrayObj->VertexAttrib[i]._MaxElement);
+         if (arrayObj->VertexAttrib[i].Enabled) {
+            min = MIN2(min, arrayObj->VertexAttrib[i]._MaxElement);
          }
       }
    }
 
-   if (ctx->Array.ArrayObj->EdgeFlag.Enabled) {
-      min = MIN2(min, ctx->Array.ArrayObj->EdgeFlag._MaxElement);
+   if (arrayObj->EdgeFlag.Enabled) {
+      min = MIN2(min, arrayObj->EdgeFlag._MaxElement);
    }
 
    /* _MaxElement is one past the last legal array element */
-- 
cgit v1.2.3


From 0077c879b57f663c038becdde37b2f6671f59150 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 6 May 2009 13:00:35 -0600
Subject: mesa: added _ElementSize field to gl_client_array

Will be handy for bounds checking later...
---
 src/mesa/main/mtypes.h | 1 +
 src/mesa/main/varray.c | 2 ++
 2 files changed, 3 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index bdb1081ca8..716e5c655d 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1541,6 +1541,7 @@ struct gl_client_array
    const GLubyte *Ptr;          /**< Points to array data */
    GLboolean Enabled;		/**< Enabled flag is a boolean */
    GLboolean Normalized;        /**< GL_ARB_vertex_program */
+   GLuint _ElementSize;         /**< size of each element in bytes */
 
    struct gl_buffer_object *BufferObj;/**< GL_ARB_vertex_buffer_object */
    GLuint _MaxElement;          /**< max element index into array buffer */
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 106252e460..629be600d4 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -63,6 +63,8 @@ update_array(GLcontext *ctx, struct gl_client_array *array,
    array->StrideB = stride ? stride : elementSize;
    array->Normalized = normalized;
    array->Ptr = (const GLubyte *) ptr;
+   array->_ElementSize = elementSize;
+
 #if FEATURE_ARB_vertex_buffer_object
    _mesa_reference_buffer_object(ctx, &array->BufferObj,
                                  ctx->Array.ArrayBufferObj);
-- 
cgit v1.2.3


From 828aa76f360c96adea1725380c397d04690bfd04 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 6 May 2009 13:02:38 -0600
Subject: mesa: use array->BufferObj instead of ctx->Array.ArrayBufferObj

No difference, but a little more understandable.
---
 src/mesa/main/varray.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 629be600d4..527555be0e 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -73,8 +73,8 @@ update_array(GLcontext *ctx, struct gl_client_array *array,
     * Later in glDrawArrays we'll check if start + count > _MaxElement to
     * be sure we won't go out of bounds.
     */
-   if (ctx->Array.ArrayBufferObj->Name)
-      array->_MaxElement = ((GLsizeiptrARB) ctx->Array.ArrayBufferObj->Size
+   if (array->BufferObj->Name)
+      array->_MaxElement = ((GLsizeiptrARB) array->BufferObj->Size
                             - (GLsizeiptrARB) array->Ptr + array->StrideB
                             - elementSize) / array->StrideB;
    else
-- 
cgit v1.2.3


From b9d0f947f2bcc47047b162e3d7c8f91b6153e02c Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 6 May 2009 15:17:25 -0600
Subject: mesa: Compute gl_client_array->_MaxElement during array validation

Used to be done in the glVertex/Normal/Color/etc/Pointer() calls but
if the VBO was reallocated the size could change.
New _NEW_BUFFER_OBJECT state flag.
---
 src/mesa/main/bufferobj.c |  2 ++
 src/mesa/main/mtypes.h    |  1 +
 src/mesa/main/state.c     | 88 ++++++++++++++++++++++++++++++++---------------
 src/mesa/main/varray.c    | 13 -------
 4 files changed, 64 insertions(+), 40 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index c8d160baa9..49f690ddd2 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -958,6 +958,8 @@ _mesa_BufferDataARB(GLenum target, GLsizeiptrARB size,
       bufObj->Pointer = NULL;
    }  
 
+   FLUSH_VERTICES(ctx, _NEW_BUFFER_OBJECT);
+
    ASSERT(ctx->Driver.BufferData);
 
    /* Give the buffer object to the driver!  <data> may be null! */
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 716e5c655d..368acde7a1 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2619,6 +2619,7 @@ struct gl_matrix_stack
 #define _NEW_PROGRAM            0x8000000  /**< __GLcontextRec::VertexProgram */
 #define _NEW_CURRENT_ATTRIB     0x10000000  /**< __GLcontextRec::Current */
 #define _NEW_PROGRAM_CONSTANTS  0x20000000
+#define _NEW_BUFFER_OBJECT      0x40000000
 #define _NEW_ALL ~0
 /*@}*/
 
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 47e1aaa728..a6411f7b62 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -64,97 +64,131 @@ update_separate_specular(GLcontext *ctx)
 
 
 /**
- * Update state dependent on vertex arrays.
+ * Compute the index of the last array element that can be safely accessed
+ * in a vertex array.  We can really only do this when the array lives in
+ * a VBO.
+ * The array->_MaxElement field will be updated.
+ * Later in glDrawArrays/Elements/etc we can do some bounds checking.
+ */
+static void
+compute_max_element(struct gl_client_array *array)
+{
+   assert(array->Enabled);
+   if (array->BufferObj->Name) {
+      /* Compute the max element we can access in the VBO without going
+       * out of bounds.
+       */
+      array->_MaxElement = ((GLsizeiptrARB) array->BufferObj->Size
+                            - (GLsizeiptrARB) array->Ptr + array->StrideB
+                            - array->_ElementSize) / array->StrideB;
+   }
+   else {
+      /* user-space array, no idea how big it is */
+      array->_MaxElement = 2 * 1000 * 1000 * 1000; /* just a big number */
+   }
+}
+
+
+/**
+ * Helper for update_arrays().
+ * \return  min(current min, array->_MaxElement).
+ */
+static GLuint
+update_min(GLuint min, struct gl_client_array *array)
+{
+   compute_max_element(array);
+   return MIN2(min, array->_MaxElement);
+}
+
+
+/**
+ * Update ctx->Array._MaxElement (the max legal index into all enabled arrays).
+ * Need to do this upon new array state or new buffer object state.
  */
 static void
 update_arrays( GLcontext *ctx )
 {
-   const struct gl_array_object *arrayObj = ctx->Array.ArrayObj;
-   GLuint i, min;
+   struct gl_array_object *arrayObj = ctx->Array.ArrayObj;
+   GLuint i, min = ~0;
 
    /* find min of _MaxElement values for all enabled arrays */
 
    /* 0 */
    if (ctx->VertexProgram._Current
        && arrayObj->VertexAttrib[VERT_ATTRIB_POS].Enabled) {
-      min = arrayObj->VertexAttrib[VERT_ATTRIB_POS]._MaxElement;
+      min = update_min(min, &arrayObj->VertexAttrib[VERT_ATTRIB_POS]);
    }
    else if (arrayObj->Vertex.Enabled) {
-      min = arrayObj->Vertex._MaxElement;
-   }
-   else {
-      /* can't draw anything without vertex positions! */
-      min = 0;
+      min = update_min(min, &arrayObj->Vertex);
    }
 
    /* 1 */
    if (ctx->VertexProgram._Enabled
        && arrayObj->VertexAttrib[VERT_ATTRIB_WEIGHT].Enabled) {
-      min = MIN2(min, arrayObj->VertexAttrib[VERT_ATTRIB_WEIGHT]._MaxElement);
+      min = update_min(min, &arrayObj->VertexAttrib[VERT_ATTRIB_WEIGHT]);
    }
    /* no conventional vertex weight array */
 
    /* 2 */
    if (ctx->VertexProgram._Enabled
        && arrayObj->VertexAttrib[VERT_ATTRIB_NORMAL].Enabled) {
-      min = MIN2(min, arrayObj->VertexAttrib[VERT_ATTRIB_NORMAL]._MaxElement);
+      min = update_min(min, &arrayObj->VertexAttrib[VERT_ATTRIB_NORMAL]);
    }
    else if (arrayObj->Normal.Enabled) {
-      min = MIN2(min, arrayObj->Normal._MaxElement);
+      min = update_min(min, &arrayObj->Normal);
    }
 
    /* 3 */
    if (ctx->VertexProgram._Enabled
        && arrayObj->VertexAttrib[VERT_ATTRIB_COLOR0].Enabled) {
-      min = MIN2(min, arrayObj->VertexAttrib[VERT_ATTRIB_COLOR0]._MaxElement);
+      min = update_min(min, &arrayObj->VertexAttrib[VERT_ATTRIB_COLOR0]);
    }
    else if (arrayObj->Color.Enabled) {
-      min = MIN2(min, arrayObj->Color._MaxElement);
+      min = update_min(min, &arrayObj->Color);
    }
 
    /* 4 */
    if (ctx->VertexProgram._Enabled
        && arrayObj->VertexAttrib[VERT_ATTRIB_COLOR1].Enabled) {
-      min = MIN2(min, arrayObj->VertexAttrib[VERT_ATTRIB_COLOR1]._MaxElement);
+      min = update_min(min, &arrayObj->VertexAttrib[VERT_ATTRIB_COLOR1]);
    }
    else if (arrayObj->SecondaryColor.Enabled) {
-      min = MIN2(min, arrayObj->SecondaryColor._MaxElement);
+      min = update_min(min, &arrayObj->SecondaryColor);
    }
 
    /* 5 */
    if (ctx->VertexProgram._Enabled
        && arrayObj->VertexAttrib[VERT_ATTRIB_FOG].Enabled) {
-      min = MIN2(min, arrayObj->VertexAttrib[VERT_ATTRIB_FOG]._MaxElement);
+      min = update_min(min, &arrayObj->VertexAttrib[VERT_ATTRIB_FOG]);
    }
    else if (arrayObj->FogCoord.Enabled) {
-      min = MIN2(min, arrayObj->FogCoord._MaxElement);
+      min = update_min(min, &arrayObj->FogCoord);
    }
 
    /* 6 */
    if (ctx->VertexProgram._Enabled
        && arrayObj->VertexAttrib[VERT_ATTRIB_COLOR_INDEX].Enabled) {
-      min = MIN2(min, arrayObj->VertexAttrib[VERT_ATTRIB_COLOR_INDEX]._MaxElement);
+      min = update_min(min, &arrayObj->VertexAttrib[VERT_ATTRIB_COLOR_INDEX]);
    }
    else if (arrayObj->Index.Enabled) {
-      min = MIN2(min, arrayObj->Index._MaxElement);
+      min = update_min(min, &arrayObj->Index);
    }
 
-
    /* 7 */
    if (ctx->VertexProgram._Enabled
        && arrayObj->VertexAttrib[VERT_ATTRIB_EDGEFLAG].Enabled) {
-      min = MIN2(min, arrayObj->VertexAttrib[VERT_ATTRIB_EDGEFLAG]._MaxElement);
+      min = update_min(min, &arrayObj->VertexAttrib[VERT_ATTRIB_EDGEFLAG]);
    }
 
    /* 8..15 */
    for (i = VERT_ATTRIB_TEX0; i <= VERT_ATTRIB_TEX7; i++) {
       if (ctx->VertexProgram._Enabled
           && arrayObj->VertexAttrib[i].Enabled) {
-         min = MIN2(min, arrayObj->VertexAttrib[i]._MaxElement);
+         min = update_min(min, &arrayObj->VertexAttrib[i]);
       }
       else if (i - VERT_ATTRIB_TEX0 < ctx->Const.MaxTextureCoordUnits
                && arrayObj->TexCoord[i - VERT_ATTRIB_TEX0].Enabled) {
-         min = MIN2(min, arrayObj->TexCoord[i - VERT_ATTRIB_TEX0]._MaxElement);
+         min = update_min(min, &arrayObj->TexCoord[i - VERT_ATTRIB_TEX0]);
       }
    }
 
@@ -162,13 +196,13 @@ update_arrays( GLcontext *ctx )
    if (ctx->VertexProgram._Current) {
       for (i = VERT_ATTRIB_GENERIC0; i < VERT_ATTRIB_MAX; i++) {
          if (arrayObj->VertexAttrib[i].Enabled) {
-            min = MIN2(min, arrayObj->VertexAttrib[i]._MaxElement);
+            min = update_min(min, &arrayObj->VertexAttrib[i]);
          }
       }
    }
 
    if (arrayObj->EdgeFlag.Enabled) {
-      min = MIN2(min, arrayObj->EdgeFlag._MaxElement);
+      min = update_min(min, &arrayObj->EdgeFlag);
    }
 
    /* _MaxElement is one past the last legal array element */
@@ -548,7 +582,7 @@ _mesa_update_state_locked( GLcontext *ctx )
    if (new_state & _DD_NEW_SEPARATE_SPECULAR)
       update_separate_specular( ctx );
 
-   if (new_state & (_NEW_ARRAY | _NEW_PROGRAM))
+   if (new_state & (_NEW_ARRAY | _NEW_PROGRAM | _NEW_BUFFER_OBJECT))
       update_arrays( ctx );
 
    if (new_state & (_NEW_BUFFERS | _NEW_VIEWPORT))
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 527555be0e..4d153b1c0b 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -65,22 +65,9 @@ update_array(GLcontext *ctx, struct gl_client_array *array,
    array->Ptr = (const GLubyte *) ptr;
    array->_ElementSize = elementSize;
 
-#if FEATURE_ARB_vertex_buffer_object
    _mesa_reference_buffer_object(ctx, &array->BufferObj,
                                  ctx->Array.ArrayBufferObj);
 
-   /* Compute the index of the last array element that's inside the buffer.
-    * Later in glDrawArrays we'll check if start + count > _MaxElement to
-    * be sure we won't go out of bounds.
-    */
-   if (array->BufferObj->Name)
-      array->_MaxElement = ((GLsizeiptrARB) array->BufferObj->Size
-                            - (GLsizeiptrARB) array->Ptr + array->StrideB
-                            - elementSize) / array->StrideB;
-   else
-#endif
-      array->_MaxElement = 2 * 1000 * 1000 * 1000; /* just a big number */
-
    ctx->NewState |= _NEW_ARRAY;
    ctx->Array.NewState |= dirtyBit;
 }
-- 
cgit v1.2.3


From dcca97a3e3c1d8f5d27e1177257964eddb9effd3 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 6 May 2009 15:23:09 -0600
Subject: mesa: added gl_buffer_object::Written flag (for debug purposes)

The flag is set when we data has been written into the buffer object.
---
 src/mesa/main/bufferobj.c | 6 ++++++
 src/mesa/main/mtypes.h    | 1 +
 2 files changed, 7 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 49f690ddd2..43a8d2ba66 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -962,6 +962,8 @@ _mesa_BufferDataARB(GLenum target, GLsizeiptrARB size,
 
    ASSERT(ctx->Driver.BufferData);
 
+   bufObj->Written = GL_TRUE;
+
    /* Give the buffer object to the driver!  <data> may be null! */
    ctx->Driver.BufferData( ctx, target, size, data, usage, bufObj );
 }
@@ -982,6 +984,8 @@ _mesa_BufferSubDataARB(GLenum target, GLintptrARB offset,
       return;
    }
 
+   bufObj->Written = GL_TRUE;
+
    ASSERT(ctx->Driver.BufferSubData);
    ctx->Driver.BufferSubData( ctx, target, offset, size, data, bufObj );
 }
@@ -1046,6 +1050,8 @@ _mesa_MapBufferARB(GLenum target, GLenum access)
    }
 
    bufObj->Access = access;
+   if (access == GL_WRITE_ONLY_ARB || access == GL_READ_WRITE_ARB)
+      bufObj->Written = GL_TRUE;
 
    return bufObj->Pointer;
 }
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 368acde7a1..276bc42eba 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1506,6 +1506,7 @@ struct gl_buffer_object
    GLsizeiptrARB Size;       /**< Size of storage in bytes */
    GLubyte *Data;            /**< Location of storage either in RAM or VRAM. */
    GLboolean OnCard;         /**< Is buffer in VRAM? (hardware drivers) */
+   GLboolean Written;        /**< Ever written to? (for debugging) */
 };
 
 
-- 
cgit v1.2.3


From 6359ecebec860963886801656ab4e01c4e9ff988 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 6 May 2009 15:39:51 -0600
Subject: mesa: remove unused gl_buffer_object::OnCard field

---
 src/mesa/main/bufferobj.c | 2 --
 src/mesa/main/mtypes.h    | 1 -
 2 files changed, 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 43a8d2ba66..641e5d7c3b 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -389,7 +389,6 @@ _mesa_buffer_map( GLcontext *ctx, GLenum target, GLenum access,
    (void) ctx;
    (void) target;
    (void) access;
-   ASSERT(!bufObj->OnCard);
    /* Just return a direct pointer to the data */
    if (bufObj->Pointer) {
       /* already mapped! */
@@ -413,7 +412,6 @@ _mesa_buffer_unmap( GLcontext *ctx, GLenum target,
 {
    (void) ctx;
    (void) target;
-   ASSERT(!bufObj->OnCard);
    /* XXX we might assert here that bufObj->Pointer is non-null */
    bufObj->Pointer = NULL;
    return GL_TRUE;
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 276bc42eba..affb000b8c 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1505,7 +1505,6 @@ struct gl_buffer_object
    GLsizeiptr Length;        /**< mapped length */
    GLsizeiptrARB Size;       /**< Size of storage in bytes */
    GLubyte *Data;            /**< Location of storage either in RAM or VRAM. */
-   GLboolean OnCard;         /**< Is buffer in VRAM? (hardware drivers) */
    GLboolean Written;        /**< Ever written to? (for debugging) */
 };
 
-- 
cgit v1.2.3


From 105c8529e78db961fee832b6248c3bcf59668bad Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 7 May 2009 13:10:48 -0600
Subject: mesa: fix comments, s/texture/buffer/

---
 src/mesa/main/bufferobj.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 641e5d7c3b..a983376251 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -194,7 +194,7 @@ _mesa_reference_buffer_object(GLcontext *ctx,
       return;
 
    if (*ptr) {
-      /* Unreference the old texture */
+      /* Unreference the old buffer */
       GLboolean deleteFlag = GL_FALSE;
       struct gl_buffer_object *oldObj = *ptr;
 
@@ -227,7 +227,7 @@ _mesa_reference_buffer_object(GLcontext *ctx,
    ASSERT(!*ptr);
 
    if (bufObj) {
-      /* reference new texture */
+      /* reference new buffer */
       /*_glthread_LOCK_MUTEX(tex->Mutex);*/
       if (bufObj->RefCount == 0) {
          /* this buffer's being deleted (look just above) */
-- 
cgit v1.2.3


From 4f6b704f9796775d8d9937c3cf75a2901b99b896 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 7 May 2009 13:30:39 -0600
Subject: mesa: move the NullBufferObj from GLcontext to gl_shared_state

Since shared array objects may point to the null/default buffer object,
the null/default buffer object should be part of the shared state.
---
 src/mesa/main/arrayobj.c         |  5 +++--
 src/mesa/main/bufferobj.c        | 16 ++++------------
 src/mesa/main/context.c          |  3 ---
 src/mesa/main/mtypes.h           |  3 ++-
 src/mesa/main/pixel.c            | 12 ++++++------
 src/mesa/main/pixelstore.c       |  9 ++++++---
 src/mesa/main/shared.c           | 12 ++++++++++++
 src/mesa/swrast/s_imaging.c      | 10 +++++-----
 src/mesa/vbo/vbo_context.c       |  9 ++++++---
 src/mesa/vbo/vbo_exec_api.c      |  4 ++--
 src/mesa/vbo/vbo_rebase.c        |  2 +-
 src/mesa/vbo/vbo_split_copy.c    |  4 ++--
 src/mesa/vbo/vbo_split_inplace.c |  2 +-
 13 files changed, 50 insertions(+), 41 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index b04095fd16..2646c12ccc 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -112,7 +112,8 @@ init_array(GLcontext *ctx,
    array->Normalized = GL_FALSE;
 #if FEATURE_ARB_vertex_buffer_object
    /* Vertex array buffers */
-   array->BufferObj = ctx->Array.NullBufferObj;
+   _mesa_reference_buffer_object(ctx, &array->BufferObj,
+                                 ctx->Shared->NullBufferObj);
 #endif
 }
 
@@ -180,7 +181,7 @@ _mesa_remove_array_object( GLcontext *ctx, struct gl_array_object *obj )
 static void
 unbind_buffer_object( GLcontext *ctx, struct gl_buffer_object *bufObj )
 {
-   if (bufObj != ctx->Array.NullBufferObj) {
+   if (bufObj != ctx->Shared->NullBufferObj) {
       _mesa_reference_buffer_object(ctx, &bufObj, NULL);
    }
 }
diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index a983376251..1f2070ef47 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -424,16 +424,8 @@ _mesa_buffer_unmap( GLcontext *ctx, GLenum target,
 void
 _mesa_init_buffer_objects( GLcontext *ctx )
 {
-   /* Allocate the default buffer object and set refcount so high that
-    * it never gets deleted.
-    * XXX with recent/improved refcounting this may not longer be needed.
-    */
-   ctx->Array.NullBufferObj = _mesa_new_buffer_object(ctx, 0, 0);
-   if (ctx->Array.NullBufferObj)
-      ctx->Array.NullBufferObj->RefCount = 1000;
-
-   ctx->Array.ArrayBufferObj = ctx->Array.NullBufferObj;
-   ctx->Array.ElementArrayBufferObj = ctx->Array.NullBufferObj;
+   ctx->Array.ArrayBufferObj = ctx->Shared->NullBufferObj;
+   ctx->Array.ElementArrayBufferObj = ctx->Shared->NullBufferObj;
 }
 
 
@@ -477,7 +469,7 @@ bind_buffer_object(GLcontext *ctx, GLenum target, GLuint buffer)
       /* The spec says there's not a buffer object named 0, but we use
        * one internally because it simplifies things.
        */
-      newBufObj = ctx->Array.NullBufferObj;
+      newBufObj = ctx->Shared->NullBufferObj;
    }
    else {
       /* non-default buffer object */
@@ -744,7 +736,7 @@ unbind(GLcontext *ctx,
        struct gl_buffer_object *obj)
 {
    if (*ptr == obj) {
-      _mesa_reference_buffer_object(ctx, ptr, ctx->Array.NullBufferObj);
+      _mesa_reference_buffer_object(ctx, ptr, ctx->Shared->NullBufferObj);
    }
 }
 
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index d780f91f04..1a290f251a 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1005,9 +1005,6 @@ _mesa_free_context_data( GLcontext *ctx )
    _mesa_free_query_data(ctx);
 #endif
 
-#if FEATURE_ARB_vertex_buffer_object
-   _mesa_delete_buffer_object(ctx, ctx->Array.NullBufferObj);
-#endif
    _mesa_delete_array_object(ctx, ctx->Array.DefaultArrayObj);
 
    /* free dispatch tables */
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index affb000b8c..3debbe9f2d 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1593,7 +1593,6 @@ struct gl_array_attrib
    GLbitfield NewState;		/**< mask of _NEW_ARRAY_* values */
 
 #if FEATURE_ARB_vertex_buffer_object
-   struct gl_buffer_object *NullBufferObj;
    struct gl_buffer_object *ArrayBufferObj;
    struct gl_buffer_object *ElementArrayBufferObj;
 #endif
@@ -2064,6 +2063,8 @@ struct gl_shared_state
    GLuint TextureStateStamp;	        /**< state notification for shared tex */
    /*@}*/
 
+   /** Default buffer object for vertex arrays that aren't in VBOs */
+   struct gl_buffer_object *NullBufferObj;
 
    /**
     * \name Vertex/fragment programs
diff --git a/src/mesa/main/pixel.c b/src/mesa/main/pixel.c
index 57ae9c721a..d9f3e476e8 100644
--- a/src/mesa/main/pixel.c
+++ b/src/mesa/main/pixel.c
@@ -170,7 +170,7 @@ _mesa_PixelMapfv( GLenum map, GLsizei mapsize, const GLfloat *values )
          return;
       }
       /* restore */
-      ctx->DefaultPacking.BufferObj = ctx->Array.NullBufferObj;
+      ctx->DefaultPacking.BufferObj = ctx->Shared->NullBufferObj;
       buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
                                               GL_READ_ONLY_ARB,
                                               ctx->Unpack.BufferObj);
@@ -229,7 +229,7 @@ _mesa_PixelMapuiv(GLenum map, GLsizei mapsize, const GLuint *values )
          return;
       }
       /* restore */
-      ctx->DefaultPacking.BufferObj = ctx->Array.NullBufferObj;
+      ctx->DefaultPacking.BufferObj = ctx->Shared->NullBufferObj;
       buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
                                               GL_READ_ONLY_ARB,
                                               ctx->Unpack.BufferObj);
@@ -303,7 +303,7 @@ _mesa_PixelMapusv(GLenum map, GLsizei mapsize, const GLushort *values )
          return;
       }
       /* restore */
-      ctx->DefaultPacking.BufferObj = ctx->Array.NullBufferObj;
+      ctx->DefaultPacking.BufferObj = ctx->Shared->NullBufferObj;
       buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
                                               GL_READ_ONLY_ARB,
                                               ctx->Unpack.BufferObj);
@@ -371,7 +371,7 @@ _mesa_GetPixelMapfv( GLenum map, GLfloat *values )
          return;
       }
       /* restore */
-      ctx->DefaultPacking.BufferObj = ctx->Array.NullBufferObj;
+      ctx->DefaultPacking.BufferObj = ctx->Shared->NullBufferObj;
       buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
                                               GL_WRITE_ONLY_ARB,
                                               ctx->Pack.BufferObj);
@@ -432,7 +432,7 @@ _mesa_GetPixelMapuiv( GLenum map, GLuint *values )
          return;
       }
       /* restore */
-      ctx->DefaultPacking.BufferObj = ctx->Array.NullBufferObj;
+      ctx->DefaultPacking.BufferObj = ctx->Shared->NullBufferObj;
       buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
                                               GL_WRITE_ONLY_ARB,
                                               ctx->Pack.BufferObj);
@@ -494,7 +494,7 @@ _mesa_GetPixelMapusv( GLenum map, GLushort *values )
          return;
       }
       /* restore */
-      ctx->DefaultPacking.BufferObj = ctx->Array.NullBufferObj;
+      ctx->DefaultPacking.BufferObj = ctx->Shared->NullBufferObj;
       buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
                                               GL_WRITE_ONLY_ARB,
                                               ctx->Pack.BufferObj);
diff --git a/src/mesa/main/pixelstore.c b/src/mesa/main/pixelstore.c
index ff1a6344cc..6a641f83f2 100644
--- a/src/mesa/main/pixelstore.c
+++ b/src/mesa/main/pixelstore.c
@@ -245,7 +245,8 @@ _mesa_init_pixelstore( GLcontext *ctx )
    ctx->Pack.ClientStorage = GL_FALSE;
    ctx->Pack.Invert = GL_FALSE;
 #if FEATURE_EXT_pixel_buffer_object
-   ctx->Pack.BufferObj = ctx->Array.NullBufferObj;
+   _mesa_reference_buffer_object(ctx, &ctx->Pack.BufferObj,
+                                 ctx->Shared->NullBufferObj);
 #endif
    ctx->Unpack.Alignment = 4;
    ctx->Unpack.RowLength = 0;
@@ -258,7 +259,8 @@ _mesa_init_pixelstore( GLcontext *ctx )
    ctx->Unpack.ClientStorage = GL_FALSE;
    ctx->Unpack.Invert = GL_FALSE;
 #if FEATURE_EXT_pixel_buffer_object
-   ctx->Unpack.BufferObj = ctx->Array.NullBufferObj;
+   _mesa_reference_buffer_object(ctx, &ctx->Unpack.BufferObj,
+                                 ctx->Shared->NullBufferObj);
 #endif
 
    /*
@@ -278,6 +280,7 @@ _mesa_init_pixelstore( GLcontext *ctx )
    ctx->DefaultPacking.ClientStorage = GL_FALSE;
    ctx->DefaultPacking.Invert = GL_FALSE;
 #if FEATURE_EXT_pixel_buffer_object
-   ctx->DefaultPacking.BufferObj = ctx->Array.NullBufferObj;
+   _mesa_reference_buffer_object(ctx, &ctx->DefaultPacking.BufferObj,
+                                 ctx->Shared->NullBufferObj);
 #endif
 }
diff --git a/src/mesa/main/shared.c b/src/mesa/main/shared.c
index ae8dd2a836..759883743d 100644
--- a/src/mesa/main/shared.c
+++ b/src/mesa/main/shared.c
@@ -33,6 +33,7 @@
 #include "mtypes.h"
 #include "hash.h"
 #include "arrayobj.h"
+#include "bufferobj.h"
 #include "shared.h"
 #include "shader/program.h"
 #include "shader/shader_api.h"
@@ -92,6 +93,13 @@ _mesa_alloc_shared_state(GLcontext *ctx)
    shared->BufferObjects = _mesa_NewHashTable();
 #endif
 
+   /* Allocate the default buffer object and set refcount so high that
+    * it never gets deleted.
+    * XXX with recent/improved refcounting this may not longer be needed.
+    */
+   shared->NullBufferObj = _mesa_new_buffer_object(ctx, 0, 0);
+   shared->NullBufferObj->RefCount = 1000;
+
    shared->ArrayObjects = _mesa_NewHashTable();
 
    /* Create default texture objects */
@@ -341,6 +349,10 @@ _mesa_free_shared_state(GLcontext *ctx, struct gl_shared_state *shared)
    _mesa_DeleteHashTable(shared->RenderBuffers);
 #endif
 
+#if FEATURE_ARB_vertex_buffer_object
+   _mesa_delete_buffer_object(ctx, shared->NullBufferObj);
+#endif
+
    /*
     * Free texture objects (after FBOs since some textures might have
     * been bound to FBOs).
diff --git a/src/mesa/swrast/s_imaging.c b/src/mesa/swrast/s_imaging.c
index d6be3aa022..3578b713f6 100644
--- a/src/mesa/swrast/s_imaging.c
+++ b/src/mesa/swrast/s_imaging.c
@@ -60,7 +60,7 @@ _swrast_CopyColorTable( GLcontext *ctx,
 
    /* save PBO binding */
    bufferSave = ctx->Unpack.BufferObj;
-   ctx->Unpack.BufferObj = ctx->Array.NullBufferObj;
+   ctx->Unpack.BufferObj = ctx->Shared->NullBufferObj;
 
    _mesa_ColorTable(target, internalformat, width, GL_RGBA, CHAN_TYPE, data);
 
@@ -94,7 +94,7 @@ _swrast_CopyColorSubTable( GLcontext *ctx,GLenum target, GLsizei start,
 
    /* save PBO binding */
    bufferSave = ctx->Unpack.BufferObj;
-   ctx->Unpack.BufferObj = ctx->Array.NullBufferObj;
+   ctx->Unpack.BufferObj = ctx->Shared->NullBufferObj;
 
    _mesa_ColorSubTable(target, start, width, GL_RGBA, CHAN_TYPE, data);
 
@@ -126,7 +126,7 @@ _swrast_CopyConvolutionFilter1D(GLcontext *ctx, GLenum target,
 
    /* save PBO binding */
    bufferSave = ctx->Unpack.BufferObj;
-   ctx->Unpack.BufferObj = ctx->Array.NullBufferObj;
+   ctx->Unpack.BufferObj = ctx->Shared->NullBufferObj;
 
    /* store as convolution filter */
    _mesa_ConvolutionFilter1D(target, internalFormat, width,
@@ -178,12 +178,12 @@ _swrast_CopyConvolutionFilter2D(GLcontext *ctx, GLenum target,
    ctx->Unpack.SkipImages = 0;
    ctx->Unpack.SwapBytes = GL_FALSE;
    ctx->Unpack.LsbFirst = GL_FALSE;
-   ctx->Unpack.BufferObj = ctx->Array.NullBufferObj;
+   ctx->Unpack.BufferObj = ctx->Shared->NullBufferObj;
    ctx->NewState |= _NEW_PACKUNPACK;
 
    /* save PBO binding */
    bufferSave = ctx->Unpack.BufferObj;
-   ctx->Unpack.BufferObj = ctx->Array.NullBufferObj;
+   ctx->Unpack.BufferObj = ctx->Shared->NullBufferObj;
 
    _mesa_ConvolutionFilter2D(target, internalFormat, width, height,
                              GL_RGBA, CHAN_TYPE, rgba);
diff --git a/src/mesa/vbo/vbo_context.c b/src/mesa/vbo/vbo_context.c
index ca8190fd05..f193a4bf1e 100644
--- a/src/mesa/vbo/vbo_context.c
+++ b/src/mesa/vbo/vbo_context.c
@@ -28,6 +28,7 @@
 #include "main/imports.h"
 #include "main/mtypes.h"
 #include "main/api_arrayelt.h"
+#include "main/bufferobj.h"
 #include "math/m_eval.h"
 #include "vbo.h"
 #include "vbo_context.h"
@@ -81,7 +82,8 @@ static void init_legacy_currval(GLcontext *ctx)
       cl->Type = GL_FLOAT;
       cl->Format = GL_RGBA;
       cl->Ptr = (const void *)ctx->Current.Attrib[i];
-      cl->BufferObj = ctx->Array.NullBufferObj;
+      _mesa_reference_buffer_object(ctx, &cl->BufferObj,
+                                    ctx->Shared->NullBufferObj);
    }
 }
 
@@ -106,7 +108,8 @@ static void init_generic_currval(GLcontext *ctx)
       cl->Stride = 0;
       cl->StrideB = 0;
       cl->Enabled = 1;
-      cl->BufferObj = ctx->Array.NullBufferObj;
+      _mesa_reference_buffer_object(ctx, &cl->BufferObj,
+                                    ctx->Shared->NullBufferObj);
    }
 }
 
@@ -150,7 +153,7 @@ static void init_mat_currval(GLcontext *ctx)
       cl->Stride = 0;
       cl->StrideB = 0;
       cl->Enabled = 1;
-      cl->BufferObj = ctx->Array.NullBufferObj;
+      cl->BufferObj = ctx->Shared->NullBufferObj;
    }
 }
 
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c
index 5d35ec9c11..6871ee5cab 100644
--- a/src/mesa/vbo/vbo_exec_api.c
+++ b/src/mesa/vbo/vbo_exec_api.c
@@ -671,7 +671,7 @@ void vbo_use_buffer_objects(GLcontext *ctx)
    GLsizei size = VBO_VERT_BUFFER_SIZE;
 
    /* Make sure this func is only used once */
-   assert(exec->vtx.bufferobj == ctx->Array.NullBufferObj);
+   assert(exec->vtx.bufferobj == ctx->Shared->NullBufferObj);
    if (exec->vtx.buffer_map) {
       _mesa_align_free(exec->vtx.buffer_map);
       exec->vtx.buffer_map = NULL;
@@ -697,7 +697,7 @@ void vbo_exec_vtx_init( struct vbo_exec_context *exec )
     */
    _mesa_reference_buffer_object(ctx,
                                  &exec->vtx.bufferobj,
-                                 ctx->Array.NullBufferObj);
+                                 ctx->Shared->NullBufferObj);
 
    ASSERT(!exec->vtx.buffer_map);
    exec->vtx.buffer_map = (GLfloat *)ALIGN_MALLOC(VBO_VERT_BUFFER_SIZE, 64);
diff --git a/src/mesa/vbo/vbo_rebase.c b/src/mesa/vbo/vbo_rebase.c
index dae778e741..ea87dede64 100644
--- a/src/mesa/vbo/vbo_rebase.c
+++ b/src/mesa/vbo/vbo_rebase.c
@@ -161,7 +161,7 @@ void vbo_rebase_prims( GLcontext *ctx,
 				 GL_ELEMENT_ARRAY_BUFFER,
 				 ib->obj);
 
-      tmp_ib.obj = ctx->Array.NullBufferObj;
+      tmp_ib.obj = ctx->Shared->NullBufferObj;
       tmp_ib.ptr = tmp_indices;
       tmp_ib.count = ib->count;
       tmp_ib.type = ib->type;
diff --git a/src/mesa/vbo/vbo_split_copy.c b/src/mesa/vbo/vbo_split_copy.c
index 56a9fafac4..2f6a1998ea 100644
--- a/src/mesa/vbo/vbo_split_copy.c
+++ b/src/mesa/vbo/vbo_split_copy.c
@@ -459,7 +459,7 @@ replay_init( struct copy_context *copy )
       dst->Ptr = copy->dstbuf + offset;
       dst->Enabled = GL_TRUE;
       dst->Normalized = src->Normalized; 
-      dst->BufferObj = ctx->Array.NullBufferObj;
+      dst->BufferObj = ctx->Shared->NullBufferObj;
       dst->_MaxElement = copy->dstbuf_size; /* may be less! */
 
       offset += copy->varying[i].size;
@@ -479,7 +479,7 @@ replay_init( struct copy_context *copy )
     */
    copy->dstib.count = 0;	/* duplicates dstelt_nr */
    copy->dstib.type = GL_UNSIGNED_INT;
-   copy->dstib.obj = ctx->Array.NullBufferObj;
+   copy->dstib.obj = ctx->Shared->NullBufferObj;
    copy->dstib.ptr = copy->dstelt;
 }
 
diff --git a/src/mesa/vbo/vbo_split_inplace.c b/src/mesa/vbo/vbo_split_inplace.c
index fbc856e93b..3ed6b34fbf 100644
--- a/src/mesa/vbo/vbo_split_inplace.c
+++ b/src/mesa/vbo/vbo_split_inplace.c
@@ -221,7 +221,7 @@ static void split_prims( struct split_context *split)
 
 	 ib.count = count;
 	 ib.type = GL_UNSIGNED_INT;
-	 ib.obj = split->ctx->Array.NullBufferObj;
+	 ib.obj = split->ctx->Shared->NullBufferObj;
 	 ib.ptr = elts;
 	    
 	 tmpprim = *prim;
-- 
cgit v1.2.3


From 9bb6684799f00fabc313ee50be671454e498d8a9 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 7 May 2009 13:36:20 -0600
Subject: mesa: array object comments

---
 src/mesa/main/mtypes.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 3debbe9f2d..b24366d0fe 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1557,6 +1557,8 @@ struct gl_array_object
    /** Name of the array object as received from glGenVertexArrayAPPLE. */
    GLuint Name;
 
+   /** XXX Need a refcount here */
+
    /** Conventional vertex arrays */
    /*@{*/
    struct gl_client_array Vertex;
@@ -1583,7 +1585,10 @@ struct gl_array_object
  */
 struct gl_array_attrib
 {
+   /** Currently bound array object. See _mesa_BindVertexArrayAPPLE() */
    struct gl_array_object *ArrayObj;
+
+   /** The default vertex array object */
    struct gl_array_object *DefaultArrayObj;
 
    GLint ActiveTexture;		/**< Client Active Texture */
-- 
cgit v1.2.3


From 1030bf0ded2a88a5e27f7a4d393c11cfde3d3c5a Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 7 May 2009 13:52:26 -0600
Subject: mesa: reference counting for gl_array_object

Every kind of object that can be shared by multiple contexts should be
refcounted.
---
 src/mesa/main/arrayobj.c | 67 +++++++++++++++++++++++++++++++++++++++++++++---
 src/mesa/main/arrayobj.h | 23 ++++++++++++-----
 src/mesa/main/mtypes.h   |  3 ++-
 src/mesa/main/varray.c   |  4 +--
 4 files changed, 83 insertions(+), 14 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index 2646c12ccc..71f4216bd3 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -94,10 +94,69 @@ void
 _mesa_delete_array_object( GLcontext *ctx, struct gl_array_object *obj )
 {
    (void) ctx;
+   _glthread_DESTROY_MUTEX(obj->Mutex);
    _mesa_free(obj);
 }
 
 
+/**
+ * Set ptr to arrayObj w/ reference counting.
+ */
+void
+_mesa_reference_array_object(GLcontext *ctx,
+                             struct gl_array_object **ptr,
+                             struct gl_array_object *arrayObj)
+{
+   if (*ptr == arrayObj)
+      return;
+
+   if (*ptr) {
+      /* Unreference the old array object */
+      GLboolean deleteFlag = GL_FALSE;
+      struct gl_array_object *oldObj = *ptr;
+
+      _glthread_LOCK_MUTEX(oldObj->Mutex);
+      ASSERT(oldObj->RefCount > 0);
+      oldObj->RefCount--;
+#if 0
+      printf("ArrayObj %p %d DECR to %d\n",
+             (void *) oldObj, oldObj->Name, oldObj->RefCount);
+#endif
+      deleteFlag = (oldObj->RefCount == 0);
+      _glthread_UNLOCK_MUTEX(oldObj->Mutex);
+
+      if (deleteFlag) {
+	 ASSERT(ctx->Driver.DeleteArrayObject);
+         ctx->Driver.DeleteArrayObject(ctx, oldObj);
+      }
+
+      *ptr = NULL;
+   }
+   ASSERT(!*ptr);
+
+   if (arrayObj) {
+      /* reference new array object */
+      _glthread_LOCK_MUTEX(arrayObj->Mutex);
+      if (arrayObj->RefCount == 0) {
+         /* this array's being deleted (look just above) */
+         /* Not sure this can every really happen.  Warn if it does. */
+         _mesa_problem(NULL, "referencing deleted array object");
+         *ptr = NULL;
+      }
+      else {
+         arrayObj->RefCount++;
+#if 0
+         printf("ArrayObj %p %d INCR to %d\n",
+                (void *) arrayObj, arrayObj->Name, arrayObj->RefCount);
+#endif
+         *ptr = arrayObj;
+      }
+      _glthread_UNLOCK_MUTEX(arrayObj->Mutex);
+   }
+}
+
+
+
 static void
 init_array(GLcontext *ctx,
            struct gl_client_array *array, GLint size, GLint type)
@@ -130,6 +189,9 @@ _mesa_initialize_array_object( GLcontext *ctx,
 
    obj->Name = name;
 
+   _glthread_INIT_MUTEX(obj->Mutex);
+   obj->RefCount = 1;
+
    /* Init the individual arrays */
    init_array(ctx, &obj->Vertex, 4, GL_FLOAT);
    init_array(ctx, &obj->Normal, 3, GL_FLOAT);
@@ -227,7 +289,6 @@ _mesa_BindVertexArrayAPPLE( GLuint id )
       if (!newObj) {
          /* If this is a new array object id, allocate an array object now.
 	  */
-
 	 newObj = (*ctx->Driver.NewArrayObject)(ctx, id);
          if (!newObj) {
             _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindVertexArrayAPPLE");
@@ -237,11 +298,9 @@ _mesa_BindVertexArrayAPPLE( GLuint id )
       }
    }
 
-
    ctx->NewState |= _NEW_ARRAY;
    ctx->Array.NewState |= _NEW_ARRAY_ALL;
-   ctx->Array.ArrayObj = newObj;
-
+   _mesa_reference_array_object(ctx, &ctx->Array.ArrayObj, newObj);
 
    /* Pass BindVertexArray call to device driver */
    if (ctx->Driver.BindArrayObject && newObj)
diff --git a/src/mesa/main/arrayobj.h b/src/mesa/main/arrayobj.h
index c7d66ec166..9c4036af5a 100644
--- a/src/mesa/main/arrayobj.h
+++ b/src/mesa/main/arrayobj.h
@@ -41,17 +41,26 @@
  * Internal functions
  */
 
-struct gl_array_object * _mesa_new_array_object( GLcontext *ctx,
-    GLuint name );
+extern struct gl_array_object *
+_mesa_new_array_object( GLcontext *ctx, GLuint name );
 
-void _mesa_delete_array_object( GLcontext *ctx, struct gl_array_object *obj );
+extern void
+_mesa_delete_array_object( GLcontext *ctx, struct gl_array_object *obj );
 
-void _mesa_initialize_array_object( GLcontext *ctx,
-    struct gl_array_object *obj, GLuint name );
+extern void
+_mesa_reference_array_object(GLcontext *ctx,
+                             struct gl_array_object **ptr,
+                             struct gl_array_object *arrayObj);
 
-void _mesa_save_array_object( GLcontext *ctx, struct gl_array_object *obj );
+extern void
+_mesa_initialize_array_object( GLcontext *ctx,
+                               struct gl_array_object *obj, GLuint name );
 
-void _mesa_remove_array_object( GLcontext *ctx, struct gl_array_object *obj );
+extern void
+_mesa_save_array_object( GLcontext *ctx, struct gl_array_object *obj );
+
+extern void
+_mesa_remove_array_object( GLcontext *ctx, struct gl_array_object *obj );
 
 
 
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index b24366d0fe..d11df535f2 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1557,7 +1557,8 @@ struct gl_array_object
    /** Name of the array object as received from glGenVertexArrayAPPLE. */
    GLuint Name;
 
-   /** XXX Need a refcount here */
+   GLint RefCount;
+   _glthread_Mutex Mutex;
 
    /** Conventional vertex arrays */
    /*@{*/
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 4d153b1c0b..a9c9162be1 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -1039,7 +1039,7 @@ void
 _mesa_init_varray(GLcontext *ctx)
 {
    ctx->Array.DefaultArrayObj = _mesa_new_array_object(ctx, 0);
-   ctx->Array.ArrayObj = ctx->Array.DefaultArrayObj;
-
+   _mesa_reference_array_object(ctx, &ctx->Array.ArrayObj,
+                                ctx->Array.DefaultArrayObj);
    ctx->Array.ActiveTexture = 0;   /* GL_ARB_multitexture */
 }
-- 
cgit v1.2.3


From 32b851c80792623195069d7a41a5808cff3b2f6f Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 7 May 2009 14:26:17 -0600
Subject: mesa: clean-up vertex array object VBO unbinding and
 delete/refcounting

Don't really delete vertex array objects until the refcount hits zero.
At that time, unbind any pointers to VBOs.
---
 src/mesa/main/arrayobj.c | 64 +++++++++++++++++++++++++-----------------------
 1 file changed, 33 insertions(+), 31 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index 71f4216bd3..b4d1a77b97 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -68,6 +68,32 @@ lookup_arrayobj(GLcontext *ctx, GLuint id)
 }
 
 
+/**
+ * For all the vertex arrays in the array object, unbind any pointers
+ * to any buffer objects (VBOs).
+ * This is done just prior to array object destruction.
+ */
+static void
+unbind_array_object_vbos(GLcontext *ctx, struct gl_array_object *obj)
+{
+   GLuint i;
+
+   _mesa_reference_buffer_object(ctx, &obj->Vertex.BufferObj, NULL);
+   _mesa_reference_buffer_object(ctx, &obj->Normal.BufferObj, NULL);
+   _mesa_reference_buffer_object(ctx, &obj->Color.BufferObj, NULL);
+   _mesa_reference_buffer_object(ctx, &obj->SecondaryColor.BufferObj, NULL);
+   _mesa_reference_buffer_object(ctx, &obj->FogCoord.BufferObj, NULL);
+   _mesa_reference_buffer_object(ctx, &obj->Index.BufferObj, NULL);
+   _mesa_reference_buffer_object(ctx, &obj->EdgeFlag.BufferObj, NULL);
+
+   for (i = 0; i < MAX_TEXTURE_COORD_UNITS; i++)
+      _mesa_reference_buffer_object(ctx, &obj->TexCoord[i].BufferObj, NULL);
+
+   for (i = 0; i < VERT_ATTRIB_MAX; i++)
+      _mesa_reference_buffer_object(ctx, &obj->VertexAttrib[i].BufferObj,NULL);
+}
+
+
 /**
  * Allocate and initialize a new vertex array object.
  * 
@@ -94,6 +120,7 @@ void
 _mesa_delete_array_object( GLcontext *ctx, struct gl_array_object *obj )
 {
    (void) ctx;
+   unbind_array_object_vbos(ctx, obj);
    _glthread_DESTROY_MUTEX(obj->Mutex);
    _mesa_free(obj);
 }
@@ -240,15 +267,6 @@ _mesa_remove_array_object( GLcontext *ctx, struct gl_array_object *obj )
 }
 
 
-static void
-unbind_buffer_object( GLcontext *ctx, struct gl_buffer_object *bufObj )
-{
-   if (bufObj != ctx->Shared->NullBufferObj) {
-      _mesa_reference_buffer_object(ctx, &bufObj, NULL);
-   }
-}
-
-
 /**********************************************************************/
 /* API Functions                                                      */
 /**********************************************************************/
@@ -275,7 +293,7 @@ _mesa_BindVertexArrayAPPLE( GLuint id )
       return;   /* rebinding the same array object- no change */
 
    /*
-    * Get pointer to new array object (newBufObj)
+    * Get pointer to new array object (newObj)
     */
    if (id == 0) {
       /* The spec says there is no array object named 0, but we use
@@ -334,7 +352,6 @@ _mesa_DeleteVertexArraysAPPLE(GLsizei n, const GLuint *ids)
       if ( obj != NULL ) {
 	 ASSERT( obj->Name == ids[i] );
 
-
 	 /* If the array object is currently bound, the spec says "the binding
 	  * for that object reverts to zero and the default vertex array
 	  * becomes current."
@@ -343,28 +360,13 @@ _mesa_DeleteVertexArraysAPPLE(GLsizei n, const GLuint *ids)
 	    CALL_BindVertexArrayAPPLE( ctx->Exec, (0) );
 	 }
 
-#if FEATURE_ARB_vertex_buffer_object
-	 /* Unbind any buffer objects that might be bound to arrays in
-	  * this array object.
-	  */
-	 unbind_buffer_object( ctx, obj->Vertex.BufferObj );
-	 unbind_buffer_object( ctx, obj->Normal.BufferObj );
-	 unbind_buffer_object( ctx, obj->Color.BufferObj );
-	 unbind_buffer_object( ctx, obj->SecondaryColor.BufferObj );
-	 unbind_buffer_object( ctx, obj->FogCoord.BufferObj );
-	 unbind_buffer_object( ctx, obj->Index.BufferObj );
-	 for (i = 0; i < MAX_TEXTURE_COORD_UNITS; i++) {
-	    unbind_buffer_object( ctx, obj->TexCoord[i].BufferObj );
-	 }
-	 unbind_buffer_object( ctx, obj->EdgeFlag.BufferObj );
-	 for (i = 0; i < VERT_ATTRIB_MAX; i++) {
-	    unbind_buffer_object( ctx, obj->VertexAttrib[i].BufferObj );
-	 }
-#endif
-
 	 /* The ID is immediately freed for re-use */
 	 _mesa_remove_array_object(ctx, obj);
-	 ctx->Driver.DeleteArrayObject(ctx, obj);
+
+         /* Unreference the array object. 
+          * If refcount hits zero, the object will be deleted.
+          */
+         _mesa_reference_array_object(ctx, &obj, NULL);
       }
    }
 
-- 
cgit v1.2.3


From fa95ecb467d656e293a12c089b3e85fcbbadb848 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 7 May 2009 14:33:18 -0600
Subject: mesa: make the array object save/remove functions static

---
 src/mesa/main/arrayobj.c | 14 +++++++-------
 src/mesa/main/arrayobj.h |  7 -------
 2 files changed, 7 insertions(+), 14 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index b4d1a77b97..8ec73b9526 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -243,8 +243,8 @@ _mesa_initialize_array_object( GLcontext *ctx,
 /**
  * Add the given array object to the array object pool.
  */
-void
-_mesa_save_array_object( GLcontext *ctx, struct gl_array_object *obj )
+static void
+save_array_object( GLcontext *ctx, struct gl_array_object *obj )
 {
    if (obj->Name > 0) {
       /* insert into hash table */
@@ -257,8 +257,8 @@ _mesa_save_array_object( GLcontext *ctx, struct gl_array_object *obj )
  * Remove the given array object from the array object pool.
  * Do not deallocate the array object though.
  */
-void
-_mesa_remove_array_object( GLcontext *ctx, struct gl_array_object *obj )
+static void
+remove_array_object( GLcontext *ctx, struct gl_array_object *obj )
 {
    if (obj->Name > 0) {
       /* remove from hash table */
@@ -312,7 +312,7 @@ _mesa_BindVertexArrayAPPLE( GLuint id )
             _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindVertexArrayAPPLE");
             return;
          }
-         _mesa_save_array_object(ctx, newObj);
+         save_array_object(ctx, newObj);
       }
    }
 
@@ -361,7 +361,7 @@ _mesa_DeleteVertexArraysAPPLE(GLsizei n, const GLuint *ids)
 	 }
 
 	 /* The ID is immediately freed for re-use */
-	 _mesa_remove_array_object(ctx, obj);
+	 remove_array_object(ctx, obj);
 
          /* Unreference the array object. 
           * If refcount hits zero, the object will be deleted.
@@ -415,7 +415,7 @@ _mesa_GenVertexArraysAPPLE(GLsizei n, GLuint *arrays)
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "glGenVertexArraysAPPLE");
          return;
       }
-      _mesa_save_array_object(ctx, obj);
+      save_array_object(ctx, obj);
       arrays[i] = first + i;
    }
 
diff --git a/src/mesa/main/arrayobj.h b/src/mesa/main/arrayobj.h
index 9c4036af5a..9c2f340cfa 100644
--- a/src/mesa/main/arrayobj.h
+++ b/src/mesa/main/arrayobj.h
@@ -56,13 +56,6 @@ extern void
 _mesa_initialize_array_object( GLcontext *ctx,
                                struct gl_array_object *obj, GLuint name );
 
-extern void
-_mesa_save_array_object( GLcontext *ctx, struct gl_array_object *obj );
-
-extern void
-_mesa_remove_array_object( GLcontext *ctx, struct gl_array_object *obj );
-
-
 
 /*
  * API functions
-- 
cgit v1.2.3


From b25168c34c60760a33ca9e8336ac76cf1219f143 Mon Sep 17 00:00:00 2001
From: José Fonseca <jfonseca@vmware.com>
Date: Fri, 1 May 2009 18:52:54 +0100
Subject: mesa: Make _mesa_share_state thread safe.

---
 src/mesa/main/context.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 1a290f251a..ddbc631e67 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1394,14 +1394,21 @@ _mesa_share_state(GLcontext *ctx, GLcontext *ctxToShare)
 {
    if (ctx && ctxToShare && ctx->Shared && ctxToShare->Shared) {
       struct gl_shared_state *oldSharedState = ctx->Shared;
+      GLint RefCount;
 
       ctx->Shared = ctxToShare->Shared;
+      
+      _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
       ctx->Shared->RefCount++;
+      _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
 
       update_default_objects(ctx);
 
-      oldSharedState->RefCount--;
-      if (oldSharedState->RefCount == 0) {
+      _glthread_LOCK_MUTEX(oldSharedState->Mutex);
+      RefCount = --oldSharedState->RefCount;
+      _glthread_UNLOCK_MUTEX(oldSharedState->Mutex);
+
+      if (RefCount == 0) {
          _mesa_free_shared_state(ctx, oldSharedState);
       }
 
-- 
cgit v1.2.3


From 751f73e2812cf8185c775a91c16cf8565b85536d Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keithw@vmware.com>
Date: Fri, 1 May 2009 18:20:42 +0100
Subject: mesa/main: set PREFER_DP4 to match position_invarient code

This is a quick fix for z fighting in quake4 caused by the mismatch
between vertex transformation here and in the position_invarient code.
Full fix would be to make this driver-tunable and adjust both
position_invarient and ffvertex_prog.c code to respect driver
preferences.
---
 src/mesa/main/ffvertex_prog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index 1ce5685af4..82e1c4af66 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -319,7 +319,7 @@ static void make_state_key( GLcontext *ctx, struct state_key *key )
  * multiplications with DP4's or with MUL/MAD's?  SSE works better
  * with the latter, drivers may differ.
  */
-#define PREFER_DP4 0
+#define PREFER_DP4 1
 
 
 /* Use uregs to represent registers internally, translate to Mesa's
-- 
cgit v1.2.3


From b6e8256899a9a93c665c34e10efcc918f2fcc095 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keithw@vmware.com>
Date: Tue, 5 May 2009 12:12:28 +0100
Subject: mesa: more complete fix for transform_invarient glitches

Add a new flag mvp_with_dp4 in the context, and use that to switch
both ffvertex.c and programopt.c vertex transformation code to
either DP4 or MUL/MAD implementations.
---
 src/mesa/main/context.c             |  13 ++++
 src/mesa/main/context.h             |   4 ++
 src/mesa/main/ffvertex_prog.c       |  16 +++--
 src/mesa/main/mtypes.h              |   6 ++
 src/mesa/shader/programopt.c        | 119 +++++++++++++++++++++++++++++++++++-
 src/mesa/state_tracker/st_context.c |   6 ++
 6 files changed, 153 insertions(+), 11 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 016284de9a..d780f91f04 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1522,4 +1522,17 @@ _mesa_Flush(void)
 }
 
 
+/**
+ * Set mvp_with_dp4 flag.  If a driver has a preference for DP4 over
+ * MUL/MAD, or vice versa, call this function to register that.
+ * Otherwise we default to MUL/MAD.
+ */
+void
+_mesa_set_mvp_with_dp4( GLcontext *ctx,
+                        GLboolean flag )
+{
+   ctx->mvp_with_dp4 = flag;
+}
+
+
 /*@}*/
diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h
index ecc1cec779..5b57d88029 100644
--- a/src/mesa/main/context.h
+++ b/src/mesa/main/context.h
@@ -151,6 +151,10 @@ extern struct _glapi_table *
 _mesa_get_dispatch(GLcontext *ctx);
 
 
+void
+_mesa_set_mvp_with_dp4( GLcontext *ctx,
+                        GLboolean flag );
+
 
 /** \name Miscellaneous */
 /*@{*/
diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index 82e1c4af66..43325b1352 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -315,12 +315,6 @@ static void make_state_key( GLcontext *ctx, struct state_key *key )
  */
 #define DISASSEM 0
 
-/* Should be tunable by the driver - do we want to do matrix
- * multiplications with DP4's or with MUL/MAD's?  SSE works better
- * with the latter, drivers may differ.
- */
-#define PREFER_DP4 1
-
 
 /* Use uregs to represent registers internally, translate to Mesa's
  * expected formats on emit.  
@@ -348,6 +342,7 @@ struct tnl_program {
    const struct state_key *state;
    struct gl_vertex_program *program;
    GLint max_inst;  /** number of instructions allocated for program */
+   GLboolean mvp_with_dp4;
    
    GLuint temp_in_use;
    GLuint temp_reserved;
@@ -775,7 +770,7 @@ static struct ureg get_eye_position( struct tnl_program *p )
 
       p->eye_position = reserve_temp(p);
 
-      if (PREFER_DP4) {
+      if (p->mvp_with_dp4) {
 	 register_matrix_param5( p, STATE_MODELVIEW_MATRIX, 0, 0, 3,
                                  0, modelview );
 
@@ -881,7 +876,7 @@ static void build_hpos( struct tnl_program *p )
    struct ureg hpos = register_output( p, VERT_RESULT_HPOS );
    struct ureg mvp[4];
 
-   if (PREFER_DP4) {
+   if (p->mvp_with_dp4) {
       register_matrix_param5( p, STATE_MVP_MATRIX, 0, 0, 3, 
 			      0, mvp );
       emit_matrix_transform_vec4( p, hpos, mvp, pos );
@@ -1574,7 +1569,7 @@ static void build_texture_transform( struct tnl_program *p )
 	    struct ureg in = (!is_undef(out_texgen) ? 
 			      out_texgen : 
 			      register_input(p, VERT_ATTRIB_TEX0+i));
-	    if (PREFER_DP4) {
+	    if (p->mvp_with_dp4) {
 	       register_matrix_param5( p, STATE_TEXTURE_MATRIX, i, 0, 3,
 				       0, texmat );
 	       emit_matrix_transform_vec4( p, out, texmat, in );
@@ -1708,6 +1703,7 @@ static void build_tnl_program( struct tnl_program *p )
 static void
 create_new_program( const struct state_key *key,
                     struct gl_vertex_program *program,
+                    GLboolean mvp_with_dp4,
                     GLuint max_temps)
 {
    struct tnl_program p;
@@ -1721,6 +1717,7 @@ create_new_program( const struct state_key *key,
    p.transformed_normal = undef;
    p.identity = undef;
    p.temp_in_use = 0;
+   p.mvp_with_dp4 = mvp_with_dp4;
    
    if (max_temps >= sizeof(int) * 8)
       p.temp_reserved = 0;
@@ -1776,6 +1773,7 @@ _mesa_get_fixed_func_vertex_program(GLcontext *ctx)
          return NULL;
 
       create_new_program( &key, prog,
+                          ctx->mvp_with_dp4,
                           ctx->Const.VertexProgram.MaxTemps );
 
 #if 0
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 30c7cca3b5..ed6b1062bd 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2977,6 +2977,12 @@ struct __GLcontextRec
    /** software compression/decompression supported or not */
    GLboolean Mesa_DXTn;
 
+   /** 
+    * Use dp4 (rather than mul/mad) instructions for position
+    * transformation?
+    */
+   GLboolean mvp_with_dp4;
+
    /** Core tnl module support */
    struct gl_tnl_module TnlModule;
 
diff --git a/src/mesa/shader/programopt.c b/src/mesa/shader/programopt.c
index ecd98dc85c..f70c75cec8 100644
--- a/src/mesa/shader/programopt.c
+++ b/src/mesa/shader/programopt.c
@@ -45,8 +45,8 @@
  * into a vertex program.
  * May be used to implement the position_invariant option.
  */
-void
-_mesa_insert_mvp_code(GLcontext *ctx, struct gl_vertex_program *vprog)
+static void
+_mesa_insert_mvp_dp4_code(GLcontext *ctx, struct gl_vertex_program *vprog)
 {
    struct prog_instruction *newInst;
    const GLuint origLen = vprog->Base.NumInstructions;
@@ -113,6 +113,121 @@ _mesa_insert_mvp_code(GLcontext *ctx, struct gl_vertex_program *vprog)
 }
 
 
+static void
+_mesa_insert_mvp_mad_code(GLcontext *ctx, struct gl_vertex_program *vprog)
+{
+   struct prog_instruction *newInst;
+   const GLuint origLen = vprog->Base.NumInstructions;
+   const GLuint newLen = origLen + 4;
+   GLuint hposTemp;
+   GLuint i;
+
+   /*
+    * Setup state references for the modelview/projection matrix.
+    * XXX we should check if these state vars are already declared.
+    */
+   static const gl_state_index mvpState[4][STATE_LENGTH] = {
+      { STATE_MVP_MATRIX, 0, 0, 0, STATE_MATRIX_TRANSPOSE },
+      { STATE_MVP_MATRIX, 0, 1, 1, STATE_MATRIX_TRANSPOSE },
+      { STATE_MVP_MATRIX, 0, 2, 2, STATE_MATRIX_TRANSPOSE },
+      { STATE_MVP_MATRIX, 0, 3, 3, STATE_MATRIX_TRANSPOSE },
+   };
+   GLint mvpRef[4];
+
+   for (i = 0; i < 4; i++) {
+      mvpRef[i] = _mesa_add_state_reference(vprog->Base.Parameters,
+                                            mvpState[i]);
+   }
+
+   /* Alloc storage for new instructions */
+   newInst = _mesa_alloc_instructions(newLen);
+   if (!newInst) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY,
+                  "glProgramString(inserting position_invariant code)");
+      return;
+   }
+
+   /* TEMP hposTemp; */
+   hposTemp = vprog->Base.NumTemporaries++;
+
+   /*
+    * Generated instructions:
+    *    emit_op2(p, OPCODE_MUL, tmp, 0, swizzle1(src,X), mat[0]);
+    *    emit_op3(p, OPCODE_MAD, tmp, 0, swizzle1(src,Y), mat[1], tmp);
+    *    emit_op3(p, OPCODE_MAD, tmp, 0, swizzle1(src,Z), mat[2], tmp);
+    *    emit_op3(p, OPCODE_MAD, dest, 0, swizzle1(src,W), mat[3], tmp);
+    */
+   _mesa_init_instructions(newInst, 4);
+
+   newInst[0].Opcode = OPCODE_MUL;
+   newInst[0].DstReg.File = PROGRAM_TEMPORARY;
+   newInst[0].DstReg.Index = hposTemp;
+   newInst[0].DstReg.WriteMask = WRITEMASK_XYZW;
+   newInst[0].SrcReg[0].File = PROGRAM_INPUT;
+   newInst[0].SrcReg[0].Index = VERT_ATTRIB_POS;
+   newInst[0].SrcReg[0].Swizzle = SWIZZLE_XXXX;
+   newInst[0].SrcReg[1].File = PROGRAM_STATE_VAR;
+   newInst[0].SrcReg[1].Index = mvpRef[0];
+   newInst[0].SrcReg[1].Swizzle = SWIZZLE_NOOP;
+
+   for (i = 1; i <= 2; i++) {
+      newInst[i].Opcode = OPCODE_MAD;
+      newInst[i].DstReg.File = PROGRAM_TEMPORARY;
+      newInst[i].DstReg.Index = hposTemp;
+      newInst[i].DstReg.WriteMask = WRITEMASK_XYZW;
+      newInst[i].SrcReg[0].File = PROGRAM_INPUT;
+      newInst[i].SrcReg[0].Index = VERT_ATTRIB_POS;
+      newInst[i].SrcReg[0].Swizzle = MAKE_SWIZZLE4(i,i,i,i);
+      newInst[i].SrcReg[1].File = PROGRAM_STATE_VAR;
+      newInst[i].SrcReg[1].Index = mvpRef[i];
+      newInst[i].SrcReg[1].Swizzle = SWIZZLE_NOOP;
+      newInst[i].SrcReg[2].File = PROGRAM_TEMPORARY;
+      newInst[i].SrcReg[2].Index = hposTemp;
+      newInst[1].SrcReg[2].Swizzle = SWIZZLE_NOOP;
+   }
+
+   newInst[3].Opcode = OPCODE_MAD;
+   newInst[3].DstReg.File = PROGRAM_OUTPUT;
+   newInst[3].DstReg.Index = VERT_RESULT_HPOS;
+   newInst[3].DstReg.WriteMask = WRITEMASK_XYZW;
+   newInst[3].SrcReg[0].File = PROGRAM_INPUT;
+   newInst[3].SrcReg[0].Index = VERT_ATTRIB_POS;
+   newInst[3].SrcReg[0].Swizzle = SWIZZLE_WWWW;
+   newInst[3].SrcReg[1].File = PROGRAM_STATE_VAR;
+   newInst[3].SrcReg[1].Index = mvpRef[3];
+   newInst[3].SrcReg[1].Swizzle = SWIZZLE_NOOP;
+   newInst[3].SrcReg[2].File = PROGRAM_TEMPORARY;
+   newInst[3].SrcReg[2].Index = hposTemp;
+   newInst[3].SrcReg[2].Swizzle = SWIZZLE_NOOP;
+
+
+   /* Append original instructions after new instructions */
+   _mesa_copy_instructions (newInst + 4, vprog->Base.Instructions, origLen);
+
+   /* free old instructions */
+   _mesa_free_instructions(vprog->Base.Instructions, origLen);
+
+   /* install new instructions */
+   vprog->Base.Instructions = newInst;
+   vprog->Base.NumInstructions = newLen;
+   vprog->Base.InputsRead |= VERT_BIT_POS;
+   vprog->Base.OutputsWritten |= (1 << VERT_RESULT_HPOS);
+}
+
+
+void
+_mesa_insert_mvp_code(GLcontext *ctx, struct gl_vertex_program *vprog)
+{
+   if (ctx->mvp_with_dp4) 
+      _mesa_insert_mvp_dp4_code( ctx, vprog );
+   else
+      _mesa_insert_mvp_mad_code( ctx, vprog );
+}
+      
+
+
+
+
 
 /**
  * Append extra instructions onto the given fragment program to implement
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index 92a630eff9..2a1f21c51c 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -177,6 +177,12 @@ struct st_context *st_create_context(struct pipe_context *pipe,
 
    ctx = _mesa_create_context(visual, shareCtx, &funcs, NULL);
 
+   /* XXX: need a capability bit in gallium to query if the pipe
+    * driver prefers DP4 or MUL/MAD for vertex transformation.
+    */
+   if (debug_get_bool_option("MESA_MVP_DP4", FALSE))
+      _mesa_set_mvp_with_dp4( ctx, GL_TRUE );
+
    return st_create_context_priv(ctx, pipe);
 }
 
-- 
cgit v1.2.3


From d88faf91e9fe222636b33540298ee64bc6f4416c Mon Sep 17 00:00:00 2001
From: José Fonseca <jfonseca@vmware.com>
Date: Fri, 1 May 2009 18:52:54 +0100
Subject: mesa: Make _mesa_share_state thread safe.

---
 src/mesa/main/context.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index d780f91f04..60c48289e4 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1397,14 +1397,21 @@ _mesa_share_state(GLcontext *ctx, GLcontext *ctxToShare)
 {
    if (ctx && ctxToShare && ctx->Shared && ctxToShare->Shared) {
       struct gl_shared_state *oldSharedState = ctx->Shared;
+      GLint RefCount;
 
       ctx->Shared = ctxToShare->Shared;
+      
+      _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
       ctx->Shared->RefCount++;
+      _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
 
       update_default_objects(ctx);
 
-      oldSharedState->RefCount--;
-      if (oldSharedState->RefCount == 0) {
+      _glthread_LOCK_MUTEX(oldSharedState->Mutex);
+      RefCount = --oldSharedState->RefCount;
+      _glthread_UNLOCK_MUTEX(oldSharedState->Mutex);
+
+      if (RefCount == 0) {
          _mesa_free_shared_state(ctx, oldSharedState);
       }
 
-- 
cgit v1.2.3


From 87fbc9a14ed2bdd24d84c38431abbf7b0c275998 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 8 May 2009 12:44:38 -0600
Subject: mesa: issue warning for out of bounds array indexes

---
 src/mesa/main/api_validate.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c
index 27049486ee..d5c604c56a 100644
--- a/src/mesa/main/api_validate.c
+++ b/src/mesa/main/api_validate.c
@@ -184,6 +184,8 @@ _mesa_validate_DrawElements(GLcontext *ctx,
                                     ctx->Array.ElementArrayBufferObj);
       if (max >= ctx->Array._MaxElement) {
          /* the max element is out of bounds of one or more enabled arrays */
+         _mesa_warning(ctx, "glDrawElements() index=%u is "
+                       "out of bounds (max=%u)", max, ctx->Array._MaxElement);
          return GL_FALSE;
       }
    }
-- 
cgit v1.2.3


From 17a354a119370df9196a010a31fc71cd8712ec46 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 8 May 2009 14:34:15 -0600
Subject: mesa: assertions to check for too many vertex outputs or fragment
 inputs

---
 src/mesa/main/context.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index ddbc631e67..5e0f2d7b1b 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -602,6 +602,10 @@ _mesa_init_constants(GLcontext *ctx)
    ASSERT(MAX_NV_VERTEX_PROGRAM_TEMPS <= MAX_PROGRAM_TEMPS);
    ASSERT(MAX_NV_VERTEX_PROGRAM_INPUTS <= VERT_ATTRIB_MAX);
    ASSERT(MAX_NV_VERTEX_PROGRAM_OUTPUTS <= VERT_RESULT_MAX);
+
+   /* check that we don't exceed various 32-bit bitfields */
+   ASSERT(VERT_RESULT_MAX <= 32);
+   ASSERT(FRAG_ATTRIB_MAX <= 32);
 }
 
 
-- 
cgit v1.2.3


From 4e762395ef7e8c332c16fd0c11025cfa52763a45 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 8 May 2009 14:34:43 -0600
Subject: mesa: raise MAX_VARYING (number of shader varying vars) to 16

16 is the limit for now because of various 32-bit bitfields.
---
 src/mesa/main/config.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index 2a9fdf9ca0..888e08ff93 100644
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -187,7 +187,7 @@
 #define MAX_PROGRAM_TEMPS 256
 #define MAX_PROGRAM_ADDRESS_REGS 2
 #define MAX_UNIFORMS 1024  /**< number of vec4 uniforms */
-#define MAX_VARYING 8      /**< number of float[4] vectors */
+#define MAX_VARYING 16     /**< number of float[4] vectors */
 #define MAX_SAMPLERS MAX_TEXTURE_IMAGE_UNITS
 #define MAX_PROGRAM_INPUTS 32
 #define MAX_PROGRAM_OUTPUTS 32
-- 
cgit v1.2.3


From 6fec2eb1433c8d533b0a9afb73a2162db8dd9a7b Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 8 May 2009 15:04:12 -0600
Subject: mesa: set version to 7.5-rc1

---
 Makefile                | 2 +-
 src/mesa/main/version.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/Makefile b/Makefile
index a77825e8f9..4282b78f49 100644
--- a/Makefile
+++ b/Makefile
@@ -181,7 +181,7 @@ ultrix-gcc:
 
 # Rules for making release tarballs
 
-VERSION=7.5-devel
+VERSION=7.5-rc1
 DIRECTORY = Mesa-$(VERSION)
 LIB_NAME = MesaLib-$(VERSION)
 DEMO_NAME = MesaDemos-$(VERSION)
diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index ba027465d4..072037bbd7 100644
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -31,7 +31,7 @@
 #define MESA_MAJOR 7
 #define MESA_MINOR 5
 #define MESA_PATCH 0
-#define MESA_VERSION_STRING "7.5"
+#define MESA_VERSION_STRING "7.5-rc1"
 
 /* To make version comparison easy */
 #define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
-- 
cgit v1.2.3


From c230767d6956b63a2b101acb48f98823bb5dd31a Mon Sep 17 00:00:00 2001
From: Robert Ellison <papillo@vmware.com>
Date: Fri, 8 May 2009 11:13:57 -0600
Subject: mesa: Fixed a texture memory leak

The current texture for any particular texture unit is given an additional
reference in update_texture_state(); but if the context is closed before
that texture can be released (which is quite frequent in normal use, unless
a program unbinds and deletes the texture and renders without it to force
a call to update_texture_state(), the memory is lost.

This affects general Mesa; but the i965 is particularly affected because
it allocates a considerable amount of additional memory for each allocated
texture.
---
 src/mesa/main/texstate.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 5453331c67..6e0c0c688a 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -791,6 +791,9 @@ _mesa_free_texture_data(GLcontext *ctx)
 
    /* unreference current textures */
    for (u = 0; u < MAX_TEXTURE_IMAGE_UNITS; u++) {
+      /* The _Current texture could account for another reference */
+      _mesa_reference_texobj(&ctx->Texture.Unit[u]._Current, NULL);
+
       for (tgt = 0; tgt < NUM_TEXTURE_TARGETS; tgt++) {
          _mesa_reference_texobj(&ctx->Texture.Unit[u].CurrentTex[tgt], NULL);
       }
-- 
cgit v1.2.3


From 2223615e0a897434b41f86d22c41cb5dc9f8d67a Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 11 May 2009 09:46:56 -0600
Subject: mesa: Fixed a texture memory leak

The current texture for any particular texture unit is given an additional
reference in update_texture_state(); but if the context is closed before
that texture can be released (which is quite frequent in normal use, unless
a program unbinds and deletes the texture and renders without it to force
a call to update_texture_state(), the memory is lost.

This affects general Mesa; but the i965 is particularly affected because
it allocates a considerable amount of additional memory for each allocated
texture.

(cherry picked from master, commit c230767d6956b63a2b101acb48f98823bb5dd31a)
---
 src/mesa/main/texstate.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 73f8a5339e..cef58d7a49 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -780,6 +780,9 @@ _mesa_free_texture_data(GLcontext *ctx)
 
    /* unreference current textures */
    for (u = 0; u < MAX_TEXTURE_IMAGE_UNITS; u++) {
+      /* The _Current texture could account for another reference */
+      _mesa_reference_texobj(&ctx->Texture.Unit[u]._Current, NULL);
+
       for (tgt = 0; tgt < NUM_TEXTURE_TARGETS; tgt++) {
          _mesa_reference_texobj(&ctx->Texture.Unit[u].CurrentTex[tgt], NULL);
       }
-- 
cgit v1.2.3


From 7c3d7353d7b46f5ce2b411f08f9e4c158f1610e0 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 11 May 2009 10:02:18 -0600
Subject: mesa: updated comments for _mesa_generate_mipmap()

---
 src/mesa/main/mipmap.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index bc8658beff..47db2acdf0 100644
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -1478,9 +1478,12 @@ next_mipmap_level_size(GLenum target, GLint border,
 
 
 /**
- * For GL_SGIX_generate_mipmap:
- * Generate a complete set of mipmaps from texObj's base-level image.
+ * Automatic mipmap generation.
+ * This is the fallback/default function for ctx->Driver.GenerateMipmap().
+ * Generate a complete set of mipmaps from texObj's BaseLevel image.
  * Stop at texObj's MaxLevel or when we get to the 1x1 texture.
+ * For cube maps, target will be one of
+ * GL_TEXTURE_CUBE_MAP_POSITIVE/NEGATIVE_X/Y/Z; never GL_TEXTURE_CUBE_MAP.
  */
 void
 _mesa_generate_mipmap(GLcontext *ctx, GLenum target,
-- 
cgit v1.2.3


From 5568f2f601fbd974af402da92548904f6fafc6dc Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 13 May 2009 09:27:31 -0600
Subject: mesa: reference counting for gl_array_object

Every kind of object that can be shared by multiple contexts should be
refcounted.
(cherry picked from commit 1030bf0ded2a88a5e27f7a4d393c11cfde3d3c5a)
---
 src/mesa/main/arrayobj.c | 67 +++++++++++++++++++++++++++++++++++++++++++++---
 src/mesa/main/arrayobj.h | 23 ++++++++++++-----
 src/mesa/main/mtypes.h   |  3 +++
 src/mesa/main/varray.c   |  4 +--
 4 files changed, 84 insertions(+), 13 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index b04095fd16..ccb5b8e157 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -94,10 +94,69 @@ void
 _mesa_delete_array_object( GLcontext *ctx, struct gl_array_object *obj )
 {
    (void) ctx;
+   _glthread_DESTROY_MUTEX(obj->Mutex);
    _mesa_free(obj);
 }
 
 
+/**
+ * Set ptr to arrayObj w/ reference counting.
+ */
+void
+_mesa_reference_array_object(GLcontext *ctx,
+                             struct gl_array_object **ptr,
+                             struct gl_array_object *arrayObj)
+{
+   if (*ptr == arrayObj)
+      return;
+
+   if (*ptr) {
+      /* Unreference the old array object */
+      GLboolean deleteFlag = GL_FALSE;
+      struct gl_array_object *oldObj = *ptr;
+
+      _glthread_LOCK_MUTEX(oldObj->Mutex);
+      ASSERT(oldObj->RefCount > 0);
+      oldObj->RefCount--;
+#if 0
+      printf("ArrayObj %p %d DECR to %d\n",
+             (void *) oldObj, oldObj->Name, oldObj->RefCount);
+#endif
+      deleteFlag = (oldObj->RefCount == 0);
+      _glthread_UNLOCK_MUTEX(oldObj->Mutex);
+
+      if (deleteFlag) {
+	 ASSERT(ctx->Driver.DeleteArrayObject);
+         ctx->Driver.DeleteArrayObject(ctx, oldObj);
+      }
+
+      *ptr = NULL;
+   }
+   ASSERT(!*ptr);
+
+   if (arrayObj) {
+      /* reference new array object */
+      _glthread_LOCK_MUTEX(arrayObj->Mutex);
+      if (arrayObj->RefCount == 0) {
+         /* this array's being deleted (look just above) */
+         /* Not sure this can every really happen.  Warn if it does. */
+         _mesa_problem(NULL, "referencing deleted array object");
+         *ptr = NULL;
+      }
+      else {
+         arrayObj->RefCount++;
+#if 0
+         printf("ArrayObj %p %d INCR to %d\n",
+                (void *) arrayObj, arrayObj->Name, arrayObj->RefCount);
+#endif
+         *ptr = arrayObj;
+      }
+      _glthread_UNLOCK_MUTEX(arrayObj->Mutex);
+   }
+}
+
+
+
 static void
 init_array(GLcontext *ctx,
            struct gl_client_array *array, GLint size, GLint type)
@@ -129,6 +188,9 @@ _mesa_initialize_array_object( GLcontext *ctx,
 
    obj->Name = name;
 
+   _glthread_INIT_MUTEX(obj->Mutex);
+   obj->RefCount = 1;
+
    /* Init the individual arrays */
    init_array(ctx, &obj->Vertex, 4, GL_FLOAT);
    init_array(ctx, &obj->Normal, 3, GL_FLOAT);
@@ -226,7 +288,6 @@ _mesa_BindVertexArrayAPPLE( GLuint id )
       if (!newObj) {
          /* If this is a new array object id, allocate an array object now.
 	  */
-
 	 newObj = (*ctx->Driver.NewArrayObject)(ctx, id);
          if (!newObj) {
             _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindVertexArrayAPPLE");
@@ -236,11 +297,9 @@ _mesa_BindVertexArrayAPPLE( GLuint id )
       }
    }
 
-
    ctx->NewState |= _NEW_ARRAY;
    ctx->Array.NewState |= _NEW_ARRAY_ALL;
-   ctx->Array.ArrayObj = newObj;
-
+   _mesa_reference_array_object(ctx, &ctx->Array.ArrayObj, newObj);
 
    /* Pass BindVertexArray call to device driver */
    if (ctx->Driver.BindArrayObject && newObj)
diff --git a/src/mesa/main/arrayobj.h b/src/mesa/main/arrayobj.h
index c7d66ec166..9c4036af5a 100644
--- a/src/mesa/main/arrayobj.h
+++ b/src/mesa/main/arrayobj.h
@@ -41,17 +41,26 @@
  * Internal functions
  */
 
-struct gl_array_object * _mesa_new_array_object( GLcontext *ctx,
-    GLuint name );
+extern struct gl_array_object *
+_mesa_new_array_object( GLcontext *ctx, GLuint name );
 
-void _mesa_delete_array_object( GLcontext *ctx, struct gl_array_object *obj );
+extern void
+_mesa_delete_array_object( GLcontext *ctx, struct gl_array_object *obj );
 
-void _mesa_initialize_array_object( GLcontext *ctx,
-    struct gl_array_object *obj, GLuint name );
+extern void
+_mesa_reference_array_object(GLcontext *ctx,
+                             struct gl_array_object **ptr,
+                             struct gl_array_object *arrayObj);
 
-void _mesa_save_array_object( GLcontext *ctx, struct gl_array_object *obj );
+extern void
+_mesa_initialize_array_object( GLcontext *ctx,
+                               struct gl_array_object *obj, GLuint name );
 
-void _mesa_remove_array_object( GLcontext *ctx, struct gl_array_object *obj );
+extern void
+_mesa_save_array_object( GLcontext *ctx, struct gl_array_object *obj );
+
+extern void
+_mesa_remove_array_object( GLcontext *ctx, struct gl_array_object *obj );
 
 
 
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index ed6b1062bd..50dc2def87 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1557,6 +1557,9 @@ struct gl_array_object
    /** Name of the array object as received from glGenVertexArrayAPPLE. */
    GLuint Name;
 
+   GLint RefCount;
+   _glthread_Mutex Mutex;
+
    /** Conventional vertex arrays */
    /*@{*/
    struct gl_client_array Vertex;
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 106252e460..72b3e834b3 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -1050,7 +1050,7 @@ void
 _mesa_init_varray(GLcontext *ctx)
 {
    ctx->Array.DefaultArrayObj = _mesa_new_array_object(ctx, 0);
-   ctx->Array.ArrayObj = ctx->Array.DefaultArrayObj;
-
+   _mesa_reference_array_object(ctx, &ctx->Array.ArrayObj,
+                                ctx->Array.DefaultArrayObj);
    ctx->Array.ActiveTexture = 0;   /* GL_ARB_multitexture */
 }
-- 
cgit v1.2.3


From 7ae4ce9e22e39d78e2d31164c05a3b267fb48e3c Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 13 May 2009 09:32:53 -0600
Subject: mesa: clean-up vertex array object VBO unbinding and
 delete/refcounting

Don't really delete vertex array objects until the refcount hits zero.
At that time, unbind any pointers to VBOs.
(cherry picked from commit 32b851c80792623195069d7a41a5808cff3b2f6f)
---
 src/mesa/main/arrayobj.c | 64 +++++++++++++++++++++++++-----------------------
 1 file changed, 33 insertions(+), 31 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index ccb5b8e157..0fa5f0de55 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -68,6 +68,32 @@ lookup_arrayobj(GLcontext *ctx, GLuint id)
 }
 
 
+/**
+ * For all the vertex arrays in the array object, unbind any pointers
+ * to any buffer objects (VBOs).
+ * This is done just prior to array object destruction.
+ */
+static void
+unbind_array_object_vbos(GLcontext *ctx, struct gl_array_object *obj)
+{
+   GLuint i;
+
+   _mesa_reference_buffer_object(ctx, &obj->Vertex.BufferObj, NULL);
+   _mesa_reference_buffer_object(ctx, &obj->Normal.BufferObj, NULL);
+   _mesa_reference_buffer_object(ctx, &obj->Color.BufferObj, NULL);
+   _mesa_reference_buffer_object(ctx, &obj->SecondaryColor.BufferObj, NULL);
+   _mesa_reference_buffer_object(ctx, &obj->FogCoord.BufferObj, NULL);
+   _mesa_reference_buffer_object(ctx, &obj->Index.BufferObj, NULL);
+   _mesa_reference_buffer_object(ctx, &obj->EdgeFlag.BufferObj, NULL);
+
+   for (i = 0; i < MAX_TEXTURE_COORD_UNITS; i++)
+      _mesa_reference_buffer_object(ctx, &obj->TexCoord[i].BufferObj, NULL);
+
+   for (i = 0; i < VERT_ATTRIB_MAX; i++)
+      _mesa_reference_buffer_object(ctx, &obj->VertexAttrib[i].BufferObj,NULL);
+}
+
+
 /**
  * Allocate and initialize a new vertex array object.
  * 
@@ -94,6 +120,7 @@ void
 _mesa_delete_array_object( GLcontext *ctx, struct gl_array_object *obj )
 {
    (void) ctx;
+   unbind_array_object_vbos(ctx, obj);
    _glthread_DESTROY_MUTEX(obj->Mutex);
    _mesa_free(obj);
 }
@@ -239,15 +266,6 @@ _mesa_remove_array_object( GLcontext *ctx, struct gl_array_object *obj )
 }
 
 
-static void
-unbind_buffer_object( GLcontext *ctx, struct gl_buffer_object *bufObj )
-{
-   if (bufObj != ctx->Array.NullBufferObj) {
-      _mesa_reference_buffer_object(ctx, &bufObj, NULL);
-   }
-}
-
-
 /**********************************************************************/
 /* API Functions                                                      */
 /**********************************************************************/
@@ -274,7 +292,7 @@ _mesa_BindVertexArrayAPPLE( GLuint id )
       return;   /* rebinding the same array object- no change */
 
    /*
-    * Get pointer to new array object (newBufObj)
+    * Get pointer to new array object (newObj)
     */
    if (id == 0) {
       /* The spec says there is no array object named 0, but we use
@@ -333,7 +351,6 @@ _mesa_DeleteVertexArraysAPPLE(GLsizei n, const GLuint *ids)
       if ( obj != NULL ) {
 	 ASSERT( obj->Name == ids[i] );
 
-
 	 /* If the array object is currently bound, the spec says "the binding
 	  * for that object reverts to zero and the default vertex array
 	  * becomes current."
@@ -342,28 +359,13 @@ _mesa_DeleteVertexArraysAPPLE(GLsizei n, const GLuint *ids)
 	    CALL_BindVertexArrayAPPLE( ctx->Exec, (0) );
 	 }
 
-#if FEATURE_ARB_vertex_buffer_object
-	 /* Unbind any buffer objects that might be bound to arrays in
-	  * this array object.
-	  */
-	 unbind_buffer_object( ctx, obj->Vertex.BufferObj );
-	 unbind_buffer_object( ctx, obj->Normal.BufferObj );
-	 unbind_buffer_object( ctx, obj->Color.BufferObj );
-	 unbind_buffer_object( ctx, obj->SecondaryColor.BufferObj );
-	 unbind_buffer_object( ctx, obj->FogCoord.BufferObj );
-	 unbind_buffer_object( ctx, obj->Index.BufferObj );
-	 for (i = 0; i < MAX_TEXTURE_COORD_UNITS; i++) {
-	    unbind_buffer_object( ctx, obj->TexCoord[i].BufferObj );
-	 }
-	 unbind_buffer_object( ctx, obj->EdgeFlag.BufferObj );
-	 for (i = 0; i < VERT_ATTRIB_MAX; i++) {
-	    unbind_buffer_object( ctx, obj->VertexAttrib[i].BufferObj );
-	 }
-#endif
-
 	 /* The ID is immediately freed for re-use */
 	 _mesa_remove_array_object(ctx, obj);
-	 ctx->Driver.DeleteArrayObject(ctx, obj);
+
+         /* Unreference the array object. 
+          * If refcount hits zero, the object will be deleted.
+          */
+         _mesa_reference_array_object(ctx, &obj, NULL);
       }
    }
 
-- 
cgit v1.2.3


From 3e74faa02948624cfbaf1f03854f27e0c9130759 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 13 May 2009 09:47:13 -0600
Subject: mesa: delete array objects before buffer objects during context
 tear-down

The former may point to the later.
---
 src/mesa/main/context.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 60c48289e4..ec0dc12a3e 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1005,10 +1005,11 @@ _mesa_free_context_data( GLcontext *ctx )
    _mesa_free_query_data(ctx);
 #endif
 
+   _mesa_delete_array_object(ctx, ctx->Array.DefaultArrayObj);
+
 #if FEATURE_ARB_vertex_buffer_object
    _mesa_delete_buffer_object(ctx, ctx->Array.NullBufferObj);
 #endif
-   _mesa_delete_array_object(ctx, ctx->Array.DefaultArrayObj);
 
    /* free dispatch tables */
    _mesa_free(ctx->Exec);
-- 
cgit v1.2.3


From 483e247804db914835173347b7f2a12c0f78d60e Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 15 May 2009 08:03:56 -0600
Subject: mesa: bump version to 7.5-rc2

---
 Makefile                | 2 +-
 src/mesa/main/version.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/Makefile b/Makefile
index 69d3ecacd7..acf83e6280 100644
--- a/Makefile
+++ b/Makefile
@@ -181,7 +181,7 @@ ultrix-gcc:
 
 # Rules for making release tarballs
 
-VERSION=7.5-rc1
+VERSION=7.5-rc2
 DIRECTORY = Mesa-$(VERSION)
 LIB_NAME = MesaLib-$(VERSION)
 DEMO_NAME = MesaDemos-$(VERSION)
diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index 072037bbd7..e109f20df4 100644
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -31,7 +31,7 @@
 #define MESA_MAJOR 7
 #define MESA_MINOR 5
 #define MESA_PATCH 0
-#define MESA_VERSION_STRING "7.5-rc1"
+#define MESA_VERSION_STRING "7.5-rc2"
 
 /* To make version comparison easy */
 #define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
-- 
cgit v1.2.3


From 0307e609aa3e707eeb40051bd664d36f2340ba9b Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Fri, 15 May 2009 16:24:59 -0700
Subject: mesa: Mark FBOs with compressed color attachments as FBO-incomplete.

Both EXT_fbo and ARB_fbo agree on this.  Fixes a segfault in the metaops
mipmap generation in Intel for SGIS_generate_mipmap of S3TC textures in
Regnum Online.

Bug #21654.
---
 src/mesa/main/fbobject.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 9c5a5908a2..dbd4c5848c 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -368,6 +368,11 @@ test_attachment_completeness(const GLcontext *ctx, GLenum format,
             att->Complete = GL_FALSE;
             return;
          }
+         if (texImage->TexFormat->TexelBytes == 0) {
+            att_incomplete("compressed internalformat");
+            att->Complete = GL_FALSE;
+            return;
+         }
       }
       else if (format == GL_DEPTH) {
          if (texImage->TexFormat->BaseFormat == GL_DEPTH_COMPONENT) {
-- 
cgit v1.2.3


From adabd0e81e287cd5dac60fa63841d8b096d10d5f Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 18 May 2009 10:27:31 -0600
Subject: mesa: comments for _mesa_generate_mipmap_level()

---
 src/mesa/main/mipmap.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index bc8658beff..7a719745fc 100644
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -1370,6 +1370,9 @@ make_2d_stack_mipmap(GLenum datatype, GLuint comps, GLint border,
 
 /**
  * Down-sample a texture image to produce the next lower mipmap level.
+ * \param comps  components per texel (1, 2, 3 or 4)
+ * \param srcRowStride  stride between source rows, in texels
+ * \param dstRowStride  stride between destination rows, in texels
  */
 void
 _mesa_generate_mipmap_level(GLenum target,
-- 
cgit v1.2.3


From 43d8ace88da80848035827c7bb4bbf5530b59a7c Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 19 May 2009 09:21:27 -0600
Subject: mesa: print more info when valid_texture_object() fails

---
 src/mesa/main/texobj.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index 0024efc0e6..d51e7b76ec 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -281,7 +281,8 @@ valid_texture_object(const struct gl_texture_object *tex)
       _mesa_problem(NULL, "invalid reference to a deleted texture object");
       return GL_FALSE;
    default:
-      _mesa_problem(NULL, "invalid texture object Target value");
+      _mesa_problem(NULL, "invalid texture object Target 0x%x, Id = %u",
+                    tex->Target, tex->Name);
       return GL_FALSE;
    }
 }
-- 
cgit v1.2.3


From c99a60c40d4ece363d37a5af895124f08a645c6b Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 19 May 2009 09:57:01 -0600
Subject: mesa: assign trb->Base.StencilBits in update_wrapper().

When we render to a depth/stencil texture there are stencil bits.
---
 src/mesa/main/texrender.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texrender.c b/src/mesa/main/texrender.c
index 49de6f5b8a..cc74d58fbd 100644
--- a/src/mesa/main/texrender.c
+++ b/src/mesa/main/texrender.c
@@ -507,6 +507,7 @@ update_wrapper(GLcontext *ctx, const struct gl_renderbuffer_attachment *att)
    trb->Base.BlueBits = trb->TexImage->TexFormat->BlueBits;
    trb->Base.AlphaBits = trb->TexImage->TexFormat->AlphaBits;
    trb->Base.DepthBits = trb->TexImage->TexFormat->DepthBits;
+   trb->Base.StencilBits = trb->TexImage->TexFormat->StencilBits;
 }
 
 
-- 
cgit v1.2.3


From 042d9a513213b1fa356c0d80abc62b9327e0bcc2 Mon Sep 17 00:00:00 2001
From: Mathias Fröhlich <frohlich8@users.sourceforge.net>
Date: Tue, 19 May 2009 09:59:01 -0600
Subject: mesa: allow depth/stencil textures to be attached to
 GL_STENCIL_ATTACHMENT

See sourceforge bug #2793846.
---
 src/mesa/main/fbobject.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 9c5a5908a2..e8e8c2bf30 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -374,6 +374,7 @@ test_attachment_completeness(const GLcontext *ctx, GLenum format,
             /* OK */
          }
          else if (ctx->Extensions.EXT_packed_depth_stencil &&
+                  ctx->Extensions.ARB_depth_texture &&
                   texImage->TexFormat->BaseFormat == GL_DEPTH_STENCIL_EXT) {
             /* OK */
          }
@@ -384,10 +385,19 @@ test_attachment_completeness(const GLcontext *ctx, GLenum format,
          }
       }
       else {
-         /* no such thing as stencil textures */
-         att_incomplete("illegal stencil texture");
-         att->Complete = GL_FALSE;
-         return;
+         ASSERT(format == GL_STENCIL);
+         ASSERT(att->Renderbuffer->StencilBits);
+         if (ctx->Extensions.EXT_packed_depth_stencil &&
+             ctx->Extensions.ARB_depth_texture &&
+             att->Renderbuffer->_BaseFormat == GL_DEPTH_STENCIL_EXT) {
+            /* OK */
+         }
+         else {
+            /* no such thing as stencil-only textures */
+            att_incomplete("illegal stencil texture");
+            att->Complete = GL_FALSE;
+            return;
+         }
       }
    }
    else if (att->Type == GL_RENDERBUFFER_EXT) {
-- 
cgit v1.2.3


From a185bcbdec856cc98c26098e4e447a683eed14d1 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 14 May 2009 13:24:24 -0600
Subject: mesa: move gl_array_attrib::_MaxElement to
 gl_array_object::_MaxElement

This value is per array object.
---
 src/mesa/main/api_validate.c  | 8 ++++----
 src/mesa/main/mtypes.h        | 7 ++++++-
 src/mesa/main/state.c         | 2 +-
 src/mesa/vbo/vbo_exec_array.c | 5 +++--
 4 files changed, 14 insertions(+), 8 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c
index d5c604c56a..1507671250 100644
--- a/src/mesa/main/api_validate.c
+++ b/src/mesa/main/api_validate.c
@@ -182,10 +182,10 @@ _mesa_validate_DrawElements(GLcontext *ctx,
       /* find max array index */
       GLuint max = max_buffer_index(ctx, count, type, indices,
                                     ctx->Array.ElementArrayBufferObj);
-      if (max >= ctx->Array._MaxElement) {
+      if (max >= ctx->Array.ArrayObj->_MaxElement) {
          /* the max element is out of bounds of one or more enabled arrays */
          _mesa_warning(ctx, "glDrawElements() index=%u is "
-                       "out of bounds (max=%u)", max, ctx->Array._MaxElement);
+                       "out of bounds (max=%u)", max, ctx->Array.ArrayObj->_MaxElement);
          return GL_FALSE;
       }
    }
@@ -254,7 +254,7 @@ _mesa_validate_DrawRangeElements(GLcontext *ctx, GLenum mode,
    if (ctx->Const.CheckArrayBounds) {
       GLuint max = max_buffer_index(ctx, count, type, indices,
                                     ctx->Array.ElementArrayBufferObj);
-      if (max >= ctx->Array._MaxElement) {
+      if (max >= ctx->Array.ArrayObj->_MaxElement) {
          /* the max element is out of bounds of one or more enabled arrays */
          return GL_FALSE;
       }
@@ -293,7 +293,7 @@ _mesa_validate_DrawArrays(GLcontext *ctx,
       return GL_FALSE;
 
    if (ctx->Const.CheckArrayBounds) {
-      if (start + count > (GLint) ctx->Array._MaxElement)
+      if (start + count > (GLint) ctx->Array.ArrayObj->_MaxElement)
          return GL_FALSE;
    }
 
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index d11df535f2..0df425c913 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1578,6 +1578,12 @@ struct gl_array_object
 
    /** Mask of _NEW_ARRAY_* values indicating which arrays are enabled */
    GLbitfield _Enabled;
+
+   /**
+    * Min of all enabled arrays' _MaxElement.  When arrays reside inside VBOs
+    * we can determine the max legal (in bounds) glDrawElements array index.
+    */
+   GLuint _MaxElement;
 };
 
 
@@ -1602,7 +1608,6 @@ struct gl_array_attrib
    struct gl_buffer_object *ArrayBufferObj;
    struct gl_buffer_object *ElementArrayBufferObj;
 #endif
-   GLuint _MaxElement;          /* Min of all enabled array's maxes */
 };
 
 
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index a6411f7b62..bfbefa55d4 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -206,7 +206,7 @@ update_arrays( GLcontext *ctx )
    }
 
    /* _MaxElement is one past the last legal array element */
-   ctx->Array._MaxElement = min;
+   arrayObj->_MaxElement = min;
 }
 
 
diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c
index fdb501815d..a4c67c1de1 100644
--- a/src/mesa/vbo/vbo_exec_array.c
+++ b/src/mesa/vbo/vbo_exec_array.c
@@ -352,10 +352,11 @@ vbo_exec_DrawRangeElements(GLenum mode,
    if (!_mesa_validate_DrawRangeElements( ctx, mode, start, end, count, type, indices ))
       return;
 
-   if (end >= ctx->Array._MaxElement) {
+   if (end >= ctx->Array.ArrayObj->_MaxElement) {
       /* the max element is out of bounds of one or more enabled arrays */
       _mesa_warning(ctx, "glDraw[Range]Elements() index=%u is "
-                    "out of bounds (max=%u)", end, ctx->Array._MaxElement);
+                    "out of bounds (max=%u)", end,
+                    ctx->Array.ArrayObj->_MaxElement);
       return;
    }
 
-- 
cgit v1.2.3


From 15f21bf357980284d4aea6270f68bb9b83d26fbd Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 14 May 2009 16:23:34 -0600
Subject: mesa: updated comment for _MaxElement field

It's the largest array index, plus one.
---
 src/mesa/main/mtypes.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 0df425c913..2708678e64 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1544,7 +1544,7 @@ struct gl_client_array
    GLuint _ElementSize;         /**< size of each element in bytes */
 
    struct gl_buffer_object *BufferObj;/**< GL_ARB_vertex_buffer_object */
-   GLuint _MaxElement;          /**< max element index into array buffer */
+   GLuint _MaxElement;          /**< max element index into array buffer + 1 */
 };
 
 
-- 
cgit v1.2.3


From 39d7524f7b176d4375e230ac60963d197be539f2 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 14 May 2009 16:25:32 -0600
Subject: mesa: added _mesa_print_arrays() for debugging

---
 src/mesa/main/varray.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
 src/mesa/main/varray.h | 17 +++++------------
 2 files changed, 51 insertions(+), 13 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index a9c9162be1..8e6ef9caa5 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -1,8 +1,9 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.2
+ * Version:  7.6
  *
  * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -1032,6 +1033,50 @@ _mesa_MultiModeDrawElementsIBM( const GLenum * mode, const GLsizei * count,
 }
 
 
+/**
+ * Print vertex array's fields.
+ */
+static void
+print_array(const char *name, GLint index, const struct gl_client_array *array)
+{
+   if (index >= 0)
+      _mesa_printf("  %s[%d]: ", name, index);
+   else
+      _mesa_printf("  %s: ", name);
+   _mesa_printf("Ptr=%p, Type=0x%x, Size=%d, ElemSize=%u, Stride=%d, Buffer=%u(Size %u), MaxElem=%u\n",
+                array->Ptr, array->Type, array->Size,
+                array->_ElementSize, array->StrideB,
+                array->BufferObj->Name, array->BufferObj->Size,
+                array->_MaxElement);
+}
+
+
+/**
+ * Print current vertex object/array info.  For debug.
+ */
+void
+_mesa_print_arrays(GLcontext *ctx)
+{
+   const struct gl_array_object *arrayObj = ctx->Array.ArrayObj;
+   GLuint i;
+
+   _mesa_printf("Array Object %u\n", arrayObj->Name);
+   if (arrayObj->Vertex.Enabled)
+      print_array("Vertex", -1, &arrayObj->Vertex);
+   if (arrayObj->Normal.Enabled)
+      print_array("Normal", -1, &arrayObj->Normal);
+   if (arrayObj->Color.Enabled)
+      print_array("Color", -1, &arrayObj->Color);
+   for (i = 0; i < MAX_TEXTURE_COORD_UNITS; i++)
+      if (arrayObj->TexCoord[i].Enabled)
+         print_array("TexCoord", i, &arrayObj->TexCoord[i]);
+   for (i = 0; i < VERT_ATTRIB_MAX; i++)
+      if (arrayObj->VertexAttrib[i].Enabled)
+         print_array("Attrib", i, &arrayObj->VertexAttrib[i]);
+   _mesa_printf("  _MaxElement = %u\n", arrayObj->_MaxElement);
+}
+
+
 /**
  * Initialize vertex array state for given context.
  */
diff --git a/src/mesa/main/varray.h b/src/mesa/main/varray.h
index 97d5c8219d..46cc3ee342 100644
--- a/src/mesa/main/varray.h
+++ b/src/mesa/main/varray.h
@@ -1,18 +1,9 @@
-/**
- * \file varray.h
- * Vertex arrays.
- *
- * \if subset
- * (No-op)
- *
- * \endif
- */
-
 /*
  * Mesa 3-D graphics library
- * Version:  4.1
+ * Version:  7.6
  *
- * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -169,6 +160,8 @@ _mesa_DrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count,
                         GLenum type, const GLvoid *indices);
 
 
+extern void
+_mesa_print_arrays(GLcontext *ctx);
 
 extern void
 _mesa_init_varray( GLcontext * ctx );
-- 
cgit v1.2.3


From f7ca97f85e73c0b0a0e056ae86e4aa5a68ec39f1 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 14 May 2009 16:51:10 -0600
Subject: mesa: remove pointless null ptr check, improved some error messages

---
 src/mesa/main/bufferobj.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 1f2070ef47..a806766386 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -490,7 +490,7 @@ bind_buffer_object(GLcontext *ctx, GLenum target, GLuint buffer)
    _mesa_reference_buffer_object(ctx, bindTarget, newBufObj);
 
    /* Pass BindBuffer call to device driver */
-   if (ctx->Driver.BindBuffer && newBufObj)
+   if (ctx->Driver.BindBuffer)
       ctx->Driver.BindBuffer( ctx, target, newBufObj );
 }
 
@@ -937,7 +937,7 @@ _mesa_BufferDataARB(GLenum target, GLsizeiptrARB size,
       return;
    }
    if (bufObj->Name == 0) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glBufferDataARB" );
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glBufferDataARB(buffer 0)" );
       return;
    }
    
@@ -1025,7 +1025,7 @@ _mesa_MapBufferARB(GLenum target, GLenum access)
       return NULL;
    }
    if (bufObj->Name == 0) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glMapBufferARB" );
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glMapBufferARB(buffer 0)" );
       return NULL;
    }
    if (bufObj->Pointer) {
-- 
cgit v1.2.3


From 02f73c43b4060b58fa0d9b3da4753cbbccde3c84 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 21 May 2009 09:12:35 -0600
Subject: mesa: added debug functions for dumping color/depth/stencil buffers

---
 src/mesa/main/debug.c | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++
 src/mesa/main/debug.h |   9 +++++
 2 files changed, 110 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/debug.c b/src/mesa/main/debug.c
index 2eabcdaf49..80bc6afc4c 100644
--- a/src/mesa/main/debug.c
+++ b/src/mesa/main/debug.c
@@ -341,3 +341,104 @@ _mesa_dump_textures(GLboolean dumpImages)
    DumpImages = dumpImages;
    _mesa_HashWalk(ctx->Shared->TexObjects, dump_texture_cb, ctx);
 }
+
+
+void
+_mesa_dump_color_buffer(const char *filename)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   const GLuint w = ctx->DrawBuffer->Width;
+   const GLuint h = ctx->DrawBuffer->Height;
+   GLubyte *buf;
+
+   buf = (GLubyte *) _mesa_malloc(w * h * 4);
+
+   glPushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT);
+   glPixelStorei(GL_PACK_ALIGNMENT, 1);
+   glPixelStorei(GL_PACK_INVERT_MESA, GL_TRUE);
+
+   glReadPixels(0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, buf);
+
+   _mesa_printf("ReadBuffer %p 0x%x  DrawBuffer %p 0x%x\n",
+                ctx->ReadBuffer->_ColorReadBuffer,
+                ctx->ReadBuffer->ColorReadBuffer,
+                ctx->DrawBuffer->_ColorDrawBuffers[0],
+                ctx->DrawBuffer->ColorDrawBuffer[0]);
+   _mesa_printf("Writing %d x %d color buffer to %s\n", w, h, filename);
+   write_ppm(filename, buf, w, h, 4, 0, 1, 2);
+
+   glPopClientAttrib();
+
+   _mesa_free(buf);
+}
+
+
+void
+_mesa_dump_depth_buffer(const char *filename)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   const GLuint w = ctx->DrawBuffer->Width;
+   const GLuint h = ctx->DrawBuffer->Height;
+   GLuint *buf;
+   GLubyte *buf2;
+   GLuint i;
+
+   buf = (GLuint *) _mesa_malloc(w * h * 4);  /* 4 bpp */
+   buf2 = (GLubyte *) _mesa_malloc(w * h * 3); /* 3 bpp */
+
+   glPushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT);
+   glPixelStorei(GL_PACK_ALIGNMENT, 1);
+   glPixelStorei(GL_PACK_INVERT_MESA, GL_TRUE);
+
+   glReadPixels(0, 0, w, h, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, buf);
+
+   /* spread 24 bits of Z across R, G, B */
+   for (i = 0; i < w * h; i++) {
+      buf2[i*3+0] = (buf[i] >> 24) & 0xff;
+      buf2[i*3+1] = (buf[i] >> 16) & 0xff;
+      buf2[i*3+2] = (buf[i] >>  8) & 0xff;
+   }
+
+   _mesa_printf("Writing %d x %d depth buffer to %s\n", w, h, filename);
+   write_ppm(filename, buf2, w, h, 3, 0, 1, 2);
+
+   glPopClientAttrib();
+
+   _mesa_free(buf);
+   _mesa_free(buf2);
+}
+
+
+void
+_mesa_dump_stencil_buffer(const char *filename)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   const GLuint w = ctx->DrawBuffer->Width;
+   const GLuint h = ctx->DrawBuffer->Height;
+   GLubyte *buf;
+   GLubyte *buf2;
+   GLuint i;
+
+   buf = (GLubyte *) _mesa_malloc(w * h);  /* 1 bpp */
+   buf2 = (GLubyte *) _mesa_malloc(w * h * 3); /* 3 bpp */
+
+   glPushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT);
+   glPixelStorei(GL_PACK_ALIGNMENT, 1);
+   glPixelStorei(GL_PACK_INVERT_MESA, GL_TRUE);
+
+   glReadPixels(0, 0, w, h, GL_STENCIL_INDEX, GL_UNSIGNED_BYTE, buf);
+
+   for (i = 0; i < w * h; i++) {
+      buf2[i*3+0] = buf[i];
+      buf2[i*3+1] = (buf[i] & 127) * 2;
+      buf2[i*3+2] = (buf[i] - 128) * 2;
+   }
+
+   _mesa_printf("Writing %d x %d stencil buffer to %s\n", w, h, filename);
+   write_ppm(filename, buf2, w, h, 3, 0, 1, 2);
+
+   glPopClientAttrib();
+
+   _mesa_free(buf);
+   _mesa_free(buf2);
+}
diff --git a/src/mesa/main/debug.h b/src/mesa/main/debug.h
index 1862ec75b7..bb384c4324 100644
--- a/src/mesa/main/debug.h
+++ b/src/mesa/main/debug.h
@@ -60,4 +60,13 @@ extern void _mesa_init_debug( GLcontext *ctx );
 extern void
 _mesa_dump_textures(GLboolean dumpImages);
 
+extern void
+_mesa_dump_color_buffer(const char *filename);
+
+extern void
+_mesa_dump_depth_buffer(const char *filename);
+
+extern void
+_mesa_dump_stencil_buffer(const char *filename);
+
 #endif
-- 
cgit v1.2.3


From de1cfc5e8a8e9d0b0b397671575ae448a554a002 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 21 May 2009 09:56:41 -0600
Subject: mesa: new _mesa_update_array_object_max_element() function

This will replace the code in state.c
---
 src/mesa/main/arrayobj.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++-
 src/mesa/main/arrayobj.h |  7 ++++-
 2 files changed, 83 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index 8ec73b9526..eab6fac94e 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -1,9 +1,10 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.2
+ * Version:  7.6
  *
  * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  * (C) Copyright IBM Corporation 2006
+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -46,6 +47,7 @@
 #include "bufferobj.h"
 #endif
 #include "arrayobj.h"
+#include "macros.h"
 #include "glapi/dispatch.h"
 
 
@@ -267,6 +269,80 @@ remove_array_object( GLcontext *ctx, struct gl_array_object *obj )
 }
 
 
+
+/**
+ * Compute the index of the last array element that can be safely accessed
+ * in a vertex array.  We can really only do this when the array lives in
+ * a VBO.
+ * The array->_MaxElement field will be updated.
+ * Later in glDrawArrays/Elements/etc we can do some bounds checking.
+ */
+static void
+compute_max_element(struct gl_client_array *array)
+{
+   if (array->BufferObj->Name) {
+      /* Compute the max element we can access in the VBO without going
+       * out of bounds.
+       */
+      array->_MaxElement = ((GLsizeiptrARB) array->BufferObj->Size
+                            - (GLsizeiptrARB) array->Ptr + array->StrideB
+                            - array->_ElementSize) / array->StrideB;
+      if (0)
+         _mesa_printf("%s Object %u  Size %u  MaxElement %u\n",
+                      __FUNCTION__,
+                      array->BufferObj->Name,
+                      (GLuint) array->BufferObj->Size,
+                      array->_MaxElement);
+   }
+   else {
+      /* user-space array, no idea how big it is */
+      array->_MaxElement = 2 * 1000 * 1000 * 1000; /* just a big number */
+   }
+}
+
+
+/**
+ * Helper for update_arrays().
+ * \return  min(current min, array->_MaxElement).
+ */
+static GLuint
+update_min(GLuint min, struct gl_client_array *array)
+{
+   compute_max_element(array);
+   if (array->Enabled)
+      return MIN2(min, array->_MaxElement);
+   else
+      return min;
+}
+
+
+/**
+ * Examine vertex arrays to update the gl_array_object::_MaxElement field.
+ */
+void
+_mesa_update_array_object_max_element(GLcontext *ctx,
+                                      struct gl_array_object *arrayObj)
+{
+   GLuint i, min = ~0;
+
+   min = update_min(min, &arrayObj->Vertex);
+   min = update_min(min, &arrayObj->Normal);
+   min = update_min(min, &arrayObj->Color);
+   min = update_min(min, &arrayObj->SecondaryColor);
+   min = update_min(min, &arrayObj->FogCoord);
+   min = update_min(min, &arrayObj->Index);
+   min = update_min(min, &arrayObj->EdgeFlag);
+   min = update_min(min, &arrayObj->PointSize);
+   for (i = 0; i < ctx->Const.MaxTextureCoordUnits; i++)
+      min = update_min(min, &arrayObj->TexCoord[i]);
+   for (i = 0; i < VERT_ATTRIB_MAX; i++)
+      min = update_min(min, &arrayObj->VertexAttrib[i]);
+
+   /* _MaxElement is one past the last legal array element */
+   arrayObj->_MaxElement = min;
+}
+
+
 /**********************************************************************/
 /* API Functions                                                      */
 /**********************************************************************/
diff --git a/src/mesa/main/arrayobj.h b/src/mesa/main/arrayobj.h
index 90c2aea155..abca5ab9b4 100644
--- a/src/mesa/main/arrayobj.h
+++ b/src/mesa/main/arrayobj.h
@@ -1,9 +1,10 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.5
+ * Version:  7.6
  *
  * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
  * (C) Copyright IBM Corporation 2006
+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -57,6 +58,10 @@ _mesa_initialize_array_object( GLcontext *ctx,
                                struct gl_array_object *obj, GLuint name );
 
 
+extern void
+_mesa_update_array_object_max_element(GLcontext *ctx,
+                                      struct gl_array_object *arrayObj);
+
 
 /*
  * API functions
-- 
cgit v1.2.3


From aac19609bfd7c950b2577489b06886c8a8097bb2 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 21 May 2009 10:05:04 -0600
Subject: mesa: fix some potential state-restore issues in pop_texture_group()

Call the _mesa_set_enable() functions instead of driver functions, etc.

Also, add missing code for 1D/2D texture arrays.
---
 src/mesa/main/attrib.c | 90 +++++++++++++++++++++++++-------------------------
 1 file changed, 45 insertions(+), 45 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index e43fa96dd3..a609199504 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -1,6 +1,6 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.3
+ * Version:  7.6
  *
  * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  * Copyright (C) 2009  VMware, Inc.   All Rights Reserved.
@@ -541,6 +541,7 @@ end:
 static void
 pop_enable_group(GLcontext *ctx, const struct gl_enable_attrib *enable)
 {
+   const GLuint curTexUnitSave = ctx->Texture.CurrentUnit;
    GLuint i;
 
 #define TEST_AND_UPDATE(VALUE, NEWVALUE, ENUM)		\
@@ -685,59 +686,51 @@ pop_enable_group(GLcontext *ctx, const struct gl_enable_attrib *enable)
 
    /* texture unit enables */
    for (i = 0; i < ctx->Const.MaxTextureUnits; i++) {
-      if (ctx->Texture.Unit[i].Enabled != enable->Texture[i]) {
-         ctx->Texture.Unit[i].Enabled = enable->Texture[i];
-         if (ctx->Driver.Enable) {
-            if (ctx->Driver.ActiveTexture) {
-               (*ctx->Driver.ActiveTexture)(ctx, i);
-            }
-            (*ctx->Driver.Enable)( ctx, GL_TEXTURE_1D,
-                             (GLboolean) (enable->Texture[i] & TEXTURE_1D_BIT) );
-            (*ctx->Driver.Enable)( ctx, GL_TEXTURE_2D,
-                             (GLboolean) (enable->Texture[i] & TEXTURE_2D_BIT) );
-            (*ctx->Driver.Enable)( ctx, GL_TEXTURE_3D,
-                             (GLboolean) (enable->Texture[i] & TEXTURE_3D_BIT) );
-            if (ctx->Extensions.ARB_texture_cube_map)
-               (*ctx->Driver.Enable)( ctx, GL_TEXTURE_CUBE_MAP_ARB,
-                          (GLboolean) (enable->Texture[i] & TEXTURE_CUBE_BIT) );
-            if (ctx->Extensions.NV_texture_rectangle)
-               (*ctx->Driver.Enable)( ctx, GL_TEXTURE_RECTANGLE_NV,
-                          (GLboolean) (enable->Texture[i] & TEXTURE_RECT_BIT) );
+      const GLbitfield enabled = enable->Texture[i];
+      const GLbitfield genEnabled = enable->TexGen[i];
+
+      if (ctx->Texture.Unit[i].Enabled != enabled) {
+         _mesa_ActiveTextureARB(GL_TEXTURE0 + i);
+
+         _mesa_set_enable(ctx, GL_TEXTURE_1D,
+                          (enabled & TEXTURE_1D_BIT) ? GL_TRUE : GL_FALSE);
+         _mesa_set_enable(ctx, GL_TEXTURE_2D,
+                          (enabled & TEXTURE_2D_BIT) ? GL_TRUE : GL_FALSE);
+         _mesa_set_enable(ctx, GL_TEXTURE_3D,
+                          (enabled & TEXTURE_3D_BIT) ? GL_TRUE : GL_FALSE);
+         if (ctx->Extensions.NV_texture_rectangle) {
+            _mesa_set_enable(ctx, GL_TEXTURE_RECTANGLE_ARB,
+                             (enabled & TEXTURE_RECT_BIT) ? GL_TRUE : GL_FALSE);
+         }
+         if (ctx->Extensions.ARB_texture_cube_map) {
+            _mesa_set_enable(ctx, GL_TEXTURE_CUBE_MAP,
+                             (enabled & TEXTURE_CUBE_BIT) ? GL_TRUE : GL_FALSE);
+         }
+         if (ctx->Extensions.MESA_texture_array) {
+            _mesa_set_enable(ctx, GL_TEXTURE_1D_ARRAY_EXT,
+                           (enabled & TEXTURE_1D_ARRAY_BIT) ? GL_TRUE : GL_FALSE);
+            _mesa_set_enable(ctx, GL_TEXTURE_2D_ARRAY_EXT,
+                           (enabled & TEXTURE_2D_ARRAY_BIT) ? GL_TRUE : GL_FALSE);
          }
       }
 
-      if (ctx->Texture.Unit[i].TexGenEnabled != enable->TexGen[i]) {
-         ctx->Texture.Unit[i].TexGenEnabled = enable->TexGen[i];
-         if (ctx->Driver.Enable) {
-            if (ctx->Driver.ActiveTexture) {
-               (*ctx->Driver.ActiveTexture)(ctx, i);
-            }
-            if (enable->TexGen[i] & S_BIT)
-               (*ctx->Driver.Enable)( ctx, GL_TEXTURE_GEN_S, GL_TRUE);
-            else
-               (*ctx->Driver.Enable)( ctx, GL_TEXTURE_GEN_S, GL_FALSE);
-            if (enable->TexGen[i] & T_BIT)
-               (*ctx->Driver.Enable)( ctx, GL_TEXTURE_GEN_T, GL_TRUE);
-            else
-               (*ctx->Driver.Enable)( ctx, GL_TEXTURE_GEN_T, GL_FALSE);
-            if (enable->TexGen[i] & R_BIT)
-               (*ctx->Driver.Enable)( ctx, GL_TEXTURE_GEN_R, GL_TRUE);
-            else
-               (*ctx->Driver.Enable)( ctx, GL_TEXTURE_GEN_R, GL_FALSE);
-            if (enable->TexGen[i] & Q_BIT)
-               (*ctx->Driver.Enable)( ctx, GL_TEXTURE_GEN_Q, GL_TRUE);
-            else
-               (*ctx->Driver.Enable)( ctx, GL_TEXTURE_GEN_Q, GL_FALSE);
-         }
+      if (ctx->Texture.Unit[i].TexGenEnabled != genEnabled) {
+         _mesa_ActiveTextureARB(GL_TEXTURE0 + i);
+         _mesa_set_enable(ctx, GL_TEXTURE_GEN_S,
+                          (genEnabled & S_BIT) ? GL_TRUE : GL_FALSE);
+         _mesa_set_enable(ctx, GL_TEXTURE_GEN_T,
+                          (genEnabled & T_BIT) ? GL_TRUE : GL_FALSE);
+         _mesa_set_enable(ctx, GL_TEXTURE_GEN_R,
+                          (genEnabled & R_BIT) ? GL_TRUE : GL_FALSE);
+         _mesa_set_enable(ctx, GL_TEXTURE_GEN_Q,
+                          (genEnabled & Q_BIT) ? GL_TRUE : GL_FALSE);
       }
 
       /* GL_SGI_texture_color_table */
       ctx->Texture.Unit[i].ColorTableEnabled = enable->TextureColorTable[i];
    }
 
-   if (ctx->Driver.ActiveTexture) {
-      (*ctx->Driver.ActiveTexture)(ctx, ctx->Texture.CurrentUnit);
-   }
+   _mesa_ActiveTextureARB(GL_TEXTURE0 + curTexUnitSave);
 }
 
 
@@ -770,6 +763,13 @@ pop_texture_group(GLcontext *ctx, struct texture_state *texstate)
          _mesa_set_enable(ctx, GL_TEXTURE_RECTANGLE_NV,
                      (unit->Enabled & TEXTURE_RECT_BIT) ? GL_TRUE : GL_FALSE);
       }
+      if (ctx->Extensions.MESA_texture_array) {
+         _mesa_set_enable(ctx, GL_TEXTURE_1D_ARRAY_EXT,
+                 (unit->Enabled & TEXTURE_1D_ARRAY_BIT) ? GL_TRUE : GL_FALSE);
+         _mesa_set_enable(ctx, GL_TEXTURE_2D_ARRAY_EXT,
+                 (unit->Enabled & TEXTURE_2D_ARRAY_BIT) ? GL_TRUE : GL_FALSE);
+      }
+
       if (ctx->Extensions.SGI_texture_color_table) {
          _mesa_set_enable(ctx, GL_TEXTURE_COLOR_TABLE_SGI,
                           unit->ColorTableEnabled);
-- 
cgit v1.2.3


From 1889890c88c3c10287ca4f84369190cc7029884f Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 21 May 2009 10:11:13 -0600
Subject: mesa: check FEATURE_point_size_array for PointSize array

---
 src/mesa/main/arrayobj.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index eab6fac94e..8973c3cb37 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -332,7 +332,9 @@ _mesa_update_array_object_max_element(GLcontext *ctx,
    min = update_min(min, &arrayObj->FogCoord);
    min = update_min(min, &arrayObj->Index);
    min = update_min(min, &arrayObj->EdgeFlag);
+#if FEATURE_point_size_array
    min = update_min(min, &arrayObj->PointSize);
+#endif
    for (i = 0; i < ctx->Const.MaxTextureCoordUnits; i++)
       min = update_min(min, &arrayObj->TexCoord[i]);
    for (i = 0; i < VERT_ATTRIB_MAX; i++)
-- 
cgit v1.2.3


From 8fa0cb2b422abaeee1b69f82ca7e9f02dc8393b9 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 21 May 2009 10:15:18 -0600
Subject: mesa: added gl_array_object::Weight array field

We don't really implement vertex weights but in the VBO code this
fixes and odd case for the legacy_array[] setup.  Before, the
vbo->draw_prims() call was always indicating that the vertex weight
array was present/enabled when it really wasn't.
---
 src/mesa/main/arrayobj.c      | 3 +++
 src/mesa/main/mtypes.h        | 1 +
 src/mesa/vbo/vbo_exec_array.c | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index 8973c3cb37..f9b11ee244 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -81,6 +81,7 @@ unbind_array_object_vbos(GLcontext *ctx, struct gl_array_object *obj)
    GLuint i;
 
    _mesa_reference_buffer_object(ctx, &obj->Vertex.BufferObj, NULL);
+   _mesa_reference_buffer_object(ctx, &obj->Weight.BufferObj, NULL);
    _mesa_reference_buffer_object(ctx, &obj->Normal.BufferObj, NULL);
    _mesa_reference_buffer_object(ctx, &obj->Color.BufferObj, NULL);
    _mesa_reference_buffer_object(ctx, &obj->SecondaryColor.BufferObj, NULL);
@@ -223,6 +224,7 @@ _mesa_initialize_array_object( GLcontext *ctx,
 
    /* Init the individual arrays */
    init_array(ctx, &obj->Vertex, 4, GL_FLOAT);
+   init_array(ctx, &obj->Weight, 1, GL_FLOAT);
    init_array(ctx, &obj->Normal, 3, GL_FLOAT);
    init_array(ctx, &obj->Color, 4, GL_FLOAT);
    init_array(ctx, &obj->SecondaryColor, 4, GL_FLOAT);
@@ -326,6 +328,7 @@ _mesa_update_array_object_max_element(GLcontext *ctx,
    GLuint i, min = ~0;
 
    min = update_min(min, &arrayObj->Vertex);
+   min = update_min(min, &arrayObj->Weight);
    min = update_min(min, &arrayObj->Normal);
    min = update_min(min, &arrayObj->Color);
    min = update_min(min, &arrayObj->SecondaryColor);
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 2708678e64..55bfa2bf41 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1563,6 +1563,7 @@ struct gl_array_object
    /** Conventional vertex arrays */
    /*@{*/
    struct gl_client_array Vertex;
+   struct gl_client_array Weight;
    struct gl_client_array Normal;
    struct gl_client_array Color;
    struct gl_client_array SecondaryColor;
diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c
index a4c67c1de1..c33d557e92 100644
--- a/src/mesa/vbo/vbo_exec_array.c
+++ b/src/mesa/vbo/vbo_exec_array.c
@@ -103,7 +103,7 @@ static void bind_array_obj( GLcontext *ctx )
     * go away.
     */
    exec->array.legacy_array[VERT_ATTRIB_POS] = &arrayObj->Vertex;
-   exec->array.legacy_array[VERT_ATTRIB_WEIGHT] = &vbo->legacy_currval[VERT_ATTRIB_WEIGHT];
+   exec->array.legacy_array[VERT_ATTRIB_WEIGHT] = &arrayObj->Weight;
    exec->array.legacy_array[VERT_ATTRIB_NORMAL] = &arrayObj->Normal;
    exec->array.legacy_array[VERT_ATTRIB_COLOR0] = &arrayObj->Color;
    exec->array.legacy_array[VERT_ATTRIB_COLOR1] = &arrayObj->SecondaryColor;
-- 
cgit v1.2.3


From 8fe3134622eed34159ff6f72a33558a659e8d299 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 21 May 2009 15:36:25 -0600
Subject: mesa: call _mesa_update_array_object_max_element() before printing
 array info

---
 src/mesa/main/varray.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 8e6ef9caa5..ac30538925 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -1060,6 +1060,8 @@ _mesa_print_arrays(GLcontext *ctx)
    const struct gl_array_object *arrayObj = ctx->Array.ArrayObj;
    GLuint i;
 
+   _mesa_update_array_object_max_element(ctx, arrayObj);
+
    _mesa_printf("Array Object %u\n", arrayObj->Name);
    if (arrayObj->Vertex.Enabled)
       print_array("Vertex", -1, &arrayObj->Vertex);
-- 
cgit v1.2.3


From a554d7c4d87902833382cb67bd8a282d5c500c6d Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 21 May 2009 15:55:33 -0600
Subject: mesa: VertexAttribPointer comments

---
 src/mesa/main/varray.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index ac30538925..7879e0079b 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -518,6 +518,12 @@ _mesa_PointSizePointer(GLenum type, GLsizei stride, const GLvoid *ptr)
 
 
 #if FEATURE_NV_vertex_program
+/**
+ * Set a vertex attribute array.
+ * Note that these arrays DO alias the conventional GL vertex arrays
+ * (position, normal, color, fog, texcoord, etc).
+ * The generic attribute slots at #16 and above are not touched.
+ */
 void GLAPIENTRY
 _mesa_VertexAttribPointerNV(GLuint index, GLint size, GLenum type,
                             GLsizei stride, const GLvoid *ptr)
@@ -578,6 +584,11 @@ _mesa_VertexAttribPointerNV(GLuint index, GLint size, GLenum type,
 
 
 #if FEATURE_ARB_vertex_program
+/**
+ * Set a generic vertex attribute array.
+ * Note that these arrays DO NOT alias the conventional GL vertex arrays
+ * (position, normal, color, fog, texcoord, etc).
+ */
 void GLAPIENTRY
 _mesa_VertexAttribPointerARB(GLuint index, GLint size, GLenum type,
                              GLboolean normalized,
-- 
cgit v1.2.3


From 6a2211f00077f49af42e6f087e3120abfb1be5ae Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 21 May 2009 15:55:50 -0600
Subject: mesa: remove const qualifier

---
 src/mesa/main/varray.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 7879e0079b..ea11857a98 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -1068,7 +1068,7 @@ print_array(const char *name, GLint index, const struct gl_client_array *array)
 void
 _mesa_print_arrays(GLcontext *ctx)
 {
-   const struct gl_array_object *arrayObj = ctx->Array.ArrayObj;
+   struct gl_array_object *arrayObj = ctx->Array.ArrayObj;
    GLuint i;
 
    _mesa_update_array_object_max_element(ctx, arrayObj);
-- 
cgit v1.2.3


From 54a5ffbfa1f935c46642a9835f08983cc1fdfeed Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 21 May 2009 16:05:11 -0600
Subject: mesa: freshen comments for update_array()

---
 src/mesa/main/varray.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index ea11857a98..6bf3c485c7 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -37,15 +37,14 @@
 
 
 /**
- * Update the fields of a vertex array object.
- * We need to do a few special things for arrays that live in
- * vertex buffer objects.
+ * Set the fields of a vertex array.
  *
  * \param array  the array to update
  * \param dirtyBit  which bit to set in ctx->Array.NewState for this array
  * \param elementSize  size of each array element, in bytes
  * \param size  components per element (1, 2, 3 or 4)
  * \param type  datatype of each component (GL_FLOAT, GL_INT, etc)
+ * \param format  either GL_RGBA or GL_BGRA
  * \param stride  stride between elements, in elements
  * \param normalized  are integer types converted to floats in [-1, 1]?
  * \param ptr  the address (or offset inside VBO) of the array data
-- 
cgit v1.2.3


From d2a74d76c96957cf0294dcf40d29526621ada95e Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 21 May 2009 17:03:21 -0600
Subject: mesa: s/MAX_VERTEX_PROGRAM_ATTRIBS/MAX_NV_VERTEX_PROGRAM_INPUTS

---
 src/mesa/main/varray.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 6bf3c485c7..0982dc7977 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -532,7 +532,7 @@ _mesa_VertexAttribPointerNV(GLuint index, GLint size, GLenum type,
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-   if (index >= MAX_VERTEX_PROGRAM_ATTRIBS) {
+   if (index >= MAX_NV_VERTEX_PROGRAM_INPUTS) {
       _mesa_error(ctx, GL_INVALID_VALUE, "glVertexAttribPointerNV(index)");
       return;
    }
-- 
cgit v1.2.3


From 70c4b81e88e18e354e8dfaf47e5455e463b207d8 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 21 May 2009 21:49:57 -0600
Subject: mesa: add missing glGet*() case for GL_VERTEX_ARRAY_BINDING_APPLE

---
 src/mesa/main/get.c      | 12 ++++++++++++
 src/mesa/main/get_gen.py |  5 ++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 0937fd053c..1ed6fc3383 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -1867,6 +1867,10 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          CHECK_EXT1(ARB_framebuffer_object, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Const.MaxSamples);
          break;
+      case GL_VERTEX_ARRAY_BINDING_APPLE:
+         CHECK_EXT1(APPLE_vertex_array_object, "GetBooleanv");
+         params[0] = INT_TO_BOOLEAN(ctx->Array.ArrayObj->Name);
+         break;
       default:
          _mesa_error(ctx, GL_INVALID_ENUM, "glGetBooleanv(pname=0x%x)", pname);
    }
@@ -3677,6 +3681,10 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          CHECK_EXT1(ARB_framebuffer_object, "GetFloatv");
          params[0] = (GLfloat)(ctx->Const.MaxSamples);
          break;
+      case GL_VERTEX_ARRAY_BINDING_APPLE:
+         CHECK_EXT1(APPLE_vertex_array_object, "GetFloatv");
+         params[0] = (GLfloat)(ctx->Array.ArrayObj->Name);
+         break;
       default:
          _mesa_error(ctx, GL_INVALID_ENUM, "glGetFloatv(pname=0x%x)", pname);
    }
@@ -5487,6 +5495,10 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          CHECK_EXT1(ARB_framebuffer_object, "GetIntegerv");
          params[0] = ctx->Const.MaxSamples;
          break;
+      case GL_VERTEX_ARRAY_BINDING_APPLE:
+         CHECK_EXT1(APPLE_vertex_array_object, "GetIntegerv");
+         params[0] = ctx->Array.ArrayObj->Name;
+         break;
       default:
          _mesa_error(ctx, GL_INVALID_ENUM, "glGetIntegerv(pname=0x%x)", pname);
    }
diff --git a/src/mesa/main/get_gen.py b/src/mesa/main/get_gen.py
index fa695c48f1..00dcb19335 100644
--- a/src/mesa/main/get_gen.py
+++ b/src/mesa/main/get_gen.py
@@ -1003,7 +1003,10 @@ StateVars = [
 
 	# GL_ARB_framebuffer_object
 	( "GL_MAX_SAMPLES", GLint, ["ctx->Const.MaxSamples"], "",
-	  ["ARB_framebuffer_object"] )
+	  ["ARB_framebuffer_object"] ),
+
+	( "GL_VERTEX_ARRAY_BINDING_APPLE", GLint, ["ctx->Array.ArrayObj->Name"], "",
+	  ["APPLE_vertex_array_object"] ),
 ]
 
 
-- 
cgit v1.2.3


From 42b747e57d4487ee4f0049ab6835b56f22890e97 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 22 May 2009 07:14:16 -0600
Subject: mesa: added comment

---
 src/mesa/main/get_gen.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/get_gen.py b/src/mesa/main/get_gen.py
index 00dcb19335..43ee5fff10 100644
--- a/src/mesa/main/get_gen.py
+++ b/src/mesa/main/get_gen.py
@@ -1005,6 +1005,7 @@ StateVars = [
 	( "GL_MAX_SAMPLES", GLint, ["ctx->Const.MaxSamples"], "",
 	  ["ARB_framebuffer_object"] ),
 
+	# GL_APPLE_vertex_array_object
 	( "GL_VERTEX_ARRAY_BINDING_APPLE", GLint, ["ctx->Array.ArrayObj->Name"], "",
 	  ["APPLE_vertex_array_object"] ),
 ]
-- 
cgit v1.2.3


From 4dc426c01627a240bd5b148c1804c45b0d5ecd6c Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 22 May 2009 07:19:27 -0600
Subject: mesa: s/MAX_VERTEX_PROGRAM_ATTRIBS/MAX_NV_VERTEX_PROGRAM_INPUTS/ in
 NV funcs

---
 src/mesa/main/dlist.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 537ff5881f..478fedd523 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -5506,7 +5506,7 @@ index_error(void)
 static void GLAPIENTRY
 save_VertexAttrib1fNV(GLuint index, GLfloat x)
 {
-   if (index < MAX_VERTEX_PROGRAM_ATTRIBS)
+   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS)
       save_Attr1fNV(index, x);
    else
       index_error();
@@ -5515,7 +5515,7 @@ save_VertexAttrib1fNV(GLuint index, GLfloat x)
 static void GLAPIENTRY
 save_VertexAttrib1fvNV(GLuint index, const GLfloat * v)
 {
-   if (index < MAX_VERTEX_PROGRAM_ATTRIBS)
+   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS)
       save_Attr1fNV(index, v[0]);
    else
       index_error();
@@ -5524,7 +5524,7 @@ save_VertexAttrib1fvNV(GLuint index, const GLfloat * v)
 static void GLAPIENTRY
 save_VertexAttrib2fNV(GLuint index, GLfloat x, GLfloat y)
 {
-   if (index < MAX_VERTEX_PROGRAM_ATTRIBS)
+   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS)
       save_Attr2fNV(index, x, y);
    else
       index_error();
@@ -5533,7 +5533,7 @@ save_VertexAttrib2fNV(GLuint index, GLfloat x, GLfloat y)
 static void GLAPIENTRY
 save_VertexAttrib2fvNV(GLuint index, const GLfloat * v)
 {
-   if (index < MAX_VERTEX_PROGRAM_ATTRIBS)
+   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS)
       save_Attr2fNV(index, v[0], v[1]);
    else
       index_error();
@@ -5542,7 +5542,7 @@ save_VertexAttrib2fvNV(GLuint index, const GLfloat * v)
 static void GLAPIENTRY
 save_VertexAttrib3fNV(GLuint index, GLfloat x, GLfloat y, GLfloat z)
 {
-   if (index < MAX_VERTEX_PROGRAM_ATTRIBS)
+   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS)
       save_Attr3fNV(index, x, y, z);
    else
       index_error();
@@ -5551,7 +5551,7 @@ save_VertexAttrib3fNV(GLuint index, GLfloat x, GLfloat y, GLfloat z)
 static void GLAPIENTRY
 save_VertexAttrib3fvNV(GLuint index, const GLfloat * v)
 {
-   if (index < MAX_VERTEX_PROGRAM_ATTRIBS)
+   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS)
       save_Attr3fNV(index, v[0], v[1], v[2]);
    else
       index_error();
@@ -5561,7 +5561,7 @@ static void GLAPIENTRY
 save_VertexAttrib4fNV(GLuint index, GLfloat x, GLfloat y,
                       GLfloat z, GLfloat w)
 {
-   if (index < MAX_VERTEX_PROGRAM_ATTRIBS)
+   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS)
       save_Attr4fNV(index, x, y, z, w);
    else
       index_error();
@@ -5570,7 +5570,7 @@ save_VertexAttrib4fNV(GLuint index, GLfloat x, GLfloat y,
 static void GLAPIENTRY
 save_VertexAttrib4fvNV(GLuint index, const GLfloat * v)
 {
-   if (index < MAX_VERTEX_PROGRAM_ATTRIBS)
+   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS)
       save_Attr4fNV(index, v[0], v[1], v[2], v[3]);
    else
       index_error();
-- 
cgit v1.2.3


From 4a95185c9f30c2de7a03bb1a0653f51b53b1111d Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 22 May 2009 07:26:08 -0600
Subject: mesa: rename MAX_VERTEX_ATTRIBS to MAX_VERTEX_GENERIC_ATTRIBS

Be clearer that this is the number of generic vertex program/shader
attributes, not counting the legacy attributes (pos, normal, color, etc).
---
 src/mesa/main/api_noop.c           | 16 ++++++++--------
 src/mesa/main/config.h             |  2 +-
 src/mesa/main/dlist.c              | 24 ++++++++++++------------
 src/mesa/main/enums.c              | 10 +++++-----
 src/mesa/shader/slang/slang_link.c |  8 ++++----
 src/mesa/vbo/vbo_attrib_tmp.h      | 16 ++++++++--------
 src/mesa/vbo/vbo_exec_array.c      |  4 ++--
 7 files changed, 40 insertions(+), 40 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_noop.c b/src/mesa/main/api_noop.c
index a1cc3a2a4b..66f9c4e6bd 100644
--- a/src/mesa/main/api_noop.c
+++ b/src/mesa/main/api_noop.c
@@ -477,7 +477,7 @@ static void GLAPIENTRY _mesa_noop_VertexAttrib4fvNV( GLuint index, const GLfloat
 static void GLAPIENTRY _mesa_noop_VertexAttrib1fARB( GLuint index, GLfloat x )
 {
    GET_CURRENT_CONTEXT(ctx);
-   if (index < MAX_VERTEX_ATTRIBS) {
+   if (index < MAX_VERTEX_GENERIC_ATTRIBS) {
       ASSIGN_4V(ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index], x, 0, 0, 1);
    }
    else
@@ -487,7 +487,7 @@ static void GLAPIENTRY _mesa_noop_VertexAttrib1fARB( GLuint index, GLfloat x )
 static void GLAPIENTRY _mesa_noop_VertexAttrib1fvARB( GLuint index, const GLfloat *v )
 {
    GET_CURRENT_CONTEXT(ctx);
-   if (index < MAX_VERTEX_ATTRIBS) {
+   if (index < MAX_VERTEX_GENERIC_ATTRIBS) {
       ASSIGN_4V(ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index], v[0], 0, 0, 1);
    }
    else
@@ -497,7 +497,7 @@ static void GLAPIENTRY _mesa_noop_VertexAttrib1fvARB( GLuint index, const GLfloa
 static void GLAPIENTRY _mesa_noop_VertexAttrib2fARB( GLuint index, GLfloat x, GLfloat y )
 {
    GET_CURRENT_CONTEXT(ctx);
-   if (index < MAX_VERTEX_ATTRIBS) {
+   if (index < MAX_VERTEX_GENERIC_ATTRIBS) {
       ASSIGN_4V(ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index], x, y, 0, 1);
    }
    else
@@ -507,7 +507,7 @@ static void GLAPIENTRY _mesa_noop_VertexAttrib2fARB( GLuint index, GLfloat x, GL
 static void GLAPIENTRY _mesa_noop_VertexAttrib2fvARB( GLuint index, const GLfloat *v )
 {
    GET_CURRENT_CONTEXT(ctx);
-   if (index < MAX_VERTEX_ATTRIBS) {
+   if (index < MAX_VERTEX_GENERIC_ATTRIBS) {
       ASSIGN_4V(ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index], v[0], v[1], 0, 1);
    }
    else
@@ -518,7 +518,7 @@ static void GLAPIENTRY _mesa_noop_VertexAttrib3fARB( GLuint index, GLfloat x,
                                   GLfloat y, GLfloat z )
 {
    GET_CURRENT_CONTEXT(ctx);
-   if (index < MAX_VERTEX_ATTRIBS) {
+   if (index < MAX_VERTEX_GENERIC_ATTRIBS) {
       ASSIGN_4V(ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index], x, y, z, 1);
    }
    else
@@ -528,7 +528,7 @@ static void GLAPIENTRY _mesa_noop_VertexAttrib3fARB( GLuint index, GLfloat x,
 static void GLAPIENTRY _mesa_noop_VertexAttrib3fvARB( GLuint index, const GLfloat *v )
 {
    GET_CURRENT_CONTEXT(ctx);
-   if (index < MAX_VERTEX_ATTRIBS) {
+   if (index < MAX_VERTEX_GENERIC_ATTRIBS) {
       ASSIGN_4V(ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index], v[0], v[1], v[2], 1);
    }
    else
@@ -539,7 +539,7 @@ static void GLAPIENTRY _mesa_noop_VertexAttrib4fARB( GLuint index, GLfloat x,
                                   GLfloat y, GLfloat z, GLfloat w )
 {
    GET_CURRENT_CONTEXT(ctx);
-   if (index < MAX_VERTEX_ATTRIBS) {
+   if (index < MAX_VERTEX_GENERIC_ATTRIBS) {
       ASSIGN_4V(ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index], x, y, z, w);
    }
    else
@@ -549,7 +549,7 @@ static void GLAPIENTRY _mesa_noop_VertexAttrib4fARB( GLuint index, GLfloat x,
 static void GLAPIENTRY _mesa_noop_VertexAttrib4fvARB( GLuint index, const GLfloat *v )
 {
    GET_CURRENT_CONTEXT(ctx);
-   if (index < MAX_VERTEX_ATTRIBS) {
+   if (index < MAX_VERTEX_GENERIC_ATTRIBS) {
       ASSIGN_4V(ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index], v[0], v[1], v[2], v[3]);
    }
    else
diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index 888e08ff93..100caff7bf 100644
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -215,7 +215,7 @@
 
 /** For GL_ARB_vertex_shader */
 /*@{*/
-#define MAX_VERTEX_ATTRIBS 16
+#define MAX_VERTEX_GENERIC_ATTRIBS 16
 #define MAX_VERTEX_TEXTURE_IMAGE_UNITS MAX_TEXTURE_IMAGE_UNITS
 #define MAX_COMBINED_TEXTURE_IMAGE_UNITS MAX_TEXTURE_IMAGE_UNITS
 /*@}*/
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 478fedd523..782f847904 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -4974,7 +4974,7 @@ save_Attr1fARB(GLenum attr, GLfloat x)
       n[2].f = x;
    }
 
-   ASSERT(attr < MAX_VERTEX_ATTRIBS);
+   ASSERT(attr < MAX_VERTEX_GENERIC_ATTRIBS);
    ctx->ListState.ActiveAttribSize[attr] = 1;
    ASSIGN_4V(ctx->ListState.CurrentAttrib[attr], x, 0, 0, 1);
 
@@ -4996,7 +4996,7 @@ save_Attr2fARB(GLenum attr, GLfloat x, GLfloat y)
       n[3].f = y;
    }
 
-   ASSERT(attr < MAX_VERTEX_ATTRIBS);
+   ASSERT(attr < MAX_VERTEX_GENERIC_ATTRIBS);
    ctx->ListState.ActiveAttribSize[attr] = 2;
    ASSIGN_4V(ctx->ListState.CurrentAttrib[attr], x, y, 0, 1);
 
@@ -5019,7 +5019,7 @@ save_Attr3fARB(GLenum attr, GLfloat x, GLfloat y, GLfloat z)
       n[4].f = z;
    }
 
-   ASSERT(attr < MAX_VERTEX_ATTRIBS);
+   ASSERT(attr < MAX_VERTEX_GENERIC_ATTRIBS);
    ctx->ListState.ActiveAttribSize[attr] = 3;
    ASSIGN_4V(ctx->ListState.CurrentAttrib[attr], x, y, z, 1);
 
@@ -5043,7 +5043,7 @@ save_Attr4fARB(GLenum attr, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
       n[5].f = w;
    }
 
-   ASSERT(attr < MAX_VERTEX_ATTRIBS);
+   ASSERT(attr < MAX_VERTEX_GENERIC_ATTRIBS);
    ctx->ListState.ActiveAttribSize[attr] = 4;
    ASSIGN_4V(ctx->ListState.CurrentAttrib[attr], x, y, z, w);
 
@@ -5582,7 +5582,7 @@ save_VertexAttrib4fvNV(GLuint index, const GLfloat * v)
 static void GLAPIENTRY
 save_VertexAttrib1fARB(GLuint index, GLfloat x)
 {
-   if (index < MAX_VERTEX_ATTRIBS)
+   if (index < MAX_VERTEX_GENERIC_ATTRIBS)
       save_Attr1fARB(index, x);
    else
       index_error();
@@ -5591,7 +5591,7 @@ save_VertexAttrib1fARB(GLuint index, GLfloat x)
 static void GLAPIENTRY
 save_VertexAttrib1fvARB(GLuint index, const GLfloat * v)
 {
-   if (index < MAX_VERTEX_ATTRIBS)
+   if (index < MAX_VERTEX_GENERIC_ATTRIBS)
       save_Attr1fARB(index, v[0]);
    else
       index_error();
@@ -5600,7 +5600,7 @@ save_VertexAttrib1fvARB(GLuint index, const GLfloat * v)
 static void GLAPIENTRY
 save_VertexAttrib2fARB(GLuint index, GLfloat x, GLfloat y)
 {
-   if (index < MAX_VERTEX_ATTRIBS)
+   if (index < MAX_VERTEX_GENERIC_ATTRIBS)
       save_Attr2fARB(index, x, y);
    else
       index_error();
@@ -5609,7 +5609,7 @@ save_VertexAttrib2fARB(GLuint index, GLfloat x, GLfloat y)
 static void GLAPIENTRY
 save_VertexAttrib2fvARB(GLuint index, const GLfloat * v)
 {
-   if (index < MAX_VERTEX_ATTRIBS)
+   if (index < MAX_VERTEX_GENERIC_ATTRIBS)
       save_Attr2fARB(index, v[0], v[1]);
    else
       index_error();
@@ -5618,7 +5618,7 @@ save_VertexAttrib2fvARB(GLuint index, const GLfloat * v)
 static void GLAPIENTRY
 save_VertexAttrib3fARB(GLuint index, GLfloat x, GLfloat y, GLfloat z)
 {
-   if (index < MAX_VERTEX_ATTRIBS)
+   if (index < MAX_VERTEX_GENERIC_ATTRIBS)
       save_Attr3fARB(index, x, y, z);
    else
       index_error();
@@ -5627,7 +5627,7 @@ save_VertexAttrib3fARB(GLuint index, GLfloat x, GLfloat y, GLfloat z)
 static void GLAPIENTRY
 save_VertexAttrib3fvARB(GLuint index, const GLfloat * v)
 {
-   if (index < MAX_VERTEX_ATTRIBS)
+   if (index < MAX_VERTEX_GENERIC_ATTRIBS)
       save_Attr3fARB(index, v[0], v[1], v[2]);
    else
       index_error();
@@ -5637,7 +5637,7 @@ static void GLAPIENTRY
 save_VertexAttrib4fARB(GLuint index, GLfloat x, GLfloat y, GLfloat z,
                        GLfloat w)
 {
-   if (index < MAX_VERTEX_ATTRIBS)
+   if (index < MAX_VERTEX_GENERIC_ATTRIBS)
       save_Attr4fARB(index, x, y, z, w);
    else
       index_error();
@@ -5646,7 +5646,7 @@ save_VertexAttrib4fARB(GLuint index, GLfloat x, GLfloat y, GLfloat z,
 static void GLAPIENTRY
 save_VertexAttrib4fvARB(GLuint index, const GLfloat * v)
 {
-   if (index < MAX_VERTEX_ATTRIBS)
+   if (index < MAX_VERTEX_GENERIC_ATTRIBS)
       save_Attr4fARB(index, v[0], v[1], v[2], v[3]);
    else
       index_error();
diff --git a/src/mesa/main/enums.c b/src/mesa/main/enums.c
index c077bc0a89..cf893fdac5 100644
--- a/src/mesa/main/enums.c
+++ b/src/mesa/main/enums.c
@@ -948,8 +948,8 @@ LONGSTRING static const char enum_string_table[] =
    "GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV\0"
    "GL_MAX_VARYING_FLOATS\0"
    "GL_MAX_VARYING_FLOATS_ARB\0"
-   "GL_MAX_VERTEX_ATTRIBS\0"
-   "GL_MAX_VERTEX_ATTRIBS_ARB\0"
+   "GL_MAX_VERTEX_GENERIC_ATTRIBS\0"
+   "GL_MAX_VERTEX_GENERIC_ATTRIBS_ARB\0"
    "GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS\0"
    "GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB\0"
    "GL_MAX_VERTEX_UNIFORM_COMPONENTS\0"
@@ -2772,8 +2772,8 @@ static const enum_elt all_enums[1820] =
    { 19417, 0x0000862E }, /* GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */
    { 19452, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS */
    { 19474, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS_ARB */
-   { 19500, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS */
-   { 19522, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS_ARB */
+   { 19500, 0x00008869 }, /* GL_MAX_VERTEX_GENERIC_ATTRIBS */
+   { 19522, 0x00008869 }, /* GL_MAX_VERTEX_GENERIC_ATTRIBS_ARB */
    { 19548, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
    { 19582, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
    { 19620, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
@@ -4733,7 +4733,7 @@ static const unsigned reduced_enums[1319] =
        317, /* GL_CURRENT_QUERY */
       1259, /* GL_QUERY_RESULT */
       1261, /* GL_QUERY_RESULT_AVAILABLE */
-       912, /* GL_MAX_VERTEX_ATTRIBS */
+       912, /* GL_MAX_VERTEX_GENERIC_ATTRIBS */
       1778, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
        368, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
        367, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c
index 2bc8809661..5ea89d2ff3 100644
--- a/src/mesa/shader/slang/slang_link.c
+++ b/src/mesa/shader/slang/slang_link.c
@@ -324,7 +324,7 @@ _slang_resolve_attributes(struct gl_shader_program *shProg,
                           const struct gl_program *origProg,
                           struct gl_program *linkedProg)
 {
-   GLint attribMap[MAX_VERTEX_ATTRIBS];
+   GLint attribMap[MAX_VERTEX_GENERIC_ATTRIBS];
    GLuint i, j;
    GLbitfield usedAttributes; /* generics only, not legacy attributes */
 
@@ -360,7 +360,7 @@ _slang_resolve_attributes(struct gl_shader_program *shProg,
    }
 
    /* initialize the generic attribute map entries to -1 */
-   for (i = 0; i < MAX_VERTEX_ATTRIBS; i++) {
+   for (i = 0; i < MAX_VERTEX_GENERIC_ATTRIBS; i++) {
       attribMap[i] = -1;
    }
 
@@ -401,11 +401,11 @@ _slang_resolve_attributes(struct gl_shader_program *shProg,
                    * Start at 1 since generic attribute 0 always aliases
                    * glVertex/position.
                    */
-                  for (attr = 0; attr < MAX_VERTEX_ATTRIBS; attr++) {
+                  for (attr = 0; attr < MAX_VERTEX_GENERIC_ATTRIBS; attr++) {
                      if (((1 << attr) & usedAttributes) == 0)
                         break;
                   }
-                  if (attr == MAX_VERTEX_ATTRIBS) {
+                  if (attr == MAX_VERTEX_GENERIC_ATTRIBS) {
                      link_error(shProg, "Too many vertex attributes");
                      return GL_FALSE;
                   }
diff --git a/src/mesa/vbo/vbo_attrib_tmp.h b/src/mesa/vbo/vbo_attrib_tmp.h
index ff11c7d59a..7a889b8e2f 100644
--- a/src/mesa/vbo/vbo_attrib_tmp.h
+++ b/src/mesa/vbo/vbo_attrib_tmp.h
@@ -265,7 +265,7 @@ static void GLAPIENTRY TAG(VertexAttrib1fARB)( GLuint index, GLfloat x )
    GET_CURRENT_CONTEXT( ctx );
    if (index == 0) 
       ATTR1F(0, x);
-   else if (index < MAX_VERTEX_ATTRIBS)
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
       ATTR1F(VBO_ATTRIB_GENERIC0 + index, x);
    else
       ERROR();
@@ -277,7 +277,7 @@ static void GLAPIENTRY TAG(VertexAttrib1fvARB)( GLuint index,
    GET_CURRENT_CONTEXT( ctx );
    if (index == 0) 
       ATTR1FV(0, v);
-   else if (index < MAX_VERTEX_ATTRIBS)
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
       ATTR1FV(VBO_ATTRIB_GENERIC0 + index, v);
    else
       ERROR();
@@ -289,7 +289,7 @@ static void GLAPIENTRY TAG(VertexAttrib2fARB)( GLuint index, GLfloat x,
    GET_CURRENT_CONTEXT( ctx );
    if (index == 0) 
       ATTR2F(0, x, y);
-   else if (index < MAX_VERTEX_ATTRIBS)
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
       ATTR2F(VBO_ATTRIB_GENERIC0 + index, x, y);
    else
       ERROR();
@@ -301,7 +301,7 @@ static void GLAPIENTRY TAG(VertexAttrib2fvARB)( GLuint index,
    GET_CURRENT_CONTEXT( ctx );
    if (index == 0) 
       ATTR2FV(0, v);
-   else if (index < MAX_VERTEX_ATTRIBS)
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
       ATTR2FV(VBO_ATTRIB_GENERIC0 + index, v);
    else
       ERROR();
@@ -313,7 +313,7 @@ static void GLAPIENTRY TAG(VertexAttrib3fARB)( GLuint index, GLfloat x,
    GET_CURRENT_CONTEXT( ctx );
    if (index == 0) 
       ATTR3F(0, x, y, z);
-   else if (index < MAX_VERTEX_ATTRIBS)
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
       ATTR3F(VBO_ATTRIB_GENERIC0 + index, x, y, z);
    else
       ERROR();
@@ -325,7 +325,7 @@ static void GLAPIENTRY TAG(VertexAttrib3fvARB)( GLuint index,
    GET_CURRENT_CONTEXT( ctx );
    if (index == 0) 
       ATTR3FV(0, v);
-   else if (index < MAX_VERTEX_ATTRIBS)
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
       ATTR3FV(VBO_ATTRIB_GENERIC0 + index, v);
    else
       ERROR();
@@ -338,7 +338,7 @@ static void GLAPIENTRY TAG(VertexAttrib4fARB)( GLuint index, GLfloat x,
    GET_CURRENT_CONTEXT( ctx );
    if (index == 0) 
       ATTR4F(0, x, y, z, w);
-   else if (index < MAX_VERTEX_ATTRIBS)
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
       ATTR4F(VBO_ATTRIB_GENERIC0 + index, x, y, z, w);
    else
       ERROR();
@@ -350,7 +350,7 @@ static void GLAPIENTRY TAG(VertexAttrib4fvARB)( GLuint index,
    GET_CURRENT_CONTEXT( ctx );
    if (index == 0) 
       ATTR4FV(0, v);
-   else if (index < MAX_VERTEX_ATTRIBS)
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
       ATTR4FV(VBO_ATTRIB_GENERIC0 + index, v);
    else
       ERROR();
diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c
index df444932bc..1e1c0781c2 100644
--- a/src/mesa/vbo/vbo_exec_array.c
+++ b/src/mesa/vbo/vbo_exec_array.c
@@ -120,7 +120,7 @@ static void bind_array_obj( GLcontext *ctx )
    for (i = 0; i < MAX_TEXTURE_COORD_UNITS; i++)
       exec->array.legacy_array[VERT_ATTRIB_TEX0 + i] = &arrayObj->TexCoord[i];
 
-   for (i = 0; i < MAX_VERTEX_ATTRIBS; i++) {
+   for (i = 0; i < MAX_VERTEX_GENERIC_ATTRIBS; i++) {
       assert(i < Elements(arrayObj->VertexAttrib));
       assert(i < Elements(exec->array.generic_array));
       exec->array.generic_array[i] = &arrayObj->VertexAttrib[i];
@@ -222,7 +222,7 @@ static void recalculate_input_bindings( GLcontext *ctx )
          }
       }
 
-      for (i = 0; i < MAX_VERTEX_ATTRIBS; i++) {
+      for (i = 0; i < MAX_VERTEX_GENERIC_ATTRIBS; i++) {
 	 if (exec->array.generic_array[i]->Enabled)
 	    inputs[VERT_ATTRIB_GENERIC0 + i] = exec->array.generic_array[i];
 	 else {
-- 
cgit v1.2.3


From 882cd6c839e56a3eceb8edf62f83893f6b531d35 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 22 May 2009 07:30:05 -0600
Subject: mesa: remove MAX_VERTEX_PROGRAM_ATTRIBS

Use MAX_VERTEX_GENERIC_ATTRIBS instead.  No need for two #defines for
the same quantity.
---
 src/mesa/main/config.h         |  1 -
 src/mesa/main/dlist.c          |  8 ++++----
 src/mesa/shader/arbprogparse.c | 14 +++++++-------
 src/mesa/shader/arbprogram.c   |  2 +-
 src/mesa/tnl/t_vb_program.c    |  2 +-
 5 files changed, 13 insertions(+), 14 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index 100caff7bf..5a05a65396 100644
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -168,7 +168,6 @@
 /** For GL_ARB_vertex_program */
 /*@{*/
 #define MAX_VERTEX_PROGRAM_ADDRESS_REGS 1
-#define MAX_VERTEX_PROGRAM_ATTRIBS     16
 /*@}*/
 
 /** For GL_ARB_fragment_program */
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 782f847904..5120e516e0 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -4883,7 +4883,7 @@ save_Attr1fNV(GLenum attr, GLfloat x)
       n[2].f = x;
    }
 
-   ASSERT(attr < MAX_VERTEX_PROGRAM_ATTRIBS);
+   ASSERT(attr < MAX_VERTEX_GENERIC_ATTRIBS);
    ctx->ListState.ActiveAttribSize[attr] = 1;
    ASSIGN_4V(ctx->ListState.CurrentAttrib[attr], x, 0, 0, 1);
 
@@ -4905,7 +4905,7 @@ save_Attr2fNV(GLenum attr, GLfloat x, GLfloat y)
       n[3].f = y;
    }
 
-   ASSERT(attr < MAX_VERTEX_PROGRAM_ATTRIBS);
+   ASSERT(attr < MAX_VERTEX_GENERIC_ATTRIBS);
    ctx->ListState.ActiveAttribSize[attr] = 2;
    ASSIGN_4V(ctx->ListState.CurrentAttrib[attr], x, y, 0, 1);
 
@@ -4928,7 +4928,7 @@ save_Attr3fNV(GLenum attr, GLfloat x, GLfloat y, GLfloat z)
       n[4].f = z;
    }
 
-   ASSERT(attr < MAX_VERTEX_PROGRAM_ATTRIBS);
+   ASSERT(attr < MAX_VERTEX_GENERIC_ATTRIBS);
    ctx->ListState.ActiveAttribSize[attr] = 3;
    ASSIGN_4V(ctx->ListState.CurrentAttrib[attr], x, y, z, 1);
 
@@ -4952,7 +4952,7 @@ save_Attr4fNV(GLenum attr, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
       n[5].f = w;
    }
 
-   ASSERT(attr < MAX_VERTEX_PROGRAM_ATTRIBS);
+   ASSERT(attr < MAX_VERTEX_GENERIC_ATTRIBS);
    ctx->ListState.ActiveAttribSize[attr] = 4;
    ASSIGN_4V(ctx->ListState.CurrentAttrib[attr], x, y, z, w);
 
diff --git a/src/mesa/shader/arbprogparse.c b/src/mesa/shader/arbprogparse.c
index 36267c336f..a90ce95a63 100644
--- a/src/mesa/shader/arbprogparse.c
+++ b/src/mesa/shader/arbprogparse.c
@@ -953,7 +953,7 @@ parse_generic_attrib_num(GLcontext *ctx, const GLubyte ** inst,
 {
    GLint i = parse_integer(inst, Program);
 
-   if ((i < 0) || (i >= MAX_VERTEX_PROGRAM_ATTRIBS))
+   if ((i < 0) || (i >= MAX_VERTEX_GENERIC_ATTRIBS))
    {
       program_error(ctx, Program->Position,
                     "Invalid generic vertex attribute index");
@@ -1510,10 +1510,10 @@ generic_attrib_check(struct var_cache *vc_head)
 {
    int a;
    struct var_cache *curr;
-   GLboolean explicitAttrib[MAX_VERTEX_PROGRAM_ATTRIBS],
-      genericAttrib[MAX_VERTEX_PROGRAM_ATTRIBS];
+   GLboolean explicitAttrib[MAX_VERTEX_GENERIC_ATTRIBS],
+      genericAttrib[MAX_VERTEX_GENERIC_ATTRIBS];
 
-   for (a=0; a<MAX_VERTEX_PROGRAM_ATTRIBS; a++) {
+   for (a=0; a<MAX_VERTEX_GENERIC_ATTRIBS; a++) {
       explicitAttrib[a] = GL_FALSE;
       genericAttrib[a] = GL_FALSE;
    }
@@ -1524,11 +1524,11 @@ generic_attrib_check(struct var_cache *vc_head)
          if (curr->attrib_is_generic) {
             GLuint attr = (curr->attrib_binding == 0)
                ? 0 : (curr->attrib_binding - VERT_ATTRIB_GENERIC0);
-            assert(attr < MAX_VERTEX_PROGRAM_ATTRIBS);
+            assert(attr < MAX_VERTEX_GENERIC_ATTRIBS);
             genericAttrib[attr] = GL_TRUE;
          }
          else {
-            assert(curr->attrib_binding < MAX_VERTEX_PROGRAM_ATTRIBS);
+            assert(curr->attrib_binding < MAX_VERTEX_GENERIC_ATTRIBS);
             explicitAttrib[ curr->attrib_binding ] = GL_TRUE;
          }
       }
@@ -1536,7 +1536,7 @@ generic_attrib_check(struct var_cache *vc_head)
       curr = curr->next;
    }
 
-   for (a=0; a<MAX_VERTEX_PROGRAM_ATTRIBS; a++) {
+   for (a=0; a<MAX_VERTEX_GENERIC_ATTRIBS; a++) {
       if ((explicitAttrib[a]) && (genericAttrib[a]))
          return 1;
    }
diff --git a/src/mesa/shader/arbprogram.c b/src/mesa/shader/arbprogram.c
index 6f5a954c16..21c5cfbf99 100644
--- a/src/mesa/shader/arbprogram.c
+++ b/src/mesa/shader/arbprogram.c
@@ -310,7 +310,7 @@ _mesa_GetVertexAttribfvARB(GLuint index, GLenum pname, GLfloat *params)
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-   if (index >= MAX_VERTEX_PROGRAM_ATTRIBS) {
+   if (index >= MAX_VERTEX_GENERIC_ATTRIBS) {
       _mesa_error(ctx, GL_INVALID_VALUE, "glGetVertexAttribfvARB(index)");
       return;
    }
diff --git a/src/mesa/tnl/t_vb_program.c b/src/mesa/tnl/t_vb_program.c
index 1795f62c32..c35eaf1538 100644
--- a/src/mesa/tnl/t_vb_program.c
+++ b/src/mesa/tnl/t_vb_program.c
@@ -207,7 +207,7 @@ init_machine(GLcontext *ctx, struct gl_program_machine *machine)
 {
    /* Input registers get initialized from the current vertex attribs */
    MEMCPY(machine->VertAttribs, ctx->Current.Attrib,
-          MAX_VERTEX_PROGRAM_ATTRIBS * 4 * sizeof(GLfloat));
+          MAX_VERTEX_GENERIC_ATTRIBS * 4 * sizeof(GLfloat));
 
    if (ctx->VertexProgram._Current->IsNVProgram) {
       GLuint i;
-- 
cgit v1.2.3


From 42ae2a8648923b6fa11e29ad0f6ff7555534e390 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 22 May 2009 07:51:13 -0600
Subject: mesa: use Elements() macro to limit loops instead of constants

---
 src/mesa/main/arrayobj.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index f9b11ee244..c03353b78f 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -89,10 +89,10 @@ unbind_array_object_vbos(GLcontext *ctx, struct gl_array_object *obj)
    _mesa_reference_buffer_object(ctx, &obj->Index.BufferObj, NULL);
    _mesa_reference_buffer_object(ctx, &obj->EdgeFlag.BufferObj, NULL);
 
-   for (i = 0; i < MAX_TEXTURE_COORD_UNITS; i++)
+   for (i = 0; i < Elements(obj->TexCoord); i++)
       _mesa_reference_buffer_object(ctx, &obj->TexCoord[i].BufferObj, NULL);
 
-   for (i = 0; i < VERT_ATTRIB_MAX; i++)
+   for (i = 0; i < Elements(obj->VertexAttrib); i++)
       _mesa_reference_buffer_object(ctx, &obj->VertexAttrib[i].BufferObj,NULL);
 }
 
@@ -230,11 +230,11 @@ _mesa_initialize_array_object( GLcontext *ctx,
    init_array(ctx, &obj->SecondaryColor, 4, GL_FLOAT);
    init_array(ctx, &obj->FogCoord, 1, GL_FLOAT);
    init_array(ctx, &obj->Index, 1, GL_FLOAT);
-   for (i = 0; i < MAX_TEXTURE_COORD_UNITS; i++) {
+   for (i = 0; i < Elements(obj->TexCoord); i++) {
       init_array(ctx, &obj->TexCoord[i], 4, GL_FLOAT);
    }
    init_array(ctx, &obj->EdgeFlag, 1, GL_BOOL);
-   for (i = 0; i < VERT_ATTRIB_MAX; i++) {
+   for (i = 0; i < Elements(obj->VertexAttrib); i++) {
       init_array(ctx, &obj->VertexAttrib[i], 4, GL_FLOAT);
    }
 
@@ -340,7 +340,7 @@ _mesa_update_array_object_max_element(GLcontext *ctx,
 #endif
    for (i = 0; i < ctx->Const.MaxTextureCoordUnits; i++)
       min = update_min(min, &arrayObj->TexCoord[i]);
-   for (i = 0; i < VERT_ATTRIB_MAX; i++)
+   for (i = 0; i < Elements(arrayObj->VertexAttrib); i++)
       min = update_min(min, &arrayObj->VertexAttrib[i]);
 
    /* _MaxElement is one past the last legal array element */
-- 
cgit v1.2.3


From a545f1ab6d50e044c6e0b2d952af28e6d9059f80 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 22 May 2009 07:51:35 -0600
Subject: mesa: added some assertions

---
 src/mesa/main/enable.c       | 2 ++
 src/mesa/shader/arbprogram.c | 8 ++++++++
 2 files changed, 10 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index 2e7baa48ff..48268fcd27 100644
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -119,6 +119,7 @@ client_state(GLcontext *ctx, GLenum cap, GLboolean state)
          CHECK_EXTENSION(NV_vertex_program, cap);
          {
             GLint n = (GLint) cap - GL_VERTEX_ATTRIB_ARRAY0_NV;
+            ASSERT(n < Elements(ctx->Array.ArrayObj->VertexAttrib));
             var = &ctx->Array.ArrayObj->VertexAttrib[n].Enabled;
             flag = _NEW_ARRAY_ATTRIB(n);
          }
@@ -1316,6 +1317,7 @@ _mesa_IsEnabled( GLenum cap )
          CHECK_EXTENSION(NV_vertex_program);
          {
             GLint n = (GLint) cap - GL_VERTEX_ATTRIB_ARRAY0_NV;
+            ASSERT(n < Elements(ctx->Array.ArrayObj->VertexAttrib));
             return (ctx->Array.ArrayObj->VertexAttrib[n].Enabled != 0);
          }
       case GL_MAP1_VERTEX_ATTRIB0_4_NV:
diff --git a/src/mesa/shader/arbprogram.c b/src/mesa/shader/arbprogram.c
index 21c5cfbf99..39136efada 100644
--- a/src/mesa/shader/arbprogram.c
+++ b/src/mesa/shader/arbprogram.c
@@ -254,6 +254,8 @@ _mesa_EnableVertexAttribArrayARB(GLuint index)
       return;
    }
 
+   ASSERT(index < Elements(ctx->Array.ArrayObj->VertexAttrib));
+
    FLUSH_VERTICES(ctx, _NEW_ARRAY);
    ctx->Array.ArrayObj->VertexAttrib[index].Enabled = GL_TRUE;
    ctx->Array.ArrayObj->_Enabled |= _NEW_ARRAY_ATTRIB(index);
@@ -273,6 +275,8 @@ _mesa_DisableVertexAttribArrayARB(GLuint index)
       return;
    }
 
+   ASSERT(index < Elements(ctx->Array.ArrayObj->VertexAttrib));
+
    FLUSH_VERTICES(ctx, _NEW_ARRAY);
    ctx->Array.ArrayObj->VertexAttrib[index].Enabled = GL_FALSE;
    ctx->Array.ArrayObj->_Enabled &= ~_NEW_ARRAY_ATTRIB(index);
@@ -315,6 +319,8 @@ _mesa_GetVertexAttribfvARB(GLuint index, GLenum pname, GLfloat *params)
       return;
    }
 
+   ASSERT(index < Elements(ctx->Array.ArrayObj->VertexAttrib));
+
    array = &ctx->Array.ArrayObj->VertexAttrib[index];
 
    switch (pname) {
@@ -387,6 +393,8 @@ _mesa_GetVertexAttribPointervARB(GLuint index, GLenum pname, GLvoid **pointer)
       return;
    }
 
+   ASSERT(index < Elements(ctx->Array.ArrayObj->VertexAttrib));
+
    *pointer = (GLvoid *) ctx->Array.ArrayObj->VertexAttrib[index].Ptr;
 }
 
-- 
cgit v1.2.3


From 995456f9305593005f8466520314ee087f3d422a Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 22 May 2009 09:35:02 -0600
Subject: mesa: allow GL_BITMAP type in _mesa_image_image_stride()

It's possible to hand a GL_COLOR_INDEX/GL_BITMAP image to glTexImage3D()
which gets converted to RGBA via the glPixelMap tables.

This fixes a failure with piglit/fdo10370 with Gallium.
---
 src/mesa/main/image.c | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index ddae456fa1..332febf91f 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -1,8 +1,9 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.1
+ * Version:  7.5
  *
  * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -755,12 +756,20 @@ _mesa_image_image_stride( const struct gl_pixelstore_attrib *packing,
                           GLint width, GLint height,
                           GLenum format, GLenum type )
 {
+   GLint bytesPerRow, bytesPerImage, remainder;
+
    ASSERT(packing);
-   ASSERT(type != GL_BITMAP);
 
-   {
+   if (type == GL_BITMAP) {
+      if (packing->RowLength == 0) {
+         bytesPerRow = (width + 7) / 8;
+      }
+      else {
+         bytesPerRow = (packing->RowLength + 7) / 8;
+      }
+   }
+   else {
       const GLint bytesPerPixel = _mesa_bytes_per_pixel(format, type);
-      GLint bytesPerRow, bytesPerImage, remainder;
 
       if (bytesPerPixel <= 0)
          return -1;  /* error */
@@ -770,17 +779,18 @@ _mesa_image_image_stride( const struct gl_pixelstore_attrib *packing,
       else {
          bytesPerRow = bytesPerPixel * packing->RowLength;
       }
-      remainder = bytesPerRow % packing->Alignment;
-      if (remainder > 0)
-         bytesPerRow += (packing->Alignment - remainder);
+   }
 
-      if (packing->ImageHeight == 0)
-         bytesPerImage = bytesPerRow * height;
-      else
-         bytesPerImage = bytesPerRow * packing->ImageHeight;
+   remainder = bytesPerRow % packing->Alignment;
+   if (remainder > 0)
+      bytesPerRow += (packing->Alignment - remainder);
 
-      return bytesPerImage;
-   }
+   if (packing->ImageHeight == 0)
+      bytesPerImage = bytesPerRow * height;
+   else
+      bytesPerImage = bytesPerRow * packing->ImageHeight;
+
+   return bytesPerImage;
 }
 
 
-- 
cgit v1.2.3


From 1045481dd96dec6e37f4b623b1dbae8af381de75 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 22 May 2009 13:50:31 -0600
Subject: mesa: fix loop over generic attribs in update_arrays()

---
 src/mesa/main/state.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index f18fc8f683..94e37e3dab 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -159,7 +159,7 @@ update_arrays( GLcontext *ctx )
 
    /* 16..31 */
    if (ctx->VertexProgram._Current) {
-      for (i = VERT_ATTRIB_GENERIC0; i < VERT_ATTRIB_MAX; i++) {
+      for (i = 0; i < Elements(ctx->Array.ArrayObj->VertexAttrib); i++) {
          if (ctx->Array.ArrayObj->VertexAttrib[i].Enabled) {
             min = MIN2(min, ctx->Array.ArrayObj->VertexAttrib[i]._MaxElement);
          }
-- 
cgit v1.2.3


From a65f385b8deec6ac1f2ed7a52f7d76ec89e167b9 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 22 May 2009 14:14:53 -0600
Subject: mesa: minor code simplification

---
 src/mesa/main/bufferobj.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index a806766386..eefc1b04fa 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -779,6 +779,7 @@ _mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids)
    for (i = 0; i < n; i++) {
       struct gl_buffer_object *bufObj = _mesa_lookup_bufferobj(ctx, ids[i]);
       if (bufObj) {
+         struct gl_array_object *arrayObj = ctx->Array.ArrayObj;
          GLuint j;
 
          ASSERT(bufObj->Name == ids[i]);
@@ -791,18 +792,19 @@ _mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids)
          }
 
          /* unbind any vertex pointers bound to this buffer */
-         unbind(ctx, &ctx->Array.ArrayObj->Vertex.BufferObj, bufObj);
-         unbind(ctx, &ctx->Array.ArrayObj->Normal.BufferObj, bufObj);
-         unbind(ctx, &ctx->Array.ArrayObj->Color.BufferObj, bufObj);
-         unbind(ctx, &ctx->Array.ArrayObj->SecondaryColor.BufferObj, bufObj);
-         unbind(ctx, &ctx->Array.ArrayObj->FogCoord.BufferObj, bufObj);
-         unbind(ctx, &ctx->Array.ArrayObj->Index.BufferObj, bufObj);
-         unbind(ctx, &ctx->Array.ArrayObj->EdgeFlag.BufferObj, bufObj);
+         unbind(ctx, &arrayObj->Vertex.BufferObj, bufObj);
+         unbind(ctx, &arrayObj->Weight.BufferObj, bufObj);
+         unbind(ctx, &arrayObj->Normal.BufferObj, bufObj);
+         unbind(ctx, &arrayObj->Color.BufferObj, bufObj);
+         unbind(ctx, &arrayObj->SecondaryColor.BufferObj, bufObj);
+         unbind(ctx, &arrayObj->FogCoord.BufferObj, bufObj);
+         unbind(ctx, &arrayObj->Index.BufferObj, bufObj);
+         unbind(ctx, &arrayObj->EdgeFlag.BufferObj, bufObj);
          for (j = 0; j < MAX_TEXTURE_COORD_UNITS; j++) {
-            unbind(ctx, &ctx->Array.ArrayObj->TexCoord[j].BufferObj, bufObj);
+            unbind(ctx, &arrayObj->TexCoord[j].BufferObj, bufObj);
          }
          for (j = 0; j < VERT_ATTRIB_MAX; j++) {
-            unbind(ctx, &ctx->Array.ArrayObj->VertexAttrib[j].BufferObj, bufObj);
+            unbind(ctx, &arrayObj->VertexAttrib[j].BufferObj, bufObj);
          }
 
          if (ctx->Array.ArrayBufferObj == bufObj) {
-- 
cgit v1.2.3


From ebb991ca0d7de103dc068397ed91744bf40ee58f Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 22 May 2009 14:16:00 -0600
Subject: mesa: use Elements() for loop bound

---
 src/mesa/main/bufferobj.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index eefc1b04fa..90daa2e5b8 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -800,10 +800,10 @@ _mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids)
          unbind(ctx, &arrayObj->FogCoord.BufferObj, bufObj);
          unbind(ctx, &arrayObj->Index.BufferObj, bufObj);
          unbind(ctx, &arrayObj->EdgeFlag.BufferObj, bufObj);
-         for (j = 0; j < MAX_TEXTURE_COORD_UNITS; j++) {
+         for (j = 0; j < Elements(arrayObj->TexCoord); j++) {
             unbind(ctx, &arrayObj->TexCoord[j].BufferObj, bufObj);
          }
-         for (j = 0; j < VERT_ATTRIB_MAX; j++) {
+         for (j = 0; j < Elements(arrayObj->VertexAttrib); j++) {
             unbind(ctx, &arrayObj->VertexAttrib[j].BufferObj, bufObj);
          }
 
-- 
cgit v1.2.3


From d30163ad4201dcd5a594694ab87be9e59db47edd Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 22 May 2009 14:23:02 -0600
Subject: mesa: use Elements() for loop limit

---
 src/mesa/main/dlist.c      | 4 ++--
 src/mesa/main/varray.c     | 4 ++--
 src/mesa/vbo/vbo_context.c | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 5120e516e0..dd73a1906b 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -6806,10 +6806,10 @@ _mesa_NewList(GLuint name, GLenum mode)
 
    /* Reset acumulated list state:
     */
-   for (i = 0; i < VERT_ATTRIB_MAX; i++)
+   for (i = 0; i < Elements(ctx->ListState.ActiveAttribSize); i++)
       ctx->ListState.ActiveAttribSize[i] = 0;
 
-   for (i = 0; i < MAT_ATTRIB_MAX; i++)
+   for (i = 0; i < Elements(ctx->ListState.ActiveMaterialSize); i++)
       ctx->ListState.ActiveMaterialSize[i] = 0;
 
    ctx->Driver.CurrentSavePrimitive = PRIM_UNKNOWN;
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 0982dc7977..ff3128b8be 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -1079,10 +1079,10 @@ _mesa_print_arrays(GLcontext *ctx)
       print_array("Normal", -1, &arrayObj->Normal);
    if (arrayObj->Color.Enabled)
       print_array("Color", -1, &arrayObj->Color);
-   for (i = 0; i < MAX_TEXTURE_COORD_UNITS; i++)
+   for (i = 0; i < Elements(arrayObj->TexCoord); i++)
       if (arrayObj->TexCoord[i].Enabled)
          print_array("TexCoord", i, &arrayObj->TexCoord[i]);
-   for (i = 0; i < VERT_ATTRIB_MAX; i++)
+   for (i = 0; i < Elements(arrayObj->VertexAttrib); i++)
       if (arrayObj->VertexAttrib[i].Enabled)
          print_array("Attrib", i, &arrayObj->VertexAttrib[i]);
    _mesa_printf("  _MaxElement = %u\n", arrayObj->_MaxElement);
diff --git a/src/mesa/vbo/vbo_context.c b/src/mesa/vbo/vbo_context.c
index f193a4bf1e..90025f62fc 100644
--- a/src/mesa/vbo/vbo_context.c
+++ b/src/mesa/vbo/vbo_context.c
@@ -214,7 +214,7 @@ GLboolean _vbo_CreateContext( GLcontext *ctx )
       for (i = 0; i < 4; i++)
 	 vbo->map_vp_none[28+i] = i;	
       
-      for (i = 0; i < VERT_ATTRIB_MAX; i++)
+      for (i = 0; i < Elements(vbo->map_vp_arb); i++)
 	 vbo->map_vp_arb[i] = i;
    }
 
-- 
cgit v1.2.3


From bf4dfd6563e1ce5cabea415d1e3600ab4abefe81 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 22 May 2009 14:24:21 -0600
Subject: mesa: minor code clean-up

---
 src/mesa/main/api_arrayelt.c | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_arrayelt.c b/src/mesa/main/api_arrayelt.c
index d124c724c9..703eeebfc3 100644
--- a/src/mesa/main/api_arrayelt.c
+++ b/src/mesa/main/api_arrayelt.c
@@ -1094,48 +1094,49 @@ static void _ae_update_state( GLcontext *ctx )
    AEarray *aa = actx->arrays;
    AEattrib *at = actx->attribs;
    GLuint i;
+   struct gl_array_object *arrayObj = ctx->Array.ArrayObj;
 
    actx->nr_vbos = 0;
 
    /* conventional vertex arrays */
-  if (ctx->Array.ArrayObj->Index.Enabled) {
-      aa->array = &ctx->Array.ArrayObj->Index;
+   if (arrayObj->Index.Enabled) {
+      aa->array = &arrayObj->Index;
       aa->offset = IndexFuncs[TYPE_IDX(aa->array->Type)];
       check_vbo(actx, aa->array->BufferObj);
       aa++;
    }
-   if (ctx->Array.ArrayObj->EdgeFlag.Enabled) {
-      aa->array = &ctx->Array.ArrayObj->EdgeFlag;
+   if (arrayObj->EdgeFlag.Enabled) {
+      aa->array = &arrayObj->EdgeFlag;
       aa->offset = _gloffset_EdgeFlagv;
       check_vbo(actx, aa->array->BufferObj);
       aa++;
    }
-   if (ctx->Array.ArrayObj->Normal.Enabled) {
-      aa->array = &ctx->Array.ArrayObj->Normal;
+   if (arrayObj->Normal.Enabled) {
+      aa->array = &arrayObj->Normal;
       aa->offset = NormalFuncs[TYPE_IDX(aa->array->Type)];
       check_vbo(actx, aa->array->BufferObj);
       aa++;
    }
-   if (ctx->Array.ArrayObj->Color.Enabled) {
-      aa->array = &ctx->Array.ArrayObj->Color;
+   if (arrayObj->Color.Enabled) {
+      aa->array = &arrayObj->Color;
       aa->offset = ColorFuncs[aa->array->Size-3][TYPE_IDX(aa->array->Type)];
       check_vbo(actx, aa->array->BufferObj);
       aa++;
    }
-   if (ctx->Array.ArrayObj->SecondaryColor.Enabled) {
-      aa->array = &ctx->Array.ArrayObj->SecondaryColor;
+   if (arrayObj->SecondaryColor.Enabled) {
+      aa->array = &arrayObj->SecondaryColor;
       aa->offset = SecondaryColorFuncs[TYPE_IDX(aa->array->Type)];
       check_vbo(actx, aa->array->BufferObj);
       aa++;
    }
-   if (ctx->Array.ArrayObj->FogCoord.Enabled) {
-      aa->array = &ctx->Array.ArrayObj->FogCoord;
+   if (arrayObj->FogCoord.Enabled) {
+      aa->array = &arrayObj->FogCoord;
       aa->offset = FogCoordFuncs[TYPE_IDX(aa->array->Type)];
       check_vbo(actx, aa->array->BufferObj);
       aa++;
    }
    for (i = 0; i < ctx->Const.MaxTextureCoordUnits; i++) {
-      struct gl_client_array *attribArray = &ctx->Array.ArrayObj->TexCoord[i];
+      struct gl_client_array *attribArray = &arrayObj->TexCoord[i];
       if (attribArray->Enabled) {
          /* NOTE: we use generic glVertexAttribNV functions here.
           * If we ever remove GL_NV_vertex_program this will have to change.
@@ -1153,7 +1154,7 @@ static void _ae_update_state( GLcontext *ctx )
 
    /* generic vertex attribute arrays */   
    for (i = 1; i < VERT_ATTRIB_MAX; i++) {  /* skip zero! */
-      struct gl_client_array *attribArray = &ctx->Array.ArrayObj->VertexAttrib[i];
+      struct gl_client_array *attribArray = &arrayObj->VertexAttrib[i];
       if (attribArray->Enabled) {
          at->array = attribArray;
          /* Note: we can't grab the _glapi_Dispatch->VertexAttrib1fvNV
@@ -1179,18 +1180,18 @@ static void _ae_update_state( GLcontext *ctx )
    }
 
    /* finally, vertex position */
-   if (ctx->Array.ArrayObj->VertexAttrib[0].Enabled) {
+   if (arrayObj->VertexAttrib[0].Enabled) {
       /* Use glVertex(v) instead of glVertexAttrib(0, v) to be sure it's
        * issued as the last (provoking) attribute).
        */
-      aa->array = &ctx->Array.ArrayObj->VertexAttrib[0];
+      aa->array = &arrayObj->VertexAttrib[0];
       assert(aa->array->Size >= 2); /* XXX fix someday? */
       aa->offset = VertexFuncs[aa->array->Size-2][TYPE_IDX(aa->array->Type)];
       check_vbo(actx, aa->array->BufferObj);
       aa++;
    }
-   else if (ctx->Array.ArrayObj->Vertex.Enabled) {
-      aa->array = &ctx->Array.ArrayObj->Vertex;
+   else if (arrayObj->Vertex.Enabled) {
+      aa->array = &arrayObj->Vertex;
       aa->offset = VertexFuncs[aa->array->Size-2][TYPE_IDX(aa->array->Type)];
       check_vbo(actx, aa->array->BufferObj);
       aa++;
-- 
cgit v1.2.3


From 180df4d328166a21fa9bb847b52ec1ba8f95dfcc Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 22 May 2009 14:27:26 -0600
Subject: mesa: simplify adjust_buffer_object_ref_counts()

---
 src/mesa/main/attrib.c | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index a609199504..51b653fb74 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -1330,20 +1330,22 @@ _mesa_PopAttrib(void)
  * counts when pushing/popping the GL_CLIENT_VERTEX_ARRAY_BIT attribute group.
  */
 static void
-adjust_buffer_object_ref_counts(struct gl_array_attrib *array, GLint step)
+adjust_buffer_object_ref_counts(struct gl_array_object *arrayObj, GLint step)
 {
    GLuint i;
-   array->ArrayObj->Vertex.BufferObj->RefCount += step;
-   array->ArrayObj->Normal.BufferObj->RefCount += step;
-   array->ArrayObj->Color.BufferObj->RefCount += step;
-   array->ArrayObj->SecondaryColor.BufferObj->RefCount += step;
-   array->ArrayObj->FogCoord.BufferObj->RefCount += step;
-   array->ArrayObj->Index.BufferObj->RefCount += step;
-   array->ArrayObj->EdgeFlag.BufferObj->RefCount += step;
+
+   arrayObj->Vertex.BufferObj->RefCount += step;
+   arrayObj->Weight.BufferObj->RefCount += step;
+   arrayObj->Normal.BufferObj->RefCount += step;
+   arrayObj->Color.BufferObj->RefCount += step;
+   arrayObj->SecondaryColor.BufferObj->RefCount += step;
+   arrayObj->FogCoord.BufferObj->RefCount += step;
+   arrayObj->Index.BufferObj->RefCount += step;
+   arrayObj->EdgeFlag.BufferObj->RefCount += step;
    for (i = 0; i < MAX_TEXTURE_COORD_UNITS; i++)
-      array->ArrayObj->TexCoord[i].BufferObj->RefCount += step;
+      arrayObj->TexCoord[i].BufferObj->RefCount += step;
    for (i = 0; i < VERT_ATTRIB_MAX; i++)
-      array->ArrayObj->VertexAttrib[i].BufferObj->RefCount += step;
+      arrayObj->VertexAttrib[i].BufferObj->RefCount += step;
 }
 
 
@@ -1434,7 +1436,7 @@ _mesa_PushClientAttrib(GLbitfield mask)
       newnode->next = head;
       head = newnode;
       /* bump reference counts on buffer objects */
-      adjust_buffer_object_ref_counts(&ctx->Array, 1);
+      adjust_buffer_object_ref_counts(ctx->Array.ArrayObj, 1);
    }
 
    ctx->ClientAttribStack[ctx->ClientAttribStackDepth] = head;
@@ -1484,7 +1486,7 @@ _mesa_PopClientAttrib(void)
 	    struct gl_array_attrib * data =
 	      (struct gl_array_attrib *) node->data;
 
-            adjust_buffer_object_ref_counts(&ctx->Array, -1);
+            adjust_buffer_object_ref_counts(ctx->Array.ArrayObj, -1);
 	 
             ctx->Array.ActiveTexture = data->ActiveTexture;
 	    if (data->LockCount != 0)
-- 
cgit v1.2.3


From 2a3d118a8e4c048e5d850a29301c02f886ba09d4 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 22 May 2009 14:27:42 -0600
Subject: mesa: use Elements() for loop limit

---
 src/mesa/main/api_arrayelt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_arrayelt.c b/src/mesa/main/api_arrayelt.c
index 703eeebfc3..f5b7d1e138 100644
--- a/src/mesa/main/api_arrayelt.c
+++ b/src/mesa/main/api_arrayelt.c
@@ -1153,7 +1153,7 @@ static void _ae_update_state( GLcontext *ctx )
    }
 
    /* generic vertex attribute arrays */   
-   for (i = 1; i < VERT_ATTRIB_MAX; i++) {  /* skip zero! */
+   for (i = 1; i < Elements(arrayObj->VertexAttrib); i++) {  /* skip zero! */
       struct gl_client_array *attribArray = &arrayObj->VertexAttrib[i];
       if (attribArray->Enabled) {
          at->array = attribArray;
-- 
cgit v1.2.3


From 8091aa86337b5541e70f0a83bc9b13c55faec559 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 22 May 2009 14:28:24 -0600
Subject: mesa: use Elements() for loop limit

---
 src/mesa/main/attrib.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 51b653fb74..476a24434c 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -1342,9 +1342,9 @@ adjust_buffer_object_ref_counts(struct gl_array_object *arrayObj, GLint step)
    arrayObj->FogCoord.BufferObj->RefCount += step;
    arrayObj->Index.BufferObj->RefCount += step;
    arrayObj->EdgeFlag.BufferObj->RefCount += step;
-   for (i = 0; i < MAX_TEXTURE_COORD_UNITS; i++)
+   for (i = 0; i < Elements(arrayObj->TexCoord); i++)
       arrayObj->TexCoord[i].BufferObj->RefCount += step;
-   for (i = 0; i < VERT_ATTRIB_MAX; i++)
+   for (i = 0; i < Elements(arrayObj->VertexAttrib); i++)
       arrayObj->VertexAttrib[i].BufferObj->RefCount += step;
 }
 
-- 
cgit v1.2.3


From ce7a049191c14be1d3dd456cdc72463b01ccf34c Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 22 May 2009 14:32:37 -0600
Subject: mesa: use Elements() for loop limit

---
 src/mesa/main/context.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 5e0f2d7b1b..ff9dd488c7 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -455,7 +455,7 @@ _mesa_init_current(GLcontext *ctx)
    GLuint i;
 
    /* Init all to (0,0,0,1) */
-   for (i = 0; i < VERT_ATTRIB_MAX; i++) {
+   for (i = 0; i < Elements(ctx->Current.Attrib); i++) {
       ASSIGN_4V( ctx->Current.Attrib[i], 0.0, 0.0, 0.0, 1.0 );
    }
 
-- 
cgit v1.2.3


From 2ead49f98bcc18ab0ebc7942de78e280ec56d77a Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 22 May 2009 14:57:51 -0600
Subject: mesa: reduce gl_array_object::VertexAttrib[] array from 32 to 16
 elements

This array was mistakenly dimensioned with VERT_ATTRIB_MAX (32) but it
should really be MAX_VERTEX_GENERIC_ATTRIBS (16).

The generic vertex attributes are in addition to the conventional arrays
(except in NV vertex program mode- they alias/overlay in that case) so
the total of all conventional attributes plus generic attributes should
total 32 (not 48).
---
 src/mesa/main/mtypes.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 55bfa2bf41..e3471123c6 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1574,8 +1574,13 @@ struct gl_array_object
    struct gl_client_array PointSize;
    /*@}*/
 
-   /** Generic arrays for vertex programs/shaders */
-   struct gl_client_array VertexAttrib[VERT_ATTRIB_MAX];
+   /**
+    * Generic arrays for vertex programs/shaders.
+    * For NV vertex programs, these attributes alias and take priority
+    * over the conventional attribs above.  For ARB vertex programs and
+    * GLSL vertex shaders, these attributes are separate.
+    */
+   struct gl_client_array VertexAttrib[MAX_VERTEX_GENERIC_ATTRIBS];
 
    /** Mask of _NEW_ARRAY_* values indicating which arrays are enabled */
    GLbitfield _Enabled;
-- 
cgit v1.2.3


From 68d412f31cbf028b1faa1c7fd95b849a95bb762c Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 22 May 2009 15:35:49 -0600
Subject: mesa: add missing update_min() call in update_arrays()

---
 src/mesa/main/state.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index d5bdb63a97..7b41b8f4da 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -196,7 +196,7 @@ update_arrays( GLcontext *ctx )
    if (ctx->VertexProgram._Current) {
       for (i = 0; i < Elements(arrayObj->VertexAttrib); i++) {
          if (arrayObj->VertexAttrib[i].Enabled) {
-            min = MIN2(min, arrayObj->VertexAttrib[i]._MaxElement);
+            min = update_min(min, &arrayObj->VertexAttrib[i]);
          }
       }
    }
-- 
cgit v1.2.3


From bd6c44458f132830d40f7c4d44ae249d8725b132 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 28 May 2009 12:29:23 -0600
Subject: mesa: regenerated enums for GL_EXT_provoking_vertex

---
 src/mesa/main/enums.c | 4712 +++++++++++++++++++++++++------------------------
 1 file changed, 2362 insertions(+), 2350 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/enums.c b/src/mesa/main/enums.c
index cf893fdac5..e38f824b62 100644
--- a/src/mesa/main/enums.c
+++ b/src/mesa/main/enums.c
@@ -512,6 +512,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_FEEDBACK_BUFFER_SIZE\0"
    "GL_FEEDBACK_BUFFER_TYPE\0"
    "GL_FILL\0"
+   "GL_FIRST_VERTEX_CONVENTION_EXT\0"
    "GL_FLAT\0"
    "GL_FLOAT\0"
    "GL_FLOAT_MAT2\0"
@@ -694,6 +695,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_INVERSE_TRANSPOSE_NV\0"
    "GL_INVERT\0"
    "GL_KEEP\0"
+   "GL_LAST_VERTEX_CONVENTION_EXT\0"
    "GL_LEFT\0"
    "GL_LEQUAL\0"
    "GL_LESS\0"
@@ -948,8 +950,8 @@ LONGSTRING static const char enum_string_table[] =
    "GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV\0"
    "GL_MAX_VARYING_FLOATS\0"
    "GL_MAX_VARYING_FLOATS_ARB\0"
-   "GL_MAX_VERTEX_GENERIC_ATTRIBS\0"
-   "GL_MAX_VERTEX_GENERIC_ATTRIBS_ARB\0"
+   "GL_MAX_VERTEX_ATTRIBS\0"
+   "GL_MAX_VERTEX_ATTRIBS_ARB\0"
    "GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS\0"
    "GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB\0"
    "GL_MAX_VERTEX_UNIFORM_COMPONENTS\0"
@@ -1271,6 +1273,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_PROJECTION\0"
    "GL_PROJECTION_MATRIX\0"
    "GL_PROJECTION_STACK_DEPTH\0"
+   "GL_PROVOKING_VERTEX_EXT\0"
    "GL_PROXY_COLOR_TABLE\0"
    "GL_PROXY_HISTOGRAM\0"
    "GL_PROXY_HISTOGRAM_EXT\0"
@@ -1291,6 +1294,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_Q\0"
    "GL_QUADRATIC_ATTENUATION\0"
    "GL_QUADS\0"
+   "GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT\0"
    "GL_QUAD_MESH_SUN\0"
    "GL_QUAD_STRIP\0"
    "GL_QUERY_COUNTER_BITS\0"
@@ -1858,7 +1862,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_ZOOM_Y\0"
    ;
 
-static const enum_elt all_enums[1820] =
+static const enum_elt all_enums[1824] =
 {
    {     0, 0x00000600 }, /* GL_2D */
    {     6, 0x00001407 }, /* GL_2_BYTES */
@@ -2336,1429 +2340,1433 @@ static const enum_elt all_enums[1820] =
    {  9506, 0x00000DF1 }, /* GL_FEEDBACK_BUFFER_SIZE */
    {  9530, 0x00000DF2 }, /* GL_FEEDBACK_BUFFER_TYPE */
    {  9554, 0x00001B02 }, /* GL_FILL */
-   {  9562, 0x00001D00 }, /* GL_FLAT */
-   {  9570, 0x00001406 }, /* GL_FLOAT */
-   {  9579, 0x00008B5A }, /* GL_FLOAT_MAT2 */
-   {  9593, 0x00008B5A }, /* GL_FLOAT_MAT2_ARB */
-   {  9611, 0x00008B65 }, /* GL_FLOAT_MAT2x3 */
-   {  9627, 0x00008B66 }, /* GL_FLOAT_MAT2x4 */
-   {  9643, 0x00008B5B }, /* GL_FLOAT_MAT3 */
-   {  9657, 0x00008B5B }, /* GL_FLOAT_MAT3_ARB */
-   {  9675, 0x00008B67 }, /* GL_FLOAT_MAT3x2 */
-   {  9691, 0x00008B68 }, /* GL_FLOAT_MAT3x4 */
-   {  9707, 0x00008B5C }, /* GL_FLOAT_MAT4 */
-   {  9721, 0x00008B5C }, /* GL_FLOAT_MAT4_ARB */
-   {  9739, 0x00008B69 }, /* GL_FLOAT_MAT4x2 */
-   {  9755, 0x00008B6A }, /* GL_FLOAT_MAT4x3 */
-   {  9771, 0x00008B50 }, /* GL_FLOAT_VEC2 */
-   {  9785, 0x00008B50 }, /* GL_FLOAT_VEC2_ARB */
-   {  9803, 0x00008B51 }, /* GL_FLOAT_VEC3 */
-   {  9817, 0x00008B51 }, /* GL_FLOAT_VEC3_ARB */
-   {  9835, 0x00008B52 }, /* GL_FLOAT_VEC4 */
-   {  9849, 0x00008B52 }, /* GL_FLOAT_VEC4_ARB */
-   {  9867, 0x00000B60 }, /* GL_FOG */
-   {  9874, 0x00000080 }, /* GL_FOG_BIT */
-   {  9885, 0x00000B66 }, /* GL_FOG_COLOR */
-   {  9898, 0x00008451 }, /* GL_FOG_COORD */
-   {  9911, 0x00008451 }, /* GL_FOG_COORDINATE */
-   {  9929, 0x00008457 }, /* GL_FOG_COORDINATE_ARRAY */
-   {  9953, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
-   {  9992, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB */
-   { 10035, 0x00008456 }, /* GL_FOG_COORDINATE_ARRAY_POINTER */
-   { 10067, 0x00008455 }, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
-   { 10098, 0x00008454 }, /* GL_FOG_COORDINATE_ARRAY_TYPE */
-   { 10127, 0x00008450 }, /* GL_FOG_COORDINATE_SOURCE */
-   { 10152, 0x00008457 }, /* GL_FOG_COORD_ARRAY */
-   { 10171, 0x0000889D }, /* GL_FOG_COORD_ARRAY_BUFFER_BINDING */
-   { 10205, 0x00008456 }, /* GL_FOG_COORD_ARRAY_POINTER */
-   { 10232, 0x00008455 }, /* GL_FOG_COORD_ARRAY_STRIDE */
-   { 10258, 0x00008454 }, /* GL_FOG_COORD_ARRAY_TYPE */
-   { 10282, 0x00008450 }, /* GL_FOG_COORD_SRC */
-   { 10299, 0x00000B62 }, /* GL_FOG_DENSITY */
-   { 10314, 0x0000855A }, /* GL_FOG_DISTANCE_MODE_NV */
-   { 10338, 0x00000B64 }, /* GL_FOG_END */
-   { 10349, 0x00000C54 }, /* GL_FOG_HINT */
-   { 10361, 0x00000B61 }, /* GL_FOG_INDEX */
-   { 10374, 0x00000B65 }, /* GL_FOG_MODE */
-   { 10386, 0x00008198 }, /* GL_FOG_OFFSET_SGIX */
-   { 10405, 0x00008199 }, /* GL_FOG_OFFSET_VALUE_SGIX */
-   { 10430, 0x00000B63 }, /* GL_FOG_START */
-   { 10443, 0x00008452 }, /* GL_FRAGMENT_DEPTH */
-   { 10461, 0x00008804 }, /* GL_FRAGMENT_PROGRAM_ARB */
-   { 10485, 0x00008B30 }, /* GL_FRAGMENT_SHADER */
-   { 10504, 0x00008B30 }, /* GL_FRAGMENT_SHADER_ARB */
-   { 10527, 0x00008B8B }, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
-   { 10562, 0x00008D40 }, /* GL_FRAMEBUFFER */
-   { 10577, 0x00008215 }, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
-   { 10614, 0x00008214 }, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
-   { 10650, 0x00008210 }, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
-   { 10691, 0x00008211 }, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
-   { 10732, 0x00008216 }, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
-   { 10769, 0x00008213 }, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
-   { 10806, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
-   { 10844, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT */
-   { 10886, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
-   { 10924, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT */
-   { 10966, 0x00008212 }, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
-   { 11001, 0x00008217 }, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
-   { 11040, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT */
-   { 11089, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
-   { 11137, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT */
-   { 11189, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
-   { 11229, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
-   { 11273, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
-   { 11313, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT */
-   { 11357, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING_EXT */
-   { 11384, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE */
-   { 11408, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE_EXT */
-   { 11436, 0x00008218 }, /* GL_FRAMEBUFFER_DEFAULT */
-   { 11459, 0x00008D40 }, /* GL_FRAMEBUFFER_EXT */
-   { 11478, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
-   { 11515, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT */
-   { 11556, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
-   { 11597, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
-   { 11639, 0x00008CD8 }, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
-   { 11690, 0x00008CDA }, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
-   { 11728, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
-   { 11773, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT */
-   { 11822, 0x00008D56 }, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
-   { 11860, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
-   { 11902, 0x00008CDE }, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
-   { 11934, 0x00008219 }, /* GL_FRAMEBUFFER_UNDEFINED */
-   { 11959, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED */
-   { 11986, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED_EXT */
-   { 12017, 0x00000404 }, /* GL_FRONT */
-   { 12026, 0x00000408 }, /* GL_FRONT_AND_BACK */
-   { 12044, 0x00000B46 }, /* GL_FRONT_FACE */
-   { 12058, 0x00000400 }, /* GL_FRONT_LEFT */
-   { 12072, 0x00000401 }, /* GL_FRONT_RIGHT */
-   { 12087, 0x00008006 }, /* GL_FUNC_ADD */
-   { 12099, 0x00008006 }, /* GL_FUNC_ADD_EXT */
-   { 12115, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT */
-   { 12140, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT_EXT */
-   { 12169, 0x0000800A }, /* GL_FUNC_SUBTRACT */
-   { 12186, 0x0000800A }, /* GL_FUNC_SUBTRACT_EXT */
-   { 12207, 0x00008191 }, /* GL_GENERATE_MIPMAP */
-   { 12226, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT */
-   { 12250, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT_SGIS */
-   { 12279, 0x00008191 }, /* GL_GENERATE_MIPMAP_SGIS */
-   { 12303, 0x00000206 }, /* GL_GEQUAL */
-   { 12313, 0x00000204 }, /* GL_GREATER */
-   { 12324, 0x00001904 }, /* GL_GREEN */
-   { 12333, 0x00000D19 }, /* GL_GREEN_BIAS */
-   { 12347, 0x00000D53 }, /* GL_GREEN_BITS */
-   { 12361, 0x00000D18 }, /* GL_GREEN_SCALE */
-   { 12376, 0x00008000 }, /* GL_HINT_BIT */
-   { 12388, 0x00008024 }, /* GL_HISTOGRAM */
-   { 12401, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE */
-   { 12425, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE_EXT */
-   { 12453, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE */
-   { 12476, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE_EXT */
-   { 12503, 0x00008024 }, /* GL_HISTOGRAM_EXT */
-   { 12520, 0x00008027 }, /* GL_HISTOGRAM_FORMAT */
-   { 12540, 0x00008027 }, /* GL_HISTOGRAM_FORMAT_EXT */
-   { 12564, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE */
-   { 12588, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE_EXT */
-   { 12616, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE */
-   { 12644, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE_EXT */
-   { 12676, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE */
-   { 12698, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE_EXT */
-   { 12724, 0x0000802D }, /* GL_HISTOGRAM_SINK */
-   { 12742, 0x0000802D }, /* GL_HISTOGRAM_SINK_EXT */
-   { 12764, 0x00008026 }, /* GL_HISTOGRAM_WIDTH */
-   { 12783, 0x00008026 }, /* GL_HISTOGRAM_WIDTH_EXT */
-   { 12806, 0x0000862A }, /* GL_IDENTITY_NV */
-   { 12821, 0x00008150 }, /* GL_IGNORE_BORDER_HP */
-   { 12841, 0x00008B9B }, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
-   { 12881, 0x00008B9A }, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
-   { 12919, 0x00001E02 }, /* GL_INCR */
-   { 12927, 0x00008507 }, /* GL_INCR_WRAP */
-   { 12940, 0x00008507 }, /* GL_INCR_WRAP_EXT */
-   { 12957, 0x00008222 }, /* GL_INDEX */
-   { 12966, 0x00008077 }, /* GL_INDEX_ARRAY */
-   { 12981, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING */
-   { 13011, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING_ARB */
-   { 13045, 0x00008091 }, /* GL_INDEX_ARRAY_POINTER */
-   { 13068, 0x00008086 }, /* GL_INDEX_ARRAY_STRIDE */
-   { 13090, 0x00008085 }, /* GL_INDEX_ARRAY_TYPE */
-   { 13110, 0x00000D51 }, /* GL_INDEX_BITS */
-   { 13124, 0x00000C20 }, /* GL_INDEX_CLEAR_VALUE */
-   { 13145, 0x00000BF1 }, /* GL_INDEX_LOGIC_OP */
-   { 13163, 0x00000C30 }, /* GL_INDEX_MODE */
-   { 13177, 0x00000D13 }, /* GL_INDEX_OFFSET */
-   { 13193, 0x00000D12 }, /* GL_INDEX_SHIFT */
-   { 13208, 0x00000C21 }, /* GL_INDEX_WRITEMASK */
-   { 13227, 0x00008B84 }, /* GL_INFO_LOG_LENGTH */
-   { 13246, 0x00001404 }, /* GL_INT */
-   { 13253, 0x00008049 }, /* GL_INTENSITY */
-   { 13266, 0x0000804C }, /* GL_INTENSITY12 */
-   { 13281, 0x0000804C }, /* GL_INTENSITY12_EXT */
-   { 13300, 0x0000804D }, /* GL_INTENSITY16 */
-   { 13315, 0x0000804D }, /* GL_INTENSITY16_EXT */
-   { 13334, 0x0000804A }, /* GL_INTENSITY4 */
-   { 13348, 0x0000804A }, /* GL_INTENSITY4_EXT */
-   { 13366, 0x0000804B }, /* GL_INTENSITY8 */
-   { 13380, 0x0000804B }, /* GL_INTENSITY8_EXT */
-   { 13398, 0x00008049 }, /* GL_INTENSITY_EXT */
-   { 13415, 0x00008575 }, /* GL_INTERPOLATE */
-   { 13430, 0x00008575 }, /* GL_INTERPOLATE_ARB */
-   { 13449, 0x00008575 }, /* GL_INTERPOLATE_EXT */
-   { 13468, 0x00008B53 }, /* GL_INT_VEC2 */
-   { 13480, 0x00008B53 }, /* GL_INT_VEC2_ARB */
-   { 13496, 0x00008B54 }, /* GL_INT_VEC3 */
-   { 13508, 0x00008B54 }, /* GL_INT_VEC3_ARB */
-   { 13524, 0x00008B55 }, /* GL_INT_VEC4 */
-   { 13536, 0x00008B55 }, /* GL_INT_VEC4_ARB */
-   { 13552, 0x00000500 }, /* GL_INVALID_ENUM */
-   { 13568, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION */
-   { 13601, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION_EXT */
-   { 13638, 0x00000502 }, /* GL_INVALID_OPERATION */
-   { 13659, 0x00000501 }, /* GL_INVALID_VALUE */
-   { 13676, 0x0000862B }, /* GL_INVERSE_NV */
-   { 13690, 0x0000862D }, /* GL_INVERSE_TRANSPOSE_NV */
-   { 13714, 0x0000150A }, /* GL_INVERT */
-   { 13724, 0x00001E00 }, /* GL_KEEP */
-   { 13732, 0x00000406 }, /* GL_LEFT */
-   { 13740, 0x00000203 }, /* GL_LEQUAL */
-   { 13750, 0x00000201 }, /* GL_LESS */
-   { 13758, 0x00004000 }, /* GL_LIGHT0 */
-   { 13768, 0x00004001 }, /* GL_LIGHT1 */
-   { 13778, 0x00004002 }, /* GL_LIGHT2 */
-   { 13788, 0x00004003 }, /* GL_LIGHT3 */
-   { 13798, 0x00004004 }, /* GL_LIGHT4 */
-   { 13808, 0x00004005 }, /* GL_LIGHT5 */
-   { 13818, 0x00004006 }, /* GL_LIGHT6 */
-   { 13828, 0x00004007 }, /* GL_LIGHT7 */
-   { 13838, 0x00000B50 }, /* GL_LIGHTING */
-   { 13850, 0x00000040 }, /* GL_LIGHTING_BIT */
-   { 13866, 0x00000B53 }, /* GL_LIGHT_MODEL_AMBIENT */
-   { 13889, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL */
-   { 13918, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL_EXT */
-   { 13951, 0x00000B51 }, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
-   { 13979, 0x00000B52 }, /* GL_LIGHT_MODEL_TWO_SIDE */
-   { 14003, 0x00001B01 }, /* GL_LINE */
-   { 14011, 0x00002601 }, /* GL_LINEAR */
-   { 14021, 0x00001208 }, /* GL_LINEAR_ATTENUATION */
-   { 14043, 0x00008170 }, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
-   { 14073, 0x0000844F }, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
-   { 14104, 0x00002703 }, /* GL_LINEAR_MIPMAP_LINEAR */
-   { 14128, 0x00002701 }, /* GL_LINEAR_MIPMAP_NEAREST */
-   { 14153, 0x00000001 }, /* GL_LINES */
-   { 14162, 0x00000004 }, /* GL_LINE_BIT */
-   { 14174, 0x00000002 }, /* GL_LINE_LOOP */
-   { 14187, 0x00000707 }, /* GL_LINE_RESET_TOKEN */
-   { 14207, 0x00000B20 }, /* GL_LINE_SMOOTH */
-   { 14222, 0x00000C52 }, /* GL_LINE_SMOOTH_HINT */
-   { 14242, 0x00000B24 }, /* GL_LINE_STIPPLE */
-   { 14258, 0x00000B25 }, /* GL_LINE_STIPPLE_PATTERN */
-   { 14282, 0x00000B26 }, /* GL_LINE_STIPPLE_REPEAT */
-   { 14305, 0x00000003 }, /* GL_LINE_STRIP */
-   { 14319, 0x00000702 }, /* GL_LINE_TOKEN */
-   { 14333, 0x00000B21 }, /* GL_LINE_WIDTH */
-   { 14347, 0x00000B23 }, /* GL_LINE_WIDTH_GRANULARITY */
-   { 14373, 0x00000B22 }, /* GL_LINE_WIDTH_RANGE */
-   { 14393, 0x00008B82 }, /* GL_LINK_STATUS */
-   { 14408, 0x00000B32 }, /* GL_LIST_BASE */
-   { 14421, 0x00020000 }, /* GL_LIST_BIT */
-   { 14433, 0x00000B33 }, /* GL_LIST_INDEX */
-   { 14447, 0x00000B30 }, /* GL_LIST_MODE */
-   { 14460, 0x00000101 }, /* GL_LOAD */
-   { 14468, 0x00000BF1 }, /* GL_LOGIC_OP */
-   { 14480, 0x00000BF0 }, /* GL_LOGIC_OP_MODE */
-   { 14497, 0x00008CA1 }, /* GL_LOWER_LEFT */
-   { 14511, 0x00001909 }, /* GL_LUMINANCE */
-   { 14524, 0x00008041 }, /* GL_LUMINANCE12 */
-   { 14539, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12 */
-   { 14562, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12_EXT */
-   { 14589, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4 */
-   { 14611, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4_EXT */
-   { 14637, 0x00008041 }, /* GL_LUMINANCE12_EXT */
-   { 14656, 0x00008042 }, /* GL_LUMINANCE16 */
-   { 14671, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16 */
-   { 14694, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16_EXT */
-   { 14721, 0x00008042 }, /* GL_LUMINANCE16_EXT */
-   { 14740, 0x0000803F }, /* GL_LUMINANCE4 */
-   { 14754, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4 */
-   { 14775, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4_EXT */
-   { 14800, 0x0000803F }, /* GL_LUMINANCE4_EXT */
-   { 14818, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2 */
-   { 14839, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2_EXT */
-   { 14864, 0x00008040 }, /* GL_LUMINANCE8 */
-   { 14878, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8 */
-   { 14899, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8_EXT */
-   { 14924, 0x00008040 }, /* GL_LUMINANCE8_EXT */
-   { 14942, 0x0000190A }, /* GL_LUMINANCE_ALPHA */
-   { 14961, 0x00000D90 }, /* GL_MAP1_COLOR_4 */
-   { 14977, 0x00000DD0 }, /* GL_MAP1_GRID_DOMAIN */
-   { 14997, 0x00000DD1 }, /* GL_MAP1_GRID_SEGMENTS */
-   { 15019, 0x00000D91 }, /* GL_MAP1_INDEX */
-   { 15033, 0x00000D92 }, /* GL_MAP1_NORMAL */
-   { 15048, 0x00000D93 }, /* GL_MAP1_TEXTURE_COORD_1 */
-   { 15072, 0x00000D94 }, /* GL_MAP1_TEXTURE_COORD_2 */
-   { 15096, 0x00000D95 }, /* GL_MAP1_TEXTURE_COORD_3 */
-   { 15120, 0x00000D96 }, /* GL_MAP1_TEXTURE_COORD_4 */
-   { 15144, 0x00000D97 }, /* GL_MAP1_VERTEX_3 */
-   { 15161, 0x00000D98 }, /* GL_MAP1_VERTEX_4 */
-   { 15178, 0x00008660 }, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
-   { 15206, 0x0000866A }, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
-   { 15235, 0x0000866B }, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
-   { 15264, 0x0000866C }, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
-   { 15293, 0x0000866D }, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
-   { 15322, 0x0000866E }, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
-   { 15351, 0x0000866F }, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
-   { 15380, 0x00008661 }, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
-   { 15408, 0x00008662 }, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
-   { 15436, 0x00008663 }, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
-   { 15464, 0x00008664 }, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
-   { 15492, 0x00008665 }, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
-   { 15520, 0x00008666 }, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
-   { 15548, 0x00008667 }, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
-   { 15576, 0x00008668 }, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
-   { 15604, 0x00008669 }, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
-   { 15632, 0x00000DB0 }, /* GL_MAP2_COLOR_4 */
-   { 15648, 0x00000DD2 }, /* GL_MAP2_GRID_DOMAIN */
-   { 15668, 0x00000DD3 }, /* GL_MAP2_GRID_SEGMENTS */
-   { 15690, 0x00000DB1 }, /* GL_MAP2_INDEX */
-   { 15704, 0x00000DB2 }, /* GL_MAP2_NORMAL */
-   { 15719, 0x00000DB3 }, /* GL_MAP2_TEXTURE_COORD_1 */
-   { 15743, 0x00000DB4 }, /* GL_MAP2_TEXTURE_COORD_2 */
-   { 15767, 0x00000DB5 }, /* GL_MAP2_TEXTURE_COORD_3 */
-   { 15791, 0x00000DB6 }, /* GL_MAP2_TEXTURE_COORD_4 */
-   { 15815, 0x00000DB7 }, /* GL_MAP2_VERTEX_3 */
-   { 15832, 0x00000DB8 }, /* GL_MAP2_VERTEX_4 */
-   { 15849, 0x00008670 }, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
-   { 15877, 0x0000867A }, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
-   { 15906, 0x0000867B }, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
-   { 15935, 0x0000867C }, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
-   { 15964, 0x0000867D }, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
-   { 15993, 0x0000867E }, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
-   { 16022, 0x0000867F }, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
-   { 16051, 0x00008671 }, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
-   { 16079, 0x00008672 }, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
-   { 16107, 0x00008673 }, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
-   { 16135, 0x00008674 }, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
-   { 16163, 0x00008675 }, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
-   { 16191, 0x00008676 }, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
-   { 16219, 0x00008677 }, /* GL_MAP2_VERTEX_ATTRIB7_4_NV */
-   { 16247, 0x00008678 }, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
-   { 16275, 0x00008679 }, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
-   { 16303, 0x00000D10 }, /* GL_MAP_COLOR */
-   { 16316, 0x00000D11 }, /* GL_MAP_STENCIL */
-   { 16331, 0x000088C0 }, /* GL_MATRIX0_ARB */
-   { 16346, 0x00008630 }, /* GL_MATRIX0_NV */
-   { 16360, 0x000088CA }, /* GL_MATRIX10_ARB */
-   { 16376, 0x000088CB }, /* GL_MATRIX11_ARB */
-   { 16392, 0x000088CC }, /* GL_MATRIX12_ARB */
-   { 16408, 0x000088CD }, /* GL_MATRIX13_ARB */
-   { 16424, 0x000088CE }, /* GL_MATRIX14_ARB */
-   { 16440, 0x000088CF }, /* GL_MATRIX15_ARB */
-   { 16456, 0x000088D0 }, /* GL_MATRIX16_ARB */
-   { 16472, 0x000088D1 }, /* GL_MATRIX17_ARB */
-   { 16488, 0x000088D2 }, /* GL_MATRIX18_ARB */
-   { 16504, 0x000088D3 }, /* GL_MATRIX19_ARB */
-   { 16520, 0x000088C1 }, /* GL_MATRIX1_ARB */
-   { 16535, 0x00008631 }, /* GL_MATRIX1_NV */
-   { 16549, 0x000088D4 }, /* GL_MATRIX20_ARB */
-   { 16565, 0x000088D5 }, /* GL_MATRIX21_ARB */
-   { 16581, 0x000088D6 }, /* GL_MATRIX22_ARB */
-   { 16597, 0x000088D7 }, /* GL_MATRIX23_ARB */
-   { 16613, 0x000088D8 }, /* GL_MATRIX24_ARB */
-   { 16629, 0x000088D9 }, /* GL_MATRIX25_ARB */
-   { 16645, 0x000088DA }, /* GL_MATRIX26_ARB */
-   { 16661, 0x000088DB }, /* GL_MATRIX27_ARB */
-   { 16677, 0x000088DC }, /* GL_MATRIX28_ARB */
-   { 16693, 0x000088DD }, /* GL_MATRIX29_ARB */
-   { 16709, 0x000088C2 }, /* GL_MATRIX2_ARB */
-   { 16724, 0x00008632 }, /* GL_MATRIX2_NV */
-   { 16738, 0x000088DE }, /* GL_MATRIX30_ARB */
-   { 16754, 0x000088DF }, /* GL_MATRIX31_ARB */
-   { 16770, 0x000088C3 }, /* GL_MATRIX3_ARB */
-   { 16785, 0x00008633 }, /* GL_MATRIX3_NV */
-   { 16799, 0x000088C4 }, /* GL_MATRIX4_ARB */
-   { 16814, 0x00008634 }, /* GL_MATRIX4_NV */
-   { 16828, 0x000088C5 }, /* GL_MATRIX5_ARB */
-   { 16843, 0x00008635 }, /* GL_MATRIX5_NV */
-   { 16857, 0x000088C6 }, /* GL_MATRIX6_ARB */
-   { 16872, 0x00008636 }, /* GL_MATRIX6_NV */
-   { 16886, 0x000088C7 }, /* GL_MATRIX7_ARB */
-   { 16901, 0x00008637 }, /* GL_MATRIX7_NV */
-   { 16915, 0x000088C8 }, /* GL_MATRIX8_ARB */
-   { 16930, 0x000088C9 }, /* GL_MATRIX9_ARB */
-   { 16945, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_ARB */
-   { 16971, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
-   { 17005, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
-   { 17036, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
-   { 17069, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
-   { 17100, 0x00000BA0 }, /* GL_MATRIX_MODE */
-   { 17115, 0x00008840 }, /* GL_MATRIX_PALETTE_ARB */
-   { 17137, 0x00008008 }, /* GL_MAX */
-   { 17144, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE */
-   { 17167, 0x000088FF }, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
-   { 17199, 0x00000D35 }, /* GL_MAX_ATTRIB_STACK_DEPTH */
-   { 17225, 0x00000D3B }, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
-   { 17258, 0x00008177 }, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
-   { 17284, 0x00008178 }, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-   { 17318, 0x00000D32 }, /* GL_MAX_CLIP_PLANES */
-   { 17337, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
-   { 17366, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
-   { 17398, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI */
-   { 17434, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
-   { 17470, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB */
-   { 17510, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT */
-   { 17536, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT_EXT */
-   { 17566, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH */
-   { 17591, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH_EXT */
-   { 17620, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
-   { 17649, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB */
-   { 17682, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS */
-   { 17702, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ARB */
-   { 17726, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ATI */
-   { 17750, 0x000080E9 }, /* GL_MAX_ELEMENTS_INDICES */
-   { 17774, 0x000080E8 }, /* GL_MAX_ELEMENTS_VERTICES */
-   { 17799, 0x00000D30 }, /* GL_MAX_EVAL_ORDER */
-   { 17817, 0x00008008 }, /* GL_MAX_EXT */
-   { 17828, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
-   { 17863, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB */
-   { 17902, 0x00000D31 }, /* GL_MAX_LIGHTS */
-   { 17916, 0x00000B31 }, /* GL_MAX_LIST_NESTING */
-   { 17936, 0x00008841 }, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
-   { 17974, 0x00000D36 }, /* GL_MAX_MODELVIEW_STACK_DEPTH */
-   { 18003, 0x00000D37 }, /* GL_MAX_NAME_STACK_DEPTH */
-   { 18027, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_ARB */
-   { 18055, 0x00000D34 }, /* GL_MAX_PIXEL_MAP_TABLE */
-   { 18078, 0x000088B1 }, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
-   { 18115, 0x0000880B }, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
-   { 18151, 0x000088AD }, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
-   { 18178, 0x000088F5 }, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
-   { 18207, 0x000088B5 }, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
-   { 18241, 0x000088F4 }, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
-   { 18277, 0x000088F6 }, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
-   { 18304, 0x000088A1 }, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
-   { 18336, 0x000088B4 }, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
-   { 18372, 0x000088F8 }, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
-   { 18401, 0x000088F7 }, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
-   { 18430, 0x0000862F }, /* GL_MAX_PROGRAM_MATRICES_ARB */
-   { 18458, 0x0000862E }, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
-   { 18496, 0x000088B3 }, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-   { 18540, 0x0000880E }, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-   { 18583, 0x000088AF }, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
-   { 18617, 0x000088A3 }, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-   { 18656, 0x000088AB }, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
-   { 18693, 0x000088A7 }, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
-   { 18731, 0x00008810 }, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-   { 18774, 0x0000880F }, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-   { 18817, 0x000088A9 }, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
-   { 18847, 0x000088A5 }, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
-   { 18878, 0x0000880D }, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
-   { 18914, 0x0000880C }, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
-   { 18950, 0x00000D38 }, /* GL_MAX_PROJECTION_STACK_DEPTH */
-   { 18980, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
-   { 19014, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_NV */
-   { 19047, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
-   { 19076, 0x00008D57 }, /* GL_MAX_SAMPLES */
-   { 19091, 0x00008504 }, /* GL_MAX_SHININESS_NV */
-   { 19111, 0x00008505 }, /* GL_MAX_SPOT_EXPONENT_NV */
-   { 19135, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS */
-   { 19157, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS_ARB */
-   { 19183, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS */
-   { 19210, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS_ARB */
-   { 19241, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS */
-   { 19265, 0x000084FF }, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
-   { 19299, 0x00000D33 }, /* GL_MAX_TEXTURE_SIZE */
-   { 19319, 0x00000D39 }, /* GL_MAX_TEXTURE_STACK_DEPTH */
-   { 19346, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS */
-   { 19367, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS_ARB */
-   { 19392, 0x0000862F }, /* GL_MAX_TRACK_MATRICES_NV */
-   { 19417, 0x0000862E }, /* GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */
-   { 19452, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS */
-   { 19474, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS_ARB */
-   { 19500, 0x00008869 }, /* GL_MAX_VERTEX_GENERIC_ATTRIBS */
-   { 19522, 0x00008869 }, /* GL_MAX_VERTEX_GENERIC_ATTRIBS_ARB */
-   { 19548, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
-   { 19582, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
-   { 19620, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
-   { 19653, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB */
-   { 19690, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_ARB */
-   { 19714, 0x00000D3A }, /* GL_MAX_VIEWPORT_DIMS */
-   { 19735, 0x00008007 }, /* GL_MIN */
-   { 19742, 0x0000802E }, /* GL_MINMAX */
-   { 19752, 0x0000802E }, /* GL_MINMAX_EXT */
-   { 19766, 0x0000802F }, /* GL_MINMAX_FORMAT */
-   { 19783, 0x0000802F }, /* GL_MINMAX_FORMAT_EXT */
-   { 19804, 0x00008030 }, /* GL_MINMAX_SINK */
-   { 19819, 0x00008030 }, /* GL_MINMAX_SINK_EXT */
-   { 19838, 0x00008007 }, /* GL_MIN_EXT */
-   { 19849, 0x00008370 }, /* GL_MIRRORED_REPEAT */
-   { 19868, 0x00008370 }, /* GL_MIRRORED_REPEAT_ARB */
-   { 19891, 0x00008370 }, /* GL_MIRRORED_REPEAT_IBM */
-   { 19914, 0x00008742 }, /* GL_MIRROR_CLAMP_ATI */
-   { 19934, 0x00008742 }, /* GL_MIRROR_CLAMP_EXT */
-   { 19954, 0x00008912 }, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
-   { 19984, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_ATI */
-   { 20012, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
-   { 20040, 0x00001700 }, /* GL_MODELVIEW */
-   { 20053, 0x00001700 }, /* GL_MODELVIEW0_ARB */
-   { 20071, 0x0000872A }, /* GL_MODELVIEW10_ARB */
-   { 20090, 0x0000872B }, /* GL_MODELVIEW11_ARB */
-   { 20109, 0x0000872C }, /* GL_MODELVIEW12_ARB */
-   { 20128, 0x0000872D }, /* GL_MODELVIEW13_ARB */
-   { 20147, 0x0000872E }, /* GL_MODELVIEW14_ARB */
-   { 20166, 0x0000872F }, /* GL_MODELVIEW15_ARB */
-   { 20185, 0x00008730 }, /* GL_MODELVIEW16_ARB */
-   { 20204, 0x00008731 }, /* GL_MODELVIEW17_ARB */
-   { 20223, 0x00008732 }, /* GL_MODELVIEW18_ARB */
-   { 20242, 0x00008733 }, /* GL_MODELVIEW19_ARB */
-   { 20261, 0x0000850A }, /* GL_MODELVIEW1_ARB */
-   { 20279, 0x00008734 }, /* GL_MODELVIEW20_ARB */
-   { 20298, 0x00008735 }, /* GL_MODELVIEW21_ARB */
-   { 20317, 0x00008736 }, /* GL_MODELVIEW22_ARB */
-   { 20336, 0x00008737 }, /* GL_MODELVIEW23_ARB */
-   { 20355, 0x00008738 }, /* GL_MODELVIEW24_ARB */
-   { 20374, 0x00008739 }, /* GL_MODELVIEW25_ARB */
-   { 20393, 0x0000873A }, /* GL_MODELVIEW26_ARB */
-   { 20412, 0x0000873B }, /* GL_MODELVIEW27_ARB */
-   { 20431, 0x0000873C }, /* GL_MODELVIEW28_ARB */
-   { 20450, 0x0000873D }, /* GL_MODELVIEW29_ARB */
-   { 20469, 0x00008722 }, /* GL_MODELVIEW2_ARB */
-   { 20487, 0x0000873E }, /* GL_MODELVIEW30_ARB */
-   { 20506, 0x0000873F }, /* GL_MODELVIEW31_ARB */
-   { 20525, 0x00008723 }, /* GL_MODELVIEW3_ARB */
-   { 20543, 0x00008724 }, /* GL_MODELVIEW4_ARB */
-   { 20561, 0x00008725 }, /* GL_MODELVIEW5_ARB */
-   { 20579, 0x00008726 }, /* GL_MODELVIEW6_ARB */
-   { 20597, 0x00008727 }, /* GL_MODELVIEW7_ARB */
-   { 20615, 0x00008728 }, /* GL_MODELVIEW8_ARB */
-   { 20633, 0x00008729 }, /* GL_MODELVIEW9_ARB */
-   { 20651, 0x00000BA6 }, /* GL_MODELVIEW_MATRIX */
-   { 20671, 0x00008629 }, /* GL_MODELVIEW_PROJECTION_NV */
-   { 20698, 0x00000BA3 }, /* GL_MODELVIEW_STACK_DEPTH */
-   { 20723, 0x00002100 }, /* GL_MODULATE */
-   { 20735, 0x00008744 }, /* GL_MODULATE_ADD_ATI */
-   { 20755, 0x00008745 }, /* GL_MODULATE_SIGNED_ADD_ATI */
-   { 20782, 0x00008746 }, /* GL_MODULATE_SUBTRACT_ATI */
-   { 20807, 0x00000103 }, /* GL_MULT */
-   { 20815, 0x0000809D }, /* GL_MULTISAMPLE */
-   { 20830, 0x000086B2 }, /* GL_MULTISAMPLE_3DFX */
-   { 20850, 0x0000809D }, /* GL_MULTISAMPLE_ARB */
-   { 20869, 0x20000000 }, /* GL_MULTISAMPLE_BIT */
-   { 20888, 0x20000000 }, /* GL_MULTISAMPLE_BIT_3DFX */
-   { 20912, 0x20000000 }, /* GL_MULTISAMPLE_BIT_ARB */
-   { 20935, 0x00008534 }, /* GL_MULTISAMPLE_FILTER_HINT_NV */
-   { 20965, 0x00002A25 }, /* GL_N3F_V3F */
-   { 20976, 0x00000D70 }, /* GL_NAME_STACK_DEPTH */
-   { 20996, 0x0000150E }, /* GL_NAND */
-   { 21004, 0x00002600 }, /* GL_NEAREST */
-   { 21015, 0x0000844E }, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
-   { 21046, 0x0000844D }, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
-   { 21078, 0x00002702 }, /* GL_NEAREST_MIPMAP_LINEAR */
-   { 21103, 0x00002700 }, /* GL_NEAREST_MIPMAP_NEAREST */
-   { 21129, 0x00000200 }, /* GL_NEVER */
-   { 21138, 0x00001102 }, /* GL_NICEST */
-   { 21148, 0x00000000 }, /* GL_NONE */
-   { 21156, 0x00001505 }, /* GL_NOOP */
-   { 21164, 0x00001508 }, /* GL_NOR */
-   { 21171, 0x00000BA1 }, /* GL_NORMALIZE */
-   { 21184, 0x00008075 }, /* GL_NORMAL_ARRAY */
-   { 21200, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
-   { 21231, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING_ARB */
-   { 21266, 0x0000808F }, /* GL_NORMAL_ARRAY_POINTER */
-   { 21290, 0x0000807F }, /* GL_NORMAL_ARRAY_STRIDE */
-   { 21313, 0x0000807E }, /* GL_NORMAL_ARRAY_TYPE */
-   { 21334, 0x00008511 }, /* GL_NORMAL_MAP */
-   { 21348, 0x00008511 }, /* GL_NORMAL_MAP_ARB */
-   { 21366, 0x00008511 }, /* GL_NORMAL_MAP_NV */
-   { 21383, 0x00000205 }, /* GL_NOTEQUAL */
-   { 21395, 0x00000000 }, /* GL_NO_ERROR */
-   { 21407, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
-   { 21441, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB */
-   { 21479, 0x00008B89 }, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */
-   { 21511, 0x00008B8A }, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */
-   { 21553, 0x00008B86 }, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */
-   { 21583, 0x00008B87 }, /* GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB */
-   { 21623, 0x00008B85 }, /* GL_OBJECT_ATTACHED_OBJECTS_ARB */
-   { 21654, 0x00008B81 }, /* GL_OBJECT_COMPILE_STATUS_ARB */
-   { 21683, 0x00008B80 }, /* GL_OBJECT_DELETE_STATUS_ARB */
-   { 21711, 0x00008B84 }, /* GL_OBJECT_INFO_LOG_LENGTH_ARB */
-   { 21741, 0x00002401 }, /* GL_OBJECT_LINEAR */
-   { 21758, 0x00008B82 }, /* GL_OBJECT_LINK_STATUS_ARB */
-   { 21784, 0x00002501 }, /* GL_OBJECT_PLANE */
-   { 21800, 0x00008B88 }, /* GL_OBJECT_SHADER_SOURCE_LENGTH_ARB */
-   { 21835, 0x00008B4F }, /* GL_OBJECT_SUBTYPE_ARB */
-   { 21857, 0x00008B4E }, /* GL_OBJECT_TYPE_ARB */
-   { 21876, 0x00008B83 }, /* GL_OBJECT_VALIDATE_STATUS_ARB */
-   { 21906, 0x00008165 }, /* GL_OCCLUSION_TEST_HP */
-   { 21927, 0x00008166 }, /* GL_OCCLUSION_TEST_RESULT_HP */
-   { 21955, 0x00000001 }, /* GL_ONE */
-   { 21962, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA */
-   { 21990, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA_EXT */
-   { 22022, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR */
-   { 22050, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR_EXT */
-   { 22082, 0x00000305 }, /* GL_ONE_MINUS_DST_ALPHA */
-   { 22105, 0x00000307 }, /* GL_ONE_MINUS_DST_COLOR */
-   { 22128, 0x00000303 }, /* GL_ONE_MINUS_SRC_ALPHA */
-   { 22151, 0x00000301 }, /* GL_ONE_MINUS_SRC_COLOR */
-   { 22174, 0x00008598 }, /* GL_OPERAND0_ALPHA */
-   { 22192, 0x00008598 }, /* GL_OPERAND0_ALPHA_ARB */
-   { 22214, 0x00008598 }, /* GL_OPERAND0_ALPHA_EXT */
-   { 22236, 0x00008590 }, /* GL_OPERAND0_RGB */
-   { 22252, 0x00008590 }, /* GL_OPERAND0_RGB_ARB */
-   { 22272, 0x00008590 }, /* GL_OPERAND0_RGB_EXT */
-   { 22292, 0x00008599 }, /* GL_OPERAND1_ALPHA */
-   { 22310, 0x00008599 }, /* GL_OPERAND1_ALPHA_ARB */
-   { 22332, 0x00008599 }, /* GL_OPERAND1_ALPHA_EXT */
-   { 22354, 0x00008591 }, /* GL_OPERAND1_RGB */
-   { 22370, 0x00008591 }, /* GL_OPERAND1_RGB_ARB */
-   { 22390, 0x00008591 }, /* GL_OPERAND1_RGB_EXT */
-   { 22410, 0x0000859A }, /* GL_OPERAND2_ALPHA */
-   { 22428, 0x0000859A }, /* GL_OPERAND2_ALPHA_ARB */
-   { 22450, 0x0000859A }, /* GL_OPERAND2_ALPHA_EXT */
-   { 22472, 0x00008592 }, /* GL_OPERAND2_RGB */
-   { 22488, 0x00008592 }, /* GL_OPERAND2_RGB_ARB */
-   { 22508, 0x00008592 }, /* GL_OPERAND2_RGB_EXT */
-   { 22528, 0x0000859B }, /* GL_OPERAND3_ALPHA_NV */
-   { 22549, 0x00008593 }, /* GL_OPERAND3_RGB_NV */
-   { 22568, 0x00001507 }, /* GL_OR */
-   { 22574, 0x00000A01 }, /* GL_ORDER */
-   { 22583, 0x0000150D }, /* GL_OR_INVERTED */
-   { 22598, 0x0000150B }, /* GL_OR_REVERSE */
-   { 22612, 0x00000505 }, /* GL_OUT_OF_MEMORY */
-   { 22629, 0x00000D05 }, /* GL_PACK_ALIGNMENT */
-   { 22647, 0x0000806C }, /* GL_PACK_IMAGE_HEIGHT */
-   { 22668, 0x00008758 }, /* GL_PACK_INVERT_MESA */
-   { 22688, 0x00000D01 }, /* GL_PACK_LSB_FIRST */
-   { 22706, 0x00000D02 }, /* GL_PACK_ROW_LENGTH */
-   { 22725, 0x0000806B }, /* GL_PACK_SKIP_IMAGES */
-   { 22745, 0x00000D04 }, /* GL_PACK_SKIP_PIXELS */
-   { 22765, 0x00000D03 }, /* GL_PACK_SKIP_ROWS */
-   { 22783, 0x00000D00 }, /* GL_PACK_SWAP_BYTES */
-   { 22802, 0x00008B92 }, /* GL_PALETTE4_R5_G6_B5_OES */
-   { 22827, 0x00008B94 }, /* GL_PALETTE4_RGB5_A1_OES */
-   { 22851, 0x00008B90 }, /* GL_PALETTE4_RGB8_OES */
-   { 22872, 0x00008B93 }, /* GL_PALETTE4_RGBA4_OES */
-   { 22894, 0x00008B91 }, /* GL_PALETTE4_RGBA8_OES */
-   { 22916, 0x00008B97 }, /* GL_PALETTE8_R5_G6_B5_OES */
-   { 22941, 0x00008B99 }, /* GL_PALETTE8_RGB5_A1_OES */
-   { 22965, 0x00008B95 }, /* GL_PALETTE8_RGB8_OES */
-   { 22986, 0x00008B98 }, /* GL_PALETTE8_RGBA4_OES */
-   { 23008, 0x00008B96 }, /* GL_PALETTE8_RGBA8_OES */
-   { 23030, 0x00000700 }, /* GL_PASS_THROUGH_TOKEN */
-   { 23052, 0x00000C50 }, /* GL_PERSPECTIVE_CORRECTION_HINT */
-   { 23083, 0x00000C79 }, /* GL_PIXEL_MAP_A_TO_A */
-   { 23103, 0x00000CB9 }, /* GL_PIXEL_MAP_A_TO_A_SIZE */
-   { 23128, 0x00000C78 }, /* GL_PIXEL_MAP_B_TO_B */
-   { 23148, 0x00000CB8 }, /* GL_PIXEL_MAP_B_TO_B_SIZE */
-   { 23173, 0x00000C77 }, /* GL_PIXEL_MAP_G_TO_G */
-   { 23193, 0x00000CB7 }, /* GL_PIXEL_MAP_G_TO_G_SIZE */
-   { 23218, 0x00000C75 }, /* GL_PIXEL_MAP_I_TO_A */
-   { 23238, 0x00000CB5 }, /* GL_PIXEL_MAP_I_TO_A_SIZE */
-   { 23263, 0x00000C74 }, /* GL_PIXEL_MAP_I_TO_B */
-   { 23283, 0x00000CB4 }, /* GL_PIXEL_MAP_I_TO_B_SIZE */
-   { 23308, 0x00000C73 }, /* GL_PIXEL_MAP_I_TO_G */
-   { 23328, 0x00000CB3 }, /* GL_PIXEL_MAP_I_TO_G_SIZE */
-   { 23353, 0x00000C70 }, /* GL_PIXEL_MAP_I_TO_I */
-   { 23373, 0x00000CB0 }, /* GL_PIXEL_MAP_I_TO_I_SIZE */
-   { 23398, 0x00000C72 }, /* GL_PIXEL_MAP_I_TO_R */
-   { 23418, 0x00000CB2 }, /* GL_PIXEL_MAP_I_TO_R_SIZE */
-   { 23443, 0x00000C76 }, /* GL_PIXEL_MAP_R_TO_R */
-   { 23463, 0x00000CB6 }, /* GL_PIXEL_MAP_R_TO_R_SIZE */
-   { 23488, 0x00000C71 }, /* GL_PIXEL_MAP_S_TO_S */
-   { 23508, 0x00000CB1 }, /* GL_PIXEL_MAP_S_TO_S_SIZE */
-   { 23533, 0x00000020 }, /* GL_PIXEL_MODE_BIT */
-   { 23551, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER */
-   { 23572, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING */
-   { 23601, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING_EXT */
-   { 23634, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER_EXT */
-   { 23659, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER */
-   { 23682, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
-   { 23713, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING_EXT */
-   { 23748, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER_EXT */
-   { 23775, 0x00001B00 }, /* GL_POINT */
-   { 23784, 0x00000000 }, /* GL_POINTS */
-   { 23794, 0x00000002 }, /* GL_POINT_BIT */
-   { 23807, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION */
-   { 23837, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_ARB */
-   { 23871, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_EXT */
-   { 23905, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_SGIS */
-   { 23940, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE */
-   { 23969, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_ARB */
-   { 24002, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_EXT */
-   { 24035, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_SGIS */
-   { 24069, 0x00000B11 }, /* GL_POINT_SIZE */
-   { 24083, 0x00000B13 }, /* GL_POINT_SIZE_GRANULARITY */
-   { 24109, 0x00008127 }, /* GL_POINT_SIZE_MAX */
-   { 24127, 0x00008127 }, /* GL_POINT_SIZE_MAX_ARB */
-   { 24149, 0x00008127 }, /* GL_POINT_SIZE_MAX_EXT */
-   { 24171, 0x00008127 }, /* GL_POINT_SIZE_MAX_SGIS */
-   { 24194, 0x00008126 }, /* GL_POINT_SIZE_MIN */
-   { 24212, 0x00008126 }, /* GL_POINT_SIZE_MIN_ARB */
-   { 24234, 0x00008126 }, /* GL_POINT_SIZE_MIN_EXT */
-   { 24256, 0x00008126 }, /* GL_POINT_SIZE_MIN_SGIS */
-   { 24279, 0x00000B12 }, /* GL_POINT_SIZE_RANGE */
-   { 24299, 0x00000B10 }, /* GL_POINT_SMOOTH */
-   { 24315, 0x00000C51 }, /* GL_POINT_SMOOTH_HINT */
-   { 24336, 0x00008861 }, /* GL_POINT_SPRITE */
-   { 24352, 0x00008861 }, /* GL_POINT_SPRITE_ARB */
-   { 24372, 0x00008CA0 }, /* GL_POINT_SPRITE_COORD_ORIGIN */
-   { 24401, 0x00008861 }, /* GL_POINT_SPRITE_NV */
-   { 24420, 0x00008863 }, /* GL_POINT_SPRITE_R_MODE_NV */
-   { 24446, 0x00000701 }, /* GL_POINT_TOKEN */
-   { 24461, 0x00000009 }, /* GL_POLYGON */
-   { 24472, 0x00000008 }, /* GL_POLYGON_BIT */
-   { 24487, 0x00000B40 }, /* GL_POLYGON_MODE */
-   { 24503, 0x00008039 }, /* GL_POLYGON_OFFSET_BIAS */
-   { 24526, 0x00008038 }, /* GL_POLYGON_OFFSET_FACTOR */
-   { 24551, 0x00008037 }, /* GL_POLYGON_OFFSET_FILL */
-   { 24574, 0x00002A02 }, /* GL_POLYGON_OFFSET_LINE */
-   { 24597, 0x00002A01 }, /* GL_POLYGON_OFFSET_POINT */
-   { 24621, 0x00002A00 }, /* GL_POLYGON_OFFSET_UNITS */
-   { 24645, 0x00000B41 }, /* GL_POLYGON_SMOOTH */
-   { 24663, 0x00000C53 }, /* GL_POLYGON_SMOOTH_HINT */
-   { 24686, 0x00000B42 }, /* GL_POLYGON_STIPPLE */
-   { 24705, 0x00000010 }, /* GL_POLYGON_STIPPLE_BIT */
-   { 24728, 0x00000703 }, /* GL_POLYGON_TOKEN */
-   { 24745, 0x00001203 }, /* GL_POSITION */
-   { 24757, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
-   { 24789, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI */
-   { 24825, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
-   { 24858, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI */
-   { 24895, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
-   { 24926, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI */
-   { 24961, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
-   { 24993, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI */
-   { 25029, 0x000080D2 }, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
-   { 25062, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
-   { 25094, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI */
-   { 25130, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
-   { 25163, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI */
-   { 25200, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS */
-   { 25230, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS_SGI */
-   { 25264, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE */
-   { 25295, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE_SGI */
-   { 25330, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
-   { 25361, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS_EXT */
-   { 25396, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
-   { 25428, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE_EXT */
-   { 25464, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS */
-   { 25494, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS_EXT */
-   { 25528, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE */
-   { 25559, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE_EXT */
-   { 25594, 0x000080D1 }, /* GL_POST_CONVOLUTION_COLOR_TABLE */
-   { 25626, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS */
-   { 25657, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS_EXT */
-   { 25692, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE */
-   { 25724, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE_EXT */
-   { 25760, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS */
-   { 25789, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS_EXT */
-   { 25822, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE */
-   { 25852, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE_EXT */
-   { 25886, 0x0000817B }, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
-   { 25925, 0x00008179 }, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
-   { 25958, 0x0000817C }, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
-   { 25998, 0x0000817A }, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
-   { 26032, 0x00008578 }, /* GL_PREVIOUS */
-   { 26044, 0x00008578 }, /* GL_PREVIOUS_ARB */
-   { 26060, 0x00008578 }, /* GL_PREVIOUS_EXT */
-   { 26076, 0x00008577 }, /* GL_PRIMARY_COLOR */
-   { 26093, 0x00008577 }, /* GL_PRIMARY_COLOR_ARB */
-   { 26114, 0x00008577 }, /* GL_PRIMARY_COLOR_EXT */
-   { 26135, 0x000088B0 }, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
-   { 26168, 0x00008805 }, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
-   { 26200, 0x000088AC }, /* GL_PROGRAM_ATTRIBS_ARB */
-   { 26223, 0x00008677 }, /* GL_PROGRAM_BINDING_ARB */
-   { 26246, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_ARB */
-   { 26276, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_NV */
-   { 26305, 0x00008874 }, /* GL_PROGRAM_ERROR_STRING_ARB */
-   { 26333, 0x00008876 }, /* GL_PROGRAM_FORMAT_ARB */
-   { 26355, 0x00008875 }, /* GL_PROGRAM_FORMAT_ASCII_ARB */
-   { 26383, 0x000088A0 }, /* GL_PROGRAM_INSTRUCTIONS_ARB */
-   { 26411, 0x00008627 }, /* GL_PROGRAM_LENGTH_ARB */
-   { 26433, 0x00008627 }, /* GL_PROGRAM_LENGTH_NV */
-   { 26454, 0x000088B2 }, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-   { 26494, 0x00008808 }, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-   { 26533, 0x000088AE }, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
-   { 26563, 0x000088A2 }, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-   { 26598, 0x000088AA }, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
-   { 26631, 0x000088A6 }, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
-   { 26665, 0x0000880A }, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-   { 26704, 0x00008809 }, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-   { 26743, 0x00008B40 }, /* GL_PROGRAM_OBJECT_ARB */
-   { 26765, 0x000088A8 }, /* GL_PROGRAM_PARAMETERS_ARB */
-   { 26791, 0x00008644 }, /* GL_PROGRAM_PARAMETER_NV */
-   { 26815, 0x00008647 }, /* GL_PROGRAM_RESIDENT_NV */
-   { 26838, 0x00008628 }, /* GL_PROGRAM_STRING_ARB */
-   { 26860, 0x00008628 }, /* GL_PROGRAM_STRING_NV */
-   { 26881, 0x00008646 }, /* GL_PROGRAM_TARGET_NV */
-   { 26902, 0x000088A4 }, /* GL_PROGRAM_TEMPORARIES_ARB */
-   { 26929, 0x00008807 }, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
-   { 26961, 0x00008806 }, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
-   { 26993, 0x000088B6 }, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-   { 27028, 0x00001701 }, /* GL_PROJECTION */
-   { 27042, 0x00000BA7 }, /* GL_PROJECTION_MATRIX */
-   { 27063, 0x00000BA4 }, /* GL_PROJECTION_STACK_DEPTH */
-   { 27089, 0x000080D3 }, /* GL_PROXY_COLOR_TABLE */
-   { 27110, 0x00008025 }, /* GL_PROXY_HISTOGRAM */
-   { 27129, 0x00008025 }, /* GL_PROXY_HISTOGRAM_EXT */
-   { 27152, 0x000080D5 }, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
-   { 27191, 0x000080D4 }, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
-   { 27229, 0x00008063 }, /* GL_PROXY_TEXTURE_1D */
-   { 27249, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
-   { 27279, 0x00008063 }, /* GL_PROXY_TEXTURE_1D_EXT */
-   { 27303, 0x00008064 }, /* GL_PROXY_TEXTURE_2D */
-   { 27323, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
-   { 27353, 0x00008064 }, /* GL_PROXY_TEXTURE_2D_EXT */
-   { 27377, 0x00008070 }, /* GL_PROXY_TEXTURE_3D */
-   { 27397, 0x000080BD }, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
-   { 27430, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP */
-   { 27456, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP_ARB */
-   { 27486, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
-   { 27517, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_NV */
-   { 27547, 0x00002003 }, /* GL_Q */
-   { 27552, 0x00001209 }, /* GL_QUADRATIC_ATTENUATION */
-   { 27577, 0x00000007 }, /* GL_QUADS */
-   { 27586, 0x00008614 }, /* GL_QUAD_MESH_SUN */
-   { 27603, 0x00000008 }, /* GL_QUAD_STRIP */
-   { 27617, 0x00008864 }, /* GL_QUERY_COUNTER_BITS */
-   { 27639, 0x00008864 }, /* GL_QUERY_COUNTER_BITS_ARB */
-   { 27665, 0x00008866 }, /* GL_QUERY_RESULT */
-   { 27681, 0x00008866 }, /* GL_QUERY_RESULT_ARB */
-   { 27701, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE */
-   { 27727, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE_ARB */
-   { 27757, 0x00002002 }, /* GL_R */
-   { 27762, 0x00002A10 }, /* GL_R3_G3_B2 */
-   { 27774, 0x00019262 }, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
-   { 27807, 0x00000C02 }, /* GL_READ_BUFFER */
-   { 27822, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER */
-   { 27842, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
-   { 27874, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER_EXT */
-   { 27898, 0x000088B8 }, /* GL_READ_ONLY */
-   { 27911, 0x000088B8 }, /* GL_READ_ONLY_ARB */
-   { 27928, 0x000088BA }, /* GL_READ_WRITE */
-   { 27942, 0x000088BA }, /* GL_READ_WRITE_ARB */
-   { 27960, 0x00001903 }, /* GL_RED */
-   { 27967, 0x00008016 }, /* GL_REDUCE */
-   { 27977, 0x00008016 }, /* GL_REDUCE_EXT */
-   { 27991, 0x00000D15 }, /* GL_RED_BIAS */
-   { 28003, 0x00000D52 }, /* GL_RED_BITS */
-   { 28015, 0x00000D14 }, /* GL_RED_SCALE */
-   { 28028, 0x00008512 }, /* GL_REFLECTION_MAP */
-   { 28046, 0x00008512 }, /* GL_REFLECTION_MAP_ARB */
-   { 28068, 0x00008512 }, /* GL_REFLECTION_MAP_NV */
-   { 28089, 0x00001C00 }, /* GL_RENDER */
-   { 28099, 0x00008D41 }, /* GL_RENDERBUFFER */
-   { 28115, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE */
-   { 28142, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_EXT */
-   { 28170, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE */
-   { 28196, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE */
-   { 28223, 0x00008D41 }, /* GL_RENDERBUFFER_EXT */
-   { 28243, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE */
-   { 28270, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT */
-   { 28293, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_EXT */
-   { 28320, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
-   { 28352, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */
-   { 28388, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE */
-   { 28413, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES */
-   { 28437, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE */
-   { 28466, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH */
-   { 28488, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_EXT */
-   { 28514, 0x00001F01 }, /* GL_RENDERER */
-   { 28526, 0x00000C40 }, /* GL_RENDER_MODE */
-   { 28541, 0x00002901 }, /* GL_REPEAT */
-   { 28551, 0x00001E01 }, /* GL_REPLACE */
-   { 28562, 0x00008062 }, /* GL_REPLACE_EXT */
-   { 28577, 0x00008153 }, /* GL_REPLICATE_BORDER_HP */
-   { 28600, 0x0000803A }, /* GL_RESCALE_NORMAL */
-   { 28618, 0x0000803A }, /* GL_RESCALE_NORMAL_EXT */
-   { 28640, 0x00000102 }, /* GL_RETURN */
-   { 28650, 0x00001907 }, /* GL_RGB */
-   { 28657, 0x00008052 }, /* GL_RGB10 */
-   { 28666, 0x00008059 }, /* GL_RGB10_A2 */
-   { 28678, 0x00008059 }, /* GL_RGB10_A2_EXT */
-   { 28694, 0x00008052 }, /* GL_RGB10_EXT */
-   { 28707, 0x00008053 }, /* GL_RGB12 */
-   { 28716, 0x00008053 }, /* GL_RGB12_EXT */
-   { 28729, 0x00008054 }, /* GL_RGB16 */
-   { 28738, 0x00008054 }, /* GL_RGB16_EXT */
-   { 28751, 0x0000804E }, /* GL_RGB2_EXT */
-   { 28763, 0x0000804F }, /* GL_RGB4 */
-   { 28771, 0x0000804F }, /* GL_RGB4_EXT */
-   { 28783, 0x000083A1 }, /* GL_RGB4_S3TC */
-   { 28796, 0x00008050 }, /* GL_RGB5 */
-   { 28804, 0x00008057 }, /* GL_RGB5_A1 */
-   { 28815, 0x00008057 }, /* GL_RGB5_A1_EXT */
-   { 28830, 0x00008050 }, /* GL_RGB5_EXT */
-   { 28842, 0x00008051 }, /* GL_RGB8 */
-   { 28850, 0x00008051 }, /* GL_RGB8_EXT */
-   { 28862, 0x00001908 }, /* GL_RGBA */
-   { 28870, 0x0000805A }, /* GL_RGBA12 */
-   { 28880, 0x0000805A }, /* GL_RGBA12_EXT */
-   { 28894, 0x0000805B }, /* GL_RGBA16 */
-   { 28904, 0x0000805B }, /* GL_RGBA16_EXT */
-   { 28918, 0x00008055 }, /* GL_RGBA2 */
-   { 28927, 0x00008055 }, /* GL_RGBA2_EXT */
-   { 28940, 0x00008056 }, /* GL_RGBA4 */
-   { 28949, 0x000083A5 }, /* GL_RGBA4_DXT5_S3TC */
-   { 28968, 0x00008056 }, /* GL_RGBA4_EXT */
-   { 28981, 0x000083A3 }, /* GL_RGBA4_S3TC */
-   { 28995, 0x00008058 }, /* GL_RGBA8 */
-   { 29004, 0x00008058 }, /* GL_RGBA8_EXT */
-   { 29017, 0x00008F97 }, /* GL_RGBA8_SNORM */
-   { 29032, 0x000083A4 }, /* GL_RGBA_DXT5_S3TC */
-   { 29050, 0x00000C31 }, /* GL_RGBA_MODE */
-   { 29063, 0x000083A2 }, /* GL_RGBA_S3TC */
-   { 29076, 0x00008F93 }, /* GL_RGBA_SNORM */
-   { 29090, 0x000083A0 }, /* GL_RGB_S3TC */
-   { 29102, 0x00008573 }, /* GL_RGB_SCALE */
-   { 29115, 0x00008573 }, /* GL_RGB_SCALE_ARB */
-   { 29132, 0x00008573 }, /* GL_RGB_SCALE_EXT */
-   { 29149, 0x00000407 }, /* GL_RIGHT */
-   { 29158, 0x00002000 }, /* GL_S */
-   { 29163, 0x00008B5D }, /* GL_SAMPLER_1D */
-   { 29177, 0x00008B61 }, /* GL_SAMPLER_1D_SHADOW */
-   { 29198, 0x00008B5E }, /* GL_SAMPLER_2D */
-   { 29212, 0x00008B62 }, /* GL_SAMPLER_2D_SHADOW */
-   { 29233, 0x00008B5F }, /* GL_SAMPLER_3D */
-   { 29247, 0x00008B60 }, /* GL_SAMPLER_CUBE */
-   { 29263, 0x000080A9 }, /* GL_SAMPLES */
-   { 29274, 0x000086B4 }, /* GL_SAMPLES_3DFX */
-   { 29290, 0x000080A9 }, /* GL_SAMPLES_ARB */
-   { 29305, 0x00008914 }, /* GL_SAMPLES_PASSED */
-   { 29323, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */
-   { 29345, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
-   { 29373, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */
-   { 29405, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */
-   { 29428, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */
-   { 29455, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */
-   { 29473, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */
-   { 29496, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */
-   { 29518, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */
-   { 29537, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */
-   { 29560, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */
-   { 29586, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */
-   { 29616, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */
-   { 29641, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */
-   { 29670, 0x00080000 }, /* GL_SCISSOR_BIT */
-   { 29685, 0x00000C10 }, /* GL_SCISSOR_BOX */
-   { 29700, 0x00000C11 }, /* GL_SCISSOR_TEST */
-   { 29716, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */
-   { 29741, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
-   { 29781, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */
-   { 29825, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
-   { 29858, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
-   { 29888, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
-   { 29920, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
-   { 29950, 0x00001C02 }, /* GL_SELECT */
-   { 29960, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */
-   { 29988, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */
-   { 30013, 0x00008012 }, /* GL_SEPARABLE_2D */
-   { 30029, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */
-   { 30056, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */
-   { 30087, 0x0000150F }, /* GL_SET */
-   { 30094, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */
-   { 30115, 0x00008B88 }, /* GL_SHADER_SOURCE_LENGTH */
-   { 30139, 0x00008B4F }, /* GL_SHADER_TYPE */
-   { 30154, 0x00000B54 }, /* GL_SHADE_MODEL */
-   { 30169, 0x00008B8C }, /* GL_SHADING_LANGUAGE_VERSION */
-   { 30197, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */
-   { 30220, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */
-   { 30250, 0x00001601 }, /* GL_SHININESS */
-   { 30263, 0x00001402 }, /* GL_SHORT */
-   { 30272, 0x00008F9C }, /* GL_SIGNED_NORMALIZED */
-   { 30293, 0x000081F9 }, /* GL_SINGLE_COLOR */
-   { 30309, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */
-   { 30329, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */
-   { 30348, 0x00008C46 }, /* GL_SLUMINANCE */
-   { 30362, 0x00008C47 }, /* GL_SLUMINANCE8 */
-   { 30377, 0x00008C45 }, /* GL_SLUMINANCE8_ALPHA8 */
-   { 30399, 0x00008C44 }, /* GL_SLUMINANCE_ALPHA */
-   { 30419, 0x00001D01 }, /* GL_SMOOTH */
-   { 30429, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */
-   { 30462, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */
-   { 30489, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */
-   { 30522, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */
-   { 30549, 0x00008588 }, /* GL_SOURCE0_ALPHA */
-   { 30566, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */
-   { 30587, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */
-   { 30608, 0x00008580 }, /* GL_SOURCE0_RGB */
-   { 30623, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */
-   { 30642, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */
-   { 30661, 0x00008589 }, /* GL_SOURCE1_ALPHA */
-   { 30678, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */
-   { 30699, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */
-   { 30720, 0x00008581 }, /* GL_SOURCE1_RGB */
-   { 30735, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */
-   { 30754, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */
-   { 30773, 0x0000858A }, /* GL_SOURCE2_ALPHA */
-   { 30790, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */
-   { 30811, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */
-   { 30832, 0x00008582 }, /* GL_SOURCE2_RGB */
-   { 30847, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */
-   { 30866, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */
-   { 30885, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */
-   { 30905, 0x00008583 }, /* GL_SOURCE3_RGB_NV */
-   { 30923, 0x00001202 }, /* GL_SPECULAR */
-   { 30935, 0x00002402 }, /* GL_SPHERE_MAP */
-   { 30949, 0x00001206 }, /* GL_SPOT_CUTOFF */
-   { 30964, 0x00001204 }, /* GL_SPOT_DIRECTION */
-   { 30982, 0x00001205 }, /* GL_SPOT_EXPONENT */
-   { 30999, 0x00008588 }, /* GL_SRC0_ALPHA */
-   { 31013, 0x00008580 }, /* GL_SRC0_RGB */
-   { 31025, 0x00008589 }, /* GL_SRC1_ALPHA */
-   { 31039, 0x00008581 }, /* GL_SRC1_RGB */
-   { 31051, 0x0000858A }, /* GL_SRC2_ALPHA */
-   { 31065, 0x00008582 }, /* GL_SRC2_RGB */
-   { 31077, 0x00000302 }, /* GL_SRC_ALPHA */
-   { 31090, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */
-   { 31112, 0x00000300 }, /* GL_SRC_COLOR */
-   { 31125, 0x00008C40 }, /* GL_SRGB */
-   { 31133, 0x00008C41 }, /* GL_SRGB8 */
-   { 31142, 0x00008C43 }, /* GL_SRGB8_ALPHA8 */
-   { 31158, 0x00008C42 }, /* GL_SRGB_ALPHA */
-   { 31172, 0x00000503 }, /* GL_STACK_OVERFLOW */
-   { 31190, 0x00000504 }, /* GL_STACK_UNDERFLOW */
-   { 31209, 0x000088E6 }, /* GL_STATIC_COPY */
-   { 31224, 0x000088E6 }, /* GL_STATIC_COPY_ARB */
-   { 31243, 0x000088E4 }, /* GL_STATIC_DRAW */
-   { 31258, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */
-   { 31277, 0x000088E5 }, /* GL_STATIC_READ */
-   { 31292, 0x000088E5 }, /* GL_STATIC_READ_ARB */
-   { 31311, 0x00001802 }, /* GL_STENCIL */
-   { 31322, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT */
-   { 31344, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */
-   { 31370, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */
-   { 31391, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */
-   { 31416, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
-   { 31437, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */
-   { 31462, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-   { 31494, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */
-   { 31530, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
-   { 31562, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */
-   { 31598, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
-   { 31618, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
-   { 31645, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
-   { 31671, 0x00000D57 }, /* GL_STENCIL_BITS */
-   { 31687, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
-   { 31709, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
-   { 31732, 0x00000B94 }, /* GL_STENCIL_FAIL */
-   { 31748, 0x00000B92 }, /* GL_STENCIL_FUNC */
-   { 31764, 0x00001901 }, /* GL_STENCIL_INDEX */
-   { 31781, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
-   { 31804, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
-   { 31826, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
-   { 31848, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
-   { 31870, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
-   { 31891, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
-   { 31918, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
-   { 31945, 0x00000B97 }, /* GL_STENCIL_REF */
-   { 31960, 0x00000B90 }, /* GL_STENCIL_TEST */
-   { 31976, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
-   { 32005, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
-   { 32027, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
-   { 32048, 0x00000C33 }, /* GL_STEREO */
-   { 32058, 0x000088E2 }, /* GL_STREAM_COPY */
-   { 32073, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
-   { 32092, 0x000088E0 }, /* GL_STREAM_DRAW */
-   { 32107, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
-   { 32126, 0x000088E1 }, /* GL_STREAM_READ */
-   { 32141, 0x000088E1 }, /* GL_STREAM_READ_ARB */
-   { 32160, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
-   { 32177, 0x000084E7 }, /* GL_SUBTRACT */
-   { 32189, 0x000084E7 }, /* GL_SUBTRACT_ARB */
-   { 32205, 0x00002001 }, /* GL_T */
-   { 32210, 0x00002A2A }, /* GL_T2F_C3F_V3F */
-   { 32225, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
-   { 32244, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
-   { 32260, 0x00002A2B }, /* GL_T2F_N3F_V3F */
-   { 32275, 0x00002A27 }, /* GL_T2F_V3F */
-   { 32286, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
-   { 32305, 0x00002A28 }, /* GL_T4F_V4F */
-   { 32316, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
-   { 32339, 0x00001702 }, /* GL_TEXTURE */
-   { 32350, 0x000084C0 }, /* GL_TEXTURE0 */
-   { 32362, 0x000084C0 }, /* GL_TEXTURE0_ARB */
-   { 32378, 0x000084C1 }, /* GL_TEXTURE1 */
-   { 32390, 0x000084CA }, /* GL_TEXTURE10 */
-   { 32403, 0x000084CA }, /* GL_TEXTURE10_ARB */
-   { 32420, 0x000084CB }, /* GL_TEXTURE11 */
-   { 32433, 0x000084CB }, /* GL_TEXTURE11_ARB */
-   { 32450, 0x000084CC }, /* GL_TEXTURE12 */
-   { 32463, 0x000084CC }, /* GL_TEXTURE12_ARB */
-   { 32480, 0x000084CD }, /* GL_TEXTURE13 */
-   { 32493, 0x000084CD }, /* GL_TEXTURE13_ARB */
-   { 32510, 0x000084CE }, /* GL_TEXTURE14 */
-   { 32523, 0x000084CE }, /* GL_TEXTURE14_ARB */
-   { 32540, 0x000084CF }, /* GL_TEXTURE15 */
-   { 32553, 0x000084CF }, /* GL_TEXTURE15_ARB */
-   { 32570, 0x000084D0 }, /* GL_TEXTURE16 */
-   { 32583, 0x000084D0 }, /* GL_TEXTURE16_ARB */
-   { 32600, 0x000084D1 }, /* GL_TEXTURE17 */
-   { 32613, 0x000084D1 }, /* GL_TEXTURE17_ARB */
-   { 32630, 0x000084D2 }, /* GL_TEXTURE18 */
-   { 32643, 0x000084D2 }, /* GL_TEXTURE18_ARB */
-   { 32660, 0x000084D3 }, /* GL_TEXTURE19 */
-   { 32673, 0x000084D3 }, /* GL_TEXTURE19_ARB */
-   { 32690, 0x000084C1 }, /* GL_TEXTURE1_ARB */
-   { 32706, 0x000084C2 }, /* GL_TEXTURE2 */
-   { 32718, 0x000084D4 }, /* GL_TEXTURE20 */
-   { 32731, 0x000084D4 }, /* GL_TEXTURE20_ARB */
-   { 32748, 0x000084D5 }, /* GL_TEXTURE21 */
-   { 32761, 0x000084D5 }, /* GL_TEXTURE21_ARB */
-   { 32778, 0x000084D6 }, /* GL_TEXTURE22 */
-   { 32791, 0x000084D6 }, /* GL_TEXTURE22_ARB */
-   { 32808, 0x000084D7 }, /* GL_TEXTURE23 */
-   { 32821, 0x000084D7 }, /* GL_TEXTURE23_ARB */
-   { 32838, 0x000084D8 }, /* GL_TEXTURE24 */
-   { 32851, 0x000084D8 }, /* GL_TEXTURE24_ARB */
-   { 32868, 0x000084D9 }, /* GL_TEXTURE25 */
-   { 32881, 0x000084D9 }, /* GL_TEXTURE25_ARB */
-   { 32898, 0x000084DA }, /* GL_TEXTURE26 */
-   { 32911, 0x000084DA }, /* GL_TEXTURE26_ARB */
-   { 32928, 0x000084DB }, /* GL_TEXTURE27 */
-   { 32941, 0x000084DB }, /* GL_TEXTURE27_ARB */
-   { 32958, 0x000084DC }, /* GL_TEXTURE28 */
-   { 32971, 0x000084DC }, /* GL_TEXTURE28_ARB */
-   { 32988, 0x000084DD }, /* GL_TEXTURE29 */
-   { 33001, 0x000084DD }, /* GL_TEXTURE29_ARB */
-   { 33018, 0x000084C2 }, /* GL_TEXTURE2_ARB */
-   { 33034, 0x000084C3 }, /* GL_TEXTURE3 */
-   { 33046, 0x000084DE }, /* GL_TEXTURE30 */
-   { 33059, 0x000084DE }, /* GL_TEXTURE30_ARB */
-   { 33076, 0x000084DF }, /* GL_TEXTURE31 */
-   { 33089, 0x000084DF }, /* GL_TEXTURE31_ARB */
-   { 33106, 0x000084C3 }, /* GL_TEXTURE3_ARB */
-   { 33122, 0x000084C4 }, /* GL_TEXTURE4 */
-   { 33134, 0x000084C4 }, /* GL_TEXTURE4_ARB */
-   { 33150, 0x000084C5 }, /* GL_TEXTURE5 */
-   { 33162, 0x000084C5 }, /* GL_TEXTURE5_ARB */
-   { 33178, 0x000084C6 }, /* GL_TEXTURE6 */
-   { 33190, 0x000084C6 }, /* GL_TEXTURE6_ARB */
-   { 33206, 0x000084C7 }, /* GL_TEXTURE7 */
-   { 33218, 0x000084C7 }, /* GL_TEXTURE7_ARB */
-   { 33234, 0x000084C8 }, /* GL_TEXTURE8 */
-   { 33246, 0x000084C8 }, /* GL_TEXTURE8_ARB */
-   { 33262, 0x000084C9 }, /* GL_TEXTURE9 */
-   { 33274, 0x000084C9 }, /* GL_TEXTURE9_ARB */
-   { 33290, 0x00000DE0 }, /* GL_TEXTURE_1D */
-   { 33304, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
-   { 33328, 0x00000DE1 }, /* GL_TEXTURE_2D */
-   { 33342, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
-   { 33366, 0x0000806F }, /* GL_TEXTURE_3D */
-   { 33380, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
-   { 33402, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
-   { 33428, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
-   { 33450, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
-   { 33472, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
-   { 33504, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
-   { 33526, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
-   { 33558, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
-   { 33580, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
-   { 33608, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
-   { 33640, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
-   { 33673, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
-   { 33705, 0x00040000 }, /* GL_TEXTURE_BIT */
-   { 33720, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
-   { 33741, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
-   { 33766, 0x00001005 }, /* GL_TEXTURE_BORDER */
-   { 33784, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
-   { 33808, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-   { 33839, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
-   { 33869, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-   { 33899, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-   { 33934, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-   { 33965, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-   { 34003, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
-   { 34030, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
-   { 34062, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
-   { 34096, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
-   { 34120, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
-   { 34148, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
-   { 34172, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
-   { 34200, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-   { 34233, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
-   { 34257, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
-   { 34279, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
-   { 34301, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
-   { 34327, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
-   { 34361, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-   { 34394, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
-   { 34431, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
-   { 34459, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
-   { 34491, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
-   { 34514, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
-   { 34552, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
-   { 34594, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
-   { 34625, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-   { 34653, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
-   { 34683, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-   { 34711, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
-   { 34731, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
-   { 34755, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-   { 34786, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
-   { 34821, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-   { 34852, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
-   { 34887, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
-   { 34918, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
-   { 34953, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-   { 34984, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
-   { 35019, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-   { 35050, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
-   { 35085, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-   { 35116, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
-   { 35151, 0x00008071 }, /* GL_TEXTURE_DEPTH */
-   { 35168, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
-   { 35190, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
-   { 35216, 0x00002300 }, /* GL_TEXTURE_ENV */
-   { 35231, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
-   { 35252, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
-   { 35272, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
-   { 35298, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
-   { 35318, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
-   { 35335, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
-   { 35352, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
-   { 35369, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
-   { 35386, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
-   { 35411, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
-   { 35433, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
-   { 35459, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
-   { 35477, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
-   { 35503, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
-   { 35529, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
-   { 35559, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
-   { 35586, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
-   { 35611, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
-   { 35631, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
-   { 35655, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
-   { 35682, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-   { 35709, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-   { 35736, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
-   { 35762, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
-   { 35792, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
-   { 35814, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
-   { 35832, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
-   { 35862, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
-   { 35890, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-   { 35918, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-   { 35946, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
-   { 35967, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
-   { 35986, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
-   { 36008, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
-   { 36027, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
-   { 36047, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
-   { 36072, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
-   { 36096, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
-   { 36116, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
-   { 36140, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
-   { 36160, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
-   { 36183, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */
-   { 36207, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
-   { 36232, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
-   { 36266, 0x00001000 }, /* GL_TEXTURE_WIDTH */
-   { 36283, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
-   { 36301, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
-   { 36319, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
-   { 36337, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
-   { 36357, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
-   { 36376, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-   { 36405, 0x00001000 }, /* GL_TRANSFORM_BIT */
-   { 36422, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
-   { 36448, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
-   { 36478, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-   { 36510, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-   { 36540, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
-   { 36574, 0x0000862C }, /* GL_TRANSPOSE_NV */
-   { 36590, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-   { 36621, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
-   { 36656, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-   { 36684, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
-   { 36716, 0x00000004 }, /* GL_TRIANGLES */
-   { 36729, 0x00000006 }, /* GL_TRIANGLE_FAN */
-   { 36745, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
-   { 36766, 0x00000005 }, /* GL_TRIANGLE_STRIP */
-   { 36784, 0x00000001 }, /* GL_TRUE */
-   { 36792, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
-   { 36812, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
-   { 36835, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
-   { 36855, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
-   { 36876, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
-   { 36898, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
-   { 36920, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
-   { 36940, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
-   { 36961, 0x00001401 }, /* GL_UNSIGNED_BYTE */
-   { 36978, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-   { 37005, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
-   { 37028, 0x00001405 }, /* GL_UNSIGNED_INT */
-   { 37044, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
-   { 37071, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */
-   { 37092, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
-   { 37116, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-   { 37147, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
-   { 37171, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-   { 37199, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */
-   { 37222, 0x00001403 }, /* GL_UNSIGNED_SHORT */
-   { 37240, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-   { 37270, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-   { 37296, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-   { 37326, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-   { 37352, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
-   { 37376, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-   { 37404, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-   { 37432, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
-   { 37459, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-   { 37491, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
-   { 37522, 0x00008CA2 }, /* GL_UPPER_LEFT */
-   { 37536, 0x00002A20 }, /* GL_V2F */
-   { 37543, 0x00002A21 }, /* GL_V3F */
-   { 37550, 0x00008B83 }, /* GL_VALIDATE_STATUS */
-   { 37569, 0x00001F00 }, /* GL_VENDOR */
-   { 37579, 0x00001F02 }, /* GL_VERSION */
-   { 37590, 0x00008074 }, /* GL_VERTEX_ARRAY */
-   { 37606, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
-   { 37636, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-   { 37667, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
-   { 37702, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
-   { 37726, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
-   { 37747, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
-   { 37770, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
-   { 37791, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-   { 37818, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-   { 37846, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-   { 37874, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-   { 37902, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-   { 37930, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-   { 37958, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
-   { 37986, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-   { 38013, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-   { 38040, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-   { 38067, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-   { 38094, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-   { 38121, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-   { 38148, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-   { 38175, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-   { 38202, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-   { 38229, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-   { 38267, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
-   { 38309, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-   { 38340, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
-   { 38375, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
-   { 38409, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
-   { 38447, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-   { 38478, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
-   { 38513, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-   { 38541, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
-   { 38573, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-   { 38603, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
-   { 38637, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
-   { 38665, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
-   { 38697, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
-   { 38717, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
-   { 38739, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
-   { 38768, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
-   { 38789, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-   { 38818, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
-   { 38851, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
-   { 38883, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-   { 38910, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
-   { 38941, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
-   { 38971, 0x00008B31 }, /* GL_VERTEX_SHADER */
-   { 38988, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
-   { 39009, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
-   { 39036, 0x00000BA2 }, /* GL_VIEWPORT */
-   { 39048, 0x00000800 }, /* GL_VIEWPORT_BIT */
-   { 39064, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
-   { 39084, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-   { 39115, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
-   { 39150, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-   { 39178, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-   { 39203, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-   { 39230, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-   { 39255, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
-   { 39279, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
-   { 39298, 0x000088B9 }, /* GL_WRITE_ONLY */
-   { 39312, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
-   { 39330, 0x00001506 }, /* GL_XOR */
-   { 39337, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
-   { 39356, 0x00008757 }, /* GL_YCBCR_MESA */
-   { 39370, 0x00000000 }, /* GL_ZERO */
-   { 39378, 0x00000D16 }, /* GL_ZOOM_X */
-   { 39388, 0x00000D17 }, /* GL_ZOOM_Y */
+   {  9562, 0x00008E4D }, /* GL_FIRST_VERTEX_CONVENTION_EXT */
+   {  9593, 0x00001D00 }, /* GL_FLAT */
+   {  9601, 0x00001406 }, /* GL_FLOAT */
+   {  9610, 0x00008B5A }, /* GL_FLOAT_MAT2 */
+   {  9624, 0x00008B5A }, /* GL_FLOAT_MAT2_ARB */
+   {  9642, 0x00008B65 }, /* GL_FLOAT_MAT2x3 */
+   {  9658, 0x00008B66 }, /* GL_FLOAT_MAT2x4 */
+   {  9674, 0x00008B5B }, /* GL_FLOAT_MAT3 */
+   {  9688, 0x00008B5B }, /* GL_FLOAT_MAT3_ARB */
+   {  9706, 0x00008B67 }, /* GL_FLOAT_MAT3x2 */
+   {  9722, 0x00008B68 }, /* GL_FLOAT_MAT3x4 */
+   {  9738, 0x00008B5C }, /* GL_FLOAT_MAT4 */
+   {  9752, 0x00008B5C }, /* GL_FLOAT_MAT4_ARB */
+   {  9770, 0x00008B69 }, /* GL_FLOAT_MAT4x2 */
+   {  9786, 0x00008B6A }, /* GL_FLOAT_MAT4x3 */
+   {  9802, 0x00008B50 }, /* GL_FLOAT_VEC2 */
+   {  9816, 0x00008B50 }, /* GL_FLOAT_VEC2_ARB */
+   {  9834, 0x00008B51 }, /* GL_FLOAT_VEC3 */
+   {  9848, 0x00008B51 }, /* GL_FLOAT_VEC3_ARB */
+   {  9866, 0x00008B52 }, /* GL_FLOAT_VEC4 */
+   {  9880, 0x00008B52 }, /* GL_FLOAT_VEC4_ARB */
+   {  9898, 0x00000B60 }, /* GL_FOG */
+   {  9905, 0x00000080 }, /* GL_FOG_BIT */
+   {  9916, 0x00000B66 }, /* GL_FOG_COLOR */
+   {  9929, 0x00008451 }, /* GL_FOG_COORD */
+   {  9942, 0x00008451 }, /* GL_FOG_COORDINATE */
+   {  9960, 0x00008457 }, /* GL_FOG_COORDINATE_ARRAY */
+   {  9984, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
+   { 10023, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB */
+   { 10066, 0x00008456 }, /* GL_FOG_COORDINATE_ARRAY_POINTER */
+   { 10098, 0x00008455 }, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
+   { 10129, 0x00008454 }, /* GL_FOG_COORDINATE_ARRAY_TYPE */
+   { 10158, 0x00008450 }, /* GL_FOG_COORDINATE_SOURCE */
+   { 10183, 0x00008457 }, /* GL_FOG_COORD_ARRAY */
+   { 10202, 0x0000889D }, /* GL_FOG_COORD_ARRAY_BUFFER_BINDING */
+   { 10236, 0x00008456 }, /* GL_FOG_COORD_ARRAY_POINTER */
+   { 10263, 0x00008455 }, /* GL_FOG_COORD_ARRAY_STRIDE */
+   { 10289, 0x00008454 }, /* GL_FOG_COORD_ARRAY_TYPE */
+   { 10313, 0x00008450 }, /* GL_FOG_COORD_SRC */
+   { 10330, 0x00000B62 }, /* GL_FOG_DENSITY */
+   { 10345, 0x0000855A }, /* GL_FOG_DISTANCE_MODE_NV */
+   { 10369, 0x00000B64 }, /* GL_FOG_END */
+   { 10380, 0x00000C54 }, /* GL_FOG_HINT */
+   { 10392, 0x00000B61 }, /* GL_FOG_INDEX */
+   { 10405, 0x00000B65 }, /* GL_FOG_MODE */
+   { 10417, 0x00008198 }, /* GL_FOG_OFFSET_SGIX */
+   { 10436, 0x00008199 }, /* GL_FOG_OFFSET_VALUE_SGIX */
+   { 10461, 0x00000B63 }, /* GL_FOG_START */
+   { 10474, 0x00008452 }, /* GL_FRAGMENT_DEPTH */
+   { 10492, 0x00008804 }, /* GL_FRAGMENT_PROGRAM_ARB */
+   { 10516, 0x00008B30 }, /* GL_FRAGMENT_SHADER */
+   { 10535, 0x00008B30 }, /* GL_FRAGMENT_SHADER_ARB */
+   { 10558, 0x00008B8B }, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
+   { 10593, 0x00008D40 }, /* GL_FRAMEBUFFER */
+   { 10608, 0x00008215 }, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
+   { 10645, 0x00008214 }, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
+   { 10681, 0x00008210 }, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
+   { 10722, 0x00008211 }, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
+   { 10763, 0x00008216 }, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
+   { 10800, 0x00008213 }, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
+   { 10837, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
+   { 10875, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT */
+   { 10917, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
+   { 10955, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT */
+   { 10997, 0x00008212 }, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
+   { 11032, 0x00008217 }, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
+   { 11071, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT */
+   { 11120, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
+   { 11168, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT */
+   { 11220, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+   { 11260, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
+   { 11304, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
+   { 11344, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT */
+   { 11388, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING_EXT */
+   { 11415, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE */
+   { 11439, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE_EXT */
+   { 11467, 0x00008218 }, /* GL_FRAMEBUFFER_DEFAULT */
+   { 11490, 0x00008D40 }, /* GL_FRAMEBUFFER_EXT */
+   { 11509, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
+   { 11546, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT */
+   { 11587, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
+   { 11628, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
+   { 11670, 0x00008CD8 }, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
+   { 11721, 0x00008CDA }, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
+   { 11759, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
+   { 11804, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT */
+   { 11853, 0x00008D56 }, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
+   { 11891, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
+   { 11933, 0x00008CDE }, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
+   { 11965, 0x00008219 }, /* GL_FRAMEBUFFER_UNDEFINED */
+   { 11990, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED */
+   { 12017, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED_EXT */
+   { 12048, 0x00000404 }, /* GL_FRONT */
+   { 12057, 0x00000408 }, /* GL_FRONT_AND_BACK */
+   { 12075, 0x00000B46 }, /* GL_FRONT_FACE */
+   { 12089, 0x00000400 }, /* GL_FRONT_LEFT */
+   { 12103, 0x00000401 }, /* GL_FRONT_RIGHT */
+   { 12118, 0x00008006 }, /* GL_FUNC_ADD */
+   { 12130, 0x00008006 }, /* GL_FUNC_ADD_EXT */
+   { 12146, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT */
+   { 12171, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT_EXT */
+   { 12200, 0x0000800A }, /* GL_FUNC_SUBTRACT */
+   { 12217, 0x0000800A }, /* GL_FUNC_SUBTRACT_EXT */
+   { 12238, 0x00008191 }, /* GL_GENERATE_MIPMAP */
+   { 12257, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT */
+   { 12281, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT_SGIS */
+   { 12310, 0x00008191 }, /* GL_GENERATE_MIPMAP_SGIS */
+   { 12334, 0x00000206 }, /* GL_GEQUAL */
+   { 12344, 0x00000204 }, /* GL_GREATER */
+   { 12355, 0x00001904 }, /* GL_GREEN */
+   { 12364, 0x00000D19 }, /* GL_GREEN_BIAS */
+   { 12378, 0x00000D53 }, /* GL_GREEN_BITS */
+   { 12392, 0x00000D18 }, /* GL_GREEN_SCALE */
+   { 12407, 0x00008000 }, /* GL_HINT_BIT */
+   { 12419, 0x00008024 }, /* GL_HISTOGRAM */
+   { 12432, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE */
+   { 12456, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE_EXT */
+   { 12484, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE */
+   { 12507, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE_EXT */
+   { 12534, 0x00008024 }, /* GL_HISTOGRAM_EXT */
+   { 12551, 0x00008027 }, /* GL_HISTOGRAM_FORMAT */
+   { 12571, 0x00008027 }, /* GL_HISTOGRAM_FORMAT_EXT */
+   { 12595, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE */
+   { 12619, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE_EXT */
+   { 12647, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE */
+   { 12675, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE_EXT */
+   { 12707, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE */
+   { 12729, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE_EXT */
+   { 12755, 0x0000802D }, /* GL_HISTOGRAM_SINK */
+   { 12773, 0x0000802D }, /* GL_HISTOGRAM_SINK_EXT */
+   { 12795, 0x00008026 }, /* GL_HISTOGRAM_WIDTH */
+   { 12814, 0x00008026 }, /* GL_HISTOGRAM_WIDTH_EXT */
+   { 12837, 0x0000862A }, /* GL_IDENTITY_NV */
+   { 12852, 0x00008150 }, /* GL_IGNORE_BORDER_HP */
+   { 12872, 0x00008B9B }, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
+   { 12912, 0x00008B9A }, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
+   { 12950, 0x00001E02 }, /* GL_INCR */
+   { 12958, 0x00008507 }, /* GL_INCR_WRAP */
+   { 12971, 0x00008507 }, /* GL_INCR_WRAP_EXT */
+   { 12988, 0x00008222 }, /* GL_INDEX */
+   { 12997, 0x00008077 }, /* GL_INDEX_ARRAY */
+   { 13012, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING */
+   { 13042, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING_ARB */
+   { 13076, 0x00008091 }, /* GL_INDEX_ARRAY_POINTER */
+   { 13099, 0x00008086 }, /* GL_INDEX_ARRAY_STRIDE */
+   { 13121, 0x00008085 }, /* GL_INDEX_ARRAY_TYPE */
+   { 13141, 0x00000D51 }, /* GL_INDEX_BITS */
+   { 13155, 0x00000C20 }, /* GL_INDEX_CLEAR_VALUE */
+   { 13176, 0x00000BF1 }, /* GL_INDEX_LOGIC_OP */
+   { 13194, 0x00000C30 }, /* GL_INDEX_MODE */
+   { 13208, 0x00000D13 }, /* GL_INDEX_OFFSET */
+   { 13224, 0x00000D12 }, /* GL_INDEX_SHIFT */
+   { 13239, 0x00000C21 }, /* GL_INDEX_WRITEMASK */
+   { 13258, 0x00008B84 }, /* GL_INFO_LOG_LENGTH */
+   { 13277, 0x00001404 }, /* GL_INT */
+   { 13284, 0x00008049 }, /* GL_INTENSITY */
+   { 13297, 0x0000804C }, /* GL_INTENSITY12 */
+   { 13312, 0x0000804C }, /* GL_INTENSITY12_EXT */
+   { 13331, 0x0000804D }, /* GL_INTENSITY16 */
+   { 13346, 0x0000804D }, /* GL_INTENSITY16_EXT */
+   { 13365, 0x0000804A }, /* GL_INTENSITY4 */
+   { 13379, 0x0000804A }, /* GL_INTENSITY4_EXT */
+   { 13397, 0x0000804B }, /* GL_INTENSITY8 */
+   { 13411, 0x0000804B }, /* GL_INTENSITY8_EXT */
+   { 13429, 0x00008049 }, /* GL_INTENSITY_EXT */
+   { 13446, 0x00008575 }, /* GL_INTERPOLATE */
+   { 13461, 0x00008575 }, /* GL_INTERPOLATE_ARB */
+   { 13480, 0x00008575 }, /* GL_INTERPOLATE_EXT */
+   { 13499, 0x00008B53 }, /* GL_INT_VEC2 */
+   { 13511, 0x00008B53 }, /* GL_INT_VEC2_ARB */
+   { 13527, 0x00008B54 }, /* GL_INT_VEC3 */
+   { 13539, 0x00008B54 }, /* GL_INT_VEC3_ARB */
+   { 13555, 0x00008B55 }, /* GL_INT_VEC4 */
+   { 13567, 0x00008B55 }, /* GL_INT_VEC4_ARB */
+   { 13583, 0x00000500 }, /* GL_INVALID_ENUM */
+   { 13599, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION */
+   { 13632, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION_EXT */
+   { 13669, 0x00000502 }, /* GL_INVALID_OPERATION */
+   { 13690, 0x00000501 }, /* GL_INVALID_VALUE */
+   { 13707, 0x0000862B }, /* GL_INVERSE_NV */
+   { 13721, 0x0000862D }, /* GL_INVERSE_TRANSPOSE_NV */
+   { 13745, 0x0000150A }, /* GL_INVERT */
+   { 13755, 0x00001E00 }, /* GL_KEEP */
+   { 13763, 0x00008E4E }, /* GL_LAST_VERTEX_CONVENTION_EXT */
+   { 13793, 0x00000406 }, /* GL_LEFT */
+   { 13801, 0x00000203 }, /* GL_LEQUAL */
+   { 13811, 0x00000201 }, /* GL_LESS */
+   { 13819, 0x00004000 }, /* GL_LIGHT0 */
+   { 13829, 0x00004001 }, /* GL_LIGHT1 */
+   { 13839, 0x00004002 }, /* GL_LIGHT2 */
+   { 13849, 0x00004003 }, /* GL_LIGHT3 */
+   { 13859, 0x00004004 }, /* GL_LIGHT4 */
+   { 13869, 0x00004005 }, /* GL_LIGHT5 */
+   { 13879, 0x00004006 }, /* GL_LIGHT6 */
+   { 13889, 0x00004007 }, /* GL_LIGHT7 */
+   { 13899, 0x00000B50 }, /* GL_LIGHTING */
+   { 13911, 0x00000040 }, /* GL_LIGHTING_BIT */
+   { 13927, 0x00000B53 }, /* GL_LIGHT_MODEL_AMBIENT */
+   { 13950, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL */
+   { 13979, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL_EXT */
+   { 14012, 0x00000B51 }, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
+   { 14040, 0x00000B52 }, /* GL_LIGHT_MODEL_TWO_SIDE */
+   { 14064, 0x00001B01 }, /* GL_LINE */
+   { 14072, 0x00002601 }, /* GL_LINEAR */
+   { 14082, 0x00001208 }, /* GL_LINEAR_ATTENUATION */
+   { 14104, 0x00008170 }, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
+   { 14134, 0x0000844F }, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
+   { 14165, 0x00002703 }, /* GL_LINEAR_MIPMAP_LINEAR */
+   { 14189, 0x00002701 }, /* GL_LINEAR_MIPMAP_NEAREST */
+   { 14214, 0x00000001 }, /* GL_LINES */
+   { 14223, 0x00000004 }, /* GL_LINE_BIT */
+   { 14235, 0x00000002 }, /* GL_LINE_LOOP */
+   { 14248, 0x00000707 }, /* GL_LINE_RESET_TOKEN */
+   { 14268, 0x00000B20 }, /* GL_LINE_SMOOTH */
+   { 14283, 0x00000C52 }, /* GL_LINE_SMOOTH_HINT */
+   { 14303, 0x00000B24 }, /* GL_LINE_STIPPLE */
+   { 14319, 0x00000B25 }, /* GL_LINE_STIPPLE_PATTERN */
+   { 14343, 0x00000B26 }, /* GL_LINE_STIPPLE_REPEAT */
+   { 14366, 0x00000003 }, /* GL_LINE_STRIP */
+   { 14380, 0x00000702 }, /* GL_LINE_TOKEN */
+   { 14394, 0x00000B21 }, /* GL_LINE_WIDTH */
+   { 14408, 0x00000B23 }, /* GL_LINE_WIDTH_GRANULARITY */
+   { 14434, 0x00000B22 }, /* GL_LINE_WIDTH_RANGE */
+   { 14454, 0x00008B82 }, /* GL_LINK_STATUS */
+   { 14469, 0x00000B32 }, /* GL_LIST_BASE */
+   { 14482, 0x00020000 }, /* GL_LIST_BIT */
+   { 14494, 0x00000B33 }, /* GL_LIST_INDEX */
+   { 14508, 0x00000B30 }, /* GL_LIST_MODE */
+   { 14521, 0x00000101 }, /* GL_LOAD */
+   { 14529, 0x00000BF1 }, /* GL_LOGIC_OP */
+   { 14541, 0x00000BF0 }, /* GL_LOGIC_OP_MODE */
+   { 14558, 0x00008CA1 }, /* GL_LOWER_LEFT */
+   { 14572, 0x00001909 }, /* GL_LUMINANCE */
+   { 14585, 0x00008041 }, /* GL_LUMINANCE12 */
+   { 14600, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12 */
+   { 14623, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12_EXT */
+   { 14650, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4 */
+   { 14672, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4_EXT */
+   { 14698, 0x00008041 }, /* GL_LUMINANCE12_EXT */
+   { 14717, 0x00008042 }, /* GL_LUMINANCE16 */
+   { 14732, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16 */
+   { 14755, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16_EXT */
+   { 14782, 0x00008042 }, /* GL_LUMINANCE16_EXT */
+   { 14801, 0x0000803F }, /* GL_LUMINANCE4 */
+   { 14815, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4 */
+   { 14836, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4_EXT */
+   { 14861, 0x0000803F }, /* GL_LUMINANCE4_EXT */
+   { 14879, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2 */
+   { 14900, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2_EXT */
+   { 14925, 0x00008040 }, /* GL_LUMINANCE8 */
+   { 14939, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8 */
+   { 14960, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8_EXT */
+   { 14985, 0x00008040 }, /* GL_LUMINANCE8_EXT */
+   { 15003, 0x0000190A }, /* GL_LUMINANCE_ALPHA */
+   { 15022, 0x00000D90 }, /* GL_MAP1_COLOR_4 */
+   { 15038, 0x00000DD0 }, /* GL_MAP1_GRID_DOMAIN */
+   { 15058, 0x00000DD1 }, /* GL_MAP1_GRID_SEGMENTS */
+   { 15080, 0x00000D91 }, /* GL_MAP1_INDEX */
+   { 15094, 0x00000D92 }, /* GL_MAP1_NORMAL */
+   { 15109, 0x00000D93 }, /* GL_MAP1_TEXTURE_COORD_1 */
+   { 15133, 0x00000D94 }, /* GL_MAP1_TEXTURE_COORD_2 */
+   { 15157, 0x00000D95 }, /* GL_MAP1_TEXTURE_COORD_3 */
+   { 15181, 0x00000D96 }, /* GL_MAP1_TEXTURE_COORD_4 */
+   { 15205, 0x00000D97 }, /* GL_MAP1_VERTEX_3 */
+   { 15222, 0x00000D98 }, /* GL_MAP1_VERTEX_4 */
+   { 15239, 0x00008660 }, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
+   { 15267, 0x0000866A }, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
+   { 15296, 0x0000866B }, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
+   { 15325, 0x0000866C }, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
+   { 15354, 0x0000866D }, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
+   { 15383, 0x0000866E }, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
+   { 15412, 0x0000866F }, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
+   { 15441, 0x00008661 }, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
+   { 15469, 0x00008662 }, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
+   { 15497, 0x00008663 }, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
+   { 15525, 0x00008664 }, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
+   { 15553, 0x00008665 }, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
+   { 15581, 0x00008666 }, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
+   { 15609, 0x00008667 }, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
+   { 15637, 0x00008668 }, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
+   { 15665, 0x00008669 }, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
+   { 15693, 0x00000DB0 }, /* GL_MAP2_COLOR_4 */
+   { 15709, 0x00000DD2 }, /* GL_MAP2_GRID_DOMAIN */
+   { 15729, 0x00000DD3 }, /* GL_MAP2_GRID_SEGMENTS */
+   { 15751, 0x00000DB1 }, /* GL_MAP2_INDEX */
+   { 15765, 0x00000DB2 }, /* GL_MAP2_NORMAL */
+   { 15780, 0x00000DB3 }, /* GL_MAP2_TEXTURE_COORD_1 */
+   { 15804, 0x00000DB4 }, /* GL_MAP2_TEXTURE_COORD_2 */
+   { 15828, 0x00000DB5 }, /* GL_MAP2_TEXTURE_COORD_3 */
+   { 15852, 0x00000DB6 }, /* GL_MAP2_TEXTURE_COORD_4 */
+   { 15876, 0x00000DB7 }, /* GL_MAP2_VERTEX_3 */
+   { 15893, 0x00000DB8 }, /* GL_MAP2_VERTEX_4 */
+   { 15910, 0x00008670 }, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
+   { 15938, 0x0000867A }, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
+   { 15967, 0x0000867B }, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
+   { 15996, 0x0000867C }, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
+   { 16025, 0x0000867D }, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
+   { 16054, 0x0000867E }, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
+   { 16083, 0x0000867F }, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
+   { 16112, 0x00008671 }, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
+   { 16140, 0x00008672 }, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
+   { 16168, 0x00008673 }, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
+   { 16196, 0x00008674 }, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
+   { 16224, 0x00008675 }, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
+   { 16252, 0x00008676 }, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
+   { 16280, 0x00008677 }, /* GL_MAP2_VERTEX_ATTRIB7_4_NV */
+   { 16308, 0x00008678 }, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
+   { 16336, 0x00008679 }, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
+   { 16364, 0x00000D10 }, /* GL_MAP_COLOR */
+   { 16377, 0x00000D11 }, /* GL_MAP_STENCIL */
+   { 16392, 0x000088C0 }, /* GL_MATRIX0_ARB */
+   { 16407, 0x00008630 }, /* GL_MATRIX0_NV */
+   { 16421, 0x000088CA }, /* GL_MATRIX10_ARB */
+   { 16437, 0x000088CB }, /* GL_MATRIX11_ARB */
+   { 16453, 0x000088CC }, /* GL_MATRIX12_ARB */
+   { 16469, 0x000088CD }, /* GL_MATRIX13_ARB */
+   { 16485, 0x000088CE }, /* GL_MATRIX14_ARB */
+   { 16501, 0x000088CF }, /* GL_MATRIX15_ARB */
+   { 16517, 0x000088D0 }, /* GL_MATRIX16_ARB */
+   { 16533, 0x000088D1 }, /* GL_MATRIX17_ARB */
+   { 16549, 0x000088D2 }, /* GL_MATRIX18_ARB */
+   { 16565, 0x000088D3 }, /* GL_MATRIX19_ARB */
+   { 16581, 0x000088C1 }, /* GL_MATRIX1_ARB */
+   { 16596, 0x00008631 }, /* GL_MATRIX1_NV */
+   { 16610, 0x000088D4 }, /* GL_MATRIX20_ARB */
+   { 16626, 0x000088D5 }, /* GL_MATRIX21_ARB */
+   { 16642, 0x000088D6 }, /* GL_MATRIX22_ARB */
+   { 16658, 0x000088D7 }, /* GL_MATRIX23_ARB */
+   { 16674, 0x000088D8 }, /* GL_MATRIX24_ARB */
+   { 16690, 0x000088D9 }, /* GL_MATRIX25_ARB */
+   { 16706, 0x000088DA }, /* GL_MATRIX26_ARB */
+   { 16722, 0x000088DB }, /* GL_MATRIX27_ARB */
+   { 16738, 0x000088DC }, /* GL_MATRIX28_ARB */
+   { 16754, 0x000088DD }, /* GL_MATRIX29_ARB */
+   { 16770, 0x000088C2 }, /* GL_MATRIX2_ARB */
+   { 16785, 0x00008632 }, /* GL_MATRIX2_NV */
+   { 16799, 0x000088DE }, /* GL_MATRIX30_ARB */
+   { 16815, 0x000088DF }, /* GL_MATRIX31_ARB */
+   { 16831, 0x000088C3 }, /* GL_MATRIX3_ARB */
+   { 16846, 0x00008633 }, /* GL_MATRIX3_NV */
+   { 16860, 0x000088C4 }, /* GL_MATRIX4_ARB */
+   { 16875, 0x00008634 }, /* GL_MATRIX4_NV */
+   { 16889, 0x000088C5 }, /* GL_MATRIX5_ARB */
+   { 16904, 0x00008635 }, /* GL_MATRIX5_NV */
+   { 16918, 0x000088C6 }, /* GL_MATRIX6_ARB */
+   { 16933, 0x00008636 }, /* GL_MATRIX6_NV */
+   { 16947, 0x000088C7 }, /* GL_MATRIX7_ARB */
+   { 16962, 0x00008637 }, /* GL_MATRIX7_NV */
+   { 16976, 0x000088C8 }, /* GL_MATRIX8_ARB */
+   { 16991, 0x000088C9 }, /* GL_MATRIX9_ARB */
+   { 17006, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_ARB */
+   { 17032, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
+   { 17066, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
+   { 17097, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
+   { 17130, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
+   { 17161, 0x00000BA0 }, /* GL_MATRIX_MODE */
+   { 17176, 0x00008840 }, /* GL_MATRIX_PALETTE_ARB */
+   { 17198, 0x00008008 }, /* GL_MAX */
+   { 17205, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE */
+   { 17228, 0x000088FF }, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
+   { 17260, 0x00000D35 }, /* GL_MAX_ATTRIB_STACK_DEPTH */
+   { 17286, 0x00000D3B }, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
+   { 17319, 0x00008177 }, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
+   { 17345, 0x00008178 }, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+   { 17379, 0x00000D32 }, /* GL_MAX_CLIP_PLANES */
+   { 17398, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
+   { 17427, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
+   { 17459, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI */
+   { 17495, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
+   { 17531, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB */
+   { 17571, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT */
+   { 17597, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT_EXT */
+   { 17627, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH */
+   { 17652, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH_EXT */
+   { 17681, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
+   { 17710, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB */
+   { 17743, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS */
+   { 17763, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ARB */
+   { 17787, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ATI */
+   { 17811, 0x000080E9 }, /* GL_MAX_ELEMENTS_INDICES */
+   { 17835, 0x000080E8 }, /* GL_MAX_ELEMENTS_VERTICES */
+   { 17860, 0x00000D30 }, /* GL_MAX_EVAL_ORDER */
+   { 17878, 0x00008008 }, /* GL_MAX_EXT */
+   { 17889, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
+   { 17924, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB */
+   { 17963, 0x00000D31 }, /* GL_MAX_LIGHTS */
+   { 17977, 0x00000B31 }, /* GL_MAX_LIST_NESTING */
+   { 17997, 0x00008841 }, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
+   { 18035, 0x00000D36 }, /* GL_MAX_MODELVIEW_STACK_DEPTH */
+   { 18064, 0x00000D37 }, /* GL_MAX_NAME_STACK_DEPTH */
+   { 18088, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_ARB */
+   { 18116, 0x00000D34 }, /* GL_MAX_PIXEL_MAP_TABLE */
+   { 18139, 0x000088B1 }, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
+   { 18176, 0x0000880B }, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
+   { 18212, 0x000088AD }, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
+   { 18239, 0x000088F5 }, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
+   { 18268, 0x000088B5 }, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
+   { 18302, 0x000088F4 }, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
+   { 18338, 0x000088F6 }, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
+   { 18365, 0x000088A1 }, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
+   { 18397, 0x000088B4 }, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
+   { 18433, 0x000088F8 }, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
+   { 18462, 0x000088F7 }, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
+   { 18491, 0x0000862F }, /* GL_MAX_PROGRAM_MATRICES_ARB */
+   { 18519, 0x0000862E }, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
+   { 18557, 0x000088B3 }, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+   { 18601, 0x0000880E }, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+   { 18644, 0x000088AF }, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
+   { 18678, 0x000088A3 }, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+   { 18717, 0x000088AB }, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
+   { 18754, 0x000088A7 }, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
+   { 18792, 0x00008810 }, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+   { 18835, 0x0000880F }, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+   { 18878, 0x000088A9 }, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
+   { 18908, 0x000088A5 }, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
+   { 18939, 0x0000880D }, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
+   { 18975, 0x0000880C }, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
+   { 19011, 0x00000D38 }, /* GL_MAX_PROJECTION_STACK_DEPTH */
+   { 19041, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
+   { 19075, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_NV */
+   { 19108, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
+   { 19137, 0x00008D57 }, /* GL_MAX_SAMPLES */
+   { 19152, 0x00008504 }, /* GL_MAX_SHININESS_NV */
+   { 19172, 0x00008505 }, /* GL_MAX_SPOT_EXPONENT_NV */
+   { 19196, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS */
+   { 19218, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS_ARB */
+   { 19244, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS */
+   { 19271, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS_ARB */
+   { 19302, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS */
+   { 19326, 0x000084FF }, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
+   { 19360, 0x00000D33 }, /* GL_MAX_TEXTURE_SIZE */
+   { 19380, 0x00000D39 }, /* GL_MAX_TEXTURE_STACK_DEPTH */
+   { 19407, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS */
+   { 19428, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS_ARB */
+   { 19453, 0x0000862F }, /* GL_MAX_TRACK_MATRICES_NV */
+   { 19478, 0x0000862E }, /* GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */
+   { 19513, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS */
+   { 19535, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS_ARB */
+   { 19561, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS */
+   { 19583, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS_ARB */
+   { 19609, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
+   { 19643, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
+   { 19681, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
+   { 19714, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB */
+   { 19751, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_ARB */
+   { 19775, 0x00000D3A }, /* GL_MAX_VIEWPORT_DIMS */
+   { 19796, 0x00008007 }, /* GL_MIN */
+   { 19803, 0x0000802E }, /* GL_MINMAX */
+   { 19813, 0x0000802E }, /* GL_MINMAX_EXT */
+   { 19827, 0x0000802F }, /* GL_MINMAX_FORMAT */
+   { 19844, 0x0000802F }, /* GL_MINMAX_FORMAT_EXT */
+   { 19865, 0x00008030 }, /* GL_MINMAX_SINK */
+   { 19880, 0x00008030 }, /* GL_MINMAX_SINK_EXT */
+   { 19899, 0x00008007 }, /* GL_MIN_EXT */
+   { 19910, 0x00008370 }, /* GL_MIRRORED_REPEAT */
+   { 19929, 0x00008370 }, /* GL_MIRRORED_REPEAT_ARB */
+   { 19952, 0x00008370 }, /* GL_MIRRORED_REPEAT_IBM */
+   { 19975, 0x00008742 }, /* GL_MIRROR_CLAMP_ATI */
+   { 19995, 0x00008742 }, /* GL_MIRROR_CLAMP_EXT */
+   { 20015, 0x00008912 }, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
+   { 20045, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_ATI */
+   { 20073, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
+   { 20101, 0x00001700 }, /* GL_MODELVIEW */
+   { 20114, 0x00001700 }, /* GL_MODELVIEW0_ARB */
+   { 20132, 0x0000872A }, /* GL_MODELVIEW10_ARB */
+   { 20151, 0x0000872B }, /* GL_MODELVIEW11_ARB */
+   { 20170, 0x0000872C }, /* GL_MODELVIEW12_ARB */
+   { 20189, 0x0000872D }, /* GL_MODELVIEW13_ARB */
+   { 20208, 0x0000872E }, /* GL_MODELVIEW14_ARB */
+   { 20227, 0x0000872F }, /* GL_MODELVIEW15_ARB */
+   { 20246, 0x00008730 }, /* GL_MODELVIEW16_ARB */
+   { 20265, 0x00008731 }, /* GL_MODELVIEW17_ARB */
+   { 20284, 0x00008732 }, /* GL_MODELVIEW18_ARB */
+   { 20303, 0x00008733 }, /* GL_MODELVIEW19_ARB */
+   { 20322, 0x0000850A }, /* GL_MODELVIEW1_ARB */
+   { 20340, 0x00008734 }, /* GL_MODELVIEW20_ARB */
+   { 20359, 0x00008735 }, /* GL_MODELVIEW21_ARB */
+   { 20378, 0x00008736 }, /* GL_MODELVIEW22_ARB */
+   { 20397, 0x00008737 }, /* GL_MODELVIEW23_ARB */
+   { 20416, 0x00008738 }, /* GL_MODELVIEW24_ARB */
+   { 20435, 0x00008739 }, /* GL_MODELVIEW25_ARB */
+   { 20454, 0x0000873A }, /* GL_MODELVIEW26_ARB */
+   { 20473, 0x0000873B }, /* GL_MODELVIEW27_ARB */
+   { 20492, 0x0000873C }, /* GL_MODELVIEW28_ARB */
+   { 20511, 0x0000873D }, /* GL_MODELVIEW29_ARB */
+   { 20530, 0x00008722 }, /* GL_MODELVIEW2_ARB */
+   { 20548, 0x0000873E }, /* GL_MODELVIEW30_ARB */
+   { 20567, 0x0000873F }, /* GL_MODELVIEW31_ARB */
+   { 20586, 0x00008723 }, /* GL_MODELVIEW3_ARB */
+   { 20604, 0x00008724 }, /* GL_MODELVIEW4_ARB */
+   { 20622, 0x00008725 }, /* GL_MODELVIEW5_ARB */
+   { 20640, 0x00008726 }, /* GL_MODELVIEW6_ARB */
+   { 20658, 0x00008727 }, /* GL_MODELVIEW7_ARB */
+   { 20676, 0x00008728 }, /* GL_MODELVIEW8_ARB */
+   { 20694, 0x00008729 }, /* GL_MODELVIEW9_ARB */
+   { 20712, 0x00000BA6 }, /* GL_MODELVIEW_MATRIX */
+   { 20732, 0x00008629 }, /* GL_MODELVIEW_PROJECTION_NV */
+   { 20759, 0x00000BA3 }, /* GL_MODELVIEW_STACK_DEPTH */
+   { 20784, 0x00002100 }, /* GL_MODULATE */
+   { 20796, 0x00008744 }, /* GL_MODULATE_ADD_ATI */
+   { 20816, 0x00008745 }, /* GL_MODULATE_SIGNED_ADD_ATI */
+   { 20843, 0x00008746 }, /* GL_MODULATE_SUBTRACT_ATI */
+   { 20868, 0x00000103 }, /* GL_MULT */
+   { 20876, 0x0000809D }, /* GL_MULTISAMPLE */
+   { 20891, 0x000086B2 }, /* GL_MULTISAMPLE_3DFX */
+   { 20911, 0x0000809D }, /* GL_MULTISAMPLE_ARB */
+   { 20930, 0x20000000 }, /* GL_MULTISAMPLE_BIT */
+   { 20949, 0x20000000 }, /* GL_MULTISAMPLE_BIT_3DFX */
+   { 20973, 0x20000000 }, /* GL_MULTISAMPLE_BIT_ARB */
+   { 20996, 0x00008534 }, /* GL_MULTISAMPLE_FILTER_HINT_NV */
+   { 21026, 0x00002A25 }, /* GL_N3F_V3F */
+   { 21037, 0x00000D70 }, /* GL_NAME_STACK_DEPTH */
+   { 21057, 0x0000150E }, /* GL_NAND */
+   { 21065, 0x00002600 }, /* GL_NEAREST */
+   { 21076, 0x0000844E }, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
+   { 21107, 0x0000844D }, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
+   { 21139, 0x00002702 }, /* GL_NEAREST_MIPMAP_LINEAR */
+   { 21164, 0x00002700 }, /* GL_NEAREST_MIPMAP_NEAREST */
+   { 21190, 0x00000200 }, /* GL_NEVER */
+   { 21199, 0x00001102 }, /* GL_NICEST */
+   { 21209, 0x00000000 }, /* GL_NONE */
+   { 21217, 0x00001505 }, /* GL_NOOP */
+   { 21225, 0x00001508 }, /* GL_NOR */
+   { 21232, 0x00000BA1 }, /* GL_NORMALIZE */
+   { 21245, 0x00008075 }, /* GL_NORMAL_ARRAY */
+   { 21261, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
+   { 21292, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING_ARB */
+   { 21327, 0x0000808F }, /* GL_NORMAL_ARRAY_POINTER */
+   { 21351, 0x0000807F }, /* GL_NORMAL_ARRAY_STRIDE */
+   { 21374, 0x0000807E }, /* GL_NORMAL_ARRAY_TYPE */
+   { 21395, 0x00008511 }, /* GL_NORMAL_MAP */
+   { 21409, 0x00008511 }, /* GL_NORMAL_MAP_ARB */
+   { 21427, 0x00008511 }, /* GL_NORMAL_MAP_NV */
+   { 21444, 0x00000205 }, /* GL_NOTEQUAL */
+   { 21456, 0x00000000 }, /* GL_NO_ERROR */
+   { 21468, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
+   { 21502, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB */
+   { 21540, 0x00008B89 }, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */
+   { 21572, 0x00008B8A }, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */
+   { 21614, 0x00008B86 }, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */
+   { 21644, 0x00008B87 }, /* GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB */
+   { 21684, 0x00008B85 }, /* GL_OBJECT_ATTACHED_OBJECTS_ARB */
+   { 21715, 0x00008B81 }, /* GL_OBJECT_COMPILE_STATUS_ARB */
+   { 21744, 0x00008B80 }, /* GL_OBJECT_DELETE_STATUS_ARB */
+   { 21772, 0x00008B84 }, /* GL_OBJECT_INFO_LOG_LENGTH_ARB */
+   { 21802, 0x00002401 }, /* GL_OBJECT_LINEAR */
+   { 21819, 0x00008B82 }, /* GL_OBJECT_LINK_STATUS_ARB */
+   { 21845, 0x00002501 }, /* GL_OBJECT_PLANE */
+   { 21861, 0x00008B88 }, /* GL_OBJECT_SHADER_SOURCE_LENGTH_ARB */
+   { 21896, 0x00008B4F }, /* GL_OBJECT_SUBTYPE_ARB */
+   { 21918, 0x00008B4E }, /* GL_OBJECT_TYPE_ARB */
+   { 21937, 0x00008B83 }, /* GL_OBJECT_VALIDATE_STATUS_ARB */
+   { 21967, 0x00008165 }, /* GL_OCCLUSION_TEST_HP */
+   { 21988, 0x00008166 }, /* GL_OCCLUSION_TEST_RESULT_HP */
+   { 22016, 0x00000001 }, /* GL_ONE */
+   { 22023, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA */
+   { 22051, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA_EXT */
+   { 22083, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR */
+   { 22111, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR_EXT */
+   { 22143, 0x00000305 }, /* GL_ONE_MINUS_DST_ALPHA */
+   { 22166, 0x00000307 }, /* GL_ONE_MINUS_DST_COLOR */
+   { 22189, 0x00000303 }, /* GL_ONE_MINUS_SRC_ALPHA */
+   { 22212, 0x00000301 }, /* GL_ONE_MINUS_SRC_COLOR */
+   { 22235, 0x00008598 }, /* GL_OPERAND0_ALPHA */
+   { 22253, 0x00008598 }, /* GL_OPERAND0_ALPHA_ARB */
+   { 22275, 0x00008598 }, /* GL_OPERAND0_ALPHA_EXT */
+   { 22297, 0x00008590 }, /* GL_OPERAND0_RGB */
+   { 22313, 0x00008590 }, /* GL_OPERAND0_RGB_ARB */
+   { 22333, 0x00008590 }, /* GL_OPERAND0_RGB_EXT */
+   { 22353, 0x00008599 }, /* GL_OPERAND1_ALPHA */
+   { 22371, 0x00008599 }, /* GL_OPERAND1_ALPHA_ARB */
+   { 22393, 0x00008599 }, /* GL_OPERAND1_ALPHA_EXT */
+   { 22415, 0x00008591 }, /* GL_OPERAND1_RGB */
+   { 22431, 0x00008591 }, /* GL_OPERAND1_RGB_ARB */
+   { 22451, 0x00008591 }, /* GL_OPERAND1_RGB_EXT */
+   { 22471, 0x0000859A }, /* GL_OPERAND2_ALPHA */
+   { 22489, 0x0000859A }, /* GL_OPERAND2_ALPHA_ARB */
+   { 22511, 0x0000859A }, /* GL_OPERAND2_ALPHA_EXT */
+   { 22533, 0x00008592 }, /* GL_OPERAND2_RGB */
+   { 22549, 0x00008592 }, /* GL_OPERAND2_RGB_ARB */
+   { 22569, 0x00008592 }, /* GL_OPERAND2_RGB_EXT */
+   { 22589, 0x0000859B }, /* GL_OPERAND3_ALPHA_NV */
+   { 22610, 0x00008593 }, /* GL_OPERAND3_RGB_NV */
+   { 22629, 0x00001507 }, /* GL_OR */
+   { 22635, 0x00000A01 }, /* GL_ORDER */
+   { 22644, 0x0000150D }, /* GL_OR_INVERTED */
+   { 22659, 0x0000150B }, /* GL_OR_REVERSE */
+   { 22673, 0x00000505 }, /* GL_OUT_OF_MEMORY */
+   { 22690, 0x00000D05 }, /* GL_PACK_ALIGNMENT */
+   { 22708, 0x0000806C }, /* GL_PACK_IMAGE_HEIGHT */
+   { 22729, 0x00008758 }, /* GL_PACK_INVERT_MESA */
+   { 22749, 0x00000D01 }, /* GL_PACK_LSB_FIRST */
+   { 22767, 0x00000D02 }, /* GL_PACK_ROW_LENGTH */
+   { 22786, 0x0000806B }, /* GL_PACK_SKIP_IMAGES */
+   { 22806, 0x00000D04 }, /* GL_PACK_SKIP_PIXELS */
+   { 22826, 0x00000D03 }, /* GL_PACK_SKIP_ROWS */
+   { 22844, 0x00000D00 }, /* GL_PACK_SWAP_BYTES */
+   { 22863, 0x00008B92 }, /* GL_PALETTE4_R5_G6_B5_OES */
+   { 22888, 0x00008B94 }, /* GL_PALETTE4_RGB5_A1_OES */
+   { 22912, 0x00008B90 }, /* GL_PALETTE4_RGB8_OES */
+   { 22933, 0x00008B93 }, /* GL_PALETTE4_RGBA4_OES */
+   { 22955, 0x00008B91 }, /* GL_PALETTE4_RGBA8_OES */
+   { 22977, 0x00008B97 }, /* GL_PALETTE8_R5_G6_B5_OES */
+   { 23002, 0x00008B99 }, /* GL_PALETTE8_RGB5_A1_OES */
+   { 23026, 0x00008B95 }, /* GL_PALETTE8_RGB8_OES */
+   { 23047, 0x00008B98 }, /* GL_PALETTE8_RGBA4_OES */
+   { 23069, 0x00008B96 }, /* GL_PALETTE8_RGBA8_OES */
+   { 23091, 0x00000700 }, /* GL_PASS_THROUGH_TOKEN */
+   { 23113, 0x00000C50 }, /* GL_PERSPECTIVE_CORRECTION_HINT */
+   { 23144, 0x00000C79 }, /* GL_PIXEL_MAP_A_TO_A */
+   { 23164, 0x00000CB9 }, /* GL_PIXEL_MAP_A_TO_A_SIZE */
+   { 23189, 0x00000C78 }, /* GL_PIXEL_MAP_B_TO_B */
+   { 23209, 0x00000CB8 }, /* GL_PIXEL_MAP_B_TO_B_SIZE */
+   { 23234, 0x00000C77 }, /* GL_PIXEL_MAP_G_TO_G */
+   { 23254, 0x00000CB7 }, /* GL_PIXEL_MAP_G_TO_G_SIZE */
+   { 23279, 0x00000C75 }, /* GL_PIXEL_MAP_I_TO_A */
+   { 23299, 0x00000CB5 }, /* GL_PIXEL_MAP_I_TO_A_SIZE */
+   { 23324, 0x00000C74 }, /* GL_PIXEL_MAP_I_TO_B */
+   { 23344, 0x00000CB4 }, /* GL_PIXEL_MAP_I_TO_B_SIZE */
+   { 23369, 0x00000C73 }, /* GL_PIXEL_MAP_I_TO_G */
+   { 23389, 0x00000CB3 }, /* GL_PIXEL_MAP_I_TO_G_SIZE */
+   { 23414, 0x00000C70 }, /* GL_PIXEL_MAP_I_TO_I */
+   { 23434, 0x00000CB0 }, /* GL_PIXEL_MAP_I_TO_I_SIZE */
+   { 23459, 0x00000C72 }, /* GL_PIXEL_MAP_I_TO_R */
+   { 23479, 0x00000CB2 }, /* GL_PIXEL_MAP_I_TO_R_SIZE */
+   { 23504, 0x00000C76 }, /* GL_PIXEL_MAP_R_TO_R */
+   { 23524, 0x00000CB6 }, /* GL_PIXEL_MAP_R_TO_R_SIZE */
+   { 23549, 0x00000C71 }, /* GL_PIXEL_MAP_S_TO_S */
+   { 23569, 0x00000CB1 }, /* GL_PIXEL_MAP_S_TO_S_SIZE */
+   { 23594, 0x00000020 }, /* GL_PIXEL_MODE_BIT */
+   { 23612, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER */
+   { 23633, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING */
+   { 23662, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING_EXT */
+   { 23695, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER_EXT */
+   { 23720, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER */
+   { 23743, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
+   { 23774, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING_EXT */
+   { 23809, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER_EXT */
+   { 23836, 0x00001B00 }, /* GL_POINT */
+   { 23845, 0x00000000 }, /* GL_POINTS */
+   { 23855, 0x00000002 }, /* GL_POINT_BIT */
+   { 23868, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION */
+   { 23898, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_ARB */
+   { 23932, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_EXT */
+   { 23966, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_SGIS */
+   { 24001, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE */
+   { 24030, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_ARB */
+   { 24063, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_EXT */
+   { 24096, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_SGIS */
+   { 24130, 0x00000B11 }, /* GL_POINT_SIZE */
+   { 24144, 0x00000B13 }, /* GL_POINT_SIZE_GRANULARITY */
+   { 24170, 0x00008127 }, /* GL_POINT_SIZE_MAX */
+   { 24188, 0x00008127 }, /* GL_POINT_SIZE_MAX_ARB */
+   { 24210, 0x00008127 }, /* GL_POINT_SIZE_MAX_EXT */
+   { 24232, 0x00008127 }, /* GL_POINT_SIZE_MAX_SGIS */
+   { 24255, 0x00008126 }, /* GL_POINT_SIZE_MIN */
+   { 24273, 0x00008126 }, /* GL_POINT_SIZE_MIN_ARB */
+   { 24295, 0x00008126 }, /* GL_POINT_SIZE_MIN_EXT */
+   { 24317, 0x00008126 }, /* GL_POINT_SIZE_MIN_SGIS */
+   { 24340, 0x00000B12 }, /* GL_POINT_SIZE_RANGE */
+   { 24360, 0x00000B10 }, /* GL_POINT_SMOOTH */
+   { 24376, 0x00000C51 }, /* GL_POINT_SMOOTH_HINT */
+   { 24397, 0x00008861 }, /* GL_POINT_SPRITE */
+   { 24413, 0x00008861 }, /* GL_POINT_SPRITE_ARB */
+   { 24433, 0x00008CA0 }, /* GL_POINT_SPRITE_COORD_ORIGIN */
+   { 24462, 0x00008861 }, /* GL_POINT_SPRITE_NV */
+   { 24481, 0x00008863 }, /* GL_POINT_SPRITE_R_MODE_NV */
+   { 24507, 0x00000701 }, /* GL_POINT_TOKEN */
+   { 24522, 0x00000009 }, /* GL_POLYGON */
+   { 24533, 0x00000008 }, /* GL_POLYGON_BIT */
+   { 24548, 0x00000B40 }, /* GL_POLYGON_MODE */
+   { 24564, 0x00008039 }, /* GL_POLYGON_OFFSET_BIAS */
+   { 24587, 0x00008038 }, /* GL_POLYGON_OFFSET_FACTOR */
+   { 24612, 0x00008037 }, /* GL_POLYGON_OFFSET_FILL */
+   { 24635, 0x00002A02 }, /* GL_POLYGON_OFFSET_LINE */
+   { 24658, 0x00002A01 }, /* GL_POLYGON_OFFSET_POINT */
+   { 24682, 0x00002A00 }, /* GL_POLYGON_OFFSET_UNITS */
+   { 24706, 0x00000B41 }, /* GL_POLYGON_SMOOTH */
+   { 24724, 0x00000C53 }, /* GL_POLYGON_SMOOTH_HINT */
+   { 24747, 0x00000B42 }, /* GL_POLYGON_STIPPLE */
+   { 24766, 0x00000010 }, /* GL_POLYGON_STIPPLE_BIT */
+   { 24789, 0x00000703 }, /* GL_POLYGON_TOKEN */
+   { 24806, 0x00001203 }, /* GL_POSITION */
+   { 24818, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
+   { 24850, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI */
+   { 24886, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
+   { 24919, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI */
+   { 24956, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
+   { 24987, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI */
+   { 25022, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
+   { 25054, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI */
+   { 25090, 0x000080D2 }, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
+   { 25123, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
+   { 25155, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI */
+   { 25191, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
+   { 25224, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI */
+   { 25261, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS */
+   { 25291, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS_SGI */
+   { 25325, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE */
+   { 25356, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE_SGI */
+   { 25391, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
+   { 25422, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS_EXT */
+   { 25457, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
+   { 25489, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE_EXT */
+   { 25525, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS */
+   { 25555, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS_EXT */
+   { 25589, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE */
+   { 25620, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE_EXT */
+   { 25655, 0x000080D1 }, /* GL_POST_CONVOLUTION_COLOR_TABLE */
+   { 25687, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS */
+   { 25718, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS_EXT */
+   { 25753, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE */
+   { 25785, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE_EXT */
+   { 25821, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS */
+   { 25850, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS_EXT */
+   { 25883, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE */
+   { 25913, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE_EXT */
+   { 25947, 0x0000817B }, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
+   { 25986, 0x00008179 }, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
+   { 26019, 0x0000817C }, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
+   { 26059, 0x0000817A }, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
+   { 26093, 0x00008578 }, /* GL_PREVIOUS */
+   { 26105, 0x00008578 }, /* GL_PREVIOUS_ARB */
+   { 26121, 0x00008578 }, /* GL_PREVIOUS_EXT */
+   { 26137, 0x00008577 }, /* GL_PRIMARY_COLOR */
+   { 26154, 0x00008577 }, /* GL_PRIMARY_COLOR_ARB */
+   { 26175, 0x00008577 }, /* GL_PRIMARY_COLOR_EXT */
+   { 26196, 0x000088B0 }, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
+   { 26229, 0x00008805 }, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
+   { 26261, 0x000088AC }, /* GL_PROGRAM_ATTRIBS_ARB */
+   { 26284, 0x00008677 }, /* GL_PROGRAM_BINDING_ARB */
+   { 26307, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_ARB */
+   { 26337, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_NV */
+   { 26366, 0x00008874 }, /* GL_PROGRAM_ERROR_STRING_ARB */
+   { 26394, 0x00008876 }, /* GL_PROGRAM_FORMAT_ARB */
+   { 26416, 0x00008875 }, /* GL_PROGRAM_FORMAT_ASCII_ARB */
+   { 26444, 0x000088A0 }, /* GL_PROGRAM_INSTRUCTIONS_ARB */
+   { 26472, 0x00008627 }, /* GL_PROGRAM_LENGTH_ARB */
+   { 26494, 0x00008627 }, /* GL_PROGRAM_LENGTH_NV */
+   { 26515, 0x000088B2 }, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+   { 26555, 0x00008808 }, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+   { 26594, 0x000088AE }, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
+   { 26624, 0x000088A2 }, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+   { 26659, 0x000088AA }, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
+   { 26692, 0x000088A6 }, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
+   { 26726, 0x0000880A }, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+   { 26765, 0x00008809 }, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+   { 26804, 0x00008B40 }, /* GL_PROGRAM_OBJECT_ARB */
+   { 26826, 0x000088A8 }, /* GL_PROGRAM_PARAMETERS_ARB */
+   { 26852, 0x00008644 }, /* GL_PROGRAM_PARAMETER_NV */
+   { 26876, 0x00008647 }, /* GL_PROGRAM_RESIDENT_NV */
+   { 26899, 0x00008628 }, /* GL_PROGRAM_STRING_ARB */
+   { 26921, 0x00008628 }, /* GL_PROGRAM_STRING_NV */
+   { 26942, 0x00008646 }, /* GL_PROGRAM_TARGET_NV */
+   { 26963, 0x000088A4 }, /* GL_PROGRAM_TEMPORARIES_ARB */
+   { 26990, 0x00008807 }, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
+   { 27022, 0x00008806 }, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
+   { 27054, 0x000088B6 }, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
+   { 27089, 0x00001701 }, /* GL_PROJECTION */
+   { 27103, 0x00000BA7 }, /* GL_PROJECTION_MATRIX */
+   { 27124, 0x00000BA4 }, /* GL_PROJECTION_STACK_DEPTH */
+   { 27150, 0x00008E4F }, /* GL_PROVOKING_VERTEX_EXT */
+   { 27174, 0x000080D3 }, /* GL_PROXY_COLOR_TABLE */
+   { 27195, 0x00008025 }, /* GL_PROXY_HISTOGRAM */
+   { 27214, 0x00008025 }, /* GL_PROXY_HISTOGRAM_EXT */
+   { 27237, 0x000080D5 }, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
+   { 27276, 0x000080D4 }, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
+   { 27314, 0x00008063 }, /* GL_PROXY_TEXTURE_1D */
+   { 27334, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
+   { 27364, 0x00008063 }, /* GL_PROXY_TEXTURE_1D_EXT */
+   { 27388, 0x00008064 }, /* GL_PROXY_TEXTURE_2D */
+   { 27408, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
+   { 27438, 0x00008064 }, /* GL_PROXY_TEXTURE_2D_EXT */
+   { 27462, 0x00008070 }, /* GL_PROXY_TEXTURE_3D */
+   { 27482, 0x000080BD }, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
+   { 27515, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP */
+   { 27541, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP_ARB */
+   { 27571, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
+   { 27602, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_NV */
+   { 27632, 0x00002003 }, /* GL_Q */
+   { 27637, 0x00001209 }, /* GL_QUADRATIC_ATTENUATION */
+   { 27662, 0x00000007 }, /* GL_QUADS */
+   { 27671, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT */
+   { 27719, 0x00008614 }, /* GL_QUAD_MESH_SUN */
+   { 27736, 0x00000008 }, /* GL_QUAD_STRIP */
+   { 27750, 0x00008864 }, /* GL_QUERY_COUNTER_BITS */
+   { 27772, 0x00008864 }, /* GL_QUERY_COUNTER_BITS_ARB */
+   { 27798, 0x00008866 }, /* GL_QUERY_RESULT */
+   { 27814, 0x00008866 }, /* GL_QUERY_RESULT_ARB */
+   { 27834, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE */
+   { 27860, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE_ARB */
+   { 27890, 0x00002002 }, /* GL_R */
+   { 27895, 0x00002A10 }, /* GL_R3_G3_B2 */
+   { 27907, 0x00019262 }, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
+   { 27940, 0x00000C02 }, /* GL_READ_BUFFER */
+   { 27955, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER */
+   { 27975, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
+   { 28007, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER_EXT */
+   { 28031, 0x000088B8 }, /* GL_READ_ONLY */
+   { 28044, 0x000088B8 }, /* GL_READ_ONLY_ARB */
+   { 28061, 0x000088BA }, /* GL_READ_WRITE */
+   { 28075, 0x000088BA }, /* GL_READ_WRITE_ARB */
+   { 28093, 0x00001903 }, /* GL_RED */
+   { 28100, 0x00008016 }, /* GL_REDUCE */
+   { 28110, 0x00008016 }, /* GL_REDUCE_EXT */
+   { 28124, 0x00000D15 }, /* GL_RED_BIAS */
+   { 28136, 0x00000D52 }, /* GL_RED_BITS */
+   { 28148, 0x00000D14 }, /* GL_RED_SCALE */
+   { 28161, 0x00008512 }, /* GL_REFLECTION_MAP */
+   { 28179, 0x00008512 }, /* GL_REFLECTION_MAP_ARB */
+   { 28201, 0x00008512 }, /* GL_REFLECTION_MAP_NV */
+   { 28222, 0x00001C00 }, /* GL_RENDER */
+   { 28232, 0x00008D41 }, /* GL_RENDERBUFFER */
+   { 28248, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE */
+   { 28275, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_EXT */
+   { 28303, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE */
+   { 28329, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE */
+   { 28356, 0x00008D41 }, /* GL_RENDERBUFFER_EXT */
+   { 28376, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE */
+   { 28403, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT */
+   { 28426, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_EXT */
+   { 28453, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
+   { 28485, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */
+   { 28521, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE */
+   { 28546, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES */
+   { 28570, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE */
+   { 28599, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH */
+   { 28621, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_EXT */
+   { 28647, 0x00001F01 }, /* GL_RENDERER */
+   { 28659, 0x00000C40 }, /* GL_RENDER_MODE */
+   { 28674, 0x00002901 }, /* GL_REPEAT */
+   { 28684, 0x00001E01 }, /* GL_REPLACE */
+   { 28695, 0x00008062 }, /* GL_REPLACE_EXT */
+   { 28710, 0x00008153 }, /* GL_REPLICATE_BORDER_HP */
+   { 28733, 0x0000803A }, /* GL_RESCALE_NORMAL */
+   { 28751, 0x0000803A }, /* GL_RESCALE_NORMAL_EXT */
+   { 28773, 0x00000102 }, /* GL_RETURN */
+   { 28783, 0x00001907 }, /* GL_RGB */
+   { 28790, 0x00008052 }, /* GL_RGB10 */
+   { 28799, 0x00008059 }, /* GL_RGB10_A2 */
+   { 28811, 0x00008059 }, /* GL_RGB10_A2_EXT */
+   { 28827, 0x00008052 }, /* GL_RGB10_EXT */
+   { 28840, 0x00008053 }, /* GL_RGB12 */
+   { 28849, 0x00008053 }, /* GL_RGB12_EXT */
+   { 28862, 0x00008054 }, /* GL_RGB16 */
+   { 28871, 0x00008054 }, /* GL_RGB16_EXT */
+   { 28884, 0x0000804E }, /* GL_RGB2_EXT */
+   { 28896, 0x0000804F }, /* GL_RGB4 */
+   { 28904, 0x0000804F }, /* GL_RGB4_EXT */
+   { 28916, 0x000083A1 }, /* GL_RGB4_S3TC */
+   { 28929, 0x00008050 }, /* GL_RGB5 */
+   { 28937, 0x00008057 }, /* GL_RGB5_A1 */
+   { 28948, 0x00008057 }, /* GL_RGB5_A1_EXT */
+   { 28963, 0x00008050 }, /* GL_RGB5_EXT */
+   { 28975, 0x00008051 }, /* GL_RGB8 */
+   { 28983, 0x00008051 }, /* GL_RGB8_EXT */
+   { 28995, 0x00001908 }, /* GL_RGBA */
+   { 29003, 0x0000805A }, /* GL_RGBA12 */
+   { 29013, 0x0000805A }, /* GL_RGBA12_EXT */
+   { 29027, 0x0000805B }, /* GL_RGBA16 */
+   { 29037, 0x0000805B }, /* GL_RGBA16_EXT */
+   { 29051, 0x00008055 }, /* GL_RGBA2 */
+   { 29060, 0x00008055 }, /* GL_RGBA2_EXT */
+   { 29073, 0x00008056 }, /* GL_RGBA4 */
+   { 29082, 0x000083A5 }, /* GL_RGBA4_DXT5_S3TC */
+   { 29101, 0x00008056 }, /* GL_RGBA4_EXT */
+   { 29114, 0x000083A3 }, /* GL_RGBA4_S3TC */
+   { 29128, 0x00008058 }, /* GL_RGBA8 */
+   { 29137, 0x00008058 }, /* GL_RGBA8_EXT */
+   { 29150, 0x00008F97 }, /* GL_RGBA8_SNORM */
+   { 29165, 0x000083A4 }, /* GL_RGBA_DXT5_S3TC */
+   { 29183, 0x00000C31 }, /* GL_RGBA_MODE */
+   { 29196, 0x000083A2 }, /* GL_RGBA_S3TC */
+   { 29209, 0x00008F93 }, /* GL_RGBA_SNORM */
+   { 29223, 0x000083A0 }, /* GL_RGB_S3TC */
+   { 29235, 0x00008573 }, /* GL_RGB_SCALE */
+   { 29248, 0x00008573 }, /* GL_RGB_SCALE_ARB */
+   { 29265, 0x00008573 }, /* GL_RGB_SCALE_EXT */
+   { 29282, 0x00000407 }, /* GL_RIGHT */
+   { 29291, 0x00002000 }, /* GL_S */
+   { 29296, 0x00008B5D }, /* GL_SAMPLER_1D */
+   { 29310, 0x00008B61 }, /* GL_SAMPLER_1D_SHADOW */
+   { 29331, 0x00008B5E }, /* GL_SAMPLER_2D */
+   { 29345, 0x00008B62 }, /* GL_SAMPLER_2D_SHADOW */
+   { 29366, 0x00008B5F }, /* GL_SAMPLER_3D */
+   { 29380, 0x00008B60 }, /* GL_SAMPLER_CUBE */
+   { 29396, 0x000080A9 }, /* GL_SAMPLES */
+   { 29407, 0x000086B4 }, /* GL_SAMPLES_3DFX */
+   { 29423, 0x000080A9 }, /* GL_SAMPLES_ARB */
+   { 29438, 0x00008914 }, /* GL_SAMPLES_PASSED */
+   { 29456, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */
+   { 29478, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
+   { 29506, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */
+   { 29538, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */
+   { 29561, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */
+   { 29588, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */
+   { 29606, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */
+   { 29629, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */
+   { 29651, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */
+   { 29670, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */
+   { 29693, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */
+   { 29719, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */
+   { 29749, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */
+   { 29774, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */
+   { 29803, 0x00080000 }, /* GL_SCISSOR_BIT */
+   { 29818, 0x00000C10 }, /* GL_SCISSOR_BOX */
+   { 29833, 0x00000C11 }, /* GL_SCISSOR_TEST */
+   { 29849, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */
+   { 29874, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
+   { 29914, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */
+   { 29958, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
+   { 29991, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
+   { 30021, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
+   { 30053, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
+   { 30083, 0x00001C02 }, /* GL_SELECT */
+   { 30093, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */
+   { 30121, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */
+   { 30146, 0x00008012 }, /* GL_SEPARABLE_2D */
+   { 30162, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */
+   { 30189, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */
+   { 30220, 0x0000150F }, /* GL_SET */
+   { 30227, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */
+   { 30248, 0x00008B88 }, /* GL_SHADER_SOURCE_LENGTH */
+   { 30272, 0x00008B4F }, /* GL_SHADER_TYPE */
+   { 30287, 0x00000B54 }, /* GL_SHADE_MODEL */
+   { 30302, 0x00008B8C }, /* GL_SHADING_LANGUAGE_VERSION */
+   { 30330, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */
+   { 30353, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */
+   { 30383, 0x00001601 }, /* GL_SHININESS */
+   { 30396, 0x00001402 }, /* GL_SHORT */
+   { 30405, 0x00008F9C }, /* GL_SIGNED_NORMALIZED */
+   { 30426, 0x000081F9 }, /* GL_SINGLE_COLOR */
+   { 30442, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */
+   { 30462, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */
+   { 30481, 0x00008C46 }, /* GL_SLUMINANCE */
+   { 30495, 0x00008C47 }, /* GL_SLUMINANCE8 */
+   { 30510, 0x00008C45 }, /* GL_SLUMINANCE8_ALPHA8 */
+   { 30532, 0x00008C44 }, /* GL_SLUMINANCE_ALPHA */
+   { 30552, 0x00001D01 }, /* GL_SMOOTH */
+   { 30562, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */
+   { 30595, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */
+   { 30622, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */
+   { 30655, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */
+   { 30682, 0x00008588 }, /* GL_SOURCE0_ALPHA */
+   { 30699, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */
+   { 30720, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */
+   { 30741, 0x00008580 }, /* GL_SOURCE0_RGB */
+   { 30756, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */
+   { 30775, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */
+   { 30794, 0x00008589 }, /* GL_SOURCE1_ALPHA */
+   { 30811, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */
+   { 30832, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */
+   { 30853, 0x00008581 }, /* GL_SOURCE1_RGB */
+   { 30868, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */
+   { 30887, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */
+   { 30906, 0x0000858A }, /* GL_SOURCE2_ALPHA */
+   { 30923, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */
+   { 30944, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */
+   { 30965, 0x00008582 }, /* GL_SOURCE2_RGB */
+   { 30980, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */
+   { 30999, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */
+   { 31018, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */
+   { 31038, 0x00008583 }, /* GL_SOURCE3_RGB_NV */
+   { 31056, 0x00001202 }, /* GL_SPECULAR */
+   { 31068, 0x00002402 }, /* GL_SPHERE_MAP */
+   { 31082, 0x00001206 }, /* GL_SPOT_CUTOFF */
+   { 31097, 0x00001204 }, /* GL_SPOT_DIRECTION */
+   { 31115, 0x00001205 }, /* GL_SPOT_EXPONENT */
+   { 31132, 0x00008588 }, /* GL_SRC0_ALPHA */
+   { 31146, 0x00008580 }, /* GL_SRC0_RGB */
+   { 31158, 0x00008589 }, /* GL_SRC1_ALPHA */
+   { 31172, 0x00008581 }, /* GL_SRC1_RGB */
+   { 31184, 0x0000858A }, /* GL_SRC2_ALPHA */
+   { 31198, 0x00008582 }, /* GL_SRC2_RGB */
+   { 31210, 0x00000302 }, /* GL_SRC_ALPHA */
+   { 31223, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */
+   { 31245, 0x00000300 }, /* GL_SRC_COLOR */
+   { 31258, 0x00008C40 }, /* GL_SRGB */
+   { 31266, 0x00008C41 }, /* GL_SRGB8 */
+   { 31275, 0x00008C43 }, /* GL_SRGB8_ALPHA8 */
+   { 31291, 0x00008C42 }, /* GL_SRGB_ALPHA */
+   { 31305, 0x00000503 }, /* GL_STACK_OVERFLOW */
+   { 31323, 0x00000504 }, /* GL_STACK_UNDERFLOW */
+   { 31342, 0x000088E6 }, /* GL_STATIC_COPY */
+   { 31357, 0x000088E6 }, /* GL_STATIC_COPY_ARB */
+   { 31376, 0x000088E4 }, /* GL_STATIC_DRAW */
+   { 31391, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */
+   { 31410, 0x000088E5 }, /* GL_STATIC_READ */
+   { 31425, 0x000088E5 }, /* GL_STATIC_READ_ARB */
+   { 31444, 0x00001802 }, /* GL_STENCIL */
+   { 31455, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT */
+   { 31477, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */
+   { 31503, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */
+   { 31524, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */
+   { 31549, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
+   { 31570, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */
+   { 31595, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
+   { 31627, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */
+   { 31663, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
+   { 31695, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */
+   { 31731, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
+   { 31751, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
+   { 31778, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
+   { 31804, 0x00000D57 }, /* GL_STENCIL_BITS */
+   { 31820, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
+   { 31842, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
+   { 31865, 0x00000B94 }, /* GL_STENCIL_FAIL */
+   { 31881, 0x00000B92 }, /* GL_STENCIL_FUNC */
+   { 31897, 0x00001901 }, /* GL_STENCIL_INDEX */
+   { 31914, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
+   { 31937, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
+   { 31959, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
+   { 31981, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
+   { 32003, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
+   { 32024, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
+   { 32051, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
+   { 32078, 0x00000B97 }, /* GL_STENCIL_REF */
+   { 32093, 0x00000B90 }, /* GL_STENCIL_TEST */
+   { 32109, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
+   { 32138, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
+   { 32160, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
+   { 32181, 0x00000C33 }, /* GL_STEREO */
+   { 32191, 0x000088E2 }, /* GL_STREAM_COPY */
+   { 32206, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
+   { 32225, 0x000088E0 }, /* GL_STREAM_DRAW */
+   { 32240, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
+   { 32259, 0x000088E1 }, /* GL_STREAM_READ */
+   { 32274, 0x000088E1 }, /* GL_STREAM_READ_ARB */
+   { 32293, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
+   { 32310, 0x000084E7 }, /* GL_SUBTRACT */
+   { 32322, 0x000084E7 }, /* GL_SUBTRACT_ARB */
+   { 32338, 0x00002001 }, /* GL_T */
+   { 32343, 0x00002A2A }, /* GL_T2F_C3F_V3F */
+   { 32358, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
+   { 32377, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
+   { 32393, 0x00002A2B }, /* GL_T2F_N3F_V3F */
+   { 32408, 0x00002A27 }, /* GL_T2F_V3F */
+   { 32419, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
+   { 32438, 0x00002A28 }, /* GL_T4F_V4F */
+   { 32449, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
+   { 32472, 0x00001702 }, /* GL_TEXTURE */
+   { 32483, 0x000084C0 }, /* GL_TEXTURE0 */
+   { 32495, 0x000084C0 }, /* GL_TEXTURE0_ARB */
+   { 32511, 0x000084C1 }, /* GL_TEXTURE1 */
+   { 32523, 0x000084CA }, /* GL_TEXTURE10 */
+   { 32536, 0x000084CA }, /* GL_TEXTURE10_ARB */
+   { 32553, 0x000084CB }, /* GL_TEXTURE11 */
+   { 32566, 0x000084CB }, /* GL_TEXTURE11_ARB */
+   { 32583, 0x000084CC }, /* GL_TEXTURE12 */
+   { 32596, 0x000084CC }, /* GL_TEXTURE12_ARB */
+   { 32613, 0x000084CD }, /* GL_TEXTURE13 */
+   { 32626, 0x000084CD }, /* GL_TEXTURE13_ARB */
+   { 32643, 0x000084CE }, /* GL_TEXTURE14 */
+   { 32656, 0x000084CE }, /* GL_TEXTURE14_ARB */
+   { 32673, 0x000084CF }, /* GL_TEXTURE15 */
+   { 32686, 0x000084CF }, /* GL_TEXTURE15_ARB */
+   { 32703, 0x000084D0 }, /* GL_TEXTURE16 */
+   { 32716, 0x000084D0 }, /* GL_TEXTURE16_ARB */
+   { 32733, 0x000084D1 }, /* GL_TEXTURE17 */
+   { 32746, 0x000084D1 }, /* GL_TEXTURE17_ARB */
+   { 32763, 0x000084D2 }, /* GL_TEXTURE18 */
+   { 32776, 0x000084D2 }, /* GL_TEXTURE18_ARB */
+   { 32793, 0x000084D3 }, /* GL_TEXTURE19 */
+   { 32806, 0x000084D3 }, /* GL_TEXTURE19_ARB */
+   { 32823, 0x000084C1 }, /* GL_TEXTURE1_ARB */
+   { 32839, 0x000084C2 }, /* GL_TEXTURE2 */
+   { 32851, 0x000084D4 }, /* GL_TEXTURE20 */
+   { 32864, 0x000084D4 }, /* GL_TEXTURE20_ARB */
+   { 32881, 0x000084D5 }, /* GL_TEXTURE21 */
+   { 32894, 0x000084D5 }, /* GL_TEXTURE21_ARB */
+   { 32911, 0x000084D6 }, /* GL_TEXTURE22 */
+   { 32924, 0x000084D6 }, /* GL_TEXTURE22_ARB */
+   { 32941, 0x000084D7 }, /* GL_TEXTURE23 */
+   { 32954, 0x000084D7 }, /* GL_TEXTURE23_ARB */
+   { 32971, 0x000084D8 }, /* GL_TEXTURE24 */
+   { 32984, 0x000084D8 }, /* GL_TEXTURE24_ARB */
+   { 33001, 0x000084D9 }, /* GL_TEXTURE25 */
+   { 33014, 0x000084D9 }, /* GL_TEXTURE25_ARB */
+   { 33031, 0x000084DA }, /* GL_TEXTURE26 */
+   { 33044, 0x000084DA }, /* GL_TEXTURE26_ARB */
+   { 33061, 0x000084DB }, /* GL_TEXTURE27 */
+   { 33074, 0x000084DB }, /* GL_TEXTURE27_ARB */
+   { 33091, 0x000084DC }, /* GL_TEXTURE28 */
+   { 33104, 0x000084DC }, /* GL_TEXTURE28_ARB */
+   { 33121, 0x000084DD }, /* GL_TEXTURE29 */
+   { 33134, 0x000084DD }, /* GL_TEXTURE29_ARB */
+   { 33151, 0x000084C2 }, /* GL_TEXTURE2_ARB */
+   { 33167, 0x000084C3 }, /* GL_TEXTURE3 */
+   { 33179, 0x000084DE }, /* GL_TEXTURE30 */
+   { 33192, 0x000084DE }, /* GL_TEXTURE30_ARB */
+   { 33209, 0x000084DF }, /* GL_TEXTURE31 */
+   { 33222, 0x000084DF }, /* GL_TEXTURE31_ARB */
+   { 33239, 0x000084C3 }, /* GL_TEXTURE3_ARB */
+   { 33255, 0x000084C4 }, /* GL_TEXTURE4 */
+   { 33267, 0x000084C4 }, /* GL_TEXTURE4_ARB */
+   { 33283, 0x000084C5 }, /* GL_TEXTURE5 */
+   { 33295, 0x000084C5 }, /* GL_TEXTURE5_ARB */
+   { 33311, 0x000084C6 }, /* GL_TEXTURE6 */
+   { 33323, 0x000084C6 }, /* GL_TEXTURE6_ARB */
+   { 33339, 0x000084C7 }, /* GL_TEXTURE7 */
+   { 33351, 0x000084C7 }, /* GL_TEXTURE7_ARB */
+   { 33367, 0x000084C8 }, /* GL_TEXTURE8 */
+   { 33379, 0x000084C8 }, /* GL_TEXTURE8_ARB */
+   { 33395, 0x000084C9 }, /* GL_TEXTURE9 */
+   { 33407, 0x000084C9 }, /* GL_TEXTURE9_ARB */
+   { 33423, 0x00000DE0 }, /* GL_TEXTURE_1D */
+   { 33437, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
+   { 33461, 0x00000DE1 }, /* GL_TEXTURE_2D */
+   { 33475, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
+   { 33499, 0x0000806F }, /* GL_TEXTURE_3D */
+   { 33513, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
+   { 33535, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
+   { 33561, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
+   { 33583, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
+   { 33605, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
+   { 33637, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
+   { 33659, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
+   { 33691, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
+   { 33713, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
+   { 33741, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
+   { 33773, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
+   { 33806, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
+   { 33838, 0x00040000 }, /* GL_TEXTURE_BIT */
+   { 33853, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
+   { 33874, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
+   { 33899, 0x00001005 }, /* GL_TEXTURE_BORDER */
+   { 33917, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
+   { 33941, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
+   { 33972, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
+   { 34002, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
+   { 34032, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
+   { 34067, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
+   { 34098, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+   { 34136, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
+   { 34163, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
+   { 34195, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+   { 34229, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
+   { 34253, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
+   { 34281, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
+   { 34305, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
+   { 34333, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
+   { 34366, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
+   { 34390, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
+   { 34412, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
+   { 34434, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
+   { 34460, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
+   { 34494, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
+   { 34527, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
+   { 34564, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
+   { 34592, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
+   { 34624, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
+   { 34647, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
+   { 34685, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
+   { 34727, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
+   { 34758, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
+   { 34786, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
+   { 34816, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
+   { 34844, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
+   { 34864, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
+   { 34888, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
+   { 34919, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
+   { 34954, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
+   { 34985, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
+   { 35020, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
+   { 35051, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
+   { 35086, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
+   { 35117, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
+   { 35152, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
+   { 35183, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
+   { 35218, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
+   { 35249, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
+   { 35284, 0x00008071 }, /* GL_TEXTURE_DEPTH */
+   { 35301, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
+   { 35323, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
+   { 35349, 0x00002300 }, /* GL_TEXTURE_ENV */
+   { 35364, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
+   { 35385, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
+   { 35405, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
+   { 35431, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
+   { 35451, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
+   { 35468, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
+   { 35485, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
+   { 35502, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
+   { 35519, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
+   { 35544, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
+   { 35566, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
+   { 35592, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
+   { 35610, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
+   { 35636, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
+   { 35662, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
+   { 35692, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
+   { 35719, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
+   { 35744, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
+   { 35764, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
+   { 35788, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+   { 35815, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+   { 35842, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+   { 35869, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
+   { 35895, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
+   { 35925, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
+   { 35947, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
+   { 35965, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+   { 35995, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+   { 36023, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+   { 36051, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+   { 36079, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
+   { 36100, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
+   { 36119, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
+   { 36141, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
+   { 36160, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
+   { 36180, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
+   { 36205, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
+   { 36229, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
+   { 36249, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
+   { 36273, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
+   { 36293, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
+   { 36316, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */
+   { 36340, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
+   { 36365, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+   { 36399, 0x00001000 }, /* GL_TEXTURE_WIDTH */
+   { 36416, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
+   { 36434, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
+   { 36452, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
+   { 36470, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
+   { 36490, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
+   { 36509, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+   { 36538, 0x00001000 }, /* GL_TRANSFORM_BIT */
+   { 36555, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
+   { 36581, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
+   { 36611, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+   { 36643, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+   { 36673, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
+   { 36707, 0x0000862C }, /* GL_TRANSPOSE_NV */
+   { 36723, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+   { 36754, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
+   { 36789, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+   { 36817, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
+   { 36849, 0x00000004 }, /* GL_TRIANGLES */
+   { 36862, 0x00000006 }, /* GL_TRIANGLE_FAN */
+   { 36878, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
+   { 36899, 0x00000005 }, /* GL_TRIANGLE_STRIP */
+   { 36917, 0x00000001 }, /* GL_TRUE */
+   { 36925, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
+   { 36945, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
+   { 36968, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
+   { 36988, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
+   { 37009, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
+   { 37031, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
+   { 37053, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
+   { 37073, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
+   { 37094, 0x00001401 }, /* GL_UNSIGNED_BYTE */
+   { 37111, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+   { 37138, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
+   { 37161, 0x00001405 }, /* GL_UNSIGNED_INT */
+   { 37177, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
+   { 37204, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */
+   { 37225, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
+   { 37249, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+   { 37280, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
+   { 37304, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+   { 37332, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */
+   { 37355, 0x00001403 }, /* GL_UNSIGNED_SHORT */
+   { 37373, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+   { 37403, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+   { 37429, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+   { 37459, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+   { 37485, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
+   { 37509, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+   { 37537, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+   { 37565, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
+   { 37592, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+   { 37624, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
+   { 37655, 0x00008CA2 }, /* GL_UPPER_LEFT */
+   { 37669, 0x00002A20 }, /* GL_V2F */
+   { 37676, 0x00002A21 }, /* GL_V3F */
+   { 37683, 0x00008B83 }, /* GL_VALIDATE_STATUS */
+   { 37702, 0x00001F00 }, /* GL_VENDOR */
+   { 37712, 0x00001F02 }, /* GL_VERSION */
+   { 37723, 0x00008074 }, /* GL_VERTEX_ARRAY */
+   { 37739, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
+   { 37769, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+   { 37800, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
+   { 37835, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
+   { 37859, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
+   { 37880, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
+   { 37903, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
+   { 37924, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+   { 37951, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+   { 37979, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+   { 38007, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+   { 38035, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+   { 38063, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+   { 38091, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+   { 38119, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+   { 38146, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+   { 38173, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+   { 38200, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+   { 38227, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+   { 38254, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+   { 38281, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+   { 38308, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+   { 38335, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+   { 38362, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+   { 38400, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
+   { 38442, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+   { 38473, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
+   { 38508, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+   { 38542, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
+   { 38580, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+   { 38611, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
+   { 38646, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+   { 38674, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
+   { 38706, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+   { 38736, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
+   { 38770, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+   { 38798, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
+   { 38830, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
+   { 38850, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
+   { 38872, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
+   { 38901, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
+   { 38922, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
+   { 38951, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
+   { 38984, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
+   { 39016, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+   { 39043, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
+   { 39074, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
+   { 39104, 0x00008B31 }, /* GL_VERTEX_SHADER */
+   { 39121, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
+   { 39142, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
+   { 39169, 0x00000BA2 }, /* GL_VIEWPORT */
+   { 39181, 0x00000800 }, /* GL_VIEWPORT_BIT */
+   { 39197, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
+   { 39217, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+   { 39248, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
+   { 39283, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+   { 39311, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+   { 39336, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+   { 39363, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+   { 39388, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
+   { 39412, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
+   { 39431, 0x000088B9 }, /* GL_WRITE_ONLY */
+   { 39445, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
+   { 39463, 0x00001506 }, /* GL_XOR */
+   { 39470, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
+   { 39489, 0x00008757 }, /* GL_YCBCR_MESA */
+   { 39503, 0x00000000 }, /* GL_ZERO */
+   { 39511, 0x00000D16 }, /* GL_ZOOM_X */
+   { 39521, 0x00000D17 }, /* GL_ZOOM_Y */
 };
 
-static const unsigned reduced_enums[1319] =
+static const unsigned reduced_enums[1323] =
 {
        469, /* GL_FALSE */
-       683, /* GL_LINES */
-       685, /* GL_LINE_LOOP */
-       692, /* GL_LINE_STRIP */
-      1709, /* GL_TRIANGLES */
-      1712, /* GL_TRIANGLE_STRIP */
-      1710, /* GL_TRIANGLE_FAN */
-      1254, /* GL_QUADS */
-      1256, /* GL_QUAD_STRIP */
-      1142, /* GL_POLYGON */
-      1154, /* GL_POLYGON_STIPPLE_BIT */
-      1103, /* GL_PIXEL_MODE_BIT */
-       670, /* GL_LIGHTING_BIT */
-       497, /* GL_FOG_BIT */
+       685, /* GL_LINES */
+       687, /* GL_LINE_LOOP */
+       694, /* GL_LINE_STRIP */
+      1713, /* GL_TRIANGLES */
+      1716, /* GL_TRIANGLE_STRIP */
+      1714, /* GL_TRIANGLE_FAN */
+      1257, /* GL_QUADS */
+      1260, /* GL_QUAD_STRIP */
+      1144, /* GL_POLYGON */
+      1156, /* GL_POLYGON_STIPPLE_BIT */
+      1105, /* GL_PIXEL_MODE_BIT */
+       672, /* GL_LIGHTING_BIT */
+       498, /* GL_FOG_BIT */
          8, /* GL_ACCUM */
-       702, /* GL_LOAD */
-      1308, /* GL_RETURN */
-       976, /* GL_MULT */
+       704, /* GL_LOAD */
+      1312, /* GL_RETURN */
+       978, /* GL_MULT */
         23, /* GL_ADD */
-       992, /* GL_NEVER */
-       660, /* GL_LESS */
+       994, /* GL_NEVER */
+       662, /* GL_LESS */
        459, /* GL_EQUAL */
-       659, /* GL_LEQUAL */
-       583, /* GL_GREATER */
-      1007, /* GL_NOTEQUAL */
-       582, /* GL_GEQUAL */
+       661, /* GL_LEQUAL */
+       584, /* GL_GREATER */
+      1009, /* GL_NOTEQUAL */
+       583, /* GL_GEQUAL */
         46, /* GL_ALWAYS */
-      1448, /* GL_SRC_COLOR */
-      1036, /* GL_ONE_MINUS_SRC_COLOR */
-      1446, /* GL_SRC_ALPHA */
-      1035, /* GL_ONE_MINUS_SRC_ALPHA */
+      1452, /* GL_SRC_COLOR */
+      1038, /* GL_ONE_MINUS_SRC_COLOR */
+      1450, /* GL_SRC_ALPHA */
+      1037, /* GL_ONE_MINUS_SRC_ALPHA */
        438, /* GL_DST_ALPHA */
-      1033, /* GL_ONE_MINUS_DST_ALPHA */
+      1035, /* GL_ONE_MINUS_DST_ALPHA */
        439, /* GL_DST_COLOR */
-      1034, /* GL_ONE_MINUS_DST_COLOR */
-      1447, /* GL_SRC_ALPHA_SATURATE */
-       570, /* GL_FRONT_LEFT */
-       571, /* GL_FRONT_RIGHT */
+      1036, /* GL_ONE_MINUS_DST_COLOR */
+      1451, /* GL_SRC_ALPHA_SATURATE */
+       571, /* GL_FRONT_LEFT */
+       572, /* GL_FRONT_RIGHT */
         68, /* GL_BACK_LEFT */
         69, /* GL_BACK_RIGHT */
-       567, /* GL_FRONT */
+       568, /* GL_FRONT */
         67, /* GL_BACK */
-       658, /* GL_LEFT */
-      1350, /* GL_RIGHT */
-       568, /* GL_FRONT_AND_BACK */
+       660, /* GL_LEFT */
+      1354, /* GL_RIGHT */
+       569, /* GL_FRONT_AND_BACK */
         62, /* GL_AUX0 */
         63, /* GL_AUX1 */
         64, /* GL_AUX2 */
         65, /* GL_AUX3 */
-       649, /* GL_INVALID_ENUM */
-       653, /* GL_INVALID_VALUE */
-       652, /* GL_INVALID_OPERATION */
-      1453, /* GL_STACK_OVERFLOW */
-      1454, /* GL_STACK_UNDERFLOW */
-      1061, /* GL_OUT_OF_MEMORY */
-       650, /* GL_INVALID_FRAMEBUFFER_OPERATION */
+       650, /* GL_INVALID_ENUM */
+       654, /* GL_INVALID_VALUE */
+       653, /* GL_INVALID_OPERATION */
+      1457, /* GL_STACK_OVERFLOW */
+      1458, /* GL_STACK_UNDERFLOW */
+      1063, /* GL_OUT_OF_MEMORY */
+       651, /* GL_INVALID_FRAMEBUFFER_OPERATION */
          0, /* GL_2D */
          2, /* GL_3D */
          3, /* GL_3D_COLOR */
          4, /* GL_3D_COLOR_TEXTURE */
          6, /* GL_4D_COLOR_TEXTURE */
-      1081, /* GL_PASS_THROUGH_TOKEN */
-      1141, /* GL_POINT_TOKEN */
-       693, /* GL_LINE_TOKEN */
-      1155, /* GL_POLYGON_TOKEN */
+      1083, /* GL_PASS_THROUGH_TOKEN */
+      1143, /* GL_POINT_TOKEN */
+       695, /* GL_LINE_TOKEN */
+      1157, /* GL_POLYGON_TOKEN */
         73, /* GL_BITMAP_TOKEN */
        437, /* GL_DRAW_PIXEL_TOKEN */
        297, /* GL_COPY_PIXEL_TOKEN */
-       686, /* GL_LINE_RESET_TOKEN */
+       688, /* GL_LINE_RESET_TOKEN */
        462, /* GL_EXP */
        463, /* GL_EXP2 */
        331, /* GL_CW */
        122, /* GL_CCW */
        143, /* GL_COEFF */
-      1058, /* GL_ORDER */
+      1060, /* GL_ORDER */
        375, /* GL_DOMAIN */
        305, /* GL_CURRENT_COLOR */
        308, /* GL_CURRENT_INDEX */
@@ -3770,67 +3778,67 @@ static const unsigned reduced_enums[1319] =
        322, /* GL_CURRENT_RASTER_POSITION */
        323, /* GL_CURRENT_RASTER_POSITION_VALID */
        320, /* GL_CURRENT_RASTER_DISTANCE */
-      1134, /* GL_POINT_SMOOTH */
-      1123, /* GL_POINT_SIZE */
-      1133, /* GL_POINT_SIZE_RANGE */
-      1124, /* GL_POINT_SIZE_GRANULARITY */
-       687, /* GL_LINE_SMOOTH */
-       694, /* GL_LINE_WIDTH */
-       696, /* GL_LINE_WIDTH_RANGE */
-       695, /* GL_LINE_WIDTH_GRANULARITY */
-       689, /* GL_LINE_STIPPLE */
-       690, /* GL_LINE_STIPPLE_PATTERN */
-       691, /* GL_LINE_STIPPLE_REPEAT */
-       701, /* GL_LIST_MODE */
-       860, /* GL_MAX_LIST_NESTING */
-       698, /* GL_LIST_BASE */
-       700, /* GL_LIST_INDEX */
-      1144, /* GL_POLYGON_MODE */
-      1151, /* GL_POLYGON_SMOOTH */
-      1153, /* GL_POLYGON_STIPPLE */
+      1136, /* GL_POINT_SMOOTH */
+      1125, /* GL_POINT_SIZE */
+      1135, /* GL_POINT_SIZE_RANGE */
+      1126, /* GL_POINT_SIZE_GRANULARITY */
+       689, /* GL_LINE_SMOOTH */
+       696, /* GL_LINE_WIDTH */
+       698, /* GL_LINE_WIDTH_RANGE */
+       697, /* GL_LINE_WIDTH_GRANULARITY */
+       691, /* GL_LINE_STIPPLE */
+       692, /* GL_LINE_STIPPLE_PATTERN */
+       693, /* GL_LINE_STIPPLE_REPEAT */
+       703, /* GL_LIST_MODE */
+       862, /* GL_MAX_LIST_NESTING */
+       700, /* GL_LIST_BASE */
+       702, /* GL_LIST_INDEX */
+      1146, /* GL_POLYGON_MODE */
+      1153, /* GL_POLYGON_SMOOTH */
+      1155, /* GL_POLYGON_STIPPLE */
        448, /* GL_EDGE_FLAG */
        298, /* GL_CULL_FACE */
        299, /* GL_CULL_FACE_MODE */
-       569, /* GL_FRONT_FACE */
-       669, /* GL_LIGHTING */
-       674, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
-       675, /* GL_LIGHT_MODEL_TWO_SIDE */
-       671, /* GL_LIGHT_MODEL_AMBIENT */
-      1396, /* GL_SHADE_MODEL */
+       570, /* GL_FRONT_FACE */
+       671, /* GL_LIGHTING */
+       676, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
+       677, /* GL_LIGHT_MODEL_TWO_SIDE */
+       673, /* GL_LIGHT_MODEL_AMBIENT */
+      1400, /* GL_SHADE_MODEL */
        190, /* GL_COLOR_MATERIAL_FACE */
        191, /* GL_COLOR_MATERIAL_PARAMETER */
        189, /* GL_COLOR_MATERIAL */
-       496, /* GL_FOG */
-       518, /* GL_FOG_INDEX */
-       514, /* GL_FOG_DENSITY */
-       522, /* GL_FOG_START */
-       516, /* GL_FOG_END */
-       519, /* GL_FOG_MODE */
-       498, /* GL_FOG_COLOR */
+       497, /* GL_FOG */
+       519, /* GL_FOG_INDEX */
+       515, /* GL_FOG_DENSITY */
+       523, /* GL_FOG_START */
+       517, /* GL_FOG_END */
+       520, /* GL_FOG_MODE */
+       499, /* GL_FOG_COLOR */
        362, /* GL_DEPTH_RANGE */
        369, /* GL_DEPTH_TEST */
        372, /* GL_DEPTH_WRITEMASK */
        350, /* GL_DEPTH_CLEAR_VALUE */
        361, /* GL_DEPTH_FUNC */
         12, /* GL_ACCUM_CLEAR_VALUE */
-      1489, /* GL_STENCIL_TEST */
-      1477, /* GL_STENCIL_CLEAR_VALUE */
-      1479, /* GL_STENCIL_FUNC */
-      1491, /* GL_STENCIL_VALUE_MASK */
-      1478, /* GL_STENCIL_FAIL */
-      1486, /* GL_STENCIL_PASS_DEPTH_FAIL */
-      1487, /* GL_STENCIL_PASS_DEPTH_PASS */
-      1488, /* GL_STENCIL_REF */
-      1492, /* GL_STENCIL_WRITEMASK */
-       829, /* GL_MATRIX_MODE */
-       997, /* GL_NORMALIZE */
-      1801, /* GL_VIEWPORT */
-       971, /* GL_MODELVIEW_STACK_DEPTH */
-      1234, /* GL_PROJECTION_STACK_DEPTH */
-      1687, /* GL_TEXTURE_STACK_DEPTH */
-       969, /* GL_MODELVIEW_MATRIX */
-      1233, /* GL_PROJECTION_MATRIX */
-      1672, /* GL_TEXTURE_MATRIX */
+      1493, /* GL_STENCIL_TEST */
+      1481, /* GL_STENCIL_CLEAR_VALUE */
+      1483, /* GL_STENCIL_FUNC */
+      1495, /* GL_STENCIL_VALUE_MASK */
+      1482, /* GL_STENCIL_FAIL */
+      1490, /* GL_STENCIL_PASS_DEPTH_FAIL */
+      1491, /* GL_STENCIL_PASS_DEPTH_PASS */
+      1492, /* GL_STENCIL_REF */
+      1496, /* GL_STENCIL_WRITEMASK */
+       831, /* GL_MATRIX_MODE */
+       999, /* GL_NORMALIZE */
+      1805, /* GL_VIEWPORT */
+       973, /* GL_MODELVIEW_STACK_DEPTH */
+      1236, /* GL_PROJECTION_STACK_DEPTH */
+      1691, /* GL_TEXTURE_STACK_DEPTH */
+       971, /* GL_MODELVIEW_MATRIX */
+      1235, /* GL_PROJECTION_MATRIX */
+      1676, /* GL_TEXTURE_MATRIX */
         60, /* GL_ATTRIB_STACK_DEPTH */
        133, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
         43, /* GL_ALPHA_TEST */
@@ -3840,162 +3848,162 @@ static const unsigned reduced_enums[1319] =
         77, /* GL_BLEND_DST */
         86, /* GL_BLEND_SRC */
         74, /* GL_BLEND */
-       704, /* GL_LOGIC_OP_MODE */
-       623, /* GL_INDEX_LOGIC_OP */
+       706, /* GL_LOGIC_OP_MODE */
+       624, /* GL_INDEX_LOGIC_OP */
        188, /* GL_COLOR_LOGIC_OP */
         66, /* GL_AUX_BUFFERS */
        385, /* GL_DRAW_BUFFER */
-      1266, /* GL_READ_BUFFER */
-      1377, /* GL_SCISSOR_BOX */
-      1378, /* GL_SCISSOR_TEST */
-       622, /* GL_INDEX_CLEAR_VALUE */
-       627, /* GL_INDEX_WRITEMASK */
+      1270, /* GL_READ_BUFFER */
+      1381, /* GL_SCISSOR_BOX */
+      1382, /* GL_SCISSOR_TEST */
+       623, /* GL_INDEX_CLEAR_VALUE */
+       628, /* GL_INDEX_WRITEMASK */
        185, /* GL_COLOR_CLEAR_VALUE */
        227, /* GL_COLOR_WRITEMASK */
-       624, /* GL_INDEX_MODE */
-      1343, /* GL_RGBA_MODE */
+       625, /* GL_INDEX_MODE */
+      1347, /* GL_RGBA_MODE */
        384, /* GL_DOUBLEBUFFER */
-      1493, /* GL_STEREO */
-      1301, /* GL_RENDER_MODE */
-      1082, /* GL_PERSPECTIVE_CORRECTION_HINT */
-      1135, /* GL_POINT_SMOOTH_HINT */
-       688, /* GL_LINE_SMOOTH_HINT */
-      1152, /* GL_POLYGON_SMOOTH_HINT */
-       517, /* GL_FOG_HINT */
-      1653, /* GL_TEXTURE_GEN_S */
-      1654, /* GL_TEXTURE_GEN_T */
-      1652, /* GL_TEXTURE_GEN_R */
-      1651, /* GL_TEXTURE_GEN_Q */
-      1095, /* GL_PIXEL_MAP_I_TO_I */
-      1101, /* GL_PIXEL_MAP_S_TO_S */
-      1097, /* GL_PIXEL_MAP_I_TO_R */
-      1093, /* GL_PIXEL_MAP_I_TO_G */
-      1091, /* GL_PIXEL_MAP_I_TO_B */
-      1089, /* GL_PIXEL_MAP_I_TO_A */
-      1099, /* GL_PIXEL_MAP_R_TO_R */
-      1087, /* GL_PIXEL_MAP_G_TO_G */
-      1085, /* GL_PIXEL_MAP_B_TO_B */
-      1083, /* GL_PIXEL_MAP_A_TO_A */
-      1096, /* GL_PIXEL_MAP_I_TO_I_SIZE */
-      1102, /* GL_PIXEL_MAP_S_TO_S_SIZE */
-      1098, /* GL_PIXEL_MAP_I_TO_R_SIZE */
-      1094, /* GL_PIXEL_MAP_I_TO_G_SIZE */
-      1092, /* GL_PIXEL_MAP_I_TO_B_SIZE */
-      1090, /* GL_PIXEL_MAP_I_TO_A_SIZE */
-      1100, /* GL_PIXEL_MAP_R_TO_R_SIZE */
-      1088, /* GL_PIXEL_MAP_G_TO_G_SIZE */
-      1086, /* GL_PIXEL_MAP_B_TO_B_SIZE */
-      1084, /* GL_PIXEL_MAP_A_TO_A_SIZE */
-      1721, /* GL_UNPACK_SWAP_BYTES */
-      1716, /* GL_UNPACK_LSB_FIRST */
-      1717, /* GL_UNPACK_ROW_LENGTH */
-      1720, /* GL_UNPACK_SKIP_ROWS */
-      1719, /* GL_UNPACK_SKIP_PIXELS */
-      1714, /* GL_UNPACK_ALIGNMENT */
-      1070, /* GL_PACK_SWAP_BYTES */
-      1065, /* GL_PACK_LSB_FIRST */
-      1066, /* GL_PACK_ROW_LENGTH */
-      1069, /* GL_PACK_SKIP_ROWS */
-      1068, /* GL_PACK_SKIP_PIXELS */
-      1062, /* GL_PACK_ALIGNMENT */
-       782, /* GL_MAP_COLOR */
-       783, /* GL_MAP_STENCIL */
-       626, /* GL_INDEX_SHIFT */
-       625, /* GL_INDEX_OFFSET */
-      1279, /* GL_RED_SCALE */
-      1277, /* GL_RED_BIAS */
-      1818, /* GL_ZOOM_X */
-      1819, /* GL_ZOOM_Y */
-       587, /* GL_GREEN_SCALE */
-       585, /* GL_GREEN_BIAS */
+      1497, /* GL_STEREO */
+      1305, /* GL_RENDER_MODE */
+      1084, /* GL_PERSPECTIVE_CORRECTION_HINT */
+      1137, /* GL_POINT_SMOOTH_HINT */
+       690, /* GL_LINE_SMOOTH_HINT */
+      1154, /* GL_POLYGON_SMOOTH_HINT */
+       518, /* GL_FOG_HINT */
+      1657, /* GL_TEXTURE_GEN_S */
+      1658, /* GL_TEXTURE_GEN_T */
+      1656, /* GL_TEXTURE_GEN_R */
+      1655, /* GL_TEXTURE_GEN_Q */
+      1097, /* GL_PIXEL_MAP_I_TO_I */
+      1103, /* GL_PIXEL_MAP_S_TO_S */
+      1099, /* GL_PIXEL_MAP_I_TO_R */
+      1095, /* GL_PIXEL_MAP_I_TO_G */
+      1093, /* GL_PIXEL_MAP_I_TO_B */
+      1091, /* GL_PIXEL_MAP_I_TO_A */
+      1101, /* GL_PIXEL_MAP_R_TO_R */
+      1089, /* GL_PIXEL_MAP_G_TO_G */
+      1087, /* GL_PIXEL_MAP_B_TO_B */
+      1085, /* GL_PIXEL_MAP_A_TO_A */
+      1098, /* GL_PIXEL_MAP_I_TO_I_SIZE */
+      1104, /* GL_PIXEL_MAP_S_TO_S_SIZE */
+      1100, /* GL_PIXEL_MAP_I_TO_R_SIZE */
+      1096, /* GL_PIXEL_MAP_I_TO_G_SIZE */
+      1094, /* GL_PIXEL_MAP_I_TO_B_SIZE */
+      1092, /* GL_PIXEL_MAP_I_TO_A_SIZE */
+      1102, /* GL_PIXEL_MAP_R_TO_R_SIZE */
+      1090, /* GL_PIXEL_MAP_G_TO_G_SIZE */
+      1088, /* GL_PIXEL_MAP_B_TO_B_SIZE */
+      1086, /* GL_PIXEL_MAP_A_TO_A_SIZE */
+      1725, /* GL_UNPACK_SWAP_BYTES */
+      1720, /* GL_UNPACK_LSB_FIRST */
+      1721, /* GL_UNPACK_ROW_LENGTH */
+      1724, /* GL_UNPACK_SKIP_ROWS */
+      1723, /* GL_UNPACK_SKIP_PIXELS */
+      1718, /* GL_UNPACK_ALIGNMENT */
+      1072, /* GL_PACK_SWAP_BYTES */
+      1067, /* GL_PACK_LSB_FIRST */
+      1068, /* GL_PACK_ROW_LENGTH */
+      1071, /* GL_PACK_SKIP_ROWS */
+      1070, /* GL_PACK_SKIP_PIXELS */
+      1064, /* GL_PACK_ALIGNMENT */
+       784, /* GL_MAP_COLOR */
+       785, /* GL_MAP_STENCIL */
+       627, /* GL_INDEX_SHIFT */
+       626, /* GL_INDEX_OFFSET */
+      1283, /* GL_RED_SCALE */
+      1281, /* GL_RED_BIAS */
+      1822, /* GL_ZOOM_X */
+      1823, /* GL_ZOOM_Y */
+       588, /* GL_GREEN_SCALE */
+       586, /* GL_GREEN_BIAS */
         92, /* GL_BLUE_SCALE */
         90, /* GL_BLUE_BIAS */
         42, /* GL_ALPHA_SCALE */
         40, /* GL_ALPHA_BIAS */
        363, /* GL_DEPTH_SCALE */
        344, /* GL_DEPTH_BIAS */
-       855, /* GL_MAX_EVAL_ORDER */
-       859, /* GL_MAX_LIGHTS */
-       838, /* GL_MAX_CLIP_PLANES */
-       904, /* GL_MAX_TEXTURE_SIZE */
-       865, /* GL_MAX_PIXEL_MAP_TABLE */
-       834, /* GL_MAX_ATTRIB_STACK_DEPTH */
-       862, /* GL_MAX_MODELVIEW_STACK_DEPTH */
-       863, /* GL_MAX_NAME_STACK_DEPTH */
-       891, /* GL_MAX_PROJECTION_STACK_DEPTH */
-       905, /* GL_MAX_TEXTURE_STACK_DEPTH */
-       919, /* GL_MAX_VIEWPORT_DIMS */
-       835, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
-      1500, /* GL_SUBPIXEL_BITS */
-       621, /* GL_INDEX_BITS */
-      1278, /* GL_RED_BITS */
-       586, /* GL_GREEN_BITS */
+       857, /* GL_MAX_EVAL_ORDER */
+       861, /* GL_MAX_LIGHTS */
+       840, /* GL_MAX_CLIP_PLANES */
+       906, /* GL_MAX_TEXTURE_SIZE */
+       867, /* GL_MAX_PIXEL_MAP_TABLE */
+       836, /* GL_MAX_ATTRIB_STACK_DEPTH */
+       864, /* GL_MAX_MODELVIEW_STACK_DEPTH */
+       865, /* GL_MAX_NAME_STACK_DEPTH */
+       893, /* GL_MAX_PROJECTION_STACK_DEPTH */
+       907, /* GL_MAX_TEXTURE_STACK_DEPTH */
+       921, /* GL_MAX_VIEWPORT_DIMS */
+       837, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
+      1504, /* GL_SUBPIXEL_BITS */
+       622, /* GL_INDEX_BITS */
+      1282, /* GL_RED_BITS */
+       587, /* GL_GREEN_BITS */
         91, /* GL_BLUE_BITS */
         41, /* GL_ALPHA_BITS */
        345, /* GL_DEPTH_BITS */
-      1475, /* GL_STENCIL_BITS */
+      1479, /* GL_STENCIL_BITS */
         14, /* GL_ACCUM_RED_BITS */
         13, /* GL_ACCUM_GREEN_BITS */
         10, /* GL_ACCUM_BLUE_BITS */
          9, /* GL_ACCUM_ALPHA_BITS */
-       985, /* GL_NAME_STACK_DEPTH */
+       987, /* GL_NAME_STACK_DEPTH */
         61, /* GL_AUTO_NORMAL */
-       728, /* GL_MAP1_COLOR_4 */
-       731, /* GL_MAP1_INDEX */
-       732, /* GL_MAP1_NORMAL */
-       733, /* GL_MAP1_TEXTURE_COORD_1 */
-       734, /* GL_MAP1_TEXTURE_COORD_2 */
-       735, /* GL_MAP1_TEXTURE_COORD_3 */
-       736, /* GL_MAP1_TEXTURE_COORD_4 */
-       737, /* GL_MAP1_VERTEX_3 */
-       738, /* GL_MAP1_VERTEX_4 */
-       755, /* GL_MAP2_COLOR_4 */
-       758, /* GL_MAP2_INDEX */
-       759, /* GL_MAP2_NORMAL */
-       760, /* GL_MAP2_TEXTURE_COORD_1 */
-       761, /* GL_MAP2_TEXTURE_COORD_2 */
-       762, /* GL_MAP2_TEXTURE_COORD_3 */
-       763, /* GL_MAP2_TEXTURE_COORD_4 */
-       764, /* GL_MAP2_VERTEX_3 */
-       765, /* GL_MAP2_VERTEX_4 */
-       729, /* GL_MAP1_GRID_DOMAIN */
-       730, /* GL_MAP1_GRID_SEGMENTS */
-       756, /* GL_MAP2_GRID_DOMAIN */
-       757, /* GL_MAP2_GRID_SEGMENTS */
-      1577, /* GL_TEXTURE_1D */
-      1579, /* GL_TEXTURE_2D */
+       730, /* GL_MAP1_COLOR_4 */
+       733, /* GL_MAP1_INDEX */
+       734, /* GL_MAP1_NORMAL */
+       735, /* GL_MAP1_TEXTURE_COORD_1 */
+       736, /* GL_MAP1_TEXTURE_COORD_2 */
+       737, /* GL_MAP1_TEXTURE_COORD_3 */
+       738, /* GL_MAP1_TEXTURE_COORD_4 */
+       739, /* GL_MAP1_VERTEX_3 */
+       740, /* GL_MAP1_VERTEX_4 */
+       757, /* GL_MAP2_COLOR_4 */
+       760, /* GL_MAP2_INDEX */
+       761, /* GL_MAP2_NORMAL */
+       762, /* GL_MAP2_TEXTURE_COORD_1 */
+       763, /* GL_MAP2_TEXTURE_COORD_2 */
+       764, /* GL_MAP2_TEXTURE_COORD_3 */
+       765, /* GL_MAP2_TEXTURE_COORD_4 */
+       766, /* GL_MAP2_VERTEX_3 */
+       767, /* GL_MAP2_VERTEX_4 */
+       731, /* GL_MAP1_GRID_DOMAIN */
+       732, /* GL_MAP1_GRID_SEGMENTS */
+       758, /* GL_MAP2_GRID_DOMAIN */
+       759, /* GL_MAP2_GRID_SEGMENTS */
+      1581, /* GL_TEXTURE_1D */
+      1583, /* GL_TEXTURE_2D */
        472, /* GL_FEEDBACK_BUFFER_POINTER */
        473, /* GL_FEEDBACK_BUFFER_SIZE */
        474, /* GL_FEEDBACK_BUFFER_TYPE */
-      1387, /* GL_SELECTION_BUFFER_POINTER */
-      1388, /* GL_SELECTION_BUFFER_SIZE */
-      1691, /* GL_TEXTURE_WIDTH */
-      1658, /* GL_TEXTURE_HEIGHT */
-      1614, /* GL_TEXTURE_COMPONENTS */
-      1598, /* GL_TEXTURE_BORDER_COLOR */
-      1597, /* GL_TEXTURE_BORDER */
+      1391, /* GL_SELECTION_BUFFER_POINTER */
+      1392, /* GL_SELECTION_BUFFER_SIZE */
+      1695, /* GL_TEXTURE_WIDTH */
+      1662, /* GL_TEXTURE_HEIGHT */
+      1618, /* GL_TEXTURE_COMPONENTS */
+      1602, /* GL_TEXTURE_BORDER_COLOR */
+      1601, /* GL_TEXTURE_BORDER */
        376, /* GL_DONT_CARE */
        470, /* GL_FASTEST */
-       993, /* GL_NICEST */
+       995, /* GL_NICEST */
         47, /* GL_AMBIENT */
        373, /* GL_DIFFUSE */
-      1435, /* GL_SPECULAR */
-      1156, /* GL_POSITION */
-      1438, /* GL_SPOT_DIRECTION */
-      1439, /* GL_SPOT_EXPONENT */
-      1437, /* GL_SPOT_CUTOFF */
+      1439, /* GL_SPECULAR */
+      1158, /* GL_POSITION */
+      1442, /* GL_SPOT_DIRECTION */
+      1443, /* GL_SPOT_EXPONENT */
+      1441, /* GL_SPOT_CUTOFF */
        271, /* GL_CONSTANT_ATTENUATION */
-       678, /* GL_LINEAR_ATTENUATION */
-      1253, /* GL_QUADRATIC_ATTENUATION */
+       680, /* GL_LINEAR_ATTENUATION */
+      1256, /* GL_QUADRATIC_ATTENUATION */
        241, /* GL_COMPILE */
        242, /* GL_COMPILE_AND_EXECUTE */
        117, /* GL_BYTE */
-      1722, /* GL_UNSIGNED_BYTE */
-      1401, /* GL_SHORT */
-      1733, /* GL_UNSIGNED_SHORT */
-       629, /* GL_INT */
-      1725, /* GL_UNSIGNED_INT */
-       477, /* GL_FLOAT */
+      1726, /* GL_UNSIGNED_BYTE */
+      1405, /* GL_SHORT */
+      1737, /* GL_UNSIGNED_SHORT */
+       630, /* GL_INT */
+      1729, /* GL_UNSIGNED_INT */
+       478, /* GL_FLOAT */
          1, /* GL_2_BYTES */
          5, /* GL_3_BYTES */
          7, /* GL_4_BYTES */
@@ -4005,284 +4013,284 @@ static const unsigned reduced_enums[1319] =
         51, /* GL_AND_REVERSE */
        295, /* GL_COPY */
         50, /* GL_AND_INVERTED */
-       995, /* GL_NOOP */
-      1814, /* GL_XOR */
-      1057, /* GL_OR */
-       996, /* GL_NOR */
+       997, /* GL_NOOP */
+      1818, /* GL_XOR */
+      1059, /* GL_OR */
+       998, /* GL_NOR */
        460, /* GL_EQUIV */
-       656, /* GL_INVERT */
-      1060, /* GL_OR_REVERSE */
+       657, /* GL_INVERT */
+      1062, /* GL_OR_REVERSE */
        296, /* GL_COPY_INVERTED */
-      1059, /* GL_OR_INVERTED */
-       986, /* GL_NAND */
-      1392, /* GL_SET */
+      1061, /* GL_OR_INVERTED */
+       988, /* GL_NAND */
+      1396, /* GL_SET */
        457, /* GL_EMISSION */
-      1400, /* GL_SHININESS */
+      1404, /* GL_SHININESS */
         48, /* GL_AMBIENT_AND_DIFFUSE */
        187, /* GL_COLOR_INDEXES */
-       936, /* GL_MODELVIEW */
-      1232, /* GL_PROJECTION */
-      1512, /* GL_TEXTURE */
+       938, /* GL_MODELVIEW */
+      1234, /* GL_PROJECTION */
+      1516, /* GL_TEXTURE */
        144, /* GL_COLOR */
        340, /* GL_DEPTH */
-      1461, /* GL_STENCIL */
+      1465, /* GL_STENCIL */
        186, /* GL_COLOR_INDEX */
-      1480, /* GL_STENCIL_INDEX */
+      1484, /* GL_STENCIL_INDEX */
        351, /* GL_DEPTH_COMPONENT */
-      1274, /* GL_RED */
-       584, /* GL_GREEN */
+      1278, /* GL_RED */
+       585, /* GL_GREEN */
         89, /* GL_BLUE */
         31, /* GL_ALPHA */
-      1309, /* GL_RGB */
-      1328, /* GL_RGBA */
-       706, /* GL_LUMINANCE */
-       727, /* GL_LUMINANCE_ALPHA */
+      1313, /* GL_RGB */
+      1332, /* GL_RGBA */
+       708, /* GL_LUMINANCE */
+       729, /* GL_LUMINANCE_ALPHA */
         72, /* GL_BITMAP */
-      1112, /* GL_POINT */
-       676, /* GL_LINE */
+      1114, /* GL_POINT */
+       678, /* GL_LINE */
        475, /* GL_FILL */
-      1283, /* GL_RENDER */
+      1287, /* GL_RENDER */
        471, /* GL_FEEDBACK */
-      1386, /* GL_SELECT */
-       476, /* GL_FLAT */
-      1410, /* GL_SMOOTH */
-       657, /* GL_KEEP */
-      1303, /* GL_REPLACE */
-       611, /* GL_INCR */
+      1390, /* GL_SELECT */
+       477, /* GL_FLAT */
+      1414, /* GL_SMOOTH */
+       658, /* GL_KEEP */
+      1307, /* GL_REPLACE */
+       612, /* GL_INCR */
        336, /* GL_DECR */
-      1748, /* GL_VENDOR */
-      1300, /* GL_RENDERER */
-      1749, /* GL_VERSION */
+      1752, /* GL_VENDOR */
+      1304, /* GL_RENDERER */
+      1753, /* GL_VERSION */
        464, /* GL_EXTENSIONS */
-      1351, /* GL_S */
-      1503, /* GL_T */
-      1263, /* GL_R */
-      1252, /* GL_Q */
-       972, /* GL_MODULATE */
+      1355, /* GL_S */
+      1507, /* GL_T */
+      1267, /* GL_R */
+      1255, /* GL_Q */
+       974, /* GL_MODULATE */
        335, /* GL_DECAL */
-      1648, /* GL_TEXTURE_ENV_MODE */
-      1647, /* GL_TEXTURE_ENV_COLOR */
-      1646, /* GL_TEXTURE_ENV */
+      1652, /* GL_TEXTURE_ENV_MODE */
+      1651, /* GL_TEXTURE_ENV_COLOR */
+      1650, /* GL_TEXTURE_ENV */
        465, /* GL_EYE_LINEAR */
-      1019, /* GL_OBJECT_LINEAR */
-      1436, /* GL_SPHERE_MAP */
-      1650, /* GL_TEXTURE_GEN_MODE */
-      1021, /* GL_OBJECT_PLANE */
+      1021, /* GL_OBJECT_LINEAR */
+      1440, /* GL_SPHERE_MAP */
+      1654, /* GL_TEXTURE_GEN_MODE */
+      1023, /* GL_OBJECT_PLANE */
        466, /* GL_EYE_PLANE */
-       987, /* GL_NEAREST */
-       677, /* GL_LINEAR */
-       991, /* GL_NEAREST_MIPMAP_NEAREST */
-       682, /* GL_LINEAR_MIPMAP_NEAREST */
-       990, /* GL_NEAREST_MIPMAP_LINEAR */
-       681, /* GL_LINEAR_MIPMAP_LINEAR */
-      1671, /* GL_TEXTURE_MAG_FILTER */
-      1679, /* GL_TEXTURE_MIN_FILTER */
-      1693, /* GL_TEXTURE_WRAP_S */
-      1694, /* GL_TEXTURE_WRAP_T */
+       989, /* GL_NEAREST */
+       679, /* GL_LINEAR */
+       993, /* GL_NEAREST_MIPMAP_NEAREST */
+       684, /* GL_LINEAR_MIPMAP_NEAREST */
+       992, /* GL_NEAREST_MIPMAP_LINEAR */
+       683, /* GL_LINEAR_MIPMAP_LINEAR */
+      1675, /* GL_TEXTURE_MAG_FILTER */
+      1683, /* GL_TEXTURE_MIN_FILTER */
+      1697, /* GL_TEXTURE_WRAP_S */
+      1698, /* GL_TEXTURE_WRAP_T */
        123, /* GL_CLAMP */
-      1302, /* GL_REPEAT */
-      1150, /* GL_POLYGON_OFFSET_UNITS */
-      1149, /* GL_POLYGON_OFFSET_POINT */
-      1148, /* GL_POLYGON_OFFSET_LINE */
-      1264, /* GL_R3_G3_B2 */
-      1745, /* GL_V2F */
-      1746, /* GL_V3F */
+      1306, /* GL_REPEAT */
+      1152, /* GL_POLYGON_OFFSET_UNITS */
+      1151, /* GL_POLYGON_OFFSET_POINT */
+      1150, /* GL_POLYGON_OFFSET_LINE */
+      1268, /* GL_R3_G3_B2 */
+      1749, /* GL_V2F */
+      1750, /* GL_V3F */
        120, /* GL_C4UB_V2F */
        121, /* GL_C4UB_V3F */
        118, /* GL_C3F_V3F */
-       984, /* GL_N3F_V3F */
+       986, /* GL_N3F_V3F */
        119, /* GL_C4F_N3F_V3F */
-      1508, /* GL_T2F_V3F */
-      1510, /* GL_T4F_V4F */
-      1506, /* GL_T2F_C4UB_V3F */
-      1504, /* GL_T2F_C3F_V3F */
-      1507, /* GL_T2F_N3F_V3F */
-      1505, /* GL_T2F_C4F_N3F_V3F */
-      1509, /* GL_T4F_C4F_N3F_V4F */
+      1512, /* GL_T2F_V3F */
+      1514, /* GL_T4F_V4F */
+      1510, /* GL_T2F_C4UB_V3F */
+      1508, /* GL_T2F_C3F_V3F */
+      1511, /* GL_T2F_N3F_V3F */
+      1509, /* GL_T2F_C4F_N3F_V3F */
+      1513, /* GL_T4F_C4F_N3F_V4F */
        136, /* GL_CLIP_PLANE0 */
        137, /* GL_CLIP_PLANE1 */
        138, /* GL_CLIP_PLANE2 */
        139, /* GL_CLIP_PLANE3 */
        140, /* GL_CLIP_PLANE4 */
        141, /* GL_CLIP_PLANE5 */
-       661, /* GL_LIGHT0 */
-       662, /* GL_LIGHT1 */
-       663, /* GL_LIGHT2 */
-       664, /* GL_LIGHT3 */
-       665, /* GL_LIGHT4 */
-       666, /* GL_LIGHT5 */
-       667, /* GL_LIGHT6 */
-       668, /* GL_LIGHT7 */
-       588, /* GL_HINT_BIT */
+       663, /* GL_LIGHT0 */
+       664, /* GL_LIGHT1 */
+       665, /* GL_LIGHT2 */
+       666, /* GL_LIGHT3 */
+       667, /* GL_LIGHT4 */
+       668, /* GL_LIGHT5 */
+       669, /* GL_LIGHT6 */
+       670, /* GL_LIGHT7 */
+       589, /* GL_HINT_BIT */
        273, /* GL_CONSTANT_COLOR */
-      1031, /* GL_ONE_MINUS_CONSTANT_COLOR */
+      1033, /* GL_ONE_MINUS_CONSTANT_COLOR */
        268, /* GL_CONSTANT_ALPHA */
-      1029, /* GL_ONE_MINUS_CONSTANT_ALPHA */
+      1031, /* GL_ONE_MINUS_CONSTANT_ALPHA */
         75, /* GL_BLEND_COLOR */
-       572, /* GL_FUNC_ADD */
-       920, /* GL_MIN */
-       831, /* GL_MAX */
+       573, /* GL_FUNC_ADD */
+       922, /* GL_MIN */
+       833, /* GL_MAX */
         80, /* GL_BLEND_EQUATION */
-       576, /* GL_FUNC_SUBTRACT */
-       574, /* GL_FUNC_REVERSE_SUBTRACT */
+       577, /* GL_FUNC_SUBTRACT */
+       575, /* GL_FUNC_REVERSE_SUBTRACT */
        276, /* GL_CONVOLUTION_1D */
        277, /* GL_CONVOLUTION_2D */
-      1389, /* GL_SEPARABLE_2D */
+      1393, /* GL_SEPARABLE_2D */
        280, /* GL_CONVOLUTION_BORDER_MODE */
        284, /* GL_CONVOLUTION_FILTER_SCALE */
        282, /* GL_CONVOLUTION_FILTER_BIAS */
-      1275, /* GL_REDUCE */
+      1279, /* GL_REDUCE */
        286, /* GL_CONVOLUTION_FORMAT */
        290, /* GL_CONVOLUTION_WIDTH */
        288, /* GL_CONVOLUTION_HEIGHT */
-       846, /* GL_MAX_CONVOLUTION_WIDTH */
-       844, /* GL_MAX_CONVOLUTION_HEIGHT */
-      1189, /* GL_POST_CONVOLUTION_RED_SCALE */
-      1185, /* GL_POST_CONVOLUTION_GREEN_SCALE */
-      1180, /* GL_POST_CONVOLUTION_BLUE_SCALE */
-      1176, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
-      1187, /* GL_POST_CONVOLUTION_RED_BIAS */
-      1183, /* GL_POST_CONVOLUTION_GREEN_BIAS */
-      1178, /* GL_POST_CONVOLUTION_BLUE_BIAS */
-      1174, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
-       589, /* GL_HISTOGRAM */
-      1236, /* GL_PROXY_HISTOGRAM */
-       605, /* GL_HISTOGRAM_WIDTH */
-       595, /* GL_HISTOGRAM_FORMAT */
-       601, /* GL_HISTOGRAM_RED_SIZE */
-       597, /* GL_HISTOGRAM_GREEN_SIZE */
-       592, /* GL_HISTOGRAM_BLUE_SIZE */
-       590, /* GL_HISTOGRAM_ALPHA_SIZE */
-       599, /* GL_HISTOGRAM_LUMINANCE_SIZE */
-       603, /* GL_HISTOGRAM_SINK */
-       921, /* GL_MINMAX */
-       923, /* GL_MINMAX_FORMAT */
-       925, /* GL_MINMAX_SINK */
-      1511, /* GL_TABLE_TOO_LARGE_EXT */
-      1724, /* GL_UNSIGNED_BYTE_3_3_2 */
-      1735, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-      1737, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-      1730, /* GL_UNSIGNED_INT_8_8_8_8 */
-      1726, /* GL_UNSIGNED_INT_10_10_10_2 */
-      1147, /* GL_POLYGON_OFFSET_FILL */
-      1146, /* GL_POLYGON_OFFSET_FACTOR */
-      1145, /* GL_POLYGON_OFFSET_BIAS */
-      1306, /* GL_RESCALE_NORMAL */
+       848, /* GL_MAX_CONVOLUTION_WIDTH */
+       846, /* GL_MAX_CONVOLUTION_HEIGHT */
+      1191, /* GL_POST_CONVOLUTION_RED_SCALE */
+      1187, /* GL_POST_CONVOLUTION_GREEN_SCALE */
+      1182, /* GL_POST_CONVOLUTION_BLUE_SCALE */
+      1178, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
+      1189, /* GL_POST_CONVOLUTION_RED_BIAS */
+      1185, /* GL_POST_CONVOLUTION_GREEN_BIAS */
+      1180, /* GL_POST_CONVOLUTION_BLUE_BIAS */
+      1176, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
+       590, /* GL_HISTOGRAM */
+      1239, /* GL_PROXY_HISTOGRAM */
+       606, /* GL_HISTOGRAM_WIDTH */
+       596, /* GL_HISTOGRAM_FORMAT */
+       602, /* GL_HISTOGRAM_RED_SIZE */
+       598, /* GL_HISTOGRAM_GREEN_SIZE */
+       593, /* GL_HISTOGRAM_BLUE_SIZE */
+       591, /* GL_HISTOGRAM_ALPHA_SIZE */
+       600, /* GL_HISTOGRAM_LUMINANCE_SIZE */
+       604, /* GL_HISTOGRAM_SINK */
+       923, /* GL_MINMAX */
+       925, /* GL_MINMAX_FORMAT */
+       927, /* GL_MINMAX_SINK */
+      1515, /* GL_TABLE_TOO_LARGE_EXT */
+      1728, /* GL_UNSIGNED_BYTE_3_3_2 */
+      1739, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+      1741, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+      1734, /* GL_UNSIGNED_INT_8_8_8_8 */
+      1730, /* GL_UNSIGNED_INT_10_10_10_2 */
+      1149, /* GL_POLYGON_OFFSET_FILL */
+      1148, /* GL_POLYGON_OFFSET_FACTOR */
+      1147, /* GL_POLYGON_OFFSET_BIAS */
+      1310, /* GL_RESCALE_NORMAL */
         36, /* GL_ALPHA4 */
         38, /* GL_ALPHA8 */
         32, /* GL_ALPHA12 */
         34, /* GL_ALPHA16 */
-       717, /* GL_LUMINANCE4 */
-       723, /* GL_LUMINANCE8 */
-       707, /* GL_LUMINANCE12 */
-       713, /* GL_LUMINANCE16 */
-       718, /* GL_LUMINANCE4_ALPHA4 */
-       721, /* GL_LUMINANCE6_ALPHA2 */
-       724, /* GL_LUMINANCE8_ALPHA8 */
-       710, /* GL_LUMINANCE12_ALPHA4 */
-       708, /* GL_LUMINANCE12_ALPHA12 */
-       714, /* GL_LUMINANCE16_ALPHA16 */
-       630, /* GL_INTENSITY */
-       635, /* GL_INTENSITY4 */
-       637, /* GL_INTENSITY8 */
-       631, /* GL_INTENSITY12 */
-       633, /* GL_INTENSITY16 */
-      1318, /* GL_RGB2_EXT */
-      1319, /* GL_RGB4 */
-      1322, /* GL_RGB5 */
-      1326, /* GL_RGB8 */
-      1310, /* GL_RGB10 */
-      1314, /* GL_RGB12 */
-      1316, /* GL_RGB16 */
-      1333, /* GL_RGBA2 */
-      1335, /* GL_RGBA4 */
-      1323, /* GL_RGB5_A1 */
-      1339, /* GL_RGBA8 */
-      1311, /* GL_RGB10_A2 */
-      1329, /* GL_RGBA12 */
-      1331, /* GL_RGBA16 */
-      1684, /* GL_TEXTURE_RED_SIZE */
-      1656, /* GL_TEXTURE_GREEN_SIZE */
-      1595, /* GL_TEXTURE_BLUE_SIZE */
-      1582, /* GL_TEXTURE_ALPHA_SIZE */
-      1669, /* GL_TEXTURE_LUMINANCE_SIZE */
-      1660, /* GL_TEXTURE_INTENSITY_SIZE */
-      1304, /* GL_REPLACE_EXT */
-      1240, /* GL_PROXY_TEXTURE_1D */
-      1243, /* GL_PROXY_TEXTURE_2D */
-      1689, /* GL_TEXTURE_TOO_LARGE_EXT */
-      1681, /* GL_TEXTURE_PRIORITY */
-      1686, /* GL_TEXTURE_RESIDENT */
-      1585, /* GL_TEXTURE_BINDING_1D */
-      1587, /* GL_TEXTURE_BINDING_2D */
-      1589, /* GL_TEXTURE_BINDING_3D */
-      1067, /* GL_PACK_SKIP_IMAGES */
-      1063, /* GL_PACK_IMAGE_HEIGHT */
-      1718, /* GL_UNPACK_SKIP_IMAGES */
-      1715, /* GL_UNPACK_IMAGE_HEIGHT */
-      1581, /* GL_TEXTURE_3D */
-      1246, /* GL_PROXY_TEXTURE_3D */
-      1643, /* GL_TEXTURE_DEPTH */
-      1692, /* GL_TEXTURE_WRAP_R */
-       832, /* GL_MAX_3D_TEXTURE_SIZE */
-      1750, /* GL_VERTEX_ARRAY */
-       998, /* GL_NORMAL_ARRAY */
+       719, /* GL_LUMINANCE4 */
+       725, /* GL_LUMINANCE8 */
+       709, /* GL_LUMINANCE12 */
+       715, /* GL_LUMINANCE16 */
+       720, /* GL_LUMINANCE4_ALPHA4 */
+       723, /* GL_LUMINANCE6_ALPHA2 */
+       726, /* GL_LUMINANCE8_ALPHA8 */
+       712, /* GL_LUMINANCE12_ALPHA4 */
+       710, /* GL_LUMINANCE12_ALPHA12 */
+       716, /* GL_LUMINANCE16_ALPHA16 */
+       631, /* GL_INTENSITY */
+       636, /* GL_INTENSITY4 */
+       638, /* GL_INTENSITY8 */
+       632, /* GL_INTENSITY12 */
+       634, /* GL_INTENSITY16 */
+      1322, /* GL_RGB2_EXT */
+      1323, /* GL_RGB4 */
+      1326, /* GL_RGB5 */
+      1330, /* GL_RGB8 */
+      1314, /* GL_RGB10 */
+      1318, /* GL_RGB12 */
+      1320, /* GL_RGB16 */
+      1337, /* GL_RGBA2 */
+      1339, /* GL_RGBA4 */
+      1327, /* GL_RGB5_A1 */
+      1343, /* GL_RGBA8 */
+      1315, /* GL_RGB10_A2 */
+      1333, /* GL_RGBA12 */
+      1335, /* GL_RGBA16 */
+      1688, /* GL_TEXTURE_RED_SIZE */
+      1660, /* GL_TEXTURE_GREEN_SIZE */
+      1599, /* GL_TEXTURE_BLUE_SIZE */
+      1586, /* GL_TEXTURE_ALPHA_SIZE */
+      1673, /* GL_TEXTURE_LUMINANCE_SIZE */
+      1664, /* GL_TEXTURE_INTENSITY_SIZE */
+      1308, /* GL_REPLACE_EXT */
+      1243, /* GL_PROXY_TEXTURE_1D */
+      1246, /* GL_PROXY_TEXTURE_2D */
+      1693, /* GL_TEXTURE_TOO_LARGE_EXT */
+      1685, /* GL_TEXTURE_PRIORITY */
+      1690, /* GL_TEXTURE_RESIDENT */
+      1589, /* GL_TEXTURE_BINDING_1D */
+      1591, /* GL_TEXTURE_BINDING_2D */
+      1593, /* GL_TEXTURE_BINDING_3D */
+      1069, /* GL_PACK_SKIP_IMAGES */
+      1065, /* GL_PACK_IMAGE_HEIGHT */
+      1722, /* GL_UNPACK_SKIP_IMAGES */
+      1719, /* GL_UNPACK_IMAGE_HEIGHT */
+      1585, /* GL_TEXTURE_3D */
+      1249, /* GL_PROXY_TEXTURE_3D */
+      1647, /* GL_TEXTURE_DEPTH */
+      1696, /* GL_TEXTURE_WRAP_R */
+       834, /* GL_MAX_3D_TEXTURE_SIZE */
+      1754, /* GL_VERTEX_ARRAY */
+      1000, /* GL_NORMAL_ARRAY */
        145, /* GL_COLOR_ARRAY */
-       615, /* GL_INDEX_ARRAY */
-      1622, /* GL_TEXTURE_COORD_ARRAY */
+       616, /* GL_INDEX_ARRAY */
+      1626, /* GL_TEXTURE_COORD_ARRAY */
        449, /* GL_EDGE_FLAG_ARRAY */
-      1755, /* GL_VERTEX_ARRAY_SIZE */
-      1757, /* GL_VERTEX_ARRAY_TYPE */
-      1756, /* GL_VERTEX_ARRAY_STRIDE */
-      1003, /* GL_NORMAL_ARRAY_TYPE */
-      1002, /* GL_NORMAL_ARRAY_STRIDE */
+      1759, /* GL_VERTEX_ARRAY_SIZE */
+      1761, /* GL_VERTEX_ARRAY_TYPE */
+      1760, /* GL_VERTEX_ARRAY_STRIDE */
+      1005, /* GL_NORMAL_ARRAY_TYPE */
+      1004, /* GL_NORMAL_ARRAY_STRIDE */
        149, /* GL_COLOR_ARRAY_SIZE */
        151, /* GL_COLOR_ARRAY_TYPE */
        150, /* GL_COLOR_ARRAY_STRIDE */
-       620, /* GL_INDEX_ARRAY_TYPE */
-       619, /* GL_INDEX_ARRAY_STRIDE */
-      1626, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-      1628, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-      1627, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
+       621, /* GL_INDEX_ARRAY_TYPE */
+       620, /* GL_INDEX_ARRAY_STRIDE */
+      1630, /* GL_TEXTURE_COORD_ARRAY_SIZE */
+      1632, /* GL_TEXTURE_COORD_ARRAY_TYPE */
+      1631, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
        453, /* GL_EDGE_FLAG_ARRAY_STRIDE */
-      1754, /* GL_VERTEX_ARRAY_POINTER */
-      1001, /* GL_NORMAL_ARRAY_POINTER */
+      1758, /* GL_VERTEX_ARRAY_POINTER */
+      1003, /* GL_NORMAL_ARRAY_POINTER */
        148, /* GL_COLOR_ARRAY_POINTER */
-       618, /* GL_INDEX_ARRAY_POINTER */
-      1625, /* GL_TEXTURE_COORD_ARRAY_POINTER */
+       619, /* GL_INDEX_ARRAY_POINTER */
+      1629, /* GL_TEXTURE_COORD_ARRAY_POINTER */
        452, /* GL_EDGE_FLAG_ARRAY_POINTER */
-       977, /* GL_MULTISAMPLE */
-      1363, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
-      1365, /* GL_SAMPLE_ALPHA_TO_ONE */
-      1370, /* GL_SAMPLE_COVERAGE */
-      1367, /* GL_SAMPLE_BUFFERS */
-      1358, /* GL_SAMPLES */
-      1374, /* GL_SAMPLE_COVERAGE_VALUE */
-      1372, /* GL_SAMPLE_COVERAGE_INVERT */
+       979, /* GL_MULTISAMPLE */
+      1367, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
+      1369, /* GL_SAMPLE_ALPHA_TO_ONE */
+      1374, /* GL_SAMPLE_COVERAGE */
+      1371, /* GL_SAMPLE_BUFFERS */
+      1362, /* GL_SAMPLES */
+      1378, /* GL_SAMPLE_COVERAGE_VALUE */
+      1376, /* GL_SAMPLE_COVERAGE_INVERT */
        192, /* GL_COLOR_MATRIX */
        194, /* GL_COLOR_MATRIX_STACK_DEPTH */
-       840, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
-      1172, /* GL_POST_COLOR_MATRIX_RED_SCALE */
-      1168, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
-      1163, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
-      1159, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
-      1170, /* GL_POST_COLOR_MATRIX_RED_BIAS */
-      1166, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
-      1161, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
-      1157, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
-      1605, /* GL_TEXTURE_COLOR_TABLE_SGI */
-      1247, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
-      1607, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+       842, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
+      1174, /* GL_POST_COLOR_MATRIX_RED_SCALE */
+      1170, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
+      1165, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
+      1161, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
+      1172, /* GL_POST_COLOR_MATRIX_RED_BIAS */
+      1168, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
+      1163, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
+      1159, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
+      1609, /* GL_TEXTURE_COLOR_TABLE_SGI */
+      1250, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
+      1611, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
         79, /* GL_BLEND_DST_RGB */
         88, /* GL_BLEND_SRC_RGB */
         78, /* GL_BLEND_DST_ALPHA */
         87, /* GL_BLEND_SRC_ALPHA */
        198, /* GL_COLOR_TABLE */
-      1182, /* GL_POST_CONVOLUTION_COLOR_TABLE */
-      1165, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
-      1235, /* GL_PROXY_COLOR_TABLE */
-      1239, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
-      1238, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
+      1184, /* GL_POST_CONVOLUTION_COLOR_TABLE */
+      1167, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
+      1238, /* GL_PROXY_COLOR_TABLE */
+      1242, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
+      1241, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
        222, /* GL_COLOR_TABLE_SCALE */
        202, /* GL_COLOR_TABLE_BIAS */
        207, /* GL_COLOR_TABLE_FORMAT */
@@ -4295,374 +4303,374 @@ static const unsigned reduced_enums[1319] =
        213, /* GL_COLOR_TABLE_INTENSITY_SIZE */
         70, /* GL_BGR */
         71, /* GL_BGRA */
-       854, /* GL_MAX_ELEMENTS_VERTICES */
-       853, /* GL_MAX_ELEMENTS_INDICES */
-      1659, /* GL_TEXTURE_INDEX_SIZE_EXT */
+       856, /* GL_MAX_ELEMENTS_VERTICES */
+       855, /* GL_MAX_ELEMENTS_INDICES */
+      1663, /* GL_TEXTURE_INDEX_SIZE_EXT */
        142, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
-      1129, /* GL_POINT_SIZE_MIN */
-      1125, /* GL_POINT_SIZE_MAX */
-      1119, /* GL_POINT_FADE_THRESHOLD_SIZE */
-      1115, /* GL_POINT_DISTANCE_ATTENUATION */
+      1131, /* GL_POINT_SIZE_MIN */
+      1127, /* GL_POINT_SIZE_MAX */
+      1121, /* GL_POINT_FADE_THRESHOLD_SIZE */
+      1117, /* GL_POINT_DISTANCE_ATTENUATION */
        124, /* GL_CLAMP_TO_BORDER */
        127, /* GL_CLAMP_TO_EDGE */
-      1680, /* GL_TEXTURE_MIN_LOD */
-      1678, /* GL_TEXTURE_MAX_LOD */
-      1584, /* GL_TEXTURE_BASE_LEVEL */
-      1677, /* GL_TEXTURE_MAX_LEVEL */
-       608, /* GL_IGNORE_BORDER_HP */
+      1684, /* GL_TEXTURE_MIN_LOD */
+      1682, /* GL_TEXTURE_MAX_LOD */
+      1588, /* GL_TEXTURE_BASE_LEVEL */
+      1681, /* GL_TEXTURE_MAX_LEVEL */
+       609, /* GL_IGNORE_BORDER_HP */
        272, /* GL_CONSTANT_BORDER_HP */
-      1305, /* GL_REPLICATE_BORDER_HP */
+      1309, /* GL_REPLICATE_BORDER_HP */
        278, /* GL_CONVOLUTION_BORDER_COLOR */
-      1026, /* GL_OCCLUSION_TEST_HP */
-      1027, /* GL_OCCLUSION_TEST_RESULT_HP */
-       679, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
-      1599, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-      1601, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-      1603, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-      1604, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-      1602, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-      1600, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
-       836, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
-       837, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-      1192, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
-      1194, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
-      1191, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
-      1193, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
-      1667, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-      1668, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-      1666, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
-       578, /* GL_GENERATE_MIPMAP */
-       579, /* GL_GENERATE_MIPMAP_HINT */
-       520, /* GL_FOG_OFFSET_SGIX */
-       521, /* GL_FOG_OFFSET_VALUE_SGIX */
-      1613, /* GL_TEXTURE_COMPARE_SGIX */
-      1612, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-      1663, /* GL_TEXTURE_LEQUAL_R_SGIX */
-      1655, /* GL_TEXTURE_GEQUAL_R_SGIX */
+      1028, /* GL_OCCLUSION_TEST_HP */
+      1029, /* GL_OCCLUSION_TEST_RESULT_HP */
+       681, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
+      1603, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
+      1605, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
+      1607, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
+      1608, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+      1606, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
+      1604, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
+       838, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
+       839, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+      1194, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
+      1196, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
+      1193, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
+      1195, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
+      1671, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+      1672, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+      1670, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+       579, /* GL_GENERATE_MIPMAP */
+       580, /* GL_GENERATE_MIPMAP_HINT */
+       521, /* GL_FOG_OFFSET_SGIX */
+       522, /* GL_FOG_OFFSET_VALUE_SGIX */
+      1617, /* GL_TEXTURE_COMPARE_SGIX */
+      1616, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
+      1667, /* GL_TEXTURE_LEQUAL_R_SGIX */
+      1659, /* GL_TEXTURE_GEQUAL_R_SGIX */
        352, /* GL_DEPTH_COMPONENT16 */
        355, /* GL_DEPTH_COMPONENT24 */
        358, /* GL_DEPTH_COMPONENT32 */
        300, /* GL_CULL_VERTEX_EXT */
        302, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
        301, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
-      1811, /* GL_WRAP_BORDER_SUN */
-      1606, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
-       672, /* GL_LIGHT_MODEL_COLOR_CONTROL */
-      1403, /* GL_SINGLE_COLOR */
-      1390, /* GL_SEPARATE_SPECULAR_COLOR */
-      1399, /* GL_SHARED_TEXTURE_PALETTE_EXT */
-       531, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
-       532, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
-       539, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
-       534, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
-       530, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
-       529, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
-       533, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
-       540, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
-       551, /* GL_FRAMEBUFFER_DEFAULT */
-       564, /* GL_FRAMEBUFFER_UNDEFINED */
+      1815, /* GL_WRAP_BORDER_SUN */
+      1610, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
+       674, /* GL_LIGHT_MODEL_COLOR_CONTROL */
+      1407, /* GL_SINGLE_COLOR */
+      1394, /* GL_SEPARATE_SPECULAR_COLOR */
+      1403, /* GL_SHARED_TEXTURE_PALETTE_EXT */
+       532, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
+       533, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
+       540, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
+       535, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
+       531, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
+       530, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
+       534, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
+       541, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
+       552, /* GL_FRAMEBUFFER_DEFAULT */
+       565, /* GL_FRAMEBUFFER_UNDEFINED */
        365, /* GL_DEPTH_STENCIL_ATTACHMENT */
-       614, /* GL_INDEX */
-      1723, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-      1738, /* GL_UNSIGNED_SHORT_5_6_5 */
-      1739, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-      1736, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-      1734, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-      1731, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-      1729, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-      1675, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-      1676, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-      1674, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
-       928, /* GL_MIRRORED_REPEAT */
-      1346, /* GL_RGB_S3TC */
-      1321, /* GL_RGB4_S3TC */
-      1344, /* GL_RGBA_S3TC */
-      1338, /* GL_RGBA4_S3TC */
-      1342, /* GL_RGBA_DXT5_S3TC */
-      1336, /* GL_RGBA4_DXT5_S3TC */
+       615, /* GL_INDEX */
+      1727, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+      1742, /* GL_UNSIGNED_SHORT_5_6_5 */
+      1743, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+      1740, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+      1738, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+      1735, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+      1733, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+      1679, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+      1680, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+      1678, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+       930, /* GL_MIRRORED_REPEAT */
+      1350, /* GL_RGB_S3TC */
+      1325, /* GL_RGB4_S3TC */
+      1348, /* GL_RGBA_S3TC */
+      1342, /* GL_RGBA4_S3TC */
+      1346, /* GL_RGBA_DXT5_S3TC */
+      1340, /* GL_RGBA4_DXT5_S3TC */
        261, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
        256, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
        257, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
        258, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */
-       989, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
-       988, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
-       680, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
-       507, /* GL_FOG_COORDINATE_SOURCE */
-       499, /* GL_FOG_COORD */
-       523, /* GL_FRAGMENT_DEPTH */
+       991, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
+       990, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
+       682, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
+       508, /* GL_FOG_COORDINATE_SOURCE */
+       500, /* GL_FOG_COORD */
+       524, /* GL_FRAGMENT_DEPTH */
        306, /* GL_CURRENT_FOG_COORD */
-       506, /* GL_FOG_COORDINATE_ARRAY_TYPE */
-       505, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
-       504, /* GL_FOG_COORDINATE_ARRAY_POINTER */
-       501, /* GL_FOG_COORDINATE_ARRAY */
+       507, /* GL_FOG_COORDINATE_ARRAY_TYPE */
+       506, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
+       505, /* GL_FOG_COORDINATE_ARRAY_POINTER */
+       502, /* GL_FOG_COORDINATE_ARRAY */
        196, /* GL_COLOR_SUM */
        326, /* GL_CURRENT_SECONDARY_COLOR */
-      1383, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
-      1385, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
-      1384, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
-      1382, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
-      1379, /* GL_SECONDARY_COLOR_ARRAY */
+      1387, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
+      1389, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
+      1388, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
+      1386, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
+      1383, /* GL_SECONDARY_COLOR_ARRAY */
        324, /* GL_CURRENT_RASTER_SECONDARY_COLOR */
         28, /* GL_ALIASED_POINT_SIZE_RANGE */
         27, /* GL_ALIASED_LINE_WIDTH_RANGE */
-      1513, /* GL_TEXTURE0 */
-      1515, /* GL_TEXTURE1 */
-      1537, /* GL_TEXTURE2 */
-      1559, /* GL_TEXTURE3 */
-      1565, /* GL_TEXTURE4 */
-      1567, /* GL_TEXTURE5 */
-      1569, /* GL_TEXTURE6 */
-      1571, /* GL_TEXTURE7 */
-      1573, /* GL_TEXTURE8 */
-      1575, /* GL_TEXTURE9 */
-      1516, /* GL_TEXTURE10 */
-      1518, /* GL_TEXTURE11 */
-      1520, /* GL_TEXTURE12 */
-      1522, /* GL_TEXTURE13 */
-      1524, /* GL_TEXTURE14 */
-      1526, /* GL_TEXTURE15 */
-      1528, /* GL_TEXTURE16 */
-      1530, /* GL_TEXTURE17 */
-      1532, /* GL_TEXTURE18 */
-      1534, /* GL_TEXTURE19 */
-      1538, /* GL_TEXTURE20 */
-      1540, /* GL_TEXTURE21 */
-      1542, /* GL_TEXTURE22 */
-      1544, /* GL_TEXTURE23 */
-      1546, /* GL_TEXTURE24 */
-      1548, /* GL_TEXTURE25 */
-      1550, /* GL_TEXTURE26 */
-      1552, /* GL_TEXTURE27 */
-      1554, /* GL_TEXTURE28 */
-      1556, /* GL_TEXTURE29 */
-      1560, /* GL_TEXTURE30 */
-      1562, /* GL_TEXTURE31 */
+      1517, /* GL_TEXTURE0 */
+      1519, /* GL_TEXTURE1 */
+      1541, /* GL_TEXTURE2 */
+      1563, /* GL_TEXTURE3 */
+      1569, /* GL_TEXTURE4 */
+      1571, /* GL_TEXTURE5 */
+      1573, /* GL_TEXTURE6 */
+      1575, /* GL_TEXTURE7 */
+      1577, /* GL_TEXTURE8 */
+      1579, /* GL_TEXTURE9 */
+      1520, /* GL_TEXTURE10 */
+      1522, /* GL_TEXTURE11 */
+      1524, /* GL_TEXTURE12 */
+      1526, /* GL_TEXTURE13 */
+      1528, /* GL_TEXTURE14 */
+      1530, /* GL_TEXTURE15 */
+      1532, /* GL_TEXTURE16 */
+      1534, /* GL_TEXTURE17 */
+      1536, /* GL_TEXTURE18 */
+      1538, /* GL_TEXTURE19 */
+      1542, /* GL_TEXTURE20 */
+      1544, /* GL_TEXTURE21 */
+      1546, /* GL_TEXTURE22 */
+      1548, /* GL_TEXTURE23 */
+      1550, /* GL_TEXTURE24 */
+      1552, /* GL_TEXTURE25 */
+      1554, /* GL_TEXTURE26 */
+      1556, /* GL_TEXTURE27 */
+      1558, /* GL_TEXTURE28 */
+      1560, /* GL_TEXTURE29 */
+      1564, /* GL_TEXTURE30 */
+      1566, /* GL_TEXTURE31 */
         18, /* GL_ACTIVE_TEXTURE */
        130, /* GL_CLIENT_ACTIVE_TEXTURE */
-       906, /* GL_MAX_TEXTURE_UNITS */
-      1702, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-      1705, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-      1707, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-      1699, /* GL_TRANSPOSE_COLOR_MATRIX */
-      1501, /* GL_SUBTRACT */
-       894, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
+       908, /* GL_MAX_TEXTURE_UNITS */
+      1706, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+      1709, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+      1711, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+      1703, /* GL_TRANSPOSE_COLOR_MATRIX */
+      1505, /* GL_SUBTRACT */
+       896, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
        244, /* GL_COMPRESSED_ALPHA */
        248, /* GL_COMPRESSED_LUMINANCE */
        249, /* GL_COMPRESSED_LUMINANCE_ALPHA */
        246, /* GL_COMPRESSED_INTENSITY */
        252, /* GL_COMPRESSED_RGB */
        253, /* GL_COMPRESSED_RGBA */
-      1620, /* GL_TEXTURE_COMPRESSION_HINT */
-      1682, /* GL_TEXTURE_RECTANGLE_ARB */
-      1592, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
-      1250, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
-       892, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
+      1624, /* GL_TEXTURE_COMPRESSION_HINT */
+      1686, /* GL_TEXTURE_RECTANGLE_ARB */
+      1596, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
+      1253, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
+       894, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
        364, /* GL_DEPTH_STENCIL */
-      1727, /* GL_UNSIGNED_INT_24_8 */
-       902, /* GL_MAX_TEXTURE_LOD_BIAS */
-      1673, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
-       903, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
-      1649, /* GL_TEXTURE_FILTER_CONTROL */
-      1664, /* GL_TEXTURE_LOD_BIAS */
+      1731, /* GL_UNSIGNED_INT_24_8 */
+       904, /* GL_MAX_TEXTURE_LOD_BIAS */
+      1677, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+       905, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
+      1653, /* GL_TEXTURE_FILTER_CONTROL */
+      1668, /* GL_TEXTURE_LOD_BIAS */
        229, /* GL_COMBINE4 */
-       896, /* GL_MAX_SHININESS_NV */
-       897, /* GL_MAX_SPOT_EXPONENT_NV */
-       612, /* GL_INCR_WRAP */
+       898, /* GL_MAX_SHININESS_NV */
+       899, /* GL_MAX_SPOT_EXPONENT_NV */
+       613, /* GL_INCR_WRAP */
        337, /* GL_DECR_WRAP */
-       948, /* GL_MODELVIEW1_ARB */
-      1004, /* GL_NORMAL_MAP */
-      1280, /* GL_REFLECTION_MAP */
-      1629, /* GL_TEXTURE_CUBE_MAP */
-      1590, /* GL_TEXTURE_BINDING_CUBE_MAP */
-      1637, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-      1631, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-      1639, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-      1633, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-      1641, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-      1635, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
-      1248, /* GL_PROXY_TEXTURE_CUBE_MAP */
-       848, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
-       983, /* GL_MULTISAMPLE_FILTER_HINT_NV */
-       515, /* GL_FOG_DISTANCE_MODE_NV */
+       950, /* GL_MODELVIEW1_ARB */
+      1006, /* GL_NORMAL_MAP */
+      1284, /* GL_REFLECTION_MAP */
+      1633, /* GL_TEXTURE_CUBE_MAP */
+      1594, /* GL_TEXTURE_BINDING_CUBE_MAP */
+      1641, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
+      1635, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
+      1643, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
+      1637, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
+      1645, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
+      1639, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
+      1251, /* GL_PROXY_TEXTURE_CUBE_MAP */
+       850, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
+       985, /* GL_MULTISAMPLE_FILTER_HINT_NV */
+       516, /* GL_FOG_DISTANCE_MODE_NV */
        468, /* GL_EYE_RADIAL_NV */
        467, /* GL_EYE_PLANE_ABSOLUTE_NV */
        228, /* GL_COMBINE */
        235, /* GL_COMBINE_RGB */
        230, /* GL_COMBINE_ALPHA */
-      1347, /* GL_RGB_SCALE */
+      1351, /* GL_RGB_SCALE */
         24, /* GL_ADD_SIGNED */
-       640, /* GL_INTERPOLATE */
+       641, /* GL_INTERPOLATE */
        267, /* GL_CONSTANT */
-      1198, /* GL_PRIMARY_COLOR */
-      1195, /* GL_PREVIOUS */
-      1418, /* GL_SOURCE0_RGB */
-      1424, /* GL_SOURCE1_RGB */
-      1430, /* GL_SOURCE2_RGB */
-      1434, /* GL_SOURCE3_RGB_NV */
-      1415, /* GL_SOURCE0_ALPHA */
-      1421, /* GL_SOURCE1_ALPHA */
-      1427, /* GL_SOURCE2_ALPHA */
-      1433, /* GL_SOURCE3_ALPHA_NV */
-      1040, /* GL_OPERAND0_RGB */
-      1046, /* GL_OPERAND1_RGB */
-      1052, /* GL_OPERAND2_RGB */
-      1056, /* GL_OPERAND3_RGB_NV */
-      1037, /* GL_OPERAND0_ALPHA */
-      1043, /* GL_OPERAND1_ALPHA */
-      1049, /* GL_OPERAND2_ALPHA */
-      1055, /* GL_OPERAND3_ALPHA_NV */
-      1751, /* GL_VERTEX_ARRAY_BINDING_APPLE */
-      1815, /* GL_YCBCR_422_APPLE */
-      1740, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-      1742, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-      1405, /* GL_SLICE_ACCUM_SUN */
-      1255, /* GL_QUAD_MESH_SUN */
-      1711, /* GL_TRIANGLE_MESH_SUN */
-      1789, /* GL_VERTEX_PROGRAM_ARB */
-      1800, /* GL_VERTEX_STATE_PROGRAM_NV */
-      1776, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-      1782, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-      1784, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-      1786, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+      1200, /* GL_PRIMARY_COLOR */
+      1197, /* GL_PREVIOUS */
+      1422, /* GL_SOURCE0_RGB */
+      1428, /* GL_SOURCE1_RGB */
+      1434, /* GL_SOURCE2_RGB */
+      1438, /* GL_SOURCE3_RGB_NV */
+      1419, /* GL_SOURCE0_ALPHA */
+      1425, /* GL_SOURCE1_ALPHA */
+      1431, /* GL_SOURCE2_ALPHA */
+      1437, /* GL_SOURCE3_ALPHA_NV */
+      1042, /* GL_OPERAND0_RGB */
+      1048, /* GL_OPERAND1_RGB */
+      1054, /* GL_OPERAND2_RGB */
+      1058, /* GL_OPERAND3_RGB_NV */
+      1039, /* GL_OPERAND0_ALPHA */
+      1045, /* GL_OPERAND1_ALPHA */
+      1051, /* GL_OPERAND2_ALPHA */
+      1057, /* GL_OPERAND3_ALPHA_NV */
+      1755, /* GL_VERTEX_ARRAY_BINDING_APPLE */
+      1819, /* GL_YCBCR_422_APPLE */
+      1744, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+      1746, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+      1409, /* GL_SLICE_ACCUM_SUN */
+      1259, /* GL_QUAD_MESH_SUN */
+      1715, /* GL_TRIANGLE_MESH_SUN */
+      1793, /* GL_VERTEX_PROGRAM_ARB */
+      1804, /* GL_VERTEX_STATE_PROGRAM_NV */
+      1780, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+      1786, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+      1788, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+      1790, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
        328, /* GL_CURRENT_VERTEX_ATTRIB */
-      1211, /* GL_PROGRAM_LENGTH_ARB */
-      1225, /* GL_PROGRAM_STRING_ARB */
-       970, /* GL_MODELVIEW_PROJECTION_NV */
-       607, /* GL_IDENTITY_NV */
-       654, /* GL_INVERSE_NV */
-      1704, /* GL_TRANSPOSE_NV */
-       655, /* GL_INVERSE_TRANSPOSE_NV */
-       878, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
-       877, /* GL_MAX_PROGRAM_MATRICES_ARB */
-       785, /* GL_MATRIX0_NV */
-       797, /* GL_MATRIX1_NV */
-       809, /* GL_MATRIX2_NV */
-       813, /* GL_MATRIX3_NV */
-       815, /* GL_MATRIX4_NV */
-       817, /* GL_MATRIX5_NV */
-       819, /* GL_MATRIX6_NV */
-       821, /* GL_MATRIX7_NV */
+      1213, /* GL_PROGRAM_LENGTH_ARB */
+      1227, /* GL_PROGRAM_STRING_ARB */
+       972, /* GL_MODELVIEW_PROJECTION_NV */
+       608, /* GL_IDENTITY_NV */
+       655, /* GL_INVERSE_NV */
+      1708, /* GL_TRANSPOSE_NV */
+       656, /* GL_INVERSE_TRANSPOSE_NV */
+       880, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
+       879, /* GL_MAX_PROGRAM_MATRICES_ARB */
+       787, /* GL_MATRIX0_NV */
+       799, /* GL_MATRIX1_NV */
+       811, /* GL_MATRIX2_NV */
+       815, /* GL_MATRIX3_NV */
+       817, /* GL_MATRIX4_NV */
+       819, /* GL_MATRIX5_NV */
+       821, /* GL_MATRIX6_NV */
+       823, /* GL_MATRIX7_NV */
        312, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
        309, /* GL_CURRENT_MATRIX_ARB */
-      1792, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-      1795, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-      1223, /* GL_PROGRAM_PARAMETER_NV */
-      1780, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-      1227, /* GL_PROGRAM_TARGET_NV */
-      1224, /* GL_PROGRAM_RESIDENT_NV */
-      1696, /* GL_TRACK_MATRIX_NV */
-      1697, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-      1790, /* GL_VERTEX_PROGRAM_BINDING_NV */
-      1205, /* GL_PROGRAM_ERROR_POSITION_ARB */
+      1796, /* GL_VERTEX_PROGRAM_POINT_SIZE */
+      1799, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+      1225, /* GL_PROGRAM_PARAMETER_NV */
+      1784, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+      1229, /* GL_PROGRAM_TARGET_NV */
+      1226, /* GL_PROGRAM_RESIDENT_NV */
+      1700, /* GL_TRACK_MATRIX_NV */
+      1701, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+      1794, /* GL_VERTEX_PROGRAM_BINDING_NV */
+      1207, /* GL_PROGRAM_ERROR_POSITION_ARB */
        349, /* GL_DEPTH_CLAMP_NV */
-      1758, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-      1765, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-      1766, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-      1767, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-      1768, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-      1769, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-      1770, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-      1771, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-      1772, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-      1773, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-      1759, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-      1760, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-      1761, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-      1762, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-      1763, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-      1764, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
-       739, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
-       746, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
-       747, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
-       748, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
-       749, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
-       750, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
-       751, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
-       752, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
-       753, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
-       754, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
-       740, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
-       741, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
-       742, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
-       743, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
-       744, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
-       745, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
-       766, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
-       773, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
-       774, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
-       775, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
-       776, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
-       777, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
-       778, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
-      1204, /* GL_PROGRAM_BINDING_ARB */
-       780, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
-       781, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
-       767, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
-       768, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
-       769, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
-       770, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
-       771, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
-       772, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
-      1618, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-      1615, /* GL_TEXTURE_COMPRESSED */
-      1009, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
+      1762, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+      1769, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+      1770, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+      1771, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+      1772, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+      1773, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+      1774, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+      1775, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+      1776, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+      1777, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+      1763, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+      1764, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+      1765, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+      1766, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+      1767, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+      1768, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+       741, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
+       748, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
+       749, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
+       750, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
+       751, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
+       752, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
+       753, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
+       754, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
+       755, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
+       756, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
+       742, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
+       743, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
+       744, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
+       745, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
+       746, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
+       747, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
+       768, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
+       775, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
+       776, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
+       777, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
+       778, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
+       779, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
+       780, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
+      1206, /* GL_PROGRAM_BINDING_ARB */
+       782, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
+       783, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
+       769, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
+       770, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
+       771, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
+       772, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
+       773, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
+       774, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
+      1622, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
+      1619, /* GL_TEXTURE_COMPRESSED */
+      1011, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
        266, /* GL_COMPRESSED_TEXTURE_FORMATS */
-       918, /* GL_MAX_VERTEX_UNITS_ARB */
+       920, /* GL_MAX_VERTEX_UNITS_ARB */
         22, /* GL_ACTIVE_VERTEX_UNITS_ARB */
-      1810, /* GL_WEIGHT_SUM_UNITY_ARB */
-      1788, /* GL_VERTEX_BLEND_ARB */
+      1814, /* GL_WEIGHT_SUM_UNITY_ARB */
+      1792, /* GL_VERTEX_BLEND_ARB */
        330, /* GL_CURRENT_WEIGHT_ARB */
-      1809, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-      1808, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-      1807, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-      1806, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-      1803, /* GL_WEIGHT_ARRAY_ARB */
+      1813, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+      1812, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+      1811, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+      1810, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+      1807, /* GL_WEIGHT_ARRAY_ARB */
        377, /* GL_DOT3_RGB */
        378, /* GL_DOT3_RGBA */
        260, /* GL_COMPRESSED_RGB_FXT1_3DFX */
        255, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
-       978, /* GL_MULTISAMPLE_3DFX */
-      1368, /* GL_SAMPLE_BUFFERS_3DFX */
-      1359, /* GL_SAMPLES_3DFX */
-       959, /* GL_MODELVIEW2_ARB */
-       962, /* GL_MODELVIEW3_ARB */
-       963, /* GL_MODELVIEW4_ARB */
-       964, /* GL_MODELVIEW5_ARB */
-       965, /* GL_MODELVIEW6_ARB */
-       966, /* GL_MODELVIEW7_ARB */
-       967, /* GL_MODELVIEW8_ARB */
-       968, /* GL_MODELVIEW9_ARB */
-       938, /* GL_MODELVIEW10_ARB */
-       939, /* GL_MODELVIEW11_ARB */
-       940, /* GL_MODELVIEW12_ARB */
-       941, /* GL_MODELVIEW13_ARB */
-       942, /* GL_MODELVIEW14_ARB */
-       943, /* GL_MODELVIEW15_ARB */
-       944, /* GL_MODELVIEW16_ARB */
-       945, /* GL_MODELVIEW17_ARB */
-       946, /* GL_MODELVIEW18_ARB */
-       947, /* GL_MODELVIEW19_ARB */
-       949, /* GL_MODELVIEW20_ARB */
-       950, /* GL_MODELVIEW21_ARB */
-       951, /* GL_MODELVIEW22_ARB */
-       952, /* GL_MODELVIEW23_ARB */
-       953, /* GL_MODELVIEW24_ARB */
-       954, /* GL_MODELVIEW25_ARB */
-       955, /* GL_MODELVIEW26_ARB */
-       956, /* GL_MODELVIEW27_ARB */
-       957, /* GL_MODELVIEW28_ARB */
-       958, /* GL_MODELVIEW29_ARB */
-       960, /* GL_MODELVIEW30_ARB */
-       961, /* GL_MODELVIEW31_ARB */
+       980, /* GL_MULTISAMPLE_3DFX */
+      1372, /* GL_SAMPLE_BUFFERS_3DFX */
+      1363, /* GL_SAMPLES_3DFX */
+       961, /* GL_MODELVIEW2_ARB */
+       964, /* GL_MODELVIEW3_ARB */
+       965, /* GL_MODELVIEW4_ARB */
+       966, /* GL_MODELVIEW5_ARB */
+       967, /* GL_MODELVIEW6_ARB */
+       968, /* GL_MODELVIEW7_ARB */
+       969, /* GL_MODELVIEW8_ARB */
+       970, /* GL_MODELVIEW9_ARB */
+       940, /* GL_MODELVIEW10_ARB */
+       941, /* GL_MODELVIEW11_ARB */
+       942, /* GL_MODELVIEW12_ARB */
+       943, /* GL_MODELVIEW13_ARB */
+       944, /* GL_MODELVIEW14_ARB */
+       945, /* GL_MODELVIEW15_ARB */
+       946, /* GL_MODELVIEW16_ARB */
+       947, /* GL_MODELVIEW17_ARB */
+       948, /* GL_MODELVIEW18_ARB */
+       949, /* GL_MODELVIEW19_ARB */
+       951, /* GL_MODELVIEW20_ARB */
+       952, /* GL_MODELVIEW21_ARB */
+       953, /* GL_MODELVIEW22_ARB */
+       954, /* GL_MODELVIEW23_ARB */
+       955, /* GL_MODELVIEW24_ARB */
+       956, /* GL_MODELVIEW25_ARB */
+       957, /* GL_MODELVIEW26_ARB */
+       958, /* GL_MODELVIEW27_ARB */
+       959, /* GL_MODELVIEW28_ARB */
+       960, /* GL_MODELVIEW29_ARB */
+       962, /* GL_MODELVIEW30_ARB */
+       963, /* GL_MODELVIEW31_ARB */
        382, /* GL_DOT3_RGB_EXT */
        380, /* GL_DOT3_RGBA_EXT */
-       932, /* GL_MIRROR_CLAMP_EXT */
-       935, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
-       973, /* GL_MODULATE_ADD_ATI */
-       974, /* GL_MODULATE_SIGNED_ADD_ATI */
-       975, /* GL_MODULATE_SUBTRACT_ATI */
-      1816, /* GL_YCBCR_MESA */
-      1064, /* GL_PACK_INVERT_MESA */
+       934, /* GL_MIRROR_CLAMP_EXT */
+       937, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
+       975, /* GL_MODULATE_ADD_ATI */
+       976, /* GL_MODULATE_SIGNED_ADD_ATI */
+       977, /* GL_MODULATE_SUBTRACT_ATI */
+      1820, /* GL_YCBCR_MESA */
+      1066, /* GL_PACK_INVERT_MESA */
        333, /* GL_DEBUG_OBJECT_MESA */
        334, /* GL_DEBUG_PRINT_MESA */
        332, /* GL_DEBUG_ASSERT_MESA */
@@ -4676,24 +4684,24 @@ static const unsigned reduced_enums[1319] =
        440, /* GL_DU8DV8_ATI */
        111, /* GL_BUMP_ENVMAP_ATI */
        115, /* GL_BUMP_TARGET_ATI */
-      1466, /* GL_STENCIL_BACK_FUNC */
-      1464, /* GL_STENCIL_BACK_FAIL */
-      1468, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-      1470, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
-       524, /* GL_FRAGMENT_PROGRAM_ARB */
-      1202, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
-      1230, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
-      1229, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
-      1214, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-      1220, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-      1219, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-       867, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
-       890, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
-       889, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
-       880, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-       886, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-       885, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-       850, /* GL_MAX_DRAW_BUFFERS */
+      1470, /* GL_STENCIL_BACK_FUNC */
+      1468, /* GL_STENCIL_BACK_FAIL */
+      1472, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
+      1474, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
+       525, /* GL_FRAGMENT_PROGRAM_ARB */
+      1204, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
+      1232, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
+      1231, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
+      1216, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+      1222, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+      1221, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+       869, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
+       892, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
+       891, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
+       882, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+       888, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+       887, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+       852, /* GL_MAX_DRAW_BUFFERS */
        386, /* GL_DRAW_BUFFER0 */
        389, /* GL_DRAW_BUFFER1 */
        410, /* GL_DRAW_BUFFER2 */
@@ -4711,251 +4719,251 @@ static const unsigned reduced_enums[1319] =
        402, /* GL_DRAW_BUFFER14 */
        405, /* GL_DRAW_BUFFER15 */
         81, /* GL_BLEND_EQUATION_ALPHA */
-       830, /* GL_MATRIX_PALETTE_ARB */
-       861, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
-       864, /* GL_MAX_PALETTE_MATRICES_ARB */
+       832, /* GL_MATRIX_PALETTE_ARB */
+       863, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
+       866, /* GL_MAX_PALETTE_MATRICES_ARB */
        315, /* GL_CURRENT_PALETTE_MATRIX_ARB */
-       824, /* GL_MATRIX_INDEX_ARRAY_ARB */
+       826, /* GL_MATRIX_INDEX_ARRAY_ARB */
        310, /* GL_CURRENT_MATRIX_INDEX_ARB */
-       826, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
-       828, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
-       827, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
-       825, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
-      1644, /* GL_TEXTURE_DEPTH_SIZE */
+       828, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
+       830, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
+       829, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
+       827, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
+      1648, /* GL_TEXTURE_DEPTH_SIZE */
        370, /* GL_DEPTH_TEXTURE_MODE */
-      1610, /* GL_TEXTURE_COMPARE_MODE */
-      1608, /* GL_TEXTURE_COMPARE_FUNC */
+      1614, /* GL_TEXTURE_COMPARE_MODE */
+      1612, /* GL_TEXTURE_COMPARE_FUNC */
        239, /* GL_COMPARE_R_TO_TEXTURE */
-      1136, /* GL_POINT_SPRITE */
+      1138, /* GL_POINT_SPRITE */
        292, /* GL_COORD_REPLACE */
-      1140, /* GL_POINT_SPRITE_R_MODE_NV */
-      1257, /* GL_QUERY_COUNTER_BITS */
+      1142, /* GL_POINT_SPRITE_R_MODE_NV */
+      1261, /* GL_QUERY_COUNTER_BITS */
        317, /* GL_CURRENT_QUERY */
-      1259, /* GL_QUERY_RESULT */
-      1261, /* GL_QUERY_RESULT_AVAILABLE */
-       912, /* GL_MAX_VERTEX_GENERIC_ATTRIBS */
-      1778, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+      1263, /* GL_QUERY_RESULT */
+      1265, /* GL_QUERY_RESULT_AVAILABLE */
+       914, /* GL_MAX_VERTEX_ATTRIBS */
+      1782, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
        368, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
        367, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
-       898, /* GL_MAX_TEXTURE_COORDS */
-       900, /* GL_MAX_TEXTURE_IMAGE_UNITS */
-      1207, /* GL_PROGRAM_ERROR_STRING_ARB */
-      1209, /* GL_PROGRAM_FORMAT_ASCII_ARB */
-      1208, /* GL_PROGRAM_FORMAT_ARB */
-      1690, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+       900, /* GL_MAX_TEXTURE_COORDS */
+       902, /* GL_MAX_TEXTURE_IMAGE_UNITS */
+      1209, /* GL_PROGRAM_ERROR_STRING_ARB */
+      1211, /* GL_PROGRAM_FORMAT_ASCII_ARB */
+      1210, /* GL_PROGRAM_FORMAT_ARB */
+      1694, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
        347, /* GL_DEPTH_BOUNDS_TEST_EXT */
        346, /* GL_DEPTH_BOUNDS_EXT */
         52, /* GL_ARRAY_BUFFER */
        454, /* GL_ELEMENT_ARRAY_BUFFER */
         53, /* GL_ARRAY_BUFFER_BINDING */
        455, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
-      1752, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-       999, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
+      1756, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+      1001, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
        146, /* GL_COLOR_ARRAY_BUFFER_BINDING */
-       616, /* GL_INDEX_ARRAY_BUFFER_BINDING */
-      1623, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
+       617, /* GL_INDEX_ARRAY_BUFFER_BINDING */
+      1627, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
        450, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
-      1380, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
-       502, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
-      1804, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-      1774, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-      1210, /* GL_PROGRAM_INSTRUCTIONS_ARB */
-       873, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
-      1216, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-       882, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-      1228, /* GL_PROGRAM_TEMPORARIES_ARB */
-       888, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
-      1218, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
-       884, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
-      1222, /* GL_PROGRAM_PARAMETERS_ARB */
-       887, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
-      1217, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
-       883, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
-      1203, /* GL_PROGRAM_ATTRIBS_ARB */
-       868, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
-      1215, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
-       881, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
-      1201, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
-       866, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
-      1213, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-       879, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-       874, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
-       870, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
-      1231, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-      1701, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-      1270, /* GL_READ_ONLY */
-      1812, /* GL_WRITE_ONLY */
-      1272, /* GL_READ_WRITE */
+      1384, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
+       503, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
+      1808, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+      1778, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+      1212, /* GL_PROGRAM_INSTRUCTIONS_ARB */
+       875, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
+      1218, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+       884, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+      1230, /* GL_PROGRAM_TEMPORARIES_ARB */
+       890, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
+      1220, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
+       886, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
+      1224, /* GL_PROGRAM_PARAMETERS_ARB */
+       889, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
+      1219, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
+       885, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
+      1205, /* GL_PROGRAM_ATTRIBS_ARB */
+       870, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
+      1217, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
+       883, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
+      1203, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
+       868, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
+      1215, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+       881, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+       876, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
+       872, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
+      1233, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
+      1705, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+      1274, /* GL_READ_ONLY */
+      1816, /* GL_WRITE_ONLY */
+      1276, /* GL_READ_WRITE */
        101, /* GL_BUFFER_ACCESS */
        103, /* GL_BUFFER_MAPPED */
        105, /* GL_BUFFER_MAP_POINTER */
-      1695, /* GL_TIME_ELAPSED_EXT */
-       784, /* GL_MATRIX0_ARB */
-       796, /* GL_MATRIX1_ARB */
-       808, /* GL_MATRIX2_ARB */
-       812, /* GL_MATRIX3_ARB */
-       814, /* GL_MATRIX4_ARB */
-       816, /* GL_MATRIX5_ARB */
-       818, /* GL_MATRIX6_ARB */
-       820, /* GL_MATRIX7_ARB */
-       822, /* GL_MATRIX8_ARB */
-       823, /* GL_MATRIX9_ARB */
-       786, /* GL_MATRIX10_ARB */
-       787, /* GL_MATRIX11_ARB */
-       788, /* GL_MATRIX12_ARB */
-       789, /* GL_MATRIX13_ARB */
-       790, /* GL_MATRIX14_ARB */
-       791, /* GL_MATRIX15_ARB */
-       792, /* GL_MATRIX16_ARB */
-       793, /* GL_MATRIX17_ARB */
-       794, /* GL_MATRIX18_ARB */
-       795, /* GL_MATRIX19_ARB */
-       798, /* GL_MATRIX20_ARB */
-       799, /* GL_MATRIX21_ARB */
-       800, /* GL_MATRIX22_ARB */
-       801, /* GL_MATRIX23_ARB */
-       802, /* GL_MATRIX24_ARB */
-       803, /* GL_MATRIX25_ARB */
-       804, /* GL_MATRIX26_ARB */
-       805, /* GL_MATRIX27_ARB */
-       806, /* GL_MATRIX28_ARB */
-       807, /* GL_MATRIX29_ARB */
-       810, /* GL_MATRIX30_ARB */
-       811, /* GL_MATRIX31_ARB */
-      1496, /* GL_STREAM_DRAW */
-      1498, /* GL_STREAM_READ */
-      1494, /* GL_STREAM_COPY */
-      1457, /* GL_STATIC_DRAW */
-      1459, /* GL_STATIC_READ */
-      1455, /* GL_STATIC_COPY */
+      1699, /* GL_TIME_ELAPSED_EXT */
+       786, /* GL_MATRIX0_ARB */
+       798, /* GL_MATRIX1_ARB */
+       810, /* GL_MATRIX2_ARB */
+       814, /* GL_MATRIX3_ARB */
+       816, /* GL_MATRIX4_ARB */
+       818, /* GL_MATRIX5_ARB */
+       820, /* GL_MATRIX6_ARB */
+       822, /* GL_MATRIX7_ARB */
+       824, /* GL_MATRIX8_ARB */
+       825, /* GL_MATRIX9_ARB */
+       788, /* GL_MATRIX10_ARB */
+       789, /* GL_MATRIX11_ARB */
+       790, /* GL_MATRIX12_ARB */
+       791, /* GL_MATRIX13_ARB */
+       792, /* GL_MATRIX14_ARB */
+       793, /* GL_MATRIX15_ARB */
+       794, /* GL_MATRIX16_ARB */
+       795, /* GL_MATRIX17_ARB */
+       796, /* GL_MATRIX18_ARB */
+       797, /* GL_MATRIX19_ARB */
+       800, /* GL_MATRIX20_ARB */
+       801, /* GL_MATRIX21_ARB */
+       802, /* GL_MATRIX22_ARB */
+       803, /* GL_MATRIX23_ARB */
+       804, /* GL_MATRIX24_ARB */
+       805, /* GL_MATRIX25_ARB */
+       806, /* GL_MATRIX26_ARB */
+       807, /* GL_MATRIX27_ARB */
+       808, /* GL_MATRIX28_ARB */
+       809, /* GL_MATRIX29_ARB */
+       812, /* GL_MATRIX30_ARB */
+       813, /* GL_MATRIX31_ARB */
+      1500, /* GL_STREAM_DRAW */
+      1502, /* GL_STREAM_READ */
+      1498, /* GL_STREAM_COPY */
+      1461, /* GL_STATIC_DRAW */
+      1463, /* GL_STATIC_READ */
+      1459, /* GL_STATIC_COPY */
        444, /* GL_DYNAMIC_DRAW */
        446, /* GL_DYNAMIC_READ */
        442, /* GL_DYNAMIC_COPY */
-      1104, /* GL_PIXEL_PACK_BUFFER */
-      1108, /* GL_PIXEL_UNPACK_BUFFER */
-      1105, /* GL_PIXEL_PACK_BUFFER_BINDING */
-      1109, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
+      1106, /* GL_PIXEL_PACK_BUFFER */
+      1110, /* GL_PIXEL_UNPACK_BUFFER */
+      1107, /* GL_PIXEL_PACK_BUFFER_BINDING */
+      1111, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
        341, /* GL_DEPTH24_STENCIL8 */
-      1688, /* GL_TEXTURE_STENCIL_SIZE */
-       871, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
-       869, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
-       872, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
-       876, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
-       875, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
-       833, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
-      1490, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
+      1692, /* GL_TEXTURE_STENCIL_SIZE */
+       873, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
+       871, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
+       874, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
+       878, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
+       877, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
+       835, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
+      1494, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
         17, /* GL_ACTIVE_STENCIL_FACE_EXT */
-       933, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
-      1361, /* GL_SAMPLES_PASSED */
-       525, /* GL_FRAGMENT_SHADER */
-      1798, /* GL_VERTEX_SHADER */
-      1221, /* GL_PROGRAM_OBJECT_ARB */
-      1393, /* GL_SHADER_OBJECT_ARB */
-       857, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
-       916, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
-       910, /* GL_MAX_VARYING_FLOATS */
-       914, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
-       842, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
-      1024, /* GL_OBJECT_TYPE_ARB */
-      1395, /* GL_SHADER_TYPE */
-       490, /* GL_FLOAT_VEC2 */
-       492, /* GL_FLOAT_VEC3 */
-       494, /* GL_FLOAT_VEC4 */
-       643, /* GL_INT_VEC2 */
-       645, /* GL_INT_VEC3 */
-       647, /* GL_INT_VEC4 */
+       935, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
+      1365, /* GL_SAMPLES_PASSED */
+       526, /* GL_FRAGMENT_SHADER */
+      1802, /* GL_VERTEX_SHADER */
+      1223, /* GL_PROGRAM_OBJECT_ARB */
+      1397, /* GL_SHADER_OBJECT_ARB */
+       859, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
+       918, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
+       912, /* GL_MAX_VARYING_FLOATS */
+       916, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
+       844, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
+      1026, /* GL_OBJECT_TYPE_ARB */
+      1399, /* GL_SHADER_TYPE */
+       491, /* GL_FLOAT_VEC2 */
+       493, /* GL_FLOAT_VEC3 */
+       495, /* GL_FLOAT_VEC4 */
+       644, /* GL_INT_VEC2 */
+       646, /* GL_INT_VEC3 */
+       648, /* GL_INT_VEC4 */
         93, /* GL_BOOL */
         95, /* GL_BOOL_VEC2 */
         97, /* GL_BOOL_VEC3 */
         99, /* GL_BOOL_VEC4 */
-       478, /* GL_FLOAT_MAT2 */
-       482, /* GL_FLOAT_MAT3 */
-       486, /* GL_FLOAT_MAT4 */
-      1352, /* GL_SAMPLER_1D */
-      1354, /* GL_SAMPLER_2D */
-      1356, /* GL_SAMPLER_3D */
-      1357, /* GL_SAMPLER_CUBE */
-      1353, /* GL_SAMPLER_1D_SHADOW */
-      1355, /* GL_SAMPLER_2D_SHADOW */
-       480, /* GL_FLOAT_MAT2x3 */
-       481, /* GL_FLOAT_MAT2x4 */
-       484, /* GL_FLOAT_MAT3x2 */
-       485, /* GL_FLOAT_MAT3x4 */
-       488, /* GL_FLOAT_MAT4x2 */
-       489, /* GL_FLOAT_MAT4x3 */
+       479, /* GL_FLOAT_MAT2 */
+       483, /* GL_FLOAT_MAT3 */
+       487, /* GL_FLOAT_MAT4 */
+      1356, /* GL_SAMPLER_1D */
+      1358, /* GL_SAMPLER_2D */
+      1360, /* GL_SAMPLER_3D */
+      1361, /* GL_SAMPLER_CUBE */
+      1357, /* GL_SAMPLER_1D_SHADOW */
+      1359, /* GL_SAMPLER_2D_SHADOW */
+       481, /* GL_FLOAT_MAT2x3 */
+       482, /* GL_FLOAT_MAT2x4 */
+       485, /* GL_FLOAT_MAT3x2 */
+       486, /* GL_FLOAT_MAT3x4 */
+       489, /* GL_FLOAT_MAT4x2 */
+       490, /* GL_FLOAT_MAT4x3 */
        339, /* GL_DELETE_STATUS */
        243, /* GL_COMPILE_STATUS */
-       697, /* GL_LINK_STATUS */
-      1747, /* GL_VALIDATE_STATUS */
-       628, /* GL_INFO_LOG_LENGTH */
+       699, /* GL_LINK_STATUS */
+      1751, /* GL_VALIDATE_STATUS */
+       629, /* GL_INFO_LOG_LENGTH */
         55, /* GL_ATTACHED_SHADERS */
         20, /* GL_ACTIVE_UNIFORMS */
         21, /* GL_ACTIVE_UNIFORM_MAX_LENGTH */
-      1394, /* GL_SHADER_SOURCE_LENGTH */
+      1398, /* GL_SHADER_SOURCE_LENGTH */
         15, /* GL_ACTIVE_ATTRIBUTES */
         16, /* GL_ACTIVE_ATTRIBUTE_MAX_LENGTH */
-       527, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
-      1397, /* GL_SHADING_LANGUAGE_VERSION */
+       528, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
+      1401, /* GL_SHADING_LANGUAGE_VERSION */
        316, /* GL_CURRENT_PROGRAM */
-      1073, /* GL_PALETTE4_RGB8_OES */
-      1075, /* GL_PALETTE4_RGBA8_OES */
-      1071, /* GL_PALETTE4_R5_G6_B5_OES */
-      1074, /* GL_PALETTE4_RGBA4_OES */
-      1072, /* GL_PALETTE4_RGB5_A1_OES */
-      1078, /* GL_PALETTE8_RGB8_OES */
-      1080, /* GL_PALETTE8_RGBA8_OES */
-      1076, /* GL_PALETTE8_R5_G6_B5_OES */
-      1079, /* GL_PALETTE8_RGBA4_OES */
-      1077, /* GL_PALETTE8_RGB5_A1_OES */
-       610, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
-       609, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
-      1732, /* GL_UNSIGNED_NORMALIZED */
-      1578, /* GL_TEXTURE_1D_ARRAY_EXT */
-      1241, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
-      1580, /* GL_TEXTURE_2D_ARRAY_EXT */
-      1244, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
-      1586, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
-      1588, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
-      1449, /* GL_SRGB */
-      1450, /* GL_SRGB8 */
-      1452, /* GL_SRGB_ALPHA */
-      1451, /* GL_SRGB8_ALPHA8 */
-      1409, /* GL_SLUMINANCE_ALPHA */
-      1408, /* GL_SLUMINANCE8_ALPHA8 */
-      1406, /* GL_SLUMINANCE */
-      1407, /* GL_SLUMINANCE8 */
+      1075, /* GL_PALETTE4_RGB8_OES */
+      1077, /* GL_PALETTE4_RGBA8_OES */
+      1073, /* GL_PALETTE4_R5_G6_B5_OES */
+      1076, /* GL_PALETTE4_RGBA4_OES */
+      1074, /* GL_PALETTE4_RGB5_A1_OES */
+      1080, /* GL_PALETTE8_RGB8_OES */
+      1082, /* GL_PALETTE8_RGBA8_OES */
+      1078, /* GL_PALETTE8_R5_G6_B5_OES */
+      1081, /* GL_PALETTE8_RGBA4_OES */
+      1079, /* GL_PALETTE8_RGB5_A1_OES */
+       611, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
+       610, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
+      1736, /* GL_UNSIGNED_NORMALIZED */
+      1582, /* GL_TEXTURE_1D_ARRAY_EXT */
+      1244, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
+      1584, /* GL_TEXTURE_2D_ARRAY_EXT */
+      1247, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
+      1590, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
+      1592, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
+      1453, /* GL_SRGB */
+      1454, /* GL_SRGB8 */
+      1456, /* GL_SRGB_ALPHA */
+      1455, /* GL_SRGB8_ALPHA8 */
+      1413, /* GL_SLUMINANCE_ALPHA */
+      1412, /* GL_SLUMINANCE8_ALPHA8 */
+      1410, /* GL_SLUMINANCE */
+      1411, /* GL_SLUMINANCE8 */
        264, /* GL_COMPRESSED_SRGB */
        265, /* GL_COMPRESSED_SRGB_ALPHA */
        262, /* GL_COMPRESSED_SLUMINANCE */
        263, /* GL_COMPRESSED_SLUMINANCE_ALPHA */
-      1138, /* GL_POINT_SPRITE_COORD_ORIGIN */
-       705, /* GL_LOWER_LEFT */
-      1744, /* GL_UPPER_LEFT */
-      1472, /* GL_STENCIL_BACK_REF */
-      1473, /* GL_STENCIL_BACK_VALUE_MASK */
-      1474, /* GL_STENCIL_BACK_WRITEMASK */
+      1140, /* GL_POINT_SPRITE_COORD_ORIGIN */
+       707, /* GL_LOWER_LEFT */
+      1748, /* GL_UPPER_LEFT */
+      1476, /* GL_STENCIL_BACK_REF */
+      1477, /* GL_STENCIL_BACK_VALUE_MASK */
+      1478, /* GL_STENCIL_BACK_WRITEMASK */
        435, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
-      1286, /* GL_RENDERBUFFER_BINDING_EXT */
-      1267, /* GL_READ_FRAMEBUFFER */
+      1290, /* GL_RENDERBUFFER_BINDING_EXT */
+      1271, /* GL_READ_FRAMEBUFFER */
        434, /* GL_DRAW_FRAMEBUFFER */
-      1268, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
-      1296, /* GL_RENDERBUFFER_SAMPLES */
-       537, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
-       535, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
-       546, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
-       542, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
-       544, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
-       549, /* GL_FRAMEBUFFER_COMPLETE */
-       553, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
-       559, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
-       557, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
-       555, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
-       558, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
-       556, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
-       562, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
-       565, /* GL_FRAMEBUFFER_UNSUPPORTED */
-       563, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
-       839, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
+      1272, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
+      1300, /* GL_RENDERBUFFER_SAMPLES */
+       538, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
+       536, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
+       547, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
+       543, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
+       545, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+       550, /* GL_FRAMEBUFFER_COMPLETE */
+       554, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
+       560, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
+       558, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
+       556, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
+       559, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
+       557, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
+       563, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
+       566, /* GL_FRAMEBUFFER_UNSUPPORTED */
+       564, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
+       841, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
        152, /* GL_COLOR_ATTACHMENT0 */
        154, /* GL_COLOR_ATTACHMENT1 */
        168, /* GL_COLOR_ATTACHMENT2 */
@@ -4973,35 +4981,39 @@ static const unsigned reduced_enums[1319] =
        163, /* GL_COLOR_ATTACHMENT14 */
        165, /* GL_COLOR_ATTACHMENT15 */
        342, /* GL_DEPTH_ATTACHMENT */
-      1462, /* GL_STENCIL_ATTACHMENT */
-       528, /* GL_FRAMEBUFFER */
-      1284, /* GL_RENDERBUFFER */
-      1298, /* GL_RENDERBUFFER_WIDTH */
-      1291, /* GL_RENDERBUFFER_HEIGHT */
-      1293, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
-      1485, /* GL_STENCIL_INDEX_EXT */
-      1482, /* GL_STENCIL_INDEX1_EXT */
-      1483, /* GL_STENCIL_INDEX4_EXT */
-      1484, /* GL_STENCIL_INDEX8_EXT */
-      1481, /* GL_STENCIL_INDEX16_EXT */
-      1295, /* GL_RENDERBUFFER_RED_SIZE */
-      1290, /* GL_RENDERBUFFER_GREEN_SIZE */
-      1287, /* GL_RENDERBUFFER_BLUE_SIZE */
-      1285, /* GL_RENDERBUFFER_ALPHA_SIZE */
-      1288, /* GL_RENDERBUFFER_DEPTH_SIZE */
-      1297, /* GL_RENDERBUFFER_STENCIL_SIZE */
-       561, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
-       895, /* GL_MAX_SAMPLES */
-      1345, /* GL_RGBA_SNORM */
-      1341, /* GL_RGBA8_SNORM */
-      1402, /* GL_SIGNED_NORMALIZED */
+      1466, /* GL_STENCIL_ATTACHMENT */
+       529, /* GL_FRAMEBUFFER */
+      1288, /* GL_RENDERBUFFER */
+      1302, /* GL_RENDERBUFFER_WIDTH */
+      1295, /* GL_RENDERBUFFER_HEIGHT */
+      1297, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
+      1489, /* GL_STENCIL_INDEX_EXT */
+      1486, /* GL_STENCIL_INDEX1_EXT */
+      1487, /* GL_STENCIL_INDEX4_EXT */
+      1488, /* GL_STENCIL_INDEX8_EXT */
+      1485, /* GL_STENCIL_INDEX16_EXT */
+      1299, /* GL_RENDERBUFFER_RED_SIZE */
+      1294, /* GL_RENDERBUFFER_GREEN_SIZE */
+      1291, /* GL_RENDERBUFFER_BLUE_SIZE */
+      1289, /* GL_RENDERBUFFER_ALPHA_SIZE */
+      1292, /* GL_RENDERBUFFER_DEPTH_SIZE */
+      1301, /* GL_RENDERBUFFER_STENCIL_SIZE */
+       562, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
+       897, /* GL_MAX_SAMPLES */
+      1258, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT */
+       476, /* GL_FIRST_VERTEX_CONVENTION_EXT */
+       659, /* GL_LAST_VERTEX_CONVENTION_EXT */
+      1237, /* GL_PROVOKING_VERTEX_EXT */
+      1349, /* GL_RGBA_SNORM */
+      1345, /* GL_RGBA8_SNORM */
+      1406, /* GL_SIGNED_NORMALIZED */
        461, /* GL_EVAL_BIT */
-      1265, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
-       699, /* GL_LIST_BIT */
-      1594, /* GL_TEXTURE_BIT */
-      1376, /* GL_SCISSOR_BIT */
+      1269, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
+       701, /* GL_LIST_BIT */
+      1598, /* GL_TEXTURE_BIT */
+      1380, /* GL_SCISSOR_BIT */
         29, /* GL_ALL_ATTRIB_BITS */
-       980, /* GL_MULTISAMPLE_BIT */
+       982, /* GL_MULTISAMPLE_BIT */
         30, /* GL_ALL_CLIENT_ATTRIB_BITS */
 };
 
-- 
cgit v1.2.3


From 89966cdb1b5974059c32308d74b5bb09943a6fa1 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 28 May 2009 12:30:25 -0600
Subject: mesa: data structure updates for GL_EXT_provoking_vertex

---
 src/mesa/main/context.c    | 3 +++
 src/mesa/main/extensions.c | 1 +
 src/mesa/main/mtypes.h     | 5 +++++
 3 files changed, 9 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index ff9dd488c7..d9f10468aa 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -592,6 +592,9 @@ _mesa_init_constants(GLcontext *ctx)
    /* GL_ATI_envmap_bumpmap */
    ctx->Const.SupportedBumpUnits = SUPPORTED_ATI_BUMP_UNITS;
 
+   /* GL_EXT_provoking_vertex */
+   ctx->Const.QuadsFollowProvokingVertexConvention = GL_TRUE;
+
    /* sanity checks */
    ASSERT(ctx->Const.MaxTextureUnits == MIN2(ctx->Const.MaxTextureImageUnits,
                                              ctx->Const.MaxTextureCoordUnits));
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 5c4bea9cf6..fc8717e057 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -106,6 +106,7 @@ static const struct {
    { OFF, "GL_EXT_pixel_buffer_object",        F(EXT_pixel_buffer_object) },
    { OFF, "GL_EXT_point_parameters",           F(EXT_point_parameters) },
    { ON,  "GL_EXT_polygon_offset",             F(EXT_polygon_offset) },
+   { OFF, "GL_EXT_provoking_vertex",           F(EXT_provoking_vertex) },
    { ON,  "GL_EXT_rescale_normal",             F(EXT_rescale_normal) },
    { OFF, "GL_EXT_secondary_color",            F(EXT_secondary_color) },
    { ON,  "GL_EXT_separate_specular_color",    F(EXT_separate_specular_color) },
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index e3471123c6..0e90226c7c 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -770,6 +770,7 @@ struct gl_light_attrib
 
    GLboolean Enabled;			/**< Lighting enabled flag */
    GLenum ShadeModel;			/**< GL_FLAT or GL_SMOOTH */
+   GLenum ProvokingVertex;              /**< GL_EXT_provoking_vertex */
    GLenum ColorMaterialFace;		/**< GL_FRONT, BACK or FRONT_AND_BACK */
    GLenum ColorMaterialMode;		/**< GL_AMBIENT, GL_DIFFUSE, etc */
    GLbitfield ColorMaterialBitmask;	/**< bitmask formed from Face and Mode */
@@ -2421,6 +2422,9 @@ struct gl_constants
    GLuint MaxVarying;  /**< Number of float[4] varying parameters */
 
    GLbitfield SupportedBumpUnits; /**> units supporting GL_ATI_envmap_bumpmap as targets */
+
+   /**< GL_EXT_provoking_vertex */
+   GLboolean QuadsFollowProvokingVertexConvention;
 };
 
 
@@ -2489,6 +2493,7 @@ struct gl_extensions
    GLboolean EXT_pixel_buffer_object;
    GLboolean EXT_point_parameters;
    GLboolean EXT_polygon_offset;
+   GLboolean EXT_provoking_vertex;
    GLboolean EXT_rescale_normal;
    GLboolean EXT_shadow_funcs;
    GLboolean EXT_secondary_color;
-- 
cgit v1.2.3


From fe86e508967bd7b63902928033247e145103f60c Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 28 May 2009 12:31:18 -0600
Subject: mesa: exec/dlist functions for glProvokingVertexEXT()

---
 src/mesa/main/api_exec.c |  2 ++
 src/mesa/main/dlist.c    | 33 +++++++++++++++++++++++++++++++++
 src/mesa/main/light.c    | 37 +++++++++++++++++++++++++++++++++++--
 src/mesa/main/light.h    | 14 +++++++-------
 4 files changed, 77 insertions(+), 9 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index 6f66ff47a0..8627fafa3b 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -641,6 +641,8 @@ _mesa_init_exec_table(struct _glapi_table *exec)
    /* ???. GL_EXT_depth_bounds_test */
    SET_DepthBoundsEXT(exec, _mesa_DepthBoundsEXT);
 
+   SET_ProvokingVertexEXT(exec, _mesa_ProvokingVertexEXT);
+
    /* ARB 1. GL_ARB_multitexture */
 #if _HAVE_FULL_GL
    SET_ActiveTextureARB(exec, _mesa_ActiveTextureARB);
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index dd73a1906b..016c8481e9 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -352,6 +352,9 @@ typedef enum
    OPCODE_EVAL_P1,
    OPCODE_EVAL_P2,
 
+   /* GL_EXT_provoking_vertex */
+   OPCODE_PROVOKING_VERTEX,
+
    /* The following three are meta instructions */
    OPCODE_ERROR,                /* raise compiled-in error */
    OPCODE_CONTINUE,
@@ -5705,6 +5708,25 @@ save_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
 #endif
 
 
+/** GL_EXT_provoking_vertex */
+static void GLAPIENTRY
+save_ProvokingVertexEXT(GLenum mode)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION(ctx, OPCODE_PROVOKING_VERTEX, 1);
+   if (n) {
+      n[1].e = mode;
+   }
+   if (ctx->ExecuteFlag) {
+      /*CALL_ProvokingVertexEXT(ctx->Exec, (mode));*/
+      _mesa_ProvokingVertexEXT(mode);
+   }
+}
+
+
+
 /**
  * Save an error-generating command into display list.
  *
@@ -6269,6 +6291,9 @@ execute_list(GLcontext *ctx, GLuint list)
          case OPCODE_SHADE_MODEL:
             CALL_ShadeModel(ctx->Exec, (n[1].e));
             break;
+         case OPCODE_PROVOKING_VERTEX:
+            CALL_ProvokingVertexEXT(ctx->Exec, (n[1].e));
+            break;
          case OPCODE_STENCIL_FUNC:
             CALL_StencilFunc(ctx->Exec, (n[1].e, n[2].i, n[3].ui));
             break;
@@ -8238,6 +8263,9 @@ _mesa_init_dlist_table(struct _glapi_table *table)
    SET_ProgramEnvParameters4fvEXT(table, save_ProgramEnvParameters4fvEXT);
    SET_ProgramLocalParameters4fvEXT(table, save_ProgramLocalParameters4fvEXT);
 #endif
+
+   /* 364. GL_EXT_provoking_vertex */
+   SET_ProvokingVertexEXT(table, save_ProvokingVertexEXT);
 }
 
 
@@ -8474,6 +8502,11 @@ print_list(GLcontext *ctx, GLuint list)
             _mesa_printf("EVAL_P2 %d %d\n", n[1].i, n[2].i);
             break;
 
+         case OPCODE_PROVOKING_VERTEX:
+            _mesa_printf("ProvokingVertex %s\n",
+                         _mesa_lookup_enum_by_nr(n[1].ui));
+            break;
+
             /*
              * meta opcodes/commands
              */
diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c
index ac604fd12c..0f0d831fee 100644
--- a/src/mesa/main/light.c
+++ b/src/mesa/main/light.c
@@ -1,8 +1,9 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.0
+ * Version:  7.5
  *
- * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -63,6 +64,37 @@ _mesa_ShadeModel( GLenum mode )
 }
 
 
+/**
+ * Set the provoking vertex (the vertex which specifies the prim's
+ * color when flat shading) to either the first or last vertex of the
+ * triangle or line.
+ */
+void GLAPIENTRY
+_mesa_ProvokingVertexEXT(GLenum mode)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (MESA_VERBOSE&VERBOSE_API)
+      _mesa_debug(ctx, "glProvokingVertexEXT 0x%x\n", mode);
+
+   switch (mode) {
+   case GL_FIRST_VERTEX_CONVENTION_EXT:
+   case GL_LAST_VERTEX_CONVENTION_EXT:
+      break;
+   default:
+      _mesa_error(ctx, GL_INVALID_ENUM, "glProvokingVertexEXT(0x%x)", mode);
+      return;
+   }
+
+   if (ctx->Light.ProvokingVertex == mode)
+      return;
+
+   FLUSH_VERTICES(ctx, _NEW_LIGHT);
+   ctx->Light.ProvokingVertex = mode;
+}
+
+
 /**
  * Helper function called by _mesa_Lightfv and _mesa_PopAttrib to set
  * per-light state.
@@ -1348,6 +1380,7 @@ _mesa_init_lighting( GLcontext *ctx )
    init_lightmodel( &ctx->Light.Model );
    init_material( &ctx->Light.Material );
    ctx->Light.ShadeModel = GL_SMOOTH;
+   ctx->Light.ProvokingVertex = GL_LAST_VERTEX_CONVENTION_EXT;
    ctx->Light.Enabled = GL_FALSE;
    ctx->Light.ColorMaterialFace = GL_FRONT_AND_BACK;
    ctx->Light.ColorMaterialMode = GL_AMBIENT_AND_DIFFUSE;
diff --git a/src/mesa/main/light.h b/src/mesa/main/light.h
index b97e17b5be..9c1a5eefad 100644
--- a/src/mesa/main/light.h
+++ b/src/mesa/main/light.h
@@ -1,13 +1,9 @@
-/**
- * \file light.h
- * Lighting.
- */
-
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  7.5
  *
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -37,6 +33,10 @@
 extern void GLAPIENTRY
 _mesa_ShadeModel( GLenum mode );
 
+extern void GLAPIENTRY
+_mesa_ProvokingVertexEXT(GLenum mode);
+
+
 #if _HAVE_FULL_GL
 extern void GLAPIENTRY
 _mesa_ColorMaterial( GLenum face, GLenum mode );
-- 
cgit v1.2.3


From f2f89b01d2179775e240145ce62923854c1c8936 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 28 May 2009 12:31:56 -0600
Subject: mesa: glGet queries for GL_EXT_provoking_vertex

---
 src/mesa/main/get.c      | 24 ++++++++++++++++++++++++
 src/mesa/main/get_gen.py |  7 +++++++
 2 files changed, 31 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 1ed6fc3383..516159bbf2 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -1835,6 +1835,14 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          CHECK_EXT1(EXT_framebuffer_blit, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->ReadBuffer->Name);
          break;
+      case GL_PROVOKING_VERTEX_EXT:
+         CHECK_EXT1(EXT_provoking_vertex, "GetBooleanv");
+         params[0] = ctx->Light.ProvokingVertex;
+         break;
+      case GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT:
+         CHECK_EXT1(EXT_provoking_vertex, "GetBooleanv");
+         params[0] = ctx->Const.QuadsFollowProvokingVertexConvention;
+         break;
       case GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB:
          CHECK_EXT1(ARB_fragment_shader, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Const.FragmentProgram.MaxUniformComponents);
@@ -3649,6 +3657,14 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          CHECK_EXT1(EXT_framebuffer_blit, "GetFloatv");
          params[0] = (GLfloat)(ctx->ReadBuffer->Name);
          break;
+      case GL_PROVOKING_VERTEX_EXT:
+         CHECK_EXT1(EXT_provoking_vertex, "GetFloatv");
+         params[0] = BOOLEAN_TO_FLOAT(ctx->Light.ProvokingVertex);
+         break;
+      case GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT:
+         CHECK_EXT1(EXT_provoking_vertex, "GetFloatv");
+         params[0] = BOOLEAN_TO_FLOAT(ctx->Const.QuadsFollowProvokingVertexConvention);
+         break;
       case GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB:
          CHECK_EXT1(ARB_fragment_shader, "GetFloatv");
          params[0] = (GLfloat)(ctx->Const.FragmentProgram.MaxUniformComponents);
@@ -5463,6 +5479,14 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          CHECK_EXT1(EXT_framebuffer_blit, "GetIntegerv");
          params[0] = ctx->ReadBuffer->Name;
          break;
+      case GL_PROVOKING_VERTEX_EXT:
+         CHECK_EXT1(EXT_provoking_vertex, "GetIntegerv");
+         params[0] = BOOLEAN_TO_INT(ctx->Light.ProvokingVertex);
+         break;
+      case GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT:
+         CHECK_EXT1(EXT_provoking_vertex, "GetIntegerv");
+         params[0] = BOOLEAN_TO_INT(ctx->Const.QuadsFollowProvokingVertexConvention);
+         break;
       case GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB:
          CHECK_EXT1(ARB_fragment_shader, "GetIntegerv");
          params[0] = ctx->Const.FragmentProgram.MaxUniformComponents;
diff --git a/src/mesa/main/get_gen.py b/src/mesa/main/get_gen.py
index 43ee5fff10..5666ad0e42 100644
--- a/src/mesa/main/get_gen.py
+++ b/src/mesa/main/get_gen.py
@@ -976,6 +976,13 @@ StateVars = [
 	( "GL_READ_FRAMEBUFFER_BINDING_EXT", GLint, ["ctx->ReadBuffer->Name"], "",
 	  ["EXT_framebuffer_blit"] ),
 
+	# GL_EXT_provoking_vertex
+	( "GL_PROVOKING_VERTEX_EXT", GLboolean,
+	  ["ctx->Light.ProvokingVertex"], "", ["EXT_provoking_vertex"] ),
+	( "GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT", GLboolean,
+	  ["ctx->Const.QuadsFollowProvokingVertexConvention"], "",
+	  ["EXT_provoking_vertex"] ),
+
 	# GL_ARB_fragment_shader
 	( "GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB", GLint,
 	  ["ctx->Const.FragmentProgram.MaxUniformComponents"], "",
-- 
cgit v1.2.3


From 29c6c8eb18ace95b9af6dcf34e02c2b8db0ffda8 Mon Sep 17 00:00:00 2001
From: José Fonseca <jfonseca@vmware.com>
Date: Sat, 30 May 2009 12:38:45 -0700
Subject: mesa: Add success/failures return value to _mesa_make_current.

---
 src/mesa/main/context.c | 8 +++++---
 src/mesa/main/context.h | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index ec0dc12a3e..884b6ad282 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1259,7 +1259,7 @@ initialize_framebuffer_size(GLcontext *ctx, GLframebuffer *fb)
  * \param drawBuffer  the drawing framebuffer
  * \param readBuffer  the reading framebuffer
  */
-void
+GLboolean
 _mesa_make_current( GLcontext *newCtx, GLframebuffer *drawBuffer,
                     GLframebuffer *readBuffer )
 {
@@ -1272,14 +1272,14 @@ _mesa_make_current( GLcontext *newCtx, GLframebuffer *drawBuffer,
       if (!check_compatible(newCtx, drawBuffer)) {
          _mesa_warning(newCtx,
               "MakeCurrent: incompatible visuals for context and drawbuffer");
-         return;
+         return GL_FALSE;
       }
    }
    if (newCtx && readBuffer && newCtx->WinSysReadBuffer != readBuffer) {
       if (!check_compatible(newCtx, readBuffer)) {
          _mesa_warning(newCtx,
               "MakeCurrent: incompatible visuals for context and readbuffer");
-         return;
+         return GL_FALSE;
       }
    }
 
@@ -1384,6 +1384,8 @@ _mesa_make_current( GLcontext *newCtx, GLframebuffer *drawBuffer,
 	 newCtx->FirstTimeCurrent = GL_FALSE;
       }
    }
+   
+   return GL_TRUE;
 }
 
 
diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h
index 5b57d88029..6b3e1b2b97 100644
--- a/src/mesa/main/context.h
+++ b/src/mesa/main/context.h
@@ -130,7 +130,7 @@ extern void
 _mesa_copy_context(const GLcontext *src, GLcontext *dst, GLuint mask);
 
 
-extern void
+extern GLboolean
 _mesa_make_current( GLcontext *ctx, GLframebuffer *drawBuffer,
                     GLframebuffer *readBuffer );
 
-- 
cgit v1.2.3


From 5bb2074798a752557a1eaa8f2d2b8b45282f9f7e Mon Sep 17 00:00:00 2001
From: José Fonseca <jfonseca@vmware.com>
Date: Sat, 30 May 2009 12:42:55 -0700
Subject: mesa: Output warnings to debugger on Windows.

Stderr of Windows applications without console is not usually
visible.
---
 src/mesa/main/imports.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 615f7c9a6d..3fb67083a2 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -1008,6 +1008,16 @@ output_if_debug(const char *prefixString, const char *outputString,
       fprintf(stderr, "%s: %s", prefixString, outputString);
       if (newline)
          fprintf(stderr, "\n");
+
+#if defined(_WIN32) && !defined(_WIN32_WCE)
+      /* stderr from windows applications without console is not usually 
+       * visible, so communicate with the debugger instead */ 
+      {
+         char buf[4096];
+         _mesa_snprintf(buf, sizeof(buf), "%s: %s%s", prefixString, outputString, newline ? "\n" : "");
+         OutputDebugStringA(buf);
+      }
+#endif
    }
 }
 
-- 
cgit v1.2.3


From a444d245e5098a85c7b1c0f1923300a8ef9a31d6 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 1 Jun 2009 20:43:57 -0600
Subject: mesa: enable GL_EXT_provoking_vertex for sw drivers

---
 src/mesa/main/extensions.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index fc8717e057..c5695f8a68 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -262,6 +262,7 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
    ctx->Extensions.EXT_pixel_buffer_object = GL_TRUE;
 #endif
    ctx->Extensions.EXT_point_parameters = GL_TRUE;
+   ctx->Extensions.EXT_provoking_vertex = GL_TRUE;
    ctx->Extensions.EXT_shadow_funcs = GL_TRUE;
    ctx->Extensions.EXT_secondary_color = GL_TRUE;
    ctx->Extensions.EXT_shared_texture_palette = GL_TRUE;
-- 
cgit v1.2.3


From cb3a9f984de6b1a167c60c345d51d55b8c0ca80b Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 2 Jun 2009 10:26:50 -0600
Subject: mesa: add #define FEATURE_ARB_pixel_buffer_object

---
 src/mesa/main/mfeatures.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index f570647942..62c3ead3e1 100644
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -61,6 +61,7 @@
 #define FEATURE_ARB_occlusion_query  _HAVE_FULL_GL
 #define FEATURE_ARB_fragment_program  _HAVE_FULL_GL
 #define FEATURE_ARB_framebuffer_object  _HAVE_FULL_GL
+#define FEATURE_ARB_pixel_buffer_object  _HAVE_FULL_GL
 #define FEATURE_ARB_vertex_buffer_object  _HAVE_FULL_GL
 #define FEATURE_ARB_vertex_program  _HAVE_FULL_GL
 #define FEATURE_ARB_vertex_shader _HAVE_FULL_GL
-- 
cgit v1.2.3


From 12e94d892e3322be5c8a1594702d69e7a02d5274 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 2 Jun 2009 10:27:05 -0600
Subject: mesa: release VBO and PBO references upon context destruction

---
 src/mesa/main/context.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 884b6ad282..a947f69632 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1007,6 +1007,16 @@ _mesa_free_context_data( GLcontext *ctx )
 
    _mesa_delete_array_object(ctx, ctx->Array.DefaultArrayObj);
 
+#if FEATURE_ARB_pixel_buffer_object
+   _mesa_reference_buffer_object(ctx, &ctx->Pack.BufferObj, NULL);
+   _mesa_reference_buffer_object(ctx, &ctx->Unpack.BufferObj, NULL);
+#endif
+
+#if FEATURE_ARB_vertex_buffer_object
+   _mesa_reference_buffer_object(ctx, &ctx->Array.ArrayBufferObj, NULL);
+   _mesa_reference_buffer_object(ctx, &ctx->Array.ElementArrayBufferObj, NULL);
+#endif
+
 #if FEATURE_ARB_vertex_buffer_object
    _mesa_delete_buffer_object(ctx, ctx->Array.NullBufferObj);
 #endif
-- 
cgit v1.2.3


From 751977075f30076bd5e53f9ed9b19d9b36b5da69 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 2 Jun 2009 20:29:11 -0600
Subject: glapi: regenerated files for GL_ARB_copy_buffer

---
 src/glx/x11/indirect.c                         |   60 -
 src/mesa/drivers/dri/common/extension_helper.h |   30 +-
 src/mesa/glapi/dispatch.h                      |  435 +-
 src/mesa/glapi/glapioffsets.h                  |  430 +-
 src/mesa/glapi/glapitable.h                    |  427 +-
 src/mesa/glapi/glapitemp.h                     |  166 +-
 src/mesa/glapi/glprocs.h                       | 1102 ++---
 src/mesa/main/enums.c                          | 5300 ++++++++++++------------
 src/mesa/sparc/glapi_sparc.S                   |   83 +-
 src/mesa/x86-64/glapi_x86-64.S                 | 2021 ++++-----
 src/mesa/x86/glapi_x86.S                       |  109 +-
 11 files changed, 5094 insertions(+), 5069 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/glx/x11/indirect.c b/src/glx/x11/indirect.c
index aea117ec32..08d52aeea3 100644
--- a/src/glx/x11/indirect.c
+++ b/src/glx/x11/indirect.c
@@ -5198,13 +5198,9 @@ glDeleteTexturesEXT(GLsizei n, const GLuint * textures)
 {
     __GLXcontext *const gc = __glXGetCurrentContext();
 
-#ifdef GLX_DIRECT_RENDERING
     if (gc->driContext) {
         CALL_DeleteTextures(GET_DISPATCH(), (n, textures));
     } else {
-#else
-    {
-#endif
         __GLXcontext *const gc = __glXGetCurrentContext();
         Display *const dpy = gc->currentDpy;
         const GLuint cmdlen = 4 + __GLX_PAD((n * 4));
@@ -5270,13 +5266,9 @@ glGenTexturesEXT(GLsizei n, GLuint * textures)
 {
     __GLXcontext *const gc = __glXGetCurrentContext();
 
-#ifdef GLX_DIRECT_RENDERING    
     if (gc->driContext) {
         CALL_GenTextures(GET_DISPATCH(), (n, textures));
     } else {
-#else 
-    {
-#endif
         __GLXcontext *const gc = __glXGetCurrentContext();
         Display *const dpy = gc->currentDpy;
         const GLuint cmdlen = 4;
@@ -5336,13 +5328,9 @@ glIsTextureEXT(GLuint texture)
 {
     __GLXcontext *const gc = __glXGetCurrentContext();
 
-#ifdef GLX_DIRECT_RENDERING    
     if (gc->driContext) {
         return CALL_IsTexture(GET_DISPATCH(), (texture));
     } else {
-#else 
-    {
-#endif
         __GLXcontext *const gc = __glXGetCurrentContext();
         Display *const dpy = gc->currentDpy;
         GLboolean retval = (GLboolean) 0;
@@ -5653,13 +5641,9 @@ glGetColorTableEXT(GLenum target, GLenum format, GLenum type, GLvoid * table)
 {
     __GLXcontext *const gc = __glXGetCurrentContext();
 
-#ifdef GLX_DIRECT_RENDERING    
     if (gc->driContext) {
         CALL_GetColorTable(GET_DISPATCH(), (target, format, type, table));
     } else {
-#else 
-    {
-#endif
         __GLXcontext *const gc = __glXGetCurrentContext();
         const __GLXattribute *const state = gc->client_state_private;
         Display *const dpy = gc->currentDpy;
@@ -5730,14 +5714,10 @@ glGetColorTableParameterfvEXT(GLenum target, GLenum pname, GLfloat * params)
 {
     __GLXcontext *const gc = __glXGetCurrentContext();
 
-#ifdef GLX_DIRECT_RENDERING    
     if (gc->driContext) {
         CALL_GetColorTableParameterfv(GET_DISPATCH(),
                                       (target, pname, params));
     } else {
-#else 
-    {
-#endif
         __GLXcontext *const gc = __glXGetCurrentContext();
         Display *const dpy = gc->currentDpy;
         const GLuint cmdlen = 8;
@@ -5804,14 +5784,10 @@ glGetColorTableParameterivEXT(GLenum target, GLenum pname, GLint * params)
 {
     __GLXcontext *const gc = __glXGetCurrentContext();
 
-#ifdef GLX_DIRECT_RENDERING    
     if (gc->driContext) {
         CALL_GetColorTableParameteriv(GET_DISPATCH(),
                                       (target, pname, params));
     } else {
-#else 
-    {
-#endif
         __GLXcontext *const gc = __glXGetCurrentContext();
         Display *const dpy = gc->currentDpy;
         const GLuint cmdlen = 8;
@@ -6131,14 +6107,10 @@ gl_dispatch_stub_356(GLenum target, GLenum format, GLenum type,
 {
     __GLXcontext *const gc = __glXGetCurrentContext();
 
-#ifdef GLX_DIRECT_RENDERING    
     if (gc->driContext) {
         CALL_GetConvolutionFilter(GET_DISPATCH(),
                                   (target, format, type, image));
     } else {
-#else 
-    {
-#endif
         __GLXcontext *const gc = __glXGetCurrentContext();
         const __GLXattribute *const state = gc->client_state_private;
         Display *const dpy = gc->currentDpy;
@@ -6210,14 +6182,10 @@ gl_dispatch_stub_357(GLenum target, GLenum pname, GLfloat * params)
 {
     __GLXcontext *const gc = __glXGetCurrentContext();
 
-#ifdef GLX_DIRECT_RENDERING    
     if (gc->driContext) {
         CALL_GetConvolutionParameterfv(GET_DISPATCH(),
                                        (target, pname, params));
     } else {
-#else 
-    {
-#endif
         __GLXcontext *const gc = __glXGetCurrentContext();
         Display *const dpy = gc->currentDpy;
         const GLuint cmdlen = 8;
@@ -6284,14 +6252,10 @@ gl_dispatch_stub_358(GLenum target, GLenum pname, GLint * params)
 {
     __GLXcontext *const gc = __glXGetCurrentContext();
 
-#ifdef GLX_DIRECT_RENDERING    
     if (gc->driContext) {
         CALL_GetConvolutionParameteriv(GET_DISPATCH(),
                                        (target, pname, params));
     } else {
-#else 
-    {
-#endif
         __GLXcontext *const gc = __glXGetCurrentContext();
         Display *const dpy = gc->currentDpy;
         const GLuint cmdlen = 8;
@@ -6365,14 +6329,10 @@ gl_dispatch_stub_361(GLenum target, GLboolean reset, GLenum format,
 {
     __GLXcontext *const gc = __glXGetCurrentContext();
 
-#ifdef GLX_DIRECT_RENDERING    
     if (gc->driContext) {
         CALL_GetHistogram(GET_DISPATCH(),
                           (target, reset, format, type, values));
     } else {
-#else 
-    {
-#endif
         __GLXcontext *const gc = __glXGetCurrentContext();
         const __GLXattribute *const state = gc->client_state_private;
         Display *const dpy = gc->currentDpy;
@@ -6443,13 +6403,9 @@ gl_dispatch_stub_362(GLenum target, GLenum pname, GLfloat * params)
 {
     __GLXcontext *const gc = __glXGetCurrentContext();
 
-#ifdef GLX_DIRECT_RENDERING    
     if (gc->driContext) {
         CALL_GetHistogramParameterfv(GET_DISPATCH(), (target, pname, params));
     } else {
-#else 
-    {
-#endif
         __GLXcontext *const gc = __glXGetCurrentContext();
         Display *const dpy = gc->currentDpy;
         const GLuint cmdlen = 8;
@@ -6515,13 +6471,9 @@ gl_dispatch_stub_363(GLenum target, GLenum pname, GLint * params)
 {
     __GLXcontext *const gc = __glXGetCurrentContext();
 
-#ifdef GLX_DIRECT_RENDERING    
     if (gc->driContext) {
         CALL_GetHistogramParameteriv(GET_DISPATCH(), (target, pname, params));
     } else {
-#else 
-    {
-#endif
         __GLXcontext *const gc = __glXGetCurrentContext();
         Display *const dpy = gc->currentDpy;
         const GLuint cmdlen = 8;
@@ -6591,13 +6543,9 @@ gl_dispatch_stub_364(GLenum target, GLboolean reset, GLenum format,
 {
     __GLXcontext *const gc = __glXGetCurrentContext();
 
-#ifdef GLX_DIRECT_RENDERING    
     if (gc->driContext) {
         CALL_GetMinmax(GET_DISPATCH(), (target, reset, format, type, values));
     } else {
-#else 
-    {
-#endif
         __GLXcontext *const gc = __glXGetCurrentContext();
         const __GLXattribute *const state = gc->client_state_private;
         Display *const dpy = gc->currentDpy;
@@ -6666,13 +6614,9 @@ gl_dispatch_stub_365(GLenum target, GLenum pname, GLfloat * params)
 {
     __GLXcontext *const gc = __glXGetCurrentContext();
 
-#ifdef GLX_DIRECT_RENDERING    
     if (gc->driContext) {
         CALL_GetMinmaxParameterfv(GET_DISPATCH(), (target, pname, params));
     } else {
-#else 
-    {
-#endif
         __GLXcontext *const gc = __glXGetCurrentContext();
         Display *const dpy = gc->currentDpy;
         const GLuint cmdlen = 8;
@@ -6735,13 +6679,9 @@ gl_dispatch_stub_366(GLenum target, GLenum pname, GLint * params)
 {
     __GLXcontext *const gc = __glXGetCurrentContext();
 
-#ifdef GLX_DIRECT_RENDERING    
     if (gc->driContext) {
         CALL_GetMinmaxParameteriv(GET_DISPATCH(), (target, pname, params));
     } else {
-#else 
-    {
-#endif
         __GLXcontext *const gc = __glXGetCurrentContext();
         Display *const dpy = gc->currentDpy;
         const GLuint cmdlen = 8;
diff --git a/src/mesa/drivers/dri/common/extension_helper.h b/src/mesa/drivers/dri/common/extension_helper.h
index 8dcaaee307..f5e35e4161 100644
--- a/src/mesa/drivers/dri/common/extension_helper.h
+++ b/src/mesa/drivers/dri/common/extension_helper.h
@@ -1763,6 +1763,13 @@ static const char DeleteFencesNV_names[] =
     "";
 #endif
 
+#if defined(need_GL_SGIX_polynomial_ffd)
+static const char DeformationMap3dSGIX_names[] = 
+    "iddiiddiiddiip\0" /* Parameter signature */
+    "glDeformationMap3dSGIX\0"
+    "";
+#endif
+
 #if defined(need_GL_VERSION_2_0)
 static const char IsShader_names[] = 
     "i\0" /* Parameter signature */
@@ -4396,6 +4403,13 @@ static const char WindowPos3ivMESA_names[] =
     "";
 #endif
 
+#if defined(need_GL_ARB_copy_buffer)
+static const char CopyBufferSubData_names[] = 
+    "iiiii\0" /* Parameter signature */
+    "glCopyBufferSubData\0"
+    "";
+#endif
+
 #if defined(need_GL_VERSION_1_5) || defined(need_GL_ARB_vertex_buffer_object)
 static const char IsBufferARB_names[] = 
     "i\0" /* Parameter signature */
@@ -4560,13 +4574,6 @@ static const char Minmax_names[] =
     "";
 #endif
 
-#if defined(need_GL_SGIX_polynomial_ffd)
-static const char DeformationMap3dSGIX_names[] = 
-    "iddiiddiiddiip\0" /* Parameter signature */
-    "glDeformationMap3dSGIX\0"
-    "";
-#endif
-
 #if defined(need_GL_VERSION_1_4) || defined(need_GL_EXT_fog_coord)
 static const char FogCoorddvEXT_names[] = 
     "p\0" /* Parameter signature */
@@ -4939,6 +4946,13 @@ static const struct dri_extension_function GL_APPLE_vertex_array_object_function
 };
 #endif
 
+#if defined(need_GL_ARB_copy_buffer)
+static const struct dri_extension_function GL_ARB_copy_buffer_functions[] = {
+    { CopyBufferSubData_names, CopyBufferSubData_remap_index, -1 },
+    { NULL, 0, 0 }
+};
+#endif
+
 #if defined(need_GL_ARB_draw_buffers)
 static const struct dri_extension_function GL_ARB_draw_buffers_functions[] = {
     { DrawBuffersARB_names, DrawBuffersARB_remap_index, -1 },
@@ -6055,9 +6069,9 @@ static const struct dri_extension_function GL_SGIX_pixel_texture_functions[] = {
 #if defined(need_GL_SGIX_polynomial_ffd)
 static const struct dri_extension_function GL_SGIX_polynomial_ffd_functions[] = {
     { LoadIdentityDeformationMapSGIX_names, LoadIdentityDeformationMapSGIX_remap_index, -1 },
+    { DeformationMap3dSGIX_names, DeformationMap3dSGIX_remap_index, -1 },
     { DeformSGIX_names, DeformSGIX_remap_index, -1 },
     { DeformationMap3fSGIX_names, DeformationMap3fSGIX_remap_index, -1 },
-    { DeformationMap3dSGIX_names, DeformationMap3dSGIX_remap_index, -1 },
     { NULL, 0, 0 }
 };
 #endif
diff --git a/src/mesa/glapi/dispatch.h b/src/mesa/glapi/dispatch.h
index 45b2fa077a..39ccf62f23 100644
--- a/src/mesa/glapi/dispatch.h
+++ b/src/mesa/glapi/dispatch.h
@@ -1746,6 +1746,9 @@
 #define CALL_RenderbufferStorageMultisample(disp, parameters) (*((disp)->RenderbufferStorageMultisample)) parameters
 #define GET_RenderbufferStorageMultisample(disp) ((disp)->RenderbufferStorageMultisample)
 #define SET_RenderbufferStorageMultisample(disp, fn) ((disp)->RenderbufferStorageMultisample = fn)
+#define CALL_CopyBufferSubData(disp, parameters) (*((disp)->CopyBufferSubData)) parameters
+#define GET_CopyBufferSubData(disp) ((disp)->CopyBufferSubData)
+#define SET_CopyBufferSubData(disp, fn) ((disp)->CopyBufferSubData = fn)
 #define CALL_PolygonOffsetEXT(disp, parameters) (*((disp)->PolygonOffsetEXT)) parameters
 #define GET_PolygonOffsetEXT(disp) ((disp)->PolygonOffsetEXT)
 #define SET_PolygonOffsetEXT(disp, fn) ((disp)->PolygonOffsetEXT = fn)
@@ -2388,7 +2391,7 @@
 
 #else
 
-#define driDispatchRemapTable_size 367
+#define driDispatchRemapTable_size 368
 extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 
 #define AttachShader_remap_index 0
@@ -2545,219 +2548,220 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define GetAttribLocationARB_remap_index 151
 #define DrawBuffersARB_remap_index 152
 #define RenderbufferStorageMultisample_remap_index 153
-#define PolygonOffsetEXT_remap_index 154
-#define GetPixelTexGenParameterfvSGIS_remap_index 155
-#define GetPixelTexGenParameterivSGIS_remap_index 156
-#define PixelTexGenParameterfSGIS_remap_index 157
-#define PixelTexGenParameterfvSGIS_remap_index 158
-#define PixelTexGenParameteriSGIS_remap_index 159
-#define PixelTexGenParameterivSGIS_remap_index 160
-#define SampleMaskSGIS_remap_index 161
-#define SamplePatternSGIS_remap_index 162
-#define ColorPointerEXT_remap_index 163
-#define EdgeFlagPointerEXT_remap_index 164
-#define IndexPointerEXT_remap_index 165
-#define NormalPointerEXT_remap_index 166
-#define TexCoordPointerEXT_remap_index 167
-#define VertexPointerEXT_remap_index 168
-#define PointParameterfEXT_remap_index 169
-#define PointParameterfvEXT_remap_index 170
-#define LockArraysEXT_remap_index 171
-#define UnlockArraysEXT_remap_index 172
-#define CullParameterdvEXT_remap_index 173
-#define CullParameterfvEXT_remap_index 174
-#define SecondaryColor3bEXT_remap_index 175
-#define SecondaryColor3bvEXT_remap_index 176
-#define SecondaryColor3dEXT_remap_index 177
-#define SecondaryColor3dvEXT_remap_index 178
-#define SecondaryColor3fEXT_remap_index 179
-#define SecondaryColor3fvEXT_remap_index 180
-#define SecondaryColor3iEXT_remap_index 181
-#define SecondaryColor3ivEXT_remap_index 182
-#define SecondaryColor3sEXT_remap_index 183
-#define SecondaryColor3svEXT_remap_index 184
-#define SecondaryColor3ubEXT_remap_index 185
-#define SecondaryColor3ubvEXT_remap_index 186
-#define SecondaryColor3uiEXT_remap_index 187
-#define SecondaryColor3uivEXT_remap_index 188
-#define SecondaryColor3usEXT_remap_index 189
-#define SecondaryColor3usvEXT_remap_index 190
-#define SecondaryColorPointerEXT_remap_index 191
-#define MultiDrawArraysEXT_remap_index 192
-#define MultiDrawElementsEXT_remap_index 193
-#define FogCoordPointerEXT_remap_index 194
-#define FogCoorddEXT_remap_index 195
-#define FogCoorddvEXT_remap_index 196
-#define FogCoordfEXT_remap_index 197
-#define FogCoordfvEXT_remap_index 198
-#define PixelTexGenSGIX_remap_index 199
-#define BlendFuncSeparateEXT_remap_index 200
-#define FlushVertexArrayRangeNV_remap_index 201
-#define VertexArrayRangeNV_remap_index 202
-#define CombinerInputNV_remap_index 203
-#define CombinerOutputNV_remap_index 204
-#define CombinerParameterfNV_remap_index 205
-#define CombinerParameterfvNV_remap_index 206
-#define CombinerParameteriNV_remap_index 207
-#define CombinerParameterivNV_remap_index 208
-#define FinalCombinerInputNV_remap_index 209
-#define GetCombinerInputParameterfvNV_remap_index 210
-#define GetCombinerInputParameterivNV_remap_index 211
-#define GetCombinerOutputParameterfvNV_remap_index 212
-#define GetCombinerOutputParameterivNV_remap_index 213
-#define GetFinalCombinerInputParameterfvNV_remap_index 214
-#define GetFinalCombinerInputParameterivNV_remap_index 215
-#define ResizeBuffersMESA_remap_index 216
-#define WindowPos2dMESA_remap_index 217
-#define WindowPos2dvMESA_remap_index 218
-#define WindowPos2fMESA_remap_index 219
-#define WindowPos2fvMESA_remap_index 220
-#define WindowPos2iMESA_remap_index 221
-#define WindowPos2ivMESA_remap_index 222
-#define WindowPos2sMESA_remap_index 223
-#define WindowPos2svMESA_remap_index 224
-#define WindowPos3dMESA_remap_index 225
-#define WindowPos3dvMESA_remap_index 226
-#define WindowPos3fMESA_remap_index 227
-#define WindowPos3fvMESA_remap_index 228
-#define WindowPos3iMESA_remap_index 229
-#define WindowPos3ivMESA_remap_index 230
-#define WindowPos3sMESA_remap_index 231
-#define WindowPos3svMESA_remap_index 232
-#define WindowPos4dMESA_remap_index 233
-#define WindowPos4dvMESA_remap_index 234
-#define WindowPos4fMESA_remap_index 235
-#define WindowPos4fvMESA_remap_index 236
-#define WindowPos4iMESA_remap_index 237
-#define WindowPos4ivMESA_remap_index 238
-#define WindowPos4sMESA_remap_index 239
-#define WindowPos4svMESA_remap_index 240
-#define MultiModeDrawArraysIBM_remap_index 241
-#define MultiModeDrawElementsIBM_remap_index 242
-#define DeleteFencesNV_remap_index 243
-#define FinishFenceNV_remap_index 244
-#define GenFencesNV_remap_index 245
-#define GetFenceivNV_remap_index 246
-#define IsFenceNV_remap_index 247
-#define SetFenceNV_remap_index 248
-#define TestFenceNV_remap_index 249
-#define AreProgramsResidentNV_remap_index 250
-#define BindProgramNV_remap_index 251
-#define DeleteProgramsNV_remap_index 252
-#define ExecuteProgramNV_remap_index 253
-#define GenProgramsNV_remap_index 254
-#define GetProgramParameterdvNV_remap_index 255
-#define GetProgramParameterfvNV_remap_index 256
-#define GetProgramStringNV_remap_index 257
-#define GetProgramivNV_remap_index 258
-#define GetTrackMatrixivNV_remap_index 259
-#define GetVertexAttribPointervNV_remap_index 260
-#define GetVertexAttribdvNV_remap_index 261
-#define GetVertexAttribfvNV_remap_index 262
-#define GetVertexAttribivNV_remap_index 263
-#define IsProgramNV_remap_index 264
-#define LoadProgramNV_remap_index 265
-#define ProgramParameters4dvNV_remap_index 266
-#define ProgramParameters4fvNV_remap_index 267
-#define RequestResidentProgramsNV_remap_index 268
-#define TrackMatrixNV_remap_index 269
-#define VertexAttrib1dNV_remap_index 270
-#define VertexAttrib1dvNV_remap_index 271
-#define VertexAttrib1fNV_remap_index 272
-#define VertexAttrib1fvNV_remap_index 273
-#define VertexAttrib1sNV_remap_index 274
-#define VertexAttrib1svNV_remap_index 275
-#define VertexAttrib2dNV_remap_index 276
-#define VertexAttrib2dvNV_remap_index 277
-#define VertexAttrib2fNV_remap_index 278
-#define VertexAttrib2fvNV_remap_index 279
-#define VertexAttrib2sNV_remap_index 280
-#define VertexAttrib2svNV_remap_index 281
-#define VertexAttrib3dNV_remap_index 282
-#define VertexAttrib3dvNV_remap_index 283
-#define VertexAttrib3fNV_remap_index 284
-#define VertexAttrib3fvNV_remap_index 285
-#define VertexAttrib3sNV_remap_index 286
-#define VertexAttrib3svNV_remap_index 287
-#define VertexAttrib4dNV_remap_index 288
-#define VertexAttrib4dvNV_remap_index 289
-#define VertexAttrib4fNV_remap_index 290
-#define VertexAttrib4fvNV_remap_index 291
-#define VertexAttrib4sNV_remap_index 292
-#define VertexAttrib4svNV_remap_index 293
-#define VertexAttrib4ubNV_remap_index 294
-#define VertexAttrib4ubvNV_remap_index 295
-#define VertexAttribPointerNV_remap_index 296
-#define VertexAttribs1dvNV_remap_index 297
-#define VertexAttribs1fvNV_remap_index 298
-#define VertexAttribs1svNV_remap_index 299
-#define VertexAttribs2dvNV_remap_index 300
-#define VertexAttribs2fvNV_remap_index 301
-#define VertexAttribs2svNV_remap_index 302
-#define VertexAttribs3dvNV_remap_index 303
-#define VertexAttribs3fvNV_remap_index 304
-#define VertexAttribs3svNV_remap_index 305
-#define VertexAttribs4dvNV_remap_index 306
-#define VertexAttribs4fvNV_remap_index 307
-#define VertexAttribs4svNV_remap_index 308
-#define VertexAttribs4ubvNV_remap_index 309
-#define GetTexBumpParameterfvATI_remap_index 310
-#define GetTexBumpParameterivATI_remap_index 311
-#define TexBumpParameterfvATI_remap_index 312
-#define TexBumpParameterivATI_remap_index 313
-#define AlphaFragmentOp1ATI_remap_index 314
-#define AlphaFragmentOp2ATI_remap_index 315
-#define AlphaFragmentOp3ATI_remap_index 316
-#define BeginFragmentShaderATI_remap_index 317
-#define BindFragmentShaderATI_remap_index 318
-#define ColorFragmentOp1ATI_remap_index 319
-#define ColorFragmentOp2ATI_remap_index 320
-#define ColorFragmentOp3ATI_remap_index 321
-#define DeleteFragmentShaderATI_remap_index 322
-#define EndFragmentShaderATI_remap_index 323
-#define GenFragmentShadersATI_remap_index 324
-#define PassTexCoordATI_remap_index 325
-#define SampleMapATI_remap_index 326
-#define SetFragmentShaderConstantATI_remap_index 327
-#define PointParameteriNV_remap_index 328
-#define PointParameterivNV_remap_index 329
-#define ActiveStencilFaceEXT_remap_index 330
-#define BindVertexArrayAPPLE_remap_index 331
-#define DeleteVertexArraysAPPLE_remap_index 332
-#define GenVertexArraysAPPLE_remap_index 333
-#define IsVertexArrayAPPLE_remap_index 334
-#define GetProgramNamedParameterdvNV_remap_index 335
-#define GetProgramNamedParameterfvNV_remap_index 336
-#define ProgramNamedParameter4dNV_remap_index 337
-#define ProgramNamedParameter4dvNV_remap_index 338
-#define ProgramNamedParameter4fNV_remap_index 339
-#define ProgramNamedParameter4fvNV_remap_index 340
-#define DepthBoundsEXT_remap_index 341
-#define BlendEquationSeparateEXT_remap_index 342
-#define BindFramebufferEXT_remap_index 343
-#define BindRenderbufferEXT_remap_index 344
-#define CheckFramebufferStatusEXT_remap_index 345
-#define DeleteFramebuffersEXT_remap_index 346
-#define DeleteRenderbuffersEXT_remap_index 347
-#define FramebufferRenderbufferEXT_remap_index 348
-#define FramebufferTexture1DEXT_remap_index 349
-#define FramebufferTexture2DEXT_remap_index 350
-#define FramebufferTexture3DEXT_remap_index 351
-#define GenFramebuffersEXT_remap_index 352
-#define GenRenderbuffersEXT_remap_index 353
-#define GenerateMipmapEXT_remap_index 354
-#define GetFramebufferAttachmentParameterivEXT_remap_index 355
-#define GetRenderbufferParameterivEXT_remap_index 356
-#define IsFramebufferEXT_remap_index 357
-#define IsRenderbufferEXT_remap_index 358
-#define RenderbufferStorageEXT_remap_index 359
-#define BlitFramebufferEXT_remap_index 360
-#define FramebufferTextureLayerEXT_remap_index 361
-#define StencilFuncSeparateATI_remap_index 362
-#define ProgramEnvParameters4fvEXT_remap_index 363
-#define ProgramLocalParameters4fvEXT_remap_index 364
-#define GetQueryObjecti64vEXT_remap_index 365
-#define GetQueryObjectui64vEXT_remap_index 366
+#define CopyBufferSubData_remap_index 154
+#define PolygonOffsetEXT_remap_index 155
+#define GetPixelTexGenParameterfvSGIS_remap_index 156
+#define GetPixelTexGenParameterivSGIS_remap_index 157
+#define PixelTexGenParameterfSGIS_remap_index 158
+#define PixelTexGenParameterfvSGIS_remap_index 159
+#define PixelTexGenParameteriSGIS_remap_index 160
+#define PixelTexGenParameterivSGIS_remap_index 161
+#define SampleMaskSGIS_remap_index 162
+#define SamplePatternSGIS_remap_index 163
+#define ColorPointerEXT_remap_index 164
+#define EdgeFlagPointerEXT_remap_index 165
+#define IndexPointerEXT_remap_index 166
+#define NormalPointerEXT_remap_index 167
+#define TexCoordPointerEXT_remap_index 168
+#define VertexPointerEXT_remap_index 169
+#define PointParameterfEXT_remap_index 170
+#define PointParameterfvEXT_remap_index 171
+#define LockArraysEXT_remap_index 172
+#define UnlockArraysEXT_remap_index 173
+#define CullParameterdvEXT_remap_index 174
+#define CullParameterfvEXT_remap_index 175
+#define SecondaryColor3bEXT_remap_index 176
+#define SecondaryColor3bvEXT_remap_index 177
+#define SecondaryColor3dEXT_remap_index 178
+#define SecondaryColor3dvEXT_remap_index 179
+#define SecondaryColor3fEXT_remap_index 180
+#define SecondaryColor3fvEXT_remap_index 181
+#define SecondaryColor3iEXT_remap_index 182
+#define SecondaryColor3ivEXT_remap_index 183
+#define SecondaryColor3sEXT_remap_index 184
+#define SecondaryColor3svEXT_remap_index 185
+#define SecondaryColor3ubEXT_remap_index 186
+#define SecondaryColor3ubvEXT_remap_index 187
+#define SecondaryColor3uiEXT_remap_index 188
+#define SecondaryColor3uivEXT_remap_index 189
+#define SecondaryColor3usEXT_remap_index 190
+#define SecondaryColor3usvEXT_remap_index 191
+#define SecondaryColorPointerEXT_remap_index 192
+#define MultiDrawArraysEXT_remap_index 193
+#define MultiDrawElementsEXT_remap_index 194
+#define FogCoordPointerEXT_remap_index 195
+#define FogCoorddEXT_remap_index 196
+#define FogCoorddvEXT_remap_index 197
+#define FogCoordfEXT_remap_index 198
+#define FogCoordfvEXT_remap_index 199
+#define PixelTexGenSGIX_remap_index 200
+#define BlendFuncSeparateEXT_remap_index 201
+#define FlushVertexArrayRangeNV_remap_index 202
+#define VertexArrayRangeNV_remap_index 203
+#define CombinerInputNV_remap_index 204
+#define CombinerOutputNV_remap_index 205
+#define CombinerParameterfNV_remap_index 206
+#define CombinerParameterfvNV_remap_index 207
+#define CombinerParameteriNV_remap_index 208
+#define CombinerParameterivNV_remap_index 209
+#define FinalCombinerInputNV_remap_index 210
+#define GetCombinerInputParameterfvNV_remap_index 211
+#define GetCombinerInputParameterivNV_remap_index 212
+#define GetCombinerOutputParameterfvNV_remap_index 213
+#define GetCombinerOutputParameterivNV_remap_index 214
+#define GetFinalCombinerInputParameterfvNV_remap_index 215
+#define GetFinalCombinerInputParameterivNV_remap_index 216
+#define ResizeBuffersMESA_remap_index 217
+#define WindowPos2dMESA_remap_index 218
+#define WindowPos2dvMESA_remap_index 219
+#define WindowPos2fMESA_remap_index 220
+#define WindowPos2fvMESA_remap_index 221
+#define WindowPos2iMESA_remap_index 222
+#define WindowPos2ivMESA_remap_index 223
+#define WindowPos2sMESA_remap_index 224
+#define WindowPos2svMESA_remap_index 225
+#define WindowPos3dMESA_remap_index 226
+#define WindowPos3dvMESA_remap_index 227
+#define WindowPos3fMESA_remap_index 228
+#define WindowPos3fvMESA_remap_index 229
+#define WindowPos3iMESA_remap_index 230
+#define WindowPos3ivMESA_remap_index 231
+#define WindowPos3sMESA_remap_index 232
+#define WindowPos3svMESA_remap_index 233
+#define WindowPos4dMESA_remap_index 234
+#define WindowPos4dvMESA_remap_index 235
+#define WindowPos4fMESA_remap_index 236
+#define WindowPos4fvMESA_remap_index 237
+#define WindowPos4iMESA_remap_index 238
+#define WindowPos4ivMESA_remap_index 239
+#define WindowPos4sMESA_remap_index 240
+#define WindowPos4svMESA_remap_index 241
+#define MultiModeDrawArraysIBM_remap_index 242
+#define MultiModeDrawElementsIBM_remap_index 243
+#define DeleteFencesNV_remap_index 244
+#define FinishFenceNV_remap_index 245
+#define GenFencesNV_remap_index 246
+#define GetFenceivNV_remap_index 247
+#define IsFenceNV_remap_index 248
+#define SetFenceNV_remap_index 249
+#define TestFenceNV_remap_index 250
+#define AreProgramsResidentNV_remap_index 251
+#define BindProgramNV_remap_index 252
+#define DeleteProgramsNV_remap_index 253
+#define ExecuteProgramNV_remap_index 254
+#define GenProgramsNV_remap_index 255
+#define GetProgramParameterdvNV_remap_index 256
+#define GetProgramParameterfvNV_remap_index 257
+#define GetProgramStringNV_remap_index 258
+#define GetProgramivNV_remap_index 259
+#define GetTrackMatrixivNV_remap_index 260
+#define GetVertexAttribPointervNV_remap_index 261
+#define GetVertexAttribdvNV_remap_index 262
+#define GetVertexAttribfvNV_remap_index 263
+#define GetVertexAttribivNV_remap_index 264
+#define IsProgramNV_remap_index 265
+#define LoadProgramNV_remap_index 266
+#define ProgramParameters4dvNV_remap_index 267
+#define ProgramParameters4fvNV_remap_index 268
+#define RequestResidentProgramsNV_remap_index 269
+#define TrackMatrixNV_remap_index 270
+#define VertexAttrib1dNV_remap_index 271
+#define VertexAttrib1dvNV_remap_index 272
+#define VertexAttrib1fNV_remap_index 273
+#define VertexAttrib1fvNV_remap_index 274
+#define VertexAttrib1sNV_remap_index 275
+#define VertexAttrib1svNV_remap_index 276
+#define VertexAttrib2dNV_remap_index 277
+#define VertexAttrib2dvNV_remap_index 278
+#define VertexAttrib2fNV_remap_index 279
+#define VertexAttrib2fvNV_remap_index 280
+#define VertexAttrib2sNV_remap_index 281
+#define VertexAttrib2svNV_remap_index 282
+#define VertexAttrib3dNV_remap_index 283
+#define VertexAttrib3dvNV_remap_index 284
+#define VertexAttrib3fNV_remap_index 285
+#define VertexAttrib3fvNV_remap_index 286
+#define VertexAttrib3sNV_remap_index 287
+#define VertexAttrib3svNV_remap_index 288
+#define VertexAttrib4dNV_remap_index 289
+#define VertexAttrib4dvNV_remap_index 290
+#define VertexAttrib4fNV_remap_index 291
+#define VertexAttrib4fvNV_remap_index 292
+#define VertexAttrib4sNV_remap_index 293
+#define VertexAttrib4svNV_remap_index 294
+#define VertexAttrib4ubNV_remap_index 295
+#define VertexAttrib4ubvNV_remap_index 296
+#define VertexAttribPointerNV_remap_index 297
+#define VertexAttribs1dvNV_remap_index 298
+#define VertexAttribs1fvNV_remap_index 299
+#define VertexAttribs1svNV_remap_index 300
+#define VertexAttribs2dvNV_remap_index 301
+#define VertexAttribs2fvNV_remap_index 302
+#define VertexAttribs2svNV_remap_index 303
+#define VertexAttribs3dvNV_remap_index 304
+#define VertexAttribs3fvNV_remap_index 305
+#define VertexAttribs3svNV_remap_index 306
+#define VertexAttribs4dvNV_remap_index 307
+#define VertexAttribs4fvNV_remap_index 308
+#define VertexAttribs4svNV_remap_index 309
+#define VertexAttribs4ubvNV_remap_index 310
+#define GetTexBumpParameterfvATI_remap_index 311
+#define GetTexBumpParameterivATI_remap_index 312
+#define TexBumpParameterfvATI_remap_index 313
+#define TexBumpParameterivATI_remap_index 314
+#define AlphaFragmentOp1ATI_remap_index 315
+#define AlphaFragmentOp2ATI_remap_index 316
+#define AlphaFragmentOp3ATI_remap_index 317
+#define BeginFragmentShaderATI_remap_index 318
+#define BindFragmentShaderATI_remap_index 319
+#define ColorFragmentOp1ATI_remap_index 320
+#define ColorFragmentOp2ATI_remap_index 321
+#define ColorFragmentOp3ATI_remap_index 322
+#define DeleteFragmentShaderATI_remap_index 323
+#define EndFragmentShaderATI_remap_index 324
+#define GenFragmentShadersATI_remap_index 325
+#define PassTexCoordATI_remap_index 326
+#define SampleMapATI_remap_index 327
+#define SetFragmentShaderConstantATI_remap_index 328
+#define PointParameteriNV_remap_index 329
+#define PointParameterivNV_remap_index 330
+#define ActiveStencilFaceEXT_remap_index 331
+#define BindVertexArrayAPPLE_remap_index 332
+#define DeleteVertexArraysAPPLE_remap_index 333
+#define GenVertexArraysAPPLE_remap_index 334
+#define IsVertexArrayAPPLE_remap_index 335
+#define GetProgramNamedParameterdvNV_remap_index 336
+#define GetProgramNamedParameterfvNV_remap_index 337
+#define ProgramNamedParameter4dNV_remap_index 338
+#define ProgramNamedParameter4dvNV_remap_index 339
+#define ProgramNamedParameter4fNV_remap_index 340
+#define ProgramNamedParameter4fvNV_remap_index 341
+#define DepthBoundsEXT_remap_index 342
+#define BlendEquationSeparateEXT_remap_index 343
+#define BindFramebufferEXT_remap_index 344
+#define BindRenderbufferEXT_remap_index 345
+#define CheckFramebufferStatusEXT_remap_index 346
+#define DeleteFramebuffersEXT_remap_index 347
+#define DeleteRenderbuffersEXT_remap_index 348
+#define FramebufferRenderbufferEXT_remap_index 349
+#define FramebufferTexture1DEXT_remap_index 350
+#define FramebufferTexture2DEXT_remap_index 351
+#define FramebufferTexture3DEXT_remap_index 352
+#define GenFramebuffersEXT_remap_index 353
+#define GenRenderbuffersEXT_remap_index 354
+#define GenerateMipmapEXT_remap_index 355
+#define GetFramebufferAttachmentParameterivEXT_remap_index 356
+#define GetRenderbufferParameterivEXT_remap_index 357
+#define IsFramebufferEXT_remap_index 358
+#define IsRenderbufferEXT_remap_index 359
+#define RenderbufferStorageEXT_remap_index 360
+#define BlitFramebufferEXT_remap_index 361
+#define FramebufferTextureLayerEXT_remap_index 362
+#define StencilFuncSeparateATI_remap_index 363
+#define ProgramEnvParameters4fvEXT_remap_index 364
+#define ProgramLocalParameters4fvEXT_remap_index 365
+#define GetQueryObjecti64vEXT_remap_index 366
+#define GetQueryObjectui64vEXT_remap_index 367
 
 #define CALL_AttachShader(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLuint)), driDispatchRemapTable[AttachShader_remap_index], parameters)
 #define GET_AttachShader(disp) GET_by_offset(disp, driDispatchRemapTable[AttachShader_remap_index])
@@ -3221,6 +3225,9 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define CALL_RenderbufferStorageMultisample(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLsizei, GLenum, GLsizei, GLsizei)), driDispatchRemapTable[RenderbufferStorageMultisample_remap_index], parameters)
 #define GET_RenderbufferStorageMultisample(disp) GET_by_offset(disp, driDispatchRemapTable[RenderbufferStorageMultisample_remap_index])
 #define SET_RenderbufferStorageMultisample(disp, fn) SET_by_offset(disp, driDispatchRemapTable[RenderbufferStorageMultisample_remap_index], fn)
+#define CALL_CopyBufferSubData(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLintptr, GLintptr, GLsizeiptr)), driDispatchRemapTable[CopyBufferSubData_remap_index], parameters)
+#define GET_CopyBufferSubData(disp) GET_by_offset(disp, driDispatchRemapTable[CopyBufferSubData_remap_index])
+#define SET_CopyBufferSubData(disp, fn) SET_by_offset(disp, driDispatchRemapTable[CopyBufferSubData_remap_index], fn)
 #define CALL_PolygonOffsetEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLfloat, GLfloat)), driDispatchRemapTable[PolygonOffsetEXT_remap_index], parameters)
 #define GET_PolygonOffsetEXT(disp) GET_by_offset(disp, driDispatchRemapTable[PolygonOffsetEXT_remap_index])
 #define SET_PolygonOffsetEXT(disp, fn) SET_by_offset(disp, driDispatchRemapTable[PolygonOffsetEXT_remap_index], fn)
diff --git a/src/mesa/glapi/glapioffsets.h b/src/mesa/glapi/glapioffsets.h
index 14f305f025..e29e2e3bfa 100644
--- a/src/mesa/glapi/glapioffsets.h
+++ b/src/mesa/glapi/glapioffsets.h
@@ -594,220 +594,221 @@
 #define _gloffset_GetAttribLocationARB 559
 #define _gloffset_DrawBuffersARB 560
 #define _gloffset_RenderbufferStorageMultisample 561
-#define _gloffset_PolygonOffsetEXT 562
-#define _gloffset_GetPixelTexGenParameterfvSGIS 563
-#define _gloffset_GetPixelTexGenParameterivSGIS 564
-#define _gloffset_PixelTexGenParameterfSGIS 565
-#define _gloffset_PixelTexGenParameterfvSGIS 566
-#define _gloffset_PixelTexGenParameteriSGIS 567
-#define _gloffset_PixelTexGenParameterivSGIS 568
-#define _gloffset_SampleMaskSGIS 569
-#define _gloffset_SamplePatternSGIS 570
-#define _gloffset_ColorPointerEXT 571
-#define _gloffset_EdgeFlagPointerEXT 572
-#define _gloffset_IndexPointerEXT 573
-#define _gloffset_NormalPointerEXT 574
-#define _gloffset_TexCoordPointerEXT 575
-#define _gloffset_VertexPointerEXT 576
-#define _gloffset_PointParameterfEXT 577
-#define _gloffset_PointParameterfvEXT 578
-#define _gloffset_LockArraysEXT 579
-#define _gloffset_UnlockArraysEXT 580
-#define _gloffset_CullParameterdvEXT 581
-#define _gloffset_CullParameterfvEXT 582
-#define _gloffset_SecondaryColor3bEXT 583
-#define _gloffset_SecondaryColor3bvEXT 584
-#define _gloffset_SecondaryColor3dEXT 585
-#define _gloffset_SecondaryColor3dvEXT 586
-#define _gloffset_SecondaryColor3fEXT 587
-#define _gloffset_SecondaryColor3fvEXT 588
-#define _gloffset_SecondaryColor3iEXT 589
-#define _gloffset_SecondaryColor3ivEXT 590
-#define _gloffset_SecondaryColor3sEXT 591
-#define _gloffset_SecondaryColor3svEXT 592
-#define _gloffset_SecondaryColor3ubEXT 593
-#define _gloffset_SecondaryColor3ubvEXT 594
-#define _gloffset_SecondaryColor3uiEXT 595
-#define _gloffset_SecondaryColor3uivEXT 596
-#define _gloffset_SecondaryColor3usEXT 597
-#define _gloffset_SecondaryColor3usvEXT 598
-#define _gloffset_SecondaryColorPointerEXT 599
-#define _gloffset_MultiDrawArraysEXT 600
-#define _gloffset_MultiDrawElementsEXT 601
-#define _gloffset_FogCoordPointerEXT 602
-#define _gloffset_FogCoorddEXT 603
-#define _gloffset_FogCoorddvEXT 604
-#define _gloffset_FogCoordfEXT 605
-#define _gloffset_FogCoordfvEXT 606
-#define _gloffset_PixelTexGenSGIX 607
-#define _gloffset_BlendFuncSeparateEXT 608
-#define _gloffset_FlushVertexArrayRangeNV 609
-#define _gloffset_VertexArrayRangeNV 610
-#define _gloffset_CombinerInputNV 611
-#define _gloffset_CombinerOutputNV 612
-#define _gloffset_CombinerParameterfNV 613
-#define _gloffset_CombinerParameterfvNV 614
-#define _gloffset_CombinerParameteriNV 615
-#define _gloffset_CombinerParameterivNV 616
-#define _gloffset_FinalCombinerInputNV 617
-#define _gloffset_GetCombinerInputParameterfvNV 618
-#define _gloffset_GetCombinerInputParameterivNV 619
-#define _gloffset_GetCombinerOutputParameterfvNV 620
-#define _gloffset_GetCombinerOutputParameterivNV 621
-#define _gloffset_GetFinalCombinerInputParameterfvNV 622
-#define _gloffset_GetFinalCombinerInputParameterivNV 623
-#define _gloffset_ResizeBuffersMESA 624
-#define _gloffset_WindowPos2dMESA 625
-#define _gloffset_WindowPos2dvMESA 626
-#define _gloffset_WindowPos2fMESA 627
-#define _gloffset_WindowPos2fvMESA 628
-#define _gloffset_WindowPos2iMESA 629
-#define _gloffset_WindowPos2ivMESA 630
-#define _gloffset_WindowPos2sMESA 631
-#define _gloffset_WindowPos2svMESA 632
-#define _gloffset_WindowPos3dMESA 633
-#define _gloffset_WindowPos3dvMESA 634
-#define _gloffset_WindowPos3fMESA 635
-#define _gloffset_WindowPos3fvMESA 636
-#define _gloffset_WindowPos3iMESA 637
-#define _gloffset_WindowPos3ivMESA 638
-#define _gloffset_WindowPos3sMESA 639
-#define _gloffset_WindowPos3svMESA 640
-#define _gloffset_WindowPos4dMESA 641
-#define _gloffset_WindowPos4dvMESA 642
-#define _gloffset_WindowPos4fMESA 643
-#define _gloffset_WindowPos4fvMESA 644
-#define _gloffset_WindowPos4iMESA 645
-#define _gloffset_WindowPos4ivMESA 646
-#define _gloffset_WindowPos4sMESA 647
-#define _gloffset_WindowPos4svMESA 648
-#define _gloffset_MultiModeDrawArraysIBM 649
-#define _gloffset_MultiModeDrawElementsIBM 650
-#define _gloffset_DeleteFencesNV 651
-#define _gloffset_FinishFenceNV 652
-#define _gloffset_GenFencesNV 653
-#define _gloffset_GetFenceivNV 654
-#define _gloffset_IsFenceNV 655
-#define _gloffset_SetFenceNV 656
-#define _gloffset_TestFenceNV 657
-#define _gloffset_AreProgramsResidentNV 658
-#define _gloffset_BindProgramNV 659
-#define _gloffset_DeleteProgramsNV 660
-#define _gloffset_ExecuteProgramNV 661
-#define _gloffset_GenProgramsNV 662
-#define _gloffset_GetProgramParameterdvNV 663
-#define _gloffset_GetProgramParameterfvNV 664
-#define _gloffset_GetProgramStringNV 665
-#define _gloffset_GetProgramivNV 666
-#define _gloffset_GetTrackMatrixivNV 667
-#define _gloffset_GetVertexAttribPointervNV 668
-#define _gloffset_GetVertexAttribdvNV 669
-#define _gloffset_GetVertexAttribfvNV 670
-#define _gloffset_GetVertexAttribivNV 671
-#define _gloffset_IsProgramNV 672
-#define _gloffset_LoadProgramNV 673
-#define _gloffset_ProgramParameters4dvNV 674
-#define _gloffset_ProgramParameters4fvNV 675
-#define _gloffset_RequestResidentProgramsNV 676
-#define _gloffset_TrackMatrixNV 677
-#define _gloffset_VertexAttrib1dNV 678
-#define _gloffset_VertexAttrib1dvNV 679
-#define _gloffset_VertexAttrib1fNV 680
-#define _gloffset_VertexAttrib1fvNV 681
-#define _gloffset_VertexAttrib1sNV 682
-#define _gloffset_VertexAttrib1svNV 683
-#define _gloffset_VertexAttrib2dNV 684
-#define _gloffset_VertexAttrib2dvNV 685
-#define _gloffset_VertexAttrib2fNV 686
-#define _gloffset_VertexAttrib2fvNV 687
-#define _gloffset_VertexAttrib2sNV 688
-#define _gloffset_VertexAttrib2svNV 689
-#define _gloffset_VertexAttrib3dNV 690
-#define _gloffset_VertexAttrib3dvNV 691
-#define _gloffset_VertexAttrib3fNV 692
-#define _gloffset_VertexAttrib3fvNV 693
-#define _gloffset_VertexAttrib3sNV 694
-#define _gloffset_VertexAttrib3svNV 695
-#define _gloffset_VertexAttrib4dNV 696
-#define _gloffset_VertexAttrib4dvNV 697
-#define _gloffset_VertexAttrib4fNV 698
-#define _gloffset_VertexAttrib4fvNV 699
-#define _gloffset_VertexAttrib4sNV 700
-#define _gloffset_VertexAttrib4svNV 701
-#define _gloffset_VertexAttrib4ubNV 702
-#define _gloffset_VertexAttrib4ubvNV 703
-#define _gloffset_VertexAttribPointerNV 704
-#define _gloffset_VertexAttribs1dvNV 705
-#define _gloffset_VertexAttribs1fvNV 706
-#define _gloffset_VertexAttribs1svNV 707
-#define _gloffset_VertexAttribs2dvNV 708
-#define _gloffset_VertexAttribs2fvNV 709
-#define _gloffset_VertexAttribs2svNV 710
-#define _gloffset_VertexAttribs3dvNV 711
-#define _gloffset_VertexAttribs3fvNV 712
-#define _gloffset_VertexAttribs3svNV 713
-#define _gloffset_VertexAttribs4dvNV 714
-#define _gloffset_VertexAttribs4fvNV 715
-#define _gloffset_VertexAttribs4svNV 716
-#define _gloffset_VertexAttribs4ubvNV 717
-#define _gloffset_GetTexBumpParameterfvATI 718
-#define _gloffset_GetTexBumpParameterivATI 719
-#define _gloffset_TexBumpParameterfvATI 720
-#define _gloffset_TexBumpParameterivATI 721
-#define _gloffset_AlphaFragmentOp1ATI 722
-#define _gloffset_AlphaFragmentOp2ATI 723
-#define _gloffset_AlphaFragmentOp3ATI 724
-#define _gloffset_BeginFragmentShaderATI 725
-#define _gloffset_BindFragmentShaderATI 726
-#define _gloffset_ColorFragmentOp1ATI 727
-#define _gloffset_ColorFragmentOp2ATI 728
-#define _gloffset_ColorFragmentOp3ATI 729
-#define _gloffset_DeleteFragmentShaderATI 730
-#define _gloffset_EndFragmentShaderATI 731
-#define _gloffset_GenFragmentShadersATI 732
-#define _gloffset_PassTexCoordATI 733
-#define _gloffset_SampleMapATI 734
-#define _gloffset_SetFragmentShaderConstantATI 735
-#define _gloffset_PointParameteriNV 736
-#define _gloffset_PointParameterivNV 737
-#define _gloffset_ActiveStencilFaceEXT 738
-#define _gloffset_BindVertexArrayAPPLE 739
-#define _gloffset_DeleteVertexArraysAPPLE 740
-#define _gloffset_GenVertexArraysAPPLE 741
-#define _gloffset_IsVertexArrayAPPLE 742
-#define _gloffset_GetProgramNamedParameterdvNV 743
-#define _gloffset_GetProgramNamedParameterfvNV 744
-#define _gloffset_ProgramNamedParameter4dNV 745
-#define _gloffset_ProgramNamedParameter4dvNV 746
-#define _gloffset_ProgramNamedParameter4fNV 747
-#define _gloffset_ProgramNamedParameter4fvNV 748
-#define _gloffset_DepthBoundsEXT 749
-#define _gloffset_BlendEquationSeparateEXT 750
-#define _gloffset_BindFramebufferEXT 751
-#define _gloffset_BindRenderbufferEXT 752
-#define _gloffset_CheckFramebufferStatusEXT 753
-#define _gloffset_DeleteFramebuffersEXT 754
-#define _gloffset_DeleteRenderbuffersEXT 755
-#define _gloffset_FramebufferRenderbufferEXT 756
-#define _gloffset_FramebufferTexture1DEXT 757
-#define _gloffset_FramebufferTexture2DEXT 758
-#define _gloffset_FramebufferTexture3DEXT 759
-#define _gloffset_GenFramebuffersEXT 760
-#define _gloffset_GenRenderbuffersEXT 761
-#define _gloffset_GenerateMipmapEXT 762
-#define _gloffset_GetFramebufferAttachmentParameterivEXT 763
-#define _gloffset_GetRenderbufferParameterivEXT 764
-#define _gloffset_IsFramebufferEXT 765
-#define _gloffset_IsRenderbufferEXT 766
-#define _gloffset_RenderbufferStorageEXT 767
-#define _gloffset_BlitFramebufferEXT 768
-#define _gloffset_FramebufferTextureLayerEXT 769
-#define _gloffset_StencilFuncSeparateATI 770
-#define _gloffset_ProgramEnvParameters4fvEXT 771
-#define _gloffset_ProgramLocalParameters4fvEXT 772
-#define _gloffset_GetQueryObjecti64vEXT 773
-#define _gloffset_GetQueryObjectui64vEXT 774
-#define _gloffset_FIRST_DYNAMIC 775
+#define _gloffset_CopyBufferSubData 562
+#define _gloffset_PolygonOffsetEXT 563
+#define _gloffset_GetPixelTexGenParameterfvSGIS 564
+#define _gloffset_GetPixelTexGenParameterivSGIS 565
+#define _gloffset_PixelTexGenParameterfSGIS 566
+#define _gloffset_PixelTexGenParameterfvSGIS 567
+#define _gloffset_PixelTexGenParameteriSGIS 568
+#define _gloffset_PixelTexGenParameterivSGIS 569
+#define _gloffset_SampleMaskSGIS 570
+#define _gloffset_SamplePatternSGIS 571
+#define _gloffset_ColorPointerEXT 572
+#define _gloffset_EdgeFlagPointerEXT 573
+#define _gloffset_IndexPointerEXT 574
+#define _gloffset_NormalPointerEXT 575
+#define _gloffset_TexCoordPointerEXT 576
+#define _gloffset_VertexPointerEXT 577
+#define _gloffset_PointParameterfEXT 578
+#define _gloffset_PointParameterfvEXT 579
+#define _gloffset_LockArraysEXT 580
+#define _gloffset_UnlockArraysEXT 581
+#define _gloffset_CullParameterdvEXT 582
+#define _gloffset_CullParameterfvEXT 583
+#define _gloffset_SecondaryColor3bEXT 584
+#define _gloffset_SecondaryColor3bvEXT 585
+#define _gloffset_SecondaryColor3dEXT 586
+#define _gloffset_SecondaryColor3dvEXT 587
+#define _gloffset_SecondaryColor3fEXT 588
+#define _gloffset_SecondaryColor3fvEXT 589
+#define _gloffset_SecondaryColor3iEXT 590
+#define _gloffset_SecondaryColor3ivEXT 591
+#define _gloffset_SecondaryColor3sEXT 592
+#define _gloffset_SecondaryColor3svEXT 593
+#define _gloffset_SecondaryColor3ubEXT 594
+#define _gloffset_SecondaryColor3ubvEXT 595
+#define _gloffset_SecondaryColor3uiEXT 596
+#define _gloffset_SecondaryColor3uivEXT 597
+#define _gloffset_SecondaryColor3usEXT 598
+#define _gloffset_SecondaryColor3usvEXT 599
+#define _gloffset_SecondaryColorPointerEXT 600
+#define _gloffset_MultiDrawArraysEXT 601
+#define _gloffset_MultiDrawElementsEXT 602
+#define _gloffset_FogCoordPointerEXT 603
+#define _gloffset_FogCoorddEXT 604
+#define _gloffset_FogCoorddvEXT 605
+#define _gloffset_FogCoordfEXT 606
+#define _gloffset_FogCoordfvEXT 607
+#define _gloffset_PixelTexGenSGIX 608
+#define _gloffset_BlendFuncSeparateEXT 609
+#define _gloffset_FlushVertexArrayRangeNV 610
+#define _gloffset_VertexArrayRangeNV 611
+#define _gloffset_CombinerInputNV 612
+#define _gloffset_CombinerOutputNV 613
+#define _gloffset_CombinerParameterfNV 614
+#define _gloffset_CombinerParameterfvNV 615
+#define _gloffset_CombinerParameteriNV 616
+#define _gloffset_CombinerParameterivNV 617
+#define _gloffset_FinalCombinerInputNV 618
+#define _gloffset_GetCombinerInputParameterfvNV 619
+#define _gloffset_GetCombinerInputParameterivNV 620
+#define _gloffset_GetCombinerOutputParameterfvNV 621
+#define _gloffset_GetCombinerOutputParameterivNV 622
+#define _gloffset_GetFinalCombinerInputParameterfvNV 623
+#define _gloffset_GetFinalCombinerInputParameterivNV 624
+#define _gloffset_ResizeBuffersMESA 625
+#define _gloffset_WindowPos2dMESA 626
+#define _gloffset_WindowPos2dvMESA 627
+#define _gloffset_WindowPos2fMESA 628
+#define _gloffset_WindowPos2fvMESA 629
+#define _gloffset_WindowPos2iMESA 630
+#define _gloffset_WindowPos2ivMESA 631
+#define _gloffset_WindowPos2sMESA 632
+#define _gloffset_WindowPos2svMESA 633
+#define _gloffset_WindowPos3dMESA 634
+#define _gloffset_WindowPos3dvMESA 635
+#define _gloffset_WindowPos3fMESA 636
+#define _gloffset_WindowPos3fvMESA 637
+#define _gloffset_WindowPos3iMESA 638
+#define _gloffset_WindowPos3ivMESA 639
+#define _gloffset_WindowPos3sMESA 640
+#define _gloffset_WindowPos3svMESA 641
+#define _gloffset_WindowPos4dMESA 642
+#define _gloffset_WindowPos4dvMESA 643
+#define _gloffset_WindowPos4fMESA 644
+#define _gloffset_WindowPos4fvMESA 645
+#define _gloffset_WindowPos4iMESA 646
+#define _gloffset_WindowPos4ivMESA 647
+#define _gloffset_WindowPos4sMESA 648
+#define _gloffset_WindowPos4svMESA 649
+#define _gloffset_MultiModeDrawArraysIBM 650
+#define _gloffset_MultiModeDrawElementsIBM 651
+#define _gloffset_DeleteFencesNV 652
+#define _gloffset_FinishFenceNV 653
+#define _gloffset_GenFencesNV 654
+#define _gloffset_GetFenceivNV 655
+#define _gloffset_IsFenceNV 656
+#define _gloffset_SetFenceNV 657
+#define _gloffset_TestFenceNV 658
+#define _gloffset_AreProgramsResidentNV 659
+#define _gloffset_BindProgramNV 660
+#define _gloffset_DeleteProgramsNV 661
+#define _gloffset_ExecuteProgramNV 662
+#define _gloffset_GenProgramsNV 663
+#define _gloffset_GetProgramParameterdvNV 664
+#define _gloffset_GetProgramParameterfvNV 665
+#define _gloffset_GetProgramStringNV 666
+#define _gloffset_GetProgramivNV 667
+#define _gloffset_GetTrackMatrixivNV 668
+#define _gloffset_GetVertexAttribPointervNV 669
+#define _gloffset_GetVertexAttribdvNV 670
+#define _gloffset_GetVertexAttribfvNV 671
+#define _gloffset_GetVertexAttribivNV 672
+#define _gloffset_IsProgramNV 673
+#define _gloffset_LoadProgramNV 674
+#define _gloffset_ProgramParameters4dvNV 675
+#define _gloffset_ProgramParameters4fvNV 676
+#define _gloffset_RequestResidentProgramsNV 677
+#define _gloffset_TrackMatrixNV 678
+#define _gloffset_VertexAttrib1dNV 679
+#define _gloffset_VertexAttrib1dvNV 680
+#define _gloffset_VertexAttrib1fNV 681
+#define _gloffset_VertexAttrib1fvNV 682
+#define _gloffset_VertexAttrib1sNV 683
+#define _gloffset_VertexAttrib1svNV 684
+#define _gloffset_VertexAttrib2dNV 685
+#define _gloffset_VertexAttrib2dvNV 686
+#define _gloffset_VertexAttrib2fNV 687
+#define _gloffset_VertexAttrib2fvNV 688
+#define _gloffset_VertexAttrib2sNV 689
+#define _gloffset_VertexAttrib2svNV 690
+#define _gloffset_VertexAttrib3dNV 691
+#define _gloffset_VertexAttrib3dvNV 692
+#define _gloffset_VertexAttrib3fNV 693
+#define _gloffset_VertexAttrib3fvNV 694
+#define _gloffset_VertexAttrib3sNV 695
+#define _gloffset_VertexAttrib3svNV 696
+#define _gloffset_VertexAttrib4dNV 697
+#define _gloffset_VertexAttrib4dvNV 698
+#define _gloffset_VertexAttrib4fNV 699
+#define _gloffset_VertexAttrib4fvNV 700
+#define _gloffset_VertexAttrib4sNV 701
+#define _gloffset_VertexAttrib4svNV 702
+#define _gloffset_VertexAttrib4ubNV 703
+#define _gloffset_VertexAttrib4ubvNV 704
+#define _gloffset_VertexAttribPointerNV 705
+#define _gloffset_VertexAttribs1dvNV 706
+#define _gloffset_VertexAttribs1fvNV 707
+#define _gloffset_VertexAttribs1svNV 708
+#define _gloffset_VertexAttribs2dvNV 709
+#define _gloffset_VertexAttribs2fvNV 710
+#define _gloffset_VertexAttribs2svNV 711
+#define _gloffset_VertexAttribs3dvNV 712
+#define _gloffset_VertexAttribs3fvNV 713
+#define _gloffset_VertexAttribs3svNV 714
+#define _gloffset_VertexAttribs4dvNV 715
+#define _gloffset_VertexAttribs4fvNV 716
+#define _gloffset_VertexAttribs4svNV 717
+#define _gloffset_VertexAttribs4ubvNV 718
+#define _gloffset_GetTexBumpParameterfvATI 719
+#define _gloffset_GetTexBumpParameterivATI 720
+#define _gloffset_TexBumpParameterfvATI 721
+#define _gloffset_TexBumpParameterivATI 722
+#define _gloffset_AlphaFragmentOp1ATI 723
+#define _gloffset_AlphaFragmentOp2ATI 724
+#define _gloffset_AlphaFragmentOp3ATI 725
+#define _gloffset_BeginFragmentShaderATI 726
+#define _gloffset_BindFragmentShaderATI 727
+#define _gloffset_ColorFragmentOp1ATI 728
+#define _gloffset_ColorFragmentOp2ATI 729
+#define _gloffset_ColorFragmentOp3ATI 730
+#define _gloffset_DeleteFragmentShaderATI 731
+#define _gloffset_EndFragmentShaderATI 732
+#define _gloffset_GenFragmentShadersATI 733
+#define _gloffset_PassTexCoordATI 734
+#define _gloffset_SampleMapATI 735
+#define _gloffset_SetFragmentShaderConstantATI 736
+#define _gloffset_PointParameteriNV 737
+#define _gloffset_PointParameterivNV 738
+#define _gloffset_ActiveStencilFaceEXT 739
+#define _gloffset_BindVertexArrayAPPLE 740
+#define _gloffset_DeleteVertexArraysAPPLE 741
+#define _gloffset_GenVertexArraysAPPLE 742
+#define _gloffset_IsVertexArrayAPPLE 743
+#define _gloffset_GetProgramNamedParameterdvNV 744
+#define _gloffset_GetProgramNamedParameterfvNV 745
+#define _gloffset_ProgramNamedParameter4dNV 746
+#define _gloffset_ProgramNamedParameter4dvNV 747
+#define _gloffset_ProgramNamedParameter4fNV 748
+#define _gloffset_ProgramNamedParameter4fvNV 749
+#define _gloffset_DepthBoundsEXT 750
+#define _gloffset_BlendEquationSeparateEXT 751
+#define _gloffset_BindFramebufferEXT 752
+#define _gloffset_BindRenderbufferEXT 753
+#define _gloffset_CheckFramebufferStatusEXT 754
+#define _gloffset_DeleteFramebuffersEXT 755
+#define _gloffset_DeleteRenderbuffersEXT 756
+#define _gloffset_FramebufferRenderbufferEXT 757
+#define _gloffset_FramebufferTexture1DEXT 758
+#define _gloffset_FramebufferTexture2DEXT 759
+#define _gloffset_FramebufferTexture3DEXT 760
+#define _gloffset_GenFramebuffersEXT 761
+#define _gloffset_GenRenderbuffersEXT 762
+#define _gloffset_GenerateMipmapEXT 763
+#define _gloffset_GetFramebufferAttachmentParameterivEXT 764
+#define _gloffset_GetRenderbufferParameterivEXT 765
+#define _gloffset_IsFramebufferEXT 766
+#define _gloffset_IsRenderbufferEXT 767
+#define _gloffset_RenderbufferStorageEXT 768
+#define _gloffset_BlitFramebufferEXT 769
+#define _gloffset_FramebufferTextureLayerEXT 770
+#define _gloffset_StencilFuncSeparateATI 771
+#define _gloffset_ProgramEnvParameters4fvEXT 772
+#define _gloffset_ProgramLocalParameters4fvEXT 773
+#define _gloffset_GetQueryObjecti64vEXT 774
+#define _gloffset_GetQueryObjectui64vEXT 775
+#define _gloffset_FIRST_DYNAMIC 776
 
 #else
 
@@ -965,6 +966,7 @@
 #define _gloffset_GetAttribLocationARB driDispatchRemapTable[GetAttribLocationARB_remap_index]
 #define _gloffset_DrawBuffersARB driDispatchRemapTable[DrawBuffersARB_remap_index]
 #define _gloffset_RenderbufferStorageMultisample driDispatchRemapTable[RenderbufferStorageMultisample_remap_index]
+#define _gloffset_CopyBufferSubData driDispatchRemapTable[CopyBufferSubData_remap_index]
 #define _gloffset_PolygonOffsetEXT driDispatchRemapTable[PolygonOffsetEXT_remap_index]
 #define _gloffset_GetPixelTexGenParameterfvSGIS driDispatchRemapTable[GetPixelTexGenParameterfvSGIS_remap_index]
 #define _gloffset_GetPixelTexGenParameterivSGIS driDispatchRemapTable[GetPixelTexGenParameterivSGIS_remap_index]
diff --git a/src/mesa/glapi/glapitable.h b/src/mesa/glapi/glapitable.h
index 9ecb036461..c782c90087 100644
--- a/src/mesa/glapi/glapitable.h
+++ b/src/mesa/glapi/glapitable.h
@@ -602,219 +602,220 @@ struct _glapi_table
    GLint (GLAPIENTRYP GetAttribLocationARB)(GLhandleARB program, const GLcharARB * name); /* 559 */
    void (GLAPIENTRYP DrawBuffersARB)(GLsizei n, const GLenum * bufs); /* 560 */
    void (GLAPIENTRYP RenderbufferStorageMultisample)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); /* 561 */
-   void (GLAPIENTRYP PolygonOffsetEXT)(GLfloat factor, GLfloat bias); /* 562 */
-   void (GLAPIENTRYP GetPixelTexGenParameterfvSGIS)(GLenum pname, GLfloat * params); /* 563 */
-   void (GLAPIENTRYP GetPixelTexGenParameterivSGIS)(GLenum pname, GLint * params); /* 564 */
-   void (GLAPIENTRYP PixelTexGenParameterfSGIS)(GLenum pname, GLfloat param); /* 565 */
-   void (GLAPIENTRYP PixelTexGenParameterfvSGIS)(GLenum pname, const GLfloat * params); /* 566 */
-   void (GLAPIENTRYP PixelTexGenParameteriSGIS)(GLenum pname, GLint param); /* 567 */
-   void (GLAPIENTRYP PixelTexGenParameterivSGIS)(GLenum pname, const GLint * params); /* 568 */
-   void (GLAPIENTRYP SampleMaskSGIS)(GLclampf value, GLboolean invert); /* 569 */
-   void (GLAPIENTRYP SamplePatternSGIS)(GLenum pattern); /* 570 */
-   void (GLAPIENTRYP ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 571 */
-   void (GLAPIENTRYP EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean * pointer); /* 572 */
-   void (GLAPIENTRYP IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 573 */
-   void (GLAPIENTRYP NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 574 */
-   void (GLAPIENTRYP TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 575 */
-   void (GLAPIENTRYP VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 576 */
-   void (GLAPIENTRYP PointParameterfEXT)(GLenum pname, GLfloat param); /* 577 */
-   void (GLAPIENTRYP PointParameterfvEXT)(GLenum pname, const GLfloat * params); /* 578 */
-   void (GLAPIENTRYP LockArraysEXT)(GLint first, GLsizei count); /* 579 */
-   void (GLAPIENTRYP UnlockArraysEXT)(void); /* 580 */
-   void (GLAPIENTRYP CullParameterdvEXT)(GLenum pname, GLdouble * params); /* 581 */
-   void (GLAPIENTRYP CullParameterfvEXT)(GLenum pname, GLfloat * params); /* 582 */
-   void (GLAPIENTRYP SecondaryColor3bEXT)(GLbyte red, GLbyte green, GLbyte blue); /* 583 */
-   void (GLAPIENTRYP SecondaryColor3bvEXT)(const GLbyte * v); /* 584 */
-   void (GLAPIENTRYP SecondaryColor3dEXT)(GLdouble red, GLdouble green, GLdouble blue); /* 585 */
-   void (GLAPIENTRYP SecondaryColor3dvEXT)(const GLdouble * v); /* 586 */
-   void (GLAPIENTRYP SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue); /* 587 */
-   void (GLAPIENTRYP SecondaryColor3fvEXT)(const GLfloat * v); /* 588 */
-   void (GLAPIENTRYP SecondaryColor3iEXT)(GLint red, GLint green, GLint blue); /* 589 */
-   void (GLAPIENTRYP SecondaryColor3ivEXT)(const GLint * v); /* 590 */
-   void (GLAPIENTRYP SecondaryColor3sEXT)(GLshort red, GLshort green, GLshort blue); /* 591 */
-   void (GLAPIENTRYP SecondaryColor3svEXT)(const GLshort * v); /* 592 */
-   void (GLAPIENTRYP SecondaryColor3ubEXT)(GLubyte red, GLubyte green, GLubyte blue); /* 593 */
-   void (GLAPIENTRYP SecondaryColor3ubvEXT)(const GLubyte * v); /* 594 */
-   void (GLAPIENTRYP SecondaryColor3uiEXT)(GLuint red, GLuint green, GLuint blue); /* 595 */
-   void (GLAPIENTRYP SecondaryColor3uivEXT)(const GLuint * v); /* 596 */
-   void (GLAPIENTRYP SecondaryColor3usEXT)(GLushort red, GLushort green, GLushort blue); /* 597 */
-   void (GLAPIENTRYP SecondaryColor3usvEXT)(const GLushort * v); /* 598 */
-   void (GLAPIENTRYP SecondaryColorPointerEXT)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 599 */
-   void (GLAPIENTRYP MultiDrawArraysEXT)(GLenum mode, GLint * first, GLsizei * count, GLsizei primcount); /* 600 */
-   void (GLAPIENTRYP MultiDrawElementsEXT)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount); /* 601 */
-   void (GLAPIENTRYP FogCoordPointerEXT)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 602 */
-   void (GLAPIENTRYP FogCoorddEXT)(GLdouble coord); /* 603 */
-   void (GLAPIENTRYP FogCoorddvEXT)(const GLdouble * coord); /* 604 */
-   void (GLAPIENTRYP FogCoordfEXT)(GLfloat coord); /* 605 */
-   void (GLAPIENTRYP FogCoordfvEXT)(const GLfloat * coord); /* 606 */
-   void (GLAPIENTRYP PixelTexGenSGIX)(GLenum mode); /* 607 */
-   void (GLAPIENTRYP BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); /* 608 */
-   void (GLAPIENTRYP FlushVertexArrayRangeNV)(void); /* 609 */
-   void (GLAPIENTRYP VertexArrayRangeNV)(GLsizei length, const GLvoid * pointer); /* 610 */
-   void (GLAPIENTRYP CombinerInputNV)(GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 611 */
-   void (GLAPIENTRYP CombinerOutputNV)(GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum); /* 612 */
-   void (GLAPIENTRYP CombinerParameterfNV)(GLenum pname, GLfloat param); /* 613 */
-   void (GLAPIENTRYP CombinerParameterfvNV)(GLenum pname, const GLfloat * params); /* 614 */
-   void (GLAPIENTRYP CombinerParameteriNV)(GLenum pname, GLint param); /* 615 */
-   void (GLAPIENTRYP CombinerParameterivNV)(GLenum pname, const GLint * params); /* 616 */
-   void (GLAPIENTRYP FinalCombinerInputNV)(GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 617 */
-   void (GLAPIENTRYP GetCombinerInputParameterfvNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat * params); /* 618 */
-   void (GLAPIENTRYP GetCombinerInputParameterivNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint * params); /* 619 */
-   void (GLAPIENTRYP GetCombinerOutputParameterfvNV)(GLenum stage, GLenum portion, GLenum pname, GLfloat * params); /* 620 */
-   void (GLAPIENTRYP GetCombinerOutputParameterivNV)(GLenum stage, GLenum portion, GLenum pname, GLint * params); /* 621 */
-   void (GLAPIENTRYP GetFinalCombinerInputParameterfvNV)(GLenum variable, GLenum pname, GLfloat * params); /* 622 */
-   void (GLAPIENTRYP GetFinalCombinerInputParameterivNV)(GLenum variable, GLenum pname, GLint * params); /* 623 */
-   void (GLAPIENTRYP ResizeBuffersMESA)(void); /* 624 */
-   void (GLAPIENTRYP WindowPos2dMESA)(GLdouble x, GLdouble y); /* 625 */
-   void (GLAPIENTRYP WindowPos2dvMESA)(const GLdouble * v); /* 626 */
-   void (GLAPIENTRYP WindowPos2fMESA)(GLfloat x, GLfloat y); /* 627 */
-   void (GLAPIENTRYP WindowPos2fvMESA)(const GLfloat * v); /* 628 */
-   void (GLAPIENTRYP WindowPos2iMESA)(GLint x, GLint y); /* 629 */
-   void (GLAPIENTRYP WindowPos2ivMESA)(const GLint * v); /* 630 */
-   void (GLAPIENTRYP WindowPos2sMESA)(GLshort x, GLshort y); /* 631 */
-   void (GLAPIENTRYP WindowPos2svMESA)(const GLshort * v); /* 632 */
-   void (GLAPIENTRYP WindowPos3dMESA)(GLdouble x, GLdouble y, GLdouble z); /* 633 */
-   void (GLAPIENTRYP WindowPos3dvMESA)(const GLdouble * v); /* 634 */
-   void (GLAPIENTRYP WindowPos3fMESA)(GLfloat x, GLfloat y, GLfloat z); /* 635 */
-   void (GLAPIENTRYP WindowPos3fvMESA)(const GLfloat * v); /* 636 */
-   void (GLAPIENTRYP WindowPos3iMESA)(GLint x, GLint y, GLint z); /* 637 */
-   void (GLAPIENTRYP WindowPos3ivMESA)(const GLint * v); /* 638 */
-   void (GLAPIENTRYP WindowPos3sMESA)(GLshort x, GLshort y, GLshort z); /* 639 */
-   void (GLAPIENTRYP WindowPos3svMESA)(const GLshort * v); /* 640 */
-   void (GLAPIENTRYP WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 641 */
-   void (GLAPIENTRYP WindowPos4dvMESA)(const GLdouble * v); /* 642 */
-   void (GLAPIENTRYP WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 643 */
-   void (GLAPIENTRYP WindowPos4fvMESA)(const GLfloat * v); /* 644 */
-   void (GLAPIENTRYP WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w); /* 645 */
-   void (GLAPIENTRYP WindowPos4ivMESA)(const GLint * v); /* 646 */
-   void (GLAPIENTRYP WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w); /* 647 */
-   void (GLAPIENTRYP WindowPos4svMESA)(const GLshort * v); /* 648 */
-   void (GLAPIENTRYP MultiModeDrawArraysIBM)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride); /* 649 */
-   void (GLAPIENTRYP MultiModeDrawElementsIBM)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride); /* 650 */
-   void (GLAPIENTRYP DeleteFencesNV)(GLsizei n, const GLuint * fences); /* 651 */
-   void (GLAPIENTRYP FinishFenceNV)(GLuint fence); /* 652 */
-   void (GLAPIENTRYP GenFencesNV)(GLsizei n, GLuint * fences); /* 653 */
-   void (GLAPIENTRYP GetFenceivNV)(GLuint fence, GLenum pname, GLint * params); /* 654 */
-   GLboolean (GLAPIENTRYP IsFenceNV)(GLuint fence); /* 655 */
-   void (GLAPIENTRYP SetFenceNV)(GLuint fence, GLenum condition); /* 656 */
-   GLboolean (GLAPIENTRYP TestFenceNV)(GLuint fence); /* 657 */
-   GLboolean (GLAPIENTRYP AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences); /* 658 */
-   void (GLAPIENTRYP BindProgramNV)(GLenum target, GLuint program); /* 659 */
-   void (GLAPIENTRYP DeleteProgramsNV)(GLsizei n, const GLuint * programs); /* 660 */
-   void (GLAPIENTRYP ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat * params); /* 661 */
-   void (GLAPIENTRYP GenProgramsNV)(GLsizei n, GLuint * programs); /* 662 */
-   void (GLAPIENTRYP GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params); /* 663 */
-   void (GLAPIENTRYP GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat * params); /* 664 */
-   void (GLAPIENTRYP GetProgramStringNV)(GLuint id, GLenum pname, GLubyte * program); /* 665 */
-   void (GLAPIENTRYP GetProgramivNV)(GLuint id, GLenum pname, GLint * params); /* 666 */
-   void (GLAPIENTRYP GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint * params); /* 667 */
-   void (GLAPIENTRYP GetVertexAttribPointervNV)(GLuint index, GLenum pname, GLvoid ** pointer); /* 668 */
-   void (GLAPIENTRYP GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params); /* 669 */
-   void (GLAPIENTRYP GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat * params); /* 670 */
-   void (GLAPIENTRYP GetVertexAttribivNV)(GLuint index, GLenum pname, GLint * params); /* 671 */
-   GLboolean (GLAPIENTRYP IsProgramNV)(GLuint program); /* 672 */
-   void (GLAPIENTRYP LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte * program); /* 673 */
-   void (GLAPIENTRYP ProgramParameters4dvNV)(GLenum target, GLuint index, GLuint num, const GLdouble * params); /* 674 */
-   void (GLAPIENTRYP ProgramParameters4fvNV)(GLenum target, GLuint index, GLuint num, const GLfloat * params); /* 675 */
-   void (GLAPIENTRYP RequestResidentProgramsNV)(GLsizei n, const GLuint * ids); /* 676 */
-   void (GLAPIENTRYP TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform); /* 677 */
-   void (GLAPIENTRYP VertexAttrib1dNV)(GLuint index, GLdouble x); /* 678 */
-   void (GLAPIENTRYP VertexAttrib1dvNV)(GLuint index, const GLdouble * v); /* 679 */
-   void (GLAPIENTRYP VertexAttrib1fNV)(GLuint index, GLfloat x); /* 680 */
-   void (GLAPIENTRYP VertexAttrib1fvNV)(GLuint index, const GLfloat * v); /* 681 */
-   void (GLAPIENTRYP VertexAttrib1sNV)(GLuint index, GLshort x); /* 682 */
-   void (GLAPIENTRYP VertexAttrib1svNV)(GLuint index, const GLshort * v); /* 683 */
-   void (GLAPIENTRYP VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y); /* 684 */
-   void (GLAPIENTRYP VertexAttrib2dvNV)(GLuint index, const GLdouble * v); /* 685 */
-   void (GLAPIENTRYP VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y); /* 686 */
-   void (GLAPIENTRYP VertexAttrib2fvNV)(GLuint index, const GLfloat * v); /* 687 */
-   void (GLAPIENTRYP VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y); /* 688 */
-   void (GLAPIENTRYP VertexAttrib2svNV)(GLuint index, const GLshort * v); /* 689 */
-   void (GLAPIENTRYP VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 690 */
-   void (GLAPIENTRYP VertexAttrib3dvNV)(GLuint index, const GLdouble * v); /* 691 */
-   void (GLAPIENTRYP VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 692 */
-   void (GLAPIENTRYP VertexAttrib3fvNV)(GLuint index, const GLfloat * v); /* 693 */
-   void (GLAPIENTRYP VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z); /* 694 */
-   void (GLAPIENTRYP VertexAttrib3svNV)(GLuint index, const GLshort * v); /* 695 */
-   void (GLAPIENTRYP VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 696 */
-   void (GLAPIENTRYP VertexAttrib4dvNV)(GLuint index, const GLdouble * v); /* 697 */
-   void (GLAPIENTRYP VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 698 */
-   void (GLAPIENTRYP VertexAttrib4fvNV)(GLuint index, const GLfloat * v); /* 699 */
-   void (GLAPIENTRYP VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 700 */
-   void (GLAPIENTRYP VertexAttrib4svNV)(GLuint index, const GLshort * v); /* 701 */
-   void (GLAPIENTRYP VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 702 */
-   void (GLAPIENTRYP VertexAttrib4ubvNV)(GLuint index, const GLubyte * v); /* 703 */
-   void (GLAPIENTRYP VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 704 */
-   void (GLAPIENTRYP VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 705 */
-   void (GLAPIENTRYP VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 706 */
-   void (GLAPIENTRYP VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v); /* 707 */
-   void (GLAPIENTRYP VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 708 */
-   void (GLAPIENTRYP VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 709 */
-   void (GLAPIENTRYP VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v); /* 710 */
-   void (GLAPIENTRYP VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 711 */
-   void (GLAPIENTRYP VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 712 */
-   void (GLAPIENTRYP VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v); /* 713 */
-   void (GLAPIENTRYP VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 714 */
-   void (GLAPIENTRYP VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 715 */
-   void (GLAPIENTRYP VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v); /* 716 */
-   void (GLAPIENTRYP VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v); /* 717 */
-   void (GLAPIENTRYP GetTexBumpParameterfvATI)(GLenum pname, GLfloat * param); /* 718 */
-   void (GLAPIENTRYP GetTexBumpParameterivATI)(GLenum pname, GLint * param); /* 719 */
-   void (GLAPIENTRYP TexBumpParameterfvATI)(GLenum pname, const GLfloat * param); /* 720 */
-   void (GLAPIENTRYP TexBumpParameterivATI)(GLenum pname, const GLint * param); /* 721 */
-   void (GLAPIENTRYP AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 722 */
-   void (GLAPIENTRYP AlphaFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 723 */
-   void (GLAPIENTRYP AlphaFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 724 */
-   void (GLAPIENTRYP BeginFragmentShaderATI)(void); /* 725 */
-   void (GLAPIENTRYP BindFragmentShaderATI)(GLuint id); /* 726 */
-   void (GLAPIENTRYP ColorFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 727 */
-   void (GLAPIENTRYP ColorFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 728 */
-   void (GLAPIENTRYP ColorFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 729 */
-   void (GLAPIENTRYP DeleteFragmentShaderATI)(GLuint id); /* 730 */
-   void (GLAPIENTRYP EndFragmentShaderATI)(void); /* 731 */
-   GLuint (GLAPIENTRYP GenFragmentShadersATI)(GLuint range); /* 732 */
-   void (GLAPIENTRYP PassTexCoordATI)(GLuint dst, GLuint coord, GLenum swizzle); /* 733 */
-   void (GLAPIENTRYP SampleMapATI)(GLuint dst, GLuint interp, GLenum swizzle); /* 734 */
-   void (GLAPIENTRYP SetFragmentShaderConstantATI)(GLuint dst, const GLfloat * value); /* 735 */
-   void (GLAPIENTRYP PointParameteriNV)(GLenum pname, GLint param); /* 736 */
-   void (GLAPIENTRYP PointParameterivNV)(GLenum pname, const GLint * params); /* 737 */
-   void (GLAPIENTRYP ActiveStencilFaceEXT)(GLenum face); /* 738 */
-   void (GLAPIENTRYP BindVertexArrayAPPLE)(GLuint array); /* 739 */
-   void (GLAPIENTRYP DeleteVertexArraysAPPLE)(GLsizei n, const GLuint * arrays); /* 740 */
-   void (GLAPIENTRYP GenVertexArraysAPPLE)(GLsizei n, GLuint * arrays); /* 741 */
-   GLboolean (GLAPIENTRYP IsVertexArrayAPPLE)(GLuint array); /* 742 */
-   void (GLAPIENTRYP GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params); /* 743 */
-   void (GLAPIENTRYP GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params); /* 744 */
-   void (GLAPIENTRYP ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 745 */
-   void (GLAPIENTRYP ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 746 */
-   void (GLAPIENTRYP ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 747 */
-   void (GLAPIENTRYP ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 748 */
-   void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 749 */
-   void (GLAPIENTRYP BlendEquationSeparateEXT)(GLenum modeRGB, GLenum modeA); /* 750 */
-   void (GLAPIENTRYP BindFramebufferEXT)(GLenum target, GLuint framebuffer); /* 751 */
-   void (GLAPIENTRYP BindRenderbufferEXT)(GLenum target, GLuint renderbuffer); /* 752 */
-   GLenum (GLAPIENTRYP CheckFramebufferStatusEXT)(GLenum target); /* 753 */
-   void (GLAPIENTRYP DeleteFramebuffersEXT)(GLsizei n, const GLuint * framebuffers); /* 754 */
-   void (GLAPIENTRYP DeleteRenderbuffersEXT)(GLsizei n, const GLuint * renderbuffers); /* 755 */
-   void (GLAPIENTRYP FramebufferRenderbufferEXT)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); /* 756 */
-   void (GLAPIENTRYP FramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 757 */
-   void (GLAPIENTRYP FramebufferTexture2DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 758 */
-   void (GLAPIENTRYP FramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); /* 759 */
-   void (GLAPIENTRYP GenFramebuffersEXT)(GLsizei n, GLuint * framebuffers); /* 760 */
-   void (GLAPIENTRYP GenRenderbuffersEXT)(GLsizei n, GLuint * renderbuffers); /* 761 */
-   void (GLAPIENTRYP GenerateMipmapEXT)(GLenum target); /* 762 */
-   void (GLAPIENTRYP GetFramebufferAttachmentParameterivEXT)(GLenum target, GLenum attachment, GLenum pname, GLint * params); /* 763 */
-   void (GLAPIENTRYP GetRenderbufferParameterivEXT)(GLenum target, GLenum pname, GLint * params); /* 764 */
-   GLboolean (GLAPIENTRYP IsFramebufferEXT)(GLuint framebuffer); /* 765 */
-   GLboolean (GLAPIENTRYP IsRenderbufferEXT)(GLuint renderbuffer); /* 766 */
-   void (GLAPIENTRYP RenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); /* 767 */
-   void (GLAPIENTRYP BlitFramebufferEXT)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); /* 768 */
-   void (GLAPIENTRYP FramebufferTextureLayerEXT)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); /* 769 */
-   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 770 */
-   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 771 */
-   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 772 */
-   void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 773 */
-   void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 774 */
+   void (GLAPIENTRYP CopyBufferSubData)(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); /* 562 */
+   void (GLAPIENTRYP PolygonOffsetEXT)(GLfloat factor, GLfloat bias); /* 563 */
+   void (GLAPIENTRYP GetPixelTexGenParameterfvSGIS)(GLenum pname, GLfloat * params); /* 564 */
+   void (GLAPIENTRYP GetPixelTexGenParameterivSGIS)(GLenum pname, GLint * params); /* 565 */
+   void (GLAPIENTRYP PixelTexGenParameterfSGIS)(GLenum pname, GLfloat param); /* 566 */
+   void (GLAPIENTRYP PixelTexGenParameterfvSGIS)(GLenum pname, const GLfloat * params); /* 567 */
+   void (GLAPIENTRYP PixelTexGenParameteriSGIS)(GLenum pname, GLint param); /* 568 */
+   void (GLAPIENTRYP PixelTexGenParameterivSGIS)(GLenum pname, const GLint * params); /* 569 */
+   void (GLAPIENTRYP SampleMaskSGIS)(GLclampf value, GLboolean invert); /* 570 */
+   void (GLAPIENTRYP SamplePatternSGIS)(GLenum pattern); /* 571 */
+   void (GLAPIENTRYP ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 572 */
+   void (GLAPIENTRYP EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean * pointer); /* 573 */
+   void (GLAPIENTRYP IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 574 */
+   void (GLAPIENTRYP NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 575 */
+   void (GLAPIENTRYP TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 576 */
+   void (GLAPIENTRYP VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 577 */
+   void (GLAPIENTRYP PointParameterfEXT)(GLenum pname, GLfloat param); /* 578 */
+   void (GLAPIENTRYP PointParameterfvEXT)(GLenum pname, const GLfloat * params); /* 579 */
+   void (GLAPIENTRYP LockArraysEXT)(GLint first, GLsizei count); /* 580 */
+   void (GLAPIENTRYP UnlockArraysEXT)(void); /* 581 */
+   void (GLAPIENTRYP CullParameterdvEXT)(GLenum pname, GLdouble * params); /* 582 */
+   void (GLAPIENTRYP CullParameterfvEXT)(GLenum pname, GLfloat * params); /* 583 */
+   void (GLAPIENTRYP SecondaryColor3bEXT)(GLbyte red, GLbyte green, GLbyte blue); /* 584 */
+   void (GLAPIENTRYP SecondaryColor3bvEXT)(const GLbyte * v); /* 585 */
+   void (GLAPIENTRYP SecondaryColor3dEXT)(GLdouble red, GLdouble green, GLdouble blue); /* 586 */
+   void (GLAPIENTRYP SecondaryColor3dvEXT)(const GLdouble * v); /* 587 */
+   void (GLAPIENTRYP SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue); /* 588 */
+   void (GLAPIENTRYP SecondaryColor3fvEXT)(const GLfloat * v); /* 589 */
+   void (GLAPIENTRYP SecondaryColor3iEXT)(GLint red, GLint green, GLint blue); /* 590 */
+   void (GLAPIENTRYP SecondaryColor3ivEXT)(const GLint * v); /* 591 */
+   void (GLAPIENTRYP SecondaryColor3sEXT)(GLshort red, GLshort green, GLshort blue); /* 592 */
+   void (GLAPIENTRYP SecondaryColor3svEXT)(const GLshort * v); /* 593 */
+   void (GLAPIENTRYP SecondaryColor3ubEXT)(GLubyte red, GLubyte green, GLubyte blue); /* 594 */
+   void (GLAPIENTRYP SecondaryColor3ubvEXT)(const GLubyte * v); /* 595 */
+   void (GLAPIENTRYP SecondaryColor3uiEXT)(GLuint red, GLuint green, GLuint blue); /* 596 */
+   void (GLAPIENTRYP SecondaryColor3uivEXT)(const GLuint * v); /* 597 */
+   void (GLAPIENTRYP SecondaryColor3usEXT)(GLushort red, GLushort green, GLushort blue); /* 598 */
+   void (GLAPIENTRYP SecondaryColor3usvEXT)(const GLushort * v); /* 599 */
+   void (GLAPIENTRYP SecondaryColorPointerEXT)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 600 */
+   void (GLAPIENTRYP MultiDrawArraysEXT)(GLenum mode, GLint * first, GLsizei * count, GLsizei primcount); /* 601 */
+   void (GLAPIENTRYP MultiDrawElementsEXT)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount); /* 602 */
+   void (GLAPIENTRYP FogCoordPointerEXT)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 603 */
+   void (GLAPIENTRYP FogCoorddEXT)(GLdouble coord); /* 604 */
+   void (GLAPIENTRYP FogCoorddvEXT)(const GLdouble * coord); /* 605 */
+   void (GLAPIENTRYP FogCoordfEXT)(GLfloat coord); /* 606 */
+   void (GLAPIENTRYP FogCoordfvEXT)(const GLfloat * coord); /* 607 */
+   void (GLAPIENTRYP PixelTexGenSGIX)(GLenum mode); /* 608 */
+   void (GLAPIENTRYP BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); /* 609 */
+   void (GLAPIENTRYP FlushVertexArrayRangeNV)(void); /* 610 */
+   void (GLAPIENTRYP VertexArrayRangeNV)(GLsizei length, const GLvoid * pointer); /* 611 */
+   void (GLAPIENTRYP CombinerInputNV)(GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 612 */
+   void (GLAPIENTRYP CombinerOutputNV)(GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum); /* 613 */
+   void (GLAPIENTRYP CombinerParameterfNV)(GLenum pname, GLfloat param); /* 614 */
+   void (GLAPIENTRYP CombinerParameterfvNV)(GLenum pname, const GLfloat * params); /* 615 */
+   void (GLAPIENTRYP CombinerParameteriNV)(GLenum pname, GLint param); /* 616 */
+   void (GLAPIENTRYP CombinerParameterivNV)(GLenum pname, const GLint * params); /* 617 */
+   void (GLAPIENTRYP FinalCombinerInputNV)(GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 618 */
+   void (GLAPIENTRYP GetCombinerInputParameterfvNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat * params); /* 619 */
+   void (GLAPIENTRYP GetCombinerInputParameterivNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint * params); /* 620 */
+   void (GLAPIENTRYP GetCombinerOutputParameterfvNV)(GLenum stage, GLenum portion, GLenum pname, GLfloat * params); /* 621 */
+   void (GLAPIENTRYP GetCombinerOutputParameterivNV)(GLenum stage, GLenum portion, GLenum pname, GLint * params); /* 622 */
+   void (GLAPIENTRYP GetFinalCombinerInputParameterfvNV)(GLenum variable, GLenum pname, GLfloat * params); /* 623 */
+   void (GLAPIENTRYP GetFinalCombinerInputParameterivNV)(GLenum variable, GLenum pname, GLint * params); /* 624 */
+   void (GLAPIENTRYP ResizeBuffersMESA)(void); /* 625 */
+   void (GLAPIENTRYP WindowPos2dMESA)(GLdouble x, GLdouble y); /* 626 */
+   void (GLAPIENTRYP WindowPos2dvMESA)(const GLdouble * v); /* 627 */
+   void (GLAPIENTRYP WindowPos2fMESA)(GLfloat x, GLfloat y); /* 628 */
+   void (GLAPIENTRYP WindowPos2fvMESA)(const GLfloat * v); /* 629 */
+   void (GLAPIENTRYP WindowPos2iMESA)(GLint x, GLint y); /* 630 */
+   void (GLAPIENTRYP WindowPos2ivMESA)(const GLint * v); /* 631 */
+   void (GLAPIENTRYP WindowPos2sMESA)(GLshort x, GLshort y); /* 632 */
+   void (GLAPIENTRYP WindowPos2svMESA)(const GLshort * v); /* 633 */
+   void (GLAPIENTRYP WindowPos3dMESA)(GLdouble x, GLdouble y, GLdouble z); /* 634 */
+   void (GLAPIENTRYP WindowPos3dvMESA)(const GLdouble * v); /* 635 */
+   void (GLAPIENTRYP WindowPos3fMESA)(GLfloat x, GLfloat y, GLfloat z); /* 636 */
+   void (GLAPIENTRYP WindowPos3fvMESA)(const GLfloat * v); /* 637 */
+   void (GLAPIENTRYP WindowPos3iMESA)(GLint x, GLint y, GLint z); /* 638 */
+   void (GLAPIENTRYP WindowPos3ivMESA)(const GLint * v); /* 639 */
+   void (GLAPIENTRYP WindowPos3sMESA)(GLshort x, GLshort y, GLshort z); /* 640 */
+   void (GLAPIENTRYP WindowPos3svMESA)(const GLshort * v); /* 641 */
+   void (GLAPIENTRYP WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 642 */
+   void (GLAPIENTRYP WindowPos4dvMESA)(const GLdouble * v); /* 643 */
+   void (GLAPIENTRYP WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 644 */
+   void (GLAPIENTRYP WindowPos4fvMESA)(const GLfloat * v); /* 645 */
+   void (GLAPIENTRYP WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w); /* 646 */
+   void (GLAPIENTRYP WindowPos4ivMESA)(const GLint * v); /* 647 */
+   void (GLAPIENTRYP WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w); /* 648 */
+   void (GLAPIENTRYP WindowPos4svMESA)(const GLshort * v); /* 649 */
+   void (GLAPIENTRYP MultiModeDrawArraysIBM)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride); /* 650 */
+   void (GLAPIENTRYP MultiModeDrawElementsIBM)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride); /* 651 */
+   void (GLAPIENTRYP DeleteFencesNV)(GLsizei n, const GLuint * fences); /* 652 */
+   void (GLAPIENTRYP FinishFenceNV)(GLuint fence); /* 653 */
+   void (GLAPIENTRYP GenFencesNV)(GLsizei n, GLuint * fences); /* 654 */
+   void (GLAPIENTRYP GetFenceivNV)(GLuint fence, GLenum pname, GLint * params); /* 655 */
+   GLboolean (GLAPIENTRYP IsFenceNV)(GLuint fence); /* 656 */
+   void (GLAPIENTRYP SetFenceNV)(GLuint fence, GLenum condition); /* 657 */
+   GLboolean (GLAPIENTRYP TestFenceNV)(GLuint fence); /* 658 */
+   GLboolean (GLAPIENTRYP AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences); /* 659 */
+   void (GLAPIENTRYP BindProgramNV)(GLenum target, GLuint program); /* 660 */
+   void (GLAPIENTRYP DeleteProgramsNV)(GLsizei n, const GLuint * programs); /* 661 */
+   void (GLAPIENTRYP ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat * params); /* 662 */
+   void (GLAPIENTRYP GenProgramsNV)(GLsizei n, GLuint * programs); /* 663 */
+   void (GLAPIENTRYP GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params); /* 664 */
+   void (GLAPIENTRYP GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat * params); /* 665 */
+   void (GLAPIENTRYP GetProgramStringNV)(GLuint id, GLenum pname, GLubyte * program); /* 666 */
+   void (GLAPIENTRYP GetProgramivNV)(GLuint id, GLenum pname, GLint * params); /* 667 */
+   void (GLAPIENTRYP GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint * params); /* 668 */
+   void (GLAPIENTRYP GetVertexAttribPointervNV)(GLuint index, GLenum pname, GLvoid ** pointer); /* 669 */
+   void (GLAPIENTRYP GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params); /* 670 */
+   void (GLAPIENTRYP GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat * params); /* 671 */
+   void (GLAPIENTRYP GetVertexAttribivNV)(GLuint index, GLenum pname, GLint * params); /* 672 */
+   GLboolean (GLAPIENTRYP IsProgramNV)(GLuint program); /* 673 */
+   void (GLAPIENTRYP LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte * program); /* 674 */
+   void (GLAPIENTRYP ProgramParameters4dvNV)(GLenum target, GLuint index, GLuint num, const GLdouble * params); /* 675 */
+   void (GLAPIENTRYP ProgramParameters4fvNV)(GLenum target, GLuint index, GLuint num, const GLfloat * params); /* 676 */
+   void (GLAPIENTRYP RequestResidentProgramsNV)(GLsizei n, const GLuint * ids); /* 677 */
+   void (GLAPIENTRYP TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform); /* 678 */
+   void (GLAPIENTRYP VertexAttrib1dNV)(GLuint index, GLdouble x); /* 679 */
+   void (GLAPIENTRYP VertexAttrib1dvNV)(GLuint index, const GLdouble * v); /* 680 */
+   void (GLAPIENTRYP VertexAttrib1fNV)(GLuint index, GLfloat x); /* 681 */
+   void (GLAPIENTRYP VertexAttrib1fvNV)(GLuint index, const GLfloat * v); /* 682 */
+   void (GLAPIENTRYP VertexAttrib1sNV)(GLuint index, GLshort x); /* 683 */
+   void (GLAPIENTRYP VertexAttrib1svNV)(GLuint index, const GLshort * v); /* 684 */
+   void (GLAPIENTRYP VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y); /* 685 */
+   void (GLAPIENTRYP VertexAttrib2dvNV)(GLuint index, const GLdouble * v); /* 686 */
+   void (GLAPIENTRYP VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y); /* 687 */
+   void (GLAPIENTRYP VertexAttrib2fvNV)(GLuint index, const GLfloat * v); /* 688 */
+   void (GLAPIENTRYP VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y); /* 689 */
+   void (GLAPIENTRYP VertexAttrib2svNV)(GLuint index, const GLshort * v); /* 690 */
+   void (GLAPIENTRYP VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 691 */
+   void (GLAPIENTRYP VertexAttrib3dvNV)(GLuint index, const GLdouble * v); /* 692 */
+   void (GLAPIENTRYP VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 693 */
+   void (GLAPIENTRYP VertexAttrib3fvNV)(GLuint index, const GLfloat * v); /* 694 */
+   void (GLAPIENTRYP VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z); /* 695 */
+   void (GLAPIENTRYP VertexAttrib3svNV)(GLuint index, const GLshort * v); /* 696 */
+   void (GLAPIENTRYP VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 697 */
+   void (GLAPIENTRYP VertexAttrib4dvNV)(GLuint index, const GLdouble * v); /* 698 */
+   void (GLAPIENTRYP VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 699 */
+   void (GLAPIENTRYP VertexAttrib4fvNV)(GLuint index, const GLfloat * v); /* 700 */
+   void (GLAPIENTRYP VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 701 */
+   void (GLAPIENTRYP VertexAttrib4svNV)(GLuint index, const GLshort * v); /* 702 */
+   void (GLAPIENTRYP VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 703 */
+   void (GLAPIENTRYP VertexAttrib4ubvNV)(GLuint index, const GLubyte * v); /* 704 */
+   void (GLAPIENTRYP VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 705 */
+   void (GLAPIENTRYP VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 706 */
+   void (GLAPIENTRYP VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 707 */
+   void (GLAPIENTRYP VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v); /* 708 */
+   void (GLAPIENTRYP VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 709 */
+   void (GLAPIENTRYP VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 710 */
+   void (GLAPIENTRYP VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v); /* 711 */
+   void (GLAPIENTRYP VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 712 */
+   void (GLAPIENTRYP VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 713 */
+   void (GLAPIENTRYP VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v); /* 714 */
+   void (GLAPIENTRYP VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 715 */
+   void (GLAPIENTRYP VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 716 */
+   void (GLAPIENTRYP VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v); /* 717 */
+   void (GLAPIENTRYP VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v); /* 718 */
+   void (GLAPIENTRYP GetTexBumpParameterfvATI)(GLenum pname, GLfloat * param); /* 719 */
+   void (GLAPIENTRYP GetTexBumpParameterivATI)(GLenum pname, GLint * param); /* 720 */
+   void (GLAPIENTRYP TexBumpParameterfvATI)(GLenum pname, const GLfloat * param); /* 721 */
+   void (GLAPIENTRYP TexBumpParameterivATI)(GLenum pname, const GLint * param); /* 722 */
+   void (GLAPIENTRYP AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 723 */
+   void (GLAPIENTRYP AlphaFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 724 */
+   void (GLAPIENTRYP AlphaFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 725 */
+   void (GLAPIENTRYP BeginFragmentShaderATI)(void); /* 726 */
+   void (GLAPIENTRYP BindFragmentShaderATI)(GLuint id); /* 727 */
+   void (GLAPIENTRYP ColorFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 728 */
+   void (GLAPIENTRYP ColorFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 729 */
+   void (GLAPIENTRYP ColorFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 730 */
+   void (GLAPIENTRYP DeleteFragmentShaderATI)(GLuint id); /* 731 */
+   void (GLAPIENTRYP EndFragmentShaderATI)(void); /* 732 */
+   GLuint (GLAPIENTRYP GenFragmentShadersATI)(GLuint range); /* 733 */
+   void (GLAPIENTRYP PassTexCoordATI)(GLuint dst, GLuint coord, GLenum swizzle); /* 734 */
+   void (GLAPIENTRYP SampleMapATI)(GLuint dst, GLuint interp, GLenum swizzle); /* 735 */
+   void (GLAPIENTRYP SetFragmentShaderConstantATI)(GLuint dst, const GLfloat * value); /* 736 */
+   void (GLAPIENTRYP PointParameteriNV)(GLenum pname, GLint param); /* 737 */
+   void (GLAPIENTRYP PointParameterivNV)(GLenum pname, const GLint * params); /* 738 */
+   void (GLAPIENTRYP ActiveStencilFaceEXT)(GLenum face); /* 739 */
+   void (GLAPIENTRYP BindVertexArrayAPPLE)(GLuint array); /* 740 */
+   void (GLAPIENTRYP DeleteVertexArraysAPPLE)(GLsizei n, const GLuint * arrays); /* 741 */
+   void (GLAPIENTRYP GenVertexArraysAPPLE)(GLsizei n, GLuint * arrays); /* 742 */
+   GLboolean (GLAPIENTRYP IsVertexArrayAPPLE)(GLuint array); /* 743 */
+   void (GLAPIENTRYP GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params); /* 744 */
+   void (GLAPIENTRYP GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params); /* 745 */
+   void (GLAPIENTRYP ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 746 */
+   void (GLAPIENTRYP ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 747 */
+   void (GLAPIENTRYP ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 748 */
+   void (GLAPIENTRYP ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 749 */
+   void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 750 */
+   void (GLAPIENTRYP BlendEquationSeparateEXT)(GLenum modeRGB, GLenum modeA); /* 751 */
+   void (GLAPIENTRYP BindFramebufferEXT)(GLenum target, GLuint framebuffer); /* 752 */
+   void (GLAPIENTRYP BindRenderbufferEXT)(GLenum target, GLuint renderbuffer); /* 753 */
+   GLenum (GLAPIENTRYP CheckFramebufferStatusEXT)(GLenum target); /* 754 */
+   void (GLAPIENTRYP DeleteFramebuffersEXT)(GLsizei n, const GLuint * framebuffers); /* 755 */
+   void (GLAPIENTRYP DeleteRenderbuffersEXT)(GLsizei n, const GLuint * renderbuffers); /* 756 */
+   void (GLAPIENTRYP FramebufferRenderbufferEXT)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); /* 757 */
+   void (GLAPIENTRYP FramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 758 */
+   void (GLAPIENTRYP FramebufferTexture2DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 759 */
+   void (GLAPIENTRYP FramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); /* 760 */
+   void (GLAPIENTRYP GenFramebuffersEXT)(GLsizei n, GLuint * framebuffers); /* 761 */
+   void (GLAPIENTRYP GenRenderbuffersEXT)(GLsizei n, GLuint * renderbuffers); /* 762 */
+   void (GLAPIENTRYP GenerateMipmapEXT)(GLenum target); /* 763 */
+   void (GLAPIENTRYP GetFramebufferAttachmentParameterivEXT)(GLenum target, GLenum attachment, GLenum pname, GLint * params); /* 764 */
+   void (GLAPIENTRYP GetRenderbufferParameterivEXT)(GLenum target, GLenum pname, GLint * params); /* 765 */
+   GLboolean (GLAPIENTRYP IsFramebufferEXT)(GLuint framebuffer); /* 766 */
+   GLboolean (GLAPIENTRYP IsRenderbufferEXT)(GLuint renderbuffer); /* 767 */
+   void (GLAPIENTRYP RenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); /* 768 */
+   void (GLAPIENTRYP BlitFramebufferEXT)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); /* 769 */
+   void (GLAPIENTRYP FramebufferTextureLayerEXT)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); /* 770 */
+   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 771 */
+   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 772 */
+   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 773 */
+   void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 774 */
+   void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 775 */
 };
 
 #endif /* !defined( _GLAPI_TABLE_H_ ) */
diff --git a/src/mesa/glapi/glapitemp.h b/src/mesa/glapi/glapitemp.h
index 7ccd9707c3..c37aed7bcd 100644
--- a/src/mesa/glapi/glapitemp.h
+++ b/src/mesa/glapi/glapitemp.h
@@ -4011,63 +4011,68 @@ KEYWORD1 void KEYWORD2 NAME(RenderbufferStorageMultisample)(GLenum target, GLsiz
    DISPATCH(RenderbufferStorageMultisample, (target, samples, internalformat, width, height), (F, "glRenderbufferStorageMultisample(0x%x, %d, 0x%x, %d, %d);\n", target, samples, internalformat, width, height));
 }
 
+KEYWORD1 void KEYWORD2 NAME(CopyBufferSubData)(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size)
+{
+   DISPATCH(CopyBufferSubData, (readTarget, writeTarget, readOffset, writeOffset, size), (F, "glCopyBufferSubData(0x%x, 0x%x, %d, %d, %d);\n", readTarget, writeTarget, readOffset, writeOffset, size));
+}
+
 KEYWORD1 void KEYWORD2 NAME(PolygonOffsetEXT)(GLfloat factor, GLfloat bias)
 {
    DISPATCH(PolygonOffsetEXT, (factor, bias), (F, "glPolygonOffsetEXT(%f, %f);\n", factor, bias));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_563)(GLenum pname, GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_564)(GLenum pname, GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_563)(GLenum pname, GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_564)(GLenum pname, GLfloat * params)
 {
    DISPATCH(GetPixelTexGenParameterfvSGIS, (pname, params), (F, "glGetPixelTexGenParameterfvSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_564)(GLenum pname, GLint * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_565)(GLenum pname, GLint * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_564)(GLenum pname, GLint * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_565)(GLenum pname, GLint * params)
 {
    DISPATCH(GetPixelTexGenParameterivSGIS, (pname, params), (F, "glGetPixelTexGenParameterivSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_565)(GLenum pname, GLfloat param);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_566)(GLenum pname, GLfloat param);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_565)(GLenum pname, GLfloat param)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_566)(GLenum pname, GLfloat param)
 {
    DISPATCH(PixelTexGenParameterfSGIS, (pname, param), (F, "glPixelTexGenParameterfSGIS(0x%x, %f);\n", pname, param));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_566)(GLenum pname, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_567)(GLenum pname, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_566)(GLenum pname, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_567)(GLenum pname, const GLfloat * params)
 {
    DISPATCH(PixelTexGenParameterfvSGIS, (pname, params), (F, "glPixelTexGenParameterfvSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_567)(GLenum pname, GLint param);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_568)(GLenum pname, GLint param);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_567)(GLenum pname, GLint param)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_568)(GLenum pname, GLint param)
 {
    DISPATCH(PixelTexGenParameteriSGIS, (pname, param), (F, "glPixelTexGenParameteriSGIS(0x%x, %d);\n", pname, param));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_568)(GLenum pname, const GLint * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_569)(GLenum pname, const GLint * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_568)(GLenum pname, const GLint * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_569)(GLenum pname, const GLint * params)
 {
    DISPATCH(PixelTexGenParameterivSGIS, (pname, params), (F, "glPixelTexGenParameterivSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_569)(GLclampf value, GLboolean invert);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_570)(GLclampf value, GLboolean invert);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_569)(GLclampf value, GLboolean invert)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_570)(GLclampf value, GLboolean invert)
 {
    DISPATCH(SampleMaskSGIS, (value, invert), (F, "glSampleMaskSGIS(%f, %d);\n", value, invert));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_570)(GLenum pattern);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_571)(GLenum pattern);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_570)(GLenum pattern)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_571)(GLenum pattern)
 {
    DISPATCH(SamplePatternSGIS, (pattern), (F, "glSamplePatternSGIS(0x%x);\n", pattern));
 }
@@ -4117,9 +4122,9 @@ KEYWORD1 void KEYWORD2 NAME(PointParameterfEXT)(GLenum pname, GLfloat param)
    DISPATCH(PointParameterfEXT, (pname, param), (F, "glPointParameterfEXT(0x%x, %f);\n", pname, param));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_577)(GLenum pname, GLfloat param);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_578)(GLenum pname, GLfloat param);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_577)(GLenum pname, GLfloat param)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_578)(GLenum pname, GLfloat param)
 {
    DISPATCH(PointParameterfEXT, (pname, param), (F, "glPointParameterfSGIS(0x%x, %f);\n", pname, param));
 }
@@ -4139,9 +4144,9 @@ KEYWORD1 void KEYWORD2 NAME(PointParameterfvEXT)(GLenum pname, const GLfloat * p
    DISPATCH(PointParameterfvEXT, (pname, params), (F, "glPointParameterfvEXT(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_578)(GLenum pname, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_579)(GLenum pname, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_578)(GLenum pname, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_579)(GLenum pname, const GLfloat * params)
 {
    DISPATCH(PointParameterfvEXT, (pname, params), (F, "glPointParameterfvSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
@@ -4156,16 +4161,16 @@ KEYWORD1 void KEYWORD2 NAME(UnlockArraysEXT)(void)
    DISPATCH(UnlockArraysEXT, (), (F, "glUnlockArraysEXT();\n"));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_581)(GLenum pname, GLdouble * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_582)(GLenum pname, GLdouble * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_581)(GLenum pname, GLdouble * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_582)(GLenum pname, GLdouble * params)
 {
    DISPATCH(CullParameterdvEXT, (pname, params), (F, "glCullParameterdvEXT(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_582)(GLenum pname, GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_583)(GLenum pname, GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_582)(GLenum pname, GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_583)(GLenum pname, GLfloat * params)
 {
    DISPATCH(CullParameterfvEXT, (pname, params), (F, "glCullParameterfvEXT(0x%x, %p);\n", pname, (const void *) params));
 }
@@ -4410,9 +4415,9 @@ KEYWORD1 void KEYWORD2 NAME(FogCoordfvEXT)(const GLfloat * coord)
    DISPATCH(FogCoordfvEXT, (coord), (F, "glFogCoordfvEXT(%p);\n", (const void *) coord));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_607)(GLenum mode);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_608)(GLenum mode);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_607)(GLenum mode)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_608)(GLenum mode)
 {
    DISPATCH(PixelTexGenSGIX, (mode), (F, "glPixelTexGenSGIX(0x%x);\n", mode));
 }
@@ -4427,9 +4432,9 @@ KEYWORD1 void KEYWORD2 NAME(BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfac
    DISPATCH(BlendFuncSeparateEXT, (sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha), (F, "glBlendFuncSeparateEXT(0x%x, 0x%x, 0x%x, 0x%x);\n", sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_608)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_609)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_608)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_609)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
 {
    DISPATCH(BlendFuncSeparateEXT, (sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha), (F, "glBlendFuncSeparateINGR(0x%x, 0x%x, 0x%x, 0x%x);\n", sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha));
 }
@@ -4794,65 +4799,65 @@ KEYWORD1 void KEYWORD2 NAME(WindowPos4svMESA)(const GLshort * v)
    DISPATCH(WindowPos4svMESA, (v), (F, "glWindowPos4svMESA(%p);\n", (const void *) v));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_649)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_650)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_649)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_650)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride)
 {
    DISPATCH(MultiModeDrawArraysIBM, (mode, first, count, primcount, modestride), (F, "glMultiModeDrawArraysIBM(%p, %p, %p, %d, %d);\n", (const void *) mode, (const void *) first, (const void *) count, primcount, modestride));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_650)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_651)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_650)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_651)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride)
 {
    DISPATCH(MultiModeDrawElementsIBM, (mode, count, type, indices, primcount, modestride), (F, "glMultiModeDrawElementsIBM(%p, %p, 0x%x, %p, %d, %d);\n", (const void *) mode, (const void *) count, type, (const void *) indices, primcount, modestride));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_651)(GLsizei n, const GLuint * fences);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_652)(GLsizei n, const GLuint * fences);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_651)(GLsizei n, const GLuint * fences)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_652)(GLsizei n, const GLuint * fences)
 {
    DISPATCH(DeleteFencesNV, (n, fences), (F, "glDeleteFencesNV(%d, %p);\n", n, (const void *) fences));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_652)(GLuint fence);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_653)(GLuint fence);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_652)(GLuint fence)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_653)(GLuint fence)
 {
    DISPATCH(FinishFenceNV, (fence), (F, "glFinishFenceNV(%d);\n", fence));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_653)(GLsizei n, GLuint * fences);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_654)(GLsizei n, GLuint * fences);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_653)(GLsizei n, GLuint * fences)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_654)(GLsizei n, GLuint * fences)
 {
    DISPATCH(GenFencesNV, (n, fences), (F, "glGenFencesNV(%d, %p);\n", n, (const void *) fences));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_654)(GLuint fence, GLenum pname, GLint * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_655)(GLuint fence, GLenum pname, GLint * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_654)(GLuint fence, GLenum pname, GLint * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_655)(GLuint fence, GLenum pname, GLint * params)
 {
    DISPATCH(GetFenceivNV, (fence, pname, params), (F, "glGetFenceivNV(%d, 0x%x, %p);\n", fence, pname, (const void *) params));
 }
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_655)(GLuint fence);
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_656)(GLuint fence);
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_655)(GLuint fence)
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_656)(GLuint fence)
 {
    RETURN_DISPATCH(IsFenceNV, (fence), (F, "glIsFenceNV(%d);\n", fence));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_656)(GLuint fence, GLenum condition);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_657)(GLuint fence, GLenum condition);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_656)(GLuint fence, GLenum condition)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_657)(GLuint fence, GLenum condition)
 {
    DISPATCH(SetFenceNV, (fence, condition), (F, "glSetFenceNV(%d, 0x%x);\n", fence, condition));
 }
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_657)(GLuint fence);
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_658)(GLuint fence);
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_657)(GLuint fence)
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_658)(GLuint fence)
 {
    RETURN_DISPATCH(TestFenceNV, (fence), (F, "glTestFenceNV(%d);\n", fence));
 }
@@ -5297,37 +5302,37 @@ KEYWORD1 void KEYWORD2 NAME(PointParameterivNV)(GLenum pname, const GLint * para
    DISPATCH(PointParameterivNV, (pname, params), (F, "glPointParameterivNV(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_738)(GLenum face);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_739)(GLenum face);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_738)(GLenum face)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_739)(GLenum face)
 {
    DISPATCH(ActiveStencilFaceEXT, (face), (F, "glActiveStencilFaceEXT(0x%x);\n", face));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_739)(GLuint array);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_740)(GLuint array);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_739)(GLuint array)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_740)(GLuint array)
 {
    DISPATCH(BindVertexArrayAPPLE, (array), (F, "glBindVertexArrayAPPLE(%d);\n", array));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_740)(GLsizei n, const GLuint * arrays);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_741)(GLsizei n, const GLuint * arrays);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_740)(GLsizei n, const GLuint * arrays)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_741)(GLsizei n, const GLuint * arrays)
 {
    DISPATCH(DeleteVertexArraysAPPLE, (n, arrays), (F, "glDeleteVertexArraysAPPLE(%d, %p);\n", n, (const void *) arrays));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_741)(GLsizei n, GLuint * arrays);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_742)(GLsizei n, GLuint * arrays);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_741)(GLsizei n, GLuint * arrays)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_742)(GLsizei n, GLuint * arrays)
 {
    DISPATCH(GenVertexArraysAPPLE, (n, arrays), (F, "glGenVertexArraysAPPLE(%d, %p);\n", n, (const void *) arrays));
 }
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_742)(GLuint array);
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_743)(GLuint array);
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_742)(GLuint array)
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_743)(GLuint array)
 {
    RETURN_DISPATCH(IsVertexArrayAPPLE, (array), (F, "glIsVertexArrayAPPLE(%d);\n", array));
 }
@@ -5362,9 +5367,9 @@ KEYWORD1 void KEYWORD2 NAME(ProgramNamedParameter4fvNV)(GLuint id, GLsizei len,
    DISPATCH(ProgramNamedParameter4fvNV, (id, len, name, v), (F, "glProgramNamedParameter4fvNV(%d, %d, %p, %p);\n", id, len, (const void *) name, (const void *) v));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_749)(GLclampd zmin, GLclampd zmax);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_750)(GLclampd zmin, GLclampd zmax);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_749)(GLclampd zmin, GLclampd zmax)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_750)(GLclampd zmin, GLclampd zmax)
 {
    DISPATCH(DepthBoundsEXT, (zmin, zmax), (F, "glDepthBoundsEXT(%f, %f);\n", zmin, zmax));
 }
@@ -5374,9 +5379,9 @@ KEYWORD1 void KEYWORD2 NAME(BlendEquationSeparate)(GLenum modeRGB, GLenum modeA)
    DISPATCH(BlendEquationSeparateEXT, (modeRGB, modeA), (F, "glBlendEquationSeparate(0x%x, 0x%x);\n", modeRGB, modeA));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_750)(GLenum modeRGB, GLenum modeA);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_751)(GLenum modeRGB, GLenum modeA);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_750)(GLenum modeRGB, GLenum modeA)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_751)(GLenum modeRGB, GLenum modeA)
 {
    DISPATCH(BlendEquationSeparateEXT, (modeRGB, modeA), (F, "glBlendEquationSeparateEXT(0x%x, 0x%x);\n", modeRGB, modeA));
 }
@@ -5556,9 +5561,9 @@ KEYWORD1 void KEYWORD2 NAME(BlitFramebuffer)(GLint srcX0, GLint srcY0, GLint src
    DISPATCH(BlitFramebufferEXT, (srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter), (F, "glBlitFramebuffer(%d, %d, %d, %d, %d, %d, %d, %d, %d, 0x%x);\n", srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_768)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_769)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_768)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_769)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
 {
    DISPATCH(BlitFramebufferEXT, (srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter), (F, "glBlitFramebufferEXT(%d, %d, %d, %d, %d, %d, %d, %d, %d, 0x%x);\n", srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter));
 }
@@ -5573,37 +5578,37 @@ KEYWORD1 void KEYWORD2 NAME(FramebufferTextureLayerEXT)(GLenum target, GLenum at
    DISPATCH(FramebufferTextureLayerEXT, (target, attachment, texture, level, layer), (F, "glFramebufferTextureLayerEXT(0x%x, 0x%x, %d, %d, %d);\n", target, attachment, texture, level, layer));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_770)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_771)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_770)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_771)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask)
 {
    DISPATCH(StencilFuncSeparateATI, (frontfunc, backfunc, ref, mask), (F, "glStencilFuncSeparateATI(0x%x, 0x%x, %d, %d);\n", frontfunc, backfunc, ref, mask));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_771)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_772)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_771)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_772)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
 {
    DISPATCH(ProgramEnvParameters4fvEXT, (target, index, count, params), (F, "glProgramEnvParameters4fvEXT(0x%x, %d, %d, %p);\n", target, index, count, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_772)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_773)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_772)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_773)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
 {
    DISPATCH(ProgramLocalParameters4fvEXT, (target, index, count, params), (F, "glProgramLocalParameters4fvEXT(0x%x, %d, %d, %p);\n", target, index, count, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_773)(GLuint id, GLenum pname, GLint64EXT * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_774)(GLuint id, GLenum pname, GLint64EXT * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_773)(GLuint id, GLenum pname, GLint64EXT * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_774)(GLuint id, GLenum pname, GLint64EXT * params)
 {
    DISPATCH(GetQueryObjecti64vEXT, (id, pname, params), (F, "glGetQueryObjecti64vEXT(%d, 0x%x, %p);\n", id, pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_774)(GLuint id, GLenum pname, GLuint64EXT * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_775)(GLuint id, GLenum pname, GLuint64EXT * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_774)(GLuint id, GLenum pname, GLuint64EXT * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_775)(GLuint id, GLenum pname, GLuint64EXT * params)
 {
    DISPATCH(GetQueryObjectui64vEXT, (id, pname, params), (F, "glGetQueryObjectui64vEXT(%d, 0x%x, %p);\n", id, pname, (const void *) params));
 }
@@ -6184,8 +6189,8 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(GetAttribLocationARB),
    TABLE_ENTRY(DrawBuffersARB),
    TABLE_ENTRY(RenderbufferStorageMultisample),
+   TABLE_ENTRY(CopyBufferSubData),
    TABLE_ENTRY(PolygonOffsetEXT),
-   TABLE_ENTRY(_dispatch_stub_563),
    TABLE_ENTRY(_dispatch_stub_564),
    TABLE_ENTRY(_dispatch_stub_565),
    TABLE_ENTRY(_dispatch_stub_566),
@@ -6193,6 +6198,7 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(_dispatch_stub_568),
    TABLE_ENTRY(_dispatch_stub_569),
    TABLE_ENTRY(_dispatch_stub_570),
+   TABLE_ENTRY(_dispatch_stub_571),
    TABLE_ENTRY(ColorPointerEXT),
    TABLE_ENTRY(EdgeFlagPointerEXT),
    TABLE_ENTRY(IndexPointerEXT),
@@ -6203,8 +6209,8 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(PointParameterfvEXT),
    TABLE_ENTRY(LockArraysEXT),
    TABLE_ENTRY(UnlockArraysEXT),
-   TABLE_ENTRY(_dispatch_stub_581),
    TABLE_ENTRY(_dispatch_stub_582),
+   TABLE_ENTRY(_dispatch_stub_583),
    TABLE_ENTRY(SecondaryColor3bEXT),
    TABLE_ENTRY(SecondaryColor3bvEXT),
    TABLE_ENTRY(SecondaryColor3dEXT),
@@ -6229,7 +6235,7 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(FogCoorddvEXT),
    TABLE_ENTRY(FogCoordfEXT),
    TABLE_ENTRY(FogCoordfvEXT),
-   TABLE_ENTRY(_dispatch_stub_607),
+   TABLE_ENTRY(_dispatch_stub_608),
    TABLE_ENTRY(BlendFuncSeparateEXT),
    TABLE_ENTRY(FlushVertexArrayRangeNV),
    TABLE_ENTRY(VertexArrayRangeNV),
@@ -6271,7 +6277,6 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(WindowPos4ivMESA),
    TABLE_ENTRY(WindowPos4sMESA),
    TABLE_ENTRY(WindowPos4svMESA),
-   TABLE_ENTRY(_dispatch_stub_649),
    TABLE_ENTRY(_dispatch_stub_650),
    TABLE_ENTRY(_dispatch_stub_651),
    TABLE_ENTRY(_dispatch_stub_652),
@@ -6280,6 +6285,7 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(_dispatch_stub_655),
    TABLE_ENTRY(_dispatch_stub_656),
    TABLE_ENTRY(_dispatch_stub_657),
+   TABLE_ENTRY(_dispatch_stub_658),
    TABLE_ENTRY(AreProgramsResidentNV),
    TABLE_ENTRY(BindProgramNV),
    TABLE_ENTRY(DeleteProgramsNV),
@@ -6360,19 +6366,19 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(SetFragmentShaderConstantATI),
    TABLE_ENTRY(PointParameteriNV),
    TABLE_ENTRY(PointParameterivNV),
-   TABLE_ENTRY(_dispatch_stub_738),
    TABLE_ENTRY(_dispatch_stub_739),
    TABLE_ENTRY(_dispatch_stub_740),
    TABLE_ENTRY(_dispatch_stub_741),
    TABLE_ENTRY(_dispatch_stub_742),
+   TABLE_ENTRY(_dispatch_stub_743),
    TABLE_ENTRY(GetProgramNamedParameterdvNV),
    TABLE_ENTRY(GetProgramNamedParameterfvNV),
    TABLE_ENTRY(ProgramNamedParameter4dNV),
    TABLE_ENTRY(ProgramNamedParameter4dvNV),
    TABLE_ENTRY(ProgramNamedParameter4fNV),
    TABLE_ENTRY(ProgramNamedParameter4fvNV),
-   TABLE_ENTRY(_dispatch_stub_749),
    TABLE_ENTRY(_dispatch_stub_750),
+   TABLE_ENTRY(_dispatch_stub_751),
    TABLE_ENTRY(BindFramebufferEXT),
    TABLE_ENTRY(BindRenderbufferEXT),
    TABLE_ENTRY(CheckFramebufferStatusEXT),
@@ -6390,13 +6396,13 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(IsFramebufferEXT),
    TABLE_ENTRY(IsRenderbufferEXT),
    TABLE_ENTRY(RenderbufferStorageEXT),
-   TABLE_ENTRY(_dispatch_stub_768),
+   TABLE_ENTRY(_dispatch_stub_769),
    TABLE_ENTRY(FramebufferTextureLayerEXT),
-   TABLE_ENTRY(_dispatch_stub_770),
    TABLE_ENTRY(_dispatch_stub_771),
    TABLE_ENTRY(_dispatch_stub_772),
    TABLE_ENTRY(_dispatch_stub_773),
    TABLE_ENTRY(_dispatch_stub_774),
+   TABLE_ENTRY(_dispatch_stub_775),
    /* A whole bunch of no-op functions.  These might be called
     * when someone tries to call a dynamically-registered
     * extension function without a current rendering context.
diff --git a/src/mesa/glapi/glprocs.h b/src/mesa/glapi/glprocs.h
index 680893cfc4..648609a35d 100644
--- a/src/mesa/glapi/glprocs.h
+++ b/src/mesa/glapi/glprocs.h
@@ -614,6 +614,7 @@ static const char gl_string_table[] =
     "glGetAttribLocationARB\0"
     "glDrawBuffersARB\0"
     "glRenderbufferStorageMultisample\0"
+    "glCopyBufferSubData\0"
     "glPolygonOffsetEXT\0"
     "glGetPixelTexGenParameterfvSGIS\0"
     "glGetPixelTexGenParameterivSGIS\0"
@@ -1142,7 +1143,6 @@ static const char gl_string_table[] =
 #define gl_dispatch_stub_364 mgl_dispatch_stub_364
 #define gl_dispatch_stub_365 mgl_dispatch_stub_365
 #define gl_dispatch_stub_366 mgl_dispatch_stub_366
-#define gl_dispatch_stub_563 mgl_dispatch_stub_563
 #define gl_dispatch_stub_564 mgl_dispatch_stub_564
 #define gl_dispatch_stub_565 mgl_dispatch_stub_565
 #define gl_dispatch_stub_566 mgl_dispatch_stub_566
@@ -1150,10 +1150,10 @@ static const char gl_string_table[] =
 #define gl_dispatch_stub_568 mgl_dispatch_stub_568
 #define gl_dispatch_stub_569 mgl_dispatch_stub_569
 #define gl_dispatch_stub_570 mgl_dispatch_stub_570
-#define gl_dispatch_stub_581 mgl_dispatch_stub_581
+#define gl_dispatch_stub_571 mgl_dispatch_stub_571
 #define gl_dispatch_stub_582 mgl_dispatch_stub_582
-#define gl_dispatch_stub_607 mgl_dispatch_stub_607
-#define gl_dispatch_stub_649 mgl_dispatch_stub_649
+#define gl_dispatch_stub_583 mgl_dispatch_stub_583
+#define gl_dispatch_stub_608 mgl_dispatch_stub_608
 #define gl_dispatch_stub_650 mgl_dispatch_stub_650
 #define gl_dispatch_stub_651 mgl_dispatch_stub_651
 #define gl_dispatch_stub_652 mgl_dispatch_stub_652
@@ -1162,19 +1162,20 @@ static const char gl_string_table[] =
 #define gl_dispatch_stub_655 mgl_dispatch_stub_655
 #define gl_dispatch_stub_656 mgl_dispatch_stub_656
 #define gl_dispatch_stub_657 mgl_dispatch_stub_657
-#define gl_dispatch_stub_738 mgl_dispatch_stub_738
+#define gl_dispatch_stub_658 mgl_dispatch_stub_658
 #define gl_dispatch_stub_739 mgl_dispatch_stub_739
 #define gl_dispatch_stub_740 mgl_dispatch_stub_740
 #define gl_dispatch_stub_741 mgl_dispatch_stub_741
 #define gl_dispatch_stub_742 mgl_dispatch_stub_742
-#define gl_dispatch_stub_749 mgl_dispatch_stub_749
+#define gl_dispatch_stub_743 mgl_dispatch_stub_743
 #define gl_dispatch_stub_750 mgl_dispatch_stub_750
-#define gl_dispatch_stub_768 mgl_dispatch_stub_768
-#define gl_dispatch_stub_770 mgl_dispatch_stub_770
+#define gl_dispatch_stub_751 mgl_dispatch_stub_751
+#define gl_dispatch_stub_769 mgl_dispatch_stub_769
 #define gl_dispatch_stub_771 mgl_dispatch_stub_771
 #define gl_dispatch_stub_772 mgl_dispatch_stub_772
 #define gl_dispatch_stub_773 mgl_dispatch_stub_773
 #define gl_dispatch_stub_774 mgl_dispatch_stub_774
+#define gl_dispatch_stub_775 mgl_dispatch_stub_775
 #endif /* USE_MGL_NAMESPACE */
 
 
@@ -1192,39 +1193,39 @@ void GLAPIENTRY gl_dispatch_stub_363(GLenum target, GLenum pname, GLint * params
 void GLAPIENTRY gl_dispatch_stub_364(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid * values);
 void GLAPIENTRY gl_dispatch_stub_365(GLenum target, GLenum pname, GLfloat * params);
 void GLAPIENTRY gl_dispatch_stub_366(GLenum target, GLenum pname, GLint * params);
-void GLAPIENTRY gl_dispatch_stub_563(GLenum pname, GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_564(GLenum pname, GLint * params);
-void GLAPIENTRY gl_dispatch_stub_565(GLenum pname, GLfloat param);
-void GLAPIENTRY gl_dispatch_stub_566(GLenum pname, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_567(GLenum pname, GLint param);
-void GLAPIENTRY gl_dispatch_stub_568(GLenum pname, const GLint * params);
-void GLAPIENTRY gl_dispatch_stub_569(GLclampf value, GLboolean invert);
-void GLAPIENTRY gl_dispatch_stub_570(GLenum pattern);
-void GLAPIENTRY gl_dispatch_stub_581(GLenum pname, GLdouble * params);
-void GLAPIENTRY gl_dispatch_stub_582(GLenum pname, GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_607(GLenum mode);
-void GLAPIENTRY gl_dispatch_stub_649(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
-void GLAPIENTRY gl_dispatch_stub_650(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
-void GLAPIENTRY gl_dispatch_stub_651(GLsizei n, const GLuint * fences);
-void GLAPIENTRY gl_dispatch_stub_652(GLuint fence);
-void GLAPIENTRY gl_dispatch_stub_653(GLsizei n, GLuint * fences);
-void GLAPIENTRY gl_dispatch_stub_654(GLuint fence, GLenum pname, GLint * params);
-GLboolean GLAPIENTRY gl_dispatch_stub_655(GLuint fence);
-void GLAPIENTRY gl_dispatch_stub_656(GLuint fence, GLenum condition);
-GLboolean GLAPIENTRY gl_dispatch_stub_657(GLuint fence);
-void GLAPIENTRY gl_dispatch_stub_738(GLenum face);
-void GLAPIENTRY gl_dispatch_stub_739(GLuint array);
-void GLAPIENTRY gl_dispatch_stub_740(GLsizei n, const GLuint * arrays);
-void GLAPIENTRY gl_dispatch_stub_741(GLsizei n, GLuint * arrays);
-GLboolean GLAPIENTRY gl_dispatch_stub_742(GLuint array);
-void GLAPIENTRY gl_dispatch_stub_749(GLclampd zmin, GLclampd zmax);
-void GLAPIENTRY gl_dispatch_stub_750(GLenum modeRGB, GLenum modeA);
-void GLAPIENTRY gl_dispatch_stub_768(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-void GLAPIENTRY gl_dispatch_stub_770(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-void GLAPIENTRY gl_dispatch_stub_771(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_564(GLenum pname, GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_565(GLenum pname, GLint * params);
+void GLAPIENTRY gl_dispatch_stub_566(GLenum pname, GLfloat param);
+void GLAPIENTRY gl_dispatch_stub_567(GLenum pname, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_568(GLenum pname, GLint param);
+void GLAPIENTRY gl_dispatch_stub_569(GLenum pname, const GLint * params);
+void GLAPIENTRY gl_dispatch_stub_570(GLclampf value, GLboolean invert);
+void GLAPIENTRY gl_dispatch_stub_571(GLenum pattern);
+void GLAPIENTRY gl_dispatch_stub_582(GLenum pname, GLdouble * params);
+void GLAPIENTRY gl_dispatch_stub_583(GLenum pname, GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_608(GLenum mode);
+void GLAPIENTRY gl_dispatch_stub_650(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
+void GLAPIENTRY gl_dispatch_stub_651(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
+void GLAPIENTRY gl_dispatch_stub_652(GLsizei n, const GLuint * fences);
+void GLAPIENTRY gl_dispatch_stub_653(GLuint fence);
+void GLAPIENTRY gl_dispatch_stub_654(GLsizei n, GLuint * fences);
+void GLAPIENTRY gl_dispatch_stub_655(GLuint fence, GLenum pname, GLint * params);
+GLboolean GLAPIENTRY gl_dispatch_stub_656(GLuint fence);
+void GLAPIENTRY gl_dispatch_stub_657(GLuint fence, GLenum condition);
+GLboolean GLAPIENTRY gl_dispatch_stub_658(GLuint fence);
+void GLAPIENTRY gl_dispatch_stub_739(GLenum face);
+void GLAPIENTRY gl_dispatch_stub_740(GLuint array);
+void GLAPIENTRY gl_dispatch_stub_741(GLsizei n, const GLuint * arrays);
+void GLAPIENTRY gl_dispatch_stub_742(GLsizei n, GLuint * arrays);
+GLboolean GLAPIENTRY gl_dispatch_stub_743(GLuint array);
+void GLAPIENTRY gl_dispatch_stub_750(GLclampd zmin, GLclampd zmax);
+void GLAPIENTRY gl_dispatch_stub_751(GLenum modeRGB, GLenum modeA);
+void GLAPIENTRY gl_dispatch_stub_769(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+void GLAPIENTRY gl_dispatch_stub_771(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
 void GLAPIENTRY gl_dispatch_stub_772(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_773(GLuint id, GLenum pname, GLint64EXT * params);
-void GLAPIENTRY gl_dispatch_stub_774(GLuint id, GLenum pname, GLuint64EXT * params);
+void GLAPIENTRY gl_dispatch_stub_773(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_774(GLuint id, GLenum pname, GLint64EXT * params);
+void GLAPIENTRY gl_dispatch_stub_775(GLuint id, GLenum pname, GLuint64EXT * params);
 #endif /* defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING) */
 
 static const glprocs_table_t static_functions[] = {
@@ -1790,517 +1791,518 @@ static const glprocs_table_t static_functions[] = {
     NAME_FUNC_OFFSET( 8911, glGetAttribLocationARB, glGetAttribLocationARB, NULL, _gloffset_GetAttribLocationARB),
     NAME_FUNC_OFFSET( 8934, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
     NAME_FUNC_OFFSET( 8951, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, _gloffset_RenderbufferStorageMultisample),
-    NAME_FUNC_OFFSET( 8984, glPolygonOffsetEXT, glPolygonOffsetEXT, NULL, _gloffset_PolygonOffsetEXT),
-    NAME_FUNC_OFFSET( 9003, gl_dispatch_stub_563, gl_dispatch_stub_563, NULL, _gloffset_GetPixelTexGenParameterfvSGIS),
-    NAME_FUNC_OFFSET( 9035, gl_dispatch_stub_564, gl_dispatch_stub_564, NULL, _gloffset_GetPixelTexGenParameterivSGIS),
-    NAME_FUNC_OFFSET( 9067, gl_dispatch_stub_565, gl_dispatch_stub_565, NULL, _gloffset_PixelTexGenParameterfSGIS),
-    NAME_FUNC_OFFSET( 9095, gl_dispatch_stub_566, gl_dispatch_stub_566, NULL, _gloffset_PixelTexGenParameterfvSGIS),
-    NAME_FUNC_OFFSET( 9124, gl_dispatch_stub_567, gl_dispatch_stub_567, NULL, _gloffset_PixelTexGenParameteriSGIS),
-    NAME_FUNC_OFFSET( 9152, gl_dispatch_stub_568, gl_dispatch_stub_568, NULL, _gloffset_PixelTexGenParameterivSGIS),
-    NAME_FUNC_OFFSET( 9181, gl_dispatch_stub_569, gl_dispatch_stub_569, NULL, _gloffset_SampleMaskSGIS),
-    NAME_FUNC_OFFSET( 9198, gl_dispatch_stub_570, gl_dispatch_stub_570, NULL, _gloffset_SamplePatternSGIS),
-    NAME_FUNC_OFFSET( 9218, glColorPointerEXT, glColorPointerEXT, NULL, _gloffset_ColorPointerEXT),
-    NAME_FUNC_OFFSET( 9236, glEdgeFlagPointerEXT, glEdgeFlagPointerEXT, NULL, _gloffset_EdgeFlagPointerEXT),
-    NAME_FUNC_OFFSET( 9257, glIndexPointerEXT, glIndexPointerEXT, NULL, _gloffset_IndexPointerEXT),
-    NAME_FUNC_OFFSET( 9275, glNormalPointerEXT, glNormalPointerEXT, NULL, _gloffset_NormalPointerEXT),
-    NAME_FUNC_OFFSET( 9294, glTexCoordPointerEXT, glTexCoordPointerEXT, NULL, _gloffset_TexCoordPointerEXT),
-    NAME_FUNC_OFFSET( 9315, glVertexPointerEXT, glVertexPointerEXT, NULL, _gloffset_VertexPointerEXT),
-    NAME_FUNC_OFFSET( 9334, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET( 9355, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET( 9377, glLockArraysEXT, glLockArraysEXT, NULL, _gloffset_LockArraysEXT),
-    NAME_FUNC_OFFSET( 9393, glUnlockArraysEXT, glUnlockArraysEXT, NULL, _gloffset_UnlockArraysEXT),
-    NAME_FUNC_OFFSET( 9411, gl_dispatch_stub_581, gl_dispatch_stub_581, NULL, _gloffset_CullParameterdvEXT),
-    NAME_FUNC_OFFSET( 9432, gl_dispatch_stub_582, gl_dispatch_stub_582, NULL, _gloffset_CullParameterfvEXT),
-    NAME_FUNC_OFFSET( 9453, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
-    NAME_FUNC_OFFSET( 9475, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
-    NAME_FUNC_OFFSET( 9498, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
-    NAME_FUNC_OFFSET( 9520, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
-    NAME_FUNC_OFFSET( 9543, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
-    NAME_FUNC_OFFSET( 9565, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
-    NAME_FUNC_OFFSET( 9588, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
-    NAME_FUNC_OFFSET( 9610, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
-    NAME_FUNC_OFFSET( 9633, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
-    NAME_FUNC_OFFSET( 9655, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
-    NAME_FUNC_OFFSET( 9678, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
-    NAME_FUNC_OFFSET( 9701, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
-    NAME_FUNC_OFFSET( 9725, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
-    NAME_FUNC_OFFSET( 9748, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
-    NAME_FUNC_OFFSET( 9772, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
-    NAME_FUNC_OFFSET( 9795, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
-    NAME_FUNC_OFFSET( 9819, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
-    NAME_FUNC_OFFSET( 9846, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
-    NAME_FUNC_OFFSET( 9867, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
-    NAME_FUNC_OFFSET( 9890, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
-    NAME_FUNC_OFFSET( 9911, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
-    NAME_FUNC_OFFSET( 9926, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
-    NAME_FUNC_OFFSET( 9942, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
-    NAME_FUNC_OFFSET( 9957, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
-    NAME_FUNC_OFFSET( 9973, gl_dispatch_stub_607, gl_dispatch_stub_607, NULL, _gloffset_PixelTexGenSGIX),
-    NAME_FUNC_OFFSET( 9991, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
-    NAME_FUNC_OFFSET(10014, glFlushVertexArrayRangeNV, glFlushVertexArrayRangeNV, NULL, _gloffset_FlushVertexArrayRangeNV),
-    NAME_FUNC_OFFSET(10040, glVertexArrayRangeNV, glVertexArrayRangeNV, NULL, _gloffset_VertexArrayRangeNV),
-    NAME_FUNC_OFFSET(10061, glCombinerInputNV, glCombinerInputNV, NULL, _gloffset_CombinerInputNV),
-    NAME_FUNC_OFFSET(10079, glCombinerOutputNV, glCombinerOutputNV, NULL, _gloffset_CombinerOutputNV),
-    NAME_FUNC_OFFSET(10098, glCombinerParameterfNV, glCombinerParameterfNV, NULL, _gloffset_CombinerParameterfNV),
-    NAME_FUNC_OFFSET(10121, glCombinerParameterfvNV, glCombinerParameterfvNV, NULL, _gloffset_CombinerParameterfvNV),
-    NAME_FUNC_OFFSET(10145, glCombinerParameteriNV, glCombinerParameteriNV, NULL, _gloffset_CombinerParameteriNV),
-    NAME_FUNC_OFFSET(10168, glCombinerParameterivNV, glCombinerParameterivNV, NULL, _gloffset_CombinerParameterivNV),
-    NAME_FUNC_OFFSET(10192, glFinalCombinerInputNV, glFinalCombinerInputNV, NULL, _gloffset_FinalCombinerInputNV),
-    NAME_FUNC_OFFSET(10215, glGetCombinerInputParameterfvNV, glGetCombinerInputParameterfvNV, NULL, _gloffset_GetCombinerInputParameterfvNV),
-    NAME_FUNC_OFFSET(10247, glGetCombinerInputParameterivNV, glGetCombinerInputParameterivNV, NULL, _gloffset_GetCombinerInputParameterivNV),
-    NAME_FUNC_OFFSET(10279, glGetCombinerOutputParameterfvNV, glGetCombinerOutputParameterfvNV, NULL, _gloffset_GetCombinerOutputParameterfvNV),
-    NAME_FUNC_OFFSET(10312, glGetCombinerOutputParameterivNV, glGetCombinerOutputParameterivNV, NULL, _gloffset_GetCombinerOutputParameterivNV),
-    NAME_FUNC_OFFSET(10345, glGetFinalCombinerInputParameterfvNV, glGetFinalCombinerInputParameterfvNV, NULL, _gloffset_GetFinalCombinerInputParameterfvNV),
-    NAME_FUNC_OFFSET(10382, glGetFinalCombinerInputParameterivNV, glGetFinalCombinerInputParameterivNV, NULL, _gloffset_GetFinalCombinerInputParameterivNV),
-    NAME_FUNC_OFFSET(10419, glResizeBuffersMESA, glResizeBuffersMESA, NULL, _gloffset_ResizeBuffersMESA),
-    NAME_FUNC_OFFSET(10439, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
-    NAME_FUNC_OFFSET(10457, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
-    NAME_FUNC_OFFSET(10476, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
-    NAME_FUNC_OFFSET(10494, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
-    NAME_FUNC_OFFSET(10513, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
-    NAME_FUNC_OFFSET(10531, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
-    NAME_FUNC_OFFSET(10550, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
-    NAME_FUNC_OFFSET(10568, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
-    NAME_FUNC_OFFSET(10587, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
-    NAME_FUNC_OFFSET(10605, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
-    NAME_FUNC_OFFSET(10624, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
-    NAME_FUNC_OFFSET(10642, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
-    NAME_FUNC_OFFSET(10661, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
-    NAME_FUNC_OFFSET(10679, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
-    NAME_FUNC_OFFSET(10698, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
-    NAME_FUNC_OFFSET(10716, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
-    NAME_FUNC_OFFSET(10735, glWindowPos4dMESA, glWindowPos4dMESA, NULL, _gloffset_WindowPos4dMESA),
-    NAME_FUNC_OFFSET(10753, glWindowPos4dvMESA, glWindowPos4dvMESA, NULL, _gloffset_WindowPos4dvMESA),
-    NAME_FUNC_OFFSET(10772, glWindowPos4fMESA, glWindowPos4fMESA, NULL, _gloffset_WindowPos4fMESA),
-    NAME_FUNC_OFFSET(10790, glWindowPos4fvMESA, glWindowPos4fvMESA, NULL, _gloffset_WindowPos4fvMESA),
-    NAME_FUNC_OFFSET(10809, glWindowPos4iMESA, glWindowPos4iMESA, NULL, _gloffset_WindowPos4iMESA),
-    NAME_FUNC_OFFSET(10827, glWindowPos4ivMESA, glWindowPos4ivMESA, NULL, _gloffset_WindowPos4ivMESA),
-    NAME_FUNC_OFFSET(10846, glWindowPos4sMESA, glWindowPos4sMESA, NULL, _gloffset_WindowPos4sMESA),
-    NAME_FUNC_OFFSET(10864, glWindowPos4svMESA, glWindowPos4svMESA, NULL, _gloffset_WindowPos4svMESA),
-    NAME_FUNC_OFFSET(10883, gl_dispatch_stub_649, gl_dispatch_stub_649, NULL, _gloffset_MultiModeDrawArraysIBM),
-    NAME_FUNC_OFFSET(10908, gl_dispatch_stub_650, gl_dispatch_stub_650, NULL, _gloffset_MultiModeDrawElementsIBM),
-    NAME_FUNC_OFFSET(10935, gl_dispatch_stub_651, gl_dispatch_stub_651, NULL, _gloffset_DeleteFencesNV),
-    NAME_FUNC_OFFSET(10952, gl_dispatch_stub_652, gl_dispatch_stub_652, NULL, _gloffset_FinishFenceNV),
-    NAME_FUNC_OFFSET(10968, gl_dispatch_stub_653, gl_dispatch_stub_653, NULL, _gloffset_GenFencesNV),
-    NAME_FUNC_OFFSET(10982, gl_dispatch_stub_654, gl_dispatch_stub_654, NULL, _gloffset_GetFenceivNV),
-    NAME_FUNC_OFFSET(10997, gl_dispatch_stub_655, gl_dispatch_stub_655, NULL, _gloffset_IsFenceNV),
-    NAME_FUNC_OFFSET(11009, gl_dispatch_stub_656, gl_dispatch_stub_656, NULL, _gloffset_SetFenceNV),
-    NAME_FUNC_OFFSET(11022, gl_dispatch_stub_657, gl_dispatch_stub_657, NULL, _gloffset_TestFenceNV),
-    NAME_FUNC_OFFSET(11036, glAreProgramsResidentNV, glAreProgramsResidentNV, NULL, _gloffset_AreProgramsResidentNV),
-    NAME_FUNC_OFFSET(11060, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
-    NAME_FUNC_OFFSET(11076, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
-    NAME_FUNC_OFFSET(11095, glExecuteProgramNV, glExecuteProgramNV, NULL, _gloffset_ExecuteProgramNV),
-    NAME_FUNC_OFFSET(11114, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
-    NAME_FUNC_OFFSET(11130, glGetProgramParameterdvNV, glGetProgramParameterdvNV, NULL, _gloffset_GetProgramParameterdvNV),
-    NAME_FUNC_OFFSET(11156, glGetProgramParameterfvNV, glGetProgramParameterfvNV, NULL, _gloffset_GetProgramParameterfvNV),
-    NAME_FUNC_OFFSET(11182, glGetProgramStringNV, glGetProgramStringNV, NULL, _gloffset_GetProgramStringNV),
-    NAME_FUNC_OFFSET(11203, glGetProgramivNV, glGetProgramivNV, NULL, _gloffset_GetProgramivNV),
-    NAME_FUNC_OFFSET(11220, glGetTrackMatrixivNV, glGetTrackMatrixivNV, NULL, _gloffset_GetTrackMatrixivNV),
-    NAME_FUNC_OFFSET(11241, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
-    NAME_FUNC_OFFSET(11269, glGetVertexAttribdvNV, glGetVertexAttribdvNV, NULL, _gloffset_GetVertexAttribdvNV),
-    NAME_FUNC_OFFSET(11291, glGetVertexAttribfvNV, glGetVertexAttribfvNV, NULL, _gloffset_GetVertexAttribfvNV),
-    NAME_FUNC_OFFSET(11313, glGetVertexAttribivNV, glGetVertexAttribivNV, NULL, _gloffset_GetVertexAttribivNV),
-    NAME_FUNC_OFFSET(11335, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
-    NAME_FUNC_OFFSET(11349, glLoadProgramNV, glLoadProgramNV, NULL, _gloffset_LoadProgramNV),
-    NAME_FUNC_OFFSET(11365, glProgramParameters4dvNV, glProgramParameters4dvNV, NULL, _gloffset_ProgramParameters4dvNV),
-    NAME_FUNC_OFFSET(11390, glProgramParameters4fvNV, glProgramParameters4fvNV, NULL, _gloffset_ProgramParameters4fvNV),
-    NAME_FUNC_OFFSET(11415, glRequestResidentProgramsNV, glRequestResidentProgramsNV, NULL, _gloffset_RequestResidentProgramsNV),
-    NAME_FUNC_OFFSET(11443, glTrackMatrixNV, glTrackMatrixNV, NULL, _gloffset_TrackMatrixNV),
-    NAME_FUNC_OFFSET(11459, glVertexAttrib1dNV, glVertexAttrib1dNV, NULL, _gloffset_VertexAttrib1dNV),
-    NAME_FUNC_OFFSET(11478, glVertexAttrib1dvNV, glVertexAttrib1dvNV, NULL, _gloffset_VertexAttrib1dvNV),
-    NAME_FUNC_OFFSET(11498, glVertexAttrib1fNV, glVertexAttrib1fNV, NULL, _gloffset_VertexAttrib1fNV),
-    NAME_FUNC_OFFSET(11517, glVertexAttrib1fvNV, glVertexAttrib1fvNV, NULL, _gloffset_VertexAttrib1fvNV),
-    NAME_FUNC_OFFSET(11537, glVertexAttrib1sNV, glVertexAttrib1sNV, NULL, _gloffset_VertexAttrib1sNV),
-    NAME_FUNC_OFFSET(11556, glVertexAttrib1svNV, glVertexAttrib1svNV, NULL, _gloffset_VertexAttrib1svNV),
-    NAME_FUNC_OFFSET(11576, glVertexAttrib2dNV, glVertexAttrib2dNV, NULL, _gloffset_VertexAttrib2dNV),
-    NAME_FUNC_OFFSET(11595, glVertexAttrib2dvNV, glVertexAttrib2dvNV, NULL, _gloffset_VertexAttrib2dvNV),
-    NAME_FUNC_OFFSET(11615, glVertexAttrib2fNV, glVertexAttrib2fNV, NULL, _gloffset_VertexAttrib2fNV),
-    NAME_FUNC_OFFSET(11634, glVertexAttrib2fvNV, glVertexAttrib2fvNV, NULL, _gloffset_VertexAttrib2fvNV),
-    NAME_FUNC_OFFSET(11654, glVertexAttrib2sNV, glVertexAttrib2sNV, NULL, _gloffset_VertexAttrib2sNV),
-    NAME_FUNC_OFFSET(11673, glVertexAttrib2svNV, glVertexAttrib2svNV, NULL, _gloffset_VertexAttrib2svNV),
-    NAME_FUNC_OFFSET(11693, glVertexAttrib3dNV, glVertexAttrib3dNV, NULL, _gloffset_VertexAttrib3dNV),
-    NAME_FUNC_OFFSET(11712, glVertexAttrib3dvNV, glVertexAttrib3dvNV, NULL, _gloffset_VertexAttrib3dvNV),
-    NAME_FUNC_OFFSET(11732, glVertexAttrib3fNV, glVertexAttrib3fNV, NULL, _gloffset_VertexAttrib3fNV),
-    NAME_FUNC_OFFSET(11751, glVertexAttrib3fvNV, glVertexAttrib3fvNV, NULL, _gloffset_VertexAttrib3fvNV),
-    NAME_FUNC_OFFSET(11771, glVertexAttrib3sNV, glVertexAttrib3sNV, NULL, _gloffset_VertexAttrib3sNV),
-    NAME_FUNC_OFFSET(11790, glVertexAttrib3svNV, glVertexAttrib3svNV, NULL, _gloffset_VertexAttrib3svNV),
-    NAME_FUNC_OFFSET(11810, glVertexAttrib4dNV, glVertexAttrib4dNV, NULL, _gloffset_VertexAttrib4dNV),
-    NAME_FUNC_OFFSET(11829, glVertexAttrib4dvNV, glVertexAttrib4dvNV, NULL, _gloffset_VertexAttrib4dvNV),
-    NAME_FUNC_OFFSET(11849, glVertexAttrib4fNV, glVertexAttrib4fNV, NULL, _gloffset_VertexAttrib4fNV),
-    NAME_FUNC_OFFSET(11868, glVertexAttrib4fvNV, glVertexAttrib4fvNV, NULL, _gloffset_VertexAttrib4fvNV),
-    NAME_FUNC_OFFSET(11888, glVertexAttrib4sNV, glVertexAttrib4sNV, NULL, _gloffset_VertexAttrib4sNV),
-    NAME_FUNC_OFFSET(11907, glVertexAttrib4svNV, glVertexAttrib4svNV, NULL, _gloffset_VertexAttrib4svNV),
-    NAME_FUNC_OFFSET(11927, glVertexAttrib4ubNV, glVertexAttrib4ubNV, NULL, _gloffset_VertexAttrib4ubNV),
-    NAME_FUNC_OFFSET(11947, glVertexAttrib4ubvNV, glVertexAttrib4ubvNV, NULL, _gloffset_VertexAttrib4ubvNV),
-    NAME_FUNC_OFFSET(11968, glVertexAttribPointerNV, glVertexAttribPointerNV, NULL, _gloffset_VertexAttribPointerNV),
-    NAME_FUNC_OFFSET(11992, glVertexAttribs1dvNV, glVertexAttribs1dvNV, NULL, _gloffset_VertexAttribs1dvNV),
-    NAME_FUNC_OFFSET(12013, glVertexAttribs1fvNV, glVertexAttribs1fvNV, NULL, _gloffset_VertexAttribs1fvNV),
-    NAME_FUNC_OFFSET(12034, glVertexAttribs1svNV, glVertexAttribs1svNV, NULL, _gloffset_VertexAttribs1svNV),
-    NAME_FUNC_OFFSET(12055, glVertexAttribs2dvNV, glVertexAttribs2dvNV, NULL, _gloffset_VertexAttribs2dvNV),
-    NAME_FUNC_OFFSET(12076, glVertexAttribs2fvNV, glVertexAttribs2fvNV, NULL, _gloffset_VertexAttribs2fvNV),
-    NAME_FUNC_OFFSET(12097, glVertexAttribs2svNV, glVertexAttribs2svNV, NULL, _gloffset_VertexAttribs2svNV),
-    NAME_FUNC_OFFSET(12118, glVertexAttribs3dvNV, glVertexAttribs3dvNV, NULL, _gloffset_VertexAttribs3dvNV),
-    NAME_FUNC_OFFSET(12139, glVertexAttribs3fvNV, glVertexAttribs3fvNV, NULL, _gloffset_VertexAttribs3fvNV),
-    NAME_FUNC_OFFSET(12160, glVertexAttribs3svNV, glVertexAttribs3svNV, NULL, _gloffset_VertexAttribs3svNV),
-    NAME_FUNC_OFFSET(12181, glVertexAttribs4dvNV, glVertexAttribs4dvNV, NULL, _gloffset_VertexAttribs4dvNV),
-    NAME_FUNC_OFFSET(12202, glVertexAttribs4fvNV, glVertexAttribs4fvNV, NULL, _gloffset_VertexAttribs4fvNV),
-    NAME_FUNC_OFFSET(12223, glVertexAttribs4svNV, glVertexAttribs4svNV, NULL, _gloffset_VertexAttribs4svNV),
-    NAME_FUNC_OFFSET(12244, glVertexAttribs4ubvNV, glVertexAttribs4ubvNV, NULL, _gloffset_VertexAttribs4ubvNV),
-    NAME_FUNC_OFFSET(12266, glGetTexBumpParameterfvATI, glGetTexBumpParameterfvATI, NULL, _gloffset_GetTexBumpParameterfvATI),
-    NAME_FUNC_OFFSET(12293, glGetTexBumpParameterivATI, glGetTexBumpParameterivATI, NULL, _gloffset_GetTexBumpParameterivATI),
-    NAME_FUNC_OFFSET(12320, glTexBumpParameterfvATI, glTexBumpParameterfvATI, NULL, _gloffset_TexBumpParameterfvATI),
-    NAME_FUNC_OFFSET(12344, glTexBumpParameterivATI, glTexBumpParameterivATI, NULL, _gloffset_TexBumpParameterivATI),
-    NAME_FUNC_OFFSET(12368, glAlphaFragmentOp1ATI, glAlphaFragmentOp1ATI, NULL, _gloffset_AlphaFragmentOp1ATI),
-    NAME_FUNC_OFFSET(12390, glAlphaFragmentOp2ATI, glAlphaFragmentOp2ATI, NULL, _gloffset_AlphaFragmentOp2ATI),
-    NAME_FUNC_OFFSET(12412, glAlphaFragmentOp3ATI, glAlphaFragmentOp3ATI, NULL, _gloffset_AlphaFragmentOp3ATI),
-    NAME_FUNC_OFFSET(12434, glBeginFragmentShaderATI, glBeginFragmentShaderATI, NULL, _gloffset_BeginFragmentShaderATI),
-    NAME_FUNC_OFFSET(12459, glBindFragmentShaderATI, glBindFragmentShaderATI, NULL, _gloffset_BindFragmentShaderATI),
-    NAME_FUNC_OFFSET(12483, glColorFragmentOp1ATI, glColorFragmentOp1ATI, NULL, _gloffset_ColorFragmentOp1ATI),
-    NAME_FUNC_OFFSET(12505, glColorFragmentOp2ATI, glColorFragmentOp2ATI, NULL, _gloffset_ColorFragmentOp2ATI),
-    NAME_FUNC_OFFSET(12527, glColorFragmentOp3ATI, glColorFragmentOp3ATI, NULL, _gloffset_ColorFragmentOp3ATI),
-    NAME_FUNC_OFFSET(12549, glDeleteFragmentShaderATI, glDeleteFragmentShaderATI, NULL, _gloffset_DeleteFragmentShaderATI),
-    NAME_FUNC_OFFSET(12575, glEndFragmentShaderATI, glEndFragmentShaderATI, NULL, _gloffset_EndFragmentShaderATI),
-    NAME_FUNC_OFFSET(12598, glGenFragmentShadersATI, glGenFragmentShadersATI, NULL, _gloffset_GenFragmentShadersATI),
-    NAME_FUNC_OFFSET(12622, glPassTexCoordATI, glPassTexCoordATI, NULL, _gloffset_PassTexCoordATI),
-    NAME_FUNC_OFFSET(12640, glSampleMapATI, glSampleMapATI, NULL, _gloffset_SampleMapATI),
-    NAME_FUNC_OFFSET(12655, glSetFragmentShaderConstantATI, glSetFragmentShaderConstantATI, NULL, _gloffset_SetFragmentShaderConstantATI),
-    NAME_FUNC_OFFSET(12686, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
-    NAME_FUNC_OFFSET(12706, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
-    NAME_FUNC_OFFSET(12727, gl_dispatch_stub_738, gl_dispatch_stub_738, NULL, _gloffset_ActiveStencilFaceEXT),
-    NAME_FUNC_OFFSET(12750, gl_dispatch_stub_739, gl_dispatch_stub_739, NULL, _gloffset_BindVertexArrayAPPLE),
-    NAME_FUNC_OFFSET(12773, gl_dispatch_stub_740, gl_dispatch_stub_740, NULL, _gloffset_DeleteVertexArraysAPPLE),
-    NAME_FUNC_OFFSET(12799, gl_dispatch_stub_741, gl_dispatch_stub_741, NULL, _gloffset_GenVertexArraysAPPLE),
-    NAME_FUNC_OFFSET(12822, gl_dispatch_stub_742, gl_dispatch_stub_742, NULL, _gloffset_IsVertexArrayAPPLE),
-    NAME_FUNC_OFFSET(12843, glGetProgramNamedParameterdvNV, glGetProgramNamedParameterdvNV, NULL, _gloffset_GetProgramNamedParameterdvNV),
-    NAME_FUNC_OFFSET(12874, glGetProgramNamedParameterfvNV, glGetProgramNamedParameterfvNV, NULL, _gloffset_GetProgramNamedParameterfvNV),
-    NAME_FUNC_OFFSET(12905, glProgramNamedParameter4dNV, glProgramNamedParameter4dNV, NULL, _gloffset_ProgramNamedParameter4dNV),
-    NAME_FUNC_OFFSET(12933, glProgramNamedParameter4dvNV, glProgramNamedParameter4dvNV, NULL, _gloffset_ProgramNamedParameter4dvNV),
-    NAME_FUNC_OFFSET(12962, glProgramNamedParameter4fNV, glProgramNamedParameter4fNV, NULL, _gloffset_ProgramNamedParameter4fNV),
-    NAME_FUNC_OFFSET(12990, glProgramNamedParameter4fvNV, glProgramNamedParameter4fvNV, NULL, _gloffset_ProgramNamedParameter4fvNV),
-    NAME_FUNC_OFFSET(13019, gl_dispatch_stub_749, gl_dispatch_stub_749, NULL, _gloffset_DepthBoundsEXT),
-    NAME_FUNC_OFFSET(13036, gl_dispatch_stub_750, gl_dispatch_stub_750, NULL, _gloffset_BlendEquationSeparateEXT),
-    NAME_FUNC_OFFSET(13063, glBindFramebufferEXT, glBindFramebufferEXT, NULL, _gloffset_BindFramebufferEXT),
-    NAME_FUNC_OFFSET(13084, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, _gloffset_BindRenderbufferEXT),
-    NAME_FUNC_OFFSET(13106, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, _gloffset_CheckFramebufferStatusEXT),
-    NAME_FUNC_OFFSET(13134, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, _gloffset_DeleteFramebuffersEXT),
-    NAME_FUNC_OFFSET(13158, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, _gloffset_DeleteRenderbuffersEXT),
-    NAME_FUNC_OFFSET(13183, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, _gloffset_FramebufferRenderbufferEXT),
-    NAME_FUNC_OFFSET(13212, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, _gloffset_FramebufferTexture1DEXT),
-    NAME_FUNC_OFFSET(13238, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, _gloffset_FramebufferTexture2DEXT),
-    NAME_FUNC_OFFSET(13264, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, _gloffset_FramebufferTexture3DEXT),
-    NAME_FUNC_OFFSET(13290, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, _gloffset_GenFramebuffersEXT),
-    NAME_FUNC_OFFSET(13311, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, _gloffset_GenRenderbuffersEXT),
-    NAME_FUNC_OFFSET(13333, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, _gloffset_GenerateMipmapEXT),
-    NAME_FUNC_OFFSET(13353, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, _gloffset_GetFramebufferAttachmentParameterivEXT),
-    NAME_FUNC_OFFSET(13394, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, _gloffset_GetRenderbufferParameterivEXT),
-    NAME_FUNC_OFFSET(13426, glIsFramebufferEXT, glIsFramebufferEXT, NULL, _gloffset_IsFramebufferEXT),
-    NAME_FUNC_OFFSET(13445, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, _gloffset_IsRenderbufferEXT),
-    NAME_FUNC_OFFSET(13465, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, _gloffset_RenderbufferStorageEXT),
-    NAME_FUNC_OFFSET(13490, gl_dispatch_stub_768, gl_dispatch_stub_768, NULL, _gloffset_BlitFramebufferEXT),
-    NAME_FUNC_OFFSET(13511, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
-    NAME_FUNC_OFFSET(13540, gl_dispatch_stub_770, gl_dispatch_stub_770, NULL, _gloffset_StencilFuncSeparateATI),
-    NAME_FUNC_OFFSET(13565, gl_dispatch_stub_771, gl_dispatch_stub_771, NULL, _gloffset_ProgramEnvParameters4fvEXT),
-    NAME_FUNC_OFFSET(13594, gl_dispatch_stub_772, gl_dispatch_stub_772, NULL, _gloffset_ProgramLocalParameters4fvEXT),
-    NAME_FUNC_OFFSET(13625, gl_dispatch_stub_773, gl_dispatch_stub_773, NULL, _gloffset_GetQueryObjecti64vEXT),
-    NAME_FUNC_OFFSET(13649, gl_dispatch_stub_774, gl_dispatch_stub_774, NULL, _gloffset_GetQueryObjectui64vEXT),
-    NAME_FUNC_OFFSET(13674, glArrayElement, glArrayElement, NULL, _gloffset_ArrayElement),
-    NAME_FUNC_OFFSET(13692, glBindTexture, glBindTexture, NULL, _gloffset_BindTexture),
-    NAME_FUNC_OFFSET(13709, glDrawArrays, glDrawArrays, NULL, _gloffset_DrawArrays),
-    NAME_FUNC_OFFSET(13725, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, _gloffset_AreTexturesResident),
-    NAME_FUNC_OFFSET(13750, glCopyTexImage1D, glCopyTexImage1D, NULL, _gloffset_CopyTexImage1D),
-    NAME_FUNC_OFFSET(13770, glCopyTexImage2D, glCopyTexImage2D, NULL, _gloffset_CopyTexImage2D),
-    NAME_FUNC_OFFSET(13790, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, _gloffset_CopyTexSubImage1D),
-    NAME_FUNC_OFFSET(13813, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, _gloffset_CopyTexSubImage2D),
-    NAME_FUNC_OFFSET(13836, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, _gloffset_DeleteTextures),
-    NAME_FUNC_OFFSET(13856, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, _gloffset_GenTextures),
-    NAME_FUNC_OFFSET(13873, glGetPointerv, glGetPointerv, NULL, _gloffset_GetPointerv),
-    NAME_FUNC_OFFSET(13890, glIsTexture, glIsTextureEXT, glIsTextureEXT, _gloffset_IsTexture),
-    NAME_FUNC_OFFSET(13905, glPrioritizeTextures, glPrioritizeTextures, NULL, _gloffset_PrioritizeTextures),
-    NAME_FUNC_OFFSET(13929, glTexSubImage1D, glTexSubImage1D, NULL, _gloffset_TexSubImage1D),
-    NAME_FUNC_OFFSET(13948, glTexSubImage2D, glTexSubImage2D, NULL, _gloffset_TexSubImage2D),
-    NAME_FUNC_OFFSET(13967, glBlendColor, glBlendColor, NULL, _gloffset_BlendColor),
-    NAME_FUNC_OFFSET(13983, glBlendEquation, glBlendEquation, NULL, _gloffset_BlendEquation),
-    NAME_FUNC_OFFSET(14002, glDrawRangeElements, glDrawRangeElements, NULL, _gloffset_DrawRangeElements),
-    NAME_FUNC_OFFSET(14025, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
-    NAME_FUNC_OFFSET(14041, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
-    NAME_FUNC_OFFSET(14057, glColorTableParameterfv, glColorTableParameterfv, NULL, _gloffset_ColorTableParameterfv),
-    NAME_FUNC_OFFSET(14084, glColorTableParameteriv, glColorTableParameteriv, NULL, _gloffset_ColorTableParameteriv),
-    NAME_FUNC_OFFSET(14111, glCopyColorTable, glCopyColorTable, NULL, _gloffset_CopyColorTable),
-    NAME_FUNC_OFFSET(14131, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
-    NAME_FUNC_OFFSET(14150, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
-    NAME_FUNC_OFFSET(14169, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
-    NAME_FUNC_OFFSET(14199, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
-    NAME_FUNC_OFFSET(14229, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
-    NAME_FUNC_OFFSET(14259, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
-    NAME_FUNC_OFFSET(14289, glColorSubTable, glColorSubTable, NULL, _gloffset_ColorSubTable),
-    NAME_FUNC_OFFSET(14308, glCopyColorSubTable, glCopyColorSubTable, NULL, _gloffset_CopyColorSubTable),
-    NAME_FUNC_OFFSET(14331, glConvolutionFilter1D, glConvolutionFilter1D, NULL, _gloffset_ConvolutionFilter1D),
-    NAME_FUNC_OFFSET(14356, glConvolutionFilter2D, glConvolutionFilter2D, NULL, _gloffset_ConvolutionFilter2D),
-    NAME_FUNC_OFFSET(14381, glConvolutionParameterf, glConvolutionParameterf, NULL, _gloffset_ConvolutionParameterf),
-    NAME_FUNC_OFFSET(14408, glConvolutionParameterfv, glConvolutionParameterfv, NULL, _gloffset_ConvolutionParameterfv),
-    NAME_FUNC_OFFSET(14436, glConvolutionParameteri, glConvolutionParameteri, NULL, _gloffset_ConvolutionParameteri),
-    NAME_FUNC_OFFSET(14463, glConvolutionParameteriv, glConvolutionParameteriv, NULL, _gloffset_ConvolutionParameteriv),
-    NAME_FUNC_OFFSET(14491, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, _gloffset_CopyConvolutionFilter1D),
-    NAME_FUNC_OFFSET(14520, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, _gloffset_CopyConvolutionFilter2D),
-    NAME_FUNC_OFFSET(14549, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, _gloffset_GetConvolutionFilter),
-    NAME_FUNC_OFFSET(14575, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, _gloffset_GetConvolutionParameterfv),
-    NAME_FUNC_OFFSET(14606, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, _gloffset_GetConvolutionParameteriv),
-    NAME_FUNC_OFFSET(14637, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, _gloffset_GetSeparableFilter),
-    NAME_FUNC_OFFSET(14661, glSeparableFilter2D, glSeparableFilter2D, NULL, _gloffset_SeparableFilter2D),
-    NAME_FUNC_OFFSET(14684, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, _gloffset_GetHistogram),
-    NAME_FUNC_OFFSET(14702, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, _gloffset_GetHistogramParameterfv),
-    NAME_FUNC_OFFSET(14731, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, _gloffset_GetHistogramParameteriv),
-    NAME_FUNC_OFFSET(14760, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, _gloffset_GetMinmax),
-    NAME_FUNC_OFFSET(14775, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, _gloffset_GetMinmaxParameterfv),
-    NAME_FUNC_OFFSET(14801, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, _gloffset_GetMinmaxParameteriv),
-    NAME_FUNC_OFFSET(14827, glHistogram, glHistogram, NULL, _gloffset_Histogram),
-    NAME_FUNC_OFFSET(14842, glMinmax, glMinmax, NULL, _gloffset_Minmax),
-    NAME_FUNC_OFFSET(14854, glResetHistogram, glResetHistogram, NULL, _gloffset_ResetHistogram),
-    NAME_FUNC_OFFSET(14874, glResetMinmax, glResetMinmax, NULL, _gloffset_ResetMinmax),
-    NAME_FUNC_OFFSET(14891, glTexImage3D, glTexImage3D, NULL, _gloffset_TexImage3D),
-    NAME_FUNC_OFFSET(14907, glTexSubImage3D, glTexSubImage3D, NULL, _gloffset_TexSubImage3D),
-    NAME_FUNC_OFFSET(14926, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, _gloffset_CopyTexSubImage3D),
-    NAME_FUNC_OFFSET(14949, glActiveTextureARB, glActiveTextureARB, NULL, _gloffset_ActiveTextureARB),
-    NAME_FUNC_OFFSET(14965, glClientActiveTextureARB, glClientActiveTextureARB, NULL, _gloffset_ClientActiveTextureARB),
-    NAME_FUNC_OFFSET(14987, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL, _gloffset_MultiTexCoord1dARB),
-    NAME_FUNC_OFFSET(15005, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL, _gloffset_MultiTexCoord1dvARB),
-    NAME_FUNC_OFFSET(15024, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, _gloffset_MultiTexCoord1fARB),
-    NAME_FUNC_OFFSET(15042, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, _gloffset_MultiTexCoord1fvARB),
-    NAME_FUNC_OFFSET(15061, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL, _gloffset_MultiTexCoord1iARB),
-    NAME_FUNC_OFFSET(15079, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL, _gloffset_MultiTexCoord1ivARB),
-    NAME_FUNC_OFFSET(15098, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL, _gloffset_MultiTexCoord1sARB),
-    NAME_FUNC_OFFSET(15116, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL, _gloffset_MultiTexCoord1svARB),
-    NAME_FUNC_OFFSET(15135, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL, _gloffset_MultiTexCoord2dARB),
-    NAME_FUNC_OFFSET(15153, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL, _gloffset_MultiTexCoord2dvARB),
-    NAME_FUNC_OFFSET(15172, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, _gloffset_MultiTexCoord2fARB),
-    NAME_FUNC_OFFSET(15190, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, _gloffset_MultiTexCoord2fvARB),
-    NAME_FUNC_OFFSET(15209, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL, _gloffset_MultiTexCoord2iARB),
-    NAME_FUNC_OFFSET(15227, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL, _gloffset_MultiTexCoord2ivARB),
-    NAME_FUNC_OFFSET(15246, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL, _gloffset_MultiTexCoord2sARB),
-    NAME_FUNC_OFFSET(15264, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL, _gloffset_MultiTexCoord2svARB),
-    NAME_FUNC_OFFSET(15283, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL, _gloffset_MultiTexCoord3dARB),
-    NAME_FUNC_OFFSET(15301, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL, _gloffset_MultiTexCoord3dvARB),
-    NAME_FUNC_OFFSET(15320, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, _gloffset_MultiTexCoord3fARB),
-    NAME_FUNC_OFFSET(15338, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, _gloffset_MultiTexCoord3fvARB),
-    NAME_FUNC_OFFSET(15357, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL, _gloffset_MultiTexCoord3iARB),
-    NAME_FUNC_OFFSET(15375, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL, _gloffset_MultiTexCoord3ivARB),
-    NAME_FUNC_OFFSET(15394, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL, _gloffset_MultiTexCoord3sARB),
-    NAME_FUNC_OFFSET(15412, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL, _gloffset_MultiTexCoord3svARB),
-    NAME_FUNC_OFFSET(15431, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL, _gloffset_MultiTexCoord4dARB),
-    NAME_FUNC_OFFSET(15449, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL, _gloffset_MultiTexCoord4dvARB),
-    NAME_FUNC_OFFSET(15468, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, _gloffset_MultiTexCoord4fARB),
-    NAME_FUNC_OFFSET(15486, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, _gloffset_MultiTexCoord4fvARB),
-    NAME_FUNC_OFFSET(15505, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL, _gloffset_MultiTexCoord4iARB),
-    NAME_FUNC_OFFSET(15523, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL, _gloffset_MultiTexCoord4ivARB),
-    NAME_FUNC_OFFSET(15542, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL, _gloffset_MultiTexCoord4sARB),
-    NAME_FUNC_OFFSET(15560, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL, _gloffset_MultiTexCoord4svARB),
-    NAME_FUNC_OFFSET(15579, glStencilOpSeparate, glStencilOpSeparate, NULL, _gloffset_StencilOpSeparate),
-    NAME_FUNC_OFFSET(15602, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, _gloffset_LoadTransposeMatrixdARB),
-    NAME_FUNC_OFFSET(15625, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, _gloffset_LoadTransposeMatrixfARB),
-    NAME_FUNC_OFFSET(15648, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, _gloffset_MultTransposeMatrixdARB),
-    NAME_FUNC_OFFSET(15671, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB, NULL, _gloffset_MultTransposeMatrixfARB),
-    NAME_FUNC_OFFSET(15694, glSampleCoverageARB, glSampleCoverageARB, NULL, _gloffset_SampleCoverageARB),
-    NAME_FUNC_OFFSET(15711, glCompressedTexImage1DARB, glCompressedTexImage1DARB, NULL, _gloffset_CompressedTexImage1DARB),
-    NAME_FUNC_OFFSET(15734, glCompressedTexImage2DARB, glCompressedTexImage2DARB, NULL, _gloffset_CompressedTexImage2DARB),
-    NAME_FUNC_OFFSET(15757, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, _gloffset_CompressedTexImage3DARB),
-    NAME_FUNC_OFFSET(15780, glCompressedTexSubImage1DARB, glCompressedTexSubImage1DARB, NULL, _gloffset_CompressedTexSubImage1DARB),
-    NAME_FUNC_OFFSET(15806, glCompressedTexSubImage2DARB, glCompressedTexSubImage2DARB, NULL, _gloffset_CompressedTexSubImage2DARB),
-    NAME_FUNC_OFFSET(15832, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, _gloffset_CompressedTexSubImage3DARB),
-    NAME_FUNC_OFFSET(15858, glGetCompressedTexImageARB, glGetCompressedTexImageARB, NULL, _gloffset_GetCompressedTexImageARB),
-    NAME_FUNC_OFFSET(15882, glDisableVertexAttribArrayARB, glDisableVertexAttribArrayARB, NULL, _gloffset_DisableVertexAttribArrayARB),
-    NAME_FUNC_OFFSET(15909, glEnableVertexAttribArrayARB, glEnableVertexAttribArrayARB, NULL, _gloffset_EnableVertexAttribArrayARB),
-    NAME_FUNC_OFFSET(15935, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL, _gloffset_GetVertexAttribdvARB),
-    NAME_FUNC_OFFSET(15955, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL, _gloffset_GetVertexAttribfvARB),
-    NAME_FUNC_OFFSET(15975, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL, _gloffset_GetVertexAttribivARB),
-    NAME_FUNC_OFFSET(15995, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, _gloffset_ProgramEnvParameter4dARB),
-    NAME_FUNC_OFFSET(16018, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, _gloffset_ProgramEnvParameter4dvARB),
-    NAME_FUNC_OFFSET(16042, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, _gloffset_ProgramEnvParameter4fARB),
-    NAME_FUNC_OFFSET(16065, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, _gloffset_ProgramEnvParameter4fvARB),
-    NAME_FUNC_OFFSET(16089, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, _gloffset_VertexAttrib1dARB),
-    NAME_FUNC_OFFSET(16106, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL, _gloffset_VertexAttrib1dvARB),
-    NAME_FUNC_OFFSET(16124, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, _gloffset_VertexAttrib1fARB),
-    NAME_FUNC_OFFSET(16141, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, _gloffset_VertexAttrib1fvARB),
-    NAME_FUNC_OFFSET(16159, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, _gloffset_VertexAttrib1sARB),
-    NAME_FUNC_OFFSET(16176, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL, _gloffset_VertexAttrib1svARB),
-    NAME_FUNC_OFFSET(16194, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, _gloffset_VertexAttrib2dARB),
-    NAME_FUNC_OFFSET(16211, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL, _gloffset_VertexAttrib2dvARB),
-    NAME_FUNC_OFFSET(16229, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, _gloffset_VertexAttrib2fARB),
-    NAME_FUNC_OFFSET(16246, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, _gloffset_VertexAttrib2fvARB),
-    NAME_FUNC_OFFSET(16264, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, _gloffset_VertexAttrib2sARB),
-    NAME_FUNC_OFFSET(16281, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL, _gloffset_VertexAttrib2svARB),
-    NAME_FUNC_OFFSET(16299, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, _gloffset_VertexAttrib3dARB),
-    NAME_FUNC_OFFSET(16316, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL, _gloffset_VertexAttrib3dvARB),
-    NAME_FUNC_OFFSET(16334, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, _gloffset_VertexAttrib3fARB),
-    NAME_FUNC_OFFSET(16351, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, _gloffset_VertexAttrib3fvARB),
-    NAME_FUNC_OFFSET(16369, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, _gloffset_VertexAttrib3sARB),
-    NAME_FUNC_OFFSET(16386, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL, _gloffset_VertexAttrib3svARB),
-    NAME_FUNC_OFFSET(16404, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL, _gloffset_VertexAttrib4NbvARB),
-    NAME_FUNC_OFFSET(16423, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL, _gloffset_VertexAttrib4NivARB),
-    NAME_FUNC_OFFSET(16442, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL, _gloffset_VertexAttrib4NsvARB),
-    NAME_FUNC_OFFSET(16461, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL, _gloffset_VertexAttrib4NubARB),
-    NAME_FUNC_OFFSET(16480, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, _gloffset_VertexAttrib4NubvARB),
-    NAME_FUNC_OFFSET(16500, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, _gloffset_VertexAttrib4NuivARB),
-    NAME_FUNC_OFFSET(16520, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, _gloffset_VertexAttrib4NusvARB),
-    NAME_FUNC_OFFSET(16540, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, _gloffset_VertexAttrib4bvARB),
-    NAME_FUNC_OFFSET(16558, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, _gloffset_VertexAttrib4dARB),
-    NAME_FUNC_OFFSET(16575, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, _gloffset_VertexAttrib4dvARB),
-    NAME_FUNC_OFFSET(16593, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, _gloffset_VertexAttrib4fARB),
-    NAME_FUNC_OFFSET(16610, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, _gloffset_VertexAttrib4fvARB),
-    NAME_FUNC_OFFSET(16628, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, _gloffset_VertexAttrib4ivARB),
-    NAME_FUNC_OFFSET(16646, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, _gloffset_VertexAttrib4sARB),
-    NAME_FUNC_OFFSET(16663, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, _gloffset_VertexAttrib4svARB),
-    NAME_FUNC_OFFSET(16681, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, _gloffset_VertexAttrib4ubvARB),
-    NAME_FUNC_OFFSET(16700, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, _gloffset_VertexAttrib4uivARB),
-    NAME_FUNC_OFFSET(16719, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, _gloffset_VertexAttrib4usvARB),
-    NAME_FUNC_OFFSET(16738, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, _gloffset_VertexAttribPointerARB),
-    NAME_FUNC_OFFSET(16760, glBindBufferARB, glBindBufferARB, NULL, _gloffset_BindBufferARB),
-    NAME_FUNC_OFFSET(16773, glBufferDataARB, glBufferDataARB, NULL, _gloffset_BufferDataARB),
-    NAME_FUNC_OFFSET(16786, glBufferSubDataARB, glBufferSubDataARB, NULL, _gloffset_BufferSubDataARB),
-    NAME_FUNC_OFFSET(16802, glDeleteBuffersARB, glDeleteBuffersARB, NULL, _gloffset_DeleteBuffersARB),
-    NAME_FUNC_OFFSET(16818, glGenBuffersARB, glGenBuffersARB, NULL, _gloffset_GenBuffersARB),
-    NAME_FUNC_OFFSET(16831, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, _gloffset_GetBufferParameterivARB),
-    NAME_FUNC_OFFSET(16854, glGetBufferPointervARB, glGetBufferPointervARB, NULL, _gloffset_GetBufferPointervARB),
-    NAME_FUNC_OFFSET(16874, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, _gloffset_GetBufferSubDataARB),
-    NAME_FUNC_OFFSET(16893, glIsBufferARB, glIsBufferARB, NULL, _gloffset_IsBufferARB),
-    NAME_FUNC_OFFSET(16904, glMapBufferARB, glMapBufferARB, NULL, _gloffset_MapBufferARB),
-    NAME_FUNC_OFFSET(16916, glUnmapBufferARB, glUnmapBufferARB, NULL, _gloffset_UnmapBufferARB),
-    NAME_FUNC_OFFSET(16930, glBeginQueryARB, glBeginQueryARB, NULL, _gloffset_BeginQueryARB),
-    NAME_FUNC_OFFSET(16943, glDeleteQueriesARB, glDeleteQueriesARB, NULL, _gloffset_DeleteQueriesARB),
-    NAME_FUNC_OFFSET(16959, glEndQueryARB, glEndQueryARB, NULL, _gloffset_EndQueryARB),
-    NAME_FUNC_OFFSET(16970, glGenQueriesARB, glGenQueriesARB, NULL, _gloffset_GenQueriesARB),
-    NAME_FUNC_OFFSET(16983, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, _gloffset_GetQueryObjectivARB),
-    NAME_FUNC_OFFSET(17002, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, _gloffset_GetQueryObjectuivARB),
-    NAME_FUNC_OFFSET(17022, glGetQueryivARB, glGetQueryivARB, NULL, _gloffset_GetQueryivARB),
-    NAME_FUNC_OFFSET(17035, glIsQueryARB, glIsQueryARB, NULL, _gloffset_IsQueryARB),
-    NAME_FUNC_OFFSET(17045, glCompileShaderARB, glCompileShaderARB, NULL, _gloffset_CompileShaderARB),
-    NAME_FUNC_OFFSET(17061, glGetActiveUniformARB, glGetActiveUniformARB, NULL, _gloffset_GetActiveUniformARB),
-    NAME_FUNC_OFFSET(17080, glGetShaderSourceARB, glGetShaderSourceARB, NULL, _gloffset_GetShaderSourceARB),
-    NAME_FUNC_OFFSET(17098, glGetUniformLocationARB, glGetUniformLocationARB, NULL, _gloffset_GetUniformLocationARB),
-    NAME_FUNC_OFFSET(17119, glGetUniformfvARB, glGetUniformfvARB, NULL, _gloffset_GetUniformfvARB),
-    NAME_FUNC_OFFSET(17134, glGetUniformivARB, glGetUniformivARB, NULL, _gloffset_GetUniformivARB),
-    NAME_FUNC_OFFSET(17149, glLinkProgramARB, glLinkProgramARB, NULL, _gloffset_LinkProgramARB),
-    NAME_FUNC_OFFSET(17163, glShaderSourceARB, glShaderSourceARB, NULL, _gloffset_ShaderSourceARB),
-    NAME_FUNC_OFFSET(17178, glUniform1fARB, glUniform1fARB, NULL, _gloffset_Uniform1fARB),
-    NAME_FUNC_OFFSET(17190, glUniform1fvARB, glUniform1fvARB, NULL, _gloffset_Uniform1fvARB),
-    NAME_FUNC_OFFSET(17203, glUniform1iARB, glUniform1iARB, NULL, _gloffset_Uniform1iARB),
-    NAME_FUNC_OFFSET(17215, glUniform1ivARB, glUniform1ivARB, NULL, _gloffset_Uniform1ivARB),
-    NAME_FUNC_OFFSET(17228, glUniform2fARB, glUniform2fARB, NULL, _gloffset_Uniform2fARB),
-    NAME_FUNC_OFFSET(17240, glUniform2fvARB, glUniform2fvARB, NULL, _gloffset_Uniform2fvARB),
-    NAME_FUNC_OFFSET(17253, glUniform2iARB, glUniform2iARB, NULL, _gloffset_Uniform2iARB),
-    NAME_FUNC_OFFSET(17265, glUniform2ivARB, glUniform2ivARB, NULL, _gloffset_Uniform2ivARB),
-    NAME_FUNC_OFFSET(17278, glUniform3fARB, glUniform3fARB, NULL, _gloffset_Uniform3fARB),
-    NAME_FUNC_OFFSET(17290, glUniform3fvARB, glUniform3fvARB, NULL, _gloffset_Uniform3fvARB),
-    NAME_FUNC_OFFSET(17303, glUniform3iARB, glUniform3iARB, NULL, _gloffset_Uniform3iARB),
-    NAME_FUNC_OFFSET(17315, glUniform3ivARB, glUniform3ivARB, NULL, _gloffset_Uniform3ivARB),
-    NAME_FUNC_OFFSET(17328, glUniform4fARB, glUniform4fARB, NULL, _gloffset_Uniform4fARB),
-    NAME_FUNC_OFFSET(17340, glUniform4fvARB, glUniform4fvARB, NULL, _gloffset_Uniform4fvARB),
-    NAME_FUNC_OFFSET(17353, glUniform4iARB, glUniform4iARB, NULL, _gloffset_Uniform4iARB),
-    NAME_FUNC_OFFSET(17365, glUniform4ivARB, glUniform4ivARB, NULL, _gloffset_Uniform4ivARB),
-    NAME_FUNC_OFFSET(17378, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, _gloffset_UniformMatrix2fvARB),
-    NAME_FUNC_OFFSET(17397, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, _gloffset_UniformMatrix3fvARB),
-    NAME_FUNC_OFFSET(17416, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, _gloffset_UniformMatrix4fvARB),
-    NAME_FUNC_OFFSET(17435, glUseProgramObjectARB, glUseProgramObjectARB, NULL, _gloffset_UseProgramObjectARB),
-    NAME_FUNC_OFFSET(17448, glValidateProgramARB, glValidateProgramARB, NULL, _gloffset_ValidateProgramARB),
-    NAME_FUNC_OFFSET(17466, glBindAttribLocationARB, glBindAttribLocationARB, NULL, _gloffset_BindAttribLocationARB),
-    NAME_FUNC_OFFSET(17487, glGetActiveAttribARB, glGetActiveAttribARB, NULL, _gloffset_GetActiveAttribARB),
-    NAME_FUNC_OFFSET(17505, glGetAttribLocationARB, glGetAttribLocationARB, NULL, _gloffset_GetAttribLocationARB),
-    NAME_FUNC_OFFSET(17525, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
-    NAME_FUNC_OFFSET(17539, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
-    NAME_FUNC_OFFSET(17556, gl_dispatch_stub_569, gl_dispatch_stub_569, NULL, _gloffset_SampleMaskSGIS),
-    NAME_FUNC_OFFSET(17572, gl_dispatch_stub_570, gl_dispatch_stub_570, NULL, _gloffset_SamplePatternSGIS),
-    NAME_FUNC_OFFSET(17591, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(17609, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(17630, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(17652, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(17671, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(17693, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(17716, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
-    NAME_FUNC_OFFSET(17735, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
-    NAME_FUNC_OFFSET(17755, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
-    NAME_FUNC_OFFSET(17774, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
-    NAME_FUNC_OFFSET(17794, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
-    NAME_FUNC_OFFSET(17813, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
-    NAME_FUNC_OFFSET(17833, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
-    NAME_FUNC_OFFSET(17852, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
-    NAME_FUNC_OFFSET(17872, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
-    NAME_FUNC_OFFSET(17891, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
-    NAME_FUNC_OFFSET(17911, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
-    NAME_FUNC_OFFSET(17931, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
-    NAME_FUNC_OFFSET(17952, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
-    NAME_FUNC_OFFSET(17972, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
-    NAME_FUNC_OFFSET(17993, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
-    NAME_FUNC_OFFSET(18013, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
-    NAME_FUNC_OFFSET(18034, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
-    NAME_FUNC_OFFSET(18058, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
-    NAME_FUNC_OFFSET(18076, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
-    NAME_FUNC_OFFSET(18096, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
-    NAME_FUNC_OFFSET(18114, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
-    NAME_FUNC_OFFSET(18126, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
-    NAME_FUNC_OFFSET(18139, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
-    NAME_FUNC_OFFSET(18151, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
-    NAME_FUNC_OFFSET(18164, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
+    NAME_FUNC_OFFSET( 8984, glCopyBufferSubData, glCopyBufferSubData, NULL, _gloffset_CopyBufferSubData),
+    NAME_FUNC_OFFSET( 9004, glPolygonOffsetEXT, glPolygonOffsetEXT, NULL, _gloffset_PolygonOffsetEXT),
+    NAME_FUNC_OFFSET( 9023, gl_dispatch_stub_564, gl_dispatch_stub_564, NULL, _gloffset_GetPixelTexGenParameterfvSGIS),
+    NAME_FUNC_OFFSET( 9055, gl_dispatch_stub_565, gl_dispatch_stub_565, NULL, _gloffset_GetPixelTexGenParameterivSGIS),
+    NAME_FUNC_OFFSET( 9087, gl_dispatch_stub_566, gl_dispatch_stub_566, NULL, _gloffset_PixelTexGenParameterfSGIS),
+    NAME_FUNC_OFFSET( 9115, gl_dispatch_stub_567, gl_dispatch_stub_567, NULL, _gloffset_PixelTexGenParameterfvSGIS),
+    NAME_FUNC_OFFSET( 9144, gl_dispatch_stub_568, gl_dispatch_stub_568, NULL, _gloffset_PixelTexGenParameteriSGIS),
+    NAME_FUNC_OFFSET( 9172, gl_dispatch_stub_569, gl_dispatch_stub_569, NULL, _gloffset_PixelTexGenParameterivSGIS),
+    NAME_FUNC_OFFSET( 9201, gl_dispatch_stub_570, gl_dispatch_stub_570, NULL, _gloffset_SampleMaskSGIS),
+    NAME_FUNC_OFFSET( 9218, gl_dispatch_stub_571, gl_dispatch_stub_571, NULL, _gloffset_SamplePatternSGIS),
+    NAME_FUNC_OFFSET( 9238, glColorPointerEXT, glColorPointerEXT, NULL, _gloffset_ColorPointerEXT),
+    NAME_FUNC_OFFSET( 9256, glEdgeFlagPointerEXT, glEdgeFlagPointerEXT, NULL, _gloffset_EdgeFlagPointerEXT),
+    NAME_FUNC_OFFSET( 9277, glIndexPointerEXT, glIndexPointerEXT, NULL, _gloffset_IndexPointerEXT),
+    NAME_FUNC_OFFSET( 9295, glNormalPointerEXT, glNormalPointerEXT, NULL, _gloffset_NormalPointerEXT),
+    NAME_FUNC_OFFSET( 9314, glTexCoordPointerEXT, glTexCoordPointerEXT, NULL, _gloffset_TexCoordPointerEXT),
+    NAME_FUNC_OFFSET( 9335, glVertexPointerEXT, glVertexPointerEXT, NULL, _gloffset_VertexPointerEXT),
+    NAME_FUNC_OFFSET( 9354, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET( 9375, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET( 9397, glLockArraysEXT, glLockArraysEXT, NULL, _gloffset_LockArraysEXT),
+    NAME_FUNC_OFFSET( 9413, glUnlockArraysEXT, glUnlockArraysEXT, NULL, _gloffset_UnlockArraysEXT),
+    NAME_FUNC_OFFSET( 9431, gl_dispatch_stub_582, gl_dispatch_stub_582, NULL, _gloffset_CullParameterdvEXT),
+    NAME_FUNC_OFFSET( 9452, gl_dispatch_stub_583, gl_dispatch_stub_583, NULL, _gloffset_CullParameterfvEXT),
+    NAME_FUNC_OFFSET( 9473, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
+    NAME_FUNC_OFFSET( 9495, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
+    NAME_FUNC_OFFSET( 9518, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
+    NAME_FUNC_OFFSET( 9540, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
+    NAME_FUNC_OFFSET( 9563, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
+    NAME_FUNC_OFFSET( 9585, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
+    NAME_FUNC_OFFSET( 9608, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
+    NAME_FUNC_OFFSET( 9630, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
+    NAME_FUNC_OFFSET( 9653, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
+    NAME_FUNC_OFFSET( 9675, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
+    NAME_FUNC_OFFSET( 9698, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
+    NAME_FUNC_OFFSET( 9721, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
+    NAME_FUNC_OFFSET( 9745, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
+    NAME_FUNC_OFFSET( 9768, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
+    NAME_FUNC_OFFSET( 9792, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
+    NAME_FUNC_OFFSET( 9815, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
+    NAME_FUNC_OFFSET( 9839, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
+    NAME_FUNC_OFFSET( 9866, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
+    NAME_FUNC_OFFSET( 9887, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
+    NAME_FUNC_OFFSET( 9910, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
+    NAME_FUNC_OFFSET( 9931, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
+    NAME_FUNC_OFFSET( 9946, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
+    NAME_FUNC_OFFSET( 9962, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
+    NAME_FUNC_OFFSET( 9977, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
+    NAME_FUNC_OFFSET( 9993, gl_dispatch_stub_608, gl_dispatch_stub_608, NULL, _gloffset_PixelTexGenSGIX),
+    NAME_FUNC_OFFSET(10011, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
+    NAME_FUNC_OFFSET(10034, glFlushVertexArrayRangeNV, glFlushVertexArrayRangeNV, NULL, _gloffset_FlushVertexArrayRangeNV),
+    NAME_FUNC_OFFSET(10060, glVertexArrayRangeNV, glVertexArrayRangeNV, NULL, _gloffset_VertexArrayRangeNV),
+    NAME_FUNC_OFFSET(10081, glCombinerInputNV, glCombinerInputNV, NULL, _gloffset_CombinerInputNV),
+    NAME_FUNC_OFFSET(10099, glCombinerOutputNV, glCombinerOutputNV, NULL, _gloffset_CombinerOutputNV),
+    NAME_FUNC_OFFSET(10118, glCombinerParameterfNV, glCombinerParameterfNV, NULL, _gloffset_CombinerParameterfNV),
+    NAME_FUNC_OFFSET(10141, glCombinerParameterfvNV, glCombinerParameterfvNV, NULL, _gloffset_CombinerParameterfvNV),
+    NAME_FUNC_OFFSET(10165, glCombinerParameteriNV, glCombinerParameteriNV, NULL, _gloffset_CombinerParameteriNV),
+    NAME_FUNC_OFFSET(10188, glCombinerParameterivNV, glCombinerParameterivNV, NULL, _gloffset_CombinerParameterivNV),
+    NAME_FUNC_OFFSET(10212, glFinalCombinerInputNV, glFinalCombinerInputNV, NULL, _gloffset_FinalCombinerInputNV),
+    NAME_FUNC_OFFSET(10235, glGetCombinerInputParameterfvNV, glGetCombinerInputParameterfvNV, NULL, _gloffset_GetCombinerInputParameterfvNV),
+    NAME_FUNC_OFFSET(10267, glGetCombinerInputParameterivNV, glGetCombinerInputParameterivNV, NULL, _gloffset_GetCombinerInputParameterivNV),
+    NAME_FUNC_OFFSET(10299, glGetCombinerOutputParameterfvNV, glGetCombinerOutputParameterfvNV, NULL, _gloffset_GetCombinerOutputParameterfvNV),
+    NAME_FUNC_OFFSET(10332, glGetCombinerOutputParameterivNV, glGetCombinerOutputParameterivNV, NULL, _gloffset_GetCombinerOutputParameterivNV),
+    NAME_FUNC_OFFSET(10365, glGetFinalCombinerInputParameterfvNV, glGetFinalCombinerInputParameterfvNV, NULL, _gloffset_GetFinalCombinerInputParameterfvNV),
+    NAME_FUNC_OFFSET(10402, glGetFinalCombinerInputParameterivNV, glGetFinalCombinerInputParameterivNV, NULL, _gloffset_GetFinalCombinerInputParameterivNV),
+    NAME_FUNC_OFFSET(10439, glResizeBuffersMESA, glResizeBuffersMESA, NULL, _gloffset_ResizeBuffersMESA),
+    NAME_FUNC_OFFSET(10459, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
+    NAME_FUNC_OFFSET(10477, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
+    NAME_FUNC_OFFSET(10496, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
+    NAME_FUNC_OFFSET(10514, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
+    NAME_FUNC_OFFSET(10533, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
+    NAME_FUNC_OFFSET(10551, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
+    NAME_FUNC_OFFSET(10570, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
+    NAME_FUNC_OFFSET(10588, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
+    NAME_FUNC_OFFSET(10607, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
+    NAME_FUNC_OFFSET(10625, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
+    NAME_FUNC_OFFSET(10644, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
+    NAME_FUNC_OFFSET(10662, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
+    NAME_FUNC_OFFSET(10681, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
+    NAME_FUNC_OFFSET(10699, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
+    NAME_FUNC_OFFSET(10718, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
+    NAME_FUNC_OFFSET(10736, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
+    NAME_FUNC_OFFSET(10755, glWindowPos4dMESA, glWindowPos4dMESA, NULL, _gloffset_WindowPos4dMESA),
+    NAME_FUNC_OFFSET(10773, glWindowPos4dvMESA, glWindowPos4dvMESA, NULL, _gloffset_WindowPos4dvMESA),
+    NAME_FUNC_OFFSET(10792, glWindowPos4fMESA, glWindowPos4fMESA, NULL, _gloffset_WindowPos4fMESA),
+    NAME_FUNC_OFFSET(10810, glWindowPos4fvMESA, glWindowPos4fvMESA, NULL, _gloffset_WindowPos4fvMESA),
+    NAME_FUNC_OFFSET(10829, glWindowPos4iMESA, glWindowPos4iMESA, NULL, _gloffset_WindowPos4iMESA),
+    NAME_FUNC_OFFSET(10847, glWindowPos4ivMESA, glWindowPos4ivMESA, NULL, _gloffset_WindowPos4ivMESA),
+    NAME_FUNC_OFFSET(10866, glWindowPos4sMESA, glWindowPos4sMESA, NULL, _gloffset_WindowPos4sMESA),
+    NAME_FUNC_OFFSET(10884, glWindowPos4svMESA, glWindowPos4svMESA, NULL, _gloffset_WindowPos4svMESA),
+    NAME_FUNC_OFFSET(10903, gl_dispatch_stub_650, gl_dispatch_stub_650, NULL, _gloffset_MultiModeDrawArraysIBM),
+    NAME_FUNC_OFFSET(10928, gl_dispatch_stub_651, gl_dispatch_stub_651, NULL, _gloffset_MultiModeDrawElementsIBM),
+    NAME_FUNC_OFFSET(10955, gl_dispatch_stub_652, gl_dispatch_stub_652, NULL, _gloffset_DeleteFencesNV),
+    NAME_FUNC_OFFSET(10972, gl_dispatch_stub_653, gl_dispatch_stub_653, NULL, _gloffset_FinishFenceNV),
+    NAME_FUNC_OFFSET(10988, gl_dispatch_stub_654, gl_dispatch_stub_654, NULL, _gloffset_GenFencesNV),
+    NAME_FUNC_OFFSET(11002, gl_dispatch_stub_655, gl_dispatch_stub_655, NULL, _gloffset_GetFenceivNV),
+    NAME_FUNC_OFFSET(11017, gl_dispatch_stub_656, gl_dispatch_stub_656, NULL, _gloffset_IsFenceNV),
+    NAME_FUNC_OFFSET(11029, gl_dispatch_stub_657, gl_dispatch_stub_657, NULL, _gloffset_SetFenceNV),
+    NAME_FUNC_OFFSET(11042, gl_dispatch_stub_658, gl_dispatch_stub_658, NULL, _gloffset_TestFenceNV),
+    NAME_FUNC_OFFSET(11056, glAreProgramsResidentNV, glAreProgramsResidentNV, NULL, _gloffset_AreProgramsResidentNV),
+    NAME_FUNC_OFFSET(11080, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
+    NAME_FUNC_OFFSET(11096, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
+    NAME_FUNC_OFFSET(11115, glExecuteProgramNV, glExecuteProgramNV, NULL, _gloffset_ExecuteProgramNV),
+    NAME_FUNC_OFFSET(11134, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
+    NAME_FUNC_OFFSET(11150, glGetProgramParameterdvNV, glGetProgramParameterdvNV, NULL, _gloffset_GetProgramParameterdvNV),
+    NAME_FUNC_OFFSET(11176, glGetProgramParameterfvNV, glGetProgramParameterfvNV, NULL, _gloffset_GetProgramParameterfvNV),
+    NAME_FUNC_OFFSET(11202, glGetProgramStringNV, glGetProgramStringNV, NULL, _gloffset_GetProgramStringNV),
+    NAME_FUNC_OFFSET(11223, glGetProgramivNV, glGetProgramivNV, NULL, _gloffset_GetProgramivNV),
+    NAME_FUNC_OFFSET(11240, glGetTrackMatrixivNV, glGetTrackMatrixivNV, NULL, _gloffset_GetTrackMatrixivNV),
+    NAME_FUNC_OFFSET(11261, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
+    NAME_FUNC_OFFSET(11289, glGetVertexAttribdvNV, glGetVertexAttribdvNV, NULL, _gloffset_GetVertexAttribdvNV),
+    NAME_FUNC_OFFSET(11311, glGetVertexAttribfvNV, glGetVertexAttribfvNV, NULL, _gloffset_GetVertexAttribfvNV),
+    NAME_FUNC_OFFSET(11333, glGetVertexAttribivNV, glGetVertexAttribivNV, NULL, _gloffset_GetVertexAttribivNV),
+    NAME_FUNC_OFFSET(11355, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
+    NAME_FUNC_OFFSET(11369, glLoadProgramNV, glLoadProgramNV, NULL, _gloffset_LoadProgramNV),
+    NAME_FUNC_OFFSET(11385, glProgramParameters4dvNV, glProgramParameters4dvNV, NULL, _gloffset_ProgramParameters4dvNV),
+    NAME_FUNC_OFFSET(11410, glProgramParameters4fvNV, glProgramParameters4fvNV, NULL, _gloffset_ProgramParameters4fvNV),
+    NAME_FUNC_OFFSET(11435, glRequestResidentProgramsNV, glRequestResidentProgramsNV, NULL, _gloffset_RequestResidentProgramsNV),
+    NAME_FUNC_OFFSET(11463, glTrackMatrixNV, glTrackMatrixNV, NULL, _gloffset_TrackMatrixNV),
+    NAME_FUNC_OFFSET(11479, glVertexAttrib1dNV, glVertexAttrib1dNV, NULL, _gloffset_VertexAttrib1dNV),
+    NAME_FUNC_OFFSET(11498, glVertexAttrib1dvNV, glVertexAttrib1dvNV, NULL, _gloffset_VertexAttrib1dvNV),
+    NAME_FUNC_OFFSET(11518, glVertexAttrib1fNV, glVertexAttrib1fNV, NULL, _gloffset_VertexAttrib1fNV),
+    NAME_FUNC_OFFSET(11537, glVertexAttrib1fvNV, glVertexAttrib1fvNV, NULL, _gloffset_VertexAttrib1fvNV),
+    NAME_FUNC_OFFSET(11557, glVertexAttrib1sNV, glVertexAttrib1sNV, NULL, _gloffset_VertexAttrib1sNV),
+    NAME_FUNC_OFFSET(11576, glVertexAttrib1svNV, glVertexAttrib1svNV, NULL, _gloffset_VertexAttrib1svNV),
+    NAME_FUNC_OFFSET(11596, glVertexAttrib2dNV, glVertexAttrib2dNV, NULL, _gloffset_VertexAttrib2dNV),
+    NAME_FUNC_OFFSET(11615, glVertexAttrib2dvNV, glVertexAttrib2dvNV, NULL, _gloffset_VertexAttrib2dvNV),
+    NAME_FUNC_OFFSET(11635, glVertexAttrib2fNV, glVertexAttrib2fNV, NULL, _gloffset_VertexAttrib2fNV),
+    NAME_FUNC_OFFSET(11654, glVertexAttrib2fvNV, glVertexAttrib2fvNV, NULL, _gloffset_VertexAttrib2fvNV),
+    NAME_FUNC_OFFSET(11674, glVertexAttrib2sNV, glVertexAttrib2sNV, NULL, _gloffset_VertexAttrib2sNV),
+    NAME_FUNC_OFFSET(11693, glVertexAttrib2svNV, glVertexAttrib2svNV, NULL, _gloffset_VertexAttrib2svNV),
+    NAME_FUNC_OFFSET(11713, glVertexAttrib3dNV, glVertexAttrib3dNV, NULL, _gloffset_VertexAttrib3dNV),
+    NAME_FUNC_OFFSET(11732, glVertexAttrib3dvNV, glVertexAttrib3dvNV, NULL, _gloffset_VertexAttrib3dvNV),
+    NAME_FUNC_OFFSET(11752, glVertexAttrib3fNV, glVertexAttrib3fNV, NULL, _gloffset_VertexAttrib3fNV),
+    NAME_FUNC_OFFSET(11771, glVertexAttrib3fvNV, glVertexAttrib3fvNV, NULL, _gloffset_VertexAttrib3fvNV),
+    NAME_FUNC_OFFSET(11791, glVertexAttrib3sNV, glVertexAttrib3sNV, NULL, _gloffset_VertexAttrib3sNV),
+    NAME_FUNC_OFFSET(11810, glVertexAttrib3svNV, glVertexAttrib3svNV, NULL, _gloffset_VertexAttrib3svNV),
+    NAME_FUNC_OFFSET(11830, glVertexAttrib4dNV, glVertexAttrib4dNV, NULL, _gloffset_VertexAttrib4dNV),
+    NAME_FUNC_OFFSET(11849, glVertexAttrib4dvNV, glVertexAttrib4dvNV, NULL, _gloffset_VertexAttrib4dvNV),
+    NAME_FUNC_OFFSET(11869, glVertexAttrib4fNV, glVertexAttrib4fNV, NULL, _gloffset_VertexAttrib4fNV),
+    NAME_FUNC_OFFSET(11888, glVertexAttrib4fvNV, glVertexAttrib4fvNV, NULL, _gloffset_VertexAttrib4fvNV),
+    NAME_FUNC_OFFSET(11908, glVertexAttrib4sNV, glVertexAttrib4sNV, NULL, _gloffset_VertexAttrib4sNV),
+    NAME_FUNC_OFFSET(11927, glVertexAttrib4svNV, glVertexAttrib4svNV, NULL, _gloffset_VertexAttrib4svNV),
+    NAME_FUNC_OFFSET(11947, glVertexAttrib4ubNV, glVertexAttrib4ubNV, NULL, _gloffset_VertexAttrib4ubNV),
+    NAME_FUNC_OFFSET(11967, glVertexAttrib4ubvNV, glVertexAttrib4ubvNV, NULL, _gloffset_VertexAttrib4ubvNV),
+    NAME_FUNC_OFFSET(11988, glVertexAttribPointerNV, glVertexAttribPointerNV, NULL, _gloffset_VertexAttribPointerNV),
+    NAME_FUNC_OFFSET(12012, glVertexAttribs1dvNV, glVertexAttribs1dvNV, NULL, _gloffset_VertexAttribs1dvNV),
+    NAME_FUNC_OFFSET(12033, glVertexAttribs1fvNV, glVertexAttribs1fvNV, NULL, _gloffset_VertexAttribs1fvNV),
+    NAME_FUNC_OFFSET(12054, glVertexAttribs1svNV, glVertexAttribs1svNV, NULL, _gloffset_VertexAttribs1svNV),
+    NAME_FUNC_OFFSET(12075, glVertexAttribs2dvNV, glVertexAttribs2dvNV, NULL, _gloffset_VertexAttribs2dvNV),
+    NAME_FUNC_OFFSET(12096, glVertexAttribs2fvNV, glVertexAttribs2fvNV, NULL, _gloffset_VertexAttribs2fvNV),
+    NAME_FUNC_OFFSET(12117, glVertexAttribs2svNV, glVertexAttribs2svNV, NULL, _gloffset_VertexAttribs2svNV),
+    NAME_FUNC_OFFSET(12138, glVertexAttribs3dvNV, glVertexAttribs3dvNV, NULL, _gloffset_VertexAttribs3dvNV),
+    NAME_FUNC_OFFSET(12159, glVertexAttribs3fvNV, glVertexAttribs3fvNV, NULL, _gloffset_VertexAttribs3fvNV),
+    NAME_FUNC_OFFSET(12180, glVertexAttribs3svNV, glVertexAttribs3svNV, NULL, _gloffset_VertexAttribs3svNV),
+    NAME_FUNC_OFFSET(12201, glVertexAttribs4dvNV, glVertexAttribs4dvNV, NULL, _gloffset_VertexAttribs4dvNV),
+    NAME_FUNC_OFFSET(12222, glVertexAttribs4fvNV, glVertexAttribs4fvNV, NULL, _gloffset_VertexAttribs4fvNV),
+    NAME_FUNC_OFFSET(12243, glVertexAttribs4svNV, glVertexAttribs4svNV, NULL, _gloffset_VertexAttribs4svNV),
+    NAME_FUNC_OFFSET(12264, glVertexAttribs4ubvNV, glVertexAttribs4ubvNV, NULL, _gloffset_VertexAttribs4ubvNV),
+    NAME_FUNC_OFFSET(12286, glGetTexBumpParameterfvATI, glGetTexBumpParameterfvATI, NULL, _gloffset_GetTexBumpParameterfvATI),
+    NAME_FUNC_OFFSET(12313, glGetTexBumpParameterivATI, glGetTexBumpParameterivATI, NULL, _gloffset_GetTexBumpParameterivATI),
+    NAME_FUNC_OFFSET(12340, glTexBumpParameterfvATI, glTexBumpParameterfvATI, NULL, _gloffset_TexBumpParameterfvATI),
+    NAME_FUNC_OFFSET(12364, glTexBumpParameterivATI, glTexBumpParameterivATI, NULL, _gloffset_TexBumpParameterivATI),
+    NAME_FUNC_OFFSET(12388, glAlphaFragmentOp1ATI, glAlphaFragmentOp1ATI, NULL, _gloffset_AlphaFragmentOp1ATI),
+    NAME_FUNC_OFFSET(12410, glAlphaFragmentOp2ATI, glAlphaFragmentOp2ATI, NULL, _gloffset_AlphaFragmentOp2ATI),
+    NAME_FUNC_OFFSET(12432, glAlphaFragmentOp3ATI, glAlphaFragmentOp3ATI, NULL, _gloffset_AlphaFragmentOp3ATI),
+    NAME_FUNC_OFFSET(12454, glBeginFragmentShaderATI, glBeginFragmentShaderATI, NULL, _gloffset_BeginFragmentShaderATI),
+    NAME_FUNC_OFFSET(12479, glBindFragmentShaderATI, glBindFragmentShaderATI, NULL, _gloffset_BindFragmentShaderATI),
+    NAME_FUNC_OFFSET(12503, glColorFragmentOp1ATI, glColorFragmentOp1ATI, NULL, _gloffset_ColorFragmentOp1ATI),
+    NAME_FUNC_OFFSET(12525, glColorFragmentOp2ATI, glColorFragmentOp2ATI, NULL, _gloffset_ColorFragmentOp2ATI),
+    NAME_FUNC_OFFSET(12547, glColorFragmentOp3ATI, glColorFragmentOp3ATI, NULL, _gloffset_ColorFragmentOp3ATI),
+    NAME_FUNC_OFFSET(12569, glDeleteFragmentShaderATI, glDeleteFragmentShaderATI, NULL, _gloffset_DeleteFragmentShaderATI),
+    NAME_FUNC_OFFSET(12595, glEndFragmentShaderATI, glEndFragmentShaderATI, NULL, _gloffset_EndFragmentShaderATI),
+    NAME_FUNC_OFFSET(12618, glGenFragmentShadersATI, glGenFragmentShadersATI, NULL, _gloffset_GenFragmentShadersATI),
+    NAME_FUNC_OFFSET(12642, glPassTexCoordATI, glPassTexCoordATI, NULL, _gloffset_PassTexCoordATI),
+    NAME_FUNC_OFFSET(12660, glSampleMapATI, glSampleMapATI, NULL, _gloffset_SampleMapATI),
+    NAME_FUNC_OFFSET(12675, glSetFragmentShaderConstantATI, glSetFragmentShaderConstantATI, NULL, _gloffset_SetFragmentShaderConstantATI),
+    NAME_FUNC_OFFSET(12706, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
+    NAME_FUNC_OFFSET(12726, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
+    NAME_FUNC_OFFSET(12747, gl_dispatch_stub_739, gl_dispatch_stub_739, NULL, _gloffset_ActiveStencilFaceEXT),
+    NAME_FUNC_OFFSET(12770, gl_dispatch_stub_740, gl_dispatch_stub_740, NULL, _gloffset_BindVertexArrayAPPLE),
+    NAME_FUNC_OFFSET(12793, gl_dispatch_stub_741, gl_dispatch_stub_741, NULL, _gloffset_DeleteVertexArraysAPPLE),
+    NAME_FUNC_OFFSET(12819, gl_dispatch_stub_742, gl_dispatch_stub_742, NULL, _gloffset_GenVertexArraysAPPLE),
+    NAME_FUNC_OFFSET(12842, gl_dispatch_stub_743, gl_dispatch_stub_743, NULL, _gloffset_IsVertexArrayAPPLE),
+    NAME_FUNC_OFFSET(12863, glGetProgramNamedParameterdvNV, glGetProgramNamedParameterdvNV, NULL, _gloffset_GetProgramNamedParameterdvNV),
+    NAME_FUNC_OFFSET(12894, glGetProgramNamedParameterfvNV, glGetProgramNamedParameterfvNV, NULL, _gloffset_GetProgramNamedParameterfvNV),
+    NAME_FUNC_OFFSET(12925, glProgramNamedParameter4dNV, glProgramNamedParameter4dNV, NULL, _gloffset_ProgramNamedParameter4dNV),
+    NAME_FUNC_OFFSET(12953, glProgramNamedParameter4dvNV, glProgramNamedParameter4dvNV, NULL, _gloffset_ProgramNamedParameter4dvNV),
+    NAME_FUNC_OFFSET(12982, glProgramNamedParameter4fNV, glProgramNamedParameter4fNV, NULL, _gloffset_ProgramNamedParameter4fNV),
+    NAME_FUNC_OFFSET(13010, glProgramNamedParameter4fvNV, glProgramNamedParameter4fvNV, NULL, _gloffset_ProgramNamedParameter4fvNV),
+    NAME_FUNC_OFFSET(13039, gl_dispatch_stub_750, gl_dispatch_stub_750, NULL, _gloffset_DepthBoundsEXT),
+    NAME_FUNC_OFFSET(13056, gl_dispatch_stub_751, gl_dispatch_stub_751, NULL, _gloffset_BlendEquationSeparateEXT),
+    NAME_FUNC_OFFSET(13083, glBindFramebufferEXT, glBindFramebufferEXT, NULL, _gloffset_BindFramebufferEXT),
+    NAME_FUNC_OFFSET(13104, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, _gloffset_BindRenderbufferEXT),
+    NAME_FUNC_OFFSET(13126, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, _gloffset_CheckFramebufferStatusEXT),
+    NAME_FUNC_OFFSET(13154, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, _gloffset_DeleteFramebuffersEXT),
+    NAME_FUNC_OFFSET(13178, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, _gloffset_DeleteRenderbuffersEXT),
+    NAME_FUNC_OFFSET(13203, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, _gloffset_FramebufferRenderbufferEXT),
+    NAME_FUNC_OFFSET(13232, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, _gloffset_FramebufferTexture1DEXT),
+    NAME_FUNC_OFFSET(13258, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, _gloffset_FramebufferTexture2DEXT),
+    NAME_FUNC_OFFSET(13284, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, _gloffset_FramebufferTexture3DEXT),
+    NAME_FUNC_OFFSET(13310, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, _gloffset_GenFramebuffersEXT),
+    NAME_FUNC_OFFSET(13331, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, _gloffset_GenRenderbuffersEXT),
+    NAME_FUNC_OFFSET(13353, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, _gloffset_GenerateMipmapEXT),
+    NAME_FUNC_OFFSET(13373, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, _gloffset_GetFramebufferAttachmentParameterivEXT),
+    NAME_FUNC_OFFSET(13414, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, _gloffset_GetRenderbufferParameterivEXT),
+    NAME_FUNC_OFFSET(13446, glIsFramebufferEXT, glIsFramebufferEXT, NULL, _gloffset_IsFramebufferEXT),
+    NAME_FUNC_OFFSET(13465, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, _gloffset_IsRenderbufferEXT),
+    NAME_FUNC_OFFSET(13485, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, _gloffset_RenderbufferStorageEXT),
+    NAME_FUNC_OFFSET(13510, gl_dispatch_stub_769, gl_dispatch_stub_769, NULL, _gloffset_BlitFramebufferEXT),
+    NAME_FUNC_OFFSET(13531, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
+    NAME_FUNC_OFFSET(13560, gl_dispatch_stub_771, gl_dispatch_stub_771, NULL, _gloffset_StencilFuncSeparateATI),
+    NAME_FUNC_OFFSET(13585, gl_dispatch_stub_772, gl_dispatch_stub_772, NULL, _gloffset_ProgramEnvParameters4fvEXT),
+    NAME_FUNC_OFFSET(13614, gl_dispatch_stub_773, gl_dispatch_stub_773, NULL, _gloffset_ProgramLocalParameters4fvEXT),
+    NAME_FUNC_OFFSET(13645, gl_dispatch_stub_774, gl_dispatch_stub_774, NULL, _gloffset_GetQueryObjecti64vEXT),
+    NAME_FUNC_OFFSET(13669, gl_dispatch_stub_775, gl_dispatch_stub_775, NULL, _gloffset_GetQueryObjectui64vEXT),
+    NAME_FUNC_OFFSET(13694, glArrayElement, glArrayElement, NULL, _gloffset_ArrayElement),
+    NAME_FUNC_OFFSET(13712, glBindTexture, glBindTexture, NULL, _gloffset_BindTexture),
+    NAME_FUNC_OFFSET(13729, glDrawArrays, glDrawArrays, NULL, _gloffset_DrawArrays),
+    NAME_FUNC_OFFSET(13745, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, _gloffset_AreTexturesResident),
+    NAME_FUNC_OFFSET(13770, glCopyTexImage1D, glCopyTexImage1D, NULL, _gloffset_CopyTexImage1D),
+    NAME_FUNC_OFFSET(13790, glCopyTexImage2D, glCopyTexImage2D, NULL, _gloffset_CopyTexImage2D),
+    NAME_FUNC_OFFSET(13810, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, _gloffset_CopyTexSubImage1D),
+    NAME_FUNC_OFFSET(13833, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, _gloffset_CopyTexSubImage2D),
+    NAME_FUNC_OFFSET(13856, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, _gloffset_DeleteTextures),
+    NAME_FUNC_OFFSET(13876, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, _gloffset_GenTextures),
+    NAME_FUNC_OFFSET(13893, glGetPointerv, glGetPointerv, NULL, _gloffset_GetPointerv),
+    NAME_FUNC_OFFSET(13910, glIsTexture, glIsTextureEXT, glIsTextureEXT, _gloffset_IsTexture),
+    NAME_FUNC_OFFSET(13925, glPrioritizeTextures, glPrioritizeTextures, NULL, _gloffset_PrioritizeTextures),
+    NAME_FUNC_OFFSET(13949, glTexSubImage1D, glTexSubImage1D, NULL, _gloffset_TexSubImage1D),
+    NAME_FUNC_OFFSET(13968, glTexSubImage2D, glTexSubImage2D, NULL, _gloffset_TexSubImage2D),
+    NAME_FUNC_OFFSET(13987, glBlendColor, glBlendColor, NULL, _gloffset_BlendColor),
+    NAME_FUNC_OFFSET(14003, glBlendEquation, glBlendEquation, NULL, _gloffset_BlendEquation),
+    NAME_FUNC_OFFSET(14022, glDrawRangeElements, glDrawRangeElements, NULL, _gloffset_DrawRangeElements),
+    NAME_FUNC_OFFSET(14045, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
+    NAME_FUNC_OFFSET(14061, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
+    NAME_FUNC_OFFSET(14077, glColorTableParameterfv, glColorTableParameterfv, NULL, _gloffset_ColorTableParameterfv),
+    NAME_FUNC_OFFSET(14104, glColorTableParameteriv, glColorTableParameteriv, NULL, _gloffset_ColorTableParameteriv),
+    NAME_FUNC_OFFSET(14131, glCopyColorTable, glCopyColorTable, NULL, _gloffset_CopyColorTable),
+    NAME_FUNC_OFFSET(14151, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
+    NAME_FUNC_OFFSET(14170, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
+    NAME_FUNC_OFFSET(14189, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
+    NAME_FUNC_OFFSET(14219, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
+    NAME_FUNC_OFFSET(14249, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
+    NAME_FUNC_OFFSET(14279, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
+    NAME_FUNC_OFFSET(14309, glColorSubTable, glColorSubTable, NULL, _gloffset_ColorSubTable),
+    NAME_FUNC_OFFSET(14328, glCopyColorSubTable, glCopyColorSubTable, NULL, _gloffset_CopyColorSubTable),
+    NAME_FUNC_OFFSET(14351, glConvolutionFilter1D, glConvolutionFilter1D, NULL, _gloffset_ConvolutionFilter1D),
+    NAME_FUNC_OFFSET(14376, glConvolutionFilter2D, glConvolutionFilter2D, NULL, _gloffset_ConvolutionFilter2D),
+    NAME_FUNC_OFFSET(14401, glConvolutionParameterf, glConvolutionParameterf, NULL, _gloffset_ConvolutionParameterf),
+    NAME_FUNC_OFFSET(14428, glConvolutionParameterfv, glConvolutionParameterfv, NULL, _gloffset_ConvolutionParameterfv),
+    NAME_FUNC_OFFSET(14456, glConvolutionParameteri, glConvolutionParameteri, NULL, _gloffset_ConvolutionParameteri),
+    NAME_FUNC_OFFSET(14483, glConvolutionParameteriv, glConvolutionParameteriv, NULL, _gloffset_ConvolutionParameteriv),
+    NAME_FUNC_OFFSET(14511, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, _gloffset_CopyConvolutionFilter1D),
+    NAME_FUNC_OFFSET(14540, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, _gloffset_CopyConvolutionFilter2D),
+    NAME_FUNC_OFFSET(14569, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, _gloffset_GetConvolutionFilter),
+    NAME_FUNC_OFFSET(14595, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, _gloffset_GetConvolutionParameterfv),
+    NAME_FUNC_OFFSET(14626, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, _gloffset_GetConvolutionParameteriv),
+    NAME_FUNC_OFFSET(14657, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, _gloffset_GetSeparableFilter),
+    NAME_FUNC_OFFSET(14681, glSeparableFilter2D, glSeparableFilter2D, NULL, _gloffset_SeparableFilter2D),
+    NAME_FUNC_OFFSET(14704, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, _gloffset_GetHistogram),
+    NAME_FUNC_OFFSET(14722, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, _gloffset_GetHistogramParameterfv),
+    NAME_FUNC_OFFSET(14751, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, _gloffset_GetHistogramParameteriv),
+    NAME_FUNC_OFFSET(14780, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, _gloffset_GetMinmax),
+    NAME_FUNC_OFFSET(14795, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, _gloffset_GetMinmaxParameterfv),
+    NAME_FUNC_OFFSET(14821, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, _gloffset_GetMinmaxParameteriv),
+    NAME_FUNC_OFFSET(14847, glHistogram, glHistogram, NULL, _gloffset_Histogram),
+    NAME_FUNC_OFFSET(14862, glMinmax, glMinmax, NULL, _gloffset_Minmax),
+    NAME_FUNC_OFFSET(14874, glResetHistogram, glResetHistogram, NULL, _gloffset_ResetHistogram),
+    NAME_FUNC_OFFSET(14894, glResetMinmax, glResetMinmax, NULL, _gloffset_ResetMinmax),
+    NAME_FUNC_OFFSET(14911, glTexImage3D, glTexImage3D, NULL, _gloffset_TexImage3D),
+    NAME_FUNC_OFFSET(14927, glTexSubImage3D, glTexSubImage3D, NULL, _gloffset_TexSubImage3D),
+    NAME_FUNC_OFFSET(14946, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, _gloffset_CopyTexSubImage3D),
+    NAME_FUNC_OFFSET(14969, glActiveTextureARB, glActiveTextureARB, NULL, _gloffset_ActiveTextureARB),
+    NAME_FUNC_OFFSET(14985, glClientActiveTextureARB, glClientActiveTextureARB, NULL, _gloffset_ClientActiveTextureARB),
+    NAME_FUNC_OFFSET(15007, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL, _gloffset_MultiTexCoord1dARB),
+    NAME_FUNC_OFFSET(15025, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL, _gloffset_MultiTexCoord1dvARB),
+    NAME_FUNC_OFFSET(15044, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, _gloffset_MultiTexCoord1fARB),
+    NAME_FUNC_OFFSET(15062, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, _gloffset_MultiTexCoord1fvARB),
+    NAME_FUNC_OFFSET(15081, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL, _gloffset_MultiTexCoord1iARB),
+    NAME_FUNC_OFFSET(15099, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL, _gloffset_MultiTexCoord1ivARB),
+    NAME_FUNC_OFFSET(15118, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL, _gloffset_MultiTexCoord1sARB),
+    NAME_FUNC_OFFSET(15136, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL, _gloffset_MultiTexCoord1svARB),
+    NAME_FUNC_OFFSET(15155, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL, _gloffset_MultiTexCoord2dARB),
+    NAME_FUNC_OFFSET(15173, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL, _gloffset_MultiTexCoord2dvARB),
+    NAME_FUNC_OFFSET(15192, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, _gloffset_MultiTexCoord2fARB),
+    NAME_FUNC_OFFSET(15210, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, _gloffset_MultiTexCoord2fvARB),
+    NAME_FUNC_OFFSET(15229, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL, _gloffset_MultiTexCoord2iARB),
+    NAME_FUNC_OFFSET(15247, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL, _gloffset_MultiTexCoord2ivARB),
+    NAME_FUNC_OFFSET(15266, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL, _gloffset_MultiTexCoord2sARB),
+    NAME_FUNC_OFFSET(15284, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL, _gloffset_MultiTexCoord2svARB),
+    NAME_FUNC_OFFSET(15303, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL, _gloffset_MultiTexCoord3dARB),
+    NAME_FUNC_OFFSET(15321, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL, _gloffset_MultiTexCoord3dvARB),
+    NAME_FUNC_OFFSET(15340, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, _gloffset_MultiTexCoord3fARB),
+    NAME_FUNC_OFFSET(15358, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, _gloffset_MultiTexCoord3fvARB),
+    NAME_FUNC_OFFSET(15377, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL, _gloffset_MultiTexCoord3iARB),
+    NAME_FUNC_OFFSET(15395, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL, _gloffset_MultiTexCoord3ivARB),
+    NAME_FUNC_OFFSET(15414, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL, _gloffset_MultiTexCoord3sARB),
+    NAME_FUNC_OFFSET(15432, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL, _gloffset_MultiTexCoord3svARB),
+    NAME_FUNC_OFFSET(15451, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL, _gloffset_MultiTexCoord4dARB),
+    NAME_FUNC_OFFSET(15469, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL, _gloffset_MultiTexCoord4dvARB),
+    NAME_FUNC_OFFSET(15488, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, _gloffset_MultiTexCoord4fARB),
+    NAME_FUNC_OFFSET(15506, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, _gloffset_MultiTexCoord4fvARB),
+    NAME_FUNC_OFFSET(15525, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL, _gloffset_MultiTexCoord4iARB),
+    NAME_FUNC_OFFSET(15543, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL, _gloffset_MultiTexCoord4ivARB),
+    NAME_FUNC_OFFSET(15562, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL, _gloffset_MultiTexCoord4sARB),
+    NAME_FUNC_OFFSET(15580, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL, _gloffset_MultiTexCoord4svARB),
+    NAME_FUNC_OFFSET(15599, glStencilOpSeparate, glStencilOpSeparate, NULL, _gloffset_StencilOpSeparate),
+    NAME_FUNC_OFFSET(15622, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, _gloffset_LoadTransposeMatrixdARB),
+    NAME_FUNC_OFFSET(15645, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, _gloffset_LoadTransposeMatrixfARB),
+    NAME_FUNC_OFFSET(15668, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, _gloffset_MultTransposeMatrixdARB),
+    NAME_FUNC_OFFSET(15691, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB, NULL, _gloffset_MultTransposeMatrixfARB),
+    NAME_FUNC_OFFSET(15714, glSampleCoverageARB, glSampleCoverageARB, NULL, _gloffset_SampleCoverageARB),
+    NAME_FUNC_OFFSET(15731, glCompressedTexImage1DARB, glCompressedTexImage1DARB, NULL, _gloffset_CompressedTexImage1DARB),
+    NAME_FUNC_OFFSET(15754, glCompressedTexImage2DARB, glCompressedTexImage2DARB, NULL, _gloffset_CompressedTexImage2DARB),
+    NAME_FUNC_OFFSET(15777, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, _gloffset_CompressedTexImage3DARB),
+    NAME_FUNC_OFFSET(15800, glCompressedTexSubImage1DARB, glCompressedTexSubImage1DARB, NULL, _gloffset_CompressedTexSubImage1DARB),
+    NAME_FUNC_OFFSET(15826, glCompressedTexSubImage2DARB, glCompressedTexSubImage2DARB, NULL, _gloffset_CompressedTexSubImage2DARB),
+    NAME_FUNC_OFFSET(15852, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, _gloffset_CompressedTexSubImage3DARB),
+    NAME_FUNC_OFFSET(15878, glGetCompressedTexImageARB, glGetCompressedTexImageARB, NULL, _gloffset_GetCompressedTexImageARB),
+    NAME_FUNC_OFFSET(15902, glDisableVertexAttribArrayARB, glDisableVertexAttribArrayARB, NULL, _gloffset_DisableVertexAttribArrayARB),
+    NAME_FUNC_OFFSET(15929, glEnableVertexAttribArrayARB, glEnableVertexAttribArrayARB, NULL, _gloffset_EnableVertexAttribArrayARB),
+    NAME_FUNC_OFFSET(15955, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL, _gloffset_GetVertexAttribdvARB),
+    NAME_FUNC_OFFSET(15975, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL, _gloffset_GetVertexAttribfvARB),
+    NAME_FUNC_OFFSET(15995, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL, _gloffset_GetVertexAttribivARB),
+    NAME_FUNC_OFFSET(16015, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, _gloffset_ProgramEnvParameter4dARB),
+    NAME_FUNC_OFFSET(16038, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, _gloffset_ProgramEnvParameter4dvARB),
+    NAME_FUNC_OFFSET(16062, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, _gloffset_ProgramEnvParameter4fARB),
+    NAME_FUNC_OFFSET(16085, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, _gloffset_ProgramEnvParameter4fvARB),
+    NAME_FUNC_OFFSET(16109, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, _gloffset_VertexAttrib1dARB),
+    NAME_FUNC_OFFSET(16126, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL, _gloffset_VertexAttrib1dvARB),
+    NAME_FUNC_OFFSET(16144, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, _gloffset_VertexAttrib1fARB),
+    NAME_FUNC_OFFSET(16161, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, _gloffset_VertexAttrib1fvARB),
+    NAME_FUNC_OFFSET(16179, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, _gloffset_VertexAttrib1sARB),
+    NAME_FUNC_OFFSET(16196, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL, _gloffset_VertexAttrib1svARB),
+    NAME_FUNC_OFFSET(16214, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, _gloffset_VertexAttrib2dARB),
+    NAME_FUNC_OFFSET(16231, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL, _gloffset_VertexAttrib2dvARB),
+    NAME_FUNC_OFFSET(16249, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, _gloffset_VertexAttrib2fARB),
+    NAME_FUNC_OFFSET(16266, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, _gloffset_VertexAttrib2fvARB),
+    NAME_FUNC_OFFSET(16284, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, _gloffset_VertexAttrib2sARB),
+    NAME_FUNC_OFFSET(16301, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL, _gloffset_VertexAttrib2svARB),
+    NAME_FUNC_OFFSET(16319, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, _gloffset_VertexAttrib3dARB),
+    NAME_FUNC_OFFSET(16336, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL, _gloffset_VertexAttrib3dvARB),
+    NAME_FUNC_OFFSET(16354, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, _gloffset_VertexAttrib3fARB),
+    NAME_FUNC_OFFSET(16371, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, _gloffset_VertexAttrib3fvARB),
+    NAME_FUNC_OFFSET(16389, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, _gloffset_VertexAttrib3sARB),
+    NAME_FUNC_OFFSET(16406, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL, _gloffset_VertexAttrib3svARB),
+    NAME_FUNC_OFFSET(16424, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL, _gloffset_VertexAttrib4NbvARB),
+    NAME_FUNC_OFFSET(16443, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL, _gloffset_VertexAttrib4NivARB),
+    NAME_FUNC_OFFSET(16462, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL, _gloffset_VertexAttrib4NsvARB),
+    NAME_FUNC_OFFSET(16481, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL, _gloffset_VertexAttrib4NubARB),
+    NAME_FUNC_OFFSET(16500, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, _gloffset_VertexAttrib4NubvARB),
+    NAME_FUNC_OFFSET(16520, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, _gloffset_VertexAttrib4NuivARB),
+    NAME_FUNC_OFFSET(16540, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, _gloffset_VertexAttrib4NusvARB),
+    NAME_FUNC_OFFSET(16560, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, _gloffset_VertexAttrib4bvARB),
+    NAME_FUNC_OFFSET(16578, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, _gloffset_VertexAttrib4dARB),
+    NAME_FUNC_OFFSET(16595, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, _gloffset_VertexAttrib4dvARB),
+    NAME_FUNC_OFFSET(16613, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, _gloffset_VertexAttrib4fARB),
+    NAME_FUNC_OFFSET(16630, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, _gloffset_VertexAttrib4fvARB),
+    NAME_FUNC_OFFSET(16648, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, _gloffset_VertexAttrib4ivARB),
+    NAME_FUNC_OFFSET(16666, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, _gloffset_VertexAttrib4sARB),
+    NAME_FUNC_OFFSET(16683, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, _gloffset_VertexAttrib4svARB),
+    NAME_FUNC_OFFSET(16701, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, _gloffset_VertexAttrib4ubvARB),
+    NAME_FUNC_OFFSET(16720, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, _gloffset_VertexAttrib4uivARB),
+    NAME_FUNC_OFFSET(16739, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, _gloffset_VertexAttrib4usvARB),
+    NAME_FUNC_OFFSET(16758, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, _gloffset_VertexAttribPointerARB),
+    NAME_FUNC_OFFSET(16780, glBindBufferARB, glBindBufferARB, NULL, _gloffset_BindBufferARB),
+    NAME_FUNC_OFFSET(16793, glBufferDataARB, glBufferDataARB, NULL, _gloffset_BufferDataARB),
+    NAME_FUNC_OFFSET(16806, glBufferSubDataARB, glBufferSubDataARB, NULL, _gloffset_BufferSubDataARB),
+    NAME_FUNC_OFFSET(16822, glDeleteBuffersARB, glDeleteBuffersARB, NULL, _gloffset_DeleteBuffersARB),
+    NAME_FUNC_OFFSET(16838, glGenBuffersARB, glGenBuffersARB, NULL, _gloffset_GenBuffersARB),
+    NAME_FUNC_OFFSET(16851, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, _gloffset_GetBufferParameterivARB),
+    NAME_FUNC_OFFSET(16874, glGetBufferPointervARB, glGetBufferPointervARB, NULL, _gloffset_GetBufferPointervARB),
+    NAME_FUNC_OFFSET(16894, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, _gloffset_GetBufferSubDataARB),
+    NAME_FUNC_OFFSET(16913, glIsBufferARB, glIsBufferARB, NULL, _gloffset_IsBufferARB),
+    NAME_FUNC_OFFSET(16924, glMapBufferARB, glMapBufferARB, NULL, _gloffset_MapBufferARB),
+    NAME_FUNC_OFFSET(16936, glUnmapBufferARB, glUnmapBufferARB, NULL, _gloffset_UnmapBufferARB),
+    NAME_FUNC_OFFSET(16950, glBeginQueryARB, glBeginQueryARB, NULL, _gloffset_BeginQueryARB),
+    NAME_FUNC_OFFSET(16963, glDeleteQueriesARB, glDeleteQueriesARB, NULL, _gloffset_DeleteQueriesARB),
+    NAME_FUNC_OFFSET(16979, glEndQueryARB, glEndQueryARB, NULL, _gloffset_EndQueryARB),
+    NAME_FUNC_OFFSET(16990, glGenQueriesARB, glGenQueriesARB, NULL, _gloffset_GenQueriesARB),
+    NAME_FUNC_OFFSET(17003, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, _gloffset_GetQueryObjectivARB),
+    NAME_FUNC_OFFSET(17022, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, _gloffset_GetQueryObjectuivARB),
+    NAME_FUNC_OFFSET(17042, glGetQueryivARB, glGetQueryivARB, NULL, _gloffset_GetQueryivARB),
+    NAME_FUNC_OFFSET(17055, glIsQueryARB, glIsQueryARB, NULL, _gloffset_IsQueryARB),
+    NAME_FUNC_OFFSET(17065, glCompileShaderARB, glCompileShaderARB, NULL, _gloffset_CompileShaderARB),
+    NAME_FUNC_OFFSET(17081, glGetActiveUniformARB, glGetActiveUniformARB, NULL, _gloffset_GetActiveUniformARB),
+    NAME_FUNC_OFFSET(17100, glGetShaderSourceARB, glGetShaderSourceARB, NULL, _gloffset_GetShaderSourceARB),
+    NAME_FUNC_OFFSET(17118, glGetUniformLocationARB, glGetUniformLocationARB, NULL, _gloffset_GetUniformLocationARB),
+    NAME_FUNC_OFFSET(17139, glGetUniformfvARB, glGetUniformfvARB, NULL, _gloffset_GetUniformfvARB),
+    NAME_FUNC_OFFSET(17154, glGetUniformivARB, glGetUniformivARB, NULL, _gloffset_GetUniformivARB),
+    NAME_FUNC_OFFSET(17169, glLinkProgramARB, glLinkProgramARB, NULL, _gloffset_LinkProgramARB),
+    NAME_FUNC_OFFSET(17183, glShaderSourceARB, glShaderSourceARB, NULL, _gloffset_ShaderSourceARB),
+    NAME_FUNC_OFFSET(17198, glUniform1fARB, glUniform1fARB, NULL, _gloffset_Uniform1fARB),
+    NAME_FUNC_OFFSET(17210, glUniform1fvARB, glUniform1fvARB, NULL, _gloffset_Uniform1fvARB),
+    NAME_FUNC_OFFSET(17223, glUniform1iARB, glUniform1iARB, NULL, _gloffset_Uniform1iARB),
+    NAME_FUNC_OFFSET(17235, glUniform1ivARB, glUniform1ivARB, NULL, _gloffset_Uniform1ivARB),
+    NAME_FUNC_OFFSET(17248, glUniform2fARB, glUniform2fARB, NULL, _gloffset_Uniform2fARB),
+    NAME_FUNC_OFFSET(17260, glUniform2fvARB, glUniform2fvARB, NULL, _gloffset_Uniform2fvARB),
+    NAME_FUNC_OFFSET(17273, glUniform2iARB, glUniform2iARB, NULL, _gloffset_Uniform2iARB),
+    NAME_FUNC_OFFSET(17285, glUniform2ivARB, glUniform2ivARB, NULL, _gloffset_Uniform2ivARB),
+    NAME_FUNC_OFFSET(17298, glUniform3fARB, glUniform3fARB, NULL, _gloffset_Uniform3fARB),
+    NAME_FUNC_OFFSET(17310, glUniform3fvARB, glUniform3fvARB, NULL, _gloffset_Uniform3fvARB),
+    NAME_FUNC_OFFSET(17323, glUniform3iARB, glUniform3iARB, NULL, _gloffset_Uniform3iARB),
+    NAME_FUNC_OFFSET(17335, glUniform3ivARB, glUniform3ivARB, NULL, _gloffset_Uniform3ivARB),
+    NAME_FUNC_OFFSET(17348, glUniform4fARB, glUniform4fARB, NULL, _gloffset_Uniform4fARB),
+    NAME_FUNC_OFFSET(17360, glUniform4fvARB, glUniform4fvARB, NULL, _gloffset_Uniform4fvARB),
+    NAME_FUNC_OFFSET(17373, glUniform4iARB, glUniform4iARB, NULL, _gloffset_Uniform4iARB),
+    NAME_FUNC_OFFSET(17385, glUniform4ivARB, glUniform4ivARB, NULL, _gloffset_Uniform4ivARB),
+    NAME_FUNC_OFFSET(17398, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, _gloffset_UniformMatrix2fvARB),
+    NAME_FUNC_OFFSET(17417, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, _gloffset_UniformMatrix3fvARB),
+    NAME_FUNC_OFFSET(17436, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, _gloffset_UniformMatrix4fvARB),
+    NAME_FUNC_OFFSET(17455, glUseProgramObjectARB, glUseProgramObjectARB, NULL, _gloffset_UseProgramObjectARB),
+    NAME_FUNC_OFFSET(17468, glValidateProgramARB, glValidateProgramARB, NULL, _gloffset_ValidateProgramARB),
+    NAME_FUNC_OFFSET(17486, glBindAttribLocationARB, glBindAttribLocationARB, NULL, _gloffset_BindAttribLocationARB),
+    NAME_FUNC_OFFSET(17507, glGetActiveAttribARB, glGetActiveAttribARB, NULL, _gloffset_GetActiveAttribARB),
+    NAME_FUNC_OFFSET(17525, glGetAttribLocationARB, glGetAttribLocationARB, NULL, _gloffset_GetAttribLocationARB),
+    NAME_FUNC_OFFSET(17545, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
+    NAME_FUNC_OFFSET(17559, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
+    NAME_FUNC_OFFSET(17576, gl_dispatch_stub_570, gl_dispatch_stub_570, NULL, _gloffset_SampleMaskSGIS),
+    NAME_FUNC_OFFSET(17592, gl_dispatch_stub_571, gl_dispatch_stub_571, NULL, _gloffset_SamplePatternSGIS),
+    NAME_FUNC_OFFSET(17611, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(17629, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(17650, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(17672, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(17691, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(17713, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(17736, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
+    NAME_FUNC_OFFSET(17755, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
+    NAME_FUNC_OFFSET(17775, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
+    NAME_FUNC_OFFSET(17794, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
+    NAME_FUNC_OFFSET(17814, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
+    NAME_FUNC_OFFSET(17833, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
+    NAME_FUNC_OFFSET(17853, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
+    NAME_FUNC_OFFSET(17872, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
+    NAME_FUNC_OFFSET(17892, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
+    NAME_FUNC_OFFSET(17911, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
+    NAME_FUNC_OFFSET(17931, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
+    NAME_FUNC_OFFSET(17951, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
+    NAME_FUNC_OFFSET(17972, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
+    NAME_FUNC_OFFSET(17992, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
+    NAME_FUNC_OFFSET(18013, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
+    NAME_FUNC_OFFSET(18033, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
+    NAME_FUNC_OFFSET(18054, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
+    NAME_FUNC_OFFSET(18078, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
+    NAME_FUNC_OFFSET(18096, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
+    NAME_FUNC_OFFSET(18116, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
+    NAME_FUNC_OFFSET(18134, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
+    NAME_FUNC_OFFSET(18146, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
+    NAME_FUNC_OFFSET(18159, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
+    NAME_FUNC_OFFSET(18171, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
     NAME_FUNC_OFFSET(18184, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
-    NAME_FUNC_OFFSET(18208, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
-    NAME_FUNC_OFFSET(18222, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
-    NAME_FUNC_OFFSET(18239, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
-    NAME_FUNC_OFFSET(18254, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
-    NAME_FUNC_OFFSET(18272, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
-    NAME_FUNC_OFFSET(18286, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
-    NAME_FUNC_OFFSET(18303, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
-    NAME_FUNC_OFFSET(18318, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
-    NAME_FUNC_OFFSET(18336, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
-    NAME_FUNC_OFFSET(18350, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
-    NAME_FUNC_OFFSET(18367, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
-    NAME_FUNC_OFFSET(18382, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
-    NAME_FUNC_OFFSET(18400, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
-    NAME_FUNC_OFFSET(18414, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
-    NAME_FUNC_OFFSET(18431, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
-    NAME_FUNC_OFFSET(18446, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
-    NAME_FUNC_OFFSET(18464, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
-    NAME_FUNC_OFFSET(18478, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
-    NAME_FUNC_OFFSET(18495, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
-    NAME_FUNC_OFFSET(18510, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
-    NAME_FUNC_OFFSET(18528, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
-    NAME_FUNC_OFFSET(18542, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
-    NAME_FUNC_OFFSET(18559, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
-    NAME_FUNC_OFFSET(18574, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
-    NAME_FUNC_OFFSET(18592, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
-    NAME_FUNC_OFFSET(18606, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
-    NAME_FUNC_OFFSET(18623, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
-    NAME_FUNC_OFFSET(18638, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
-    NAME_FUNC_OFFSET(18656, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
-    NAME_FUNC_OFFSET(18670, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
-    NAME_FUNC_OFFSET(18687, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
-    NAME_FUNC_OFFSET(18702, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
-    NAME_FUNC_OFFSET(18720, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
-    NAME_FUNC_OFFSET(18737, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
-    NAME_FUNC_OFFSET(18757, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
-    NAME_FUNC_OFFSET(18774, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
-    NAME_FUNC_OFFSET(18800, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
-    NAME_FUNC_OFFSET(18829, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
-    NAME_FUNC_OFFSET(18844, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
-    NAME_FUNC_OFFSET(18862, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
-    NAME_FUNC_OFFSET(18881, gl_dispatch_stub_750, gl_dispatch_stub_750, NULL, _gloffset_BlendEquationSeparateEXT),
-    NAME_FUNC_OFFSET(18905, gl_dispatch_stub_750, gl_dispatch_stub_750, NULL, _gloffset_BlendEquationSeparateEXT),
-    NAME_FUNC_OFFSET(18932, glBindFramebufferEXT, glBindFramebufferEXT, NULL, _gloffset_BindFramebufferEXT),
-    NAME_FUNC_OFFSET(18950, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, _gloffset_BindRenderbufferEXT),
-    NAME_FUNC_OFFSET(18969, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, _gloffset_CheckFramebufferStatusEXT),
-    NAME_FUNC_OFFSET(18994, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, _gloffset_DeleteFramebuffersEXT),
-    NAME_FUNC_OFFSET(19015, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, _gloffset_DeleteRenderbuffersEXT),
-    NAME_FUNC_OFFSET(19037, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, _gloffset_FramebufferRenderbufferEXT),
-    NAME_FUNC_OFFSET(19063, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, _gloffset_FramebufferTexture1DEXT),
-    NAME_FUNC_OFFSET(19086, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, _gloffset_FramebufferTexture2DEXT),
-    NAME_FUNC_OFFSET(19109, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, _gloffset_FramebufferTexture3DEXT),
-    NAME_FUNC_OFFSET(19132, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, _gloffset_GenFramebuffersEXT),
-    NAME_FUNC_OFFSET(19150, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, _gloffset_GenRenderbuffersEXT),
-    NAME_FUNC_OFFSET(19169, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, _gloffset_GenerateMipmapEXT),
-    NAME_FUNC_OFFSET(19186, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, _gloffset_GetFramebufferAttachmentParameterivEXT),
-    NAME_FUNC_OFFSET(19224, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, _gloffset_GetRenderbufferParameterivEXT),
-    NAME_FUNC_OFFSET(19253, glIsFramebufferEXT, glIsFramebufferEXT, NULL, _gloffset_IsFramebufferEXT),
-    NAME_FUNC_OFFSET(19269, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, _gloffset_IsRenderbufferEXT),
-    NAME_FUNC_OFFSET(19286, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, _gloffset_RenderbufferStorageEXT),
-    NAME_FUNC_OFFSET(19308, gl_dispatch_stub_768, gl_dispatch_stub_768, NULL, _gloffset_BlitFramebufferEXT),
-    NAME_FUNC_OFFSET(19326, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
+    NAME_FUNC_OFFSET(18204, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
+    NAME_FUNC_OFFSET(18228, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
+    NAME_FUNC_OFFSET(18242, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
+    NAME_FUNC_OFFSET(18259, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
+    NAME_FUNC_OFFSET(18274, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
+    NAME_FUNC_OFFSET(18292, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
+    NAME_FUNC_OFFSET(18306, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
+    NAME_FUNC_OFFSET(18323, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
+    NAME_FUNC_OFFSET(18338, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
+    NAME_FUNC_OFFSET(18356, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
+    NAME_FUNC_OFFSET(18370, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
+    NAME_FUNC_OFFSET(18387, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
+    NAME_FUNC_OFFSET(18402, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
+    NAME_FUNC_OFFSET(18420, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
+    NAME_FUNC_OFFSET(18434, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
+    NAME_FUNC_OFFSET(18451, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
+    NAME_FUNC_OFFSET(18466, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
+    NAME_FUNC_OFFSET(18484, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
+    NAME_FUNC_OFFSET(18498, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
+    NAME_FUNC_OFFSET(18515, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
+    NAME_FUNC_OFFSET(18530, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
+    NAME_FUNC_OFFSET(18548, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
+    NAME_FUNC_OFFSET(18562, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
+    NAME_FUNC_OFFSET(18579, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
+    NAME_FUNC_OFFSET(18594, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
+    NAME_FUNC_OFFSET(18612, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
+    NAME_FUNC_OFFSET(18626, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
+    NAME_FUNC_OFFSET(18643, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
+    NAME_FUNC_OFFSET(18658, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
+    NAME_FUNC_OFFSET(18676, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
+    NAME_FUNC_OFFSET(18690, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
+    NAME_FUNC_OFFSET(18707, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
+    NAME_FUNC_OFFSET(18722, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
+    NAME_FUNC_OFFSET(18740, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
+    NAME_FUNC_OFFSET(18757, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
+    NAME_FUNC_OFFSET(18777, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
+    NAME_FUNC_OFFSET(18794, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
+    NAME_FUNC_OFFSET(18820, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
+    NAME_FUNC_OFFSET(18849, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
+    NAME_FUNC_OFFSET(18864, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
+    NAME_FUNC_OFFSET(18882, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
+    NAME_FUNC_OFFSET(18901, gl_dispatch_stub_751, gl_dispatch_stub_751, NULL, _gloffset_BlendEquationSeparateEXT),
+    NAME_FUNC_OFFSET(18925, gl_dispatch_stub_751, gl_dispatch_stub_751, NULL, _gloffset_BlendEquationSeparateEXT),
+    NAME_FUNC_OFFSET(18952, glBindFramebufferEXT, glBindFramebufferEXT, NULL, _gloffset_BindFramebufferEXT),
+    NAME_FUNC_OFFSET(18970, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, _gloffset_BindRenderbufferEXT),
+    NAME_FUNC_OFFSET(18989, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, _gloffset_CheckFramebufferStatusEXT),
+    NAME_FUNC_OFFSET(19014, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, _gloffset_DeleteFramebuffersEXT),
+    NAME_FUNC_OFFSET(19035, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, _gloffset_DeleteRenderbuffersEXT),
+    NAME_FUNC_OFFSET(19057, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, _gloffset_FramebufferRenderbufferEXT),
+    NAME_FUNC_OFFSET(19083, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, _gloffset_FramebufferTexture1DEXT),
+    NAME_FUNC_OFFSET(19106, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, _gloffset_FramebufferTexture2DEXT),
+    NAME_FUNC_OFFSET(19129, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, _gloffset_FramebufferTexture3DEXT),
+    NAME_FUNC_OFFSET(19152, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, _gloffset_GenFramebuffersEXT),
+    NAME_FUNC_OFFSET(19170, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, _gloffset_GenRenderbuffersEXT),
+    NAME_FUNC_OFFSET(19189, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, _gloffset_GenerateMipmapEXT),
+    NAME_FUNC_OFFSET(19206, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, _gloffset_GetFramebufferAttachmentParameterivEXT),
+    NAME_FUNC_OFFSET(19244, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, _gloffset_GetRenderbufferParameterivEXT),
+    NAME_FUNC_OFFSET(19273, glIsFramebufferEXT, glIsFramebufferEXT, NULL, _gloffset_IsFramebufferEXT),
+    NAME_FUNC_OFFSET(19289, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, _gloffset_IsRenderbufferEXT),
+    NAME_FUNC_OFFSET(19306, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, _gloffset_RenderbufferStorageEXT),
+    NAME_FUNC_OFFSET(19328, gl_dispatch_stub_769, gl_dispatch_stub_769, NULL, _gloffset_BlitFramebufferEXT),
+    NAME_FUNC_OFFSET(19346, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
     NAME_FUNC_OFFSET(-1, NULL, NULL, NULL, 0)
 };
 
diff --git a/src/mesa/main/enums.c b/src/mesa/main/enums.c
index cf893fdac5..4339e3ba4e 100644
--- a/src/mesa/main/enums.c
+++ b/src/mesa/main/enums.c
@@ -334,6 +334,8 @@ LONGSTRING static const char enum_string_table[] =
    "GL_COPY\0"
    "GL_COPY_INVERTED\0"
    "GL_COPY_PIXEL_TOKEN\0"
+   "GL_COPY_READ_BUFFER\0"
+   "GL_COPY_WRITE_BUFFER\0"
    "GL_CULL_FACE\0"
    "GL_CULL_FACE_MODE\0"
    "GL_CULL_VERTEX_EXT\0"
@@ -948,8 +950,8 @@ LONGSTRING static const char enum_string_table[] =
    "GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV\0"
    "GL_MAX_VARYING_FLOATS\0"
    "GL_MAX_VARYING_FLOATS_ARB\0"
-   "GL_MAX_VERTEX_GENERIC_ATTRIBS\0"
-   "GL_MAX_VERTEX_GENERIC_ATTRIBS_ARB\0"
+   "GL_MAX_VERTEX_ATTRIBS\0"
+   "GL_MAX_VERTEX_ATTRIBS_ARB\0"
    "GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS\0"
    "GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB\0"
    "GL_MAX_VERTEX_UNIFORM_COMPONENTS\0"
@@ -1858,7 +1860,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_ZOOM_Y\0"
    ;
 
-static const enum_elt all_enums[1820] =
+static const enum_elt all_enums[1822] =
 {
    {     0, 0x00000600 }, /* GL_2D */
    {     6, 0x00001407 }, /* GL_2_BYTES */
@@ -2158,2131 +2160,2133 @@ static const enum_elt all_enums[1820] =
    {  6027, 0x00001503 }, /* GL_COPY */
    {  6035, 0x0000150C }, /* GL_COPY_INVERTED */
    {  6052, 0x00000706 }, /* GL_COPY_PIXEL_TOKEN */
-   {  6072, 0x00000B44 }, /* GL_CULL_FACE */
-   {  6085, 0x00000B45 }, /* GL_CULL_FACE_MODE */
-   {  6103, 0x000081AA }, /* GL_CULL_VERTEX_EXT */
-   {  6122, 0x000081AC }, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
-   {  6154, 0x000081AB }, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
-   {  6189, 0x00008626 }, /* GL_CURRENT_ATTRIB_NV */
-   {  6210, 0x00000001 }, /* GL_CURRENT_BIT */
-   {  6225, 0x00000B00 }, /* GL_CURRENT_COLOR */
-   {  6242, 0x00008453 }, /* GL_CURRENT_FOG_COORD */
-   {  6263, 0x00008453 }, /* GL_CURRENT_FOG_COORDINATE */
-   {  6289, 0x00000B01 }, /* GL_CURRENT_INDEX */
-   {  6306, 0x00008641 }, /* GL_CURRENT_MATRIX_ARB */
-   {  6328, 0x00008845 }, /* GL_CURRENT_MATRIX_INDEX_ARB */
-   {  6356, 0x00008641 }, /* GL_CURRENT_MATRIX_NV */
-   {  6377, 0x00008640 }, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
-   {  6411, 0x00008640 }, /* GL_CURRENT_MATRIX_STACK_DEPTH_NV */
-   {  6444, 0x00000B02 }, /* GL_CURRENT_NORMAL */
-   {  6462, 0x00008843 }, /* GL_CURRENT_PALETTE_MATRIX_ARB */
-   {  6492, 0x00008B8D }, /* GL_CURRENT_PROGRAM */
-   {  6511, 0x00008865 }, /* GL_CURRENT_QUERY */
-   {  6528, 0x00008865 }, /* GL_CURRENT_QUERY_ARB */
-   {  6549, 0x00000B04 }, /* GL_CURRENT_RASTER_COLOR */
-   {  6573, 0x00000B09 }, /* GL_CURRENT_RASTER_DISTANCE */
-   {  6600, 0x00000B05 }, /* GL_CURRENT_RASTER_INDEX */
-   {  6624, 0x00000B07 }, /* GL_CURRENT_RASTER_POSITION */
-   {  6651, 0x00000B08 }, /* GL_CURRENT_RASTER_POSITION_VALID */
-   {  6684, 0x0000845F }, /* GL_CURRENT_RASTER_SECONDARY_COLOR */
-   {  6718, 0x00000B06 }, /* GL_CURRENT_RASTER_TEXTURE_COORDS */
-   {  6751, 0x00008459 }, /* GL_CURRENT_SECONDARY_COLOR */
-   {  6778, 0x00000B03 }, /* GL_CURRENT_TEXTURE_COORDS */
-   {  6804, 0x00008626 }, /* GL_CURRENT_VERTEX_ATTRIB */
-   {  6829, 0x00008626 }, /* GL_CURRENT_VERTEX_ATTRIB_ARB */
-   {  6858, 0x000086A8 }, /* GL_CURRENT_WEIGHT_ARB */
-   {  6880, 0x00000900 }, /* GL_CW */
-   {  6886, 0x0000875B }, /* GL_DEBUG_ASSERT_MESA */
-   {  6907, 0x00008759 }, /* GL_DEBUG_OBJECT_MESA */
-   {  6928, 0x0000875A }, /* GL_DEBUG_PRINT_MESA */
-   {  6948, 0x00002101 }, /* GL_DECAL */
-   {  6957, 0x00001E03 }, /* GL_DECR */
-   {  6965, 0x00008508 }, /* GL_DECR_WRAP */
-   {  6978, 0x00008508 }, /* GL_DECR_WRAP_EXT */
-   {  6995, 0x00008B80 }, /* GL_DELETE_STATUS */
-   {  7012, 0x00001801 }, /* GL_DEPTH */
-   {  7021, 0x000088F0 }, /* GL_DEPTH24_STENCIL8 */
-   {  7041, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT */
-   {  7061, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT_EXT */
-   {  7085, 0x00000D1F }, /* GL_DEPTH_BIAS */
-   {  7099, 0x00000D56 }, /* GL_DEPTH_BITS */
-   {  7113, 0x00008891 }, /* GL_DEPTH_BOUNDS_EXT */
-   {  7133, 0x00008890 }, /* GL_DEPTH_BOUNDS_TEST_EXT */
-   {  7158, 0x00000100 }, /* GL_DEPTH_BUFFER_BIT */
-   {  7178, 0x0000864F }, /* GL_DEPTH_CLAMP_NV */
-   {  7196, 0x00000B73 }, /* GL_DEPTH_CLEAR_VALUE */
-   {  7217, 0x00001902 }, /* GL_DEPTH_COMPONENT */
-   {  7236, 0x000081A5 }, /* GL_DEPTH_COMPONENT16 */
-   {  7257, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_ARB */
-   {  7282, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_SGIX */
-   {  7308, 0x000081A6 }, /* GL_DEPTH_COMPONENT24 */
-   {  7329, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_ARB */
-   {  7354, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_SGIX */
-   {  7380, 0x000081A7 }, /* GL_DEPTH_COMPONENT32 */
-   {  7401, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_ARB */
-   {  7426, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_SGIX */
-   {  7452, 0x00000B74 }, /* GL_DEPTH_FUNC */
-   {  7466, 0x00000B70 }, /* GL_DEPTH_RANGE */
-   {  7481, 0x00000D1E }, /* GL_DEPTH_SCALE */
-   {  7496, 0x000084F9 }, /* GL_DEPTH_STENCIL */
-   {  7513, 0x0000821A }, /* GL_DEPTH_STENCIL_ATTACHMENT */
-   {  7541, 0x000084F9 }, /* GL_DEPTH_STENCIL_NV */
-   {  7561, 0x0000886F }, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
-   {  7589, 0x0000886E }, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
-   {  7617, 0x00000B71 }, /* GL_DEPTH_TEST */
-   {  7631, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE */
-   {  7653, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE_ARB */
-   {  7679, 0x00000B72 }, /* GL_DEPTH_WRITEMASK */
-   {  7698, 0x00001201 }, /* GL_DIFFUSE */
-   {  7709, 0x00000BD0 }, /* GL_DITHER */
-   {  7719, 0x00000A02 }, /* GL_DOMAIN */
-   {  7729, 0x00001100 }, /* GL_DONT_CARE */
-   {  7742, 0x000086AE }, /* GL_DOT3_RGB */
-   {  7754, 0x000086AF }, /* GL_DOT3_RGBA */
-   {  7767, 0x000086AF }, /* GL_DOT3_RGBA_ARB */
-   {  7784, 0x00008741 }, /* GL_DOT3_RGBA_EXT */
-   {  7801, 0x000086AE }, /* GL_DOT3_RGB_ARB */
-   {  7817, 0x00008740 }, /* GL_DOT3_RGB_EXT */
-   {  7833, 0x0000140A }, /* GL_DOUBLE */
-   {  7843, 0x00000C32 }, /* GL_DOUBLEBUFFER */
-   {  7859, 0x00000C01 }, /* GL_DRAW_BUFFER */
-   {  7874, 0x00008825 }, /* GL_DRAW_BUFFER0 */
-   {  7890, 0x00008825 }, /* GL_DRAW_BUFFER0_ARB */
-   {  7910, 0x00008825 }, /* GL_DRAW_BUFFER0_ATI */
-   {  7930, 0x00008826 }, /* GL_DRAW_BUFFER1 */
-   {  7946, 0x0000882F }, /* GL_DRAW_BUFFER10 */
-   {  7963, 0x0000882F }, /* GL_DRAW_BUFFER10_ARB */
-   {  7984, 0x0000882F }, /* GL_DRAW_BUFFER10_ATI */
-   {  8005, 0x00008830 }, /* GL_DRAW_BUFFER11 */
-   {  8022, 0x00008830 }, /* GL_DRAW_BUFFER11_ARB */
-   {  8043, 0x00008830 }, /* GL_DRAW_BUFFER11_ATI */
-   {  8064, 0x00008831 }, /* GL_DRAW_BUFFER12 */
-   {  8081, 0x00008831 }, /* GL_DRAW_BUFFER12_ARB */
-   {  8102, 0x00008831 }, /* GL_DRAW_BUFFER12_ATI */
-   {  8123, 0x00008832 }, /* GL_DRAW_BUFFER13 */
-   {  8140, 0x00008832 }, /* GL_DRAW_BUFFER13_ARB */
-   {  8161, 0x00008832 }, /* GL_DRAW_BUFFER13_ATI */
-   {  8182, 0x00008833 }, /* GL_DRAW_BUFFER14 */
-   {  8199, 0x00008833 }, /* GL_DRAW_BUFFER14_ARB */
-   {  8220, 0x00008833 }, /* GL_DRAW_BUFFER14_ATI */
-   {  8241, 0x00008834 }, /* GL_DRAW_BUFFER15 */
-   {  8258, 0x00008834 }, /* GL_DRAW_BUFFER15_ARB */
-   {  8279, 0x00008834 }, /* GL_DRAW_BUFFER15_ATI */
-   {  8300, 0x00008826 }, /* GL_DRAW_BUFFER1_ARB */
-   {  8320, 0x00008826 }, /* GL_DRAW_BUFFER1_ATI */
-   {  8340, 0x00008827 }, /* GL_DRAW_BUFFER2 */
-   {  8356, 0x00008827 }, /* GL_DRAW_BUFFER2_ARB */
-   {  8376, 0x00008827 }, /* GL_DRAW_BUFFER2_ATI */
-   {  8396, 0x00008828 }, /* GL_DRAW_BUFFER3 */
-   {  8412, 0x00008828 }, /* GL_DRAW_BUFFER3_ARB */
-   {  8432, 0x00008828 }, /* GL_DRAW_BUFFER3_ATI */
-   {  8452, 0x00008829 }, /* GL_DRAW_BUFFER4 */
-   {  8468, 0x00008829 }, /* GL_DRAW_BUFFER4_ARB */
-   {  8488, 0x00008829 }, /* GL_DRAW_BUFFER4_ATI */
-   {  8508, 0x0000882A }, /* GL_DRAW_BUFFER5 */
-   {  8524, 0x0000882A }, /* GL_DRAW_BUFFER5_ARB */
-   {  8544, 0x0000882A }, /* GL_DRAW_BUFFER5_ATI */
-   {  8564, 0x0000882B }, /* GL_DRAW_BUFFER6 */
-   {  8580, 0x0000882B }, /* GL_DRAW_BUFFER6_ARB */
-   {  8600, 0x0000882B }, /* GL_DRAW_BUFFER6_ATI */
-   {  8620, 0x0000882C }, /* GL_DRAW_BUFFER7 */
-   {  8636, 0x0000882C }, /* GL_DRAW_BUFFER7_ARB */
-   {  8656, 0x0000882C }, /* GL_DRAW_BUFFER7_ATI */
-   {  8676, 0x0000882D }, /* GL_DRAW_BUFFER8 */
-   {  8692, 0x0000882D }, /* GL_DRAW_BUFFER8_ARB */
-   {  8712, 0x0000882D }, /* GL_DRAW_BUFFER8_ATI */
-   {  8732, 0x0000882E }, /* GL_DRAW_BUFFER9 */
-   {  8748, 0x0000882E }, /* GL_DRAW_BUFFER9_ARB */
-   {  8768, 0x0000882E }, /* GL_DRAW_BUFFER9_ATI */
-   {  8788, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER */
-   {  8808, 0x00008CA6 }, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
-   {  8840, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER_EXT */
-   {  8864, 0x00000705 }, /* GL_DRAW_PIXEL_TOKEN */
-   {  8884, 0x00000304 }, /* GL_DST_ALPHA */
-   {  8897, 0x00000306 }, /* GL_DST_COLOR */
-   {  8910, 0x0000877A }, /* GL_DU8DV8_ATI */
-   {  8924, 0x00008779 }, /* GL_DUDV_ATI */
-   {  8936, 0x000088EA }, /* GL_DYNAMIC_COPY */
-   {  8952, 0x000088EA }, /* GL_DYNAMIC_COPY_ARB */
-   {  8972, 0x000088E8 }, /* GL_DYNAMIC_DRAW */
-   {  8988, 0x000088E8 }, /* GL_DYNAMIC_DRAW_ARB */
-   {  9008, 0x000088E9 }, /* GL_DYNAMIC_READ */
-   {  9024, 0x000088E9 }, /* GL_DYNAMIC_READ_ARB */
-   {  9044, 0x00000B43 }, /* GL_EDGE_FLAG */
-   {  9057, 0x00008079 }, /* GL_EDGE_FLAG_ARRAY */
-   {  9076, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
-   {  9110, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB */
-   {  9148, 0x00008093 }, /* GL_EDGE_FLAG_ARRAY_POINTER */
-   {  9175, 0x0000808C }, /* GL_EDGE_FLAG_ARRAY_STRIDE */
-   {  9201, 0x00008893 }, /* GL_ELEMENT_ARRAY_BUFFER */
-   {  9225, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
-   {  9257, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB */
-   {  9293, 0x00001600 }, /* GL_EMISSION */
-   {  9305, 0x00002000 }, /* GL_ENABLE_BIT */
-   {  9319, 0x00000202 }, /* GL_EQUAL */
-   {  9328, 0x00001509 }, /* GL_EQUIV */
-   {  9337, 0x00010000 }, /* GL_EVAL_BIT */
-   {  9349, 0x00000800 }, /* GL_EXP */
-   {  9356, 0x00000801 }, /* GL_EXP2 */
-   {  9364, 0x00001F03 }, /* GL_EXTENSIONS */
-   {  9378, 0x00002400 }, /* GL_EYE_LINEAR */
-   {  9392, 0x00002502 }, /* GL_EYE_PLANE */
-   {  9405, 0x0000855C }, /* GL_EYE_PLANE_ABSOLUTE_NV */
-   {  9430, 0x0000855B }, /* GL_EYE_RADIAL_NV */
-   {  9447, 0x00000000 }, /* GL_FALSE */
-   {  9456, 0x00001101 }, /* GL_FASTEST */
-   {  9467, 0x00001C01 }, /* GL_FEEDBACK */
-   {  9479, 0x00000DF0 }, /* GL_FEEDBACK_BUFFER_POINTER */
-   {  9506, 0x00000DF1 }, /* GL_FEEDBACK_BUFFER_SIZE */
-   {  9530, 0x00000DF2 }, /* GL_FEEDBACK_BUFFER_TYPE */
-   {  9554, 0x00001B02 }, /* GL_FILL */
-   {  9562, 0x00001D00 }, /* GL_FLAT */
-   {  9570, 0x00001406 }, /* GL_FLOAT */
-   {  9579, 0x00008B5A }, /* GL_FLOAT_MAT2 */
-   {  9593, 0x00008B5A }, /* GL_FLOAT_MAT2_ARB */
-   {  9611, 0x00008B65 }, /* GL_FLOAT_MAT2x3 */
-   {  9627, 0x00008B66 }, /* GL_FLOAT_MAT2x4 */
-   {  9643, 0x00008B5B }, /* GL_FLOAT_MAT3 */
-   {  9657, 0x00008B5B }, /* GL_FLOAT_MAT3_ARB */
-   {  9675, 0x00008B67 }, /* GL_FLOAT_MAT3x2 */
-   {  9691, 0x00008B68 }, /* GL_FLOAT_MAT3x4 */
-   {  9707, 0x00008B5C }, /* GL_FLOAT_MAT4 */
-   {  9721, 0x00008B5C }, /* GL_FLOAT_MAT4_ARB */
-   {  9739, 0x00008B69 }, /* GL_FLOAT_MAT4x2 */
-   {  9755, 0x00008B6A }, /* GL_FLOAT_MAT4x3 */
-   {  9771, 0x00008B50 }, /* GL_FLOAT_VEC2 */
-   {  9785, 0x00008B50 }, /* GL_FLOAT_VEC2_ARB */
-   {  9803, 0x00008B51 }, /* GL_FLOAT_VEC3 */
-   {  9817, 0x00008B51 }, /* GL_FLOAT_VEC3_ARB */
-   {  9835, 0x00008B52 }, /* GL_FLOAT_VEC4 */
-   {  9849, 0x00008B52 }, /* GL_FLOAT_VEC4_ARB */
-   {  9867, 0x00000B60 }, /* GL_FOG */
-   {  9874, 0x00000080 }, /* GL_FOG_BIT */
-   {  9885, 0x00000B66 }, /* GL_FOG_COLOR */
-   {  9898, 0x00008451 }, /* GL_FOG_COORD */
-   {  9911, 0x00008451 }, /* GL_FOG_COORDINATE */
-   {  9929, 0x00008457 }, /* GL_FOG_COORDINATE_ARRAY */
-   {  9953, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
-   {  9992, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB */
-   { 10035, 0x00008456 }, /* GL_FOG_COORDINATE_ARRAY_POINTER */
-   { 10067, 0x00008455 }, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
-   { 10098, 0x00008454 }, /* GL_FOG_COORDINATE_ARRAY_TYPE */
-   { 10127, 0x00008450 }, /* GL_FOG_COORDINATE_SOURCE */
-   { 10152, 0x00008457 }, /* GL_FOG_COORD_ARRAY */
-   { 10171, 0x0000889D }, /* GL_FOG_COORD_ARRAY_BUFFER_BINDING */
-   { 10205, 0x00008456 }, /* GL_FOG_COORD_ARRAY_POINTER */
-   { 10232, 0x00008455 }, /* GL_FOG_COORD_ARRAY_STRIDE */
-   { 10258, 0x00008454 }, /* GL_FOG_COORD_ARRAY_TYPE */
-   { 10282, 0x00008450 }, /* GL_FOG_COORD_SRC */
-   { 10299, 0x00000B62 }, /* GL_FOG_DENSITY */
-   { 10314, 0x0000855A }, /* GL_FOG_DISTANCE_MODE_NV */
-   { 10338, 0x00000B64 }, /* GL_FOG_END */
-   { 10349, 0x00000C54 }, /* GL_FOG_HINT */
-   { 10361, 0x00000B61 }, /* GL_FOG_INDEX */
-   { 10374, 0x00000B65 }, /* GL_FOG_MODE */
-   { 10386, 0x00008198 }, /* GL_FOG_OFFSET_SGIX */
-   { 10405, 0x00008199 }, /* GL_FOG_OFFSET_VALUE_SGIX */
-   { 10430, 0x00000B63 }, /* GL_FOG_START */
-   { 10443, 0x00008452 }, /* GL_FRAGMENT_DEPTH */
-   { 10461, 0x00008804 }, /* GL_FRAGMENT_PROGRAM_ARB */
-   { 10485, 0x00008B30 }, /* GL_FRAGMENT_SHADER */
-   { 10504, 0x00008B30 }, /* GL_FRAGMENT_SHADER_ARB */
-   { 10527, 0x00008B8B }, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
-   { 10562, 0x00008D40 }, /* GL_FRAMEBUFFER */
-   { 10577, 0x00008215 }, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
-   { 10614, 0x00008214 }, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
-   { 10650, 0x00008210 }, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
-   { 10691, 0x00008211 }, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
-   { 10732, 0x00008216 }, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
-   { 10769, 0x00008213 }, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
-   { 10806, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
-   { 10844, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT */
-   { 10886, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
-   { 10924, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT */
-   { 10966, 0x00008212 }, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
-   { 11001, 0x00008217 }, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
-   { 11040, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT */
-   { 11089, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
-   { 11137, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT */
-   { 11189, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
-   { 11229, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
-   { 11273, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
-   { 11313, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT */
-   { 11357, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING_EXT */
-   { 11384, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE */
-   { 11408, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE_EXT */
-   { 11436, 0x00008218 }, /* GL_FRAMEBUFFER_DEFAULT */
-   { 11459, 0x00008D40 }, /* GL_FRAMEBUFFER_EXT */
-   { 11478, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
-   { 11515, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT */
-   { 11556, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
-   { 11597, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
-   { 11639, 0x00008CD8 }, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
-   { 11690, 0x00008CDA }, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
-   { 11728, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
-   { 11773, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT */
-   { 11822, 0x00008D56 }, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
-   { 11860, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
-   { 11902, 0x00008CDE }, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
-   { 11934, 0x00008219 }, /* GL_FRAMEBUFFER_UNDEFINED */
-   { 11959, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED */
-   { 11986, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED_EXT */
-   { 12017, 0x00000404 }, /* GL_FRONT */
-   { 12026, 0x00000408 }, /* GL_FRONT_AND_BACK */
-   { 12044, 0x00000B46 }, /* GL_FRONT_FACE */
-   { 12058, 0x00000400 }, /* GL_FRONT_LEFT */
-   { 12072, 0x00000401 }, /* GL_FRONT_RIGHT */
-   { 12087, 0x00008006 }, /* GL_FUNC_ADD */
-   { 12099, 0x00008006 }, /* GL_FUNC_ADD_EXT */
-   { 12115, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT */
-   { 12140, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT_EXT */
-   { 12169, 0x0000800A }, /* GL_FUNC_SUBTRACT */
-   { 12186, 0x0000800A }, /* GL_FUNC_SUBTRACT_EXT */
-   { 12207, 0x00008191 }, /* GL_GENERATE_MIPMAP */
-   { 12226, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT */
-   { 12250, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT_SGIS */
-   { 12279, 0x00008191 }, /* GL_GENERATE_MIPMAP_SGIS */
-   { 12303, 0x00000206 }, /* GL_GEQUAL */
-   { 12313, 0x00000204 }, /* GL_GREATER */
-   { 12324, 0x00001904 }, /* GL_GREEN */
-   { 12333, 0x00000D19 }, /* GL_GREEN_BIAS */
-   { 12347, 0x00000D53 }, /* GL_GREEN_BITS */
-   { 12361, 0x00000D18 }, /* GL_GREEN_SCALE */
-   { 12376, 0x00008000 }, /* GL_HINT_BIT */
-   { 12388, 0x00008024 }, /* GL_HISTOGRAM */
-   { 12401, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE */
-   { 12425, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE_EXT */
-   { 12453, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE */
-   { 12476, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE_EXT */
-   { 12503, 0x00008024 }, /* GL_HISTOGRAM_EXT */
-   { 12520, 0x00008027 }, /* GL_HISTOGRAM_FORMAT */
-   { 12540, 0x00008027 }, /* GL_HISTOGRAM_FORMAT_EXT */
-   { 12564, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE */
-   { 12588, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE_EXT */
-   { 12616, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE */
-   { 12644, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE_EXT */
-   { 12676, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE */
-   { 12698, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE_EXT */
-   { 12724, 0x0000802D }, /* GL_HISTOGRAM_SINK */
-   { 12742, 0x0000802D }, /* GL_HISTOGRAM_SINK_EXT */
-   { 12764, 0x00008026 }, /* GL_HISTOGRAM_WIDTH */
-   { 12783, 0x00008026 }, /* GL_HISTOGRAM_WIDTH_EXT */
-   { 12806, 0x0000862A }, /* GL_IDENTITY_NV */
-   { 12821, 0x00008150 }, /* GL_IGNORE_BORDER_HP */
-   { 12841, 0x00008B9B }, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
-   { 12881, 0x00008B9A }, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
-   { 12919, 0x00001E02 }, /* GL_INCR */
-   { 12927, 0x00008507 }, /* GL_INCR_WRAP */
-   { 12940, 0x00008507 }, /* GL_INCR_WRAP_EXT */
-   { 12957, 0x00008222 }, /* GL_INDEX */
-   { 12966, 0x00008077 }, /* GL_INDEX_ARRAY */
-   { 12981, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING */
-   { 13011, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING_ARB */
-   { 13045, 0x00008091 }, /* GL_INDEX_ARRAY_POINTER */
-   { 13068, 0x00008086 }, /* GL_INDEX_ARRAY_STRIDE */
-   { 13090, 0x00008085 }, /* GL_INDEX_ARRAY_TYPE */
-   { 13110, 0x00000D51 }, /* GL_INDEX_BITS */
-   { 13124, 0x00000C20 }, /* GL_INDEX_CLEAR_VALUE */
-   { 13145, 0x00000BF1 }, /* GL_INDEX_LOGIC_OP */
-   { 13163, 0x00000C30 }, /* GL_INDEX_MODE */
-   { 13177, 0x00000D13 }, /* GL_INDEX_OFFSET */
-   { 13193, 0x00000D12 }, /* GL_INDEX_SHIFT */
-   { 13208, 0x00000C21 }, /* GL_INDEX_WRITEMASK */
-   { 13227, 0x00008B84 }, /* GL_INFO_LOG_LENGTH */
-   { 13246, 0x00001404 }, /* GL_INT */
-   { 13253, 0x00008049 }, /* GL_INTENSITY */
-   { 13266, 0x0000804C }, /* GL_INTENSITY12 */
-   { 13281, 0x0000804C }, /* GL_INTENSITY12_EXT */
-   { 13300, 0x0000804D }, /* GL_INTENSITY16 */
-   { 13315, 0x0000804D }, /* GL_INTENSITY16_EXT */
-   { 13334, 0x0000804A }, /* GL_INTENSITY4 */
-   { 13348, 0x0000804A }, /* GL_INTENSITY4_EXT */
-   { 13366, 0x0000804B }, /* GL_INTENSITY8 */
-   { 13380, 0x0000804B }, /* GL_INTENSITY8_EXT */
-   { 13398, 0x00008049 }, /* GL_INTENSITY_EXT */
-   { 13415, 0x00008575 }, /* GL_INTERPOLATE */
-   { 13430, 0x00008575 }, /* GL_INTERPOLATE_ARB */
-   { 13449, 0x00008575 }, /* GL_INTERPOLATE_EXT */
-   { 13468, 0x00008B53 }, /* GL_INT_VEC2 */
-   { 13480, 0x00008B53 }, /* GL_INT_VEC2_ARB */
-   { 13496, 0x00008B54 }, /* GL_INT_VEC3 */
-   { 13508, 0x00008B54 }, /* GL_INT_VEC3_ARB */
-   { 13524, 0x00008B55 }, /* GL_INT_VEC4 */
-   { 13536, 0x00008B55 }, /* GL_INT_VEC4_ARB */
-   { 13552, 0x00000500 }, /* GL_INVALID_ENUM */
-   { 13568, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION */
-   { 13601, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION_EXT */
-   { 13638, 0x00000502 }, /* GL_INVALID_OPERATION */
-   { 13659, 0x00000501 }, /* GL_INVALID_VALUE */
-   { 13676, 0x0000862B }, /* GL_INVERSE_NV */
-   { 13690, 0x0000862D }, /* GL_INVERSE_TRANSPOSE_NV */
-   { 13714, 0x0000150A }, /* GL_INVERT */
-   { 13724, 0x00001E00 }, /* GL_KEEP */
-   { 13732, 0x00000406 }, /* GL_LEFT */
-   { 13740, 0x00000203 }, /* GL_LEQUAL */
-   { 13750, 0x00000201 }, /* GL_LESS */
-   { 13758, 0x00004000 }, /* GL_LIGHT0 */
-   { 13768, 0x00004001 }, /* GL_LIGHT1 */
-   { 13778, 0x00004002 }, /* GL_LIGHT2 */
-   { 13788, 0x00004003 }, /* GL_LIGHT3 */
-   { 13798, 0x00004004 }, /* GL_LIGHT4 */
-   { 13808, 0x00004005 }, /* GL_LIGHT5 */
-   { 13818, 0x00004006 }, /* GL_LIGHT6 */
-   { 13828, 0x00004007 }, /* GL_LIGHT7 */
-   { 13838, 0x00000B50 }, /* GL_LIGHTING */
-   { 13850, 0x00000040 }, /* GL_LIGHTING_BIT */
-   { 13866, 0x00000B53 }, /* GL_LIGHT_MODEL_AMBIENT */
-   { 13889, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL */
-   { 13918, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL_EXT */
-   { 13951, 0x00000B51 }, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
-   { 13979, 0x00000B52 }, /* GL_LIGHT_MODEL_TWO_SIDE */
-   { 14003, 0x00001B01 }, /* GL_LINE */
-   { 14011, 0x00002601 }, /* GL_LINEAR */
-   { 14021, 0x00001208 }, /* GL_LINEAR_ATTENUATION */
-   { 14043, 0x00008170 }, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
-   { 14073, 0x0000844F }, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
-   { 14104, 0x00002703 }, /* GL_LINEAR_MIPMAP_LINEAR */
-   { 14128, 0x00002701 }, /* GL_LINEAR_MIPMAP_NEAREST */
-   { 14153, 0x00000001 }, /* GL_LINES */
-   { 14162, 0x00000004 }, /* GL_LINE_BIT */
-   { 14174, 0x00000002 }, /* GL_LINE_LOOP */
-   { 14187, 0x00000707 }, /* GL_LINE_RESET_TOKEN */
-   { 14207, 0x00000B20 }, /* GL_LINE_SMOOTH */
-   { 14222, 0x00000C52 }, /* GL_LINE_SMOOTH_HINT */
-   { 14242, 0x00000B24 }, /* GL_LINE_STIPPLE */
-   { 14258, 0x00000B25 }, /* GL_LINE_STIPPLE_PATTERN */
-   { 14282, 0x00000B26 }, /* GL_LINE_STIPPLE_REPEAT */
-   { 14305, 0x00000003 }, /* GL_LINE_STRIP */
-   { 14319, 0x00000702 }, /* GL_LINE_TOKEN */
-   { 14333, 0x00000B21 }, /* GL_LINE_WIDTH */
-   { 14347, 0x00000B23 }, /* GL_LINE_WIDTH_GRANULARITY */
-   { 14373, 0x00000B22 }, /* GL_LINE_WIDTH_RANGE */
-   { 14393, 0x00008B82 }, /* GL_LINK_STATUS */
-   { 14408, 0x00000B32 }, /* GL_LIST_BASE */
-   { 14421, 0x00020000 }, /* GL_LIST_BIT */
-   { 14433, 0x00000B33 }, /* GL_LIST_INDEX */
-   { 14447, 0x00000B30 }, /* GL_LIST_MODE */
-   { 14460, 0x00000101 }, /* GL_LOAD */
-   { 14468, 0x00000BF1 }, /* GL_LOGIC_OP */
-   { 14480, 0x00000BF0 }, /* GL_LOGIC_OP_MODE */
-   { 14497, 0x00008CA1 }, /* GL_LOWER_LEFT */
-   { 14511, 0x00001909 }, /* GL_LUMINANCE */
-   { 14524, 0x00008041 }, /* GL_LUMINANCE12 */
-   { 14539, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12 */
-   { 14562, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12_EXT */
-   { 14589, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4 */
-   { 14611, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4_EXT */
-   { 14637, 0x00008041 }, /* GL_LUMINANCE12_EXT */
-   { 14656, 0x00008042 }, /* GL_LUMINANCE16 */
-   { 14671, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16 */
-   { 14694, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16_EXT */
-   { 14721, 0x00008042 }, /* GL_LUMINANCE16_EXT */
-   { 14740, 0x0000803F }, /* GL_LUMINANCE4 */
-   { 14754, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4 */
-   { 14775, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4_EXT */
-   { 14800, 0x0000803F }, /* GL_LUMINANCE4_EXT */
-   { 14818, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2 */
-   { 14839, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2_EXT */
-   { 14864, 0x00008040 }, /* GL_LUMINANCE8 */
-   { 14878, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8 */
-   { 14899, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8_EXT */
-   { 14924, 0x00008040 }, /* GL_LUMINANCE8_EXT */
-   { 14942, 0x0000190A }, /* GL_LUMINANCE_ALPHA */
-   { 14961, 0x00000D90 }, /* GL_MAP1_COLOR_4 */
-   { 14977, 0x00000DD0 }, /* GL_MAP1_GRID_DOMAIN */
-   { 14997, 0x00000DD1 }, /* GL_MAP1_GRID_SEGMENTS */
-   { 15019, 0x00000D91 }, /* GL_MAP1_INDEX */
-   { 15033, 0x00000D92 }, /* GL_MAP1_NORMAL */
-   { 15048, 0x00000D93 }, /* GL_MAP1_TEXTURE_COORD_1 */
-   { 15072, 0x00000D94 }, /* GL_MAP1_TEXTURE_COORD_2 */
-   { 15096, 0x00000D95 }, /* GL_MAP1_TEXTURE_COORD_3 */
-   { 15120, 0x00000D96 }, /* GL_MAP1_TEXTURE_COORD_4 */
-   { 15144, 0x00000D97 }, /* GL_MAP1_VERTEX_3 */
-   { 15161, 0x00000D98 }, /* GL_MAP1_VERTEX_4 */
-   { 15178, 0x00008660 }, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
-   { 15206, 0x0000866A }, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
-   { 15235, 0x0000866B }, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
-   { 15264, 0x0000866C }, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
-   { 15293, 0x0000866D }, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
-   { 15322, 0x0000866E }, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
-   { 15351, 0x0000866F }, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
-   { 15380, 0x00008661 }, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
-   { 15408, 0x00008662 }, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
-   { 15436, 0x00008663 }, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
-   { 15464, 0x00008664 }, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
-   { 15492, 0x00008665 }, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
-   { 15520, 0x00008666 }, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
-   { 15548, 0x00008667 }, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
-   { 15576, 0x00008668 }, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
-   { 15604, 0x00008669 }, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
-   { 15632, 0x00000DB0 }, /* GL_MAP2_COLOR_4 */
-   { 15648, 0x00000DD2 }, /* GL_MAP2_GRID_DOMAIN */
-   { 15668, 0x00000DD3 }, /* GL_MAP2_GRID_SEGMENTS */
-   { 15690, 0x00000DB1 }, /* GL_MAP2_INDEX */
-   { 15704, 0x00000DB2 }, /* GL_MAP2_NORMAL */
-   { 15719, 0x00000DB3 }, /* GL_MAP2_TEXTURE_COORD_1 */
-   { 15743, 0x00000DB4 }, /* GL_MAP2_TEXTURE_COORD_2 */
-   { 15767, 0x00000DB5 }, /* GL_MAP2_TEXTURE_COORD_3 */
-   { 15791, 0x00000DB6 }, /* GL_MAP2_TEXTURE_COORD_4 */
-   { 15815, 0x00000DB7 }, /* GL_MAP2_VERTEX_3 */
-   { 15832, 0x00000DB8 }, /* GL_MAP2_VERTEX_4 */
-   { 15849, 0x00008670 }, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
-   { 15877, 0x0000867A }, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
-   { 15906, 0x0000867B }, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
-   { 15935, 0x0000867C }, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
-   { 15964, 0x0000867D }, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
-   { 15993, 0x0000867E }, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
-   { 16022, 0x0000867F }, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
-   { 16051, 0x00008671 }, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
-   { 16079, 0x00008672 }, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
-   { 16107, 0x00008673 }, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
-   { 16135, 0x00008674 }, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
-   { 16163, 0x00008675 }, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
-   { 16191, 0x00008676 }, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
-   { 16219, 0x00008677 }, /* GL_MAP2_VERTEX_ATTRIB7_4_NV */
-   { 16247, 0x00008678 }, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
-   { 16275, 0x00008679 }, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
-   { 16303, 0x00000D10 }, /* GL_MAP_COLOR */
-   { 16316, 0x00000D11 }, /* GL_MAP_STENCIL */
-   { 16331, 0x000088C0 }, /* GL_MATRIX0_ARB */
-   { 16346, 0x00008630 }, /* GL_MATRIX0_NV */
-   { 16360, 0x000088CA }, /* GL_MATRIX10_ARB */
-   { 16376, 0x000088CB }, /* GL_MATRIX11_ARB */
-   { 16392, 0x000088CC }, /* GL_MATRIX12_ARB */
-   { 16408, 0x000088CD }, /* GL_MATRIX13_ARB */
-   { 16424, 0x000088CE }, /* GL_MATRIX14_ARB */
-   { 16440, 0x000088CF }, /* GL_MATRIX15_ARB */
-   { 16456, 0x000088D0 }, /* GL_MATRIX16_ARB */
-   { 16472, 0x000088D1 }, /* GL_MATRIX17_ARB */
-   { 16488, 0x000088D2 }, /* GL_MATRIX18_ARB */
-   { 16504, 0x000088D3 }, /* GL_MATRIX19_ARB */
-   { 16520, 0x000088C1 }, /* GL_MATRIX1_ARB */
-   { 16535, 0x00008631 }, /* GL_MATRIX1_NV */
-   { 16549, 0x000088D4 }, /* GL_MATRIX20_ARB */
-   { 16565, 0x000088D5 }, /* GL_MATRIX21_ARB */
-   { 16581, 0x000088D6 }, /* GL_MATRIX22_ARB */
-   { 16597, 0x000088D7 }, /* GL_MATRIX23_ARB */
-   { 16613, 0x000088D8 }, /* GL_MATRIX24_ARB */
-   { 16629, 0x000088D9 }, /* GL_MATRIX25_ARB */
-   { 16645, 0x000088DA }, /* GL_MATRIX26_ARB */
-   { 16661, 0x000088DB }, /* GL_MATRIX27_ARB */
-   { 16677, 0x000088DC }, /* GL_MATRIX28_ARB */
-   { 16693, 0x000088DD }, /* GL_MATRIX29_ARB */
-   { 16709, 0x000088C2 }, /* GL_MATRIX2_ARB */
-   { 16724, 0x00008632 }, /* GL_MATRIX2_NV */
-   { 16738, 0x000088DE }, /* GL_MATRIX30_ARB */
-   { 16754, 0x000088DF }, /* GL_MATRIX31_ARB */
-   { 16770, 0x000088C3 }, /* GL_MATRIX3_ARB */
-   { 16785, 0x00008633 }, /* GL_MATRIX3_NV */
-   { 16799, 0x000088C4 }, /* GL_MATRIX4_ARB */
-   { 16814, 0x00008634 }, /* GL_MATRIX4_NV */
-   { 16828, 0x000088C5 }, /* GL_MATRIX5_ARB */
-   { 16843, 0x00008635 }, /* GL_MATRIX5_NV */
-   { 16857, 0x000088C6 }, /* GL_MATRIX6_ARB */
-   { 16872, 0x00008636 }, /* GL_MATRIX6_NV */
-   { 16886, 0x000088C7 }, /* GL_MATRIX7_ARB */
-   { 16901, 0x00008637 }, /* GL_MATRIX7_NV */
-   { 16915, 0x000088C8 }, /* GL_MATRIX8_ARB */
-   { 16930, 0x000088C9 }, /* GL_MATRIX9_ARB */
-   { 16945, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_ARB */
-   { 16971, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
-   { 17005, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
-   { 17036, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
-   { 17069, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
-   { 17100, 0x00000BA0 }, /* GL_MATRIX_MODE */
-   { 17115, 0x00008840 }, /* GL_MATRIX_PALETTE_ARB */
-   { 17137, 0x00008008 }, /* GL_MAX */
-   { 17144, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE */
-   { 17167, 0x000088FF }, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
-   { 17199, 0x00000D35 }, /* GL_MAX_ATTRIB_STACK_DEPTH */
-   { 17225, 0x00000D3B }, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
-   { 17258, 0x00008177 }, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
-   { 17284, 0x00008178 }, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-   { 17318, 0x00000D32 }, /* GL_MAX_CLIP_PLANES */
-   { 17337, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
-   { 17366, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
-   { 17398, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI */
-   { 17434, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
-   { 17470, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB */
-   { 17510, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT */
-   { 17536, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT_EXT */
-   { 17566, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH */
-   { 17591, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH_EXT */
-   { 17620, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
-   { 17649, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB */
-   { 17682, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS */
-   { 17702, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ARB */
-   { 17726, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ATI */
-   { 17750, 0x000080E9 }, /* GL_MAX_ELEMENTS_INDICES */
-   { 17774, 0x000080E8 }, /* GL_MAX_ELEMENTS_VERTICES */
-   { 17799, 0x00000D30 }, /* GL_MAX_EVAL_ORDER */
-   { 17817, 0x00008008 }, /* GL_MAX_EXT */
-   { 17828, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
-   { 17863, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB */
-   { 17902, 0x00000D31 }, /* GL_MAX_LIGHTS */
-   { 17916, 0x00000B31 }, /* GL_MAX_LIST_NESTING */
-   { 17936, 0x00008841 }, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
-   { 17974, 0x00000D36 }, /* GL_MAX_MODELVIEW_STACK_DEPTH */
-   { 18003, 0x00000D37 }, /* GL_MAX_NAME_STACK_DEPTH */
-   { 18027, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_ARB */
-   { 18055, 0x00000D34 }, /* GL_MAX_PIXEL_MAP_TABLE */
-   { 18078, 0x000088B1 }, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
-   { 18115, 0x0000880B }, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
-   { 18151, 0x000088AD }, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
-   { 18178, 0x000088F5 }, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
-   { 18207, 0x000088B5 }, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
-   { 18241, 0x000088F4 }, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
-   { 18277, 0x000088F6 }, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
-   { 18304, 0x000088A1 }, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
-   { 18336, 0x000088B4 }, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
-   { 18372, 0x000088F8 }, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
-   { 18401, 0x000088F7 }, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
-   { 18430, 0x0000862F }, /* GL_MAX_PROGRAM_MATRICES_ARB */
-   { 18458, 0x0000862E }, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
-   { 18496, 0x000088B3 }, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-   { 18540, 0x0000880E }, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-   { 18583, 0x000088AF }, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
-   { 18617, 0x000088A3 }, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-   { 18656, 0x000088AB }, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
-   { 18693, 0x000088A7 }, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
-   { 18731, 0x00008810 }, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-   { 18774, 0x0000880F }, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-   { 18817, 0x000088A9 }, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
-   { 18847, 0x000088A5 }, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
-   { 18878, 0x0000880D }, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
-   { 18914, 0x0000880C }, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
-   { 18950, 0x00000D38 }, /* GL_MAX_PROJECTION_STACK_DEPTH */
-   { 18980, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
-   { 19014, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_NV */
-   { 19047, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
-   { 19076, 0x00008D57 }, /* GL_MAX_SAMPLES */
-   { 19091, 0x00008504 }, /* GL_MAX_SHININESS_NV */
-   { 19111, 0x00008505 }, /* GL_MAX_SPOT_EXPONENT_NV */
-   { 19135, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS */
-   { 19157, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS_ARB */
-   { 19183, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS */
-   { 19210, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS_ARB */
-   { 19241, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS */
-   { 19265, 0x000084FF }, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
-   { 19299, 0x00000D33 }, /* GL_MAX_TEXTURE_SIZE */
-   { 19319, 0x00000D39 }, /* GL_MAX_TEXTURE_STACK_DEPTH */
-   { 19346, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS */
-   { 19367, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS_ARB */
-   { 19392, 0x0000862F }, /* GL_MAX_TRACK_MATRICES_NV */
-   { 19417, 0x0000862E }, /* GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */
-   { 19452, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS */
-   { 19474, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS_ARB */
-   { 19500, 0x00008869 }, /* GL_MAX_VERTEX_GENERIC_ATTRIBS */
-   { 19522, 0x00008869 }, /* GL_MAX_VERTEX_GENERIC_ATTRIBS_ARB */
-   { 19548, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
-   { 19582, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
-   { 19620, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
-   { 19653, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB */
-   { 19690, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_ARB */
-   { 19714, 0x00000D3A }, /* GL_MAX_VIEWPORT_DIMS */
-   { 19735, 0x00008007 }, /* GL_MIN */
-   { 19742, 0x0000802E }, /* GL_MINMAX */
-   { 19752, 0x0000802E }, /* GL_MINMAX_EXT */
-   { 19766, 0x0000802F }, /* GL_MINMAX_FORMAT */
-   { 19783, 0x0000802F }, /* GL_MINMAX_FORMAT_EXT */
-   { 19804, 0x00008030 }, /* GL_MINMAX_SINK */
-   { 19819, 0x00008030 }, /* GL_MINMAX_SINK_EXT */
-   { 19838, 0x00008007 }, /* GL_MIN_EXT */
-   { 19849, 0x00008370 }, /* GL_MIRRORED_REPEAT */
-   { 19868, 0x00008370 }, /* GL_MIRRORED_REPEAT_ARB */
-   { 19891, 0x00008370 }, /* GL_MIRRORED_REPEAT_IBM */
-   { 19914, 0x00008742 }, /* GL_MIRROR_CLAMP_ATI */
-   { 19934, 0x00008742 }, /* GL_MIRROR_CLAMP_EXT */
-   { 19954, 0x00008912 }, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
-   { 19984, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_ATI */
-   { 20012, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
-   { 20040, 0x00001700 }, /* GL_MODELVIEW */
-   { 20053, 0x00001700 }, /* GL_MODELVIEW0_ARB */
-   { 20071, 0x0000872A }, /* GL_MODELVIEW10_ARB */
-   { 20090, 0x0000872B }, /* GL_MODELVIEW11_ARB */
-   { 20109, 0x0000872C }, /* GL_MODELVIEW12_ARB */
-   { 20128, 0x0000872D }, /* GL_MODELVIEW13_ARB */
-   { 20147, 0x0000872E }, /* GL_MODELVIEW14_ARB */
-   { 20166, 0x0000872F }, /* GL_MODELVIEW15_ARB */
-   { 20185, 0x00008730 }, /* GL_MODELVIEW16_ARB */
-   { 20204, 0x00008731 }, /* GL_MODELVIEW17_ARB */
-   { 20223, 0x00008732 }, /* GL_MODELVIEW18_ARB */
-   { 20242, 0x00008733 }, /* GL_MODELVIEW19_ARB */
-   { 20261, 0x0000850A }, /* GL_MODELVIEW1_ARB */
-   { 20279, 0x00008734 }, /* GL_MODELVIEW20_ARB */
-   { 20298, 0x00008735 }, /* GL_MODELVIEW21_ARB */
-   { 20317, 0x00008736 }, /* GL_MODELVIEW22_ARB */
-   { 20336, 0x00008737 }, /* GL_MODELVIEW23_ARB */
-   { 20355, 0x00008738 }, /* GL_MODELVIEW24_ARB */
-   { 20374, 0x00008739 }, /* GL_MODELVIEW25_ARB */
-   { 20393, 0x0000873A }, /* GL_MODELVIEW26_ARB */
-   { 20412, 0x0000873B }, /* GL_MODELVIEW27_ARB */
-   { 20431, 0x0000873C }, /* GL_MODELVIEW28_ARB */
-   { 20450, 0x0000873D }, /* GL_MODELVIEW29_ARB */
-   { 20469, 0x00008722 }, /* GL_MODELVIEW2_ARB */
-   { 20487, 0x0000873E }, /* GL_MODELVIEW30_ARB */
-   { 20506, 0x0000873F }, /* GL_MODELVIEW31_ARB */
-   { 20525, 0x00008723 }, /* GL_MODELVIEW3_ARB */
-   { 20543, 0x00008724 }, /* GL_MODELVIEW4_ARB */
-   { 20561, 0x00008725 }, /* GL_MODELVIEW5_ARB */
-   { 20579, 0x00008726 }, /* GL_MODELVIEW6_ARB */
-   { 20597, 0x00008727 }, /* GL_MODELVIEW7_ARB */
-   { 20615, 0x00008728 }, /* GL_MODELVIEW8_ARB */
-   { 20633, 0x00008729 }, /* GL_MODELVIEW9_ARB */
-   { 20651, 0x00000BA6 }, /* GL_MODELVIEW_MATRIX */
-   { 20671, 0x00008629 }, /* GL_MODELVIEW_PROJECTION_NV */
-   { 20698, 0x00000BA3 }, /* GL_MODELVIEW_STACK_DEPTH */
-   { 20723, 0x00002100 }, /* GL_MODULATE */
-   { 20735, 0x00008744 }, /* GL_MODULATE_ADD_ATI */
-   { 20755, 0x00008745 }, /* GL_MODULATE_SIGNED_ADD_ATI */
-   { 20782, 0x00008746 }, /* GL_MODULATE_SUBTRACT_ATI */
-   { 20807, 0x00000103 }, /* GL_MULT */
-   { 20815, 0x0000809D }, /* GL_MULTISAMPLE */
-   { 20830, 0x000086B2 }, /* GL_MULTISAMPLE_3DFX */
-   { 20850, 0x0000809D }, /* GL_MULTISAMPLE_ARB */
-   { 20869, 0x20000000 }, /* GL_MULTISAMPLE_BIT */
-   { 20888, 0x20000000 }, /* GL_MULTISAMPLE_BIT_3DFX */
-   { 20912, 0x20000000 }, /* GL_MULTISAMPLE_BIT_ARB */
-   { 20935, 0x00008534 }, /* GL_MULTISAMPLE_FILTER_HINT_NV */
-   { 20965, 0x00002A25 }, /* GL_N3F_V3F */
-   { 20976, 0x00000D70 }, /* GL_NAME_STACK_DEPTH */
-   { 20996, 0x0000150E }, /* GL_NAND */
-   { 21004, 0x00002600 }, /* GL_NEAREST */
-   { 21015, 0x0000844E }, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
-   { 21046, 0x0000844D }, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
-   { 21078, 0x00002702 }, /* GL_NEAREST_MIPMAP_LINEAR */
-   { 21103, 0x00002700 }, /* GL_NEAREST_MIPMAP_NEAREST */
-   { 21129, 0x00000200 }, /* GL_NEVER */
-   { 21138, 0x00001102 }, /* GL_NICEST */
-   { 21148, 0x00000000 }, /* GL_NONE */
-   { 21156, 0x00001505 }, /* GL_NOOP */
-   { 21164, 0x00001508 }, /* GL_NOR */
-   { 21171, 0x00000BA1 }, /* GL_NORMALIZE */
-   { 21184, 0x00008075 }, /* GL_NORMAL_ARRAY */
-   { 21200, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
-   { 21231, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING_ARB */
-   { 21266, 0x0000808F }, /* GL_NORMAL_ARRAY_POINTER */
-   { 21290, 0x0000807F }, /* GL_NORMAL_ARRAY_STRIDE */
-   { 21313, 0x0000807E }, /* GL_NORMAL_ARRAY_TYPE */
-   { 21334, 0x00008511 }, /* GL_NORMAL_MAP */
-   { 21348, 0x00008511 }, /* GL_NORMAL_MAP_ARB */
-   { 21366, 0x00008511 }, /* GL_NORMAL_MAP_NV */
-   { 21383, 0x00000205 }, /* GL_NOTEQUAL */
-   { 21395, 0x00000000 }, /* GL_NO_ERROR */
-   { 21407, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
-   { 21441, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB */
-   { 21479, 0x00008B89 }, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */
-   { 21511, 0x00008B8A }, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */
-   { 21553, 0x00008B86 }, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */
-   { 21583, 0x00008B87 }, /* GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB */
-   { 21623, 0x00008B85 }, /* GL_OBJECT_ATTACHED_OBJECTS_ARB */
-   { 21654, 0x00008B81 }, /* GL_OBJECT_COMPILE_STATUS_ARB */
-   { 21683, 0x00008B80 }, /* GL_OBJECT_DELETE_STATUS_ARB */
-   { 21711, 0x00008B84 }, /* GL_OBJECT_INFO_LOG_LENGTH_ARB */
-   { 21741, 0x00002401 }, /* GL_OBJECT_LINEAR */
-   { 21758, 0x00008B82 }, /* GL_OBJECT_LINK_STATUS_ARB */
-   { 21784, 0x00002501 }, /* GL_OBJECT_PLANE */
-   { 21800, 0x00008B88 }, /* GL_OBJECT_SHADER_SOURCE_LENGTH_ARB */
-   { 21835, 0x00008B4F }, /* GL_OBJECT_SUBTYPE_ARB */
-   { 21857, 0x00008B4E }, /* GL_OBJECT_TYPE_ARB */
-   { 21876, 0x00008B83 }, /* GL_OBJECT_VALIDATE_STATUS_ARB */
-   { 21906, 0x00008165 }, /* GL_OCCLUSION_TEST_HP */
-   { 21927, 0x00008166 }, /* GL_OCCLUSION_TEST_RESULT_HP */
-   { 21955, 0x00000001 }, /* GL_ONE */
-   { 21962, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA */
-   { 21990, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA_EXT */
-   { 22022, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR */
-   { 22050, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR_EXT */
-   { 22082, 0x00000305 }, /* GL_ONE_MINUS_DST_ALPHA */
-   { 22105, 0x00000307 }, /* GL_ONE_MINUS_DST_COLOR */
-   { 22128, 0x00000303 }, /* GL_ONE_MINUS_SRC_ALPHA */
-   { 22151, 0x00000301 }, /* GL_ONE_MINUS_SRC_COLOR */
-   { 22174, 0x00008598 }, /* GL_OPERAND0_ALPHA */
-   { 22192, 0x00008598 }, /* GL_OPERAND0_ALPHA_ARB */
-   { 22214, 0x00008598 }, /* GL_OPERAND0_ALPHA_EXT */
-   { 22236, 0x00008590 }, /* GL_OPERAND0_RGB */
-   { 22252, 0x00008590 }, /* GL_OPERAND0_RGB_ARB */
-   { 22272, 0x00008590 }, /* GL_OPERAND0_RGB_EXT */
-   { 22292, 0x00008599 }, /* GL_OPERAND1_ALPHA */
-   { 22310, 0x00008599 }, /* GL_OPERAND1_ALPHA_ARB */
-   { 22332, 0x00008599 }, /* GL_OPERAND1_ALPHA_EXT */
-   { 22354, 0x00008591 }, /* GL_OPERAND1_RGB */
-   { 22370, 0x00008591 }, /* GL_OPERAND1_RGB_ARB */
-   { 22390, 0x00008591 }, /* GL_OPERAND1_RGB_EXT */
-   { 22410, 0x0000859A }, /* GL_OPERAND2_ALPHA */
-   { 22428, 0x0000859A }, /* GL_OPERAND2_ALPHA_ARB */
-   { 22450, 0x0000859A }, /* GL_OPERAND2_ALPHA_EXT */
-   { 22472, 0x00008592 }, /* GL_OPERAND2_RGB */
-   { 22488, 0x00008592 }, /* GL_OPERAND2_RGB_ARB */
-   { 22508, 0x00008592 }, /* GL_OPERAND2_RGB_EXT */
-   { 22528, 0x0000859B }, /* GL_OPERAND3_ALPHA_NV */
-   { 22549, 0x00008593 }, /* GL_OPERAND3_RGB_NV */
-   { 22568, 0x00001507 }, /* GL_OR */
-   { 22574, 0x00000A01 }, /* GL_ORDER */
-   { 22583, 0x0000150D }, /* GL_OR_INVERTED */
-   { 22598, 0x0000150B }, /* GL_OR_REVERSE */
-   { 22612, 0x00000505 }, /* GL_OUT_OF_MEMORY */
-   { 22629, 0x00000D05 }, /* GL_PACK_ALIGNMENT */
-   { 22647, 0x0000806C }, /* GL_PACK_IMAGE_HEIGHT */
-   { 22668, 0x00008758 }, /* GL_PACK_INVERT_MESA */
-   { 22688, 0x00000D01 }, /* GL_PACK_LSB_FIRST */
-   { 22706, 0x00000D02 }, /* GL_PACK_ROW_LENGTH */
-   { 22725, 0x0000806B }, /* GL_PACK_SKIP_IMAGES */
-   { 22745, 0x00000D04 }, /* GL_PACK_SKIP_PIXELS */
-   { 22765, 0x00000D03 }, /* GL_PACK_SKIP_ROWS */
-   { 22783, 0x00000D00 }, /* GL_PACK_SWAP_BYTES */
-   { 22802, 0x00008B92 }, /* GL_PALETTE4_R5_G6_B5_OES */
-   { 22827, 0x00008B94 }, /* GL_PALETTE4_RGB5_A1_OES */
-   { 22851, 0x00008B90 }, /* GL_PALETTE4_RGB8_OES */
-   { 22872, 0x00008B93 }, /* GL_PALETTE4_RGBA4_OES */
-   { 22894, 0x00008B91 }, /* GL_PALETTE4_RGBA8_OES */
-   { 22916, 0x00008B97 }, /* GL_PALETTE8_R5_G6_B5_OES */
-   { 22941, 0x00008B99 }, /* GL_PALETTE8_RGB5_A1_OES */
-   { 22965, 0x00008B95 }, /* GL_PALETTE8_RGB8_OES */
-   { 22986, 0x00008B98 }, /* GL_PALETTE8_RGBA4_OES */
-   { 23008, 0x00008B96 }, /* GL_PALETTE8_RGBA8_OES */
-   { 23030, 0x00000700 }, /* GL_PASS_THROUGH_TOKEN */
-   { 23052, 0x00000C50 }, /* GL_PERSPECTIVE_CORRECTION_HINT */
-   { 23083, 0x00000C79 }, /* GL_PIXEL_MAP_A_TO_A */
-   { 23103, 0x00000CB9 }, /* GL_PIXEL_MAP_A_TO_A_SIZE */
-   { 23128, 0x00000C78 }, /* GL_PIXEL_MAP_B_TO_B */
-   { 23148, 0x00000CB8 }, /* GL_PIXEL_MAP_B_TO_B_SIZE */
-   { 23173, 0x00000C77 }, /* GL_PIXEL_MAP_G_TO_G */
-   { 23193, 0x00000CB7 }, /* GL_PIXEL_MAP_G_TO_G_SIZE */
-   { 23218, 0x00000C75 }, /* GL_PIXEL_MAP_I_TO_A */
-   { 23238, 0x00000CB5 }, /* GL_PIXEL_MAP_I_TO_A_SIZE */
-   { 23263, 0x00000C74 }, /* GL_PIXEL_MAP_I_TO_B */
-   { 23283, 0x00000CB4 }, /* GL_PIXEL_MAP_I_TO_B_SIZE */
-   { 23308, 0x00000C73 }, /* GL_PIXEL_MAP_I_TO_G */
-   { 23328, 0x00000CB3 }, /* GL_PIXEL_MAP_I_TO_G_SIZE */
-   { 23353, 0x00000C70 }, /* GL_PIXEL_MAP_I_TO_I */
-   { 23373, 0x00000CB0 }, /* GL_PIXEL_MAP_I_TO_I_SIZE */
-   { 23398, 0x00000C72 }, /* GL_PIXEL_MAP_I_TO_R */
-   { 23418, 0x00000CB2 }, /* GL_PIXEL_MAP_I_TO_R_SIZE */
-   { 23443, 0x00000C76 }, /* GL_PIXEL_MAP_R_TO_R */
-   { 23463, 0x00000CB6 }, /* GL_PIXEL_MAP_R_TO_R_SIZE */
-   { 23488, 0x00000C71 }, /* GL_PIXEL_MAP_S_TO_S */
-   { 23508, 0x00000CB1 }, /* GL_PIXEL_MAP_S_TO_S_SIZE */
-   { 23533, 0x00000020 }, /* GL_PIXEL_MODE_BIT */
-   { 23551, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER */
-   { 23572, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING */
-   { 23601, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING_EXT */
-   { 23634, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER_EXT */
-   { 23659, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER */
-   { 23682, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
-   { 23713, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING_EXT */
-   { 23748, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER_EXT */
-   { 23775, 0x00001B00 }, /* GL_POINT */
-   { 23784, 0x00000000 }, /* GL_POINTS */
-   { 23794, 0x00000002 }, /* GL_POINT_BIT */
-   { 23807, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION */
-   { 23837, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_ARB */
-   { 23871, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_EXT */
-   { 23905, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_SGIS */
-   { 23940, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE */
-   { 23969, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_ARB */
-   { 24002, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_EXT */
-   { 24035, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_SGIS */
-   { 24069, 0x00000B11 }, /* GL_POINT_SIZE */
-   { 24083, 0x00000B13 }, /* GL_POINT_SIZE_GRANULARITY */
-   { 24109, 0x00008127 }, /* GL_POINT_SIZE_MAX */
-   { 24127, 0x00008127 }, /* GL_POINT_SIZE_MAX_ARB */
-   { 24149, 0x00008127 }, /* GL_POINT_SIZE_MAX_EXT */
-   { 24171, 0x00008127 }, /* GL_POINT_SIZE_MAX_SGIS */
-   { 24194, 0x00008126 }, /* GL_POINT_SIZE_MIN */
-   { 24212, 0x00008126 }, /* GL_POINT_SIZE_MIN_ARB */
-   { 24234, 0x00008126 }, /* GL_POINT_SIZE_MIN_EXT */
-   { 24256, 0x00008126 }, /* GL_POINT_SIZE_MIN_SGIS */
-   { 24279, 0x00000B12 }, /* GL_POINT_SIZE_RANGE */
-   { 24299, 0x00000B10 }, /* GL_POINT_SMOOTH */
-   { 24315, 0x00000C51 }, /* GL_POINT_SMOOTH_HINT */
-   { 24336, 0x00008861 }, /* GL_POINT_SPRITE */
-   { 24352, 0x00008861 }, /* GL_POINT_SPRITE_ARB */
-   { 24372, 0x00008CA0 }, /* GL_POINT_SPRITE_COORD_ORIGIN */
-   { 24401, 0x00008861 }, /* GL_POINT_SPRITE_NV */
-   { 24420, 0x00008863 }, /* GL_POINT_SPRITE_R_MODE_NV */
-   { 24446, 0x00000701 }, /* GL_POINT_TOKEN */
-   { 24461, 0x00000009 }, /* GL_POLYGON */
-   { 24472, 0x00000008 }, /* GL_POLYGON_BIT */
-   { 24487, 0x00000B40 }, /* GL_POLYGON_MODE */
-   { 24503, 0x00008039 }, /* GL_POLYGON_OFFSET_BIAS */
-   { 24526, 0x00008038 }, /* GL_POLYGON_OFFSET_FACTOR */
-   { 24551, 0x00008037 }, /* GL_POLYGON_OFFSET_FILL */
-   { 24574, 0x00002A02 }, /* GL_POLYGON_OFFSET_LINE */
-   { 24597, 0x00002A01 }, /* GL_POLYGON_OFFSET_POINT */
-   { 24621, 0x00002A00 }, /* GL_POLYGON_OFFSET_UNITS */
-   { 24645, 0x00000B41 }, /* GL_POLYGON_SMOOTH */
-   { 24663, 0x00000C53 }, /* GL_POLYGON_SMOOTH_HINT */
-   { 24686, 0x00000B42 }, /* GL_POLYGON_STIPPLE */
-   { 24705, 0x00000010 }, /* GL_POLYGON_STIPPLE_BIT */
-   { 24728, 0x00000703 }, /* GL_POLYGON_TOKEN */
-   { 24745, 0x00001203 }, /* GL_POSITION */
-   { 24757, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
-   { 24789, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI */
-   { 24825, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
-   { 24858, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI */
-   { 24895, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
-   { 24926, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI */
-   { 24961, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
-   { 24993, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI */
-   { 25029, 0x000080D2 }, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
-   { 25062, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
-   { 25094, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI */
-   { 25130, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
-   { 25163, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI */
-   { 25200, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS */
-   { 25230, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS_SGI */
-   { 25264, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE */
-   { 25295, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE_SGI */
-   { 25330, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
-   { 25361, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS_EXT */
-   { 25396, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
-   { 25428, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE_EXT */
-   { 25464, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS */
-   { 25494, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS_EXT */
-   { 25528, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE */
-   { 25559, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE_EXT */
-   { 25594, 0x000080D1 }, /* GL_POST_CONVOLUTION_COLOR_TABLE */
-   { 25626, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS */
-   { 25657, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS_EXT */
-   { 25692, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE */
-   { 25724, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE_EXT */
-   { 25760, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS */
-   { 25789, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS_EXT */
-   { 25822, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE */
-   { 25852, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE_EXT */
-   { 25886, 0x0000817B }, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
-   { 25925, 0x00008179 }, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
-   { 25958, 0x0000817C }, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
-   { 25998, 0x0000817A }, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
-   { 26032, 0x00008578 }, /* GL_PREVIOUS */
-   { 26044, 0x00008578 }, /* GL_PREVIOUS_ARB */
-   { 26060, 0x00008578 }, /* GL_PREVIOUS_EXT */
-   { 26076, 0x00008577 }, /* GL_PRIMARY_COLOR */
-   { 26093, 0x00008577 }, /* GL_PRIMARY_COLOR_ARB */
-   { 26114, 0x00008577 }, /* GL_PRIMARY_COLOR_EXT */
-   { 26135, 0x000088B0 }, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
-   { 26168, 0x00008805 }, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
-   { 26200, 0x000088AC }, /* GL_PROGRAM_ATTRIBS_ARB */
-   { 26223, 0x00008677 }, /* GL_PROGRAM_BINDING_ARB */
-   { 26246, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_ARB */
-   { 26276, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_NV */
-   { 26305, 0x00008874 }, /* GL_PROGRAM_ERROR_STRING_ARB */
-   { 26333, 0x00008876 }, /* GL_PROGRAM_FORMAT_ARB */
-   { 26355, 0x00008875 }, /* GL_PROGRAM_FORMAT_ASCII_ARB */
-   { 26383, 0x000088A0 }, /* GL_PROGRAM_INSTRUCTIONS_ARB */
-   { 26411, 0x00008627 }, /* GL_PROGRAM_LENGTH_ARB */
-   { 26433, 0x00008627 }, /* GL_PROGRAM_LENGTH_NV */
-   { 26454, 0x000088B2 }, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-   { 26494, 0x00008808 }, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-   { 26533, 0x000088AE }, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
-   { 26563, 0x000088A2 }, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-   { 26598, 0x000088AA }, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
-   { 26631, 0x000088A6 }, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
-   { 26665, 0x0000880A }, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-   { 26704, 0x00008809 }, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-   { 26743, 0x00008B40 }, /* GL_PROGRAM_OBJECT_ARB */
-   { 26765, 0x000088A8 }, /* GL_PROGRAM_PARAMETERS_ARB */
-   { 26791, 0x00008644 }, /* GL_PROGRAM_PARAMETER_NV */
-   { 26815, 0x00008647 }, /* GL_PROGRAM_RESIDENT_NV */
-   { 26838, 0x00008628 }, /* GL_PROGRAM_STRING_ARB */
-   { 26860, 0x00008628 }, /* GL_PROGRAM_STRING_NV */
-   { 26881, 0x00008646 }, /* GL_PROGRAM_TARGET_NV */
-   { 26902, 0x000088A4 }, /* GL_PROGRAM_TEMPORARIES_ARB */
-   { 26929, 0x00008807 }, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
-   { 26961, 0x00008806 }, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
-   { 26993, 0x000088B6 }, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-   { 27028, 0x00001701 }, /* GL_PROJECTION */
-   { 27042, 0x00000BA7 }, /* GL_PROJECTION_MATRIX */
-   { 27063, 0x00000BA4 }, /* GL_PROJECTION_STACK_DEPTH */
-   { 27089, 0x000080D3 }, /* GL_PROXY_COLOR_TABLE */
-   { 27110, 0x00008025 }, /* GL_PROXY_HISTOGRAM */
-   { 27129, 0x00008025 }, /* GL_PROXY_HISTOGRAM_EXT */
-   { 27152, 0x000080D5 }, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
-   { 27191, 0x000080D4 }, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
-   { 27229, 0x00008063 }, /* GL_PROXY_TEXTURE_1D */
-   { 27249, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
-   { 27279, 0x00008063 }, /* GL_PROXY_TEXTURE_1D_EXT */
-   { 27303, 0x00008064 }, /* GL_PROXY_TEXTURE_2D */
-   { 27323, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
-   { 27353, 0x00008064 }, /* GL_PROXY_TEXTURE_2D_EXT */
-   { 27377, 0x00008070 }, /* GL_PROXY_TEXTURE_3D */
-   { 27397, 0x000080BD }, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
-   { 27430, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP */
-   { 27456, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP_ARB */
-   { 27486, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
-   { 27517, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_NV */
-   { 27547, 0x00002003 }, /* GL_Q */
-   { 27552, 0x00001209 }, /* GL_QUADRATIC_ATTENUATION */
-   { 27577, 0x00000007 }, /* GL_QUADS */
-   { 27586, 0x00008614 }, /* GL_QUAD_MESH_SUN */
-   { 27603, 0x00000008 }, /* GL_QUAD_STRIP */
-   { 27617, 0x00008864 }, /* GL_QUERY_COUNTER_BITS */
-   { 27639, 0x00008864 }, /* GL_QUERY_COUNTER_BITS_ARB */
-   { 27665, 0x00008866 }, /* GL_QUERY_RESULT */
-   { 27681, 0x00008866 }, /* GL_QUERY_RESULT_ARB */
-   { 27701, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE */
-   { 27727, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE_ARB */
-   { 27757, 0x00002002 }, /* GL_R */
-   { 27762, 0x00002A10 }, /* GL_R3_G3_B2 */
-   { 27774, 0x00019262 }, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
-   { 27807, 0x00000C02 }, /* GL_READ_BUFFER */
-   { 27822, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER */
-   { 27842, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
-   { 27874, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER_EXT */
-   { 27898, 0x000088B8 }, /* GL_READ_ONLY */
-   { 27911, 0x000088B8 }, /* GL_READ_ONLY_ARB */
-   { 27928, 0x000088BA }, /* GL_READ_WRITE */
-   { 27942, 0x000088BA }, /* GL_READ_WRITE_ARB */
-   { 27960, 0x00001903 }, /* GL_RED */
-   { 27967, 0x00008016 }, /* GL_REDUCE */
-   { 27977, 0x00008016 }, /* GL_REDUCE_EXT */
-   { 27991, 0x00000D15 }, /* GL_RED_BIAS */
-   { 28003, 0x00000D52 }, /* GL_RED_BITS */
-   { 28015, 0x00000D14 }, /* GL_RED_SCALE */
-   { 28028, 0x00008512 }, /* GL_REFLECTION_MAP */
-   { 28046, 0x00008512 }, /* GL_REFLECTION_MAP_ARB */
-   { 28068, 0x00008512 }, /* GL_REFLECTION_MAP_NV */
-   { 28089, 0x00001C00 }, /* GL_RENDER */
-   { 28099, 0x00008D41 }, /* GL_RENDERBUFFER */
-   { 28115, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE */
-   { 28142, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_EXT */
-   { 28170, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE */
-   { 28196, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE */
-   { 28223, 0x00008D41 }, /* GL_RENDERBUFFER_EXT */
-   { 28243, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE */
-   { 28270, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT */
-   { 28293, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_EXT */
-   { 28320, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
-   { 28352, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */
-   { 28388, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE */
-   { 28413, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES */
-   { 28437, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE */
-   { 28466, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH */
-   { 28488, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_EXT */
-   { 28514, 0x00001F01 }, /* GL_RENDERER */
-   { 28526, 0x00000C40 }, /* GL_RENDER_MODE */
-   { 28541, 0x00002901 }, /* GL_REPEAT */
-   { 28551, 0x00001E01 }, /* GL_REPLACE */
-   { 28562, 0x00008062 }, /* GL_REPLACE_EXT */
-   { 28577, 0x00008153 }, /* GL_REPLICATE_BORDER_HP */
-   { 28600, 0x0000803A }, /* GL_RESCALE_NORMAL */
-   { 28618, 0x0000803A }, /* GL_RESCALE_NORMAL_EXT */
-   { 28640, 0x00000102 }, /* GL_RETURN */
-   { 28650, 0x00001907 }, /* GL_RGB */
-   { 28657, 0x00008052 }, /* GL_RGB10 */
-   { 28666, 0x00008059 }, /* GL_RGB10_A2 */
-   { 28678, 0x00008059 }, /* GL_RGB10_A2_EXT */
-   { 28694, 0x00008052 }, /* GL_RGB10_EXT */
-   { 28707, 0x00008053 }, /* GL_RGB12 */
-   { 28716, 0x00008053 }, /* GL_RGB12_EXT */
-   { 28729, 0x00008054 }, /* GL_RGB16 */
-   { 28738, 0x00008054 }, /* GL_RGB16_EXT */
-   { 28751, 0x0000804E }, /* GL_RGB2_EXT */
-   { 28763, 0x0000804F }, /* GL_RGB4 */
-   { 28771, 0x0000804F }, /* GL_RGB4_EXT */
-   { 28783, 0x000083A1 }, /* GL_RGB4_S3TC */
-   { 28796, 0x00008050 }, /* GL_RGB5 */
-   { 28804, 0x00008057 }, /* GL_RGB5_A1 */
-   { 28815, 0x00008057 }, /* GL_RGB5_A1_EXT */
-   { 28830, 0x00008050 }, /* GL_RGB5_EXT */
-   { 28842, 0x00008051 }, /* GL_RGB8 */
-   { 28850, 0x00008051 }, /* GL_RGB8_EXT */
-   { 28862, 0x00001908 }, /* GL_RGBA */
-   { 28870, 0x0000805A }, /* GL_RGBA12 */
-   { 28880, 0x0000805A }, /* GL_RGBA12_EXT */
-   { 28894, 0x0000805B }, /* GL_RGBA16 */
-   { 28904, 0x0000805B }, /* GL_RGBA16_EXT */
-   { 28918, 0x00008055 }, /* GL_RGBA2 */
-   { 28927, 0x00008055 }, /* GL_RGBA2_EXT */
-   { 28940, 0x00008056 }, /* GL_RGBA4 */
-   { 28949, 0x000083A5 }, /* GL_RGBA4_DXT5_S3TC */
-   { 28968, 0x00008056 }, /* GL_RGBA4_EXT */
-   { 28981, 0x000083A3 }, /* GL_RGBA4_S3TC */
-   { 28995, 0x00008058 }, /* GL_RGBA8 */
-   { 29004, 0x00008058 }, /* GL_RGBA8_EXT */
-   { 29017, 0x00008F97 }, /* GL_RGBA8_SNORM */
-   { 29032, 0x000083A4 }, /* GL_RGBA_DXT5_S3TC */
-   { 29050, 0x00000C31 }, /* GL_RGBA_MODE */
-   { 29063, 0x000083A2 }, /* GL_RGBA_S3TC */
-   { 29076, 0x00008F93 }, /* GL_RGBA_SNORM */
-   { 29090, 0x000083A0 }, /* GL_RGB_S3TC */
-   { 29102, 0x00008573 }, /* GL_RGB_SCALE */
-   { 29115, 0x00008573 }, /* GL_RGB_SCALE_ARB */
-   { 29132, 0x00008573 }, /* GL_RGB_SCALE_EXT */
-   { 29149, 0x00000407 }, /* GL_RIGHT */
-   { 29158, 0x00002000 }, /* GL_S */
-   { 29163, 0x00008B5D }, /* GL_SAMPLER_1D */
-   { 29177, 0x00008B61 }, /* GL_SAMPLER_1D_SHADOW */
-   { 29198, 0x00008B5E }, /* GL_SAMPLER_2D */
-   { 29212, 0x00008B62 }, /* GL_SAMPLER_2D_SHADOW */
-   { 29233, 0x00008B5F }, /* GL_SAMPLER_3D */
-   { 29247, 0x00008B60 }, /* GL_SAMPLER_CUBE */
-   { 29263, 0x000080A9 }, /* GL_SAMPLES */
-   { 29274, 0x000086B4 }, /* GL_SAMPLES_3DFX */
-   { 29290, 0x000080A9 }, /* GL_SAMPLES_ARB */
-   { 29305, 0x00008914 }, /* GL_SAMPLES_PASSED */
-   { 29323, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */
-   { 29345, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
-   { 29373, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */
-   { 29405, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */
-   { 29428, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */
-   { 29455, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */
-   { 29473, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */
-   { 29496, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */
-   { 29518, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */
-   { 29537, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */
-   { 29560, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */
-   { 29586, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */
-   { 29616, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */
-   { 29641, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */
-   { 29670, 0x00080000 }, /* GL_SCISSOR_BIT */
-   { 29685, 0x00000C10 }, /* GL_SCISSOR_BOX */
-   { 29700, 0x00000C11 }, /* GL_SCISSOR_TEST */
-   { 29716, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */
-   { 29741, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
-   { 29781, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */
-   { 29825, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
-   { 29858, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
-   { 29888, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
-   { 29920, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
-   { 29950, 0x00001C02 }, /* GL_SELECT */
-   { 29960, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */
-   { 29988, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */
-   { 30013, 0x00008012 }, /* GL_SEPARABLE_2D */
-   { 30029, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */
-   { 30056, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */
-   { 30087, 0x0000150F }, /* GL_SET */
-   { 30094, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */
-   { 30115, 0x00008B88 }, /* GL_SHADER_SOURCE_LENGTH */
-   { 30139, 0x00008B4F }, /* GL_SHADER_TYPE */
-   { 30154, 0x00000B54 }, /* GL_SHADE_MODEL */
-   { 30169, 0x00008B8C }, /* GL_SHADING_LANGUAGE_VERSION */
-   { 30197, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */
-   { 30220, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */
-   { 30250, 0x00001601 }, /* GL_SHININESS */
-   { 30263, 0x00001402 }, /* GL_SHORT */
-   { 30272, 0x00008F9C }, /* GL_SIGNED_NORMALIZED */
-   { 30293, 0x000081F9 }, /* GL_SINGLE_COLOR */
-   { 30309, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */
-   { 30329, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */
-   { 30348, 0x00008C46 }, /* GL_SLUMINANCE */
-   { 30362, 0x00008C47 }, /* GL_SLUMINANCE8 */
-   { 30377, 0x00008C45 }, /* GL_SLUMINANCE8_ALPHA8 */
-   { 30399, 0x00008C44 }, /* GL_SLUMINANCE_ALPHA */
-   { 30419, 0x00001D01 }, /* GL_SMOOTH */
-   { 30429, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */
-   { 30462, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */
-   { 30489, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */
-   { 30522, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */
-   { 30549, 0x00008588 }, /* GL_SOURCE0_ALPHA */
-   { 30566, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */
-   { 30587, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */
-   { 30608, 0x00008580 }, /* GL_SOURCE0_RGB */
-   { 30623, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */
-   { 30642, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */
-   { 30661, 0x00008589 }, /* GL_SOURCE1_ALPHA */
-   { 30678, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */
-   { 30699, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */
-   { 30720, 0x00008581 }, /* GL_SOURCE1_RGB */
-   { 30735, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */
-   { 30754, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */
-   { 30773, 0x0000858A }, /* GL_SOURCE2_ALPHA */
-   { 30790, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */
-   { 30811, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */
-   { 30832, 0x00008582 }, /* GL_SOURCE2_RGB */
-   { 30847, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */
-   { 30866, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */
-   { 30885, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */
-   { 30905, 0x00008583 }, /* GL_SOURCE3_RGB_NV */
-   { 30923, 0x00001202 }, /* GL_SPECULAR */
-   { 30935, 0x00002402 }, /* GL_SPHERE_MAP */
-   { 30949, 0x00001206 }, /* GL_SPOT_CUTOFF */
-   { 30964, 0x00001204 }, /* GL_SPOT_DIRECTION */
-   { 30982, 0x00001205 }, /* GL_SPOT_EXPONENT */
-   { 30999, 0x00008588 }, /* GL_SRC0_ALPHA */
-   { 31013, 0x00008580 }, /* GL_SRC0_RGB */
-   { 31025, 0x00008589 }, /* GL_SRC1_ALPHA */
-   { 31039, 0x00008581 }, /* GL_SRC1_RGB */
-   { 31051, 0x0000858A }, /* GL_SRC2_ALPHA */
-   { 31065, 0x00008582 }, /* GL_SRC2_RGB */
-   { 31077, 0x00000302 }, /* GL_SRC_ALPHA */
-   { 31090, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */
-   { 31112, 0x00000300 }, /* GL_SRC_COLOR */
-   { 31125, 0x00008C40 }, /* GL_SRGB */
-   { 31133, 0x00008C41 }, /* GL_SRGB8 */
-   { 31142, 0x00008C43 }, /* GL_SRGB8_ALPHA8 */
-   { 31158, 0x00008C42 }, /* GL_SRGB_ALPHA */
-   { 31172, 0x00000503 }, /* GL_STACK_OVERFLOW */
-   { 31190, 0x00000504 }, /* GL_STACK_UNDERFLOW */
-   { 31209, 0x000088E6 }, /* GL_STATIC_COPY */
-   { 31224, 0x000088E6 }, /* GL_STATIC_COPY_ARB */
-   { 31243, 0x000088E4 }, /* GL_STATIC_DRAW */
-   { 31258, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */
-   { 31277, 0x000088E5 }, /* GL_STATIC_READ */
-   { 31292, 0x000088E5 }, /* GL_STATIC_READ_ARB */
-   { 31311, 0x00001802 }, /* GL_STENCIL */
-   { 31322, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT */
-   { 31344, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */
-   { 31370, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */
-   { 31391, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */
-   { 31416, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
-   { 31437, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */
-   { 31462, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-   { 31494, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */
-   { 31530, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
-   { 31562, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */
-   { 31598, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
-   { 31618, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
-   { 31645, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
-   { 31671, 0x00000D57 }, /* GL_STENCIL_BITS */
-   { 31687, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
-   { 31709, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
-   { 31732, 0x00000B94 }, /* GL_STENCIL_FAIL */
-   { 31748, 0x00000B92 }, /* GL_STENCIL_FUNC */
-   { 31764, 0x00001901 }, /* GL_STENCIL_INDEX */
-   { 31781, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
-   { 31804, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
-   { 31826, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
-   { 31848, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
-   { 31870, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
-   { 31891, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
-   { 31918, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
-   { 31945, 0x00000B97 }, /* GL_STENCIL_REF */
-   { 31960, 0x00000B90 }, /* GL_STENCIL_TEST */
-   { 31976, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
-   { 32005, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
-   { 32027, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
-   { 32048, 0x00000C33 }, /* GL_STEREO */
-   { 32058, 0x000088E2 }, /* GL_STREAM_COPY */
-   { 32073, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
-   { 32092, 0x000088E0 }, /* GL_STREAM_DRAW */
-   { 32107, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
-   { 32126, 0x000088E1 }, /* GL_STREAM_READ */
-   { 32141, 0x000088E1 }, /* GL_STREAM_READ_ARB */
-   { 32160, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
-   { 32177, 0x000084E7 }, /* GL_SUBTRACT */
-   { 32189, 0x000084E7 }, /* GL_SUBTRACT_ARB */
-   { 32205, 0x00002001 }, /* GL_T */
-   { 32210, 0x00002A2A }, /* GL_T2F_C3F_V3F */
-   { 32225, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
-   { 32244, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
-   { 32260, 0x00002A2B }, /* GL_T2F_N3F_V3F */
-   { 32275, 0x00002A27 }, /* GL_T2F_V3F */
-   { 32286, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
-   { 32305, 0x00002A28 }, /* GL_T4F_V4F */
-   { 32316, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
-   { 32339, 0x00001702 }, /* GL_TEXTURE */
-   { 32350, 0x000084C0 }, /* GL_TEXTURE0 */
-   { 32362, 0x000084C0 }, /* GL_TEXTURE0_ARB */
-   { 32378, 0x000084C1 }, /* GL_TEXTURE1 */
-   { 32390, 0x000084CA }, /* GL_TEXTURE10 */
-   { 32403, 0x000084CA }, /* GL_TEXTURE10_ARB */
-   { 32420, 0x000084CB }, /* GL_TEXTURE11 */
-   { 32433, 0x000084CB }, /* GL_TEXTURE11_ARB */
-   { 32450, 0x000084CC }, /* GL_TEXTURE12 */
-   { 32463, 0x000084CC }, /* GL_TEXTURE12_ARB */
-   { 32480, 0x000084CD }, /* GL_TEXTURE13 */
-   { 32493, 0x000084CD }, /* GL_TEXTURE13_ARB */
-   { 32510, 0x000084CE }, /* GL_TEXTURE14 */
-   { 32523, 0x000084CE }, /* GL_TEXTURE14_ARB */
-   { 32540, 0x000084CF }, /* GL_TEXTURE15 */
-   { 32553, 0x000084CF }, /* GL_TEXTURE15_ARB */
-   { 32570, 0x000084D0 }, /* GL_TEXTURE16 */
-   { 32583, 0x000084D0 }, /* GL_TEXTURE16_ARB */
-   { 32600, 0x000084D1 }, /* GL_TEXTURE17 */
-   { 32613, 0x000084D1 }, /* GL_TEXTURE17_ARB */
-   { 32630, 0x000084D2 }, /* GL_TEXTURE18 */
-   { 32643, 0x000084D2 }, /* GL_TEXTURE18_ARB */
-   { 32660, 0x000084D3 }, /* GL_TEXTURE19 */
-   { 32673, 0x000084D3 }, /* GL_TEXTURE19_ARB */
-   { 32690, 0x000084C1 }, /* GL_TEXTURE1_ARB */
-   { 32706, 0x000084C2 }, /* GL_TEXTURE2 */
-   { 32718, 0x000084D4 }, /* GL_TEXTURE20 */
-   { 32731, 0x000084D4 }, /* GL_TEXTURE20_ARB */
-   { 32748, 0x000084D5 }, /* GL_TEXTURE21 */
-   { 32761, 0x000084D5 }, /* GL_TEXTURE21_ARB */
-   { 32778, 0x000084D6 }, /* GL_TEXTURE22 */
-   { 32791, 0x000084D6 }, /* GL_TEXTURE22_ARB */
-   { 32808, 0x000084D7 }, /* GL_TEXTURE23 */
-   { 32821, 0x000084D7 }, /* GL_TEXTURE23_ARB */
-   { 32838, 0x000084D8 }, /* GL_TEXTURE24 */
-   { 32851, 0x000084D8 }, /* GL_TEXTURE24_ARB */
-   { 32868, 0x000084D9 }, /* GL_TEXTURE25 */
-   { 32881, 0x000084D9 }, /* GL_TEXTURE25_ARB */
-   { 32898, 0x000084DA }, /* GL_TEXTURE26 */
-   { 32911, 0x000084DA }, /* GL_TEXTURE26_ARB */
-   { 32928, 0x000084DB }, /* GL_TEXTURE27 */
-   { 32941, 0x000084DB }, /* GL_TEXTURE27_ARB */
-   { 32958, 0x000084DC }, /* GL_TEXTURE28 */
-   { 32971, 0x000084DC }, /* GL_TEXTURE28_ARB */
-   { 32988, 0x000084DD }, /* GL_TEXTURE29 */
-   { 33001, 0x000084DD }, /* GL_TEXTURE29_ARB */
-   { 33018, 0x000084C2 }, /* GL_TEXTURE2_ARB */
-   { 33034, 0x000084C3 }, /* GL_TEXTURE3 */
-   { 33046, 0x000084DE }, /* GL_TEXTURE30 */
-   { 33059, 0x000084DE }, /* GL_TEXTURE30_ARB */
-   { 33076, 0x000084DF }, /* GL_TEXTURE31 */
-   { 33089, 0x000084DF }, /* GL_TEXTURE31_ARB */
-   { 33106, 0x000084C3 }, /* GL_TEXTURE3_ARB */
-   { 33122, 0x000084C4 }, /* GL_TEXTURE4 */
-   { 33134, 0x000084C4 }, /* GL_TEXTURE4_ARB */
-   { 33150, 0x000084C5 }, /* GL_TEXTURE5 */
-   { 33162, 0x000084C5 }, /* GL_TEXTURE5_ARB */
-   { 33178, 0x000084C6 }, /* GL_TEXTURE6 */
-   { 33190, 0x000084C6 }, /* GL_TEXTURE6_ARB */
-   { 33206, 0x000084C7 }, /* GL_TEXTURE7 */
-   { 33218, 0x000084C7 }, /* GL_TEXTURE7_ARB */
-   { 33234, 0x000084C8 }, /* GL_TEXTURE8 */
-   { 33246, 0x000084C8 }, /* GL_TEXTURE8_ARB */
-   { 33262, 0x000084C9 }, /* GL_TEXTURE9 */
-   { 33274, 0x000084C9 }, /* GL_TEXTURE9_ARB */
-   { 33290, 0x00000DE0 }, /* GL_TEXTURE_1D */
-   { 33304, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
-   { 33328, 0x00000DE1 }, /* GL_TEXTURE_2D */
-   { 33342, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
-   { 33366, 0x0000806F }, /* GL_TEXTURE_3D */
-   { 33380, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
-   { 33402, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
-   { 33428, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
-   { 33450, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
-   { 33472, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
-   { 33504, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
-   { 33526, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
-   { 33558, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
-   { 33580, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
-   { 33608, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
-   { 33640, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
-   { 33673, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
-   { 33705, 0x00040000 }, /* GL_TEXTURE_BIT */
-   { 33720, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
-   { 33741, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
-   { 33766, 0x00001005 }, /* GL_TEXTURE_BORDER */
-   { 33784, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
-   { 33808, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-   { 33839, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
-   { 33869, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-   { 33899, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-   { 33934, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-   { 33965, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-   { 34003, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
-   { 34030, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
-   { 34062, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
-   { 34096, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
-   { 34120, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
-   { 34148, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
-   { 34172, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
-   { 34200, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-   { 34233, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
-   { 34257, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
-   { 34279, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
-   { 34301, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
-   { 34327, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
-   { 34361, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-   { 34394, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
-   { 34431, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
-   { 34459, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
-   { 34491, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
-   { 34514, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
-   { 34552, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
-   { 34594, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
-   { 34625, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-   { 34653, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
-   { 34683, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-   { 34711, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
-   { 34731, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
-   { 34755, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-   { 34786, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
-   { 34821, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-   { 34852, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
-   { 34887, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
-   { 34918, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
-   { 34953, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-   { 34984, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
-   { 35019, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-   { 35050, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
-   { 35085, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-   { 35116, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
-   { 35151, 0x00008071 }, /* GL_TEXTURE_DEPTH */
-   { 35168, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
-   { 35190, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
-   { 35216, 0x00002300 }, /* GL_TEXTURE_ENV */
-   { 35231, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
-   { 35252, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
-   { 35272, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
-   { 35298, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
-   { 35318, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
-   { 35335, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
-   { 35352, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
-   { 35369, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
-   { 35386, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
-   { 35411, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
-   { 35433, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
-   { 35459, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
-   { 35477, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
-   { 35503, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
-   { 35529, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
-   { 35559, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
-   { 35586, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
-   { 35611, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
-   { 35631, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
-   { 35655, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
-   { 35682, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-   { 35709, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-   { 35736, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
-   { 35762, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
-   { 35792, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
-   { 35814, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
-   { 35832, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
-   { 35862, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
-   { 35890, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-   { 35918, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-   { 35946, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
-   { 35967, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
-   { 35986, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
-   { 36008, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
-   { 36027, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
-   { 36047, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
-   { 36072, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
-   { 36096, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
-   { 36116, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
-   { 36140, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
-   { 36160, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
-   { 36183, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */
-   { 36207, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
-   { 36232, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
-   { 36266, 0x00001000 }, /* GL_TEXTURE_WIDTH */
-   { 36283, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
-   { 36301, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
-   { 36319, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
-   { 36337, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
-   { 36357, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
-   { 36376, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-   { 36405, 0x00001000 }, /* GL_TRANSFORM_BIT */
-   { 36422, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
-   { 36448, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
-   { 36478, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-   { 36510, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-   { 36540, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
-   { 36574, 0x0000862C }, /* GL_TRANSPOSE_NV */
-   { 36590, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-   { 36621, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
-   { 36656, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-   { 36684, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
-   { 36716, 0x00000004 }, /* GL_TRIANGLES */
-   { 36729, 0x00000006 }, /* GL_TRIANGLE_FAN */
-   { 36745, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
-   { 36766, 0x00000005 }, /* GL_TRIANGLE_STRIP */
-   { 36784, 0x00000001 }, /* GL_TRUE */
-   { 36792, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
-   { 36812, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
-   { 36835, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
-   { 36855, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
-   { 36876, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
-   { 36898, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
-   { 36920, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
-   { 36940, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
-   { 36961, 0x00001401 }, /* GL_UNSIGNED_BYTE */
-   { 36978, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-   { 37005, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
-   { 37028, 0x00001405 }, /* GL_UNSIGNED_INT */
-   { 37044, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
-   { 37071, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */
-   { 37092, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
-   { 37116, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-   { 37147, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
-   { 37171, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-   { 37199, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */
-   { 37222, 0x00001403 }, /* GL_UNSIGNED_SHORT */
-   { 37240, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-   { 37270, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-   { 37296, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-   { 37326, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-   { 37352, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
-   { 37376, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-   { 37404, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-   { 37432, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
-   { 37459, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-   { 37491, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
-   { 37522, 0x00008CA2 }, /* GL_UPPER_LEFT */
-   { 37536, 0x00002A20 }, /* GL_V2F */
-   { 37543, 0x00002A21 }, /* GL_V3F */
-   { 37550, 0x00008B83 }, /* GL_VALIDATE_STATUS */
-   { 37569, 0x00001F00 }, /* GL_VENDOR */
-   { 37579, 0x00001F02 }, /* GL_VERSION */
-   { 37590, 0x00008074 }, /* GL_VERTEX_ARRAY */
-   { 37606, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
-   { 37636, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-   { 37667, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
-   { 37702, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
-   { 37726, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
-   { 37747, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
-   { 37770, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
-   { 37791, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-   { 37818, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-   { 37846, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-   { 37874, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-   { 37902, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-   { 37930, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-   { 37958, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
-   { 37986, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-   { 38013, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-   { 38040, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-   { 38067, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-   { 38094, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-   { 38121, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-   { 38148, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-   { 38175, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-   { 38202, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-   { 38229, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-   { 38267, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
-   { 38309, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-   { 38340, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
-   { 38375, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
-   { 38409, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
-   { 38447, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-   { 38478, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
-   { 38513, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-   { 38541, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
-   { 38573, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-   { 38603, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
-   { 38637, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
-   { 38665, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
-   { 38697, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
-   { 38717, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
-   { 38739, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
-   { 38768, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
-   { 38789, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-   { 38818, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
-   { 38851, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
-   { 38883, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-   { 38910, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
-   { 38941, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
-   { 38971, 0x00008B31 }, /* GL_VERTEX_SHADER */
-   { 38988, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
-   { 39009, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
-   { 39036, 0x00000BA2 }, /* GL_VIEWPORT */
-   { 39048, 0x00000800 }, /* GL_VIEWPORT_BIT */
-   { 39064, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
-   { 39084, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-   { 39115, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
-   { 39150, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-   { 39178, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-   { 39203, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-   { 39230, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-   { 39255, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
-   { 39279, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
-   { 39298, 0x000088B9 }, /* GL_WRITE_ONLY */
-   { 39312, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
-   { 39330, 0x00001506 }, /* GL_XOR */
-   { 39337, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
-   { 39356, 0x00008757 }, /* GL_YCBCR_MESA */
-   { 39370, 0x00000000 }, /* GL_ZERO */
-   { 39378, 0x00000D16 }, /* GL_ZOOM_X */
-   { 39388, 0x00000D17 }, /* GL_ZOOM_Y */
+   {  6072, 0x00008F36 }, /* GL_COPY_READ_BUFFER */
+   {  6092, 0x00008F37 }, /* GL_COPY_WRITE_BUFFER */
+   {  6113, 0x00000B44 }, /* GL_CULL_FACE */
+   {  6126, 0x00000B45 }, /* GL_CULL_FACE_MODE */
+   {  6144, 0x000081AA }, /* GL_CULL_VERTEX_EXT */
+   {  6163, 0x000081AC }, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
+   {  6195, 0x000081AB }, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
+   {  6230, 0x00008626 }, /* GL_CURRENT_ATTRIB_NV */
+   {  6251, 0x00000001 }, /* GL_CURRENT_BIT */
+   {  6266, 0x00000B00 }, /* GL_CURRENT_COLOR */
+   {  6283, 0x00008453 }, /* GL_CURRENT_FOG_COORD */
+   {  6304, 0x00008453 }, /* GL_CURRENT_FOG_COORDINATE */
+   {  6330, 0x00000B01 }, /* GL_CURRENT_INDEX */
+   {  6347, 0x00008641 }, /* GL_CURRENT_MATRIX_ARB */
+   {  6369, 0x00008845 }, /* GL_CURRENT_MATRIX_INDEX_ARB */
+   {  6397, 0x00008641 }, /* GL_CURRENT_MATRIX_NV */
+   {  6418, 0x00008640 }, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
+   {  6452, 0x00008640 }, /* GL_CURRENT_MATRIX_STACK_DEPTH_NV */
+   {  6485, 0x00000B02 }, /* GL_CURRENT_NORMAL */
+   {  6503, 0x00008843 }, /* GL_CURRENT_PALETTE_MATRIX_ARB */
+   {  6533, 0x00008B8D }, /* GL_CURRENT_PROGRAM */
+   {  6552, 0x00008865 }, /* GL_CURRENT_QUERY */
+   {  6569, 0x00008865 }, /* GL_CURRENT_QUERY_ARB */
+   {  6590, 0x00000B04 }, /* GL_CURRENT_RASTER_COLOR */
+   {  6614, 0x00000B09 }, /* GL_CURRENT_RASTER_DISTANCE */
+   {  6641, 0x00000B05 }, /* GL_CURRENT_RASTER_INDEX */
+   {  6665, 0x00000B07 }, /* GL_CURRENT_RASTER_POSITION */
+   {  6692, 0x00000B08 }, /* GL_CURRENT_RASTER_POSITION_VALID */
+   {  6725, 0x0000845F }, /* GL_CURRENT_RASTER_SECONDARY_COLOR */
+   {  6759, 0x00000B06 }, /* GL_CURRENT_RASTER_TEXTURE_COORDS */
+   {  6792, 0x00008459 }, /* GL_CURRENT_SECONDARY_COLOR */
+   {  6819, 0x00000B03 }, /* GL_CURRENT_TEXTURE_COORDS */
+   {  6845, 0x00008626 }, /* GL_CURRENT_VERTEX_ATTRIB */
+   {  6870, 0x00008626 }, /* GL_CURRENT_VERTEX_ATTRIB_ARB */
+   {  6899, 0x000086A8 }, /* GL_CURRENT_WEIGHT_ARB */
+   {  6921, 0x00000900 }, /* GL_CW */
+   {  6927, 0x0000875B }, /* GL_DEBUG_ASSERT_MESA */
+   {  6948, 0x00008759 }, /* GL_DEBUG_OBJECT_MESA */
+   {  6969, 0x0000875A }, /* GL_DEBUG_PRINT_MESA */
+   {  6989, 0x00002101 }, /* GL_DECAL */
+   {  6998, 0x00001E03 }, /* GL_DECR */
+   {  7006, 0x00008508 }, /* GL_DECR_WRAP */
+   {  7019, 0x00008508 }, /* GL_DECR_WRAP_EXT */
+   {  7036, 0x00008B80 }, /* GL_DELETE_STATUS */
+   {  7053, 0x00001801 }, /* GL_DEPTH */
+   {  7062, 0x000088F0 }, /* GL_DEPTH24_STENCIL8 */
+   {  7082, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT */
+   {  7102, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT_EXT */
+   {  7126, 0x00000D1F }, /* GL_DEPTH_BIAS */
+   {  7140, 0x00000D56 }, /* GL_DEPTH_BITS */
+   {  7154, 0x00008891 }, /* GL_DEPTH_BOUNDS_EXT */
+   {  7174, 0x00008890 }, /* GL_DEPTH_BOUNDS_TEST_EXT */
+   {  7199, 0x00000100 }, /* GL_DEPTH_BUFFER_BIT */
+   {  7219, 0x0000864F }, /* GL_DEPTH_CLAMP_NV */
+   {  7237, 0x00000B73 }, /* GL_DEPTH_CLEAR_VALUE */
+   {  7258, 0x00001902 }, /* GL_DEPTH_COMPONENT */
+   {  7277, 0x000081A5 }, /* GL_DEPTH_COMPONENT16 */
+   {  7298, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_ARB */
+   {  7323, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_SGIX */
+   {  7349, 0x000081A6 }, /* GL_DEPTH_COMPONENT24 */
+   {  7370, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_ARB */
+   {  7395, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_SGIX */
+   {  7421, 0x000081A7 }, /* GL_DEPTH_COMPONENT32 */
+   {  7442, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_ARB */
+   {  7467, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_SGIX */
+   {  7493, 0x00000B74 }, /* GL_DEPTH_FUNC */
+   {  7507, 0x00000B70 }, /* GL_DEPTH_RANGE */
+   {  7522, 0x00000D1E }, /* GL_DEPTH_SCALE */
+   {  7537, 0x000084F9 }, /* GL_DEPTH_STENCIL */
+   {  7554, 0x0000821A }, /* GL_DEPTH_STENCIL_ATTACHMENT */
+   {  7582, 0x000084F9 }, /* GL_DEPTH_STENCIL_NV */
+   {  7602, 0x0000886F }, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
+   {  7630, 0x0000886E }, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
+   {  7658, 0x00000B71 }, /* GL_DEPTH_TEST */
+   {  7672, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE */
+   {  7694, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE_ARB */
+   {  7720, 0x00000B72 }, /* GL_DEPTH_WRITEMASK */
+   {  7739, 0x00001201 }, /* GL_DIFFUSE */
+   {  7750, 0x00000BD0 }, /* GL_DITHER */
+   {  7760, 0x00000A02 }, /* GL_DOMAIN */
+   {  7770, 0x00001100 }, /* GL_DONT_CARE */
+   {  7783, 0x000086AE }, /* GL_DOT3_RGB */
+   {  7795, 0x000086AF }, /* GL_DOT3_RGBA */
+   {  7808, 0x000086AF }, /* GL_DOT3_RGBA_ARB */
+   {  7825, 0x00008741 }, /* GL_DOT3_RGBA_EXT */
+   {  7842, 0x000086AE }, /* GL_DOT3_RGB_ARB */
+   {  7858, 0x00008740 }, /* GL_DOT3_RGB_EXT */
+   {  7874, 0x0000140A }, /* GL_DOUBLE */
+   {  7884, 0x00000C32 }, /* GL_DOUBLEBUFFER */
+   {  7900, 0x00000C01 }, /* GL_DRAW_BUFFER */
+   {  7915, 0x00008825 }, /* GL_DRAW_BUFFER0 */
+   {  7931, 0x00008825 }, /* GL_DRAW_BUFFER0_ARB */
+   {  7951, 0x00008825 }, /* GL_DRAW_BUFFER0_ATI */
+   {  7971, 0x00008826 }, /* GL_DRAW_BUFFER1 */
+   {  7987, 0x0000882F }, /* GL_DRAW_BUFFER10 */
+   {  8004, 0x0000882F }, /* GL_DRAW_BUFFER10_ARB */
+   {  8025, 0x0000882F }, /* GL_DRAW_BUFFER10_ATI */
+   {  8046, 0x00008830 }, /* GL_DRAW_BUFFER11 */
+   {  8063, 0x00008830 }, /* GL_DRAW_BUFFER11_ARB */
+   {  8084, 0x00008830 }, /* GL_DRAW_BUFFER11_ATI */
+   {  8105, 0x00008831 }, /* GL_DRAW_BUFFER12 */
+   {  8122, 0x00008831 }, /* GL_DRAW_BUFFER12_ARB */
+   {  8143, 0x00008831 }, /* GL_DRAW_BUFFER12_ATI */
+   {  8164, 0x00008832 }, /* GL_DRAW_BUFFER13 */
+   {  8181, 0x00008832 }, /* GL_DRAW_BUFFER13_ARB */
+   {  8202, 0x00008832 }, /* GL_DRAW_BUFFER13_ATI */
+   {  8223, 0x00008833 }, /* GL_DRAW_BUFFER14 */
+   {  8240, 0x00008833 }, /* GL_DRAW_BUFFER14_ARB */
+   {  8261, 0x00008833 }, /* GL_DRAW_BUFFER14_ATI */
+   {  8282, 0x00008834 }, /* GL_DRAW_BUFFER15 */
+   {  8299, 0x00008834 }, /* GL_DRAW_BUFFER15_ARB */
+   {  8320, 0x00008834 }, /* GL_DRAW_BUFFER15_ATI */
+   {  8341, 0x00008826 }, /* GL_DRAW_BUFFER1_ARB */
+   {  8361, 0x00008826 }, /* GL_DRAW_BUFFER1_ATI */
+   {  8381, 0x00008827 }, /* GL_DRAW_BUFFER2 */
+   {  8397, 0x00008827 }, /* GL_DRAW_BUFFER2_ARB */
+   {  8417, 0x00008827 }, /* GL_DRAW_BUFFER2_ATI */
+   {  8437, 0x00008828 }, /* GL_DRAW_BUFFER3 */
+   {  8453, 0x00008828 }, /* GL_DRAW_BUFFER3_ARB */
+   {  8473, 0x00008828 }, /* GL_DRAW_BUFFER3_ATI */
+   {  8493, 0x00008829 }, /* GL_DRAW_BUFFER4 */
+   {  8509, 0x00008829 }, /* GL_DRAW_BUFFER4_ARB */
+   {  8529, 0x00008829 }, /* GL_DRAW_BUFFER4_ATI */
+   {  8549, 0x0000882A }, /* GL_DRAW_BUFFER5 */
+   {  8565, 0x0000882A }, /* GL_DRAW_BUFFER5_ARB */
+   {  8585, 0x0000882A }, /* GL_DRAW_BUFFER5_ATI */
+   {  8605, 0x0000882B }, /* GL_DRAW_BUFFER6 */
+   {  8621, 0x0000882B }, /* GL_DRAW_BUFFER6_ARB */
+   {  8641, 0x0000882B }, /* GL_DRAW_BUFFER6_ATI */
+   {  8661, 0x0000882C }, /* GL_DRAW_BUFFER7 */
+   {  8677, 0x0000882C }, /* GL_DRAW_BUFFER7_ARB */
+   {  8697, 0x0000882C }, /* GL_DRAW_BUFFER7_ATI */
+   {  8717, 0x0000882D }, /* GL_DRAW_BUFFER8 */
+   {  8733, 0x0000882D }, /* GL_DRAW_BUFFER8_ARB */
+   {  8753, 0x0000882D }, /* GL_DRAW_BUFFER8_ATI */
+   {  8773, 0x0000882E }, /* GL_DRAW_BUFFER9 */
+   {  8789, 0x0000882E }, /* GL_DRAW_BUFFER9_ARB */
+   {  8809, 0x0000882E }, /* GL_DRAW_BUFFER9_ATI */
+   {  8829, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER */
+   {  8849, 0x00008CA6 }, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
+   {  8881, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER_EXT */
+   {  8905, 0x00000705 }, /* GL_DRAW_PIXEL_TOKEN */
+   {  8925, 0x00000304 }, /* GL_DST_ALPHA */
+   {  8938, 0x00000306 }, /* GL_DST_COLOR */
+   {  8951, 0x0000877A }, /* GL_DU8DV8_ATI */
+   {  8965, 0x00008779 }, /* GL_DUDV_ATI */
+   {  8977, 0x000088EA }, /* GL_DYNAMIC_COPY */
+   {  8993, 0x000088EA }, /* GL_DYNAMIC_COPY_ARB */
+   {  9013, 0x000088E8 }, /* GL_DYNAMIC_DRAW */
+   {  9029, 0x000088E8 }, /* GL_DYNAMIC_DRAW_ARB */
+   {  9049, 0x000088E9 }, /* GL_DYNAMIC_READ */
+   {  9065, 0x000088E9 }, /* GL_DYNAMIC_READ_ARB */
+   {  9085, 0x00000B43 }, /* GL_EDGE_FLAG */
+   {  9098, 0x00008079 }, /* GL_EDGE_FLAG_ARRAY */
+   {  9117, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
+   {  9151, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB */
+   {  9189, 0x00008093 }, /* GL_EDGE_FLAG_ARRAY_POINTER */
+   {  9216, 0x0000808C }, /* GL_EDGE_FLAG_ARRAY_STRIDE */
+   {  9242, 0x00008893 }, /* GL_ELEMENT_ARRAY_BUFFER */
+   {  9266, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
+   {  9298, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB */
+   {  9334, 0x00001600 }, /* GL_EMISSION */
+   {  9346, 0x00002000 }, /* GL_ENABLE_BIT */
+   {  9360, 0x00000202 }, /* GL_EQUAL */
+   {  9369, 0x00001509 }, /* GL_EQUIV */
+   {  9378, 0x00010000 }, /* GL_EVAL_BIT */
+   {  9390, 0x00000800 }, /* GL_EXP */
+   {  9397, 0x00000801 }, /* GL_EXP2 */
+   {  9405, 0x00001F03 }, /* GL_EXTENSIONS */
+   {  9419, 0x00002400 }, /* GL_EYE_LINEAR */
+   {  9433, 0x00002502 }, /* GL_EYE_PLANE */
+   {  9446, 0x0000855C }, /* GL_EYE_PLANE_ABSOLUTE_NV */
+   {  9471, 0x0000855B }, /* GL_EYE_RADIAL_NV */
+   {  9488, 0x00000000 }, /* GL_FALSE */
+   {  9497, 0x00001101 }, /* GL_FASTEST */
+   {  9508, 0x00001C01 }, /* GL_FEEDBACK */
+   {  9520, 0x00000DF0 }, /* GL_FEEDBACK_BUFFER_POINTER */
+   {  9547, 0x00000DF1 }, /* GL_FEEDBACK_BUFFER_SIZE */
+   {  9571, 0x00000DF2 }, /* GL_FEEDBACK_BUFFER_TYPE */
+   {  9595, 0x00001B02 }, /* GL_FILL */
+   {  9603, 0x00001D00 }, /* GL_FLAT */
+   {  9611, 0x00001406 }, /* GL_FLOAT */
+   {  9620, 0x00008B5A }, /* GL_FLOAT_MAT2 */
+   {  9634, 0x00008B5A }, /* GL_FLOAT_MAT2_ARB */
+   {  9652, 0x00008B65 }, /* GL_FLOAT_MAT2x3 */
+   {  9668, 0x00008B66 }, /* GL_FLOAT_MAT2x4 */
+   {  9684, 0x00008B5B }, /* GL_FLOAT_MAT3 */
+   {  9698, 0x00008B5B }, /* GL_FLOAT_MAT3_ARB */
+   {  9716, 0x00008B67 }, /* GL_FLOAT_MAT3x2 */
+   {  9732, 0x00008B68 }, /* GL_FLOAT_MAT3x4 */
+   {  9748, 0x00008B5C }, /* GL_FLOAT_MAT4 */
+   {  9762, 0x00008B5C }, /* GL_FLOAT_MAT4_ARB */
+   {  9780, 0x00008B69 }, /* GL_FLOAT_MAT4x2 */
+   {  9796, 0x00008B6A }, /* GL_FLOAT_MAT4x3 */
+   {  9812, 0x00008B50 }, /* GL_FLOAT_VEC2 */
+   {  9826, 0x00008B50 }, /* GL_FLOAT_VEC2_ARB */
+   {  9844, 0x00008B51 }, /* GL_FLOAT_VEC3 */
+   {  9858, 0x00008B51 }, /* GL_FLOAT_VEC3_ARB */
+   {  9876, 0x00008B52 }, /* GL_FLOAT_VEC4 */
+   {  9890, 0x00008B52 }, /* GL_FLOAT_VEC4_ARB */
+   {  9908, 0x00000B60 }, /* GL_FOG */
+   {  9915, 0x00000080 }, /* GL_FOG_BIT */
+   {  9926, 0x00000B66 }, /* GL_FOG_COLOR */
+   {  9939, 0x00008451 }, /* GL_FOG_COORD */
+   {  9952, 0x00008451 }, /* GL_FOG_COORDINATE */
+   {  9970, 0x00008457 }, /* GL_FOG_COORDINATE_ARRAY */
+   {  9994, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
+   { 10033, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB */
+   { 10076, 0x00008456 }, /* GL_FOG_COORDINATE_ARRAY_POINTER */
+   { 10108, 0x00008455 }, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
+   { 10139, 0x00008454 }, /* GL_FOG_COORDINATE_ARRAY_TYPE */
+   { 10168, 0x00008450 }, /* GL_FOG_COORDINATE_SOURCE */
+   { 10193, 0x00008457 }, /* GL_FOG_COORD_ARRAY */
+   { 10212, 0x0000889D }, /* GL_FOG_COORD_ARRAY_BUFFER_BINDING */
+   { 10246, 0x00008456 }, /* GL_FOG_COORD_ARRAY_POINTER */
+   { 10273, 0x00008455 }, /* GL_FOG_COORD_ARRAY_STRIDE */
+   { 10299, 0x00008454 }, /* GL_FOG_COORD_ARRAY_TYPE */
+   { 10323, 0x00008450 }, /* GL_FOG_COORD_SRC */
+   { 10340, 0x00000B62 }, /* GL_FOG_DENSITY */
+   { 10355, 0x0000855A }, /* GL_FOG_DISTANCE_MODE_NV */
+   { 10379, 0x00000B64 }, /* GL_FOG_END */
+   { 10390, 0x00000C54 }, /* GL_FOG_HINT */
+   { 10402, 0x00000B61 }, /* GL_FOG_INDEX */
+   { 10415, 0x00000B65 }, /* GL_FOG_MODE */
+   { 10427, 0x00008198 }, /* GL_FOG_OFFSET_SGIX */
+   { 10446, 0x00008199 }, /* GL_FOG_OFFSET_VALUE_SGIX */
+   { 10471, 0x00000B63 }, /* GL_FOG_START */
+   { 10484, 0x00008452 }, /* GL_FRAGMENT_DEPTH */
+   { 10502, 0x00008804 }, /* GL_FRAGMENT_PROGRAM_ARB */
+   { 10526, 0x00008B30 }, /* GL_FRAGMENT_SHADER */
+   { 10545, 0x00008B30 }, /* GL_FRAGMENT_SHADER_ARB */
+   { 10568, 0x00008B8B }, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
+   { 10603, 0x00008D40 }, /* GL_FRAMEBUFFER */
+   { 10618, 0x00008215 }, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
+   { 10655, 0x00008214 }, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
+   { 10691, 0x00008210 }, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
+   { 10732, 0x00008211 }, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
+   { 10773, 0x00008216 }, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
+   { 10810, 0x00008213 }, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
+   { 10847, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
+   { 10885, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT */
+   { 10927, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
+   { 10965, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT */
+   { 11007, 0x00008212 }, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
+   { 11042, 0x00008217 }, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
+   { 11081, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT */
+   { 11130, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
+   { 11178, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT */
+   { 11230, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+   { 11270, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
+   { 11314, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
+   { 11354, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT */
+   { 11398, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING_EXT */
+   { 11425, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE */
+   { 11449, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE_EXT */
+   { 11477, 0x00008218 }, /* GL_FRAMEBUFFER_DEFAULT */
+   { 11500, 0x00008D40 }, /* GL_FRAMEBUFFER_EXT */
+   { 11519, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
+   { 11556, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT */
+   { 11597, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
+   { 11638, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
+   { 11680, 0x00008CD8 }, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
+   { 11731, 0x00008CDA }, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
+   { 11769, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
+   { 11814, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT */
+   { 11863, 0x00008D56 }, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
+   { 11901, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
+   { 11943, 0x00008CDE }, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
+   { 11975, 0x00008219 }, /* GL_FRAMEBUFFER_UNDEFINED */
+   { 12000, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED */
+   { 12027, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED_EXT */
+   { 12058, 0x00000404 }, /* GL_FRONT */
+   { 12067, 0x00000408 }, /* GL_FRONT_AND_BACK */
+   { 12085, 0x00000B46 }, /* GL_FRONT_FACE */
+   { 12099, 0x00000400 }, /* GL_FRONT_LEFT */
+   { 12113, 0x00000401 }, /* GL_FRONT_RIGHT */
+   { 12128, 0x00008006 }, /* GL_FUNC_ADD */
+   { 12140, 0x00008006 }, /* GL_FUNC_ADD_EXT */
+   { 12156, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT */
+   { 12181, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT_EXT */
+   { 12210, 0x0000800A }, /* GL_FUNC_SUBTRACT */
+   { 12227, 0x0000800A }, /* GL_FUNC_SUBTRACT_EXT */
+   { 12248, 0x00008191 }, /* GL_GENERATE_MIPMAP */
+   { 12267, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT */
+   { 12291, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT_SGIS */
+   { 12320, 0x00008191 }, /* GL_GENERATE_MIPMAP_SGIS */
+   { 12344, 0x00000206 }, /* GL_GEQUAL */
+   { 12354, 0x00000204 }, /* GL_GREATER */
+   { 12365, 0x00001904 }, /* GL_GREEN */
+   { 12374, 0x00000D19 }, /* GL_GREEN_BIAS */
+   { 12388, 0x00000D53 }, /* GL_GREEN_BITS */
+   { 12402, 0x00000D18 }, /* GL_GREEN_SCALE */
+   { 12417, 0x00008000 }, /* GL_HINT_BIT */
+   { 12429, 0x00008024 }, /* GL_HISTOGRAM */
+   { 12442, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE */
+   { 12466, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE_EXT */
+   { 12494, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE */
+   { 12517, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE_EXT */
+   { 12544, 0x00008024 }, /* GL_HISTOGRAM_EXT */
+   { 12561, 0x00008027 }, /* GL_HISTOGRAM_FORMAT */
+   { 12581, 0x00008027 }, /* GL_HISTOGRAM_FORMAT_EXT */
+   { 12605, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE */
+   { 12629, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE_EXT */
+   { 12657, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE */
+   { 12685, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE_EXT */
+   { 12717, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE */
+   { 12739, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE_EXT */
+   { 12765, 0x0000802D }, /* GL_HISTOGRAM_SINK */
+   { 12783, 0x0000802D }, /* GL_HISTOGRAM_SINK_EXT */
+   { 12805, 0x00008026 }, /* GL_HISTOGRAM_WIDTH */
+   { 12824, 0x00008026 }, /* GL_HISTOGRAM_WIDTH_EXT */
+   { 12847, 0x0000862A }, /* GL_IDENTITY_NV */
+   { 12862, 0x00008150 }, /* GL_IGNORE_BORDER_HP */
+   { 12882, 0x00008B9B }, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
+   { 12922, 0x00008B9A }, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
+   { 12960, 0x00001E02 }, /* GL_INCR */
+   { 12968, 0x00008507 }, /* GL_INCR_WRAP */
+   { 12981, 0x00008507 }, /* GL_INCR_WRAP_EXT */
+   { 12998, 0x00008222 }, /* GL_INDEX */
+   { 13007, 0x00008077 }, /* GL_INDEX_ARRAY */
+   { 13022, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING */
+   { 13052, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING_ARB */
+   { 13086, 0x00008091 }, /* GL_INDEX_ARRAY_POINTER */
+   { 13109, 0x00008086 }, /* GL_INDEX_ARRAY_STRIDE */
+   { 13131, 0x00008085 }, /* GL_INDEX_ARRAY_TYPE */
+   { 13151, 0x00000D51 }, /* GL_INDEX_BITS */
+   { 13165, 0x00000C20 }, /* GL_INDEX_CLEAR_VALUE */
+   { 13186, 0x00000BF1 }, /* GL_INDEX_LOGIC_OP */
+   { 13204, 0x00000C30 }, /* GL_INDEX_MODE */
+   { 13218, 0x00000D13 }, /* GL_INDEX_OFFSET */
+   { 13234, 0x00000D12 }, /* GL_INDEX_SHIFT */
+   { 13249, 0x00000C21 }, /* GL_INDEX_WRITEMASK */
+   { 13268, 0x00008B84 }, /* GL_INFO_LOG_LENGTH */
+   { 13287, 0x00001404 }, /* GL_INT */
+   { 13294, 0x00008049 }, /* GL_INTENSITY */
+   { 13307, 0x0000804C }, /* GL_INTENSITY12 */
+   { 13322, 0x0000804C }, /* GL_INTENSITY12_EXT */
+   { 13341, 0x0000804D }, /* GL_INTENSITY16 */
+   { 13356, 0x0000804D }, /* GL_INTENSITY16_EXT */
+   { 13375, 0x0000804A }, /* GL_INTENSITY4 */
+   { 13389, 0x0000804A }, /* GL_INTENSITY4_EXT */
+   { 13407, 0x0000804B }, /* GL_INTENSITY8 */
+   { 13421, 0x0000804B }, /* GL_INTENSITY8_EXT */
+   { 13439, 0x00008049 }, /* GL_INTENSITY_EXT */
+   { 13456, 0x00008575 }, /* GL_INTERPOLATE */
+   { 13471, 0x00008575 }, /* GL_INTERPOLATE_ARB */
+   { 13490, 0x00008575 }, /* GL_INTERPOLATE_EXT */
+   { 13509, 0x00008B53 }, /* GL_INT_VEC2 */
+   { 13521, 0x00008B53 }, /* GL_INT_VEC2_ARB */
+   { 13537, 0x00008B54 }, /* GL_INT_VEC3 */
+   { 13549, 0x00008B54 }, /* GL_INT_VEC3_ARB */
+   { 13565, 0x00008B55 }, /* GL_INT_VEC4 */
+   { 13577, 0x00008B55 }, /* GL_INT_VEC4_ARB */
+   { 13593, 0x00000500 }, /* GL_INVALID_ENUM */
+   { 13609, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION */
+   { 13642, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION_EXT */
+   { 13679, 0x00000502 }, /* GL_INVALID_OPERATION */
+   { 13700, 0x00000501 }, /* GL_INVALID_VALUE */
+   { 13717, 0x0000862B }, /* GL_INVERSE_NV */
+   { 13731, 0x0000862D }, /* GL_INVERSE_TRANSPOSE_NV */
+   { 13755, 0x0000150A }, /* GL_INVERT */
+   { 13765, 0x00001E00 }, /* GL_KEEP */
+   { 13773, 0x00000406 }, /* GL_LEFT */
+   { 13781, 0x00000203 }, /* GL_LEQUAL */
+   { 13791, 0x00000201 }, /* GL_LESS */
+   { 13799, 0x00004000 }, /* GL_LIGHT0 */
+   { 13809, 0x00004001 }, /* GL_LIGHT1 */
+   { 13819, 0x00004002 }, /* GL_LIGHT2 */
+   { 13829, 0x00004003 }, /* GL_LIGHT3 */
+   { 13839, 0x00004004 }, /* GL_LIGHT4 */
+   { 13849, 0x00004005 }, /* GL_LIGHT5 */
+   { 13859, 0x00004006 }, /* GL_LIGHT6 */
+   { 13869, 0x00004007 }, /* GL_LIGHT7 */
+   { 13879, 0x00000B50 }, /* GL_LIGHTING */
+   { 13891, 0x00000040 }, /* GL_LIGHTING_BIT */
+   { 13907, 0x00000B53 }, /* GL_LIGHT_MODEL_AMBIENT */
+   { 13930, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL */
+   { 13959, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL_EXT */
+   { 13992, 0x00000B51 }, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
+   { 14020, 0x00000B52 }, /* GL_LIGHT_MODEL_TWO_SIDE */
+   { 14044, 0x00001B01 }, /* GL_LINE */
+   { 14052, 0x00002601 }, /* GL_LINEAR */
+   { 14062, 0x00001208 }, /* GL_LINEAR_ATTENUATION */
+   { 14084, 0x00008170 }, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
+   { 14114, 0x0000844F }, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
+   { 14145, 0x00002703 }, /* GL_LINEAR_MIPMAP_LINEAR */
+   { 14169, 0x00002701 }, /* GL_LINEAR_MIPMAP_NEAREST */
+   { 14194, 0x00000001 }, /* GL_LINES */
+   { 14203, 0x00000004 }, /* GL_LINE_BIT */
+   { 14215, 0x00000002 }, /* GL_LINE_LOOP */
+   { 14228, 0x00000707 }, /* GL_LINE_RESET_TOKEN */
+   { 14248, 0x00000B20 }, /* GL_LINE_SMOOTH */
+   { 14263, 0x00000C52 }, /* GL_LINE_SMOOTH_HINT */
+   { 14283, 0x00000B24 }, /* GL_LINE_STIPPLE */
+   { 14299, 0x00000B25 }, /* GL_LINE_STIPPLE_PATTERN */
+   { 14323, 0x00000B26 }, /* GL_LINE_STIPPLE_REPEAT */
+   { 14346, 0x00000003 }, /* GL_LINE_STRIP */
+   { 14360, 0x00000702 }, /* GL_LINE_TOKEN */
+   { 14374, 0x00000B21 }, /* GL_LINE_WIDTH */
+   { 14388, 0x00000B23 }, /* GL_LINE_WIDTH_GRANULARITY */
+   { 14414, 0x00000B22 }, /* GL_LINE_WIDTH_RANGE */
+   { 14434, 0x00008B82 }, /* GL_LINK_STATUS */
+   { 14449, 0x00000B32 }, /* GL_LIST_BASE */
+   { 14462, 0x00020000 }, /* GL_LIST_BIT */
+   { 14474, 0x00000B33 }, /* GL_LIST_INDEX */
+   { 14488, 0x00000B30 }, /* GL_LIST_MODE */
+   { 14501, 0x00000101 }, /* GL_LOAD */
+   { 14509, 0x00000BF1 }, /* GL_LOGIC_OP */
+   { 14521, 0x00000BF0 }, /* GL_LOGIC_OP_MODE */
+   { 14538, 0x00008CA1 }, /* GL_LOWER_LEFT */
+   { 14552, 0x00001909 }, /* GL_LUMINANCE */
+   { 14565, 0x00008041 }, /* GL_LUMINANCE12 */
+   { 14580, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12 */
+   { 14603, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12_EXT */
+   { 14630, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4 */
+   { 14652, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4_EXT */
+   { 14678, 0x00008041 }, /* GL_LUMINANCE12_EXT */
+   { 14697, 0x00008042 }, /* GL_LUMINANCE16 */
+   { 14712, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16 */
+   { 14735, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16_EXT */
+   { 14762, 0x00008042 }, /* GL_LUMINANCE16_EXT */
+   { 14781, 0x0000803F }, /* GL_LUMINANCE4 */
+   { 14795, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4 */
+   { 14816, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4_EXT */
+   { 14841, 0x0000803F }, /* GL_LUMINANCE4_EXT */
+   { 14859, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2 */
+   { 14880, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2_EXT */
+   { 14905, 0x00008040 }, /* GL_LUMINANCE8 */
+   { 14919, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8 */
+   { 14940, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8_EXT */
+   { 14965, 0x00008040 }, /* GL_LUMINANCE8_EXT */
+   { 14983, 0x0000190A }, /* GL_LUMINANCE_ALPHA */
+   { 15002, 0x00000D90 }, /* GL_MAP1_COLOR_4 */
+   { 15018, 0x00000DD0 }, /* GL_MAP1_GRID_DOMAIN */
+   { 15038, 0x00000DD1 }, /* GL_MAP1_GRID_SEGMENTS */
+   { 15060, 0x00000D91 }, /* GL_MAP1_INDEX */
+   { 15074, 0x00000D92 }, /* GL_MAP1_NORMAL */
+   { 15089, 0x00000D93 }, /* GL_MAP1_TEXTURE_COORD_1 */
+   { 15113, 0x00000D94 }, /* GL_MAP1_TEXTURE_COORD_2 */
+   { 15137, 0x00000D95 }, /* GL_MAP1_TEXTURE_COORD_3 */
+   { 15161, 0x00000D96 }, /* GL_MAP1_TEXTURE_COORD_4 */
+   { 15185, 0x00000D97 }, /* GL_MAP1_VERTEX_3 */
+   { 15202, 0x00000D98 }, /* GL_MAP1_VERTEX_4 */
+   { 15219, 0x00008660 }, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
+   { 15247, 0x0000866A }, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
+   { 15276, 0x0000866B }, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
+   { 15305, 0x0000866C }, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
+   { 15334, 0x0000866D }, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
+   { 15363, 0x0000866E }, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
+   { 15392, 0x0000866F }, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
+   { 15421, 0x00008661 }, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
+   { 15449, 0x00008662 }, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
+   { 15477, 0x00008663 }, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
+   { 15505, 0x00008664 }, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
+   { 15533, 0x00008665 }, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
+   { 15561, 0x00008666 }, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
+   { 15589, 0x00008667 }, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
+   { 15617, 0x00008668 }, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
+   { 15645, 0x00008669 }, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
+   { 15673, 0x00000DB0 }, /* GL_MAP2_COLOR_4 */
+   { 15689, 0x00000DD2 }, /* GL_MAP2_GRID_DOMAIN */
+   { 15709, 0x00000DD3 }, /* GL_MAP2_GRID_SEGMENTS */
+   { 15731, 0x00000DB1 }, /* GL_MAP2_INDEX */
+   { 15745, 0x00000DB2 }, /* GL_MAP2_NORMAL */
+   { 15760, 0x00000DB3 }, /* GL_MAP2_TEXTURE_COORD_1 */
+   { 15784, 0x00000DB4 }, /* GL_MAP2_TEXTURE_COORD_2 */
+   { 15808, 0x00000DB5 }, /* GL_MAP2_TEXTURE_COORD_3 */
+   { 15832, 0x00000DB6 }, /* GL_MAP2_TEXTURE_COORD_4 */
+   { 15856, 0x00000DB7 }, /* GL_MAP2_VERTEX_3 */
+   { 15873, 0x00000DB8 }, /* GL_MAP2_VERTEX_4 */
+   { 15890, 0x00008670 }, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
+   { 15918, 0x0000867A }, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
+   { 15947, 0x0000867B }, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
+   { 15976, 0x0000867C }, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
+   { 16005, 0x0000867D }, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
+   { 16034, 0x0000867E }, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
+   { 16063, 0x0000867F }, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
+   { 16092, 0x00008671 }, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
+   { 16120, 0x00008672 }, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
+   { 16148, 0x00008673 }, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
+   { 16176, 0x00008674 }, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
+   { 16204, 0x00008675 }, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
+   { 16232, 0x00008676 }, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
+   { 16260, 0x00008677 }, /* GL_MAP2_VERTEX_ATTRIB7_4_NV */
+   { 16288, 0x00008678 }, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
+   { 16316, 0x00008679 }, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
+   { 16344, 0x00000D10 }, /* GL_MAP_COLOR */
+   { 16357, 0x00000D11 }, /* GL_MAP_STENCIL */
+   { 16372, 0x000088C0 }, /* GL_MATRIX0_ARB */
+   { 16387, 0x00008630 }, /* GL_MATRIX0_NV */
+   { 16401, 0x000088CA }, /* GL_MATRIX10_ARB */
+   { 16417, 0x000088CB }, /* GL_MATRIX11_ARB */
+   { 16433, 0x000088CC }, /* GL_MATRIX12_ARB */
+   { 16449, 0x000088CD }, /* GL_MATRIX13_ARB */
+   { 16465, 0x000088CE }, /* GL_MATRIX14_ARB */
+   { 16481, 0x000088CF }, /* GL_MATRIX15_ARB */
+   { 16497, 0x000088D0 }, /* GL_MATRIX16_ARB */
+   { 16513, 0x000088D1 }, /* GL_MATRIX17_ARB */
+   { 16529, 0x000088D2 }, /* GL_MATRIX18_ARB */
+   { 16545, 0x000088D3 }, /* GL_MATRIX19_ARB */
+   { 16561, 0x000088C1 }, /* GL_MATRIX1_ARB */
+   { 16576, 0x00008631 }, /* GL_MATRIX1_NV */
+   { 16590, 0x000088D4 }, /* GL_MATRIX20_ARB */
+   { 16606, 0x000088D5 }, /* GL_MATRIX21_ARB */
+   { 16622, 0x000088D6 }, /* GL_MATRIX22_ARB */
+   { 16638, 0x000088D7 }, /* GL_MATRIX23_ARB */
+   { 16654, 0x000088D8 }, /* GL_MATRIX24_ARB */
+   { 16670, 0x000088D9 }, /* GL_MATRIX25_ARB */
+   { 16686, 0x000088DA }, /* GL_MATRIX26_ARB */
+   { 16702, 0x000088DB }, /* GL_MATRIX27_ARB */
+   { 16718, 0x000088DC }, /* GL_MATRIX28_ARB */
+   { 16734, 0x000088DD }, /* GL_MATRIX29_ARB */
+   { 16750, 0x000088C2 }, /* GL_MATRIX2_ARB */
+   { 16765, 0x00008632 }, /* GL_MATRIX2_NV */
+   { 16779, 0x000088DE }, /* GL_MATRIX30_ARB */
+   { 16795, 0x000088DF }, /* GL_MATRIX31_ARB */
+   { 16811, 0x000088C3 }, /* GL_MATRIX3_ARB */
+   { 16826, 0x00008633 }, /* GL_MATRIX3_NV */
+   { 16840, 0x000088C4 }, /* GL_MATRIX4_ARB */
+   { 16855, 0x00008634 }, /* GL_MATRIX4_NV */
+   { 16869, 0x000088C5 }, /* GL_MATRIX5_ARB */
+   { 16884, 0x00008635 }, /* GL_MATRIX5_NV */
+   { 16898, 0x000088C6 }, /* GL_MATRIX6_ARB */
+   { 16913, 0x00008636 }, /* GL_MATRIX6_NV */
+   { 16927, 0x000088C7 }, /* GL_MATRIX7_ARB */
+   { 16942, 0x00008637 }, /* GL_MATRIX7_NV */
+   { 16956, 0x000088C8 }, /* GL_MATRIX8_ARB */
+   { 16971, 0x000088C9 }, /* GL_MATRIX9_ARB */
+   { 16986, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_ARB */
+   { 17012, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
+   { 17046, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
+   { 17077, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
+   { 17110, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
+   { 17141, 0x00000BA0 }, /* GL_MATRIX_MODE */
+   { 17156, 0x00008840 }, /* GL_MATRIX_PALETTE_ARB */
+   { 17178, 0x00008008 }, /* GL_MAX */
+   { 17185, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE */
+   { 17208, 0x000088FF }, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
+   { 17240, 0x00000D35 }, /* GL_MAX_ATTRIB_STACK_DEPTH */
+   { 17266, 0x00000D3B }, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
+   { 17299, 0x00008177 }, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
+   { 17325, 0x00008178 }, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+   { 17359, 0x00000D32 }, /* GL_MAX_CLIP_PLANES */
+   { 17378, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
+   { 17407, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
+   { 17439, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI */
+   { 17475, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
+   { 17511, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB */
+   { 17551, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT */
+   { 17577, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT_EXT */
+   { 17607, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH */
+   { 17632, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH_EXT */
+   { 17661, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
+   { 17690, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB */
+   { 17723, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS */
+   { 17743, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ARB */
+   { 17767, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ATI */
+   { 17791, 0x000080E9 }, /* GL_MAX_ELEMENTS_INDICES */
+   { 17815, 0x000080E8 }, /* GL_MAX_ELEMENTS_VERTICES */
+   { 17840, 0x00000D30 }, /* GL_MAX_EVAL_ORDER */
+   { 17858, 0x00008008 }, /* GL_MAX_EXT */
+   { 17869, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
+   { 17904, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB */
+   { 17943, 0x00000D31 }, /* GL_MAX_LIGHTS */
+   { 17957, 0x00000B31 }, /* GL_MAX_LIST_NESTING */
+   { 17977, 0x00008841 }, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
+   { 18015, 0x00000D36 }, /* GL_MAX_MODELVIEW_STACK_DEPTH */
+   { 18044, 0x00000D37 }, /* GL_MAX_NAME_STACK_DEPTH */
+   { 18068, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_ARB */
+   { 18096, 0x00000D34 }, /* GL_MAX_PIXEL_MAP_TABLE */
+   { 18119, 0x000088B1 }, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
+   { 18156, 0x0000880B }, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
+   { 18192, 0x000088AD }, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
+   { 18219, 0x000088F5 }, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
+   { 18248, 0x000088B5 }, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
+   { 18282, 0x000088F4 }, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
+   { 18318, 0x000088F6 }, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
+   { 18345, 0x000088A1 }, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
+   { 18377, 0x000088B4 }, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
+   { 18413, 0x000088F8 }, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
+   { 18442, 0x000088F7 }, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
+   { 18471, 0x0000862F }, /* GL_MAX_PROGRAM_MATRICES_ARB */
+   { 18499, 0x0000862E }, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
+   { 18537, 0x000088B3 }, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+   { 18581, 0x0000880E }, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+   { 18624, 0x000088AF }, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
+   { 18658, 0x000088A3 }, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+   { 18697, 0x000088AB }, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
+   { 18734, 0x000088A7 }, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
+   { 18772, 0x00008810 }, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+   { 18815, 0x0000880F }, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+   { 18858, 0x000088A9 }, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
+   { 18888, 0x000088A5 }, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
+   { 18919, 0x0000880D }, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
+   { 18955, 0x0000880C }, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
+   { 18991, 0x00000D38 }, /* GL_MAX_PROJECTION_STACK_DEPTH */
+   { 19021, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
+   { 19055, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_NV */
+   { 19088, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
+   { 19117, 0x00008D57 }, /* GL_MAX_SAMPLES */
+   { 19132, 0x00008504 }, /* GL_MAX_SHININESS_NV */
+   { 19152, 0x00008505 }, /* GL_MAX_SPOT_EXPONENT_NV */
+   { 19176, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS */
+   { 19198, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS_ARB */
+   { 19224, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS */
+   { 19251, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS_ARB */
+   { 19282, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS */
+   { 19306, 0x000084FF }, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
+   { 19340, 0x00000D33 }, /* GL_MAX_TEXTURE_SIZE */
+   { 19360, 0x00000D39 }, /* GL_MAX_TEXTURE_STACK_DEPTH */
+   { 19387, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS */
+   { 19408, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS_ARB */
+   { 19433, 0x0000862F }, /* GL_MAX_TRACK_MATRICES_NV */
+   { 19458, 0x0000862E }, /* GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */
+   { 19493, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS */
+   { 19515, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS_ARB */
+   { 19541, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS */
+   { 19563, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS_ARB */
+   { 19589, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
+   { 19623, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
+   { 19661, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
+   { 19694, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB */
+   { 19731, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_ARB */
+   { 19755, 0x00000D3A }, /* GL_MAX_VIEWPORT_DIMS */
+   { 19776, 0x00008007 }, /* GL_MIN */
+   { 19783, 0x0000802E }, /* GL_MINMAX */
+   { 19793, 0x0000802E }, /* GL_MINMAX_EXT */
+   { 19807, 0x0000802F }, /* GL_MINMAX_FORMAT */
+   { 19824, 0x0000802F }, /* GL_MINMAX_FORMAT_EXT */
+   { 19845, 0x00008030 }, /* GL_MINMAX_SINK */
+   { 19860, 0x00008030 }, /* GL_MINMAX_SINK_EXT */
+   { 19879, 0x00008007 }, /* GL_MIN_EXT */
+   { 19890, 0x00008370 }, /* GL_MIRRORED_REPEAT */
+   { 19909, 0x00008370 }, /* GL_MIRRORED_REPEAT_ARB */
+   { 19932, 0x00008370 }, /* GL_MIRRORED_REPEAT_IBM */
+   { 19955, 0x00008742 }, /* GL_MIRROR_CLAMP_ATI */
+   { 19975, 0x00008742 }, /* GL_MIRROR_CLAMP_EXT */
+   { 19995, 0x00008912 }, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
+   { 20025, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_ATI */
+   { 20053, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
+   { 20081, 0x00001700 }, /* GL_MODELVIEW */
+   { 20094, 0x00001700 }, /* GL_MODELVIEW0_ARB */
+   { 20112, 0x0000872A }, /* GL_MODELVIEW10_ARB */
+   { 20131, 0x0000872B }, /* GL_MODELVIEW11_ARB */
+   { 20150, 0x0000872C }, /* GL_MODELVIEW12_ARB */
+   { 20169, 0x0000872D }, /* GL_MODELVIEW13_ARB */
+   { 20188, 0x0000872E }, /* GL_MODELVIEW14_ARB */
+   { 20207, 0x0000872F }, /* GL_MODELVIEW15_ARB */
+   { 20226, 0x00008730 }, /* GL_MODELVIEW16_ARB */
+   { 20245, 0x00008731 }, /* GL_MODELVIEW17_ARB */
+   { 20264, 0x00008732 }, /* GL_MODELVIEW18_ARB */
+   { 20283, 0x00008733 }, /* GL_MODELVIEW19_ARB */
+   { 20302, 0x0000850A }, /* GL_MODELVIEW1_ARB */
+   { 20320, 0x00008734 }, /* GL_MODELVIEW20_ARB */
+   { 20339, 0x00008735 }, /* GL_MODELVIEW21_ARB */
+   { 20358, 0x00008736 }, /* GL_MODELVIEW22_ARB */
+   { 20377, 0x00008737 }, /* GL_MODELVIEW23_ARB */
+   { 20396, 0x00008738 }, /* GL_MODELVIEW24_ARB */
+   { 20415, 0x00008739 }, /* GL_MODELVIEW25_ARB */
+   { 20434, 0x0000873A }, /* GL_MODELVIEW26_ARB */
+   { 20453, 0x0000873B }, /* GL_MODELVIEW27_ARB */
+   { 20472, 0x0000873C }, /* GL_MODELVIEW28_ARB */
+   { 20491, 0x0000873D }, /* GL_MODELVIEW29_ARB */
+   { 20510, 0x00008722 }, /* GL_MODELVIEW2_ARB */
+   { 20528, 0x0000873E }, /* GL_MODELVIEW30_ARB */
+   { 20547, 0x0000873F }, /* GL_MODELVIEW31_ARB */
+   { 20566, 0x00008723 }, /* GL_MODELVIEW3_ARB */
+   { 20584, 0x00008724 }, /* GL_MODELVIEW4_ARB */
+   { 20602, 0x00008725 }, /* GL_MODELVIEW5_ARB */
+   { 20620, 0x00008726 }, /* GL_MODELVIEW6_ARB */
+   { 20638, 0x00008727 }, /* GL_MODELVIEW7_ARB */
+   { 20656, 0x00008728 }, /* GL_MODELVIEW8_ARB */
+   { 20674, 0x00008729 }, /* GL_MODELVIEW9_ARB */
+   { 20692, 0x00000BA6 }, /* GL_MODELVIEW_MATRIX */
+   { 20712, 0x00008629 }, /* GL_MODELVIEW_PROJECTION_NV */
+   { 20739, 0x00000BA3 }, /* GL_MODELVIEW_STACK_DEPTH */
+   { 20764, 0x00002100 }, /* GL_MODULATE */
+   { 20776, 0x00008744 }, /* GL_MODULATE_ADD_ATI */
+   { 20796, 0x00008745 }, /* GL_MODULATE_SIGNED_ADD_ATI */
+   { 20823, 0x00008746 }, /* GL_MODULATE_SUBTRACT_ATI */
+   { 20848, 0x00000103 }, /* GL_MULT */
+   { 20856, 0x0000809D }, /* GL_MULTISAMPLE */
+   { 20871, 0x000086B2 }, /* GL_MULTISAMPLE_3DFX */
+   { 20891, 0x0000809D }, /* GL_MULTISAMPLE_ARB */
+   { 20910, 0x20000000 }, /* GL_MULTISAMPLE_BIT */
+   { 20929, 0x20000000 }, /* GL_MULTISAMPLE_BIT_3DFX */
+   { 20953, 0x20000000 }, /* GL_MULTISAMPLE_BIT_ARB */
+   { 20976, 0x00008534 }, /* GL_MULTISAMPLE_FILTER_HINT_NV */
+   { 21006, 0x00002A25 }, /* GL_N3F_V3F */
+   { 21017, 0x00000D70 }, /* GL_NAME_STACK_DEPTH */
+   { 21037, 0x0000150E }, /* GL_NAND */
+   { 21045, 0x00002600 }, /* GL_NEAREST */
+   { 21056, 0x0000844E }, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
+   { 21087, 0x0000844D }, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
+   { 21119, 0x00002702 }, /* GL_NEAREST_MIPMAP_LINEAR */
+   { 21144, 0x00002700 }, /* GL_NEAREST_MIPMAP_NEAREST */
+   { 21170, 0x00000200 }, /* GL_NEVER */
+   { 21179, 0x00001102 }, /* GL_NICEST */
+   { 21189, 0x00000000 }, /* GL_NONE */
+   { 21197, 0x00001505 }, /* GL_NOOP */
+   { 21205, 0x00001508 }, /* GL_NOR */
+   { 21212, 0x00000BA1 }, /* GL_NORMALIZE */
+   { 21225, 0x00008075 }, /* GL_NORMAL_ARRAY */
+   { 21241, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
+   { 21272, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING_ARB */
+   { 21307, 0x0000808F }, /* GL_NORMAL_ARRAY_POINTER */
+   { 21331, 0x0000807F }, /* GL_NORMAL_ARRAY_STRIDE */
+   { 21354, 0x0000807E }, /* GL_NORMAL_ARRAY_TYPE */
+   { 21375, 0x00008511 }, /* GL_NORMAL_MAP */
+   { 21389, 0x00008511 }, /* GL_NORMAL_MAP_ARB */
+   { 21407, 0x00008511 }, /* GL_NORMAL_MAP_NV */
+   { 21424, 0x00000205 }, /* GL_NOTEQUAL */
+   { 21436, 0x00000000 }, /* GL_NO_ERROR */
+   { 21448, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
+   { 21482, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB */
+   { 21520, 0x00008B89 }, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */
+   { 21552, 0x00008B8A }, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */
+   { 21594, 0x00008B86 }, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */
+   { 21624, 0x00008B87 }, /* GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB */
+   { 21664, 0x00008B85 }, /* GL_OBJECT_ATTACHED_OBJECTS_ARB */
+   { 21695, 0x00008B81 }, /* GL_OBJECT_COMPILE_STATUS_ARB */
+   { 21724, 0x00008B80 }, /* GL_OBJECT_DELETE_STATUS_ARB */
+   { 21752, 0x00008B84 }, /* GL_OBJECT_INFO_LOG_LENGTH_ARB */
+   { 21782, 0x00002401 }, /* GL_OBJECT_LINEAR */
+   { 21799, 0x00008B82 }, /* GL_OBJECT_LINK_STATUS_ARB */
+   { 21825, 0x00002501 }, /* GL_OBJECT_PLANE */
+   { 21841, 0x00008B88 }, /* GL_OBJECT_SHADER_SOURCE_LENGTH_ARB */
+   { 21876, 0x00008B4F }, /* GL_OBJECT_SUBTYPE_ARB */
+   { 21898, 0x00008B4E }, /* GL_OBJECT_TYPE_ARB */
+   { 21917, 0x00008B83 }, /* GL_OBJECT_VALIDATE_STATUS_ARB */
+   { 21947, 0x00008165 }, /* GL_OCCLUSION_TEST_HP */
+   { 21968, 0x00008166 }, /* GL_OCCLUSION_TEST_RESULT_HP */
+   { 21996, 0x00000001 }, /* GL_ONE */
+   { 22003, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA */
+   { 22031, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA_EXT */
+   { 22063, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR */
+   { 22091, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR_EXT */
+   { 22123, 0x00000305 }, /* GL_ONE_MINUS_DST_ALPHA */
+   { 22146, 0x00000307 }, /* GL_ONE_MINUS_DST_COLOR */
+   { 22169, 0x00000303 }, /* GL_ONE_MINUS_SRC_ALPHA */
+   { 22192, 0x00000301 }, /* GL_ONE_MINUS_SRC_COLOR */
+   { 22215, 0x00008598 }, /* GL_OPERAND0_ALPHA */
+   { 22233, 0x00008598 }, /* GL_OPERAND0_ALPHA_ARB */
+   { 22255, 0x00008598 }, /* GL_OPERAND0_ALPHA_EXT */
+   { 22277, 0x00008590 }, /* GL_OPERAND0_RGB */
+   { 22293, 0x00008590 }, /* GL_OPERAND0_RGB_ARB */
+   { 22313, 0x00008590 }, /* GL_OPERAND0_RGB_EXT */
+   { 22333, 0x00008599 }, /* GL_OPERAND1_ALPHA */
+   { 22351, 0x00008599 }, /* GL_OPERAND1_ALPHA_ARB */
+   { 22373, 0x00008599 }, /* GL_OPERAND1_ALPHA_EXT */
+   { 22395, 0x00008591 }, /* GL_OPERAND1_RGB */
+   { 22411, 0x00008591 }, /* GL_OPERAND1_RGB_ARB */
+   { 22431, 0x00008591 }, /* GL_OPERAND1_RGB_EXT */
+   { 22451, 0x0000859A }, /* GL_OPERAND2_ALPHA */
+   { 22469, 0x0000859A }, /* GL_OPERAND2_ALPHA_ARB */
+   { 22491, 0x0000859A }, /* GL_OPERAND2_ALPHA_EXT */
+   { 22513, 0x00008592 }, /* GL_OPERAND2_RGB */
+   { 22529, 0x00008592 }, /* GL_OPERAND2_RGB_ARB */
+   { 22549, 0x00008592 }, /* GL_OPERAND2_RGB_EXT */
+   { 22569, 0x0000859B }, /* GL_OPERAND3_ALPHA_NV */
+   { 22590, 0x00008593 }, /* GL_OPERAND3_RGB_NV */
+   { 22609, 0x00001507 }, /* GL_OR */
+   { 22615, 0x00000A01 }, /* GL_ORDER */
+   { 22624, 0x0000150D }, /* GL_OR_INVERTED */
+   { 22639, 0x0000150B }, /* GL_OR_REVERSE */
+   { 22653, 0x00000505 }, /* GL_OUT_OF_MEMORY */
+   { 22670, 0x00000D05 }, /* GL_PACK_ALIGNMENT */
+   { 22688, 0x0000806C }, /* GL_PACK_IMAGE_HEIGHT */
+   { 22709, 0x00008758 }, /* GL_PACK_INVERT_MESA */
+   { 22729, 0x00000D01 }, /* GL_PACK_LSB_FIRST */
+   { 22747, 0x00000D02 }, /* GL_PACK_ROW_LENGTH */
+   { 22766, 0x0000806B }, /* GL_PACK_SKIP_IMAGES */
+   { 22786, 0x00000D04 }, /* GL_PACK_SKIP_PIXELS */
+   { 22806, 0x00000D03 }, /* GL_PACK_SKIP_ROWS */
+   { 22824, 0x00000D00 }, /* GL_PACK_SWAP_BYTES */
+   { 22843, 0x00008B92 }, /* GL_PALETTE4_R5_G6_B5_OES */
+   { 22868, 0x00008B94 }, /* GL_PALETTE4_RGB5_A1_OES */
+   { 22892, 0x00008B90 }, /* GL_PALETTE4_RGB8_OES */
+   { 22913, 0x00008B93 }, /* GL_PALETTE4_RGBA4_OES */
+   { 22935, 0x00008B91 }, /* GL_PALETTE4_RGBA8_OES */
+   { 22957, 0x00008B97 }, /* GL_PALETTE8_R5_G6_B5_OES */
+   { 22982, 0x00008B99 }, /* GL_PALETTE8_RGB5_A1_OES */
+   { 23006, 0x00008B95 }, /* GL_PALETTE8_RGB8_OES */
+   { 23027, 0x00008B98 }, /* GL_PALETTE8_RGBA4_OES */
+   { 23049, 0x00008B96 }, /* GL_PALETTE8_RGBA8_OES */
+   { 23071, 0x00000700 }, /* GL_PASS_THROUGH_TOKEN */
+   { 23093, 0x00000C50 }, /* GL_PERSPECTIVE_CORRECTION_HINT */
+   { 23124, 0x00000C79 }, /* GL_PIXEL_MAP_A_TO_A */
+   { 23144, 0x00000CB9 }, /* GL_PIXEL_MAP_A_TO_A_SIZE */
+   { 23169, 0x00000C78 }, /* GL_PIXEL_MAP_B_TO_B */
+   { 23189, 0x00000CB8 }, /* GL_PIXEL_MAP_B_TO_B_SIZE */
+   { 23214, 0x00000C77 }, /* GL_PIXEL_MAP_G_TO_G */
+   { 23234, 0x00000CB7 }, /* GL_PIXEL_MAP_G_TO_G_SIZE */
+   { 23259, 0x00000C75 }, /* GL_PIXEL_MAP_I_TO_A */
+   { 23279, 0x00000CB5 }, /* GL_PIXEL_MAP_I_TO_A_SIZE */
+   { 23304, 0x00000C74 }, /* GL_PIXEL_MAP_I_TO_B */
+   { 23324, 0x00000CB4 }, /* GL_PIXEL_MAP_I_TO_B_SIZE */
+   { 23349, 0x00000C73 }, /* GL_PIXEL_MAP_I_TO_G */
+   { 23369, 0x00000CB3 }, /* GL_PIXEL_MAP_I_TO_G_SIZE */
+   { 23394, 0x00000C70 }, /* GL_PIXEL_MAP_I_TO_I */
+   { 23414, 0x00000CB0 }, /* GL_PIXEL_MAP_I_TO_I_SIZE */
+   { 23439, 0x00000C72 }, /* GL_PIXEL_MAP_I_TO_R */
+   { 23459, 0x00000CB2 }, /* GL_PIXEL_MAP_I_TO_R_SIZE */
+   { 23484, 0x00000C76 }, /* GL_PIXEL_MAP_R_TO_R */
+   { 23504, 0x00000CB6 }, /* GL_PIXEL_MAP_R_TO_R_SIZE */
+   { 23529, 0x00000C71 }, /* GL_PIXEL_MAP_S_TO_S */
+   { 23549, 0x00000CB1 }, /* GL_PIXEL_MAP_S_TO_S_SIZE */
+   { 23574, 0x00000020 }, /* GL_PIXEL_MODE_BIT */
+   { 23592, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER */
+   { 23613, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING */
+   { 23642, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING_EXT */
+   { 23675, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER_EXT */
+   { 23700, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER */
+   { 23723, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
+   { 23754, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING_EXT */
+   { 23789, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER_EXT */
+   { 23816, 0x00001B00 }, /* GL_POINT */
+   { 23825, 0x00000000 }, /* GL_POINTS */
+   { 23835, 0x00000002 }, /* GL_POINT_BIT */
+   { 23848, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION */
+   { 23878, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_ARB */
+   { 23912, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_EXT */
+   { 23946, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_SGIS */
+   { 23981, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE */
+   { 24010, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_ARB */
+   { 24043, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_EXT */
+   { 24076, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_SGIS */
+   { 24110, 0x00000B11 }, /* GL_POINT_SIZE */
+   { 24124, 0x00000B13 }, /* GL_POINT_SIZE_GRANULARITY */
+   { 24150, 0x00008127 }, /* GL_POINT_SIZE_MAX */
+   { 24168, 0x00008127 }, /* GL_POINT_SIZE_MAX_ARB */
+   { 24190, 0x00008127 }, /* GL_POINT_SIZE_MAX_EXT */
+   { 24212, 0x00008127 }, /* GL_POINT_SIZE_MAX_SGIS */
+   { 24235, 0x00008126 }, /* GL_POINT_SIZE_MIN */
+   { 24253, 0x00008126 }, /* GL_POINT_SIZE_MIN_ARB */
+   { 24275, 0x00008126 }, /* GL_POINT_SIZE_MIN_EXT */
+   { 24297, 0x00008126 }, /* GL_POINT_SIZE_MIN_SGIS */
+   { 24320, 0x00000B12 }, /* GL_POINT_SIZE_RANGE */
+   { 24340, 0x00000B10 }, /* GL_POINT_SMOOTH */
+   { 24356, 0x00000C51 }, /* GL_POINT_SMOOTH_HINT */
+   { 24377, 0x00008861 }, /* GL_POINT_SPRITE */
+   { 24393, 0x00008861 }, /* GL_POINT_SPRITE_ARB */
+   { 24413, 0x00008CA0 }, /* GL_POINT_SPRITE_COORD_ORIGIN */
+   { 24442, 0x00008861 }, /* GL_POINT_SPRITE_NV */
+   { 24461, 0x00008863 }, /* GL_POINT_SPRITE_R_MODE_NV */
+   { 24487, 0x00000701 }, /* GL_POINT_TOKEN */
+   { 24502, 0x00000009 }, /* GL_POLYGON */
+   { 24513, 0x00000008 }, /* GL_POLYGON_BIT */
+   { 24528, 0x00000B40 }, /* GL_POLYGON_MODE */
+   { 24544, 0x00008039 }, /* GL_POLYGON_OFFSET_BIAS */
+   { 24567, 0x00008038 }, /* GL_POLYGON_OFFSET_FACTOR */
+   { 24592, 0x00008037 }, /* GL_POLYGON_OFFSET_FILL */
+   { 24615, 0x00002A02 }, /* GL_POLYGON_OFFSET_LINE */
+   { 24638, 0x00002A01 }, /* GL_POLYGON_OFFSET_POINT */
+   { 24662, 0x00002A00 }, /* GL_POLYGON_OFFSET_UNITS */
+   { 24686, 0x00000B41 }, /* GL_POLYGON_SMOOTH */
+   { 24704, 0x00000C53 }, /* GL_POLYGON_SMOOTH_HINT */
+   { 24727, 0x00000B42 }, /* GL_POLYGON_STIPPLE */
+   { 24746, 0x00000010 }, /* GL_POLYGON_STIPPLE_BIT */
+   { 24769, 0x00000703 }, /* GL_POLYGON_TOKEN */
+   { 24786, 0x00001203 }, /* GL_POSITION */
+   { 24798, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
+   { 24830, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI */
+   { 24866, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
+   { 24899, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI */
+   { 24936, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
+   { 24967, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI */
+   { 25002, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
+   { 25034, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI */
+   { 25070, 0x000080D2 }, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
+   { 25103, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
+   { 25135, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI */
+   { 25171, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
+   { 25204, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI */
+   { 25241, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS */
+   { 25271, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS_SGI */
+   { 25305, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE */
+   { 25336, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE_SGI */
+   { 25371, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
+   { 25402, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS_EXT */
+   { 25437, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
+   { 25469, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE_EXT */
+   { 25505, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS */
+   { 25535, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS_EXT */
+   { 25569, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE */
+   { 25600, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE_EXT */
+   { 25635, 0x000080D1 }, /* GL_POST_CONVOLUTION_COLOR_TABLE */
+   { 25667, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS */
+   { 25698, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS_EXT */
+   { 25733, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE */
+   { 25765, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE_EXT */
+   { 25801, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS */
+   { 25830, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS_EXT */
+   { 25863, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE */
+   { 25893, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE_EXT */
+   { 25927, 0x0000817B }, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
+   { 25966, 0x00008179 }, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
+   { 25999, 0x0000817C }, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
+   { 26039, 0x0000817A }, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
+   { 26073, 0x00008578 }, /* GL_PREVIOUS */
+   { 26085, 0x00008578 }, /* GL_PREVIOUS_ARB */
+   { 26101, 0x00008578 }, /* GL_PREVIOUS_EXT */
+   { 26117, 0x00008577 }, /* GL_PRIMARY_COLOR */
+   { 26134, 0x00008577 }, /* GL_PRIMARY_COLOR_ARB */
+   { 26155, 0x00008577 }, /* GL_PRIMARY_COLOR_EXT */
+   { 26176, 0x000088B0 }, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
+   { 26209, 0x00008805 }, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
+   { 26241, 0x000088AC }, /* GL_PROGRAM_ATTRIBS_ARB */
+   { 26264, 0x00008677 }, /* GL_PROGRAM_BINDING_ARB */
+   { 26287, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_ARB */
+   { 26317, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_NV */
+   { 26346, 0x00008874 }, /* GL_PROGRAM_ERROR_STRING_ARB */
+   { 26374, 0x00008876 }, /* GL_PROGRAM_FORMAT_ARB */
+   { 26396, 0x00008875 }, /* GL_PROGRAM_FORMAT_ASCII_ARB */
+   { 26424, 0x000088A0 }, /* GL_PROGRAM_INSTRUCTIONS_ARB */
+   { 26452, 0x00008627 }, /* GL_PROGRAM_LENGTH_ARB */
+   { 26474, 0x00008627 }, /* GL_PROGRAM_LENGTH_NV */
+   { 26495, 0x000088B2 }, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+   { 26535, 0x00008808 }, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+   { 26574, 0x000088AE }, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
+   { 26604, 0x000088A2 }, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+   { 26639, 0x000088AA }, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
+   { 26672, 0x000088A6 }, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
+   { 26706, 0x0000880A }, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+   { 26745, 0x00008809 }, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+   { 26784, 0x00008B40 }, /* GL_PROGRAM_OBJECT_ARB */
+   { 26806, 0x000088A8 }, /* GL_PROGRAM_PARAMETERS_ARB */
+   { 26832, 0x00008644 }, /* GL_PROGRAM_PARAMETER_NV */
+   { 26856, 0x00008647 }, /* GL_PROGRAM_RESIDENT_NV */
+   { 26879, 0x00008628 }, /* GL_PROGRAM_STRING_ARB */
+   { 26901, 0x00008628 }, /* GL_PROGRAM_STRING_NV */
+   { 26922, 0x00008646 }, /* GL_PROGRAM_TARGET_NV */
+   { 26943, 0x000088A4 }, /* GL_PROGRAM_TEMPORARIES_ARB */
+   { 26970, 0x00008807 }, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
+   { 27002, 0x00008806 }, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
+   { 27034, 0x000088B6 }, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
+   { 27069, 0x00001701 }, /* GL_PROJECTION */
+   { 27083, 0x00000BA7 }, /* GL_PROJECTION_MATRIX */
+   { 27104, 0x00000BA4 }, /* GL_PROJECTION_STACK_DEPTH */
+   { 27130, 0x000080D3 }, /* GL_PROXY_COLOR_TABLE */
+   { 27151, 0x00008025 }, /* GL_PROXY_HISTOGRAM */
+   { 27170, 0x00008025 }, /* GL_PROXY_HISTOGRAM_EXT */
+   { 27193, 0x000080D5 }, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
+   { 27232, 0x000080D4 }, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
+   { 27270, 0x00008063 }, /* GL_PROXY_TEXTURE_1D */
+   { 27290, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
+   { 27320, 0x00008063 }, /* GL_PROXY_TEXTURE_1D_EXT */
+   { 27344, 0x00008064 }, /* GL_PROXY_TEXTURE_2D */
+   { 27364, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
+   { 27394, 0x00008064 }, /* GL_PROXY_TEXTURE_2D_EXT */
+   { 27418, 0x00008070 }, /* GL_PROXY_TEXTURE_3D */
+   { 27438, 0x000080BD }, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
+   { 27471, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP */
+   { 27497, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP_ARB */
+   { 27527, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
+   { 27558, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_NV */
+   { 27588, 0x00002003 }, /* GL_Q */
+   { 27593, 0x00001209 }, /* GL_QUADRATIC_ATTENUATION */
+   { 27618, 0x00000007 }, /* GL_QUADS */
+   { 27627, 0x00008614 }, /* GL_QUAD_MESH_SUN */
+   { 27644, 0x00000008 }, /* GL_QUAD_STRIP */
+   { 27658, 0x00008864 }, /* GL_QUERY_COUNTER_BITS */
+   { 27680, 0x00008864 }, /* GL_QUERY_COUNTER_BITS_ARB */
+   { 27706, 0x00008866 }, /* GL_QUERY_RESULT */
+   { 27722, 0x00008866 }, /* GL_QUERY_RESULT_ARB */
+   { 27742, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE */
+   { 27768, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE_ARB */
+   { 27798, 0x00002002 }, /* GL_R */
+   { 27803, 0x00002A10 }, /* GL_R3_G3_B2 */
+   { 27815, 0x00019262 }, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
+   { 27848, 0x00000C02 }, /* GL_READ_BUFFER */
+   { 27863, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER */
+   { 27883, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
+   { 27915, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER_EXT */
+   { 27939, 0x000088B8 }, /* GL_READ_ONLY */
+   { 27952, 0x000088B8 }, /* GL_READ_ONLY_ARB */
+   { 27969, 0x000088BA }, /* GL_READ_WRITE */
+   { 27983, 0x000088BA }, /* GL_READ_WRITE_ARB */
+   { 28001, 0x00001903 }, /* GL_RED */
+   { 28008, 0x00008016 }, /* GL_REDUCE */
+   { 28018, 0x00008016 }, /* GL_REDUCE_EXT */
+   { 28032, 0x00000D15 }, /* GL_RED_BIAS */
+   { 28044, 0x00000D52 }, /* GL_RED_BITS */
+   { 28056, 0x00000D14 }, /* GL_RED_SCALE */
+   { 28069, 0x00008512 }, /* GL_REFLECTION_MAP */
+   { 28087, 0x00008512 }, /* GL_REFLECTION_MAP_ARB */
+   { 28109, 0x00008512 }, /* GL_REFLECTION_MAP_NV */
+   { 28130, 0x00001C00 }, /* GL_RENDER */
+   { 28140, 0x00008D41 }, /* GL_RENDERBUFFER */
+   { 28156, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE */
+   { 28183, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_EXT */
+   { 28211, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE */
+   { 28237, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE */
+   { 28264, 0x00008D41 }, /* GL_RENDERBUFFER_EXT */
+   { 28284, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE */
+   { 28311, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT */
+   { 28334, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_EXT */
+   { 28361, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
+   { 28393, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */
+   { 28429, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE */
+   { 28454, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES */
+   { 28478, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE */
+   { 28507, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH */
+   { 28529, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_EXT */
+   { 28555, 0x00001F01 }, /* GL_RENDERER */
+   { 28567, 0x00000C40 }, /* GL_RENDER_MODE */
+   { 28582, 0x00002901 }, /* GL_REPEAT */
+   { 28592, 0x00001E01 }, /* GL_REPLACE */
+   { 28603, 0x00008062 }, /* GL_REPLACE_EXT */
+   { 28618, 0x00008153 }, /* GL_REPLICATE_BORDER_HP */
+   { 28641, 0x0000803A }, /* GL_RESCALE_NORMAL */
+   { 28659, 0x0000803A }, /* GL_RESCALE_NORMAL_EXT */
+   { 28681, 0x00000102 }, /* GL_RETURN */
+   { 28691, 0x00001907 }, /* GL_RGB */
+   { 28698, 0x00008052 }, /* GL_RGB10 */
+   { 28707, 0x00008059 }, /* GL_RGB10_A2 */
+   { 28719, 0x00008059 }, /* GL_RGB10_A2_EXT */
+   { 28735, 0x00008052 }, /* GL_RGB10_EXT */
+   { 28748, 0x00008053 }, /* GL_RGB12 */
+   { 28757, 0x00008053 }, /* GL_RGB12_EXT */
+   { 28770, 0x00008054 }, /* GL_RGB16 */
+   { 28779, 0x00008054 }, /* GL_RGB16_EXT */
+   { 28792, 0x0000804E }, /* GL_RGB2_EXT */
+   { 28804, 0x0000804F }, /* GL_RGB4 */
+   { 28812, 0x0000804F }, /* GL_RGB4_EXT */
+   { 28824, 0x000083A1 }, /* GL_RGB4_S3TC */
+   { 28837, 0x00008050 }, /* GL_RGB5 */
+   { 28845, 0x00008057 }, /* GL_RGB5_A1 */
+   { 28856, 0x00008057 }, /* GL_RGB5_A1_EXT */
+   { 28871, 0x00008050 }, /* GL_RGB5_EXT */
+   { 28883, 0x00008051 }, /* GL_RGB8 */
+   { 28891, 0x00008051 }, /* GL_RGB8_EXT */
+   { 28903, 0x00001908 }, /* GL_RGBA */
+   { 28911, 0x0000805A }, /* GL_RGBA12 */
+   { 28921, 0x0000805A }, /* GL_RGBA12_EXT */
+   { 28935, 0x0000805B }, /* GL_RGBA16 */
+   { 28945, 0x0000805B }, /* GL_RGBA16_EXT */
+   { 28959, 0x00008055 }, /* GL_RGBA2 */
+   { 28968, 0x00008055 }, /* GL_RGBA2_EXT */
+   { 28981, 0x00008056 }, /* GL_RGBA4 */
+   { 28990, 0x000083A5 }, /* GL_RGBA4_DXT5_S3TC */
+   { 29009, 0x00008056 }, /* GL_RGBA4_EXT */
+   { 29022, 0x000083A3 }, /* GL_RGBA4_S3TC */
+   { 29036, 0x00008058 }, /* GL_RGBA8 */
+   { 29045, 0x00008058 }, /* GL_RGBA8_EXT */
+   { 29058, 0x00008F97 }, /* GL_RGBA8_SNORM */
+   { 29073, 0x000083A4 }, /* GL_RGBA_DXT5_S3TC */
+   { 29091, 0x00000C31 }, /* GL_RGBA_MODE */
+   { 29104, 0x000083A2 }, /* GL_RGBA_S3TC */
+   { 29117, 0x00008F93 }, /* GL_RGBA_SNORM */
+   { 29131, 0x000083A0 }, /* GL_RGB_S3TC */
+   { 29143, 0x00008573 }, /* GL_RGB_SCALE */
+   { 29156, 0x00008573 }, /* GL_RGB_SCALE_ARB */
+   { 29173, 0x00008573 }, /* GL_RGB_SCALE_EXT */
+   { 29190, 0x00000407 }, /* GL_RIGHT */
+   { 29199, 0x00002000 }, /* GL_S */
+   { 29204, 0x00008B5D }, /* GL_SAMPLER_1D */
+   { 29218, 0x00008B61 }, /* GL_SAMPLER_1D_SHADOW */
+   { 29239, 0x00008B5E }, /* GL_SAMPLER_2D */
+   { 29253, 0x00008B62 }, /* GL_SAMPLER_2D_SHADOW */
+   { 29274, 0x00008B5F }, /* GL_SAMPLER_3D */
+   { 29288, 0x00008B60 }, /* GL_SAMPLER_CUBE */
+   { 29304, 0x000080A9 }, /* GL_SAMPLES */
+   { 29315, 0x000086B4 }, /* GL_SAMPLES_3DFX */
+   { 29331, 0x000080A9 }, /* GL_SAMPLES_ARB */
+   { 29346, 0x00008914 }, /* GL_SAMPLES_PASSED */
+   { 29364, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */
+   { 29386, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
+   { 29414, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */
+   { 29446, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */
+   { 29469, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */
+   { 29496, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */
+   { 29514, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */
+   { 29537, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */
+   { 29559, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */
+   { 29578, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */
+   { 29601, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */
+   { 29627, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */
+   { 29657, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */
+   { 29682, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */
+   { 29711, 0x00080000 }, /* GL_SCISSOR_BIT */
+   { 29726, 0x00000C10 }, /* GL_SCISSOR_BOX */
+   { 29741, 0x00000C11 }, /* GL_SCISSOR_TEST */
+   { 29757, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */
+   { 29782, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
+   { 29822, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */
+   { 29866, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
+   { 29899, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
+   { 29929, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
+   { 29961, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
+   { 29991, 0x00001C02 }, /* GL_SELECT */
+   { 30001, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */
+   { 30029, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */
+   { 30054, 0x00008012 }, /* GL_SEPARABLE_2D */
+   { 30070, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */
+   { 30097, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */
+   { 30128, 0x0000150F }, /* GL_SET */
+   { 30135, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */
+   { 30156, 0x00008B88 }, /* GL_SHADER_SOURCE_LENGTH */
+   { 30180, 0x00008B4F }, /* GL_SHADER_TYPE */
+   { 30195, 0x00000B54 }, /* GL_SHADE_MODEL */
+   { 30210, 0x00008B8C }, /* GL_SHADING_LANGUAGE_VERSION */
+   { 30238, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */
+   { 30261, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */
+   { 30291, 0x00001601 }, /* GL_SHININESS */
+   { 30304, 0x00001402 }, /* GL_SHORT */
+   { 30313, 0x00008F9C }, /* GL_SIGNED_NORMALIZED */
+   { 30334, 0x000081F9 }, /* GL_SINGLE_COLOR */
+   { 30350, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */
+   { 30370, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */
+   { 30389, 0x00008C46 }, /* GL_SLUMINANCE */
+   { 30403, 0x00008C47 }, /* GL_SLUMINANCE8 */
+   { 30418, 0x00008C45 }, /* GL_SLUMINANCE8_ALPHA8 */
+   { 30440, 0x00008C44 }, /* GL_SLUMINANCE_ALPHA */
+   { 30460, 0x00001D01 }, /* GL_SMOOTH */
+   { 30470, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */
+   { 30503, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */
+   { 30530, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */
+   { 30563, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */
+   { 30590, 0x00008588 }, /* GL_SOURCE0_ALPHA */
+   { 30607, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */
+   { 30628, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */
+   { 30649, 0x00008580 }, /* GL_SOURCE0_RGB */
+   { 30664, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */
+   { 30683, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */
+   { 30702, 0x00008589 }, /* GL_SOURCE1_ALPHA */
+   { 30719, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */
+   { 30740, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */
+   { 30761, 0x00008581 }, /* GL_SOURCE1_RGB */
+   { 30776, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */
+   { 30795, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */
+   { 30814, 0x0000858A }, /* GL_SOURCE2_ALPHA */
+   { 30831, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */
+   { 30852, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */
+   { 30873, 0x00008582 }, /* GL_SOURCE2_RGB */
+   { 30888, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */
+   { 30907, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */
+   { 30926, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */
+   { 30946, 0x00008583 }, /* GL_SOURCE3_RGB_NV */
+   { 30964, 0x00001202 }, /* GL_SPECULAR */
+   { 30976, 0x00002402 }, /* GL_SPHERE_MAP */
+   { 30990, 0x00001206 }, /* GL_SPOT_CUTOFF */
+   { 31005, 0x00001204 }, /* GL_SPOT_DIRECTION */
+   { 31023, 0x00001205 }, /* GL_SPOT_EXPONENT */
+   { 31040, 0x00008588 }, /* GL_SRC0_ALPHA */
+   { 31054, 0x00008580 }, /* GL_SRC0_RGB */
+   { 31066, 0x00008589 }, /* GL_SRC1_ALPHA */
+   { 31080, 0x00008581 }, /* GL_SRC1_RGB */
+   { 31092, 0x0000858A }, /* GL_SRC2_ALPHA */
+   { 31106, 0x00008582 }, /* GL_SRC2_RGB */
+   { 31118, 0x00000302 }, /* GL_SRC_ALPHA */
+   { 31131, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */
+   { 31153, 0x00000300 }, /* GL_SRC_COLOR */
+   { 31166, 0x00008C40 }, /* GL_SRGB */
+   { 31174, 0x00008C41 }, /* GL_SRGB8 */
+   { 31183, 0x00008C43 }, /* GL_SRGB8_ALPHA8 */
+   { 31199, 0x00008C42 }, /* GL_SRGB_ALPHA */
+   { 31213, 0x00000503 }, /* GL_STACK_OVERFLOW */
+   { 31231, 0x00000504 }, /* GL_STACK_UNDERFLOW */
+   { 31250, 0x000088E6 }, /* GL_STATIC_COPY */
+   { 31265, 0x000088E6 }, /* GL_STATIC_COPY_ARB */
+   { 31284, 0x000088E4 }, /* GL_STATIC_DRAW */
+   { 31299, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */
+   { 31318, 0x000088E5 }, /* GL_STATIC_READ */
+   { 31333, 0x000088E5 }, /* GL_STATIC_READ_ARB */
+   { 31352, 0x00001802 }, /* GL_STENCIL */
+   { 31363, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT */
+   { 31385, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */
+   { 31411, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */
+   { 31432, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */
+   { 31457, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
+   { 31478, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */
+   { 31503, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
+   { 31535, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */
+   { 31571, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
+   { 31603, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */
+   { 31639, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
+   { 31659, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
+   { 31686, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
+   { 31712, 0x00000D57 }, /* GL_STENCIL_BITS */
+   { 31728, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
+   { 31750, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
+   { 31773, 0x00000B94 }, /* GL_STENCIL_FAIL */
+   { 31789, 0x00000B92 }, /* GL_STENCIL_FUNC */
+   { 31805, 0x00001901 }, /* GL_STENCIL_INDEX */
+   { 31822, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
+   { 31845, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
+   { 31867, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
+   { 31889, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
+   { 31911, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
+   { 31932, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
+   { 31959, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
+   { 31986, 0x00000B97 }, /* GL_STENCIL_REF */
+   { 32001, 0x00000B90 }, /* GL_STENCIL_TEST */
+   { 32017, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
+   { 32046, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
+   { 32068, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
+   { 32089, 0x00000C33 }, /* GL_STEREO */
+   { 32099, 0x000088E2 }, /* GL_STREAM_COPY */
+   { 32114, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
+   { 32133, 0x000088E0 }, /* GL_STREAM_DRAW */
+   { 32148, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
+   { 32167, 0x000088E1 }, /* GL_STREAM_READ */
+   { 32182, 0x000088E1 }, /* GL_STREAM_READ_ARB */
+   { 32201, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
+   { 32218, 0x000084E7 }, /* GL_SUBTRACT */
+   { 32230, 0x000084E7 }, /* GL_SUBTRACT_ARB */
+   { 32246, 0x00002001 }, /* GL_T */
+   { 32251, 0x00002A2A }, /* GL_T2F_C3F_V3F */
+   { 32266, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
+   { 32285, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
+   { 32301, 0x00002A2B }, /* GL_T2F_N3F_V3F */
+   { 32316, 0x00002A27 }, /* GL_T2F_V3F */
+   { 32327, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
+   { 32346, 0x00002A28 }, /* GL_T4F_V4F */
+   { 32357, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
+   { 32380, 0x00001702 }, /* GL_TEXTURE */
+   { 32391, 0x000084C0 }, /* GL_TEXTURE0 */
+   { 32403, 0x000084C0 }, /* GL_TEXTURE0_ARB */
+   { 32419, 0x000084C1 }, /* GL_TEXTURE1 */
+   { 32431, 0x000084CA }, /* GL_TEXTURE10 */
+   { 32444, 0x000084CA }, /* GL_TEXTURE10_ARB */
+   { 32461, 0x000084CB }, /* GL_TEXTURE11 */
+   { 32474, 0x000084CB }, /* GL_TEXTURE11_ARB */
+   { 32491, 0x000084CC }, /* GL_TEXTURE12 */
+   { 32504, 0x000084CC }, /* GL_TEXTURE12_ARB */
+   { 32521, 0x000084CD }, /* GL_TEXTURE13 */
+   { 32534, 0x000084CD }, /* GL_TEXTURE13_ARB */
+   { 32551, 0x000084CE }, /* GL_TEXTURE14 */
+   { 32564, 0x000084CE }, /* GL_TEXTURE14_ARB */
+   { 32581, 0x000084CF }, /* GL_TEXTURE15 */
+   { 32594, 0x000084CF }, /* GL_TEXTURE15_ARB */
+   { 32611, 0x000084D0 }, /* GL_TEXTURE16 */
+   { 32624, 0x000084D0 }, /* GL_TEXTURE16_ARB */
+   { 32641, 0x000084D1 }, /* GL_TEXTURE17 */
+   { 32654, 0x000084D1 }, /* GL_TEXTURE17_ARB */
+   { 32671, 0x000084D2 }, /* GL_TEXTURE18 */
+   { 32684, 0x000084D2 }, /* GL_TEXTURE18_ARB */
+   { 32701, 0x000084D3 }, /* GL_TEXTURE19 */
+   { 32714, 0x000084D3 }, /* GL_TEXTURE19_ARB */
+   { 32731, 0x000084C1 }, /* GL_TEXTURE1_ARB */
+   { 32747, 0x000084C2 }, /* GL_TEXTURE2 */
+   { 32759, 0x000084D4 }, /* GL_TEXTURE20 */
+   { 32772, 0x000084D4 }, /* GL_TEXTURE20_ARB */
+   { 32789, 0x000084D5 }, /* GL_TEXTURE21 */
+   { 32802, 0x000084D5 }, /* GL_TEXTURE21_ARB */
+   { 32819, 0x000084D6 }, /* GL_TEXTURE22 */
+   { 32832, 0x000084D6 }, /* GL_TEXTURE22_ARB */
+   { 32849, 0x000084D7 }, /* GL_TEXTURE23 */
+   { 32862, 0x000084D7 }, /* GL_TEXTURE23_ARB */
+   { 32879, 0x000084D8 }, /* GL_TEXTURE24 */
+   { 32892, 0x000084D8 }, /* GL_TEXTURE24_ARB */
+   { 32909, 0x000084D9 }, /* GL_TEXTURE25 */
+   { 32922, 0x000084D9 }, /* GL_TEXTURE25_ARB */
+   { 32939, 0x000084DA }, /* GL_TEXTURE26 */
+   { 32952, 0x000084DA }, /* GL_TEXTURE26_ARB */
+   { 32969, 0x000084DB }, /* GL_TEXTURE27 */
+   { 32982, 0x000084DB }, /* GL_TEXTURE27_ARB */
+   { 32999, 0x000084DC }, /* GL_TEXTURE28 */
+   { 33012, 0x000084DC }, /* GL_TEXTURE28_ARB */
+   { 33029, 0x000084DD }, /* GL_TEXTURE29 */
+   { 33042, 0x000084DD }, /* GL_TEXTURE29_ARB */
+   { 33059, 0x000084C2 }, /* GL_TEXTURE2_ARB */
+   { 33075, 0x000084C3 }, /* GL_TEXTURE3 */
+   { 33087, 0x000084DE }, /* GL_TEXTURE30 */
+   { 33100, 0x000084DE }, /* GL_TEXTURE30_ARB */
+   { 33117, 0x000084DF }, /* GL_TEXTURE31 */
+   { 33130, 0x000084DF }, /* GL_TEXTURE31_ARB */
+   { 33147, 0x000084C3 }, /* GL_TEXTURE3_ARB */
+   { 33163, 0x000084C4 }, /* GL_TEXTURE4 */
+   { 33175, 0x000084C4 }, /* GL_TEXTURE4_ARB */
+   { 33191, 0x000084C5 }, /* GL_TEXTURE5 */
+   { 33203, 0x000084C5 }, /* GL_TEXTURE5_ARB */
+   { 33219, 0x000084C6 }, /* GL_TEXTURE6 */
+   { 33231, 0x000084C6 }, /* GL_TEXTURE6_ARB */
+   { 33247, 0x000084C7 }, /* GL_TEXTURE7 */
+   { 33259, 0x000084C7 }, /* GL_TEXTURE7_ARB */
+   { 33275, 0x000084C8 }, /* GL_TEXTURE8 */
+   { 33287, 0x000084C8 }, /* GL_TEXTURE8_ARB */
+   { 33303, 0x000084C9 }, /* GL_TEXTURE9 */
+   { 33315, 0x000084C9 }, /* GL_TEXTURE9_ARB */
+   { 33331, 0x00000DE0 }, /* GL_TEXTURE_1D */
+   { 33345, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
+   { 33369, 0x00000DE1 }, /* GL_TEXTURE_2D */
+   { 33383, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
+   { 33407, 0x0000806F }, /* GL_TEXTURE_3D */
+   { 33421, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
+   { 33443, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
+   { 33469, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
+   { 33491, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
+   { 33513, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
+   { 33545, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
+   { 33567, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
+   { 33599, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
+   { 33621, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
+   { 33649, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
+   { 33681, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
+   { 33714, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
+   { 33746, 0x00040000 }, /* GL_TEXTURE_BIT */
+   { 33761, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
+   { 33782, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
+   { 33807, 0x00001005 }, /* GL_TEXTURE_BORDER */
+   { 33825, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
+   { 33849, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
+   { 33880, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
+   { 33910, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
+   { 33940, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
+   { 33975, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
+   { 34006, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+   { 34044, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
+   { 34071, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
+   { 34103, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+   { 34137, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
+   { 34161, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
+   { 34189, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
+   { 34213, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
+   { 34241, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
+   { 34274, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
+   { 34298, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
+   { 34320, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
+   { 34342, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
+   { 34368, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
+   { 34402, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
+   { 34435, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
+   { 34472, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
+   { 34500, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
+   { 34532, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
+   { 34555, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
+   { 34593, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
+   { 34635, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
+   { 34666, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
+   { 34694, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
+   { 34724, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
+   { 34752, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
+   { 34772, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
+   { 34796, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
+   { 34827, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
+   { 34862, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
+   { 34893, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
+   { 34928, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
+   { 34959, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
+   { 34994, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
+   { 35025, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
+   { 35060, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
+   { 35091, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
+   { 35126, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
+   { 35157, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
+   { 35192, 0x00008071 }, /* GL_TEXTURE_DEPTH */
+   { 35209, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
+   { 35231, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
+   { 35257, 0x00002300 }, /* GL_TEXTURE_ENV */
+   { 35272, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
+   { 35293, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
+   { 35313, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
+   { 35339, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
+   { 35359, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
+   { 35376, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
+   { 35393, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
+   { 35410, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
+   { 35427, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
+   { 35452, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
+   { 35474, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
+   { 35500, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
+   { 35518, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
+   { 35544, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
+   { 35570, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
+   { 35600, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
+   { 35627, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
+   { 35652, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
+   { 35672, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
+   { 35696, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+   { 35723, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+   { 35750, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+   { 35777, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
+   { 35803, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
+   { 35833, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
+   { 35855, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
+   { 35873, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+   { 35903, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+   { 35931, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+   { 35959, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+   { 35987, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
+   { 36008, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
+   { 36027, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
+   { 36049, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
+   { 36068, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
+   { 36088, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
+   { 36113, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
+   { 36137, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
+   { 36157, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
+   { 36181, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
+   { 36201, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
+   { 36224, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */
+   { 36248, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
+   { 36273, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+   { 36307, 0x00001000 }, /* GL_TEXTURE_WIDTH */
+   { 36324, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
+   { 36342, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
+   { 36360, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
+   { 36378, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
+   { 36398, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
+   { 36417, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+   { 36446, 0x00001000 }, /* GL_TRANSFORM_BIT */
+   { 36463, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
+   { 36489, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
+   { 36519, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+   { 36551, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+   { 36581, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
+   { 36615, 0x0000862C }, /* GL_TRANSPOSE_NV */
+   { 36631, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+   { 36662, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
+   { 36697, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+   { 36725, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
+   { 36757, 0x00000004 }, /* GL_TRIANGLES */
+   { 36770, 0x00000006 }, /* GL_TRIANGLE_FAN */
+   { 36786, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
+   { 36807, 0x00000005 }, /* GL_TRIANGLE_STRIP */
+   { 36825, 0x00000001 }, /* GL_TRUE */
+   { 36833, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
+   { 36853, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
+   { 36876, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
+   { 36896, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
+   { 36917, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
+   { 36939, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
+   { 36961, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
+   { 36981, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
+   { 37002, 0x00001401 }, /* GL_UNSIGNED_BYTE */
+   { 37019, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+   { 37046, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
+   { 37069, 0x00001405 }, /* GL_UNSIGNED_INT */
+   { 37085, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
+   { 37112, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */
+   { 37133, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
+   { 37157, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+   { 37188, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
+   { 37212, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+   { 37240, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */
+   { 37263, 0x00001403 }, /* GL_UNSIGNED_SHORT */
+   { 37281, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+   { 37311, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+   { 37337, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+   { 37367, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+   { 37393, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
+   { 37417, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+   { 37445, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+   { 37473, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
+   { 37500, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+   { 37532, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
+   { 37563, 0x00008CA2 }, /* GL_UPPER_LEFT */
+   { 37577, 0x00002A20 }, /* GL_V2F */
+   { 37584, 0x00002A21 }, /* GL_V3F */
+   { 37591, 0x00008B83 }, /* GL_VALIDATE_STATUS */
+   { 37610, 0x00001F00 }, /* GL_VENDOR */
+   { 37620, 0x00001F02 }, /* GL_VERSION */
+   { 37631, 0x00008074 }, /* GL_VERTEX_ARRAY */
+   { 37647, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
+   { 37677, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+   { 37708, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
+   { 37743, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
+   { 37767, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
+   { 37788, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
+   { 37811, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
+   { 37832, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+   { 37859, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+   { 37887, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+   { 37915, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+   { 37943, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+   { 37971, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+   { 37999, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+   { 38027, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+   { 38054, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+   { 38081, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+   { 38108, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+   { 38135, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+   { 38162, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+   { 38189, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+   { 38216, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+   { 38243, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+   { 38270, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+   { 38308, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
+   { 38350, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+   { 38381, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
+   { 38416, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+   { 38450, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
+   { 38488, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+   { 38519, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
+   { 38554, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+   { 38582, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
+   { 38614, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+   { 38644, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
+   { 38678, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+   { 38706, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
+   { 38738, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
+   { 38758, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
+   { 38780, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
+   { 38809, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
+   { 38830, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
+   { 38859, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
+   { 38892, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
+   { 38924, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+   { 38951, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
+   { 38982, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
+   { 39012, 0x00008B31 }, /* GL_VERTEX_SHADER */
+   { 39029, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
+   { 39050, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
+   { 39077, 0x00000BA2 }, /* GL_VIEWPORT */
+   { 39089, 0x00000800 }, /* GL_VIEWPORT_BIT */
+   { 39105, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
+   { 39125, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+   { 39156, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
+   { 39191, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+   { 39219, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+   { 39244, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+   { 39271, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+   { 39296, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
+   { 39320, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
+   { 39339, 0x000088B9 }, /* GL_WRITE_ONLY */
+   { 39353, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
+   { 39371, 0x00001506 }, /* GL_XOR */
+   { 39378, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
+   { 39397, 0x00008757 }, /* GL_YCBCR_MESA */
+   { 39411, 0x00000000 }, /* GL_ZERO */
+   { 39419, 0x00000D16 }, /* GL_ZOOM_X */
+   { 39429, 0x00000D17 }, /* GL_ZOOM_Y */
 };
 
-static const unsigned reduced_enums[1319] =
+static const unsigned reduced_enums[1321] =
 {
-       469, /* GL_FALSE */
-       683, /* GL_LINES */
-       685, /* GL_LINE_LOOP */
-       692, /* GL_LINE_STRIP */
-      1709, /* GL_TRIANGLES */
-      1712, /* GL_TRIANGLE_STRIP */
-      1710, /* GL_TRIANGLE_FAN */
-      1254, /* GL_QUADS */
-      1256, /* GL_QUAD_STRIP */
-      1142, /* GL_POLYGON */
-      1154, /* GL_POLYGON_STIPPLE_BIT */
-      1103, /* GL_PIXEL_MODE_BIT */
-       670, /* GL_LIGHTING_BIT */
-       497, /* GL_FOG_BIT */
+       471, /* GL_FALSE */
+       685, /* GL_LINES */
+       687, /* GL_LINE_LOOP */
+       694, /* GL_LINE_STRIP */
+      1711, /* GL_TRIANGLES */
+      1714, /* GL_TRIANGLE_STRIP */
+      1712, /* GL_TRIANGLE_FAN */
+      1256, /* GL_QUADS */
+      1258, /* GL_QUAD_STRIP */
+      1144, /* GL_POLYGON */
+      1156, /* GL_POLYGON_STIPPLE_BIT */
+      1105, /* GL_PIXEL_MODE_BIT */
+       672, /* GL_LIGHTING_BIT */
+       499, /* GL_FOG_BIT */
          8, /* GL_ACCUM */
-       702, /* GL_LOAD */
-      1308, /* GL_RETURN */
-       976, /* GL_MULT */
+       704, /* GL_LOAD */
+      1310, /* GL_RETURN */
+       978, /* GL_MULT */
         23, /* GL_ADD */
-       992, /* GL_NEVER */
-       660, /* GL_LESS */
-       459, /* GL_EQUAL */
-       659, /* GL_LEQUAL */
-       583, /* GL_GREATER */
-      1007, /* GL_NOTEQUAL */
-       582, /* GL_GEQUAL */
+       994, /* GL_NEVER */
+       662, /* GL_LESS */
+       461, /* GL_EQUAL */
+       661, /* GL_LEQUAL */
+       585, /* GL_GREATER */
+      1009, /* GL_NOTEQUAL */
+       584, /* GL_GEQUAL */
         46, /* GL_ALWAYS */
-      1448, /* GL_SRC_COLOR */
-      1036, /* GL_ONE_MINUS_SRC_COLOR */
-      1446, /* GL_SRC_ALPHA */
-      1035, /* GL_ONE_MINUS_SRC_ALPHA */
-       438, /* GL_DST_ALPHA */
-      1033, /* GL_ONE_MINUS_DST_ALPHA */
-       439, /* GL_DST_COLOR */
-      1034, /* GL_ONE_MINUS_DST_COLOR */
-      1447, /* GL_SRC_ALPHA_SATURATE */
-       570, /* GL_FRONT_LEFT */
-       571, /* GL_FRONT_RIGHT */
+      1450, /* GL_SRC_COLOR */
+      1038, /* GL_ONE_MINUS_SRC_COLOR */
+      1448, /* GL_SRC_ALPHA */
+      1037, /* GL_ONE_MINUS_SRC_ALPHA */
+       440, /* GL_DST_ALPHA */
+      1035, /* GL_ONE_MINUS_DST_ALPHA */
+       441, /* GL_DST_COLOR */
+      1036, /* GL_ONE_MINUS_DST_COLOR */
+      1449, /* GL_SRC_ALPHA_SATURATE */
+       572, /* GL_FRONT_LEFT */
+       573, /* GL_FRONT_RIGHT */
         68, /* GL_BACK_LEFT */
         69, /* GL_BACK_RIGHT */
-       567, /* GL_FRONT */
+       569, /* GL_FRONT */
         67, /* GL_BACK */
-       658, /* GL_LEFT */
-      1350, /* GL_RIGHT */
-       568, /* GL_FRONT_AND_BACK */
+       660, /* GL_LEFT */
+      1352, /* GL_RIGHT */
+       570, /* GL_FRONT_AND_BACK */
         62, /* GL_AUX0 */
         63, /* GL_AUX1 */
         64, /* GL_AUX2 */
         65, /* GL_AUX3 */
-       649, /* GL_INVALID_ENUM */
-       653, /* GL_INVALID_VALUE */
-       652, /* GL_INVALID_OPERATION */
-      1453, /* GL_STACK_OVERFLOW */
-      1454, /* GL_STACK_UNDERFLOW */
-      1061, /* GL_OUT_OF_MEMORY */
-       650, /* GL_INVALID_FRAMEBUFFER_OPERATION */
+       651, /* GL_INVALID_ENUM */
+       655, /* GL_INVALID_VALUE */
+       654, /* GL_INVALID_OPERATION */
+      1455, /* GL_STACK_OVERFLOW */
+      1456, /* GL_STACK_UNDERFLOW */
+      1063, /* GL_OUT_OF_MEMORY */
+       652, /* GL_INVALID_FRAMEBUFFER_OPERATION */
          0, /* GL_2D */
          2, /* GL_3D */
          3, /* GL_3D_COLOR */
          4, /* GL_3D_COLOR_TEXTURE */
          6, /* GL_4D_COLOR_TEXTURE */
-      1081, /* GL_PASS_THROUGH_TOKEN */
-      1141, /* GL_POINT_TOKEN */
-       693, /* GL_LINE_TOKEN */
-      1155, /* GL_POLYGON_TOKEN */
+      1083, /* GL_PASS_THROUGH_TOKEN */
+      1143, /* GL_POINT_TOKEN */
+       695, /* GL_LINE_TOKEN */
+      1157, /* GL_POLYGON_TOKEN */
         73, /* GL_BITMAP_TOKEN */
-       437, /* GL_DRAW_PIXEL_TOKEN */
+       439, /* GL_DRAW_PIXEL_TOKEN */
        297, /* GL_COPY_PIXEL_TOKEN */
-       686, /* GL_LINE_RESET_TOKEN */
-       462, /* GL_EXP */
-       463, /* GL_EXP2 */
-       331, /* GL_CW */
+       688, /* GL_LINE_RESET_TOKEN */
+       464, /* GL_EXP */
+       465, /* GL_EXP2 */
+       333, /* GL_CW */
        122, /* GL_CCW */
        143, /* GL_COEFF */
-      1058, /* GL_ORDER */
-       375, /* GL_DOMAIN */
-       305, /* GL_CURRENT_COLOR */
-       308, /* GL_CURRENT_INDEX */
-       314, /* GL_CURRENT_NORMAL */
-       327, /* GL_CURRENT_TEXTURE_COORDS */
-       319, /* GL_CURRENT_RASTER_COLOR */
-       321, /* GL_CURRENT_RASTER_INDEX */
-       325, /* GL_CURRENT_RASTER_TEXTURE_COORDS */
-       322, /* GL_CURRENT_RASTER_POSITION */
-       323, /* GL_CURRENT_RASTER_POSITION_VALID */
-       320, /* GL_CURRENT_RASTER_DISTANCE */
-      1134, /* GL_POINT_SMOOTH */
-      1123, /* GL_POINT_SIZE */
-      1133, /* GL_POINT_SIZE_RANGE */
-      1124, /* GL_POINT_SIZE_GRANULARITY */
-       687, /* GL_LINE_SMOOTH */
-       694, /* GL_LINE_WIDTH */
-       696, /* GL_LINE_WIDTH_RANGE */
-       695, /* GL_LINE_WIDTH_GRANULARITY */
-       689, /* GL_LINE_STIPPLE */
-       690, /* GL_LINE_STIPPLE_PATTERN */
-       691, /* GL_LINE_STIPPLE_REPEAT */
-       701, /* GL_LIST_MODE */
-       860, /* GL_MAX_LIST_NESTING */
-       698, /* GL_LIST_BASE */
-       700, /* GL_LIST_INDEX */
-      1144, /* GL_POLYGON_MODE */
-      1151, /* GL_POLYGON_SMOOTH */
-      1153, /* GL_POLYGON_STIPPLE */
-       448, /* GL_EDGE_FLAG */
-       298, /* GL_CULL_FACE */
-       299, /* GL_CULL_FACE_MODE */
-       569, /* GL_FRONT_FACE */
-       669, /* GL_LIGHTING */
-       674, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
-       675, /* GL_LIGHT_MODEL_TWO_SIDE */
-       671, /* GL_LIGHT_MODEL_AMBIENT */
-      1396, /* GL_SHADE_MODEL */
+      1060, /* GL_ORDER */
+       377, /* GL_DOMAIN */
+       307, /* GL_CURRENT_COLOR */
+       310, /* GL_CURRENT_INDEX */
+       316, /* GL_CURRENT_NORMAL */
+       329, /* GL_CURRENT_TEXTURE_COORDS */
+       321, /* GL_CURRENT_RASTER_COLOR */
+       323, /* GL_CURRENT_RASTER_INDEX */
+       327, /* GL_CURRENT_RASTER_TEXTURE_COORDS */
+       324, /* GL_CURRENT_RASTER_POSITION */
+       325, /* GL_CURRENT_RASTER_POSITION_VALID */
+       322, /* GL_CURRENT_RASTER_DISTANCE */
+      1136, /* GL_POINT_SMOOTH */
+      1125, /* GL_POINT_SIZE */
+      1135, /* GL_POINT_SIZE_RANGE */
+      1126, /* GL_POINT_SIZE_GRANULARITY */
+       689, /* GL_LINE_SMOOTH */
+       696, /* GL_LINE_WIDTH */
+       698, /* GL_LINE_WIDTH_RANGE */
+       697, /* GL_LINE_WIDTH_GRANULARITY */
+       691, /* GL_LINE_STIPPLE */
+       692, /* GL_LINE_STIPPLE_PATTERN */
+       693, /* GL_LINE_STIPPLE_REPEAT */
+       703, /* GL_LIST_MODE */
+       862, /* GL_MAX_LIST_NESTING */
+       700, /* GL_LIST_BASE */
+       702, /* GL_LIST_INDEX */
+      1146, /* GL_POLYGON_MODE */
+      1153, /* GL_POLYGON_SMOOTH */
+      1155, /* GL_POLYGON_STIPPLE */
+       450, /* GL_EDGE_FLAG */
+       300, /* GL_CULL_FACE */
+       301, /* GL_CULL_FACE_MODE */
+       571, /* GL_FRONT_FACE */
+       671, /* GL_LIGHTING */
+       676, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
+       677, /* GL_LIGHT_MODEL_TWO_SIDE */
+       673, /* GL_LIGHT_MODEL_AMBIENT */
+      1398, /* GL_SHADE_MODEL */
        190, /* GL_COLOR_MATERIAL_FACE */
        191, /* GL_COLOR_MATERIAL_PARAMETER */
        189, /* GL_COLOR_MATERIAL */
-       496, /* GL_FOG */
-       518, /* GL_FOG_INDEX */
-       514, /* GL_FOG_DENSITY */
-       522, /* GL_FOG_START */
-       516, /* GL_FOG_END */
-       519, /* GL_FOG_MODE */
-       498, /* GL_FOG_COLOR */
-       362, /* GL_DEPTH_RANGE */
-       369, /* GL_DEPTH_TEST */
-       372, /* GL_DEPTH_WRITEMASK */
-       350, /* GL_DEPTH_CLEAR_VALUE */
-       361, /* GL_DEPTH_FUNC */
+       498, /* GL_FOG */
+       520, /* GL_FOG_INDEX */
+       516, /* GL_FOG_DENSITY */
+       524, /* GL_FOG_START */
+       518, /* GL_FOG_END */
+       521, /* GL_FOG_MODE */
+       500, /* GL_FOG_COLOR */
+       364, /* GL_DEPTH_RANGE */
+       371, /* GL_DEPTH_TEST */
+       374, /* GL_DEPTH_WRITEMASK */
+       352, /* GL_DEPTH_CLEAR_VALUE */
+       363, /* GL_DEPTH_FUNC */
         12, /* GL_ACCUM_CLEAR_VALUE */
-      1489, /* GL_STENCIL_TEST */
-      1477, /* GL_STENCIL_CLEAR_VALUE */
-      1479, /* GL_STENCIL_FUNC */
-      1491, /* GL_STENCIL_VALUE_MASK */
-      1478, /* GL_STENCIL_FAIL */
-      1486, /* GL_STENCIL_PASS_DEPTH_FAIL */
-      1487, /* GL_STENCIL_PASS_DEPTH_PASS */
-      1488, /* GL_STENCIL_REF */
-      1492, /* GL_STENCIL_WRITEMASK */
-       829, /* GL_MATRIX_MODE */
-       997, /* GL_NORMALIZE */
-      1801, /* GL_VIEWPORT */
-       971, /* GL_MODELVIEW_STACK_DEPTH */
-      1234, /* GL_PROJECTION_STACK_DEPTH */
-      1687, /* GL_TEXTURE_STACK_DEPTH */
-       969, /* GL_MODELVIEW_MATRIX */
-      1233, /* GL_PROJECTION_MATRIX */
-      1672, /* GL_TEXTURE_MATRIX */
+      1491, /* GL_STENCIL_TEST */
+      1479, /* GL_STENCIL_CLEAR_VALUE */
+      1481, /* GL_STENCIL_FUNC */
+      1493, /* GL_STENCIL_VALUE_MASK */
+      1480, /* GL_STENCIL_FAIL */
+      1488, /* GL_STENCIL_PASS_DEPTH_FAIL */
+      1489, /* GL_STENCIL_PASS_DEPTH_PASS */
+      1490, /* GL_STENCIL_REF */
+      1494, /* GL_STENCIL_WRITEMASK */
+       831, /* GL_MATRIX_MODE */
+       999, /* GL_NORMALIZE */
+      1803, /* GL_VIEWPORT */
+       973, /* GL_MODELVIEW_STACK_DEPTH */
+      1236, /* GL_PROJECTION_STACK_DEPTH */
+      1689, /* GL_TEXTURE_STACK_DEPTH */
+       971, /* GL_MODELVIEW_MATRIX */
+      1235, /* GL_PROJECTION_MATRIX */
+      1674, /* GL_TEXTURE_MATRIX */
         60, /* GL_ATTRIB_STACK_DEPTH */
        133, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
         43, /* GL_ALPHA_TEST */
         44, /* GL_ALPHA_TEST_FUNC */
         45, /* GL_ALPHA_TEST_REF */
-       374, /* GL_DITHER */
+       376, /* GL_DITHER */
         77, /* GL_BLEND_DST */
         86, /* GL_BLEND_SRC */
         74, /* GL_BLEND */
-       704, /* GL_LOGIC_OP_MODE */
-       623, /* GL_INDEX_LOGIC_OP */
+       706, /* GL_LOGIC_OP_MODE */
+       625, /* GL_INDEX_LOGIC_OP */
        188, /* GL_COLOR_LOGIC_OP */
         66, /* GL_AUX_BUFFERS */
-       385, /* GL_DRAW_BUFFER */
-      1266, /* GL_READ_BUFFER */
-      1377, /* GL_SCISSOR_BOX */
-      1378, /* GL_SCISSOR_TEST */
-       622, /* GL_INDEX_CLEAR_VALUE */
-       627, /* GL_INDEX_WRITEMASK */
+       387, /* GL_DRAW_BUFFER */
+      1268, /* GL_READ_BUFFER */
+      1379, /* GL_SCISSOR_BOX */
+      1380, /* GL_SCISSOR_TEST */
+       624, /* GL_INDEX_CLEAR_VALUE */
+       629, /* GL_INDEX_WRITEMASK */
        185, /* GL_COLOR_CLEAR_VALUE */
        227, /* GL_COLOR_WRITEMASK */
-       624, /* GL_INDEX_MODE */
-      1343, /* GL_RGBA_MODE */
-       384, /* GL_DOUBLEBUFFER */
-      1493, /* GL_STEREO */
-      1301, /* GL_RENDER_MODE */
-      1082, /* GL_PERSPECTIVE_CORRECTION_HINT */
-      1135, /* GL_POINT_SMOOTH_HINT */
-       688, /* GL_LINE_SMOOTH_HINT */
-      1152, /* GL_POLYGON_SMOOTH_HINT */
-       517, /* GL_FOG_HINT */
-      1653, /* GL_TEXTURE_GEN_S */
-      1654, /* GL_TEXTURE_GEN_T */
-      1652, /* GL_TEXTURE_GEN_R */
-      1651, /* GL_TEXTURE_GEN_Q */
-      1095, /* GL_PIXEL_MAP_I_TO_I */
-      1101, /* GL_PIXEL_MAP_S_TO_S */
-      1097, /* GL_PIXEL_MAP_I_TO_R */
-      1093, /* GL_PIXEL_MAP_I_TO_G */
-      1091, /* GL_PIXEL_MAP_I_TO_B */
-      1089, /* GL_PIXEL_MAP_I_TO_A */
-      1099, /* GL_PIXEL_MAP_R_TO_R */
-      1087, /* GL_PIXEL_MAP_G_TO_G */
-      1085, /* GL_PIXEL_MAP_B_TO_B */
-      1083, /* GL_PIXEL_MAP_A_TO_A */
-      1096, /* GL_PIXEL_MAP_I_TO_I_SIZE */
-      1102, /* GL_PIXEL_MAP_S_TO_S_SIZE */
-      1098, /* GL_PIXEL_MAP_I_TO_R_SIZE */
-      1094, /* GL_PIXEL_MAP_I_TO_G_SIZE */
-      1092, /* GL_PIXEL_MAP_I_TO_B_SIZE */
-      1090, /* GL_PIXEL_MAP_I_TO_A_SIZE */
-      1100, /* GL_PIXEL_MAP_R_TO_R_SIZE */
-      1088, /* GL_PIXEL_MAP_G_TO_G_SIZE */
-      1086, /* GL_PIXEL_MAP_B_TO_B_SIZE */
-      1084, /* GL_PIXEL_MAP_A_TO_A_SIZE */
-      1721, /* GL_UNPACK_SWAP_BYTES */
-      1716, /* GL_UNPACK_LSB_FIRST */
-      1717, /* GL_UNPACK_ROW_LENGTH */
-      1720, /* GL_UNPACK_SKIP_ROWS */
-      1719, /* GL_UNPACK_SKIP_PIXELS */
-      1714, /* GL_UNPACK_ALIGNMENT */
-      1070, /* GL_PACK_SWAP_BYTES */
-      1065, /* GL_PACK_LSB_FIRST */
-      1066, /* GL_PACK_ROW_LENGTH */
-      1069, /* GL_PACK_SKIP_ROWS */
-      1068, /* GL_PACK_SKIP_PIXELS */
-      1062, /* GL_PACK_ALIGNMENT */
-       782, /* GL_MAP_COLOR */
-       783, /* GL_MAP_STENCIL */
-       626, /* GL_INDEX_SHIFT */
-       625, /* GL_INDEX_OFFSET */
-      1279, /* GL_RED_SCALE */
-      1277, /* GL_RED_BIAS */
-      1818, /* GL_ZOOM_X */
-      1819, /* GL_ZOOM_Y */
-       587, /* GL_GREEN_SCALE */
-       585, /* GL_GREEN_BIAS */
+       626, /* GL_INDEX_MODE */
+      1345, /* GL_RGBA_MODE */
+       386, /* GL_DOUBLEBUFFER */
+      1495, /* GL_STEREO */
+      1303, /* GL_RENDER_MODE */
+      1084, /* GL_PERSPECTIVE_CORRECTION_HINT */
+      1137, /* GL_POINT_SMOOTH_HINT */
+       690, /* GL_LINE_SMOOTH_HINT */
+      1154, /* GL_POLYGON_SMOOTH_HINT */
+       519, /* GL_FOG_HINT */
+      1655, /* GL_TEXTURE_GEN_S */
+      1656, /* GL_TEXTURE_GEN_T */
+      1654, /* GL_TEXTURE_GEN_R */
+      1653, /* GL_TEXTURE_GEN_Q */
+      1097, /* GL_PIXEL_MAP_I_TO_I */
+      1103, /* GL_PIXEL_MAP_S_TO_S */
+      1099, /* GL_PIXEL_MAP_I_TO_R */
+      1095, /* GL_PIXEL_MAP_I_TO_G */
+      1093, /* GL_PIXEL_MAP_I_TO_B */
+      1091, /* GL_PIXEL_MAP_I_TO_A */
+      1101, /* GL_PIXEL_MAP_R_TO_R */
+      1089, /* GL_PIXEL_MAP_G_TO_G */
+      1087, /* GL_PIXEL_MAP_B_TO_B */
+      1085, /* GL_PIXEL_MAP_A_TO_A */
+      1098, /* GL_PIXEL_MAP_I_TO_I_SIZE */
+      1104, /* GL_PIXEL_MAP_S_TO_S_SIZE */
+      1100, /* GL_PIXEL_MAP_I_TO_R_SIZE */
+      1096, /* GL_PIXEL_MAP_I_TO_G_SIZE */
+      1094, /* GL_PIXEL_MAP_I_TO_B_SIZE */
+      1092, /* GL_PIXEL_MAP_I_TO_A_SIZE */
+      1102, /* GL_PIXEL_MAP_R_TO_R_SIZE */
+      1090, /* GL_PIXEL_MAP_G_TO_G_SIZE */
+      1088, /* GL_PIXEL_MAP_B_TO_B_SIZE */
+      1086, /* GL_PIXEL_MAP_A_TO_A_SIZE */
+      1723, /* GL_UNPACK_SWAP_BYTES */
+      1718, /* GL_UNPACK_LSB_FIRST */
+      1719, /* GL_UNPACK_ROW_LENGTH */
+      1722, /* GL_UNPACK_SKIP_ROWS */
+      1721, /* GL_UNPACK_SKIP_PIXELS */
+      1716, /* GL_UNPACK_ALIGNMENT */
+      1072, /* GL_PACK_SWAP_BYTES */
+      1067, /* GL_PACK_LSB_FIRST */
+      1068, /* GL_PACK_ROW_LENGTH */
+      1071, /* GL_PACK_SKIP_ROWS */
+      1070, /* GL_PACK_SKIP_PIXELS */
+      1064, /* GL_PACK_ALIGNMENT */
+       784, /* GL_MAP_COLOR */
+       785, /* GL_MAP_STENCIL */
+       628, /* GL_INDEX_SHIFT */
+       627, /* GL_INDEX_OFFSET */
+      1281, /* GL_RED_SCALE */
+      1279, /* GL_RED_BIAS */
+      1820, /* GL_ZOOM_X */
+      1821, /* GL_ZOOM_Y */
+       589, /* GL_GREEN_SCALE */
+       587, /* GL_GREEN_BIAS */
         92, /* GL_BLUE_SCALE */
         90, /* GL_BLUE_BIAS */
         42, /* GL_ALPHA_SCALE */
         40, /* GL_ALPHA_BIAS */
-       363, /* GL_DEPTH_SCALE */
-       344, /* GL_DEPTH_BIAS */
-       855, /* GL_MAX_EVAL_ORDER */
-       859, /* GL_MAX_LIGHTS */
-       838, /* GL_MAX_CLIP_PLANES */
-       904, /* GL_MAX_TEXTURE_SIZE */
-       865, /* GL_MAX_PIXEL_MAP_TABLE */
-       834, /* GL_MAX_ATTRIB_STACK_DEPTH */
-       862, /* GL_MAX_MODELVIEW_STACK_DEPTH */
-       863, /* GL_MAX_NAME_STACK_DEPTH */
-       891, /* GL_MAX_PROJECTION_STACK_DEPTH */
-       905, /* GL_MAX_TEXTURE_STACK_DEPTH */
-       919, /* GL_MAX_VIEWPORT_DIMS */
-       835, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
-      1500, /* GL_SUBPIXEL_BITS */
-       621, /* GL_INDEX_BITS */
-      1278, /* GL_RED_BITS */
-       586, /* GL_GREEN_BITS */
+       365, /* GL_DEPTH_SCALE */
+       346, /* GL_DEPTH_BIAS */
+       857, /* GL_MAX_EVAL_ORDER */
+       861, /* GL_MAX_LIGHTS */
+       840, /* GL_MAX_CLIP_PLANES */
+       906, /* GL_MAX_TEXTURE_SIZE */
+       867, /* GL_MAX_PIXEL_MAP_TABLE */
+       836, /* GL_MAX_ATTRIB_STACK_DEPTH */
+       864, /* GL_MAX_MODELVIEW_STACK_DEPTH */
+       865, /* GL_MAX_NAME_STACK_DEPTH */
+       893, /* GL_MAX_PROJECTION_STACK_DEPTH */
+       907, /* GL_MAX_TEXTURE_STACK_DEPTH */
+       921, /* GL_MAX_VIEWPORT_DIMS */
+       837, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
+      1502, /* GL_SUBPIXEL_BITS */
+       623, /* GL_INDEX_BITS */
+      1280, /* GL_RED_BITS */
+       588, /* GL_GREEN_BITS */
         91, /* GL_BLUE_BITS */
         41, /* GL_ALPHA_BITS */
-       345, /* GL_DEPTH_BITS */
-      1475, /* GL_STENCIL_BITS */
+       347, /* GL_DEPTH_BITS */
+      1477, /* GL_STENCIL_BITS */
         14, /* GL_ACCUM_RED_BITS */
         13, /* GL_ACCUM_GREEN_BITS */
         10, /* GL_ACCUM_BLUE_BITS */
          9, /* GL_ACCUM_ALPHA_BITS */
-       985, /* GL_NAME_STACK_DEPTH */
+       987, /* GL_NAME_STACK_DEPTH */
         61, /* GL_AUTO_NORMAL */
-       728, /* GL_MAP1_COLOR_4 */
-       731, /* GL_MAP1_INDEX */
-       732, /* GL_MAP1_NORMAL */
-       733, /* GL_MAP1_TEXTURE_COORD_1 */
-       734, /* GL_MAP1_TEXTURE_COORD_2 */
-       735, /* GL_MAP1_TEXTURE_COORD_3 */
-       736, /* GL_MAP1_TEXTURE_COORD_4 */
-       737, /* GL_MAP1_VERTEX_3 */
-       738, /* GL_MAP1_VERTEX_4 */
-       755, /* GL_MAP2_COLOR_4 */
-       758, /* GL_MAP2_INDEX */
-       759, /* GL_MAP2_NORMAL */
-       760, /* GL_MAP2_TEXTURE_COORD_1 */
-       761, /* GL_MAP2_TEXTURE_COORD_2 */
-       762, /* GL_MAP2_TEXTURE_COORD_3 */
-       763, /* GL_MAP2_TEXTURE_COORD_4 */
-       764, /* GL_MAP2_VERTEX_3 */
-       765, /* GL_MAP2_VERTEX_4 */
-       729, /* GL_MAP1_GRID_DOMAIN */
-       730, /* GL_MAP1_GRID_SEGMENTS */
-       756, /* GL_MAP2_GRID_DOMAIN */
-       757, /* GL_MAP2_GRID_SEGMENTS */
-      1577, /* GL_TEXTURE_1D */
-      1579, /* GL_TEXTURE_2D */
-       472, /* GL_FEEDBACK_BUFFER_POINTER */
-       473, /* GL_FEEDBACK_BUFFER_SIZE */
-       474, /* GL_FEEDBACK_BUFFER_TYPE */
-      1387, /* GL_SELECTION_BUFFER_POINTER */
-      1388, /* GL_SELECTION_BUFFER_SIZE */
-      1691, /* GL_TEXTURE_WIDTH */
-      1658, /* GL_TEXTURE_HEIGHT */
-      1614, /* GL_TEXTURE_COMPONENTS */
-      1598, /* GL_TEXTURE_BORDER_COLOR */
-      1597, /* GL_TEXTURE_BORDER */
-       376, /* GL_DONT_CARE */
-       470, /* GL_FASTEST */
-       993, /* GL_NICEST */
+       730, /* GL_MAP1_COLOR_4 */
+       733, /* GL_MAP1_INDEX */
+       734, /* GL_MAP1_NORMAL */
+       735, /* GL_MAP1_TEXTURE_COORD_1 */
+       736, /* GL_MAP1_TEXTURE_COORD_2 */
+       737, /* GL_MAP1_TEXTURE_COORD_3 */
+       738, /* GL_MAP1_TEXTURE_COORD_4 */
+       739, /* GL_MAP1_VERTEX_3 */
+       740, /* GL_MAP1_VERTEX_4 */
+       757, /* GL_MAP2_COLOR_4 */
+       760, /* GL_MAP2_INDEX */
+       761, /* GL_MAP2_NORMAL */
+       762, /* GL_MAP2_TEXTURE_COORD_1 */
+       763, /* GL_MAP2_TEXTURE_COORD_2 */
+       764, /* GL_MAP2_TEXTURE_COORD_3 */
+       765, /* GL_MAP2_TEXTURE_COORD_4 */
+       766, /* GL_MAP2_VERTEX_3 */
+       767, /* GL_MAP2_VERTEX_4 */
+       731, /* GL_MAP1_GRID_DOMAIN */
+       732, /* GL_MAP1_GRID_SEGMENTS */
+       758, /* GL_MAP2_GRID_DOMAIN */
+       759, /* GL_MAP2_GRID_SEGMENTS */
+      1579, /* GL_TEXTURE_1D */
+      1581, /* GL_TEXTURE_2D */
+       474, /* GL_FEEDBACK_BUFFER_POINTER */
+       475, /* GL_FEEDBACK_BUFFER_SIZE */
+       476, /* GL_FEEDBACK_BUFFER_TYPE */
+      1389, /* GL_SELECTION_BUFFER_POINTER */
+      1390, /* GL_SELECTION_BUFFER_SIZE */
+      1693, /* GL_TEXTURE_WIDTH */
+      1660, /* GL_TEXTURE_HEIGHT */
+      1616, /* GL_TEXTURE_COMPONENTS */
+      1600, /* GL_TEXTURE_BORDER_COLOR */
+      1599, /* GL_TEXTURE_BORDER */
+       378, /* GL_DONT_CARE */
+       472, /* GL_FASTEST */
+       995, /* GL_NICEST */
         47, /* GL_AMBIENT */
-       373, /* GL_DIFFUSE */
-      1435, /* GL_SPECULAR */
-      1156, /* GL_POSITION */
-      1438, /* GL_SPOT_DIRECTION */
-      1439, /* GL_SPOT_EXPONENT */
-      1437, /* GL_SPOT_CUTOFF */
+       375, /* GL_DIFFUSE */
+      1437, /* GL_SPECULAR */
+      1158, /* GL_POSITION */
+      1440, /* GL_SPOT_DIRECTION */
+      1441, /* GL_SPOT_EXPONENT */
+      1439, /* GL_SPOT_CUTOFF */
        271, /* GL_CONSTANT_ATTENUATION */
-       678, /* GL_LINEAR_ATTENUATION */
-      1253, /* GL_QUADRATIC_ATTENUATION */
+       680, /* GL_LINEAR_ATTENUATION */
+      1255, /* GL_QUADRATIC_ATTENUATION */
        241, /* GL_COMPILE */
        242, /* GL_COMPILE_AND_EXECUTE */
        117, /* GL_BYTE */
-      1722, /* GL_UNSIGNED_BYTE */
-      1401, /* GL_SHORT */
-      1733, /* GL_UNSIGNED_SHORT */
-       629, /* GL_INT */
-      1725, /* GL_UNSIGNED_INT */
-       477, /* GL_FLOAT */
+      1724, /* GL_UNSIGNED_BYTE */
+      1403, /* GL_SHORT */
+      1735, /* GL_UNSIGNED_SHORT */
+       631, /* GL_INT */
+      1727, /* GL_UNSIGNED_INT */
+       479, /* GL_FLOAT */
          1, /* GL_2_BYTES */
          5, /* GL_3_BYTES */
          7, /* GL_4_BYTES */
-       383, /* GL_DOUBLE */
+       385, /* GL_DOUBLE */
        129, /* GL_CLEAR */
         49, /* GL_AND */
         51, /* GL_AND_REVERSE */
        295, /* GL_COPY */
         50, /* GL_AND_INVERTED */
-       995, /* GL_NOOP */
-      1814, /* GL_XOR */
-      1057, /* GL_OR */
-       996, /* GL_NOR */
-       460, /* GL_EQUIV */
-       656, /* GL_INVERT */
-      1060, /* GL_OR_REVERSE */
+       997, /* GL_NOOP */
+      1816, /* GL_XOR */
+      1059, /* GL_OR */
+       998, /* GL_NOR */
+       462, /* GL_EQUIV */
+       658, /* GL_INVERT */
+      1062, /* GL_OR_REVERSE */
        296, /* GL_COPY_INVERTED */
-      1059, /* GL_OR_INVERTED */
-       986, /* GL_NAND */
-      1392, /* GL_SET */
-       457, /* GL_EMISSION */
-      1400, /* GL_SHININESS */
+      1061, /* GL_OR_INVERTED */
+       988, /* GL_NAND */
+      1394, /* GL_SET */
+       459, /* GL_EMISSION */
+      1402, /* GL_SHININESS */
         48, /* GL_AMBIENT_AND_DIFFUSE */
        187, /* GL_COLOR_INDEXES */
-       936, /* GL_MODELVIEW */
-      1232, /* GL_PROJECTION */
-      1512, /* GL_TEXTURE */
+       938, /* GL_MODELVIEW */
+      1234, /* GL_PROJECTION */
+      1514, /* GL_TEXTURE */
        144, /* GL_COLOR */
-       340, /* GL_DEPTH */
-      1461, /* GL_STENCIL */
+       342, /* GL_DEPTH */
+      1463, /* GL_STENCIL */
        186, /* GL_COLOR_INDEX */
-      1480, /* GL_STENCIL_INDEX */
-       351, /* GL_DEPTH_COMPONENT */
-      1274, /* GL_RED */
-       584, /* GL_GREEN */
+      1482, /* GL_STENCIL_INDEX */
+       353, /* GL_DEPTH_COMPONENT */
+      1276, /* GL_RED */
+       586, /* GL_GREEN */
         89, /* GL_BLUE */
         31, /* GL_ALPHA */
-      1309, /* GL_RGB */
-      1328, /* GL_RGBA */
-       706, /* GL_LUMINANCE */
-       727, /* GL_LUMINANCE_ALPHA */
+      1311, /* GL_RGB */
+      1330, /* GL_RGBA */
+       708, /* GL_LUMINANCE */
+       729, /* GL_LUMINANCE_ALPHA */
         72, /* GL_BITMAP */
-      1112, /* GL_POINT */
-       676, /* GL_LINE */
-       475, /* GL_FILL */
-      1283, /* GL_RENDER */
-       471, /* GL_FEEDBACK */
-      1386, /* GL_SELECT */
-       476, /* GL_FLAT */
-      1410, /* GL_SMOOTH */
-       657, /* GL_KEEP */
-      1303, /* GL_REPLACE */
-       611, /* GL_INCR */
-       336, /* GL_DECR */
-      1748, /* GL_VENDOR */
-      1300, /* GL_RENDERER */
-      1749, /* GL_VERSION */
-       464, /* GL_EXTENSIONS */
-      1351, /* GL_S */
-      1503, /* GL_T */
-      1263, /* GL_R */
-      1252, /* GL_Q */
-       972, /* GL_MODULATE */
-       335, /* GL_DECAL */
-      1648, /* GL_TEXTURE_ENV_MODE */
-      1647, /* GL_TEXTURE_ENV_COLOR */
-      1646, /* GL_TEXTURE_ENV */
-       465, /* GL_EYE_LINEAR */
-      1019, /* GL_OBJECT_LINEAR */
-      1436, /* GL_SPHERE_MAP */
-      1650, /* GL_TEXTURE_GEN_MODE */
-      1021, /* GL_OBJECT_PLANE */
-       466, /* GL_EYE_PLANE */
-       987, /* GL_NEAREST */
-       677, /* GL_LINEAR */
-       991, /* GL_NEAREST_MIPMAP_NEAREST */
-       682, /* GL_LINEAR_MIPMAP_NEAREST */
-       990, /* GL_NEAREST_MIPMAP_LINEAR */
-       681, /* GL_LINEAR_MIPMAP_LINEAR */
-      1671, /* GL_TEXTURE_MAG_FILTER */
-      1679, /* GL_TEXTURE_MIN_FILTER */
-      1693, /* GL_TEXTURE_WRAP_S */
-      1694, /* GL_TEXTURE_WRAP_T */
+      1114, /* GL_POINT */
+       678, /* GL_LINE */
+       477, /* GL_FILL */
+      1285, /* GL_RENDER */
+       473, /* GL_FEEDBACK */
+      1388, /* GL_SELECT */
+       478, /* GL_FLAT */
+      1412, /* GL_SMOOTH */
+       659, /* GL_KEEP */
+      1305, /* GL_REPLACE */
+       613, /* GL_INCR */
+       338, /* GL_DECR */
+      1750, /* GL_VENDOR */
+      1302, /* GL_RENDERER */
+      1751, /* GL_VERSION */
+       466, /* GL_EXTENSIONS */
+      1353, /* GL_S */
+      1505, /* GL_T */
+      1265, /* GL_R */
+      1254, /* GL_Q */
+       974, /* GL_MODULATE */
+       337, /* GL_DECAL */
+      1650, /* GL_TEXTURE_ENV_MODE */
+      1649, /* GL_TEXTURE_ENV_COLOR */
+      1648, /* GL_TEXTURE_ENV */
+       467, /* GL_EYE_LINEAR */
+      1021, /* GL_OBJECT_LINEAR */
+      1438, /* GL_SPHERE_MAP */
+      1652, /* GL_TEXTURE_GEN_MODE */
+      1023, /* GL_OBJECT_PLANE */
+       468, /* GL_EYE_PLANE */
+       989, /* GL_NEAREST */
+       679, /* GL_LINEAR */
+       993, /* GL_NEAREST_MIPMAP_NEAREST */
+       684, /* GL_LINEAR_MIPMAP_NEAREST */
+       992, /* GL_NEAREST_MIPMAP_LINEAR */
+       683, /* GL_LINEAR_MIPMAP_LINEAR */
+      1673, /* GL_TEXTURE_MAG_FILTER */
+      1681, /* GL_TEXTURE_MIN_FILTER */
+      1695, /* GL_TEXTURE_WRAP_S */
+      1696, /* GL_TEXTURE_WRAP_T */
        123, /* GL_CLAMP */
-      1302, /* GL_REPEAT */
-      1150, /* GL_POLYGON_OFFSET_UNITS */
-      1149, /* GL_POLYGON_OFFSET_POINT */
-      1148, /* GL_POLYGON_OFFSET_LINE */
-      1264, /* GL_R3_G3_B2 */
-      1745, /* GL_V2F */
-      1746, /* GL_V3F */
+      1304, /* GL_REPEAT */
+      1152, /* GL_POLYGON_OFFSET_UNITS */
+      1151, /* GL_POLYGON_OFFSET_POINT */
+      1150, /* GL_POLYGON_OFFSET_LINE */
+      1266, /* GL_R3_G3_B2 */
+      1747, /* GL_V2F */
+      1748, /* GL_V3F */
        120, /* GL_C4UB_V2F */
        121, /* GL_C4UB_V3F */
        118, /* GL_C3F_V3F */
-       984, /* GL_N3F_V3F */
+       986, /* GL_N3F_V3F */
        119, /* GL_C4F_N3F_V3F */
-      1508, /* GL_T2F_V3F */
-      1510, /* GL_T4F_V4F */
-      1506, /* GL_T2F_C4UB_V3F */
-      1504, /* GL_T2F_C3F_V3F */
-      1507, /* GL_T2F_N3F_V3F */
-      1505, /* GL_T2F_C4F_N3F_V3F */
-      1509, /* GL_T4F_C4F_N3F_V4F */
+      1510, /* GL_T2F_V3F */
+      1512, /* GL_T4F_V4F */
+      1508, /* GL_T2F_C4UB_V3F */
+      1506, /* GL_T2F_C3F_V3F */
+      1509, /* GL_T2F_N3F_V3F */
+      1507, /* GL_T2F_C4F_N3F_V3F */
+      1511, /* GL_T4F_C4F_N3F_V4F */
        136, /* GL_CLIP_PLANE0 */
        137, /* GL_CLIP_PLANE1 */
        138, /* GL_CLIP_PLANE2 */
        139, /* GL_CLIP_PLANE3 */
        140, /* GL_CLIP_PLANE4 */
        141, /* GL_CLIP_PLANE5 */
-       661, /* GL_LIGHT0 */
-       662, /* GL_LIGHT1 */
-       663, /* GL_LIGHT2 */
-       664, /* GL_LIGHT3 */
-       665, /* GL_LIGHT4 */
-       666, /* GL_LIGHT5 */
-       667, /* GL_LIGHT6 */
-       668, /* GL_LIGHT7 */
-       588, /* GL_HINT_BIT */
+       663, /* GL_LIGHT0 */
+       664, /* GL_LIGHT1 */
+       665, /* GL_LIGHT2 */
+       666, /* GL_LIGHT3 */
+       667, /* GL_LIGHT4 */
+       668, /* GL_LIGHT5 */
+       669, /* GL_LIGHT6 */
+       670, /* GL_LIGHT7 */
+       590, /* GL_HINT_BIT */
        273, /* GL_CONSTANT_COLOR */
-      1031, /* GL_ONE_MINUS_CONSTANT_COLOR */
+      1033, /* GL_ONE_MINUS_CONSTANT_COLOR */
        268, /* GL_CONSTANT_ALPHA */
-      1029, /* GL_ONE_MINUS_CONSTANT_ALPHA */
+      1031, /* GL_ONE_MINUS_CONSTANT_ALPHA */
         75, /* GL_BLEND_COLOR */
-       572, /* GL_FUNC_ADD */
-       920, /* GL_MIN */
-       831, /* GL_MAX */
+       574, /* GL_FUNC_ADD */
+       922, /* GL_MIN */
+       833, /* GL_MAX */
         80, /* GL_BLEND_EQUATION */
-       576, /* GL_FUNC_SUBTRACT */
-       574, /* GL_FUNC_REVERSE_SUBTRACT */
+       578, /* GL_FUNC_SUBTRACT */
+       576, /* GL_FUNC_REVERSE_SUBTRACT */
        276, /* GL_CONVOLUTION_1D */
        277, /* GL_CONVOLUTION_2D */
-      1389, /* GL_SEPARABLE_2D */
+      1391, /* GL_SEPARABLE_2D */
        280, /* GL_CONVOLUTION_BORDER_MODE */
        284, /* GL_CONVOLUTION_FILTER_SCALE */
        282, /* GL_CONVOLUTION_FILTER_BIAS */
-      1275, /* GL_REDUCE */
+      1277, /* GL_REDUCE */
        286, /* GL_CONVOLUTION_FORMAT */
        290, /* GL_CONVOLUTION_WIDTH */
        288, /* GL_CONVOLUTION_HEIGHT */
-       846, /* GL_MAX_CONVOLUTION_WIDTH */
-       844, /* GL_MAX_CONVOLUTION_HEIGHT */
-      1189, /* GL_POST_CONVOLUTION_RED_SCALE */
-      1185, /* GL_POST_CONVOLUTION_GREEN_SCALE */
-      1180, /* GL_POST_CONVOLUTION_BLUE_SCALE */
-      1176, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
-      1187, /* GL_POST_CONVOLUTION_RED_BIAS */
-      1183, /* GL_POST_CONVOLUTION_GREEN_BIAS */
-      1178, /* GL_POST_CONVOLUTION_BLUE_BIAS */
-      1174, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
-       589, /* GL_HISTOGRAM */
-      1236, /* GL_PROXY_HISTOGRAM */
-       605, /* GL_HISTOGRAM_WIDTH */
-       595, /* GL_HISTOGRAM_FORMAT */
-       601, /* GL_HISTOGRAM_RED_SIZE */
-       597, /* GL_HISTOGRAM_GREEN_SIZE */
-       592, /* GL_HISTOGRAM_BLUE_SIZE */
-       590, /* GL_HISTOGRAM_ALPHA_SIZE */
-       599, /* GL_HISTOGRAM_LUMINANCE_SIZE */
-       603, /* GL_HISTOGRAM_SINK */
-       921, /* GL_MINMAX */
-       923, /* GL_MINMAX_FORMAT */
-       925, /* GL_MINMAX_SINK */
-      1511, /* GL_TABLE_TOO_LARGE_EXT */
-      1724, /* GL_UNSIGNED_BYTE_3_3_2 */
-      1735, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-      1737, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-      1730, /* GL_UNSIGNED_INT_8_8_8_8 */
-      1726, /* GL_UNSIGNED_INT_10_10_10_2 */
-      1147, /* GL_POLYGON_OFFSET_FILL */
-      1146, /* GL_POLYGON_OFFSET_FACTOR */
-      1145, /* GL_POLYGON_OFFSET_BIAS */
-      1306, /* GL_RESCALE_NORMAL */
+       848, /* GL_MAX_CONVOLUTION_WIDTH */
+       846, /* GL_MAX_CONVOLUTION_HEIGHT */
+      1191, /* GL_POST_CONVOLUTION_RED_SCALE */
+      1187, /* GL_POST_CONVOLUTION_GREEN_SCALE */
+      1182, /* GL_POST_CONVOLUTION_BLUE_SCALE */
+      1178, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
+      1189, /* GL_POST_CONVOLUTION_RED_BIAS */
+      1185, /* GL_POST_CONVOLUTION_GREEN_BIAS */
+      1180, /* GL_POST_CONVOLUTION_BLUE_BIAS */
+      1176, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
+       591, /* GL_HISTOGRAM */
+      1238, /* GL_PROXY_HISTOGRAM */
+       607, /* GL_HISTOGRAM_WIDTH */
+       597, /* GL_HISTOGRAM_FORMAT */
+       603, /* GL_HISTOGRAM_RED_SIZE */
+       599, /* GL_HISTOGRAM_GREEN_SIZE */
+       594, /* GL_HISTOGRAM_BLUE_SIZE */
+       592, /* GL_HISTOGRAM_ALPHA_SIZE */
+       601, /* GL_HISTOGRAM_LUMINANCE_SIZE */
+       605, /* GL_HISTOGRAM_SINK */
+       923, /* GL_MINMAX */
+       925, /* GL_MINMAX_FORMAT */
+       927, /* GL_MINMAX_SINK */
+      1513, /* GL_TABLE_TOO_LARGE_EXT */
+      1726, /* GL_UNSIGNED_BYTE_3_3_2 */
+      1737, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+      1739, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+      1732, /* GL_UNSIGNED_INT_8_8_8_8 */
+      1728, /* GL_UNSIGNED_INT_10_10_10_2 */
+      1149, /* GL_POLYGON_OFFSET_FILL */
+      1148, /* GL_POLYGON_OFFSET_FACTOR */
+      1147, /* GL_POLYGON_OFFSET_BIAS */
+      1308, /* GL_RESCALE_NORMAL */
         36, /* GL_ALPHA4 */
         38, /* GL_ALPHA8 */
         32, /* GL_ALPHA12 */
         34, /* GL_ALPHA16 */
-       717, /* GL_LUMINANCE4 */
-       723, /* GL_LUMINANCE8 */
-       707, /* GL_LUMINANCE12 */
-       713, /* GL_LUMINANCE16 */
-       718, /* GL_LUMINANCE4_ALPHA4 */
-       721, /* GL_LUMINANCE6_ALPHA2 */
-       724, /* GL_LUMINANCE8_ALPHA8 */
-       710, /* GL_LUMINANCE12_ALPHA4 */
-       708, /* GL_LUMINANCE12_ALPHA12 */
-       714, /* GL_LUMINANCE16_ALPHA16 */
-       630, /* GL_INTENSITY */
-       635, /* GL_INTENSITY4 */
-       637, /* GL_INTENSITY8 */
-       631, /* GL_INTENSITY12 */
-       633, /* GL_INTENSITY16 */
-      1318, /* GL_RGB2_EXT */
-      1319, /* GL_RGB4 */
-      1322, /* GL_RGB5 */
-      1326, /* GL_RGB8 */
-      1310, /* GL_RGB10 */
-      1314, /* GL_RGB12 */
-      1316, /* GL_RGB16 */
-      1333, /* GL_RGBA2 */
-      1335, /* GL_RGBA4 */
-      1323, /* GL_RGB5_A1 */
-      1339, /* GL_RGBA8 */
-      1311, /* GL_RGB10_A2 */
-      1329, /* GL_RGBA12 */
-      1331, /* GL_RGBA16 */
-      1684, /* GL_TEXTURE_RED_SIZE */
-      1656, /* GL_TEXTURE_GREEN_SIZE */
-      1595, /* GL_TEXTURE_BLUE_SIZE */
-      1582, /* GL_TEXTURE_ALPHA_SIZE */
-      1669, /* GL_TEXTURE_LUMINANCE_SIZE */
-      1660, /* GL_TEXTURE_INTENSITY_SIZE */
-      1304, /* GL_REPLACE_EXT */
-      1240, /* GL_PROXY_TEXTURE_1D */
-      1243, /* GL_PROXY_TEXTURE_2D */
-      1689, /* GL_TEXTURE_TOO_LARGE_EXT */
-      1681, /* GL_TEXTURE_PRIORITY */
-      1686, /* GL_TEXTURE_RESIDENT */
-      1585, /* GL_TEXTURE_BINDING_1D */
-      1587, /* GL_TEXTURE_BINDING_2D */
-      1589, /* GL_TEXTURE_BINDING_3D */
-      1067, /* GL_PACK_SKIP_IMAGES */
-      1063, /* GL_PACK_IMAGE_HEIGHT */
-      1718, /* GL_UNPACK_SKIP_IMAGES */
-      1715, /* GL_UNPACK_IMAGE_HEIGHT */
-      1581, /* GL_TEXTURE_3D */
-      1246, /* GL_PROXY_TEXTURE_3D */
-      1643, /* GL_TEXTURE_DEPTH */
-      1692, /* GL_TEXTURE_WRAP_R */
-       832, /* GL_MAX_3D_TEXTURE_SIZE */
-      1750, /* GL_VERTEX_ARRAY */
-       998, /* GL_NORMAL_ARRAY */
+       719, /* GL_LUMINANCE4 */
+       725, /* GL_LUMINANCE8 */
+       709, /* GL_LUMINANCE12 */
+       715, /* GL_LUMINANCE16 */
+       720, /* GL_LUMINANCE4_ALPHA4 */
+       723, /* GL_LUMINANCE6_ALPHA2 */
+       726, /* GL_LUMINANCE8_ALPHA8 */
+       712, /* GL_LUMINANCE12_ALPHA4 */
+       710, /* GL_LUMINANCE12_ALPHA12 */
+       716, /* GL_LUMINANCE16_ALPHA16 */
+       632, /* GL_INTENSITY */
+       637, /* GL_INTENSITY4 */
+       639, /* GL_INTENSITY8 */
+       633, /* GL_INTENSITY12 */
+       635, /* GL_INTENSITY16 */
+      1320, /* GL_RGB2_EXT */
+      1321, /* GL_RGB4 */
+      1324, /* GL_RGB5 */
+      1328, /* GL_RGB8 */
+      1312, /* GL_RGB10 */
+      1316, /* GL_RGB12 */
+      1318, /* GL_RGB16 */
+      1335, /* GL_RGBA2 */
+      1337, /* GL_RGBA4 */
+      1325, /* GL_RGB5_A1 */
+      1341, /* GL_RGBA8 */
+      1313, /* GL_RGB10_A2 */
+      1331, /* GL_RGBA12 */
+      1333, /* GL_RGBA16 */
+      1686, /* GL_TEXTURE_RED_SIZE */
+      1658, /* GL_TEXTURE_GREEN_SIZE */
+      1597, /* GL_TEXTURE_BLUE_SIZE */
+      1584, /* GL_TEXTURE_ALPHA_SIZE */
+      1671, /* GL_TEXTURE_LUMINANCE_SIZE */
+      1662, /* GL_TEXTURE_INTENSITY_SIZE */
+      1306, /* GL_REPLACE_EXT */
+      1242, /* GL_PROXY_TEXTURE_1D */
+      1245, /* GL_PROXY_TEXTURE_2D */
+      1691, /* GL_TEXTURE_TOO_LARGE_EXT */
+      1683, /* GL_TEXTURE_PRIORITY */
+      1688, /* GL_TEXTURE_RESIDENT */
+      1587, /* GL_TEXTURE_BINDING_1D */
+      1589, /* GL_TEXTURE_BINDING_2D */
+      1591, /* GL_TEXTURE_BINDING_3D */
+      1069, /* GL_PACK_SKIP_IMAGES */
+      1065, /* GL_PACK_IMAGE_HEIGHT */
+      1720, /* GL_UNPACK_SKIP_IMAGES */
+      1717, /* GL_UNPACK_IMAGE_HEIGHT */
+      1583, /* GL_TEXTURE_3D */
+      1248, /* GL_PROXY_TEXTURE_3D */
+      1645, /* GL_TEXTURE_DEPTH */
+      1694, /* GL_TEXTURE_WRAP_R */
+       834, /* GL_MAX_3D_TEXTURE_SIZE */
+      1752, /* GL_VERTEX_ARRAY */
+      1000, /* GL_NORMAL_ARRAY */
        145, /* GL_COLOR_ARRAY */
-       615, /* GL_INDEX_ARRAY */
-      1622, /* GL_TEXTURE_COORD_ARRAY */
-       449, /* GL_EDGE_FLAG_ARRAY */
-      1755, /* GL_VERTEX_ARRAY_SIZE */
-      1757, /* GL_VERTEX_ARRAY_TYPE */
-      1756, /* GL_VERTEX_ARRAY_STRIDE */
-      1003, /* GL_NORMAL_ARRAY_TYPE */
-      1002, /* GL_NORMAL_ARRAY_STRIDE */
+       617, /* GL_INDEX_ARRAY */
+      1624, /* GL_TEXTURE_COORD_ARRAY */
+       451, /* GL_EDGE_FLAG_ARRAY */
+      1757, /* GL_VERTEX_ARRAY_SIZE */
+      1759, /* GL_VERTEX_ARRAY_TYPE */
+      1758, /* GL_VERTEX_ARRAY_STRIDE */
+      1005, /* GL_NORMAL_ARRAY_TYPE */
+      1004, /* GL_NORMAL_ARRAY_STRIDE */
        149, /* GL_COLOR_ARRAY_SIZE */
        151, /* GL_COLOR_ARRAY_TYPE */
        150, /* GL_COLOR_ARRAY_STRIDE */
-       620, /* GL_INDEX_ARRAY_TYPE */
-       619, /* GL_INDEX_ARRAY_STRIDE */
-      1626, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-      1628, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-      1627, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
-       453, /* GL_EDGE_FLAG_ARRAY_STRIDE */
-      1754, /* GL_VERTEX_ARRAY_POINTER */
-      1001, /* GL_NORMAL_ARRAY_POINTER */
+       622, /* GL_INDEX_ARRAY_TYPE */
+       621, /* GL_INDEX_ARRAY_STRIDE */
+      1628, /* GL_TEXTURE_COORD_ARRAY_SIZE */
+      1630, /* GL_TEXTURE_COORD_ARRAY_TYPE */
+      1629, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
+       455, /* GL_EDGE_FLAG_ARRAY_STRIDE */
+      1756, /* GL_VERTEX_ARRAY_POINTER */
+      1003, /* GL_NORMAL_ARRAY_POINTER */
        148, /* GL_COLOR_ARRAY_POINTER */
-       618, /* GL_INDEX_ARRAY_POINTER */
-      1625, /* GL_TEXTURE_COORD_ARRAY_POINTER */
-       452, /* GL_EDGE_FLAG_ARRAY_POINTER */
-       977, /* GL_MULTISAMPLE */
-      1363, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
-      1365, /* GL_SAMPLE_ALPHA_TO_ONE */
-      1370, /* GL_SAMPLE_COVERAGE */
-      1367, /* GL_SAMPLE_BUFFERS */
-      1358, /* GL_SAMPLES */
-      1374, /* GL_SAMPLE_COVERAGE_VALUE */
-      1372, /* GL_SAMPLE_COVERAGE_INVERT */
+       620, /* GL_INDEX_ARRAY_POINTER */
+      1627, /* GL_TEXTURE_COORD_ARRAY_POINTER */
+       454, /* GL_EDGE_FLAG_ARRAY_POINTER */
+       979, /* GL_MULTISAMPLE */
+      1365, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
+      1367, /* GL_SAMPLE_ALPHA_TO_ONE */
+      1372, /* GL_SAMPLE_COVERAGE */
+      1369, /* GL_SAMPLE_BUFFERS */
+      1360, /* GL_SAMPLES */
+      1376, /* GL_SAMPLE_COVERAGE_VALUE */
+      1374, /* GL_SAMPLE_COVERAGE_INVERT */
        192, /* GL_COLOR_MATRIX */
        194, /* GL_COLOR_MATRIX_STACK_DEPTH */
-       840, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
-      1172, /* GL_POST_COLOR_MATRIX_RED_SCALE */
-      1168, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
-      1163, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
-      1159, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
-      1170, /* GL_POST_COLOR_MATRIX_RED_BIAS */
-      1166, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
-      1161, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
-      1157, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
-      1605, /* GL_TEXTURE_COLOR_TABLE_SGI */
-      1247, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
-      1607, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+       842, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
+      1174, /* GL_POST_COLOR_MATRIX_RED_SCALE */
+      1170, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
+      1165, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
+      1161, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
+      1172, /* GL_POST_COLOR_MATRIX_RED_BIAS */
+      1168, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
+      1163, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
+      1159, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
+      1607, /* GL_TEXTURE_COLOR_TABLE_SGI */
+      1249, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
+      1609, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
         79, /* GL_BLEND_DST_RGB */
         88, /* GL_BLEND_SRC_RGB */
         78, /* GL_BLEND_DST_ALPHA */
         87, /* GL_BLEND_SRC_ALPHA */
        198, /* GL_COLOR_TABLE */
-      1182, /* GL_POST_CONVOLUTION_COLOR_TABLE */
-      1165, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
-      1235, /* GL_PROXY_COLOR_TABLE */
-      1239, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
-      1238, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
+      1184, /* GL_POST_CONVOLUTION_COLOR_TABLE */
+      1167, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
+      1237, /* GL_PROXY_COLOR_TABLE */
+      1241, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
+      1240, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
        222, /* GL_COLOR_TABLE_SCALE */
        202, /* GL_COLOR_TABLE_BIAS */
        207, /* GL_COLOR_TABLE_FORMAT */
@@ -4295,667 +4299,667 @@ static const unsigned reduced_enums[1319] =
        213, /* GL_COLOR_TABLE_INTENSITY_SIZE */
         70, /* GL_BGR */
         71, /* GL_BGRA */
-       854, /* GL_MAX_ELEMENTS_VERTICES */
-       853, /* GL_MAX_ELEMENTS_INDICES */
-      1659, /* GL_TEXTURE_INDEX_SIZE_EXT */
+       856, /* GL_MAX_ELEMENTS_VERTICES */
+       855, /* GL_MAX_ELEMENTS_INDICES */
+      1661, /* GL_TEXTURE_INDEX_SIZE_EXT */
        142, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
-      1129, /* GL_POINT_SIZE_MIN */
-      1125, /* GL_POINT_SIZE_MAX */
-      1119, /* GL_POINT_FADE_THRESHOLD_SIZE */
-      1115, /* GL_POINT_DISTANCE_ATTENUATION */
+      1131, /* GL_POINT_SIZE_MIN */
+      1127, /* GL_POINT_SIZE_MAX */
+      1121, /* GL_POINT_FADE_THRESHOLD_SIZE */
+      1117, /* GL_POINT_DISTANCE_ATTENUATION */
        124, /* GL_CLAMP_TO_BORDER */
        127, /* GL_CLAMP_TO_EDGE */
-      1680, /* GL_TEXTURE_MIN_LOD */
-      1678, /* GL_TEXTURE_MAX_LOD */
-      1584, /* GL_TEXTURE_BASE_LEVEL */
-      1677, /* GL_TEXTURE_MAX_LEVEL */
-       608, /* GL_IGNORE_BORDER_HP */
+      1682, /* GL_TEXTURE_MIN_LOD */
+      1680, /* GL_TEXTURE_MAX_LOD */
+      1586, /* GL_TEXTURE_BASE_LEVEL */
+      1679, /* GL_TEXTURE_MAX_LEVEL */
+       610, /* GL_IGNORE_BORDER_HP */
        272, /* GL_CONSTANT_BORDER_HP */
-      1305, /* GL_REPLICATE_BORDER_HP */
+      1307, /* GL_REPLICATE_BORDER_HP */
        278, /* GL_CONVOLUTION_BORDER_COLOR */
-      1026, /* GL_OCCLUSION_TEST_HP */
-      1027, /* GL_OCCLUSION_TEST_RESULT_HP */
-       679, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
-      1599, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-      1601, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-      1603, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-      1604, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-      1602, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-      1600, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
-       836, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
-       837, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-      1192, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
-      1194, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
-      1191, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
-      1193, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
-      1667, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-      1668, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-      1666, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
-       578, /* GL_GENERATE_MIPMAP */
-       579, /* GL_GENERATE_MIPMAP_HINT */
-       520, /* GL_FOG_OFFSET_SGIX */
-       521, /* GL_FOG_OFFSET_VALUE_SGIX */
-      1613, /* GL_TEXTURE_COMPARE_SGIX */
-      1612, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-      1663, /* GL_TEXTURE_LEQUAL_R_SGIX */
-      1655, /* GL_TEXTURE_GEQUAL_R_SGIX */
-       352, /* GL_DEPTH_COMPONENT16 */
-       355, /* GL_DEPTH_COMPONENT24 */
-       358, /* GL_DEPTH_COMPONENT32 */
-       300, /* GL_CULL_VERTEX_EXT */
-       302, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
-       301, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
-      1811, /* GL_WRAP_BORDER_SUN */
-      1606, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
-       672, /* GL_LIGHT_MODEL_COLOR_CONTROL */
-      1403, /* GL_SINGLE_COLOR */
-      1390, /* GL_SEPARATE_SPECULAR_COLOR */
-      1399, /* GL_SHARED_TEXTURE_PALETTE_EXT */
-       531, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
-       532, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
-       539, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
-       534, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
-       530, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
-       529, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
-       533, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
-       540, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
-       551, /* GL_FRAMEBUFFER_DEFAULT */
-       564, /* GL_FRAMEBUFFER_UNDEFINED */
-       365, /* GL_DEPTH_STENCIL_ATTACHMENT */
-       614, /* GL_INDEX */
-      1723, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-      1738, /* GL_UNSIGNED_SHORT_5_6_5 */
-      1739, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-      1736, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-      1734, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-      1731, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-      1729, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-      1675, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-      1676, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-      1674, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
-       928, /* GL_MIRRORED_REPEAT */
-      1346, /* GL_RGB_S3TC */
-      1321, /* GL_RGB4_S3TC */
-      1344, /* GL_RGBA_S3TC */
-      1338, /* GL_RGBA4_S3TC */
-      1342, /* GL_RGBA_DXT5_S3TC */
-      1336, /* GL_RGBA4_DXT5_S3TC */
+      1028, /* GL_OCCLUSION_TEST_HP */
+      1029, /* GL_OCCLUSION_TEST_RESULT_HP */
+       681, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
+      1601, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
+      1603, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
+      1605, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
+      1606, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+      1604, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
+      1602, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
+       838, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
+       839, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+      1194, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
+      1196, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
+      1193, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
+      1195, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
+      1669, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+      1670, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+      1668, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+       580, /* GL_GENERATE_MIPMAP */
+       581, /* GL_GENERATE_MIPMAP_HINT */
+       522, /* GL_FOG_OFFSET_SGIX */
+       523, /* GL_FOG_OFFSET_VALUE_SGIX */
+      1615, /* GL_TEXTURE_COMPARE_SGIX */
+      1614, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
+      1665, /* GL_TEXTURE_LEQUAL_R_SGIX */
+      1657, /* GL_TEXTURE_GEQUAL_R_SGIX */
+       354, /* GL_DEPTH_COMPONENT16 */
+       357, /* GL_DEPTH_COMPONENT24 */
+       360, /* GL_DEPTH_COMPONENT32 */
+       302, /* GL_CULL_VERTEX_EXT */
+       304, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
+       303, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
+      1813, /* GL_WRAP_BORDER_SUN */
+      1608, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
+       674, /* GL_LIGHT_MODEL_COLOR_CONTROL */
+      1405, /* GL_SINGLE_COLOR */
+      1392, /* GL_SEPARATE_SPECULAR_COLOR */
+      1401, /* GL_SHARED_TEXTURE_PALETTE_EXT */
+       533, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
+       534, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
+       541, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
+       536, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
+       532, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
+       531, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
+       535, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
+       542, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
+       553, /* GL_FRAMEBUFFER_DEFAULT */
+       566, /* GL_FRAMEBUFFER_UNDEFINED */
+       367, /* GL_DEPTH_STENCIL_ATTACHMENT */
+       616, /* GL_INDEX */
+      1725, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+      1740, /* GL_UNSIGNED_SHORT_5_6_5 */
+      1741, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+      1738, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+      1736, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+      1733, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+      1731, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+      1677, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+      1678, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+      1676, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+       930, /* GL_MIRRORED_REPEAT */
+      1348, /* GL_RGB_S3TC */
+      1323, /* GL_RGB4_S3TC */
+      1346, /* GL_RGBA_S3TC */
+      1340, /* GL_RGBA4_S3TC */
+      1344, /* GL_RGBA_DXT5_S3TC */
+      1338, /* GL_RGBA4_DXT5_S3TC */
        261, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
        256, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
        257, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
        258, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */
-       989, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
-       988, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
-       680, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
-       507, /* GL_FOG_COORDINATE_SOURCE */
-       499, /* GL_FOG_COORD */
-       523, /* GL_FRAGMENT_DEPTH */
-       306, /* GL_CURRENT_FOG_COORD */
-       506, /* GL_FOG_COORDINATE_ARRAY_TYPE */
-       505, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
-       504, /* GL_FOG_COORDINATE_ARRAY_POINTER */
-       501, /* GL_FOG_COORDINATE_ARRAY */
+       991, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
+       990, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
+       682, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
+       509, /* GL_FOG_COORDINATE_SOURCE */
+       501, /* GL_FOG_COORD */
+       525, /* GL_FRAGMENT_DEPTH */
+       308, /* GL_CURRENT_FOG_COORD */
+       508, /* GL_FOG_COORDINATE_ARRAY_TYPE */
+       507, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
+       506, /* GL_FOG_COORDINATE_ARRAY_POINTER */
+       503, /* GL_FOG_COORDINATE_ARRAY */
        196, /* GL_COLOR_SUM */
-       326, /* GL_CURRENT_SECONDARY_COLOR */
-      1383, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
-      1385, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
-      1384, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
-      1382, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
-      1379, /* GL_SECONDARY_COLOR_ARRAY */
-       324, /* GL_CURRENT_RASTER_SECONDARY_COLOR */
+       328, /* GL_CURRENT_SECONDARY_COLOR */
+      1385, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
+      1387, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
+      1386, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
+      1384, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
+      1381, /* GL_SECONDARY_COLOR_ARRAY */
+       326, /* GL_CURRENT_RASTER_SECONDARY_COLOR */
         28, /* GL_ALIASED_POINT_SIZE_RANGE */
         27, /* GL_ALIASED_LINE_WIDTH_RANGE */
-      1513, /* GL_TEXTURE0 */
-      1515, /* GL_TEXTURE1 */
-      1537, /* GL_TEXTURE2 */
-      1559, /* GL_TEXTURE3 */
-      1565, /* GL_TEXTURE4 */
-      1567, /* GL_TEXTURE5 */
-      1569, /* GL_TEXTURE6 */
-      1571, /* GL_TEXTURE7 */
-      1573, /* GL_TEXTURE8 */
-      1575, /* GL_TEXTURE9 */
-      1516, /* GL_TEXTURE10 */
-      1518, /* GL_TEXTURE11 */
-      1520, /* GL_TEXTURE12 */
-      1522, /* GL_TEXTURE13 */
-      1524, /* GL_TEXTURE14 */
-      1526, /* GL_TEXTURE15 */
-      1528, /* GL_TEXTURE16 */
-      1530, /* GL_TEXTURE17 */
-      1532, /* GL_TEXTURE18 */
-      1534, /* GL_TEXTURE19 */
-      1538, /* GL_TEXTURE20 */
-      1540, /* GL_TEXTURE21 */
-      1542, /* GL_TEXTURE22 */
-      1544, /* GL_TEXTURE23 */
-      1546, /* GL_TEXTURE24 */
-      1548, /* GL_TEXTURE25 */
-      1550, /* GL_TEXTURE26 */
-      1552, /* GL_TEXTURE27 */
-      1554, /* GL_TEXTURE28 */
-      1556, /* GL_TEXTURE29 */
-      1560, /* GL_TEXTURE30 */
-      1562, /* GL_TEXTURE31 */
+      1515, /* GL_TEXTURE0 */
+      1517, /* GL_TEXTURE1 */
+      1539, /* GL_TEXTURE2 */
+      1561, /* GL_TEXTURE3 */
+      1567, /* GL_TEXTURE4 */
+      1569, /* GL_TEXTURE5 */
+      1571, /* GL_TEXTURE6 */
+      1573, /* GL_TEXTURE7 */
+      1575, /* GL_TEXTURE8 */
+      1577, /* GL_TEXTURE9 */
+      1518, /* GL_TEXTURE10 */
+      1520, /* GL_TEXTURE11 */
+      1522, /* GL_TEXTURE12 */
+      1524, /* GL_TEXTURE13 */
+      1526, /* GL_TEXTURE14 */
+      1528, /* GL_TEXTURE15 */
+      1530, /* GL_TEXTURE16 */
+      1532, /* GL_TEXTURE17 */
+      1534, /* GL_TEXTURE18 */
+      1536, /* GL_TEXTURE19 */
+      1540, /* GL_TEXTURE20 */
+      1542, /* GL_TEXTURE21 */
+      1544, /* GL_TEXTURE22 */
+      1546, /* GL_TEXTURE23 */
+      1548, /* GL_TEXTURE24 */
+      1550, /* GL_TEXTURE25 */
+      1552, /* GL_TEXTURE26 */
+      1554, /* GL_TEXTURE27 */
+      1556, /* GL_TEXTURE28 */
+      1558, /* GL_TEXTURE29 */
+      1562, /* GL_TEXTURE30 */
+      1564, /* GL_TEXTURE31 */
         18, /* GL_ACTIVE_TEXTURE */
        130, /* GL_CLIENT_ACTIVE_TEXTURE */
-       906, /* GL_MAX_TEXTURE_UNITS */
-      1702, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-      1705, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-      1707, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-      1699, /* GL_TRANSPOSE_COLOR_MATRIX */
-      1501, /* GL_SUBTRACT */
-       894, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
+       908, /* GL_MAX_TEXTURE_UNITS */
+      1704, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+      1707, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+      1709, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+      1701, /* GL_TRANSPOSE_COLOR_MATRIX */
+      1503, /* GL_SUBTRACT */
+       896, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
        244, /* GL_COMPRESSED_ALPHA */
        248, /* GL_COMPRESSED_LUMINANCE */
        249, /* GL_COMPRESSED_LUMINANCE_ALPHA */
        246, /* GL_COMPRESSED_INTENSITY */
        252, /* GL_COMPRESSED_RGB */
        253, /* GL_COMPRESSED_RGBA */
-      1620, /* GL_TEXTURE_COMPRESSION_HINT */
-      1682, /* GL_TEXTURE_RECTANGLE_ARB */
-      1592, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
-      1250, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
-       892, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
-       364, /* GL_DEPTH_STENCIL */
-      1727, /* GL_UNSIGNED_INT_24_8 */
-       902, /* GL_MAX_TEXTURE_LOD_BIAS */
-      1673, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
-       903, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
-      1649, /* GL_TEXTURE_FILTER_CONTROL */
-      1664, /* GL_TEXTURE_LOD_BIAS */
+      1622, /* GL_TEXTURE_COMPRESSION_HINT */
+      1684, /* GL_TEXTURE_RECTANGLE_ARB */
+      1594, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
+      1252, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
+       894, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
+       366, /* GL_DEPTH_STENCIL */
+      1729, /* GL_UNSIGNED_INT_24_8 */
+       904, /* GL_MAX_TEXTURE_LOD_BIAS */
+      1675, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+       905, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
+      1651, /* GL_TEXTURE_FILTER_CONTROL */
+      1666, /* GL_TEXTURE_LOD_BIAS */
        229, /* GL_COMBINE4 */
-       896, /* GL_MAX_SHININESS_NV */
-       897, /* GL_MAX_SPOT_EXPONENT_NV */
-       612, /* GL_INCR_WRAP */
-       337, /* GL_DECR_WRAP */
-       948, /* GL_MODELVIEW1_ARB */
-      1004, /* GL_NORMAL_MAP */
-      1280, /* GL_REFLECTION_MAP */
-      1629, /* GL_TEXTURE_CUBE_MAP */
-      1590, /* GL_TEXTURE_BINDING_CUBE_MAP */
-      1637, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-      1631, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-      1639, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-      1633, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-      1641, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-      1635, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
-      1248, /* GL_PROXY_TEXTURE_CUBE_MAP */
-       848, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
-       983, /* GL_MULTISAMPLE_FILTER_HINT_NV */
-       515, /* GL_FOG_DISTANCE_MODE_NV */
-       468, /* GL_EYE_RADIAL_NV */
-       467, /* GL_EYE_PLANE_ABSOLUTE_NV */
+       898, /* GL_MAX_SHININESS_NV */
+       899, /* GL_MAX_SPOT_EXPONENT_NV */
+       614, /* GL_INCR_WRAP */
+       339, /* GL_DECR_WRAP */
+       950, /* GL_MODELVIEW1_ARB */
+      1006, /* GL_NORMAL_MAP */
+      1282, /* GL_REFLECTION_MAP */
+      1631, /* GL_TEXTURE_CUBE_MAP */
+      1592, /* GL_TEXTURE_BINDING_CUBE_MAP */
+      1639, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
+      1633, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
+      1641, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
+      1635, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
+      1643, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
+      1637, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
+      1250, /* GL_PROXY_TEXTURE_CUBE_MAP */
+       850, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
+       985, /* GL_MULTISAMPLE_FILTER_HINT_NV */
+       517, /* GL_FOG_DISTANCE_MODE_NV */
+       470, /* GL_EYE_RADIAL_NV */
+       469, /* GL_EYE_PLANE_ABSOLUTE_NV */
        228, /* GL_COMBINE */
        235, /* GL_COMBINE_RGB */
        230, /* GL_COMBINE_ALPHA */
-      1347, /* GL_RGB_SCALE */
+      1349, /* GL_RGB_SCALE */
         24, /* GL_ADD_SIGNED */
-       640, /* GL_INTERPOLATE */
+       642, /* GL_INTERPOLATE */
        267, /* GL_CONSTANT */
-      1198, /* GL_PRIMARY_COLOR */
-      1195, /* GL_PREVIOUS */
-      1418, /* GL_SOURCE0_RGB */
-      1424, /* GL_SOURCE1_RGB */
-      1430, /* GL_SOURCE2_RGB */
-      1434, /* GL_SOURCE3_RGB_NV */
-      1415, /* GL_SOURCE0_ALPHA */
-      1421, /* GL_SOURCE1_ALPHA */
-      1427, /* GL_SOURCE2_ALPHA */
-      1433, /* GL_SOURCE3_ALPHA_NV */
-      1040, /* GL_OPERAND0_RGB */
-      1046, /* GL_OPERAND1_RGB */
-      1052, /* GL_OPERAND2_RGB */
-      1056, /* GL_OPERAND3_RGB_NV */
-      1037, /* GL_OPERAND0_ALPHA */
-      1043, /* GL_OPERAND1_ALPHA */
-      1049, /* GL_OPERAND2_ALPHA */
-      1055, /* GL_OPERAND3_ALPHA_NV */
-      1751, /* GL_VERTEX_ARRAY_BINDING_APPLE */
-      1815, /* GL_YCBCR_422_APPLE */
-      1740, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-      1742, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-      1405, /* GL_SLICE_ACCUM_SUN */
-      1255, /* GL_QUAD_MESH_SUN */
-      1711, /* GL_TRIANGLE_MESH_SUN */
-      1789, /* GL_VERTEX_PROGRAM_ARB */
-      1800, /* GL_VERTEX_STATE_PROGRAM_NV */
-      1776, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-      1782, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-      1784, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-      1786, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
-       328, /* GL_CURRENT_VERTEX_ATTRIB */
-      1211, /* GL_PROGRAM_LENGTH_ARB */
-      1225, /* GL_PROGRAM_STRING_ARB */
-       970, /* GL_MODELVIEW_PROJECTION_NV */
-       607, /* GL_IDENTITY_NV */
-       654, /* GL_INVERSE_NV */
-      1704, /* GL_TRANSPOSE_NV */
-       655, /* GL_INVERSE_TRANSPOSE_NV */
-       878, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
-       877, /* GL_MAX_PROGRAM_MATRICES_ARB */
-       785, /* GL_MATRIX0_NV */
-       797, /* GL_MATRIX1_NV */
-       809, /* GL_MATRIX2_NV */
-       813, /* GL_MATRIX3_NV */
-       815, /* GL_MATRIX4_NV */
-       817, /* GL_MATRIX5_NV */
-       819, /* GL_MATRIX6_NV */
-       821, /* GL_MATRIX7_NV */
-       312, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
-       309, /* GL_CURRENT_MATRIX_ARB */
-      1792, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-      1795, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-      1223, /* GL_PROGRAM_PARAMETER_NV */
-      1780, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-      1227, /* GL_PROGRAM_TARGET_NV */
-      1224, /* GL_PROGRAM_RESIDENT_NV */
-      1696, /* GL_TRACK_MATRIX_NV */
-      1697, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-      1790, /* GL_VERTEX_PROGRAM_BINDING_NV */
-      1205, /* GL_PROGRAM_ERROR_POSITION_ARB */
-       349, /* GL_DEPTH_CLAMP_NV */
-      1758, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-      1765, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-      1766, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-      1767, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-      1768, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-      1769, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-      1770, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-      1771, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-      1772, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-      1773, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-      1759, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-      1760, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-      1761, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-      1762, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-      1763, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-      1764, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
-       739, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
-       746, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
-       747, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
-       748, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
-       749, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
-       750, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
-       751, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
-       752, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
-       753, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
-       754, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
-       740, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
-       741, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
-       742, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
-       743, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
-       744, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
-       745, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
-       766, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
-       773, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
-       774, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
-       775, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
-       776, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
-       777, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
-       778, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
-      1204, /* GL_PROGRAM_BINDING_ARB */
-       780, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
-       781, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
-       767, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
-       768, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
-       769, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
-       770, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
-       771, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
-       772, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
-      1618, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-      1615, /* GL_TEXTURE_COMPRESSED */
-      1009, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
+      1200, /* GL_PRIMARY_COLOR */
+      1197, /* GL_PREVIOUS */
+      1420, /* GL_SOURCE0_RGB */
+      1426, /* GL_SOURCE1_RGB */
+      1432, /* GL_SOURCE2_RGB */
+      1436, /* GL_SOURCE3_RGB_NV */
+      1417, /* GL_SOURCE0_ALPHA */
+      1423, /* GL_SOURCE1_ALPHA */
+      1429, /* GL_SOURCE2_ALPHA */
+      1435, /* GL_SOURCE3_ALPHA_NV */
+      1042, /* GL_OPERAND0_RGB */
+      1048, /* GL_OPERAND1_RGB */
+      1054, /* GL_OPERAND2_RGB */
+      1058, /* GL_OPERAND3_RGB_NV */
+      1039, /* GL_OPERAND0_ALPHA */
+      1045, /* GL_OPERAND1_ALPHA */
+      1051, /* GL_OPERAND2_ALPHA */
+      1057, /* GL_OPERAND3_ALPHA_NV */
+      1753, /* GL_VERTEX_ARRAY_BINDING_APPLE */
+      1817, /* GL_YCBCR_422_APPLE */
+      1742, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+      1744, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+      1407, /* GL_SLICE_ACCUM_SUN */
+      1257, /* GL_QUAD_MESH_SUN */
+      1713, /* GL_TRIANGLE_MESH_SUN */
+      1791, /* GL_VERTEX_PROGRAM_ARB */
+      1802, /* GL_VERTEX_STATE_PROGRAM_NV */
+      1778, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+      1784, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+      1786, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+      1788, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+       330, /* GL_CURRENT_VERTEX_ATTRIB */
+      1213, /* GL_PROGRAM_LENGTH_ARB */
+      1227, /* GL_PROGRAM_STRING_ARB */
+       972, /* GL_MODELVIEW_PROJECTION_NV */
+       609, /* GL_IDENTITY_NV */
+       656, /* GL_INVERSE_NV */
+      1706, /* GL_TRANSPOSE_NV */
+       657, /* GL_INVERSE_TRANSPOSE_NV */
+       880, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
+       879, /* GL_MAX_PROGRAM_MATRICES_ARB */
+       787, /* GL_MATRIX0_NV */
+       799, /* GL_MATRIX1_NV */
+       811, /* GL_MATRIX2_NV */
+       815, /* GL_MATRIX3_NV */
+       817, /* GL_MATRIX4_NV */
+       819, /* GL_MATRIX5_NV */
+       821, /* GL_MATRIX6_NV */
+       823, /* GL_MATRIX7_NV */
+       314, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
+       311, /* GL_CURRENT_MATRIX_ARB */
+      1794, /* GL_VERTEX_PROGRAM_POINT_SIZE */
+      1797, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+      1225, /* GL_PROGRAM_PARAMETER_NV */
+      1782, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+      1229, /* GL_PROGRAM_TARGET_NV */
+      1226, /* GL_PROGRAM_RESIDENT_NV */
+      1698, /* GL_TRACK_MATRIX_NV */
+      1699, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+      1792, /* GL_VERTEX_PROGRAM_BINDING_NV */
+      1207, /* GL_PROGRAM_ERROR_POSITION_ARB */
+       351, /* GL_DEPTH_CLAMP_NV */
+      1760, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+      1767, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+      1768, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+      1769, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+      1770, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+      1771, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+      1772, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+      1773, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+      1774, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+      1775, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+      1761, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+      1762, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+      1763, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+      1764, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+      1765, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+      1766, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+       741, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
+       748, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
+       749, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
+       750, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
+       751, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
+       752, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
+       753, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
+       754, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
+       755, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
+       756, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
+       742, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
+       743, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
+       744, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
+       745, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
+       746, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
+       747, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
+       768, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
+       775, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
+       776, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
+       777, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
+       778, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
+       779, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
+       780, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
+      1206, /* GL_PROGRAM_BINDING_ARB */
+       782, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
+       783, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
+       769, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
+       770, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
+       771, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
+       772, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
+       773, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
+       774, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
+      1620, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
+      1617, /* GL_TEXTURE_COMPRESSED */
+      1011, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
        266, /* GL_COMPRESSED_TEXTURE_FORMATS */
-       918, /* GL_MAX_VERTEX_UNITS_ARB */
+       920, /* GL_MAX_VERTEX_UNITS_ARB */
         22, /* GL_ACTIVE_VERTEX_UNITS_ARB */
-      1810, /* GL_WEIGHT_SUM_UNITY_ARB */
-      1788, /* GL_VERTEX_BLEND_ARB */
-       330, /* GL_CURRENT_WEIGHT_ARB */
-      1809, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-      1808, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-      1807, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-      1806, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-      1803, /* GL_WEIGHT_ARRAY_ARB */
-       377, /* GL_DOT3_RGB */
-       378, /* GL_DOT3_RGBA */
+      1812, /* GL_WEIGHT_SUM_UNITY_ARB */
+      1790, /* GL_VERTEX_BLEND_ARB */
+       332, /* GL_CURRENT_WEIGHT_ARB */
+      1811, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+      1810, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+      1809, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+      1808, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+      1805, /* GL_WEIGHT_ARRAY_ARB */
+       379, /* GL_DOT3_RGB */
+       380, /* GL_DOT3_RGBA */
        260, /* GL_COMPRESSED_RGB_FXT1_3DFX */
        255, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
-       978, /* GL_MULTISAMPLE_3DFX */
-      1368, /* GL_SAMPLE_BUFFERS_3DFX */
-      1359, /* GL_SAMPLES_3DFX */
-       959, /* GL_MODELVIEW2_ARB */
-       962, /* GL_MODELVIEW3_ARB */
-       963, /* GL_MODELVIEW4_ARB */
-       964, /* GL_MODELVIEW5_ARB */
-       965, /* GL_MODELVIEW6_ARB */
-       966, /* GL_MODELVIEW7_ARB */
-       967, /* GL_MODELVIEW8_ARB */
-       968, /* GL_MODELVIEW9_ARB */
-       938, /* GL_MODELVIEW10_ARB */
-       939, /* GL_MODELVIEW11_ARB */
-       940, /* GL_MODELVIEW12_ARB */
-       941, /* GL_MODELVIEW13_ARB */
-       942, /* GL_MODELVIEW14_ARB */
-       943, /* GL_MODELVIEW15_ARB */
-       944, /* GL_MODELVIEW16_ARB */
-       945, /* GL_MODELVIEW17_ARB */
-       946, /* GL_MODELVIEW18_ARB */
-       947, /* GL_MODELVIEW19_ARB */
-       949, /* GL_MODELVIEW20_ARB */
-       950, /* GL_MODELVIEW21_ARB */
-       951, /* GL_MODELVIEW22_ARB */
-       952, /* GL_MODELVIEW23_ARB */
-       953, /* GL_MODELVIEW24_ARB */
-       954, /* GL_MODELVIEW25_ARB */
-       955, /* GL_MODELVIEW26_ARB */
-       956, /* GL_MODELVIEW27_ARB */
-       957, /* GL_MODELVIEW28_ARB */
-       958, /* GL_MODELVIEW29_ARB */
-       960, /* GL_MODELVIEW30_ARB */
-       961, /* GL_MODELVIEW31_ARB */
-       382, /* GL_DOT3_RGB_EXT */
-       380, /* GL_DOT3_RGBA_EXT */
-       932, /* GL_MIRROR_CLAMP_EXT */
-       935, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
-       973, /* GL_MODULATE_ADD_ATI */
-       974, /* GL_MODULATE_SIGNED_ADD_ATI */
-       975, /* GL_MODULATE_SUBTRACT_ATI */
-      1816, /* GL_YCBCR_MESA */
-      1064, /* GL_PACK_INVERT_MESA */
-       333, /* GL_DEBUG_OBJECT_MESA */
-       334, /* GL_DEBUG_PRINT_MESA */
-       332, /* GL_DEBUG_ASSERT_MESA */
+       980, /* GL_MULTISAMPLE_3DFX */
+      1370, /* GL_SAMPLE_BUFFERS_3DFX */
+      1361, /* GL_SAMPLES_3DFX */
+       961, /* GL_MODELVIEW2_ARB */
+       964, /* GL_MODELVIEW3_ARB */
+       965, /* GL_MODELVIEW4_ARB */
+       966, /* GL_MODELVIEW5_ARB */
+       967, /* GL_MODELVIEW6_ARB */
+       968, /* GL_MODELVIEW7_ARB */
+       969, /* GL_MODELVIEW8_ARB */
+       970, /* GL_MODELVIEW9_ARB */
+       940, /* GL_MODELVIEW10_ARB */
+       941, /* GL_MODELVIEW11_ARB */
+       942, /* GL_MODELVIEW12_ARB */
+       943, /* GL_MODELVIEW13_ARB */
+       944, /* GL_MODELVIEW14_ARB */
+       945, /* GL_MODELVIEW15_ARB */
+       946, /* GL_MODELVIEW16_ARB */
+       947, /* GL_MODELVIEW17_ARB */
+       948, /* GL_MODELVIEW18_ARB */
+       949, /* GL_MODELVIEW19_ARB */
+       951, /* GL_MODELVIEW20_ARB */
+       952, /* GL_MODELVIEW21_ARB */
+       953, /* GL_MODELVIEW22_ARB */
+       954, /* GL_MODELVIEW23_ARB */
+       955, /* GL_MODELVIEW24_ARB */
+       956, /* GL_MODELVIEW25_ARB */
+       957, /* GL_MODELVIEW26_ARB */
+       958, /* GL_MODELVIEW27_ARB */
+       959, /* GL_MODELVIEW28_ARB */
+       960, /* GL_MODELVIEW29_ARB */
+       962, /* GL_MODELVIEW30_ARB */
+       963, /* GL_MODELVIEW31_ARB */
+       384, /* GL_DOT3_RGB_EXT */
+       382, /* GL_DOT3_RGBA_EXT */
+       934, /* GL_MIRROR_CLAMP_EXT */
+       937, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
+       975, /* GL_MODULATE_ADD_ATI */
+       976, /* GL_MODULATE_SIGNED_ADD_ATI */
+       977, /* GL_MODULATE_SUBTRACT_ATI */
+      1818, /* GL_YCBCR_MESA */
+      1066, /* GL_PACK_INVERT_MESA */
+       335, /* GL_DEBUG_OBJECT_MESA */
+       336, /* GL_DEBUG_PRINT_MESA */
+       334, /* GL_DEBUG_ASSERT_MESA */
        107, /* GL_BUFFER_SIZE */
        109, /* GL_BUFFER_USAGE */
        113, /* GL_BUMP_ROT_MATRIX_ATI */
        114, /* GL_BUMP_ROT_MATRIX_SIZE_ATI */
        112, /* GL_BUMP_NUM_TEX_UNITS_ATI */
        116, /* GL_BUMP_TEX_UNITS_ATI */
-       441, /* GL_DUDV_ATI */
-       440, /* GL_DU8DV8_ATI */
+       443, /* GL_DUDV_ATI */
+       442, /* GL_DU8DV8_ATI */
        111, /* GL_BUMP_ENVMAP_ATI */
        115, /* GL_BUMP_TARGET_ATI */
-      1466, /* GL_STENCIL_BACK_FUNC */
-      1464, /* GL_STENCIL_BACK_FAIL */
-      1468, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-      1470, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
-       524, /* GL_FRAGMENT_PROGRAM_ARB */
-      1202, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
-      1230, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
-      1229, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
-      1214, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-      1220, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-      1219, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-       867, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
-       890, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
-       889, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
-       880, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-       886, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-       885, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-       850, /* GL_MAX_DRAW_BUFFERS */
-       386, /* GL_DRAW_BUFFER0 */
-       389, /* GL_DRAW_BUFFER1 */
-       410, /* GL_DRAW_BUFFER2 */
-       413, /* GL_DRAW_BUFFER3 */
-       416, /* GL_DRAW_BUFFER4 */
-       419, /* GL_DRAW_BUFFER5 */
-       422, /* GL_DRAW_BUFFER6 */
-       425, /* GL_DRAW_BUFFER7 */
-       428, /* GL_DRAW_BUFFER8 */
-       431, /* GL_DRAW_BUFFER9 */
-       390, /* GL_DRAW_BUFFER10 */
-       393, /* GL_DRAW_BUFFER11 */
-       396, /* GL_DRAW_BUFFER12 */
-       399, /* GL_DRAW_BUFFER13 */
-       402, /* GL_DRAW_BUFFER14 */
-       405, /* GL_DRAW_BUFFER15 */
+      1468, /* GL_STENCIL_BACK_FUNC */
+      1466, /* GL_STENCIL_BACK_FAIL */
+      1470, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
+      1472, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
+       526, /* GL_FRAGMENT_PROGRAM_ARB */
+      1204, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
+      1232, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
+      1231, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
+      1216, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+      1222, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+      1221, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+       869, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
+       892, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
+       891, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
+       882, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+       888, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+       887, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+       852, /* GL_MAX_DRAW_BUFFERS */
+       388, /* GL_DRAW_BUFFER0 */
+       391, /* GL_DRAW_BUFFER1 */
+       412, /* GL_DRAW_BUFFER2 */
+       415, /* GL_DRAW_BUFFER3 */
+       418, /* GL_DRAW_BUFFER4 */
+       421, /* GL_DRAW_BUFFER5 */
+       424, /* GL_DRAW_BUFFER6 */
+       427, /* GL_DRAW_BUFFER7 */
+       430, /* GL_DRAW_BUFFER8 */
+       433, /* GL_DRAW_BUFFER9 */
+       392, /* GL_DRAW_BUFFER10 */
+       395, /* GL_DRAW_BUFFER11 */
+       398, /* GL_DRAW_BUFFER12 */
+       401, /* GL_DRAW_BUFFER13 */
+       404, /* GL_DRAW_BUFFER14 */
+       407, /* GL_DRAW_BUFFER15 */
         81, /* GL_BLEND_EQUATION_ALPHA */
-       830, /* GL_MATRIX_PALETTE_ARB */
-       861, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
-       864, /* GL_MAX_PALETTE_MATRICES_ARB */
-       315, /* GL_CURRENT_PALETTE_MATRIX_ARB */
-       824, /* GL_MATRIX_INDEX_ARRAY_ARB */
-       310, /* GL_CURRENT_MATRIX_INDEX_ARB */
-       826, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
-       828, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
-       827, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
-       825, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
-      1644, /* GL_TEXTURE_DEPTH_SIZE */
-       370, /* GL_DEPTH_TEXTURE_MODE */
-      1610, /* GL_TEXTURE_COMPARE_MODE */
-      1608, /* GL_TEXTURE_COMPARE_FUNC */
+       832, /* GL_MATRIX_PALETTE_ARB */
+       863, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
+       866, /* GL_MAX_PALETTE_MATRICES_ARB */
+       317, /* GL_CURRENT_PALETTE_MATRIX_ARB */
+       826, /* GL_MATRIX_INDEX_ARRAY_ARB */
+       312, /* GL_CURRENT_MATRIX_INDEX_ARB */
+       828, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
+       830, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
+       829, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
+       827, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
+      1646, /* GL_TEXTURE_DEPTH_SIZE */
+       372, /* GL_DEPTH_TEXTURE_MODE */
+      1612, /* GL_TEXTURE_COMPARE_MODE */
+      1610, /* GL_TEXTURE_COMPARE_FUNC */
        239, /* GL_COMPARE_R_TO_TEXTURE */
-      1136, /* GL_POINT_SPRITE */
+      1138, /* GL_POINT_SPRITE */
        292, /* GL_COORD_REPLACE */
-      1140, /* GL_POINT_SPRITE_R_MODE_NV */
-      1257, /* GL_QUERY_COUNTER_BITS */
-       317, /* GL_CURRENT_QUERY */
-      1259, /* GL_QUERY_RESULT */
-      1261, /* GL_QUERY_RESULT_AVAILABLE */
-       912, /* GL_MAX_VERTEX_GENERIC_ATTRIBS */
-      1778, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
-       368, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
-       367, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
-       898, /* GL_MAX_TEXTURE_COORDS */
-       900, /* GL_MAX_TEXTURE_IMAGE_UNITS */
-      1207, /* GL_PROGRAM_ERROR_STRING_ARB */
-      1209, /* GL_PROGRAM_FORMAT_ASCII_ARB */
-      1208, /* GL_PROGRAM_FORMAT_ARB */
-      1690, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
-       347, /* GL_DEPTH_BOUNDS_TEST_EXT */
-       346, /* GL_DEPTH_BOUNDS_EXT */
+      1142, /* GL_POINT_SPRITE_R_MODE_NV */
+      1259, /* GL_QUERY_COUNTER_BITS */
+       319, /* GL_CURRENT_QUERY */
+      1261, /* GL_QUERY_RESULT */
+      1263, /* GL_QUERY_RESULT_AVAILABLE */
+       914, /* GL_MAX_VERTEX_ATTRIBS */
+      1780, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+       370, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
+       369, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
+       900, /* GL_MAX_TEXTURE_COORDS */
+       902, /* GL_MAX_TEXTURE_IMAGE_UNITS */
+      1209, /* GL_PROGRAM_ERROR_STRING_ARB */
+      1211, /* GL_PROGRAM_FORMAT_ASCII_ARB */
+      1210, /* GL_PROGRAM_FORMAT_ARB */
+      1692, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+       349, /* GL_DEPTH_BOUNDS_TEST_EXT */
+       348, /* GL_DEPTH_BOUNDS_EXT */
         52, /* GL_ARRAY_BUFFER */
-       454, /* GL_ELEMENT_ARRAY_BUFFER */
+       456, /* GL_ELEMENT_ARRAY_BUFFER */
         53, /* GL_ARRAY_BUFFER_BINDING */
-       455, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
-      1752, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-       999, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
+       457, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
+      1754, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+      1001, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
        146, /* GL_COLOR_ARRAY_BUFFER_BINDING */
-       616, /* GL_INDEX_ARRAY_BUFFER_BINDING */
-      1623, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
-       450, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
-      1380, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
-       502, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
-      1804, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-      1774, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-      1210, /* GL_PROGRAM_INSTRUCTIONS_ARB */
-       873, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
-      1216, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-       882, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-      1228, /* GL_PROGRAM_TEMPORARIES_ARB */
-       888, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
-      1218, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
-       884, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
-      1222, /* GL_PROGRAM_PARAMETERS_ARB */
-       887, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
-      1217, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
-       883, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
-      1203, /* GL_PROGRAM_ATTRIBS_ARB */
-       868, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
-      1215, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
-       881, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
-      1201, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
-       866, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
-      1213, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-       879, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-       874, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
-       870, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
-      1231, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-      1701, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-      1270, /* GL_READ_ONLY */
-      1812, /* GL_WRITE_ONLY */
-      1272, /* GL_READ_WRITE */
+       618, /* GL_INDEX_ARRAY_BUFFER_BINDING */
+      1625, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
+       452, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
+      1382, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
+       504, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
+      1806, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+      1776, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+      1212, /* GL_PROGRAM_INSTRUCTIONS_ARB */
+       875, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
+      1218, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+       884, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+      1230, /* GL_PROGRAM_TEMPORARIES_ARB */
+       890, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
+      1220, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
+       886, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
+      1224, /* GL_PROGRAM_PARAMETERS_ARB */
+       889, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
+      1219, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
+       885, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
+      1205, /* GL_PROGRAM_ATTRIBS_ARB */
+       870, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
+      1217, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
+       883, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
+      1203, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
+       868, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
+      1215, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+       881, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+       876, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
+       872, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
+      1233, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
+      1703, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+      1272, /* GL_READ_ONLY */
+      1814, /* GL_WRITE_ONLY */
+      1274, /* GL_READ_WRITE */
        101, /* GL_BUFFER_ACCESS */
        103, /* GL_BUFFER_MAPPED */
        105, /* GL_BUFFER_MAP_POINTER */
-      1695, /* GL_TIME_ELAPSED_EXT */
-       784, /* GL_MATRIX0_ARB */
-       796, /* GL_MATRIX1_ARB */
-       808, /* GL_MATRIX2_ARB */
-       812, /* GL_MATRIX3_ARB */
-       814, /* GL_MATRIX4_ARB */
-       816, /* GL_MATRIX5_ARB */
-       818, /* GL_MATRIX6_ARB */
-       820, /* GL_MATRIX7_ARB */
-       822, /* GL_MATRIX8_ARB */
-       823, /* GL_MATRIX9_ARB */
-       786, /* GL_MATRIX10_ARB */
-       787, /* GL_MATRIX11_ARB */
-       788, /* GL_MATRIX12_ARB */
-       789, /* GL_MATRIX13_ARB */
-       790, /* GL_MATRIX14_ARB */
-       791, /* GL_MATRIX15_ARB */
-       792, /* GL_MATRIX16_ARB */
-       793, /* GL_MATRIX17_ARB */
-       794, /* GL_MATRIX18_ARB */
-       795, /* GL_MATRIX19_ARB */
-       798, /* GL_MATRIX20_ARB */
-       799, /* GL_MATRIX21_ARB */
-       800, /* GL_MATRIX22_ARB */
-       801, /* GL_MATRIX23_ARB */
-       802, /* GL_MATRIX24_ARB */
-       803, /* GL_MATRIX25_ARB */
-       804, /* GL_MATRIX26_ARB */
-       805, /* GL_MATRIX27_ARB */
-       806, /* GL_MATRIX28_ARB */
-       807, /* GL_MATRIX29_ARB */
-       810, /* GL_MATRIX30_ARB */
-       811, /* GL_MATRIX31_ARB */
-      1496, /* GL_STREAM_DRAW */
-      1498, /* GL_STREAM_READ */
-      1494, /* GL_STREAM_COPY */
-      1457, /* GL_STATIC_DRAW */
-      1459, /* GL_STATIC_READ */
-      1455, /* GL_STATIC_COPY */
-       444, /* GL_DYNAMIC_DRAW */
-       446, /* GL_DYNAMIC_READ */
-       442, /* GL_DYNAMIC_COPY */
-      1104, /* GL_PIXEL_PACK_BUFFER */
-      1108, /* GL_PIXEL_UNPACK_BUFFER */
-      1105, /* GL_PIXEL_PACK_BUFFER_BINDING */
-      1109, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
-       341, /* GL_DEPTH24_STENCIL8 */
-      1688, /* GL_TEXTURE_STENCIL_SIZE */
-       871, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
-       869, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
-       872, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
-       876, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
-       875, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
-       833, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
-      1490, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
+      1697, /* GL_TIME_ELAPSED_EXT */
+       786, /* GL_MATRIX0_ARB */
+       798, /* GL_MATRIX1_ARB */
+       810, /* GL_MATRIX2_ARB */
+       814, /* GL_MATRIX3_ARB */
+       816, /* GL_MATRIX4_ARB */
+       818, /* GL_MATRIX5_ARB */
+       820, /* GL_MATRIX6_ARB */
+       822, /* GL_MATRIX7_ARB */
+       824, /* GL_MATRIX8_ARB */
+       825, /* GL_MATRIX9_ARB */
+       788, /* GL_MATRIX10_ARB */
+       789, /* GL_MATRIX11_ARB */
+       790, /* GL_MATRIX12_ARB */
+       791, /* GL_MATRIX13_ARB */
+       792, /* GL_MATRIX14_ARB */
+       793, /* GL_MATRIX15_ARB */
+       794, /* GL_MATRIX16_ARB */
+       795, /* GL_MATRIX17_ARB */
+       796, /* GL_MATRIX18_ARB */
+       797, /* GL_MATRIX19_ARB */
+       800, /* GL_MATRIX20_ARB */
+       801, /* GL_MATRIX21_ARB */
+       802, /* GL_MATRIX22_ARB */
+       803, /* GL_MATRIX23_ARB */
+       804, /* GL_MATRIX24_ARB */
+       805, /* GL_MATRIX25_ARB */
+       806, /* GL_MATRIX26_ARB */
+       807, /* GL_MATRIX27_ARB */
+       808, /* GL_MATRIX28_ARB */
+       809, /* GL_MATRIX29_ARB */
+       812, /* GL_MATRIX30_ARB */
+       813, /* GL_MATRIX31_ARB */
+      1498, /* GL_STREAM_DRAW */
+      1500, /* GL_STREAM_READ */
+      1496, /* GL_STREAM_COPY */
+      1459, /* GL_STATIC_DRAW */
+      1461, /* GL_STATIC_READ */
+      1457, /* GL_STATIC_COPY */
+       446, /* GL_DYNAMIC_DRAW */
+       448, /* GL_DYNAMIC_READ */
+       444, /* GL_DYNAMIC_COPY */
+      1106, /* GL_PIXEL_PACK_BUFFER */
+      1110, /* GL_PIXEL_UNPACK_BUFFER */
+      1107, /* GL_PIXEL_PACK_BUFFER_BINDING */
+      1111, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
+       343, /* GL_DEPTH24_STENCIL8 */
+      1690, /* GL_TEXTURE_STENCIL_SIZE */
+       873, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
+       871, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
+       874, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
+       878, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
+       877, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
+       835, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
+      1492, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
         17, /* GL_ACTIVE_STENCIL_FACE_EXT */
-       933, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
-      1361, /* GL_SAMPLES_PASSED */
-       525, /* GL_FRAGMENT_SHADER */
-      1798, /* GL_VERTEX_SHADER */
-      1221, /* GL_PROGRAM_OBJECT_ARB */
-      1393, /* GL_SHADER_OBJECT_ARB */
-       857, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
-       916, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
-       910, /* GL_MAX_VARYING_FLOATS */
-       914, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
-       842, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
-      1024, /* GL_OBJECT_TYPE_ARB */
-      1395, /* GL_SHADER_TYPE */
-       490, /* GL_FLOAT_VEC2 */
-       492, /* GL_FLOAT_VEC3 */
-       494, /* GL_FLOAT_VEC4 */
-       643, /* GL_INT_VEC2 */
-       645, /* GL_INT_VEC3 */
-       647, /* GL_INT_VEC4 */
+       935, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
+      1363, /* GL_SAMPLES_PASSED */
+       527, /* GL_FRAGMENT_SHADER */
+      1800, /* GL_VERTEX_SHADER */
+      1223, /* GL_PROGRAM_OBJECT_ARB */
+      1395, /* GL_SHADER_OBJECT_ARB */
+       859, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
+       918, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
+       912, /* GL_MAX_VARYING_FLOATS */
+       916, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
+       844, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
+      1026, /* GL_OBJECT_TYPE_ARB */
+      1397, /* GL_SHADER_TYPE */
+       492, /* GL_FLOAT_VEC2 */
+       494, /* GL_FLOAT_VEC3 */
+       496, /* GL_FLOAT_VEC4 */
+       645, /* GL_INT_VEC2 */
+       647, /* GL_INT_VEC3 */
+       649, /* GL_INT_VEC4 */
         93, /* GL_BOOL */
         95, /* GL_BOOL_VEC2 */
         97, /* GL_BOOL_VEC3 */
         99, /* GL_BOOL_VEC4 */
-       478, /* GL_FLOAT_MAT2 */
-       482, /* GL_FLOAT_MAT3 */
-       486, /* GL_FLOAT_MAT4 */
-      1352, /* GL_SAMPLER_1D */
-      1354, /* GL_SAMPLER_2D */
-      1356, /* GL_SAMPLER_3D */
-      1357, /* GL_SAMPLER_CUBE */
-      1353, /* GL_SAMPLER_1D_SHADOW */
-      1355, /* GL_SAMPLER_2D_SHADOW */
-       480, /* GL_FLOAT_MAT2x3 */
-       481, /* GL_FLOAT_MAT2x4 */
-       484, /* GL_FLOAT_MAT3x2 */
-       485, /* GL_FLOAT_MAT3x4 */
-       488, /* GL_FLOAT_MAT4x2 */
-       489, /* GL_FLOAT_MAT4x3 */
-       339, /* GL_DELETE_STATUS */
+       480, /* GL_FLOAT_MAT2 */
+       484, /* GL_FLOAT_MAT3 */
+       488, /* GL_FLOAT_MAT4 */
+      1354, /* GL_SAMPLER_1D */
+      1356, /* GL_SAMPLER_2D */
+      1358, /* GL_SAMPLER_3D */
+      1359, /* GL_SAMPLER_CUBE */
+      1355, /* GL_SAMPLER_1D_SHADOW */
+      1357, /* GL_SAMPLER_2D_SHADOW */
+       482, /* GL_FLOAT_MAT2x3 */
+       483, /* GL_FLOAT_MAT2x4 */
+       486, /* GL_FLOAT_MAT3x2 */
+       487, /* GL_FLOAT_MAT3x4 */
+       490, /* GL_FLOAT_MAT4x2 */
+       491, /* GL_FLOAT_MAT4x3 */
+       341, /* GL_DELETE_STATUS */
        243, /* GL_COMPILE_STATUS */
-       697, /* GL_LINK_STATUS */
-      1747, /* GL_VALIDATE_STATUS */
-       628, /* GL_INFO_LOG_LENGTH */
+       699, /* GL_LINK_STATUS */
+      1749, /* GL_VALIDATE_STATUS */
+       630, /* GL_INFO_LOG_LENGTH */
         55, /* GL_ATTACHED_SHADERS */
         20, /* GL_ACTIVE_UNIFORMS */
         21, /* GL_ACTIVE_UNIFORM_MAX_LENGTH */
-      1394, /* GL_SHADER_SOURCE_LENGTH */
+      1396, /* GL_SHADER_SOURCE_LENGTH */
         15, /* GL_ACTIVE_ATTRIBUTES */
         16, /* GL_ACTIVE_ATTRIBUTE_MAX_LENGTH */
-       527, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
-      1397, /* GL_SHADING_LANGUAGE_VERSION */
-       316, /* GL_CURRENT_PROGRAM */
-      1073, /* GL_PALETTE4_RGB8_OES */
-      1075, /* GL_PALETTE4_RGBA8_OES */
-      1071, /* GL_PALETTE4_R5_G6_B5_OES */
-      1074, /* GL_PALETTE4_RGBA4_OES */
-      1072, /* GL_PALETTE4_RGB5_A1_OES */
-      1078, /* GL_PALETTE8_RGB8_OES */
-      1080, /* GL_PALETTE8_RGBA8_OES */
-      1076, /* GL_PALETTE8_R5_G6_B5_OES */
-      1079, /* GL_PALETTE8_RGBA4_OES */
-      1077, /* GL_PALETTE8_RGB5_A1_OES */
-       610, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
-       609, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
-      1732, /* GL_UNSIGNED_NORMALIZED */
-      1578, /* GL_TEXTURE_1D_ARRAY_EXT */
-      1241, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
-      1580, /* GL_TEXTURE_2D_ARRAY_EXT */
-      1244, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
-      1586, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
-      1588, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
-      1449, /* GL_SRGB */
-      1450, /* GL_SRGB8 */
-      1452, /* GL_SRGB_ALPHA */
-      1451, /* GL_SRGB8_ALPHA8 */
-      1409, /* GL_SLUMINANCE_ALPHA */
-      1408, /* GL_SLUMINANCE8_ALPHA8 */
-      1406, /* GL_SLUMINANCE */
-      1407, /* GL_SLUMINANCE8 */
+       529, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
+      1399, /* GL_SHADING_LANGUAGE_VERSION */
+       318, /* GL_CURRENT_PROGRAM */
+      1075, /* GL_PALETTE4_RGB8_OES */
+      1077, /* GL_PALETTE4_RGBA8_OES */
+      1073, /* GL_PALETTE4_R5_G6_B5_OES */
+      1076, /* GL_PALETTE4_RGBA4_OES */
+      1074, /* GL_PALETTE4_RGB5_A1_OES */
+      1080, /* GL_PALETTE8_RGB8_OES */
+      1082, /* GL_PALETTE8_RGBA8_OES */
+      1078, /* GL_PALETTE8_R5_G6_B5_OES */
+      1081, /* GL_PALETTE8_RGBA4_OES */
+      1079, /* GL_PALETTE8_RGB5_A1_OES */
+       612, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
+       611, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
+      1734, /* GL_UNSIGNED_NORMALIZED */
+      1580, /* GL_TEXTURE_1D_ARRAY_EXT */
+      1243, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
+      1582, /* GL_TEXTURE_2D_ARRAY_EXT */
+      1246, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
+      1588, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
+      1590, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
+      1451, /* GL_SRGB */
+      1452, /* GL_SRGB8 */
+      1454, /* GL_SRGB_ALPHA */
+      1453, /* GL_SRGB8_ALPHA8 */
+      1411, /* GL_SLUMINANCE_ALPHA */
+      1410, /* GL_SLUMINANCE8_ALPHA8 */
+      1408, /* GL_SLUMINANCE */
+      1409, /* GL_SLUMINANCE8 */
        264, /* GL_COMPRESSED_SRGB */
        265, /* GL_COMPRESSED_SRGB_ALPHA */
        262, /* GL_COMPRESSED_SLUMINANCE */
        263, /* GL_COMPRESSED_SLUMINANCE_ALPHA */
-      1138, /* GL_POINT_SPRITE_COORD_ORIGIN */
-       705, /* GL_LOWER_LEFT */
-      1744, /* GL_UPPER_LEFT */
-      1472, /* GL_STENCIL_BACK_REF */
-      1473, /* GL_STENCIL_BACK_VALUE_MASK */
-      1474, /* GL_STENCIL_BACK_WRITEMASK */
-       435, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
-      1286, /* GL_RENDERBUFFER_BINDING_EXT */
-      1267, /* GL_READ_FRAMEBUFFER */
-       434, /* GL_DRAW_FRAMEBUFFER */
-      1268, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
-      1296, /* GL_RENDERBUFFER_SAMPLES */
-       537, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
-       535, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
-       546, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
-       542, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
-       544, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
-       549, /* GL_FRAMEBUFFER_COMPLETE */
-       553, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
-       559, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
-       557, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
-       555, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
-       558, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
-       556, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
-       562, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
-       565, /* GL_FRAMEBUFFER_UNSUPPORTED */
-       563, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
-       839, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
+      1140, /* GL_POINT_SPRITE_COORD_ORIGIN */
+       707, /* GL_LOWER_LEFT */
+      1746, /* GL_UPPER_LEFT */
+      1474, /* GL_STENCIL_BACK_REF */
+      1475, /* GL_STENCIL_BACK_VALUE_MASK */
+      1476, /* GL_STENCIL_BACK_WRITEMASK */
+       437, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
+      1288, /* GL_RENDERBUFFER_BINDING_EXT */
+      1269, /* GL_READ_FRAMEBUFFER */
+       436, /* GL_DRAW_FRAMEBUFFER */
+      1270, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
+      1298, /* GL_RENDERBUFFER_SAMPLES */
+       539, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
+       537, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
+       548, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
+       544, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
+       546, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+       551, /* GL_FRAMEBUFFER_COMPLETE */
+       555, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
+       561, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
+       559, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
+       557, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
+       560, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
+       558, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
+       564, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
+       567, /* GL_FRAMEBUFFER_UNSUPPORTED */
+       565, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
+       841, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
        152, /* GL_COLOR_ATTACHMENT0 */
        154, /* GL_COLOR_ATTACHMENT1 */
        168, /* GL_COLOR_ATTACHMENT2 */
@@ -4972,36 +4976,38 @@ static const unsigned reduced_enums[1319] =
        161, /* GL_COLOR_ATTACHMENT13 */
        163, /* GL_COLOR_ATTACHMENT14 */
        165, /* GL_COLOR_ATTACHMENT15 */
-       342, /* GL_DEPTH_ATTACHMENT */
-      1462, /* GL_STENCIL_ATTACHMENT */
-       528, /* GL_FRAMEBUFFER */
-      1284, /* GL_RENDERBUFFER */
-      1298, /* GL_RENDERBUFFER_WIDTH */
-      1291, /* GL_RENDERBUFFER_HEIGHT */
-      1293, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
-      1485, /* GL_STENCIL_INDEX_EXT */
-      1482, /* GL_STENCIL_INDEX1_EXT */
-      1483, /* GL_STENCIL_INDEX4_EXT */
-      1484, /* GL_STENCIL_INDEX8_EXT */
-      1481, /* GL_STENCIL_INDEX16_EXT */
-      1295, /* GL_RENDERBUFFER_RED_SIZE */
-      1290, /* GL_RENDERBUFFER_GREEN_SIZE */
-      1287, /* GL_RENDERBUFFER_BLUE_SIZE */
-      1285, /* GL_RENDERBUFFER_ALPHA_SIZE */
-      1288, /* GL_RENDERBUFFER_DEPTH_SIZE */
-      1297, /* GL_RENDERBUFFER_STENCIL_SIZE */
-       561, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
-       895, /* GL_MAX_SAMPLES */
-      1345, /* GL_RGBA_SNORM */
-      1341, /* GL_RGBA8_SNORM */
-      1402, /* GL_SIGNED_NORMALIZED */
-       461, /* GL_EVAL_BIT */
-      1265, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
-       699, /* GL_LIST_BIT */
-      1594, /* GL_TEXTURE_BIT */
-      1376, /* GL_SCISSOR_BIT */
+       344, /* GL_DEPTH_ATTACHMENT */
+      1464, /* GL_STENCIL_ATTACHMENT */
+       530, /* GL_FRAMEBUFFER */
+      1286, /* GL_RENDERBUFFER */
+      1300, /* GL_RENDERBUFFER_WIDTH */
+      1293, /* GL_RENDERBUFFER_HEIGHT */
+      1295, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
+      1487, /* GL_STENCIL_INDEX_EXT */
+      1484, /* GL_STENCIL_INDEX1_EXT */
+      1485, /* GL_STENCIL_INDEX4_EXT */
+      1486, /* GL_STENCIL_INDEX8_EXT */
+      1483, /* GL_STENCIL_INDEX16_EXT */
+      1297, /* GL_RENDERBUFFER_RED_SIZE */
+      1292, /* GL_RENDERBUFFER_GREEN_SIZE */
+      1289, /* GL_RENDERBUFFER_BLUE_SIZE */
+      1287, /* GL_RENDERBUFFER_ALPHA_SIZE */
+      1290, /* GL_RENDERBUFFER_DEPTH_SIZE */
+      1299, /* GL_RENDERBUFFER_STENCIL_SIZE */
+       563, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
+       897, /* GL_MAX_SAMPLES */
+       298, /* GL_COPY_READ_BUFFER */
+       299, /* GL_COPY_WRITE_BUFFER */
+      1347, /* GL_RGBA_SNORM */
+      1343, /* GL_RGBA8_SNORM */
+      1404, /* GL_SIGNED_NORMALIZED */
+       463, /* GL_EVAL_BIT */
+      1267, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
+       701, /* GL_LIST_BIT */
+      1596, /* GL_TEXTURE_BIT */
+      1378, /* GL_SCISSOR_BIT */
         29, /* GL_ALL_ATTRIB_BITS */
-       980, /* GL_MULTISAMPLE_BIT */
+       982, /* GL_MULTISAMPLE_BIT */
         30, /* GL_ALL_CLIENT_ATTRIB_BITS */
 };
 
diff --git a/src/mesa/sparc/glapi_sparc.S b/src/mesa/sparc/glapi_sparc.S
index 493e094cde..bbc6f6e0ca 100644
--- a/src/mesa/sparc/glapi_sparc.S
+++ b/src/mesa/sparc/glapi_sparc.S
@@ -759,23 +759,24 @@ gl_dispatch_functions_start:
 	GL_STUB(glGetAttribLocationARB, _gloffset_GetAttribLocationARB)
 	GL_STUB(glDrawBuffersARB, _gloffset_DrawBuffersARB)
 	GL_STUB(glRenderbufferStorageMultisample, _gloffset_RenderbufferStorageMultisample)
+	GL_STUB(glCopyBufferSubData, _gloffset_CopyBufferSubData)
 	GL_STUB(glPolygonOffsetEXT, _gloffset_PolygonOffsetEXT)
-	GL_STUB(gl_dispatch_stub_563, _gloffset_GetPixelTexGenParameterfvSGIS)
-	HIDDEN(gl_dispatch_stub_563)
-	GL_STUB(gl_dispatch_stub_564, _gloffset_GetPixelTexGenParameterivSGIS)
+	GL_STUB(gl_dispatch_stub_564, _gloffset_GetPixelTexGenParameterfvSGIS)
 	HIDDEN(gl_dispatch_stub_564)
-	GL_STUB(gl_dispatch_stub_565, _gloffset_PixelTexGenParameterfSGIS)
+	GL_STUB(gl_dispatch_stub_565, _gloffset_GetPixelTexGenParameterivSGIS)
 	HIDDEN(gl_dispatch_stub_565)
-	GL_STUB(gl_dispatch_stub_566, _gloffset_PixelTexGenParameterfvSGIS)
+	GL_STUB(gl_dispatch_stub_566, _gloffset_PixelTexGenParameterfSGIS)
 	HIDDEN(gl_dispatch_stub_566)
-	GL_STUB(gl_dispatch_stub_567, _gloffset_PixelTexGenParameteriSGIS)
+	GL_STUB(gl_dispatch_stub_567, _gloffset_PixelTexGenParameterfvSGIS)
 	HIDDEN(gl_dispatch_stub_567)
-	GL_STUB(gl_dispatch_stub_568, _gloffset_PixelTexGenParameterivSGIS)
+	GL_STUB(gl_dispatch_stub_568, _gloffset_PixelTexGenParameteriSGIS)
 	HIDDEN(gl_dispatch_stub_568)
-	GL_STUB(gl_dispatch_stub_569, _gloffset_SampleMaskSGIS)
+	GL_STUB(gl_dispatch_stub_569, _gloffset_PixelTexGenParameterivSGIS)
 	HIDDEN(gl_dispatch_stub_569)
-	GL_STUB(gl_dispatch_stub_570, _gloffset_SamplePatternSGIS)
+	GL_STUB(gl_dispatch_stub_570, _gloffset_SampleMaskSGIS)
 	HIDDEN(gl_dispatch_stub_570)
+	GL_STUB(gl_dispatch_stub_571, _gloffset_SamplePatternSGIS)
+	HIDDEN(gl_dispatch_stub_571)
 	GL_STUB(glColorPointerEXT, _gloffset_ColorPointerEXT)
 	GL_STUB(glEdgeFlagPointerEXT, _gloffset_EdgeFlagPointerEXT)
 	GL_STUB(glIndexPointerEXT, _gloffset_IndexPointerEXT)
@@ -786,10 +787,10 @@ gl_dispatch_functions_start:
 	GL_STUB(glPointParameterfvEXT, _gloffset_PointParameterfvEXT)
 	GL_STUB(glLockArraysEXT, _gloffset_LockArraysEXT)
 	GL_STUB(glUnlockArraysEXT, _gloffset_UnlockArraysEXT)
-	GL_STUB(gl_dispatch_stub_581, _gloffset_CullParameterdvEXT)
-	HIDDEN(gl_dispatch_stub_581)
-	GL_STUB(gl_dispatch_stub_582, _gloffset_CullParameterfvEXT)
+	GL_STUB(gl_dispatch_stub_582, _gloffset_CullParameterdvEXT)
 	HIDDEN(gl_dispatch_stub_582)
+	GL_STUB(gl_dispatch_stub_583, _gloffset_CullParameterfvEXT)
+	HIDDEN(gl_dispatch_stub_583)
 	GL_STUB(glSecondaryColor3bEXT, _gloffset_SecondaryColor3bEXT)
 	GL_STUB(glSecondaryColor3bvEXT, _gloffset_SecondaryColor3bvEXT)
 	GL_STUB(glSecondaryColor3dEXT, _gloffset_SecondaryColor3dEXT)
@@ -814,8 +815,8 @@ gl_dispatch_functions_start:
 	GL_STUB(glFogCoorddvEXT, _gloffset_FogCoorddvEXT)
 	GL_STUB(glFogCoordfEXT, _gloffset_FogCoordfEXT)
 	GL_STUB(glFogCoordfvEXT, _gloffset_FogCoordfvEXT)
-	GL_STUB(gl_dispatch_stub_607, _gloffset_PixelTexGenSGIX)
-	HIDDEN(gl_dispatch_stub_607)
+	GL_STUB(gl_dispatch_stub_608, _gloffset_PixelTexGenSGIX)
+	HIDDEN(gl_dispatch_stub_608)
 	GL_STUB(glBlendFuncSeparateEXT, _gloffset_BlendFuncSeparateEXT)
 	GL_STUB(glFlushVertexArrayRangeNV, _gloffset_FlushVertexArrayRangeNV)
 	GL_STUB(glVertexArrayRangeNV, _gloffset_VertexArrayRangeNV)
@@ -857,24 +858,24 @@ gl_dispatch_functions_start:
 	GL_STUB(glWindowPos4ivMESA, _gloffset_WindowPos4ivMESA)
 	GL_STUB(glWindowPos4sMESA, _gloffset_WindowPos4sMESA)
 	GL_STUB(glWindowPos4svMESA, _gloffset_WindowPos4svMESA)
-	GL_STUB(gl_dispatch_stub_649, _gloffset_MultiModeDrawArraysIBM)
-	HIDDEN(gl_dispatch_stub_649)
-	GL_STUB(gl_dispatch_stub_650, _gloffset_MultiModeDrawElementsIBM)
+	GL_STUB(gl_dispatch_stub_650, _gloffset_MultiModeDrawArraysIBM)
 	HIDDEN(gl_dispatch_stub_650)
-	GL_STUB(gl_dispatch_stub_651, _gloffset_DeleteFencesNV)
+	GL_STUB(gl_dispatch_stub_651, _gloffset_MultiModeDrawElementsIBM)
 	HIDDEN(gl_dispatch_stub_651)
-	GL_STUB(gl_dispatch_stub_652, _gloffset_FinishFenceNV)
+	GL_STUB(gl_dispatch_stub_652, _gloffset_DeleteFencesNV)
 	HIDDEN(gl_dispatch_stub_652)
-	GL_STUB(gl_dispatch_stub_653, _gloffset_GenFencesNV)
+	GL_STUB(gl_dispatch_stub_653, _gloffset_FinishFenceNV)
 	HIDDEN(gl_dispatch_stub_653)
-	GL_STUB(gl_dispatch_stub_654, _gloffset_GetFenceivNV)
+	GL_STUB(gl_dispatch_stub_654, _gloffset_GenFencesNV)
 	HIDDEN(gl_dispatch_stub_654)
-	GL_STUB(gl_dispatch_stub_655, _gloffset_IsFenceNV)
+	GL_STUB(gl_dispatch_stub_655, _gloffset_GetFenceivNV)
 	HIDDEN(gl_dispatch_stub_655)
-	GL_STUB(gl_dispatch_stub_656, _gloffset_SetFenceNV)
+	GL_STUB(gl_dispatch_stub_656, _gloffset_IsFenceNV)
 	HIDDEN(gl_dispatch_stub_656)
-	GL_STUB(gl_dispatch_stub_657, _gloffset_TestFenceNV)
+	GL_STUB(gl_dispatch_stub_657, _gloffset_SetFenceNV)
 	HIDDEN(gl_dispatch_stub_657)
+	GL_STUB(gl_dispatch_stub_658, _gloffset_TestFenceNV)
+	HIDDEN(gl_dispatch_stub_658)
 	GL_STUB(glAreProgramsResidentNV, _gloffset_AreProgramsResidentNV)
 	GL_STUB(glBindProgramNV, _gloffset_BindProgramNV)
 	GL_STUB(glDeleteProgramsNV, _gloffset_DeleteProgramsNV)
@@ -955,26 +956,26 @@ gl_dispatch_functions_start:
 	GL_STUB(glSetFragmentShaderConstantATI, _gloffset_SetFragmentShaderConstantATI)
 	GL_STUB(glPointParameteriNV, _gloffset_PointParameteriNV)
 	GL_STUB(glPointParameterivNV, _gloffset_PointParameterivNV)
-	GL_STUB(gl_dispatch_stub_738, _gloffset_ActiveStencilFaceEXT)
-	HIDDEN(gl_dispatch_stub_738)
-	GL_STUB(gl_dispatch_stub_739, _gloffset_BindVertexArrayAPPLE)
+	GL_STUB(gl_dispatch_stub_739, _gloffset_ActiveStencilFaceEXT)
 	HIDDEN(gl_dispatch_stub_739)
-	GL_STUB(gl_dispatch_stub_740, _gloffset_DeleteVertexArraysAPPLE)
+	GL_STUB(gl_dispatch_stub_740, _gloffset_BindVertexArrayAPPLE)
 	HIDDEN(gl_dispatch_stub_740)
-	GL_STUB(gl_dispatch_stub_741, _gloffset_GenVertexArraysAPPLE)
+	GL_STUB(gl_dispatch_stub_741, _gloffset_DeleteVertexArraysAPPLE)
 	HIDDEN(gl_dispatch_stub_741)
-	GL_STUB(gl_dispatch_stub_742, _gloffset_IsVertexArrayAPPLE)
+	GL_STUB(gl_dispatch_stub_742, _gloffset_GenVertexArraysAPPLE)
 	HIDDEN(gl_dispatch_stub_742)
+	GL_STUB(gl_dispatch_stub_743, _gloffset_IsVertexArrayAPPLE)
+	HIDDEN(gl_dispatch_stub_743)
 	GL_STUB(glGetProgramNamedParameterdvNV, _gloffset_GetProgramNamedParameterdvNV)
 	GL_STUB(glGetProgramNamedParameterfvNV, _gloffset_GetProgramNamedParameterfvNV)
 	GL_STUB(glProgramNamedParameter4dNV, _gloffset_ProgramNamedParameter4dNV)
 	GL_STUB(glProgramNamedParameter4dvNV, _gloffset_ProgramNamedParameter4dvNV)
 	GL_STUB(glProgramNamedParameter4fNV, _gloffset_ProgramNamedParameter4fNV)
 	GL_STUB(glProgramNamedParameter4fvNV, _gloffset_ProgramNamedParameter4fvNV)
-	GL_STUB(gl_dispatch_stub_749, _gloffset_DepthBoundsEXT)
-	HIDDEN(gl_dispatch_stub_749)
-	GL_STUB(gl_dispatch_stub_750, _gloffset_BlendEquationSeparateEXT)
+	GL_STUB(gl_dispatch_stub_750, _gloffset_DepthBoundsEXT)
 	HIDDEN(gl_dispatch_stub_750)
+	GL_STUB(gl_dispatch_stub_751, _gloffset_BlendEquationSeparateEXT)
+	HIDDEN(gl_dispatch_stub_751)
 	GL_STUB(glBindFramebufferEXT, _gloffset_BindFramebufferEXT)
 	GL_STUB(glBindRenderbufferEXT, _gloffset_BindRenderbufferEXT)
 	GL_STUB(glCheckFramebufferStatusEXT, _gloffset_CheckFramebufferStatusEXT)
@@ -992,19 +993,19 @@ gl_dispatch_functions_start:
 	GL_STUB(glIsFramebufferEXT, _gloffset_IsFramebufferEXT)
 	GL_STUB(glIsRenderbufferEXT, _gloffset_IsRenderbufferEXT)
 	GL_STUB(glRenderbufferStorageEXT, _gloffset_RenderbufferStorageEXT)
-	GL_STUB(gl_dispatch_stub_768, _gloffset_BlitFramebufferEXT)
-	HIDDEN(gl_dispatch_stub_768)
+	GL_STUB(gl_dispatch_stub_769, _gloffset_BlitFramebufferEXT)
+	HIDDEN(gl_dispatch_stub_769)
 	GL_STUB(glFramebufferTextureLayerEXT, _gloffset_FramebufferTextureLayerEXT)
-	GL_STUB(gl_dispatch_stub_770, _gloffset_StencilFuncSeparateATI)
-	HIDDEN(gl_dispatch_stub_770)
-	GL_STUB(gl_dispatch_stub_771, _gloffset_ProgramEnvParameters4fvEXT)
+	GL_STUB(gl_dispatch_stub_771, _gloffset_StencilFuncSeparateATI)
 	HIDDEN(gl_dispatch_stub_771)
-	GL_STUB(gl_dispatch_stub_772, _gloffset_ProgramLocalParameters4fvEXT)
+	GL_STUB(gl_dispatch_stub_772, _gloffset_ProgramEnvParameters4fvEXT)
 	HIDDEN(gl_dispatch_stub_772)
-	GL_STUB(gl_dispatch_stub_773, _gloffset_GetQueryObjecti64vEXT)
+	GL_STUB(gl_dispatch_stub_773, _gloffset_ProgramLocalParameters4fvEXT)
 	HIDDEN(gl_dispatch_stub_773)
-	GL_STUB(gl_dispatch_stub_774, _gloffset_GetQueryObjectui64vEXT)
+	GL_STUB(gl_dispatch_stub_774, _gloffset_GetQueryObjecti64vEXT)
 	HIDDEN(gl_dispatch_stub_774)
+	GL_STUB(gl_dispatch_stub_775, _gloffset_GetQueryObjectui64vEXT)
+	HIDDEN(gl_dispatch_stub_775)
 	GL_STUB_ALIAS(glArrayElementEXT, glArrayElement)
 	GL_STUB_ALIAS(glBindTextureEXT, glBindTexture)
 	GL_STUB_ALIAS(glDrawArraysEXT, glDrawArrays)
diff --git a/src/mesa/x86-64/glapi_x86-64.S b/src/mesa/x86-64/glapi_x86-64.S
index fe05549c1d..8f66ef96e6 100644
--- a/src/mesa/x86-64/glapi_x86-64.S
+++ b/src/mesa/x86-64/glapi_x86-64.S
@@ -21157,21 +21157,25 @@ GL_PREFIX(RenderbufferStorageMultisample):
 	.size	GL_PREFIX(RenderbufferStorageMultisample), .-GL_PREFIX(RenderbufferStorageMultisample)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(PolygonOffsetEXT)
-	.type	GL_PREFIX(PolygonOffsetEXT), @function
-GL_PREFIX(PolygonOffsetEXT):
+	.globl	GL_PREFIX(CopyBufferSubData)
+	.type	GL_PREFIX(CopyBufferSubData), @function
+GL_PREFIX(CopyBufferSubData):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
 	movq	4496(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
-	subq	$24, %rsp
-	movq	%xmm0, (%rsp)
-	movq	%xmm1, 8(%rsp)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	pushq	%rcx
+	pushq	%r8
 	call	_x86_64_get_dispatch@PLT
-	movq	8(%rsp), %xmm1
-	movq	(%rsp), %xmm0
-	addq	$24, %rsp
+	popq	%r8
+	popq	%rcx
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
 	movq	4496(%rax), %r11
 	jmp	*%r11
 #else
@@ -21181,35 +21185,38 @@ GL_PREFIX(PolygonOffsetEXT):
 	movq	4496(%rax), %r11
 	jmp	*%r11
 1:
-	subq	$24, %rsp
-	movq	%xmm0, (%rsp)
-	movq	%xmm1, 8(%rsp)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	pushq	%rcx
+	pushq	%r8
 	call	_glapi_get_dispatch
-	movq	8(%rsp), %xmm1
-	movq	(%rsp), %xmm0
-	addq	$24, %rsp
+	popq	%r8
+	popq	%rcx
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
 	movq	4496(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(PolygonOffsetEXT), .-GL_PREFIX(PolygonOffsetEXT)
+	.size	GL_PREFIX(CopyBufferSubData), .-GL_PREFIX(CopyBufferSubData)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_563)
-	.type	GL_PREFIX(_dispatch_stub_563), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_563))
-GL_PREFIX(_dispatch_stub_563):
+	.globl	GL_PREFIX(PolygonOffsetEXT)
+	.type	GL_PREFIX(PolygonOffsetEXT), @function
+GL_PREFIX(PolygonOffsetEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
 	movq	4504(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
-	pushq	%rdi
-	pushq	%rsi
-	pushq	%rbp
+	subq	$24, %rsp
+	movq	%xmm0, (%rsp)
+	movq	%xmm1, 8(%rsp)
 	call	_x86_64_get_dispatch@PLT
-	popq	%rbp
-	popq	%rsi
-	popq	%rdi
+	movq	8(%rsp), %xmm1
+	movq	(%rsp), %xmm0
+	addq	$24, %rsp
 	movq	4504(%rax), %r11
 	jmp	*%r11
 #else
@@ -21219,17 +21226,17 @@ GL_PREFIX(_dispatch_stub_563):
 	movq	4504(%rax), %r11
 	jmp	*%r11
 1:
-	pushq	%rdi
-	pushq	%rsi
-	pushq	%rbp
+	subq	$24, %rsp
+	movq	%xmm0, (%rsp)
+	movq	%xmm1, 8(%rsp)
 	call	_glapi_get_dispatch
-	popq	%rbp
-	popq	%rsi
-	popq	%rdi
+	movq	8(%rsp), %xmm1
+	movq	(%rsp), %xmm0
+	addq	$24, %rsp
 	movq	4504(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_563), .-GL_PREFIX(_dispatch_stub_563)
+	.size	GL_PREFIX(PolygonOffsetEXT), .-GL_PREFIX(PolygonOffsetEXT)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(_dispatch_stub_564)
@@ -21279,13 +21286,13 @@ GL_PREFIX(_dispatch_stub_565):
 	movq	4520(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
-	subq	$24, %rsp
-	movq	%rdi, (%rsp)
-	movq	%xmm0, 8(%rsp)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
-	movq	8(%rsp), %xmm0
-	movq	(%rsp), %rdi
-	addq	$24, %rsp
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
 	movq	4520(%rax), %r11
 	jmp	*%r11
 #else
@@ -21295,13 +21302,13 @@ GL_PREFIX(_dispatch_stub_565):
 	movq	4520(%rax), %r11
 	jmp	*%r11
 1:
-	subq	$24, %rsp
-	movq	%rdi, (%rsp)
-	movq	%xmm0, 8(%rsp)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
 	call	_glapi_get_dispatch
-	movq	8(%rsp), %xmm0
-	movq	(%rsp), %rdi
-	addq	$24, %rsp
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
 	movq	4520(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
@@ -21317,13 +21324,13 @@ GL_PREFIX(_dispatch_stub_566):
 	movq	4528(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
-	pushq	%rdi
-	pushq	%rsi
-	pushq	%rbp
+	subq	$24, %rsp
+	movq	%rdi, (%rsp)
+	movq	%xmm0, 8(%rsp)
 	call	_x86_64_get_dispatch@PLT
-	popq	%rbp
-	popq	%rsi
-	popq	%rdi
+	movq	8(%rsp), %xmm0
+	movq	(%rsp), %rdi
+	addq	$24, %rsp
 	movq	4528(%rax), %r11
 	jmp	*%r11
 #else
@@ -21333,13 +21340,13 @@ GL_PREFIX(_dispatch_stub_566):
 	movq	4528(%rax), %r11
 	jmp	*%r11
 1:
-	pushq	%rdi
-	pushq	%rsi
-	pushq	%rbp
+	subq	$24, %rsp
+	movq	%rdi, (%rsp)
+	movq	%xmm0, 8(%rsp)
 	call	_glapi_get_dispatch
-	popq	%rbp
-	popq	%rsi
-	popq	%rdi
+	movq	8(%rsp), %xmm0
+	movq	(%rsp), %rdi
+	addq	$24, %rsp
 	movq	4528(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
@@ -21470,7 +21477,11 @@ GL_PREFIX(_dispatch_stub_570):
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
+	popq	%rbp
+	popq	%rsi
 	popq	%rdi
 	movq	4560(%rax), %r11
 	jmp	*%r11
@@ -21482,20 +21493,54 @@ GL_PREFIX(_dispatch_stub_570):
 	jmp	*%r11
 1:
 	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
 	call	_glapi_get_dispatch
+	popq	%rbp
+	popq	%rsi
 	popq	%rdi
 	movq	4560(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(_dispatch_stub_570), .-GL_PREFIX(_dispatch_stub_570)
 
+	.p2align	4,,15
+	.globl	GL_PREFIX(_dispatch_stub_571)
+	.type	GL_PREFIX(_dispatch_stub_571), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_571))
+GL_PREFIX(_dispatch_stub_571):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	4568(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	call	_x86_64_get_dispatch@PLT
+	popq	%rdi
+	movq	4568(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	4568(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	call	_glapi_get_dispatch
+	popq	%rdi
+	movq	4568(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(_dispatch_stub_571), .-GL_PREFIX(_dispatch_stub_571)
+
 	.p2align	4,,15
 	.globl	GL_PREFIX(ColorPointerEXT)
 	.type	GL_PREFIX(ColorPointerEXT), @function
 GL_PREFIX(ColorPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4568(%rax), %r11
+	movq	4576(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21509,13 +21554,13 @@ GL_PREFIX(ColorPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4568(%rax), %r11
+	movq	4576(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4568(%rax), %r11
+	movq	4576(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21529,7 +21574,7 @@ GL_PREFIX(ColorPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4568(%rax), %r11
+	movq	4576(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorPointerEXT), .-GL_PREFIX(ColorPointerEXT)
@@ -21540,7 +21585,7 @@ GL_PREFIX(ColorPointerEXT):
 GL_PREFIX(EdgeFlagPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4576(%rax), %r11
+	movq	4584(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21550,13 +21595,13 @@ GL_PREFIX(EdgeFlagPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4576(%rax), %r11
+	movq	4584(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4576(%rax), %r11
+	movq	4584(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21566,7 +21611,7 @@ GL_PREFIX(EdgeFlagPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4576(%rax), %r11
+	movq	4584(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EdgeFlagPointerEXT), .-GL_PREFIX(EdgeFlagPointerEXT)
@@ -21577,7 +21622,7 @@ GL_PREFIX(EdgeFlagPointerEXT):
 GL_PREFIX(IndexPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4584(%rax), %r11
+	movq	4592(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21591,13 +21636,13 @@ GL_PREFIX(IndexPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4584(%rax), %r11
+	movq	4592(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4584(%rax), %r11
+	movq	4592(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21611,7 +21656,7 @@ GL_PREFIX(IndexPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4584(%rax), %r11
+	movq	4592(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IndexPointerEXT), .-GL_PREFIX(IndexPointerEXT)
@@ -21622,7 +21667,7 @@ GL_PREFIX(IndexPointerEXT):
 GL_PREFIX(NormalPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4592(%rax), %r11
+	movq	4600(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21636,13 +21681,13 @@ GL_PREFIX(NormalPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4592(%rax), %r11
+	movq	4600(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4592(%rax), %r11
+	movq	4600(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21656,7 +21701,7 @@ GL_PREFIX(NormalPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4592(%rax), %r11
+	movq	4600(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(NormalPointerEXT), .-GL_PREFIX(NormalPointerEXT)
@@ -21667,7 +21712,7 @@ GL_PREFIX(NormalPointerEXT):
 GL_PREFIX(TexCoordPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4600(%rax), %r11
+	movq	4608(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21681,13 +21726,13 @@ GL_PREFIX(TexCoordPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4600(%rax), %r11
+	movq	4608(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4600(%rax), %r11
+	movq	4608(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21701,7 +21746,7 @@ GL_PREFIX(TexCoordPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4600(%rax), %r11
+	movq	4608(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexCoordPointerEXT), .-GL_PREFIX(TexCoordPointerEXT)
@@ -21712,7 +21757,7 @@ GL_PREFIX(TexCoordPointerEXT):
 GL_PREFIX(VertexPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4608(%rax), %r11
+	movq	4616(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21726,13 +21771,13 @@ GL_PREFIX(VertexPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4608(%rax), %r11
+	movq	4616(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4608(%rax), %r11
+	movq	4616(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21746,7 +21791,7 @@ GL_PREFIX(VertexPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4608(%rax), %r11
+	movq	4616(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexPointerEXT), .-GL_PREFIX(VertexPointerEXT)
@@ -21757,7 +21802,7 @@ GL_PREFIX(VertexPointerEXT):
 GL_PREFIX(PointParameterfEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4616(%rax), %r11
+	movq	4624(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -21767,13 +21812,13 @@ GL_PREFIX(PointParameterfEXT):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	4616(%rax), %r11
+	movq	4624(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4616(%rax), %r11
+	movq	4624(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -21783,7 +21828,7 @@ GL_PREFIX(PointParameterfEXT):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	4616(%rax), %r11
+	movq	4624(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PointParameterfEXT), .-GL_PREFIX(PointParameterfEXT)
@@ -21794,7 +21839,7 @@ GL_PREFIX(PointParameterfEXT):
 GL_PREFIX(PointParameterfvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4624(%rax), %r11
+	movq	4632(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21804,13 +21849,13 @@ GL_PREFIX(PointParameterfvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4624(%rax), %r11
+	movq	4632(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4624(%rax), %r11
+	movq	4632(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21820,7 +21865,7 @@ GL_PREFIX(PointParameterfvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4624(%rax), %r11
+	movq	4632(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PointParameterfvEXT), .-GL_PREFIX(PointParameterfvEXT)
@@ -21831,7 +21876,7 @@ GL_PREFIX(PointParameterfvEXT):
 GL_PREFIX(LockArraysEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4632(%rax), %r11
+	movq	4640(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21841,13 +21886,13 @@ GL_PREFIX(LockArraysEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4632(%rax), %r11
+	movq	4640(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4632(%rax), %r11
+	movq	4640(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21857,7 +21902,7 @@ GL_PREFIX(LockArraysEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4632(%rax), %r11
+	movq	4640(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(LockArraysEXT), .-GL_PREFIX(LockArraysEXT)
@@ -21868,37 +21913,37 @@ GL_PREFIX(LockArraysEXT):
 GL_PREFIX(UnlockArraysEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4640(%rax), %r11
+	movq	4648(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	4640(%rax), %r11
+	movq	4648(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4640(%rax), %r11
+	movq	4648(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	4640(%rax), %r11
+	movq	4648(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(UnlockArraysEXT), .-GL_PREFIX(UnlockArraysEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_581)
-	.type	GL_PREFIX(_dispatch_stub_581), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_581))
-GL_PREFIX(_dispatch_stub_581):
+	.globl	GL_PREFIX(_dispatch_stub_582)
+	.type	GL_PREFIX(_dispatch_stub_582), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_582))
+GL_PREFIX(_dispatch_stub_582):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4648(%rax), %r11
+	movq	4656(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21908,13 +21953,13 @@ GL_PREFIX(_dispatch_stub_581):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4648(%rax), %r11
+	movq	4656(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4648(%rax), %r11
+	movq	4656(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21924,19 +21969,19 @@ GL_PREFIX(_dispatch_stub_581):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4648(%rax), %r11
+	movq	4656(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_581), .-GL_PREFIX(_dispatch_stub_581)
+	.size	GL_PREFIX(_dispatch_stub_582), .-GL_PREFIX(_dispatch_stub_582)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_582)
-	.type	GL_PREFIX(_dispatch_stub_582), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_582))
-GL_PREFIX(_dispatch_stub_582):
+	.globl	GL_PREFIX(_dispatch_stub_583)
+	.type	GL_PREFIX(_dispatch_stub_583), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_583))
+GL_PREFIX(_dispatch_stub_583):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4656(%rax), %r11
+	movq	4664(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21946,13 +21991,13 @@ GL_PREFIX(_dispatch_stub_582):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4656(%rax), %r11
+	movq	4664(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4656(%rax), %r11
+	movq	4664(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21962,10 +22007,10 @@ GL_PREFIX(_dispatch_stub_582):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4656(%rax), %r11
+	movq	4664(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_582), .-GL_PREFIX(_dispatch_stub_582)
+	.size	GL_PREFIX(_dispatch_stub_583), .-GL_PREFIX(_dispatch_stub_583)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(SecondaryColor3bEXT)
@@ -21973,7 +22018,7 @@ GL_PREFIX(_dispatch_stub_582):
 GL_PREFIX(SecondaryColor3bEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4664(%rax), %r11
+	movq	4672(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21983,13 +22028,13 @@ GL_PREFIX(SecondaryColor3bEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4664(%rax), %r11
+	movq	4672(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4664(%rax), %r11
+	movq	4672(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21999,7 +22044,7 @@ GL_PREFIX(SecondaryColor3bEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4664(%rax), %r11
+	movq	4672(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3bEXT), .-GL_PREFIX(SecondaryColor3bEXT)
@@ -22010,25 +22055,25 @@ GL_PREFIX(SecondaryColor3bEXT):
 GL_PREFIX(SecondaryColor3bvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4672(%rax), %r11
+	movq	4680(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4672(%rax), %r11
+	movq	4680(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4672(%rax), %r11
+	movq	4680(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4672(%rax), %r11
+	movq	4680(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3bvEXT), .-GL_PREFIX(SecondaryColor3bvEXT)
@@ -22039,7 +22084,7 @@ GL_PREFIX(SecondaryColor3bvEXT):
 GL_PREFIX(SecondaryColor3dEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4680(%rax), %r11
+	movq	4688(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -22051,13 +22096,13 @@ GL_PREFIX(SecondaryColor3dEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	4680(%rax), %r11
+	movq	4688(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4680(%rax), %r11
+	movq	4688(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -22069,7 +22114,7 @@ GL_PREFIX(SecondaryColor3dEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	4680(%rax), %r11
+	movq	4688(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3dEXT), .-GL_PREFIX(SecondaryColor3dEXT)
@@ -22080,25 +22125,25 @@ GL_PREFIX(SecondaryColor3dEXT):
 GL_PREFIX(SecondaryColor3dvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4688(%rax), %r11
+	movq	4696(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4688(%rax), %r11
+	movq	4696(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4688(%rax), %r11
+	movq	4696(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4688(%rax), %r11
+	movq	4696(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3dvEXT), .-GL_PREFIX(SecondaryColor3dvEXT)
@@ -22109,7 +22154,7 @@ GL_PREFIX(SecondaryColor3dvEXT):
 GL_PREFIX(SecondaryColor3fEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4696(%rax), %r11
+	movq	4704(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -22121,13 +22166,13 @@ GL_PREFIX(SecondaryColor3fEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	4696(%rax), %r11
+	movq	4704(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4696(%rax), %r11
+	movq	4704(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -22139,7 +22184,7 @@ GL_PREFIX(SecondaryColor3fEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	4696(%rax), %r11
+	movq	4704(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3fEXT), .-GL_PREFIX(SecondaryColor3fEXT)
@@ -22150,25 +22195,25 @@ GL_PREFIX(SecondaryColor3fEXT):
 GL_PREFIX(SecondaryColor3fvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4704(%rax), %r11
+	movq	4712(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4704(%rax), %r11
+	movq	4712(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4704(%rax), %r11
+	movq	4712(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4704(%rax), %r11
+	movq	4712(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3fvEXT), .-GL_PREFIX(SecondaryColor3fvEXT)
@@ -22179,7 +22224,7 @@ GL_PREFIX(SecondaryColor3fvEXT):
 GL_PREFIX(SecondaryColor3iEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4712(%rax), %r11
+	movq	4720(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22189,13 +22234,13 @@ GL_PREFIX(SecondaryColor3iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4712(%rax), %r11
+	movq	4720(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4712(%rax), %r11
+	movq	4720(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22205,7 +22250,7 @@ GL_PREFIX(SecondaryColor3iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4712(%rax), %r11
+	movq	4720(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3iEXT), .-GL_PREFIX(SecondaryColor3iEXT)
@@ -22216,25 +22261,25 @@ GL_PREFIX(SecondaryColor3iEXT):
 GL_PREFIX(SecondaryColor3ivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4720(%rax), %r11
+	movq	4728(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4720(%rax), %r11
+	movq	4728(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4720(%rax), %r11
+	movq	4728(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4720(%rax), %r11
+	movq	4728(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3ivEXT), .-GL_PREFIX(SecondaryColor3ivEXT)
@@ -22245,7 +22290,7 @@ GL_PREFIX(SecondaryColor3ivEXT):
 GL_PREFIX(SecondaryColor3sEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4728(%rax), %r11
+	movq	4736(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22255,13 +22300,13 @@ GL_PREFIX(SecondaryColor3sEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4728(%rax), %r11
+	movq	4736(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4728(%rax), %r11
+	movq	4736(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22271,7 +22316,7 @@ GL_PREFIX(SecondaryColor3sEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4728(%rax), %r11
+	movq	4736(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3sEXT), .-GL_PREFIX(SecondaryColor3sEXT)
@@ -22282,25 +22327,25 @@ GL_PREFIX(SecondaryColor3sEXT):
 GL_PREFIX(SecondaryColor3svEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4736(%rax), %r11
+	movq	4744(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4736(%rax), %r11
+	movq	4744(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4736(%rax), %r11
+	movq	4744(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4736(%rax), %r11
+	movq	4744(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3svEXT), .-GL_PREFIX(SecondaryColor3svEXT)
@@ -22311,7 +22356,7 @@ GL_PREFIX(SecondaryColor3svEXT):
 GL_PREFIX(SecondaryColor3ubEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4744(%rax), %r11
+	movq	4752(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22321,13 +22366,13 @@ GL_PREFIX(SecondaryColor3ubEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4744(%rax), %r11
+	movq	4752(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4744(%rax), %r11
+	movq	4752(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22337,7 +22382,7 @@ GL_PREFIX(SecondaryColor3ubEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4744(%rax), %r11
+	movq	4752(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3ubEXT), .-GL_PREFIX(SecondaryColor3ubEXT)
@@ -22348,25 +22393,25 @@ GL_PREFIX(SecondaryColor3ubEXT):
 GL_PREFIX(SecondaryColor3ubvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4752(%rax), %r11
+	movq	4760(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4752(%rax), %r11
+	movq	4760(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4752(%rax), %r11
+	movq	4760(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4752(%rax), %r11
+	movq	4760(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3ubvEXT), .-GL_PREFIX(SecondaryColor3ubvEXT)
@@ -22377,7 +22422,7 @@ GL_PREFIX(SecondaryColor3ubvEXT):
 GL_PREFIX(SecondaryColor3uiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4760(%rax), %r11
+	movq	4768(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22387,13 +22432,13 @@ GL_PREFIX(SecondaryColor3uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4760(%rax), %r11
+	movq	4768(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4760(%rax), %r11
+	movq	4768(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22403,7 +22448,7 @@ GL_PREFIX(SecondaryColor3uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4760(%rax), %r11
+	movq	4768(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3uiEXT), .-GL_PREFIX(SecondaryColor3uiEXT)
@@ -22414,25 +22459,25 @@ GL_PREFIX(SecondaryColor3uiEXT):
 GL_PREFIX(SecondaryColor3uivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4768(%rax), %r11
+	movq	4776(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4768(%rax), %r11
+	movq	4776(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4768(%rax), %r11
+	movq	4776(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4768(%rax), %r11
+	movq	4776(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3uivEXT), .-GL_PREFIX(SecondaryColor3uivEXT)
@@ -22443,7 +22488,7 @@ GL_PREFIX(SecondaryColor3uivEXT):
 GL_PREFIX(SecondaryColor3usEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4776(%rax), %r11
+	movq	4784(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22453,13 +22498,13 @@ GL_PREFIX(SecondaryColor3usEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4776(%rax), %r11
+	movq	4784(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4776(%rax), %r11
+	movq	4784(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22469,7 +22514,7 @@ GL_PREFIX(SecondaryColor3usEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4776(%rax), %r11
+	movq	4784(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3usEXT), .-GL_PREFIX(SecondaryColor3usEXT)
@@ -22480,25 +22525,25 @@ GL_PREFIX(SecondaryColor3usEXT):
 GL_PREFIX(SecondaryColor3usvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4784(%rax), %r11
+	movq	4792(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4784(%rax), %r11
+	movq	4792(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4784(%rax), %r11
+	movq	4792(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4784(%rax), %r11
+	movq	4792(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3usvEXT), .-GL_PREFIX(SecondaryColor3usvEXT)
@@ -22509,7 +22554,7 @@ GL_PREFIX(SecondaryColor3usvEXT):
 GL_PREFIX(SecondaryColorPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4792(%rax), %r11
+	movq	4800(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22523,13 +22568,13 @@ GL_PREFIX(SecondaryColorPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4792(%rax), %r11
+	movq	4800(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4792(%rax), %r11
+	movq	4800(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22543,7 +22588,7 @@ GL_PREFIX(SecondaryColorPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4792(%rax), %r11
+	movq	4800(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColorPointerEXT), .-GL_PREFIX(SecondaryColorPointerEXT)
@@ -22554,7 +22599,7 @@ GL_PREFIX(SecondaryColorPointerEXT):
 GL_PREFIX(MultiDrawArraysEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4800(%rax), %r11
+	movq	4808(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22568,13 +22613,13 @@ GL_PREFIX(MultiDrawArraysEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4800(%rax), %r11
+	movq	4808(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4800(%rax), %r11
+	movq	4808(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22588,7 +22633,7 @@ GL_PREFIX(MultiDrawArraysEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4800(%rax), %r11
+	movq	4808(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(MultiDrawArraysEXT), .-GL_PREFIX(MultiDrawArraysEXT)
@@ -22599,7 +22644,7 @@ GL_PREFIX(MultiDrawArraysEXT):
 GL_PREFIX(MultiDrawElementsEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4808(%rax), %r11
+	movq	4816(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22613,13 +22658,13 @@ GL_PREFIX(MultiDrawElementsEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4808(%rax), %r11
+	movq	4816(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4808(%rax), %r11
+	movq	4816(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22633,7 +22678,7 @@ GL_PREFIX(MultiDrawElementsEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4808(%rax), %r11
+	movq	4816(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(MultiDrawElementsEXT), .-GL_PREFIX(MultiDrawElementsEXT)
@@ -22644,7 +22689,7 @@ GL_PREFIX(MultiDrawElementsEXT):
 GL_PREFIX(FogCoordPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4816(%rax), %r11
+	movq	4824(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22654,13 +22699,13 @@ GL_PREFIX(FogCoordPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4816(%rax), %r11
+	movq	4824(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4816(%rax), %r11
+	movq	4824(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22670,7 +22715,7 @@ GL_PREFIX(FogCoordPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4816(%rax), %r11
+	movq	4824(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoordPointerEXT), .-GL_PREFIX(FogCoordPointerEXT)
@@ -22681,7 +22726,7 @@ GL_PREFIX(FogCoordPointerEXT):
 GL_PREFIX(FogCoorddEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4824(%rax), %r11
+	movq	4832(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$8, %rsp
@@ -22689,13 +22734,13 @@ GL_PREFIX(FogCoorddEXT):
 	call	_x86_64_get_dispatch@PLT
 	movq	(%rsp), %xmm0
 	addq	$8, %rsp
-	movq	4824(%rax), %r11
+	movq	4832(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4824(%rax), %r11
+	movq	4832(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$8, %rsp
@@ -22703,7 +22748,7 @@ GL_PREFIX(FogCoorddEXT):
 	call	_glapi_get_dispatch
 	movq	(%rsp), %xmm0
 	addq	$8, %rsp
-	movq	4824(%rax), %r11
+	movq	4832(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoorddEXT), .-GL_PREFIX(FogCoorddEXT)
@@ -22714,25 +22759,25 @@ GL_PREFIX(FogCoorddEXT):
 GL_PREFIX(FogCoorddvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4832(%rax), %r11
+	movq	4840(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4832(%rax), %r11
+	movq	4840(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4832(%rax), %r11
+	movq	4840(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4832(%rax), %r11
+	movq	4840(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoorddvEXT), .-GL_PREFIX(FogCoorddvEXT)
@@ -22743,7 +22788,7 @@ GL_PREFIX(FogCoorddvEXT):
 GL_PREFIX(FogCoordfEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4840(%rax), %r11
+	movq	4848(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$8, %rsp
@@ -22751,13 +22796,13 @@ GL_PREFIX(FogCoordfEXT):
 	call	_x86_64_get_dispatch@PLT
 	movq	(%rsp), %xmm0
 	addq	$8, %rsp
-	movq	4840(%rax), %r11
+	movq	4848(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4840(%rax), %r11
+	movq	4848(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$8, %rsp
@@ -22765,7 +22810,7 @@ GL_PREFIX(FogCoordfEXT):
 	call	_glapi_get_dispatch
 	movq	(%rsp), %xmm0
 	addq	$8, %rsp
-	movq	4840(%rax), %r11
+	movq	4848(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoordfEXT), .-GL_PREFIX(FogCoordfEXT)
@@ -22776,58 +22821,58 @@ GL_PREFIX(FogCoordfEXT):
 GL_PREFIX(FogCoordfvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4848(%rax), %r11
+	movq	4856(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4848(%rax), %r11
+	movq	4856(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4848(%rax), %r11
+	movq	4856(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4848(%rax), %r11
+	movq	4856(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoordfvEXT), .-GL_PREFIX(FogCoordfvEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_607)
-	.type	GL_PREFIX(_dispatch_stub_607), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_607))
-GL_PREFIX(_dispatch_stub_607):
+	.globl	GL_PREFIX(_dispatch_stub_608)
+	.type	GL_PREFIX(_dispatch_stub_608), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_608))
+GL_PREFIX(_dispatch_stub_608):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4856(%rax), %r11
+	movq	4864(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4856(%rax), %r11
+	movq	4864(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4856(%rax), %r11
+	movq	4864(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4856(%rax), %r11
+	movq	4864(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_607), .-GL_PREFIX(_dispatch_stub_607)
+	.size	GL_PREFIX(_dispatch_stub_608), .-GL_PREFIX(_dispatch_stub_608)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(BlendFuncSeparateEXT)
@@ -22835,7 +22880,7 @@ GL_PREFIX(_dispatch_stub_607):
 GL_PREFIX(BlendFuncSeparateEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4864(%rax), %r11
+	movq	4872(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22849,13 +22894,13 @@ GL_PREFIX(BlendFuncSeparateEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4864(%rax), %r11
+	movq	4872(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4864(%rax), %r11
+	movq	4872(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22869,7 +22914,7 @@ GL_PREFIX(BlendFuncSeparateEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4864(%rax), %r11
+	movq	4872(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BlendFuncSeparateEXT), .-GL_PREFIX(BlendFuncSeparateEXT)
@@ -22880,25 +22925,25 @@ GL_PREFIX(BlendFuncSeparateEXT):
 GL_PREFIX(FlushVertexArrayRangeNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4872(%rax), %r11
+	movq	4880(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	4872(%rax), %r11
+	movq	4880(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4872(%rax), %r11
+	movq	4880(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	4872(%rax), %r11
+	movq	4880(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FlushVertexArrayRangeNV), .-GL_PREFIX(FlushVertexArrayRangeNV)
@@ -22909,7 +22954,7 @@ GL_PREFIX(FlushVertexArrayRangeNV):
 GL_PREFIX(VertexArrayRangeNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4880(%rax), %r11
+	movq	4888(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22919,13 +22964,13 @@ GL_PREFIX(VertexArrayRangeNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4880(%rax), %r11
+	movq	4888(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4880(%rax), %r11
+	movq	4888(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22935,7 +22980,7 @@ GL_PREFIX(VertexArrayRangeNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4880(%rax), %r11
+	movq	4888(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexArrayRangeNV), .-GL_PREFIX(VertexArrayRangeNV)
@@ -22946,7 +22991,7 @@ GL_PREFIX(VertexArrayRangeNV):
 GL_PREFIX(CombinerInputNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4888(%rax), %r11
+	movq	4896(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22964,13 +23009,13 @@ GL_PREFIX(CombinerInputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4888(%rax), %r11
+	movq	4896(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4888(%rax), %r11
+	movq	4896(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22988,7 +23033,7 @@ GL_PREFIX(CombinerInputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4888(%rax), %r11
+	movq	4896(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerInputNV), .-GL_PREFIX(CombinerInputNV)
@@ -22999,7 +23044,7 @@ GL_PREFIX(CombinerInputNV):
 GL_PREFIX(CombinerOutputNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4896(%rax), %r11
+	movq	4904(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23017,13 +23062,13 @@ GL_PREFIX(CombinerOutputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4896(%rax), %r11
+	movq	4904(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4896(%rax), %r11
+	movq	4904(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23041,7 +23086,7 @@ GL_PREFIX(CombinerOutputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4896(%rax), %r11
+	movq	4904(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerOutputNV), .-GL_PREFIX(CombinerOutputNV)
@@ -23052,7 +23097,7 @@ GL_PREFIX(CombinerOutputNV):
 GL_PREFIX(CombinerParameterfNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4904(%rax), %r11
+	movq	4912(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -23062,13 +23107,13 @@ GL_PREFIX(CombinerParameterfNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	4904(%rax), %r11
+	movq	4912(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4904(%rax), %r11
+	movq	4912(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -23078,7 +23123,7 @@ GL_PREFIX(CombinerParameterfNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	4904(%rax), %r11
+	movq	4912(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerParameterfNV), .-GL_PREFIX(CombinerParameterfNV)
@@ -23089,7 +23134,7 @@ GL_PREFIX(CombinerParameterfNV):
 GL_PREFIX(CombinerParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4912(%rax), %r11
+	movq	4920(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23099,13 +23144,13 @@ GL_PREFIX(CombinerParameterfvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4912(%rax), %r11
+	movq	4920(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4912(%rax), %r11
+	movq	4920(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23115,7 +23160,7 @@ GL_PREFIX(CombinerParameterfvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4912(%rax), %r11
+	movq	4920(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerParameterfvNV), .-GL_PREFIX(CombinerParameterfvNV)
@@ -23126,7 +23171,7 @@ GL_PREFIX(CombinerParameterfvNV):
 GL_PREFIX(CombinerParameteriNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4920(%rax), %r11
+	movq	4928(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23136,13 +23181,13 @@ GL_PREFIX(CombinerParameteriNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4920(%rax), %r11
+	movq	4928(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4920(%rax), %r11
+	movq	4928(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23152,7 +23197,7 @@ GL_PREFIX(CombinerParameteriNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4920(%rax), %r11
+	movq	4928(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerParameteriNV), .-GL_PREFIX(CombinerParameteriNV)
@@ -23163,7 +23208,7 @@ GL_PREFIX(CombinerParameteriNV):
 GL_PREFIX(CombinerParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4928(%rax), %r11
+	movq	4936(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23173,13 +23218,13 @@ GL_PREFIX(CombinerParameterivNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4928(%rax), %r11
+	movq	4936(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4928(%rax), %r11
+	movq	4936(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23189,7 +23234,7 @@ GL_PREFIX(CombinerParameterivNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4928(%rax), %r11
+	movq	4936(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerParameterivNV), .-GL_PREFIX(CombinerParameterivNV)
@@ -23200,7 +23245,7 @@ GL_PREFIX(CombinerParameterivNV):
 GL_PREFIX(FinalCombinerInputNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4936(%rax), %r11
+	movq	4944(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23214,13 +23259,13 @@ GL_PREFIX(FinalCombinerInputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4936(%rax), %r11
+	movq	4944(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4936(%rax), %r11
+	movq	4944(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23234,7 +23279,7 @@ GL_PREFIX(FinalCombinerInputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4936(%rax), %r11
+	movq	4944(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FinalCombinerInputNV), .-GL_PREFIX(FinalCombinerInputNV)
@@ -23245,7 +23290,7 @@ GL_PREFIX(FinalCombinerInputNV):
 GL_PREFIX(GetCombinerInputParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4944(%rax), %r11
+	movq	4952(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23259,13 +23304,13 @@ GL_PREFIX(GetCombinerInputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4944(%rax), %r11
+	movq	4952(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4944(%rax), %r11
+	movq	4952(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23279,7 +23324,7 @@ GL_PREFIX(GetCombinerInputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4944(%rax), %r11
+	movq	4952(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetCombinerInputParameterfvNV), .-GL_PREFIX(GetCombinerInputParameterfvNV)
@@ -23290,7 +23335,7 @@ GL_PREFIX(GetCombinerInputParameterfvNV):
 GL_PREFIX(GetCombinerInputParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4952(%rax), %r11
+	movq	4960(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23304,13 +23349,13 @@ GL_PREFIX(GetCombinerInputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4952(%rax), %r11
+	movq	4960(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4952(%rax), %r11
+	movq	4960(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23324,7 +23369,7 @@ GL_PREFIX(GetCombinerInputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4952(%rax), %r11
+	movq	4960(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetCombinerInputParameterivNV), .-GL_PREFIX(GetCombinerInputParameterivNV)
@@ -23335,7 +23380,7 @@ GL_PREFIX(GetCombinerInputParameterivNV):
 GL_PREFIX(GetCombinerOutputParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4960(%rax), %r11
+	movq	4968(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23349,13 +23394,13 @@ GL_PREFIX(GetCombinerOutputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4960(%rax), %r11
+	movq	4968(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4960(%rax), %r11
+	movq	4968(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23369,7 +23414,7 @@ GL_PREFIX(GetCombinerOutputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4960(%rax), %r11
+	movq	4968(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetCombinerOutputParameterfvNV), .-GL_PREFIX(GetCombinerOutputParameterfvNV)
@@ -23380,7 +23425,7 @@ GL_PREFIX(GetCombinerOutputParameterfvNV):
 GL_PREFIX(GetCombinerOutputParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4968(%rax), %r11
+	movq	4976(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23394,13 +23439,13 @@ GL_PREFIX(GetCombinerOutputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4968(%rax), %r11
+	movq	4976(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4968(%rax), %r11
+	movq	4976(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23414,7 +23459,7 @@ GL_PREFIX(GetCombinerOutputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4968(%rax), %r11
+	movq	4976(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetCombinerOutputParameterivNV), .-GL_PREFIX(GetCombinerOutputParameterivNV)
@@ -23425,7 +23470,7 @@ GL_PREFIX(GetCombinerOutputParameterivNV):
 GL_PREFIX(GetFinalCombinerInputParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4976(%rax), %r11
+	movq	4984(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23435,13 +23480,13 @@ GL_PREFIX(GetFinalCombinerInputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4976(%rax), %r11
+	movq	4984(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4976(%rax), %r11
+	movq	4984(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23451,7 +23496,7 @@ GL_PREFIX(GetFinalCombinerInputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4976(%rax), %r11
+	movq	4984(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetFinalCombinerInputParameterfvNV), .-GL_PREFIX(GetFinalCombinerInputParameterfvNV)
@@ -23462,7 +23507,7 @@ GL_PREFIX(GetFinalCombinerInputParameterfvNV):
 GL_PREFIX(GetFinalCombinerInputParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4984(%rax), %r11
+	movq	4992(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23472,13 +23517,13 @@ GL_PREFIX(GetFinalCombinerInputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4984(%rax), %r11
+	movq	4992(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4984(%rax), %r11
+	movq	4992(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23488,7 +23533,7 @@ GL_PREFIX(GetFinalCombinerInputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4984(%rax), %r11
+	movq	4992(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetFinalCombinerInputParameterivNV), .-GL_PREFIX(GetFinalCombinerInputParameterivNV)
@@ -23499,25 +23544,25 @@ GL_PREFIX(GetFinalCombinerInputParameterivNV):
 GL_PREFIX(ResizeBuffersMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4992(%rax), %r11
+	movq	5000(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	4992(%rax), %r11
+	movq	5000(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4992(%rax), %r11
+	movq	5000(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	4992(%rax), %r11
+	movq	5000(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ResizeBuffersMESA), .-GL_PREFIX(ResizeBuffersMESA)
@@ -23528,7 +23573,7 @@ GL_PREFIX(ResizeBuffersMESA):
 GL_PREFIX(WindowPos2dMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5000(%rax), %r11
+	movq	5008(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -23538,13 +23583,13 @@ GL_PREFIX(WindowPos2dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5000(%rax), %r11
+	movq	5008(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5000(%rax), %r11
+	movq	5008(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -23554,7 +23599,7 @@ GL_PREFIX(WindowPos2dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5000(%rax), %r11
+	movq	5008(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2dMESA), .-GL_PREFIX(WindowPos2dMESA)
@@ -23565,25 +23610,25 @@ GL_PREFIX(WindowPos2dMESA):
 GL_PREFIX(WindowPos2dvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5008(%rax), %r11
+	movq	5016(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5008(%rax), %r11
+	movq	5016(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5008(%rax), %r11
+	movq	5016(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5008(%rax), %r11
+	movq	5016(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2dvMESA), .-GL_PREFIX(WindowPos2dvMESA)
@@ -23594,7 +23639,7 @@ GL_PREFIX(WindowPos2dvMESA):
 GL_PREFIX(WindowPos2fMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5016(%rax), %r11
+	movq	5024(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -23604,13 +23649,13 @@ GL_PREFIX(WindowPos2fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5016(%rax), %r11
+	movq	5024(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5016(%rax), %r11
+	movq	5024(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -23620,7 +23665,7 @@ GL_PREFIX(WindowPos2fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5016(%rax), %r11
+	movq	5024(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2fMESA), .-GL_PREFIX(WindowPos2fMESA)
@@ -23631,25 +23676,25 @@ GL_PREFIX(WindowPos2fMESA):
 GL_PREFIX(WindowPos2fvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5024(%rax), %r11
+	movq	5032(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5024(%rax), %r11
+	movq	5032(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5024(%rax), %r11
+	movq	5032(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5024(%rax), %r11
+	movq	5032(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2fvMESA), .-GL_PREFIX(WindowPos2fvMESA)
@@ -23660,7 +23705,7 @@ GL_PREFIX(WindowPos2fvMESA):
 GL_PREFIX(WindowPos2iMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5032(%rax), %r11
+	movq	5040(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23670,13 +23715,13 @@ GL_PREFIX(WindowPos2iMESA):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5032(%rax), %r11
+	movq	5040(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5032(%rax), %r11
+	movq	5040(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23686,7 +23731,7 @@ GL_PREFIX(WindowPos2iMESA):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5032(%rax), %r11
+	movq	5040(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2iMESA), .-GL_PREFIX(WindowPos2iMESA)
@@ -23697,25 +23742,25 @@ GL_PREFIX(WindowPos2iMESA):
 GL_PREFIX(WindowPos2ivMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5040(%rax), %r11
+	movq	5048(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5040(%rax), %r11
+	movq	5048(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5040(%rax), %r11
+	movq	5048(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5040(%rax), %r11
+	movq	5048(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2ivMESA), .-GL_PREFIX(WindowPos2ivMESA)
@@ -23726,7 +23771,7 @@ GL_PREFIX(WindowPos2ivMESA):
 GL_PREFIX(WindowPos2sMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5048(%rax), %r11
+	movq	5056(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23736,13 +23781,13 @@ GL_PREFIX(WindowPos2sMESA):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5048(%rax), %r11
+	movq	5056(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5048(%rax), %r11
+	movq	5056(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23752,7 +23797,7 @@ GL_PREFIX(WindowPos2sMESA):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5048(%rax), %r11
+	movq	5056(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2sMESA), .-GL_PREFIX(WindowPos2sMESA)
@@ -23763,25 +23808,25 @@ GL_PREFIX(WindowPos2sMESA):
 GL_PREFIX(WindowPos2svMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5056(%rax), %r11
+	movq	5064(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5056(%rax), %r11
+	movq	5064(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5056(%rax), %r11
+	movq	5064(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5056(%rax), %r11
+	movq	5064(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2svMESA), .-GL_PREFIX(WindowPos2svMESA)
@@ -23792,7 +23837,7 @@ GL_PREFIX(WindowPos2svMESA):
 GL_PREFIX(WindowPos3dMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5064(%rax), %r11
+	movq	5072(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -23804,13 +23849,13 @@ GL_PREFIX(WindowPos3dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5064(%rax), %r11
+	movq	5072(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5064(%rax), %r11
+	movq	5072(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -23822,7 +23867,7 @@ GL_PREFIX(WindowPos3dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5064(%rax), %r11
+	movq	5072(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3dMESA), .-GL_PREFIX(WindowPos3dMESA)
@@ -23833,25 +23878,25 @@ GL_PREFIX(WindowPos3dMESA):
 GL_PREFIX(WindowPos3dvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5072(%rax), %r11
+	movq	5080(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5072(%rax), %r11
+	movq	5080(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5072(%rax), %r11
+	movq	5080(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5072(%rax), %r11
+	movq	5080(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3dvMESA), .-GL_PREFIX(WindowPos3dvMESA)
@@ -23862,7 +23907,7 @@ GL_PREFIX(WindowPos3dvMESA):
 GL_PREFIX(WindowPos3fMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5080(%rax), %r11
+	movq	5088(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -23874,13 +23919,13 @@ GL_PREFIX(WindowPos3fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5080(%rax), %r11
+	movq	5088(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5080(%rax), %r11
+	movq	5088(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -23892,7 +23937,7 @@ GL_PREFIX(WindowPos3fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5080(%rax), %r11
+	movq	5088(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3fMESA), .-GL_PREFIX(WindowPos3fMESA)
@@ -23903,25 +23948,25 @@ GL_PREFIX(WindowPos3fMESA):
 GL_PREFIX(WindowPos3fvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5088(%rax), %r11
+	movq	5096(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5088(%rax), %r11
+	movq	5096(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5088(%rax), %r11
+	movq	5096(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5088(%rax), %r11
+	movq	5096(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3fvMESA), .-GL_PREFIX(WindowPos3fvMESA)
@@ -23932,7 +23977,7 @@ GL_PREFIX(WindowPos3fvMESA):
 GL_PREFIX(WindowPos3iMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5096(%rax), %r11
+	movq	5104(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23942,13 +23987,13 @@ GL_PREFIX(WindowPos3iMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5096(%rax), %r11
+	movq	5104(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5096(%rax), %r11
+	movq	5104(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23958,7 +24003,7 @@ GL_PREFIX(WindowPos3iMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5096(%rax), %r11
+	movq	5104(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3iMESA), .-GL_PREFIX(WindowPos3iMESA)
@@ -23969,25 +24014,25 @@ GL_PREFIX(WindowPos3iMESA):
 GL_PREFIX(WindowPos3ivMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5104(%rax), %r11
+	movq	5112(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5104(%rax), %r11
+	movq	5112(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5104(%rax), %r11
+	movq	5112(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5104(%rax), %r11
+	movq	5112(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3ivMESA), .-GL_PREFIX(WindowPos3ivMESA)
@@ -23998,7 +24043,7 @@ GL_PREFIX(WindowPos3ivMESA):
 GL_PREFIX(WindowPos3sMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5112(%rax), %r11
+	movq	5120(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24008,13 +24053,13 @@ GL_PREFIX(WindowPos3sMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5112(%rax), %r11
+	movq	5120(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5112(%rax), %r11
+	movq	5120(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24024,7 +24069,7 @@ GL_PREFIX(WindowPos3sMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5112(%rax), %r11
+	movq	5120(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3sMESA), .-GL_PREFIX(WindowPos3sMESA)
@@ -24035,25 +24080,25 @@ GL_PREFIX(WindowPos3sMESA):
 GL_PREFIX(WindowPos3svMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5120(%rax), %r11
+	movq	5128(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5120(%rax), %r11
+	movq	5128(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5120(%rax), %r11
+	movq	5128(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5120(%rax), %r11
+	movq	5128(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3svMESA), .-GL_PREFIX(WindowPos3svMESA)
@@ -24064,7 +24109,7 @@ GL_PREFIX(WindowPos3svMESA):
 GL_PREFIX(WindowPos4dMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5128(%rax), %r11
+	movq	5136(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -24078,13 +24123,13 @@ GL_PREFIX(WindowPos4dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$40, %rsp
-	movq	5128(%rax), %r11
+	movq	5136(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5128(%rax), %r11
+	movq	5136(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -24098,7 +24143,7 @@ GL_PREFIX(WindowPos4dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$40, %rsp
-	movq	5128(%rax), %r11
+	movq	5136(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4dMESA), .-GL_PREFIX(WindowPos4dMESA)
@@ -24109,25 +24154,25 @@ GL_PREFIX(WindowPos4dMESA):
 GL_PREFIX(WindowPos4dvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5136(%rax), %r11
+	movq	5144(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5136(%rax), %r11
+	movq	5144(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5136(%rax), %r11
+	movq	5144(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5136(%rax), %r11
+	movq	5144(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4dvMESA), .-GL_PREFIX(WindowPos4dvMESA)
@@ -24138,7 +24183,7 @@ GL_PREFIX(WindowPos4dvMESA):
 GL_PREFIX(WindowPos4fMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5144(%rax), %r11
+	movq	5152(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -24152,13 +24197,13 @@ GL_PREFIX(WindowPos4fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$40, %rsp
-	movq	5144(%rax), %r11
+	movq	5152(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5144(%rax), %r11
+	movq	5152(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -24172,7 +24217,7 @@ GL_PREFIX(WindowPos4fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$40, %rsp
-	movq	5144(%rax), %r11
+	movq	5152(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4fMESA), .-GL_PREFIX(WindowPos4fMESA)
@@ -24183,25 +24228,25 @@ GL_PREFIX(WindowPos4fMESA):
 GL_PREFIX(WindowPos4fvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5152(%rax), %r11
+	movq	5160(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5152(%rax), %r11
+	movq	5160(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5152(%rax), %r11
+	movq	5160(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5152(%rax), %r11
+	movq	5160(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4fvMESA), .-GL_PREFIX(WindowPos4fvMESA)
@@ -24212,7 +24257,7 @@ GL_PREFIX(WindowPos4fvMESA):
 GL_PREFIX(WindowPos4iMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5160(%rax), %r11
+	movq	5168(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24226,13 +24271,13 @@ GL_PREFIX(WindowPos4iMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5160(%rax), %r11
+	movq	5168(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5160(%rax), %r11
+	movq	5168(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24246,7 +24291,7 @@ GL_PREFIX(WindowPos4iMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5160(%rax), %r11
+	movq	5168(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4iMESA), .-GL_PREFIX(WindowPos4iMESA)
@@ -24257,25 +24302,25 @@ GL_PREFIX(WindowPos4iMESA):
 GL_PREFIX(WindowPos4ivMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5168(%rax), %r11
+	movq	5176(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5168(%rax), %r11
+	movq	5176(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5168(%rax), %r11
+	movq	5176(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5168(%rax), %r11
+	movq	5176(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4ivMESA), .-GL_PREFIX(WindowPos4ivMESA)
@@ -24286,7 +24331,7 @@ GL_PREFIX(WindowPos4ivMESA):
 GL_PREFIX(WindowPos4sMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5176(%rax), %r11
+	movq	5184(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24300,13 +24345,13 @@ GL_PREFIX(WindowPos4sMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5176(%rax), %r11
+	movq	5184(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5176(%rax), %r11
+	movq	5184(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24320,7 +24365,7 @@ GL_PREFIX(WindowPos4sMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5176(%rax), %r11
+	movq	5184(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4sMESA), .-GL_PREFIX(WindowPos4sMESA)
@@ -24329,51 +24374,13 @@ GL_PREFIX(WindowPos4sMESA):
 	.globl	GL_PREFIX(WindowPos4svMESA)
 	.type	GL_PREFIX(WindowPos4svMESA), @function
 GL_PREFIX(WindowPos4svMESA):
-#if defined(GLX_USE_TLS)
-	call	_x86_64_get_dispatch@PLT
-	movq	5184(%rax), %r11
-	jmp	*%r11
-#elif defined(PTHREADS)
-	pushq	%rdi
-	call	_x86_64_get_dispatch@PLT
-	popq	%rdi
-	movq	5184(%rax), %r11
-	jmp	*%r11
-#else
-	movq	_glapi_Dispatch(%rip), %rax
-	testq	%rax, %rax
-	je	1f
-	movq	5184(%rax), %r11
-	jmp	*%r11
-1:
-	pushq	%rdi
-	call	_glapi_get_dispatch
-	popq	%rdi
-	movq	5184(%rax), %r11
-	jmp	*%r11
-#endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(WindowPos4svMESA), .-GL_PREFIX(WindowPos4svMESA)
-
-	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_649)
-	.type	GL_PREFIX(_dispatch_stub_649), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_649))
-GL_PREFIX(_dispatch_stub_649):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
 	movq	5192(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
-	pushq	%rsi
-	pushq	%rdx
-	pushq	%rcx
-	pushq	%r8
 	call	_x86_64_get_dispatch@PLT
-	popq	%r8
-	popq	%rcx
-	popq	%rdx
-	popq	%rsi
 	popq	%rdi
 	movq	5192(%rax), %r11
 	jmp	*%r11
@@ -24385,20 +24392,12 @@ GL_PREFIX(_dispatch_stub_649):
 	jmp	*%r11
 1:
 	pushq	%rdi
-	pushq	%rsi
-	pushq	%rdx
-	pushq	%rcx
-	pushq	%r8
 	call	_glapi_get_dispatch
-	popq	%r8
-	popq	%rcx
-	popq	%rdx
-	popq	%rsi
 	popq	%rdi
 	movq	5192(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_649), .-GL_PREFIX(_dispatch_stub_649)
+	.size	GL_PREFIX(WindowPos4svMESA), .-GL_PREFIX(WindowPos4svMESA)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(_dispatch_stub_650)
@@ -24415,11 +24414,7 @@ GL_PREFIX(_dispatch_stub_650):
 	pushq	%rdx
 	pushq	%rcx
 	pushq	%r8
-	pushq	%r9
-	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
-	popq	%rbp
-	popq	%r9
 	popq	%r8
 	popq	%rcx
 	popq	%rdx
@@ -24439,11 +24434,7 @@ GL_PREFIX(_dispatch_stub_650):
 	pushq	%rdx
 	pushq	%rcx
 	pushq	%r8
-	pushq	%r9
-	pushq	%rbp
 	call	_glapi_get_dispatch
-	popq	%rbp
-	popq	%r9
 	popq	%r8
 	popq	%rcx
 	popq	%rdx
@@ -24466,9 +24457,17 @@ GL_PREFIX(_dispatch_stub_651):
 #elif defined(PTHREADS)
 	pushq	%rdi
 	pushq	%rsi
+	pushq	%rdx
+	pushq	%rcx
+	pushq	%r8
+	pushq	%r9
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
+	popq	%r9
+	popq	%r8
+	popq	%rcx
+	popq	%rdx
 	popq	%rsi
 	popq	%rdi
 	movq	5208(%rax), %r11
@@ -24482,9 +24481,17 @@ GL_PREFIX(_dispatch_stub_651):
 1:
 	pushq	%rdi
 	pushq	%rsi
+	pushq	%rdx
+	pushq	%rcx
+	pushq	%r8
+	pushq	%r9
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
+	popq	%r9
+	popq	%r8
+	popq	%rcx
+	popq	%rdx
 	popq	%rsi
 	popq	%rdi
 	movq	5208(%rax), %r11
@@ -24503,7 +24510,11 @@ GL_PREFIX(_dispatch_stub_652):
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
+	popq	%rbp
+	popq	%rsi
 	popq	%rdi
 	movq	5216(%rax), %r11
 	jmp	*%r11
@@ -24515,7 +24526,11 @@ GL_PREFIX(_dispatch_stub_652):
 	jmp	*%r11
 1:
 	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
 	call	_glapi_get_dispatch
+	popq	%rbp
+	popq	%rsi
 	popq	%rdi
 	movq	5216(%rax), %r11
 	jmp	*%r11
@@ -24533,11 +24548,7 @@ GL_PREFIX(_dispatch_stub_653):
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
-	pushq	%rsi
-	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
-	popq	%rbp
-	popq	%rsi
 	popq	%rdi
 	movq	5224(%rax), %r11
 	jmp	*%r11
@@ -24549,11 +24560,7 @@ GL_PREFIX(_dispatch_stub_653):
 	jmp	*%r11
 1:
 	pushq	%rdi
-	pushq	%rsi
-	pushq	%rbp
 	call	_glapi_get_dispatch
-	popq	%rbp
-	popq	%rsi
 	popq	%rdi
 	movq	5224(%rax), %r11
 	jmp	*%r11
@@ -24572,9 +24579,9 @@ GL_PREFIX(_dispatch_stub_654):
 #elif defined(PTHREADS)
 	pushq	%rdi
 	pushq	%rsi
-	pushq	%rdx
+	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
-	popq	%rdx
+	popq	%rbp
 	popq	%rsi
 	popq	%rdi
 	movq	5232(%rax), %r11
@@ -24588,9 +24595,9 @@ GL_PREFIX(_dispatch_stub_654):
 1:
 	pushq	%rdi
 	pushq	%rsi
-	pushq	%rdx
+	pushq	%rbp
 	call	_glapi_get_dispatch
-	popq	%rdx
+	popq	%rbp
 	popq	%rsi
 	popq	%rdi
 	movq	5232(%rax), %r11
@@ -24609,7 +24616,11 @@ GL_PREFIX(_dispatch_stub_655):
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
 	call	_x86_64_get_dispatch@PLT
+	popq	%rdx
+	popq	%rsi
 	popq	%rdi
 	movq	5240(%rax), %r11
 	jmp	*%r11
@@ -24621,7 +24632,11 @@ GL_PREFIX(_dispatch_stub_655):
 	jmp	*%r11
 1:
 	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
 	call	_glapi_get_dispatch
+	popq	%rdx
+	popq	%rsi
 	popq	%rdi
 	movq	5240(%rax), %r11
 	jmp	*%r11
@@ -24637,6 +24652,36 @@ GL_PREFIX(_dispatch_stub_656):
 	call	_x86_64_get_dispatch@PLT
 	movq	5248(%rax), %r11
 	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	call	_x86_64_get_dispatch@PLT
+	popq	%rdi
+	movq	5248(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	5248(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	call	_glapi_get_dispatch
+	popq	%rdi
+	movq	5248(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(_dispatch_stub_656), .-GL_PREFIX(_dispatch_stub_656)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(_dispatch_stub_657)
+	.type	GL_PREFIX(_dispatch_stub_657), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_657))
+GL_PREFIX(_dispatch_stub_657):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	5256(%rax), %r11
+	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	pushq	%rsi
@@ -24645,13 +24690,13 @@ GL_PREFIX(_dispatch_stub_656):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5248(%rax), %r11
+	movq	5256(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5248(%rax), %r11
+	movq	5256(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24661,40 +24706,40 @@ GL_PREFIX(_dispatch_stub_656):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5248(%rax), %r11
+	movq	5256(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_656), .-GL_PREFIX(_dispatch_stub_656)
+	.size	GL_PREFIX(_dispatch_stub_657), .-GL_PREFIX(_dispatch_stub_657)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_657)
-	.type	GL_PREFIX(_dispatch_stub_657), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_657))
-GL_PREFIX(_dispatch_stub_657):
+	.globl	GL_PREFIX(_dispatch_stub_658)
+	.type	GL_PREFIX(_dispatch_stub_658), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_658))
+GL_PREFIX(_dispatch_stub_658):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5256(%rax), %r11
+	movq	5264(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5256(%rax), %r11
+	movq	5264(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5256(%rax), %r11
+	movq	5264(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5256(%rax), %r11
+	movq	5264(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_657), .-GL_PREFIX(_dispatch_stub_657)
+	.size	GL_PREFIX(_dispatch_stub_658), .-GL_PREFIX(_dispatch_stub_658)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(AreProgramsResidentNV)
@@ -24702,7 +24747,7 @@ GL_PREFIX(_dispatch_stub_657):
 GL_PREFIX(AreProgramsResidentNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5264(%rax), %r11
+	movq	5272(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24712,13 +24757,13 @@ GL_PREFIX(AreProgramsResidentNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5264(%rax), %r11
+	movq	5272(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5264(%rax), %r11
+	movq	5272(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24728,7 +24773,7 @@ GL_PREFIX(AreProgramsResidentNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5264(%rax), %r11
+	movq	5272(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AreProgramsResidentNV), .-GL_PREFIX(AreProgramsResidentNV)
@@ -24739,7 +24784,7 @@ GL_PREFIX(AreProgramsResidentNV):
 GL_PREFIX(BindProgramNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5272(%rax), %r11
+	movq	5280(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24749,13 +24794,13 @@ GL_PREFIX(BindProgramNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5272(%rax), %r11
+	movq	5280(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5272(%rax), %r11
+	movq	5280(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24765,7 +24810,7 @@ GL_PREFIX(BindProgramNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5272(%rax), %r11
+	movq	5280(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindProgramNV), .-GL_PREFIX(BindProgramNV)
@@ -24776,7 +24821,7 @@ GL_PREFIX(BindProgramNV):
 GL_PREFIX(DeleteProgramsNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5280(%rax), %r11
+	movq	5288(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24786,13 +24831,13 @@ GL_PREFIX(DeleteProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5280(%rax), %r11
+	movq	5288(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5280(%rax), %r11
+	movq	5288(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24802,7 +24847,7 @@ GL_PREFIX(DeleteProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5280(%rax), %r11
+	movq	5288(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteProgramsNV), .-GL_PREFIX(DeleteProgramsNV)
@@ -24813,7 +24858,7 @@ GL_PREFIX(DeleteProgramsNV):
 GL_PREFIX(ExecuteProgramNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5288(%rax), %r11
+	movq	5296(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24823,13 +24868,13 @@ GL_PREFIX(ExecuteProgramNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5288(%rax), %r11
+	movq	5296(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5288(%rax), %r11
+	movq	5296(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24839,7 +24884,7 @@ GL_PREFIX(ExecuteProgramNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5288(%rax), %r11
+	movq	5296(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ExecuteProgramNV), .-GL_PREFIX(ExecuteProgramNV)
@@ -24850,7 +24895,7 @@ GL_PREFIX(ExecuteProgramNV):
 GL_PREFIX(GenProgramsNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5296(%rax), %r11
+	movq	5304(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24860,13 +24905,13 @@ GL_PREFIX(GenProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5296(%rax), %r11
+	movq	5304(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5296(%rax), %r11
+	movq	5304(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24876,7 +24921,7 @@ GL_PREFIX(GenProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5296(%rax), %r11
+	movq	5304(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenProgramsNV), .-GL_PREFIX(GenProgramsNV)
@@ -24887,7 +24932,7 @@ GL_PREFIX(GenProgramsNV):
 GL_PREFIX(GetProgramParameterdvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5304(%rax), %r11
+	movq	5312(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24901,13 +24946,13 @@ GL_PREFIX(GetProgramParameterdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5304(%rax), %r11
+	movq	5312(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5304(%rax), %r11
+	movq	5312(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24921,7 +24966,7 @@ GL_PREFIX(GetProgramParameterdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5304(%rax), %r11
+	movq	5312(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramParameterdvNV), .-GL_PREFIX(GetProgramParameterdvNV)
@@ -24932,7 +24977,7 @@ GL_PREFIX(GetProgramParameterdvNV):
 GL_PREFIX(GetProgramParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5312(%rax), %r11
+	movq	5320(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24946,13 +24991,13 @@ GL_PREFIX(GetProgramParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5312(%rax), %r11
+	movq	5320(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5312(%rax), %r11
+	movq	5320(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24966,7 +25011,7 @@ GL_PREFIX(GetProgramParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5312(%rax), %r11
+	movq	5320(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramParameterfvNV), .-GL_PREFIX(GetProgramParameterfvNV)
@@ -24977,7 +25022,7 @@ GL_PREFIX(GetProgramParameterfvNV):
 GL_PREFIX(GetProgramStringNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5320(%rax), %r11
+	movq	5328(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24987,13 +25032,13 @@ GL_PREFIX(GetProgramStringNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5320(%rax), %r11
+	movq	5328(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5320(%rax), %r11
+	movq	5328(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25003,7 +25048,7 @@ GL_PREFIX(GetProgramStringNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5320(%rax), %r11
+	movq	5328(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramStringNV), .-GL_PREFIX(GetProgramStringNV)
@@ -25014,7 +25059,7 @@ GL_PREFIX(GetProgramStringNV):
 GL_PREFIX(GetProgramivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5328(%rax), %r11
+	movq	5336(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25024,13 +25069,13 @@ GL_PREFIX(GetProgramivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5328(%rax), %r11
+	movq	5336(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5328(%rax), %r11
+	movq	5336(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25040,7 +25085,7 @@ GL_PREFIX(GetProgramivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5328(%rax), %r11
+	movq	5336(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramivNV), .-GL_PREFIX(GetProgramivNV)
@@ -25051,7 +25096,7 @@ GL_PREFIX(GetProgramivNV):
 GL_PREFIX(GetTrackMatrixivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5336(%rax), %r11
+	movq	5344(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25065,13 +25110,13 @@ GL_PREFIX(GetTrackMatrixivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5336(%rax), %r11
+	movq	5344(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5336(%rax), %r11
+	movq	5344(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25085,7 +25130,7 @@ GL_PREFIX(GetTrackMatrixivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5336(%rax), %r11
+	movq	5344(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetTrackMatrixivNV), .-GL_PREFIX(GetTrackMatrixivNV)
@@ -25096,7 +25141,7 @@ GL_PREFIX(GetTrackMatrixivNV):
 GL_PREFIX(GetVertexAttribPointervNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5344(%rax), %r11
+	movq	5352(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25106,13 +25151,13 @@ GL_PREFIX(GetVertexAttribPointervNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5344(%rax), %r11
+	movq	5352(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5344(%rax), %r11
+	movq	5352(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25122,7 +25167,7 @@ GL_PREFIX(GetVertexAttribPointervNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5344(%rax), %r11
+	movq	5352(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribPointervNV), .-GL_PREFIX(GetVertexAttribPointervNV)
@@ -25133,7 +25178,7 @@ GL_PREFIX(GetVertexAttribPointervNV):
 GL_PREFIX(GetVertexAttribdvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5352(%rax), %r11
+	movq	5360(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25143,13 +25188,13 @@ GL_PREFIX(GetVertexAttribdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5352(%rax), %r11
+	movq	5360(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5352(%rax), %r11
+	movq	5360(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25159,7 +25204,7 @@ GL_PREFIX(GetVertexAttribdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5352(%rax), %r11
+	movq	5360(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribdvNV), .-GL_PREFIX(GetVertexAttribdvNV)
@@ -25170,7 +25215,7 @@ GL_PREFIX(GetVertexAttribdvNV):
 GL_PREFIX(GetVertexAttribfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5360(%rax), %r11
+	movq	5368(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25180,13 +25225,13 @@ GL_PREFIX(GetVertexAttribfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5360(%rax), %r11
+	movq	5368(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5360(%rax), %r11
+	movq	5368(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25196,7 +25241,7 @@ GL_PREFIX(GetVertexAttribfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5360(%rax), %r11
+	movq	5368(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribfvNV), .-GL_PREFIX(GetVertexAttribfvNV)
@@ -25207,7 +25252,7 @@ GL_PREFIX(GetVertexAttribfvNV):
 GL_PREFIX(GetVertexAttribivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5368(%rax), %r11
+	movq	5376(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25217,13 +25262,13 @@ GL_PREFIX(GetVertexAttribivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5368(%rax), %r11
+	movq	5376(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5368(%rax), %r11
+	movq	5376(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25233,7 +25278,7 @@ GL_PREFIX(GetVertexAttribivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5368(%rax), %r11
+	movq	5376(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribivNV), .-GL_PREFIX(GetVertexAttribivNV)
@@ -25244,25 +25289,25 @@ GL_PREFIX(GetVertexAttribivNV):
 GL_PREFIX(IsProgramNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5376(%rax), %r11
+	movq	5384(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5376(%rax), %r11
+	movq	5384(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5376(%rax), %r11
+	movq	5384(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5376(%rax), %r11
+	movq	5384(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsProgramNV), .-GL_PREFIX(IsProgramNV)
@@ -25273,7 +25318,7 @@ GL_PREFIX(IsProgramNV):
 GL_PREFIX(LoadProgramNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5384(%rax), %r11
+	movq	5392(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25287,13 +25332,13 @@ GL_PREFIX(LoadProgramNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5384(%rax), %r11
+	movq	5392(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5384(%rax), %r11
+	movq	5392(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25307,7 +25352,7 @@ GL_PREFIX(LoadProgramNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5384(%rax), %r11
+	movq	5392(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(LoadProgramNV), .-GL_PREFIX(LoadProgramNV)
@@ -25318,7 +25363,7 @@ GL_PREFIX(LoadProgramNV):
 GL_PREFIX(ProgramParameters4dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5392(%rax), %r11
+	movq	5400(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25332,13 +25377,13 @@ GL_PREFIX(ProgramParameters4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5392(%rax), %r11
+	movq	5400(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5392(%rax), %r11
+	movq	5400(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25352,7 +25397,7 @@ GL_PREFIX(ProgramParameters4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5392(%rax), %r11
+	movq	5400(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramParameters4dvNV), .-GL_PREFIX(ProgramParameters4dvNV)
@@ -25363,7 +25408,7 @@ GL_PREFIX(ProgramParameters4dvNV):
 GL_PREFIX(ProgramParameters4fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5400(%rax), %r11
+	movq	5408(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25377,13 +25422,13 @@ GL_PREFIX(ProgramParameters4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5400(%rax), %r11
+	movq	5408(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5400(%rax), %r11
+	movq	5408(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25397,7 +25442,7 @@ GL_PREFIX(ProgramParameters4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5400(%rax), %r11
+	movq	5408(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramParameters4fvNV), .-GL_PREFIX(ProgramParameters4fvNV)
@@ -25408,7 +25453,7 @@ GL_PREFIX(ProgramParameters4fvNV):
 GL_PREFIX(RequestResidentProgramsNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5408(%rax), %r11
+	movq	5416(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25418,13 +25463,13 @@ GL_PREFIX(RequestResidentProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5408(%rax), %r11
+	movq	5416(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5408(%rax), %r11
+	movq	5416(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25434,7 +25479,7 @@ GL_PREFIX(RequestResidentProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5408(%rax), %r11
+	movq	5416(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(RequestResidentProgramsNV), .-GL_PREFIX(RequestResidentProgramsNV)
@@ -25445,7 +25490,7 @@ GL_PREFIX(RequestResidentProgramsNV):
 GL_PREFIX(TrackMatrixNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5416(%rax), %r11
+	movq	5424(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25459,13 +25504,13 @@ GL_PREFIX(TrackMatrixNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5416(%rax), %r11
+	movq	5424(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5416(%rax), %r11
+	movq	5424(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25479,7 +25524,7 @@ GL_PREFIX(TrackMatrixNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5416(%rax), %r11
+	movq	5424(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TrackMatrixNV), .-GL_PREFIX(TrackMatrixNV)
@@ -25490,7 +25535,7 @@ GL_PREFIX(TrackMatrixNV):
 GL_PREFIX(VertexAttrib1dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5424(%rax), %r11
+	movq	5432(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -25500,13 +25545,13 @@ GL_PREFIX(VertexAttrib1dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5424(%rax), %r11
+	movq	5432(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5424(%rax), %r11
+	movq	5432(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -25516,7 +25561,7 @@ GL_PREFIX(VertexAttrib1dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5424(%rax), %r11
+	movq	5432(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1dNV), .-GL_PREFIX(VertexAttrib1dNV)
@@ -25527,7 +25572,7 @@ GL_PREFIX(VertexAttrib1dNV):
 GL_PREFIX(VertexAttrib1dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5432(%rax), %r11
+	movq	5440(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25537,13 +25582,13 @@ GL_PREFIX(VertexAttrib1dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5432(%rax), %r11
+	movq	5440(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5432(%rax), %r11
+	movq	5440(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25553,7 +25598,7 @@ GL_PREFIX(VertexAttrib1dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5432(%rax), %r11
+	movq	5440(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1dvNV), .-GL_PREFIX(VertexAttrib1dvNV)
@@ -25564,7 +25609,7 @@ GL_PREFIX(VertexAttrib1dvNV):
 GL_PREFIX(VertexAttrib1fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5440(%rax), %r11
+	movq	5448(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -25574,13 +25619,13 @@ GL_PREFIX(VertexAttrib1fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5440(%rax), %r11
+	movq	5448(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5440(%rax), %r11
+	movq	5448(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -25590,7 +25635,7 @@ GL_PREFIX(VertexAttrib1fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5440(%rax), %r11
+	movq	5448(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1fNV), .-GL_PREFIX(VertexAttrib1fNV)
@@ -25601,7 +25646,7 @@ GL_PREFIX(VertexAttrib1fNV):
 GL_PREFIX(VertexAttrib1fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5448(%rax), %r11
+	movq	5456(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25611,13 +25656,13 @@ GL_PREFIX(VertexAttrib1fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5448(%rax), %r11
+	movq	5456(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5448(%rax), %r11
+	movq	5456(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25627,7 +25672,7 @@ GL_PREFIX(VertexAttrib1fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5448(%rax), %r11
+	movq	5456(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1fvNV), .-GL_PREFIX(VertexAttrib1fvNV)
@@ -25638,7 +25683,7 @@ GL_PREFIX(VertexAttrib1fvNV):
 GL_PREFIX(VertexAttrib1sNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5456(%rax), %r11
+	movq	5464(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25648,13 +25693,13 @@ GL_PREFIX(VertexAttrib1sNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5456(%rax), %r11
+	movq	5464(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5456(%rax), %r11
+	movq	5464(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25664,7 +25709,7 @@ GL_PREFIX(VertexAttrib1sNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5456(%rax), %r11
+	movq	5464(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1sNV), .-GL_PREFIX(VertexAttrib1sNV)
@@ -25675,7 +25720,7 @@ GL_PREFIX(VertexAttrib1sNV):
 GL_PREFIX(VertexAttrib1svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5464(%rax), %r11
+	movq	5472(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25685,13 +25730,13 @@ GL_PREFIX(VertexAttrib1svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5464(%rax), %r11
+	movq	5472(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5464(%rax), %r11
+	movq	5472(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25701,7 +25746,7 @@ GL_PREFIX(VertexAttrib1svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5464(%rax), %r11
+	movq	5472(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1svNV), .-GL_PREFIX(VertexAttrib1svNV)
@@ -25712,7 +25757,7 @@ GL_PREFIX(VertexAttrib1svNV):
 GL_PREFIX(VertexAttrib2dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5472(%rax), %r11
+	movq	5480(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -25724,13 +25769,13 @@ GL_PREFIX(VertexAttrib2dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5472(%rax), %r11
+	movq	5480(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5472(%rax), %r11
+	movq	5480(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -25742,7 +25787,7 @@ GL_PREFIX(VertexAttrib2dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5472(%rax), %r11
+	movq	5480(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2dNV), .-GL_PREFIX(VertexAttrib2dNV)
@@ -25753,7 +25798,7 @@ GL_PREFIX(VertexAttrib2dNV):
 GL_PREFIX(VertexAttrib2dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5480(%rax), %r11
+	movq	5488(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25763,13 +25808,13 @@ GL_PREFIX(VertexAttrib2dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5480(%rax), %r11
+	movq	5488(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5480(%rax), %r11
+	movq	5488(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25779,7 +25824,7 @@ GL_PREFIX(VertexAttrib2dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5480(%rax), %r11
+	movq	5488(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2dvNV), .-GL_PREFIX(VertexAttrib2dvNV)
@@ -25790,7 +25835,7 @@ GL_PREFIX(VertexAttrib2dvNV):
 GL_PREFIX(VertexAttrib2fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5488(%rax), %r11
+	movq	5496(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -25802,13 +25847,13 @@ GL_PREFIX(VertexAttrib2fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5488(%rax), %r11
+	movq	5496(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5488(%rax), %r11
+	movq	5496(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -25820,7 +25865,7 @@ GL_PREFIX(VertexAttrib2fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5488(%rax), %r11
+	movq	5496(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2fNV), .-GL_PREFIX(VertexAttrib2fNV)
@@ -25831,7 +25876,7 @@ GL_PREFIX(VertexAttrib2fNV):
 GL_PREFIX(VertexAttrib2fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5496(%rax), %r11
+	movq	5504(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25841,13 +25886,13 @@ GL_PREFIX(VertexAttrib2fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5496(%rax), %r11
+	movq	5504(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5496(%rax), %r11
+	movq	5504(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25857,7 +25902,7 @@ GL_PREFIX(VertexAttrib2fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5496(%rax), %r11
+	movq	5504(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2fvNV), .-GL_PREFIX(VertexAttrib2fvNV)
@@ -25868,7 +25913,7 @@ GL_PREFIX(VertexAttrib2fvNV):
 GL_PREFIX(VertexAttrib2sNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5504(%rax), %r11
+	movq	5512(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25878,13 +25923,13 @@ GL_PREFIX(VertexAttrib2sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5504(%rax), %r11
+	movq	5512(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5504(%rax), %r11
+	movq	5512(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25894,7 +25939,7 @@ GL_PREFIX(VertexAttrib2sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5504(%rax), %r11
+	movq	5512(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2sNV), .-GL_PREFIX(VertexAttrib2sNV)
@@ -25905,7 +25950,7 @@ GL_PREFIX(VertexAttrib2sNV):
 GL_PREFIX(VertexAttrib2svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5512(%rax), %r11
+	movq	5520(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25915,13 +25960,13 @@ GL_PREFIX(VertexAttrib2svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5512(%rax), %r11
+	movq	5520(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5512(%rax), %r11
+	movq	5520(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25931,7 +25976,7 @@ GL_PREFIX(VertexAttrib2svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5512(%rax), %r11
+	movq	5520(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2svNV), .-GL_PREFIX(VertexAttrib2svNV)
@@ -25942,7 +25987,7 @@ GL_PREFIX(VertexAttrib2svNV):
 GL_PREFIX(VertexAttrib3dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5520(%rax), %r11
+	movq	5528(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -25956,13 +26001,13 @@ GL_PREFIX(VertexAttrib3dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5520(%rax), %r11
+	movq	5528(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5520(%rax), %r11
+	movq	5528(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -25976,7 +26021,7 @@ GL_PREFIX(VertexAttrib3dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5520(%rax), %r11
+	movq	5528(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3dNV), .-GL_PREFIX(VertexAttrib3dNV)
@@ -25987,7 +26032,7 @@ GL_PREFIX(VertexAttrib3dNV):
 GL_PREFIX(VertexAttrib3dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5528(%rax), %r11
+	movq	5536(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25997,13 +26042,13 @@ GL_PREFIX(VertexAttrib3dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5528(%rax), %r11
+	movq	5536(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5528(%rax), %r11
+	movq	5536(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26013,7 +26058,7 @@ GL_PREFIX(VertexAttrib3dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5528(%rax), %r11
+	movq	5536(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3dvNV), .-GL_PREFIX(VertexAttrib3dvNV)
@@ -26024,7 +26069,7 @@ GL_PREFIX(VertexAttrib3dvNV):
 GL_PREFIX(VertexAttrib3fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5536(%rax), %r11
+	movq	5544(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -26038,13 +26083,13 @@ GL_PREFIX(VertexAttrib3fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5536(%rax), %r11
+	movq	5544(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5536(%rax), %r11
+	movq	5544(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -26058,7 +26103,7 @@ GL_PREFIX(VertexAttrib3fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5536(%rax), %r11
+	movq	5544(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3fNV), .-GL_PREFIX(VertexAttrib3fNV)
@@ -26069,7 +26114,7 @@ GL_PREFIX(VertexAttrib3fNV):
 GL_PREFIX(VertexAttrib3fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5544(%rax), %r11
+	movq	5552(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26079,13 +26124,13 @@ GL_PREFIX(VertexAttrib3fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5544(%rax), %r11
+	movq	5552(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5544(%rax), %r11
+	movq	5552(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26095,7 +26140,7 @@ GL_PREFIX(VertexAttrib3fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5544(%rax), %r11
+	movq	5552(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3fvNV), .-GL_PREFIX(VertexAttrib3fvNV)
@@ -26106,7 +26151,7 @@ GL_PREFIX(VertexAttrib3fvNV):
 GL_PREFIX(VertexAttrib3sNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5552(%rax), %r11
+	movq	5560(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26120,13 +26165,13 @@ GL_PREFIX(VertexAttrib3sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5552(%rax), %r11
+	movq	5560(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5552(%rax), %r11
+	movq	5560(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26140,7 +26185,7 @@ GL_PREFIX(VertexAttrib3sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5552(%rax), %r11
+	movq	5560(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3sNV), .-GL_PREFIX(VertexAttrib3sNV)
@@ -26151,7 +26196,7 @@ GL_PREFIX(VertexAttrib3sNV):
 GL_PREFIX(VertexAttrib3svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5560(%rax), %r11
+	movq	5568(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26161,13 +26206,13 @@ GL_PREFIX(VertexAttrib3svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5560(%rax), %r11
+	movq	5568(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5560(%rax), %r11
+	movq	5568(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26177,7 +26222,7 @@ GL_PREFIX(VertexAttrib3svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5560(%rax), %r11
+	movq	5568(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3svNV), .-GL_PREFIX(VertexAttrib3svNV)
@@ -26188,7 +26233,7 @@ GL_PREFIX(VertexAttrib3svNV):
 GL_PREFIX(VertexAttrib4dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5568(%rax), %r11
+	movq	5576(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -26204,13 +26249,13 @@ GL_PREFIX(VertexAttrib4dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5568(%rax), %r11
+	movq	5576(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5568(%rax), %r11
+	movq	5576(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -26226,7 +26271,7 @@ GL_PREFIX(VertexAttrib4dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5568(%rax), %r11
+	movq	5576(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4dNV), .-GL_PREFIX(VertexAttrib4dNV)
@@ -26237,7 +26282,7 @@ GL_PREFIX(VertexAttrib4dNV):
 GL_PREFIX(VertexAttrib4dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5576(%rax), %r11
+	movq	5584(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26247,13 +26292,13 @@ GL_PREFIX(VertexAttrib4dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5576(%rax), %r11
+	movq	5584(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5576(%rax), %r11
+	movq	5584(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26263,7 +26308,7 @@ GL_PREFIX(VertexAttrib4dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5576(%rax), %r11
+	movq	5584(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4dvNV), .-GL_PREFIX(VertexAttrib4dvNV)
@@ -26274,7 +26319,7 @@ GL_PREFIX(VertexAttrib4dvNV):
 GL_PREFIX(VertexAttrib4fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5584(%rax), %r11
+	movq	5592(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -26290,13 +26335,13 @@ GL_PREFIX(VertexAttrib4fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5584(%rax), %r11
+	movq	5592(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5584(%rax), %r11
+	movq	5592(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -26312,7 +26357,7 @@ GL_PREFIX(VertexAttrib4fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5584(%rax), %r11
+	movq	5592(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4fNV), .-GL_PREFIX(VertexAttrib4fNV)
@@ -26323,7 +26368,7 @@ GL_PREFIX(VertexAttrib4fNV):
 GL_PREFIX(VertexAttrib4fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5592(%rax), %r11
+	movq	5600(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26333,13 +26378,13 @@ GL_PREFIX(VertexAttrib4fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5592(%rax), %r11
+	movq	5600(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5592(%rax), %r11
+	movq	5600(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26349,7 +26394,7 @@ GL_PREFIX(VertexAttrib4fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5592(%rax), %r11
+	movq	5600(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4fvNV), .-GL_PREFIX(VertexAttrib4fvNV)
@@ -26360,7 +26405,7 @@ GL_PREFIX(VertexAttrib4fvNV):
 GL_PREFIX(VertexAttrib4sNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5600(%rax), %r11
+	movq	5608(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26374,13 +26419,13 @@ GL_PREFIX(VertexAttrib4sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5600(%rax), %r11
+	movq	5608(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5600(%rax), %r11
+	movq	5608(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26394,7 +26439,7 @@ GL_PREFIX(VertexAttrib4sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5600(%rax), %r11
+	movq	5608(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4sNV), .-GL_PREFIX(VertexAttrib4sNV)
@@ -26405,7 +26450,7 @@ GL_PREFIX(VertexAttrib4sNV):
 GL_PREFIX(VertexAttrib4svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5608(%rax), %r11
+	movq	5616(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26415,13 +26460,13 @@ GL_PREFIX(VertexAttrib4svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5608(%rax), %r11
+	movq	5616(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5608(%rax), %r11
+	movq	5616(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26431,7 +26476,7 @@ GL_PREFIX(VertexAttrib4svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5608(%rax), %r11
+	movq	5616(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4svNV), .-GL_PREFIX(VertexAttrib4svNV)
@@ -26442,7 +26487,7 @@ GL_PREFIX(VertexAttrib4svNV):
 GL_PREFIX(VertexAttrib4ubNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5616(%rax), %r11
+	movq	5624(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26456,13 +26501,13 @@ GL_PREFIX(VertexAttrib4ubNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5616(%rax), %r11
+	movq	5624(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5616(%rax), %r11
+	movq	5624(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26476,7 +26521,7 @@ GL_PREFIX(VertexAttrib4ubNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5616(%rax), %r11
+	movq	5624(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4ubNV), .-GL_PREFIX(VertexAttrib4ubNV)
@@ -26487,7 +26532,7 @@ GL_PREFIX(VertexAttrib4ubNV):
 GL_PREFIX(VertexAttrib4ubvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5624(%rax), %r11
+	movq	5632(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26497,13 +26542,13 @@ GL_PREFIX(VertexAttrib4ubvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5624(%rax), %r11
+	movq	5632(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5624(%rax), %r11
+	movq	5632(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26513,7 +26558,7 @@ GL_PREFIX(VertexAttrib4ubvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5624(%rax), %r11
+	movq	5632(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4ubvNV), .-GL_PREFIX(VertexAttrib4ubvNV)
@@ -26524,7 +26569,7 @@ GL_PREFIX(VertexAttrib4ubvNV):
 GL_PREFIX(VertexAttribPointerNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5632(%rax), %r11
+	movq	5640(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26538,13 +26583,13 @@ GL_PREFIX(VertexAttribPointerNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5632(%rax), %r11
+	movq	5640(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5632(%rax), %r11
+	movq	5640(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26558,7 +26603,7 @@ GL_PREFIX(VertexAttribPointerNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5632(%rax), %r11
+	movq	5640(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribPointerNV), .-GL_PREFIX(VertexAttribPointerNV)
@@ -26569,7 +26614,7 @@ GL_PREFIX(VertexAttribPointerNV):
 GL_PREFIX(VertexAttribs1dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5640(%rax), %r11
+	movq	5648(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26579,13 +26624,13 @@ GL_PREFIX(VertexAttribs1dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5640(%rax), %r11
+	movq	5648(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5640(%rax), %r11
+	movq	5648(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26595,7 +26640,7 @@ GL_PREFIX(VertexAttribs1dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5640(%rax), %r11
+	movq	5648(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs1dvNV), .-GL_PREFIX(VertexAttribs1dvNV)
@@ -26606,7 +26651,7 @@ GL_PREFIX(VertexAttribs1dvNV):
 GL_PREFIX(VertexAttribs1fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5648(%rax), %r11
+	movq	5656(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26616,13 +26661,13 @@ GL_PREFIX(VertexAttribs1fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5648(%rax), %r11
+	movq	5656(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5648(%rax), %r11
+	movq	5656(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26632,7 +26677,7 @@ GL_PREFIX(VertexAttribs1fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5648(%rax), %r11
+	movq	5656(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs1fvNV), .-GL_PREFIX(VertexAttribs1fvNV)
@@ -26643,7 +26688,7 @@ GL_PREFIX(VertexAttribs1fvNV):
 GL_PREFIX(VertexAttribs1svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5656(%rax), %r11
+	movq	5664(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26653,13 +26698,13 @@ GL_PREFIX(VertexAttribs1svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5656(%rax), %r11
+	movq	5664(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5656(%rax), %r11
+	movq	5664(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26669,7 +26714,7 @@ GL_PREFIX(VertexAttribs1svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5656(%rax), %r11
+	movq	5664(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs1svNV), .-GL_PREFIX(VertexAttribs1svNV)
@@ -26680,7 +26725,7 @@ GL_PREFIX(VertexAttribs1svNV):
 GL_PREFIX(VertexAttribs2dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5664(%rax), %r11
+	movq	5672(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26690,13 +26735,13 @@ GL_PREFIX(VertexAttribs2dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5664(%rax), %r11
+	movq	5672(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5664(%rax), %r11
+	movq	5672(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26706,7 +26751,7 @@ GL_PREFIX(VertexAttribs2dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5664(%rax), %r11
+	movq	5672(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs2dvNV), .-GL_PREFIX(VertexAttribs2dvNV)
@@ -26717,7 +26762,7 @@ GL_PREFIX(VertexAttribs2dvNV):
 GL_PREFIX(VertexAttribs2fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5672(%rax), %r11
+	movq	5680(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26727,13 +26772,13 @@ GL_PREFIX(VertexAttribs2fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5672(%rax), %r11
+	movq	5680(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5672(%rax), %r11
+	movq	5680(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26743,7 +26788,7 @@ GL_PREFIX(VertexAttribs2fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5672(%rax), %r11
+	movq	5680(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs2fvNV), .-GL_PREFIX(VertexAttribs2fvNV)
@@ -26754,7 +26799,7 @@ GL_PREFIX(VertexAttribs2fvNV):
 GL_PREFIX(VertexAttribs2svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5680(%rax), %r11
+	movq	5688(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26764,13 +26809,13 @@ GL_PREFIX(VertexAttribs2svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5680(%rax), %r11
+	movq	5688(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5680(%rax), %r11
+	movq	5688(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26780,7 +26825,7 @@ GL_PREFIX(VertexAttribs2svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5680(%rax), %r11
+	movq	5688(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs2svNV), .-GL_PREFIX(VertexAttribs2svNV)
@@ -26791,7 +26836,7 @@ GL_PREFIX(VertexAttribs2svNV):
 GL_PREFIX(VertexAttribs3dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5688(%rax), %r11
+	movq	5696(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26801,13 +26846,13 @@ GL_PREFIX(VertexAttribs3dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5688(%rax), %r11
+	movq	5696(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5688(%rax), %r11
+	movq	5696(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26817,7 +26862,7 @@ GL_PREFIX(VertexAttribs3dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5688(%rax), %r11
+	movq	5696(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs3dvNV), .-GL_PREFIX(VertexAttribs3dvNV)
@@ -26828,7 +26873,7 @@ GL_PREFIX(VertexAttribs3dvNV):
 GL_PREFIX(VertexAttribs3fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5696(%rax), %r11
+	movq	5704(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26838,13 +26883,13 @@ GL_PREFIX(VertexAttribs3fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5696(%rax), %r11
+	movq	5704(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5696(%rax), %r11
+	movq	5704(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26854,7 +26899,7 @@ GL_PREFIX(VertexAttribs3fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5696(%rax), %r11
+	movq	5704(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs3fvNV), .-GL_PREFIX(VertexAttribs3fvNV)
@@ -26865,7 +26910,7 @@ GL_PREFIX(VertexAttribs3fvNV):
 GL_PREFIX(VertexAttribs3svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5704(%rax), %r11
+	movq	5712(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26875,13 +26920,13 @@ GL_PREFIX(VertexAttribs3svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5704(%rax), %r11
+	movq	5712(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5704(%rax), %r11
+	movq	5712(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26891,7 +26936,7 @@ GL_PREFIX(VertexAttribs3svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5704(%rax), %r11
+	movq	5712(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs3svNV), .-GL_PREFIX(VertexAttribs3svNV)
@@ -26902,7 +26947,7 @@ GL_PREFIX(VertexAttribs3svNV):
 GL_PREFIX(VertexAttribs4dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5712(%rax), %r11
+	movq	5720(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26912,13 +26957,13 @@ GL_PREFIX(VertexAttribs4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5712(%rax), %r11
+	movq	5720(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5712(%rax), %r11
+	movq	5720(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26928,7 +26973,7 @@ GL_PREFIX(VertexAttribs4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5712(%rax), %r11
+	movq	5720(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs4dvNV), .-GL_PREFIX(VertexAttribs4dvNV)
@@ -26939,7 +26984,7 @@ GL_PREFIX(VertexAttribs4dvNV):
 GL_PREFIX(VertexAttribs4fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5720(%rax), %r11
+	movq	5728(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26949,13 +26994,13 @@ GL_PREFIX(VertexAttribs4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5720(%rax), %r11
+	movq	5728(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5720(%rax), %r11
+	movq	5728(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26965,7 +27010,7 @@ GL_PREFIX(VertexAttribs4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5720(%rax), %r11
+	movq	5728(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs4fvNV), .-GL_PREFIX(VertexAttribs4fvNV)
@@ -26976,7 +27021,7 @@ GL_PREFIX(VertexAttribs4fvNV):
 GL_PREFIX(VertexAttribs4svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5728(%rax), %r11
+	movq	5736(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26986,13 +27031,13 @@ GL_PREFIX(VertexAttribs4svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5728(%rax), %r11
+	movq	5736(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5728(%rax), %r11
+	movq	5736(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27002,7 +27047,7 @@ GL_PREFIX(VertexAttribs4svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5728(%rax), %r11
+	movq	5736(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs4svNV), .-GL_PREFIX(VertexAttribs4svNV)
@@ -27013,7 +27058,7 @@ GL_PREFIX(VertexAttribs4svNV):
 GL_PREFIX(VertexAttribs4ubvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5736(%rax), %r11
+	movq	5744(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27023,13 +27068,13 @@ GL_PREFIX(VertexAttribs4ubvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5736(%rax), %r11
+	movq	5744(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5736(%rax), %r11
+	movq	5744(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27039,7 +27084,7 @@ GL_PREFIX(VertexAttribs4ubvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5736(%rax), %r11
+	movq	5744(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs4ubvNV), .-GL_PREFIX(VertexAttribs4ubvNV)
@@ -27050,7 +27095,7 @@ GL_PREFIX(VertexAttribs4ubvNV):
 GL_PREFIX(GetTexBumpParameterfvATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5744(%rax), %r11
+	movq	5752(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27060,13 +27105,13 @@ GL_PREFIX(GetTexBumpParameterfvATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5744(%rax), %r11
+	movq	5752(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5744(%rax), %r11
+	movq	5752(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27076,7 +27121,7 @@ GL_PREFIX(GetTexBumpParameterfvATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5744(%rax), %r11
+	movq	5752(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetTexBumpParameterfvATI), .-GL_PREFIX(GetTexBumpParameterfvATI)
@@ -27087,7 +27132,7 @@ GL_PREFIX(GetTexBumpParameterfvATI):
 GL_PREFIX(GetTexBumpParameterivATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5752(%rax), %r11
+	movq	5760(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27097,13 +27142,13 @@ GL_PREFIX(GetTexBumpParameterivATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5752(%rax), %r11
+	movq	5760(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5752(%rax), %r11
+	movq	5760(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27113,7 +27158,7 @@ GL_PREFIX(GetTexBumpParameterivATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5752(%rax), %r11
+	movq	5760(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetTexBumpParameterivATI), .-GL_PREFIX(GetTexBumpParameterivATI)
@@ -27124,7 +27169,7 @@ GL_PREFIX(GetTexBumpParameterivATI):
 GL_PREFIX(TexBumpParameterfvATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5760(%rax), %r11
+	movq	5768(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27134,13 +27179,13 @@ GL_PREFIX(TexBumpParameterfvATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5760(%rax), %r11
+	movq	5768(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5760(%rax), %r11
+	movq	5768(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27150,7 +27195,7 @@ GL_PREFIX(TexBumpParameterfvATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5760(%rax), %r11
+	movq	5768(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexBumpParameterfvATI), .-GL_PREFIX(TexBumpParameterfvATI)
@@ -27161,7 +27206,7 @@ GL_PREFIX(TexBumpParameterfvATI):
 GL_PREFIX(TexBumpParameterivATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5768(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27171,13 +27216,13 @@ GL_PREFIX(TexBumpParameterivATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5768(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5768(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27187,7 +27232,7 @@ GL_PREFIX(TexBumpParameterivATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5768(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexBumpParameterivATI), .-GL_PREFIX(TexBumpParameterivATI)
@@ -27198,7 +27243,7 @@ GL_PREFIX(TexBumpParameterivATI):
 GL_PREFIX(AlphaFragmentOp1ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5776(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27216,13 +27261,13 @@ GL_PREFIX(AlphaFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5776(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5776(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27240,7 +27285,7 @@ GL_PREFIX(AlphaFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5776(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AlphaFragmentOp1ATI), .-GL_PREFIX(AlphaFragmentOp1ATI)
@@ -27251,7 +27296,7 @@ GL_PREFIX(AlphaFragmentOp1ATI):
 GL_PREFIX(AlphaFragmentOp2ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5784(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27269,13 +27314,13 @@ GL_PREFIX(AlphaFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5784(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5784(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27293,7 +27338,7 @@ GL_PREFIX(AlphaFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5784(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AlphaFragmentOp2ATI), .-GL_PREFIX(AlphaFragmentOp2ATI)
@@ -27304,7 +27349,7 @@ GL_PREFIX(AlphaFragmentOp2ATI):
 GL_PREFIX(AlphaFragmentOp3ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5792(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27322,13 +27367,13 @@ GL_PREFIX(AlphaFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5792(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5792(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27346,7 +27391,7 @@ GL_PREFIX(AlphaFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5792(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AlphaFragmentOp3ATI), .-GL_PREFIX(AlphaFragmentOp3ATI)
@@ -27357,25 +27402,25 @@ GL_PREFIX(AlphaFragmentOp3ATI):
 GL_PREFIX(BeginFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5800(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	5800(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5800(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	5800(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BeginFragmentShaderATI), .-GL_PREFIX(BeginFragmentShaderATI)
@@ -27386,25 +27431,25 @@ GL_PREFIX(BeginFragmentShaderATI):
 GL_PREFIX(BindFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5808(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5808(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5808(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5808(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindFragmentShaderATI), .-GL_PREFIX(BindFragmentShaderATI)
@@ -27415,7 +27460,7 @@ GL_PREFIX(BindFragmentShaderATI):
 GL_PREFIX(ColorFragmentOp1ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5816(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27433,13 +27478,13 @@ GL_PREFIX(ColorFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5816(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5816(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27457,7 +27502,7 @@ GL_PREFIX(ColorFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5816(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorFragmentOp1ATI), .-GL_PREFIX(ColorFragmentOp1ATI)
@@ -27468,7 +27513,7 @@ GL_PREFIX(ColorFragmentOp1ATI):
 GL_PREFIX(ColorFragmentOp2ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5824(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27486,13 +27531,13 @@ GL_PREFIX(ColorFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5824(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5824(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27510,7 +27555,7 @@ GL_PREFIX(ColorFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5824(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorFragmentOp2ATI), .-GL_PREFIX(ColorFragmentOp2ATI)
@@ -27521,7 +27566,7 @@ GL_PREFIX(ColorFragmentOp2ATI):
 GL_PREFIX(ColorFragmentOp3ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5832(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27539,13 +27584,13 @@ GL_PREFIX(ColorFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5832(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5832(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27563,7 +27608,7 @@ GL_PREFIX(ColorFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5832(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorFragmentOp3ATI), .-GL_PREFIX(ColorFragmentOp3ATI)
@@ -27574,25 +27619,25 @@ GL_PREFIX(ColorFragmentOp3ATI):
 GL_PREFIX(DeleteFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5840(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5840(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5840(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5840(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteFragmentShaderATI), .-GL_PREFIX(DeleteFragmentShaderATI)
@@ -27603,25 +27648,25 @@ GL_PREFIX(DeleteFragmentShaderATI):
 GL_PREFIX(EndFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5848(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	5848(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5848(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	5848(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EndFragmentShaderATI), .-GL_PREFIX(EndFragmentShaderATI)
@@ -27632,25 +27677,25 @@ GL_PREFIX(EndFragmentShaderATI):
 GL_PREFIX(GenFragmentShadersATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5856(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5856(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5856(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5856(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenFragmentShadersATI), .-GL_PREFIX(GenFragmentShadersATI)
@@ -27661,7 +27706,7 @@ GL_PREFIX(GenFragmentShadersATI):
 GL_PREFIX(PassTexCoordATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5864(%rax), %r11
+	movq	5872(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27671,13 +27716,13 @@ GL_PREFIX(PassTexCoordATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5864(%rax), %r11
+	movq	5872(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5864(%rax), %r11
+	movq	5872(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27687,7 +27732,7 @@ GL_PREFIX(PassTexCoordATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5864(%rax), %r11
+	movq	5872(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PassTexCoordATI), .-GL_PREFIX(PassTexCoordATI)
@@ -27698,7 +27743,7 @@ GL_PREFIX(PassTexCoordATI):
 GL_PREFIX(SampleMapATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5872(%rax), %r11
+	movq	5880(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27708,13 +27753,13 @@ GL_PREFIX(SampleMapATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5872(%rax), %r11
+	movq	5880(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5872(%rax), %r11
+	movq	5880(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27724,7 +27769,7 @@ GL_PREFIX(SampleMapATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5872(%rax), %r11
+	movq	5880(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SampleMapATI), .-GL_PREFIX(SampleMapATI)
@@ -27735,7 +27780,7 @@ GL_PREFIX(SampleMapATI):
 GL_PREFIX(SetFragmentShaderConstantATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5880(%rax), %r11
+	movq	5888(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27745,13 +27790,13 @@ GL_PREFIX(SetFragmentShaderConstantATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5880(%rax), %r11
+	movq	5888(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5880(%rax), %r11
+	movq	5888(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27761,7 +27806,7 @@ GL_PREFIX(SetFragmentShaderConstantATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5880(%rax), %r11
+	movq	5888(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SetFragmentShaderConstantATI), .-GL_PREFIX(SetFragmentShaderConstantATI)
@@ -27772,7 +27817,7 @@ GL_PREFIX(SetFragmentShaderConstantATI):
 GL_PREFIX(PointParameteriNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5888(%rax), %r11
+	movq	5896(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27782,13 +27827,13 @@ GL_PREFIX(PointParameteriNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5888(%rax), %r11
+	movq	5896(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5888(%rax), %r11
+	movq	5896(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27798,7 +27843,7 @@ GL_PREFIX(PointParameteriNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5888(%rax), %r11
+	movq	5896(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PointParameteriNV), .-GL_PREFIX(PointParameteriNV)
@@ -27809,7 +27854,7 @@ GL_PREFIX(PointParameteriNV):
 GL_PREFIX(PointParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5896(%rax), %r11
+	movq	5904(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27819,13 +27864,13 @@ GL_PREFIX(PointParameterivNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5896(%rax), %r11
+	movq	5904(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5896(%rax), %r11
+	movq	5904(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27835,40 +27880,10 @@ GL_PREFIX(PointParameterivNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5896(%rax), %r11
-	jmp	*%r11
-#endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(PointParameterivNV), .-GL_PREFIX(PointParameterivNV)
-
-	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_738)
-	.type	GL_PREFIX(_dispatch_stub_738), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_738))
-GL_PREFIX(_dispatch_stub_738):
-#if defined(GLX_USE_TLS)
-	call	_x86_64_get_dispatch@PLT
-	movq	5904(%rax), %r11
-	jmp	*%r11
-#elif defined(PTHREADS)
-	pushq	%rdi
-	call	_x86_64_get_dispatch@PLT
-	popq	%rdi
-	movq	5904(%rax), %r11
-	jmp	*%r11
-#else
-	movq	_glapi_Dispatch(%rip), %rax
-	testq	%rax, %rax
-	je	1f
-	movq	5904(%rax), %r11
-	jmp	*%r11
-1:
-	pushq	%rdi
-	call	_glapi_get_dispatch
-	popq	%rdi
 	movq	5904(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_738), .-GL_PREFIX(_dispatch_stub_738)
+	.size	GL_PREFIX(PointParameterivNV), .-GL_PREFIX(PointParameterivNV)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(_dispatch_stub_739)
@@ -27911,11 +27926,7 @@ GL_PREFIX(_dispatch_stub_740):
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
-	pushq	%rsi
-	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
-	popq	%rbp
-	popq	%rsi
 	popq	%rdi
 	movq	5920(%rax), %r11
 	jmp	*%r11
@@ -27927,11 +27938,7 @@ GL_PREFIX(_dispatch_stub_740):
 	jmp	*%r11
 1:
 	pushq	%rdi
-	pushq	%rsi
-	pushq	%rbp
 	call	_glapi_get_dispatch
-	popq	%rbp
-	popq	%rsi
 	popq	%rdi
 	movq	5920(%rax), %r11
 	jmp	*%r11
@@ -27987,7 +27994,11 @@ GL_PREFIX(_dispatch_stub_742):
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
+	popq	%rbp
+	popq	%rsi
 	popq	%rdi
 	movq	5936(%rax), %r11
 	jmp	*%r11
@@ -27999,20 +28010,54 @@ GL_PREFIX(_dispatch_stub_742):
 	jmp	*%r11
 1:
 	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
 	call	_glapi_get_dispatch
+	popq	%rbp
+	popq	%rsi
 	popq	%rdi
 	movq	5936(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(_dispatch_stub_742), .-GL_PREFIX(_dispatch_stub_742)
 
+	.p2align	4,,15
+	.globl	GL_PREFIX(_dispatch_stub_743)
+	.type	GL_PREFIX(_dispatch_stub_743), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_743))
+GL_PREFIX(_dispatch_stub_743):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	5944(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	call	_x86_64_get_dispatch@PLT
+	popq	%rdi
+	movq	5944(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	5944(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	call	_glapi_get_dispatch
+	popq	%rdi
+	movq	5944(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(_dispatch_stub_743), .-GL_PREFIX(_dispatch_stub_743)
+
 	.p2align	4,,15
 	.globl	GL_PREFIX(GetProgramNamedParameterdvNV)
 	.type	GL_PREFIX(GetProgramNamedParameterdvNV), @function
 GL_PREFIX(GetProgramNamedParameterdvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5944(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28026,13 +28071,13 @@ GL_PREFIX(GetProgramNamedParameterdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5944(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5944(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28046,7 +28091,7 @@ GL_PREFIX(GetProgramNamedParameterdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5944(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramNamedParameterdvNV), .-GL_PREFIX(GetProgramNamedParameterdvNV)
@@ -28057,7 +28102,7 @@ GL_PREFIX(GetProgramNamedParameterdvNV):
 GL_PREFIX(GetProgramNamedParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5952(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28071,13 +28116,13 @@ GL_PREFIX(GetProgramNamedParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5952(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5952(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28091,7 +28136,7 @@ GL_PREFIX(GetProgramNamedParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5952(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramNamedParameterfvNV), .-GL_PREFIX(GetProgramNamedParameterfvNV)
@@ -28102,7 +28147,7 @@ GL_PREFIX(GetProgramNamedParameterfvNV):
 GL_PREFIX(ProgramNamedParameter4dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5960(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$56, %rsp
@@ -28122,13 +28167,13 @@ GL_PREFIX(ProgramNamedParameter4dNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	5960(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5960(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$56, %rsp
@@ -28148,7 +28193,7 @@ GL_PREFIX(ProgramNamedParameter4dNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	5960(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4dNV), .-GL_PREFIX(ProgramNamedParameter4dNV)
@@ -28159,7 +28204,7 @@ GL_PREFIX(ProgramNamedParameter4dNV):
 GL_PREFIX(ProgramNamedParameter4dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5968(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28173,13 +28218,13 @@ GL_PREFIX(ProgramNamedParameter4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5968(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5968(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28193,7 +28238,7 @@ GL_PREFIX(ProgramNamedParameter4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5968(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4dvNV), .-GL_PREFIX(ProgramNamedParameter4dvNV)
@@ -28204,7 +28249,7 @@ GL_PREFIX(ProgramNamedParameter4dvNV):
 GL_PREFIX(ProgramNamedParameter4fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5976(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$56, %rsp
@@ -28224,13 +28269,13 @@ GL_PREFIX(ProgramNamedParameter4fNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	5976(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5976(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$56, %rsp
@@ -28250,7 +28295,7 @@ GL_PREFIX(ProgramNamedParameter4fNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	5976(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4fNV), .-GL_PREFIX(ProgramNamedParameter4fNV)
@@ -28261,7 +28306,7 @@ GL_PREFIX(ProgramNamedParameter4fNV):
 GL_PREFIX(ProgramNamedParameter4fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5984(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28275,13 +28320,13 @@ GL_PREFIX(ProgramNamedParameter4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5984(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5984(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28295,19 +28340,19 @@ GL_PREFIX(ProgramNamedParameter4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5984(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4fvNV), .-GL_PREFIX(ProgramNamedParameter4fvNV)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_749)
-	.type	GL_PREFIX(_dispatch_stub_749), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_749))
-GL_PREFIX(_dispatch_stub_749):
+	.globl	GL_PREFIX(_dispatch_stub_750)
+	.type	GL_PREFIX(_dispatch_stub_750), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_750))
+GL_PREFIX(_dispatch_stub_750):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5992(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28317,13 +28362,13 @@ GL_PREFIX(_dispatch_stub_749):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5992(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5992(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28333,19 +28378,19 @@ GL_PREFIX(_dispatch_stub_749):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5992(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_749), .-GL_PREFIX(_dispatch_stub_749)
+	.size	GL_PREFIX(_dispatch_stub_750), .-GL_PREFIX(_dispatch_stub_750)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_750)
-	.type	GL_PREFIX(_dispatch_stub_750), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_750))
-GL_PREFIX(_dispatch_stub_750):
+	.globl	GL_PREFIX(_dispatch_stub_751)
+	.type	GL_PREFIX(_dispatch_stub_751), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_751))
+GL_PREFIX(_dispatch_stub_751):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6000(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28355,13 +28400,13 @@ GL_PREFIX(_dispatch_stub_750):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6000(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6000(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28371,10 +28416,10 @@ GL_PREFIX(_dispatch_stub_750):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6000(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_750), .-GL_PREFIX(_dispatch_stub_750)
+	.size	GL_PREFIX(_dispatch_stub_751), .-GL_PREFIX(_dispatch_stub_751)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(BindFramebufferEXT)
@@ -28382,7 +28427,7 @@ GL_PREFIX(_dispatch_stub_750):
 GL_PREFIX(BindFramebufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6008(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28392,13 +28437,13 @@ GL_PREFIX(BindFramebufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6008(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6008(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28408,7 +28453,7 @@ GL_PREFIX(BindFramebufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6008(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindFramebufferEXT), .-GL_PREFIX(BindFramebufferEXT)
@@ -28419,7 +28464,7 @@ GL_PREFIX(BindFramebufferEXT):
 GL_PREFIX(BindRenderbufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6016(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28429,13 +28474,13 @@ GL_PREFIX(BindRenderbufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6016(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6016(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28445,7 +28490,7 @@ GL_PREFIX(BindRenderbufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6016(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindRenderbufferEXT), .-GL_PREFIX(BindRenderbufferEXT)
@@ -28456,25 +28501,25 @@ GL_PREFIX(BindRenderbufferEXT):
 GL_PREFIX(CheckFramebufferStatusEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6024(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6024(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6024(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6024(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CheckFramebufferStatusEXT), .-GL_PREFIX(CheckFramebufferStatusEXT)
@@ -28485,7 +28530,7 @@ GL_PREFIX(CheckFramebufferStatusEXT):
 GL_PREFIX(DeleteFramebuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6032(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28495,13 +28540,13 @@ GL_PREFIX(DeleteFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6032(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6032(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28511,7 +28556,7 @@ GL_PREFIX(DeleteFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6032(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteFramebuffersEXT), .-GL_PREFIX(DeleteFramebuffersEXT)
@@ -28522,7 +28567,7 @@ GL_PREFIX(DeleteFramebuffersEXT):
 GL_PREFIX(DeleteRenderbuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6040(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28532,13 +28577,13 @@ GL_PREFIX(DeleteRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6040(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6040(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28548,7 +28593,7 @@ GL_PREFIX(DeleteRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6040(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteRenderbuffersEXT), .-GL_PREFIX(DeleteRenderbuffersEXT)
@@ -28559,7 +28604,7 @@ GL_PREFIX(DeleteRenderbuffersEXT):
 GL_PREFIX(FramebufferRenderbufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6048(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28573,13 +28618,13 @@ GL_PREFIX(FramebufferRenderbufferEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6048(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6048(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28593,7 +28638,7 @@ GL_PREFIX(FramebufferRenderbufferEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6048(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferRenderbufferEXT), .-GL_PREFIX(FramebufferRenderbufferEXT)
@@ -28604,7 +28649,7 @@ GL_PREFIX(FramebufferRenderbufferEXT):
 GL_PREFIX(FramebufferTexture1DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6056(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28618,13 +28663,13 @@ GL_PREFIX(FramebufferTexture1DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6056(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6056(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28638,7 +28683,7 @@ GL_PREFIX(FramebufferTexture1DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6056(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTexture1DEXT), .-GL_PREFIX(FramebufferTexture1DEXT)
@@ -28649,7 +28694,7 @@ GL_PREFIX(FramebufferTexture1DEXT):
 GL_PREFIX(FramebufferTexture2DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6064(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28663,13 +28708,13 @@ GL_PREFIX(FramebufferTexture2DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6064(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6064(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28683,7 +28728,7 @@ GL_PREFIX(FramebufferTexture2DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6064(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTexture2DEXT), .-GL_PREFIX(FramebufferTexture2DEXT)
@@ -28694,7 +28739,7 @@ GL_PREFIX(FramebufferTexture2DEXT):
 GL_PREFIX(FramebufferTexture3DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6072(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28712,13 +28757,13 @@ GL_PREFIX(FramebufferTexture3DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6072(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6072(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28736,7 +28781,7 @@ GL_PREFIX(FramebufferTexture3DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6072(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTexture3DEXT), .-GL_PREFIX(FramebufferTexture3DEXT)
@@ -28747,7 +28792,7 @@ GL_PREFIX(FramebufferTexture3DEXT):
 GL_PREFIX(GenFramebuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6080(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28757,13 +28802,13 @@ GL_PREFIX(GenFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6080(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6080(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28773,7 +28818,7 @@ GL_PREFIX(GenFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6080(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenFramebuffersEXT), .-GL_PREFIX(GenFramebuffersEXT)
@@ -28784,7 +28829,7 @@ GL_PREFIX(GenFramebuffersEXT):
 GL_PREFIX(GenRenderbuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6088(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28794,13 +28839,13 @@ GL_PREFIX(GenRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6088(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6088(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28810,7 +28855,7 @@ GL_PREFIX(GenRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6088(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenRenderbuffersEXT), .-GL_PREFIX(GenRenderbuffersEXT)
@@ -28821,25 +28866,25 @@ GL_PREFIX(GenRenderbuffersEXT):
 GL_PREFIX(GenerateMipmapEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6096(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6096(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6096(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6096(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenerateMipmapEXT), .-GL_PREFIX(GenerateMipmapEXT)
@@ -28850,7 +28895,7 @@ GL_PREFIX(GenerateMipmapEXT):
 GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6104(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28864,13 +28909,13 @@ GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6104(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6104(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28884,7 +28929,7 @@ GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6104(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetFramebufferAttachmentParameterivEXT), .-GL_PREFIX(GetFramebufferAttachmentParameterivEXT)
@@ -28895,7 +28940,7 @@ GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 GL_PREFIX(GetRenderbufferParameterivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6112(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28905,13 +28950,13 @@ GL_PREFIX(GetRenderbufferParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6112(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6112(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28921,7 +28966,7 @@ GL_PREFIX(GetRenderbufferParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6112(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetRenderbufferParameterivEXT), .-GL_PREFIX(GetRenderbufferParameterivEXT)
@@ -28932,25 +28977,25 @@ GL_PREFIX(GetRenderbufferParameterivEXT):
 GL_PREFIX(IsFramebufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6120(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6120(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6120(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6120(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsFramebufferEXT), .-GL_PREFIX(IsFramebufferEXT)
@@ -28961,25 +29006,25 @@ GL_PREFIX(IsFramebufferEXT):
 GL_PREFIX(IsRenderbufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6128(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6128(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6128(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6128(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsRenderbufferEXT), .-GL_PREFIX(IsRenderbufferEXT)
@@ -28990,7 +29035,7 @@ GL_PREFIX(IsRenderbufferEXT):
 GL_PREFIX(RenderbufferStorageEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6136(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29004,13 +29049,13 @@ GL_PREFIX(RenderbufferStorageEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6136(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6136(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29024,19 +29069,19 @@ GL_PREFIX(RenderbufferStorageEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6136(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(RenderbufferStorageEXT), .-GL_PREFIX(RenderbufferStorageEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_768)
-	.type	GL_PREFIX(_dispatch_stub_768), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_768))
-GL_PREFIX(_dispatch_stub_768):
+	.globl	GL_PREFIX(_dispatch_stub_769)
+	.type	GL_PREFIX(_dispatch_stub_769), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_769))
+GL_PREFIX(_dispatch_stub_769):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6144(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29054,13 +29099,13 @@ GL_PREFIX(_dispatch_stub_768):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6144(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6144(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29078,10 +29123,10 @@ GL_PREFIX(_dispatch_stub_768):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6144(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_768), .-GL_PREFIX(_dispatch_stub_768)
+	.size	GL_PREFIX(_dispatch_stub_769), .-GL_PREFIX(_dispatch_stub_769)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(FramebufferTextureLayerEXT)
@@ -29089,7 +29134,7 @@ GL_PREFIX(_dispatch_stub_768):
 GL_PREFIX(FramebufferTextureLayerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6152(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29103,13 +29148,13 @@ GL_PREFIX(FramebufferTextureLayerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6152(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6152(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29123,19 +29168,19 @@ GL_PREFIX(FramebufferTextureLayerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6152(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTextureLayerEXT), .-GL_PREFIX(FramebufferTextureLayerEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_770)
-	.type	GL_PREFIX(_dispatch_stub_770), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_770))
-GL_PREFIX(_dispatch_stub_770):
+	.globl	GL_PREFIX(_dispatch_stub_771)
+	.type	GL_PREFIX(_dispatch_stub_771), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_771))
+GL_PREFIX(_dispatch_stub_771):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6160(%rax), %r11
+	movq	6168(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29149,13 +29194,13 @@ GL_PREFIX(_dispatch_stub_770):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6160(%rax), %r11
+	movq	6168(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6160(%rax), %r11
+	movq	6168(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29169,19 +29214,19 @@ GL_PREFIX(_dispatch_stub_770):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6160(%rax), %r11
+	movq	6168(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_770), .-GL_PREFIX(_dispatch_stub_770)
+	.size	GL_PREFIX(_dispatch_stub_771), .-GL_PREFIX(_dispatch_stub_771)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_771)
-	.type	GL_PREFIX(_dispatch_stub_771), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_771))
-GL_PREFIX(_dispatch_stub_771):
+	.globl	GL_PREFIX(_dispatch_stub_772)
+	.type	GL_PREFIX(_dispatch_stub_772), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_772))
+GL_PREFIX(_dispatch_stub_772):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6168(%rax), %r11
+	movq	6176(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29195,13 +29240,13 @@ GL_PREFIX(_dispatch_stub_771):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6168(%rax), %r11
+	movq	6176(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6168(%rax), %r11
+	movq	6176(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29215,19 +29260,19 @@ GL_PREFIX(_dispatch_stub_771):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6168(%rax), %r11
+	movq	6176(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_771), .-GL_PREFIX(_dispatch_stub_771)
+	.size	GL_PREFIX(_dispatch_stub_772), .-GL_PREFIX(_dispatch_stub_772)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_772)
-	.type	GL_PREFIX(_dispatch_stub_772), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_772))
-GL_PREFIX(_dispatch_stub_772):
+	.globl	GL_PREFIX(_dispatch_stub_773)
+	.type	GL_PREFIX(_dispatch_stub_773), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_773))
+GL_PREFIX(_dispatch_stub_773):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6176(%rax), %r11
+	movq	6184(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29241,13 +29286,13 @@ GL_PREFIX(_dispatch_stub_772):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6176(%rax), %r11
+	movq	6184(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6176(%rax), %r11
+	movq	6184(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29261,19 +29306,19 @@ GL_PREFIX(_dispatch_stub_772):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6176(%rax), %r11
+	movq	6184(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_772), .-GL_PREFIX(_dispatch_stub_772)
+	.size	GL_PREFIX(_dispatch_stub_773), .-GL_PREFIX(_dispatch_stub_773)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_773)
-	.type	GL_PREFIX(_dispatch_stub_773), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_773))
-GL_PREFIX(_dispatch_stub_773):
+	.globl	GL_PREFIX(_dispatch_stub_774)
+	.type	GL_PREFIX(_dispatch_stub_774), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_774))
+GL_PREFIX(_dispatch_stub_774):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6184(%rax), %r11
+	movq	6192(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29283,13 +29328,13 @@ GL_PREFIX(_dispatch_stub_773):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6184(%rax), %r11
+	movq	6192(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6184(%rax), %r11
+	movq	6192(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29299,19 +29344,19 @@ GL_PREFIX(_dispatch_stub_773):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6184(%rax), %r11
+	movq	6192(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_773), .-GL_PREFIX(_dispatch_stub_773)
+	.size	GL_PREFIX(_dispatch_stub_774), .-GL_PREFIX(_dispatch_stub_774)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_774)
-	.type	GL_PREFIX(_dispatch_stub_774), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_774))
-GL_PREFIX(_dispatch_stub_774):
+	.globl	GL_PREFIX(_dispatch_stub_775)
+	.type	GL_PREFIX(_dispatch_stub_775), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_775))
+GL_PREFIX(_dispatch_stub_775):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6192(%rax), %r11
+	movq	6200(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29321,13 +29366,13 @@ GL_PREFIX(_dispatch_stub_774):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6192(%rax), %r11
+	movq	6200(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6192(%rax), %r11
+	movq	6200(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29337,10 +29382,10 @@ GL_PREFIX(_dispatch_stub_774):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6192(%rax), %r11
+	movq	6200(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_774), .-GL_PREFIX(_dispatch_stub_774)
+	.size	GL_PREFIX(_dispatch_stub_775), .-GL_PREFIX(_dispatch_stub_775)
 
 	.globl GL_PREFIX(ArrayElementEXT) ; .set GL_PREFIX(ArrayElementEXT), GL_PREFIX(ArrayElement)
 	.globl GL_PREFIX(BindTextureEXT) ; .set GL_PREFIX(BindTextureEXT), GL_PREFIX(BindTexture)
@@ -29595,7 +29640,7 @@ GL_PREFIX(_dispatch_stub_774):
 	.globl GL_PREFIX(IsProgramARB) ; .set GL_PREFIX(IsProgramARB), GL_PREFIX(IsProgramNV)
 	.globl GL_PREFIX(PointParameteri) ; .set GL_PREFIX(PointParameteri), GL_PREFIX(PointParameteriNV)
 	.globl GL_PREFIX(PointParameteriv) ; .set GL_PREFIX(PointParameteriv), GL_PREFIX(PointParameterivNV)
-	.globl GL_PREFIX(BlendEquationSeparate) ; .set GL_PREFIX(BlendEquationSeparate), GL_PREFIX(_dispatch_stub_750)
+	.globl GL_PREFIX(BlendEquationSeparate) ; .set GL_PREFIX(BlendEquationSeparate), GL_PREFIX(_dispatch_stub_751)
 	.globl GL_PREFIX(BindFramebuffer) ; .set GL_PREFIX(BindFramebuffer), GL_PREFIX(BindFramebufferEXT)
 	.globl GL_PREFIX(BindRenderbuffer) ; .set GL_PREFIX(BindRenderbuffer), GL_PREFIX(BindRenderbufferEXT)
 	.globl GL_PREFIX(CheckFramebufferStatus) ; .set GL_PREFIX(CheckFramebufferStatus), GL_PREFIX(CheckFramebufferStatusEXT)
@@ -29613,7 +29658,7 @@ GL_PREFIX(_dispatch_stub_774):
 	.globl GL_PREFIX(IsFramebuffer) ; .set GL_PREFIX(IsFramebuffer), GL_PREFIX(IsFramebufferEXT)
 	.globl GL_PREFIX(IsRenderbuffer) ; .set GL_PREFIX(IsRenderbuffer), GL_PREFIX(IsRenderbufferEXT)
 	.globl GL_PREFIX(RenderbufferStorage) ; .set GL_PREFIX(RenderbufferStorage), GL_PREFIX(RenderbufferStorageEXT)
-	.globl GL_PREFIX(BlitFramebuffer) ; .set GL_PREFIX(BlitFramebuffer), GL_PREFIX(_dispatch_stub_768)
+	.globl GL_PREFIX(BlitFramebuffer) ; .set GL_PREFIX(BlitFramebuffer), GL_PREFIX(_dispatch_stub_769)
 	.globl GL_PREFIX(FramebufferTextureLayer) ; .set GL_PREFIX(FramebufferTextureLayer), GL_PREFIX(FramebufferTextureLayerEXT)
 
 #if defined(GLX_USE_TLS) && defined(__linux__)
diff --git a/src/mesa/x86/glapi_x86.S b/src/mesa/x86/glapi_x86.S
index 7aa344f214..85eb955413 100644
--- a/src/mesa/x86/glapi_x86.S
+++ b/src/mesa/x86/glapi_x86.S
@@ -713,23 +713,24 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(GetAttribLocationARB, _gloffset_GetAttribLocationARB, GetAttribLocationARB@8)
 	GL_STUB(DrawBuffersARB, _gloffset_DrawBuffersARB, DrawBuffersARB@8)
 	GL_STUB(RenderbufferStorageMultisample, _gloffset_RenderbufferStorageMultisample, RenderbufferStorageMultisample@20)
+	GL_STUB(CopyBufferSubData, _gloffset_CopyBufferSubData, CopyBufferSubData@20)
 	GL_STUB(PolygonOffsetEXT, _gloffset_PolygonOffsetEXT, PolygonOffsetEXT@8)
-	GL_STUB(_dispatch_stub_563, _gloffset_GetPixelTexGenParameterfvSGIS, _dispatch_stub_563@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_563, _dispatch_stub_563@8))
-	GL_STUB(_dispatch_stub_564, _gloffset_GetPixelTexGenParameterivSGIS, _dispatch_stub_564@8)
+	GL_STUB(_dispatch_stub_564, _gloffset_GetPixelTexGenParameterfvSGIS, _dispatch_stub_564@8)
 	HIDDEN(GL_PREFIX(_dispatch_stub_564, _dispatch_stub_564@8))
-	GL_STUB(_dispatch_stub_565, _gloffset_PixelTexGenParameterfSGIS, _dispatch_stub_565@8)
+	GL_STUB(_dispatch_stub_565, _gloffset_GetPixelTexGenParameterivSGIS, _dispatch_stub_565@8)
 	HIDDEN(GL_PREFIX(_dispatch_stub_565, _dispatch_stub_565@8))
-	GL_STUB(_dispatch_stub_566, _gloffset_PixelTexGenParameterfvSGIS, _dispatch_stub_566@8)
+	GL_STUB(_dispatch_stub_566, _gloffset_PixelTexGenParameterfSGIS, _dispatch_stub_566@8)
 	HIDDEN(GL_PREFIX(_dispatch_stub_566, _dispatch_stub_566@8))
-	GL_STUB(_dispatch_stub_567, _gloffset_PixelTexGenParameteriSGIS, _dispatch_stub_567@8)
+	GL_STUB(_dispatch_stub_567, _gloffset_PixelTexGenParameterfvSGIS, _dispatch_stub_567@8)
 	HIDDEN(GL_PREFIX(_dispatch_stub_567, _dispatch_stub_567@8))
-	GL_STUB(_dispatch_stub_568, _gloffset_PixelTexGenParameterivSGIS, _dispatch_stub_568@8)
+	GL_STUB(_dispatch_stub_568, _gloffset_PixelTexGenParameteriSGIS, _dispatch_stub_568@8)
 	HIDDEN(GL_PREFIX(_dispatch_stub_568, _dispatch_stub_568@8))
-	GL_STUB(_dispatch_stub_569, _gloffset_SampleMaskSGIS, _dispatch_stub_569@8)
+	GL_STUB(_dispatch_stub_569, _gloffset_PixelTexGenParameterivSGIS, _dispatch_stub_569@8)
 	HIDDEN(GL_PREFIX(_dispatch_stub_569, _dispatch_stub_569@8))
-	GL_STUB(_dispatch_stub_570, _gloffset_SamplePatternSGIS, _dispatch_stub_570@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_570, _dispatch_stub_570@4))
+	GL_STUB(_dispatch_stub_570, _gloffset_SampleMaskSGIS, _dispatch_stub_570@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_570, _dispatch_stub_570@8))
+	GL_STUB(_dispatch_stub_571, _gloffset_SamplePatternSGIS, _dispatch_stub_571@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_571, _dispatch_stub_571@4))
 	GL_STUB(ColorPointerEXT, _gloffset_ColorPointerEXT, ColorPointerEXT@20)
 	GL_STUB(EdgeFlagPointerEXT, _gloffset_EdgeFlagPointerEXT, EdgeFlagPointerEXT@12)
 	GL_STUB(IndexPointerEXT, _gloffset_IndexPointerEXT, IndexPointerEXT@16)
@@ -740,10 +741,10 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(PointParameterfvEXT, _gloffset_PointParameterfvEXT, PointParameterfvEXT@8)
 	GL_STUB(LockArraysEXT, _gloffset_LockArraysEXT, LockArraysEXT@8)
 	GL_STUB(UnlockArraysEXT, _gloffset_UnlockArraysEXT, UnlockArraysEXT@0)
-	GL_STUB(_dispatch_stub_581, _gloffset_CullParameterdvEXT, _dispatch_stub_581@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_581, _dispatch_stub_581@8))
-	GL_STUB(_dispatch_stub_582, _gloffset_CullParameterfvEXT, _dispatch_stub_582@8)
+	GL_STUB(_dispatch_stub_582, _gloffset_CullParameterdvEXT, _dispatch_stub_582@8)
 	HIDDEN(GL_PREFIX(_dispatch_stub_582, _dispatch_stub_582@8))
+	GL_STUB(_dispatch_stub_583, _gloffset_CullParameterfvEXT, _dispatch_stub_583@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_583, _dispatch_stub_583@8))
 	GL_STUB(SecondaryColor3bEXT, _gloffset_SecondaryColor3bEXT, SecondaryColor3bEXT@12)
 	GL_STUB(SecondaryColor3bvEXT, _gloffset_SecondaryColor3bvEXT, SecondaryColor3bvEXT@4)
 	GL_STUB(SecondaryColor3dEXT, _gloffset_SecondaryColor3dEXT, SecondaryColor3dEXT@24)
@@ -768,8 +769,8 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(FogCoorddvEXT, _gloffset_FogCoorddvEXT, FogCoorddvEXT@4)
 	GL_STUB(FogCoordfEXT, _gloffset_FogCoordfEXT, FogCoordfEXT@4)
 	GL_STUB(FogCoordfvEXT, _gloffset_FogCoordfvEXT, FogCoordfvEXT@4)
-	GL_STUB(_dispatch_stub_607, _gloffset_PixelTexGenSGIX, _dispatch_stub_607@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_607, _dispatch_stub_607@4))
+	GL_STUB(_dispatch_stub_608, _gloffset_PixelTexGenSGIX, _dispatch_stub_608@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_608, _dispatch_stub_608@4))
 	GL_STUB(BlendFuncSeparateEXT, _gloffset_BlendFuncSeparateEXT, BlendFuncSeparateEXT@16)
 	GL_STUB(FlushVertexArrayRangeNV, _gloffset_FlushVertexArrayRangeNV, FlushVertexArrayRangeNV@0)
 	GL_STUB(VertexArrayRangeNV, _gloffset_VertexArrayRangeNV, VertexArrayRangeNV@8)
@@ -811,24 +812,24 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(WindowPos4ivMESA, _gloffset_WindowPos4ivMESA, WindowPos4ivMESA@4)
 	GL_STUB(WindowPos4sMESA, _gloffset_WindowPos4sMESA, WindowPos4sMESA@16)
 	GL_STUB(WindowPos4svMESA, _gloffset_WindowPos4svMESA, WindowPos4svMESA@4)
-	GL_STUB(_dispatch_stub_649, _gloffset_MultiModeDrawArraysIBM, _dispatch_stub_649@20)
-	HIDDEN(GL_PREFIX(_dispatch_stub_649, _dispatch_stub_649@20))
-	GL_STUB(_dispatch_stub_650, _gloffset_MultiModeDrawElementsIBM, _dispatch_stub_650@24)
-	HIDDEN(GL_PREFIX(_dispatch_stub_650, _dispatch_stub_650@24))
-	GL_STUB(_dispatch_stub_651, _gloffset_DeleteFencesNV, _dispatch_stub_651@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_651, _dispatch_stub_651@8))
-	GL_STUB(_dispatch_stub_652, _gloffset_FinishFenceNV, _dispatch_stub_652@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_652, _dispatch_stub_652@4))
-	GL_STUB(_dispatch_stub_653, _gloffset_GenFencesNV, _dispatch_stub_653@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_653, _dispatch_stub_653@8))
-	GL_STUB(_dispatch_stub_654, _gloffset_GetFenceivNV, _dispatch_stub_654@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_654, _dispatch_stub_654@12))
-	GL_STUB(_dispatch_stub_655, _gloffset_IsFenceNV, _dispatch_stub_655@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_655, _dispatch_stub_655@4))
-	GL_STUB(_dispatch_stub_656, _gloffset_SetFenceNV, _dispatch_stub_656@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_656, _dispatch_stub_656@8))
-	GL_STUB(_dispatch_stub_657, _gloffset_TestFenceNV, _dispatch_stub_657@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_657, _dispatch_stub_657@4))
+	GL_STUB(_dispatch_stub_650, _gloffset_MultiModeDrawArraysIBM, _dispatch_stub_650@20)
+	HIDDEN(GL_PREFIX(_dispatch_stub_650, _dispatch_stub_650@20))
+	GL_STUB(_dispatch_stub_651, _gloffset_MultiModeDrawElementsIBM, _dispatch_stub_651@24)
+	HIDDEN(GL_PREFIX(_dispatch_stub_651, _dispatch_stub_651@24))
+	GL_STUB(_dispatch_stub_652, _gloffset_DeleteFencesNV, _dispatch_stub_652@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_652, _dispatch_stub_652@8))
+	GL_STUB(_dispatch_stub_653, _gloffset_FinishFenceNV, _dispatch_stub_653@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_653, _dispatch_stub_653@4))
+	GL_STUB(_dispatch_stub_654, _gloffset_GenFencesNV, _dispatch_stub_654@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_654, _dispatch_stub_654@8))
+	GL_STUB(_dispatch_stub_655, _gloffset_GetFenceivNV, _dispatch_stub_655@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_655, _dispatch_stub_655@12))
+	GL_STUB(_dispatch_stub_656, _gloffset_IsFenceNV, _dispatch_stub_656@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_656, _dispatch_stub_656@4))
+	GL_STUB(_dispatch_stub_657, _gloffset_SetFenceNV, _dispatch_stub_657@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_657, _dispatch_stub_657@8))
+	GL_STUB(_dispatch_stub_658, _gloffset_TestFenceNV, _dispatch_stub_658@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_658, _dispatch_stub_658@4))
 	GL_STUB(AreProgramsResidentNV, _gloffset_AreProgramsResidentNV, AreProgramsResidentNV@12)
 	GL_STUB(BindProgramNV, _gloffset_BindProgramNV, BindProgramNV@8)
 	GL_STUB(DeleteProgramsNV, _gloffset_DeleteProgramsNV, DeleteProgramsNV@8)
@@ -909,26 +910,26 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(SetFragmentShaderConstantATI, _gloffset_SetFragmentShaderConstantATI, SetFragmentShaderConstantATI@8)
 	GL_STUB(PointParameteriNV, _gloffset_PointParameteriNV, PointParameteriNV@8)
 	GL_STUB(PointParameterivNV, _gloffset_PointParameterivNV, PointParameterivNV@8)
-	GL_STUB(_dispatch_stub_738, _gloffset_ActiveStencilFaceEXT, _dispatch_stub_738@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_738, _dispatch_stub_738@4))
-	GL_STUB(_dispatch_stub_739, _gloffset_BindVertexArrayAPPLE, _dispatch_stub_739@4)
+	GL_STUB(_dispatch_stub_739, _gloffset_ActiveStencilFaceEXT, _dispatch_stub_739@4)
 	HIDDEN(GL_PREFIX(_dispatch_stub_739, _dispatch_stub_739@4))
-	GL_STUB(_dispatch_stub_740, _gloffset_DeleteVertexArraysAPPLE, _dispatch_stub_740@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_740, _dispatch_stub_740@8))
-	GL_STUB(_dispatch_stub_741, _gloffset_GenVertexArraysAPPLE, _dispatch_stub_741@8)
+	GL_STUB(_dispatch_stub_740, _gloffset_BindVertexArrayAPPLE, _dispatch_stub_740@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_740, _dispatch_stub_740@4))
+	GL_STUB(_dispatch_stub_741, _gloffset_DeleteVertexArraysAPPLE, _dispatch_stub_741@8)
 	HIDDEN(GL_PREFIX(_dispatch_stub_741, _dispatch_stub_741@8))
-	GL_STUB(_dispatch_stub_742, _gloffset_IsVertexArrayAPPLE, _dispatch_stub_742@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_742, _dispatch_stub_742@4))
+	GL_STUB(_dispatch_stub_742, _gloffset_GenVertexArraysAPPLE, _dispatch_stub_742@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_742, _dispatch_stub_742@8))
+	GL_STUB(_dispatch_stub_743, _gloffset_IsVertexArrayAPPLE, _dispatch_stub_743@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_743, _dispatch_stub_743@4))
 	GL_STUB(GetProgramNamedParameterdvNV, _gloffset_GetProgramNamedParameterdvNV, GetProgramNamedParameterdvNV@16)
 	GL_STUB(GetProgramNamedParameterfvNV, _gloffset_GetProgramNamedParameterfvNV, GetProgramNamedParameterfvNV@16)
 	GL_STUB(ProgramNamedParameter4dNV, _gloffset_ProgramNamedParameter4dNV, ProgramNamedParameter4dNV@44)
 	GL_STUB(ProgramNamedParameter4dvNV, _gloffset_ProgramNamedParameter4dvNV, ProgramNamedParameter4dvNV@16)
 	GL_STUB(ProgramNamedParameter4fNV, _gloffset_ProgramNamedParameter4fNV, ProgramNamedParameter4fNV@28)
 	GL_STUB(ProgramNamedParameter4fvNV, _gloffset_ProgramNamedParameter4fvNV, ProgramNamedParameter4fvNV@16)
-	GL_STUB(_dispatch_stub_749, _gloffset_DepthBoundsEXT, _dispatch_stub_749@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_749, _dispatch_stub_749@16))
-	GL_STUB(_dispatch_stub_750, _gloffset_BlendEquationSeparateEXT, _dispatch_stub_750@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_750, _dispatch_stub_750@8))
+	GL_STUB(_dispatch_stub_750, _gloffset_DepthBoundsEXT, _dispatch_stub_750@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_750, _dispatch_stub_750@16))
+	GL_STUB(_dispatch_stub_751, _gloffset_BlendEquationSeparateEXT, _dispatch_stub_751@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_751, _dispatch_stub_751@8))
 	GL_STUB(BindFramebufferEXT, _gloffset_BindFramebufferEXT, BindFramebufferEXT@8)
 	GL_STUB(BindRenderbufferEXT, _gloffset_BindRenderbufferEXT, BindRenderbufferEXT@8)
 	GL_STUB(CheckFramebufferStatusEXT, _gloffset_CheckFramebufferStatusEXT, CheckFramebufferStatusEXT@4)
@@ -946,19 +947,19 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(IsFramebufferEXT, _gloffset_IsFramebufferEXT, IsFramebufferEXT@4)
 	GL_STUB(IsRenderbufferEXT, _gloffset_IsRenderbufferEXT, IsRenderbufferEXT@4)
 	GL_STUB(RenderbufferStorageEXT, _gloffset_RenderbufferStorageEXT, RenderbufferStorageEXT@16)
-	GL_STUB(_dispatch_stub_768, _gloffset_BlitFramebufferEXT, _dispatch_stub_768@40)
-	HIDDEN(GL_PREFIX(_dispatch_stub_768, _dispatch_stub_768@40))
+	GL_STUB(_dispatch_stub_769, _gloffset_BlitFramebufferEXT, _dispatch_stub_769@40)
+	HIDDEN(GL_PREFIX(_dispatch_stub_769, _dispatch_stub_769@40))
 	GL_STUB(FramebufferTextureLayerEXT, _gloffset_FramebufferTextureLayerEXT, FramebufferTextureLayerEXT@20)
-	GL_STUB(_dispatch_stub_770, _gloffset_StencilFuncSeparateATI, _dispatch_stub_770@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_770, _dispatch_stub_770@16))
-	GL_STUB(_dispatch_stub_771, _gloffset_ProgramEnvParameters4fvEXT, _dispatch_stub_771@16)
+	GL_STUB(_dispatch_stub_771, _gloffset_StencilFuncSeparateATI, _dispatch_stub_771@16)
 	HIDDEN(GL_PREFIX(_dispatch_stub_771, _dispatch_stub_771@16))
-	GL_STUB(_dispatch_stub_772, _gloffset_ProgramLocalParameters4fvEXT, _dispatch_stub_772@16)
+	GL_STUB(_dispatch_stub_772, _gloffset_ProgramEnvParameters4fvEXT, _dispatch_stub_772@16)
 	HIDDEN(GL_PREFIX(_dispatch_stub_772, _dispatch_stub_772@16))
-	GL_STUB(_dispatch_stub_773, _gloffset_GetQueryObjecti64vEXT, _dispatch_stub_773@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_773, _dispatch_stub_773@12))
-	GL_STUB(_dispatch_stub_774, _gloffset_GetQueryObjectui64vEXT, _dispatch_stub_774@12)
+	GL_STUB(_dispatch_stub_773, _gloffset_ProgramLocalParameters4fvEXT, _dispatch_stub_773@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_773, _dispatch_stub_773@16))
+	GL_STUB(_dispatch_stub_774, _gloffset_GetQueryObjecti64vEXT, _dispatch_stub_774@12)
 	HIDDEN(GL_PREFIX(_dispatch_stub_774, _dispatch_stub_774@12))
+	GL_STUB(_dispatch_stub_775, _gloffset_GetQueryObjectui64vEXT, _dispatch_stub_775@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_775, _dispatch_stub_775@12))
 	GL_STUB_ALIAS(ArrayElementEXT, _gloffset_ArrayElement, ArrayElementEXT@4, ArrayElement, ArrayElement@4)
 	GL_STUB_ALIAS(BindTextureEXT, _gloffset_BindTexture, BindTextureEXT@8, BindTexture, BindTexture@8)
 	GL_STUB_ALIAS(DrawArraysEXT, _gloffset_DrawArrays, DrawArraysEXT@12, DrawArrays, DrawArrays@12)
-- 
cgit v1.2.3


From 76b438878e4ab504d68efb8800111e4c41ddeadc Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 2 Jun 2009 20:31:02 -0600
Subject: mesa: new CopyBufferSubData() driver hook

---
 src/mesa/main/dd.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index 32b1d4e9fa..1d92e510a4 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -798,6 +798,12 @@ struct dd_function_table {
    void * (*MapBuffer)( GLcontext *ctx, GLenum target, GLenum access,
 			struct gl_buffer_object *obj );
 
+   void (*CopyBufferSubData)( GLcontext *ctx,
+                              struct gl_buffer_object *src,
+                              struct gl_buffer_object *dst,
+                              GLintptr readOffset, GLintptr writeOffset,
+                              GLsizeiptr size );
+
    /* May return NULL if MESA_MAP_NOWAIT_BIT is set in access:
     */
    void * (*MapBufferRange)( GLcontext *ctx, GLenum target,
-- 
cgit v1.2.3


From 96a30b06dbc60ff63392cf8ae9dcb3d245b41c27 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 2 Jun 2009 20:31:41 -0600
Subject: mesa: new state for GL_ARB_copy_buffer

---
 src/mesa/main/mtypes.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index e3471123c6..26ec8d5595 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2431,6 +2431,7 @@ struct gl_constants
 struct gl_extensions
 {
    GLboolean dummy;  /* don't remove this! */
+   GLboolean ARB_copy_buffer;
    GLboolean ARB_depth_texture;
    GLboolean ARB_draw_buffers;
    GLboolean ARB_fragment_program;
@@ -2956,6 +2957,9 @@ struct __GLcontextRec
    struct gl_shader_state Shader; /**< GLSL shader object state */
 
    struct gl_query_state Query;  /**< occlusion, timer queries */
+
+   struct gl_buffer_object *CopyReadBuffer; /**< GL_ARB_copy_buffer */
+   struct gl_buffer_object *CopyWriteBuffer; /**< GL_ARB_copy_buffer */
    /*@}*/
 
 #if FEATURE_EXT_framebuffer_object
-- 
cgit v1.2.3


From dc0b71f00d2fc8ba9b2f1966510bcca942d35e15 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 2 Jun 2009 20:29:57 -0600
Subject: mesa: _mesa_CopyBufferSubData() function, and driver fall-back

---
 src/mesa/main/bufferobj.c | 145 +++++++++++++++++++++++++++++++++++++++++++++-
 src/mesa/main/bufferobj.h |  15 ++++-
 2 files changed, 156 insertions(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 90daa2e5b8..88b51fe60f 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -1,9 +1,9 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.5
+ * Version:  7.6
  *
  * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
- * Copyright (C) 1999-2009  VMware, Inc.  All Rights Reserved.
+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -73,6 +73,16 @@ get_buffer(GLcontext *ctx, GLenum target)
       case GL_PIXEL_UNPACK_BUFFER_EXT:
          bufObj = ctx->Unpack.BufferObj;
          break;
+      case GL_COPY_READ_BUFFER:
+         if (ctx->Extensions.ARB_copy_buffer) {
+            bufObj = ctx->CopyReadBuffer;
+         }
+         break;
+      case GL_COPY_WRITE_BUFFER:
+         if (ctx->Extensions.ARB_copy_buffer) {
+            bufObj = ctx->CopyWriteBuffer;
+         }
+         break;
       default:
          /* error must be recorded by caller */
          return NULL;
@@ -418,6 +428,37 @@ _mesa_buffer_unmap( GLcontext *ctx, GLenum target,
 }
 
 
+/**
+ * Default fallback for \c dd_function_table::CopyBufferSubData().
+ * Called via glCopyBuffserSubData().
+ */
+void
+_mesa_copy_buffer_subdata(GLcontext *ctx,
+                          struct gl_buffer_object *src,
+                          struct gl_buffer_object *dst,
+                          GLintptr readOffset, GLintptr writeOffset,
+                          GLsizeiptr size)
+{
+   GLubyte *srcPtr, *dstPtr;
+
+   /* buffer should not already be mapped */
+   assert(!src->Pointer);
+   assert(!dst->Pointer);
+
+   srcPtr = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_COPY_READ_BUFFER,
+                                              GL_READ_ONLY, src);
+   dstPtr = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_COPY_WRITE_BUFFER,
+                                              GL_WRITE_ONLY, dst);
+
+   if (srcPtr && dstPtr)
+      _mesa_memcpy(dstPtr + writeOffset, srcPtr + readOffset, size);
+
+   ctx->Driver.UnmapBuffer(ctx, GL_COPY_READ_BUFFER, src);
+   ctx->Driver.UnmapBuffer(ctx, GL_COPY_WRITE_BUFFER, dst);
+}
+
+
+
 /**
  * Initialize the state associated with buffer objects
  */
@@ -426,6 +467,9 @@ _mesa_init_buffer_objects( GLcontext *ctx )
 {
    ctx->Array.ArrayBufferObj = ctx->Shared->NullBufferObj;
    ctx->Array.ElementArrayBufferObj = ctx->Shared->NullBufferObj;
+
+   ctx->CopyReadBuffer = ctx->Shared->NullBufferObj;
+   ctx->CopyWriteBuffer = ctx->Shared->NullBufferObj;
 }
 
 
@@ -452,8 +496,22 @@ bind_buffer_object(GLcontext *ctx, GLenum target, GLuint buffer)
    case GL_PIXEL_UNPACK_BUFFER_EXT:
       bindTarget = &ctx->Unpack.BufferObj;
       break;
+   case GL_COPY_READ_BUFFER:
+      if (ctx->Extensions.ARB_copy_buffer) {
+         bindTarget = &ctx->CopyReadBuffer;
+      }
+      break;
+   case GL_COPY_WRITE_BUFFER:
+      if (ctx->Extensions.ARB_copy_buffer) {
+         bindTarget = &ctx->CopyWriteBuffer;
+      }
+      break;
    default:
-      _mesa_error(ctx, GL_INVALID_ENUM, "glBindBufferARB(target)");
+      ; /* no-op / we'll hit the follow error test next */
+   }
+
+   if (!bindTarget) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glBindBufferARB(target 0x%x)");
       return;
    }
 
@@ -1140,3 +1198,84 @@ _mesa_GetBufferPointervARB(GLenum target, GLenum pname, GLvoid **params)
 
    *params = bufObj->Pointer;
 }
+
+
+void GLAPIENTRY
+_mesa_CopyBufferSubData(GLenum readTarget, GLenum writeTarget,
+                        GLintptr readOffset, GLintptr writeOffset,
+                        GLsizeiptr size)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_buffer_object *src, *dst;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   src = get_buffer(ctx, readTarget);
+   if (!src || src->Name == 0) {
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "glCopyBuffserSubData(readTarget = 0x%x)", readTarget);
+      return;
+   }
+
+   dst = get_buffer(ctx, writeTarget);
+   if (!dst || dst->Name == 0) {
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "glCopyBuffserSubData(writeTarget = 0x%x)", writeTarget);
+      return;
+   }
+
+   if (src->Pointer) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glCopyBuffserSubData(readBuffer is mapped)");
+      return;
+   }
+
+   if (dst->Pointer) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glCopyBuffserSubData(writeBuffer is mapped)");
+      return;
+   }
+
+   if (readOffset < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glCopyBuffserSubData(readOffset = %d)", readOffset);
+      return;
+   }
+
+   if (writeOffset < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glCopyBuffserSubData(writeOffset = %d)", writeOffset);
+      return;
+   }
+
+   if (readOffset + size > src->Size) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glCopyBuffserSubData(readOffset + size = %d)",
+                  readOffset, size);
+      return;
+   }
+
+   if (writeOffset + size > src->Size) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glCopyBuffserSubData(writeOffset + size = %d)",
+                  writeOffset, size);
+      return;
+   }
+
+   if (src == dst) {
+      if (readOffset + size <= writeOffset) {
+         /* OK */
+      }
+      else if (writeOffset + size <= readOffset) {
+         /* OK */
+      }
+      else {
+         /* overlapping src/dst is illegal */
+         _mesa_error(ctx, GL_INVALID_VALUE,
+                     "glCopyBuffserSubData(overlapping src/dst)");
+         return;
+      }
+   }
+
+   ctx->Driver.CopyBufferSubData(ctx, src, dst, readOffset, writeOffset, size);
+}
+
diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h
index 3c08f0083c..79c027aa4d 100644
--- a/src/mesa/main/bufferobj.h
+++ b/src/mesa/main/bufferobj.h
@@ -1,8 +1,9 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.2
+ * Version:  7.6
  *
  * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -82,6 +83,13 @@ extern GLboolean
 _mesa_buffer_unmap( GLcontext *ctx, GLenum target,
                     struct gl_buffer_object * bufObj );
 
+extern void
+_mesa_copy_buffer_subdata(GLcontext *ctx,
+                          struct gl_buffer_object *src,
+                          struct gl_buffer_object *dst,
+                          GLintptr readOffset, GLintptr writeOffset,
+                          GLsizeiptr size);
+
 extern GLboolean
 _mesa_validate_pbo_access(GLuint dimensions,
                           const struct gl_pixelstore_attrib *pack,
@@ -154,4 +162,9 @@ _mesa_GetBufferParameterivARB(GLenum target, GLenum pname, GLint *params);
 extern void GLAPIENTRY
 _mesa_GetBufferPointervARB(GLenum target, GLenum pname, GLvoid **params);
 
+extern void GLAPIENTRY
+_mesa_CopyBufferSubData(GLenum readTarget, GLenum writeTarget,
+                        GLintptr readOffset, GLintptr writeOffset,
+                        GLsizeiptr size);
+
 #endif
-- 
cgit v1.2.3


From 08e43ebfb216284818925e899419af03e28d2360 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 2 Jun 2009 20:32:15 -0600
Subject: mesa: plug in new _mesa_CopyBufferSubData() functions

---
 src/mesa/drivers/common/driverfuncs.c | 3 +++
 src/mesa/main/api_exec.c              | 3 +++
 src/mesa/main/dlist.c                 | 3 +++
 3 files changed, 9 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c
index 276da41f4e..56abdbdfcb 100644
--- a/src/mesa/drivers/common/driverfuncs.c
+++ b/src/mesa/drivers/common/driverfuncs.c
@@ -237,6 +237,9 @@ _mesa_init_driver_functions(struct dd_function_table *driver)
    driver->DeleteArrayObject = _mesa_delete_array_object;
    driver->BindArrayObject = NULL;
 
+   /* GL_ARB_copy_buffer */
+   driver->CopyBufferSubData = _mesa_copy_buffer_subdata;
+
    /* T&L stuff */
    driver->NeedValidate = GL_FALSE;
    driver->ValidateTnlModule = NULL;
diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index 6f66ff47a0..c714d177a2 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -894,5 +894,8 @@ _mesa_init_exec_table(struct _glapi_table *exec)
     */
    SET_RenderbufferStorageMultisample(exec, _mesa_RenderbufferStorageMultisample);
 #endif
+
+   /* GL_ARB_copy_buffer */
+   SET_CopyBufferSubData(exec, _mesa_CopyBufferSubData);
 }
 
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index dd73a1906b..d3c1717a50 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -8238,6 +8238,9 @@ _mesa_init_dlist_table(struct _glapi_table *table)
    SET_ProgramEnvParameters4fvEXT(table, save_ProgramEnvParameters4fvEXT);
    SET_ProgramLocalParameters4fvEXT(table, save_ProgramLocalParameters4fvEXT);
 #endif
+
+   /* ARB 59. GL_ARB_copy_buffer */
+   SET_CopyBufferSubData(table, _mesa_CopyBufferSubData); /* no dlist save */
 }
 
 
-- 
cgit v1.2.3


From 3a7399e2c4a5fc46f871ad030d6198a16e52d356 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 2 Jun 2009 20:32:34 -0600
Subject: mesa: enable GL_ARB_copy_buffer for software drivers

---
 src/mesa/main/extensions.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 5c4bea9cf6..aa9513a550 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -44,6 +44,7 @@ static const struct {
    const char *name;
    int flag_offset;
 } default_extensions[] = {
+   { OFF, "GL_ARB_copy_buffer",                F(ARB_copy_buffer) },
    { OFF, "GL_ARB_depth_texture",              F(ARB_depth_texture) },
    { ON,  "GL_ARB_draw_buffers",               F(ARB_draw_buffers) },
    { OFF, "GL_ARB_fragment_program",           F(ARB_fragment_program) },
@@ -183,6 +184,7 @@ static const struct {
 void
 _mesa_enable_sw_extensions(GLcontext *ctx)
 {
+   ctx->Extensions.ARB_copy_buffer = GL_TRUE;
    ctx->Extensions.ARB_depth_texture = GL_TRUE;
    /*ctx->Extensions.ARB_draw_buffers = GL_TRUE;*/
 #if FEATURE_ARB_fragment_program
-- 
cgit v1.2.3


From 2813c08b35aa1b4fafa47f4421c9822ff8f6f85c Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 2 Jun 2009 21:23:28 -0600
Subject: mesa: fix error test mistake in _mesa_CopyBufferSubData()

---
 src/mesa/main/bufferobj.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 88b51fe60f..5fa13d9b54 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -1254,7 +1254,7 @@ _mesa_CopyBufferSubData(GLenum readTarget, GLenum writeTarget,
       return;
    }
 
-   if (writeOffset + size > src->Size) {
+   if (writeOffset + size > dst->Size) {
       _mesa_error(ctx, GL_INVALID_VALUE,
                   "glCopyBuffserSubData(writeOffset + size = %d)",
                   writeOffset, size);
-- 
cgit v1.2.3


From 7f8000db8bd45bb95bda4a4f8535c49b8ef74254 Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed, 3 Jun 2009 17:49:05 +0100
Subject: Fast path when rebinding the same texture in single context
 environment

If there is no shared context, there is no purpose in rebinding the same
texture.  In some artificial tests this improves performance 10% - 30%.
---
 src/mesa/main/texobj.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index d51e7b76ec..2082f945f1 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -945,6 +945,7 @@ _mesa_BindTexture( GLenum target, GLuint texName )
    struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
    struct gl_texture_object *newTexObj = NULL, *defaultTexObj = NULL;
    GLint targetIndex;
+   GLboolean early_out = GL_FALSE;
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
    if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))
@@ -998,6 +999,17 @@ _mesa_BindTexture( GLenum target, GLuint texName )
 
    assert(valid_texture_object(newTexObj));
 
+   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
+   if ((ctx->Shared->RefCount == 1)
+       && (newTexObj == texUnit->CurrentTex[targetIndex])) {
+      early_out = GL_TRUE;
+   }
+   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
+
+   if (early_out) {
+      return;
+   }
+
    /* flush before changing binding */
    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
 
-- 
cgit v1.2.3


From e7927626c13b8cd3743ba52a407b8f3736eae8a1 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 3 Jun 2009 15:38:57 -0600
Subject: mesa: added buffer object debug code (disabled)

---
 src/mesa/main/bufferobj.c | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 5fa13d9b54..3e011ef5b2 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -1014,6 +1014,11 @@ _mesa_BufferDataARB(GLenum target, GLsizeiptrARB size,
 
    bufObj->Written = GL_TRUE;
 
+#ifdef VBO_DEBUG
+   _mesa_printf("glBufferDataARB(%u, sz %ld, from %p, usage 0x%x)\n",
+                bufObj->Name, size, data, usage);
+#endif
+
    /* Give the buffer object to the driver!  <data> may be null! */
    ctx->Driver.BufferData( ctx, target, size, data, usage, bufObj );
 }
@@ -1103,6 +1108,17 @@ _mesa_MapBufferARB(GLenum target, GLenum access)
    if (access == GL_WRITE_ONLY_ARB || access == GL_READ_WRITE_ARB)
       bufObj->Written = GL_TRUE;
 
+#ifdef VBO_DEBUG
+   _mesa_printf("glMapBufferARB(%u, sz %ld, access 0x%x)\n",
+                bufObj->Name, bufObj->Size, access);
+   if (access == GL_WRITE_ONLY_ARB) {
+      GLuint i;
+      GLubyte *b = (GLubyte *) bufObj->Pointer;
+      for (i = 0; i < bufObj->Size; i++)
+         b[i] = i & 0xff;
+   }
+#endif
+
    return bufObj->Pointer;
 }
 
@@ -1129,6 +1145,26 @@ _mesa_UnmapBufferARB(GLenum target)
       return GL_FALSE;
    }
 
+#ifdef VBO_DEBUG
+   if (bufObj->Access == GL_WRITE_ONLY_ARB) {
+      GLuint i, unchanged = 0;
+      GLubyte *b = (GLubyte *) bufObj->Pointer;
+      GLint pos = -1;
+      /* check which bytes changed */
+      for (i = 0; i < bufObj->Size - 1; i++) {
+         if (b[i] == (i & 0xff) && b[i+1] == ((i+1) & 0xff)) {
+            unchanged++;
+            if (pos == -1)
+               pos = i;
+         }
+      }
+      if (unchanged) {
+         _mesa_printf("glUnmapBufferARB(%u): %u of %ld unchanged, starting at %d\n",
+                      bufObj->Name, unchanged, bufObj->Size, pos);
+      }
+   }
+#endif
+
    status = ctx->Driver.UnmapBuffer( ctx, target, bufObj );
    bufObj->Access = DEFAULT_ACCESS;
    bufObj->Pointer = NULL;
-- 
cgit v1.2.3


From 185fbcce3644ff861c60cd73923ef7187c623564 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 4 Jun 2009 14:26:51 -0600
Subject: mesa: call _mesa_ funcs, not gl funcs for debugging

---
 src/mesa/main/debug.c | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/debug.c b/src/mesa/main/debug.c
index 80bc6afc4c..7276c22742 100644
--- a/src/mesa/main/debug.c
+++ b/src/mesa/main/debug.c
@@ -24,12 +24,15 @@
  */
 
 #include "mtypes.h"
+#include "attrib.h"
 #include "colormac.h"
 #include "context.h"
 #include "hash.h"
 #include "imports.h"
 #include "debug.h"
 #include "get.h"
+#include "pixelstore.h"
+#include "readpix.h"
 #include "texobj.h"
 #include "texformat.h"
 
@@ -353,11 +356,11 @@ _mesa_dump_color_buffer(const char *filename)
 
    buf = (GLubyte *) _mesa_malloc(w * h * 4);
 
-   glPushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT);
-   glPixelStorei(GL_PACK_ALIGNMENT, 1);
-   glPixelStorei(GL_PACK_INVERT_MESA, GL_TRUE);
+   _mesa_PushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT);
+   _mesa_PixelStorei(GL_PACK_ALIGNMENT, 1);
+   _mesa_PixelStorei(GL_PACK_INVERT_MESA, GL_TRUE);
 
-   glReadPixels(0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, buf);
+   _mesa_ReadPixels(0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, buf);
 
    _mesa_printf("ReadBuffer %p 0x%x  DrawBuffer %p 0x%x\n",
                 ctx->ReadBuffer->_ColorReadBuffer,
@@ -367,7 +370,7 @@ _mesa_dump_color_buffer(const char *filename)
    _mesa_printf("Writing %d x %d color buffer to %s\n", w, h, filename);
    write_ppm(filename, buf, w, h, 4, 0, 1, 2);
 
-   glPopClientAttrib();
+   _mesa_PopClientAttrib();
 
    _mesa_free(buf);
 }
@@ -386,11 +389,11 @@ _mesa_dump_depth_buffer(const char *filename)
    buf = (GLuint *) _mesa_malloc(w * h * 4);  /* 4 bpp */
    buf2 = (GLubyte *) _mesa_malloc(w * h * 3); /* 3 bpp */
 
-   glPushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT);
-   glPixelStorei(GL_PACK_ALIGNMENT, 1);
-   glPixelStorei(GL_PACK_INVERT_MESA, GL_TRUE);
+   _mesa_PushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT);
+   _mesa_PixelStorei(GL_PACK_ALIGNMENT, 1);
+   _mesa_PixelStorei(GL_PACK_INVERT_MESA, GL_TRUE);
 
-   glReadPixels(0, 0, w, h, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, buf);
+   _mesa_ReadPixels(0, 0, w, h, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, buf);
 
    /* spread 24 bits of Z across R, G, B */
    for (i = 0; i < w * h; i++) {
@@ -402,7 +405,7 @@ _mesa_dump_depth_buffer(const char *filename)
    _mesa_printf("Writing %d x %d depth buffer to %s\n", w, h, filename);
    write_ppm(filename, buf2, w, h, 3, 0, 1, 2);
 
-   glPopClientAttrib();
+   _mesa_PopClientAttrib();
 
    _mesa_free(buf);
    _mesa_free(buf2);
@@ -422,11 +425,11 @@ _mesa_dump_stencil_buffer(const char *filename)
    buf = (GLubyte *) _mesa_malloc(w * h);  /* 1 bpp */
    buf2 = (GLubyte *) _mesa_malloc(w * h * 3); /* 3 bpp */
 
-   glPushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT);
-   glPixelStorei(GL_PACK_ALIGNMENT, 1);
-   glPixelStorei(GL_PACK_INVERT_MESA, GL_TRUE);
+   _mesa_PushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT);
+   _mesa_PixelStorei(GL_PACK_ALIGNMENT, 1);
+   _mesa_PixelStorei(GL_PACK_INVERT_MESA, GL_TRUE);
 
-   glReadPixels(0, 0, w, h, GL_STENCIL_INDEX, GL_UNSIGNED_BYTE, buf);
+   _mesa_ReadPixels(0, 0, w, h, GL_STENCIL_INDEX, GL_UNSIGNED_BYTE, buf);
 
    for (i = 0; i < w * h; i++) {
       buf2[i*3+0] = buf[i];
@@ -437,7 +440,7 @@ _mesa_dump_stencil_buffer(const char *filename)
    _mesa_printf("Writing %d x %d stencil buffer to %s\n", w, h, filename);
    write_ppm(filename, buf2, w, h, 3, 0, 1, 2);
 
-   glPopClientAttrib();
+   _mesa_PopClientAttrib();
 
    _mesa_free(buf);
    _mesa_free(buf2);
-- 
cgit v1.2.3


From cfff2a6189b38f1ee8c8ca204e223574a5abf760 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 5 Jun 2009 17:16:47 -0600
Subject: mesa: bump version to 7.5-rc3

---
 Makefile                | 2 +-
 src/mesa/main/version.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/Makefile b/Makefile
index d134c4c330..22334d6ee4 100644
--- a/Makefile
+++ b/Makefile
@@ -182,7 +182,7 @@ ultrix-gcc:
 
 # Rules for making release tarballs
 
-VERSION=7.5-rc2
+VERSION=7.5-rc3
 DIRECTORY = Mesa-$(VERSION)
 LIB_NAME = MesaLib-$(VERSION)
 DEMO_NAME = MesaDemos-$(VERSION)
diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index e109f20df4..015ac71a17 100644
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -31,7 +31,7 @@
 #define MESA_MAJOR 7
 #define MESA_MINOR 5
 #define MESA_PATCH 0
-#define MESA_VERSION_STRING "7.5-rc2"
+#define MESA_VERSION_STRING "7.5-rc3"
 
 /* To make version comparison easy */
 #define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
-- 
cgit v1.2.3


From 4adb190a162c5ed0684a8616331344caadba4010 Mon Sep 17 00:00:00 2001
From: Maciej Cencora <m.cencora@gmail.com>
Date: Mon, 8 Jun 2009 07:23:56 -0600
Subject: mesa: EXT_vertex_array_bgra fixes

1) Pass the correct format when calling update_array in
   _mesa_VertexAttribPointerARB.
2) glVertexAttribPointerNV accepts GL_BGRA format too.
3) raise INVALID_VALUE error when format is BGRA and normalized is
   false in glVertexAttribPointerARB
---
 src/mesa/main/varray.c | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index ff3128b8be..f04c137c6d 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -529,6 +529,7 @@ _mesa_VertexAttribPointerNV(GLuint index, GLint size, GLenum type,
 {
    GLboolean normalized = GL_FALSE;
    GLsizei elementSize;
+   GLenum format;
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
@@ -552,6 +553,21 @@ _mesa_VertexAttribPointerNV(GLuint index, GLint size, GLenum type,
       return;
    }
 
+   if (size == GL_BGRA) {
+      if (type != GL_UNSIGNED_BYTE) {
+         _mesa_error(ctx, GL_INVALID_VALUE,
+                     "glVertexAttribPointerNV(GL_BGRA/type)");
+         return;
+      }
+
+      format = GL_BGRA;
+      size = 4;
+      normalized = GL_TRUE;
+   }
+   else {
+      format = GL_RGBA;
+   }
+
    /* check for valid 'type' and compute StrideB right away */
    switch (type) {
       case GL_UNSIGNED_BYTE:
@@ -574,7 +590,7 @@ _mesa_VertexAttribPointerNV(GLuint index, GLint size, GLenum type,
 
    update_array(ctx, &ctx->Array.ArrayObj->VertexAttrib[index],
                 _NEW_ARRAY_ATTRIB(index),
-                elementSize, size, type, GL_RGBA, stride, normalized, ptr);
+                elementSize, size, type, format, stride, normalized, ptr);
 
    if (ctx->Driver.VertexAttribPointer)
       ctx->Driver.VertexAttribPointer( ctx, index, size, type, stride, ptr );
@@ -621,9 +637,14 @@ _mesa_VertexAttribPointerARB(GLuint index, GLint size, GLenum type,
                      "glVertexAttribPointerARB(GL_BGRA/type)");
          return;
       }
+      if (normalized != GL_TRUE) {
+         _mesa_error(ctx, GL_INVALID_VALUE,
+                     "glVertexAttribPointerARB(GL_BGRA/normalized)");
+         return;
+      }
+
       format = GL_BGRA;
       size = 4;
-      normalized = GL_TRUE;
    }
    else {
       format = GL_RGBA;
@@ -668,7 +689,7 @@ _mesa_VertexAttribPointerARB(GLuint index, GLint size, GLenum type,
 
    update_array(ctx, &ctx->Array.ArrayObj->VertexAttrib[index],
                 _NEW_ARRAY_ATTRIB(index),
-                elementSize, size, type, GL_RGBA, stride, normalized, ptr);
+                elementSize, size, type, format, stride, normalized, ptr);
 
    if (ctx->Driver.VertexAttribPointer)
       ctx->Driver.VertexAttribPointer(ctx, index, size, type, stride, ptr);
-- 
cgit v1.2.3


From fce4ee12a620de4ece35cef62a4562bbd4895557 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 8 Jun 2009 07:25:24 -0600
Subject: mesa: EXT_vertex_array_bgra fixes

1) Pass the correct format when calling update_array in
   _mesa_VertexAttribPointerARB.
2) glVertexAttribPointerNV accepts GL_BGRA format too.
3) raise INVALID_VALUE error when format is BGRA and normalized is
   false in glVertexAttribPointerARB

(cherry picked from commit 4adb190a162c5ed0684a8616331344caadba4010)
---
 src/mesa/main/varray.c | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 72b3e834b3..0882e8f37a 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -534,6 +534,7 @@ _mesa_VertexAttribPointerNV(GLuint index, GLint size, GLenum type,
 {
    GLboolean normalized = GL_FALSE;
    GLsizei elementSize;
+   GLenum format;
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
@@ -557,6 +558,21 @@ _mesa_VertexAttribPointerNV(GLuint index, GLint size, GLenum type,
       return;
    }
 
+   if (size == GL_BGRA) {
+      if (type != GL_UNSIGNED_BYTE) {
+         _mesa_error(ctx, GL_INVALID_VALUE,
+                     "glVertexAttribPointerNV(GL_BGRA/type)");
+         return;
+      }
+
+      format = GL_BGRA;
+      size = 4;
+      normalized = GL_TRUE;
+   }
+   else {
+      format = GL_RGBA;
+   }
+
    /* check for valid 'type' and compute StrideB right away */
    switch (type) {
       case GL_UNSIGNED_BYTE:
@@ -579,7 +595,7 @@ _mesa_VertexAttribPointerNV(GLuint index, GLint size, GLenum type,
 
    update_array(ctx, &ctx->Array.ArrayObj->VertexAttrib[index],
                 _NEW_ARRAY_ATTRIB(index),
-                elementSize, size, type, GL_RGBA, stride, normalized, ptr);
+                elementSize, size, type, format, stride, normalized, ptr);
 
    if (ctx->Driver.VertexAttribPointer)
       ctx->Driver.VertexAttribPointer( ctx, index, size, type, stride, ptr );
@@ -621,9 +637,14 @@ _mesa_VertexAttribPointerARB(GLuint index, GLint size, GLenum type,
                      "glVertexAttribPointerARB(GL_BGRA/type)");
          return;
       }
+      if (normalized != GL_TRUE) {
+         _mesa_error(ctx, GL_INVALID_VALUE,
+                     "glVertexAttribPointerARB(GL_BGRA/normalized)");
+         return;
+      }
+
       format = GL_BGRA;
       size = 4;
-      normalized = GL_TRUE;
    }
    else {
       format = GL_RGBA;
@@ -668,7 +689,7 @@ _mesa_VertexAttribPointerARB(GLuint index, GLint size, GLenum type,
 
    update_array(ctx, &ctx->Array.ArrayObj->VertexAttrib[index],
                 _NEW_ARRAY_ATTRIB(index),
-                elementSize, size, type, GL_RGBA, stride, normalized, ptr);
+                elementSize, size, type, format, stride, normalized, ptr);
 
    if (ctx->Driver.VertexAttribPointer)
       ctx->Driver.VertexAttribPointer(ctx, index, size, type, stride, ptr);
-- 
cgit v1.2.3


From 0bced6a326e3520d2b280b4f6cdaadf843ce1d2d Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 8 Jun 2009 09:42:04 -0600
Subject: mesa: bump MAX_PROGRAM_ENV_PARAMS from 128 to 256

Also, MAX_NV_VERTEX_PROGRAM_PARAMS should be 96, not 128 (or 256).
---
 src/mesa/main/config.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index 2a9fdf9ca0..bd66a4c231 100644
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -180,7 +180,7 @@
 /*@{*/
 #define MAX_PROGRAM_INSTRUCTIONS  (16 * 1024)
 #define MAX_PROGRAM_LOCAL_PARAMS 256 /**< per-program constants (power of two) */
-#define MAX_PROGRAM_ENV_PARAMS 128
+#define MAX_PROGRAM_ENV_PARAMS 256   /**< per-context constants (power of two) */
 #define MAX_PROGRAM_MATRICES 8
 #define MAX_PROGRAM_MATRIX_STACK_DEPTH 4
 #define MAX_PROGRAM_CALL_DEPTH 8
@@ -197,7 +197,7 @@
 /*@{*/
 #define MAX_NV_VERTEX_PROGRAM_INSTRUCTIONS 128
 #define MAX_NV_VERTEX_PROGRAM_TEMPS         12
-#define MAX_NV_VERTEX_PROGRAM_PARAMS        MAX_PROGRAM_ENV_PARAMS
+#define MAX_NV_VERTEX_PROGRAM_PARAMS        96
 #define MAX_NV_VERTEX_PROGRAM_INPUTS        16
 #define MAX_NV_VERTEX_PROGRAM_OUTPUTS       15
 /*@}*/
-- 
cgit v1.2.3


From e09f78d8dc7f20bb11f84206b6f1d71418332d8a Mon Sep 17 00:00:00 2001
From: José Fonseca <jfonseca@vmware.com>
Date: Mon, 8 Jun 2009 16:29:46 +0100
Subject: mesa: Use matching signedness for the counter as upper bound.

---
 src/mesa/main/debug.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/debug.c b/src/mesa/main/debug.c
index 2eabcdaf49..b54e47919d 100644
--- a/src/mesa/main/debug.c
+++ b/src/mesa/main/debug.c
@@ -282,7 +282,7 @@ write_texture_image(struct gl_texture_object *texObj)
       case MESA_FORMAT_RGB565:
          {
             GLubyte *buf2 = (GLubyte *) _mesa_malloc(img->Width * img->Height * 3);
-            GLint i;
+            GLuint i;
             for (i = 0; i < img->Width * img->Height; i++) {
                GLint r, g, b;
                GLushort s = ((GLushort *) img->Data)[i];
-- 
cgit v1.2.3


From a6f266361693c6b9a5639ba7176925feb26f64c9 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 8 Jun 2009 10:52:16 -0600
Subject: mesa: new MESA_EXTENSION_OVERRIDE env var

Can be used to enable/disable extensions as reported by
glGetString(GL_EXTENSIONS).

If a name is preceeded by '-' it's disabled.  Otherwise, the named
extension is enabled.

Intended for debug/test purposes.
---
 src/mesa/main/extensions.c | 112 ++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 101 insertions(+), 11 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index aa9513a550..490110a6d2 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -442,8 +442,9 @@ _mesa_enable_2_1_extensions(GLcontext *ctx)
 
 /**
  * Either enable or disable the named extension.
+ * \return GL_TRUE for success, GL_FALSE if invalid extension name
  */
-static void
+static GLboolean
 set_extension( GLcontext *ctx, const char *name, GLboolean state )
 {
    GLboolean *base = (GLboolean *) &ctx->Extensions;
@@ -452,7 +453,7 @@ set_extension( GLcontext *ctx, const char *name, GLboolean state )
    if (ctx->Extensions.String) {
       /* The string was already queried - can't change it now! */
       _mesa_problem(ctx, "Trying to enable/disable extension after glGetString(GL_EXTENSIONS): %s", name);
-      return;
+      return GL_FALSE;
    }
 
    for (i = 0 ; i < Elements(default_extensions) ; i++) {
@@ -461,10 +462,10 @@ set_extension( GLcontext *ctx, const char *name, GLboolean state )
             GLboolean *enabled = base + default_extensions[i].flag_offset;
             *enabled = state;
          }
-         return;
+         return GL_TRUE;
       }
    }
-   _mesa_problem(ctx, "Trying to enable unknown extension: %s", name);
+   return GL_FALSE;
 }
 
 
@@ -475,7 +476,8 @@ set_extension( GLcontext *ctx, const char *name, GLboolean state )
 void
 _mesa_enable_extension( GLcontext *ctx, const char *name )
 {
-   set_extension(ctx, name, GL_TRUE);
+   if (!set_extension(ctx, name, GL_TRUE))
+      _mesa_problem(ctx, "Trying to enable unknown extension: %s", name);
 }
 
 
@@ -486,7 +488,8 @@ _mesa_enable_extension( GLcontext *ctx, const char *name )
 void
 _mesa_disable_extension( GLcontext *ctx, const char *name )
 {
-   set_extension(ctx, name, GL_FALSE);
+   if (!set_extension(ctx, name, GL_FALSE))
+      _mesa_problem(ctx, "Trying to disable unknown extension: %s", name);
 }
 
 
@@ -510,6 +513,80 @@ _mesa_extension_is_enabled( GLcontext *ctx, const char *name )
 }
 
 
+/**
+ * Append string 'b' onto string 'a'.  Free 'a' and return new string.
+ */
+static char *
+append(const char *a, const char *b)
+{
+   const GLuint aLen = a ? _mesa_strlen(a) : 0;
+   const GLuint bLen = b ? _mesa_strlen(b) : 0;
+   char *s = _mesa_calloc(aLen + bLen + 1);
+   if (s) {
+      if (a)
+         _mesa_memcpy(s, a, aLen);
+      if (b)
+         _mesa_memcpy(s + aLen, b, bLen);
+      s[aLen + bLen] = '\0';
+   }
+   if (a)
+      _mesa_free((void *) a);
+   return s;
+}
+
+
+/**
+ * Check the MESA_EXTENSION_OVERRIDE env var.
+ * For extension names that are recognized, turn them on.  For extension
+ * names that are recognized and prefixed with '-', turn them off.
+ * Return a string of the unknown/leftover names.
+ */
+static const char *
+get_extension_override( GLcontext *ctx )
+{
+   const char *envExt = _mesa_getenv("MESA_EXTENSION_OVERRIDE");
+   char *extraExt = NULL;
+   char ext[1000];
+   GLuint extLen = 0;
+   GLuint i;
+   GLboolean disableExt = GL_FALSE;
+
+   if (!envExt)
+      return NULL;
+
+   for (i = 0; ; i++) {
+      if (envExt[i] == '\0' || envExt[i] == ' ') {
+         /* terminate/process 'ext' if extLen > 0 */
+         if (extLen > 0) {
+            assert(extLen < sizeof(ext));
+            /* enable extension named by 'ext' */
+            ext[extLen] = 0;
+            if (!set_extension(ctx, ext, !disableExt)) {
+               /* unknown extension name, append it to extraExt */
+               if (extraExt) {
+                  extraExt = append(extraExt, " ");
+               }
+               extraExt = append(extraExt, ext);
+            }
+            extLen = 0;
+            disableExt = GL_FALSE;
+         }
+         if (envExt[i] == '\0')
+            break;
+      }
+      else if (envExt[i] == '-') {
+         disableExt = GL_TRUE;
+      }
+      else {
+         /* accumulate this non-space character */
+         ext[extLen++] = envExt[i];
+      }
+   }
+
+   return extraExt;
+}
+
+
 /**
  * Run through the default_extensions array above and set the
  * ctx->Extensions.ARB/EXT_* flags accordingly.
@@ -538,8 +615,9 @@ GLubyte *
 _mesa_make_extension_string( GLcontext *ctx )
 {
    const GLboolean *base = (const GLboolean *) &ctx->Extensions;
+   const char *extraExt = get_extension_override(ctx);
    GLuint extStrLen = 0;
-   GLubyte *s;
+   char *s;
    GLuint i;
 
    /* first, compute length of the extension string */
@@ -549,7 +627,14 @@ _mesa_make_extension_string( GLcontext *ctx )
          extStrLen += (GLuint)_mesa_strlen(default_extensions[i].name) + 1;
       }
    }
-   s = (GLubyte *) _mesa_malloc(extStrLen);
+
+   if (extraExt)
+      extStrLen += _mesa_strlen(extraExt) + 1; /* +1 for space */
+
+   /* allocate the extension string */
+   s = (char *) _mesa_malloc(extStrLen);
+   if (!s)
+      return NULL;
 
    /* second, build the extension string */
    extStrLen = 0;
@@ -559,13 +644,18 @@ _mesa_make_extension_string( GLcontext *ctx )
          GLuint len = (GLuint)_mesa_strlen(default_extensions[i].name);
          _mesa_memcpy(s + extStrLen, default_extensions[i].name, len);
          extStrLen += len;
-         s[extStrLen] = (GLubyte) ' ';
+         s[extStrLen] = ' ';
          extStrLen++;
       }
    }
    ASSERT(extStrLen > 0);
 
-   s[extStrLen - 1] = 0;
+   s[extStrLen - 1] = 0; /* -1 to overwrite trailing the ' ' */
 
-   return s;
+   if (extraExt) {
+      s = append(s, " ");
+      s = append(s, extraExt);
+   }
+
+   return (GLubyte *) s;
 }
-- 
cgit v1.2.3


From 462a9525c78d5757afd2a8d4dc60afc68a69579b Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 8 Jun 2009 15:27:10 -0600
Subject: mesa: reorder fields, update comments for gl_buffer_object

---
 src/mesa/main/mtypes.h | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 26ec8d5595..46020eb210 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1498,14 +1498,17 @@ struct gl_buffer_object
 {
    GLint RefCount;
    GLuint Name;
-   GLenum Usage;
-   GLenum Access;
-   GLvoid *Pointer;          /**< Only valid while buffer is mapped */
-   GLintptr Offset;          /**< mapped offset */
-   GLsizeiptr Length;        /**< mapped length */
-   GLsizeiptrARB Size;       /**< Size of storage in bytes */
-   GLubyte *Data;            /**< Location of storage either in RAM or VRAM. */
-   GLboolean Written;        /**< Ever written to? (for debugging) */
+   GLenum Usage;        /**< GL_STREAM_DRAW_ARB, GL_STREAM_READ_ARB, etc. */
+   GLsizeiptrARB Size;  /**< Size of buffer storage in bytes */
+   GLubyte *Data;       /**< Location of storage either in RAM or VRAM. */
+   /** Fields describing a mapped buffer */
+   /*@{*/
+   GLenum Access;       /**< GL_READ_ONLY_ARB, GL_WRITE_ONLY_ARB, etc. */
+   GLvoid *Pointer;     /**< User-space address of mapping */
+   GLintptr Offset;     /**< Mapped offset */
+   GLsizeiptr Length;   /**< Mapped length */
+   /*@}*/
+   GLboolean Written;   /**< Ever written to? (for debugging) */
 };
 
 
-- 
cgit v1.2.3


From 75cb3c3b7a9db75ec4df63158bf268bb49b62bf4 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 8 Jun 2009 17:00:12 -0600
Subject: mesa: regenerated files for GL_ARB_map_buffer_range

---
 src/mesa/drivers/dri/common/extension_helper.h |   30 +-
 src/mesa/glapi/dispatch.h                      |  444 +--
 src/mesa/glapi/glapioffsets.h                  |  434 +--
 src/mesa/glapi/glapitable.h                    |  430 +--
 src/mesa/glapi/glapitemp.h                     |  184 +-
 src/mesa/glapi/glprocs.h                       | 1118 ++++----
 src/mesa/main/enums.c                          | 3614 ++++++++++++------------
 src/mesa/sparc/glapi_sparc.S                   |   96 +-
 src/mesa/x86-64/glapi_x86-64.S                 | 2124 +++++++-------
 src/mesa/x86/glapi_x86.S                       |  118 +-
 10 files changed, 4374 insertions(+), 4218 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/common/extension_helper.h b/src/mesa/drivers/dri/common/extension_helper.h
index f5e35e4161..261b5f6067 100644
--- a/src/mesa/drivers/dri/common/extension_helper.h
+++ b/src/mesa/drivers/dri/common/extension_helper.h
@@ -2773,10 +2773,10 @@ static const char Uniform4fARB_names[] =
     "";
 #endif
 
-#if defined(need_GL_IBM_multimode_draw_arrays)
-static const char MultiModeDrawArraysIBM_names[] = 
-    "pppii\0" /* Parameter signature */
-    "glMultiModeDrawArraysIBM\0"
+#if defined(need_GL_ARB_map_buffer_range)
+static const char FlushMappedBufferRange_names[] = 
+    "iii\0" /* Parameter signature */
+    "glFlushMappedBufferRange\0"
     "";
 #endif
 
@@ -3904,6 +3904,13 @@ static const char VertexAttribs4dvNV_names[] =
     "";
 #endif
 
+#if defined(need_GL_IBM_multimode_draw_arrays)
+static const char MultiModeDrawArraysIBM_names[] = 
+    "pppii\0" /* Parameter signature */
+    "glMultiModeDrawArraysIBM\0"
+    "";
+#endif
+
 #if defined(need_GL_VERSION_2_0) || defined(need_GL_ARB_vertex_program)
 static const char VertexAttrib4dARB_names[] = 
     "idddd\0" /* Parameter signature */
@@ -4055,6 +4062,13 @@ static const char IsVertexArrayAPPLE_names[] =
     "";
 #endif
 
+#if defined(need_GL_ARB_map_buffer_range)
+static const char MapBufferRange_names[] = 
+    "iiii\0" /* Parameter signature */
+    "glMapBufferRange\0"
+    "";
+#endif
+
 #if defined(need_GL_NV_vertex_program)
 static const char ProgramParameters4dvNV_names[] = 
     "iiip\0" /* Parameter signature */
@@ -4986,6 +5000,14 @@ static const struct dri_extension_function GL_ARB_framebuffer_object_functions[]
 };
 #endif
 
+#if defined(need_GL_ARB_map_buffer_range)
+static const struct dri_extension_function GL_ARB_map_buffer_range_functions[] = {
+    { FlushMappedBufferRange_names, FlushMappedBufferRange_remap_index, -1 },
+    { MapBufferRange_names, MapBufferRange_remap_index, -1 },
+    { NULL, 0, 0 }
+};
+#endif
+
 #if defined(need_GL_ARB_matrix_palette)
 static const struct dri_extension_function GL_ARB_matrix_palette_functions[] = {
     { MatrixIndexusvARB_names, MatrixIndexusvARB_remap_index, -1 },
diff --git a/src/mesa/glapi/dispatch.h b/src/mesa/glapi/dispatch.h
index 39ccf62f23..0ceec40284 100644
--- a/src/mesa/glapi/dispatch.h
+++ b/src/mesa/glapi/dispatch.h
@@ -1746,6 +1746,12 @@
 #define CALL_RenderbufferStorageMultisample(disp, parameters) (*((disp)->RenderbufferStorageMultisample)) parameters
 #define GET_RenderbufferStorageMultisample(disp) ((disp)->RenderbufferStorageMultisample)
 #define SET_RenderbufferStorageMultisample(disp, fn) ((disp)->RenderbufferStorageMultisample = fn)
+#define CALL_FlushMappedBufferRange(disp, parameters) (*((disp)->FlushMappedBufferRange)) parameters
+#define GET_FlushMappedBufferRange(disp) ((disp)->FlushMappedBufferRange)
+#define SET_FlushMappedBufferRange(disp, fn) ((disp)->FlushMappedBufferRange = fn)
+#define CALL_MapBufferRange(disp, parameters) (*((disp)->MapBufferRange)) parameters
+#define GET_MapBufferRange(disp) ((disp)->MapBufferRange)
+#define SET_MapBufferRange(disp, fn) ((disp)->MapBufferRange = fn)
 #define CALL_CopyBufferSubData(disp, parameters) (*((disp)->CopyBufferSubData)) parameters
 #define GET_CopyBufferSubData(disp) ((disp)->CopyBufferSubData)
 #define SET_CopyBufferSubData(disp, fn) ((disp)->CopyBufferSubData = fn)
@@ -2391,7 +2397,7 @@
 
 #else
 
-#define driDispatchRemapTable_size 368
+#define driDispatchRemapTable_size 370
 extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 
 #define AttachShader_remap_index 0
@@ -2548,220 +2554,222 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define GetAttribLocationARB_remap_index 151
 #define DrawBuffersARB_remap_index 152
 #define RenderbufferStorageMultisample_remap_index 153
-#define CopyBufferSubData_remap_index 154
-#define PolygonOffsetEXT_remap_index 155
-#define GetPixelTexGenParameterfvSGIS_remap_index 156
-#define GetPixelTexGenParameterivSGIS_remap_index 157
-#define PixelTexGenParameterfSGIS_remap_index 158
-#define PixelTexGenParameterfvSGIS_remap_index 159
-#define PixelTexGenParameteriSGIS_remap_index 160
-#define PixelTexGenParameterivSGIS_remap_index 161
-#define SampleMaskSGIS_remap_index 162
-#define SamplePatternSGIS_remap_index 163
-#define ColorPointerEXT_remap_index 164
-#define EdgeFlagPointerEXT_remap_index 165
-#define IndexPointerEXT_remap_index 166
-#define NormalPointerEXT_remap_index 167
-#define TexCoordPointerEXT_remap_index 168
-#define VertexPointerEXT_remap_index 169
-#define PointParameterfEXT_remap_index 170
-#define PointParameterfvEXT_remap_index 171
-#define LockArraysEXT_remap_index 172
-#define UnlockArraysEXT_remap_index 173
-#define CullParameterdvEXT_remap_index 174
-#define CullParameterfvEXT_remap_index 175
-#define SecondaryColor3bEXT_remap_index 176
-#define SecondaryColor3bvEXT_remap_index 177
-#define SecondaryColor3dEXT_remap_index 178
-#define SecondaryColor3dvEXT_remap_index 179
-#define SecondaryColor3fEXT_remap_index 180
-#define SecondaryColor3fvEXT_remap_index 181
-#define SecondaryColor3iEXT_remap_index 182
-#define SecondaryColor3ivEXT_remap_index 183
-#define SecondaryColor3sEXT_remap_index 184
-#define SecondaryColor3svEXT_remap_index 185
-#define SecondaryColor3ubEXT_remap_index 186
-#define SecondaryColor3ubvEXT_remap_index 187
-#define SecondaryColor3uiEXT_remap_index 188
-#define SecondaryColor3uivEXT_remap_index 189
-#define SecondaryColor3usEXT_remap_index 190
-#define SecondaryColor3usvEXT_remap_index 191
-#define SecondaryColorPointerEXT_remap_index 192
-#define MultiDrawArraysEXT_remap_index 193
-#define MultiDrawElementsEXT_remap_index 194
-#define FogCoordPointerEXT_remap_index 195
-#define FogCoorddEXT_remap_index 196
-#define FogCoorddvEXT_remap_index 197
-#define FogCoordfEXT_remap_index 198
-#define FogCoordfvEXT_remap_index 199
-#define PixelTexGenSGIX_remap_index 200
-#define BlendFuncSeparateEXT_remap_index 201
-#define FlushVertexArrayRangeNV_remap_index 202
-#define VertexArrayRangeNV_remap_index 203
-#define CombinerInputNV_remap_index 204
-#define CombinerOutputNV_remap_index 205
-#define CombinerParameterfNV_remap_index 206
-#define CombinerParameterfvNV_remap_index 207
-#define CombinerParameteriNV_remap_index 208
-#define CombinerParameterivNV_remap_index 209
-#define FinalCombinerInputNV_remap_index 210
-#define GetCombinerInputParameterfvNV_remap_index 211
-#define GetCombinerInputParameterivNV_remap_index 212
-#define GetCombinerOutputParameterfvNV_remap_index 213
-#define GetCombinerOutputParameterivNV_remap_index 214
-#define GetFinalCombinerInputParameterfvNV_remap_index 215
-#define GetFinalCombinerInputParameterivNV_remap_index 216
-#define ResizeBuffersMESA_remap_index 217
-#define WindowPos2dMESA_remap_index 218
-#define WindowPos2dvMESA_remap_index 219
-#define WindowPos2fMESA_remap_index 220
-#define WindowPos2fvMESA_remap_index 221
-#define WindowPos2iMESA_remap_index 222
-#define WindowPos2ivMESA_remap_index 223
-#define WindowPos2sMESA_remap_index 224
-#define WindowPos2svMESA_remap_index 225
-#define WindowPos3dMESA_remap_index 226
-#define WindowPos3dvMESA_remap_index 227
-#define WindowPos3fMESA_remap_index 228
-#define WindowPos3fvMESA_remap_index 229
-#define WindowPos3iMESA_remap_index 230
-#define WindowPos3ivMESA_remap_index 231
-#define WindowPos3sMESA_remap_index 232
-#define WindowPos3svMESA_remap_index 233
-#define WindowPos4dMESA_remap_index 234
-#define WindowPos4dvMESA_remap_index 235
-#define WindowPos4fMESA_remap_index 236
-#define WindowPos4fvMESA_remap_index 237
-#define WindowPos4iMESA_remap_index 238
-#define WindowPos4ivMESA_remap_index 239
-#define WindowPos4sMESA_remap_index 240
-#define WindowPos4svMESA_remap_index 241
-#define MultiModeDrawArraysIBM_remap_index 242
-#define MultiModeDrawElementsIBM_remap_index 243
-#define DeleteFencesNV_remap_index 244
-#define FinishFenceNV_remap_index 245
-#define GenFencesNV_remap_index 246
-#define GetFenceivNV_remap_index 247
-#define IsFenceNV_remap_index 248
-#define SetFenceNV_remap_index 249
-#define TestFenceNV_remap_index 250
-#define AreProgramsResidentNV_remap_index 251
-#define BindProgramNV_remap_index 252
-#define DeleteProgramsNV_remap_index 253
-#define ExecuteProgramNV_remap_index 254
-#define GenProgramsNV_remap_index 255
-#define GetProgramParameterdvNV_remap_index 256
-#define GetProgramParameterfvNV_remap_index 257
-#define GetProgramStringNV_remap_index 258
-#define GetProgramivNV_remap_index 259
-#define GetTrackMatrixivNV_remap_index 260
-#define GetVertexAttribPointervNV_remap_index 261
-#define GetVertexAttribdvNV_remap_index 262
-#define GetVertexAttribfvNV_remap_index 263
-#define GetVertexAttribivNV_remap_index 264
-#define IsProgramNV_remap_index 265
-#define LoadProgramNV_remap_index 266
-#define ProgramParameters4dvNV_remap_index 267
-#define ProgramParameters4fvNV_remap_index 268
-#define RequestResidentProgramsNV_remap_index 269
-#define TrackMatrixNV_remap_index 270
-#define VertexAttrib1dNV_remap_index 271
-#define VertexAttrib1dvNV_remap_index 272
-#define VertexAttrib1fNV_remap_index 273
-#define VertexAttrib1fvNV_remap_index 274
-#define VertexAttrib1sNV_remap_index 275
-#define VertexAttrib1svNV_remap_index 276
-#define VertexAttrib2dNV_remap_index 277
-#define VertexAttrib2dvNV_remap_index 278
-#define VertexAttrib2fNV_remap_index 279
-#define VertexAttrib2fvNV_remap_index 280
-#define VertexAttrib2sNV_remap_index 281
-#define VertexAttrib2svNV_remap_index 282
-#define VertexAttrib3dNV_remap_index 283
-#define VertexAttrib3dvNV_remap_index 284
-#define VertexAttrib3fNV_remap_index 285
-#define VertexAttrib3fvNV_remap_index 286
-#define VertexAttrib3sNV_remap_index 287
-#define VertexAttrib3svNV_remap_index 288
-#define VertexAttrib4dNV_remap_index 289
-#define VertexAttrib4dvNV_remap_index 290
-#define VertexAttrib4fNV_remap_index 291
-#define VertexAttrib4fvNV_remap_index 292
-#define VertexAttrib4sNV_remap_index 293
-#define VertexAttrib4svNV_remap_index 294
-#define VertexAttrib4ubNV_remap_index 295
-#define VertexAttrib4ubvNV_remap_index 296
-#define VertexAttribPointerNV_remap_index 297
-#define VertexAttribs1dvNV_remap_index 298
-#define VertexAttribs1fvNV_remap_index 299
-#define VertexAttribs1svNV_remap_index 300
-#define VertexAttribs2dvNV_remap_index 301
-#define VertexAttribs2fvNV_remap_index 302
-#define VertexAttribs2svNV_remap_index 303
-#define VertexAttribs3dvNV_remap_index 304
-#define VertexAttribs3fvNV_remap_index 305
-#define VertexAttribs3svNV_remap_index 306
-#define VertexAttribs4dvNV_remap_index 307
-#define VertexAttribs4fvNV_remap_index 308
-#define VertexAttribs4svNV_remap_index 309
-#define VertexAttribs4ubvNV_remap_index 310
-#define GetTexBumpParameterfvATI_remap_index 311
-#define GetTexBumpParameterivATI_remap_index 312
-#define TexBumpParameterfvATI_remap_index 313
-#define TexBumpParameterivATI_remap_index 314
-#define AlphaFragmentOp1ATI_remap_index 315
-#define AlphaFragmentOp2ATI_remap_index 316
-#define AlphaFragmentOp3ATI_remap_index 317
-#define BeginFragmentShaderATI_remap_index 318
-#define BindFragmentShaderATI_remap_index 319
-#define ColorFragmentOp1ATI_remap_index 320
-#define ColorFragmentOp2ATI_remap_index 321
-#define ColorFragmentOp3ATI_remap_index 322
-#define DeleteFragmentShaderATI_remap_index 323
-#define EndFragmentShaderATI_remap_index 324
-#define GenFragmentShadersATI_remap_index 325
-#define PassTexCoordATI_remap_index 326
-#define SampleMapATI_remap_index 327
-#define SetFragmentShaderConstantATI_remap_index 328
-#define PointParameteriNV_remap_index 329
-#define PointParameterivNV_remap_index 330
-#define ActiveStencilFaceEXT_remap_index 331
-#define BindVertexArrayAPPLE_remap_index 332
-#define DeleteVertexArraysAPPLE_remap_index 333
-#define GenVertexArraysAPPLE_remap_index 334
-#define IsVertexArrayAPPLE_remap_index 335
-#define GetProgramNamedParameterdvNV_remap_index 336
-#define GetProgramNamedParameterfvNV_remap_index 337
-#define ProgramNamedParameter4dNV_remap_index 338
-#define ProgramNamedParameter4dvNV_remap_index 339
-#define ProgramNamedParameter4fNV_remap_index 340
-#define ProgramNamedParameter4fvNV_remap_index 341
-#define DepthBoundsEXT_remap_index 342
-#define BlendEquationSeparateEXT_remap_index 343
-#define BindFramebufferEXT_remap_index 344
-#define BindRenderbufferEXT_remap_index 345
-#define CheckFramebufferStatusEXT_remap_index 346
-#define DeleteFramebuffersEXT_remap_index 347
-#define DeleteRenderbuffersEXT_remap_index 348
-#define FramebufferRenderbufferEXT_remap_index 349
-#define FramebufferTexture1DEXT_remap_index 350
-#define FramebufferTexture2DEXT_remap_index 351
-#define FramebufferTexture3DEXT_remap_index 352
-#define GenFramebuffersEXT_remap_index 353
-#define GenRenderbuffersEXT_remap_index 354
-#define GenerateMipmapEXT_remap_index 355
-#define GetFramebufferAttachmentParameterivEXT_remap_index 356
-#define GetRenderbufferParameterivEXT_remap_index 357
-#define IsFramebufferEXT_remap_index 358
-#define IsRenderbufferEXT_remap_index 359
-#define RenderbufferStorageEXT_remap_index 360
-#define BlitFramebufferEXT_remap_index 361
-#define FramebufferTextureLayerEXT_remap_index 362
-#define StencilFuncSeparateATI_remap_index 363
-#define ProgramEnvParameters4fvEXT_remap_index 364
-#define ProgramLocalParameters4fvEXT_remap_index 365
-#define GetQueryObjecti64vEXT_remap_index 366
-#define GetQueryObjectui64vEXT_remap_index 367
+#define FlushMappedBufferRange_remap_index 154
+#define MapBufferRange_remap_index 155
+#define CopyBufferSubData_remap_index 156
+#define PolygonOffsetEXT_remap_index 157
+#define GetPixelTexGenParameterfvSGIS_remap_index 158
+#define GetPixelTexGenParameterivSGIS_remap_index 159
+#define PixelTexGenParameterfSGIS_remap_index 160
+#define PixelTexGenParameterfvSGIS_remap_index 161
+#define PixelTexGenParameteriSGIS_remap_index 162
+#define PixelTexGenParameterivSGIS_remap_index 163
+#define SampleMaskSGIS_remap_index 164
+#define SamplePatternSGIS_remap_index 165
+#define ColorPointerEXT_remap_index 166
+#define EdgeFlagPointerEXT_remap_index 167
+#define IndexPointerEXT_remap_index 168
+#define NormalPointerEXT_remap_index 169
+#define TexCoordPointerEXT_remap_index 170
+#define VertexPointerEXT_remap_index 171
+#define PointParameterfEXT_remap_index 172
+#define PointParameterfvEXT_remap_index 173
+#define LockArraysEXT_remap_index 174
+#define UnlockArraysEXT_remap_index 175
+#define CullParameterdvEXT_remap_index 176
+#define CullParameterfvEXT_remap_index 177
+#define SecondaryColor3bEXT_remap_index 178
+#define SecondaryColor3bvEXT_remap_index 179
+#define SecondaryColor3dEXT_remap_index 180
+#define SecondaryColor3dvEXT_remap_index 181
+#define SecondaryColor3fEXT_remap_index 182
+#define SecondaryColor3fvEXT_remap_index 183
+#define SecondaryColor3iEXT_remap_index 184
+#define SecondaryColor3ivEXT_remap_index 185
+#define SecondaryColor3sEXT_remap_index 186
+#define SecondaryColor3svEXT_remap_index 187
+#define SecondaryColor3ubEXT_remap_index 188
+#define SecondaryColor3ubvEXT_remap_index 189
+#define SecondaryColor3uiEXT_remap_index 190
+#define SecondaryColor3uivEXT_remap_index 191
+#define SecondaryColor3usEXT_remap_index 192
+#define SecondaryColor3usvEXT_remap_index 193
+#define SecondaryColorPointerEXT_remap_index 194
+#define MultiDrawArraysEXT_remap_index 195
+#define MultiDrawElementsEXT_remap_index 196
+#define FogCoordPointerEXT_remap_index 197
+#define FogCoorddEXT_remap_index 198
+#define FogCoorddvEXT_remap_index 199
+#define FogCoordfEXT_remap_index 200
+#define FogCoordfvEXT_remap_index 201
+#define PixelTexGenSGIX_remap_index 202
+#define BlendFuncSeparateEXT_remap_index 203
+#define FlushVertexArrayRangeNV_remap_index 204
+#define VertexArrayRangeNV_remap_index 205
+#define CombinerInputNV_remap_index 206
+#define CombinerOutputNV_remap_index 207
+#define CombinerParameterfNV_remap_index 208
+#define CombinerParameterfvNV_remap_index 209
+#define CombinerParameteriNV_remap_index 210
+#define CombinerParameterivNV_remap_index 211
+#define FinalCombinerInputNV_remap_index 212
+#define GetCombinerInputParameterfvNV_remap_index 213
+#define GetCombinerInputParameterivNV_remap_index 214
+#define GetCombinerOutputParameterfvNV_remap_index 215
+#define GetCombinerOutputParameterivNV_remap_index 216
+#define GetFinalCombinerInputParameterfvNV_remap_index 217
+#define GetFinalCombinerInputParameterivNV_remap_index 218
+#define ResizeBuffersMESA_remap_index 219
+#define WindowPos2dMESA_remap_index 220
+#define WindowPos2dvMESA_remap_index 221
+#define WindowPos2fMESA_remap_index 222
+#define WindowPos2fvMESA_remap_index 223
+#define WindowPos2iMESA_remap_index 224
+#define WindowPos2ivMESA_remap_index 225
+#define WindowPos2sMESA_remap_index 226
+#define WindowPos2svMESA_remap_index 227
+#define WindowPos3dMESA_remap_index 228
+#define WindowPos3dvMESA_remap_index 229
+#define WindowPos3fMESA_remap_index 230
+#define WindowPos3fvMESA_remap_index 231
+#define WindowPos3iMESA_remap_index 232
+#define WindowPos3ivMESA_remap_index 233
+#define WindowPos3sMESA_remap_index 234
+#define WindowPos3svMESA_remap_index 235
+#define WindowPos4dMESA_remap_index 236
+#define WindowPos4dvMESA_remap_index 237
+#define WindowPos4fMESA_remap_index 238
+#define WindowPos4fvMESA_remap_index 239
+#define WindowPos4iMESA_remap_index 240
+#define WindowPos4ivMESA_remap_index 241
+#define WindowPos4sMESA_remap_index 242
+#define WindowPos4svMESA_remap_index 243
+#define MultiModeDrawArraysIBM_remap_index 244
+#define MultiModeDrawElementsIBM_remap_index 245
+#define DeleteFencesNV_remap_index 246
+#define FinishFenceNV_remap_index 247
+#define GenFencesNV_remap_index 248
+#define GetFenceivNV_remap_index 249
+#define IsFenceNV_remap_index 250
+#define SetFenceNV_remap_index 251
+#define TestFenceNV_remap_index 252
+#define AreProgramsResidentNV_remap_index 253
+#define BindProgramNV_remap_index 254
+#define DeleteProgramsNV_remap_index 255
+#define ExecuteProgramNV_remap_index 256
+#define GenProgramsNV_remap_index 257
+#define GetProgramParameterdvNV_remap_index 258
+#define GetProgramParameterfvNV_remap_index 259
+#define GetProgramStringNV_remap_index 260
+#define GetProgramivNV_remap_index 261
+#define GetTrackMatrixivNV_remap_index 262
+#define GetVertexAttribPointervNV_remap_index 263
+#define GetVertexAttribdvNV_remap_index 264
+#define GetVertexAttribfvNV_remap_index 265
+#define GetVertexAttribivNV_remap_index 266
+#define IsProgramNV_remap_index 267
+#define LoadProgramNV_remap_index 268
+#define ProgramParameters4dvNV_remap_index 269
+#define ProgramParameters4fvNV_remap_index 270
+#define RequestResidentProgramsNV_remap_index 271
+#define TrackMatrixNV_remap_index 272
+#define VertexAttrib1dNV_remap_index 273
+#define VertexAttrib1dvNV_remap_index 274
+#define VertexAttrib1fNV_remap_index 275
+#define VertexAttrib1fvNV_remap_index 276
+#define VertexAttrib1sNV_remap_index 277
+#define VertexAttrib1svNV_remap_index 278
+#define VertexAttrib2dNV_remap_index 279
+#define VertexAttrib2dvNV_remap_index 280
+#define VertexAttrib2fNV_remap_index 281
+#define VertexAttrib2fvNV_remap_index 282
+#define VertexAttrib2sNV_remap_index 283
+#define VertexAttrib2svNV_remap_index 284
+#define VertexAttrib3dNV_remap_index 285
+#define VertexAttrib3dvNV_remap_index 286
+#define VertexAttrib3fNV_remap_index 287
+#define VertexAttrib3fvNV_remap_index 288
+#define VertexAttrib3sNV_remap_index 289
+#define VertexAttrib3svNV_remap_index 290
+#define VertexAttrib4dNV_remap_index 291
+#define VertexAttrib4dvNV_remap_index 292
+#define VertexAttrib4fNV_remap_index 293
+#define VertexAttrib4fvNV_remap_index 294
+#define VertexAttrib4sNV_remap_index 295
+#define VertexAttrib4svNV_remap_index 296
+#define VertexAttrib4ubNV_remap_index 297
+#define VertexAttrib4ubvNV_remap_index 298
+#define VertexAttribPointerNV_remap_index 299
+#define VertexAttribs1dvNV_remap_index 300
+#define VertexAttribs1fvNV_remap_index 301
+#define VertexAttribs1svNV_remap_index 302
+#define VertexAttribs2dvNV_remap_index 303
+#define VertexAttribs2fvNV_remap_index 304
+#define VertexAttribs2svNV_remap_index 305
+#define VertexAttribs3dvNV_remap_index 306
+#define VertexAttribs3fvNV_remap_index 307
+#define VertexAttribs3svNV_remap_index 308
+#define VertexAttribs4dvNV_remap_index 309
+#define VertexAttribs4fvNV_remap_index 310
+#define VertexAttribs4svNV_remap_index 311
+#define VertexAttribs4ubvNV_remap_index 312
+#define GetTexBumpParameterfvATI_remap_index 313
+#define GetTexBumpParameterivATI_remap_index 314
+#define TexBumpParameterfvATI_remap_index 315
+#define TexBumpParameterivATI_remap_index 316
+#define AlphaFragmentOp1ATI_remap_index 317
+#define AlphaFragmentOp2ATI_remap_index 318
+#define AlphaFragmentOp3ATI_remap_index 319
+#define BeginFragmentShaderATI_remap_index 320
+#define BindFragmentShaderATI_remap_index 321
+#define ColorFragmentOp1ATI_remap_index 322
+#define ColorFragmentOp2ATI_remap_index 323
+#define ColorFragmentOp3ATI_remap_index 324
+#define DeleteFragmentShaderATI_remap_index 325
+#define EndFragmentShaderATI_remap_index 326
+#define GenFragmentShadersATI_remap_index 327
+#define PassTexCoordATI_remap_index 328
+#define SampleMapATI_remap_index 329
+#define SetFragmentShaderConstantATI_remap_index 330
+#define PointParameteriNV_remap_index 331
+#define PointParameterivNV_remap_index 332
+#define ActiveStencilFaceEXT_remap_index 333
+#define BindVertexArrayAPPLE_remap_index 334
+#define DeleteVertexArraysAPPLE_remap_index 335
+#define GenVertexArraysAPPLE_remap_index 336
+#define IsVertexArrayAPPLE_remap_index 337
+#define GetProgramNamedParameterdvNV_remap_index 338
+#define GetProgramNamedParameterfvNV_remap_index 339
+#define ProgramNamedParameter4dNV_remap_index 340
+#define ProgramNamedParameter4dvNV_remap_index 341
+#define ProgramNamedParameter4fNV_remap_index 342
+#define ProgramNamedParameter4fvNV_remap_index 343
+#define DepthBoundsEXT_remap_index 344
+#define BlendEquationSeparateEXT_remap_index 345
+#define BindFramebufferEXT_remap_index 346
+#define BindRenderbufferEXT_remap_index 347
+#define CheckFramebufferStatusEXT_remap_index 348
+#define DeleteFramebuffersEXT_remap_index 349
+#define DeleteRenderbuffersEXT_remap_index 350
+#define FramebufferRenderbufferEXT_remap_index 351
+#define FramebufferTexture1DEXT_remap_index 352
+#define FramebufferTexture2DEXT_remap_index 353
+#define FramebufferTexture3DEXT_remap_index 354
+#define GenFramebuffersEXT_remap_index 355
+#define GenRenderbuffersEXT_remap_index 356
+#define GenerateMipmapEXT_remap_index 357
+#define GetFramebufferAttachmentParameterivEXT_remap_index 358
+#define GetRenderbufferParameterivEXT_remap_index 359
+#define IsFramebufferEXT_remap_index 360
+#define IsRenderbufferEXT_remap_index 361
+#define RenderbufferStorageEXT_remap_index 362
+#define BlitFramebufferEXT_remap_index 363
+#define FramebufferTextureLayerEXT_remap_index 364
+#define StencilFuncSeparateATI_remap_index 365
+#define ProgramEnvParameters4fvEXT_remap_index 366
+#define ProgramLocalParameters4fvEXT_remap_index 367
+#define GetQueryObjecti64vEXT_remap_index 368
+#define GetQueryObjectui64vEXT_remap_index 369
 
 #define CALL_AttachShader(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLuint)), driDispatchRemapTable[AttachShader_remap_index], parameters)
 #define GET_AttachShader(disp) GET_by_offset(disp, driDispatchRemapTable[AttachShader_remap_index])
@@ -3225,6 +3233,12 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define CALL_RenderbufferStorageMultisample(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLsizei, GLenum, GLsizei, GLsizei)), driDispatchRemapTable[RenderbufferStorageMultisample_remap_index], parameters)
 #define GET_RenderbufferStorageMultisample(disp) GET_by_offset(disp, driDispatchRemapTable[RenderbufferStorageMultisample_remap_index])
 #define SET_RenderbufferStorageMultisample(disp, fn) SET_by_offset(disp, driDispatchRemapTable[RenderbufferStorageMultisample_remap_index], fn)
+#define CALL_FlushMappedBufferRange(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLintptr, GLsizeiptr)), driDispatchRemapTable[FlushMappedBufferRange_remap_index], parameters)
+#define GET_FlushMappedBufferRange(disp) GET_by_offset(disp, driDispatchRemapTable[FlushMappedBufferRange_remap_index])
+#define SET_FlushMappedBufferRange(disp, fn) SET_by_offset(disp, driDispatchRemapTable[FlushMappedBufferRange_remap_index], fn)
+#define CALL_MapBufferRange(disp, parameters) CALL_by_offset(disp, (GLvoid * (GLAPIENTRYP)(GLenum, GLintptr, GLsizeiptr, GLbitfield)), driDispatchRemapTable[MapBufferRange_remap_index], parameters)
+#define GET_MapBufferRange(disp) GET_by_offset(disp, driDispatchRemapTable[MapBufferRange_remap_index])
+#define SET_MapBufferRange(disp, fn) SET_by_offset(disp, driDispatchRemapTable[MapBufferRange_remap_index], fn)
 #define CALL_CopyBufferSubData(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLintptr, GLintptr, GLsizeiptr)), driDispatchRemapTable[CopyBufferSubData_remap_index], parameters)
 #define GET_CopyBufferSubData(disp) GET_by_offset(disp, driDispatchRemapTable[CopyBufferSubData_remap_index])
 #define SET_CopyBufferSubData(disp, fn) SET_by_offset(disp, driDispatchRemapTable[CopyBufferSubData_remap_index], fn)
diff --git a/src/mesa/glapi/glapioffsets.h b/src/mesa/glapi/glapioffsets.h
index e29e2e3bfa..580b6b66bc 100644
--- a/src/mesa/glapi/glapioffsets.h
+++ b/src/mesa/glapi/glapioffsets.h
@@ -594,221 +594,223 @@
 #define _gloffset_GetAttribLocationARB 559
 #define _gloffset_DrawBuffersARB 560
 #define _gloffset_RenderbufferStorageMultisample 561
-#define _gloffset_CopyBufferSubData 562
-#define _gloffset_PolygonOffsetEXT 563
-#define _gloffset_GetPixelTexGenParameterfvSGIS 564
-#define _gloffset_GetPixelTexGenParameterivSGIS 565
-#define _gloffset_PixelTexGenParameterfSGIS 566
-#define _gloffset_PixelTexGenParameterfvSGIS 567
-#define _gloffset_PixelTexGenParameteriSGIS 568
-#define _gloffset_PixelTexGenParameterivSGIS 569
-#define _gloffset_SampleMaskSGIS 570
-#define _gloffset_SamplePatternSGIS 571
-#define _gloffset_ColorPointerEXT 572
-#define _gloffset_EdgeFlagPointerEXT 573
-#define _gloffset_IndexPointerEXT 574
-#define _gloffset_NormalPointerEXT 575
-#define _gloffset_TexCoordPointerEXT 576
-#define _gloffset_VertexPointerEXT 577
-#define _gloffset_PointParameterfEXT 578
-#define _gloffset_PointParameterfvEXT 579
-#define _gloffset_LockArraysEXT 580
-#define _gloffset_UnlockArraysEXT 581
-#define _gloffset_CullParameterdvEXT 582
-#define _gloffset_CullParameterfvEXT 583
-#define _gloffset_SecondaryColor3bEXT 584
-#define _gloffset_SecondaryColor3bvEXT 585
-#define _gloffset_SecondaryColor3dEXT 586
-#define _gloffset_SecondaryColor3dvEXT 587
-#define _gloffset_SecondaryColor3fEXT 588
-#define _gloffset_SecondaryColor3fvEXT 589
-#define _gloffset_SecondaryColor3iEXT 590
-#define _gloffset_SecondaryColor3ivEXT 591
-#define _gloffset_SecondaryColor3sEXT 592
-#define _gloffset_SecondaryColor3svEXT 593
-#define _gloffset_SecondaryColor3ubEXT 594
-#define _gloffset_SecondaryColor3ubvEXT 595
-#define _gloffset_SecondaryColor3uiEXT 596
-#define _gloffset_SecondaryColor3uivEXT 597
-#define _gloffset_SecondaryColor3usEXT 598
-#define _gloffset_SecondaryColor3usvEXT 599
-#define _gloffset_SecondaryColorPointerEXT 600
-#define _gloffset_MultiDrawArraysEXT 601
-#define _gloffset_MultiDrawElementsEXT 602
-#define _gloffset_FogCoordPointerEXT 603
-#define _gloffset_FogCoorddEXT 604
-#define _gloffset_FogCoorddvEXT 605
-#define _gloffset_FogCoordfEXT 606
-#define _gloffset_FogCoordfvEXT 607
-#define _gloffset_PixelTexGenSGIX 608
-#define _gloffset_BlendFuncSeparateEXT 609
-#define _gloffset_FlushVertexArrayRangeNV 610
-#define _gloffset_VertexArrayRangeNV 611
-#define _gloffset_CombinerInputNV 612
-#define _gloffset_CombinerOutputNV 613
-#define _gloffset_CombinerParameterfNV 614
-#define _gloffset_CombinerParameterfvNV 615
-#define _gloffset_CombinerParameteriNV 616
-#define _gloffset_CombinerParameterivNV 617
-#define _gloffset_FinalCombinerInputNV 618
-#define _gloffset_GetCombinerInputParameterfvNV 619
-#define _gloffset_GetCombinerInputParameterivNV 620
-#define _gloffset_GetCombinerOutputParameterfvNV 621
-#define _gloffset_GetCombinerOutputParameterivNV 622
-#define _gloffset_GetFinalCombinerInputParameterfvNV 623
-#define _gloffset_GetFinalCombinerInputParameterivNV 624
-#define _gloffset_ResizeBuffersMESA 625
-#define _gloffset_WindowPos2dMESA 626
-#define _gloffset_WindowPos2dvMESA 627
-#define _gloffset_WindowPos2fMESA 628
-#define _gloffset_WindowPos2fvMESA 629
-#define _gloffset_WindowPos2iMESA 630
-#define _gloffset_WindowPos2ivMESA 631
-#define _gloffset_WindowPos2sMESA 632
-#define _gloffset_WindowPos2svMESA 633
-#define _gloffset_WindowPos3dMESA 634
-#define _gloffset_WindowPos3dvMESA 635
-#define _gloffset_WindowPos3fMESA 636
-#define _gloffset_WindowPos3fvMESA 637
-#define _gloffset_WindowPos3iMESA 638
-#define _gloffset_WindowPos3ivMESA 639
-#define _gloffset_WindowPos3sMESA 640
-#define _gloffset_WindowPos3svMESA 641
-#define _gloffset_WindowPos4dMESA 642
-#define _gloffset_WindowPos4dvMESA 643
-#define _gloffset_WindowPos4fMESA 644
-#define _gloffset_WindowPos4fvMESA 645
-#define _gloffset_WindowPos4iMESA 646
-#define _gloffset_WindowPos4ivMESA 647
-#define _gloffset_WindowPos4sMESA 648
-#define _gloffset_WindowPos4svMESA 649
-#define _gloffset_MultiModeDrawArraysIBM 650
-#define _gloffset_MultiModeDrawElementsIBM 651
-#define _gloffset_DeleteFencesNV 652
-#define _gloffset_FinishFenceNV 653
-#define _gloffset_GenFencesNV 654
-#define _gloffset_GetFenceivNV 655
-#define _gloffset_IsFenceNV 656
-#define _gloffset_SetFenceNV 657
-#define _gloffset_TestFenceNV 658
-#define _gloffset_AreProgramsResidentNV 659
-#define _gloffset_BindProgramNV 660
-#define _gloffset_DeleteProgramsNV 661
-#define _gloffset_ExecuteProgramNV 662
-#define _gloffset_GenProgramsNV 663
-#define _gloffset_GetProgramParameterdvNV 664
-#define _gloffset_GetProgramParameterfvNV 665
-#define _gloffset_GetProgramStringNV 666
-#define _gloffset_GetProgramivNV 667
-#define _gloffset_GetTrackMatrixivNV 668
-#define _gloffset_GetVertexAttribPointervNV 669
-#define _gloffset_GetVertexAttribdvNV 670
-#define _gloffset_GetVertexAttribfvNV 671
-#define _gloffset_GetVertexAttribivNV 672
-#define _gloffset_IsProgramNV 673
-#define _gloffset_LoadProgramNV 674
-#define _gloffset_ProgramParameters4dvNV 675
-#define _gloffset_ProgramParameters4fvNV 676
-#define _gloffset_RequestResidentProgramsNV 677
-#define _gloffset_TrackMatrixNV 678
-#define _gloffset_VertexAttrib1dNV 679
-#define _gloffset_VertexAttrib1dvNV 680
-#define _gloffset_VertexAttrib1fNV 681
-#define _gloffset_VertexAttrib1fvNV 682
-#define _gloffset_VertexAttrib1sNV 683
-#define _gloffset_VertexAttrib1svNV 684
-#define _gloffset_VertexAttrib2dNV 685
-#define _gloffset_VertexAttrib2dvNV 686
-#define _gloffset_VertexAttrib2fNV 687
-#define _gloffset_VertexAttrib2fvNV 688
-#define _gloffset_VertexAttrib2sNV 689
-#define _gloffset_VertexAttrib2svNV 690
-#define _gloffset_VertexAttrib3dNV 691
-#define _gloffset_VertexAttrib3dvNV 692
-#define _gloffset_VertexAttrib3fNV 693
-#define _gloffset_VertexAttrib3fvNV 694
-#define _gloffset_VertexAttrib3sNV 695
-#define _gloffset_VertexAttrib3svNV 696
-#define _gloffset_VertexAttrib4dNV 697
-#define _gloffset_VertexAttrib4dvNV 698
-#define _gloffset_VertexAttrib4fNV 699
-#define _gloffset_VertexAttrib4fvNV 700
-#define _gloffset_VertexAttrib4sNV 701
-#define _gloffset_VertexAttrib4svNV 702
-#define _gloffset_VertexAttrib4ubNV 703
-#define _gloffset_VertexAttrib4ubvNV 704
-#define _gloffset_VertexAttribPointerNV 705
-#define _gloffset_VertexAttribs1dvNV 706
-#define _gloffset_VertexAttribs1fvNV 707
-#define _gloffset_VertexAttribs1svNV 708
-#define _gloffset_VertexAttribs2dvNV 709
-#define _gloffset_VertexAttribs2fvNV 710
-#define _gloffset_VertexAttribs2svNV 711
-#define _gloffset_VertexAttribs3dvNV 712
-#define _gloffset_VertexAttribs3fvNV 713
-#define _gloffset_VertexAttribs3svNV 714
-#define _gloffset_VertexAttribs4dvNV 715
-#define _gloffset_VertexAttribs4fvNV 716
-#define _gloffset_VertexAttribs4svNV 717
-#define _gloffset_VertexAttribs4ubvNV 718
-#define _gloffset_GetTexBumpParameterfvATI 719
-#define _gloffset_GetTexBumpParameterivATI 720
-#define _gloffset_TexBumpParameterfvATI 721
-#define _gloffset_TexBumpParameterivATI 722
-#define _gloffset_AlphaFragmentOp1ATI 723
-#define _gloffset_AlphaFragmentOp2ATI 724
-#define _gloffset_AlphaFragmentOp3ATI 725
-#define _gloffset_BeginFragmentShaderATI 726
-#define _gloffset_BindFragmentShaderATI 727
-#define _gloffset_ColorFragmentOp1ATI 728
-#define _gloffset_ColorFragmentOp2ATI 729
-#define _gloffset_ColorFragmentOp3ATI 730
-#define _gloffset_DeleteFragmentShaderATI 731
-#define _gloffset_EndFragmentShaderATI 732
-#define _gloffset_GenFragmentShadersATI 733
-#define _gloffset_PassTexCoordATI 734
-#define _gloffset_SampleMapATI 735
-#define _gloffset_SetFragmentShaderConstantATI 736
-#define _gloffset_PointParameteriNV 737
-#define _gloffset_PointParameterivNV 738
-#define _gloffset_ActiveStencilFaceEXT 739
-#define _gloffset_BindVertexArrayAPPLE 740
-#define _gloffset_DeleteVertexArraysAPPLE 741
-#define _gloffset_GenVertexArraysAPPLE 742
-#define _gloffset_IsVertexArrayAPPLE 743
-#define _gloffset_GetProgramNamedParameterdvNV 744
-#define _gloffset_GetProgramNamedParameterfvNV 745
-#define _gloffset_ProgramNamedParameter4dNV 746
-#define _gloffset_ProgramNamedParameter4dvNV 747
-#define _gloffset_ProgramNamedParameter4fNV 748
-#define _gloffset_ProgramNamedParameter4fvNV 749
-#define _gloffset_DepthBoundsEXT 750
-#define _gloffset_BlendEquationSeparateEXT 751
-#define _gloffset_BindFramebufferEXT 752
-#define _gloffset_BindRenderbufferEXT 753
-#define _gloffset_CheckFramebufferStatusEXT 754
-#define _gloffset_DeleteFramebuffersEXT 755
-#define _gloffset_DeleteRenderbuffersEXT 756
-#define _gloffset_FramebufferRenderbufferEXT 757
-#define _gloffset_FramebufferTexture1DEXT 758
-#define _gloffset_FramebufferTexture2DEXT 759
-#define _gloffset_FramebufferTexture3DEXT 760
-#define _gloffset_GenFramebuffersEXT 761
-#define _gloffset_GenRenderbuffersEXT 762
-#define _gloffset_GenerateMipmapEXT 763
-#define _gloffset_GetFramebufferAttachmentParameterivEXT 764
-#define _gloffset_GetRenderbufferParameterivEXT 765
-#define _gloffset_IsFramebufferEXT 766
-#define _gloffset_IsRenderbufferEXT 767
-#define _gloffset_RenderbufferStorageEXT 768
-#define _gloffset_BlitFramebufferEXT 769
-#define _gloffset_FramebufferTextureLayerEXT 770
-#define _gloffset_StencilFuncSeparateATI 771
-#define _gloffset_ProgramEnvParameters4fvEXT 772
-#define _gloffset_ProgramLocalParameters4fvEXT 773
-#define _gloffset_GetQueryObjecti64vEXT 774
-#define _gloffset_GetQueryObjectui64vEXT 775
-#define _gloffset_FIRST_DYNAMIC 776
+#define _gloffset_FlushMappedBufferRange 562
+#define _gloffset_MapBufferRange 563
+#define _gloffset_CopyBufferSubData 564
+#define _gloffset_PolygonOffsetEXT 565
+#define _gloffset_GetPixelTexGenParameterfvSGIS 566
+#define _gloffset_GetPixelTexGenParameterivSGIS 567
+#define _gloffset_PixelTexGenParameterfSGIS 568
+#define _gloffset_PixelTexGenParameterfvSGIS 569
+#define _gloffset_PixelTexGenParameteriSGIS 570
+#define _gloffset_PixelTexGenParameterivSGIS 571
+#define _gloffset_SampleMaskSGIS 572
+#define _gloffset_SamplePatternSGIS 573
+#define _gloffset_ColorPointerEXT 574
+#define _gloffset_EdgeFlagPointerEXT 575
+#define _gloffset_IndexPointerEXT 576
+#define _gloffset_NormalPointerEXT 577
+#define _gloffset_TexCoordPointerEXT 578
+#define _gloffset_VertexPointerEXT 579
+#define _gloffset_PointParameterfEXT 580
+#define _gloffset_PointParameterfvEXT 581
+#define _gloffset_LockArraysEXT 582
+#define _gloffset_UnlockArraysEXT 583
+#define _gloffset_CullParameterdvEXT 584
+#define _gloffset_CullParameterfvEXT 585
+#define _gloffset_SecondaryColor3bEXT 586
+#define _gloffset_SecondaryColor3bvEXT 587
+#define _gloffset_SecondaryColor3dEXT 588
+#define _gloffset_SecondaryColor3dvEXT 589
+#define _gloffset_SecondaryColor3fEXT 590
+#define _gloffset_SecondaryColor3fvEXT 591
+#define _gloffset_SecondaryColor3iEXT 592
+#define _gloffset_SecondaryColor3ivEXT 593
+#define _gloffset_SecondaryColor3sEXT 594
+#define _gloffset_SecondaryColor3svEXT 595
+#define _gloffset_SecondaryColor3ubEXT 596
+#define _gloffset_SecondaryColor3ubvEXT 597
+#define _gloffset_SecondaryColor3uiEXT 598
+#define _gloffset_SecondaryColor3uivEXT 599
+#define _gloffset_SecondaryColor3usEXT 600
+#define _gloffset_SecondaryColor3usvEXT 601
+#define _gloffset_SecondaryColorPointerEXT 602
+#define _gloffset_MultiDrawArraysEXT 603
+#define _gloffset_MultiDrawElementsEXT 604
+#define _gloffset_FogCoordPointerEXT 605
+#define _gloffset_FogCoorddEXT 606
+#define _gloffset_FogCoorddvEXT 607
+#define _gloffset_FogCoordfEXT 608
+#define _gloffset_FogCoordfvEXT 609
+#define _gloffset_PixelTexGenSGIX 610
+#define _gloffset_BlendFuncSeparateEXT 611
+#define _gloffset_FlushVertexArrayRangeNV 612
+#define _gloffset_VertexArrayRangeNV 613
+#define _gloffset_CombinerInputNV 614
+#define _gloffset_CombinerOutputNV 615
+#define _gloffset_CombinerParameterfNV 616
+#define _gloffset_CombinerParameterfvNV 617
+#define _gloffset_CombinerParameteriNV 618
+#define _gloffset_CombinerParameterivNV 619
+#define _gloffset_FinalCombinerInputNV 620
+#define _gloffset_GetCombinerInputParameterfvNV 621
+#define _gloffset_GetCombinerInputParameterivNV 622
+#define _gloffset_GetCombinerOutputParameterfvNV 623
+#define _gloffset_GetCombinerOutputParameterivNV 624
+#define _gloffset_GetFinalCombinerInputParameterfvNV 625
+#define _gloffset_GetFinalCombinerInputParameterivNV 626
+#define _gloffset_ResizeBuffersMESA 627
+#define _gloffset_WindowPos2dMESA 628
+#define _gloffset_WindowPos2dvMESA 629
+#define _gloffset_WindowPos2fMESA 630
+#define _gloffset_WindowPos2fvMESA 631
+#define _gloffset_WindowPos2iMESA 632
+#define _gloffset_WindowPos2ivMESA 633
+#define _gloffset_WindowPos2sMESA 634
+#define _gloffset_WindowPos2svMESA 635
+#define _gloffset_WindowPos3dMESA 636
+#define _gloffset_WindowPos3dvMESA 637
+#define _gloffset_WindowPos3fMESA 638
+#define _gloffset_WindowPos3fvMESA 639
+#define _gloffset_WindowPos3iMESA 640
+#define _gloffset_WindowPos3ivMESA 641
+#define _gloffset_WindowPos3sMESA 642
+#define _gloffset_WindowPos3svMESA 643
+#define _gloffset_WindowPos4dMESA 644
+#define _gloffset_WindowPos4dvMESA 645
+#define _gloffset_WindowPos4fMESA 646
+#define _gloffset_WindowPos4fvMESA 647
+#define _gloffset_WindowPos4iMESA 648
+#define _gloffset_WindowPos4ivMESA 649
+#define _gloffset_WindowPos4sMESA 650
+#define _gloffset_WindowPos4svMESA 651
+#define _gloffset_MultiModeDrawArraysIBM 652
+#define _gloffset_MultiModeDrawElementsIBM 653
+#define _gloffset_DeleteFencesNV 654
+#define _gloffset_FinishFenceNV 655
+#define _gloffset_GenFencesNV 656
+#define _gloffset_GetFenceivNV 657
+#define _gloffset_IsFenceNV 658
+#define _gloffset_SetFenceNV 659
+#define _gloffset_TestFenceNV 660
+#define _gloffset_AreProgramsResidentNV 661
+#define _gloffset_BindProgramNV 662
+#define _gloffset_DeleteProgramsNV 663
+#define _gloffset_ExecuteProgramNV 664
+#define _gloffset_GenProgramsNV 665
+#define _gloffset_GetProgramParameterdvNV 666
+#define _gloffset_GetProgramParameterfvNV 667
+#define _gloffset_GetProgramStringNV 668
+#define _gloffset_GetProgramivNV 669
+#define _gloffset_GetTrackMatrixivNV 670
+#define _gloffset_GetVertexAttribPointervNV 671
+#define _gloffset_GetVertexAttribdvNV 672
+#define _gloffset_GetVertexAttribfvNV 673
+#define _gloffset_GetVertexAttribivNV 674
+#define _gloffset_IsProgramNV 675
+#define _gloffset_LoadProgramNV 676
+#define _gloffset_ProgramParameters4dvNV 677
+#define _gloffset_ProgramParameters4fvNV 678
+#define _gloffset_RequestResidentProgramsNV 679
+#define _gloffset_TrackMatrixNV 680
+#define _gloffset_VertexAttrib1dNV 681
+#define _gloffset_VertexAttrib1dvNV 682
+#define _gloffset_VertexAttrib1fNV 683
+#define _gloffset_VertexAttrib1fvNV 684
+#define _gloffset_VertexAttrib1sNV 685
+#define _gloffset_VertexAttrib1svNV 686
+#define _gloffset_VertexAttrib2dNV 687
+#define _gloffset_VertexAttrib2dvNV 688
+#define _gloffset_VertexAttrib2fNV 689
+#define _gloffset_VertexAttrib2fvNV 690
+#define _gloffset_VertexAttrib2sNV 691
+#define _gloffset_VertexAttrib2svNV 692
+#define _gloffset_VertexAttrib3dNV 693
+#define _gloffset_VertexAttrib3dvNV 694
+#define _gloffset_VertexAttrib3fNV 695
+#define _gloffset_VertexAttrib3fvNV 696
+#define _gloffset_VertexAttrib3sNV 697
+#define _gloffset_VertexAttrib3svNV 698
+#define _gloffset_VertexAttrib4dNV 699
+#define _gloffset_VertexAttrib4dvNV 700
+#define _gloffset_VertexAttrib4fNV 701
+#define _gloffset_VertexAttrib4fvNV 702
+#define _gloffset_VertexAttrib4sNV 703
+#define _gloffset_VertexAttrib4svNV 704
+#define _gloffset_VertexAttrib4ubNV 705
+#define _gloffset_VertexAttrib4ubvNV 706
+#define _gloffset_VertexAttribPointerNV 707
+#define _gloffset_VertexAttribs1dvNV 708
+#define _gloffset_VertexAttribs1fvNV 709
+#define _gloffset_VertexAttribs1svNV 710
+#define _gloffset_VertexAttribs2dvNV 711
+#define _gloffset_VertexAttribs2fvNV 712
+#define _gloffset_VertexAttribs2svNV 713
+#define _gloffset_VertexAttribs3dvNV 714
+#define _gloffset_VertexAttribs3fvNV 715
+#define _gloffset_VertexAttribs3svNV 716
+#define _gloffset_VertexAttribs4dvNV 717
+#define _gloffset_VertexAttribs4fvNV 718
+#define _gloffset_VertexAttribs4svNV 719
+#define _gloffset_VertexAttribs4ubvNV 720
+#define _gloffset_GetTexBumpParameterfvATI 721
+#define _gloffset_GetTexBumpParameterivATI 722
+#define _gloffset_TexBumpParameterfvATI 723
+#define _gloffset_TexBumpParameterivATI 724
+#define _gloffset_AlphaFragmentOp1ATI 725
+#define _gloffset_AlphaFragmentOp2ATI 726
+#define _gloffset_AlphaFragmentOp3ATI 727
+#define _gloffset_BeginFragmentShaderATI 728
+#define _gloffset_BindFragmentShaderATI 729
+#define _gloffset_ColorFragmentOp1ATI 730
+#define _gloffset_ColorFragmentOp2ATI 731
+#define _gloffset_ColorFragmentOp3ATI 732
+#define _gloffset_DeleteFragmentShaderATI 733
+#define _gloffset_EndFragmentShaderATI 734
+#define _gloffset_GenFragmentShadersATI 735
+#define _gloffset_PassTexCoordATI 736
+#define _gloffset_SampleMapATI 737
+#define _gloffset_SetFragmentShaderConstantATI 738
+#define _gloffset_PointParameteriNV 739
+#define _gloffset_PointParameterivNV 740
+#define _gloffset_ActiveStencilFaceEXT 741
+#define _gloffset_BindVertexArrayAPPLE 742
+#define _gloffset_DeleteVertexArraysAPPLE 743
+#define _gloffset_GenVertexArraysAPPLE 744
+#define _gloffset_IsVertexArrayAPPLE 745
+#define _gloffset_GetProgramNamedParameterdvNV 746
+#define _gloffset_GetProgramNamedParameterfvNV 747
+#define _gloffset_ProgramNamedParameter4dNV 748
+#define _gloffset_ProgramNamedParameter4dvNV 749
+#define _gloffset_ProgramNamedParameter4fNV 750
+#define _gloffset_ProgramNamedParameter4fvNV 751
+#define _gloffset_DepthBoundsEXT 752
+#define _gloffset_BlendEquationSeparateEXT 753
+#define _gloffset_BindFramebufferEXT 754
+#define _gloffset_BindRenderbufferEXT 755
+#define _gloffset_CheckFramebufferStatusEXT 756
+#define _gloffset_DeleteFramebuffersEXT 757
+#define _gloffset_DeleteRenderbuffersEXT 758
+#define _gloffset_FramebufferRenderbufferEXT 759
+#define _gloffset_FramebufferTexture1DEXT 760
+#define _gloffset_FramebufferTexture2DEXT 761
+#define _gloffset_FramebufferTexture3DEXT 762
+#define _gloffset_GenFramebuffersEXT 763
+#define _gloffset_GenRenderbuffersEXT 764
+#define _gloffset_GenerateMipmapEXT 765
+#define _gloffset_GetFramebufferAttachmentParameterivEXT 766
+#define _gloffset_GetRenderbufferParameterivEXT 767
+#define _gloffset_IsFramebufferEXT 768
+#define _gloffset_IsRenderbufferEXT 769
+#define _gloffset_RenderbufferStorageEXT 770
+#define _gloffset_BlitFramebufferEXT 771
+#define _gloffset_FramebufferTextureLayerEXT 772
+#define _gloffset_StencilFuncSeparateATI 773
+#define _gloffset_ProgramEnvParameters4fvEXT 774
+#define _gloffset_ProgramLocalParameters4fvEXT 775
+#define _gloffset_GetQueryObjecti64vEXT 776
+#define _gloffset_GetQueryObjectui64vEXT 777
+#define _gloffset_FIRST_DYNAMIC 778
 
 #else
 
@@ -966,6 +968,8 @@
 #define _gloffset_GetAttribLocationARB driDispatchRemapTable[GetAttribLocationARB_remap_index]
 #define _gloffset_DrawBuffersARB driDispatchRemapTable[DrawBuffersARB_remap_index]
 #define _gloffset_RenderbufferStorageMultisample driDispatchRemapTable[RenderbufferStorageMultisample_remap_index]
+#define _gloffset_FlushMappedBufferRange driDispatchRemapTable[FlushMappedBufferRange_remap_index]
+#define _gloffset_MapBufferRange driDispatchRemapTable[MapBufferRange_remap_index]
 #define _gloffset_CopyBufferSubData driDispatchRemapTable[CopyBufferSubData_remap_index]
 #define _gloffset_PolygonOffsetEXT driDispatchRemapTable[PolygonOffsetEXT_remap_index]
 #define _gloffset_GetPixelTexGenParameterfvSGIS driDispatchRemapTable[GetPixelTexGenParameterfvSGIS_remap_index]
diff --git a/src/mesa/glapi/glapitable.h b/src/mesa/glapi/glapitable.h
index c782c90087..f4c36234ce 100644
--- a/src/mesa/glapi/glapitable.h
+++ b/src/mesa/glapi/glapitable.h
@@ -602,220 +602,222 @@ struct _glapi_table
    GLint (GLAPIENTRYP GetAttribLocationARB)(GLhandleARB program, const GLcharARB * name); /* 559 */
    void (GLAPIENTRYP DrawBuffersARB)(GLsizei n, const GLenum * bufs); /* 560 */
    void (GLAPIENTRYP RenderbufferStorageMultisample)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); /* 561 */
-   void (GLAPIENTRYP CopyBufferSubData)(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); /* 562 */
-   void (GLAPIENTRYP PolygonOffsetEXT)(GLfloat factor, GLfloat bias); /* 563 */
-   void (GLAPIENTRYP GetPixelTexGenParameterfvSGIS)(GLenum pname, GLfloat * params); /* 564 */
-   void (GLAPIENTRYP GetPixelTexGenParameterivSGIS)(GLenum pname, GLint * params); /* 565 */
-   void (GLAPIENTRYP PixelTexGenParameterfSGIS)(GLenum pname, GLfloat param); /* 566 */
-   void (GLAPIENTRYP PixelTexGenParameterfvSGIS)(GLenum pname, const GLfloat * params); /* 567 */
-   void (GLAPIENTRYP PixelTexGenParameteriSGIS)(GLenum pname, GLint param); /* 568 */
-   void (GLAPIENTRYP PixelTexGenParameterivSGIS)(GLenum pname, const GLint * params); /* 569 */
-   void (GLAPIENTRYP SampleMaskSGIS)(GLclampf value, GLboolean invert); /* 570 */
-   void (GLAPIENTRYP SamplePatternSGIS)(GLenum pattern); /* 571 */
-   void (GLAPIENTRYP ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 572 */
-   void (GLAPIENTRYP EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean * pointer); /* 573 */
-   void (GLAPIENTRYP IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 574 */
-   void (GLAPIENTRYP NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 575 */
-   void (GLAPIENTRYP TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 576 */
-   void (GLAPIENTRYP VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 577 */
-   void (GLAPIENTRYP PointParameterfEXT)(GLenum pname, GLfloat param); /* 578 */
-   void (GLAPIENTRYP PointParameterfvEXT)(GLenum pname, const GLfloat * params); /* 579 */
-   void (GLAPIENTRYP LockArraysEXT)(GLint first, GLsizei count); /* 580 */
-   void (GLAPIENTRYP UnlockArraysEXT)(void); /* 581 */
-   void (GLAPIENTRYP CullParameterdvEXT)(GLenum pname, GLdouble * params); /* 582 */
-   void (GLAPIENTRYP CullParameterfvEXT)(GLenum pname, GLfloat * params); /* 583 */
-   void (GLAPIENTRYP SecondaryColor3bEXT)(GLbyte red, GLbyte green, GLbyte blue); /* 584 */
-   void (GLAPIENTRYP SecondaryColor3bvEXT)(const GLbyte * v); /* 585 */
-   void (GLAPIENTRYP SecondaryColor3dEXT)(GLdouble red, GLdouble green, GLdouble blue); /* 586 */
-   void (GLAPIENTRYP SecondaryColor3dvEXT)(const GLdouble * v); /* 587 */
-   void (GLAPIENTRYP SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue); /* 588 */
-   void (GLAPIENTRYP SecondaryColor3fvEXT)(const GLfloat * v); /* 589 */
-   void (GLAPIENTRYP SecondaryColor3iEXT)(GLint red, GLint green, GLint blue); /* 590 */
-   void (GLAPIENTRYP SecondaryColor3ivEXT)(const GLint * v); /* 591 */
-   void (GLAPIENTRYP SecondaryColor3sEXT)(GLshort red, GLshort green, GLshort blue); /* 592 */
-   void (GLAPIENTRYP SecondaryColor3svEXT)(const GLshort * v); /* 593 */
-   void (GLAPIENTRYP SecondaryColor3ubEXT)(GLubyte red, GLubyte green, GLubyte blue); /* 594 */
-   void (GLAPIENTRYP SecondaryColor3ubvEXT)(const GLubyte * v); /* 595 */
-   void (GLAPIENTRYP SecondaryColor3uiEXT)(GLuint red, GLuint green, GLuint blue); /* 596 */
-   void (GLAPIENTRYP SecondaryColor3uivEXT)(const GLuint * v); /* 597 */
-   void (GLAPIENTRYP SecondaryColor3usEXT)(GLushort red, GLushort green, GLushort blue); /* 598 */
-   void (GLAPIENTRYP SecondaryColor3usvEXT)(const GLushort * v); /* 599 */
-   void (GLAPIENTRYP SecondaryColorPointerEXT)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 600 */
-   void (GLAPIENTRYP MultiDrawArraysEXT)(GLenum mode, GLint * first, GLsizei * count, GLsizei primcount); /* 601 */
-   void (GLAPIENTRYP MultiDrawElementsEXT)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount); /* 602 */
-   void (GLAPIENTRYP FogCoordPointerEXT)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 603 */
-   void (GLAPIENTRYP FogCoorddEXT)(GLdouble coord); /* 604 */
-   void (GLAPIENTRYP FogCoorddvEXT)(const GLdouble * coord); /* 605 */
-   void (GLAPIENTRYP FogCoordfEXT)(GLfloat coord); /* 606 */
-   void (GLAPIENTRYP FogCoordfvEXT)(const GLfloat * coord); /* 607 */
-   void (GLAPIENTRYP PixelTexGenSGIX)(GLenum mode); /* 608 */
-   void (GLAPIENTRYP BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); /* 609 */
-   void (GLAPIENTRYP FlushVertexArrayRangeNV)(void); /* 610 */
-   void (GLAPIENTRYP VertexArrayRangeNV)(GLsizei length, const GLvoid * pointer); /* 611 */
-   void (GLAPIENTRYP CombinerInputNV)(GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 612 */
-   void (GLAPIENTRYP CombinerOutputNV)(GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum); /* 613 */
-   void (GLAPIENTRYP CombinerParameterfNV)(GLenum pname, GLfloat param); /* 614 */
-   void (GLAPIENTRYP CombinerParameterfvNV)(GLenum pname, const GLfloat * params); /* 615 */
-   void (GLAPIENTRYP CombinerParameteriNV)(GLenum pname, GLint param); /* 616 */
-   void (GLAPIENTRYP CombinerParameterivNV)(GLenum pname, const GLint * params); /* 617 */
-   void (GLAPIENTRYP FinalCombinerInputNV)(GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 618 */
-   void (GLAPIENTRYP GetCombinerInputParameterfvNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat * params); /* 619 */
-   void (GLAPIENTRYP GetCombinerInputParameterivNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint * params); /* 620 */
-   void (GLAPIENTRYP GetCombinerOutputParameterfvNV)(GLenum stage, GLenum portion, GLenum pname, GLfloat * params); /* 621 */
-   void (GLAPIENTRYP GetCombinerOutputParameterivNV)(GLenum stage, GLenum portion, GLenum pname, GLint * params); /* 622 */
-   void (GLAPIENTRYP GetFinalCombinerInputParameterfvNV)(GLenum variable, GLenum pname, GLfloat * params); /* 623 */
-   void (GLAPIENTRYP GetFinalCombinerInputParameterivNV)(GLenum variable, GLenum pname, GLint * params); /* 624 */
-   void (GLAPIENTRYP ResizeBuffersMESA)(void); /* 625 */
-   void (GLAPIENTRYP WindowPos2dMESA)(GLdouble x, GLdouble y); /* 626 */
-   void (GLAPIENTRYP WindowPos2dvMESA)(const GLdouble * v); /* 627 */
-   void (GLAPIENTRYP WindowPos2fMESA)(GLfloat x, GLfloat y); /* 628 */
-   void (GLAPIENTRYP WindowPos2fvMESA)(const GLfloat * v); /* 629 */
-   void (GLAPIENTRYP WindowPos2iMESA)(GLint x, GLint y); /* 630 */
-   void (GLAPIENTRYP WindowPos2ivMESA)(const GLint * v); /* 631 */
-   void (GLAPIENTRYP WindowPos2sMESA)(GLshort x, GLshort y); /* 632 */
-   void (GLAPIENTRYP WindowPos2svMESA)(const GLshort * v); /* 633 */
-   void (GLAPIENTRYP WindowPos3dMESA)(GLdouble x, GLdouble y, GLdouble z); /* 634 */
-   void (GLAPIENTRYP WindowPos3dvMESA)(const GLdouble * v); /* 635 */
-   void (GLAPIENTRYP WindowPos3fMESA)(GLfloat x, GLfloat y, GLfloat z); /* 636 */
-   void (GLAPIENTRYP WindowPos3fvMESA)(const GLfloat * v); /* 637 */
-   void (GLAPIENTRYP WindowPos3iMESA)(GLint x, GLint y, GLint z); /* 638 */
-   void (GLAPIENTRYP WindowPos3ivMESA)(const GLint * v); /* 639 */
-   void (GLAPIENTRYP WindowPos3sMESA)(GLshort x, GLshort y, GLshort z); /* 640 */
-   void (GLAPIENTRYP WindowPos3svMESA)(const GLshort * v); /* 641 */
-   void (GLAPIENTRYP WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 642 */
-   void (GLAPIENTRYP WindowPos4dvMESA)(const GLdouble * v); /* 643 */
-   void (GLAPIENTRYP WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 644 */
-   void (GLAPIENTRYP WindowPos4fvMESA)(const GLfloat * v); /* 645 */
-   void (GLAPIENTRYP WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w); /* 646 */
-   void (GLAPIENTRYP WindowPos4ivMESA)(const GLint * v); /* 647 */
-   void (GLAPIENTRYP WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w); /* 648 */
-   void (GLAPIENTRYP WindowPos4svMESA)(const GLshort * v); /* 649 */
-   void (GLAPIENTRYP MultiModeDrawArraysIBM)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride); /* 650 */
-   void (GLAPIENTRYP MultiModeDrawElementsIBM)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride); /* 651 */
-   void (GLAPIENTRYP DeleteFencesNV)(GLsizei n, const GLuint * fences); /* 652 */
-   void (GLAPIENTRYP FinishFenceNV)(GLuint fence); /* 653 */
-   void (GLAPIENTRYP GenFencesNV)(GLsizei n, GLuint * fences); /* 654 */
-   void (GLAPIENTRYP GetFenceivNV)(GLuint fence, GLenum pname, GLint * params); /* 655 */
-   GLboolean (GLAPIENTRYP IsFenceNV)(GLuint fence); /* 656 */
-   void (GLAPIENTRYP SetFenceNV)(GLuint fence, GLenum condition); /* 657 */
-   GLboolean (GLAPIENTRYP TestFenceNV)(GLuint fence); /* 658 */
-   GLboolean (GLAPIENTRYP AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences); /* 659 */
-   void (GLAPIENTRYP BindProgramNV)(GLenum target, GLuint program); /* 660 */
-   void (GLAPIENTRYP DeleteProgramsNV)(GLsizei n, const GLuint * programs); /* 661 */
-   void (GLAPIENTRYP ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat * params); /* 662 */
-   void (GLAPIENTRYP GenProgramsNV)(GLsizei n, GLuint * programs); /* 663 */
-   void (GLAPIENTRYP GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params); /* 664 */
-   void (GLAPIENTRYP GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat * params); /* 665 */
-   void (GLAPIENTRYP GetProgramStringNV)(GLuint id, GLenum pname, GLubyte * program); /* 666 */
-   void (GLAPIENTRYP GetProgramivNV)(GLuint id, GLenum pname, GLint * params); /* 667 */
-   void (GLAPIENTRYP GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint * params); /* 668 */
-   void (GLAPIENTRYP GetVertexAttribPointervNV)(GLuint index, GLenum pname, GLvoid ** pointer); /* 669 */
-   void (GLAPIENTRYP GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params); /* 670 */
-   void (GLAPIENTRYP GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat * params); /* 671 */
-   void (GLAPIENTRYP GetVertexAttribivNV)(GLuint index, GLenum pname, GLint * params); /* 672 */
-   GLboolean (GLAPIENTRYP IsProgramNV)(GLuint program); /* 673 */
-   void (GLAPIENTRYP LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte * program); /* 674 */
-   void (GLAPIENTRYP ProgramParameters4dvNV)(GLenum target, GLuint index, GLuint num, const GLdouble * params); /* 675 */
-   void (GLAPIENTRYP ProgramParameters4fvNV)(GLenum target, GLuint index, GLuint num, const GLfloat * params); /* 676 */
-   void (GLAPIENTRYP RequestResidentProgramsNV)(GLsizei n, const GLuint * ids); /* 677 */
-   void (GLAPIENTRYP TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform); /* 678 */
-   void (GLAPIENTRYP VertexAttrib1dNV)(GLuint index, GLdouble x); /* 679 */
-   void (GLAPIENTRYP VertexAttrib1dvNV)(GLuint index, const GLdouble * v); /* 680 */
-   void (GLAPIENTRYP VertexAttrib1fNV)(GLuint index, GLfloat x); /* 681 */
-   void (GLAPIENTRYP VertexAttrib1fvNV)(GLuint index, const GLfloat * v); /* 682 */
-   void (GLAPIENTRYP VertexAttrib1sNV)(GLuint index, GLshort x); /* 683 */
-   void (GLAPIENTRYP VertexAttrib1svNV)(GLuint index, const GLshort * v); /* 684 */
-   void (GLAPIENTRYP VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y); /* 685 */
-   void (GLAPIENTRYP VertexAttrib2dvNV)(GLuint index, const GLdouble * v); /* 686 */
-   void (GLAPIENTRYP VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y); /* 687 */
-   void (GLAPIENTRYP VertexAttrib2fvNV)(GLuint index, const GLfloat * v); /* 688 */
-   void (GLAPIENTRYP VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y); /* 689 */
-   void (GLAPIENTRYP VertexAttrib2svNV)(GLuint index, const GLshort * v); /* 690 */
-   void (GLAPIENTRYP VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 691 */
-   void (GLAPIENTRYP VertexAttrib3dvNV)(GLuint index, const GLdouble * v); /* 692 */
-   void (GLAPIENTRYP VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 693 */
-   void (GLAPIENTRYP VertexAttrib3fvNV)(GLuint index, const GLfloat * v); /* 694 */
-   void (GLAPIENTRYP VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z); /* 695 */
-   void (GLAPIENTRYP VertexAttrib3svNV)(GLuint index, const GLshort * v); /* 696 */
-   void (GLAPIENTRYP VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 697 */
-   void (GLAPIENTRYP VertexAttrib4dvNV)(GLuint index, const GLdouble * v); /* 698 */
-   void (GLAPIENTRYP VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 699 */
-   void (GLAPIENTRYP VertexAttrib4fvNV)(GLuint index, const GLfloat * v); /* 700 */
-   void (GLAPIENTRYP VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 701 */
-   void (GLAPIENTRYP VertexAttrib4svNV)(GLuint index, const GLshort * v); /* 702 */
-   void (GLAPIENTRYP VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 703 */
-   void (GLAPIENTRYP VertexAttrib4ubvNV)(GLuint index, const GLubyte * v); /* 704 */
-   void (GLAPIENTRYP VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 705 */
-   void (GLAPIENTRYP VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 706 */
-   void (GLAPIENTRYP VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 707 */
-   void (GLAPIENTRYP VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v); /* 708 */
-   void (GLAPIENTRYP VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 709 */
-   void (GLAPIENTRYP VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 710 */
-   void (GLAPIENTRYP VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v); /* 711 */
-   void (GLAPIENTRYP VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 712 */
-   void (GLAPIENTRYP VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 713 */
-   void (GLAPIENTRYP VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v); /* 714 */
-   void (GLAPIENTRYP VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 715 */
-   void (GLAPIENTRYP VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 716 */
-   void (GLAPIENTRYP VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v); /* 717 */
-   void (GLAPIENTRYP VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v); /* 718 */
-   void (GLAPIENTRYP GetTexBumpParameterfvATI)(GLenum pname, GLfloat * param); /* 719 */
-   void (GLAPIENTRYP GetTexBumpParameterivATI)(GLenum pname, GLint * param); /* 720 */
-   void (GLAPIENTRYP TexBumpParameterfvATI)(GLenum pname, const GLfloat * param); /* 721 */
-   void (GLAPIENTRYP TexBumpParameterivATI)(GLenum pname, const GLint * param); /* 722 */
-   void (GLAPIENTRYP AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 723 */
-   void (GLAPIENTRYP AlphaFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 724 */
-   void (GLAPIENTRYP AlphaFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 725 */
-   void (GLAPIENTRYP BeginFragmentShaderATI)(void); /* 726 */
-   void (GLAPIENTRYP BindFragmentShaderATI)(GLuint id); /* 727 */
-   void (GLAPIENTRYP ColorFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 728 */
-   void (GLAPIENTRYP ColorFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 729 */
-   void (GLAPIENTRYP ColorFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 730 */
-   void (GLAPIENTRYP DeleteFragmentShaderATI)(GLuint id); /* 731 */
-   void (GLAPIENTRYP EndFragmentShaderATI)(void); /* 732 */
-   GLuint (GLAPIENTRYP GenFragmentShadersATI)(GLuint range); /* 733 */
-   void (GLAPIENTRYP PassTexCoordATI)(GLuint dst, GLuint coord, GLenum swizzle); /* 734 */
-   void (GLAPIENTRYP SampleMapATI)(GLuint dst, GLuint interp, GLenum swizzle); /* 735 */
-   void (GLAPIENTRYP SetFragmentShaderConstantATI)(GLuint dst, const GLfloat * value); /* 736 */
-   void (GLAPIENTRYP PointParameteriNV)(GLenum pname, GLint param); /* 737 */
-   void (GLAPIENTRYP PointParameterivNV)(GLenum pname, const GLint * params); /* 738 */
-   void (GLAPIENTRYP ActiveStencilFaceEXT)(GLenum face); /* 739 */
-   void (GLAPIENTRYP BindVertexArrayAPPLE)(GLuint array); /* 740 */
-   void (GLAPIENTRYP DeleteVertexArraysAPPLE)(GLsizei n, const GLuint * arrays); /* 741 */
-   void (GLAPIENTRYP GenVertexArraysAPPLE)(GLsizei n, GLuint * arrays); /* 742 */
-   GLboolean (GLAPIENTRYP IsVertexArrayAPPLE)(GLuint array); /* 743 */
-   void (GLAPIENTRYP GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params); /* 744 */
-   void (GLAPIENTRYP GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params); /* 745 */
-   void (GLAPIENTRYP ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 746 */
-   void (GLAPIENTRYP ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 747 */
-   void (GLAPIENTRYP ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 748 */
-   void (GLAPIENTRYP ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 749 */
-   void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 750 */
-   void (GLAPIENTRYP BlendEquationSeparateEXT)(GLenum modeRGB, GLenum modeA); /* 751 */
-   void (GLAPIENTRYP BindFramebufferEXT)(GLenum target, GLuint framebuffer); /* 752 */
-   void (GLAPIENTRYP BindRenderbufferEXT)(GLenum target, GLuint renderbuffer); /* 753 */
-   GLenum (GLAPIENTRYP CheckFramebufferStatusEXT)(GLenum target); /* 754 */
-   void (GLAPIENTRYP DeleteFramebuffersEXT)(GLsizei n, const GLuint * framebuffers); /* 755 */
-   void (GLAPIENTRYP DeleteRenderbuffersEXT)(GLsizei n, const GLuint * renderbuffers); /* 756 */
-   void (GLAPIENTRYP FramebufferRenderbufferEXT)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); /* 757 */
-   void (GLAPIENTRYP FramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 758 */
-   void (GLAPIENTRYP FramebufferTexture2DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 759 */
-   void (GLAPIENTRYP FramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); /* 760 */
-   void (GLAPIENTRYP GenFramebuffersEXT)(GLsizei n, GLuint * framebuffers); /* 761 */
-   void (GLAPIENTRYP GenRenderbuffersEXT)(GLsizei n, GLuint * renderbuffers); /* 762 */
-   void (GLAPIENTRYP GenerateMipmapEXT)(GLenum target); /* 763 */
-   void (GLAPIENTRYP GetFramebufferAttachmentParameterivEXT)(GLenum target, GLenum attachment, GLenum pname, GLint * params); /* 764 */
-   void (GLAPIENTRYP GetRenderbufferParameterivEXT)(GLenum target, GLenum pname, GLint * params); /* 765 */
-   GLboolean (GLAPIENTRYP IsFramebufferEXT)(GLuint framebuffer); /* 766 */
-   GLboolean (GLAPIENTRYP IsRenderbufferEXT)(GLuint renderbuffer); /* 767 */
-   void (GLAPIENTRYP RenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); /* 768 */
-   void (GLAPIENTRYP BlitFramebufferEXT)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); /* 769 */
-   void (GLAPIENTRYP FramebufferTextureLayerEXT)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); /* 770 */
-   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 771 */
-   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 772 */
-   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 773 */
-   void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 774 */
-   void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 775 */
+   void (GLAPIENTRYP FlushMappedBufferRange)(GLenum target, GLintptr offset, GLsizeiptr length); /* 562 */
+   GLvoid * (GLAPIENTRYP MapBufferRange)(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); /* 563 */
+   void (GLAPIENTRYP CopyBufferSubData)(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); /* 564 */
+   void (GLAPIENTRYP PolygonOffsetEXT)(GLfloat factor, GLfloat bias); /* 565 */
+   void (GLAPIENTRYP GetPixelTexGenParameterfvSGIS)(GLenum pname, GLfloat * params); /* 566 */
+   void (GLAPIENTRYP GetPixelTexGenParameterivSGIS)(GLenum pname, GLint * params); /* 567 */
+   void (GLAPIENTRYP PixelTexGenParameterfSGIS)(GLenum pname, GLfloat param); /* 568 */
+   void (GLAPIENTRYP PixelTexGenParameterfvSGIS)(GLenum pname, const GLfloat * params); /* 569 */
+   void (GLAPIENTRYP PixelTexGenParameteriSGIS)(GLenum pname, GLint param); /* 570 */
+   void (GLAPIENTRYP PixelTexGenParameterivSGIS)(GLenum pname, const GLint * params); /* 571 */
+   void (GLAPIENTRYP SampleMaskSGIS)(GLclampf value, GLboolean invert); /* 572 */
+   void (GLAPIENTRYP SamplePatternSGIS)(GLenum pattern); /* 573 */
+   void (GLAPIENTRYP ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 574 */
+   void (GLAPIENTRYP EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean * pointer); /* 575 */
+   void (GLAPIENTRYP IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 576 */
+   void (GLAPIENTRYP NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 577 */
+   void (GLAPIENTRYP TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 578 */
+   void (GLAPIENTRYP VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 579 */
+   void (GLAPIENTRYP PointParameterfEXT)(GLenum pname, GLfloat param); /* 580 */
+   void (GLAPIENTRYP PointParameterfvEXT)(GLenum pname, const GLfloat * params); /* 581 */
+   void (GLAPIENTRYP LockArraysEXT)(GLint first, GLsizei count); /* 582 */
+   void (GLAPIENTRYP UnlockArraysEXT)(void); /* 583 */
+   void (GLAPIENTRYP CullParameterdvEXT)(GLenum pname, GLdouble * params); /* 584 */
+   void (GLAPIENTRYP CullParameterfvEXT)(GLenum pname, GLfloat * params); /* 585 */
+   void (GLAPIENTRYP SecondaryColor3bEXT)(GLbyte red, GLbyte green, GLbyte blue); /* 586 */
+   void (GLAPIENTRYP SecondaryColor3bvEXT)(const GLbyte * v); /* 587 */
+   void (GLAPIENTRYP SecondaryColor3dEXT)(GLdouble red, GLdouble green, GLdouble blue); /* 588 */
+   void (GLAPIENTRYP SecondaryColor3dvEXT)(const GLdouble * v); /* 589 */
+   void (GLAPIENTRYP SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue); /* 590 */
+   void (GLAPIENTRYP SecondaryColor3fvEXT)(const GLfloat * v); /* 591 */
+   void (GLAPIENTRYP SecondaryColor3iEXT)(GLint red, GLint green, GLint blue); /* 592 */
+   void (GLAPIENTRYP SecondaryColor3ivEXT)(const GLint * v); /* 593 */
+   void (GLAPIENTRYP SecondaryColor3sEXT)(GLshort red, GLshort green, GLshort blue); /* 594 */
+   void (GLAPIENTRYP SecondaryColor3svEXT)(const GLshort * v); /* 595 */
+   void (GLAPIENTRYP SecondaryColor3ubEXT)(GLubyte red, GLubyte green, GLubyte blue); /* 596 */
+   void (GLAPIENTRYP SecondaryColor3ubvEXT)(const GLubyte * v); /* 597 */
+   void (GLAPIENTRYP SecondaryColor3uiEXT)(GLuint red, GLuint green, GLuint blue); /* 598 */
+   void (GLAPIENTRYP SecondaryColor3uivEXT)(const GLuint * v); /* 599 */
+   void (GLAPIENTRYP SecondaryColor3usEXT)(GLushort red, GLushort green, GLushort blue); /* 600 */
+   void (GLAPIENTRYP SecondaryColor3usvEXT)(const GLushort * v); /* 601 */
+   void (GLAPIENTRYP SecondaryColorPointerEXT)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 602 */
+   void (GLAPIENTRYP MultiDrawArraysEXT)(GLenum mode, GLint * first, GLsizei * count, GLsizei primcount); /* 603 */
+   void (GLAPIENTRYP MultiDrawElementsEXT)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount); /* 604 */
+   void (GLAPIENTRYP FogCoordPointerEXT)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 605 */
+   void (GLAPIENTRYP FogCoorddEXT)(GLdouble coord); /* 606 */
+   void (GLAPIENTRYP FogCoorddvEXT)(const GLdouble * coord); /* 607 */
+   void (GLAPIENTRYP FogCoordfEXT)(GLfloat coord); /* 608 */
+   void (GLAPIENTRYP FogCoordfvEXT)(const GLfloat * coord); /* 609 */
+   void (GLAPIENTRYP PixelTexGenSGIX)(GLenum mode); /* 610 */
+   void (GLAPIENTRYP BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); /* 611 */
+   void (GLAPIENTRYP FlushVertexArrayRangeNV)(void); /* 612 */
+   void (GLAPIENTRYP VertexArrayRangeNV)(GLsizei length, const GLvoid * pointer); /* 613 */
+   void (GLAPIENTRYP CombinerInputNV)(GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 614 */
+   void (GLAPIENTRYP CombinerOutputNV)(GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum); /* 615 */
+   void (GLAPIENTRYP CombinerParameterfNV)(GLenum pname, GLfloat param); /* 616 */
+   void (GLAPIENTRYP CombinerParameterfvNV)(GLenum pname, const GLfloat * params); /* 617 */
+   void (GLAPIENTRYP CombinerParameteriNV)(GLenum pname, GLint param); /* 618 */
+   void (GLAPIENTRYP CombinerParameterivNV)(GLenum pname, const GLint * params); /* 619 */
+   void (GLAPIENTRYP FinalCombinerInputNV)(GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 620 */
+   void (GLAPIENTRYP GetCombinerInputParameterfvNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat * params); /* 621 */
+   void (GLAPIENTRYP GetCombinerInputParameterivNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint * params); /* 622 */
+   void (GLAPIENTRYP GetCombinerOutputParameterfvNV)(GLenum stage, GLenum portion, GLenum pname, GLfloat * params); /* 623 */
+   void (GLAPIENTRYP GetCombinerOutputParameterivNV)(GLenum stage, GLenum portion, GLenum pname, GLint * params); /* 624 */
+   void (GLAPIENTRYP GetFinalCombinerInputParameterfvNV)(GLenum variable, GLenum pname, GLfloat * params); /* 625 */
+   void (GLAPIENTRYP GetFinalCombinerInputParameterivNV)(GLenum variable, GLenum pname, GLint * params); /* 626 */
+   void (GLAPIENTRYP ResizeBuffersMESA)(void); /* 627 */
+   void (GLAPIENTRYP WindowPos2dMESA)(GLdouble x, GLdouble y); /* 628 */
+   void (GLAPIENTRYP WindowPos2dvMESA)(const GLdouble * v); /* 629 */
+   void (GLAPIENTRYP WindowPos2fMESA)(GLfloat x, GLfloat y); /* 630 */
+   void (GLAPIENTRYP WindowPos2fvMESA)(const GLfloat * v); /* 631 */
+   void (GLAPIENTRYP WindowPos2iMESA)(GLint x, GLint y); /* 632 */
+   void (GLAPIENTRYP WindowPos2ivMESA)(const GLint * v); /* 633 */
+   void (GLAPIENTRYP WindowPos2sMESA)(GLshort x, GLshort y); /* 634 */
+   void (GLAPIENTRYP WindowPos2svMESA)(const GLshort * v); /* 635 */
+   void (GLAPIENTRYP WindowPos3dMESA)(GLdouble x, GLdouble y, GLdouble z); /* 636 */
+   void (GLAPIENTRYP WindowPos3dvMESA)(const GLdouble * v); /* 637 */
+   void (GLAPIENTRYP WindowPos3fMESA)(GLfloat x, GLfloat y, GLfloat z); /* 638 */
+   void (GLAPIENTRYP WindowPos3fvMESA)(const GLfloat * v); /* 639 */
+   void (GLAPIENTRYP WindowPos3iMESA)(GLint x, GLint y, GLint z); /* 640 */
+   void (GLAPIENTRYP WindowPos3ivMESA)(const GLint * v); /* 641 */
+   void (GLAPIENTRYP WindowPos3sMESA)(GLshort x, GLshort y, GLshort z); /* 642 */
+   void (GLAPIENTRYP WindowPos3svMESA)(const GLshort * v); /* 643 */
+   void (GLAPIENTRYP WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 644 */
+   void (GLAPIENTRYP WindowPos4dvMESA)(const GLdouble * v); /* 645 */
+   void (GLAPIENTRYP WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 646 */
+   void (GLAPIENTRYP WindowPos4fvMESA)(const GLfloat * v); /* 647 */
+   void (GLAPIENTRYP WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w); /* 648 */
+   void (GLAPIENTRYP WindowPos4ivMESA)(const GLint * v); /* 649 */
+   void (GLAPIENTRYP WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w); /* 650 */
+   void (GLAPIENTRYP WindowPos4svMESA)(const GLshort * v); /* 651 */
+   void (GLAPIENTRYP MultiModeDrawArraysIBM)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride); /* 652 */
+   void (GLAPIENTRYP MultiModeDrawElementsIBM)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride); /* 653 */
+   void (GLAPIENTRYP DeleteFencesNV)(GLsizei n, const GLuint * fences); /* 654 */
+   void (GLAPIENTRYP FinishFenceNV)(GLuint fence); /* 655 */
+   void (GLAPIENTRYP GenFencesNV)(GLsizei n, GLuint * fences); /* 656 */
+   void (GLAPIENTRYP GetFenceivNV)(GLuint fence, GLenum pname, GLint * params); /* 657 */
+   GLboolean (GLAPIENTRYP IsFenceNV)(GLuint fence); /* 658 */
+   void (GLAPIENTRYP SetFenceNV)(GLuint fence, GLenum condition); /* 659 */
+   GLboolean (GLAPIENTRYP TestFenceNV)(GLuint fence); /* 660 */
+   GLboolean (GLAPIENTRYP AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences); /* 661 */
+   void (GLAPIENTRYP BindProgramNV)(GLenum target, GLuint program); /* 662 */
+   void (GLAPIENTRYP DeleteProgramsNV)(GLsizei n, const GLuint * programs); /* 663 */
+   void (GLAPIENTRYP ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat * params); /* 664 */
+   void (GLAPIENTRYP GenProgramsNV)(GLsizei n, GLuint * programs); /* 665 */
+   void (GLAPIENTRYP GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params); /* 666 */
+   void (GLAPIENTRYP GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat * params); /* 667 */
+   void (GLAPIENTRYP GetProgramStringNV)(GLuint id, GLenum pname, GLubyte * program); /* 668 */
+   void (GLAPIENTRYP GetProgramivNV)(GLuint id, GLenum pname, GLint * params); /* 669 */
+   void (GLAPIENTRYP GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint * params); /* 670 */
+   void (GLAPIENTRYP GetVertexAttribPointervNV)(GLuint index, GLenum pname, GLvoid ** pointer); /* 671 */
+   void (GLAPIENTRYP GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params); /* 672 */
+   void (GLAPIENTRYP GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat * params); /* 673 */
+   void (GLAPIENTRYP GetVertexAttribivNV)(GLuint index, GLenum pname, GLint * params); /* 674 */
+   GLboolean (GLAPIENTRYP IsProgramNV)(GLuint program); /* 675 */
+   void (GLAPIENTRYP LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte * program); /* 676 */
+   void (GLAPIENTRYP ProgramParameters4dvNV)(GLenum target, GLuint index, GLuint num, const GLdouble * params); /* 677 */
+   void (GLAPIENTRYP ProgramParameters4fvNV)(GLenum target, GLuint index, GLuint num, const GLfloat * params); /* 678 */
+   void (GLAPIENTRYP RequestResidentProgramsNV)(GLsizei n, const GLuint * ids); /* 679 */
+   void (GLAPIENTRYP TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform); /* 680 */
+   void (GLAPIENTRYP VertexAttrib1dNV)(GLuint index, GLdouble x); /* 681 */
+   void (GLAPIENTRYP VertexAttrib1dvNV)(GLuint index, const GLdouble * v); /* 682 */
+   void (GLAPIENTRYP VertexAttrib1fNV)(GLuint index, GLfloat x); /* 683 */
+   void (GLAPIENTRYP VertexAttrib1fvNV)(GLuint index, const GLfloat * v); /* 684 */
+   void (GLAPIENTRYP VertexAttrib1sNV)(GLuint index, GLshort x); /* 685 */
+   void (GLAPIENTRYP VertexAttrib1svNV)(GLuint index, const GLshort * v); /* 686 */
+   void (GLAPIENTRYP VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y); /* 687 */
+   void (GLAPIENTRYP VertexAttrib2dvNV)(GLuint index, const GLdouble * v); /* 688 */
+   void (GLAPIENTRYP VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y); /* 689 */
+   void (GLAPIENTRYP VertexAttrib2fvNV)(GLuint index, const GLfloat * v); /* 690 */
+   void (GLAPIENTRYP VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y); /* 691 */
+   void (GLAPIENTRYP VertexAttrib2svNV)(GLuint index, const GLshort * v); /* 692 */
+   void (GLAPIENTRYP VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 693 */
+   void (GLAPIENTRYP VertexAttrib3dvNV)(GLuint index, const GLdouble * v); /* 694 */
+   void (GLAPIENTRYP VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 695 */
+   void (GLAPIENTRYP VertexAttrib3fvNV)(GLuint index, const GLfloat * v); /* 696 */
+   void (GLAPIENTRYP VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z); /* 697 */
+   void (GLAPIENTRYP VertexAttrib3svNV)(GLuint index, const GLshort * v); /* 698 */
+   void (GLAPIENTRYP VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 699 */
+   void (GLAPIENTRYP VertexAttrib4dvNV)(GLuint index, const GLdouble * v); /* 700 */
+   void (GLAPIENTRYP VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 701 */
+   void (GLAPIENTRYP VertexAttrib4fvNV)(GLuint index, const GLfloat * v); /* 702 */
+   void (GLAPIENTRYP VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 703 */
+   void (GLAPIENTRYP VertexAttrib4svNV)(GLuint index, const GLshort * v); /* 704 */
+   void (GLAPIENTRYP VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 705 */
+   void (GLAPIENTRYP VertexAttrib4ubvNV)(GLuint index, const GLubyte * v); /* 706 */
+   void (GLAPIENTRYP VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 707 */
+   void (GLAPIENTRYP VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 708 */
+   void (GLAPIENTRYP VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 709 */
+   void (GLAPIENTRYP VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v); /* 710 */
+   void (GLAPIENTRYP VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 711 */
+   void (GLAPIENTRYP VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 712 */
+   void (GLAPIENTRYP VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v); /* 713 */
+   void (GLAPIENTRYP VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 714 */
+   void (GLAPIENTRYP VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 715 */
+   void (GLAPIENTRYP VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v); /* 716 */
+   void (GLAPIENTRYP VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 717 */
+   void (GLAPIENTRYP VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 718 */
+   void (GLAPIENTRYP VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v); /* 719 */
+   void (GLAPIENTRYP VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v); /* 720 */
+   void (GLAPIENTRYP GetTexBumpParameterfvATI)(GLenum pname, GLfloat * param); /* 721 */
+   void (GLAPIENTRYP GetTexBumpParameterivATI)(GLenum pname, GLint * param); /* 722 */
+   void (GLAPIENTRYP TexBumpParameterfvATI)(GLenum pname, const GLfloat * param); /* 723 */
+   void (GLAPIENTRYP TexBumpParameterivATI)(GLenum pname, const GLint * param); /* 724 */
+   void (GLAPIENTRYP AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 725 */
+   void (GLAPIENTRYP AlphaFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 726 */
+   void (GLAPIENTRYP AlphaFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 727 */
+   void (GLAPIENTRYP BeginFragmentShaderATI)(void); /* 728 */
+   void (GLAPIENTRYP BindFragmentShaderATI)(GLuint id); /* 729 */
+   void (GLAPIENTRYP ColorFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 730 */
+   void (GLAPIENTRYP ColorFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 731 */
+   void (GLAPIENTRYP ColorFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 732 */
+   void (GLAPIENTRYP DeleteFragmentShaderATI)(GLuint id); /* 733 */
+   void (GLAPIENTRYP EndFragmentShaderATI)(void); /* 734 */
+   GLuint (GLAPIENTRYP GenFragmentShadersATI)(GLuint range); /* 735 */
+   void (GLAPIENTRYP PassTexCoordATI)(GLuint dst, GLuint coord, GLenum swizzle); /* 736 */
+   void (GLAPIENTRYP SampleMapATI)(GLuint dst, GLuint interp, GLenum swizzle); /* 737 */
+   void (GLAPIENTRYP SetFragmentShaderConstantATI)(GLuint dst, const GLfloat * value); /* 738 */
+   void (GLAPIENTRYP PointParameteriNV)(GLenum pname, GLint param); /* 739 */
+   void (GLAPIENTRYP PointParameterivNV)(GLenum pname, const GLint * params); /* 740 */
+   void (GLAPIENTRYP ActiveStencilFaceEXT)(GLenum face); /* 741 */
+   void (GLAPIENTRYP BindVertexArrayAPPLE)(GLuint array); /* 742 */
+   void (GLAPIENTRYP DeleteVertexArraysAPPLE)(GLsizei n, const GLuint * arrays); /* 743 */
+   void (GLAPIENTRYP GenVertexArraysAPPLE)(GLsizei n, GLuint * arrays); /* 744 */
+   GLboolean (GLAPIENTRYP IsVertexArrayAPPLE)(GLuint array); /* 745 */
+   void (GLAPIENTRYP GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params); /* 746 */
+   void (GLAPIENTRYP GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params); /* 747 */
+   void (GLAPIENTRYP ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 748 */
+   void (GLAPIENTRYP ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 749 */
+   void (GLAPIENTRYP ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 750 */
+   void (GLAPIENTRYP ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 751 */
+   void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 752 */
+   void (GLAPIENTRYP BlendEquationSeparateEXT)(GLenum modeRGB, GLenum modeA); /* 753 */
+   void (GLAPIENTRYP BindFramebufferEXT)(GLenum target, GLuint framebuffer); /* 754 */
+   void (GLAPIENTRYP BindRenderbufferEXT)(GLenum target, GLuint renderbuffer); /* 755 */
+   GLenum (GLAPIENTRYP CheckFramebufferStatusEXT)(GLenum target); /* 756 */
+   void (GLAPIENTRYP DeleteFramebuffersEXT)(GLsizei n, const GLuint * framebuffers); /* 757 */
+   void (GLAPIENTRYP DeleteRenderbuffersEXT)(GLsizei n, const GLuint * renderbuffers); /* 758 */
+   void (GLAPIENTRYP FramebufferRenderbufferEXT)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); /* 759 */
+   void (GLAPIENTRYP FramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 760 */
+   void (GLAPIENTRYP FramebufferTexture2DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 761 */
+   void (GLAPIENTRYP FramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); /* 762 */
+   void (GLAPIENTRYP GenFramebuffersEXT)(GLsizei n, GLuint * framebuffers); /* 763 */
+   void (GLAPIENTRYP GenRenderbuffersEXT)(GLsizei n, GLuint * renderbuffers); /* 764 */
+   void (GLAPIENTRYP GenerateMipmapEXT)(GLenum target); /* 765 */
+   void (GLAPIENTRYP GetFramebufferAttachmentParameterivEXT)(GLenum target, GLenum attachment, GLenum pname, GLint * params); /* 766 */
+   void (GLAPIENTRYP GetRenderbufferParameterivEXT)(GLenum target, GLenum pname, GLint * params); /* 767 */
+   GLboolean (GLAPIENTRYP IsFramebufferEXT)(GLuint framebuffer); /* 768 */
+   GLboolean (GLAPIENTRYP IsRenderbufferEXT)(GLuint renderbuffer); /* 769 */
+   void (GLAPIENTRYP RenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); /* 770 */
+   void (GLAPIENTRYP BlitFramebufferEXT)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); /* 771 */
+   void (GLAPIENTRYP FramebufferTextureLayerEXT)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); /* 772 */
+   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 773 */
+   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 774 */
+   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 775 */
+   void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 776 */
+   void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 777 */
 };
 
 #endif /* !defined( _GLAPI_TABLE_H_ ) */
diff --git a/src/mesa/glapi/glapitemp.h b/src/mesa/glapi/glapitemp.h
index c37aed7bcd..b1ac9ff841 100644
--- a/src/mesa/glapi/glapitemp.h
+++ b/src/mesa/glapi/glapitemp.h
@@ -4011,6 +4011,16 @@ KEYWORD1 void KEYWORD2 NAME(RenderbufferStorageMultisample)(GLenum target, GLsiz
    DISPATCH(RenderbufferStorageMultisample, (target, samples, internalformat, width, height), (F, "glRenderbufferStorageMultisample(0x%x, %d, 0x%x, %d, %d);\n", target, samples, internalformat, width, height));
 }
 
+KEYWORD1 void KEYWORD2 NAME(FlushMappedBufferRange)(GLenum target, GLintptr offset, GLsizeiptr length)
+{
+   DISPATCH(FlushMappedBufferRange, (target, offset, length), (F, "glFlushMappedBufferRange(0x%x, %d, %d);\n", target, offset, length));
+}
+
+KEYWORD1 GLvoid * KEYWORD2 NAME(MapBufferRange)(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access)
+{
+   RETURN_DISPATCH(MapBufferRange, (target, offset, length, access), (F, "glMapBufferRange(0x%x, %d, %d, %d);\n", target, offset, length, access));
+}
+
 KEYWORD1 void KEYWORD2 NAME(CopyBufferSubData)(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size)
 {
    DISPATCH(CopyBufferSubData, (readTarget, writeTarget, readOffset, writeOffset, size), (F, "glCopyBufferSubData(0x%x, 0x%x, %d, %d, %d);\n", readTarget, writeTarget, readOffset, writeOffset, size));
@@ -4021,58 +4031,58 @@ KEYWORD1 void KEYWORD2 NAME(PolygonOffsetEXT)(GLfloat factor, GLfloat bias)
    DISPATCH(PolygonOffsetEXT, (factor, bias), (F, "glPolygonOffsetEXT(%f, %f);\n", factor, bias));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_564)(GLenum pname, GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_566)(GLenum pname, GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_564)(GLenum pname, GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_566)(GLenum pname, GLfloat * params)
 {
    DISPATCH(GetPixelTexGenParameterfvSGIS, (pname, params), (F, "glGetPixelTexGenParameterfvSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_565)(GLenum pname, GLint * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_567)(GLenum pname, GLint * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_565)(GLenum pname, GLint * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_567)(GLenum pname, GLint * params)
 {
    DISPATCH(GetPixelTexGenParameterivSGIS, (pname, params), (F, "glGetPixelTexGenParameterivSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_566)(GLenum pname, GLfloat param);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_568)(GLenum pname, GLfloat param);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_566)(GLenum pname, GLfloat param)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_568)(GLenum pname, GLfloat param)
 {
    DISPATCH(PixelTexGenParameterfSGIS, (pname, param), (F, "glPixelTexGenParameterfSGIS(0x%x, %f);\n", pname, param));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_567)(GLenum pname, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_569)(GLenum pname, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_567)(GLenum pname, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_569)(GLenum pname, const GLfloat * params)
 {
    DISPATCH(PixelTexGenParameterfvSGIS, (pname, params), (F, "glPixelTexGenParameterfvSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_568)(GLenum pname, GLint param);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_570)(GLenum pname, GLint param);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_568)(GLenum pname, GLint param)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_570)(GLenum pname, GLint param)
 {
    DISPATCH(PixelTexGenParameteriSGIS, (pname, param), (F, "glPixelTexGenParameteriSGIS(0x%x, %d);\n", pname, param));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_569)(GLenum pname, const GLint * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_571)(GLenum pname, const GLint * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_569)(GLenum pname, const GLint * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_571)(GLenum pname, const GLint * params)
 {
    DISPATCH(PixelTexGenParameterivSGIS, (pname, params), (F, "glPixelTexGenParameterivSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_570)(GLclampf value, GLboolean invert);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_572)(GLclampf value, GLboolean invert);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_570)(GLclampf value, GLboolean invert)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_572)(GLclampf value, GLboolean invert)
 {
    DISPATCH(SampleMaskSGIS, (value, invert), (F, "glSampleMaskSGIS(%f, %d);\n", value, invert));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_571)(GLenum pattern);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_573)(GLenum pattern);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_571)(GLenum pattern)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_573)(GLenum pattern)
 {
    DISPATCH(SamplePatternSGIS, (pattern), (F, "glSamplePatternSGIS(0x%x);\n", pattern));
 }
@@ -4122,9 +4132,9 @@ KEYWORD1 void KEYWORD2 NAME(PointParameterfEXT)(GLenum pname, GLfloat param)
    DISPATCH(PointParameterfEXT, (pname, param), (F, "glPointParameterfEXT(0x%x, %f);\n", pname, param));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_578)(GLenum pname, GLfloat param);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_580)(GLenum pname, GLfloat param);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_578)(GLenum pname, GLfloat param)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_580)(GLenum pname, GLfloat param)
 {
    DISPATCH(PointParameterfEXT, (pname, param), (F, "glPointParameterfSGIS(0x%x, %f);\n", pname, param));
 }
@@ -4144,9 +4154,9 @@ KEYWORD1 void KEYWORD2 NAME(PointParameterfvEXT)(GLenum pname, const GLfloat * p
    DISPATCH(PointParameterfvEXT, (pname, params), (F, "glPointParameterfvEXT(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_579)(GLenum pname, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_581)(GLenum pname, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_579)(GLenum pname, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_581)(GLenum pname, const GLfloat * params)
 {
    DISPATCH(PointParameterfvEXT, (pname, params), (F, "glPointParameterfvSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
@@ -4161,16 +4171,16 @@ KEYWORD1 void KEYWORD2 NAME(UnlockArraysEXT)(void)
    DISPATCH(UnlockArraysEXT, (), (F, "glUnlockArraysEXT();\n"));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_582)(GLenum pname, GLdouble * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_584)(GLenum pname, GLdouble * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_582)(GLenum pname, GLdouble * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_584)(GLenum pname, GLdouble * params)
 {
    DISPATCH(CullParameterdvEXT, (pname, params), (F, "glCullParameterdvEXT(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_583)(GLenum pname, GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_585)(GLenum pname, GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_583)(GLenum pname, GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_585)(GLenum pname, GLfloat * params)
 {
    DISPATCH(CullParameterfvEXT, (pname, params), (F, "glCullParameterfvEXT(0x%x, %p);\n", pname, (const void *) params));
 }
@@ -4415,9 +4425,9 @@ KEYWORD1 void KEYWORD2 NAME(FogCoordfvEXT)(const GLfloat * coord)
    DISPATCH(FogCoordfvEXT, (coord), (F, "glFogCoordfvEXT(%p);\n", (const void *) coord));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_608)(GLenum mode);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_610)(GLenum mode);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_608)(GLenum mode)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_610)(GLenum mode)
 {
    DISPATCH(PixelTexGenSGIX, (mode), (F, "glPixelTexGenSGIX(0x%x);\n", mode));
 }
@@ -4432,9 +4442,9 @@ KEYWORD1 void KEYWORD2 NAME(BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfac
    DISPATCH(BlendFuncSeparateEXT, (sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha), (F, "glBlendFuncSeparateEXT(0x%x, 0x%x, 0x%x, 0x%x);\n", sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_609)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_611)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_609)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_611)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
 {
    DISPATCH(BlendFuncSeparateEXT, (sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha), (F, "glBlendFuncSeparateINGR(0x%x, 0x%x, 0x%x, 0x%x);\n", sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha));
 }
@@ -4799,65 +4809,65 @@ KEYWORD1 void KEYWORD2 NAME(WindowPos4svMESA)(const GLshort * v)
    DISPATCH(WindowPos4svMESA, (v), (F, "glWindowPos4svMESA(%p);\n", (const void *) v));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_650)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_652)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_650)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_652)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride)
 {
    DISPATCH(MultiModeDrawArraysIBM, (mode, first, count, primcount, modestride), (F, "glMultiModeDrawArraysIBM(%p, %p, %p, %d, %d);\n", (const void *) mode, (const void *) first, (const void *) count, primcount, modestride));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_651)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_653)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_651)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_653)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride)
 {
    DISPATCH(MultiModeDrawElementsIBM, (mode, count, type, indices, primcount, modestride), (F, "glMultiModeDrawElementsIBM(%p, %p, 0x%x, %p, %d, %d);\n", (const void *) mode, (const void *) count, type, (const void *) indices, primcount, modestride));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_652)(GLsizei n, const GLuint * fences);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_654)(GLsizei n, const GLuint * fences);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_652)(GLsizei n, const GLuint * fences)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_654)(GLsizei n, const GLuint * fences)
 {
    DISPATCH(DeleteFencesNV, (n, fences), (F, "glDeleteFencesNV(%d, %p);\n", n, (const void *) fences));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_653)(GLuint fence);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_655)(GLuint fence);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_653)(GLuint fence)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_655)(GLuint fence)
 {
    DISPATCH(FinishFenceNV, (fence), (F, "glFinishFenceNV(%d);\n", fence));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_654)(GLsizei n, GLuint * fences);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_656)(GLsizei n, GLuint * fences);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_654)(GLsizei n, GLuint * fences)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_656)(GLsizei n, GLuint * fences)
 {
    DISPATCH(GenFencesNV, (n, fences), (F, "glGenFencesNV(%d, %p);\n", n, (const void *) fences));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_655)(GLuint fence, GLenum pname, GLint * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_657)(GLuint fence, GLenum pname, GLint * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_655)(GLuint fence, GLenum pname, GLint * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_657)(GLuint fence, GLenum pname, GLint * params)
 {
    DISPATCH(GetFenceivNV, (fence, pname, params), (F, "glGetFenceivNV(%d, 0x%x, %p);\n", fence, pname, (const void *) params));
 }
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_656)(GLuint fence);
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_658)(GLuint fence);
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_656)(GLuint fence)
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_658)(GLuint fence)
 {
    RETURN_DISPATCH(IsFenceNV, (fence), (F, "glIsFenceNV(%d);\n", fence));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_657)(GLuint fence, GLenum condition);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_659)(GLuint fence, GLenum condition);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_657)(GLuint fence, GLenum condition)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_659)(GLuint fence, GLenum condition)
 {
    DISPATCH(SetFenceNV, (fence, condition), (F, "glSetFenceNV(%d, 0x%x);\n", fence, condition));
 }
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_658)(GLuint fence);
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_660)(GLuint fence);
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_658)(GLuint fence)
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_660)(GLuint fence)
 {
    RETURN_DISPATCH(TestFenceNV, (fence), (F, "glTestFenceNV(%d);\n", fence));
 }
@@ -5302,37 +5312,37 @@ KEYWORD1 void KEYWORD2 NAME(PointParameterivNV)(GLenum pname, const GLint * para
    DISPATCH(PointParameterivNV, (pname, params), (F, "glPointParameterivNV(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_739)(GLenum face);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_741)(GLenum face);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_739)(GLenum face)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_741)(GLenum face)
 {
    DISPATCH(ActiveStencilFaceEXT, (face), (F, "glActiveStencilFaceEXT(0x%x);\n", face));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_740)(GLuint array);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_742)(GLuint array);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_740)(GLuint array)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_742)(GLuint array)
 {
    DISPATCH(BindVertexArrayAPPLE, (array), (F, "glBindVertexArrayAPPLE(%d);\n", array));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_741)(GLsizei n, const GLuint * arrays);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_743)(GLsizei n, const GLuint * arrays);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_741)(GLsizei n, const GLuint * arrays)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_743)(GLsizei n, const GLuint * arrays)
 {
    DISPATCH(DeleteVertexArraysAPPLE, (n, arrays), (F, "glDeleteVertexArraysAPPLE(%d, %p);\n", n, (const void *) arrays));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_742)(GLsizei n, GLuint * arrays);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_744)(GLsizei n, GLuint * arrays);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_742)(GLsizei n, GLuint * arrays)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_744)(GLsizei n, GLuint * arrays)
 {
    DISPATCH(GenVertexArraysAPPLE, (n, arrays), (F, "glGenVertexArraysAPPLE(%d, %p);\n", n, (const void *) arrays));
 }
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_743)(GLuint array);
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_745)(GLuint array);
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_743)(GLuint array)
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_745)(GLuint array)
 {
    RETURN_DISPATCH(IsVertexArrayAPPLE, (array), (F, "glIsVertexArrayAPPLE(%d);\n", array));
 }
@@ -5367,9 +5377,9 @@ KEYWORD1 void KEYWORD2 NAME(ProgramNamedParameter4fvNV)(GLuint id, GLsizei len,
    DISPATCH(ProgramNamedParameter4fvNV, (id, len, name, v), (F, "glProgramNamedParameter4fvNV(%d, %d, %p, %p);\n", id, len, (const void *) name, (const void *) v));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_750)(GLclampd zmin, GLclampd zmax);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_752)(GLclampd zmin, GLclampd zmax);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_750)(GLclampd zmin, GLclampd zmax)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_752)(GLclampd zmin, GLclampd zmax)
 {
    DISPATCH(DepthBoundsEXT, (zmin, zmax), (F, "glDepthBoundsEXT(%f, %f);\n", zmin, zmax));
 }
@@ -5379,9 +5389,9 @@ KEYWORD1 void KEYWORD2 NAME(BlendEquationSeparate)(GLenum modeRGB, GLenum modeA)
    DISPATCH(BlendEquationSeparateEXT, (modeRGB, modeA), (F, "glBlendEquationSeparate(0x%x, 0x%x);\n", modeRGB, modeA));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_751)(GLenum modeRGB, GLenum modeA);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_753)(GLenum modeRGB, GLenum modeA);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_751)(GLenum modeRGB, GLenum modeA)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_753)(GLenum modeRGB, GLenum modeA)
 {
    DISPATCH(BlendEquationSeparateEXT, (modeRGB, modeA), (F, "glBlendEquationSeparateEXT(0x%x, 0x%x);\n", modeRGB, modeA));
 }
@@ -5561,9 +5571,9 @@ KEYWORD1 void KEYWORD2 NAME(BlitFramebuffer)(GLint srcX0, GLint srcY0, GLint src
    DISPATCH(BlitFramebufferEXT, (srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter), (F, "glBlitFramebuffer(%d, %d, %d, %d, %d, %d, %d, %d, %d, 0x%x);\n", srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_769)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_771)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_769)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_771)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
 {
    DISPATCH(BlitFramebufferEXT, (srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter), (F, "glBlitFramebufferEXT(%d, %d, %d, %d, %d, %d, %d, %d, %d, 0x%x);\n", srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter));
 }
@@ -5578,37 +5588,37 @@ KEYWORD1 void KEYWORD2 NAME(FramebufferTextureLayerEXT)(GLenum target, GLenum at
    DISPATCH(FramebufferTextureLayerEXT, (target, attachment, texture, level, layer), (F, "glFramebufferTextureLayerEXT(0x%x, 0x%x, %d, %d, %d);\n", target, attachment, texture, level, layer));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_771)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_773)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_771)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_773)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask)
 {
    DISPATCH(StencilFuncSeparateATI, (frontfunc, backfunc, ref, mask), (F, "glStencilFuncSeparateATI(0x%x, 0x%x, %d, %d);\n", frontfunc, backfunc, ref, mask));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_772)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_774)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_772)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_774)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
 {
    DISPATCH(ProgramEnvParameters4fvEXT, (target, index, count, params), (F, "glProgramEnvParameters4fvEXT(0x%x, %d, %d, %p);\n", target, index, count, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_773)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_775)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_773)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_775)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
 {
    DISPATCH(ProgramLocalParameters4fvEXT, (target, index, count, params), (F, "glProgramLocalParameters4fvEXT(0x%x, %d, %d, %p);\n", target, index, count, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_774)(GLuint id, GLenum pname, GLint64EXT * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_776)(GLuint id, GLenum pname, GLint64EXT * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_774)(GLuint id, GLenum pname, GLint64EXT * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_776)(GLuint id, GLenum pname, GLint64EXT * params)
 {
    DISPATCH(GetQueryObjecti64vEXT, (id, pname, params), (F, "glGetQueryObjecti64vEXT(%d, 0x%x, %p);\n", id, pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_775)(GLuint id, GLenum pname, GLuint64EXT * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_777)(GLuint id, GLenum pname, GLuint64EXT * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_775)(GLuint id, GLenum pname, GLuint64EXT * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_777)(GLuint id, GLenum pname, GLuint64EXT * params)
 {
    DISPATCH(GetQueryObjectui64vEXT, (id, pname, params), (F, "glGetQueryObjectui64vEXT(%d, 0x%x, %p);\n", id, pname, (const void *) params));
 }
@@ -6189,16 +6199,18 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(GetAttribLocationARB),
    TABLE_ENTRY(DrawBuffersARB),
    TABLE_ENTRY(RenderbufferStorageMultisample),
+   TABLE_ENTRY(FlushMappedBufferRange),
+   TABLE_ENTRY(MapBufferRange),
    TABLE_ENTRY(CopyBufferSubData),
    TABLE_ENTRY(PolygonOffsetEXT),
-   TABLE_ENTRY(_dispatch_stub_564),
-   TABLE_ENTRY(_dispatch_stub_565),
    TABLE_ENTRY(_dispatch_stub_566),
    TABLE_ENTRY(_dispatch_stub_567),
    TABLE_ENTRY(_dispatch_stub_568),
    TABLE_ENTRY(_dispatch_stub_569),
    TABLE_ENTRY(_dispatch_stub_570),
    TABLE_ENTRY(_dispatch_stub_571),
+   TABLE_ENTRY(_dispatch_stub_572),
+   TABLE_ENTRY(_dispatch_stub_573),
    TABLE_ENTRY(ColorPointerEXT),
    TABLE_ENTRY(EdgeFlagPointerEXT),
    TABLE_ENTRY(IndexPointerEXT),
@@ -6209,8 +6221,8 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(PointParameterfvEXT),
    TABLE_ENTRY(LockArraysEXT),
    TABLE_ENTRY(UnlockArraysEXT),
-   TABLE_ENTRY(_dispatch_stub_582),
-   TABLE_ENTRY(_dispatch_stub_583),
+   TABLE_ENTRY(_dispatch_stub_584),
+   TABLE_ENTRY(_dispatch_stub_585),
    TABLE_ENTRY(SecondaryColor3bEXT),
    TABLE_ENTRY(SecondaryColor3bvEXT),
    TABLE_ENTRY(SecondaryColor3dEXT),
@@ -6235,7 +6247,7 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(FogCoorddvEXT),
    TABLE_ENTRY(FogCoordfEXT),
    TABLE_ENTRY(FogCoordfvEXT),
-   TABLE_ENTRY(_dispatch_stub_608),
+   TABLE_ENTRY(_dispatch_stub_610),
    TABLE_ENTRY(BlendFuncSeparateEXT),
    TABLE_ENTRY(FlushVertexArrayRangeNV),
    TABLE_ENTRY(VertexArrayRangeNV),
@@ -6277,8 +6289,6 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(WindowPos4ivMESA),
    TABLE_ENTRY(WindowPos4sMESA),
    TABLE_ENTRY(WindowPos4svMESA),
-   TABLE_ENTRY(_dispatch_stub_650),
-   TABLE_ENTRY(_dispatch_stub_651),
    TABLE_ENTRY(_dispatch_stub_652),
    TABLE_ENTRY(_dispatch_stub_653),
    TABLE_ENTRY(_dispatch_stub_654),
@@ -6286,6 +6296,8 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(_dispatch_stub_656),
    TABLE_ENTRY(_dispatch_stub_657),
    TABLE_ENTRY(_dispatch_stub_658),
+   TABLE_ENTRY(_dispatch_stub_659),
+   TABLE_ENTRY(_dispatch_stub_660),
    TABLE_ENTRY(AreProgramsResidentNV),
    TABLE_ENTRY(BindProgramNV),
    TABLE_ENTRY(DeleteProgramsNV),
@@ -6366,19 +6378,19 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(SetFragmentShaderConstantATI),
    TABLE_ENTRY(PointParameteriNV),
    TABLE_ENTRY(PointParameterivNV),
-   TABLE_ENTRY(_dispatch_stub_739),
-   TABLE_ENTRY(_dispatch_stub_740),
    TABLE_ENTRY(_dispatch_stub_741),
    TABLE_ENTRY(_dispatch_stub_742),
    TABLE_ENTRY(_dispatch_stub_743),
+   TABLE_ENTRY(_dispatch_stub_744),
+   TABLE_ENTRY(_dispatch_stub_745),
    TABLE_ENTRY(GetProgramNamedParameterdvNV),
    TABLE_ENTRY(GetProgramNamedParameterfvNV),
    TABLE_ENTRY(ProgramNamedParameter4dNV),
    TABLE_ENTRY(ProgramNamedParameter4dvNV),
    TABLE_ENTRY(ProgramNamedParameter4fNV),
    TABLE_ENTRY(ProgramNamedParameter4fvNV),
-   TABLE_ENTRY(_dispatch_stub_750),
-   TABLE_ENTRY(_dispatch_stub_751),
+   TABLE_ENTRY(_dispatch_stub_752),
+   TABLE_ENTRY(_dispatch_stub_753),
    TABLE_ENTRY(BindFramebufferEXT),
    TABLE_ENTRY(BindRenderbufferEXT),
    TABLE_ENTRY(CheckFramebufferStatusEXT),
@@ -6396,13 +6408,13 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(IsFramebufferEXT),
    TABLE_ENTRY(IsRenderbufferEXT),
    TABLE_ENTRY(RenderbufferStorageEXT),
-   TABLE_ENTRY(_dispatch_stub_769),
-   TABLE_ENTRY(FramebufferTextureLayerEXT),
    TABLE_ENTRY(_dispatch_stub_771),
-   TABLE_ENTRY(_dispatch_stub_772),
+   TABLE_ENTRY(FramebufferTextureLayerEXT),
    TABLE_ENTRY(_dispatch_stub_773),
    TABLE_ENTRY(_dispatch_stub_774),
    TABLE_ENTRY(_dispatch_stub_775),
+   TABLE_ENTRY(_dispatch_stub_776),
+   TABLE_ENTRY(_dispatch_stub_777),
    /* A whole bunch of no-op functions.  These might be called
     * when someone tries to call a dynamically-registered
     * extension function without a current rendering context.
diff --git a/src/mesa/glapi/glprocs.h b/src/mesa/glapi/glprocs.h
index 648609a35d..2a7cca5b2b 100644
--- a/src/mesa/glapi/glprocs.h
+++ b/src/mesa/glapi/glprocs.h
@@ -614,6 +614,8 @@ static const char gl_string_table[] =
     "glGetAttribLocationARB\0"
     "glDrawBuffersARB\0"
     "glRenderbufferStorageMultisample\0"
+    "glFlushMappedBufferRange\0"
+    "glMapBufferRange\0"
     "glCopyBufferSubData\0"
     "glPolygonOffsetEXT\0"
     "glGetPixelTexGenParameterfvSGIS\0"
@@ -1143,19 +1145,17 @@ static const char gl_string_table[] =
 #define gl_dispatch_stub_364 mgl_dispatch_stub_364
 #define gl_dispatch_stub_365 mgl_dispatch_stub_365
 #define gl_dispatch_stub_366 mgl_dispatch_stub_366
-#define gl_dispatch_stub_564 mgl_dispatch_stub_564
-#define gl_dispatch_stub_565 mgl_dispatch_stub_565
 #define gl_dispatch_stub_566 mgl_dispatch_stub_566
 #define gl_dispatch_stub_567 mgl_dispatch_stub_567
 #define gl_dispatch_stub_568 mgl_dispatch_stub_568
 #define gl_dispatch_stub_569 mgl_dispatch_stub_569
 #define gl_dispatch_stub_570 mgl_dispatch_stub_570
 #define gl_dispatch_stub_571 mgl_dispatch_stub_571
-#define gl_dispatch_stub_582 mgl_dispatch_stub_582
-#define gl_dispatch_stub_583 mgl_dispatch_stub_583
-#define gl_dispatch_stub_608 mgl_dispatch_stub_608
-#define gl_dispatch_stub_650 mgl_dispatch_stub_650
-#define gl_dispatch_stub_651 mgl_dispatch_stub_651
+#define gl_dispatch_stub_572 mgl_dispatch_stub_572
+#define gl_dispatch_stub_573 mgl_dispatch_stub_573
+#define gl_dispatch_stub_584 mgl_dispatch_stub_584
+#define gl_dispatch_stub_585 mgl_dispatch_stub_585
+#define gl_dispatch_stub_610 mgl_dispatch_stub_610
 #define gl_dispatch_stub_652 mgl_dispatch_stub_652
 #define gl_dispatch_stub_653 mgl_dispatch_stub_653
 #define gl_dispatch_stub_654 mgl_dispatch_stub_654
@@ -1163,19 +1163,21 @@ static const char gl_string_table[] =
 #define gl_dispatch_stub_656 mgl_dispatch_stub_656
 #define gl_dispatch_stub_657 mgl_dispatch_stub_657
 #define gl_dispatch_stub_658 mgl_dispatch_stub_658
-#define gl_dispatch_stub_739 mgl_dispatch_stub_739
-#define gl_dispatch_stub_740 mgl_dispatch_stub_740
+#define gl_dispatch_stub_659 mgl_dispatch_stub_659
+#define gl_dispatch_stub_660 mgl_dispatch_stub_660
 #define gl_dispatch_stub_741 mgl_dispatch_stub_741
 #define gl_dispatch_stub_742 mgl_dispatch_stub_742
 #define gl_dispatch_stub_743 mgl_dispatch_stub_743
-#define gl_dispatch_stub_750 mgl_dispatch_stub_750
-#define gl_dispatch_stub_751 mgl_dispatch_stub_751
-#define gl_dispatch_stub_769 mgl_dispatch_stub_769
+#define gl_dispatch_stub_744 mgl_dispatch_stub_744
+#define gl_dispatch_stub_745 mgl_dispatch_stub_745
+#define gl_dispatch_stub_752 mgl_dispatch_stub_752
+#define gl_dispatch_stub_753 mgl_dispatch_stub_753
 #define gl_dispatch_stub_771 mgl_dispatch_stub_771
-#define gl_dispatch_stub_772 mgl_dispatch_stub_772
 #define gl_dispatch_stub_773 mgl_dispatch_stub_773
 #define gl_dispatch_stub_774 mgl_dispatch_stub_774
 #define gl_dispatch_stub_775 mgl_dispatch_stub_775
+#define gl_dispatch_stub_776 mgl_dispatch_stub_776
+#define gl_dispatch_stub_777 mgl_dispatch_stub_777
 #endif /* USE_MGL_NAMESPACE */
 
 
@@ -1193,39 +1195,39 @@ void GLAPIENTRY gl_dispatch_stub_363(GLenum target, GLenum pname, GLint * params
 void GLAPIENTRY gl_dispatch_stub_364(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid * values);
 void GLAPIENTRY gl_dispatch_stub_365(GLenum target, GLenum pname, GLfloat * params);
 void GLAPIENTRY gl_dispatch_stub_366(GLenum target, GLenum pname, GLint * params);
-void GLAPIENTRY gl_dispatch_stub_564(GLenum pname, GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_565(GLenum pname, GLint * params);
-void GLAPIENTRY gl_dispatch_stub_566(GLenum pname, GLfloat param);
-void GLAPIENTRY gl_dispatch_stub_567(GLenum pname, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_568(GLenum pname, GLint param);
-void GLAPIENTRY gl_dispatch_stub_569(GLenum pname, const GLint * params);
-void GLAPIENTRY gl_dispatch_stub_570(GLclampf value, GLboolean invert);
-void GLAPIENTRY gl_dispatch_stub_571(GLenum pattern);
-void GLAPIENTRY gl_dispatch_stub_582(GLenum pname, GLdouble * params);
-void GLAPIENTRY gl_dispatch_stub_583(GLenum pname, GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_608(GLenum mode);
-void GLAPIENTRY gl_dispatch_stub_650(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
-void GLAPIENTRY gl_dispatch_stub_651(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
-void GLAPIENTRY gl_dispatch_stub_652(GLsizei n, const GLuint * fences);
-void GLAPIENTRY gl_dispatch_stub_653(GLuint fence);
-void GLAPIENTRY gl_dispatch_stub_654(GLsizei n, GLuint * fences);
-void GLAPIENTRY gl_dispatch_stub_655(GLuint fence, GLenum pname, GLint * params);
-GLboolean GLAPIENTRY gl_dispatch_stub_656(GLuint fence);
-void GLAPIENTRY gl_dispatch_stub_657(GLuint fence, GLenum condition);
+void GLAPIENTRY gl_dispatch_stub_566(GLenum pname, GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_567(GLenum pname, GLint * params);
+void GLAPIENTRY gl_dispatch_stub_568(GLenum pname, GLfloat param);
+void GLAPIENTRY gl_dispatch_stub_569(GLenum pname, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_570(GLenum pname, GLint param);
+void GLAPIENTRY gl_dispatch_stub_571(GLenum pname, const GLint * params);
+void GLAPIENTRY gl_dispatch_stub_572(GLclampf value, GLboolean invert);
+void GLAPIENTRY gl_dispatch_stub_573(GLenum pattern);
+void GLAPIENTRY gl_dispatch_stub_584(GLenum pname, GLdouble * params);
+void GLAPIENTRY gl_dispatch_stub_585(GLenum pname, GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_610(GLenum mode);
+void GLAPIENTRY gl_dispatch_stub_652(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
+void GLAPIENTRY gl_dispatch_stub_653(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
+void GLAPIENTRY gl_dispatch_stub_654(GLsizei n, const GLuint * fences);
+void GLAPIENTRY gl_dispatch_stub_655(GLuint fence);
+void GLAPIENTRY gl_dispatch_stub_656(GLsizei n, GLuint * fences);
+void GLAPIENTRY gl_dispatch_stub_657(GLuint fence, GLenum pname, GLint * params);
 GLboolean GLAPIENTRY gl_dispatch_stub_658(GLuint fence);
-void GLAPIENTRY gl_dispatch_stub_739(GLenum face);
-void GLAPIENTRY gl_dispatch_stub_740(GLuint array);
-void GLAPIENTRY gl_dispatch_stub_741(GLsizei n, const GLuint * arrays);
-void GLAPIENTRY gl_dispatch_stub_742(GLsizei n, GLuint * arrays);
-GLboolean GLAPIENTRY gl_dispatch_stub_743(GLuint array);
-void GLAPIENTRY gl_dispatch_stub_750(GLclampd zmin, GLclampd zmax);
-void GLAPIENTRY gl_dispatch_stub_751(GLenum modeRGB, GLenum modeA);
-void GLAPIENTRY gl_dispatch_stub_769(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-void GLAPIENTRY gl_dispatch_stub_771(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-void GLAPIENTRY gl_dispatch_stub_772(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_773(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_774(GLuint id, GLenum pname, GLint64EXT * params);
-void GLAPIENTRY gl_dispatch_stub_775(GLuint id, GLenum pname, GLuint64EXT * params);
+void GLAPIENTRY gl_dispatch_stub_659(GLuint fence, GLenum condition);
+GLboolean GLAPIENTRY gl_dispatch_stub_660(GLuint fence);
+void GLAPIENTRY gl_dispatch_stub_741(GLenum face);
+void GLAPIENTRY gl_dispatch_stub_742(GLuint array);
+void GLAPIENTRY gl_dispatch_stub_743(GLsizei n, const GLuint * arrays);
+void GLAPIENTRY gl_dispatch_stub_744(GLsizei n, GLuint * arrays);
+GLboolean GLAPIENTRY gl_dispatch_stub_745(GLuint array);
+void GLAPIENTRY gl_dispatch_stub_752(GLclampd zmin, GLclampd zmax);
+void GLAPIENTRY gl_dispatch_stub_753(GLenum modeRGB, GLenum modeA);
+void GLAPIENTRY gl_dispatch_stub_771(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+void GLAPIENTRY gl_dispatch_stub_773(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+void GLAPIENTRY gl_dispatch_stub_774(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_775(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_776(GLuint id, GLenum pname, GLint64EXT * params);
+void GLAPIENTRY gl_dispatch_stub_777(GLuint id, GLenum pname, GLuint64EXT * params);
 #endif /* defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING) */
 
 static const glprocs_table_t static_functions[] = {
@@ -1791,518 +1793,520 @@ static const glprocs_table_t static_functions[] = {
     NAME_FUNC_OFFSET( 8911, glGetAttribLocationARB, glGetAttribLocationARB, NULL, _gloffset_GetAttribLocationARB),
     NAME_FUNC_OFFSET( 8934, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
     NAME_FUNC_OFFSET( 8951, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, _gloffset_RenderbufferStorageMultisample),
-    NAME_FUNC_OFFSET( 8984, glCopyBufferSubData, glCopyBufferSubData, NULL, _gloffset_CopyBufferSubData),
-    NAME_FUNC_OFFSET( 9004, glPolygonOffsetEXT, glPolygonOffsetEXT, NULL, _gloffset_PolygonOffsetEXT),
-    NAME_FUNC_OFFSET( 9023, gl_dispatch_stub_564, gl_dispatch_stub_564, NULL, _gloffset_GetPixelTexGenParameterfvSGIS),
-    NAME_FUNC_OFFSET( 9055, gl_dispatch_stub_565, gl_dispatch_stub_565, NULL, _gloffset_GetPixelTexGenParameterivSGIS),
-    NAME_FUNC_OFFSET( 9087, gl_dispatch_stub_566, gl_dispatch_stub_566, NULL, _gloffset_PixelTexGenParameterfSGIS),
-    NAME_FUNC_OFFSET( 9115, gl_dispatch_stub_567, gl_dispatch_stub_567, NULL, _gloffset_PixelTexGenParameterfvSGIS),
-    NAME_FUNC_OFFSET( 9144, gl_dispatch_stub_568, gl_dispatch_stub_568, NULL, _gloffset_PixelTexGenParameteriSGIS),
-    NAME_FUNC_OFFSET( 9172, gl_dispatch_stub_569, gl_dispatch_stub_569, NULL, _gloffset_PixelTexGenParameterivSGIS),
-    NAME_FUNC_OFFSET( 9201, gl_dispatch_stub_570, gl_dispatch_stub_570, NULL, _gloffset_SampleMaskSGIS),
-    NAME_FUNC_OFFSET( 9218, gl_dispatch_stub_571, gl_dispatch_stub_571, NULL, _gloffset_SamplePatternSGIS),
-    NAME_FUNC_OFFSET( 9238, glColorPointerEXT, glColorPointerEXT, NULL, _gloffset_ColorPointerEXT),
-    NAME_FUNC_OFFSET( 9256, glEdgeFlagPointerEXT, glEdgeFlagPointerEXT, NULL, _gloffset_EdgeFlagPointerEXT),
-    NAME_FUNC_OFFSET( 9277, glIndexPointerEXT, glIndexPointerEXT, NULL, _gloffset_IndexPointerEXT),
-    NAME_FUNC_OFFSET( 9295, glNormalPointerEXT, glNormalPointerEXT, NULL, _gloffset_NormalPointerEXT),
-    NAME_FUNC_OFFSET( 9314, glTexCoordPointerEXT, glTexCoordPointerEXT, NULL, _gloffset_TexCoordPointerEXT),
-    NAME_FUNC_OFFSET( 9335, glVertexPointerEXT, glVertexPointerEXT, NULL, _gloffset_VertexPointerEXT),
-    NAME_FUNC_OFFSET( 9354, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET( 9375, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET( 9397, glLockArraysEXT, glLockArraysEXT, NULL, _gloffset_LockArraysEXT),
-    NAME_FUNC_OFFSET( 9413, glUnlockArraysEXT, glUnlockArraysEXT, NULL, _gloffset_UnlockArraysEXT),
-    NAME_FUNC_OFFSET( 9431, gl_dispatch_stub_582, gl_dispatch_stub_582, NULL, _gloffset_CullParameterdvEXT),
-    NAME_FUNC_OFFSET( 9452, gl_dispatch_stub_583, gl_dispatch_stub_583, NULL, _gloffset_CullParameterfvEXT),
-    NAME_FUNC_OFFSET( 9473, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
-    NAME_FUNC_OFFSET( 9495, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
-    NAME_FUNC_OFFSET( 9518, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
-    NAME_FUNC_OFFSET( 9540, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
-    NAME_FUNC_OFFSET( 9563, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
-    NAME_FUNC_OFFSET( 9585, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
-    NAME_FUNC_OFFSET( 9608, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
-    NAME_FUNC_OFFSET( 9630, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
-    NAME_FUNC_OFFSET( 9653, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
-    NAME_FUNC_OFFSET( 9675, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
-    NAME_FUNC_OFFSET( 9698, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
-    NAME_FUNC_OFFSET( 9721, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
-    NAME_FUNC_OFFSET( 9745, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
-    NAME_FUNC_OFFSET( 9768, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
-    NAME_FUNC_OFFSET( 9792, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
-    NAME_FUNC_OFFSET( 9815, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
-    NAME_FUNC_OFFSET( 9839, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
-    NAME_FUNC_OFFSET( 9866, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
-    NAME_FUNC_OFFSET( 9887, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
-    NAME_FUNC_OFFSET( 9910, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
-    NAME_FUNC_OFFSET( 9931, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
-    NAME_FUNC_OFFSET( 9946, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
-    NAME_FUNC_OFFSET( 9962, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
-    NAME_FUNC_OFFSET( 9977, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
-    NAME_FUNC_OFFSET( 9993, gl_dispatch_stub_608, gl_dispatch_stub_608, NULL, _gloffset_PixelTexGenSGIX),
-    NAME_FUNC_OFFSET(10011, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
-    NAME_FUNC_OFFSET(10034, glFlushVertexArrayRangeNV, glFlushVertexArrayRangeNV, NULL, _gloffset_FlushVertexArrayRangeNV),
-    NAME_FUNC_OFFSET(10060, glVertexArrayRangeNV, glVertexArrayRangeNV, NULL, _gloffset_VertexArrayRangeNV),
-    NAME_FUNC_OFFSET(10081, glCombinerInputNV, glCombinerInputNV, NULL, _gloffset_CombinerInputNV),
-    NAME_FUNC_OFFSET(10099, glCombinerOutputNV, glCombinerOutputNV, NULL, _gloffset_CombinerOutputNV),
-    NAME_FUNC_OFFSET(10118, glCombinerParameterfNV, glCombinerParameterfNV, NULL, _gloffset_CombinerParameterfNV),
-    NAME_FUNC_OFFSET(10141, glCombinerParameterfvNV, glCombinerParameterfvNV, NULL, _gloffset_CombinerParameterfvNV),
-    NAME_FUNC_OFFSET(10165, glCombinerParameteriNV, glCombinerParameteriNV, NULL, _gloffset_CombinerParameteriNV),
-    NAME_FUNC_OFFSET(10188, glCombinerParameterivNV, glCombinerParameterivNV, NULL, _gloffset_CombinerParameterivNV),
-    NAME_FUNC_OFFSET(10212, glFinalCombinerInputNV, glFinalCombinerInputNV, NULL, _gloffset_FinalCombinerInputNV),
-    NAME_FUNC_OFFSET(10235, glGetCombinerInputParameterfvNV, glGetCombinerInputParameterfvNV, NULL, _gloffset_GetCombinerInputParameterfvNV),
-    NAME_FUNC_OFFSET(10267, glGetCombinerInputParameterivNV, glGetCombinerInputParameterivNV, NULL, _gloffset_GetCombinerInputParameterivNV),
-    NAME_FUNC_OFFSET(10299, glGetCombinerOutputParameterfvNV, glGetCombinerOutputParameterfvNV, NULL, _gloffset_GetCombinerOutputParameterfvNV),
-    NAME_FUNC_OFFSET(10332, glGetCombinerOutputParameterivNV, glGetCombinerOutputParameterivNV, NULL, _gloffset_GetCombinerOutputParameterivNV),
-    NAME_FUNC_OFFSET(10365, glGetFinalCombinerInputParameterfvNV, glGetFinalCombinerInputParameterfvNV, NULL, _gloffset_GetFinalCombinerInputParameterfvNV),
-    NAME_FUNC_OFFSET(10402, glGetFinalCombinerInputParameterivNV, glGetFinalCombinerInputParameterivNV, NULL, _gloffset_GetFinalCombinerInputParameterivNV),
-    NAME_FUNC_OFFSET(10439, glResizeBuffersMESA, glResizeBuffersMESA, NULL, _gloffset_ResizeBuffersMESA),
-    NAME_FUNC_OFFSET(10459, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
-    NAME_FUNC_OFFSET(10477, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
-    NAME_FUNC_OFFSET(10496, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
-    NAME_FUNC_OFFSET(10514, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
-    NAME_FUNC_OFFSET(10533, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
-    NAME_FUNC_OFFSET(10551, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
-    NAME_FUNC_OFFSET(10570, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
-    NAME_FUNC_OFFSET(10588, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
-    NAME_FUNC_OFFSET(10607, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
-    NAME_FUNC_OFFSET(10625, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
-    NAME_FUNC_OFFSET(10644, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
-    NAME_FUNC_OFFSET(10662, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
-    NAME_FUNC_OFFSET(10681, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
-    NAME_FUNC_OFFSET(10699, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
-    NAME_FUNC_OFFSET(10718, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
-    NAME_FUNC_OFFSET(10736, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
-    NAME_FUNC_OFFSET(10755, glWindowPos4dMESA, glWindowPos4dMESA, NULL, _gloffset_WindowPos4dMESA),
-    NAME_FUNC_OFFSET(10773, glWindowPos4dvMESA, glWindowPos4dvMESA, NULL, _gloffset_WindowPos4dvMESA),
-    NAME_FUNC_OFFSET(10792, glWindowPos4fMESA, glWindowPos4fMESA, NULL, _gloffset_WindowPos4fMESA),
-    NAME_FUNC_OFFSET(10810, glWindowPos4fvMESA, glWindowPos4fvMESA, NULL, _gloffset_WindowPos4fvMESA),
-    NAME_FUNC_OFFSET(10829, glWindowPos4iMESA, glWindowPos4iMESA, NULL, _gloffset_WindowPos4iMESA),
-    NAME_FUNC_OFFSET(10847, glWindowPos4ivMESA, glWindowPos4ivMESA, NULL, _gloffset_WindowPos4ivMESA),
-    NAME_FUNC_OFFSET(10866, glWindowPos4sMESA, glWindowPos4sMESA, NULL, _gloffset_WindowPos4sMESA),
-    NAME_FUNC_OFFSET(10884, glWindowPos4svMESA, glWindowPos4svMESA, NULL, _gloffset_WindowPos4svMESA),
-    NAME_FUNC_OFFSET(10903, gl_dispatch_stub_650, gl_dispatch_stub_650, NULL, _gloffset_MultiModeDrawArraysIBM),
-    NAME_FUNC_OFFSET(10928, gl_dispatch_stub_651, gl_dispatch_stub_651, NULL, _gloffset_MultiModeDrawElementsIBM),
-    NAME_FUNC_OFFSET(10955, gl_dispatch_stub_652, gl_dispatch_stub_652, NULL, _gloffset_DeleteFencesNV),
-    NAME_FUNC_OFFSET(10972, gl_dispatch_stub_653, gl_dispatch_stub_653, NULL, _gloffset_FinishFenceNV),
-    NAME_FUNC_OFFSET(10988, gl_dispatch_stub_654, gl_dispatch_stub_654, NULL, _gloffset_GenFencesNV),
-    NAME_FUNC_OFFSET(11002, gl_dispatch_stub_655, gl_dispatch_stub_655, NULL, _gloffset_GetFenceivNV),
-    NAME_FUNC_OFFSET(11017, gl_dispatch_stub_656, gl_dispatch_stub_656, NULL, _gloffset_IsFenceNV),
-    NAME_FUNC_OFFSET(11029, gl_dispatch_stub_657, gl_dispatch_stub_657, NULL, _gloffset_SetFenceNV),
-    NAME_FUNC_OFFSET(11042, gl_dispatch_stub_658, gl_dispatch_stub_658, NULL, _gloffset_TestFenceNV),
-    NAME_FUNC_OFFSET(11056, glAreProgramsResidentNV, glAreProgramsResidentNV, NULL, _gloffset_AreProgramsResidentNV),
-    NAME_FUNC_OFFSET(11080, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
-    NAME_FUNC_OFFSET(11096, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
-    NAME_FUNC_OFFSET(11115, glExecuteProgramNV, glExecuteProgramNV, NULL, _gloffset_ExecuteProgramNV),
-    NAME_FUNC_OFFSET(11134, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
-    NAME_FUNC_OFFSET(11150, glGetProgramParameterdvNV, glGetProgramParameterdvNV, NULL, _gloffset_GetProgramParameterdvNV),
-    NAME_FUNC_OFFSET(11176, glGetProgramParameterfvNV, glGetProgramParameterfvNV, NULL, _gloffset_GetProgramParameterfvNV),
-    NAME_FUNC_OFFSET(11202, glGetProgramStringNV, glGetProgramStringNV, NULL, _gloffset_GetProgramStringNV),
-    NAME_FUNC_OFFSET(11223, glGetProgramivNV, glGetProgramivNV, NULL, _gloffset_GetProgramivNV),
-    NAME_FUNC_OFFSET(11240, glGetTrackMatrixivNV, glGetTrackMatrixivNV, NULL, _gloffset_GetTrackMatrixivNV),
-    NAME_FUNC_OFFSET(11261, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
-    NAME_FUNC_OFFSET(11289, glGetVertexAttribdvNV, glGetVertexAttribdvNV, NULL, _gloffset_GetVertexAttribdvNV),
-    NAME_FUNC_OFFSET(11311, glGetVertexAttribfvNV, glGetVertexAttribfvNV, NULL, _gloffset_GetVertexAttribfvNV),
-    NAME_FUNC_OFFSET(11333, glGetVertexAttribivNV, glGetVertexAttribivNV, NULL, _gloffset_GetVertexAttribivNV),
-    NAME_FUNC_OFFSET(11355, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
-    NAME_FUNC_OFFSET(11369, glLoadProgramNV, glLoadProgramNV, NULL, _gloffset_LoadProgramNV),
-    NAME_FUNC_OFFSET(11385, glProgramParameters4dvNV, glProgramParameters4dvNV, NULL, _gloffset_ProgramParameters4dvNV),
-    NAME_FUNC_OFFSET(11410, glProgramParameters4fvNV, glProgramParameters4fvNV, NULL, _gloffset_ProgramParameters4fvNV),
-    NAME_FUNC_OFFSET(11435, glRequestResidentProgramsNV, glRequestResidentProgramsNV, NULL, _gloffset_RequestResidentProgramsNV),
-    NAME_FUNC_OFFSET(11463, glTrackMatrixNV, glTrackMatrixNV, NULL, _gloffset_TrackMatrixNV),
-    NAME_FUNC_OFFSET(11479, glVertexAttrib1dNV, glVertexAttrib1dNV, NULL, _gloffset_VertexAttrib1dNV),
-    NAME_FUNC_OFFSET(11498, glVertexAttrib1dvNV, glVertexAttrib1dvNV, NULL, _gloffset_VertexAttrib1dvNV),
-    NAME_FUNC_OFFSET(11518, glVertexAttrib1fNV, glVertexAttrib1fNV, NULL, _gloffset_VertexAttrib1fNV),
-    NAME_FUNC_OFFSET(11537, glVertexAttrib1fvNV, glVertexAttrib1fvNV, NULL, _gloffset_VertexAttrib1fvNV),
-    NAME_FUNC_OFFSET(11557, glVertexAttrib1sNV, glVertexAttrib1sNV, NULL, _gloffset_VertexAttrib1sNV),
-    NAME_FUNC_OFFSET(11576, glVertexAttrib1svNV, glVertexAttrib1svNV, NULL, _gloffset_VertexAttrib1svNV),
-    NAME_FUNC_OFFSET(11596, glVertexAttrib2dNV, glVertexAttrib2dNV, NULL, _gloffset_VertexAttrib2dNV),
-    NAME_FUNC_OFFSET(11615, glVertexAttrib2dvNV, glVertexAttrib2dvNV, NULL, _gloffset_VertexAttrib2dvNV),
-    NAME_FUNC_OFFSET(11635, glVertexAttrib2fNV, glVertexAttrib2fNV, NULL, _gloffset_VertexAttrib2fNV),
-    NAME_FUNC_OFFSET(11654, glVertexAttrib2fvNV, glVertexAttrib2fvNV, NULL, _gloffset_VertexAttrib2fvNV),
-    NAME_FUNC_OFFSET(11674, glVertexAttrib2sNV, glVertexAttrib2sNV, NULL, _gloffset_VertexAttrib2sNV),
-    NAME_FUNC_OFFSET(11693, glVertexAttrib2svNV, glVertexAttrib2svNV, NULL, _gloffset_VertexAttrib2svNV),
-    NAME_FUNC_OFFSET(11713, glVertexAttrib3dNV, glVertexAttrib3dNV, NULL, _gloffset_VertexAttrib3dNV),
-    NAME_FUNC_OFFSET(11732, glVertexAttrib3dvNV, glVertexAttrib3dvNV, NULL, _gloffset_VertexAttrib3dvNV),
-    NAME_FUNC_OFFSET(11752, glVertexAttrib3fNV, glVertexAttrib3fNV, NULL, _gloffset_VertexAttrib3fNV),
-    NAME_FUNC_OFFSET(11771, glVertexAttrib3fvNV, glVertexAttrib3fvNV, NULL, _gloffset_VertexAttrib3fvNV),
-    NAME_FUNC_OFFSET(11791, glVertexAttrib3sNV, glVertexAttrib3sNV, NULL, _gloffset_VertexAttrib3sNV),
-    NAME_FUNC_OFFSET(11810, glVertexAttrib3svNV, glVertexAttrib3svNV, NULL, _gloffset_VertexAttrib3svNV),
-    NAME_FUNC_OFFSET(11830, glVertexAttrib4dNV, glVertexAttrib4dNV, NULL, _gloffset_VertexAttrib4dNV),
-    NAME_FUNC_OFFSET(11849, glVertexAttrib4dvNV, glVertexAttrib4dvNV, NULL, _gloffset_VertexAttrib4dvNV),
-    NAME_FUNC_OFFSET(11869, glVertexAttrib4fNV, glVertexAttrib4fNV, NULL, _gloffset_VertexAttrib4fNV),
-    NAME_FUNC_OFFSET(11888, glVertexAttrib4fvNV, glVertexAttrib4fvNV, NULL, _gloffset_VertexAttrib4fvNV),
-    NAME_FUNC_OFFSET(11908, glVertexAttrib4sNV, glVertexAttrib4sNV, NULL, _gloffset_VertexAttrib4sNV),
-    NAME_FUNC_OFFSET(11927, glVertexAttrib4svNV, glVertexAttrib4svNV, NULL, _gloffset_VertexAttrib4svNV),
-    NAME_FUNC_OFFSET(11947, glVertexAttrib4ubNV, glVertexAttrib4ubNV, NULL, _gloffset_VertexAttrib4ubNV),
-    NAME_FUNC_OFFSET(11967, glVertexAttrib4ubvNV, glVertexAttrib4ubvNV, NULL, _gloffset_VertexAttrib4ubvNV),
-    NAME_FUNC_OFFSET(11988, glVertexAttribPointerNV, glVertexAttribPointerNV, NULL, _gloffset_VertexAttribPointerNV),
-    NAME_FUNC_OFFSET(12012, glVertexAttribs1dvNV, glVertexAttribs1dvNV, NULL, _gloffset_VertexAttribs1dvNV),
-    NAME_FUNC_OFFSET(12033, glVertexAttribs1fvNV, glVertexAttribs1fvNV, NULL, _gloffset_VertexAttribs1fvNV),
-    NAME_FUNC_OFFSET(12054, glVertexAttribs1svNV, glVertexAttribs1svNV, NULL, _gloffset_VertexAttribs1svNV),
-    NAME_FUNC_OFFSET(12075, glVertexAttribs2dvNV, glVertexAttribs2dvNV, NULL, _gloffset_VertexAttribs2dvNV),
-    NAME_FUNC_OFFSET(12096, glVertexAttribs2fvNV, glVertexAttribs2fvNV, NULL, _gloffset_VertexAttribs2fvNV),
-    NAME_FUNC_OFFSET(12117, glVertexAttribs2svNV, glVertexAttribs2svNV, NULL, _gloffset_VertexAttribs2svNV),
-    NAME_FUNC_OFFSET(12138, glVertexAttribs3dvNV, glVertexAttribs3dvNV, NULL, _gloffset_VertexAttribs3dvNV),
-    NAME_FUNC_OFFSET(12159, glVertexAttribs3fvNV, glVertexAttribs3fvNV, NULL, _gloffset_VertexAttribs3fvNV),
-    NAME_FUNC_OFFSET(12180, glVertexAttribs3svNV, glVertexAttribs3svNV, NULL, _gloffset_VertexAttribs3svNV),
-    NAME_FUNC_OFFSET(12201, glVertexAttribs4dvNV, glVertexAttribs4dvNV, NULL, _gloffset_VertexAttribs4dvNV),
-    NAME_FUNC_OFFSET(12222, glVertexAttribs4fvNV, glVertexAttribs4fvNV, NULL, _gloffset_VertexAttribs4fvNV),
-    NAME_FUNC_OFFSET(12243, glVertexAttribs4svNV, glVertexAttribs4svNV, NULL, _gloffset_VertexAttribs4svNV),
-    NAME_FUNC_OFFSET(12264, glVertexAttribs4ubvNV, glVertexAttribs4ubvNV, NULL, _gloffset_VertexAttribs4ubvNV),
-    NAME_FUNC_OFFSET(12286, glGetTexBumpParameterfvATI, glGetTexBumpParameterfvATI, NULL, _gloffset_GetTexBumpParameterfvATI),
-    NAME_FUNC_OFFSET(12313, glGetTexBumpParameterivATI, glGetTexBumpParameterivATI, NULL, _gloffset_GetTexBumpParameterivATI),
-    NAME_FUNC_OFFSET(12340, glTexBumpParameterfvATI, glTexBumpParameterfvATI, NULL, _gloffset_TexBumpParameterfvATI),
-    NAME_FUNC_OFFSET(12364, glTexBumpParameterivATI, glTexBumpParameterivATI, NULL, _gloffset_TexBumpParameterivATI),
-    NAME_FUNC_OFFSET(12388, glAlphaFragmentOp1ATI, glAlphaFragmentOp1ATI, NULL, _gloffset_AlphaFragmentOp1ATI),
-    NAME_FUNC_OFFSET(12410, glAlphaFragmentOp2ATI, glAlphaFragmentOp2ATI, NULL, _gloffset_AlphaFragmentOp2ATI),
-    NAME_FUNC_OFFSET(12432, glAlphaFragmentOp3ATI, glAlphaFragmentOp3ATI, NULL, _gloffset_AlphaFragmentOp3ATI),
-    NAME_FUNC_OFFSET(12454, glBeginFragmentShaderATI, glBeginFragmentShaderATI, NULL, _gloffset_BeginFragmentShaderATI),
-    NAME_FUNC_OFFSET(12479, glBindFragmentShaderATI, glBindFragmentShaderATI, NULL, _gloffset_BindFragmentShaderATI),
-    NAME_FUNC_OFFSET(12503, glColorFragmentOp1ATI, glColorFragmentOp1ATI, NULL, _gloffset_ColorFragmentOp1ATI),
-    NAME_FUNC_OFFSET(12525, glColorFragmentOp2ATI, glColorFragmentOp2ATI, NULL, _gloffset_ColorFragmentOp2ATI),
-    NAME_FUNC_OFFSET(12547, glColorFragmentOp3ATI, glColorFragmentOp3ATI, NULL, _gloffset_ColorFragmentOp3ATI),
-    NAME_FUNC_OFFSET(12569, glDeleteFragmentShaderATI, glDeleteFragmentShaderATI, NULL, _gloffset_DeleteFragmentShaderATI),
-    NAME_FUNC_OFFSET(12595, glEndFragmentShaderATI, glEndFragmentShaderATI, NULL, _gloffset_EndFragmentShaderATI),
-    NAME_FUNC_OFFSET(12618, glGenFragmentShadersATI, glGenFragmentShadersATI, NULL, _gloffset_GenFragmentShadersATI),
-    NAME_FUNC_OFFSET(12642, glPassTexCoordATI, glPassTexCoordATI, NULL, _gloffset_PassTexCoordATI),
-    NAME_FUNC_OFFSET(12660, glSampleMapATI, glSampleMapATI, NULL, _gloffset_SampleMapATI),
-    NAME_FUNC_OFFSET(12675, glSetFragmentShaderConstantATI, glSetFragmentShaderConstantATI, NULL, _gloffset_SetFragmentShaderConstantATI),
-    NAME_FUNC_OFFSET(12706, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
-    NAME_FUNC_OFFSET(12726, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
-    NAME_FUNC_OFFSET(12747, gl_dispatch_stub_739, gl_dispatch_stub_739, NULL, _gloffset_ActiveStencilFaceEXT),
-    NAME_FUNC_OFFSET(12770, gl_dispatch_stub_740, gl_dispatch_stub_740, NULL, _gloffset_BindVertexArrayAPPLE),
-    NAME_FUNC_OFFSET(12793, gl_dispatch_stub_741, gl_dispatch_stub_741, NULL, _gloffset_DeleteVertexArraysAPPLE),
-    NAME_FUNC_OFFSET(12819, gl_dispatch_stub_742, gl_dispatch_stub_742, NULL, _gloffset_GenVertexArraysAPPLE),
-    NAME_FUNC_OFFSET(12842, gl_dispatch_stub_743, gl_dispatch_stub_743, NULL, _gloffset_IsVertexArrayAPPLE),
-    NAME_FUNC_OFFSET(12863, glGetProgramNamedParameterdvNV, glGetProgramNamedParameterdvNV, NULL, _gloffset_GetProgramNamedParameterdvNV),
-    NAME_FUNC_OFFSET(12894, glGetProgramNamedParameterfvNV, glGetProgramNamedParameterfvNV, NULL, _gloffset_GetProgramNamedParameterfvNV),
-    NAME_FUNC_OFFSET(12925, glProgramNamedParameter4dNV, glProgramNamedParameter4dNV, NULL, _gloffset_ProgramNamedParameter4dNV),
-    NAME_FUNC_OFFSET(12953, glProgramNamedParameter4dvNV, glProgramNamedParameter4dvNV, NULL, _gloffset_ProgramNamedParameter4dvNV),
-    NAME_FUNC_OFFSET(12982, glProgramNamedParameter4fNV, glProgramNamedParameter4fNV, NULL, _gloffset_ProgramNamedParameter4fNV),
-    NAME_FUNC_OFFSET(13010, glProgramNamedParameter4fvNV, glProgramNamedParameter4fvNV, NULL, _gloffset_ProgramNamedParameter4fvNV),
-    NAME_FUNC_OFFSET(13039, gl_dispatch_stub_750, gl_dispatch_stub_750, NULL, _gloffset_DepthBoundsEXT),
-    NAME_FUNC_OFFSET(13056, gl_dispatch_stub_751, gl_dispatch_stub_751, NULL, _gloffset_BlendEquationSeparateEXT),
-    NAME_FUNC_OFFSET(13083, glBindFramebufferEXT, glBindFramebufferEXT, NULL, _gloffset_BindFramebufferEXT),
-    NAME_FUNC_OFFSET(13104, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, _gloffset_BindRenderbufferEXT),
-    NAME_FUNC_OFFSET(13126, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, _gloffset_CheckFramebufferStatusEXT),
-    NAME_FUNC_OFFSET(13154, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, _gloffset_DeleteFramebuffersEXT),
-    NAME_FUNC_OFFSET(13178, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, _gloffset_DeleteRenderbuffersEXT),
-    NAME_FUNC_OFFSET(13203, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, _gloffset_FramebufferRenderbufferEXT),
-    NAME_FUNC_OFFSET(13232, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, _gloffset_FramebufferTexture1DEXT),
-    NAME_FUNC_OFFSET(13258, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, _gloffset_FramebufferTexture2DEXT),
-    NAME_FUNC_OFFSET(13284, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, _gloffset_FramebufferTexture3DEXT),
-    NAME_FUNC_OFFSET(13310, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, _gloffset_GenFramebuffersEXT),
-    NAME_FUNC_OFFSET(13331, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, _gloffset_GenRenderbuffersEXT),
-    NAME_FUNC_OFFSET(13353, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, _gloffset_GenerateMipmapEXT),
-    NAME_FUNC_OFFSET(13373, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, _gloffset_GetFramebufferAttachmentParameterivEXT),
-    NAME_FUNC_OFFSET(13414, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, _gloffset_GetRenderbufferParameterivEXT),
-    NAME_FUNC_OFFSET(13446, glIsFramebufferEXT, glIsFramebufferEXT, NULL, _gloffset_IsFramebufferEXT),
-    NAME_FUNC_OFFSET(13465, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, _gloffset_IsRenderbufferEXT),
-    NAME_FUNC_OFFSET(13485, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, _gloffset_RenderbufferStorageEXT),
-    NAME_FUNC_OFFSET(13510, gl_dispatch_stub_769, gl_dispatch_stub_769, NULL, _gloffset_BlitFramebufferEXT),
-    NAME_FUNC_OFFSET(13531, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
-    NAME_FUNC_OFFSET(13560, gl_dispatch_stub_771, gl_dispatch_stub_771, NULL, _gloffset_StencilFuncSeparateATI),
-    NAME_FUNC_OFFSET(13585, gl_dispatch_stub_772, gl_dispatch_stub_772, NULL, _gloffset_ProgramEnvParameters4fvEXT),
-    NAME_FUNC_OFFSET(13614, gl_dispatch_stub_773, gl_dispatch_stub_773, NULL, _gloffset_ProgramLocalParameters4fvEXT),
-    NAME_FUNC_OFFSET(13645, gl_dispatch_stub_774, gl_dispatch_stub_774, NULL, _gloffset_GetQueryObjecti64vEXT),
-    NAME_FUNC_OFFSET(13669, gl_dispatch_stub_775, gl_dispatch_stub_775, NULL, _gloffset_GetQueryObjectui64vEXT),
-    NAME_FUNC_OFFSET(13694, glArrayElement, glArrayElement, NULL, _gloffset_ArrayElement),
-    NAME_FUNC_OFFSET(13712, glBindTexture, glBindTexture, NULL, _gloffset_BindTexture),
-    NAME_FUNC_OFFSET(13729, glDrawArrays, glDrawArrays, NULL, _gloffset_DrawArrays),
-    NAME_FUNC_OFFSET(13745, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, _gloffset_AreTexturesResident),
-    NAME_FUNC_OFFSET(13770, glCopyTexImage1D, glCopyTexImage1D, NULL, _gloffset_CopyTexImage1D),
-    NAME_FUNC_OFFSET(13790, glCopyTexImage2D, glCopyTexImage2D, NULL, _gloffset_CopyTexImage2D),
-    NAME_FUNC_OFFSET(13810, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, _gloffset_CopyTexSubImage1D),
-    NAME_FUNC_OFFSET(13833, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, _gloffset_CopyTexSubImage2D),
-    NAME_FUNC_OFFSET(13856, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, _gloffset_DeleteTextures),
-    NAME_FUNC_OFFSET(13876, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, _gloffset_GenTextures),
-    NAME_FUNC_OFFSET(13893, glGetPointerv, glGetPointerv, NULL, _gloffset_GetPointerv),
-    NAME_FUNC_OFFSET(13910, glIsTexture, glIsTextureEXT, glIsTextureEXT, _gloffset_IsTexture),
-    NAME_FUNC_OFFSET(13925, glPrioritizeTextures, glPrioritizeTextures, NULL, _gloffset_PrioritizeTextures),
-    NAME_FUNC_OFFSET(13949, glTexSubImage1D, glTexSubImage1D, NULL, _gloffset_TexSubImage1D),
-    NAME_FUNC_OFFSET(13968, glTexSubImage2D, glTexSubImage2D, NULL, _gloffset_TexSubImage2D),
-    NAME_FUNC_OFFSET(13987, glBlendColor, glBlendColor, NULL, _gloffset_BlendColor),
-    NAME_FUNC_OFFSET(14003, glBlendEquation, glBlendEquation, NULL, _gloffset_BlendEquation),
-    NAME_FUNC_OFFSET(14022, glDrawRangeElements, glDrawRangeElements, NULL, _gloffset_DrawRangeElements),
-    NAME_FUNC_OFFSET(14045, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
-    NAME_FUNC_OFFSET(14061, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
-    NAME_FUNC_OFFSET(14077, glColorTableParameterfv, glColorTableParameterfv, NULL, _gloffset_ColorTableParameterfv),
-    NAME_FUNC_OFFSET(14104, glColorTableParameteriv, glColorTableParameteriv, NULL, _gloffset_ColorTableParameteriv),
-    NAME_FUNC_OFFSET(14131, glCopyColorTable, glCopyColorTable, NULL, _gloffset_CopyColorTable),
-    NAME_FUNC_OFFSET(14151, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
-    NAME_FUNC_OFFSET(14170, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
-    NAME_FUNC_OFFSET(14189, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
-    NAME_FUNC_OFFSET(14219, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
-    NAME_FUNC_OFFSET(14249, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
-    NAME_FUNC_OFFSET(14279, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
-    NAME_FUNC_OFFSET(14309, glColorSubTable, glColorSubTable, NULL, _gloffset_ColorSubTable),
-    NAME_FUNC_OFFSET(14328, glCopyColorSubTable, glCopyColorSubTable, NULL, _gloffset_CopyColorSubTable),
-    NAME_FUNC_OFFSET(14351, glConvolutionFilter1D, glConvolutionFilter1D, NULL, _gloffset_ConvolutionFilter1D),
-    NAME_FUNC_OFFSET(14376, glConvolutionFilter2D, glConvolutionFilter2D, NULL, _gloffset_ConvolutionFilter2D),
-    NAME_FUNC_OFFSET(14401, glConvolutionParameterf, glConvolutionParameterf, NULL, _gloffset_ConvolutionParameterf),
-    NAME_FUNC_OFFSET(14428, glConvolutionParameterfv, glConvolutionParameterfv, NULL, _gloffset_ConvolutionParameterfv),
-    NAME_FUNC_OFFSET(14456, glConvolutionParameteri, glConvolutionParameteri, NULL, _gloffset_ConvolutionParameteri),
-    NAME_FUNC_OFFSET(14483, glConvolutionParameteriv, glConvolutionParameteriv, NULL, _gloffset_ConvolutionParameteriv),
-    NAME_FUNC_OFFSET(14511, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, _gloffset_CopyConvolutionFilter1D),
-    NAME_FUNC_OFFSET(14540, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, _gloffset_CopyConvolutionFilter2D),
-    NAME_FUNC_OFFSET(14569, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, _gloffset_GetConvolutionFilter),
-    NAME_FUNC_OFFSET(14595, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, _gloffset_GetConvolutionParameterfv),
-    NAME_FUNC_OFFSET(14626, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, _gloffset_GetConvolutionParameteriv),
-    NAME_FUNC_OFFSET(14657, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, _gloffset_GetSeparableFilter),
-    NAME_FUNC_OFFSET(14681, glSeparableFilter2D, glSeparableFilter2D, NULL, _gloffset_SeparableFilter2D),
-    NAME_FUNC_OFFSET(14704, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, _gloffset_GetHistogram),
-    NAME_FUNC_OFFSET(14722, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, _gloffset_GetHistogramParameterfv),
-    NAME_FUNC_OFFSET(14751, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, _gloffset_GetHistogramParameteriv),
-    NAME_FUNC_OFFSET(14780, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, _gloffset_GetMinmax),
-    NAME_FUNC_OFFSET(14795, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, _gloffset_GetMinmaxParameterfv),
-    NAME_FUNC_OFFSET(14821, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, _gloffset_GetMinmaxParameteriv),
-    NAME_FUNC_OFFSET(14847, glHistogram, glHistogram, NULL, _gloffset_Histogram),
-    NAME_FUNC_OFFSET(14862, glMinmax, glMinmax, NULL, _gloffset_Minmax),
-    NAME_FUNC_OFFSET(14874, glResetHistogram, glResetHistogram, NULL, _gloffset_ResetHistogram),
-    NAME_FUNC_OFFSET(14894, glResetMinmax, glResetMinmax, NULL, _gloffset_ResetMinmax),
-    NAME_FUNC_OFFSET(14911, glTexImage3D, glTexImage3D, NULL, _gloffset_TexImage3D),
-    NAME_FUNC_OFFSET(14927, glTexSubImage3D, glTexSubImage3D, NULL, _gloffset_TexSubImage3D),
-    NAME_FUNC_OFFSET(14946, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, _gloffset_CopyTexSubImage3D),
-    NAME_FUNC_OFFSET(14969, glActiveTextureARB, glActiveTextureARB, NULL, _gloffset_ActiveTextureARB),
-    NAME_FUNC_OFFSET(14985, glClientActiveTextureARB, glClientActiveTextureARB, NULL, _gloffset_ClientActiveTextureARB),
-    NAME_FUNC_OFFSET(15007, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL, _gloffset_MultiTexCoord1dARB),
-    NAME_FUNC_OFFSET(15025, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL, _gloffset_MultiTexCoord1dvARB),
-    NAME_FUNC_OFFSET(15044, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, _gloffset_MultiTexCoord1fARB),
-    NAME_FUNC_OFFSET(15062, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, _gloffset_MultiTexCoord1fvARB),
-    NAME_FUNC_OFFSET(15081, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL, _gloffset_MultiTexCoord1iARB),
-    NAME_FUNC_OFFSET(15099, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL, _gloffset_MultiTexCoord1ivARB),
-    NAME_FUNC_OFFSET(15118, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL, _gloffset_MultiTexCoord1sARB),
-    NAME_FUNC_OFFSET(15136, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL, _gloffset_MultiTexCoord1svARB),
-    NAME_FUNC_OFFSET(15155, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL, _gloffset_MultiTexCoord2dARB),
-    NAME_FUNC_OFFSET(15173, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL, _gloffset_MultiTexCoord2dvARB),
-    NAME_FUNC_OFFSET(15192, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, _gloffset_MultiTexCoord2fARB),
-    NAME_FUNC_OFFSET(15210, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, _gloffset_MultiTexCoord2fvARB),
-    NAME_FUNC_OFFSET(15229, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL, _gloffset_MultiTexCoord2iARB),
-    NAME_FUNC_OFFSET(15247, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL, _gloffset_MultiTexCoord2ivARB),
-    NAME_FUNC_OFFSET(15266, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL, _gloffset_MultiTexCoord2sARB),
-    NAME_FUNC_OFFSET(15284, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL, _gloffset_MultiTexCoord2svARB),
-    NAME_FUNC_OFFSET(15303, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL, _gloffset_MultiTexCoord3dARB),
-    NAME_FUNC_OFFSET(15321, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL, _gloffset_MultiTexCoord3dvARB),
-    NAME_FUNC_OFFSET(15340, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, _gloffset_MultiTexCoord3fARB),
-    NAME_FUNC_OFFSET(15358, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, _gloffset_MultiTexCoord3fvARB),
-    NAME_FUNC_OFFSET(15377, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL, _gloffset_MultiTexCoord3iARB),
-    NAME_FUNC_OFFSET(15395, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL, _gloffset_MultiTexCoord3ivARB),
-    NAME_FUNC_OFFSET(15414, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL, _gloffset_MultiTexCoord3sARB),
-    NAME_FUNC_OFFSET(15432, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL, _gloffset_MultiTexCoord3svARB),
-    NAME_FUNC_OFFSET(15451, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL, _gloffset_MultiTexCoord4dARB),
-    NAME_FUNC_OFFSET(15469, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL, _gloffset_MultiTexCoord4dvARB),
-    NAME_FUNC_OFFSET(15488, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, _gloffset_MultiTexCoord4fARB),
-    NAME_FUNC_OFFSET(15506, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, _gloffset_MultiTexCoord4fvARB),
-    NAME_FUNC_OFFSET(15525, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL, _gloffset_MultiTexCoord4iARB),
-    NAME_FUNC_OFFSET(15543, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL, _gloffset_MultiTexCoord4ivARB),
-    NAME_FUNC_OFFSET(15562, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL, _gloffset_MultiTexCoord4sARB),
-    NAME_FUNC_OFFSET(15580, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL, _gloffset_MultiTexCoord4svARB),
-    NAME_FUNC_OFFSET(15599, glStencilOpSeparate, glStencilOpSeparate, NULL, _gloffset_StencilOpSeparate),
-    NAME_FUNC_OFFSET(15622, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, _gloffset_LoadTransposeMatrixdARB),
-    NAME_FUNC_OFFSET(15645, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, _gloffset_LoadTransposeMatrixfARB),
-    NAME_FUNC_OFFSET(15668, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, _gloffset_MultTransposeMatrixdARB),
-    NAME_FUNC_OFFSET(15691, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB, NULL, _gloffset_MultTransposeMatrixfARB),
-    NAME_FUNC_OFFSET(15714, glSampleCoverageARB, glSampleCoverageARB, NULL, _gloffset_SampleCoverageARB),
-    NAME_FUNC_OFFSET(15731, glCompressedTexImage1DARB, glCompressedTexImage1DARB, NULL, _gloffset_CompressedTexImage1DARB),
-    NAME_FUNC_OFFSET(15754, glCompressedTexImage2DARB, glCompressedTexImage2DARB, NULL, _gloffset_CompressedTexImage2DARB),
-    NAME_FUNC_OFFSET(15777, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, _gloffset_CompressedTexImage3DARB),
-    NAME_FUNC_OFFSET(15800, glCompressedTexSubImage1DARB, glCompressedTexSubImage1DARB, NULL, _gloffset_CompressedTexSubImage1DARB),
-    NAME_FUNC_OFFSET(15826, glCompressedTexSubImage2DARB, glCompressedTexSubImage2DARB, NULL, _gloffset_CompressedTexSubImage2DARB),
-    NAME_FUNC_OFFSET(15852, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, _gloffset_CompressedTexSubImage3DARB),
-    NAME_FUNC_OFFSET(15878, glGetCompressedTexImageARB, glGetCompressedTexImageARB, NULL, _gloffset_GetCompressedTexImageARB),
-    NAME_FUNC_OFFSET(15902, glDisableVertexAttribArrayARB, glDisableVertexAttribArrayARB, NULL, _gloffset_DisableVertexAttribArrayARB),
-    NAME_FUNC_OFFSET(15929, glEnableVertexAttribArrayARB, glEnableVertexAttribArrayARB, NULL, _gloffset_EnableVertexAttribArrayARB),
-    NAME_FUNC_OFFSET(15955, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL, _gloffset_GetVertexAttribdvARB),
-    NAME_FUNC_OFFSET(15975, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL, _gloffset_GetVertexAttribfvARB),
-    NAME_FUNC_OFFSET(15995, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL, _gloffset_GetVertexAttribivARB),
-    NAME_FUNC_OFFSET(16015, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, _gloffset_ProgramEnvParameter4dARB),
-    NAME_FUNC_OFFSET(16038, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, _gloffset_ProgramEnvParameter4dvARB),
-    NAME_FUNC_OFFSET(16062, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, _gloffset_ProgramEnvParameter4fARB),
-    NAME_FUNC_OFFSET(16085, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, _gloffset_ProgramEnvParameter4fvARB),
-    NAME_FUNC_OFFSET(16109, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, _gloffset_VertexAttrib1dARB),
-    NAME_FUNC_OFFSET(16126, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL, _gloffset_VertexAttrib1dvARB),
-    NAME_FUNC_OFFSET(16144, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, _gloffset_VertexAttrib1fARB),
-    NAME_FUNC_OFFSET(16161, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, _gloffset_VertexAttrib1fvARB),
-    NAME_FUNC_OFFSET(16179, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, _gloffset_VertexAttrib1sARB),
-    NAME_FUNC_OFFSET(16196, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL, _gloffset_VertexAttrib1svARB),
-    NAME_FUNC_OFFSET(16214, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, _gloffset_VertexAttrib2dARB),
-    NAME_FUNC_OFFSET(16231, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL, _gloffset_VertexAttrib2dvARB),
-    NAME_FUNC_OFFSET(16249, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, _gloffset_VertexAttrib2fARB),
-    NAME_FUNC_OFFSET(16266, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, _gloffset_VertexAttrib2fvARB),
-    NAME_FUNC_OFFSET(16284, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, _gloffset_VertexAttrib2sARB),
-    NAME_FUNC_OFFSET(16301, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL, _gloffset_VertexAttrib2svARB),
-    NAME_FUNC_OFFSET(16319, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, _gloffset_VertexAttrib3dARB),
-    NAME_FUNC_OFFSET(16336, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL, _gloffset_VertexAttrib3dvARB),
-    NAME_FUNC_OFFSET(16354, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, _gloffset_VertexAttrib3fARB),
-    NAME_FUNC_OFFSET(16371, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, _gloffset_VertexAttrib3fvARB),
-    NAME_FUNC_OFFSET(16389, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, _gloffset_VertexAttrib3sARB),
-    NAME_FUNC_OFFSET(16406, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL, _gloffset_VertexAttrib3svARB),
-    NAME_FUNC_OFFSET(16424, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL, _gloffset_VertexAttrib4NbvARB),
-    NAME_FUNC_OFFSET(16443, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL, _gloffset_VertexAttrib4NivARB),
-    NAME_FUNC_OFFSET(16462, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL, _gloffset_VertexAttrib4NsvARB),
-    NAME_FUNC_OFFSET(16481, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL, _gloffset_VertexAttrib4NubARB),
-    NAME_FUNC_OFFSET(16500, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, _gloffset_VertexAttrib4NubvARB),
-    NAME_FUNC_OFFSET(16520, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, _gloffset_VertexAttrib4NuivARB),
-    NAME_FUNC_OFFSET(16540, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, _gloffset_VertexAttrib4NusvARB),
-    NAME_FUNC_OFFSET(16560, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, _gloffset_VertexAttrib4bvARB),
-    NAME_FUNC_OFFSET(16578, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, _gloffset_VertexAttrib4dARB),
-    NAME_FUNC_OFFSET(16595, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, _gloffset_VertexAttrib4dvARB),
-    NAME_FUNC_OFFSET(16613, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, _gloffset_VertexAttrib4fARB),
-    NAME_FUNC_OFFSET(16630, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, _gloffset_VertexAttrib4fvARB),
-    NAME_FUNC_OFFSET(16648, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, _gloffset_VertexAttrib4ivARB),
-    NAME_FUNC_OFFSET(16666, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, _gloffset_VertexAttrib4sARB),
-    NAME_FUNC_OFFSET(16683, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, _gloffset_VertexAttrib4svARB),
-    NAME_FUNC_OFFSET(16701, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, _gloffset_VertexAttrib4ubvARB),
-    NAME_FUNC_OFFSET(16720, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, _gloffset_VertexAttrib4uivARB),
-    NAME_FUNC_OFFSET(16739, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, _gloffset_VertexAttrib4usvARB),
-    NAME_FUNC_OFFSET(16758, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, _gloffset_VertexAttribPointerARB),
-    NAME_FUNC_OFFSET(16780, glBindBufferARB, glBindBufferARB, NULL, _gloffset_BindBufferARB),
-    NAME_FUNC_OFFSET(16793, glBufferDataARB, glBufferDataARB, NULL, _gloffset_BufferDataARB),
-    NAME_FUNC_OFFSET(16806, glBufferSubDataARB, glBufferSubDataARB, NULL, _gloffset_BufferSubDataARB),
-    NAME_FUNC_OFFSET(16822, glDeleteBuffersARB, glDeleteBuffersARB, NULL, _gloffset_DeleteBuffersARB),
-    NAME_FUNC_OFFSET(16838, glGenBuffersARB, glGenBuffersARB, NULL, _gloffset_GenBuffersARB),
-    NAME_FUNC_OFFSET(16851, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, _gloffset_GetBufferParameterivARB),
-    NAME_FUNC_OFFSET(16874, glGetBufferPointervARB, glGetBufferPointervARB, NULL, _gloffset_GetBufferPointervARB),
-    NAME_FUNC_OFFSET(16894, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, _gloffset_GetBufferSubDataARB),
-    NAME_FUNC_OFFSET(16913, glIsBufferARB, glIsBufferARB, NULL, _gloffset_IsBufferARB),
-    NAME_FUNC_OFFSET(16924, glMapBufferARB, glMapBufferARB, NULL, _gloffset_MapBufferARB),
-    NAME_FUNC_OFFSET(16936, glUnmapBufferARB, glUnmapBufferARB, NULL, _gloffset_UnmapBufferARB),
-    NAME_FUNC_OFFSET(16950, glBeginQueryARB, glBeginQueryARB, NULL, _gloffset_BeginQueryARB),
-    NAME_FUNC_OFFSET(16963, glDeleteQueriesARB, glDeleteQueriesARB, NULL, _gloffset_DeleteQueriesARB),
-    NAME_FUNC_OFFSET(16979, glEndQueryARB, glEndQueryARB, NULL, _gloffset_EndQueryARB),
-    NAME_FUNC_OFFSET(16990, glGenQueriesARB, glGenQueriesARB, NULL, _gloffset_GenQueriesARB),
-    NAME_FUNC_OFFSET(17003, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, _gloffset_GetQueryObjectivARB),
-    NAME_FUNC_OFFSET(17022, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, _gloffset_GetQueryObjectuivARB),
-    NAME_FUNC_OFFSET(17042, glGetQueryivARB, glGetQueryivARB, NULL, _gloffset_GetQueryivARB),
-    NAME_FUNC_OFFSET(17055, glIsQueryARB, glIsQueryARB, NULL, _gloffset_IsQueryARB),
-    NAME_FUNC_OFFSET(17065, glCompileShaderARB, glCompileShaderARB, NULL, _gloffset_CompileShaderARB),
-    NAME_FUNC_OFFSET(17081, glGetActiveUniformARB, glGetActiveUniformARB, NULL, _gloffset_GetActiveUniformARB),
-    NAME_FUNC_OFFSET(17100, glGetShaderSourceARB, glGetShaderSourceARB, NULL, _gloffset_GetShaderSourceARB),
-    NAME_FUNC_OFFSET(17118, glGetUniformLocationARB, glGetUniformLocationARB, NULL, _gloffset_GetUniformLocationARB),
-    NAME_FUNC_OFFSET(17139, glGetUniformfvARB, glGetUniformfvARB, NULL, _gloffset_GetUniformfvARB),
-    NAME_FUNC_OFFSET(17154, glGetUniformivARB, glGetUniformivARB, NULL, _gloffset_GetUniformivARB),
-    NAME_FUNC_OFFSET(17169, glLinkProgramARB, glLinkProgramARB, NULL, _gloffset_LinkProgramARB),
-    NAME_FUNC_OFFSET(17183, glShaderSourceARB, glShaderSourceARB, NULL, _gloffset_ShaderSourceARB),
-    NAME_FUNC_OFFSET(17198, glUniform1fARB, glUniform1fARB, NULL, _gloffset_Uniform1fARB),
-    NAME_FUNC_OFFSET(17210, glUniform1fvARB, glUniform1fvARB, NULL, _gloffset_Uniform1fvARB),
-    NAME_FUNC_OFFSET(17223, glUniform1iARB, glUniform1iARB, NULL, _gloffset_Uniform1iARB),
-    NAME_FUNC_OFFSET(17235, glUniform1ivARB, glUniform1ivARB, NULL, _gloffset_Uniform1ivARB),
-    NAME_FUNC_OFFSET(17248, glUniform2fARB, glUniform2fARB, NULL, _gloffset_Uniform2fARB),
-    NAME_FUNC_OFFSET(17260, glUniform2fvARB, glUniform2fvARB, NULL, _gloffset_Uniform2fvARB),
-    NAME_FUNC_OFFSET(17273, glUniform2iARB, glUniform2iARB, NULL, _gloffset_Uniform2iARB),
-    NAME_FUNC_OFFSET(17285, glUniform2ivARB, glUniform2ivARB, NULL, _gloffset_Uniform2ivARB),
-    NAME_FUNC_OFFSET(17298, glUniform3fARB, glUniform3fARB, NULL, _gloffset_Uniform3fARB),
-    NAME_FUNC_OFFSET(17310, glUniform3fvARB, glUniform3fvARB, NULL, _gloffset_Uniform3fvARB),
-    NAME_FUNC_OFFSET(17323, glUniform3iARB, glUniform3iARB, NULL, _gloffset_Uniform3iARB),
-    NAME_FUNC_OFFSET(17335, glUniform3ivARB, glUniform3ivARB, NULL, _gloffset_Uniform3ivARB),
-    NAME_FUNC_OFFSET(17348, glUniform4fARB, glUniform4fARB, NULL, _gloffset_Uniform4fARB),
-    NAME_FUNC_OFFSET(17360, glUniform4fvARB, glUniform4fvARB, NULL, _gloffset_Uniform4fvARB),
-    NAME_FUNC_OFFSET(17373, glUniform4iARB, glUniform4iARB, NULL, _gloffset_Uniform4iARB),
-    NAME_FUNC_OFFSET(17385, glUniform4ivARB, glUniform4ivARB, NULL, _gloffset_Uniform4ivARB),
-    NAME_FUNC_OFFSET(17398, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, _gloffset_UniformMatrix2fvARB),
-    NAME_FUNC_OFFSET(17417, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, _gloffset_UniformMatrix3fvARB),
-    NAME_FUNC_OFFSET(17436, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, _gloffset_UniformMatrix4fvARB),
-    NAME_FUNC_OFFSET(17455, glUseProgramObjectARB, glUseProgramObjectARB, NULL, _gloffset_UseProgramObjectARB),
-    NAME_FUNC_OFFSET(17468, glValidateProgramARB, glValidateProgramARB, NULL, _gloffset_ValidateProgramARB),
-    NAME_FUNC_OFFSET(17486, glBindAttribLocationARB, glBindAttribLocationARB, NULL, _gloffset_BindAttribLocationARB),
-    NAME_FUNC_OFFSET(17507, glGetActiveAttribARB, glGetActiveAttribARB, NULL, _gloffset_GetActiveAttribARB),
-    NAME_FUNC_OFFSET(17525, glGetAttribLocationARB, glGetAttribLocationARB, NULL, _gloffset_GetAttribLocationARB),
-    NAME_FUNC_OFFSET(17545, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
-    NAME_FUNC_OFFSET(17559, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
-    NAME_FUNC_OFFSET(17576, gl_dispatch_stub_570, gl_dispatch_stub_570, NULL, _gloffset_SampleMaskSGIS),
-    NAME_FUNC_OFFSET(17592, gl_dispatch_stub_571, gl_dispatch_stub_571, NULL, _gloffset_SamplePatternSGIS),
-    NAME_FUNC_OFFSET(17611, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(17629, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(17650, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(17672, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(17691, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(17713, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(17736, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
-    NAME_FUNC_OFFSET(17755, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
-    NAME_FUNC_OFFSET(17775, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
-    NAME_FUNC_OFFSET(17794, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
-    NAME_FUNC_OFFSET(17814, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
-    NAME_FUNC_OFFSET(17833, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
-    NAME_FUNC_OFFSET(17853, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
-    NAME_FUNC_OFFSET(17872, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
-    NAME_FUNC_OFFSET(17892, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
-    NAME_FUNC_OFFSET(17911, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
-    NAME_FUNC_OFFSET(17931, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
-    NAME_FUNC_OFFSET(17951, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
-    NAME_FUNC_OFFSET(17972, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
-    NAME_FUNC_OFFSET(17992, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
-    NAME_FUNC_OFFSET(18013, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
-    NAME_FUNC_OFFSET(18033, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
-    NAME_FUNC_OFFSET(18054, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
-    NAME_FUNC_OFFSET(18078, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
-    NAME_FUNC_OFFSET(18096, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
-    NAME_FUNC_OFFSET(18116, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
-    NAME_FUNC_OFFSET(18134, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
-    NAME_FUNC_OFFSET(18146, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
-    NAME_FUNC_OFFSET(18159, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
-    NAME_FUNC_OFFSET(18171, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
-    NAME_FUNC_OFFSET(18184, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
-    NAME_FUNC_OFFSET(18204, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
-    NAME_FUNC_OFFSET(18228, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
-    NAME_FUNC_OFFSET(18242, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
-    NAME_FUNC_OFFSET(18259, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
-    NAME_FUNC_OFFSET(18274, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
-    NAME_FUNC_OFFSET(18292, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
-    NAME_FUNC_OFFSET(18306, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
-    NAME_FUNC_OFFSET(18323, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
-    NAME_FUNC_OFFSET(18338, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
-    NAME_FUNC_OFFSET(18356, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
-    NAME_FUNC_OFFSET(18370, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
-    NAME_FUNC_OFFSET(18387, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
-    NAME_FUNC_OFFSET(18402, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
-    NAME_FUNC_OFFSET(18420, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
-    NAME_FUNC_OFFSET(18434, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
-    NAME_FUNC_OFFSET(18451, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
-    NAME_FUNC_OFFSET(18466, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
-    NAME_FUNC_OFFSET(18484, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
-    NAME_FUNC_OFFSET(18498, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
-    NAME_FUNC_OFFSET(18515, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
-    NAME_FUNC_OFFSET(18530, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
-    NAME_FUNC_OFFSET(18548, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
-    NAME_FUNC_OFFSET(18562, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
-    NAME_FUNC_OFFSET(18579, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
-    NAME_FUNC_OFFSET(18594, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
-    NAME_FUNC_OFFSET(18612, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
-    NAME_FUNC_OFFSET(18626, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
-    NAME_FUNC_OFFSET(18643, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
-    NAME_FUNC_OFFSET(18658, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
-    NAME_FUNC_OFFSET(18676, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
-    NAME_FUNC_OFFSET(18690, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
-    NAME_FUNC_OFFSET(18707, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
-    NAME_FUNC_OFFSET(18722, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
-    NAME_FUNC_OFFSET(18740, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
-    NAME_FUNC_OFFSET(18757, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
-    NAME_FUNC_OFFSET(18777, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
-    NAME_FUNC_OFFSET(18794, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
-    NAME_FUNC_OFFSET(18820, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
-    NAME_FUNC_OFFSET(18849, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
-    NAME_FUNC_OFFSET(18864, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
-    NAME_FUNC_OFFSET(18882, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
-    NAME_FUNC_OFFSET(18901, gl_dispatch_stub_751, gl_dispatch_stub_751, NULL, _gloffset_BlendEquationSeparateEXT),
-    NAME_FUNC_OFFSET(18925, gl_dispatch_stub_751, gl_dispatch_stub_751, NULL, _gloffset_BlendEquationSeparateEXT),
-    NAME_FUNC_OFFSET(18952, glBindFramebufferEXT, glBindFramebufferEXT, NULL, _gloffset_BindFramebufferEXT),
-    NAME_FUNC_OFFSET(18970, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, _gloffset_BindRenderbufferEXT),
-    NAME_FUNC_OFFSET(18989, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, _gloffset_CheckFramebufferStatusEXT),
-    NAME_FUNC_OFFSET(19014, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, _gloffset_DeleteFramebuffersEXT),
-    NAME_FUNC_OFFSET(19035, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, _gloffset_DeleteRenderbuffersEXT),
-    NAME_FUNC_OFFSET(19057, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, _gloffset_FramebufferRenderbufferEXT),
-    NAME_FUNC_OFFSET(19083, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, _gloffset_FramebufferTexture1DEXT),
-    NAME_FUNC_OFFSET(19106, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, _gloffset_FramebufferTexture2DEXT),
-    NAME_FUNC_OFFSET(19129, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, _gloffset_FramebufferTexture3DEXT),
-    NAME_FUNC_OFFSET(19152, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, _gloffset_GenFramebuffersEXT),
-    NAME_FUNC_OFFSET(19170, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, _gloffset_GenRenderbuffersEXT),
-    NAME_FUNC_OFFSET(19189, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, _gloffset_GenerateMipmapEXT),
-    NAME_FUNC_OFFSET(19206, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, _gloffset_GetFramebufferAttachmentParameterivEXT),
-    NAME_FUNC_OFFSET(19244, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, _gloffset_GetRenderbufferParameterivEXT),
-    NAME_FUNC_OFFSET(19273, glIsFramebufferEXT, glIsFramebufferEXT, NULL, _gloffset_IsFramebufferEXT),
-    NAME_FUNC_OFFSET(19289, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, _gloffset_IsRenderbufferEXT),
-    NAME_FUNC_OFFSET(19306, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, _gloffset_RenderbufferStorageEXT),
-    NAME_FUNC_OFFSET(19328, gl_dispatch_stub_769, gl_dispatch_stub_769, NULL, _gloffset_BlitFramebufferEXT),
-    NAME_FUNC_OFFSET(19346, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
+    NAME_FUNC_OFFSET( 8984, glFlushMappedBufferRange, glFlushMappedBufferRange, NULL, _gloffset_FlushMappedBufferRange),
+    NAME_FUNC_OFFSET( 9009, glMapBufferRange, glMapBufferRange, NULL, _gloffset_MapBufferRange),
+    NAME_FUNC_OFFSET( 9026, glCopyBufferSubData, glCopyBufferSubData, NULL, _gloffset_CopyBufferSubData),
+    NAME_FUNC_OFFSET( 9046, glPolygonOffsetEXT, glPolygonOffsetEXT, NULL, _gloffset_PolygonOffsetEXT),
+    NAME_FUNC_OFFSET( 9065, gl_dispatch_stub_566, gl_dispatch_stub_566, NULL, _gloffset_GetPixelTexGenParameterfvSGIS),
+    NAME_FUNC_OFFSET( 9097, gl_dispatch_stub_567, gl_dispatch_stub_567, NULL, _gloffset_GetPixelTexGenParameterivSGIS),
+    NAME_FUNC_OFFSET( 9129, gl_dispatch_stub_568, gl_dispatch_stub_568, NULL, _gloffset_PixelTexGenParameterfSGIS),
+    NAME_FUNC_OFFSET( 9157, gl_dispatch_stub_569, gl_dispatch_stub_569, NULL, _gloffset_PixelTexGenParameterfvSGIS),
+    NAME_FUNC_OFFSET( 9186, gl_dispatch_stub_570, gl_dispatch_stub_570, NULL, _gloffset_PixelTexGenParameteriSGIS),
+    NAME_FUNC_OFFSET( 9214, gl_dispatch_stub_571, gl_dispatch_stub_571, NULL, _gloffset_PixelTexGenParameterivSGIS),
+    NAME_FUNC_OFFSET( 9243, gl_dispatch_stub_572, gl_dispatch_stub_572, NULL, _gloffset_SampleMaskSGIS),
+    NAME_FUNC_OFFSET( 9260, gl_dispatch_stub_573, gl_dispatch_stub_573, NULL, _gloffset_SamplePatternSGIS),
+    NAME_FUNC_OFFSET( 9280, glColorPointerEXT, glColorPointerEXT, NULL, _gloffset_ColorPointerEXT),
+    NAME_FUNC_OFFSET( 9298, glEdgeFlagPointerEXT, glEdgeFlagPointerEXT, NULL, _gloffset_EdgeFlagPointerEXT),
+    NAME_FUNC_OFFSET( 9319, glIndexPointerEXT, glIndexPointerEXT, NULL, _gloffset_IndexPointerEXT),
+    NAME_FUNC_OFFSET( 9337, glNormalPointerEXT, glNormalPointerEXT, NULL, _gloffset_NormalPointerEXT),
+    NAME_FUNC_OFFSET( 9356, glTexCoordPointerEXT, glTexCoordPointerEXT, NULL, _gloffset_TexCoordPointerEXT),
+    NAME_FUNC_OFFSET( 9377, glVertexPointerEXT, glVertexPointerEXT, NULL, _gloffset_VertexPointerEXT),
+    NAME_FUNC_OFFSET( 9396, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET( 9417, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET( 9439, glLockArraysEXT, glLockArraysEXT, NULL, _gloffset_LockArraysEXT),
+    NAME_FUNC_OFFSET( 9455, glUnlockArraysEXT, glUnlockArraysEXT, NULL, _gloffset_UnlockArraysEXT),
+    NAME_FUNC_OFFSET( 9473, gl_dispatch_stub_584, gl_dispatch_stub_584, NULL, _gloffset_CullParameterdvEXT),
+    NAME_FUNC_OFFSET( 9494, gl_dispatch_stub_585, gl_dispatch_stub_585, NULL, _gloffset_CullParameterfvEXT),
+    NAME_FUNC_OFFSET( 9515, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
+    NAME_FUNC_OFFSET( 9537, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
+    NAME_FUNC_OFFSET( 9560, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
+    NAME_FUNC_OFFSET( 9582, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
+    NAME_FUNC_OFFSET( 9605, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
+    NAME_FUNC_OFFSET( 9627, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
+    NAME_FUNC_OFFSET( 9650, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
+    NAME_FUNC_OFFSET( 9672, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
+    NAME_FUNC_OFFSET( 9695, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
+    NAME_FUNC_OFFSET( 9717, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
+    NAME_FUNC_OFFSET( 9740, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
+    NAME_FUNC_OFFSET( 9763, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
+    NAME_FUNC_OFFSET( 9787, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
+    NAME_FUNC_OFFSET( 9810, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
+    NAME_FUNC_OFFSET( 9834, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
+    NAME_FUNC_OFFSET( 9857, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
+    NAME_FUNC_OFFSET( 9881, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
+    NAME_FUNC_OFFSET( 9908, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
+    NAME_FUNC_OFFSET( 9929, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
+    NAME_FUNC_OFFSET( 9952, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
+    NAME_FUNC_OFFSET( 9973, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
+    NAME_FUNC_OFFSET( 9988, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
+    NAME_FUNC_OFFSET(10004, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
+    NAME_FUNC_OFFSET(10019, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
+    NAME_FUNC_OFFSET(10035, gl_dispatch_stub_610, gl_dispatch_stub_610, NULL, _gloffset_PixelTexGenSGIX),
+    NAME_FUNC_OFFSET(10053, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
+    NAME_FUNC_OFFSET(10076, glFlushVertexArrayRangeNV, glFlushVertexArrayRangeNV, NULL, _gloffset_FlushVertexArrayRangeNV),
+    NAME_FUNC_OFFSET(10102, glVertexArrayRangeNV, glVertexArrayRangeNV, NULL, _gloffset_VertexArrayRangeNV),
+    NAME_FUNC_OFFSET(10123, glCombinerInputNV, glCombinerInputNV, NULL, _gloffset_CombinerInputNV),
+    NAME_FUNC_OFFSET(10141, glCombinerOutputNV, glCombinerOutputNV, NULL, _gloffset_CombinerOutputNV),
+    NAME_FUNC_OFFSET(10160, glCombinerParameterfNV, glCombinerParameterfNV, NULL, _gloffset_CombinerParameterfNV),
+    NAME_FUNC_OFFSET(10183, glCombinerParameterfvNV, glCombinerParameterfvNV, NULL, _gloffset_CombinerParameterfvNV),
+    NAME_FUNC_OFFSET(10207, glCombinerParameteriNV, glCombinerParameteriNV, NULL, _gloffset_CombinerParameteriNV),
+    NAME_FUNC_OFFSET(10230, glCombinerParameterivNV, glCombinerParameterivNV, NULL, _gloffset_CombinerParameterivNV),
+    NAME_FUNC_OFFSET(10254, glFinalCombinerInputNV, glFinalCombinerInputNV, NULL, _gloffset_FinalCombinerInputNV),
+    NAME_FUNC_OFFSET(10277, glGetCombinerInputParameterfvNV, glGetCombinerInputParameterfvNV, NULL, _gloffset_GetCombinerInputParameterfvNV),
+    NAME_FUNC_OFFSET(10309, glGetCombinerInputParameterivNV, glGetCombinerInputParameterivNV, NULL, _gloffset_GetCombinerInputParameterivNV),
+    NAME_FUNC_OFFSET(10341, glGetCombinerOutputParameterfvNV, glGetCombinerOutputParameterfvNV, NULL, _gloffset_GetCombinerOutputParameterfvNV),
+    NAME_FUNC_OFFSET(10374, glGetCombinerOutputParameterivNV, glGetCombinerOutputParameterivNV, NULL, _gloffset_GetCombinerOutputParameterivNV),
+    NAME_FUNC_OFFSET(10407, glGetFinalCombinerInputParameterfvNV, glGetFinalCombinerInputParameterfvNV, NULL, _gloffset_GetFinalCombinerInputParameterfvNV),
+    NAME_FUNC_OFFSET(10444, glGetFinalCombinerInputParameterivNV, glGetFinalCombinerInputParameterivNV, NULL, _gloffset_GetFinalCombinerInputParameterivNV),
+    NAME_FUNC_OFFSET(10481, glResizeBuffersMESA, glResizeBuffersMESA, NULL, _gloffset_ResizeBuffersMESA),
+    NAME_FUNC_OFFSET(10501, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
+    NAME_FUNC_OFFSET(10519, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
+    NAME_FUNC_OFFSET(10538, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
+    NAME_FUNC_OFFSET(10556, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
+    NAME_FUNC_OFFSET(10575, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
+    NAME_FUNC_OFFSET(10593, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
+    NAME_FUNC_OFFSET(10612, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
+    NAME_FUNC_OFFSET(10630, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
+    NAME_FUNC_OFFSET(10649, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
+    NAME_FUNC_OFFSET(10667, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
+    NAME_FUNC_OFFSET(10686, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
+    NAME_FUNC_OFFSET(10704, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
+    NAME_FUNC_OFFSET(10723, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
+    NAME_FUNC_OFFSET(10741, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
+    NAME_FUNC_OFFSET(10760, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
+    NAME_FUNC_OFFSET(10778, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
+    NAME_FUNC_OFFSET(10797, glWindowPos4dMESA, glWindowPos4dMESA, NULL, _gloffset_WindowPos4dMESA),
+    NAME_FUNC_OFFSET(10815, glWindowPos4dvMESA, glWindowPos4dvMESA, NULL, _gloffset_WindowPos4dvMESA),
+    NAME_FUNC_OFFSET(10834, glWindowPos4fMESA, glWindowPos4fMESA, NULL, _gloffset_WindowPos4fMESA),
+    NAME_FUNC_OFFSET(10852, glWindowPos4fvMESA, glWindowPos4fvMESA, NULL, _gloffset_WindowPos4fvMESA),
+    NAME_FUNC_OFFSET(10871, glWindowPos4iMESA, glWindowPos4iMESA, NULL, _gloffset_WindowPos4iMESA),
+    NAME_FUNC_OFFSET(10889, glWindowPos4ivMESA, glWindowPos4ivMESA, NULL, _gloffset_WindowPos4ivMESA),
+    NAME_FUNC_OFFSET(10908, glWindowPos4sMESA, glWindowPos4sMESA, NULL, _gloffset_WindowPos4sMESA),
+    NAME_FUNC_OFFSET(10926, glWindowPos4svMESA, glWindowPos4svMESA, NULL, _gloffset_WindowPos4svMESA),
+    NAME_FUNC_OFFSET(10945, gl_dispatch_stub_652, gl_dispatch_stub_652, NULL, _gloffset_MultiModeDrawArraysIBM),
+    NAME_FUNC_OFFSET(10970, gl_dispatch_stub_653, gl_dispatch_stub_653, NULL, _gloffset_MultiModeDrawElementsIBM),
+    NAME_FUNC_OFFSET(10997, gl_dispatch_stub_654, gl_dispatch_stub_654, NULL, _gloffset_DeleteFencesNV),
+    NAME_FUNC_OFFSET(11014, gl_dispatch_stub_655, gl_dispatch_stub_655, NULL, _gloffset_FinishFenceNV),
+    NAME_FUNC_OFFSET(11030, gl_dispatch_stub_656, gl_dispatch_stub_656, NULL, _gloffset_GenFencesNV),
+    NAME_FUNC_OFFSET(11044, gl_dispatch_stub_657, gl_dispatch_stub_657, NULL, _gloffset_GetFenceivNV),
+    NAME_FUNC_OFFSET(11059, gl_dispatch_stub_658, gl_dispatch_stub_658, NULL, _gloffset_IsFenceNV),
+    NAME_FUNC_OFFSET(11071, gl_dispatch_stub_659, gl_dispatch_stub_659, NULL, _gloffset_SetFenceNV),
+    NAME_FUNC_OFFSET(11084, gl_dispatch_stub_660, gl_dispatch_stub_660, NULL, _gloffset_TestFenceNV),
+    NAME_FUNC_OFFSET(11098, glAreProgramsResidentNV, glAreProgramsResidentNV, NULL, _gloffset_AreProgramsResidentNV),
+    NAME_FUNC_OFFSET(11122, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
+    NAME_FUNC_OFFSET(11138, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
+    NAME_FUNC_OFFSET(11157, glExecuteProgramNV, glExecuteProgramNV, NULL, _gloffset_ExecuteProgramNV),
+    NAME_FUNC_OFFSET(11176, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
+    NAME_FUNC_OFFSET(11192, glGetProgramParameterdvNV, glGetProgramParameterdvNV, NULL, _gloffset_GetProgramParameterdvNV),
+    NAME_FUNC_OFFSET(11218, glGetProgramParameterfvNV, glGetProgramParameterfvNV, NULL, _gloffset_GetProgramParameterfvNV),
+    NAME_FUNC_OFFSET(11244, glGetProgramStringNV, glGetProgramStringNV, NULL, _gloffset_GetProgramStringNV),
+    NAME_FUNC_OFFSET(11265, glGetProgramivNV, glGetProgramivNV, NULL, _gloffset_GetProgramivNV),
+    NAME_FUNC_OFFSET(11282, glGetTrackMatrixivNV, glGetTrackMatrixivNV, NULL, _gloffset_GetTrackMatrixivNV),
+    NAME_FUNC_OFFSET(11303, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
+    NAME_FUNC_OFFSET(11331, glGetVertexAttribdvNV, glGetVertexAttribdvNV, NULL, _gloffset_GetVertexAttribdvNV),
+    NAME_FUNC_OFFSET(11353, glGetVertexAttribfvNV, glGetVertexAttribfvNV, NULL, _gloffset_GetVertexAttribfvNV),
+    NAME_FUNC_OFFSET(11375, glGetVertexAttribivNV, glGetVertexAttribivNV, NULL, _gloffset_GetVertexAttribivNV),
+    NAME_FUNC_OFFSET(11397, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
+    NAME_FUNC_OFFSET(11411, glLoadProgramNV, glLoadProgramNV, NULL, _gloffset_LoadProgramNV),
+    NAME_FUNC_OFFSET(11427, glProgramParameters4dvNV, glProgramParameters4dvNV, NULL, _gloffset_ProgramParameters4dvNV),
+    NAME_FUNC_OFFSET(11452, glProgramParameters4fvNV, glProgramParameters4fvNV, NULL, _gloffset_ProgramParameters4fvNV),
+    NAME_FUNC_OFFSET(11477, glRequestResidentProgramsNV, glRequestResidentProgramsNV, NULL, _gloffset_RequestResidentProgramsNV),
+    NAME_FUNC_OFFSET(11505, glTrackMatrixNV, glTrackMatrixNV, NULL, _gloffset_TrackMatrixNV),
+    NAME_FUNC_OFFSET(11521, glVertexAttrib1dNV, glVertexAttrib1dNV, NULL, _gloffset_VertexAttrib1dNV),
+    NAME_FUNC_OFFSET(11540, glVertexAttrib1dvNV, glVertexAttrib1dvNV, NULL, _gloffset_VertexAttrib1dvNV),
+    NAME_FUNC_OFFSET(11560, glVertexAttrib1fNV, glVertexAttrib1fNV, NULL, _gloffset_VertexAttrib1fNV),
+    NAME_FUNC_OFFSET(11579, glVertexAttrib1fvNV, glVertexAttrib1fvNV, NULL, _gloffset_VertexAttrib1fvNV),
+    NAME_FUNC_OFFSET(11599, glVertexAttrib1sNV, glVertexAttrib1sNV, NULL, _gloffset_VertexAttrib1sNV),
+    NAME_FUNC_OFFSET(11618, glVertexAttrib1svNV, glVertexAttrib1svNV, NULL, _gloffset_VertexAttrib1svNV),
+    NAME_FUNC_OFFSET(11638, glVertexAttrib2dNV, glVertexAttrib2dNV, NULL, _gloffset_VertexAttrib2dNV),
+    NAME_FUNC_OFFSET(11657, glVertexAttrib2dvNV, glVertexAttrib2dvNV, NULL, _gloffset_VertexAttrib2dvNV),
+    NAME_FUNC_OFFSET(11677, glVertexAttrib2fNV, glVertexAttrib2fNV, NULL, _gloffset_VertexAttrib2fNV),
+    NAME_FUNC_OFFSET(11696, glVertexAttrib2fvNV, glVertexAttrib2fvNV, NULL, _gloffset_VertexAttrib2fvNV),
+    NAME_FUNC_OFFSET(11716, glVertexAttrib2sNV, glVertexAttrib2sNV, NULL, _gloffset_VertexAttrib2sNV),
+    NAME_FUNC_OFFSET(11735, glVertexAttrib2svNV, glVertexAttrib2svNV, NULL, _gloffset_VertexAttrib2svNV),
+    NAME_FUNC_OFFSET(11755, glVertexAttrib3dNV, glVertexAttrib3dNV, NULL, _gloffset_VertexAttrib3dNV),
+    NAME_FUNC_OFFSET(11774, glVertexAttrib3dvNV, glVertexAttrib3dvNV, NULL, _gloffset_VertexAttrib3dvNV),
+    NAME_FUNC_OFFSET(11794, glVertexAttrib3fNV, glVertexAttrib3fNV, NULL, _gloffset_VertexAttrib3fNV),
+    NAME_FUNC_OFFSET(11813, glVertexAttrib3fvNV, glVertexAttrib3fvNV, NULL, _gloffset_VertexAttrib3fvNV),
+    NAME_FUNC_OFFSET(11833, glVertexAttrib3sNV, glVertexAttrib3sNV, NULL, _gloffset_VertexAttrib3sNV),
+    NAME_FUNC_OFFSET(11852, glVertexAttrib3svNV, glVertexAttrib3svNV, NULL, _gloffset_VertexAttrib3svNV),
+    NAME_FUNC_OFFSET(11872, glVertexAttrib4dNV, glVertexAttrib4dNV, NULL, _gloffset_VertexAttrib4dNV),
+    NAME_FUNC_OFFSET(11891, glVertexAttrib4dvNV, glVertexAttrib4dvNV, NULL, _gloffset_VertexAttrib4dvNV),
+    NAME_FUNC_OFFSET(11911, glVertexAttrib4fNV, glVertexAttrib4fNV, NULL, _gloffset_VertexAttrib4fNV),
+    NAME_FUNC_OFFSET(11930, glVertexAttrib4fvNV, glVertexAttrib4fvNV, NULL, _gloffset_VertexAttrib4fvNV),
+    NAME_FUNC_OFFSET(11950, glVertexAttrib4sNV, glVertexAttrib4sNV, NULL, _gloffset_VertexAttrib4sNV),
+    NAME_FUNC_OFFSET(11969, glVertexAttrib4svNV, glVertexAttrib4svNV, NULL, _gloffset_VertexAttrib4svNV),
+    NAME_FUNC_OFFSET(11989, glVertexAttrib4ubNV, glVertexAttrib4ubNV, NULL, _gloffset_VertexAttrib4ubNV),
+    NAME_FUNC_OFFSET(12009, glVertexAttrib4ubvNV, glVertexAttrib4ubvNV, NULL, _gloffset_VertexAttrib4ubvNV),
+    NAME_FUNC_OFFSET(12030, glVertexAttribPointerNV, glVertexAttribPointerNV, NULL, _gloffset_VertexAttribPointerNV),
+    NAME_FUNC_OFFSET(12054, glVertexAttribs1dvNV, glVertexAttribs1dvNV, NULL, _gloffset_VertexAttribs1dvNV),
+    NAME_FUNC_OFFSET(12075, glVertexAttribs1fvNV, glVertexAttribs1fvNV, NULL, _gloffset_VertexAttribs1fvNV),
+    NAME_FUNC_OFFSET(12096, glVertexAttribs1svNV, glVertexAttribs1svNV, NULL, _gloffset_VertexAttribs1svNV),
+    NAME_FUNC_OFFSET(12117, glVertexAttribs2dvNV, glVertexAttribs2dvNV, NULL, _gloffset_VertexAttribs2dvNV),
+    NAME_FUNC_OFFSET(12138, glVertexAttribs2fvNV, glVertexAttribs2fvNV, NULL, _gloffset_VertexAttribs2fvNV),
+    NAME_FUNC_OFFSET(12159, glVertexAttribs2svNV, glVertexAttribs2svNV, NULL, _gloffset_VertexAttribs2svNV),
+    NAME_FUNC_OFFSET(12180, glVertexAttribs3dvNV, glVertexAttribs3dvNV, NULL, _gloffset_VertexAttribs3dvNV),
+    NAME_FUNC_OFFSET(12201, glVertexAttribs3fvNV, glVertexAttribs3fvNV, NULL, _gloffset_VertexAttribs3fvNV),
+    NAME_FUNC_OFFSET(12222, glVertexAttribs3svNV, glVertexAttribs3svNV, NULL, _gloffset_VertexAttribs3svNV),
+    NAME_FUNC_OFFSET(12243, glVertexAttribs4dvNV, glVertexAttribs4dvNV, NULL, _gloffset_VertexAttribs4dvNV),
+    NAME_FUNC_OFFSET(12264, glVertexAttribs4fvNV, glVertexAttribs4fvNV, NULL, _gloffset_VertexAttribs4fvNV),
+    NAME_FUNC_OFFSET(12285, glVertexAttribs4svNV, glVertexAttribs4svNV, NULL, _gloffset_VertexAttribs4svNV),
+    NAME_FUNC_OFFSET(12306, glVertexAttribs4ubvNV, glVertexAttribs4ubvNV, NULL, _gloffset_VertexAttribs4ubvNV),
+    NAME_FUNC_OFFSET(12328, glGetTexBumpParameterfvATI, glGetTexBumpParameterfvATI, NULL, _gloffset_GetTexBumpParameterfvATI),
+    NAME_FUNC_OFFSET(12355, glGetTexBumpParameterivATI, glGetTexBumpParameterivATI, NULL, _gloffset_GetTexBumpParameterivATI),
+    NAME_FUNC_OFFSET(12382, glTexBumpParameterfvATI, glTexBumpParameterfvATI, NULL, _gloffset_TexBumpParameterfvATI),
+    NAME_FUNC_OFFSET(12406, glTexBumpParameterivATI, glTexBumpParameterivATI, NULL, _gloffset_TexBumpParameterivATI),
+    NAME_FUNC_OFFSET(12430, glAlphaFragmentOp1ATI, glAlphaFragmentOp1ATI, NULL, _gloffset_AlphaFragmentOp1ATI),
+    NAME_FUNC_OFFSET(12452, glAlphaFragmentOp2ATI, glAlphaFragmentOp2ATI, NULL, _gloffset_AlphaFragmentOp2ATI),
+    NAME_FUNC_OFFSET(12474, glAlphaFragmentOp3ATI, glAlphaFragmentOp3ATI, NULL, _gloffset_AlphaFragmentOp3ATI),
+    NAME_FUNC_OFFSET(12496, glBeginFragmentShaderATI, glBeginFragmentShaderATI, NULL, _gloffset_BeginFragmentShaderATI),
+    NAME_FUNC_OFFSET(12521, glBindFragmentShaderATI, glBindFragmentShaderATI, NULL, _gloffset_BindFragmentShaderATI),
+    NAME_FUNC_OFFSET(12545, glColorFragmentOp1ATI, glColorFragmentOp1ATI, NULL, _gloffset_ColorFragmentOp1ATI),
+    NAME_FUNC_OFFSET(12567, glColorFragmentOp2ATI, glColorFragmentOp2ATI, NULL, _gloffset_ColorFragmentOp2ATI),
+    NAME_FUNC_OFFSET(12589, glColorFragmentOp3ATI, glColorFragmentOp3ATI, NULL, _gloffset_ColorFragmentOp3ATI),
+    NAME_FUNC_OFFSET(12611, glDeleteFragmentShaderATI, glDeleteFragmentShaderATI, NULL, _gloffset_DeleteFragmentShaderATI),
+    NAME_FUNC_OFFSET(12637, glEndFragmentShaderATI, glEndFragmentShaderATI, NULL, _gloffset_EndFragmentShaderATI),
+    NAME_FUNC_OFFSET(12660, glGenFragmentShadersATI, glGenFragmentShadersATI, NULL, _gloffset_GenFragmentShadersATI),
+    NAME_FUNC_OFFSET(12684, glPassTexCoordATI, glPassTexCoordATI, NULL, _gloffset_PassTexCoordATI),
+    NAME_FUNC_OFFSET(12702, glSampleMapATI, glSampleMapATI, NULL, _gloffset_SampleMapATI),
+    NAME_FUNC_OFFSET(12717, glSetFragmentShaderConstantATI, glSetFragmentShaderConstantATI, NULL, _gloffset_SetFragmentShaderConstantATI),
+    NAME_FUNC_OFFSET(12748, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
+    NAME_FUNC_OFFSET(12768, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
+    NAME_FUNC_OFFSET(12789, gl_dispatch_stub_741, gl_dispatch_stub_741, NULL, _gloffset_ActiveStencilFaceEXT),
+    NAME_FUNC_OFFSET(12812, gl_dispatch_stub_742, gl_dispatch_stub_742, NULL, _gloffset_BindVertexArrayAPPLE),
+    NAME_FUNC_OFFSET(12835, gl_dispatch_stub_743, gl_dispatch_stub_743, NULL, _gloffset_DeleteVertexArraysAPPLE),
+    NAME_FUNC_OFFSET(12861, gl_dispatch_stub_744, gl_dispatch_stub_744, NULL, _gloffset_GenVertexArraysAPPLE),
+    NAME_FUNC_OFFSET(12884, gl_dispatch_stub_745, gl_dispatch_stub_745, NULL, _gloffset_IsVertexArrayAPPLE),
+    NAME_FUNC_OFFSET(12905, glGetProgramNamedParameterdvNV, glGetProgramNamedParameterdvNV, NULL, _gloffset_GetProgramNamedParameterdvNV),
+    NAME_FUNC_OFFSET(12936, glGetProgramNamedParameterfvNV, glGetProgramNamedParameterfvNV, NULL, _gloffset_GetProgramNamedParameterfvNV),
+    NAME_FUNC_OFFSET(12967, glProgramNamedParameter4dNV, glProgramNamedParameter4dNV, NULL, _gloffset_ProgramNamedParameter4dNV),
+    NAME_FUNC_OFFSET(12995, glProgramNamedParameter4dvNV, glProgramNamedParameter4dvNV, NULL, _gloffset_ProgramNamedParameter4dvNV),
+    NAME_FUNC_OFFSET(13024, glProgramNamedParameter4fNV, glProgramNamedParameter4fNV, NULL, _gloffset_ProgramNamedParameter4fNV),
+    NAME_FUNC_OFFSET(13052, glProgramNamedParameter4fvNV, glProgramNamedParameter4fvNV, NULL, _gloffset_ProgramNamedParameter4fvNV),
+    NAME_FUNC_OFFSET(13081, gl_dispatch_stub_752, gl_dispatch_stub_752, NULL, _gloffset_DepthBoundsEXT),
+    NAME_FUNC_OFFSET(13098, gl_dispatch_stub_753, gl_dispatch_stub_753, NULL, _gloffset_BlendEquationSeparateEXT),
+    NAME_FUNC_OFFSET(13125, glBindFramebufferEXT, glBindFramebufferEXT, NULL, _gloffset_BindFramebufferEXT),
+    NAME_FUNC_OFFSET(13146, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, _gloffset_BindRenderbufferEXT),
+    NAME_FUNC_OFFSET(13168, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, _gloffset_CheckFramebufferStatusEXT),
+    NAME_FUNC_OFFSET(13196, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, _gloffset_DeleteFramebuffersEXT),
+    NAME_FUNC_OFFSET(13220, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, _gloffset_DeleteRenderbuffersEXT),
+    NAME_FUNC_OFFSET(13245, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, _gloffset_FramebufferRenderbufferEXT),
+    NAME_FUNC_OFFSET(13274, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, _gloffset_FramebufferTexture1DEXT),
+    NAME_FUNC_OFFSET(13300, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, _gloffset_FramebufferTexture2DEXT),
+    NAME_FUNC_OFFSET(13326, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, _gloffset_FramebufferTexture3DEXT),
+    NAME_FUNC_OFFSET(13352, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, _gloffset_GenFramebuffersEXT),
+    NAME_FUNC_OFFSET(13373, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, _gloffset_GenRenderbuffersEXT),
+    NAME_FUNC_OFFSET(13395, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, _gloffset_GenerateMipmapEXT),
+    NAME_FUNC_OFFSET(13415, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, _gloffset_GetFramebufferAttachmentParameterivEXT),
+    NAME_FUNC_OFFSET(13456, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, _gloffset_GetRenderbufferParameterivEXT),
+    NAME_FUNC_OFFSET(13488, glIsFramebufferEXT, glIsFramebufferEXT, NULL, _gloffset_IsFramebufferEXT),
+    NAME_FUNC_OFFSET(13507, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, _gloffset_IsRenderbufferEXT),
+    NAME_FUNC_OFFSET(13527, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, _gloffset_RenderbufferStorageEXT),
+    NAME_FUNC_OFFSET(13552, gl_dispatch_stub_771, gl_dispatch_stub_771, NULL, _gloffset_BlitFramebufferEXT),
+    NAME_FUNC_OFFSET(13573, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
+    NAME_FUNC_OFFSET(13602, gl_dispatch_stub_773, gl_dispatch_stub_773, NULL, _gloffset_StencilFuncSeparateATI),
+    NAME_FUNC_OFFSET(13627, gl_dispatch_stub_774, gl_dispatch_stub_774, NULL, _gloffset_ProgramEnvParameters4fvEXT),
+    NAME_FUNC_OFFSET(13656, gl_dispatch_stub_775, gl_dispatch_stub_775, NULL, _gloffset_ProgramLocalParameters4fvEXT),
+    NAME_FUNC_OFFSET(13687, gl_dispatch_stub_776, gl_dispatch_stub_776, NULL, _gloffset_GetQueryObjecti64vEXT),
+    NAME_FUNC_OFFSET(13711, gl_dispatch_stub_777, gl_dispatch_stub_777, NULL, _gloffset_GetQueryObjectui64vEXT),
+    NAME_FUNC_OFFSET(13736, glArrayElement, glArrayElement, NULL, _gloffset_ArrayElement),
+    NAME_FUNC_OFFSET(13754, glBindTexture, glBindTexture, NULL, _gloffset_BindTexture),
+    NAME_FUNC_OFFSET(13771, glDrawArrays, glDrawArrays, NULL, _gloffset_DrawArrays),
+    NAME_FUNC_OFFSET(13787, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, _gloffset_AreTexturesResident),
+    NAME_FUNC_OFFSET(13812, glCopyTexImage1D, glCopyTexImage1D, NULL, _gloffset_CopyTexImage1D),
+    NAME_FUNC_OFFSET(13832, glCopyTexImage2D, glCopyTexImage2D, NULL, _gloffset_CopyTexImage2D),
+    NAME_FUNC_OFFSET(13852, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, _gloffset_CopyTexSubImage1D),
+    NAME_FUNC_OFFSET(13875, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, _gloffset_CopyTexSubImage2D),
+    NAME_FUNC_OFFSET(13898, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, _gloffset_DeleteTextures),
+    NAME_FUNC_OFFSET(13918, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, _gloffset_GenTextures),
+    NAME_FUNC_OFFSET(13935, glGetPointerv, glGetPointerv, NULL, _gloffset_GetPointerv),
+    NAME_FUNC_OFFSET(13952, glIsTexture, glIsTextureEXT, glIsTextureEXT, _gloffset_IsTexture),
+    NAME_FUNC_OFFSET(13967, glPrioritizeTextures, glPrioritizeTextures, NULL, _gloffset_PrioritizeTextures),
+    NAME_FUNC_OFFSET(13991, glTexSubImage1D, glTexSubImage1D, NULL, _gloffset_TexSubImage1D),
+    NAME_FUNC_OFFSET(14010, glTexSubImage2D, glTexSubImage2D, NULL, _gloffset_TexSubImage2D),
+    NAME_FUNC_OFFSET(14029, glBlendColor, glBlendColor, NULL, _gloffset_BlendColor),
+    NAME_FUNC_OFFSET(14045, glBlendEquation, glBlendEquation, NULL, _gloffset_BlendEquation),
+    NAME_FUNC_OFFSET(14064, glDrawRangeElements, glDrawRangeElements, NULL, _gloffset_DrawRangeElements),
+    NAME_FUNC_OFFSET(14087, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
+    NAME_FUNC_OFFSET(14103, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
+    NAME_FUNC_OFFSET(14119, glColorTableParameterfv, glColorTableParameterfv, NULL, _gloffset_ColorTableParameterfv),
+    NAME_FUNC_OFFSET(14146, glColorTableParameteriv, glColorTableParameteriv, NULL, _gloffset_ColorTableParameteriv),
+    NAME_FUNC_OFFSET(14173, glCopyColorTable, glCopyColorTable, NULL, _gloffset_CopyColorTable),
+    NAME_FUNC_OFFSET(14193, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
+    NAME_FUNC_OFFSET(14212, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
+    NAME_FUNC_OFFSET(14231, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
+    NAME_FUNC_OFFSET(14261, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
+    NAME_FUNC_OFFSET(14291, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
+    NAME_FUNC_OFFSET(14321, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
+    NAME_FUNC_OFFSET(14351, glColorSubTable, glColorSubTable, NULL, _gloffset_ColorSubTable),
+    NAME_FUNC_OFFSET(14370, glCopyColorSubTable, glCopyColorSubTable, NULL, _gloffset_CopyColorSubTable),
+    NAME_FUNC_OFFSET(14393, glConvolutionFilter1D, glConvolutionFilter1D, NULL, _gloffset_ConvolutionFilter1D),
+    NAME_FUNC_OFFSET(14418, glConvolutionFilter2D, glConvolutionFilter2D, NULL, _gloffset_ConvolutionFilter2D),
+    NAME_FUNC_OFFSET(14443, glConvolutionParameterf, glConvolutionParameterf, NULL, _gloffset_ConvolutionParameterf),
+    NAME_FUNC_OFFSET(14470, glConvolutionParameterfv, glConvolutionParameterfv, NULL, _gloffset_ConvolutionParameterfv),
+    NAME_FUNC_OFFSET(14498, glConvolutionParameteri, glConvolutionParameteri, NULL, _gloffset_ConvolutionParameteri),
+    NAME_FUNC_OFFSET(14525, glConvolutionParameteriv, glConvolutionParameteriv, NULL, _gloffset_ConvolutionParameteriv),
+    NAME_FUNC_OFFSET(14553, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, _gloffset_CopyConvolutionFilter1D),
+    NAME_FUNC_OFFSET(14582, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, _gloffset_CopyConvolutionFilter2D),
+    NAME_FUNC_OFFSET(14611, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, _gloffset_GetConvolutionFilter),
+    NAME_FUNC_OFFSET(14637, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, _gloffset_GetConvolutionParameterfv),
+    NAME_FUNC_OFFSET(14668, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, _gloffset_GetConvolutionParameteriv),
+    NAME_FUNC_OFFSET(14699, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, _gloffset_GetSeparableFilter),
+    NAME_FUNC_OFFSET(14723, glSeparableFilter2D, glSeparableFilter2D, NULL, _gloffset_SeparableFilter2D),
+    NAME_FUNC_OFFSET(14746, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, _gloffset_GetHistogram),
+    NAME_FUNC_OFFSET(14764, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, _gloffset_GetHistogramParameterfv),
+    NAME_FUNC_OFFSET(14793, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, _gloffset_GetHistogramParameteriv),
+    NAME_FUNC_OFFSET(14822, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, _gloffset_GetMinmax),
+    NAME_FUNC_OFFSET(14837, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, _gloffset_GetMinmaxParameterfv),
+    NAME_FUNC_OFFSET(14863, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, _gloffset_GetMinmaxParameteriv),
+    NAME_FUNC_OFFSET(14889, glHistogram, glHistogram, NULL, _gloffset_Histogram),
+    NAME_FUNC_OFFSET(14904, glMinmax, glMinmax, NULL, _gloffset_Minmax),
+    NAME_FUNC_OFFSET(14916, glResetHistogram, glResetHistogram, NULL, _gloffset_ResetHistogram),
+    NAME_FUNC_OFFSET(14936, glResetMinmax, glResetMinmax, NULL, _gloffset_ResetMinmax),
+    NAME_FUNC_OFFSET(14953, glTexImage3D, glTexImage3D, NULL, _gloffset_TexImage3D),
+    NAME_FUNC_OFFSET(14969, glTexSubImage3D, glTexSubImage3D, NULL, _gloffset_TexSubImage3D),
+    NAME_FUNC_OFFSET(14988, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, _gloffset_CopyTexSubImage3D),
+    NAME_FUNC_OFFSET(15011, glActiveTextureARB, glActiveTextureARB, NULL, _gloffset_ActiveTextureARB),
+    NAME_FUNC_OFFSET(15027, glClientActiveTextureARB, glClientActiveTextureARB, NULL, _gloffset_ClientActiveTextureARB),
+    NAME_FUNC_OFFSET(15049, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL, _gloffset_MultiTexCoord1dARB),
+    NAME_FUNC_OFFSET(15067, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL, _gloffset_MultiTexCoord1dvARB),
+    NAME_FUNC_OFFSET(15086, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, _gloffset_MultiTexCoord1fARB),
+    NAME_FUNC_OFFSET(15104, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, _gloffset_MultiTexCoord1fvARB),
+    NAME_FUNC_OFFSET(15123, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL, _gloffset_MultiTexCoord1iARB),
+    NAME_FUNC_OFFSET(15141, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL, _gloffset_MultiTexCoord1ivARB),
+    NAME_FUNC_OFFSET(15160, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL, _gloffset_MultiTexCoord1sARB),
+    NAME_FUNC_OFFSET(15178, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL, _gloffset_MultiTexCoord1svARB),
+    NAME_FUNC_OFFSET(15197, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL, _gloffset_MultiTexCoord2dARB),
+    NAME_FUNC_OFFSET(15215, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL, _gloffset_MultiTexCoord2dvARB),
+    NAME_FUNC_OFFSET(15234, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, _gloffset_MultiTexCoord2fARB),
+    NAME_FUNC_OFFSET(15252, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, _gloffset_MultiTexCoord2fvARB),
+    NAME_FUNC_OFFSET(15271, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL, _gloffset_MultiTexCoord2iARB),
+    NAME_FUNC_OFFSET(15289, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL, _gloffset_MultiTexCoord2ivARB),
+    NAME_FUNC_OFFSET(15308, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL, _gloffset_MultiTexCoord2sARB),
+    NAME_FUNC_OFFSET(15326, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL, _gloffset_MultiTexCoord2svARB),
+    NAME_FUNC_OFFSET(15345, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL, _gloffset_MultiTexCoord3dARB),
+    NAME_FUNC_OFFSET(15363, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL, _gloffset_MultiTexCoord3dvARB),
+    NAME_FUNC_OFFSET(15382, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, _gloffset_MultiTexCoord3fARB),
+    NAME_FUNC_OFFSET(15400, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, _gloffset_MultiTexCoord3fvARB),
+    NAME_FUNC_OFFSET(15419, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL, _gloffset_MultiTexCoord3iARB),
+    NAME_FUNC_OFFSET(15437, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL, _gloffset_MultiTexCoord3ivARB),
+    NAME_FUNC_OFFSET(15456, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL, _gloffset_MultiTexCoord3sARB),
+    NAME_FUNC_OFFSET(15474, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL, _gloffset_MultiTexCoord3svARB),
+    NAME_FUNC_OFFSET(15493, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL, _gloffset_MultiTexCoord4dARB),
+    NAME_FUNC_OFFSET(15511, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL, _gloffset_MultiTexCoord4dvARB),
+    NAME_FUNC_OFFSET(15530, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, _gloffset_MultiTexCoord4fARB),
+    NAME_FUNC_OFFSET(15548, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, _gloffset_MultiTexCoord4fvARB),
+    NAME_FUNC_OFFSET(15567, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL, _gloffset_MultiTexCoord4iARB),
+    NAME_FUNC_OFFSET(15585, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL, _gloffset_MultiTexCoord4ivARB),
+    NAME_FUNC_OFFSET(15604, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL, _gloffset_MultiTexCoord4sARB),
+    NAME_FUNC_OFFSET(15622, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL, _gloffset_MultiTexCoord4svARB),
+    NAME_FUNC_OFFSET(15641, glStencilOpSeparate, glStencilOpSeparate, NULL, _gloffset_StencilOpSeparate),
+    NAME_FUNC_OFFSET(15664, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, _gloffset_LoadTransposeMatrixdARB),
+    NAME_FUNC_OFFSET(15687, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, _gloffset_LoadTransposeMatrixfARB),
+    NAME_FUNC_OFFSET(15710, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, _gloffset_MultTransposeMatrixdARB),
+    NAME_FUNC_OFFSET(15733, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB, NULL, _gloffset_MultTransposeMatrixfARB),
+    NAME_FUNC_OFFSET(15756, glSampleCoverageARB, glSampleCoverageARB, NULL, _gloffset_SampleCoverageARB),
+    NAME_FUNC_OFFSET(15773, glCompressedTexImage1DARB, glCompressedTexImage1DARB, NULL, _gloffset_CompressedTexImage1DARB),
+    NAME_FUNC_OFFSET(15796, glCompressedTexImage2DARB, glCompressedTexImage2DARB, NULL, _gloffset_CompressedTexImage2DARB),
+    NAME_FUNC_OFFSET(15819, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, _gloffset_CompressedTexImage3DARB),
+    NAME_FUNC_OFFSET(15842, glCompressedTexSubImage1DARB, glCompressedTexSubImage1DARB, NULL, _gloffset_CompressedTexSubImage1DARB),
+    NAME_FUNC_OFFSET(15868, glCompressedTexSubImage2DARB, glCompressedTexSubImage2DARB, NULL, _gloffset_CompressedTexSubImage2DARB),
+    NAME_FUNC_OFFSET(15894, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, _gloffset_CompressedTexSubImage3DARB),
+    NAME_FUNC_OFFSET(15920, glGetCompressedTexImageARB, glGetCompressedTexImageARB, NULL, _gloffset_GetCompressedTexImageARB),
+    NAME_FUNC_OFFSET(15944, glDisableVertexAttribArrayARB, glDisableVertexAttribArrayARB, NULL, _gloffset_DisableVertexAttribArrayARB),
+    NAME_FUNC_OFFSET(15971, glEnableVertexAttribArrayARB, glEnableVertexAttribArrayARB, NULL, _gloffset_EnableVertexAttribArrayARB),
+    NAME_FUNC_OFFSET(15997, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL, _gloffset_GetVertexAttribdvARB),
+    NAME_FUNC_OFFSET(16017, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL, _gloffset_GetVertexAttribfvARB),
+    NAME_FUNC_OFFSET(16037, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL, _gloffset_GetVertexAttribivARB),
+    NAME_FUNC_OFFSET(16057, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, _gloffset_ProgramEnvParameter4dARB),
+    NAME_FUNC_OFFSET(16080, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, _gloffset_ProgramEnvParameter4dvARB),
+    NAME_FUNC_OFFSET(16104, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, _gloffset_ProgramEnvParameter4fARB),
+    NAME_FUNC_OFFSET(16127, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, _gloffset_ProgramEnvParameter4fvARB),
+    NAME_FUNC_OFFSET(16151, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, _gloffset_VertexAttrib1dARB),
+    NAME_FUNC_OFFSET(16168, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL, _gloffset_VertexAttrib1dvARB),
+    NAME_FUNC_OFFSET(16186, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, _gloffset_VertexAttrib1fARB),
+    NAME_FUNC_OFFSET(16203, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, _gloffset_VertexAttrib1fvARB),
+    NAME_FUNC_OFFSET(16221, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, _gloffset_VertexAttrib1sARB),
+    NAME_FUNC_OFFSET(16238, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL, _gloffset_VertexAttrib1svARB),
+    NAME_FUNC_OFFSET(16256, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, _gloffset_VertexAttrib2dARB),
+    NAME_FUNC_OFFSET(16273, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL, _gloffset_VertexAttrib2dvARB),
+    NAME_FUNC_OFFSET(16291, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, _gloffset_VertexAttrib2fARB),
+    NAME_FUNC_OFFSET(16308, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, _gloffset_VertexAttrib2fvARB),
+    NAME_FUNC_OFFSET(16326, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, _gloffset_VertexAttrib2sARB),
+    NAME_FUNC_OFFSET(16343, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL, _gloffset_VertexAttrib2svARB),
+    NAME_FUNC_OFFSET(16361, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, _gloffset_VertexAttrib3dARB),
+    NAME_FUNC_OFFSET(16378, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL, _gloffset_VertexAttrib3dvARB),
+    NAME_FUNC_OFFSET(16396, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, _gloffset_VertexAttrib3fARB),
+    NAME_FUNC_OFFSET(16413, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, _gloffset_VertexAttrib3fvARB),
+    NAME_FUNC_OFFSET(16431, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, _gloffset_VertexAttrib3sARB),
+    NAME_FUNC_OFFSET(16448, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL, _gloffset_VertexAttrib3svARB),
+    NAME_FUNC_OFFSET(16466, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL, _gloffset_VertexAttrib4NbvARB),
+    NAME_FUNC_OFFSET(16485, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL, _gloffset_VertexAttrib4NivARB),
+    NAME_FUNC_OFFSET(16504, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL, _gloffset_VertexAttrib4NsvARB),
+    NAME_FUNC_OFFSET(16523, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL, _gloffset_VertexAttrib4NubARB),
+    NAME_FUNC_OFFSET(16542, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, _gloffset_VertexAttrib4NubvARB),
+    NAME_FUNC_OFFSET(16562, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, _gloffset_VertexAttrib4NuivARB),
+    NAME_FUNC_OFFSET(16582, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, _gloffset_VertexAttrib4NusvARB),
+    NAME_FUNC_OFFSET(16602, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, _gloffset_VertexAttrib4bvARB),
+    NAME_FUNC_OFFSET(16620, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, _gloffset_VertexAttrib4dARB),
+    NAME_FUNC_OFFSET(16637, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, _gloffset_VertexAttrib4dvARB),
+    NAME_FUNC_OFFSET(16655, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, _gloffset_VertexAttrib4fARB),
+    NAME_FUNC_OFFSET(16672, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, _gloffset_VertexAttrib4fvARB),
+    NAME_FUNC_OFFSET(16690, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, _gloffset_VertexAttrib4ivARB),
+    NAME_FUNC_OFFSET(16708, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, _gloffset_VertexAttrib4sARB),
+    NAME_FUNC_OFFSET(16725, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, _gloffset_VertexAttrib4svARB),
+    NAME_FUNC_OFFSET(16743, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, _gloffset_VertexAttrib4ubvARB),
+    NAME_FUNC_OFFSET(16762, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, _gloffset_VertexAttrib4uivARB),
+    NAME_FUNC_OFFSET(16781, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, _gloffset_VertexAttrib4usvARB),
+    NAME_FUNC_OFFSET(16800, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, _gloffset_VertexAttribPointerARB),
+    NAME_FUNC_OFFSET(16822, glBindBufferARB, glBindBufferARB, NULL, _gloffset_BindBufferARB),
+    NAME_FUNC_OFFSET(16835, glBufferDataARB, glBufferDataARB, NULL, _gloffset_BufferDataARB),
+    NAME_FUNC_OFFSET(16848, glBufferSubDataARB, glBufferSubDataARB, NULL, _gloffset_BufferSubDataARB),
+    NAME_FUNC_OFFSET(16864, glDeleteBuffersARB, glDeleteBuffersARB, NULL, _gloffset_DeleteBuffersARB),
+    NAME_FUNC_OFFSET(16880, glGenBuffersARB, glGenBuffersARB, NULL, _gloffset_GenBuffersARB),
+    NAME_FUNC_OFFSET(16893, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, _gloffset_GetBufferParameterivARB),
+    NAME_FUNC_OFFSET(16916, glGetBufferPointervARB, glGetBufferPointervARB, NULL, _gloffset_GetBufferPointervARB),
+    NAME_FUNC_OFFSET(16936, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, _gloffset_GetBufferSubDataARB),
+    NAME_FUNC_OFFSET(16955, glIsBufferARB, glIsBufferARB, NULL, _gloffset_IsBufferARB),
+    NAME_FUNC_OFFSET(16966, glMapBufferARB, glMapBufferARB, NULL, _gloffset_MapBufferARB),
+    NAME_FUNC_OFFSET(16978, glUnmapBufferARB, glUnmapBufferARB, NULL, _gloffset_UnmapBufferARB),
+    NAME_FUNC_OFFSET(16992, glBeginQueryARB, glBeginQueryARB, NULL, _gloffset_BeginQueryARB),
+    NAME_FUNC_OFFSET(17005, glDeleteQueriesARB, glDeleteQueriesARB, NULL, _gloffset_DeleteQueriesARB),
+    NAME_FUNC_OFFSET(17021, glEndQueryARB, glEndQueryARB, NULL, _gloffset_EndQueryARB),
+    NAME_FUNC_OFFSET(17032, glGenQueriesARB, glGenQueriesARB, NULL, _gloffset_GenQueriesARB),
+    NAME_FUNC_OFFSET(17045, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, _gloffset_GetQueryObjectivARB),
+    NAME_FUNC_OFFSET(17064, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, _gloffset_GetQueryObjectuivARB),
+    NAME_FUNC_OFFSET(17084, glGetQueryivARB, glGetQueryivARB, NULL, _gloffset_GetQueryivARB),
+    NAME_FUNC_OFFSET(17097, glIsQueryARB, glIsQueryARB, NULL, _gloffset_IsQueryARB),
+    NAME_FUNC_OFFSET(17107, glCompileShaderARB, glCompileShaderARB, NULL, _gloffset_CompileShaderARB),
+    NAME_FUNC_OFFSET(17123, glGetActiveUniformARB, glGetActiveUniformARB, NULL, _gloffset_GetActiveUniformARB),
+    NAME_FUNC_OFFSET(17142, glGetShaderSourceARB, glGetShaderSourceARB, NULL, _gloffset_GetShaderSourceARB),
+    NAME_FUNC_OFFSET(17160, glGetUniformLocationARB, glGetUniformLocationARB, NULL, _gloffset_GetUniformLocationARB),
+    NAME_FUNC_OFFSET(17181, glGetUniformfvARB, glGetUniformfvARB, NULL, _gloffset_GetUniformfvARB),
+    NAME_FUNC_OFFSET(17196, glGetUniformivARB, glGetUniformivARB, NULL, _gloffset_GetUniformivARB),
+    NAME_FUNC_OFFSET(17211, glLinkProgramARB, glLinkProgramARB, NULL, _gloffset_LinkProgramARB),
+    NAME_FUNC_OFFSET(17225, glShaderSourceARB, glShaderSourceARB, NULL, _gloffset_ShaderSourceARB),
+    NAME_FUNC_OFFSET(17240, glUniform1fARB, glUniform1fARB, NULL, _gloffset_Uniform1fARB),
+    NAME_FUNC_OFFSET(17252, glUniform1fvARB, glUniform1fvARB, NULL, _gloffset_Uniform1fvARB),
+    NAME_FUNC_OFFSET(17265, glUniform1iARB, glUniform1iARB, NULL, _gloffset_Uniform1iARB),
+    NAME_FUNC_OFFSET(17277, glUniform1ivARB, glUniform1ivARB, NULL, _gloffset_Uniform1ivARB),
+    NAME_FUNC_OFFSET(17290, glUniform2fARB, glUniform2fARB, NULL, _gloffset_Uniform2fARB),
+    NAME_FUNC_OFFSET(17302, glUniform2fvARB, glUniform2fvARB, NULL, _gloffset_Uniform2fvARB),
+    NAME_FUNC_OFFSET(17315, glUniform2iARB, glUniform2iARB, NULL, _gloffset_Uniform2iARB),
+    NAME_FUNC_OFFSET(17327, glUniform2ivARB, glUniform2ivARB, NULL, _gloffset_Uniform2ivARB),
+    NAME_FUNC_OFFSET(17340, glUniform3fARB, glUniform3fARB, NULL, _gloffset_Uniform3fARB),
+    NAME_FUNC_OFFSET(17352, glUniform3fvARB, glUniform3fvARB, NULL, _gloffset_Uniform3fvARB),
+    NAME_FUNC_OFFSET(17365, glUniform3iARB, glUniform3iARB, NULL, _gloffset_Uniform3iARB),
+    NAME_FUNC_OFFSET(17377, glUniform3ivARB, glUniform3ivARB, NULL, _gloffset_Uniform3ivARB),
+    NAME_FUNC_OFFSET(17390, glUniform4fARB, glUniform4fARB, NULL, _gloffset_Uniform4fARB),
+    NAME_FUNC_OFFSET(17402, glUniform4fvARB, glUniform4fvARB, NULL, _gloffset_Uniform4fvARB),
+    NAME_FUNC_OFFSET(17415, glUniform4iARB, glUniform4iARB, NULL, _gloffset_Uniform4iARB),
+    NAME_FUNC_OFFSET(17427, glUniform4ivARB, glUniform4ivARB, NULL, _gloffset_Uniform4ivARB),
+    NAME_FUNC_OFFSET(17440, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, _gloffset_UniformMatrix2fvARB),
+    NAME_FUNC_OFFSET(17459, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, _gloffset_UniformMatrix3fvARB),
+    NAME_FUNC_OFFSET(17478, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, _gloffset_UniformMatrix4fvARB),
+    NAME_FUNC_OFFSET(17497, glUseProgramObjectARB, glUseProgramObjectARB, NULL, _gloffset_UseProgramObjectARB),
+    NAME_FUNC_OFFSET(17510, glValidateProgramARB, glValidateProgramARB, NULL, _gloffset_ValidateProgramARB),
+    NAME_FUNC_OFFSET(17528, glBindAttribLocationARB, glBindAttribLocationARB, NULL, _gloffset_BindAttribLocationARB),
+    NAME_FUNC_OFFSET(17549, glGetActiveAttribARB, glGetActiveAttribARB, NULL, _gloffset_GetActiveAttribARB),
+    NAME_FUNC_OFFSET(17567, glGetAttribLocationARB, glGetAttribLocationARB, NULL, _gloffset_GetAttribLocationARB),
+    NAME_FUNC_OFFSET(17587, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
+    NAME_FUNC_OFFSET(17601, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
+    NAME_FUNC_OFFSET(17618, gl_dispatch_stub_572, gl_dispatch_stub_572, NULL, _gloffset_SampleMaskSGIS),
+    NAME_FUNC_OFFSET(17634, gl_dispatch_stub_573, gl_dispatch_stub_573, NULL, _gloffset_SamplePatternSGIS),
+    NAME_FUNC_OFFSET(17653, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(17671, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(17692, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(17714, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(17733, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(17755, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(17778, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
+    NAME_FUNC_OFFSET(17797, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
+    NAME_FUNC_OFFSET(17817, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
+    NAME_FUNC_OFFSET(17836, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
+    NAME_FUNC_OFFSET(17856, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
+    NAME_FUNC_OFFSET(17875, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
+    NAME_FUNC_OFFSET(17895, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
+    NAME_FUNC_OFFSET(17914, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
+    NAME_FUNC_OFFSET(17934, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
+    NAME_FUNC_OFFSET(17953, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
+    NAME_FUNC_OFFSET(17973, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
+    NAME_FUNC_OFFSET(17993, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
+    NAME_FUNC_OFFSET(18014, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
+    NAME_FUNC_OFFSET(18034, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
+    NAME_FUNC_OFFSET(18055, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
+    NAME_FUNC_OFFSET(18075, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
+    NAME_FUNC_OFFSET(18096, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
+    NAME_FUNC_OFFSET(18120, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
+    NAME_FUNC_OFFSET(18138, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
+    NAME_FUNC_OFFSET(18158, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
+    NAME_FUNC_OFFSET(18176, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
+    NAME_FUNC_OFFSET(18188, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
+    NAME_FUNC_OFFSET(18201, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
+    NAME_FUNC_OFFSET(18213, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
+    NAME_FUNC_OFFSET(18226, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
+    NAME_FUNC_OFFSET(18246, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
+    NAME_FUNC_OFFSET(18270, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
+    NAME_FUNC_OFFSET(18284, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
+    NAME_FUNC_OFFSET(18301, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
+    NAME_FUNC_OFFSET(18316, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
+    NAME_FUNC_OFFSET(18334, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
+    NAME_FUNC_OFFSET(18348, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
+    NAME_FUNC_OFFSET(18365, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
+    NAME_FUNC_OFFSET(18380, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
+    NAME_FUNC_OFFSET(18398, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
+    NAME_FUNC_OFFSET(18412, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
+    NAME_FUNC_OFFSET(18429, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
+    NAME_FUNC_OFFSET(18444, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
+    NAME_FUNC_OFFSET(18462, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
+    NAME_FUNC_OFFSET(18476, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
+    NAME_FUNC_OFFSET(18493, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
+    NAME_FUNC_OFFSET(18508, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
+    NAME_FUNC_OFFSET(18526, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
+    NAME_FUNC_OFFSET(18540, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
+    NAME_FUNC_OFFSET(18557, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
+    NAME_FUNC_OFFSET(18572, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
+    NAME_FUNC_OFFSET(18590, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
+    NAME_FUNC_OFFSET(18604, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
+    NAME_FUNC_OFFSET(18621, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
+    NAME_FUNC_OFFSET(18636, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
+    NAME_FUNC_OFFSET(18654, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
+    NAME_FUNC_OFFSET(18668, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
+    NAME_FUNC_OFFSET(18685, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
+    NAME_FUNC_OFFSET(18700, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
+    NAME_FUNC_OFFSET(18718, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
+    NAME_FUNC_OFFSET(18732, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
+    NAME_FUNC_OFFSET(18749, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
+    NAME_FUNC_OFFSET(18764, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
+    NAME_FUNC_OFFSET(18782, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
+    NAME_FUNC_OFFSET(18799, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
+    NAME_FUNC_OFFSET(18819, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
+    NAME_FUNC_OFFSET(18836, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
+    NAME_FUNC_OFFSET(18862, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
+    NAME_FUNC_OFFSET(18891, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
+    NAME_FUNC_OFFSET(18906, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
+    NAME_FUNC_OFFSET(18924, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
+    NAME_FUNC_OFFSET(18943, gl_dispatch_stub_753, gl_dispatch_stub_753, NULL, _gloffset_BlendEquationSeparateEXT),
+    NAME_FUNC_OFFSET(18967, gl_dispatch_stub_753, gl_dispatch_stub_753, NULL, _gloffset_BlendEquationSeparateEXT),
+    NAME_FUNC_OFFSET(18994, glBindFramebufferEXT, glBindFramebufferEXT, NULL, _gloffset_BindFramebufferEXT),
+    NAME_FUNC_OFFSET(19012, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, _gloffset_BindRenderbufferEXT),
+    NAME_FUNC_OFFSET(19031, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, _gloffset_CheckFramebufferStatusEXT),
+    NAME_FUNC_OFFSET(19056, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, _gloffset_DeleteFramebuffersEXT),
+    NAME_FUNC_OFFSET(19077, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, _gloffset_DeleteRenderbuffersEXT),
+    NAME_FUNC_OFFSET(19099, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, _gloffset_FramebufferRenderbufferEXT),
+    NAME_FUNC_OFFSET(19125, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, _gloffset_FramebufferTexture1DEXT),
+    NAME_FUNC_OFFSET(19148, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, _gloffset_FramebufferTexture2DEXT),
+    NAME_FUNC_OFFSET(19171, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, _gloffset_FramebufferTexture3DEXT),
+    NAME_FUNC_OFFSET(19194, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, _gloffset_GenFramebuffersEXT),
+    NAME_FUNC_OFFSET(19212, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, _gloffset_GenRenderbuffersEXT),
+    NAME_FUNC_OFFSET(19231, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, _gloffset_GenerateMipmapEXT),
+    NAME_FUNC_OFFSET(19248, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, _gloffset_GetFramebufferAttachmentParameterivEXT),
+    NAME_FUNC_OFFSET(19286, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, _gloffset_GetRenderbufferParameterivEXT),
+    NAME_FUNC_OFFSET(19315, glIsFramebufferEXT, glIsFramebufferEXT, NULL, _gloffset_IsFramebufferEXT),
+    NAME_FUNC_OFFSET(19331, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, _gloffset_IsRenderbufferEXT),
+    NAME_FUNC_OFFSET(19348, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, _gloffset_RenderbufferStorageEXT),
+    NAME_FUNC_OFFSET(19370, gl_dispatch_stub_771, gl_dispatch_stub_771, NULL, _gloffset_BlitFramebufferEXT),
+    NAME_FUNC_OFFSET(19388, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
     NAME_FUNC_OFFSET(-1, NULL, NULL, NULL, 0)
 };
 
diff --git a/src/mesa/main/enums.c b/src/mesa/main/enums.c
index 4339e3ba4e..aa4351dfa1 100644
--- a/src/mesa/main/enums.c
+++ b/src/mesa/main/enums.c
@@ -821,7 +821,13 @@ LONGSTRING static const char enum_string_table[] =
    "GL_MAP2_VERTEX_ATTRIB8_4_NV\0"
    "GL_MAP2_VERTEX_ATTRIB9_4_NV\0"
    "GL_MAP_COLOR\0"
+   "GL_MAP_FLUSH_EXPLICIT_BIT\0"
+   "GL_MAP_INVALIDATE_BUFFER_BIT\0"
+   "GL_MAP_INVALIDATE_RANGE_BIT\0"
+   "GL_MAP_READ_BIT\0"
    "GL_MAP_STENCIL\0"
+   "GL_MAP_UNSYNCHRONIZED_BIT\0"
+   "GL_MAP_WRITE_BIT\0"
    "GL_MATRIX0_ARB\0"
    "GL_MATRIX0_NV\0"
    "GL_MATRIX10_ARB\0"
@@ -1860,7 +1866,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_ZOOM_Y\0"
    ;
 
-static const enum_elt all_enums[1822] =
+static const enum_elt all_enums[1828] =
 {
    {     0, 0x00000600 }, /* GL_2D */
    {     6, 0x00001407 }, /* GL_2_BYTES */
@@ -2647,1043 +2653,1049 @@ static const enum_elt all_enums[1822] =
    { 16288, 0x00008678 }, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
    { 16316, 0x00008679 }, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
    { 16344, 0x00000D10 }, /* GL_MAP_COLOR */
-   { 16357, 0x00000D11 }, /* GL_MAP_STENCIL */
-   { 16372, 0x000088C0 }, /* GL_MATRIX0_ARB */
-   { 16387, 0x00008630 }, /* GL_MATRIX0_NV */
-   { 16401, 0x000088CA }, /* GL_MATRIX10_ARB */
-   { 16417, 0x000088CB }, /* GL_MATRIX11_ARB */
-   { 16433, 0x000088CC }, /* GL_MATRIX12_ARB */
-   { 16449, 0x000088CD }, /* GL_MATRIX13_ARB */
-   { 16465, 0x000088CE }, /* GL_MATRIX14_ARB */
-   { 16481, 0x000088CF }, /* GL_MATRIX15_ARB */
-   { 16497, 0x000088D0 }, /* GL_MATRIX16_ARB */
-   { 16513, 0x000088D1 }, /* GL_MATRIX17_ARB */
-   { 16529, 0x000088D2 }, /* GL_MATRIX18_ARB */
-   { 16545, 0x000088D3 }, /* GL_MATRIX19_ARB */
-   { 16561, 0x000088C1 }, /* GL_MATRIX1_ARB */
-   { 16576, 0x00008631 }, /* GL_MATRIX1_NV */
-   { 16590, 0x000088D4 }, /* GL_MATRIX20_ARB */
-   { 16606, 0x000088D5 }, /* GL_MATRIX21_ARB */
-   { 16622, 0x000088D6 }, /* GL_MATRIX22_ARB */
-   { 16638, 0x000088D7 }, /* GL_MATRIX23_ARB */
-   { 16654, 0x000088D8 }, /* GL_MATRIX24_ARB */
-   { 16670, 0x000088D9 }, /* GL_MATRIX25_ARB */
-   { 16686, 0x000088DA }, /* GL_MATRIX26_ARB */
-   { 16702, 0x000088DB }, /* GL_MATRIX27_ARB */
-   { 16718, 0x000088DC }, /* GL_MATRIX28_ARB */
-   { 16734, 0x000088DD }, /* GL_MATRIX29_ARB */
-   { 16750, 0x000088C2 }, /* GL_MATRIX2_ARB */
-   { 16765, 0x00008632 }, /* GL_MATRIX2_NV */
-   { 16779, 0x000088DE }, /* GL_MATRIX30_ARB */
-   { 16795, 0x000088DF }, /* GL_MATRIX31_ARB */
-   { 16811, 0x000088C3 }, /* GL_MATRIX3_ARB */
-   { 16826, 0x00008633 }, /* GL_MATRIX3_NV */
-   { 16840, 0x000088C4 }, /* GL_MATRIX4_ARB */
-   { 16855, 0x00008634 }, /* GL_MATRIX4_NV */
-   { 16869, 0x000088C5 }, /* GL_MATRIX5_ARB */
-   { 16884, 0x00008635 }, /* GL_MATRIX5_NV */
-   { 16898, 0x000088C6 }, /* GL_MATRIX6_ARB */
-   { 16913, 0x00008636 }, /* GL_MATRIX6_NV */
-   { 16927, 0x000088C7 }, /* GL_MATRIX7_ARB */
-   { 16942, 0x00008637 }, /* GL_MATRIX7_NV */
-   { 16956, 0x000088C8 }, /* GL_MATRIX8_ARB */
-   { 16971, 0x000088C9 }, /* GL_MATRIX9_ARB */
-   { 16986, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_ARB */
-   { 17012, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
-   { 17046, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
-   { 17077, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
-   { 17110, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
-   { 17141, 0x00000BA0 }, /* GL_MATRIX_MODE */
-   { 17156, 0x00008840 }, /* GL_MATRIX_PALETTE_ARB */
-   { 17178, 0x00008008 }, /* GL_MAX */
-   { 17185, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE */
-   { 17208, 0x000088FF }, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
-   { 17240, 0x00000D35 }, /* GL_MAX_ATTRIB_STACK_DEPTH */
-   { 17266, 0x00000D3B }, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
-   { 17299, 0x00008177 }, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
-   { 17325, 0x00008178 }, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-   { 17359, 0x00000D32 }, /* GL_MAX_CLIP_PLANES */
-   { 17378, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
-   { 17407, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
-   { 17439, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI */
-   { 17475, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
-   { 17511, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB */
-   { 17551, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT */
-   { 17577, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT_EXT */
-   { 17607, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH */
-   { 17632, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH_EXT */
-   { 17661, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
-   { 17690, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB */
-   { 17723, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS */
-   { 17743, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ARB */
-   { 17767, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ATI */
-   { 17791, 0x000080E9 }, /* GL_MAX_ELEMENTS_INDICES */
-   { 17815, 0x000080E8 }, /* GL_MAX_ELEMENTS_VERTICES */
-   { 17840, 0x00000D30 }, /* GL_MAX_EVAL_ORDER */
-   { 17858, 0x00008008 }, /* GL_MAX_EXT */
-   { 17869, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
-   { 17904, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB */
-   { 17943, 0x00000D31 }, /* GL_MAX_LIGHTS */
-   { 17957, 0x00000B31 }, /* GL_MAX_LIST_NESTING */
-   { 17977, 0x00008841 }, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
-   { 18015, 0x00000D36 }, /* GL_MAX_MODELVIEW_STACK_DEPTH */
-   { 18044, 0x00000D37 }, /* GL_MAX_NAME_STACK_DEPTH */
-   { 18068, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_ARB */
-   { 18096, 0x00000D34 }, /* GL_MAX_PIXEL_MAP_TABLE */
-   { 18119, 0x000088B1 }, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
-   { 18156, 0x0000880B }, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
-   { 18192, 0x000088AD }, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
-   { 18219, 0x000088F5 }, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
-   { 18248, 0x000088B5 }, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
-   { 18282, 0x000088F4 }, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
-   { 18318, 0x000088F6 }, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
-   { 18345, 0x000088A1 }, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
-   { 18377, 0x000088B4 }, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
-   { 18413, 0x000088F8 }, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
-   { 18442, 0x000088F7 }, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
-   { 18471, 0x0000862F }, /* GL_MAX_PROGRAM_MATRICES_ARB */
-   { 18499, 0x0000862E }, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
-   { 18537, 0x000088B3 }, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-   { 18581, 0x0000880E }, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-   { 18624, 0x000088AF }, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
-   { 18658, 0x000088A3 }, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-   { 18697, 0x000088AB }, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
-   { 18734, 0x000088A7 }, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
-   { 18772, 0x00008810 }, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-   { 18815, 0x0000880F }, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-   { 18858, 0x000088A9 }, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
-   { 18888, 0x000088A5 }, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
-   { 18919, 0x0000880D }, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
-   { 18955, 0x0000880C }, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
-   { 18991, 0x00000D38 }, /* GL_MAX_PROJECTION_STACK_DEPTH */
-   { 19021, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
-   { 19055, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_NV */
-   { 19088, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
-   { 19117, 0x00008D57 }, /* GL_MAX_SAMPLES */
-   { 19132, 0x00008504 }, /* GL_MAX_SHININESS_NV */
-   { 19152, 0x00008505 }, /* GL_MAX_SPOT_EXPONENT_NV */
-   { 19176, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS */
-   { 19198, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS_ARB */
-   { 19224, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS */
-   { 19251, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS_ARB */
-   { 19282, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS */
-   { 19306, 0x000084FF }, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
-   { 19340, 0x00000D33 }, /* GL_MAX_TEXTURE_SIZE */
-   { 19360, 0x00000D39 }, /* GL_MAX_TEXTURE_STACK_DEPTH */
-   { 19387, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS */
-   { 19408, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS_ARB */
-   { 19433, 0x0000862F }, /* GL_MAX_TRACK_MATRICES_NV */
-   { 19458, 0x0000862E }, /* GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */
-   { 19493, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS */
-   { 19515, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS_ARB */
-   { 19541, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS */
-   { 19563, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS_ARB */
-   { 19589, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
-   { 19623, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
-   { 19661, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
-   { 19694, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB */
-   { 19731, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_ARB */
-   { 19755, 0x00000D3A }, /* GL_MAX_VIEWPORT_DIMS */
-   { 19776, 0x00008007 }, /* GL_MIN */
-   { 19783, 0x0000802E }, /* GL_MINMAX */
-   { 19793, 0x0000802E }, /* GL_MINMAX_EXT */
-   { 19807, 0x0000802F }, /* GL_MINMAX_FORMAT */
-   { 19824, 0x0000802F }, /* GL_MINMAX_FORMAT_EXT */
-   { 19845, 0x00008030 }, /* GL_MINMAX_SINK */
-   { 19860, 0x00008030 }, /* GL_MINMAX_SINK_EXT */
-   { 19879, 0x00008007 }, /* GL_MIN_EXT */
-   { 19890, 0x00008370 }, /* GL_MIRRORED_REPEAT */
-   { 19909, 0x00008370 }, /* GL_MIRRORED_REPEAT_ARB */
-   { 19932, 0x00008370 }, /* GL_MIRRORED_REPEAT_IBM */
-   { 19955, 0x00008742 }, /* GL_MIRROR_CLAMP_ATI */
-   { 19975, 0x00008742 }, /* GL_MIRROR_CLAMP_EXT */
-   { 19995, 0x00008912 }, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
-   { 20025, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_ATI */
-   { 20053, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
-   { 20081, 0x00001700 }, /* GL_MODELVIEW */
-   { 20094, 0x00001700 }, /* GL_MODELVIEW0_ARB */
-   { 20112, 0x0000872A }, /* GL_MODELVIEW10_ARB */
-   { 20131, 0x0000872B }, /* GL_MODELVIEW11_ARB */
-   { 20150, 0x0000872C }, /* GL_MODELVIEW12_ARB */
-   { 20169, 0x0000872D }, /* GL_MODELVIEW13_ARB */
-   { 20188, 0x0000872E }, /* GL_MODELVIEW14_ARB */
-   { 20207, 0x0000872F }, /* GL_MODELVIEW15_ARB */
-   { 20226, 0x00008730 }, /* GL_MODELVIEW16_ARB */
-   { 20245, 0x00008731 }, /* GL_MODELVIEW17_ARB */
-   { 20264, 0x00008732 }, /* GL_MODELVIEW18_ARB */
-   { 20283, 0x00008733 }, /* GL_MODELVIEW19_ARB */
-   { 20302, 0x0000850A }, /* GL_MODELVIEW1_ARB */
-   { 20320, 0x00008734 }, /* GL_MODELVIEW20_ARB */
-   { 20339, 0x00008735 }, /* GL_MODELVIEW21_ARB */
-   { 20358, 0x00008736 }, /* GL_MODELVIEW22_ARB */
-   { 20377, 0x00008737 }, /* GL_MODELVIEW23_ARB */
-   { 20396, 0x00008738 }, /* GL_MODELVIEW24_ARB */
-   { 20415, 0x00008739 }, /* GL_MODELVIEW25_ARB */
-   { 20434, 0x0000873A }, /* GL_MODELVIEW26_ARB */
-   { 20453, 0x0000873B }, /* GL_MODELVIEW27_ARB */
-   { 20472, 0x0000873C }, /* GL_MODELVIEW28_ARB */
-   { 20491, 0x0000873D }, /* GL_MODELVIEW29_ARB */
-   { 20510, 0x00008722 }, /* GL_MODELVIEW2_ARB */
-   { 20528, 0x0000873E }, /* GL_MODELVIEW30_ARB */
-   { 20547, 0x0000873F }, /* GL_MODELVIEW31_ARB */
-   { 20566, 0x00008723 }, /* GL_MODELVIEW3_ARB */
-   { 20584, 0x00008724 }, /* GL_MODELVIEW4_ARB */
-   { 20602, 0x00008725 }, /* GL_MODELVIEW5_ARB */
-   { 20620, 0x00008726 }, /* GL_MODELVIEW6_ARB */
-   { 20638, 0x00008727 }, /* GL_MODELVIEW7_ARB */
-   { 20656, 0x00008728 }, /* GL_MODELVIEW8_ARB */
-   { 20674, 0x00008729 }, /* GL_MODELVIEW9_ARB */
-   { 20692, 0x00000BA6 }, /* GL_MODELVIEW_MATRIX */
-   { 20712, 0x00008629 }, /* GL_MODELVIEW_PROJECTION_NV */
-   { 20739, 0x00000BA3 }, /* GL_MODELVIEW_STACK_DEPTH */
-   { 20764, 0x00002100 }, /* GL_MODULATE */
-   { 20776, 0x00008744 }, /* GL_MODULATE_ADD_ATI */
-   { 20796, 0x00008745 }, /* GL_MODULATE_SIGNED_ADD_ATI */
-   { 20823, 0x00008746 }, /* GL_MODULATE_SUBTRACT_ATI */
-   { 20848, 0x00000103 }, /* GL_MULT */
-   { 20856, 0x0000809D }, /* GL_MULTISAMPLE */
-   { 20871, 0x000086B2 }, /* GL_MULTISAMPLE_3DFX */
-   { 20891, 0x0000809D }, /* GL_MULTISAMPLE_ARB */
-   { 20910, 0x20000000 }, /* GL_MULTISAMPLE_BIT */
-   { 20929, 0x20000000 }, /* GL_MULTISAMPLE_BIT_3DFX */
-   { 20953, 0x20000000 }, /* GL_MULTISAMPLE_BIT_ARB */
-   { 20976, 0x00008534 }, /* GL_MULTISAMPLE_FILTER_HINT_NV */
-   { 21006, 0x00002A25 }, /* GL_N3F_V3F */
-   { 21017, 0x00000D70 }, /* GL_NAME_STACK_DEPTH */
-   { 21037, 0x0000150E }, /* GL_NAND */
-   { 21045, 0x00002600 }, /* GL_NEAREST */
-   { 21056, 0x0000844E }, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
-   { 21087, 0x0000844D }, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
-   { 21119, 0x00002702 }, /* GL_NEAREST_MIPMAP_LINEAR */
-   { 21144, 0x00002700 }, /* GL_NEAREST_MIPMAP_NEAREST */
-   { 21170, 0x00000200 }, /* GL_NEVER */
-   { 21179, 0x00001102 }, /* GL_NICEST */
-   { 21189, 0x00000000 }, /* GL_NONE */
-   { 21197, 0x00001505 }, /* GL_NOOP */
-   { 21205, 0x00001508 }, /* GL_NOR */
-   { 21212, 0x00000BA1 }, /* GL_NORMALIZE */
-   { 21225, 0x00008075 }, /* GL_NORMAL_ARRAY */
-   { 21241, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
-   { 21272, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING_ARB */
-   { 21307, 0x0000808F }, /* GL_NORMAL_ARRAY_POINTER */
-   { 21331, 0x0000807F }, /* GL_NORMAL_ARRAY_STRIDE */
-   { 21354, 0x0000807E }, /* GL_NORMAL_ARRAY_TYPE */
-   { 21375, 0x00008511 }, /* GL_NORMAL_MAP */
-   { 21389, 0x00008511 }, /* GL_NORMAL_MAP_ARB */
-   { 21407, 0x00008511 }, /* GL_NORMAL_MAP_NV */
-   { 21424, 0x00000205 }, /* GL_NOTEQUAL */
-   { 21436, 0x00000000 }, /* GL_NO_ERROR */
-   { 21448, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
-   { 21482, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB */
-   { 21520, 0x00008B89 }, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */
-   { 21552, 0x00008B8A }, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */
-   { 21594, 0x00008B86 }, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */
-   { 21624, 0x00008B87 }, /* GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB */
-   { 21664, 0x00008B85 }, /* GL_OBJECT_ATTACHED_OBJECTS_ARB */
-   { 21695, 0x00008B81 }, /* GL_OBJECT_COMPILE_STATUS_ARB */
-   { 21724, 0x00008B80 }, /* GL_OBJECT_DELETE_STATUS_ARB */
-   { 21752, 0x00008B84 }, /* GL_OBJECT_INFO_LOG_LENGTH_ARB */
-   { 21782, 0x00002401 }, /* GL_OBJECT_LINEAR */
-   { 21799, 0x00008B82 }, /* GL_OBJECT_LINK_STATUS_ARB */
-   { 21825, 0x00002501 }, /* GL_OBJECT_PLANE */
-   { 21841, 0x00008B88 }, /* GL_OBJECT_SHADER_SOURCE_LENGTH_ARB */
-   { 21876, 0x00008B4F }, /* GL_OBJECT_SUBTYPE_ARB */
-   { 21898, 0x00008B4E }, /* GL_OBJECT_TYPE_ARB */
-   { 21917, 0x00008B83 }, /* GL_OBJECT_VALIDATE_STATUS_ARB */
-   { 21947, 0x00008165 }, /* GL_OCCLUSION_TEST_HP */
-   { 21968, 0x00008166 }, /* GL_OCCLUSION_TEST_RESULT_HP */
-   { 21996, 0x00000001 }, /* GL_ONE */
-   { 22003, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA */
-   { 22031, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA_EXT */
-   { 22063, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR */
-   { 22091, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR_EXT */
-   { 22123, 0x00000305 }, /* GL_ONE_MINUS_DST_ALPHA */
-   { 22146, 0x00000307 }, /* GL_ONE_MINUS_DST_COLOR */
-   { 22169, 0x00000303 }, /* GL_ONE_MINUS_SRC_ALPHA */
-   { 22192, 0x00000301 }, /* GL_ONE_MINUS_SRC_COLOR */
-   { 22215, 0x00008598 }, /* GL_OPERAND0_ALPHA */
-   { 22233, 0x00008598 }, /* GL_OPERAND0_ALPHA_ARB */
-   { 22255, 0x00008598 }, /* GL_OPERAND0_ALPHA_EXT */
-   { 22277, 0x00008590 }, /* GL_OPERAND0_RGB */
-   { 22293, 0x00008590 }, /* GL_OPERAND0_RGB_ARB */
-   { 22313, 0x00008590 }, /* GL_OPERAND0_RGB_EXT */
-   { 22333, 0x00008599 }, /* GL_OPERAND1_ALPHA */
-   { 22351, 0x00008599 }, /* GL_OPERAND1_ALPHA_ARB */
-   { 22373, 0x00008599 }, /* GL_OPERAND1_ALPHA_EXT */
-   { 22395, 0x00008591 }, /* GL_OPERAND1_RGB */
-   { 22411, 0x00008591 }, /* GL_OPERAND1_RGB_ARB */
-   { 22431, 0x00008591 }, /* GL_OPERAND1_RGB_EXT */
-   { 22451, 0x0000859A }, /* GL_OPERAND2_ALPHA */
-   { 22469, 0x0000859A }, /* GL_OPERAND2_ALPHA_ARB */
-   { 22491, 0x0000859A }, /* GL_OPERAND2_ALPHA_EXT */
-   { 22513, 0x00008592 }, /* GL_OPERAND2_RGB */
-   { 22529, 0x00008592 }, /* GL_OPERAND2_RGB_ARB */
-   { 22549, 0x00008592 }, /* GL_OPERAND2_RGB_EXT */
-   { 22569, 0x0000859B }, /* GL_OPERAND3_ALPHA_NV */
-   { 22590, 0x00008593 }, /* GL_OPERAND3_RGB_NV */
-   { 22609, 0x00001507 }, /* GL_OR */
-   { 22615, 0x00000A01 }, /* GL_ORDER */
-   { 22624, 0x0000150D }, /* GL_OR_INVERTED */
-   { 22639, 0x0000150B }, /* GL_OR_REVERSE */
-   { 22653, 0x00000505 }, /* GL_OUT_OF_MEMORY */
-   { 22670, 0x00000D05 }, /* GL_PACK_ALIGNMENT */
-   { 22688, 0x0000806C }, /* GL_PACK_IMAGE_HEIGHT */
-   { 22709, 0x00008758 }, /* GL_PACK_INVERT_MESA */
-   { 22729, 0x00000D01 }, /* GL_PACK_LSB_FIRST */
-   { 22747, 0x00000D02 }, /* GL_PACK_ROW_LENGTH */
-   { 22766, 0x0000806B }, /* GL_PACK_SKIP_IMAGES */
-   { 22786, 0x00000D04 }, /* GL_PACK_SKIP_PIXELS */
-   { 22806, 0x00000D03 }, /* GL_PACK_SKIP_ROWS */
-   { 22824, 0x00000D00 }, /* GL_PACK_SWAP_BYTES */
-   { 22843, 0x00008B92 }, /* GL_PALETTE4_R5_G6_B5_OES */
-   { 22868, 0x00008B94 }, /* GL_PALETTE4_RGB5_A1_OES */
-   { 22892, 0x00008B90 }, /* GL_PALETTE4_RGB8_OES */
-   { 22913, 0x00008B93 }, /* GL_PALETTE4_RGBA4_OES */
-   { 22935, 0x00008B91 }, /* GL_PALETTE4_RGBA8_OES */
-   { 22957, 0x00008B97 }, /* GL_PALETTE8_R5_G6_B5_OES */
-   { 22982, 0x00008B99 }, /* GL_PALETTE8_RGB5_A1_OES */
-   { 23006, 0x00008B95 }, /* GL_PALETTE8_RGB8_OES */
-   { 23027, 0x00008B98 }, /* GL_PALETTE8_RGBA4_OES */
-   { 23049, 0x00008B96 }, /* GL_PALETTE8_RGBA8_OES */
-   { 23071, 0x00000700 }, /* GL_PASS_THROUGH_TOKEN */
-   { 23093, 0x00000C50 }, /* GL_PERSPECTIVE_CORRECTION_HINT */
-   { 23124, 0x00000C79 }, /* GL_PIXEL_MAP_A_TO_A */
-   { 23144, 0x00000CB9 }, /* GL_PIXEL_MAP_A_TO_A_SIZE */
-   { 23169, 0x00000C78 }, /* GL_PIXEL_MAP_B_TO_B */
-   { 23189, 0x00000CB8 }, /* GL_PIXEL_MAP_B_TO_B_SIZE */
-   { 23214, 0x00000C77 }, /* GL_PIXEL_MAP_G_TO_G */
-   { 23234, 0x00000CB7 }, /* GL_PIXEL_MAP_G_TO_G_SIZE */
-   { 23259, 0x00000C75 }, /* GL_PIXEL_MAP_I_TO_A */
-   { 23279, 0x00000CB5 }, /* GL_PIXEL_MAP_I_TO_A_SIZE */
-   { 23304, 0x00000C74 }, /* GL_PIXEL_MAP_I_TO_B */
-   { 23324, 0x00000CB4 }, /* GL_PIXEL_MAP_I_TO_B_SIZE */
-   { 23349, 0x00000C73 }, /* GL_PIXEL_MAP_I_TO_G */
-   { 23369, 0x00000CB3 }, /* GL_PIXEL_MAP_I_TO_G_SIZE */
-   { 23394, 0x00000C70 }, /* GL_PIXEL_MAP_I_TO_I */
-   { 23414, 0x00000CB0 }, /* GL_PIXEL_MAP_I_TO_I_SIZE */
-   { 23439, 0x00000C72 }, /* GL_PIXEL_MAP_I_TO_R */
-   { 23459, 0x00000CB2 }, /* GL_PIXEL_MAP_I_TO_R_SIZE */
-   { 23484, 0x00000C76 }, /* GL_PIXEL_MAP_R_TO_R */
-   { 23504, 0x00000CB6 }, /* GL_PIXEL_MAP_R_TO_R_SIZE */
-   { 23529, 0x00000C71 }, /* GL_PIXEL_MAP_S_TO_S */
-   { 23549, 0x00000CB1 }, /* GL_PIXEL_MAP_S_TO_S_SIZE */
-   { 23574, 0x00000020 }, /* GL_PIXEL_MODE_BIT */
-   { 23592, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER */
-   { 23613, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING */
-   { 23642, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING_EXT */
-   { 23675, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER_EXT */
-   { 23700, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER */
-   { 23723, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
-   { 23754, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING_EXT */
-   { 23789, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER_EXT */
-   { 23816, 0x00001B00 }, /* GL_POINT */
-   { 23825, 0x00000000 }, /* GL_POINTS */
-   { 23835, 0x00000002 }, /* GL_POINT_BIT */
-   { 23848, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION */
-   { 23878, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_ARB */
-   { 23912, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_EXT */
-   { 23946, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_SGIS */
-   { 23981, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE */
-   { 24010, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_ARB */
-   { 24043, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_EXT */
-   { 24076, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_SGIS */
-   { 24110, 0x00000B11 }, /* GL_POINT_SIZE */
-   { 24124, 0x00000B13 }, /* GL_POINT_SIZE_GRANULARITY */
-   { 24150, 0x00008127 }, /* GL_POINT_SIZE_MAX */
-   { 24168, 0x00008127 }, /* GL_POINT_SIZE_MAX_ARB */
-   { 24190, 0x00008127 }, /* GL_POINT_SIZE_MAX_EXT */
-   { 24212, 0x00008127 }, /* GL_POINT_SIZE_MAX_SGIS */
-   { 24235, 0x00008126 }, /* GL_POINT_SIZE_MIN */
-   { 24253, 0x00008126 }, /* GL_POINT_SIZE_MIN_ARB */
-   { 24275, 0x00008126 }, /* GL_POINT_SIZE_MIN_EXT */
-   { 24297, 0x00008126 }, /* GL_POINT_SIZE_MIN_SGIS */
-   { 24320, 0x00000B12 }, /* GL_POINT_SIZE_RANGE */
-   { 24340, 0x00000B10 }, /* GL_POINT_SMOOTH */
-   { 24356, 0x00000C51 }, /* GL_POINT_SMOOTH_HINT */
-   { 24377, 0x00008861 }, /* GL_POINT_SPRITE */
-   { 24393, 0x00008861 }, /* GL_POINT_SPRITE_ARB */
-   { 24413, 0x00008CA0 }, /* GL_POINT_SPRITE_COORD_ORIGIN */
-   { 24442, 0x00008861 }, /* GL_POINT_SPRITE_NV */
-   { 24461, 0x00008863 }, /* GL_POINT_SPRITE_R_MODE_NV */
-   { 24487, 0x00000701 }, /* GL_POINT_TOKEN */
-   { 24502, 0x00000009 }, /* GL_POLYGON */
-   { 24513, 0x00000008 }, /* GL_POLYGON_BIT */
-   { 24528, 0x00000B40 }, /* GL_POLYGON_MODE */
-   { 24544, 0x00008039 }, /* GL_POLYGON_OFFSET_BIAS */
-   { 24567, 0x00008038 }, /* GL_POLYGON_OFFSET_FACTOR */
-   { 24592, 0x00008037 }, /* GL_POLYGON_OFFSET_FILL */
-   { 24615, 0x00002A02 }, /* GL_POLYGON_OFFSET_LINE */
-   { 24638, 0x00002A01 }, /* GL_POLYGON_OFFSET_POINT */
-   { 24662, 0x00002A00 }, /* GL_POLYGON_OFFSET_UNITS */
-   { 24686, 0x00000B41 }, /* GL_POLYGON_SMOOTH */
-   { 24704, 0x00000C53 }, /* GL_POLYGON_SMOOTH_HINT */
-   { 24727, 0x00000B42 }, /* GL_POLYGON_STIPPLE */
-   { 24746, 0x00000010 }, /* GL_POLYGON_STIPPLE_BIT */
-   { 24769, 0x00000703 }, /* GL_POLYGON_TOKEN */
-   { 24786, 0x00001203 }, /* GL_POSITION */
-   { 24798, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
-   { 24830, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI */
-   { 24866, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
-   { 24899, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI */
-   { 24936, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
-   { 24967, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI */
-   { 25002, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
-   { 25034, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI */
-   { 25070, 0x000080D2 }, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
-   { 25103, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
-   { 25135, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI */
-   { 25171, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
-   { 25204, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI */
-   { 25241, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS */
-   { 25271, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS_SGI */
-   { 25305, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE */
-   { 25336, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE_SGI */
-   { 25371, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
-   { 25402, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS_EXT */
-   { 25437, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
-   { 25469, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE_EXT */
-   { 25505, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS */
-   { 25535, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS_EXT */
-   { 25569, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE */
-   { 25600, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE_EXT */
-   { 25635, 0x000080D1 }, /* GL_POST_CONVOLUTION_COLOR_TABLE */
-   { 25667, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS */
-   { 25698, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS_EXT */
-   { 25733, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE */
-   { 25765, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE_EXT */
-   { 25801, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS */
-   { 25830, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS_EXT */
-   { 25863, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE */
-   { 25893, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE_EXT */
-   { 25927, 0x0000817B }, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
-   { 25966, 0x00008179 }, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
-   { 25999, 0x0000817C }, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
-   { 26039, 0x0000817A }, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
-   { 26073, 0x00008578 }, /* GL_PREVIOUS */
-   { 26085, 0x00008578 }, /* GL_PREVIOUS_ARB */
-   { 26101, 0x00008578 }, /* GL_PREVIOUS_EXT */
-   { 26117, 0x00008577 }, /* GL_PRIMARY_COLOR */
-   { 26134, 0x00008577 }, /* GL_PRIMARY_COLOR_ARB */
-   { 26155, 0x00008577 }, /* GL_PRIMARY_COLOR_EXT */
-   { 26176, 0x000088B0 }, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
-   { 26209, 0x00008805 }, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
-   { 26241, 0x000088AC }, /* GL_PROGRAM_ATTRIBS_ARB */
-   { 26264, 0x00008677 }, /* GL_PROGRAM_BINDING_ARB */
-   { 26287, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_ARB */
-   { 26317, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_NV */
-   { 26346, 0x00008874 }, /* GL_PROGRAM_ERROR_STRING_ARB */
-   { 26374, 0x00008876 }, /* GL_PROGRAM_FORMAT_ARB */
-   { 26396, 0x00008875 }, /* GL_PROGRAM_FORMAT_ASCII_ARB */
-   { 26424, 0x000088A0 }, /* GL_PROGRAM_INSTRUCTIONS_ARB */
-   { 26452, 0x00008627 }, /* GL_PROGRAM_LENGTH_ARB */
-   { 26474, 0x00008627 }, /* GL_PROGRAM_LENGTH_NV */
-   { 26495, 0x000088B2 }, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-   { 26535, 0x00008808 }, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-   { 26574, 0x000088AE }, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
-   { 26604, 0x000088A2 }, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-   { 26639, 0x000088AA }, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
-   { 26672, 0x000088A6 }, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
-   { 26706, 0x0000880A }, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-   { 26745, 0x00008809 }, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-   { 26784, 0x00008B40 }, /* GL_PROGRAM_OBJECT_ARB */
-   { 26806, 0x000088A8 }, /* GL_PROGRAM_PARAMETERS_ARB */
-   { 26832, 0x00008644 }, /* GL_PROGRAM_PARAMETER_NV */
-   { 26856, 0x00008647 }, /* GL_PROGRAM_RESIDENT_NV */
-   { 26879, 0x00008628 }, /* GL_PROGRAM_STRING_ARB */
-   { 26901, 0x00008628 }, /* GL_PROGRAM_STRING_NV */
-   { 26922, 0x00008646 }, /* GL_PROGRAM_TARGET_NV */
-   { 26943, 0x000088A4 }, /* GL_PROGRAM_TEMPORARIES_ARB */
-   { 26970, 0x00008807 }, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
-   { 27002, 0x00008806 }, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
-   { 27034, 0x000088B6 }, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-   { 27069, 0x00001701 }, /* GL_PROJECTION */
-   { 27083, 0x00000BA7 }, /* GL_PROJECTION_MATRIX */
-   { 27104, 0x00000BA4 }, /* GL_PROJECTION_STACK_DEPTH */
-   { 27130, 0x000080D3 }, /* GL_PROXY_COLOR_TABLE */
-   { 27151, 0x00008025 }, /* GL_PROXY_HISTOGRAM */
-   { 27170, 0x00008025 }, /* GL_PROXY_HISTOGRAM_EXT */
-   { 27193, 0x000080D5 }, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
-   { 27232, 0x000080D4 }, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
-   { 27270, 0x00008063 }, /* GL_PROXY_TEXTURE_1D */
-   { 27290, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
-   { 27320, 0x00008063 }, /* GL_PROXY_TEXTURE_1D_EXT */
-   { 27344, 0x00008064 }, /* GL_PROXY_TEXTURE_2D */
-   { 27364, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
-   { 27394, 0x00008064 }, /* GL_PROXY_TEXTURE_2D_EXT */
-   { 27418, 0x00008070 }, /* GL_PROXY_TEXTURE_3D */
-   { 27438, 0x000080BD }, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
-   { 27471, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP */
-   { 27497, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP_ARB */
-   { 27527, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
-   { 27558, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_NV */
-   { 27588, 0x00002003 }, /* GL_Q */
-   { 27593, 0x00001209 }, /* GL_QUADRATIC_ATTENUATION */
-   { 27618, 0x00000007 }, /* GL_QUADS */
-   { 27627, 0x00008614 }, /* GL_QUAD_MESH_SUN */
-   { 27644, 0x00000008 }, /* GL_QUAD_STRIP */
-   { 27658, 0x00008864 }, /* GL_QUERY_COUNTER_BITS */
-   { 27680, 0x00008864 }, /* GL_QUERY_COUNTER_BITS_ARB */
-   { 27706, 0x00008866 }, /* GL_QUERY_RESULT */
-   { 27722, 0x00008866 }, /* GL_QUERY_RESULT_ARB */
-   { 27742, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE */
-   { 27768, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE_ARB */
-   { 27798, 0x00002002 }, /* GL_R */
-   { 27803, 0x00002A10 }, /* GL_R3_G3_B2 */
-   { 27815, 0x00019262 }, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
-   { 27848, 0x00000C02 }, /* GL_READ_BUFFER */
-   { 27863, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER */
-   { 27883, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
-   { 27915, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER_EXT */
-   { 27939, 0x000088B8 }, /* GL_READ_ONLY */
-   { 27952, 0x000088B8 }, /* GL_READ_ONLY_ARB */
-   { 27969, 0x000088BA }, /* GL_READ_WRITE */
-   { 27983, 0x000088BA }, /* GL_READ_WRITE_ARB */
-   { 28001, 0x00001903 }, /* GL_RED */
-   { 28008, 0x00008016 }, /* GL_REDUCE */
-   { 28018, 0x00008016 }, /* GL_REDUCE_EXT */
-   { 28032, 0x00000D15 }, /* GL_RED_BIAS */
-   { 28044, 0x00000D52 }, /* GL_RED_BITS */
-   { 28056, 0x00000D14 }, /* GL_RED_SCALE */
-   { 28069, 0x00008512 }, /* GL_REFLECTION_MAP */
-   { 28087, 0x00008512 }, /* GL_REFLECTION_MAP_ARB */
-   { 28109, 0x00008512 }, /* GL_REFLECTION_MAP_NV */
-   { 28130, 0x00001C00 }, /* GL_RENDER */
-   { 28140, 0x00008D41 }, /* GL_RENDERBUFFER */
-   { 28156, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE */
-   { 28183, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_EXT */
-   { 28211, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE */
-   { 28237, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE */
-   { 28264, 0x00008D41 }, /* GL_RENDERBUFFER_EXT */
-   { 28284, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE */
-   { 28311, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT */
-   { 28334, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_EXT */
-   { 28361, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
-   { 28393, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */
-   { 28429, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE */
-   { 28454, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES */
-   { 28478, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE */
-   { 28507, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH */
-   { 28529, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_EXT */
-   { 28555, 0x00001F01 }, /* GL_RENDERER */
-   { 28567, 0x00000C40 }, /* GL_RENDER_MODE */
-   { 28582, 0x00002901 }, /* GL_REPEAT */
-   { 28592, 0x00001E01 }, /* GL_REPLACE */
-   { 28603, 0x00008062 }, /* GL_REPLACE_EXT */
-   { 28618, 0x00008153 }, /* GL_REPLICATE_BORDER_HP */
-   { 28641, 0x0000803A }, /* GL_RESCALE_NORMAL */
-   { 28659, 0x0000803A }, /* GL_RESCALE_NORMAL_EXT */
-   { 28681, 0x00000102 }, /* GL_RETURN */
-   { 28691, 0x00001907 }, /* GL_RGB */
-   { 28698, 0x00008052 }, /* GL_RGB10 */
-   { 28707, 0x00008059 }, /* GL_RGB10_A2 */
-   { 28719, 0x00008059 }, /* GL_RGB10_A2_EXT */
-   { 28735, 0x00008052 }, /* GL_RGB10_EXT */
-   { 28748, 0x00008053 }, /* GL_RGB12 */
-   { 28757, 0x00008053 }, /* GL_RGB12_EXT */
-   { 28770, 0x00008054 }, /* GL_RGB16 */
-   { 28779, 0x00008054 }, /* GL_RGB16_EXT */
-   { 28792, 0x0000804E }, /* GL_RGB2_EXT */
-   { 28804, 0x0000804F }, /* GL_RGB4 */
-   { 28812, 0x0000804F }, /* GL_RGB4_EXT */
-   { 28824, 0x000083A1 }, /* GL_RGB4_S3TC */
-   { 28837, 0x00008050 }, /* GL_RGB5 */
-   { 28845, 0x00008057 }, /* GL_RGB5_A1 */
-   { 28856, 0x00008057 }, /* GL_RGB5_A1_EXT */
-   { 28871, 0x00008050 }, /* GL_RGB5_EXT */
-   { 28883, 0x00008051 }, /* GL_RGB8 */
-   { 28891, 0x00008051 }, /* GL_RGB8_EXT */
-   { 28903, 0x00001908 }, /* GL_RGBA */
-   { 28911, 0x0000805A }, /* GL_RGBA12 */
-   { 28921, 0x0000805A }, /* GL_RGBA12_EXT */
-   { 28935, 0x0000805B }, /* GL_RGBA16 */
-   { 28945, 0x0000805B }, /* GL_RGBA16_EXT */
-   { 28959, 0x00008055 }, /* GL_RGBA2 */
-   { 28968, 0x00008055 }, /* GL_RGBA2_EXT */
-   { 28981, 0x00008056 }, /* GL_RGBA4 */
-   { 28990, 0x000083A5 }, /* GL_RGBA4_DXT5_S3TC */
-   { 29009, 0x00008056 }, /* GL_RGBA4_EXT */
-   { 29022, 0x000083A3 }, /* GL_RGBA4_S3TC */
-   { 29036, 0x00008058 }, /* GL_RGBA8 */
-   { 29045, 0x00008058 }, /* GL_RGBA8_EXT */
-   { 29058, 0x00008F97 }, /* GL_RGBA8_SNORM */
-   { 29073, 0x000083A4 }, /* GL_RGBA_DXT5_S3TC */
-   { 29091, 0x00000C31 }, /* GL_RGBA_MODE */
-   { 29104, 0x000083A2 }, /* GL_RGBA_S3TC */
-   { 29117, 0x00008F93 }, /* GL_RGBA_SNORM */
-   { 29131, 0x000083A0 }, /* GL_RGB_S3TC */
-   { 29143, 0x00008573 }, /* GL_RGB_SCALE */
-   { 29156, 0x00008573 }, /* GL_RGB_SCALE_ARB */
-   { 29173, 0x00008573 }, /* GL_RGB_SCALE_EXT */
-   { 29190, 0x00000407 }, /* GL_RIGHT */
-   { 29199, 0x00002000 }, /* GL_S */
-   { 29204, 0x00008B5D }, /* GL_SAMPLER_1D */
-   { 29218, 0x00008B61 }, /* GL_SAMPLER_1D_SHADOW */
-   { 29239, 0x00008B5E }, /* GL_SAMPLER_2D */
-   { 29253, 0x00008B62 }, /* GL_SAMPLER_2D_SHADOW */
-   { 29274, 0x00008B5F }, /* GL_SAMPLER_3D */
-   { 29288, 0x00008B60 }, /* GL_SAMPLER_CUBE */
-   { 29304, 0x000080A9 }, /* GL_SAMPLES */
-   { 29315, 0x000086B4 }, /* GL_SAMPLES_3DFX */
-   { 29331, 0x000080A9 }, /* GL_SAMPLES_ARB */
-   { 29346, 0x00008914 }, /* GL_SAMPLES_PASSED */
-   { 29364, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */
-   { 29386, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
-   { 29414, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */
-   { 29446, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */
-   { 29469, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */
-   { 29496, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */
-   { 29514, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */
-   { 29537, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */
-   { 29559, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */
-   { 29578, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */
-   { 29601, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */
-   { 29627, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */
-   { 29657, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */
-   { 29682, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */
-   { 29711, 0x00080000 }, /* GL_SCISSOR_BIT */
-   { 29726, 0x00000C10 }, /* GL_SCISSOR_BOX */
-   { 29741, 0x00000C11 }, /* GL_SCISSOR_TEST */
-   { 29757, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */
-   { 29782, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
-   { 29822, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */
-   { 29866, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
-   { 29899, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
-   { 29929, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
-   { 29961, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
-   { 29991, 0x00001C02 }, /* GL_SELECT */
-   { 30001, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */
-   { 30029, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */
-   { 30054, 0x00008012 }, /* GL_SEPARABLE_2D */
-   { 30070, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */
-   { 30097, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */
-   { 30128, 0x0000150F }, /* GL_SET */
-   { 30135, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */
-   { 30156, 0x00008B88 }, /* GL_SHADER_SOURCE_LENGTH */
-   { 30180, 0x00008B4F }, /* GL_SHADER_TYPE */
-   { 30195, 0x00000B54 }, /* GL_SHADE_MODEL */
-   { 30210, 0x00008B8C }, /* GL_SHADING_LANGUAGE_VERSION */
-   { 30238, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */
-   { 30261, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */
-   { 30291, 0x00001601 }, /* GL_SHININESS */
-   { 30304, 0x00001402 }, /* GL_SHORT */
-   { 30313, 0x00008F9C }, /* GL_SIGNED_NORMALIZED */
-   { 30334, 0x000081F9 }, /* GL_SINGLE_COLOR */
-   { 30350, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */
-   { 30370, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */
-   { 30389, 0x00008C46 }, /* GL_SLUMINANCE */
-   { 30403, 0x00008C47 }, /* GL_SLUMINANCE8 */
-   { 30418, 0x00008C45 }, /* GL_SLUMINANCE8_ALPHA8 */
-   { 30440, 0x00008C44 }, /* GL_SLUMINANCE_ALPHA */
-   { 30460, 0x00001D01 }, /* GL_SMOOTH */
-   { 30470, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */
-   { 30503, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */
-   { 30530, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */
-   { 30563, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */
-   { 30590, 0x00008588 }, /* GL_SOURCE0_ALPHA */
-   { 30607, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */
-   { 30628, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */
-   { 30649, 0x00008580 }, /* GL_SOURCE0_RGB */
-   { 30664, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */
-   { 30683, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */
-   { 30702, 0x00008589 }, /* GL_SOURCE1_ALPHA */
-   { 30719, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */
-   { 30740, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */
-   { 30761, 0x00008581 }, /* GL_SOURCE1_RGB */
-   { 30776, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */
-   { 30795, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */
-   { 30814, 0x0000858A }, /* GL_SOURCE2_ALPHA */
-   { 30831, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */
-   { 30852, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */
-   { 30873, 0x00008582 }, /* GL_SOURCE2_RGB */
-   { 30888, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */
-   { 30907, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */
-   { 30926, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */
-   { 30946, 0x00008583 }, /* GL_SOURCE3_RGB_NV */
-   { 30964, 0x00001202 }, /* GL_SPECULAR */
-   { 30976, 0x00002402 }, /* GL_SPHERE_MAP */
-   { 30990, 0x00001206 }, /* GL_SPOT_CUTOFF */
-   { 31005, 0x00001204 }, /* GL_SPOT_DIRECTION */
-   { 31023, 0x00001205 }, /* GL_SPOT_EXPONENT */
-   { 31040, 0x00008588 }, /* GL_SRC0_ALPHA */
-   { 31054, 0x00008580 }, /* GL_SRC0_RGB */
-   { 31066, 0x00008589 }, /* GL_SRC1_ALPHA */
-   { 31080, 0x00008581 }, /* GL_SRC1_RGB */
-   { 31092, 0x0000858A }, /* GL_SRC2_ALPHA */
-   { 31106, 0x00008582 }, /* GL_SRC2_RGB */
-   { 31118, 0x00000302 }, /* GL_SRC_ALPHA */
-   { 31131, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */
-   { 31153, 0x00000300 }, /* GL_SRC_COLOR */
-   { 31166, 0x00008C40 }, /* GL_SRGB */
-   { 31174, 0x00008C41 }, /* GL_SRGB8 */
-   { 31183, 0x00008C43 }, /* GL_SRGB8_ALPHA8 */
-   { 31199, 0x00008C42 }, /* GL_SRGB_ALPHA */
-   { 31213, 0x00000503 }, /* GL_STACK_OVERFLOW */
-   { 31231, 0x00000504 }, /* GL_STACK_UNDERFLOW */
-   { 31250, 0x000088E6 }, /* GL_STATIC_COPY */
-   { 31265, 0x000088E6 }, /* GL_STATIC_COPY_ARB */
-   { 31284, 0x000088E4 }, /* GL_STATIC_DRAW */
-   { 31299, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */
-   { 31318, 0x000088E5 }, /* GL_STATIC_READ */
-   { 31333, 0x000088E5 }, /* GL_STATIC_READ_ARB */
-   { 31352, 0x00001802 }, /* GL_STENCIL */
-   { 31363, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT */
-   { 31385, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */
-   { 31411, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */
-   { 31432, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */
-   { 31457, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
-   { 31478, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */
-   { 31503, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-   { 31535, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */
-   { 31571, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
-   { 31603, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */
-   { 31639, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
-   { 31659, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
-   { 31686, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
-   { 31712, 0x00000D57 }, /* GL_STENCIL_BITS */
-   { 31728, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
-   { 31750, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
-   { 31773, 0x00000B94 }, /* GL_STENCIL_FAIL */
-   { 31789, 0x00000B92 }, /* GL_STENCIL_FUNC */
-   { 31805, 0x00001901 }, /* GL_STENCIL_INDEX */
-   { 31822, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
-   { 31845, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
-   { 31867, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
-   { 31889, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
-   { 31911, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
-   { 31932, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
-   { 31959, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
-   { 31986, 0x00000B97 }, /* GL_STENCIL_REF */
-   { 32001, 0x00000B90 }, /* GL_STENCIL_TEST */
-   { 32017, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
-   { 32046, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
-   { 32068, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
-   { 32089, 0x00000C33 }, /* GL_STEREO */
-   { 32099, 0x000088E2 }, /* GL_STREAM_COPY */
-   { 32114, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
-   { 32133, 0x000088E0 }, /* GL_STREAM_DRAW */
-   { 32148, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
-   { 32167, 0x000088E1 }, /* GL_STREAM_READ */
-   { 32182, 0x000088E1 }, /* GL_STREAM_READ_ARB */
-   { 32201, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
-   { 32218, 0x000084E7 }, /* GL_SUBTRACT */
-   { 32230, 0x000084E7 }, /* GL_SUBTRACT_ARB */
-   { 32246, 0x00002001 }, /* GL_T */
-   { 32251, 0x00002A2A }, /* GL_T2F_C3F_V3F */
-   { 32266, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
-   { 32285, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
-   { 32301, 0x00002A2B }, /* GL_T2F_N3F_V3F */
-   { 32316, 0x00002A27 }, /* GL_T2F_V3F */
-   { 32327, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
-   { 32346, 0x00002A28 }, /* GL_T4F_V4F */
-   { 32357, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
-   { 32380, 0x00001702 }, /* GL_TEXTURE */
-   { 32391, 0x000084C0 }, /* GL_TEXTURE0 */
-   { 32403, 0x000084C0 }, /* GL_TEXTURE0_ARB */
-   { 32419, 0x000084C1 }, /* GL_TEXTURE1 */
-   { 32431, 0x000084CA }, /* GL_TEXTURE10 */
-   { 32444, 0x000084CA }, /* GL_TEXTURE10_ARB */
-   { 32461, 0x000084CB }, /* GL_TEXTURE11 */
-   { 32474, 0x000084CB }, /* GL_TEXTURE11_ARB */
-   { 32491, 0x000084CC }, /* GL_TEXTURE12 */
-   { 32504, 0x000084CC }, /* GL_TEXTURE12_ARB */
-   { 32521, 0x000084CD }, /* GL_TEXTURE13 */
-   { 32534, 0x000084CD }, /* GL_TEXTURE13_ARB */
-   { 32551, 0x000084CE }, /* GL_TEXTURE14 */
-   { 32564, 0x000084CE }, /* GL_TEXTURE14_ARB */
-   { 32581, 0x000084CF }, /* GL_TEXTURE15 */
-   { 32594, 0x000084CF }, /* GL_TEXTURE15_ARB */
-   { 32611, 0x000084D0 }, /* GL_TEXTURE16 */
-   { 32624, 0x000084D0 }, /* GL_TEXTURE16_ARB */
-   { 32641, 0x000084D1 }, /* GL_TEXTURE17 */
-   { 32654, 0x000084D1 }, /* GL_TEXTURE17_ARB */
-   { 32671, 0x000084D2 }, /* GL_TEXTURE18 */
-   { 32684, 0x000084D2 }, /* GL_TEXTURE18_ARB */
-   { 32701, 0x000084D3 }, /* GL_TEXTURE19 */
-   { 32714, 0x000084D3 }, /* GL_TEXTURE19_ARB */
-   { 32731, 0x000084C1 }, /* GL_TEXTURE1_ARB */
-   { 32747, 0x000084C2 }, /* GL_TEXTURE2 */
-   { 32759, 0x000084D4 }, /* GL_TEXTURE20 */
-   { 32772, 0x000084D4 }, /* GL_TEXTURE20_ARB */
-   { 32789, 0x000084D5 }, /* GL_TEXTURE21 */
-   { 32802, 0x000084D5 }, /* GL_TEXTURE21_ARB */
-   { 32819, 0x000084D6 }, /* GL_TEXTURE22 */
-   { 32832, 0x000084D6 }, /* GL_TEXTURE22_ARB */
-   { 32849, 0x000084D7 }, /* GL_TEXTURE23 */
-   { 32862, 0x000084D7 }, /* GL_TEXTURE23_ARB */
-   { 32879, 0x000084D8 }, /* GL_TEXTURE24 */
-   { 32892, 0x000084D8 }, /* GL_TEXTURE24_ARB */
-   { 32909, 0x000084D9 }, /* GL_TEXTURE25 */
-   { 32922, 0x000084D9 }, /* GL_TEXTURE25_ARB */
-   { 32939, 0x000084DA }, /* GL_TEXTURE26 */
-   { 32952, 0x000084DA }, /* GL_TEXTURE26_ARB */
-   { 32969, 0x000084DB }, /* GL_TEXTURE27 */
-   { 32982, 0x000084DB }, /* GL_TEXTURE27_ARB */
-   { 32999, 0x000084DC }, /* GL_TEXTURE28 */
-   { 33012, 0x000084DC }, /* GL_TEXTURE28_ARB */
-   { 33029, 0x000084DD }, /* GL_TEXTURE29 */
-   { 33042, 0x000084DD }, /* GL_TEXTURE29_ARB */
-   { 33059, 0x000084C2 }, /* GL_TEXTURE2_ARB */
-   { 33075, 0x000084C3 }, /* GL_TEXTURE3 */
-   { 33087, 0x000084DE }, /* GL_TEXTURE30 */
-   { 33100, 0x000084DE }, /* GL_TEXTURE30_ARB */
-   { 33117, 0x000084DF }, /* GL_TEXTURE31 */
-   { 33130, 0x000084DF }, /* GL_TEXTURE31_ARB */
-   { 33147, 0x000084C3 }, /* GL_TEXTURE3_ARB */
-   { 33163, 0x000084C4 }, /* GL_TEXTURE4 */
-   { 33175, 0x000084C4 }, /* GL_TEXTURE4_ARB */
-   { 33191, 0x000084C5 }, /* GL_TEXTURE5 */
-   { 33203, 0x000084C5 }, /* GL_TEXTURE5_ARB */
-   { 33219, 0x000084C6 }, /* GL_TEXTURE6 */
-   { 33231, 0x000084C6 }, /* GL_TEXTURE6_ARB */
-   { 33247, 0x000084C7 }, /* GL_TEXTURE7 */
-   { 33259, 0x000084C7 }, /* GL_TEXTURE7_ARB */
-   { 33275, 0x000084C8 }, /* GL_TEXTURE8 */
-   { 33287, 0x000084C8 }, /* GL_TEXTURE8_ARB */
-   { 33303, 0x000084C9 }, /* GL_TEXTURE9 */
-   { 33315, 0x000084C9 }, /* GL_TEXTURE9_ARB */
-   { 33331, 0x00000DE0 }, /* GL_TEXTURE_1D */
-   { 33345, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
-   { 33369, 0x00000DE1 }, /* GL_TEXTURE_2D */
-   { 33383, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
-   { 33407, 0x0000806F }, /* GL_TEXTURE_3D */
-   { 33421, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
-   { 33443, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
-   { 33469, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
-   { 33491, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
-   { 33513, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
-   { 33545, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
-   { 33567, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
-   { 33599, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
-   { 33621, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
-   { 33649, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
-   { 33681, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
-   { 33714, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
-   { 33746, 0x00040000 }, /* GL_TEXTURE_BIT */
-   { 33761, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
-   { 33782, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
-   { 33807, 0x00001005 }, /* GL_TEXTURE_BORDER */
-   { 33825, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
-   { 33849, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-   { 33880, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
-   { 33910, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-   { 33940, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-   { 33975, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-   { 34006, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-   { 34044, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
-   { 34071, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
-   { 34103, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
-   { 34137, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
-   { 34161, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
-   { 34189, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
-   { 34213, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
-   { 34241, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-   { 34274, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
-   { 34298, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
-   { 34320, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
-   { 34342, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
-   { 34368, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
-   { 34402, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-   { 34435, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
-   { 34472, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
-   { 34500, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
-   { 34532, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
-   { 34555, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
-   { 34593, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
-   { 34635, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
-   { 34666, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-   { 34694, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
-   { 34724, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-   { 34752, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
-   { 34772, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
-   { 34796, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-   { 34827, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
-   { 34862, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-   { 34893, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
-   { 34928, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
-   { 34959, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
-   { 34994, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-   { 35025, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
-   { 35060, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-   { 35091, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
-   { 35126, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-   { 35157, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
-   { 35192, 0x00008071 }, /* GL_TEXTURE_DEPTH */
-   { 35209, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
-   { 35231, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
-   { 35257, 0x00002300 }, /* GL_TEXTURE_ENV */
-   { 35272, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
-   { 35293, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
-   { 35313, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
-   { 35339, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
-   { 35359, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
-   { 35376, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
-   { 35393, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
-   { 35410, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
-   { 35427, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
-   { 35452, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
-   { 35474, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
-   { 35500, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
-   { 35518, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
-   { 35544, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
-   { 35570, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
-   { 35600, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
-   { 35627, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
-   { 35652, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
-   { 35672, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
-   { 35696, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
-   { 35723, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-   { 35750, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-   { 35777, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
-   { 35803, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
-   { 35833, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
-   { 35855, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
-   { 35873, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
-   { 35903, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
-   { 35931, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-   { 35959, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-   { 35987, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
-   { 36008, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
-   { 36027, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
-   { 36049, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
-   { 36068, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
-   { 36088, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
-   { 36113, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
-   { 36137, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
-   { 36157, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
-   { 36181, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
-   { 36201, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
-   { 36224, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */
-   { 36248, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
-   { 36273, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
-   { 36307, 0x00001000 }, /* GL_TEXTURE_WIDTH */
-   { 36324, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
-   { 36342, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
-   { 36360, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
-   { 36378, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
-   { 36398, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
-   { 36417, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-   { 36446, 0x00001000 }, /* GL_TRANSFORM_BIT */
-   { 36463, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
-   { 36489, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
-   { 36519, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-   { 36551, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-   { 36581, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
-   { 36615, 0x0000862C }, /* GL_TRANSPOSE_NV */
-   { 36631, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-   { 36662, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
-   { 36697, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-   { 36725, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
-   { 36757, 0x00000004 }, /* GL_TRIANGLES */
-   { 36770, 0x00000006 }, /* GL_TRIANGLE_FAN */
-   { 36786, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
-   { 36807, 0x00000005 }, /* GL_TRIANGLE_STRIP */
-   { 36825, 0x00000001 }, /* GL_TRUE */
-   { 36833, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
-   { 36853, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
-   { 36876, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
-   { 36896, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
-   { 36917, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
-   { 36939, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
-   { 36961, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
-   { 36981, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
-   { 37002, 0x00001401 }, /* GL_UNSIGNED_BYTE */
-   { 37019, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-   { 37046, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
-   { 37069, 0x00001405 }, /* GL_UNSIGNED_INT */
-   { 37085, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
-   { 37112, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */
-   { 37133, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
-   { 37157, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-   { 37188, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
-   { 37212, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-   { 37240, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */
-   { 37263, 0x00001403 }, /* GL_UNSIGNED_SHORT */
-   { 37281, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-   { 37311, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-   { 37337, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-   { 37367, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-   { 37393, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
-   { 37417, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-   { 37445, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-   { 37473, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
-   { 37500, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-   { 37532, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
-   { 37563, 0x00008CA2 }, /* GL_UPPER_LEFT */
-   { 37577, 0x00002A20 }, /* GL_V2F */
-   { 37584, 0x00002A21 }, /* GL_V3F */
-   { 37591, 0x00008B83 }, /* GL_VALIDATE_STATUS */
-   { 37610, 0x00001F00 }, /* GL_VENDOR */
-   { 37620, 0x00001F02 }, /* GL_VERSION */
-   { 37631, 0x00008074 }, /* GL_VERTEX_ARRAY */
-   { 37647, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
-   { 37677, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-   { 37708, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
-   { 37743, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
-   { 37767, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
-   { 37788, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
-   { 37811, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
-   { 37832, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-   { 37859, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-   { 37887, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-   { 37915, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-   { 37943, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-   { 37971, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-   { 37999, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
-   { 38027, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-   { 38054, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-   { 38081, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-   { 38108, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-   { 38135, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-   { 38162, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-   { 38189, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-   { 38216, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-   { 38243, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-   { 38270, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-   { 38308, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
-   { 38350, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-   { 38381, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
-   { 38416, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
-   { 38450, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
-   { 38488, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-   { 38519, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
-   { 38554, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-   { 38582, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
-   { 38614, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-   { 38644, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
-   { 38678, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
-   { 38706, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
-   { 38738, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
-   { 38758, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
-   { 38780, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
-   { 38809, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
-   { 38830, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-   { 38859, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
-   { 38892, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
-   { 38924, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-   { 38951, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
-   { 38982, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
-   { 39012, 0x00008B31 }, /* GL_VERTEX_SHADER */
-   { 39029, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
-   { 39050, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
-   { 39077, 0x00000BA2 }, /* GL_VIEWPORT */
-   { 39089, 0x00000800 }, /* GL_VIEWPORT_BIT */
-   { 39105, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
-   { 39125, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-   { 39156, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
-   { 39191, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-   { 39219, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-   { 39244, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-   { 39271, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-   { 39296, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
-   { 39320, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
-   { 39339, 0x000088B9 }, /* GL_WRITE_ONLY */
-   { 39353, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
-   { 39371, 0x00001506 }, /* GL_XOR */
-   { 39378, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
-   { 39397, 0x00008757 }, /* GL_YCBCR_MESA */
-   { 39411, 0x00000000 }, /* GL_ZERO */
-   { 39419, 0x00000D16 }, /* GL_ZOOM_X */
-   { 39429, 0x00000D17 }, /* GL_ZOOM_Y */
+   { 16357, 0x00000010 }, /* GL_MAP_FLUSH_EXPLICIT_BIT */
+   { 16383, 0x00000008 }, /* GL_MAP_INVALIDATE_BUFFER_BIT */
+   { 16412, 0x00000004 }, /* GL_MAP_INVALIDATE_RANGE_BIT */
+   { 16440, 0x00000001 }, /* GL_MAP_READ_BIT */
+   { 16456, 0x00000D11 }, /* GL_MAP_STENCIL */
+   { 16471, 0x00000020 }, /* GL_MAP_UNSYNCHRONIZED_BIT */
+   { 16497, 0x00000002 }, /* GL_MAP_WRITE_BIT */
+   { 16514, 0x000088C0 }, /* GL_MATRIX0_ARB */
+   { 16529, 0x00008630 }, /* GL_MATRIX0_NV */
+   { 16543, 0x000088CA }, /* GL_MATRIX10_ARB */
+   { 16559, 0x000088CB }, /* GL_MATRIX11_ARB */
+   { 16575, 0x000088CC }, /* GL_MATRIX12_ARB */
+   { 16591, 0x000088CD }, /* GL_MATRIX13_ARB */
+   { 16607, 0x000088CE }, /* GL_MATRIX14_ARB */
+   { 16623, 0x000088CF }, /* GL_MATRIX15_ARB */
+   { 16639, 0x000088D0 }, /* GL_MATRIX16_ARB */
+   { 16655, 0x000088D1 }, /* GL_MATRIX17_ARB */
+   { 16671, 0x000088D2 }, /* GL_MATRIX18_ARB */
+   { 16687, 0x000088D3 }, /* GL_MATRIX19_ARB */
+   { 16703, 0x000088C1 }, /* GL_MATRIX1_ARB */
+   { 16718, 0x00008631 }, /* GL_MATRIX1_NV */
+   { 16732, 0x000088D4 }, /* GL_MATRIX20_ARB */
+   { 16748, 0x000088D5 }, /* GL_MATRIX21_ARB */
+   { 16764, 0x000088D6 }, /* GL_MATRIX22_ARB */
+   { 16780, 0x000088D7 }, /* GL_MATRIX23_ARB */
+   { 16796, 0x000088D8 }, /* GL_MATRIX24_ARB */
+   { 16812, 0x000088D9 }, /* GL_MATRIX25_ARB */
+   { 16828, 0x000088DA }, /* GL_MATRIX26_ARB */
+   { 16844, 0x000088DB }, /* GL_MATRIX27_ARB */
+   { 16860, 0x000088DC }, /* GL_MATRIX28_ARB */
+   { 16876, 0x000088DD }, /* GL_MATRIX29_ARB */
+   { 16892, 0x000088C2 }, /* GL_MATRIX2_ARB */
+   { 16907, 0x00008632 }, /* GL_MATRIX2_NV */
+   { 16921, 0x000088DE }, /* GL_MATRIX30_ARB */
+   { 16937, 0x000088DF }, /* GL_MATRIX31_ARB */
+   { 16953, 0x000088C3 }, /* GL_MATRIX3_ARB */
+   { 16968, 0x00008633 }, /* GL_MATRIX3_NV */
+   { 16982, 0x000088C4 }, /* GL_MATRIX4_ARB */
+   { 16997, 0x00008634 }, /* GL_MATRIX4_NV */
+   { 17011, 0x000088C5 }, /* GL_MATRIX5_ARB */
+   { 17026, 0x00008635 }, /* GL_MATRIX5_NV */
+   { 17040, 0x000088C6 }, /* GL_MATRIX6_ARB */
+   { 17055, 0x00008636 }, /* GL_MATRIX6_NV */
+   { 17069, 0x000088C7 }, /* GL_MATRIX7_ARB */
+   { 17084, 0x00008637 }, /* GL_MATRIX7_NV */
+   { 17098, 0x000088C8 }, /* GL_MATRIX8_ARB */
+   { 17113, 0x000088C9 }, /* GL_MATRIX9_ARB */
+   { 17128, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_ARB */
+   { 17154, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
+   { 17188, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
+   { 17219, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
+   { 17252, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
+   { 17283, 0x00000BA0 }, /* GL_MATRIX_MODE */
+   { 17298, 0x00008840 }, /* GL_MATRIX_PALETTE_ARB */
+   { 17320, 0x00008008 }, /* GL_MAX */
+   { 17327, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE */
+   { 17350, 0x000088FF }, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
+   { 17382, 0x00000D35 }, /* GL_MAX_ATTRIB_STACK_DEPTH */
+   { 17408, 0x00000D3B }, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
+   { 17441, 0x00008177 }, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
+   { 17467, 0x00008178 }, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+   { 17501, 0x00000D32 }, /* GL_MAX_CLIP_PLANES */
+   { 17520, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
+   { 17549, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
+   { 17581, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI */
+   { 17617, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
+   { 17653, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB */
+   { 17693, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT */
+   { 17719, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT_EXT */
+   { 17749, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH */
+   { 17774, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH_EXT */
+   { 17803, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
+   { 17832, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB */
+   { 17865, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS */
+   { 17885, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ARB */
+   { 17909, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ATI */
+   { 17933, 0x000080E9 }, /* GL_MAX_ELEMENTS_INDICES */
+   { 17957, 0x000080E8 }, /* GL_MAX_ELEMENTS_VERTICES */
+   { 17982, 0x00000D30 }, /* GL_MAX_EVAL_ORDER */
+   { 18000, 0x00008008 }, /* GL_MAX_EXT */
+   { 18011, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
+   { 18046, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB */
+   { 18085, 0x00000D31 }, /* GL_MAX_LIGHTS */
+   { 18099, 0x00000B31 }, /* GL_MAX_LIST_NESTING */
+   { 18119, 0x00008841 }, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
+   { 18157, 0x00000D36 }, /* GL_MAX_MODELVIEW_STACK_DEPTH */
+   { 18186, 0x00000D37 }, /* GL_MAX_NAME_STACK_DEPTH */
+   { 18210, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_ARB */
+   { 18238, 0x00000D34 }, /* GL_MAX_PIXEL_MAP_TABLE */
+   { 18261, 0x000088B1 }, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
+   { 18298, 0x0000880B }, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
+   { 18334, 0x000088AD }, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
+   { 18361, 0x000088F5 }, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
+   { 18390, 0x000088B5 }, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
+   { 18424, 0x000088F4 }, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
+   { 18460, 0x000088F6 }, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
+   { 18487, 0x000088A1 }, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
+   { 18519, 0x000088B4 }, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
+   { 18555, 0x000088F8 }, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
+   { 18584, 0x000088F7 }, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
+   { 18613, 0x0000862F }, /* GL_MAX_PROGRAM_MATRICES_ARB */
+   { 18641, 0x0000862E }, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
+   { 18679, 0x000088B3 }, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+   { 18723, 0x0000880E }, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+   { 18766, 0x000088AF }, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
+   { 18800, 0x000088A3 }, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+   { 18839, 0x000088AB }, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
+   { 18876, 0x000088A7 }, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
+   { 18914, 0x00008810 }, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+   { 18957, 0x0000880F }, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+   { 19000, 0x000088A9 }, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
+   { 19030, 0x000088A5 }, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
+   { 19061, 0x0000880D }, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
+   { 19097, 0x0000880C }, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
+   { 19133, 0x00000D38 }, /* GL_MAX_PROJECTION_STACK_DEPTH */
+   { 19163, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
+   { 19197, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_NV */
+   { 19230, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
+   { 19259, 0x00008D57 }, /* GL_MAX_SAMPLES */
+   { 19274, 0x00008504 }, /* GL_MAX_SHININESS_NV */
+   { 19294, 0x00008505 }, /* GL_MAX_SPOT_EXPONENT_NV */
+   { 19318, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS */
+   { 19340, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS_ARB */
+   { 19366, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS */
+   { 19393, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS_ARB */
+   { 19424, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS */
+   { 19448, 0x000084FF }, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
+   { 19482, 0x00000D33 }, /* GL_MAX_TEXTURE_SIZE */
+   { 19502, 0x00000D39 }, /* GL_MAX_TEXTURE_STACK_DEPTH */
+   { 19529, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS */
+   { 19550, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS_ARB */
+   { 19575, 0x0000862F }, /* GL_MAX_TRACK_MATRICES_NV */
+   { 19600, 0x0000862E }, /* GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */
+   { 19635, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS */
+   { 19657, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS_ARB */
+   { 19683, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS */
+   { 19705, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS_ARB */
+   { 19731, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
+   { 19765, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
+   { 19803, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
+   { 19836, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB */
+   { 19873, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_ARB */
+   { 19897, 0x00000D3A }, /* GL_MAX_VIEWPORT_DIMS */
+   { 19918, 0x00008007 }, /* GL_MIN */
+   { 19925, 0x0000802E }, /* GL_MINMAX */
+   { 19935, 0x0000802E }, /* GL_MINMAX_EXT */
+   { 19949, 0x0000802F }, /* GL_MINMAX_FORMAT */
+   { 19966, 0x0000802F }, /* GL_MINMAX_FORMAT_EXT */
+   { 19987, 0x00008030 }, /* GL_MINMAX_SINK */
+   { 20002, 0x00008030 }, /* GL_MINMAX_SINK_EXT */
+   { 20021, 0x00008007 }, /* GL_MIN_EXT */
+   { 20032, 0x00008370 }, /* GL_MIRRORED_REPEAT */
+   { 20051, 0x00008370 }, /* GL_MIRRORED_REPEAT_ARB */
+   { 20074, 0x00008370 }, /* GL_MIRRORED_REPEAT_IBM */
+   { 20097, 0x00008742 }, /* GL_MIRROR_CLAMP_ATI */
+   { 20117, 0x00008742 }, /* GL_MIRROR_CLAMP_EXT */
+   { 20137, 0x00008912 }, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
+   { 20167, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_ATI */
+   { 20195, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
+   { 20223, 0x00001700 }, /* GL_MODELVIEW */
+   { 20236, 0x00001700 }, /* GL_MODELVIEW0_ARB */
+   { 20254, 0x0000872A }, /* GL_MODELVIEW10_ARB */
+   { 20273, 0x0000872B }, /* GL_MODELVIEW11_ARB */
+   { 20292, 0x0000872C }, /* GL_MODELVIEW12_ARB */
+   { 20311, 0x0000872D }, /* GL_MODELVIEW13_ARB */
+   { 20330, 0x0000872E }, /* GL_MODELVIEW14_ARB */
+   { 20349, 0x0000872F }, /* GL_MODELVIEW15_ARB */
+   { 20368, 0x00008730 }, /* GL_MODELVIEW16_ARB */
+   { 20387, 0x00008731 }, /* GL_MODELVIEW17_ARB */
+   { 20406, 0x00008732 }, /* GL_MODELVIEW18_ARB */
+   { 20425, 0x00008733 }, /* GL_MODELVIEW19_ARB */
+   { 20444, 0x0000850A }, /* GL_MODELVIEW1_ARB */
+   { 20462, 0x00008734 }, /* GL_MODELVIEW20_ARB */
+   { 20481, 0x00008735 }, /* GL_MODELVIEW21_ARB */
+   { 20500, 0x00008736 }, /* GL_MODELVIEW22_ARB */
+   { 20519, 0x00008737 }, /* GL_MODELVIEW23_ARB */
+   { 20538, 0x00008738 }, /* GL_MODELVIEW24_ARB */
+   { 20557, 0x00008739 }, /* GL_MODELVIEW25_ARB */
+   { 20576, 0x0000873A }, /* GL_MODELVIEW26_ARB */
+   { 20595, 0x0000873B }, /* GL_MODELVIEW27_ARB */
+   { 20614, 0x0000873C }, /* GL_MODELVIEW28_ARB */
+   { 20633, 0x0000873D }, /* GL_MODELVIEW29_ARB */
+   { 20652, 0x00008722 }, /* GL_MODELVIEW2_ARB */
+   { 20670, 0x0000873E }, /* GL_MODELVIEW30_ARB */
+   { 20689, 0x0000873F }, /* GL_MODELVIEW31_ARB */
+   { 20708, 0x00008723 }, /* GL_MODELVIEW3_ARB */
+   { 20726, 0x00008724 }, /* GL_MODELVIEW4_ARB */
+   { 20744, 0x00008725 }, /* GL_MODELVIEW5_ARB */
+   { 20762, 0x00008726 }, /* GL_MODELVIEW6_ARB */
+   { 20780, 0x00008727 }, /* GL_MODELVIEW7_ARB */
+   { 20798, 0x00008728 }, /* GL_MODELVIEW8_ARB */
+   { 20816, 0x00008729 }, /* GL_MODELVIEW9_ARB */
+   { 20834, 0x00000BA6 }, /* GL_MODELVIEW_MATRIX */
+   { 20854, 0x00008629 }, /* GL_MODELVIEW_PROJECTION_NV */
+   { 20881, 0x00000BA3 }, /* GL_MODELVIEW_STACK_DEPTH */
+   { 20906, 0x00002100 }, /* GL_MODULATE */
+   { 20918, 0x00008744 }, /* GL_MODULATE_ADD_ATI */
+   { 20938, 0x00008745 }, /* GL_MODULATE_SIGNED_ADD_ATI */
+   { 20965, 0x00008746 }, /* GL_MODULATE_SUBTRACT_ATI */
+   { 20990, 0x00000103 }, /* GL_MULT */
+   { 20998, 0x0000809D }, /* GL_MULTISAMPLE */
+   { 21013, 0x000086B2 }, /* GL_MULTISAMPLE_3DFX */
+   { 21033, 0x0000809D }, /* GL_MULTISAMPLE_ARB */
+   { 21052, 0x20000000 }, /* GL_MULTISAMPLE_BIT */
+   { 21071, 0x20000000 }, /* GL_MULTISAMPLE_BIT_3DFX */
+   { 21095, 0x20000000 }, /* GL_MULTISAMPLE_BIT_ARB */
+   { 21118, 0x00008534 }, /* GL_MULTISAMPLE_FILTER_HINT_NV */
+   { 21148, 0x00002A25 }, /* GL_N3F_V3F */
+   { 21159, 0x00000D70 }, /* GL_NAME_STACK_DEPTH */
+   { 21179, 0x0000150E }, /* GL_NAND */
+   { 21187, 0x00002600 }, /* GL_NEAREST */
+   { 21198, 0x0000844E }, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
+   { 21229, 0x0000844D }, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
+   { 21261, 0x00002702 }, /* GL_NEAREST_MIPMAP_LINEAR */
+   { 21286, 0x00002700 }, /* GL_NEAREST_MIPMAP_NEAREST */
+   { 21312, 0x00000200 }, /* GL_NEVER */
+   { 21321, 0x00001102 }, /* GL_NICEST */
+   { 21331, 0x00000000 }, /* GL_NONE */
+   { 21339, 0x00001505 }, /* GL_NOOP */
+   { 21347, 0x00001508 }, /* GL_NOR */
+   { 21354, 0x00000BA1 }, /* GL_NORMALIZE */
+   { 21367, 0x00008075 }, /* GL_NORMAL_ARRAY */
+   { 21383, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
+   { 21414, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING_ARB */
+   { 21449, 0x0000808F }, /* GL_NORMAL_ARRAY_POINTER */
+   { 21473, 0x0000807F }, /* GL_NORMAL_ARRAY_STRIDE */
+   { 21496, 0x0000807E }, /* GL_NORMAL_ARRAY_TYPE */
+   { 21517, 0x00008511 }, /* GL_NORMAL_MAP */
+   { 21531, 0x00008511 }, /* GL_NORMAL_MAP_ARB */
+   { 21549, 0x00008511 }, /* GL_NORMAL_MAP_NV */
+   { 21566, 0x00000205 }, /* GL_NOTEQUAL */
+   { 21578, 0x00000000 }, /* GL_NO_ERROR */
+   { 21590, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
+   { 21624, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB */
+   { 21662, 0x00008B89 }, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */
+   { 21694, 0x00008B8A }, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */
+   { 21736, 0x00008B86 }, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */
+   { 21766, 0x00008B87 }, /* GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB */
+   { 21806, 0x00008B85 }, /* GL_OBJECT_ATTACHED_OBJECTS_ARB */
+   { 21837, 0x00008B81 }, /* GL_OBJECT_COMPILE_STATUS_ARB */
+   { 21866, 0x00008B80 }, /* GL_OBJECT_DELETE_STATUS_ARB */
+   { 21894, 0x00008B84 }, /* GL_OBJECT_INFO_LOG_LENGTH_ARB */
+   { 21924, 0x00002401 }, /* GL_OBJECT_LINEAR */
+   { 21941, 0x00008B82 }, /* GL_OBJECT_LINK_STATUS_ARB */
+   { 21967, 0x00002501 }, /* GL_OBJECT_PLANE */
+   { 21983, 0x00008B88 }, /* GL_OBJECT_SHADER_SOURCE_LENGTH_ARB */
+   { 22018, 0x00008B4F }, /* GL_OBJECT_SUBTYPE_ARB */
+   { 22040, 0x00008B4E }, /* GL_OBJECT_TYPE_ARB */
+   { 22059, 0x00008B83 }, /* GL_OBJECT_VALIDATE_STATUS_ARB */
+   { 22089, 0x00008165 }, /* GL_OCCLUSION_TEST_HP */
+   { 22110, 0x00008166 }, /* GL_OCCLUSION_TEST_RESULT_HP */
+   { 22138, 0x00000001 }, /* GL_ONE */
+   { 22145, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA */
+   { 22173, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA_EXT */
+   { 22205, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR */
+   { 22233, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR_EXT */
+   { 22265, 0x00000305 }, /* GL_ONE_MINUS_DST_ALPHA */
+   { 22288, 0x00000307 }, /* GL_ONE_MINUS_DST_COLOR */
+   { 22311, 0x00000303 }, /* GL_ONE_MINUS_SRC_ALPHA */
+   { 22334, 0x00000301 }, /* GL_ONE_MINUS_SRC_COLOR */
+   { 22357, 0x00008598 }, /* GL_OPERAND0_ALPHA */
+   { 22375, 0x00008598 }, /* GL_OPERAND0_ALPHA_ARB */
+   { 22397, 0x00008598 }, /* GL_OPERAND0_ALPHA_EXT */
+   { 22419, 0x00008590 }, /* GL_OPERAND0_RGB */
+   { 22435, 0x00008590 }, /* GL_OPERAND0_RGB_ARB */
+   { 22455, 0x00008590 }, /* GL_OPERAND0_RGB_EXT */
+   { 22475, 0x00008599 }, /* GL_OPERAND1_ALPHA */
+   { 22493, 0x00008599 }, /* GL_OPERAND1_ALPHA_ARB */
+   { 22515, 0x00008599 }, /* GL_OPERAND1_ALPHA_EXT */
+   { 22537, 0x00008591 }, /* GL_OPERAND1_RGB */
+   { 22553, 0x00008591 }, /* GL_OPERAND1_RGB_ARB */
+   { 22573, 0x00008591 }, /* GL_OPERAND1_RGB_EXT */
+   { 22593, 0x0000859A }, /* GL_OPERAND2_ALPHA */
+   { 22611, 0x0000859A }, /* GL_OPERAND2_ALPHA_ARB */
+   { 22633, 0x0000859A }, /* GL_OPERAND2_ALPHA_EXT */
+   { 22655, 0x00008592 }, /* GL_OPERAND2_RGB */
+   { 22671, 0x00008592 }, /* GL_OPERAND2_RGB_ARB */
+   { 22691, 0x00008592 }, /* GL_OPERAND2_RGB_EXT */
+   { 22711, 0x0000859B }, /* GL_OPERAND3_ALPHA_NV */
+   { 22732, 0x00008593 }, /* GL_OPERAND3_RGB_NV */
+   { 22751, 0x00001507 }, /* GL_OR */
+   { 22757, 0x00000A01 }, /* GL_ORDER */
+   { 22766, 0x0000150D }, /* GL_OR_INVERTED */
+   { 22781, 0x0000150B }, /* GL_OR_REVERSE */
+   { 22795, 0x00000505 }, /* GL_OUT_OF_MEMORY */
+   { 22812, 0x00000D05 }, /* GL_PACK_ALIGNMENT */
+   { 22830, 0x0000806C }, /* GL_PACK_IMAGE_HEIGHT */
+   { 22851, 0x00008758 }, /* GL_PACK_INVERT_MESA */
+   { 22871, 0x00000D01 }, /* GL_PACK_LSB_FIRST */
+   { 22889, 0x00000D02 }, /* GL_PACK_ROW_LENGTH */
+   { 22908, 0x0000806B }, /* GL_PACK_SKIP_IMAGES */
+   { 22928, 0x00000D04 }, /* GL_PACK_SKIP_PIXELS */
+   { 22948, 0x00000D03 }, /* GL_PACK_SKIP_ROWS */
+   { 22966, 0x00000D00 }, /* GL_PACK_SWAP_BYTES */
+   { 22985, 0x00008B92 }, /* GL_PALETTE4_R5_G6_B5_OES */
+   { 23010, 0x00008B94 }, /* GL_PALETTE4_RGB5_A1_OES */
+   { 23034, 0x00008B90 }, /* GL_PALETTE4_RGB8_OES */
+   { 23055, 0x00008B93 }, /* GL_PALETTE4_RGBA4_OES */
+   { 23077, 0x00008B91 }, /* GL_PALETTE4_RGBA8_OES */
+   { 23099, 0x00008B97 }, /* GL_PALETTE8_R5_G6_B5_OES */
+   { 23124, 0x00008B99 }, /* GL_PALETTE8_RGB5_A1_OES */
+   { 23148, 0x00008B95 }, /* GL_PALETTE8_RGB8_OES */
+   { 23169, 0x00008B98 }, /* GL_PALETTE8_RGBA4_OES */
+   { 23191, 0x00008B96 }, /* GL_PALETTE8_RGBA8_OES */
+   { 23213, 0x00000700 }, /* GL_PASS_THROUGH_TOKEN */
+   { 23235, 0x00000C50 }, /* GL_PERSPECTIVE_CORRECTION_HINT */
+   { 23266, 0x00000C79 }, /* GL_PIXEL_MAP_A_TO_A */
+   { 23286, 0x00000CB9 }, /* GL_PIXEL_MAP_A_TO_A_SIZE */
+   { 23311, 0x00000C78 }, /* GL_PIXEL_MAP_B_TO_B */
+   { 23331, 0x00000CB8 }, /* GL_PIXEL_MAP_B_TO_B_SIZE */
+   { 23356, 0x00000C77 }, /* GL_PIXEL_MAP_G_TO_G */
+   { 23376, 0x00000CB7 }, /* GL_PIXEL_MAP_G_TO_G_SIZE */
+   { 23401, 0x00000C75 }, /* GL_PIXEL_MAP_I_TO_A */
+   { 23421, 0x00000CB5 }, /* GL_PIXEL_MAP_I_TO_A_SIZE */
+   { 23446, 0x00000C74 }, /* GL_PIXEL_MAP_I_TO_B */
+   { 23466, 0x00000CB4 }, /* GL_PIXEL_MAP_I_TO_B_SIZE */
+   { 23491, 0x00000C73 }, /* GL_PIXEL_MAP_I_TO_G */
+   { 23511, 0x00000CB3 }, /* GL_PIXEL_MAP_I_TO_G_SIZE */
+   { 23536, 0x00000C70 }, /* GL_PIXEL_MAP_I_TO_I */
+   { 23556, 0x00000CB0 }, /* GL_PIXEL_MAP_I_TO_I_SIZE */
+   { 23581, 0x00000C72 }, /* GL_PIXEL_MAP_I_TO_R */
+   { 23601, 0x00000CB2 }, /* GL_PIXEL_MAP_I_TO_R_SIZE */
+   { 23626, 0x00000C76 }, /* GL_PIXEL_MAP_R_TO_R */
+   { 23646, 0x00000CB6 }, /* GL_PIXEL_MAP_R_TO_R_SIZE */
+   { 23671, 0x00000C71 }, /* GL_PIXEL_MAP_S_TO_S */
+   { 23691, 0x00000CB1 }, /* GL_PIXEL_MAP_S_TO_S_SIZE */
+   { 23716, 0x00000020 }, /* GL_PIXEL_MODE_BIT */
+   { 23734, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER */
+   { 23755, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING */
+   { 23784, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING_EXT */
+   { 23817, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER_EXT */
+   { 23842, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER */
+   { 23865, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
+   { 23896, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING_EXT */
+   { 23931, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER_EXT */
+   { 23958, 0x00001B00 }, /* GL_POINT */
+   { 23967, 0x00000000 }, /* GL_POINTS */
+   { 23977, 0x00000002 }, /* GL_POINT_BIT */
+   { 23990, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION */
+   { 24020, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_ARB */
+   { 24054, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_EXT */
+   { 24088, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_SGIS */
+   { 24123, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE */
+   { 24152, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_ARB */
+   { 24185, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_EXT */
+   { 24218, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_SGIS */
+   { 24252, 0x00000B11 }, /* GL_POINT_SIZE */
+   { 24266, 0x00000B13 }, /* GL_POINT_SIZE_GRANULARITY */
+   { 24292, 0x00008127 }, /* GL_POINT_SIZE_MAX */
+   { 24310, 0x00008127 }, /* GL_POINT_SIZE_MAX_ARB */
+   { 24332, 0x00008127 }, /* GL_POINT_SIZE_MAX_EXT */
+   { 24354, 0x00008127 }, /* GL_POINT_SIZE_MAX_SGIS */
+   { 24377, 0x00008126 }, /* GL_POINT_SIZE_MIN */
+   { 24395, 0x00008126 }, /* GL_POINT_SIZE_MIN_ARB */
+   { 24417, 0x00008126 }, /* GL_POINT_SIZE_MIN_EXT */
+   { 24439, 0x00008126 }, /* GL_POINT_SIZE_MIN_SGIS */
+   { 24462, 0x00000B12 }, /* GL_POINT_SIZE_RANGE */
+   { 24482, 0x00000B10 }, /* GL_POINT_SMOOTH */
+   { 24498, 0x00000C51 }, /* GL_POINT_SMOOTH_HINT */
+   { 24519, 0x00008861 }, /* GL_POINT_SPRITE */
+   { 24535, 0x00008861 }, /* GL_POINT_SPRITE_ARB */
+   { 24555, 0x00008CA0 }, /* GL_POINT_SPRITE_COORD_ORIGIN */
+   { 24584, 0x00008861 }, /* GL_POINT_SPRITE_NV */
+   { 24603, 0x00008863 }, /* GL_POINT_SPRITE_R_MODE_NV */
+   { 24629, 0x00000701 }, /* GL_POINT_TOKEN */
+   { 24644, 0x00000009 }, /* GL_POLYGON */
+   { 24655, 0x00000008 }, /* GL_POLYGON_BIT */
+   { 24670, 0x00000B40 }, /* GL_POLYGON_MODE */
+   { 24686, 0x00008039 }, /* GL_POLYGON_OFFSET_BIAS */
+   { 24709, 0x00008038 }, /* GL_POLYGON_OFFSET_FACTOR */
+   { 24734, 0x00008037 }, /* GL_POLYGON_OFFSET_FILL */
+   { 24757, 0x00002A02 }, /* GL_POLYGON_OFFSET_LINE */
+   { 24780, 0x00002A01 }, /* GL_POLYGON_OFFSET_POINT */
+   { 24804, 0x00002A00 }, /* GL_POLYGON_OFFSET_UNITS */
+   { 24828, 0x00000B41 }, /* GL_POLYGON_SMOOTH */
+   { 24846, 0x00000C53 }, /* GL_POLYGON_SMOOTH_HINT */
+   { 24869, 0x00000B42 }, /* GL_POLYGON_STIPPLE */
+   { 24888, 0x00000010 }, /* GL_POLYGON_STIPPLE_BIT */
+   { 24911, 0x00000703 }, /* GL_POLYGON_TOKEN */
+   { 24928, 0x00001203 }, /* GL_POSITION */
+   { 24940, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
+   { 24972, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI */
+   { 25008, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
+   { 25041, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI */
+   { 25078, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
+   { 25109, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI */
+   { 25144, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
+   { 25176, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI */
+   { 25212, 0x000080D2 }, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
+   { 25245, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
+   { 25277, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI */
+   { 25313, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
+   { 25346, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI */
+   { 25383, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS */
+   { 25413, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS_SGI */
+   { 25447, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE */
+   { 25478, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE_SGI */
+   { 25513, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
+   { 25544, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS_EXT */
+   { 25579, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
+   { 25611, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE_EXT */
+   { 25647, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS */
+   { 25677, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS_EXT */
+   { 25711, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE */
+   { 25742, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE_EXT */
+   { 25777, 0x000080D1 }, /* GL_POST_CONVOLUTION_COLOR_TABLE */
+   { 25809, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS */
+   { 25840, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS_EXT */
+   { 25875, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE */
+   { 25907, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE_EXT */
+   { 25943, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS */
+   { 25972, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS_EXT */
+   { 26005, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE */
+   { 26035, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE_EXT */
+   { 26069, 0x0000817B }, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
+   { 26108, 0x00008179 }, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
+   { 26141, 0x0000817C }, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
+   { 26181, 0x0000817A }, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
+   { 26215, 0x00008578 }, /* GL_PREVIOUS */
+   { 26227, 0x00008578 }, /* GL_PREVIOUS_ARB */
+   { 26243, 0x00008578 }, /* GL_PREVIOUS_EXT */
+   { 26259, 0x00008577 }, /* GL_PRIMARY_COLOR */
+   { 26276, 0x00008577 }, /* GL_PRIMARY_COLOR_ARB */
+   { 26297, 0x00008577 }, /* GL_PRIMARY_COLOR_EXT */
+   { 26318, 0x000088B0 }, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
+   { 26351, 0x00008805 }, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
+   { 26383, 0x000088AC }, /* GL_PROGRAM_ATTRIBS_ARB */
+   { 26406, 0x00008677 }, /* GL_PROGRAM_BINDING_ARB */
+   { 26429, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_ARB */
+   { 26459, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_NV */
+   { 26488, 0x00008874 }, /* GL_PROGRAM_ERROR_STRING_ARB */
+   { 26516, 0x00008876 }, /* GL_PROGRAM_FORMAT_ARB */
+   { 26538, 0x00008875 }, /* GL_PROGRAM_FORMAT_ASCII_ARB */
+   { 26566, 0x000088A0 }, /* GL_PROGRAM_INSTRUCTIONS_ARB */
+   { 26594, 0x00008627 }, /* GL_PROGRAM_LENGTH_ARB */
+   { 26616, 0x00008627 }, /* GL_PROGRAM_LENGTH_NV */
+   { 26637, 0x000088B2 }, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+   { 26677, 0x00008808 }, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+   { 26716, 0x000088AE }, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
+   { 26746, 0x000088A2 }, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+   { 26781, 0x000088AA }, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
+   { 26814, 0x000088A6 }, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
+   { 26848, 0x0000880A }, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+   { 26887, 0x00008809 }, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+   { 26926, 0x00008B40 }, /* GL_PROGRAM_OBJECT_ARB */
+   { 26948, 0x000088A8 }, /* GL_PROGRAM_PARAMETERS_ARB */
+   { 26974, 0x00008644 }, /* GL_PROGRAM_PARAMETER_NV */
+   { 26998, 0x00008647 }, /* GL_PROGRAM_RESIDENT_NV */
+   { 27021, 0x00008628 }, /* GL_PROGRAM_STRING_ARB */
+   { 27043, 0x00008628 }, /* GL_PROGRAM_STRING_NV */
+   { 27064, 0x00008646 }, /* GL_PROGRAM_TARGET_NV */
+   { 27085, 0x000088A4 }, /* GL_PROGRAM_TEMPORARIES_ARB */
+   { 27112, 0x00008807 }, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
+   { 27144, 0x00008806 }, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
+   { 27176, 0x000088B6 }, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
+   { 27211, 0x00001701 }, /* GL_PROJECTION */
+   { 27225, 0x00000BA7 }, /* GL_PROJECTION_MATRIX */
+   { 27246, 0x00000BA4 }, /* GL_PROJECTION_STACK_DEPTH */
+   { 27272, 0x000080D3 }, /* GL_PROXY_COLOR_TABLE */
+   { 27293, 0x00008025 }, /* GL_PROXY_HISTOGRAM */
+   { 27312, 0x00008025 }, /* GL_PROXY_HISTOGRAM_EXT */
+   { 27335, 0x000080D5 }, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
+   { 27374, 0x000080D4 }, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
+   { 27412, 0x00008063 }, /* GL_PROXY_TEXTURE_1D */
+   { 27432, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
+   { 27462, 0x00008063 }, /* GL_PROXY_TEXTURE_1D_EXT */
+   { 27486, 0x00008064 }, /* GL_PROXY_TEXTURE_2D */
+   { 27506, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
+   { 27536, 0x00008064 }, /* GL_PROXY_TEXTURE_2D_EXT */
+   { 27560, 0x00008070 }, /* GL_PROXY_TEXTURE_3D */
+   { 27580, 0x000080BD }, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
+   { 27613, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP */
+   { 27639, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP_ARB */
+   { 27669, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
+   { 27700, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_NV */
+   { 27730, 0x00002003 }, /* GL_Q */
+   { 27735, 0x00001209 }, /* GL_QUADRATIC_ATTENUATION */
+   { 27760, 0x00000007 }, /* GL_QUADS */
+   { 27769, 0x00008614 }, /* GL_QUAD_MESH_SUN */
+   { 27786, 0x00000008 }, /* GL_QUAD_STRIP */
+   { 27800, 0x00008864 }, /* GL_QUERY_COUNTER_BITS */
+   { 27822, 0x00008864 }, /* GL_QUERY_COUNTER_BITS_ARB */
+   { 27848, 0x00008866 }, /* GL_QUERY_RESULT */
+   { 27864, 0x00008866 }, /* GL_QUERY_RESULT_ARB */
+   { 27884, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE */
+   { 27910, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE_ARB */
+   { 27940, 0x00002002 }, /* GL_R */
+   { 27945, 0x00002A10 }, /* GL_R3_G3_B2 */
+   { 27957, 0x00019262 }, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
+   { 27990, 0x00000C02 }, /* GL_READ_BUFFER */
+   { 28005, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER */
+   { 28025, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
+   { 28057, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER_EXT */
+   { 28081, 0x000088B8 }, /* GL_READ_ONLY */
+   { 28094, 0x000088B8 }, /* GL_READ_ONLY_ARB */
+   { 28111, 0x000088BA }, /* GL_READ_WRITE */
+   { 28125, 0x000088BA }, /* GL_READ_WRITE_ARB */
+   { 28143, 0x00001903 }, /* GL_RED */
+   { 28150, 0x00008016 }, /* GL_REDUCE */
+   { 28160, 0x00008016 }, /* GL_REDUCE_EXT */
+   { 28174, 0x00000D15 }, /* GL_RED_BIAS */
+   { 28186, 0x00000D52 }, /* GL_RED_BITS */
+   { 28198, 0x00000D14 }, /* GL_RED_SCALE */
+   { 28211, 0x00008512 }, /* GL_REFLECTION_MAP */
+   { 28229, 0x00008512 }, /* GL_REFLECTION_MAP_ARB */
+   { 28251, 0x00008512 }, /* GL_REFLECTION_MAP_NV */
+   { 28272, 0x00001C00 }, /* GL_RENDER */
+   { 28282, 0x00008D41 }, /* GL_RENDERBUFFER */
+   { 28298, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE */
+   { 28325, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_EXT */
+   { 28353, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE */
+   { 28379, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE */
+   { 28406, 0x00008D41 }, /* GL_RENDERBUFFER_EXT */
+   { 28426, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE */
+   { 28453, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT */
+   { 28476, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_EXT */
+   { 28503, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
+   { 28535, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */
+   { 28571, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE */
+   { 28596, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES */
+   { 28620, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE */
+   { 28649, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH */
+   { 28671, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_EXT */
+   { 28697, 0x00001F01 }, /* GL_RENDERER */
+   { 28709, 0x00000C40 }, /* GL_RENDER_MODE */
+   { 28724, 0x00002901 }, /* GL_REPEAT */
+   { 28734, 0x00001E01 }, /* GL_REPLACE */
+   { 28745, 0x00008062 }, /* GL_REPLACE_EXT */
+   { 28760, 0x00008153 }, /* GL_REPLICATE_BORDER_HP */
+   { 28783, 0x0000803A }, /* GL_RESCALE_NORMAL */
+   { 28801, 0x0000803A }, /* GL_RESCALE_NORMAL_EXT */
+   { 28823, 0x00000102 }, /* GL_RETURN */
+   { 28833, 0x00001907 }, /* GL_RGB */
+   { 28840, 0x00008052 }, /* GL_RGB10 */
+   { 28849, 0x00008059 }, /* GL_RGB10_A2 */
+   { 28861, 0x00008059 }, /* GL_RGB10_A2_EXT */
+   { 28877, 0x00008052 }, /* GL_RGB10_EXT */
+   { 28890, 0x00008053 }, /* GL_RGB12 */
+   { 28899, 0x00008053 }, /* GL_RGB12_EXT */
+   { 28912, 0x00008054 }, /* GL_RGB16 */
+   { 28921, 0x00008054 }, /* GL_RGB16_EXT */
+   { 28934, 0x0000804E }, /* GL_RGB2_EXT */
+   { 28946, 0x0000804F }, /* GL_RGB4 */
+   { 28954, 0x0000804F }, /* GL_RGB4_EXT */
+   { 28966, 0x000083A1 }, /* GL_RGB4_S3TC */
+   { 28979, 0x00008050 }, /* GL_RGB5 */
+   { 28987, 0x00008057 }, /* GL_RGB5_A1 */
+   { 28998, 0x00008057 }, /* GL_RGB5_A1_EXT */
+   { 29013, 0x00008050 }, /* GL_RGB5_EXT */
+   { 29025, 0x00008051 }, /* GL_RGB8 */
+   { 29033, 0x00008051 }, /* GL_RGB8_EXT */
+   { 29045, 0x00001908 }, /* GL_RGBA */
+   { 29053, 0x0000805A }, /* GL_RGBA12 */
+   { 29063, 0x0000805A }, /* GL_RGBA12_EXT */
+   { 29077, 0x0000805B }, /* GL_RGBA16 */
+   { 29087, 0x0000805B }, /* GL_RGBA16_EXT */
+   { 29101, 0x00008055 }, /* GL_RGBA2 */
+   { 29110, 0x00008055 }, /* GL_RGBA2_EXT */
+   { 29123, 0x00008056 }, /* GL_RGBA4 */
+   { 29132, 0x000083A5 }, /* GL_RGBA4_DXT5_S3TC */
+   { 29151, 0x00008056 }, /* GL_RGBA4_EXT */
+   { 29164, 0x000083A3 }, /* GL_RGBA4_S3TC */
+   { 29178, 0x00008058 }, /* GL_RGBA8 */
+   { 29187, 0x00008058 }, /* GL_RGBA8_EXT */
+   { 29200, 0x00008F97 }, /* GL_RGBA8_SNORM */
+   { 29215, 0x000083A4 }, /* GL_RGBA_DXT5_S3TC */
+   { 29233, 0x00000C31 }, /* GL_RGBA_MODE */
+   { 29246, 0x000083A2 }, /* GL_RGBA_S3TC */
+   { 29259, 0x00008F93 }, /* GL_RGBA_SNORM */
+   { 29273, 0x000083A0 }, /* GL_RGB_S3TC */
+   { 29285, 0x00008573 }, /* GL_RGB_SCALE */
+   { 29298, 0x00008573 }, /* GL_RGB_SCALE_ARB */
+   { 29315, 0x00008573 }, /* GL_RGB_SCALE_EXT */
+   { 29332, 0x00000407 }, /* GL_RIGHT */
+   { 29341, 0x00002000 }, /* GL_S */
+   { 29346, 0x00008B5D }, /* GL_SAMPLER_1D */
+   { 29360, 0x00008B61 }, /* GL_SAMPLER_1D_SHADOW */
+   { 29381, 0x00008B5E }, /* GL_SAMPLER_2D */
+   { 29395, 0x00008B62 }, /* GL_SAMPLER_2D_SHADOW */
+   { 29416, 0x00008B5F }, /* GL_SAMPLER_3D */
+   { 29430, 0x00008B60 }, /* GL_SAMPLER_CUBE */
+   { 29446, 0x000080A9 }, /* GL_SAMPLES */
+   { 29457, 0x000086B4 }, /* GL_SAMPLES_3DFX */
+   { 29473, 0x000080A9 }, /* GL_SAMPLES_ARB */
+   { 29488, 0x00008914 }, /* GL_SAMPLES_PASSED */
+   { 29506, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */
+   { 29528, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
+   { 29556, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */
+   { 29588, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */
+   { 29611, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */
+   { 29638, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */
+   { 29656, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */
+   { 29679, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */
+   { 29701, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */
+   { 29720, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */
+   { 29743, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */
+   { 29769, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */
+   { 29799, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */
+   { 29824, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */
+   { 29853, 0x00080000 }, /* GL_SCISSOR_BIT */
+   { 29868, 0x00000C10 }, /* GL_SCISSOR_BOX */
+   { 29883, 0x00000C11 }, /* GL_SCISSOR_TEST */
+   { 29899, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */
+   { 29924, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
+   { 29964, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */
+   { 30008, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
+   { 30041, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
+   { 30071, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
+   { 30103, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
+   { 30133, 0x00001C02 }, /* GL_SELECT */
+   { 30143, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */
+   { 30171, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */
+   { 30196, 0x00008012 }, /* GL_SEPARABLE_2D */
+   { 30212, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */
+   { 30239, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */
+   { 30270, 0x0000150F }, /* GL_SET */
+   { 30277, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */
+   { 30298, 0x00008B88 }, /* GL_SHADER_SOURCE_LENGTH */
+   { 30322, 0x00008B4F }, /* GL_SHADER_TYPE */
+   { 30337, 0x00000B54 }, /* GL_SHADE_MODEL */
+   { 30352, 0x00008B8C }, /* GL_SHADING_LANGUAGE_VERSION */
+   { 30380, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */
+   { 30403, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */
+   { 30433, 0x00001601 }, /* GL_SHININESS */
+   { 30446, 0x00001402 }, /* GL_SHORT */
+   { 30455, 0x00008F9C }, /* GL_SIGNED_NORMALIZED */
+   { 30476, 0x000081F9 }, /* GL_SINGLE_COLOR */
+   { 30492, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */
+   { 30512, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */
+   { 30531, 0x00008C46 }, /* GL_SLUMINANCE */
+   { 30545, 0x00008C47 }, /* GL_SLUMINANCE8 */
+   { 30560, 0x00008C45 }, /* GL_SLUMINANCE8_ALPHA8 */
+   { 30582, 0x00008C44 }, /* GL_SLUMINANCE_ALPHA */
+   { 30602, 0x00001D01 }, /* GL_SMOOTH */
+   { 30612, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */
+   { 30645, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */
+   { 30672, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */
+   { 30705, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */
+   { 30732, 0x00008588 }, /* GL_SOURCE0_ALPHA */
+   { 30749, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */
+   { 30770, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */
+   { 30791, 0x00008580 }, /* GL_SOURCE0_RGB */
+   { 30806, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */
+   { 30825, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */
+   { 30844, 0x00008589 }, /* GL_SOURCE1_ALPHA */
+   { 30861, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */
+   { 30882, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */
+   { 30903, 0x00008581 }, /* GL_SOURCE1_RGB */
+   { 30918, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */
+   { 30937, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */
+   { 30956, 0x0000858A }, /* GL_SOURCE2_ALPHA */
+   { 30973, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */
+   { 30994, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */
+   { 31015, 0x00008582 }, /* GL_SOURCE2_RGB */
+   { 31030, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */
+   { 31049, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */
+   { 31068, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */
+   { 31088, 0x00008583 }, /* GL_SOURCE3_RGB_NV */
+   { 31106, 0x00001202 }, /* GL_SPECULAR */
+   { 31118, 0x00002402 }, /* GL_SPHERE_MAP */
+   { 31132, 0x00001206 }, /* GL_SPOT_CUTOFF */
+   { 31147, 0x00001204 }, /* GL_SPOT_DIRECTION */
+   { 31165, 0x00001205 }, /* GL_SPOT_EXPONENT */
+   { 31182, 0x00008588 }, /* GL_SRC0_ALPHA */
+   { 31196, 0x00008580 }, /* GL_SRC0_RGB */
+   { 31208, 0x00008589 }, /* GL_SRC1_ALPHA */
+   { 31222, 0x00008581 }, /* GL_SRC1_RGB */
+   { 31234, 0x0000858A }, /* GL_SRC2_ALPHA */
+   { 31248, 0x00008582 }, /* GL_SRC2_RGB */
+   { 31260, 0x00000302 }, /* GL_SRC_ALPHA */
+   { 31273, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */
+   { 31295, 0x00000300 }, /* GL_SRC_COLOR */
+   { 31308, 0x00008C40 }, /* GL_SRGB */
+   { 31316, 0x00008C41 }, /* GL_SRGB8 */
+   { 31325, 0x00008C43 }, /* GL_SRGB8_ALPHA8 */
+   { 31341, 0x00008C42 }, /* GL_SRGB_ALPHA */
+   { 31355, 0x00000503 }, /* GL_STACK_OVERFLOW */
+   { 31373, 0x00000504 }, /* GL_STACK_UNDERFLOW */
+   { 31392, 0x000088E6 }, /* GL_STATIC_COPY */
+   { 31407, 0x000088E6 }, /* GL_STATIC_COPY_ARB */
+   { 31426, 0x000088E4 }, /* GL_STATIC_DRAW */
+   { 31441, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */
+   { 31460, 0x000088E5 }, /* GL_STATIC_READ */
+   { 31475, 0x000088E5 }, /* GL_STATIC_READ_ARB */
+   { 31494, 0x00001802 }, /* GL_STENCIL */
+   { 31505, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT */
+   { 31527, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */
+   { 31553, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */
+   { 31574, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */
+   { 31599, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
+   { 31620, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */
+   { 31645, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
+   { 31677, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */
+   { 31713, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
+   { 31745, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */
+   { 31781, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
+   { 31801, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
+   { 31828, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
+   { 31854, 0x00000D57 }, /* GL_STENCIL_BITS */
+   { 31870, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
+   { 31892, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
+   { 31915, 0x00000B94 }, /* GL_STENCIL_FAIL */
+   { 31931, 0x00000B92 }, /* GL_STENCIL_FUNC */
+   { 31947, 0x00001901 }, /* GL_STENCIL_INDEX */
+   { 31964, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
+   { 31987, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
+   { 32009, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
+   { 32031, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
+   { 32053, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
+   { 32074, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
+   { 32101, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
+   { 32128, 0x00000B97 }, /* GL_STENCIL_REF */
+   { 32143, 0x00000B90 }, /* GL_STENCIL_TEST */
+   { 32159, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
+   { 32188, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
+   { 32210, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
+   { 32231, 0x00000C33 }, /* GL_STEREO */
+   { 32241, 0x000088E2 }, /* GL_STREAM_COPY */
+   { 32256, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
+   { 32275, 0x000088E0 }, /* GL_STREAM_DRAW */
+   { 32290, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
+   { 32309, 0x000088E1 }, /* GL_STREAM_READ */
+   { 32324, 0x000088E1 }, /* GL_STREAM_READ_ARB */
+   { 32343, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
+   { 32360, 0x000084E7 }, /* GL_SUBTRACT */
+   { 32372, 0x000084E7 }, /* GL_SUBTRACT_ARB */
+   { 32388, 0x00002001 }, /* GL_T */
+   { 32393, 0x00002A2A }, /* GL_T2F_C3F_V3F */
+   { 32408, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
+   { 32427, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
+   { 32443, 0x00002A2B }, /* GL_T2F_N3F_V3F */
+   { 32458, 0x00002A27 }, /* GL_T2F_V3F */
+   { 32469, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
+   { 32488, 0x00002A28 }, /* GL_T4F_V4F */
+   { 32499, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
+   { 32522, 0x00001702 }, /* GL_TEXTURE */
+   { 32533, 0x000084C0 }, /* GL_TEXTURE0 */
+   { 32545, 0x000084C0 }, /* GL_TEXTURE0_ARB */
+   { 32561, 0x000084C1 }, /* GL_TEXTURE1 */
+   { 32573, 0x000084CA }, /* GL_TEXTURE10 */
+   { 32586, 0x000084CA }, /* GL_TEXTURE10_ARB */
+   { 32603, 0x000084CB }, /* GL_TEXTURE11 */
+   { 32616, 0x000084CB }, /* GL_TEXTURE11_ARB */
+   { 32633, 0x000084CC }, /* GL_TEXTURE12 */
+   { 32646, 0x000084CC }, /* GL_TEXTURE12_ARB */
+   { 32663, 0x000084CD }, /* GL_TEXTURE13 */
+   { 32676, 0x000084CD }, /* GL_TEXTURE13_ARB */
+   { 32693, 0x000084CE }, /* GL_TEXTURE14 */
+   { 32706, 0x000084CE }, /* GL_TEXTURE14_ARB */
+   { 32723, 0x000084CF }, /* GL_TEXTURE15 */
+   { 32736, 0x000084CF }, /* GL_TEXTURE15_ARB */
+   { 32753, 0x000084D0 }, /* GL_TEXTURE16 */
+   { 32766, 0x000084D0 }, /* GL_TEXTURE16_ARB */
+   { 32783, 0x000084D1 }, /* GL_TEXTURE17 */
+   { 32796, 0x000084D1 }, /* GL_TEXTURE17_ARB */
+   { 32813, 0x000084D2 }, /* GL_TEXTURE18 */
+   { 32826, 0x000084D2 }, /* GL_TEXTURE18_ARB */
+   { 32843, 0x000084D3 }, /* GL_TEXTURE19 */
+   { 32856, 0x000084D3 }, /* GL_TEXTURE19_ARB */
+   { 32873, 0x000084C1 }, /* GL_TEXTURE1_ARB */
+   { 32889, 0x000084C2 }, /* GL_TEXTURE2 */
+   { 32901, 0x000084D4 }, /* GL_TEXTURE20 */
+   { 32914, 0x000084D4 }, /* GL_TEXTURE20_ARB */
+   { 32931, 0x000084D5 }, /* GL_TEXTURE21 */
+   { 32944, 0x000084D5 }, /* GL_TEXTURE21_ARB */
+   { 32961, 0x000084D6 }, /* GL_TEXTURE22 */
+   { 32974, 0x000084D6 }, /* GL_TEXTURE22_ARB */
+   { 32991, 0x000084D7 }, /* GL_TEXTURE23 */
+   { 33004, 0x000084D7 }, /* GL_TEXTURE23_ARB */
+   { 33021, 0x000084D8 }, /* GL_TEXTURE24 */
+   { 33034, 0x000084D8 }, /* GL_TEXTURE24_ARB */
+   { 33051, 0x000084D9 }, /* GL_TEXTURE25 */
+   { 33064, 0x000084D9 }, /* GL_TEXTURE25_ARB */
+   { 33081, 0x000084DA }, /* GL_TEXTURE26 */
+   { 33094, 0x000084DA }, /* GL_TEXTURE26_ARB */
+   { 33111, 0x000084DB }, /* GL_TEXTURE27 */
+   { 33124, 0x000084DB }, /* GL_TEXTURE27_ARB */
+   { 33141, 0x000084DC }, /* GL_TEXTURE28 */
+   { 33154, 0x000084DC }, /* GL_TEXTURE28_ARB */
+   { 33171, 0x000084DD }, /* GL_TEXTURE29 */
+   { 33184, 0x000084DD }, /* GL_TEXTURE29_ARB */
+   { 33201, 0x000084C2 }, /* GL_TEXTURE2_ARB */
+   { 33217, 0x000084C3 }, /* GL_TEXTURE3 */
+   { 33229, 0x000084DE }, /* GL_TEXTURE30 */
+   { 33242, 0x000084DE }, /* GL_TEXTURE30_ARB */
+   { 33259, 0x000084DF }, /* GL_TEXTURE31 */
+   { 33272, 0x000084DF }, /* GL_TEXTURE31_ARB */
+   { 33289, 0x000084C3 }, /* GL_TEXTURE3_ARB */
+   { 33305, 0x000084C4 }, /* GL_TEXTURE4 */
+   { 33317, 0x000084C4 }, /* GL_TEXTURE4_ARB */
+   { 33333, 0x000084C5 }, /* GL_TEXTURE5 */
+   { 33345, 0x000084C5 }, /* GL_TEXTURE5_ARB */
+   { 33361, 0x000084C6 }, /* GL_TEXTURE6 */
+   { 33373, 0x000084C6 }, /* GL_TEXTURE6_ARB */
+   { 33389, 0x000084C7 }, /* GL_TEXTURE7 */
+   { 33401, 0x000084C7 }, /* GL_TEXTURE7_ARB */
+   { 33417, 0x000084C8 }, /* GL_TEXTURE8 */
+   { 33429, 0x000084C8 }, /* GL_TEXTURE8_ARB */
+   { 33445, 0x000084C9 }, /* GL_TEXTURE9 */
+   { 33457, 0x000084C9 }, /* GL_TEXTURE9_ARB */
+   { 33473, 0x00000DE0 }, /* GL_TEXTURE_1D */
+   { 33487, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
+   { 33511, 0x00000DE1 }, /* GL_TEXTURE_2D */
+   { 33525, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
+   { 33549, 0x0000806F }, /* GL_TEXTURE_3D */
+   { 33563, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
+   { 33585, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
+   { 33611, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
+   { 33633, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
+   { 33655, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
+   { 33687, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
+   { 33709, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
+   { 33741, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
+   { 33763, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
+   { 33791, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
+   { 33823, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
+   { 33856, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
+   { 33888, 0x00040000 }, /* GL_TEXTURE_BIT */
+   { 33903, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
+   { 33924, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
+   { 33949, 0x00001005 }, /* GL_TEXTURE_BORDER */
+   { 33967, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
+   { 33991, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
+   { 34022, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
+   { 34052, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
+   { 34082, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
+   { 34117, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
+   { 34148, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+   { 34186, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
+   { 34213, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
+   { 34245, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+   { 34279, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
+   { 34303, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
+   { 34331, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
+   { 34355, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
+   { 34383, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
+   { 34416, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
+   { 34440, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
+   { 34462, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
+   { 34484, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
+   { 34510, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
+   { 34544, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
+   { 34577, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
+   { 34614, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
+   { 34642, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
+   { 34674, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
+   { 34697, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
+   { 34735, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
+   { 34777, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
+   { 34808, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
+   { 34836, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
+   { 34866, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
+   { 34894, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
+   { 34914, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
+   { 34938, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
+   { 34969, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
+   { 35004, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
+   { 35035, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
+   { 35070, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
+   { 35101, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
+   { 35136, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
+   { 35167, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
+   { 35202, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
+   { 35233, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
+   { 35268, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
+   { 35299, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
+   { 35334, 0x00008071 }, /* GL_TEXTURE_DEPTH */
+   { 35351, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
+   { 35373, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
+   { 35399, 0x00002300 }, /* GL_TEXTURE_ENV */
+   { 35414, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
+   { 35435, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
+   { 35455, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
+   { 35481, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
+   { 35501, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
+   { 35518, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
+   { 35535, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
+   { 35552, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
+   { 35569, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
+   { 35594, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
+   { 35616, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
+   { 35642, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
+   { 35660, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
+   { 35686, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
+   { 35712, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
+   { 35742, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
+   { 35769, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
+   { 35794, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
+   { 35814, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
+   { 35838, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+   { 35865, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+   { 35892, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+   { 35919, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
+   { 35945, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
+   { 35975, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
+   { 35997, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
+   { 36015, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+   { 36045, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+   { 36073, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+   { 36101, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+   { 36129, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
+   { 36150, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
+   { 36169, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
+   { 36191, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
+   { 36210, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
+   { 36230, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
+   { 36255, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
+   { 36279, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
+   { 36299, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
+   { 36323, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
+   { 36343, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
+   { 36366, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */
+   { 36390, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
+   { 36415, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+   { 36449, 0x00001000 }, /* GL_TEXTURE_WIDTH */
+   { 36466, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
+   { 36484, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
+   { 36502, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
+   { 36520, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
+   { 36540, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
+   { 36559, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+   { 36588, 0x00001000 }, /* GL_TRANSFORM_BIT */
+   { 36605, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
+   { 36631, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
+   { 36661, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+   { 36693, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+   { 36723, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
+   { 36757, 0x0000862C }, /* GL_TRANSPOSE_NV */
+   { 36773, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+   { 36804, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
+   { 36839, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+   { 36867, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
+   { 36899, 0x00000004 }, /* GL_TRIANGLES */
+   { 36912, 0x00000006 }, /* GL_TRIANGLE_FAN */
+   { 36928, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
+   { 36949, 0x00000005 }, /* GL_TRIANGLE_STRIP */
+   { 36967, 0x00000001 }, /* GL_TRUE */
+   { 36975, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
+   { 36995, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
+   { 37018, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
+   { 37038, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
+   { 37059, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
+   { 37081, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
+   { 37103, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
+   { 37123, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
+   { 37144, 0x00001401 }, /* GL_UNSIGNED_BYTE */
+   { 37161, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+   { 37188, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
+   { 37211, 0x00001405 }, /* GL_UNSIGNED_INT */
+   { 37227, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
+   { 37254, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */
+   { 37275, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
+   { 37299, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+   { 37330, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
+   { 37354, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+   { 37382, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */
+   { 37405, 0x00001403 }, /* GL_UNSIGNED_SHORT */
+   { 37423, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+   { 37453, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+   { 37479, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+   { 37509, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+   { 37535, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
+   { 37559, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+   { 37587, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+   { 37615, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
+   { 37642, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+   { 37674, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
+   { 37705, 0x00008CA2 }, /* GL_UPPER_LEFT */
+   { 37719, 0x00002A20 }, /* GL_V2F */
+   { 37726, 0x00002A21 }, /* GL_V3F */
+   { 37733, 0x00008B83 }, /* GL_VALIDATE_STATUS */
+   { 37752, 0x00001F00 }, /* GL_VENDOR */
+   { 37762, 0x00001F02 }, /* GL_VERSION */
+   { 37773, 0x00008074 }, /* GL_VERTEX_ARRAY */
+   { 37789, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
+   { 37819, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+   { 37850, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
+   { 37885, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
+   { 37909, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
+   { 37930, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
+   { 37953, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
+   { 37974, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+   { 38001, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+   { 38029, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+   { 38057, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+   { 38085, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+   { 38113, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+   { 38141, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+   { 38169, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+   { 38196, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+   { 38223, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+   { 38250, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+   { 38277, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+   { 38304, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+   { 38331, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+   { 38358, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+   { 38385, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+   { 38412, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+   { 38450, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
+   { 38492, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+   { 38523, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
+   { 38558, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+   { 38592, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
+   { 38630, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+   { 38661, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
+   { 38696, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+   { 38724, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
+   { 38756, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+   { 38786, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
+   { 38820, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+   { 38848, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
+   { 38880, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
+   { 38900, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
+   { 38922, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
+   { 38951, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
+   { 38972, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
+   { 39001, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
+   { 39034, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
+   { 39066, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+   { 39093, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
+   { 39124, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
+   { 39154, 0x00008B31 }, /* GL_VERTEX_SHADER */
+   { 39171, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
+   { 39192, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
+   { 39219, 0x00000BA2 }, /* GL_VIEWPORT */
+   { 39231, 0x00000800 }, /* GL_VIEWPORT_BIT */
+   { 39247, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
+   { 39267, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+   { 39298, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
+   { 39333, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+   { 39361, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+   { 39386, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+   { 39413, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+   { 39438, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
+   { 39462, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
+   { 39481, 0x000088B9 }, /* GL_WRITE_ONLY */
+   { 39495, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
+   { 39513, 0x00001506 }, /* GL_XOR */
+   { 39520, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
+   { 39539, 0x00008757 }, /* GL_YCBCR_MESA */
+   { 39553, 0x00000000 }, /* GL_ZERO */
+   { 39561, 0x00000D16 }, /* GL_ZOOM_X */
+   { 39571, 0x00000D17 }, /* GL_ZOOM_Y */
 };
 
 static const unsigned reduced_enums[1321] =
@@ -3692,38 +3704,38 @@ static const unsigned reduced_enums[1321] =
        685, /* GL_LINES */
        687, /* GL_LINE_LOOP */
        694, /* GL_LINE_STRIP */
-      1711, /* GL_TRIANGLES */
-      1714, /* GL_TRIANGLE_STRIP */
-      1712, /* GL_TRIANGLE_FAN */
-      1256, /* GL_QUADS */
-      1258, /* GL_QUAD_STRIP */
-      1144, /* GL_POLYGON */
-      1156, /* GL_POLYGON_STIPPLE_BIT */
-      1105, /* GL_PIXEL_MODE_BIT */
+      1717, /* GL_TRIANGLES */
+      1720, /* GL_TRIANGLE_STRIP */
+      1718, /* GL_TRIANGLE_FAN */
+      1262, /* GL_QUADS */
+      1264, /* GL_QUAD_STRIP */
+      1150, /* GL_POLYGON */
+      1162, /* GL_POLYGON_STIPPLE_BIT */
+      1111, /* GL_PIXEL_MODE_BIT */
        672, /* GL_LIGHTING_BIT */
        499, /* GL_FOG_BIT */
          8, /* GL_ACCUM */
        704, /* GL_LOAD */
-      1310, /* GL_RETURN */
-       978, /* GL_MULT */
+      1316, /* GL_RETURN */
+       984, /* GL_MULT */
         23, /* GL_ADD */
-       994, /* GL_NEVER */
+      1000, /* GL_NEVER */
        662, /* GL_LESS */
        461, /* GL_EQUAL */
        661, /* GL_LEQUAL */
        585, /* GL_GREATER */
-      1009, /* GL_NOTEQUAL */
+      1015, /* GL_NOTEQUAL */
        584, /* GL_GEQUAL */
         46, /* GL_ALWAYS */
-      1450, /* GL_SRC_COLOR */
-      1038, /* GL_ONE_MINUS_SRC_COLOR */
-      1448, /* GL_SRC_ALPHA */
-      1037, /* GL_ONE_MINUS_SRC_ALPHA */
+      1456, /* GL_SRC_COLOR */
+      1044, /* GL_ONE_MINUS_SRC_COLOR */
+      1454, /* GL_SRC_ALPHA */
+      1043, /* GL_ONE_MINUS_SRC_ALPHA */
        440, /* GL_DST_ALPHA */
-      1035, /* GL_ONE_MINUS_DST_ALPHA */
+      1041, /* GL_ONE_MINUS_DST_ALPHA */
        441, /* GL_DST_COLOR */
-      1036, /* GL_ONE_MINUS_DST_COLOR */
-      1449, /* GL_SRC_ALPHA_SATURATE */
+      1042, /* GL_ONE_MINUS_DST_COLOR */
+      1455, /* GL_SRC_ALPHA_SATURATE */
        572, /* GL_FRONT_LEFT */
        573, /* GL_FRONT_RIGHT */
         68, /* GL_BACK_LEFT */
@@ -3731,7 +3743,7 @@ static const unsigned reduced_enums[1321] =
        569, /* GL_FRONT */
         67, /* GL_BACK */
        660, /* GL_LEFT */
-      1352, /* GL_RIGHT */
+      1358, /* GL_RIGHT */
        570, /* GL_FRONT_AND_BACK */
         62, /* GL_AUX0 */
         63, /* GL_AUX1 */
@@ -3740,19 +3752,19 @@ static const unsigned reduced_enums[1321] =
        651, /* GL_INVALID_ENUM */
        655, /* GL_INVALID_VALUE */
        654, /* GL_INVALID_OPERATION */
-      1455, /* GL_STACK_OVERFLOW */
-      1456, /* GL_STACK_UNDERFLOW */
-      1063, /* GL_OUT_OF_MEMORY */
+      1461, /* GL_STACK_OVERFLOW */
+      1462, /* GL_STACK_UNDERFLOW */
+      1069, /* GL_OUT_OF_MEMORY */
        652, /* GL_INVALID_FRAMEBUFFER_OPERATION */
          0, /* GL_2D */
          2, /* GL_3D */
          3, /* GL_3D_COLOR */
          4, /* GL_3D_COLOR_TEXTURE */
          6, /* GL_4D_COLOR_TEXTURE */
-      1083, /* GL_PASS_THROUGH_TOKEN */
-      1143, /* GL_POINT_TOKEN */
+      1089, /* GL_PASS_THROUGH_TOKEN */
+      1149, /* GL_POINT_TOKEN */
        695, /* GL_LINE_TOKEN */
-      1157, /* GL_POLYGON_TOKEN */
+      1163, /* GL_POLYGON_TOKEN */
         73, /* GL_BITMAP_TOKEN */
        439, /* GL_DRAW_PIXEL_TOKEN */
        297, /* GL_COPY_PIXEL_TOKEN */
@@ -3762,7 +3774,7 @@ static const unsigned reduced_enums[1321] =
        333, /* GL_CW */
        122, /* GL_CCW */
        143, /* GL_COEFF */
-      1060, /* GL_ORDER */
+      1066, /* GL_ORDER */
        377, /* GL_DOMAIN */
        307, /* GL_CURRENT_COLOR */
        310, /* GL_CURRENT_INDEX */
@@ -3774,10 +3786,10 @@ static const unsigned reduced_enums[1321] =
        324, /* GL_CURRENT_RASTER_POSITION */
        325, /* GL_CURRENT_RASTER_POSITION_VALID */
        322, /* GL_CURRENT_RASTER_DISTANCE */
-      1136, /* GL_POINT_SMOOTH */
-      1125, /* GL_POINT_SIZE */
-      1135, /* GL_POINT_SIZE_RANGE */
-      1126, /* GL_POINT_SIZE_GRANULARITY */
+      1142, /* GL_POINT_SMOOTH */
+      1131, /* GL_POINT_SIZE */
+      1141, /* GL_POINT_SIZE_RANGE */
+      1132, /* GL_POINT_SIZE_GRANULARITY */
        689, /* GL_LINE_SMOOTH */
        696, /* GL_LINE_WIDTH */
        698, /* GL_LINE_WIDTH_RANGE */
@@ -3786,12 +3798,12 @@ static const unsigned reduced_enums[1321] =
        692, /* GL_LINE_STIPPLE_PATTERN */
        693, /* GL_LINE_STIPPLE_REPEAT */
        703, /* GL_LIST_MODE */
-       862, /* GL_MAX_LIST_NESTING */
+       868, /* GL_MAX_LIST_NESTING */
        700, /* GL_LIST_BASE */
        702, /* GL_LIST_INDEX */
-      1146, /* GL_POLYGON_MODE */
-      1153, /* GL_POLYGON_SMOOTH */
-      1155, /* GL_POLYGON_STIPPLE */
+      1152, /* GL_POLYGON_MODE */
+      1159, /* GL_POLYGON_SMOOTH */
+      1161, /* GL_POLYGON_STIPPLE */
        450, /* GL_EDGE_FLAG */
        300, /* GL_CULL_FACE */
        301, /* GL_CULL_FACE_MODE */
@@ -3800,7 +3812,7 @@ static const unsigned reduced_enums[1321] =
        676, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
        677, /* GL_LIGHT_MODEL_TWO_SIDE */
        673, /* GL_LIGHT_MODEL_AMBIENT */
-      1398, /* GL_SHADE_MODEL */
+      1404, /* GL_SHADE_MODEL */
        190, /* GL_COLOR_MATERIAL_FACE */
        191, /* GL_COLOR_MATERIAL_PARAMETER */
        189, /* GL_COLOR_MATERIAL */
@@ -3817,24 +3829,24 @@ static const unsigned reduced_enums[1321] =
        352, /* GL_DEPTH_CLEAR_VALUE */
        363, /* GL_DEPTH_FUNC */
         12, /* GL_ACCUM_CLEAR_VALUE */
-      1491, /* GL_STENCIL_TEST */
-      1479, /* GL_STENCIL_CLEAR_VALUE */
-      1481, /* GL_STENCIL_FUNC */
-      1493, /* GL_STENCIL_VALUE_MASK */
-      1480, /* GL_STENCIL_FAIL */
-      1488, /* GL_STENCIL_PASS_DEPTH_FAIL */
-      1489, /* GL_STENCIL_PASS_DEPTH_PASS */
-      1490, /* GL_STENCIL_REF */
-      1494, /* GL_STENCIL_WRITEMASK */
-       831, /* GL_MATRIX_MODE */
-       999, /* GL_NORMALIZE */
-      1803, /* GL_VIEWPORT */
-       973, /* GL_MODELVIEW_STACK_DEPTH */
-      1236, /* GL_PROJECTION_STACK_DEPTH */
-      1689, /* GL_TEXTURE_STACK_DEPTH */
-       971, /* GL_MODELVIEW_MATRIX */
-      1235, /* GL_PROJECTION_MATRIX */
-      1674, /* GL_TEXTURE_MATRIX */
+      1497, /* GL_STENCIL_TEST */
+      1485, /* GL_STENCIL_CLEAR_VALUE */
+      1487, /* GL_STENCIL_FUNC */
+      1499, /* GL_STENCIL_VALUE_MASK */
+      1486, /* GL_STENCIL_FAIL */
+      1494, /* GL_STENCIL_PASS_DEPTH_FAIL */
+      1495, /* GL_STENCIL_PASS_DEPTH_PASS */
+      1496, /* GL_STENCIL_REF */
+      1500, /* GL_STENCIL_WRITEMASK */
+       837, /* GL_MATRIX_MODE */
+      1005, /* GL_NORMALIZE */
+      1809, /* GL_VIEWPORT */
+       979, /* GL_MODELVIEW_STACK_DEPTH */
+      1242, /* GL_PROJECTION_STACK_DEPTH */
+      1695, /* GL_TEXTURE_STACK_DEPTH */
+       977, /* GL_MODELVIEW_MATRIX */
+      1241, /* GL_PROJECTION_MATRIX */
+      1680, /* GL_TEXTURE_MATRIX */
         60, /* GL_ATTRIB_STACK_DEPTH */
        133, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
         43, /* GL_ALPHA_TEST */
@@ -3849,67 +3861,67 @@ static const unsigned reduced_enums[1321] =
        188, /* GL_COLOR_LOGIC_OP */
         66, /* GL_AUX_BUFFERS */
        387, /* GL_DRAW_BUFFER */
-      1268, /* GL_READ_BUFFER */
-      1379, /* GL_SCISSOR_BOX */
-      1380, /* GL_SCISSOR_TEST */
+      1274, /* GL_READ_BUFFER */
+      1385, /* GL_SCISSOR_BOX */
+      1386, /* GL_SCISSOR_TEST */
        624, /* GL_INDEX_CLEAR_VALUE */
        629, /* GL_INDEX_WRITEMASK */
        185, /* GL_COLOR_CLEAR_VALUE */
        227, /* GL_COLOR_WRITEMASK */
        626, /* GL_INDEX_MODE */
-      1345, /* GL_RGBA_MODE */
+      1351, /* GL_RGBA_MODE */
        386, /* GL_DOUBLEBUFFER */
-      1495, /* GL_STEREO */
-      1303, /* GL_RENDER_MODE */
-      1084, /* GL_PERSPECTIVE_CORRECTION_HINT */
-      1137, /* GL_POINT_SMOOTH_HINT */
+      1501, /* GL_STEREO */
+      1309, /* GL_RENDER_MODE */
+      1090, /* GL_PERSPECTIVE_CORRECTION_HINT */
+      1143, /* GL_POINT_SMOOTH_HINT */
        690, /* GL_LINE_SMOOTH_HINT */
-      1154, /* GL_POLYGON_SMOOTH_HINT */
+      1160, /* GL_POLYGON_SMOOTH_HINT */
        519, /* GL_FOG_HINT */
-      1655, /* GL_TEXTURE_GEN_S */
-      1656, /* GL_TEXTURE_GEN_T */
-      1654, /* GL_TEXTURE_GEN_R */
-      1653, /* GL_TEXTURE_GEN_Q */
-      1097, /* GL_PIXEL_MAP_I_TO_I */
-      1103, /* GL_PIXEL_MAP_S_TO_S */
-      1099, /* GL_PIXEL_MAP_I_TO_R */
-      1095, /* GL_PIXEL_MAP_I_TO_G */
-      1093, /* GL_PIXEL_MAP_I_TO_B */
-      1091, /* GL_PIXEL_MAP_I_TO_A */
-      1101, /* GL_PIXEL_MAP_R_TO_R */
-      1089, /* GL_PIXEL_MAP_G_TO_G */
-      1087, /* GL_PIXEL_MAP_B_TO_B */
-      1085, /* GL_PIXEL_MAP_A_TO_A */
-      1098, /* GL_PIXEL_MAP_I_TO_I_SIZE */
-      1104, /* GL_PIXEL_MAP_S_TO_S_SIZE */
-      1100, /* GL_PIXEL_MAP_I_TO_R_SIZE */
-      1096, /* GL_PIXEL_MAP_I_TO_G_SIZE */
-      1094, /* GL_PIXEL_MAP_I_TO_B_SIZE */
-      1092, /* GL_PIXEL_MAP_I_TO_A_SIZE */
-      1102, /* GL_PIXEL_MAP_R_TO_R_SIZE */
-      1090, /* GL_PIXEL_MAP_G_TO_G_SIZE */
-      1088, /* GL_PIXEL_MAP_B_TO_B_SIZE */
-      1086, /* GL_PIXEL_MAP_A_TO_A_SIZE */
-      1723, /* GL_UNPACK_SWAP_BYTES */
-      1718, /* GL_UNPACK_LSB_FIRST */
-      1719, /* GL_UNPACK_ROW_LENGTH */
-      1722, /* GL_UNPACK_SKIP_ROWS */
-      1721, /* GL_UNPACK_SKIP_PIXELS */
-      1716, /* GL_UNPACK_ALIGNMENT */
-      1072, /* GL_PACK_SWAP_BYTES */
-      1067, /* GL_PACK_LSB_FIRST */
-      1068, /* GL_PACK_ROW_LENGTH */
-      1071, /* GL_PACK_SKIP_ROWS */
-      1070, /* GL_PACK_SKIP_PIXELS */
-      1064, /* GL_PACK_ALIGNMENT */
+      1661, /* GL_TEXTURE_GEN_S */
+      1662, /* GL_TEXTURE_GEN_T */
+      1660, /* GL_TEXTURE_GEN_R */
+      1659, /* GL_TEXTURE_GEN_Q */
+      1103, /* GL_PIXEL_MAP_I_TO_I */
+      1109, /* GL_PIXEL_MAP_S_TO_S */
+      1105, /* GL_PIXEL_MAP_I_TO_R */
+      1101, /* GL_PIXEL_MAP_I_TO_G */
+      1099, /* GL_PIXEL_MAP_I_TO_B */
+      1097, /* GL_PIXEL_MAP_I_TO_A */
+      1107, /* GL_PIXEL_MAP_R_TO_R */
+      1095, /* GL_PIXEL_MAP_G_TO_G */
+      1093, /* GL_PIXEL_MAP_B_TO_B */
+      1091, /* GL_PIXEL_MAP_A_TO_A */
+      1104, /* GL_PIXEL_MAP_I_TO_I_SIZE */
+      1110, /* GL_PIXEL_MAP_S_TO_S_SIZE */
+      1106, /* GL_PIXEL_MAP_I_TO_R_SIZE */
+      1102, /* GL_PIXEL_MAP_I_TO_G_SIZE */
+      1100, /* GL_PIXEL_MAP_I_TO_B_SIZE */
+      1098, /* GL_PIXEL_MAP_I_TO_A_SIZE */
+      1108, /* GL_PIXEL_MAP_R_TO_R_SIZE */
+      1096, /* GL_PIXEL_MAP_G_TO_G_SIZE */
+      1094, /* GL_PIXEL_MAP_B_TO_B_SIZE */
+      1092, /* GL_PIXEL_MAP_A_TO_A_SIZE */
+      1729, /* GL_UNPACK_SWAP_BYTES */
+      1724, /* GL_UNPACK_LSB_FIRST */
+      1725, /* GL_UNPACK_ROW_LENGTH */
+      1728, /* GL_UNPACK_SKIP_ROWS */
+      1727, /* GL_UNPACK_SKIP_PIXELS */
+      1722, /* GL_UNPACK_ALIGNMENT */
+      1078, /* GL_PACK_SWAP_BYTES */
+      1073, /* GL_PACK_LSB_FIRST */
+      1074, /* GL_PACK_ROW_LENGTH */
+      1077, /* GL_PACK_SKIP_ROWS */
+      1076, /* GL_PACK_SKIP_PIXELS */
+      1070, /* GL_PACK_ALIGNMENT */
        784, /* GL_MAP_COLOR */
-       785, /* GL_MAP_STENCIL */
+       789, /* GL_MAP_STENCIL */
        628, /* GL_INDEX_SHIFT */
        627, /* GL_INDEX_OFFSET */
-      1281, /* GL_RED_SCALE */
-      1279, /* GL_RED_BIAS */
-      1820, /* GL_ZOOM_X */
-      1821, /* GL_ZOOM_Y */
+      1287, /* GL_RED_SCALE */
+      1285, /* GL_RED_BIAS */
+      1826, /* GL_ZOOM_X */
+      1827, /* GL_ZOOM_Y */
        589, /* GL_GREEN_SCALE */
        587, /* GL_GREEN_BIAS */
         92, /* GL_BLUE_SCALE */
@@ -3918,31 +3930,31 @@ static const unsigned reduced_enums[1321] =
         40, /* GL_ALPHA_BIAS */
        365, /* GL_DEPTH_SCALE */
        346, /* GL_DEPTH_BIAS */
-       857, /* GL_MAX_EVAL_ORDER */
-       861, /* GL_MAX_LIGHTS */
-       840, /* GL_MAX_CLIP_PLANES */
-       906, /* GL_MAX_TEXTURE_SIZE */
-       867, /* GL_MAX_PIXEL_MAP_TABLE */
-       836, /* GL_MAX_ATTRIB_STACK_DEPTH */
-       864, /* GL_MAX_MODELVIEW_STACK_DEPTH */
-       865, /* GL_MAX_NAME_STACK_DEPTH */
-       893, /* GL_MAX_PROJECTION_STACK_DEPTH */
-       907, /* GL_MAX_TEXTURE_STACK_DEPTH */
-       921, /* GL_MAX_VIEWPORT_DIMS */
-       837, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
-      1502, /* GL_SUBPIXEL_BITS */
+       863, /* GL_MAX_EVAL_ORDER */
+       867, /* GL_MAX_LIGHTS */
+       846, /* GL_MAX_CLIP_PLANES */
+       912, /* GL_MAX_TEXTURE_SIZE */
+       873, /* GL_MAX_PIXEL_MAP_TABLE */
+       842, /* GL_MAX_ATTRIB_STACK_DEPTH */
+       870, /* GL_MAX_MODELVIEW_STACK_DEPTH */
+       871, /* GL_MAX_NAME_STACK_DEPTH */
+       899, /* GL_MAX_PROJECTION_STACK_DEPTH */
+       913, /* GL_MAX_TEXTURE_STACK_DEPTH */
+       927, /* GL_MAX_VIEWPORT_DIMS */
+       843, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
+      1508, /* GL_SUBPIXEL_BITS */
        623, /* GL_INDEX_BITS */
-      1280, /* GL_RED_BITS */
+      1286, /* GL_RED_BITS */
        588, /* GL_GREEN_BITS */
         91, /* GL_BLUE_BITS */
         41, /* GL_ALPHA_BITS */
        347, /* GL_DEPTH_BITS */
-      1477, /* GL_STENCIL_BITS */
+      1483, /* GL_STENCIL_BITS */
         14, /* GL_ACCUM_RED_BITS */
         13, /* GL_ACCUM_GREEN_BITS */
         10, /* GL_ACCUM_BLUE_BITS */
          9, /* GL_ACCUM_ALPHA_BITS */
-       987, /* GL_NAME_STACK_DEPTH */
+       993, /* GL_NAME_STACK_DEPTH */
         61, /* GL_AUTO_NORMAL */
        730, /* GL_MAP1_COLOR_4 */
        733, /* GL_MAP1_INDEX */
@@ -3966,39 +3978,39 @@ static const unsigned reduced_enums[1321] =
        732, /* GL_MAP1_GRID_SEGMENTS */
        758, /* GL_MAP2_GRID_DOMAIN */
        759, /* GL_MAP2_GRID_SEGMENTS */
-      1579, /* GL_TEXTURE_1D */
-      1581, /* GL_TEXTURE_2D */
+      1585, /* GL_TEXTURE_1D */
+      1587, /* GL_TEXTURE_2D */
        474, /* GL_FEEDBACK_BUFFER_POINTER */
        475, /* GL_FEEDBACK_BUFFER_SIZE */
        476, /* GL_FEEDBACK_BUFFER_TYPE */
-      1389, /* GL_SELECTION_BUFFER_POINTER */
-      1390, /* GL_SELECTION_BUFFER_SIZE */
-      1693, /* GL_TEXTURE_WIDTH */
-      1660, /* GL_TEXTURE_HEIGHT */
-      1616, /* GL_TEXTURE_COMPONENTS */
-      1600, /* GL_TEXTURE_BORDER_COLOR */
-      1599, /* GL_TEXTURE_BORDER */
+      1395, /* GL_SELECTION_BUFFER_POINTER */
+      1396, /* GL_SELECTION_BUFFER_SIZE */
+      1699, /* GL_TEXTURE_WIDTH */
+      1666, /* GL_TEXTURE_HEIGHT */
+      1622, /* GL_TEXTURE_COMPONENTS */
+      1606, /* GL_TEXTURE_BORDER_COLOR */
+      1605, /* GL_TEXTURE_BORDER */
        378, /* GL_DONT_CARE */
        472, /* GL_FASTEST */
-       995, /* GL_NICEST */
+      1001, /* GL_NICEST */
         47, /* GL_AMBIENT */
        375, /* GL_DIFFUSE */
-      1437, /* GL_SPECULAR */
-      1158, /* GL_POSITION */
-      1440, /* GL_SPOT_DIRECTION */
-      1441, /* GL_SPOT_EXPONENT */
-      1439, /* GL_SPOT_CUTOFF */
+      1443, /* GL_SPECULAR */
+      1164, /* GL_POSITION */
+      1446, /* GL_SPOT_DIRECTION */
+      1447, /* GL_SPOT_EXPONENT */
+      1445, /* GL_SPOT_CUTOFF */
        271, /* GL_CONSTANT_ATTENUATION */
        680, /* GL_LINEAR_ATTENUATION */
-      1255, /* GL_QUADRATIC_ATTENUATION */
+      1261, /* GL_QUADRATIC_ATTENUATION */
        241, /* GL_COMPILE */
        242, /* GL_COMPILE_AND_EXECUTE */
        117, /* GL_BYTE */
-      1724, /* GL_UNSIGNED_BYTE */
-      1403, /* GL_SHORT */
-      1735, /* GL_UNSIGNED_SHORT */
+      1730, /* GL_UNSIGNED_BYTE */
+      1409, /* GL_SHORT */
+      1741, /* GL_UNSIGNED_SHORT */
        631, /* GL_INT */
-      1727, /* GL_UNSIGNED_INT */
+      1733, /* GL_UNSIGNED_INT */
        479, /* GL_FLOAT */
          1, /* GL_2_BYTES */
          5, /* GL_3_BYTES */
@@ -4009,100 +4021,100 @@ static const unsigned reduced_enums[1321] =
         51, /* GL_AND_REVERSE */
        295, /* GL_COPY */
         50, /* GL_AND_INVERTED */
-       997, /* GL_NOOP */
-      1816, /* GL_XOR */
-      1059, /* GL_OR */
-       998, /* GL_NOR */
+      1003, /* GL_NOOP */
+      1822, /* GL_XOR */
+      1065, /* GL_OR */
+      1004, /* GL_NOR */
        462, /* GL_EQUIV */
        658, /* GL_INVERT */
-      1062, /* GL_OR_REVERSE */
+      1068, /* GL_OR_REVERSE */
        296, /* GL_COPY_INVERTED */
-      1061, /* GL_OR_INVERTED */
-       988, /* GL_NAND */
-      1394, /* GL_SET */
+      1067, /* GL_OR_INVERTED */
+       994, /* GL_NAND */
+      1400, /* GL_SET */
        459, /* GL_EMISSION */
-      1402, /* GL_SHININESS */
+      1408, /* GL_SHININESS */
         48, /* GL_AMBIENT_AND_DIFFUSE */
        187, /* GL_COLOR_INDEXES */
-       938, /* GL_MODELVIEW */
-      1234, /* GL_PROJECTION */
-      1514, /* GL_TEXTURE */
+       944, /* GL_MODELVIEW */
+      1240, /* GL_PROJECTION */
+      1520, /* GL_TEXTURE */
        144, /* GL_COLOR */
        342, /* GL_DEPTH */
-      1463, /* GL_STENCIL */
+      1469, /* GL_STENCIL */
        186, /* GL_COLOR_INDEX */
-      1482, /* GL_STENCIL_INDEX */
+      1488, /* GL_STENCIL_INDEX */
        353, /* GL_DEPTH_COMPONENT */
-      1276, /* GL_RED */
+      1282, /* GL_RED */
        586, /* GL_GREEN */
         89, /* GL_BLUE */
         31, /* GL_ALPHA */
-      1311, /* GL_RGB */
-      1330, /* GL_RGBA */
+      1317, /* GL_RGB */
+      1336, /* GL_RGBA */
        708, /* GL_LUMINANCE */
        729, /* GL_LUMINANCE_ALPHA */
         72, /* GL_BITMAP */
-      1114, /* GL_POINT */
+      1120, /* GL_POINT */
        678, /* GL_LINE */
        477, /* GL_FILL */
-      1285, /* GL_RENDER */
+      1291, /* GL_RENDER */
        473, /* GL_FEEDBACK */
-      1388, /* GL_SELECT */
+      1394, /* GL_SELECT */
        478, /* GL_FLAT */
-      1412, /* GL_SMOOTH */
+      1418, /* GL_SMOOTH */
        659, /* GL_KEEP */
-      1305, /* GL_REPLACE */
+      1311, /* GL_REPLACE */
        613, /* GL_INCR */
        338, /* GL_DECR */
-      1750, /* GL_VENDOR */
-      1302, /* GL_RENDERER */
-      1751, /* GL_VERSION */
+      1756, /* GL_VENDOR */
+      1308, /* GL_RENDERER */
+      1757, /* GL_VERSION */
        466, /* GL_EXTENSIONS */
-      1353, /* GL_S */
-      1505, /* GL_T */
-      1265, /* GL_R */
-      1254, /* GL_Q */
-       974, /* GL_MODULATE */
+      1359, /* GL_S */
+      1511, /* GL_T */
+      1271, /* GL_R */
+      1260, /* GL_Q */
+       980, /* GL_MODULATE */
        337, /* GL_DECAL */
-      1650, /* GL_TEXTURE_ENV_MODE */
-      1649, /* GL_TEXTURE_ENV_COLOR */
-      1648, /* GL_TEXTURE_ENV */
+      1656, /* GL_TEXTURE_ENV_MODE */
+      1655, /* GL_TEXTURE_ENV_COLOR */
+      1654, /* GL_TEXTURE_ENV */
        467, /* GL_EYE_LINEAR */
-      1021, /* GL_OBJECT_LINEAR */
-      1438, /* GL_SPHERE_MAP */
-      1652, /* GL_TEXTURE_GEN_MODE */
-      1023, /* GL_OBJECT_PLANE */
+      1027, /* GL_OBJECT_LINEAR */
+      1444, /* GL_SPHERE_MAP */
+      1658, /* GL_TEXTURE_GEN_MODE */
+      1029, /* GL_OBJECT_PLANE */
        468, /* GL_EYE_PLANE */
-       989, /* GL_NEAREST */
+       995, /* GL_NEAREST */
        679, /* GL_LINEAR */
-       993, /* GL_NEAREST_MIPMAP_NEAREST */
+       999, /* GL_NEAREST_MIPMAP_NEAREST */
        684, /* GL_LINEAR_MIPMAP_NEAREST */
-       992, /* GL_NEAREST_MIPMAP_LINEAR */
+       998, /* GL_NEAREST_MIPMAP_LINEAR */
        683, /* GL_LINEAR_MIPMAP_LINEAR */
-      1673, /* GL_TEXTURE_MAG_FILTER */
-      1681, /* GL_TEXTURE_MIN_FILTER */
-      1695, /* GL_TEXTURE_WRAP_S */
-      1696, /* GL_TEXTURE_WRAP_T */
+      1679, /* GL_TEXTURE_MAG_FILTER */
+      1687, /* GL_TEXTURE_MIN_FILTER */
+      1701, /* GL_TEXTURE_WRAP_S */
+      1702, /* GL_TEXTURE_WRAP_T */
        123, /* GL_CLAMP */
-      1304, /* GL_REPEAT */
-      1152, /* GL_POLYGON_OFFSET_UNITS */
-      1151, /* GL_POLYGON_OFFSET_POINT */
-      1150, /* GL_POLYGON_OFFSET_LINE */
-      1266, /* GL_R3_G3_B2 */
-      1747, /* GL_V2F */
-      1748, /* GL_V3F */
+      1310, /* GL_REPEAT */
+      1158, /* GL_POLYGON_OFFSET_UNITS */
+      1157, /* GL_POLYGON_OFFSET_POINT */
+      1156, /* GL_POLYGON_OFFSET_LINE */
+      1272, /* GL_R3_G3_B2 */
+      1753, /* GL_V2F */
+      1754, /* GL_V3F */
        120, /* GL_C4UB_V2F */
        121, /* GL_C4UB_V3F */
        118, /* GL_C3F_V3F */
-       986, /* GL_N3F_V3F */
+       992, /* GL_N3F_V3F */
        119, /* GL_C4F_N3F_V3F */
-      1510, /* GL_T2F_V3F */
-      1512, /* GL_T4F_V4F */
-      1508, /* GL_T2F_C4UB_V3F */
-      1506, /* GL_T2F_C3F_V3F */
-      1509, /* GL_T2F_N3F_V3F */
-      1507, /* GL_T2F_C4F_N3F_V3F */
-      1511, /* GL_T4F_C4F_N3F_V4F */
+      1516, /* GL_T2F_V3F */
+      1518, /* GL_T4F_V4F */
+      1514, /* GL_T2F_C4UB_V3F */
+      1512, /* GL_T2F_C3F_V3F */
+      1515, /* GL_T2F_N3F_V3F */
+      1513, /* GL_T2F_C4F_N3F_V3F */
+      1517, /* GL_T4F_C4F_N3F_V4F */
        136, /* GL_CLIP_PLANE0 */
        137, /* GL_CLIP_PLANE1 */
        138, /* GL_CLIP_PLANE2 */
@@ -4119,38 +4131,38 @@ static const unsigned reduced_enums[1321] =
        670, /* GL_LIGHT7 */
        590, /* GL_HINT_BIT */
        273, /* GL_CONSTANT_COLOR */
-      1033, /* GL_ONE_MINUS_CONSTANT_COLOR */
+      1039, /* GL_ONE_MINUS_CONSTANT_COLOR */
        268, /* GL_CONSTANT_ALPHA */
-      1031, /* GL_ONE_MINUS_CONSTANT_ALPHA */
+      1037, /* GL_ONE_MINUS_CONSTANT_ALPHA */
         75, /* GL_BLEND_COLOR */
        574, /* GL_FUNC_ADD */
-       922, /* GL_MIN */
-       833, /* GL_MAX */
+       928, /* GL_MIN */
+       839, /* GL_MAX */
         80, /* GL_BLEND_EQUATION */
        578, /* GL_FUNC_SUBTRACT */
        576, /* GL_FUNC_REVERSE_SUBTRACT */
        276, /* GL_CONVOLUTION_1D */
        277, /* GL_CONVOLUTION_2D */
-      1391, /* GL_SEPARABLE_2D */
+      1397, /* GL_SEPARABLE_2D */
        280, /* GL_CONVOLUTION_BORDER_MODE */
        284, /* GL_CONVOLUTION_FILTER_SCALE */
        282, /* GL_CONVOLUTION_FILTER_BIAS */
-      1277, /* GL_REDUCE */
+      1283, /* GL_REDUCE */
        286, /* GL_CONVOLUTION_FORMAT */
        290, /* GL_CONVOLUTION_WIDTH */
        288, /* GL_CONVOLUTION_HEIGHT */
-       848, /* GL_MAX_CONVOLUTION_WIDTH */
-       846, /* GL_MAX_CONVOLUTION_HEIGHT */
-      1191, /* GL_POST_CONVOLUTION_RED_SCALE */
-      1187, /* GL_POST_CONVOLUTION_GREEN_SCALE */
-      1182, /* GL_POST_CONVOLUTION_BLUE_SCALE */
-      1178, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
-      1189, /* GL_POST_CONVOLUTION_RED_BIAS */
-      1185, /* GL_POST_CONVOLUTION_GREEN_BIAS */
-      1180, /* GL_POST_CONVOLUTION_BLUE_BIAS */
-      1176, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
+       854, /* GL_MAX_CONVOLUTION_WIDTH */
+       852, /* GL_MAX_CONVOLUTION_HEIGHT */
+      1197, /* GL_POST_CONVOLUTION_RED_SCALE */
+      1193, /* GL_POST_CONVOLUTION_GREEN_SCALE */
+      1188, /* GL_POST_CONVOLUTION_BLUE_SCALE */
+      1184, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
+      1195, /* GL_POST_CONVOLUTION_RED_BIAS */
+      1191, /* GL_POST_CONVOLUTION_GREEN_BIAS */
+      1186, /* GL_POST_CONVOLUTION_BLUE_BIAS */
+      1182, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
        591, /* GL_HISTOGRAM */
-      1238, /* GL_PROXY_HISTOGRAM */
+      1244, /* GL_PROXY_HISTOGRAM */
        607, /* GL_HISTOGRAM_WIDTH */
        597, /* GL_HISTOGRAM_FORMAT */
        603, /* GL_HISTOGRAM_RED_SIZE */
@@ -4159,19 +4171,19 @@ static const unsigned reduced_enums[1321] =
        592, /* GL_HISTOGRAM_ALPHA_SIZE */
        601, /* GL_HISTOGRAM_LUMINANCE_SIZE */
        605, /* GL_HISTOGRAM_SINK */
-       923, /* GL_MINMAX */
-       925, /* GL_MINMAX_FORMAT */
-       927, /* GL_MINMAX_SINK */
-      1513, /* GL_TABLE_TOO_LARGE_EXT */
-      1726, /* GL_UNSIGNED_BYTE_3_3_2 */
-      1737, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-      1739, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-      1732, /* GL_UNSIGNED_INT_8_8_8_8 */
-      1728, /* GL_UNSIGNED_INT_10_10_10_2 */
-      1149, /* GL_POLYGON_OFFSET_FILL */
-      1148, /* GL_POLYGON_OFFSET_FACTOR */
-      1147, /* GL_POLYGON_OFFSET_BIAS */
-      1308, /* GL_RESCALE_NORMAL */
+       929, /* GL_MINMAX */
+       931, /* GL_MINMAX_FORMAT */
+       933, /* GL_MINMAX_SINK */
+      1519, /* GL_TABLE_TOO_LARGE_EXT */
+      1732, /* GL_UNSIGNED_BYTE_3_3_2 */
+      1743, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+      1745, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+      1738, /* GL_UNSIGNED_INT_8_8_8_8 */
+      1734, /* GL_UNSIGNED_INT_10_10_10_2 */
+      1155, /* GL_POLYGON_OFFSET_FILL */
+      1154, /* GL_POLYGON_OFFSET_FACTOR */
+      1153, /* GL_POLYGON_OFFSET_BIAS */
+      1314, /* GL_RESCALE_NORMAL */
         36, /* GL_ALPHA4 */
         38, /* GL_ALPHA8 */
         32, /* GL_ALPHA12 */
@@ -4191,102 +4203,102 @@ static const unsigned reduced_enums[1321] =
        639, /* GL_INTENSITY8 */
        633, /* GL_INTENSITY12 */
        635, /* GL_INTENSITY16 */
-      1320, /* GL_RGB2_EXT */
-      1321, /* GL_RGB4 */
-      1324, /* GL_RGB5 */
-      1328, /* GL_RGB8 */
-      1312, /* GL_RGB10 */
-      1316, /* GL_RGB12 */
-      1318, /* GL_RGB16 */
-      1335, /* GL_RGBA2 */
-      1337, /* GL_RGBA4 */
-      1325, /* GL_RGB5_A1 */
-      1341, /* GL_RGBA8 */
-      1313, /* GL_RGB10_A2 */
-      1331, /* GL_RGBA12 */
-      1333, /* GL_RGBA16 */
-      1686, /* GL_TEXTURE_RED_SIZE */
-      1658, /* GL_TEXTURE_GREEN_SIZE */
-      1597, /* GL_TEXTURE_BLUE_SIZE */
-      1584, /* GL_TEXTURE_ALPHA_SIZE */
-      1671, /* GL_TEXTURE_LUMINANCE_SIZE */
-      1662, /* GL_TEXTURE_INTENSITY_SIZE */
-      1306, /* GL_REPLACE_EXT */
-      1242, /* GL_PROXY_TEXTURE_1D */
-      1245, /* GL_PROXY_TEXTURE_2D */
-      1691, /* GL_TEXTURE_TOO_LARGE_EXT */
-      1683, /* GL_TEXTURE_PRIORITY */
-      1688, /* GL_TEXTURE_RESIDENT */
-      1587, /* GL_TEXTURE_BINDING_1D */
-      1589, /* GL_TEXTURE_BINDING_2D */
-      1591, /* GL_TEXTURE_BINDING_3D */
-      1069, /* GL_PACK_SKIP_IMAGES */
-      1065, /* GL_PACK_IMAGE_HEIGHT */
-      1720, /* GL_UNPACK_SKIP_IMAGES */
-      1717, /* GL_UNPACK_IMAGE_HEIGHT */
-      1583, /* GL_TEXTURE_3D */
-      1248, /* GL_PROXY_TEXTURE_3D */
-      1645, /* GL_TEXTURE_DEPTH */
-      1694, /* GL_TEXTURE_WRAP_R */
-       834, /* GL_MAX_3D_TEXTURE_SIZE */
-      1752, /* GL_VERTEX_ARRAY */
-      1000, /* GL_NORMAL_ARRAY */
+      1326, /* GL_RGB2_EXT */
+      1327, /* GL_RGB4 */
+      1330, /* GL_RGB5 */
+      1334, /* GL_RGB8 */
+      1318, /* GL_RGB10 */
+      1322, /* GL_RGB12 */
+      1324, /* GL_RGB16 */
+      1341, /* GL_RGBA2 */
+      1343, /* GL_RGBA4 */
+      1331, /* GL_RGB5_A1 */
+      1347, /* GL_RGBA8 */
+      1319, /* GL_RGB10_A2 */
+      1337, /* GL_RGBA12 */
+      1339, /* GL_RGBA16 */
+      1692, /* GL_TEXTURE_RED_SIZE */
+      1664, /* GL_TEXTURE_GREEN_SIZE */
+      1603, /* GL_TEXTURE_BLUE_SIZE */
+      1590, /* GL_TEXTURE_ALPHA_SIZE */
+      1677, /* GL_TEXTURE_LUMINANCE_SIZE */
+      1668, /* GL_TEXTURE_INTENSITY_SIZE */
+      1312, /* GL_REPLACE_EXT */
+      1248, /* GL_PROXY_TEXTURE_1D */
+      1251, /* GL_PROXY_TEXTURE_2D */
+      1697, /* GL_TEXTURE_TOO_LARGE_EXT */
+      1689, /* GL_TEXTURE_PRIORITY */
+      1694, /* GL_TEXTURE_RESIDENT */
+      1593, /* GL_TEXTURE_BINDING_1D */
+      1595, /* GL_TEXTURE_BINDING_2D */
+      1597, /* GL_TEXTURE_BINDING_3D */
+      1075, /* GL_PACK_SKIP_IMAGES */
+      1071, /* GL_PACK_IMAGE_HEIGHT */
+      1726, /* GL_UNPACK_SKIP_IMAGES */
+      1723, /* GL_UNPACK_IMAGE_HEIGHT */
+      1589, /* GL_TEXTURE_3D */
+      1254, /* GL_PROXY_TEXTURE_3D */
+      1651, /* GL_TEXTURE_DEPTH */
+      1700, /* GL_TEXTURE_WRAP_R */
+       840, /* GL_MAX_3D_TEXTURE_SIZE */
+      1758, /* GL_VERTEX_ARRAY */
+      1006, /* GL_NORMAL_ARRAY */
        145, /* GL_COLOR_ARRAY */
        617, /* GL_INDEX_ARRAY */
-      1624, /* GL_TEXTURE_COORD_ARRAY */
+      1630, /* GL_TEXTURE_COORD_ARRAY */
        451, /* GL_EDGE_FLAG_ARRAY */
-      1757, /* GL_VERTEX_ARRAY_SIZE */
-      1759, /* GL_VERTEX_ARRAY_TYPE */
-      1758, /* GL_VERTEX_ARRAY_STRIDE */
-      1005, /* GL_NORMAL_ARRAY_TYPE */
-      1004, /* GL_NORMAL_ARRAY_STRIDE */
+      1763, /* GL_VERTEX_ARRAY_SIZE */
+      1765, /* GL_VERTEX_ARRAY_TYPE */
+      1764, /* GL_VERTEX_ARRAY_STRIDE */
+      1011, /* GL_NORMAL_ARRAY_TYPE */
+      1010, /* GL_NORMAL_ARRAY_STRIDE */
        149, /* GL_COLOR_ARRAY_SIZE */
        151, /* GL_COLOR_ARRAY_TYPE */
        150, /* GL_COLOR_ARRAY_STRIDE */
        622, /* GL_INDEX_ARRAY_TYPE */
        621, /* GL_INDEX_ARRAY_STRIDE */
-      1628, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-      1630, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-      1629, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
+      1634, /* GL_TEXTURE_COORD_ARRAY_SIZE */
+      1636, /* GL_TEXTURE_COORD_ARRAY_TYPE */
+      1635, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
        455, /* GL_EDGE_FLAG_ARRAY_STRIDE */
-      1756, /* GL_VERTEX_ARRAY_POINTER */
-      1003, /* GL_NORMAL_ARRAY_POINTER */
+      1762, /* GL_VERTEX_ARRAY_POINTER */
+      1009, /* GL_NORMAL_ARRAY_POINTER */
        148, /* GL_COLOR_ARRAY_POINTER */
        620, /* GL_INDEX_ARRAY_POINTER */
-      1627, /* GL_TEXTURE_COORD_ARRAY_POINTER */
+      1633, /* GL_TEXTURE_COORD_ARRAY_POINTER */
        454, /* GL_EDGE_FLAG_ARRAY_POINTER */
-       979, /* GL_MULTISAMPLE */
-      1365, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
-      1367, /* GL_SAMPLE_ALPHA_TO_ONE */
-      1372, /* GL_SAMPLE_COVERAGE */
-      1369, /* GL_SAMPLE_BUFFERS */
-      1360, /* GL_SAMPLES */
-      1376, /* GL_SAMPLE_COVERAGE_VALUE */
-      1374, /* GL_SAMPLE_COVERAGE_INVERT */
+       985, /* GL_MULTISAMPLE */
+      1371, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
+      1373, /* GL_SAMPLE_ALPHA_TO_ONE */
+      1378, /* GL_SAMPLE_COVERAGE */
+      1375, /* GL_SAMPLE_BUFFERS */
+      1366, /* GL_SAMPLES */
+      1382, /* GL_SAMPLE_COVERAGE_VALUE */
+      1380, /* GL_SAMPLE_COVERAGE_INVERT */
        192, /* GL_COLOR_MATRIX */
        194, /* GL_COLOR_MATRIX_STACK_DEPTH */
-       842, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
-      1174, /* GL_POST_COLOR_MATRIX_RED_SCALE */
-      1170, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
-      1165, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
-      1161, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
-      1172, /* GL_POST_COLOR_MATRIX_RED_BIAS */
-      1168, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
-      1163, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
-      1159, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
-      1607, /* GL_TEXTURE_COLOR_TABLE_SGI */
-      1249, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
-      1609, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+       848, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
+      1180, /* GL_POST_COLOR_MATRIX_RED_SCALE */
+      1176, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
+      1171, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
+      1167, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
+      1178, /* GL_POST_COLOR_MATRIX_RED_BIAS */
+      1174, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
+      1169, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
+      1165, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
+      1613, /* GL_TEXTURE_COLOR_TABLE_SGI */
+      1255, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
+      1615, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
         79, /* GL_BLEND_DST_RGB */
         88, /* GL_BLEND_SRC_RGB */
         78, /* GL_BLEND_DST_ALPHA */
         87, /* GL_BLEND_SRC_ALPHA */
        198, /* GL_COLOR_TABLE */
-      1184, /* GL_POST_CONVOLUTION_COLOR_TABLE */
-      1167, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
-      1237, /* GL_PROXY_COLOR_TABLE */
-      1241, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
-      1240, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
+      1190, /* GL_POST_CONVOLUTION_COLOR_TABLE */
+      1173, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
+      1243, /* GL_PROXY_COLOR_TABLE */
+      1247, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
+      1246, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
        222, /* GL_COLOR_TABLE_SCALE */
        202, /* GL_COLOR_TABLE_BIAS */
        207, /* GL_COLOR_TABLE_FORMAT */
@@ -4299,62 +4311,62 @@ static const unsigned reduced_enums[1321] =
        213, /* GL_COLOR_TABLE_INTENSITY_SIZE */
         70, /* GL_BGR */
         71, /* GL_BGRA */
-       856, /* GL_MAX_ELEMENTS_VERTICES */
-       855, /* GL_MAX_ELEMENTS_INDICES */
-      1661, /* GL_TEXTURE_INDEX_SIZE_EXT */
+       862, /* GL_MAX_ELEMENTS_VERTICES */
+       861, /* GL_MAX_ELEMENTS_INDICES */
+      1667, /* GL_TEXTURE_INDEX_SIZE_EXT */
        142, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
-      1131, /* GL_POINT_SIZE_MIN */
-      1127, /* GL_POINT_SIZE_MAX */
-      1121, /* GL_POINT_FADE_THRESHOLD_SIZE */
-      1117, /* GL_POINT_DISTANCE_ATTENUATION */
+      1137, /* GL_POINT_SIZE_MIN */
+      1133, /* GL_POINT_SIZE_MAX */
+      1127, /* GL_POINT_FADE_THRESHOLD_SIZE */
+      1123, /* GL_POINT_DISTANCE_ATTENUATION */
        124, /* GL_CLAMP_TO_BORDER */
        127, /* GL_CLAMP_TO_EDGE */
-      1682, /* GL_TEXTURE_MIN_LOD */
-      1680, /* GL_TEXTURE_MAX_LOD */
-      1586, /* GL_TEXTURE_BASE_LEVEL */
-      1679, /* GL_TEXTURE_MAX_LEVEL */
+      1688, /* GL_TEXTURE_MIN_LOD */
+      1686, /* GL_TEXTURE_MAX_LOD */
+      1592, /* GL_TEXTURE_BASE_LEVEL */
+      1685, /* GL_TEXTURE_MAX_LEVEL */
        610, /* GL_IGNORE_BORDER_HP */
        272, /* GL_CONSTANT_BORDER_HP */
-      1307, /* GL_REPLICATE_BORDER_HP */
+      1313, /* GL_REPLICATE_BORDER_HP */
        278, /* GL_CONVOLUTION_BORDER_COLOR */
-      1028, /* GL_OCCLUSION_TEST_HP */
-      1029, /* GL_OCCLUSION_TEST_RESULT_HP */
+      1034, /* GL_OCCLUSION_TEST_HP */
+      1035, /* GL_OCCLUSION_TEST_RESULT_HP */
        681, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
-      1601, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-      1603, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-      1605, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-      1606, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-      1604, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-      1602, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
-       838, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
-       839, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-      1194, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
-      1196, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
-      1193, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
-      1195, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
-      1669, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-      1670, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-      1668, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+      1607, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
+      1609, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
+      1611, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
+      1612, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+      1610, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
+      1608, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
+       844, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
+       845, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+      1200, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
+      1202, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
+      1199, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
+      1201, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
+      1675, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+      1676, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+      1674, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
        580, /* GL_GENERATE_MIPMAP */
        581, /* GL_GENERATE_MIPMAP_HINT */
        522, /* GL_FOG_OFFSET_SGIX */
        523, /* GL_FOG_OFFSET_VALUE_SGIX */
-      1615, /* GL_TEXTURE_COMPARE_SGIX */
-      1614, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-      1665, /* GL_TEXTURE_LEQUAL_R_SGIX */
-      1657, /* GL_TEXTURE_GEQUAL_R_SGIX */
+      1621, /* GL_TEXTURE_COMPARE_SGIX */
+      1620, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
+      1671, /* GL_TEXTURE_LEQUAL_R_SGIX */
+      1663, /* GL_TEXTURE_GEQUAL_R_SGIX */
        354, /* GL_DEPTH_COMPONENT16 */
        357, /* GL_DEPTH_COMPONENT24 */
        360, /* GL_DEPTH_COMPONENT32 */
        302, /* GL_CULL_VERTEX_EXT */
        304, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
        303, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
-      1813, /* GL_WRAP_BORDER_SUN */
-      1608, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
+      1819, /* GL_WRAP_BORDER_SUN */
+      1614, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
        674, /* GL_LIGHT_MODEL_COLOR_CONTROL */
-      1405, /* GL_SINGLE_COLOR */
-      1392, /* GL_SEPARATE_SPECULAR_COLOR */
-      1401, /* GL_SHARED_TEXTURE_PALETTE_EXT */
+      1411, /* GL_SINGLE_COLOR */
+      1398, /* GL_SEPARATE_SPECULAR_COLOR */
+      1407, /* GL_SHARED_TEXTURE_PALETTE_EXT */
        533, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
        534, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
        541, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
@@ -4367,29 +4379,29 @@ static const unsigned reduced_enums[1321] =
        566, /* GL_FRAMEBUFFER_UNDEFINED */
        367, /* GL_DEPTH_STENCIL_ATTACHMENT */
        616, /* GL_INDEX */
-      1725, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-      1740, /* GL_UNSIGNED_SHORT_5_6_5 */
-      1741, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-      1738, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-      1736, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-      1733, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-      1731, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-      1677, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-      1678, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-      1676, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
-       930, /* GL_MIRRORED_REPEAT */
-      1348, /* GL_RGB_S3TC */
-      1323, /* GL_RGB4_S3TC */
-      1346, /* GL_RGBA_S3TC */
-      1340, /* GL_RGBA4_S3TC */
-      1344, /* GL_RGBA_DXT5_S3TC */
-      1338, /* GL_RGBA4_DXT5_S3TC */
+      1731, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+      1746, /* GL_UNSIGNED_SHORT_5_6_5 */
+      1747, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+      1744, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+      1742, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+      1739, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+      1737, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+      1683, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+      1684, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+      1682, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+       936, /* GL_MIRRORED_REPEAT */
+      1354, /* GL_RGB_S3TC */
+      1329, /* GL_RGB4_S3TC */
+      1352, /* GL_RGBA_S3TC */
+      1346, /* GL_RGBA4_S3TC */
+      1350, /* GL_RGBA_DXT5_S3TC */
+      1344, /* GL_RGBA4_DXT5_S3TC */
        261, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
        256, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
        257, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
        258, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */
-       991, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
-       990, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
+       997, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
+       996, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
        682, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
        509, /* GL_FOG_COORDINATE_SOURCE */
        501, /* GL_FOG_COORD */
@@ -4401,180 +4413,180 @@ static const unsigned reduced_enums[1321] =
        503, /* GL_FOG_COORDINATE_ARRAY */
        196, /* GL_COLOR_SUM */
        328, /* GL_CURRENT_SECONDARY_COLOR */
-      1385, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
-      1387, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
-      1386, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
-      1384, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
-      1381, /* GL_SECONDARY_COLOR_ARRAY */
+      1391, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
+      1393, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
+      1392, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
+      1390, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
+      1387, /* GL_SECONDARY_COLOR_ARRAY */
        326, /* GL_CURRENT_RASTER_SECONDARY_COLOR */
         28, /* GL_ALIASED_POINT_SIZE_RANGE */
         27, /* GL_ALIASED_LINE_WIDTH_RANGE */
-      1515, /* GL_TEXTURE0 */
-      1517, /* GL_TEXTURE1 */
-      1539, /* GL_TEXTURE2 */
-      1561, /* GL_TEXTURE3 */
-      1567, /* GL_TEXTURE4 */
-      1569, /* GL_TEXTURE5 */
-      1571, /* GL_TEXTURE6 */
-      1573, /* GL_TEXTURE7 */
-      1575, /* GL_TEXTURE8 */
-      1577, /* GL_TEXTURE9 */
-      1518, /* GL_TEXTURE10 */
-      1520, /* GL_TEXTURE11 */
-      1522, /* GL_TEXTURE12 */
-      1524, /* GL_TEXTURE13 */
-      1526, /* GL_TEXTURE14 */
-      1528, /* GL_TEXTURE15 */
-      1530, /* GL_TEXTURE16 */
-      1532, /* GL_TEXTURE17 */
-      1534, /* GL_TEXTURE18 */
-      1536, /* GL_TEXTURE19 */
-      1540, /* GL_TEXTURE20 */
-      1542, /* GL_TEXTURE21 */
-      1544, /* GL_TEXTURE22 */
-      1546, /* GL_TEXTURE23 */
-      1548, /* GL_TEXTURE24 */
-      1550, /* GL_TEXTURE25 */
-      1552, /* GL_TEXTURE26 */
-      1554, /* GL_TEXTURE27 */
-      1556, /* GL_TEXTURE28 */
-      1558, /* GL_TEXTURE29 */
-      1562, /* GL_TEXTURE30 */
-      1564, /* GL_TEXTURE31 */
+      1521, /* GL_TEXTURE0 */
+      1523, /* GL_TEXTURE1 */
+      1545, /* GL_TEXTURE2 */
+      1567, /* GL_TEXTURE3 */
+      1573, /* GL_TEXTURE4 */
+      1575, /* GL_TEXTURE5 */
+      1577, /* GL_TEXTURE6 */
+      1579, /* GL_TEXTURE7 */
+      1581, /* GL_TEXTURE8 */
+      1583, /* GL_TEXTURE9 */
+      1524, /* GL_TEXTURE10 */
+      1526, /* GL_TEXTURE11 */
+      1528, /* GL_TEXTURE12 */
+      1530, /* GL_TEXTURE13 */
+      1532, /* GL_TEXTURE14 */
+      1534, /* GL_TEXTURE15 */
+      1536, /* GL_TEXTURE16 */
+      1538, /* GL_TEXTURE17 */
+      1540, /* GL_TEXTURE18 */
+      1542, /* GL_TEXTURE19 */
+      1546, /* GL_TEXTURE20 */
+      1548, /* GL_TEXTURE21 */
+      1550, /* GL_TEXTURE22 */
+      1552, /* GL_TEXTURE23 */
+      1554, /* GL_TEXTURE24 */
+      1556, /* GL_TEXTURE25 */
+      1558, /* GL_TEXTURE26 */
+      1560, /* GL_TEXTURE27 */
+      1562, /* GL_TEXTURE28 */
+      1564, /* GL_TEXTURE29 */
+      1568, /* GL_TEXTURE30 */
+      1570, /* GL_TEXTURE31 */
         18, /* GL_ACTIVE_TEXTURE */
        130, /* GL_CLIENT_ACTIVE_TEXTURE */
-       908, /* GL_MAX_TEXTURE_UNITS */
-      1704, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-      1707, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-      1709, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-      1701, /* GL_TRANSPOSE_COLOR_MATRIX */
-      1503, /* GL_SUBTRACT */
-       896, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
+       914, /* GL_MAX_TEXTURE_UNITS */
+      1710, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+      1713, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+      1715, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+      1707, /* GL_TRANSPOSE_COLOR_MATRIX */
+      1509, /* GL_SUBTRACT */
+       902, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
        244, /* GL_COMPRESSED_ALPHA */
        248, /* GL_COMPRESSED_LUMINANCE */
        249, /* GL_COMPRESSED_LUMINANCE_ALPHA */
        246, /* GL_COMPRESSED_INTENSITY */
        252, /* GL_COMPRESSED_RGB */
        253, /* GL_COMPRESSED_RGBA */
-      1622, /* GL_TEXTURE_COMPRESSION_HINT */
-      1684, /* GL_TEXTURE_RECTANGLE_ARB */
-      1594, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
-      1252, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
-       894, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
+      1628, /* GL_TEXTURE_COMPRESSION_HINT */
+      1690, /* GL_TEXTURE_RECTANGLE_ARB */
+      1600, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
+      1258, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
+       900, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
        366, /* GL_DEPTH_STENCIL */
-      1729, /* GL_UNSIGNED_INT_24_8 */
-       904, /* GL_MAX_TEXTURE_LOD_BIAS */
-      1675, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
-       905, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
-      1651, /* GL_TEXTURE_FILTER_CONTROL */
-      1666, /* GL_TEXTURE_LOD_BIAS */
+      1735, /* GL_UNSIGNED_INT_24_8 */
+       910, /* GL_MAX_TEXTURE_LOD_BIAS */
+      1681, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+       911, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
+      1657, /* GL_TEXTURE_FILTER_CONTROL */
+      1672, /* GL_TEXTURE_LOD_BIAS */
        229, /* GL_COMBINE4 */
-       898, /* GL_MAX_SHININESS_NV */
-       899, /* GL_MAX_SPOT_EXPONENT_NV */
+       904, /* GL_MAX_SHININESS_NV */
+       905, /* GL_MAX_SPOT_EXPONENT_NV */
        614, /* GL_INCR_WRAP */
        339, /* GL_DECR_WRAP */
-       950, /* GL_MODELVIEW1_ARB */
-      1006, /* GL_NORMAL_MAP */
-      1282, /* GL_REFLECTION_MAP */
-      1631, /* GL_TEXTURE_CUBE_MAP */
-      1592, /* GL_TEXTURE_BINDING_CUBE_MAP */
-      1639, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-      1633, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-      1641, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-      1635, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-      1643, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-      1637, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
-      1250, /* GL_PROXY_TEXTURE_CUBE_MAP */
-       850, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
-       985, /* GL_MULTISAMPLE_FILTER_HINT_NV */
+       956, /* GL_MODELVIEW1_ARB */
+      1012, /* GL_NORMAL_MAP */
+      1288, /* GL_REFLECTION_MAP */
+      1637, /* GL_TEXTURE_CUBE_MAP */
+      1598, /* GL_TEXTURE_BINDING_CUBE_MAP */
+      1645, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
+      1639, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
+      1647, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
+      1641, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
+      1649, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
+      1643, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
+      1256, /* GL_PROXY_TEXTURE_CUBE_MAP */
+       856, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
+       991, /* GL_MULTISAMPLE_FILTER_HINT_NV */
        517, /* GL_FOG_DISTANCE_MODE_NV */
        470, /* GL_EYE_RADIAL_NV */
        469, /* GL_EYE_PLANE_ABSOLUTE_NV */
        228, /* GL_COMBINE */
        235, /* GL_COMBINE_RGB */
        230, /* GL_COMBINE_ALPHA */
-      1349, /* GL_RGB_SCALE */
+      1355, /* GL_RGB_SCALE */
         24, /* GL_ADD_SIGNED */
        642, /* GL_INTERPOLATE */
        267, /* GL_CONSTANT */
-      1200, /* GL_PRIMARY_COLOR */
-      1197, /* GL_PREVIOUS */
-      1420, /* GL_SOURCE0_RGB */
-      1426, /* GL_SOURCE1_RGB */
-      1432, /* GL_SOURCE2_RGB */
-      1436, /* GL_SOURCE3_RGB_NV */
-      1417, /* GL_SOURCE0_ALPHA */
-      1423, /* GL_SOURCE1_ALPHA */
-      1429, /* GL_SOURCE2_ALPHA */
-      1435, /* GL_SOURCE3_ALPHA_NV */
-      1042, /* GL_OPERAND0_RGB */
-      1048, /* GL_OPERAND1_RGB */
-      1054, /* GL_OPERAND2_RGB */
-      1058, /* GL_OPERAND3_RGB_NV */
-      1039, /* GL_OPERAND0_ALPHA */
-      1045, /* GL_OPERAND1_ALPHA */
-      1051, /* GL_OPERAND2_ALPHA */
-      1057, /* GL_OPERAND3_ALPHA_NV */
-      1753, /* GL_VERTEX_ARRAY_BINDING_APPLE */
-      1817, /* GL_YCBCR_422_APPLE */
-      1742, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-      1744, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-      1407, /* GL_SLICE_ACCUM_SUN */
-      1257, /* GL_QUAD_MESH_SUN */
-      1713, /* GL_TRIANGLE_MESH_SUN */
-      1791, /* GL_VERTEX_PROGRAM_ARB */
-      1802, /* GL_VERTEX_STATE_PROGRAM_NV */
-      1778, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-      1784, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-      1786, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-      1788, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+      1206, /* GL_PRIMARY_COLOR */
+      1203, /* GL_PREVIOUS */
+      1426, /* GL_SOURCE0_RGB */
+      1432, /* GL_SOURCE1_RGB */
+      1438, /* GL_SOURCE2_RGB */
+      1442, /* GL_SOURCE3_RGB_NV */
+      1423, /* GL_SOURCE0_ALPHA */
+      1429, /* GL_SOURCE1_ALPHA */
+      1435, /* GL_SOURCE2_ALPHA */
+      1441, /* GL_SOURCE3_ALPHA_NV */
+      1048, /* GL_OPERAND0_RGB */
+      1054, /* GL_OPERAND1_RGB */
+      1060, /* GL_OPERAND2_RGB */
+      1064, /* GL_OPERAND3_RGB_NV */
+      1045, /* GL_OPERAND0_ALPHA */
+      1051, /* GL_OPERAND1_ALPHA */
+      1057, /* GL_OPERAND2_ALPHA */
+      1063, /* GL_OPERAND3_ALPHA_NV */
+      1759, /* GL_VERTEX_ARRAY_BINDING_APPLE */
+      1823, /* GL_YCBCR_422_APPLE */
+      1748, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+      1750, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+      1413, /* GL_SLICE_ACCUM_SUN */
+      1263, /* GL_QUAD_MESH_SUN */
+      1719, /* GL_TRIANGLE_MESH_SUN */
+      1797, /* GL_VERTEX_PROGRAM_ARB */
+      1808, /* GL_VERTEX_STATE_PROGRAM_NV */
+      1784, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+      1790, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+      1792, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+      1794, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
        330, /* GL_CURRENT_VERTEX_ATTRIB */
-      1213, /* GL_PROGRAM_LENGTH_ARB */
-      1227, /* GL_PROGRAM_STRING_ARB */
-       972, /* GL_MODELVIEW_PROJECTION_NV */
+      1219, /* GL_PROGRAM_LENGTH_ARB */
+      1233, /* GL_PROGRAM_STRING_ARB */
+       978, /* GL_MODELVIEW_PROJECTION_NV */
        609, /* GL_IDENTITY_NV */
        656, /* GL_INVERSE_NV */
-      1706, /* GL_TRANSPOSE_NV */
+      1712, /* GL_TRANSPOSE_NV */
        657, /* GL_INVERSE_TRANSPOSE_NV */
-       880, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
-       879, /* GL_MAX_PROGRAM_MATRICES_ARB */
-       787, /* GL_MATRIX0_NV */
-       799, /* GL_MATRIX1_NV */
-       811, /* GL_MATRIX2_NV */
-       815, /* GL_MATRIX3_NV */
-       817, /* GL_MATRIX4_NV */
-       819, /* GL_MATRIX5_NV */
-       821, /* GL_MATRIX6_NV */
-       823, /* GL_MATRIX7_NV */
+       886, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
+       885, /* GL_MAX_PROGRAM_MATRICES_ARB */
+       793, /* GL_MATRIX0_NV */
+       805, /* GL_MATRIX1_NV */
+       817, /* GL_MATRIX2_NV */
+       821, /* GL_MATRIX3_NV */
+       823, /* GL_MATRIX4_NV */
+       825, /* GL_MATRIX5_NV */
+       827, /* GL_MATRIX6_NV */
+       829, /* GL_MATRIX7_NV */
        314, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
        311, /* GL_CURRENT_MATRIX_ARB */
-      1794, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-      1797, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-      1225, /* GL_PROGRAM_PARAMETER_NV */
-      1782, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-      1229, /* GL_PROGRAM_TARGET_NV */
-      1226, /* GL_PROGRAM_RESIDENT_NV */
-      1698, /* GL_TRACK_MATRIX_NV */
-      1699, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-      1792, /* GL_VERTEX_PROGRAM_BINDING_NV */
-      1207, /* GL_PROGRAM_ERROR_POSITION_ARB */
+      1800, /* GL_VERTEX_PROGRAM_POINT_SIZE */
+      1803, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+      1231, /* GL_PROGRAM_PARAMETER_NV */
+      1788, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+      1235, /* GL_PROGRAM_TARGET_NV */
+      1232, /* GL_PROGRAM_RESIDENT_NV */
+      1704, /* GL_TRACK_MATRIX_NV */
+      1705, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+      1798, /* GL_VERTEX_PROGRAM_BINDING_NV */
+      1213, /* GL_PROGRAM_ERROR_POSITION_ARB */
        351, /* GL_DEPTH_CLAMP_NV */
-      1760, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-      1767, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-      1768, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-      1769, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-      1770, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-      1771, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-      1772, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-      1773, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-      1774, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-      1775, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-      1761, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-      1762, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-      1763, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-      1764, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-      1765, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-      1766, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+      1766, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+      1773, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+      1774, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+      1775, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+      1776, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+      1777, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+      1778, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+      1779, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+      1780, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+      1781, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+      1767, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+      1768, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+      1769, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+      1770, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+      1771, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+      1772, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
        741, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
        748, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
        749, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
@@ -4598,7 +4610,7 @@ static const unsigned reduced_enums[1321] =
        778, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
        779, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
        780, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
-      1206, /* GL_PROGRAM_BINDING_ARB */
+      1212, /* GL_PROGRAM_BINDING_ARB */
        782, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
        783, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
        769, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
@@ -4607,66 +4619,66 @@ static const unsigned reduced_enums[1321] =
        772, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
        773, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
        774, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
-      1620, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-      1617, /* GL_TEXTURE_COMPRESSED */
-      1011, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
+      1626, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
+      1623, /* GL_TEXTURE_COMPRESSED */
+      1017, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
        266, /* GL_COMPRESSED_TEXTURE_FORMATS */
-       920, /* GL_MAX_VERTEX_UNITS_ARB */
+       926, /* GL_MAX_VERTEX_UNITS_ARB */
         22, /* GL_ACTIVE_VERTEX_UNITS_ARB */
-      1812, /* GL_WEIGHT_SUM_UNITY_ARB */
-      1790, /* GL_VERTEX_BLEND_ARB */
+      1818, /* GL_WEIGHT_SUM_UNITY_ARB */
+      1796, /* GL_VERTEX_BLEND_ARB */
        332, /* GL_CURRENT_WEIGHT_ARB */
-      1811, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-      1810, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-      1809, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-      1808, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-      1805, /* GL_WEIGHT_ARRAY_ARB */
+      1817, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+      1816, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+      1815, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+      1814, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+      1811, /* GL_WEIGHT_ARRAY_ARB */
        379, /* GL_DOT3_RGB */
        380, /* GL_DOT3_RGBA */
        260, /* GL_COMPRESSED_RGB_FXT1_3DFX */
        255, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
-       980, /* GL_MULTISAMPLE_3DFX */
-      1370, /* GL_SAMPLE_BUFFERS_3DFX */
-      1361, /* GL_SAMPLES_3DFX */
-       961, /* GL_MODELVIEW2_ARB */
-       964, /* GL_MODELVIEW3_ARB */
-       965, /* GL_MODELVIEW4_ARB */
-       966, /* GL_MODELVIEW5_ARB */
-       967, /* GL_MODELVIEW6_ARB */
-       968, /* GL_MODELVIEW7_ARB */
-       969, /* GL_MODELVIEW8_ARB */
-       970, /* GL_MODELVIEW9_ARB */
-       940, /* GL_MODELVIEW10_ARB */
-       941, /* GL_MODELVIEW11_ARB */
-       942, /* GL_MODELVIEW12_ARB */
-       943, /* GL_MODELVIEW13_ARB */
-       944, /* GL_MODELVIEW14_ARB */
-       945, /* GL_MODELVIEW15_ARB */
-       946, /* GL_MODELVIEW16_ARB */
-       947, /* GL_MODELVIEW17_ARB */
-       948, /* GL_MODELVIEW18_ARB */
-       949, /* GL_MODELVIEW19_ARB */
-       951, /* GL_MODELVIEW20_ARB */
-       952, /* GL_MODELVIEW21_ARB */
-       953, /* GL_MODELVIEW22_ARB */
-       954, /* GL_MODELVIEW23_ARB */
-       955, /* GL_MODELVIEW24_ARB */
-       956, /* GL_MODELVIEW25_ARB */
-       957, /* GL_MODELVIEW26_ARB */
-       958, /* GL_MODELVIEW27_ARB */
-       959, /* GL_MODELVIEW28_ARB */
-       960, /* GL_MODELVIEW29_ARB */
-       962, /* GL_MODELVIEW30_ARB */
-       963, /* GL_MODELVIEW31_ARB */
+       986, /* GL_MULTISAMPLE_3DFX */
+      1376, /* GL_SAMPLE_BUFFERS_3DFX */
+      1367, /* GL_SAMPLES_3DFX */
+       967, /* GL_MODELVIEW2_ARB */
+       970, /* GL_MODELVIEW3_ARB */
+       971, /* GL_MODELVIEW4_ARB */
+       972, /* GL_MODELVIEW5_ARB */
+       973, /* GL_MODELVIEW6_ARB */
+       974, /* GL_MODELVIEW7_ARB */
+       975, /* GL_MODELVIEW8_ARB */
+       976, /* GL_MODELVIEW9_ARB */
+       946, /* GL_MODELVIEW10_ARB */
+       947, /* GL_MODELVIEW11_ARB */
+       948, /* GL_MODELVIEW12_ARB */
+       949, /* GL_MODELVIEW13_ARB */
+       950, /* GL_MODELVIEW14_ARB */
+       951, /* GL_MODELVIEW15_ARB */
+       952, /* GL_MODELVIEW16_ARB */
+       953, /* GL_MODELVIEW17_ARB */
+       954, /* GL_MODELVIEW18_ARB */
+       955, /* GL_MODELVIEW19_ARB */
+       957, /* GL_MODELVIEW20_ARB */
+       958, /* GL_MODELVIEW21_ARB */
+       959, /* GL_MODELVIEW22_ARB */
+       960, /* GL_MODELVIEW23_ARB */
+       961, /* GL_MODELVIEW24_ARB */
+       962, /* GL_MODELVIEW25_ARB */
+       963, /* GL_MODELVIEW26_ARB */
+       964, /* GL_MODELVIEW27_ARB */
+       965, /* GL_MODELVIEW28_ARB */
+       966, /* GL_MODELVIEW29_ARB */
+       968, /* GL_MODELVIEW30_ARB */
+       969, /* GL_MODELVIEW31_ARB */
        384, /* GL_DOT3_RGB_EXT */
        382, /* GL_DOT3_RGBA_EXT */
-       934, /* GL_MIRROR_CLAMP_EXT */
-       937, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
-       975, /* GL_MODULATE_ADD_ATI */
-       976, /* GL_MODULATE_SIGNED_ADD_ATI */
-       977, /* GL_MODULATE_SUBTRACT_ATI */
-      1818, /* GL_YCBCR_MESA */
-      1066, /* GL_PACK_INVERT_MESA */
+       940, /* GL_MIRROR_CLAMP_EXT */
+       943, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
+       981, /* GL_MODULATE_ADD_ATI */
+       982, /* GL_MODULATE_SIGNED_ADD_ATI */
+       983, /* GL_MODULATE_SUBTRACT_ATI */
+      1824, /* GL_YCBCR_MESA */
+      1072, /* GL_PACK_INVERT_MESA */
        335, /* GL_DEBUG_OBJECT_MESA */
        336, /* GL_DEBUG_PRINT_MESA */
        334, /* GL_DEBUG_ASSERT_MESA */
@@ -4680,24 +4692,24 @@ static const unsigned reduced_enums[1321] =
        442, /* GL_DU8DV8_ATI */
        111, /* GL_BUMP_ENVMAP_ATI */
        115, /* GL_BUMP_TARGET_ATI */
-      1468, /* GL_STENCIL_BACK_FUNC */
-      1466, /* GL_STENCIL_BACK_FAIL */
-      1470, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-      1472, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
+      1474, /* GL_STENCIL_BACK_FUNC */
+      1472, /* GL_STENCIL_BACK_FAIL */
+      1476, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
+      1478, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
        526, /* GL_FRAGMENT_PROGRAM_ARB */
-      1204, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
-      1232, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
-      1231, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
-      1216, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-      1222, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-      1221, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-       869, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
-       892, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
-       891, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
-       882, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-       888, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-       887, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-       852, /* GL_MAX_DRAW_BUFFERS */
+      1210, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
+      1238, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
+      1237, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
+      1222, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+      1228, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+      1227, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+       875, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
+       898, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
+       897, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
+       888, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+       894, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+       893, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+       858, /* GL_MAX_DRAW_BUFFERS */
        388, /* GL_DRAW_BUFFER0 */
        391, /* GL_DRAW_BUFFER1 */
        412, /* GL_DRAW_BUFFER2 */
@@ -4715,153 +4727,153 @@ static const unsigned reduced_enums[1321] =
        404, /* GL_DRAW_BUFFER14 */
        407, /* GL_DRAW_BUFFER15 */
         81, /* GL_BLEND_EQUATION_ALPHA */
-       832, /* GL_MATRIX_PALETTE_ARB */
-       863, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
-       866, /* GL_MAX_PALETTE_MATRICES_ARB */
+       838, /* GL_MATRIX_PALETTE_ARB */
+       869, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
+       872, /* GL_MAX_PALETTE_MATRICES_ARB */
        317, /* GL_CURRENT_PALETTE_MATRIX_ARB */
-       826, /* GL_MATRIX_INDEX_ARRAY_ARB */
+       832, /* GL_MATRIX_INDEX_ARRAY_ARB */
        312, /* GL_CURRENT_MATRIX_INDEX_ARB */
-       828, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
-       830, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
-       829, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
-       827, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
-      1646, /* GL_TEXTURE_DEPTH_SIZE */
+       834, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
+       836, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
+       835, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
+       833, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
+      1652, /* GL_TEXTURE_DEPTH_SIZE */
        372, /* GL_DEPTH_TEXTURE_MODE */
-      1612, /* GL_TEXTURE_COMPARE_MODE */
-      1610, /* GL_TEXTURE_COMPARE_FUNC */
+      1618, /* GL_TEXTURE_COMPARE_MODE */
+      1616, /* GL_TEXTURE_COMPARE_FUNC */
        239, /* GL_COMPARE_R_TO_TEXTURE */
-      1138, /* GL_POINT_SPRITE */
+      1144, /* GL_POINT_SPRITE */
        292, /* GL_COORD_REPLACE */
-      1142, /* GL_POINT_SPRITE_R_MODE_NV */
-      1259, /* GL_QUERY_COUNTER_BITS */
+      1148, /* GL_POINT_SPRITE_R_MODE_NV */
+      1265, /* GL_QUERY_COUNTER_BITS */
        319, /* GL_CURRENT_QUERY */
-      1261, /* GL_QUERY_RESULT */
-      1263, /* GL_QUERY_RESULT_AVAILABLE */
-       914, /* GL_MAX_VERTEX_ATTRIBS */
-      1780, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+      1267, /* GL_QUERY_RESULT */
+      1269, /* GL_QUERY_RESULT_AVAILABLE */
+       920, /* GL_MAX_VERTEX_ATTRIBS */
+      1786, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
        370, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
        369, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
-       900, /* GL_MAX_TEXTURE_COORDS */
-       902, /* GL_MAX_TEXTURE_IMAGE_UNITS */
-      1209, /* GL_PROGRAM_ERROR_STRING_ARB */
-      1211, /* GL_PROGRAM_FORMAT_ASCII_ARB */
-      1210, /* GL_PROGRAM_FORMAT_ARB */
-      1692, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+       906, /* GL_MAX_TEXTURE_COORDS */
+       908, /* GL_MAX_TEXTURE_IMAGE_UNITS */
+      1215, /* GL_PROGRAM_ERROR_STRING_ARB */
+      1217, /* GL_PROGRAM_FORMAT_ASCII_ARB */
+      1216, /* GL_PROGRAM_FORMAT_ARB */
+      1698, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
        349, /* GL_DEPTH_BOUNDS_TEST_EXT */
        348, /* GL_DEPTH_BOUNDS_EXT */
         52, /* GL_ARRAY_BUFFER */
        456, /* GL_ELEMENT_ARRAY_BUFFER */
         53, /* GL_ARRAY_BUFFER_BINDING */
        457, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
-      1754, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-      1001, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
+      1760, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+      1007, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
        146, /* GL_COLOR_ARRAY_BUFFER_BINDING */
        618, /* GL_INDEX_ARRAY_BUFFER_BINDING */
-      1625, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
+      1631, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
        452, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
-      1382, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
+      1388, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
        504, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
-      1806, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-      1776, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-      1212, /* GL_PROGRAM_INSTRUCTIONS_ARB */
-       875, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
-      1218, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-       884, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-      1230, /* GL_PROGRAM_TEMPORARIES_ARB */
-       890, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
-      1220, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
-       886, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
-      1224, /* GL_PROGRAM_PARAMETERS_ARB */
-       889, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
-      1219, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
-       885, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
-      1205, /* GL_PROGRAM_ATTRIBS_ARB */
-       870, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
-      1217, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
-       883, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
-      1203, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
-       868, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
-      1215, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-       881, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-       876, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
-       872, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
-      1233, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-      1703, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-      1272, /* GL_READ_ONLY */
-      1814, /* GL_WRITE_ONLY */
-      1274, /* GL_READ_WRITE */
+      1812, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+      1782, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+      1218, /* GL_PROGRAM_INSTRUCTIONS_ARB */
+       881, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
+      1224, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+       890, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+      1236, /* GL_PROGRAM_TEMPORARIES_ARB */
+       896, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
+      1226, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
+       892, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
+      1230, /* GL_PROGRAM_PARAMETERS_ARB */
+       895, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
+      1225, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
+       891, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
+      1211, /* GL_PROGRAM_ATTRIBS_ARB */
+       876, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
+      1223, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
+       889, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
+      1209, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
+       874, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
+      1221, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+       887, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+       882, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
+       878, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
+      1239, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
+      1709, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+      1278, /* GL_READ_ONLY */
+      1820, /* GL_WRITE_ONLY */
+      1280, /* GL_READ_WRITE */
        101, /* GL_BUFFER_ACCESS */
        103, /* GL_BUFFER_MAPPED */
        105, /* GL_BUFFER_MAP_POINTER */
-      1697, /* GL_TIME_ELAPSED_EXT */
-       786, /* GL_MATRIX0_ARB */
-       798, /* GL_MATRIX1_ARB */
-       810, /* GL_MATRIX2_ARB */
-       814, /* GL_MATRIX3_ARB */
-       816, /* GL_MATRIX4_ARB */
-       818, /* GL_MATRIX5_ARB */
-       820, /* GL_MATRIX6_ARB */
-       822, /* GL_MATRIX7_ARB */
-       824, /* GL_MATRIX8_ARB */
-       825, /* GL_MATRIX9_ARB */
-       788, /* GL_MATRIX10_ARB */
-       789, /* GL_MATRIX11_ARB */
-       790, /* GL_MATRIX12_ARB */
-       791, /* GL_MATRIX13_ARB */
-       792, /* GL_MATRIX14_ARB */
-       793, /* GL_MATRIX15_ARB */
-       794, /* GL_MATRIX16_ARB */
-       795, /* GL_MATRIX17_ARB */
-       796, /* GL_MATRIX18_ARB */
-       797, /* GL_MATRIX19_ARB */
-       800, /* GL_MATRIX20_ARB */
-       801, /* GL_MATRIX21_ARB */
-       802, /* GL_MATRIX22_ARB */
-       803, /* GL_MATRIX23_ARB */
-       804, /* GL_MATRIX24_ARB */
-       805, /* GL_MATRIX25_ARB */
-       806, /* GL_MATRIX26_ARB */
-       807, /* GL_MATRIX27_ARB */
-       808, /* GL_MATRIX28_ARB */
-       809, /* GL_MATRIX29_ARB */
-       812, /* GL_MATRIX30_ARB */
-       813, /* GL_MATRIX31_ARB */
-      1498, /* GL_STREAM_DRAW */
-      1500, /* GL_STREAM_READ */
-      1496, /* GL_STREAM_COPY */
-      1459, /* GL_STATIC_DRAW */
-      1461, /* GL_STATIC_READ */
-      1457, /* GL_STATIC_COPY */
+      1703, /* GL_TIME_ELAPSED_EXT */
+       792, /* GL_MATRIX0_ARB */
+       804, /* GL_MATRIX1_ARB */
+       816, /* GL_MATRIX2_ARB */
+       820, /* GL_MATRIX3_ARB */
+       822, /* GL_MATRIX4_ARB */
+       824, /* GL_MATRIX5_ARB */
+       826, /* GL_MATRIX6_ARB */
+       828, /* GL_MATRIX7_ARB */
+       830, /* GL_MATRIX8_ARB */
+       831, /* GL_MATRIX9_ARB */
+       794, /* GL_MATRIX10_ARB */
+       795, /* GL_MATRIX11_ARB */
+       796, /* GL_MATRIX12_ARB */
+       797, /* GL_MATRIX13_ARB */
+       798, /* GL_MATRIX14_ARB */
+       799, /* GL_MATRIX15_ARB */
+       800, /* GL_MATRIX16_ARB */
+       801, /* GL_MATRIX17_ARB */
+       802, /* GL_MATRIX18_ARB */
+       803, /* GL_MATRIX19_ARB */
+       806, /* GL_MATRIX20_ARB */
+       807, /* GL_MATRIX21_ARB */
+       808, /* GL_MATRIX22_ARB */
+       809, /* GL_MATRIX23_ARB */
+       810, /* GL_MATRIX24_ARB */
+       811, /* GL_MATRIX25_ARB */
+       812, /* GL_MATRIX26_ARB */
+       813, /* GL_MATRIX27_ARB */
+       814, /* GL_MATRIX28_ARB */
+       815, /* GL_MATRIX29_ARB */
+       818, /* GL_MATRIX30_ARB */
+       819, /* GL_MATRIX31_ARB */
+      1504, /* GL_STREAM_DRAW */
+      1506, /* GL_STREAM_READ */
+      1502, /* GL_STREAM_COPY */
+      1465, /* GL_STATIC_DRAW */
+      1467, /* GL_STATIC_READ */
+      1463, /* GL_STATIC_COPY */
        446, /* GL_DYNAMIC_DRAW */
        448, /* GL_DYNAMIC_READ */
        444, /* GL_DYNAMIC_COPY */
-      1106, /* GL_PIXEL_PACK_BUFFER */
-      1110, /* GL_PIXEL_UNPACK_BUFFER */
-      1107, /* GL_PIXEL_PACK_BUFFER_BINDING */
-      1111, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
+      1112, /* GL_PIXEL_PACK_BUFFER */
+      1116, /* GL_PIXEL_UNPACK_BUFFER */
+      1113, /* GL_PIXEL_PACK_BUFFER_BINDING */
+      1117, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
        343, /* GL_DEPTH24_STENCIL8 */
-      1690, /* GL_TEXTURE_STENCIL_SIZE */
-       873, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
-       871, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
-       874, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
-       878, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
-       877, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
-       835, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
-      1492, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
+      1696, /* GL_TEXTURE_STENCIL_SIZE */
+       879, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
+       877, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
+       880, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
+       884, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
+       883, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
+       841, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
+      1498, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
         17, /* GL_ACTIVE_STENCIL_FACE_EXT */
-       935, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
-      1363, /* GL_SAMPLES_PASSED */
+       941, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
+      1369, /* GL_SAMPLES_PASSED */
        527, /* GL_FRAGMENT_SHADER */
-      1800, /* GL_VERTEX_SHADER */
-      1223, /* GL_PROGRAM_OBJECT_ARB */
-      1395, /* GL_SHADER_OBJECT_ARB */
-       859, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
-       918, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
-       912, /* GL_MAX_VARYING_FLOATS */
-       916, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
-       844, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
-      1026, /* GL_OBJECT_TYPE_ARB */
-      1397, /* GL_SHADER_TYPE */
+      1806, /* GL_VERTEX_SHADER */
+      1229, /* GL_PROGRAM_OBJECT_ARB */
+      1401, /* GL_SHADER_OBJECT_ARB */
+       865, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
+       924, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
+       918, /* GL_MAX_VARYING_FLOATS */
+       922, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
+       850, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
+      1032, /* GL_OBJECT_TYPE_ARB */
+      1403, /* GL_SHADER_TYPE */
        492, /* GL_FLOAT_VEC2 */
        494, /* GL_FLOAT_VEC3 */
        496, /* GL_FLOAT_VEC4 */
@@ -4875,12 +4887,12 @@ static const unsigned reduced_enums[1321] =
        480, /* GL_FLOAT_MAT2 */
        484, /* GL_FLOAT_MAT3 */
        488, /* GL_FLOAT_MAT4 */
-      1354, /* GL_SAMPLER_1D */
-      1356, /* GL_SAMPLER_2D */
-      1358, /* GL_SAMPLER_3D */
-      1359, /* GL_SAMPLER_CUBE */
-      1355, /* GL_SAMPLER_1D_SHADOW */
-      1357, /* GL_SAMPLER_2D_SHADOW */
+      1360, /* GL_SAMPLER_1D */
+      1362, /* GL_SAMPLER_2D */
+      1364, /* GL_SAMPLER_3D */
+      1365, /* GL_SAMPLER_CUBE */
+      1361, /* GL_SAMPLER_1D_SHADOW */
+      1363, /* GL_SAMPLER_2D_SHADOW */
        482, /* GL_FLOAT_MAT2x3 */
        483, /* GL_FLOAT_MAT2x4 */
        486, /* GL_FLOAT_MAT3x2 */
@@ -4890,60 +4902,60 @@ static const unsigned reduced_enums[1321] =
        341, /* GL_DELETE_STATUS */
        243, /* GL_COMPILE_STATUS */
        699, /* GL_LINK_STATUS */
-      1749, /* GL_VALIDATE_STATUS */
+      1755, /* GL_VALIDATE_STATUS */
        630, /* GL_INFO_LOG_LENGTH */
         55, /* GL_ATTACHED_SHADERS */
         20, /* GL_ACTIVE_UNIFORMS */
         21, /* GL_ACTIVE_UNIFORM_MAX_LENGTH */
-      1396, /* GL_SHADER_SOURCE_LENGTH */
+      1402, /* GL_SHADER_SOURCE_LENGTH */
         15, /* GL_ACTIVE_ATTRIBUTES */
         16, /* GL_ACTIVE_ATTRIBUTE_MAX_LENGTH */
        529, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
-      1399, /* GL_SHADING_LANGUAGE_VERSION */
+      1405, /* GL_SHADING_LANGUAGE_VERSION */
        318, /* GL_CURRENT_PROGRAM */
-      1075, /* GL_PALETTE4_RGB8_OES */
-      1077, /* GL_PALETTE4_RGBA8_OES */
-      1073, /* GL_PALETTE4_R5_G6_B5_OES */
-      1076, /* GL_PALETTE4_RGBA4_OES */
-      1074, /* GL_PALETTE4_RGB5_A1_OES */
-      1080, /* GL_PALETTE8_RGB8_OES */
-      1082, /* GL_PALETTE8_RGBA8_OES */
-      1078, /* GL_PALETTE8_R5_G6_B5_OES */
-      1081, /* GL_PALETTE8_RGBA4_OES */
-      1079, /* GL_PALETTE8_RGB5_A1_OES */
+      1081, /* GL_PALETTE4_RGB8_OES */
+      1083, /* GL_PALETTE4_RGBA8_OES */
+      1079, /* GL_PALETTE4_R5_G6_B5_OES */
+      1082, /* GL_PALETTE4_RGBA4_OES */
+      1080, /* GL_PALETTE4_RGB5_A1_OES */
+      1086, /* GL_PALETTE8_RGB8_OES */
+      1088, /* GL_PALETTE8_RGBA8_OES */
+      1084, /* GL_PALETTE8_R5_G6_B5_OES */
+      1087, /* GL_PALETTE8_RGBA4_OES */
+      1085, /* GL_PALETTE8_RGB5_A1_OES */
        612, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
        611, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
-      1734, /* GL_UNSIGNED_NORMALIZED */
-      1580, /* GL_TEXTURE_1D_ARRAY_EXT */
-      1243, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
-      1582, /* GL_TEXTURE_2D_ARRAY_EXT */
-      1246, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
-      1588, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
-      1590, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
-      1451, /* GL_SRGB */
-      1452, /* GL_SRGB8 */
-      1454, /* GL_SRGB_ALPHA */
-      1453, /* GL_SRGB8_ALPHA8 */
-      1411, /* GL_SLUMINANCE_ALPHA */
-      1410, /* GL_SLUMINANCE8_ALPHA8 */
-      1408, /* GL_SLUMINANCE */
-      1409, /* GL_SLUMINANCE8 */
+      1740, /* GL_UNSIGNED_NORMALIZED */
+      1586, /* GL_TEXTURE_1D_ARRAY_EXT */
+      1249, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
+      1588, /* GL_TEXTURE_2D_ARRAY_EXT */
+      1252, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
+      1594, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
+      1596, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
+      1457, /* GL_SRGB */
+      1458, /* GL_SRGB8 */
+      1460, /* GL_SRGB_ALPHA */
+      1459, /* GL_SRGB8_ALPHA8 */
+      1417, /* GL_SLUMINANCE_ALPHA */
+      1416, /* GL_SLUMINANCE8_ALPHA8 */
+      1414, /* GL_SLUMINANCE */
+      1415, /* GL_SLUMINANCE8 */
        264, /* GL_COMPRESSED_SRGB */
        265, /* GL_COMPRESSED_SRGB_ALPHA */
        262, /* GL_COMPRESSED_SLUMINANCE */
        263, /* GL_COMPRESSED_SLUMINANCE_ALPHA */
-      1140, /* GL_POINT_SPRITE_COORD_ORIGIN */
+      1146, /* GL_POINT_SPRITE_COORD_ORIGIN */
        707, /* GL_LOWER_LEFT */
-      1746, /* GL_UPPER_LEFT */
-      1474, /* GL_STENCIL_BACK_REF */
-      1475, /* GL_STENCIL_BACK_VALUE_MASK */
-      1476, /* GL_STENCIL_BACK_WRITEMASK */
+      1752, /* GL_UPPER_LEFT */
+      1480, /* GL_STENCIL_BACK_REF */
+      1481, /* GL_STENCIL_BACK_VALUE_MASK */
+      1482, /* GL_STENCIL_BACK_WRITEMASK */
        437, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
-      1288, /* GL_RENDERBUFFER_BINDING_EXT */
-      1269, /* GL_READ_FRAMEBUFFER */
+      1294, /* GL_RENDERBUFFER_BINDING_EXT */
+      1275, /* GL_READ_FRAMEBUFFER */
        436, /* GL_DRAW_FRAMEBUFFER */
-      1270, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
-      1298, /* GL_RENDERBUFFER_SAMPLES */
+      1276, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
+      1304, /* GL_RENDERBUFFER_SAMPLES */
        539, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
        537, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
        548, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
@@ -4959,7 +4971,7 @@ static const unsigned reduced_enums[1321] =
        564, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
        567, /* GL_FRAMEBUFFER_UNSUPPORTED */
        565, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
-       841, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
+       847, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
        152, /* GL_COLOR_ATTACHMENT0 */
        154, /* GL_COLOR_ATTACHMENT1 */
        168, /* GL_COLOR_ATTACHMENT2 */
@@ -4977,37 +4989,37 @@ static const unsigned reduced_enums[1321] =
        163, /* GL_COLOR_ATTACHMENT14 */
        165, /* GL_COLOR_ATTACHMENT15 */
        344, /* GL_DEPTH_ATTACHMENT */
-      1464, /* GL_STENCIL_ATTACHMENT */
+      1470, /* GL_STENCIL_ATTACHMENT */
        530, /* GL_FRAMEBUFFER */
-      1286, /* GL_RENDERBUFFER */
-      1300, /* GL_RENDERBUFFER_WIDTH */
-      1293, /* GL_RENDERBUFFER_HEIGHT */
-      1295, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
-      1487, /* GL_STENCIL_INDEX_EXT */
-      1484, /* GL_STENCIL_INDEX1_EXT */
-      1485, /* GL_STENCIL_INDEX4_EXT */
-      1486, /* GL_STENCIL_INDEX8_EXT */
-      1483, /* GL_STENCIL_INDEX16_EXT */
-      1297, /* GL_RENDERBUFFER_RED_SIZE */
-      1292, /* GL_RENDERBUFFER_GREEN_SIZE */
-      1289, /* GL_RENDERBUFFER_BLUE_SIZE */
-      1287, /* GL_RENDERBUFFER_ALPHA_SIZE */
-      1290, /* GL_RENDERBUFFER_DEPTH_SIZE */
-      1299, /* GL_RENDERBUFFER_STENCIL_SIZE */
+      1292, /* GL_RENDERBUFFER */
+      1306, /* GL_RENDERBUFFER_WIDTH */
+      1299, /* GL_RENDERBUFFER_HEIGHT */
+      1301, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
+      1493, /* GL_STENCIL_INDEX_EXT */
+      1490, /* GL_STENCIL_INDEX1_EXT */
+      1491, /* GL_STENCIL_INDEX4_EXT */
+      1492, /* GL_STENCIL_INDEX8_EXT */
+      1489, /* GL_STENCIL_INDEX16_EXT */
+      1303, /* GL_RENDERBUFFER_RED_SIZE */
+      1298, /* GL_RENDERBUFFER_GREEN_SIZE */
+      1295, /* GL_RENDERBUFFER_BLUE_SIZE */
+      1293, /* GL_RENDERBUFFER_ALPHA_SIZE */
+      1296, /* GL_RENDERBUFFER_DEPTH_SIZE */
+      1305, /* GL_RENDERBUFFER_STENCIL_SIZE */
        563, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
-       897, /* GL_MAX_SAMPLES */
+       903, /* GL_MAX_SAMPLES */
        298, /* GL_COPY_READ_BUFFER */
        299, /* GL_COPY_WRITE_BUFFER */
-      1347, /* GL_RGBA_SNORM */
-      1343, /* GL_RGBA8_SNORM */
-      1404, /* GL_SIGNED_NORMALIZED */
+      1353, /* GL_RGBA_SNORM */
+      1349, /* GL_RGBA8_SNORM */
+      1410, /* GL_SIGNED_NORMALIZED */
        463, /* GL_EVAL_BIT */
-      1267, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
+      1273, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
        701, /* GL_LIST_BIT */
-      1596, /* GL_TEXTURE_BIT */
-      1378, /* GL_SCISSOR_BIT */
+      1602, /* GL_TEXTURE_BIT */
+      1384, /* GL_SCISSOR_BIT */
         29, /* GL_ALL_ATTRIB_BITS */
-       982, /* GL_MULTISAMPLE_BIT */
+       988, /* GL_MULTISAMPLE_BIT */
         30, /* GL_ALL_CLIENT_ATTRIB_BITS */
 };
 
diff --git a/src/mesa/sparc/glapi_sparc.S b/src/mesa/sparc/glapi_sparc.S
index bbc6f6e0ca..1771c576ab 100644
--- a/src/mesa/sparc/glapi_sparc.S
+++ b/src/mesa/sparc/glapi_sparc.S
@@ -759,24 +759,26 @@ gl_dispatch_functions_start:
 	GL_STUB(glGetAttribLocationARB, _gloffset_GetAttribLocationARB)
 	GL_STUB(glDrawBuffersARB, _gloffset_DrawBuffersARB)
 	GL_STUB(glRenderbufferStorageMultisample, _gloffset_RenderbufferStorageMultisample)
+	GL_STUB(glFlushMappedBufferRange, _gloffset_FlushMappedBufferRange)
+	GL_STUB(glMapBufferRange, _gloffset_MapBufferRange)
 	GL_STUB(glCopyBufferSubData, _gloffset_CopyBufferSubData)
 	GL_STUB(glPolygonOffsetEXT, _gloffset_PolygonOffsetEXT)
-	GL_STUB(gl_dispatch_stub_564, _gloffset_GetPixelTexGenParameterfvSGIS)
-	HIDDEN(gl_dispatch_stub_564)
-	GL_STUB(gl_dispatch_stub_565, _gloffset_GetPixelTexGenParameterivSGIS)
-	HIDDEN(gl_dispatch_stub_565)
-	GL_STUB(gl_dispatch_stub_566, _gloffset_PixelTexGenParameterfSGIS)
+	GL_STUB(gl_dispatch_stub_566, _gloffset_GetPixelTexGenParameterfvSGIS)
 	HIDDEN(gl_dispatch_stub_566)
-	GL_STUB(gl_dispatch_stub_567, _gloffset_PixelTexGenParameterfvSGIS)
+	GL_STUB(gl_dispatch_stub_567, _gloffset_GetPixelTexGenParameterivSGIS)
 	HIDDEN(gl_dispatch_stub_567)
-	GL_STUB(gl_dispatch_stub_568, _gloffset_PixelTexGenParameteriSGIS)
+	GL_STUB(gl_dispatch_stub_568, _gloffset_PixelTexGenParameterfSGIS)
 	HIDDEN(gl_dispatch_stub_568)
-	GL_STUB(gl_dispatch_stub_569, _gloffset_PixelTexGenParameterivSGIS)
+	GL_STUB(gl_dispatch_stub_569, _gloffset_PixelTexGenParameterfvSGIS)
 	HIDDEN(gl_dispatch_stub_569)
-	GL_STUB(gl_dispatch_stub_570, _gloffset_SampleMaskSGIS)
+	GL_STUB(gl_dispatch_stub_570, _gloffset_PixelTexGenParameteriSGIS)
 	HIDDEN(gl_dispatch_stub_570)
-	GL_STUB(gl_dispatch_stub_571, _gloffset_SamplePatternSGIS)
+	GL_STUB(gl_dispatch_stub_571, _gloffset_PixelTexGenParameterivSGIS)
 	HIDDEN(gl_dispatch_stub_571)
+	GL_STUB(gl_dispatch_stub_572, _gloffset_SampleMaskSGIS)
+	HIDDEN(gl_dispatch_stub_572)
+	GL_STUB(gl_dispatch_stub_573, _gloffset_SamplePatternSGIS)
+	HIDDEN(gl_dispatch_stub_573)
 	GL_STUB(glColorPointerEXT, _gloffset_ColorPointerEXT)
 	GL_STUB(glEdgeFlagPointerEXT, _gloffset_EdgeFlagPointerEXT)
 	GL_STUB(glIndexPointerEXT, _gloffset_IndexPointerEXT)
@@ -787,10 +789,10 @@ gl_dispatch_functions_start:
 	GL_STUB(glPointParameterfvEXT, _gloffset_PointParameterfvEXT)
 	GL_STUB(glLockArraysEXT, _gloffset_LockArraysEXT)
 	GL_STUB(glUnlockArraysEXT, _gloffset_UnlockArraysEXT)
-	GL_STUB(gl_dispatch_stub_582, _gloffset_CullParameterdvEXT)
-	HIDDEN(gl_dispatch_stub_582)
-	GL_STUB(gl_dispatch_stub_583, _gloffset_CullParameterfvEXT)
-	HIDDEN(gl_dispatch_stub_583)
+	GL_STUB(gl_dispatch_stub_584, _gloffset_CullParameterdvEXT)
+	HIDDEN(gl_dispatch_stub_584)
+	GL_STUB(gl_dispatch_stub_585, _gloffset_CullParameterfvEXT)
+	HIDDEN(gl_dispatch_stub_585)
 	GL_STUB(glSecondaryColor3bEXT, _gloffset_SecondaryColor3bEXT)
 	GL_STUB(glSecondaryColor3bvEXT, _gloffset_SecondaryColor3bvEXT)
 	GL_STUB(glSecondaryColor3dEXT, _gloffset_SecondaryColor3dEXT)
@@ -815,8 +817,8 @@ gl_dispatch_functions_start:
 	GL_STUB(glFogCoorddvEXT, _gloffset_FogCoorddvEXT)
 	GL_STUB(glFogCoordfEXT, _gloffset_FogCoordfEXT)
 	GL_STUB(glFogCoordfvEXT, _gloffset_FogCoordfvEXT)
-	GL_STUB(gl_dispatch_stub_608, _gloffset_PixelTexGenSGIX)
-	HIDDEN(gl_dispatch_stub_608)
+	GL_STUB(gl_dispatch_stub_610, _gloffset_PixelTexGenSGIX)
+	HIDDEN(gl_dispatch_stub_610)
 	GL_STUB(glBlendFuncSeparateEXT, _gloffset_BlendFuncSeparateEXT)
 	GL_STUB(glFlushVertexArrayRangeNV, _gloffset_FlushVertexArrayRangeNV)
 	GL_STUB(glVertexArrayRangeNV, _gloffset_VertexArrayRangeNV)
@@ -858,24 +860,24 @@ gl_dispatch_functions_start:
 	GL_STUB(glWindowPos4ivMESA, _gloffset_WindowPos4ivMESA)
 	GL_STUB(glWindowPos4sMESA, _gloffset_WindowPos4sMESA)
 	GL_STUB(glWindowPos4svMESA, _gloffset_WindowPos4svMESA)
-	GL_STUB(gl_dispatch_stub_650, _gloffset_MultiModeDrawArraysIBM)
-	HIDDEN(gl_dispatch_stub_650)
-	GL_STUB(gl_dispatch_stub_651, _gloffset_MultiModeDrawElementsIBM)
-	HIDDEN(gl_dispatch_stub_651)
-	GL_STUB(gl_dispatch_stub_652, _gloffset_DeleteFencesNV)
+	GL_STUB(gl_dispatch_stub_652, _gloffset_MultiModeDrawArraysIBM)
 	HIDDEN(gl_dispatch_stub_652)
-	GL_STUB(gl_dispatch_stub_653, _gloffset_FinishFenceNV)
+	GL_STUB(gl_dispatch_stub_653, _gloffset_MultiModeDrawElementsIBM)
 	HIDDEN(gl_dispatch_stub_653)
-	GL_STUB(gl_dispatch_stub_654, _gloffset_GenFencesNV)
+	GL_STUB(gl_dispatch_stub_654, _gloffset_DeleteFencesNV)
 	HIDDEN(gl_dispatch_stub_654)
-	GL_STUB(gl_dispatch_stub_655, _gloffset_GetFenceivNV)
+	GL_STUB(gl_dispatch_stub_655, _gloffset_FinishFenceNV)
 	HIDDEN(gl_dispatch_stub_655)
-	GL_STUB(gl_dispatch_stub_656, _gloffset_IsFenceNV)
+	GL_STUB(gl_dispatch_stub_656, _gloffset_GenFencesNV)
 	HIDDEN(gl_dispatch_stub_656)
-	GL_STUB(gl_dispatch_stub_657, _gloffset_SetFenceNV)
+	GL_STUB(gl_dispatch_stub_657, _gloffset_GetFenceivNV)
 	HIDDEN(gl_dispatch_stub_657)
-	GL_STUB(gl_dispatch_stub_658, _gloffset_TestFenceNV)
+	GL_STUB(gl_dispatch_stub_658, _gloffset_IsFenceNV)
 	HIDDEN(gl_dispatch_stub_658)
+	GL_STUB(gl_dispatch_stub_659, _gloffset_SetFenceNV)
+	HIDDEN(gl_dispatch_stub_659)
+	GL_STUB(gl_dispatch_stub_660, _gloffset_TestFenceNV)
+	HIDDEN(gl_dispatch_stub_660)
 	GL_STUB(glAreProgramsResidentNV, _gloffset_AreProgramsResidentNV)
 	GL_STUB(glBindProgramNV, _gloffset_BindProgramNV)
 	GL_STUB(glDeleteProgramsNV, _gloffset_DeleteProgramsNV)
@@ -956,26 +958,26 @@ gl_dispatch_functions_start:
 	GL_STUB(glSetFragmentShaderConstantATI, _gloffset_SetFragmentShaderConstantATI)
 	GL_STUB(glPointParameteriNV, _gloffset_PointParameteriNV)
 	GL_STUB(glPointParameterivNV, _gloffset_PointParameterivNV)
-	GL_STUB(gl_dispatch_stub_739, _gloffset_ActiveStencilFaceEXT)
-	HIDDEN(gl_dispatch_stub_739)
-	GL_STUB(gl_dispatch_stub_740, _gloffset_BindVertexArrayAPPLE)
-	HIDDEN(gl_dispatch_stub_740)
-	GL_STUB(gl_dispatch_stub_741, _gloffset_DeleteVertexArraysAPPLE)
+	GL_STUB(gl_dispatch_stub_741, _gloffset_ActiveStencilFaceEXT)
 	HIDDEN(gl_dispatch_stub_741)
-	GL_STUB(gl_dispatch_stub_742, _gloffset_GenVertexArraysAPPLE)
+	GL_STUB(gl_dispatch_stub_742, _gloffset_BindVertexArrayAPPLE)
 	HIDDEN(gl_dispatch_stub_742)
-	GL_STUB(gl_dispatch_stub_743, _gloffset_IsVertexArrayAPPLE)
+	GL_STUB(gl_dispatch_stub_743, _gloffset_DeleteVertexArraysAPPLE)
 	HIDDEN(gl_dispatch_stub_743)
+	GL_STUB(gl_dispatch_stub_744, _gloffset_GenVertexArraysAPPLE)
+	HIDDEN(gl_dispatch_stub_744)
+	GL_STUB(gl_dispatch_stub_745, _gloffset_IsVertexArrayAPPLE)
+	HIDDEN(gl_dispatch_stub_745)
 	GL_STUB(glGetProgramNamedParameterdvNV, _gloffset_GetProgramNamedParameterdvNV)
 	GL_STUB(glGetProgramNamedParameterfvNV, _gloffset_GetProgramNamedParameterfvNV)
 	GL_STUB(glProgramNamedParameter4dNV, _gloffset_ProgramNamedParameter4dNV)
 	GL_STUB(glProgramNamedParameter4dvNV, _gloffset_ProgramNamedParameter4dvNV)
 	GL_STUB(glProgramNamedParameter4fNV, _gloffset_ProgramNamedParameter4fNV)
 	GL_STUB(glProgramNamedParameter4fvNV, _gloffset_ProgramNamedParameter4fvNV)
-	GL_STUB(gl_dispatch_stub_750, _gloffset_DepthBoundsEXT)
-	HIDDEN(gl_dispatch_stub_750)
-	GL_STUB(gl_dispatch_stub_751, _gloffset_BlendEquationSeparateEXT)
-	HIDDEN(gl_dispatch_stub_751)
+	GL_STUB(gl_dispatch_stub_752, _gloffset_DepthBoundsEXT)
+	HIDDEN(gl_dispatch_stub_752)
+	GL_STUB(gl_dispatch_stub_753, _gloffset_BlendEquationSeparateEXT)
+	HIDDEN(gl_dispatch_stub_753)
 	GL_STUB(glBindFramebufferEXT, _gloffset_BindFramebufferEXT)
 	GL_STUB(glBindRenderbufferEXT, _gloffset_BindRenderbufferEXT)
 	GL_STUB(glCheckFramebufferStatusEXT, _gloffset_CheckFramebufferStatusEXT)
@@ -993,19 +995,19 @@ gl_dispatch_functions_start:
 	GL_STUB(glIsFramebufferEXT, _gloffset_IsFramebufferEXT)
 	GL_STUB(glIsRenderbufferEXT, _gloffset_IsRenderbufferEXT)
 	GL_STUB(glRenderbufferStorageEXT, _gloffset_RenderbufferStorageEXT)
-	GL_STUB(gl_dispatch_stub_769, _gloffset_BlitFramebufferEXT)
-	HIDDEN(gl_dispatch_stub_769)
-	GL_STUB(glFramebufferTextureLayerEXT, _gloffset_FramebufferTextureLayerEXT)
-	GL_STUB(gl_dispatch_stub_771, _gloffset_StencilFuncSeparateATI)
+	GL_STUB(gl_dispatch_stub_771, _gloffset_BlitFramebufferEXT)
 	HIDDEN(gl_dispatch_stub_771)
-	GL_STUB(gl_dispatch_stub_772, _gloffset_ProgramEnvParameters4fvEXT)
-	HIDDEN(gl_dispatch_stub_772)
-	GL_STUB(gl_dispatch_stub_773, _gloffset_ProgramLocalParameters4fvEXT)
+	GL_STUB(glFramebufferTextureLayerEXT, _gloffset_FramebufferTextureLayerEXT)
+	GL_STUB(gl_dispatch_stub_773, _gloffset_StencilFuncSeparateATI)
 	HIDDEN(gl_dispatch_stub_773)
-	GL_STUB(gl_dispatch_stub_774, _gloffset_GetQueryObjecti64vEXT)
+	GL_STUB(gl_dispatch_stub_774, _gloffset_ProgramEnvParameters4fvEXT)
 	HIDDEN(gl_dispatch_stub_774)
-	GL_STUB(gl_dispatch_stub_775, _gloffset_GetQueryObjectui64vEXT)
+	GL_STUB(gl_dispatch_stub_775, _gloffset_ProgramLocalParameters4fvEXT)
 	HIDDEN(gl_dispatch_stub_775)
+	GL_STUB(gl_dispatch_stub_776, _gloffset_GetQueryObjecti64vEXT)
+	HIDDEN(gl_dispatch_stub_776)
+	GL_STUB(gl_dispatch_stub_777, _gloffset_GetQueryObjectui64vEXT)
+	HIDDEN(gl_dispatch_stub_777)
 	GL_STUB_ALIAS(glArrayElementEXT, glArrayElement)
 	GL_STUB_ALIAS(glBindTextureEXT, glBindTexture)
 	GL_STUB_ALIAS(glDrawArraysEXT, glDrawArrays)
diff --git a/src/mesa/x86-64/glapi_x86-64.S b/src/mesa/x86-64/glapi_x86-64.S
index 8f66ef96e6..dc6cfa72f7 100644
--- a/src/mesa/x86-64/glapi_x86-64.S
+++ b/src/mesa/x86-64/glapi_x86-64.S
@@ -21157,9 +21157,9 @@ GL_PREFIX(RenderbufferStorageMultisample):
 	.size	GL_PREFIX(RenderbufferStorageMultisample), .-GL_PREFIX(RenderbufferStorageMultisample)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(CopyBufferSubData)
-	.type	GL_PREFIX(CopyBufferSubData), @function
-GL_PREFIX(CopyBufferSubData):
+	.globl	GL_PREFIX(FlushMappedBufferRange)
+	.type	GL_PREFIX(FlushMappedBufferRange), @function
+GL_PREFIX(FlushMappedBufferRange):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
 	movq	4496(%rax), %r11
@@ -21168,11 +21168,7 @@ GL_PREFIX(CopyBufferSubData):
 	pushq	%rdi
 	pushq	%rsi
 	pushq	%rdx
-	pushq	%rcx
-	pushq	%r8
 	call	_x86_64_get_dispatch@PLT
-	popq	%r8
-	popq	%rcx
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
@@ -21188,35 +21184,35 @@ GL_PREFIX(CopyBufferSubData):
 	pushq	%rdi
 	pushq	%rsi
 	pushq	%rdx
-	pushq	%rcx
-	pushq	%r8
 	call	_glapi_get_dispatch
-	popq	%r8
-	popq	%rcx
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
 	movq	4496(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(CopyBufferSubData), .-GL_PREFIX(CopyBufferSubData)
+	.size	GL_PREFIX(FlushMappedBufferRange), .-GL_PREFIX(FlushMappedBufferRange)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(PolygonOffsetEXT)
-	.type	GL_PREFIX(PolygonOffsetEXT), @function
-GL_PREFIX(PolygonOffsetEXT):
+	.globl	GL_PREFIX(MapBufferRange)
+	.type	GL_PREFIX(MapBufferRange), @function
+GL_PREFIX(MapBufferRange):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
 	movq	4504(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
-	subq	$24, %rsp
-	movq	%xmm0, (%rsp)
-	movq	%xmm1, 8(%rsp)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	pushq	%rcx
+	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
-	movq	8(%rsp), %xmm1
-	movq	(%rsp), %xmm0
-	addq	$24, %rsp
+	popq	%rbp
+	popq	%rcx
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
 	movq	4504(%rax), %r11
 	jmp	*%r11
 #else
@@ -21226,23 +21222,26 @@ GL_PREFIX(PolygonOffsetEXT):
 	movq	4504(%rax), %r11
 	jmp	*%r11
 1:
-	subq	$24, %rsp
-	movq	%xmm0, (%rsp)
-	movq	%xmm1, 8(%rsp)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	pushq	%rcx
+	pushq	%rbp
 	call	_glapi_get_dispatch
-	movq	8(%rsp), %xmm1
-	movq	(%rsp), %xmm0
-	addq	$24, %rsp
+	popq	%rbp
+	popq	%rcx
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
 	movq	4504(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(PolygonOffsetEXT), .-GL_PREFIX(PolygonOffsetEXT)
+	.size	GL_PREFIX(MapBufferRange), .-GL_PREFIX(MapBufferRange)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_564)
-	.type	GL_PREFIX(_dispatch_stub_564), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_564))
-GL_PREFIX(_dispatch_stub_564):
+	.globl	GL_PREFIX(CopyBufferSubData)
+	.type	GL_PREFIX(CopyBufferSubData), @function
+GL_PREFIX(CopyBufferSubData):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
 	movq	4512(%rax), %r11
@@ -21250,9 +21249,13 @@ GL_PREFIX(_dispatch_stub_564):
 #elif defined(PTHREADS)
 	pushq	%rdi
 	pushq	%rsi
-	pushq	%rbp
+	pushq	%rdx
+	pushq	%rcx
+	pushq	%r8
 	call	_x86_64_get_dispatch@PLT
-	popq	%rbp
+	popq	%r8
+	popq	%rcx
+	popq	%rdx
 	popq	%rsi
 	popq	%rdi
 	movq	4512(%rax), %r11
@@ -21266,33 +21269,36 @@ GL_PREFIX(_dispatch_stub_564):
 1:
 	pushq	%rdi
 	pushq	%rsi
-	pushq	%rbp
+	pushq	%rdx
+	pushq	%rcx
+	pushq	%r8
 	call	_glapi_get_dispatch
-	popq	%rbp
+	popq	%r8
+	popq	%rcx
+	popq	%rdx
 	popq	%rsi
 	popq	%rdi
 	movq	4512(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_564), .-GL_PREFIX(_dispatch_stub_564)
+	.size	GL_PREFIX(CopyBufferSubData), .-GL_PREFIX(CopyBufferSubData)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_565)
-	.type	GL_PREFIX(_dispatch_stub_565), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_565))
-GL_PREFIX(_dispatch_stub_565):
+	.globl	GL_PREFIX(PolygonOffsetEXT)
+	.type	GL_PREFIX(PolygonOffsetEXT), @function
+GL_PREFIX(PolygonOffsetEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
 	movq	4520(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
-	pushq	%rdi
-	pushq	%rsi
-	pushq	%rbp
+	subq	$24, %rsp
+	movq	%xmm0, (%rsp)
+	movq	%xmm1, 8(%rsp)
 	call	_x86_64_get_dispatch@PLT
-	popq	%rbp
-	popq	%rsi
-	popq	%rdi
+	movq	8(%rsp), %xmm1
+	movq	(%rsp), %xmm0
+	addq	$24, %rsp
 	movq	4520(%rax), %r11
 	jmp	*%r11
 #else
@@ -21302,17 +21308,17 @@ GL_PREFIX(_dispatch_stub_565):
 	movq	4520(%rax), %r11
 	jmp	*%r11
 1:
-	pushq	%rdi
-	pushq	%rsi
-	pushq	%rbp
+	subq	$24, %rsp
+	movq	%xmm0, (%rsp)
+	movq	%xmm1, 8(%rsp)
 	call	_glapi_get_dispatch
-	popq	%rbp
-	popq	%rsi
-	popq	%rdi
+	movq	8(%rsp), %xmm1
+	movq	(%rsp), %xmm0
+	addq	$24, %rsp
 	movq	4520(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_565), .-GL_PREFIX(_dispatch_stub_565)
+	.size	GL_PREFIX(PolygonOffsetEXT), .-GL_PREFIX(PolygonOffsetEXT)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(_dispatch_stub_566)
@@ -21324,13 +21330,13 @@ GL_PREFIX(_dispatch_stub_566):
 	movq	4528(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
-	subq	$24, %rsp
-	movq	%rdi, (%rsp)
-	movq	%xmm0, 8(%rsp)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
-	movq	8(%rsp), %xmm0
-	movq	(%rsp), %rdi
-	addq	$24, %rsp
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
 	movq	4528(%rax), %r11
 	jmp	*%r11
 #else
@@ -21340,13 +21346,13 @@ GL_PREFIX(_dispatch_stub_566):
 	movq	4528(%rax), %r11
 	jmp	*%r11
 1:
-	subq	$24, %rsp
-	movq	%rdi, (%rsp)
-	movq	%xmm0, 8(%rsp)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
 	call	_glapi_get_dispatch
-	movq	8(%rsp), %xmm0
-	movq	(%rsp), %rdi
-	addq	$24, %rsp
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
 	movq	4528(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
@@ -21400,13 +21406,13 @@ GL_PREFIX(_dispatch_stub_568):
 	movq	4544(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
-	pushq	%rdi
-	pushq	%rsi
-	pushq	%rbp
+	subq	$24, %rsp
+	movq	%rdi, (%rsp)
+	movq	%xmm0, 8(%rsp)
 	call	_x86_64_get_dispatch@PLT
-	popq	%rbp
-	popq	%rsi
-	popq	%rdi
+	movq	8(%rsp), %xmm0
+	movq	(%rsp), %rdi
+	addq	$24, %rsp
 	movq	4544(%rax), %r11
 	jmp	*%r11
 #else
@@ -21416,13 +21422,13 @@ GL_PREFIX(_dispatch_stub_568):
 	movq	4544(%rax), %r11
 	jmp	*%r11
 1:
-	pushq	%rdi
-	pushq	%rsi
-	pushq	%rbp
+	subq	$24, %rsp
+	movq	%rdi, (%rsp)
+	movq	%xmm0, 8(%rsp)
 	call	_glapi_get_dispatch
-	popq	%rbp
-	popq	%rsi
-	popq	%rdi
+	movq	8(%rsp), %xmm0
+	movq	(%rsp), %rdi
+	addq	$24, %rsp
 	movq	4544(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
@@ -21515,7 +21521,11 @@ GL_PREFIX(_dispatch_stub_571):
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
+	popq	%rbp
+	popq	%rsi
 	popq	%rdi
 	movq	4568(%rax), %r11
 	jmp	*%r11
@@ -21527,20 +21537,92 @@ GL_PREFIX(_dispatch_stub_571):
 	jmp	*%r11
 1:
 	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
 	call	_glapi_get_dispatch
+	popq	%rbp
+	popq	%rsi
 	popq	%rdi
 	movq	4568(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(_dispatch_stub_571), .-GL_PREFIX(_dispatch_stub_571)
 
+	.p2align	4,,15
+	.globl	GL_PREFIX(_dispatch_stub_572)
+	.type	GL_PREFIX(_dispatch_stub_572), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_572))
+GL_PREFIX(_dispatch_stub_572):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	4576(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
+	call	_x86_64_get_dispatch@PLT
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
+	movq	4576(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	4576(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
+	call	_glapi_get_dispatch
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
+	movq	4576(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(_dispatch_stub_572), .-GL_PREFIX(_dispatch_stub_572)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(_dispatch_stub_573)
+	.type	GL_PREFIX(_dispatch_stub_573), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_573))
+GL_PREFIX(_dispatch_stub_573):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	4584(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	call	_x86_64_get_dispatch@PLT
+	popq	%rdi
+	movq	4584(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	4584(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	call	_glapi_get_dispatch
+	popq	%rdi
+	movq	4584(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(_dispatch_stub_573), .-GL_PREFIX(_dispatch_stub_573)
+
 	.p2align	4,,15
 	.globl	GL_PREFIX(ColorPointerEXT)
 	.type	GL_PREFIX(ColorPointerEXT), @function
 GL_PREFIX(ColorPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4576(%rax), %r11
+	movq	4592(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21554,13 +21636,13 @@ GL_PREFIX(ColorPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4576(%rax), %r11
+	movq	4592(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4576(%rax), %r11
+	movq	4592(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21574,7 +21656,7 @@ GL_PREFIX(ColorPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4576(%rax), %r11
+	movq	4592(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorPointerEXT), .-GL_PREFIX(ColorPointerEXT)
@@ -21585,7 +21667,7 @@ GL_PREFIX(ColorPointerEXT):
 GL_PREFIX(EdgeFlagPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4584(%rax), %r11
+	movq	4600(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21595,13 +21677,13 @@ GL_PREFIX(EdgeFlagPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4584(%rax), %r11
+	movq	4600(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4584(%rax), %r11
+	movq	4600(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21611,7 +21693,7 @@ GL_PREFIX(EdgeFlagPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4584(%rax), %r11
+	movq	4600(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EdgeFlagPointerEXT), .-GL_PREFIX(EdgeFlagPointerEXT)
@@ -21622,7 +21704,7 @@ GL_PREFIX(EdgeFlagPointerEXT):
 GL_PREFIX(IndexPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4592(%rax), %r11
+	movq	4608(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21636,13 +21718,13 @@ GL_PREFIX(IndexPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4592(%rax), %r11
+	movq	4608(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4592(%rax), %r11
+	movq	4608(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21656,7 +21738,7 @@ GL_PREFIX(IndexPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4592(%rax), %r11
+	movq	4608(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IndexPointerEXT), .-GL_PREFIX(IndexPointerEXT)
@@ -21667,7 +21749,7 @@ GL_PREFIX(IndexPointerEXT):
 GL_PREFIX(NormalPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4600(%rax), %r11
+	movq	4616(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21681,13 +21763,13 @@ GL_PREFIX(NormalPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4600(%rax), %r11
+	movq	4616(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4600(%rax), %r11
+	movq	4616(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21701,7 +21783,7 @@ GL_PREFIX(NormalPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4600(%rax), %r11
+	movq	4616(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(NormalPointerEXT), .-GL_PREFIX(NormalPointerEXT)
@@ -21712,7 +21794,7 @@ GL_PREFIX(NormalPointerEXT):
 GL_PREFIX(TexCoordPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4608(%rax), %r11
+	movq	4624(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21726,13 +21808,13 @@ GL_PREFIX(TexCoordPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4608(%rax), %r11
+	movq	4624(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4608(%rax), %r11
+	movq	4624(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21746,7 +21828,7 @@ GL_PREFIX(TexCoordPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4608(%rax), %r11
+	movq	4624(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexCoordPointerEXT), .-GL_PREFIX(TexCoordPointerEXT)
@@ -21757,7 +21839,7 @@ GL_PREFIX(TexCoordPointerEXT):
 GL_PREFIX(VertexPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4616(%rax), %r11
+	movq	4632(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21771,13 +21853,13 @@ GL_PREFIX(VertexPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4616(%rax), %r11
+	movq	4632(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4616(%rax), %r11
+	movq	4632(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21791,7 +21873,7 @@ GL_PREFIX(VertexPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4616(%rax), %r11
+	movq	4632(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexPointerEXT), .-GL_PREFIX(VertexPointerEXT)
@@ -21802,7 +21884,7 @@ GL_PREFIX(VertexPointerEXT):
 GL_PREFIX(PointParameterfEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4624(%rax), %r11
+	movq	4640(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -21812,13 +21894,13 @@ GL_PREFIX(PointParameterfEXT):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	4624(%rax), %r11
+	movq	4640(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4624(%rax), %r11
+	movq	4640(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -21828,7 +21910,7 @@ GL_PREFIX(PointParameterfEXT):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	4624(%rax), %r11
+	movq	4640(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PointParameterfEXT), .-GL_PREFIX(PointParameterfEXT)
@@ -21839,7 +21921,7 @@ GL_PREFIX(PointParameterfEXT):
 GL_PREFIX(PointParameterfvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4632(%rax), %r11
+	movq	4648(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21849,13 +21931,13 @@ GL_PREFIX(PointParameterfvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4632(%rax), %r11
+	movq	4648(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4632(%rax), %r11
+	movq	4648(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21865,7 +21947,7 @@ GL_PREFIX(PointParameterfvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4632(%rax), %r11
+	movq	4648(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PointParameterfvEXT), .-GL_PREFIX(PointParameterfvEXT)
@@ -21876,7 +21958,7 @@ GL_PREFIX(PointParameterfvEXT):
 GL_PREFIX(LockArraysEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4640(%rax), %r11
+	movq	4656(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21886,13 +21968,13 @@ GL_PREFIX(LockArraysEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4640(%rax), %r11
+	movq	4656(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4640(%rax), %r11
+	movq	4656(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21902,7 +21984,7 @@ GL_PREFIX(LockArraysEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4640(%rax), %r11
+	movq	4656(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(LockArraysEXT), .-GL_PREFIX(LockArraysEXT)
@@ -21913,37 +21995,37 @@ GL_PREFIX(LockArraysEXT):
 GL_PREFIX(UnlockArraysEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4648(%rax), %r11
+	movq	4664(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	4648(%rax), %r11
+	movq	4664(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4648(%rax), %r11
+	movq	4664(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	4648(%rax), %r11
+	movq	4664(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(UnlockArraysEXT), .-GL_PREFIX(UnlockArraysEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_582)
-	.type	GL_PREFIX(_dispatch_stub_582), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_582))
-GL_PREFIX(_dispatch_stub_582):
+	.globl	GL_PREFIX(_dispatch_stub_584)
+	.type	GL_PREFIX(_dispatch_stub_584), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_584))
+GL_PREFIX(_dispatch_stub_584):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4656(%rax), %r11
+	movq	4672(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21953,13 +22035,13 @@ GL_PREFIX(_dispatch_stub_582):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4656(%rax), %r11
+	movq	4672(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4656(%rax), %r11
+	movq	4672(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21969,19 +22051,19 @@ GL_PREFIX(_dispatch_stub_582):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4656(%rax), %r11
+	movq	4672(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_582), .-GL_PREFIX(_dispatch_stub_582)
+	.size	GL_PREFIX(_dispatch_stub_584), .-GL_PREFIX(_dispatch_stub_584)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_583)
-	.type	GL_PREFIX(_dispatch_stub_583), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_583))
-GL_PREFIX(_dispatch_stub_583):
+	.globl	GL_PREFIX(_dispatch_stub_585)
+	.type	GL_PREFIX(_dispatch_stub_585), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_585))
+GL_PREFIX(_dispatch_stub_585):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4664(%rax), %r11
+	movq	4680(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21991,13 +22073,13 @@ GL_PREFIX(_dispatch_stub_583):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4664(%rax), %r11
+	movq	4680(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4664(%rax), %r11
+	movq	4680(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22007,10 +22089,10 @@ GL_PREFIX(_dispatch_stub_583):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4664(%rax), %r11
+	movq	4680(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_583), .-GL_PREFIX(_dispatch_stub_583)
+	.size	GL_PREFIX(_dispatch_stub_585), .-GL_PREFIX(_dispatch_stub_585)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(SecondaryColor3bEXT)
@@ -22018,7 +22100,7 @@ GL_PREFIX(_dispatch_stub_583):
 GL_PREFIX(SecondaryColor3bEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4672(%rax), %r11
+	movq	4688(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22028,13 +22110,13 @@ GL_PREFIX(SecondaryColor3bEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4672(%rax), %r11
+	movq	4688(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4672(%rax), %r11
+	movq	4688(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22044,7 +22126,7 @@ GL_PREFIX(SecondaryColor3bEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4672(%rax), %r11
+	movq	4688(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3bEXT), .-GL_PREFIX(SecondaryColor3bEXT)
@@ -22055,25 +22137,25 @@ GL_PREFIX(SecondaryColor3bEXT):
 GL_PREFIX(SecondaryColor3bvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4680(%rax), %r11
+	movq	4696(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4680(%rax), %r11
+	movq	4696(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4680(%rax), %r11
+	movq	4696(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4680(%rax), %r11
+	movq	4696(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3bvEXT), .-GL_PREFIX(SecondaryColor3bvEXT)
@@ -22084,7 +22166,7 @@ GL_PREFIX(SecondaryColor3bvEXT):
 GL_PREFIX(SecondaryColor3dEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4688(%rax), %r11
+	movq	4704(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -22096,13 +22178,13 @@ GL_PREFIX(SecondaryColor3dEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	4688(%rax), %r11
+	movq	4704(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4688(%rax), %r11
+	movq	4704(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -22114,7 +22196,7 @@ GL_PREFIX(SecondaryColor3dEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	4688(%rax), %r11
+	movq	4704(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3dEXT), .-GL_PREFIX(SecondaryColor3dEXT)
@@ -22125,25 +22207,25 @@ GL_PREFIX(SecondaryColor3dEXT):
 GL_PREFIX(SecondaryColor3dvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4696(%rax), %r11
+	movq	4712(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4696(%rax), %r11
+	movq	4712(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4696(%rax), %r11
+	movq	4712(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4696(%rax), %r11
+	movq	4712(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3dvEXT), .-GL_PREFIX(SecondaryColor3dvEXT)
@@ -22154,7 +22236,7 @@ GL_PREFIX(SecondaryColor3dvEXT):
 GL_PREFIX(SecondaryColor3fEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4704(%rax), %r11
+	movq	4720(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -22166,13 +22248,13 @@ GL_PREFIX(SecondaryColor3fEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	4704(%rax), %r11
+	movq	4720(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4704(%rax), %r11
+	movq	4720(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -22184,7 +22266,7 @@ GL_PREFIX(SecondaryColor3fEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	4704(%rax), %r11
+	movq	4720(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3fEXT), .-GL_PREFIX(SecondaryColor3fEXT)
@@ -22195,25 +22277,25 @@ GL_PREFIX(SecondaryColor3fEXT):
 GL_PREFIX(SecondaryColor3fvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4712(%rax), %r11
+	movq	4728(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4712(%rax), %r11
+	movq	4728(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4712(%rax), %r11
+	movq	4728(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4712(%rax), %r11
+	movq	4728(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3fvEXT), .-GL_PREFIX(SecondaryColor3fvEXT)
@@ -22224,7 +22306,7 @@ GL_PREFIX(SecondaryColor3fvEXT):
 GL_PREFIX(SecondaryColor3iEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4720(%rax), %r11
+	movq	4736(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22234,13 +22316,13 @@ GL_PREFIX(SecondaryColor3iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4720(%rax), %r11
+	movq	4736(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4720(%rax), %r11
+	movq	4736(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22250,7 +22332,7 @@ GL_PREFIX(SecondaryColor3iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4720(%rax), %r11
+	movq	4736(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3iEXT), .-GL_PREFIX(SecondaryColor3iEXT)
@@ -22261,25 +22343,25 @@ GL_PREFIX(SecondaryColor3iEXT):
 GL_PREFIX(SecondaryColor3ivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4728(%rax), %r11
+	movq	4744(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4728(%rax), %r11
+	movq	4744(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4728(%rax), %r11
+	movq	4744(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4728(%rax), %r11
+	movq	4744(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3ivEXT), .-GL_PREFIX(SecondaryColor3ivEXT)
@@ -22290,7 +22372,7 @@ GL_PREFIX(SecondaryColor3ivEXT):
 GL_PREFIX(SecondaryColor3sEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4736(%rax), %r11
+	movq	4752(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22300,13 +22382,13 @@ GL_PREFIX(SecondaryColor3sEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4736(%rax), %r11
+	movq	4752(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4736(%rax), %r11
+	movq	4752(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22316,7 +22398,7 @@ GL_PREFIX(SecondaryColor3sEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4736(%rax), %r11
+	movq	4752(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3sEXT), .-GL_PREFIX(SecondaryColor3sEXT)
@@ -22327,25 +22409,25 @@ GL_PREFIX(SecondaryColor3sEXT):
 GL_PREFIX(SecondaryColor3svEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4744(%rax), %r11
+	movq	4760(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4744(%rax), %r11
+	movq	4760(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4744(%rax), %r11
+	movq	4760(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4744(%rax), %r11
+	movq	4760(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3svEXT), .-GL_PREFIX(SecondaryColor3svEXT)
@@ -22356,7 +22438,7 @@ GL_PREFIX(SecondaryColor3svEXT):
 GL_PREFIX(SecondaryColor3ubEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4752(%rax), %r11
+	movq	4768(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22366,13 +22448,13 @@ GL_PREFIX(SecondaryColor3ubEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4752(%rax), %r11
+	movq	4768(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4752(%rax), %r11
+	movq	4768(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22382,7 +22464,7 @@ GL_PREFIX(SecondaryColor3ubEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4752(%rax), %r11
+	movq	4768(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3ubEXT), .-GL_PREFIX(SecondaryColor3ubEXT)
@@ -22393,25 +22475,25 @@ GL_PREFIX(SecondaryColor3ubEXT):
 GL_PREFIX(SecondaryColor3ubvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4760(%rax), %r11
+	movq	4776(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4760(%rax), %r11
+	movq	4776(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4760(%rax), %r11
+	movq	4776(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4760(%rax), %r11
+	movq	4776(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3ubvEXT), .-GL_PREFIX(SecondaryColor3ubvEXT)
@@ -22422,7 +22504,7 @@ GL_PREFIX(SecondaryColor3ubvEXT):
 GL_PREFIX(SecondaryColor3uiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4768(%rax), %r11
+	movq	4784(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22432,13 +22514,13 @@ GL_PREFIX(SecondaryColor3uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4768(%rax), %r11
+	movq	4784(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4768(%rax), %r11
+	movq	4784(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22448,7 +22530,7 @@ GL_PREFIX(SecondaryColor3uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4768(%rax), %r11
+	movq	4784(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3uiEXT), .-GL_PREFIX(SecondaryColor3uiEXT)
@@ -22459,25 +22541,25 @@ GL_PREFIX(SecondaryColor3uiEXT):
 GL_PREFIX(SecondaryColor3uivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4776(%rax), %r11
+	movq	4792(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4776(%rax), %r11
+	movq	4792(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4776(%rax), %r11
+	movq	4792(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4776(%rax), %r11
+	movq	4792(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3uivEXT), .-GL_PREFIX(SecondaryColor3uivEXT)
@@ -22488,7 +22570,7 @@ GL_PREFIX(SecondaryColor3uivEXT):
 GL_PREFIX(SecondaryColor3usEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4784(%rax), %r11
+	movq	4800(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22498,13 +22580,13 @@ GL_PREFIX(SecondaryColor3usEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4784(%rax), %r11
+	movq	4800(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4784(%rax), %r11
+	movq	4800(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22514,7 +22596,7 @@ GL_PREFIX(SecondaryColor3usEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4784(%rax), %r11
+	movq	4800(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3usEXT), .-GL_PREFIX(SecondaryColor3usEXT)
@@ -22525,25 +22607,25 @@ GL_PREFIX(SecondaryColor3usEXT):
 GL_PREFIX(SecondaryColor3usvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4792(%rax), %r11
+	movq	4808(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4792(%rax), %r11
+	movq	4808(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4792(%rax), %r11
+	movq	4808(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4792(%rax), %r11
+	movq	4808(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3usvEXT), .-GL_PREFIX(SecondaryColor3usvEXT)
@@ -22554,7 +22636,7 @@ GL_PREFIX(SecondaryColor3usvEXT):
 GL_PREFIX(SecondaryColorPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4800(%rax), %r11
+	movq	4816(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22568,13 +22650,13 @@ GL_PREFIX(SecondaryColorPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4800(%rax), %r11
+	movq	4816(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4800(%rax), %r11
+	movq	4816(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22588,7 +22670,7 @@ GL_PREFIX(SecondaryColorPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4800(%rax), %r11
+	movq	4816(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColorPointerEXT), .-GL_PREFIX(SecondaryColorPointerEXT)
@@ -22599,7 +22681,7 @@ GL_PREFIX(SecondaryColorPointerEXT):
 GL_PREFIX(MultiDrawArraysEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4808(%rax), %r11
+	movq	4824(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22613,13 +22695,13 @@ GL_PREFIX(MultiDrawArraysEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4808(%rax), %r11
+	movq	4824(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4808(%rax), %r11
+	movq	4824(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22633,7 +22715,7 @@ GL_PREFIX(MultiDrawArraysEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4808(%rax), %r11
+	movq	4824(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(MultiDrawArraysEXT), .-GL_PREFIX(MultiDrawArraysEXT)
@@ -22644,7 +22726,7 @@ GL_PREFIX(MultiDrawArraysEXT):
 GL_PREFIX(MultiDrawElementsEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4816(%rax), %r11
+	movq	4832(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22658,13 +22740,13 @@ GL_PREFIX(MultiDrawElementsEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4816(%rax), %r11
+	movq	4832(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4816(%rax), %r11
+	movq	4832(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22678,7 +22760,7 @@ GL_PREFIX(MultiDrawElementsEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4816(%rax), %r11
+	movq	4832(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(MultiDrawElementsEXT), .-GL_PREFIX(MultiDrawElementsEXT)
@@ -22689,7 +22771,7 @@ GL_PREFIX(MultiDrawElementsEXT):
 GL_PREFIX(FogCoordPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4824(%rax), %r11
+	movq	4840(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22699,13 +22781,13 @@ GL_PREFIX(FogCoordPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4824(%rax), %r11
+	movq	4840(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4824(%rax), %r11
+	movq	4840(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22715,7 +22797,7 @@ GL_PREFIX(FogCoordPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4824(%rax), %r11
+	movq	4840(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoordPointerEXT), .-GL_PREFIX(FogCoordPointerEXT)
@@ -22726,7 +22808,7 @@ GL_PREFIX(FogCoordPointerEXT):
 GL_PREFIX(FogCoorddEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4832(%rax), %r11
+	movq	4848(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$8, %rsp
@@ -22734,13 +22816,13 @@ GL_PREFIX(FogCoorddEXT):
 	call	_x86_64_get_dispatch@PLT
 	movq	(%rsp), %xmm0
 	addq	$8, %rsp
-	movq	4832(%rax), %r11
+	movq	4848(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4832(%rax), %r11
+	movq	4848(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$8, %rsp
@@ -22748,7 +22830,7 @@ GL_PREFIX(FogCoorddEXT):
 	call	_glapi_get_dispatch
 	movq	(%rsp), %xmm0
 	addq	$8, %rsp
-	movq	4832(%rax), %r11
+	movq	4848(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoorddEXT), .-GL_PREFIX(FogCoorddEXT)
@@ -22759,25 +22841,25 @@ GL_PREFIX(FogCoorddEXT):
 GL_PREFIX(FogCoorddvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4840(%rax), %r11
+	movq	4856(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4840(%rax), %r11
+	movq	4856(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4840(%rax), %r11
+	movq	4856(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4840(%rax), %r11
+	movq	4856(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoorddvEXT), .-GL_PREFIX(FogCoorddvEXT)
@@ -22788,7 +22870,7 @@ GL_PREFIX(FogCoorddvEXT):
 GL_PREFIX(FogCoordfEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4848(%rax), %r11
+	movq	4864(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$8, %rsp
@@ -22796,13 +22878,13 @@ GL_PREFIX(FogCoordfEXT):
 	call	_x86_64_get_dispatch@PLT
 	movq	(%rsp), %xmm0
 	addq	$8, %rsp
-	movq	4848(%rax), %r11
+	movq	4864(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4848(%rax), %r11
+	movq	4864(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$8, %rsp
@@ -22810,7 +22892,7 @@ GL_PREFIX(FogCoordfEXT):
 	call	_glapi_get_dispatch
 	movq	(%rsp), %xmm0
 	addq	$8, %rsp
-	movq	4848(%rax), %r11
+	movq	4864(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoordfEXT), .-GL_PREFIX(FogCoordfEXT)
@@ -22821,58 +22903,58 @@ GL_PREFIX(FogCoordfEXT):
 GL_PREFIX(FogCoordfvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4856(%rax), %r11
+	movq	4872(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4856(%rax), %r11
+	movq	4872(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4856(%rax), %r11
+	movq	4872(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4856(%rax), %r11
+	movq	4872(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoordfvEXT), .-GL_PREFIX(FogCoordfvEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_608)
-	.type	GL_PREFIX(_dispatch_stub_608), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_608))
-GL_PREFIX(_dispatch_stub_608):
+	.globl	GL_PREFIX(_dispatch_stub_610)
+	.type	GL_PREFIX(_dispatch_stub_610), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_610))
+GL_PREFIX(_dispatch_stub_610):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4864(%rax), %r11
+	movq	4880(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4864(%rax), %r11
+	movq	4880(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4864(%rax), %r11
+	movq	4880(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4864(%rax), %r11
+	movq	4880(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_608), .-GL_PREFIX(_dispatch_stub_608)
+	.size	GL_PREFIX(_dispatch_stub_610), .-GL_PREFIX(_dispatch_stub_610)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(BlendFuncSeparateEXT)
@@ -22880,7 +22962,7 @@ GL_PREFIX(_dispatch_stub_608):
 GL_PREFIX(BlendFuncSeparateEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4872(%rax), %r11
+	movq	4888(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22894,13 +22976,13 @@ GL_PREFIX(BlendFuncSeparateEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4872(%rax), %r11
+	movq	4888(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4872(%rax), %r11
+	movq	4888(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22914,7 +22996,7 @@ GL_PREFIX(BlendFuncSeparateEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4872(%rax), %r11
+	movq	4888(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BlendFuncSeparateEXT), .-GL_PREFIX(BlendFuncSeparateEXT)
@@ -22925,25 +23007,25 @@ GL_PREFIX(BlendFuncSeparateEXT):
 GL_PREFIX(FlushVertexArrayRangeNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4880(%rax), %r11
+	movq	4896(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	4880(%rax), %r11
+	movq	4896(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4880(%rax), %r11
+	movq	4896(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	4880(%rax), %r11
+	movq	4896(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FlushVertexArrayRangeNV), .-GL_PREFIX(FlushVertexArrayRangeNV)
@@ -22954,7 +23036,7 @@ GL_PREFIX(FlushVertexArrayRangeNV):
 GL_PREFIX(VertexArrayRangeNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4888(%rax), %r11
+	movq	4904(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22964,13 +23046,13 @@ GL_PREFIX(VertexArrayRangeNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4888(%rax), %r11
+	movq	4904(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4888(%rax), %r11
+	movq	4904(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22980,7 +23062,7 @@ GL_PREFIX(VertexArrayRangeNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4888(%rax), %r11
+	movq	4904(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexArrayRangeNV), .-GL_PREFIX(VertexArrayRangeNV)
@@ -22991,7 +23073,7 @@ GL_PREFIX(VertexArrayRangeNV):
 GL_PREFIX(CombinerInputNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4896(%rax), %r11
+	movq	4912(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23009,13 +23091,13 @@ GL_PREFIX(CombinerInputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4896(%rax), %r11
+	movq	4912(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4896(%rax), %r11
+	movq	4912(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23033,7 +23115,7 @@ GL_PREFIX(CombinerInputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4896(%rax), %r11
+	movq	4912(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerInputNV), .-GL_PREFIX(CombinerInputNV)
@@ -23044,7 +23126,7 @@ GL_PREFIX(CombinerInputNV):
 GL_PREFIX(CombinerOutputNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4904(%rax), %r11
+	movq	4920(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23062,13 +23144,13 @@ GL_PREFIX(CombinerOutputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4904(%rax), %r11
+	movq	4920(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4904(%rax), %r11
+	movq	4920(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23086,7 +23168,7 @@ GL_PREFIX(CombinerOutputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4904(%rax), %r11
+	movq	4920(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerOutputNV), .-GL_PREFIX(CombinerOutputNV)
@@ -23097,7 +23179,7 @@ GL_PREFIX(CombinerOutputNV):
 GL_PREFIX(CombinerParameterfNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4912(%rax), %r11
+	movq	4928(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -23107,13 +23189,13 @@ GL_PREFIX(CombinerParameterfNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	4912(%rax), %r11
+	movq	4928(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4912(%rax), %r11
+	movq	4928(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -23123,7 +23205,7 @@ GL_PREFIX(CombinerParameterfNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	4912(%rax), %r11
+	movq	4928(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerParameterfNV), .-GL_PREFIX(CombinerParameterfNV)
@@ -23134,7 +23216,7 @@ GL_PREFIX(CombinerParameterfNV):
 GL_PREFIX(CombinerParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4920(%rax), %r11
+	movq	4936(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23144,13 +23226,13 @@ GL_PREFIX(CombinerParameterfvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4920(%rax), %r11
+	movq	4936(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4920(%rax), %r11
+	movq	4936(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23160,7 +23242,7 @@ GL_PREFIX(CombinerParameterfvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4920(%rax), %r11
+	movq	4936(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerParameterfvNV), .-GL_PREFIX(CombinerParameterfvNV)
@@ -23171,7 +23253,7 @@ GL_PREFIX(CombinerParameterfvNV):
 GL_PREFIX(CombinerParameteriNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4928(%rax), %r11
+	movq	4944(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23181,13 +23263,13 @@ GL_PREFIX(CombinerParameteriNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4928(%rax), %r11
+	movq	4944(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4928(%rax), %r11
+	movq	4944(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23197,7 +23279,7 @@ GL_PREFIX(CombinerParameteriNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4928(%rax), %r11
+	movq	4944(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerParameteriNV), .-GL_PREFIX(CombinerParameteriNV)
@@ -23208,7 +23290,7 @@ GL_PREFIX(CombinerParameteriNV):
 GL_PREFIX(CombinerParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4936(%rax), %r11
+	movq	4952(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23218,13 +23300,13 @@ GL_PREFIX(CombinerParameterivNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4936(%rax), %r11
+	movq	4952(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4936(%rax), %r11
+	movq	4952(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23234,7 +23316,7 @@ GL_PREFIX(CombinerParameterivNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4936(%rax), %r11
+	movq	4952(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerParameterivNV), .-GL_PREFIX(CombinerParameterivNV)
@@ -23245,7 +23327,7 @@ GL_PREFIX(CombinerParameterivNV):
 GL_PREFIX(FinalCombinerInputNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4944(%rax), %r11
+	movq	4960(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23259,13 +23341,13 @@ GL_PREFIX(FinalCombinerInputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4944(%rax), %r11
+	movq	4960(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4944(%rax), %r11
+	movq	4960(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23279,7 +23361,7 @@ GL_PREFIX(FinalCombinerInputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4944(%rax), %r11
+	movq	4960(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FinalCombinerInputNV), .-GL_PREFIX(FinalCombinerInputNV)
@@ -23290,7 +23372,7 @@ GL_PREFIX(FinalCombinerInputNV):
 GL_PREFIX(GetCombinerInputParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4952(%rax), %r11
+	movq	4968(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23304,13 +23386,13 @@ GL_PREFIX(GetCombinerInputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4952(%rax), %r11
+	movq	4968(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4952(%rax), %r11
+	movq	4968(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23324,7 +23406,7 @@ GL_PREFIX(GetCombinerInputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4952(%rax), %r11
+	movq	4968(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetCombinerInputParameterfvNV), .-GL_PREFIX(GetCombinerInputParameterfvNV)
@@ -23335,7 +23417,7 @@ GL_PREFIX(GetCombinerInputParameterfvNV):
 GL_PREFIX(GetCombinerInputParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4960(%rax), %r11
+	movq	4976(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23349,13 +23431,13 @@ GL_PREFIX(GetCombinerInputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4960(%rax), %r11
+	movq	4976(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4960(%rax), %r11
+	movq	4976(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23369,7 +23451,7 @@ GL_PREFIX(GetCombinerInputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4960(%rax), %r11
+	movq	4976(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetCombinerInputParameterivNV), .-GL_PREFIX(GetCombinerInputParameterivNV)
@@ -23380,7 +23462,7 @@ GL_PREFIX(GetCombinerInputParameterivNV):
 GL_PREFIX(GetCombinerOutputParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4968(%rax), %r11
+	movq	4984(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23394,13 +23476,13 @@ GL_PREFIX(GetCombinerOutputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4968(%rax), %r11
+	movq	4984(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4968(%rax), %r11
+	movq	4984(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23414,7 +23496,7 @@ GL_PREFIX(GetCombinerOutputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4968(%rax), %r11
+	movq	4984(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetCombinerOutputParameterfvNV), .-GL_PREFIX(GetCombinerOutputParameterfvNV)
@@ -23425,7 +23507,7 @@ GL_PREFIX(GetCombinerOutputParameterfvNV):
 GL_PREFIX(GetCombinerOutputParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4976(%rax), %r11
+	movq	4992(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23439,13 +23521,13 @@ GL_PREFIX(GetCombinerOutputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4976(%rax), %r11
+	movq	4992(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4976(%rax), %r11
+	movq	4992(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23459,7 +23541,7 @@ GL_PREFIX(GetCombinerOutputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4976(%rax), %r11
+	movq	4992(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetCombinerOutputParameterivNV), .-GL_PREFIX(GetCombinerOutputParameterivNV)
@@ -23470,7 +23552,7 @@ GL_PREFIX(GetCombinerOutputParameterivNV):
 GL_PREFIX(GetFinalCombinerInputParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4984(%rax), %r11
+	movq	5000(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23480,13 +23562,13 @@ GL_PREFIX(GetFinalCombinerInputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4984(%rax), %r11
+	movq	5000(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4984(%rax), %r11
+	movq	5000(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23496,7 +23578,7 @@ GL_PREFIX(GetFinalCombinerInputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4984(%rax), %r11
+	movq	5000(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetFinalCombinerInputParameterfvNV), .-GL_PREFIX(GetFinalCombinerInputParameterfvNV)
@@ -23507,7 +23589,7 @@ GL_PREFIX(GetFinalCombinerInputParameterfvNV):
 GL_PREFIX(GetFinalCombinerInputParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4992(%rax), %r11
+	movq	5008(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23517,13 +23599,13 @@ GL_PREFIX(GetFinalCombinerInputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4992(%rax), %r11
+	movq	5008(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4992(%rax), %r11
+	movq	5008(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23533,7 +23615,7 @@ GL_PREFIX(GetFinalCombinerInputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4992(%rax), %r11
+	movq	5008(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetFinalCombinerInputParameterivNV), .-GL_PREFIX(GetFinalCombinerInputParameterivNV)
@@ -23544,25 +23626,25 @@ GL_PREFIX(GetFinalCombinerInputParameterivNV):
 GL_PREFIX(ResizeBuffersMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5000(%rax), %r11
+	movq	5016(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	5000(%rax), %r11
+	movq	5016(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5000(%rax), %r11
+	movq	5016(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	5000(%rax), %r11
+	movq	5016(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ResizeBuffersMESA), .-GL_PREFIX(ResizeBuffersMESA)
@@ -23573,7 +23655,7 @@ GL_PREFIX(ResizeBuffersMESA):
 GL_PREFIX(WindowPos2dMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5008(%rax), %r11
+	movq	5024(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -23583,13 +23665,13 @@ GL_PREFIX(WindowPos2dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5008(%rax), %r11
+	movq	5024(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5008(%rax), %r11
+	movq	5024(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -23599,7 +23681,7 @@ GL_PREFIX(WindowPos2dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5008(%rax), %r11
+	movq	5024(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2dMESA), .-GL_PREFIX(WindowPos2dMESA)
@@ -23610,25 +23692,25 @@ GL_PREFIX(WindowPos2dMESA):
 GL_PREFIX(WindowPos2dvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5016(%rax), %r11
+	movq	5032(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5016(%rax), %r11
+	movq	5032(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5016(%rax), %r11
+	movq	5032(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5016(%rax), %r11
+	movq	5032(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2dvMESA), .-GL_PREFIX(WindowPos2dvMESA)
@@ -23639,7 +23721,7 @@ GL_PREFIX(WindowPos2dvMESA):
 GL_PREFIX(WindowPos2fMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5024(%rax), %r11
+	movq	5040(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -23649,13 +23731,13 @@ GL_PREFIX(WindowPos2fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5024(%rax), %r11
+	movq	5040(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5024(%rax), %r11
+	movq	5040(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -23665,7 +23747,7 @@ GL_PREFIX(WindowPos2fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5024(%rax), %r11
+	movq	5040(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2fMESA), .-GL_PREFIX(WindowPos2fMESA)
@@ -23676,25 +23758,25 @@ GL_PREFIX(WindowPos2fMESA):
 GL_PREFIX(WindowPos2fvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5032(%rax), %r11
+	movq	5048(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5032(%rax), %r11
+	movq	5048(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5032(%rax), %r11
+	movq	5048(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5032(%rax), %r11
+	movq	5048(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2fvMESA), .-GL_PREFIX(WindowPos2fvMESA)
@@ -23705,7 +23787,7 @@ GL_PREFIX(WindowPos2fvMESA):
 GL_PREFIX(WindowPos2iMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5040(%rax), %r11
+	movq	5056(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23715,13 +23797,13 @@ GL_PREFIX(WindowPos2iMESA):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5040(%rax), %r11
+	movq	5056(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5040(%rax), %r11
+	movq	5056(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23731,7 +23813,7 @@ GL_PREFIX(WindowPos2iMESA):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5040(%rax), %r11
+	movq	5056(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2iMESA), .-GL_PREFIX(WindowPos2iMESA)
@@ -23742,25 +23824,25 @@ GL_PREFIX(WindowPos2iMESA):
 GL_PREFIX(WindowPos2ivMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5048(%rax), %r11
+	movq	5064(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5048(%rax), %r11
+	movq	5064(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5048(%rax), %r11
+	movq	5064(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5048(%rax), %r11
+	movq	5064(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2ivMESA), .-GL_PREFIX(WindowPos2ivMESA)
@@ -23771,7 +23853,7 @@ GL_PREFIX(WindowPos2ivMESA):
 GL_PREFIX(WindowPos2sMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5056(%rax), %r11
+	movq	5072(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23781,13 +23863,13 @@ GL_PREFIX(WindowPos2sMESA):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5056(%rax), %r11
+	movq	5072(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5056(%rax), %r11
+	movq	5072(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23797,7 +23879,7 @@ GL_PREFIX(WindowPos2sMESA):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5056(%rax), %r11
+	movq	5072(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2sMESA), .-GL_PREFIX(WindowPos2sMESA)
@@ -23808,25 +23890,25 @@ GL_PREFIX(WindowPos2sMESA):
 GL_PREFIX(WindowPos2svMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5064(%rax), %r11
+	movq	5080(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5064(%rax), %r11
+	movq	5080(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5064(%rax), %r11
+	movq	5080(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5064(%rax), %r11
+	movq	5080(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2svMESA), .-GL_PREFIX(WindowPos2svMESA)
@@ -23837,7 +23919,7 @@ GL_PREFIX(WindowPos2svMESA):
 GL_PREFIX(WindowPos3dMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5072(%rax), %r11
+	movq	5088(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -23849,13 +23931,13 @@ GL_PREFIX(WindowPos3dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5072(%rax), %r11
+	movq	5088(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5072(%rax), %r11
+	movq	5088(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -23867,7 +23949,7 @@ GL_PREFIX(WindowPos3dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5072(%rax), %r11
+	movq	5088(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3dMESA), .-GL_PREFIX(WindowPos3dMESA)
@@ -23878,25 +23960,25 @@ GL_PREFIX(WindowPos3dMESA):
 GL_PREFIX(WindowPos3dvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5080(%rax), %r11
+	movq	5096(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5080(%rax), %r11
+	movq	5096(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5080(%rax), %r11
+	movq	5096(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5080(%rax), %r11
+	movq	5096(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3dvMESA), .-GL_PREFIX(WindowPos3dvMESA)
@@ -23907,7 +23989,7 @@ GL_PREFIX(WindowPos3dvMESA):
 GL_PREFIX(WindowPos3fMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5088(%rax), %r11
+	movq	5104(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -23919,13 +24001,13 @@ GL_PREFIX(WindowPos3fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5088(%rax), %r11
+	movq	5104(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5088(%rax), %r11
+	movq	5104(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -23937,7 +24019,7 @@ GL_PREFIX(WindowPos3fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5088(%rax), %r11
+	movq	5104(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3fMESA), .-GL_PREFIX(WindowPos3fMESA)
@@ -23948,25 +24030,25 @@ GL_PREFIX(WindowPos3fMESA):
 GL_PREFIX(WindowPos3fvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5096(%rax), %r11
+	movq	5112(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5096(%rax), %r11
+	movq	5112(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5096(%rax), %r11
+	movq	5112(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5096(%rax), %r11
+	movq	5112(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3fvMESA), .-GL_PREFIX(WindowPos3fvMESA)
@@ -23977,7 +24059,7 @@ GL_PREFIX(WindowPos3fvMESA):
 GL_PREFIX(WindowPos3iMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5104(%rax), %r11
+	movq	5120(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23987,13 +24069,13 @@ GL_PREFIX(WindowPos3iMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5104(%rax), %r11
+	movq	5120(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5104(%rax), %r11
+	movq	5120(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24003,7 +24085,7 @@ GL_PREFIX(WindowPos3iMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5104(%rax), %r11
+	movq	5120(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3iMESA), .-GL_PREFIX(WindowPos3iMESA)
@@ -24014,25 +24096,25 @@ GL_PREFIX(WindowPos3iMESA):
 GL_PREFIX(WindowPos3ivMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5112(%rax), %r11
+	movq	5128(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5112(%rax), %r11
+	movq	5128(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5112(%rax), %r11
+	movq	5128(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5112(%rax), %r11
+	movq	5128(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3ivMESA), .-GL_PREFIX(WindowPos3ivMESA)
@@ -24043,7 +24125,7 @@ GL_PREFIX(WindowPos3ivMESA):
 GL_PREFIX(WindowPos3sMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5120(%rax), %r11
+	movq	5136(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24053,13 +24135,13 @@ GL_PREFIX(WindowPos3sMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5120(%rax), %r11
+	movq	5136(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5120(%rax), %r11
+	movq	5136(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24069,7 +24151,7 @@ GL_PREFIX(WindowPos3sMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5120(%rax), %r11
+	movq	5136(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3sMESA), .-GL_PREFIX(WindowPos3sMESA)
@@ -24080,25 +24162,25 @@ GL_PREFIX(WindowPos3sMESA):
 GL_PREFIX(WindowPos3svMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5128(%rax), %r11
+	movq	5144(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5128(%rax), %r11
+	movq	5144(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5128(%rax), %r11
+	movq	5144(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5128(%rax), %r11
+	movq	5144(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3svMESA), .-GL_PREFIX(WindowPos3svMESA)
@@ -24109,7 +24191,7 @@ GL_PREFIX(WindowPos3svMESA):
 GL_PREFIX(WindowPos4dMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5136(%rax), %r11
+	movq	5152(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -24123,13 +24205,13 @@ GL_PREFIX(WindowPos4dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$40, %rsp
-	movq	5136(%rax), %r11
+	movq	5152(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5136(%rax), %r11
+	movq	5152(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -24143,7 +24225,7 @@ GL_PREFIX(WindowPos4dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$40, %rsp
-	movq	5136(%rax), %r11
+	movq	5152(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4dMESA), .-GL_PREFIX(WindowPos4dMESA)
@@ -24154,25 +24236,25 @@ GL_PREFIX(WindowPos4dMESA):
 GL_PREFIX(WindowPos4dvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5144(%rax), %r11
+	movq	5160(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5144(%rax), %r11
+	movq	5160(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5144(%rax), %r11
+	movq	5160(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5144(%rax), %r11
+	movq	5160(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4dvMESA), .-GL_PREFIX(WindowPos4dvMESA)
@@ -24183,7 +24265,7 @@ GL_PREFIX(WindowPos4dvMESA):
 GL_PREFIX(WindowPos4fMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5152(%rax), %r11
+	movq	5168(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -24197,13 +24279,13 @@ GL_PREFIX(WindowPos4fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$40, %rsp
-	movq	5152(%rax), %r11
+	movq	5168(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5152(%rax), %r11
+	movq	5168(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -24217,7 +24299,7 @@ GL_PREFIX(WindowPos4fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$40, %rsp
-	movq	5152(%rax), %r11
+	movq	5168(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4fMESA), .-GL_PREFIX(WindowPos4fMESA)
@@ -24228,25 +24310,25 @@ GL_PREFIX(WindowPos4fMESA):
 GL_PREFIX(WindowPos4fvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5160(%rax), %r11
+	movq	5176(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5160(%rax), %r11
+	movq	5176(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5160(%rax), %r11
+	movq	5176(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5160(%rax), %r11
+	movq	5176(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4fvMESA), .-GL_PREFIX(WindowPos4fvMESA)
@@ -24257,7 +24339,7 @@ GL_PREFIX(WindowPos4fvMESA):
 GL_PREFIX(WindowPos4iMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5168(%rax), %r11
+	movq	5184(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24271,13 +24353,13 @@ GL_PREFIX(WindowPos4iMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5168(%rax), %r11
+	movq	5184(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5168(%rax), %r11
+	movq	5184(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24291,7 +24373,7 @@ GL_PREFIX(WindowPos4iMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5168(%rax), %r11
+	movq	5184(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4iMESA), .-GL_PREFIX(WindowPos4iMESA)
@@ -24302,25 +24384,25 @@ GL_PREFIX(WindowPos4iMESA):
 GL_PREFIX(WindowPos4ivMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5176(%rax), %r11
+	movq	5192(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5176(%rax), %r11
+	movq	5192(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5176(%rax), %r11
+	movq	5192(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5176(%rax), %r11
+	movq	5192(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4ivMESA), .-GL_PREFIX(WindowPos4ivMESA)
@@ -24331,7 +24413,7 @@ GL_PREFIX(WindowPos4ivMESA):
 GL_PREFIX(WindowPos4sMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5184(%rax), %r11
+	movq	5200(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24345,13 +24427,13 @@ GL_PREFIX(WindowPos4sMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5184(%rax), %r11
+	movq	5200(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5184(%rax), %r11
+	movq	5200(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24365,7 +24447,7 @@ GL_PREFIX(WindowPos4sMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5184(%rax), %r11
+	movq	5200(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4sMESA), .-GL_PREFIX(WindowPos4sMESA)
@@ -24376,37 +24458,37 @@ GL_PREFIX(WindowPos4sMESA):
 GL_PREFIX(WindowPos4svMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5192(%rax), %r11
+	movq	5208(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5192(%rax), %r11
+	movq	5208(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5192(%rax), %r11
+	movq	5208(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5192(%rax), %r11
+	movq	5208(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4svMESA), .-GL_PREFIX(WindowPos4svMESA)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_650)
-	.type	GL_PREFIX(_dispatch_stub_650), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_650))
-GL_PREFIX(_dispatch_stub_650):
+	.globl	GL_PREFIX(_dispatch_stub_652)
+	.type	GL_PREFIX(_dispatch_stub_652), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_652))
+GL_PREFIX(_dispatch_stub_652):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5200(%rax), %r11
+	movq	5216(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24420,13 +24502,13 @@ GL_PREFIX(_dispatch_stub_650):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5200(%rax), %r11
+	movq	5216(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5200(%rax), %r11
+	movq	5216(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24440,19 +24522,19 @@ GL_PREFIX(_dispatch_stub_650):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5200(%rax), %r11
+	movq	5216(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_650), .-GL_PREFIX(_dispatch_stub_650)
+	.size	GL_PREFIX(_dispatch_stub_652), .-GL_PREFIX(_dispatch_stub_652)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_651)
-	.type	GL_PREFIX(_dispatch_stub_651), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_651))
-GL_PREFIX(_dispatch_stub_651):
+	.globl	GL_PREFIX(_dispatch_stub_653)
+	.type	GL_PREFIX(_dispatch_stub_653), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_653))
+GL_PREFIX(_dispatch_stub_653):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5208(%rax), %r11
+	movq	5224(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24470,13 +24552,13 @@ GL_PREFIX(_dispatch_stub_651):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5208(%rax), %r11
+	movq	5224(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5208(%rax), %r11
+	movq	5224(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24494,19 +24576,19 @@ GL_PREFIX(_dispatch_stub_651):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5208(%rax), %r11
+	movq	5224(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_651), .-GL_PREFIX(_dispatch_stub_651)
+	.size	GL_PREFIX(_dispatch_stub_653), .-GL_PREFIX(_dispatch_stub_653)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_652)
-	.type	GL_PREFIX(_dispatch_stub_652), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_652))
-GL_PREFIX(_dispatch_stub_652):
+	.globl	GL_PREFIX(_dispatch_stub_654)
+	.type	GL_PREFIX(_dispatch_stub_654), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_654))
+GL_PREFIX(_dispatch_stub_654):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5216(%rax), %r11
+	movq	5232(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24516,13 +24598,13 @@ GL_PREFIX(_dispatch_stub_652):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5216(%rax), %r11
+	movq	5232(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5216(%rax), %r11
+	movq	5232(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24532,49 +24614,49 @@ GL_PREFIX(_dispatch_stub_652):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5216(%rax), %r11
+	movq	5232(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_652), .-GL_PREFIX(_dispatch_stub_652)
+	.size	GL_PREFIX(_dispatch_stub_654), .-GL_PREFIX(_dispatch_stub_654)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_653)
-	.type	GL_PREFIX(_dispatch_stub_653), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_653))
-GL_PREFIX(_dispatch_stub_653):
+	.globl	GL_PREFIX(_dispatch_stub_655)
+	.type	GL_PREFIX(_dispatch_stub_655), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_655))
+GL_PREFIX(_dispatch_stub_655):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5224(%rax), %r11
+	movq	5240(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5224(%rax), %r11
+	movq	5240(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5224(%rax), %r11
+	movq	5240(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5224(%rax), %r11
+	movq	5240(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_653), .-GL_PREFIX(_dispatch_stub_653)
+	.size	GL_PREFIX(_dispatch_stub_655), .-GL_PREFIX(_dispatch_stub_655)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_654)
-	.type	GL_PREFIX(_dispatch_stub_654), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_654))
-GL_PREFIX(_dispatch_stub_654):
+	.globl	GL_PREFIX(_dispatch_stub_656)
+	.type	GL_PREFIX(_dispatch_stub_656), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_656))
+GL_PREFIX(_dispatch_stub_656):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5232(%rax), %r11
+	movq	5248(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24584,13 +24666,13 @@ GL_PREFIX(_dispatch_stub_654):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5232(%rax), %r11
+	movq	5248(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5232(%rax), %r11
+	movq	5248(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24600,19 +24682,19 @@ GL_PREFIX(_dispatch_stub_654):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5232(%rax), %r11
+	movq	5248(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_654), .-GL_PREFIX(_dispatch_stub_654)
+	.size	GL_PREFIX(_dispatch_stub_656), .-GL_PREFIX(_dispatch_stub_656)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_655)
-	.type	GL_PREFIX(_dispatch_stub_655), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_655))
-GL_PREFIX(_dispatch_stub_655):
+	.globl	GL_PREFIX(_dispatch_stub_657)
+	.type	GL_PREFIX(_dispatch_stub_657), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_657))
+GL_PREFIX(_dispatch_stub_657):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5240(%rax), %r11
+	movq	5256(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24622,13 +24704,13 @@ GL_PREFIX(_dispatch_stub_655):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5240(%rax), %r11
+	movq	5256(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5240(%rax), %r11
+	movq	5256(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24638,49 +24720,49 @@ GL_PREFIX(_dispatch_stub_655):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5240(%rax), %r11
+	movq	5256(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_655), .-GL_PREFIX(_dispatch_stub_655)
+	.size	GL_PREFIX(_dispatch_stub_657), .-GL_PREFIX(_dispatch_stub_657)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_656)
-	.type	GL_PREFIX(_dispatch_stub_656), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_656))
-GL_PREFIX(_dispatch_stub_656):
+	.globl	GL_PREFIX(_dispatch_stub_658)
+	.type	GL_PREFIX(_dispatch_stub_658), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_658))
+GL_PREFIX(_dispatch_stub_658):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5248(%rax), %r11
+	movq	5264(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5248(%rax), %r11
+	movq	5264(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5248(%rax), %r11
+	movq	5264(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5248(%rax), %r11
+	movq	5264(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_656), .-GL_PREFIX(_dispatch_stub_656)
+	.size	GL_PREFIX(_dispatch_stub_658), .-GL_PREFIX(_dispatch_stub_658)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_657)
-	.type	GL_PREFIX(_dispatch_stub_657), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_657))
-GL_PREFIX(_dispatch_stub_657):
+	.globl	GL_PREFIX(_dispatch_stub_659)
+	.type	GL_PREFIX(_dispatch_stub_659), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_659))
+GL_PREFIX(_dispatch_stub_659):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5256(%rax), %r11
+	movq	5272(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24690,13 +24772,13 @@ GL_PREFIX(_dispatch_stub_657):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5256(%rax), %r11
+	movq	5272(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5256(%rax), %r11
+	movq	5272(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24706,40 +24788,40 @@ GL_PREFIX(_dispatch_stub_657):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5256(%rax), %r11
+	movq	5272(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_657), .-GL_PREFIX(_dispatch_stub_657)
+	.size	GL_PREFIX(_dispatch_stub_659), .-GL_PREFIX(_dispatch_stub_659)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_658)
-	.type	GL_PREFIX(_dispatch_stub_658), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_658))
-GL_PREFIX(_dispatch_stub_658):
+	.globl	GL_PREFIX(_dispatch_stub_660)
+	.type	GL_PREFIX(_dispatch_stub_660), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_660))
+GL_PREFIX(_dispatch_stub_660):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5264(%rax), %r11
+	movq	5280(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5264(%rax), %r11
+	movq	5280(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5264(%rax), %r11
+	movq	5280(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5264(%rax), %r11
+	movq	5280(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_658), .-GL_PREFIX(_dispatch_stub_658)
+	.size	GL_PREFIX(_dispatch_stub_660), .-GL_PREFIX(_dispatch_stub_660)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(AreProgramsResidentNV)
@@ -24747,7 +24829,7 @@ GL_PREFIX(_dispatch_stub_658):
 GL_PREFIX(AreProgramsResidentNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5272(%rax), %r11
+	movq	5288(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24757,13 +24839,13 @@ GL_PREFIX(AreProgramsResidentNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5272(%rax), %r11
+	movq	5288(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5272(%rax), %r11
+	movq	5288(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24773,7 +24855,7 @@ GL_PREFIX(AreProgramsResidentNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5272(%rax), %r11
+	movq	5288(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AreProgramsResidentNV), .-GL_PREFIX(AreProgramsResidentNV)
@@ -24784,7 +24866,7 @@ GL_PREFIX(AreProgramsResidentNV):
 GL_PREFIX(BindProgramNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5280(%rax), %r11
+	movq	5296(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24794,13 +24876,13 @@ GL_PREFIX(BindProgramNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5280(%rax), %r11
+	movq	5296(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5280(%rax), %r11
+	movq	5296(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24810,7 +24892,7 @@ GL_PREFIX(BindProgramNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5280(%rax), %r11
+	movq	5296(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindProgramNV), .-GL_PREFIX(BindProgramNV)
@@ -24821,7 +24903,7 @@ GL_PREFIX(BindProgramNV):
 GL_PREFIX(DeleteProgramsNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5288(%rax), %r11
+	movq	5304(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24831,13 +24913,13 @@ GL_PREFIX(DeleteProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5288(%rax), %r11
+	movq	5304(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5288(%rax), %r11
+	movq	5304(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24847,7 +24929,7 @@ GL_PREFIX(DeleteProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5288(%rax), %r11
+	movq	5304(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteProgramsNV), .-GL_PREFIX(DeleteProgramsNV)
@@ -24858,7 +24940,7 @@ GL_PREFIX(DeleteProgramsNV):
 GL_PREFIX(ExecuteProgramNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5296(%rax), %r11
+	movq	5312(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24868,13 +24950,13 @@ GL_PREFIX(ExecuteProgramNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5296(%rax), %r11
+	movq	5312(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5296(%rax), %r11
+	movq	5312(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24884,7 +24966,7 @@ GL_PREFIX(ExecuteProgramNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5296(%rax), %r11
+	movq	5312(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ExecuteProgramNV), .-GL_PREFIX(ExecuteProgramNV)
@@ -24895,7 +24977,7 @@ GL_PREFIX(ExecuteProgramNV):
 GL_PREFIX(GenProgramsNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5304(%rax), %r11
+	movq	5320(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24905,13 +24987,13 @@ GL_PREFIX(GenProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5304(%rax), %r11
+	movq	5320(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5304(%rax), %r11
+	movq	5320(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24921,7 +25003,7 @@ GL_PREFIX(GenProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5304(%rax), %r11
+	movq	5320(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenProgramsNV), .-GL_PREFIX(GenProgramsNV)
@@ -24932,7 +25014,7 @@ GL_PREFIX(GenProgramsNV):
 GL_PREFIX(GetProgramParameterdvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5312(%rax), %r11
+	movq	5328(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24946,13 +25028,13 @@ GL_PREFIX(GetProgramParameterdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5312(%rax), %r11
+	movq	5328(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5312(%rax), %r11
+	movq	5328(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24966,7 +25048,7 @@ GL_PREFIX(GetProgramParameterdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5312(%rax), %r11
+	movq	5328(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramParameterdvNV), .-GL_PREFIX(GetProgramParameterdvNV)
@@ -24977,7 +25059,7 @@ GL_PREFIX(GetProgramParameterdvNV):
 GL_PREFIX(GetProgramParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5320(%rax), %r11
+	movq	5336(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24991,13 +25073,13 @@ GL_PREFIX(GetProgramParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5320(%rax), %r11
+	movq	5336(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5320(%rax), %r11
+	movq	5336(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25011,7 +25093,7 @@ GL_PREFIX(GetProgramParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5320(%rax), %r11
+	movq	5336(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramParameterfvNV), .-GL_PREFIX(GetProgramParameterfvNV)
@@ -25022,7 +25104,7 @@ GL_PREFIX(GetProgramParameterfvNV):
 GL_PREFIX(GetProgramStringNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5328(%rax), %r11
+	movq	5344(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25032,13 +25114,13 @@ GL_PREFIX(GetProgramStringNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5328(%rax), %r11
+	movq	5344(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5328(%rax), %r11
+	movq	5344(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25048,7 +25130,7 @@ GL_PREFIX(GetProgramStringNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5328(%rax), %r11
+	movq	5344(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramStringNV), .-GL_PREFIX(GetProgramStringNV)
@@ -25059,7 +25141,7 @@ GL_PREFIX(GetProgramStringNV):
 GL_PREFIX(GetProgramivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5336(%rax), %r11
+	movq	5352(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25069,13 +25151,13 @@ GL_PREFIX(GetProgramivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5336(%rax), %r11
+	movq	5352(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5336(%rax), %r11
+	movq	5352(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25085,7 +25167,7 @@ GL_PREFIX(GetProgramivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5336(%rax), %r11
+	movq	5352(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramivNV), .-GL_PREFIX(GetProgramivNV)
@@ -25096,7 +25178,7 @@ GL_PREFIX(GetProgramivNV):
 GL_PREFIX(GetTrackMatrixivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5344(%rax), %r11
+	movq	5360(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25110,13 +25192,13 @@ GL_PREFIX(GetTrackMatrixivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5344(%rax), %r11
+	movq	5360(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5344(%rax), %r11
+	movq	5360(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25130,7 +25212,7 @@ GL_PREFIX(GetTrackMatrixivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5344(%rax), %r11
+	movq	5360(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetTrackMatrixivNV), .-GL_PREFIX(GetTrackMatrixivNV)
@@ -25141,7 +25223,7 @@ GL_PREFIX(GetTrackMatrixivNV):
 GL_PREFIX(GetVertexAttribPointervNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5352(%rax), %r11
+	movq	5368(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25151,13 +25233,13 @@ GL_PREFIX(GetVertexAttribPointervNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5352(%rax), %r11
+	movq	5368(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5352(%rax), %r11
+	movq	5368(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25167,7 +25249,7 @@ GL_PREFIX(GetVertexAttribPointervNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5352(%rax), %r11
+	movq	5368(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribPointervNV), .-GL_PREFIX(GetVertexAttribPointervNV)
@@ -25178,7 +25260,7 @@ GL_PREFIX(GetVertexAttribPointervNV):
 GL_PREFIX(GetVertexAttribdvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5360(%rax), %r11
+	movq	5376(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25188,13 +25270,13 @@ GL_PREFIX(GetVertexAttribdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5360(%rax), %r11
+	movq	5376(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5360(%rax), %r11
+	movq	5376(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25204,7 +25286,7 @@ GL_PREFIX(GetVertexAttribdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5360(%rax), %r11
+	movq	5376(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribdvNV), .-GL_PREFIX(GetVertexAttribdvNV)
@@ -25215,7 +25297,7 @@ GL_PREFIX(GetVertexAttribdvNV):
 GL_PREFIX(GetVertexAttribfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5368(%rax), %r11
+	movq	5384(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25225,13 +25307,13 @@ GL_PREFIX(GetVertexAttribfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5368(%rax), %r11
+	movq	5384(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5368(%rax), %r11
+	movq	5384(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25241,7 +25323,7 @@ GL_PREFIX(GetVertexAttribfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5368(%rax), %r11
+	movq	5384(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribfvNV), .-GL_PREFIX(GetVertexAttribfvNV)
@@ -25252,7 +25334,7 @@ GL_PREFIX(GetVertexAttribfvNV):
 GL_PREFIX(GetVertexAttribivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5376(%rax), %r11
+	movq	5392(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25262,13 +25344,13 @@ GL_PREFIX(GetVertexAttribivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5376(%rax), %r11
+	movq	5392(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5376(%rax), %r11
+	movq	5392(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25278,7 +25360,7 @@ GL_PREFIX(GetVertexAttribivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5376(%rax), %r11
+	movq	5392(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribivNV), .-GL_PREFIX(GetVertexAttribivNV)
@@ -25289,25 +25371,25 @@ GL_PREFIX(GetVertexAttribivNV):
 GL_PREFIX(IsProgramNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5384(%rax), %r11
+	movq	5400(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5384(%rax), %r11
+	movq	5400(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5384(%rax), %r11
+	movq	5400(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5384(%rax), %r11
+	movq	5400(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsProgramNV), .-GL_PREFIX(IsProgramNV)
@@ -25318,7 +25400,7 @@ GL_PREFIX(IsProgramNV):
 GL_PREFIX(LoadProgramNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5392(%rax), %r11
+	movq	5408(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25332,13 +25414,13 @@ GL_PREFIX(LoadProgramNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5392(%rax), %r11
+	movq	5408(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5392(%rax), %r11
+	movq	5408(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25352,7 +25434,7 @@ GL_PREFIX(LoadProgramNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5392(%rax), %r11
+	movq	5408(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(LoadProgramNV), .-GL_PREFIX(LoadProgramNV)
@@ -25363,7 +25445,7 @@ GL_PREFIX(LoadProgramNV):
 GL_PREFIX(ProgramParameters4dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5400(%rax), %r11
+	movq	5416(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25377,13 +25459,13 @@ GL_PREFIX(ProgramParameters4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5400(%rax), %r11
+	movq	5416(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5400(%rax), %r11
+	movq	5416(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25397,7 +25479,7 @@ GL_PREFIX(ProgramParameters4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5400(%rax), %r11
+	movq	5416(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramParameters4dvNV), .-GL_PREFIX(ProgramParameters4dvNV)
@@ -25408,7 +25490,7 @@ GL_PREFIX(ProgramParameters4dvNV):
 GL_PREFIX(ProgramParameters4fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5408(%rax), %r11
+	movq	5424(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25422,13 +25504,13 @@ GL_PREFIX(ProgramParameters4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5408(%rax), %r11
+	movq	5424(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5408(%rax), %r11
+	movq	5424(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25442,7 +25524,7 @@ GL_PREFIX(ProgramParameters4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5408(%rax), %r11
+	movq	5424(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramParameters4fvNV), .-GL_PREFIX(ProgramParameters4fvNV)
@@ -25453,7 +25535,7 @@ GL_PREFIX(ProgramParameters4fvNV):
 GL_PREFIX(RequestResidentProgramsNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5416(%rax), %r11
+	movq	5432(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25463,13 +25545,13 @@ GL_PREFIX(RequestResidentProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5416(%rax), %r11
+	movq	5432(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5416(%rax), %r11
+	movq	5432(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25479,7 +25561,7 @@ GL_PREFIX(RequestResidentProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5416(%rax), %r11
+	movq	5432(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(RequestResidentProgramsNV), .-GL_PREFIX(RequestResidentProgramsNV)
@@ -25490,7 +25572,7 @@ GL_PREFIX(RequestResidentProgramsNV):
 GL_PREFIX(TrackMatrixNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5424(%rax), %r11
+	movq	5440(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25504,13 +25586,13 @@ GL_PREFIX(TrackMatrixNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5424(%rax), %r11
+	movq	5440(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5424(%rax), %r11
+	movq	5440(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25524,7 +25606,7 @@ GL_PREFIX(TrackMatrixNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5424(%rax), %r11
+	movq	5440(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TrackMatrixNV), .-GL_PREFIX(TrackMatrixNV)
@@ -25535,7 +25617,7 @@ GL_PREFIX(TrackMatrixNV):
 GL_PREFIX(VertexAttrib1dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5432(%rax), %r11
+	movq	5448(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -25545,13 +25627,13 @@ GL_PREFIX(VertexAttrib1dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5432(%rax), %r11
+	movq	5448(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5432(%rax), %r11
+	movq	5448(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -25561,7 +25643,7 @@ GL_PREFIX(VertexAttrib1dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5432(%rax), %r11
+	movq	5448(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1dNV), .-GL_PREFIX(VertexAttrib1dNV)
@@ -25572,7 +25654,7 @@ GL_PREFIX(VertexAttrib1dNV):
 GL_PREFIX(VertexAttrib1dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5440(%rax), %r11
+	movq	5456(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25582,13 +25664,13 @@ GL_PREFIX(VertexAttrib1dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5440(%rax), %r11
+	movq	5456(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5440(%rax), %r11
+	movq	5456(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25598,7 +25680,7 @@ GL_PREFIX(VertexAttrib1dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5440(%rax), %r11
+	movq	5456(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1dvNV), .-GL_PREFIX(VertexAttrib1dvNV)
@@ -25609,7 +25691,7 @@ GL_PREFIX(VertexAttrib1dvNV):
 GL_PREFIX(VertexAttrib1fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5448(%rax), %r11
+	movq	5464(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -25619,13 +25701,13 @@ GL_PREFIX(VertexAttrib1fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5448(%rax), %r11
+	movq	5464(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5448(%rax), %r11
+	movq	5464(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -25635,7 +25717,7 @@ GL_PREFIX(VertexAttrib1fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5448(%rax), %r11
+	movq	5464(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1fNV), .-GL_PREFIX(VertexAttrib1fNV)
@@ -25646,7 +25728,7 @@ GL_PREFIX(VertexAttrib1fNV):
 GL_PREFIX(VertexAttrib1fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5456(%rax), %r11
+	movq	5472(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25656,13 +25738,13 @@ GL_PREFIX(VertexAttrib1fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5456(%rax), %r11
+	movq	5472(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5456(%rax), %r11
+	movq	5472(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25672,7 +25754,7 @@ GL_PREFIX(VertexAttrib1fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5456(%rax), %r11
+	movq	5472(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1fvNV), .-GL_PREFIX(VertexAttrib1fvNV)
@@ -25683,7 +25765,7 @@ GL_PREFIX(VertexAttrib1fvNV):
 GL_PREFIX(VertexAttrib1sNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5464(%rax), %r11
+	movq	5480(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25693,13 +25775,13 @@ GL_PREFIX(VertexAttrib1sNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5464(%rax), %r11
+	movq	5480(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5464(%rax), %r11
+	movq	5480(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25709,7 +25791,7 @@ GL_PREFIX(VertexAttrib1sNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5464(%rax), %r11
+	movq	5480(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1sNV), .-GL_PREFIX(VertexAttrib1sNV)
@@ -25720,7 +25802,7 @@ GL_PREFIX(VertexAttrib1sNV):
 GL_PREFIX(VertexAttrib1svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5472(%rax), %r11
+	movq	5488(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25730,13 +25812,13 @@ GL_PREFIX(VertexAttrib1svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5472(%rax), %r11
+	movq	5488(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5472(%rax), %r11
+	movq	5488(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25746,7 +25828,7 @@ GL_PREFIX(VertexAttrib1svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5472(%rax), %r11
+	movq	5488(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1svNV), .-GL_PREFIX(VertexAttrib1svNV)
@@ -25757,7 +25839,7 @@ GL_PREFIX(VertexAttrib1svNV):
 GL_PREFIX(VertexAttrib2dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5480(%rax), %r11
+	movq	5496(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -25769,13 +25851,13 @@ GL_PREFIX(VertexAttrib2dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5480(%rax), %r11
+	movq	5496(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5480(%rax), %r11
+	movq	5496(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -25787,7 +25869,7 @@ GL_PREFIX(VertexAttrib2dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5480(%rax), %r11
+	movq	5496(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2dNV), .-GL_PREFIX(VertexAttrib2dNV)
@@ -25798,7 +25880,7 @@ GL_PREFIX(VertexAttrib2dNV):
 GL_PREFIX(VertexAttrib2dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5488(%rax), %r11
+	movq	5504(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25808,13 +25890,13 @@ GL_PREFIX(VertexAttrib2dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5488(%rax), %r11
+	movq	5504(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5488(%rax), %r11
+	movq	5504(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25824,7 +25906,7 @@ GL_PREFIX(VertexAttrib2dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5488(%rax), %r11
+	movq	5504(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2dvNV), .-GL_PREFIX(VertexAttrib2dvNV)
@@ -25835,7 +25917,7 @@ GL_PREFIX(VertexAttrib2dvNV):
 GL_PREFIX(VertexAttrib2fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5496(%rax), %r11
+	movq	5512(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -25847,13 +25929,13 @@ GL_PREFIX(VertexAttrib2fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5496(%rax), %r11
+	movq	5512(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5496(%rax), %r11
+	movq	5512(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -25865,7 +25947,7 @@ GL_PREFIX(VertexAttrib2fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5496(%rax), %r11
+	movq	5512(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2fNV), .-GL_PREFIX(VertexAttrib2fNV)
@@ -25876,7 +25958,7 @@ GL_PREFIX(VertexAttrib2fNV):
 GL_PREFIX(VertexAttrib2fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5504(%rax), %r11
+	movq	5520(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25886,13 +25968,13 @@ GL_PREFIX(VertexAttrib2fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5504(%rax), %r11
+	movq	5520(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5504(%rax), %r11
+	movq	5520(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25902,7 +25984,7 @@ GL_PREFIX(VertexAttrib2fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5504(%rax), %r11
+	movq	5520(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2fvNV), .-GL_PREFIX(VertexAttrib2fvNV)
@@ -25913,7 +25995,7 @@ GL_PREFIX(VertexAttrib2fvNV):
 GL_PREFIX(VertexAttrib2sNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5512(%rax), %r11
+	movq	5528(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25923,13 +26005,13 @@ GL_PREFIX(VertexAttrib2sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5512(%rax), %r11
+	movq	5528(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5512(%rax), %r11
+	movq	5528(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25939,7 +26021,7 @@ GL_PREFIX(VertexAttrib2sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5512(%rax), %r11
+	movq	5528(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2sNV), .-GL_PREFIX(VertexAttrib2sNV)
@@ -25950,7 +26032,7 @@ GL_PREFIX(VertexAttrib2sNV):
 GL_PREFIX(VertexAttrib2svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5520(%rax), %r11
+	movq	5536(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25960,13 +26042,13 @@ GL_PREFIX(VertexAttrib2svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5520(%rax), %r11
+	movq	5536(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5520(%rax), %r11
+	movq	5536(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25976,7 +26058,7 @@ GL_PREFIX(VertexAttrib2svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5520(%rax), %r11
+	movq	5536(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2svNV), .-GL_PREFIX(VertexAttrib2svNV)
@@ -25987,7 +26069,7 @@ GL_PREFIX(VertexAttrib2svNV):
 GL_PREFIX(VertexAttrib3dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5528(%rax), %r11
+	movq	5544(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -26001,13 +26083,13 @@ GL_PREFIX(VertexAttrib3dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5528(%rax), %r11
+	movq	5544(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5528(%rax), %r11
+	movq	5544(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -26021,7 +26103,7 @@ GL_PREFIX(VertexAttrib3dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5528(%rax), %r11
+	movq	5544(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3dNV), .-GL_PREFIX(VertexAttrib3dNV)
@@ -26032,7 +26114,7 @@ GL_PREFIX(VertexAttrib3dNV):
 GL_PREFIX(VertexAttrib3dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5536(%rax), %r11
+	movq	5552(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26042,13 +26124,13 @@ GL_PREFIX(VertexAttrib3dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5536(%rax), %r11
+	movq	5552(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5536(%rax), %r11
+	movq	5552(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26058,7 +26140,7 @@ GL_PREFIX(VertexAttrib3dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5536(%rax), %r11
+	movq	5552(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3dvNV), .-GL_PREFIX(VertexAttrib3dvNV)
@@ -26069,7 +26151,7 @@ GL_PREFIX(VertexAttrib3dvNV):
 GL_PREFIX(VertexAttrib3fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5544(%rax), %r11
+	movq	5560(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -26083,13 +26165,13 @@ GL_PREFIX(VertexAttrib3fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5544(%rax), %r11
+	movq	5560(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5544(%rax), %r11
+	movq	5560(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -26103,7 +26185,7 @@ GL_PREFIX(VertexAttrib3fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5544(%rax), %r11
+	movq	5560(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3fNV), .-GL_PREFIX(VertexAttrib3fNV)
@@ -26114,7 +26196,7 @@ GL_PREFIX(VertexAttrib3fNV):
 GL_PREFIX(VertexAttrib3fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5552(%rax), %r11
+	movq	5568(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26124,13 +26206,13 @@ GL_PREFIX(VertexAttrib3fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5552(%rax), %r11
+	movq	5568(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5552(%rax), %r11
+	movq	5568(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26140,7 +26222,7 @@ GL_PREFIX(VertexAttrib3fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5552(%rax), %r11
+	movq	5568(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3fvNV), .-GL_PREFIX(VertexAttrib3fvNV)
@@ -26151,7 +26233,7 @@ GL_PREFIX(VertexAttrib3fvNV):
 GL_PREFIX(VertexAttrib3sNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5560(%rax), %r11
+	movq	5576(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26165,13 +26247,13 @@ GL_PREFIX(VertexAttrib3sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5560(%rax), %r11
+	movq	5576(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5560(%rax), %r11
+	movq	5576(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26185,7 +26267,7 @@ GL_PREFIX(VertexAttrib3sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5560(%rax), %r11
+	movq	5576(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3sNV), .-GL_PREFIX(VertexAttrib3sNV)
@@ -26196,7 +26278,7 @@ GL_PREFIX(VertexAttrib3sNV):
 GL_PREFIX(VertexAttrib3svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5568(%rax), %r11
+	movq	5584(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26206,13 +26288,13 @@ GL_PREFIX(VertexAttrib3svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5568(%rax), %r11
+	movq	5584(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5568(%rax), %r11
+	movq	5584(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26222,7 +26304,7 @@ GL_PREFIX(VertexAttrib3svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5568(%rax), %r11
+	movq	5584(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3svNV), .-GL_PREFIX(VertexAttrib3svNV)
@@ -26233,7 +26315,7 @@ GL_PREFIX(VertexAttrib3svNV):
 GL_PREFIX(VertexAttrib4dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5576(%rax), %r11
+	movq	5592(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -26249,13 +26331,13 @@ GL_PREFIX(VertexAttrib4dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5576(%rax), %r11
+	movq	5592(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5576(%rax), %r11
+	movq	5592(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -26271,7 +26353,7 @@ GL_PREFIX(VertexAttrib4dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5576(%rax), %r11
+	movq	5592(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4dNV), .-GL_PREFIX(VertexAttrib4dNV)
@@ -26282,7 +26364,7 @@ GL_PREFIX(VertexAttrib4dNV):
 GL_PREFIX(VertexAttrib4dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5584(%rax), %r11
+	movq	5600(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26292,13 +26374,13 @@ GL_PREFIX(VertexAttrib4dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5584(%rax), %r11
+	movq	5600(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5584(%rax), %r11
+	movq	5600(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26308,7 +26390,7 @@ GL_PREFIX(VertexAttrib4dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5584(%rax), %r11
+	movq	5600(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4dvNV), .-GL_PREFIX(VertexAttrib4dvNV)
@@ -26319,7 +26401,7 @@ GL_PREFIX(VertexAttrib4dvNV):
 GL_PREFIX(VertexAttrib4fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5592(%rax), %r11
+	movq	5608(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -26335,13 +26417,13 @@ GL_PREFIX(VertexAttrib4fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5592(%rax), %r11
+	movq	5608(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5592(%rax), %r11
+	movq	5608(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -26357,7 +26439,7 @@ GL_PREFIX(VertexAttrib4fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5592(%rax), %r11
+	movq	5608(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4fNV), .-GL_PREFIX(VertexAttrib4fNV)
@@ -26368,7 +26450,7 @@ GL_PREFIX(VertexAttrib4fNV):
 GL_PREFIX(VertexAttrib4fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5600(%rax), %r11
+	movq	5616(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26378,13 +26460,13 @@ GL_PREFIX(VertexAttrib4fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5600(%rax), %r11
+	movq	5616(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5600(%rax), %r11
+	movq	5616(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26394,7 +26476,7 @@ GL_PREFIX(VertexAttrib4fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5600(%rax), %r11
+	movq	5616(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4fvNV), .-GL_PREFIX(VertexAttrib4fvNV)
@@ -26405,7 +26487,7 @@ GL_PREFIX(VertexAttrib4fvNV):
 GL_PREFIX(VertexAttrib4sNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5608(%rax), %r11
+	movq	5624(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26419,13 +26501,13 @@ GL_PREFIX(VertexAttrib4sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5608(%rax), %r11
+	movq	5624(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5608(%rax), %r11
+	movq	5624(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26439,7 +26521,7 @@ GL_PREFIX(VertexAttrib4sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5608(%rax), %r11
+	movq	5624(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4sNV), .-GL_PREFIX(VertexAttrib4sNV)
@@ -26450,7 +26532,7 @@ GL_PREFIX(VertexAttrib4sNV):
 GL_PREFIX(VertexAttrib4svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5616(%rax), %r11
+	movq	5632(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26460,13 +26542,13 @@ GL_PREFIX(VertexAttrib4svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5616(%rax), %r11
+	movq	5632(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5616(%rax), %r11
+	movq	5632(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26476,7 +26558,7 @@ GL_PREFIX(VertexAttrib4svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5616(%rax), %r11
+	movq	5632(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4svNV), .-GL_PREFIX(VertexAttrib4svNV)
@@ -26487,7 +26569,7 @@ GL_PREFIX(VertexAttrib4svNV):
 GL_PREFIX(VertexAttrib4ubNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5624(%rax), %r11
+	movq	5640(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26501,13 +26583,13 @@ GL_PREFIX(VertexAttrib4ubNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5624(%rax), %r11
+	movq	5640(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5624(%rax), %r11
+	movq	5640(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26521,7 +26603,7 @@ GL_PREFIX(VertexAttrib4ubNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5624(%rax), %r11
+	movq	5640(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4ubNV), .-GL_PREFIX(VertexAttrib4ubNV)
@@ -26532,7 +26614,7 @@ GL_PREFIX(VertexAttrib4ubNV):
 GL_PREFIX(VertexAttrib4ubvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5632(%rax), %r11
+	movq	5648(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26542,13 +26624,13 @@ GL_PREFIX(VertexAttrib4ubvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5632(%rax), %r11
+	movq	5648(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5632(%rax), %r11
+	movq	5648(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26558,7 +26640,7 @@ GL_PREFIX(VertexAttrib4ubvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5632(%rax), %r11
+	movq	5648(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4ubvNV), .-GL_PREFIX(VertexAttrib4ubvNV)
@@ -26569,7 +26651,7 @@ GL_PREFIX(VertexAttrib4ubvNV):
 GL_PREFIX(VertexAttribPointerNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5640(%rax), %r11
+	movq	5656(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26583,13 +26665,13 @@ GL_PREFIX(VertexAttribPointerNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5640(%rax), %r11
+	movq	5656(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5640(%rax), %r11
+	movq	5656(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26603,7 +26685,7 @@ GL_PREFIX(VertexAttribPointerNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5640(%rax), %r11
+	movq	5656(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribPointerNV), .-GL_PREFIX(VertexAttribPointerNV)
@@ -26614,7 +26696,7 @@ GL_PREFIX(VertexAttribPointerNV):
 GL_PREFIX(VertexAttribs1dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5648(%rax), %r11
+	movq	5664(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26624,13 +26706,13 @@ GL_PREFIX(VertexAttribs1dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5648(%rax), %r11
+	movq	5664(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5648(%rax), %r11
+	movq	5664(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26640,7 +26722,7 @@ GL_PREFIX(VertexAttribs1dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5648(%rax), %r11
+	movq	5664(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs1dvNV), .-GL_PREFIX(VertexAttribs1dvNV)
@@ -26651,7 +26733,7 @@ GL_PREFIX(VertexAttribs1dvNV):
 GL_PREFIX(VertexAttribs1fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5656(%rax), %r11
+	movq	5672(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26661,13 +26743,13 @@ GL_PREFIX(VertexAttribs1fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5656(%rax), %r11
+	movq	5672(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5656(%rax), %r11
+	movq	5672(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26677,7 +26759,7 @@ GL_PREFIX(VertexAttribs1fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5656(%rax), %r11
+	movq	5672(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs1fvNV), .-GL_PREFIX(VertexAttribs1fvNV)
@@ -26688,7 +26770,7 @@ GL_PREFIX(VertexAttribs1fvNV):
 GL_PREFIX(VertexAttribs1svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5664(%rax), %r11
+	movq	5680(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26698,13 +26780,13 @@ GL_PREFIX(VertexAttribs1svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5664(%rax), %r11
+	movq	5680(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5664(%rax), %r11
+	movq	5680(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26714,7 +26796,7 @@ GL_PREFIX(VertexAttribs1svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5664(%rax), %r11
+	movq	5680(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs1svNV), .-GL_PREFIX(VertexAttribs1svNV)
@@ -26725,7 +26807,7 @@ GL_PREFIX(VertexAttribs1svNV):
 GL_PREFIX(VertexAttribs2dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5672(%rax), %r11
+	movq	5688(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26735,13 +26817,13 @@ GL_PREFIX(VertexAttribs2dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5672(%rax), %r11
+	movq	5688(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5672(%rax), %r11
+	movq	5688(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26751,7 +26833,7 @@ GL_PREFIX(VertexAttribs2dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5672(%rax), %r11
+	movq	5688(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs2dvNV), .-GL_PREFIX(VertexAttribs2dvNV)
@@ -26762,7 +26844,7 @@ GL_PREFIX(VertexAttribs2dvNV):
 GL_PREFIX(VertexAttribs2fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5680(%rax), %r11
+	movq	5696(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26772,13 +26854,13 @@ GL_PREFIX(VertexAttribs2fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5680(%rax), %r11
+	movq	5696(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5680(%rax), %r11
+	movq	5696(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26788,7 +26870,7 @@ GL_PREFIX(VertexAttribs2fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5680(%rax), %r11
+	movq	5696(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs2fvNV), .-GL_PREFIX(VertexAttribs2fvNV)
@@ -26799,7 +26881,7 @@ GL_PREFIX(VertexAttribs2fvNV):
 GL_PREFIX(VertexAttribs2svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5688(%rax), %r11
+	movq	5704(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26809,13 +26891,13 @@ GL_PREFIX(VertexAttribs2svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5688(%rax), %r11
+	movq	5704(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5688(%rax), %r11
+	movq	5704(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26825,7 +26907,7 @@ GL_PREFIX(VertexAttribs2svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5688(%rax), %r11
+	movq	5704(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs2svNV), .-GL_PREFIX(VertexAttribs2svNV)
@@ -26836,7 +26918,7 @@ GL_PREFIX(VertexAttribs2svNV):
 GL_PREFIX(VertexAttribs3dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5696(%rax), %r11
+	movq	5712(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26846,13 +26928,13 @@ GL_PREFIX(VertexAttribs3dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5696(%rax), %r11
+	movq	5712(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5696(%rax), %r11
+	movq	5712(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26862,7 +26944,7 @@ GL_PREFIX(VertexAttribs3dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5696(%rax), %r11
+	movq	5712(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs3dvNV), .-GL_PREFIX(VertexAttribs3dvNV)
@@ -26873,7 +26955,7 @@ GL_PREFIX(VertexAttribs3dvNV):
 GL_PREFIX(VertexAttribs3fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5704(%rax), %r11
+	movq	5720(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26883,13 +26965,13 @@ GL_PREFIX(VertexAttribs3fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5704(%rax), %r11
+	movq	5720(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5704(%rax), %r11
+	movq	5720(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26899,7 +26981,7 @@ GL_PREFIX(VertexAttribs3fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5704(%rax), %r11
+	movq	5720(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs3fvNV), .-GL_PREFIX(VertexAttribs3fvNV)
@@ -26910,7 +26992,7 @@ GL_PREFIX(VertexAttribs3fvNV):
 GL_PREFIX(VertexAttribs3svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5712(%rax), %r11
+	movq	5728(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26920,13 +27002,13 @@ GL_PREFIX(VertexAttribs3svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5712(%rax), %r11
+	movq	5728(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5712(%rax), %r11
+	movq	5728(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26936,7 +27018,7 @@ GL_PREFIX(VertexAttribs3svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5712(%rax), %r11
+	movq	5728(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs3svNV), .-GL_PREFIX(VertexAttribs3svNV)
@@ -26947,7 +27029,7 @@ GL_PREFIX(VertexAttribs3svNV):
 GL_PREFIX(VertexAttribs4dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5720(%rax), %r11
+	movq	5736(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26957,13 +27039,13 @@ GL_PREFIX(VertexAttribs4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5720(%rax), %r11
+	movq	5736(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5720(%rax), %r11
+	movq	5736(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26973,7 +27055,7 @@ GL_PREFIX(VertexAttribs4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5720(%rax), %r11
+	movq	5736(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs4dvNV), .-GL_PREFIX(VertexAttribs4dvNV)
@@ -26984,7 +27066,7 @@ GL_PREFIX(VertexAttribs4dvNV):
 GL_PREFIX(VertexAttribs4fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5728(%rax), %r11
+	movq	5744(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26994,13 +27076,13 @@ GL_PREFIX(VertexAttribs4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5728(%rax), %r11
+	movq	5744(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5728(%rax), %r11
+	movq	5744(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27010,7 +27092,7 @@ GL_PREFIX(VertexAttribs4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5728(%rax), %r11
+	movq	5744(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs4fvNV), .-GL_PREFIX(VertexAttribs4fvNV)
@@ -27021,7 +27103,7 @@ GL_PREFIX(VertexAttribs4fvNV):
 GL_PREFIX(VertexAttribs4svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5736(%rax), %r11
+	movq	5752(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27031,13 +27113,13 @@ GL_PREFIX(VertexAttribs4svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5736(%rax), %r11
+	movq	5752(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5736(%rax), %r11
+	movq	5752(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27047,7 +27129,7 @@ GL_PREFIX(VertexAttribs4svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5736(%rax), %r11
+	movq	5752(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs4svNV), .-GL_PREFIX(VertexAttribs4svNV)
@@ -27058,7 +27140,7 @@ GL_PREFIX(VertexAttribs4svNV):
 GL_PREFIX(VertexAttribs4ubvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5744(%rax), %r11
+	movq	5760(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27068,13 +27150,13 @@ GL_PREFIX(VertexAttribs4ubvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5744(%rax), %r11
+	movq	5760(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5744(%rax), %r11
+	movq	5760(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27084,7 +27166,7 @@ GL_PREFIX(VertexAttribs4ubvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5744(%rax), %r11
+	movq	5760(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs4ubvNV), .-GL_PREFIX(VertexAttribs4ubvNV)
@@ -27095,7 +27177,7 @@ GL_PREFIX(VertexAttribs4ubvNV):
 GL_PREFIX(GetTexBumpParameterfvATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5752(%rax), %r11
+	movq	5768(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27105,13 +27187,13 @@ GL_PREFIX(GetTexBumpParameterfvATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5752(%rax), %r11
+	movq	5768(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5752(%rax), %r11
+	movq	5768(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27121,7 +27203,7 @@ GL_PREFIX(GetTexBumpParameterfvATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5752(%rax), %r11
+	movq	5768(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetTexBumpParameterfvATI), .-GL_PREFIX(GetTexBumpParameterfvATI)
@@ -27132,7 +27214,7 @@ GL_PREFIX(GetTexBumpParameterfvATI):
 GL_PREFIX(GetTexBumpParameterivATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5760(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27142,13 +27224,13 @@ GL_PREFIX(GetTexBumpParameterivATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5760(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5760(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27158,7 +27240,7 @@ GL_PREFIX(GetTexBumpParameterivATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5760(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetTexBumpParameterivATI), .-GL_PREFIX(GetTexBumpParameterivATI)
@@ -27169,7 +27251,7 @@ GL_PREFIX(GetTexBumpParameterivATI):
 GL_PREFIX(TexBumpParameterfvATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5768(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27179,13 +27261,13 @@ GL_PREFIX(TexBumpParameterfvATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5768(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5768(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27195,7 +27277,7 @@ GL_PREFIX(TexBumpParameterfvATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5768(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexBumpParameterfvATI), .-GL_PREFIX(TexBumpParameterfvATI)
@@ -27206,7 +27288,7 @@ GL_PREFIX(TexBumpParameterfvATI):
 GL_PREFIX(TexBumpParameterivATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5776(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27216,13 +27298,13 @@ GL_PREFIX(TexBumpParameterivATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5776(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5776(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27232,7 +27314,7 @@ GL_PREFIX(TexBumpParameterivATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5776(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexBumpParameterivATI), .-GL_PREFIX(TexBumpParameterivATI)
@@ -27243,7 +27325,7 @@ GL_PREFIX(TexBumpParameterivATI):
 GL_PREFIX(AlphaFragmentOp1ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5784(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27261,13 +27343,13 @@ GL_PREFIX(AlphaFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5784(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5784(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27285,7 +27367,7 @@ GL_PREFIX(AlphaFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5784(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AlphaFragmentOp1ATI), .-GL_PREFIX(AlphaFragmentOp1ATI)
@@ -27296,7 +27378,7 @@ GL_PREFIX(AlphaFragmentOp1ATI):
 GL_PREFIX(AlphaFragmentOp2ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5792(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27314,13 +27396,13 @@ GL_PREFIX(AlphaFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5792(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5792(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27338,7 +27420,7 @@ GL_PREFIX(AlphaFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5792(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AlphaFragmentOp2ATI), .-GL_PREFIX(AlphaFragmentOp2ATI)
@@ -27349,7 +27431,7 @@ GL_PREFIX(AlphaFragmentOp2ATI):
 GL_PREFIX(AlphaFragmentOp3ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5800(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27367,13 +27449,13 @@ GL_PREFIX(AlphaFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5800(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5800(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27391,7 +27473,7 @@ GL_PREFIX(AlphaFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5800(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AlphaFragmentOp3ATI), .-GL_PREFIX(AlphaFragmentOp3ATI)
@@ -27402,25 +27484,25 @@ GL_PREFIX(AlphaFragmentOp3ATI):
 GL_PREFIX(BeginFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5808(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	5808(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5808(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	5808(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BeginFragmentShaderATI), .-GL_PREFIX(BeginFragmentShaderATI)
@@ -27431,25 +27513,25 @@ GL_PREFIX(BeginFragmentShaderATI):
 GL_PREFIX(BindFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5816(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5816(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5816(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5816(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindFragmentShaderATI), .-GL_PREFIX(BindFragmentShaderATI)
@@ -27460,7 +27542,7 @@ GL_PREFIX(BindFragmentShaderATI):
 GL_PREFIX(ColorFragmentOp1ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5824(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27478,13 +27560,13 @@ GL_PREFIX(ColorFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5824(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5824(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27502,7 +27584,7 @@ GL_PREFIX(ColorFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5824(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorFragmentOp1ATI), .-GL_PREFIX(ColorFragmentOp1ATI)
@@ -27513,7 +27595,7 @@ GL_PREFIX(ColorFragmentOp1ATI):
 GL_PREFIX(ColorFragmentOp2ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5832(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27531,13 +27613,13 @@ GL_PREFIX(ColorFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5832(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5832(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27555,7 +27637,7 @@ GL_PREFIX(ColorFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5832(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorFragmentOp2ATI), .-GL_PREFIX(ColorFragmentOp2ATI)
@@ -27566,7 +27648,7 @@ GL_PREFIX(ColorFragmentOp2ATI):
 GL_PREFIX(ColorFragmentOp3ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5840(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27584,13 +27666,13 @@ GL_PREFIX(ColorFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5840(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5840(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27608,7 +27690,7 @@ GL_PREFIX(ColorFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5840(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorFragmentOp3ATI), .-GL_PREFIX(ColorFragmentOp3ATI)
@@ -27619,25 +27701,25 @@ GL_PREFIX(ColorFragmentOp3ATI):
 GL_PREFIX(DeleteFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5848(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5848(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5848(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5848(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteFragmentShaderATI), .-GL_PREFIX(DeleteFragmentShaderATI)
@@ -27648,25 +27730,25 @@ GL_PREFIX(DeleteFragmentShaderATI):
 GL_PREFIX(EndFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5856(%rax), %r11
+	movq	5872(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	5856(%rax), %r11
+	movq	5872(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5856(%rax), %r11
+	movq	5872(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	5856(%rax), %r11
+	movq	5872(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EndFragmentShaderATI), .-GL_PREFIX(EndFragmentShaderATI)
@@ -27677,25 +27759,25 @@ GL_PREFIX(EndFragmentShaderATI):
 GL_PREFIX(GenFragmentShadersATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5864(%rax), %r11
+	movq	5880(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5864(%rax), %r11
+	movq	5880(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5864(%rax), %r11
+	movq	5880(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5864(%rax), %r11
+	movq	5880(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenFragmentShadersATI), .-GL_PREFIX(GenFragmentShadersATI)
@@ -27706,7 +27788,7 @@ GL_PREFIX(GenFragmentShadersATI):
 GL_PREFIX(PassTexCoordATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5872(%rax), %r11
+	movq	5888(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27716,13 +27798,13 @@ GL_PREFIX(PassTexCoordATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5872(%rax), %r11
+	movq	5888(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5872(%rax), %r11
+	movq	5888(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27732,7 +27814,7 @@ GL_PREFIX(PassTexCoordATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5872(%rax), %r11
+	movq	5888(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PassTexCoordATI), .-GL_PREFIX(PassTexCoordATI)
@@ -27743,7 +27825,7 @@ GL_PREFIX(PassTexCoordATI):
 GL_PREFIX(SampleMapATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5880(%rax), %r11
+	movq	5896(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27753,13 +27835,13 @@ GL_PREFIX(SampleMapATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5880(%rax), %r11
+	movq	5896(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5880(%rax), %r11
+	movq	5896(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27769,7 +27851,7 @@ GL_PREFIX(SampleMapATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5880(%rax), %r11
+	movq	5896(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SampleMapATI), .-GL_PREFIX(SampleMapATI)
@@ -27780,7 +27862,7 @@ GL_PREFIX(SampleMapATI):
 GL_PREFIX(SetFragmentShaderConstantATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5888(%rax), %r11
+	movq	5904(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27790,13 +27872,13 @@ GL_PREFIX(SetFragmentShaderConstantATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5888(%rax), %r11
+	movq	5904(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5888(%rax), %r11
+	movq	5904(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27806,7 +27888,7 @@ GL_PREFIX(SetFragmentShaderConstantATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5888(%rax), %r11
+	movq	5904(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SetFragmentShaderConstantATI), .-GL_PREFIX(SetFragmentShaderConstantATI)
@@ -27817,7 +27899,7 @@ GL_PREFIX(SetFragmentShaderConstantATI):
 GL_PREFIX(PointParameteriNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5896(%rax), %r11
+	movq	5912(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27827,13 +27909,13 @@ GL_PREFIX(PointParameteriNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5896(%rax), %r11
+	movq	5912(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5896(%rax), %r11
+	movq	5912(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27843,7 +27925,7 @@ GL_PREFIX(PointParameteriNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5896(%rax), %r11
+	movq	5912(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PointParameteriNV), .-GL_PREFIX(PointParameteriNV)
@@ -27854,7 +27936,7 @@ GL_PREFIX(PointParameteriNV):
 GL_PREFIX(PointParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5904(%rax), %r11
+	movq	5920(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27864,13 +27946,13 @@ GL_PREFIX(PointParameterivNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5904(%rax), %r11
+	movq	5920(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5904(%rax), %r11
+	movq	5920(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27880,79 +27962,79 @@ GL_PREFIX(PointParameterivNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5904(%rax), %r11
+	movq	5920(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PointParameterivNV), .-GL_PREFIX(PointParameterivNV)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_739)
-	.type	GL_PREFIX(_dispatch_stub_739), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_739))
-GL_PREFIX(_dispatch_stub_739):
+	.globl	GL_PREFIX(_dispatch_stub_741)
+	.type	GL_PREFIX(_dispatch_stub_741), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_741))
+GL_PREFIX(_dispatch_stub_741):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5912(%rax), %r11
+	movq	5928(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5912(%rax), %r11
+	movq	5928(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5912(%rax), %r11
+	movq	5928(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5912(%rax), %r11
+	movq	5928(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_739), .-GL_PREFIX(_dispatch_stub_739)
+	.size	GL_PREFIX(_dispatch_stub_741), .-GL_PREFIX(_dispatch_stub_741)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_740)
-	.type	GL_PREFIX(_dispatch_stub_740), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_740))
-GL_PREFIX(_dispatch_stub_740):
+	.globl	GL_PREFIX(_dispatch_stub_742)
+	.type	GL_PREFIX(_dispatch_stub_742), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_742))
+GL_PREFIX(_dispatch_stub_742):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5920(%rax), %r11
+	movq	5936(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5920(%rax), %r11
+	movq	5936(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5920(%rax), %r11
+	movq	5936(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5920(%rax), %r11
+	movq	5936(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_740), .-GL_PREFIX(_dispatch_stub_740)
+	.size	GL_PREFIX(_dispatch_stub_742), .-GL_PREFIX(_dispatch_stub_742)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_741)
-	.type	GL_PREFIX(_dispatch_stub_741), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_741))
-GL_PREFIX(_dispatch_stub_741):
+	.globl	GL_PREFIX(_dispatch_stub_743)
+	.type	GL_PREFIX(_dispatch_stub_743), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_743))
+GL_PREFIX(_dispatch_stub_743):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5928(%rax), %r11
+	movq	5944(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27962,13 +28044,13 @@ GL_PREFIX(_dispatch_stub_741):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5928(%rax), %r11
+	movq	5944(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5928(%rax), %r11
+	movq	5944(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27978,19 +28060,19 @@ GL_PREFIX(_dispatch_stub_741):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5928(%rax), %r11
+	movq	5944(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_741), .-GL_PREFIX(_dispatch_stub_741)
+	.size	GL_PREFIX(_dispatch_stub_743), .-GL_PREFIX(_dispatch_stub_743)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_742)
-	.type	GL_PREFIX(_dispatch_stub_742), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_742))
-GL_PREFIX(_dispatch_stub_742):
+	.globl	GL_PREFIX(_dispatch_stub_744)
+	.type	GL_PREFIX(_dispatch_stub_744), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_744))
+GL_PREFIX(_dispatch_stub_744):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5936(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28000,13 +28082,13 @@ GL_PREFIX(_dispatch_stub_742):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5936(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5936(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28016,40 +28098,40 @@ GL_PREFIX(_dispatch_stub_742):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5936(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_742), .-GL_PREFIX(_dispatch_stub_742)
+	.size	GL_PREFIX(_dispatch_stub_744), .-GL_PREFIX(_dispatch_stub_744)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_743)
-	.type	GL_PREFIX(_dispatch_stub_743), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_743))
-GL_PREFIX(_dispatch_stub_743):
+	.globl	GL_PREFIX(_dispatch_stub_745)
+	.type	GL_PREFIX(_dispatch_stub_745), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_745))
+GL_PREFIX(_dispatch_stub_745):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5944(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5944(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5944(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5944(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_743), .-GL_PREFIX(_dispatch_stub_743)
+	.size	GL_PREFIX(_dispatch_stub_745), .-GL_PREFIX(_dispatch_stub_745)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(GetProgramNamedParameterdvNV)
@@ -28057,7 +28139,7 @@ GL_PREFIX(_dispatch_stub_743):
 GL_PREFIX(GetProgramNamedParameterdvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5952(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28071,13 +28153,13 @@ GL_PREFIX(GetProgramNamedParameterdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5952(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5952(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28091,7 +28173,7 @@ GL_PREFIX(GetProgramNamedParameterdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5952(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramNamedParameterdvNV), .-GL_PREFIX(GetProgramNamedParameterdvNV)
@@ -28102,7 +28184,7 @@ GL_PREFIX(GetProgramNamedParameterdvNV):
 GL_PREFIX(GetProgramNamedParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5960(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28116,13 +28198,13 @@ GL_PREFIX(GetProgramNamedParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5960(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5960(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28136,7 +28218,7 @@ GL_PREFIX(GetProgramNamedParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5960(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramNamedParameterfvNV), .-GL_PREFIX(GetProgramNamedParameterfvNV)
@@ -28147,7 +28229,7 @@ GL_PREFIX(GetProgramNamedParameterfvNV):
 GL_PREFIX(ProgramNamedParameter4dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5968(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$56, %rsp
@@ -28167,13 +28249,13 @@ GL_PREFIX(ProgramNamedParameter4dNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	5968(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5968(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$56, %rsp
@@ -28193,7 +28275,7 @@ GL_PREFIX(ProgramNamedParameter4dNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	5968(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4dNV), .-GL_PREFIX(ProgramNamedParameter4dNV)
@@ -28204,7 +28286,7 @@ GL_PREFIX(ProgramNamedParameter4dNV):
 GL_PREFIX(ProgramNamedParameter4dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5976(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28218,13 +28300,13 @@ GL_PREFIX(ProgramNamedParameter4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5976(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5976(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28238,7 +28320,7 @@ GL_PREFIX(ProgramNamedParameter4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5976(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4dvNV), .-GL_PREFIX(ProgramNamedParameter4dvNV)
@@ -28249,7 +28331,7 @@ GL_PREFIX(ProgramNamedParameter4dvNV):
 GL_PREFIX(ProgramNamedParameter4fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5984(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$56, %rsp
@@ -28269,13 +28351,13 @@ GL_PREFIX(ProgramNamedParameter4fNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	5984(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5984(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$56, %rsp
@@ -28295,7 +28377,7 @@ GL_PREFIX(ProgramNamedParameter4fNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	5984(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4fNV), .-GL_PREFIX(ProgramNamedParameter4fNV)
@@ -28306,7 +28388,7 @@ GL_PREFIX(ProgramNamedParameter4fNV):
 GL_PREFIX(ProgramNamedParameter4fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5992(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28320,13 +28402,13 @@ GL_PREFIX(ProgramNamedParameter4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5992(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5992(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28340,19 +28422,19 @@ GL_PREFIX(ProgramNamedParameter4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5992(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4fvNV), .-GL_PREFIX(ProgramNamedParameter4fvNV)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_750)
-	.type	GL_PREFIX(_dispatch_stub_750), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_750))
-GL_PREFIX(_dispatch_stub_750):
+	.globl	GL_PREFIX(_dispatch_stub_752)
+	.type	GL_PREFIX(_dispatch_stub_752), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_752))
+GL_PREFIX(_dispatch_stub_752):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6000(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28362,13 +28444,13 @@ GL_PREFIX(_dispatch_stub_750):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6000(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6000(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28378,19 +28460,19 @@ GL_PREFIX(_dispatch_stub_750):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6000(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_750), .-GL_PREFIX(_dispatch_stub_750)
+	.size	GL_PREFIX(_dispatch_stub_752), .-GL_PREFIX(_dispatch_stub_752)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_751)
-	.type	GL_PREFIX(_dispatch_stub_751), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_751))
-GL_PREFIX(_dispatch_stub_751):
+	.globl	GL_PREFIX(_dispatch_stub_753)
+	.type	GL_PREFIX(_dispatch_stub_753), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_753))
+GL_PREFIX(_dispatch_stub_753):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6008(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28400,13 +28482,13 @@ GL_PREFIX(_dispatch_stub_751):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6008(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6008(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28416,10 +28498,10 @@ GL_PREFIX(_dispatch_stub_751):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6008(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_751), .-GL_PREFIX(_dispatch_stub_751)
+	.size	GL_PREFIX(_dispatch_stub_753), .-GL_PREFIX(_dispatch_stub_753)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(BindFramebufferEXT)
@@ -28427,7 +28509,7 @@ GL_PREFIX(_dispatch_stub_751):
 GL_PREFIX(BindFramebufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6016(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28437,13 +28519,13 @@ GL_PREFIX(BindFramebufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6016(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6016(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28453,7 +28535,7 @@ GL_PREFIX(BindFramebufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6016(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindFramebufferEXT), .-GL_PREFIX(BindFramebufferEXT)
@@ -28464,7 +28546,7 @@ GL_PREFIX(BindFramebufferEXT):
 GL_PREFIX(BindRenderbufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6024(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28474,13 +28556,13 @@ GL_PREFIX(BindRenderbufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6024(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6024(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28490,7 +28572,7 @@ GL_PREFIX(BindRenderbufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6024(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindRenderbufferEXT), .-GL_PREFIX(BindRenderbufferEXT)
@@ -28501,25 +28583,25 @@ GL_PREFIX(BindRenderbufferEXT):
 GL_PREFIX(CheckFramebufferStatusEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6032(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6032(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6032(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6032(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CheckFramebufferStatusEXT), .-GL_PREFIX(CheckFramebufferStatusEXT)
@@ -28530,7 +28612,7 @@ GL_PREFIX(CheckFramebufferStatusEXT):
 GL_PREFIX(DeleteFramebuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6040(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28540,13 +28622,13 @@ GL_PREFIX(DeleteFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6040(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6040(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28556,7 +28638,7 @@ GL_PREFIX(DeleteFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6040(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteFramebuffersEXT), .-GL_PREFIX(DeleteFramebuffersEXT)
@@ -28567,7 +28649,7 @@ GL_PREFIX(DeleteFramebuffersEXT):
 GL_PREFIX(DeleteRenderbuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6048(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28577,13 +28659,13 @@ GL_PREFIX(DeleteRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6048(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6048(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28593,7 +28675,7 @@ GL_PREFIX(DeleteRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6048(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteRenderbuffersEXT), .-GL_PREFIX(DeleteRenderbuffersEXT)
@@ -28604,7 +28686,7 @@ GL_PREFIX(DeleteRenderbuffersEXT):
 GL_PREFIX(FramebufferRenderbufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6056(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28618,13 +28700,13 @@ GL_PREFIX(FramebufferRenderbufferEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6056(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6056(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28638,7 +28720,7 @@ GL_PREFIX(FramebufferRenderbufferEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6056(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferRenderbufferEXT), .-GL_PREFIX(FramebufferRenderbufferEXT)
@@ -28649,7 +28731,7 @@ GL_PREFIX(FramebufferRenderbufferEXT):
 GL_PREFIX(FramebufferTexture1DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6064(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28663,13 +28745,13 @@ GL_PREFIX(FramebufferTexture1DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6064(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6064(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28683,7 +28765,7 @@ GL_PREFIX(FramebufferTexture1DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6064(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTexture1DEXT), .-GL_PREFIX(FramebufferTexture1DEXT)
@@ -28694,7 +28776,7 @@ GL_PREFIX(FramebufferTexture1DEXT):
 GL_PREFIX(FramebufferTexture2DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6072(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28708,13 +28790,13 @@ GL_PREFIX(FramebufferTexture2DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6072(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6072(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28728,7 +28810,7 @@ GL_PREFIX(FramebufferTexture2DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6072(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTexture2DEXT), .-GL_PREFIX(FramebufferTexture2DEXT)
@@ -28739,7 +28821,7 @@ GL_PREFIX(FramebufferTexture2DEXT):
 GL_PREFIX(FramebufferTexture3DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6080(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28757,13 +28839,13 @@ GL_PREFIX(FramebufferTexture3DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6080(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6080(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28781,7 +28863,7 @@ GL_PREFIX(FramebufferTexture3DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6080(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTexture3DEXT), .-GL_PREFIX(FramebufferTexture3DEXT)
@@ -28792,7 +28874,7 @@ GL_PREFIX(FramebufferTexture3DEXT):
 GL_PREFIX(GenFramebuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6088(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28802,13 +28884,13 @@ GL_PREFIX(GenFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6088(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6088(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28818,7 +28900,7 @@ GL_PREFIX(GenFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6088(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenFramebuffersEXT), .-GL_PREFIX(GenFramebuffersEXT)
@@ -28829,7 +28911,7 @@ GL_PREFIX(GenFramebuffersEXT):
 GL_PREFIX(GenRenderbuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6096(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28839,13 +28921,13 @@ GL_PREFIX(GenRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6096(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6096(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28855,7 +28937,7 @@ GL_PREFIX(GenRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6096(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenRenderbuffersEXT), .-GL_PREFIX(GenRenderbuffersEXT)
@@ -28866,25 +28948,25 @@ GL_PREFIX(GenRenderbuffersEXT):
 GL_PREFIX(GenerateMipmapEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6104(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6104(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6104(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6104(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenerateMipmapEXT), .-GL_PREFIX(GenerateMipmapEXT)
@@ -28895,7 +28977,7 @@ GL_PREFIX(GenerateMipmapEXT):
 GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6112(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28909,13 +28991,13 @@ GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6112(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6112(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28929,7 +29011,7 @@ GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6112(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetFramebufferAttachmentParameterivEXT), .-GL_PREFIX(GetFramebufferAttachmentParameterivEXT)
@@ -28940,7 +29022,7 @@ GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 GL_PREFIX(GetRenderbufferParameterivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6120(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28950,13 +29032,13 @@ GL_PREFIX(GetRenderbufferParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6120(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6120(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28966,7 +29048,7 @@ GL_PREFIX(GetRenderbufferParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6120(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetRenderbufferParameterivEXT), .-GL_PREFIX(GetRenderbufferParameterivEXT)
@@ -28977,25 +29059,25 @@ GL_PREFIX(GetRenderbufferParameterivEXT):
 GL_PREFIX(IsFramebufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6128(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6128(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6128(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6128(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsFramebufferEXT), .-GL_PREFIX(IsFramebufferEXT)
@@ -29006,25 +29088,25 @@ GL_PREFIX(IsFramebufferEXT):
 GL_PREFIX(IsRenderbufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6136(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6136(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6136(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6136(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsRenderbufferEXT), .-GL_PREFIX(IsRenderbufferEXT)
@@ -29035,7 +29117,7 @@ GL_PREFIX(IsRenderbufferEXT):
 GL_PREFIX(RenderbufferStorageEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6144(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29049,13 +29131,13 @@ GL_PREFIX(RenderbufferStorageEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6144(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6144(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29069,19 +29151,19 @@ GL_PREFIX(RenderbufferStorageEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6144(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(RenderbufferStorageEXT), .-GL_PREFIX(RenderbufferStorageEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_769)
-	.type	GL_PREFIX(_dispatch_stub_769), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_769))
-GL_PREFIX(_dispatch_stub_769):
+	.globl	GL_PREFIX(_dispatch_stub_771)
+	.type	GL_PREFIX(_dispatch_stub_771), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_771))
+GL_PREFIX(_dispatch_stub_771):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6152(%rax), %r11
+	movq	6168(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29099,13 +29181,13 @@ GL_PREFIX(_dispatch_stub_769):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6152(%rax), %r11
+	movq	6168(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6152(%rax), %r11
+	movq	6168(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29123,10 +29205,10 @@ GL_PREFIX(_dispatch_stub_769):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6152(%rax), %r11
+	movq	6168(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_769), .-GL_PREFIX(_dispatch_stub_769)
+	.size	GL_PREFIX(_dispatch_stub_771), .-GL_PREFIX(_dispatch_stub_771)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(FramebufferTextureLayerEXT)
@@ -29134,7 +29216,7 @@ GL_PREFIX(_dispatch_stub_769):
 GL_PREFIX(FramebufferTextureLayerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6160(%rax), %r11
+	movq	6176(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29148,13 +29230,13 @@ GL_PREFIX(FramebufferTextureLayerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6160(%rax), %r11
+	movq	6176(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6160(%rax), %r11
+	movq	6176(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29168,19 +29250,19 @@ GL_PREFIX(FramebufferTextureLayerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6160(%rax), %r11
+	movq	6176(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTextureLayerEXT), .-GL_PREFIX(FramebufferTextureLayerEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_771)
-	.type	GL_PREFIX(_dispatch_stub_771), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_771))
-GL_PREFIX(_dispatch_stub_771):
+	.globl	GL_PREFIX(_dispatch_stub_773)
+	.type	GL_PREFIX(_dispatch_stub_773), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_773))
+GL_PREFIX(_dispatch_stub_773):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6168(%rax), %r11
+	movq	6184(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29194,13 +29276,13 @@ GL_PREFIX(_dispatch_stub_771):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6168(%rax), %r11
+	movq	6184(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6168(%rax), %r11
+	movq	6184(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29214,19 +29296,19 @@ GL_PREFIX(_dispatch_stub_771):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6168(%rax), %r11
+	movq	6184(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_771), .-GL_PREFIX(_dispatch_stub_771)
+	.size	GL_PREFIX(_dispatch_stub_773), .-GL_PREFIX(_dispatch_stub_773)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_772)
-	.type	GL_PREFIX(_dispatch_stub_772), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_772))
-GL_PREFIX(_dispatch_stub_772):
+	.globl	GL_PREFIX(_dispatch_stub_774)
+	.type	GL_PREFIX(_dispatch_stub_774), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_774))
+GL_PREFIX(_dispatch_stub_774):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6176(%rax), %r11
+	movq	6192(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29240,13 +29322,13 @@ GL_PREFIX(_dispatch_stub_772):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6176(%rax), %r11
+	movq	6192(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6176(%rax), %r11
+	movq	6192(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29260,19 +29342,19 @@ GL_PREFIX(_dispatch_stub_772):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6176(%rax), %r11
+	movq	6192(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_772), .-GL_PREFIX(_dispatch_stub_772)
+	.size	GL_PREFIX(_dispatch_stub_774), .-GL_PREFIX(_dispatch_stub_774)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_773)
-	.type	GL_PREFIX(_dispatch_stub_773), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_773))
-GL_PREFIX(_dispatch_stub_773):
+	.globl	GL_PREFIX(_dispatch_stub_775)
+	.type	GL_PREFIX(_dispatch_stub_775), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_775))
+GL_PREFIX(_dispatch_stub_775):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6184(%rax), %r11
+	movq	6200(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29286,13 +29368,13 @@ GL_PREFIX(_dispatch_stub_773):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6184(%rax), %r11
+	movq	6200(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6184(%rax), %r11
+	movq	6200(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29306,19 +29388,19 @@ GL_PREFIX(_dispatch_stub_773):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6184(%rax), %r11
+	movq	6200(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_773), .-GL_PREFIX(_dispatch_stub_773)
+	.size	GL_PREFIX(_dispatch_stub_775), .-GL_PREFIX(_dispatch_stub_775)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_774)
-	.type	GL_PREFIX(_dispatch_stub_774), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_774))
-GL_PREFIX(_dispatch_stub_774):
+	.globl	GL_PREFIX(_dispatch_stub_776)
+	.type	GL_PREFIX(_dispatch_stub_776), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_776))
+GL_PREFIX(_dispatch_stub_776):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6192(%rax), %r11
+	movq	6208(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29328,13 +29410,13 @@ GL_PREFIX(_dispatch_stub_774):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6192(%rax), %r11
+	movq	6208(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6192(%rax), %r11
+	movq	6208(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29344,19 +29426,19 @@ GL_PREFIX(_dispatch_stub_774):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6192(%rax), %r11
+	movq	6208(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_774), .-GL_PREFIX(_dispatch_stub_774)
+	.size	GL_PREFIX(_dispatch_stub_776), .-GL_PREFIX(_dispatch_stub_776)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_775)
-	.type	GL_PREFIX(_dispatch_stub_775), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_775))
-GL_PREFIX(_dispatch_stub_775):
+	.globl	GL_PREFIX(_dispatch_stub_777)
+	.type	GL_PREFIX(_dispatch_stub_777), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_777))
+GL_PREFIX(_dispatch_stub_777):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6200(%rax), %r11
+	movq	6216(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29366,13 +29448,13 @@ GL_PREFIX(_dispatch_stub_775):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6200(%rax), %r11
+	movq	6216(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6200(%rax), %r11
+	movq	6216(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29382,10 +29464,10 @@ GL_PREFIX(_dispatch_stub_775):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6200(%rax), %r11
+	movq	6216(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_775), .-GL_PREFIX(_dispatch_stub_775)
+	.size	GL_PREFIX(_dispatch_stub_777), .-GL_PREFIX(_dispatch_stub_777)
 
 	.globl GL_PREFIX(ArrayElementEXT) ; .set GL_PREFIX(ArrayElementEXT), GL_PREFIX(ArrayElement)
 	.globl GL_PREFIX(BindTextureEXT) ; .set GL_PREFIX(BindTextureEXT), GL_PREFIX(BindTexture)
@@ -29640,7 +29722,7 @@ GL_PREFIX(_dispatch_stub_775):
 	.globl GL_PREFIX(IsProgramARB) ; .set GL_PREFIX(IsProgramARB), GL_PREFIX(IsProgramNV)
 	.globl GL_PREFIX(PointParameteri) ; .set GL_PREFIX(PointParameteri), GL_PREFIX(PointParameteriNV)
 	.globl GL_PREFIX(PointParameteriv) ; .set GL_PREFIX(PointParameteriv), GL_PREFIX(PointParameterivNV)
-	.globl GL_PREFIX(BlendEquationSeparate) ; .set GL_PREFIX(BlendEquationSeparate), GL_PREFIX(_dispatch_stub_751)
+	.globl GL_PREFIX(BlendEquationSeparate) ; .set GL_PREFIX(BlendEquationSeparate), GL_PREFIX(_dispatch_stub_753)
 	.globl GL_PREFIX(BindFramebuffer) ; .set GL_PREFIX(BindFramebuffer), GL_PREFIX(BindFramebufferEXT)
 	.globl GL_PREFIX(BindRenderbuffer) ; .set GL_PREFIX(BindRenderbuffer), GL_PREFIX(BindRenderbufferEXT)
 	.globl GL_PREFIX(CheckFramebufferStatus) ; .set GL_PREFIX(CheckFramebufferStatus), GL_PREFIX(CheckFramebufferStatusEXT)
@@ -29658,7 +29740,7 @@ GL_PREFIX(_dispatch_stub_775):
 	.globl GL_PREFIX(IsFramebuffer) ; .set GL_PREFIX(IsFramebuffer), GL_PREFIX(IsFramebufferEXT)
 	.globl GL_PREFIX(IsRenderbuffer) ; .set GL_PREFIX(IsRenderbuffer), GL_PREFIX(IsRenderbufferEXT)
 	.globl GL_PREFIX(RenderbufferStorage) ; .set GL_PREFIX(RenderbufferStorage), GL_PREFIX(RenderbufferStorageEXT)
-	.globl GL_PREFIX(BlitFramebuffer) ; .set GL_PREFIX(BlitFramebuffer), GL_PREFIX(_dispatch_stub_769)
+	.globl GL_PREFIX(BlitFramebuffer) ; .set GL_PREFIX(BlitFramebuffer), GL_PREFIX(_dispatch_stub_771)
 	.globl GL_PREFIX(FramebufferTextureLayer) ; .set GL_PREFIX(FramebufferTextureLayer), GL_PREFIX(FramebufferTextureLayerEXT)
 
 #if defined(GLX_USE_TLS) && defined(__linux__)
diff --git a/src/mesa/x86/glapi_x86.S b/src/mesa/x86/glapi_x86.S
index 85eb955413..8d5ef4f90c 100644
--- a/src/mesa/x86/glapi_x86.S
+++ b/src/mesa/x86/glapi_x86.S
@@ -713,24 +713,26 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(GetAttribLocationARB, _gloffset_GetAttribLocationARB, GetAttribLocationARB@8)
 	GL_STUB(DrawBuffersARB, _gloffset_DrawBuffersARB, DrawBuffersARB@8)
 	GL_STUB(RenderbufferStorageMultisample, _gloffset_RenderbufferStorageMultisample, RenderbufferStorageMultisample@20)
+	GL_STUB(FlushMappedBufferRange, _gloffset_FlushMappedBufferRange, FlushMappedBufferRange@12)
+	GL_STUB(MapBufferRange, _gloffset_MapBufferRange, MapBufferRange@16)
 	GL_STUB(CopyBufferSubData, _gloffset_CopyBufferSubData, CopyBufferSubData@20)
 	GL_STUB(PolygonOffsetEXT, _gloffset_PolygonOffsetEXT, PolygonOffsetEXT@8)
-	GL_STUB(_dispatch_stub_564, _gloffset_GetPixelTexGenParameterfvSGIS, _dispatch_stub_564@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_564, _dispatch_stub_564@8))
-	GL_STUB(_dispatch_stub_565, _gloffset_GetPixelTexGenParameterivSGIS, _dispatch_stub_565@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_565, _dispatch_stub_565@8))
-	GL_STUB(_dispatch_stub_566, _gloffset_PixelTexGenParameterfSGIS, _dispatch_stub_566@8)
+	GL_STUB(_dispatch_stub_566, _gloffset_GetPixelTexGenParameterfvSGIS, _dispatch_stub_566@8)
 	HIDDEN(GL_PREFIX(_dispatch_stub_566, _dispatch_stub_566@8))
-	GL_STUB(_dispatch_stub_567, _gloffset_PixelTexGenParameterfvSGIS, _dispatch_stub_567@8)
+	GL_STUB(_dispatch_stub_567, _gloffset_GetPixelTexGenParameterivSGIS, _dispatch_stub_567@8)
 	HIDDEN(GL_PREFIX(_dispatch_stub_567, _dispatch_stub_567@8))
-	GL_STUB(_dispatch_stub_568, _gloffset_PixelTexGenParameteriSGIS, _dispatch_stub_568@8)
+	GL_STUB(_dispatch_stub_568, _gloffset_PixelTexGenParameterfSGIS, _dispatch_stub_568@8)
 	HIDDEN(GL_PREFIX(_dispatch_stub_568, _dispatch_stub_568@8))
-	GL_STUB(_dispatch_stub_569, _gloffset_PixelTexGenParameterivSGIS, _dispatch_stub_569@8)
+	GL_STUB(_dispatch_stub_569, _gloffset_PixelTexGenParameterfvSGIS, _dispatch_stub_569@8)
 	HIDDEN(GL_PREFIX(_dispatch_stub_569, _dispatch_stub_569@8))
-	GL_STUB(_dispatch_stub_570, _gloffset_SampleMaskSGIS, _dispatch_stub_570@8)
+	GL_STUB(_dispatch_stub_570, _gloffset_PixelTexGenParameteriSGIS, _dispatch_stub_570@8)
 	HIDDEN(GL_PREFIX(_dispatch_stub_570, _dispatch_stub_570@8))
-	GL_STUB(_dispatch_stub_571, _gloffset_SamplePatternSGIS, _dispatch_stub_571@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_571, _dispatch_stub_571@4))
+	GL_STUB(_dispatch_stub_571, _gloffset_PixelTexGenParameterivSGIS, _dispatch_stub_571@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_571, _dispatch_stub_571@8))
+	GL_STUB(_dispatch_stub_572, _gloffset_SampleMaskSGIS, _dispatch_stub_572@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_572, _dispatch_stub_572@8))
+	GL_STUB(_dispatch_stub_573, _gloffset_SamplePatternSGIS, _dispatch_stub_573@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_573, _dispatch_stub_573@4))
 	GL_STUB(ColorPointerEXT, _gloffset_ColorPointerEXT, ColorPointerEXT@20)
 	GL_STUB(EdgeFlagPointerEXT, _gloffset_EdgeFlagPointerEXT, EdgeFlagPointerEXT@12)
 	GL_STUB(IndexPointerEXT, _gloffset_IndexPointerEXT, IndexPointerEXT@16)
@@ -741,10 +743,10 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(PointParameterfvEXT, _gloffset_PointParameterfvEXT, PointParameterfvEXT@8)
 	GL_STUB(LockArraysEXT, _gloffset_LockArraysEXT, LockArraysEXT@8)
 	GL_STUB(UnlockArraysEXT, _gloffset_UnlockArraysEXT, UnlockArraysEXT@0)
-	GL_STUB(_dispatch_stub_582, _gloffset_CullParameterdvEXT, _dispatch_stub_582@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_582, _dispatch_stub_582@8))
-	GL_STUB(_dispatch_stub_583, _gloffset_CullParameterfvEXT, _dispatch_stub_583@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_583, _dispatch_stub_583@8))
+	GL_STUB(_dispatch_stub_584, _gloffset_CullParameterdvEXT, _dispatch_stub_584@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_584, _dispatch_stub_584@8))
+	GL_STUB(_dispatch_stub_585, _gloffset_CullParameterfvEXT, _dispatch_stub_585@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_585, _dispatch_stub_585@8))
 	GL_STUB(SecondaryColor3bEXT, _gloffset_SecondaryColor3bEXT, SecondaryColor3bEXT@12)
 	GL_STUB(SecondaryColor3bvEXT, _gloffset_SecondaryColor3bvEXT, SecondaryColor3bvEXT@4)
 	GL_STUB(SecondaryColor3dEXT, _gloffset_SecondaryColor3dEXT, SecondaryColor3dEXT@24)
@@ -769,8 +771,8 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(FogCoorddvEXT, _gloffset_FogCoorddvEXT, FogCoorddvEXT@4)
 	GL_STUB(FogCoordfEXT, _gloffset_FogCoordfEXT, FogCoordfEXT@4)
 	GL_STUB(FogCoordfvEXT, _gloffset_FogCoordfvEXT, FogCoordfvEXT@4)
-	GL_STUB(_dispatch_stub_608, _gloffset_PixelTexGenSGIX, _dispatch_stub_608@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_608, _dispatch_stub_608@4))
+	GL_STUB(_dispatch_stub_610, _gloffset_PixelTexGenSGIX, _dispatch_stub_610@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_610, _dispatch_stub_610@4))
 	GL_STUB(BlendFuncSeparateEXT, _gloffset_BlendFuncSeparateEXT, BlendFuncSeparateEXT@16)
 	GL_STUB(FlushVertexArrayRangeNV, _gloffset_FlushVertexArrayRangeNV, FlushVertexArrayRangeNV@0)
 	GL_STUB(VertexArrayRangeNV, _gloffset_VertexArrayRangeNV, VertexArrayRangeNV@8)
@@ -812,24 +814,24 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(WindowPos4ivMESA, _gloffset_WindowPos4ivMESA, WindowPos4ivMESA@4)
 	GL_STUB(WindowPos4sMESA, _gloffset_WindowPos4sMESA, WindowPos4sMESA@16)
 	GL_STUB(WindowPos4svMESA, _gloffset_WindowPos4svMESA, WindowPos4svMESA@4)
-	GL_STUB(_dispatch_stub_650, _gloffset_MultiModeDrawArraysIBM, _dispatch_stub_650@20)
-	HIDDEN(GL_PREFIX(_dispatch_stub_650, _dispatch_stub_650@20))
-	GL_STUB(_dispatch_stub_651, _gloffset_MultiModeDrawElementsIBM, _dispatch_stub_651@24)
-	HIDDEN(GL_PREFIX(_dispatch_stub_651, _dispatch_stub_651@24))
-	GL_STUB(_dispatch_stub_652, _gloffset_DeleteFencesNV, _dispatch_stub_652@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_652, _dispatch_stub_652@8))
-	GL_STUB(_dispatch_stub_653, _gloffset_FinishFenceNV, _dispatch_stub_653@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_653, _dispatch_stub_653@4))
-	GL_STUB(_dispatch_stub_654, _gloffset_GenFencesNV, _dispatch_stub_654@8)
+	GL_STUB(_dispatch_stub_652, _gloffset_MultiModeDrawArraysIBM, _dispatch_stub_652@20)
+	HIDDEN(GL_PREFIX(_dispatch_stub_652, _dispatch_stub_652@20))
+	GL_STUB(_dispatch_stub_653, _gloffset_MultiModeDrawElementsIBM, _dispatch_stub_653@24)
+	HIDDEN(GL_PREFIX(_dispatch_stub_653, _dispatch_stub_653@24))
+	GL_STUB(_dispatch_stub_654, _gloffset_DeleteFencesNV, _dispatch_stub_654@8)
 	HIDDEN(GL_PREFIX(_dispatch_stub_654, _dispatch_stub_654@8))
-	GL_STUB(_dispatch_stub_655, _gloffset_GetFenceivNV, _dispatch_stub_655@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_655, _dispatch_stub_655@12))
-	GL_STUB(_dispatch_stub_656, _gloffset_IsFenceNV, _dispatch_stub_656@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_656, _dispatch_stub_656@4))
-	GL_STUB(_dispatch_stub_657, _gloffset_SetFenceNV, _dispatch_stub_657@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_657, _dispatch_stub_657@8))
-	GL_STUB(_dispatch_stub_658, _gloffset_TestFenceNV, _dispatch_stub_658@4)
+	GL_STUB(_dispatch_stub_655, _gloffset_FinishFenceNV, _dispatch_stub_655@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_655, _dispatch_stub_655@4))
+	GL_STUB(_dispatch_stub_656, _gloffset_GenFencesNV, _dispatch_stub_656@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_656, _dispatch_stub_656@8))
+	GL_STUB(_dispatch_stub_657, _gloffset_GetFenceivNV, _dispatch_stub_657@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_657, _dispatch_stub_657@12))
+	GL_STUB(_dispatch_stub_658, _gloffset_IsFenceNV, _dispatch_stub_658@4)
 	HIDDEN(GL_PREFIX(_dispatch_stub_658, _dispatch_stub_658@4))
+	GL_STUB(_dispatch_stub_659, _gloffset_SetFenceNV, _dispatch_stub_659@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_659, _dispatch_stub_659@8))
+	GL_STUB(_dispatch_stub_660, _gloffset_TestFenceNV, _dispatch_stub_660@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_660, _dispatch_stub_660@4))
 	GL_STUB(AreProgramsResidentNV, _gloffset_AreProgramsResidentNV, AreProgramsResidentNV@12)
 	GL_STUB(BindProgramNV, _gloffset_BindProgramNV, BindProgramNV@8)
 	GL_STUB(DeleteProgramsNV, _gloffset_DeleteProgramsNV, DeleteProgramsNV@8)
@@ -910,26 +912,26 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(SetFragmentShaderConstantATI, _gloffset_SetFragmentShaderConstantATI, SetFragmentShaderConstantATI@8)
 	GL_STUB(PointParameteriNV, _gloffset_PointParameteriNV, PointParameteriNV@8)
 	GL_STUB(PointParameterivNV, _gloffset_PointParameterivNV, PointParameterivNV@8)
-	GL_STUB(_dispatch_stub_739, _gloffset_ActiveStencilFaceEXT, _dispatch_stub_739@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_739, _dispatch_stub_739@4))
-	GL_STUB(_dispatch_stub_740, _gloffset_BindVertexArrayAPPLE, _dispatch_stub_740@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_740, _dispatch_stub_740@4))
-	GL_STUB(_dispatch_stub_741, _gloffset_DeleteVertexArraysAPPLE, _dispatch_stub_741@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_741, _dispatch_stub_741@8))
-	GL_STUB(_dispatch_stub_742, _gloffset_GenVertexArraysAPPLE, _dispatch_stub_742@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_742, _dispatch_stub_742@8))
-	GL_STUB(_dispatch_stub_743, _gloffset_IsVertexArrayAPPLE, _dispatch_stub_743@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_743, _dispatch_stub_743@4))
+	GL_STUB(_dispatch_stub_741, _gloffset_ActiveStencilFaceEXT, _dispatch_stub_741@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_741, _dispatch_stub_741@4))
+	GL_STUB(_dispatch_stub_742, _gloffset_BindVertexArrayAPPLE, _dispatch_stub_742@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_742, _dispatch_stub_742@4))
+	GL_STUB(_dispatch_stub_743, _gloffset_DeleteVertexArraysAPPLE, _dispatch_stub_743@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_743, _dispatch_stub_743@8))
+	GL_STUB(_dispatch_stub_744, _gloffset_GenVertexArraysAPPLE, _dispatch_stub_744@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_744, _dispatch_stub_744@8))
+	GL_STUB(_dispatch_stub_745, _gloffset_IsVertexArrayAPPLE, _dispatch_stub_745@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_745, _dispatch_stub_745@4))
 	GL_STUB(GetProgramNamedParameterdvNV, _gloffset_GetProgramNamedParameterdvNV, GetProgramNamedParameterdvNV@16)
 	GL_STUB(GetProgramNamedParameterfvNV, _gloffset_GetProgramNamedParameterfvNV, GetProgramNamedParameterfvNV@16)
 	GL_STUB(ProgramNamedParameter4dNV, _gloffset_ProgramNamedParameter4dNV, ProgramNamedParameter4dNV@44)
 	GL_STUB(ProgramNamedParameter4dvNV, _gloffset_ProgramNamedParameter4dvNV, ProgramNamedParameter4dvNV@16)
 	GL_STUB(ProgramNamedParameter4fNV, _gloffset_ProgramNamedParameter4fNV, ProgramNamedParameter4fNV@28)
 	GL_STUB(ProgramNamedParameter4fvNV, _gloffset_ProgramNamedParameter4fvNV, ProgramNamedParameter4fvNV@16)
-	GL_STUB(_dispatch_stub_750, _gloffset_DepthBoundsEXT, _dispatch_stub_750@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_750, _dispatch_stub_750@16))
-	GL_STUB(_dispatch_stub_751, _gloffset_BlendEquationSeparateEXT, _dispatch_stub_751@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_751, _dispatch_stub_751@8))
+	GL_STUB(_dispatch_stub_752, _gloffset_DepthBoundsEXT, _dispatch_stub_752@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_752, _dispatch_stub_752@16))
+	GL_STUB(_dispatch_stub_753, _gloffset_BlendEquationSeparateEXT, _dispatch_stub_753@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_753, _dispatch_stub_753@8))
 	GL_STUB(BindFramebufferEXT, _gloffset_BindFramebufferEXT, BindFramebufferEXT@8)
 	GL_STUB(BindRenderbufferEXT, _gloffset_BindRenderbufferEXT, BindRenderbufferEXT@8)
 	GL_STUB(CheckFramebufferStatusEXT, _gloffset_CheckFramebufferStatusEXT, CheckFramebufferStatusEXT@4)
@@ -947,19 +949,19 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(IsFramebufferEXT, _gloffset_IsFramebufferEXT, IsFramebufferEXT@4)
 	GL_STUB(IsRenderbufferEXT, _gloffset_IsRenderbufferEXT, IsRenderbufferEXT@4)
 	GL_STUB(RenderbufferStorageEXT, _gloffset_RenderbufferStorageEXT, RenderbufferStorageEXT@16)
-	GL_STUB(_dispatch_stub_769, _gloffset_BlitFramebufferEXT, _dispatch_stub_769@40)
-	HIDDEN(GL_PREFIX(_dispatch_stub_769, _dispatch_stub_769@40))
+	GL_STUB(_dispatch_stub_771, _gloffset_BlitFramebufferEXT, _dispatch_stub_771@40)
+	HIDDEN(GL_PREFIX(_dispatch_stub_771, _dispatch_stub_771@40))
 	GL_STUB(FramebufferTextureLayerEXT, _gloffset_FramebufferTextureLayerEXT, FramebufferTextureLayerEXT@20)
-	GL_STUB(_dispatch_stub_771, _gloffset_StencilFuncSeparateATI, _dispatch_stub_771@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_771, _dispatch_stub_771@16))
-	GL_STUB(_dispatch_stub_772, _gloffset_ProgramEnvParameters4fvEXT, _dispatch_stub_772@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_772, _dispatch_stub_772@16))
-	GL_STUB(_dispatch_stub_773, _gloffset_ProgramLocalParameters4fvEXT, _dispatch_stub_773@16)
+	GL_STUB(_dispatch_stub_773, _gloffset_StencilFuncSeparateATI, _dispatch_stub_773@16)
 	HIDDEN(GL_PREFIX(_dispatch_stub_773, _dispatch_stub_773@16))
-	GL_STUB(_dispatch_stub_774, _gloffset_GetQueryObjecti64vEXT, _dispatch_stub_774@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_774, _dispatch_stub_774@12))
-	GL_STUB(_dispatch_stub_775, _gloffset_GetQueryObjectui64vEXT, _dispatch_stub_775@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_775, _dispatch_stub_775@12))
+	GL_STUB(_dispatch_stub_774, _gloffset_ProgramEnvParameters4fvEXT, _dispatch_stub_774@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_774, _dispatch_stub_774@16))
+	GL_STUB(_dispatch_stub_775, _gloffset_ProgramLocalParameters4fvEXT, _dispatch_stub_775@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_775, _dispatch_stub_775@16))
+	GL_STUB(_dispatch_stub_776, _gloffset_GetQueryObjecti64vEXT, _dispatch_stub_776@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_776, _dispatch_stub_776@12))
+	GL_STUB(_dispatch_stub_777, _gloffset_GetQueryObjectui64vEXT, _dispatch_stub_777@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_777, _dispatch_stub_777@12))
 	GL_STUB_ALIAS(ArrayElementEXT, _gloffset_ArrayElement, ArrayElementEXT@4, ArrayElement, ArrayElement@4)
 	GL_STUB_ALIAS(BindTextureEXT, _gloffset_BindTexture, BindTextureEXT@8, BindTexture, BindTexture@8)
 	GL_STUB_ALIAS(DrawArraysEXT, _gloffset_DrawArrays, DrawArraysEXT@12, DrawArrays, DrawArrays@12)
-- 
cgit v1.2.3


From e75b283b45add351dbe5a09289fe85546df8a79a Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 8 Jun 2009 17:02:36 -0600
Subject: mesa: implement GL_ARB_map_buffer_range

Only enabled for software drivers at this point.

Note that the gl_buffer_object::Access enum field has been replaced by
a gl_buffer_object::AccessFlags bitfield.  The new field is a mask of
the GL_MAP_x_BIT flags which is a superset of the old GL_READ_ONLY,
GL_WRITE_ONLY and GL_READ_WRITE modes.  When we query GL_BUFFER_ACCESS_ARB
we translate the bitfield into the conventional enum values.
---
 src/mesa/drivers/common/driverfuncs.c |   5 +
 src/mesa/main/api_exec.c              |   6 +-
 src/mesa/main/bufferobj.c             | 235 ++++++++++++++++++++++++++++++++--
 src/mesa/main/bufferobj.h             |  17 +++
 src/mesa/main/dlist.c                 |   6 +
 src/mesa/main/extensions.c            |   5 +-
 src/mesa/main/mfeatures.h             |   1 +
 src/mesa/main/mtypes.h                |   3 +-
 8 files changed, 265 insertions(+), 13 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c
index 56abdbdfcb..624ace058a 100644
--- a/src/mesa/drivers/common/driverfuncs.c
+++ b/src/mesa/drivers/common/driverfuncs.c
@@ -213,6 +213,11 @@ _mesa_init_driver_functions(struct dd_function_table *driver)
    driver->UnmapBuffer = _mesa_buffer_unmap;
 #endif
 
+#if FEATURE_ARB_map_buffer_range
+   driver->MapBufferRange = _mesa_buffer_map_range;
+   driver->FlushMappedBufferRange = _mesa_buffer_flush_mapped_range;
+#endif
+
 #if FEATURE_EXT_framebuffer_object
    driver->NewFramebuffer = _mesa_new_framebuffer;
    driver->NewRenderbuffer = _mesa_new_soft_renderbuffer;
diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index c714d177a2..2cc9a4323b 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -895,7 +895,11 @@ _mesa_init_exec_table(struct _glapi_table *exec)
    SET_RenderbufferStorageMultisample(exec, _mesa_RenderbufferStorageMultisample);
 #endif
 
+#if FEATURE_ARB_map_buffer_range
+   SET_MapBufferRange(exec, _mesa_MapBufferRange);
+   SET_FlushMappedBufferRange(exec, _mesa_FlushMappedBufferRange);
+#endif
+
    /* GL_ARB_copy_buffer */
    SET_CopyBufferSubData(exec, _mesa_CopyBufferSubData);
 }
-
diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 3e011ef5b2..6b22881072 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -40,9 +40,9 @@
 
 
 #ifdef FEATURE_OES_mapbuffer
-#define DEFAULT_ACCESS GL_WRITE_ONLY;
+#define DEFAULT_ACCESS GL_MAP_WRITE_BIT
 #else
-#define DEFAULT_ACCESS GL_READ_WRITE;
+#define DEFAULT_ACCESS (GL_MAP_READ_BIT | GL_MAP_WRITE_BIT)
 #endif
 
 
@@ -95,6 +95,24 @@ get_buffer(GLcontext *ctx, GLenum target)
 }
 
 
+/**
+ * Convert a GLbitfield describing the mapped buffer access flags
+ * into one of GL_READ_WRITE, GL_READ_ONLY, or GL_WRITE_ONLY.
+ */
+static GLenum
+simplified_access_mode(GLbitfield access)
+{
+   const GLbitfield rwFlags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT;
+   if ((access & rwFlags) == rwFlags)
+      return GL_READ_WRITE;
+   if ((access & GL_MAP_READ_BIT) == GL_MAP_READ_BIT)
+      return GL_READ_ONLY;
+   if ((access & GL_MAP_WRITE_BIT) == GL_MAP_WRITE_BIT)
+      return GL_WRITE_ONLY;
+   return GL_READ_WRITE; /* this should never happen, but no big deal */
+}
+
+
 /**
  * Tests the subdata range parameters and sets the GL error code for
  * \c glBufferSubDataARB and \c glGetBufferSubDataARB.
@@ -271,7 +289,7 @@ _mesa_initialize_buffer_object( struct gl_buffer_object *obj,
    obj->RefCount = 1;
    obj->Name = name;
    obj->Usage = GL_STATIC_DRAW_ARB;
-   obj->Access = DEFAULT_ACCESS;
+   obj->AccessFlags = DEFAULT_ACCESS;
 }
 
 
@@ -409,6 +427,43 @@ _mesa_buffer_map( GLcontext *ctx, GLenum target, GLenum access,
 }
 
 
+/**
+ * Default fallback for \c dd_function_table::MapBufferRange().
+ * Called via glMapBufferRange().
+ */
+void *
+_mesa_buffer_map_range( GLcontext *ctx, GLenum target, GLintptr offset,
+                        GLsizeiptr length, GLbitfield access,
+                        struct gl_buffer_object *bufObj )
+{
+   (void) ctx;
+   (void) target;
+   (void) access;
+   (void) length;
+   assert(!bufObj->Pointer);
+   /* Just return a direct pointer to the data */
+   return bufObj->Data + offset;
+}
+
+
+/**
+ * Default fallback for \c dd_function_table::FlushMappedBufferRange().
+ * Called via glFlushMappedBufferRange().
+ */
+void
+_mesa_buffer_flush_mapped_range( GLcontext *ctx, GLenum target, 
+                                 GLintptr offset, GLsizeiptr length,
+                                 struct gl_buffer_object *obj )
+{
+   (void) ctx;
+   (void) target;
+   (void) offset;
+   (void) length;
+   (void) obj;
+   /* no-op */
+}
+
+
 /**
  * Default callback for \c dd_function_table::MapBuffer().
  *
@@ -845,7 +900,7 @@ _mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids)
          if (bufObj->Pointer) {
             /* if mapped, unmap it now */
             ctx->Driver.UnmapBuffer(ctx, 0, bufObj);
-            bufObj->Access = DEFAULT_ACCESS;
+            bufObj->AccessFlags = DEFAULT_ACCESS;
             bufObj->Pointer = NULL;
          }
 
@@ -1004,7 +1059,7 @@ _mesa_BufferDataARB(GLenum target, GLsizeiptrARB size,
    if (bufObj->Pointer) {
       /* Unmap the existing buffer.  We'll replace it now.  Not an error. */
       ctx->Driver.UnmapBuffer(ctx, target, bufObj);
-      bufObj->Access = DEFAULT_ACCESS;
+      bufObj->AccessFlags = DEFAULT_ACCESS;
       bufObj->Pointer = NULL;
    }  
 
@@ -1071,13 +1126,18 @@ _mesa_MapBufferARB(GLenum target, GLenum access)
 {
    GET_CURRENT_CONTEXT(ctx);
    struct gl_buffer_object * bufObj;
+   GLbitfield accessFlags;
    ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, NULL);
 
    switch (access) {
       case GL_READ_ONLY_ARB:
+         accessFlags = GL_MAP_READ_BIT;
+         break;
       case GL_WRITE_ONLY_ARB:
+         accessFlags = GL_MAP_WRITE_BIT;
+         break;
       case GL_READ_WRITE_ARB:
-         /* OK */
+         accessFlags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT;
          break;
       default:
          _mesa_error(ctx, GL_INVALID_ENUM, "glMapBufferARB(access)");
@@ -1104,7 +1164,10 @@ _mesa_MapBufferARB(GLenum target, GLenum access)
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glMapBufferARB(access)");
    }
 
-   bufObj->Access = access;
+   bufObj->AccessFlags = accessFlags;
+   bufObj->Offset = 0;
+   bufObj->Length = bufObj->Size;
+
    if (access == GL_WRITE_ONLY_ARB || access == GL_READ_WRITE_ARB)
       bufObj->Written = GL_TRUE;
 
@@ -1146,7 +1209,7 @@ _mesa_UnmapBufferARB(GLenum target)
    }
 
 #ifdef VBO_DEBUG
-   if (bufObj->Access == GL_WRITE_ONLY_ARB) {
+   if (bufObj->AccessFlags & GL_MAP_WRITE_BIT) {
       GLuint i, unchanged = 0;
       GLubyte *b = (GLubyte *) bufObj->Pointer;
       GLint pos = -1;
@@ -1166,8 +1229,10 @@ _mesa_UnmapBufferARB(GLenum target)
 #endif
 
    status = ctx->Driver.UnmapBuffer( ctx, target, bufObj );
-   bufObj->Access = DEFAULT_ACCESS;
+   bufObj->AccessFlags = DEFAULT_ACCESS;
    bufObj->Pointer = NULL;
+   bufObj->Offset = 0;
+   bufObj->Length = 0;
 
    return status;
 }
@@ -1198,7 +1263,7 @@ _mesa_GetBufferParameterivARB(GLenum target, GLenum pname, GLint *params)
          *params = bufObj->Usage;
          break;
       case GL_BUFFER_ACCESS_ARB:
-         *params = bufObj->Access;
+         *params = simplified_access_mode(bufObj->AccessFlags);
          break;
       case GL_BUFFER_MAPPED_ARB:
          *params = (bufObj->Pointer != NULL);
@@ -1315,3 +1380,153 @@ _mesa_CopyBufferSubData(GLenum readTarget, GLenum writeTarget,
    ctx->Driver.CopyBufferSubData(ctx, src, dst, readOffset, writeOffset, size);
 }
 
+
+/**
+ * See GL_ARB_map_buffer_range spec
+ */
+void * GLAPIENTRY
+_mesa_MapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length,
+                     GLbitfield access)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_buffer_object *bufObj;
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, NULL);
+
+   if (!ctx->Extensions.ARB_map_buffer_range) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glMapBufferRange(extension not supported)");
+      return NULL;
+   }
+
+   if (offset < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glMapBufferRange(offset = %ld)", offset);
+      return NULL;
+   }
+
+   if (length < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glMapBufferRange(length = %ld)", length);
+      return NULL;
+   }
+
+   if ((access & (GL_MAP_READ_BIT | GL_MAP_WRITE_BIT)) == 0) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glMapBufferRange(access indicates neither read or write)");
+      return NULL;
+   }
+
+   if (access & GL_MAP_READ_BIT) {
+      if ((access & GL_MAP_INVALIDATE_RANGE_BIT) ||
+          (access & GL_MAP_INVALIDATE_BUFFER_BIT) ||
+          (access & GL_MAP_UNSYNCHRONIZED_BIT)) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glMapBufferRange(invalid access flags)");
+         return NULL;
+      }
+   }
+
+   if ((access & GL_MAP_FLUSH_EXPLICIT_BIT) &&
+       ((access & GL_MAP_WRITE_BIT) == 0)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glMapBufferRange(invalid access flags)");
+      return NULL;
+   }
+
+   bufObj = get_buffer(ctx, target);
+   if (!bufObj || bufObj->Name == 0) {
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "glMapBufferRange(target = 0x%x)", target);
+      return NULL;
+   }
+
+   if (offset + length > bufObj->Size) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glMapBufferRange(offset + length > size)");
+      return NULL;
+   }
+
+   if (bufObj->Pointer) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glMapBufferRange(buffer already mapped)");
+      return NULL;
+   }
+      
+   ASSERT(ctx->Driver.MapBufferRange);
+   bufObj->Pointer = ctx->Driver.MapBufferRange(ctx, target, offset, length,
+                                                access, bufObj);
+
+   bufObj->Offset = offset;
+   bufObj->Length = length;
+   bufObj->AccessFlags = access;
+
+   return bufObj->Pointer;
+}
+
+
+/**
+ * See GL_ARB_map_buffer_range spec
+ */
+void GLAPIENTRY
+_mesa_FlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_buffer_object *bufObj;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (!ctx->Extensions.ARB_map_buffer_range) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glMapBufferRange(extension not supported)");
+      return;
+   }
+
+   if (offset < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glMapBufferRange(offset = %ld)", offset);
+      return;
+   }
+
+   if (length < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glMapBufferRange(length = %ld)", length);
+      return;
+   }
+
+   bufObj = get_buffer(ctx, target);
+   if (!bufObj) {
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "glMapBufferRange(target = 0x%x)", target);
+      return;
+   }
+
+   if (bufObj->Name == 0) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glMapBufferRange(current buffer is 0)");
+      return;
+   }
+
+   if (!bufObj->Pointer) {
+      /* buffer is not mapped */
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glMapBufferRange(buffer is not mapped)");
+      return;
+   }
+
+   if ((bufObj->AccessFlags & GL_MAP_FLUSH_EXPLICIT_BIT) == 0) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glMapBufferRange(GL_MAP_FLUSH_EXPLICIT_BIT not set)");
+      return;
+   }
+
+   if (offset + length > bufObj->Length) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+             "glMapBufferRange(offset %ld + length %ld > mapped length %ld)",
+             offset, length, bufObj->Length);
+      return;
+   }
+
+   ASSERT(bufObj->AccessFlags & GL_MAP_WRITE_BIT);
+
+   if (ctx->Driver.FlushMappedBufferRange)
+      ctx->Driver.FlushMappedBufferRange(ctx, target, offset, length, bufObj);
+}
diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h
index 79c027aa4d..a8e2dcef93 100644
--- a/src/mesa/main/bufferobj.h
+++ b/src/mesa/main/bufferobj.h
@@ -79,6 +79,16 @@ extern void *
 _mesa_buffer_map( GLcontext *ctx, GLenum target, GLenum access,
 		  struct gl_buffer_object * bufObj );
 
+extern void *
+_mesa_buffer_map_range( GLcontext *ctx, GLenum target, GLintptr offset,
+                        GLsizeiptr length, GLbitfield access,
+                        struct gl_buffer_object *bufObj );
+
+extern void
+_mesa_buffer_flush_mapped_range( GLcontext *ctx, GLenum target, 
+                                 GLintptr offset, GLsizeiptr length,
+                                 struct gl_buffer_object *obj );
+
 extern GLboolean
 _mesa_buffer_unmap( GLcontext *ctx, GLenum target,
                     struct gl_buffer_object * bufObj );
@@ -167,4 +177,11 @@ _mesa_CopyBufferSubData(GLenum readTarget, GLenum writeTarget,
                         GLintptr readOffset, GLintptr writeOffset,
                         GLsizeiptr size);
 
+extern void * GLAPIENTRY
+_mesa_MapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length,
+                     GLbitfield access);
+
+extern void GLAPIENTRY
+_mesa_FlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length);
+
 #endif
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index d3c1717a50..a9c2c306ec 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -8239,6 +8239,12 @@ _mesa_init_dlist_table(struct _glapi_table *table)
    SET_ProgramLocalParameters4fvEXT(table, save_ProgramLocalParameters4fvEXT);
 #endif
 
+   /* ARB 50. GL_ARB_map_buffer_range */
+#if FEATURE_ARB_map_buffer_range
+   SET_MapBufferRange(table, _mesa_MapBufferRange); /* no dlist save */
+   SET_FlushMappedBufferRange(table, _mesa_FlushMappedBufferRange); /* no dl */
+#endif
+
    /* ARB 59. GL_ARB_copy_buffer */
    SET_CopyBufferSubData(table, _mesa_CopyBufferSubData); /* no dlist save */
 }
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 490110a6d2..0d708fc246 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -1,8 +1,9 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.3
+ * Version:  7.6
  *
  * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -53,6 +54,7 @@ static const struct {
    { OFF, "GL_ARB_framebuffer_object",         F(ARB_framebuffer_object) },
    { OFF, "GL_ARB_half_float_pixel",           F(ARB_half_float_pixel) },
    { OFF, "GL_ARB_imaging",                    F(ARB_imaging) },
+   { OFF, "GL_ARB_map_buffer_range",           F(ARB_map_buffer_range) },
    { ON,  "GL_ARB_multisample",                F(ARB_multisample) },
    { OFF, "GL_ARB_multitexture",               F(ARB_multitexture) },
    { OFF, "GL_ARB_occlusion_query",            F(ARB_occlusion_query) },
@@ -199,6 +201,7 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
 #endif
    ctx->Extensions.ARB_half_float_pixel = GL_TRUE;
    ctx->Extensions.ARB_imaging = GL_TRUE;
+   ctx->Extensions.ARB_map_buffer_range = GL_TRUE;
    ctx->Extensions.ARB_multitexture = GL_TRUE;
 #if FEATURE_ARB_occlusion_query
    ctx->Extensions.ARB_occlusion_query = GL_TRUE;
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index 62c3ead3e1..ef973314e3 100644
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -61,6 +61,7 @@
 #define FEATURE_ARB_occlusion_query  _HAVE_FULL_GL
 #define FEATURE_ARB_fragment_program  _HAVE_FULL_GL
 #define FEATURE_ARB_framebuffer_object  _HAVE_FULL_GL
+#define FEATURE_ARB_map_buffer_range  _HAVE_FULL_GL
 #define FEATURE_ARB_pixel_buffer_object  _HAVE_FULL_GL
 #define FEATURE_ARB_vertex_buffer_object  _HAVE_FULL_GL
 #define FEATURE_ARB_vertex_program  _HAVE_FULL_GL
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 46020eb210..71a85a9db8 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1503,7 +1503,7 @@ struct gl_buffer_object
    GLubyte *Data;       /**< Location of storage either in RAM or VRAM. */
    /** Fields describing a mapped buffer */
    /*@{*/
-   GLenum Access;       /**< GL_READ_ONLY_ARB, GL_WRITE_ONLY_ARB, etc. */
+   GLbitfield AccessFlags; /**< Mask of GL_MAP_x_BIT flags */
    GLvoid *Pointer;     /**< User-space address of mapping */
    GLintptr Offset;     /**< Mapped offset */
    GLsizeiptr Length;   /**< Mapped length */
@@ -2443,6 +2443,7 @@ struct gl_extensions
    GLboolean ARB_framebuffer_object;
    GLboolean ARB_half_float_pixel;
    GLboolean ARB_imaging;
+   GLboolean ARB_map_buffer_range;
    GLboolean ARB_multisample;
    GLboolean ARB_multitexture;
    GLboolean ARB_occlusion_query;
-- 
cgit v1.2.3


From a81097c545f089610326d528296d8f1f25ac06a7 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 8 Jun 2009 15:27:10 -0600
Subject: mesa: reorder fields, update comments for gl_buffer_object

---
 src/mesa/main/mtypes.h | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 26ec8d5595..46020eb210 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1498,14 +1498,17 @@ struct gl_buffer_object
 {
    GLint RefCount;
    GLuint Name;
-   GLenum Usage;
-   GLenum Access;
-   GLvoid *Pointer;          /**< Only valid while buffer is mapped */
-   GLintptr Offset;          /**< mapped offset */
-   GLsizeiptr Length;        /**< mapped length */
-   GLsizeiptrARB Size;       /**< Size of storage in bytes */
-   GLubyte *Data;            /**< Location of storage either in RAM or VRAM. */
-   GLboolean Written;        /**< Ever written to? (for debugging) */
+   GLenum Usage;        /**< GL_STREAM_DRAW_ARB, GL_STREAM_READ_ARB, etc. */
+   GLsizeiptrARB Size;  /**< Size of buffer storage in bytes */
+   GLubyte *Data;       /**< Location of storage either in RAM or VRAM. */
+   /** Fields describing a mapped buffer */
+   /*@{*/
+   GLenum Access;       /**< GL_READ_ONLY_ARB, GL_WRITE_ONLY_ARB, etc. */
+   GLvoid *Pointer;     /**< User-space address of mapping */
+   GLintptr Offset;     /**< Mapped offset */
+   GLsizeiptr Length;   /**< Mapped length */
+   /*@}*/
+   GLboolean Written;   /**< Ever written to? (for debugging) */
 };
 
 
-- 
cgit v1.2.3


From 4a7fd6323afde7cbe22097ba71a149876a75bc58 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 9 Jun 2009 11:53:19 -0600
Subject: mesa: added a simple bounds checker to glMap/UnmapBuffer() (disabled)

---
 src/mesa/main/bufferobj.c | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 3e011ef5b2..a49da3d3b5 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -39,6 +39,11 @@
 #include "bufferobj.h"
 
 
+/* Debug flags */
+/*#define VBO_DEBUG*/
+/*#define BOUNDS_CHECK*/
+
+
 #ifdef FEATURE_OES_mapbuffer
 #define DEFAULT_ACCESS GL_WRITE_ONLY;
 #else
@@ -1019,6 +1024,9 @@ _mesa_BufferDataARB(GLenum target, GLsizeiptrARB size,
                 bufObj->Name, size, data, usage);
 #endif
 
+#ifdef BOUNDS_CHECK
+   size += 100;
+#endif
    /* Give the buffer object to the driver!  <data> may be null! */
    ctx->Driver.BufferData( ctx, target, size, data, usage, bufObj );
 }
@@ -1119,6 +1127,17 @@ _mesa_MapBufferARB(GLenum target, GLenum access)
    }
 #endif
 
+#ifdef BOUNDS_CHECK
+   {
+      GLubyte *buf = (GLubyte *) bufObj->Pointer;
+      GLuint i;
+      /* buffer is 100 bytes larger than requested, fill with magic value */
+      for (i = 0; i < 100; i++) {
+         buf[bufObj->Size - i - 1] = 123;
+      }
+   }
+#endif
+
    return bufObj->Pointer;
 }
 
@@ -1145,6 +1164,22 @@ _mesa_UnmapBufferARB(GLenum target)
       return GL_FALSE;
    }
 
+#ifdef BOUNDS_CHECK
+   if (bufObj->Access != GL_READ_ONLY_ARB) {
+      GLubyte *buf = (GLubyte *) bufObj->Pointer;
+      GLuint i;
+      /* check that last 100 bytes are still = magic value */
+      for (i = 0; i < 100; i++) {
+         GLuint pos = bufObj->Size - i - 1;
+         if (buf[pos] != 123) {
+            _mesa_warning(ctx, "Out of bounds buffer object write detected"
+                          " at position %d (value = %u)\n",
+                          pos, buf[pos]);
+         }
+      }
+   }
+#endif
+
 #ifdef VBO_DEBUG
    if (bufObj->Access == GL_WRITE_ONLY_ARB) {
       GLuint i, unchanged = 0;
-- 
cgit v1.2.3


From 6f50c9865d96a704cf47f59c3c21b4686bddf1f8 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 10 Jun 2009 08:39:10 -0600
Subject: mesa: disable texture unit error check in _mesa_MatrixMode()

See comments for details.
---
 src/mesa/main/matrix.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/matrix.c b/src/mesa/main/matrix.c
index 39b4967a58..ebc3cbd59c 100644
--- a/src/mesa/main/matrix.c
+++ b/src/mesa/main/matrix.c
@@ -160,11 +160,21 @@ _mesa_MatrixMode( GLenum mode )
       ctx->CurrentStack = &ctx->ProjectionMatrixStack;
       break;
    case GL_TEXTURE:
+      /* This error check is disabled because if we're called from
+       * glPopAttrib() when the active texture unit is >= MaxTextureCoordUnits
+       * we'll generate an unexpected error.
+       * From the GL_ARB_vertex_shader spec it sounds like we should instead
+       * do error checking in other places when we actually try to access
+       * texture matrices beyond MaxTextureCoordUnits.
+       */
+#if 0
       if (ctx->Texture.CurrentUnit >= ctx->Const.MaxTextureCoordUnits) {
          _mesa_error(ctx, GL_INVALID_OPERATION, "glMatrixMode(invalid tex unit %d)",
                      ctx->Texture.CurrentUnit);
          return;
       }
+#endif
+      ASSERT(ctx->Texture.CurrentUnit < Elements(ctx->TextureMatrixStack));
       ctx->CurrentStack = &ctx->TextureMatrixStack[ctx->Texture.CurrentUnit];
       break;
    case GL_COLOR:
-- 
cgit v1.2.3


From 8fa8669aeba45d1b57f3cc41429578d55cad378a Mon Sep 17 00:00:00 2001
From: José Fonseca <jfonseca@vmware.com>
Date: Wed, 10 Jun 2009 21:25:54 +0100
Subject: mesa: Fix typo in bitmask.

---
 src/mesa/main/image.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index 332febf91f..01fbe40a03 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -2872,7 +2872,7 @@ extract_uint_indexes(GLuint n, GLuint indexes[],
             }
             else {
                for (i = 0; i < n; i++)
-                  indexes[i] = s[i] & 0xfff;  /* lower 8 bits */
+                  indexes[i] = s[i] & 0xff;  /* lower 8 bits */
             }
          }
          break;
-- 
cgit v1.2.3


From 322e8556b91ceb80d4a53129cbb5db99087085f1 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 11 Jun 2009 14:55:14 -0600
Subject: mesa: add default function for ctx->Driver.CheckQuery() hook

---
 src/mesa/drivers/common/driverfuncs.c |  1 +
 src/mesa/main/queryobj.c              | 16 +++++++++++++++-
 src/mesa/main/queryobj.h              |  3 +++
 3 files changed, 19 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c
index 276da41f4e..6a98c29a3d 100644
--- a/src/mesa/drivers/common/driverfuncs.c
+++ b/src/mesa/drivers/common/driverfuncs.c
@@ -231,6 +231,7 @@ _mesa_init_driver_functions(struct dd_function_table *driver)
    driver->BeginQuery = _mesa_begin_query;
    driver->EndQuery = _mesa_end_query;
    driver->WaitQuery = _mesa_wait_query;
+   driver->CheckQuery = _mesa_check_query;
 
    /* APPLE_vertex_array_object */
    driver->NewArrayObject = _mesa_new_array_object;
diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c
index 554e0b0d18..c25b31af02 100644
--- a/src/mesa/main/queryobj.c
+++ b/src/mesa/main/queryobj.c
@@ -83,12 +83,26 @@ void
 _mesa_wait_query(GLcontext *ctx, struct gl_query_object *q)
 {
    /* For software drivers, _mesa_end_query() should have completed the query.
-    * For real hardware, implement a proper WaitQuery() driver function.
+    * For real hardware, implement a proper WaitQuery() driver function,
+    * which may require issuing a flush.
     */
    assert(q->Ready);
 }
 
 
+/**
+ * Check if a query results are ready.  Software driver fallback.
+ * Called via ctx->Driver.CheckQuery().
+ */
+void
+_mesa_check_query(GLcontext *ctx, struct gl_query_object *q)
+{
+   /* No-op for sw rendering.
+    * HW drivers may need to flush at this time.
+    */
+}
+
+
 /**
  * Delete a query object.  Called via ctx->Driver.DeleteQuery().
  * Not removed from hash table here.
diff --git a/src/mesa/main/queryobj.h b/src/mesa/main/queryobj.h
index 9a9774641b..bc02b65b54 100644
--- a/src/mesa/main/queryobj.h
+++ b/src/mesa/main/queryobj.h
@@ -48,6 +48,9 @@ _mesa_end_query(GLcontext *ctx, struct gl_query_object *q);
 extern void
 _mesa_wait_query(GLcontext *ctx, struct gl_query_object *q);
 
+extern void
+_mesa_check_query(GLcontext *ctx, struct gl_query_object *q);
+
 
 extern void GLAPIENTRY
 _mesa_GenQueriesARB(GLsizei n, GLuint *ids);
-- 
cgit v1.2.3


From c6de08fff483911953692693c501bc200c235dce Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@vmware.com>
Date: Thu, 11 Jun 2009 19:26:55 +0100
Subject: mesa: Enable uploads of only depth to z24s8 textures

---
 src/mesa/main/texstore.c | 39 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 36 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index f3739f950b..bfced1b3f4 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -2689,12 +2689,45 @@ GLboolean
 _mesa_texstore_z24_s8(TEXSTORE_PARAMS)
 {
    const GLfloat depthScale = (GLfloat) 0xffffff;
+   const GLint srcRowStride
+      = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType)
+      / sizeof(GLuint);
+   GLint img, row;
 
    ASSERT(dstFormat == &_mesa_texformat_z24_s8);
-   ASSERT(srcFormat == GL_DEPTH_STENCIL_EXT);
-   ASSERT(srcType == GL_UNSIGNED_INT_24_8_EXT);
+   ASSERT(srcFormat == GL_DEPTH_STENCIL_EXT || srcFormat == GL_DEPTH_COMPONENT);
+   ASSERT(srcFormat != GL_DEPTH_STENCIL_EXT || srcType == GL_UNSIGNED_INT_24_8_EXT);
 
-   if (ctx->Pixel.DepthScale == 1.0f &&
+   /* In case we only upload depth we need to preserve the stencil */
+   if (srcFormat == GL_DEPTH_COMPONENT) {
+      for (img = 0; img < srcDepth; img++) {
+         GLuint *dstRow = (GLuint *) dstAddr
+            + dstImageOffsets[dstZoffset + img]
+            + dstYoffset * dstRowStride / sizeof(GLuint)
+            + dstXoffset;
+         const GLuint *src
+            = (const GLuint *) _mesa_image_address(dims, srcPacking, srcAddr,
+                  srcWidth, srcHeight,
+                  srcFormat, srcType,
+                  img, 0, 0);
+         for (row = 0; row < srcHeight; row++) {
+            GLuint depth[MAX_WIDTH];
+            GLint i;
+            _mesa_unpack_depth_span(ctx, srcWidth,
+                                    GL_UNSIGNED_INT, /* dst type */
+                                    depth, /* dst addr */
+                                    depthScale,
+                                    srcType, src, srcPacking);
+
+            for (i = 0; i < srcWidth; i++)
+               dstRow[i] = depth[i] << 8 | (dstRow[i] & 0x000000FF);
+
+            src += srcRowStride;
+            dstRow += dstRowStride / sizeof(GLuint);
+         }
+      }
+   }
+   else if (ctx->Pixel.DepthScale == 1.0f &&
        ctx->Pixel.DepthBias == 0.0f &&
        !srcPacking->SwapBytes) {
       /* simple path */
-- 
cgit v1.2.3


From 0854b7e972eaea1986aa956d4dffa2d6ad541b62 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 10 Jun 2009 13:45:01 -0600
Subject: mesa: use _mesa_reference_buffer_object() in a few places

---
 src/mesa/main/bufferobj.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index a49da3d3b5..c04fa69115 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -470,11 +470,15 @@ _mesa_copy_buffer_subdata(GLcontext *ctx,
 void
 _mesa_init_buffer_objects( GLcontext *ctx )
 {
-   ctx->Array.ArrayBufferObj = ctx->Shared->NullBufferObj;
-   ctx->Array.ElementArrayBufferObj = ctx->Shared->NullBufferObj;
-
-   ctx->CopyReadBuffer = ctx->Shared->NullBufferObj;
-   ctx->CopyWriteBuffer = ctx->Shared->NullBufferObj;
+   _mesa_reference_buffer_object(ctx, &ctx->Array.ArrayBufferObj,
+                                 ctx->Shared->NullBufferObj);
+   _mesa_reference_buffer_object(ctx, &ctx->Array.ElementArrayBufferObj,
+                                 ctx->Shared->NullBufferObj);
+
+   _mesa_reference_buffer_object(ctx, &ctx->CopyReadBuffer,
+                                 ctx->Shared->NullBufferObj);
+   _mesa_reference_buffer_object(ctx, &ctx->CopyWriteBuffer,
+                                 ctx->Shared->NullBufferObj);
 }
 
 
-- 
cgit v1.2.3


From 05f0d90962147ad61050bbcde42775a3422e68a5 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 10 Jun 2009 13:46:04 -0600
Subject: mesa: use larger initial refcount for NullBufferObj

Refcounting of the null/default buffer object isn't perfect yet so be
extra safe.
---
 src/mesa/main/shared.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/shared.c b/src/mesa/main/shared.c
index 759883743d..731a154040 100644
--- a/src/mesa/main/shared.c
+++ b/src/mesa/main/shared.c
@@ -98,7 +98,7 @@ _mesa_alloc_shared_state(GLcontext *ctx)
     * XXX with recent/improved refcounting this may not longer be needed.
     */
    shared->NullBufferObj = _mesa_new_buffer_object(ctx, 0, 0);
-   shared->NullBufferObj->RefCount = 1000;
+   shared->NullBufferObj->RefCount = 1000 * 1000 * 1000;
 
    shared->ArrayObjects = _mesa_NewHashTable();
 
-- 
cgit v1.2.3


From 70e72070fce6aa1e0918dcc62c1949465cee69f7 Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Mon, 22 Jun 2009 18:22:51 -0700
Subject: mesa: From float type modifier from values to large for singles

The values 2147483648.0 and 4294967294.0 are too larget to be stored in single
precision floats.  Forcing these to be singles causes bits to be lost, which
results in errors in some pixel transfer tests.

This fixes bug #22344.
---
 src/mesa/main/macros.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/macros.h b/src/mesa/main/macros.h
index 59def651a3..4ca7957ffa 100644
--- a/src/mesa/main/macros.h
+++ b/src/mesa/main/macros.h
@@ -83,28 +83,28 @@ extern GLfloat _mesa_ubyte_to_float_color_tab[256];
 
 
 /** Convert GLuint in [0,4294967295] to GLfloat in [0.0,1.0] */
-#define UINT_TO_FLOAT(U)    ((GLfloat) (U) * (1.0F / 4294967295.0F))
+#define UINT_TO_FLOAT(U)    ((GLfloat) (U) * (1.0F / 4294967295.0))
 
 /** Convert GLfloat in [0.0,1.0] to GLuint in [0,4294967295] */
-#define FLOAT_TO_UINT(X)    ((GLuint) ((X) * 4294967295.0F))
+#define FLOAT_TO_UINT(X)    ((GLuint) ((X) * 4294967295.0))
 
 
 /** Convert GLint in [-2147483648,2147483647] to GLfloat in [-1.0,1.0] */
-#define INT_TO_FLOAT(I)     ((2.0F * (I) + 1.0F) * (1.0F/4294967294.0F))
+#define INT_TO_FLOAT(I)     ((2.0F * (I) + 1.0F) * (1.0F/4294967294.0))
 
 /** Convert GLfloat in [-1.0,1.0] to GLint in [-2147483648,2147483647] */
 /* causes overflow:
-#define FLOAT_TO_INT(X)     ( (((GLint) (4294967294.0F * (X))) - 1) / 2 )
+#define FLOAT_TO_INT(X)     ( (((GLint) (4294967294.0 * (X))) - 1) / 2 )
 */
 /* a close approximation: */
-#define FLOAT_TO_INT(X)     ( (GLint) (2147483647.0F * (X)) )
+#define FLOAT_TO_INT(X)     ( (GLint) (2147483647.0 * (X)) )
 
 
 /** Convert GLint in [-2147483648,2147483647] to GLfloat in [-1.0,1.0], texture/fb data */
-#define INT_TO_FLOAT_TEX(I)    ((I) == -2147483648 ? -1.0F : (I) * (1.0F/2147483647.0F))
+#define INT_TO_FLOAT_TEX(I)    ((I) == -2147483648 ? -1.0F : (I) * (1.0F/2147483647.0))
 
 /** Convert GLfloat in [-1.0,1.0] to GLint in [-2147483648,2147483647], texture/fb data */
-#define FLOAT_TO_INT_TEX(X)    ( (GLint) (2147483647.0F * (X)) )
+#define FLOAT_TO_INT_TEX(X)    ( (GLint) (2147483647.0 * (X)) )
 
 
 #define BYTE_TO_UBYTE(b)   ((GLubyte) ((b) < 0 ? 0 : (GLubyte) (b)))
-- 
cgit v1.2.3


From 6629a35559ff7e3b993966f697f7c7f68e5a38d9 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 19 Jun 2009 09:58:51 -0600
Subject: mesa: create/destroy buffer objects via driver functions

---
 src/mesa/main/shared.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/shared.c b/src/mesa/main/shared.c
index 731a154040..104f18f545 100644
--- a/src/mesa/main/shared.c
+++ b/src/mesa/main/shared.c
@@ -97,7 +97,7 @@ _mesa_alloc_shared_state(GLcontext *ctx)
     * it never gets deleted.
     * XXX with recent/improved refcounting this may not longer be needed.
     */
-   shared->NullBufferObj = _mesa_new_buffer_object(ctx, 0, 0);
+   shared->NullBufferObj = ctx->Driver.NewBufferObject(ctx, 0, 0);
    shared->NullBufferObj->RefCount = 1000 * 1000 * 1000;
 
    shared->ArrayObjects = _mesa_NewHashTable();
@@ -350,7 +350,7 @@ _mesa_free_shared_state(GLcontext *ctx, struct gl_shared_state *shared)
 #endif
 
 #if FEATURE_ARB_vertex_buffer_object
-   _mesa_delete_buffer_object(ctx, shared->NullBufferObj);
+   ctx->Driver.DeleteBuffer(ctx, shared->NullBufferObj);
 #endif
 
    /*
-- 
cgit v1.2.3


From 331eb58f68db26b54f706a908a3e1424a461b709 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 19 Jun 2009 10:00:03 -0600
Subject: mesa: make buffer object-related driver fallback functions static

Plug them in via _mesa_init_buffer_object_functions().
---
 src/mesa/drivers/common/driverfuncs.c | 19 +-------------
 src/mesa/main/bufferobj.c             | 46 +++++++++++++++++++++++++--------
 src/mesa/main/bufferobj.h             | 48 +++--------------------------------
 3 files changed, 40 insertions(+), 73 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c
index edc069deee..6c6b19538b 100644
--- a/src/mesa/drivers/common/driverfuncs.c
+++ b/src/mesa/drivers/common/driverfuncs.c
@@ -202,21 +202,7 @@ _mesa_init_driver_functions(struct dd_function_table *driver)
    driver->GetIntegerv = NULL;
    driver->GetPointerv = NULL;
    
-#if FEATURE_ARB_vertex_buffer_object
-   driver->NewBufferObject = _mesa_new_buffer_object;
-   driver->DeleteBuffer = _mesa_delete_buffer_object;
-   driver->BindBuffer = NULL;
-   driver->BufferData = _mesa_buffer_data;
-   driver->BufferSubData = _mesa_buffer_subdata;
-   driver->GetBufferSubData = _mesa_buffer_get_subdata;
-   driver->MapBuffer = _mesa_buffer_map;
-   driver->UnmapBuffer = _mesa_buffer_unmap;
-#endif
-
-#if FEATURE_ARB_map_buffer_range
-   driver->MapBufferRange = _mesa_buffer_map_range;
-   driver->FlushMappedBufferRange = _mesa_buffer_flush_mapped_range;
-#endif
+   _mesa_init_buffer_object_functions(driver);
 
 #if FEATURE_EXT_framebuffer_object
    driver->NewFramebuffer = _mesa_new_framebuffer;
@@ -243,9 +229,6 @@ _mesa_init_driver_functions(struct dd_function_table *driver)
    driver->DeleteArrayObject = _mesa_delete_array_object;
    driver->BindArrayObject = NULL;
 
-   /* GL_ARB_copy_buffer */
-   driver->CopyBufferSubData = _mesa_copy_buffer_subdata;
-
    /* T&L stuff */
    driver->NeedValidate = GL_FALSE;
    driver->ValidateTnlModule = NULL;
diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index ba19e58cdb..d640f5358e 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -180,7 +180,7 @@ buffer_object_subdata_range_good( GLcontext * ctx, GLenum target,
  * 
  * Default callback for the \c dd_function_table::NewBufferObject() hook.
  */
-struct gl_buffer_object *
+static struct gl_buffer_object *
 _mesa_new_buffer_object( GLcontext *ctx, GLuint name, GLenum target )
 {
    struct gl_buffer_object *obj;
@@ -198,7 +198,7 @@ _mesa_new_buffer_object( GLcontext *ctx, GLuint name, GLenum target )
  * 
  * Default callback for the \c dd_function_table::DeleteBuffer() hook.
  */
-void
+static void
 _mesa_delete_buffer_object( GLcontext *ctx, struct gl_buffer_object *bufObj )
 {
    (void) ctx;
@@ -316,7 +316,7 @@ _mesa_initialize_buffer_object( struct gl_buffer_object *obj,
  *
  * \sa glBufferDataARB, dd_function_table::BufferData.
  */
-void
+static void
 _mesa_buffer_data( GLcontext *ctx, GLenum target, GLsizeiptrARB size,
 		   const GLvoid * data, GLenum usage,
 		   struct gl_buffer_object * bufObj )
@@ -355,7 +355,7 @@ _mesa_buffer_data( GLcontext *ctx, GLenum target, GLsizeiptrARB size,
  *
  * \sa glBufferSubDataARB, dd_function_table::BufferSubData.
  */
-void
+static void
 _mesa_buffer_subdata( GLcontext *ctx, GLenum target, GLintptrARB offset,
 		      GLsizeiptrARB size, const GLvoid * data,
 		      struct gl_buffer_object * bufObj )
@@ -388,7 +388,7 @@ _mesa_buffer_subdata( GLcontext *ctx, GLenum target, GLintptrARB offset,
  *
  * \sa glBufferGetSubDataARB, dd_function_table::GetBufferSubData.
  */
-void
+static void
 _mesa_buffer_get_subdata( GLcontext *ctx, GLenum target, GLintptrARB offset,
 			  GLsizeiptrARB size, GLvoid * data,
 			  struct gl_buffer_object * bufObj )
@@ -415,7 +415,7 @@ _mesa_buffer_get_subdata( GLcontext *ctx, GLenum target, GLintptrARB offset,
  *
  * \sa glMapBufferARB, dd_function_table::MapBuffer
  */
-void *
+static void *
 _mesa_buffer_map( GLcontext *ctx, GLenum target, GLenum access,
 		  struct gl_buffer_object *bufObj )
 {
@@ -436,7 +436,7 @@ _mesa_buffer_map( GLcontext *ctx, GLenum target, GLenum access,
  * Default fallback for \c dd_function_table::MapBufferRange().
  * Called via glMapBufferRange().
  */
-void *
+static void *
 _mesa_buffer_map_range( GLcontext *ctx, GLenum target, GLintptr offset,
                         GLsizeiptr length, GLbitfield access,
                         struct gl_buffer_object *bufObj )
@@ -455,7 +455,7 @@ _mesa_buffer_map_range( GLcontext *ctx, GLenum target, GLintptr offset,
  * Default fallback for \c dd_function_table::FlushMappedBufferRange().
  * Called via glFlushMappedBufferRange().
  */
-void
+static void
 _mesa_buffer_flush_mapped_range( GLcontext *ctx, GLenum target, 
                                  GLintptr offset, GLsizeiptr length,
                                  struct gl_buffer_object *obj )
@@ -476,7 +476,7 @@ _mesa_buffer_flush_mapped_range( GLcontext *ctx, GLenum target,
  *
  * \sa glUnmapBufferARB, dd_function_table::UnmapBuffer
  */
-GLboolean
+static GLboolean
 _mesa_buffer_unmap( GLcontext *ctx, GLenum target,
                     struct gl_buffer_object *bufObj )
 {
@@ -492,7 +492,7 @@ _mesa_buffer_unmap( GLcontext *ctx, GLenum target,
  * Default fallback for \c dd_function_table::CopyBufferSubData().
  * Called via glCopyBuffserSubData().
  */
-void
+static void
 _mesa_copy_buffer_subdata(GLcontext *ctx,
                           struct gl_buffer_object *src,
                           struct gl_buffer_object *dst,
@@ -863,6 +863,32 @@ unbind(GLcontext *ctx,
 }
 
 
+/**
+ * Plug default/fallback buffer object functions into the device
+ * driver hooks.
+ */
+void
+_mesa_init_buffer_object_functions(struct dd_function_table *driver)
+{
+   /* GL_ARB_vertex/pixel_buffer_object */
+   driver->NewBufferObject = _mesa_new_buffer_object;
+   driver->DeleteBuffer = _mesa_delete_buffer_object;
+   driver->BindBuffer = NULL;
+   driver->BufferData = _mesa_buffer_data;
+   driver->BufferSubData = _mesa_buffer_subdata;
+   driver->GetBufferSubData = _mesa_buffer_get_subdata;
+   driver->MapBuffer = _mesa_buffer_map;
+   driver->UnmapBuffer = _mesa_buffer_unmap;
+
+   /* GL_ARB_map_buffer_range */
+   driver->MapBufferRange = _mesa_buffer_map_range;
+   driver->FlushMappedBufferRange = _mesa_buffer_flush_mapped_range;
+
+   /* GL_ARB_copy_buffer */
+   driver->CopyBufferSubData = _mesa_copy_buffer_subdata;
+}
+
+
 
 /**********************************************************************/
 /* API Functions                                                      */
diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h
index a8e2dcef93..ef59ff83c8 100644
--- a/src/mesa/main/bufferobj.h
+++ b/src/mesa/main/bufferobj.h
@@ -42,11 +42,6 @@ _mesa_init_buffer_objects( GLcontext *ctx );
 extern void
 _mesa_update_default_objects_buffer_objects(GLcontext *ctx);
 
-extern struct gl_buffer_object *
-_mesa_new_buffer_object( GLcontext *ctx, GLuint name, GLenum target );
-
-extern void
-_mesa_delete_buffer_object( GLcontext *ctx, struct gl_buffer_object *bufObj );
 
 extern struct gl_buffer_object *
 _mesa_lookup_bufferobj(GLcontext *ctx, GLuint buffer);
@@ -60,46 +55,6 @@ _mesa_reference_buffer_object(GLcontext *ctx,
                               struct gl_buffer_object **ptr,
                               struct gl_buffer_object *bufObj);
 
-extern void
-_mesa_buffer_data( GLcontext *ctx, GLenum target, GLsizeiptrARB size,
-		   const GLvoid * data, GLenum usage,
-		   struct gl_buffer_object * bufObj );
-
-extern void
-_mesa_buffer_subdata( GLcontext *ctx, GLenum target, GLintptrARB offset,
-		      GLsizeiptrARB size, const GLvoid * data,
-		      struct gl_buffer_object * bufObj );
-
-extern void
-_mesa_buffer_get_subdata( GLcontext *ctx, GLenum target, GLintptrARB offset,
-			  GLsizeiptrARB size, GLvoid * data,
-			  struct gl_buffer_object * bufObj );
-
-extern void *
-_mesa_buffer_map( GLcontext *ctx, GLenum target, GLenum access,
-		  struct gl_buffer_object * bufObj );
-
-extern void *
-_mesa_buffer_map_range( GLcontext *ctx, GLenum target, GLintptr offset,
-                        GLsizeiptr length, GLbitfield access,
-                        struct gl_buffer_object *bufObj );
-
-extern void
-_mesa_buffer_flush_mapped_range( GLcontext *ctx, GLenum target, 
-                                 GLintptr offset, GLsizeiptr length,
-                                 struct gl_buffer_object *obj );
-
-extern GLboolean
-_mesa_buffer_unmap( GLcontext *ctx, GLenum target,
-                    struct gl_buffer_object * bufObj );
-
-extern void
-_mesa_copy_buffer_subdata(GLcontext *ctx,
-                          struct gl_buffer_object *src,
-                          struct gl_buffer_object *dst,
-                          GLintptr readOffset, GLintptr writeOffset,
-                          GLsizeiptr size);
-
 extern GLboolean
 _mesa_validate_pbo_access(GLuint dimensions,
                           const struct gl_pixelstore_attrib *pack,
@@ -134,6 +89,9 @@ _mesa_unmap_readpix_pbo(GLcontext *ctx,
                         const struct gl_pixelstore_attrib *pack);
 
 
+extern void
+_mesa_init_buffer_object_functions(struct dd_function_table *driver);
+
 
 /*
  * API functions
-- 
cgit v1.2.3


From a8da1feb231115205f3a19b0bb0a9317157ba167 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 19 Jun 2009 10:05:08 -0600
Subject: mesa: make query-related driver fallback functions static

Plug them in via _mesa_init_query_object_functions().
---
 src/mesa/drivers/common/driverfuncs.c | 12 ++++--------
 src/mesa/main/queryobj.c              | 24 ++++++++++++++++++------
 src/mesa/main/queryobj.h              | 17 +----------------
 3 files changed, 23 insertions(+), 30 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c
index 6c6b19538b..3b397fef7d 100644
--- a/src/mesa/drivers/common/driverfuncs.c
+++ b/src/mesa/drivers/common/driverfuncs.c
@@ -202,8 +202,12 @@ _mesa_init_driver_functions(struct dd_function_table *driver)
    driver->GetIntegerv = NULL;
    driver->GetPointerv = NULL;
    
+   /* buffer objects */
    _mesa_init_buffer_object_functions(driver);
 
+   /* query objects */
+   _mesa_init_query_object_functions(driver);
+
 #if FEATURE_EXT_framebuffer_object
    driver->NewFramebuffer = _mesa_new_framebuffer;
    driver->NewRenderbuffer = _mesa_new_soft_renderbuffer;
@@ -216,14 +220,6 @@ _mesa_init_driver_functions(struct dd_function_table *driver)
    driver->BlitFramebuffer = _swrast_BlitFramebuffer;
 #endif
 
-   /* query objects */
-   driver->NewQueryObject = _mesa_new_query_object;
-   driver->DeleteQuery = _mesa_delete_query;
-   driver->BeginQuery = _mesa_begin_query;
-   driver->EndQuery = _mesa_end_query;
-   driver->WaitQuery = _mesa_wait_query;
-   driver->CheckQuery = _mesa_check_query;
-
    /* APPLE_vertex_array_object */
    driver->NewArrayObject = _mesa_new_array_object;
    driver->DeleteArrayObject = _mesa_delete_array_object;
diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c
index c25b31af02..a73c6e0508 100644
--- a/src/mesa/main/queryobj.c
+++ b/src/mesa/main/queryobj.c
@@ -38,7 +38,7 @@
  * \param id - the new object's ID
  * \return pointer to new query_object object or NULL if out of memory.
  */
-struct gl_query_object *
+static struct gl_query_object *
 _mesa_new_query_object(GLcontext *ctx, GLuint id)
 {
    struct gl_query_object *q = MALLOC_STRUCT(gl_query_object);
@@ -57,7 +57,7 @@ _mesa_new_query_object(GLcontext *ctx, GLuint id)
  * Begin a query.  Software driver fallback.
  * Called via ctx->Driver.BeginQuery().
  */
-void
+static void
 _mesa_begin_query(GLcontext *ctx, struct gl_query_object *q)
 {
    /* no-op */
@@ -68,7 +68,7 @@ _mesa_begin_query(GLcontext *ctx, struct gl_query_object *q)
  * End a query.  Software driver fallback.
  * Called via ctx->Driver.EndQuery().
  */
-void
+static void
 _mesa_end_query(GLcontext *ctx, struct gl_query_object *q)
 {
    q->Ready = GL_TRUE;
@@ -79,7 +79,7 @@ _mesa_end_query(GLcontext *ctx, struct gl_query_object *q)
  * Wait for query to complete.  Software driver fallback.
  * Called via ctx->Driver.WaitQuery().
  */
-void
+static void
 _mesa_wait_query(GLcontext *ctx, struct gl_query_object *q)
 {
    /* For software drivers, _mesa_end_query() should have completed the query.
@@ -94,7 +94,7 @@ _mesa_wait_query(GLcontext *ctx, struct gl_query_object *q)
  * Check if a query results are ready.  Software driver fallback.
  * Called via ctx->Driver.CheckQuery().
  */
-void
+static void
 _mesa_check_query(GLcontext *ctx, struct gl_query_object *q)
 {
    /* No-op for sw rendering.
@@ -107,7 +107,7 @@ _mesa_check_query(GLcontext *ctx, struct gl_query_object *q)
  * Delete a query object.  Called via ctx->Driver.DeleteQuery().
  * Not removed from hash table here.
  */
-void
+static void
 _mesa_delete_query(GLcontext *ctx, struct gl_query_object *q)
 {
    _mesa_free(q);
@@ -123,6 +123,18 @@ lookup_query_object(GLcontext *ctx, GLuint id)
 
 
 
+void
+_mesa_init_query_object_functions(struct dd_function_table *driver)
+{
+   driver->NewQueryObject = _mesa_new_query_object;
+   driver->DeleteQuery = _mesa_delete_query;
+   driver->BeginQuery = _mesa_begin_query;
+   driver->EndQuery = _mesa_end_query;
+   driver->WaitQuery = _mesa_wait_query;
+   driver->CheckQuery = _mesa_check_query;
+}
+
+
 void GLAPIENTRY
 _mesa_GenQueriesARB(GLsizei n, GLuint *ids)
 {
diff --git a/src/mesa/main/queryobj.h b/src/mesa/main/queryobj.h
index bc02b65b54..ee775ef959 100644
--- a/src/mesa/main/queryobj.h
+++ b/src/mesa/main/queryobj.h
@@ -27,9 +27,6 @@
 #define OCCLUDE_H
 
 
-extern struct gl_query_object *
-_mesa_new_query_object(GLcontext *ctx, GLuint id);
-
 extern void
 _mesa_init_query(GLcontext *ctx);
 
@@ -37,19 +34,7 @@ extern void
 _mesa_free_query_data(GLcontext *ctx);
 
 extern void
-_mesa_delete_query(GLcontext *ctx, struct gl_query_object *q);
-
-extern void
-_mesa_begin_query(GLcontext *ctx, struct gl_query_object *q);
-
-extern void
-_mesa_end_query(GLcontext *ctx, struct gl_query_object *q);
-
-extern void
-_mesa_wait_query(GLcontext *ctx, struct gl_query_object *q);
-
-extern void
-_mesa_check_query(GLcontext *ctx, struct gl_query_object *q);
+_mesa_init_query_object_functions(struct dd_function_table *driver);
 
 
 extern void GLAPIENTRY
-- 
cgit v1.2.3


From bda551898a09e4a07491dcf394bb2981dced0012 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 19 Jun 2009 18:11:29 -0600
Subject: mesa: regenerated files related to GL_ARB_vertex_array_object

---
 src/mesa/drivers/dri/common/extension_helper.h |   64 +-
 src/mesa/glapi/dispatch.h                      |  446 ++---
 src/mesa/glapi/glapioffsets.h                  |  436 ++---
 src/mesa/glapi/glapitable.h                    |  432 ++---
 src/mesa/glapi/glapitemp.h                     |  196 ++-
 src/mesa/glapi/glprocs.h                       | 1126 ++++++-------
 src/mesa/main/enums.c                          |  244 +--
 src/mesa/sparc/glapi_sparc.S                   |   96 +-
 src/mesa/x86-64/glapi_x86-64.S                 | 2122 ++++++++++++------------
 src/mesa/x86/glapi_x86.S                       |  118 +-
 10 files changed, 2716 insertions(+), 2564 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/common/extension_helper.h b/src/mesa/drivers/dri/common/extension_helper.h
index 8df0e6c44b..e308fd2831 100644
--- a/src/mesa/drivers/dri/common/extension_helper.h
+++ b/src/mesa/drivers/dri/common/extension_helper.h
@@ -406,9 +406,10 @@ static const char UniformMatrix4fvARB_names[] =
     "";
 #endif
 
-#if defined(need_GL_APPLE_vertex_array_object)
+#if defined(need_GL_ARB_vertex_array_object) || defined(need_GL_APPLE_vertex_array_object)
 static const char DeleteVertexArraysAPPLE_names[] = 
     "ip\0" /* Parameter signature */
+    "glDeleteVertexArrays\0"
     "glDeleteVertexArraysAPPLE\0"
     "";
 #endif
@@ -941,6 +942,13 @@ static const char WeightivARB_names[] =
     "";
 #endif
 
+#if defined(need_GL_SGIX_instruments)
+static const char PollInstrumentsSGIX_names[] = 
+    "p\0" /* Parameter signature */
+    "glPollInstrumentsSGIX\0"
+    "";
+#endif
+
 #if defined(need_GL_SUN_global_alpha)
 static const char GlobalAlphaFactordSUN_names[] = 
     "d\0" /* Parameter signature */
@@ -2114,6 +2122,13 @@ static const char Tangent3fvEXT_names[] =
     "";
 #endif
 
+#if defined(need_GL_ARB_vertex_array_object)
+static const char GenVertexArrays_names[] = 
+    "ip\0" /* Parameter signature */
+    "glGenVertexArrays\0"
+    "";
+#endif
+
 #if defined(need_GL_ARB_framebuffer_object) || defined(need_GL_EXT_framebuffer_object)
 static const char BindFramebufferEXT_names[] = 
     "ii\0" /* Parameter signature */
@@ -2340,10 +2355,10 @@ static const char GetCombinerStageParameterfvNV_names[] =
     "";
 #endif
 
-#if defined(need_GL_EXT_coordinate_frame)
-static const char Binormal3fEXT_names[] = 
-    "fff\0" /* Parameter signature */
-    "glBinormal3fEXT\0"
+#if defined(need_GL_ARB_vertex_array_object)
+static const char BindVertexArray_names[] = 
+    "i\0" /* Parameter signature */
+    "glBindVertexArray\0"
     "";
 #endif
 
@@ -3403,10 +3418,11 @@ static const char GetProgramParameterdvNV_names[] =
     "";
 #endif
 
-#if defined(need_GL_SGIX_instruments)
-static const char PollInstrumentsSGIX_names[] = 
-    "p\0" /* Parameter signature */
-    "glPollInstrumentsSGIX\0"
+#if defined(need_GL_ARB_vertex_array_object) || defined(need_GL_APPLE_vertex_array_object)
+static const char IsVertexArrayAPPLE_names[] = 
+    "i\0" /* Parameter signature */
+    "glIsVertexArray\0"
+    "glIsVertexArrayAPPLE\0"
     "";
 #endif
 
@@ -3940,6 +3956,13 @@ static const char VertexWeightfEXT_names[] =
     "";
 #endif
 
+#if defined(need_GL_EXT_coordinate_frame)
+static const char Binormal3fEXT_names[] = 
+    "fff\0" /* Parameter signature */
+    "glBinormal3fEXT\0"
+    "";
+#endif
+
 #if defined(need_GL_VERSION_1_4) || defined(need_GL_EXT_fog_coord)
 static const char FogCoordfvEXT_names[] = 
     "p\0" /* Parameter signature */
@@ -4055,13 +4078,6 @@ static const char BlendFuncSeparateEXT_names[] =
     "";
 #endif
 
-#if defined(need_GL_APPLE_vertex_array_object)
-static const char IsVertexArrayAPPLE_names[] = 
-    "i\0" /* Parameter signature */
-    "glIsVertexArrayAPPLE\0"
-    "";
-#endif
-
 #if defined(need_GL_ARB_map_buffer_range)
 static const char MapBufferRange_names[] = 
     "iiii\0" /* Parameter signature */
@@ -4961,8 +4977,8 @@ static const struct dri_extension_function GL_3DFX_tbuffer_functions[] = {
 static const struct dri_extension_function GL_APPLE_vertex_array_object_functions[] = {
     { DeleteVertexArraysAPPLE_names, DeleteVertexArraysAPPLE_remap_index, -1 },
     { GenVertexArraysAPPLE_names, GenVertexArraysAPPLE_remap_index, -1 },
-    { BindVertexArrayAPPLE_names, BindVertexArrayAPPLE_remap_index, -1 },
     { IsVertexArrayAPPLE_names, IsVertexArrayAPPLE_remap_index, -1 },
+    { BindVertexArrayAPPLE_names, BindVertexArrayAPPLE_remap_index, -1 },
     { NULL, 0, 0 }
 };
 #endif
@@ -5123,6 +5139,16 @@ static const struct dri_extension_function GL_ARB_transpose_matrix_functions[] =
 };
 #endif
 
+#if defined(need_GL_ARB_vertex_array_object)
+static const struct dri_extension_function GL_ARB_vertex_array_object_functions[] = {
+    { DeleteVertexArraysAPPLE_names, DeleteVertexArraysAPPLE_remap_index, -1 },
+    { GenVertexArrays_names, GenVertexArrays_remap_index, -1 },
+    { BindVertexArray_names, BindVertexArray_remap_index, -1 },
+    { IsVertexArrayAPPLE_names, IsVertexArrayAPPLE_remap_index, -1 },
+    { NULL, 0, 0 }
+};
+#endif
+
 #if defined(need_GL_ARB_vertex_blend)
 static const struct dri_extension_function GL_ARB_vertex_blend_functions[] = {
     { WeightubvARB_names, WeightubvARB_remap_index, -1 },
@@ -5376,7 +5402,6 @@ static const struct dri_extension_function GL_EXT_coordinate_frame_functions[] =
     { Binormal3ivEXT_names, Binormal3ivEXT_remap_index, -1 },
     { Tangent3sEXT_names, Tangent3sEXT_remap_index, -1 },
     { Tangent3fvEXT_names, Tangent3fvEXT_remap_index, -1 },
-    { Binormal3fEXT_names, Binormal3fEXT_remap_index, -1 },
     { Tangent3dvEXT_names, Tangent3dvEXT_remap_index, -1 },
     { Binormal3bvEXT_names, Binormal3bvEXT_remap_index, -1 },
     { Binormal3dEXT_names, Binormal3dEXT_remap_index, -1 },
@@ -5385,6 +5410,7 @@ static const struct dri_extension_function GL_EXT_coordinate_frame_functions[] =
     { Tangent3ivEXT_names, Tangent3ivEXT_remap_index, -1 },
     { Tangent3dEXT_names, Tangent3dEXT_remap_index, -1 },
     { Binormal3svEXT_names, Binormal3svEXT_remap_index, -1 },
+    { Binormal3fEXT_names, Binormal3fEXT_remap_index, -1 },
     { Binormal3dvEXT_names, Binormal3dvEXT_remap_index, -1 },
     { Tangent3iEXT_names, Tangent3iEXT_remap_index, -1 },
     { Tangent3bvEXT_names, Tangent3bvEXT_remap_index, -1 },
@@ -6074,11 +6100,11 @@ static const struct dri_extension_function GL_SGIX_igloo_interface_functions[] =
 #if defined(need_GL_SGIX_instruments)
 static const struct dri_extension_function GL_SGIX_instruments_functions[] = {
     { ReadInstrumentsSGIX_names, ReadInstrumentsSGIX_remap_index, -1 },
+    { PollInstrumentsSGIX_names, PollInstrumentsSGIX_remap_index, -1 },
     { GetInstrumentsSGIX_names, GetInstrumentsSGIX_remap_index, -1 },
     { StartInstrumentsSGIX_names, StartInstrumentsSGIX_remap_index, -1 },
     { StopInstrumentsSGIX_names, StopInstrumentsSGIX_remap_index, -1 },
     { InstrumentsBufferSGIX_names, InstrumentsBufferSGIX_remap_index, -1 },
-    { PollInstrumentsSGIX_names, PollInstrumentsSGIX_remap_index, -1 },
     { NULL, 0, 0 }
 };
 #endif
diff --git a/src/mesa/glapi/dispatch.h b/src/mesa/glapi/dispatch.h
index 874b23bc7a..b3f1aed1a4 100644
--- a/src/mesa/glapi/dispatch.h
+++ b/src/mesa/glapi/dispatch.h
@@ -1752,6 +1752,12 @@
 #define CALL_MapBufferRange(disp, parameters) (*((disp)->MapBufferRange)) parameters
 #define GET_MapBufferRange(disp) ((disp)->MapBufferRange)
 #define SET_MapBufferRange(disp, fn) ((disp)->MapBufferRange = fn)
+#define CALL_BindVertexArray(disp, parameters) (*((disp)->BindVertexArray)) parameters
+#define GET_BindVertexArray(disp) ((disp)->BindVertexArray)
+#define SET_BindVertexArray(disp, fn) ((disp)->BindVertexArray = fn)
+#define CALL_GenVertexArrays(disp, parameters) (*((disp)->GenVertexArrays)) parameters
+#define GET_GenVertexArrays(disp) ((disp)->GenVertexArrays)
+#define SET_GenVertexArrays(disp, fn) ((disp)->GenVertexArrays = fn)
 #define CALL_CopyBufferSubData(disp, parameters) (*((disp)->CopyBufferSubData)) parameters
 #define GET_CopyBufferSubData(disp) ((disp)->CopyBufferSubData)
 #define SET_CopyBufferSubData(disp, fn) ((disp)->CopyBufferSubData = fn)
@@ -2400,7 +2406,7 @@
 
 #else
 
-#define driDispatchRemapTable_size 371
+#define driDispatchRemapTable_size 373
 extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 
 #define AttachShader_remap_index 0
@@ -2559,221 +2565,223 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define RenderbufferStorageMultisample_remap_index 153
 #define FlushMappedBufferRange_remap_index 154
 #define MapBufferRange_remap_index 155
-#define CopyBufferSubData_remap_index 156
-#define PolygonOffsetEXT_remap_index 157
-#define GetPixelTexGenParameterfvSGIS_remap_index 158
-#define GetPixelTexGenParameterivSGIS_remap_index 159
-#define PixelTexGenParameterfSGIS_remap_index 160
-#define PixelTexGenParameterfvSGIS_remap_index 161
-#define PixelTexGenParameteriSGIS_remap_index 162
-#define PixelTexGenParameterivSGIS_remap_index 163
-#define SampleMaskSGIS_remap_index 164
-#define SamplePatternSGIS_remap_index 165
-#define ColorPointerEXT_remap_index 166
-#define EdgeFlagPointerEXT_remap_index 167
-#define IndexPointerEXT_remap_index 168
-#define NormalPointerEXT_remap_index 169
-#define TexCoordPointerEXT_remap_index 170
-#define VertexPointerEXT_remap_index 171
-#define PointParameterfEXT_remap_index 172
-#define PointParameterfvEXT_remap_index 173
-#define LockArraysEXT_remap_index 174
-#define UnlockArraysEXT_remap_index 175
-#define CullParameterdvEXT_remap_index 176
-#define CullParameterfvEXT_remap_index 177
-#define SecondaryColor3bEXT_remap_index 178
-#define SecondaryColor3bvEXT_remap_index 179
-#define SecondaryColor3dEXT_remap_index 180
-#define SecondaryColor3dvEXT_remap_index 181
-#define SecondaryColor3fEXT_remap_index 182
-#define SecondaryColor3fvEXT_remap_index 183
-#define SecondaryColor3iEXT_remap_index 184
-#define SecondaryColor3ivEXT_remap_index 185
-#define SecondaryColor3sEXT_remap_index 186
-#define SecondaryColor3svEXT_remap_index 187
-#define SecondaryColor3ubEXT_remap_index 188
-#define SecondaryColor3ubvEXT_remap_index 189
-#define SecondaryColor3uiEXT_remap_index 190
-#define SecondaryColor3uivEXT_remap_index 191
-#define SecondaryColor3usEXT_remap_index 192
-#define SecondaryColor3usvEXT_remap_index 193
-#define SecondaryColorPointerEXT_remap_index 194
-#define MultiDrawArraysEXT_remap_index 195
-#define MultiDrawElementsEXT_remap_index 196
-#define FogCoordPointerEXT_remap_index 197
-#define FogCoorddEXT_remap_index 198
-#define FogCoorddvEXT_remap_index 199
-#define FogCoordfEXT_remap_index 200
-#define FogCoordfvEXT_remap_index 201
-#define PixelTexGenSGIX_remap_index 202
-#define BlendFuncSeparateEXT_remap_index 203
-#define FlushVertexArrayRangeNV_remap_index 204
-#define VertexArrayRangeNV_remap_index 205
-#define CombinerInputNV_remap_index 206
-#define CombinerOutputNV_remap_index 207
-#define CombinerParameterfNV_remap_index 208
-#define CombinerParameterfvNV_remap_index 209
-#define CombinerParameteriNV_remap_index 210
-#define CombinerParameterivNV_remap_index 211
-#define FinalCombinerInputNV_remap_index 212
-#define GetCombinerInputParameterfvNV_remap_index 213
-#define GetCombinerInputParameterivNV_remap_index 214
-#define GetCombinerOutputParameterfvNV_remap_index 215
-#define GetCombinerOutputParameterivNV_remap_index 216
-#define GetFinalCombinerInputParameterfvNV_remap_index 217
-#define GetFinalCombinerInputParameterivNV_remap_index 218
-#define ResizeBuffersMESA_remap_index 219
-#define WindowPos2dMESA_remap_index 220
-#define WindowPos2dvMESA_remap_index 221
-#define WindowPos2fMESA_remap_index 222
-#define WindowPos2fvMESA_remap_index 223
-#define WindowPos2iMESA_remap_index 224
-#define WindowPos2ivMESA_remap_index 225
-#define WindowPos2sMESA_remap_index 226
-#define WindowPos2svMESA_remap_index 227
-#define WindowPos3dMESA_remap_index 228
-#define WindowPos3dvMESA_remap_index 229
-#define WindowPos3fMESA_remap_index 230
-#define WindowPos3fvMESA_remap_index 231
-#define WindowPos3iMESA_remap_index 232
-#define WindowPos3ivMESA_remap_index 233
-#define WindowPos3sMESA_remap_index 234
-#define WindowPos3svMESA_remap_index 235
-#define WindowPos4dMESA_remap_index 236
-#define WindowPos4dvMESA_remap_index 237
-#define WindowPos4fMESA_remap_index 238
-#define WindowPos4fvMESA_remap_index 239
-#define WindowPos4iMESA_remap_index 240
-#define WindowPos4ivMESA_remap_index 241
-#define WindowPos4sMESA_remap_index 242
-#define WindowPos4svMESA_remap_index 243
-#define MultiModeDrawArraysIBM_remap_index 244
-#define MultiModeDrawElementsIBM_remap_index 245
-#define DeleteFencesNV_remap_index 246
-#define FinishFenceNV_remap_index 247
-#define GenFencesNV_remap_index 248
-#define GetFenceivNV_remap_index 249
-#define IsFenceNV_remap_index 250
-#define SetFenceNV_remap_index 251
-#define TestFenceNV_remap_index 252
-#define AreProgramsResidentNV_remap_index 253
-#define BindProgramNV_remap_index 254
-#define DeleteProgramsNV_remap_index 255
-#define ExecuteProgramNV_remap_index 256
-#define GenProgramsNV_remap_index 257
-#define GetProgramParameterdvNV_remap_index 258
-#define GetProgramParameterfvNV_remap_index 259
-#define GetProgramStringNV_remap_index 260
-#define GetProgramivNV_remap_index 261
-#define GetTrackMatrixivNV_remap_index 262
-#define GetVertexAttribPointervNV_remap_index 263
-#define GetVertexAttribdvNV_remap_index 264
-#define GetVertexAttribfvNV_remap_index 265
-#define GetVertexAttribivNV_remap_index 266
-#define IsProgramNV_remap_index 267
-#define LoadProgramNV_remap_index 268
-#define ProgramParameters4dvNV_remap_index 269
-#define ProgramParameters4fvNV_remap_index 270
-#define RequestResidentProgramsNV_remap_index 271
-#define TrackMatrixNV_remap_index 272
-#define VertexAttrib1dNV_remap_index 273
-#define VertexAttrib1dvNV_remap_index 274
-#define VertexAttrib1fNV_remap_index 275
-#define VertexAttrib1fvNV_remap_index 276
-#define VertexAttrib1sNV_remap_index 277
-#define VertexAttrib1svNV_remap_index 278
-#define VertexAttrib2dNV_remap_index 279
-#define VertexAttrib2dvNV_remap_index 280
-#define VertexAttrib2fNV_remap_index 281
-#define VertexAttrib2fvNV_remap_index 282
-#define VertexAttrib2sNV_remap_index 283
-#define VertexAttrib2svNV_remap_index 284
-#define VertexAttrib3dNV_remap_index 285
-#define VertexAttrib3dvNV_remap_index 286
-#define VertexAttrib3fNV_remap_index 287
-#define VertexAttrib3fvNV_remap_index 288
-#define VertexAttrib3sNV_remap_index 289
-#define VertexAttrib3svNV_remap_index 290
-#define VertexAttrib4dNV_remap_index 291
-#define VertexAttrib4dvNV_remap_index 292
-#define VertexAttrib4fNV_remap_index 293
-#define VertexAttrib4fvNV_remap_index 294
-#define VertexAttrib4sNV_remap_index 295
-#define VertexAttrib4svNV_remap_index 296
-#define VertexAttrib4ubNV_remap_index 297
-#define VertexAttrib4ubvNV_remap_index 298
-#define VertexAttribPointerNV_remap_index 299
-#define VertexAttribs1dvNV_remap_index 300
-#define VertexAttribs1fvNV_remap_index 301
-#define VertexAttribs1svNV_remap_index 302
-#define VertexAttribs2dvNV_remap_index 303
-#define VertexAttribs2fvNV_remap_index 304
-#define VertexAttribs2svNV_remap_index 305
-#define VertexAttribs3dvNV_remap_index 306
-#define VertexAttribs3fvNV_remap_index 307
-#define VertexAttribs3svNV_remap_index 308
-#define VertexAttribs4dvNV_remap_index 309
-#define VertexAttribs4fvNV_remap_index 310
-#define VertexAttribs4svNV_remap_index 311
-#define VertexAttribs4ubvNV_remap_index 312
-#define GetTexBumpParameterfvATI_remap_index 313
-#define GetTexBumpParameterivATI_remap_index 314
-#define TexBumpParameterfvATI_remap_index 315
-#define TexBumpParameterivATI_remap_index 316
-#define AlphaFragmentOp1ATI_remap_index 317
-#define AlphaFragmentOp2ATI_remap_index 318
-#define AlphaFragmentOp3ATI_remap_index 319
-#define BeginFragmentShaderATI_remap_index 320
-#define BindFragmentShaderATI_remap_index 321
-#define ColorFragmentOp1ATI_remap_index 322
-#define ColorFragmentOp2ATI_remap_index 323
-#define ColorFragmentOp3ATI_remap_index 324
-#define DeleteFragmentShaderATI_remap_index 325
-#define EndFragmentShaderATI_remap_index 326
-#define GenFragmentShadersATI_remap_index 327
-#define PassTexCoordATI_remap_index 328
-#define SampleMapATI_remap_index 329
-#define SetFragmentShaderConstantATI_remap_index 330
-#define PointParameteriNV_remap_index 331
-#define PointParameterivNV_remap_index 332
-#define ActiveStencilFaceEXT_remap_index 333
-#define BindVertexArrayAPPLE_remap_index 334
-#define DeleteVertexArraysAPPLE_remap_index 335
-#define GenVertexArraysAPPLE_remap_index 336
-#define IsVertexArrayAPPLE_remap_index 337
-#define GetProgramNamedParameterdvNV_remap_index 338
-#define GetProgramNamedParameterfvNV_remap_index 339
-#define ProgramNamedParameter4dNV_remap_index 340
-#define ProgramNamedParameter4dvNV_remap_index 341
-#define ProgramNamedParameter4fNV_remap_index 342
-#define ProgramNamedParameter4fvNV_remap_index 343
-#define DepthBoundsEXT_remap_index 344
-#define BlendEquationSeparateEXT_remap_index 345
-#define BindFramebufferEXT_remap_index 346
-#define BindRenderbufferEXT_remap_index 347
-#define CheckFramebufferStatusEXT_remap_index 348
-#define DeleteFramebuffersEXT_remap_index 349
-#define DeleteRenderbuffersEXT_remap_index 350
-#define FramebufferRenderbufferEXT_remap_index 351
-#define FramebufferTexture1DEXT_remap_index 352
-#define FramebufferTexture2DEXT_remap_index 353
-#define FramebufferTexture3DEXT_remap_index 354
-#define GenFramebuffersEXT_remap_index 355
-#define GenRenderbuffersEXT_remap_index 356
-#define GenerateMipmapEXT_remap_index 357
-#define GetFramebufferAttachmentParameterivEXT_remap_index 358
-#define GetRenderbufferParameterivEXT_remap_index 359
-#define IsFramebufferEXT_remap_index 360
-#define IsRenderbufferEXT_remap_index 361
-#define RenderbufferStorageEXT_remap_index 362
-#define BlitFramebufferEXT_remap_index 363
-#define FramebufferTextureLayerEXT_remap_index 364
-#define ProvokingVertexEXT_remap_index 365
-#define StencilFuncSeparateATI_remap_index 366
-#define ProgramEnvParameters4fvEXT_remap_index 367
-#define ProgramLocalParameters4fvEXT_remap_index 368
-#define GetQueryObjecti64vEXT_remap_index 369
-#define GetQueryObjectui64vEXT_remap_index 370
+#define BindVertexArray_remap_index 156
+#define GenVertexArrays_remap_index 157
+#define CopyBufferSubData_remap_index 158
+#define PolygonOffsetEXT_remap_index 159
+#define GetPixelTexGenParameterfvSGIS_remap_index 160
+#define GetPixelTexGenParameterivSGIS_remap_index 161
+#define PixelTexGenParameterfSGIS_remap_index 162
+#define PixelTexGenParameterfvSGIS_remap_index 163
+#define PixelTexGenParameteriSGIS_remap_index 164
+#define PixelTexGenParameterivSGIS_remap_index 165
+#define SampleMaskSGIS_remap_index 166
+#define SamplePatternSGIS_remap_index 167
+#define ColorPointerEXT_remap_index 168
+#define EdgeFlagPointerEXT_remap_index 169
+#define IndexPointerEXT_remap_index 170
+#define NormalPointerEXT_remap_index 171
+#define TexCoordPointerEXT_remap_index 172
+#define VertexPointerEXT_remap_index 173
+#define PointParameterfEXT_remap_index 174
+#define PointParameterfvEXT_remap_index 175
+#define LockArraysEXT_remap_index 176
+#define UnlockArraysEXT_remap_index 177
+#define CullParameterdvEXT_remap_index 178
+#define CullParameterfvEXT_remap_index 179
+#define SecondaryColor3bEXT_remap_index 180
+#define SecondaryColor3bvEXT_remap_index 181
+#define SecondaryColor3dEXT_remap_index 182
+#define SecondaryColor3dvEXT_remap_index 183
+#define SecondaryColor3fEXT_remap_index 184
+#define SecondaryColor3fvEXT_remap_index 185
+#define SecondaryColor3iEXT_remap_index 186
+#define SecondaryColor3ivEXT_remap_index 187
+#define SecondaryColor3sEXT_remap_index 188
+#define SecondaryColor3svEXT_remap_index 189
+#define SecondaryColor3ubEXT_remap_index 190
+#define SecondaryColor3ubvEXT_remap_index 191
+#define SecondaryColor3uiEXT_remap_index 192
+#define SecondaryColor3uivEXT_remap_index 193
+#define SecondaryColor3usEXT_remap_index 194
+#define SecondaryColor3usvEXT_remap_index 195
+#define SecondaryColorPointerEXT_remap_index 196
+#define MultiDrawArraysEXT_remap_index 197
+#define MultiDrawElementsEXT_remap_index 198
+#define FogCoordPointerEXT_remap_index 199
+#define FogCoorddEXT_remap_index 200
+#define FogCoorddvEXT_remap_index 201
+#define FogCoordfEXT_remap_index 202
+#define FogCoordfvEXT_remap_index 203
+#define PixelTexGenSGIX_remap_index 204
+#define BlendFuncSeparateEXT_remap_index 205
+#define FlushVertexArrayRangeNV_remap_index 206
+#define VertexArrayRangeNV_remap_index 207
+#define CombinerInputNV_remap_index 208
+#define CombinerOutputNV_remap_index 209
+#define CombinerParameterfNV_remap_index 210
+#define CombinerParameterfvNV_remap_index 211
+#define CombinerParameteriNV_remap_index 212
+#define CombinerParameterivNV_remap_index 213
+#define FinalCombinerInputNV_remap_index 214
+#define GetCombinerInputParameterfvNV_remap_index 215
+#define GetCombinerInputParameterivNV_remap_index 216
+#define GetCombinerOutputParameterfvNV_remap_index 217
+#define GetCombinerOutputParameterivNV_remap_index 218
+#define GetFinalCombinerInputParameterfvNV_remap_index 219
+#define GetFinalCombinerInputParameterivNV_remap_index 220
+#define ResizeBuffersMESA_remap_index 221
+#define WindowPos2dMESA_remap_index 222
+#define WindowPos2dvMESA_remap_index 223
+#define WindowPos2fMESA_remap_index 224
+#define WindowPos2fvMESA_remap_index 225
+#define WindowPos2iMESA_remap_index 226
+#define WindowPos2ivMESA_remap_index 227
+#define WindowPos2sMESA_remap_index 228
+#define WindowPos2svMESA_remap_index 229
+#define WindowPos3dMESA_remap_index 230
+#define WindowPos3dvMESA_remap_index 231
+#define WindowPos3fMESA_remap_index 232
+#define WindowPos3fvMESA_remap_index 233
+#define WindowPos3iMESA_remap_index 234
+#define WindowPos3ivMESA_remap_index 235
+#define WindowPos3sMESA_remap_index 236
+#define WindowPos3svMESA_remap_index 237
+#define WindowPos4dMESA_remap_index 238
+#define WindowPos4dvMESA_remap_index 239
+#define WindowPos4fMESA_remap_index 240
+#define WindowPos4fvMESA_remap_index 241
+#define WindowPos4iMESA_remap_index 242
+#define WindowPos4ivMESA_remap_index 243
+#define WindowPos4sMESA_remap_index 244
+#define WindowPos4svMESA_remap_index 245
+#define MultiModeDrawArraysIBM_remap_index 246
+#define MultiModeDrawElementsIBM_remap_index 247
+#define DeleteFencesNV_remap_index 248
+#define FinishFenceNV_remap_index 249
+#define GenFencesNV_remap_index 250
+#define GetFenceivNV_remap_index 251
+#define IsFenceNV_remap_index 252
+#define SetFenceNV_remap_index 253
+#define TestFenceNV_remap_index 254
+#define AreProgramsResidentNV_remap_index 255
+#define BindProgramNV_remap_index 256
+#define DeleteProgramsNV_remap_index 257
+#define ExecuteProgramNV_remap_index 258
+#define GenProgramsNV_remap_index 259
+#define GetProgramParameterdvNV_remap_index 260
+#define GetProgramParameterfvNV_remap_index 261
+#define GetProgramStringNV_remap_index 262
+#define GetProgramivNV_remap_index 263
+#define GetTrackMatrixivNV_remap_index 264
+#define GetVertexAttribPointervNV_remap_index 265
+#define GetVertexAttribdvNV_remap_index 266
+#define GetVertexAttribfvNV_remap_index 267
+#define GetVertexAttribivNV_remap_index 268
+#define IsProgramNV_remap_index 269
+#define LoadProgramNV_remap_index 270
+#define ProgramParameters4dvNV_remap_index 271
+#define ProgramParameters4fvNV_remap_index 272
+#define RequestResidentProgramsNV_remap_index 273
+#define TrackMatrixNV_remap_index 274
+#define VertexAttrib1dNV_remap_index 275
+#define VertexAttrib1dvNV_remap_index 276
+#define VertexAttrib1fNV_remap_index 277
+#define VertexAttrib1fvNV_remap_index 278
+#define VertexAttrib1sNV_remap_index 279
+#define VertexAttrib1svNV_remap_index 280
+#define VertexAttrib2dNV_remap_index 281
+#define VertexAttrib2dvNV_remap_index 282
+#define VertexAttrib2fNV_remap_index 283
+#define VertexAttrib2fvNV_remap_index 284
+#define VertexAttrib2sNV_remap_index 285
+#define VertexAttrib2svNV_remap_index 286
+#define VertexAttrib3dNV_remap_index 287
+#define VertexAttrib3dvNV_remap_index 288
+#define VertexAttrib3fNV_remap_index 289
+#define VertexAttrib3fvNV_remap_index 290
+#define VertexAttrib3sNV_remap_index 291
+#define VertexAttrib3svNV_remap_index 292
+#define VertexAttrib4dNV_remap_index 293
+#define VertexAttrib4dvNV_remap_index 294
+#define VertexAttrib4fNV_remap_index 295
+#define VertexAttrib4fvNV_remap_index 296
+#define VertexAttrib4sNV_remap_index 297
+#define VertexAttrib4svNV_remap_index 298
+#define VertexAttrib4ubNV_remap_index 299
+#define VertexAttrib4ubvNV_remap_index 300
+#define VertexAttribPointerNV_remap_index 301
+#define VertexAttribs1dvNV_remap_index 302
+#define VertexAttribs1fvNV_remap_index 303
+#define VertexAttribs1svNV_remap_index 304
+#define VertexAttribs2dvNV_remap_index 305
+#define VertexAttribs2fvNV_remap_index 306
+#define VertexAttribs2svNV_remap_index 307
+#define VertexAttribs3dvNV_remap_index 308
+#define VertexAttribs3fvNV_remap_index 309
+#define VertexAttribs3svNV_remap_index 310
+#define VertexAttribs4dvNV_remap_index 311
+#define VertexAttribs4fvNV_remap_index 312
+#define VertexAttribs4svNV_remap_index 313
+#define VertexAttribs4ubvNV_remap_index 314
+#define GetTexBumpParameterfvATI_remap_index 315
+#define GetTexBumpParameterivATI_remap_index 316
+#define TexBumpParameterfvATI_remap_index 317
+#define TexBumpParameterivATI_remap_index 318
+#define AlphaFragmentOp1ATI_remap_index 319
+#define AlphaFragmentOp2ATI_remap_index 320
+#define AlphaFragmentOp3ATI_remap_index 321
+#define BeginFragmentShaderATI_remap_index 322
+#define BindFragmentShaderATI_remap_index 323
+#define ColorFragmentOp1ATI_remap_index 324
+#define ColorFragmentOp2ATI_remap_index 325
+#define ColorFragmentOp3ATI_remap_index 326
+#define DeleteFragmentShaderATI_remap_index 327
+#define EndFragmentShaderATI_remap_index 328
+#define GenFragmentShadersATI_remap_index 329
+#define PassTexCoordATI_remap_index 330
+#define SampleMapATI_remap_index 331
+#define SetFragmentShaderConstantATI_remap_index 332
+#define PointParameteriNV_remap_index 333
+#define PointParameterivNV_remap_index 334
+#define ActiveStencilFaceEXT_remap_index 335
+#define BindVertexArrayAPPLE_remap_index 336
+#define DeleteVertexArraysAPPLE_remap_index 337
+#define GenVertexArraysAPPLE_remap_index 338
+#define IsVertexArrayAPPLE_remap_index 339
+#define GetProgramNamedParameterdvNV_remap_index 340
+#define GetProgramNamedParameterfvNV_remap_index 341
+#define ProgramNamedParameter4dNV_remap_index 342
+#define ProgramNamedParameter4dvNV_remap_index 343
+#define ProgramNamedParameter4fNV_remap_index 344
+#define ProgramNamedParameter4fvNV_remap_index 345
+#define DepthBoundsEXT_remap_index 346
+#define BlendEquationSeparateEXT_remap_index 347
+#define BindFramebufferEXT_remap_index 348
+#define BindRenderbufferEXT_remap_index 349
+#define CheckFramebufferStatusEXT_remap_index 350
+#define DeleteFramebuffersEXT_remap_index 351
+#define DeleteRenderbuffersEXT_remap_index 352
+#define FramebufferRenderbufferEXT_remap_index 353
+#define FramebufferTexture1DEXT_remap_index 354
+#define FramebufferTexture2DEXT_remap_index 355
+#define FramebufferTexture3DEXT_remap_index 356
+#define GenFramebuffersEXT_remap_index 357
+#define GenRenderbuffersEXT_remap_index 358
+#define GenerateMipmapEXT_remap_index 359
+#define GetFramebufferAttachmentParameterivEXT_remap_index 360
+#define GetRenderbufferParameterivEXT_remap_index 361
+#define IsFramebufferEXT_remap_index 362
+#define IsRenderbufferEXT_remap_index 363
+#define RenderbufferStorageEXT_remap_index 364
+#define BlitFramebufferEXT_remap_index 365
+#define FramebufferTextureLayerEXT_remap_index 366
+#define ProvokingVertexEXT_remap_index 367
+#define StencilFuncSeparateATI_remap_index 368
+#define ProgramEnvParameters4fvEXT_remap_index 369
+#define ProgramLocalParameters4fvEXT_remap_index 370
+#define GetQueryObjecti64vEXT_remap_index 371
+#define GetQueryObjectui64vEXT_remap_index 372
 
 #define CALL_AttachShader(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLuint)), driDispatchRemapTable[AttachShader_remap_index], parameters)
 #define GET_AttachShader(disp) GET_by_offset(disp, driDispatchRemapTable[AttachShader_remap_index])
@@ -3243,6 +3251,12 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define CALL_MapBufferRange(disp, parameters) CALL_by_offset(disp, (GLvoid * (GLAPIENTRYP)(GLenum, GLintptr, GLsizeiptr, GLbitfield)), driDispatchRemapTable[MapBufferRange_remap_index], parameters)
 #define GET_MapBufferRange(disp) GET_by_offset(disp, driDispatchRemapTable[MapBufferRange_remap_index])
 #define SET_MapBufferRange(disp, fn) SET_by_offset(disp, driDispatchRemapTable[MapBufferRange_remap_index], fn)
+#define CALL_BindVertexArray(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint)), driDispatchRemapTable[BindVertexArray_remap_index], parameters)
+#define GET_BindVertexArray(disp) GET_by_offset(disp, driDispatchRemapTable[BindVertexArray_remap_index])
+#define SET_BindVertexArray(disp, fn) SET_by_offset(disp, driDispatchRemapTable[BindVertexArray_remap_index], fn)
+#define CALL_GenVertexArrays(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsizei, GLuint *)), driDispatchRemapTable[GenVertexArrays_remap_index], parameters)
+#define GET_GenVertexArrays(disp) GET_by_offset(disp, driDispatchRemapTable[GenVertexArrays_remap_index])
+#define SET_GenVertexArrays(disp, fn) SET_by_offset(disp, driDispatchRemapTable[GenVertexArrays_remap_index], fn)
 #define CALL_CopyBufferSubData(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLintptr, GLintptr, GLsizeiptr)), driDispatchRemapTable[CopyBufferSubData_remap_index], parameters)
 #define GET_CopyBufferSubData(disp) GET_by_offset(disp, driDispatchRemapTable[CopyBufferSubData_remap_index])
 #define SET_CopyBufferSubData(disp, fn) SET_by_offset(disp, driDispatchRemapTable[CopyBufferSubData_remap_index], fn)
diff --git a/src/mesa/glapi/glapioffsets.h b/src/mesa/glapi/glapioffsets.h
index bd0a53a58f..9ed67a645f 100644
--- a/src/mesa/glapi/glapioffsets.h
+++ b/src/mesa/glapi/glapioffsets.h
@@ -596,222 +596,224 @@
 #define _gloffset_RenderbufferStorageMultisample 561
 #define _gloffset_FlushMappedBufferRange 562
 #define _gloffset_MapBufferRange 563
-#define _gloffset_CopyBufferSubData 564
-#define _gloffset_PolygonOffsetEXT 565
-#define _gloffset_GetPixelTexGenParameterfvSGIS 566
-#define _gloffset_GetPixelTexGenParameterivSGIS 567
-#define _gloffset_PixelTexGenParameterfSGIS 568
-#define _gloffset_PixelTexGenParameterfvSGIS 569
-#define _gloffset_PixelTexGenParameteriSGIS 570
-#define _gloffset_PixelTexGenParameterivSGIS 571
-#define _gloffset_SampleMaskSGIS 572
-#define _gloffset_SamplePatternSGIS 573
-#define _gloffset_ColorPointerEXT 574
-#define _gloffset_EdgeFlagPointerEXT 575
-#define _gloffset_IndexPointerEXT 576
-#define _gloffset_NormalPointerEXT 577
-#define _gloffset_TexCoordPointerEXT 578
-#define _gloffset_VertexPointerEXT 579
-#define _gloffset_PointParameterfEXT 580
-#define _gloffset_PointParameterfvEXT 581
-#define _gloffset_LockArraysEXT 582
-#define _gloffset_UnlockArraysEXT 583
-#define _gloffset_CullParameterdvEXT 584
-#define _gloffset_CullParameterfvEXT 585
-#define _gloffset_SecondaryColor3bEXT 586
-#define _gloffset_SecondaryColor3bvEXT 587
-#define _gloffset_SecondaryColor3dEXT 588
-#define _gloffset_SecondaryColor3dvEXT 589
-#define _gloffset_SecondaryColor3fEXT 590
-#define _gloffset_SecondaryColor3fvEXT 591
-#define _gloffset_SecondaryColor3iEXT 592
-#define _gloffset_SecondaryColor3ivEXT 593
-#define _gloffset_SecondaryColor3sEXT 594
-#define _gloffset_SecondaryColor3svEXT 595
-#define _gloffset_SecondaryColor3ubEXT 596
-#define _gloffset_SecondaryColor3ubvEXT 597
-#define _gloffset_SecondaryColor3uiEXT 598
-#define _gloffset_SecondaryColor3uivEXT 599
-#define _gloffset_SecondaryColor3usEXT 600
-#define _gloffset_SecondaryColor3usvEXT 601
-#define _gloffset_SecondaryColorPointerEXT 602
-#define _gloffset_MultiDrawArraysEXT 603
-#define _gloffset_MultiDrawElementsEXT 604
-#define _gloffset_FogCoordPointerEXT 605
-#define _gloffset_FogCoorddEXT 606
-#define _gloffset_FogCoorddvEXT 607
-#define _gloffset_FogCoordfEXT 608
-#define _gloffset_FogCoordfvEXT 609
-#define _gloffset_PixelTexGenSGIX 610
-#define _gloffset_BlendFuncSeparateEXT 611
-#define _gloffset_FlushVertexArrayRangeNV 612
-#define _gloffset_VertexArrayRangeNV 613
-#define _gloffset_CombinerInputNV 614
-#define _gloffset_CombinerOutputNV 615
-#define _gloffset_CombinerParameterfNV 616
-#define _gloffset_CombinerParameterfvNV 617
-#define _gloffset_CombinerParameteriNV 618
-#define _gloffset_CombinerParameterivNV 619
-#define _gloffset_FinalCombinerInputNV 620
-#define _gloffset_GetCombinerInputParameterfvNV 621
-#define _gloffset_GetCombinerInputParameterivNV 622
-#define _gloffset_GetCombinerOutputParameterfvNV 623
-#define _gloffset_GetCombinerOutputParameterivNV 624
-#define _gloffset_GetFinalCombinerInputParameterfvNV 625
-#define _gloffset_GetFinalCombinerInputParameterivNV 626
-#define _gloffset_ResizeBuffersMESA 627
-#define _gloffset_WindowPos2dMESA 628
-#define _gloffset_WindowPos2dvMESA 629
-#define _gloffset_WindowPos2fMESA 630
-#define _gloffset_WindowPos2fvMESA 631
-#define _gloffset_WindowPos2iMESA 632
-#define _gloffset_WindowPos2ivMESA 633
-#define _gloffset_WindowPos2sMESA 634
-#define _gloffset_WindowPos2svMESA 635
-#define _gloffset_WindowPos3dMESA 636
-#define _gloffset_WindowPos3dvMESA 637
-#define _gloffset_WindowPos3fMESA 638
-#define _gloffset_WindowPos3fvMESA 639
-#define _gloffset_WindowPos3iMESA 640
-#define _gloffset_WindowPos3ivMESA 641
-#define _gloffset_WindowPos3sMESA 642
-#define _gloffset_WindowPos3svMESA 643
-#define _gloffset_WindowPos4dMESA 644
-#define _gloffset_WindowPos4dvMESA 645
-#define _gloffset_WindowPos4fMESA 646
-#define _gloffset_WindowPos4fvMESA 647
-#define _gloffset_WindowPos4iMESA 648
-#define _gloffset_WindowPos4ivMESA 649
-#define _gloffset_WindowPos4sMESA 650
-#define _gloffset_WindowPos4svMESA 651
-#define _gloffset_MultiModeDrawArraysIBM 652
-#define _gloffset_MultiModeDrawElementsIBM 653
-#define _gloffset_DeleteFencesNV 654
-#define _gloffset_FinishFenceNV 655
-#define _gloffset_GenFencesNV 656
-#define _gloffset_GetFenceivNV 657
-#define _gloffset_IsFenceNV 658
-#define _gloffset_SetFenceNV 659
-#define _gloffset_TestFenceNV 660
-#define _gloffset_AreProgramsResidentNV 661
-#define _gloffset_BindProgramNV 662
-#define _gloffset_DeleteProgramsNV 663
-#define _gloffset_ExecuteProgramNV 664
-#define _gloffset_GenProgramsNV 665
-#define _gloffset_GetProgramParameterdvNV 666
-#define _gloffset_GetProgramParameterfvNV 667
-#define _gloffset_GetProgramStringNV 668
-#define _gloffset_GetProgramivNV 669
-#define _gloffset_GetTrackMatrixivNV 670
-#define _gloffset_GetVertexAttribPointervNV 671
-#define _gloffset_GetVertexAttribdvNV 672
-#define _gloffset_GetVertexAttribfvNV 673
-#define _gloffset_GetVertexAttribivNV 674
-#define _gloffset_IsProgramNV 675
-#define _gloffset_LoadProgramNV 676
-#define _gloffset_ProgramParameters4dvNV 677
-#define _gloffset_ProgramParameters4fvNV 678
-#define _gloffset_RequestResidentProgramsNV 679
-#define _gloffset_TrackMatrixNV 680
-#define _gloffset_VertexAttrib1dNV 681
-#define _gloffset_VertexAttrib1dvNV 682
-#define _gloffset_VertexAttrib1fNV 683
-#define _gloffset_VertexAttrib1fvNV 684
-#define _gloffset_VertexAttrib1sNV 685
-#define _gloffset_VertexAttrib1svNV 686
-#define _gloffset_VertexAttrib2dNV 687
-#define _gloffset_VertexAttrib2dvNV 688
-#define _gloffset_VertexAttrib2fNV 689
-#define _gloffset_VertexAttrib2fvNV 690
-#define _gloffset_VertexAttrib2sNV 691
-#define _gloffset_VertexAttrib2svNV 692
-#define _gloffset_VertexAttrib3dNV 693
-#define _gloffset_VertexAttrib3dvNV 694
-#define _gloffset_VertexAttrib3fNV 695
-#define _gloffset_VertexAttrib3fvNV 696
-#define _gloffset_VertexAttrib3sNV 697
-#define _gloffset_VertexAttrib3svNV 698
-#define _gloffset_VertexAttrib4dNV 699
-#define _gloffset_VertexAttrib4dvNV 700
-#define _gloffset_VertexAttrib4fNV 701
-#define _gloffset_VertexAttrib4fvNV 702
-#define _gloffset_VertexAttrib4sNV 703
-#define _gloffset_VertexAttrib4svNV 704
-#define _gloffset_VertexAttrib4ubNV 705
-#define _gloffset_VertexAttrib4ubvNV 706
-#define _gloffset_VertexAttribPointerNV 707
-#define _gloffset_VertexAttribs1dvNV 708
-#define _gloffset_VertexAttribs1fvNV 709
-#define _gloffset_VertexAttribs1svNV 710
-#define _gloffset_VertexAttribs2dvNV 711
-#define _gloffset_VertexAttribs2fvNV 712
-#define _gloffset_VertexAttribs2svNV 713
-#define _gloffset_VertexAttribs3dvNV 714
-#define _gloffset_VertexAttribs3fvNV 715
-#define _gloffset_VertexAttribs3svNV 716
-#define _gloffset_VertexAttribs4dvNV 717
-#define _gloffset_VertexAttribs4fvNV 718
-#define _gloffset_VertexAttribs4svNV 719
-#define _gloffset_VertexAttribs4ubvNV 720
-#define _gloffset_GetTexBumpParameterfvATI 721
-#define _gloffset_GetTexBumpParameterivATI 722
-#define _gloffset_TexBumpParameterfvATI 723
-#define _gloffset_TexBumpParameterivATI 724
-#define _gloffset_AlphaFragmentOp1ATI 725
-#define _gloffset_AlphaFragmentOp2ATI 726
-#define _gloffset_AlphaFragmentOp3ATI 727
-#define _gloffset_BeginFragmentShaderATI 728
-#define _gloffset_BindFragmentShaderATI 729
-#define _gloffset_ColorFragmentOp1ATI 730
-#define _gloffset_ColorFragmentOp2ATI 731
-#define _gloffset_ColorFragmentOp3ATI 732
-#define _gloffset_DeleteFragmentShaderATI 733
-#define _gloffset_EndFragmentShaderATI 734
-#define _gloffset_GenFragmentShadersATI 735
-#define _gloffset_PassTexCoordATI 736
-#define _gloffset_SampleMapATI 737
-#define _gloffset_SetFragmentShaderConstantATI 738
-#define _gloffset_PointParameteriNV 739
-#define _gloffset_PointParameterivNV 740
-#define _gloffset_ActiveStencilFaceEXT 741
-#define _gloffset_BindVertexArrayAPPLE 742
-#define _gloffset_DeleteVertexArraysAPPLE 743
-#define _gloffset_GenVertexArraysAPPLE 744
-#define _gloffset_IsVertexArrayAPPLE 745
-#define _gloffset_GetProgramNamedParameterdvNV 746
-#define _gloffset_GetProgramNamedParameterfvNV 747
-#define _gloffset_ProgramNamedParameter4dNV 748
-#define _gloffset_ProgramNamedParameter4dvNV 749
-#define _gloffset_ProgramNamedParameter4fNV 750
-#define _gloffset_ProgramNamedParameter4fvNV 751
-#define _gloffset_DepthBoundsEXT 752
-#define _gloffset_BlendEquationSeparateEXT 753
-#define _gloffset_BindFramebufferEXT 754
-#define _gloffset_BindRenderbufferEXT 755
-#define _gloffset_CheckFramebufferStatusEXT 756
-#define _gloffset_DeleteFramebuffersEXT 757
-#define _gloffset_DeleteRenderbuffersEXT 758
-#define _gloffset_FramebufferRenderbufferEXT 759
-#define _gloffset_FramebufferTexture1DEXT 760
-#define _gloffset_FramebufferTexture2DEXT 761
-#define _gloffset_FramebufferTexture3DEXT 762
-#define _gloffset_GenFramebuffersEXT 763
-#define _gloffset_GenRenderbuffersEXT 764
-#define _gloffset_GenerateMipmapEXT 765
-#define _gloffset_GetFramebufferAttachmentParameterivEXT 766
-#define _gloffset_GetRenderbufferParameterivEXT 767
-#define _gloffset_IsFramebufferEXT 768
-#define _gloffset_IsRenderbufferEXT 769
-#define _gloffset_RenderbufferStorageEXT 770
-#define _gloffset_BlitFramebufferEXT 771
-#define _gloffset_FramebufferTextureLayerEXT 772
-#define _gloffset_ProvokingVertexEXT 773
-#define _gloffset_StencilFuncSeparateATI 774
-#define _gloffset_ProgramEnvParameters4fvEXT 775
-#define _gloffset_ProgramLocalParameters4fvEXT 776
-#define _gloffset_GetQueryObjecti64vEXT 777
-#define _gloffset_GetQueryObjectui64vEXT 778
-#define _gloffset_FIRST_DYNAMIC 779
+#define _gloffset_BindVertexArray 564
+#define _gloffset_GenVertexArrays 565
+#define _gloffset_CopyBufferSubData 566
+#define _gloffset_PolygonOffsetEXT 567
+#define _gloffset_GetPixelTexGenParameterfvSGIS 568
+#define _gloffset_GetPixelTexGenParameterivSGIS 569
+#define _gloffset_PixelTexGenParameterfSGIS 570
+#define _gloffset_PixelTexGenParameterfvSGIS 571
+#define _gloffset_PixelTexGenParameteriSGIS 572
+#define _gloffset_PixelTexGenParameterivSGIS 573
+#define _gloffset_SampleMaskSGIS 574
+#define _gloffset_SamplePatternSGIS 575
+#define _gloffset_ColorPointerEXT 576
+#define _gloffset_EdgeFlagPointerEXT 577
+#define _gloffset_IndexPointerEXT 578
+#define _gloffset_NormalPointerEXT 579
+#define _gloffset_TexCoordPointerEXT 580
+#define _gloffset_VertexPointerEXT 581
+#define _gloffset_PointParameterfEXT 582
+#define _gloffset_PointParameterfvEXT 583
+#define _gloffset_LockArraysEXT 584
+#define _gloffset_UnlockArraysEXT 585
+#define _gloffset_CullParameterdvEXT 586
+#define _gloffset_CullParameterfvEXT 587
+#define _gloffset_SecondaryColor3bEXT 588
+#define _gloffset_SecondaryColor3bvEXT 589
+#define _gloffset_SecondaryColor3dEXT 590
+#define _gloffset_SecondaryColor3dvEXT 591
+#define _gloffset_SecondaryColor3fEXT 592
+#define _gloffset_SecondaryColor3fvEXT 593
+#define _gloffset_SecondaryColor3iEXT 594
+#define _gloffset_SecondaryColor3ivEXT 595
+#define _gloffset_SecondaryColor3sEXT 596
+#define _gloffset_SecondaryColor3svEXT 597
+#define _gloffset_SecondaryColor3ubEXT 598
+#define _gloffset_SecondaryColor3ubvEXT 599
+#define _gloffset_SecondaryColor3uiEXT 600
+#define _gloffset_SecondaryColor3uivEXT 601
+#define _gloffset_SecondaryColor3usEXT 602
+#define _gloffset_SecondaryColor3usvEXT 603
+#define _gloffset_SecondaryColorPointerEXT 604
+#define _gloffset_MultiDrawArraysEXT 605
+#define _gloffset_MultiDrawElementsEXT 606
+#define _gloffset_FogCoordPointerEXT 607
+#define _gloffset_FogCoorddEXT 608
+#define _gloffset_FogCoorddvEXT 609
+#define _gloffset_FogCoordfEXT 610
+#define _gloffset_FogCoordfvEXT 611
+#define _gloffset_PixelTexGenSGIX 612
+#define _gloffset_BlendFuncSeparateEXT 613
+#define _gloffset_FlushVertexArrayRangeNV 614
+#define _gloffset_VertexArrayRangeNV 615
+#define _gloffset_CombinerInputNV 616
+#define _gloffset_CombinerOutputNV 617
+#define _gloffset_CombinerParameterfNV 618
+#define _gloffset_CombinerParameterfvNV 619
+#define _gloffset_CombinerParameteriNV 620
+#define _gloffset_CombinerParameterivNV 621
+#define _gloffset_FinalCombinerInputNV 622
+#define _gloffset_GetCombinerInputParameterfvNV 623
+#define _gloffset_GetCombinerInputParameterivNV 624
+#define _gloffset_GetCombinerOutputParameterfvNV 625
+#define _gloffset_GetCombinerOutputParameterivNV 626
+#define _gloffset_GetFinalCombinerInputParameterfvNV 627
+#define _gloffset_GetFinalCombinerInputParameterivNV 628
+#define _gloffset_ResizeBuffersMESA 629
+#define _gloffset_WindowPos2dMESA 630
+#define _gloffset_WindowPos2dvMESA 631
+#define _gloffset_WindowPos2fMESA 632
+#define _gloffset_WindowPos2fvMESA 633
+#define _gloffset_WindowPos2iMESA 634
+#define _gloffset_WindowPos2ivMESA 635
+#define _gloffset_WindowPos2sMESA 636
+#define _gloffset_WindowPos2svMESA 637
+#define _gloffset_WindowPos3dMESA 638
+#define _gloffset_WindowPos3dvMESA 639
+#define _gloffset_WindowPos3fMESA 640
+#define _gloffset_WindowPos3fvMESA 641
+#define _gloffset_WindowPos3iMESA 642
+#define _gloffset_WindowPos3ivMESA 643
+#define _gloffset_WindowPos3sMESA 644
+#define _gloffset_WindowPos3svMESA 645
+#define _gloffset_WindowPos4dMESA 646
+#define _gloffset_WindowPos4dvMESA 647
+#define _gloffset_WindowPos4fMESA 648
+#define _gloffset_WindowPos4fvMESA 649
+#define _gloffset_WindowPos4iMESA 650
+#define _gloffset_WindowPos4ivMESA 651
+#define _gloffset_WindowPos4sMESA 652
+#define _gloffset_WindowPos4svMESA 653
+#define _gloffset_MultiModeDrawArraysIBM 654
+#define _gloffset_MultiModeDrawElementsIBM 655
+#define _gloffset_DeleteFencesNV 656
+#define _gloffset_FinishFenceNV 657
+#define _gloffset_GenFencesNV 658
+#define _gloffset_GetFenceivNV 659
+#define _gloffset_IsFenceNV 660
+#define _gloffset_SetFenceNV 661
+#define _gloffset_TestFenceNV 662
+#define _gloffset_AreProgramsResidentNV 663
+#define _gloffset_BindProgramNV 664
+#define _gloffset_DeleteProgramsNV 665
+#define _gloffset_ExecuteProgramNV 666
+#define _gloffset_GenProgramsNV 667
+#define _gloffset_GetProgramParameterdvNV 668
+#define _gloffset_GetProgramParameterfvNV 669
+#define _gloffset_GetProgramStringNV 670
+#define _gloffset_GetProgramivNV 671
+#define _gloffset_GetTrackMatrixivNV 672
+#define _gloffset_GetVertexAttribPointervNV 673
+#define _gloffset_GetVertexAttribdvNV 674
+#define _gloffset_GetVertexAttribfvNV 675
+#define _gloffset_GetVertexAttribivNV 676
+#define _gloffset_IsProgramNV 677
+#define _gloffset_LoadProgramNV 678
+#define _gloffset_ProgramParameters4dvNV 679
+#define _gloffset_ProgramParameters4fvNV 680
+#define _gloffset_RequestResidentProgramsNV 681
+#define _gloffset_TrackMatrixNV 682
+#define _gloffset_VertexAttrib1dNV 683
+#define _gloffset_VertexAttrib1dvNV 684
+#define _gloffset_VertexAttrib1fNV 685
+#define _gloffset_VertexAttrib1fvNV 686
+#define _gloffset_VertexAttrib1sNV 687
+#define _gloffset_VertexAttrib1svNV 688
+#define _gloffset_VertexAttrib2dNV 689
+#define _gloffset_VertexAttrib2dvNV 690
+#define _gloffset_VertexAttrib2fNV 691
+#define _gloffset_VertexAttrib2fvNV 692
+#define _gloffset_VertexAttrib2sNV 693
+#define _gloffset_VertexAttrib2svNV 694
+#define _gloffset_VertexAttrib3dNV 695
+#define _gloffset_VertexAttrib3dvNV 696
+#define _gloffset_VertexAttrib3fNV 697
+#define _gloffset_VertexAttrib3fvNV 698
+#define _gloffset_VertexAttrib3sNV 699
+#define _gloffset_VertexAttrib3svNV 700
+#define _gloffset_VertexAttrib4dNV 701
+#define _gloffset_VertexAttrib4dvNV 702
+#define _gloffset_VertexAttrib4fNV 703
+#define _gloffset_VertexAttrib4fvNV 704
+#define _gloffset_VertexAttrib4sNV 705
+#define _gloffset_VertexAttrib4svNV 706
+#define _gloffset_VertexAttrib4ubNV 707
+#define _gloffset_VertexAttrib4ubvNV 708
+#define _gloffset_VertexAttribPointerNV 709
+#define _gloffset_VertexAttribs1dvNV 710
+#define _gloffset_VertexAttribs1fvNV 711
+#define _gloffset_VertexAttribs1svNV 712
+#define _gloffset_VertexAttribs2dvNV 713
+#define _gloffset_VertexAttribs2fvNV 714
+#define _gloffset_VertexAttribs2svNV 715
+#define _gloffset_VertexAttribs3dvNV 716
+#define _gloffset_VertexAttribs3fvNV 717
+#define _gloffset_VertexAttribs3svNV 718
+#define _gloffset_VertexAttribs4dvNV 719
+#define _gloffset_VertexAttribs4fvNV 720
+#define _gloffset_VertexAttribs4svNV 721
+#define _gloffset_VertexAttribs4ubvNV 722
+#define _gloffset_GetTexBumpParameterfvATI 723
+#define _gloffset_GetTexBumpParameterivATI 724
+#define _gloffset_TexBumpParameterfvATI 725
+#define _gloffset_TexBumpParameterivATI 726
+#define _gloffset_AlphaFragmentOp1ATI 727
+#define _gloffset_AlphaFragmentOp2ATI 728
+#define _gloffset_AlphaFragmentOp3ATI 729
+#define _gloffset_BeginFragmentShaderATI 730
+#define _gloffset_BindFragmentShaderATI 731
+#define _gloffset_ColorFragmentOp1ATI 732
+#define _gloffset_ColorFragmentOp2ATI 733
+#define _gloffset_ColorFragmentOp3ATI 734
+#define _gloffset_DeleteFragmentShaderATI 735
+#define _gloffset_EndFragmentShaderATI 736
+#define _gloffset_GenFragmentShadersATI 737
+#define _gloffset_PassTexCoordATI 738
+#define _gloffset_SampleMapATI 739
+#define _gloffset_SetFragmentShaderConstantATI 740
+#define _gloffset_PointParameteriNV 741
+#define _gloffset_PointParameterivNV 742
+#define _gloffset_ActiveStencilFaceEXT 743
+#define _gloffset_BindVertexArrayAPPLE 744
+#define _gloffset_DeleteVertexArraysAPPLE 745
+#define _gloffset_GenVertexArraysAPPLE 746
+#define _gloffset_IsVertexArrayAPPLE 747
+#define _gloffset_GetProgramNamedParameterdvNV 748
+#define _gloffset_GetProgramNamedParameterfvNV 749
+#define _gloffset_ProgramNamedParameter4dNV 750
+#define _gloffset_ProgramNamedParameter4dvNV 751
+#define _gloffset_ProgramNamedParameter4fNV 752
+#define _gloffset_ProgramNamedParameter4fvNV 753
+#define _gloffset_DepthBoundsEXT 754
+#define _gloffset_BlendEquationSeparateEXT 755
+#define _gloffset_BindFramebufferEXT 756
+#define _gloffset_BindRenderbufferEXT 757
+#define _gloffset_CheckFramebufferStatusEXT 758
+#define _gloffset_DeleteFramebuffersEXT 759
+#define _gloffset_DeleteRenderbuffersEXT 760
+#define _gloffset_FramebufferRenderbufferEXT 761
+#define _gloffset_FramebufferTexture1DEXT 762
+#define _gloffset_FramebufferTexture2DEXT 763
+#define _gloffset_FramebufferTexture3DEXT 764
+#define _gloffset_GenFramebuffersEXT 765
+#define _gloffset_GenRenderbuffersEXT 766
+#define _gloffset_GenerateMipmapEXT 767
+#define _gloffset_GetFramebufferAttachmentParameterivEXT 768
+#define _gloffset_GetRenderbufferParameterivEXT 769
+#define _gloffset_IsFramebufferEXT 770
+#define _gloffset_IsRenderbufferEXT 771
+#define _gloffset_RenderbufferStorageEXT 772
+#define _gloffset_BlitFramebufferEXT 773
+#define _gloffset_FramebufferTextureLayerEXT 774
+#define _gloffset_ProvokingVertexEXT 775
+#define _gloffset_StencilFuncSeparateATI 776
+#define _gloffset_ProgramEnvParameters4fvEXT 777
+#define _gloffset_ProgramLocalParameters4fvEXT 778
+#define _gloffset_GetQueryObjecti64vEXT 779
+#define _gloffset_GetQueryObjectui64vEXT 780
+#define _gloffset_FIRST_DYNAMIC 781
 
 #else
 
@@ -971,6 +973,8 @@
 #define _gloffset_RenderbufferStorageMultisample driDispatchRemapTable[RenderbufferStorageMultisample_remap_index]
 #define _gloffset_FlushMappedBufferRange driDispatchRemapTable[FlushMappedBufferRange_remap_index]
 #define _gloffset_MapBufferRange driDispatchRemapTable[MapBufferRange_remap_index]
+#define _gloffset_BindVertexArray driDispatchRemapTable[BindVertexArray_remap_index]
+#define _gloffset_GenVertexArrays driDispatchRemapTable[GenVertexArrays_remap_index]
 #define _gloffset_CopyBufferSubData driDispatchRemapTable[CopyBufferSubData_remap_index]
 #define _gloffset_PolygonOffsetEXT driDispatchRemapTable[PolygonOffsetEXT_remap_index]
 #define _gloffset_GetPixelTexGenParameterfvSGIS driDispatchRemapTable[GetPixelTexGenParameterfvSGIS_remap_index]
diff --git a/src/mesa/glapi/glapitable.h b/src/mesa/glapi/glapitable.h
index c96d84a084..308de4facc 100644
--- a/src/mesa/glapi/glapitable.h
+++ b/src/mesa/glapi/glapitable.h
@@ -604,221 +604,223 @@ struct _glapi_table
    void (GLAPIENTRYP RenderbufferStorageMultisample)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); /* 561 */
    void (GLAPIENTRYP FlushMappedBufferRange)(GLenum target, GLintptr offset, GLsizeiptr length); /* 562 */
    GLvoid * (GLAPIENTRYP MapBufferRange)(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); /* 563 */
-   void (GLAPIENTRYP CopyBufferSubData)(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); /* 564 */
-   void (GLAPIENTRYP PolygonOffsetEXT)(GLfloat factor, GLfloat bias); /* 565 */
-   void (GLAPIENTRYP GetPixelTexGenParameterfvSGIS)(GLenum pname, GLfloat * params); /* 566 */
-   void (GLAPIENTRYP GetPixelTexGenParameterivSGIS)(GLenum pname, GLint * params); /* 567 */
-   void (GLAPIENTRYP PixelTexGenParameterfSGIS)(GLenum pname, GLfloat param); /* 568 */
-   void (GLAPIENTRYP PixelTexGenParameterfvSGIS)(GLenum pname, const GLfloat * params); /* 569 */
-   void (GLAPIENTRYP PixelTexGenParameteriSGIS)(GLenum pname, GLint param); /* 570 */
-   void (GLAPIENTRYP PixelTexGenParameterivSGIS)(GLenum pname, const GLint * params); /* 571 */
-   void (GLAPIENTRYP SampleMaskSGIS)(GLclampf value, GLboolean invert); /* 572 */
-   void (GLAPIENTRYP SamplePatternSGIS)(GLenum pattern); /* 573 */
-   void (GLAPIENTRYP ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 574 */
-   void (GLAPIENTRYP EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean * pointer); /* 575 */
-   void (GLAPIENTRYP IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 576 */
-   void (GLAPIENTRYP NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 577 */
-   void (GLAPIENTRYP TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 578 */
-   void (GLAPIENTRYP VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 579 */
-   void (GLAPIENTRYP PointParameterfEXT)(GLenum pname, GLfloat param); /* 580 */
-   void (GLAPIENTRYP PointParameterfvEXT)(GLenum pname, const GLfloat * params); /* 581 */
-   void (GLAPIENTRYP LockArraysEXT)(GLint first, GLsizei count); /* 582 */
-   void (GLAPIENTRYP UnlockArraysEXT)(void); /* 583 */
-   void (GLAPIENTRYP CullParameterdvEXT)(GLenum pname, GLdouble * params); /* 584 */
-   void (GLAPIENTRYP CullParameterfvEXT)(GLenum pname, GLfloat * params); /* 585 */
-   void (GLAPIENTRYP SecondaryColor3bEXT)(GLbyte red, GLbyte green, GLbyte blue); /* 586 */
-   void (GLAPIENTRYP SecondaryColor3bvEXT)(const GLbyte * v); /* 587 */
-   void (GLAPIENTRYP SecondaryColor3dEXT)(GLdouble red, GLdouble green, GLdouble blue); /* 588 */
-   void (GLAPIENTRYP SecondaryColor3dvEXT)(const GLdouble * v); /* 589 */
-   void (GLAPIENTRYP SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue); /* 590 */
-   void (GLAPIENTRYP SecondaryColor3fvEXT)(const GLfloat * v); /* 591 */
-   void (GLAPIENTRYP SecondaryColor3iEXT)(GLint red, GLint green, GLint blue); /* 592 */
-   void (GLAPIENTRYP SecondaryColor3ivEXT)(const GLint * v); /* 593 */
-   void (GLAPIENTRYP SecondaryColor3sEXT)(GLshort red, GLshort green, GLshort blue); /* 594 */
-   void (GLAPIENTRYP SecondaryColor3svEXT)(const GLshort * v); /* 595 */
-   void (GLAPIENTRYP SecondaryColor3ubEXT)(GLubyte red, GLubyte green, GLubyte blue); /* 596 */
-   void (GLAPIENTRYP SecondaryColor3ubvEXT)(const GLubyte * v); /* 597 */
-   void (GLAPIENTRYP SecondaryColor3uiEXT)(GLuint red, GLuint green, GLuint blue); /* 598 */
-   void (GLAPIENTRYP SecondaryColor3uivEXT)(const GLuint * v); /* 599 */
-   void (GLAPIENTRYP SecondaryColor3usEXT)(GLushort red, GLushort green, GLushort blue); /* 600 */
-   void (GLAPIENTRYP SecondaryColor3usvEXT)(const GLushort * v); /* 601 */
-   void (GLAPIENTRYP SecondaryColorPointerEXT)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 602 */
-   void (GLAPIENTRYP MultiDrawArraysEXT)(GLenum mode, GLint * first, GLsizei * count, GLsizei primcount); /* 603 */
-   void (GLAPIENTRYP MultiDrawElementsEXT)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount); /* 604 */
-   void (GLAPIENTRYP FogCoordPointerEXT)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 605 */
-   void (GLAPIENTRYP FogCoorddEXT)(GLdouble coord); /* 606 */
-   void (GLAPIENTRYP FogCoorddvEXT)(const GLdouble * coord); /* 607 */
-   void (GLAPIENTRYP FogCoordfEXT)(GLfloat coord); /* 608 */
-   void (GLAPIENTRYP FogCoordfvEXT)(const GLfloat * coord); /* 609 */
-   void (GLAPIENTRYP PixelTexGenSGIX)(GLenum mode); /* 610 */
-   void (GLAPIENTRYP BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); /* 611 */
-   void (GLAPIENTRYP FlushVertexArrayRangeNV)(void); /* 612 */
-   void (GLAPIENTRYP VertexArrayRangeNV)(GLsizei length, const GLvoid * pointer); /* 613 */
-   void (GLAPIENTRYP CombinerInputNV)(GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 614 */
-   void (GLAPIENTRYP CombinerOutputNV)(GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum); /* 615 */
-   void (GLAPIENTRYP CombinerParameterfNV)(GLenum pname, GLfloat param); /* 616 */
-   void (GLAPIENTRYP CombinerParameterfvNV)(GLenum pname, const GLfloat * params); /* 617 */
-   void (GLAPIENTRYP CombinerParameteriNV)(GLenum pname, GLint param); /* 618 */
-   void (GLAPIENTRYP CombinerParameterivNV)(GLenum pname, const GLint * params); /* 619 */
-   void (GLAPIENTRYP FinalCombinerInputNV)(GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 620 */
-   void (GLAPIENTRYP GetCombinerInputParameterfvNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat * params); /* 621 */
-   void (GLAPIENTRYP GetCombinerInputParameterivNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint * params); /* 622 */
-   void (GLAPIENTRYP GetCombinerOutputParameterfvNV)(GLenum stage, GLenum portion, GLenum pname, GLfloat * params); /* 623 */
-   void (GLAPIENTRYP GetCombinerOutputParameterivNV)(GLenum stage, GLenum portion, GLenum pname, GLint * params); /* 624 */
-   void (GLAPIENTRYP GetFinalCombinerInputParameterfvNV)(GLenum variable, GLenum pname, GLfloat * params); /* 625 */
-   void (GLAPIENTRYP GetFinalCombinerInputParameterivNV)(GLenum variable, GLenum pname, GLint * params); /* 626 */
-   void (GLAPIENTRYP ResizeBuffersMESA)(void); /* 627 */
-   void (GLAPIENTRYP WindowPos2dMESA)(GLdouble x, GLdouble y); /* 628 */
-   void (GLAPIENTRYP WindowPos2dvMESA)(const GLdouble * v); /* 629 */
-   void (GLAPIENTRYP WindowPos2fMESA)(GLfloat x, GLfloat y); /* 630 */
-   void (GLAPIENTRYP WindowPos2fvMESA)(const GLfloat * v); /* 631 */
-   void (GLAPIENTRYP WindowPos2iMESA)(GLint x, GLint y); /* 632 */
-   void (GLAPIENTRYP WindowPos2ivMESA)(const GLint * v); /* 633 */
-   void (GLAPIENTRYP WindowPos2sMESA)(GLshort x, GLshort y); /* 634 */
-   void (GLAPIENTRYP WindowPos2svMESA)(const GLshort * v); /* 635 */
-   void (GLAPIENTRYP WindowPos3dMESA)(GLdouble x, GLdouble y, GLdouble z); /* 636 */
-   void (GLAPIENTRYP WindowPos3dvMESA)(const GLdouble * v); /* 637 */
-   void (GLAPIENTRYP WindowPos3fMESA)(GLfloat x, GLfloat y, GLfloat z); /* 638 */
-   void (GLAPIENTRYP WindowPos3fvMESA)(const GLfloat * v); /* 639 */
-   void (GLAPIENTRYP WindowPos3iMESA)(GLint x, GLint y, GLint z); /* 640 */
-   void (GLAPIENTRYP WindowPos3ivMESA)(const GLint * v); /* 641 */
-   void (GLAPIENTRYP WindowPos3sMESA)(GLshort x, GLshort y, GLshort z); /* 642 */
-   void (GLAPIENTRYP WindowPos3svMESA)(const GLshort * v); /* 643 */
-   void (GLAPIENTRYP WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 644 */
-   void (GLAPIENTRYP WindowPos4dvMESA)(const GLdouble * v); /* 645 */
-   void (GLAPIENTRYP WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 646 */
-   void (GLAPIENTRYP WindowPos4fvMESA)(const GLfloat * v); /* 647 */
-   void (GLAPIENTRYP WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w); /* 648 */
-   void (GLAPIENTRYP WindowPos4ivMESA)(const GLint * v); /* 649 */
-   void (GLAPIENTRYP WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w); /* 650 */
-   void (GLAPIENTRYP WindowPos4svMESA)(const GLshort * v); /* 651 */
-   void (GLAPIENTRYP MultiModeDrawArraysIBM)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride); /* 652 */
-   void (GLAPIENTRYP MultiModeDrawElementsIBM)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride); /* 653 */
-   void (GLAPIENTRYP DeleteFencesNV)(GLsizei n, const GLuint * fences); /* 654 */
-   void (GLAPIENTRYP FinishFenceNV)(GLuint fence); /* 655 */
-   void (GLAPIENTRYP GenFencesNV)(GLsizei n, GLuint * fences); /* 656 */
-   void (GLAPIENTRYP GetFenceivNV)(GLuint fence, GLenum pname, GLint * params); /* 657 */
-   GLboolean (GLAPIENTRYP IsFenceNV)(GLuint fence); /* 658 */
-   void (GLAPIENTRYP SetFenceNV)(GLuint fence, GLenum condition); /* 659 */
-   GLboolean (GLAPIENTRYP TestFenceNV)(GLuint fence); /* 660 */
-   GLboolean (GLAPIENTRYP AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences); /* 661 */
-   void (GLAPIENTRYP BindProgramNV)(GLenum target, GLuint program); /* 662 */
-   void (GLAPIENTRYP DeleteProgramsNV)(GLsizei n, const GLuint * programs); /* 663 */
-   void (GLAPIENTRYP ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat * params); /* 664 */
-   void (GLAPIENTRYP GenProgramsNV)(GLsizei n, GLuint * programs); /* 665 */
-   void (GLAPIENTRYP GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params); /* 666 */
-   void (GLAPIENTRYP GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat * params); /* 667 */
-   void (GLAPIENTRYP GetProgramStringNV)(GLuint id, GLenum pname, GLubyte * program); /* 668 */
-   void (GLAPIENTRYP GetProgramivNV)(GLuint id, GLenum pname, GLint * params); /* 669 */
-   void (GLAPIENTRYP GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint * params); /* 670 */
-   void (GLAPIENTRYP GetVertexAttribPointervNV)(GLuint index, GLenum pname, GLvoid ** pointer); /* 671 */
-   void (GLAPIENTRYP GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params); /* 672 */
-   void (GLAPIENTRYP GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat * params); /* 673 */
-   void (GLAPIENTRYP GetVertexAttribivNV)(GLuint index, GLenum pname, GLint * params); /* 674 */
-   GLboolean (GLAPIENTRYP IsProgramNV)(GLuint program); /* 675 */
-   void (GLAPIENTRYP LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte * program); /* 676 */
-   void (GLAPIENTRYP ProgramParameters4dvNV)(GLenum target, GLuint index, GLuint num, const GLdouble * params); /* 677 */
-   void (GLAPIENTRYP ProgramParameters4fvNV)(GLenum target, GLuint index, GLuint num, const GLfloat * params); /* 678 */
-   void (GLAPIENTRYP RequestResidentProgramsNV)(GLsizei n, const GLuint * ids); /* 679 */
-   void (GLAPIENTRYP TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform); /* 680 */
-   void (GLAPIENTRYP VertexAttrib1dNV)(GLuint index, GLdouble x); /* 681 */
-   void (GLAPIENTRYP VertexAttrib1dvNV)(GLuint index, const GLdouble * v); /* 682 */
-   void (GLAPIENTRYP VertexAttrib1fNV)(GLuint index, GLfloat x); /* 683 */
-   void (GLAPIENTRYP VertexAttrib1fvNV)(GLuint index, const GLfloat * v); /* 684 */
-   void (GLAPIENTRYP VertexAttrib1sNV)(GLuint index, GLshort x); /* 685 */
-   void (GLAPIENTRYP VertexAttrib1svNV)(GLuint index, const GLshort * v); /* 686 */
-   void (GLAPIENTRYP VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y); /* 687 */
-   void (GLAPIENTRYP VertexAttrib2dvNV)(GLuint index, const GLdouble * v); /* 688 */
-   void (GLAPIENTRYP VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y); /* 689 */
-   void (GLAPIENTRYP VertexAttrib2fvNV)(GLuint index, const GLfloat * v); /* 690 */
-   void (GLAPIENTRYP VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y); /* 691 */
-   void (GLAPIENTRYP VertexAttrib2svNV)(GLuint index, const GLshort * v); /* 692 */
-   void (GLAPIENTRYP VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 693 */
-   void (GLAPIENTRYP VertexAttrib3dvNV)(GLuint index, const GLdouble * v); /* 694 */
-   void (GLAPIENTRYP VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 695 */
-   void (GLAPIENTRYP VertexAttrib3fvNV)(GLuint index, const GLfloat * v); /* 696 */
-   void (GLAPIENTRYP VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z); /* 697 */
-   void (GLAPIENTRYP VertexAttrib3svNV)(GLuint index, const GLshort * v); /* 698 */
-   void (GLAPIENTRYP VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 699 */
-   void (GLAPIENTRYP VertexAttrib4dvNV)(GLuint index, const GLdouble * v); /* 700 */
-   void (GLAPIENTRYP VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 701 */
-   void (GLAPIENTRYP VertexAttrib4fvNV)(GLuint index, const GLfloat * v); /* 702 */
-   void (GLAPIENTRYP VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 703 */
-   void (GLAPIENTRYP VertexAttrib4svNV)(GLuint index, const GLshort * v); /* 704 */
-   void (GLAPIENTRYP VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 705 */
-   void (GLAPIENTRYP VertexAttrib4ubvNV)(GLuint index, const GLubyte * v); /* 706 */
-   void (GLAPIENTRYP VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 707 */
-   void (GLAPIENTRYP VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 708 */
-   void (GLAPIENTRYP VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 709 */
-   void (GLAPIENTRYP VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v); /* 710 */
-   void (GLAPIENTRYP VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 711 */
-   void (GLAPIENTRYP VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 712 */
-   void (GLAPIENTRYP VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v); /* 713 */
-   void (GLAPIENTRYP VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 714 */
-   void (GLAPIENTRYP VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 715 */
-   void (GLAPIENTRYP VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v); /* 716 */
-   void (GLAPIENTRYP VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 717 */
-   void (GLAPIENTRYP VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 718 */
-   void (GLAPIENTRYP VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v); /* 719 */
-   void (GLAPIENTRYP VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v); /* 720 */
-   void (GLAPIENTRYP GetTexBumpParameterfvATI)(GLenum pname, GLfloat * param); /* 721 */
-   void (GLAPIENTRYP GetTexBumpParameterivATI)(GLenum pname, GLint * param); /* 722 */
-   void (GLAPIENTRYP TexBumpParameterfvATI)(GLenum pname, const GLfloat * param); /* 723 */
-   void (GLAPIENTRYP TexBumpParameterivATI)(GLenum pname, const GLint * param); /* 724 */
-   void (GLAPIENTRYP AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 725 */
-   void (GLAPIENTRYP AlphaFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 726 */
-   void (GLAPIENTRYP AlphaFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 727 */
-   void (GLAPIENTRYP BeginFragmentShaderATI)(void); /* 728 */
-   void (GLAPIENTRYP BindFragmentShaderATI)(GLuint id); /* 729 */
-   void (GLAPIENTRYP ColorFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 730 */
-   void (GLAPIENTRYP ColorFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 731 */
-   void (GLAPIENTRYP ColorFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 732 */
-   void (GLAPIENTRYP DeleteFragmentShaderATI)(GLuint id); /* 733 */
-   void (GLAPIENTRYP EndFragmentShaderATI)(void); /* 734 */
-   GLuint (GLAPIENTRYP GenFragmentShadersATI)(GLuint range); /* 735 */
-   void (GLAPIENTRYP PassTexCoordATI)(GLuint dst, GLuint coord, GLenum swizzle); /* 736 */
-   void (GLAPIENTRYP SampleMapATI)(GLuint dst, GLuint interp, GLenum swizzle); /* 737 */
-   void (GLAPIENTRYP SetFragmentShaderConstantATI)(GLuint dst, const GLfloat * value); /* 738 */
-   void (GLAPIENTRYP PointParameteriNV)(GLenum pname, GLint param); /* 739 */
-   void (GLAPIENTRYP PointParameterivNV)(GLenum pname, const GLint * params); /* 740 */
-   void (GLAPIENTRYP ActiveStencilFaceEXT)(GLenum face); /* 741 */
-   void (GLAPIENTRYP BindVertexArrayAPPLE)(GLuint array); /* 742 */
-   void (GLAPIENTRYP DeleteVertexArraysAPPLE)(GLsizei n, const GLuint * arrays); /* 743 */
-   void (GLAPIENTRYP GenVertexArraysAPPLE)(GLsizei n, GLuint * arrays); /* 744 */
-   GLboolean (GLAPIENTRYP IsVertexArrayAPPLE)(GLuint array); /* 745 */
-   void (GLAPIENTRYP GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params); /* 746 */
-   void (GLAPIENTRYP GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params); /* 747 */
-   void (GLAPIENTRYP ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 748 */
-   void (GLAPIENTRYP ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 749 */
-   void (GLAPIENTRYP ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 750 */
-   void (GLAPIENTRYP ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 751 */
-   void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 752 */
-   void (GLAPIENTRYP BlendEquationSeparateEXT)(GLenum modeRGB, GLenum modeA); /* 753 */
-   void (GLAPIENTRYP BindFramebufferEXT)(GLenum target, GLuint framebuffer); /* 754 */
-   void (GLAPIENTRYP BindRenderbufferEXT)(GLenum target, GLuint renderbuffer); /* 755 */
-   GLenum (GLAPIENTRYP CheckFramebufferStatusEXT)(GLenum target); /* 756 */
-   void (GLAPIENTRYP DeleteFramebuffersEXT)(GLsizei n, const GLuint * framebuffers); /* 757 */
-   void (GLAPIENTRYP DeleteRenderbuffersEXT)(GLsizei n, const GLuint * renderbuffers); /* 758 */
-   void (GLAPIENTRYP FramebufferRenderbufferEXT)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); /* 759 */
-   void (GLAPIENTRYP FramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 760 */
-   void (GLAPIENTRYP FramebufferTexture2DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 761 */
-   void (GLAPIENTRYP FramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); /* 762 */
-   void (GLAPIENTRYP GenFramebuffersEXT)(GLsizei n, GLuint * framebuffers); /* 763 */
-   void (GLAPIENTRYP GenRenderbuffersEXT)(GLsizei n, GLuint * renderbuffers); /* 764 */
-   void (GLAPIENTRYP GenerateMipmapEXT)(GLenum target); /* 765 */
-   void (GLAPIENTRYP GetFramebufferAttachmentParameterivEXT)(GLenum target, GLenum attachment, GLenum pname, GLint * params); /* 766 */
-   void (GLAPIENTRYP GetRenderbufferParameterivEXT)(GLenum target, GLenum pname, GLint * params); /* 767 */
-   GLboolean (GLAPIENTRYP IsFramebufferEXT)(GLuint framebuffer); /* 768 */
-   GLboolean (GLAPIENTRYP IsRenderbufferEXT)(GLuint renderbuffer); /* 769 */
-   void (GLAPIENTRYP RenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); /* 770 */
-   void (GLAPIENTRYP BlitFramebufferEXT)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); /* 771 */
-   void (GLAPIENTRYP FramebufferTextureLayerEXT)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); /* 772 */
-   void (GLAPIENTRYP ProvokingVertexEXT)(GLenum mode); /* 773 */
-   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 774 */
-   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 775 */
-   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 776 */
-   void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 777 */
-   void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 778 */
+   void (GLAPIENTRYP BindVertexArray)(GLuint array); /* 564 */
+   void (GLAPIENTRYP GenVertexArrays)(GLsizei n, GLuint * arrays); /* 565 */
+   void (GLAPIENTRYP CopyBufferSubData)(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); /* 566 */
+   void (GLAPIENTRYP PolygonOffsetEXT)(GLfloat factor, GLfloat bias); /* 567 */
+   void (GLAPIENTRYP GetPixelTexGenParameterfvSGIS)(GLenum pname, GLfloat * params); /* 568 */
+   void (GLAPIENTRYP GetPixelTexGenParameterivSGIS)(GLenum pname, GLint * params); /* 569 */
+   void (GLAPIENTRYP PixelTexGenParameterfSGIS)(GLenum pname, GLfloat param); /* 570 */
+   void (GLAPIENTRYP PixelTexGenParameterfvSGIS)(GLenum pname, const GLfloat * params); /* 571 */
+   void (GLAPIENTRYP PixelTexGenParameteriSGIS)(GLenum pname, GLint param); /* 572 */
+   void (GLAPIENTRYP PixelTexGenParameterivSGIS)(GLenum pname, const GLint * params); /* 573 */
+   void (GLAPIENTRYP SampleMaskSGIS)(GLclampf value, GLboolean invert); /* 574 */
+   void (GLAPIENTRYP SamplePatternSGIS)(GLenum pattern); /* 575 */
+   void (GLAPIENTRYP ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 576 */
+   void (GLAPIENTRYP EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean * pointer); /* 577 */
+   void (GLAPIENTRYP IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 578 */
+   void (GLAPIENTRYP NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 579 */
+   void (GLAPIENTRYP TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 580 */
+   void (GLAPIENTRYP VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 581 */
+   void (GLAPIENTRYP PointParameterfEXT)(GLenum pname, GLfloat param); /* 582 */
+   void (GLAPIENTRYP PointParameterfvEXT)(GLenum pname, const GLfloat * params); /* 583 */
+   void (GLAPIENTRYP LockArraysEXT)(GLint first, GLsizei count); /* 584 */
+   void (GLAPIENTRYP UnlockArraysEXT)(void); /* 585 */
+   void (GLAPIENTRYP CullParameterdvEXT)(GLenum pname, GLdouble * params); /* 586 */
+   void (GLAPIENTRYP CullParameterfvEXT)(GLenum pname, GLfloat * params); /* 587 */
+   void (GLAPIENTRYP SecondaryColor3bEXT)(GLbyte red, GLbyte green, GLbyte blue); /* 588 */
+   void (GLAPIENTRYP SecondaryColor3bvEXT)(const GLbyte * v); /* 589 */
+   void (GLAPIENTRYP SecondaryColor3dEXT)(GLdouble red, GLdouble green, GLdouble blue); /* 590 */
+   void (GLAPIENTRYP SecondaryColor3dvEXT)(const GLdouble * v); /* 591 */
+   void (GLAPIENTRYP SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue); /* 592 */
+   void (GLAPIENTRYP SecondaryColor3fvEXT)(const GLfloat * v); /* 593 */
+   void (GLAPIENTRYP SecondaryColor3iEXT)(GLint red, GLint green, GLint blue); /* 594 */
+   void (GLAPIENTRYP SecondaryColor3ivEXT)(const GLint * v); /* 595 */
+   void (GLAPIENTRYP SecondaryColor3sEXT)(GLshort red, GLshort green, GLshort blue); /* 596 */
+   void (GLAPIENTRYP SecondaryColor3svEXT)(const GLshort * v); /* 597 */
+   void (GLAPIENTRYP SecondaryColor3ubEXT)(GLubyte red, GLubyte green, GLubyte blue); /* 598 */
+   void (GLAPIENTRYP SecondaryColor3ubvEXT)(const GLubyte * v); /* 599 */
+   void (GLAPIENTRYP SecondaryColor3uiEXT)(GLuint red, GLuint green, GLuint blue); /* 600 */
+   void (GLAPIENTRYP SecondaryColor3uivEXT)(const GLuint * v); /* 601 */
+   void (GLAPIENTRYP SecondaryColor3usEXT)(GLushort red, GLushort green, GLushort blue); /* 602 */
+   void (GLAPIENTRYP SecondaryColor3usvEXT)(const GLushort * v); /* 603 */
+   void (GLAPIENTRYP SecondaryColorPointerEXT)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 604 */
+   void (GLAPIENTRYP MultiDrawArraysEXT)(GLenum mode, GLint * first, GLsizei * count, GLsizei primcount); /* 605 */
+   void (GLAPIENTRYP MultiDrawElementsEXT)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount); /* 606 */
+   void (GLAPIENTRYP FogCoordPointerEXT)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 607 */
+   void (GLAPIENTRYP FogCoorddEXT)(GLdouble coord); /* 608 */
+   void (GLAPIENTRYP FogCoorddvEXT)(const GLdouble * coord); /* 609 */
+   void (GLAPIENTRYP FogCoordfEXT)(GLfloat coord); /* 610 */
+   void (GLAPIENTRYP FogCoordfvEXT)(const GLfloat * coord); /* 611 */
+   void (GLAPIENTRYP PixelTexGenSGIX)(GLenum mode); /* 612 */
+   void (GLAPIENTRYP BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); /* 613 */
+   void (GLAPIENTRYP FlushVertexArrayRangeNV)(void); /* 614 */
+   void (GLAPIENTRYP VertexArrayRangeNV)(GLsizei length, const GLvoid * pointer); /* 615 */
+   void (GLAPIENTRYP CombinerInputNV)(GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 616 */
+   void (GLAPIENTRYP CombinerOutputNV)(GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum); /* 617 */
+   void (GLAPIENTRYP CombinerParameterfNV)(GLenum pname, GLfloat param); /* 618 */
+   void (GLAPIENTRYP CombinerParameterfvNV)(GLenum pname, const GLfloat * params); /* 619 */
+   void (GLAPIENTRYP CombinerParameteriNV)(GLenum pname, GLint param); /* 620 */
+   void (GLAPIENTRYP CombinerParameterivNV)(GLenum pname, const GLint * params); /* 621 */
+   void (GLAPIENTRYP FinalCombinerInputNV)(GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 622 */
+   void (GLAPIENTRYP GetCombinerInputParameterfvNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat * params); /* 623 */
+   void (GLAPIENTRYP GetCombinerInputParameterivNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint * params); /* 624 */
+   void (GLAPIENTRYP GetCombinerOutputParameterfvNV)(GLenum stage, GLenum portion, GLenum pname, GLfloat * params); /* 625 */
+   void (GLAPIENTRYP GetCombinerOutputParameterivNV)(GLenum stage, GLenum portion, GLenum pname, GLint * params); /* 626 */
+   void (GLAPIENTRYP GetFinalCombinerInputParameterfvNV)(GLenum variable, GLenum pname, GLfloat * params); /* 627 */
+   void (GLAPIENTRYP GetFinalCombinerInputParameterivNV)(GLenum variable, GLenum pname, GLint * params); /* 628 */
+   void (GLAPIENTRYP ResizeBuffersMESA)(void); /* 629 */
+   void (GLAPIENTRYP WindowPos2dMESA)(GLdouble x, GLdouble y); /* 630 */
+   void (GLAPIENTRYP WindowPos2dvMESA)(const GLdouble * v); /* 631 */
+   void (GLAPIENTRYP WindowPos2fMESA)(GLfloat x, GLfloat y); /* 632 */
+   void (GLAPIENTRYP WindowPos2fvMESA)(const GLfloat * v); /* 633 */
+   void (GLAPIENTRYP WindowPos2iMESA)(GLint x, GLint y); /* 634 */
+   void (GLAPIENTRYP WindowPos2ivMESA)(const GLint * v); /* 635 */
+   void (GLAPIENTRYP WindowPos2sMESA)(GLshort x, GLshort y); /* 636 */
+   void (GLAPIENTRYP WindowPos2svMESA)(const GLshort * v); /* 637 */
+   void (GLAPIENTRYP WindowPos3dMESA)(GLdouble x, GLdouble y, GLdouble z); /* 638 */
+   void (GLAPIENTRYP WindowPos3dvMESA)(const GLdouble * v); /* 639 */
+   void (GLAPIENTRYP WindowPos3fMESA)(GLfloat x, GLfloat y, GLfloat z); /* 640 */
+   void (GLAPIENTRYP WindowPos3fvMESA)(const GLfloat * v); /* 641 */
+   void (GLAPIENTRYP WindowPos3iMESA)(GLint x, GLint y, GLint z); /* 642 */
+   void (GLAPIENTRYP WindowPos3ivMESA)(const GLint * v); /* 643 */
+   void (GLAPIENTRYP WindowPos3sMESA)(GLshort x, GLshort y, GLshort z); /* 644 */
+   void (GLAPIENTRYP WindowPos3svMESA)(const GLshort * v); /* 645 */
+   void (GLAPIENTRYP WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 646 */
+   void (GLAPIENTRYP WindowPos4dvMESA)(const GLdouble * v); /* 647 */
+   void (GLAPIENTRYP WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 648 */
+   void (GLAPIENTRYP WindowPos4fvMESA)(const GLfloat * v); /* 649 */
+   void (GLAPIENTRYP WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w); /* 650 */
+   void (GLAPIENTRYP WindowPos4ivMESA)(const GLint * v); /* 651 */
+   void (GLAPIENTRYP WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w); /* 652 */
+   void (GLAPIENTRYP WindowPos4svMESA)(const GLshort * v); /* 653 */
+   void (GLAPIENTRYP MultiModeDrawArraysIBM)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride); /* 654 */
+   void (GLAPIENTRYP MultiModeDrawElementsIBM)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride); /* 655 */
+   void (GLAPIENTRYP DeleteFencesNV)(GLsizei n, const GLuint * fences); /* 656 */
+   void (GLAPIENTRYP FinishFenceNV)(GLuint fence); /* 657 */
+   void (GLAPIENTRYP GenFencesNV)(GLsizei n, GLuint * fences); /* 658 */
+   void (GLAPIENTRYP GetFenceivNV)(GLuint fence, GLenum pname, GLint * params); /* 659 */
+   GLboolean (GLAPIENTRYP IsFenceNV)(GLuint fence); /* 660 */
+   void (GLAPIENTRYP SetFenceNV)(GLuint fence, GLenum condition); /* 661 */
+   GLboolean (GLAPIENTRYP TestFenceNV)(GLuint fence); /* 662 */
+   GLboolean (GLAPIENTRYP AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences); /* 663 */
+   void (GLAPIENTRYP BindProgramNV)(GLenum target, GLuint program); /* 664 */
+   void (GLAPIENTRYP DeleteProgramsNV)(GLsizei n, const GLuint * programs); /* 665 */
+   void (GLAPIENTRYP ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat * params); /* 666 */
+   void (GLAPIENTRYP GenProgramsNV)(GLsizei n, GLuint * programs); /* 667 */
+   void (GLAPIENTRYP GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params); /* 668 */
+   void (GLAPIENTRYP GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat * params); /* 669 */
+   void (GLAPIENTRYP GetProgramStringNV)(GLuint id, GLenum pname, GLubyte * program); /* 670 */
+   void (GLAPIENTRYP GetProgramivNV)(GLuint id, GLenum pname, GLint * params); /* 671 */
+   void (GLAPIENTRYP GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint * params); /* 672 */
+   void (GLAPIENTRYP GetVertexAttribPointervNV)(GLuint index, GLenum pname, GLvoid ** pointer); /* 673 */
+   void (GLAPIENTRYP GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params); /* 674 */
+   void (GLAPIENTRYP GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat * params); /* 675 */
+   void (GLAPIENTRYP GetVertexAttribivNV)(GLuint index, GLenum pname, GLint * params); /* 676 */
+   GLboolean (GLAPIENTRYP IsProgramNV)(GLuint program); /* 677 */
+   void (GLAPIENTRYP LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte * program); /* 678 */
+   void (GLAPIENTRYP ProgramParameters4dvNV)(GLenum target, GLuint index, GLuint num, const GLdouble * params); /* 679 */
+   void (GLAPIENTRYP ProgramParameters4fvNV)(GLenum target, GLuint index, GLuint num, const GLfloat * params); /* 680 */
+   void (GLAPIENTRYP RequestResidentProgramsNV)(GLsizei n, const GLuint * ids); /* 681 */
+   void (GLAPIENTRYP TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform); /* 682 */
+   void (GLAPIENTRYP VertexAttrib1dNV)(GLuint index, GLdouble x); /* 683 */
+   void (GLAPIENTRYP VertexAttrib1dvNV)(GLuint index, const GLdouble * v); /* 684 */
+   void (GLAPIENTRYP VertexAttrib1fNV)(GLuint index, GLfloat x); /* 685 */
+   void (GLAPIENTRYP VertexAttrib1fvNV)(GLuint index, const GLfloat * v); /* 686 */
+   void (GLAPIENTRYP VertexAttrib1sNV)(GLuint index, GLshort x); /* 687 */
+   void (GLAPIENTRYP VertexAttrib1svNV)(GLuint index, const GLshort * v); /* 688 */
+   void (GLAPIENTRYP VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y); /* 689 */
+   void (GLAPIENTRYP VertexAttrib2dvNV)(GLuint index, const GLdouble * v); /* 690 */
+   void (GLAPIENTRYP VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y); /* 691 */
+   void (GLAPIENTRYP VertexAttrib2fvNV)(GLuint index, const GLfloat * v); /* 692 */
+   void (GLAPIENTRYP VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y); /* 693 */
+   void (GLAPIENTRYP VertexAttrib2svNV)(GLuint index, const GLshort * v); /* 694 */
+   void (GLAPIENTRYP VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 695 */
+   void (GLAPIENTRYP VertexAttrib3dvNV)(GLuint index, const GLdouble * v); /* 696 */
+   void (GLAPIENTRYP VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 697 */
+   void (GLAPIENTRYP VertexAttrib3fvNV)(GLuint index, const GLfloat * v); /* 698 */
+   void (GLAPIENTRYP VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z); /* 699 */
+   void (GLAPIENTRYP VertexAttrib3svNV)(GLuint index, const GLshort * v); /* 700 */
+   void (GLAPIENTRYP VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 701 */
+   void (GLAPIENTRYP VertexAttrib4dvNV)(GLuint index, const GLdouble * v); /* 702 */
+   void (GLAPIENTRYP VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 703 */
+   void (GLAPIENTRYP VertexAttrib4fvNV)(GLuint index, const GLfloat * v); /* 704 */
+   void (GLAPIENTRYP VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 705 */
+   void (GLAPIENTRYP VertexAttrib4svNV)(GLuint index, const GLshort * v); /* 706 */
+   void (GLAPIENTRYP VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 707 */
+   void (GLAPIENTRYP VertexAttrib4ubvNV)(GLuint index, const GLubyte * v); /* 708 */
+   void (GLAPIENTRYP VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 709 */
+   void (GLAPIENTRYP VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 710 */
+   void (GLAPIENTRYP VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 711 */
+   void (GLAPIENTRYP VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v); /* 712 */
+   void (GLAPIENTRYP VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 713 */
+   void (GLAPIENTRYP VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 714 */
+   void (GLAPIENTRYP VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v); /* 715 */
+   void (GLAPIENTRYP VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 716 */
+   void (GLAPIENTRYP VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 717 */
+   void (GLAPIENTRYP VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v); /* 718 */
+   void (GLAPIENTRYP VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 719 */
+   void (GLAPIENTRYP VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 720 */
+   void (GLAPIENTRYP VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v); /* 721 */
+   void (GLAPIENTRYP VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v); /* 722 */
+   void (GLAPIENTRYP GetTexBumpParameterfvATI)(GLenum pname, GLfloat * param); /* 723 */
+   void (GLAPIENTRYP GetTexBumpParameterivATI)(GLenum pname, GLint * param); /* 724 */
+   void (GLAPIENTRYP TexBumpParameterfvATI)(GLenum pname, const GLfloat * param); /* 725 */
+   void (GLAPIENTRYP TexBumpParameterivATI)(GLenum pname, const GLint * param); /* 726 */
+   void (GLAPIENTRYP AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 727 */
+   void (GLAPIENTRYP AlphaFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 728 */
+   void (GLAPIENTRYP AlphaFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 729 */
+   void (GLAPIENTRYP BeginFragmentShaderATI)(void); /* 730 */
+   void (GLAPIENTRYP BindFragmentShaderATI)(GLuint id); /* 731 */
+   void (GLAPIENTRYP ColorFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 732 */
+   void (GLAPIENTRYP ColorFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 733 */
+   void (GLAPIENTRYP ColorFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 734 */
+   void (GLAPIENTRYP DeleteFragmentShaderATI)(GLuint id); /* 735 */
+   void (GLAPIENTRYP EndFragmentShaderATI)(void); /* 736 */
+   GLuint (GLAPIENTRYP GenFragmentShadersATI)(GLuint range); /* 737 */
+   void (GLAPIENTRYP PassTexCoordATI)(GLuint dst, GLuint coord, GLenum swizzle); /* 738 */
+   void (GLAPIENTRYP SampleMapATI)(GLuint dst, GLuint interp, GLenum swizzle); /* 739 */
+   void (GLAPIENTRYP SetFragmentShaderConstantATI)(GLuint dst, const GLfloat * value); /* 740 */
+   void (GLAPIENTRYP PointParameteriNV)(GLenum pname, GLint param); /* 741 */
+   void (GLAPIENTRYP PointParameterivNV)(GLenum pname, const GLint * params); /* 742 */
+   void (GLAPIENTRYP ActiveStencilFaceEXT)(GLenum face); /* 743 */
+   void (GLAPIENTRYP BindVertexArrayAPPLE)(GLuint array); /* 744 */
+   void (GLAPIENTRYP DeleteVertexArraysAPPLE)(GLsizei n, const GLuint * arrays); /* 745 */
+   void (GLAPIENTRYP GenVertexArraysAPPLE)(GLsizei n, GLuint * arrays); /* 746 */
+   GLboolean (GLAPIENTRYP IsVertexArrayAPPLE)(GLuint array); /* 747 */
+   void (GLAPIENTRYP GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params); /* 748 */
+   void (GLAPIENTRYP GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params); /* 749 */
+   void (GLAPIENTRYP ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 750 */
+   void (GLAPIENTRYP ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 751 */
+   void (GLAPIENTRYP ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 752 */
+   void (GLAPIENTRYP ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 753 */
+   void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 754 */
+   void (GLAPIENTRYP BlendEquationSeparateEXT)(GLenum modeRGB, GLenum modeA); /* 755 */
+   void (GLAPIENTRYP BindFramebufferEXT)(GLenum target, GLuint framebuffer); /* 756 */
+   void (GLAPIENTRYP BindRenderbufferEXT)(GLenum target, GLuint renderbuffer); /* 757 */
+   GLenum (GLAPIENTRYP CheckFramebufferStatusEXT)(GLenum target); /* 758 */
+   void (GLAPIENTRYP DeleteFramebuffersEXT)(GLsizei n, const GLuint * framebuffers); /* 759 */
+   void (GLAPIENTRYP DeleteRenderbuffersEXT)(GLsizei n, const GLuint * renderbuffers); /* 760 */
+   void (GLAPIENTRYP FramebufferRenderbufferEXT)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); /* 761 */
+   void (GLAPIENTRYP FramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 762 */
+   void (GLAPIENTRYP FramebufferTexture2DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 763 */
+   void (GLAPIENTRYP FramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); /* 764 */
+   void (GLAPIENTRYP GenFramebuffersEXT)(GLsizei n, GLuint * framebuffers); /* 765 */
+   void (GLAPIENTRYP GenRenderbuffersEXT)(GLsizei n, GLuint * renderbuffers); /* 766 */
+   void (GLAPIENTRYP GenerateMipmapEXT)(GLenum target); /* 767 */
+   void (GLAPIENTRYP GetFramebufferAttachmentParameterivEXT)(GLenum target, GLenum attachment, GLenum pname, GLint * params); /* 768 */
+   void (GLAPIENTRYP GetRenderbufferParameterivEXT)(GLenum target, GLenum pname, GLint * params); /* 769 */
+   GLboolean (GLAPIENTRYP IsFramebufferEXT)(GLuint framebuffer); /* 770 */
+   GLboolean (GLAPIENTRYP IsRenderbufferEXT)(GLuint renderbuffer); /* 771 */
+   void (GLAPIENTRYP RenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); /* 772 */
+   void (GLAPIENTRYP BlitFramebufferEXT)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); /* 773 */
+   void (GLAPIENTRYP FramebufferTextureLayerEXT)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); /* 774 */
+   void (GLAPIENTRYP ProvokingVertexEXT)(GLenum mode); /* 775 */
+   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 776 */
+   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 777 */
+   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 778 */
+   void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 779 */
+   void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 780 */
 };
 
 #endif /* !defined( _GLAPI_TABLE_H_ ) */
diff --git a/src/mesa/glapi/glapitemp.h b/src/mesa/glapi/glapitemp.h
index 79a94dbb19..86fda613f0 100644
--- a/src/mesa/glapi/glapitemp.h
+++ b/src/mesa/glapi/glapitemp.h
@@ -4021,6 +4021,16 @@ KEYWORD1 GLvoid * KEYWORD2 NAME(MapBufferRange)(GLenum target, GLintptr offset,
    RETURN_DISPATCH(MapBufferRange, (target, offset, length, access), (F, "glMapBufferRange(0x%x, %d, %d, %d);\n", target, offset, length, access));
 }
 
+KEYWORD1 void KEYWORD2 NAME(BindVertexArray)(GLuint array)
+{
+   DISPATCH(BindVertexArray, (array), (F, "glBindVertexArray(%d);\n", array));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GenVertexArrays)(GLsizei n, GLuint * arrays)
+{
+   DISPATCH(GenVertexArrays, (n, arrays), (F, "glGenVertexArrays(%d, %p);\n", n, (const void *) arrays));
+}
+
 KEYWORD1 void KEYWORD2 NAME(CopyBufferSubData)(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size)
 {
    DISPATCH(CopyBufferSubData, (readTarget, writeTarget, readOffset, writeOffset, size), (F, "glCopyBufferSubData(0x%x, 0x%x, %d, %d, %d);\n", readTarget, writeTarget, readOffset, writeOffset, size));
@@ -4031,58 +4041,58 @@ KEYWORD1 void KEYWORD2 NAME(PolygonOffsetEXT)(GLfloat factor, GLfloat bias)
    DISPATCH(PolygonOffsetEXT, (factor, bias), (F, "glPolygonOffsetEXT(%f, %f);\n", factor, bias));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_566)(GLenum pname, GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_568)(GLenum pname, GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_566)(GLenum pname, GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_568)(GLenum pname, GLfloat * params)
 {
    DISPATCH(GetPixelTexGenParameterfvSGIS, (pname, params), (F, "glGetPixelTexGenParameterfvSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_567)(GLenum pname, GLint * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_569)(GLenum pname, GLint * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_567)(GLenum pname, GLint * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_569)(GLenum pname, GLint * params)
 {
    DISPATCH(GetPixelTexGenParameterivSGIS, (pname, params), (F, "glGetPixelTexGenParameterivSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_568)(GLenum pname, GLfloat param);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_570)(GLenum pname, GLfloat param);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_568)(GLenum pname, GLfloat param)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_570)(GLenum pname, GLfloat param)
 {
    DISPATCH(PixelTexGenParameterfSGIS, (pname, param), (F, "glPixelTexGenParameterfSGIS(0x%x, %f);\n", pname, param));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_569)(GLenum pname, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_571)(GLenum pname, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_569)(GLenum pname, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_571)(GLenum pname, const GLfloat * params)
 {
    DISPATCH(PixelTexGenParameterfvSGIS, (pname, params), (F, "glPixelTexGenParameterfvSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_570)(GLenum pname, GLint param);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_572)(GLenum pname, GLint param);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_570)(GLenum pname, GLint param)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_572)(GLenum pname, GLint param)
 {
    DISPATCH(PixelTexGenParameteriSGIS, (pname, param), (F, "glPixelTexGenParameteriSGIS(0x%x, %d);\n", pname, param));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_571)(GLenum pname, const GLint * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_573)(GLenum pname, const GLint * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_571)(GLenum pname, const GLint * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_573)(GLenum pname, const GLint * params)
 {
    DISPATCH(PixelTexGenParameterivSGIS, (pname, params), (F, "glPixelTexGenParameterivSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_572)(GLclampf value, GLboolean invert);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_574)(GLclampf value, GLboolean invert);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_572)(GLclampf value, GLboolean invert)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_574)(GLclampf value, GLboolean invert)
 {
    DISPATCH(SampleMaskSGIS, (value, invert), (F, "glSampleMaskSGIS(%f, %d);\n", value, invert));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_573)(GLenum pattern);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_575)(GLenum pattern);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_573)(GLenum pattern)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_575)(GLenum pattern)
 {
    DISPATCH(SamplePatternSGIS, (pattern), (F, "glSamplePatternSGIS(0x%x);\n", pattern));
 }
@@ -4132,9 +4142,9 @@ KEYWORD1 void KEYWORD2 NAME(PointParameterfEXT)(GLenum pname, GLfloat param)
    DISPATCH(PointParameterfEXT, (pname, param), (F, "glPointParameterfEXT(0x%x, %f);\n", pname, param));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_580)(GLenum pname, GLfloat param);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_582)(GLenum pname, GLfloat param);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_580)(GLenum pname, GLfloat param)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_582)(GLenum pname, GLfloat param)
 {
    DISPATCH(PointParameterfEXT, (pname, param), (F, "glPointParameterfSGIS(0x%x, %f);\n", pname, param));
 }
@@ -4154,9 +4164,9 @@ KEYWORD1 void KEYWORD2 NAME(PointParameterfvEXT)(GLenum pname, const GLfloat * p
    DISPATCH(PointParameterfvEXT, (pname, params), (F, "glPointParameterfvEXT(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_581)(GLenum pname, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_583)(GLenum pname, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_581)(GLenum pname, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_583)(GLenum pname, const GLfloat * params)
 {
    DISPATCH(PointParameterfvEXT, (pname, params), (F, "glPointParameterfvSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
@@ -4171,16 +4181,16 @@ KEYWORD1 void KEYWORD2 NAME(UnlockArraysEXT)(void)
    DISPATCH(UnlockArraysEXT, (), (F, "glUnlockArraysEXT();\n"));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_584)(GLenum pname, GLdouble * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_586)(GLenum pname, GLdouble * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_584)(GLenum pname, GLdouble * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_586)(GLenum pname, GLdouble * params)
 {
    DISPATCH(CullParameterdvEXT, (pname, params), (F, "glCullParameterdvEXT(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_585)(GLenum pname, GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_587)(GLenum pname, GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_585)(GLenum pname, GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_587)(GLenum pname, GLfloat * params)
 {
    DISPATCH(CullParameterfvEXT, (pname, params), (F, "glCullParameterfvEXT(0x%x, %p);\n", pname, (const void *) params));
 }
@@ -4425,9 +4435,9 @@ KEYWORD1 void KEYWORD2 NAME(FogCoordfvEXT)(const GLfloat * coord)
    DISPATCH(FogCoordfvEXT, (coord), (F, "glFogCoordfvEXT(%p);\n", (const void *) coord));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_610)(GLenum mode);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_612)(GLenum mode);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_610)(GLenum mode)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_612)(GLenum mode)
 {
    DISPATCH(PixelTexGenSGIX, (mode), (F, "glPixelTexGenSGIX(0x%x);\n", mode));
 }
@@ -4442,9 +4452,9 @@ KEYWORD1 void KEYWORD2 NAME(BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfac
    DISPATCH(BlendFuncSeparateEXT, (sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha), (F, "glBlendFuncSeparateEXT(0x%x, 0x%x, 0x%x, 0x%x);\n", sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_611)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_613)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_611)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_613)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
 {
    DISPATCH(BlendFuncSeparateEXT, (sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha), (F, "glBlendFuncSeparateINGR(0x%x, 0x%x, 0x%x, 0x%x);\n", sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha));
 }
@@ -4809,65 +4819,65 @@ KEYWORD1 void KEYWORD2 NAME(WindowPos4svMESA)(const GLshort * v)
    DISPATCH(WindowPos4svMESA, (v), (F, "glWindowPos4svMESA(%p);\n", (const void *) v));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_652)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_654)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_652)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_654)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride)
 {
    DISPATCH(MultiModeDrawArraysIBM, (mode, first, count, primcount, modestride), (F, "glMultiModeDrawArraysIBM(%p, %p, %p, %d, %d);\n", (const void *) mode, (const void *) first, (const void *) count, primcount, modestride));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_653)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_655)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_653)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_655)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride)
 {
    DISPATCH(MultiModeDrawElementsIBM, (mode, count, type, indices, primcount, modestride), (F, "glMultiModeDrawElementsIBM(%p, %p, 0x%x, %p, %d, %d);\n", (const void *) mode, (const void *) count, type, (const void *) indices, primcount, modestride));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_654)(GLsizei n, const GLuint * fences);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_656)(GLsizei n, const GLuint * fences);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_654)(GLsizei n, const GLuint * fences)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_656)(GLsizei n, const GLuint * fences)
 {
    DISPATCH(DeleteFencesNV, (n, fences), (F, "glDeleteFencesNV(%d, %p);\n", n, (const void *) fences));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_655)(GLuint fence);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_657)(GLuint fence);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_655)(GLuint fence)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_657)(GLuint fence)
 {
    DISPATCH(FinishFenceNV, (fence), (F, "glFinishFenceNV(%d);\n", fence));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_656)(GLsizei n, GLuint * fences);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_658)(GLsizei n, GLuint * fences);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_656)(GLsizei n, GLuint * fences)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_658)(GLsizei n, GLuint * fences)
 {
    DISPATCH(GenFencesNV, (n, fences), (F, "glGenFencesNV(%d, %p);\n", n, (const void *) fences));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_657)(GLuint fence, GLenum pname, GLint * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_659)(GLuint fence, GLenum pname, GLint * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_657)(GLuint fence, GLenum pname, GLint * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_659)(GLuint fence, GLenum pname, GLint * params)
 {
    DISPATCH(GetFenceivNV, (fence, pname, params), (F, "glGetFenceivNV(%d, 0x%x, %p);\n", fence, pname, (const void *) params));
 }
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_658)(GLuint fence);
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_660)(GLuint fence);
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_658)(GLuint fence)
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_660)(GLuint fence)
 {
    RETURN_DISPATCH(IsFenceNV, (fence), (F, "glIsFenceNV(%d);\n", fence));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_659)(GLuint fence, GLenum condition);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_661)(GLuint fence, GLenum condition);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_659)(GLuint fence, GLenum condition)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_661)(GLuint fence, GLenum condition)
 {
    DISPATCH(SetFenceNV, (fence, condition), (F, "glSetFenceNV(%d, 0x%x);\n", fence, condition));
 }
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_660)(GLuint fence);
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_662)(GLuint fence);
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_660)(GLuint fence)
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_662)(GLuint fence)
 {
    RETURN_DISPATCH(TestFenceNV, (fence), (F, "glTestFenceNV(%d);\n", fence));
 }
@@ -5312,37 +5322,47 @@ KEYWORD1 void KEYWORD2 NAME(PointParameterivNV)(GLenum pname, const GLint * para
    DISPATCH(PointParameterivNV, (pname, params), (F, "glPointParameterivNV(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_741)(GLenum face);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_743)(GLenum face);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_741)(GLenum face)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_743)(GLenum face)
 {
    DISPATCH(ActiveStencilFaceEXT, (face), (F, "glActiveStencilFaceEXT(0x%x);\n", face));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_742)(GLuint array);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_744)(GLuint array);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_742)(GLuint array)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_744)(GLuint array)
 {
    DISPATCH(BindVertexArrayAPPLE, (array), (F, "glBindVertexArrayAPPLE(%d);\n", array));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_743)(GLsizei n, const GLuint * arrays);
+KEYWORD1 void KEYWORD2 NAME(DeleteVertexArrays)(GLsizei n, const GLuint * arrays)
+{
+   DISPATCH(DeleteVertexArraysAPPLE, (n, arrays), (F, "glDeleteVertexArrays(%d, %p);\n", n, (const void *) arrays));
+}
+
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_745)(GLsizei n, const GLuint * arrays);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_743)(GLsizei n, const GLuint * arrays)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_745)(GLsizei n, const GLuint * arrays)
 {
    DISPATCH(DeleteVertexArraysAPPLE, (n, arrays), (F, "glDeleteVertexArraysAPPLE(%d, %p);\n", n, (const void *) arrays));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_744)(GLsizei n, GLuint * arrays);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_746)(GLsizei n, GLuint * arrays);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_744)(GLsizei n, GLuint * arrays)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_746)(GLsizei n, GLuint * arrays)
 {
    DISPATCH(GenVertexArraysAPPLE, (n, arrays), (F, "glGenVertexArraysAPPLE(%d, %p);\n", n, (const void *) arrays));
 }
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_745)(GLuint array);
+KEYWORD1 GLboolean KEYWORD2 NAME(IsVertexArray)(GLuint array)
+{
+   RETURN_DISPATCH(IsVertexArrayAPPLE, (array), (F, "glIsVertexArray(%d);\n", array));
+}
+
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_747)(GLuint array);
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_745)(GLuint array)
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_747)(GLuint array)
 {
    RETURN_DISPATCH(IsVertexArrayAPPLE, (array), (F, "glIsVertexArrayAPPLE(%d);\n", array));
 }
@@ -5377,9 +5397,9 @@ KEYWORD1 void KEYWORD2 NAME(ProgramNamedParameter4fvNV)(GLuint id, GLsizei len,
    DISPATCH(ProgramNamedParameter4fvNV, (id, len, name, v), (F, "glProgramNamedParameter4fvNV(%d, %d, %p, %p);\n", id, len, (const void *) name, (const void *) v));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_752)(GLclampd zmin, GLclampd zmax);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_754)(GLclampd zmin, GLclampd zmax);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_752)(GLclampd zmin, GLclampd zmax)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_754)(GLclampd zmin, GLclampd zmax)
 {
    DISPATCH(DepthBoundsEXT, (zmin, zmax), (F, "glDepthBoundsEXT(%f, %f);\n", zmin, zmax));
 }
@@ -5389,9 +5409,9 @@ KEYWORD1 void KEYWORD2 NAME(BlendEquationSeparate)(GLenum modeRGB, GLenum modeA)
    DISPATCH(BlendEquationSeparateEXT, (modeRGB, modeA), (F, "glBlendEquationSeparate(0x%x, 0x%x);\n", modeRGB, modeA));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_753)(GLenum modeRGB, GLenum modeA);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_755)(GLenum modeRGB, GLenum modeA);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_753)(GLenum modeRGB, GLenum modeA)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_755)(GLenum modeRGB, GLenum modeA)
 {
    DISPATCH(BlendEquationSeparateEXT, (modeRGB, modeA), (F, "glBlendEquationSeparateEXT(0x%x, 0x%x);\n", modeRGB, modeA));
 }
@@ -5571,9 +5591,9 @@ KEYWORD1 void KEYWORD2 NAME(BlitFramebuffer)(GLint srcX0, GLint srcY0, GLint src
    DISPATCH(BlitFramebufferEXT, (srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter), (F, "glBlitFramebuffer(%d, %d, %d, %d, %d, %d, %d, %d, %d, 0x%x);\n", srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_771)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_773)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_771)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_773)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
 {
    DISPATCH(BlitFramebufferEXT, (srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter), (F, "glBlitFramebufferEXT(%d, %d, %d, %d, %d, %d, %d, %d, %d, 0x%x);\n", srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter));
 }
@@ -5593,37 +5613,37 @@ KEYWORD1 void KEYWORD2 NAME(ProvokingVertexEXT)(GLenum mode)
    DISPATCH(ProvokingVertexEXT, (mode), (F, "glProvokingVertexEXT(0x%x);\n", mode));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_774)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_776)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_774)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_776)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask)
 {
    DISPATCH(StencilFuncSeparateATI, (frontfunc, backfunc, ref, mask), (F, "glStencilFuncSeparateATI(0x%x, 0x%x, %d, %d);\n", frontfunc, backfunc, ref, mask));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_775)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_777)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_775)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_777)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
 {
    DISPATCH(ProgramEnvParameters4fvEXT, (target, index, count, params), (F, "glProgramEnvParameters4fvEXT(0x%x, %d, %d, %p);\n", target, index, count, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_776)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_778)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_776)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_778)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
 {
    DISPATCH(ProgramLocalParameters4fvEXT, (target, index, count, params), (F, "glProgramLocalParameters4fvEXT(0x%x, %d, %d, %p);\n", target, index, count, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_777)(GLuint id, GLenum pname, GLint64EXT * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_779)(GLuint id, GLenum pname, GLint64EXT * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_777)(GLuint id, GLenum pname, GLint64EXT * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_779)(GLuint id, GLenum pname, GLint64EXT * params)
 {
    DISPATCH(GetQueryObjecti64vEXT, (id, pname, params), (F, "glGetQueryObjecti64vEXT(%d, 0x%x, %p);\n", id, pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_778)(GLuint id, GLenum pname, GLuint64EXT * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_780)(GLuint id, GLenum pname, GLuint64EXT * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_778)(GLuint id, GLenum pname, GLuint64EXT * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_780)(GLuint id, GLenum pname, GLuint64EXT * params)
 {
    DISPATCH(GetQueryObjectui64vEXT, (id, pname, params), (F, "glGetQueryObjectui64vEXT(%d, 0x%x, %p);\n", id, pname, (const void *) params));
 }
@@ -6206,16 +6226,18 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(RenderbufferStorageMultisample),
    TABLE_ENTRY(FlushMappedBufferRange),
    TABLE_ENTRY(MapBufferRange),
+   TABLE_ENTRY(BindVertexArray),
+   TABLE_ENTRY(GenVertexArrays),
    TABLE_ENTRY(CopyBufferSubData),
    TABLE_ENTRY(PolygonOffsetEXT),
-   TABLE_ENTRY(_dispatch_stub_566),
-   TABLE_ENTRY(_dispatch_stub_567),
    TABLE_ENTRY(_dispatch_stub_568),
    TABLE_ENTRY(_dispatch_stub_569),
    TABLE_ENTRY(_dispatch_stub_570),
    TABLE_ENTRY(_dispatch_stub_571),
    TABLE_ENTRY(_dispatch_stub_572),
    TABLE_ENTRY(_dispatch_stub_573),
+   TABLE_ENTRY(_dispatch_stub_574),
+   TABLE_ENTRY(_dispatch_stub_575),
    TABLE_ENTRY(ColorPointerEXT),
    TABLE_ENTRY(EdgeFlagPointerEXT),
    TABLE_ENTRY(IndexPointerEXT),
@@ -6226,8 +6248,8 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(PointParameterfvEXT),
    TABLE_ENTRY(LockArraysEXT),
    TABLE_ENTRY(UnlockArraysEXT),
-   TABLE_ENTRY(_dispatch_stub_584),
-   TABLE_ENTRY(_dispatch_stub_585),
+   TABLE_ENTRY(_dispatch_stub_586),
+   TABLE_ENTRY(_dispatch_stub_587),
    TABLE_ENTRY(SecondaryColor3bEXT),
    TABLE_ENTRY(SecondaryColor3bvEXT),
    TABLE_ENTRY(SecondaryColor3dEXT),
@@ -6252,7 +6274,7 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(FogCoorddvEXT),
    TABLE_ENTRY(FogCoordfEXT),
    TABLE_ENTRY(FogCoordfvEXT),
-   TABLE_ENTRY(_dispatch_stub_610),
+   TABLE_ENTRY(_dispatch_stub_612),
    TABLE_ENTRY(BlendFuncSeparateEXT),
    TABLE_ENTRY(FlushVertexArrayRangeNV),
    TABLE_ENTRY(VertexArrayRangeNV),
@@ -6294,8 +6316,6 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(WindowPos4ivMESA),
    TABLE_ENTRY(WindowPos4sMESA),
    TABLE_ENTRY(WindowPos4svMESA),
-   TABLE_ENTRY(_dispatch_stub_652),
-   TABLE_ENTRY(_dispatch_stub_653),
    TABLE_ENTRY(_dispatch_stub_654),
    TABLE_ENTRY(_dispatch_stub_655),
    TABLE_ENTRY(_dispatch_stub_656),
@@ -6303,6 +6323,8 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(_dispatch_stub_658),
    TABLE_ENTRY(_dispatch_stub_659),
    TABLE_ENTRY(_dispatch_stub_660),
+   TABLE_ENTRY(_dispatch_stub_661),
+   TABLE_ENTRY(_dispatch_stub_662),
    TABLE_ENTRY(AreProgramsResidentNV),
    TABLE_ENTRY(BindProgramNV),
    TABLE_ENTRY(DeleteProgramsNV),
@@ -6383,19 +6405,19 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(SetFragmentShaderConstantATI),
    TABLE_ENTRY(PointParameteriNV),
    TABLE_ENTRY(PointParameterivNV),
-   TABLE_ENTRY(_dispatch_stub_741),
-   TABLE_ENTRY(_dispatch_stub_742),
    TABLE_ENTRY(_dispatch_stub_743),
    TABLE_ENTRY(_dispatch_stub_744),
    TABLE_ENTRY(_dispatch_stub_745),
+   TABLE_ENTRY(_dispatch_stub_746),
+   TABLE_ENTRY(_dispatch_stub_747),
    TABLE_ENTRY(GetProgramNamedParameterdvNV),
    TABLE_ENTRY(GetProgramNamedParameterfvNV),
    TABLE_ENTRY(ProgramNamedParameter4dNV),
    TABLE_ENTRY(ProgramNamedParameter4dvNV),
    TABLE_ENTRY(ProgramNamedParameter4fNV),
    TABLE_ENTRY(ProgramNamedParameter4fvNV),
-   TABLE_ENTRY(_dispatch_stub_752),
-   TABLE_ENTRY(_dispatch_stub_753),
+   TABLE_ENTRY(_dispatch_stub_754),
+   TABLE_ENTRY(_dispatch_stub_755),
    TABLE_ENTRY(BindFramebufferEXT),
    TABLE_ENTRY(BindRenderbufferEXT),
    TABLE_ENTRY(CheckFramebufferStatusEXT),
@@ -6413,14 +6435,14 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(IsFramebufferEXT),
    TABLE_ENTRY(IsRenderbufferEXT),
    TABLE_ENTRY(RenderbufferStorageEXT),
-   TABLE_ENTRY(_dispatch_stub_771),
+   TABLE_ENTRY(_dispatch_stub_773),
    TABLE_ENTRY(FramebufferTextureLayerEXT),
    TABLE_ENTRY(ProvokingVertexEXT),
-   TABLE_ENTRY(_dispatch_stub_774),
-   TABLE_ENTRY(_dispatch_stub_775),
    TABLE_ENTRY(_dispatch_stub_776),
    TABLE_ENTRY(_dispatch_stub_777),
    TABLE_ENTRY(_dispatch_stub_778),
+   TABLE_ENTRY(_dispatch_stub_779),
+   TABLE_ENTRY(_dispatch_stub_780),
    /* A whole bunch of no-op functions.  These might be called
     * when someone tries to call a dynamically-registered
     * extension function without a current rendering context.
@@ -6787,6 +6809,8 @@ static _glapi_proc UNUSED_TABLE_NAME[] = {
    TABLE_ENTRY(IsProgramARB),
    TABLE_ENTRY(PointParameteri),
    TABLE_ENTRY(PointParameteriv),
+   TABLE_ENTRY(DeleteVertexArrays),
+   TABLE_ENTRY(IsVertexArray),
    TABLE_ENTRY(BlendEquationSeparate),
    TABLE_ENTRY(BindFramebuffer),
    TABLE_ENTRY(BindRenderbuffer),
diff --git a/src/mesa/glapi/glprocs.h b/src/mesa/glapi/glprocs.h
index b83d88571c..bd3ebc8872 100644
--- a/src/mesa/glapi/glprocs.h
+++ b/src/mesa/glapi/glprocs.h
@@ -616,6 +616,8 @@ static const char gl_string_table[] =
     "glRenderbufferStorageMultisample\0"
     "glFlushMappedBufferRange\0"
     "glMapBufferRange\0"
+    "glBindVertexArray\0"
+    "glGenVertexArrays\0"
     "glCopyBufferSubData\0"
     "glPolygonOffsetEXT\0"
     "glGetPixelTexGenParameterfvSGIS\0"
@@ -1108,6 +1110,8 @@ static const char gl_string_table[] =
     "glIsProgramARB\0"
     "glPointParameteri\0"
     "glPointParameteriv\0"
+    "glDeleteVertexArrays\0"
+    "glIsVertexArray\0"
     "glBlendEquationSeparate\0"
     "glBlendEquationSeparateATI\0"
     "glBindFramebuffer\0"
@@ -1146,19 +1150,17 @@ static const char gl_string_table[] =
 #define gl_dispatch_stub_364 mgl_dispatch_stub_364
 #define gl_dispatch_stub_365 mgl_dispatch_stub_365
 #define gl_dispatch_stub_366 mgl_dispatch_stub_366
-#define gl_dispatch_stub_566 mgl_dispatch_stub_566
-#define gl_dispatch_stub_567 mgl_dispatch_stub_567
 #define gl_dispatch_stub_568 mgl_dispatch_stub_568
 #define gl_dispatch_stub_569 mgl_dispatch_stub_569
 #define gl_dispatch_stub_570 mgl_dispatch_stub_570
 #define gl_dispatch_stub_571 mgl_dispatch_stub_571
 #define gl_dispatch_stub_572 mgl_dispatch_stub_572
 #define gl_dispatch_stub_573 mgl_dispatch_stub_573
-#define gl_dispatch_stub_584 mgl_dispatch_stub_584
-#define gl_dispatch_stub_585 mgl_dispatch_stub_585
-#define gl_dispatch_stub_610 mgl_dispatch_stub_610
-#define gl_dispatch_stub_652 mgl_dispatch_stub_652
-#define gl_dispatch_stub_653 mgl_dispatch_stub_653
+#define gl_dispatch_stub_574 mgl_dispatch_stub_574
+#define gl_dispatch_stub_575 mgl_dispatch_stub_575
+#define gl_dispatch_stub_586 mgl_dispatch_stub_586
+#define gl_dispatch_stub_587 mgl_dispatch_stub_587
+#define gl_dispatch_stub_612 mgl_dispatch_stub_612
 #define gl_dispatch_stub_654 mgl_dispatch_stub_654
 #define gl_dispatch_stub_655 mgl_dispatch_stub_655
 #define gl_dispatch_stub_656 mgl_dispatch_stub_656
@@ -1166,19 +1168,21 @@ static const char gl_string_table[] =
 #define gl_dispatch_stub_658 mgl_dispatch_stub_658
 #define gl_dispatch_stub_659 mgl_dispatch_stub_659
 #define gl_dispatch_stub_660 mgl_dispatch_stub_660
-#define gl_dispatch_stub_741 mgl_dispatch_stub_741
-#define gl_dispatch_stub_742 mgl_dispatch_stub_742
+#define gl_dispatch_stub_661 mgl_dispatch_stub_661
+#define gl_dispatch_stub_662 mgl_dispatch_stub_662
 #define gl_dispatch_stub_743 mgl_dispatch_stub_743
 #define gl_dispatch_stub_744 mgl_dispatch_stub_744
 #define gl_dispatch_stub_745 mgl_dispatch_stub_745
-#define gl_dispatch_stub_752 mgl_dispatch_stub_752
-#define gl_dispatch_stub_753 mgl_dispatch_stub_753
-#define gl_dispatch_stub_771 mgl_dispatch_stub_771
-#define gl_dispatch_stub_774 mgl_dispatch_stub_774
-#define gl_dispatch_stub_775 mgl_dispatch_stub_775
+#define gl_dispatch_stub_746 mgl_dispatch_stub_746
+#define gl_dispatch_stub_747 mgl_dispatch_stub_747
+#define gl_dispatch_stub_754 mgl_dispatch_stub_754
+#define gl_dispatch_stub_755 mgl_dispatch_stub_755
+#define gl_dispatch_stub_773 mgl_dispatch_stub_773
 #define gl_dispatch_stub_776 mgl_dispatch_stub_776
 #define gl_dispatch_stub_777 mgl_dispatch_stub_777
 #define gl_dispatch_stub_778 mgl_dispatch_stub_778
+#define gl_dispatch_stub_779 mgl_dispatch_stub_779
+#define gl_dispatch_stub_780 mgl_dispatch_stub_780
 #endif /* USE_MGL_NAMESPACE */
 
 
@@ -1196,39 +1200,39 @@ void GLAPIENTRY gl_dispatch_stub_363(GLenum target, GLenum pname, GLint * params
 void GLAPIENTRY gl_dispatch_stub_364(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid * values);
 void GLAPIENTRY gl_dispatch_stub_365(GLenum target, GLenum pname, GLfloat * params);
 void GLAPIENTRY gl_dispatch_stub_366(GLenum target, GLenum pname, GLint * params);
-void GLAPIENTRY gl_dispatch_stub_566(GLenum pname, GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_567(GLenum pname, GLint * params);
-void GLAPIENTRY gl_dispatch_stub_568(GLenum pname, GLfloat param);
-void GLAPIENTRY gl_dispatch_stub_569(GLenum pname, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_570(GLenum pname, GLint param);
-void GLAPIENTRY gl_dispatch_stub_571(GLenum pname, const GLint * params);
-void GLAPIENTRY gl_dispatch_stub_572(GLclampf value, GLboolean invert);
-void GLAPIENTRY gl_dispatch_stub_573(GLenum pattern);
-void GLAPIENTRY gl_dispatch_stub_584(GLenum pname, GLdouble * params);
-void GLAPIENTRY gl_dispatch_stub_585(GLenum pname, GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_610(GLenum mode);
-void GLAPIENTRY gl_dispatch_stub_652(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
-void GLAPIENTRY gl_dispatch_stub_653(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
-void GLAPIENTRY gl_dispatch_stub_654(GLsizei n, const GLuint * fences);
-void GLAPIENTRY gl_dispatch_stub_655(GLuint fence);
-void GLAPIENTRY gl_dispatch_stub_656(GLsizei n, GLuint * fences);
-void GLAPIENTRY gl_dispatch_stub_657(GLuint fence, GLenum pname, GLint * params);
-GLboolean GLAPIENTRY gl_dispatch_stub_658(GLuint fence);
-void GLAPIENTRY gl_dispatch_stub_659(GLuint fence, GLenum condition);
+void GLAPIENTRY gl_dispatch_stub_568(GLenum pname, GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_569(GLenum pname, GLint * params);
+void GLAPIENTRY gl_dispatch_stub_570(GLenum pname, GLfloat param);
+void GLAPIENTRY gl_dispatch_stub_571(GLenum pname, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_572(GLenum pname, GLint param);
+void GLAPIENTRY gl_dispatch_stub_573(GLenum pname, const GLint * params);
+void GLAPIENTRY gl_dispatch_stub_574(GLclampf value, GLboolean invert);
+void GLAPIENTRY gl_dispatch_stub_575(GLenum pattern);
+void GLAPIENTRY gl_dispatch_stub_586(GLenum pname, GLdouble * params);
+void GLAPIENTRY gl_dispatch_stub_587(GLenum pname, GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_612(GLenum mode);
+void GLAPIENTRY gl_dispatch_stub_654(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
+void GLAPIENTRY gl_dispatch_stub_655(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
+void GLAPIENTRY gl_dispatch_stub_656(GLsizei n, const GLuint * fences);
+void GLAPIENTRY gl_dispatch_stub_657(GLuint fence);
+void GLAPIENTRY gl_dispatch_stub_658(GLsizei n, GLuint * fences);
+void GLAPIENTRY gl_dispatch_stub_659(GLuint fence, GLenum pname, GLint * params);
 GLboolean GLAPIENTRY gl_dispatch_stub_660(GLuint fence);
-void GLAPIENTRY gl_dispatch_stub_741(GLenum face);
-void GLAPIENTRY gl_dispatch_stub_742(GLuint array);
-void GLAPIENTRY gl_dispatch_stub_743(GLsizei n, const GLuint * arrays);
-void GLAPIENTRY gl_dispatch_stub_744(GLsizei n, GLuint * arrays);
-GLboolean GLAPIENTRY gl_dispatch_stub_745(GLuint array);
-void GLAPIENTRY gl_dispatch_stub_752(GLclampd zmin, GLclampd zmax);
-void GLAPIENTRY gl_dispatch_stub_753(GLenum modeRGB, GLenum modeA);
-void GLAPIENTRY gl_dispatch_stub_771(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-void GLAPIENTRY gl_dispatch_stub_774(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-void GLAPIENTRY gl_dispatch_stub_775(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_776(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_777(GLuint id, GLenum pname, GLint64EXT * params);
-void GLAPIENTRY gl_dispatch_stub_778(GLuint id, GLenum pname, GLuint64EXT * params);
+void GLAPIENTRY gl_dispatch_stub_661(GLuint fence, GLenum condition);
+GLboolean GLAPIENTRY gl_dispatch_stub_662(GLuint fence);
+void GLAPIENTRY gl_dispatch_stub_743(GLenum face);
+void GLAPIENTRY gl_dispatch_stub_744(GLuint array);
+void GLAPIENTRY gl_dispatch_stub_745(GLsizei n, const GLuint * arrays);
+void GLAPIENTRY gl_dispatch_stub_746(GLsizei n, GLuint * arrays);
+GLboolean GLAPIENTRY gl_dispatch_stub_747(GLuint array);
+void GLAPIENTRY gl_dispatch_stub_754(GLclampd zmin, GLclampd zmax);
+void GLAPIENTRY gl_dispatch_stub_755(GLenum modeRGB, GLenum modeA);
+void GLAPIENTRY gl_dispatch_stub_773(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+void GLAPIENTRY gl_dispatch_stub_776(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+void GLAPIENTRY gl_dispatch_stub_777(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_778(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_779(GLuint id, GLenum pname, GLint64EXT * params);
+void GLAPIENTRY gl_dispatch_stub_780(GLuint id, GLenum pname, GLuint64EXT * params);
 #endif /* defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING) */
 
 static const glprocs_table_t static_functions[] = {
@@ -1796,519 +1800,523 @@ static const glprocs_table_t static_functions[] = {
     NAME_FUNC_OFFSET( 8951, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, _gloffset_RenderbufferStorageMultisample),
     NAME_FUNC_OFFSET( 8984, glFlushMappedBufferRange, glFlushMappedBufferRange, NULL, _gloffset_FlushMappedBufferRange),
     NAME_FUNC_OFFSET( 9009, glMapBufferRange, glMapBufferRange, NULL, _gloffset_MapBufferRange),
-    NAME_FUNC_OFFSET( 9026, glCopyBufferSubData, glCopyBufferSubData, NULL, _gloffset_CopyBufferSubData),
-    NAME_FUNC_OFFSET( 9046, glPolygonOffsetEXT, glPolygonOffsetEXT, NULL, _gloffset_PolygonOffsetEXT),
-    NAME_FUNC_OFFSET( 9065, gl_dispatch_stub_566, gl_dispatch_stub_566, NULL, _gloffset_GetPixelTexGenParameterfvSGIS),
-    NAME_FUNC_OFFSET( 9097, gl_dispatch_stub_567, gl_dispatch_stub_567, NULL, _gloffset_GetPixelTexGenParameterivSGIS),
-    NAME_FUNC_OFFSET( 9129, gl_dispatch_stub_568, gl_dispatch_stub_568, NULL, _gloffset_PixelTexGenParameterfSGIS),
-    NAME_FUNC_OFFSET( 9157, gl_dispatch_stub_569, gl_dispatch_stub_569, NULL, _gloffset_PixelTexGenParameterfvSGIS),
-    NAME_FUNC_OFFSET( 9186, gl_dispatch_stub_570, gl_dispatch_stub_570, NULL, _gloffset_PixelTexGenParameteriSGIS),
-    NAME_FUNC_OFFSET( 9214, gl_dispatch_stub_571, gl_dispatch_stub_571, NULL, _gloffset_PixelTexGenParameterivSGIS),
-    NAME_FUNC_OFFSET( 9243, gl_dispatch_stub_572, gl_dispatch_stub_572, NULL, _gloffset_SampleMaskSGIS),
-    NAME_FUNC_OFFSET( 9260, gl_dispatch_stub_573, gl_dispatch_stub_573, NULL, _gloffset_SamplePatternSGIS),
-    NAME_FUNC_OFFSET( 9280, glColorPointerEXT, glColorPointerEXT, NULL, _gloffset_ColorPointerEXT),
-    NAME_FUNC_OFFSET( 9298, glEdgeFlagPointerEXT, glEdgeFlagPointerEXT, NULL, _gloffset_EdgeFlagPointerEXT),
-    NAME_FUNC_OFFSET( 9319, glIndexPointerEXT, glIndexPointerEXT, NULL, _gloffset_IndexPointerEXT),
-    NAME_FUNC_OFFSET( 9337, glNormalPointerEXT, glNormalPointerEXT, NULL, _gloffset_NormalPointerEXT),
-    NAME_FUNC_OFFSET( 9356, glTexCoordPointerEXT, glTexCoordPointerEXT, NULL, _gloffset_TexCoordPointerEXT),
-    NAME_FUNC_OFFSET( 9377, glVertexPointerEXT, glVertexPointerEXT, NULL, _gloffset_VertexPointerEXT),
-    NAME_FUNC_OFFSET( 9396, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET( 9417, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET( 9439, glLockArraysEXT, glLockArraysEXT, NULL, _gloffset_LockArraysEXT),
-    NAME_FUNC_OFFSET( 9455, glUnlockArraysEXT, glUnlockArraysEXT, NULL, _gloffset_UnlockArraysEXT),
-    NAME_FUNC_OFFSET( 9473, gl_dispatch_stub_584, gl_dispatch_stub_584, NULL, _gloffset_CullParameterdvEXT),
-    NAME_FUNC_OFFSET( 9494, gl_dispatch_stub_585, gl_dispatch_stub_585, NULL, _gloffset_CullParameterfvEXT),
-    NAME_FUNC_OFFSET( 9515, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
-    NAME_FUNC_OFFSET( 9537, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
-    NAME_FUNC_OFFSET( 9560, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
-    NAME_FUNC_OFFSET( 9582, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
-    NAME_FUNC_OFFSET( 9605, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
-    NAME_FUNC_OFFSET( 9627, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
-    NAME_FUNC_OFFSET( 9650, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
-    NAME_FUNC_OFFSET( 9672, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
-    NAME_FUNC_OFFSET( 9695, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
-    NAME_FUNC_OFFSET( 9717, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
-    NAME_FUNC_OFFSET( 9740, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
-    NAME_FUNC_OFFSET( 9763, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
-    NAME_FUNC_OFFSET( 9787, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
-    NAME_FUNC_OFFSET( 9810, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
-    NAME_FUNC_OFFSET( 9834, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
-    NAME_FUNC_OFFSET( 9857, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
-    NAME_FUNC_OFFSET( 9881, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
-    NAME_FUNC_OFFSET( 9908, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
-    NAME_FUNC_OFFSET( 9929, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
-    NAME_FUNC_OFFSET( 9952, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
-    NAME_FUNC_OFFSET( 9973, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
-    NAME_FUNC_OFFSET( 9988, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
-    NAME_FUNC_OFFSET(10004, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
-    NAME_FUNC_OFFSET(10019, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
-    NAME_FUNC_OFFSET(10035, gl_dispatch_stub_610, gl_dispatch_stub_610, NULL, _gloffset_PixelTexGenSGIX),
-    NAME_FUNC_OFFSET(10053, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
-    NAME_FUNC_OFFSET(10076, glFlushVertexArrayRangeNV, glFlushVertexArrayRangeNV, NULL, _gloffset_FlushVertexArrayRangeNV),
-    NAME_FUNC_OFFSET(10102, glVertexArrayRangeNV, glVertexArrayRangeNV, NULL, _gloffset_VertexArrayRangeNV),
-    NAME_FUNC_OFFSET(10123, glCombinerInputNV, glCombinerInputNV, NULL, _gloffset_CombinerInputNV),
-    NAME_FUNC_OFFSET(10141, glCombinerOutputNV, glCombinerOutputNV, NULL, _gloffset_CombinerOutputNV),
-    NAME_FUNC_OFFSET(10160, glCombinerParameterfNV, glCombinerParameterfNV, NULL, _gloffset_CombinerParameterfNV),
-    NAME_FUNC_OFFSET(10183, glCombinerParameterfvNV, glCombinerParameterfvNV, NULL, _gloffset_CombinerParameterfvNV),
-    NAME_FUNC_OFFSET(10207, glCombinerParameteriNV, glCombinerParameteriNV, NULL, _gloffset_CombinerParameteriNV),
-    NAME_FUNC_OFFSET(10230, glCombinerParameterivNV, glCombinerParameterivNV, NULL, _gloffset_CombinerParameterivNV),
-    NAME_FUNC_OFFSET(10254, glFinalCombinerInputNV, glFinalCombinerInputNV, NULL, _gloffset_FinalCombinerInputNV),
-    NAME_FUNC_OFFSET(10277, glGetCombinerInputParameterfvNV, glGetCombinerInputParameterfvNV, NULL, _gloffset_GetCombinerInputParameterfvNV),
-    NAME_FUNC_OFFSET(10309, glGetCombinerInputParameterivNV, glGetCombinerInputParameterivNV, NULL, _gloffset_GetCombinerInputParameterivNV),
-    NAME_FUNC_OFFSET(10341, glGetCombinerOutputParameterfvNV, glGetCombinerOutputParameterfvNV, NULL, _gloffset_GetCombinerOutputParameterfvNV),
-    NAME_FUNC_OFFSET(10374, glGetCombinerOutputParameterivNV, glGetCombinerOutputParameterivNV, NULL, _gloffset_GetCombinerOutputParameterivNV),
-    NAME_FUNC_OFFSET(10407, glGetFinalCombinerInputParameterfvNV, glGetFinalCombinerInputParameterfvNV, NULL, _gloffset_GetFinalCombinerInputParameterfvNV),
-    NAME_FUNC_OFFSET(10444, glGetFinalCombinerInputParameterivNV, glGetFinalCombinerInputParameterivNV, NULL, _gloffset_GetFinalCombinerInputParameterivNV),
-    NAME_FUNC_OFFSET(10481, glResizeBuffersMESA, glResizeBuffersMESA, NULL, _gloffset_ResizeBuffersMESA),
-    NAME_FUNC_OFFSET(10501, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
-    NAME_FUNC_OFFSET(10519, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
-    NAME_FUNC_OFFSET(10538, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
-    NAME_FUNC_OFFSET(10556, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
-    NAME_FUNC_OFFSET(10575, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
-    NAME_FUNC_OFFSET(10593, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
-    NAME_FUNC_OFFSET(10612, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
-    NAME_FUNC_OFFSET(10630, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
-    NAME_FUNC_OFFSET(10649, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
-    NAME_FUNC_OFFSET(10667, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
-    NAME_FUNC_OFFSET(10686, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
-    NAME_FUNC_OFFSET(10704, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
-    NAME_FUNC_OFFSET(10723, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
-    NAME_FUNC_OFFSET(10741, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
-    NAME_FUNC_OFFSET(10760, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
-    NAME_FUNC_OFFSET(10778, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
-    NAME_FUNC_OFFSET(10797, glWindowPos4dMESA, glWindowPos4dMESA, NULL, _gloffset_WindowPos4dMESA),
-    NAME_FUNC_OFFSET(10815, glWindowPos4dvMESA, glWindowPos4dvMESA, NULL, _gloffset_WindowPos4dvMESA),
-    NAME_FUNC_OFFSET(10834, glWindowPos4fMESA, glWindowPos4fMESA, NULL, _gloffset_WindowPos4fMESA),
-    NAME_FUNC_OFFSET(10852, glWindowPos4fvMESA, glWindowPos4fvMESA, NULL, _gloffset_WindowPos4fvMESA),
-    NAME_FUNC_OFFSET(10871, glWindowPos4iMESA, glWindowPos4iMESA, NULL, _gloffset_WindowPos4iMESA),
-    NAME_FUNC_OFFSET(10889, glWindowPos4ivMESA, glWindowPos4ivMESA, NULL, _gloffset_WindowPos4ivMESA),
-    NAME_FUNC_OFFSET(10908, glWindowPos4sMESA, glWindowPos4sMESA, NULL, _gloffset_WindowPos4sMESA),
-    NAME_FUNC_OFFSET(10926, glWindowPos4svMESA, glWindowPos4svMESA, NULL, _gloffset_WindowPos4svMESA),
-    NAME_FUNC_OFFSET(10945, gl_dispatch_stub_652, gl_dispatch_stub_652, NULL, _gloffset_MultiModeDrawArraysIBM),
-    NAME_FUNC_OFFSET(10970, gl_dispatch_stub_653, gl_dispatch_stub_653, NULL, _gloffset_MultiModeDrawElementsIBM),
-    NAME_FUNC_OFFSET(10997, gl_dispatch_stub_654, gl_dispatch_stub_654, NULL, _gloffset_DeleteFencesNV),
-    NAME_FUNC_OFFSET(11014, gl_dispatch_stub_655, gl_dispatch_stub_655, NULL, _gloffset_FinishFenceNV),
-    NAME_FUNC_OFFSET(11030, gl_dispatch_stub_656, gl_dispatch_stub_656, NULL, _gloffset_GenFencesNV),
-    NAME_FUNC_OFFSET(11044, gl_dispatch_stub_657, gl_dispatch_stub_657, NULL, _gloffset_GetFenceivNV),
-    NAME_FUNC_OFFSET(11059, gl_dispatch_stub_658, gl_dispatch_stub_658, NULL, _gloffset_IsFenceNV),
-    NAME_FUNC_OFFSET(11071, gl_dispatch_stub_659, gl_dispatch_stub_659, NULL, _gloffset_SetFenceNV),
-    NAME_FUNC_OFFSET(11084, gl_dispatch_stub_660, gl_dispatch_stub_660, NULL, _gloffset_TestFenceNV),
-    NAME_FUNC_OFFSET(11098, glAreProgramsResidentNV, glAreProgramsResidentNV, NULL, _gloffset_AreProgramsResidentNV),
-    NAME_FUNC_OFFSET(11122, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
-    NAME_FUNC_OFFSET(11138, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
-    NAME_FUNC_OFFSET(11157, glExecuteProgramNV, glExecuteProgramNV, NULL, _gloffset_ExecuteProgramNV),
-    NAME_FUNC_OFFSET(11176, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
-    NAME_FUNC_OFFSET(11192, glGetProgramParameterdvNV, glGetProgramParameterdvNV, NULL, _gloffset_GetProgramParameterdvNV),
-    NAME_FUNC_OFFSET(11218, glGetProgramParameterfvNV, glGetProgramParameterfvNV, NULL, _gloffset_GetProgramParameterfvNV),
-    NAME_FUNC_OFFSET(11244, glGetProgramStringNV, glGetProgramStringNV, NULL, _gloffset_GetProgramStringNV),
-    NAME_FUNC_OFFSET(11265, glGetProgramivNV, glGetProgramivNV, NULL, _gloffset_GetProgramivNV),
-    NAME_FUNC_OFFSET(11282, glGetTrackMatrixivNV, glGetTrackMatrixivNV, NULL, _gloffset_GetTrackMatrixivNV),
-    NAME_FUNC_OFFSET(11303, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
-    NAME_FUNC_OFFSET(11331, glGetVertexAttribdvNV, glGetVertexAttribdvNV, NULL, _gloffset_GetVertexAttribdvNV),
-    NAME_FUNC_OFFSET(11353, glGetVertexAttribfvNV, glGetVertexAttribfvNV, NULL, _gloffset_GetVertexAttribfvNV),
-    NAME_FUNC_OFFSET(11375, glGetVertexAttribivNV, glGetVertexAttribivNV, NULL, _gloffset_GetVertexAttribivNV),
-    NAME_FUNC_OFFSET(11397, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
-    NAME_FUNC_OFFSET(11411, glLoadProgramNV, glLoadProgramNV, NULL, _gloffset_LoadProgramNV),
-    NAME_FUNC_OFFSET(11427, glProgramParameters4dvNV, glProgramParameters4dvNV, NULL, _gloffset_ProgramParameters4dvNV),
-    NAME_FUNC_OFFSET(11452, glProgramParameters4fvNV, glProgramParameters4fvNV, NULL, _gloffset_ProgramParameters4fvNV),
-    NAME_FUNC_OFFSET(11477, glRequestResidentProgramsNV, glRequestResidentProgramsNV, NULL, _gloffset_RequestResidentProgramsNV),
-    NAME_FUNC_OFFSET(11505, glTrackMatrixNV, glTrackMatrixNV, NULL, _gloffset_TrackMatrixNV),
-    NAME_FUNC_OFFSET(11521, glVertexAttrib1dNV, glVertexAttrib1dNV, NULL, _gloffset_VertexAttrib1dNV),
-    NAME_FUNC_OFFSET(11540, glVertexAttrib1dvNV, glVertexAttrib1dvNV, NULL, _gloffset_VertexAttrib1dvNV),
-    NAME_FUNC_OFFSET(11560, glVertexAttrib1fNV, glVertexAttrib1fNV, NULL, _gloffset_VertexAttrib1fNV),
-    NAME_FUNC_OFFSET(11579, glVertexAttrib1fvNV, glVertexAttrib1fvNV, NULL, _gloffset_VertexAttrib1fvNV),
-    NAME_FUNC_OFFSET(11599, glVertexAttrib1sNV, glVertexAttrib1sNV, NULL, _gloffset_VertexAttrib1sNV),
-    NAME_FUNC_OFFSET(11618, glVertexAttrib1svNV, glVertexAttrib1svNV, NULL, _gloffset_VertexAttrib1svNV),
-    NAME_FUNC_OFFSET(11638, glVertexAttrib2dNV, glVertexAttrib2dNV, NULL, _gloffset_VertexAttrib2dNV),
-    NAME_FUNC_OFFSET(11657, glVertexAttrib2dvNV, glVertexAttrib2dvNV, NULL, _gloffset_VertexAttrib2dvNV),
-    NAME_FUNC_OFFSET(11677, glVertexAttrib2fNV, glVertexAttrib2fNV, NULL, _gloffset_VertexAttrib2fNV),
-    NAME_FUNC_OFFSET(11696, glVertexAttrib2fvNV, glVertexAttrib2fvNV, NULL, _gloffset_VertexAttrib2fvNV),
-    NAME_FUNC_OFFSET(11716, glVertexAttrib2sNV, glVertexAttrib2sNV, NULL, _gloffset_VertexAttrib2sNV),
-    NAME_FUNC_OFFSET(11735, glVertexAttrib2svNV, glVertexAttrib2svNV, NULL, _gloffset_VertexAttrib2svNV),
-    NAME_FUNC_OFFSET(11755, glVertexAttrib3dNV, glVertexAttrib3dNV, NULL, _gloffset_VertexAttrib3dNV),
-    NAME_FUNC_OFFSET(11774, glVertexAttrib3dvNV, glVertexAttrib3dvNV, NULL, _gloffset_VertexAttrib3dvNV),
-    NAME_FUNC_OFFSET(11794, glVertexAttrib3fNV, glVertexAttrib3fNV, NULL, _gloffset_VertexAttrib3fNV),
-    NAME_FUNC_OFFSET(11813, glVertexAttrib3fvNV, glVertexAttrib3fvNV, NULL, _gloffset_VertexAttrib3fvNV),
-    NAME_FUNC_OFFSET(11833, glVertexAttrib3sNV, glVertexAttrib3sNV, NULL, _gloffset_VertexAttrib3sNV),
-    NAME_FUNC_OFFSET(11852, glVertexAttrib3svNV, glVertexAttrib3svNV, NULL, _gloffset_VertexAttrib3svNV),
-    NAME_FUNC_OFFSET(11872, glVertexAttrib4dNV, glVertexAttrib4dNV, NULL, _gloffset_VertexAttrib4dNV),
-    NAME_FUNC_OFFSET(11891, glVertexAttrib4dvNV, glVertexAttrib4dvNV, NULL, _gloffset_VertexAttrib4dvNV),
-    NAME_FUNC_OFFSET(11911, glVertexAttrib4fNV, glVertexAttrib4fNV, NULL, _gloffset_VertexAttrib4fNV),
-    NAME_FUNC_OFFSET(11930, glVertexAttrib4fvNV, glVertexAttrib4fvNV, NULL, _gloffset_VertexAttrib4fvNV),
-    NAME_FUNC_OFFSET(11950, glVertexAttrib4sNV, glVertexAttrib4sNV, NULL, _gloffset_VertexAttrib4sNV),
-    NAME_FUNC_OFFSET(11969, glVertexAttrib4svNV, glVertexAttrib4svNV, NULL, _gloffset_VertexAttrib4svNV),
-    NAME_FUNC_OFFSET(11989, glVertexAttrib4ubNV, glVertexAttrib4ubNV, NULL, _gloffset_VertexAttrib4ubNV),
-    NAME_FUNC_OFFSET(12009, glVertexAttrib4ubvNV, glVertexAttrib4ubvNV, NULL, _gloffset_VertexAttrib4ubvNV),
-    NAME_FUNC_OFFSET(12030, glVertexAttribPointerNV, glVertexAttribPointerNV, NULL, _gloffset_VertexAttribPointerNV),
-    NAME_FUNC_OFFSET(12054, glVertexAttribs1dvNV, glVertexAttribs1dvNV, NULL, _gloffset_VertexAttribs1dvNV),
-    NAME_FUNC_OFFSET(12075, glVertexAttribs1fvNV, glVertexAttribs1fvNV, NULL, _gloffset_VertexAttribs1fvNV),
-    NAME_FUNC_OFFSET(12096, glVertexAttribs1svNV, glVertexAttribs1svNV, NULL, _gloffset_VertexAttribs1svNV),
-    NAME_FUNC_OFFSET(12117, glVertexAttribs2dvNV, glVertexAttribs2dvNV, NULL, _gloffset_VertexAttribs2dvNV),
-    NAME_FUNC_OFFSET(12138, glVertexAttribs2fvNV, glVertexAttribs2fvNV, NULL, _gloffset_VertexAttribs2fvNV),
-    NAME_FUNC_OFFSET(12159, glVertexAttribs2svNV, glVertexAttribs2svNV, NULL, _gloffset_VertexAttribs2svNV),
-    NAME_FUNC_OFFSET(12180, glVertexAttribs3dvNV, glVertexAttribs3dvNV, NULL, _gloffset_VertexAttribs3dvNV),
-    NAME_FUNC_OFFSET(12201, glVertexAttribs3fvNV, glVertexAttribs3fvNV, NULL, _gloffset_VertexAttribs3fvNV),
-    NAME_FUNC_OFFSET(12222, glVertexAttribs3svNV, glVertexAttribs3svNV, NULL, _gloffset_VertexAttribs3svNV),
-    NAME_FUNC_OFFSET(12243, glVertexAttribs4dvNV, glVertexAttribs4dvNV, NULL, _gloffset_VertexAttribs4dvNV),
-    NAME_FUNC_OFFSET(12264, glVertexAttribs4fvNV, glVertexAttribs4fvNV, NULL, _gloffset_VertexAttribs4fvNV),
-    NAME_FUNC_OFFSET(12285, glVertexAttribs4svNV, glVertexAttribs4svNV, NULL, _gloffset_VertexAttribs4svNV),
-    NAME_FUNC_OFFSET(12306, glVertexAttribs4ubvNV, glVertexAttribs4ubvNV, NULL, _gloffset_VertexAttribs4ubvNV),
-    NAME_FUNC_OFFSET(12328, glGetTexBumpParameterfvATI, glGetTexBumpParameterfvATI, NULL, _gloffset_GetTexBumpParameterfvATI),
-    NAME_FUNC_OFFSET(12355, glGetTexBumpParameterivATI, glGetTexBumpParameterivATI, NULL, _gloffset_GetTexBumpParameterivATI),
-    NAME_FUNC_OFFSET(12382, glTexBumpParameterfvATI, glTexBumpParameterfvATI, NULL, _gloffset_TexBumpParameterfvATI),
-    NAME_FUNC_OFFSET(12406, glTexBumpParameterivATI, glTexBumpParameterivATI, NULL, _gloffset_TexBumpParameterivATI),
-    NAME_FUNC_OFFSET(12430, glAlphaFragmentOp1ATI, glAlphaFragmentOp1ATI, NULL, _gloffset_AlphaFragmentOp1ATI),
-    NAME_FUNC_OFFSET(12452, glAlphaFragmentOp2ATI, glAlphaFragmentOp2ATI, NULL, _gloffset_AlphaFragmentOp2ATI),
-    NAME_FUNC_OFFSET(12474, glAlphaFragmentOp3ATI, glAlphaFragmentOp3ATI, NULL, _gloffset_AlphaFragmentOp3ATI),
-    NAME_FUNC_OFFSET(12496, glBeginFragmentShaderATI, glBeginFragmentShaderATI, NULL, _gloffset_BeginFragmentShaderATI),
-    NAME_FUNC_OFFSET(12521, glBindFragmentShaderATI, glBindFragmentShaderATI, NULL, _gloffset_BindFragmentShaderATI),
-    NAME_FUNC_OFFSET(12545, glColorFragmentOp1ATI, glColorFragmentOp1ATI, NULL, _gloffset_ColorFragmentOp1ATI),
-    NAME_FUNC_OFFSET(12567, glColorFragmentOp2ATI, glColorFragmentOp2ATI, NULL, _gloffset_ColorFragmentOp2ATI),
-    NAME_FUNC_OFFSET(12589, glColorFragmentOp3ATI, glColorFragmentOp3ATI, NULL, _gloffset_ColorFragmentOp3ATI),
-    NAME_FUNC_OFFSET(12611, glDeleteFragmentShaderATI, glDeleteFragmentShaderATI, NULL, _gloffset_DeleteFragmentShaderATI),
-    NAME_FUNC_OFFSET(12637, glEndFragmentShaderATI, glEndFragmentShaderATI, NULL, _gloffset_EndFragmentShaderATI),
-    NAME_FUNC_OFFSET(12660, glGenFragmentShadersATI, glGenFragmentShadersATI, NULL, _gloffset_GenFragmentShadersATI),
-    NAME_FUNC_OFFSET(12684, glPassTexCoordATI, glPassTexCoordATI, NULL, _gloffset_PassTexCoordATI),
-    NAME_FUNC_OFFSET(12702, glSampleMapATI, glSampleMapATI, NULL, _gloffset_SampleMapATI),
-    NAME_FUNC_OFFSET(12717, glSetFragmentShaderConstantATI, glSetFragmentShaderConstantATI, NULL, _gloffset_SetFragmentShaderConstantATI),
-    NAME_FUNC_OFFSET(12748, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
-    NAME_FUNC_OFFSET(12768, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
-    NAME_FUNC_OFFSET(12789, gl_dispatch_stub_741, gl_dispatch_stub_741, NULL, _gloffset_ActiveStencilFaceEXT),
-    NAME_FUNC_OFFSET(12812, gl_dispatch_stub_742, gl_dispatch_stub_742, NULL, _gloffset_BindVertexArrayAPPLE),
-    NAME_FUNC_OFFSET(12835, gl_dispatch_stub_743, gl_dispatch_stub_743, NULL, _gloffset_DeleteVertexArraysAPPLE),
-    NAME_FUNC_OFFSET(12861, gl_dispatch_stub_744, gl_dispatch_stub_744, NULL, _gloffset_GenVertexArraysAPPLE),
-    NAME_FUNC_OFFSET(12884, gl_dispatch_stub_745, gl_dispatch_stub_745, NULL, _gloffset_IsVertexArrayAPPLE),
-    NAME_FUNC_OFFSET(12905, glGetProgramNamedParameterdvNV, glGetProgramNamedParameterdvNV, NULL, _gloffset_GetProgramNamedParameterdvNV),
-    NAME_FUNC_OFFSET(12936, glGetProgramNamedParameterfvNV, glGetProgramNamedParameterfvNV, NULL, _gloffset_GetProgramNamedParameterfvNV),
-    NAME_FUNC_OFFSET(12967, glProgramNamedParameter4dNV, glProgramNamedParameter4dNV, NULL, _gloffset_ProgramNamedParameter4dNV),
-    NAME_FUNC_OFFSET(12995, glProgramNamedParameter4dvNV, glProgramNamedParameter4dvNV, NULL, _gloffset_ProgramNamedParameter4dvNV),
-    NAME_FUNC_OFFSET(13024, glProgramNamedParameter4fNV, glProgramNamedParameter4fNV, NULL, _gloffset_ProgramNamedParameter4fNV),
-    NAME_FUNC_OFFSET(13052, glProgramNamedParameter4fvNV, glProgramNamedParameter4fvNV, NULL, _gloffset_ProgramNamedParameter4fvNV),
-    NAME_FUNC_OFFSET(13081, gl_dispatch_stub_752, gl_dispatch_stub_752, NULL, _gloffset_DepthBoundsEXT),
-    NAME_FUNC_OFFSET(13098, gl_dispatch_stub_753, gl_dispatch_stub_753, NULL, _gloffset_BlendEquationSeparateEXT),
-    NAME_FUNC_OFFSET(13125, glBindFramebufferEXT, glBindFramebufferEXT, NULL, _gloffset_BindFramebufferEXT),
-    NAME_FUNC_OFFSET(13146, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, _gloffset_BindRenderbufferEXT),
-    NAME_FUNC_OFFSET(13168, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, _gloffset_CheckFramebufferStatusEXT),
-    NAME_FUNC_OFFSET(13196, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, _gloffset_DeleteFramebuffersEXT),
-    NAME_FUNC_OFFSET(13220, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, _gloffset_DeleteRenderbuffersEXT),
-    NAME_FUNC_OFFSET(13245, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, _gloffset_FramebufferRenderbufferEXT),
-    NAME_FUNC_OFFSET(13274, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, _gloffset_FramebufferTexture1DEXT),
-    NAME_FUNC_OFFSET(13300, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, _gloffset_FramebufferTexture2DEXT),
-    NAME_FUNC_OFFSET(13326, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, _gloffset_FramebufferTexture3DEXT),
-    NAME_FUNC_OFFSET(13352, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, _gloffset_GenFramebuffersEXT),
-    NAME_FUNC_OFFSET(13373, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, _gloffset_GenRenderbuffersEXT),
-    NAME_FUNC_OFFSET(13395, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, _gloffset_GenerateMipmapEXT),
-    NAME_FUNC_OFFSET(13415, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, _gloffset_GetFramebufferAttachmentParameterivEXT),
-    NAME_FUNC_OFFSET(13456, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, _gloffset_GetRenderbufferParameterivEXT),
-    NAME_FUNC_OFFSET(13488, glIsFramebufferEXT, glIsFramebufferEXT, NULL, _gloffset_IsFramebufferEXT),
-    NAME_FUNC_OFFSET(13507, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, _gloffset_IsRenderbufferEXT),
-    NAME_FUNC_OFFSET(13527, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, _gloffset_RenderbufferStorageEXT),
-    NAME_FUNC_OFFSET(13552, gl_dispatch_stub_771, gl_dispatch_stub_771, NULL, _gloffset_BlitFramebufferEXT),
-    NAME_FUNC_OFFSET(13573, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
-    NAME_FUNC_OFFSET(13602, glProvokingVertexEXT, glProvokingVertexEXT, NULL, _gloffset_ProvokingVertexEXT),
-    NAME_FUNC_OFFSET(13623, gl_dispatch_stub_774, gl_dispatch_stub_774, NULL, _gloffset_StencilFuncSeparateATI),
-    NAME_FUNC_OFFSET(13648, gl_dispatch_stub_775, gl_dispatch_stub_775, NULL, _gloffset_ProgramEnvParameters4fvEXT),
-    NAME_FUNC_OFFSET(13677, gl_dispatch_stub_776, gl_dispatch_stub_776, NULL, _gloffset_ProgramLocalParameters4fvEXT),
-    NAME_FUNC_OFFSET(13708, gl_dispatch_stub_777, gl_dispatch_stub_777, NULL, _gloffset_GetQueryObjecti64vEXT),
-    NAME_FUNC_OFFSET(13732, gl_dispatch_stub_778, gl_dispatch_stub_778, NULL, _gloffset_GetQueryObjectui64vEXT),
-    NAME_FUNC_OFFSET(13757, glArrayElement, glArrayElement, NULL, _gloffset_ArrayElement),
-    NAME_FUNC_OFFSET(13775, glBindTexture, glBindTexture, NULL, _gloffset_BindTexture),
-    NAME_FUNC_OFFSET(13792, glDrawArrays, glDrawArrays, NULL, _gloffset_DrawArrays),
-    NAME_FUNC_OFFSET(13808, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, _gloffset_AreTexturesResident),
-    NAME_FUNC_OFFSET(13833, glCopyTexImage1D, glCopyTexImage1D, NULL, _gloffset_CopyTexImage1D),
-    NAME_FUNC_OFFSET(13853, glCopyTexImage2D, glCopyTexImage2D, NULL, _gloffset_CopyTexImage2D),
-    NAME_FUNC_OFFSET(13873, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, _gloffset_CopyTexSubImage1D),
-    NAME_FUNC_OFFSET(13896, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, _gloffset_CopyTexSubImage2D),
-    NAME_FUNC_OFFSET(13919, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, _gloffset_DeleteTextures),
-    NAME_FUNC_OFFSET(13939, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, _gloffset_GenTextures),
-    NAME_FUNC_OFFSET(13956, glGetPointerv, glGetPointerv, NULL, _gloffset_GetPointerv),
-    NAME_FUNC_OFFSET(13973, glIsTexture, glIsTextureEXT, glIsTextureEXT, _gloffset_IsTexture),
-    NAME_FUNC_OFFSET(13988, glPrioritizeTextures, glPrioritizeTextures, NULL, _gloffset_PrioritizeTextures),
-    NAME_FUNC_OFFSET(14012, glTexSubImage1D, glTexSubImage1D, NULL, _gloffset_TexSubImage1D),
-    NAME_FUNC_OFFSET(14031, glTexSubImage2D, glTexSubImage2D, NULL, _gloffset_TexSubImage2D),
-    NAME_FUNC_OFFSET(14050, glBlendColor, glBlendColor, NULL, _gloffset_BlendColor),
-    NAME_FUNC_OFFSET(14066, glBlendEquation, glBlendEquation, NULL, _gloffset_BlendEquation),
-    NAME_FUNC_OFFSET(14085, glDrawRangeElements, glDrawRangeElements, NULL, _gloffset_DrawRangeElements),
-    NAME_FUNC_OFFSET(14108, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
-    NAME_FUNC_OFFSET(14124, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
-    NAME_FUNC_OFFSET(14140, glColorTableParameterfv, glColorTableParameterfv, NULL, _gloffset_ColorTableParameterfv),
-    NAME_FUNC_OFFSET(14167, glColorTableParameteriv, glColorTableParameteriv, NULL, _gloffset_ColorTableParameteriv),
-    NAME_FUNC_OFFSET(14194, glCopyColorTable, glCopyColorTable, NULL, _gloffset_CopyColorTable),
-    NAME_FUNC_OFFSET(14214, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
-    NAME_FUNC_OFFSET(14233, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
-    NAME_FUNC_OFFSET(14252, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
-    NAME_FUNC_OFFSET(14282, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
-    NAME_FUNC_OFFSET(14312, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
-    NAME_FUNC_OFFSET(14342, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
-    NAME_FUNC_OFFSET(14372, glColorSubTable, glColorSubTable, NULL, _gloffset_ColorSubTable),
-    NAME_FUNC_OFFSET(14391, glCopyColorSubTable, glCopyColorSubTable, NULL, _gloffset_CopyColorSubTable),
-    NAME_FUNC_OFFSET(14414, glConvolutionFilter1D, glConvolutionFilter1D, NULL, _gloffset_ConvolutionFilter1D),
-    NAME_FUNC_OFFSET(14439, glConvolutionFilter2D, glConvolutionFilter2D, NULL, _gloffset_ConvolutionFilter2D),
-    NAME_FUNC_OFFSET(14464, glConvolutionParameterf, glConvolutionParameterf, NULL, _gloffset_ConvolutionParameterf),
-    NAME_FUNC_OFFSET(14491, glConvolutionParameterfv, glConvolutionParameterfv, NULL, _gloffset_ConvolutionParameterfv),
-    NAME_FUNC_OFFSET(14519, glConvolutionParameteri, glConvolutionParameteri, NULL, _gloffset_ConvolutionParameteri),
-    NAME_FUNC_OFFSET(14546, glConvolutionParameteriv, glConvolutionParameteriv, NULL, _gloffset_ConvolutionParameteriv),
-    NAME_FUNC_OFFSET(14574, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, _gloffset_CopyConvolutionFilter1D),
-    NAME_FUNC_OFFSET(14603, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, _gloffset_CopyConvolutionFilter2D),
-    NAME_FUNC_OFFSET(14632, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, _gloffset_GetConvolutionFilter),
-    NAME_FUNC_OFFSET(14658, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, _gloffset_GetConvolutionParameterfv),
-    NAME_FUNC_OFFSET(14689, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, _gloffset_GetConvolutionParameteriv),
-    NAME_FUNC_OFFSET(14720, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, _gloffset_GetSeparableFilter),
-    NAME_FUNC_OFFSET(14744, glSeparableFilter2D, glSeparableFilter2D, NULL, _gloffset_SeparableFilter2D),
-    NAME_FUNC_OFFSET(14767, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, _gloffset_GetHistogram),
-    NAME_FUNC_OFFSET(14785, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, _gloffset_GetHistogramParameterfv),
-    NAME_FUNC_OFFSET(14814, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, _gloffset_GetHistogramParameteriv),
-    NAME_FUNC_OFFSET(14843, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, _gloffset_GetMinmax),
-    NAME_FUNC_OFFSET(14858, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, _gloffset_GetMinmaxParameterfv),
-    NAME_FUNC_OFFSET(14884, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, _gloffset_GetMinmaxParameteriv),
-    NAME_FUNC_OFFSET(14910, glHistogram, glHistogram, NULL, _gloffset_Histogram),
-    NAME_FUNC_OFFSET(14925, glMinmax, glMinmax, NULL, _gloffset_Minmax),
-    NAME_FUNC_OFFSET(14937, glResetHistogram, glResetHistogram, NULL, _gloffset_ResetHistogram),
-    NAME_FUNC_OFFSET(14957, glResetMinmax, glResetMinmax, NULL, _gloffset_ResetMinmax),
-    NAME_FUNC_OFFSET(14974, glTexImage3D, glTexImage3D, NULL, _gloffset_TexImage3D),
-    NAME_FUNC_OFFSET(14990, glTexSubImage3D, glTexSubImage3D, NULL, _gloffset_TexSubImage3D),
-    NAME_FUNC_OFFSET(15009, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, _gloffset_CopyTexSubImage3D),
-    NAME_FUNC_OFFSET(15032, glActiveTextureARB, glActiveTextureARB, NULL, _gloffset_ActiveTextureARB),
-    NAME_FUNC_OFFSET(15048, glClientActiveTextureARB, glClientActiveTextureARB, NULL, _gloffset_ClientActiveTextureARB),
-    NAME_FUNC_OFFSET(15070, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL, _gloffset_MultiTexCoord1dARB),
-    NAME_FUNC_OFFSET(15088, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL, _gloffset_MultiTexCoord1dvARB),
-    NAME_FUNC_OFFSET(15107, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, _gloffset_MultiTexCoord1fARB),
-    NAME_FUNC_OFFSET(15125, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, _gloffset_MultiTexCoord1fvARB),
-    NAME_FUNC_OFFSET(15144, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL, _gloffset_MultiTexCoord1iARB),
-    NAME_FUNC_OFFSET(15162, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL, _gloffset_MultiTexCoord1ivARB),
-    NAME_FUNC_OFFSET(15181, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL, _gloffset_MultiTexCoord1sARB),
-    NAME_FUNC_OFFSET(15199, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL, _gloffset_MultiTexCoord1svARB),
-    NAME_FUNC_OFFSET(15218, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL, _gloffset_MultiTexCoord2dARB),
-    NAME_FUNC_OFFSET(15236, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL, _gloffset_MultiTexCoord2dvARB),
-    NAME_FUNC_OFFSET(15255, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, _gloffset_MultiTexCoord2fARB),
-    NAME_FUNC_OFFSET(15273, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, _gloffset_MultiTexCoord2fvARB),
-    NAME_FUNC_OFFSET(15292, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL, _gloffset_MultiTexCoord2iARB),
-    NAME_FUNC_OFFSET(15310, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL, _gloffset_MultiTexCoord2ivARB),
-    NAME_FUNC_OFFSET(15329, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL, _gloffset_MultiTexCoord2sARB),
-    NAME_FUNC_OFFSET(15347, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL, _gloffset_MultiTexCoord2svARB),
-    NAME_FUNC_OFFSET(15366, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL, _gloffset_MultiTexCoord3dARB),
-    NAME_FUNC_OFFSET(15384, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL, _gloffset_MultiTexCoord3dvARB),
-    NAME_FUNC_OFFSET(15403, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, _gloffset_MultiTexCoord3fARB),
-    NAME_FUNC_OFFSET(15421, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, _gloffset_MultiTexCoord3fvARB),
-    NAME_FUNC_OFFSET(15440, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL, _gloffset_MultiTexCoord3iARB),
-    NAME_FUNC_OFFSET(15458, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL, _gloffset_MultiTexCoord3ivARB),
-    NAME_FUNC_OFFSET(15477, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL, _gloffset_MultiTexCoord3sARB),
-    NAME_FUNC_OFFSET(15495, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL, _gloffset_MultiTexCoord3svARB),
-    NAME_FUNC_OFFSET(15514, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL, _gloffset_MultiTexCoord4dARB),
-    NAME_FUNC_OFFSET(15532, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL, _gloffset_MultiTexCoord4dvARB),
-    NAME_FUNC_OFFSET(15551, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, _gloffset_MultiTexCoord4fARB),
-    NAME_FUNC_OFFSET(15569, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, _gloffset_MultiTexCoord4fvARB),
-    NAME_FUNC_OFFSET(15588, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL, _gloffset_MultiTexCoord4iARB),
-    NAME_FUNC_OFFSET(15606, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL, _gloffset_MultiTexCoord4ivARB),
-    NAME_FUNC_OFFSET(15625, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL, _gloffset_MultiTexCoord4sARB),
-    NAME_FUNC_OFFSET(15643, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL, _gloffset_MultiTexCoord4svARB),
-    NAME_FUNC_OFFSET(15662, glStencilOpSeparate, glStencilOpSeparate, NULL, _gloffset_StencilOpSeparate),
-    NAME_FUNC_OFFSET(15685, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, _gloffset_LoadTransposeMatrixdARB),
-    NAME_FUNC_OFFSET(15708, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, _gloffset_LoadTransposeMatrixfARB),
-    NAME_FUNC_OFFSET(15731, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, _gloffset_MultTransposeMatrixdARB),
-    NAME_FUNC_OFFSET(15754, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB, NULL, _gloffset_MultTransposeMatrixfARB),
-    NAME_FUNC_OFFSET(15777, glSampleCoverageARB, glSampleCoverageARB, NULL, _gloffset_SampleCoverageARB),
-    NAME_FUNC_OFFSET(15794, glCompressedTexImage1DARB, glCompressedTexImage1DARB, NULL, _gloffset_CompressedTexImage1DARB),
-    NAME_FUNC_OFFSET(15817, glCompressedTexImage2DARB, glCompressedTexImage2DARB, NULL, _gloffset_CompressedTexImage2DARB),
-    NAME_FUNC_OFFSET(15840, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, _gloffset_CompressedTexImage3DARB),
-    NAME_FUNC_OFFSET(15863, glCompressedTexSubImage1DARB, glCompressedTexSubImage1DARB, NULL, _gloffset_CompressedTexSubImage1DARB),
-    NAME_FUNC_OFFSET(15889, glCompressedTexSubImage2DARB, glCompressedTexSubImage2DARB, NULL, _gloffset_CompressedTexSubImage2DARB),
-    NAME_FUNC_OFFSET(15915, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, _gloffset_CompressedTexSubImage3DARB),
-    NAME_FUNC_OFFSET(15941, glGetCompressedTexImageARB, glGetCompressedTexImageARB, NULL, _gloffset_GetCompressedTexImageARB),
-    NAME_FUNC_OFFSET(15965, glDisableVertexAttribArrayARB, glDisableVertexAttribArrayARB, NULL, _gloffset_DisableVertexAttribArrayARB),
-    NAME_FUNC_OFFSET(15992, glEnableVertexAttribArrayARB, glEnableVertexAttribArrayARB, NULL, _gloffset_EnableVertexAttribArrayARB),
-    NAME_FUNC_OFFSET(16018, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL, _gloffset_GetVertexAttribdvARB),
-    NAME_FUNC_OFFSET(16038, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL, _gloffset_GetVertexAttribfvARB),
-    NAME_FUNC_OFFSET(16058, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL, _gloffset_GetVertexAttribivARB),
-    NAME_FUNC_OFFSET(16078, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, _gloffset_ProgramEnvParameter4dARB),
-    NAME_FUNC_OFFSET(16101, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, _gloffset_ProgramEnvParameter4dvARB),
-    NAME_FUNC_OFFSET(16125, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, _gloffset_ProgramEnvParameter4fARB),
-    NAME_FUNC_OFFSET(16148, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, _gloffset_ProgramEnvParameter4fvARB),
-    NAME_FUNC_OFFSET(16172, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, _gloffset_VertexAttrib1dARB),
-    NAME_FUNC_OFFSET(16189, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL, _gloffset_VertexAttrib1dvARB),
-    NAME_FUNC_OFFSET(16207, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, _gloffset_VertexAttrib1fARB),
-    NAME_FUNC_OFFSET(16224, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, _gloffset_VertexAttrib1fvARB),
-    NAME_FUNC_OFFSET(16242, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, _gloffset_VertexAttrib1sARB),
-    NAME_FUNC_OFFSET(16259, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL, _gloffset_VertexAttrib1svARB),
-    NAME_FUNC_OFFSET(16277, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, _gloffset_VertexAttrib2dARB),
-    NAME_FUNC_OFFSET(16294, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL, _gloffset_VertexAttrib2dvARB),
-    NAME_FUNC_OFFSET(16312, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, _gloffset_VertexAttrib2fARB),
-    NAME_FUNC_OFFSET(16329, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, _gloffset_VertexAttrib2fvARB),
-    NAME_FUNC_OFFSET(16347, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, _gloffset_VertexAttrib2sARB),
-    NAME_FUNC_OFFSET(16364, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL, _gloffset_VertexAttrib2svARB),
-    NAME_FUNC_OFFSET(16382, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, _gloffset_VertexAttrib3dARB),
-    NAME_FUNC_OFFSET(16399, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL, _gloffset_VertexAttrib3dvARB),
-    NAME_FUNC_OFFSET(16417, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, _gloffset_VertexAttrib3fARB),
-    NAME_FUNC_OFFSET(16434, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, _gloffset_VertexAttrib3fvARB),
-    NAME_FUNC_OFFSET(16452, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, _gloffset_VertexAttrib3sARB),
-    NAME_FUNC_OFFSET(16469, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL, _gloffset_VertexAttrib3svARB),
-    NAME_FUNC_OFFSET(16487, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL, _gloffset_VertexAttrib4NbvARB),
-    NAME_FUNC_OFFSET(16506, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL, _gloffset_VertexAttrib4NivARB),
-    NAME_FUNC_OFFSET(16525, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL, _gloffset_VertexAttrib4NsvARB),
-    NAME_FUNC_OFFSET(16544, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL, _gloffset_VertexAttrib4NubARB),
-    NAME_FUNC_OFFSET(16563, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, _gloffset_VertexAttrib4NubvARB),
-    NAME_FUNC_OFFSET(16583, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, _gloffset_VertexAttrib4NuivARB),
-    NAME_FUNC_OFFSET(16603, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, _gloffset_VertexAttrib4NusvARB),
-    NAME_FUNC_OFFSET(16623, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, _gloffset_VertexAttrib4bvARB),
-    NAME_FUNC_OFFSET(16641, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, _gloffset_VertexAttrib4dARB),
-    NAME_FUNC_OFFSET(16658, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, _gloffset_VertexAttrib4dvARB),
-    NAME_FUNC_OFFSET(16676, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, _gloffset_VertexAttrib4fARB),
-    NAME_FUNC_OFFSET(16693, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, _gloffset_VertexAttrib4fvARB),
-    NAME_FUNC_OFFSET(16711, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, _gloffset_VertexAttrib4ivARB),
-    NAME_FUNC_OFFSET(16729, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, _gloffset_VertexAttrib4sARB),
-    NAME_FUNC_OFFSET(16746, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, _gloffset_VertexAttrib4svARB),
-    NAME_FUNC_OFFSET(16764, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, _gloffset_VertexAttrib4ubvARB),
-    NAME_FUNC_OFFSET(16783, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, _gloffset_VertexAttrib4uivARB),
-    NAME_FUNC_OFFSET(16802, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, _gloffset_VertexAttrib4usvARB),
-    NAME_FUNC_OFFSET(16821, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, _gloffset_VertexAttribPointerARB),
-    NAME_FUNC_OFFSET(16843, glBindBufferARB, glBindBufferARB, NULL, _gloffset_BindBufferARB),
-    NAME_FUNC_OFFSET(16856, glBufferDataARB, glBufferDataARB, NULL, _gloffset_BufferDataARB),
-    NAME_FUNC_OFFSET(16869, glBufferSubDataARB, glBufferSubDataARB, NULL, _gloffset_BufferSubDataARB),
-    NAME_FUNC_OFFSET(16885, glDeleteBuffersARB, glDeleteBuffersARB, NULL, _gloffset_DeleteBuffersARB),
-    NAME_FUNC_OFFSET(16901, glGenBuffersARB, glGenBuffersARB, NULL, _gloffset_GenBuffersARB),
-    NAME_FUNC_OFFSET(16914, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, _gloffset_GetBufferParameterivARB),
-    NAME_FUNC_OFFSET(16937, glGetBufferPointervARB, glGetBufferPointervARB, NULL, _gloffset_GetBufferPointervARB),
-    NAME_FUNC_OFFSET(16957, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, _gloffset_GetBufferSubDataARB),
-    NAME_FUNC_OFFSET(16976, glIsBufferARB, glIsBufferARB, NULL, _gloffset_IsBufferARB),
-    NAME_FUNC_OFFSET(16987, glMapBufferARB, glMapBufferARB, NULL, _gloffset_MapBufferARB),
-    NAME_FUNC_OFFSET(16999, glUnmapBufferARB, glUnmapBufferARB, NULL, _gloffset_UnmapBufferARB),
-    NAME_FUNC_OFFSET(17013, glBeginQueryARB, glBeginQueryARB, NULL, _gloffset_BeginQueryARB),
-    NAME_FUNC_OFFSET(17026, glDeleteQueriesARB, glDeleteQueriesARB, NULL, _gloffset_DeleteQueriesARB),
-    NAME_FUNC_OFFSET(17042, glEndQueryARB, glEndQueryARB, NULL, _gloffset_EndQueryARB),
-    NAME_FUNC_OFFSET(17053, glGenQueriesARB, glGenQueriesARB, NULL, _gloffset_GenQueriesARB),
-    NAME_FUNC_OFFSET(17066, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, _gloffset_GetQueryObjectivARB),
-    NAME_FUNC_OFFSET(17085, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, _gloffset_GetQueryObjectuivARB),
-    NAME_FUNC_OFFSET(17105, glGetQueryivARB, glGetQueryivARB, NULL, _gloffset_GetQueryivARB),
-    NAME_FUNC_OFFSET(17118, glIsQueryARB, glIsQueryARB, NULL, _gloffset_IsQueryARB),
-    NAME_FUNC_OFFSET(17128, glCompileShaderARB, glCompileShaderARB, NULL, _gloffset_CompileShaderARB),
-    NAME_FUNC_OFFSET(17144, glGetActiveUniformARB, glGetActiveUniformARB, NULL, _gloffset_GetActiveUniformARB),
-    NAME_FUNC_OFFSET(17163, glGetShaderSourceARB, glGetShaderSourceARB, NULL, _gloffset_GetShaderSourceARB),
-    NAME_FUNC_OFFSET(17181, glGetUniformLocationARB, glGetUniformLocationARB, NULL, _gloffset_GetUniformLocationARB),
-    NAME_FUNC_OFFSET(17202, glGetUniformfvARB, glGetUniformfvARB, NULL, _gloffset_GetUniformfvARB),
-    NAME_FUNC_OFFSET(17217, glGetUniformivARB, glGetUniformivARB, NULL, _gloffset_GetUniformivARB),
-    NAME_FUNC_OFFSET(17232, glLinkProgramARB, glLinkProgramARB, NULL, _gloffset_LinkProgramARB),
-    NAME_FUNC_OFFSET(17246, glShaderSourceARB, glShaderSourceARB, NULL, _gloffset_ShaderSourceARB),
-    NAME_FUNC_OFFSET(17261, glUniform1fARB, glUniform1fARB, NULL, _gloffset_Uniform1fARB),
-    NAME_FUNC_OFFSET(17273, glUniform1fvARB, glUniform1fvARB, NULL, _gloffset_Uniform1fvARB),
-    NAME_FUNC_OFFSET(17286, glUniform1iARB, glUniform1iARB, NULL, _gloffset_Uniform1iARB),
-    NAME_FUNC_OFFSET(17298, glUniform1ivARB, glUniform1ivARB, NULL, _gloffset_Uniform1ivARB),
-    NAME_FUNC_OFFSET(17311, glUniform2fARB, glUniform2fARB, NULL, _gloffset_Uniform2fARB),
-    NAME_FUNC_OFFSET(17323, glUniform2fvARB, glUniform2fvARB, NULL, _gloffset_Uniform2fvARB),
-    NAME_FUNC_OFFSET(17336, glUniform2iARB, glUniform2iARB, NULL, _gloffset_Uniform2iARB),
-    NAME_FUNC_OFFSET(17348, glUniform2ivARB, glUniform2ivARB, NULL, _gloffset_Uniform2ivARB),
-    NAME_FUNC_OFFSET(17361, glUniform3fARB, glUniform3fARB, NULL, _gloffset_Uniform3fARB),
-    NAME_FUNC_OFFSET(17373, glUniform3fvARB, glUniform3fvARB, NULL, _gloffset_Uniform3fvARB),
-    NAME_FUNC_OFFSET(17386, glUniform3iARB, glUniform3iARB, NULL, _gloffset_Uniform3iARB),
-    NAME_FUNC_OFFSET(17398, glUniform3ivARB, glUniform3ivARB, NULL, _gloffset_Uniform3ivARB),
-    NAME_FUNC_OFFSET(17411, glUniform4fARB, glUniform4fARB, NULL, _gloffset_Uniform4fARB),
-    NAME_FUNC_OFFSET(17423, glUniform4fvARB, glUniform4fvARB, NULL, _gloffset_Uniform4fvARB),
-    NAME_FUNC_OFFSET(17436, glUniform4iARB, glUniform4iARB, NULL, _gloffset_Uniform4iARB),
-    NAME_FUNC_OFFSET(17448, glUniform4ivARB, glUniform4ivARB, NULL, _gloffset_Uniform4ivARB),
-    NAME_FUNC_OFFSET(17461, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, _gloffset_UniformMatrix2fvARB),
-    NAME_FUNC_OFFSET(17480, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, _gloffset_UniformMatrix3fvARB),
-    NAME_FUNC_OFFSET(17499, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, _gloffset_UniformMatrix4fvARB),
-    NAME_FUNC_OFFSET(17518, glUseProgramObjectARB, glUseProgramObjectARB, NULL, _gloffset_UseProgramObjectARB),
-    NAME_FUNC_OFFSET(17531, glValidateProgramARB, glValidateProgramARB, NULL, _gloffset_ValidateProgramARB),
-    NAME_FUNC_OFFSET(17549, glBindAttribLocationARB, glBindAttribLocationARB, NULL, _gloffset_BindAttribLocationARB),
-    NAME_FUNC_OFFSET(17570, glGetActiveAttribARB, glGetActiveAttribARB, NULL, _gloffset_GetActiveAttribARB),
-    NAME_FUNC_OFFSET(17588, glGetAttribLocationARB, glGetAttribLocationARB, NULL, _gloffset_GetAttribLocationARB),
-    NAME_FUNC_OFFSET(17608, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
-    NAME_FUNC_OFFSET(17622, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
-    NAME_FUNC_OFFSET(17639, gl_dispatch_stub_572, gl_dispatch_stub_572, NULL, _gloffset_SampleMaskSGIS),
-    NAME_FUNC_OFFSET(17655, gl_dispatch_stub_573, gl_dispatch_stub_573, NULL, _gloffset_SamplePatternSGIS),
-    NAME_FUNC_OFFSET(17674, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(17692, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(17713, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(17735, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(17754, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(17776, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(17799, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
-    NAME_FUNC_OFFSET(17818, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
-    NAME_FUNC_OFFSET(17838, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
-    NAME_FUNC_OFFSET(17857, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
-    NAME_FUNC_OFFSET(17877, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
-    NAME_FUNC_OFFSET(17896, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
-    NAME_FUNC_OFFSET(17916, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
-    NAME_FUNC_OFFSET(17935, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
-    NAME_FUNC_OFFSET(17955, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
-    NAME_FUNC_OFFSET(17974, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
-    NAME_FUNC_OFFSET(17994, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
-    NAME_FUNC_OFFSET(18014, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
-    NAME_FUNC_OFFSET(18035, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
-    NAME_FUNC_OFFSET(18055, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
-    NAME_FUNC_OFFSET(18076, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
-    NAME_FUNC_OFFSET(18096, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
-    NAME_FUNC_OFFSET(18117, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
-    NAME_FUNC_OFFSET(18141, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
-    NAME_FUNC_OFFSET(18159, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
-    NAME_FUNC_OFFSET(18179, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
-    NAME_FUNC_OFFSET(18197, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
-    NAME_FUNC_OFFSET(18209, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
-    NAME_FUNC_OFFSET(18222, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
-    NAME_FUNC_OFFSET(18234, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
-    NAME_FUNC_OFFSET(18247, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
-    NAME_FUNC_OFFSET(18267, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
-    NAME_FUNC_OFFSET(18291, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
-    NAME_FUNC_OFFSET(18305, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
-    NAME_FUNC_OFFSET(18322, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
-    NAME_FUNC_OFFSET(18337, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
-    NAME_FUNC_OFFSET(18355, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
-    NAME_FUNC_OFFSET(18369, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
-    NAME_FUNC_OFFSET(18386, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
-    NAME_FUNC_OFFSET(18401, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
-    NAME_FUNC_OFFSET(18419, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
-    NAME_FUNC_OFFSET(18433, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
-    NAME_FUNC_OFFSET(18450, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
-    NAME_FUNC_OFFSET(18465, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
-    NAME_FUNC_OFFSET(18483, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
-    NAME_FUNC_OFFSET(18497, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
-    NAME_FUNC_OFFSET(18514, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
-    NAME_FUNC_OFFSET(18529, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
-    NAME_FUNC_OFFSET(18547, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
-    NAME_FUNC_OFFSET(18561, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
-    NAME_FUNC_OFFSET(18578, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
-    NAME_FUNC_OFFSET(18593, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
-    NAME_FUNC_OFFSET(18611, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
-    NAME_FUNC_OFFSET(18625, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
-    NAME_FUNC_OFFSET(18642, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
-    NAME_FUNC_OFFSET(18657, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
-    NAME_FUNC_OFFSET(18675, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
-    NAME_FUNC_OFFSET(18689, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
-    NAME_FUNC_OFFSET(18706, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
-    NAME_FUNC_OFFSET(18721, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
-    NAME_FUNC_OFFSET(18739, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
-    NAME_FUNC_OFFSET(18753, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
-    NAME_FUNC_OFFSET(18770, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
-    NAME_FUNC_OFFSET(18785, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
-    NAME_FUNC_OFFSET(18803, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
-    NAME_FUNC_OFFSET(18820, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
-    NAME_FUNC_OFFSET(18840, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
-    NAME_FUNC_OFFSET(18857, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
-    NAME_FUNC_OFFSET(18883, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
-    NAME_FUNC_OFFSET(18912, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
-    NAME_FUNC_OFFSET(18927, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
-    NAME_FUNC_OFFSET(18945, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
-    NAME_FUNC_OFFSET(18964, gl_dispatch_stub_753, gl_dispatch_stub_753, NULL, _gloffset_BlendEquationSeparateEXT),
-    NAME_FUNC_OFFSET(18988, gl_dispatch_stub_753, gl_dispatch_stub_753, NULL, _gloffset_BlendEquationSeparateEXT),
-    NAME_FUNC_OFFSET(19015, glBindFramebufferEXT, glBindFramebufferEXT, NULL, _gloffset_BindFramebufferEXT),
-    NAME_FUNC_OFFSET(19033, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, _gloffset_BindRenderbufferEXT),
-    NAME_FUNC_OFFSET(19052, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, _gloffset_CheckFramebufferStatusEXT),
-    NAME_FUNC_OFFSET(19077, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, _gloffset_DeleteFramebuffersEXT),
-    NAME_FUNC_OFFSET(19098, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, _gloffset_DeleteRenderbuffersEXT),
-    NAME_FUNC_OFFSET(19120, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, _gloffset_FramebufferRenderbufferEXT),
-    NAME_FUNC_OFFSET(19146, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, _gloffset_FramebufferTexture1DEXT),
-    NAME_FUNC_OFFSET(19169, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, _gloffset_FramebufferTexture2DEXT),
-    NAME_FUNC_OFFSET(19192, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, _gloffset_FramebufferTexture3DEXT),
-    NAME_FUNC_OFFSET(19215, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, _gloffset_GenFramebuffersEXT),
-    NAME_FUNC_OFFSET(19233, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, _gloffset_GenRenderbuffersEXT),
-    NAME_FUNC_OFFSET(19252, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, _gloffset_GenerateMipmapEXT),
-    NAME_FUNC_OFFSET(19269, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, _gloffset_GetFramebufferAttachmentParameterivEXT),
-    NAME_FUNC_OFFSET(19307, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, _gloffset_GetRenderbufferParameterivEXT),
-    NAME_FUNC_OFFSET(19336, glIsFramebufferEXT, glIsFramebufferEXT, NULL, _gloffset_IsFramebufferEXT),
-    NAME_FUNC_OFFSET(19352, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, _gloffset_IsRenderbufferEXT),
-    NAME_FUNC_OFFSET(19369, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, _gloffset_RenderbufferStorageEXT),
-    NAME_FUNC_OFFSET(19391, gl_dispatch_stub_771, gl_dispatch_stub_771, NULL, _gloffset_BlitFramebufferEXT),
-    NAME_FUNC_OFFSET(19409, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
+    NAME_FUNC_OFFSET( 9026, glBindVertexArray, glBindVertexArray, NULL, _gloffset_BindVertexArray),
+    NAME_FUNC_OFFSET( 9044, glGenVertexArrays, glGenVertexArrays, NULL, _gloffset_GenVertexArrays),
+    NAME_FUNC_OFFSET( 9062, glCopyBufferSubData, glCopyBufferSubData, NULL, _gloffset_CopyBufferSubData),
+    NAME_FUNC_OFFSET( 9082, glPolygonOffsetEXT, glPolygonOffsetEXT, NULL, _gloffset_PolygonOffsetEXT),
+    NAME_FUNC_OFFSET( 9101, gl_dispatch_stub_568, gl_dispatch_stub_568, NULL, _gloffset_GetPixelTexGenParameterfvSGIS),
+    NAME_FUNC_OFFSET( 9133, gl_dispatch_stub_569, gl_dispatch_stub_569, NULL, _gloffset_GetPixelTexGenParameterivSGIS),
+    NAME_FUNC_OFFSET( 9165, gl_dispatch_stub_570, gl_dispatch_stub_570, NULL, _gloffset_PixelTexGenParameterfSGIS),
+    NAME_FUNC_OFFSET( 9193, gl_dispatch_stub_571, gl_dispatch_stub_571, NULL, _gloffset_PixelTexGenParameterfvSGIS),
+    NAME_FUNC_OFFSET( 9222, gl_dispatch_stub_572, gl_dispatch_stub_572, NULL, _gloffset_PixelTexGenParameteriSGIS),
+    NAME_FUNC_OFFSET( 9250, gl_dispatch_stub_573, gl_dispatch_stub_573, NULL, _gloffset_PixelTexGenParameterivSGIS),
+    NAME_FUNC_OFFSET( 9279, gl_dispatch_stub_574, gl_dispatch_stub_574, NULL, _gloffset_SampleMaskSGIS),
+    NAME_FUNC_OFFSET( 9296, gl_dispatch_stub_575, gl_dispatch_stub_575, NULL, _gloffset_SamplePatternSGIS),
+    NAME_FUNC_OFFSET( 9316, glColorPointerEXT, glColorPointerEXT, NULL, _gloffset_ColorPointerEXT),
+    NAME_FUNC_OFFSET( 9334, glEdgeFlagPointerEXT, glEdgeFlagPointerEXT, NULL, _gloffset_EdgeFlagPointerEXT),
+    NAME_FUNC_OFFSET( 9355, glIndexPointerEXT, glIndexPointerEXT, NULL, _gloffset_IndexPointerEXT),
+    NAME_FUNC_OFFSET( 9373, glNormalPointerEXT, glNormalPointerEXT, NULL, _gloffset_NormalPointerEXT),
+    NAME_FUNC_OFFSET( 9392, glTexCoordPointerEXT, glTexCoordPointerEXT, NULL, _gloffset_TexCoordPointerEXT),
+    NAME_FUNC_OFFSET( 9413, glVertexPointerEXT, glVertexPointerEXT, NULL, _gloffset_VertexPointerEXT),
+    NAME_FUNC_OFFSET( 9432, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET( 9453, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET( 9475, glLockArraysEXT, glLockArraysEXT, NULL, _gloffset_LockArraysEXT),
+    NAME_FUNC_OFFSET( 9491, glUnlockArraysEXT, glUnlockArraysEXT, NULL, _gloffset_UnlockArraysEXT),
+    NAME_FUNC_OFFSET( 9509, gl_dispatch_stub_586, gl_dispatch_stub_586, NULL, _gloffset_CullParameterdvEXT),
+    NAME_FUNC_OFFSET( 9530, gl_dispatch_stub_587, gl_dispatch_stub_587, NULL, _gloffset_CullParameterfvEXT),
+    NAME_FUNC_OFFSET( 9551, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
+    NAME_FUNC_OFFSET( 9573, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
+    NAME_FUNC_OFFSET( 9596, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
+    NAME_FUNC_OFFSET( 9618, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
+    NAME_FUNC_OFFSET( 9641, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
+    NAME_FUNC_OFFSET( 9663, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
+    NAME_FUNC_OFFSET( 9686, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
+    NAME_FUNC_OFFSET( 9708, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
+    NAME_FUNC_OFFSET( 9731, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
+    NAME_FUNC_OFFSET( 9753, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
+    NAME_FUNC_OFFSET( 9776, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
+    NAME_FUNC_OFFSET( 9799, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
+    NAME_FUNC_OFFSET( 9823, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
+    NAME_FUNC_OFFSET( 9846, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
+    NAME_FUNC_OFFSET( 9870, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
+    NAME_FUNC_OFFSET( 9893, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
+    NAME_FUNC_OFFSET( 9917, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
+    NAME_FUNC_OFFSET( 9944, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
+    NAME_FUNC_OFFSET( 9965, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
+    NAME_FUNC_OFFSET( 9988, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
+    NAME_FUNC_OFFSET(10009, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
+    NAME_FUNC_OFFSET(10024, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
+    NAME_FUNC_OFFSET(10040, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
+    NAME_FUNC_OFFSET(10055, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
+    NAME_FUNC_OFFSET(10071, gl_dispatch_stub_612, gl_dispatch_stub_612, NULL, _gloffset_PixelTexGenSGIX),
+    NAME_FUNC_OFFSET(10089, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
+    NAME_FUNC_OFFSET(10112, glFlushVertexArrayRangeNV, glFlushVertexArrayRangeNV, NULL, _gloffset_FlushVertexArrayRangeNV),
+    NAME_FUNC_OFFSET(10138, glVertexArrayRangeNV, glVertexArrayRangeNV, NULL, _gloffset_VertexArrayRangeNV),
+    NAME_FUNC_OFFSET(10159, glCombinerInputNV, glCombinerInputNV, NULL, _gloffset_CombinerInputNV),
+    NAME_FUNC_OFFSET(10177, glCombinerOutputNV, glCombinerOutputNV, NULL, _gloffset_CombinerOutputNV),
+    NAME_FUNC_OFFSET(10196, glCombinerParameterfNV, glCombinerParameterfNV, NULL, _gloffset_CombinerParameterfNV),
+    NAME_FUNC_OFFSET(10219, glCombinerParameterfvNV, glCombinerParameterfvNV, NULL, _gloffset_CombinerParameterfvNV),
+    NAME_FUNC_OFFSET(10243, glCombinerParameteriNV, glCombinerParameteriNV, NULL, _gloffset_CombinerParameteriNV),
+    NAME_FUNC_OFFSET(10266, glCombinerParameterivNV, glCombinerParameterivNV, NULL, _gloffset_CombinerParameterivNV),
+    NAME_FUNC_OFFSET(10290, glFinalCombinerInputNV, glFinalCombinerInputNV, NULL, _gloffset_FinalCombinerInputNV),
+    NAME_FUNC_OFFSET(10313, glGetCombinerInputParameterfvNV, glGetCombinerInputParameterfvNV, NULL, _gloffset_GetCombinerInputParameterfvNV),
+    NAME_FUNC_OFFSET(10345, glGetCombinerInputParameterivNV, glGetCombinerInputParameterivNV, NULL, _gloffset_GetCombinerInputParameterivNV),
+    NAME_FUNC_OFFSET(10377, glGetCombinerOutputParameterfvNV, glGetCombinerOutputParameterfvNV, NULL, _gloffset_GetCombinerOutputParameterfvNV),
+    NAME_FUNC_OFFSET(10410, glGetCombinerOutputParameterivNV, glGetCombinerOutputParameterivNV, NULL, _gloffset_GetCombinerOutputParameterivNV),
+    NAME_FUNC_OFFSET(10443, glGetFinalCombinerInputParameterfvNV, glGetFinalCombinerInputParameterfvNV, NULL, _gloffset_GetFinalCombinerInputParameterfvNV),
+    NAME_FUNC_OFFSET(10480, glGetFinalCombinerInputParameterivNV, glGetFinalCombinerInputParameterivNV, NULL, _gloffset_GetFinalCombinerInputParameterivNV),
+    NAME_FUNC_OFFSET(10517, glResizeBuffersMESA, glResizeBuffersMESA, NULL, _gloffset_ResizeBuffersMESA),
+    NAME_FUNC_OFFSET(10537, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
+    NAME_FUNC_OFFSET(10555, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
+    NAME_FUNC_OFFSET(10574, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
+    NAME_FUNC_OFFSET(10592, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
+    NAME_FUNC_OFFSET(10611, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
+    NAME_FUNC_OFFSET(10629, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
+    NAME_FUNC_OFFSET(10648, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
+    NAME_FUNC_OFFSET(10666, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
+    NAME_FUNC_OFFSET(10685, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
+    NAME_FUNC_OFFSET(10703, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
+    NAME_FUNC_OFFSET(10722, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
+    NAME_FUNC_OFFSET(10740, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
+    NAME_FUNC_OFFSET(10759, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
+    NAME_FUNC_OFFSET(10777, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
+    NAME_FUNC_OFFSET(10796, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
+    NAME_FUNC_OFFSET(10814, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
+    NAME_FUNC_OFFSET(10833, glWindowPos4dMESA, glWindowPos4dMESA, NULL, _gloffset_WindowPos4dMESA),
+    NAME_FUNC_OFFSET(10851, glWindowPos4dvMESA, glWindowPos4dvMESA, NULL, _gloffset_WindowPos4dvMESA),
+    NAME_FUNC_OFFSET(10870, glWindowPos4fMESA, glWindowPos4fMESA, NULL, _gloffset_WindowPos4fMESA),
+    NAME_FUNC_OFFSET(10888, glWindowPos4fvMESA, glWindowPos4fvMESA, NULL, _gloffset_WindowPos4fvMESA),
+    NAME_FUNC_OFFSET(10907, glWindowPos4iMESA, glWindowPos4iMESA, NULL, _gloffset_WindowPos4iMESA),
+    NAME_FUNC_OFFSET(10925, glWindowPos4ivMESA, glWindowPos4ivMESA, NULL, _gloffset_WindowPos4ivMESA),
+    NAME_FUNC_OFFSET(10944, glWindowPos4sMESA, glWindowPos4sMESA, NULL, _gloffset_WindowPos4sMESA),
+    NAME_FUNC_OFFSET(10962, glWindowPos4svMESA, glWindowPos4svMESA, NULL, _gloffset_WindowPos4svMESA),
+    NAME_FUNC_OFFSET(10981, gl_dispatch_stub_654, gl_dispatch_stub_654, NULL, _gloffset_MultiModeDrawArraysIBM),
+    NAME_FUNC_OFFSET(11006, gl_dispatch_stub_655, gl_dispatch_stub_655, NULL, _gloffset_MultiModeDrawElementsIBM),
+    NAME_FUNC_OFFSET(11033, gl_dispatch_stub_656, gl_dispatch_stub_656, NULL, _gloffset_DeleteFencesNV),
+    NAME_FUNC_OFFSET(11050, gl_dispatch_stub_657, gl_dispatch_stub_657, NULL, _gloffset_FinishFenceNV),
+    NAME_FUNC_OFFSET(11066, gl_dispatch_stub_658, gl_dispatch_stub_658, NULL, _gloffset_GenFencesNV),
+    NAME_FUNC_OFFSET(11080, gl_dispatch_stub_659, gl_dispatch_stub_659, NULL, _gloffset_GetFenceivNV),
+    NAME_FUNC_OFFSET(11095, gl_dispatch_stub_660, gl_dispatch_stub_660, NULL, _gloffset_IsFenceNV),
+    NAME_FUNC_OFFSET(11107, gl_dispatch_stub_661, gl_dispatch_stub_661, NULL, _gloffset_SetFenceNV),
+    NAME_FUNC_OFFSET(11120, gl_dispatch_stub_662, gl_dispatch_stub_662, NULL, _gloffset_TestFenceNV),
+    NAME_FUNC_OFFSET(11134, glAreProgramsResidentNV, glAreProgramsResidentNV, NULL, _gloffset_AreProgramsResidentNV),
+    NAME_FUNC_OFFSET(11158, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
+    NAME_FUNC_OFFSET(11174, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
+    NAME_FUNC_OFFSET(11193, glExecuteProgramNV, glExecuteProgramNV, NULL, _gloffset_ExecuteProgramNV),
+    NAME_FUNC_OFFSET(11212, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
+    NAME_FUNC_OFFSET(11228, glGetProgramParameterdvNV, glGetProgramParameterdvNV, NULL, _gloffset_GetProgramParameterdvNV),
+    NAME_FUNC_OFFSET(11254, glGetProgramParameterfvNV, glGetProgramParameterfvNV, NULL, _gloffset_GetProgramParameterfvNV),
+    NAME_FUNC_OFFSET(11280, glGetProgramStringNV, glGetProgramStringNV, NULL, _gloffset_GetProgramStringNV),
+    NAME_FUNC_OFFSET(11301, glGetProgramivNV, glGetProgramivNV, NULL, _gloffset_GetProgramivNV),
+    NAME_FUNC_OFFSET(11318, glGetTrackMatrixivNV, glGetTrackMatrixivNV, NULL, _gloffset_GetTrackMatrixivNV),
+    NAME_FUNC_OFFSET(11339, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
+    NAME_FUNC_OFFSET(11367, glGetVertexAttribdvNV, glGetVertexAttribdvNV, NULL, _gloffset_GetVertexAttribdvNV),
+    NAME_FUNC_OFFSET(11389, glGetVertexAttribfvNV, glGetVertexAttribfvNV, NULL, _gloffset_GetVertexAttribfvNV),
+    NAME_FUNC_OFFSET(11411, glGetVertexAttribivNV, glGetVertexAttribivNV, NULL, _gloffset_GetVertexAttribivNV),
+    NAME_FUNC_OFFSET(11433, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
+    NAME_FUNC_OFFSET(11447, glLoadProgramNV, glLoadProgramNV, NULL, _gloffset_LoadProgramNV),
+    NAME_FUNC_OFFSET(11463, glProgramParameters4dvNV, glProgramParameters4dvNV, NULL, _gloffset_ProgramParameters4dvNV),
+    NAME_FUNC_OFFSET(11488, glProgramParameters4fvNV, glProgramParameters4fvNV, NULL, _gloffset_ProgramParameters4fvNV),
+    NAME_FUNC_OFFSET(11513, glRequestResidentProgramsNV, glRequestResidentProgramsNV, NULL, _gloffset_RequestResidentProgramsNV),
+    NAME_FUNC_OFFSET(11541, glTrackMatrixNV, glTrackMatrixNV, NULL, _gloffset_TrackMatrixNV),
+    NAME_FUNC_OFFSET(11557, glVertexAttrib1dNV, glVertexAttrib1dNV, NULL, _gloffset_VertexAttrib1dNV),
+    NAME_FUNC_OFFSET(11576, glVertexAttrib1dvNV, glVertexAttrib1dvNV, NULL, _gloffset_VertexAttrib1dvNV),
+    NAME_FUNC_OFFSET(11596, glVertexAttrib1fNV, glVertexAttrib1fNV, NULL, _gloffset_VertexAttrib1fNV),
+    NAME_FUNC_OFFSET(11615, glVertexAttrib1fvNV, glVertexAttrib1fvNV, NULL, _gloffset_VertexAttrib1fvNV),
+    NAME_FUNC_OFFSET(11635, glVertexAttrib1sNV, glVertexAttrib1sNV, NULL, _gloffset_VertexAttrib1sNV),
+    NAME_FUNC_OFFSET(11654, glVertexAttrib1svNV, glVertexAttrib1svNV, NULL, _gloffset_VertexAttrib1svNV),
+    NAME_FUNC_OFFSET(11674, glVertexAttrib2dNV, glVertexAttrib2dNV, NULL, _gloffset_VertexAttrib2dNV),
+    NAME_FUNC_OFFSET(11693, glVertexAttrib2dvNV, glVertexAttrib2dvNV, NULL, _gloffset_VertexAttrib2dvNV),
+    NAME_FUNC_OFFSET(11713, glVertexAttrib2fNV, glVertexAttrib2fNV, NULL, _gloffset_VertexAttrib2fNV),
+    NAME_FUNC_OFFSET(11732, glVertexAttrib2fvNV, glVertexAttrib2fvNV, NULL, _gloffset_VertexAttrib2fvNV),
+    NAME_FUNC_OFFSET(11752, glVertexAttrib2sNV, glVertexAttrib2sNV, NULL, _gloffset_VertexAttrib2sNV),
+    NAME_FUNC_OFFSET(11771, glVertexAttrib2svNV, glVertexAttrib2svNV, NULL, _gloffset_VertexAttrib2svNV),
+    NAME_FUNC_OFFSET(11791, glVertexAttrib3dNV, glVertexAttrib3dNV, NULL, _gloffset_VertexAttrib3dNV),
+    NAME_FUNC_OFFSET(11810, glVertexAttrib3dvNV, glVertexAttrib3dvNV, NULL, _gloffset_VertexAttrib3dvNV),
+    NAME_FUNC_OFFSET(11830, glVertexAttrib3fNV, glVertexAttrib3fNV, NULL, _gloffset_VertexAttrib3fNV),
+    NAME_FUNC_OFFSET(11849, glVertexAttrib3fvNV, glVertexAttrib3fvNV, NULL, _gloffset_VertexAttrib3fvNV),
+    NAME_FUNC_OFFSET(11869, glVertexAttrib3sNV, glVertexAttrib3sNV, NULL, _gloffset_VertexAttrib3sNV),
+    NAME_FUNC_OFFSET(11888, glVertexAttrib3svNV, glVertexAttrib3svNV, NULL, _gloffset_VertexAttrib3svNV),
+    NAME_FUNC_OFFSET(11908, glVertexAttrib4dNV, glVertexAttrib4dNV, NULL, _gloffset_VertexAttrib4dNV),
+    NAME_FUNC_OFFSET(11927, glVertexAttrib4dvNV, glVertexAttrib4dvNV, NULL, _gloffset_VertexAttrib4dvNV),
+    NAME_FUNC_OFFSET(11947, glVertexAttrib4fNV, glVertexAttrib4fNV, NULL, _gloffset_VertexAttrib4fNV),
+    NAME_FUNC_OFFSET(11966, glVertexAttrib4fvNV, glVertexAttrib4fvNV, NULL, _gloffset_VertexAttrib4fvNV),
+    NAME_FUNC_OFFSET(11986, glVertexAttrib4sNV, glVertexAttrib4sNV, NULL, _gloffset_VertexAttrib4sNV),
+    NAME_FUNC_OFFSET(12005, glVertexAttrib4svNV, glVertexAttrib4svNV, NULL, _gloffset_VertexAttrib4svNV),
+    NAME_FUNC_OFFSET(12025, glVertexAttrib4ubNV, glVertexAttrib4ubNV, NULL, _gloffset_VertexAttrib4ubNV),
+    NAME_FUNC_OFFSET(12045, glVertexAttrib4ubvNV, glVertexAttrib4ubvNV, NULL, _gloffset_VertexAttrib4ubvNV),
+    NAME_FUNC_OFFSET(12066, glVertexAttribPointerNV, glVertexAttribPointerNV, NULL, _gloffset_VertexAttribPointerNV),
+    NAME_FUNC_OFFSET(12090, glVertexAttribs1dvNV, glVertexAttribs1dvNV, NULL, _gloffset_VertexAttribs1dvNV),
+    NAME_FUNC_OFFSET(12111, glVertexAttribs1fvNV, glVertexAttribs1fvNV, NULL, _gloffset_VertexAttribs1fvNV),
+    NAME_FUNC_OFFSET(12132, glVertexAttribs1svNV, glVertexAttribs1svNV, NULL, _gloffset_VertexAttribs1svNV),
+    NAME_FUNC_OFFSET(12153, glVertexAttribs2dvNV, glVertexAttribs2dvNV, NULL, _gloffset_VertexAttribs2dvNV),
+    NAME_FUNC_OFFSET(12174, glVertexAttribs2fvNV, glVertexAttribs2fvNV, NULL, _gloffset_VertexAttribs2fvNV),
+    NAME_FUNC_OFFSET(12195, glVertexAttribs2svNV, glVertexAttribs2svNV, NULL, _gloffset_VertexAttribs2svNV),
+    NAME_FUNC_OFFSET(12216, glVertexAttribs3dvNV, glVertexAttribs3dvNV, NULL, _gloffset_VertexAttribs3dvNV),
+    NAME_FUNC_OFFSET(12237, glVertexAttribs3fvNV, glVertexAttribs3fvNV, NULL, _gloffset_VertexAttribs3fvNV),
+    NAME_FUNC_OFFSET(12258, glVertexAttribs3svNV, glVertexAttribs3svNV, NULL, _gloffset_VertexAttribs3svNV),
+    NAME_FUNC_OFFSET(12279, glVertexAttribs4dvNV, glVertexAttribs4dvNV, NULL, _gloffset_VertexAttribs4dvNV),
+    NAME_FUNC_OFFSET(12300, glVertexAttribs4fvNV, glVertexAttribs4fvNV, NULL, _gloffset_VertexAttribs4fvNV),
+    NAME_FUNC_OFFSET(12321, glVertexAttribs4svNV, glVertexAttribs4svNV, NULL, _gloffset_VertexAttribs4svNV),
+    NAME_FUNC_OFFSET(12342, glVertexAttribs4ubvNV, glVertexAttribs4ubvNV, NULL, _gloffset_VertexAttribs4ubvNV),
+    NAME_FUNC_OFFSET(12364, glGetTexBumpParameterfvATI, glGetTexBumpParameterfvATI, NULL, _gloffset_GetTexBumpParameterfvATI),
+    NAME_FUNC_OFFSET(12391, glGetTexBumpParameterivATI, glGetTexBumpParameterivATI, NULL, _gloffset_GetTexBumpParameterivATI),
+    NAME_FUNC_OFFSET(12418, glTexBumpParameterfvATI, glTexBumpParameterfvATI, NULL, _gloffset_TexBumpParameterfvATI),
+    NAME_FUNC_OFFSET(12442, glTexBumpParameterivATI, glTexBumpParameterivATI, NULL, _gloffset_TexBumpParameterivATI),
+    NAME_FUNC_OFFSET(12466, glAlphaFragmentOp1ATI, glAlphaFragmentOp1ATI, NULL, _gloffset_AlphaFragmentOp1ATI),
+    NAME_FUNC_OFFSET(12488, glAlphaFragmentOp2ATI, glAlphaFragmentOp2ATI, NULL, _gloffset_AlphaFragmentOp2ATI),
+    NAME_FUNC_OFFSET(12510, glAlphaFragmentOp3ATI, glAlphaFragmentOp3ATI, NULL, _gloffset_AlphaFragmentOp3ATI),
+    NAME_FUNC_OFFSET(12532, glBeginFragmentShaderATI, glBeginFragmentShaderATI, NULL, _gloffset_BeginFragmentShaderATI),
+    NAME_FUNC_OFFSET(12557, glBindFragmentShaderATI, glBindFragmentShaderATI, NULL, _gloffset_BindFragmentShaderATI),
+    NAME_FUNC_OFFSET(12581, glColorFragmentOp1ATI, glColorFragmentOp1ATI, NULL, _gloffset_ColorFragmentOp1ATI),
+    NAME_FUNC_OFFSET(12603, glColorFragmentOp2ATI, glColorFragmentOp2ATI, NULL, _gloffset_ColorFragmentOp2ATI),
+    NAME_FUNC_OFFSET(12625, glColorFragmentOp3ATI, glColorFragmentOp3ATI, NULL, _gloffset_ColorFragmentOp3ATI),
+    NAME_FUNC_OFFSET(12647, glDeleteFragmentShaderATI, glDeleteFragmentShaderATI, NULL, _gloffset_DeleteFragmentShaderATI),
+    NAME_FUNC_OFFSET(12673, glEndFragmentShaderATI, glEndFragmentShaderATI, NULL, _gloffset_EndFragmentShaderATI),
+    NAME_FUNC_OFFSET(12696, glGenFragmentShadersATI, glGenFragmentShadersATI, NULL, _gloffset_GenFragmentShadersATI),
+    NAME_FUNC_OFFSET(12720, glPassTexCoordATI, glPassTexCoordATI, NULL, _gloffset_PassTexCoordATI),
+    NAME_FUNC_OFFSET(12738, glSampleMapATI, glSampleMapATI, NULL, _gloffset_SampleMapATI),
+    NAME_FUNC_OFFSET(12753, glSetFragmentShaderConstantATI, glSetFragmentShaderConstantATI, NULL, _gloffset_SetFragmentShaderConstantATI),
+    NAME_FUNC_OFFSET(12784, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
+    NAME_FUNC_OFFSET(12804, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
+    NAME_FUNC_OFFSET(12825, gl_dispatch_stub_743, gl_dispatch_stub_743, NULL, _gloffset_ActiveStencilFaceEXT),
+    NAME_FUNC_OFFSET(12848, gl_dispatch_stub_744, gl_dispatch_stub_744, NULL, _gloffset_BindVertexArrayAPPLE),
+    NAME_FUNC_OFFSET(12871, gl_dispatch_stub_745, gl_dispatch_stub_745, NULL, _gloffset_DeleteVertexArraysAPPLE),
+    NAME_FUNC_OFFSET(12897, gl_dispatch_stub_746, gl_dispatch_stub_746, NULL, _gloffset_GenVertexArraysAPPLE),
+    NAME_FUNC_OFFSET(12920, gl_dispatch_stub_747, gl_dispatch_stub_747, NULL, _gloffset_IsVertexArrayAPPLE),
+    NAME_FUNC_OFFSET(12941, glGetProgramNamedParameterdvNV, glGetProgramNamedParameterdvNV, NULL, _gloffset_GetProgramNamedParameterdvNV),
+    NAME_FUNC_OFFSET(12972, glGetProgramNamedParameterfvNV, glGetProgramNamedParameterfvNV, NULL, _gloffset_GetProgramNamedParameterfvNV),
+    NAME_FUNC_OFFSET(13003, glProgramNamedParameter4dNV, glProgramNamedParameter4dNV, NULL, _gloffset_ProgramNamedParameter4dNV),
+    NAME_FUNC_OFFSET(13031, glProgramNamedParameter4dvNV, glProgramNamedParameter4dvNV, NULL, _gloffset_ProgramNamedParameter4dvNV),
+    NAME_FUNC_OFFSET(13060, glProgramNamedParameter4fNV, glProgramNamedParameter4fNV, NULL, _gloffset_ProgramNamedParameter4fNV),
+    NAME_FUNC_OFFSET(13088, glProgramNamedParameter4fvNV, glProgramNamedParameter4fvNV, NULL, _gloffset_ProgramNamedParameter4fvNV),
+    NAME_FUNC_OFFSET(13117, gl_dispatch_stub_754, gl_dispatch_stub_754, NULL, _gloffset_DepthBoundsEXT),
+    NAME_FUNC_OFFSET(13134, gl_dispatch_stub_755, gl_dispatch_stub_755, NULL, _gloffset_BlendEquationSeparateEXT),
+    NAME_FUNC_OFFSET(13161, glBindFramebufferEXT, glBindFramebufferEXT, NULL, _gloffset_BindFramebufferEXT),
+    NAME_FUNC_OFFSET(13182, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, _gloffset_BindRenderbufferEXT),
+    NAME_FUNC_OFFSET(13204, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, _gloffset_CheckFramebufferStatusEXT),
+    NAME_FUNC_OFFSET(13232, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, _gloffset_DeleteFramebuffersEXT),
+    NAME_FUNC_OFFSET(13256, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, _gloffset_DeleteRenderbuffersEXT),
+    NAME_FUNC_OFFSET(13281, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, _gloffset_FramebufferRenderbufferEXT),
+    NAME_FUNC_OFFSET(13310, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, _gloffset_FramebufferTexture1DEXT),
+    NAME_FUNC_OFFSET(13336, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, _gloffset_FramebufferTexture2DEXT),
+    NAME_FUNC_OFFSET(13362, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, _gloffset_FramebufferTexture3DEXT),
+    NAME_FUNC_OFFSET(13388, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, _gloffset_GenFramebuffersEXT),
+    NAME_FUNC_OFFSET(13409, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, _gloffset_GenRenderbuffersEXT),
+    NAME_FUNC_OFFSET(13431, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, _gloffset_GenerateMipmapEXT),
+    NAME_FUNC_OFFSET(13451, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, _gloffset_GetFramebufferAttachmentParameterivEXT),
+    NAME_FUNC_OFFSET(13492, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, _gloffset_GetRenderbufferParameterivEXT),
+    NAME_FUNC_OFFSET(13524, glIsFramebufferEXT, glIsFramebufferEXT, NULL, _gloffset_IsFramebufferEXT),
+    NAME_FUNC_OFFSET(13543, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, _gloffset_IsRenderbufferEXT),
+    NAME_FUNC_OFFSET(13563, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, _gloffset_RenderbufferStorageEXT),
+    NAME_FUNC_OFFSET(13588, gl_dispatch_stub_773, gl_dispatch_stub_773, NULL, _gloffset_BlitFramebufferEXT),
+    NAME_FUNC_OFFSET(13609, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
+    NAME_FUNC_OFFSET(13638, glProvokingVertexEXT, glProvokingVertexEXT, NULL, _gloffset_ProvokingVertexEXT),
+    NAME_FUNC_OFFSET(13659, gl_dispatch_stub_776, gl_dispatch_stub_776, NULL, _gloffset_StencilFuncSeparateATI),
+    NAME_FUNC_OFFSET(13684, gl_dispatch_stub_777, gl_dispatch_stub_777, NULL, _gloffset_ProgramEnvParameters4fvEXT),
+    NAME_FUNC_OFFSET(13713, gl_dispatch_stub_778, gl_dispatch_stub_778, NULL, _gloffset_ProgramLocalParameters4fvEXT),
+    NAME_FUNC_OFFSET(13744, gl_dispatch_stub_779, gl_dispatch_stub_779, NULL, _gloffset_GetQueryObjecti64vEXT),
+    NAME_FUNC_OFFSET(13768, gl_dispatch_stub_780, gl_dispatch_stub_780, NULL, _gloffset_GetQueryObjectui64vEXT),
+    NAME_FUNC_OFFSET(13793, glArrayElement, glArrayElement, NULL, _gloffset_ArrayElement),
+    NAME_FUNC_OFFSET(13811, glBindTexture, glBindTexture, NULL, _gloffset_BindTexture),
+    NAME_FUNC_OFFSET(13828, glDrawArrays, glDrawArrays, NULL, _gloffset_DrawArrays),
+    NAME_FUNC_OFFSET(13844, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, _gloffset_AreTexturesResident),
+    NAME_FUNC_OFFSET(13869, glCopyTexImage1D, glCopyTexImage1D, NULL, _gloffset_CopyTexImage1D),
+    NAME_FUNC_OFFSET(13889, glCopyTexImage2D, glCopyTexImage2D, NULL, _gloffset_CopyTexImage2D),
+    NAME_FUNC_OFFSET(13909, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, _gloffset_CopyTexSubImage1D),
+    NAME_FUNC_OFFSET(13932, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, _gloffset_CopyTexSubImage2D),
+    NAME_FUNC_OFFSET(13955, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, _gloffset_DeleteTextures),
+    NAME_FUNC_OFFSET(13975, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, _gloffset_GenTextures),
+    NAME_FUNC_OFFSET(13992, glGetPointerv, glGetPointerv, NULL, _gloffset_GetPointerv),
+    NAME_FUNC_OFFSET(14009, glIsTexture, glIsTextureEXT, glIsTextureEXT, _gloffset_IsTexture),
+    NAME_FUNC_OFFSET(14024, glPrioritizeTextures, glPrioritizeTextures, NULL, _gloffset_PrioritizeTextures),
+    NAME_FUNC_OFFSET(14048, glTexSubImage1D, glTexSubImage1D, NULL, _gloffset_TexSubImage1D),
+    NAME_FUNC_OFFSET(14067, glTexSubImage2D, glTexSubImage2D, NULL, _gloffset_TexSubImage2D),
+    NAME_FUNC_OFFSET(14086, glBlendColor, glBlendColor, NULL, _gloffset_BlendColor),
+    NAME_FUNC_OFFSET(14102, glBlendEquation, glBlendEquation, NULL, _gloffset_BlendEquation),
+    NAME_FUNC_OFFSET(14121, glDrawRangeElements, glDrawRangeElements, NULL, _gloffset_DrawRangeElements),
+    NAME_FUNC_OFFSET(14144, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
+    NAME_FUNC_OFFSET(14160, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
+    NAME_FUNC_OFFSET(14176, glColorTableParameterfv, glColorTableParameterfv, NULL, _gloffset_ColorTableParameterfv),
+    NAME_FUNC_OFFSET(14203, glColorTableParameteriv, glColorTableParameteriv, NULL, _gloffset_ColorTableParameteriv),
+    NAME_FUNC_OFFSET(14230, glCopyColorTable, glCopyColorTable, NULL, _gloffset_CopyColorTable),
+    NAME_FUNC_OFFSET(14250, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
+    NAME_FUNC_OFFSET(14269, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
+    NAME_FUNC_OFFSET(14288, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
+    NAME_FUNC_OFFSET(14318, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
+    NAME_FUNC_OFFSET(14348, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
+    NAME_FUNC_OFFSET(14378, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
+    NAME_FUNC_OFFSET(14408, glColorSubTable, glColorSubTable, NULL, _gloffset_ColorSubTable),
+    NAME_FUNC_OFFSET(14427, glCopyColorSubTable, glCopyColorSubTable, NULL, _gloffset_CopyColorSubTable),
+    NAME_FUNC_OFFSET(14450, glConvolutionFilter1D, glConvolutionFilter1D, NULL, _gloffset_ConvolutionFilter1D),
+    NAME_FUNC_OFFSET(14475, glConvolutionFilter2D, glConvolutionFilter2D, NULL, _gloffset_ConvolutionFilter2D),
+    NAME_FUNC_OFFSET(14500, glConvolutionParameterf, glConvolutionParameterf, NULL, _gloffset_ConvolutionParameterf),
+    NAME_FUNC_OFFSET(14527, glConvolutionParameterfv, glConvolutionParameterfv, NULL, _gloffset_ConvolutionParameterfv),
+    NAME_FUNC_OFFSET(14555, glConvolutionParameteri, glConvolutionParameteri, NULL, _gloffset_ConvolutionParameteri),
+    NAME_FUNC_OFFSET(14582, glConvolutionParameteriv, glConvolutionParameteriv, NULL, _gloffset_ConvolutionParameteriv),
+    NAME_FUNC_OFFSET(14610, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, _gloffset_CopyConvolutionFilter1D),
+    NAME_FUNC_OFFSET(14639, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, _gloffset_CopyConvolutionFilter2D),
+    NAME_FUNC_OFFSET(14668, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, _gloffset_GetConvolutionFilter),
+    NAME_FUNC_OFFSET(14694, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, _gloffset_GetConvolutionParameterfv),
+    NAME_FUNC_OFFSET(14725, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, _gloffset_GetConvolutionParameteriv),
+    NAME_FUNC_OFFSET(14756, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, _gloffset_GetSeparableFilter),
+    NAME_FUNC_OFFSET(14780, glSeparableFilter2D, glSeparableFilter2D, NULL, _gloffset_SeparableFilter2D),
+    NAME_FUNC_OFFSET(14803, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, _gloffset_GetHistogram),
+    NAME_FUNC_OFFSET(14821, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, _gloffset_GetHistogramParameterfv),
+    NAME_FUNC_OFFSET(14850, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, _gloffset_GetHistogramParameteriv),
+    NAME_FUNC_OFFSET(14879, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, _gloffset_GetMinmax),
+    NAME_FUNC_OFFSET(14894, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, _gloffset_GetMinmaxParameterfv),
+    NAME_FUNC_OFFSET(14920, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, _gloffset_GetMinmaxParameteriv),
+    NAME_FUNC_OFFSET(14946, glHistogram, glHistogram, NULL, _gloffset_Histogram),
+    NAME_FUNC_OFFSET(14961, glMinmax, glMinmax, NULL, _gloffset_Minmax),
+    NAME_FUNC_OFFSET(14973, glResetHistogram, glResetHistogram, NULL, _gloffset_ResetHistogram),
+    NAME_FUNC_OFFSET(14993, glResetMinmax, glResetMinmax, NULL, _gloffset_ResetMinmax),
+    NAME_FUNC_OFFSET(15010, glTexImage3D, glTexImage3D, NULL, _gloffset_TexImage3D),
+    NAME_FUNC_OFFSET(15026, glTexSubImage3D, glTexSubImage3D, NULL, _gloffset_TexSubImage3D),
+    NAME_FUNC_OFFSET(15045, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, _gloffset_CopyTexSubImage3D),
+    NAME_FUNC_OFFSET(15068, glActiveTextureARB, glActiveTextureARB, NULL, _gloffset_ActiveTextureARB),
+    NAME_FUNC_OFFSET(15084, glClientActiveTextureARB, glClientActiveTextureARB, NULL, _gloffset_ClientActiveTextureARB),
+    NAME_FUNC_OFFSET(15106, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL, _gloffset_MultiTexCoord1dARB),
+    NAME_FUNC_OFFSET(15124, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL, _gloffset_MultiTexCoord1dvARB),
+    NAME_FUNC_OFFSET(15143, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, _gloffset_MultiTexCoord1fARB),
+    NAME_FUNC_OFFSET(15161, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, _gloffset_MultiTexCoord1fvARB),
+    NAME_FUNC_OFFSET(15180, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL, _gloffset_MultiTexCoord1iARB),
+    NAME_FUNC_OFFSET(15198, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL, _gloffset_MultiTexCoord1ivARB),
+    NAME_FUNC_OFFSET(15217, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL, _gloffset_MultiTexCoord1sARB),
+    NAME_FUNC_OFFSET(15235, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL, _gloffset_MultiTexCoord1svARB),
+    NAME_FUNC_OFFSET(15254, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL, _gloffset_MultiTexCoord2dARB),
+    NAME_FUNC_OFFSET(15272, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL, _gloffset_MultiTexCoord2dvARB),
+    NAME_FUNC_OFFSET(15291, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, _gloffset_MultiTexCoord2fARB),
+    NAME_FUNC_OFFSET(15309, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, _gloffset_MultiTexCoord2fvARB),
+    NAME_FUNC_OFFSET(15328, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL, _gloffset_MultiTexCoord2iARB),
+    NAME_FUNC_OFFSET(15346, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL, _gloffset_MultiTexCoord2ivARB),
+    NAME_FUNC_OFFSET(15365, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL, _gloffset_MultiTexCoord2sARB),
+    NAME_FUNC_OFFSET(15383, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL, _gloffset_MultiTexCoord2svARB),
+    NAME_FUNC_OFFSET(15402, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL, _gloffset_MultiTexCoord3dARB),
+    NAME_FUNC_OFFSET(15420, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL, _gloffset_MultiTexCoord3dvARB),
+    NAME_FUNC_OFFSET(15439, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, _gloffset_MultiTexCoord3fARB),
+    NAME_FUNC_OFFSET(15457, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, _gloffset_MultiTexCoord3fvARB),
+    NAME_FUNC_OFFSET(15476, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL, _gloffset_MultiTexCoord3iARB),
+    NAME_FUNC_OFFSET(15494, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL, _gloffset_MultiTexCoord3ivARB),
+    NAME_FUNC_OFFSET(15513, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL, _gloffset_MultiTexCoord3sARB),
+    NAME_FUNC_OFFSET(15531, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL, _gloffset_MultiTexCoord3svARB),
+    NAME_FUNC_OFFSET(15550, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL, _gloffset_MultiTexCoord4dARB),
+    NAME_FUNC_OFFSET(15568, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL, _gloffset_MultiTexCoord4dvARB),
+    NAME_FUNC_OFFSET(15587, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, _gloffset_MultiTexCoord4fARB),
+    NAME_FUNC_OFFSET(15605, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, _gloffset_MultiTexCoord4fvARB),
+    NAME_FUNC_OFFSET(15624, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL, _gloffset_MultiTexCoord4iARB),
+    NAME_FUNC_OFFSET(15642, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL, _gloffset_MultiTexCoord4ivARB),
+    NAME_FUNC_OFFSET(15661, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL, _gloffset_MultiTexCoord4sARB),
+    NAME_FUNC_OFFSET(15679, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL, _gloffset_MultiTexCoord4svARB),
+    NAME_FUNC_OFFSET(15698, glStencilOpSeparate, glStencilOpSeparate, NULL, _gloffset_StencilOpSeparate),
+    NAME_FUNC_OFFSET(15721, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, _gloffset_LoadTransposeMatrixdARB),
+    NAME_FUNC_OFFSET(15744, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, _gloffset_LoadTransposeMatrixfARB),
+    NAME_FUNC_OFFSET(15767, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, _gloffset_MultTransposeMatrixdARB),
+    NAME_FUNC_OFFSET(15790, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB, NULL, _gloffset_MultTransposeMatrixfARB),
+    NAME_FUNC_OFFSET(15813, glSampleCoverageARB, glSampleCoverageARB, NULL, _gloffset_SampleCoverageARB),
+    NAME_FUNC_OFFSET(15830, glCompressedTexImage1DARB, glCompressedTexImage1DARB, NULL, _gloffset_CompressedTexImage1DARB),
+    NAME_FUNC_OFFSET(15853, glCompressedTexImage2DARB, glCompressedTexImage2DARB, NULL, _gloffset_CompressedTexImage2DARB),
+    NAME_FUNC_OFFSET(15876, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, _gloffset_CompressedTexImage3DARB),
+    NAME_FUNC_OFFSET(15899, glCompressedTexSubImage1DARB, glCompressedTexSubImage1DARB, NULL, _gloffset_CompressedTexSubImage1DARB),
+    NAME_FUNC_OFFSET(15925, glCompressedTexSubImage2DARB, glCompressedTexSubImage2DARB, NULL, _gloffset_CompressedTexSubImage2DARB),
+    NAME_FUNC_OFFSET(15951, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, _gloffset_CompressedTexSubImage3DARB),
+    NAME_FUNC_OFFSET(15977, glGetCompressedTexImageARB, glGetCompressedTexImageARB, NULL, _gloffset_GetCompressedTexImageARB),
+    NAME_FUNC_OFFSET(16001, glDisableVertexAttribArrayARB, glDisableVertexAttribArrayARB, NULL, _gloffset_DisableVertexAttribArrayARB),
+    NAME_FUNC_OFFSET(16028, glEnableVertexAttribArrayARB, glEnableVertexAttribArrayARB, NULL, _gloffset_EnableVertexAttribArrayARB),
+    NAME_FUNC_OFFSET(16054, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL, _gloffset_GetVertexAttribdvARB),
+    NAME_FUNC_OFFSET(16074, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL, _gloffset_GetVertexAttribfvARB),
+    NAME_FUNC_OFFSET(16094, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL, _gloffset_GetVertexAttribivARB),
+    NAME_FUNC_OFFSET(16114, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, _gloffset_ProgramEnvParameter4dARB),
+    NAME_FUNC_OFFSET(16137, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, _gloffset_ProgramEnvParameter4dvARB),
+    NAME_FUNC_OFFSET(16161, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, _gloffset_ProgramEnvParameter4fARB),
+    NAME_FUNC_OFFSET(16184, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, _gloffset_ProgramEnvParameter4fvARB),
+    NAME_FUNC_OFFSET(16208, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, _gloffset_VertexAttrib1dARB),
+    NAME_FUNC_OFFSET(16225, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL, _gloffset_VertexAttrib1dvARB),
+    NAME_FUNC_OFFSET(16243, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, _gloffset_VertexAttrib1fARB),
+    NAME_FUNC_OFFSET(16260, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, _gloffset_VertexAttrib1fvARB),
+    NAME_FUNC_OFFSET(16278, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, _gloffset_VertexAttrib1sARB),
+    NAME_FUNC_OFFSET(16295, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL, _gloffset_VertexAttrib1svARB),
+    NAME_FUNC_OFFSET(16313, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, _gloffset_VertexAttrib2dARB),
+    NAME_FUNC_OFFSET(16330, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL, _gloffset_VertexAttrib2dvARB),
+    NAME_FUNC_OFFSET(16348, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, _gloffset_VertexAttrib2fARB),
+    NAME_FUNC_OFFSET(16365, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, _gloffset_VertexAttrib2fvARB),
+    NAME_FUNC_OFFSET(16383, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, _gloffset_VertexAttrib2sARB),
+    NAME_FUNC_OFFSET(16400, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL, _gloffset_VertexAttrib2svARB),
+    NAME_FUNC_OFFSET(16418, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, _gloffset_VertexAttrib3dARB),
+    NAME_FUNC_OFFSET(16435, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL, _gloffset_VertexAttrib3dvARB),
+    NAME_FUNC_OFFSET(16453, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, _gloffset_VertexAttrib3fARB),
+    NAME_FUNC_OFFSET(16470, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, _gloffset_VertexAttrib3fvARB),
+    NAME_FUNC_OFFSET(16488, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, _gloffset_VertexAttrib3sARB),
+    NAME_FUNC_OFFSET(16505, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL, _gloffset_VertexAttrib3svARB),
+    NAME_FUNC_OFFSET(16523, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL, _gloffset_VertexAttrib4NbvARB),
+    NAME_FUNC_OFFSET(16542, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL, _gloffset_VertexAttrib4NivARB),
+    NAME_FUNC_OFFSET(16561, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL, _gloffset_VertexAttrib4NsvARB),
+    NAME_FUNC_OFFSET(16580, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL, _gloffset_VertexAttrib4NubARB),
+    NAME_FUNC_OFFSET(16599, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, _gloffset_VertexAttrib4NubvARB),
+    NAME_FUNC_OFFSET(16619, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, _gloffset_VertexAttrib4NuivARB),
+    NAME_FUNC_OFFSET(16639, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, _gloffset_VertexAttrib4NusvARB),
+    NAME_FUNC_OFFSET(16659, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, _gloffset_VertexAttrib4bvARB),
+    NAME_FUNC_OFFSET(16677, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, _gloffset_VertexAttrib4dARB),
+    NAME_FUNC_OFFSET(16694, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, _gloffset_VertexAttrib4dvARB),
+    NAME_FUNC_OFFSET(16712, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, _gloffset_VertexAttrib4fARB),
+    NAME_FUNC_OFFSET(16729, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, _gloffset_VertexAttrib4fvARB),
+    NAME_FUNC_OFFSET(16747, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, _gloffset_VertexAttrib4ivARB),
+    NAME_FUNC_OFFSET(16765, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, _gloffset_VertexAttrib4sARB),
+    NAME_FUNC_OFFSET(16782, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, _gloffset_VertexAttrib4svARB),
+    NAME_FUNC_OFFSET(16800, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, _gloffset_VertexAttrib4ubvARB),
+    NAME_FUNC_OFFSET(16819, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, _gloffset_VertexAttrib4uivARB),
+    NAME_FUNC_OFFSET(16838, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, _gloffset_VertexAttrib4usvARB),
+    NAME_FUNC_OFFSET(16857, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, _gloffset_VertexAttribPointerARB),
+    NAME_FUNC_OFFSET(16879, glBindBufferARB, glBindBufferARB, NULL, _gloffset_BindBufferARB),
+    NAME_FUNC_OFFSET(16892, glBufferDataARB, glBufferDataARB, NULL, _gloffset_BufferDataARB),
+    NAME_FUNC_OFFSET(16905, glBufferSubDataARB, glBufferSubDataARB, NULL, _gloffset_BufferSubDataARB),
+    NAME_FUNC_OFFSET(16921, glDeleteBuffersARB, glDeleteBuffersARB, NULL, _gloffset_DeleteBuffersARB),
+    NAME_FUNC_OFFSET(16937, glGenBuffersARB, glGenBuffersARB, NULL, _gloffset_GenBuffersARB),
+    NAME_FUNC_OFFSET(16950, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, _gloffset_GetBufferParameterivARB),
+    NAME_FUNC_OFFSET(16973, glGetBufferPointervARB, glGetBufferPointervARB, NULL, _gloffset_GetBufferPointervARB),
+    NAME_FUNC_OFFSET(16993, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, _gloffset_GetBufferSubDataARB),
+    NAME_FUNC_OFFSET(17012, glIsBufferARB, glIsBufferARB, NULL, _gloffset_IsBufferARB),
+    NAME_FUNC_OFFSET(17023, glMapBufferARB, glMapBufferARB, NULL, _gloffset_MapBufferARB),
+    NAME_FUNC_OFFSET(17035, glUnmapBufferARB, glUnmapBufferARB, NULL, _gloffset_UnmapBufferARB),
+    NAME_FUNC_OFFSET(17049, glBeginQueryARB, glBeginQueryARB, NULL, _gloffset_BeginQueryARB),
+    NAME_FUNC_OFFSET(17062, glDeleteQueriesARB, glDeleteQueriesARB, NULL, _gloffset_DeleteQueriesARB),
+    NAME_FUNC_OFFSET(17078, glEndQueryARB, glEndQueryARB, NULL, _gloffset_EndQueryARB),
+    NAME_FUNC_OFFSET(17089, glGenQueriesARB, glGenQueriesARB, NULL, _gloffset_GenQueriesARB),
+    NAME_FUNC_OFFSET(17102, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, _gloffset_GetQueryObjectivARB),
+    NAME_FUNC_OFFSET(17121, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, _gloffset_GetQueryObjectuivARB),
+    NAME_FUNC_OFFSET(17141, glGetQueryivARB, glGetQueryivARB, NULL, _gloffset_GetQueryivARB),
+    NAME_FUNC_OFFSET(17154, glIsQueryARB, glIsQueryARB, NULL, _gloffset_IsQueryARB),
+    NAME_FUNC_OFFSET(17164, glCompileShaderARB, glCompileShaderARB, NULL, _gloffset_CompileShaderARB),
+    NAME_FUNC_OFFSET(17180, glGetActiveUniformARB, glGetActiveUniformARB, NULL, _gloffset_GetActiveUniformARB),
+    NAME_FUNC_OFFSET(17199, glGetShaderSourceARB, glGetShaderSourceARB, NULL, _gloffset_GetShaderSourceARB),
+    NAME_FUNC_OFFSET(17217, glGetUniformLocationARB, glGetUniformLocationARB, NULL, _gloffset_GetUniformLocationARB),
+    NAME_FUNC_OFFSET(17238, glGetUniformfvARB, glGetUniformfvARB, NULL, _gloffset_GetUniformfvARB),
+    NAME_FUNC_OFFSET(17253, glGetUniformivARB, glGetUniformivARB, NULL, _gloffset_GetUniformivARB),
+    NAME_FUNC_OFFSET(17268, glLinkProgramARB, glLinkProgramARB, NULL, _gloffset_LinkProgramARB),
+    NAME_FUNC_OFFSET(17282, glShaderSourceARB, glShaderSourceARB, NULL, _gloffset_ShaderSourceARB),
+    NAME_FUNC_OFFSET(17297, glUniform1fARB, glUniform1fARB, NULL, _gloffset_Uniform1fARB),
+    NAME_FUNC_OFFSET(17309, glUniform1fvARB, glUniform1fvARB, NULL, _gloffset_Uniform1fvARB),
+    NAME_FUNC_OFFSET(17322, glUniform1iARB, glUniform1iARB, NULL, _gloffset_Uniform1iARB),
+    NAME_FUNC_OFFSET(17334, glUniform1ivARB, glUniform1ivARB, NULL, _gloffset_Uniform1ivARB),
+    NAME_FUNC_OFFSET(17347, glUniform2fARB, glUniform2fARB, NULL, _gloffset_Uniform2fARB),
+    NAME_FUNC_OFFSET(17359, glUniform2fvARB, glUniform2fvARB, NULL, _gloffset_Uniform2fvARB),
+    NAME_FUNC_OFFSET(17372, glUniform2iARB, glUniform2iARB, NULL, _gloffset_Uniform2iARB),
+    NAME_FUNC_OFFSET(17384, glUniform2ivARB, glUniform2ivARB, NULL, _gloffset_Uniform2ivARB),
+    NAME_FUNC_OFFSET(17397, glUniform3fARB, glUniform3fARB, NULL, _gloffset_Uniform3fARB),
+    NAME_FUNC_OFFSET(17409, glUniform3fvARB, glUniform3fvARB, NULL, _gloffset_Uniform3fvARB),
+    NAME_FUNC_OFFSET(17422, glUniform3iARB, glUniform3iARB, NULL, _gloffset_Uniform3iARB),
+    NAME_FUNC_OFFSET(17434, glUniform3ivARB, glUniform3ivARB, NULL, _gloffset_Uniform3ivARB),
+    NAME_FUNC_OFFSET(17447, glUniform4fARB, glUniform4fARB, NULL, _gloffset_Uniform4fARB),
+    NAME_FUNC_OFFSET(17459, glUniform4fvARB, glUniform4fvARB, NULL, _gloffset_Uniform4fvARB),
+    NAME_FUNC_OFFSET(17472, glUniform4iARB, glUniform4iARB, NULL, _gloffset_Uniform4iARB),
+    NAME_FUNC_OFFSET(17484, glUniform4ivARB, glUniform4ivARB, NULL, _gloffset_Uniform4ivARB),
+    NAME_FUNC_OFFSET(17497, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, _gloffset_UniformMatrix2fvARB),
+    NAME_FUNC_OFFSET(17516, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, _gloffset_UniformMatrix3fvARB),
+    NAME_FUNC_OFFSET(17535, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, _gloffset_UniformMatrix4fvARB),
+    NAME_FUNC_OFFSET(17554, glUseProgramObjectARB, glUseProgramObjectARB, NULL, _gloffset_UseProgramObjectARB),
+    NAME_FUNC_OFFSET(17567, glValidateProgramARB, glValidateProgramARB, NULL, _gloffset_ValidateProgramARB),
+    NAME_FUNC_OFFSET(17585, glBindAttribLocationARB, glBindAttribLocationARB, NULL, _gloffset_BindAttribLocationARB),
+    NAME_FUNC_OFFSET(17606, glGetActiveAttribARB, glGetActiveAttribARB, NULL, _gloffset_GetActiveAttribARB),
+    NAME_FUNC_OFFSET(17624, glGetAttribLocationARB, glGetAttribLocationARB, NULL, _gloffset_GetAttribLocationARB),
+    NAME_FUNC_OFFSET(17644, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
+    NAME_FUNC_OFFSET(17658, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
+    NAME_FUNC_OFFSET(17675, gl_dispatch_stub_574, gl_dispatch_stub_574, NULL, _gloffset_SampleMaskSGIS),
+    NAME_FUNC_OFFSET(17691, gl_dispatch_stub_575, gl_dispatch_stub_575, NULL, _gloffset_SamplePatternSGIS),
+    NAME_FUNC_OFFSET(17710, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(17728, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(17749, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(17771, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(17790, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(17812, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(17835, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
+    NAME_FUNC_OFFSET(17854, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
+    NAME_FUNC_OFFSET(17874, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
+    NAME_FUNC_OFFSET(17893, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
+    NAME_FUNC_OFFSET(17913, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
+    NAME_FUNC_OFFSET(17932, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
+    NAME_FUNC_OFFSET(17952, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
+    NAME_FUNC_OFFSET(17971, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
+    NAME_FUNC_OFFSET(17991, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
+    NAME_FUNC_OFFSET(18010, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
+    NAME_FUNC_OFFSET(18030, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
+    NAME_FUNC_OFFSET(18050, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
+    NAME_FUNC_OFFSET(18071, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
+    NAME_FUNC_OFFSET(18091, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
+    NAME_FUNC_OFFSET(18112, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
+    NAME_FUNC_OFFSET(18132, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
+    NAME_FUNC_OFFSET(18153, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
+    NAME_FUNC_OFFSET(18177, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
+    NAME_FUNC_OFFSET(18195, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
+    NAME_FUNC_OFFSET(18215, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
+    NAME_FUNC_OFFSET(18233, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
+    NAME_FUNC_OFFSET(18245, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
+    NAME_FUNC_OFFSET(18258, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
+    NAME_FUNC_OFFSET(18270, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
+    NAME_FUNC_OFFSET(18283, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
+    NAME_FUNC_OFFSET(18303, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
+    NAME_FUNC_OFFSET(18327, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
+    NAME_FUNC_OFFSET(18341, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
+    NAME_FUNC_OFFSET(18358, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
+    NAME_FUNC_OFFSET(18373, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
+    NAME_FUNC_OFFSET(18391, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
+    NAME_FUNC_OFFSET(18405, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
+    NAME_FUNC_OFFSET(18422, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
+    NAME_FUNC_OFFSET(18437, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
+    NAME_FUNC_OFFSET(18455, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
+    NAME_FUNC_OFFSET(18469, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
+    NAME_FUNC_OFFSET(18486, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
+    NAME_FUNC_OFFSET(18501, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
+    NAME_FUNC_OFFSET(18519, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
+    NAME_FUNC_OFFSET(18533, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
+    NAME_FUNC_OFFSET(18550, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
+    NAME_FUNC_OFFSET(18565, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
+    NAME_FUNC_OFFSET(18583, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
+    NAME_FUNC_OFFSET(18597, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
+    NAME_FUNC_OFFSET(18614, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
+    NAME_FUNC_OFFSET(18629, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
+    NAME_FUNC_OFFSET(18647, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
+    NAME_FUNC_OFFSET(18661, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
+    NAME_FUNC_OFFSET(18678, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
+    NAME_FUNC_OFFSET(18693, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
+    NAME_FUNC_OFFSET(18711, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
+    NAME_FUNC_OFFSET(18725, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
+    NAME_FUNC_OFFSET(18742, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
+    NAME_FUNC_OFFSET(18757, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
+    NAME_FUNC_OFFSET(18775, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
+    NAME_FUNC_OFFSET(18789, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
+    NAME_FUNC_OFFSET(18806, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
+    NAME_FUNC_OFFSET(18821, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
+    NAME_FUNC_OFFSET(18839, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
+    NAME_FUNC_OFFSET(18856, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
+    NAME_FUNC_OFFSET(18876, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
+    NAME_FUNC_OFFSET(18893, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
+    NAME_FUNC_OFFSET(18919, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
+    NAME_FUNC_OFFSET(18948, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
+    NAME_FUNC_OFFSET(18963, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
+    NAME_FUNC_OFFSET(18981, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
+    NAME_FUNC_OFFSET(19000, gl_dispatch_stub_745, gl_dispatch_stub_745, NULL, _gloffset_DeleteVertexArraysAPPLE),
+    NAME_FUNC_OFFSET(19021, gl_dispatch_stub_747, gl_dispatch_stub_747, NULL, _gloffset_IsVertexArrayAPPLE),
+    NAME_FUNC_OFFSET(19037, gl_dispatch_stub_755, gl_dispatch_stub_755, NULL, _gloffset_BlendEquationSeparateEXT),
+    NAME_FUNC_OFFSET(19061, gl_dispatch_stub_755, gl_dispatch_stub_755, NULL, _gloffset_BlendEquationSeparateEXT),
+    NAME_FUNC_OFFSET(19088, glBindFramebufferEXT, glBindFramebufferEXT, NULL, _gloffset_BindFramebufferEXT),
+    NAME_FUNC_OFFSET(19106, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, _gloffset_BindRenderbufferEXT),
+    NAME_FUNC_OFFSET(19125, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, _gloffset_CheckFramebufferStatusEXT),
+    NAME_FUNC_OFFSET(19150, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, _gloffset_DeleteFramebuffersEXT),
+    NAME_FUNC_OFFSET(19171, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, _gloffset_DeleteRenderbuffersEXT),
+    NAME_FUNC_OFFSET(19193, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, _gloffset_FramebufferRenderbufferEXT),
+    NAME_FUNC_OFFSET(19219, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, _gloffset_FramebufferTexture1DEXT),
+    NAME_FUNC_OFFSET(19242, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, _gloffset_FramebufferTexture2DEXT),
+    NAME_FUNC_OFFSET(19265, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, _gloffset_FramebufferTexture3DEXT),
+    NAME_FUNC_OFFSET(19288, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, _gloffset_GenFramebuffersEXT),
+    NAME_FUNC_OFFSET(19306, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, _gloffset_GenRenderbuffersEXT),
+    NAME_FUNC_OFFSET(19325, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, _gloffset_GenerateMipmapEXT),
+    NAME_FUNC_OFFSET(19342, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, _gloffset_GetFramebufferAttachmentParameterivEXT),
+    NAME_FUNC_OFFSET(19380, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, _gloffset_GetRenderbufferParameterivEXT),
+    NAME_FUNC_OFFSET(19409, glIsFramebufferEXT, glIsFramebufferEXT, NULL, _gloffset_IsFramebufferEXT),
+    NAME_FUNC_OFFSET(19425, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, _gloffset_IsRenderbufferEXT),
+    NAME_FUNC_OFFSET(19442, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, _gloffset_RenderbufferStorageEXT),
+    NAME_FUNC_OFFSET(19464, gl_dispatch_stub_773, gl_dispatch_stub_773, NULL, _gloffset_BlitFramebufferEXT),
+    NAME_FUNC_OFFSET(19482, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
     NAME_FUNC_OFFSET(-1, NULL, NULL, NULL, 0)
 };
 
diff --git a/src/mesa/main/enums.c b/src/mesa/main/enums.c
index 2745fb3d66..11f9a82e7c 100644
--- a/src/mesa/main/enums.c
+++ b/src/mesa/main/enums.c
@@ -1799,6 +1799,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_VENDOR\0"
    "GL_VERSION\0"
    "GL_VERTEX_ARRAY\0"
+   "GL_VERTEX_ARRAY_BINDING\0"
    "GL_VERTEX_ARRAY_BINDING_APPLE\0"
    "GL_VERTEX_ARRAY_BUFFER_BINDING\0"
    "GL_VERTEX_ARRAY_BUFFER_BINDING_ARB\0"
@@ -1870,7 +1871,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_ZOOM_Y\0"
    ;
 
-static const enum_elt all_enums[1832] =
+static const enum_elt all_enums[1833] =
 {
    {     0, 0x00000600 }, /* GL_2D */
    {     6, 0x00001407 }, /* GL_2_BYTES */
@@ -3635,75 +3636,76 @@ static const enum_elt all_enums[1832] =
    { 37885, 0x00001F00 }, /* GL_VENDOR */
    { 37895, 0x00001F02 }, /* GL_VERSION */
    { 37906, 0x00008074 }, /* GL_VERTEX_ARRAY */
-   { 37922, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
-   { 37952, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-   { 37983, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
-   { 38018, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
-   { 38042, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
-   { 38063, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
-   { 38086, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
-   { 38107, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-   { 38134, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-   { 38162, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-   { 38190, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-   { 38218, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-   { 38246, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-   { 38274, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
-   { 38302, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-   { 38329, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-   { 38356, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-   { 38383, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-   { 38410, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-   { 38437, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-   { 38464, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-   { 38491, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-   { 38518, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-   { 38545, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-   { 38583, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
-   { 38625, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-   { 38656, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
-   { 38691, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
-   { 38725, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
-   { 38763, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-   { 38794, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
-   { 38829, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-   { 38857, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
-   { 38889, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-   { 38919, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
-   { 38953, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
-   { 38981, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
-   { 39013, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
-   { 39033, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
-   { 39055, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
-   { 39084, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
-   { 39105, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-   { 39134, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
-   { 39167, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
-   { 39199, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-   { 39226, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
-   { 39257, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
-   { 39287, 0x00008B31 }, /* GL_VERTEX_SHADER */
-   { 39304, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
-   { 39325, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
-   { 39352, 0x00000BA2 }, /* GL_VIEWPORT */
-   { 39364, 0x00000800 }, /* GL_VIEWPORT_BIT */
-   { 39380, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
-   { 39400, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-   { 39431, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
-   { 39466, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-   { 39494, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-   { 39519, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-   { 39546, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-   { 39571, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
-   { 39595, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
-   { 39614, 0x000088B9 }, /* GL_WRITE_ONLY */
-   { 39628, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
-   { 39646, 0x00001506 }, /* GL_XOR */
-   { 39653, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
-   { 39672, 0x00008757 }, /* GL_YCBCR_MESA */
-   { 39686, 0x00000000 }, /* GL_ZERO */
-   { 39694, 0x00000D16 }, /* GL_ZOOM_X */
-   { 39704, 0x00000D17 }, /* GL_ZOOM_Y */
+   { 37922, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING */
+   { 37946, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
+   { 37976, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+   { 38007, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
+   { 38042, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
+   { 38066, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
+   { 38087, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
+   { 38110, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
+   { 38131, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+   { 38158, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+   { 38186, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+   { 38214, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+   { 38242, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+   { 38270, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+   { 38298, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+   { 38326, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+   { 38353, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+   { 38380, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+   { 38407, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+   { 38434, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+   { 38461, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+   { 38488, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+   { 38515, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+   { 38542, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+   { 38569, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+   { 38607, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
+   { 38649, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+   { 38680, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
+   { 38715, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+   { 38749, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
+   { 38787, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+   { 38818, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
+   { 38853, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+   { 38881, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
+   { 38913, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+   { 38943, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
+   { 38977, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+   { 39005, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
+   { 39037, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
+   { 39057, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
+   { 39079, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
+   { 39108, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
+   { 39129, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
+   { 39158, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
+   { 39191, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
+   { 39223, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+   { 39250, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
+   { 39281, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
+   { 39311, 0x00008B31 }, /* GL_VERTEX_SHADER */
+   { 39328, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
+   { 39349, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
+   { 39376, 0x00000BA2 }, /* GL_VIEWPORT */
+   { 39388, 0x00000800 }, /* GL_VIEWPORT_BIT */
+   { 39404, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
+   { 39424, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+   { 39455, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
+   { 39490, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+   { 39518, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+   { 39543, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+   { 39570, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+   { 39595, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
+   { 39619, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
+   { 39638, 0x000088B9 }, /* GL_WRITE_ONLY */
+   { 39652, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
+   { 39670, 0x00001506 }, /* GL_XOR */
+   { 39677, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
+   { 39696, 0x00008757 }, /* GL_YCBCR_MESA */
+   { 39710, 0x00000000 }, /* GL_ZERO */
+   { 39718, 0x00000D16 }, /* GL_ZOOM_X */
+   { 39728, 0x00000D17 }, /* GL_ZOOM_Y */
 };
 
 static const unsigned reduced_enums[1325] =
@@ -3848,7 +3850,7 @@ static const unsigned reduced_enums[1325] =
       1504, /* GL_STENCIL_WRITEMASK */
        839, /* GL_MATRIX_MODE */
       1007, /* GL_NORMALIZE */
-      1813, /* GL_VIEWPORT */
+      1814, /* GL_VIEWPORT */
        981, /* GL_MODELVIEW_STACK_DEPTH */
       1244, /* GL_PROJECTION_STACK_DEPTH */
       1699, /* GL_TEXTURE_STACK_DEPTH */
@@ -3928,8 +3930,8 @@ static const unsigned reduced_enums[1325] =
        628, /* GL_INDEX_OFFSET */
       1291, /* GL_RED_SCALE */
       1289, /* GL_RED_BIAS */
-      1830, /* GL_ZOOM_X */
-      1831, /* GL_ZOOM_Y */
+      1831, /* GL_ZOOM_X */
+      1832, /* GL_ZOOM_Y */
        590, /* GL_GREEN_SCALE */
        588, /* GL_GREEN_BIAS */
         92, /* GL_BLUE_SCALE */
@@ -4030,7 +4032,7 @@ static const unsigned reduced_enums[1325] =
        295, /* GL_COPY */
         50, /* GL_AND_INVERTED */
       1005, /* GL_NOOP */
-      1826, /* GL_XOR */
+      1827, /* GL_XOR */
       1067, /* GL_OR */
       1006, /* GL_NOR */
        462, /* GL_EQUIV */
@@ -4255,9 +4257,9 @@ static const unsigned reduced_enums[1325] =
        618, /* GL_INDEX_ARRAY */
       1634, /* GL_TEXTURE_COORD_ARRAY */
        451, /* GL_EDGE_FLAG_ARRAY */
-      1767, /* GL_VERTEX_ARRAY_SIZE */
-      1769, /* GL_VERTEX_ARRAY_TYPE */
-      1768, /* GL_VERTEX_ARRAY_STRIDE */
+      1768, /* GL_VERTEX_ARRAY_SIZE */
+      1770, /* GL_VERTEX_ARRAY_TYPE */
+      1769, /* GL_VERTEX_ARRAY_STRIDE */
       1013, /* GL_NORMAL_ARRAY_TYPE */
       1012, /* GL_NORMAL_ARRAY_STRIDE */
        149, /* GL_COLOR_ARRAY_SIZE */
@@ -4269,7 +4271,7 @@ static const unsigned reduced_enums[1325] =
       1640, /* GL_TEXTURE_COORD_ARRAY_TYPE */
       1639, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
        455, /* GL_EDGE_FLAG_ARRAY_STRIDE */
-      1766, /* GL_VERTEX_ARRAY_POINTER */
+      1767, /* GL_VERTEX_ARRAY_POINTER */
       1011, /* GL_NORMAL_ARRAY_POINTER */
        148, /* GL_COLOR_ARRAY_POINTER */
        621, /* GL_INDEX_ARRAY_POINTER */
@@ -4369,7 +4371,7 @@ static const unsigned reduced_enums[1325] =
        302, /* GL_CULL_VERTEX_EXT */
        304, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
        303, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
-      1823, /* GL_WRAP_BORDER_SUN */
+      1824, /* GL_WRAP_BORDER_SUN */
       1618, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
        676, /* GL_LIGHT_MODEL_COLOR_CONTROL */
       1415, /* GL_SINGLE_COLOR */
@@ -4535,19 +4537,19 @@ static const unsigned reduced_enums[1325] =
       1053, /* GL_OPERAND1_ALPHA */
       1059, /* GL_OPERAND2_ALPHA */
       1065, /* GL_OPERAND3_ALPHA_NV */
-      1763, /* GL_VERTEX_ARRAY_BINDING_APPLE */
-      1827, /* GL_YCBCR_422_APPLE */
+      1763, /* GL_VERTEX_ARRAY_BINDING */
+      1828, /* GL_YCBCR_422_APPLE */
       1752, /* GL_UNSIGNED_SHORT_8_8_APPLE */
       1754, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
       1417, /* GL_SLICE_ACCUM_SUN */
       1267, /* GL_QUAD_MESH_SUN */
       1723, /* GL_TRIANGLE_MESH_SUN */
-      1801, /* GL_VERTEX_PROGRAM_ARB */
-      1812, /* GL_VERTEX_STATE_PROGRAM_NV */
-      1788, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-      1794, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-      1796, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-      1798, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+      1802, /* GL_VERTEX_PROGRAM_ARB */
+      1813, /* GL_VERTEX_STATE_PROGRAM_NV */
+      1789, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+      1795, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+      1797, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+      1799, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
        330, /* GL_CURRENT_VERTEX_ATTRIB */
       1221, /* GL_PROGRAM_LENGTH_ARB */
       1235, /* GL_PROGRAM_STRING_ARB */
@@ -4568,33 +4570,33 @@ static const unsigned reduced_enums[1325] =
        831, /* GL_MATRIX7_NV */
        314, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
        311, /* GL_CURRENT_MATRIX_ARB */
-      1804, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-      1807, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+      1805, /* GL_VERTEX_PROGRAM_POINT_SIZE */
+      1808, /* GL_VERTEX_PROGRAM_TWO_SIDE */
       1233, /* GL_PROGRAM_PARAMETER_NV */
-      1792, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+      1793, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
       1237, /* GL_PROGRAM_TARGET_NV */
       1234, /* GL_PROGRAM_RESIDENT_NV */
       1708, /* GL_TRACK_MATRIX_NV */
       1709, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-      1802, /* GL_VERTEX_PROGRAM_BINDING_NV */
+      1803, /* GL_VERTEX_PROGRAM_BINDING_NV */
       1215, /* GL_PROGRAM_ERROR_POSITION_ARB */
        351, /* GL_DEPTH_CLAMP_NV */
-      1770, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-      1777, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-      1778, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-      1779, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-      1780, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-      1781, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-      1782, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-      1783, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-      1784, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-      1785, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-      1771, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-      1772, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-      1773, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-      1774, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-      1775, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-      1776, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+      1771, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+      1778, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+      1779, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+      1780, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+      1781, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+      1782, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+      1783, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+      1784, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+      1785, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+      1786, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+      1772, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+      1773, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+      1774, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+      1775, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+      1776, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+      1777, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
        743, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
        750, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
        751, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
@@ -4633,14 +4635,14 @@ static const unsigned reduced_enums[1325] =
        266, /* GL_COMPRESSED_TEXTURE_FORMATS */
        928, /* GL_MAX_VERTEX_UNITS_ARB */
         22, /* GL_ACTIVE_VERTEX_UNITS_ARB */
-      1822, /* GL_WEIGHT_SUM_UNITY_ARB */
-      1800, /* GL_VERTEX_BLEND_ARB */
+      1823, /* GL_WEIGHT_SUM_UNITY_ARB */
+      1801, /* GL_VERTEX_BLEND_ARB */
        332, /* GL_CURRENT_WEIGHT_ARB */
-      1821, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-      1820, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-      1819, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-      1818, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-      1815, /* GL_WEIGHT_ARRAY_ARB */
+      1822, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+      1821, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+      1820, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+      1819, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+      1816, /* GL_WEIGHT_ARRAY_ARB */
        379, /* GL_DOT3_RGB */
        380, /* GL_DOT3_RGBA */
        260, /* GL_COMPRESSED_RGB_FXT1_3DFX */
@@ -4685,7 +4687,7 @@ static const unsigned reduced_enums[1325] =
        983, /* GL_MODULATE_ADD_ATI */
        984, /* GL_MODULATE_SIGNED_ADD_ATI */
        985, /* GL_MODULATE_SUBTRACT_ATI */
-      1828, /* GL_YCBCR_MESA */
+      1829, /* GL_YCBCR_MESA */
       1074, /* GL_PACK_INVERT_MESA */
        335, /* GL_DEBUG_OBJECT_MESA */
        336, /* GL_DEBUG_PRINT_MESA */
@@ -4758,7 +4760,7 @@ static const unsigned reduced_enums[1325] =
       1271, /* GL_QUERY_RESULT */
       1273, /* GL_QUERY_RESULT_AVAILABLE */
        922, /* GL_MAX_VERTEX_ATTRIBS */
-      1790, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+      1791, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
        370, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
        369, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
        908, /* GL_MAX_TEXTURE_COORDS */
@@ -4773,7 +4775,7 @@ static const unsigned reduced_enums[1325] =
        456, /* GL_ELEMENT_ARRAY_BUFFER */
         53, /* GL_ARRAY_BUFFER_BINDING */
        457, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
-      1764, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+      1765, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
       1009, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
        146, /* GL_COLOR_ARRAY_BUFFER_BINDING */
        619, /* GL_INDEX_ARRAY_BUFFER_BINDING */
@@ -4781,8 +4783,8 @@ static const unsigned reduced_enums[1325] =
        452, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
       1392, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
        505, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
-      1816, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-      1786, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+      1817, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+      1787, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
       1220, /* GL_PROGRAM_INSTRUCTIONS_ARB */
        883, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
       1226, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
@@ -4808,7 +4810,7 @@ static const unsigned reduced_enums[1325] =
       1241, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
       1713, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
       1282, /* GL_READ_ONLY */
-      1824, /* GL_WRITE_ONLY */
+      1825, /* GL_WRITE_ONLY */
       1284, /* GL_READ_WRITE */
        101, /* GL_BUFFER_ACCESS */
        103, /* GL_BUFFER_MAPPED */
@@ -4872,7 +4874,7 @@ static const unsigned reduced_enums[1325] =
        943, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
       1373, /* GL_SAMPLES_PASSED */
        528, /* GL_FRAGMENT_SHADER */
-      1810, /* GL_VERTEX_SHADER */
+      1811, /* GL_VERTEX_SHADER */
       1231, /* GL_PROGRAM_OBJECT_ARB */
       1405, /* GL_SHADER_OBJECT_ARB */
        867, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
diff --git a/src/mesa/sparc/glapi_sparc.S b/src/mesa/sparc/glapi_sparc.S
index c1663dfc83..12d74fa4fb 100644
--- a/src/mesa/sparc/glapi_sparc.S
+++ b/src/mesa/sparc/glapi_sparc.S
@@ -761,24 +761,26 @@ gl_dispatch_functions_start:
 	GL_STUB(glRenderbufferStorageMultisample, _gloffset_RenderbufferStorageMultisample)
 	GL_STUB(glFlushMappedBufferRange, _gloffset_FlushMappedBufferRange)
 	GL_STUB(glMapBufferRange, _gloffset_MapBufferRange)
+	GL_STUB(glBindVertexArray, _gloffset_BindVertexArray)
+	GL_STUB(glGenVertexArrays, _gloffset_GenVertexArrays)
 	GL_STUB(glCopyBufferSubData, _gloffset_CopyBufferSubData)
 	GL_STUB(glPolygonOffsetEXT, _gloffset_PolygonOffsetEXT)
-	GL_STUB(gl_dispatch_stub_566, _gloffset_GetPixelTexGenParameterfvSGIS)
-	HIDDEN(gl_dispatch_stub_566)
-	GL_STUB(gl_dispatch_stub_567, _gloffset_GetPixelTexGenParameterivSGIS)
-	HIDDEN(gl_dispatch_stub_567)
-	GL_STUB(gl_dispatch_stub_568, _gloffset_PixelTexGenParameterfSGIS)
+	GL_STUB(gl_dispatch_stub_568, _gloffset_GetPixelTexGenParameterfvSGIS)
 	HIDDEN(gl_dispatch_stub_568)
-	GL_STUB(gl_dispatch_stub_569, _gloffset_PixelTexGenParameterfvSGIS)
+	GL_STUB(gl_dispatch_stub_569, _gloffset_GetPixelTexGenParameterivSGIS)
 	HIDDEN(gl_dispatch_stub_569)
-	GL_STUB(gl_dispatch_stub_570, _gloffset_PixelTexGenParameteriSGIS)
+	GL_STUB(gl_dispatch_stub_570, _gloffset_PixelTexGenParameterfSGIS)
 	HIDDEN(gl_dispatch_stub_570)
-	GL_STUB(gl_dispatch_stub_571, _gloffset_PixelTexGenParameterivSGIS)
+	GL_STUB(gl_dispatch_stub_571, _gloffset_PixelTexGenParameterfvSGIS)
 	HIDDEN(gl_dispatch_stub_571)
-	GL_STUB(gl_dispatch_stub_572, _gloffset_SampleMaskSGIS)
+	GL_STUB(gl_dispatch_stub_572, _gloffset_PixelTexGenParameteriSGIS)
 	HIDDEN(gl_dispatch_stub_572)
-	GL_STUB(gl_dispatch_stub_573, _gloffset_SamplePatternSGIS)
+	GL_STUB(gl_dispatch_stub_573, _gloffset_PixelTexGenParameterivSGIS)
 	HIDDEN(gl_dispatch_stub_573)
+	GL_STUB(gl_dispatch_stub_574, _gloffset_SampleMaskSGIS)
+	HIDDEN(gl_dispatch_stub_574)
+	GL_STUB(gl_dispatch_stub_575, _gloffset_SamplePatternSGIS)
+	HIDDEN(gl_dispatch_stub_575)
 	GL_STUB(glColorPointerEXT, _gloffset_ColorPointerEXT)
 	GL_STUB(glEdgeFlagPointerEXT, _gloffset_EdgeFlagPointerEXT)
 	GL_STUB(glIndexPointerEXT, _gloffset_IndexPointerEXT)
@@ -789,10 +791,10 @@ gl_dispatch_functions_start:
 	GL_STUB(glPointParameterfvEXT, _gloffset_PointParameterfvEXT)
 	GL_STUB(glLockArraysEXT, _gloffset_LockArraysEXT)
 	GL_STUB(glUnlockArraysEXT, _gloffset_UnlockArraysEXT)
-	GL_STUB(gl_dispatch_stub_584, _gloffset_CullParameterdvEXT)
-	HIDDEN(gl_dispatch_stub_584)
-	GL_STUB(gl_dispatch_stub_585, _gloffset_CullParameterfvEXT)
-	HIDDEN(gl_dispatch_stub_585)
+	GL_STUB(gl_dispatch_stub_586, _gloffset_CullParameterdvEXT)
+	HIDDEN(gl_dispatch_stub_586)
+	GL_STUB(gl_dispatch_stub_587, _gloffset_CullParameterfvEXT)
+	HIDDEN(gl_dispatch_stub_587)
 	GL_STUB(glSecondaryColor3bEXT, _gloffset_SecondaryColor3bEXT)
 	GL_STUB(glSecondaryColor3bvEXT, _gloffset_SecondaryColor3bvEXT)
 	GL_STUB(glSecondaryColor3dEXT, _gloffset_SecondaryColor3dEXT)
@@ -817,8 +819,8 @@ gl_dispatch_functions_start:
 	GL_STUB(glFogCoorddvEXT, _gloffset_FogCoorddvEXT)
 	GL_STUB(glFogCoordfEXT, _gloffset_FogCoordfEXT)
 	GL_STUB(glFogCoordfvEXT, _gloffset_FogCoordfvEXT)
-	GL_STUB(gl_dispatch_stub_610, _gloffset_PixelTexGenSGIX)
-	HIDDEN(gl_dispatch_stub_610)
+	GL_STUB(gl_dispatch_stub_612, _gloffset_PixelTexGenSGIX)
+	HIDDEN(gl_dispatch_stub_612)
 	GL_STUB(glBlendFuncSeparateEXT, _gloffset_BlendFuncSeparateEXT)
 	GL_STUB(glFlushVertexArrayRangeNV, _gloffset_FlushVertexArrayRangeNV)
 	GL_STUB(glVertexArrayRangeNV, _gloffset_VertexArrayRangeNV)
@@ -860,24 +862,24 @@ gl_dispatch_functions_start:
 	GL_STUB(glWindowPos4ivMESA, _gloffset_WindowPos4ivMESA)
 	GL_STUB(glWindowPos4sMESA, _gloffset_WindowPos4sMESA)
 	GL_STUB(glWindowPos4svMESA, _gloffset_WindowPos4svMESA)
-	GL_STUB(gl_dispatch_stub_652, _gloffset_MultiModeDrawArraysIBM)
-	HIDDEN(gl_dispatch_stub_652)
-	GL_STUB(gl_dispatch_stub_653, _gloffset_MultiModeDrawElementsIBM)
-	HIDDEN(gl_dispatch_stub_653)
-	GL_STUB(gl_dispatch_stub_654, _gloffset_DeleteFencesNV)
+	GL_STUB(gl_dispatch_stub_654, _gloffset_MultiModeDrawArraysIBM)
 	HIDDEN(gl_dispatch_stub_654)
-	GL_STUB(gl_dispatch_stub_655, _gloffset_FinishFenceNV)
+	GL_STUB(gl_dispatch_stub_655, _gloffset_MultiModeDrawElementsIBM)
 	HIDDEN(gl_dispatch_stub_655)
-	GL_STUB(gl_dispatch_stub_656, _gloffset_GenFencesNV)
+	GL_STUB(gl_dispatch_stub_656, _gloffset_DeleteFencesNV)
 	HIDDEN(gl_dispatch_stub_656)
-	GL_STUB(gl_dispatch_stub_657, _gloffset_GetFenceivNV)
+	GL_STUB(gl_dispatch_stub_657, _gloffset_FinishFenceNV)
 	HIDDEN(gl_dispatch_stub_657)
-	GL_STUB(gl_dispatch_stub_658, _gloffset_IsFenceNV)
+	GL_STUB(gl_dispatch_stub_658, _gloffset_GenFencesNV)
 	HIDDEN(gl_dispatch_stub_658)
-	GL_STUB(gl_dispatch_stub_659, _gloffset_SetFenceNV)
+	GL_STUB(gl_dispatch_stub_659, _gloffset_GetFenceivNV)
 	HIDDEN(gl_dispatch_stub_659)
-	GL_STUB(gl_dispatch_stub_660, _gloffset_TestFenceNV)
+	GL_STUB(gl_dispatch_stub_660, _gloffset_IsFenceNV)
 	HIDDEN(gl_dispatch_stub_660)
+	GL_STUB(gl_dispatch_stub_661, _gloffset_SetFenceNV)
+	HIDDEN(gl_dispatch_stub_661)
+	GL_STUB(gl_dispatch_stub_662, _gloffset_TestFenceNV)
+	HIDDEN(gl_dispatch_stub_662)
 	GL_STUB(glAreProgramsResidentNV, _gloffset_AreProgramsResidentNV)
 	GL_STUB(glBindProgramNV, _gloffset_BindProgramNV)
 	GL_STUB(glDeleteProgramsNV, _gloffset_DeleteProgramsNV)
@@ -958,26 +960,26 @@ gl_dispatch_functions_start:
 	GL_STUB(glSetFragmentShaderConstantATI, _gloffset_SetFragmentShaderConstantATI)
 	GL_STUB(glPointParameteriNV, _gloffset_PointParameteriNV)
 	GL_STUB(glPointParameterivNV, _gloffset_PointParameterivNV)
-	GL_STUB(gl_dispatch_stub_741, _gloffset_ActiveStencilFaceEXT)
-	HIDDEN(gl_dispatch_stub_741)
-	GL_STUB(gl_dispatch_stub_742, _gloffset_BindVertexArrayAPPLE)
-	HIDDEN(gl_dispatch_stub_742)
-	GL_STUB(gl_dispatch_stub_743, _gloffset_DeleteVertexArraysAPPLE)
+	GL_STUB(gl_dispatch_stub_743, _gloffset_ActiveStencilFaceEXT)
 	HIDDEN(gl_dispatch_stub_743)
-	GL_STUB(gl_dispatch_stub_744, _gloffset_GenVertexArraysAPPLE)
+	GL_STUB(gl_dispatch_stub_744, _gloffset_BindVertexArrayAPPLE)
 	HIDDEN(gl_dispatch_stub_744)
-	GL_STUB(gl_dispatch_stub_745, _gloffset_IsVertexArrayAPPLE)
+	GL_STUB(gl_dispatch_stub_745, _gloffset_DeleteVertexArraysAPPLE)
 	HIDDEN(gl_dispatch_stub_745)
+	GL_STUB(gl_dispatch_stub_746, _gloffset_GenVertexArraysAPPLE)
+	HIDDEN(gl_dispatch_stub_746)
+	GL_STUB(gl_dispatch_stub_747, _gloffset_IsVertexArrayAPPLE)
+	HIDDEN(gl_dispatch_stub_747)
 	GL_STUB(glGetProgramNamedParameterdvNV, _gloffset_GetProgramNamedParameterdvNV)
 	GL_STUB(glGetProgramNamedParameterfvNV, _gloffset_GetProgramNamedParameterfvNV)
 	GL_STUB(glProgramNamedParameter4dNV, _gloffset_ProgramNamedParameter4dNV)
 	GL_STUB(glProgramNamedParameter4dvNV, _gloffset_ProgramNamedParameter4dvNV)
 	GL_STUB(glProgramNamedParameter4fNV, _gloffset_ProgramNamedParameter4fNV)
 	GL_STUB(glProgramNamedParameter4fvNV, _gloffset_ProgramNamedParameter4fvNV)
-	GL_STUB(gl_dispatch_stub_752, _gloffset_DepthBoundsEXT)
-	HIDDEN(gl_dispatch_stub_752)
-	GL_STUB(gl_dispatch_stub_753, _gloffset_BlendEquationSeparateEXT)
-	HIDDEN(gl_dispatch_stub_753)
+	GL_STUB(gl_dispatch_stub_754, _gloffset_DepthBoundsEXT)
+	HIDDEN(gl_dispatch_stub_754)
+	GL_STUB(gl_dispatch_stub_755, _gloffset_BlendEquationSeparateEXT)
+	HIDDEN(gl_dispatch_stub_755)
 	GL_STUB(glBindFramebufferEXT, _gloffset_BindFramebufferEXT)
 	GL_STUB(glBindRenderbufferEXT, _gloffset_BindRenderbufferEXT)
 	GL_STUB(glCheckFramebufferStatusEXT, _gloffset_CheckFramebufferStatusEXT)
@@ -995,20 +997,20 @@ gl_dispatch_functions_start:
 	GL_STUB(glIsFramebufferEXT, _gloffset_IsFramebufferEXT)
 	GL_STUB(glIsRenderbufferEXT, _gloffset_IsRenderbufferEXT)
 	GL_STUB(glRenderbufferStorageEXT, _gloffset_RenderbufferStorageEXT)
-	GL_STUB(gl_dispatch_stub_771, _gloffset_BlitFramebufferEXT)
-	HIDDEN(gl_dispatch_stub_771)
+	GL_STUB(gl_dispatch_stub_773, _gloffset_BlitFramebufferEXT)
+	HIDDEN(gl_dispatch_stub_773)
 	GL_STUB(glFramebufferTextureLayerEXT, _gloffset_FramebufferTextureLayerEXT)
 	GL_STUB(glProvokingVertexEXT, _gloffset_ProvokingVertexEXT)
-	GL_STUB(gl_dispatch_stub_774, _gloffset_StencilFuncSeparateATI)
-	HIDDEN(gl_dispatch_stub_774)
-	GL_STUB(gl_dispatch_stub_775, _gloffset_ProgramEnvParameters4fvEXT)
-	HIDDEN(gl_dispatch_stub_775)
-	GL_STUB(gl_dispatch_stub_776, _gloffset_ProgramLocalParameters4fvEXT)
+	GL_STUB(gl_dispatch_stub_776, _gloffset_StencilFuncSeparateATI)
 	HIDDEN(gl_dispatch_stub_776)
-	GL_STUB(gl_dispatch_stub_777, _gloffset_GetQueryObjecti64vEXT)
+	GL_STUB(gl_dispatch_stub_777, _gloffset_ProgramEnvParameters4fvEXT)
 	HIDDEN(gl_dispatch_stub_777)
-	GL_STUB(gl_dispatch_stub_778, _gloffset_GetQueryObjectui64vEXT)
+	GL_STUB(gl_dispatch_stub_778, _gloffset_ProgramLocalParameters4fvEXT)
 	HIDDEN(gl_dispatch_stub_778)
+	GL_STUB(gl_dispatch_stub_779, _gloffset_GetQueryObjecti64vEXT)
+	HIDDEN(gl_dispatch_stub_779)
+	GL_STUB(gl_dispatch_stub_780, _gloffset_GetQueryObjectui64vEXT)
+	HIDDEN(gl_dispatch_stub_780)
 	GL_STUB_ALIAS(glArrayElementEXT, glArrayElement)
 	GL_STUB_ALIAS(glBindTextureEXT, glBindTexture)
 	GL_STUB_ALIAS(glDrawArraysEXT, glDrawArrays)
diff --git a/src/mesa/x86-64/glapi_x86-64.S b/src/mesa/x86-64/glapi_x86-64.S
index 98b9ef3819..90ad36a8f3 100644
--- a/src/mesa/x86-64/glapi_x86-64.S
+++ b/src/mesa/x86-64/glapi_x86-64.S
@@ -21238,13 +21238,79 @@ GL_PREFIX(MapBufferRange):
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(MapBufferRange), .-GL_PREFIX(MapBufferRange)
 
+	.p2align	4,,15
+	.globl	GL_PREFIX(BindVertexArray)
+	.type	GL_PREFIX(BindVertexArray), @function
+GL_PREFIX(BindVertexArray):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	4512(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	call	_x86_64_get_dispatch@PLT
+	popq	%rdi
+	movq	4512(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	4512(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	call	_glapi_get_dispatch
+	popq	%rdi
+	movq	4512(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(BindVertexArray), .-GL_PREFIX(BindVertexArray)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(GenVertexArrays)
+	.type	GL_PREFIX(GenVertexArrays), @function
+GL_PREFIX(GenVertexArrays):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	4520(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
+	call	_x86_64_get_dispatch@PLT
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
+	movq	4520(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	4520(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
+	call	_glapi_get_dispatch
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
+	movq	4520(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(GenVertexArrays), .-GL_PREFIX(GenVertexArrays)
+
 	.p2align	4,,15
 	.globl	GL_PREFIX(CopyBufferSubData)
 	.type	GL_PREFIX(CopyBufferSubData), @function
 GL_PREFIX(CopyBufferSubData):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4512(%rax), %r11
+	movq	4528(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21258,13 +21324,13 @@ GL_PREFIX(CopyBufferSubData):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4512(%rax), %r11
+	movq	4528(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4512(%rax), %r11
+	movq	4528(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21278,7 +21344,7 @@ GL_PREFIX(CopyBufferSubData):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4512(%rax), %r11
+	movq	4528(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CopyBufferSubData), .-GL_PREFIX(CopyBufferSubData)
@@ -21289,7 +21355,7 @@ GL_PREFIX(CopyBufferSubData):
 GL_PREFIX(PolygonOffsetEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4520(%rax), %r11
+	movq	4536(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -21299,13 +21365,13 @@ GL_PREFIX(PolygonOffsetEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	4520(%rax), %r11
+	movq	4536(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4520(%rax), %r11
+	movq	4536(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -21315,19 +21381,19 @@ GL_PREFIX(PolygonOffsetEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	4520(%rax), %r11
+	movq	4536(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PolygonOffsetEXT), .-GL_PREFIX(PolygonOffsetEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_566)
-	.type	GL_PREFIX(_dispatch_stub_566), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_566))
-GL_PREFIX(_dispatch_stub_566):
+	.globl	GL_PREFIX(_dispatch_stub_568)
+	.type	GL_PREFIX(_dispatch_stub_568), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_568))
+GL_PREFIX(_dispatch_stub_568):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4528(%rax), %r11
+	movq	4544(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21337,13 +21403,13 @@ GL_PREFIX(_dispatch_stub_566):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4528(%rax), %r11
+	movq	4544(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4528(%rax), %r11
+	movq	4544(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21353,19 +21419,19 @@ GL_PREFIX(_dispatch_stub_566):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4528(%rax), %r11
+	movq	4544(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_566), .-GL_PREFIX(_dispatch_stub_566)
+	.size	GL_PREFIX(_dispatch_stub_568), .-GL_PREFIX(_dispatch_stub_568)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_567)
-	.type	GL_PREFIX(_dispatch_stub_567), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_567))
-GL_PREFIX(_dispatch_stub_567):
+	.globl	GL_PREFIX(_dispatch_stub_569)
+	.type	GL_PREFIX(_dispatch_stub_569), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_569))
+GL_PREFIX(_dispatch_stub_569):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4536(%rax), %r11
+	movq	4552(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21375,13 +21441,13 @@ GL_PREFIX(_dispatch_stub_567):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4536(%rax), %r11
+	movq	4552(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4536(%rax), %r11
+	movq	4552(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21391,19 +21457,19 @@ GL_PREFIX(_dispatch_stub_567):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4536(%rax), %r11
+	movq	4552(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_567), .-GL_PREFIX(_dispatch_stub_567)
+	.size	GL_PREFIX(_dispatch_stub_569), .-GL_PREFIX(_dispatch_stub_569)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_568)
-	.type	GL_PREFIX(_dispatch_stub_568), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_568))
-GL_PREFIX(_dispatch_stub_568):
+	.globl	GL_PREFIX(_dispatch_stub_570)
+	.type	GL_PREFIX(_dispatch_stub_570), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_570))
+GL_PREFIX(_dispatch_stub_570):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4544(%rax), %r11
+	movq	4560(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -21413,13 +21479,13 @@ GL_PREFIX(_dispatch_stub_568):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	4544(%rax), %r11
+	movq	4560(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4544(%rax), %r11
+	movq	4560(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -21429,19 +21495,19 @@ GL_PREFIX(_dispatch_stub_568):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	4544(%rax), %r11
+	movq	4560(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_568), .-GL_PREFIX(_dispatch_stub_568)
+	.size	GL_PREFIX(_dispatch_stub_570), .-GL_PREFIX(_dispatch_stub_570)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_569)
-	.type	GL_PREFIX(_dispatch_stub_569), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_569))
-GL_PREFIX(_dispatch_stub_569):
+	.globl	GL_PREFIX(_dispatch_stub_571)
+	.type	GL_PREFIX(_dispatch_stub_571), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_571))
+GL_PREFIX(_dispatch_stub_571):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4552(%rax), %r11
+	movq	4568(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21451,13 +21517,13 @@ GL_PREFIX(_dispatch_stub_569):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4552(%rax), %r11
+	movq	4568(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4552(%rax), %r11
+	movq	4568(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21467,19 +21533,19 @@ GL_PREFIX(_dispatch_stub_569):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4552(%rax), %r11
+	movq	4568(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_569), .-GL_PREFIX(_dispatch_stub_569)
+	.size	GL_PREFIX(_dispatch_stub_571), .-GL_PREFIX(_dispatch_stub_571)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_570)
-	.type	GL_PREFIX(_dispatch_stub_570), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_570))
-GL_PREFIX(_dispatch_stub_570):
+	.globl	GL_PREFIX(_dispatch_stub_572)
+	.type	GL_PREFIX(_dispatch_stub_572), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_572))
+GL_PREFIX(_dispatch_stub_572):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4560(%rax), %r11
+	movq	4576(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21489,13 +21555,13 @@ GL_PREFIX(_dispatch_stub_570):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4560(%rax), %r11
+	movq	4576(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4560(%rax), %r11
+	movq	4576(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21505,19 +21571,19 @@ GL_PREFIX(_dispatch_stub_570):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4560(%rax), %r11
+	movq	4576(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_570), .-GL_PREFIX(_dispatch_stub_570)
+	.size	GL_PREFIX(_dispatch_stub_572), .-GL_PREFIX(_dispatch_stub_572)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_571)
-	.type	GL_PREFIX(_dispatch_stub_571), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_571))
-GL_PREFIX(_dispatch_stub_571):
+	.globl	GL_PREFIX(_dispatch_stub_573)
+	.type	GL_PREFIX(_dispatch_stub_573), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_573))
+GL_PREFIX(_dispatch_stub_573):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4568(%rax), %r11
+	movq	4584(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21527,13 +21593,13 @@ GL_PREFIX(_dispatch_stub_571):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4568(%rax), %r11
+	movq	4584(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4568(%rax), %r11
+	movq	4584(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21543,19 +21609,19 @@ GL_PREFIX(_dispatch_stub_571):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4568(%rax), %r11
+	movq	4584(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_571), .-GL_PREFIX(_dispatch_stub_571)
+	.size	GL_PREFIX(_dispatch_stub_573), .-GL_PREFIX(_dispatch_stub_573)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_572)
-	.type	GL_PREFIX(_dispatch_stub_572), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_572))
-GL_PREFIX(_dispatch_stub_572):
+	.globl	GL_PREFIX(_dispatch_stub_574)
+	.type	GL_PREFIX(_dispatch_stub_574), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_574))
+GL_PREFIX(_dispatch_stub_574):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4576(%rax), %r11
+	movq	4592(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21565,13 +21631,13 @@ GL_PREFIX(_dispatch_stub_572):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4576(%rax), %r11
+	movq	4592(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4576(%rax), %r11
+	movq	4592(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21581,40 +21647,40 @@ GL_PREFIX(_dispatch_stub_572):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4576(%rax), %r11
+	movq	4592(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_572), .-GL_PREFIX(_dispatch_stub_572)
+	.size	GL_PREFIX(_dispatch_stub_574), .-GL_PREFIX(_dispatch_stub_574)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_573)
-	.type	GL_PREFIX(_dispatch_stub_573), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_573))
-GL_PREFIX(_dispatch_stub_573):
+	.globl	GL_PREFIX(_dispatch_stub_575)
+	.type	GL_PREFIX(_dispatch_stub_575), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_575))
+GL_PREFIX(_dispatch_stub_575):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4584(%rax), %r11
+	movq	4600(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4584(%rax), %r11
+	movq	4600(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4584(%rax), %r11
+	movq	4600(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4584(%rax), %r11
+	movq	4600(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_573), .-GL_PREFIX(_dispatch_stub_573)
+	.size	GL_PREFIX(_dispatch_stub_575), .-GL_PREFIX(_dispatch_stub_575)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(ColorPointerEXT)
@@ -21622,7 +21688,7 @@ GL_PREFIX(_dispatch_stub_573):
 GL_PREFIX(ColorPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4592(%rax), %r11
+	movq	4608(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21636,13 +21702,13 @@ GL_PREFIX(ColorPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4592(%rax), %r11
+	movq	4608(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4592(%rax), %r11
+	movq	4608(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21656,7 +21722,7 @@ GL_PREFIX(ColorPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4592(%rax), %r11
+	movq	4608(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorPointerEXT), .-GL_PREFIX(ColorPointerEXT)
@@ -21667,7 +21733,7 @@ GL_PREFIX(ColorPointerEXT):
 GL_PREFIX(EdgeFlagPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4600(%rax), %r11
+	movq	4616(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21677,13 +21743,13 @@ GL_PREFIX(EdgeFlagPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4600(%rax), %r11
+	movq	4616(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4600(%rax), %r11
+	movq	4616(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21693,7 +21759,7 @@ GL_PREFIX(EdgeFlagPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4600(%rax), %r11
+	movq	4616(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EdgeFlagPointerEXT), .-GL_PREFIX(EdgeFlagPointerEXT)
@@ -21704,7 +21770,7 @@ GL_PREFIX(EdgeFlagPointerEXT):
 GL_PREFIX(IndexPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4608(%rax), %r11
+	movq	4624(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21718,13 +21784,13 @@ GL_PREFIX(IndexPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4608(%rax), %r11
+	movq	4624(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4608(%rax), %r11
+	movq	4624(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21738,7 +21804,7 @@ GL_PREFIX(IndexPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4608(%rax), %r11
+	movq	4624(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IndexPointerEXT), .-GL_PREFIX(IndexPointerEXT)
@@ -21749,7 +21815,7 @@ GL_PREFIX(IndexPointerEXT):
 GL_PREFIX(NormalPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4616(%rax), %r11
+	movq	4632(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21763,13 +21829,13 @@ GL_PREFIX(NormalPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4616(%rax), %r11
+	movq	4632(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4616(%rax), %r11
+	movq	4632(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21783,7 +21849,7 @@ GL_PREFIX(NormalPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4616(%rax), %r11
+	movq	4632(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(NormalPointerEXT), .-GL_PREFIX(NormalPointerEXT)
@@ -21794,7 +21860,7 @@ GL_PREFIX(NormalPointerEXT):
 GL_PREFIX(TexCoordPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4624(%rax), %r11
+	movq	4640(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21808,13 +21874,13 @@ GL_PREFIX(TexCoordPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4624(%rax), %r11
+	movq	4640(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4624(%rax), %r11
+	movq	4640(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21828,7 +21894,7 @@ GL_PREFIX(TexCoordPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4624(%rax), %r11
+	movq	4640(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexCoordPointerEXT), .-GL_PREFIX(TexCoordPointerEXT)
@@ -21839,7 +21905,7 @@ GL_PREFIX(TexCoordPointerEXT):
 GL_PREFIX(VertexPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4632(%rax), %r11
+	movq	4648(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21853,13 +21919,13 @@ GL_PREFIX(VertexPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4632(%rax), %r11
+	movq	4648(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4632(%rax), %r11
+	movq	4648(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21873,7 +21939,7 @@ GL_PREFIX(VertexPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4632(%rax), %r11
+	movq	4648(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexPointerEXT), .-GL_PREFIX(VertexPointerEXT)
@@ -21884,7 +21950,7 @@ GL_PREFIX(VertexPointerEXT):
 GL_PREFIX(PointParameterfEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4640(%rax), %r11
+	movq	4656(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -21894,13 +21960,13 @@ GL_PREFIX(PointParameterfEXT):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	4640(%rax), %r11
+	movq	4656(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4640(%rax), %r11
+	movq	4656(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -21910,7 +21976,7 @@ GL_PREFIX(PointParameterfEXT):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	4640(%rax), %r11
+	movq	4656(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PointParameterfEXT), .-GL_PREFIX(PointParameterfEXT)
@@ -21921,7 +21987,7 @@ GL_PREFIX(PointParameterfEXT):
 GL_PREFIX(PointParameterfvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4648(%rax), %r11
+	movq	4664(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21931,13 +21997,13 @@ GL_PREFIX(PointParameterfvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4648(%rax), %r11
+	movq	4664(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4648(%rax), %r11
+	movq	4664(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21947,7 +22013,7 @@ GL_PREFIX(PointParameterfvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4648(%rax), %r11
+	movq	4664(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PointParameterfvEXT), .-GL_PREFIX(PointParameterfvEXT)
@@ -21958,7 +22024,7 @@ GL_PREFIX(PointParameterfvEXT):
 GL_PREFIX(LockArraysEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4656(%rax), %r11
+	movq	4672(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21968,13 +22034,13 @@ GL_PREFIX(LockArraysEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4656(%rax), %r11
+	movq	4672(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4656(%rax), %r11
+	movq	4672(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21984,7 +22050,7 @@ GL_PREFIX(LockArraysEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4656(%rax), %r11
+	movq	4672(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(LockArraysEXT), .-GL_PREFIX(LockArraysEXT)
@@ -21995,37 +22061,37 @@ GL_PREFIX(LockArraysEXT):
 GL_PREFIX(UnlockArraysEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4664(%rax), %r11
+	movq	4680(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	4664(%rax), %r11
+	movq	4680(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4664(%rax), %r11
+	movq	4680(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	4664(%rax), %r11
+	movq	4680(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(UnlockArraysEXT), .-GL_PREFIX(UnlockArraysEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_584)
-	.type	GL_PREFIX(_dispatch_stub_584), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_584))
-GL_PREFIX(_dispatch_stub_584):
+	.globl	GL_PREFIX(_dispatch_stub_586)
+	.type	GL_PREFIX(_dispatch_stub_586), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_586))
+GL_PREFIX(_dispatch_stub_586):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4672(%rax), %r11
+	movq	4688(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22035,13 +22101,13 @@ GL_PREFIX(_dispatch_stub_584):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4672(%rax), %r11
+	movq	4688(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4672(%rax), %r11
+	movq	4688(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22051,19 +22117,19 @@ GL_PREFIX(_dispatch_stub_584):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4672(%rax), %r11
+	movq	4688(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_584), .-GL_PREFIX(_dispatch_stub_584)
+	.size	GL_PREFIX(_dispatch_stub_586), .-GL_PREFIX(_dispatch_stub_586)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_585)
-	.type	GL_PREFIX(_dispatch_stub_585), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_585))
-GL_PREFIX(_dispatch_stub_585):
+	.globl	GL_PREFIX(_dispatch_stub_587)
+	.type	GL_PREFIX(_dispatch_stub_587), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_587))
+GL_PREFIX(_dispatch_stub_587):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4680(%rax), %r11
+	movq	4696(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22073,13 +22139,13 @@ GL_PREFIX(_dispatch_stub_585):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4680(%rax), %r11
+	movq	4696(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4680(%rax), %r11
+	movq	4696(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22089,10 +22155,10 @@ GL_PREFIX(_dispatch_stub_585):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4680(%rax), %r11
+	movq	4696(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_585), .-GL_PREFIX(_dispatch_stub_585)
+	.size	GL_PREFIX(_dispatch_stub_587), .-GL_PREFIX(_dispatch_stub_587)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(SecondaryColor3bEXT)
@@ -22100,7 +22166,7 @@ GL_PREFIX(_dispatch_stub_585):
 GL_PREFIX(SecondaryColor3bEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4688(%rax), %r11
+	movq	4704(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22110,13 +22176,13 @@ GL_PREFIX(SecondaryColor3bEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4688(%rax), %r11
+	movq	4704(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4688(%rax), %r11
+	movq	4704(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22126,7 +22192,7 @@ GL_PREFIX(SecondaryColor3bEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4688(%rax), %r11
+	movq	4704(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3bEXT), .-GL_PREFIX(SecondaryColor3bEXT)
@@ -22137,25 +22203,25 @@ GL_PREFIX(SecondaryColor3bEXT):
 GL_PREFIX(SecondaryColor3bvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4696(%rax), %r11
+	movq	4712(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4696(%rax), %r11
+	movq	4712(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4696(%rax), %r11
+	movq	4712(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4696(%rax), %r11
+	movq	4712(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3bvEXT), .-GL_PREFIX(SecondaryColor3bvEXT)
@@ -22166,7 +22232,7 @@ GL_PREFIX(SecondaryColor3bvEXT):
 GL_PREFIX(SecondaryColor3dEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4704(%rax), %r11
+	movq	4720(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -22178,13 +22244,13 @@ GL_PREFIX(SecondaryColor3dEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	4704(%rax), %r11
+	movq	4720(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4704(%rax), %r11
+	movq	4720(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -22196,7 +22262,7 @@ GL_PREFIX(SecondaryColor3dEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	4704(%rax), %r11
+	movq	4720(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3dEXT), .-GL_PREFIX(SecondaryColor3dEXT)
@@ -22207,25 +22273,25 @@ GL_PREFIX(SecondaryColor3dEXT):
 GL_PREFIX(SecondaryColor3dvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4712(%rax), %r11
+	movq	4728(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4712(%rax), %r11
+	movq	4728(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4712(%rax), %r11
+	movq	4728(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4712(%rax), %r11
+	movq	4728(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3dvEXT), .-GL_PREFIX(SecondaryColor3dvEXT)
@@ -22236,7 +22302,7 @@ GL_PREFIX(SecondaryColor3dvEXT):
 GL_PREFIX(SecondaryColor3fEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4720(%rax), %r11
+	movq	4736(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -22248,13 +22314,13 @@ GL_PREFIX(SecondaryColor3fEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	4720(%rax), %r11
+	movq	4736(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4720(%rax), %r11
+	movq	4736(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -22266,7 +22332,7 @@ GL_PREFIX(SecondaryColor3fEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	4720(%rax), %r11
+	movq	4736(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3fEXT), .-GL_PREFIX(SecondaryColor3fEXT)
@@ -22277,25 +22343,25 @@ GL_PREFIX(SecondaryColor3fEXT):
 GL_PREFIX(SecondaryColor3fvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4728(%rax), %r11
+	movq	4744(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4728(%rax), %r11
+	movq	4744(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4728(%rax), %r11
+	movq	4744(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4728(%rax), %r11
+	movq	4744(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3fvEXT), .-GL_PREFIX(SecondaryColor3fvEXT)
@@ -22306,7 +22372,7 @@ GL_PREFIX(SecondaryColor3fvEXT):
 GL_PREFIX(SecondaryColor3iEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4736(%rax), %r11
+	movq	4752(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22316,13 +22382,13 @@ GL_PREFIX(SecondaryColor3iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4736(%rax), %r11
+	movq	4752(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4736(%rax), %r11
+	movq	4752(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22332,7 +22398,7 @@ GL_PREFIX(SecondaryColor3iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4736(%rax), %r11
+	movq	4752(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3iEXT), .-GL_PREFIX(SecondaryColor3iEXT)
@@ -22343,25 +22409,25 @@ GL_PREFIX(SecondaryColor3iEXT):
 GL_PREFIX(SecondaryColor3ivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4744(%rax), %r11
+	movq	4760(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4744(%rax), %r11
+	movq	4760(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4744(%rax), %r11
+	movq	4760(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4744(%rax), %r11
+	movq	4760(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3ivEXT), .-GL_PREFIX(SecondaryColor3ivEXT)
@@ -22372,7 +22438,7 @@ GL_PREFIX(SecondaryColor3ivEXT):
 GL_PREFIX(SecondaryColor3sEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4752(%rax), %r11
+	movq	4768(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22382,13 +22448,13 @@ GL_PREFIX(SecondaryColor3sEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4752(%rax), %r11
+	movq	4768(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4752(%rax), %r11
+	movq	4768(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22398,7 +22464,7 @@ GL_PREFIX(SecondaryColor3sEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4752(%rax), %r11
+	movq	4768(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3sEXT), .-GL_PREFIX(SecondaryColor3sEXT)
@@ -22409,25 +22475,25 @@ GL_PREFIX(SecondaryColor3sEXT):
 GL_PREFIX(SecondaryColor3svEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4760(%rax), %r11
+	movq	4776(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4760(%rax), %r11
+	movq	4776(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4760(%rax), %r11
+	movq	4776(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4760(%rax), %r11
+	movq	4776(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3svEXT), .-GL_PREFIX(SecondaryColor3svEXT)
@@ -22438,7 +22504,7 @@ GL_PREFIX(SecondaryColor3svEXT):
 GL_PREFIX(SecondaryColor3ubEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4768(%rax), %r11
+	movq	4784(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22448,13 +22514,13 @@ GL_PREFIX(SecondaryColor3ubEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4768(%rax), %r11
+	movq	4784(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4768(%rax), %r11
+	movq	4784(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22464,7 +22530,7 @@ GL_PREFIX(SecondaryColor3ubEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4768(%rax), %r11
+	movq	4784(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3ubEXT), .-GL_PREFIX(SecondaryColor3ubEXT)
@@ -22475,25 +22541,25 @@ GL_PREFIX(SecondaryColor3ubEXT):
 GL_PREFIX(SecondaryColor3ubvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4776(%rax), %r11
+	movq	4792(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4776(%rax), %r11
+	movq	4792(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4776(%rax), %r11
+	movq	4792(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4776(%rax), %r11
+	movq	4792(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3ubvEXT), .-GL_PREFIX(SecondaryColor3ubvEXT)
@@ -22504,7 +22570,7 @@ GL_PREFIX(SecondaryColor3ubvEXT):
 GL_PREFIX(SecondaryColor3uiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4784(%rax), %r11
+	movq	4800(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22514,13 +22580,13 @@ GL_PREFIX(SecondaryColor3uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4784(%rax), %r11
+	movq	4800(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4784(%rax), %r11
+	movq	4800(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22530,7 +22596,7 @@ GL_PREFIX(SecondaryColor3uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4784(%rax), %r11
+	movq	4800(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3uiEXT), .-GL_PREFIX(SecondaryColor3uiEXT)
@@ -22541,25 +22607,25 @@ GL_PREFIX(SecondaryColor3uiEXT):
 GL_PREFIX(SecondaryColor3uivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4792(%rax), %r11
+	movq	4808(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4792(%rax), %r11
+	movq	4808(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4792(%rax), %r11
+	movq	4808(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4792(%rax), %r11
+	movq	4808(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3uivEXT), .-GL_PREFIX(SecondaryColor3uivEXT)
@@ -22570,7 +22636,7 @@ GL_PREFIX(SecondaryColor3uivEXT):
 GL_PREFIX(SecondaryColor3usEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4800(%rax), %r11
+	movq	4816(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22580,13 +22646,13 @@ GL_PREFIX(SecondaryColor3usEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4800(%rax), %r11
+	movq	4816(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4800(%rax), %r11
+	movq	4816(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22596,7 +22662,7 @@ GL_PREFIX(SecondaryColor3usEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4800(%rax), %r11
+	movq	4816(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3usEXT), .-GL_PREFIX(SecondaryColor3usEXT)
@@ -22607,25 +22673,25 @@ GL_PREFIX(SecondaryColor3usEXT):
 GL_PREFIX(SecondaryColor3usvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4808(%rax), %r11
+	movq	4824(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4808(%rax), %r11
+	movq	4824(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4808(%rax), %r11
+	movq	4824(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4808(%rax), %r11
+	movq	4824(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3usvEXT), .-GL_PREFIX(SecondaryColor3usvEXT)
@@ -22636,7 +22702,7 @@ GL_PREFIX(SecondaryColor3usvEXT):
 GL_PREFIX(SecondaryColorPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4816(%rax), %r11
+	movq	4832(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22650,13 +22716,13 @@ GL_PREFIX(SecondaryColorPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4816(%rax), %r11
+	movq	4832(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4816(%rax), %r11
+	movq	4832(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22670,7 +22736,7 @@ GL_PREFIX(SecondaryColorPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4816(%rax), %r11
+	movq	4832(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColorPointerEXT), .-GL_PREFIX(SecondaryColorPointerEXT)
@@ -22681,7 +22747,7 @@ GL_PREFIX(SecondaryColorPointerEXT):
 GL_PREFIX(MultiDrawArraysEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4824(%rax), %r11
+	movq	4840(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22695,13 +22761,13 @@ GL_PREFIX(MultiDrawArraysEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4824(%rax), %r11
+	movq	4840(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4824(%rax), %r11
+	movq	4840(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22715,7 +22781,7 @@ GL_PREFIX(MultiDrawArraysEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4824(%rax), %r11
+	movq	4840(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(MultiDrawArraysEXT), .-GL_PREFIX(MultiDrawArraysEXT)
@@ -22726,7 +22792,7 @@ GL_PREFIX(MultiDrawArraysEXT):
 GL_PREFIX(MultiDrawElementsEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4832(%rax), %r11
+	movq	4848(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22740,13 +22806,13 @@ GL_PREFIX(MultiDrawElementsEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4832(%rax), %r11
+	movq	4848(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4832(%rax), %r11
+	movq	4848(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22760,7 +22826,7 @@ GL_PREFIX(MultiDrawElementsEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4832(%rax), %r11
+	movq	4848(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(MultiDrawElementsEXT), .-GL_PREFIX(MultiDrawElementsEXT)
@@ -22771,7 +22837,7 @@ GL_PREFIX(MultiDrawElementsEXT):
 GL_PREFIX(FogCoordPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4840(%rax), %r11
+	movq	4856(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22781,13 +22847,13 @@ GL_PREFIX(FogCoordPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4840(%rax), %r11
+	movq	4856(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4840(%rax), %r11
+	movq	4856(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22797,7 +22863,7 @@ GL_PREFIX(FogCoordPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4840(%rax), %r11
+	movq	4856(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoordPointerEXT), .-GL_PREFIX(FogCoordPointerEXT)
@@ -22808,7 +22874,7 @@ GL_PREFIX(FogCoordPointerEXT):
 GL_PREFIX(FogCoorddEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4848(%rax), %r11
+	movq	4864(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$8, %rsp
@@ -22816,13 +22882,13 @@ GL_PREFIX(FogCoorddEXT):
 	call	_x86_64_get_dispatch@PLT
 	movq	(%rsp), %xmm0
 	addq	$8, %rsp
-	movq	4848(%rax), %r11
+	movq	4864(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4848(%rax), %r11
+	movq	4864(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$8, %rsp
@@ -22830,7 +22896,7 @@ GL_PREFIX(FogCoorddEXT):
 	call	_glapi_get_dispatch
 	movq	(%rsp), %xmm0
 	addq	$8, %rsp
-	movq	4848(%rax), %r11
+	movq	4864(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoorddEXT), .-GL_PREFIX(FogCoorddEXT)
@@ -22841,25 +22907,25 @@ GL_PREFIX(FogCoorddEXT):
 GL_PREFIX(FogCoorddvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4856(%rax), %r11
+	movq	4872(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4856(%rax), %r11
+	movq	4872(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4856(%rax), %r11
+	movq	4872(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4856(%rax), %r11
+	movq	4872(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoorddvEXT), .-GL_PREFIX(FogCoorddvEXT)
@@ -22870,7 +22936,7 @@ GL_PREFIX(FogCoorddvEXT):
 GL_PREFIX(FogCoordfEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4864(%rax), %r11
+	movq	4880(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$8, %rsp
@@ -22878,13 +22944,13 @@ GL_PREFIX(FogCoordfEXT):
 	call	_x86_64_get_dispatch@PLT
 	movq	(%rsp), %xmm0
 	addq	$8, %rsp
-	movq	4864(%rax), %r11
+	movq	4880(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4864(%rax), %r11
+	movq	4880(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$8, %rsp
@@ -22892,7 +22958,7 @@ GL_PREFIX(FogCoordfEXT):
 	call	_glapi_get_dispatch
 	movq	(%rsp), %xmm0
 	addq	$8, %rsp
-	movq	4864(%rax), %r11
+	movq	4880(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoordfEXT), .-GL_PREFIX(FogCoordfEXT)
@@ -22903,58 +22969,58 @@ GL_PREFIX(FogCoordfEXT):
 GL_PREFIX(FogCoordfvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4872(%rax), %r11
+	movq	4888(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4872(%rax), %r11
+	movq	4888(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4872(%rax), %r11
+	movq	4888(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4872(%rax), %r11
+	movq	4888(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoordfvEXT), .-GL_PREFIX(FogCoordfvEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_610)
-	.type	GL_PREFIX(_dispatch_stub_610), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_610))
-GL_PREFIX(_dispatch_stub_610):
+	.globl	GL_PREFIX(_dispatch_stub_612)
+	.type	GL_PREFIX(_dispatch_stub_612), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_612))
+GL_PREFIX(_dispatch_stub_612):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4880(%rax), %r11
+	movq	4896(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4880(%rax), %r11
+	movq	4896(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4880(%rax), %r11
+	movq	4896(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4880(%rax), %r11
+	movq	4896(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_610), .-GL_PREFIX(_dispatch_stub_610)
+	.size	GL_PREFIX(_dispatch_stub_612), .-GL_PREFIX(_dispatch_stub_612)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(BlendFuncSeparateEXT)
@@ -22962,7 +23028,7 @@ GL_PREFIX(_dispatch_stub_610):
 GL_PREFIX(BlendFuncSeparateEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4888(%rax), %r11
+	movq	4904(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22976,13 +23042,13 @@ GL_PREFIX(BlendFuncSeparateEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4888(%rax), %r11
+	movq	4904(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4888(%rax), %r11
+	movq	4904(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22996,7 +23062,7 @@ GL_PREFIX(BlendFuncSeparateEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4888(%rax), %r11
+	movq	4904(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BlendFuncSeparateEXT), .-GL_PREFIX(BlendFuncSeparateEXT)
@@ -23007,25 +23073,25 @@ GL_PREFIX(BlendFuncSeparateEXT):
 GL_PREFIX(FlushVertexArrayRangeNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4896(%rax), %r11
+	movq	4912(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	4896(%rax), %r11
+	movq	4912(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4896(%rax), %r11
+	movq	4912(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	4896(%rax), %r11
+	movq	4912(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FlushVertexArrayRangeNV), .-GL_PREFIX(FlushVertexArrayRangeNV)
@@ -23036,7 +23102,7 @@ GL_PREFIX(FlushVertexArrayRangeNV):
 GL_PREFIX(VertexArrayRangeNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4904(%rax), %r11
+	movq	4920(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23046,13 +23112,13 @@ GL_PREFIX(VertexArrayRangeNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4904(%rax), %r11
+	movq	4920(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4904(%rax), %r11
+	movq	4920(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23062,7 +23128,7 @@ GL_PREFIX(VertexArrayRangeNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4904(%rax), %r11
+	movq	4920(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexArrayRangeNV), .-GL_PREFIX(VertexArrayRangeNV)
@@ -23073,7 +23139,7 @@ GL_PREFIX(VertexArrayRangeNV):
 GL_PREFIX(CombinerInputNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4912(%rax), %r11
+	movq	4928(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23091,13 +23157,13 @@ GL_PREFIX(CombinerInputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4912(%rax), %r11
+	movq	4928(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4912(%rax), %r11
+	movq	4928(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23115,7 +23181,7 @@ GL_PREFIX(CombinerInputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4912(%rax), %r11
+	movq	4928(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerInputNV), .-GL_PREFIX(CombinerInputNV)
@@ -23126,7 +23192,7 @@ GL_PREFIX(CombinerInputNV):
 GL_PREFIX(CombinerOutputNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4920(%rax), %r11
+	movq	4936(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23144,13 +23210,13 @@ GL_PREFIX(CombinerOutputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4920(%rax), %r11
+	movq	4936(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4920(%rax), %r11
+	movq	4936(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23168,7 +23234,7 @@ GL_PREFIX(CombinerOutputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4920(%rax), %r11
+	movq	4936(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerOutputNV), .-GL_PREFIX(CombinerOutputNV)
@@ -23179,7 +23245,7 @@ GL_PREFIX(CombinerOutputNV):
 GL_PREFIX(CombinerParameterfNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4928(%rax), %r11
+	movq	4944(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -23189,13 +23255,13 @@ GL_PREFIX(CombinerParameterfNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	4928(%rax), %r11
+	movq	4944(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4928(%rax), %r11
+	movq	4944(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -23205,7 +23271,7 @@ GL_PREFIX(CombinerParameterfNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	4928(%rax), %r11
+	movq	4944(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerParameterfNV), .-GL_PREFIX(CombinerParameterfNV)
@@ -23216,7 +23282,7 @@ GL_PREFIX(CombinerParameterfNV):
 GL_PREFIX(CombinerParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4936(%rax), %r11
+	movq	4952(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23226,13 +23292,13 @@ GL_PREFIX(CombinerParameterfvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4936(%rax), %r11
+	movq	4952(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4936(%rax), %r11
+	movq	4952(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23242,7 +23308,7 @@ GL_PREFIX(CombinerParameterfvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4936(%rax), %r11
+	movq	4952(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerParameterfvNV), .-GL_PREFIX(CombinerParameterfvNV)
@@ -23253,7 +23319,7 @@ GL_PREFIX(CombinerParameterfvNV):
 GL_PREFIX(CombinerParameteriNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4944(%rax), %r11
+	movq	4960(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23263,13 +23329,13 @@ GL_PREFIX(CombinerParameteriNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4944(%rax), %r11
+	movq	4960(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4944(%rax), %r11
+	movq	4960(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23279,7 +23345,7 @@ GL_PREFIX(CombinerParameteriNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4944(%rax), %r11
+	movq	4960(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerParameteriNV), .-GL_PREFIX(CombinerParameteriNV)
@@ -23290,7 +23356,7 @@ GL_PREFIX(CombinerParameteriNV):
 GL_PREFIX(CombinerParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4952(%rax), %r11
+	movq	4968(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23300,13 +23366,13 @@ GL_PREFIX(CombinerParameterivNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4952(%rax), %r11
+	movq	4968(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4952(%rax), %r11
+	movq	4968(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23316,7 +23382,7 @@ GL_PREFIX(CombinerParameterivNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4952(%rax), %r11
+	movq	4968(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerParameterivNV), .-GL_PREFIX(CombinerParameterivNV)
@@ -23327,7 +23393,7 @@ GL_PREFIX(CombinerParameterivNV):
 GL_PREFIX(FinalCombinerInputNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4960(%rax), %r11
+	movq	4976(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23341,13 +23407,13 @@ GL_PREFIX(FinalCombinerInputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4960(%rax), %r11
+	movq	4976(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4960(%rax), %r11
+	movq	4976(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23361,7 +23427,7 @@ GL_PREFIX(FinalCombinerInputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4960(%rax), %r11
+	movq	4976(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FinalCombinerInputNV), .-GL_PREFIX(FinalCombinerInputNV)
@@ -23372,7 +23438,7 @@ GL_PREFIX(FinalCombinerInputNV):
 GL_PREFIX(GetCombinerInputParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4968(%rax), %r11
+	movq	4984(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23386,13 +23452,13 @@ GL_PREFIX(GetCombinerInputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4968(%rax), %r11
+	movq	4984(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4968(%rax), %r11
+	movq	4984(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23406,7 +23472,7 @@ GL_PREFIX(GetCombinerInputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4968(%rax), %r11
+	movq	4984(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetCombinerInputParameterfvNV), .-GL_PREFIX(GetCombinerInputParameterfvNV)
@@ -23417,7 +23483,7 @@ GL_PREFIX(GetCombinerInputParameterfvNV):
 GL_PREFIX(GetCombinerInputParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4976(%rax), %r11
+	movq	4992(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23431,13 +23497,13 @@ GL_PREFIX(GetCombinerInputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4976(%rax), %r11
+	movq	4992(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4976(%rax), %r11
+	movq	4992(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23451,7 +23517,7 @@ GL_PREFIX(GetCombinerInputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4976(%rax), %r11
+	movq	4992(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetCombinerInputParameterivNV), .-GL_PREFIX(GetCombinerInputParameterivNV)
@@ -23462,7 +23528,7 @@ GL_PREFIX(GetCombinerInputParameterivNV):
 GL_PREFIX(GetCombinerOutputParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4984(%rax), %r11
+	movq	5000(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23476,13 +23542,13 @@ GL_PREFIX(GetCombinerOutputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4984(%rax), %r11
+	movq	5000(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4984(%rax), %r11
+	movq	5000(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23496,7 +23562,7 @@ GL_PREFIX(GetCombinerOutputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4984(%rax), %r11
+	movq	5000(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetCombinerOutputParameterfvNV), .-GL_PREFIX(GetCombinerOutputParameterfvNV)
@@ -23507,7 +23573,7 @@ GL_PREFIX(GetCombinerOutputParameterfvNV):
 GL_PREFIX(GetCombinerOutputParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4992(%rax), %r11
+	movq	5008(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23521,13 +23587,13 @@ GL_PREFIX(GetCombinerOutputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4992(%rax), %r11
+	movq	5008(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4992(%rax), %r11
+	movq	5008(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23541,7 +23607,7 @@ GL_PREFIX(GetCombinerOutputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4992(%rax), %r11
+	movq	5008(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetCombinerOutputParameterivNV), .-GL_PREFIX(GetCombinerOutputParameterivNV)
@@ -23552,7 +23618,7 @@ GL_PREFIX(GetCombinerOutputParameterivNV):
 GL_PREFIX(GetFinalCombinerInputParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5000(%rax), %r11
+	movq	5016(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23562,13 +23628,13 @@ GL_PREFIX(GetFinalCombinerInputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5000(%rax), %r11
+	movq	5016(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5000(%rax), %r11
+	movq	5016(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23578,7 +23644,7 @@ GL_PREFIX(GetFinalCombinerInputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5000(%rax), %r11
+	movq	5016(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetFinalCombinerInputParameterfvNV), .-GL_PREFIX(GetFinalCombinerInputParameterfvNV)
@@ -23589,7 +23655,7 @@ GL_PREFIX(GetFinalCombinerInputParameterfvNV):
 GL_PREFIX(GetFinalCombinerInputParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5008(%rax), %r11
+	movq	5024(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23599,13 +23665,13 @@ GL_PREFIX(GetFinalCombinerInputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5008(%rax), %r11
+	movq	5024(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5008(%rax), %r11
+	movq	5024(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23615,7 +23681,7 @@ GL_PREFIX(GetFinalCombinerInputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5008(%rax), %r11
+	movq	5024(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetFinalCombinerInputParameterivNV), .-GL_PREFIX(GetFinalCombinerInputParameterivNV)
@@ -23626,25 +23692,25 @@ GL_PREFIX(GetFinalCombinerInputParameterivNV):
 GL_PREFIX(ResizeBuffersMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5016(%rax), %r11
+	movq	5032(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	5016(%rax), %r11
+	movq	5032(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5016(%rax), %r11
+	movq	5032(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	5016(%rax), %r11
+	movq	5032(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ResizeBuffersMESA), .-GL_PREFIX(ResizeBuffersMESA)
@@ -23655,7 +23721,7 @@ GL_PREFIX(ResizeBuffersMESA):
 GL_PREFIX(WindowPos2dMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5024(%rax), %r11
+	movq	5040(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -23665,13 +23731,13 @@ GL_PREFIX(WindowPos2dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5024(%rax), %r11
+	movq	5040(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5024(%rax), %r11
+	movq	5040(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -23681,7 +23747,7 @@ GL_PREFIX(WindowPos2dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5024(%rax), %r11
+	movq	5040(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2dMESA), .-GL_PREFIX(WindowPos2dMESA)
@@ -23692,25 +23758,25 @@ GL_PREFIX(WindowPos2dMESA):
 GL_PREFIX(WindowPos2dvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5032(%rax), %r11
+	movq	5048(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5032(%rax), %r11
+	movq	5048(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5032(%rax), %r11
+	movq	5048(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5032(%rax), %r11
+	movq	5048(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2dvMESA), .-GL_PREFIX(WindowPos2dvMESA)
@@ -23721,7 +23787,7 @@ GL_PREFIX(WindowPos2dvMESA):
 GL_PREFIX(WindowPos2fMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5040(%rax), %r11
+	movq	5056(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -23731,13 +23797,13 @@ GL_PREFIX(WindowPos2fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5040(%rax), %r11
+	movq	5056(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5040(%rax), %r11
+	movq	5056(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -23747,7 +23813,7 @@ GL_PREFIX(WindowPos2fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5040(%rax), %r11
+	movq	5056(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2fMESA), .-GL_PREFIX(WindowPos2fMESA)
@@ -23758,25 +23824,25 @@ GL_PREFIX(WindowPos2fMESA):
 GL_PREFIX(WindowPos2fvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5048(%rax), %r11
+	movq	5064(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5048(%rax), %r11
+	movq	5064(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5048(%rax), %r11
+	movq	5064(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5048(%rax), %r11
+	movq	5064(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2fvMESA), .-GL_PREFIX(WindowPos2fvMESA)
@@ -23787,7 +23853,7 @@ GL_PREFIX(WindowPos2fvMESA):
 GL_PREFIX(WindowPos2iMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5056(%rax), %r11
+	movq	5072(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23797,13 +23863,13 @@ GL_PREFIX(WindowPos2iMESA):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5056(%rax), %r11
+	movq	5072(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5056(%rax), %r11
+	movq	5072(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23813,7 +23879,7 @@ GL_PREFIX(WindowPos2iMESA):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5056(%rax), %r11
+	movq	5072(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2iMESA), .-GL_PREFIX(WindowPos2iMESA)
@@ -23824,25 +23890,25 @@ GL_PREFIX(WindowPos2iMESA):
 GL_PREFIX(WindowPos2ivMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5064(%rax), %r11
+	movq	5080(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5064(%rax), %r11
+	movq	5080(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5064(%rax), %r11
+	movq	5080(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5064(%rax), %r11
+	movq	5080(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2ivMESA), .-GL_PREFIX(WindowPos2ivMESA)
@@ -23853,7 +23919,7 @@ GL_PREFIX(WindowPos2ivMESA):
 GL_PREFIX(WindowPos2sMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5072(%rax), %r11
+	movq	5088(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23863,13 +23929,13 @@ GL_PREFIX(WindowPos2sMESA):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5072(%rax), %r11
+	movq	5088(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5072(%rax), %r11
+	movq	5088(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23879,7 +23945,7 @@ GL_PREFIX(WindowPos2sMESA):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5072(%rax), %r11
+	movq	5088(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2sMESA), .-GL_PREFIX(WindowPos2sMESA)
@@ -23890,25 +23956,25 @@ GL_PREFIX(WindowPos2sMESA):
 GL_PREFIX(WindowPos2svMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5080(%rax), %r11
+	movq	5096(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5080(%rax), %r11
+	movq	5096(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5080(%rax), %r11
+	movq	5096(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5080(%rax), %r11
+	movq	5096(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2svMESA), .-GL_PREFIX(WindowPos2svMESA)
@@ -23919,7 +23985,7 @@ GL_PREFIX(WindowPos2svMESA):
 GL_PREFIX(WindowPos3dMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5088(%rax), %r11
+	movq	5104(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -23931,13 +23997,13 @@ GL_PREFIX(WindowPos3dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5088(%rax), %r11
+	movq	5104(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5088(%rax), %r11
+	movq	5104(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -23949,7 +24015,7 @@ GL_PREFIX(WindowPos3dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5088(%rax), %r11
+	movq	5104(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3dMESA), .-GL_PREFIX(WindowPos3dMESA)
@@ -23960,25 +24026,25 @@ GL_PREFIX(WindowPos3dMESA):
 GL_PREFIX(WindowPos3dvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5096(%rax), %r11
+	movq	5112(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5096(%rax), %r11
+	movq	5112(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5096(%rax), %r11
+	movq	5112(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5096(%rax), %r11
+	movq	5112(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3dvMESA), .-GL_PREFIX(WindowPos3dvMESA)
@@ -23989,7 +24055,7 @@ GL_PREFIX(WindowPos3dvMESA):
 GL_PREFIX(WindowPos3fMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5104(%rax), %r11
+	movq	5120(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -24001,13 +24067,13 @@ GL_PREFIX(WindowPos3fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5104(%rax), %r11
+	movq	5120(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5104(%rax), %r11
+	movq	5120(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -24019,7 +24085,7 @@ GL_PREFIX(WindowPos3fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5104(%rax), %r11
+	movq	5120(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3fMESA), .-GL_PREFIX(WindowPos3fMESA)
@@ -24030,25 +24096,25 @@ GL_PREFIX(WindowPos3fMESA):
 GL_PREFIX(WindowPos3fvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5112(%rax), %r11
+	movq	5128(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5112(%rax), %r11
+	movq	5128(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5112(%rax), %r11
+	movq	5128(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5112(%rax), %r11
+	movq	5128(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3fvMESA), .-GL_PREFIX(WindowPos3fvMESA)
@@ -24059,7 +24125,7 @@ GL_PREFIX(WindowPos3fvMESA):
 GL_PREFIX(WindowPos3iMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5120(%rax), %r11
+	movq	5136(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24069,13 +24135,13 @@ GL_PREFIX(WindowPos3iMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5120(%rax), %r11
+	movq	5136(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5120(%rax), %r11
+	movq	5136(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24085,7 +24151,7 @@ GL_PREFIX(WindowPos3iMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5120(%rax), %r11
+	movq	5136(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3iMESA), .-GL_PREFIX(WindowPos3iMESA)
@@ -24096,25 +24162,25 @@ GL_PREFIX(WindowPos3iMESA):
 GL_PREFIX(WindowPos3ivMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5128(%rax), %r11
+	movq	5144(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5128(%rax), %r11
+	movq	5144(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5128(%rax), %r11
+	movq	5144(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5128(%rax), %r11
+	movq	5144(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3ivMESA), .-GL_PREFIX(WindowPos3ivMESA)
@@ -24125,7 +24191,7 @@ GL_PREFIX(WindowPos3ivMESA):
 GL_PREFIX(WindowPos3sMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5136(%rax), %r11
+	movq	5152(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24135,13 +24201,13 @@ GL_PREFIX(WindowPos3sMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5136(%rax), %r11
+	movq	5152(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5136(%rax), %r11
+	movq	5152(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24151,7 +24217,7 @@ GL_PREFIX(WindowPos3sMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5136(%rax), %r11
+	movq	5152(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3sMESA), .-GL_PREFIX(WindowPos3sMESA)
@@ -24162,25 +24228,25 @@ GL_PREFIX(WindowPos3sMESA):
 GL_PREFIX(WindowPos3svMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5144(%rax), %r11
+	movq	5160(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5144(%rax), %r11
+	movq	5160(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5144(%rax), %r11
+	movq	5160(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5144(%rax), %r11
+	movq	5160(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3svMESA), .-GL_PREFIX(WindowPos3svMESA)
@@ -24191,7 +24257,7 @@ GL_PREFIX(WindowPos3svMESA):
 GL_PREFIX(WindowPos4dMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5152(%rax), %r11
+	movq	5168(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -24205,13 +24271,13 @@ GL_PREFIX(WindowPos4dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$40, %rsp
-	movq	5152(%rax), %r11
+	movq	5168(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5152(%rax), %r11
+	movq	5168(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -24225,7 +24291,7 @@ GL_PREFIX(WindowPos4dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$40, %rsp
-	movq	5152(%rax), %r11
+	movq	5168(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4dMESA), .-GL_PREFIX(WindowPos4dMESA)
@@ -24236,25 +24302,25 @@ GL_PREFIX(WindowPos4dMESA):
 GL_PREFIX(WindowPos4dvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5160(%rax), %r11
+	movq	5176(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5160(%rax), %r11
+	movq	5176(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5160(%rax), %r11
+	movq	5176(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5160(%rax), %r11
+	movq	5176(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4dvMESA), .-GL_PREFIX(WindowPos4dvMESA)
@@ -24265,7 +24331,7 @@ GL_PREFIX(WindowPos4dvMESA):
 GL_PREFIX(WindowPos4fMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5168(%rax), %r11
+	movq	5184(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -24279,13 +24345,13 @@ GL_PREFIX(WindowPos4fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$40, %rsp
-	movq	5168(%rax), %r11
+	movq	5184(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5168(%rax), %r11
+	movq	5184(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -24299,7 +24365,7 @@ GL_PREFIX(WindowPos4fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$40, %rsp
-	movq	5168(%rax), %r11
+	movq	5184(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4fMESA), .-GL_PREFIX(WindowPos4fMESA)
@@ -24310,25 +24376,25 @@ GL_PREFIX(WindowPos4fMESA):
 GL_PREFIX(WindowPos4fvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5176(%rax), %r11
+	movq	5192(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5176(%rax), %r11
+	movq	5192(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5176(%rax), %r11
+	movq	5192(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5176(%rax), %r11
+	movq	5192(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4fvMESA), .-GL_PREFIX(WindowPos4fvMESA)
@@ -24339,7 +24405,7 @@ GL_PREFIX(WindowPos4fvMESA):
 GL_PREFIX(WindowPos4iMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5184(%rax), %r11
+	movq	5200(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24353,13 +24419,13 @@ GL_PREFIX(WindowPos4iMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5184(%rax), %r11
+	movq	5200(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5184(%rax), %r11
+	movq	5200(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24373,7 +24439,7 @@ GL_PREFIX(WindowPos4iMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5184(%rax), %r11
+	movq	5200(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4iMESA), .-GL_PREFIX(WindowPos4iMESA)
@@ -24384,25 +24450,25 @@ GL_PREFIX(WindowPos4iMESA):
 GL_PREFIX(WindowPos4ivMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5192(%rax), %r11
+	movq	5208(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5192(%rax), %r11
+	movq	5208(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5192(%rax), %r11
+	movq	5208(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5192(%rax), %r11
+	movq	5208(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4ivMESA), .-GL_PREFIX(WindowPos4ivMESA)
@@ -24413,7 +24479,7 @@ GL_PREFIX(WindowPos4ivMESA):
 GL_PREFIX(WindowPos4sMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5200(%rax), %r11
+	movq	5216(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24427,13 +24493,13 @@ GL_PREFIX(WindowPos4sMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5200(%rax), %r11
+	movq	5216(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5200(%rax), %r11
+	movq	5216(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24447,7 +24513,7 @@ GL_PREFIX(WindowPos4sMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5200(%rax), %r11
+	movq	5216(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4sMESA), .-GL_PREFIX(WindowPos4sMESA)
@@ -24458,37 +24524,37 @@ GL_PREFIX(WindowPos4sMESA):
 GL_PREFIX(WindowPos4svMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5208(%rax), %r11
+	movq	5224(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5208(%rax), %r11
+	movq	5224(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5208(%rax), %r11
+	movq	5224(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5208(%rax), %r11
+	movq	5224(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4svMESA), .-GL_PREFIX(WindowPos4svMESA)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_652)
-	.type	GL_PREFIX(_dispatch_stub_652), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_652))
-GL_PREFIX(_dispatch_stub_652):
+	.globl	GL_PREFIX(_dispatch_stub_654)
+	.type	GL_PREFIX(_dispatch_stub_654), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_654))
+GL_PREFIX(_dispatch_stub_654):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5216(%rax), %r11
+	movq	5232(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24502,13 +24568,13 @@ GL_PREFIX(_dispatch_stub_652):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5216(%rax), %r11
+	movq	5232(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5216(%rax), %r11
+	movq	5232(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24522,19 +24588,19 @@ GL_PREFIX(_dispatch_stub_652):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5216(%rax), %r11
+	movq	5232(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_652), .-GL_PREFIX(_dispatch_stub_652)
+	.size	GL_PREFIX(_dispatch_stub_654), .-GL_PREFIX(_dispatch_stub_654)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_653)
-	.type	GL_PREFIX(_dispatch_stub_653), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_653))
-GL_PREFIX(_dispatch_stub_653):
+	.globl	GL_PREFIX(_dispatch_stub_655)
+	.type	GL_PREFIX(_dispatch_stub_655), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_655))
+GL_PREFIX(_dispatch_stub_655):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5224(%rax), %r11
+	movq	5240(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24552,13 +24618,13 @@ GL_PREFIX(_dispatch_stub_653):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5224(%rax), %r11
+	movq	5240(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5224(%rax), %r11
+	movq	5240(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24576,19 +24642,19 @@ GL_PREFIX(_dispatch_stub_653):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5224(%rax), %r11
+	movq	5240(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_653), .-GL_PREFIX(_dispatch_stub_653)
+	.size	GL_PREFIX(_dispatch_stub_655), .-GL_PREFIX(_dispatch_stub_655)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_654)
-	.type	GL_PREFIX(_dispatch_stub_654), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_654))
-GL_PREFIX(_dispatch_stub_654):
+	.globl	GL_PREFIX(_dispatch_stub_656)
+	.type	GL_PREFIX(_dispatch_stub_656), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_656))
+GL_PREFIX(_dispatch_stub_656):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5232(%rax), %r11
+	movq	5248(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24598,13 +24664,13 @@ GL_PREFIX(_dispatch_stub_654):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5232(%rax), %r11
+	movq	5248(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5232(%rax), %r11
+	movq	5248(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24614,49 +24680,49 @@ GL_PREFIX(_dispatch_stub_654):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5232(%rax), %r11
+	movq	5248(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_654), .-GL_PREFIX(_dispatch_stub_654)
+	.size	GL_PREFIX(_dispatch_stub_656), .-GL_PREFIX(_dispatch_stub_656)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_655)
-	.type	GL_PREFIX(_dispatch_stub_655), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_655))
-GL_PREFIX(_dispatch_stub_655):
+	.globl	GL_PREFIX(_dispatch_stub_657)
+	.type	GL_PREFIX(_dispatch_stub_657), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_657))
+GL_PREFIX(_dispatch_stub_657):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5240(%rax), %r11
+	movq	5256(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5240(%rax), %r11
+	movq	5256(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5240(%rax), %r11
+	movq	5256(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5240(%rax), %r11
+	movq	5256(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_655), .-GL_PREFIX(_dispatch_stub_655)
+	.size	GL_PREFIX(_dispatch_stub_657), .-GL_PREFIX(_dispatch_stub_657)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_656)
-	.type	GL_PREFIX(_dispatch_stub_656), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_656))
-GL_PREFIX(_dispatch_stub_656):
+	.globl	GL_PREFIX(_dispatch_stub_658)
+	.type	GL_PREFIX(_dispatch_stub_658), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_658))
+GL_PREFIX(_dispatch_stub_658):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5248(%rax), %r11
+	movq	5264(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24666,13 +24732,13 @@ GL_PREFIX(_dispatch_stub_656):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5248(%rax), %r11
+	movq	5264(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5248(%rax), %r11
+	movq	5264(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24682,19 +24748,19 @@ GL_PREFIX(_dispatch_stub_656):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5248(%rax), %r11
+	movq	5264(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_656), .-GL_PREFIX(_dispatch_stub_656)
+	.size	GL_PREFIX(_dispatch_stub_658), .-GL_PREFIX(_dispatch_stub_658)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_657)
-	.type	GL_PREFIX(_dispatch_stub_657), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_657))
-GL_PREFIX(_dispatch_stub_657):
+	.globl	GL_PREFIX(_dispatch_stub_659)
+	.type	GL_PREFIX(_dispatch_stub_659), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_659))
+GL_PREFIX(_dispatch_stub_659):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5256(%rax), %r11
+	movq	5272(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24704,13 +24770,13 @@ GL_PREFIX(_dispatch_stub_657):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5256(%rax), %r11
+	movq	5272(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5256(%rax), %r11
+	movq	5272(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24720,49 +24786,49 @@ GL_PREFIX(_dispatch_stub_657):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5256(%rax), %r11
+	movq	5272(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_657), .-GL_PREFIX(_dispatch_stub_657)
+	.size	GL_PREFIX(_dispatch_stub_659), .-GL_PREFIX(_dispatch_stub_659)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_658)
-	.type	GL_PREFIX(_dispatch_stub_658), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_658))
-GL_PREFIX(_dispatch_stub_658):
+	.globl	GL_PREFIX(_dispatch_stub_660)
+	.type	GL_PREFIX(_dispatch_stub_660), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_660))
+GL_PREFIX(_dispatch_stub_660):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5264(%rax), %r11
+	movq	5280(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5264(%rax), %r11
+	movq	5280(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5264(%rax), %r11
+	movq	5280(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5264(%rax), %r11
+	movq	5280(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_658), .-GL_PREFIX(_dispatch_stub_658)
+	.size	GL_PREFIX(_dispatch_stub_660), .-GL_PREFIX(_dispatch_stub_660)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_659)
-	.type	GL_PREFIX(_dispatch_stub_659), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_659))
-GL_PREFIX(_dispatch_stub_659):
+	.globl	GL_PREFIX(_dispatch_stub_661)
+	.type	GL_PREFIX(_dispatch_stub_661), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_661))
+GL_PREFIX(_dispatch_stub_661):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5272(%rax), %r11
+	movq	5288(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24772,13 +24838,13 @@ GL_PREFIX(_dispatch_stub_659):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5272(%rax), %r11
+	movq	5288(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5272(%rax), %r11
+	movq	5288(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24788,40 +24854,40 @@ GL_PREFIX(_dispatch_stub_659):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5272(%rax), %r11
+	movq	5288(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_659), .-GL_PREFIX(_dispatch_stub_659)
+	.size	GL_PREFIX(_dispatch_stub_661), .-GL_PREFIX(_dispatch_stub_661)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_660)
-	.type	GL_PREFIX(_dispatch_stub_660), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_660))
-GL_PREFIX(_dispatch_stub_660):
+	.globl	GL_PREFIX(_dispatch_stub_662)
+	.type	GL_PREFIX(_dispatch_stub_662), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_662))
+GL_PREFIX(_dispatch_stub_662):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5280(%rax), %r11
+	movq	5296(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5280(%rax), %r11
+	movq	5296(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5280(%rax), %r11
+	movq	5296(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5280(%rax), %r11
+	movq	5296(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_660), .-GL_PREFIX(_dispatch_stub_660)
+	.size	GL_PREFIX(_dispatch_stub_662), .-GL_PREFIX(_dispatch_stub_662)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(AreProgramsResidentNV)
@@ -24829,7 +24895,7 @@ GL_PREFIX(_dispatch_stub_660):
 GL_PREFIX(AreProgramsResidentNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5288(%rax), %r11
+	movq	5304(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24839,13 +24905,13 @@ GL_PREFIX(AreProgramsResidentNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5288(%rax), %r11
+	movq	5304(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5288(%rax), %r11
+	movq	5304(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24855,7 +24921,7 @@ GL_PREFIX(AreProgramsResidentNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5288(%rax), %r11
+	movq	5304(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AreProgramsResidentNV), .-GL_PREFIX(AreProgramsResidentNV)
@@ -24866,7 +24932,7 @@ GL_PREFIX(AreProgramsResidentNV):
 GL_PREFIX(BindProgramNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5296(%rax), %r11
+	movq	5312(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24876,13 +24942,13 @@ GL_PREFIX(BindProgramNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5296(%rax), %r11
+	movq	5312(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5296(%rax), %r11
+	movq	5312(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24892,7 +24958,7 @@ GL_PREFIX(BindProgramNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5296(%rax), %r11
+	movq	5312(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindProgramNV), .-GL_PREFIX(BindProgramNV)
@@ -24903,7 +24969,7 @@ GL_PREFIX(BindProgramNV):
 GL_PREFIX(DeleteProgramsNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5304(%rax), %r11
+	movq	5320(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24913,13 +24979,13 @@ GL_PREFIX(DeleteProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5304(%rax), %r11
+	movq	5320(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5304(%rax), %r11
+	movq	5320(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24929,7 +24995,7 @@ GL_PREFIX(DeleteProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5304(%rax), %r11
+	movq	5320(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteProgramsNV), .-GL_PREFIX(DeleteProgramsNV)
@@ -24940,7 +25006,7 @@ GL_PREFIX(DeleteProgramsNV):
 GL_PREFIX(ExecuteProgramNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5312(%rax), %r11
+	movq	5328(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24950,13 +25016,13 @@ GL_PREFIX(ExecuteProgramNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5312(%rax), %r11
+	movq	5328(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5312(%rax), %r11
+	movq	5328(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24966,7 +25032,7 @@ GL_PREFIX(ExecuteProgramNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5312(%rax), %r11
+	movq	5328(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ExecuteProgramNV), .-GL_PREFIX(ExecuteProgramNV)
@@ -24977,7 +25043,7 @@ GL_PREFIX(ExecuteProgramNV):
 GL_PREFIX(GenProgramsNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5320(%rax), %r11
+	movq	5336(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24987,13 +25053,13 @@ GL_PREFIX(GenProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5320(%rax), %r11
+	movq	5336(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5320(%rax), %r11
+	movq	5336(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25003,7 +25069,7 @@ GL_PREFIX(GenProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5320(%rax), %r11
+	movq	5336(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenProgramsNV), .-GL_PREFIX(GenProgramsNV)
@@ -25014,7 +25080,7 @@ GL_PREFIX(GenProgramsNV):
 GL_PREFIX(GetProgramParameterdvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5328(%rax), %r11
+	movq	5344(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25028,13 +25094,13 @@ GL_PREFIX(GetProgramParameterdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5328(%rax), %r11
+	movq	5344(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5328(%rax), %r11
+	movq	5344(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25048,7 +25114,7 @@ GL_PREFIX(GetProgramParameterdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5328(%rax), %r11
+	movq	5344(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramParameterdvNV), .-GL_PREFIX(GetProgramParameterdvNV)
@@ -25059,7 +25125,7 @@ GL_PREFIX(GetProgramParameterdvNV):
 GL_PREFIX(GetProgramParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5336(%rax), %r11
+	movq	5352(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25073,13 +25139,13 @@ GL_PREFIX(GetProgramParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5336(%rax), %r11
+	movq	5352(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5336(%rax), %r11
+	movq	5352(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25093,7 +25159,7 @@ GL_PREFIX(GetProgramParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5336(%rax), %r11
+	movq	5352(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramParameterfvNV), .-GL_PREFIX(GetProgramParameterfvNV)
@@ -25104,7 +25170,7 @@ GL_PREFIX(GetProgramParameterfvNV):
 GL_PREFIX(GetProgramStringNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5344(%rax), %r11
+	movq	5360(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25114,13 +25180,13 @@ GL_PREFIX(GetProgramStringNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5344(%rax), %r11
+	movq	5360(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5344(%rax), %r11
+	movq	5360(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25130,7 +25196,7 @@ GL_PREFIX(GetProgramStringNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5344(%rax), %r11
+	movq	5360(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramStringNV), .-GL_PREFIX(GetProgramStringNV)
@@ -25141,7 +25207,7 @@ GL_PREFIX(GetProgramStringNV):
 GL_PREFIX(GetProgramivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5352(%rax), %r11
+	movq	5368(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25151,13 +25217,13 @@ GL_PREFIX(GetProgramivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5352(%rax), %r11
+	movq	5368(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5352(%rax), %r11
+	movq	5368(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25167,7 +25233,7 @@ GL_PREFIX(GetProgramivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5352(%rax), %r11
+	movq	5368(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramivNV), .-GL_PREFIX(GetProgramivNV)
@@ -25178,7 +25244,7 @@ GL_PREFIX(GetProgramivNV):
 GL_PREFIX(GetTrackMatrixivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5360(%rax), %r11
+	movq	5376(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25192,13 +25258,13 @@ GL_PREFIX(GetTrackMatrixivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5360(%rax), %r11
+	movq	5376(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5360(%rax), %r11
+	movq	5376(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25212,7 +25278,7 @@ GL_PREFIX(GetTrackMatrixivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5360(%rax), %r11
+	movq	5376(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetTrackMatrixivNV), .-GL_PREFIX(GetTrackMatrixivNV)
@@ -25223,7 +25289,7 @@ GL_PREFIX(GetTrackMatrixivNV):
 GL_PREFIX(GetVertexAttribPointervNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5368(%rax), %r11
+	movq	5384(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25233,13 +25299,13 @@ GL_PREFIX(GetVertexAttribPointervNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5368(%rax), %r11
+	movq	5384(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5368(%rax), %r11
+	movq	5384(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25249,7 +25315,7 @@ GL_PREFIX(GetVertexAttribPointervNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5368(%rax), %r11
+	movq	5384(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribPointervNV), .-GL_PREFIX(GetVertexAttribPointervNV)
@@ -25260,7 +25326,7 @@ GL_PREFIX(GetVertexAttribPointervNV):
 GL_PREFIX(GetVertexAttribdvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5376(%rax), %r11
+	movq	5392(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25270,13 +25336,13 @@ GL_PREFIX(GetVertexAttribdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5376(%rax), %r11
+	movq	5392(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5376(%rax), %r11
+	movq	5392(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25286,7 +25352,7 @@ GL_PREFIX(GetVertexAttribdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5376(%rax), %r11
+	movq	5392(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribdvNV), .-GL_PREFIX(GetVertexAttribdvNV)
@@ -25297,7 +25363,7 @@ GL_PREFIX(GetVertexAttribdvNV):
 GL_PREFIX(GetVertexAttribfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5384(%rax), %r11
+	movq	5400(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25307,13 +25373,13 @@ GL_PREFIX(GetVertexAttribfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5384(%rax), %r11
+	movq	5400(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5384(%rax), %r11
+	movq	5400(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25323,7 +25389,7 @@ GL_PREFIX(GetVertexAttribfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5384(%rax), %r11
+	movq	5400(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribfvNV), .-GL_PREFIX(GetVertexAttribfvNV)
@@ -25334,7 +25400,7 @@ GL_PREFIX(GetVertexAttribfvNV):
 GL_PREFIX(GetVertexAttribivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5392(%rax), %r11
+	movq	5408(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25344,13 +25410,13 @@ GL_PREFIX(GetVertexAttribivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5392(%rax), %r11
+	movq	5408(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5392(%rax), %r11
+	movq	5408(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25360,7 +25426,7 @@ GL_PREFIX(GetVertexAttribivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5392(%rax), %r11
+	movq	5408(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribivNV), .-GL_PREFIX(GetVertexAttribivNV)
@@ -25371,25 +25437,25 @@ GL_PREFIX(GetVertexAttribivNV):
 GL_PREFIX(IsProgramNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5400(%rax), %r11
+	movq	5416(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5400(%rax), %r11
+	movq	5416(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5400(%rax), %r11
+	movq	5416(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5400(%rax), %r11
+	movq	5416(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsProgramNV), .-GL_PREFIX(IsProgramNV)
@@ -25400,7 +25466,7 @@ GL_PREFIX(IsProgramNV):
 GL_PREFIX(LoadProgramNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5408(%rax), %r11
+	movq	5424(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25414,13 +25480,13 @@ GL_PREFIX(LoadProgramNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5408(%rax), %r11
+	movq	5424(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5408(%rax), %r11
+	movq	5424(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25434,7 +25500,7 @@ GL_PREFIX(LoadProgramNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5408(%rax), %r11
+	movq	5424(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(LoadProgramNV), .-GL_PREFIX(LoadProgramNV)
@@ -25445,7 +25511,7 @@ GL_PREFIX(LoadProgramNV):
 GL_PREFIX(ProgramParameters4dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5416(%rax), %r11
+	movq	5432(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25459,13 +25525,13 @@ GL_PREFIX(ProgramParameters4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5416(%rax), %r11
+	movq	5432(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5416(%rax), %r11
+	movq	5432(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25479,7 +25545,7 @@ GL_PREFIX(ProgramParameters4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5416(%rax), %r11
+	movq	5432(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramParameters4dvNV), .-GL_PREFIX(ProgramParameters4dvNV)
@@ -25490,7 +25556,7 @@ GL_PREFIX(ProgramParameters4dvNV):
 GL_PREFIX(ProgramParameters4fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5424(%rax), %r11
+	movq	5440(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25504,13 +25570,13 @@ GL_PREFIX(ProgramParameters4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5424(%rax), %r11
+	movq	5440(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5424(%rax), %r11
+	movq	5440(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25524,7 +25590,7 @@ GL_PREFIX(ProgramParameters4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5424(%rax), %r11
+	movq	5440(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramParameters4fvNV), .-GL_PREFIX(ProgramParameters4fvNV)
@@ -25535,7 +25601,7 @@ GL_PREFIX(ProgramParameters4fvNV):
 GL_PREFIX(RequestResidentProgramsNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5432(%rax), %r11
+	movq	5448(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25545,13 +25611,13 @@ GL_PREFIX(RequestResidentProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5432(%rax), %r11
+	movq	5448(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5432(%rax), %r11
+	movq	5448(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25561,7 +25627,7 @@ GL_PREFIX(RequestResidentProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5432(%rax), %r11
+	movq	5448(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(RequestResidentProgramsNV), .-GL_PREFIX(RequestResidentProgramsNV)
@@ -25572,7 +25638,7 @@ GL_PREFIX(RequestResidentProgramsNV):
 GL_PREFIX(TrackMatrixNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5440(%rax), %r11
+	movq	5456(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25586,13 +25652,13 @@ GL_PREFIX(TrackMatrixNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5440(%rax), %r11
+	movq	5456(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5440(%rax), %r11
+	movq	5456(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25606,7 +25672,7 @@ GL_PREFIX(TrackMatrixNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5440(%rax), %r11
+	movq	5456(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TrackMatrixNV), .-GL_PREFIX(TrackMatrixNV)
@@ -25617,7 +25683,7 @@ GL_PREFIX(TrackMatrixNV):
 GL_PREFIX(VertexAttrib1dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5448(%rax), %r11
+	movq	5464(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -25627,13 +25693,13 @@ GL_PREFIX(VertexAttrib1dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5448(%rax), %r11
+	movq	5464(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5448(%rax), %r11
+	movq	5464(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -25643,7 +25709,7 @@ GL_PREFIX(VertexAttrib1dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5448(%rax), %r11
+	movq	5464(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1dNV), .-GL_PREFIX(VertexAttrib1dNV)
@@ -25654,7 +25720,7 @@ GL_PREFIX(VertexAttrib1dNV):
 GL_PREFIX(VertexAttrib1dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5456(%rax), %r11
+	movq	5472(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25664,13 +25730,13 @@ GL_PREFIX(VertexAttrib1dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5456(%rax), %r11
+	movq	5472(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5456(%rax), %r11
+	movq	5472(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25680,7 +25746,7 @@ GL_PREFIX(VertexAttrib1dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5456(%rax), %r11
+	movq	5472(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1dvNV), .-GL_PREFIX(VertexAttrib1dvNV)
@@ -25691,7 +25757,7 @@ GL_PREFIX(VertexAttrib1dvNV):
 GL_PREFIX(VertexAttrib1fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5464(%rax), %r11
+	movq	5480(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -25701,13 +25767,13 @@ GL_PREFIX(VertexAttrib1fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5464(%rax), %r11
+	movq	5480(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5464(%rax), %r11
+	movq	5480(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -25717,7 +25783,7 @@ GL_PREFIX(VertexAttrib1fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5464(%rax), %r11
+	movq	5480(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1fNV), .-GL_PREFIX(VertexAttrib1fNV)
@@ -25728,7 +25794,7 @@ GL_PREFIX(VertexAttrib1fNV):
 GL_PREFIX(VertexAttrib1fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5472(%rax), %r11
+	movq	5488(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25738,13 +25804,13 @@ GL_PREFIX(VertexAttrib1fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5472(%rax), %r11
+	movq	5488(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5472(%rax), %r11
+	movq	5488(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25754,7 +25820,7 @@ GL_PREFIX(VertexAttrib1fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5472(%rax), %r11
+	movq	5488(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1fvNV), .-GL_PREFIX(VertexAttrib1fvNV)
@@ -25765,7 +25831,7 @@ GL_PREFIX(VertexAttrib1fvNV):
 GL_PREFIX(VertexAttrib1sNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5480(%rax), %r11
+	movq	5496(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25775,13 +25841,13 @@ GL_PREFIX(VertexAttrib1sNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5480(%rax), %r11
+	movq	5496(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5480(%rax), %r11
+	movq	5496(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25791,7 +25857,7 @@ GL_PREFIX(VertexAttrib1sNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5480(%rax), %r11
+	movq	5496(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1sNV), .-GL_PREFIX(VertexAttrib1sNV)
@@ -25802,7 +25868,7 @@ GL_PREFIX(VertexAttrib1sNV):
 GL_PREFIX(VertexAttrib1svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5488(%rax), %r11
+	movq	5504(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25812,13 +25878,13 @@ GL_PREFIX(VertexAttrib1svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5488(%rax), %r11
+	movq	5504(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5488(%rax), %r11
+	movq	5504(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25828,7 +25894,7 @@ GL_PREFIX(VertexAttrib1svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5488(%rax), %r11
+	movq	5504(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1svNV), .-GL_PREFIX(VertexAttrib1svNV)
@@ -25839,7 +25905,7 @@ GL_PREFIX(VertexAttrib1svNV):
 GL_PREFIX(VertexAttrib2dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5496(%rax), %r11
+	movq	5512(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -25851,13 +25917,13 @@ GL_PREFIX(VertexAttrib2dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5496(%rax), %r11
+	movq	5512(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5496(%rax), %r11
+	movq	5512(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -25869,7 +25935,7 @@ GL_PREFIX(VertexAttrib2dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5496(%rax), %r11
+	movq	5512(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2dNV), .-GL_PREFIX(VertexAttrib2dNV)
@@ -25880,7 +25946,7 @@ GL_PREFIX(VertexAttrib2dNV):
 GL_PREFIX(VertexAttrib2dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5504(%rax), %r11
+	movq	5520(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25890,13 +25956,13 @@ GL_PREFIX(VertexAttrib2dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5504(%rax), %r11
+	movq	5520(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5504(%rax), %r11
+	movq	5520(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25906,7 +25972,7 @@ GL_PREFIX(VertexAttrib2dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5504(%rax), %r11
+	movq	5520(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2dvNV), .-GL_PREFIX(VertexAttrib2dvNV)
@@ -25917,7 +25983,7 @@ GL_PREFIX(VertexAttrib2dvNV):
 GL_PREFIX(VertexAttrib2fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5512(%rax), %r11
+	movq	5528(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -25929,13 +25995,13 @@ GL_PREFIX(VertexAttrib2fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5512(%rax), %r11
+	movq	5528(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5512(%rax), %r11
+	movq	5528(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -25947,7 +26013,7 @@ GL_PREFIX(VertexAttrib2fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5512(%rax), %r11
+	movq	5528(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2fNV), .-GL_PREFIX(VertexAttrib2fNV)
@@ -25958,7 +26024,7 @@ GL_PREFIX(VertexAttrib2fNV):
 GL_PREFIX(VertexAttrib2fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5520(%rax), %r11
+	movq	5536(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25968,13 +26034,13 @@ GL_PREFIX(VertexAttrib2fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5520(%rax), %r11
+	movq	5536(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5520(%rax), %r11
+	movq	5536(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25984,7 +26050,7 @@ GL_PREFIX(VertexAttrib2fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5520(%rax), %r11
+	movq	5536(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2fvNV), .-GL_PREFIX(VertexAttrib2fvNV)
@@ -25995,7 +26061,7 @@ GL_PREFIX(VertexAttrib2fvNV):
 GL_PREFIX(VertexAttrib2sNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5528(%rax), %r11
+	movq	5544(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26005,13 +26071,13 @@ GL_PREFIX(VertexAttrib2sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5528(%rax), %r11
+	movq	5544(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5528(%rax), %r11
+	movq	5544(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26021,7 +26087,7 @@ GL_PREFIX(VertexAttrib2sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5528(%rax), %r11
+	movq	5544(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2sNV), .-GL_PREFIX(VertexAttrib2sNV)
@@ -26032,7 +26098,7 @@ GL_PREFIX(VertexAttrib2sNV):
 GL_PREFIX(VertexAttrib2svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5536(%rax), %r11
+	movq	5552(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26042,13 +26108,13 @@ GL_PREFIX(VertexAttrib2svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5536(%rax), %r11
+	movq	5552(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5536(%rax), %r11
+	movq	5552(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26058,7 +26124,7 @@ GL_PREFIX(VertexAttrib2svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5536(%rax), %r11
+	movq	5552(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2svNV), .-GL_PREFIX(VertexAttrib2svNV)
@@ -26069,7 +26135,7 @@ GL_PREFIX(VertexAttrib2svNV):
 GL_PREFIX(VertexAttrib3dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5544(%rax), %r11
+	movq	5560(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -26083,13 +26149,13 @@ GL_PREFIX(VertexAttrib3dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5544(%rax), %r11
+	movq	5560(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5544(%rax), %r11
+	movq	5560(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -26103,7 +26169,7 @@ GL_PREFIX(VertexAttrib3dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5544(%rax), %r11
+	movq	5560(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3dNV), .-GL_PREFIX(VertexAttrib3dNV)
@@ -26114,7 +26180,7 @@ GL_PREFIX(VertexAttrib3dNV):
 GL_PREFIX(VertexAttrib3dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5552(%rax), %r11
+	movq	5568(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26124,13 +26190,13 @@ GL_PREFIX(VertexAttrib3dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5552(%rax), %r11
+	movq	5568(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5552(%rax), %r11
+	movq	5568(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26140,7 +26206,7 @@ GL_PREFIX(VertexAttrib3dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5552(%rax), %r11
+	movq	5568(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3dvNV), .-GL_PREFIX(VertexAttrib3dvNV)
@@ -26151,7 +26217,7 @@ GL_PREFIX(VertexAttrib3dvNV):
 GL_PREFIX(VertexAttrib3fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5560(%rax), %r11
+	movq	5576(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -26165,13 +26231,13 @@ GL_PREFIX(VertexAttrib3fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5560(%rax), %r11
+	movq	5576(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5560(%rax), %r11
+	movq	5576(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -26185,7 +26251,7 @@ GL_PREFIX(VertexAttrib3fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5560(%rax), %r11
+	movq	5576(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3fNV), .-GL_PREFIX(VertexAttrib3fNV)
@@ -26196,7 +26262,7 @@ GL_PREFIX(VertexAttrib3fNV):
 GL_PREFIX(VertexAttrib3fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5568(%rax), %r11
+	movq	5584(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26206,13 +26272,13 @@ GL_PREFIX(VertexAttrib3fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5568(%rax), %r11
+	movq	5584(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5568(%rax), %r11
+	movq	5584(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26222,7 +26288,7 @@ GL_PREFIX(VertexAttrib3fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5568(%rax), %r11
+	movq	5584(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3fvNV), .-GL_PREFIX(VertexAttrib3fvNV)
@@ -26233,7 +26299,7 @@ GL_PREFIX(VertexAttrib3fvNV):
 GL_PREFIX(VertexAttrib3sNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5576(%rax), %r11
+	movq	5592(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26247,13 +26313,13 @@ GL_PREFIX(VertexAttrib3sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5576(%rax), %r11
+	movq	5592(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5576(%rax), %r11
+	movq	5592(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26267,7 +26333,7 @@ GL_PREFIX(VertexAttrib3sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5576(%rax), %r11
+	movq	5592(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3sNV), .-GL_PREFIX(VertexAttrib3sNV)
@@ -26278,7 +26344,7 @@ GL_PREFIX(VertexAttrib3sNV):
 GL_PREFIX(VertexAttrib3svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5584(%rax), %r11
+	movq	5600(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26288,13 +26354,13 @@ GL_PREFIX(VertexAttrib3svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5584(%rax), %r11
+	movq	5600(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5584(%rax), %r11
+	movq	5600(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26304,7 +26370,7 @@ GL_PREFIX(VertexAttrib3svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5584(%rax), %r11
+	movq	5600(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3svNV), .-GL_PREFIX(VertexAttrib3svNV)
@@ -26315,7 +26381,7 @@ GL_PREFIX(VertexAttrib3svNV):
 GL_PREFIX(VertexAttrib4dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5592(%rax), %r11
+	movq	5608(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -26331,13 +26397,13 @@ GL_PREFIX(VertexAttrib4dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5592(%rax), %r11
+	movq	5608(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5592(%rax), %r11
+	movq	5608(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -26353,7 +26419,7 @@ GL_PREFIX(VertexAttrib4dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5592(%rax), %r11
+	movq	5608(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4dNV), .-GL_PREFIX(VertexAttrib4dNV)
@@ -26364,7 +26430,7 @@ GL_PREFIX(VertexAttrib4dNV):
 GL_PREFIX(VertexAttrib4dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5600(%rax), %r11
+	movq	5616(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26374,13 +26440,13 @@ GL_PREFIX(VertexAttrib4dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5600(%rax), %r11
+	movq	5616(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5600(%rax), %r11
+	movq	5616(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26390,7 +26456,7 @@ GL_PREFIX(VertexAttrib4dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5600(%rax), %r11
+	movq	5616(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4dvNV), .-GL_PREFIX(VertexAttrib4dvNV)
@@ -26401,7 +26467,7 @@ GL_PREFIX(VertexAttrib4dvNV):
 GL_PREFIX(VertexAttrib4fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5608(%rax), %r11
+	movq	5624(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -26417,13 +26483,13 @@ GL_PREFIX(VertexAttrib4fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5608(%rax), %r11
+	movq	5624(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5608(%rax), %r11
+	movq	5624(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -26439,7 +26505,7 @@ GL_PREFIX(VertexAttrib4fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5608(%rax), %r11
+	movq	5624(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4fNV), .-GL_PREFIX(VertexAttrib4fNV)
@@ -26450,7 +26516,7 @@ GL_PREFIX(VertexAttrib4fNV):
 GL_PREFIX(VertexAttrib4fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5616(%rax), %r11
+	movq	5632(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26460,13 +26526,13 @@ GL_PREFIX(VertexAttrib4fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5616(%rax), %r11
+	movq	5632(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5616(%rax), %r11
+	movq	5632(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26476,7 +26542,7 @@ GL_PREFIX(VertexAttrib4fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5616(%rax), %r11
+	movq	5632(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4fvNV), .-GL_PREFIX(VertexAttrib4fvNV)
@@ -26487,7 +26553,7 @@ GL_PREFIX(VertexAttrib4fvNV):
 GL_PREFIX(VertexAttrib4sNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5624(%rax), %r11
+	movq	5640(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26501,13 +26567,13 @@ GL_PREFIX(VertexAttrib4sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5624(%rax), %r11
+	movq	5640(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5624(%rax), %r11
+	movq	5640(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26521,7 +26587,7 @@ GL_PREFIX(VertexAttrib4sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5624(%rax), %r11
+	movq	5640(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4sNV), .-GL_PREFIX(VertexAttrib4sNV)
@@ -26532,7 +26598,7 @@ GL_PREFIX(VertexAttrib4sNV):
 GL_PREFIX(VertexAttrib4svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5632(%rax), %r11
+	movq	5648(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26542,13 +26608,13 @@ GL_PREFIX(VertexAttrib4svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5632(%rax), %r11
+	movq	5648(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5632(%rax), %r11
+	movq	5648(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26558,7 +26624,7 @@ GL_PREFIX(VertexAttrib4svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5632(%rax), %r11
+	movq	5648(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4svNV), .-GL_PREFIX(VertexAttrib4svNV)
@@ -26569,7 +26635,7 @@ GL_PREFIX(VertexAttrib4svNV):
 GL_PREFIX(VertexAttrib4ubNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5640(%rax), %r11
+	movq	5656(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26583,13 +26649,13 @@ GL_PREFIX(VertexAttrib4ubNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5640(%rax), %r11
+	movq	5656(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5640(%rax), %r11
+	movq	5656(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26603,7 +26669,7 @@ GL_PREFIX(VertexAttrib4ubNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5640(%rax), %r11
+	movq	5656(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4ubNV), .-GL_PREFIX(VertexAttrib4ubNV)
@@ -26614,7 +26680,7 @@ GL_PREFIX(VertexAttrib4ubNV):
 GL_PREFIX(VertexAttrib4ubvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5648(%rax), %r11
+	movq	5664(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26624,13 +26690,13 @@ GL_PREFIX(VertexAttrib4ubvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5648(%rax), %r11
+	movq	5664(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5648(%rax), %r11
+	movq	5664(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26640,7 +26706,7 @@ GL_PREFIX(VertexAttrib4ubvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5648(%rax), %r11
+	movq	5664(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4ubvNV), .-GL_PREFIX(VertexAttrib4ubvNV)
@@ -26651,7 +26717,7 @@ GL_PREFIX(VertexAttrib4ubvNV):
 GL_PREFIX(VertexAttribPointerNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5656(%rax), %r11
+	movq	5672(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26665,13 +26731,13 @@ GL_PREFIX(VertexAttribPointerNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5656(%rax), %r11
+	movq	5672(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5656(%rax), %r11
+	movq	5672(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26685,7 +26751,7 @@ GL_PREFIX(VertexAttribPointerNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5656(%rax), %r11
+	movq	5672(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribPointerNV), .-GL_PREFIX(VertexAttribPointerNV)
@@ -26696,7 +26762,7 @@ GL_PREFIX(VertexAttribPointerNV):
 GL_PREFIX(VertexAttribs1dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5664(%rax), %r11
+	movq	5680(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26706,13 +26772,13 @@ GL_PREFIX(VertexAttribs1dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5664(%rax), %r11
+	movq	5680(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5664(%rax), %r11
+	movq	5680(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26722,7 +26788,7 @@ GL_PREFIX(VertexAttribs1dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5664(%rax), %r11
+	movq	5680(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs1dvNV), .-GL_PREFIX(VertexAttribs1dvNV)
@@ -26733,7 +26799,7 @@ GL_PREFIX(VertexAttribs1dvNV):
 GL_PREFIX(VertexAttribs1fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5672(%rax), %r11
+	movq	5688(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26743,13 +26809,13 @@ GL_PREFIX(VertexAttribs1fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5672(%rax), %r11
+	movq	5688(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5672(%rax), %r11
+	movq	5688(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26759,7 +26825,7 @@ GL_PREFIX(VertexAttribs1fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5672(%rax), %r11
+	movq	5688(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs1fvNV), .-GL_PREFIX(VertexAttribs1fvNV)
@@ -26770,7 +26836,7 @@ GL_PREFIX(VertexAttribs1fvNV):
 GL_PREFIX(VertexAttribs1svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5680(%rax), %r11
+	movq	5696(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26780,13 +26846,13 @@ GL_PREFIX(VertexAttribs1svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5680(%rax), %r11
+	movq	5696(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5680(%rax), %r11
+	movq	5696(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26796,7 +26862,7 @@ GL_PREFIX(VertexAttribs1svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5680(%rax), %r11
+	movq	5696(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs1svNV), .-GL_PREFIX(VertexAttribs1svNV)
@@ -26807,7 +26873,7 @@ GL_PREFIX(VertexAttribs1svNV):
 GL_PREFIX(VertexAttribs2dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5688(%rax), %r11
+	movq	5704(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26817,13 +26883,13 @@ GL_PREFIX(VertexAttribs2dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5688(%rax), %r11
+	movq	5704(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5688(%rax), %r11
+	movq	5704(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26833,7 +26899,7 @@ GL_PREFIX(VertexAttribs2dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5688(%rax), %r11
+	movq	5704(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs2dvNV), .-GL_PREFIX(VertexAttribs2dvNV)
@@ -26844,7 +26910,7 @@ GL_PREFIX(VertexAttribs2dvNV):
 GL_PREFIX(VertexAttribs2fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5696(%rax), %r11
+	movq	5712(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26854,13 +26920,13 @@ GL_PREFIX(VertexAttribs2fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5696(%rax), %r11
+	movq	5712(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5696(%rax), %r11
+	movq	5712(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26870,7 +26936,7 @@ GL_PREFIX(VertexAttribs2fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5696(%rax), %r11
+	movq	5712(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs2fvNV), .-GL_PREFIX(VertexAttribs2fvNV)
@@ -26881,7 +26947,7 @@ GL_PREFIX(VertexAttribs2fvNV):
 GL_PREFIX(VertexAttribs2svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5704(%rax), %r11
+	movq	5720(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26891,13 +26957,13 @@ GL_PREFIX(VertexAttribs2svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5704(%rax), %r11
+	movq	5720(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5704(%rax), %r11
+	movq	5720(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26907,7 +26973,7 @@ GL_PREFIX(VertexAttribs2svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5704(%rax), %r11
+	movq	5720(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs2svNV), .-GL_PREFIX(VertexAttribs2svNV)
@@ -26918,7 +26984,7 @@ GL_PREFIX(VertexAttribs2svNV):
 GL_PREFIX(VertexAttribs3dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5712(%rax), %r11
+	movq	5728(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26928,13 +26994,13 @@ GL_PREFIX(VertexAttribs3dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5712(%rax), %r11
+	movq	5728(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5712(%rax), %r11
+	movq	5728(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26944,7 +27010,7 @@ GL_PREFIX(VertexAttribs3dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5712(%rax), %r11
+	movq	5728(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs3dvNV), .-GL_PREFIX(VertexAttribs3dvNV)
@@ -26955,7 +27021,7 @@ GL_PREFIX(VertexAttribs3dvNV):
 GL_PREFIX(VertexAttribs3fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5720(%rax), %r11
+	movq	5736(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26965,13 +27031,13 @@ GL_PREFIX(VertexAttribs3fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5720(%rax), %r11
+	movq	5736(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5720(%rax), %r11
+	movq	5736(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26981,7 +27047,7 @@ GL_PREFIX(VertexAttribs3fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5720(%rax), %r11
+	movq	5736(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs3fvNV), .-GL_PREFIX(VertexAttribs3fvNV)
@@ -26992,7 +27058,7 @@ GL_PREFIX(VertexAttribs3fvNV):
 GL_PREFIX(VertexAttribs3svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5728(%rax), %r11
+	movq	5744(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27002,13 +27068,13 @@ GL_PREFIX(VertexAttribs3svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5728(%rax), %r11
+	movq	5744(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5728(%rax), %r11
+	movq	5744(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27018,7 +27084,7 @@ GL_PREFIX(VertexAttribs3svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5728(%rax), %r11
+	movq	5744(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs3svNV), .-GL_PREFIX(VertexAttribs3svNV)
@@ -27029,7 +27095,7 @@ GL_PREFIX(VertexAttribs3svNV):
 GL_PREFIX(VertexAttribs4dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5736(%rax), %r11
+	movq	5752(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27039,13 +27105,13 @@ GL_PREFIX(VertexAttribs4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5736(%rax), %r11
+	movq	5752(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5736(%rax), %r11
+	movq	5752(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27055,7 +27121,7 @@ GL_PREFIX(VertexAttribs4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5736(%rax), %r11
+	movq	5752(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs4dvNV), .-GL_PREFIX(VertexAttribs4dvNV)
@@ -27066,7 +27132,7 @@ GL_PREFIX(VertexAttribs4dvNV):
 GL_PREFIX(VertexAttribs4fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5744(%rax), %r11
+	movq	5760(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27076,13 +27142,13 @@ GL_PREFIX(VertexAttribs4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5744(%rax), %r11
+	movq	5760(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5744(%rax), %r11
+	movq	5760(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27092,7 +27158,7 @@ GL_PREFIX(VertexAttribs4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5744(%rax), %r11
+	movq	5760(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs4fvNV), .-GL_PREFIX(VertexAttribs4fvNV)
@@ -27103,7 +27169,7 @@ GL_PREFIX(VertexAttribs4fvNV):
 GL_PREFIX(VertexAttribs4svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5752(%rax), %r11
+	movq	5768(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27113,13 +27179,13 @@ GL_PREFIX(VertexAttribs4svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5752(%rax), %r11
+	movq	5768(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5752(%rax), %r11
+	movq	5768(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27129,7 +27195,7 @@ GL_PREFIX(VertexAttribs4svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5752(%rax), %r11
+	movq	5768(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs4svNV), .-GL_PREFIX(VertexAttribs4svNV)
@@ -27140,7 +27206,7 @@ GL_PREFIX(VertexAttribs4svNV):
 GL_PREFIX(VertexAttribs4ubvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5760(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27150,13 +27216,13 @@ GL_PREFIX(VertexAttribs4ubvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5760(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5760(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27166,7 +27232,7 @@ GL_PREFIX(VertexAttribs4ubvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5760(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs4ubvNV), .-GL_PREFIX(VertexAttribs4ubvNV)
@@ -27177,7 +27243,7 @@ GL_PREFIX(VertexAttribs4ubvNV):
 GL_PREFIX(GetTexBumpParameterfvATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5768(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27187,13 +27253,13 @@ GL_PREFIX(GetTexBumpParameterfvATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5768(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5768(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27203,7 +27269,7 @@ GL_PREFIX(GetTexBumpParameterfvATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5768(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetTexBumpParameterfvATI), .-GL_PREFIX(GetTexBumpParameterfvATI)
@@ -27214,7 +27280,7 @@ GL_PREFIX(GetTexBumpParameterfvATI):
 GL_PREFIX(GetTexBumpParameterivATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5776(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27224,13 +27290,13 @@ GL_PREFIX(GetTexBumpParameterivATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5776(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5776(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27240,7 +27306,7 @@ GL_PREFIX(GetTexBumpParameterivATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5776(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetTexBumpParameterivATI), .-GL_PREFIX(GetTexBumpParameterivATI)
@@ -27251,7 +27317,7 @@ GL_PREFIX(GetTexBumpParameterivATI):
 GL_PREFIX(TexBumpParameterfvATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5784(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27261,13 +27327,13 @@ GL_PREFIX(TexBumpParameterfvATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5784(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5784(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27277,7 +27343,7 @@ GL_PREFIX(TexBumpParameterfvATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5784(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexBumpParameterfvATI), .-GL_PREFIX(TexBumpParameterfvATI)
@@ -27288,7 +27354,7 @@ GL_PREFIX(TexBumpParameterfvATI):
 GL_PREFIX(TexBumpParameterivATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5792(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27298,13 +27364,13 @@ GL_PREFIX(TexBumpParameterivATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5792(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5792(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27314,7 +27380,7 @@ GL_PREFIX(TexBumpParameterivATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5792(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexBumpParameterivATI), .-GL_PREFIX(TexBumpParameterivATI)
@@ -27325,7 +27391,7 @@ GL_PREFIX(TexBumpParameterivATI):
 GL_PREFIX(AlphaFragmentOp1ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5800(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27343,13 +27409,13 @@ GL_PREFIX(AlphaFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5800(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5800(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27367,7 +27433,7 @@ GL_PREFIX(AlphaFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5800(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AlphaFragmentOp1ATI), .-GL_PREFIX(AlphaFragmentOp1ATI)
@@ -27378,7 +27444,7 @@ GL_PREFIX(AlphaFragmentOp1ATI):
 GL_PREFIX(AlphaFragmentOp2ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5808(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27396,13 +27462,13 @@ GL_PREFIX(AlphaFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5808(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5808(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27420,7 +27486,7 @@ GL_PREFIX(AlphaFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5808(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AlphaFragmentOp2ATI), .-GL_PREFIX(AlphaFragmentOp2ATI)
@@ -27431,7 +27497,7 @@ GL_PREFIX(AlphaFragmentOp2ATI):
 GL_PREFIX(AlphaFragmentOp3ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5816(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27449,13 +27515,13 @@ GL_PREFIX(AlphaFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5816(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5816(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27473,7 +27539,7 @@ GL_PREFIX(AlphaFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5816(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AlphaFragmentOp3ATI), .-GL_PREFIX(AlphaFragmentOp3ATI)
@@ -27484,25 +27550,25 @@ GL_PREFIX(AlphaFragmentOp3ATI):
 GL_PREFIX(BeginFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5824(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	5824(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5824(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	5824(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BeginFragmentShaderATI), .-GL_PREFIX(BeginFragmentShaderATI)
@@ -27513,25 +27579,25 @@ GL_PREFIX(BeginFragmentShaderATI):
 GL_PREFIX(BindFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5832(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5832(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5832(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5832(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindFragmentShaderATI), .-GL_PREFIX(BindFragmentShaderATI)
@@ -27542,7 +27608,7 @@ GL_PREFIX(BindFragmentShaderATI):
 GL_PREFIX(ColorFragmentOp1ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5840(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27560,13 +27626,13 @@ GL_PREFIX(ColorFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5840(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5840(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27584,7 +27650,7 @@ GL_PREFIX(ColorFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5840(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorFragmentOp1ATI), .-GL_PREFIX(ColorFragmentOp1ATI)
@@ -27595,7 +27661,7 @@ GL_PREFIX(ColorFragmentOp1ATI):
 GL_PREFIX(ColorFragmentOp2ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5848(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27613,13 +27679,13 @@ GL_PREFIX(ColorFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5848(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5848(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27637,7 +27703,7 @@ GL_PREFIX(ColorFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5848(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorFragmentOp2ATI), .-GL_PREFIX(ColorFragmentOp2ATI)
@@ -27648,7 +27714,7 @@ GL_PREFIX(ColorFragmentOp2ATI):
 GL_PREFIX(ColorFragmentOp3ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5856(%rax), %r11
+	movq	5872(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27666,13 +27732,13 @@ GL_PREFIX(ColorFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5856(%rax), %r11
+	movq	5872(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5856(%rax), %r11
+	movq	5872(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27690,7 +27756,7 @@ GL_PREFIX(ColorFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5856(%rax), %r11
+	movq	5872(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorFragmentOp3ATI), .-GL_PREFIX(ColorFragmentOp3ATI)
@@ -27701,25 +27767,25 @@ GL_PREFIX(ColorFragmentOp3ATI):
 GL_PREFIX(DeleteFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5864(%rax), %r11
+	movq	5880(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5864(%rax), %r11
+	movq	5880(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5864(%rax), %r11
+	movq	5880(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5864(%rax), %r11
+	movq	5880(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteFragmentShaderATI), .-GL_PREFIX(DeleteFragmentShaderATI)
@@ -27730,25 +27796,25 @@ GL_PREFIX(DeleteFragmentShaderATI):
 GL_PREFIX(EndFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5872(%rax), %r11
+	movq	5888(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	5872(%rax), %r11
+	movq	5888(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5872(%rax), %r11
+	movq	5888(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	5872(%rax), %r11
+	movq	5888(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EndFragmentShaderATI), .-GL_PREFIX(EndFragmentShaderATI)
@@ -27759,25 +27825,25 @@ GL_PREFIX(EndFragmentShaderATI):
 GL_PREFIX(GenFragmentShadersATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5880(%rax), %r11
+	movq	5896(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5880(%rax), %r11
+	movq	5896(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5880(%rax), %r11
+	movq	5896(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5880(%rax), %r11
+	movq	5896(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenFragmentShadersATI), .-GL_PREFIX(GenFragmentShadersATI)
@@ -27788,7 +27854,7 @@ GL_PREFIX(GenFragmentShadersATI):
 GL_PREFIX(PassTexCoordATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5888(%rax), %r11
+	movq	5904(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27798,13 +27864,13 @@ GL_PREFIX(PassTexCoordATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5888(%rax), %r11
+	movq	5904(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5888(%rax), %r11
+	movq	5904(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27814,7 +27880,7 @@ GL_PREFIX(PassTexCoordATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5888(%rax), %r11
+	movq	5904(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PassTexCoordATI), .-GL_PREFIX(PassTexCoordATI)
@@ -27825,7 +27891,7 @@ GL_PREFIX(PassTexCoordATI):
 GL_PREFIX(SampleMapATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5896(%rax), %r11
+	movq	5912(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27835,13 +27901,13 @@ GL_PREFIX(SampleMapATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5896(%rax), %r11
+	movq	5912(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5896(%rax), %r11
+	movq	5912(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27851,7 +27917,7 @@ GL_PREFIX(SampleMapATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5896(%rax), %r11
+	movq	5912(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SampleMapATI), .-GL_PREFIX(SampleMapATI)
@@ -27862,7 +27928,7 @@ GL_PREFIX(SampleMapATI):
 GL_PREFIX(SetFragmentShaderConstantATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5904(%rax), %r11
+	movq	5920(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27872,13 +27938,13 @@ GL_PREFIX(SetFragmentShaderConstantATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5904(%rax), %r11
+	movq	5920(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5904(%rax), %r11
+	movq	5920(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27888,7 +27954,7 @@ GL_PREFIX(SetFragmentShaderConstantATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5904(%rax), %r11
+	movq	5920(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SetFragmentShaderConstantATI), .-GL_PREFIX(SetFragmentShaderConstantATI)
@@ -27899,7 +27965,7 @@ GL_PREFIX(SetFragmentShaderConstantATI):
 GL_PREFIX(PointParameteriNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5912(%rax), %r11
+	movq	5928(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27909,13 +27975,13 @@ GL_PREFIX(PointParameteriNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5912(%rax), %r11
+	movq	5928(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5912(%rax), %r11
+	movq	5928(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27925,7 +27991,7 @@ GL_PREFIX(PointParameteriNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5912(%rax), %r11
+	movq	5928(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PointParameteriNV), .-GL_PREFIX(PointParameteriNV)
@@ -27936,7 +28002,7 @@ GL_PREFIX(PointParameteriNV):
 GL_PREFIX(PointParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5920(%rax), %r11
+	movq	5936(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27946,13 +28012,13 @@ GL_PREFIX(PointParameterivNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5920(%rax), %r11
+	movq	5936(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5920(%rax), %r11
+	movq	5936(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27962,79 +28028,79 @@ GL_PREFIX(PointParameterivNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5920(%rax), %r11
+	movq	5936(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PointParameterivNV), .-GL_PREFIX(PointParameterivNV)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_741)
-	.type	GL_PREFIX(_dispatch_stub_741), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_741))
-GL_PREFIX(_dispatch_stub_741):
+	.globl	GL_PREFIX(_dispatch_stub_743)
+	.type	GL_PREFIX(_dispatch_stub_743), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_743))
+GL_PREFIX(_dispatch_stub_743):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5928(%rax), %r11
+	movq	5944(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5928(%rax), %r11
+	movq	5944(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5928(%rax), %r11
+	movq	5944(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5928(%rax), %r11
+	movq	5944(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_741), .-GL_PREFIX(_dispatch_stub_741)
+	.size	GL_PREFIX(_dispatch_stub_743), .-GL_PREFIX(_dispatch_stub_743)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_742)
-	.type	GL_PREFIX(_dispatch_stub_742), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_742))
-GL_PREFIX(_dispatch_stub_742):
+	.globl	GL_PREFIX(_dispatch_stub_744)
+	.type	GL_PREFIX(_dispatch_stub_744), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_744))
+GL_PREFIX(_dispatch_stub_744):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5936(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5936(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5936(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5936(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_742), .-GL_PREFIX(_dispatch_stub_742)
+	.size	GL_PREFIX(_dispatch_stub_744), .-GL_PREFIX(_dispatch_stub_744)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_743)
-	.type	GL_PREFIX(_dispatch_stub_743), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_743))
-GL_PREFIX(_dispatch_stub_743):
+	.globl	GL_PREFIX(_dispatch_stub_745)
+	.type	GL_PREFIX(_dispatch_stub_745), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_745))
+GL_PREFIX(_dispatch_stub_745):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5944(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28044,13 +28110,13 @@ GL_PREFIX(_dispatch_stub_743):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5944(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5944(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28060,19 +28126,19 @@ GL_PREFIX(_dispatch_stub_743):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5944(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_743), .-GL_PREFIX(_dispatch_stub_743)
+	.size	GL_PREFIX(_dispatch_stub_745), .-GL_PREFIX(_dispatch_stub_745)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_744)
-	.type	GL_PREFIX(_dispatch_stub_744), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_744))
-GL_PREFIX(_dispatch_stub_744):
+	.globl	GL_PREFIX(_dispatch_stub_746)
+	.type	GL_PREFIX(_dispatch_stub_746), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_746))
+GL_PREFIX(_dispatch_stub_746):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5952(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28082,13 +28148,13 @@ GL_PREFIX(_dispatch_stub_744):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5952(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5952(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28098,40 +28164,40 @@ GL_PREFIX(_dispatch_stub_744):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5952(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_744), .-GL_PREFIX(_dispatch_stub_744)
+	.size	GL_PREFIX(_dispatch_stub_746), .-GL_PREFIX(_dispatch_stub_746)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_745)
-	.type	GL_PREFIX(_dispatch_stub_745), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_745))
-GL_PREFIX(_dispatch_stub_745):
+	.globl	GL_PREFIX(_dispatch_stub_747)
+	.type	GL_PREFIX(_dispatch_stub_747), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_747))
+GL_PREFIX(_dispatch_stub_747):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5960(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5960(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5960(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5960(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_745), .-GL_PREFIX(_dispatch_stub_745)
+	.size	GL_PREFIX(_dispatch_stub_747), .-GL_PREFIX(_dispatch_stub_747)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(GetProgramNamedParameterdvNV)
@@ -28139,7 +28205,7 @@ GL_PREFIX(_dispatch_stub_745):
 GL_PREFIX(GetProgramNamedParameterdvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5968(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28153,13 +28219,13 @@ GL_PREFIX(GetProgramNamedParameterdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5968(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5968(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28173,7 +28239,7 @@ GL_PREFIX(GetProgramNamedParameterdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5968(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramNamedParameterdvNV), .-GL_PREFIX(GetProgramNamedParameterdvNV)
@@ -28184,7 +28250,7 @@ GL_PREFIX(GetProgramNamedParameterdvNV):
 GL_PREFIX(GetProgramNamedParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5976(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28198,13 +28264,13 @@ GL_PREFIX(GetProgramNamedParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5976(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5976(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28218,7 +28284,7 @@ GL_PREFIX(GetProgramNamedParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5976(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramNamedParameterfvNV), .-GL_PREFIX(GetProgramNamedParameterfvNV)
@@ -28229,7 +28295,7 @@ GL_PREFIX(GetProgramNamedParameterfvNV):
 GL_PREFIX(ProgramNamedParameter4dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5984(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$56, %rsp
@@ -28249,13 +28315,13 @@ GL_PREFIX(ProgramNamedParameter4dNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	5984(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5984(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$56, %rsp
@@ -28275,7 +28341,7 @@ GL_PREFIX(ProgramNamedParameter4dNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	5984(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4dNV), .-GL_PREFIX(ProgramNamedParameter4dNV)
@@ -28286,7 +28352,7 @@ GL_PREFIX(ProgramNamedParameter4dNV):
 GL_PREFIX(ProgramNamedParameter4dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5992(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28300,13 +28366,13 @@ GL_PREFIX(ProgramNamedParameter4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5992(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5992(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28320,7 +28386,7 @@ GL_PREFIX(ProgramNamedParameter4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5992(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4dvNV), .-GL_PREFIX(ProgramNamedParameter4dvNV)
@@ -28331,7 +28397,7 @@ GL_PREFIX(ProgramNamedParameter4dvNV):
 GL_PREFIX(ProgramNamedParameter4fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6000(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$56, %rsp
@@ -28351,13 +28417,13 @@ GL_PREFIX(ProgramNamedParameter4fNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	6000(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6000(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$56, %rsp
@@ -28377,7 +28443,7 @@ GL_PREFIX(ProgramNamedParameter4fNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	6000(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4fNV), .-GL_PREFIX(ProgramNamedParameter4fNV)
@@ -28388,7 +28454,7 @@ GL_PREFIX(ProgramNamedParameter4fNV):
 GL_PREFIX(ProgramNamedParameter4fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6008(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28402,13 +28468,13 @@ GL_PREFIX(ProgramNamedParameter4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6008(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6008(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28422,19 +28488,19 @@ GL_PREFIX(ProgramNamedParameter4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6008(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4fvNV), .-GL_PREFIX(ProgramNamedParameter4fvNV)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_752)
-	.type	GL_PREFIX(_dispatch_stub_752), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_752))
-GL_PREFIX(_dispatch_stub_752):
+	.globl	GL_PREFIX(_dispatch_stub_754)
+	.type	GL_PREFIX(_dispatch_stub_754), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_754))
+GL_PREFIX(_dispatch_stub_754):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6016(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28444,13 +28510,13 @@ GL_PREFIX(_dispatch_stub_752):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6016(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6016(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28460,19 +28526,19 @@ GL_PREFIX(_dispatch_stub_752):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6016(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_752), .-GL_PREFIX(_dispatch_stub_752)
+	.size	GL_PREFIX(_dispatch_stub_754), .-GL_PREFIX(_dispatch_stub_754)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_753)
-	.type	GL_PREFIX(_dispatch_stub_753), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_753))
-GL_PREFIX(_dispatch_stub_753):
+	.globl	GL_PREFIX(_dispatch_stub_755)
+	.type	GL_PREFIX(_dispatch_stub_755), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_755))
+GL_PREFIX(_dispatch_stub_755):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6024(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28482,13 +28548,13 @@ GL_PREFIX(_dispatch_stub_753):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6024(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6024(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28498,10 +28564,10 @@ GL_PREFIX(_dispatch_stub_753):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6024(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_753), .-GL_PREFIX(_dispatch_stub_753)
+	.size	GL_PREFIX(_dispatch_stub_755), .-GL_PREFIX(_dispatch_stub_755)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(BindFramebufferEXT)
@@ -28509,7 +28575,7 @@ GL_PREFIX(_dispatch_stub_753):
 GL_PREFIX(BindFramebufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6032(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28519,13 +28585,13 @@ GL_PREFIX(BindFramebufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6032(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6032(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28535,7 +28601,7 @@ GL_PREFIX(BindFramebufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6032(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindFramebufferEXT), .-GL_PREFIX(BindFramebufferEXT)
@@ -28546,7 +28612,7 @@ GL_PREFIX(BindFramebufferEXT):
 GL_PREFIX(BindRenderbufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6040(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28556,13 +28622,13 @@ GL_PREFIX(BindRenderbufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6040(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6040(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28572,7 +28638,7 @@ GL_PREFIX(BindRenderbufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6040(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindRenderbufferEXT), .-GL_PREFIX(BindRenderbufferEXT)
@@ -28583,25 +28649,25 @@ GL_PREFIX(BindRenderbufferEXT):
 GL_PREFIX(CheckFramebufferStatusEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6048(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6048(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6048(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6048(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CheckFramebufferStatusEXT), .-GL_PREFIX(CheckFramebufferStatusEXT)
@@ -28612,7 +28678,7 @@ GL_PREFIX(CheckFramebufferStatusEXT):
 GL_PREFIX(DeleteFramebuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6056(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28622,13 +28688,13 @@ GL_PREFIX(DeleteFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6056(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6056(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28638,7 +28704,7 @@ GL_PREFIX(DeleteFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6056(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteFramebuffersEXT), .-GL_PREFIX(DeleteFramebuffersEXT)
@@ -28649,7 +28715,7 @@ GL_PREFIX(DeleteFramebuffersEXT):
 GL_PREFIX(DeleteRenderbuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6064(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28659,13 +28725,13 @@ GL_PREFIX(DeleteRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6064(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6064(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28675,7 +28741,7 @@ GL_PREFIX(DeleteRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6064(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteRenderbuffersEXT), .-GL_PREFIX(DeleteRenderbuffersEXT)
@@ -28686,7 +28752,7 @@ GL_PREFIX(DeleteRenderbuffersEXT):
 GL_PREFIX(FramebufferRenderbufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6072(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28700,13 +28766,13 @@ GL_PREFIX(FramebufferRenderbufferEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6072(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6072(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28720,7 +28786,7 @@ GL_PREFIX(FramebufferRenderbufferEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6072(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferRenderbufferEXT), .-GL_PREFIX(FramebufferRenderbufferEXT)
@@ -28731,7 +28797,7 @@ GL_PREFIX(FramebufferRenderbufferEXT):
 GL_PREFIX(FramebufferTexture1DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6080(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28745,13 +28811,13 @@ GL_PREFIX(FramebufferTexture1DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6080(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6080(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28765,7 +28831,7 @@ GL_PREFIX(FramebufferTexture1DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6080(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTexture1DEXT), .-GL_PREFIX(FramebufferTexture1DEXT)
@@ -28776,7 +28842,7 @@ GL_PREFIX(FramebufferTexture1DEXT):
 GL_PREFIX(FramebufferTexture2DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6088(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28790,13 +28856,13 @@ GL_PREFIX(FramebufferTexture2DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6088(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6088(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28810,7 +28876,7 @@ GL_PREFIX(FramebufferTexture2DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6088(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTexture2DEXT), .-GL_PREFIX(FramebufferTexture2DEXT)
@@ -28821,7 +28887,7 @@ GL_PREFIX(FramebufferTexture2DEXT):
 GL_PREFIX(FramebufferTexture3DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6096(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28839,13 +28905,13 @@ GL_PREFIX(FramebufferTexture3DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6096(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6096(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28863,7 +28929,7 @@ GL_PREFIX(FramebufferTexture3DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6096(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTexture3DEXT), .-GL_PREFIX(FramebufferTexture3DEXT)
@@ -28874,7 +28940,7 @@ GL_PREFIX(FramebufferTexture3DEXT):
 GL_PREFIX(GenFramebuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6104(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28884,13 +28950,13 @@ GL_PREFIX(GenFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6104(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6104(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28900,7 +28966,7 @@ GL_PREFIX(GenFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6104(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenFramebuffersEXT), .-GL_PREFIX(GenFramebuffersEXT)
@@ -28911,7 +28977,7 @@ GL_PREFIX(GenFramebuffersEXT):
 GL_PREFIX(GenRenderbuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6112(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28921,13 +28987,13 @@ GL_PREFIX(GenRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6112(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6112(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28937,7 +29003,7 @@ GL_PREFIX(GenRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6112(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenRenderbuffersEXT), .-GL_PREFIX(GenRenderbuffersEXT)
@@ -28948,25 +29014,25 @@ GL_PREFIX(GenRenderbuffersEXT):
 GL_PREFIX(GenerateMipmapEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6120(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6120(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6120(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6120(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenerateMipmapEXT), .-GL_PREFIX(GenerateMipmapEXT)
@@ -28977,7 +29043,7 @@ GL_PREFIX(GenerateMipmapEXT):
 GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6128(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28991,13 +29057,13 @@ GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6128(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6128(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29011,7 +29077,7 @@ GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6128(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetFramebufferAttachmentParameterivEXT), .-GL_PREFIX(GetFramebufferAttachmentParameterivEXT)
@@ -29022,7 +29088,7 @@ GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 GL_PREFIX(GetRenderbufferParameterivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6136(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29032,13 +29098,13 @@ GL_PREFIX(GetRenderbufferParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6136(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6136(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29048,7 +29114,7 @@ GL_PREFIX(GetRenderbufferParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6136(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetRenderbufferParameterivEXT), .-GL_PREFIX(GetRenderbufferParameterivEXT)
@@ -29059,25 +29125,25 @@ GL_PREFIX(GetRenderbufferParameterivEXT):
 GL_PREFIX(IsFramebufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6144(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6144(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6144(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6144(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsFramebufferEXT), .-GL_PREFIX(IsFramebufferEXT)
@@ -29088,25 +29154,25 @@ GL_PREFIX(IsFramebufferEXT):
 GL_PREFIX(IsRenderbufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6152(%rax), %r11
+	movq	6168(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6152(%rax), %r11
+	movq	6168(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6152(%rax), %r11
+	movq	6168(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6152(%rax), %r11
+	movq	6168(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsRenderbufferEXT), .-GL_PREFIX(IsRenderbufferEXT)
@@ -29117,7 +29183,7 @@ GL_PREFIX(IsRenderbufferEXT):
 GL_PREFIX(RenderbufferStorageEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6160(%rax), %r11
+	movq	6176(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29131,13 +29197,13 @@ GL_PREFIX(RenderbufferStorageEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6160(%rax), %r11
+	movq	6176(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6160(%rax), %r11
+	movq	6176(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29151,19 +29217,19 @@ GL_PREFIX(RenderbufferStorageEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6160(%rax), %r11
+	movq	6176(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(RenderbufferStorageEXT), .-GL_PREFIX(RenderbufferStorageEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_771)
-	.type	GL_PREFIX(_dispatch_stub_771), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_771))
-GL_PREFIX(_dispatch_stub_771):
+	.globl	GL_PREFIX(_dispatch_stub_773)
+	.type	GL_PREFIX(_dispatch_stub_773), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_773))
+GL_PREFIX(_dispatch_stub_773):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6168(%rax), %r11
+	movq	6184(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29181,13 +29247,13 @@ GL_PREFIX(_dispatch_stub_771):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6168(%rax), %r11
+	movq	6184(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6168(%rax), %r11
+	movq	6184(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29205,10 +29271,10 @@ GL_PREFIX(_dispatch_stub_771):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6168(%rax), %r11
+	movq	6184(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_771), .-GL_PREFIX(_dispatch_stub_771)
+	.size	GL_PREFIX(_dispatch_stub_773), .-GL_PREFIX(_dispatch_stub_773)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(FramebufferTextureLayerEXT)
@@ -29216,7 +29282,7 @@ GL_PREFIX(_dispatch_stub_771):
 GL_PREFIX(FramebufferTextureLayerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6176(%rax), %r11
+	movq	6192(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29230,13 +29296,13 @@ GL_PREFIX(FramebufferTextureLayerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6176(%rax), %r11
+	movq	6192(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6176(%rax), %r11
+	movq	6192(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29250,7 +29316,7 @@ GL_PREFIX(FramebufferTextureLayerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6176(%rax), %r11
+	movq	6192(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTextureLayerEXT), .-GL_PREFIX(FramebufferTextureLayerEXT)
@@ -29261,37 +29327,37 @@ GL_PREFIX(FramebufferTextureLayerEXT):
 GL_PREFIX(ProvokingVertexEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6184(%rax), %r11
+	movq	6200(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6184(%rax), %r11
+	movq	6200(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6184(%rax), %r11
+	movq	6200(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6184(%rax), %r11
+	movq	6200(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProvokingVertexEXT), .-GL_PREFIX(ProvokingVertexEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_774)
-	.type	GL_PREFIX(_dispatch_stub_774), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_774))
-GL_PREFIX(_dispatch_stub_774):
+	.globl	GL_PREFIX(_dispatch_stub_776)
+	.type	GL_PREFIX(_dispatch_stub_776), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_776))
+GL_PREFIX(_dispatch_stub_776):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6192(%rax), %r11
+	movq	6208(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29305,13 +29371,13 @@ GL_PREFIX(_dispatch_stub_774):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6192(%rax), %r11
+	movq	6208(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6192(%rax), %r11
+	movq	6208(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29325,19 +29391,19 @@ GL_PREFIX(_dispatch_stub_774):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6192(%rax), %r11
+	movq	6208(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_774), .-GL_PREFIX(_dispatch_stub_774)
+	.size	GL_PREFIX(_dispatch_stub_776), .-GL_PREFIX(_dispatch_stub_776)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_775)
-	.type	GL_PREFIX(_dispatch_stub_775), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_775))
-GL_PREFIX(_dispatch_stub_775):
+	.globl	GL_PREFIX(_dispatch_stub_777)
+	.type	GL_PREFIX(_dispatch_stub_777), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_777))
+GL_PREFIX(_dispatch_stub_777):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6200(%rax), %r11
+	movq	6216(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29351,13 +29417,13 @@ GL_PREFIX(_dispatch_stub_775):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6200(%rax), %r11
+	movq	6216(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6200(%rax), %r11
+	movq	6216(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29371,19 +29437,19 @@ GL_PREFIX(_dispatch_stub_775):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6200(%rax), %r11
+	movq	6216(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_775), .-GL_PREFIX(_dispatch_stub_775)
+	.size	GL_PREFIX(_dispatch_stub_777), .-GL_PREFIX(_dispatch_stub_777)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_776)
-	.type	GL_PREFIX(_dispatch_stub_776), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_776))
-GL_PREFIX(_dispatch_stub_776):
+	.globl	GL_PREFIX(_dispatch_stub_778)
+	.type	GL_PREFIX(_dispatch_stub_778), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_778))
+GL_PREFIX(_dispatch_stub_778):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6208(%rax), %r11
+	movq	6224(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29397,13 +29463,13 @@ GL_PREFIX(_dispatch_stub_776):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6208(%rax), %r11
+	movq	6224(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6208(%rax), %r11
+	movq	6224(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29417,19 +29483,19 @@ GL_PREFIX(_dispatch_stub_776):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6208(%rax), %r11
+	movq	6224(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_776), .-GL_PREFIX(_dispatch_stub_776)
+	.size	GL_PREFIX(_dispatch_stub_778), .-GL_PREFIX(_dispatch_stub_778)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_777)
-	.type	GL_PREFIX(_dispatch_stub_777), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_777))
-GL_PREFIX(_dispatch_stub_777):
+	.globl	GL_PREFIX(_dispatch_stub_779)
+	.type	GL_PREFIX(_dispatch_stub_779), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_779))
+GL_PREFIX(_dispatch_stub_779):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6216(%rax), %r11
+	movq	6232(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29439,13 +29505,13 @@ GL_PREFIX(_dispatch_stub_777):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6216(%rax), %r11
+	movq	6232(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6216(%rax), %r11
+	movq	6232(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29455,19 +29521,19 @@ GL_PREFIX(_dispatch_stub_777):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6216(%rax), %r11
+	movq	6232(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_777), .-GL_PREFIX(_dispatch_stub_777)
+	.size	GL_PREFIX(_dispatch_stub_779), .-GL_PREFIX(_dispatch_stub_779)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_778)
-	.type	GL_PREFIX(_dispatch_stub_778), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_778))
-GL_PREFIX(_dispatch_stub_778):
+	.globl	GL_PREFIX(_dispatch_stub_780)
+	.type	GL_PREFIX(_dispatch_stub_780), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_780))
+GL_PREFIX(_dispatch_stub_780):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6224(%rax), %r11
+	movq	6240(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29477,13 +29543,13 @@ GL_PREFIX(_dispatch_stub_778):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6224(%rax), %r11
+	movq	6240(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6224(%rax), %r11
+	movq	6240(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29493,10 +29559,10 @@ GL_PREFIX(_dispatch_stub_778):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6224(%rax), %r11
+	movq	6240(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_778), .-GL_PREFIX(_dispatch_stub_778)
+	.size	GL_PREFIX(_dispatch_stub_780), .-GL_PREFIX(_dispatch_stub_780)
 
 	.globl GL_PREFIX(ArrayElementEXT) ; .set GL_PREFIX(ArrayElementEXT), GL_PREFIX(ArrayElement)
 	.globl GL_PREFIX(BindTextureEXT) ; .set GL_PREFIX(BindTextureEXT), GL_PREFIX(BindTexture)
@@ -29751,7 +29817,9 @@ GL_PREFIX(_dispatch_stub_778):
 	.globl GL_PREFIX(IsProgramARB) ; .set GL_PREFIX(IsProgramARB), GL_PREFIX(IsProgramNV)
 	.globl GL_PREFIX(PointParameteri) ; .set GL_PREFIX(PointParameteri), GL_PREFIX(PointParameteriNV)
 	.globl GL_PREFIX(PointParameteriv) ; .set GL_PREFIX(PointParameteriv), GL_PREFIX(PointParameterivNV)
-	.globl GL_PREFIX(BlendEquationSeparate) ; .set GL_PREFIX(BlendEquationSeparate), GL_PREFIX(_dispatch_stub_753)
+	.globl GL_PREFIX(DeleteVertexArrays) ; .set GL_PREFIX(DeleteVertexArrays), GL_PREFIX(_dispatch_stub_745)
+	.globl GL_PREFIX(IsVertexArray) ; .set GL_PREFIX(IsVertexArray), GL_PREFIX(_dispatch_stub_747)
+	.globl GL_PREFIX(BlendEquationSeparate) ; .set GL_PREFIX(BlendEquationSeparate), GL_PREFIX(_dispatch_stub_755)
 	.globl GL_PREFIX(BindFramebuffer) ; .set GL_PREFIX(BindFramebuffer), GL_PREFIX(BindFramebufferEXT)
 	.globl GL_PREFIX(BindRenderbuffer) ; .set GL_PREFIX(BindRenderbuffer), GL_PREFIX(BindRenderbufferEXT)
 	.globl GL_PREFIX(CheckFramebufferStatus) ; .set GL_PREFIX(CheckFramebufferStatus), GL_PREFIX(CheckFramebufferStatusEXT)
@@ -29769,7 +29837,7 @@ GL_PREFIX(_dispatch_stub_778):
 	.globl GL_PREFIX(IsFramebuffer) ; .set GL_PREFIX(IsFramebuffer), GL_PREFIX(IsFramebufferEXT)
 	.globl GL_PREFIX(IsRenderbuffer) ; .set GL_PREFIX(IsRenderbuffer), GL_PREFIX(IsRenderbufferEXT)
 	.globl GL_PREFIX(RenderbufferStorage) ; .set GL_PREFIX(RenderbufferStorage), GL_PREFIX(RenderbufferStorageEXT)
-	.globl GL_PREFIX(BlitFramebuffer) ; .set GL_PREFIX(BlitFramebuffer), GL_PREFIX(_dispatch_stub_771)
+	.globl GL_PREFIX(BlitFramebuffer) ; .set GL_PREFIX(BlitFramebuffer), GL_PREFIX(_dispatch_stub_773)
 	.globl GL_PREFIX(FramebufferTextureLayer) ; .set GL_PREFIX(FramebufferTextureLayer), GL_PREFIX(FramebufferTextureLayerEXT)
 
 #if defined(GLX_USE_TLS) && defined(__linux__)
diff --git a/src/mesa/x86/glapi_x86.S b/src/mesa/x86/glapi_x86.S
index 5ad5e4f622..40fc6f2229 100644
--- a/src/mesa/x86/glapi_x86.S
+++ b/src/mesa/x86/glapi_x86.S
@@ -715,24 +715,26 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(RenderbufferStorageMultisample, _gloffset_RenderbufferStorageMultisample, RenderbufferStorageMultisample@20)
 	GL_STUB(FlushMappedBufferRange, _gloffset_FlushMappedBufferRange, FlushMappedBufferRange@12)
 	GL_STUB(MapBufferRange, _gloffset_MapBufferRange, MapBufferRange@16)
+	GL_STUB(BindVertexArray, _gloffset_BindVertexArray, BindVertexArray@4)
+	GL_STUB(GenVertexArrays, _gloffset_GenVertexArrays, GenVertexArrays@8)
 	GL_STUB(CopyBufferSubData, _gloffset_CopyBufferSubData, CopyBufferSubData@20)
 	GL_STUB(PolygonOffsetEXT, _gloffset_PolygonOffsetEXT, PolygonOffsetEXT@8)
-	GL_STUB(_dispatch_stub_566, _gloffset_GetPixelTexGenParameterfvSGIS, _dispatch_stub_566@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_566, _dispatch_stub_566@8))
-	GL_STUB(_dispatch_stub_567, _gloffset_GetPixelTexGenParameterivSGIS, _dispatch_stub_567@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_567, _dispatch_stub_567@8))
-	GL_STUB(_dispatch_stub_568, _gloffset_PixelTexGenParameterfSGIS, _dispatch_stub_568@8)
+	GL_STUB(_dispatch_stub_568, _gloffset_GetPixelTexGenParameterfvSGIS, _dispatch_stub_568@8)
 	HIDDEN(GL_PREFIX(_dispatch_stub_568, _dispatch_stub_568@8))
-	GL_STUB(_dispatch_stub_569, _gloffset_PixelTexGenParameterfvSGIS, _dispatch_stub_569@8)
+	GL_STUB(_dispatch_stub_569, _gloffset_GetPixelTexGenParameterivSGIS, _dispatch_stub_569@8)
 	HIDDEN(GL_PREFIX(_dispatch_stub_569, _dispatch_stub_569@8))
-	GL_STUB(_dispatch_stub_570, _gloffset_PixelTexGenParameteriSGIS, _dispatch_stub_570@8)
+	GL_STUB(_dispatch_stub_570, _gloffset_PixelTexGenParameterfSGIS, _dispatch_stub_570@8)
 	HIDDEN(GL_PREFIX(_dispatch_stub_570, _dispatch_stub_570@8))
-	GL_STUB(_dispatch_stub_571, _gloffset_PixelTexGenParameterivSGIS, _dispatch_stub_571@8)
+	GL_STUB(_dispatch_stub_571, _gloffset_PixelTexGenParameterfvSGIS, _dispatch_stub_571@8)
 	HIDDEN(GL_PREFIX(_dispatch_stub_571, _dispatch_stub_571@8))
-	GL_STUB(_dispatch_stub_572, _gloffset_SampleMaskSGIS, _dispatch_stub_572@8)
+	GL_STUB(_dispatch_stub_572, _gloffset_PixelTexGenParameteriSGIS, _dispatch_stub_572@8)
 	HIDDEN(GL_PREFIX(_dispatch_stub_572, _dispatch_stub_572@8))
-	GL_STUB(_dispatch_stub_573, _gloffset_SamplePatternSGIS, _dispatch_stub_573@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_573, _dispatch_stub_573@4))
+	GL_STUB(_dispatch_stub_573, _gloffset_PixelTexGenParameterivSGIS, _dispatch_stub_573@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_573, _dispatch_stub_573@8))
+	GL_STUB(_dispatch_stub_574, _gloffset_SampleMaskSGIS, _dispatch_stub_574@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_574, _dispatch_stub_574@8))
+	GL_STUB(_dispatch_stub_575, _gloffset_SamplePatternSGIS, _dispatch_stub_575@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_575, _dispatch_stub_575@4))
 	GL_STUB(ColorPointerEXT, _gloffset_ColorPointerEXT, ColorPointerEXT@20)
 	GL_STUB(EdgeFlagPointerEXT, _gloffset_EdgeFlagPointerEXT, EdgeFlagPointerEXT@12)
 	GL_STUB(IndexPointerEXT, _gloffset_IndexPointerEXT, IndexPointerEXT@16)
@@ -743,10 +745,10 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(PointParameterfvEXT, _gloffset_PointParameterfvEXT, PointParameterfvEXT@8)
 	GL_STUB(LockArraysEXT, _gloffset_LockArraysEXT, LockArraysEXT@8)
 	GL_STUB(UnlockArraysEXT, _gloffset_UnlockArraysEXT, UnlockArraysEXT@0)
-	GL_STUB(_dispatch_stub_584, _gloffset_CullParameterdvEXT, _dispatch_stub_584@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_584, _dispatch_stub_584@8))
-	GL_STUB(_dispatch_stub_585, _gloffset_CullParameterfvEXT, _dispatch_stub_585@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_585, _dispatch_stub_585@8))
+	GL_STUB(_dispatch_stub_586, _gloffset_CullParameterdvEXT, _dispatch_stub_586@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_586, _dispatch_stub_586@8))
+	GL_STUB(_dispatch_stub_587, _gloffset_CullParameterfvEXT, _dispatch_stub_587@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_587, _dispatch_stub_587@8))
 	GL_STUB(SecondaryColor3bEXT, _gloffset_SecondaryColor3bEXT, SecondaryColor3bEXT@12)
 	GL_STUB(SecondaryColor3bvEXT, _gloffset_SecondaryColor3bvEXT, SecondaryColor3bvEXT@4)
 	GL_STUB(SecondaryColor3dEXT, _gloffset_SecondaryColor3dEXT, SecondaryColor3dEXT@24)
@@ -771,8 +773,8 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(FogCoorddvEXT, _gloffset_FogCoorddvEXT, FogCoorddvEXT@4)
 	GL_STUB(FogCoordfEXT, _gloffset_FogCoordfEXT, FogCoordfEXT@4)
 	GL_STUB(FogCoordfvEXT, _gloffset_FogCoordfvEXT, FogCoordfvEXT@4)
-	GL_STUB(_dispatch_stub_610, _gloffset_PixelTexGenSGIX, _dispatch_stub_610@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_610, _dispatch_stub_610@4))
+	GL_STUB(_dispatch_stub_612, _gloffset_PixelTexGenSGIX, _dispatch_stub_612@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_612, _dispatch_stub_612@4))
 	GL_STUB(BlendFuncSeparateEXT, _gloffset_BlendFuncSeparateEXT, BlendFuncSeparateEXT@16)
 	GL_STUB(FlushVertexArrayRangeNV, _gloffset_FlushVertexArrayRangeNV, FlushVertexArrayRangeNV@0)
 	GL_STUB(VertexArrayRangeNV, _gloffset_VertexArrayRangeNV, VertexArrayRangeNV@8)
@@ -814,24 +816,24 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(WindowPos4ivMESA, _gloffset_WindowPos4ivMESA, WindowPos4ivMESA@4)
 	GL_STUB(WindowPos4sMESA, _gloffset_WindowPos4sMESA, WindowPos4sMESA@16)
 	GL_STUB(WindowPos4svMESA, _gloffset_WindowPos4svMESA, WindowPos4svMESA@4)
-	GL_STUB(_dispatch_stub_652, _gloffset_MultiModeDrawArraysIBM, _dispatch_stub_652@20)
-	HIDDEN(GL_PREFIX(_dispatch_stub_652, _dispatch_stub_652@20))
-	GL_STUB(_dispatch_stub_653, _gloffset_MultiModeDrawElementsIBM, _dispatch_stub_653@24)
-	HIDDEN(GL_PREFIX(_dispatch_stub_653, _dispatch_stub_653@24))
-	GL_STUB(_dispatch_stub_654, _gloffset_DeleteFencesNV, _dispatch_stub_654@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_654, _dispatch_stub_654@8))
-	GL_STUB(_dispatch_stub_655, _gloffset_FinishFenceNV, _dispatch_stub_655@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_655, _dispatch_stub_655@4))
-	GL_STUB(_dispatch_stub_656, _gloffset_GenFencesNV, _dispatch_stub_656@8)
+	GL_STUB(_dispatch_stub_654, _gloffset_MultiModeDrawArraysIBM, _dispatch_stub_654@20)
+	HIDDEN(GL_PREFIX(_dispatch_stub_654, _dispatch_stub_654@20))
+	GL_STUB(_dispatch_stub_655, _gloffset_MultiModeDrawElementsIBM, _dispatch_stub_655@24)
+	HIDDEN(GL_PREFIX(_dispatch_stub_655, _dispatch_stub_655@24))
+	GL_STUB(_dispatch_stub_656, _gloffset_DeleteFencesNV, _dispatch_stub_656@8)
 	HIDDEN(GL_PREFIX(_dispatch_stub_656, _dispatch_stub_656@8))
-	GL_STUB(_dispatch_stub_657, _gloffset_GetFenceivNV, _dispatch_stub_657@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_657, _dispatch_stub_657@12))
-	GL_STUB(_dispatch_stub_658, _gloffset_IsFenceNV, _dispatch_stub_658@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_658, _dispatch_stub_658@4))
-	GL_STUB(_dispatch_stub_659, _gloffset_SetFenceNV, _dispatch_stub_659@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_659, _dispatch_stub_659@8))
-	GL_STUB(_dispatch_stub_660, _gloffset_TestFenceNV, _dispatch_stub_660@4)
+	GL_STUB(_dispatch_stub_657, _gloffset_FinishFenceNV, _dispatch_stub_657@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_657, _dispatch_stub_657@4))
+	GL_STUB(_dispatch_stub_658, _gloffset_GenFencesNV, _dispatch_stub_658@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_658, _dispatch_stub_658@8))
+	GL_STUB(_dispatch_stub_659, _gloffset_GetFenceivNV, _dispatch_stub_659@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_659, _dispatch_stub_659@12))
+	GL_STUB(_dispatch_stub_660, _gloffset_IsFenceNV, _dispatch_stub_660@4)
 	HIDDEN(GL_PREFIX(_dispatch_stub_660, _dispatch_stub_660@4))
+	GL_STUB(_dispatch_stub_661, _gloffset_SetFenceNV, _dispatch_stub_661@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_661, _dispatch_stub_661@8))
+	GL_STUB(_dispatch_stub_662, _gloffset_TestFenceNV, _dispatch_stub_662@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_662, _dispatch_stub_662@4))
 	GL_STUB(AreProgramsResidentNV, _gloffset_AreProgramsResidentNV, AreProgramsResidentNV@12)
 	GL_STUB(BindProgramNV, _gloffset_BindProgramNV, BindProgramNV@8)
 	GL_STUB(DeleteProgramsNV, _gloffset_DeleteProgramsNV, DeleteProgramsNV@8)
@@ -912,26 +914,26 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(SetFragmentShaderConstantATI, _gloffset_SetFragmentShaderConstantATI, SetFragmentShaderConstantATI@8)
 	GL_STUB(PointParameteriNV, _gloffset_PointParameteriNV, PointParameteriNV@8)
 	GL_STUB(PointParameterivNV, _gloffset_PointParameterivNV, PointParameterivNV@8)
-	GL_STUB(_dispatch_stub_741, _gloffset_ActiveStencilFaceEXT, _dispatch_stub_741@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_741, _dispatch_stub_741@4))
-	GL_STUB(_dispatch_stub_742, _gloffset_BindVertexArrayAPPLE, _dispatch_stub_742@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_742, _dispatch_stub_742@4))
-	GL_STUB(_dispatch_stub_743, _gloffset_DeleteVertexArraysAPPLE, _dispatch_stub_743@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_743, _dispatch_stub_743@8))
-	GL_STUB(_dispatch_stub_744, _gloffset_GenVertexArraysAPPLE, _dispatch_stub_744@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_744, _dispatch_stub_744@8))
-	GL_STUB(_dispatch_stub_745, _gloffset_IsVertexArrayAPPLE, _dispatch_stub_745@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_745, _dispatch_stub_745@4))
+	GL_STUB(_dispatch_stub_743, _gloffset_ActiveStencilFaceEXT, _dispatch_stub_743@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_743, _dispatch_stub_743@4))
+	GL_STUB(_dispatch_stub_744, _gloffset_BindVertexArrayAPPLE, _dispatch_stub_744@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_744, _dispatch_stub_744@4))
+	GL_STUB(_dispatch_stub_745, _gloffset_DeleteVertexArraysAPPLE, _dispatch_stub_745@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_745, _dispatch_stub_745@8))
+	GL_STUB(_dispatch_stub_746, _gloffset_GenVertexArraysAPPLE, _dispatch_stub_746@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_746, _dispatch_stub_746@8))
+	GL_STUB(_dispatch_stub_747, _gloffset_IsVertexArrayAPPLE, _dispatch_stub_747@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_747, _dispatch_stub_747@4))
 	GL_STUB(GetProgramNamedParameterdvNV, _gloffset_GetProgramNamedParameterdvNV, GetProgramNamedParameterdvNV@16)
 	GL_STUB(GetProgramNamedParameterfvNV, _gloffset_GetProgramNamedParameterfvNV, GetProgramNamedParameterfvNV@16)
 	GL_STUB(ProgramNamedParameter4dNV, _gloffset_ProgramNamedParameter4dNV, ProgramNamedParameter4dNV@44)
 	GL_STUB(ProgramNamedParameter4dvNV, _gloffset_ProgramNamedParameter4dvNV, ProgramNamedParameter4dvNV@16)
 	GL_STUB(ProgramNamedParameter4fNV, _gloffset_ProgramNamedParameter4fNV, ProgramNamedParameter4fNV@28)
 	GL_STUB(ProgramNamedParameter4fvNV, _gloffset_ProgramNamedParameter4fvNV, ProgramNamedParameter4fvNV@16)
-	GL_STUB(_dispatch_stub_752, _gloffset_DepthBoundsEXT, _dispatch_stub_752@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_752, _dispatch_stub_752@16))
-	GL_STUB(_dispatch_stub_753, _gloffset_BlendEquationSeparateEXT, _dispatch_stub_753@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_753, _dispatch_stub_753@8))
+	GL_STUB(_dispatch_stub_754, _gloffset_DepthBoundsEXT, _dispatch_stub_754@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_754, _dispatch_stub_754@16))
+	GL_STUB(_dispatch_stub_755, _gloffset_BlendEquationSeparateEXT, _dispatch_stub_755@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_755, _dispatch_stub_755@8))
 	GL_STUB(BindFramebufferEXT, _gloffset_BindFramebufferEXT, BindFramebufferEXT@8)
 	GL_STUB(BindRenderbufferEXT, _gloffset_BindRenderbufferEXT, BindRenderbufferEXT@8)
 	GL_STUB(CheckFramebufferStatusEXT, _gloffset_CheckFramebufferStatusEXT, CheckFramebufferStatusEXT@4)
@@ -949,20 +951,20 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(IsFramebufferEXT, _gloffset_IsFramebufferEXT, IsFramebufferEXT@4)
 	GL_STUB(IsRenderbufferEXT, _gloffset_IsRenderbufferEXT, IsRenderbufferEXT@4)
 	GL_STUB(RenderbufferStorageEXT, _gloffset_RenderbufferStorageEXT, RenderbufferStorageEXT@16)
-	GL_STUB(_dispatch_stub_771, _gloffset_BlitFramebufferEXT, _dispatch_stub_771@40)
-	HIDDEN(GL_PREFIX(_dispatch_stub_771, _dispatch_stub_771@40))
+	GL_STUB(_dispatch_stub_773, _gloffset_BlitFramebufferEXT, _dispatch_stub_773@40)
+	HIDDEN(GL_PREFIX(_dispatch_stub_773, _dispatch_stub_773@40))
 	GL_STUB(FramebufferTextureLayerEXT, _gloffset_FramebufferTextureLayerEXT, FramebufferTextureLayerEXT@20)
 	GL_STUB(ProvokingVertexEXT, _gloffset_ProvokingVertexEXT, ProvokingVertexEXT@4)
-	GL_STUB(_dispatch_stub_774, _gloffset_StencilFuncSeparateATI, _dispatch_stub_774@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_774, _dispatch_stub_774@16))
-	GL_STUB(_dispatch_stub_775, _gloffset_ProgramEnvParameters4fvEXT, _dispatch_stub_775@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_775, _dispatch_stub_775@16))
-	GL_STUB(_dispatch_stub_776, _gloffset_ProgramLocalParameters4fvEXT, _dispatch_stub_776@16)
+	GL_STUB(_dispatch_stub_776, _gloffset_StencilFuncSeparateATI, _dispatch_stub_776@16)
 	HIDDEN(GL_PREFIX(_dispatch_stub_776, _dispatch_stub_776@16))
-	GL_STUB(_dispatch_stub_777, _gloffset_GetQueryObjecti64vEXT, _dispatch_stub_777@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_777, _dispatch_stub_777@12))
-	GL_STUB(_dispatch_stub_778, _gloffset_GetQueryObjectui64vEXT, _dispatch_stub_778@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_778, _dispatch_stub_778@12))
+	GL_STUB(_dispatch_stub_777, _gloffset_ProgramEnvParameters4fvEXT, _dispatch_stub_777@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_777, _dispatch_stub_777@16))
+	GL_STUB(_dispatch_stub_778, _gloffset_ProgramLocalParameters4fvEXT, _dispatch_stub_778@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_778, _dispatch_stub_778@16))
+	GL_STUB(_dispatch_stub_779, _gloffset_GetQueryObjecti64vEXT, _dispatch_stub_779@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_779, _dispatch_stub_779@12))
+	GL_STUB(_dispatch_stub_780, _gloffset_GetQueryObjectui64vEXT, _dispatch_stub_780@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_780, _dispatch_stub_780@12))
 	GL_STUB_ALIAS(ArrayElementEXT, _gloffset_ArrayElement, ArrayElementEXT@4, ArrayElement, ArrayElement@4)
 	GL_STUB_ALIAS(BindTextureEXT, _gloffset_BindTexture, BindTextureEXT@8, BindTexture, BindTexture@8)
 	GL_STUB_ALIAS(DrawArraysEXT, _gloffset_DrawArrays, DrawArraysEXT@12, DrawArrays, DrawArrays@12)
-- 
cgit v1.2.3


From 12cf98f5fc5eaa4743134387ce3f8e584aa20bc4 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 19 Jun 2009 17:58:47 -0600
Subject: mesa: move vertex array objects from shared state to per-context

The ARB version requires VAOs to be per-context while the Apple extension
was ambiguous.
---
 src/mesa/main/arrayobj.c | 29 ++++++++---------------------
 src/mesa/main/context.c  |  1 +
 src/mesa/main/mtypes.h   |  6 +++---
 src/mesa/main/shared.c   | 17 -----------------
 src/mesa/main/varray.c   | 26 ++++++++++++++++++++++++++
 src/mesa/main/varray.h   |  4 ++++
 6 files changed, 42 insertions(+), 41 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index c03353b78f..e078f69ff9 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -63,10 +63,11 @@
 static INLINE struct gl_array_object *
 lookup_arrayobj(GLcontext *ctx, GLuint id)
 {
-   return (id == 0) 
-     ? NULL 
-     : (struct gl_array_object *) _mesa_HashLookup(ctx->Shared->ArrayObjects,
-						   id);
+   if (id == 0)
+      return NULL;
+   else
+      return (struct gl_array_object *)
+         _mesa_HashLookup(ctx->Array.Objects, id);
 }
 
 
@@ -252,7 +253,7 @@ save_array_object( GLcontext *ctx, struct gl_array_object *obj )
 {
    if (obj->Name > 0) {
       /* insert into hash table */
-      _mesa_HashInsert(ctx->Shared->ArrayObjects, obj->Name, obj);
+      _mesa_HashInsert(ctx->Array.Objects, obj->Name, obj);
    }
 }
 
@@ -266,7 +267,7 @@ remove_array_object( GLcontext *ctx, struct gl_array_object *obj )
 {
    if (obj->Name > 0) {
       /* remove from hash table */
-      _mesa_HashRemove(ctx->Shared->ArrayObjects, obj->Name);
+      _mesa_HashRemove(ctx->Array.Objects, obj->Name);
    }
 }
 
@@ -425,8 +426,6 @@ _mesa_DeleteVertexArraysAPPLE(GLsizei n, const GLuint *ids)
       return;
    }
 
-   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
-
    for (i = 0; i < n; i++) {
       struct gl_array_object *obj = lookup_arrayobj(ctx, ids[i]);
 
@@ -450,8 +449,6 @@ _mesa_DeleteVertexArraysAPPLE(GLsizei n, const GLuint *ids)
          _mesa_reference_array_object(ctx, &obj, NULL);
       }
    }
-
-   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
 }
 
 
@@ -478,12 +475,7 @@ _mesa_GenVertexArraysAPPLE(GLsizei n, GLuint *arrays)
       return;
    }
 
-   /*
-    * This must be atomic (generation and allocation of array object IDs)
-    */
-   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
-
-   first = _mesa_HashFindFreeKeyBlock(ctx->Shared->ArrayObjects, n);
+   first = _mesa_HashFindFreeKeyBlock(ctx->Array.Objects, n);
 
    /* Allocate new, empty array objects and return identifiers */
    for (i = 0; i < n; i++) {
@@ -492,15 +484,12 @@ _mesa_GenVertexArraysAPPLE(GLsizei n, GLuint *arrays)
 
       obj = (*ctx->Driver.NewArrayObject)( ctx, name );
       if (!obj) {
-         _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "glGenVertexArraysAPPLE");
          return;
       }
       save_array_object(ctx, obj);
       arrays[i] = first + i;
    }
-
-   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
 }
 
 
@@ -521,9 +510,7 @@ _mesa_IsVertexArrayAPPLE( GLuint id )
    if (id == 0)
       return GL_FALSE;
 
-   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
    obj = lookup_arrayobj(ctx, id);
-   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
 
    return (obj != NULL) ? GL_TRUE : GL_FALSE;
 }
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index eafe292a1f..7a9c69ac90 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1011,6 +1011,7 @@ _mesa_free_context_data( GLcontext *ctx )
 #if FEATURE_ARB_occlusion_query
    _mesa_free_query_data(ctx);
 #endif
+   _mesa_free_varray_data(ctx);
 
    _mesa_delete_array_object(ctx, ctx->Array.DefaultArrayObj);
 
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 0c071ee19a..69a23fe98a 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1608,6 +1608,9 @@ struct gl_array_attrib
    /** The default vertex array object */
    struct gl_array_object *DefaultArrayObj;
 
+   /** Array objects (GL_ARB/APPLE_vertex_array_object) */
+   struct _mesa_HashTable *Objects;
+
    GLint ActiveTexture;		/**< Client Active Texture */
    GLuint LockFirst;            /**< GL_EXT_compiled_vertex_array */
    GLuint LockCount;            /**< GL_EXT_compiled_vertex_array */
@@ -2119,9 +2122,6 @@ struct gl_shared_state
    struct _mesa_HashTable *FrameBuffers;
 #endif
 
-   /** Objects associated with the GL_APPLE_vertex_array_object extension. */
-   struct _mesa_HashTable *ArrayObjects;
-
    void *DriverData;  /**< Device driver shared state */
 };
 
diff --git a/src/mesa/main/shared.c b/src/mesa/main/shared.c
index 104f18f545..ad6e6ce7cd 100644
--- a/src/mesa/main/shared.c
+++ b/src/mesa/main/shared.c
@@ -100,8 +100,6 @@ _mesa_alloc_shared_state(GLcontext *ctx)
    shared->NullBufferObj = ctx->Driver.NewBufferObject(ctx, 0, 0);
    shared->NullBufferObj->RefCount = 1000 * 1000 * 1000;
 
-   shared->ArrayObjects = _mesa_NewHashTable();
-
    /* Create default texture objects */
    for (i = 0; i < NUM_TEXTURE_TARGETS; i++) {
       /* NOTE: the order of these enums matches the TEXTURE_x_INDEX values */
@@ -206,18 +204,6 @@ delete_bufferobj_cb(GLuint id, void *data, void *userData)
 }
 
 
-/**
- * Callback for deleting an array object.  Called by _mesa_HashDeleteAll().
- */
-static void
-delete_arrayobj_cb(GLuint id, void *data, void *userData)
-{
-   struct gl_array_object *arrayObj = (struct gl_array_object *) data;
-   GLcontext *ctx = (GLcontext *) userData;
-   _mesa_delete_array_object(ctx, arrayObj);
-}
-
-
 /**
  * Callback for freeing shader program data. Call it before delete_shader_cb
  * to avoid memory access error.
@@ -320,9 +306,6 @@ _mesa_free_shared_state(GLcontext *ctx, struct gl_shared_state *shared)
    _mesa_HashDeleteAll(shared->Programs, delete_program_cb, ctx);
    _mesa_DeleteHashTable(shared->Programs);
 
-   _mesa_HashDeleteAll(shared->ArrayObjects, delete_arrayobj_cb, ctx);
-   _mesa_DeleteHashTable(shared->ArrayObjects);
-
 #if FEATURE_ARB_vertex_program
    _mesa_reference_vertprog(ctx, &shared->DefaultVertexProgram, NULL);
 #endif
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index f04c137c6d..3fbc730dc2 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -30,6 +30,7 @@
 #include "context.h"
 #include "enable.h"
 #include "enums.h"
+#include "hash.h"
 #include "mtypes.h"
 #include "varray.h"
 #include "arrayobj.h"
@@ -1120,4 +1121,29 @@ _mesa_init_varray(GLcontext *ctx)
    _mesa_reference_array_object(ctx, &ctx->Array.ArrayObj,
                                 ctx->Array.DefaultArrayObj);
    ctx->Array.ActiveTexture = 0;   /* GL_ARB_multitexture */
+
+   ctx->Array.Objects = _mesa_NewHashTable();
+}
+
+
+/**
+ * Callback for deleting an array object.  Called by _mesa_HashDeleteAll().
+ */
+static void
+delete_arrayobj_cb(GLuint id, void *data, void *userData)
+{
+   struct gl_array_object *arrayObj = (struct gl_array_object *) data;
+   GLcontext *ctx = (GLcontext *) userData;
+   _mesa_delete_array_object(ctx, arrayObj);
+}
+
+
+/**
+ * Free vertex array state for given context.
+ */
+void 
+_mesa_free_varray_data(GLcontext *ctx)
+{
+   _mesa_HashDeleteAll(ctx->Array.Objects, delete_arrayobj_cb, ctx);
+   _mesa_DeleteHashTable(ctx->Array.Objects);
 }
diff --git a/src/mesa/main/varray.h b/src/mesa/main/varray.h
index 46cc3ee342..d4d505ae04 100644
--- a/src/mesa/main/varray.h
+++ b/src/mesa/main/varray.h
@@ -166,10 +166,14 @@ _mesa_print_arrays(GLcontext *ctx);
 extern void
 _mesa_init_varray( GLcontext * ctx );
 
+extern void 
+_mesa_free_varray_data(GLcontext *ctx);
+
 #else
 
 /** No-op */
 #define _mesa_init_varray( c )  ((void)0)
+#define _mesa_free_varray_data( c )  ((void)0)
 
 #endif
 
-- 
cgit v1.2.3


From b8000c874ecb33b1554407c5e568afbb471dda3a Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 19 Jun 2009 18:07:49 -0600
Subject: mesa: implement _mesa_BindVertexArray()

---
 src/mesa/main/arrayobj.c | 55 +++++++++++++++++++++++++++++++++++++-----------
 src/mesa/main/arrayobj.h |  3 +++
 2 files changed, 46 insertions(+), 12 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index e078f69ff9..ae9db212ae 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -353,18 +353,15 @@ _mesa_update_array_object_max_element(GLcontext *ctx,
 /* API Functions                                                      */
 /**********************************************************************/
 
+
 /**
- * Bind a new array.
- *
- * \todo
- * The binding could be done more efficiently by comparing the non-NULL
- * pointers in the old and new objects.  The only arrays that are "dirty" are
- * the ones that are non-NULL in either object.
+ * Helper for _mesa_BindVertexArray() and _mesa_BindVertexArrayAPPLE().
+ * \param genRequired  specifies behavour when id was not generated with
+ *                     glGenVertexArrays().
  */
-void GLAPIENTRY
-_mesa_BindVertexArrayAPPLE( GLuint id )
+static void
+bind_vertex_array(GLcontext *ctx, GLuint id, GLboolean genRequired)
 {
-   GET_CURRENT_CONTEXT(ctx);
    struct gl_array_object * const oldObj = ctx->Array.ArrayObj;
    struct gl_array_object *newObj = NULL;
    ASSERT_OUTSIDE_BEGIN_END(ctx);
@@ -387,8 +384,12 @@ _mesa_BindVertexArrayAPPLE( GLuint id )
       /* non-default array object */
       newObj = lookup_arrayobj(ctx, id);
       if (!newObj) {
-         /* If this is a new array object id, allocate an array object now.
-	  */
+         if (genRequired) {
+            _mesa_error(ctx, GL_INVALID_OPERATION, "glBindVertexArray(id)");
+            return;
+         }
+
+         /* For APPLE version, generate a new array object now */
 	 newObj = (*ctx->Driver.NewArrayObject)(ctx, id);
          if (!newObj) {
             _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindVertexArrayAPPLE");
@@ -404,7 +405,37 @@ _mesa_BindVertexArrayAPPLE( GLuint id )
 
    /* Pass BindVertexArray call to device driver */
    if (ctx->Driver.BindArrayObject && newObj)
-      (*ctx->Driver.BindArrayObject)( ctx, newObj );
+      ctx->Driver.BindArrayObject(ctx, newObj);
+}
+
+
+/**
+ * ARB version of glBindVertexArray()
+ * This function behaves differently from glBindVertexArrayAPPLE() in
+ * that this function requires all ids to have been previously generated
+ * by glGenVertexArrays[APPLE]().
+ */
+void GLAPIENTRY
+_mesa_BindVertexArray( GLuint id )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   bind_vertex_array(ctx, id, GL_TRUE);
+}
+
+
+/**
+ * Bind a new array.
+ *
+ * \todo
+ * The binding could be done more efficiently by comparing the non-NULL
+ * pointers in the old and new objects.  The only arrays that are "dirty" are
+ * the ones that are non-NULL in either object.
+ */
+void GLAPIENTRY
+_mesa_BindVertexArrayAPPLE( GLuint id )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   bind_vertex_array(ctx, id, GL_FALSE);
 }
 
 
diff --git a/src/mesa/main/arrayobj.h b/src/mesa/main/arrayobj.h
index abca5ab9b4..e2f156d16c 100644
--- a/src/mesa/main/arrayobj.h
+++ b/src/mesa/main/arrayobj.h
@@ -67,6 +67,9 @@ _mesa_update_array_object_max_element(GLcontext *ctx,
  * API functions
  */
 
+
+void GLAPIENTRY _mesa_BindVertexArray( GLuint id );
+
 void GLAPIENTRY _mesa_BindVertexArrayAPPLE( GLuint id );
 
 void GLAPIENTRY _mesa_DeleteVertexArraysAPPLE(GLsizei n, const GLuint *ids);
-- 
cgit v1.2.3


From 9342e6f5a94d3b884dcb98b4741295f1aa23e282 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 19 Jun 2009 18:17:25 -0600
Subject: mesa: implement _mesa_GenVertexArrays() for
 GL_ARB_vertex_array_object

This also involves adding a gl_array_object::VBOonly field.  For the
ARB extension, all arrays in the object must reside in a VBO.  This flag
keeps track of that requirement.
---
 src/mesa/main/arrayobj.c | 33 +++++++++++++++++++++++++++++----
 src/mesa/main/arrayobj.h |  2 ++
 src/mesa/main/mtypes.h   |  1 +
 3 files changed, 32 insertions(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index ae9db212ae..fd35d4e38c 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -485,14 +485,14 @@ _mesa_DeleteVertexArraysAPPLE(GLsizei n, const GLuint *ids)
 
 /**
  * Generate a set of unique array object IDs and store them in \c arrays.
- * 
+ * Helper for _mesa_GenVertexArrays[APPLE]() functions below.
  * \param n       Number of IDs to generate.
  * \param arrays  Array of \c n locations to store the IDs.
+ * \param vboOnly Will arrays have to reside in VBOs?
  */
-void GLAPIENTRY
-_mesa_GenVertexArraysAPPLE(GLsizei n, GLuint *arrays)
+static void 
+gen_vertex_arrays(GLcontext *ctx, GLsizei n, GLuint *arrays, GLboolean vboOnly)
 {
-   GET_CURRENT_CONTEXT(ctx);
    GLuint first;
    GLint i;
    ASSERT_OUTSIDE_BEGIN_END(ctx);
@@ -518,12 +518,37 @@ _mesa_GenVertexArraysAPPLE(GLsizei n, GLuint *arrays)
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "glGenVertexArraysAPPLE");
          return;
       }
+      obj->VBOonly = vboOnly;
       save_array_object(ctx, obj);
       arrays[i] = first + i;
    }
 }
 
 
+/**
+ * ARB version of glGenVertexArrays()
+ * All arrays will be required to live in VBOs.
+ */
+void GLAPIENTRY
+_mesa_GenVertexArrays(GLsizei n, GLuint *arrays)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   gen_vertex_arrays(ctx, n, arrays, GL_TRUE);
+}
+
+
+/**
+ * APPLE version of glGenVertexArraysAPPLE()
+ * Arrays may live in VBOs or ordinary memory.
+ */
+void GLAPIENTRY
+_mesa_GenVertexArraysAPPLE(GLsizei n, GLuint *arrays)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   gen_vertex_arrays(ctx, n, arrays, GL_FALSE);
+}
+
+
 /**
  * Determine if ID is the name of an array object.
  * 
diff --git a/src/mesa/main/arrayobj.h b/src/mesa/main/arrayobj.h
index e2f156d16c..8999edc724 100644
--- a/src/mesa/main/arrayobj.h
+++ b/src/mesa/main/arrayobj.h
@@ -74,6 +74,8 @@ void GLAPIENTRY _mesa_BindVertexArrayAPPLE( GLuint id );
 
 void GLAPIENTRY _mesa_DeleteVertexArraysAPPLE(GLsizei n, const GLuint *ids);
 
+void GLAPIENTRY _mesa_GenVertexArrays(GLsizei n, GLuint *arrays);
+
 void GLAPIENTRY _mesa_GenVertexArraysAPPLE(GLsizei n, GLuint *buffer);
 
 GLboolean GLAPIENTRY _mesa_IsVertexArrayAPPLE( GLuint id );
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 69a23fe98a..0d082cbc8a 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1563,6 +1563,7 @@ struct gl_array_object
 
    GLint RefCount;
    _glthread_Mutex Mutex;
+   GLboolean VBOonly;  /**< require all arrays to live in VBOs? */
 
    /** Conventional vertex arrays */
    /*@{*/
-- 
cgit v1.2.3


From 7ebadecd8758f2a4d965bc57068eccd05f9b1470 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 22 Jun 2009 16:47:45 -0600
Subject: mesa: added extension flag for ARB_vertex_array_object

---
 src/mesa/main/extensions.c | 2 ++
 src/mesa/main/mtypes.h     | 1 +
 2 files changed, 3 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 96552599a8..c60b58a492 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -78,6 +78,7 @@ static const struct {
    { OFF, "GL_ARB_texture_non_power_of_two",   F(ARB_texture_non_power_of_two)},
    { OFF, "GL_ARB_texture_rectangle",          F(NV_texture_rectangle) },
    { ON,  "GL_ARB_transpose_matrix",           F(ARB_transpose_matrix) },
+   { OFF, "GL_ARB_vertex_array_object",        F(ARB_vertex_array_object) },
    { ON,  "GL_ARB_vertex_buffer_object",       F(ARB_vertex_buffer_object) },
    { OFF, "GL_ARB_vertex_program",             F(ARB_vertex_program) },
    { OFF, "GL_ARB_vertex_shader",              F(ARB_vertex_shader) },
@@ -227,6 +228,7 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
    /*ctx->Extensions.ARB_texture_float = GL_TRUE;*/
    ctx->Extensions.ARB_texture_mirrored_repeat = GL_TRUE;
    ctx->Extensions.ARB_texture_non_power_of_two = GL_TRUE;
+   ctx->Extensions.ARB_vertex_array_object = GL_TRUE;
 #if FEATURE_ARB_vertex_program
    ctx->Extensions.ARB_vertex_program = GL_TRUE;
 #endif
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 0d082cbc8a..135eedbcab 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2468,6 +2468,7 @@ struct gl_extensions
    GLboolean ARB_texture_mirrored_repeat;
    GLboolean ARB_texture_non_power_of_two;
    GLboolean ARB_transpose_matrix;
+   GLboolean ARB_vertex_array_object;
    GLboolean ARB_vertex_buffer_object;
    GLboolean ARB_vertex_program;
    GLboolean ARB_vertex_shader;
-- 
cgit v1.2.3


From e2b72495550980198dcc0580af8de1fe9dfd8c67 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 22 Jun 2009 16:56:35 -0600
Subject: mesa: enforce the rule that arrays live in VBOs for
 GL_ARB_vertex_array_object

---
 src/mesa/main/varray.c | 77 ++++++++++++++++++++++++++++++++++----------------
 1 file changed, 52 insertions(+), 25 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 3fbc730dc2..3d5b8faecf 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -39,6 +39,8 @@
 
 /**
  * Set the fields of a vertex array.
+ * Also do an error check for GL_ARB_vertex_array_object: check that
+ * all arrays reside in VBOs when using a vertex array object.
  *
  * \param array  the array to update
  * \param dirtyBit  which bit to set in ctx->Array.NewState for this array
@@ -49,14 +51,26 @@
  * \param stride  stride between elements, in elements
  * \param normalized  are integer types converted to floats in [-1, 1]?
  * \param ptr  the address (or offset inside VBO) of the array data
+ * \return GL_TRUE if no error, GL_FALSE if error
  */
-static void
+static GLboolean
 update_array(GLcontext *ctx, struct gl_client_array *array,
              GLbitfield dirtyBit, GLsizei elementSize,
              GLint size, GLenum type, GLenum format,
              GLsizei stride, GLboolean normalized, const GLvoid *ptr)
 {
    ASSERT(format == GL_RGBA || format == GL_BGRA);
+
+   if (ctx->Array.ArrayObj->VBOonly &&
+       ctx->Array.ArrayBufferObj->Name == 0) {
+      /* GL_ARB_vertex_array_object requires that all arrays reside in VBOs.
+       * Generate GL_INVALID_OPERATION if that's not true.
+       */
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glVertex/Normal/EtcPointer(non-VBO array)");
+      return GL_FALSE;
+   }
+
    array->Size = size;
    array->Type = type;
    array->Format = format;
@@ -71,6 +85,8 @@ update_array(GLcontext *ctx, struct gl_client_array *array,
 
    ctx->NewState |= _NEW_ARRAY;
    ctx->Array.NewState |= dirtyBit;
+
+   return GL_TRUE;
 }
 
 
@@ -123,8 +139,9 @@ _mesa_VertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
          return;
    }
 
-   update_array(ctx, &ctx->Array.ArrayObj->Vertex, _NEW_ARRAY_VERTEX,
-                elementSize, size, type, GL_RGBA, stride, GL_FALSE, ptr);
+   if (!update_array(ctx, &ctx->Array.ArrayObj->Vertex, _NEW_ARRAY_VERTEX,
+                     elementSize, size, type, GL_RGBA, stride, GL_FALSE, ptr))
+      return;
 
    if (ctx->Driver.VertexPointer)
       ctx->Driver.VertexPointer( ctx, size, type, stride, ptr );
@@ -173,8 +190,9 @@ _mesa_NormalPointer(GLenum type, GLsizei stride, const GLvoid *ptr )
          return;
    }
 
-   update_array(ctx, &ctx->Array.ArrayObj->Normal, _NEW_ARRAY_NORMAL,
-                elementSize, 3, type, GL_RGBA, stride, GL_TRUE, ptr);
+   if (!update_array(ctx, &ctx->Array.ArrayObj->Normal, _NEW_ARRAY_NORMAL,
+                     elementSize, 3, type, GL_RGBA, stride, GL_TRUE, ptr))
+      return;
 
    if (ctx->Driver.NormalPointer)
       ctx->Driver.NormalPointer( ctx, type, stride, ptr );
@@ -251,8 +269,9 @@ _mesa_ColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
          return;
    }
 
-   update_array(ctx, &ctx->Array.ArrayObj->Color, _NEW_ARRAY_COLOR0,
-                elementSize, size, type, format, stride, GL_TRUE, ptr);
+   if (!update_array(ctx, &ctx->Array.ArrayObj->Color, _NEW_ARRAY_COLOR0,
+                     elementSize, size, type, format, stride, GL_TRUE, ptr))
+      return;
 
    if (ctx->Driver.ColorPointer)
       ctx->Driver.ColorPointer( ctx, size, type, stride, ptr );
@@ -283,8 +302,9 @@ _mesa_FogCoordPointerEXT(GLenum type, GLsizei stride, const GLvoid *ptr)
          return;
    }
 
-   update_array(ctx, &ctx->Array.ArrayObj->FogCoord, _NEW_ARRAY_FOGCOORD,
-                elementSize, 1, type, GL_RGBA, stride, GL_FALSE, ptr);
+   if (!update_array(ctx, &ctx->Array.ArrayObj->FogCoord, _NEW_ARRAY_FOGCOORD,
+                     elementSize, 1, type, GL_RGBA, stride, GL_FALSE, ptr))
+      return;
 
    if (ctx->Driver.FogCoordPointer)
       ctx->Driver.FogCoordPointer( ctx, type, stride, ptr );
@@ -324,8 +344,9 @@ _mesa_IndexPointer(GLenum type, GLsizei stride, const GLvoid *ptr)
          return;
    }
 
-   update_array(ctx, &ctx->Array.ArrayObj->Index, _NEW_ARRAY_INDEX,
-                elementSize, 1, type, GL_RGBA, stride, GL_FALSE, ptr);
+   if (!update_array(ctx, &ctx->Array.ArrayObj->Index, _NEW_ARRAY_INDEX,
+                     elementSize, 1, type, GL_RGBA, stride, GL_FALSE, ptr))
+      return;
 
    if (ctx->Driver.IndexPointer)
       ctx->Driver.IndexPointer( ctx, type, stride, ptr );
@@ -398,8 +419,10 @@ _mesa_SecondaryColorPointerEXT(GLint size, GLenum type,
          return;
    }
 
-   update_array(ctx, &ctx->Array.ArrayObj->SecondaryColor, _NEW_ARRAY_COLOR1,
-                elementSize, size, type, format, stride, GL_TRUE, ptr);
+   if (!update_array(ctx, &ctx->Array.ArrayObj->SecondaryColor,
+                     _NEW_ARRAY_COLOR1, elementSize, size, type,
+                     format, stride, GL_TRUE, ptr))
+      return;
 
    if (ctx->Driver.SecondaryColorPointer)
       ctx->Driver.SecondaryColorPointer( ctx, size, type, stride, ptr );
@@ -457,9 +480,10 @@ _mesa_TexCoordPointer(GLint size, GLenum type, GLsizei stride,
          return;
    }
 
-   update_array(ctx, &ctx->Array.ArrayObj->TexCoord[unit],
-                _NEW_ARRAY_TEXCOORD(unit),
-                elementSize, size, type, GL_RGBA, stride, GL_FALSE, ptr);
+   if (!update_array(ctx, &ctx->Array.ArrayObj->TexCoord[unit],
+                     _NEW_ARRAY_TEXCOORD(unit),
+                     elementSize, size, type, GL_RGBA, stride, GL_FALSE, ptr))
+      return;
 
    if (ctx->Driver.TexCoordPointer)
       ctx->Driver.TexCoordPointer( ctx, size, type, stride, ptr );
@@ -477,9 +501,10 @@ _mesa_EdgeFlagPointer(GLsizei stride, const GLvoid *ptr)
       return;
    }
 
-   update_array(ctx, &ctx->Array.ArrayObj->EdgeFlag, _NEW_ARRAY_EDGEFLAG,
-                sizeof(GLboolean), 1, GL_UNSIGNED_BYTE, GL_RGBA,
-                stride, GL_FALSE, ptr);
+   if (!update_array(ctx, &ctx->Array.ArrayObj->EdgeFlag, _NEW_ARRAY_EDGEFLAG,
+                     sizeof(GLboolean), 1, GL_UNSIGNED_BYTE, GL_RGBA,
+                     stride, GL_FALSE, ptr))
+      return;
 
    if (ctx->Driver.EdgeFlagPointer)
       ctx->Driver.EdgeFlagPointer( ctx, stride, ptr );
@@ -589,9 +614,10 @@ _mesa_VertexAttribPointerNV(GLuint index, GLint size, GLenum type,
          return;
    }
 
-   update_array(ctx, &ctx->Array.ArrayObj->VertexAttrib[index],
-                _NEW_ARRAY_ATTRIB(index),
-                elementSize, size, type, format, stride, normalized, ptr);
+   if (!update_array(ctx, &ctx->Array.ArrayObj->VertexAttrib[index],
+                     _NEW_ARRAY_ATTRIB(index),
+                     elementSize, size, type, format, stride, normalized, ptr))
+      return;
 
    if (ctx->Driver.VertexAttribPointer)
       ctx->Driver.VertexAttribPointer( ctx, index, size, type, stride, ptr );
@@ -688,9 +714,10 @@ _mesa_VertexAttribPointerARB(GLuint index, GLint size, GLenum type,
          return;
    }
 
-   update_array(ctx, &ctx->Array.ArrayObj->VertexAttrib[index],
-                _NEW_ARRAY_ATTRIB(index),
-                elementSize, size, type, format, stride, normalized, ptr);
+   if (!update_array(ctx, &ctx->Array.ArrayObj->VertexAttrib[index],
+                     _NEW_ARRAY_ATTRIB(index),
+                     elementSize, size, type, format, stride, normalized, ptr))
+      return;
 
    if (ctx->Driver.VertexAttribPointer)
       ctx->Driver.VertexAttribPointer(ctx, index, size, type, stride, ptr);
-- 
cgit v1.2.3


From cfb815805839ecb5eb8636b1a7f643de44e04ca9 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 22 Jun 2009 17:52:08 -0600
Subject: mesa: plug in glBindVertexArray, glGenVertexArrays functions

---
 src/mesa/main/api_exec.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index 534fef00df..e49cd041a6 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -904,4 +904,8 @@ _mesa_init_exec_table(struct _glapi_table *exec)
 
    /* GL_ARB_copy_buffer */
    SET_CopyBufferSubData(exec, _mesa_CopyBufferSubData);
+
+   /* GL_ARB_vertex_array_object */
+   SET_BindVertexArray(exec, _mesa_BindVertexArray);
+   SET_GenVertexArrays(exec, _mesa_GenVertexArrays);
 }
-- 
cgit v1.2.3


From 37f2117cd132527ebf89f9294b2f35db87326460 Mon Sep 17 00:00:00 2001
From: José Fonseca <jfonseca@vmware.com>
Date: Mon, 15 Jun 2009 19:17:07 +0100
Subject: mesa: Use integer type with appropriate sign.

---
 src/mesa/main/api_validate.c | 4 ++--
 src/mesa/main/texenv.c       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c
index 42d1e579e0..2c6f370df9 100644
--- a/src/mesa/main/api_validate.c
+++ b/src/mesa/main/api_validate.c
@@ -40,7 +40,7 @@ max_buffer_index(GLcontext *ctx, GLuint count, GLenum type,
 {
    const GLubyte *map = NULL;
    GLuint max = 0;
-   GLint i;
+   GLuint i;
 
    if (elementBuf->Name) {
       /* elements are in a user-defined buffer object.  need to map it */
@@ -224,7 +224,7 @@ _mesa_validate_DrawRangeElements(GLcontext *ctx, GLenum mode,
    /* Vertex buffer object tests */
    if (ctx->Array.ElementArrayBufferObj->Name) {
       /* use indices in the buffer object */
-      GLuint indexBytes;
+      GLsizei indexBytes;
 
       if (type == GL_UNSIGNED_INT) {
          indexBytes = count * sizeof(GLuint);
diff --git a/src/mesa/main/texenv.c b/src/mesa/main/texenv.c
index 4d511f2f7e..4c04a7ed37 100644
--- a/src/mesa/main/texenv.c
+++ b/src/mesa/main/texenv.c
@@ -959,7 +959,7 @@ void GLAPIENTRY
 _mesa_GetTexBumpParameterivATI( GLenum pname, GLint *param )
 {
    const struct gl_texture_unit *texUnit;
-   GLint i;
+   GLuint i;
    GLint temp = 0;
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
@@ -1006,7 +1006,7 @@ void GLAPIENTRY
 _mesa_GetTexBumpParameterfvATI( GLenum pname, GLfloat *param )
 {
    const struct gl_texture_unit *texUnit;
-   GLint i;
+   GLuint i;
    GLint temp = 0;
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
-- 
cgit v1.2.3


From 6214c7262fe2d31553a4974022e08a7715693014 Mon Sep 17 00:00:00 2001
From: José Fonseca <jfonseca@vmware.com>
Date: Mon, 15 Jun 2009 19:19:29 +0100
Subject: mesa: Use type modifier for float constants.

---
 src/mesa/main/macros.h        | 14 +++++++-------
 src/mesa/main/texformat_tmp.h | 24 ++++++++++++------------
 src/mesa/main/texgetimage.c   |  4 ++--
 3 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/macros.h b/src/mesa/main/macros.h
index 01d59dd42d..59def651a3 100644
--- a/src/mesa/main/macros.h
+++ b/src/mesa/main/macros.h
@@ -55,7 +55,7 @@ extern GLfloat _mesa_ubyte_to_float_color_tab[256];
 
 
 /** Convert GLbyte in [-128,127] to GLfloat in [-1.0,1.0], texture/fb data */
-#define BYTE_TO_FLOAT_TEX(B)    ((B) == -128 ? -1.0 : (B) * (1.0F/127.0F))
+#define BYTE_TO_FLOAT_TEX(B)    ((B) == -128 ? -1.0F : (B) * (1.0F/127.0F))
 
 /** Convert GLfloat in [-1.0,1.0] to GLbyte in [-128,127], texture/fb data */
 #define FLOAT_TO_BYTE_TEX(X)    ( (GLint) (127.0F * (X)) )
@@ -65,7 +65,7 @@ extern GLfloat _mesa_ubyte_to_float_color_tab[256];
 #define USHORT_TO_FLOAT(S)  ((GLfloat) (S) * (1.0F / 65535.0F))
 
 /** Convert GLfloat in [0.0,1.0] to GLushort in [0, 65535] */
-#define FLOAT_TO_USHORT(X)   ((GLuint) ((X) * 65535.0))
+#define FLOAT_TO_USHORT(X)   ((GLuint) ((X) * 65535.0F))
 
 
 /** Convert GLshort in [-32768,32767] to GLfloat in [-1.0,1.0] */
@@ -76,7 +76,7 @@ extern GLfloat _mesa_ubyte_to_float_color_tab[256];
 
 
 /** Convert GLshort in [-32768,32767] to GLfloat in [-1.0,1.0], texture/fb data */
-#define SHORT_TO_FLOAT_TEX(S)    ((S) == -32768 ? -1.0 : (S) * (1.0F/32767.0F))
+#define SHORT_TO_FLOAT_TEX(S)    ((S) == -32768 ? -1.0F : (S) * (1.0F/32767.0F))
 
 /** Convert GLfloat in [-1.0,1.0] to GLshort in [-32768,32767], texture/fb data */
 #define FLOAT_TO_SHORT_TEX(X)    ( (GLint) (32767.0F * (X)) )
@@ -86,7 +86,7 @@ extern GLfloat _mesa_ubyte_to_float_color_tab[256];
 #define UINT_TO_FLOAT(U)    ((GLfloat) (U) * (1.0F / 4294967295.0F))
 
 /** Convert GLfloat in [0.0,1.0] to GLuint in [0,4294967295] */
-#define FLOAT_TO_UINT(X)    ((GLuint) ((X) * 4294967295.0))
+#define FLOAT_TO_UINT(X)    ((GLuint) ((X) * 4294967295.0F))
 
 
 /** Convert GLint in [-2147483648,2147483647] to GLfloat in [-1.0,1.0] */
@@ -97,11 +97,11 @@ extern GLfloat _mesa_ubyte_to_float_color_tab[256];
 #define FLOAT_TO_INT(X)     ( (((GLint) (4294967294.0F * (X))) - 1) / 2 )
 */
 /* a close approximation: */
-#define FLOAT_TO_INT(X)     ( (GLint) (2147483647.0 * (X)) )
+#define FLOAT_TO_INT(X)     ( (GLint) (2147483647.0F * (X)) )
 
 
 /** Convert GLint in [-2147483648,2147483647] to GLfloat in [-1.0,1.0], texture/fb data */
-#define INT_TO_FLOAT_TEX(I)    ((I) == -2147483648 ? -1.0 : (I) * (1.0F/2147483647.0))
+#define INT_TO_FLOAT_TEX(I)    ((I) == -2147483648 ? -1.0F : (I) * (1.0F/2147483647.0F))
 
 /** Convert GLfloat in [-1.0,1.0] to GLint in [-2147483648,2147483647], texture/fb data */
 #define FLOAT_TO_INT_TEX(X)    ( (GLint) (2147483647.0F * (X)) )
@@ -120,7 +120,7 @@ extern GLfloat _mesa_ubyte_to_float_color_tab[256];
 #define INT_TO_USHORT(i)   ((i) < 0 ? 0 : ((GLushort) ((i) >> 15)))
 #define UINT_TO_USHORT(i)  ((i) < 0 ? 0 : ((GLushort) ((i) >> 16)))
 #define UNCLAMPED_FLOAT_TO_USHORT(us, f)  \
-        us = ( (GLushort) IROUND( CLAMP((f), 0.0, 1.0) * 65535.0F) )
+        us = ( (GLushort) IROUND( CLAMP((f), 0.0F, 1.0F) * 65535.0F) )
 #define CLAMPED_FLOAT_TO_USHORT(us, f)  \
         us = ( (GLushort) IROUND( (f) * 65535.0F) )
 
diff --git a/src/mesa/main/texformat_tmp.h b/src/mesa/main/texformat_tmp.h
index f3b2fb9c9c..1020624faa 100644
--- a/src/mesa/main/texformat_tmp.h
+++ b/src/mesa/main/texformat_tmp.h
@@ -1348,12 +1348,12 @@ static void FETCH(f_ycbcr)( const struct gl_texture_image *texImage,
    const GLubyte y1 = (*src1 >> 8) & 0xff;  /* luminance */
    const GLubyte cr = *src1 & 0xff;         /* chroma V */
    const GLfloat y = (i & 1) ? y1 : y0;     /* choose even/odd luminance */
-   GLfloat r = 1.164 * (y - 16) + 1.596 * (cr - 128);
-   GLfloat g = 1.164 * (y - 16) - 0.813 * (cr - 128) - 0.391 * (cb - 128);
-   GLfloat b = 1.164 * (y - 16) + 2.018 * (cb - 128);
-   r *= (1.0 / 255.0F);
-   g *= (1.0 / 255.0F);
-   b *= (1.0 / 255.0F);
+   GLfloat r = 1.164F * (y - 16) + 1.596F * (cr - 128);
+   GLfloat g = 1.164F * (y - 16) - 0.813F * (cr - 128) - 0.391F * (cb - 128);
+   GLfloat b = 1.164F * (y - 16) + 2.018F * (cb - 128);
+   r *= (1.0F / 255.0F);
+   g *= (1.0F / 255.0F);
+   b *= (1.0F / 255.0F);
    texel[RCOMP] = CLAMP(r, 0.0F, 1.0F);
    texel[GCOMP] = CLAMP(g, 0.0F, 1.0F);
    texel[BCOMP] = CLAMP(b, 0.0F, 1.0F);
@@ -1389,12 +1389,12 @@ static void FETCH(f_ycbcr_rev)( const struct gl_texture_image *texImage,
    const GLubyte y1 = *src1 & 0xff;         /* luminance */
    const GLubyte cb = (*src1 >> 8) & 0xff;  /* chroma U */
    const GLfloat y = (i & 1) ? y1 : y0;     /* choose even/odd luminance */
-   GLfloat r = 1.164 * (y - 16) + 1.596 * (cr - 128);
-   GLfloat g = 1.164 * (y - 16) - 0.813 * (cr - 128) - 0.391 * (cb - 128);
-   GLfloat b = 1.164 * (y - 16) + 2.018 * (cb - 128);
-   r *= (1.0 / 255.0F);
-   g *= (1.0 / 255.0F);
-   b *= (1.0 / 255.0F);
+   GLfloat r = 1.164F * (y - 16) + 1.596F * (cr - 128);
+   GLfloat g = 1.164F * (y - 16) - 0.813F * (cr - 128) - 0.391F * (cb - 128);
+   GLfloat b = 1.164F * (y - 16) + 2.018F * (cb - 128);
+   r *= (1.0F / 255.0F);
+   g *= (1.0F / 255.0F);
+   b *= (1.0F / 255.0F);
    texel[RCOMP] = CLAMP(r, 0.0F, 1.0F);
    texel[GCOMP] = CLAMP(g, 0.0F, 1.0F);
    texel[BCOMP] = CLAMP(b, 0.0F, 1.0F);
diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c
index 70a25080cb..58421c8528 100644
--- a/src/mesa/main/texgetimage.c
+++ b/src/mesa/main/texgetimage.c
@@ -73,8 +73,8 @@ linear_to_nonlinear(GLfloat cl)
 {
    /* can't have values outside [0, 1] */
    GLfloat cs;
-   if (cl < 0.0031308) {
-      cs = 12.92 * cl;
+   if (cl < 0.0031308f) {
+      cs = 12.92f * cl;
    }
    else {
       cs = 1.055 * _mesa_pow(cl, 0.41666) - 0.055;
-- 
cgit v1.2.3


From 053d8eb8914cae274ccd19abb0a492e7ca220660 Mon Sep 17 00:00:00 2001
From: José Fonseca <jfonseca@vmware.com>
Date: Mon, 15 Jun 2009 19:20:05 +0100
Subject: mesa: Use appropriate float/integer types.

---
 src/mesa/main/texformat_tmp.h | 4 ++--
 src/mesa/main/texgetimage.c   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texformat_tmp.h b/src/mesa/main/texformat_tmp.h
index 1020624faa..eb160deff9 100644
--- a/src/mesa/main/texformat_tmp.h
+++ b/src/mesa/main/texformat_tmp.h
@@ -1347,7 +1347,7 @@ static void FETCH(f_ycbcr)( const struct gl_texture_image *texImage,
    const GLubyte cb = *src0 & 0xff;         /* chroma U */
    const GLubyte y1 = (*src1 >> 8) & 0xff;  /* luminance */
    const GLubyte cr = *src1 & 0xff;         /* chroma V */
-   const GLfloat y = (i & 1) ? y1 : y0;     /* choose even/odd luminance */
+   const GLubyte y = (i & 1) ? y1 : y0;     /* choose even/odd luminance */
    GLfloat r = 1.164F * (y - 16) + 1.596F * (cr - 128);
    GLfloat g = 1.164F * (y - 16) - 0.813F * (cr - 128) - 0.391F * (cb - 128);
    GLfloat b = 1.164F * (y - 16) + 2.018F * (cb - 128);
@@ -1388,7 +1388,7 @@ static void FETCH(f_ycbcr_rev)( const struct gl_texture_image *texImage,
    const GLubyte cr = (*src0 >> 8) & 0xff;  /* chroma V */
    const GLubyte y1 = *src1 & 0xff;         /* luminance */
    const GLubyte cb = (*src1 >> 8) & 0xff;  /* chroma U */
-   const GLfloat y = (i & 1) ? y1 : y0;     /* choose even/odd luminance */
+   const GLubyte y = (i & 1) ? y1 : y0;     /* choose even/odd luminance */
    GLfloat r = 1.164F * (y - 16) + 1.596F * (cr - 128);
    GLfloat g = 1.164F * (y - 16) - 0.813F * (cr - 128) - 0.391F * (cb - 128);
    GLfloat b = 1.164F * (y - 16) + 2.018F * (cb - 128);
diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c
index 58421c8528..02409d8009 100644
--- a/src/mesa/main/texgetimage.c
+++ b/src/mesa/main/texgetimage.c
@@ -77,7 +77,7 @@ linear_to_nonlinear(GLfloat cl)
       cs = 12.92f * cl;
    }
    else {
-      cs = 1.055 * _mesa_pow(cl, 0.41666) - 0.055;
+      cs = (GLfloat)(1.055 * _mesa_pow(cl, 0.41666) - 0.055);
    }
    return cs;
 }
-- 
cgit v1.2.3


From c6af9b29476e4e445623e7a2f737ba95003bbe13 Mon Sep 17 00:00:00 2001
From: José Fonseca <jfonseca@vmware.com>
Date: Mon, 15 Jun 2009 19:20:25 +0100
Subject: mesa: Always return a value.

---
 src/mesa/main/texenvprogram.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index a70d069bd9..b92ba2542d 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -877,6 +877,7 @@ static struct ureg get_source( struct texenv_fragment_program *p,
 
    default:
       assert(0);
+      return undef;
    }
 }
 
-- 
cgit v1.2.3


From 3e48dd04456aaf2d42dfa7f3a3c99a95a5986eb6 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 16 Jun 2009 09:34:35 -0600
Subject: mesa: fix incorrect viewport clamping in _mesa_set_viewport()

A 0 by 0 viewport size is legal.  Don't clamp against lower bound of one.
The error checking earlier in the function prevents negative values.
---
 src/mesa/main/viewport.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/viewport.c b/src/mesa/main/viewport.c
index ead856d32c..50e0402d27 100644
--- a/src/mesa/main/viewport.c
+++ b/src/mesa/main/viewport.c
@@ -73,8 +73,8 @@ _mesa_set_viewport(GLcontext *ctx, GLint x, GLint y,
    }
 
    /* clamp width and height to the implementation dependent range */
-   width  = CLAMP(width,  1, (GLsizei) ctx->Const.MaxViewportWidth);
-   height = CLAMP(height, 1, (GLsizei) ctx->Const.MaxViewportHeight);
+   width  = MIN2(width, (GLsizei) ctx->Const.MaxViewportWidth);
+   height = MIN2(height, (GLsizei) ctx->Const.MaxViewportHeight);
 
    ctx->Viewport.X = x;
    ctx->Viewport.Width = width;
-- 
cgit v1.2.3


From 3f856c6b6b7fa95ef97a8712876de88d7d57932e Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 17 Jun 2009 08:35:55 -0600
Subject: mesa: rework viewport/scissor initialization code

The first time a context is bound to a drawable, the viewport and scissor
bounds are initialized to the buffer's size.  This is actually a bit tricky.

A new _mesa_check_init_viewport() function is called in several places
to check if the viewport has been initialized.  We also use a new
ctx->ViewportInitialized flag instead of the overloaded
ctx->FirstTimeCurrent flag.
---
 src/mesa/main/context.c                 | 41 +++++++++++++++++++++++----------
 src/mesa/main/context.h                 |  3 +++
 src/mesa/main/mtypes.h                  |  2 ++
 src/mesa/state_tracker/st_context.c     | 15 +++---------
 src/mesa/state_tracker/st_framebuffer.c | 11 +--------
 5 files changed, 38 insertions(+), 34 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index a947f69632..0a4c9acdfe 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1255,6 +1255,24 @@ initialize_framebuffer_size(GLcontext *ctx, GLframebuffer *fb)
 }
 
 
+/**
+ * Check if the viewport/scissor size has not yet been initialized.
+ * Initialize the size if the given width and height are non-zero.
+ */
+void
+_mesa_check_init_viewport(GLcontext *ctx, GLuint width, GLuint height)
+{
+   if (!ctx->ViewportInitialized && width > 0 && height > 0) {
+      /* Note: set flag here, before calling _mesa_set_viewport(), to prevent
+       * potential infinite recursion.
+       */
+      ctx->ViewportInitialized = GL_TRUE;
+      _mesa_set_viewport(ctx, 0, 0, width, height);
+      _mesa_set_scissor(ctx, 0, 0, width, height);
+   }
+}
+
+
 /**
  * Bind the given context to the given drawBuffer and readBuffer and
  * make it the current context for the calling thread.
@@ -1372,25 +1390,24 @@ _mesa_make_current( GLcontext *newCtx, GLframebuffer *drawBuffer,
          ASSERT(drawBuffer->Height > 0);
 #endif
 
-         if (newCtx->FirstTimeCurrent) {
-            /* set initial viewport and scissor size now */
-            _mesa_set_viewport(newCtx, 0, 0,
-                               drawBuffer->Width, drawBuffer->Height);
-	    _mesa_set_scissor(newCtx, 0, 0,
-			      drawBuffer->Width, drawBuffer->Height );
-            check_context_limits(newCtx);
+         if (drawBuffer) {
+            _mesa_check_init_viewport(newCtx,
+                                      drawBuffer->Width, drawBuffer->Height);
          }
       }
 
-      /* We can use this to help debug user's problems.  Tell them to set
-       * the MESA_INFO env variable before running their app.  Then the
-       * first time each context is made current we'll print some useful
-       * information.
-       */
       if (newCtx->FirstTimeCurrent) {
+         check_context_limits(newCtx);
+
+         /* We can use this to help debug user's problems.  Tell them to set
+          * the MESA_INFO env variable before running their app.  Then the
+          * first time each context is made current we'll print some useful
+          * information.
+          */
 	 if (_mesa_getenv("MESA_INFO")) {
 	    _mesa_print_info();
 	 }
+
 	 newCtx->FirstTimeCurrent = GL_FALSE;
       }
    }
diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h
index 6b3e1b2b97..0531ae8ee8 100644
--- a/src/mesa/main/context.h
+++ b/src/mesa/main/context.h
@@ -130,6 +130,9 @@ extern void
 _mesa_copy_context(const GLcontext *src, GLcontext *dst, GLuint mask);
 
 
+extern void
+_mesa_check_init_viewport(GLcontext *ctx, GLuint width, GLuint height);
+
 extern GLboolean
 _mesa_make_current( GLcontext *ctx, GLframebuffer *drawBuffer,
                     GLframebuffer *readBuffer );
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 50dc2def87..8872c8963f 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2947,6 +2947,8 @@ struct __GLcontextRec
    GLenum RenderMode;        /**< either GL_RENDER, GL_SELECT, GL_FEEDBACK */
    GLbitfield NewState;      /**< bitwise-or of _NEW_* flags */
 
+   GLboolean ViewportInitialized;  /**< has viewport size been initialized? */
+
    GLbitfield varying_vp_inputs;  /**< mask of VERT_BIT_* flags */
 
    /** \name Derived state */
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index 92ddffc014..8514b6b375 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -274,20 +274,11 @@ st_make_current(struct st_context *st,
    _glapi_check_multithread();
 
    if (st) {
-      GLboolean firstTime = st->ctx->FirstTimeCurrent;
-      if(!_mesa_make_current(st->ctx, &draw->Base, &read->Base))
+      if (!_mesa_make_current(st->ctx, &draw->Base, &read->Base))
          return GL_FALSE;
-      /* Need to initialize viewport here since draw->Base->Width/Height
-       * will still be zero at this point.
-       * This could be improved, but would require rather extensive work
-       * elsewhere (allocate rb surface storage sooner)
-       */
-      if (firstTime) {
-         GLuint w = draw->InitWidth, h = draw->InitHeight;
-         _mesa_set_viewport(st->ctx, 0, 0, w, h);
-         _mesa_set_scissor(st->ctx, 0, 0, w, h);
 
-      }
+      _mesa_check_init_viewport(st->ctx, draw->InitWidth, draw->InitHeight);
+
       return GL_TRUE;
    }
    else {
diff --git a/src/mesa/state_tracker/st_framebuffer.c b/src/mesa/state_tracker/st_framebuffer.c
index 331575660d..33a90ea7db 100644
--- a/src/mesa/state_tracker/st_framebuffer.c
+++ b/src/mesa/state_tracker/st_framebuffer.c
@@ -134,16 +134,7 @@ void st_resize_framebuffer( struct st_framebuffer *stfb,
    if (stfb->Base.Width != width || stfb->Base.Height != height) {
       GET_CURRENT_CONTEXT(ctx);
       if (ctx) {
-         if (stfb->InitWidth == 0 && stfb->InitHeight == 0) {
-            /* didn't have a valid size until now */
-            stfb->InitWidth = width;
-            stfb->InitHeight = height;
-            if (ctx->Viewport.Width <= 1) {
-               /* set context's initial viewport/scissor size */
-               _mesa_set_viewport(ctx, 0, 0, width, height);
-               _mesa_set_scissor(ctx, 0, 0, width, height);
-            }
-         }
+         _mesa_check_init_viewport(ctx, width, height);
 
          _mesa_resize_framebuffer(ctx, &stfb->Base, width, height);
 
-- 
cgit v1.2.3


From 957f3c8c3d3b6a48bbcc24e9db2c110a7fde177b Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Fri, 15 May 2009 16:24:59 -0700
Subject: mesa: Mark FBOs with compressed color attachments as FBO-incomplete.

Both EXT_fbo and ARB_fbo agree on this.  Fixes a segfault in the metaops
mipmap generation in Intel for SGIS_generate_mipmap of S3TC textures in
Regnum Online.

Bug #21654.
(cherry picked from commit 0307e609aa3e707eeb40051bd664d36f2340ba9b)
---
 src/mesa/main/fbobject.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index e8e8c2bf30..83301f1e62 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -368,6 +368,11 @@ test_attachment_completeness(const GLcontext *ctx, GLenum format,
             att->Complete = GL_FALSE;
             return;
          }
+         if (texImage->TexFormat->TexelBytes == 0) {
+            att_incomplete("compressed internalformat");
+            att->Complete = GL_FALSE;
+            return;
+         }
       }
       else if (format == GL_DEPTH) {
          if (texImage->TexFormat->BaseFormat == GL_DEPTH_COMPONENT) {
-- 
cgit v1.2.3


From a70c45bdabd8a172de6c50167b3e9d99649db1fa Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed, 3 Jun 2009 17:49:05 +0100
Subject: Fast path when rebinding the same texture in single context
 environment

If there is no shared context, there is no purpose in rebinding the same
texture.  In some artificial tests this improves performance 10% - 30%.
(cherry picked from commit 7f8000db8bd45bb95bda4a4f8535c49b8ef74254)
---
 src/mesa/main/texobj.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index b63f747fe8..9b8d3777fb 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -891,6 +891,7 @@ _mesa_BindTexture( GLenum target, GLuint texName )
    struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
    struct gl_texture_object *newTexObj = NULL, *defaultTexObj = NULL;
    GLint targetIndex;
+   GLboolean early_out = GL_FALSE;
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
    if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))
@@ -944,6 +945,17 @@ _mesa_BindTexture( GLenum target, GLuint texName )
 
    assert(valid_texture_object(newTexObj));
 
+   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
+   if ((ctx->Shared->RefCount == 1)
+       && (newTexObj == texUnit->CurrentTex[targetIndex])) {
+      early_out = GL_TRUE;
+   }
+   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
+
+   if (early_out) {
+      return;
+   }
+
    /* flush before changing binding */
    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
 
-- 
cgit v1.2.3


From 0491142152dcc61ebe0b46b05c94957e54c44bd9 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keithw@vmware.com>
Date: Thu, 11 Jun 2009 10:52:37 +0100
Subject: mesa: protect Elements against multiple definitions

Mesa and gallium both have a definition of this macro
---
 src/mesa/main/compiler.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h
index 93103fe878..e79bbc2ac5 100644
--- a/src/mesa/main/compiler.h
+++ b/src/mesa/main/compiler.h
@@ -468,9 +468,9 @@ do {                                                                    \
 #endif
 
 
-
+#ifndef Elements
 #define Elements(x) (sizeof(x)/sizeof(*(x)))
-
+#endif
 
 
 
-- 
cgit v1.2.3


From a120778c72324bc56c63cd0f1873c6f2772228ea Mon Sep 17 00:00:00 2001
From: Michel Dänzer <daenzer@vmware.com>
Date: Fri, 19 Jun 2009 11:19:08 +0200
Subject: Always free image offsets memory when re-initializing texture image
 fields.

Fixes leak running compiz with direct rendering.
---
 src/mesa/main/mipmap.c                 | 3 ---
 src/mesa/main/teximage.c               | 2 ++
 src/mesa/state_tracker/st_gen_mipmap.c | 3 ---
 3 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index 7a719745fc..b306700484 100644
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -1598,9 +1598,6 @@ _mesa_generate_mipmap(GLcontext *ctx, GLenum target,
          return;
       }
 
-      if (dstImage->ImageOffsets)
-         _mesa_free(dstImage->ImageOffsets);
-
       /* Free old image data */
       if (dstImage->Data)
          ctx->Driver.FreeTexImageData(ctx, dstImage);
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 76b46d700b..6e21066537 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -1250,6 +1250,8 @@ _mesa_init_teximage_fields(GLcontext *ctx, GLenum target,
     * We allocate the array for 1D/2D textures too in order to avoid special-
     * case code in the texstore routines.
     */
+   if (img->ImageOffsets)
+      _mesa_free(img->ImageOffsets);
    img->ImageOffsets = (GLuint *) _mesa_malloc(depth * sizeof(GLuint));
    for (i = 0; i < depth; i++) {
       img->ImageOffsets[i] = i * width * height;
diff --git a/src/mesa/state_tracker/st_gen_mipmap.c b/src/mesa/state_tracker/st_gen_mipmap.c
index dc6d77825f..58f6933652 100644
--- a/src/mesa/state_tracker/st_gen_mipmap.c
+++ b/src/mesa/state_tracker/st_gen_mipmap.c
@@ -198,9 +198,6 @@ st_generate_mipmap(GLcontext *ctx, GLenum target,
          return;
       }
 
-      if (dstImage->ImageOffsets)
-         _mesa_free(dstImage->ImageOffsets);
-
       /* Free old image data */
       if (dstImage->Data)
          ctx->Driver.FreeTexImageData(ctx, dstImage);
-- 
cgit v1.2.3


From 00e203fe17cbf2127abc422c785cf9fad3232adb Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 1 May 2009 09:30:32 -0600
Subject: mesa: create/use a fallback texture when bound texture is incomplete

When a GLSL sampler reads from an incomplete texture it should
return (0,0,0,1).  Instead of jumping through hoops in all the drivers
to make this happen, just create/install a fallback texture with those
texel values.

Fixes piglit/fp-incomplete-tex on i965 and more importantly, fixes some
GPU lockups when trying to sample from missing surfaces.  If a binding
table entry is NULL, it seems that sampling sometimes works, but not
always (lockup).

Todo: create a fallback texture for each type of texture target?
(cherry picked from commit 3f25219c7bf0f090502489928f0f018e62c4f6cf)
---
 src/mesa/main/mtypes.h   |  3 +++
 src/mesa/main/texobj.c   | 53 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/mesa/main/texobj.h   |  3 +++
 src/mesa/main/texstate.c |  9 ++++++--
 4 files changed, 66 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 8872c8963f..b9cb972e5f 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2053,6 +2053,9 @@ struct gl_shared_state
    /** Default texture objects (shared by all texture units) */
    struct gl_texture_object *DefaultTex[NUM_TEXTURE_TARGETS];
 
+   /** Fallback texture used when a bound texture is incomplete */
+   struct gl_texture_object *FallbackTex;
+
    /**
     * \name Thread safety and statechange notification for texture
     * objects. 
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index 9b8d3777fb..89ee69770e 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -662,6 +662,59 @@ _mesa_test_texobj_completeness( const GLcontext *ctx,
    }
 }
 
+
+/**
+ * Return pointer to a default/fallback texture.
+ * The texture is a 2D 8x8 RGBA texture with all texels = (0,0,0,1).
+ * That's the value a sampler should get when sampling from an
+ * incomplete texture.
+ */
+struct gl_texture_object *
+_mesa_get_fallback_texture(GLcontext *ctx)
+{
+   if (!ctx->Shared->FallbackTex) {
+      /* create fallback texture now */
+      static GLubyte texels[8 * 8][4];
+      struct gl_texture_object *texObj;
+      struct gl_texture_image *texImage;
+      GLuint i;
+
+      for (i = 0; i < 8 * 8; i++) {
+         texels[i][0] =
+         texels[i][1] =
+         texels[i][2] = 0x0;
+         texels[i][3] = 0xff;
+      }
+
+      /* create texture object */
+      texObj = ctx->Driver.NewTextureObject(ctx, 0, GL_TEXTURE_2D);
+      assert(texObj->RefCount == 1);
+      texObj->MinFilter = GL_NEAREST;
+      texObj->MagFilter = GL_NEAREST;
+
+      /* create level[0] texture image */
+      texImage = _mesa_get_tex_image(ctx, texObj, GL_TEXTURE_2D, 0);
+
+      /* init the image fields */
+      _mesa_init_teximage_fields(ctx, GL_TEXTURE_2D, texImage,
+                                    8, 8, 1, 0, GL_RGBA); 
+
+      /* set image data */
+      ctx->Driver.TexImage2D(ctx, GL_TEXTURE_2D, 0, GL_RGBA,
+                             8, 8, 0,
+                             GL_RGBA, GL_UNSIGNED_BYTE, texels,
+                             &ctx->DefaultPacking, texObj, texImage);
+
+      _mesa_test_texobj_completeness(ctx, texObj);
+      assert(texObj->_Complete);
+
+      ctx->Shared->FallbackTex = texObj;
+   }
+   return ctx->Shared->FallbackTex;
+}
+
+
+
 /*@}*/
 
 
diff --git a/src/mesa/main/texobj.h b/src/mesa/main/texobj.h
index d5374c5d6c..2599c0816a 100644
--- a/src/mesa/main/texobj.h
+++ b/src/mesa/main/texobj.h
@@ -65,6 +65,9 @@ extern void
 _mesa_test_texobj_completeness( const GLcontext *ctx,
                                 struct gl_texture_object *obj );
 
+extern struct gl_texture_object *
+_mesa_get_fallback_texture(GLcontext *ctx);
+
 extern void
 _mesa_unlock_context_textures( GLcontext *ctx );
 
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index cef58d7a49..89da4335a2 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -561,8 +561,13 @@ update_texture_state( GLcontext *ctx )
       }
 
       if (!texUnit->_ReallyEnabled) {
-         _mesa_reference_texobj(&texUnit->_Current, NULL);
-         continue;
+         /* If we get here it means the shader (or fixed-function state)
+          * is expecting a texture object, but there isn't one (or it's
+          * incomplete).  Use the fallback texture.
+          */
+         struct gl_texture_object *texObj = _mesa_get_fallback_texture(ctx);
+         texUnit->_ReallyEnabled = 1 << TEXTURE_2D_INDEX;
+         _mesa_reference_texobj(&texUnit->_Current, texObj);
       }
 
       /* if we get here, we know this texture unit is enabled */
-- 
cgit v1.2.3


From 19ca5ee1db002db48fd3d2ff665670a9bc8d699b Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 21 May 2009 10:05:04 -0600
Subject: mesa: fix some potential state-restore issues in pop_texture_group()

Call the _mesa_set_enable() functions instead of driver functions, etc.

Also, add missing code for 1D/2D texture arrays.
(cherry picked from commit aac19609bfd7c950b2577489b06886c8a8097bb2)
---
 src/mesa/main/attrib.c | 90 +++++++++++++++++++++++++-------------------------
 1 file changed, 45 insertions(+), 45 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index e43fa96dd3..a609199504 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -1,6 +1,6 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.3
+ * Version:  7.6
  *
  * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  * Copyright (C) 2009  VMware, Inc.   All Rights Reserved.
@@ -541,6 +541,7 @@ end:
 static void
 pop_enable_group(GLcontext *ctx, const struct gl_enable_attrib *enable)
 {
+   const GLuint curTexUnitSave = ctx->Texture.CurrentUnit;
    GLuint i;
 
 #define TEST_AND_UPDATE(VALUE, NEWVALUE, ENUM)		\
@@ -685,59 +686,51 @@ pop_enable_group(GLcontext *ctx, const struct gl_enable_attrib *enable)
 
    /* texture unit enables */
    for (i = 0; i < ctx->Const.MaxTextureUnits; i++) {
-      if (ctx->Texture.Unit[i].Enabled != enable->Texture[i]) {
-         ctx->Texture.Unit[i].Enabled = enable->Texture[i];
-         if (ctx->Driver.Enable) {
-            if (ctx->Driver.ActiveTexture) {
-               (*ctx->Driver.ActiveTexture)(ctx, i);
-            }
-            (*ctx->Driver.Enable)( ctx, GL_TEXTURE_1D,
-                             (GLboolean) (enable->Texture[i] & TEXTURE_1D_BIT) );
-            (*ctx->Driver.Enable)( ctx, GL_TEXTURE_2D,
-                             (GLboolean) (enable->Texture[i] & TEXTURE_2D_BIT) );
-            (*ctx->Driver.Enable)( ctx, GL_TEXTURE_3D,
-                             (GLboolean) (enable->Texture[i] & TEXTURE_3D_BIT) );
-            if (ctx->Extensions.ARB_texture_cube_map)
-               (*ctx->Driver.Enable)( ctx, GL_TEXTURE_CUBE_MAP_ARB,
-                          (GLboolean) (enable->Texture[i] & TEXTURE_CUBE_BIT) );
-            if (ctx->Extensions.NV_texture_rectangle)
-               (*ctx->Driver.Enable)( ctx, GL_TEXTURE_RECTANGLE_NV,
-                          (GLboolean) (enable->Texture[i] & TEXTURE_RECT_BIT) );
+      const GLbitfield enabled = enable->Texture[i];
+      const GLbitfield genEnabled = enable->TexGen[i];
+
+      if (ctx->Texture.Unit[i].Enabled != enabled) {
+         _mesa_ActiveTextureARB(GL_TEXTURE0 + i);
+
+         _mesa_set_enable(ctx, GL_TEXTURE_1D,
+                          (enabled & TEXTURE_1D_BIT) ? GL_TRUE : GL_FALSE);
+         _mesa_set_enable(ctx, GL_TEXTURE_2D,
+                          (enabled & TEXTURE_2D_BIT) ? GL_TRUE : GL_FALSE);
+         _mesa_set_enable(ctx, GL_TEXTURE_3D,
+                          (enabled & TEXTURE_3D_BIT) ? GL_TRUE : GL_FALSE);
+         if (ctx->Extensions.NV_texture_rectangle) {
+            _mesa_set_enable(ctx, GL_TEXTURE_RECTANGLE_ARB,
+                             (enabled & TEXTURE_RECT_BIT) ? GL_TRUE : GL_FALSE);
+         }
+         if (ctx->Extensions.ARB_texture_cube_map) {
+            _mesa_set_enable(ctx, GL_TEXTURE_CUBE_MAP,
+                             (enabled & TEXTURE_CUBE_BIT) ? GL_TRUE : GL_FALSE);
+         }
+         if (ctx->Extensions.MESA_texture_array) {
+            _mesa_set_enable(ctx, GL_TEXTURE_1D_ARRAY_EXT,
+                           (enabled & TEXTURE_1D_ARRAY_BIT) ? GL_TRUE : GL_FALSE);
+            _mesa_set_enable(ctx, GL_TEXTURE_2D_ARRAY_EXT,
+                           (enabled & TEXTURE_2D_ARRAY_BIT) ? GL_TRUE : GL_FALSE);
          }
       }
 
-      if (ctx->Texture.Unit[i].TexGenEnabled != enable->TexGen[i]) {
-         ctx->Texture.Unit[i].TexGenEnabled = enable->TexGen[i];
-         if (ctx->Driver.Enable) {
-            if (ctx->Driver.ActiveTexture) {
-               (*ctx->Driver.ActiveTexture)(ctx, i);
-            }
-            if (enable->TexGen[i] & S_BIT)
-               (*ctx->Driver.Enable)( ctx, GL_TEXTURE_GEN_S, GL_TRUE);
-            else
-               (*ctx->Driver.Enable)( ctx, GL_TEXTURE_GEN_S, GL_FALSE);
-            if (enable->TexGen[i] & T_BIT)
-               (*ctx->Driver.Enable)( ctx, GL_TEXTURE_GEN_T, GL_TRUE);
-            else
-               (*ctx->Driver.Enable)( ctx, GL_TEXTURE_GEN_T, GL_FALSE);
-            if (enable->TexGen[i] & R_BIT)
-               (*ctx->Driver.Enable)( ctx, GL_TEXTURE_GEN_R, GL_TRUE);
-            else
-               (*ctx->Driver.Enable)( ctx, GL_TEXTURE_GEN_R, GL_FALSE);
-            if (enable->TexGen[i] & Q_BIT)
-               (*ctx->Driver.Enable)( ctx, GL_TEXTURE_GEN_Q, GL_TRUE);
-            else
-               (*ctx->Driver.Enable)( ctx, GL_TEXTURE_GEN_Q, GL_FALSE);
-         }
+      if (ctx->Texture.Unit[i].TexGenEnabled != genEnabled) {
+         _mesa_ActiveTextureARB(GL_TEXTURE0 + i);
+         _mesa_set_enable(ctx, GL_TEXTURE_GEN_S,
+                          (genEnabled & S_BIT) ? GL_TRUE : GL_FALSE);
+         _mesa_set_enable(ctx, GL_TEXTURE_GEN_T,
+                          (genEnabled & T_BIT) ? GL_TRUE : GL_FALSE);
+         _mesa_set_enable(ctx, GL_TEXTURE_GEN_R,
+                          (genEnabled & R_BIT) ? GL_TRUE : GL_FALSE);
+         _mesa_set_enable(ctx, GL_TEXTURE_GEN_Q,
+                          (genEnabled & Q_BIT) ? GL_TRUE : GL_FALSE);
       }
 
       /* GL_SGI_texture_color_table */
       ctx->Texture.Unit[i].ColorTableEnabled = enable->TextureColorTable[i];
    }
 
-   if (ctx->Driver.ActiveTexture) {
-      (*ctx->Driver.ActiveTexture)(ctx, ctx->Texture.CurrentUnit);
-   }
+   _mesa_ActiveTextureARB(GL_TEXTURE0 + curTexUnitSave);
 }
 
 
@@ -770,6 +763,13 @@ pop_texture_group(GLcontext *ctx, struct texture_state *texstate)
          _mesa_set_enable(ctx, GL_TEXTURE_RECTANGLE_NV,
                      (unit->Enabled & TEXTURE_RECT_BIT) ? GL_TRUE : GL_FALSE);
       }
+      if (ctx->Extensions.MESA_texture_array) {
+         _mesa_set_enable(ctx, GL_TEXTURE_1D_ARRAY_EXT,
+                 (unit->Enabled & TEXTURE_1D_ARRAY_BIT) ? GL_TRUE : GL_FALSE);
+         _mesa_set_enable(ctx, GL_TEXTURE_2D_ARRAY_EXT,
+                 (unit->Enabled & TEXTURE_2D_ARRAY_BIT) ? GL_TRUE : GL_FALSE);
+      }
+
       if (ctx->Extensions.SGI_texture_color_table) {
          _mesa_set_enable(ctx, GL_TEXTURE_COLOR_TABLE_SGI,
                           unit->ColorTableEnabled);
-- 
cgit v1.2.3


From 810df8317dfe30c573cfb8296e569f73d23b74a7 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 21 May 2009 17:03:21 -0600
Subject: mesa: s/MAX_VERTEX_PROGRAM_ATTRIBS/MAX_NV_VERTEX_PROGRAM_INPUTS
 (cherry picked from commit d2a74d76c96957cf0294dcf40d29526621ada95e)

---
 src/mesa/main/varray.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 0882e8f37a..8f6621ee45 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -538,7 +538,7 @@ _mesa_VertexAttribPointerNV(GLuint index, GLint size, GLenum type,
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-   if (index >= MAX_VERTEX_PROGRAM_ATTRIBS) {
+   if (index >= MAX_NV_VERTEX_PROGRAM_INPUTS) {
       _mesa_error(ctx, GL_INVALID_VALUE, "glVertexAttribPointerNV(index)");
       return;
    }
-- 
cgit v1.2.3


From 54f425b5cefd1e40f315a4f8747b9a3db29ab9d4 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 22 May 2009 07:26:08 -0600
Subject: mesa: rename MAX_VERTEX_ATTRIBS to MAX_VERTEX_GENERIC_ATTRIBS

Be clearer that this is the number of generic vertex program/shader
attributes, not counting the legacy attributes (pos, normal, color, etc).
(cherry picked from commit 4a95185c9f30c2de7a03bb1a0653f51b53b1111d)
---
 src/mesa/main/api_noop.c           | 16 ++++++++--------
 src/mesa/main/config.h             |  2 +-
 src/mesa/main/dlist.c              | 24 ++++++++++++------------
 src/mesa/main/enums.c              | 10 +++++-----
 src/mesa/shader/slang/slang_link.c |  8 ++++----
 src/mesa/vbo/vbo_attrib_tmp.h      | 16 ++++++++--------
 src/mesa/vbo/vbo_exec_array.c      |  4 ++--
 7 files changed, 40 insertions(+), 40 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_noop.c b/src/mesa/main/api_noop.c
index a1cc3a2a4b..66f9c4e6bd 100644
--- a/src/mesa/main/api_noop.c
+++ b/src/mesa/main/api_noop.c
@@ -477,7 +477,7 @@ static void GLAPIENTRY _mesa_noop_VertexAttrib4fvNV( GLuint index, const GLfloat
 static void GLAPIENTRY _mesa_noop_VertexAttrib1fARB( GLuint index, GLfloat x )
 {
    GET_CURRENT_CONTEXT(ctx);
-   if (index < MAX_VERTEX_ATTRIBS) {
+   if (index < MAX_VERTEX_GENERIC_ATTRIBS) {
       ASSIGN_4V(ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index], x, 0, 0, 1);
    }
    else
@@ -487,7 +487,7 @@ static void GLAPIENTRY _mesa_noop_VertexAttrib1fARB( GLuint index, GLfloat x )
 static void GLAPIENTRY _mesa_noop_VertexAttrib1fvARB( GLuint index, const GLfloat *v )
 {
    GET_CURRENT_CONTEXT(ctx);
-   if (index < MAX_VERTEX_ATTRIBS) {
+   if (index < MAX_VERTEX_GENERIC_ATTRIBS) {
       ASSIGN_4V(ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index], v[0], 0, 0, 1);
    }
    else
@@ -497,7 +497,7 @@ static void GLAPIENTRY _mesa_noop_VertexAttrib1fvARB( GLuint index, const GLfloa
 static void GLAPIENTRY _mesa_noop_VertexAttrib2fARB( GLuint index, GLfloat x, GLfloat y )
 {
    GET_CURRENT_CONTEXT(ctx);
-   if (index < MAX_VERTEX_ATTRIBS) {
+   if (index < MAX_VERTEX_GENERIC_ATTRIBS) {
       ASSIGN_4V(ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index], x, y, 0, 1);
    }
    else
@@ -507,7 +507,7 @@ static void GLAPIENTRY _mesa_noop_VertexAttrib2fARB( GLuint index, GLfloat x, GL
 static void GLAPIENTRY _mesa_noop_VertexAttrib2fvARB( GLuint index, const GLfloat *v )
 {
    GET_CURRENT_CONTEXT(ctx);
-   if (index < MAX_VERTEX_ATTRIBS) {
+   if (index < MAX_VERTEX_GENERIC_ATTRIBS) {
       ASSIGN_4V(ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index], v[0], v[1], 0, 1);
    }
    else
@@ -518,7 +518,7 @@ static void GLAPIENTRY _mesa_noop_VertexAttrib3fARB( GLuint index, GLfloat x,
                                   GLfloat y, GLfloat z )
 {
    GET_CURRENT_CONTEXT(ctx);
-   if (index < MAX_VERTEX_ATTRIBS) {
+   if (index < MAX_VERTEX_GENERIC_ATTRIBS) {
       ASSIGN_4V(ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index], x, y, z, 1);
    }
    else
@@ -528,7 +528,7 @@ static void GLAPIENTRY _mesa_noop_VertexAttrib3fARB( GLuint index, GLfloat x,
 static void GLAPIENTRY _mesa_noop_VertexAttrib3fvARB( GLuint index, const GLfloat *v )
 {
    GET_CURRENT_CONTEXT(ctx);
-   if (index < MAX_VERTEX_ATTRIBS) {
+   if (index < MAX_VERTEX_GENERIC_ATTRIBS) {
       ASSIGN_4V(ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index], v[0], v[1], v[2], 1);
    }
    else
@@ -539,7 +539,7 @@ static void GLAPIENTRY _mesa_noop_VertexAttrib4fARB( GLuint index, GLfloat x,
                                   GLfloat y, GLfloat z, GLfloat w )
 {
    GET_CURRENT_CONTEXT(ctx);
-   if (index < MAX_VERTEX_ATTRIBS) {
+   if (index < MAX_VERTEX_GENERIC_ATTRIBS) {
       ASSIGN_4V(ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index], x, y, z, w);
    }
    else
@@ -549,7 +549,7 @@ static void GLAPIENTRY _mesa_noop_VertexAttrib4fARB( GLuint index, GLfloat x,
 static void GLAPIENTRY _mesa_noop_VertexAttrib4fvARB( GLuint index, const GLfloat *v )
 {
    GET_CURRENT_CONTEXT(ctx);
-   if (index < MAX_VERTEX_ATTRIBS) {
+   if (index < MAX_VERTEX_GENERIC_ATTRIBS) {
       ASSIGN_4V(ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index], v[0], v[1], v[2], v[3]);
    }
    else
diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index bd66a4c231..aecea689af 100644
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -215,7 +215,7 @@
 
 /** For GL_ARB_vertex_shader */
 /*@{*/
-#define MAX_VERTEX_ATTRIBS 16
+#define MAX_VERTEX_GENERIC_ATTRIBS 16
 #define MAX_VERTEX_TEXTURE_IMAGE_UNITS MAX_TEXTURE_IMAGE_UNITS
 #define MAX_COMBINED_TEXTURE_IMAGE_UNITS MAX_TEXTURE_IMAGE_UNITS
 /*@}*/
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 537ff5881f..0bd7c3d9a1 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -4974,7 +4974,7 @@ save_Attr1fARB(GLenum attr, GLfloat x)
       n[2].f = x;
    }
 
-   ASSERT(attr < MAX_VERTEX_ATTRIBS);
+   ASSERT(attr < MAX_VERTEX_GENERIC_ATTRIBS);
    ctx->ListState.ActiveAttribSize[attr] = 1;
    ASSIGN_4V(ctx->ListState.CurrentAttrib[attr], x, 0, 0, 1);
 
@@ -4996,7 +4996,7 @@ save_Attr2fARB(GLenum attr, GLfloat x, GLfloat y)
       n[3].f = y;
    }
 
-   ASSERT(attr < MAX_VERTEX_ATTRIBS);
+   ASSERT(attr < MAX_VERTEX_GENERIC_ATTRIBS);
    ctx->ListState.ActiveAttribSize[attr] = 2;
    ASSIGN_4V(ctx->ListState.CurrentAttrib[attr], x, y, 0, 1);
 
@@ -5019,7 +5019,7 @@ save_Attr3fARB(GLenum attr, GLfloat x, GLfloat y, GLfloat z)
       n[4].f = z;
    }
 
-   ASSERT(attr < MAX_VERTEX_ATTRIBS);
+   ASSERT(attr < MAX_VERTEX_GENERIC_ATTRIBS);
    ctx->ListState.ActiveAttribSize[attr] = 3;
    ASSIGN_4V(ctx->ListState.CurrentAttrib[attr], x, y, z, 1);
 
@@ -5043,7 +5043,7 @@ save_Attr4fARB(GLenum attr, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
       n[5].f = w;
    }
 
-   ASSERT(attr < MAX_VERTEX_ATTRIBS);
+   ASSERT(attr < MAX_VERTEX_GENERIC_ATTRIBS);
    ctx->ListState.ActiveAttribSize[attr] = 4;
    ASSIGN_4V(ctx->ListState.CurrentAttrib[attr], x, y, z, w);
 
@@ -5582,7 +5582,7 @@ save_VertexAttrib4fvNV(GLuint index, const GLfloat * v)
 static void GLAPIENTRY
 save_VertexAttrib1fARB(GLuint index, GLfloat x)
 {
-   if (index < MAX_VERTEX_ATTRIBS)
+   if (index < MAX_VERTEX_GENERIC_ATTRIBS)
       save_Attr1fARB(index, x);
    else
       index_error();
@@ -5591,7 +5591,7 @@ save_VertexAttrib1fARB(GLuint index, GLfloat x)
 static void GLAPIENTRY
 save_VertexAttrib1fvARB(GLuint index, const GLfloat * v)
 {
-   if (index < MAX_VERTEX_ATTRIBS)
+   if (index < MAX_VERTEX_GENERIC_ATTRIBS)
       save_Attr1fARB(index, v[0]);
    else
       index_error();
@@ -5600,7 +5600,7 @@ save_VertexAttrib1fvARB(GLuint index, const GLfloat * v)
 static void GLAPIENTRY
 save_VertexAttrib2fARB(GLuint index, GLfloat x, GLfloat y)
 {
-   if (index < MAX_VERTEX_ATTRIBS)
+   if (index < MAX_VERTEX_GENERIC_ATTRIBS)
       save_Attr2fARB(index, x, y);
    else
       index_error();
@@ -5609,7 +5609,7 @@ save_VertexAttrib2fARB(GLuint index, GLfloat x, GLfloat y)
 static void GLAPIENTRY
 save_VertexAttrib2fvARB(GLuint index, const GLfloat * v)
 {
-   if (index < MAX_VERTEX_ATTRIBS)
+   if (index < MAX_VERTEX_GENERIC_ATTRIBS)
       save_Attr2fARB(index, v[0], v[1]);
    else
       index_error();
@@ -5618,7 +5618,7 @@ save_VertexAttrib2fvARB(GLuint index, const GLfloat * v)
 static void GLAPIENTRY
 save_VertexAttrib3fARB(GLuint index, GLfloat x, GLfloat y, GLfloat z)
 {
-   if (index < MAX_VERTEX_ATTRIBS)
+   if (index < MAX_VERTEX_GENERIC_ATTRIBS)
       save_Attr3fARB(index, x, y, z);
    else
       index_error();
@@ -5627,7 +5627,7 @@ save_VertexAttrib3fARB(GLuint index, GLfloat x, GLfloat y, GLfloat z)
 static void GLAPIENTRY
 save_VertexAttrib3fvARB(GLuint index, const GLfloat * v)
 {
-   if (index < MAX_VERTEX_ATTRIBS)
+   if (index < MAX_VERTEX_GENERIC_ATTRIBS)
       save_Attr3fARB(index, v[0], v[1], v[2]);
    else
       index_error();
@@ -5637,7 +5637,7 @@ static void GLAPIENTRY
 save_VertexAttrib4fARB(GLuint index, GLfloat x, GLfloat y, GLfloat z,
                        GLfloat w)
 {
-   if (index < MAX_VERTEX_ATTRIBS)
+   if (index < MAX_VERTEX_GENERIC_ATTRIBS)
       save_Attr4fARB(index, x, y, z, w);
    else
       index_error();
@@ -5646,7 +5646,7 @@ save_VertexAttrib4fARB(GLuint index, GLfloat x, GLfloat y, GLfloat z,
 static void GLAPIENTRY
 save_VertexAttrib4fvARB(GLuint index, const GLfloat * v)
 {
-   if (index < MAX_VERTEX_ATTRIBS)
+   if (index < MAX_VERTEX_GENERIC_ATTRIBS)
       save_Attr4fARB(index, v[0], v[1], v[2], v[3]);
    else
       index_error();
diff --git a/src/mesa/main/enums.c b/src/mesa/main/enums.c
index c077bc0a89..cf893fdac5 100644
--- a/src/mesa/main/enums.c
+++ b/src/mesa/main/enums.c
@@ -948,8 +948,8 @@ LONGSTRING static const char enum_string_table[] =
    "GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV\0"
    "GL_MAX_VARYING_FLOATS\0"
    "GL_MAX_VARYING_FLOATS_ARB\0"
-   "GL_MAX_VERTEX_ATTRIBS\0"
-   "GL_MAX_VERTEX_ATTRIBS_ARB\0"
+   "GL_MAX_VERTEX_GENERIC_ATTRIBS\0"
+   "GL_MAX_VERTEX_GENERIC_ATTRIBS_ARB\0"
    "GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS\0"
    "GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB\0"
    "GL_MAX_VERTEX_UNIFORM_COMPONENTS\0"
@@ -2772,8 +2772,8 @@ static const enum_elt all_enums[1820] =
    { 19417, 0x0000862E }, /* GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */
    { 19452, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS */
    { 19474, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS_ARB */
-   { 19500, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS */
-   { 19522, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS_ARB */
+   { 19500, 0x00008869 }, /* GL_MAX_VERTEX_GENERIC_ATTRIBS */
+   { 19522, 0x00008869 }, /* GL_MAX_VERTEX_GENERIC_ATTRIBS_ARB */
    { 19548, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
    { 19582, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
    { 19620, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
@@ -4733,7 +4733,7 @@ static const unsigned reduced_enums[1319] =
        317, /* GL_CURRENT_QUERY */
       1259, /* GL_QUERY_RESULT */
       1261, /* GL_QUERY_RESULT_AVAILABLE */
-       912, /* GL_MAX_VERTEX_ATTRIBS */
+       912, /* GL_MAX_VERTEX_GENERIC_ATTRIBS */
       1778, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
        368, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
        367, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c
index 1fdf4db054..8c9fe1ea1f 100644
--- a/src/mesa/shader/slang/slang_link.c
+++ b/src/mesa/shader/slang/slang_link.c
@@ -319,7 +319,7 @@ _slang_resolve_attributes(struct gl_shader_program *shProg,
                           const struct gl_program *origProg,
                           struct gl_program *linkedProg)
 {
-   GLint attribMap[MAX_VERTEX_ATTRIBS];
+   GLint attribMap[MAX_VERTEX_GENERIC_ATTRIBS];
    GLuint i, j;
    GLbitfield usedAttributes; /* generics only, not legacy attributes */
 
@@ -355,7 +355,7 @@ _slang_resolve_attributes(struct gl_shader_program *shProg,
    }
 
    /* initialize the generic attribute map entries to -1 */
-   for (i = 0; i < MAX_VERTEX_ATTRIBS; i++) {
+   for (i = 0; i < MAX_VERTEX_GENERIC_ATTRIBS; i++) {
       attribMap[i] = -1;
    }
 
@@ -396,11 +396,11 @@ _slang_resolve_attributes(struct gl_shader_program *shProg,
                    * Start at 1 since generic attribute 0 always aliases
                    * glVertex/position.
                    */
-                  for (attr = 0; attr < MAX_VERTEX_ATTRIBS; attr++) {
+                  for (attr = 0; attr < MAX_VERTEX_GENERIC_ATTRIBS; attr++) {
                      if (((1 << attr) & usedAttributes) == 0)
                         break;
                   }
-                  if (attr == MAX_VERTEX_ATTRIBS) {
+                  if (attr == MAX_VERTEX_GENERIC_ATTRIBS) {
                      link_error(shProg, "Too many vertex attributes");
                      return GL_FALSE;
                   }
diff --git a/src/mesa/vbo/vbo_attrib_tmp.h b/src/mesa/vbo/vbo_attrib_tmp.h
index ff11c7d59a..7a889b8e2f 100644
--- a/src/mesa/vbo/vbo_attrib_tmp.h
+++ b/src/mesa/vbo/vbo_attrib_tmp.h
@@ -265,7 +265,7 @@ static void GLAPIENTRY TAG(VertexAttrib1fARB)( GLuint index, GLfloat x )
    GET_CURRENT_CONTEXT( ctx );
    if (index == 0) 
       ATTR1F(0, x);
-   else if (index < MAX_VERTEX_ATTRIBS)
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
       ATTR1F(VBO_ATTRIB_GENERIC0 + index, x);
    else
       ERROR();
@@ -277,7 +277,7 @@ static void GLAPIENTRY TAG(VertexAttrib1fvARB)( GLuint index,
    GET_CURRENT_CONTEXT( ctx );
    if (index == 0) 
       ATTR1FV(0, v);
-   else if (index < MAX_VERTEX_ATTRIBS)
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
       ATTR1FV(VBO_ATTRIB_GENERIC0 + index, v);
    else
       ERROR();
@@ -289,7 +289,7 @@ static void GLAPIENTRY TAG(VertexAttrib2fARB)( GLuint index, GLfloat x,
    GET_CURRENT_CONTEXT( ctx );
    if (index == 0) 
       ATTR2F(0, x, y);
-   else if (index < MAX_VERTEX_ATTRIBS)
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
       ATTR2F(VBO_ATTRIB_GENERIC0 + index, x, y);
    else
       ERROR();
@@ -301,7 +301,7 @@ static void GLAPIENTRY TAG(VertexAttrib2fvARB)( GLuint index,
    GET_CURRENT_CONTEXT( ctx );
    if (index == 0) 
       ATTR2FV(0, v);
-   else if (index < MAX_VERTEX_ATTRIBS)
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
       ATTR2FV(VBO_ATTRIB_GENERIC0 + index, v);
    else
       ERROR();
@@ -313,7 +313,7 @@ static void GLAPIENTRY TAG(VertexAttrib3fARB)( GLuint index, GLfloat x,
    GET_CURRENT_CONTEXT( ctx );
    if (index == 0) 
       ATTR3F(0, x, y, z);
-   else if (index < MAX_VERTEX_ATTRIBS)
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
       ATTR3F(VBO_ATTRIB_GENERIC0 + index, x, y, z);
    else
       ERROR();
@@ -325,7 +325,7 @@ static void GLAPIENTRY TAG(VertexAttrib3fvARB)( GLuint index,
    GET_CURRENT_CONTEXT( ctx );
    if (index == 0) 
       ATTR3FV(0, v);
-   else if (index < MAX_VERTEX_ATTRIBS)
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
       ATTR3FV(VBO_ATTRIB_GENERIC0 + index, v);
    else
       ERROR();
@@ -338,7 +338,7 @@ static void GLAPIENTRY TAG(VertexAttrib4fARB)( GLuint index, GLfloat x,
    GET_CURRENT_CONTEXT( ctx );
    if (index == 0) 
       ATTR4F(0, x, y, z, w);
-   else if (index < MAX_VERTEX_ATTRIBS)
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
       ATTR4F(VBO_ATTRIB_GENERIC0 + index, x, y, z, w);
    else
       ERROR();
@@ -350,7 +350,7 @@ static void GLAPIENTRY TAG(VertexAttrib4fvARB)( GLuint index,
    GET_CURRENT_CONTEXT( ctx );
    if (index == 0) 
       ATTR4FV(0, v);
-   else if (index < MAX_VERTEX_ATTRIBS)
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
       ATTR4FV(VBO_ATTRIB_GENERIC0 + index, v);
    else
       ERROR();
diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c
index 65fe197a4d..de66cdd92f 100644
--- a/src/mesa/vbo/vbo_exec_array.c
+++ b/src/mesa/vbo/vbo_exec_array.c
@@ -118,7 +118,7 @@ static void bind_array_obj( GLcontext *ctx )
    for (i = 0; i < MAX_TEXTURE_COORD_UNITS; i++)
       exec->array.legacy_array[VERT_ATTRIB_TEX0 + i] = &arrayObj->TexCoord[i];
 
-   for (i = 0; i < MAX_VERTEX_ATTRIBS; i++) {
+   for (i = 0; i < MAX_VERTEX_GENERIC_ATTRIBS; i++) {
       assert(i < Elements(arrayObj->VertexAttrib));
       assert(i < Elements(exec->array.generic_array));
       exec->array.generic_array[i] = &arrayObj->VertexAttrib[i];
@@ -219,7 +219,7 @@ static void recalculate_input_bindings( GLcontext *ctx )
          }
       }
 
-      for (i = 0; i < MAX_VERTEX_ATTRIBS; i++) {
+      for (i = 0; i < MAX_VERTEX_GENERIC_ATTRIBS; i++) {
 	 if (exec->array.generic_array[i]->Enabled)
 	    inputs[VERT_ATTRIB_GENERIC0 + i] = exec->array.generic_array[i];
 	 else {
-- 
cgit v1.2.3


From a5b7e0c7d73949e24d4edb1ab09b0aff367132a5 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 22 May 2009 07:19:27 -0600
Subject: mesa: s/MAX_VERTEX_PROGRAM_ATTRIBS/MAX_NV_VERTEX_PROGRAM_INPUTS/ in
 NV funcs (cherry picked from commit 4dc426c01627a240bd5b148c1804c45b0d5ecd6c)

---
 src/mesa/main/dlist.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 0bd7c3d9a1..782f847904 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -5506,7 +5506,7 @@ index_error(void)
 static void GLAPIENTRY
 save_VertexAttrib1fNV(GLuint index, GLfloat x)
 {
-   if (index < MAX_VERTEX_PROGRAM_ATTRIBS)
+   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS)
       save_Attr1fNV(index, x);
    else
       index_error();
@@ -5515,7 +5515,7 @@ save_VertexAttrib1fNV(GLuint index, GLfloat x)
 static void GLAPIENTRY
 save_VertexAttrib1fvNV(GLuint index, const GLfloat * v)
 {
-   if (index < MAX_VERTEX_PROGRAM_ATTRIBS)
+   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS)
       save_Attr1fNV(index, v[0]);
    else
       index_error();
@@ -5524,7 +5524,7 @@ save_VertexAttrib1fvNV(GLuint index, const GLfloat * v)
 static void GLAPIENTRY
 save_VertexAttrib2fNV(GLuint index, GLfloat x, GLfloat y)
 {
-   if (index < MAX_VERTEX_PROGRAM_ATTRIBS)
+   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS)
       save_Attr2fNV(index, x, y);
    else
       index_error();
@@ -5533,7 +5533,7 @@ save_VertexAttrib2fNV(GLuint index, GLfloat x, GLfloat y)
 static void GLAPIENTRY
 save_VertexAttrib2fvNV(GLuint index, const GLfloat * v)
 {
-   if (index < MAX_VERTEX_PROGRAM_ATTRIBS)
+   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS)
       save_Attr2fNV(index, v[0], v[1]);
    else
       index_error();
@@ -5542,7 +5542,7 @@ save_VertexAttrib2fvNV(GLuint index, const GLfloat * v)
 static void GLAPIENTRY
 save_VertexAttrib3fNV(GLuint index, GLfloat x, GLfloat y, GLfloat z)
 {
-   if (index < MAX_VERTEX_PROGRAM_ATTRIBS)
+   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS)
       save_Attr3fNV(index, x, y, z);
    else
       index_error();
@@ -5551,7 +5551,7 @@ save_VertexAttrib3fNV(GLuint index, GLfloat x, GLfloat y, GLfloat z)
 static void GLAPIENTRY
 save_VertexAttrib3fvNV(GLuint index, const GLfloat * v)
 {
-   if (index < MAX_VERTEX_PROGRAM_ATTRIBS)
+   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS)
       save_Attr3fNV(index, v[0], v[1], v[2]);
    else
       index_error();
@@ -5561,7 +5561,7 @@ static void GLAPIENTRY
 save_VertexAttrib4fNV(GLuint index, GLfloat x, GLfloat y,
                       GLfloat z, GLfloat w)
 {
-   if (index < MAX_VERTEX_PROGRAM_ATTRIBS)
+   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS)
       save_Attr4fNV(index, x, y, z, w);
    else
       index_error();
@@ -5570,7 +5570,7 @@ save_VertexAttrib4fNV(GLuint index, GLfloat x, GLfloat y,
 static void GLAPIENTRY
 save_VertexAttrib4fvNV(GLuint index, const GLfloat * v)
 {
-   if (index < MAX_VERTEX_PROGRAM_ATTRIBS)
+   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS)
       save_Attr4fNV(index, v[0], v[1], v[2], v[3]);
    else
       index_error();
-- 
cgit v1.2.3


From 4031ea1520f582fa36a6b964de7d565fe33a538d Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 17 Jun 2009 11:57:39 -0600
Subject: glsl: Added gl_shader_state::EmitContReturn field

This is the start of a glsl-continue-return feature branch to support
a GLSL code generator option for 'continue' and 'return' statements.
Some targets don't support CONT or RET statements so we'll need to
try to generate code that does not use them...
---
 src/mesa/main/mtypes.h       | 1 +
 src/mesa/shader/shader_api.c | 1 +
 2 files changed, 2 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index b9cb972e5f..84a082b253 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2032,6 +2032,7 @@ struct gl_shader_state
    struct gl_shader_program *CurrentProgram; /**< The user-bound program */
    /** Driver-selectable options: */
    GLboolean EmitHighLevelInstructions; /**< IF/ELSE/ENDIF vs. BRA, etc. */
+   GLboolean EmitContReturn;            /**< Emit CONT/RET opcodes? */
    GLboolean EmitCondCodes;             /**< Use condition codes? */
    GLboolean EmitComments;              /**< Annotated instructions */
    void *MemPool;
diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index 644cd39185..cf9f8b9222 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -402,6 +402,7 @@ _mesa_init_shader_state(GLcontext * ctx)
     * are generated by the GLSL compiler.
     */
    ctx->Shader.EmitHighLevelInstructions = GL_TRUE;
+   ctx->Shader.EmitContReturn = GL_TRUE;
    ctx->Shader.EmitCondCodes = GL_FALSE;
    ctx->Shader.EmitComments = GL_FALSE;
    ctx->Shader.Flags = get_shader_flags();
-- 
cgit v1.2.3


From 077a06c140001849dafbedc4175f9aa703bbba69 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 26 Jun 2009 13:16:08 -0600
Subject: mesa: bump version to 7.5-rc4

---
 Makefile                | 2 +-
 src/mesa/main/version.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/Makefile b/Makefile
index 22334d6ee4..f7361d6198 100644
--- a/Makefile
+++ b/Makefile
@@ -182,7 +182,7 @@ ultrix-gcc:
 
 # Rules for making release tarballs
 
-VERSION=7.5-rc3
+VERSION=7.5-rc4
 DIRECTORY = Mesa-$(VERSION)
 LIB_NAME = MesaLib-$(VERSION)
 DEMO_NAME = MesaDemos-$(VERSION)
diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index 015ac71a17..52ee324d17 100644
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -31,7 +31,7 @@
 #define MESA_MAJOR 7
 #define MESA_MINOR 5
 #define MESA_PATCH 0
-#define MESA_VERSION_STRING "7.5-rc3"
+#define MESA_VERSION_STRING "7.5-rc4"
 
 /* To make version comparison easy */
 #define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
-- 
cgit v1.2.3


From f08bebfe246d786c39731871d8c4aa00a10b29ab Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 26 Jun 2009 16:33:46 -0600
Subject: mesa: raise MAX_VARYING (number of shader varying vars) to 16

16 is the limit for now because of various 32-bit bitfields.

(cherry picked from master, commit 4e762395ef7e8c332c16fd0c11025cfa52763a45)
---
 src/mesa/main/config.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index aecea689af..f7acd2f08e 100644
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -187,7 +187,7 @@
 #define MAX_PROGRAM_TEMPS 256
 #define MAX_PROGRAM_ADDRESS_REGS 2
 #define MAX_UNIFORMS 1024  /**< number of vec4 uniforms */
-#define MAX_VARYING 8      /**< number of float[4] vectors */
+#define MAX_VARYING 16     /**< number of float[4] vectors */
 #define MAX_SAMPLERS MAX_TEXTURE_IMAGE_UNITS
 #define MAX_PROGRAM_INPUTS 32
 #define MAX_PROGRAM_OUTPUTS 32
-- 
cgit v1.2.3


From f44638fa613b48e8d6551ebcb127336b932ba6c8 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 29 Jun 2009 15:12:36 -0600
Subject: mesa: check for ARB_framebuffer_object for
 GL_TEXTURE_STENCIL_SIZE_EXT query

---
 src/mesa/main/texparam.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index 2195a334d3..d27c59381c 100644
--- a/src/mesa/main/texparam.c
+++ b/src/mesa/main/texparam.c
@@ -882,7 +882,8 @@ _mesa_GetTexLevelParameteriv( GLenum target, GLint level,
                         "glGetTexLevelParameter[if]v(pname)");
          break;
       case GL_TEXTURE_STENCIL_SIZE_EXT:
-         if (ctx->Extensions.EXT_packed_depth_stencil) {
+         if (ctx->Extensions.EXT_packed_depth_stencil ||
+             ctx->Extensions.ARB_framebuffer_object) {
             *params = img->TexFormat->StencilBits;
          }
          else {
-- 
cgit v1.2.3


From 47173cf67f0ed55012b0820397f6d620d8ad4473 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keithw@vmware.com>
Date: Tue, 30 Jun 2009 09:55:33 +0100
Subject: mesa/dlist: shortcircuit some redundant statechanges at compile time

Currently, state-changes in mesa display lists are more or less
a verbatim recording of the GL calls made during compilation.

This change introduces a minor optimization to recognize and eliminate
cases where the application emits redundant state changes, eg:

  glShadeModel( GL_FLAT );
  glBegin( prim )
  ...
  glEnd()
  glShadeModel( GL_FLAT );
  glBegin( prim )
  ...
  glEnd()

The big win is when we can eliminate all the statechanges between two
primitive blocks and combine them into a single VBO node.

This commit implements state-change elimination for Material and ShadeModel
only.  This is enough to make a start on debugging, etc.
---
 src/mesa/main/dlist.c  | 63 +++++++++++++++++++++++++++++++++++---------------
 src/mesa/main/mtypes.h |  7 ++++++
 2 files changed, 51 insertions(+), 19 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 782f847904..3647401a1b 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -3177,14 +3177,21 @@ save_ShadeModel(GLenum mode)
 {
    GET_CURRENT_CONTEXT(ctx);
    Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   ASSERT_OUTSIDE_SAVE_BEGIN_END(ctx);
+
+   if (ctx->ExecuteFlag) {
+      CALL_ShadeModel(ctx->Exec, (mode));
+   }
+
+   if (ctx->ListState.Current.ShadeModel == mode)
+      return;
+
+   ctx->ListState.Current.ShadeModel = mode;
+
    n = ALLOC_INSTRUCTION(ctx, OPCODE_SHADE_MODEL, 1);
    if (n) {
       n[1].e = mode;
    }
-   if (ctx->ExecuteFlag) {
-      CALL_ShadeModel(ctx->Exec, (mode));
-   }
 }
 
 
@@ -5146,14 +5153,21 @@ save_EdgeFlag(GLboolean x)
    save_Attr1fNV(VERT_ATTRIB_EDGEFLAG, x ? (GLfloat)1.0 : (GLfloat)0.0);
 }
 
+static INLINE GLboolean compare4fv( const GLfloat *a,
+                                    const GLfloat *b,
+                                    GLuint count )
+{
+   return memcmp( a, b, count * sizeof(GLfloat) ) == 0;
+}
+                              
+
 static void GLAPIENTRY
 save_Materialfv(GLenum face, GLenum pname, const GLfloat * param)
 {
    GET_CURRENT_CONTEXT(ctx);
    Node *n;
    int args, i;
-
-   SAVE_FLUSH_VERTICES(ctx);
+   GLuint bitmask;
 
    switch (face) {
    case GL_BACK:
@@ -5183,6 +5197,28 @@ save_Materialfv(GLenum face, GLenum pname, const GLfloat * param)
       _mesa_compile_error(ctx, GL_INVALID_ENUM, "material(pname)");
       return;
    }
+   
+   if (ctx->ExecuteFlag) {
+      CALL_Materialfv(ctx->Exec, (face, pname, param));
+   }
+
+   bitmask = _mesa_material_bitmask(ctx, face, pname, ~0, NULL);
+
+   /* Try to eliminate redundant statechanges
+    */
+   for (i = 0; i < MAT_ATTRIB_MAX; i++) {
+      if (bitmask & (1 << i)) {
+         if (ctx->Driver.CurrentSavePrimitive == PRIM_OUTSIDE_BEGIN_END && 
+             ctx->ListState.ActiveMaterialSize[i] == args &&
+             compare4fv(ctx->ListState.CurrentMaterial[i], param, args))
+            return;
+             
+         ctx->ListState.ActiveMaterialSize[i] = args;
+         COPY_SZ_4V(ctx->ListState.CurrentMaterial[i], args, param);
+      }
+   }
+
+   SAVE_FLUSH_VERTICES(ctx);
 
    n = ALLOC_INSTRUCTION(ctx, OPCODE_MATERIAL, 6);
    if (n) {
@@ -5191,19 +5227,6 @@ save_Materialfv(GLenum face, GLenum pname, const GLfloat * param)
       for (i = 0; i < args; i++)
          n[3 + i].f = param[i];
    }
-
-   {
-      GLuint bitmask = _mesa_material_bitmask(ctx, face, pname, ~0, NULL);
-      for (i = 0; i < MAT_ATTRIB_MAX; i++)
-         if (bitmask & (1 << i)) {
-            ctx->ListState.ActiveMaterialSize[i] = args;
-            COPY_SZ_4V(ctx->ListState.CurrentMaterial[i], args, param);
-         }
-   }
-
-   if (ctx->ExecuteFlag) {
-      CALL_Materialfv(ctx->Exec, (face, pname, param));
-   }
 }
 
 static void GLAPIENTRY
@@ -6812,6 +6835,8 @@ _mesa_NewList(GLuint name, GLenum mode)
    for (i = 0; i < MAT_ATTRIB_MAX; i++)
       ctx->ListState.ActiveMaterialSize[i] = 0;
 
+   memset(&ctx->ListState.Current, 0, sizeof ctx->ListState.Current);
+
    ctx->Driver.CurrentSavePrimitive = PRIM_UNKNOWN;
    ctx->Driver.NewList(ctx, name, mode);
 
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 84a082b253..bdaa4977b7 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2806,6 +2806,13 @@ struct gl_dlist_state
    
    GLubyte ActiveEdgeFlag;
    GLboolean CurrentEdgeFlag;
+
+   struct {
+      /* State known to have been set by the currently-compiling display
+       * list.  Used to eliminate some redundant state changes.
+       */
+      GLenum ShadeModel;
+   } Current;
 };
 
 
-- 
cgit v1.2.3


From aa688d1579776494640475f4a5b93f3d7fae4fcd Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keithw@vmware.com>
Date: Tue, 30 Jun 2009 12:13:50 +0100
Subject: mesa: add debug printer for primitive name

Add a simple version of _mesa_lookup_enum_by_nr() which expects a primitive
enum (GL_POINTS..GL_POLYGON).  This avoids some annoying duplicates
when looking up primitives, such as the GL_FALSE/GL_POINTS clash.
---
 src/mesa/main/enums.c | 22 ++++++++++++++++++++++
 src/mesa/main/enums.h |  6 ++++++
 2 files changed, 28 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/enums.c b/src/mesa/main/enums.c
index cf893fdac5..417cee8fb2 100644
--- a/src/mesa/main/enums.c
+++ b/src/mesa/main/enums.c
@@ -5059,6 +5059,28 @@ const char *_mesa_lookup_enum_by_nr( int nr )
    }
 }
 
+/* Get the name of an enum given that it is a primitive type.  Avoids
+ * GL_FALSE/GL_POINTS ambiguity and others.
+ */
+const char *_mesa_lookup_prim_by_nr( int nr )
+{
+   switch (nr) {
+   case GL_POINTS: return "GL_POINTS";
+   case GL_LINES: return "GL_LINES";
+   case GL_LINE_STRIP: return "GL_LINE_STRIP";
+   case GL_LINE_LOOP: return "GL_LINE_LOOP";
+   case GL_TRIANGLES: return "GL_TRIANGLES";
+   case GL_TRIANGLE_STRIP: return "GL_TRIANGLE_STRIP";
+   case GL_TRIANGLE_FAN: return "GL_TRIANGLE_FAN";
+   case GL_QUADS: return "GL_QUADS";
+   case GL_QUAD_STRIP: return "GL_QUAD_STRIP";
+   case GL_POLYGON: return "GL_POLYGON";
+   case GL_POLYGON+1: return "OUTSIDE_BEGIN_END";
+   default: return "<invalid>";
+   }
+}
+
+
 int _mesa_lookup_enum_by_name( const char *symbol )
 {
    enum_elt * f = NULL;
diff --git a/src/mesa/main/enums.h b/src/mesa/main/enums.h
index 23a4767f35..b5f69001b8 100644
--- a/src/mesa/main/enums.h
+++ b/src/mesa/main/enums.h
@@ -40,6 +40,12 @@
 #if defined(_HAVE_FULL_GL) && _HAVE_FULL_GL
 
 extern const char *_mesa_lookup_enum_by_nr( int nr );
+
+/* Get the name of an enum given that it is a primitive type.  Avoids
+ * GL_FALSE/GL_POINTS ambiguity and others.
+ */
+const char *_mesa_lookup_prim_by_nr( int nr );
+
 extern int _mesa_lookup_enum_by_name( const char *symbol );
 
 #else
-- 
cgit v1.2.3


From 00438bb94a9ee03f8a4d5472d7ae598fcbdb1572 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keithw@vmware.com>
Date: Tue, 30 Jun 2009 12:19:11 +0100
Subject: mesa/dlist: restore missing SAVE_FLUSH_VERTICES in save_ShadeModel

Reorganization of ShadeModel to avoid flushing vertices too often
ended up never flushing vertices due to omitted line of code.
---
 src/mesa/main/dlist.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 3647401a1b..93b8a8f56d 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -3186,6 +3186,7 @@ save_ShadeModel(GLenum mode)
    if (ctx->ListState.Current.ShadeModel == mode)
       return;
 
+   SAVE_FLUSH_VERTICES(ctx);
    ctx->ListState.Current.ShadeModel = mode;
 
    n = ALLOC_INSTRUCTION(ctx, OPCODE_SHADE_MODEL, 1);
-- 
cgit v1.2.3


From f6c8ca06f649ae1367f61eca6fb7635862bd5584 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keithw@vmware.com>
Date: Sun, 31 May 2009 19:01:55 -0700
Subject: mesa: fix material inputs in ffvertex_prog.c

Varying material inputs were not being picked up from the same slots
where the VBO code is currently placing them (GENERIC0 and above).
Most often they were just being ignored.
---
 src/mesa/main/ffvertex_prog.c | 54 ++++++++++++-------------------------------
 1 file changed, 15 insertions(+), 39 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index 43325b1352..b939401de1 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -48,11 +48,9 @@
 
 struct state_key {
    unsigned light_color_material_mask:12;
-   unsigned light_material_mask:12;
    unsigned light_global_enabled:1;
    unsigned light_local_viewer:1;
    unsigned light_twoside:1;
-   unsigned light_color_material:1;
    unsigned material_shininess_is_zero:1;
    unsigned need_eye_coords:1;
    unsigned normalize:1;
@@ -125,27 +123,6 @@ static GLuint translate_texgen( GLboolean enabled, GLenum mode )
 }
 
 
-/**
- * Returns bitmask of flags indicating which materials are set per-vertex
- * in the current VB.
- * XXX get these from the VBO...
- */
-static GLbitfield
-tnl_get_per_vertex_materials(GLcontext *ctx)
-{
-   GLbitfield mask = 0x0;
-#if 0
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   struct vertex_buffer *VB = &tnl->vb;
-   GLuint i;
-
-   for (i = _TNL_FIRST_MAT; i <= _TNL_LAST_MAT; i++) 
-      if (VB->AttribPtr[i] && VB->AttribPtr[i]->stride) 
-         mask |= 1 << (i - _TNL_FIRST_MAT);
-#endif
-   return mask;
-}
-
 
 /**
  * Should fog be computed per-vertex?
@@ -168,10 +145,11 @@ static GLboolean check_active_shininess( GLcontext *ctx,
 {
    GLuint bit = 1 << (MAT_ATTRIB_FRONT_SHININESS + side);
 
-   if (key->light_color_material_mask & bit)
+   if ((key->varying_vp_inputs & VERT_BIT_COLOR0) &&
+       (key->light_color_material_mask & bit))
       return GL_TRUE;
 
-   if (key->light_material_mask & bit)
+   if (key->varying_vp_inputs & (bit << 16))
       return GL_TRUE;
 
    if (ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_SHININESS + side][0] != 0.0F)
@@ -216,12 +194,9 @@ static void make_state_key( GLcontext *ctx, struct state_key *key )
 	 key->light_twoside = 1;
 
       if (ctx->Light.ColorMaterialEnabled) {
-	 key->light_color_material = 1;
 	 key->light_color_material_mask = ctx->Light.ColorMaterialBitmask;
       }
 
-      key->light_material_mask = tnl_get_per_vertex_materials(ctx);
-
       for (i = 0; i < MAX_LIGHTS; i++) {
 	 struct gl_light *light = &ctx->Light.Light[i];
 
@@ -481,9 +456,9 @@ static struct ureg register_param5(struct tnl_program *p,
  */
 static struct ureg register_input( struct tnl_program *p, GLuint input )
 {
-   /* Material attribs are passed here as inputs >= 32
-    */
-   if (input >= 32 || (p->state->varying_vp_inputs & (1<<input))) {
+   assert(input < 32);
+
+   if (p->state->varying_vp_inputs & (1<<input)) {
       p->program->Base.InputsRead |= (1<<input);
       return make_ureg(PROGRAM_INPUT, input);
    }
@@ -903,18 +878,15 @@ static void set_material_flags( struct tnl_program *p )
    p->color_materials = 0;
    p->materials = 0;
 
-   if (p->state->light_color_material) {
-      p->materials = 
+   if (p->state->varying_vp_inputs & VERT_BIT_COLOR0) {
+      p->materials =
 	 p->color_materials = p->state->light_color_material_mask;
    }
 
-   p->materials |= p->state->light_material_mask;
+   p->materials |= (p->state->varying_vp_inputs >> 16);
 }
 
 
-/* XXX temporary!!! */
-#define _TNL_ATTRIB_MAT_FRONT_AMBIENT 32
-
 static struct ureg get_material( struct tnl_program *p, GLuint side, 
 				 GLuint property )
 {
@@ -922,8 +894,12 @@ static struct ureg get_material( struct tnl_program *p, GLuint side,
 
    if (p->color_materials & (1<<attrib))
       return register_input(p, VERT_ATTRIB_COLOR0);
-   else if (p->materials & (1<<attrib)) 
-      return register_input( p, attrib + _TNL_ATTRIB_MAT_FRONT_AMBIENT );
+   else if (p->materials & (1<<attrib)) {
+      /* Put material values in the GENERIC slots -- they are not used
+       * for anything in fixed function mode.
+       */
+      return register_input( p, attrib + VERT_ATTRIB_GENERIC0 );
+   }
    else
       return register_param3( p, STATE_MATERIAL, side, property );
 }
-- 
cgit v1.2.3


From 79047cc1ddf0332e5b64c9f05a19885cc36c76ae Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keithw@vmware.com>
Date: Sun, 31 May 2009 19:03:02 -0700
Subject: mesa: remove dead vertex fog code from ffvertex_prog.c

---
 src/mesa/main/ffvertex_prog.c | 87 ++-----------------------------------------
 1 file changed, 3 insertions(+), 84 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index b939401de1..a8e48253a5 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -57,9 +57,7 @@ struct state_key {
    unsigned rescale_normals:1;
 
    unsigned fog_source_is_depth:1;
-   unsigned tnl_do_vertex_fog:1;
    unsigned separate_specular:1;
-   unsigned fog_mode:2;
    unsigned point_attenuated:1;
    unsigned point_array:1;
    unsigned texture_enabled_global:1;
@@ -83,23 +81,6 @@ struct state_key {
 };
 
 
-
-#define FOG_NONE   0
-#define FOG_LINEAR 1
-#define FOG_EXP    2
-#define FOG_EXP2   3
-
-static GLuint translate_fog_mode( GLenum mode )
-{
-   switch (mode) {
-   case GL_LINEAR: return FOG_LINEAR;
-   case GL_EXP: return FOG_EXP;
-   case GL_EXP2: return FOG_EXP2;
-   default: return FOG_NONE;
-   }
-}
-
-
 #define TXG_NONE           0
 #define TXG_OBJ_LINEAR     1
 #define TXG_EYE_LINEAR     2
@@ -124,21 +105,6 @@ static GLuint translate_texgen( GLboolean enabled, GLenum mode )
 
 
 
-/**
- * Should fog be computed per-vertex?
- */
-static GLboolean
-tnl_get_per_vertex_fog(GLcontext *ctx)
-{
-#if 0
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   return tnl->_DoVertexFog;
-#else
-   return GL_FALSE;
-#endif
-}
-
-
 static GLboolean check_active_shininess( GLcontext *ctx,
                                          const struct state_key *key,
                                          GLuint side )
@@ -234,12 +200,8 @@ static void make_state_key( GLcontext *ctx, struct state_key *key )
    if (ctx->Transform.RescaleNormals)
       key->rescale_normals = 1;
 
-   key->fog_mode = translate_fog_mode(fp->FogOption);
-   
    if (ctx->Fog.FogCoordinateSource == GL_FRAGMENT_DEPTH_EXT)
       key->fog_source_is_depth = 1;
-   
-   key->tnl_do_vertex_fog = tnl_get_per_vertex_fog(ctx);
 
    if (ctx->Point._Attenuated)
       key->point_attenuated = 1;
@@ -1344,52 +1306,10 @@ static void build_fog( struct tnl_program *p )
       input = swizzle1(register_input(p, VERT_ATTRIB_FOG), X);
    }
 
-   if (p->state->fog_mode && p->state->tnl_do_vertex_fog) {
-      struct ureg params = register_param2(p, STATE_INTERNAL,
-					   STATE_FOG_PARAMS_OPTIMIZED);
-      struct ureg tmp = get_temp(p);
-      GLboolean useabs = (p->state->fog_mode != FOG_EXP2);
-
-      if (useabs) {
-	 emit_op1(p, OPCODE_ABS, tmp, 0, input);
-      }
-
-      switch (p->state->fog_mode) {
-      case FOG_LINEAR: {
-	 struct ureg id = get_identity_param(p);
-	 emit_op3(p, OPCODE_MAD, tmp, 0, useabs ? tmp : input,
-			swizzle1(params,X), swizzle1(params,Y));
-	 emit_op2(p, OPCODE_MAX, tmp, 0, tmp, swizzle1(id,X)); /* saturate */
-	 emit_op2(p, OPCODE_MIN, fog, WRITEMASK_X, tmp, swizzle1(id,W));
-	 break;
-      }
-      case FOG_EXP:
-	 emit_op2(p, OPCODE_MUL, tmp, 0, useabs ? tmp : input,
-			swizzle1(params,Z));
-	 emit_op1(p, OPCODE_EX2, fog, WRITEMASK_X, negate(tmp));
-	 break;
-      case FOG_EXP2:
-	 emit_op2(p, OPCODE_MUL, tmp, 0, input, swizzle1(params,W));
-	 emit_op2(p, OPCODE_MUL, tmp, 0, tmp, tmp);
-	 emit_op1(p, OPCODE_EX2, fog, WRITEMASK_X, negate(tmp));
-	 break;
-      }
-
-      release_temp(p, tmp);
-   }
-   else {
-      /* results = incoming fog coords (compute fog per-fragment later) 
-       *
-       * KW:  Is it really necessary to do anything in this case?
-       * BP: Yes, we always need to compute the absolute value, unless
-       * we want to push that down into the fragment program...
-       */
-      GLboolean useabs = GL_TRUE;
-      emit_op1(p, useabs ? OPCODE_ABS : OPCODE_MOV, fog, WRITEMASK_X, input);
-   }
+   emit_op1(p, OPCODE_ABS, fog, WRITEMASK_X, input);
 }
 
- 
+
 static void build_reflect_texgen( struct tnl_program *p,
 				  struct ureg dest,
 				  GLuint writemask )
@@ -1646,8 +1566,7 @@ static void build_tnl_program( struct tnl_program *p )
       }
    }
 
-   if ((p->state->fragprog_inputs_read & FRAG_BIT_FOGC) ||
-       p->state->fog_mode != FOG_NONE)
+   if (p->state->fragprog_inputs_read & FRAG_BIT_FOGC)
       build_fog(p);
 
    if (p->state->fragprog_inputs_read & FRAG_BITS_TEX_ANY)
-- 
cgit v1.2.3


From cea259f0392766e8a2e4749c6d5277d866abbc3b Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keithw@vmware.com>
Date: Sun, 31 May 2009 19:03:46 -0700
Subject: mesa: remove dead constant pointsize code from ffvertex_prog.c

---
 src/mesa/main/ffvertex_prog.c | 17 -----------------
 1 file changed, 17 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index a8e48253a5..c38dba04c7 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -1524,17 +1524,6 @@ static void build_atten_pointsize( struct tnl_program *p )
 }
 
 
-/**
- * Emit constant point size.
- */
-static void build_constant_pointsize( struct tnl_program *p )
-{
-   struct ureg state_size = register_param1(p, STATE_POINT_SIZE);
-   struct ureg out = register_output(p, VERT_RESULT_PSIZ);
-   emit_op1(p, OPCODE_MOV, out, WRITEMASK_X, state_size);
-}
-
-
 /**
  * Pass-though per-vertex point size, from user's point size array.
  */
@@ -1576,12 +1565,6 @@ static void build_tnl_program( struct tnl_program *p )
       build_atten_pointsize(p);
    else if (p->state->point_array)
       build_array_pointsize(p);
-#if 0
-   else
-      build_constant_pointsize(p);
-#else
-   (void) build_constant_pointsize;
-#endif
 
    /* Finish up:
     */
-- 
cgit v1.2.3


From 6dfb89e4a09a269cbd5c4dc725881fbd42eaa18a Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keithw@vmware.com>
Date: Sun, 31 May 2009 19:04:06 -0700
Subject: mesa: remove whitespace

---
 src/mesa/main/ffvertex_prog.c | 216 +++++++++++++++++++++---------------------
 1 file changed, 108 insertions(+), 108 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index c38dba04c7..80dde4b5aa 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -1,8 +1,8 @@
 /**************************************************************************
- * 
+ *
  * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
  * 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
@@ -10,11 +10,11 @@
  * distribute, sub license, and/or sell copies of the Software, and to
  * permit persons to whom the Software is furnished to do so, subject to
  * the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice (including the
  * next paragraph) shall be included in all copies or substantial portions
  * of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
@@ -22,7 +22,7 @@
  * 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.
- * 
+ *
  **************************************************************************/
 
 /**
@@ -69,7 +69,7 @@ struct state_key {
       unsigned light_enabled:1;
       unsigned light_eyepos3_is_zero:1;
       unsigned light_spotcutoff_is_180:1;
-      unsigned light_attenuated:1;      
+      unsigned light_attenuated:1;
       unsigned texunit_really_enabled:1;
       unsigned texmat_enabled:1;
       unsigned texgen_enabled:4;
@@ -171,7 +171,7 @@ static void make_state_key( GLcontext *ctx, struct state_key *key )
 
 	    if (light->EyePosition[3] == 0.0)
 	       key->unit[i].light_eyepos3_is_zero = 1;
-	    
+
 	    if (light->SpotCutoff == 180.0)
 	       key->unit[i].light_spotcutoff_is_180 = 1;
 
@@ -215,29 +215,29 @@ static void make_state_key( GLcontext *ctx, struct state_key *key )
        ctx->Texture._TexMatEnabled ||
        ctx->Texture._EnabledUnits)
       key->texture_enabled_global = 1;
-      
+
    for (i = 0; i < MAX_TEXTURE_COORD_UNITS; i++) {
       struct gl_texture_unit *texUnit = &ctx->Texture.Unit[i];
 
       if (texUnit->_ReallyEnabled)
 	 key->unit[i].texunit_really_enabled = 1;
 
-      if (ctx->Texture._TexMatEnabled & ENABLE_TEXMAT(i))      
+      if (ctx->Texture._TexMatEnabled & ENABLE_TEXMAT(i))
 	 key->unit[i].texmat_enabled = 1;
-      
+
       if (texUnit->TexGenEnabled) {
 	 key->unit[i].texgen_enabled = 1;
-      
-	 key->unit[i].texgen_mode0 = 
+
+	 key->unit[i].texgen_mode0 =
 	    translate_texgen( texUnit->TexGenEnabled & (1<<0),
 			      texUnit->GenS.Mode );
-	 key->unit[i].texgen_mode1 = 
+	 key->unit[i].texgen_mode1 =
 	    translate_texgen( texUnit->TexGenEnabled & (1<<1),
 			      texUnit->GenT.Mode );
-	 key->unit[i].texgen_mode2 = 
+	 key->unit[i].texgen_mode2 =
 	    translate_texgen( texUnit->TexGenEnabled & (1<<2),
 			      texUnit->GenR.Mode );
-	 key->unit[i].texgen_mode3 = 
+	 key->unit[i].texgen_mode3 =
 	    translate_texgen( texUnit->TexGenEnabled & (1<<3),
 			      texUnit->GenQ.Mode );
       }
@@ -245,7 +245,7 @@ static void make_state_key( GLcontext *ctx, struct state_key *key )
 }
 
 
-   
+
 /* Very useful debugging tool - produces annotated listing of
  * generated program with line/function references for each
  * instruction back into this file:
@@ -254,7 +254,7 @@ static void make_state_key( GLcontext *ctx, struct state_key *key )
 
 
 /* Use uregs to represent registers internally, translate to Mesa's
- * expected formats on emit.  
+ * expected formats on emit.
  *
  * NOTE: These are passed by value extensively in this file rather
  * than as usual by pointer reference.  If this disturbs you, try
@@ -280,10 +280,10 @@ struct tnl_program {
    struct gl_vertex_program *program;
    GLint max_inst;  /** number of instructions allocated for program */
    GLboolean mvp_with_dp4;
-   
+
    GLuint temp_in_use;
    GLuint temp_reserved;
-   
+
    struct ureg eye_position;
    struct ureg eye_position_z;
    struct ureg eye_position_normalized;
@@ -387,7 +387,7 @@ static void release_temps( struct tnl_program *p )
 }
 
 
-static struct ureg register_param5(struct tnl_program *p, 
+static struct ureg register_param5(struct tnl_program *p,
 				   GLint s0,
 				   GLint s1,
 				   GLint s2,
@@ -440,7 +440,7 @@ static struct ureg register_output( struct tnl_program *p, GLuint output )
 }
 
 
-static struct ureg register_const4f( struct tnl_program *p, 
+static struct ureg register_const4f( struct tnl_program *p,
 			      GLfloat s0,
 			      GLfloat s1,
 			      GLfloat s2,
@@ -472,7 +472,7 @@ static GLboolean is_undef( struct ureg reg )
 
 static struct ureg get_identity_param( struct tnl_program *p )
 {
-   if (is_undef(p->identity)) 
+   if (is_undef(p->identity))
       p->identity = register_const4f(p, 0,0,0,1);
 
    return p->identity;
@@ -491,7 +491,7 @@ static void register_matrix_param5( struct tnl_program *p,
    /* This is a bit sad as the support is there to pull the whole
     * matrix out in one go:
     */
-   for (i = 0; i <= s3 - s2; i++) 
+   for (i = 0; i <= s3 - s2; i++)
       matrix[i] = register_param5( p, s0, s1, i, i, s4 );
 }
 
@@ -516,7 +516,7 @@ static void emit_dst( struct prog_dst_register *dst,
    dst->File = reg.file;
    dst->Index = reg.idx;
    /* allow zero as a shorthand for xyzw */
-   dst->WriteMask = mask ? mask : WRITEMASK_XYZW; 
+   dst->WriteMask = mask ? mask : WRITEMASK_XYZW;
    dst->CondMask = COND_TR;  /* always pass cond test */
    dst->CondSwizzle = SWIZZLE_NOOP;
    dst->CondSrc = 0;
@@ -531,12 +531,12 @@ static void debug_insn( struct prog_instruction *inst, const char *fn,
 {
    if (DISASSEM) {
       static const char *last_fn;
-   
+
       if (fn != last_fn) {
 	 last_fn = fn;
 	 _mesa_printf("%s:\n", fn);
       }
-	 
+
       _mesa_printf("%d:\t", line);
       _mesa_print_instruction(inst);
    }
@@ -555,7 +555,7 @@ static void emit_op3fn(struct tnl_program *p,
 {
    GLuint nr;
    struct prog_instruction *inst;
-      
+
    assert((GLint) p->program->Base.NumInstructions <= p->max_inst);
 
    if (p->program->Base.NumInstructions == p->max_inst) {
@@ -580,16 +580,16 @@ static void emit_op3fn(struct tnl_program *p,
 
       p->program->Base.Instructions = newInst;
    }
-      
+
    nr = p->program->Base.NumInstructions++;
 
    inst = &p->program->Base.Instructions[nr];
-   inst->Opcode = (enum prog_opcode) op; 
+   inst->Opcode = (enum prog_opcode) op;
    inst->Data = 0;
-   
+
    emit_arg( &inst->SrcReg[0], src0 );
    emit_arg( &inst->SrcReg[1], src1 );
-   emit_arg( &inst->SrcReg[2], src2 );   
+   emit_arg( &inst->SrcReg[2], src2 );
 
    emit_dst( &inst->DstReg, dest, mask );
 
@@ -609,7 +609,7 @@ static void emit_op3fn(struct tnl_program *p,
 
 static struct ureg make_temp( struct tnl_program *p, struct ureg reg )
 {
-   if (reg.file == PROGRAM_TEMPORARY && 
+   if (reg.file == PROGRAM_TEMPORARY &&
        !(p->temp_reserved & (1<<reg.idx)))
       return reg;
    else {
@@ -690,19 +690,19 @@ static void emit_normalize_vec3( struct tnl_program *p,
 }
 
 
-static void emit_passthrough( struct tnl_program *p, 
+static void emit_passthrough( struct tnl_program *p,
 			      GLuint input,
 			      GLuint output )
 {
    struct ureg out = register_output(p, output);
-   emit_op1(p, OPCODE_MOV, out, 0, register_input(p, input)); 
+   emit_op1(p, OPCODE_MOV, out, 0, register_input(p, input));
 }
 
 
 static struct ureg get_eye_position( struct tnl_program *p )
 {
    if (is_undef(p->eye_position)) {
-      struct ureg pos = register_input( p, VERT_ATTRIB_POS ); 
+      struct ureg pos = register_input( p, VERT_ATTRIB_POS );
       struct ureg modelview[4];
 
       p->eye_position = reserve_temp(p);
@@ -720,18 +720,18 @@ static struct ureg get_eye_position( struct tnl_program *p )
 	 emit_transpose_matrix_transform_vec4(p, p->eye_position, modelview, pos);
       }
    }
-   
+
    return p->eye_position;
 }
 
 
 static struct ureg get_eye_position_z( struct tnl_program *p )
 {
-   if (!is_undef(p->eye_position)) 
+   if (!is_undef(p->eye_position))
       return swizzle1(p->eye_position, Z);
 
    if (is_undef(p->eye_position_z)) {
-      struct ureg pos = register_input( p, VERT_ATTRIB_POS ); 
+      struct ureg pos = register_input( p, VERT_ATTRIB_POS );
       struct ureg modelview[4];
 
       p->eye_position_z = reserve_temp(p);
@@ -741,10 +741,10 @@ static struct ureg get_eye_position_z( struct tnl_program *p )
 
       emit_op2(p, OPCODE_DP4, p->eye_position_z, 0, pos, modelview[2]);
    }
-   
+
    return p->eye_position_z;
 }
-   
+
 
 static struct ureg get_eye_position_normalized( struct tnl_program *p )
 {
@@ -753,7 +753,7 @@ static struct ureg get_eye_position_normalized( struct tnl_program *p )
       p->eye_position_normalized = reserve_temp(p);
       emit_normalize_vec3(p, p->eye_position_normalized, eye);
    }
-   
+
    return p->eye_position_normalized;
 }
 
@@ -767,7 +767,7 @@ static struct ureg get_transformed_normal( struct tnl_program *p )
    {
       p->transformed_normal = register_input(p, VERT_ATTRIB_NORMAL );
    }
-   else if (is_undef(p->transformed_normal)) 
+   else if (is_undef(p->transformed_normal))
    {
       struct ureg normal = register_input(p, VERT_ATTRIB_NORMAL );
       struct ureg mvinv[3];
@@ -798,7 +798,7 @@ static struct ureg get_transformed_normal( struct tnl_program *p )
 	 emit_op2( p, OPCODE_MUL, transformed_normal, 0, normal, rescale );
          normal = transformed_normal;
       }
-      
+
       assert(normal.file == PROGRAM_TEMPORARY);
       p->transformed_normal = normal;
    }
@@ -809,17 +809,17 @@ static struct ureg get_transformed_normal( struct tnl_program *p )
 
 static void build_hpos( struct tnl_program *p )
 {
-   struct ureg pos = register_input( p, VERT_ATTRIB_POS ); 
+   struct ureg pos = register_input( p, VERT_ATTRIB_POS );
    struct ureg hpos = register_output( p, VERT_RESULT_HPOS );
    struct ureg mvp[4];
 
    if (p->mvp_with_dp4) {
-      register_matrix_param5( p, STATE_MVP_MATRIX, 0, 0, 3, 
+      register_matrix_param5( p, STATE_MVP_MATRIX, 0, 0, 3,
 			      0, mvp );
       emit_matrix_transform_vec4( p, hpos, mvp, pos );
    }
    else {
-      register_matrix_param5( p, STATE_MVP_MATRIX, 0, 0, 3, 
+      register_matrix_param5( p, STATE_MVP_MATRIX, 0, 0, 3,
 			      STATE_MATRIX_TRANSPOSE, mvp );
       emit_transpose_matrix_transform_vec4( p, hpos, mvp, pos );
    }
@@ -849,7 +849,7 @@ static void set_material_flags( struct tnl_program *p )
 }
 
 
-static struct ureg get_material( struct tnl_program *p, GLuint side, 
+static struct ureg get_material( struct tnl_program *p, GLuint side,
 				 GLuint property )
 {
    GLuint attrib = material_attrib(side, property);
@@ -890,7 +890,7 @@ static struct ureg get_scenecolor( struct tnl_program *p, GLuint side )
       struct ureg material_ambient = get_material(p, side, STATE_AMBIENT);
       struct ureg material_diffuse = get_material(p, side, STATE_DIFFUSE);
       struct ureg tmp = make_temp(p, material_diffuse);
-      emit_op3(p, OPCODE_MAD, tmp, WRITEMASK_XYZ, lm_ambient, 
+      emit_op3(p, OPCODE_MAD, tmp, WRITEMASK_XYZ, lm_ambient,
 	       material_ambient, material_emission);
       return tmp;
    }
@@ -899,12 +899,12 @@ static struct ureg get_scenecolor( struct tnl_program *p, GLuint side )
 }
 
 
-static struct ureg get_lightprod( struct tnl_program *p, GLuint light, 
+static struct ureg get_lightprod( struct tnl_program *p, GLuint light,
 				  GLuint side, GLuint property )
 {
    GLuint attrib = material_attrib(side, property);
    if (p->materials & (1<<attrib)) {
-      struct ureg light_value = 
+      struct ureg light_value =
 	 register_param3(p, STATE_LIGHT, light, property);
       struct ureg material_value = get_material(p, side, property);
       struct ureg tmp = get_temp(p);
@@ -917,7 +917,7 @@ static struct ureg get_lightprod( struct tnl_program *p, GLuint light,
 
 
 static struct ureg calculate_light_attenuation( struct tnl_program *p,
-						GLuint i, 
+						GLuint i,
 						struct ureg VPpli,
 						struct ureg dist )
 {
@@ -946,27 +946,27 @@ static struct ureg calculate_light_attenuation( struct tnl_program *p,
     */
    if (p->state->unit[i].light_attenuated) {
       /* 1/d,d,d,1/d */
-      emit_op1(p, OPCODE_RCP, dist, WRITEMASK_YZ, dist); 
+      emit_op1(p, OPCODE_RCP, dist, WRITEMASK_YZ, dist);
       /* 1,d,d*d,1/d */
-      emit_op2(p, OPCODE_MUL, dist, WRITEMASK_XZ, dist, swizzle1(dist,Y)); 
+      emit_op2(p, OPCODE_MUL, dist, WRITEMASK_XZ, dist, swizzle1(dist,Y));
       /* 1/dist-atten */
-      emit_op2(p, OPCODE_DP3, dist, 0, attenuation, dist); 
+      emit_op2(p, OPCODE_DP3, dist, 0, attenuation, dist);
 
       if (!p->state->unit[i].light_spotcutoff_is_180) {
 	 /* dist-atten */
-	 emit_op1(p, OPCODE_RCP, dist, 0, dist); 
+	 emit_op1(p, OPCODE_RCP, dist, 0, dist);
 	 /* spot-atten * dist-atten */
-	 emit_op2(p, OPCODE_MUL, att, 0, dist, att);	
+	 emit_op2(p, OPCODE_MUL, att, 0, dist, att);
       }
       else {
 	 /* dist-atten */
-	 emit_op1(p, OPCODE_RCP, att, 0, dist); 
+	 emit_op1(p, OPCODE_RCP, att, 0, dist);
       }
    }
 
    return att;
 }
-						
+
 
 /**
  * Compute:
@@ -985,7 +985,7 @@ static void emit_degenerate_lit( struct tnl_program *p,
 
    /* MAX lit, id, dots;
     */
-   emit_op2(p, OPCODE_MAX, lit, WRITEMASK_XYZW, id, dots); 
+   emit_op2(p, OPCODE_MAX, lit, WRITEMASK_XYZW, id, dots);
 
    /* result[2] = (in > 0 ? 1 : 0)
     * SLT lit.z, id.z, dots;   # lit.z = (0 < dots.z) ? 1 : 0
@@ -1018,10 +1018,10 @@ static void build_lighting( struct tnl_program *p )
     * dots.w = front.shininess
     */
 
-   for (i = 0; i < MAX_LIGHTS; i++) 
+   for (i = 0; i < MAX_LIGHTS; i++)
       if (p->state->unit[i].light_enabled)
 	 nr_lights++;
-   
+
    set_material_flags(p);
 
    {
@@ -1044,7 +1044,7 @@ static void build_lighting( struct tnl_program *p )
           * The negation will be un-done later in the back-face code below.
           */
          struct ureg shininess = get_material(p, 1, STATE_SHININESS);
-         emit_op1(p, OPCODE_MOV, dots, WRITEMASK_Z, 
+         emit_op1(p, OPCODE_MOV, dots, WRITEMASK_Z,
                   negate(swizzle1(shininess,X)));
          release_temp(p, shininess);
       }
@@ -1072,12 +1072,12 @@ static void build_lighting( struct tnl_program *p )
       struct ureg res0 = register_output( p, VERT_RESULT_BFC0 );
       emit_op1(p, OPCODE_MOV, res0, 0, _bfc0);
    }
-      
+
    if (twoside && separate) {
       struct ureg res1 = register_output( p, VERT_RESULT_BFC1 );
       emit_op1(p, OPCODE_MOV, res1, 0, _bfc1);
    }
-      
+
    if (nr_lights == 0) {
       release_temps(p);
       return;
@@ -1087,16 +1087,16 @@ static void build_lighting( struct tnl_program *p )
       if (p->state->unit[i].light_enabled) {
 	 struct ureg half = undef;
 	 struct ureg att = undef, VPpli = undef;
-	  
+
 	 count++;
 
 	 if (p->state->unit[i].light_eyepos3_is_zero) {
 	    /* Can used precomputed constants in this case.
 	     * Attenuation never applies to infinite lights.
 	     */
-	    VPpli = register_param3(p, STATE_INTERNAL, 
-				    STATE_LIGHT_POSITION_NORMALIZED, i); 
-            
+	    VPpli = register_param3(p, STATE_INTERNAL,
+				    STATE_LIGHT_POSITION_NORMALIZED, i);
+
             if (!p->state->material_shininess_is_zero) {
                if (p->state->light_local_viewer) {
                   struct ureg eye_hat = get_eye_position_normalized(p);
@@ -1105,22 +1105,22 @@ static void build_lighting( struct tnl_program *p )
                   emit_normalize_vec3(p, half, half);
                }
                else {
-                  half = register_param3(p, STATE_INTERNAL, 
+                  half = register_param3(p, STATE_INTERNAL,
                                          STATE_LIGHT_HALF_VECTOR, i);
                }
             }
 	 }
 	 else {
-	    struct ureg Ppli = register_param3(p, STATE_INTERNAL, 
-					       STATE_LIGHT_POSITION, i); 
+	    struct ureg Ppli = register_param3(p, STATE_INTERNAL,
+					       STATE_LIGHT_POSITION, i);
 	    struct ureg V = get_eye_position(p);
 	    struct ureg dist = get_temp(p);
 
-	    VPpli = get_temp(p); 
- 
+	    VPpli = get_temp(p);
+
 	    /* Calculate VPpli vector
 	     */
-	    emit_op2(p, OPCODE_SUB, VPpli, 0, Ppli, V); 
+	    emit_op2(p, OPCODE_SUB, VPpli, 0, Ppli, V);
 
 	    /* Normalize VPpli.  The dist value also used in
 	     * attenuation below.
@@ -1130,7 +1130,7 @@ static void build_lighting( struct tnl_program *p )
 	    emit_op2(p, OPCODE_MUL, VPpli, 0, VPpli, dist);
 
 	    /* Calculate attenuation:
-	     */ 
+	     */
 	    if (!p->state->unit[i].light_spotcutoff_is_180 ||
 		p->state->unit[i].light_attenuated) {
 	       att = calculate_light_attenuation(p, i, VPpli, dist);
@@ -1146,7 +1146,7 @@ static void build_lighting( struct tnl_program *p )
                   emit_op2(p, OPCODE_SUB, half, 0, VPpli, eye_hat);
                }
                else {
-                  struct ureg z_dir = swizzle(get_identity_param(p),X,Y,W,Z); 
+                  struct ureg z_dir = swizzle(get_identity_param(p),X,Y,W,Z);
                   emit_op2(p, OPCODE_ADD, half, 0, VPpli, z_dir);
                }
 
@@ -1215,7 +1215,7 @@ static void build_lighting( struct tnl_program *p )
 
 	    emit_op3(p, OPCODE_MAD, res0, mask0, swizzle1(lit,Y), diffuse, _col0);
 	    emit_op3(p, OPCODE_MAD, res1, mask1, swizzle1(lit,Z), specular, _col1);
-      
+
 	    release_temp(p, ambient);
 	    release_temp(p, diffuse);
 	    release_temp(p, specular);
@@ -1229,7 +1229,7 @@ static void build_lighting( struct tnl_program *p )
 	    struct ureg specular = get_lightprod(p, i, 1, STATE_SPECULAR);
 	    struct ureg res0, res1;
 	    GLuint mask0, mask1;
-	       
+
 	    if (count == nr_lights) {
 	       if (separate) {
 		  mask0 = WRITEMASK_XYZ;
@@ -1319,9 +1319,9 @@ static void build_reflect_texgen( struct tnl_program *p,
    struct ureg tmp = get_temp(p);
 
    /* n.u */
-   emit_op2(p, OPCODE_DP3, tmp, 0, normal, eye_hat); 
+   emit_op2(p, OPCODE_DP3, tmp, 0, normal, eye_hat);
    /* 2n.u */
-   emit_op2(p, OPCODE_ADD, tmp, 0, tmp, tmp); 
+   emit_op2(p, OPCODE_ADD, tmp, 0, tmp, tmp);
    /* (-2n.u)n + u */
    emit_op3(p, OPCODE_MAD, dest, writemask, negate(tmp), normal, eye_hat);
 
@@ -1350,22 +1350,22 @@ static void build_sphere_texgen( struct tnl_program *p,
     */
 
    /* n.u */
-   emit_op2(p, OPCODE_DP3, tmp, 0, normal, eye_hat); 
+   emit_op2(p, OPCODE_DP3, tmp, 0, normal, eye_hat);
    /* 2n.u */
-   emit_op2(p, OPCODE_ADD, tmp, 0, tmp, tmp); 
+   emit_op2(p, OPCODE_ADD, tmp, 0, tmp, tmp);
    /* (-2n.u)n + u */
-   emit_op3(p, OPCODE_MAD, r, 0, negate(tmp), normal, eye_hat); 
+   emit_op3(p, OPCODE_MAD, r, 0, negate(tmp), normal, eye_hat);
    /* r + 0,0,1 */
-   emit_op2(p, OPCODE_ADD, tmp, 0, r, swizzle(id,X,Y,W,Z)); 
+   emit_op2(p, OPCODE_ADD, tmp, 0, r, swizzle(id,X,Y,W,Z));
    /* rx^2 + ry^2 + (rz+1)^2 */
-   emit_op2(p, OPCODE_DP3, tmp, 0, tmp, tmp); 
+   emit_op2(p, OPCODE_DP3, tmp, 0, tmp, tmp);
    /* 2/m */
-   emit_op1(p, OPCODE_RSQ, tmp, 0, tmp); 
+   emit_op1(p, OPCODE_RSQ, tmp, 0, tmp);
    /* 1/m */
-   emit_op2(p, OPCODE_MUL, inv_m, 0, tmp, half); 
+   emit_op2(p, OPCODE_MUL, inv_m, 0, tmp, half);
    /* r/m + 1/2 */
-   emit_op3(p, OPCODE_MAD, dest, writemask, r, inv_m, half); 
-	       
+   emit_op3(p, OPCODE_MAD, dest, writemask, r, inv_m, half);
+
    release_temp(p, tmp);
    release_temp(p, r);
    release_temp(p, inv_m);
@@ -1380,10 +1380,10 @@ static void build_texture_transform( struct tnl_program *p )
 
       if (!(p->state->fragprog_inputs_read & FRAG_BIT_TEX(i)))
 	 continue;
-							     
-      if (p->state->unit[i].texgen_enabled || 
+
+      if (p->state->unit[i].texgen_enabled ||
 	  p->state->unit[i].texmat_enabled) {
-	 
+
 	 GLuint texmat_enabled = p->state->unit[i].texmat_enabled;
 	 struct ureg out = register_output(p, VERT_RESULT_TEX0 + i);
 	 struct ureg out_texgen = undef;
@@ -1394,8 +1394,8 @@ static void build_texture_transform( struct tnl_program *p )
 	    GLuint reflect_mask = 0;
 	    GLuint normal_mask = 0;
 	    GLuint modes[4];
-	 
-	    if (texmat_enabled) 
+
+	    if (texmat_enabled)
 	       out_texgen = get_temp(p);
 	    else
 	       out_texgen = out;
@@ -1409,31 +1409,31 @@ static void build_texture_transform( struct tnl_program *p )
 	       switch (modes[j]) {
 	       case TXG_OBJ_LINEAR: {
 		  struct ureg obj = register_input(p, VERT_ATTRIB_POS);
-		  struct ureg plane = 
+		  struct ureg plane =
 		     register_param3(p, STATE_TEXGEN, i,
 				     STATE_TEXGEN_OBJECT_S + j);
 
-		  emit_op2(p, OPCODE_DP4, out_texgen, WRITEMASK_X << j, 
+		  emit_op2(p, OPCODE_DP4, out_texgen, WRITEMASK_X << j,
 			   obj, plane );
 		  break;
 	       }
 	       case TXG_EYE_LINEAR: {
 		  struct ureg eye = get_eye_position(p);
-		  struct ureg plane = 
-		     register_param3(p, STATE_TEXGEN, i, 
+		  struct ureg plane =
+		     register_param3(p, STATE_TEXGEN, i,
 				     STATE_TEXGEN_EYE_S + j);
 
-		  emit_op2(p, OPCODE_DP4, out_texgen, WRITEMASK_X << j, 
+		  emit_op2(p, OPCODE_DP4, out_texgen, WRITEMASK_X << j,
 			   eye, plane );
 		  break;
 	       }
-	       case TXG_SPHERE_MAP: 
+	       case TXG_SPHERE_MAP:
 		  sphere_mask |= WRITEMASK_X << j;
 		  break;
 	       case TXG_REFLECTION_MAP:
 		  reflect_mask |= WRITEMASK_X << j;
 		  break;
-	       case TXG_NORMAL_MAP: 
+	       case TXG_NORMAL_MAP:
 		  normal_mask |= WRITEMASK_X << j;
 		  break;
 	       case TXG_NONE:
@@ -1462,8 +1462,8 @@ static void build_texture_transform( struct tnl_program *p )
 
 	 if (texmat_enabled) {
 	    struct ureg texmat[4];
-	    struct ureg in = (!is_undef(out_texgen) ? 
-			      out_texgen : 
+	    struct ureg in = (!is_undef(out_texgen) ?
+			      out_texgen :
 			      register_input(p, VERT_ATTRIB_TEX0+i));
 	    if (p->mvp_with_dp4) {
 	       register_matrix_param5( p, STATE_TEXTURE_MATRIX, i, 0, 3,
@@ -1596,7 +1596,7 @@ create_new_program( const struct state_key *key,
    p.identity = undef;
    p.temp_in_use = 0;
    p.mvp_with_dp4 = mvp_with_dp4;
-   
+
    if (max_temps >= sizeof(int) * 8)
       p.temp_reserved = 0;
    else
@@ -1639,14 +1639,14 @@ _mesa_get_fixed_func_vertex_program(GLcontext *ctx)
     */
    prog = (struct gl_vertex_program *)
       _mesa_search_program_cache(ctx->VertexProgram.Cache, &key, sizeof(key));
-   
+
    if (!prog) {
       /* OK, we'll have to build a new one */
       if (0)
          _mesa_printf("Build new TNL program\n");
-	 
+
       prog = (struct gl_vertex_program *)
-         ctx->Driver.NewProgram(ctx, GL_VERTEX_PROGRAM_ARB, 0); 
+         ctx->Driver.NewProgram(ctx, GL_VERTEX_PROGRAM_ARB, 0);
       if (!prog)
          return NULL;
 
@@ -1656,7 +1656,7 @@ _mesa_get_fixed_func_vertex_program(GLcontext *ctx)
 
 #if 0
       if (ctx->Driver.ProgramStringNotify)
-         ctx->Driver.ProgramStringNotify( ctx, GL_VERTEX_PROGRAM_ARB, 
+         ctx->Driver.ProgramStringNotify( ctx, GL_VERTEX_PROGRAM_ARB,
                                           &prog->Base );
 #endif
       _mesa_program_cache_insert(ctx, ctx->VertexProgram.Cache,
-- 
cgit v1.2.3


From 7e91d035b9ef65adda39c8b164afa363477d7893 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keithw@vmware.com>
Date: Tue, 30 Jun 2009 17:04:11 +0100
Subject: mesa/dlist: invalidate cached dlist compile state after CallList

When compiling a display list containing a CallList, it is necessary to
invalidate any assumption about the GL state after the recursive call
completes.
---
 src/mesa/main/dlist.c | 40 ++++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 16 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 93b8a8f56d..3e8b5a9424 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -957,6 +957,20 @@ save_BlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
    }
 }
 
+static void invalidate_saved_current_state( GLcontext *ctx )
+{
+   GLint i;
+
+   for (i = 0; i < VERT_ATTRIB_MAX; i++)
+      ctx->ListState.ActiveAttribSize[i] = 0;
+
+   for (i = 0; i < MAT_ATTRIB_MAX; i++)
+      ctx->ListState.ActiveMaterialSize[i] = 0;
+
+   memset(&ctx->ListState.Current, 0, sizeof ctx->ListState.Current);
+
+   ctx->Driver.CurrentSavePrimitive = PRIM_UNKNOWN;
+}
 
 void GLAPIENTRY
 _mesa_save_CallList(GLuint list)
@@ -970,9 +984,10 @@ _mesa_save_CallList(GLuint list)
       n[1].ui = list;
    }
 
-   /* After this, we don't know what begin/end state we're in:
+   /* After this, we don't know what state we're in.  Invalidate all
+    * cached information previously gathered:
     */
-   ctx->Driver.CurrentSavePrimitive = PRIM_UNKNOWN;
+   invalidate_saved_current_state( ctx );
 
    if (ctx->ExecuteFlag) {
       _mesa_CallList(list);
@@ -1015,9 +1030,10 @@ _mesa_save_CallLists(GLsizei n, GLenum type, const GLvoid * lists)
       }
    }
 
-   /* After this, we don't know what begin/end state we're in:
+   /* After this, we don't know what state we're in.  Invalidate all
+    * cached information previously gathered:
     */
-   ctx->Driver.CurrentSavePrimitive = PRIM_UNKNOWN;
+   invalidate_saved_current_state( ctx );
 
    if (ctx->ExecuteFlag) {
       CALL_CallLists(ctx->Exec, (n, type, lists));
@@ -6795,7 +6811,6 @@ void GLAPIENTRY
 _mesa_NewList(GLuint name, GLenum mode)
 {
    GET_CURRENT_CONTEXT(ctx);
-   GLint i;
 
    FLUSH_CURRENT(ctx, 0);       /* must be called before assert */
    ASSERT_OUTSIDE_BEGIN_END(ctx);
@@ -6823,22 +6838,15 @@ _mesa_NewList(GLuint name, GLenum mode)
    ctx->CompileFlag = GL_TRUE;
    ctx->ExecuteFlag = (mode == GL_COMPILE_AND_EXECUTE);
 
+   /* Reset acumulated list state:
+    */
+   invalidate_saved_current_state( ctx );
+
    /* Allocate new display list */
    ctx->ListState.CurrentList = make_list(name, BLOCK_SIZE);
    ctx->ListState.CurrentBlock = ctx->ListState.CurrentList->Head;
    ctx->ListState.CurrentPos = 0;
 
-   /* Reset acumulated list state:
-    */
-   for (i = 0; i < VERT_ATTRIB_MAX; i++)
-      ctx->ListState.ActiveAttribSize[i] = 0;
-
-   for (i = 0; i < MAT_ATTRIB_MAX; i++)
-      ctx->ListState.ActiveMaterialSize[i] = 0;
-
-   memset(&ctx->ListState.Current, 0, sizeof ctx->ListState.Current);
-
-   ctx->Driver.CurrentSavePrimitive = PRIM_UNKNOWN;
    ctx->Driver.NewList(ctx, name, mode);
 
    ctx->CurrentDispatch = ctx->Save;
-- 
cgit v1.2.3


From d6c2347d79c50ac18eab96378d79d989f3ffd0b7 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keithw@vmware.com>
Date: Tue, 30 Jun 2009 17:10:56 +0100
Subject: mesa/dlist: don't cache state which may not be replayed on CallList

Statechanges which occur before the first End in a display list may
not be replayed when the list is called, in particular if it is called
from within a begin/end pair.

Recognize vulnerable statechanges and do not use them to fill in the
state cache.
---
 src/mesa/main/dlist.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 3e8b5a9424..2af0dd3c59 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -3203,7 +3203,11 @@ save_ShadeModel(GLenum mode)
       return;
 
    SAVE_FLUSH_VERTICES(ctx);
-   ctx->ListState.Current.ShadeModel = mode;
+
+   /* Only save the value if we know the statechange will take effect:
+    */
+   if (ctx->Driver.CurrentSavePrimitive == PRIM_OUTSIDE_BEGIN_END)
+      ctx->ListState.Current.ShadeModel = mode;
 
    n = ALLOC_INSTRUCTION(ctx, OPCODE_SHADE_MODEL, 1);
    if (n) {
-- 
cgit v1.2.3


From 70ae7ba818e9d8a5485653b258e76f06c988654c Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keithw@vmware.com>
Date: Tue, 30 Jun 2009 18:40:20 +0100
Subject: mesa/dlist: fixes and improvements for material caching

Only short-circuit material call if *all* statechanges from this call
are cached.  Some material calls (eg with FRONT_AND_BACK) change more
than one piece of state -- need to check all of them before returning.

Also, Material calls are legal inside begin/end pairs, so don't need
to be as careful about begin/end state as with regular statechanges
(like ShadeModel) when caching.  Take advantage of this and do better
caching.
---
 src/mesa/main/dlist.c | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 2af0dd3c59..c5a1c1f38f 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -5225,20 +5225,28 @@ save_Materialfv(GLenum face, GLenum pname, const GLfloat * param)
 
    bitmask = _mesa_material_bitmask(ctx, face, pname, ~0, NULL);
 
-   /* Try to eliminate redundant statechanges
+   /* Try to eliminate redundant statechanges.  Because it is legal to
+    * call glMaterial even inside begin/end calls, don't need to worry
+    * about ctx->Driver.CurrentSavePrimitive here.
     */
    for (i = 0; i < MAT_ATTRIB_MAX; i++) {
       if (bitmask & (1 << i)) {
-         if (ctx->Driver.CurrentSavePrimitive == PRIM_OUTSIDE_BEGIN_END && 
-             ctx->ListState.ActiveMaterialSize[i] == args &&
-             compare4fv(ctx->ListState.CurrentMaterial[i], param, args))
-            return;
-             
-         ctx->ListState.ActiveMaterialSize[i] = args;
-         COPY_SZ_4V(ctx->ListState.CurrentMaterial[i], args, param);
+         if (ctx->ListState.ActiveMaterialSize[i] == args &&
+             compare4fv(ctx->ListState.CurrentMaterial[i], param, args)) {
+            bitmask &= ~(1 << i);
+         }
+         else {
+            ctx->ListState.ActiveMaterialSize[i] = args;
+            COPY_SZ_4V(ctx->ListState.CurrentMaterial[i], args, param);
+         }
       }
    }
 
+   /* If this call has effect, return early:
+    */
+   if (bitmask == 0)
+      return;
+
    SAVE_FLUSH_VERTICES(ctx);
 
    n = ALLOC_INSTRUCTION(ctx, OPCODE_MATERIAL, 6);
-- 
cgit v1.2.3


From 058e96916b1ee661dfc16052b79b3aa9fcb47690 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Wed, 25 Feb 2009 11:57:44 -0800
Subject: Cap array elements at 0 when passed an invalid pointer for an array
 object.

Otherwise, a pointer greater than the size would underflow and give a large
maximum element.

Reviewed-by: Brian Paul <brianp@vmware.com> (previous version)
---
 src/mesa/main/state.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 7b41b8f4da..3b2c6ec618 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -75,6 +75,16 @@ compute_max_element(struct gl_client_array *array)
 {
    assert(array->Enabled);
    if (array->BufferObj->Name) {
+      GLsizeiptrARB offset = (GLsizeiptrARB) array->Ptr;
+      GLsizeiptrARB obj_size = (GLsizeiptrARB) array->BufferObj->Size;
+
+      if (offset < obj_size) {
+	 array->_MaxElement = (obj_size - offset +
+			       array->StrideB -
+			       array->_ElementSize) / array->StrideB;
+      } else {
+	 array->_MaxElement = 0;
+      }
       /* Compute the max element we can access in the VBO without going
        * out of bounds.
        */
-- 
cgit v1.2.3


From 4adc9b4a5be72e34d464ce341b011c42517d969a Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 5 May 2009 16:21:20 -0600
Subject: mesa: only use fallback texture when using shaders, not
 fixed-function (take two)

The semantics are a little different for shaders vs. fixed-function when
trying to use an incomplete texture.  The fallback texture returning
(0,0,0,1) should only be used with shaders.  For fixed function, the texture
unit is truly disabled/ignored.

Fixes glean fbo test regression.
(cherry picked from commit 01e16befd4809e3e93ee7855a4a5d7df9fe010d9)
(cherry picked from commit 51325f44d1e7e62b47795a79f8038d10dc5bc30b)
[anholt: squashed these two together from master, skipping the mess in between]
---
 src/mesa/main/texstate.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 89da4335a2..6e0c0c688a 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -561,13 +561,19 @@ update_texture_state( GLcontext *ctx )
       }
 
       if (!texUnit->_ReallyEnabled) {
-         /* If we get here it means the shader (or fixed-function state)
-          * is expecting a texture object, but there isn't one (or it's
-          * incomplete).  Use the fallback texture.
-          */
-         struct gl_texture_object *texObj = _mesa_get_fallback_texture(ctx);
-         texUnit->_ReallyEnabled = 1 << TEXTURE_2D_INDEX;
-         _mesa_reference_texobj(&texUnit->_Current, texObj);
+         if (fprog) {
+            /* If we get here it means the shader is expecting a texture
+             * object, but there isn't one (or it's incomplete).  Use the
+             * fallback texture.
+             */
+            struct gl_texture_object *texObj = _mesa_get_fallback_texture(ctx);
+            texUnit->_ReallyEnabled = 1 << TEXTURE_2D_INDEX;
+            _mesa_reference_texobj(&texUnit->_Current, texObj);
+         }
+         else {
+            /* fixed-function: texture unit is really disabled */
+            continue;
+         }
       }
 
       /* if we get here, we know this texture unit is enabled */
-- 
cgit v1.2.3


From fcd3572edf5eed47d87774150c2097e0d6245bd2 Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Mon, 22 Jun 2009 18:22:51 -0700
Subject: mesa: From float type modifier from values to large for singles

The values 2147483648.0 and 4294967294.0 are too larget to be stored in single
precision floats.  Forcing these to be singles causes bits to be lost, which
results in errors in some pixel transfer tests.

This fixes bug #22344.
(cherry picked from commit 70e72070fce6aa1e0918dcc62c1949465cee69f7)
---
 src/mesa/main/macros.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/macros.h b/src/mesa/main/macros.h
index 59def651a3..4ca7957ffa 100644
--- a/src/mesa/main/macros.h
+++ b/src/mesa/main/macros.h
@@ -83,28 +83,28 @@ extern GLfloat _mesa_ubyte_to_float_color_tab[256];
 
 
 /** Convert GLuint in [0,4294967295] to GLfloat in [0.0,1.0] */
-#define UINT_TO_FLOAT(U)    ((GLfloat) (U) * (1.0F / 4294967295.0F))
+#define UINT_TO_FLOAT(U)    ((GLfloat) (U) * (1.0F / 4294967295.0))
 
 /** Convert GLfloat in [0.0,1.0] to GLuint in [0,4294967295] */
-#define FLOAT_TO_UINT(X)    ((GLuint) ((X) * 4294967295.0F))
+#define FLOAT_TO_UINT(X)    ((GLuint) ((X) * 4294967295.0))
 
 
 /** Convert GLint in [-2147483648,2147483647] to GLfloat in [-1.0,1.0] */
-#define INT_TO_FLOAT(I)     ((2.0F * (I) + 1.0F) * (1.0F/4294967294.0F))
+#define INT_TO_FLOAT(I)     ((2.0F * (I) + 1.0F) * (1.0F/4294967294.0))
 
 /** Convert GLfloat in [-1.0,1.0] to GLint in [-2147483648,2147483647] */
 /* causes overflow:
-#define FLOAT_TO_INT(X)     ( (((GLint) (4294967294.0F * (X))) - 1) / 2 )
+#define FLOAT_TO_INT(X)     ( (((GLint) (4294967294.0 * (X))) - 1) / 2 )
 */
 /* a close approximation: */
-#define FLOAT_TO_INT(X)     ( (GLint) (2147483647.0F * (X)) )
+#define FLOAT_TO_INT(X)     ( (GLint) (2147483647.0 * (X)) )
 
 
 /** Convert GLint in [-2147483648,2147483647] to GLfloat in [-1.0,1.0], texture/fb data */
-#define INT_TO_FLOAT_TEX(I)    ((I) == -2147483648 ? -1.0F : (I) * (1.0F/2147483647.0F))
+#define INT_TO_FLOAT_TEX(I)    ((I) == -2147483648 ? -1.0F : (I) * (1.0F/2147483647.0))
 
 /** Convert GLfloat in [-1.0,1.0] to GLint in [-2147483648,2147483647], texture/fb data */
-#define FLOAT_TO_INT_TEX(X)    ( (GLint) (2147483647.0F * (X)) )
+#define FLOAT_TO_INT_TEX(X)    ( (GLint) (2147483647.0 * (X)) )
 
 
 #define BYTE_TO_UBYTE(b)   ((GLubyte) ((b) < 0 ? 0 : (GLubyte) (b)))
-- 
cgit v1.2.3


From e786ecbfb5ff6953d61d62099c8af445a6d99fb9 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 14 Jul 2009 07:47:19 -0600
Subject: mesa: regenerated enums.c file

---
 src/mesa/main/enums.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/enums.c b/src/mesa/main/enums.c
index 23648f6d1c..6e2adea636 100644
--- a/src/mesa/main/enums.c
+++ b/src/mesa/main/enums.c
@@ -958,8 +958,8 @@ LONGSTRING static const char enum_string_table[] =
    "GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV\0"
    "GL_MAX_VARYING_FLOATS\0"
    "GL_MAX_VARYING_FLOATS_ARB\0"
-   "GL_MAX_VERTEX_GENERIC_ATTRIBS\0"
-   "GL_MAX_VERTEX_GENERIC_ATTRIBS_ARB\0"
+   "GL_MAX_VERTEX_ATTRIBS\0"
+   "GL_MAX_VERTEX_ATTRIBS_ARB\0"
    "GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS\0"
    "GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB\0"
    "GL_MAX_VERTEX_UNIFORM_COMPONENTS\0"
@@ -5113,6 +5113,7 @@ const char *_mesa_lookup_prim_by_nr( int nr )
 }
 
 
+
 int _mesa_lookup_enum_by_name( const char *symbol )
 {
    enum_elt * f = NULL;
-- 
cgit v1.2.3


From 6ec955efafda961bc7789c22dbde9d3430fc270f Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 14 Jul 2009 07:58:22 -0600
Subject: mesa: regenerated enums.c file

---
 src/mesa/main/enums.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/enums.c b/src/mesa/main/enums.c
index 417cee8fb2..dff5544086 100644
--- a/src/mesa/main/enums.c
+++ b/src/mesa/main/enums.c
@@ -948,8 +948,8 @@ LONGSTRING static const char enum_string_table[] =
    "GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV\0"
    "GL_MAX_VARYING_FLOATS\0"
    "GL_MAX_VARYING_FLOATS_ARB\0"
-   "GL_MAX_VERTEX_GENERIC_ATTRIBS\0"
-   "GL_MAX_VERTEX_GENERIC_ATTRIBS_ARB\0"
+   "GL_MAX_VERTEX_ATTRIBS\0"
+   "GL_MAX_VERTEX_ATTRIBS_ARB\0"
    "GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS\0"
    "GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB\0"
    "GL_MAX_VERTEX_UNIFORM_COMPONENTS\0"
@@ -2772,8 +2772,8 @@ static const enum_elt all_enums[1820] =
    { 19417, 0x0000862E }, /* GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */
    { 19452, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS */
    { 19474, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS_ARB */
-   { 19500, 0x00008869 }, /* GL_MAX_VERTEX_GENERIC_ATTRIBS */
-   { 19522, 0x00008869 }, /* GL_MAX_VERTEX_GENERIC_ATTRIBS_ARB */
+   { 19500, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS */
+   { 19522, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS_ARB */
    { 19548, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
    { 19582, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
    { 19620, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
@@ -4733,7 +4733,7 @@ static const unsigned reduced_enums[1319] =
        317, /* GL_CURRENT_QUERY */
       1259, /* GL_QUERY_RESULT */
       1261, /* GL_QUERY_RESULT_AVAILABLE */
-       912, /* GL_MAX_VERTEX_GENERIC_ATTRIBS */
+       912, /* GL_MAX_VERTEX_ATTRIBS */
       1778, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
        368, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
        367, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
@@ -5081,6 +5081,7 @@ const char *_mesa_lookup_prim_by_nr( int nr )
 }
 
 
+
 int _mesa_lookup_enum_by_name( const char *symbol )
 {
    enum_elt * f = NULL;
-- 
cgit v1.2.3


From 9aca6769dfb934e15e848f938b7fb31345a8b3b2 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 14 Jul 2009 14:26:42 -0600
Subject: mesa: fix texture border color code for glPopAttrib()

The texture object's border color used to be stored as GLchan but it's
been GLfloat for a while now.
---
 src/mesa/main/attrib.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index a609199504..4d85d54bb9 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -849,7 +849,6 @@ pop_texture_group(GLcontext *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;
-         GLfloat bordColor[4];
          GLenum target;
 
          obj = &texstate->SavedObj[u][tgt];
@@ -875,12 +874,7 @@ pop_texture_group(GLcontext *ctx, struct texture_state *texstate)
 
          _mesa_BindTexture(target, obj->Name);
 
-         bordColor[0] = CHAN_TO_FLOAT(obj->BorderColor[0]);
-         bordColor[1] = CHAN_TO_FLOAT(obj->BorderColor[1]);
-         bordColor[2] = CHAN_TO_FLOAT(obj->BorderColor[2]);
-         bordColor[3] = CHAN_TO_FLOAT(obj->BorderColor[3]);
-
-         _mesa_TexParameterfv(target, GL_TEXTURE_BORDER_COLOR, bordColor);
+         _mesa_TexParameterfv(target, GL_TEXTURE_BORDER_COLOR, obj->BorderColor);
          _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);
-- 
cgit v1.2.3


From e5f63c403b767f9974e8eb5d412c012b8a69287f Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Tue, 2 Jun 2009 07:47:20 -0700
Subject: Fix state flag dependencies for fixed function fragment program
 updates.

I started looking into why _NEW_ARRAY punishes us, and while annotating
dependencies noticed that a bunch of dependencies were missing.
---
 src/mesa/main/state.c         |  2 +-
 src/mesa/main/texenvprogram.c | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 3b2c6ec618..9ba131bee5 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -547,7 +547,7 @@ _mesa_update_state_locked( GLcontext *ctx )
    /* Determine which state flags effect vertex/fragment program state */
    if (ctx->FragmentProgram._MaintainTexEnvProgram) {
       prog_flags |= (_NEW_TEXTURE | _NEW_FOG | _DD_NEW_SEPARATE_SPECULAR |
-		     _NEW_ARRAY);
+		     _NEW_ARRAY | _NEW_LIGHT | _NEW_POINT | _NEW_RENDERMODE);
    }
    if (ctx->VertexProgram._MaintainTnlProgram) {
       prog_flags |= (_NEW_ARRAY | _NEW_TEXTURE | _NEW_TEXTURE_MATRIX |
diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index b92ba2542d..a3f1246c98 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -261,6 +261,7 @@ static GLuint translate_tex_src_bit( GLbitfield bit )
  */
 static GLbitfield get_fp_input_mask( GLcontext *ctx )
 {
+   /* _NEW_PROGRAM */
    const GLboolean vertexShader = (ctx->Shader.CurrentProgram &&
                                    ctx->Shader.CurrentProgram->VertexProgram);
    const GLboolean vertexProgram = ctx->VertexProgram._Enabled;
@@ -274,22 +275,26 @@ static GLbitfield get_fp_input_mask( GLcontext *ctx )
       fp_inputs = ~0;
    }
    else if (ctx->RenderMode == GL_FEEDBACK) {
+      /* _NEW_RENDERMODE */
       fp_inputs = (FRAG_BIT_COL0 | FRAG_BIT_TEX0);
    }
    else if (!(vertexProgram || vertexShader) ||
             !ctx->VertexProgram._Current) {
       /* Fixed function vertex logic */
+      /* _NEW_ARRAY */
       GLbitfield varying_inputs = ctx->varying_vp_inputs;
 
       /* These get generated in the setup routine regardless of the
        * vertex program:
        */
+      /* _NEW_POINT */
       if (ctx->Point.PointSprite)
          varying_inputs |= FRAG_BITS_TEX_ANY;
 
       /* First look at what values may be computed by the generated
        * vertex program:
        */
+      /* _NEW_LIGHT */
       if (ctx->Light.Enabled) {
          fp_inputs |= FRAG_BIT_COL0;
 
@@ -297,6 +302,7 @@ static GLbitfield get_fp_input_mask( GLcontext *ctx )
             fp_inputs |= FRAG_BIT_COL1;
       }
 
+      /* _NEW_TEXTURE */
       fp_inputs |= (ctx->Texture._TexGenEnabled |
                     ctx->Texture._TexMatEnabled) << FRAG_ATTRIB_TEX0;
 
@@ -329,6 +335,7 @@ static GLbitfield get_fp_input_mask( GLcontext *ctx )
       /* These get generated in the setup routine regardless of the
        * vertex program:
        */
+      /* _NEW_POINT */
       if (ctx->Point.PointSprite)
          vp_outputs |= FRAG_BITS_TEX_ANY;
 
@@ -355,6 +362,7 @@ static void make_state_key( GLcontext *ctx,  struct state_key *key )
 
    memset(key, 0, sizeof(*key));
 
+   /* _NEW_TEXTURE */
    for (i = 0; i < ctx->Const.MaxTextureUnits; i++) {
       const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[i];
       GLenum format;
@@ -408,11 +416,13 @@ static void make_state_key( GLcontext *ctx,  struct state_key *key )
        }
    }
 
+   /* _DD_NEW_SEPARATE_SPECULAR */
    if (ctx->_TriangleCaps & DD_SEPARATE_SPECULAR) {
       key->separate_specular = 1;
       inputs_referenced |= FRAG_BIT_COL1;
    }
 
+   /* _NEW_FOG */
    if (ctx->Fog.Enabled) {
       key->fog_enabled = 1;
       key->fog_mode = translate_fog_mode(ctx->Fog.Mode);
-- 
cgit v1.2.3


From 6c9d8a6f24db3c947928d72521d5fd544841366e Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keithw@vmware.com>
Date: Tue, 14 Jul 2009 16:23:04 +0100
Subject: mesa: don't call getenv every time _mesa_error is called

Buggy apps can generate thousands of mesa_error calls.  Don't need
to keep calling getenv to retreive the same MESA_DEBUG string each
time.
---
 src/mesa/main/imports.c | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 3fb67083a2..b0e7d9d483 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -1081,22 +1081,25 @@ _mesa_problem( const GLcontext *ctx, const char *fmtString, ... )
 void
 _mesa_error( GLcontext *ctx, GLenum error, const char *fmtString, ... )
 {
-   const char *debugEnv;
-   GLboolean debug;
+   static GLint debug = -1;
 
-   debugEnv = _mesa_getenv("MESA_DEBUG");
+   /* Check debug environment variable only once:
+    */
+   if (debug == -1) {
+      const char *debugEnv = _mesa_getenv("MESA_DEBUG");
 
 #ifdef DEBUG
-   if (debugEnv && _mesa_strstr(debugEnv, "silent"))
-      debug = GL_FALSE;
-   else
-      debug = GL_TRUE;
+      if (debugEnv && _mesa_strstr(debugEnv, "silent"))
+         debug = GL_FALSE;
+      else
+         debug = GL_TRUE;
 #else
-   if (debugEnv)
-      debug = GL_TRUE;
-   else
-      debug = GL_FALSE;
+      if (debugEnv)
+         debug = GL_TRUE;
+      else
+         debug = GL_FALSE;
 #endif
+   }
 
    if (debug) {
       va_list args;
-- 
cgit v1.2.3


From df5f7a676182dc9d1d8c9c995a009b49bac971e8 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keithw@vmware.com>
Date: Tue, 14 Jul 2009 16:25:59 +0100
Subject: mesa: remove dead code in _mesa_error

Remove early and unused snprintf and where[] string.
---
 src/mesa/main/imports.c | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index b0e7d9d483..c35dcf5bd2 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -1102,14 +1102,8 @@ _mesa_error( GLcontext *ctx, GLenum error, const char *fmtString, ... )
    }
 
    if (debug) {
-      va_list args;
-      char where[MAXSTRING];
       const char *errstr;
 
-      va_start( args, fmtString );  
-      vsnprintf( where, MAXSTRING, fmtString, args );
-      va_end( args );
-
       switch (error) {
 	 case GL_NO_ERROR:
 	    errstr = "GL_NO_ERROR";
-- 
cgit v1.2.3


From 59de430de70c38a2fbe30208190f725a2901613c Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keithw@vmware.com>
Date: Tue, 14 Jul 2009 16:28:08 +0100
Subject: mesa: split out errorstring switch from _mesa_error

Move a chunk of code out of _mesa_error()
---
 src/mesa/main/imports.c | 62 +++++++++++++++++++++----------------------------
 1 file changed, 26 insertions(+), 36 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index c35dcf5bd2..3916c62eda 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -1065,6 +1065,31 @@ _mesa_problem( const GLcontext *ctx, const char *fmtString, ... )
    fprintf(stderr, "Please report at bugzilla.freedesktop.org\n");
 }
 
+static const char *error_string( GLenum error )
+{
+   switch (error) {
+   case GL_NO_ERROR:
+      return "GL_NO_ERROR";
+   case GL_INVALID_VALUE:
+      return "GL_INVALID_VALUE";
+   case GL_INVALID_ENUM:
+      return "GL_INVALID_ENUM";
+   case GL_INVALID_OPERATION:
+      return "GL_INVALID_OPERATION";
+   case GL_STACK_OVERFLOW:
+      return "GL_STACK_OVERFLOW";
+   case GL_STACK_UNDERFLOW:
+      return "GL_STACK_UNDERFLOW";
+   case GL_OUT_OF_MEMORY:
+      return "GL_OUT_OF_MEMORY";
+   case GL_TABLE_TOO_LARGE:
+      return "GL_TABLE_TOO_LARGE";
+   case GL_INVALID_FRAMEBUFFER_OPERATION_EXT:
+      return "GL_INVALID_FRAMEBUFFER_OPERATION";
+   default:
+      return "unknown";
+   }
+}
 
 /**
  * Record an OpenGL state error.  These usually occur when the user
@@ -1102,41 +1127,6 @@ _mesa_error( GLcontext *ctx, GLenum error, const char *fmtString, ... )
    }
 
    if (debug) {
-      const char *errstr;
-
-      switch (error) {
-	 case GL_NO_ERROR:
-	    errstr = "GL_NO_ERROR";
-	    break;
-	 case GL_INVALID_VALUE:
-	    errstr = "GL_INVALID_VALUE";
-	    break;
-	 case GL_INVALID_ENUM:
-	    errstr = "GL_INVALID_ENUM";
-	    break;
-	 case GL_INVALID_OPERATION:
-	    errstr = "GL_INVALID_OPERATION";
-	    break;
-	 case GL_STACK_OVERFLOW:
-	    errstr = "GL_STACK_OVERFLOW";
-	    break;
-	 case GL_STACK_UNDERFLOW:
-	    errstr = "GL_STACK_UNDERFLOW";
-	    break;
-	 case GL_OUT_OF_MEMORY:
-	    errstr = "GL_OUT_OF_MEMORY";
-	    break;
-         case GL_TABLE_TOO_LARGE:
-            errstr = "GL_TABLE_TOO_LARGE";
-            break;
-         case GL_INVALID_FRAMEBUFFER_OPERATION_EXT:
-            errstr = "GL_INVALID_FRAMEBUFFER_OPERATION";
-            break;
-	 default:
-	    errstr = "unknown";
-	    break;
-      }
-
       {
          char s[MAXSTRING], s2[MAXSTRING];
          va_list args;
@@ -1144,7 +1134,7 @@ _mesa_error( GLcontext *ctx, GLenum error, const char *fmtString, ... )
          vsnprintf(s, MAXSTRING, fmtString, args);
          va_end(args);
 
-         _mesa_snprintf(s2, MAXSTRING, "%s in %s", errstr, s);
+         _mesa_snprintf(s2, MAXSTRING, "%s in %s", error_string(error), s);
          output_if_debug("Mesa: User error", s2, GL_TRUE);
       }
    }
-- 
cgit v1.2.3


From fdeb77899052302053459b8a840a747346e30468 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keithw@vmware.com>
Date: Wed, 15 Jul 2009 13:29:58 +0100
Subject: mesa: recognize and eliminate repeated error messages

---
 src/mesa/main/imports.c | 34 +++++++++++++++++++++++++++++++---
 src/mesa/main/mtypes.h  |  7 +++++++
 2 files changed, 38 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 3916c62eda..1722579e82 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -1021,6 +1021,22 @@ output_if_debug(const char *prefixString, const char *outputString,
    }
 }
 
+static const char *error_string( GLenum error );
+
+static void flush_delayed_errors( GLcontext *ctx )
+{
+   char s2[MAXSTRING];
+
+   if (ctx->ErrorDebugCount) {
+      _mesa_snprintf(s2, MAXSTRING, "%d similar %s errors", 
+                     ctx->ErrorDebugCount,
+                     error_string(ctx->ErrorValue));
+
+      output_if_debug("Mesa: ", s2, GL_TRUE);
+
+      ctx->ErrorDebugCount = 0;
+   }
+}
 
 /**
  * Report a warning (a recoverable error condition) to stderr if
@@ -1034,10 +1050,12 @@ _mesa_warning( GLcontext *ctx, const char *fmtString, ... )
 {
    char str[MAXSTRING];
    va_list args;
-   (void) ctx;
    va_start( args, fmtString );  
    (void) vsnprintf( str, MAXSTRING, fmtString, args );
    va_end( args );
+   
+   if (ctx)
+      flush_delayed_errors( ctx );
 
    output_if_debug("Mesa warning", str, GL_TRUE);
 }
@@ -1126,16 +1144,26 @@ _mesa_error( GLcontext *ctx, GLenum error, const char *fmtString, ... )
 #endif
    }
 
-   if (debug) {
-      {
+   if (debug) {      
+      if (ctx->ErrorValue == error &&
+          ctx->ErrorDebugFmtString == fmtString) {
+         ctx->ErrorDebugCount++;
+      }
+      else {
          char s[MAXSTRING], s2[MAXSTRING];
          va_list args;
+
+         flush_delayed_errors( ctx );
+         
          va_start(args, fmtString);
          vsnprintf(s, MAXSTRING, fmtString, args);
          va_end(args);
 
          _mesa_snprintf(s2, MAXSTRING, "%s in %s", error_string(error), s);
          output_if_debug("Mesa: User error", s2, GL_TRUE);
+         
+         ctx->ErrorDebugFmtString = fmtString;
+         ctx->ErrorDebugCount = 0;
       }
    }
 
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index bdaa4977b7..3b0ebcb7ae 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2955,6 +2955,13 @@ struct __GLcontextRec
 #endif
 
    GLenum ErrorValue;        /**< Last error code */
+
+   /**
+    * Recognize and silence repeated error debug messages in buggy apps.
+    */
+   const char *ErrorDebugFmtString;
+   GLuint ErrorDebugCount;
+
    GLenum RenderMode;        /**< either GL_RENDER, GL_SELECT, GL_FEEDBACK */
    GLbitfield NewState;      /**< bitwise-or of _NEW_* flags */
 
-- 
cgit v1.2.3


From d970313b66b3aab3e3d12c65882febcc7c9091a8 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 15 Jul 2009 11:12:05 -0600
Subject: Fix state flag dependencies for fixed function fragment program
 updates.

I started looking into why _NEW_ARRAY punishes us, and while annotating
dependencies noticed that a bunch of dependencies were missing.

(cherry picked from master, commit e5f63c403b767f9974e8eb5d412c012b8a69287f)
---
 src/mesa/main/state.c         |  2 +-
 src/mesa/main/texenvprogram.c | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 94e37e3dab..1d3758a302 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -502,7 +502,7 @@ _mesa_update_state_locked( GLcontext *ctx )
    /* Determine which state flags effect vertex/fragment program state */
    if (ctx->FragmentProgram._MaintainTexEnvProgram) {
       prog_flags |= (_NEW_TEXTURE | _NEW_FOG | _DD_NEW_SEPARATE_SPECULAR |
-		     _NEW_ARRAY);
+		     _NEW_ARRAY | _NEW_LIGHT | _NEW_POINT | _NEW_RENDERMODE);
    }
    if (ctx->VertexProgram._MaintainTnlProgram) {
       prog_flags |= (_NEW_ARRAY | _NEW_TEXTURE | _NEW_TEXTURE_MATRIX |
diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index b92ba2542d..a3f1246c98 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -261,6 +261,7 @@ static GLuint translate_tex_src_bit( GLbitfield bit )
  */
 static GLbitfield get_fp_input_mask( GLcontext *ctx )
 {
+   /* _NEW_PROGRAM */
    const GLboolean vertexShader = (ctx->Shader.CurrentProgram &&
                                    ctx->Shader.CurrentProgram->VertexProgram);
    const GLboolean vertexProgram = ctx->VertexProgram._Enabled;
@@ -274,22 +275,26 @@ static GLbitfield get_fp_input_mask( GLcontext *ctx )
       fp_inputs = ~0;
    }
    else if (ctx->RenderMode == GL_FEEDBACK) {
+      /* _NEW_RENDERMODE */
       fp_inputs = (FRAG_BIT_COL0 | FRAG_BIT_TEX0);
    }
    else if (!(vertexProgram || vertexShader) ||
             !ctx->VertexProgram._Current) {
       /* Fixed function vertex logic */
+      /* _NEW_ARRAY */
       GLbitfield varying_inputs = ctx->varying_vp_inputs;
 
       /* These get generated in the setup routine regardless of the
        * vertex program:
        */
+      /* _NEW_POINT */
       if (ctx->Point.PointSprite)
          varying_inputs |= FRAG_BITS_TEX_ANY;
 
       /* First look at what values may be computed by the generated
        * vertex program:
        */
+      /* _NEW_LIGHT */
       if (ctx->Light.Enabled) {
          fp_inputs |= FRAG_BIT_COL0;
 
@@ -297,6 +302,7 @@ static GLbitfield get_fp_input_mask( GLcontext *ctx )
             fp_inputs |= FRAG_BIT_COL1;
       }
 
+      /* _NEW_TEXTURE */
       fp_inputs |= (ctx->Texture._TexGenEnabled |
                     ctx->Texture._TexMatEnabled) << FRAG_ATTRIB_TEX0;
 
@@ -329,6 +335,7 @@ static GLbitfield get_fp_input_mask( GLcontext *ctx )
       /* These get generated in the setup routine regardless of the
        * vertex program:
        */
+      /* _NEW_POINT */
       if (ctx->Point.PointSprite)
          vp_outputs |= FRAG_BITS_TEX_ANY;
 
@@ -355,6 +362,7 @@ static void make_state_key( GLcontext *ctx,  struct state_key *key )
 
    memset(key, 0, sizeof(*key));
 
+   /* _NEW_TEXTURE */
    for (i = 0; i < ctx->Const.MaxTextureUnits; i++) {
       const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[i];
       GLenum format;
@@ -408,11 +416,13 @@ static void make_state_key( GLcontext *ctx,  struct state_key *key )
        }
    }
 
+   /* _DD_NEW_SEPARATE_SPECULAR */
    if (ctx->_TriangleCaps & DD_SEPARATE_SPECULAR) {
       key->separate_specular = 1;
       inputs_referenced |= FRAG_BIT_COL1;
    }
 
+   /* _NEW_FOG */
    if (ctx->Fog.Enabled) {
       key->fog_enabled = 1;
       key->fog_mode = translate_fog_mode(ctx->Fog.Mode);
-- 
cgit v1.2.3


From 9cea84b6b5f96bf3bb42546e49b76024d7126e30 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Thu, 16 Jul 2009 18:41:03 -0700
Subject: texenv: Calculate whether we need to do secondary color on our own.

The _TriangleCaps bit is deprecated, not updated when we require, and
is set based on state that hasn't been updated at that point in
_mesa_update_state_locked().

Fixes incorrect clear color in glsl/twoside.c with meta_clear_tris.
---
 src/mesa/main/state.c         |  2 +-
 src/mesa/main/texenvprogram.c | 18 +++++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 9ba131bee5..d8191ab518 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -546,7 +546,7 @@ _mesa_update_state_locked( GLcontext *ctx )
 
    /* Determine which state flags effect vertex/fragment program state */
    if (ctx->FragmentProgram._MaintainTexEnvProgram) {
-      prog_flags |= (_NEW_TEXTURE | _NEW_FOG | _DD_NEW_SEPARATE_SPECULAR |
+      prog_flags |= (_NEW_TEXTURE | _NEW_FOG |
 		     _NEW_ARRAY | _NEW_LIGHT | _NEW_POINT | _NEW_RENDERMODE);
    }
    if (ctx->VertexProgram._MaintainTnlProgram) {
diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index a3f1246c98..6b090ff399 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -62,6 +62,18 @@ struct texenvprog_cache_item
    struct texenvprog_cache_item *next;
 };
 
+static GLboolean
+texenv_doing_secondary_color(GLcontext *ctx)
+{
+   if (ctx->Light.Enabled &&
+       (ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR))
+      return GL_TRUE;
+
+   if (ctx->Fog.ColorSumEnabled)
+      return GL_TRUE;
+
+   return GL_FALSE;
+}
 
 /**
  * Up to nine instructions per tex unit, plus fog, specular color.
@@ -298,7 +310,7 @@ static GLbitfield get_fp_input_mask( GLcontext *ctx )
       if (ctx->Light.Enabled) {
          fp_inputs |= FRAG_BIT_COL0;
 
-         if (ctx->_TriangleCaps & DD_SEPARATE_SPECULAR)
+         if (texenv_doing_secondary_color(ctx))
             fp_inputs |= FRAG_BIT_COL1;
       }
 
@@ -416,8 +428,8 @@ static void make_state_key( GLcontext *ctx,  struct state_key *key )
        }
    }
 
-   /* _DD_NEW_SEPARATE_SPECULAR */
-   if (ctx->_TriangleCaps & DD_SEPARATE_SPECULAR) {
+   /* _NEW_LIGHT | _NEW_FOG */
+   if (texenv_doing_secondary_color(ctx)) {
       key->separate_specular = 1;
       inputs_referenced |= FRAG_BIT_COL1;
    }
-- 
cgit v1.2.3


From 71b9e102913753bc5af23c774641d6a6dda184d9 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 17 Jul 2009 12:40:44 -0600
Subject: mesa: set version to 7.5

---
 src/mesa/main/version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index 52ee324d17..ba027465d4 100644
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -31,7 +31,7 @@
 #define MESA_MAJOR 7
 #define MESA_MINOR 5
 #define MESA_PATCH 0
-#define MESA_VERSION_STRING "7.5-rc4"
+#define MESA_VERSION_STRING "7.5"
 
 /* To make version comparison easy */
 #define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
-- 
cgit v1.2.3


From 9c4b877519f73f46eac35885d3b8801753168e14 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 22 Jul 2009 12:46:53 -0600
Subject: mesa: bump version to 7.5.1

---
 Makefile                | 2 +-
 configs/default         | 2 +-
 src/mesa/main/version.h | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/mesa/main')

diff --git a/Makefile b/Makefile
index 3c83160687..9ac45bd93f 100644
--- a/Makefile
+++ b/Makefile
@@ -182,7 +182,7 @@ ultrix-gcc:
 
 # Rules for making release tarballs
 
-VERSION=7.5
+VERSION=7.5.1
 DIRECTORY = Mesa-$(VERSION)
 LIB_NAME = MesaLib-$(VERSION)
 DEMO_NAME = MesaDemos-$(VERSION)
diff --git a/configs/default b/configs/default
index b5ef80afb3..2981bb9a8f 100644
--- a/configs/default
+++ b/configs/default
@@ -10,7 +10,7 @@ CONFIG_NAME = default
 # Version info
 MESA_MAJOR=7
 MESA_MINOR=5
-MESA_TINY=0
+MESA_TINY=1
 MESA_VERSION = $(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY)
 
 # external projects.  This should be useless now that we use libdrm.
diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index ba027465d4..50c1143ccc 100644
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.5
+ * Version:  7.5.1
  *
- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2009  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -30,8 +30,8 @@
 /* Mesa version */
 #define MESA_MAJOR 7
 #define MESA_MINOR 5
-#define MESA_PATCH 0
-#define MESA_VERSION_STRING "7.5"
+#define MESA_PATCH 1
+#define MESA_VERSION_STRING "7.5.1"
 
 /* To make version comparison easy */
 #define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
-- 
cgit v1.2.3


From 0ad9eba333bd80cf83f728390c8cd6c573ed446d Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 27 Jul 2009 15:09:56 -0600
Subject: mesa: separate some finite/pragma Watcom stuff

---
 src/mesa/main/compiler.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h
index e79bbc2ac5..9319505a75 100644
--- a/src/mesa/main/compiler.h
+++ b/src/mesa/main/compiler.h
@@ -110,10 +110,8 @@ extern "C" {
 #if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__) && !defined(BUILD_FOR_SNAP)
 #  define __WIN32__
 #  define finite _finite
-#endif
-#if defined(__WATCOMC__)
+#elif defined(__WATCOMC__)
 #  define finite _finite
-#  pragma disable_message(201) /* Disable unreachable code warnings */
 #endif
 
 
@@ -135,6 +133,10 @@ extern "C" {
 #    endif
 #  endif
 #endif
+#if defined(__WATCOMC__)
+#  pragma disable_message(201) /* Disable unreachable code warnings */
+#endif
+
 
 
 /**
-- 
cgit v1.2.3


From 9d0b8d72d8d704ff4d8e10448b60cbb42f07eecb Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 29 Jul 2009 20:07:41 -0600
Subject: mesa: add new FRAG_ATTRIB_FACE and FRAG_ATTRIB_PNTC fragment program
 inputs

Previously, the FOGC attribute contained the fragment fog coord, front/back-
face flag and the gl_PointCoord.xy values.  Now each of those things are
separate fragment program attributes.  This simplifies quite a few things in
Mesa and gallium.

Need to test i965 driver and fix up point coord handling in the gallium/draw
module...
---
 src/mesa/drivers/dri/i965/brw_wm_fp.c    | 61 ++++++++++++++++++--------------
 src/mesa/main/mtypes.h                   |  9 ++---
 src/mesa/shader/arbprogparse.c           |  7 ----
 src/mesa/shader/programopt.c             |  1 -
 src/mesa/shader/slang/slang_codegen.c    |  4 +--
 src/mesa/shader/slang/slang_link.c       | 14 --------
 src/mesa/state_tracker/st_atom_shader.c  | 17 ---------
 src/mesa/state_tracker/st_mesa_to_tgsi.c | 21 -----------
 src/mesa/state_tracker/st_program.c      | 42 ++++++++--------------
 src/mesa/swrast/s_fragprog.c             |  5 ++-
 src/mesa/swrast/s_points.c               | 26 +++++++-------
 11 files changed, 69 insertions(+), 138 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/i965/brw_wm_fp.c b/src/mesa/drivers/dri/i965/brw_wm_fp.c
index b9e8dd2e96..606baab967 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_fp.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_fp.c
@@ -376,14 +376,6 @@ static void emit_interp( struct brw_wm_compile *c,
       }
       break;
    case FRAG_ATTRIB_FOGC:
-      /* The FOGC input is really special.  When a program uses glFogFragCoord,
-       * the results returned are supposed to be (f,0,0,1).  But for Mesa GLSL,
-       * the glFrontFacing and glPointCoord values are also stashed in FOGC.
-       * So, write the interpolated fog value to X, then either 0, 1, or the
-       * stashed values to Y, Z, W.  Note that this means that
-       * glFogFragCoord.yzw can be wrong in those cases!
-       */
-
       /* Interpolate the fog coordinate */
       emit_op(c,
 	      WM_PINTERP,
@@ -393,26 +385,40 @@ static void emit_interp( struct brw_wm_compile *c,
 	      deltas,
 	      get_pixel_w(c));
 
-      /* Move the front facing value into FOGC.y if it's needed. */
-      if (c->fp->program.UsesFrontFacing) {
-	 emit_op(c,
-		 WM_FRONTFACING,
-		 dst_mask(dst, WRITEMASK_Y),
-		 0,
-		 src_undef(),
-		 src_undef(),
-		 src_undef());
-      } else {
-	 emit_op(c,
-		 OPCODE_MOV,
-		 dst_mask(dst, WRITEMASK_Y),
-		 0,
-		 src_swizzle1(interp, SWIZZLE_ZERO),
-		 src_undef(),
-		 src_undef());
-      }
+      emit_op(c,
+	      OPCODE_MOV,
+	      dst_mask(dst, WRITEMASK_YZW),
+	      0,
+	      src_swizzle(interp,
+			  SWIZZLE_ZERO,
+			  SWIZZLE_ZERO,
+			  SWIZZLE_ZERO,
+			  SWIZZLE_ONE),
+	      src_undef(),
+	      src_undef());
+      break;
+
+   case FRAG_ATTRIB_FACE:
+      /* XXX review/test this case */
+      emit_op(c,
+              WM_FRONTFACING,
+              dst_mask(dst, WRITEMASK_X),
+              0,
+              src_undef(),
+              src_undef(),
+              src_undef());
+      break;
+
+   case FRAG_ATTRIB_PNTC:
+      /* XXX review/test this case */
+      emit_op(c,
+	      WM_PINTERP,
+	      dst_mask(dst, WRITEMASK_XY),
+	      0,
+	      interp,
+	      deltas,
+	      get_pixel_w(c));
 
-      /* Should do the PointCoord thing here. */
       emit_op(c,
 	      OPCODE_MOV,
 	      dst_mask(dst, WRITEMASK_ZW),
@@ -425,6 +431,7 @@ static void emit_interp( struct brw_wm_compile *c,
 	      src_undef(),
 	      src_undef());
       break;
+
    default:
       emit_op(c,
 	      WM_PINTERP,
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index d0309f5e90..da01c58c2d 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -227,7 +227,9 @@ typedef enum
    FRAG_ATTRIB_TEX5 = 9,
    FRAG_ATTRIB_TEX6 = 10,
    FRAG_ATTRIB_TEX7 = 11,
-   FRAG_ATTRIB_VAR0 = 12,  /**< shader varying */
+   FRAG_ATTRIB_FACE = 12,  /**< front/back face */
+   FRAG_ATTRIB_PNTC = 13,  /**< sprite/point coord */
+   FRAG_ATTRIB_VAR0 = 14,  /**< shader varying */
    FRAG_ATTRIB_MAX = (FRAG_ATTRIB_VAR0 + MAX_VARYING)
 } gl_frag_attrib;
 
@@ -239,6 +241,8 @@ typedef enum
 #define FRAG_BIT_COL0  (1 << FRAG_ATTRIB_COL0)
 #define FRAG_BIT_COL1  (1 << FRAG_ATTRIB_COL1)
 #define FRAG_BIT_FOGC  (1 << FRAG_ATTRIB_FOGC)
+#define FRAG_BIT_FACE  (1 << FRAG_ATTRIB_FACE)
+#define FRAG_BIT_PNTC  (1 << FRAG_ATTRIB_PNTC)
 #define FRAG_BIT_TEX0  (1 << FRAG_ATTRIB_TEX0)
 #define FRAG_BIT_TEX1  (1 << FRAG_ATTRIB_TEX1)
 #define FRAG_BIT_TEX2  (1 << FRAG_ATTRIB_TEX2)
@@ -1834,9 +1838,6 @@ struct gl_fragment_program
    struct gl_program Base;   /**< base class */
    GLenum FogOption;
    GLboolean UsesKill;          /**< shader uses KIL instruction */
-   GLboolean UsesPointCoord;    /**< shader uses gl_PointCoord */
-   GLboolean UsesFrontFacing;   /**< shader used gl_FrontFacing */
-   GLboolean UsesFogFragCoord;  /**< shader used gl_FogFragCoord */
 };
 
 
diff --git a/src/mesa/shader/arbprogparse.c b/src/mesa/shader/arbprogparse.c
index bc65aba39a..f428ee541b 100644
--- a/src/mesa/shader/arbprogparse.c
+++ b/src/mesa/shader/arbprogparse.c
@@ -3974,13 +3974,6 @@ _mesa_parse_arb_fragment_program(GLcontext* ctx, GLenum target,
    if (program->FogOption)
       program->Base.InputsRead |= FRAG_BIT_FOGC;
 
-   /* XXX: assume that ARB fragment programs don't have access to the
-    * FrontFacing and PointCoord values stuffed into the fog
-    * coordinate in GLSL shaders.
-    */
-   if (program->Base.InputsRead & FRAG_BIT_FOGC)
-      program->UsesFogFragCoord = GL_TRUE;
-      
    if (program->Base.Instructions)
       _mesa_free(program->Base.Instructions);
    program->Base.Instructions = ap.Base.Instructions;
diff --git a/src/mesa/shader/programopt.c b/src/mesa/shader/programopt.c
index ac5fe0f691..f70c75cec8 100644
--- a/src/mesa/shader/programopt.c
+++ b/src/mesa/shader/programopt.c
@@ -396,7 +396,6 @@ _mesa_append_fog_code(GLcontext *ctx, struct gl_fragment_program *fprog)
    fprog->Base.Instructions = newInst;
    fprog->Base.NumInstructions = inst - newInst;
    fprog->Base.InputsRead |= FRAG_BIT_FOGC;
-   fprog->UsesFogFragCoord = GL_TRUE;
    /* XXX do this?  fprog->FogOption = GL_NONE; */
 }
 
diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c
index 2b7e781f98..4fe68eafa7 100644
--- a/src/mesa/shader/slang/slang_codegen.c
+++ b/src/mesa/shader/slang/slang_codegen.c
@@ -381,8 +381,8 @@ _slang_input_index(const char *name, GLenum target, GLuint *swizzleOut)
       { "gl_TexCoord", FRAG_ATTRIB_TEX0, SWIZZLE_NOOP },
       /* note: we're packing several quantities into the fogcoord vector */
       { "gl_FogFragCoord", FRAG_ATTRIB_FOGC, SWIZZLE_XXXX },
-      { "gl_FrontFacing", FRAG_ATTRIB_FOGC, SWIZZLE_YYYY }, /*XXX*/
-      { "gl_PointCoord", FRAG_ATTRIB_FOGC, SWIZZLE_ZWWW },
+      { "gl_PointCoord", FRAG_ATTRIB_PNTC, SWIZZLE_XYZW },
+      { "gl_FrontFacing", FRAG_ATTRIB_FACE, SWIZZLE_XXXX },
       { NULL, 0, SWIZZLE_NOOP }
    };
    GLuint i;
diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c
index f6032d1e9a..6c19fc895b 100644
--- a/src/mesa/shader/slang/slang_link.c
+++ b/src/mesa/shader/slang/slang_link.c
@@ -484,20 +484,6 @@ _slang_update_inputs_outputs(struct gl_program *prog)
       for (j = 0; j < numSrc; j++) {
          if (inst->SrcReg[j].File == PROGRAM_INPUT) {
             prog->InputsRead |= 1 << inst->SrcReg[j].Index;
-            if (prog->Target == GL_FRAGMENT_PROGRAM_ARB &&
-                inst->SrcReg[j].Index == FRAG_ATTRIB_FOGC) {
-               /* The fragment shader FOGC input is used for fog,
-                * front-facing and sprite/point coord.
-                */
-               struct gl_fragment_program *fp = fragment_program(prog);
-               const GLint swz = GET_SWZ(inst->SrcReg[j].Swizzle, 0);
-               if (swz == SWIZZLE_X)
-                  fp->UsesFogFragCoord = GL_TRUE;
-               else if (swz == SWIZZLE_Y)
-                  fp->UsesFrontFacing = GL_TRUE;
-               else if (swz == SWIZZLE_Z || swz == SWIZZLE_W)
-                  fp->UsesPointCoord = GL_TRUE;
-            }
          }
          else if (inst->SrcReg[j].File == PROGRAM_ADDRESS) {
             maxAddrReg = MAX2(maxAddrReg, (GLuint) (inst->SrcReg[j].Index + 1));
diff --git a/src/mesa/state_tracker/st_atom_shader.c b/src/mesa/state_tracker/st_atom_shader.c
index 8b3bb5cc03..ee649be885 100644
--- a/src/mesa/state_tracker/st_atom_shader.c
+++ b/src/mesa/state_tracker/st_atom_shader.c
@@ -139,23 +139,6 @@ find_translated_vp(struct st_context *st,
          if (fragInputsRead & (1 << inAttr)) {
             stfp->input_to_slot[inAttr] = numIn;
             numIn++;
-            if (((1 << inAttr) & FRAG_BIT_FOGC)) {
-               /* leave placeholders for the
-                * extra registers we extract from fog */
-               if (stfp->Base.UsesFrontFacing) {
-                  if (!stfp->Base.UsesFogFragCoord)
-                     --stfp->input_to_slot[inAttr];
-                  else
-                     ++numIn;
-               }
-               if (stfp->Base.UsesPointCoord) {
-                  if (!stfp->Base.UsesFrontFacing &&
-                      !stfp->Base.UsesFogFragCoord)
-                     stfp->input_to_slot[inAttr] -= 2;
-                  else
-                     ++numIn;
-               }
-            }
          }
          else {
             stfp->input_to_slot[inAttr] = UNUSED;
diff --git a/src/mesa/state_tracker/st_mesa_to_tgsi.c b/src/mesa/state_tracker/st_mesa_to_tgsi.c
index 6380cd6b2a..210ca82c42 100644
--- a/src/mesa/state_tracker/st_mesa_to_tgsi.c
+++ b/src/mesa/state_tracker/st_mesa_to_tgsi.c
@@ -112,27 +112,6 @@ map_register_file_index(
 {
    switch( file ) {
    case TGSI_FILE_INPUT:
-      if (procType == TGSI_PROCESSOR_FRAGMENT &&
-          index == FRAG_ATTRIB_FOGC) {
-         if (GET_SWZ(*swizzle, 0) == SWIZZLE_X) {
-            /* do nothing we're, ok */
-         } else if (GET_SWZ(*swizzle, 0) == SWIZZLE_Y) {
-            /* replace the swizzle with xxxx */
-            *swizzle = MAKE_SWIZZLE4(SWIZZLE_X,
-                                     SWIZZLE_X,
-                                     SWIZZLE_X,
-                                     SWIZZLE_X);
-            /* register after fog */
-            return inputMapping[index] + 1;
-         } else {
-            *swizzle = MAKE_SWIZZLE4(SWIZZLE_Z,
-                                     SWIZZLE_W,
-                                     SWIZZLE_Z,
-                                     SWIZZLE_W);
-            /* register after frontface */
-            return inputMapping[index] + 2;
-         }
-      }
       /* inputs are mapped according to the user-defined map */
       return inputMapping[index];
 
diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c
index 806e0ca8f6..d2da20ae42 100644
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -458,34 +458,20 @@ st_translate_fragment_program(struct st_context *st,
             stfp->input_semantic_index[slot] = 1;
             interpMode[slot] = TGSI_INTERPOLATE_LINEAR;
             break;
-         case FRAG_ATTRIB_FOGC: {
-            int extra_decls = 0;
-            if (stfp->Base.UsesFogFragCoord) {
-               stfp->input_semantic_name[slot] = TGSI_SEMANTIC_FOG;
-               stfp->input_semantic_index[slot] = 0;
-               interpMode[slot] = TGSI_INTERPOLATE_PERSPECTIVE;
-               input_flags[slot] = stfp->Base.Base.InputFlags[attr];
-               ++extra_decls;
-	    }
-            if (stfp->Base.UsesFrontFacing) {
-               GLint idx = slot + extra_decls;
-               stfp->input_semantic_name[idx] = TGSI_SEMANTIC_FACE;
-               stfp->input_semantic_index[idx] = 0;
-               interpMode[idx] = TGSI_INTERPOLATE_CONSTANT;
-               input_flags[idx] = stfp->Base.Base.InputFlags[attr];
-               ++extra_decls;
-            }
-            if (stfp->Base.UsesPointCoord) {
-               GLint idx = slot + extra_decls;
-               stfp->input_semantic_name[idx] = TGSI_SEMANTIC_GENERIC;
-               stfp->input_semantic_index[idx] = num_generic++;
-               interpMode[idx] = TGSI_INTERPOLATE_PERSPECTIVE;
-               input_flags[idx] = stfp->Base.Base.InputFlags[attr];
-               ++extra_decls;
-            }
-            fs_num_inputs += extra_decls - 1;
-            continue;
-         }
+         case FRAG_ATTRIB_FOGC:
+            stfp->input_semantic_name[slot] = TGSI_SEMANTIC_FOG;
+            stfp->input_semantic_index[slot] = 0;
+            interpMode[slot] = TGSI_INTERPOLATE_PERSPECTIVE;
+            break;
+         case FRAG_ATTRIB_FACE:
+            stfp->input_semantic_name[slot] = TGSI_SEMANTIC_FACE;
+            stfp->input_semantic_index[slot] = num_generic++;
+            interpMode[slot] = TGSI_INTERPOLATE_CONSTANT;
+            break;
+         case FRAG_ATTRIB_PNTC:
+            stfp->input_semantic_name[slot] = TGSI_SEMANTIC_GENERIC;
+            stfp->input_semantic_index[slot] = num_generic++;
+            interpMode[slot] = TGSI_INTERPOLATE_PERSPECTIVE;
             break;
          case FRAG_ATTRIB_TEX0:
          case FRAG_ATTRIB_TEX1:
diff --git a/src/mesa/swrast/s_fragprog.c b/src/mesa/swrast/s_fragprog.c
index b71fb9eae9..613a91b0ec 100644
--- a/src/mesa/swrast/s_fragprog.c
+++ b/src/mesa/swrast/s_fragprog.c
@@ -157,9 +157,8 @@ init_machine(GLcontext *ctx, struct gl_program_machine *machine,
 
    /* if running a GLSL program (not ARB_fragment_program) */
    if (ctx->Shader.CurrentProgram) {
-      /* Store front/back facing value in register FOGC.Y */
-      machine->Attribs[FRAG_ATTRIB_FOGC][col][1] = 1.0 - span->facing;
-      /* Note FOGC.ZW is gl_PointCoord if drawing a sprite */
+      /* Store front/back facing value */
+      machine->Attribs[FRAG_ATTRIB_FACE][col][0] = 1.0 - span->facing;
    }
 
    machine->CurElement = col;
diff --git a/src/mesa/swrast/s_points.c b/src/mesa/swrast/s_points.c
index 0a3ad97a71..64c9cda516 100644
--- a/src/mesa/swrast/s_points.c
+++ b/src/mesa/swrast/s_points.c
@@ -139,7 +139,8 @@ sprite_point(GLcontext *ctx, const SWvertex *vert)
       }
 
       ATTRIB_LOOP_BEGIN
-         if (attr >= FRAG_ATTRIB_TEX0 && attr < FRAG_ATTRIB_VAR0) {
+         if ((attr >= FRAG_ATTRIB_TEX0 && attr <= FRAG_ATTRIB_TEX7) ||
+            attr >= FRAG_ATTRIB_VAR0) {
             const GLuint u = attr - FRAG_ATTRIB_TEX0;
             /* a texcoord */
             if (ctx->Point.CoordReplace[u]) {
@@ -170,15 +171,15 @@ sprite_point(GLcontext *ctx, const SWvertex *vert)
                continue;
             }
          }
-         else if (attr == FRAG_ATTRIB_FOGC) {
-            /* GLSL gl_PointCoord is stored in fog.zw */
-            span.attrStart[FRAG_ATTRIB_FOGC][2] = 0.0;
-            span.attrStart[FRAG_ATTRIB_FOGC][3] = 0.0; /* t0 set below */
-            span.attrStepX[FRAG_ATTRIB_FOGC][2] = dsdx;
-            span.attrStepX[FRAG_ATTRIB_FOGC][3] = 0.0;
-            span.attrStepY[FRAG_ATTRIB_FOGC][2] = 0.0;
-            span.attrStepY[FRAG_ATTRIB_FOGC][3] = dtdy;
-            tCoords[numTcoords++] = FRAG_ATTRIB_FOGC;
+         else if (attr == FRAG_ATTRIB_PNTC) {
+            /* GLSL gl_PointCoord.xy (.zw undefined) */
+            span.attrStart[FRAG_ATTRIB_PNTC][0] = 0.0;
+            span.attrStart[FRAG_ATTRIB_PNTC][1] = 0.0; /* t0 set below */
+            span.attrStepX[FRAG_ATTRIB_PNTC][0] = dsdx;
+            span.attrStepX[FRAG_ATTRIB_PNTC][1] = 0.0;
+            span.attrStepY[FRAG_ATTRIB_PNTC][0] = 0.0;
+            span.attrStepY[FRAG_ATTRIB_PNTC][1] = dtdy;
+            tCoords[numTcoords++] = FRAG_ATTRIB_PNTC;
             continue;
          }
          /* use vertex's texcoord/attrib */
@@ -221,10 +222,7 @@ sprite_point(GLcontext *ctx, const SWvertex *vert)
          GLuint i;
          /* setup texcoord T for this row */
          for (i = 0; i < numTcoords; i++) {
-            if (tCoords[i] == FRAG_ATTRIB_FOGC)
-               span.attrStart[FRAG_ATTRIB_FOGC][3] = tcoord;
-            else
-               span.attrStart[tCoords[i]][1] = tcoord;
+            span.attrStart[tCoords[i]][1] = tcoord;
          }
 
          /* these might get changed by span clipping */
-- 
cgit v1.2.3


From 9c9a9abd7b953ec9b6cfc52c2f6981c5d38b1691 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 30 Jul 2009 09:10:26 -0600
Subject: mesa: simplify _mesa_set_tex_image()

---
 src/mesa/main/teximage.c | 35 ++++++-----------------------------
 1 file changed, 6 insertions(+), 29 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 6e21066537..6e9073fa9f 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -679,37 +679,14 @@ _mesa_set_tex_image(struct gl_texture_object *tObj,
                     GLenum target, GLint level,
                     struct gl_texture_image *texImage)
 {
+   const GLuint face = _mesa_tex_target_to_face(target);
+
    ASSERT(tObj);
    ASSERT(texImage);
-   /* XXX simplify this with _mesa_tex_target_to_face() */
-   switch (target) {
-      case GL_TEXTURE_1D:
-      case GL_TEXTURE_2D:
-      case GL_TEXTURE_3D:
-      case GL_TEXTURE_1D_ARRAY_EXT:
-      case GL_TEXTURE_2D_ARRAY_EXT:
-         tObj->Image[0][level] = texImage;
-         break;
-      case GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB:
-      case GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB:
-      case GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB:
-      case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB:
-      case GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB:
-      case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB:
-         {
-            GLuint face = ((GLuint) target - 
-                           (GLuint) GL_TEXTURE_CUBE_MAP_POSITIVE_X);
-            tObj->Image[face][level] = texImage;
-         }
-         break;
-      case GL_TEXTURE_RECTANGLE_NV:
-         ASSERT(level == 0);
-         tObj->Image[0][level] = texImage;
-         break;
-      default:
-         _mesa_problem(NULL, "bad target in _mesa_set_tex_image()");
-         return;
-   }
+   ASSERT(target != GL_TEXTURE_RECTANGLE_NV || level == 0);
+
+   tObj->Image[face][level] = texImage;
+
    /* Set the 'back' pointer */
    texImage->TexObject = tObj;
 }
-- 
cgit v1.2.3


From c156eeb682d673e571c1798ff21e183ad4114fea Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 30 Jul 2009 09:24:01 -0600
Subject: mesa: simplify _mesa_select_tex_image()

---
 src/mesa/main/teximage.c | 64 +++++++-----------------------------------------
 1 file changed, 9 insertions(+), 55 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 6e9073fa9f..ae60b46d8a 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -841,74 +841,28 @@ _mesa_select_tex_object(GLcontext *ctx, const struct gl_texture_unit *texUnit,
 
 
 /**
- * Get the texture image struct which corresponds to target and level
- * of the given texture unit.
+ * Get a texture image pointer from a texture object, given a texture
+ * target and mipmap level.  The target and level parameters should
+ * have already been error-checked.
  *
  * \param ctx GL context.
  * \param texObj texture unit.
  * \param target texture target.
  * \param level image level.
  *
- * \return pointer to the texture image structure on success, or NULL on failure.
- *
- * \sa gl_texture_unit.
+ * \return pointer to the texture image structure, or NULL on failure.
  */
 struct gl_texture_image *
 _mesa_select_tex_image(GLcontext *ctx, const struct gl_texture_object *texObj,
 		       GLenum target, GLint level)
 {
-   ASSERT(texObj);
-
-   if (level < 0 || level >= MAX_TEXTURE_LEVELS) 
-      return NULL;
-
-   /* XXX simplify this with _mesa_tex_target_to_face() */
-   switch (target) {
-      case GL_TEXTURE_1D:
-      case GL_PROXY_TEXTURE_1D:
-      case GL_TEXTURE_2D:
-      case GL_PROXY_TEXTURE_2D:
-      case GL_TEXTURE_3D:
-      case GL_PROXY_TEXTURE_3D:
-         return texObj->Image[0][level];
-
-      case GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB:
-      case GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB:
-      case GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB:
-      case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB:
-      case GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB:
-      case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB: 
-         if (ctx->Extensions.ARB_texture_cube_map) {
-	    GLuint face = ((GLuint) target - 
-			   (GLuint) GL_TEXTURE_CUBE_MAP_POSITIVE_X);
-            return texObj->Image[face][level];
-	 }
-         else
-            return NULL;
-
-      case GL_PROXY_TEXTURE_CUBE_MAP_ARB:
-         if (ctx->Extensions.ARB_texture_cube_map)
-            return texObj->Image[0][level];
-         else
-            return NULL;
-
-      case GL_TEXTURE_RECTANGLE_NV:
-      case GL_PROXY_TEXTURE_RECTANGLE_NV:
-         if (ctx->Extensions.NV_texture_rectangle && level == 0) 
-            return texObj->Image[0][level];
-         else 
-            return NULL;
+   const GLuint face = _mesa_tex_target_to_face(target);
 
-      case GL_TEXTURE_1D_ARRAY_EXT:
-      case GL_PROXY_TEXTURE_1D_ARRAY_EXT:
-      case GL_TEXTURE_2D_ARRAY_EXT:
-      case GL_PROXY_TEXTURE_2D_ARRAY_EXT:
-         return (ctx->Extensions.MESA_texture_array)
-            ? texObj->Image[0][level] : NULL;
+   ASSERT(texObj);
+   ASSERT(level >= 0);
+   ASSERT(level < MAX_TEXTURE_LEVELS);
 
-      default:
-         return NULL;
-   }
+   return texObj->Image[face][level];
 }
 
 
-- 
cgit v1.2.3


From 25be043940b25a5fe6eb8058070b3e8f12e92039 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 30 Jul 2009 09:50:36 -0600
Subject: mesa: refactor glGetTexImage error checking code

---
 src/mesa/main/teximage.c | 194 ++++++++++++++++++++++++++---------------------
 1 file changed, 108 insertions(+), 86 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index ae60b46d8a..109fe0e052 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -1,6 +1,6 @@
 /*
  * mesa 3-D graphics library
- * Version:  7.5
+ * Version:  7.6
  *
  * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
@@ -2192,142 +2192,164 @@ copytexsubimage_error_check2( GLcontext *ctx, GLuint dimensions,
 
 
 /**
- * Get texture image.  Called by glGetTexImage.
- *
- * \param target texture target.
- * \param level image level.
- * \param format pixel data format for returned image.
- * \param type pixel data type for returned image.
- * \param pixels returned pixel data.
+ * Do error checking for a glGetTexImage() call.
+ * \return GL_TRUE if any error, GL_FALSE if no errors.
  */
-void GLAPIENTRY
-_mesa_GetTexImage( GLenum target, GLint level, GLenum format,
-                   GLenum type, GLvoid *pixels )
+static GLboolean
+getteximage_error_check(GLcontext *ctx, GLenum target, GLint level,
+                        GLenum format, GLenum type, GLvoid *pixels )
 {
    const struct gl_texture_unit *texUnit;
    struct gl_texture_object *texObj;
    struct gl_texture_image *texImage;
-   GLint maxLevels = 0;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   texUnit = &(ctx->Texture.Unit[ctx->Texture.CurrentUnit]);
-   texObj = _mesa_select_tex_object(ctx, texUnit, target);
-   if (!texObj || _mesa_is_proxy_texture(target)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(target)");
-      return;
-   }
+   const GLuint maxLevels = _mesa_max_texture_levels(ctx, target);
 
-   maxLevels = _mesa_max_texture_levels(ctx, target);
    ASSERT(maxLevels > 0);  /* 0 indicates bad target, caught above */
 
    if (level < 0 || level >= maxLevels) {
       _mesa_error( ctx, GL_INVALID_VALUE, "glGetTexImage(level)" );
-      return;
+      return GL_TRUE;
    }
 
    if (_mesa_sizeof_packed_type(type) <= 0) {
       _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexImage(type)" );
-      return;
+      return GL_TRUE;
    }
 
    if (_mesa_components_in_format(format) <= 0 ||
        format == GL_STENCIL_INDEX) {
       _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexImage(format)" );
-      return;
+      return GL_TRUE;
    }
 
    if (!ctx->Extensions.EXT_paletted_texture && is_index_format(format)) {
       _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(format)");
-      return;
+      return GL_TRUE;
    }
 
    if (!ctx->Extensions.ARB_depth_texture && is_depth_format(format)) {
       _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(format)");
-      return;
+      return GL_TRUE;
    }
 
    if (!ctx->Extensions.MESA_ycbcr_texture && is_ycbcr_format(format)) {
       _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(format)");
-      return;
+      return GL_TRUE;
    }
 
    if (!ctx->Extensions.EXT_packed_depth_stencil
        && is_depthstencil_format(format)) {
       _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(format)");
-      return;
+      return GL_TRUE;
    }
 
    if (!ctx->Extensions.ATI_envmap_bumpmap
        && is_dudv_format(format)) {
       _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(format)");
-      return;
+      return GL_TRUE;
    }
 
-   _mesa_lock_texture(ctx, texObj);
-   {
-      texImage = _mesa_select_tex_image(ctx, texObj, target, level);
-      if (!texImage) {
-	 /* invalid mipmap level, not an error */
-	 goto out;
-      }
 
+   texUnit = &(ctx->Texture.Unit[ctx->Texture.CurrentUnit]);
+   texObj = _mesa_select_tex_object(ctx, texUnit, target);
+   texImage = _mesa_select_tex_image(ctx, texObj, target, level);
+   if (!texImage) {
+      /* out of memory */
+      return GL_TRUE;
+   }
+      
+   /* Make sure the requested image format is compatible with the
+    * texture's format.  Note that a color index texture can be converted
+    * to RGBA so that combo is allowed.
+    */
+   if (_mesa_is_color_format(format)
+       && !_mesa_is_color_format(texImage->TexFormat->BaseFormat)
+       && !is_index_format(texImage->TexFormat->BaseFormat)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");
+      return GL_TRUE;
+   }
+   else if (is_index_format(format)
+            && !is_index_format(texImage->TexFormat->BaseFormat)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");
+      return GL_TRUE;
+   }
+   else if (is_depth_format(format)
+            && !is_depth_format(texImage->TexFormat->BaseFormat)
+            && !is_depthstencil_format(texImage->TexFormat->BaseFormat)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");
+      return GL_TRUE;
+   }
+   else if (is_ycbcr_format(format)
+            && !is_ycbcr_format(texImage->TexFormat->BaseFormat)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");
+      return GL_TRUE;
+   }
+   else if (is_depthstencil_format(format)
+            && !is_depthstencil_format(texImage->TexFormat->BaseFormat)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");
+      return GL_TRUE;
+   }
+   else if (is_dudv_format(format)
+            && !is_dudv_format(texImage->TexFormat->BaseFormat)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");
+      return GL_TRUE;
+   }
 
-      /* Make sure the requested image format is compatible with the
-       * texture's format.  Note that a color index texture can be converted
-       * to RGBA so that combo is allowed.
-       */
-      if (_mesa_is_color_format(format)
-	  && !_mesa_is_color_format(texImage->TexFormat->BaseFormat)
-	  && !is_index_format(texImage->TexFormat->BaseFormat)) {
-	 _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");
-	 goto out;
-      }
-      else if (is_index_format(format)
-	       && !is_index_format(texImage->TexFormat->BaseFormat)) {
-	 _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");
-	 goto out;
-      }
-      else if (is_depth_format(format)
-	       && !is_depth_format(texImage->TexFormat->BaseFormat)
-	       && !is_depthstencil_format(texImage->TexFormat->BaseFormat)) {
-	 _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");
-	 goto out;
-      }
-      else if (is_ycbcr_format(format)
-	       && !is_ycbcr_format(texImage->TexFormat->BaseFormat)) {
-	 _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");
-	 goto out;
-      }
-      else if (is_depthstencil_format(format)
-	       && !is_depthstencil_format(texImage->TexFormat->BaseFormat)) {
-	 _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");
-	 goto out;
-      }
-      else if (is_dudv_format(format)
-	       && !is_dudv_format(texImage->TexFormat->BaseFormat)) {
-	 _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");
-	 goto out;
+   if (ctx->Pack.BufferObj->Name) {
+      /* packing texture image into a PBO */
+      const GLuint dimensions = (target == GL_TEXTURE_3D) ? 3 : 2;
+      if (!_mesa_validate_pbo_access(dimensions, &ctx->Pack, texImage->Width,
+                                     texImage->Height, texImage->Depth,
+                                     format, type, pixels)) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glGetTexImage(invalid PBO access)");
+         return GL_TRUE;
       }
+   }
+
+   return GL_FALSE;
+}
 
-      if (ctx->Pack.BufferObj->Name) {
-	 /* packing texture image into a PBO */
-	 const GLuint dimensions = (target == GL_TEXTURE_3D) ? 3 : 2;
-	 if (!_mesa_validate_pbo_access(dimensions, &ctx->Pack, texImage->Width,
-					texImage->Height, texImage->Depth,
-					format, type, pixels)) {
-	    _mesa_error(ctx, GL_INVALID_OPERATION,
-			"glGetTexImage(invalid PBO access)");
-	    goto out;
-	 }
-      }
+
+
+/**
+ * Get texture image.  Called by glGetTexImage.
+ *
+ * \param target texture target.
+ * \param level image level.
+ * \param format pixel data format for returned image.
+ * \param type pixel data type for returned image.
+ * \param pixels returned pixel data.
+ */
+void GLAPIENTRY
+_mesa_GetTexImage( GLenum target, GLint level, GLenum format,
+                   GLenum type, GLvoid *pixels )
+{
+   const struct gl_texture_unit *texUnit;
+   struct gl_texture_object *texObj;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   texUnit = &(ctx->Texture.Unit[ctx->Texture.CurrentUnit]);
+   texObj = _mesa_select_tex_object(ctx, texUnit, target);
+   if (!texObj || _mesa_is_proxy_texture(target)) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(target)");
+      return;
+   }
+
+   if (getteximage_error_check(ctx, target, level, format, type, pixels)) {
+      return;
+   }
+
+   _mesa_lock_texture(ctx, texObj);
+   {
+      struct gl_texture_image *texImage =
+         _mesa_select_tex_image(ctx, texObj, target, level);
 
       /* typically, this will call _mesa_get_teximage() */
       ctx->Driver.GetTexImage(ctx, target, level, format, type, pixels,
-			      texObj, texImage);
-
+                              texObj, texImage);
    }
- out:
    _mesa_unlock_texture(ctx, texObj);
 }
 
-- 
cgit v1.2.3


From 4406f79402e8f986913c20c3138d12d0af670bd4 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 30 Jul 2009 09:59:52 -0600
Subject: mesa: get_current_tex_unit() helper function

---
 src/mesa/main/teximage.c | 58 +++++++++++++++++++++++++++++-------------------
 1 file changed, 35 insertions(+), 23 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 109fe0e052..6348ec09f7 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -775,6 +775,18 @@ _mesa_is_proxy_texture(GLenum target)
 }
 
 
+/**
+ * Return pointer to current texture unit.
+ * This the texture unit set by glActiveTexture(), not glClientActiveTexture().
+ */
+static INLINE struct gl_texture_unit *
+get_current_tex_unit(GLcontext *ctx)
+{
+   ASSERT(ctx->Texture.CurrentUnit < Elements(ctx->Texture.Unit));
+   return &(ctx->Texture.Unit[ctx->Texture.CurrentUnit]);
+}
+
+
 /**
  * Get the texture object that corresponds to the target of the given texture unit.
  *
@@ -2250,7 +2262,7 @@ getteximage_error_check(GLcontext *ctx, GLenum target, GLint level,
    }
 
 
-   texUnit = &(ctx->Texture.Unit[ctx->Texture.CurrentUnit]);
+   texUnit = get_current_tex_unit(ctx);
    texObj = _mesa_select_tex_object(ctx, texUnit, target);
    texImage = _mesa_select_tex_image(ctx, texObj, target, level);
    if (!texImage) {
@@ -2330,7 +2342,7 @@ _mesa_GetTexImage( GLenum target, GLint level, GLenum format,
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
-   texUnit = &(ctx->Texture.Unit[ctx->Texture.CurrentUnit]);
+   texUnit = get_current_tex_unit(ctx);
    texObj = _mesa_select_tex_object(ctx, texUnit, target);
    if (!texObj || _mesa_is_proxy_texture(target)) {
       _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(target)");
@@ -2497,7 +2509,7 @@ _mesa_TexImage1D( GLenum target, GLint level, GLint internalFormat,
       if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)
 	 _mesa_update_state(ctx);
 
-      texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+      texUnit = get_current_tex_unit(ctx);
       texObj = _mesa_select_tex_object(ctx, texUnit, target);
       _mesa_lock_texture(ctx, texObj);
       {
@@ -2605,7 +2617,7 @@ _mesa_TexImage2D( GLenum target, GLint level, GLint internalFormat,
       if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)
 	 _mesa_update_state(ctx);
 
-      texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+      texUnit = get_current_tex_unit(ctx);
       texObj = _mesa_select_tex_object(ctx, texUnit, target);
       _mesa_lock_texture(ctx, texObj);
       {
@@ -2708,7 +2720,7 @@ _mesa_TexImage3D( GLenum target, GLint level, GLint internalFormat,
       if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)
 	 _mesa_update_state(ctx);
 
-      texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+      texUnit = get_current_tex_unit(ctx);
       texObj = _mesa_select_tex_object(ctx, texUnit, target);
       _mesa_lock_texture(ctx, texObj);
       {
@@ -2814,7 +2826,7 @@ _mesa_TexSubImage1D( GLenum target, GLint level,
    }
 
 
-   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   texUnit = get_current_tex_unit(ctx);
    texObj = _mesa_select_tex_object(ctx, texUnit, target);
    assert(texObj);
 
@@ -2874,7 +2886,7 @@ _mesa_TexSubImage2D( GLenum target, GLint level,
       return;   /* error was detected */
    }
 
-   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   texUnit = get_current_tex_unit(ctx);
    texObj = _mesa_select_tex_object(ctx, texUnit, target);
    _mesa_lock_texture(ctx, texObj);
    {
@@ -2926,7 +2938,7 @@ _mesa_TexSubImage3D( GLenum target, GLint level,
       return;   /* error was detected */
    }
 
-   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   texUnit = get_current_tex_unit(ctx);
    texObj = _mesa_select_tex_object(ctx, texUnit, target);
 
    _mesa_lock_texture(ctx, texObj);
@@ -2987,7 +2999,7 @@ _mesa_CopyTexImage1D( GLenum target, GLint level,
                                postConvWidth, 1, border))
       return;
 
-   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   texUnit = get_current_tex_unit(ctx);
    texObj = _mesa_select_tex_object(ctx, texUnit, target);
    _mesa_lock_texture(ctx, texObj);
    {
@@ -3053,7 +3065,7 @@ _mesa_CopyTexImage2D( GLenum target, GLint level, GLenum internalFormat,
                                postConvWidth, postConvHeight, border))
       return;
 
-   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   texUnit = get_current_tex_unit(ctx);
    texObj = _mesa_select_tex_object(ctx, texUnit, target);
 
    _mesa_lock_texture(ctx, texObj);
@@ -3113,7 +3125,7 @@ _mesa_CopyTexSubImage1D( GLenum target, GLint level,
    if (copytexsubimage_error_check1(ctx, 1, target, level))
       return;
 
-   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   texUnit = get_current_tex_unit(ctx);
    texObj = _mesa_select_tex_object(ctx, texUnit, target);
 
    _mesa_lock_texture(ctx, texObj);
@@ -3168,7 +3180,7 @@ _mesa_CopyTexSubImage2D( GLenum target, GLint level,
    if (copytexsubimage_error_check1(ctx, 2, target, level))
       return;
 
-   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   texUnit = get_current_tex_unit(ctx);
    texObj = _mesa_select_tex_object(ctx, texUnit, target);
 
    _mesa_lock_texture(ctx, texObj);
@@ -3223,7 +3235,7 @@ _mesa_CopyTexSubImage3D( GLenum target, GLint level,
    if (copytexsubimage_error_check1(ctx, 3, target, level))
       return;
 
-   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   texUnit = get_current_tex_unit(ctx);
    texObj = _mesa_select_tex_object(ctx, texUnit, target);
 
    _mesa_lock_texture(ctx, texObj);
@@ -3477,7 +3489,7 @@ _mesa_CompressedTexImage1DARB(GLenum target, GLint level,
          return;
       }
 
-      texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+      texUnit = get_current_tex_unit(ctx);
       texObj = _mesa_select_tex_object(ctx, texUnit, target);
 
       _mesa_lock_texture(ctx, texObj);
@@ -3531,7 +3543,7 @@ _mesa_CompressedTexImage1DARB(GLenum target, GLint level,
          struct gl_texture_unit *texUnit;
          struct gl_texture_object *texObj;
          struct gl_texture_image *texImage;
-         texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+         texUnit = get_current_tex_unit(ctx);
 	 texObj = _mesa_select_tex_object(ctx, texUnit, target);
 
 	 _mesa_lock_texture(ctx, texObj);
@@ -3574,7 +3586,7 @@ _mesa_CompressedTexImage2DARB(GLenum target, GLint level,
          return;
       }
 
-      texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+      texUnit = get_current_tex_unit(ctx);
       texObj = _mesa_select_tex_object(ctx, texUnit, target);
 
       _mesa_lock_texture(ctx, texObj);
@@ -3630,7 +3642,7 @@ _mesa_CompressedTexImage2DARB(GLenum target, GLint level,
          struct gl_texture_unit *texUnit;
          struct gl_texture_object *texObj;
          struct gl_texture_image *texImage;
-         texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+         texUnit = get_current_tex_unit(ctx);
 	 texObj = _mesa_select_tex_object(ctx, texUnit, target);
 
 	 _mesa_lock_texture(ctx, texObj);
@@ -3670,7 +3682,7 @@ _mesa_CompressedTexImage3DARB(GLenum target, GLint level,
          return;
       }
 
-      texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+      texUnit = get_current_tex_unit(ctx);
       texObj = _mesa_select_tex_object(ctx, texUnit, target);
       _mesa_lock_texture(ctx, texObj);
       {
@@ -3724,7 +3736,7 @@ _mesa_CompressedTexImage3DARB(GLenum target, GLint level,
          struct gl_texture_unit *texUnit;
          struct gl_texture_object *texObj;
          struct gl_texture_image *texImage;
-         texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+         texUnit = get_current_tex_unit(ctx);
 	 texObj = _mesa_select_tex_object(ctx, texUnit, target);
 	 _mesa_lock_texture(ctx, texObj);
 	 {
@@ -3763,7 +3775,7 @@ _mesa_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset,
       return;
    }
 
-   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   texUnit = get_current_tex_unit(ctx);
    texObj = _mesa_select_tex_object(ctx, texUnit, target);
    _mesa_lock_texture(ctx, texObj);
    {
@@ -3820,7 +3832,7 @@ _mesa_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset,
       return;
    }
 
-   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   texUnit = get_current_tex_unit(ctx);
    texObj = _mesa_select_tex_object(ctx, texUnit, target);
    _mesa_lock_texture(ctx, texObj);
    {
@@ -3877,7 +3889,7 @@ _mesa_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset,
       return;
    }
 
-   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   texUnit = get_current_tex_unit(ctx);
    texObj = _mesa_select_tex_object(ctx, texUnit, target);
    _mesa_lock_texture(ctx, texObj);
    {
@@ -3924,7 +3936,7 @@ _mesa_GetCompressedTexImageARB(GLenum target, GLint level, GLvoid *img)
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
-   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   texUnit = get_current_tex_unit(ctx);
    texObj = _mesa_select_tex_object(ctx, texUnit, target);
    if (!texObj) {
       _mesa_error(ctx, GL_INVALID_ENUM, "glGetCompressedTexImageARB");
-- 
cgit v1.2.3


From 9c936403de1aa868de1218deb2b93344b0d8d95d Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 30 Jul 2009 10:04:38 -0600
Subject: mesa: re-enable _mesa_source_buffer_exists() call

Somehow this code wound up inside a comment a while back.
---
 src/mesa/main/teximage.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 6348ec09f7..825f5e26bf 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -1869,14 +1869,14 @@ copytexture_error_check( GLcontext *ctx, GLuint dimensions,
       return GL_TRUE;
    }
 
-   /* NOTE: the format and type aren't really significant for
-    * TestProxyTexImage().  Only the internalformat really matters.
    if (!_mesa_source_buffer_exists(ctx, format)) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
                   "glCopyTexImage%dD(missing readbuffer)", dimensions);
       return GL_TRUE;
    }
 
+   /* NOTE: the format and type aren't really significant for
+    * TestProxyTexImage().  Only the internalformat really matters.
     */
    type = GL_FLOAT;
 
-- 
cgit v1.2.3


From 03187571b63d97e3d1406d329c5e760e16ef3181 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Mon, 3 Aug 2009 12:21:03 -0700
Subject: texenv: Add missing dependency on VP changes.

Funny thing is I annotated this dependency in
e5f63c403b767f9974e8eb5d412c012b8a69287f, but didn't actually use it.
---
 src/mesa/main/state.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index d8191ab518..9a70031b7a 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -547,7 +547,8 @@ _mesa_update_state_locked( GLcontext *ctx )
    /* Determine which state flags effect vertex/fragment program state */
    if (ctx->FragmentProgram._MaintainTexEnvProgram) {
       prog_flags |= (_NEW_TEXTURE | _NEW_FOG |
-		     _NEW_ARRAY | _NEW_LIGHT | _NEW_POINT | _NEW_RENDERMODE);
+		     _NEW_ARRAY | _NEW_LIGHT | _NEW_POINT | _NEW_RENDERMODE |
+		     _NEW_PROGRAM);
    }
    if (ctx->VertexProgram._MaintainTnlProgram) {
       prog_flags |= (_NEW_ARRAY | _NEW_TEXTURE | _NEW_TEXTURE_MATRIX |
-- 
cgit v1.2.3


From 40990d9dfb20b69585859b2a45596aa46c20140a Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Mon, 3 Aug 2009 12:36:52 -0700
Subject: texenv: Match state.c in deciding whether we'll be using a vertex
 shader.

---
 src/mesa/main/texenvprogram.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 6b090ff399..2eefae8255 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -275,6 +275,7 @@ static GLbitfield get_fp_input_mask( GLcontext *ctx )
 {
    /* _NEW_PROGRAM */
    const GLboolean vertexShader = (ctx->Shader.CurrentProgram &&
+				   ctx->Shader.CurrentProgram->LinkStatus &&
                                    ctx->Shader.CurrentProgram->VertexProgram);
    const GLboolean vertexProgram = ctx->VertexProgram._Enabled;
    GLbitfield fp_inputs = 0x0;
-- 
cgit v1.2.3


From a9ba1bfeb3a2852c6eda718e73c46c972a286648 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Mon, 3 Aug 2009 12:38:56 -0700
Subject: texenv: Use VP->Current, since _Current isn't updated at this point.

---
 src/mesa/main/texenvprogram.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 2eefae8255..1ee78ffa16 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -341,7 +341,7 @@ static GLbitfield get_fp_input_mask( GLcontext *ctx )
       if (vertexShader)
          vprog = ctx->Shader.CurrentProgram->VertexProgram;
       else
-         vprog = ctx->VertexProgram._Current;
+         vprog = ctx->VertexProgram.Current;
 
       vp_outputs = vprog->Base.OutputsWritten;
 
-- 
cgit v1.2.3


From 9d3929b60c9d4dd4403bcc63cb65d2673cf98b0e Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 4 Aug 2009 09:14:33 -0600
Subject: texenv: Add missing dependency on VP changes.

Funny thing is I annotated this dependency in
e5f63c403b767f9974e8eb5d412c012b8a69287f, but didn't actually use it.

(cherry picked from master, commit 03187571b63d97e3d1406d329c5e760e16ef3181)

Conflicts:
	src/mesa/main/state.c
---
 src/mesa/main/state.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 1d3758a302..51726461b6 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -502,7 +502,8 @@ _mesa_update_state_locked( GLcontext *ctx )
    /* Determine which state flags effect vertex/fragment program state */
    if (ctx->FragmentProgram._MaintainTexEnvProgram) {
       prog_flags |= (_NEW_TEXTURE | _NEW_FOG | _DD_NEW_SEPARATE_SPECULAR |
-		     _NEW_ARRAY | _NEW_LIGHT | _NEW_POINT | _NEW_RENDERMODE);
+		     _NEW_ARRAY | _NEW_LIGHT | _NEW_POINT | _NEW_RENDERMODE |
+		     _NEW_PROGRAM);
    }
    if (ctx->VertexProgram._MaintainTnlProgram) {
       prog_flags |= (_NEW_ARRAY | _NEW_TEXTURE | _NEW_TEXTURE_MATRIX |
-- 
cgit v1.2.3


From f0df08abbec173be183d3d6ecf3d4ba5206df179 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 4 Aug 2009 09:15:09 -0600
Subject: texenv: Match state.c in deciding whether we'll be using a vertex
 shader.

(cherry picked from master, commit 40990d9dfb20b69585859b2a45596aa46c20140a)
---
 src/mesa/main/texenvprogram.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index a3f1246c98..8229de4c47 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -263,6 +263,7 @@ static GLbitfield get_fp_input_mask( GLcontext *ctx )
 {
    /* _NEW_PROGRAM */
    const GLboolean vertexShader = (ctx->Shader.CurrentProgram &&
+				   ctx->Shader.CurrentProgram->LinkStatus &&
                                    ctx->Shader.CurrentProgram->VertexProgram);
    const GLboolean vertexProgram = ctx->VertexProgram._Enabled;
    GLbitfield fp_inputs = 0x0;
-- 
cgit v1.2.3


From 2bec909c69c127b4a29eedfcafed9f5f2e23c51e Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 4 Aug 2009 09:15:33 -0600
Subject: texenv: Use VP->Current, since _Current isn't updated at this point.

(cherry picked from master, commit a9ba1bfeb3a2852c6eda718e73c46c972a286648)
---
 src/mesa/main/texenvprogram.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 8229de4c47..3ff30058ec 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -329,7 +329,7 @@ static GLbitfield get_fp_input_mask( GLcontext *ctx )
       if (vertexShader)
          vprog = ctx->Shader.CurrentProgram->VertexProgram;
       else
-         vprog = ctx->VertexProgram._Current;
+         vprog = ctx->VertexProgram.Current;
 
       vp_outputs = vprog->Base.OutputsWritten;
 
-- 
cgit v1.2.3


From 2465c4fa9cabe8c40e526b9e081de3b70c851455 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 4 Aug 2009 10:55:29 -0600
Subject: mesa: more glGetTexImage() error checking consolidation, new
 assertion

---
 src/mesa/main/teximage.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 825f5e26bf..3549b68829 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -765,6 +765,9 @@ _mesa_delete_texture_image( GLcontext *ctx, struct gl_texture_image *texImage )
 GLboolean
 _mesa_is_proxy_texture(GLenum target)
 {
+   /* NUM_TEXTURE_TARGETS should match number of terms below */
+   assert(NUM_TEXTURE_TARGETS == 7);
+
    return (target == GL_PROXY_TEXTURE_1D ||
            target == GL_PROXY_TEXTURE_2D ||
            target == GL_PROXY_TEXTURE_3D ||
@@ -2261,9 +2264,14 @@ getteximage_error_check(GLcontext *ctx, GLenum target, GLint level,
       return GL_TRUE;
    }
 
-
    texUnit = get_current_tex_unit(ctx);
    texObj = _mesa_select_tex_object(ctx, texUnit, target);
+
+   if (!texObj || _mesa_is_proxy_texture(target)) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(target)");
+      return GL_TRUE;
+   }
+
    texImage = _mesa_select_tex_image(ctx, texObj, target, level);
    if (!texImage) {
       /* out of memory */
@@ -2342,17 +2350,13 @@ _mesa_GetTexImage( GLenum target, GLint level, GLenum format,
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
-   texUnit = get_current_tex_unit(ctx);
-   texObj = _mesa_select_tex_object(ctx, texUnit, target);
-   if (!texObj || _mesa_is_proxy_texture(target)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(target)");
-      return;
-   }
-
    if (getteximage_error_check(ctx, target, level, format, type, pixels)) {
       return;
    }
 
+   texUnit = get_current_tex_unit(ctx);
+   texObj = _mesa_select_tex_object(ctx, texUnit, target);
+
    _mesa_lock_texture(ctx, texObj);
    {
       struct gl_texture_image *texImage =
-- 
cgit v1.2.3


From 2b82bc93e2a0bfdd48147dfa5525dee732a50ea4 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 4 Aug 2009 14:53:24 -0600
Subject: mesa: more error message info for vertex pointer functions

---
 src/mesa/main/varray.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 3d5b8faecf..88bf8d8d35 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -135,7 +135,8 @@ _mesa_VertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
          break;
 #endif
       default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glVertexPointer(type)" );
+         _mesa_error( ctx, GL_INVALID_ENUM, "glVertexPointer(type=%s)",
+                      _mesa_lookup_enum_by_nr(type));
          return;
    }
 
@@ -186,7 +187,8 @@ _mesa_NormalPointer(GLenum type, GLsizei stride, const GLvoid *ptr )
          break;
 #endif
       default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glNormalPointer(type)" );
+         _mesa_error( ctx, GL_INVALID_ENUM, "glNormalPointer(type=%s)",
+                      _mesa_lookup_enum_by_nr(type));
          return;
    }
 
@@ -265,7 +267,8 @@ _mesa_ColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
          break;
 #endif
       default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glColorPointer(type)" );
+         _mesa_error( ctx, GL_INVALID_ENUM, "glColorPointer(type=%s)",
+                      _mesa_lookup_enum_by_nr(type));
          return;
    }
 
@@ -415,7 +418,8 @@ _mesa_SecondaryColorPointerEXT(GLint size, GLenum type,
          elementSize = size * sizeof(GLdouble);
          break;
       default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glSecondaryColorPointer(type)" );
+         _mesa_error( ctx, GL_INVALID_ENUM, "glSecondaryColorPointer(type=%s)",
+                      _mesa_lookup_enum_by_nr(type));
          return;
    }
 
@@ -476,7 +480,8 @@ _mesa_TexCoordPointer(GLint size, GLenum type, GLsizei stride,
          break;
 #endif
       default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glTexCoordPointer(type)" );
+         _mesa_error( ctx, GL_INVALID_ENUM, "glTexCoordPointer(type=%s)",
+                      _mesa_lookup_enum_by_nr(type));
          return;
    }
 
@@ -610,7 +615,8 @@ _mesa_VertexAttribPointerNV(GLuint index, GLint size, GLenum type,
          elementSize = size * sizeof(GLdouble);
          break;
       default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glVertexAttribPointerNV(type)" );
+         _mesa_error( ctx, GL_INVALID_ENUM, "glVertexAttribPointerNV(type=%s)",
+                      _mesa_lookup_enum_by_nr(type));
          return;
    }
 
-- 
cgit v1.2.3


From b98f0f2d51494d3f766bc53941fff754fce8bd0f Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 4 Aug 2009 15:04:37 -0600
Subject: mesa: better texture dump/debug code

---
 src/mesa/main/debug.c | 97 ++++++++++++++++++++++++---------------------------
 1 file changed, 45 insertions(+), 52 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/debug.c b/src/mesa/main/debug.c
index 1c8c44fcb9..8492c8561d 100644
--- a/src/mesa/main/debug.c
+++ b/src/mesa/main/debug.c
@@ -33,6 +33,7 @@
 #include "get.h"
 #include "pixelstore.h"
 #include "readpix.h"
+#include "texgetimage.h"
 #include "texobj.h"
 #include "texformat.h"
 
@@ -234,11 +235,11 @@ _mesa_init_debug( GLcontext *ctx )
  */
 static void
 write_ppm(const char *filename, const GLubyte *buffer, int width, int height,
-          int comps, int rcomp, int gcomp, int bcomp)
+          int comps, int rcomp, int gcomp, int bcomp, GLboolean invert)
 {
    FILE *f = fopen( filename, "w" );
    if (f) {
-      int i, x, y;
+      int x, y;
       const GLubyte *ptr = buffer;
       fprintf(f,"P6\n");
       fprintf(f,"# ppm-file created by osdemo.c\n");
@@ -246,10 +247,11 @@ write_ppm(const char *filename, const GLubyte *buffer, int width, int height,
       fprintf(f,"255\n");
       fclose(f);
       f = fopen( filename, "ab" );  /* reopen in binary append mode */
-      for (y=height-1; y>=0; y--) {
-         for (x=0; x<width; x++) {
-            i = (y*width + x) * comps;
-            fputc(ptr[i+rcomp], f);   /* write red */
+      for (y=0; y < height; y++) {
+         for (x = 0; x < width; x++) {
+            int yy = invert ? (height - 1 - y) : y;
+            int i = (yy * width + x) * comps;
+            fputc(ptr[i+rcomp], f); /* write red */
             fputc(ptr[i+gcomp], f); /* write green */
             fputc(ptr[i+bcomp], f); /* write blue */
          }
@@ -263,47 +265,34 @@ write_ppm(const char *filename, const GLubyte *buffer, int width, int height,
  * Write level[0] image to a ppm file.
  */
 static void
-write_texture_image(struct gl_texture_object *texObj)
+write_texture_image(struct gl_texture_object *texObj, GLuint face, GLuint level)
 {
-   const struct gl_texture_image *img = texObj->Image[0][0];
-   if (img && img->Data) {
+   struct gl_texture_image *img = texObj->Image[face][level];
+   if (img) {
+      GET_CURRENT_CONTEXT(ctx);
+      struct gl_pixelstore_attrib store;
+      GLubyte *buffer;
       char s[100];
 
+      buffer = (GLubyte *) _mesa_malloc(img->Width * img->Height
+                                        * img->Depth * 4);
+
+      store = ctx->Pack; /* save */
+      ctx->Pack = ctx->DefaultPacking;
+
+      ctx->Driver.GetTexImage(ctx, texObj->Target, level,
+                              GL_RGBA, GL_UNSIGNED_BYTE,
+                              buffer, texObj, img);
+
       /* make filename */
-      sprintf(s, "/tmp/teximage%u.ppm", texObj->Name);
-
-      switch (img->TexFormat->MesaFormat) {
-      case MESA_FORMAT_RGBA8888:
-         write_ppm(s, img->Data, img->Width, img->Height, 4, 3, 2, 1);
-         break;
-      case MESA_FORMAT_ARGB8888:
-         write_ppm(s, img->Data, img->Width, img->Height, 4, 2, 1, 0);
-         break;
-      case MESA_FORMAT_RGB888:
-         write_ppm(s, img->Data, img->Width, img->Height, 3, 2, 1, 0);
-         break;
-      case MESA_FORMAT_RGB565:
-         {
-            GLubyte *buf2 = (GLubyte *) _mesa_malloc(img->Width * img->Height * 3);
-            GLuint i;
-            for (i = 0; i < img->Width * img->Height; i++) {
-               GLint r, g, b;
-               GLushort s = ((GLushort *) img->Data)[i];
-               r = UBYTE_TO_CHAN( ((s >> 8) & 0xf8) | ((s >> 13) & 0x7) );
-               g = UBYTE_TO_CHAN( ((s >> 3) & 0xfc) | ((s >>  9) & 0x3) );
-               b = UBYTE_TO_CHAN( ((s << 3) & 0xf8) | ((s >>  2) & 0x7) );
-               buf2[i*3+1] = r;
-               buf2[i*3+2] = g;
-               buf2[i*3+3] = b;
-            }
-            write_ppm(s, buf2, img->Width, img->Height, 3, 2, 1, 0);
-            _mesa_free(buf2);
-         }
-         break;
-      default:
-         printf("XXXX unsupported mesa tex format %d in %s\n",
-                img->TexFormat->MesaFormat, __FUNCTION__);
-      }
+      _mesa_sprintf(s, "/tmp/teximage%u.ppm", texObj->Name);
+
+      _mesa_printf("  Writing image level %u to %s\n", level, s);
+      write_ppm(s, buffer, img->Width, img->Height, 4, 0, 1, 2, GL_FALSE);
+
+      ctx->Pack = store; /* restore */
+
+      _mesa_free(buffer);
    }
 }
 
@@ -316,17 +305,21 @@ dump_texture_cb(GLuint id, void *data, void *userData)
 {
    struct gl_texture_object *texObj = (struct gl_texture_object *) data;
    int i;
+   GLboolean written = GL_FALSE;
    (void) userData;
 
-   printf("Texture %u\n", texObj->Name);
-   printf("  Target 0x%x\n", texObj->Target);
+   _mesa_printf("Texture %u\n", texObj->Name);
+   _mesa_printf("  Target 0x%x\n", texObj->Target);
    for (i = 0; i < MAX_TEXTURE_LEVELS; i++) {
       struct gl_texture_image *texImg = texObj->Image[0][i];
       if (texImg) {
-         printf("  Image %u: %d x %d x %d at %p\n", i,
-                texImg->Width, texImg->Height, texImg->Depth, texImg->Data);
-         if (DumpImages && i == 0) {
-            write_texture_image(texObj);
+         _mesa_printf("  Image %u: %d x %d x %d, format %u at %p\n", i,
+                      texImg->Width, texImg->Height, texImg->Depth,
+                      texImg->TexFormat->MesaFormat, texImg->Data);
+         if (DumpImages && !written) {
+            GLuint face = 0;
+            write_texture_image(texObj, face, i);
+            written = GL_TRUE;
          }
       }
    }
@@ -368,7 +361,7 @@ _mesa_dump_color_buffer(const char *filename)
                 ctx->DrawBuffer->_ColorDrawBuffers[0],
                 ctx->DrawBuffer->ColorDrawBuffer[0]);
    _mesa_printf("Writing %d x %d color buffer to %s\n", w, h, filename);
-   write_ppm(filename, buf, w, h, 4, 0, 1, 2);
+   write_ppm(filename, buf, w, h, 4, 0, 1, 2, GL_TRUE);
 
    _mesa_PopClientAttrib();
 
@@ -403,7 +396,7 @@ _mesa_dump_depth_buffer(const char *filename)
    }
 
    _mesa_printf("Writing %d x %d depth buffer to %s\n", w, h, filename);
-   write_ppm(filename, buf2, w, h, 3, 0, 1, 2);
+   write_ppm(filename, buf2, w, h, 3, 0, 1, 2, GL_TRUE);
 
    _mesa_PopClientAttrib();
 
@@ -438,7 +431,7 @@ _mesa_dump_stencil_buffer(const char *filename)
    }
 
    _mesa_printf("Writing %d x %d stencil buffer to %s\n", w, h, filename);
-   write_ppm(filename, buf2, w, h, 3, 0, 1, 2);
+   write_ppm(filename, buf2, w, h, 3, 0, 1, 2, GL_TRUE);
 
    _mesa_PopClientAttrib();
 
-- 
cgit v1.2.3


From def77160d69dbb0a333ea3f9263e661f8557a7ec Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 4 Aug 2009 15:28:29 -0600
Subject: mesa: reset ErrorDebugCount to zero in glGetString()

---
 src/mesa/main/getstring.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/getstring.c b/src/mesa/main/getstring.c
index 41fd786d7d..6599ed9698 100644
--- a/src/mesa/main/getstring.c
+++ b/src/mesa/main/getstring.c
@@ -266,5 +266,6 @@ _mesa_GetError( void )
       _mesa_debug(ctx, "glGetError <-- %s\n", _mesa_lookup_enum_by_nr(e));
 
    ctx->ErrorValue = (GLenum) GL_NO_ERROR;
+   ctx->ErrorDebugCount = 0;
    return e;
 }
-- 
cgit v1.2.3


From 84c8315ae66f34466d0f7b9db8a825c15e0594a8 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 4 Aug 2009 15:29:00 -0600
Subject: mesa: clean-up error debug/count code

---
 src/mesa/main/imports.c | 71 ++++++++++++++++++++++++++++---------------------
 1 file changed, 41 insertions(+), 30 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 1722579e82..8967bb3dd5 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -1021,23 +1021,59 @@ output_if_debug(const char *prefixString, const char *outputString,
    }
 }
 
-static const char *error_string( GLenum error );
 
-static void flush_delayed_errors( GLcontext *ctx )
+/**
+ * Return string version of GL error code.
+ */
+static const char *
+error_string( GLenum error )
 {
-   char s2[MAXSTRING];
+   switch (error) {
+   case GL_NO_ERROR:
+      return "GL_NO_ERROR";
+   case GL_INVALID_VALUE:
+      return "GL_INVALID_VALUE";
+   case GL_INVALID_ENUM:
+      return "GL_INVALID_ENUM";
+   case GL_INVALID_OPERATION:
+      return "GL_INVALID_OPERATION";
+   case GL_STACK_OVERFLOW:
+      return "GL_STACK_OVERFLOW";
+   case GL_STACK_UNDERFLOW:
+      return "GL_STACK_UNDERFLOW";
+   case GL_OUT_OF_MEMORY:
+      return "GL_OUT_OF_MEMORY";
+   case GL_TABLE_TOO_LARGE:
+      return "GL_TABLE_TOO_LARGE";
+   case GL_INVALID_FRAMEBUFFER_OPERATION_EXT:
+      return "GL_INVALID_FRAMEBUFFER_OPERATION";
+   default:
+      return "unknown";
+   }
+}
+
+
+/**
+ * When a new type of error is recorded, print a message describing
+ * previous errors which were accumulated.
+ */
+static void
+flush_delayed_errors( GLcontext *ctx )
+{
+   char s[MAXSTRING];
 
    if (ctx->ErrorDebugCount) {
-      _mesa_snprintf(s2, MAXSTRING, "%d similar %s errors", 
+      _mesa_snprintf(s, MAXSTRING, "%d similar %s errors", 
                      ctx->ErrorDebugCount,
                      error_string(ctx->ErrorValue));
 
-      output_if_debug("Mesa: ", s2, GL_TRUE);
+      output_if_debug("Mesa", s, GL_TRUE);
 
       ctx->ErrorDebugCount = 0;
    }
 }
 
+
 /**
  * Report a warning (a recoverable error condition) to stderr if
  * either DEBUG is defined or the MESA_DEBUG env var is set.
@@ -1083,31 +1119,6 @@ _mesa_problem( const GLcontext *ctx, const char *fmtString, ... )
    fprintf(stderr, "Please report at bugzilla.freedesktop.org\n");
 }
 
-static const char *error_string( GLenum error )
-{
-   switch (error) {
-   case GL_NO_ERROR:
-      return "GL_NO_ERROR";
-   case GL_INVALID_VALUE:
-      return "GL_INVALID_VALUE";
-   case GL_INVALID_ENUM:
-      return "GL_INVALID_ENUM";
-   case GL_INVALID_OPERATION:
-      return "GL_INVALID_OPERATION";
-   case GL_STACK_OVERFLOW:
-      return "GL_STACK_OVERFLOW";
-   case GL_STACK_UNDERFLOW:
-      return "GL_STACK_UNDERFLOW";
-   case GL_OUT_OF_MEMORY:
-      return "GL_OUT_OF_MEMORY";
-   case GL_TABLE_TOO_LARGE:
-      return "GL_TABLE_TOO_LARGE";
-   case GL_INVALID_FRAMEBUFFER_OPERATION_EXT:
-      return "GL_INVALID_FRAMEBUFFER_OPERATION";
-   default:
-      return "unknown";
-   }
-}
 
 /**
  * Record an OpenGL state error.  These usually occur when the user
-- 
cgit v1.2.3


From 9f8110adcc5a6f47b5db0915bb9265925d520856 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 4 Aug 2009 15:33:53 -0600
Subject: mesa: added _mesa_str_checksum()

---
 src/mesa/main/imports.c | 14 ++++++++++++++
 src/mesa/main/imports.h |  3 +++
 2 files changed, 17 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 8967bb3dd5..6ffaddcde9 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -911,6 +911,20 @@ _mesa_strtod( const char *s, char **end )
    return strtod(s, end);
 }
 
+/** Compute simple checksum/hash for a string */
+unsigned int
+_mesa_str_checksum(const char *str)
+{
+   /* This could probably be much better */
+   unsigned int sum, i;
+   const char *c;
+   sum = i = 1;
+   for (c = str; *c; c++)
+      sum += *c * (i % 100);
+   return sum;
+}
+
+
 /*@}*/
 
 
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index 7b61e22e93..fb85f0862c 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -586,6 +586,9 @@ _mesa_atoi( const char *s );
 extern double
 _mesa_strtod( const char *s, char **end );
 
+extern unsigned int
+_mesa_str_checksum(const char *str);
+
 extern int
 _mesa_sprintf( char *str, const char *fmt, ... );
 
-- 
cgit v1.2.3


From b501263bf5965aa89c408cb8f0db3688847a8384 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 4 Aug 2009 15:34:59 -0600
Subject: mesa: added gl_shader::SourceChecksum field (for debug purposes)

---
 src/mesa/main/mtypes.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index d0309f5e90..48f00b4b0b 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2004,6 +2004,7 @@ struct gl_shader
    GLboolean Main;  /**< shader defines main() */
    GLboolean UnresolvedRefs;
    const GLchar *Source;  /**< Source code string */
+   GLuint SourceChecksum;       /**< for debug/logging purposes */
    struct gl_program *Program;  /**< Post-compile assembly code */
    GLchar *InfoLog;
    struct gl_sl_pragmas Pragmas;
-- 
cgit v1.2.3


From 727b2d747e13fed78bf62cfbf4a31427eed0ef29 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 5 Aug 2009 13:21:59 -0600
Subject: mesa: make _mesa_clip_blit() a shared function

---
 src/mesa/main/image.c    | 178 +++++++++++++++++++++++++++++++++++++++++++++
 src/mesa/main/image.h    |   6 ++
 src/mesa/swrast/s_blit.c | 183 +----------------------------------------------
 3 files changed, 187 insertions(+), 180 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index 01fbe40a03..1a4d22256f 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -5333,3 +5333,181 @@ _mesa_clip_to_region(GLint xmin, GLint ymin,
 
    return GL_TRUE;
 }
+
+
+/**
+ * Clip dst coords against Xmax (or Ymax).
+ */
+static INLINE void
+clip_right_or_top(GLint *srcX0, GLint *srcX1,
+                  GLint *dstX0, GLint *dstX1,
+                  GLint maxValue)
+{
+   GLfloat t, bias;
+
+   if (*dstX1 > maxValue) {
+      /* X1 outside right edge */
+      ASSERT(*dstX0 < maxValue); /* X0 should be inside right edge */
+      t = (GLfloat) (maxValue - *dstX0) / (GLfloat) (*dstX1 - *dstX0);
+      /* chop off [t, 1] part */
+      ASSERT(t >= 0.0 && t <= 1.0);
+      *dstX1 = maxValue;
+      bias = (*srcX0 < *srcX1) ? 0.5 : -0.5;
+      *srcX1 = *srcX0 + (GLint) (t * (*srcX1 - *srcX0) + bias);
+   }
+   else if (*dstX0 > maxValue) {
+      /* X0 outside right edge */
+      ASSERT(*dstX1 < maxValue); /* X1 should be inside right edge */
+      t = (GLfloat) (maxValue - *dstX1) / (GLfloat) (*dstX0 - *dstX1);
+      /* chop off [t, 1] part */
+      ASSERT(t >= 0.0 && t <= 1.0);
+      *dstX0 = maxValue;
+      bias = (*srcX0 < *srcX1) ? -0.5 : 0.5;
+      *srcX0 = *srcX1 + (GLint) (t * (*srcX0 - *srcX1) + bias);
+   }
+}
+
+
+/**
+ * Clip dst coords against Xmin (or Ymin).
+ */
+static INLINE void
+clip_left_or_bottom(GLint *srcX0, GLint *srcX1,
+                    GLint *dstX0, GLint *dstX1,
+                    GLint minValue)
+{
+   GLfloat t, bias;
+
+   if (*dstX0 < minValue) {
+      /* X0 outside left edge */
+      ASSERT(*dstX1 > minValue); /* X1 should be inside left edge */
+      t = (GLfloat) (minValue - *dstX0) / (GLfloat) (*dstX1 - *dstX0);
+      /* chop off [0, t] part */
+      ASSERT(t >= 0.0 && t <= 1.0);
+      *dstX0 = minValue;
+      bias = (*srcX0 < *srcX1) ? 0.5 : -0.5; /* flipped??? */
+      *srcX0 = *srcX0 + (GLint) (t * (*srcX1 - *srcX0) + bias);
+   }
+   else if (*dstX1 < minValue) {
+      /* X1 outside left edge */
+      ASSERT(*dstX0 > minValue); /* X0 should be inside left edge */
+      t = (GLfloat) (minValue - *dstX1) / (GLfloat) (*dstX0 - *dstX1);
+      /* chop off [0, t] part */
+      ASSERT(t >= 0.0 && t <= 1.0);
+      *dstX1 = minValue;
+      bias = (*srcX0 < *srcX1) ? 0.5 : -0.5;
+      *srcX1 = *srcX1 + (GLint) (t * (*srcX0 - *srcX1) + bias);
+   }
+}
+
+
+/**
+ * Do clipping of blit src/dest rectangles.
+ * The dest rect is clipped against both the buffer bounds and scissor bounds.
+ * The src rect is just clipped against the buffer bounds.
+ *
+ * When either the src or dest rect is clipped, the other is also clipped
+ * proportionately!
+ *
+ * Note that X0 need not be less than X1 (same for Y) for either the source
+ * and dest rects.  That makes the clipping a little trickier.
+ *
+ * \return GL_TRUE if anything is left to draw, GL_FALSE if totally clipped
+ */
+GLboolean
+_mesa_clip_blit(GLcontext *ctx,
+                GLint *srcX0, GLint *srcY0, GLint *srcX1, GLint *srcY1,
+                GLint *dstX0, GLint *dstY0, GLint *dstX1, GLint *dstY1)
+{
+   const GLint srcXmin = 0;
+   const GLint srcXmax = ctx->ReadBuffer->Width;
+   const GLint srcYmin = 0;
+   const GLint srcYmax = ctx->ReadBuffer->Height;
+
+   /* these include scissor bounds */
+   const GLint dstXmin = ctx->DrawBuffer->_Xmin;
+   const GLint dstXmax = ctx->DrawBuffer->_Xmax;
+   const GLint dstYmin = ctx->DrawBuffer->_Ymin;
+   const GLint dstYmax = ctx->DrawBuffer->_Ymax;
+
+   /*
+   printf("PreClipX:  src: %d .. %d  dst: %d .. %d\n",
+          *srcX0, *srcX1, *dstX0, *dstX1);
+   printf("PreClipY:  src: %d .. %d  dst: %d .. %d\n",
+          *srcY0, *srcY1, *dstY0, *dstY1);
+   */
+
+   /* trivial rejection tests */
+   if (*dstX0 == *dstX1)
+      return GL_FALSE; /* no width */
+   if (*dstX0 <= dstXmin && *dstX1 <= dstXmin)
+      return GL_FALSE; /* totally out (left) of bounds */
+   if (*dstX0 >= dstXmax && *dstX1 >= dstXmax)
+      return GL_FALSE; /* totally out (right) of bounds */
+
+   if (*dstY0 == *dstY1)
+      return GL_FALSE;
+   if (*dstY0 <= dstYmin && *dstY1 <= dstYmin)
+      return GL_FALSE;
+   if (*dstY0 >= dstYmax && *dstY1 >= dstYmax)
+      return GL_FALSE;
+
+   if (*srcX0 == *srcX1)
+      return GL_FALSE;
+   if (*srcX0 <= srcXmin && *srcX1 <= srcXmin)
+      return GL_FALSE;
+   if (*srcX0 >= srcXmax && *srcX1 >= srcXmax)
+      return GL_FALSE;
+
+   if (*srcY0 == *srcY1)
+      return GL_FALSE;
+   if (*srcY0 <= srcYmin && *srcY1 <= srcYmin)
+      return GL_FALSE;
+   if (*srcY0 >= srcYmax && *srcY1 >= srcYmax)
+      return GL_FALSE;
+
+   /*
+    * dest clip
+    */
+   clip_right_or_top(srcX0, srcX1, dstX0, dstX1, dstXmax);
+   clip_right_or_top(srcY0, srcY1, dstY0, dstY1, dstYmax);
+   clip_left_or_bottom(srcX0, srcX1, dstX0, dstX1, dstXmin);
+   clip_left_or_bottom(srcY0, srcY1, dstY0, dstY1, dstYmin);
+
+   /*
+    * src clip (just swap src/dst values from above)
+    */
+   clip_right_or_top(dstX0, dstX1, srcX0, srcX1, srcXmax);
+   clip_right_or_top(dstY0, dstY1, srcY0, srcY1, srcYmax);
+   clip_left_or_bottom(dstX0, dstX1, srcX0, srcX1, srcXmin);
+   clip_left_or_bottom(dstY0, dstY1, srcY0, srcY1, srcYmin);
+
+   /*
+   printf("PostClipX: src: %d .. %d  dst: %d .. %d\n",
+          *srcX0, *srcX1, *dstX0, *dstX1);
+   printf("PostClipY: src: %d .. %d  dst: %d .. %d\n",
+          *srcY0, *srcY1, *dstY0, *dstY1);
+   */
+
+   ASSERT(*dstX0 >= dstXmin);
+   ASSERT(*dstX0 <= dstXmax);
+   ASSERT(*dstX1 >= dstXmin);
+   ASSERT(*dstX1 <= dstXmax);
+
+   ASSERT(*dstY0 >= dstYmin);
+   ASSERT(*dstY0 <= dstYmax);
+   ASSERT(*dstY1 >= dstYmin);
+   ASSERT(*dstY1 <= dstYmax);
+
+   ASSERT(*srcX0 >= srcXmin);
+   ASSERT(*srcX0 <= srcXmax);
+   ASSERT(*srcX1 >= srcXmin);
+   ASSERT(*srcX1 <= srcXmax);
+
+   ASSERT(*srcY0 >= srcYmin);
+   ASSERT(*srcY0 <= srcYmax);
+   ASSERT(*srcY1 >= srcYmin);
+   ASSERT(*srcY1 <= srcYmax);
+
+   return GL_TRUE;
+}
diff --git a/src/mesa/main/image.h b/src/mesa/main/image.h
index b26c27e5a8..ee17accb80 100644
--- a/src/mesa/main/image.h
+++ b/src/mesa/main/image.h
@@ -291,4 +291,10 @@ _mesa_clip_to_region(GLint xmin, GLint ymin,
                      GLint *x, GLint *y,
                      GLsizei *width, GLsizei *height );
 
+extern GLboolean
+_mesa_clip_blit(GLcontext *ctx,
+                GLint *srcX0, GLint *srcY0, GLint *srcX1, GLint *srcY1,
+                GLint *dstX0, GLint *dstY0, GLint *dstX1, GLint *dstY1);
+
+
 #endif
diff --git a/src/mesa/swrast/s_blit.c b/src/mesa/swrast/s_blit.c
index 0e32cb8f65..4a95c222d5 100644
--- a/src/mesa/swrast/s_blit.c
+++ b/src/mesa/swrast/s_blit.c
@@ -24,6 +24,7 @@
 
 
 #include "main/glheader.h"
+#include "main/image.h"
 #include "main/macros.h"
 #include "s_context.h"
 
@@ -550,184 +551,6 @@ simple_blit(GLcontext *ctx,
 }
 
 
-/**
- * Clip dst coords against Xmax (or Ymax).
- */
-static INLINE void
-clip_right_or_top(GLint *srcX0, GLint *srcX1,
-                  GLint *dstX0, GLint *dstX1,
-                  GLint maxValue)
-{
-   GLfloat t, bias;
-
-   if (*dstX1 > maxValue) {
-      /* X1 outside right edge */
-      ASSERT(*dstX0 < maxValue); /* X0 should be inside right edge */
-      t = (GLfloat) (maxValue - *dstX0) / (GLfloat) (*dstX1 - *dstX0);
-      /* chop off [t, 1] part */
-      ASSERT(t >= 0.0 && t <= 1.0);
-      *dstX1 = maxValue;
-      bias = (*srcX0 < *srcX1) ? 0.5 : -0.5;
-      *srcX1 = *srcX0 + (GLint) (t * (*srcX1 - *srcX0) + bias);
-   }
-   else if (*dstX0 > maxValue) {
-      /* X0 outside right edge */
-      ASSERT(*dstX1 < maxValue); /* X1 should be inside right edge */
-      t = (GLfloat) (maxValue - *dstX1) / (GLfloat) (*dstX0 - *dstX1);
-      /* chop off [t, 1] part */
-      ASSERT(t >= 0.0 && t <= 1.0);
-      *dstX0 = maxValue;
-      bias = (*srcX0 < *srcX1) ? -0.5 : 0.5;
-      *srcX0 = *srcX1 + (GLint) (t * (*srcX0 - *srcX1) + bias);
-   }
-}
-
-
-/**
- * Clip dst coords against Xmin (or Ymin).
- */
-static INLINE void
-clip_left_or_bottom(GLint *srcX0, GLint *srcX1,
-                    GLint *dstX0, GLint *dstX1,
-                    GLint minValue)
-{
-   GLfloat t, bias;
-
-   if (*dstX0 < minValue) {
-      /* X0 outside left edge */
-      ASSERT(*dstX1 > minValue); /* X1 should be inside left edge */
-      t = (GLfloat) (minValue - *dstX0) / (GLfloat) (*dstX1 - *dstX0);
-      /* chop off [0, t] part */
-      ASSERT(t >= 0.0 && t <= 1.0);
-      *dstX0 = minValue;
-      bias = (*srcX0 < *srcX1) ? 0.5 : -0.5; /* flipped??? */
-      *srcX0 = *srcX0 + (GLint) (t * (*srcX1 - *srcX0) + bias);
-   }
-   else if (*dstX1 < minValue) {
-      /* X1 outside left edge */
-      ASSERT(*dstX0 > minValue); /* X0 should be inside left edge */
-      t = (GLfloat) (minValue - *dstX1) / (GLfloat) (*dstX0 - *dstX1);
-      /* chop off [0, t] part */
-      ASSERT(t >= 0.0 && t <= 1.0);
-      *dstX1 = minValue;
-      bias = (*srcX0 < *srcX1) ? 0.5 : -0.5;
-      *srcX1 = *srcX1 + (GLint) (t * (*srcX0 - *srcX1) + bias);
-   }
-}
-
-
-/**
- * Do clipping of blit src/dest rectangles.
- * The dest rect is clipped against both the buffer bounds and scissor bounds.
- * The src rect is just clipped against the buffer bounds.
- *
- * When either the src or dest rect is clipped, the other is also clipped
- * proportionately!
- *
- * Note that X0 need not be less than X1 (same for Y) for either the source
- * and dest rects.  That makes the clipping a little trickier.
- *
- * \return GL_TRUE if anything is left to draw, GL_FALSE if totally clipped
- */
-static GLboolean
-clip_blit(GLcontext *ctx,
-          GLint *srcX0, GLint *srcY0, GLint *srcX1, GLint *srcY1,
-          GLint *dstX0, GLint *dstY0, GLint *dstX1, GLint *dstY1)
-{
-   const GLint srcXmin = 0;
-   const GLint srcXmax = ctx->ReadBuffer->Width;
-   const GLint srcYmin = 0;
-   const GLint srcYmax = ctx->ReadBuffer->Height;
-
-   /* these include scissor bounds */
-   const GLint dstXmin = ctx->DrawBuffer->_Xmin;
-   const GLint dstXmax = ctx->DrawBuffer->_Xmax;
-   const GLint dstYmin = ctx->DrawBuffer->_Ymin;
-   const GLint dstYmax = ctx->DrawBuffer->_Ymax;
-
-   /*
-   printf("PreClipX:  src: %d .. %d  dst: %d .. %d\n",
-          *srcX0, *srcX1, *dstX0, *dstX1);
-   printf("PreClipY:  src: %d .. %d  dst: %d .. %d\n",
-          *srcY0, *srcY1, *dstY0, *dstY1);
-   */
-
-   /* trivial rejection tests */
-   if (*dstX0 == *dstX1)
-      return GL_FALSE; /* no width */
-   if (*dstX0 <= dstXmin && *dstX1 <= dstXmin)
-      return GL_FALSE; /* totally out (left) of bounds */
-   if (*dstX0 >= dstXmax && *dstX1 >= dstXmax)
-      return GL_FALSE; /* totally out (right) of bounds */
-
-   if (*dstY0 == *dstY1)
-      return GL_FALSE;
-   if (*dstY0 <= dstYmin && *dstY1 <= dstYmin)
-      return GL_FALSE;
-   if (*dstY0 >= dstYmax && *dstY1 >= dstYmax)
-      return GL_FALSE;
-
-   if (*srcX0 == *srcX1)
-      return GL_FALSE;
-   if (*srcX0 <= srcXmin && *srcX1 <= srcXmin)
-      return GL_FALSE;
-   if (*srcX0 >= srcXmax && *srcX1 >= srcXmax)
-      return GL_FALSE;
-
-   if (*srcY0 == *srcY1)
-      return GL_FALSE;
-   if (*srcY0 <= srcYmin && *srcY1 <= srcYmin)
-      return GL_FALSE;
-   if (*srcY0 >= srcYmax && *srcY1 >= srcYmax)
-      return GL_FALSE;
-
-   /*
-    * dest clip
-    */
-   clip_right_or_top(srcX0, srcX1, dstX0, dstX1, dstXmax);
-   clip_right_or_top(srcY0, srcY1, dstY0, dstY1, dstYmax);
-   clip_left_or_bottom(srcX0, srcX1, dstX0, dstX1, dstXmin);
-   clip_left_or_bottom(srcY0, srcY1, dstY0, dstY1, dstYmin);
-
-   /*
-    * src clip (just swap src/dst values from above)
-    */
-   clip_right_or_top(dstX0, dstX1, srcX0, srcX1, srcXmax);
-   clip_right_or_top(dstY0, dstY1, srcY0, srcY1, srcYmax);
-   clip_left_or_bottom(dstX0, dstX1, srcX0, srcX1, srcXmin);
-   clip_left_or_bottom(dstY0, dstY1, srcY0, srcY1, srcYmin);
-
-   /*
-   printf("PostClipX: src: %d .. %d  dst: %d .. %d\n",
-          *srcX0, *srcX1, *dstX0, *dstX1);
-   printf("PostClipY: src: %d .. %d  dst: %d .. %d\n",
-          *srcY0, *srcY1, *dstY0, *dstY1);
-   */
-
-   ASSERT(*dstX0 >= dstXmin);
-   ASSERT(*dstX0 <= dstXmax);
-   ASSERT(*dstX1 >= dstXmin);
-   ASSERT(*dstX1 <= dstXmax);
-
-   ASSERT(*dstY0 >= dstYmin);
-   ASSERT(*dstY0 <= dstYmax);
-   ASSERT(*dstY1 >= dstYmin);
-   ASSERT(*dstY1 <= dstYmax);
-
-   ASSERT(*srcX0 >= srcXmin);
-   ASSERT(*srcX0 <= srcXmax);
-   ASSERT(*srcX1 >= srcXmin);
-   ASSERT(*srcX1 <= srcXmax);
-
-   ASSERT(*srcY0 >= srcYmin);
-   ASSERT(*srcY0 <= srcYmax);
-   ASSERT(*srcY1 >= srcYmin);
-   ASSERT(*srcY1 <= srcYmax);
-
-   return GL_TRUE;
-}
-
-
 /**
  * Software fallback for glBlitFramebufferEXT().
  */
@@ -747,8 +570,8 @@ _swrast_BlitFramebuffer(GLcontext *ctx,
    if (!ctx->DrawBuffer->_NumColorDrawBuffers)
       return;
 
-   if (!clip_blit(ctx, &srcX0, &srcY0, &srcX1, &srcY1,
-                  &dstX0, &dstY0, &dstX1, &dstY1)) {
+   if (!_mesa_clip_blit(ctx, &srcX0, &srcY0, &srcX1, &srcY1,
+                        &dstX0, &dstY0, &dstX1, &dstY1)) {
       return;
    }
 
-- 
cgit v1.2.3


From dcebe220f430221821a10944fbdb639a9252bfef Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 5 Aug 2009 13:44:59 -0600
Subject: mesa: generate GL_INVALID_OPERATION for missing z/stencil when
 blitting

If glBlitFramebuffer() is called with GL_DEPTH_BUFFER_BIT or
GL_STENCIL_BUFFER_BIT and the src/dst depth/stencil buffers are absent,
report an error.
---
 src/mesa/main/fbobject.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 83301f1e62..ab91fbc4de 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -2038,7 +2038,9 @@ _mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
    if (mask & GL_STENCIL_BUFFER_BIT) {
       struct gl_renderbuffer *readRb = readFb->_StencilBuffer;
       struct gl_renderbuffer *drawRb = drawFb->_StencilBuffer;
-      if (readRb->StencilBits != drawRb->StencilBits) {
+      if (!readRb ||
+          !drawRb ||
+          readRb->StencilBits != drawRb->StencilBits) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "glBlitFramebufferEXT(stencil buffer size mismatch");
          return;
@@ -2048,7 +2050,9 @@ _mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
    if (mask & GL_DEPTH_BUFFER_BIT) {
       struct gl_renderbuffer *readRb = readFb->_DepthBuffer;
       struct gl_renderbuffer *drawRb = drawFb->_DepthBuffer;
-      if (readRb->DepthBits != drawRb->DepthBits) {
+      if (!readRb ||
+          !drawRb ||
+          readRb->DepthBits != drawRb->DepthBits) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "glBlitFramebufferEXT(depth buffer size mismatch");
          return;
-- 
cgit v1.2.3


From 42b6b067ac68ac1309d0570613bea4a88f745559 Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olvaffe@gmail.com>
Date: Wed, 5 Aug 2009 16:06:50 -0600
Subject: mesa/main: Add functions to clear and dirty texture objects.

This commit adds a function to clear a texture object such that there is
no image data associated with it, and a function to dirty it so that it
will be re-tested for completeness.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
---
 src/mesa/main/teximage.c | 17 +++++++++++++++++
 src/mesa/main/teximage.h |  4 ++++
 src/mesa/main/texobj.c   | 45 ++++++++++++++++++++++++++++++++++++++++++++-
 src/mesa/main/texobj.h   |  8 +++++++-
 4 files changed, 72 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 3549b68829..83f025f86f 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -1218,6 +1218,23 @@ _mesa_init_teximage_fields(GLcontext *ctx, GLenum target,
 }
 
 
+/**
+ * Free and clear fields of the gl_texture_image struct.
+ *
+ * \param ctx GL context.
+ * \param texImage texture image structure to be cleared.
+ *
+ * After the call, \p texImage will have no data associated with it.  Its
+ * fields are cleared so that its parent object will test incomplete.
+ */
+void
+_mesa_clear_texture_image(GLcontext *ctx, struct gl_texture_image *texImage)
+{
+   ctx->Driver.FreeTexImageData(ctx, texImage);
+   clear_teximage_fields(texImage);
+}
+
+
 /**
  * This is the fallback for Driver.TestProxyTexImage().  Test the texture
  * level, width, height and depth against the ctx->Const limits for textures.
diff --git a/src/mesa/main/teximage.h b/src/mesa/main/teximage.h
index eb60a1fa8f..b0d7c1c3aa 100644
--- a/src/mesa/main/teximage.h
+++ b/src/mesa/main/teximage.h
@@ -72,6 +72,10 @@ _mesa_init_teximage_fields(GLcontext *ctx, GLenum target,
                            GLint border, GLenum internalFormat);
 
 
+extern void
+_mesa_clear_texture_image(GLcontext *ctx, struct gl_texture_image *texImage);
+
+
 extern void
 _mesa_set_tex_image(struct gl_texture_object *tObj,
                     GLenum target, GLint level,
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index 2082f945f1..9a7773df81 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -260,6 +260,32 @@ _mesa_copy_texture_object( struct gl_texture_object *dest,
 }
 
 
+/**
+ * Clear all texture images of the given texture object.
+ *
+ * \param ctx GL context.
+ * \param t texture object.
+ *
+ * \sa _mesa_clear_texture_image().
+ */
+void
+_mesa_clear_texture_object(GLcontext *ctx, struct gl_texture_object *texObj)
+{
+   GLuint i, j;
+
+   if (texObj->Target == 0)
+      return;
+
+   for (i = 0; i < MAX_FACES; i++) {
+      for (j = 0; j < MAX_TEXTURE_LEVELS; j++) {
+         struct gl_texture_image *texImage = texObj->Image[i][j];
+         if (texImage)
+            _mesa_clear_texture_image(ctx, texImage);
+      }
+   }
+}
+
+
 /**
  * Check if the given texture object is valid by examining its Target field.
  * For debugging only.
@@ -664,6 +690,24 @@ _mesa_test_texobj_completeness( const GLcontext *ctx,
 }
 
 
+/**
+ * Mark a texture object dirty.  It forces the object to be incomplete
+ * and optionally forces the context to re-validate its state.
+ *
+ * \param ctx GL context.
+ * \param texObj texture object.
+ * \param invalidate_state also invalidate context state.
+ */
+void
+_mesa_dirty_texobj(GLcontext *ctx, struct gl_texture_object *texObj,
+                   GLboolean invalidate_state)
+{
+   texObj->_Complete = GL_FALSE;
+   if (invalidate_state)
+      ctx->NewState |= _NEW_TEXTURE;
+}
+
+
 /**
  * Return pointer to a default/fallback texture.
  * The texture is a 2D 8x8 RGBA texture with all texels = (0,0,0,1).
@@ -715,7 +759,6 @@ _mesa_get_fallback_texture(GLcontext *ctx)
 }
 
 
-
 /*@}*/
 
 
diff --git a/src/mesa/main/texobj.h b/src/mesa/main/texobj.h
index 2599c0816a..9bfebd45c8 100644
--- a/src/mesa/main/texobj.h
+++ b/src/mesa/main/texobj.h
@@ -57,6 +57,9 @@ extern void
 _mesa_copy_texture_object( struct gl_texture_object *dest,
                            const struct gl_texture_object *src );
 
+extern void
+_mesa_clear_texture_object(GLcontext *ctx, struct gl_texture_object *obj);
+
 extern void
 _mesa_reference_texobj(struct gl_texture_object **ptr,
                        struct gl_texture_object *tex);
@@ -65,6 +68,10 @@ extern void
 _mesa_test_texobj_completeness( const GLcontext *ctx,
                                 struct gl_texture_object *obj );
 
+extern void
+_mesa_dirty_texobj(GLcontext *ctx, struct gl_texture_object *texObj,
+                   GLboolean invalidate_state);
+
 extern struct gl_texture_object *
 _mesa_get_fallback_texture(GLcontext *ctx);
 
@@ -76,7 +83,6 @@ _mesa_lock_context_textures( GLcontext *ctx );
 
 /*@}*/
 
-
 /**
  * \name API functions
  */
-- 
cgit v1.2.3


From 45b12edcbe2c112a87993f810f832a9141085b17 Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@jetpack.(none)>
Date: Thu, 6 Aug 2009 15:54:49 +0100
Subject: Ensure GL_EXT_blend_equation_separate is enabled when 2.0 is enabled.

---
 src/mesa/main/extensions.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index c60b58a492..6f683d2fe6 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -413,6 +413,7 @@ _mesa_enable_2_0_extensions(GLcontext *ctx)
    ctx->Extensions.ARB_fragment_shader = GL_TRUE;
 #endif
    ctx->Extensions.ARB_point_sprite = GL_TRUE;
+   ctx->Extensions.EXT_blend_equation_separate = GL_TRUE;
    ctx->Extensions.ARB_texture_non_power_of_two = GL_TRUE;
 #if FEATURE_ARB_shader_objects
    ctx->Extensions.ARB_shader_objects = GL_TRUE;
-- 
cgit v1.2.3


From 8c223e8eb6359d5df918e23ae5c036fa134cc40d Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@jetpack.(none)>
Date: Thu, 6 Aug 2009 15:54:49 +0100
Subject: Ensure GL_EXT_blend_equation_separate is enabled when 2.0 is enabled.

---
 src/mesa/main/extensions.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 5c4bea9cf6..ebbe28acf4 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -404,6 +404,7 @@ _mesa_enable_2_0_extensions(GLcontext *ctx)
    ctx->Extensions.ARB_fragment_shader = GL_TRUE;
 #endif
    ctx->Extensions.ARB_point_sprite = GL_TRUE;
+   ctx->Extensions.EXT_blend_equation_separate = GL_TRUE;
    ctx->Extensions.ARB_texture_non_power_of_two = GL_TRUE;
 #if FEATURE_ARB_shader_objects
    ctx->Extensions.ARB_shader_objects = GL_TRUE;
-- 
cgit v1.2.3


From 3cb6f3bf21adc5ced428521746746fb85c6ae47c Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Thu, 6 Aug 2009 15:21:23 -0500
Subject: GL_ARB_vertex_array_bgra is (basically) a synonym for the EXT version

---
 src/mesa/main/extensions.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 6f683d2fe6..8870a20d0e 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -78,6 +78,7 @@ static const struct {
    { OFF, "GL_ARB_texture_non_power_of_two",   F(ARB_texture_non_power_of_two)},
    { OFF, "GL_ARB_texture_rectangle",          F(NV_texture_rectangle) },
    { ON,  "GL_ARB_transpose_matrix",           F(ARB_transpose_matrix) },
+   { OFF, "GL_ARB_vertex_array_bgra",          F(EXT_vertex_array_bgra) },
    { OFF, "GL_ARB_vertex_array_object",        F(ARB_vertex_array_object) },
    { ON,  "GL_ARB_vertex_buffer_object",       F(ARB_vertex_buffer_object) },
    { OFF, "GL_ARB_vertex_program",             F(ARB_vertex_program) },
-- 
cgit v1.2.3


From 3105fd760b8a6fc34438d51d36b65670810626a2 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 4 Aug 2009 17:02:12 -0600
Subject: mesa: fix comment

---
 src/mesa/main/texobj.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index 9a7773df81..22657ed81b 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -1203,10 +1203,9 @@ _mesa_IsTexture( GLuint texture )
 
 
 /**
- * Simplest implementation of texture locking: Grab the a new mutex in
- * the shared context.  Examine the shared context state timestamp and
- * if there has been a change, set the appropriate bits in
- * ctx->NewState.
+ * Simplest implementation of texture locking: grab the shared tex
+ * mutex.  Examine the shared context state timestamp and if there has
+ * been a change, set the appropriate bits in ctx->NewState.
  *
  * This is used to deal with synchronizing things when a texture object
  * is used/modified by different contexts (or threads) which are sharing
-- 
cgit v1.2.3


From b28854088bb6a6fa1a12f47056d9aee2fbdefc70 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 6 Aug 2009 13:53:06 -0600
Subject: mesa: new _mesa_copy_client_array() function

---
 src/mesa/main/varray.c | 23 +++++++++++++++++++++++
 src/mesa/main/varray.h |  6 ++++++
 2 files changed, 29 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 88bf8d8d35..be1c03cec2 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -1098,6 +1098,29 @@ _mesa_MultiModeDrawElementsIBM( const GLenum * mode, const GLsizei * count,
 }
 
 
+/**
+ * Copy one client vertex array to another.
+ */
+void
+_mesa_copy_client_array(GLcontext *ctx,
+                        struct gl_client_array *dst,
+                        struct gl_client_array *src)
+{
+   dst->Size = src->Size;
+   dst->Type = src->Type;
+   dst->Format = src->Format;
+   dst->Stride = src->Stride;
+   dst->StrideB = src->StrideB;
+   dst->Ptr = src->Ptr;
+   dst->Enabled = src->Enabled;
+   dst->Normalized = src->Normalized;
+   dst->_ElementSize = src->_ElementSize;
+   _mesa_reference_buffer_object(ctx, &dst->BufferObj, src->BufferObj);
+   dst->_MaxElement = src->_MaxElement;
+}
+
+
+
 /**
  * Print vertex array's fields.
  */
diff --git a/src/mesa/main/varray.h b/src/mesa/main/varray.h
index d4d505ae04..becc67c29d 100644
--- a/src/mesa/main/varray.h
+++ b/src/mesa/main/varray.h
@@ -160,6 +160,12 @@ _mesa_DrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count,
                         GLenum type, const GLvoid *indices);
 
 
+extern void
+_mesa_copy_client_array(GLcontext *ctx,
+                        struct gl_client_array *dst,
+                        struct gl_client_array *src);
+
+
 extern void
 _mesa_print_arrays(GLcontext *ctx);
 
-- 
cgit v1.2.3


From 28cfd37bb3c5dfa70715d91bd523e93dfedd3981 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 7 Aug 2009 08:53:53 -0600
Subject: mesa: use a more logical flag in _mesa_set_vp_override()

---
 src/mesa/main/state.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 9a70031b7a..140a998df2 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -713,6 +713,6 @@ _mesa_set_vp_override(GLcontext *ctx, GLboolean flag)
       /* Set one of the bits which will trigger fragment program
        * regeneration:
        */
-      ctx->NewState |= _NEW_ARRAY; 
+      ctx->NewState |= _NEW_PROGRAM;
    }
 }
-- 
cgit v1.2.3


From 3335b847bf1e1ee9e77600bd7122eb56ffbc8c07 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 7 Aug 2009 09:03:49 -0600
Subject: mesa: do error checking on glCopyPixels() type parameter

Plus, move some other error checks before state validation and update
some comments.
---
 src/mesa/main/drawpix.c | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index 6682b5e725..ec8a45cb94 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -27,6 +27,7 @@
 #include "bufferobj.h"
 #include "context.h"
 #include "drawpix.h"
+#include "enums.h"
 #include "feedback.h"
 #include "framebuffer.h"
 #include "image.h"
@@ -62,7 +63,7 @@ _mesa_DrawPixels( GLsizei width, GLsizei height,
    }
 
    if (_mesa_error_check_format_type(ctx, format, type, GL_TRUE)) {
-      /* found an error */
+      /* the error was already recorded */
       return;
    }
 
@@ -73,7 +74,7 @@ _mesa_DrawPixels( GLsizei width, GLsizei height,
    }
 
    if (!ctx->Current.RasterPosValid) {
-      return;
+      return; /* no-op, not an error */
    }
 
    if (ctx->RenderMode == GL_RENDER) {
@@ -126,6 +127,17 @@ _mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height,
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
+   if (width < 0 || height < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glCopyPixels(width or height < 0)");
+      return;
+   }
+
+   if (type != GL_COLOR && type != GL_DEPTH && type != GL_STENCIL) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glCopyPixels(type=%s)",
+                  _mesa_lookup_enum_by_nr(type));
+      return;
+   }
+
    if (ctx->NewState) {
       _mesa_update_state(ctx);
    }
@@ -136,11 +148,6 @@ _mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height,
       return;
    }
 
-   if (width < 0 || height < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glCopyPixels(width or height < 0)");
-      return;
-   }
-
    if (ctx->DrawBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT ||
        ctx->ReadBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
       _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,
@@ -156,7 +163,7 @@ _mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height,
    }
 
    if (!ctx->Current.RasterPosValid || width ==0 || height == 0) {
-      return;
+      return; /* no-op, not an error */
    }
 
    if (ctx->RenderMode == GL_RENDER) {
-- 
cgit v1.2.3


From 2dec62405f9e2e46997046a32211f25ba83d2600 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 7 Aug 2009 09:18:04 -0600
Subject: mesa: fix some incorrect error checks in
 _mesa_error_check_format_type()

Plus, simplify the code a bit.
---
 src/mesa/main/readpix.c | 51 ++++++++++++++++++++++++++++++++-----------------
 1 file changed, 34 insertions(+), 17 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/readpix.c b/src/mesa/main/readpix.c
index 2326776ecb..1753570605 100644
--- a/src/mesa/main/readpix.c
+++ b/src/mesa/main/readpix.c
@@ -44,6 +44,10 @@ _mesa_error_check_format_type(GLcontext *ctx, GLenum format, GLenum type,
                               GLboolean drawing)
 {
    const char *readDraw = drawing ? "Draw" : "Read";
+   const GLboolean reading = !drawing;
+
+   /* state validation should have already been done */
+   ASSERT(ctx->NewState == 0x0);
 
    if (ctx->Extensions.EXT_packed_depth_stencil
        && type == GL_UNSIGNED_INT_24_8_EXT
@@ -73,32 +77,45 @@ _mesa_error_check_format_type(GLcontext *ctx, GLenum format, GLenum type,
    case GL_RGBA:
    case GL_BGRA:
    case GL_ABGR_EXT:
-      if (drawing && !ctx->Visual.rgbMode) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
+      if (drawing) {
+         if (!ctx->DrawBuffer->Visual.rgbMode) {
+            _mesa_error(ctx, GL_INVALID_OPERATION,
                    "glDrawPixels(drawing RGB pixels into color index buffer)");
-         return GL_TRUE;
+            return GL_TRUE;
+         }
       }
-      if (!drawing && !_mesa_dest_buffer_exists(ctx, GL_COLOR)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glReadPixels(no color buffer)");
-         return GL_TRUE;
+      else {
+         /* reading */
+         if (!_mesa_source_buffer_exists(ctx, GL_COLOR)) {
+            _mesa_error(ctx, GL_INVALID_OPERATION,
+                        "glReadPixels(no color buffer)");
+            return GL_TRUE;
+         }
       }
       break;
    case GL_COLOR_INDEX:
-      if (!drawing && ctx->Visual.rgbMode) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                    "glReadPixels(reading color index format from RGB buffer)");
-         return GL_TRUE;
+      if (drawing) {
+         if (ctx->DrawBuffer->Visual.rgbMode &&
+             (ctx->PixelMaps.ItoR.Size == 0 ||
+              ctx->PixelMaps.ItoG.Size == 0 ||
+              ctx->PixelMaps.ItoB.Size == 0)) {
+            _mesa_error(ctx, GL_INVALID_OPERATION,
+                   "glDrawPixels(drawing color index pixels into RGB buffer)");
+            return GL_TRUE;
+         }
       }
-      if (!drawing && !_mesa_dest_buffer_exists(ctx, GL_COLOR)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glReadPixels(no color buffer)");
-         return GL_TRUE;
+      else {
+         /* reading */
+         if (!_mesa_source_buffer_exists(ctx, GL_COLOR)) {
+            _mesa_error(ctx, GL_INVALID_OPERATION,
+                        "glReadPixels(no color buffer)");
+            return GL_TRUE;
+         }
       }
       break;
    case GL_STENCIL_INDEX:
       if ((drawing && !_mesa_dest_buffer_exists(ctx, format)) ||
-          (!drawing && !_mesa_source_buffer_exists(ctx, format))) {
+          (reading && !_mesa_source_buffer_exists(ctx, format))) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "gl%sPixels(no stencil buffer)", readDraw);
          return GL_TRUE;
@@ -118,7 +135,7 @@ _mesa_error_check_format_type(GLcontext *ctx, GLenum format, GLenum type,
          return GL_TRUE;
       }
       if ((drawing && !_mesa_dest_buffer_exists(ctx, format)) ||
-          (!drawing && !_mesa_source_buffer_exists(ctx, format))) {
+          (reading && !_mesa_source_buffer_exists(ctx, format))) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "gl%sPixels(no depth or stencil buffer)", readDraw);
          return GL_TRUE;
-- 
cgit v1.2.3


From 94504be63a9a70263a0eb2872295867c989be2b1 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 7 Aug 2009 09:24:00 -0600
Subject: mesa: test DrawBuffer, not ReadBuffer in _mesa_dest_buffer_exists()

Also, update comments.
---
 src/mesa/main/framebuffer.c | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/framebuffer.c b/src/mesa/main/framebuffer.c
index 5a13c88a7a..9d9c4217a6 100644
--- a/src/mesa/main/framebuffer.c
+++ b/src/mesa/main/framebuffer.c
@@ -817,7 +817,7 @@ _mesa_update_framebuffer(GLcontext *ctx)
 
 /**
  * Check if the renderbuffer for a read operation (glReadPixels, glCopyPixels,
- * glCopyTex[Sub]Image, etc. exists.
+ * glCopyTex[Sub]Image, etc) exists.
  * \param format  a basic image format such as GL_RGB, GL_RGBA, GL_ALPHA,
  *                GL_DEPTH_COMPONENT, etc. or GL_COLOR, GL_DEPTH, GL_STENCIL.
  * \return GL_TRUE if buffer exists, GL_FALSE otherwise
@@ -825,8 +825,10 @@ _mesa_update_framebuffer(GLcontext *ctx)
 GLboolean
 _mesa_source_buffer_exists(GLcontext *ctx, GLenum format)
 {
-   const struct gl_renderbuffer_attachment *att
-      = ctx->ReadBuffer->Attachment;
+   const struct gl_renderbuffer_attachment *att = ctx->ReadBuffer->Attachment;
+
+   /* state validation should have already been done */
+   ASSERT(ctx->NewState == 0x0);
 
    if (ctx->ReadBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
       return GL_FALSE;
@@ -850,10 +852,8 @@ _mesa_source_buffer_exists(GLcontext *ctx, GLenum format)
       if (ctx->ReadBuffer->_ColorReadBuffer == NULL) {
          return GL_FALSE;
       }
-      /* XXX enable this post 6.5 release:
       ASSERT(ctx->ReadBuffer->_ColorReadBuffer->RedBits > 0 ||
              ctx->ReadBuffer->_ColorReadBuffer->IndexBits > 0);
-      */
       break;
    case GL_DEPTH:
    case GL_DEPTH_COMPONENT:
@@ -891,13 +891,15 @@ _mesa_source_buffer_exists(GLcontext *ctx, GLenum format)
 
 /**
  * As above, but for drawing operations.
- * XXX code do some code merging w/ above function.
+ * XXX could do some code merging w/ above function.
  */
 GLboolean
 _mesa_dest_buffer_exists(GLcontext *ctx, GLenum format)
 {
-   const struct gl_renderbuffer_attachment *att
-      = ctx->ReadBuffer->Attachment;
+   const struct gl_renderbuffer_attachment *att = ctx->DrawBuffer->Attachment;
+
+   /* state validation should have already been done */
+   ASSERT(ctx->NewState == 0x0);
 
    if (ctx->DrawBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
       return GL_FALSE;
@@ -918,7 +920,7 @@ _mesa_dest_buffer_exists(GLcontext *ctx, GLenum format)
    case GL_BGRA:
    case GL_ABGR_EXT:
    case GL_COLOR_INDEX:
-      /* nothing special */
+      /* Nothing special since GL_DRAW_BUFFER could be GL_NONE. */
       /* Could assert that colorbuffer has RedBits > 0 */
       break;
    case GL_DEPTH:
@@ -945,7 +947,7 @@ _mesa_dest_buffer_exists(GLcontext *ctx, GLenum format)
       break;
    default:
       _mesa_problem(ctx,
-                    "Unexpected format 0x%x in _mesa_source_buffer_exists",
+                    "Unexpected format 0x%x in _mesa_dest_buffer_exists",
                     format);
       return GL_FALSE;
    }
-- 
cgit v1.2.3


From f738b913e6b3aa4e3e9bea41d37e634c6952536f Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 7 Aug 2009 09:30:53 -0600
Subject: mesa: use valid_fragment_program() helper

---
 src/mesa/main/drawpix.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index ec8a45cb94..4e0cc056c7 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -35,6 +35,18 @@
 #include "state.h"
 
 
+
+/**
+ * If a fragment program is enabled, check that it's valid.
+ * \return GL_TRUE if valid, GL_FALSE otherwise
+ */
+static GLboolean
+valid_fragment_program(GLcontext *ctx)
+{
+   return !(ctx->FragmentProgram.Enabled && !ctx->FragmentProgram._Enabled);
+}
+
+
 #if _HAVE_FULL_GL
 
 /*
@@ -56,7 +68,7 @@ _mesa_DrawPixels( GLsizei width, GLsizei height,
       _mesa_update_state(ctx);
    }
 
-   if (ctx->FragmentProgram.Enabled && !ctx->FragmentProgram._Enabled) {
+   if (!valid_fragment_program(ctx)) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
                   "glDrawPixels (invalid fragment program)");
       return;
@@ -142,7 +154,7 @@ _mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height,
       _mesa_update_state(ctx);
    }
 
-   if (ctx->FragmentProgram.Enabled && !ctx->FragmentProgram._Enabled) {
+   if (!valid_fragment_program(ctx)) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
                   "glCopyPixels (invalid fragment program)");
       return;
@@ -215,7 +227,7 @@ _mesa_Bitmap( GLsizei width, GLsizei height,
       _mesa_update_state(ctx);
    }
 
-   if (ctx->FragmentProgram.Enabled && !ctx->FragmentProgram._Enabled) {
+   if (!valid_fragment_program(ctx)) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
                   "glBitmap (invalid fragment program)");
       return;
-- 
cgit v1.2.3


From 67153a4518ad23e31205a44119b1d63951ff1fb9 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 7 Aug 2009 09:40:02 -0600
Subject: mesa: new _mesa_bufferobj_mapped() helper function

---
 src/mesa/main/bufferobj.h | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h
index ef59ff83c8..3678fba435 100644
--- a/src/mesa/main/bufferobj.h
+++ b/src/mesa/main/bufferobj.h
@@ -36,6 +36,14 @@
  * Internal functions
  */
 
+
+/** Is the given buffer object currently mapped? */
+static INLINE GLboolean
+_mesa_bufferobj_mapped(struct gl_buffer_object *obj)
+{
+   return obj->Pointer != NULL;
+}
+
 extern void
 _mesa_init_buffer_objects( GLcontext *ctx );
 
-- 
cgit v1.2.3


From 7bf6efe78066b33c4ddd278d78ea44cfd12154cc Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 7 Aug 2009 09:40:37 -0600
Subject: mesa: use _mesa_bufferobj_mapped()

---
 src/mesa/main/bufferobj.c | 30 +++++++++++++++---------------
 src/mesa/main/drawpix.c   |  4 ++--
 src/mesa/main/readpix.c   |  2 +-
 3 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index d640f5358e..ae202c283c 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -165,7 +165,7 @@ buffer_object_subdata_range_good( GLcontext * ctx, GLenum target,
 		  "%s(size + offset > buffer size)", caller);
       return NULL;
    }
-   if (bufObj->Pointer) {
+   if (_mesa_bufferobj_mapped(bufObj)) {
       /* Buffer is currently mapped */
       _mesa_error(ctx, GL_INVALID_OPERATION, "%s", caller);
       return NULL;
@@ -423,7 +423,7 @@ _mesa_buffer_map( GLcontext *ctx, GLenum target, GLenum access,
    (void) target;
    (void) access;
    /* Just return a direct pointer to the data */
-   if (bufObj->Pointer) {
+   if (_mesa_bufferobj_mapped(bufObj)) {
       /* already mapped! */
       return NULL;
    }
@@ -445,7 +445,7 @@ _mesa_buffer_map_range( GLcontext *ctx, GLenum target, GLintptr offset,
    (void) target;
    (void) access;
    (void) length;
-   assert(!bufObj->Pointer);
+   assert(!_mesa_bufferobj_mapped(bufObj));
    /* Just return a direct pointer to the data */
    return bufObj->Data + offset;
 }
@@ -502,8 +502,8 @@ _mesa_copy_buffer_subdata(GLcontext *ctx,
    GLubyte *srcPtr, *dstPtr;
 
    /* buffer should not already be mapped */
-   assert(!src->Pointer);
-   assert(!dst->Pointer);
+   assert(!_mesa_bufferobj_mapped(src));
+   assert(!_mesa_bufferobj_mapped(dst));
 
    srcPtr = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_COPY_READ_BUFFER,
                                               GL_READ_ONLY, src);
@@ -932,7 +932,7 @@ _mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids)
 
          ASSERT(bufObj->Name == ids[i]);
 
-         if (bufObj->Pointer) {
+         if (_mesa_bufferobj_mapped(bufObj)) {
             /* if mapped, unmap it now */
             ctx->Driver.UnmapBuffer(ctx, 0, bufObj);
             bufObj->AccessFlags = DEFAULT_ACCESS;
@@ -1091,7 +1091,7 @@ _mesa_BufferDataARB(GLenum target, GLsizeiptrARB size,
       return;
    }
    
-   if (bufObj->Pointer) {
+   if (_mesa_bufferobj_mapped(bufObj)) {
       /* Unmap the existing buffer.  We'll replace it now.  Not an error. */
       ctx->Driver.UnmapBuffer(ctx, target, bufObj);
       bufObj->AccessFlags = DEFAULT_ACCESS;
@@ -1191,14 +1191,14 @@ _mesa_MapBufferARB(GLenum target, GLenum access)
       _mesa_error(ctx, GL_INVALID_OPERATION, "glMapBufferARB(buffer 0)" );
       return NULL;
    }
-   if (bufObj->Pointer) {
+   if (_mesa_bufferobj_mapped(bufObj)) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "glMapBufferARB(already mapped)");
       return NULL;
    }
 
    ASSERT(ctx->Driver.MapBuffer);
    bufObj->Pointer = ctx->Driver.MapBuffer( ctx, target, access, bufObj );
-   if (!bufObj->Pointer) {
+   if (!_mesa_bufferobj_mapped(bufObj)) {
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glMapBufferARB(access)");
    }
 
@@ -1252,7 +1252,7 @@ _mesa_UnmapBufferARB(GLenum target)
       _mesa_error(ctx, GL_INVALID_OPERATION, "glUnmapBufferARB" );
       return GL_FALSE;
    }
-   if (!bufObj->Pointer) {
+   if (!_mesa_bufferobj_mapped(bufObj)) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "glUnmapBufferARB");
       return GL_FALSE;
    }
@@ -1331,7 +1331,7 @@ _mesa_GetBufferParameterivARB(GLenum target, GLenum pname, GLint *params)
          *params = simplified_access_mode(bufObj->AccessFlags);
          break;
       case GL_BUFFER_MAPPED_ARB:
-         *params = (bufObj->Pointer != NULL);
+         *params = _mesa_bufferobj_mapped(bufObj);
          break;
       default:
          _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferParameterivARB(pname)");
@@ -1389,13 +1389,13 @@ _mesa_CopyBufferSubData(GLenum readTarget, GLenum writeTarget,
       return;
    }
 
-   if (src->Pointer) {
+   if (_mesa_bufferobj_mapped(src)) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
                   "glCopyBuffserSubData(readBuffer is mapped)");
       return;
    }
 
-   if (dst->Pointer) {
+   if (_mesa_bufferobj_mapped(dst)) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
                   "glCopyBuffserSubData(writeBuffer is mapped)");
       return;
@@ -1511,7 +1511,7 @@ _mesa_MapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length,
       return NULL;
    }
 
-   if (bufObj->Pointer) {
+   if (_mesa_bufferobj_mapped(bufObj)) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
                   "glMapBufferRange(buffer already mapped)");
       return NULL;
@@ -1570,7 +1570,7 @@ _mesa_FlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)
       return;
    }
 
-   if (!bufObj->Pointer) {
+   if (!_mesa_bufferobj_mapped(bufObj)) {
       /* buffer is not mapped */
       _mesa_error(ctx, GL_INVALID_OPERATION,
                   "glMapBufferRange(buffer is not mapped)");
diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index 4e0cc056c7..a3d25f46b7 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -103,7 +103,7 @@ _mesa_DrawPixels( GLsizei width, GLsizei height,
                            "glDrawPixels(invalid PBO access)");
                return;
             }
-            if (ctx->Unpack.BufferObj->Pointer) {
+            if (_mesa_bufferobj_mapped(ctx->Unpack.BufferObj)) {
                /* buffer is mapped - that's an error */
                _mesa_error(ctx, GL_INVALID_OPERATION,
                            "glDrawPixels(PBO is mapped)");
@@ -254,7 +254,7 @@ _mesa_Bitmap( GLsizei width, GLsizei height,
                         "glBitmap(invalid PBO access)");
             return;
          }
-         if (ctx->Unpack.BufferObj->Pointer) {
+         if (_mesa_bufferobj_mapped(ctx->Unpack.BufferObj)) {
             /* buffer is mapped - that's an error */
             _mesa_error(ctx, GL_INVALID_OPERATION, "glBitmap(PBO is mapped)");
             return;
diff --git a/src/mesa/main/readpix.c b/src/mesa/main/readpix.c
index 1753570605..18958fd438 100644
--- a/src/mesa/main/readpix.c
+++ b/src/mesa/main/readpix.c
@@ -198,7 +198,7 @@ _mesa_ReadPixels( GLint x, GLint y, GLsizei width, GLsizei height,
          return;
       }
 
-      if (ctx->Pack.BufferObj->Pointer) {
+      if (_mesa_bufferobj_mapped(ctx->Pack.BufferObj)) {
          /* buffer is mapped - that's an error */
          _mesa_error(ctx, GL_INVALID_OPERATION, "glReadPixels(PBO is mapped)");
          return;
-- 
cgit v1.2.3


From 6807d96f8efeecd9d71e1e1bff856e7e04f5f364 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 7 Aug 2009 09:42:28 -0600
Subject: mesa: reformat code to allow setting breakpoints on the
 true-statement

---
 src/mesa/main/texenvprogram.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 1ee78ffa16..3736138b9e 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -322,8 +322,10 @@ static GLbitfield get_fp_input_mask( GLcontext *ctx )
       /* Then look at what might be varying as a result of enabled
        * arrays, etc:
        */
-      if (varying_inputs & VERT_BIT_COLOR0) fp_inputs |= FRAG_BIT_COL0;
-      if (varying_inputs & VERT_BIT_COLOR1) fp_inputs |= FRAG_BIT_COL1;
+      if (varying_inputs & VERT_BIT_COLOR0)
+         fp_inputs |= FRAG_BIT_COL0;
+      if (varying_inputs & VERT_BIT_COLOR1)
+         fp_inputs |= FRAG_BIT_COL1;
 
       fp_inputs |= (((varying_inputs & VERT_BIT_TEX_ANY) >> VERT_ATTRIB_TEX0) 
                     << FRAG_ATTRIB_TEX0);
@@ -352,8 +354,10 @@ static GLbitfield get_fp_input_mask( GLcontext *ctx )
       if (ctx->Point.PointSprite)
          vp_outputs |= FRAG_BITS_TEX_ANY;
 
-      if (vp_outputs & (1 << VERT_RESULT_COL0)) fp_inputs |= FRAG_BIT_COL0;
-      if (vp_outputs & (1 << VERT_RESULT_COL1)) fp_inputs |= FRAG_BIT_COL1;
+      if (vp_outputs & (1 << VERT_RESULT_COL0))
+         fp_inputs |= FRAG_BIT_COL0;
+      if (vp_outputs & (1 << VERT_RESULT_COL1))
+         fp_inputs |= FRAG_BIT_COL1;
 
       fp_inputs |= (((vp_outputs & VERT_RESULT_TEX_ANY) >> VERT_RESULT_TEX0) 
                     << FRAG_ATTRIB_TEX0);
-- 
cgit v1.2.3


From 2c9812e3d346eb07180da520909b142e8afc1c59 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 7 Aug 2009 09:50:25 -0600
Subject: mesa: use _mesa_set_vp_override() in glDraw/CopyPixels and glBitmap

We don't use the vertex program in these functions and the driver may
install its own.  This fixes the broken glCopyPixels swrast fallback in
i965 and possibly other drivers.  In particular, glCopyPixels sometimes
didn't work because the fixed-function fragment program was replacing all
fragment colors with the current raster color.
---
 src/mesa/main/drawpix.c | 52 ++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 38 insertions(+), 14 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index a3d25f46b7..3ba285c424 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -64,6 +64,11 @@ _mesa_DrawPixels( GLsizei width, GLsizei height,
       return;
    }
 
+   /* We're not using the current vertex program, and the driver may install
+    * it's own.
+    */
+   _mesa_set_vp_override(ctx, GL_TRUE);
+
    if (ctx->NewState) {
       _mesa_update_state(ctx);
    }
@@ -71,22 +76,22 @@ _mesa_DrawPixels( GLsizei width, GLsizei height,
    if (!valid_fragment_program(ctx)) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
                   "glDrawPixels (invalid fragment program)");
-      return;
+      goto end;
    }
 
    if (_mesa_error_check_format_type(ctx, format, type, GL_TRUE)) {
       /* the error was already recorded */
-      return;
+      goto end;
    }
 
    if (ctx->DrawBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
       _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,
                   "glDrawPixels(incomplete framebuffer)" );
-      return;
+      goto end;
    }
 
    if (!ctx->Current.RasterPosValid) {
-      return; /* no-op, not an error */
+      goto end; /* no-op, not an error */
    }
 
    if (ctx->RenderMode == GL_RENDER) {
@@ -101,13 +106,13 @@ _mesa_DrawPixels( GLsizei width, GLsizei height,
                                            format, type, pixels)) {
                _mesa_error(ctx, GL_INVALID_OPERATION,
                            "glDrawPixels(invalid PBO access)");
-               return;
+               goto end;
             }
             if (_mesa_bufferobj_mapped(ctx->Unpack.BufferObj)) {
                /* buffer is mapped - that's an error */
                _mesa_error(ctx, GL_INVALID_OPERATION,
                            "glDrawPixels(PBO is mapped)");
-               return;
+               goto end;
             }
          }
 
@@ -129,6 +134,9 @@ _mesa_DrawPixels( GLsizei width, GLsizei height,
       ASSERT(ctx->RenderMode == GL_SELECT);
       /* Do nothing.  See OpenGL Spec, Appendix B, Corollary 6. */
    }
+
+end:
+   _mesa_set_vp_override(ctx, GL_FALSE);
 }
 
 
@@ -150,6 +158,11 @@ _mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height,
       return;
    }
 
+   /* We're not using the current vertex program, and the driver may install
+    * it's own.
+    */
+   _mesa_set_vp_override(ctx, GL_TRUE);
+
    if (ctx->NewState) {
       _mesa_update_state(ctx);
    }
@@ -157,25 +170,25 @@ _mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height,
    if (!valid_fragment_program(ctx)) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
                   "glCopyPixels (invalid fragment program)");
-      return;
+      goto end;
    }
 
    if (ctx->DrawBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT ||
        ctx->ReadBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
       _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,
                   "glCopyPixels(incomplete framebuffer)" );
-      return;
+      goto end;
    }
 
    if (!_mesa_source_buffer_exists(ctx, type) ||
        !_mesa_dest_buffer_exists(ctx, type)) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
                   "glCopyPixels(missing source or dest buffer)");
-      return;
+      goto end;
    }
 
    if (!ctx->Current.RasterPosValid || width ==0 || height == 0) {
-      return; /* no-op, not an error */
+      goto end; /* no-op, not an error */
    }
 
    if (ctx->RenderMode == GL_RENDER) {
@@ -200,6 +213,9 @@ _mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height,
       ASSERT(ctx->RenderMode == GL_SELECT);
       /* Do nothing.  See OpenGL Spec, Appendix B, Corollary 6. */
    }
+
+end:
+   _mesa_set_vp_override(ctx, GL_FALSE);
 }
 
 #endif /* _HAVE_FULL_GL */
@@ -223,6 +239,11 @@ _mesa_Bitmap( GLsizei width, GLsizei height,
       return;    /* do nothing */
    }
 
+   /* We're not using the current vertex program, and the driver may install
+    * it's own.
+    */
+   _mesa_set_vp_override(ctx, GL_TRUE);
+
    if (ctx->NewState) {
       _mesa_update_state(ctx);
    }
@@ -230,13 +251,13 @@ _mesa_Bitmap( GLsizei width, GLsizei height,
    if (!valid_fragment_program(ctx)) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
                   "glBitmap (invalid fragment program)");
-      return;
+      goto end;
    }
 
    if (ctx->DrawBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
       _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,
                   "glBitmap(incomplete framebuffer)");
-      return;
+      goto end;
    }
 
    if (ctx->RenderMode == GL_RENDER) {
@@ -252,12 +273,12 @@ _mesa_Bitmap( GLsizei width, GLsizei height,
                                         (GLvoid *) bitmap)) {
             _mesa_error(ctx, GL_INVALID_OPERATION,
                         "glBitmap(invalid PBO access)");
-            return;
+            goto end;
          }
          if (_mesa_bufferobj_mapped(ctx->Unpack.BufferObj)) {
             /* buffer is mapped - that's an error */
             _mesa_error(ctx, GL_INVALID_OPERATION, "glBitmap(PBO is mapped)");
-            return;
+            goto end;
          }
       }
 
@@ -282,6 +303,9 @@ _mesa_Bitmap( GLsizei width, GLsizei height,
    /* update raster position */
    ctx->Current.RasterPos[0] += xmove;
    ctx->Current.RasterPos[1] += ymove;
+
+end:
+   _mesa_set_vp_override(ctx, GL_FALSE);
 }
 
 
-- 
cgit v1.2.3


From 4482f96c59d7d0f0b19329e997fb59dba3e84119 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 7 Aug 2009 10:51:03 -0600
Subject: mesa: use _mesa_bufferobj_mapped()

---
 src/mesa/main/shared.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/shared.c b/src/mesa/main/shared.c
index ad6e6ce7cd..93bbccd3c7 100644
--- a/src/mesa/main/shared.c
+++ b/src/mesa/main/shared.c
@@ -196,7 +196,7 @@ delete_bufferobj_cb(GLuint id, void *data, void *userData)
 {
    struct gl_buffer_object *bufObj = (struct gl_buffer_object *) data;
    GLcontext *ctx = (GLcontext *) userData;
-   if (bufObj->Pointer) {
+   if (_mesa_bufferobj_mapped(bufObj)) {
       ctx->Driver.UnmapBuffer(ctx, 0, bufObj);
       bufObj->Pointer = NULL;
    }
-- 
cgit v1.2.3


From 924ba484990a57266b433b59b554124df4924fb4 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 7 Aug 2009 13:07:59 -0600
Subject: mesa: remove old, prototype code

---
 src/mesa/main/drawpix.c | 65 -------------------------------------------------
 1 file changed, 65 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index 3ba285c424..c07de9ce99 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -307,68 +307,3 @@ _mesa_Bitmap( GLsizei width, GLsizei height,
 end:
    _mesa_set_vp_override(ctx, GL_FALSE);
 }
-
-
-
-#if 0  /* experimental */
-/*
- * Execute glDrawDepthPixelsMESA().  This function accepts both a color
- * image and depth (Z) image.  Rasterization produces fragments with
- * color and Z taken from these images.  This function is intended for
- * Z-compositing.  Normally, this operation requires two glDrawPixels
- * calls with stencil testing.
- */
-void GLAPIENTRY
-_mesa_DrawDepthPixelsMESA( GLsizei width, GLsizei height,
-                           GLenum colorFormat, GLenum colorType,
-                           const GLvoid *colors,
-                           GLenum depthType, const GLvoid *depths )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (width < 0 || height < 0) {
-      _mesa_error( ctx, GL_INVALID_VALUE,
-                   "glDrawDepthPixelsMESA(width or height < 0" );
-      return;
-   }
-
-   if (!ctx->Current.RasterPosValid) {
-      return;
-   }
-
-   if (ctx->NewState) {
-      _mesa_update_state(ctx);
-   }
-
-   if (ctx->DrawBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
-      _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,
-                  "glDrawDepthPixelsMESA(incomplete framebuffer)");
-      return;
-   }
-
-   if (ctx->RenderMode == GL_RENDER) {
-      /* Round, to satisfy conformance tests (matches SGI's OpenGL) */
-      GLint x = IROUND(ctx->Current.RasterPos[0]);
-      GLint y = IROUND(ctx->Current.RasterPos[1]);
-      ctx->Driver.DrawDepthPixelsMESA(ctx, x, y, width, height,
-                                      colorFormat, colorType, colors,
-                                      depthType, depths, &ctx->Unpack);
-   }
-   else if (ctx->RenderMode == GL_FEEDBACK) {
-      /* Feedback the current raster pos info */
-      FLUSH_CURRENT( ctx, 0 );
-      _mesa_feedback_token( ctx, (GLfloat) (GLint) GL_DRAW_PIXEL_TOKEN );
-      _mesa_feedback_vertex( ctx,
-                             ctx->Current.RasterPos,
-                             ctx->Current.RasterColor,
-                             ctx->Current.RasterIndex,
-                             ctx->Current.RasterTexCoords[0] );
-   }
-   else {
-      ASSERT(ctx->RenderMode == GL_SELECT);
-      /* Do nothing.  See OpenGL Spec, Appendix B, Corollary 6. */
-   }
-}
-
-#endif
-- 
cgit v1.2.3


From 101c2f907e71b7c5e14dcd899389155ea802b2af Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 7 Aug 2009 13:39:03 -0600
Subject: mesa: simplify glPushAttrib() list building code

---
 src/mesa/main/attrib.c | 146 ++++++++++++++-----------------------------------
 1 file changed, 40 insertions(+), 106 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index cb49c4cb07..ab99ca1c64 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -174,24 +174,30 @@ struct texture_state
 
 
 /**
- * Allocate a new attribute state node.  These nodes have a
- * "kind" value and a pointer to a struct of state data.
+ * Allocate new attribute node of given type/kind.  Attach payload data.
+ * Insert it into the linked list named by 'head'.
  */
-static struct gl_attrib_node *
-new_attrib_node( GLbitfield kind )
+static void
+save_attrib_data(struct gl_attrib_node **head,
+                 GLbitfield kind, void *payload)
 {
-   struct gl_attrib_node *an = MALLOC_STRUCT(gl_attrib_node);
-   if (an) {
-      an->kind = kind;
+   struct gl_attrib_node *n = MALLOC_STRUCT(gl_attrib_node);
+   if (n) {
+      n->kind = kind;
+      n->data = payload;
+      /* insert at head */
+      n->next = *head;
+      *head = n;
+   }
+   else {
+      /* out of memory! */
    }
-   return an;
 }
 
 
 void GLAPIENTRY
 _mesa_PushAttrib(GLbitfield mask)
 {
-   struct gl_attrib_node *newnode;
    struct gl_attrib_node *head;
 
    GET_CURRENT_CONTEXT(ctx);
@@ -213,10 +219,7 @@ _mesa_PushAttrib(GLbitfield mask)
       struct gl_accum_attrib *attr;
       attr = MALLOC_STRUCT( gl_accum_attrib );
       MEMCPY( attr, &ctx->Accum, sizeof(struct gl_accum_attrib) );
-      newnode = new_attrib_node( GL_ACCUM_BUFFER_BIT );
-      newnode->data = attr;
-      newnode->next = head;
-      head = newnode;
+      save_attrib_data(&head, GL_ACCUM_BUFFER_BIT, attr);
    }
 
    if (mask & GL_COLOR_BUFFER_BIT) {
@@ -227,10 +230,7 @@ _mesa_PushAttrib(GLbitfield mask)
       /* push the Draw FBO's DrawBuffer[] state, not ctx->Color.DrawBuffer[] */
       for (i = 0; i < ctx->Const.MaxDrawBuffers; i ++)
          attr->DrawBuffer[i] = ctx->DrawBuffer->ColorDrawBuffer[i];
-      newnode = new_attrib_node( GL_COLOR_BUFFER_BIT );
-      newnode->data = attr;
-      newnode->next = head;
-      head = newnode;
+      save_attrib_data(&head, GL_COLOR_BUFFER_BIT, attr);
    }
 
    if (mask & GL_CURRENT_BIT) {
@@ -238,20 +238,14 @@ _mesa_PushAttrib(GLbitfield mask)
       FLUSH_CURRENT( ctx, 0 );
       attr = MALLOC_STRUCT( gl_current_attrib );
       MEMCPY( attr, &ctx->Current, sizeof(struct gl_current_attrib) );
-      newnode = new_attrib_node( GL_CURRENT_BIT );
-      newnode->data = attr;
-      newnode->next = head;
-      head = newnode;
+      save_attrib_data(&head, GL_CURRENT_BIT, attr);
    }
 
    if (mask & GL_DEPTH_BUFFER_BIT) {
       struct gl_depthbuffer_attrib *attr;
       attr = MALLOC_STRUCT( gl_depthbuffer_attrib );
       MEMCPY( attr, &ctx->Depth, sizeof(struct gl_depthbuffer_attrib) );
-      newnode = new_attrib_node( GL_DEPTH_BUFFER_BIT );
-      newnode->data = attr;
-      newnode->next = head;
-      head = newnode;
+      save_attrib_data(&head, GL_DEPTH_BUFFER_BIT, attr);
    }
 
    if (mask & GL_ENABLE_BIT) {
@@ -331,40 +325,28 @@ _mesa_PushAttrib(GLbitfield mask)
       attr->VertexProgram = ctx->VertexProgram.Enabled;
       attr->VertexProgramPointSize = ctx->VertexProgram.PointSizeEnabled;
       attr->VertexProgramTwoSide = ctx->VertexProgram.TwoSideEnabled;
-      newnode = new_attrib_node( GL_ENABLE_BIT );
-      newnode->data = attr;
-      newnode->next = head;
-      head = newnode;
+      save_attrib_data(&head, GL_ENABLE_BIT, attr);
    }
 
    if (mask & GL_EVAL_BIT) {
       struct gl_eval_attrib *attr;
       attr = MALLOC_STRUCT( gl_eval_attrib );
       MEMCPY( attr, &ctx->Eval, sizeof(struct gl_eval_attrib) );
-      newnode = new_attrib_node( GL_EVAL_BIT );
-      newnode->data = attr;
-      newnode->next = head;
-      head = newnode;
+      save_attrib_data(&head, GL_EVAL_BIT, attr);
    }
 
    if (mask & GL_FOG_BIT) {
       struct gl_fog_attrib *attr;
       attr = MALLOC_STRUCT( gl_fog_attrib );
       MEMCPY( attr, &ctx->Fog, sizeof(struct gl_fog_attrib) );
-      newnode = new_attrib_node( GL_FOG_BIT );
-      newnode->data = attr;
-      newnode->next = head;
-      head = newnode;
+      save_attrib_data(&head, GL_FOG_BIT, attr);
    }
 
    if (mask & GL_HINT_BIT) {
       struct gl_hint_attrib *attr;
       attr = MALLOC_STRUCT( gl_hint_attrib );
       MEMCPY( attr, &ctx->Hint, sizeof(struct gl_hint_attrib) );
-      newnode = new_attrib_node( GL_HINT_BIT );
-      newnode->data = attr;
-      newnode->next = head;
-      head = newnode;
+      save_attrib_data(&head, GL_HINT_BIT, attr);
    }
 
    if (mask & GL_LIGHTING_BIT) {
@@ -372,30 +354,21 @@ _mesa_PushAttrib(GLbitfield mask)
       FLUSH_CURRENT(ctx, 0);	/* flush material changes */
       attr = MALLOC_STRUCT( gl_light_attrib );
       MEMCPY( attr, &ctx->Light, sizeof(struct gl_light_attrib) );
-      newnode = new_attrib_node( GL_LIGHTING_BIT );
-      newnode->data = attr;
-      newnode->next = head;
-      head = newnode;
+      save_attrib_data(&head, GL_LIGHTING_BIT, attr);
    }
 
    if (mask & GL_LINE_BIT) {
       struct gl_line_attrib *attr;
       attr = MALLOC_STRUCT( gl_line_attrib );
       MEMCPY( attr, &ctx->Line, sizeof(struct gl_line_attrib) );
-      newnode = new_attrib_node( GL_LINE_BIT );
-      newnode->data = attr;
-      newnode->next = head;
-      head = newnode;
+      save_attrib_data(&head, GL_LINE_BIT, attr);
    }
 
    if (mask & GL_LIST_BIT) {
       struct gl_list_attrib *attr;
       attr = MALLOC_STRUCT( gl_list_attrib );
       MEMCPY( attr, &ctx->List, sizeof(struct gl_list_attrib) );
-      newnode = new_attrib_node( GL_LIST_BIT );
-      newnode->data = attr;
-      newnode->next = head;
-      head = newnode;
+      save_attrib_data(&head, GL_LIST_BIT, attr);
    }
 
    if (mask & GL_PIXEL_MODE_BIT) {
@@ -404,60 +377,42 @@ _mesa_PushAttrib(GLbitfield mask)
       MEMCPY( attr, &ctx->Pixel, sizeof(struct gl_pixel_attrib) );
       /* push the Read FBO's ReadBuffer state, not ctx->Pixel.ReadBuffer */
       attr->ReadBuffer = ctx->ReadBuffer->ColorReadBuffer;
-      newnode = new_attrib_node( GL_PIXEL_MODE_BIT );
-      newnode->data = attr;
-      newnode->next = head;
-      head = newnode;
+      save_attrib_data(&head, GL_PIXEL_MODE_BIT, attr);
    }
 
    if (mask & GL_POINT_BIT) {
       struct gl_point_attrib *attr;
       attr = MALLOC_STRUCT( gl_point_attrib );
       MEMCPY( attr, &ctx->Point, sizeof(struct gl_point_attrib) );
-      newnode = new_attrib_node( GL_POINT_BIT );
-      newnode->data = attr;
-      newnode->next = head;
-      head = newnode;
+      save_attrib_data(&head, GL_POINT_BIT, attr);
    }
 
    if (mask & GL_POLYGON_BIT) {
       struct gl_polygon_attrib *attr;
       attr = MALLOC_STRUCT( gl_polygon_attrib );
       MEMCPY( attr, &ctx->Polygon, sizeof(struct gl_polygon_attrib) );
-      newnode = new_attrib_node( GL_POLYGON_BIT );
-      newnode->data = attr;
-      newnode->next = head;
-      head = newnode;
+      save_attrib_data(&head, GL_POLYGON_BIT, attr);
    }
 
    if (mask & GL_POLYGON_STIPPLE_BIT) {
       GLuint *stipple;
       stipple = (GLuint *) MALLOC( 32*sizeof(GLuint) );
       MEMCPY( stipple, ctx->PolygonStipple, 32*sizeof(GLuint) );
-      newnode = new_attrib_node( GL_POLYGON_STIPPLE_BIT );
-      newnode->data = stipple;
-      newnode->next = head;
-      head = newnode;
+      save_attrib_data(&head, GL_POLYGON_STIPPLE_BIT, stipple);
    }
 
    if (mask & GL_SCISSOR_BIT) {
       struct gl_scissor_attrib *attr;
       attr = MALLOC_STRUCT( gl_scissor_attrib );
       MEMCPY( attr, &ctx->Scissor, sizeof(struct gl_scissor_attrib) );
-      newnode = new_attrib_node( GL_SCISSOR_BIT );
-      newnode->data = attr;
-      newnode->next = head;
-      head = newnode;
+      save_attrib_data(&head, GL_SCISSOR_BIT, attr);
    }
 
    if (mask & GL_STENCIL_BUFFER_BIT) {
       struct gl_stencil_attrib *attr;
       attr = MALLOC_STRUCT( gl_stencil_attrib );
       MEMCPY( attr, &ctx->Stencil, sizeof(struct gl_stencil_attrib) );
-      newnode = new_attrib_node( GL_STENCIL_BUFFER_BIT );
-      newnode->data = attr;
-      newnode->next = head;
-      head = newnode;
+      save_attrib_data(&head, GL_STENCIL_BUFFER_BIT, attr);
    }
 
    if (mask & GL_TEXTURE_BIT) {
@@ -494,30 +449,21 @@ _mesa_PushAttrib(GLbitfield mask)
 
       _mesa_unlock_context_textures(ctx);
 
-      newnode = new_attrib_node( GL_TEXTURE_BIT );
-      newnode->data = texstate;
-      newnode->next = head;
-      head = newnode;
+      save_attrib_data(&head, GL_TEXTURE_BIT, texstate);
    }
 
    if (mask & GL_TRANSFORM_BIT) {
       struct gl_transform_attrib *attr;
       attr = MALLOC_STRUCT( gl_transform_attrib );
       MEMCPY( attr, &ctx->Transform, sizeof(struct gl_transform_attrib) );
-      newnode = new_attrib_node( GL_TRANSFORM_BIT );
-      newnode->data = attr;
-      newnode->next = head;
-      head = newnode;
+      save_attrib_data(&head, GL_TRANSFORM_BIT, attr);
    }
 
    if (mask & GL_VIEWPORT_BIT) {
       struct gl_viewport_attrib *attr;
       attr = MALLOC_STRUCT( gl_viewport_attrib );
       MEMCPY( attr, &ctx->Viewport, sizeof(struct gl_viewport_attrib) );
-      newnode = new_attrib_node( GL_VIEWPORT_BIT );
-      newnode->data = attr;
-      newnode->next = head;
-      head = newnode;
+      save_attrib_data(&head, GL_VIEWPORT_BIT, attr);
    }
 
    /* GL_ARB_multisample */
@@ -525,10 +471,7 @@ _mesa_PushAttrib(GLbitfield mask)
       struct gl_multisample_attrib *attr;
       attr = MALLOC_STRUCT( gl_multisample_attrib );
       MEMCPY( attr, &ctx->Multisample, sizeof(struct gl_multisample_attrib) );
-      newnode = new_attrib_node( GL_MULTISAMPLE_BIT_ARB );
-      newnode->data = attr;
-      newnode->next = head;
-      head = newnode;
+      save_attrib_data(&head, GL_MULTISAMPLE_BIT_ARB, attr);
    }
 
 end:
@@ -1373,7 +1316,6 @@ copy_pixelstore(GLcontext *ctx,
 void GLAPIENTRY
 _mesa_PushClientAttrib(GLbitfield mask)
 {
-   struct gl_attrib_node *newnode;
    struct gl_attrib_node *head;
 
    GET_CURRENT_CONTEXT(ctx);
@@ -1394,17 +1336,11 @@ _mesa_PushClientAttrib(GLbitfield mask)
       /* packing attribs */
       attr = CALLOC_STRUCT( gl_pixelstore_attrib );
       copy_pixelstore(ctx, attr, &ctx->Pack);
-      newnode = new_attrib_node( GL_CLIENT_PACK_BIT );
-      newnode->data = attr;
-      newnode->next = head;
-      head = newnode;
+      save_attrib_data(&head, GL_CLIENT_PACK_BIT, attr);
       /* unpacking attribs */
       attr = CALLOC_STRUCT( gl_pixelstore_attrib );
       copy_pixelstore(ctx, attr, &ctx->Unpack);
-      newnode = new_attrib_node( GL_CLIENT_UNPACK_BIT );
-      newnode->data = attr;
-      newnode->next = head;
-      head = newnode;
+      save_attrib_data(&head, GL_CLIENT_UNPACK_BIT, attr);
    }
 
    if (mask & GL_CLIENT_VERTEX_ARRAY_BIT) {
@@ -1425,10 +1361,8 @@ _mesa_PushClientAttrib(GLbitfield mask)
 
       attr->ArrayObj = obj;
 
-      newnode = new_attrib_node( GL_CLIENT_VERTEX_ARRAY_BIT );
-      newnode->data = attr;
-      newnode->next = head;
-      head = newnode;
+      save_attrib_data(&head, GL_CLIENT_VERTEX_ARRAY_BIT, attr);
+
       /* bump reference counts on buffer objects */
       adjust_buffer_object_ref_counts(ctx->Array.ArrayObj, 1);
    }
-- 
cgit v1.2.3


From 483a7916d1c93d1edf125dc671dcfbff42a9fc5e Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 7 Aug 2009 14:51:59 -0600
Subject: mesa: update framebuffer status as needed in
 _mesa_source/dest_buffer_exists()

---
 src/mesa/main/framebuffer.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/framebuffer.c b/src/mesa/main/framebuffer.c
index 9d9c4217a6..dc79b8ca61 100644
--- a/src/mesa/main/framebuffer.c
+++ b/src/mesa/main/framebuffer.c
@@ -827,8 +827,10 @@ _mesa_source_buffer_exists(GLcontext *ctx, GLenum format)
 {
    const struct gl_renderbuffer_attachment *att = ctx->ReadBuffer->Attachment;
 
-   /* state validation should have already been done */
-   ASSERT(ctx->NewState == 0x0);
+   /* If we don't know the framebuffer status, update it now */
+   if (ctx->ReadBuffer->_Status == 0) {
+      _mesa_test_framebuffer_completeness(ctx, ctx->ReadBuffer);
+   }
 
    if (ctx->ReadBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
       return GL_FALSE;
@@ -898,8 +900,10 @@ _mesa_dest_buffer_exists(GLcontext *ctx, GLenum format)
 {
    const struct gl_renderbuffer_attachment *att = ctx->DrawBuffer->Attachment;
 
-   /* state validation should have already been done */
-   ASSERT(ctx->NewState == 0x0);
+   /* If we don't know the framebuffer status, update it now */
+   if (ctx->DrawBuffer->_Status == 0) {
+      _mesa_test_framebuffer_completeness(ctx, ctx->DrawBuffer);
+   }
 
    if (ctx->DrawBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
       return GL_FALSE;
-- 
cgit v1.2.3


From e9d9dab0cd8614898ecc2aceb49d8faf354cdbdf Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 10 Aug 2009 13:43:50 -0600
Subject: mesa: added GLcontext::Meta field for meta rendering state

---
 src/mesa/main/mtypes.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 48f00b4b0b..e447e4ce23 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -83,6 +83,7 @@
 /*@{*/
 struct _mesa_HashTable;
 struct gl_attrib_node;
+struct gl_meta_state;
 struct gl_pixelstore_attrib;
 struct gl_program_cache;
 struct gl_texture_format;
@@ -2982,6 +2983,8 @@ struct __GLcontextRec
    struct gl_buffer_object *CopyWriteBuffer; /**< GL_ARB_copy_buffer */
    /*@}*/
 
+   struct gl_meta_state *Meta;  /**< for "meta" operations */
+
 #if FEATURE_EXT_framebuffer_object
    struct gl_renderbuffer *CurrentRenderbuffer;
 #endif
-- 
cgit v1.2.3


From 20e4421fe3e938f5904d53661ce8d47163db491b Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 11 Aug 2009 08:37:22 -0600
Subject: mesa: remove _mesa_set_vp_override() from _mesa_Bitmap()

This reverts part of commit 2c9812e3d346eb07180da520909b142e8afc1c59.
The calls to _mesa_set_vp_override() were causing extra state validation
and caused the gallium state tracker's bitmap cache to get flushed on
every call.
---
 src/mesa/main/drawpix.c | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index c07de9ce99..6d31f32443 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -239,11 +239,6 @@ _mesa_Bitmap( GLsizei width, GLsizei height,
       return;    /* do nothing */
    }
 
-   /* We're not using the current vertex program, and the driver may install
-    * it's own.
-    */
-   _mesa_set_vp_override(ctx, GL_TRUE);
-
    if (ctx->NewState) {
       _mesa_update_state(ctx);
    }
@@ -251,13 +246,13 @@ _mesa_Bitmap( GLsizei width, GLsizei height,
    if (!valid_fragment_program(ctx)) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
                   "glBitmap (invalid fragment program)");
-      goto end;
+      return;
    }
 
    if (ctx->DrawBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
       _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,
                   "glBitmap(incomplete framebuffer)");
-      goto end;
+      return;
    }
 
    if (ctx->RenderMode == GL_RENDER) {
@@ -273,12 +268,12 @@ _mesa_Bitmap( GLsizei width, GLsizei height,
                                         (GLvoid *) bitmap)) {
             _mesa_error(ctx, GL_INVALID_OPERATION,
                         "glBitmap(invalid PBO access)");
-            goto end;
+            return;
          }
          if (_mesa_bufferobj_mapped(ctx->Unpack.BufferObj)) {
             /* buffer is mapped - that's an error */
             _mesa_error(ctx, GL_INVALID_OPERATION, "glBitmap(PBO is mapped)");
-            goto end;
+            return;
          }
       }
 
@@ -303,7 +298,4 @@ _mesa_Bitmap( GLsizei width, GLsizei height,
    /* update raster position */
    ctx->Current.RasterPos[0] += xmove;
    ctx->Current.RasterPos[1] += ymove;
-
-end:
-   _mesa_set_vp_override(ctx, GL_FALSE);
 }
-- 
cgit v1.2.3


From abbf83551f2ec1d168c3f8449eeed8dad7b394b8 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 12 Aug 2009 13:44:43 -0600
Subject: mesa: new _mesa_is_bufferobj() function

Tests if the given buffer object is a user-created, non-default buffer object.
Use this instead of testing bufferobj->Name != 0.
---
 src/mesa/main/bufferobj.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h
index 3678fba435..c68291ab91 100644
--- a/src/mesa/main/bufferobj.h
+++ b/src/mesa/main/bufferobj.h
@@ -44,6 +44,18 @@ _mesa_bufferobj_mapped(struct gl_buffer_object *obj)
    return obj->Pointer != NULL;
 }
 
+/**
+ * Is the given buffer object a user-created buffer object?
+ * Mesa uses default buffer objects in several places.  Default buffers
+ * always have Name==0.  User created buffers have Name!=0.
+ */
+static INLINE GLboolean
+_mesa_is_bufferobj(struct gl_buffer_object *obj)
+{
+   return obj->Name != 0;
+}
+
+
 extern void
 _mesa_init_buffer_objects( GLcontext *ctx );
 
-- 
cgit v1.2.3


From 604031563c92cf632f99cb4f42983faae9b509ef Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 12 Aug 2009 13:46:03 -0600
Subject: mesa: use _mesa_is_bufferobj()

---
 src/mesa/main/bufferobj.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index ae202c283c..f96185a4b5 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -156,7 +156,7 @@ buffer_object_subdata_range_good( GLcontext * ctx, GLenum target,
       _mesa_error(ctx, GL_INVALID_ENUM, "%s(target)", caller);
       return NULL;
    }
-   if (bufObj->Name == 0) {
+   if (!_mesa_is_bufferobj(bufObj)) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "%s", caller);
       return NULL;
    }
@@ -663,7 +663,7 @@ _mesa_validate_pbo_access(GLuint dimensions,
    GLvoid *start, *end;
    const GLubyte *sizeAddr; /* buffer size, cast to a pointer */
 
-   ASSERT(pack->BufferObj->Name != 0);
+   ASSERT(_mesa_is_bufferobj(pack->BufferObj));
 
    if (pack->BufferObj->Size == 0)
       /* no buffer! */
@@ -709,7 +709,7 @@ _mesa_map_bitmap_pbo(GLcontext *ctx,
 {
    const GLubyte *buf;
 
-   if (unpack->BufferObj->Name) {
+   if (_mesa_is_bufferobj(unpack->BufferObj)) {
       /* unpack from PBO */
       buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
                                               GL_READ_ONLY_ARB,
@@ -736,7 +736,7 @@ void
 _mesa_unmap_bitmap_pbo(GLcontext *ctx,
                        const struct gl_pixelstore_attrib *unpack)
 {
-   if (unpack->BufferObj->Name) {
+   if (_mesa_is_bufferobj(unpack->BufferObj)) {
       ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
                               unpack->BufferObj);
    }
@@ -753,7 +753,7 @@ _mesa_map_drawpix_pbo(GLcontext *ctx,
 {
    const GLvoid *buf;
 
-   if (unpack->BufferObj->Name) {
+   if (_mesa_is_bufferobj(unpack->BufferObj)) {
       /* unpack from PBO */
       buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
                                               GL_READ_ONLY_ARB,
@@ -779,7 +779,7 @@ void
 _mesa_unmap_drawpix_pbo(GLcontext *ctx,
                         const struct gl_pixelstore_attrib *unpack)
 {
-   if (unpack->BufferObj->Name) {
+   if (_mesa_is_bufferobj(unpack->BufferObj)) {
       ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
                               unpack->BufferObj);
    }
@@ -798,7 +798,7 @@ _mesa_map_readpix_pbo(GLcontext *ctx,
 {
    void *buf;
 
-   if (pack->BufferObj->Name) {
+   if (_mesa_is_bufferobj(pack->BufferObj)) {
       /* pack into PBO */
       buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
                                               GL_WRITE_ONLY_ARB,
@@ -824,7 +824,7 @@ void
 _mesa_unmap_readpix_pbo(GLcontext *ctx,
                         const struct gl_pixelstore_attrib *pack)
 {
-   if (pack->BufferObj->Name) {
+   if (_mesa_is_bufferobj(pack->BufferObj)) {
       ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT, pack->BufferObj);
    }
 }
@@ -1086,7 +1086,7 @@ _mesa_BufferDataARB(GLenum target, GLsizeiptrARB size,
       _mesa_error(ctx, GL_INVALID_ENUM, "glBufferDataARB(target)" );
       return;
    }
-   if (bufObj->Name == 0) {
+   if (!_mesa_is_bufferobj(bufObj)) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "glBufferDataARB(buffer 0)" );
       return;
    }
@@ -1187,7 +1187,7 @@ _mesa_MapBufferARB(GLenum target, GLenum access)
       _mesa_error(ctx, GL_INVALID_ENUM, "glMapBufferARB(target)" );
       return NULL;
    }
-   if (bufObj->Name == 0) {
+   if (!_mesa_is_bufferobj(bufObj)) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "glMapBufferARB(buffer 0)" );
       return NULL;
    }
@@ -1248,7 +1248,7 @@ _mesa_UnmapBufferARB(GLenum target)
       _mesa_error(ctx, GL_INVALID_ENUM, "glUnmapBufferARB(target)" );
       return GL_FALSE;
    }
-   if (bufObj->Name == 0) {
+   if (!_mesa_is_bufferobj(bufObj)) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "glUnmapBufferARB" );
       return GL_FALSE;
    }
@@ -1315,7 +1315,7 @@ _mesa_GetBufferParameterivARB(GLenum target, GLenum pname, GLint *params)
       _mesa_error(ctx, GL_INVALID_ENUM, "GetBufferParameterivARB(target)" );
       return;
    }
-   if (bufObj->Name == 0) {
+   if (!_mesa_is_bufferobj(bufObj)) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "GetBufferParameterivARB" );
       return;
    }
@@ -1357,7 +1357,7 @@ _mesa_GetBufferPointervARB(GLenum target, GLenum pname, GLvoid **params)
       _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferPointervARB(target)" );
       return;
    }
-   if (bufObj->Name == 0) {
+   if (!_mesa_is_bufferobj(bufObj)) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "glGetBufferPointervARB" );
       return;
    }
@@ -1376,14 +1376,14 @@ _mesa_CopyBufferSubData(GLenum readTarget, GLenum writeTarget,
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
    src = get_buffer(ctx, readTarget);
-   if (!src || src->Name == 0) {
+   if (!src || !_mesa_is_bufferobj(src)) {
       _mesa_error(ctx, GL_INVALID_ENUM,
                   "glCopyBuffserSubData(readTarget = 0x%x)", readTarget);
       return;
    }
 
    dst = get_buffer(ctx, writeTarget);
-   if (!dst || dst->Name == 0) {
+   if (!dst || !_mesa_is_bufferobj(dst)) {
       _mesa_error(ctx, GL_INVALID_ENUM,
                   "glCopyBuffserSubData(writeTarget = 0x%x)", writeTarget);
       return;
@@ -1499,7 +1499,7 @@ _mesa_MapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length,
    }
 
    bufObj = get_buffer(ctx, target);
-   if (!bufObj || bufObj->Name == 0) {
+   if (!bufObj || !_mesa_is_bufferobj(bufObj)) {
       _mesa_error(ctx, GL_INVALID_ENUM,
                   "glMapBufferRange(target = 0x%x)", target);
       return NULL;
@@ -1564,7 +1564,7 @@ _mesa_FlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)
       return;
    }
 
-   if (bufObj->Name == 0) {
+   if (!_mesa_is_bufferobj(bufObj)) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
                   "glMapBufferRange(current buffer is 0)");
       return;
-- 
cgit v1.2.3


From 434ec3ada841915a00ffc23f699401eb3e7b37ee Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 12 Aug 2009 13:46:16 -0600
Subject: mesa: use _mesa_is_bufferobj()

---
 src/mesa/main/api_arrayelt.c |  3 ++-
 src/mesa/main/api_validate.c |  7 ++++---
 src/mesa/main/colortab.c     |  8 ++++----
 src/mesa/main/convolve.c     | 20 ++++++++++----------
 src/mesa/main/dlist.c        |  2 +-
 src/mesa/main/histogram.c    |  8 ++++----
 src/mesa/main/pixel.c        | 24 ++++++++++++------------
 src/mesa/main/polygon.c      |  4 ++--
 src/mesa/main/readpix.c      |  2 +-
 src/mesa/main/texgetimage.c  |  9 +++++----
 src/mesa/main/teximage.c     |  2 +-
 src/mesa/main/texstore.c     |  6 +++---
 12 files changed, 49 insertions(+), 46 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_arrayelt.c b/src/mesa/main/api_arrayelt.c
index f5b7d1e138..2462a1b003 100644
--- a/src/mesa/main/api_arrayelt.c
+++ b/src/mesa/main/api_arrayelt.c
@@ -28,6 +28,7 @@
 
 #include "glheader.h"
 #include "api_arrayelt.h"
+#include "bufferobj.h"
 #include "context.h"
 #include "imports.h"
 #include "macros.h"
@@ -1071,7 +1072,7 @@ void _ae_destroy_context( GLcontext *ctx )
 static void check_vbo( AEcontext *actx,
 		       struct gl_buffer_object *vbo )
 {
-   if (vbo->Name && !vbo->Pointer) {
+   if (_mesa_is_bufferobj(vbo) && !_mesa_bufferobj_mapped(vbo)) {
       GLuint i;
       for (i = 0; i < actx->nr_vbos; i++)
 	 if (actx->vbo[i] == vbo)
diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c
index b2f11ffbfe..33f4dd152a 100644
--- a/src/mesa/main/api_validate.c
+++ b/src/mesa/main/api_validate.c
@@ -24,6 +24,7 @@
 
 #include "glheader.h"
 #include "api_validate.h"
+#include "bufferobj.h"
 #include "context.h"
 #include "imports.h"
 #include "mtypes.h"
@@ -62,7 +63,7 @@ max_buffer_index(GLcontext *ctx, GLuint count, GLenum type,
    GLuint max = 0;
    GLuint i;
 
-   if (elementBuf->Name) {
+   if (_mesa_is_bufferobj(elementBuf)) {
       /* elements are in a user-defined buffer object.  need to map it */
       map = ctx->Driver.MapBuffer(ctx, GL_ELEMENT_ARRAY_BUFFER,
                                   GL_READ_ONLY, elementBuf);
@@ -164,7 +165,7 @@ _mesa_validate_DrawElements(GLcontext *ctx,
       return GL_FALSE;
 
    /* Vertex buffer object tests */
-   if (ctx->Array.ElementArrayBufferObj->Name) {
+   if (_mesa_is_bufferobj(ctx->Array.ElementArrayBufferObj)) {
       /* use indices in the buffer object */
       /* make sure count doesn't go outside buffer bounds */
       if (index_bytes(type, count) > ctx->Array.ElementArrayBufferObj->Size) {
@@ -237,7 +238,7 @@ _mesa_validate_DrawRangeElements(GLcontext *ctx, GLenum mode,
       return GL_FALSE;
 
    /* Vertex buffer object tests */
-   if (ctx->Array.ElementArrayBufferObj->Name) {
+   if (_mesa_is_bufferobj(ctx->Array.ElementArrayBufferObj)) {
       /* use indices in the buffer object */
       /* make sure count doesn't go outside buffer bounds */
       if (index_bytes(type, count) > ctx->Array.ElementArrayBufferObj->Size) {
diff --git a/src/mesa/main/colortab.c b/src/mesa/main/colortab.c
index bd9cf438b4..36304065eb 100644
--- a/src/mesa/main/colortab.c
+++ b/src/mesa/main/colortab.c
@@ -179,7 +179,7 @@ store_colortable_entries(GLcontext *ctx, struct gl_color_table *table,
 			 GLfloat bScale, GLfloat bBias,
 			 GLfloat aScale, GLfloat aBias)
 {
-   if (ctx->Unpack.BufferObj->Name) {
+   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
       /* Get/unpack the color table data from a PBO */
       GLubyte *buf;
       if (!_mesa_validate_pbo_access(1, &ctx->Unpack, count, 1, 1,
@@ -279,7 +279,7 @@ store_colortable_entries(GLcontext *ctx, struct gl_color_table *table,
       }
    }
 
-   if (ctx->Unpack.BufferObj->Name) {
+   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
       ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
                               ctx->Unpack.BufferObj);
    }
@@ -696,7 +696,7 @@ _mesa_GetColorTable( GLenum target, GLenum format,
       return;
    }
 
-   if (ctx->Pack.BufferObj->Name) {
+   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
       /* pack color table into PBO */
       GLubyte *buf;
       if (!_mesa_validate_pbo_access(1, &ctx->Pack, table->Size, 1, 1,
@@ -720,7 +720,7 @@ _mesa_GetColorTable( GLenum target, GLenum format,
    _mesa_pack_rgba_span_float(ctx, table->Size, rgba,
                               format, type, data, &ctx->Pack, 0x0);
 
-   if (ctx->Pack.BufferObj->Name) {
+   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
       ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
                               ctx->Pack.BufferObj);
    }
diff --git a/src/mesa/main/convolve.c b/src/mesa/main/convolve.c
index 814c6a0a5a..69dba72ed3 100644
--- a/src/mesa/main/convolve.c
+++ b/src/mesa/main/convolve.c
@@ -144,7 +144,7 @@ _mesa_ConvolutionFilter1D(GLenum target, GLenum internalFormat, GLsizei width, G
    ctx->Convolution1D.Width = width;
    ctx->Convolution1D.Height = 1;
 
-   if (ctx->Unpack.BufferObj->Name) {
+   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
       /* unpack filter from PBO */
       GLubyte *buf;
       if (!_mesa_validate_pbo_access(1, &ctx->Unpack, width, 1, 1,
@@ -173,7 +173,7 @@ _mesa_ConvolutionFilter1D(GLenum target, GLenum internalFormat, GLsizei width, G
                                  format, type, image, &ctx->Unpack,
                                  0); /* transferOps */
 
-   if (ctx->Unpack.BufferObj->Name) {
+   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
       ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
                               ctx->Unpack.BufferObj);
    }
@@ -242,7 +242,7 @@ _mesa_ConvolutionFilter2D(GLenum target, GLenum internalFormat, GLsizei width, G
    ctx->Convolution2D.Width = width;
    ctx->Convolution2D.Height = height;
 
-   if (ctx->Unpack.BufferObj->Name) {
+   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
       /* unpack filter from PBO */
       GLubyte *buf;
       if (!_mesa_validate_pbo_access(2, &ctx->Unpack, width, height, 1,
@@ -276,7 +276,7 @@ _mesa_ConvolutionFilter2D(GLenum target, GLenum internalFormat, GLsizei width, G
                                     0); /* transferOps */
    }
 
-   if (ctx->Unpack.BufferObj->Name) {
+   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
       ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
                               ctx->Unpack.BufferObj);
    }
@@ -598,7 +598,7 @@ _mesa_GetConvolutionFilter(GLenum target, GLenum format, GLenum type,
          return;
    }
 
-   if (ctx->Pack.BufferObj->Name) {
+   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
       /* Pack the filter into a PBO */
       GLubyte *buf;
       if (!_mesa_validate_pbo_access(2, &ctx->Pack,
@@ -629,7 +629,7 @@ _mesa_GetConvolutionFilter(GLenum target, GLenum format, GLenum type,
                                  format, type, dst, &ctx->Pack, 0x0);
    }
 
-   if (ctx->Pack.BufferObj->Name) {
+   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
       ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
                               ctx->Pack.BufferObj);
    }
@@ -802,7 +802,7 @@ _mesa_GetSeparableFilter(GLenum target, GLenum format, GLenum type,
 
    filter = &ctx->Separable2D;
 
-   if (ctx->Pack.BufferObj->Name) {
+   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
       /* Pack filter into PBO */
       GLubyte *buf;
       if (!_mesa_validate_pbo_access(1, &ctx->Pack, filter->Width, 1, 1,
@@ -850,7 +850,7 @@ _mesa_GetSeparableFilter(GLenum target, GLenum format, GLenum type,
 
    (void) span;  /* unused at this time */
 
-   if (ctx->Pack.BufferObj->Name) {
+   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
       /* Pack filter into PBO */
       ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
                               ctx->Unpack.BufferObj);
@@ -905,7 +905,7 @@ _mesa_SeparableFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLs
    ctx->Separable2D.Width = width;
    ctx->Separable2D.Height = height;
 
-   if (ctx->Unpack.BufferObj->Name) {
+   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
       /* unpack filter from PBO */
       GLubyte *buf;
       if (!_mesa_validate_pbo_access(1, &ctx->Unpack, width, 1, 1,
@@ -971,7 +971,7 @@ _mesa_SeparableFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLs
                        ctx->Pixel.ConvolutionFilterBias[2][3]);
    }
 
-   if (ctx->Unpack.BufferObj->Name) {
+   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
       ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
                               ctx->Unpack.BufferObj);
    }
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 49f202daa1..4133f15dc7 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -690,7 +690,7 @@ unpack_image(GLuint dimensions, GLsizei width, GLsizei height, GLsizei depth,
              GLenum format, GLenum type, const GLvoid * pixels,
              const struct gl_pixelstore_attrib *unpack)
 {
-   if (unpack->BufferObj->Name == 0) {
+   if (!_mesa_is_bufferobj(unpack->BufferObj)) {
       /* no PBO */
       return _mesa_unpack_image(dimensions, width, height, depth, format,
                                 type, pixels, unpack);
diff --git a/src/mesa/main/histogram.c b/src/mesa/main/histogram.c
index 5fee4fd0e3..726a50d3b1 100644
--- a/src/mesa/main/histogram.c
+++ b/src/mesa/main/histogram.c
@@ -649,7 +649,7 @@ _mesa_GetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvo
       return;
    }
 
-   if (ctx->Pack.BufferObj->Name) {
+   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
       /* pack min/max values into a PBO */
       GLubyte *buf;
       if (!_mesa_validate_pbo_access(1, &ctx->Pack, 2, 1, 1,
@@ -687,7 +687,7 @@ _mesa_GetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvo
                                  format, type, values, &ctx->Pack, 0x0);
    }
 
-   if (ctx->Pack.BufferObj->Name) {
+   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
       ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
                               ctx->Pack.BufferObj);
    }
@@ -733,7 +733,7 @@ _mesa_GetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, G
       return;
    }
 
-   if (ctx->Pack.BufferObj->Name) {
+   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
       /* pack min/max values into a PBO */
       GLubyte *buf;
       if (!_mesa_validate_pbo_access(1, &ctx->Pack, ctx->Histogram.Width, 1, 1,
@@ -761,7 +761,7 @@ _mesa_GetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, G
                   (CONST GLuint (*)[4]) ctx->Histogram.Count,
                   format, type, values, &ctx->Pack);
 
-   if (ctx->Pack.BufferObj->Name) {
+   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
       ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
                               ctx->Pack.BufferObj);
    }
diff --git a/src/mesa/main/pixel.c b/src/mesa/main/pixel.c
index d9f3e476e8..25f55a422f 100644
--- a/src/mesa/main/pixel.c
+++ b/src/mesa/main/pixel.c
@@ -158,7 +158,7 @@ _mesa_PixelMapfv( GLenum map, GLsizei mapsize, const GLfloat *values )
 
    FLUSH_VERTICES(ctx, _NEW_PIXEL);
 
-   if (ctx->Unpack.BufferObj->Name) {
+   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
       /* unpack pixelmap from PBO */
       GLubyte *buf;
       /* Note, need to use DefaultPacking and Unpack's buffer object */
@@ -188,7 +188,7 @@ _mesa_PixelMapfv( GLenum map, GLsizei mapsize, const GLfloat *values )
 
    store_pixelmap(ctx, map, mapsize, values);
 
-   if (ctx->Unpack.BufferObj->Name) {
+   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
       ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
                               ctx->Unpack.BufferObj);
    }
@@ -217,7 +217,7 @@ _mesa_PixelMapuiv(GLenum map, GLsizei mapsize, const GLuint *values )
 
    FLUSH_VERTICES(ctx, _NEW_PIXEL);
 
-   if (ctx->Unpack.BufferObj->Name) {
+   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
       /* unpack pixelmap from PBO */
       GLubyte *buf;
       /* Note, need to use DefaultPacking and Unpack's buffer object */
@@ -259,7 +259,7 @@ _mesa_PixelMapuiv(GLenum map, GLsizei mapsize, const GLuint *values )
       }
    }
 
-   if (ctx->Unpack.BufferObj->Name) {
+   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
       ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
                               ctx->Unpack.BufferObj);
    }
@@ -290,7 +290,7 @@ _mesa_PixelMapusv(GLenum map, GLsizei mapsize, const GLushort *values )
 
    FLUSH_VERTICES(ctx, _NEW_PIXEL);
 
-   if (ctx->Unpack.BufferObj->Name) {
+   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
       /* unpack pixelmap from PBO */
       GLubyte *buf;
       /* Note, need to use DefaultPacking and Unpack's buffer object */
@@ -333,7 +333,7 @@ _mesa_PixelMapusv(GLenum map, GLsizei mapsize, const GLushort *values )
       }
    }
 
-   if (ctx->Unpack.BufferObj->Name) {
+   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
       ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
                               ctx->Unpack.BufferObj);
    }
@@ -359,7 +359,7 @@ _mesa_GetPixelMapfv( GLenum map, GLfloat *values )
 
    mapsize = pm->Size;
 
-   if (ctx->Pack.BufferObj->Name) {
+   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
       /* pack pixelmap into PBO */
       GLubyte *buf;
       /* Note, need to use DefaultPacking and Pack's buffer object */
@@ -397,7 +397,7 @@ _mesa_GetPixelMapfv( GLenum map, GLfloat *values )
       MEMCPY(values, pm->Map, mapsize * sizeof(GLfloat));
    }
 
-   if (ctx->Pack.BufferObj->Name) {
+   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
       ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
                               ctx->Pack.BufferObj);
    }
@@ -420,7 +420,7 @@ _mesa_GetPixelMapuiv( GLenum map, GLuint *values )
    }
    mapsize = pm->Size;
 
-   if (ctx->Pack.BufferObj->Name) {
+   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
       /* pack pixelmap into PBO */
       GLubyte *buf;
       /* Note, need to use DefaultPacking and Pack's buffer object */
@@ -458,7 +458,7 @@ _mesa_GetPixelMapuiv( GLenum map, GLuint *values )
       }
    }
 
-   if (ctx->Pack.BufferObj->Name) {
+   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
       ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
                               ctx->Pack.BufferObj);
    }
@@ -481,7 +481,7 @@ _mesa_GetPixelMapusv( GLenum map, GLushort *values )
    }
    mapsize = pm ? pm->Size : 0;
 
-   if (ctx->Pack.BufferObj->Name) {
+   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
       /* pack pixelmap into PBO */
       GLubyte *buf;
       /* Note, need to use DefaultPacking and Pack's buffer object */
@@ -528,7 +528,7 @@ _mesa_GetPixelMapusv( GLenum map, GLushort *values )
       }
    }
 
-   if (ctx->Pack.BufferObj->Name) {
+   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
       ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
                               ctx->Pack.BufferObj);
    }
diff --git a/src/mesa/main/polygon.c b/src/mesa/main/polygon.c
index 564250b881..d11c9424d5 100644
--- a/src/mesa/main/polygon.c
+++ b/src/mesa/main/polygon.c
@@ -193,7 +193,7 @@ _mesa_PolygonMode( GLenum face, GLenum mode )
 void
 _mesa_polygon_stipple(GLcontext *ctx, const GLubyte *pattern)
 {
-   if (ctx->Unpack.BufferObj->Name) {
+   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
       /* Get/unpack the stipple pattern from a PBO */
       GLubyte *buf;
       if (!_mesa_validate_pbo_access(2, &ctx->Unpack, 32, 32, 1,
@@ -258,7 +258,7 @@ _mesa_GetPolygonStipple( GLubyte *dest )
    /* XXX someday we may put this code into a separate function and call
     * it with ctx->Driver.GetPolygonStipple().
     */
-   if (ctx->Pack.BufferObj->Name) {
+   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
       /* Put/pack the stipple pattern into a PBO */
       GLubyte *buf;
       if (!_mesa_validate_pbo_access(2, &ctx->Pack, 32, 32, 1,
diff --git a/src/mesa/main/readpix.c b/src/mesa/main/readpix.c
index 18958fd438..feea1d375f 100644
--- a/src/mesa/main/readpix.c
+++ b/src/mesa/main/readpix.c
@@ -190,7 +190,7 @@ _mesa_ReadPixels( GLint x, GLint y, GLsizei width, GLsizei height,
    if (width == 0 || height == 0)
       return; /* nothing to do */
 
-   if (ctx->Pack.BufferObj->Name) {
+   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
       if (!_mesa_validate_pbo_access(2, &ctx->Pack, width, height, 1,
                                      format, type, pixels)) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c
index 02409d8009..5557b694e3 100644
--- a/src/mesa/main/texgetimage.c
+++ b/src/mesa/main/texgetimage.c
@@ -30,6 +30,7 @@
 
 
 #include "glheader.h"
+#include "bufferobj.h"
 #include "context.h"
 #include "image.h"
 #include "texcompress.h"
@@ -116,7 +117,7 @@ _mesa_get_teximage(GLcontext *ctx, GLenum target, GLint level,
 {
    const GLuint dimensions = (target == GL_TEXTURE_3D) ? 3 : 2;
 
-   if (ctx->Pack.BufferObj->Name) {
+   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
       /* Packing texture image into a PBO.
        * Map the (potentially) VRAM-based buffer into our process space so
        * we can write into it with the code below.
@@ -296,7 +297,7 @@ _mesa_get_teximage(GLcontext *ctx, GLenum target, GLint level,
       } /* img */
    }
 
-   if (ctx->Pack.BufferObj->Name) {
+   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
       ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
                               ctx->Pack.BufferObj);
    }
@@ -316,7 +317,7 @@ _mesa_get_compressed_teximage(GLcontext *ctx, GLenum target, GLint level,
 {
    GLuint size;
 
-   if (ctx->Pack.BufferObj->Name) {
+   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
       /* pack texture image into a PBO */
       GLubyte *buf;
       if ((const GLubyte *) img + texImage->CompressedSize >
@@ -349,7 +350,7 @@ _mesa_get_compressed_teximage(GLcontext *ctx, GLenum target, GLint level,
    /* just memcpy, no pixelstore or pixel transfer */
    _mesa_memcpy(img, texImage->Data, size);
 
-   if (ctx->Pack.BufferObj->Name) {
+   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
       ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
                               ctx->Pack.BufferObj);
    }
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 83f025f86f..c758462a46 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -2332,7 +2332,7 @@ getteximage_error_check(GLcontext *ctx, GLenum target, GLint level,
       return GL_TRUE;
    }
 
-   if (ctx->Pack.BufferObj->Name) {
+   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
       /* packing texture image into a PBO */
       const GLuint dimensions = (target == GL_TEXTURE_3D) ? 3 : 2;
       if (!_mesa_validate_pbo_access(dimensions, &ctx->Pack, texImage->Width,
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index bfced1b3f4..a22db628d3 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -3138,7 +3138,7 @@ _mesa_validate_pbo_teximage(GLcontext *ctx, GLuint dimensions,
 {
    GLubyte *buf;
 
-   if (unpack->BufferObj->Name == 0) {
+   if (!_mesa_is_bufferobj(unpack->BufferObj)) {
       /* no PBO */
       return pixels;
    }
@@ -3174,7 +3174,7 @@ _mesa_validate_pbo_compressed_teximage(GLcontext *ctx,
 {
    GLubyte *buf;
 
-   if (packing->BufferObj->Name == 0) {
+   if (!_mesa_is_bufferobj(packing->BufferObj)) {
       /* not using a PBO - return pointer unchanged */
       return pixels;
    }
@@ -3204,7 +3204,7 @@ void
 _mesa_unmap_teximage_pbo(GLcontext *ctx,
                          const struct gl_pixelstore_attrib *unpack)
 {
-   if (unpack->BufferObj->Name) {
+   if (_mesa_is_bufferobj(unpack->BufferObj)) {
       ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
                               unpack->BufferObj);
    }
-- 
cgit v1.2.3


From f95b82b4861c14e01ec6af81a8de65c2143952b2 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 12 Aug 2009 15:43:50 -0600
Subject: mesa: const qualifiers

---
 src/mesa/main/bufferobj.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h
index c68291ab91..decb44a65e 100644
--- a/src/mesa/main/bufferobj.h
+++ b/src/mesa/main/bufferobj.h
@@ -39,7 +39,7 @@
 
 /** Is the given buffer object currently mapped? */
 static INLINE GLboolean
-_mesa_bufferobj_mapped(struct gl_buffer_object *obj)
+_mesa_bufferobj_mapped(const struct gl_buffer_object *obj)
 {
    return obj->Pointer != NULL;
 }
@@ -50,7 +50,7 @@ _mesa_bufferobj_mapped(struct gl_buffer_object *obj)
  * always have Name==0.  User created buffers have Name!=0.
  */
 static INLINE GLboolean
-_mesa_is_bufferobj(struct gl_buffer_object *obj)
+_mesa_is_bufferobj(const struct gl_buffer_object *obj)
 {
    return obj->Name != 0;
 }
-- 
cgit v1.2.3


From b9f67df6e72e3a33b91c7d942aaa99622efd688c Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 11 Aug 2009 15:46:46 -0600
Subject: mesa: short-circuit no-change in _mesa_DepthRange()

---
 src/mesa/main/viewport.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/viewport.c b/src/mesa/main/viewport.c
index 50e0402d27..309308c983 100644
--- a/src/mesa/main/viewport.c
+++ b/src/mesa/main/viewport.c
@@ -120,6 +120,10 @@ _mesa_DepthRange(GLclampd nearval, GLclampd farval)
    if (MESA_VERBOSE&VERBOSE_API)
       _mesa_debug(ctx, "glDepthRange %f %f\n", nearval, farval);
 
+   if (ctx->Viewport.Near == nearval &&
+       ctx->Viewport.Far == farval)
+      return;
+
    ctx->Viewport.Near = (GLfloat) CLAMP(nearval, 0.0, 1.0);
    ctx->Viewport.Far = (GLfloat) CLAMP(farval, 0.0, 1.0);
    ctx->NewState |= _NEW_VIEWPORT;
-- 
cgit v1.2.3


From ba2a55ccd61d9fa5565640faefb64fd6fb0e70ab Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 13 Aug 2009 09:38:39 -0600
Subject: mesa: move _mesa_Get[Compressed]TexImage() to texgetimage.c

All the glGetTexImage code is in one file now.
---
 src/mesa/main/api_exec.c    |   1 +
 src/mesa/main/texgetimage.c | 232 ++++++++++++++++++++++++++++++++++++++++
 src/mesa/main/texgetimage.h |   9 ++
 src/mesa/main/teximage.c    | 252 ++++----------------------------------------
 src/mesa/main/teximage.h    |  23 ++--
 5 files changed, 275 insertions(+), 242 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index e49cd041a6..199550b35d 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -107,6 +107,7 @@
 #include "state.h"
 #include "stencil.h"
 #include "texenv.h"
+#include "texgetimage.h"
 #include "teximage.h"
 #if FEATURE_texgen
 #include "texgen.h"
diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c
index 5557b694e3..8800ee22ea 100644
--- a/src/mesa/main/texgetimage.c
+++ b/src/mesa/main/texgetimage.c
@@ -36,6 +36,7 @@
 #include "texcompress.h"
 #include "texformat.h"
 #include "texgetimage.h"
+#include "teximage.h"
 
 
 
@@ -105,6 +106,18 @@ type_with_negative_values(GLenum type)
 }
 
 
+/**
+ * Return pointer to current texture unit.
+ * This the texture unit set by glActiveTexture(), not glClientActiveTexture().
+ */
+static INLINE struct gl_texture_unit *
+get_current_tex_unit(GLcontext *ctx)
+{
+   ASSERT(ctx->Texture.CurrentUnit < Elements(ctx->Texture.Unit));
+   return &(ctx->Texture.Unit[ctx->Texture.CurrentUnit]);
+}
+
+
 /**
  * This is the software fallback for Driver.GetTexImage().
  * All error checking will have been done before this routine is called.
@@ -355,3 +368,222 @@ _mesa_get_compressed_teximage(GLcontext *ctx, GLenum target, GLint level,
                               ctx->Pack.BufferObj);
    }
 }
+
+
+
+/**
+ * Do error checking for a glGetTexImage() call.
+ * \return GL_TRUE if any error, GL_FALSE if no errors.
+ */
+static GLboolean
+getteximage_error_check(GLcontext *ctx, GLenum target, GLint level,
+                        GLenum format, GLenum type, GLvoid *pixels )
+{
+   const struct gl_texture_unit *texUnit;
+   struct gl_texture_object *texObj;
+   struct gl_texture_image *texImage;
+   const GLuint maxLevels = _mesa_max_texture_levels(ctx, target);
+
+   ASSERT(maxLevels > 0);  /* 0 indicates bad target, caught above */
+
+   if (level < 0 || level >= maxLevels) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glGetTexImage(level)" );
+      return GL_TRUE;
+   }
+
+   if (_mesa_sizeof_packed_type(type) <= 0) {
+      _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexImage(type)" );
+      return GL_TRUE;
+   }
+
+   if (_mesa_components_in_format(format) <= 0 ||
+       format == GL_STENCIL_INDEX) {
+      _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexImage(format)" );
+      return GL_TRUE;
+   }
+
+   if (!ctx->Extensions.EXT_paletted_texture && _mesa_is_index_format(format)) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(format)");
+      return GL_TRUE;
+   }
+
+   if (!ctx->Extensions.ARB_depth_texture && _mesa_is_depth_format(format)) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(format)");
+      return GL_TRUE;
+   }
+
+   if (!ctx->Extensions.MESA_ycbcr_texture && _mesa_is_ycbcr_format(format)) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(format)");
+      return GL_TRUE;
+   }
+
+   if (!ctx->Extensions.EXT_packed_depth_stencil
+       && _mesa_is_depthstencil_format(format)) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(format)");
+      return GL_TRUE;
+   }
+
+   if (!ctx->Extensions.ATI_envmap_bumpmap
+       && _mesa_is_dudv_format(format)) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(format)");
+      return GL_TRUE;
+   }
+
+   texUnit = get_current_tex_unit(ctx);
+   texObj = _mesa_select_tex_object(ctx, texUnit, target);
+
+   if (!texObj || _mesa_is_proxy_texture(target)) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(target)");
+      return GL_TRUE;
+   }
+
+   texImage = _mesa_select_tex_image(ctx, texObj, target, level);
+   if (!texImage) {
+      /* out of memory */
+      return GL_TRUE;
+   }
+      
+   /* Make sure the requested image format is compatible with the
+    * texture's format.  Note that a color index texture can be converted
+    * to RGBA so that combo is allowed.
+    */
+   if (_mesa_is_color_format(format)
+       && !_mesa_is_color_format(texImage->TexFormat->BaseFormat)
+       && !_mesa_is_index_format(texImage->TexFormat->BaseFormat)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");
+      return GL_TRUE;
+   }
+   else if (_mesa_is_index_format(format)
+            && !_mesa_is_index_format(texImage->TexFormat->BaseFormat)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");
+      return GL_TRUE;
+   }
+   else if (_mesa_is_depth_format(format)
+            && !_mesa_is_depth_format(texImage->TexFormat->BaseFormat)
+            && !_mesa_is_depthstencil_format(texImage->TexFormat->BaseFormat)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");
+      return GL_TRUE;
+   }
+   else if (_mesa_is_ycbcr_format(format)
+            && !_mesa_is_ycbcr_format(texImage->TexFormat->BaseFormat)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");
+      return GL_TRUE;
+   }
+   else if (_mesa_is_depthstencil_format(format)
+            && !_mesa_is_depthstencil_format(texImage->TexFormat->BaseFormat)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");
+      return GL_TRUE;
+   }
+   else if (_mesa_is_dudv_format(format)
+            && !_mesa_is_dudv_format(texImage->TexFormat->BaseFormat)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");
+      return GL_TRUE;
+   }
+
+   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
+      /* packing texture image into a PBO */
+      const GLuint dimensions = (target == GL_TEXTURE_3D) ? 3 : 2;
+      if (!_mesa_validate_pbo_access(dimensions, &ctx->Pack, texImage->Width,
+                                     texImage->Height, texImage->Depth,
+                                     format, type, pixels)) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glGetTexImage(invalid PBO access)");
+         return GL_TRUE;
+      }
+   }
+
+   return GL_FALSE;
+}
+
+
+
+/**
+ * Get texture image.  Called by glGetTexImage.
+ *
+ * \param target texture target.
+ * \param level image level.
+ * \param format pixel data format for returned image.
+ * \param type pixel data type for returned image.
+ * \param pixels returned pixel data.
+ */
+void GLAPIENTRY
+_mesa_GetTexImage( GLenum target, GLint level, GLenum format,
+                   GLenum type, GLvoid *pixels )
+{
+   const struct gl_texture_unit *texUnit;
+   struct gl_texture_object *texObj;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (getteximage_error_check(ctx, target, level, format, type, pixels)) {
+      return;
+   }
+
+   texUnit = get_current_tex_unit(ctx);
+   texObj = _mesa_select_tex_object(ctx, texUnit, target);
+
+   _mesa_lock_texture(ctx, texObj);
+   {
+      struct gl_texture_image *texImage =
+         _mesa_select_tex_image(ctx, texObj, target, level);
+
+      /* typically, this will call _mesa_get_teximage() */
+      ctx->Driver.GetTexImage(ctx, target, level, format, type, pixels,
+                              texObj, texImage);
+   }
+   _mesa_unlock_texture(ctx, texObj);
+}
+
+
+void GLAPIENTRY
+_mesa_GetCompressedTexImageARB(GLenum target, GLint level, GLvoid *img)
+{
+   const struct gl_texture_unit *texUnit;
+   struct gl_texture_object *texObj;
+   struct gl_texture_image *texImage;
+   GLint maxLevels;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   texUnit = get_current_tex_unit(ctx);
+   texObj = _mesa_select_tex_object(ctx, texUnit, target);
+   if (!texObj) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetCompressedTexImageARB");
+      return;
+   }
+
+   maxLevels = _mesa_max_texture_levels(ctx, target);
+   ASSERT(maxLevels > 0); /* 0 indicates bad target, caught above */
+
+   if (level < 0 || level >= maxLevels) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glGetCompressedTexImageARB(level)");
+      return;
+   }
+
+   if (_mesa_is_proxy_texture(target)) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetCompressedTexImageARB(target)");
+      return;
+   }
+
+   _mesa_lock_texture(ctx, texObj);
+   {
+      texImage = _mesa_select_tex_image(ctx, texObj, target, level);
+      if (texImage) {
+         if (texImage->IsCompressed) {
+            /* this typically calls _mesa_get_compressed_teximage() */
+            ctx->Driver.GetCompressedTexImage(ctx, target, level, img,
+                                              texObj, texImage);
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_OPERATION,
+                        "glGetCompressedTexImageARB");
+         }
+      }
+      else {
+         /* probably invalid mipmap level */
+         _mesa_error(ctx, GL_INVALID_VALUE,
+                     "glGetCompressedTexImageARB(level)");
+      }
+   }
+   _mesa_unlock_texture(ctx, texObj);
+}
diff --git a/src/mesa/main/texgetimage.h b/src/mesa/main/texgetimage.h
index 01f486e8f0..088d27c7e1 100644
--- a/src/mesa/main/texgetimage.h
+++ b/src/mesa/main/texgetimage.h
@@ -43,4 +43,13 @@ _mesa_get_compressed_teximage(GLcontext *ctx, GLenum target, GLint level,
 
 
 
+extern void GLAPIENTRY
+_mesa_GetTexImage( GLenum target, GLint level,
+                   GLenum format, GLenum type, GLvoid *pixels );
+
+
+extern void GLAPIENTRY
+_mesa_GetCompressedTexImageARB(GLenum target, GLint lod, GLvoid *img);
+
+
 #endif /* TEXGETIMAGE_H */
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index c758462a46..54e9155b2a 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -537,8 +537,8 @@ _mesa_is_color_format(GLenum format)
 /**
  * Test if the given image format is a color index format.
  */
-static GLboolean
-is_index_format(GLenum format)
+GLboolean
+_mesa_is_index_format(GLenum format)
 {
    switch (format) {
       case GL_COLOR_INDEX:
@@ -558,8 +558,8 @@ is_index_format(GLenum format)
 /**
  * Test if the given image format is a depth component format.
  */
-static GLboolean
-is_depth_format(GLenum format)
+GLboolean
+_mesa_is_depth_format(GLenum format)
 {
    switch (format) {
       case GL_DEPTH_COMPONENT16:
@@ -576,8 +576,8 @@ is_depth_format(GLenum format)
 /**
  * Test if the given image format is a YCbCr format.
  */
-static GLboolean
-is_ycbcr_format(GLenum format)
+GLboolean
+_mesa_is_ycbcr_format(GLenum format)
 {
    switch (format) {
       case GL_YCBCR_MESA:
@@ -591,8 +591,8 @@ is_ycbcr_format(GLenum format)
 /**
  * Test if the given image format is a Depth/Stencil format.
  */
-static GLboolean
-is_depthstencil_format(GLenum format)
+GLboolean
+_mesa_is_depthstencil_format(GLenum format)
 {
    switch (format) {
       case GL_DEPTH24_STENCIL8_EXT:
@@ -606,8 +606,8 @@ is_depthstencil_format(GLenum format)
 /**
  * Test if the given image format is a dudv format.
  */
-static GLboolean
-is_dudv_format(GLenum format)
+GLboolean
+_mesa_is_dudv_format(GLenum format)
 {
    switch (format) {
       case GL_DUDV_ATI:
@@ -1549,13 +1549,13 @@ texture_error_check( GLcontext *ctx, GLenum target,
 
    /* make sure internal format and format basically agree */
    colorFormat = _mesa_is_color_format(format);
-   indexFormat = is_index_format(format);
+   indexFormat = _mesa_is_index_format(format);
    if ((_mesa_is_color_format(internalFormat) && !colorFormat && !indexFormat) ||
-       (is_index_format(internalFormat) && !indexFormat) ||
-       (is_depth_format(internalFormat) != is_depth_format(format)) ||
-       (is_ycbcr_format(internalFormat) != is_ycbcr_format(format)) ||
-       (is_depthstencil_format(internalFormat) != is_depthstencil_format(format)) ||
-       (is_dudv_format(internalFormat) != is_dudv_format(format))) {
+       (_mesa_is_index_format(internalFormat) && !indexFormat) ||
+       (_mesa_is_depth_format(internalFormat) != _mesa_is_depth_format(format)) ||
+       (_mesa_is_ycbcr_format(internalFormat) != _mesa_is_ycbcr_format(format)) ||
+       (_mesa_is_depthstencil_format(internalFormat) != _mesa_is_depthstencil_format(format)) ||
+       (_mesa_is_dudv_format(internalFormat) != _mesa_is_dudv_format(format))) {
       if (!isProxy)
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "glTexImage%dD(incompatible internalFormat 0x%x, format 0x%x)",
@@ -1990,7 +1990,7 @@ copytexture_error_check( GLcontext *ctx, GLuint dimensions,
          return GL_TRUE;
       }
    }
-   else if (is_depth_format(internalFormat)) {
+   else if (_mesa_is_depth_format(internalFormat)) {
       /* make sure we have depth/stencil buffers */
       if (!ctx->ReadBuffer->_DepthBuffer) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
@@ -1998,7 +1998,7 @@ copytexture_error_check( GLcontext *ctx, GLuint dimensions,
          return GL_TRUE;
       }
    }
-   else if (is_depthstencil_format(internalFormat)) {
+   else if (_mesa_is_depthstencil_format(internalFormat)) {
       /* make sure we have depth/stencil buffers */
       if (!ctx->ReadBuffer->_DepthBuffer || !ctx->ReadBuffer->_StencilBuffer) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
@@ -2223,170 +2223,6 @@ copytexsubimage_error_check2( GLcontext *ctx, GLuint dimensions,
 }
 
 
-/**
- * Do error checking for a glGetTexImage() call.
- * \return GL_TRUE if any error, GL_FALSE if no errors.
- */
-static GLboolean
-getteximage_error_check(GLcontext *ctx, GLenum target, GLint level,
-                        GLenum format, GLenum type, GLvoid *pixels )
-{
-   const struct gl_texture_unit *texUnit;
-   struct gl_texture_object *texObj;
-   struct gl_texture_image *texImage;
-   const GLuint maxLevels = _mesa_max_texture_levels(ctx, target);
-
-   ASSERT(maxLevels > 0);  /* 0 indicates bad target, caught above */
-
-   if (level < 0 || level >= maxLevels) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glGetTexImage(level)" );
-      return GL_TRUE;
-   }
-
-   if (_mesa_sizeof_packed_type(type) <= 0) {
-      _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexImage(type)" );
-      return GL_TRUE;
-   }
-
-   if (_mesa_components_in_format(format) <= 0 ||
-       format == GL_STENCIL_INDEX) {
-      _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexImage(format)" );
-      return GL_TRUE;
-   }
-
-   if (!ctx->Extensions.EXT_paletted_texture && is_index_format(format)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(format)");
-      return GL_TRUE;
-   }
-
-   if (!ctx->Extensions.ARB_depth_texture && is_depth_format(format)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(format)");
-      return GL_TRUE;
-   }
-
-   if (!ctx->Extensions.MESA_ycbcr_texture && is_ycbcr_format(format)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(format)");
-      return GL_TRUE;
-   }
-
-   if (!ctx->Extensions.EXT_packed_depth_stencil
-       && is_depthstencil_format(format)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(format)");
-      return GL_TRUE;
-   }
-
-   if (!ctx->Extensions.ATI_envmap_bumpmap
-       && is_dudv_format(format)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(format)");
-      return GL_TRUE;
-   }
-
-   texUnit = get_current_tex_unit(ctx);
-   texObj = _mesa_select_tex_object(ctx, texUnit, target);
-
-   if (!texObj || _mesa_is_proxy_texture(target)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(target)");
-      return GL_TRUE;
-   }
-
-   texImage = _mesa_select_tex_image(ctx, texObj, target, level);
-   if (!texImage) {
-      /* out of memory */
-      return GL_TRUE;
-   }
-      
-   /* Make sure the requested image format is compatible with the
-    * texture's format.  Note that a color index texture can be converted
-    * to RGBA so that combo is allowed.
-    */
-   if (_mesa_is_color_format(format)
-       && !_mesa_is_color_format(texImage->TexFormat->BaseFormat)
-       && !is_index_format(texImage->TexFormat->BaseFormat)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");
-      return GL_TRUE;
-   }
-   else if (is_index_format(format)
-            && !is_index_format(texImage->TexFormat->BaseFormat)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");
-      return GL_TRUE;
-   }
-   else if (is_depth_format(format)
-            && !is_depth_format(texImage->TexFormat->BaseFormat)
-            && !is_depthstencil_format(texImage->TexFormat->BaseFormat)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");
-      return GL_TRUE;
-   }
-   else if (is_ycbcr_format(format)
-            && !is_ycbcr_format(texImage->TexFormat->BaseFormat)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");
-      return GL_TRUE;
-   }
-   else if (is_depthstencil_format(format)
-            && !is_depthstencil_format(texImage->TexFormat->BaseFormat)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");
-      return GL_TRUE;
-   }
-   else if (is_dudv_format(format)
-            && !is_dudv_format(texImage->TexFormat->BaseFormat)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");
-      return GL_TRUE;
-   }
-
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      /* packing texture image into a PBO */
-      const GLuint dimensions = (target == GL_TEXTURE_3D) ? 3 : 2;
-      if (!_mesa_validate_pbo_access(dimensions, &ctx->Pack, texImage->Width,
-                                     texImage->Height, texImage->Depth,
-                                     format, type, pixels)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetTexImage(invalid PBO access)");
-         return GL_TRUE;
-      }
-   }
-
-   return GL_FALSE;
-}
-
-
-
-/**
- * Get texture image.  Called by glGetTexImage.
- *
- * \param target texture target.
- * \param level image level.
- * \param format pixel data format for returned image.
- * \param type pixel data type for returned image.
- * \param pixels returned pixel data.
- */
-void GLAPIENTRY
-_mesa_GetTexImage( GLenum target, GLint level, GLenum format,
-                   GLenum type, GLvoid *pixels )
-{
-   const struct gl_texture_unit *texUnit;
-   struct gl_texture_object *texObj;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (getteximage_error_check(ctx, target, level, format, type, pixels)) {
-      return;
-   }
-
-   texUnit = get_current_tex_unit(ctx);
-   texObj = _mesa_select_tex_object(ctx, texUnit, target);
-
-   _mesa_lock_texture(ctx, texObj);
-   {
-      struct gl_texture_image *texImage =
-         _mesa_select_tex_image(ctx, texObj, target, level);
-
-      /* typically, this will call _mesa_get_teximage() */
-      ctx->Driver.GetTexImage(ctx, target, level, format, type, pixels,
-                              texObj, texImage);
-   }
-   _mesa_unlock_texture(ctx, texObj);
-}
-
-
 /** Callback info for walking over FBO hash table */
 struct cb_info
 {
@@ -3947,55 +3783,3 @@ _mesa_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset,
 }
 
 
-void GLAPIENTRY
-_mesa_GetCompressedTexImageARB(GLenum target, GLint level, GLvoid *img)
-{
-   const struct gl_texture_unit *texUnit;
-   struct gl_texture_object *texObj;
-   struct gl_texture_image *texImage;
-   GLint maxLevels;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   texUnit = get_current_tex_unit(ctx);
-   texObj = _mesa_select_tex_object(ctx, texUnit, target);
-   if (!texObj) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetCompressedTexImageARB");
-      return;
-   }
-
-   maxLevels = _mesa_max_texture_levels(ctx, target);
-   ASSERT(maxLevels > 0); /* 0 indicates bad target, caught above */
-
-   if (level < 0 || level >= maxLevels) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glGetCompressedTexImageARB(level)");
-      return;
-   }
-
-   if (_mesa_is_proxy_texture(target)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetCompressedTexImageARB(target)");
-      return;
-   }
-
-   _mesa_lock_texture(ctx, texObj);
-   {
-      texImage = _mesa_select_tex_image(ctx, texObj, target, level);
-      if (texImage) {
-         if (texImage->IsCompressed) {
-            /* this typically calls _mesa_get_compressed_teximage() */
-            ctx->Driver.GetCompressedTexImage(ctx, target, level, img,
-                                              texObj, texImage);
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_OPERATION,
-                        "glGetCompressedTexImageARB");
-         }
-      }
-      else {
-         /* probably invalid mipmap level */
-         _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glGetCompressedTexImageARB(level)");
-      }
-   }
-   _mesa_unlock_texture(ctx, texObj);
-}
diff --git a/src/mesa/main/teximage.h b/src/mesa/main/teximage.h
index b0d7c1c3aa..8a3179687c 100644
--- a/src/mesa/main/teximage.h
+++ b/src/mesa/main/teximage.h
@@ -118,6 +118,21 @@ _mesa_tex_target_to_face(GLenum target);
 extern GLboolean
 _mesa_is_color_format(GLenum format);
 
+extern GLboolean
+_mesa_is_index_format(GLenum format);
+
+extern GLboolean
+_mesa_is_depth_format(GLenum format);
+
+extern GLboolean
+_mesa_is_ycbcr_format(GLenum format);
+
+extern GLboolean
+_mesa_is_depthstencil_format(GLenum format);
+
+extern GLboolean
+_mesa_is_dudv_format(GLenum format);
+
 
 /**
  * Lock a texture for updating.  See also _mesa_lock_context_textures().
@@ -167,11 +182,6 @@ _mesa_TexImage3DEXT( GLenum target, GLint level, GLenum internalformat,
                      const GLvoid *pixels );
 
 
-extern void GLAPIENTRY
-_mesa_GetTexImage( GLenum target, GLint level,
-                   GLenum format, GLenum type, GLvoid *pixels );
-
-
 extern void GLAPIENTRY
 _mesa_TexSubImage1D( GLenum target, GLint level, GLint xoffset,
                      GLsizei width,
@@ -264,9 +274,6 @@ _mesa_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset,
                                  GLsizei height, GLsizei depth, GLenum format,
                                  GLsizei imageSize, const GLvoid *data);
 
-extern void GLAPIENTRY
-_mesa_GetCompressedTexImageARB(GLenum target, GLint lod, GLvoid *img);
-
 /*@}*/
 
 #endif
-- 
cgit v1.2.3


From 73b150c816c46a88e3e5d97f9b73ab0095f2bc60 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 13 Aug 2009 09:46:42 -0600
Subject: mesa: refactor: move _mesa_is_color/depth/stencil_format() helpers to
 image.c

---
 src/mesa/drivers/common/meta.c |   1 +
 src/mesa/main/image.c          | 204 ++++++++++++++++++++++++++++++++++++++++
 src/mesa/main/image.h          |  18 ++++
 src/mesa/main/teximage.c       | 207 +----------------------------------------
 src/mesa/main/teximage.h       |  19 ----
 5 files changed, 225 insertions(+), 224 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index a8db686573..e42beabc9b 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -39,6 +39,7 @@
 #include "main/bufferobj.h"
 #include "main/depth.h"
 #include "main/enable.h"
+#include "main/image.h"
 #include "main/macros.h"
 #include "main/matrix.h"
 #include "main/polygon.h"
diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index e0e8548d7c..d77c593ac7 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -530,6 +530,210 @@ _mesa_is_legal_format_and_type( GLcontext *ctx, GLenum format, GLenum type )
 }
 
 
+/**
+ * Test if the given image format is a color/RGBA format (i.e., not color
+ * index, depth, stencil, etc).
+ * \param format  the image format value (may by an internal texture format)
+ * \return GL_TRUE if its a color/RGBA format, GL_FALSE otherwise.
+ */
+GLboolean
+_mesa_is_color_format(GLenum format)
+{
+   switch (format) {
+      case GL_RED:
+      case GL_GREEN:
+      case GL_BLUE:
+      case GL_ALPHA:
+      case GL_ALPHA4:
+      case GL_ALPHA8:
+      case GL_ALPHA12:
+      case GL_ALPHA16:
+      case 1:
+      case GL_LUMINANCE:
+      case GL_LUMINANCE4:
+      case GL_LUMINANCE8:
+      case GL_LUMINANCE12:
+      case GL_LUMINANCE16:
+      case 2:
+      case GL_LUMINANCE_ALPHA:
+      case GL_LUMINANCE4_ALPHA4:
+      case GL_LUMINANCE6_ALPHA2:
+      case GL_LUMINANCE8_ALPHA8:
+      case GL_LUMINANCE12_ALPHA4:
+      case GL_LUMINANCE12_ALPHA12:
+      case GL_LUMINANCE16_ALPHA16:
+      case GL_INTENSITY:
+      case GL_INTENSITY4:
+      case GL_INTENSITY8:
+      case GL_INTENSITY12:
+      case GL_INTENSITY16:
+      case 3:
+      case GL_RGB:
+      case GL_BGR:
+      case GL_R3_G3_B2:
+      case GL_RGB4:
+      case GL_RGB5:
+      case GL_RGB8:
+      case GL_RGB10:
+      case GL_RGB12:
+      case GL_RGB16:
+      case 4:
+      case GL_ABGR_EXT:
+      case GL_RGBA:
+      case GL_BGRA:
+      case GL_RGBA2:
+      case GL_RGBA4:
+      case GL_RGB5_A1:
+      case GL_RGBA8:
+      case GL_RGB10_A2:
+      case GL_RGBA12:
+      case GL_RGBA16:
+      /* float texture formats */
+      case GL_ALPHA16F_ARB:
+      case GL_ALPHA32F_ARB:
+      case GL_LUMINANCE16F_ARB:
+      case GL_LUMINANCE32F_ARB:
+      case GL_LUMINANCE_ALPHA16F_ARB:
+      case GL_LUMINANCE_ALPHA32F_ARB:
+      case GL_INTENSITY16F_ARB:
+      case GL_INTENSITY32F_ARB:
+      case GL_RGB16F_ARB:
+      case GL_RGB32F_ARB:
+      case GL_RGBA16F_ARB:
+      case GL_RGBA32F_ARB:
+      /* compressed formats */
+      case GL_COMPRESSED_ALPHA:
+      case GL_COMPRESSED_LUMINANCE:
+      case GL_COMPRESSED_LUMINANCE_ALPHA:
+      case GL_COMPRESSED_INTENSITY:
+      case GL_COMPRESSED_RGB:
+      case GL_COMPRESSED_RGBA:
+      case GL_RGB_S3TC:
+      case GL_RGB4_S3TC:
+      case GL_RGBA_S3TC:
+      case GL_RGBA4_S3TC:
+      case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
+      case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
+      case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
+      case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
+      case GL_COMPRESSED_RGB_FXT1_3DFX:
+      case GL_COMPRESSED_RGBA_FXT1_3DFX:
+#if FEATURE_EXT_texture_sRGB
+      case GL_SRGB_EXT:
+      case GL_SRGB8_EXT:
+      case GL_SRGB_ALPHA_EXT:
+      case GL_SRGB8_ALPHA8_EXT:
+      case GL_SLUMINANCE_ALPHA_EXT:
+      case GL_SLUMINANCE8_ALPHA8_EXT:
+      case GL_SLUMINANCE_EXT:
+      case GL_SLUMINANCE8_EXT:
+      case GL_COMPRESSED_SRGB_EXT:
+      case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:
+      case GL_COMPRESSED_SRGB_ALPHA_EXT:
+      case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:
+      case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:
+      case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:
+      case GL_COMPRESSED_SLUMINANCE_EXT:
+      case GL_COMPRESSED_SLUMINANCE_ALPHA_EXT:
+#endif /* FEATURE_EXT_texture_sRGB */
+         return GL_TRUE;
+      /* signed texture formats */
+      case GL_RGBA_SNORM:
+      case GL_RGBA8_SNORM:
+         return GL_TRUE;
+      case GL_YCBCR_MESA:  /* not considered to be RGB */
+         /* fall-through */
+      default:
+         return GL_FALSE;
+   }
+}
+
+
+/**
+ * Test if the given image format is a color index format.
+ */
+GLboolean
+_mesa_is_index_format(GLenum format)
+{
+   switch (format) {
+      case GL_COLOR_INDEX:
+      case GL_COLOR_INDEX1_EXT:
+      case GL_COLOR_INDEX2_EXT:
+      case GL_COLOR_INDEX4_EXT:
+      case GL_COLOR_INDEX8_EXT:
+      case GL_COLOR_INDEX12_EXT:
+      case GL_COLOR_INDEX16_EXT:
+         return GL_TRUE;
+      default:
+         return GL_FALSE;
+   }
+}
+
+
+/**
+ * Test if the given image format is a depth component format.
+ */
+GLboolean
+_mesa_is_depth_format(GLenum format)
+{
+   switch (format) {
+      case GL_DEPTH_COMPONENT:
+      case GL_DEPTH_COMPONENT16:
+      case GL_DEPTH_COMPONENT24:
+      case GL_DEPTH_COMPONENT32:
+         return GL_TRUE;
+      default:
+         return GL_FALSE;
+   }
+}
+
+
+/**
+ * Test if the given image format is a YCbCr format.
+ */
+GLboolean
+_mesa_is_ycbcr_format(GLenum format)
+{
+   switch (format) {
+      case GL_YCBCR_MESA:
+         return GL_TRUE;
+      default:
+         return GL_FALSE;
+   }
+}
+
+
+/**
+ * Test if the given image format is a depth+stencil format.
+ */
+GLboolean
+_mesa_is_depthstencil_format(GLenum format)
+{
+   switch (format) {
+      case GL_DEPTH24_STENCIL8_EXT:
+      case GL_DEPTH_STENCIL_EXT:
+         return GL_TRUE;
+      default:
+         return GL_FALSE;
+   }
+}
+
+/**
+ * Test if the given image format is a dudv format.
+ */
+GLboolean
+_mesa_is_dudv_format(GLenum format)
+{
+   switch (format) {
+      case GL_DUDV_ATI:
+      case GL_DU8DV8_ATI:
+         return GL_TRUE;
+      default:
+         return GL_FALSE;
+   }
+}
+
+
 /**
  * Return the address of a specific pixel in an image (1D, 2D or 3D).
  *
diff --git a/src/mesa/main/image.h b/src/mesa/main/image.h
index ee17accb80..20459a5f1e 100644
--- a/src/mesa/main/image.h
+++ b/src/mesa/main/image.h
@@ -54,6 +54,24 @@ _mesa_bytes_per_pixel( GLenum format, GLenum type );
 extern GLboolean
 _mesa_is_legal_format_and_type( GLcontext *ctx, GLenum format, GLenum type );
 
+extern GLboolean
+_mesa_is_color_format(GLenum format);
+
+extern GLboolean
+_mesa_is_index_format(GLenum format);
+
+extern GLboolean
+_mesa_is_depth_format(GLenum format);
+
+extern GLboolean
+_mesa_is_ycbcr_format(GLenum format);
+
+extern GLboolean
+_mesa_is_depthstencil_format(GLenum format);
+
+extern GLboolean
+_mesa_is_dudv_format(GLenum format);
+
 
 extern GLvoid *
 _mesa_image_address( GLuint dimensions,
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 54e9155b2a..56d3790408 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -182,6 +182,8 @@ logbase2( int n )
  *
  * This is the format which is used during texture application (i.e. the
  * texture format and env mode determine the arithmetic used.
+ *
+ * XXX this could be static
  */
 GLint
 _mesa_base_tex_format( GLcontext *ctx, GLint internalFormat )
@@ -414,211 +416,6 @@ _mesa_base_tex_format( GLcontext *ctx, GLint internalFormat )
 }
 
 
-/**
- * Test if the given image format is a color/RGBA format (i.e., not color
- * index, depth, stencil, etc).
- * \param format  the image format value (may by an internal texture format)
- * \return GL_TRUE if its a color/RGBA format, GL_FALSE otherwise.
- * XXX maybe move this func to image.c
- */
-GLboolean
-_mesa_is_color_format(GLenum format)
-{
-   switch (format) {
-      case GL_RED:
-      case GL_GREEN:
-      case GL_BLUE:
-      case GL_ALPHA:
-      case GL_ALPHA4:
-      case GL_ALPHA8:
-      case GL_ALPHA12:
-      case GL_ALPHA16:
-      case 1:
-      case GL_LUMINANCE:
-      case GL_LUMINANCE4:
-      case GL_LUMINANCE8:
-      case GL_LUMINANCE12:
-      case GL_LUMINANCE16:
-      case 2:
-      case GL_LUMINANCE_ALPHA:
-      case GL_LUMINANCE4_ALPHA4:
-      case GL_LUMINANCE6_ALPHA2:
-      case GL_LUMINANCE8_ALPHA8:
-      case GL_LUMINANCE12_ALPHA4:
-      case GL_LUMINANCE12_ALPHA12:
-      case GL_LUMINANCE16_ALPHA16:
-      case GL_INTENSITY:
-      case GL_INTENSITY4:
-      case GL_INTENSITY8:
-      case GL_INTENSITY12:
-      case GL_INTENSITY16:
-      case 3:
-      case GL_RGB:
-      case GL_BGR:
-      case GL_R3_G3_B2:
-      case GL_RGB4:
-      case GL_RGB5:
-      case GL_RGB8:
-      case GL_RGB10:
-      case GL_RGB12:
-      case GL_RGB16:
-      case 4:
-      case GL_ABGR_EXT:
-      case GL_RGBA:
-      case GL_BGRA:
-      case GL_RGBA2:
-      case GL_RGBA4:
-      case GL_RGB5_A1:
-      case GL_RGBA8:
-      case GL_RGB10_A2:
-      case GL_RGBA12:
-      case GL_RGBA16:
-      /* float texture formats */
-      case GL_ALPHA16F_ARB:
-      case GL_ALPHA32F_ARB:
-      case GL_LUMINANCE16F_ARB:
-      case GL_LUMINANCE32F_ARB:
-      case GL_LUMINANCE_ALPHA16F_ARB:
-      case GL_LUMINANCE_ALPHA32F_ARB:
-      case GL_INTENSITY16F_ARB:
-      case GL_INTENSITY32F_ARB:
-      case GL_RGB16F_ARB:
-      case GL_RGB32F_ARB:
-      case GL_RGBA16F_ARB:
-      case GL_RGBA32F_ARB:
-      /* compressed formats */
-      case GL_COMPRESSED_ALPHA:
-      case GL_COMPRESSED_LUMINANCE:
-      case GL_COMPRESSED_LUMINANCE_ALPHA:
-      case GL_COMPRESSED_INTENSITY:
-      case GL_COMPRESSED_RGB:
-      case GL_COMPRESSED_RGBA:
-      case GL_RGB_S3TC:
-      case GL_RGB4_S3TC:
-      case GL_RGBA_S3TC:
-      case GL_RGBA4_S3TC:
-      case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
-      case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
-      case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
-      case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
-      case GL_COMPRESSED_RGB_FXT1_3DFX:
-      case GL_COMPRESSED_RGBA_FXT1_3DFX:
-#if FEATURE_EXT_texture_sRGB
-      case GL_SRGB_EXT:
-      case GL_SRGB8_EXT:
-      case GL_SRGB_ALPHA_EXT:
-      case GL_SRGB8_ALPHA8_EXT:
-      case GL_SLUMINANCE_ALPHA_EXT:
-      case GL_SLUMINANCE8_ALPHA8_EXT:
-      case GL_SLUMINANCE_EXT:
-      case GL_SLUMINANCE8_EXT:
-      case GL_COMPRESSED_SRGB_EXT:
-      case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:
-      case GL_COMPRESSED_SRGB_ALPHA_EXT:
-      case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:
-      case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:
-      case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:
-      case GL_COMPRESSED_SLUMINANCE_EXT:
-      case GL_COMPRESSED_SLUMINANCE_ALPHA_EXT:
-#endif /* FEATURE_EXT_texture_sRGB */
-         return GL_TRUE;
-      /* signed texture formats */
-      case GL_RGBA_SNORM:
-      case GL_RGBA8_SNORM:
-         return GL_TRUE;
-      case GL_YCBCR_MESA:  /* not considered to be RGB */
-         /* fall-through */
-      default:
-         return GL_FALSE;
-   }
-}
-
-
-/**
- * Test if the given image format is a color index format.
- */
-GLboolean
-_mesa_is_index_format(GLenum format)
-{
-   switch (format) {
-      case GL_COLOR_INDEX:
-      case GL_COLOR_INDEX1_EXT:
-      case GL_COLOR_INDEX2_EXT:
-      case GL_COLOR_INDEX4_EXT:
-      case GL_COLOR_INDEX8_EXT:
-      case GL_COLOR_INDEX12_EXT:
-      case GL_COLOR_INDEX16_EXT:
-         return GL_TRUE;
-      default:
-         return GL_FALSE;
-   }
-}
-
-
-/**
- * Test if the given image format is a depth component format.
- */
-GLboolean
-_mesa_is_depth_format(GLenum format)
-{
-   switch (format) {
-      case GL_DEPTH_COMPONENT16:
-      case GL_DEPTH_COMPONENT24:
-      case GL_DEPTH_COMPONENT32:
-      case GL_DEPTH_COMPONENT:
-         return GL_TRUE;
-      default:
-         return GL_FALSE;
-   }
-}
-
-
-/**
- * Test if the given image format is a YCbCr format.
- */
-GLboolean
-_mesa_is_ycbcr_format(GLenum format)
-{
-   switch (format) {
-      case GL_YCBCR_MESA:
-         return GL_TRUE;
-      default:
-         return GL_FALSE;
-   }
-}
-
-
-/**
- * Test if the given image format is a Depth/Stencil format.
- */
-GLboolean
-_mesa_is_depthstencil_format(GLenum format)
-{
-   switch (format) {
-      case GL_DEPTH24_STENCIL8_EXT:
-      case GL_DEPTH_STENCIL_EXT:
-         return GL_TRUE;
-      default:
-         return GL_FALSE;
-   }
-}
-
-/**
- * Test if the given image format is a dudv format.
- */
-GLboolean
-_mesa_is_dudv_format(GLenum format)
-{
-   switch (format) {
-      case GL_DUDV_ATI:
-      case GL_DU8DV8_ATI:
-         return GL_TRUE;
-      default:
-         return GL_FALSE;
-   }
-}
-
-
 /**
  * Test if it is a supported compressed format.
  * 
diff --git a/src/mesa/main/teximage.h b/src/mesa/main/teximage.h
index 8a3179687c..094177da79 100644
--- a/src/mesa/main/teximage.h
+++ b/src/mesa/main/teximage.h
@@ -115,25 +115,6 @@ extern GLuint
 _mesa_tex_target_to_face(GLenum target);
 
 
-extern GLboolean
-_mesa_is_color_format(GLenum format);
-
-extern GLboolean
-_mesa_is_index_format(GLenum format);
-
-extern GLboolean
-_mesa_is_depth_format(GLenum format);
-
-extern GLboolean
-_mesa_is_ycbcr_format(GLenum format);
-
-extern GLboolean
-_mesa_is_depthstencil_format(GLenum format);
-
-extern GLboolean
-_mesa_is_dudv_format(GLenum format);
-
-
 /**
  * Lock a texture for updating.  See also _mesa_lock_context_textures().
  */
-- 
cgit v1.2.3


From 6aa7a03d856f4cfdbed493c976387b2164a0c922 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 13 Aug 2009 09:55:34 -0600
Subject: mesa: use _mesa_get_current_tex_unit() in more places

---
 src/mesa/main/texenv.c      | 16 ++++++++------
 src/mesa/main/texgetimage.c | 19 ++++-------------
 src/mesa/main/teximage.c    | 52 +++++++++++++++++----------------------------
 src/mesa/main/texparam.c    |  9 ++++----
 src/mesa/main/texstate.h    | 18 ++++++++++++----
 5 files changed, 53 insertions(+), 61 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenv.c b/src/mesa/main/texenv.c
index 4c04a7ed37..1eab78c74c 100644
--- a/src/mesa/main/texenv.c
+++ b/src/mesa/main/texenv.c
@@ -35,6 +35,7 @@
 #include "main/enums.h"
 #include "main/macros.h"
 #include "main/texenv.h"
+#include "main/texstate.h"
 
 
 #define TE_ERROR(errCode, msg, value)				\
@@ -466,7 +467,7 @@ _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
       return;
    }
 
-   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   texUnit = _mesa_get_current_tex_unit(ctx);
 
    if (target == GL_TEXTURE_ENV) {
       switch (pname) {
@@ -793,7 +794,7 @@ _mesa_GetTexEnvfv( GLenum target, GLenum pname, GLfloat *params )
       return;
    }
 
-   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   texUnit = _mesa_get_current_tex_unit(ctx);
 
    if (target == GL_TEXTURE_ENV) {
       if (pname == GL_TEXTURE_ENV_COLOR) {
@@ -857,7 +858,7 @@ _mesa_GetTexEnviv( GLenum target, GLenum pname, GLint *params )
       return;
    }
 
-   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   texUnit = _mesa_get_current_tex_unit(ctx);
 
    if (target == GL_TEXTURE_ENV) {
       if (pname == GL_TEXTURE_ENV_COLOR) {
@@ -936,7 +937,8 @@ _mesa_TexBumpParameterfvATI( GLenum pname, const GLfloat *param )
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
    /* should return error if extension not supported? */
-   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+
+   texUnit = _mesa_get_current_tex_unit(ctx);
 
    if (pname == GL_BUMP_ROT_MATRIX_ATI) {
       if (TEST_EQ_4V(param, texUnit->RotMatrix))
@@ -965,7 +967,8 @@ _mesa_GetTexBumpParameterivATI( GLenum pname, GLint *param )
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
    /* should return error if extension not supported? */
-   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+
+   texUnit = _mesa_get_current_tex_unit(ctx);
 
    if (pname == GL_BUMP_ROT_MATRIX_SIZE_ATI) {
       /* spec leaves open to support larger matrices.
@@ -1012,7 +1015,8 @@ _mesa_GetTexBumpParameterfvATI( GLenum pname, GLfloat *param )
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
    /* should return error if extension not supported? */
-   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+
+   texUnit = _mesa_get_current_tex_unit(ctx);
 
    if (pname == GL_BUMP_ROT_MATRIX_SIZE_ATI) {
       /* spec leaves open to support larger matrices.
diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c
index 8800ee22ea..2d3b82dd38 100644
--- a/src/mesa/main/texgetimage.c
+++ b/src/mesa/main/texgetimage.c
@@ -37,6 +37,7 @@
 #include "texformat.h"
 #include "texgetimage.h"
 #include "teximage.h"
+#include "texstate.h"
 
 
 
@@ -106,18 +107,6 @@ type_with_negative_values(GLenum type)
 }
 
 
-/**
- * Return pointer to current texture unit.
- * This the texture unit set by glActiveTexture(), not glClientActiveTexture().
- */
-static INLINE struct gl_texture_unit *
-get_current_tex_unit(GLcontext *ctx)
-{
-   ASSERT(ctx->Texture.CurrentUnit < Elements(ctx->Texture.Unit));
-   return &(ctx->Texture.Unit[ctx->Texture.CurrentUnit]);
-}
-
-
 /**
  * This is the software fallback for Driver.GetTexImage().
  * All error checking will have been done before this routine is called.
@@ -429,7 +418,7 @@ getteximage_error_check(GLcontext *ctx, GLenum target, GLint level,
       return GL_TRUE;
    }
 
-   texUnit = get_current_tex_unit(ctx);
+   texUnit = _mesa_get_current_tex_unit(ctx);
    texObj = _mesa_select_tex_object(ctx, texUnit, target);
 
    if (!texObj || _mesa_is_proxy_texture(target)) {
@@ -519,7 +508,7 @@ _mesa_GetTexImage( GLenum target, GLint level, GLenum format,
       return;
    }
 
-   texUnit = get_current_tex_unit(ctx);
+   texUnit = _mesa_get_current_tex_unit(ctx);
    texObj = _mesa_select_tex_object(ctx, texUnit, target);
 
    _mesa_lock_texture(ctx, texObj);
@@ -545,7 +534,7 @@ _mesa_GetCompressedTexImageARB(GLenum target, GLint level, GLvoid *img)
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
-   texUnit = get_current_tex_unit(ctx);
+   texUnit = _mesa_get_current_tex_unit(ctx);
    texObj = _mesa_select_tex_object(ctx, texUnit, target);
    if (!texObj) {
       _mesa_error(ctx, GL_INVALID_ENUM, "glGetCompressedTexImageARB");
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 56d3790408..19e47b460f 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -575,18 +575,6 @@ _mesa_is_proxy_texture(GLenum target)
 }
 
 
-/**
- * Return pointer to current texture unit.
- * This the texture unit set by glActiveTexture(), not glClientActiveTexture().
- */
-static INLINE struct gl_texture_unit *
-get_current_tex_unit(GLcontext *ctx)
-{
-   ASSERT(ctx->Texture.CurrentUnit < Elements(ctx->Texture.Unit));
-   return &(ctx->Texture.Unit[ctx->Texture.CurrentUnit]);
-}
-
-
 /**
  * Get the texture object that corresponds to the target of the given texture unit.
  *
@@ -2163,7 +2151,7 @@ _mesa_TexImage1D( GLenum target, GLint level, GLint internalFormat,
       if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)
 	 _mesa_update_state(ctx);
 
-      texUnit = get_current_tex_unit(ctx);
+      texUnit = _mesa_get_current_tex_unit(ctx);
       texObj = _mesa_select_tex_object(ctx, texUnit, target);
       _mesa_lock_texture(ctx, texObj);
       {
@@ -2271,7 +2259,7 @@ _mesa_TexImage2D( GLenum target, GLint level, GLint internalFormat,
       if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)
 	 _mesa_update_state(ctx);
 
-      texUnit = get_current_tex_unit(ctx);
+      texUnit = _mesa_get_current_tex_unit(ctx);
       texObj = _mesa_select_tex_object(ctx, texUnit, target);
       _mesa_lock_texture(ctx, texObj);
       {
@@ -2374,7 +2362,7 @@ _mesa_TexImage3D( GLenum target, GLint level, GLint internalFormat,
       if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)
 	 _mesa_update_state(ctx);
 
-      texUnit = get_current_tex_unit(ctx);
+      texUnit = _mesa_get_current_tex_unit(ctx);
       texObj = _mesa_select_tex_object(ctx, texUnit, target);
       _mesa_lock_texture(ctx, texObj);
       {
@@ -2480,7 +2468,7 @@ _mesa_TexSubImage1D( GLenum target, GLint level,
    }
 
 
-   texUnit = get_current_tex_unit(ctx);
+   texUnit = _mesa_get_current_tex_unit(ctx);
    texObj = _mesa_select_tex_object(ctx, texUnit, target);
    assert(texObj);
 
@@ -2540,7 +2528,7 @@ _mesa_TexSubImage2D( GLenum target, GLint level,
       return;   /* error was detected */
    }
 
-   texUnit = get_current_tex_unit(ctx);
+   texUnit = _mesa_get_current_tex_unit(ctx);
    texObj = _mesa_select_tex_object(ctx, texUnit, target);
    _mesa_lock_texture(ctx, texObj);
    {
@@ -2592,7 +2580,7 @@ _mesa_TexSubImage3D( GLenum target, GLint level,
       return;   /* error was detected */
    }
 
-   texUnit = get_current_tex_unit(ctx);
+   texUnit = _mesa_get_current_tex_unit(ctx);
    texObj = _mesa_select_tex_object(ctx, texUnit, target);
 
    _mesa_lock_texture(ctx, texObj);
@@ -2653,7 +2641,7 @@ _mesa_CopyTexImage1D( GLenum target, GLint level,
                                postConvWidth, 1, border))
       return;
 
-   texUnit = get_current_tex_unit(ctx);
+   texUnit = _mesa_get_current_tex_unit(ctx);
    texObj = _mesa_select_tex_object(ctx, texUnit, target);
    _mesa_lock_texture(ctx, texObj);
    {
@@ -2719,7 +2707,7 @@ _mesa_CopyTexImage2D( GLenum target, GLint level, GLenum internalFormat,
                                postConvWidth, postConvHeight, border))
       return;
 
-   texUnit = get_current_tex_unit(ctx);
+   texUnit = _mesa_get_current_tex_unit(ctx);
    texObj = _mesa_select_tex_object(ctx, texUnit, target);
 
    _mesa_lock_texture(ctx, texObj);
@@ -2779,7 +2767,7 @@ _mesa_CopyTexSubImage1D( GLenum target, GLint level,
    if (copytexsubimage_error_check1(ctx, 1, target, level))
       return;
 
-   texUnit = get_current_tex_unit(ctx);
+   texUnit = _mesa_get_current_tex_unit(ctx);
    texObj = _mesa_select_tex_object(ctx, texUnit, target);
 
    _mesa_lock_texture(ctx, texObj);
@@ -2834,7 +2822,7 @@ _mesa_CopyTexSubImage2D( GLenum target, GLint level,
    if (copytexsubimage_error_check1(ctx, 2, target, level))
       return;
 
-   texUnit = get_current_tex_unit(ctx);
+   texUnit = _mesa_get_current_tex_unit(ctx);
    texObj = _mesa_select_tex_object(ctx, texUnit, target);
 
    _mesa_lock_texture(ctx, texObj);
@@ -2889,7 +2877,7 @@ _mesa_CopyTexSubImage3D( GLenum target, GLint level,
    if (copytexsubimage_error_check1(ctx, 3, target, level))
       return;
 
-   texUnit = get_current_tex_unit(ctx);
+   texUnit = _mesa_get_current_tex_unit(ctx);
    texObj = _mesa_select_tex_object(ctx, texUnit, target);
 
    _mesa_lock_texture(ctx, texObj);
@@ -3143,7 +3131,7 @@ _mesa_CompressedTexImage1DARB(GLenum target, GLint level,
          return;
       }
 
-      texUnit = get_current_tex_unit(ctx);
+      texUnit = _mesa_get_current_tex_unit(ctx);
       texObj = _mesa_select_tex_object(ctx, texUnit, target);
 
       _mesa_lock_texture(ctx, texObj);
@@ -3197,7 +3185,7 @@ _mesa_CompressedTexImage1DARB(GLenum target, GLint level,
          struct gl_texture_unit *texUnit;
          struct gl_texture_object *texObj;
          struct gl_texture_image *texImage;
-         texUnit = get_current_tex_unit(ctx);
+         texUnit = _mesa_get_current_tex_unit(ctx);
 	 texObj = _mesa_select_tex_object(ctx, texUnit, target);
 
 	 _mesa_lock_texture(ctx, texObj);
@@ -3240,7 +3228,7 @@ _mesa_CompressedTexImage2DARB(GLenum target, GLint level,
          return;
       }
 
-      texUnit = get_current_tex_unit(ctx);
+      texUnit = _mesa_get_current_tex_unit(ctx);
       texObj = _mesa_select_tex_object(ctx, texUnit, target);
 
       _mesa_lock_texture(ctx, texObj);
@@ -3296,7 +3284,7 @@ _mesa_CompressedTexImage2DARB(GLenum target, GLint level,
          struct gl_texture_unit *texUnit;
          struct gl_texture_object *texObj;
          struct gl_texture_image *texImage;
-         texUnit = get_current_tex_unit(ctx);
+         texUnit = _mesa_get_current_tex_unit(ctx);
 	 texObj = _mesa_select_tex_object(ctx, texUnit, target);
 
 	 _mesa_lock_texture(ctx, texObj);
@@ -3336,7 +3324,7 @@ _mesa_CompressedTexImage3DARB(GLenum target, GLint level,
          return;
       }
 
-      texUnit = get_current_tex_unit(ctx);
+      texUnit = _mesa_get_current_tex_unit(ctx);
       texObj = _mesa_select_tex_object(ctx, texUnit, target);
       _mesa_lock_texture(ctx, texObj);
       {
@@ -3390,7 +3378,7 @@ _mesa_CompressedTexImage3DARB(GLenum target, GLint level,
          struct gl_texture_unit *texUnit;
          struct gl_texture_object *texObj;
          struct gl_texture_image *texImage;
-         texUnit = get_current_tex_unit(ctx);
+         texUnit = _mesa_get_current_tex_unit(ctx);
 	 texObj = _mesa_select_tex_object(ctx, texUnit, target);
 	 _mesa_lock_texture(ctx, texObj);
 	 {
@@ -3429,7 +3417,7 @@ _mesa_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset,
       return;
    }
 
-   texUnit = get_current_tex_unit(ctx);
+   texUnit = _mesa_get_current_tex_unit(ctx);
    texObj = _mesa_select_tex_object(ctx, texUnit, target);
    _mesa_lock_texture(ctx, texObj);
    {
@@ -3486,7 +3474,7 @@ _mesa_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset,
       return;
    }
 
-   texUnit = get_current_tex_unit(ctx);
+   texUnit = _mesa_get_current_tex_unit(ctx);
    texObj = _mesa_select_tex_object(ctx, texUnit, target);
    _mesa_lock_texture(ctx, texObj);
    {
@@ -3543,7 +3531,7 @@ _mesa_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset,
       return;
    }
 
-   texUnit = get_current_tex_unit(ctx);
+   texUnit = _mesa_get_current_tex_unit(ctx);
    texObj = _mesa_select_tex_object(ctx, texUnit, target);
    _mesa_lock_texture(ctx, texObj);
    {
diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index d27c59381c..d9ba6007a0 100644
--- a/src/mesa/main/texparam.c
+++ b/src/mesa/main/texparam.c
@@ -38,6 +38,7 @@
 #include "main/texcompress.h"
 #include "main/texparam.h"
 #include "main/teximage.h"
+#include "main/texstate.h"
 #include "shader/prog_instruction.h"
 
 
@@ -88,7 +89,7 @@ get_texobj(GLcontext *ctx, GLenum target)
       return NULL;
    }
 
-   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   texUnit = _mesa_get_current_tex_unit(ctx);
 
    switch (target) {
    case GL_TEXTURE_1D:
@@ -773,7 +774,7 @@ _mesa_GetTexLevelParameteriv( GLenum target, GLint level,
       return;
    }
 
-   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   texUnit = _mesa_get_current_tex_unit(ctx);
 
    /* this will catch bad target values */
    dimensions = tex_image_dimensions(ctx, target);  /* 1, 2 or 3 */
@@ -1002,7 +1003,7 @@ _mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params )
       return;
    }
 
-   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   texUnit = _mesa_get_current_tex_unit(ctx);
 
    obj = _mesa_select_tex_object(ctx, texUnit, target);
    if (!obj) {
@@ -1169,7 +1170,7 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
       return;
    }
 
-   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   texUnit = _mesa_get_current_tex_unit(ctx);
 
    obj = _mesa_select_tex_object(ctx, texUnit, target);
    if (!obj) {
diff --git a/src/mesa/main/texstate.h b/src/mesa/main/texstate.h
index a7d7088c62..17ac68000c 100644
--- a/src/mesa/main/texstate.h
+++ b/src/mesa/main/texstate.h
@@ -35,6 +35,18 @@
 #include "mtypes.h"
 
 
+/**
+ * Return pointer to current texture unit.
+ * This the texture unit set by glActiveTexture(), not glClientActiveTexture().
+ */
+static INLINE struct gl_texture_unit *
+_mesa_get_current_tex_unit(GLcontext *ctx)
+{
+   ASSERT(ctx->Texture.CurrentUnit < Elements(ctx->Texture.Unit));
+   return &(ctx->Texture.Unit[ctx->Texture.CurrentUnit]);
+}
+
+
 extern void
 _mesa_copy_texture_state( const GLcontext *src, GLcontext *dst );
 
@@ -48,16 +60,14 @@ _mesa_print_texunit_state( GLcontext *ctx, GLuint unit );
  */
 /*@{*/
 
-
-/*
- * GL_ARB_multitexture
- */
 extern void GLAPIENTRY
 _mesa_ActiveTextureARB( GLenum target );
 
 extern void GLAPIENTRY
 _mesa_ClientActiveTextureARB( GLenum target );
 
+/*@}*/
+
 
 /**
  * \name Initialization, state maintenance
-- 
cgit v1.2.3


From 47a385b43be9cf2ef0d0b24b1d588dc26940dfe6 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 13 Aug 2009 10:01:38 -0600
Subject: mesa: minor clean-ups in bumpmap functions

---
 src/mesa/main/texenv.c | 53 +++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 39 insertions(+), 14 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenv.c b/src/mesa/main/texenv.c
index 1eab78c74c..6d86a4275c 100644
--- a/src/mesa/main/texenv.c
+++ b/src/mesa/main/texenv.c
@@ -909,12 +909,26 @@ _mesa_GetTexEnviv( GLenum target, GLenum pname, GLint *params )
    }
 }
 
-/* why does ATI_envmap_bumpmap require new entrypoints? Should just
-   reuse TexEnv ones... */
+
+/**
+ * Why does ATI_envmap_bumpmap require new entrypoints? Should just
+ * reuse TexEnv ones...
+ */
 void GLAPIENTRY
 _mesa_TexBumpParameterivATI( GLenum pname, const GLint *param )
 {
    GLfloat p[4];
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (!ctx->Extensions.ATI_envmap_bumpmap) {
+      /* This isn't an "official" error case, but let's tell the user
+       * that something's wrong.
+       */
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glTexBumpParameterivATI");
+      return;
+   }
+
    if (pname == GL_BUMP_ROT_MATRIX_ATI) {
       /* hope that conversion is correct here */
       p[0] = INT_TO_FLOAT( param[0] );
@@ -924,11 +938,12 @@ _mesa_TexBumpParameterivATI( GLenum pname, const GLint *param )
    }
    else {
       p[0] = (GLfloat) param[0];
-      p[1] = p[2] = p[3] = 0;  /* init to zero, just to be safe */
+      p[1] = p[2] = p[3] = 0.0F;  /* init to zero, just to be safe */
    }
    _mesa_TexBumpParameterfvATI( pname, p );
 }
 
+
 void GLAPIENTRY
 _mesa_TexBumpParameterfvATI( GLenum pname, const GLfloat *param )
 {
@@ -936,7 +951,10 @@ _mesa_TexBumpParameterfvATI( GLenum pname, const GLfloat *param )
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-   /* should return error if extension not supported? */
+   if (!ctx->Extensions.ATI_envmap_bumpmap) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glTexBumpParameterfvATI");
+      return;
+   }
 
    texUnit = _mesa_get_current_tex_unit(ctx);
 
@@ -957,16 +975,19 @@ _mesa_TexBumpParameterfvATI( GLenum pname, const GLfloat *param )
    }
 }
 
+
 void GLAPIENTRY
 _mesa_GetTexBumpParameterivATI( GLenum pname, GLint *param )
 {
    const struct gl_texture_unit *texUnit;
    GLuint i;
-   GLint temp = 0;
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-   /* should return error if extension not supported? */
+   if (!ctx->Extensions.ATI_envmap_bumpmap) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexBumpParameterivATI");
+      return;
+   }
 
    texUnit = _mesa_get_current_tex_unit(ctx);
 
@@ -985,12 +1006,13 @@ _mesa_GetTexBumpParameterivATI( GLenum pname, GLint *param )
       param[3] = FLOAT_TO_INT(texUnit->RotMatrix[3]);
    }
    else if (pname == GL_BUMP_NUM_TEX_UNITS_ATI) {
+      GLint count = 0;
       for (i = 0; i < ctx->Const.MaxTextureImageUnits; i++) {
          if (ctx->Const.SupportedBumpUnits & (1 << i)) {
-            temp++;
+            count++;
          }
       }
-      *param = temp;
+      *param = count;
    }
    else if (pname == GL_BUMP_TEX_UNITS_ATI) {
       for (i = 0; i < ctx->Const.MaxTextureImageUnits; i++) {
@@ -1005,16 +1027,19 @@ _mesa_GetTexBumpParameterivATI( GLenum pname, GLint *param )
    }
 }
 
+
 void GLAPIENTRY
 _mesa_GetTexBumpParameterfvATI( GLenum pname, GLfloat *param )
 {
    const struct gl_texture_unit *texUnit;
    GLuint i;
-   GLint temp = 0;
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-   /* should return error if extension not supported? */
+   if (!ctx->Extensions.ATI_envmap_bumpmap) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexBumpParameterfvATI");
+      return;
+   }
 
    texUnit = _mesa_get_current_tex_unit(ctx);
 
@@ -1022,7 +1047,7 @@ _mesa_GetTexBumpParameterfvATI( GLenum pname, GLfloat *param )
       /* spec leaves open to support larger matrices.
          Don't think anyone would ever want to use it
          (and apps might not understand it) so hardcode this. */
-      *param = (GLfloat) 4;
+      *param = 4.0F;
    }
    else if (pname == GL_BUMP_ROT_MATRIX_ATI) {
       param[0] = texUnit->RotMatrix[0];
@@ -1031,12 +1056,13 @@ _mesa_GetTexBumpParameterfvATI( GLenum pname, GLfloat *param )
       param[3] = texUnit->RotMatrix[3];
    }
    else if (pname == GL_BUMP_NUM_TEX_UNITS_ATI) {
+      GLint count = 0;
       for (i = 0; i < ctx->Const.MaxTextureImageUnits; i++) {
          if (ctx->Const.SupportedBumpUnits & (1 << i)) {
-            temp++;
+            count++;
          }
       }
-      *param = (GLfloat) temp;
+      *param = (GLfloat) count;
    }
    else if (pname == GL_BUMP_TEX_UNITS_ATI) {
       for (i = 0; i < ctx->Const.MaxTextureImageUnits; i++) {
@@ -1050,4 +1076,3 @@ _mesa_GetTexBumpParameterfvATI( GLenum pname, GLfloat *param )
       return;
    }
 }
-
-- 
cgit v1.2.3


From fe988d786c4076bfbf410b84085d8c1115baa489 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 13 Aug 2009 10:14:13 -0600
Subject: mesa: add extension checks in _mesa_max_texture_levels()

---
 src/mesa/main/teximage.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 19e47b460f..8228303040 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -784,10 +784,6 @@ _mesa_max_texture_levels(GLcontext *ctx, GLenum target)
    case GL_PROXY_TEXTURE_1D:
    case GL_TEXTURE_2D:
    case GL_PROXY_TEXTURE_2D:
-   case GL_TEXTURE_1D_ARRAY_EXT:
-   case GL_PROXY_TEXTURE_1D_ARRAY_EXT:
-   case GL_TEXTURE_2D_ARRAY_EXT:
-   case GL_PROXY_TEXTURE_2D_ARRAY_EXT:
       return ctx->Const.MaxTextureLevels;
    case GL_TEXTURE_3D:
    case GL_PROXY_TEXTURE_3D:
@@ -800,10 +796,17 @@ _mesa_max_texture_levels(GLcontext *ctx, GLenum target)
    case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB:
    case GL_TEXTURE_CUBE_MAP_ARB:
    case GL_PROXY_TEXTURE_CUBE_MAP_ARB:
-      return ctx->Const.MaxCubeTextureLevels;
+      return ctx->Extensions.ARB_texture_cube_map
+         ? ctx->Const.MaxCubeTextureLevels : 0;
    case GL_TEXTURE_RECTANGLE_NV:
    case GL_PROXY_TEXTURE_RECTANGLE_NV:
-      return 1;
+      return ctx->Extensions.NV_texture_rectangle ? 1 : 0;
+   case GL_TEXTURE_1D_ARRAY_EXT:
+   case GL_PROXY_TEXTURE_1D_ARRAY_EXT:
+   case GL_TEXTURE_2D_ARRAY_EXT:
+   case GL_PROXY_TEXTURE_2D_ARRAY_EXT:
+      return ctx->Extensions.MESA_texture_array
+         ? ctx->Const.MaxTextureLevels : 0;
    default:
       return 0; /* bad target */
    }
-- 
cgit v1.2.3


From 423a53f635f82233e9a570bfc132edc51f7548bb Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 13 Aug 2009 10:16:59 -0600
Subject: mesa: if maxLevels==0, target is invalid

---
 src/mesa/main/texgetimage.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c
index 2d3b82dd38..14d6fc7659 100644
--- a/src/mesa/main/texgetimage.c
+++ b/src/mesa/main/texgetimage.c
@@ -373,7 +373,10 @@ getteximage_error_check(GLcontext *ctx, GLenum target, GLint level,
    struct gl_texture_image *texImage;
    const GLuint maxLevels = _mesa_max_texture_levels(ctx, target);
 
-   ASSERT(maxLevels > 0);  /* 0 indicates bad target, caught above */
+   if (maxLevels == 0) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(target=0x%x)", target);
+      return GL_TRUE;
+   }
 
    if (level < 0 || level >= maxLevels) {
       _mesa_error( ctx, GL_INVALID_VALUE, "glGetTexImage(level)" );
-- 
cgit v1.2.3


From 8a9795e5c6ca353aa831148cd1c262fe1013af48 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 13 Aug 2009 10:18:50 -0600
Subject: mesa: rework error check in glGetTexLevelParameter(), remove
 tex_image_dimensions()

---
 src/mesa/main/texparam.c | 49 ++----------------------------------------------
 1 file changed, 2 insertions(+), 47 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index d9ba6007a0..05d144270e 100644
--- a/src/mesa/main/texparam.c
+++ b/src/mesa/main/texparam.c
@@ -717,44 +717,6 @@ _mesa_GetTexLevelParameterfv( GLenum target, GLint level,
 }
 
 
-static GLuint
-tex_image_dimensions(GLcontext *ctx, GLenum target)
-{
-   switch (target) {
-      case GL_TEXTURE_1D:
-      case GL_PROXY_TEXTURE_1D:
-         return 1;
-      case GL_TEXTURE_2D:
-      case GL_PROXY_TEXTURE_2D:
-         return 2;
-      case GL_TEXTURE_3D:
-      case GL_PROXY_TEXTURE_3D:
-         return 3;
-      case GL_TEXTURE_CUBE_MAP:
-      case GL_PROXY_TEXTURE_CUBE_MAP:
-      case GL_TEXTURE_CUBE_MAP_POSITIVE_X:
-      case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:
-      case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:
-      case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:
-      case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:
-      case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
-         return ctx->Extensions.ARB_texture_cube_map ? 2 : 0;
-      case GL_TEXTURE_RECTANGLE_NV:
-      case GL_PROXY_TEXTURE_RECTANGLE_NV:
-         return ctx->Extensions.NV_texture_rectangle ? 2 : 0;
-      case GL_TEXTURE_1D_ARRAY_EXT:
-      case GL_PROXY_TEXTURE_1D_ARRAY_EXT:
-         return ctx->Extensions.MESA_texture_array ? 2 : 0;
-      case GL_TEXTURE_2D_ARRAY_EXT:
-      case GL_PROXY_TEXTURE_2D_ARRAY_EXT:
-         return ctx->Extensions.MESA_texture_array ? 3 : 0;
-      default:
-         _mesa_problem(ctx, "bad target in _mesa_tex_target_dimensions()");
-         return 0;
-   }
-}
-
-
 void GLAPIENTRY
 _mesa_GetTexLevelParameteriv( GLenum target, GLint level,
                               GLenum pname, GLint *params )
@@ -762,7 +724,6 @@ _mesa_GetTexLevelParameteriv( GLenum target, GLint level,
    const struct gl_texture_unit *texUnit;
    struct gl_texture_object *texObj;
    const struct gl_texture_image *img = NULL;
-   GLuint dimensions;
    GLboolean isProxy;
    GLint maxLevels;
    GET_CURRENT_CONTEXT(ctx);
@@ -777,16 +738,10 @@ _mesa_GetTexLevelParameteriv( GLenum target, GLint level,
    texUnit = _mesa_get_current_tex_unit(ctx);
 
    /* this will catch bad target values */
-   dimensions = tex_image_dimensions(ctx, target);  /* 1, 2 or 3 */
-   if (dimensions == 0) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexLevelParameter[if]v(target)");
-      return;
-   }
-
    maxLevels = _mesa_max_texture_levels(ctx, target);
    if (maxLevels == 0) {
-      /* should not happen since <target> was just checked above */
-      _mesa_problem(ctx, "maxLevels=0 in _mesa_GetTexLevelParameter");
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "glGetTexLevelParameter[if]v(target=0x%x)", target);
       return;
    }
 
-- 
cgit v1.2.3


From c10002361c3bc175ec12d667e762e51a2cc79b47 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 13 Aug 2009 10:29:15 -0600
Subject: mesa: s/assert/ASSERT/ in _mesa_reference_texobj()

We want the no-op ASSERT for non-debug builds.
---
 src/mesa/main/texobj.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index 22657ed81b..d09c439250 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -334,7 +334,7 @@ _mesa_reference_texobj(struct gl_texture_object **ptr,
       GLboolean deleteFlag = GL_FALSE;
       struct gl_texture_object *oldTex = *ptr;
 
-      assert(valid_texture_object(oldTex));
+      ASSERT(valid_texture_object(oldTex));
 
       _glthread_LOCK_MUTEX(oldTex->Mutex);
       ASSERT(oldTex->RefCount > 0);
@@ -357,7 +357,7 @@ _mesa_reference_texobj(struct gl_texture_object **ptr,
 
    if (tex) {
       /* reference new texture */
-      assert(valid_texture_object(tex));
+      ASSERT(valid_texture_object(tex));
       _glthread_LOCK_MUTEX(tex->Mutex);
       if (tex->RefCount == 0) {
          /* this texture's being deleted (look just above) */
-- 
cgit v1.2.3


From f418d18ea6059c761f45f055c05fbd0bb50f7a80 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 13 Aug 2009 13:44:31 -0600
Subject: mesa: fix some potential uninitialized memory references

---
 src/mesa/main/fog.c   | 2 +-
 src/mesa/main/light.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/fog.c b/src/mesa/main/fog.c
index 50a61bd84b..4323d3db82 100644
--- a/src/mesa/main/fog.c
+++ b/src/mesa/main/fog.c
@@ -67,7 +67,7 @@ _mesa_Fogiv(GLenum pname, const GLint *params )
 	 break;
       default:
          /* Error will be caught later in _mesa_Fogfv */
-         ;
+         ASSIGN_4V(p, 0.0F, 0.0F, 0.0F, 0.0F);
    }
    _mesa_Fogfv(pname, p);
 }
diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c
index ac604fd12c..17034680ad 100644
--- a/src/mesa/main/light.c
+++ b/src/mesa/main/light.c
@@ -496,7 +496,7 @@ _mesa_LightModeliv( GLenum pname, const GLint *params )
          break;
       default:
          /* Error will be caught later in gl_LightModelfv */
-         ;
+         ASSIGN_4V(fparam, 0.0F, 0.0F, 0.0F, 0.0F);
    }
    _mesa_LightModelfv( pname, fparam );
 }
-- 
cgit v1.2.3


From ad8a6937ae9933ab92f2b775410c27ec7a9afe42 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 13 Aug 2009 13:48:36 -0600
Subject: main: fix some potential memory leaks

Allocate dlist images after error checking.
Record GL_OUT_OF_MEMORY when we can't make a copy of an image.
---
 src/mesa/main/dlist.c | 197 ++++++++++++++++++++++----------------------------
 1 file changed, 85 insertions(+), 112 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index c5a1c1f38f..9d0a2dca0d 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -680,24 +680,34 @@ translate_id(GLsizei n, GLenum type, const GLvoid * list)
 
 /**
  * Wrapper for _mesa_unpack_image() that handles pixel buffer objects.
+ * If we run out of memory, GL_OUT_OF_MEMORY will be recorded.
  * \todo This won't suffice when the PBO is really in VRAM/GPU memory.
  */
 static GLvoid *
-unpack_image(GLuint dimensions, GLsizei width, GLsizei height, GLsizei depth,
+unpack_image(GLcontext *ctx, GLuint dimensions,
+             GLsizei width, GLsizei height, GLsizei depth,
              GLenum format, GLenum type, const GLvoid * pixels,
              const struct gl_pixelstore_attrib *unpack)
 {
    if (unpack->BufferObj->Name == 0) {
       /* no PBO */
-      return _mesa_unpack_image(dimensions, width, height, depth, format,
-                                type, pixels, unpack);
+      GLvoid *image = _mesa_unpack_image(dimensions, width, height, depth,
+                                         format, type, pixels, unpack);
+      if (pixels && !image) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "display list construction");
+      }
+      return image;
    }
    else
       if (_mesa_validate_pbo_access
           (dimensions, unpack, width, height, depth, format, type, pixels)) {
       const GLubyte *src = ADD_POINTERS(unpack->BufferObj->Data, pixels);
-      return _mesa_unpack_image(dimensions, width, height, depth, format,
-                                type, src, unpack);
+      GLvoid *image = _mesa_unpack_image(dimensions, width, height, depth,
+                                         format, type, src, unpack);
+      if (!image) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "display list construction");
+      }
+      return image;
    }
    /* bad access! */
    return NULL;
@@ -855,7 +865,6 @@ save_Bitmap(GLsizei width, GLsizei height,
             GLfloat xmove, GLfloat ymove, const GLubyte * pixels)
 {
    GET_CURRENT_CONTEXT(ctx);
-   GLvoid *image = _mesa_unpack_bitmap(width, height, pixels, &ctx->Unpack);
    Node *n;
    ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
    n = ALLOC_INSTRUCTION(ctx, OPCODE_BITMAP, 7);
@@ -866,10 +875,7 @@ save_Bitmap(GLsizei width, GLsizei height,
       n[4].f = yorig;
       n[5].f = xmove;
       n[6].f = ymove;
-      n[7].data = image;
-   }
-   else if (image) {
-      _mesa_free(image);
+      n[7].data = _mesa_unpack_bitmap(width, height, pixels, &ctx->Unpack);
    }
    if (ctx->ExecuteFlag) {
       CALL_Bitmap(ctx->Exec, (width, height,
@@ -1214,8 +1220,6 @@ save_ColorTable(GLenum target, GLenum internalFormat,
                                   format, type, table));
    }
    else {
-      GLvoid *image = unpack_image(1, width, 1, 1, format, type, table,
-                                   &ctx->Unpack);
       Node *n;
       ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
       n = ALLOC_INSTRUCTION(ctx, OPCODE_COLOR_TABLE, 6);
@@ -1225,10 +1229,8 @@ save_ColorTable(GLenum target, GLenum internalFormat,
          n[3].i = width;
          n[4].e = format;
          n[5].e = type;
-         n[6].data = image;
-      }
-      else if (image) {
-         _mesa_free(image);
+         n[6].data = unpack_image(ctx, 1, width, 1, 1, format, type, table,
+                                  &ctx->Unpack);
       }
       if (ctx->ExecuteFlag) {
          CALL_ColorTable(ctx->Exec, (target, internalFormat, width,
@@ -1304,8 +1306,6 @@ save_ColorSubTable(GLenum target, GLsizei start, GLsizei count,
                    GLenum format, GLenum type, const GLvoid * table)
 {
    GET_CURRENT_CONTEXT(ctx);
-   GLvoid *image = unpack_image(1, count, 1, 1, format, type, table,
-                                &ctx->Unpack);
    Node *n;
    ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
    n = ALLOC_INSTRUCTION(ctx, OPCODE_COLOR_SUB_TABLE, 6);
@@ -1315,10 +1315,8 @@ save_ColorSubTable(GLenum target, GLsizei start, GLsizei count,
       n[3].i = count;
       n[4].e = format;
       n[5].e = type;
-      n[6].data = image;
-   }
-   else if (image) {
-      _mesa_free(image);
+      n[6].data = unpack_image(ctx, 1, count, 1, 1, format, type, table,
+                               &ctx->Unpack);
    }
    if (ctx->ExecuteFlag) {
       CALL_ColorSubTable(ctx->Exec,
@@ -1376,10 +1374,10 @@ save_ConvolutionFilter1D(GLenum target, GLenum internalFormat, GLsizei width,
                          GLenum format, GLenum type, const GLvoid * filter)
 {
    GET_CURRENT_CONTEXT(ctx);
-   GLvoid *image = unpack_image(1, width, 1, 1, format, type, filter,
-                                &ctx->Unpack);
    Node *n;
+
    ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+
    n = ALLOC_INSTRUCTION(ctx, OPCODE_CONVOLUTION_FILTER_1D, 6);
    if (n) {
       n[1].e = target;
@@ -1387,10 +1385,8 @@ save_ConvolutionFilter1D(GLenum target, GLenum internalFormat, GLsizei width,
       n[3].i = width;
       n[4].e = format;
       n[5].e = type;
-      n[6].data = image;
-   }
-   else if (image) {
-      _mesa_free(image);
+      n[6].data = unpack_image(ctx, 1, width, 1, 1, format, type, filter,
+                               &ctx->Unpack);
    }
    if (ctx->ExecuteFlag) {
       CALL_ConvolutionFilter1D(ctx->Exec, (target, internalFormat, width,
@@ -1405,10 +1401,10 @@ save_ConvolutionFilter2D(GLenum target, GLenum internalFormat,
                          GLenum type, const GLvoid * filter)
 {
    GET_CURRENT_CONTEXT(ctx);
-   GLvoid *image = unpack_image(2, width, height, 1, format, type, filter,
-                                &ctx->Unpack);
    Node *n;
+
    ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+
    n = ALLOC_INSTRUCTION(ctx, OPCODE_CONVOLUTION_FILTER_2D, 7);
    if (n) {
       n[1].e = target;
@@ -1417,10 +1413,8 @@ save_ConvolutionFilter2D(GLenum target, GLenum internalFormat,
       n[4].i = height;
       n[5].e = format;
       n[6].e = type;
-      n[7].data = image;
-   }
-   else if (image) {
-      _mesa_free(image);
+      n[7].data = unpack_image(ctx, 2, width, height, 1, format, type, filter,
+                               &ctx->Unpack);
    }
    if (ctx->ExecuteFlag) {
       CALL_ConvolutionFilter2D(ctx->Exec,
@@ -1775,20 +1769,18 @@ save_DrawPixels(GLsizei width, GLsizei height,
                 GLenum format, GLenum type, const GLvoid * pixels)
 {
    GET_CURRENT_CONTEXT(ctx);
-   GLvoid *image = unpack_image(2, width, height, 1, format, type,
-                                pixels, &ctx->Unpack);
    Node *n;
+
    ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+
    n = ALLOC_INSTRUCTION(ctx, OPCODE_DRAW_PIXELS, 5);
    if (n) {
       n[1].i = width;
       n[2].i = height;
       n[3].e = format;
       n[4].e = type;
-      n[5].data = image;
-   }
-   else if (image) {
-      _mesa_free(image);
+      n[5].data = unpack_image(ctx, 2, width, height, 1, format, type,
+                               pixels, &ctx->Unpack);
    }
    if (ctx->ExecuteFlag) {
       CALL_DrawPixels(ctx->Exec, (width, height, format, type, pixels));
@@ -1901,7 +1893,7 @@ save_Fogiv(GLenum pname, const GLint *params)
       break;
    default:
       /* Error will be caught later in gl_Fogfv */
-      ;
+      ASSIGN_4V(p, 0.0F, 0.0F, 0.0F, 0.0F);
    }
    save_Fogfv(pname, p);
 }
@@ -2171,7 +2163,7 @@ save_LightModeliv(GLenum pname, const GLint *params)
       break;
    default:
       /* Error will be caught later in gl_LightModelfv */
-      ;
+      ASSIGN_4V(fparam, 0.0F, 0.0F, 0.0F, 0.0F);
    }
    save_LightModelfv(pname, fparam);
 }
@@ -2750,16 +2742,14 @@ static void GLAPIENTRY
 save_PolygonStipple(const GLubyte * pattern)
 {
    GET_CURRENT_CONTEXT(ctx);
-   GLvoid *image = unpack_image(2, 32, 32, 1, GL_COLOR_INDEX, GL_BITMAP,
-                                pattern, &ctx->Unpack);
    Node *n;
+
    ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+
    n = ALLOC_INSTRUCTION(ctx, OPCODE_POLYGON_STIPPLE, 1);
    if (n) {
-      n[1].data = image; 
-   }
-   else if (image) {
-      _mesa_free(image);
+      n[1].data = unpack_image(ctx, 2, 32, 32, 1, GL_COLOR_INDEX, GL_BITMAP,
+                               pattern, &ctx->Unpack);
    }
    if (ctx->ExecuteFlag) {
       CALL_PolygonStipple(ctx->Exec, ((GLubyte *) pattern));
@@ -3543,8 +3533,6 @@ save_TexImage1D(GLenum target,
                                   border, format, type, pixels));
    }
    else {
-      GLvoid *image = unpack_image(1, width, 1, 1, format, type,
-                                   pixels, &ctx->Unpack);
       Node *n;
       ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
       n = ALLOC_INSTRUCTION(ctx, OPCODE_TEX_IMAGE1D, 8);
@@ -3556,10 +3544,8 @@ save_TexImage1D(GLenum target,
          n[5].i = border;
          n[6].e = format;
          n[7].e = type;
-         n[8].data = image;
-      }
-      else if (image) {
-         _mesa_free(image);
+         n[8].data = unpack_image(ctx, 1, width, 1, 1, format, type,
+                                  pixels, &ctx->Unpack);
       }
       if (ctx->ExecuteFlag) {
          CALL_TexImage1D(ctx->Exec, (target, level, components, width,
@@ -3582,8 +3568,6 @@ save_TexImage2D(GLenum target,
                                   height, border, format, type, pixels));
    }
    else {
-      GLvoid *image = unpack_image(2, width, height, 1, format, type,
-                                   pixels, &ctx->Unpack);
       Node *n;
       ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
       n = ALLOC_INSTRUCTION(ctx, OPCODE_TEX_IMAGE2D, 9);
@@ -3596,10 +3580,8 @@ save_TexImage2D(GLenum target,
          n[6].i = border;
          n[7].e = format;
          n[8].e = type;
-         n[9].data = image;
-      }
-      else if (image) {
-         _mesa_free(image);
+         n[9].data = unpack_image(ctx, 2, width, height, 1, format, type,
+                                  pixels, &ctx->Unpack);
       }
       if (ctx->ExecuteFlag) {
          CALL_TexImage2D(ctx->Exec, (target, level, components, width,
@@ -3625,8 +3607,6 @@ save_TexImage3D(GLenum target,
    }
    else {
       Node *n;
-      GLvoid *image = unpack_image(3, width, height, depth, format, type,
-                                   pixels, &ctx->Unpack);
       ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
       n = ALLOC_INSTRUCTION(ctx, OPCODE_TEX_IMAGE3D, 10);
       if (n) {
@@ -3639,10 +3619,8 @@ save_TexImage3D(GLenum target,
          n[7].i = border;
          n[8].e = format;
          n[9].e = type;
-         n[10].data = image;
-      }
-      else if (image) {
-         _mesa_free(image);
+         n[10].data = unpack_image(ctx, 3, width, height, depth, format, type,
+                                   pixels, &ctx->Unpack);
       }
       if (ctx->ExecuteFlag) {
          CALL_TexImage3D(ctx->Exec, (target, level, internalFormat, width,
@@ -3660,9 +3638,9 @@ save_TexSubImage1D(GLenum target, GLint level, GLint xoffset,
 {
    GET_CURRENT_CONTEXT(ctx);
    Node *n;
-   GLvoid *image = unpack_image(1, width, 1, 1, format, type,
-                                pixels, &ctx->Unpack);
+
    ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+
    n = ALLOC_INSTRUCTION(ctx, OPCODE_TEX_SUB_IMAGE1D, 7);
    if (n) {
       n[1].e = target;
@@ -3671,10 +3649,8 @@ save_TexSubImage1D(GLenum target, GLint level, GLint xoffset,
       n[4].i = (GLint) width;
       n[5].e = format;
       n[6].e = type;
-      n[7].data = image;
-   }
-   else if (image) {
-      _mesa_free(image);
+      n[7].data = unpack_image(ctx, 1, width, 1, 1, format, type,
+                               pixels, &ctx->Unpack);
    }
    if (ctx->ExecuteFlag) {
       CALL_TexSubImage1D(ctx->Exec, (target, level, xoffset, width,
@@ -3691,9 +3667,9 @@ save_TexSubImage2D(GLenum target, GLint level,
 {
    GET_CURRENT_CONTEXT(ctx);
    Node *n;
-   GLvoid *image = unpack_image(2, width, height, 1, format, type,
-                                pixels, &ctx->Unpack);
+
    ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+
    n = ALLOC_INSTRUCTION(ctx, OPCODE_TEX_SUB_IMAGE2D, 9);
    if (n) {
       n[1].e = target;
@@ -3704,10 +3680,8 @@ save_TexSubImage2D(GLenum target, GLint level,
       n[6].i = (GLint) height;
       n[7].e = format;
       n[8].e = type;
-      n[9].data = image;
-   }
-   else if (image) {
-      _mesa_free(image);
+      n[9].data = unpack_image(ctx, 2, width, height, 1, format, type,
+                               pixels, &ctx->Unpack);
    }
    if (ctx->ExecuteFlag) {
       CALL_TexSubImage2D(ctx->Exec, (target, level, xoffset, yoffset,
@@ -3724,9 +3698,9 @@ save_TexSubImage3D(GLenum target, GLint level,
 {
    GET_CURRENT_CONTEXT(ctx);
    Node *n;
-   GLvoid *image = unpack_image(3, width, height, depth, format, type,
-                                pixels, &ctx->Unpack);
+
    ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+
    n = ALLOC_INSTRUCTION(ctx, OPCODE_TEX_SUB_IMAGE3D, 11);
    if (n) {
       n[1].e = target;
@@ -3739,10 +3713,8 @@ save_TexSubImage3D(GLenum target, GLint level,
       n[8].i = (GLint) depth;
       n[9].e = format;
       n[10].e = type;
-      n[11].data = image;
-   }
-   else if (image) {
-      _mesa_free(image);
+      n[11].data = unpack_image(ctx, 3, width, height, depth, format, type,
+                                pixels, &ctx->Unpack);
    }
    if (ctx->ExecuteFlag) {
       CALL_TexSubImage3D(ctx->Exec, (target, level,
@@ -4455,18 +4427,17 @@ save_LoadProgramNV(GLenum target, GLuint id, GLsizei len,
 {
    GET_CURRENT_CONTEXT(ctx);
    Node *n;
-   GLubyte *programCopy;
-
-   programCopy = (GLubyte *) _mesa_malloc(len);
-   if (!programCopy) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glLoadProgramNV");
-      return;
-   }
-   _mesa_memcpy(programCopy, program, len);
 
    ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+
    n = ALLOC_INSTRUCTION(ctx, OPCODE_LOAD_PROGRAM_NV, 4);
    if (n) {
+      GLubyte *programCopy = (GLubyte *) _mesa_malloc(len);
+      if (!programCopy) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glLoadProgramNV");
+         return;
+      }
+      _mesa_memcpy(programCopy, program, len);
       n[1].e = target;
       n[2].ui = id;
       n[3].i = len;
@@ -4483,15 +4454,17 @@ save_RequestResidentProgramsNV(GLsizei num, const GLuint * ids)
 {
    GET_CURRENT_CONTEXT(ctx);
    Node *n;
-   GLuint *idCopy = (GLuint *) _mesa_malloc(num * sizeof(GLuint));
-   if (!idCopy) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glRequestResidentProgramsNV");
-      return;
-   }
-   _mesa_memcpy(idCopy, ids, num * sizeof(GLuint));
+
    ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+
    n = ALLOC_INSTRUCTION(ctx, OPCODE_TRACK_MATRIX_NV, 2);
    if (n) {
+      GLuint *idCopy = (GLuint *) _mesa_malloc(num * sizeof(GLuint));
+      if (!idCopy) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glRequestResidentProgramsNV");
+         return;
+      }
+      _mesa_memcpy(idCopy, ids, num * sizeof(GLuint));
       n[1].i = num;
       n[2].data = idCopy;
    }
@@ -4652,16 +4625,17 @@ save_ProgramNamedParameter4fNV(GLuint id, GLsizei len, const GLubyte * name,
 {
    GET_CURRENT_CONTEXT(ctx);
    Node *n;
-   GLubyte *nameCopy = (GLubyte *) _mesa_malloc(len);
-   if (!nameCopy) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glProgramNamedParameter4fNV");
-      return;
-   }
-   _mesa_memcpy(nameCopy, name, len);
 
    ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+
    n = ALLOC_INSTRUCTION(ctx, OPCODE_PROGRAM_NAMED_PARAMETER_NV, 6);
    if (n) {
+      GLubyte *nameCopy = (GLubyte *) _mesa_malloc(len);
+      if (!nameCopy) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glProgramNamedParameter4fNV");
+         return;
+      }
+      _mesa_memcpy(nameCopy, name, len);
       n[1].ui = id;
       n[2].i = len;
       n[3].data = nameCopy;
@@ -4750,18 +4724,17 @@ save_ProgramStringARB(GLenum target, GLenum format, GLsizei len,
 {
    GET_CURRENT_CONTEXT(ctx);
    Node *n;
-   GLubyte *programCopy;
-
-   programCopy = (GLubyte *) _mesa_malloc(len);
-   if (!programCopy) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glProgramStringARB");
-      return;
-   }
-   _mesa_memcpy(programCopy, string, len);
 
    ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+
    n = ALLOC_INSTRUCTION(ctx, OPCODE_PROGRAM_STRING_ARB, 4);
    if (n) {
+      GLubyte *programCopy = (GLubyte *) _mesa_malloc(len);
+      if (!programCopy) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glProgramStringARB");
+         return;
+      }
+      _mesa_memcpy(programCopy, string, len);
       n[1].e = target;
       n[2].e = format;
       n[3].i = len;
-- 
cgit v1.2.3


From 36df6a6e91988590900a879b88eac7c7acc0a86d Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 13 Aug 2009 14:00:21 -0600
Subject: mesa: add missing PBO mapping code in unpack_image()

---
 src/mesa/main/dlist.c | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 9d0a2dca0d..2e36eee3de 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -681,7 +681,6 @@ translate_id(GLsizei n, GLenum type, const GLvoid * list)
 /**
  * Wrapper for _mesa_unpack_image() that handles pixel buffer objects.
  * If we run out of memory, GL_OUT_OF_MEMORY will be recorded.
- * \todo This won't suffice when the PBO is really in VRAM/GPU memory.
  */
 static GLvoid *
 unpack_image(GLcontext *ctx, GLuint dimensions,
@@ -698,12 +697,27 @@ unpack_image(GLcontext *ctx, GLuint dimensions,
       }
       return image;
    }
-   else
-      if (_mesa_validate_pbo_access
-          (dimensions, unpack, width, height, depth, format, type, pixels)) {
-      const GLubyte *src = ADD_POINTERS(unpack->BufferObj->Data, pixels);
-      GLvoid *image = _mesa_unpack_image(dimensions, width, height, depth,
-                                         format, type, src, unpack);
+   else if (_mesa_validate_pbo_access(dimensions, unpack, width, height, depth,
+                                      format, type, pixels)) {
+      const GLubyte *map, *src;
+      GLvoid *image;
+
+      map = (GLubyte *)
+         ctx->Driver.MapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
+                               GL_READ_ONLY_ARB, unpack->BufferObj);
+      if (!map) {
+         /* unable to map src buffer! */
+         _mesa_error(ctx, GL_INVALID_OPERATION, "unable to map PBO");
+         return NULL;
+      }
+
+      src = ADD_POINTERS(map, pixels);
+      image = _mesa_unpack_image(dimensions, width, height, depth,
+                                 format, type, src, unpack);
+
+      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
+                              unpack->BufferObj);
+
       if (!image) {
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "display list construction");
       }
-- 
cgit v1.2.3


From ecb177eaea20f3464b08dfc4d94a3194482cf73d Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 13 Aug 2009 14:05:52 -0600
Subject: mesa: fix warnings about locals hiding function params

---
 src/mesa/main/dlist.c | 6 +++---
 src/mesa/main/light.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 2e36eee3de..f8fdd7045a 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -1016,7 +1016,7 @@ _mesa_save_CallList(GLuint list)
 
 
 void GLAPIENTRY
-_mesa_save_CallLists(GLsizei n, GLenum type, const GLvoid * lists)
+_mesa_save_CallLists(GLsizei num, GLenum type, const GLvoid * lists)
 {
    GET_CURRENT_CONTEXT(ctx);
    GLint i;
@@ -1041,7 +1041,7 @@ _mesa_save_CallLists(GLsizei n, GLenum type, const GLvoid * lists)
       typeErrorFlag = GL_TRUE;
    }
 
-   for (i = 0; i < n; i++) {
+   for (i = 0; i < num; i++) {
       GLint list = translate_id(i, type, lists);
       Node *n = ALLOC_INSTRUCTION(ctx, OPCODE_CALL_LIST_OFFSET, 2);
       if (n) {
@@ -1056,7 +1056,7 @@ _mesa_save_CallLists(GLsizei n, GLenum type, const GLvoid * lists)
    invalidate_saved_current_state( ctx );
 
    if (ctx->ExecuteFlag) {
-      CALL_CallLists(ctx->Exec, (n, type, lists));
+      CALL_CallLists(ctx->Exec, (num, type, lists));
    }
 }
 
diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c
index 17034680ad..7479fe8fc4 100644
--- a/src/mesa/main/light.c
+++ b/src/mesa/main/light.c
@@ -1224,15 +1224,15 @@ _mesa_update_tnl_spaces( GLcontext *ctx, GLuint new_state )
 	 ctx->Driver.LightingSpaceChange( ctx );
    }
    else {
-      GLuint new_state = ctx->NewState;
+      GLuint new_state2 = ctx->NewState;
 
       /* Recalculate that same state only if it has been invalidated
        * by other statechanges.
        */
-      if (new_state & _NEW_MODELVIEW)
+      if (new_state2 & _NEW_MODELVIEW)
 	 update_modelview_scale(ctx);
 
-      if (new_state & (_NEW_LIGHT|_NEW_MODELVIEW))
+      if (new_state2 & (_NEW_LIGHT|_NEW_MODELVIEW))
 	 compute_light_positions( ctx );
    }
 }
-- 
cgit v1.2.3


From 1e0f621b500db9b3ad3135426e621ffa10727d3b Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 13 Aug 2009 14:38:27 -0600
Subject: mesa: fix some invalid memory reads

We were passing the address of a float to functions that would deref the
pointer as an array.
---
 src/mesa/main/dlist.c | 75 ++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 57 insertions(+), 18 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index f8fdd7045a..74537d79e9 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -1883,7 +1883,10 @@ save_Fogfv(GLenum pname, const GLfloat *params)
 static void GLAPIENTRY
 save_Fogf(GLenum pname, GLfloat param)
 {
-   save_Fogfv(pname, &param);
+   GLfloat parray[4];
+   parray[0] = param;
+   parray[1] = parray[2] = parray[3] = 0.0F;
+   save_Fogfv(pname, parray);
 }
 
 
@@ -1916,7 +1919,10 @@ save_Fogiv(GLenum pname, const GLint *params)
 static void GLAPIENTRY
 save_Fogi(GLenum pname, GLint param)
 {
-   save_Fogiv(pname, &param);
+   GLint parray[4];
+   parray[0] = param;
+   parray[1] = parray[2] = parray[3] = 0;
+   save_Fogiv(pname, parray);
 }
 
 
@@ -2080,9 +2086,12 @@ save_Lightfv(GLenum light, GLenum pname, const GLfloat *params)
 
 
 static void GLAPIENTRY
-save_Lightf(GLenum light, GLenum pname, GLfloat params)
+save_Lightf(GLenum light, GLenum pname, GLfloat param)
 {
-   save_Lightfv(light, pname, &params);
+   GLfloat parray[4];
+   parray[0] = param;
+   parray[1] = parray[2] = parray[3] = 0.0F;
+   save_Lightfv(light, pname, parray);
 }
 
 
@@ -2128,7 +2137,10 @@ save_Lightiv(GLenum light, GLenum pname, const GLint *params)
 static void GLAPIENTRY
 save_Lighti(GLenum light, GLenum pname, GLint param)
 {
-   save_Lightiv(light, pname, &param);
+   GLint parray[4];
+   parray[0] = param;
+   parray[1] = parray[2] = parray[3] = 0;
+   save_Lightiv(light, pname, parray);
 }
 
 
@@ -2155,7 +2167,10 @@ save_LightModelfv(GLenum pname, const GLfloat *params)
 static void GLAPIENTRY
 save_LightModelf(GLenum pname, GLfloat param)
 {
-   save_LightModelfv(pname, &param);
+   GLfloat parray[4];
+   parray[0] = param;
+   parray[1] = parray[2] = parray[3] = 0.0F;
+   save_LightModelfv(pname, parray);
 }
 
 
@@ -2186,7 +2201,10 @@ save_LightModeliv(GLenum pname, const GLint *params)
 static void GLAPIENTRY
 save_LightModeli(GLenum pname, GLint param)
 {
-   save_LightModeliv(pname, &param);
+   GLint parray[4];
+   parray[0] = param;
+   parray[1] = parray[2] = parray[3] = 0;
+   save_LightModeliv(pname, parray);
 }
 
 
@@ -2701,21 +2719,28 @@ save_PointParameterfvEXT(GLenum pname, const GLfloat *params)
 static void GLAPIENTRY
 save_PointParameterfEXT(GLenum pname, GLfloat param)
 {
-   save_PointParameterfvEXT(pname, &param);
+   GLfloat parray[3];
+   parray[0] = param;
+   parray[1] = parray[2] = 0.0F;
+   save_PointParameterfvEXT(pname, parray);
 }
 
 static void GLAPIENTRY
 save_PointParameteriNV(GLenum pname, GLint param)
 {
-   GLfloat p = (GLfloat) param;
-   save_PointParameterfvEXT(pname, &p);
+   GLfloat parray[3];
+   parray[0] = (GLfloat) param;
+   parray[1] = parray[2] = 0.0F;
+   save_PointParameterfvEXT(pname, parray);
 }
 
 static void GLAPIENTRY
 save_PointParameterivNV(GLenum pname, const GLint * param)
 {
-   GLfloat p = (GLfloat) param[0];
-   save_PointParameterfvEXT(pname, &p);
+   GLfloat parray[3];
+   parray[0] = (GLfloat) param[0];
+   parray[1] = parray[2] = 0.0F;
+   save_PointParameterfvEXT(pname, parray);
 }
 
 
@@ -3387,7 +3412,10 @@ save_TexEnvfv(GLenum target, GLenum pname, const GLfloat *params)
 static void GLAPIENTRY
 save_TexEnvf(GLenum target, GLenum pname, GLfloat param)
 {
-   save_TexEnvfv(target, pname, &param);
+   GLfloat parray[4];
+   parray[0] = (GLfloat) param;
+   parray[1] = parray[2] = parray[3] = 0.0F;
+   save_TexEnvfv(target, pname, parray);
 }
 
 
@@ -3455,8 +3483,10 @@ save_TexGeniv(GLenum coord, GLenum pname, const GLint *params)
 static void GLAPIENTRY
 save_TexGend(GLenum coord, GLenum pname, GLdouble param)
 {
-   GLfloat p = (GLfloat) param;
-   save_TexGenfv(coord, pname, &p);
+   GLfloat parray[4];
+   parray[0] = (GLfloat) param;
+   parray[1] = parray[2] = parray[3] = 0.0F;
+   save_TexGenfv(coord, pname, parray);
 }
 
 
@@ -3475,14 +3505,20 @@ save_TexGendv(GLenum coord, GLenum pname, const GLdouble *params)
 static void GLAPIENTRY
 save_TexGenf(GLenum coord, GLenum pname, GLfloat param)
 {
-   save_TexGenfv(coord, pname, &param);
+   GLfloat parray[4];
+   parray[0] = param;
+   parray[1] = parray[2] = parray[3] = 0.0F;
+   save_TexGenfv(coord, pname, parray);
 }
 
 
 static void GLAPIENTRY
 save_TexGeni(GLenum coord, GLenum pname, GLint param)
 {
-   save_TexGeniv(coord, pname, &param);
+   GLint parray[4];
+   parray[0] = param;
+   parray[1] = parray[2] = parray[3] = 0;
+   save_TexGeniv(coord, pname, parray);
 }
 
 
@@ -3510,7 +3546,10 @@ save_TexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 static void GLAPIENTRY
 save_TexParameterf(GLenum target, GLenum pname, GLfloat param)
 {
-   save_TexParameterfv(target, pname, &param);
+   GLfloat parray[4];
+   parray[0] = param;
+   parray[1] = parray[2] = parray[3] = 0.0F;
+   save_TexParameterfv(target, pname, parray);
 }
 
 
-- 
cgit v1.2.3


From 66bc17e80e22d8f205cc02171b1c266feab6631f Mon Sep 17 00:00:00 2001
From: Tom Fogal <tfogal@alumni.unh.edu>
Date: Thu, 13 Aug 2009 19:23:54 -0600
Subject: Allow external settings of MAX_WIDTH/HEIGHT.

Conditionalize MAX_WIDTH / MAX_HEIGHT defines so that users can
set them via CFLAGS.
---
 src/mesa/main/config.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index f77a29a43e..e4995c35c4 100644
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -138,9 +138,14 @@
 /** 
  * Maximum viewport/image width. Must accomodate all texture sizes too. 
  */
-#define MAX_WIDTH 4096
+
+#ifndef MAX_WIDTH
+#   define MAX_WIDTH 4096
+#endif
 /** Maximum viewport/image height */
-#define MAX_HEIGHT 4096
+#ifndef MAX_HEIGHT
+#   define MAX_HEIGHT 4096
+#endif
 
 /** Maxmimum size for CVA.  May be overridden by the drivers.  */
 #define MAX_ARRAY_LOCK_SIZE 3000
-- 
cgit v1.2.3


From 3ffaa11f888ced2ae5da7e794a57f20dcc7a3dfc Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 14 Aug 2009 10:30:10 -0600
Subject: mesa: move assertions in test_attachment_completeness()

Put the assertions after the error checks.
---
 src/mesa/main/fbobject.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index ab91fbc4de..825a23090b 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -417,21 +417,22 @@ test_attachment_completeness(const GLcontext *ctx, GLenum format,
       if (format == GL_COLOR) {
          if (att->Renderbuffer->_BaseFormat != GL_RGB &&
              att->Renderbuffer->_BaseFormat != GL_RGBA) {
-            ASSERT(att->Renderbuffer->RedBits);
-            ASSERT(att->Renderbuffer->GreenBits);
-            ASSERT(att->Renderbuffer->BlueBits);
             att_incomplete("bad renderbuffer color format");
             att->Complete = GL_FALSE;
             return;
          }
+         ASSERT(att->Renderbuffer->RedBits);
+         ASSERT(att->Renderbuffer->GreenBits);
+         ASSERT(att->Renderbuffer->BlueBits);
       }
       else if (format == GL_DEPTH) {
-         ASSERT(att->Renderbuffer->DepthBits);
          if (att->Renderbuffer->_BaseFormat == GL_DEPTH_COMPONENT) {
+            ASSERT(att->Renderbuffer->DepthBits);
             /* OK */
          }
          else if (ctx->Extensions.EXT_packed_depth_stencil &&
                   att->Renderbuffer->_BaseFormat == GL_DEPTH_STENCIL_EXT) {
+            ASSERT(att->Renderbuffer->DepthBits);
             /* OK */
          }
          else {
@@ -442,12 +443,13 @@ test_attachment_completeness(const GLcontext *ctx, GLenum format,
       }
       else {
          assert(format == GL_STENCIL);
-         ASSERT(att->Renderbuffer->StencilBits);
          if (att->Renderbuffer->_BaseFormat == GL_STENCIL_INDEX) {
+            ASSERT(att->Renderbuffer->StencilBits);
             /* OK */
          }
          else if (ctx->Extensions.EXT_packed_depth_stencil &&
                   att->Renderbuffer->_BaseFormat == GL_DEPTH_STENCIL_EXT) {
+            ASSERT(att->Renderbuffer->StencilBits);
             /* OK */
          }
          else {
-- 
cgit v1.2.3


From e691b0e533c552dc5884192a9a2b9347f704479d Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 14 Aug 2009 11:22:37 -0600
Subject: Allow external settings of MAX_WIDTH/HEIGHT.

Conditionalize MAX_WIDTH / MAX_HEIGHT defines so that users can
set them via CFLAGS.

(cherry picked from master, commit 66bc17e80e22d8f205cc02171b1c266feab6631f)
---
 src/mesa/main/config.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index f7acd2f08e..114119006a 100644
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -138,9 +138,14 @@
 /** 
  * Maximum viewport/image width. Must accomodate all texture sizes too. 
  */
-#define MAX_WIDTH 4096
+
+#ifndef MAX_WIDTH
+#   define MAX_WIDTH 4096
+#endif
 /** Maximum viewport/image height */
-#define MAX_HEIGHT 4096
+#ifndef MAX_HEIGHT
+#   define MAX_HEIGHT 4096
+#endif
 
 /** Maxmimum size for CVA.  May be overridden by the drivers.  */
 #define MAX_ARRAY_LOCK_SIZE 3000
-- 
cgit v1.2.3


From a48b0a5ce7fc17eab4daa375fb95768fa2f50825 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 14 Aug 2009 10:41:03 -0600
Subject: mesa: minor error string changes

---
 src/mesa/main/api_validate.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c
index 33f4dd152a..0c6d9af4a8 100644
--- a/src/mesa/main/api_validate.c
+++ b/src/mesa/main/api_validate.c
@@ -100,11 +100,11 @@ max_buffer_index(GLcontext *ctx, GLuint count, GLenum type,
  * Check if OK to render by examining framebuffer status and vertex arrays.
  */
 static GLboolean
-check_valid_to_render(GLcontext *ctx, char *function)
+check_valid_to_render(GLcontext *ctx, const char *function)
 {
    if (ctx->DrawBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
       _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,
-                  "glDraw%s(incomplete framebuffer)", function);
+                  "%s(incomplete framebuffer)", function);
       return GL_FALSE;
    }
 
@@ -161,7 +161,7 @@ _mesa_validate_DrawElements(GLcontext *ctx,
    if (ctx->NewState)
       _mesa_update_state(ctx);
 
-   if (!check_valid_to_render(ctx, "Elements"))
+   if (!check_valid_to_render(ctx, "glDrawElements"))
       return GL_FALSE;
 
    /* Vertex buffer object tests */
@@ -234,7 +234,7 @@ _mesa_validate_DrawRangeElements(GLcontext *ctx, GLenum mode,
    if (ctx->NewState)
       _mesa_update_state(ctx);
 
-   if (!check_valid_to_render(ctx, "RangeElements"))
+   if (!check_valid_to_render(ctx, "glDrawRangeElements"))
       return GL_FALSE;
 
    /* Vertex buffer object tests */
@@ -290,7 +290,7 @@ _mesa_validate_DrawArrays(GLcontext *ctx,
    if (ctx->NewState)
       _mesa_update_state(ctx);
 
-   if (!check_valid_to_render(ctx, "Arrays"))
+   if (!check_valid_to_render(ctx, "glDrawArrays"))
       return GL_FALSE;
 
    if (ctx->Const.CheckArrayBounds) {
-- 
cgit v1.2.3


From 56c4226fcc54158eb7fe54eeb13539a979ec155c Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 14 Aug 2009 10:45:17 -0600
Subject: mesa: new _mesa_valid_to_render() function

Tests if the current shader/program is valid and that the framebuffer is
complete.  To be called by glBegin, glDrawArrays, etc.
---
 src/mesa/main/context.c | 42 ++++++++++++++++++++++++++++++++++++++++++
 src/mesa/main/context.h |  6 +++++-
 2 files changed, 47 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 415e339cb8..3547d0a220 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1576,4 +1576,46 @@ _mesa_set_mvp_with_dp4( GLcontext *ctx,
 }
 
 
+
+/**
+ * Prior to drawing anything with glBegin, glDrawArrays, etc. this function
+ * is called to see if it's valid to render.  This involves checking that
+ * the current shader is valid and the framebuffer is complete.
+ * If an error is detected it'll be recorded here.
+ * \return GL_TRUE if OK to render, GL_FALSE if not
+ */
+GLboolean
+_mesa_valid_to_render(GLcontext *ctx, const char *where)
+{
+   if (ctx->Shader.CurrentProgram) {
+      /* using shaders */
+      if (!ctx->Shader.CurrentProgram->LinkStatus) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "%s(shader not linked), where");
+         return GL_FALSE;
+      }
+   }
+   else {
+      if (ctx->VertexProgram.Enabled && !ctx->VertexProgram._Enabled) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "%s(vertex program not valid)", where);
+         return GL_FALSE;
+      }
+      if (ctx->FragmentProgram.Enabled && !ctx->FragmentProgram._Enabled) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "%s(fragment program not valid)", where);
+         return GL_FALSE;
+      }
+   }
+
+   if (ctx->DrawBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
+      _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,
+                  "%s(incomplete framebuffer)", where);
+      return GL_FALSE;
+   }
+
+   return GL_TRUE;
+}
+
+
 /*@}*/
diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h
index 0531ae8ee8..5587695fa0 100644
--- a/src/mesa/main/context.h
+++ b/src/mesa/main/context.h
@@ -159,6 +159,11 @@ _mesa_set_mvp_with_dp4( GLcontext *ctx,
                         GLboolean flag );
 
 
+extern GLboolean
+_mesa_valid_to_render(GLcontext *ctx, const char *where);
+
+
+
 /** \name Miscellaneous */
 /*@{*/
 
@@ -174,7 +179,6 @@ _mesa_Flush( void );
 /*@}*/
 
 
-
 /**
  * \name Macros for flushing buffered rendering commands before state changes,
  * checking if inside glBegin/glEnd, etc.
-- 
cgit v1.2.3


From b6e5600bd460245afef605dbfbcf6650ff677dcb Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 14 Aug 2009 10:48:31 -0600
Subject: mesa: call _mesa_valid_to_render()

---
 src/mesa/main/api_validate.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c
index 0c6d9af4a8..2df4f17389 100644
--- a/src/mesa/main/api_validate.c
+++ b/src/mesa/main/api_validate.c
@@ -97,14 +97,12 @@ max_buffer_index(GLcontext *ctx, GLuint count, GLenum type,
 
 
 /**
- * Check if OK to render by examining framebuffer status and vertex arrays.
+ * Check if OK to draw arrays/elements.
  */
 static GLboolean
 check_valid_to_render(GLcontext *ctx, const char *function)
 {
-   if (ctx->DrawBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
-      _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,
-                  "%s(incomplete framebuffer)", function);
+   if (!_mesa_valid_to_render(ctx, function)) {
       return GL_FALSE;
    }
 
-- 
cgit v1.2.3


From 71b1610941f9bfefa01d827fd19cc2368e6cdae3 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 14 Aug 2009 12:58:21 -0600
Subject: mesa: append uniform values to the log file the first time we use a
 shader

This info is essential to using/debugging a shader outside of its normal
application.
---
 src/mesa/main/context.c | 27 +++++++++++++++++++++++++++
 src/mesa/main/mtypes.h  |  1 +
 2 files changed, 28 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 3547d0a220..38ec418809 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -150,6 +150,7 @@
 #include "glapi/glapioffsets.h"
 #include "glapi/glapitable.h"
 #include "shader/program.h"
+#include "shader/prog_print.h"
 #include "shader/shader_api.h"
 #if FEATURE_ATI_fragment_shader
 #include "shader/atifragshader.h"
@@ -1614,6 +1615,32 @@ _mesa_valid_to_render(GLcontext *ctx, const char *where)
       return GL_FALSE;
    }
 
+#ifdef DEBUG
+   if (ctx->Shader.Flags & GLSL_LOG) {
+      struct gl_shader_program *shProg = ctx->Shader.CurrentProgram;
+      if (shProg) {
+         if (!shProg->_Used) {
+            /* This is the first time this shader is being used.
+             * Append shader's constants/uniforms to log file.
+             */
+            GLuint i;
+            for (i = 0; i < shProg->NumShaders; i++) {
+               struct gl_shader *sh = shProg->Shaders[i];
+               if (sh->Type == GL_VERTEX_SHADER) {
+                  _mesa_append_uniforms_to_file(sh,
+                                                &shProg->VertexProgram->Base);
+               }
+               else if (sh->Type == GL_FRAGMENT_SHADER) {
+                  _mesa_append_uniforms_to_file(sh,
+                                                &shProg->FragmentProgram->Base);
+               }
+            }
+            shProg->_Used = GL_TRUE;
+         }
+      }
+   }
+#endif
+
    return GL_TRUE;
 }
 
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 6a60ad1cee..41172788ef 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2037,6 +2037,7 @@ struct gl_shader_program
    struct gl_program_parameter_list *Varying;
    GLboolean LinkStatus;   /**< GL_LINK_STATUS */
    GLboolean Validated;
+   GLboolean _Used;        /**< Ever used for drawing? */
    GLchar *InfoLog;
 };   
 
-- 
cgit v1.2.3


From 970f76866617bc084847ce112c925b456d3deacc Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Thu, 13 Aug 2009 23:57:03 -0700
Subject: Regenerate files for GL_APPLE_flush_buffer_range

---
 src/mesa/glapi/dispatch.h      |   44 +-
 src/mesa/glapi/glapioffsets.h  |   24 +-
 src/mesa/glapi/glapitable.h    |   18 +-
 src/mesa/glapi/glapitemp.h     |   56 +-
 src/mesa/glapi/glprocs.h       |  644 ++---
 src/mesa/main/enums.c          | 5978 ++++++++++++++++++++--------------------
 src/mesa/sparc/glapi_sparc.S   |   22 +-
 src/mesa/x86-64/glapi_x86-64.S |  258 +-
 src/mesa/x86/glapi_x86.S       |   26 +-
 9 files changed, 3675 insertions(+), 3395 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/glapi/dispatch.h b/src/mesa/glapi/dispatch.h
index b3f1aed1a4..2f5cc55f00 100644
--- a/src/mesa/glapi/dispatch.h
+++ b/src/mesa/glapi/dispatch.h
@@ -2382,12 +2382,24 @@
 #define CALL_BlitFramebufferEXT(disp, parameters) (*((disp)->BlitFramebufferEXT)) parameters
 #define GET_BlitFramebufferEXT(disp) ((disp)->BlitFramebufferEXT)
 #define SET_BlitFramebufferEXT(disp, fn) ((disp)->BlitFramebufferEXT = fn)
+#define CALL_BufferParameteriAPPLE(disp, parameters) (*((disp)->BufferParameteriAPPLE)) parameters
+#define GET_BufferParameteriAPPLE(disp) ((disp)->BufferParameteriAPPLE)
+#define SET_BufferParameteriAPPLE(disp, fn) ((disp)->BufferParameteriAPPLE = fn)
+#define CALL_FlushMappedBufferRangeAPPLE(disp, parameters) (*((disp)->FlushMappedBufferRangeAPPLE)) parameters
+#define GET_FlushMappedBufferRangeAPPLE(disp) ((disp)->FlushMappedBufferRangeAPPLE)
+#define SET_FlushMappedBufferRangeAPPLE(disp, fn) ((disp)->FlushMappedBufferRangeAPPLE = fn)
 #define CALL_FramebufferTextureLayerEXT(disp, parameters) (*((disp)->FramebufferTextureLayerEXT)) parameters
 #define GET_FramebufferTextureLayerEXT(disp) ((disp)->FramebufferTextureLayerEXT)
 #define SET_FramebufferTextureLayerEXT(disp, fn) ((disp)->FramebufferTextureLayerEXT = fn)
 #define CALL_ProvokingVertexEXT(disp, parameters) (*((disp)->ProvokingVertexEXT)) parameters
 #define GET_ProvokingVertexEXT(disp) ((disp)->ProvokingVertexEXT)
 #define SET_ProvokingVertexEXT(disp, fn) ((disp)->ProvokingVertexEXT = fn)
+#define CALL_GetTexParameterPointervAPPLE(disp, parameters) (*((disp)->GetTexParameterPointervAPPLE)) parameters
+#define GET_GetTexParameterPointervAPPLE(disp) ((disp)->GetTexParameterPointervAPPLE)
+#define SET_GetTexParameterPointervAPPLE(disp, fn) ((disp)->GetTexParameterPointervAPPLE = fn)
+#define CALL_TextureRangeAPPLE(disp, parameters) (*((disp)->TextureRangeAPPLE)) parameters
+#define GET_TextureRangeAPPLE(disp) ((disp)->TextureRangeAPPLE)
+#define SET_TextureRangeAPPLE(disp, fn) ((disp)->TextureRangeAPPLE = fn)
 #define CALL_StencilFuncSeparateATI(disp, parameters) (*((disp)->StencilFuncSeparateATI)) parameters
 #define GET_StencilFuncSeparateATI(disp) ((disp)->StencilFuncSeparateATI)
 #define SET_StencilFuncSeparateATI(disp, fn) ((disp)->StencilFuncSeparateATI = fn)
@@ -2406,7 +2418,7 @@
 
 #else
 
-#define driDispatchRemapTable_size 373
+#define driDispatchRemapTable_size 377
 extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 
 #define AttachShader_remap_index 0
@@ -2775,13 +2787,17 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define IsRenderbufferEXT_remap_index 363
 #define RenderbufferStorageEXT_remap_index 364
 #define BlitFramebufferEXT_remap_index 365
-#define FramebufferTextureLayerEXT_remap_index 366
-#define ProvokingVertexEXT_remap_index 367
-#define StencilFuncSeparateATI_remap_index 368
-#define ProgramEnvParameters4fvEXT_remap_index 369
-#define ProgramLocalParameters4fvEXT_remap_index 370
-#define GetQueryObjecti64vEXT_remap_index 371
-#define GetQueryObjectui64vEXT_remap_index 372
+#define BufferParameteriAPPLE_remap_index 366
+#define FlushMappedBufferRangeAPPLE_remap_index 367
+#define FramebufferTextureLayerEXT_remap_index 368
+#define ProvokingVertexEXT_remap_index 369
+#define GetTexParameterPointervAPPLE_remap_index 370
+#define TextureRangeAPPLE_remap_index 371
+#define StencilFuncSeparateATI_remap_index 372
+#define ProgramEnvParameters4fvEXT_remap_index 373
+#define ProgramLocalParameters4fvEXT_remap_index 374
+#define GetQueryObjecti64vEXT_remap_index 375
+#define GetQueryObjectui64vEXT_remap_index 376
 
 #define CALL_AttachShader(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLuint)), driDispatchRemapTable[AttachShader_remap_index], parameters)
 #define GET_AttachShader(disp) GET_by_offset(disp, driDispatchRemapTable[AttachShader_remap_index])
@@ -3881,12 +3897,24 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define CALL_BlitFramebufferEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum)), driDispatchRemapTable[BlitFramebufferEXT_remap_index], parameters)
 #define GET_BlitFramebufferEXT(disp) GET_by_offset(disp, driDispatchRemapTable[BlitFramebufferEXT_remap_index])
 #define SET_BlitFramebufferEXT(disp, fn) SET_by_offset(disp, driDispatchRemapTable[BlitFramebufferEXT_remap_index], fn)
+#define CALL_BufferParameteriAPPLE(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLint)), driDispatchRemapTable[BufferParameteriAPPLE_remap_index], parameters)
+#define GET_BufferParameteriAPPLE(disp) GET_by_offset(disp, driDispatchRemapTable[BufferParameteriAPPLE_remap_index])
+#define SET_BufferParameteriAPPLE(disp, fn) SET_by_offset(disp, driDispatchRemapTable[BufferParameteriAPPLE_remap_index], fn)
+#define CALL_FlushMappedBufferRangeAPPLE(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLintptr, GLsizeiptr)), driDispatchRemapTable[FlushMappedBufferRangeAPPLE_remap_index], parameters)
+#define GET_FlushMappedBufferRangeAPPLE(disp) GET_by_offset(disp, driDispatchRemapTable[FlushMappedBufferRangeAPPLE_remap_index])
+#define SET_FlushMappedBufferRangeAPPLE(disp, fn) SET_by_offset(disp, driDispatchRemapTable[FlushMappedBufferRangeAPPLE_remap_index], fn)
 #define CALL_FramebufferTextureLayerEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLuint, GLint, GLint)), driDispatchRemapTable[FramebufferTextureLayerEXT_remap_index], parameters)
 #define GET_FramebufferTextureLayerEXT(disp) GET_by_offset(disp, driDispatchRemapTable[FramebufferTextureLayerEXT_remap_index])
 #define SET_FramebufferTextureLayerEXT(disp, fn) SET_by_offset(disp, driDispatchRemapTable[FramebufferTextureLayerEXT_remap_index], fn)
 #define CALL_ProvokingVertexEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum)), driDispatchRemapTable[ProvokingVertexEXT_remap_index], parameters)
 #define GET_ProvokingVertexEXT(disp) GET_by_offset(disp, driDispatchRemapTable[ProvokingVertexEXT_remap_index])
 #define SET_ProvokingVertexEXT(disp, fn) SET_by_offset(disp, driDispatchRemapTable[ProvokingVertexEXT_remap_index], fn)
+#define CALL_GetTexParameterPointervAPPLE(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLvoid **)), driDispatchRemapTable[GetTexParameterPointervAPPLE_remap_index], parameters)
+#define GET_GetTexParameterPointervAPPLE(disp) GET_by_offset(disp, driDispatchRemapTable[GetTexParameterPointervAPPLE_remap_index])
+#define SET_GetTexParameterPointervAPPLE(disp, fn) SET_by_offset(disp, driDispatchRemapTable[GetTexParameterPointervAPPLE_remap_index], fn)
+#define CALL_TextureRangeAPPLE(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLsizei, GLvoid *)), driDispatchRemapTable[TextureRangeAPPLE_remap_index], parameters)
+#define GET_TextureRangeAPPLE(disp) GET_by_offset(disp, driDispatchRemapTable[TextureRangeAPPLE_remap_index])
+#define SET_TextureRangeAPPLE(disp, fn) SET_by_offset(disp, driDispatchRemapTable[TextureRangeAPPLE_remap_index], fn)
 #define CALL_StencilFuncSeparateATI(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLint, GLuint)), driDispatchRemapTable[StencilFuncSeparateATI_remap_index], parameters)
 #define GET_StencilFuncSeparateATI(disp) GET_by_offset(disp, driDispatchRemapTable[StencilFuncSeparateATI_remap_index])
 #define SET_StencilFuncSeparateATI(disp, fn) SET_by_offset(disp, driDispatchRemapTable[StencilFuncSeparateATI_remap_index], fn)
diff --git a/src/mesa/glapi/glapioffsets.h b/src/mesa/glapi/glapioffsets.h
index 9ed67a645f..01fd6f7158 100644
--- a/src/mesa/glapi/glapioffsets.h
+++ b/src/mesa/glapi/glapioffsets.h
@@ -806,14 +806,18 @@
 #define _gloffset_IsRenderbufferEXT 771
 #define _gloffset_RenderbufferStorageEXT 772
 #define _gloffset_BlitFramebufferEXT 773
-#define _gloffset_FramebufferTextureLayerEXT 774
-#define _gloffset_ProvokingVertexEXT 775
-#define _gloffset_StencilFuncSeparateATI 776
-#define _gloffset_ProgramEnvParameters4fvEXT 777
-#define _gloffset_ProgramLocalParameters4fvEXT 778
-#define _gloffset_GetQueryObjecti64vEXT 779
-#define _gloffset_GetQueryObjectui64vEXT 780
-#define _gloffset_FIRST_DYNAMIC 781
+#define _gloffset_BufferParameteriAPPLE 774
+#define _gloffset_FlushMappedBufferRangeAPPLE 775
+#define _gloffset_FramebufferTextureLayerEXT 776
+#define _gloffset_ProvokingVertexEXT 777
+#define _gloffset_GetTexParameterPointervAPPLE 778
+#define _gloffset_TextureRangeAPPLE 779
+#define _gloffset_StencilFuncSeparateATI 780
+#define _gloffset_ProgramEnvParameters4fvEXT 781
+#define _gloffset_ProgramLocalParameters4fvEXT 782
+#define _gloffset_GetQueryObjecti64vEXT 783
+#define _gloffset_GetQueryObjectui64vEXT 784
+#define _gloffset_FIRST_DYNAMIC 785
 
 #else
 
@@ -1183,8 +1187,12 @@
 #define _gloffset_IsRenderbufferEXT driDispatchRemapTable[IsRenderbufferEXT_remap_index]
 #define _gloffset_RenderbufferStorageEXT driDispatchRemapTable[RenderbufferStorageEXT_remap_index]
 #define _gloffset_BlitFramebufferEXT driDispatchRemapTable[BlitFramebufferEXT_remap_index]
+#define _gloffset_BufferParameteriAPPLE driDispatchRemapTable[BufferParameteriAPPLE_remap_index]
+#define _gloffset_FlushMappedBufferRangeAPPLE driDispatchRemapTable[FlushMappedBufferRangeAPPLE_remap_index]
 #define _gloffset_FramebufferTextureLayerEXT driDispatchRemapTable[FramebufferTextureLayerEXT_remap_index]
 #define _gloffset_ProvokingVertexEXT driDispatchRemapTable[ProvokingVertexEXT_remap_index]
+#define _gloffset_GetTexParameterPointervAPPLE driDispatchRemapTable[GetTexParameterPointervAPPLE_remap_index]
+#define _gloffset_TextureRangeAPPLE driDispatchRemapTable[TextureRangeAPPLE_remap_index]
 #define _gloffset_StencilFuncSeparateATI driDispatchRemapTable[StencilFuncSeparateATI_remap_index]
 #define _gloffset_ProgramEnvParameters4fvEXT driDispatchRemapTable[ProgramEnvParameters4fvEXT_remap_index]
 #define _gloffset_ProgramLocalParameters4fvEXT driDispatchRemapTable[ProgramLocalParameters4fvEXT_remap_index]
diff --git a/src/mesa/glapi/glapitable.h b/src/mesa/glapi/glapitable.h
index 308de4facc..c23e9a63cf 100644
--- a/src/mesa/glapi/glapitable.h
+++ b/src/mesa/glapi/glapitable.h
@@ -814,13 +814,17 @@ struct _glapi_table
    GLboolean (GLAPIENTRYP IsRenderbufferEXT)(GLuint renderbuffer); /* 771 */
    void (GLAPIENTRYP RenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); /* 772 */
    void (GLAPIENTRYP BlitFramebufferEXT)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); /* 773 */
-   void (GLAPIENTRYP FramebufferTextureLayerEXT)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); /* 774 */
-   void (GLAPIENTRYP ProvokingVertexEXT)(GLenum mode); /* 775 */
-   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 776 */
-   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 777 */
-   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 778 */
-   void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 779 */
-   void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 780 */
+   void (GLAPIENTRYP BufferParameteriAPPLE)(GLenum target, GLenum pname, GLint param); /* 774 */
+   void (GLAPIENTRYP FlushMappedBufferRangeAPPLE)(GLenum target, GLintptr offset, GLsizeiptr size); /* 775 */
+   void (GLAPIENTRYP FramebufferTextureLayerEXT)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); /* 776 */
+   void (GLAPIENTRYP ProvokingVertexEXT)(GLenum mode); /* 777 */
+   void (GLAPIENTRYP GetTexParameterPointervAPPLE)(GLenum target, GLenum pname, GLvoid ** params); /* 778 */
+   void (GLAPIENTRYP TextureRangeAPPLE)(GLenum target, GLsizei length, GLvoid * pointer); /* 779 */
+   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 780 */
+   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 781 */
+   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 782 */
+   void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 783 */
+   void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 784 */
 };
 
 #endif /* !defined( _GLAPI_TABLE_H_ ) */
diff --git a/src/mesa/glapi/glapitemp.h b/src/mesa/glapi/glapitemp.h
index 86fda613f0..68e7a9a4f0 100644
--- a/src/mesa/glapi/glapitemp.h
+++ b/src/mesa/glapi/glapitemp.h
@@ -5598,6 +5598,20 @@ KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_773)(GLint srcX0, GLint srcY0, GL
    DISPATCH(BlitFramebufferEXT, (srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter), (F, "glBlitFramebufferEXT(%d, %d, %d, %d, %d, %d, %d, %d, %d, 0x%x);\n", srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter));
 }
 
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_774)(GLenum target, GLenum pname, GLint param);
+
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_774)(GLenum target, GLenum pname, GLint param)
+{
+   DISPATCH(BufferParameteriAPPLE, (target, pname, param), (F, "glBufferParameteriAPPLE(0x%x, 0x%x, %d);\n", target, pname, param));
+}
+
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_775)(GLenum target, GLintptr offset, GLsizeiptr size);
+
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_775)(GLenum target, GLintptr offset, GLsizeiptr size)
+{
+   DISPATCH(FlushMappedBufferRangeAPPLE, (target, offset, size), (F, "glFlushMappedBufferRangeAPPLE(0x%x, %d, %d);\n", target, offset, size));
+}
+
 KEYWORD1 void KEYWORD2 NAME(FramebufferTextureLayer)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)
 {
    DISPATCH(FramebufferTextureLayerEXT, (target, attachment, texture, level, layer), (F, "glFramebufferTextureLayer(0x%x, 0x%x, %d, %d, %d);\n", target, attachment, texture, level, layer));
@@ -5613,37 +5627,51 @@ KEYWORD1 void KEYWORD2 NAME(ProvokingVertexEXT)(GLenum mode)
    DISPATCH(ProvokingVertexEXT, (mode), (F, "glProvokingVertexEXT(0x%x);\n", mode));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_776)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_778)(GLenum target, GLenum pname, GLvoid ** params);
+
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_778)(GLenum target, GLenum pname, GLvoid ** params)
+{
+   DISPATCH(GetTexParameterPointervAPPLE, (target, pname, params), (F, "glGetTexParameterPointervAPPLE(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_779)(GLenum target, GLsizei length, GLvoid * pointer);
+
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_779)(GLenum target, GLsizei length, GLvoid * pointer)
+{
+   DISPATCH(TextureRangeAPPLE, (target, length, pointer), (F, "glTextureRangeAPPLE(0x%x, %d, %p);\n", target, length, (const void *) pointer));
+}
+
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_780)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_776)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_780)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask)
 {
    DISPATCH(StencilFuncSeparateATI, (frontfunc, backfunc, ref, mask), (F, "glStencilFuncSeparateATI(0x%x, 0x%x, %d, %d);\n", frontfunc, backfunc, ref, mask));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_777)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_781)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_777)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_781)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
 {
    DISPATCH(ProgramEnvParameters4fvEXT, (target, index, count, params), (F, "glProgramEnvParameters4fvEXT(0x%x, %d, %d, %p);\n", target, index, count, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_778)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_782)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_778)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_782)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
 {
    DISPATCH(ProgramLocalParameters4fvEXT, (target, index, count, params), (F, "glProgramLocalParameters4fvEXT(0x%x, %d, %d, %p);\n", target, index, count, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_779)(GLuint id, GLenum pname, GLint64EXT * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_783)(GLuint id, GLenum pname, GLint64EXT * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_779)(GLuint id, GLenum pname, GLint64EXT * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_783)(GLuint id, GLenum pname, GLint64EXT * params)
 {
    DISPATCH(GetQueryObjecti64vEXT, (id, pname, params), (F, "glGetQueryObjecti64vEXT(%d, 0x%x, %p);\n", id, pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_780)(GLuint id, GLenum pname, GLuint64EXT * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_784)(GLuint id, GLenum pname, GLuint64EXT * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_780)(GLuint id, GLenum pname, GLuint64EXT * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_784)(GLuint id, GLenum pname, GLuint64EXT * params)
 {
    DISPATCH(GetQueryObjectui64vEXT, (id, pname, params), (F, "glGetQueryObjectui64vEXT(%d, 0x%x, %p);\n", id, pname, (const void *) params));
 }
@@ -6436,13 +6464,17 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(IsRenderbufferEXT),
    TABLE_ENTRY(RenderbufferStorageEXT),
    TABLE_ENTRY(_dispatch_stub_773),
+   TABLE_ENTRY(_dispatch_stub_774),
+   TABLE_ENTRY(_dispatch_stub_775),
    TABLE_ENTRY(FramebufferTextureLayerEXT),
    TABLE_ENTRY(ProvokingVertexEXT),
-   TABLE_ENTRY(_dispatch_stub_776),
-   TABLE_ENTRY(_dispatch_stub_777),
    TABLE_ENTRY(_dispatch_stub_778),
    TABLE_ENTRY(_dispatch_stub_779),
    TABLE_ENTRY(_dispatch_stub_780),
+   TABLE_ENTRY(_dispatch_stub_781),
+   TABLE_ENTRY(_dispatch_stub_782),
+   TABLE_ENTRY(_dispatch_stub_783),
+   TABLE_ENTRY(_dispatch_stub_784),
    /* A whole bunch of no-op functions.  These might be called
     * when someone tries to call a dynamically-registered
     * extension function without a current rendering context.
diff --git a/src/mesa/glapi/glprocs.h b/src/mesa/glapi/glprocs.h
index bd3ebc8872..21e96a9325 100644
--- a/src/mesa/glapi/glprocs.h
+++ b/src/mesa/glapi/glprocs.h
@@ -826,8 +826,12 @@ static const char gl_string_table[] =
     "glIsRenderbufferEXT\0"
     "glRenderbufferStorageEXT\0"
     "glBlitFramebufferEXT\0"
+    "glBufferParameteriAPPLE\0"
+    "glFlushMappedBufferRangeAPPLE\0"
     "glFramebufferTextureLayerEXT\0"
     "glProvokingVertexEXT\0"
+    "glGetTexParameterPointervAPPLE\0"
+    "glTextureRangeAPPLE\0"
     "glStencilFuncSeparateATI\0"
     "glProgramEnvParameters4fvEXT\0"
     "glProgramLocalParameters4fvEXT\0"
@@ -1178,11 +1182,15 @@ static const char gl_string_table[] =
 #define gl_dispatch_stub_754 mgl_dispatch_stub_754
 #define gl_dispatch_stub_755 mgl_dispatch_stub_755
 #define gl_dispatch_stub_773 mgl_dispatch_stub_773
-#define gl_dispatch_stub_776 mgl_dispatch_stub_776
-#define gl_dispatch_stub_777 mgl_dispatch_stub_777
+#define gl_dispatch_stub_774 mgl_dispatch_stub_774
+#define gl_dispatch_stub_775 mgl_dispatch_stub_775
 #define gl_dispatch_stub_778 mgl_dispatch_stub_778
 #define gl_dispatch_stub_779 mgl_dispatch_stub_779
 #define gl_dispatch_stub_780 mgl_dispatch_stub_780
+#define gl_dispatch_stub_781 mgl_dispatch_stub_781
+#define gl_dispatch_stub_782 mgl_dispatch_stub_782
+#define gl_dispatch_stub_783 mgl_dispatch_stub_783
+#define gl_dispatch_stub_784 mgl_dispatch_stub_784
 #endif /* USE_MGL_NAMESPACE */
 
 
@@ -1228,11 +1236,15 @@ GLboolean GLAPIENTRY gl_dispatch_stub_747(GLuint array);
 void GLAPIENTRY gl_dispatch_stub_754(GLclampd zmin, GLclampd zmax);
 void GLAPIENTRY gl_dispatch_stub_755(GLenum modeRGB, GLenum modeA);
 void GLAPIENTRY gl_dispatch_stub_773(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-void GLAPIENTRY gl_dispatch_stub_776(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-void GLAPIENTRY gl_dispatch_stub_777(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_778(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_779(GLuint id, GLenum pname, GLint64EXT * params);
-void GLAPIENTRY gl_dispatch_stub_780(GLuint id, GLenum pname, GLuint64EXT * params);
+void GLAPIENTRY gl_dispatch_stub_774(GLenum target, GLenum pname, GLint param);
+void GLAPIENTRY gl_dispatch_stub_775(GLenum target, GLintptr offset, GLsizeiptr size);
+void GLAPIENTRY gl_dispatch_stub_778(GLenum target, GLenum pname, GLvoid ** params);
+void GLAPIENTRY gl_dispatch_stub_779(GLenum target, GLsizei length, GLvoid * pointer);
+void GLAPIENTRY gl_dispatch_stub_780(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+void GLAPIENTRY gl_dispatch_stub_781(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_782(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_783(GLuint id, GLenum pname, GLint64EXT * params);
+void GLAPIENTRY gl_dispatch_stub_784(GLuint id, GLenum pname, GLuint64EXT * params);
 #endif /* defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING) */
 
 static const glprocs_table_t static_functions[] = {
@@ -2010,313 +2022,317 @@ static const glprocs_table_t static_functions[] = {
     NAME_FUNC_OFFSET(13543, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, _gloffset_IsRenderbufferEXT),
     NAME_FUNC_OFFSET(13563, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, _gloffset_RenderbufferStorageEXT),
     NAME_FUNC_OFFSET(13588, gl_dispatch_stub_773, gl_dispatch_stub_773, NULL, _gloffset_BlitFramebufferEXT),
-    NAME_FUNC_OFFSET(13609, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
-    NAME_FUNC_OFFSET(13638, glProvokingVertexEXT, glProvokingVertexEXT, NULL, _gloffset_ProvokingVertexEXT),
-    NAME_FUNC_OFFSET(13659, gl_dispatch_stub_776, gl_dispatch_stub_776, NULL, _gloffset_StencilFuncSeparateATI),
-    NAME_FUNC_OFFSET(13684, gl_dispatch_stub_777, gl_dispatch_stub_777, NULL, _gloffset_ProgramEnvParameters4fvEXT),
-    NAME_FUNC_OFFSET(13713, gl_dispatch_stub_778, gl_dispatch_stub_778, NULL, _gloffset_ProgramLocalParameters4fvEXT),
-    NAME_FUNC_OFFSET(13744, gl_dispatch_stub_779, gl_dispatch_stub_779, NULL, _gloffset_GetQueryObjecti64vEXT),
-    NAME_FUNC_OFFSET(13768, gl_dispatch_stub_780, gl_dispatch_stub_780, NULL, _gloffset_GetQueryObjectui64vEXT),
-    NAME_FUNC_OFFSET(13793, glArrayElement, glArrayElement, NULL, _gloffset_ArrayElement),
-    NAME_FUNC_OFFSET(13811, glBindTexture, glBindTexture, NULL, _gloffset_BindTexture),
-    NAME_FUNC_OFFSET(13828, glDrawArrays, glDrawArrays, NULL, _gloffset_DrawArrays),
-    NAME_FUNC_OFFSET(13844, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, _gloffset_AreTexturesResident),
-    NAME_FUNC_OFFSET(13869, glCopyTexImage1D, glCopyTexImage1D, NULL, _gloffset_CopyTexImage1D),
-    NAME_FUNC_OFFSET(13889, glCopyTexImage2D, glCopyTexImage2D, NULL, _gloffset_CopyTexImage2D),
-    NAME_FUNC_OFFSET(13909, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, _gloffset_CopyTexSubImage1D),
-    NAME_FUNC_OFFSET(13932, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, _gloffset_CopyTexSubImage2D),
-    NAME_FUNC_OFFSET(13955, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, _gloffset_DeleteTextures),
-    NAME_FUNC_OFFSET(13975, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, _gloffset_GenTextures),
-    NAME_FUNC_OFFSET(13992, glGetPointerv, glGetPointerv, NULL, _gloffset_GetPointerv),
-    NAME_FUNC_OFFSET(14009, glIsTexture, glIsTextureEXT, glIsTextureEXT, _gloffset_IsTexture),
-    NAME_FUNC_OFFSET(14024, glPrioritizeTextures, glPrioritizeTextures, NULL, _gloffset_PrioritizeTextures),
-    NAME_FUNC_OFFSET(14048, glTexSubImage1D, glTexSubImage1D, NULL, _gloffset_TexSubImage1D),
-    NAME_FUNC_OFFSET(14067, glTexSubImage2D, glTexSubImage2D, NULL, _gloffset_TexSubImage2D),
-    NAME_FUNC_OFFSET(14086, glBlendColor, glBlendColor, NULL, _gloffset_BlendColor),
-    NAME_FUNC_OFFSET(14102, glBlendEquation, glBlendEquation, NULL, _gloffset_BlendEquation),
-    NAME_FUNC_OFFSET(14121, glDrawRangeElements, glDrawRangeElements, NULL, _gloffset_DrawRangeElements),
-    NAME_FUNC_OFFSET(14144, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
-    NAME_FUNC_OFFSET(14160, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
-    NAME_FUNC_OFFSET(14176, glColorTableParameterfv, glColorTableParameterfv, NULL, _gloffset_ColorTableParameterfv),
-    NAME_FUNC_OFFSET(14203, glColorTableParameteriv, glColorTableParameteriv, NULL, _gloffset_ColorTableParameteriv),
-    NAME_FUNC_OFFSET(14230, glCopyColorTable, glCopyColorTable, NULL, _gloffset_CopyColorTable),
-    NAME_FUNC_OFFSET(14250, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
-    NAME_FUNC_OFFSET(14269, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
-    NAME_FUNC_OFFSET(14288, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
-    NAME_FUNC_OFFSET(14318, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
-    NAME_FUNC_OFFSET(14348, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
-    NAME_FUNC_OFFSET(14378, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
-    NAME_FUNC_OFFSET(14408, glColorSubTable, glColorSubTable, NULL, _gloffset_ColorSubTable),
-    NAME_FUNC_OFFSET(14427, glCopyColorSubTable, glCopyColorSubTable, NULL, _gloffset_CopyColorSubTable),
-    NAME_FUNC_OFFSET(14450, glConvolutionFilter1D, glConvolutionFilter1D, NULL, _gloffset_ConvolutionFilter1D),
-    NAME_FUNC_OFFSET(14475, glConvolutionFilter2D, glConvolutionFilter2D, NULL, _gloffset_ConvolutionFilter2D),
-    NAME_FUNC_OFFSET(14500, glConvolutionParameterf, glConvolutionParameterf, NULL, _gloffset_ConvolutionParameterf),
-    NAME_FUNC_OFFSET(14527, glConvolutionParameterfv, glConvolutionParameterfv, NULL, _gloffset_ConvolutionParameterfv),
-    NAME_FUNC_OFFSET(14555, glConvolutionParameteri, glConvolutionParameteri, NULL, _gloffset_ConvolutionParameteri),
-    NAME_FUNC_OFFSET(14582, glConvolutionParameteriv, glConvolutionParameteriv, NULL, _gloffset_ConvolutionParameteriv),
-    NAME_FUNC_OFFSET(14610, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, _gloffset_CopyConvolutionFilter1D),
-    NAME_FUNC_OFFSET(14639, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, _gloffset_CopyConvolutionFilter2D),
-    NAME_FUNC_OFFSET(14668, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, _gloffset_GetConvolutionFilter),
-    NAME_FUNC_OFFSET(14694, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, _gloffset_GetConvolutionParameterfv),
-    NAME_FUNC_OFFSET(14725, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, _gloffset_GetConvolutionParameteriv),
-    NAME_FUNC_OFFSET(14756, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, _gloffset_GetSeparableFilter),
-    NAME_FUNC_OFFSET(14780, glSeparableFilter2D, glSeparableFilter2D, NULL, _gloffset_SeparableFilter2D),
-    NAME_FUNC_OFFSET(14803, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, _gloffset_GetHistogram),
-    NAME_FUNC_OFFSET(14821, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, _gloffset_GetHistogramParameterfv),
-    NAME_FUNC_OFFSET(14850, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, _gloffset_GetHistogramParameteriv),
-    NAME_FUNC_OFFSET(14879, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, _gloffset_GetMinmax),
-    NAME_FUNC_OFFSET(14894, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, _gloffset_GetMinmaxParameterfv),
-    NAME_FUNC_OFFSET(14920, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, _gloffset_GetMinmaxParameteriv),
-    NAME_FUNC_OFFSET(14946, glHistogram, glHistogram, NULL, _gloffset_Histogram),
-    NAME_FUNC_OFFSET(14961, glMinmax, glMinmax, NULL, _gloffset_Minmax),
-    NAME_FUNC_OFFSET(14973, glResetHistogram, glResetHistogram, NULL, _gloffset_ResetHistogram),
-    NAME_FUNC_OFFSET(14993, glResetMinmax, glResetMinmax, NULL, _gloffset_ResetMinmax),
-    NAME_FUNC_OFFSET(15010, glTexImage3D, glTexImage3D, NULL, _gloffset_TexImage3D),
-    NAME_FUNC_OFFSET(15026, glTexSubImage3D, glTexSubImage3D, NULL, _gloffset_TexSubImage3D),
-    NAME_FUNC_OFFSET(15045, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, _gloffset_CopyTexSubImage3D),
-    NAME_FUNC_OFFSET(15068, glActiveTextureARB, glActiveTextureARB, NULL, _gloffset_ActiveTextureARB),
-    NAME_FUNC_OFFSET(15084, glClientActiveTextureARB, glClientActiveTextureARB, NULL, _gloffset_ClientActiveTextureARB),
-    NAME_FUNC_OFFSET(15106, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL, _gloffset_MultiTexCoord1dARB),
-    NAME_FUNC_OFFSET(15124, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL, _gloffset_MultiTexCoord1dvARB),
-    NAME_FUNC_OFFSET(15143, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, _gloffset_MultiTexCoord1fARB),
-    NAME_FUNC_OFFSET(15161, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, _gloffset_MultiTexCoord1fvARB),
-    NAME_FUNC_OFFSET(15180, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL, _gloffset_MultiTexCoord1iARB),
-    NAME_FUNC_OFFSET(15198, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL, _gloffset_MultiTexCoord1ivARB),
-    NAME_FUNC_OFFSET(15217, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL, _gloffset_MultiTexCoord1sARB),
-    NAME_FUNC_OFFSET(15235, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL, _gloffset_MultiTexCoord1svARB),
-    NAME_FUNC_OFFSET(15254, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL, _gloffset_MultiTexCoord2dARB),
-    NAME_FUNC_OFFSET(15272, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL, _gloffset_MultiTexCoord2dvARB),
-    NAME_FUNC_OFFSET(15291, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, _gloffset_MultiTexCoord2fARB),
-    NAME_FUNC_OFFSET(15309, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, _gloffset_MultiTexCoord2fvARB),
-    NAME_FUNC_OFFSET(15328, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL, _gloffset_MultiTexCoord2iARB),
-    NAME_FUNC_OFFSET(15346, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL, _gloffset_MultiTexCoord2ivARB),
-    NAME_FUNC_OFFSET(15365, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL, _gloffset_MultiTexCoord2sARB),
-    NAME_FUNC_OFFSET(15383, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL, _gloffset_MultiTexCoord2svARB),
-    NAME_FUNC_OFFSET(15402, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL, _gloffset_MultiTexCoord3dARB),
-    NAME_FUNC_OFFSET(15420, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL, _gloffset_MultiTexCoord3dvARB),
-    NAME_FUNC_OFFSET(15439, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, _gloffset_MultiTexCoord3fARB),
-    NAME_FUNC_OFFSET(15457, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, _gloffset_MultiTexCoord3fvARB),
-    NAME_FUNC_OFFSET(15476, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL, _gloffset_MultiTexCoord3iARB),
-    NAME_FUNC_OFFSET(15494, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL, _gloffset_MultiTexCoord3ivARB),
-    NAME_FUNC_OFFSET(15513, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL, _gloffset_MultiTexCoord3sARB),
-    NAME_FUNC_OFFSET(15531, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL, _gloffset_MultiTexCoord3svARB),
-    NAME_FUNC_OFFSET(15550, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL, _gloffset_MultiTexCoord4dARB),
-    NAME_FUNC_OFFSET(15568, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL, _gloffset_MultiTexCoord4dvARB),
-    NAME_FUNC_OFFSET(15587, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, _gloffset_MultiTexCoord4fARB),
-    NAME_FUNC_OFFSET(15605, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, _gloffset_MultiTexCoord4fvARB),
-    NAME_FUNC_OFFSET(15624, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL, _gloffset_MultiTexCoord4iARB),
-    NAME_FUNC_OFFSET(15642, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL, _gloffset_MultiTexCoord4ivARB),
-    NAME_FUNC_OFFSET(15661, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL, _gloffset_MultiTexCoord4sARB),
-    NAME_FUNC_OFFSET(15679, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL, _gloffset_MultiTexCoord4svARB),
-    NAME_FUNC_OFFSET(15698, glStencilOpSeparate, glStencilOpSeparate, NULL, _gloffset_StencilOpSeparate),
-    NAME_FUNC_OFFSET(15721, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, _gloffset_LoadTransposeMatrixdARB),
-    NAME_FUNC_OFFSET(15744, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, _gloffset_LoadTransposeMatrixfARB),
-    NAME_FUNC_OFFSET(15767, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, _gloffset_MultTransposeMatrixdARB),
-    NAME_FUNC_OFFSET(15790, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB, NULL, _gloffset_MultTransposeMatrixfARB),
-    NAME_FUNC_OFFSET(15813, glSampleCoverageARB, glSampleCoverageARB, NULL, _gloffset_SampleCoverageARB),
-    NAME_FUNC_OFFSET(15830, glCompressedTexImage1DARB, glCompressedTexImage1DARB, NULL, _gloffset_CompressedTexImage1DARB),
-    NAME_FUNC_OFFSET(15853, glCompressedTexImage2DARB, glCompressedTexImage2DARB, NULL, _gloffset_CompressedTexImage2DARB),
-    NAME_FUNC_OFFSET(15876, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, _gloffset_CompressedTexImage3DARB),
-    NAME_FUNC_OFFSET(15899, glCompressedTexSubImage1DARB, glCompressedTexSubImage1DARB, NULL, _gloffset_CompressedTexSubImage1DARB),
-    NAME_FUNC_OFFSET(15925, glCompressedTexSubImage2DARB, glCompressedTexSubImage2DARB, NULL, _gloffset_CompressedTexSubImage2DARB),
-    NAME_FUNC_OFFSET(15951, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, _gloffset_CompressedTexSubImage3DARB),
-    NAME_FUNC_OFFSET(15977, glGetCompressedTexImageARB, glGetCompressedTexImageARB, NULL, _gloffset_GetCompressedTexImageARB),
-    NAME_FUNC_OFFSET(16001, glDisableVertexAttribArrayARB, glDisableVertexAttribArrayARB, NULL, _gloffset_DisableVertexAttribArrayARB),
-    NAME_FUNC_OFFSET(16028, glEnableVertexAttribArrayARB, glEnableVertexAttribArrayARB, NULL, _gloffset_EnableVertexAttribArrayARB),
-    NAME_FUNC_OFFSET(16054, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL, _gloffset_GetVertexAttribdvARB),
-    NAME_FUNC_OFFSET(16074, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL, _gloffset_GetVertexAttribfvARB),
-    NAME_FUNC_OFFSET(16094, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL, _gloffset_GetVertexAttribivARB),
-    NAME_FUNC_OFFSET(16114, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, _gloffset_ProgramEnvParameter4dARB),
-    NAME_FUNC_OFFSET(16137, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, _gloffset_ProgramEnvParameter4dvARB),
-    NAME_FUNC_OFFSET(16161, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, _gloffset_ProgramEnvParameter4fARB),
-    NAME_FUNC_OFFSET(16184, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, _gloffset_ProgramEnvParameter4fvARB),
-    NAME_FUNC_OFFSET(16208, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, _gloffset_VertexAttrib1dARB),
-    NAME_FUNC_OFFSET(16225, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL, _gloffset_VertexAttrib1dvARB),
-    NAME_FUNC_OFFSET(16243, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, _gloffset_VertexAttrib1fARB),
-    NAME_FUNC_OFFSET(16260, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, _gloffset_VertexAttrib1fvARB),
-    NAME_FUNC_OFFSET(16278, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, _gloffset_VertexAttrib1sARB),
-    NAME_FUNC_OFFSET(16295, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL, _gloffset_VertexAttrib1svARB),
-    NAME_FUNC_OFFSET(16313, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, _gloffset_VertexAttrib2dARB),
-    NAME_FUNC_OFFSET(16330, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL, _gloffset_VertexAttrib2dvARB),
-    NAME_FUNC_OFFSET(16348, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, _gloffset_VertexAttrib2fARB),
-    NAME_FUNC_OFFSET(16365, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, _gloffset_VertexAttrib2fvARB),
-    NAME_FUNC_OFFSET(16383, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, _gloffset_VertexAttrib2sARB),
-    NAME_FUNC_OFFSET(16400, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL, _gloffset_VertexAttrib2svARB),
-    NAME_FUNC_OFFSET(16418, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, _gloffset_VertexAttrib3dARB),
-    NAME_FUNC_OFFSET(16435, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL, _gloffset_VertexAttrib3dvARB),
-    NAME_FUNC_OFFSET(16453, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, _gloffset_VertexAttrib3fARB),
-    NAME_FUNC_OFFSET(16470, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, _gloffset_VertexAttrib3fvARB),
-    NAME_FUNC_OFFSET(16488, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, _gloffset_VertexAttrib3sARB),
-    NAME_FUNC_OFFSET(16505, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL, _gloffset_VertexAttrib3svARB),
-    NAME_FUNC_OFFSET(16523, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL, _gloffset_VertexAttrib4NbvARB),
-    NAME_FUNC_OFFSET(16542, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL, _gloffset_VertexAttrib4NivARB),
-    NAME_FUNC_OFFSET(16561, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL, _gloffset_VertexAttrib4NsvARB),
-    NAME_FUNC_OFFSET(16580, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL, _gloffset_VertexAttrib4NubARB),
-    NAME_FUNC_OFFSET(16599, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, _gloffset_VertexAttrib4NubvARB),
-    NAME_FUNC_OFFSET(16619, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, _gloffset_VertexAttrib4NuivARB),
-    NAME_FUNC_OFFSET(16639, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, _gloffset_VertexAttrib4NusvARB),
-    NAME_FUNC_OFFSET(16659, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, _gloffset_VertexAttrib4bvARB),
-    NAME_FUNC_OFFSET(16677, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, _gloffset_VertexAttrib4dARB),
-    NAME_FUNC_OFFSET(16694, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, _gloffset_VertexAttrib4dvARB),
-    NAME_FUNC_OFFSET(16712, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, _gloffset_VertexAttrib4fARB),
-    NAME_FUNC_OFFSET(16729, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, _gloffset_VertexAttrib4fvARB),
-    NAME_FUNC_OFFSET(16747, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, _gloffset_VertexAttrib4ivARB),
-    NAME_FUNC_OFFSET(16765, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, _gloffset_VertexAttrib4sARB),
-    NAME_FUNC_OFFSET(16782, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, _gloffset_VertexAttrib4svARB),
-    NAME_FUNC_OFFSET(16800, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, _gloffset_VertexAttrib4ubvARB),
-    NAME_FUNC_OFFSET(16819, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, _gloffset_VertexAttrib4uivARB),
-    NAME_FUNC_OFFSET(16838, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, _gloffset_VertexAttrib4usvARB),
-    NAME_FUNC_OFFSET(16857, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, _gloffset_VertexAttribPointerARB),
-    NAME_FUNC_OFFSET(16879, glBindBufferARB, glBindBufferARB, NULL, _gloffset_BindBufferARB),
-    NAME_FUNC_OFFSET(16892, glBufferDataARB, glBufferDataARB, NULL, _gloffset_BufferDataARB),
-    NAME_FUNC_OFFSET(16905, glBufferSubDataARB, glBufferSubDataARB, NULL, _gloffset_BufferSubDataARB),
-    NAME_FUNC_OFFSET(16921, glDeleteBuffersARB, glDeleteBuffersARB, NULL, _gloffset_DeleteBuffersARB),
-    NAME_FUNC_OFFSET(16937, glGenBuffersARB, glGenBuffersARB, NULL, _gloffset_GenBuffersARB),
-    NAME_FUNC_OFFSET(16950, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, _gloffset_GetBufferParameterivARB),
-    NAME_FUNC_OFFSET(16973, glGetBufferPointervARB, glGetBufferPointervARB, NULL, _gloffset_GetBufferPointervARB),
-    NAME_FUNC_OFFSET(16993, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, _gloffset_GetBufferSubDataARB),
-    NAME_FUNC_OFFSET(17012, glIsBufferARB, glIsBufferARB, NULL, _gloffset_IsBufferARB),
-    NAME_FUNC_OFFSET(17023, glMapBufferARB, glMapBufferARB, NULL, _gloffset_MapBufferARB),
-    NAME_FUNC_OFFSET(17035, glUnmapBufferARB, glUnmapBufferARB, NULL, _gloffset_UnmapBufferARB),
-    NAME_FUNC_OFFSET(17049, glBeginQueryARB, glBeginQueryARB, NULL, _gloffset_BeginQueryARB),
-    NAME_FUNC_OFFSET(17062, glDeleteQueriesARB, glDeleteQueriesARB, NULL, _gloffset_DeleteQueriesARB),
-    NAME_FUNC_OFFSET(17078, glEndQueryARB, glEndQueryARB, NULL, _gloffset_EndQueryARB),
-    NAME_FUNC_OFFSET(17089, glGenQueriesARB, glGenQueriesARB, NULL, _gloffset_GenQueriesARB),
-    NAME_FUNC_OFFSET(17102, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, _gloffset_GetQueryObjectivARB),
-    NAME_FUNC_OFFSET(17121, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, _gloffset_GetQueryObjectuivARB),
-    NAME_FUNC_OFFSET(17141, glGetQueryivARB, glGetQueryivARB, NULL, _gloffset_GetQueryivARB),
-    NAME_FUNC_OFFSET(17154, glIsQueryARB, glIsQueryARB, NULL, _gloffset_IsQueryARB),
-    NAME_FUNC_OFFSET(17164, glCompileShaderARB, glCompileShaderARB, NULL, _gloffset_CompileShaderARB),
-    NAME_FUNC_OFFSET(17180, glGetActiveUniformARB, glGetActiveUniformARB, NULL, _gloffset_GetActiveUniformARB),
-    NAME_FUNC_OFFSET(17199, glGetShaderSourceARB, glGetShaderSourceARB, NULL, _gloffset_GetShaderSourceARB),
-    NAME_FUNC_OFFSET(17217, glGetUniformLocationARB, glGetUniformLocationARB, NULL, _gloffset_GetUniformLocationARB),
-    NAME_FUNC_OFFSET(17238, glGetUniformfvARB, glGetUniformfvARB, NULL, _gloffset_GetUniformfvARB),
-    NAME_FUNC_OFFSET(17253, glGetUniformivARB, glGetUniformivARB, NULL, _gloffset_GetUniformivARB),
-    NAME_FUNC_OFFSET(17268, glLinkProgramARB, glLinkProgramARB, NULL, _gloffset_LinkProgramARB),
-    NAME_FUNC_OFFSET(17282, glShaderSourceARB, glShaderSourceARB, NULL, _gloffset_ShaderSourceARB),
-    NAME_FUNC_OFFSET(17297, glUniform1fARB, glUniform1fARB, NULL, _gloffset_Uniform1fARB),
-    NAME_FUNC_OFFSET(17309, glUniform1fvARB, glUniform1fvARB, NULL, _gloffset_Uniform1fvARB),
-    NAME_FUNC_OFFSET(17322, glUniform1iARB, glUniform1iARB, NULL, _gloffset_Uniform1iARB),
-    NAME_FUNC_OFFSET(17334, glUniform1ivARB, glUniform1ivARB, NULL, _gloffset_Uniform1ivARB),
-    NAME_FUNC_OFFSET(17347, glUniform2fARB, glUniform2fARB, NULL, _gloffset_Uniform2fARB),
-    NAME_FUNC_OFFSET(17359, glUniform2fvARB, glUniform2fvARB, NULL, _gloffset_Uniform2fvARB),
-    NAME_FUNC_OFFSET(17372, glUniform2iARB, glUniform2iARB, NULL, _gloffset_Uniform2iARB),
-    NAME_FUNC_OFFSET(17384, glUniform2ivARB, glUniform2ivARB, NULL, _gloffset_Uniform2ivARB),
-    NAME_FUNC_OFFSET(17397, glUniform3fARB, glUniform3fARB, NULL, _gloffset_Uniform3fARB),
-    NAME_FUNC_OFFSET(17409, glUniform3fvARB, glUniform3fvARB, NULL, _gloffset_Uniform3fvARB),
-    NAME_FUNC_OFFSET(17422, glUniform3iARB, glUniform3iARB, NULL, _gloffset_Uniform3iARB),
-    NAME_FUNC_OFFSET(17434, glUniform3ivARB, glUniform3ivARB, NULL, _gloffset_Uniform3ivARB),
-    NAME_FUNC_OFFSET(17447, glUniform4fARB, glUniform4fARB, NULL, _gloffset_Uniform4fARB),
-    NAME_FUNC_OFFSET(17459, glUniform4fvARB, glUniform4fvARB, NULL, _gloffset_Uniform4fvARB),
-    NAME_FUNC_OFFSET(17472, glUniform4iARB, glUniform4iARB, NULL, _gloffset_Uniform4iARB),
-    NAME_FUNC_OFFSET(17484, glUniform4ivARB, glUniform4ivARB, NULL, _gloffset_Uniform4ivARB),
-    NAME_FUNC_OFFSET(17497, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, _gloffset_UniformMatrix2fvARB),
-    NAME_FUNC_OFFSET(17516, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, _gloffset_UniformMatrix3fvARB),
-    NAME_FUNC_OFFSET(17535, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, _gloffset_UniformMatrix4fvARB),
-    NAME_FUNC_OFFSET(17554, glUseProgramObjectARB, glUseProgramObjectARB, NULL, _gloffset_UseProgramObjectARB),
-    NAME_FUNC_OFFSET(17567, glValidateProgramARB, glValidateProgramARB, NULL, _gloffset_ValidateProgramARB),
-    NAME_FUNC_OFFSET(17585, glBindAttribLocationARB, glBindAttribLocationARB, NULL, _gloffset_BindAttribLocationARB),
-    NAME_FUNC_OFFSET(17606, glGetActiveAttribARB, glGetActiveAttribARB, NULL, _gloffset_GetActiveAttribARB),
-    NAME_FUNC_OFFSET(17624, glGetAttribLocationARB, glGetAttribLocationARB, NULL, _gloffset_GetAttribLocationARB),
-    NAME_FUNC_OFFSET(17644, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
-    NAME_FUNC_OFFSET(17658, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
-    NAME_FUNC_OFFSET(17675, gl_dispatch_stub_574, gl_dispatch_stub_574, NULL, _gloffset_SampleMaskSGIS),
-    NAME_FUNC_OFFSET(17691, gl_dispatch_stub_575, gl_dispatch_stub_575, NULL, _gloffset_SamplePatternSGIS),
-    NAME_FUNC_OFFSET(17710, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(17728, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(17749, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(17771, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(17790, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(17812, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(17835, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
-    NAME_FUNC_OFFSET(17854, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
-    NAME_FUNC_OFFSET(17874, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
-    NAME_FUNC_OFFSET(17893, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
-    NAME_FUNC_OFFSET(17913, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
-    NAME_FUNC_OFFSET(17932, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
-    NAME_FUNC_OFFSET(17952, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
-    NAME_FUNC_OFFSET(17971, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
-    NAME_FUNC_OFFSET(17991, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
-    NAME_FUNC_OFFSET(18010, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
-    NAME_FUNC_OFFSET(18030, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
-    NAME_FUNC_OFFSET(18050, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
-    NAME_FUNC_OFFSET(18071, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
-    NAME_FUNC_OFFSET(18091, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
-    NAME_FUNC_OFFSET(18112, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
-    NAME_FUNC_OFFSET(18132, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
-    NAME_FUNC_OFFSET(18153, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
-    NAME_FUNC_OFFSET(18177, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
-    NAME_FUNC_OFFSET(18195, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
-    NAME_FUNC_OFFSET(18215, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
-    NAME_FUNC_OFFSET(18233, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
-    NAME_FUNC_OFFSET(18245, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
-    NAME_FUNC_OFFSET(18258, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
-    NAME_FUNC_OFFSET(18270, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
-    NAME_FUNC_OFFSET(18283, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
-    NAME_FUNC_OFFSET(18303, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
-    NAME_FUNC_OFFSET(18327, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
-    NAME_FUNC_OFFSET(18341, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
-    NAME_FUNC_OFFSET(18358, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
-    NAME_FUNC_OFFSET(18373, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
-    NAME_FUNC_OFFSET(18391, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
-    NAME_FUNC_OFFSET(18405, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
-    NAME_FUNC_OFFSET(18422, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
-    NAME_FUNC_OFFSET(18437, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
-    NAME_FUNC_OFFSET(18455, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
-    NAME_FUNC_OFFSET(18469, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
-    NAME_FUNC_OFFSET(18486, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
-    NAME_FUNC_OFFSET(18501, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
-    NAME_FUNC_OFFSET(18519, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
-    NAME_FUNC_OFFSET(18533, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
-    NAME_FUNC_OFFSET(18550, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
-    NAME_FUNC_OFFSET(18565, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
-    NAME_FUNC_OFFSET(18583, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
-    NAME_FUNC_OFFSET(18597, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
-    NAME_FUNC_OFFSET(18614, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
-    NAME_FUNC_OFFSET(18629, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
-    NAME_FUNC_OFFSET(18647, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
-    NAME_FUNC_OFFSET(18661, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
-    NAME_FUNC_OFFSET(18678, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
-    NAME_FUNC_OFFSET(18693, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
-    NAME_FUNC_OFFSET(18711, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
-    NAME_FUNC_OFFSET(18725, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
-    NAME_FUNC_OFFSET(18742, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
-    NAME_FUNC_OFFSET(18757, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
-    NAME_FUNC_OFFSET(18775, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
-    NAME_FUNC_OFFSET(18789, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
-    NAME_FUNC_OFFSET(18806, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
-    NAME_FUNC_OFFSET(18821, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
-    NAME_FUNC_OFFSET(18839, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
-    NAME_FUNC_OFFSET(18856, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
-    NAME_FUNC_OFFSET(18876, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
-    NAME_FUNC_OFFSET(18893, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
-    NAME_FUNC_OFFSET(18919, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
-    NAME_FUNC_OFFSET(18948, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
-    NAME_FUNC_OFFSET(18963, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
-    NAME_FUNC_OFFSET(18981, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
-    NAME_FUNC_OFFSET(19000, gl_dispatch_stub_745, gl_dispatch_stub_745, NULL, _gloffset_DeleteVertexArraysAPPLE),
-    NAME_FUNC_OFFSET(19021, gl_dispatch_stub_747, gl_dispatch_stub_747, NULL, _gloffset_IsVertexArrayAPPLE),
-    NAME_FUNC_OFFSET(19037, gl_dispatch_stub_755, gl_dispatch_stub_755, NULL, _gloffset_BlendEquationSeparateEXT),
-    NAME_FUNC_OFFSET(19061, gl_dispatch_stub_755, gl_dispatch_stub_755, NULL, _gloffset_BlendEquationSeparateEXT),
-    NAME_FUNC_OFFSET(19088, glBindFramebufferEXT, glBindFramebufferEXT, NULL, _gloffset_BindFramebufferEXT),
-    NAME_FUNC_OFFSET(19106, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, _gloffset_BindRenderbufferEXT),
-    NAME_FUNC_OFFSET(19125, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, _gloffset_CheckFramebufferStatusEXT),
-    NAME_FUNC_OFFSET(19150, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, _gloffset_DeleteFramebuffersEXT),
-    NAME_FUNC_OFFSET(19171, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, _gloffset_DeleteRenderbuffersEXT),
-    NAME_FUNC_OFFSET(19193, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, _gloffset_FramebufferRenderbufferEXT),
-    NAME_FUNC_OFFSET(19219, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, _gloffset_FramebufferTexture1DEXT),
-    NAME_FUNC_OFFSET(19242, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, _gloffset_FramebufferTexture2DEXT),
-    NAME_FUNC_OFFSET(19265, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, _gloffset_FramebufferTexture3DEXT),
-    NAME_FUNC_OFFSET(19288, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, _gloffset_GenFramebuffersEXT),
-    NAME_FUNC_OFFSET(19306, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, _gloffset_GenRenderbuffersEXT),
-    NAME_FUNC_OFFSET(19325, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, _gloffset_GenerateMipmapEXT),
-    NAME_FUNC_OFFSET(19342, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, _gloffset_GetFramebufferAttachmentParameterivEXT),
-    NAME_FUNC_OFFSET(19380, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, _gloffset_GetRenderbufferParameterivEXT),
-    NAME_FUNC_OFFSET(19409, glIsFramebufferEXT, glIsFramebufferEXT, NULL, _gloffset_IsFramebufferEXT),
-    NAME_FUNC_OFFSET(19425, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, _gloffset_IsRenderbufferEXT),
-    NAME_FUNC_OFFSET(19442, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, _gloffset_RenderbufferStorageEXT),
-    NAME_FUNC_OFFSET(19464, gl_dispatch_stub_773, gl_dispatch_stub_773, NULL, _gloffset_BlitFramebufferEXT),
-    NAME_FUNC_OFFSET(19482, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
+    NAME_FUNC_OFFSET(13609, gl_dispatch_stub_774, gl_dispatch_stub_774, NULL, _gloffset_BufferParameteriAPPLE),
+    NAME_FUNC_OFFSET(13633, gl_dispatch_stub_775, gl_dispatch_stub_775, NULL, _gloffset_FlushMappedBufferRangeAPPLE),
+    NAME_FUNC_OFFSET(13663, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
+    NAME_FUNC_OFFSET(13692, glProvokingVertexEXT, glProvokingVertexEXT, NULL, _gloffset_ProvokingVertexEXT),
+    NAME_FUNC_OFFSET(13713, gl_dispatch_stub_778, gl_dispatch_stub_778, NULL, _gloffset_GetTexParameterPointervAPPLE),
+    NAME_FUNC_OFFSET(13744, gl_dispatch_stub_779, gl_dispatch_stub_779, NULL, _gloffset_TextureRangeAPPLE),
+    NAME_FUNC_OFFSET(13764, gl_dispatch_stub_780, gl_dispatch_stub_780, NULL, _gloffset_StencilFuncSeparateATI),
+    NAME_FUNC_OFFSET(13789, gl_dispatch_stub_781, gl_dispatch_stub_781, NULL, _gloffset_ProgramEnvParameters4fvEXT),
+    NAME_FUNC_OFFSET(13818, gl_dispatch_stub_782, gl_dispatch_stub_782, NULL, _gloffset_ProgramLocalParameters4fvEXT),
+    NAME_FUNC_OFFSET(13849, gl_dispatch_stub_783, gl_dispatch_stub_783, NULL, _gloffset_GetQueryObjecti64vEXT),
+    NAME_FUNC_OFFSET(13873, gl_dispatch_stub_784, gl_dispatch_stub_784, NULL, _gloffset_GetQueryObjectui64vEXT),
+    NAME_FUNC_OFFSET(13898, glArrayElement, glArrayElement, NULL, _gloffset_ArrayElement),
+    NAME_FUNC_OFFSET(13916, glBindTexture, glBindTexture, NULL, _gloffset_BindTexture),
+    NAME_FUNC_OFFSET(13933, glDrawArrays, glDrawArrays, NULL, _gloffset_DrawArrays),
+    NAME_FUNC_OFFSET(13949, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, _gloffset_AreTexturesResident),
+    NAME_FUNC_OFFSET(13974, glCopyTexImage1D, glCopyTexImage1D, NULL, _gloffset_CopyTexImage1D),
+    NAME_FUNC_OFFSET(13994, glCopyTexImage2D, glCopyTexImage2D, NULL, _gloffset_CopyTexImage2D),
+    NAME_FUNC_OFFSET(14014, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, _gloffset_CopyTexSubImage1D),
+    NAME_FUNC_OFFSET(14037, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, _gloffset_CopyTexSubImage2D),
+    NAME_FUNC_OFFSET(14060, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, _gloffset_DeleteTextures),
+    NAME_FUNC_OFFSET(14080, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, _gloffset_GenTextures),
+    NAME_FUNC_OFFSET(14097, glGetPointerv, glGetPointerv, NULL, _gloffset_GetPointerv),
+    NAME_FUNC_OFFSET(14114, glIsTexture, glIsTextureEXT, glIsTextureEXT, _gloffset_IsTexture),
+    NAME_FUNC_OFFSET(14129, glPrioritizeTextures, glPrioritizeTextures, NULL, _gloffset_PrioritizeTextures),
+    NAME_FUNC_OFFSET(14153, glTexSubImage1D, glTexSubImage1D, NULL, _gloffset_TexSubImage1D),
+    NAME_FUNC_OFFSET(14172, glTexSubImage2D, glTexSubImage2D, NULL, _gloffset_TexSubImage2D),
+    NAME_FUNC_OFFSET(14191, glBlendColor, glBlendColor, NULL, _gloffset_BlendColor),
+    NAME_FUNC_OFFSET(14207, glBlendEquation, glBlendEquation, NULL, _gloffset_BlendEquation),
+    NAME_FUNC_OFFSET(14226, glDrawRangeElements, glDrawRangeElements, NULL, _gloffset_DrawRangeElements),
+    NAME_FUNC_OFFSET(14249, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
+    NAME_FUNC_OFFSET(14265, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
+    NAME_FUNC_OFFSET(14281, glColorTableParameterfv, glColorTableParameterfv, NULL, _gloffset_ColorTableParameterfv),
+    NAME_FUNC_OFFSET(14308, glColorTableParameteriv, glColorTableParameteriv, NULL, _gloffset_ColorTableParameteriv),
+    NAME_FUNC_OFFSET(14335, glCopyColorTable, glCopyColorTable, NULL, _gloffset_CopyColorTable),
+    NAME_FUNC_OFFSET(14355, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
+    NAME_FUNC_OFFSET(14374, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
+    NAME_FUNC_OFFSET(14393, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
+    NAME_FUNC_OFFSET(14423, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
+    NAME_FUNC_OFFSET(14453, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
+    NAME_FUNC_OFFSET(14483, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
+    NAME_FUNC_OFFSET(14513, glColorSubTable, glColorSubTable, NULL, _gloffset_ColorSubTable),
+    NAME_FUNC_OFFSET(14532, glCopyColorSubTable, glCopyColorSubTable, NULL, _gloffset_CopyColorSubTable),
+    NAME_FUNC_OFFSET(14555, glConvolutionFilter1D, glConvolutionFilter1D, NULL, _gloffset_ConvolutionFilter1D),
+    NAME_FUNC_OFFSET(14580, glConvolutionFilter2D, glConvolutionFilter2D, NULL, _gloffset_ConvolutionFilter2D),
+    NAME_FUNC_OFFSET(14605, glConvolutionParameterf, glConvolutionParameterf, NULL, _gloffset_ConvolutionParameterf),
+    NAME_FUNC_OFFSET(14632, glConvolutionParameterfv, glConvolutionParameterfv, NULL, _gloffset_ConvolutionParameterfv),
+    NAME_FUNC_OFFSET(14660, glConvolutionParameteri, glConvolutionParameteri, NULL, _gloffset_ConvolutionParameteri),
+    NAME_FUNC_OFFSET(14687, glConvolutionParameteriv, glConvolutionParameteriv, NULL, _gloffset_ConvolutionParameteriv),
+    NAME_FUNC_OFFSET(14715, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, _gloffset_CopyConvolutionFilter1D),
+    NAME_FUNC_OFFSET(14744, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, _gloffset_CopyConvolutionFilter2D),
+    NAME_FUNC_OFFSET(14773, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, _gloffset_GetConvolutionFilter),
+    NAME_FUNC_OFFSET(14799, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, _gloffset_GetConvolutionParameterfv),
+    NAME_FUNC_OFFSET(14830, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, _gloffset_GetConvolutionParameteriv),
+    NAME_FUNC_OFFSET(14861, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, _gloffset_GetSeparableFilter),
+    NAME_FUNC_OFFSET(14885, glSeparableFilter2D, glSeparableFilter2D, NULL, _gloffset_SeparableFilter2D),
+    NAME_FUNC_OFFSET(14908, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, _gloffset_GetHistogram),
+    NAME_FUNC_OFFSET(14926, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, _gloffset_GetHistogramParameterfv),
+    NAME_FUNC_OFFSET(14955, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, _gloffset_GetHistogramParameteriv),
+    NAME_FUNC_OFFSET(14984, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, _gloffset_GetMinmax),
+    NAME_FUNC_OFFSET(14999, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, _gloffset_GetMinmaxParameterfv),
+    NAME_FUNC_OFFSET(15025, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, _gloffset_GetMinmaxParameteriv),
+    NAME_FUNC_OFFSET(15051, glHistogram, glHistogram, NULL, _gloffset_Histogram),
+    NAME_FUNC_OFFSET(15066, glMinmax, glMinmax, NULL, _gloffset_Minmax),
+    NAME_FUNC_OFFSET(15078, glResetHistogram, glResetHistogram, NULL, _gloffset_ResetHistogram),
+    NAME_FUNC_OFFSET(15098, glResetMinmax, glResetMinmax, NULL, _gloffset_ResetMinmax),
+    NAME_FUNC_OFFSET(15115, glTexImage3D, glTexImage3D, NULL, _gloffset_TexImage3D),
+    NAME_FUNC_OFFSET(15131, glTexSubImage3D, glTexSubImage3D, NULL, _gloffset_TexSubImage3D),
+    NAME_FUNC_OFFSET(15150, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, _gloffset_CopyTexSubImage3D),
+    NAME_FUNC_OFFSET(15173, glActiveTextureARB, glActiveTextureARB, NULL, _gloffset_ActiveTextureARB),
+    NAME_FUNC_OFFSET(15189, glClientActiveTextureARB, glClientActiveTextureARB, NULL, _gloffset_ClientActiveTextureARB),
+    NAME_FUNC_OFFSET(15211, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL, _gloffset_MultiTexCoord1dARB),
+    NAME_FUNC_OFFSET(15229, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL, _gloffset_MultiTexCoord1dvARB),
+    NAME_FUNC_OFFSET(15248, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, _gloffset_MultiTexCoord1fARB),
+    NAME_FUNC_OFFSET(15266, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, _gloffset_MultiTexCoord1fvARB),
+    NAME_FUNC_OFFSET(15285, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL, _gloffset_MultiTexCoord1iARB),
+    NAME_FUNC_OFFSET(15303, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL, _gloffset_MultiTexCoord1ivARB),
+    NAME_FUNC_OFFSET(15322, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL, _gloffset_MultiTexCoord1sARB),
+    NAME_FUNC_OFFSET(15340, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL, _gloffset_MultiTexCoord1svARB),
+    NAME_FUNC_OFFSET(15359, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL, _gloffset_MultiTexCoord2dARB),
+    NAME_FUNC_OFFSET(15377, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL, _gloffset_MultiTexCoord2dvARB),
+    NAME_FUNC_OFFSET(15396, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, _gloffset_MultiTexCoord2fARB),
+    NAME_FUNC_OFFSET(15414, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, _gloffset_MultiTexCoord2fvARB),
+    NAME_FUNC_OFFSET(15433, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL, _gloffset_MultiTexCoord2iARB),
+    NAME_FUNC_OFFSET(15451, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL, _gloffset_MultiTexCoord2ivARB),
+    NAME_FUNC_OFFSET(15470, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL, _gloffset_MultiTexCoord2sARB),
+    NAME_FUNC_OFFSET(15488, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL, _gloffset_MultiTexCoord2svARB),
+    NAME_FUNC_OFFSET(15507, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL, _gloffset_MultiTexCoord3dARB),
+    NAME_FUNC_OFFSET(15525, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL, _gloffset_MultiTexCoord3dvARB),
+    NAME_FUNC_OFFSET(15544, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, _gloffset_MultiTexCoord3fARB),
+    NAME_FUNC_OFFSET(15562, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, _gloffset_MultiTexCoord3fvARB),
+    NAME_FUNC_OFFSET(15581, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL, _gloffset_MultiTexCoord3iARB),
+    NAME_FUNC_OFFSET(15599, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL, _gloffset_MultiTexCoord3ivARB),
+    NAME_FUNC_OFFSET(15618, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL, _gloffset_MultiTexCoord3sARB),
+    NAME_FUNC_OFFSET(15636, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL, _gloffset_MultiTexCoord3svARB),
+    NAME_FUNC_OFFSET(15655, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL, _gloffset_MultiTexCoord4dARB),
+    NAME_FUNC_OFFSET(15673, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL, _gloffset_MultiTexCoord4dvARB),
+    NAME_FUNC_OFFSET(15692, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, _gloffset_MultiTexCoord4fARB),
+    NAME_FUNC_OFFSET(15710, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, _gloffset_MultiTexCoord4fvARB),
+    NAME_FUNC_OFFSET(15729, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL, _gloffset_MultiTexCoord4iARB),
+    NAME_FUNC_OFFSET(15747, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL, _gloffset_MultiTexCoord4ivARB),
+    NAME_FUNC_OFFSET(15766, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL, _gloffset_MultiTexCoord4sARB),
+    NAME_FUNC_OFFSET(15784, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL, _gloffset_MultiTexCoord4svARB),
+    NAME_FUNC_OFFSET(15803, glStencilOpSeparate, glStencilOpSeparate, NULL, _gloffset_StencilOpSeparate),
+    NAME_FUNC_OFFSET(15826, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, _gloffset_LoadTransposeMatrixdARB),
+    NAME_FUNC_OFFSET(15849, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, _gloffset_LoadTransposeMatrixfARB),
+    NAME_FUNC_OFFSET(15872, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, _gloffset_MultTransposeMatrixdARB),
+    NAME_FUNC_OFFSET(15895, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB, NULL, _gloffset_MultTransposeMatrixfARB),
+    NAME_FUNC_OFFSET(15918, glSampleCoverageARB, glSampleCoverageARB, NULL, _gloffset_SampleCoverageARB),
+    NAME_FUNC_OFFSET(15935, glCompressedTexImage1DARB, glCompressedTexImage1DARB, NULL, _gloffset_CompressedTexImage1DARB),
+    NAME_FUNC_OFFSET(15958, glCompressedTexImage2DARB, glCompressedTexImage2DARB, NULL, _gloffset_CompressedTexImage2DARB),
+    NAME_FUNC_OFFSET(15981, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, _gloffset_CompressedTexImage3DARB),
+    NAME_FUNC_OFFSET(16004, glCompressedTexSubImage1DARB, glCompressedTexSubImage1DARB, NULL, _gloffset_CompressedTexSubImage1DARB),
+    NAME_FUNC_OFFSET(16030, glCompressedTexSubImage2DARB, glCompressedTexSubImage2DARB, NULL, _gloffset_CompressedTexSubImage2DARB),
+    NAME_FUNC_OFFSET(16056, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, _gloffset_CompressedTexSubImage3DARB),
+    NAME_FUNC_OFFSET(16082, glGetCompressedTexImageARB, glGetCompressedTexImageARB, NULL, _gloffset_GetCompressedTexImageARB),
+    NAME_FUNC_OFFSET(16106, glDisableVertexAttribArrayARB, glDisableVertexAttribArrayARB, NULL, _gloffset_DisableVertexAttribArrayARB),
+    NAME_FUNC_OFFSET(16133, glEnableVertexAttribArrayARB, glEnableVertexAttribArrayARB, NULL, _gloffset_EnableVertexAttribArrayARB),
+    NAME_FUNC_OFFSET(16159, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL, _gloffset_GetVertexAttribdvARB),
+    NAME_FUNC_OFFSET(16179, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL, _gloffset_GetVertexAttribfvARB),
+    NAME_FUNC_OFFSET(16199, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL, _gloffset_GetVertexAttribivARB),
+    NAME_FUNC_OFFSET(16219, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, _gloffset_ProgramEnvParameter4dARB),
+    NAME_FUNC_OFFSET(16242, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, _gloffset_ProgramEnvParameter4dvARB),
+    NAME_FUNC_OFFSET(16266, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, _gloffset_ProgramEnvParameter4fARB),
+    NAME_FUNC_OFFSET(16289, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, _gloffset_ProgramEnvParameter4fvARB),
+    NAME_FUNC_OFFSET(16313, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, _gloffset_VertexAttrib1dARB),
+    NAME_FUNC_OFFSET(16330, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL, _gloffset_VertexAttrib1dvARB),
+    NAME_FUNC_OFFSET(16348, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, _gloffset_VertexAttrib1fARB),
+    NAME_FUNC_OFFSET(16365, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, _gloffset_VertexAttrib1fvARB),
+    NAME_FUNC_OFFSET(16383, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, _gloffset_VertexAttrib1sARB),
+    NAME_FUNC_OFFSET(16400, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL, _gloffset_VertexAttrib1svARB),
+    NAME_FUNC_OFFSET(16418, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, _gloffset_VertexAttrib2dARB),
+    NAME_FUNC_OFFSET(16435, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL, _gloffset_VertexAttrib2dvARB),
+    NAME_FUNC_OFFSET(16453, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, _gloffset_VertexAttrib2fARB),
+    NAME_FUNC_OFFSET(16470, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, _gloffset_VertexAttrib2fvARB),
+    NAME_FUNC_OFFSET(16488, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, _gloffset_VertexAttrib2sARB),
+    NAME_FUNC_OFFSET(16505, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL, _gloffset_VertexAttrib2svARB),
+    NAME_FUNC_OFFSET(16523, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, _gloffset_VertexAttrib3dARB),
+    NAME_FUNC_OFFSET(16540, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL, _gloffset_VertexAttrib3dvARB),
+    NAME_FUNC_OFFSET(16558, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, _gloffset_VertexAttrib3fARB),
+    NAME_FUNC_OFFSET(16575, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, _gloffset_VertexAttrib3fvARB),
+    NAME_FUNC_OFFSET(16593, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, _gloffset_VertexAttrib3sARB),
+    NAME_FUNC_OFFSET(16610, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL, _gloffset_VertexAttrib3svARB),
+    NAME_FUNC_OFFSET(16628, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL, _gloffset_VertexAttrib4NbvARB),
+    NAME_FUNC_OFFSET(16647, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL, _gloffset_VertexAttrib4NivARB),
+    NAME_FUNC_OFFSET(16666, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL, _gloffset_VertexAttrib4NsvARB),
+    NAME_FUNC_OFFSET(16685, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL, _gloffset_VertexAttrib4NubARB),
+    NAME_FUNC_OFFSET(16704, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, _gloffset_VertexAttrib4NubvARB),
+    NAME_FUNC_OFFSET(16724, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, _gloffset_VertexAttrib4NuivARB),
+    NAME_FUNC_OFFSET(16744, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, _gloffset_VertexAttrib4NusvARB),
+    NAME_FUNC_OFFSET(16764, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, _gloffset_VertexAttrib4bvARB),
+    NAME_FUNC_OFFSET(16782, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, _gloffset_VertexAttrib4dARB),
+    NAME_FUNC_OFFSET(16799, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, _gloffset_VertexAttrib4dvARB),
+    NAME_FUNC_OFFSET(16817, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, _gloffset_VertexAttrib4fARB),
+    NAME_FUNC_OFFSET(16834, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, _gloffset_VertexAttrib4fvARB),
+    NAME_FUNC_OFFSET(16852, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, _gloffset_VertexAttrib4ivARB),
+    NAME_FUNC_OFFSET(16870, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, _gloffset_VertexAttrib4sARB),
+    NAME_FUNC_OFFSET(16887, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, _gloffset_VertexAttrib4svARB),
+    NAME_FUNC_OFFSET(16905, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, _gloffset_VertexAttrib4ubvARB),
+    NAME_FUNC_OFFSET(16924, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, _gloffset_VertexAttrib4uivARB),
+    NAME_FUNC_OFFSET(16943, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, _gloffset_VertexAttrib4usvARB),
+    NAME_FUNC_OFFSET(16962, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, _gloffset_VertexAttribPointerARB),
+    NAME_FUNC_OFFSET(16984, glBindBufferARB, glBindBufferARB, NULL, _gloffset_BindBufferARB),
+    NAME_FUNC_OFFSET(16997, glBufferDataARB, glBufferDataARB, NULL, _gloffset_BufferDataARB),
+    NAME_FUNC_OFFSET(17010, glBufferSubDataARB, glBufferSubDataARB, NULL, _gloffset_BufferSubDataARB),
+    NAME_FUNC_OFFSET(17026, glDeleteBuffersARB, glDeleteBuffersARB, NULL, _gloffset_DeleteBuffersARB),
+    NAME_FUNC_OFFSET(17042, glGenBuffersARB, glGenBuffersARB, NULL, _gloffset_GenBuffersARB),
+    NAME_FUNC_OFFSET(17055, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, _gloffset_GetBufferParameterivARB),
+    NAME_FUNC_OFFSET(17078, glGetBufferPointervARB, glGetBufferPointervARB, NULL, _gloffset_GetBufferPointervARB),
+    NAME_FUNC_OFFSET(17098, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, _gloffset_GetBufferSubDataARB),
+    NAME_FUNC_OFFSET(17117, glIsBufferARB, glIsBufferARB, NULL, _gloffset_IsBufferARB),
+    NAME_FUNC_OFFSET(17128, glMapBufferARB, glMapBufferARB, NULL, _gloffset_MapBufferARB),
+    NAME_FUNC_OFFSET(17140, glUnmapBufferARB, glUnmapBufferARB, NULL, _gloffset_UnmapBufferARB),
+    NAME_FUNC_OFFSET(17154, glBeginQueryARB, glBeginQueryARB, NULL, _gloffset_BeginQueryARB),
+    NAME_FUNC_OFFSET(17167, glDeleteQueriesARB, glDeleteQueriesARB, NULL, _gloffset_DeleteQueriesARB),
+    NAME_FUNC_OFFSET(17183, glEndQueryARB, glEndQueryARB, NULL, _gloffset_EndQueryARB),
+    NAME_FUNC_OFFSET(17194, glGenQueriesARB, glGenQueriesARB, NULL, _gloffset_GenQueriesARB),
+    NAME_FUNC_OFFSET(17207, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, _gloffset_GetQueryObjectivARB),
+    NAME_FUNC_OFFSET(17226, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, _gloffset_GetQueryObjectuivARB),
+    NAME_FUNC_OFFSET(17246, glGetQueryivARB, glGetQueryivARB, NULL, _gloffset_GetQueryivARB),
+    NAME_FUNC_OFFSET(17259, glIsQueryARB, glIsQueryARB, NULL, _gloffset_IsQueryARB),
+    NAME_FUNC_OFFSET(17269, glCompileShaderARB, glCompileShaderARB, NULL, _gloffset_CompileShaderARB),
+    NAME_FUNC_OFFSET(17285, glGetActiveUniformARB, glGetActiveUniformARB, NULL, _gloffset_GetActiveUniformARB),
+    NAME_FUNC_OFFSET(17304, glGetShaderSourceARB, glGetShaderSourceARB, NULL, _gloffset_GetShaderSourceARB),
+    NAME_FUNC_OFFSET(17322, glGetUniformLocationARB, glGetUniformLocationARB, NULL, _gloffset_GetUniformLocationARB),
+    NAME_FUNC_OFFSET(17343, glGetUniformfvARB, glGetUniformfvARB, NULL, _gloffset_GetUniformfvARB),
+    NAME_FUNC_OFFSET(17358, glGetUniformivARB, glGetUniformivARB, NULL, _gloffset_GetUniformivARB),
+    NAME_FUNC_OFFSET(17373, glLinkProgramARB, glLinkProgramARB, NULL, _gloffset_LinkProgramARB),
+    NAME_FUNC_OFFSET(17387, glShaderSourceARB, glShaderSourceARB, NULL, _gloffset_ShaderSourceARB),
+    NAME_FUNC_OFFSET(17402, glUniform1fARB, glUniform1fARB, NULL, _gloffset_Uniform1fARB),
+    NAME_FUNC_OFFSET(17414, glUniform1fvARB, glUniform1fvARB, NULL, _gloffset_Uniform1fvARB),
+    NAME_FUNC_OFFSET(17427, glUniform1iARB, glUniform1iARB, NULL, _gloffset_Uniform1iARB),
+    NAME_FUNC_OFFSET(17439, glUniform1ivARB, glUniform1ivARB, NULL, _gloffset_Uniform1ivARB),
+    NAME_FUNC_OFFSET(17452, glUniform2fARB, glUniform2fARB, NULL, _gloffset_Uniform2fARB),
+    NAME_FUNC_OFFSET(17464, glUniform2fvARB, glUniform2fvARB, NULL, _gloffset_Uniform2fvARB),
+    NAME_FUNC_OFFSET(17477, glUniform2iARB, glUniform2iARB, NULL, _gloffset_Uniform2iARB),
+    NAME_FUNC_OFFSET(17489, glUniform2ivARB, glUniform2ivARB, NULL, _gloffset_Uniform2ivARB),
+    NAME_FUNC_OFFSET(17502, glUniform3fARB, glUniform3fARB, NULL, _gloffset_Uniform3fARB),
+    NAME_FUNC_OFFSET(17514, glUniform3fvARB, glUniform3fvARB, NULL, _gloffset_Uniform3fvARB),
+    NAME_FUNC_OFFSET(17527, glUniform3iARB, glUniform3iARB, NULL, _gloffset_Uniform3iARB),
+    NAME_FUNC_OFFSET(17539, glUniform3ivARB, glUniform3ivARB, NULL, _gloffset_Uniform3ivARB),
+    NAME_FUNC_OFFSET(17552, glUniform4fARB, glUniform4fARB, NULL, _gloffset_Uniform4fARB),
+    NAME_FUNC_OFFSET(17564, glUniform4fvARB, glUniform4fvARB, NULL, _gloffset_Uniform4fvARB),
+    NAME_FUNC_OFFSET(17577, glUniform4iARB, glUniform4iARB, NULL, _gloffset_Uniform4iARB),
+    NAME_FUNC_OFFSET(17589, glUniform4ivARB, glUniform4ivARB, NULL, _gloffset_Uniform4ivARB),
+    NAME_FUNC_OFFSET(17602, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, _gloffset_UniformMatrix2fvARB),
+    NAME_FUNC_OFFSET(17621, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, _gloffset_UniformMatrix3fvARB),
+    NAME_FUNC_OFFSET(17640, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, _gloffset_UniformMatrix4fvARB),
+    NAME_FUNC_OFFSET(17659, glUseProgramObjectARB, glUseProgramObjectARB, NULL, _gloffset_UseProgramObjectARB),
+    NAME_FUNC_OFFSET(17672, glValidateProgramARB, glValidateProgramARB, NULL, _gloffset_ValidateProgramARB),
+    NAME_FUNC_OFFSET(17690, glBindAttribLocationARB, glBindAttribLocationARB, NULL, _gloffset_BindAttribLocationARB),
+    NAME_FUNC_OFFSET(17711, glGetActiveAttribARB, glGetActiveAttribARB, NULL, _gloffset_GetActiveAttribARB),
+    NAME_FUNC_OFFSET(17729, glGetAttribLocationARB, glGetAttribLocationARB, NULL, _gloffset_GetAttribLocationARB),
+    NAME_FUNC_OFFSET(17749, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
+    NAME_FUNC_OFFSET(17763, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
+    NAME_FUNC_OFFSET(17780, gl_dispatch_stub_574, gl_dispatch_stub_574, NULL, _gloffset_SampleMaskSGIS),
+    NAME_FUNC_OFFSET(17796, gl_dispatch_stub_575, gl_dispatch_stub_575, NULL, _gloffset_SamplePatternSGIS),
+    NAME_FUNC_OFFSET(17815, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(17833, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(17854, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(17876, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(17895, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(17917, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(17940, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
+    NAME_FUNC_OFFSET(17959, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
+    NAME_FUNC_OFFSET(17979, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
+    NAME_FUNC_OFFSET(17998, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
+    NAME_FUNC_OFFSET(18018, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
+    NAME_FUNC_OFFSET(18037, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
+    NAME_FUNC_OFFSET(18057, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
+    NAME_FUNC_OFFSET(18076, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
+    NAME_FUNC_OFFSET(18096, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
+    NAME_FUNC_OFFSET(18115, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
+    NAME_FUNC_OFFSET(18135, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
+    NAME_FUNC_OFFSET(18155, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
+    NAME_FUNC_OFFSET(18176, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
+    NAME_FUNC_OFFSET(18196, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
+    NAME_FUNC_OFFSET(18217, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
+    NAME_FUNC_OFFSET(18237, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
+    NAME_FUNC_OFFSET(18258, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
+    NAME_FUNC_OFFSET(18282, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
+    NAME_FUNC_OFFSET(18300, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
+    NAME_FUNC_OFFSET(18320, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
+    NAME_FUNC_OFFSET(18338, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
+    NAME_FUNC_OFFSET(18350, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
+    NAME_FUNC_OFFSET(18363, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
+    NAME_FUNC_OFFSET(18375, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
+    NAME_FUNC_OFFSET(18388, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
+    NAME_FUNC_OFFSET(18408, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
+    NAME_FUNC_OFFSET(18432, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
+    NAME_FUNC_OFFSET(18446, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
+    NAME_FUNC_OFFSET(18463, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
+    NAME_FUNC_OFFSET(18478, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
+    NAME_FUNC_OFFSET(18496, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
+    NAME_FUNC_OFFSET(18510, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
+    NAME_FUNC_OFFSET(18527, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
+    NAME_FUNC_OFFSET(18542, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
+    NAME_FUNC_OFFSET(18560, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
+    NAME_FUNC_OFFSET(18574, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
+    NAME_FUNC_OFFSET(18591, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
+    NAME_FUNC_OFFSET(18606, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
+    NAME_FUNC_OFFSET(18624, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
+    NAME_FUNC_OFFSET(18638, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
+    NAME_FUNC_OFFSET(18655, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
+    NAME_FUNC_OFFSET(18670, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
+    NAME_FUNC_OFFSET(18688, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
+    NAME_FUNC_OFFSET(18702, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
+    NAME_FUNC_OFFSET(18719, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
+    NAME_FUNC_OFFSET(18734, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
+    NAME_FUNC_OFFSET(18752, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
+    NAME_FUNC_OFFSET(18766, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
+    NAME_FUNC_OFFSET(18783, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
+    NAME_FUNC_OFFSET(18798, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
+    NAME_FUNC_OFFSET(18816, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
+    NAME_FUNC_OFFSET(18830, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
+    NAME_FUNC_OFFSET(18847, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
+    NAME_FUNC_OFFSET(18862, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
+    NAME_FUNC_OFFSET(18880, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
+    NAME_FUNC_OFFSET(18894, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
+    NAME_FUNC_OFFSET(18911, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
+    NAME_FUNC_OFFSET(18926, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
+    NAME_FUNC_OFFSET(18944, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
+    NAME_FUNC_OFFSET(18961, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
+    NAME_FUNC_OFFSET(18981, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
+    NAME_FUNC_OFFSET(18998, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
+    NAME_FUNC_OFFSET(19024, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
+    NAME_FUNC_OFFSET(19053, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
+    NAME_FUNC_OFFSET(19068, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
+    NAME_FUNC_OFFSET(19086, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
+    NAME_FUNC_OFFSET(19105, gl_dispatch_stub_745, gl_dispatch_stub_745, NULL, _gloffset_DeleteVertexArraysAPPLE),
+    NAME_FUNC_OFFSET(19126, gl_dispatch_stub_747, gl_dispatch_stub_747, NULL, _gloffset_IsVertexArrayAPPLE),
+    NAME_FUNC_OFFSET(19142, gl_dispatch_stub_755, gl_dispatch_stub_755, NULL, _gloffset_BlendEquationSeparateEXT),
+    NAME_FUNC_OFFSET(19166, gl_dispatch_stub_755, gl_dispatch_stub_755, NULL, _gloffset_BlendEquationSeparateEXT),
+    NAME_FUNC_OFFSET(19193, glBindFramebufferEXT, glBindFramebufferEXT, NULL, _gloffset_BindFramebufferEXT),
+    NAME_FUNC_OFFSET(19211, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, _gloffset_BindRenderbufferEXT),
+    NAME_FUNC_OFFSET(19230, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, _gloffset_CheckFramebufferStatusEXT),
+    NAME_FUNC_OFFSET(19255, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, _gloffset_DeleteFramebuffersEXT),
+    NAME_FUNC_OFFSET(19276, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, _gloffset_DeleteRenderbuffersEXT),
+    NAME_FUNC_OFFSET(19298, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, _gloffset_FramebufferRenderbufferEXT),
+    NAME_FUNC_OFFSET(19324, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, _gloffset_FramebufferTexture1DEXT),
+    NAME_FUNC_OFFSET(19347, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, _gloffset_FramebufferTexture2DEXT),
+    NAME_FUNC_OFFSET(19370, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, _gloffset_FramebufferTexture3DEXT),
+    NAME_FUNC_OFFSET(19393, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, _gloffset_GenFramebuffersEXT),
+    NAME_FUNC_OFFSET(19411, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, _gloffset_GenRenderbuffersEXT),
+    NAME_FUNC_OFFSET(19430, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, _gloffset_GenerateMipmapEXT),
+    NAME_FUNC_OFFSET(19447, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, _gloffset_GetFramebufferAttachmentParameterivEXT),
+    NAME_FUNC_OFFSET(19485, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, _gloffset_GetRenderbufferParameterivEXT),
+    NAME_FUNC_OFFSET(19514, glIsFramebufferEXT, glIsFramebufferEXT, NULL, _gloffset_IsFramebufferEXT),
+    NAME_FUNC_OFFSET(19530, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, _gloffset_IsRenderbufferEXT),
+    NAME_FUNC_OFFSET(19547, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, _gloffset_RenderbufferStorageEXT),
+    NAME_FUNC_OFFSET(19569, gl_dispatch_stub_773, gl_dispatch_stub_773, NULL, _gloffset_BlitFramebufferEXT),
+    NAME_FUNC_OFFSET(19587, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
     NAME_FUNC_OFFSET(-1, NULL, NULL, NULL, 0)
 };
 
diff --git a/src/mesa/main/enums.c b/src/mesa/main/enums.c
index 6e2adea636..646552bdd5 100644
--- a/src/mesa/main/enums.c
+++ b/src/mesa/main/enums.c
@@ -139,10 +139,12 @@ LONGSTRING static const char enum_string_table[] =
    "GL_BOOL_VEC4_ARB\0"
    "GL_BUFFER_ACCESS\0"
    "GL_BUFFER_ACCESS_ARB\0"
+   "GL_BUFFER_FLUSHING_UNMAP_APPLE\0"
    "GL_BUFFER_MAPPED\0"
    "GL_BUFFER_MAPPED_ARB\0"
    "GL_BUFFER_MAP_POINTER\0"
    "GL_BUFFER_MAP_POINTER_ARB\0"
+   "GL_BUFFER_SERIALIZED_MODIFY_APPLE\0"
    "GL_BUFFER_SIZE\0"
    "GL_BUFFER_SIZE_ARB\0"
    "GL_BUFFER_USAGE\0"
@@ -1542,6 +1544,9 @@ LONGSTRING static const char enum_string_table[] =
    "GL_STENCIL_VALUE_MASK\0"
    "GL_STENCIL_WRITEMASK\0"
    "GL_STEREO\0"
+   "GL_STORAGE_CACHED_APPLE\0"
+   "GL_STORAGE_PRIVATE_APPLE\0"
+   "GL_STORAGE_SHARED_APPLE\0"
    "GL_STREAM_COPY\0"
    "GL_STREAM_COPY_ARB\0"
    "GL_STREAM_DRAW\0"
@@ -1730,6 +1735,8 @@ LONGSTRING static const char enum_string_table[] =
    "GL_TEXTURE_MIN_FILTER\0"
    "GL_TEXTURE_MIN_LOD\0"
    "GL_TEXTURE_PRIORITY\0"
+   "GL_TEXTURE_RANGE_LENGTH_APPLE\0"
+   "GL_TEXTURE_RANGE_POINTER_APPLE\0"
    "GL_TEXTURE_RECTANGLE_ARB\0"
    "GL_TEXTURE_RECTANGLE_NV\0"
    "GL_TEXTURE_RED_SIZE\0"
@@ -1737,6 +1744,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_TEXTURE_RESIDENT\0"
    "GL_TEXTURE_STACK_DEPTH\0"
    "GL_TEXTURE_STENCIL_SIZE\0"
+   "GL_TEXTURE_STORAGE_HINT_APPLE\0"
    "GL_TEXTURE_TOO_LARGE_EXT\0"
    "GL_TEXTURE_UNSIGNED_REMAP_MODE_NV\0"
    "GL_TEXTURE_WIDTH\0"
@@ -1871,7 +1879,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_ZOOM_Y\0"
    ;
 
-static const enum_elt all_enums[1833] =
+static const enum_elt all_enums[1841] =
 {
    {     0, 0x00000600 }, /* GL_2D */
    {     6, 0x00001407 }, /* GL_2_BYTES */
@@ -1976,3064 +1984,3080 @@ static const enum_elt all_enums[1833] =
    {  1632, 0x00008B59 }, /* GL_BOOL_VEC4_ARB */
    {  1649, 0x000088BB }, /* GL_BUFFER_ACCESS */
    {  1666, 0x000088BB }, /* GL_BUFFER_ACCESS_ARB */
-   {  1687, 0x000088BC }, /* GL_BUFFER_MAPPED */
-   {  1704, 0x000088BC }, /* GL_BUFFER_MAPPED_ARB */
-   {  1725, 0x000088BD }, /* GL_BUFFER_MAP_POINTER */
-   {  1747, 0x000088BD }, /* GL_BUFFER_MAP_POINTER_ARB */
-   {  1773, 0x00008764 }, /* GL_BUFFER_SIZE */
-   {  1788, 0x00008764 }, /* GL_BUFFER_SIZE_ARB */
-   {  1807, 0x00008765 }, /* GL_BUFFER_USAGE */
-   {  1823, 0x00008765 }, /* GL_BUFFER_USAGE_ARB */
-   {  1843, 0x0000877B }, /* GL_BUMP_ENVMAP_ATI */
-   {  1862, 0x00008777 }, /* GL_BUMP_NUM_TEX_UNITS_ATI */
-   {  1888, 0x00008775 }, /* GL_BUMP_ROT_MATRIX_ATI */
-   {  1911, 0x00008776 }, /* GL_BUMP_ROT_MATRIX_SIZE_ATI */
-   {  1939, 0x0000877C }, /* GL_BUMP_TARGET_ATI */
-   {  1958, 0x00008778 }, /* GL_BUMP_TEX_UNITS_ATI */
-   {  1980, 0x00001400 }, /* GL_BYTE */
-   {  1988, 0x00002A24 }, /* GL_C3F_V3F */
-   {  1999, 0x00002A26 }, /* GL_C4F_N3F_V3F */
-   {  2014, 0x00002A22 }, /* GL_C4UB_V2F */
-   {  2026, 0x00002A23 }, /* GL_C4UB_V3F */
-   {  2038, 0x00000901 }, /* GL_CCW */
-   {  2045, 0x00002900 }, /* GL_CLAMP */
-   {  2054, 0x0000812D }, /* GL_CLAMP_TO_BORDER */
-   {  2073, 0x0000812D }, /* GL_CLAMP_TO_BORDER_ARB */
-   {  2096, 0x0000812D }, /* GL_CLAMP_TO_BORDER_SGIS */
-   {  2120, 0x0000812F }, /* GL_CLAMP_TO_EDGE */
-   {  2137, 0x0000812F }, /* GL_CLAMP_TO_EDGE_SGIS */
-   {  2159, 0x00001500 }, /* GL_CLEAR */
-   {  2168, 0x000084E1 }, /* GL_CLIENT_ACTIVE_TEXTURE */
-   {  2193, 0x000084E1 }, /* GL_CLIENT_ACTIVE_TEXTURE_ARB */
-   {  2222, 0xFFFFFFFF }, /* GL_CLIENT_ALL_ATTRIB_BITS */
-   {  2248, 0x00000BB1 }, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
-   {  2277, 0x00000001 }, /* GL_CLIENT_PIXEL_STORE_BIT */
-   {  2303, 0x00000002 }, /* GL_CLIENT_VERTEX_ARRAY_BIT */
-   {  2330, 0x00003000 }, /* GL_CLIP_PLANE0 */
-   {  2345, 0x00003001 }, /* GL_CLIP_PLANE1 */
-   {  2360, 0x00003002 }, /* GL_CLIP_PLANE2 */
-   {  2375, 0x00003003 }, /* GL_CLIP_PLANE3 */
-   {  2390, 0x00003004 }, /* GL_CLIP_PLANE4 */
-   {  2405, 0x00003005 }, /* GL_CLIP_PLANE5 */
-   {  2420, 0x000080F0 }, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
-   {  2453, 0x00000A00 }, /* GL_COEFF */
-   {  2462, 0x00001800 }, /* GL_COLOR */
-   {  2471, 0x00008076 }, /* GL_COLOR_ARRAY */
-   {  2486, 0x00008898 }, /* GL_COLOR_ARRAY_BUFFER_BINDING */
-   {  2516, 0x00008898 }, /* GL_COLOR_ARRAY_BUFFER_BINDING_ARB */
-   {  2550, 0x00008090 }, /* GL_COLOR_ARRAY_POINTER */
-   {  2573, 0x00008081 }, /* GL_COLOR_ARRAY_SIZE */
-   {  2593, 0x00008083 }, /* GL_COLOR_ARRAY_STRIDE */
-   {  2615, 0x00008082 }, /* GL_COLOR_ARRAY_TYPE */
-   {  2635, 0x00008CE0 }, /* GL_COLOR_ATTACHMENT0 */
-   {  2656, 0x00008CE0 }, /* GL_COLOR_ATTACHMENT0_EXT */
-   {  2681, 0x00008CE1 }, /* GL_COLOR_ATTACHMENT1 */
-   {  2702, 0x00008CEA }, /* GL_COLOR_ATTACHMENT10 */
-   {  2724, 0x00008CEA }, /* GL_COLOR_ATTACHMENT10_EXT */
-   {  2750, 0x00008CEB }, /* GL_COLOR_ATTACHMENT11 */
-   {  2772, 0x00008CEB }, /* GL_COLOR_ATTACHMENT11_EXT */
-   {  2798, 0x00008CEC }, /* GL_COLOR_ATTACHMENT12 */
-   {  2820, 0x00008CEC }, /* GL_COLOR_ATTACHMENT12_EXT */
-   {  2846, 0x00008CED }, /* GL_COLOR_ATTACHMENT13 */
-   {  2868, 0x00008CED }, /* GL_COLOR_ATTACHMENT13_EXT */
-   {  2894, 0x00008CEE }, /* GL_COLOR_ATTACHMENT14 */
-   {  2916, 0x00008CEE }, /* GL_COLOR_ATTACHMENT14_EXT */
-   {  2942, 0x00008CEF }, /* GL_COLOR_ATTACHMENT15 */
-   {  2964, 0x00008CEF }, /* GL_COLOR_ATTACHMENT15_EXT */
-   {  2990, 0x00008CE1 }, /* GL_COLOR_ATTACHMENT1_EXT */
-   {  3015, 0x00008CE2 }, /* GL_COLOR_ATTACHMENT2 */
-   {  3036, 0x00008CE2 }, /* GL_COLOR_ATTACHMENT2_EXT */
-   {  3061, 0x00008CE3 }, /* GL_COLOR_ATTACHMENT3 */
-   {  3082, 0x00008CE3 }, /* GL_COLOR_ATTACHMENT3_EXT */
-   {  3107, 0x00008CE4 }, /* GL_COLOR_ATTACHMENT4 */
-   {  3128, 0x00008CE4 }, /* GL_COLOR_ATTACHMENT4_EXT */
-   {  3153, 0x00008CE5 }, /* GL_COLOR_ATTACHMENT5 */
-   {  3174, 0x00008CE5 }, /* GL_COLOR_ATTACHMENT5_EXT */
-   {  3199, 0x00008CE6 }, /* GL_COLOR_ATTACHMENT6 */
-   {  3220, 0x00008CE6 }, /* GL_COLOR_ATTACHMENT6_EXT */
-   {  3245, 0x00008CE7 }, /* GL_COLOR_ATTACHMENT7 */
-   {  3266, 0x00008CE7 }, /* GL_COLOR_ATTACHMENT7_EXT */
-   {  3291, 0x00008CE8 }, /* GL_COLOR_ATTACHMENT8 */
-   {  3312, 0x00008CE8 }, /* GL_COLOR_ATTACHMENT8_EXT */
-   {  3337, 0x00008CE9 }, /* GL_COLOR_ATTACHMENT9 */
-   {  3358, 0x00008CE9 }, /* GL_COLOR_ATTACHMENT9_EXT */
-   {  3383, 0x00004000 }, /* GL_COLOR_BUFFER_BIT */
-   {  3403, 0x00000C22 }, /* GL_COLOR_CLEAR_VALUE */
-   {  3424, 0x00001900 }, /* GL_COLOR_INDEX */
-   {  3439, 0x00001603 }, /* GL_COLOR_INDEXES */
-   {  3456, 0x00000BF2 }, /* GL_COLOR_LOGIC_OP */
-   {  3474, 0x00000B57 }, /* GL_COLOR_MATERIAL */
-   {  3492, 0x00000B55 }, /* GL_COLOR_MATERIAL_FACE */
-   {  3515, 0x00000B56 }, /* GL_COLOR_MATERIAL_PARAMETER */
-   {  3543, 0x000080B1 }, /* GL_COLOR_MATRIX */
-   {  3559, 0x000080B1 }, /* GL_COLOR_MATRIX_SGI */
-   {  3579, 0x000080B2 }, /* GL_COLOR_MATRIX_STACK_DEPTH */
-   {  3607, 0x000080B2 }, /* GL_COLOR_MATRIX_STACK_DEPTH_SGI */
-   {  3639, 0x00008458 }, /* GL_COLOR_SUM */
-   {  3652, 0x00008458 }, /* GL_COLOR_SUM_ARB */
-   {  3669, 0x000080D0 }, /* GL_COLOR_TABLE */
-   {  3684, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE */
-   {  3710, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE_EXT */
-   {  3740, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE_SGI */
-   {  3770, 0x000080D7 }, /* GL_COLOR_TABLE_BIAS */
-   {  3790, 0x000080D7 }, /* GL_COLOR_TABLE_BIAS_SGI */
-   {  3814, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE */
-   {  3839, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE_EXT */
-   {  3868, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE_SGI */
-   {  3897, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT */
-   {  3919, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT_EXT */
-   {  3945, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT_SGI */
-   {  3971, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE */
-   {  3997, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE_EXT */
-   {  4027, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE_SGI */
-   {  4057, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE */
-   {  4087, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE_EXT */
-   {  4121, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE_SGI */
-   {  4155, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE */
-   {  4185, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE_EXT */
-   {  4219, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE_SGI */
-   {  4253, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE */
-   {  4277, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE_EXT */
-   {  4305, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE_SGI */
-   {  4333, 0x000080D6 }, /* GL_COLOR_TABLE_SCALE */
-   {  4354, 0x000080D6 }, /* GL_COLOR_TABLE_SCALE_SGI */
-   {  4379, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH */
-   {  4400, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH_EXT */
-   {  4425, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH_SGI */
-   {  4450, 0x00000C23 }, /* GL_COLOR_WRITEMASK */
-   {  4469, 0x00008570 }, /* GL_COMBINE */
-   {  4480, 0x00008503 }, /* GL_COMBINE4 */
-   {  4492, 0x00008572 }, /* GL_COMBINE_ALPHA */
-   {  4509, 0x00008572 }, /* GL_COMBINE_ALPHA_ARB */
-   {  4530, 0x00008572 }, /* GL_COMBINE_ALPHA_EXT */
-   {  4551, 0x00008570 }, /* GL_COMBINE_ARB */
-   {  4566, 0x00008570 }, /* GL_COMBINE_EXT */
-   {  4581, 0x00008571 }, /* GL_COMBINE_RGB */
-   {  4596, 0x00008571 }, /* GL_COMBINE_RGB_ARB */
-   {  4615, 0x00008571 }, /* GL_COMBINE_RGB_EXT */
-   {  4634, 0x0000884E }, /* GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT */
-   {  4670, 0x0000884E }, /* GL_COMPARE_R_TO_TEXTURE */
-   {  4694, 0x0000884E }, /* GL_COMPARE_R_TO_TEXTURE_ARB */
-   {  4722, 0x00001300 }, /* GL_COMPILE */
-   {  4733, 0x00001301 }, /* GL_COMPILE_AND_EXECUTE */
-   {  4756, 0x00008B81 }, /* GL_COMPILE_STATUS */
-   {  4774, 0x000084E9 }, /* GL_COMPRESSED_ALPHA */
-   {  4794, 0x000084E9 }, /* GL_COMPRESSED_ALPHA_ARB */
-   {  4818, 0x000084EC }, /* GL_COMPRESSED_INTENSITY */
-   {  4842, 0x000084EC }, /* GL_COMPRESSED_INTENSITY_ARB */
-   {  4870, 0x000084EA }, /* GL_COMPRESSED_LUMINANCE */
-   {  4894, 0x000084EB }, /* GL_COMPRESSED_LUMINANCE_ALPHA */
-   {  4924, 0x000084EB }, /* GL_COMPRESSED_LUMINANCE_ALPHA_ARB */
-   {  4958, 0x000084EA }, /* GL_COMPRESSED_LUMINANCE_ARB */
-   {  4986, 0x000084ED }, /* GL_COMPRESSED_RGB */
-   {  5004, 0x000084EE }, /* GL_COMPRESSED_RGBA */
-   {  5023, 0x000084EE }, /* GL_COMPRESSED_RGBA_ARB */
-   {  5046, 0x000086B1 }, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
-   {  5075, 0x000083F1 }, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
-   {  5108, 0x000083F2 }, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
-   {  5141, 0x000083F3 }, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */
-   {  5174, 0x000084ED }, /* GL_COMPRESSED_RGB_ARB */
-   {  5196, 0x000086B0 }, /* GL_COMPRESSED_RGB_FXT1_3DFX */
-   {  5224, 0x000083F0 }, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
-   {  5256, 0x00008C4A }, /* GL_COMPRESSED_SLUMINANCE */
-   {  5281, 0x00008C4B }, /* GL_COMPRESSED_SLUMINANCE_ALPHA */
-   {  5312, 0x00008C48 }, /* GL_COMPRESSED_SRGB */
-   {  5331, 0x00008C49 }, /* GL_COMPRESSED_SRGB_ALPHA */
-   {  5356, 0x000086A3 }, /* GL_COMPRESSED_TEXTURE_FORMATS */
-   {  5386, 0x00008576 }, /* GL_CONSTANT */
-   {  5398, 0x00008003 }, /* GL_CONSTANT_ALPHA */
-   {  5416, 0x00008003 }, /* GL_CONSTANT_ALPHA_EXT */
-   {  5438, 0x00008576 }, /* GL_CONSTANT_ARB */
-   {  5454, 0x00001207 }, /* GL_CONSTANT_ATTENUATION */
-   {  5478, 0x00008151 }, /* GL_CONSTANT_BORDER_HP */
-   {  5500, 0x00008001 }, /* GL_CONSTANT_COLOR */
-   {  5518, 0x00008001 }, /* GL_CONSTANT_COLOR_EXT */
-   {  5540, 0x00008576 }, /* GL_CONSTANT_EXT */
-   {  5556, 0x00008010 }, /* GL_CONVOLUTION_1D */
-   {  5574, 0x00008011 }, /* GL_CONVOLUTION_2D */
-   {  5592, 0x00008154 }, /* GL_CONVOLUTION_BORDER_COLOR */
-   {  5620, 0x00008154 }, /* GL_CONVOLUTION_BORDER_COLOR_HP */
-   {  5651, 0x00008013 }, /* GL_CONVOLUTION_BORDER_MODE */
-   {  5678, 0x00008013 }, /* GL_CONVOLUTION_BORDER_MODE_EXT */
-   {  5709, 0x00008015 }, /* GL_CONVOLUTION_FILTER_BIAS */
-   {  5736, 0x00008015 }, /* GL_CONVOLUTION_FILTER_BIAS_EXT */
-   {  5767, 0x00008014 }, /* GL_CONVOLUTION_FILTER_SCALE */
-   {  5795, 0x00008014 }, /* GL_CONVOLUTION_FILTER_SCALE_EXT */
-   {  5827, 0x00008017 }, /* GL_CONVOLUTION_FORMAT */
-   {  5849, 0x00008017 }, /* GL_CONVOLUTION_FORMAT_EXT */
-   {  5875, 0x00008019 }, /* GL_CONVOLUTION_HEIGHT */
-   {  5897, 0x00008019 }, /* GL_CONVOLUTION_HEIGHT_EXT */
-   {  5923, 0x00008018 }, /* GL_CONVOLUTION_WIDTH */
-   {  5944, 0x00008018 }, /* GL_CONVOLUTION_WIDTH_EXT */
-   {  5969, 0x00008862 }, /* GL_COORD_REPLACE */
-   {  5986, 0x00008862 }, /* GL_COORD_REPLACE_ARB */
-   {  6007, 0x00008862 }, /* GL_COORD_REPLACE_NV */
-   {  6027, 0x00001503 }, /* GL_COPY */
-   {  6035, 0x0000150C }, /* GL_COPY_INVERTED */
-   {  6052, 0x00000706 }, /* GL_COPY_PIXEL_TOKEN */
-   {  6072, 0x00008F36 }, /* GL_COPY_READ_BUFFER */
-   {  6092, 0x00008F37 }, /* GL_COPY_WRITE_BUFFER */
-   {  6113, 0x00000B44 }, /* GL_CULL_FACE */
-   {  6126, 0x00000B45 }, /* GL_CULL_FACE_MODE */
-   {  6144, 0x000081AA }, /* GL_CULL_VERTEX_EXT */
-   {  6163, 0x000081AC }, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
-   {  6195, 0x000081AB }, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
-   {  6230, 0x00008626 }, /* GL_CURRENT_ATTRIB_NV */
-   {  6251, 0x00000001 }, /* GL_CURRENT_BIT */
-   {  6266, 0x00000B00 }, /* GL_CURRENT_COLOR */
-   {  6283, 0x00008453 }, /* GL_CURRENT_FOG_COORD */
-   {  6304, 0x00008453 }, /* GL_CURRENT_FOG_COORDINATE */
-   {  6330, 0x00000B01 }, /* GL_CURRENT_INDEX */
-   {  6347, 0x00008641 }, /* GL_CURRENT_MATRIX_ARB */
-   {  6369, 0x00008845 }, /* GL_CURRENT_MATRIX_INDEX_ARB */
-   {  6397, 0x00008641 }, /* GL_CURRENT_MATRIX_NV */
-   {  6418, 0x00008640 }, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
-   {  6452, 0x00008640 }, /* GL_CURRENT_MATRIX_STACK_DEPTH_NV */
-   {  6485, 0x00000B02 }, /* GL_CURRENT_NORMAL */
-   {  6503, 0x00008843 }, /* GL_CURRENT_PALETTE_MATRIX_ARB */
-   {  6533, 0x00008B8D }, /* GL_CURRENT_PROGRAM */
-   {  6552, 0x00008865 }, /* GL_CURRENT_QUERY */
-   {  6569, 0x00008865 }, /* GL_CURRENT_QUERY_ARB */
-   {  6590, 0x00000B04 }, /* GL_CURRENT_RASTER_COLOR */
-   {  6614, 0x00000B09 }, /* GL_CURRENT_RASTER_DISTANCE */
-   {  6641, 0x00000B05 }, /* GL_CURRENT_RASTER_INDEX */
-   {  6665, 0x00000B07 }, /* GL_CURRENT_RASTER_POSITION */
-   {  6692, 0x00000B08 }, /* GL_CURRENT_RASTER_POSITION_VALID */
-   {  6725, 0x0000845F }, /* GL_CURRENT_RASTER_SECONDARY_COLOR */
-   {  6759, 0x00000B06 }, /* GL_CURRENT_RASTER_TEXTURE_COORDS */
-   {  6792, 0x00008459 }, /* GL_CURRENT_SECONDARY_COLOR */
-   {  6819, 0x00000B03 }, /* GL_CURRENT_TEXTURE_COORDS */
-   {  6845, 0x00008626 }, /* GL_CURRENT_VERTEX_ATTRIB */
-   {  6870, 0x00008626 }, /* GL_CURRENT_VERTEX_ATTRIB_ARB */
-   {  6899, 0x000086A8 }, /* GL_CURRENT_WEIGHT_ARB */
-   {  6921, 0x00000900 }, /* GL_CW */
-   {  6927, 0x0000875B }, /* GL_DEBUG_ASSERT_MESA */
-   {  6948, 0x00008759 }, /* GL_DEBUG_OBJECT_MESA */
-   {  6969, 0x0000875A }, /* GL_DEBUG_PRINT_MESA */
-   {  6989, 0x00002101 }, /* GL_DECAL */
-   {  6998, 0x00001E03 }, /* GL_DECR */
-   {  7006, 0x00008508 }, /* GL_DECR_WRAP */
-   {  7019, 0x00008508 }, /* GL_DECR_WRAP_EXT */
-   {  7036, 0x00008B80 }, /* GL_DELETE_STATUS */
-   {  7053, 0x00001801 }, /* GL_DEPTH */
-   {  7062, 0x000088F0 }, /* GL_DEPTH24_STENCIL8 */
-   {  7082, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT */
-   {  7102, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT_EXT */
-   {  7126, 0x00000D1F }, /* GL_DEPTH_BIAS */
-   {  7140, 0x00000D56 }, /* GL_DEPTH_BITS */
-   {  7154, 0x00008891 }, /* GL_DEPTH_BOUNDS_EXT */
-   {  7174, 0x00008890 }, /* GL_DEPTH_BOUNDS_TEST_EXT */
-   {  7199, 0x00000100 }, /* GL_DEPTH_BUFFER_BIT */
-   {  7219, 0x0000864F }, /* GL_DEPTH_CLAMP_NV */
-   {  7237, 0x00000B73 }, /* GL_DEPTH_CLEAR_VALUE */
-   {  7258, 0x00001902 }, /* GL_DEPTH_COMPONENT */
-   {  7277, 0x000081A5 }, /* GL_DEPTH_COMPONENT16 */
-   {  7298, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_ARB */
-   {  7323, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_SGIX */
-   {  7349, 0x000081A6 }, /* GL_DEPTH_COMPONENT24 */
-   {  7370, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_ARB */
-   {  7395, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_SGIX */
-   {  7421, 0x000081A7 }, /* GL_DEPTH_COMPONENT32 */
-   {  7442, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_ARB */
-   {  7467, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_SGIX */
-   {  7493, 0x00000B74 }, /* GL_DEPTH_FUNC */
-   {  7507, 0x00000B70 }, /* GL_DEPTH_RANGE */
-   {  7522, 0x00000D1E }, /* GL_DEPTH_SCALE */
-   {  7537, 0x000084F9 }, /* GL_DEPTH_STENCIL */
-   {  7554, 0x0000821A }, /* GL_DEPTH_STENCIL_ATTACHMENT */
-   {  7582, 0x000084F9 }, /* GL_DEPTH_STENCIL_NV */
-   {  7602, 0x0000886F }, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
-   {  7630, 0x0000886E }, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
-   {  7658, 0x00000B71 }, /* GL_DEPTH_TEST */
-   {  7672, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE */
-   {  7694, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE_ARB */
-   {  7720, 0x00000B72 }, /* GL_DEPTH_WRITEMASK */
-   {  7739, 0x00001201 }, /* GL_DIFFUSE */
-   {  7750, 0x00000BD0 }, /* GL_DITHER */
-   {  7760, 0x00000A02 }, /* GL_DOMAIN */
-   {  7770, 0x00001100 }, /* GL_DONT_CARE */
-   {  7783, 0x000086AE }, /* GL_DOT3_RGB */
-   {  7795, 0x000086AF }, /* GL_DOT3_RGBA */
-   {  7808, 0x000086AF }, /* GL_DOT3_RGBA_ARB */
-   {  7825, 0x00008741 }, /* GL_DOT3_RGBA_EXT */
-   {  7842, 0x000086AE }, /* GL_DOT3_RGB_ARB */
-   {  7858, 0x00008740 }, /* GL_DOT3_RGB_EXT */
-   {  7874, 0x0000140A }, /* GL_DOUBLE */
-   {  7884, 0x00000C32 }, /* GL_DOUBLEBUFFER */
-   {  7900, 0x00000C01 }, /* GL_DRAW_BUFFER */
-   {  7915, 0x00008825 }, /* GL_DRAW_BUFFER0 */
-   {  7931, 0x00008825 }, /* GL_DRAW_BUFFER0_ARB */
-   {  7951, 0x00008825 }, /* GL_DRAW_BUFFER0_ATI */
-   {  7971, 0x00008826 }, /* GL_DRAW_BUFFER1 */
-   {  7987, 0x0000882F }, /* GL_DRAW_BUFFER10 */
-   {  8004, 0x0000882F }, /* GL_DRAW_BUFFER10_ARB */
-   {  8025, 0x0000882F }, /* GL_DRAW_BUFFER10_ATI */
-   {  8046, 0x00008830 }, /* GL_DRAW_BUFFER11 */
-   {  8063, 0x00008830 }, /* GL_DRAW_BUFFER11_ARB */
-   {  8084, 0x00008830 }, /* GL_DRAW_BUFFER11_ATI */
-   {  8105, 0x00008831 }, /* GL_DRAW_BUFFER12 */
-   {  8122, 0x00008831 }, /* GL_DRAW_BUFFER12_ARB */
-   {  8143, 0x00008831 }, /* GL_DRAW_BUFFER12_ATI */
-   {  8164, 0x00008832 }, /* GL_DRAW_BUFFER13 */
-   {  8181, 0x00008832 }, /* GL_DRAW_BUFFER13_ARB */
-   {  8202, 0x00008832 }, /* GL_DRAW_BUFFER13_ATI */
-   {  8223, 0x00008833 }, /* GL_DRAW_BUFFER14 */
-   {  8240, 0x00008833 }, /* GL_DRAW_BUFFER14_ARB */
-   {  8261, 0x00008833 }, /* GL_DRAW_BUFFER14_ATI */
-   {  8282, 0x00008834 }, /* GL_DRAW_BUFFER15 */
-   {  8299, 0x00008834 }, /* GL_DRAW_BUFFER15_ARB */
-   {  8320, 0x00008834 }, /* GL_DRAW_BUFFER15_ATI */
-   {  8341, 0x00008826 }, /* GL_DRAW_BUFFER1_ARB */
-   {  8361, 0x00008826 }, /* GL_DRAW_BUFFER1_ATI */
-   {  8381, 0x00008827 }, /* GL_DRAW_BUFFER2 */
-   {  8397, 0x00008827 }, /* GL_DRAW_BUFFER2_ARB */
-   {  8417, 0x00008827 }, /* GL_DRAW_BUFFER2_ATI */
-   {  8437, 0x00008828 }, /* GL_DRAW_BUFFER3 */
-   {  8453, 0x00008828 }, /* GL_DRAW_BUFFER3_ARB */
-   {  8473, 0x00008828 }, /* GL_DRAW_BUFFER3_ATI */
-   {  8493, 0x00008829 }, /* GL_DRAW_BUFFER4 */
-   {  8509, 0x00008829 }, /* GL_DRAW_BUFFER4_ARB */
-   {  8529, 0x00008829 }, /* GL_DRAW_BUFFER4_ATI */
-   {  8549, 0x0000882A }, /* GL_DRAW_BUFFER5 */
-   {  8565, 0x0000882A }, /* GL_DRAW_BUFFER5_ARB */
-   {  8585, 0x0000882A }, /* GL_DRAW_BUFFER5_ATI */
-   {  8605, 0x0000882B }, /* GL_DRAW_BUFFER6 */
-   {  8621, 0x0000882B }, /* GL_DRAW_BUFFER6_ARB */
-   {  8641, 0x0000882B }, /* GL_DRAW_BUFFER6_ATI */
-   {  8661, 0x0000882C }, /* GL_DRAW_BUFFER7 */
-   {  8677, 0x0000882C }, /* GL_DRAW_BUFFER7_ARB */
-   {  8697, 0x0000882C }, /* GL_DRAW_BUFFER7_ATI */
-   {  8717, 0x0000882D }, /* GL_DRAW_BUFFER8 */
-   {  8733, 0x0000882D }, /* GL_DRAW_BUFFER8_ARB */
-   {  8753, 0x0000882D }, /* GL_DRAW_BUFFER8_ATI */
-   {  8773, 0x0000882E }, /* GL_DRAW_BUFFER9 */
-   {  8789, 0x0000882E }, /* GL_DRAW_BUFFER9_ARB */
-   {  8809, 0x0000882E }, /* GL_DRAW_BUFFER9_ATI */
-   {  8829, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER */
-   {  8849, 0x00008CA6 }, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
-   {  8881, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER_EXT */
-   {  8905, 0x00000705 }, /* GL_DRAW_PIXEL_TOKEN */
-   {  8925, 0x00000304 }, /* GL_DST_ALPHA */
-   {  8938, 0x00000306 }, /* GL_DST_COLOR */
-   {  8951, 0x0000877A }, /* GL_DU8DV8_ATI */
-   {  8965, 0x00008779 }, /* GL_DUDV_ATI */
-   {  8977, 0x000088EA }, /* GL_DYNAMIC_COPY */
-   {  8993, 0x000088EA }, /* GL_DYNAMIC_COPY_ARB */
-   {  9013, 0x000088E8 }, /* GL_DYNAMIC_DRAW */
-   {  9029, 0x000088E8 }, /* GL_DYNAMIC_DRAW_ARB */
-   {  9049, 0x000088E9 }, /* GL_DYNAMIC_READ */
-   {  9065, 0x000088E9 }, /* GL_DYNAMIC_READ_ARB */
-   {  9085, 0x00000B43 }, /* GL_EDGE_FLAG */
-   {  9098, 0x00008079 }, /* GL_EDGE_FLAG_ARRAY */
-   {  9117, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
-   {  9151, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB */
-   {  9189, 0x00008093 }, /* GL_EDGE_FLAG_ARRAY_POINTER */
-   {  9216, 0x0000808C }, /* GL_EDGE_FLAG_ARRAY_STRIDE */
-   {  9242, 0x00008893 }, /* GL_ELEMENT_ARRAY_BUFFER */
-   {  9266, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
-   {  9298, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB */
-   {  9334, 0x00001600 }, /* GL_EMISSION */
-   {  9346, 0x00002000 }, /* GL_ENABLE_BIT */
-   {  9360, 0x00000202 }, /* GL_EQUAL */
-   {  9369, 0x00001509 }, /* GL_EQUIV */
-   {  9378, 0x00010000 }, /* GL_EVAL_BIT */
-   {  9390, 0x00000800 }, /* GL_EXP */
-   {  9397, 0x00000801 }, /* GL_EXP2 */
-   {  9405, 0x00001F03 }, /* GL_EXTENSIONS */
-   {  9419, 0x00002400 }, /* GL_EYE_LINEAR */
-   {  9433, 0x00002502 }, /* GL_EYE_PLANE */
-   {  9446, 0x0000855C }, /* GL_EYE_PLANE_ABSOLUTE_NV */
-   {  9471, 0x0000855B }, /* GL_EYE_RADIAL_NV */
-   {  9488, 0x00000000 }, /* GL_FALSE */
-   {  9497, 0x00001101 }, /* GL_FASTEST */
-   {  9508, 0x00001C01 }, /* GL_FEEDBACK */
-   {  9520, 0x00000DF0 }, /* GL_FEEDBACK_BUFFER_POINTER */
-   {  9547, 0x00000DF1 }, /* GL_FEEDBACK_BUFFER_SIZE */
-   {  9571, 0x00000DF2 }, /* GL_FEEDBACK_BUFFER_TYPE */
-   {  9595, 0x00001B02 }, /* GL_FILL */
-   {  9603, 0x00008E4D }, /* GL_FIRST_VERTEX_CONVENTION_EXT */
-   {  9634, 0x00001D00 }, /* GL_FLAT */
-   {  9642, 0x00001406 }, /* GL_FLOAT */
-   {  9651, 0x00008B5A }, /* GL_FLOAT_MAT2 */
-   {  9665, 0x00008B5A }, /* GL_FLOAT_MAT2_ARB */
-   {  9683, 0x00008B65 }, /* GL_FLOAT_MAT2x3 */
-   {  9699, 0x00008B66 }, /* GL_FLOAT_MAT2x4 */
-   {  9715, 0x00008B5B }, /* GL_FLOAT_MAT3 */
-   {  9729, 0x00008B5B }, /* GL_FLOAT_MAT3_ARB */
-   {  9747, 0x00008B67 }, /* GL_FLOAT_MAT3x2 */
-   {  9763, 0x00008B68 }, /* GL_FLOAT_MAT3x4 */
-   {  9779, 0x00008B5C }, /* GL_FLOAT_MAT4 */
-   {  9793, 0x00008B5C }, /* GL_FLOAT_MAT4_ARB */
-   {  9811, 0x00008B69 }, /* GL_FLOAT_MAT4x2 */
-   {  9827, 0x00008B6A }, /* GL_FLOAT_MAT4x3 */
-   {  9843, 0x00008B50 }, /* GL_FLOAT_VEC2 */
-   {  9857, 0x00008B50 }, /* GL_FLOAT_VEC2_ARB */
-   {  9875, 0x00008B51 }, /* GL_FLOAT_VEC3 */
-   {  9889, 0x00008B51 }, /* GL_FLOAT_VEC3_ARB */
-   {  9907, 0x00008B52 }, /* GL_FLOAT_VEC4 */
-   {  9921, 0x00008B52 }, /* GL_FLOAT_VEC4_ARB */
-   {  9939, 0x00000B60 }, /* GL_FOG */
-   {  9946, 0x00000080 }, /* GL_FOG_BIT */
-   {  9957, 0x00000B66 }, /* GL_FOG_COLOR */
-   {  9970, 0x00008451 }, /* GL_FOG_COORD */
-   {  9983, 0x00008451 }, /* GL_FOG_COORDINATE */
-   { 10001, 0x00008457 }, /* GL_FOG_COORDINATE_ARRAY */
-   { 10025, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
-   { 10064, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB */
-   { 10107, 0x00008456 }, /* GL_FOG_COORDINATE_ARRAY_POINTER */
-   { 10139, 0x00008455 }, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
-   { 10170, 0x00008454 }, /* GL_FOG_COORDINATE_ARRAY_TYPE */
-   { 10199, 0x00008450 }, /* GL_FOG_COORDINATE_SOURCE */
-   { 10224, 0x00008457 }, /* GL_FOG_COORD_ARRAY */
-   { 10243, 0x0000889D }, /* GL_FOG_COORD_ARRAY_BUFFER_BINDING */
-   { 10277, 0x00008456 }, /* GL_FOG_COORD_ARRAY_POINTER */
-   { 10304, 0x00008455 }, /* GL_FOG_COORD_ARRAY_STRIDE */
-   { 10330, 0x00008454 }, /* GL_FOG_COORD_ARRAY_TYPE */
-   { 10354, 0x00008450 }, /* GL_FOG_COORD_SRC */
-   { 10371, 0x00000B62 }, /* GL_FOG_DENSITY */
-   { 10386, 0x0000855A }, /* GL_FOG_DISTANCE_MODE_NV */
-   { 10410, 0x00000B64 }, /* GL_FOG_END */
-   { 10421, 0x00000C54 }, /* GL_FOG_HINT */
-   { 10433, 0x00000B61 }, /* GL_FOG_INDEX */
-   { 10446, 0x00000B65 }, /* GL_FOG_MODE */
-   { 10458, 0x00008198 }, /* GL_FOG_OFFSET_SGIX */
-   { 10477, 0x00008199 }, /* GL_FOG_OFFSET_VALUE_SGIX */
-   { 10502, 0x00000B63 }, /* GL_FOG_START */
-   { 10515, 0x00008452 }, /* GL_FRAGMENT_DEPTH */
-   { 10533, 0x00008804 }, /* GL_FRAGMENT_PROGRAM_ARB */
-   { 10557, 0x00008B30 }, /* GL_FRAGMENT_SHADER */
-   { 10576, 0x00008B30 }, /* GL_FRAGMENT_SHADER_ARB */
-   { 10599, 0x00008B8B }, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
-   { 10634, 0x00008D40 }, /* GL_FRAMEBUFFER */
-   { 10649, 0x00008215 }, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
-   { 10686, 0x00008214 }, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
-   { 10722, 0x00008210 }, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
-   { 10763, 0x00008211 }, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
-   { 10804, 0x00008216 }, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
-   { 10841, 0x00008213 }, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
-   { 10878, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
-   { 10916, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT */
-   { 10958, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
-   { 10996, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT */
-   { 11038, 0x00008212 }, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
-   { 11073, 0x00008217 }, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
-   { 11112, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT */
-   { 11161, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
-   { 11209, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT */
-   { 11261, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
-   { 11301, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
-   { 11345, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
-   { 11385, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT */
-   { 11429, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING_EXT */
-   { 11456, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE */
-   { 11480, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE_EXT */
-   { 11508, 0x00008218 }, /* GL_FRAMEBUFFER_DEFAULT */
-   { 11531, 0x00008D40 }, /* GL_FRAMEBUFFER_EXT */
-   { 11550, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
-   { 11587, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT */
-   { 11628, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
-   { 11669, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
-   { 11711, 0x00008CD8 }, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
-   { 11762, 0x00008CDA }, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
-   { 11800, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
-   { 11845, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT */
-   { 11894, 0x00008D56 }, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
-   { 11932, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
-   { 11974, 0x00008CDE }, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
-   { 12006, 0x00008219 }, /* GL_FRAMEBUFFER_UNDEFINED */
-   { 12031, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED */
-   { 12058, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED_EXT */
-   { 12089, 0x00000404 }, /* GL_FRONT */
-   { 12098, 0x00000408 }, /* GL_FRONT_AND_BACK */
-   { 12116, 0x00000B46 }, /* GL_FRONT_FACE */
-   { 12130, 0x00000400 }, /* GL_FRONT_LEFT */
-   { 12144, 0x00000401 }, /* GL_FRONT_RIGHT */
-   { 12159, 0x00008006 }, /* GL_FUNC_ADD */
-   { 12171, 0x00008006 }, /* GL_FUNC_ADD_EXT */
-   { 12187, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT */
-   { 12212, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT_EXT */
-   { 12241, 0x0000800A }, /* GL_FUNC_SUBTRACT */
-   { 12258, 0x0000800A }, /* GL_FUNC_SUBTRACT_EXT */
-   { 12279, 0x00008191 }, /* GL_GENERATE_MIPMAP */
-   { 12298, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT */
-   { 12322, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT_SGIS */
-   { 12351, 0x00008191 }, /* GL_GENERATE_MIPMAP_SGIS */
-   { 12375, 0x00000206 }, /* GL_GEQUAL */
-   { 12385, 0x00000204 }, /* GL_GREATER */
-   { 12396, 0x00001904 }, /* GL_GREEN */
-   { 12405, 0x00000D19 }, /* GL_GREEN_BIAS */
-   { 12419, 0x00000D53 }, /* GL_GREEN_BITS */
-   { 12433, 0x00000D18 }, /* GL_GREEN_SCALE */
-   { 12448, 0x00008000 }, /* GL_HINT_BIT */
-   { 12460, 0x00008024 }, /* GL_HISTOGRAM */
-   { 12473, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE */
-   { 12497, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE_EXT */
-   { 12525, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE */
-   { 12548, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE_EXT */
-   { 12575, 0x00008024 }, /* GL_HISTOGRAM_EXT */
-   { 12592, 0x00008027 }, /* GL_HISTOGRAM_FORMAT */
-   { 12612, 0x00008027 }, /* GL_HISTOGRAM_FORMAT_EXT */
-   { 12636, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE */
-   { 12660, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE_EXT */
-   { 12688, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE */
-   { 12716, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE_EXT */
-   { 12748, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE */
-   { 12770, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE_EXT */
-   { 12796, 0x0000802D }, /* GL_HISTOGRAM_SINK */
-   { 12814, 0x0000802D }, /* GL_HISTOGRAM_SINK_EXT */
-   { 12836, 0x00008026 }, /* GL_HISTOGRAM_WIDTH */
-   { 12855, 0x00008026 }, /* GL_HISTOGRAM_WIDTH_EXT */
-   { 12878, 0x0000862A }, /* GL_IDENTITY_NV */
-   { 12893, 0x00008150 }, /* GL_IGNORE_BORDER_HP */
-   { 12913, 0x00008B9B }, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
-   { 12953, 0x00008B9A }, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
-   { 12991, 0x00001E02 }, /* GL_INCR */
-   { 12999, 0x00008507 }, /* GL_INCR_WRAP */
-   { 13012, 0x00008507 }, /* GL_INCR_WRAP_EXT */
-   { 13029, 0x00008222 }, /* GL_INDEX */
-   { 13038, 0x00008077 }, /* GL_INDEX_ARRAY */
-   { 13053, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING */
-   { 13083, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING_ARB */
-   { 13117, 0x00008091 }, /* GL_INDEX_ARRAY_POINTER */
-   { 13140, 0x00008086 }, /* GL_INDEX_ARRAY_STRIDE */
-   { 13162, 0x00008085 }, /* GL_INDEX_ARRAY_TYPE */
-   { 13182, 0x00000D51 }, /* GL_INDEX_BITS */
-   { 13196, 0x00000C20 }, /* GL_INDEX_CLEAR_VALUE */
-   { 13217, 0x00000BF1 }, /* GL_INDEX_LOGIC_OP */
-   { 13235, 0x00000C30 }, /* GL_INDEX_MODE */
-   { 13249, 0x00000D13 }, /* GL_INDEX_OFFSET */
-   { 13265, 0x00000D12 }, /* GL_INDEX_SHIFT */
-   { 13280, 0x00000C21 }, /* GL_INDEX_WRITEMASK */
-   { 13299, 0x00008B84 }, /* GL_INFO_LOG_LENGTH */
-   { 13318, 0x00001404 }, /* GL_INT */
-   { 13325, 0x00008049 }, /* GL_INTENSITY */
-   { 13338, 0x0000804C }, /* GL_INTENSITY12 */
-   { 13353, 0x0000804C }, /* GL_INTENSITY12_EXT */
-   { 13372, 0x0000804D }, /* GL_INTENSITY16 */
-   { 13387, 0x0000804D }, /* GL_INTENSITY16_EXT */
-   { 13406, 0x0000804A }, /* GL_INTENSITY4 */
-   { 13420, 0x0000804A }, /* GL_INTENSITY4_EXT */
-   { 13438, 0x0000804B }, /* GL_INTENSITY8 */
-   { 13452, 0x0000804B }, /* GL_INTENSITY8_EXT */
-   { 13470, 0x00008049 }, /* GL_INTENSITY_EXT */
-   { 13487, 0x00008575 }, /* GL_INTERPOLATE */
-   { 13502, 0x00008575 }, /* GL_INTERPOLATE_ARB */
-   { 13521, 0x00008575 }, /* GL_INTERPOLATE_EXT */
-   { 13540, 0x00008B53 }, /* GL_INT_VEC2 */
-   { 13552, 0x00008B53 }, /* GL_INT_VEC2_ARB */
-   { 13568, 0x00008B54 }, /* GL_INT_VEC3 */
-   { 13580, 0x00008B54 }, /* GL_INT_VEC3_ARB */
-   { 13596, 0x00008B55 }, /* GL_INT_VEC4 */
-   { 13608, 0x00008B55 }, /* GL_INT_VEC4_ARB */
-   { 13624, 0x00000500 }, /* GL_INVALID_ENUM */
-   { 13640, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION */
-   { 13673, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION_EXT */
-   { 13710, 0x00000502 }, /* GL_INVALID_OPERATION */
-   { 13731, 0x00000501 }, /* GL_INVALID_VALUE */
-   { 13748, 0x0000862B }, /* GL_INVERSE_NV */
-   { 13762, 0x0000862D }, /* GL_INVERSE_TRANSPOSE_NV */
-   { 13786, 0x0000150A }, /* GL_INVERT */
-   { 13796, 0x00001E00 }, /* GL_KEEP */
-   { 13804, 0x00008E4E }, /* GL_LAST_VERTEX_CONVENTION_EXT */
-   { 13834, 0x00000406 }, /* GL_LEFT */
-   { 13842, 0x00000203 }, /* GL_LEQUAL */
-   { 13852, 0x00000201 }, /* GL_LESS */
-   { 13860, 0x00004000 }, /* GL_LIGHT0 */
-   { 13870, 0x00004001 }, /* GL_LIGHT1 */
-   { 13880, 0x00004002 }, /* GL_LIGHT2 */
-   { 13890, 0x00004003 }, /* GL_LIGHT3 */
-   { 13900, 0x00004004 }, /* GL_LIGHT4 */
-   { 13910, 0x00004005 }, /* GL_LIGHT5 */
-   { 13920, 0x00004006 }, /* GL_LIGHT6 */
-   { 13930, 0x00004007 }, /* GL_LIGHT7 */
-   { 13940, 0x00000B50 }, /* GL_LIGHTING */
-   { 13952, 0x00000040 }, /* GL_LIGHTING_BIT */
-   { 13968, 0x00000B53 }, /* GL_LIGHT_MODEL_AMBIENT */
-   { 13991, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL */
-   { 14020, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL_EXT */
-   { 14053, 0x00000B51 }, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
-   { 14081, 0x00000B52 }, /* GL_LIGHT_MODEL_TWO_SIDE */
-   { 14105, 0x00001B01 }, /* GL_LINE */
-   { 14113, 0x00002601 }, /* GL_LINEAR */
-   { 14123, 0x00001208 }, /* GL_LINEAR_ATTENUATION */
-   { 14145, 0x00008170 }, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
-   { 14175, 0x0000844F }, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
-   { 14206, 0x00002703 }, /* GL_LINEAR_MIPMAP_LINEAR */
-   { 14230, 0x00002701 }, /* GL_LINEAR_MIPMAP_NEAREST */
-   { 14255, 0x00000001 }, /* GL_LINES */
-   { 14264, 0x00000004 }, /* GL_LINE_BIT */
-   { 14276, 0x00000002 }, /* GL_LINE_LOOP */
-   { 14289, 0x00000707 }, /* GL_LINE_RESET_TOKEN */
-   { 14309, 0x00000B20 }, /* GL_LINE_SMOOTH */
-   { 14324, 0x00000C52 }, /* GL_LINE_SMOOTH_HINT */
-   { 14344, 0x00000B24 }, /* GL_LINE_STIPPLE */
-   { 14360, 0x00000B25 }, /* GL_LINE_STIPPLE_PATTERN */
-   { 14384, 0x00000B26 }, /* GL_LINE_STIPPLE_REPEAT */
-   { 14407, 0x00000003 }, /* GL_LINE_STRIP */
-   { 14421, 0x00000702 }, /* GL_LINE_TOKEN */
-   { 14435, 0x00000B21 }, /* GL_LINE_WIDTH */
-   { 14449, 0x00000B23 }, /* GL_LINE_WIDTH_GRANULARITY */
-   { 14475, 0x00000B22 }, /* GL_LINE_WIDTH_RANGE */
-   { 14495, 0x00008B82 }, /* GL_LINK_STATUS */
-   { 14510, 0x00000B32 }, /* GL_LIST_BASE */
-   { 14523, 0x00020000 }, /* GL_LIST_BIT */
-   { 14535, 0x00000B33 }, /* GL_LIST_INDEX */
-   { 14549, 0x00000B30 }, /* GL_LIST_MODE */
-   { 14562, 0x00000101 }, /* GL_LOAD */
-   { 14570, 0x00000BF1 }, /* GL_LOGIC_OP */
-   { 14582, 0x00000BF0 }, /* GL_LOGIC_OP_MODE */
-   { 14599, 0x00008CA1 }, /* GL_LOWER_LEFT */
-   { 14613, 0x00001909 }, /* GL_LUMINANCE */
-   { 14626, 0x00008041 }, /* GL_LUMINANCE12 */
-   { 14641, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12 */
-   { 14664, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12_EXT */
-   { 14691, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4 */
-   { 14713, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4_EXT */
-   { 14739, 0x00008041 }, /* GL_LUMINANCE12_EXT */
-   { 14758, 0x00008042 }, /* GL_LUMINANCE16 */
-   { 14773, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16 */
-   { 14796, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16_EXT */
-   { 14823, 0x00008042 }, /* GL_LUMINANCE16_EXT */
-   { 14842, 0x0000803F }, /* GL_LUMINANCE4 */
-   { 14856, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4 */
-   { 14877, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4_EXT */
-   { 14902, 0x0000803F }, /* GL_LUMINANCE4_EXT */
-   { 14920, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2 */
-   { 14941, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2_EXT */
-   { 14966, 0x00008040 }, /* GL_LUMINANCE8 */
-   { 14980, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8 */
-   { 15001, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8_EXT */
-   { 15026, 0x00008040 }, /* GL_LUMINANCE8_EXT */
-   { 15044, 0x0000190A }, /* GL_LUMINANCE_ALPHA */
-   { 15063, 0x00000D90 }, /* GL_MAP1_COLOR_4 */
-   { 15079, 0x00000DD0 }, /* GL_MAP1_GRID_DOMAIN */
-   { 15099, 0x00000DD1 }, /* GL_MAP1_GRID_SEGMENTS */
-   { 15121, 0x00000D91 }, /* GL_MAP1_INDEX */
-   { 15135, 0x00000D92 }, /* GL_MAP1_NORMAL */
-   { 15150, 0x00000D93 }, /* GL_MAP1_TEXTURE_COORD_1 */
-   { 15174, 0x00000D94 }, /* GL_MAP1_TEXTURE_COORD_2 */
-   { 15198, 0x00000D95 }, /* GL_MAP1_TEXTURE_COORD_3 */
-   { 15222, 0x00000D96 }, /* GL_MAP1_TEXTURE_COORD_4 */
-   { 15246, 0x00000D97 }, /* GL_MAP1_VERTEX_3 */
-   { 15263, 0x00000D98 }, /* GL_MAP1_VERTEX_4 */
-   { 15280, 0x00008660 }, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
-   { 15308, 0x0000866A }, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
-   { 15337, 0x0000866B }, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
-   { 15366, 0x0000866C }, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
-   { 15395, 0x0000866D }, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
-   { 15424, 0x0000866E }, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
-   { 15453, 0x0000866F }, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
-   { 15482, 0x00008661 }, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
-   { 15510, 0x00008662 }, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
-   { 15538, 0x00008663 }, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
-   { 15566, 0x00008664 }, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
-   { 15594, 0x00008665 }, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
-   { 15622, 0x00008666 }, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
-   { 15650, 0x00008667 }, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
-   { 15678, 0x00008668 }, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
-   { 15706, 0x00008669 }, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
-   { 15734, 0x00000DB0 }, /* GL_MAP2_COLOR_4 */
-   { 15750, 0x00000DD2 }, /* GL_MAP2_GRID_DOMAIN */
-   { 15770, 0x00000DD3 }, /* GL_MAP2_GRID_SEGMENTS */
-   { 15792, 0x00000DB1 }, /* GL_MAP2_INDEX */
-   { 15806, 0x00000DB2 }, /* GL_MAP2_NORMAL */
-   { 15821, 0x00000DB3 }, /* GL_MAP2_TEXTURE_COORD_1 */
-   { 15845, 0x00000DB4 }, /* GL_MAP2_TEXTURE_COORD_2 */
-   { 15869, 0x00000DB5 }, /* GL_MAP2_TEXTURE_COORD_3 */
-   { 15893, 0x00000DB6 }, /* GL_MAP2_TEXTURE_COORD_4 */
-   { 15917, 0x00000DB7 }, /* GL_MAP2_VERTEX_3 */
-   { 15934, 0x00000DB8 }, /* GL_MAP2_VERTEX_4 */
-   { 15951, 0x00008670 }, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
-   { 15979, 0x0000867A }, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
-   { 16008, 0x0000867B }, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
-   { 16037, 0x0000867C }, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
-   { 16066, 0x0000867D }, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
-   { 16095, 0x0000867E }, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
-   { 16124, 0x0000867F }, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
-   { 16153, 0x00008671 }, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
-   { 16181, 0x00008672 }, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
-   { 16209, 0x00008673 }, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
-   { 16237, 0x00008674 }, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
-   { 16265, 0x00008675 }, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
-   { 16293, 0x00008676 }, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
-   { 16321, 0x00008677 }, /* GL_MAP2_VERTEX_ATTRIB7_4_NV */
-   { 16349, 0x00008678 }, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
-   { 16377, 0x00008679 }, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
-   { 16405, 0x00000D10 }, /* GL_MAP_COLOR */
-   { 16418, 0x00000010 }, /* GL_MAP_FLUSH_EXPLICIT_BIT */
-   { 16444, 0x00000008 }, /* GL_MAP_INVALIDATE_BUFFER_BIT */
-   { 16473, 0x00000004 }, /* GL_MAP_INVALIDATE_RANGE_BIT */
-   { 16501, 0x00000001 }, /* GL_MAP_READ_BIT */
-   { 16517, 0x00000D11 }, /* GL_MAP_STENCIL */
-   { 16532, 0x00000020 }, /* GL_MAP_UNSYNCHRONIZED_BIT */
-   { 16558, 0x00000002 }, /* GL_MAP_WRITE_BIT */
-   { 16575, 0x000088C0 }, /* GL_MATRIX0_ARB */
-   { 16590, 0x00008630 }, /* GL_MATRIX0_NV */
-   { 16604, 0x000088CA }, /* GL_MATRIX10_ARB */
-   { 16620, 0x000088CB }, /* GL_MATRIX11_ARB */
-   { 16636, 0x000088CC }, /* GL_MATRIX12_ARB */
-   { 16652, 0x000088CD }, /* GL_MATRIX13_ARB */
-   { 16668, 0x000088CE }, /* GL_MATRIX14_ARB */
-   { 16684, 0x000088CF }, /* GL_MATRIX15_ARB */
-   { 16700, 0x000088D0 }, /* GL_MATRIX16_ARB */
-   { 16716, 0x000088D1 }, /* GL_MATRIX17_ARB */
-   { 16732, 0x000088D2 }, /* GL_MATRIX18_ARB */
-   { 16748, 0x000088D3 }, /* GL_MATRIX19_ARB */
-   { 16764, 0x000088C1 }, /* GL_MATRIX1_ARB */
-   { 16779, 0x00008631 }, /* GL_MATRIX1_NV */
-   { 16793, 0x000088D4 }, /* GL_MATRIX20_ARB */
-   { 16809, 0x000088D5 }, /* GL_MATRIX21_ARB */
-   { 16825, 0x000088D6 }, /* GL_MATRIX22_ARB */
-   { 16841, 0x000088D7 }, /* GL_MATRIX23_ARB */
-   { 16857, 0x000088D8 }, /* GL_MATRIX24_ARB */
-   { 16873, 0x000088D9 }, /* GL_MATRIX25_ARB */
-   { 16889, 0x000088DA }, /* GL_MATRIX26_ARB */
-   { 16905, 0x000088DB }, /* GL_MATRIX27_ARB */
-   { 16921, 0x000088DC }, /* GL_MATRIX28_ARB */
-   { 16937, 0x000088DD }, /* GL_MATRIX29_ARB */
-   { 16953, 0x000088C2 }, /* GL_MATRIX2_ARB */
-   { 16968, 0x00008632 }, /* GL_MATRIX2_NV */
-   { 16982, 0x000088DE }, /* GL_MATRIX30_ARB */
-   { 16998, 0x000088DF }, /* GL_MATRIX31_ARB */
-   { 17014, 0x000088C3 }, /* GL_MATRIX3_ARB */
-   { 17029, 0x00008633 }, /* GL_MATRIX3_NV */
-   { 17043, 0x000088C4 }, /* GL_MATRIX4_ARB */
-   { 17058, 0x00008634 }, /* GL_MATRIX4_NV */
-   { 17072, 0x000088C5 }, /* GL_MATRIX5_ARB */
-   { 17087, 0x00008635 }, /* GL_MATRIX5_NV */
-   { 17101, 0x000088C6 }, /* GL_MATRIX6_ARB */
-   { 17116, 0x00008636 }, /* GL_MATRIX6_NV */
-   { 17130, 0x000088C7 }, /* GL_MATRIX7_ARB */
-   { 17145, 0x00008637 }, /* GL_MATRIX7_NV */
-   { 17159, 0x000088C8 }, /* GL_MATRIX8_ARB */
-   { 17174, 0x000088C9 }, /* GL_MATRIX9_ARB */
-   { 17189, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_ARB */
-   { 17215, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
-   { 17249, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
-   { 17280, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
-   { 17313, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
-   { 17344, 0x00000BA0 }, /* GL_MATRIX_MODE */
-   { 17359, 0x00008840 }, /* GL_MATRIX_PALETTE_ARB */
-   { 17381, 0x00008008 }, /* GL_MAX */
-   { 17388, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE */
-   { 17411, 0x000088FF }, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
-   { 17443, 0x00000D35 }, /* GL_MAX_ATTRIB_STACK_DEPTH */
-   { 17469, 0x00000D3B }, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
-   { 17502, 0x00008177 }, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
-   { 17528, 0x00008178 }, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-   { 17562, 0x00000D32 }, /* GL_MAX_CLIP_PLANES */
-   { 17581, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
-   { 17610, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
-   { 17642, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI */
-   { 17678, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
-   { 17714, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB */
-   { 17754, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT */
-   { 17780, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT_EXT */
-   { 17810, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH */
-   { 17835, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH_EXT */
-   { 17864, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
-   { 17893, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB */
-   { 17926, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS */
-   { 17946, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ARB */
-   { 17970, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ATI */
-   { 17994, 0x000080E9 }, /* GL_MAX_ELEMENTS_INDICES */
-   { 18018, 0x000080E8 }, /* GL_MAX_ELEMENTS_VERTICES */
-   { 18043, 0x00000D30 }, /* GL_MAX_EVAL_ORDER */
-   { 18061, 0x00008008 }, /* GL_MAX_EXT */
-   { 18072, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
-   { 18107, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB */
-   { 18146, 0x00000D31 }, /* GL_MAX_LIGHTS */
-   { 18160, 0x00000B31 }, /* GL_MAX_LIST_NESTING */
-   { 18180, 0x00008841 }, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
-   { 18218, 0x00000D36 }, /* GL_MAX_MODELVIEW_STACK_DEPTH */
-   { 18247, 0x00000D37 }, /* GL_MAX_NAME_STACK_DEPTH */
-   { 18271, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_ARB */
-   { 18299, 0x00000D34 }, /* GL_MAX_PIXEL_MAP_TABLE */
-   { 18322, 0x000088B1 }, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
-   { 18359, 0x0000880B }, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
-   { 18395, 0x000088AD }, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
-   { 18422, 0x000088F5 }, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
-   { 18451, 0x000088B5 }, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
-   { 18485, 0x000088F4 }, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
-   { 18521, 0x000088F6 }, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
-   { 18548, 0x000088A1 }, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
-   { 18580, 0x000088B4 }, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
-   { 18616, 0x000088F8 }, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
-   { 18645, 0x000088F7 }, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
-   { 18674, 0x0000862F }, /* GL_MAX_PROGRAM_MATRICES_ARB */
-   { 18702, 0x0000862E }, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
-   { 18740, 0x000088B3 }, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-   { 18784, 0x0000880E }, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-   { 18827, 0x000088AF }, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
-   { 18861, 0x000088A3 }, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-   { 18900, 0x000088AB }, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
-   { 18937, 0x000088A7 }, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
-   { 18975, 0x00008810 }, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-   { 19018, 0x0000880F }, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-   { 19061, 0x000088A9 }, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
-   { 19091, 0x000088A5 }, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
-   { 19122, 0x0000880D }, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
-   { 19158, 0x0000880C }, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
-   { 19194, 0x00000D38 }, /* GL_MAX_PROJECTION_STACK_DEPTH */
-   { 19224, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
-   { 19258, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_NV */
-   { 19291, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
-   { 19320, 0x00008D57 }, /* GL_MAX_SAMPLES */
-   { 19335, 0x00008504 }, /* GL_MAX_SHININESS_NV */
-   { 19355, 0x00008505 }, /* GL_MAX_SPOT_EXPONENT_NV */
-   { 19379, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS */
-   { 19401, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS_ARB */
-   { 19427, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS */
-   { 19454, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS_ARB */
-   { 19485, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS */
-   { 19509, 0x000084FF }, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
-   { 19543, 0x00000D33 }, /* GL_MAX_TEXTURE_SIZE */
-   { 19563, 0x00000D39 }, /* GL_MAX_TEXTURE_STACK_DEPTH */
-   { 19590, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS */
-   { 19611, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS_ARB */
-   { 19636, 0x0000862F }, /* GL_MAX_TRACK_MATRICES_NV */
-   { 19661, 0x0000862E }, /* GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */
-   { 19696, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS */
-   { 19718, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS_ARB */
-   { 19744, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS */
-   { 19766, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS_ARB */
-   { 19792, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
-   { 19826, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
-   { 19864, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
-   { 19897, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB */
-   { 19934, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_ARB */
-   { 19958, 0x00000D3A }, /* GL_MAX_VIEWPORT_DIMS */
-   { 19979, 0x00008007 }, /* GL_MIN */
-   { 19986, 0x0000802E }, /* GL_MINMAX */
-   { 19996, 0x0000802E }, /* GL_MINMAX_EXT */
-   { 20010, 0x0000802F }, /* GL_MINMAX_FORMAT */
-   { 20027, 0x0000802F }, /* GL_MINMAX_FORMAT_EXT */
-   { 20048, 0x00008030 }, /* GL_MINMAX_SINK */
-   { 20063, 0x00008030 }, /* GL_MINMAX_SINK_EXT */
-   { 20082, 0x00008007 }, /* GL_MIN_EXT */
-   { 20093, 0x00008370 }, /* GL_MIRRORED_REPEAT */
-   { 20112, 0x00008370 }, /* GL_MIRRORED_REPEAT_ARB */
-   { 20135, 0x00008370 }, /* GL_MIRRORED_REPEAT_IBM */
-   { 20158, 0x00008742 }, /* GL_MIRROR_CLAMP_ATI */
-   { 20178, 0x00008742 }, /* GL_MIRROR_CLAMP_EXT */
-   { 20198, 0x00008912 }, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
-   { 20228, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_ATI */
-   { 20256, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
-   { 20284, 0x00001700 }, /* GL_MODELVIEW */
-   { 20297, 0x00001700 }, /* GL_MODELVIEW0_ARB */
-   { 20315, 0x0000872A }, /* GL_MODELVIEW10_ARB */
-   { 20334, 0x0000872B }, /* GL_MODELVIEW11_ARB */
-   { 20353, 0x0000872C }, /* GL_MODELVIEW12_ARB */
-   { 20372, 0x0000872D }, /* GL_MODELVIEW13_ARB */
-   { 20391, 0x0000872E }, /* GL_MODELVIEW14_ARB */
-   { 20410, 0x0000872F }, /* GL_MODELVIEW15_ARB */
-   { 20429, 0x00008730 }, /* GL_MODELVIEW16_ARB */
-   { 20448, 0x00008731 }, /* GL_MODELVIEW17_ARB */
-   { 20467, 0x00008732 }, /* GL_MODELVIEW18_ARB */
-   { 20486, 0x00008733 }, /* GL_MODELVIEW19_ARB */
-   { 20505, 0x0000850A }, /* GL_MODELVIEW1_ARB */
-   { 20523, 0x00008734 }, /* GL_MODELVIEW20_ARB */
-   { 20542, 0x00008735 }, /* GL_MODELVIEW21_ARB */
-   { 20561, 0x00008736 }, /* GL_MODELVIEW22_ARB */
-   { 20580, 0x00008737 }, /* GL_MODELVIEW23_ARB */
-   { 20599, 0x00008738 }, /* GL_MODELVIEW24_ARB */
-   { 20618, 0x00008739 }, /* GL_MODELVIEW25_ARB */
-   { 20637, 0x0000873A }, /* GL_MODELVIEW26_ARB */
-   { 20656, 0x0000873B }, /* GL_MODELVIEW27_ARB */
-   { 20675, 0x0000873C }, /* GL_MODELVIEW28_ARB */
-   { 20694, 0x0000873D }, /* GL_MODELVIEW29_ARB */
-   { 20713, 0x00008722 }, /* GL_MODELVIEW2_ARB */
-   { 20731, 0x0000873E }, /* GL_MODELVIEW30_ARB */
-   { 20750, 0x0000873F }, /* GL_MODELVIEW31_ARB */
-   { 20769, 0x00008723 }, /* GL_MODELVIEW3_ARB */
-   { 20787, 0x00008724 }, /* GL_MODELVIEW4_ARB */
-   { 20805, 0x00008725 }, /* GL_MODELVIEW5_ARB */
-   { 20823, 0x00008726 }, /* GL_MODELVIEW6_ARB */
-   { 20841, 0x00008727 }, /* GL_MODELVIEW7_ARB */
-   { 20859, 0x00008728 }, /* GL_MODELVIEW8_ARB */
-   { 20877, 0x00008729 }, /* GL_MODELVIEW9_ARB */
-   { 20895, 0x00000BA6 }, /* GL_MODELVIEW_MATRIX */
-   { 20915, 0x00008629 }, /* GL_MODELVIEW_PROJECTION_NV */
-   { 20942, 0x00000BA3 }, /* GL_MODELVIEW_STACK_DEPTH */
-   { 20967, 0x00002100 }, /* GL_MODULATE */
-   { 20979, 0x00008744 }, /* GL_MODULATE_ADD_ATI */
-   { 20999, 0x00008745 }, /* GL_MODULATE_SIGNED_ADD_ATI */
-   { 21026, 0x00008746 }, /* GL_MODULATE_SUBTRACT_ATI */
-   { 21051, 0x00000103 }, /* GL_MULT */
-   { 21059, 0x0000809D }, /* GL_MULTISAMPLE */
-   { 21074, 0x000086B2 }, /* GL_MULTISAMPLE_3DFX */
-   { 21094, 0x0000809D }, /* GL_MULTISAMPLE_ARB */
-   { 21113, 0x20000000 }, /* GL_MULTISAMPLE_BIT */
-   { 21132, 0x20000000 }, /* GL_MULTISAMPLE_BIT_3DFX */
-   { 21156, 0x20000000 }, /* GL_MULTISAMPLE_BIT_ARB */
-   { 21179, 0x00008534 }, /* GL_MULTISAMPLE_FILTER_HINT_NV */
-   { 21209, 0x00002A25 }, /* GL_N3F_V3F */
-   { 21220, 0x00000D70 }, /* GL_NAME_STACK_DEPTH */
-   { 21240, 0x0000150E }, /* GL_NAND */
-   { 21248, 0x00002600 }, /* GL_NEAREST */
-   { 21259, 0x0000844E }, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
-   { 21290, 0x0000844D }, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
-   { 21322, 0x00002702 }, /* GL_NEAREST_MIPMAP_LINEAR */
-   { 21347, 0x00002700 }, /* GL_NEAREST_MIPMAP_NEAREST */
-   { 21373, 0x00000200 }, /* GL_NEVER */
-   { 21382, 0x00001102 }, /* GL_NICEST */
-   { 21392, 0x00000000 }, /* GL_NONE */
-   { 21400, 0x00001505 }, /* GL_NOOP */
-   { 21408, 0x00001508 }, /* GL_NOR */
-   { 21415, 0x00000BA1 }, /* GL_NORMALIZE */
-   { 21428, 0x00008075 }, /* GL_NORMAL_ARRAY */
-   { 21444, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
-   { 21475, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING_ARB */
-   { 21510, 0x0000808F }, /* GL_NORMAL_ARRAY_POINTER */
-   { 21534, 0x0000807F }, /* GL_NORMAL_ARRAY_STRIDE */
-   { 21557, 0x0000807E }, /* GL_NORMAL_ARRAY_TYPE */
-   { 21578, 0x00008511 }, /* GL_NORMAL_MAP */
-   { 21592, 0x00008511 }, /* GL_NORMAL_MAP_ARB */
-   { 21610, 0x00008511 }, /* GL_NORMAL_MAP_NV */
-   { 21627, 0x00000205 }, /* GL_NOTEQUAL */
-   { 21639, 0x00000000 }, /* GL_NO_ERROR */
-   { 21651, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
-   { 21685, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB */
-   { 21723, 0x00008B89 }, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */
-   { 21755, 0x00008B8A }, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */
-   { 21797, 0x00008B86 }, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */
-   { 21827, 0x00008B87 }, /* GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB */
-   { 21867, 0x00008B85 }, /* GL_OBJECT_ATTACHED_OBJECTS_ARB */
-   { 21898, 0x00008B81 }, /* GL_OBJECT_COMPILE_STATUS_ARB */
-   { 21927, 0x00008B80 }, /* GL_OBJECT_DELETE_STATUS_ARB */
-   { 21955, 0x00008B84 }, /* GL_OBJECT_INFO_LOG_LENGTH_ARB */
-   { 21985, 0x00002401 }, /* GL_OBJECT_LINEAR */
-   { 22002, 0x00008B82 }, /* GL_OBJECT_LINK_STATUS_ARB */
-   { 22028, 0x00002501 }, /* GL_OBJECT_PLANE */
-   { 22044, 0x00008B88 }, /* GL_OBJECT_SHADER_SOURCE_LENGTH_ARB */
-   { 22079, 0x00008B4F }, /* GL_OBJECT_SUBTYPE_ARB */
-   { 22101, 0x00008B4E }, /* GL_OBJECT_TYPE_ARB */
-   { 22120, 0x00008B83 }, /* GL_OBJECT_VALIDATE_STATUS_ARB */
-   { 22150, 0x00008165 }, /* GL_OCCLUSION_TEST_HP */
-   { 22171, 0x00008166 }, /* GL_OCCLUSION_TEST_RESULT_HP */
-   { 22199, 0x00000001 }, /* GL_ONE */
-   { 22206, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA */
-   { 22234, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA_EXT */
-   { 22266, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR */
-   { 22294, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR_EXT */
-   { 22326, 0x00000305 }, /* GL_ONE_MINUS_DST_ALPHA */
-   { 22349, 0x00000307 }, /* GL_ONE_MINUS_DST_COLOR */
-   { 22372, 0x00000303 }, /* GL_ONE_MINUS_SRC_ALPHA */
-   { 22395, 0x00000301 }, /* GL_ONE_MINUS_SRC_COLOR */
-   { 22418, 0x00008598 }, /* GL_OPERAND0_ALPHA */
-   { 22436, 0x00008598 }, /* GL_OPERAND0_ALPHA_ARB */
-   { 22458, 0x00008598 }, /* GL_OPERAND0_ALPHA_EXT */
-   { 22480, 0x00008590 }, /* GL_OPERAND0_RGB */
-   { 22496, 0x00008590 }, /* GL_OPERAND0_RGB_ARB */
-   { 22516, 0x00008590 }, /* GL_OPERAND0_RGB_EXT */
-   { 22536, 0x00008599 }, /* GL_OPERAND1_ALPHA */
-   { 22554, 0x00008599 }, /* GL_OPERAND1_ALPHA_ARB */
-   { 22576, 0x00008599 }, /* GL_OPERAND1_ALPHA_EXT */
-   { 22598, 0x00008591 }, /* GL_OPERAND1_RGB */
-   { 22614, 0x00008591 }, /* GL_OPERAND1_RGB_ARB */
-   { 22634, 0x00008591 }, /* GL_OPERAND1_RGB_EXT */
-   { 22654, 0x0000859A }, /* GL_OPERAND2_ALPHA */
-   { 22672, 0x0000859A }, /* GL_OPERAND2_ALPHA_ARB */
-   { 22694, 0x0000859A }, /* GL_OPERAND2_ALPHA_EXT */
-   { 22716, 0x00008592 }, /* GL_OPERAND2_RGB */
-   { 22732, 0x00008592 }, /* GL_OPERAND2_RGB_ARB */
-   { 22752, 0x00008592 }, /* GL_OPERAND2_RGB_EXT */
-   { 22772, 0x0000859B }, /* GL_OPERAND3_ALPHA_NV */
-   { 22793, 0x00008593 }, /* GL_OPERAND3_RGB_NV */
-   { 22812, 0x00001507 }, /* GL_OR */
-   { 22818, 0x00000A01 }, /* GL_ORDER */
-   { 22827, 0x0000150D }, /* GL_OR_INVERTED */
-   { 22842, 0x0000150B }, /* GL_OR_REVERSE */
-   { 22856, 0x00000505 }, /* GL_OUT_OF_MEMORY */
-   { 22873, 0x00000D05 }, /* GL_PACK_ALIGNMENT */
-   { 22891, 0x0000806C }, /* GL_PACK_IMAGE_HEIGHT */
-   { 22912, 0x00008758 }, /* GL_PACK_INVERT_MESA */
-   { 22932, 0x00000D01 }, /* GL_PACK_LSB_FIRST */
-   { 22950, 0x00000D02 }, /* GL_PACK_ROW_LENGTH */
-   { 22969, 0x0000806B }, /* GL_PACK_SKIP_IMAGES */
-   { 22989, 0x00000D04 }, /* GL_PACK_SKIP_PIXELS */
-   { 23009, 0x00000D03 }, /* GL_PACK_SKIP_ROWS */
-   { 23027, 0x00000D00 }, /* GL_PACK_SWAP_BYTES */
-   { 23046, 0x00008B92 }, /* GL_PALETTE4_R5_G6_B5_OES */
-   { 23071, 0x00008B94 }, /* GL_PALETTE4_RGB5_A1_OES */
-   { 23095, 0x00008B90 }, /* GL_PALETTE4_RGB8_OES */
-   { 23116, 0x00008B93 }, /* GL_PALETTE4_RGBA4_OES */
-   { 23138, 0x00008B91 }, /* GL_PALETTE4_RGBA8_OES */
-   { 23160, 0x00008B97 }, /* GL_PALETTE8_R5_G6_B5_OES */
-   { 23185, 0x00008B99 }, /* GL_PALETTE8_RGB5_A1_OES */
-   { 23209, 0x00008B95 }, /* GL_PALETTE8_RGB8_OES */
-   { 23230, 0x00008B98 }, /* GL_PALETTE8_RGBA4_OES */
-   { 23252, 0x00008B96 }, /* GL_PALETTE8_RGBA8_OES */
-   { 23274, 0x00000700 }, /* GL_PASS_THROUGH_TOKEN */
-   { 23296, 0x00000C50 }, /* GL_PERSPECTIVE_CORRECTION_HINT */
-   { 23327, 0x00000C79 }, /* GL_PIXEL_MAP_A_TO_A */
-   { 23347, 0x00000CB9 }, /* GL_PIXEL_MAP_A_TO_A_SIZE */
-   { 23372, 0x00000C78 }, /* GL_PIXEL_MAP_B_TO_B */
-   { 23392, 0x00000CB8 }, /* GL_PIXEL_MAP_B_TO_B_SIZE */
-   { 23417, 0x00000C77 }, /* GL_PIXEL_MAP_G_TO_G */
-   { 23437, 0x00000CB7 }, /* GL_PIXEL_MAP_G_TO_G_SIZE */
-   { 23462, 0x00000C75 }, /* GL_PIXEL_MAP_I_TO_A */
-   { 23482, 0x00000CB5 }, /* GL_PIXEL_MAP_I_TO_A_SIZE */
-   { 23507, 0x00000C74 }, /* GL_PIXEL_MAP_I_TO_B */
-   { 23527, 0x00000CB4 }, /* GL_PIXEL_MAP_I_TO_B_SIZE */
-   { 23552, 0x00000C73 }, /* GL_PIXEL_MAP_I_TO_G */
-   { 23572, 0x00000CB3 }, /* GL_PIXEL_MAP_I_TO_G_SIZE */
-   { 23597, 0x00000C70 }, /* GL_PIXEL_MAP_I_TO_I */
-   { 23617, 0x00000CB0 }, /* GL_PIXEL_MAP_I_TO_I_SIZE */
-   { 23642, 0x00000C72 }, /* GL_PIXEL_MAP_I_TO_R */
-   { 23662, 0x00000CB2 }, /* GL_PIXEL_MAP_I_TO_R_SIZE */
-   { 23687, 0x00000C76 }, /* GL_PIXEL_MAP_R_TO_R */
-   { 23707, 0x00000CB6 }, /* GL_PIXEL_MAP_R_TO_R_SIZE */
-   { 23732, 0x00000C71 }, /* GL_PIXEL_MAP_S_TO_S */
-   { 23752, 0x00000CB1 }, /* GL_PIXEL_MAP_S_TO_S_SIZE */
-   { 23777, 0x00000020 }, /* GL_PIXEL_MODE_BIT */
-   { 23795, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER */
-   { 23816, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING */
-   { 23845, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING_EXT */
-   { 23878, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER_EXT */
-   { 23903, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER */
-   { 23926, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
-   { 23957, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING_EXT */
-   { 23992, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER_EXT */
-   { 24019, 0x00001B00 }, /* GL_POINT */
-   { 24028, 0x00000000 }, /* GL_POINTS */
-   { 24038, 0x00000002 }, /* GL_POINT_BIT */
-   { 24051, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION */
-   { 24081, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_ARB */
-   { 24115, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_EXT */
-   { 24149, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_SGIS */
-   { 24184, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE */
-   { 24213, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_ARB */
-   { 24246, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_EXT */
-   { 24279, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_SGIS */
-   { 24313, 0x00000B11 }, /* GL_POINT_SIZE */
-   { 24327, 0x00000B13 }, /* GL_POINT_SIZE_GRANULARITY */
-   { 24353, 0x00008127 }, /* GL_POINT_SIZE_MAX */
-   { 24371, 0x00008127 }, /* GL_POINT_SIZE_MAX_ARB */
-   { 24393, 0x00008127 }, /* GL_POINT_SIZE_MAX_EXT */
-   { 24415, 0x00008127 }, /* GL_POINT_SIZE_MAX_SGIS */
-   { 24438, 0x00008126 }, /* GL_POINT_SIZE_MIN */
-   { 24456, 0x00008126 }, /* GL_POINT_SIZE_MIN_ARB */
-   { 24478, 0x00008126 }, /* GL_POINT_SIZE_MIN_EXT */
-   { 24500, 0x00008126 }, /* GL_POINT_SIZE_MIN_SGIS */
-   { 24523, 0x00000B12 }, /* GL_POINT_SIZE_RANGE */
-   { 24543, 0x00000B10 }, /* GL_POINT_SMOOTH */
-   { 24559, 0x00000C51 }, /* GL_POINT_SMOOTH_HINT */
-   { 24580, 0x00008861 }, /* GL_POINT_SPRITE */
-   { 24596, 0x00008861 }, /* GL_POINT_SPRITE_ARB */
-   { 24616, 0x00008CA0 }, /* GL_POINT_SPRITE_COORD_ORIGIN */
-   { 24645, 0x00008861 }, /* GL_POINT_SPRITE_NV */
-   { 24664, 0x00008863 }, /* GL_POINT_SPRITE_R_MODE_NV */
-   { 24690, 0x00000701 }, /* GL_POINT_TOKEN */
-   { 24705, 0x00000009 }, /* GL_POLYGON */
-   { 24716, 0x00000008 }, /* GL_POLYGON_BIT */
-   { 24731, 0x00000B40 }, /* GL_POLYGON_MODE */
-   { 24747, 0x00008039 }, /* GL_POLYGON_OFFSET_BIAS */
-   { 24770, 0x00008038 }, /* GL_POLYGON_OFFSET_FACTOR */
-   { 24795, 0x00008037 }, /* GL_POLYGON_OFFSET_FILL */
-   { 24818, 0x00002A02 }, /* GL_POLYGON_OFFSET_LINE */
-   { 24841, 0x00002A01 }, /* GL_POLYGON_OFFSET_POINT */
-   { 24865, 0x00002A00 }, /* GL_POLYGON_OFFSET_UNITS */
-   { 24889, 0x00000B41 }, /* GL_POLYGON_SMOOTH */
-   { 24907, 0x00000C53 }, /* GL_POLYGON_SMOOTH_HINT */
-   { 24930, 0x00000B42 }, /* GL_POLYGON_STIPPLE */
-   { 24949, 0x00000010 }, /* GL_POLYGON_STIPPLE_BIT */
-   { 24972, 0x00000703 }, /* GL_POLYGON_TOKEN */
-   { 24989, 0x00001203 }, /* GL_POSITION */
-   { 25001, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
-   { 25033, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI */
-   { 25069, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
-   { 25102, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI */
-   { 25139, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
-   { 25170, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI */
-   { 25205, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
-   { 25237, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI */
-   { 25273, 0x000080D2 }, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
-   { 25306, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
-   { 25338, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI */
-   { 25374, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
-   { 25407, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI */
-   { 25444, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS */
-   { 25474, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS_SGI */
-   { 25508, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE */
-   { 25539, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE_SGI */
-   { 25574, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
-   { 25605, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS_EXT */
-   { 25640, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
-   { 25672, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE_EXT */
-   { 25708, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS */
-   { 25738, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS_EXT */
-   { 25772, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE */
-   { 25803, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE_EXT */
-   { 25838, 0x000080D1 }, /* GL_POST_CONVOLUTION_COLOR_TABLE */
-   { 25870, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS */
-   { 25901, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS_EXT */
-   { 25936, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE */
-   { 25968, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE_EXT */
-   { 26004, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS */
-   { 26033, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS_EXT */
-   { 26066, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE */
-   { 26096, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE_EXT */
-   { 26130, 0x0000817B }, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
-   { 26169, 0x00008179 }, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
-   { 26202, 0x0000817C }, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
-   { 26242, 0x0000817A }, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
-   { 26276, 0x00008578 }, /* GL_PREVIOUS */
-   { 26288, 0x00008578 }, /* GL_PREVIOUS_ARB */
-   { 26304, 0x00008578 }, /* GL_PREVIOUS_EXT */
-   { 26320, 0x00008577 }, /* GL_PRIMARY_COLOR */
-   { 26337, 0x00008577 }, /* GL_PRIMARY_COLOR_ARB */
-   { 26358, 0x00008577 }, /* GL_PRIMARY_COLOR_EXT */
-   { 26379, 0x000088B0 }, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
-   { 26412, 0x00008805 }, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
-   { 26444, 0x000088AC }, /* GL_PROGRAM_ATTRIBS_ARB */
-   { 26467, 0x00008677 }, /* GL_PROGRAM_BINDING_ARB */
-   { 26490, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_ARB */
-   { 26520, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_NV */
-   { 26549, 0x00008874 }, /* GL_PROGRAM_ERROR_STRING_ARB */
-   { 26577, 0x00008876 }, /* GL_PROGRAM_FORMAT_ARB */
-   { 26599, 0x00008875 }, /* GL_PROGRAM_FORMAT_ASCII_ARB */
-   { 26627, 0x000088A0 }, /* GL_PROGRAM_INSTRUCTIONS_ARB */
-   { 26655, 0x00008627 }, /* GL_PROGRAM_LENGTH_ARB */
-   { 26677, 0x00008627 }, /* GL_PROGRAM_LENGTH_NV */
-   { 26698, 0x000088B2 }, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-   { 26738, 0x00008808 }, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-   { 26777, 0x000088AE }, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
-   { 26807, 0x000088A2 }, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-   { 26842, 0x000088AA }, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
-   { 26875, 0x000088A6 }, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
-   { 26909, 0x0000880A }, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-   { 26948, 0x00008809 }, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-   { 26987, 0x00008B40 }, /* GL_PROGRAM_OBJECT_ARB */
-   { 27009, 0x000088A8 }, /* GL_PROGRAM_PARAMETERS_ARB */
-   { 27035, 0x00008644 }, /* GL_PROGRAM_PARAMETER_NV */
-   { 27059, 0x00008647 }, /* GL_PROGRAM_RESIDENT_NV */
-   { 27082, 0x00008628 }, /* GL_PROGRAM_STRING_ARB */
-   { 27104, 0x00008628 }, /* GL_PROGRAM_STRING_NV */
-   { 27125, 0x00008646 }, /* GL_PROGRAM_TARGET_NV */
-   { 27146, 0x000088A4 }, /* GL_PROGRAM_TEMPORARIES_ARB */
-   { 27173, 0x00008807 }, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
-   { 27205, 0x00008806 }, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
-   { 27237, 0x000088B6 }, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-   { 27272, 0x00001701 }, /* GL_PROJECTION */
-   { 27286, 0x00000BA7 }, /* GL_PROJECTION_MATRIX */
-   { 27307, 0x00000BA4 }, /* GL_PROJECTION_STACK_DEPTH */
-   { 27333, 0x00008E4F }, /* GL_PROVOKING_VERTEX_EXT */
-   { 27357, 0x000080D3 }, /* GL_PROXY_COLOR_TABLE */
-   { 27378, 0x00008025 }, /* GL_PROXY_HISTOGRAM */
-   { 27397, 0x00008025 }, /* GL_PROXY_HISTOGRAM_EXT */
-   { 27420, 0x000080D5 }, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
-   { 27459, 0x000080D4 }, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
-   { 27497, 0x00008063 }, /* GL_PROXY_TEXTURE_1D */
-   { 27517, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
-   { 27547, 0x00008063 }, /* GL_PROXY_TEXTURE_1D_EXT */
-   { 27571, 0x00008064 }, /* GL_PROXY_TEXTURE_2D */
-   { 27591, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
-   { 27621, 0x00008064 }, /* GL_PROXY_TEXTURE_2D_EXT */
-   { 27645, 0x00008070 }, /* GL_PROXY_TEXTURE_3D */
-   { 27665, 0x000080BD }, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
-   { 27698, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP */
-   { 27724, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP_ARB */
-   { 27754, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
-   { 27785, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_NV */
-   { 27815, 0x00002003 }, /* GL_Q */
-   { 27820, 0x00001209 }, /* GL_QUADRATIC_ATTENUATION */
-   { 27845, 0x00000007 }, /* GL_QUADS */
-   { 27854, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT */
-   { 27902, 0x00008614 }, /* GL_QUAD_MESH_SUN */
-   { 27919, 0x00000008 }, /* GL_QUAD_STRIP */
-   { 27933, 0x00008864 }, /* GL_QUERY_COUNTER_BITS */
-   { 27955, 0x00008864 }, /* GL_QUERY_COUNTER_BITS_ARB */
-   { 27981, 0x00008866 }, /* GL_QUERY_RESULT */
-   { 27997, 0x00008866 }, /* GL_QUERY_RESULT_ARB */
-   { 28017, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE */
-   { 28043, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE_ARB */
-   { 28073, 0x00002002 }, /* GL_R */
-   { 28078, 0x00002A10 }, /* GL_R3_G3_B2 */
-   { 28090, 0x00019262 }, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
-   { 28123, 0x00000C02 }, /* GL_READ_BUFFER */
-   { 28138, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER */
-   { 28158, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
-   { 28190, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER_EXT */
-   { 28214, 0x000088B8 }, /* GL_READ_ONLY */
-   { 28227, 0x000088B8 }, /* GL_READ_ONLY_ARB */
-   { 28244, 0x000088BA }, /* GL_READ_WRITE */
-   { 28258, 0x000088BA }, /* GL_READ_WRITE_ARB */
-   { 28276, 0x00001903 }, /* GL_RED */
-   { 28283, 0x00008016 }, /* GL_REDUCE */
-   { 28293, 0x00008016 }, /* GL_REDUCE_EXT */
-   { 28307, 0x00000D15 }, /* GL_RED_BIAS */
-   { 28319, 0x00000D52 }, /* GL_RED_BITS */
-   { 28331, 0x00000D14 }, /* GL_RED_SCALE */
-   { 28344, 0x00008512 }, /* GL_REFLECTION_MAP */
-   { 28362, 0x00008512 }, /* GL_REFLECTION_MAP_ARB */
-   { 28384, 0x00008512 }, /* GL_REFLECTION_MAP_NV */
-   { 28405, 0x00001C00 }, /* GL_RENDER */
-   { 28415, 0x00008D41 }, /* GL_RENDERBUFFER */
-   { 28431, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE */
-   { 28458, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_EXT */
-   { 28486, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE */
-   { 28512, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE */
-   { 28539, 0x00008D41 }, /* GL_RENDERBUFFER_EXT */
-   { 28559, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE */
-   { 28586, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT */
-   { 28609, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_EXT */
-   { 28636, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
-   { 28668, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */
-   { 28704, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE */
-   { 28729, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES */
-   { 28753, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE */
-   { 28782, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH */
-   { 28804, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_EXT */
-   { 28830, 0x00001F01 }, /* GL_RENDERER */
-   { 28842, 0x00000C40 }, /* GL_RENDER_MODE */
-   { 28857, 0x00002901 }, /* GL_REPEAT */
-   { 28867, 0x00001E01 }, /* GL_REPLACE */
-   { 28878, 0x00008062 }, /* GL_REPLACE_EXT */
-   { 28893, 0x00008153 }, /* GL_REPLICATE_BORDER_HP */
-   { 28916, 0x0000803A }, /* GL_RESCALE_NORMAL */
-   { 28934, 0x0000803A }, /* GL_RESCALE_NORMAL_EXT */
-   { 28956, 0x00000102 }, /* GL_RETURN */
-   { 28966, 0x00001907 }, /* GL_RGB */
-   { 28973, 0x00008052 }, /* GL_RGB10 */
-   { 28982, 0x00008059 }, /* GL_RGB10_A2 */
-   { 28994, 0x00008059 }, /* GL_RGB10_A2_EXT */
-   { 29010, 0x00008052 }, /* GL_RGB10_EXT */
-   { 29023, 0x00008053 }, /* GL_RGB12 */
-   { 29032, 0x00008053 }, /* GL_RGB12_EXT */
-   { 29045, 0x00008054 }, /* GL_RGB16 */
-   { 29054, 0x00008054 }, /* GL_RGB16_EXT */
-   { 29067, 0x0000804E }, /* GL_RGB2_EXT */
-   { 29079, 0x0000804F }, /* GL_RGB4 */
-   { 29087, 0x0000804F }, /* GL_RGB4_EXT */
-   { 29099, 0x000083A1 }, /* GL_RGB4_S3TC */
-   { 29112, 0x00008050 }, /* GL_RGB5 */
-   { 29120, 0x00008057 }, /* GL_RGB5_A1 */
-   { 29131, 0x00008057 }, /* GL_RGB5_A1_EXT */
-   { 29146, 0x00008050 }, /* GL_RGB5_EXT */
-   { 29158, 0x00008051 }, /* GL_RGB8 */
-   { 29166, 0x00008051 }, /* GL_RGB8_EXT */
-   { 29178, 0x00001908 }, /* GL_RGBA */
-   { 29186, 0x0000805A }, /* GL_RGBA12 */
-   { 29196, 0x0000805A }, /* GL_RGBA12_EXT */
-   { 29210, 0x0000805B }, /* GL_RGBA16 */
-   { 29220, 0x0000805B }, /* GL_RGBA16_EXT */
-   { 29234, 0x00008055 }, /* GL_RGBA2 */
-   { 29243, 0x00008055 }, /* GL_RGBA2_EXT */
-   { 29256, 0x00008056 }, /* GL_RGBA4 */
-   { 29265, 0x000083A5 }, /* GL_RGBA4_DXT5_S3TC */
-   { 29284, 0x00008056 }, /* GL_RGBA4_EXT */
-   { 29297, 0x000083A3 }, /* GL_RGBA4_S3TC */
-   { 29311, 0x00008058 }, /* GL_RGBA8 */
-   { 29320, 0x00008058 }, /* GL_RGBA8_EXT */
-   { 29333, 0x00008F97 }, /* GL_RGBA8_SNORM */
-   { 29348, 0x000083A4 }, /* GL_RGBA_DXT5_S3TC */
-   { 29366, 0x00000C31 }, /* GL_RGBA_MODE */
-   { 29379, 0x000083A2 }, /* GL_RGBA_S3TC */
-   { 29392, 0x00008F93 }, /* GL_RGBA_SNORM */
-   { 29406, 0x000083A0 }, /* GL_RGB_S3TC */
-   { 29418, 0x00008573 }, /* GL_RGB_SCALE */
-   { 29431, 0x00008573 }, /* GL_RGB_SCALE_ARB */
-   { 29448, 0x00008573 }, /* GL_RGB_SCALE_EXT */
-   { 29465, 0x00000407 }, /* GL_RIGHT */
-   { 29474, 0x00002000 }, /* GL_S */
-   { 29479, 0x00008B5D }, /* GL_SAMPLER_1D */
-   { 29493, 0x00008B61 }, /* GL_SAMPLER_1D_SHADOW */
-   { 29514, 0x00008B5E }, /* GL_SAMPLER_2D */
-   { 29528, 0x00008B62 }, /* GL_SAMPLER_2D_SHADOW */
-   { 29549, 0x00008B5F }, /* GL_SAMPLER_3D */
-   { 29563, 0x00008B60 }, /* GL_SAMPLER_CUBE */
-   { 29579, 0x000080A9 }, /* GL_SAMPLES */
-   { 29590, 0x000086B4 }, /* GL_SAMPLES_3DFX */
-   { 29606, 0x000080A9 }, /* GL_SAMPLES_ARB */
-   { 29621, 0x00008914 }, /* GL_SAMPLES_PASSED */
-   { 29639, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */
-   { 29661, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
-   { 29689, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */
-   { 29721, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */
-   { 29744, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */
-   { 29771, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */
-   { 29789, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */
-   { 29812, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */
-   { 29834, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */
-   { 29853, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */
-   { 29876, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */
-   { 29902, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */
-   { 29932, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */
-   { 29957, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */
-   { 29986, 0x00080000 }, /* GL_SCISSOR_BIT */
-   { 30001, 0x00000C10 }, /* GL_SCISSOR_BOX */
-   { 30016, 0x00000C11 }, /* GL_SCISSOR_TEST */
-   { 30032, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */
-   { 30057, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
-   { 30097, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */
-   { 30141, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
-   { 30174, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
-   { 30204, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
-   { 30236, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
-   { 30266, 0x00001C02 }, /* GL_SELECT */
-   { 30276, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */
-   { 30304, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */
-   { 30329, 0x00008012 }, /* GL_SEPARABLE_2D */
-   { 30345, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */
-   { 30372, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */
-   { 30403, 0x0000150F }, /* GL_SET */
-   { 30410, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */
-   { 30431, 0x00008B88 }, /* GL_SHADER_SOURCE_LENGTH */
-   { 30455, 0x00008B4F }, /* GL_SHADER_TYPE */
-   { 30470, 0x00000B54 }, /* GL_SHADE_MODEL */
-   { 30485, 0x00008B8C }, /* GL_SHADING_LANGUAGE_VERSION */
-   { 30513, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */
-   { 30536, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */
-   { 30566, 0x00001601 }, /* GL_SHININESS */
-   { 30579, 0x00001402 }, /* GL_SHORT */
-   { 30588, 0x00008F9C }, /* GL_SIGNED_NORMALIZED */
-   { 30609, 0x000081F9 }, /* GL_SINGLE_COLOR */
-   { 30625, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */
-   { 30645, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */
-   { 30664, 0x00008C46 }, /* GL_SLUMINANCE */
-   { 30678, 0x00008C47 }, /* GL_SLUMINANCE8 */
-   { 30693, 0x00008C45 }, /* GL_SLUMINANCE8_ALPHA8 */
-   { 30715, 0x00008C44 }, /* GL_SLUMINANCE_ALPHA */
-   { 30735, 0x00001D01 }, /* GL_SMOOTH */
-   { 30745, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */
-   { 30778, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */
-   { 30805, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */
-   { 30838, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */
-   { 30865, 0x00008588 }, /* GL_SOURCE0_ALPHA */
-   { 30882, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */
-   { 30903, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */
-   { 30924, 0x00008580 }, /* GL_SOURCE0_RGB */
-   { 30939, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */
-   { 30958, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */
-   { 30977, 0x00008589 }, /* GL_SOURCE1_ALPHA */
-   { 30994, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */
-   { 31015, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */
-   { 31036, 0x00008581 }, /* GL_SOURCE1_RGB */
-   { 31051, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */
-   { 31070, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */
-   { 31089, 0x0000858A }, /* GL_SOURCE2_ALPHA */
-   { 31106, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */
-   { 31127, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */
-   { 31148, 0x00008582 }, /* GL_SOURCE2_RGB */
-   { 31163, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */
-   { 31182, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */
-   { 31201, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */
-   { 31221, 0x00008583 }, /* GL_SOURCE3_RGB_NV */
-   { 31239, 0x00001202 }, /* GL_SPECULAR */
-   { 31251, 0x00002402 }, /* GL_SPHERE_MAP */
-   { 31265, 0x00001206 }, /* GL_SPOT_CUTOFF */
-   { 31280, 0x00001204 }, /* GL_SPOT_DIRECTION */
-   { 31298, 0x00001205 }, /* GL_SPOT_EXPONENT */
-   { 31315, 0x00008588 }, /* GL_SRC0_ALPHA */
-   { 31329, 0x00008580 }, /* GL_SRC0_RGB */
-   { 31341, 0x00008589 }, /* GL_SRC1_ALPHA */
-   { 31355, 0x00008581 }, /* GL_SRC1_RGB */
-   { 31367, 0x0000858A }, /* GL_SRC2_ALPHA */
-   { 31381, 0x00008582 }, /* GL_SRC2_RGB */
-   { 31393, 0x00000302 }, /* GL_SRC_ALPHA */
-   { 31406, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */
-   { 31428, 0x00000300 }, /* GL_SRC_COLOR */
-   { 31441, 0x00008C40 }, /* GL_SRGB */
-   { 31449, 0x00008C41 }, /* GL_SRGB8 */
-   { 31458, 0x00008C43 }, /* GL_SRGB8_ALPHA8 */
-   { 31474, 0x00008C42 }, /* GL_SRGB_ALPHA */
-   { 31488, 0x00000503 }, /* GL_STACK_OVERFLOW */
-   { 31506, 0x00000504 }, /* GL_STACK_UNDERFLOW */
-   { 31525, 0x000088E6 }, /* GL_STATIC_COPY */
-   { 31540, 0x000088E6 }, /* GL_STATIC_COPY_ARB */
-   { 31559, 0x000088E4 }, /* GL_STATIC_DRAW */
-   { 31574, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */
-   { 31593, 0x000088E5 }, /* GL_STATIC_READ */
-   { 31608, 0x000088E5 }, /* GL_STATIC_READ_ARB */
-   { 31627, 0x00001802 }, /* GL_STENCIL */
-   { 31638, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT */
-   { 31660, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */
-   { 31686, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */
-   { 31707, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */
-   { 31732, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
-   { 31753, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */
-   { 31778, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-   { 31810, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */
-   { 31846, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
-   { 31878, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */
-   { 31914, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
-   { 31934, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
-   { 31961, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
-   { 31987, 0x00000D57 }, /* GL_STENCIL_BITS */
-   { 32003, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
-   { 32025, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
-   { 32048, 0x00000B94 }, /* GL_STENCIL_FAIL */
-   { 32064, 0x00000B92 }, /* GL_STENCIL_FUNC */
-   { 32080, 0x00001901 }, /* GL_STENCIL_INDEX */
-   { 32097, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
-   { 32120, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
-   { 32142, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
-   { 32164, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
-   { 32186, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
-   { 32207, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
-   { 32234, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
-   { 32261, 0x00000B97 }, /* GL_STENCIL_REF */
-   { 32276, 0x00000B90 }, /* GL_STENCIL_TEST */
-   { 32292, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
-   { 32321, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
-   { 32343, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
-   { 32364, 0x00000C33 }, /* GL_STEREO */
-   { 32374, 0x000088E2 }, /* GL_STREAM_COPY */
-   { 32389, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
-   { 32408, 0x000088E0 }, /* GL_STREAM_DRAW */
-   { 32423, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
-   { 32442, 0x000088E1 }, /* GL_STREAM_READ */
-   { 32457, 0x000088E1 }, /* GL_STREAM_READ_ARB */
-   { 32476, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
-   { 32493, 0x000084E7 }, /* GL_SUBTRACT */
-   { 32505, 0x000084E7 }, /* GL_SUBTRACT_ARB */
-   { 32521, 0x00002001 }, /* GL_T */
-   { 32526, 0x00002A2A }, /* GL_T2F_C3F_V3F */
-   { 32541, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
-   { 32560, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
-   { 32576, 0x00002A2B }, /* GL_T2F_N3F_V3F */
-   { 32591, 0x00002A27 }, /* GL_T2F_V3F */
-   { 32602, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
-   { 32621, 0x00002A28 }, /* GL_T4F_V4F */
-   { 32632, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
-   { 32655, 0x00001702 }, /* GL_TEXTURE */
-   { 32666, 0x000084C0 }, /* GL_TEXTURE0 */
-   { 32678, 0x000084C0 }, /* GL_TEXTURE0_ARB */
-   { 32694, 0x000084C1 }, /* GL_TEXTURE1 */
-   { 32706, 0x000084CA }, /* GL_TEXTURE10 */
-   { 32719, 0x000084CA }, /* GL_TEXTURE10_ARB */
-   { 32736, 0x000084CB }, /* GL_TEXTURE11 */
-   { 32749, 0x000084CB }, /* GL_TEXTURE11_ARB */
-   { 32766, 0x000084CC }, /* GL_TEXTURE12 */
-   { 32779, 0x000084CC }, /* GL_TEXTURE12_ARB */
-   { 32796, 0x000084CD }, /* GL_TEXTURE13 */
-   { 32809, 0x000084CD }, /* GL_TEXTURE13_ARB */
-   { 32826, 0x000084CE }, /* GL_TEXTURE14 */
-   { 32839, 0x000084CE }, /* GL_TEXTURE14_ARB */
-   { 32856, 0x000084CF }, /* GL_TEXTURE15 */
-   { 32869, 0x000084CF }, /* GL_TEXTURE15_ARB */
-   { 32886, 0x000084D0 }, /* GL_TEXTURE16 */
-   { 32899, 0x000084D0 }, /* GL_TEXTURE16_ARB */
-   { 32916, 0x000084D1 }, /* GL_TEXTURE17 */
-   { 32929, 0x000084D1 }, /* GL_TEXTURE17_ARB */
-   { 32946, 0x000084D2 }, /* GL_TEXTURE18 */
-   { 32959, 0x000084D2 }, /* GL_TEXTURE18_ARB */
-   { 32976, 0x000084D3 }, /* GL_TEXTURE19 */
-   { 32989, 0x000084D3 }, /* GL_TEXTURE19_ARB */
-   { 33006, 0x000084C1 }, /* GL_TEXTURE1_ARB */
-   { 33022, 0x000084C2 }, /* GL_TEXTURE2 */
-   { 33034, 0x000084D4 }, /* GL_TEXTURE20 */
-   { 33047, 0x000084D4 }, /* GL_TEXTURE20_ARB */
-   { 33064, 0x000084D5 }, /* GL_TEXTURE21 */
-   { 33077, 0x000084D5 }, /* GL_TEXTURE21_ARB */
-   { 33094, 0x000084D6 }, /* GL_TEXTURE22 */
-   { 33107, 0x000084D6 }, /* GL_TEXTURE22_ARB */
-   { 33124, 0x000084D7 }, /* GL_TEXTURE23 */
-   { 33137, 0x000084D7 }, /* GL_TEXTURE23_ARB */
-   { 33154, 0x000084D8 }, /* GL_TEXTURE24 */
-   { 33167, 0x000084D8 }, /* GL_TEXTURE24_ARB */
-   { 33184, 0x000084D9 }, /* GL_TEXTURE25 */
-   { 33197, 0x000084D9 }, /* GL_TEXTURE25_ARB */
-   { 33214, 0x000084DA }, /* GL_TEXTURE26 */
-   { 33227, 0x000084DA }, /* GL_TEXTURE26_ARB */
-   { 33244, 0x000084DB }, /* GL_TEXTURE27 */
-   { 33257, 0x000084DB }, /* GL_TEXTURE27_ARB */
-   { 33274, 0x000084DC }, /* GL_TEXTURE28 */
-   { 33287, 0x000084DC }, /* GL_TEXTURE28_ARB */
-   { 33304, 0x000084DD }, /* GL_TEXTURE29 */
-   { 33317, 0x000084DD }, /* GL_TEXTURE29_ARB */
-   { 33334, 0x000084C2 }, /* GL_TEXTURE2_ARB */
-   { 33350, 0x000084C3 }, /* GL_TEXTURE3 */
-   { 33362, 0x000084DE }, /* GL_TEXTURE30 */
-   { 33375, 0x000084DE }, /* GL_TEXTURE30_ARB */
-   { 33392, 0x000084DF }, /* GL_TEXTURE31 */
-   { 33405, 0x000084DF }, /* GL_TEXTURE31_ARB */
-   { 33422, 0x000084C3 }, /* GL_TEXTURE3_ARB */
-   { 33438, 0x000084C4 }, /* GL_TEXTURE4 */
-   { 33450, 0x000084C4 }, /* GL_TEXTURE4_ARB */
-   { 33466, 0x000084C5 }, /* GL_TEXTURE5 */
-   { 33478, 0x000084C5 }, /* GL_TEXTURE5_ARB */
-   { 33494, 0x000084C6 }, /* GL_TEXTURE6 */
-   { 33506, 0x000084C6 }, /* GL_TEXTURE6_ARB */
-   { 33522, 0x000084C7 }, /* GL_TEXTURE7 */
-   { 33534, 0x000084C7 }, /* GL_TEXTURE7_ARB */
-   { 33550, 0x000084C8 }, /* GL_TEXTURE8 */
-   { 33562, 0x000084C8 }, /* GL_TEXTURE8_ARB */
-   { 33578, 0x000084C9 }, /* GL_TEXTURE9 */
-   { 33590, 0x000084C9 }, /* GL_TEXTURE9_ARB */
-   { 33606, 0x00000DE0 }, /* GL_TEXTURE_1D */
-   { 33620, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
-   { 33644, 0x00000DE1 }, /* GL_TEXTURE_2D */
-   { 33658, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
-   { 33682, 0x0000806F }, /* GL_TEXTURE_3D */
-   { 33696, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
-   { 33718, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
-   { 33744, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
-   { 33766, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
-   { 33788, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
-   { 33820, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
-   { 33842, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
-   { 33874, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
-   { 33896, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
-   { 33924, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
-   { 33956, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
-   { 33989, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
-   { 34021, 0x00040000 }, /* GL_TEXTURE_BIT */
-   { 34036, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
-   { 34057, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
-   { 34082, 0x00001005 }, /* GL_TEXTURE_BORDER */
-   { 34100, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
-   { 34124, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-   { 34155, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
-   { 34185, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-   { 34215, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-   { 34250, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-   { 34281, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-   { 34319, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
-   { 34346, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
-   { 34378, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
-   { 34412, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
-   { 34436, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
-   { 34464, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
-   { 34488, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
-   { 34516, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-   { 34549, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
-   { 34573, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
-   { 34595, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
-   { 34617, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
-   { 34643, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
-   { 34677, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-   { 34710, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
-   { 34747, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
-   { 34775, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
-   { 34807, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
-   { 34830, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
-   { 34868, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
-   { 34910, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
-   { 34941, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-   { 34969, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
-   { 34999, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-   { 35027, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
-   { 35047, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
-   { 35071, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-   { 35102, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
-   { 35137, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-   { 35168, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
-   { 35203, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
-   { 35234, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
-   { 35269, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-   { 35300, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
-   { 35335, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-   { 35366, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
-   { 35401, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-   { 35432, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
-   { 35467, 0x00008071 }, /* GL_TEXTURE_DEPTH */
-   { 35484, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
-   { 35506, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
-   { 35532, 0x00002300 }, /* GL_TEXTURE_ENV */
-   { 35547, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
-   { 35568, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
-   { 35588, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
-   { 35614, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
-   { 35634, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
-   { 35651, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
-   { 35668, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
-   { 35685, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
-   { 35702, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
-   { 35727, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
-   { 35749, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
-   { 35775, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
-   { 35793, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
-   { 35819, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
-   { 35845, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
-   { 35875, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
-   { 35902, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
-   { 35927, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
-   { 35947, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
-   { 35971, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
-   { 35998, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-   { 36025, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-   { 36052, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
-   { 36078, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
-   { 36108, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
-   { 36130, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
-   { 36148, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
-   { 36178, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
-   { 36206, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-   { 36234, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-   { 36262, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
-   { 36283, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
-   { 36302, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
-   { 36324, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
-   { 36343, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
-   { 36363, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
-   { 36388, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
-   { 36412, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
-   { 36432, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
-   { 36456, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
-   { 36476, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
-   { 36499, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */
-   { 36523, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
-   { 36548, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
-   { 36582, 0x00001000 }, /* GL_TEXTURE_WIDTH */
-   { 36599, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
-   { 36617, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
-   { 36635, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
-   { 36653, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
-   { 36673, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
-   { 36692, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-   { 36721, 0x00001000 }, /* GL_TRANSFORM_BIT */
-   { 36738, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
-   { 36764, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
-   { 36794, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-   { 36826, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-   { 36856, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
-   { 36890, 0x0000862C }, /* GL_TRANSPOSE_NV */
-   { 36906, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-   { 36937, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
-   { 36972, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-   { 37000, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
-   { 37032, 0x00000004 }, /* GL_TRIANGLES */
-   { 37045, 0x00000006 }, /* GL_TRIANGLE_FAN */
-   { 37061, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
-   { 37082, 0x00000005 }, /* GL_TRIANGLE_STRIP */
-   { 37100, 0x00000001 }, /* GL_TRUE */
-   { 37108, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
-   { 37128, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
-   { 37151, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
-   { 37171, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
-   { 37192, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
-   { 37214, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
-   { 37236, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
-   { 37256, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
-   { 37277, 0x00001401 }, /* GL_UNSIGNED_BYTE */
-   { 37294, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-   { 37321, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
-   { 37344, 0x00001405 }, /* GL_UNSIGNED_INT */
-   { 37360, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
-   { 37387, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */
-   { 37408, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
-   { 37432, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-   { 37463, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
-   { 37487, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-   { 37515, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */
-   { 37538, 0x00001403 }, /* GL_UNSIGNED_SHORT */
-   { 37556, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-   { 37586, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-   { 37612, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-   { 37642, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-   { 37668, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
-   { 37692, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-   { 37720, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-   { 37748, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
-   { 37775, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-   { 37807, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
-   { 37838, 0x00008CA2 }, /* GL_UPPER_LEFT */
-   { 37852, 0x00002A20 }, /* GL_V2F */
-   { 37859, 0x00002A21 }, /* GL_V3F */
-   { 37866, 0x00008B83 }, /* GL_VALIDATE_STATUS */
-   { 37885, 0x00001F00 }, /* GL_VENDOR */
-   { 37895, 0x00001F02 }, /* GL_VERSION */
-   { 37906, 0x00008074 }, /* GL_VERTEX_ARRAY */
-   { 37922, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING */
-   { 37946, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
-   { 37976, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-   { 38007, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
-   { 38042, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
-   { 38066, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
-   { 38087, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
-   { 38110, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
-   { 38131, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-   { 38158, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-   { 38186, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-   { 38214, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-   { 38242, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-   { 38270, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-   { 38298, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
-   { 38326, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-   { 38353, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-   { 38380, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-   { 38407, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-   { 38434, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-   { 38461, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-   { 38488, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-   { 38515, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-   { 38542, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-   { 38569, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-   { 38607, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
-   { 38649, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-   { 38680, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
-   { 38715, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
-   { 38749, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
-   { 38787, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-   { 38818, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
-   { 38853, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-   { 38881, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
-   { 38913, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-   { 38943, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
-   { 38977, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
-   { 39005, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
-   { 39037, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
-   { 39057, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
-   { 39079, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
-   { 39108, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
-   { 39129, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-   { 39158, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
-   { 39191, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
-   { 39223, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-   { 39250, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
-   { 39281, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
-   { 39311, 0x00008B31 }, /* GL_VERTEX_SHADER */
-   { 39328, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
-   { 39349, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
-   { 39376, 0x00000BA2 }, /* GL_VIEWPORT */
-   { 39388, 0x00000800 }, /* GL_VIEWPORT_BIT */
-   { 39404, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
-   { 39424, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-   { 39455, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
-   { 39490, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-   { 39518, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-   { 39543, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-   { 39570, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-   { 39595, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
-   { 39619, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
-   { 39638, 0x000088B9 }, /* GL_WRITE_ONLY */
-   { 39652, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
-   { 39670, 0x00001506 }, /* GL_XOR */
-   { 39677, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
-   { 39696, 0x00008757 }, /* GL_YCBCR_MESA */
-   { 39710, 0x00000000 }, /* GL_ZERO */
-   { 39718, 0x00000D16 }, /* GL_ZOOM_X */
-   { 39728, 0x00000D17 }, /* GL_ZOOM_Y */
+   {  1687, 0x00008A13 }, /* GL_BUFFER_FLUSHING_UNMAP_APPLE */
+   {  1718, 0x000088BC }, /* GL_BUFFER_MAPPED */
+   {  1735, 0x000088BC }, /* GL_BUFFER_MAPPED_ARB */
+   {  1756, 0x000088BD }, /* GL_BUFFER_MAP_POINTER */
+   {  1778, 0x000088BD }, /* GL_BUFFER_MAP_POINTER_ARB */
+   {  1804, 0x00008A12 }, /* GL_BUFFER_SERIALIZED_MODIFY_APPLE */
+   {  1838, 0x00008764 }, /* GL_BUFFER_SIZE */
+   {  1853, 0x00008764 }, /* GL_BUFFER_SIZE_ARB */
+   {  1872, 0x00008765 }, /* GL_BUFFER_USAGE */
+   {  1888, 0x00008765 }, /* GL_BUFFER_USAGE_ARB */
+   {  1908, 0x0000877B }, /* GL_BUMP_ENVMAP_ATI */
+   {  1927, 0x00008777 }, /* GL_BUMP_NUM_TEX_UNITS_ATI */
+   {  1953, 0x00008775 }, /* GL_BUMP_ROT_MATRIX_ATI */
+   {  1976, 0x00008776 }, /* GL_BUMP_ROT_MATRIX_SIZE_ATI */
+   {  2004, 0x0000877C }, /* GL_BUMP_TARGET_ATI */
+   {  2023, 0x00008778 }, /* GL_BUMP_TEX_UNITS_ATI */
+   {  2045, 0x00001400 }, /* GL_BYTE */
+   {  2053, 0x00002A24 }, /* GL_C3F_V3F */
+   {  2064, 0x00002A26 }, /* GL_C4F_N3F_V3F */
+   {  2079, 0x00002A22 }, /* GL_C4UB_V2F */
+   {  2091, 0x00002A23 }, /* GL_C4UB_V3F */
+   {  2103, 0x00000901 }, /* GL_CCW */
+   {  2110, 0x00002900 }, /* GL_CLAMP */
+   {  2119, 0x0000812D }, /* GL_CLAMP_TO_BORDER */
+   {  2138, 0x0000812D }, /* GL_CLAMP_TO_BORDER_ARB */
+   {  2161, 0x0000812D }, /* GL_CLAMP_TO_BORDER_SGIS */
+   {  2185, 0x0000812F }, /* GL_CLAMP_TO_EDGE */
+   {  2202, 0x0000812F }, /* GL_CLAMP_TO_EDGE_SGIS */
+   {  2224, 0x00001500 }, /* GL_CLEAR */
+   {  2233, 0x000084E1 }, /* GL_CLIENT_ACTIVE_TEXTURE */
+   {  2258, 0x000084E1 }, /* GL_CLIENT_ACTIVE_TEXTURE_ARB */
+   {  2287, 0xFFFFFFFF }, /* GL_CLIENT_ALL_ATTRIB_BITS */
+   {  2313, 0x00000BB1 }, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
+   {  2342, 0x00000001 }, /* GL_CLIENT_PIXEL_STORE_BIT */
+   {  2368, 0x00000002 }, /* GL_CLIENT_VERTEX_ARRAY_BIT */
+   {  2395, 0x00003000 }, /* GL_CLIP_PLANE0 */
+   {  2410, 0x00003001 }, /* GL_CLIP_PLANE1 */
+   {  2425, 0x00003002 }, /* GL_CLIP_PLANE2 */
+   {  2440, 0x00003003 }, /* GL_CLIP_PLANE3 */
+   {  2455, 0x00003004 }, /* GL_CLIP_PLANE4 */
+   {  2470, 0x00003005 }, /* GL_CLIP_PLANE5 */
+   {  2485, 0x000080F0 }, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
+   {  2518, 0x00000A00 }, /* GL_COEFF */
+   {  2527, 0x00001800 }, /* GL_COLOR */
+   {  2536, 0x00008076 }, /* GL_COLOR_ARRAY */
+   {  2551, 0x00008898 }, /* GL_COLOR_ARRAY_BUFFER_BINDING */
+   {  2581, 0x00008898 }, /* GL_COLOR_ARRAY_BUFFER_BINDING_ARB */
+   {  2615, 0x00008090 }, /* GL_COLOR_ARRAY_POINTER */
+   {  2638, 0x00008081 }, /* GL_COLOR_ARRAY_SIZE */
+   {  2658, 0x00008083 }, /* GL_COLOR_ARRAY_STRIDE */
+   {  2680, 0x00008082 }, /* GL_COLOR_ARRAY_TYPE */
+   {  2700, 0x00008CE0 }, /* GL_COLOR_ATTACHMENT0 */
+   {  2721, 0x00008CE0 }, /* GL_COLOR_ATTACHMENT0_EXT */
+   {  2746, 0x00008CE1 }, /* GL_COLOR_ATTACHMENT1 */
+   {  2767, 0x00008CEA }, /* GL_COLOR_ATTACHMENT10 */
+   {  2789, 0x00008CEA }, /* GL_COLOR_ATTACHMENT10_EXT */
+   {  2815, 0x00008CEB }, /* GL_COLOR_ATTACHMENT11 */
+   {  2837, 0x00008CEB }, /* GL_COLOR_ATTACHMENT11_EXT */
+   {  2863, 0x00008CEC }, /* GL_COLOR_ATTACHMENT12 */
+   {  2885, 0x00008CEC }, /* GL_COLOR_ATTACHMENT12_EXT */
+   {  2911, 0x00008CED }, /* GL_COLOR_ATTACHMENT13 */
+   {  2933, 0x00008CED }, /* GL_COLOR_ATTACHMENT13_EXT */
+   {  2959, 0x00008CEE }, /* GL_COLOR_ATTACHMENT14 */
+   {  2981, 0x00008CEE }, /* GL_COLOR_ATTACHMENT14_EXT */
+   {  3007, 0x00008CEF }, /* GL_COLOR_ATTACHMENT15 */
+   {  3029, 0x00008CEF }, /* GL_COLOR_ATTACHMENT15_EXT */
+   {  3055, 0x00008CE1 }, /* GL_COLOR_ATTACHMENT1_EXT */
+   {  3080, 0x00008CE2 }, /* GL_COLOR_ATTACHMENT2 */
+   {  3101, 0x00008CE2 }, /* GL_COLOR_ATTACHMENT2_EXT */
+   {  3126, 0x00008CE3 }, /* GL_COLOR_ATTACHMENT3 */
+   {  3147, 0x00008CE3 }, /* GL_COLOR_ATTACHMENT3_EXT */
+   {  3172, 0x00008CE4 }, /* GL_COLOR_ATTACHMENT4 */
+   {  3193, 0x00008CE4 }, /* GL_COLOR_ATTACHMENT4_EXT */
+   {  3218, 0x00008CE5 }, /* GL_COLOR_ATTACHMENT5 */
+   {  3239, 0x00008CE5 }, /* GL_COLOR_ATTACHMENT5_EXT */
+   {  3264, 0x00008CE6 }, /* GL_COLOR_ATTACHMENT6 */
+   {  3285, 0x00008CE6 }, /* GL_COLOR_ATTACHMENT6_EXT */
+   {  3310, 0x00008CE7 }, /* GL_COLOR_ATTACHMENT7 */
+   {  3331, 0x00008CE7 }, /* GL_COLOR_ATTACHMENT7_EXT */
+   {  3356, 0x00008CE8 }, /* GL_COLOR_ATTACHMENT8 */
+   {  3377, 0x00008CE8 }, /* GL_COLOR_ATTACHMENT8_EXT */
+   {  3402, 0x00008CE9 }, /* GL_COLOR_ATTACHMENT9 */
+   {  3423, 0x00008CE9 }, /* GL_COLOR_ATTACHMENT9_EXT */
+   {  3448, 0x00004000 }, /* GL_COLOR_BUFFER_BIT */
+   {  3468, 0x00000C22 }, /* GL_COLOR_CLEAR_VALUE */
+   {  3489, 0x00001900 }, /* GL_COLOR_INDEX */
+   {  3504, 0x00001603 }, /* GL_COLOR_INDEXES */
+   {  3521, 0x00000BF2 }, /* GL_COLOR_LOGIC_OP */
+   {  3539, 0x00000B57 }, /* GL_COLOR_MATERIAL */
+   {  3557, 0x00000B55 }, /* GL_COLOR_MATERIAL_FACE */
+   {  3580, 0x00000B56 }, /* GL_COLOR_MATERIAL_PARAMETER */
+   {  3608, 0x000080B1 }, /* GL_COLOR_MATRIX */
+   {  3624, 0x000080B1 }, /* GL_COLOR_MATRIX_SGI */
+   {  3644, 0x000080B2 }, /* GL_COLOR_MATRIX_STACK_DEPTH */
+   {  3672, 0x000080B2 }, /* GL_COLOR_MATRIX_STACK_DEPTH_SGI */
+   {  3704, 0x00008458 }, /* GL_COLOR_SUM */
+   {  3717, 0x00008458 }, /* GL_COLOR_SUM_ARB */
+   {  3734, 0x000080D0 }, /* GL_COLOR_TABLE */
+   {  3749, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE */
+   {  3775, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE_EXT */
+   {  3805, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE_SGI */
+   {  3835, 0x000080D7 }, /* GL_COLOR_TABLE_BIAS */
+   {  3855, 0x000080D7 }, /* GL_COLOR_TABLE_BIAS_SGI */
+   {  3879, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE */
+   {  3904, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE_EXT */
+   {  3933, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE_SGI */
+   {  3962, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT */
+   {  3984, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT_EXT */
+   {  4010, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT_SGI */
+   {  4036, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE */
+   {  4062, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE_EXT */
+   {  4092, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE_SGI */
+   {  4122, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE */
+   {  4152, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE_EXT */
+   {  4186, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE_SGI */
+   {  4220, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE */
+   {  4250, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE_EXT */
+   {  4284, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE_SGI */
+   {  4318, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE */
+   {  4342, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE_EXT */
+   {  4370, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE_SGI */
+   {  4398, 0x000080D6 }, /* GL_COLOR_TABLE_SCALE */
+   {  4419, 0x000080D6 }, /* GL_COLOR_TABLE_SCALE_SGI */
+   {  4444, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH */
+   {  4465, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH_EXT */
+   {  4490, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH_SGI */
+   {  4515, 0x00000C23 }, /* GL_COLOR_WRITEMASK */
+   {  4534, 0x00008570 }, /* GL_COMBINE */
+   {  4545, 0x00008503 }, /* GL_COMBINE4 */
+   {  4557, 0x00008572 }, /* GL_COMBINE_ALPHA */
+   {  4574, 0x00008572 }, /* GL_COMBINE_ALPHA_ARB */
+   {  4595, 0x00008572 }, /* GL_COMBINE_ALPHA_EXT */
+   {  4616, 0x00008570 }, /* GL_COMBINE_ARB */
+   {  4631, 0x00008570 }, /* GL_COMBINE_EXT */
+   {  4646, 0x00008571 }, /* GL_COMBINE_RGB */
+   {  4661, 0x00008571 }, /* GL_COMBINE_RGB_ARB */
+   {  4680, 0x00008571 }, /* GL_COMBINE_RGB_EXT */
+   {  4699, 0x0000884E }, /* GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT */
+   {  4735, 0x0000884E }, /* GL_COMPARE_R_TO_TEXTURE */
+   {  4759, 0x0000884E }, /* GL_COMPARE_R_TO_TEXTURE_ARB */
+   {  4787, 0x00001300 }, /* GL_COMPILE */
+   {  4798, 0x00001301 }, /* GL_COMPILE_AND_EXECUTE */
+   {  4821, 0x00008B81 }, /* GL_COMPILE_STATUS */
+   {  4839, 0x000084E9 }, /* GL_COMPRESSED_ALPHA */
+   {  4859, 0x000084E9 }, /* GL_COMPRESSED_ALPHA_ARB */
+   {  4883, 0x000084EC }, /* GL_COMPRESSED_INTENSITY */
+   {  4907, 0x000084EC }, /* GL_COMPRESSED_INTENSITY_ARB */
+   {  4935, 0x000084EA }, /* GL_COMPRESSED_LUMINANCE */
+   {  4959, 0x000084EB }, /* GL_COMPRESSED_LUMINANCE_ALPHA */
+   {  4989, 0x000084EB }, /* GL_COMPRESSED_LUMINANCE_ALPHA_ARB */
+   {  5023, 0x000084EA }, /* GL_COMPRESSED_LUMINANCE_ARB */
+   {  5051, 0x000084ED }, /* GL_COMPRESSED_RGB */
+   {  5069, 0x000084EE }, /* GL_COMPRESSED_RGBA */
+   {  5088, 0x000084EE }, /* GL_COMPRESSED_RGBA_ARB */
+   {  5111, 0x000086B1 }, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
+   {  5140, 0x000083F1 }, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
+   {  5173, 0x000083F2 }, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
+   {  5206, 0x000083F3 }, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */
+   {  5239, 0x000084ED }, /* GL_COMPRESSED_RGB_ARB */
+   {  5261, 0x000086B0 }, /* GL_COMPRESSED_RGB_FXT1_3DFX */
+   {  5289, 0x000083F0 }, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
+   {  5321, 0x00008C4A }, /* GL_COMPRESSED_SLUMINANCE */
+   {  5346, 0x00008C4B }, /* GL_COMPRESSED_SLUMINANCE_ALPHA */
+   {  5377, 0x00008C48 }, /* GL_COMPRESSED_SRGB */
+   {  5396, 0x00008C49 }, /* GL_COMPRESSED_SRGB_ALPHA */
+   {  5421, 0x000086A3 }, /* GL_COMPRESSED_TEXTURE_FORMATS */
+   {  5451, 0x00008576 }, /* GL_CONSTANT */
+   {  5463, 0x00008003 }, /* GL_CONSTANT_ALPHA */
+   {  5481, 0x00008003 }, /* GL_CONSTANT_ALPHA_EXT */
+   {  5503, 0x00008576 }, /* GL_CONSTANT_ARB */
+   {  5519, 0x00001207 }, /* GL_CONSTANT_ATTENUATION */
+   {  5543, 0x00008151 }, /* GL_CONSTANT_BORDER_HP */
+   {  5565, 0x00008001 }, /* GL_CONSTANT_COLOR */
+   {  5583, 0x00008001 }, /* GL_CONSTANT_COLOR_EXT */
+   {  5605, 0x00008576 }, /* GL_CONSTANT_EXT */
+   {  5621, 0x00008010 }, /* GL_CONVOLUTION_1D */
+   {  5639, 0x00008011 }, /* GL_CONVOLUTION_2D */
+   {  5657, 0x00008154 }, /* GL_CONVOLUTION_BORDER_COLOR */
+   {  5685, 0x00008154 }, /* GL_CONVOLUTION_BORDER_COLOR_HP */
+   {  5716, 0x00008013 }, /* GL_CONVOLUTION_BORDER_MODE */
+   {  5743, 0x00008013 }, /* GL_CONVOLUTION_BORDER_MODE_EXT */
+   {  5774, 0x00008015 }, /* GL_CONVOLUTION_FILTER_BIAS */
+   {  5801, 0x00008015 }, /* GL_CONVOLUTION_FILTER_BIAS_EXT */
+   {  5832, 0x00008014 }, /* GL_CONVOLUTION_FILTER_SCALE */
+   {  5860, 0x00008014 }, /* GL_CONVOLUTION_FILTER_SCALE_EXT */
+   {  5892, 0x00008017 }, /* GL_CONVOLUTION_FORMAT */
+   {  5914, 0x00008017 }, /* GL_CONVOLUTION_FORMAT_EXT */
+   {  5940, 0x00008019 }, /* GL_CONVOLUTION_HEIGHT */
+   {  5962, 0x00008019 }, /* GL_CONVOLUTION_HEIGHT_EXT */
+   {  5988, 0x00008018 }, /* GL_CONVOLUTION_WIDTH */
+   {  6009, 0x00008018 }, /* GL_CONVOLUTION_WIDTH_EXT */
+   {  6034, 0x00008862 }, /* GL_COORD_REPLACE */
+   {  6051, 0x00008862 }, /* GL_COORD_REPLACE_ARB */
+   {  6072, 0x00008862 }, /* GL_COORD_REPLACE_NV */
+   {  6092, 0x00001503 }, /* GL_COPY */
+   {  6100, 0x0000150C }, /* GL_COPY_INVERTED */
+   {  6117, 0x00000706 }, /* GL_COPY_PIXEL_TOKEN */
+   {  6137, 0x00008F36 }, /* GL_COPY_READ_BUFFER */
+   {  6157, 0x00008F37 }, /* GL_COPY_WRITE_BUFFER */
+   {  6178, 0x00000B44 }, /* GL_CULL_FACE */
+   {  6191, 0x00000B45 }, /* GL_CULL_FACE_MODE */
+   {  6209, 0x000081AA }, /* GL_CULL_VERTEX_EXT */
+   {  6228, 0x000081AC }, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
+   {  6260, 0x000081AB }, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
+   {  6295, 0x00008626 }, /* GL_CURRENT_ATTRIB_NV */
+   {  6316, 0x00000001 }, /* GL_CURRENT_BIT */
+   {  6331, 0x00000B00 }, /* GL_CURRENT_COLOR */
+   {  6348, 0x00008453 }, /* GL_CURRENT_FOG_COORD */
+   {  6369, 0x00008453 }, /* GL_CURRENT_FOG_COORDINATE */
+   {  6395, 0x00000B01 }, /* GL_CURRENT_INDEX */
+   {  6412, 0x00008641 }, /* GL_CURRENT_MATRIX_ARB */
+   {  6434, 0x00008845 }, /* GL_CURRENT_MATRIX_INDEX_ARB */
+   {  6462, 0x00008641 }, /* GL_CURRENT_MATRIX_NV */
+   {  6483, 0x00008640 }, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
+   {  6517, 0x00008640 }, /* GL_CURRENT_MATRIX_STACK_DEPTH_NV */
+   {  6550, 0x00000B02 }, /* GL_CURRENT_NORMAL */
+   {  6568, 0x00008843 }, /* GL_CURRENT_PALETTE_MATRIX_ARB */
+   {  6598, 0x00008B8D }, /* GL_CURRENT_PROGRAM */
+   {  6617, 0x00008865 }, /* GL_CURRENT_QUERY */
+   {  6634, 0x00008865 }, /* GL_CURRENT_QUERY_ARB */
+   {  6655, 0x00000B04 }, /* GL_CURRENT_RASTER_COLOR */
+   {  6679, 0x00000B09 }, /* GL_CURRENT_RASTER_DISTANCE */
+   {  6706, 0x00000B05 }, /* GL_CURRENT_RASTER_INDEX */
+   {  6730, 0x00000B07 }, /* GL_CURRENT_RASTER_POSITION */
+   {  6757, 0x00000B08 }, /* GL_CURRENT_RASTER_POSITION_VALID */
+   {  6790, 0x0000845F }, /* GL_CURRENT_RASTER_SECONDARY_COLOR */
+   {  6824, 0x00000B06 }, /* GL_CURRENT_RASTER_TEXTURE_COORDS */
+   {  6857, 0x00008459 }, /* GL_CURRENT_SECONDARY_COLOR */
+   {  6884, 0x00000B03 }, /* GL_CURRENT_TEXTURE_COORDS */
+   {  6910, 0x00008626 }, /* GL_CURRENT_VERTEX_ATTRIB */
+   {  6935, 0x00008626 }, /* GL_CURRENT_VERTEX_ATTRIB_ARB */
+   {  6964, 0x000086A8 }, /* GL_CURRENT_WEIGHT_ARB */
+   {  6986, 0x00000900 }, /* GL_CW */
+   {  6992, 0x0000875B }, /* GL_DEBUG_ASSERT_MESA */
+   {  7013, 0x00008759 }, /* GL_DEBUG_OBJECT_MESA */
+   {  7034, 0x0000875A }, /* GL_DEBUG_PRINT_MESA */
+   {  7054, 0x00002101 }, /* GL_DECAL */
+   {  7063, 0x00001E03 }, /* GL_DECR */
+   {  7071, 0x00008508 }, /* GL_DECR_WRAP */
+   {  7084, 0x00008508 }, /* GL_DECR_WRAP_EXT */
+   {  7101, 0x00008B80 }, /* GL_DELETE_STATUS */
+   {  7118, 0x00001801 }, /* GL_DEPTH */
+   {  7127, 0x000088F0 }, /* GL_DEPTH24_STENCIL8 */
+   {  7147, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT */
+   {  7167, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT_EXT */
+   {  7191, 0x00000D1F }, /* GL_DEPTH_BIAS */
+   {  7205, 0x00000D56 }, /* GL_DEPTH_BITS */
+   {  7219, 0x00008891 }, /* GL_DEPTH_BOUNDS_EXT */
+   {  7239, 0x00008890 }, /* GL_DEPTH_BOUNDS_TEST_EXT */
+   {  7264, 0x00000100 }, /* GL_DEPTH_BUFFER_BIT */
+   {  7284, 0x0000864F }, /* GL_DEPTH_CLAMP_NV */
+   {  7302, 0x00000B73 }, /* GL_DEPTH_CLEAR_VALUE */
+   {  7323, 0x00001902 }, /* GL_DEPTH_COMPONENT */
+   {  7342, 0x000081A5 }, /* GL_DEPTH_COMPONENT16 */
+   {  7363, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_ARB */
+   {  7388, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_SGIX */
+   {  7414, 0x000081A6 }, /* GL_DEPTH_COMPONENT24 */
+   {  7435, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_ARB */
+   {  7460, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_SGIX */
+   {  7486, 0x000081A7 }, /* GL_DEPTH_COMPONENT32 */
+   {  7507, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_ARB */
+   {  7532, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_SGIX */
+   {  7558, 0x00000B74 }, /* GL_DEPTH_FUNC */
+   {  7572, 0x00000B70 }, /* GL_DEPTH_RANGE */
+   {  7587, 0x00000D1E }, /* GL_DEPTH_SCALE */
+   {  7602, 0x000084F9 }, /* GL_DEPTH_STENCIL */
+   {  7619, 0x0000821A }, /* GL_DEPTH_STENCIL_ATTACHMENT */
+   {  7647, 0x000084F9 }, /* GL_DEPTH_STENCIL_NV */
+   {  7667, 0x0000886F }, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
+   {  7695, 0x0000886E }, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
+   {  7723, 0x00000B71 }, /* GL_DEPTH_TEST */
+   {  7737, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE */
+   {  7759, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE_ARB */
+   {  7785, 0x00000B72 }, /* GL_DEPTH_WRITEMASK */
+   {  7804, 0x00001201 }, /* GL_DIFFUSE */
+   {  7815, 0x00000BD0 }, /* GL_DITHER */
+   {  7825, 0x00000A02 }, /* GL_DOMAIN */
+   {  7835, 0x00001100 }, /* GL_DONT_CARE */
+   {  7848, 0x000086AE }, /* GL_DOT3_RGB */
+   {  7860, 0x000086AF }, /* GL_DOT3_RGBA */
+   {  7873, 0x000086AF }, /* GL_DOT3_RGBA_ARB */
+   {  7890, 0x00008741 }, /* GL_DOT3_RGBA_EXT */
+   {  7907, 0x000086AE }, /* GL_DOT3_RGB_ARB */
+   {  7923, 0x00008740 }, /* GL_DOT3_RGB_EXT */
+   {  7939, 0x0000140A }, /* GL_DOUBLE */
+   {  7949, 0x00000C32 }, /* GL_DOUBLEBUFFER */
+   {  7965, 0x00000C01 }, /* GL_DRAW_BUFFER */
+   {  7980, 0x00008825 }, /* GL_DRAW_BUFFER0 */
+   {  7996, 0x00008825 }, /* GL_DRAW_BUFFER0_ARB */
+   {  8016, 0x00008825 }, /* GL_DRAW_BUFFER0_ATI */
+   {  8036, 0x00008826 }, /* GL_DRAW_BUFFER1 */
+   {  8052, 0x0000882F }, /* GL_DRAW_BUFFER10 */
+   {  8069, 0x0000882F }, /* GL_DRAW_BUFFER10_ARB */
+   {  8090, 0x0000882F }, /* GL_DRAW_BUFFER10_ATI */
+   {  8111, 0x00008830 }, /* GL_DRAW_BUFFER11 */
+   {  8128, 0x00008830 }, /* GL_DRAW_BUFFER11_ARB */
+   {  8149, 0x00008830 }, /* GL_DRAW_BUFFER11_ATI */
+   {  8170, 0x00008831 }, /* GL_DRAW_BUFFER12 */
+   {  8187, 0x00008831 }, /* GL_DRAW_BUFFER12_ARB */
+   {  8208, 0x00008831 }, /* GL_DRAW_BUFFER12_ATI */
+   {  8229, 0x00008832 }, /* GL_DRAW_BUFFER13 */
+   {  8246, 0x00008832 }, /* GL_DRAW_BUFFER13_ARB */
+   {  8267, 0x00008832 }, /* GL_DRAW_BUFFER13_ATI */
+   {  8288, 0x00008833 }, /* GL_DRAW_BUFFER14 */
+   {  8305, 0x00008833 }, /* GL_DRAW_BUFFER14_ARB */
+   {  8326, 0x00008833 }, /* GL_DRAW_BUFFER14_ATI */
+   {  8347, 0x00008834 }, /* GL_DRAW_BUFFER15 */
+   {  8364, 0x00008834 }, /* GL_DRAW_BUFFER15_ARB */
+   {  8385, 0x00008834 }, /* GL_DRAW_BUFFER15_ATI */
+   {  8406, 0x00008826 }, /* GL_DRAW_BUFFER1_ARB */
+   {  8426, 0x00008826 }, /* GL_DRAW_BUFFER1_ATI */
+   {  8446, 0x00008827 }, /* GL_DRAW_BUFFER2 */
+   {  8462, 0x00008827 }, /* GL_DRAW_BUFFER2_ARB */
+   {  8482, 0x00008827 }, /* GL_DRAW_BUFFER2_ATI */
+   {  8502, 0x00008828 }, /* GL_DRAW_BUFFER3 */
+   {  8518, 0x00008828 }, /* GL_DRAW_BUFFER3_ARB */
+   {  8538, 0x00008828 }, /* GL_DRAW_BUFFER3_ATI */
+   {  8558, 0x00008829 }, /* GL_DRAW_BUFFER4 */
+   {  8574, 0x00008829 }, /* GL_DRAW_BUFFER4_ARB */
+   {  8594, 0x00008829 }, /* GL_DRAW_BUFFER4_ATI */
+   {  8614, 0x0000882A }, /* GL_DRAW_BUFFER5 */
+   {  8630, 0x0000882A }, /* GL_DRAW_BUFFER5_ARB */
+   {  8650, 0x0000882A }, /* GL_DRAW_BUFFER5_ATI */
+   {  8670, 0x0000882B }, /* GL_DRAW_BUFFER6 */
+   {  8686, 0x0000882B }, /* GL_DRAW_BUFFER6_ARB */
+   {  8706, 0x0000882B }, /* GL_DRAW_BUFFER6_ATI */
+   {  8726, 0x0000882C }, /* GL_DRAW_BUFFER7 */
+   {  8742, 0x0000882C }, /* GL_DRAW_BUFFER7_ARB */
+   {  8762, 0x0000882C }, /* GL_DRAW_BUFFER7_ATI */
+   {  8782, 0x0000882D }, /* GL_DRAW_BUFFER8 */
+   {  8798, 0x0000882D }, /* GL_DRAW_BUFFER8_ARB */
+   {  8818, 0x0000882D }, /* GL_DRAW_BUFFER8_ATI */
+   {  8838, 0x0000882E }, /* GL_DRAW_BUFFER9 */
+   {  8854, 0x0000882E }, /* GL_DRAW_BUFFER9_ARB */
+   {  8874, 0x0000882E }, /* GL_DRAW_BUFFER9_ATI */
+   {  8894, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER */
+   {  8914, 0x00008CA6 }, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
+   {  8946, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER_EXT */
+   {  8970, 0x00000705 }, /* GL_DRAW_PIXEL_TOKEN */
+   {  8990, 0x00000304 }, /* GL_DST_ALPHA */
+   {  9003, 0x00000306 }, /* GL_DST_COLOR */
+   {  9016, 0x0000877A }, /* GL_DU8DV8_ATI */
+   {  9030, 0x00008779 }, /* GL_DUDV_ATI */
+   {  9042, 0x000088EA }, /* GL_DYNAMIC_COPY */
+   {  9058, 0x000088EA }, /* GL_DYNAMIC_COPY_ARB */
+   {  9078, 0x000088E8 }, /* GL_DYNAMIC_DRAW */
+   {  9094, 0x000088E8 }, /* GL_DYNAMIC_DRAW_ARB */
+   {  9114, 0x000088E9 }, /* GL_DYNAMIC_READ */
+   {  9130, 0x000088E9 }, /* GL_DYNAMIC_READ_ARB */
+   {  9150, 0x00000B43 }, /* GL_EDGE_FLAG */
+   {  9163, 0x00008079 }, /* GL_EDGE_FLAG_ARRAY */
+   {  9182, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
+   {  9216, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB */
+   {  9254, 0x00008093 }, /* GL_EDGE_FLAG_ARRAY_POINTER */
+   {  9281, 0x0000808C }, /* GL_EDGE_FLAG_ARRAY_STRIDE */
+   {  9307, 0x00008893 }, /* GL_ELEMENT_ARRAY_BUFFER */
+   {  9331, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
+   {  9363, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB */
+   {  9399, 0x00001600 }, /* GL_EMISSION */
+   {  9411, 0x00002000 }, /* GL_ENABLE_BIT */
+   {  9425, 0x00000202 }, /* GL_EQUAL */
+   {  9434, 0x00001509 }, /* GL_EQUIV */
+   {  9443, 0x00010000 }, /* GL_EVAL_BIT */
+   {  9455, 0x00000800 }, /* GL_EXP */
+   {  9462, 0x00000801 }, /* GL_EXP2 */
+   {  9470, 0x00001F03 }, /* GL_EXTENSIONS */
+   {  9484, 0x00002400 }, /* GL_EYE_LINEAR */
+   {  9498, 0x00002502 }, /* GL_EYE_PLANE */
+   {  9511, 0x0000855C }, /* GL_EYE_PLANE_ABSOLUTE_NV */
+   {  9536, 0x0000855B }, /* GL_EYE_RADIAL_NV */
+   {  9553, 0x00000000 }, /* GL_FALSE */
+   {  9562, 0x00001101 }, /* GL_FASTEST */
+   {  9573, 0x00001C01 }, /* GL_FEEDBACK */
+   {  9585, 0x00000DF0 }, /* GL_FEEDBACK_BUFFER_POINTER */
+   {  9612, 0x00000DF1 }, /* GL_FEEDBACK_BUFFER_SIZE */
+   {  9636, 0x00000DF2 }, /* GL_FEEDBACK_BUFFER_TYPE */
+   {  9660, 0x00001B02 }, /* GL_FILL */
+   {  9668, 0x00008E4D }, /* GL_FIRST_VERTEX_CONVENTION_EXT */
+   {  9699, 0x00001D00 }, /* GL_FLAT */
+   {  9707, 0x00001406 }, /* GL_FLOAT */
+   {  9716, 0x00008B5A }, /* GL_FLOAT_MAT2 */
+   {  9730, 0x00008B5A }, /* GL_FLOAT_MAT2_ARB */
+   {  9748, 0x00008B65 }, /* GL_FLOAT_MAT2x3 */
+   {  9764, 0x00008B66 }, /* GL_FLOAT_MAT2x4 */
+   {  9780, 0x00008B5B }, /* GL_FLOAT_MAT3 */
+   {  9794, 0x00008B5B }, /* GL_FLOAT_MAT3_ARB */
+   {  9812, 0x00008B67 }, /* GL_FLOAT_MAT3x2 */
+   {  9828, 0x00008B68 }, /* GL_FLOAT_MAT3x4 */
+   {  9844, 0x00008B5C }, /* GL_FLOAT_MAT4 */
+   {  9858, 0x00008B5C }, /* GL_FLOAT_MAT4_ARB */
+   {  9876, 0x00008B69 }, /* GL_FLOAT_MAT4x2 */
+   {  9892, 0x00008B6A }, /* GL_FLOAT_MAT4x3 */
+   {  9908, 0x00008B50 }, /* GL_FLOAT_VEC2 */
+   {  9922, 0x00008B50 }, /* GL_FLOAT_VEC2_ARB */
+   {  9940, 0x00008B51 }, /* GL_FLOAT_VEC3 */
+   {  9954, 0x00008B51 }, /* GL_FLOAT_VEC3_ARB */
+   {  9972, 0x00008B52 }, /* GL_FLOAT_VEC4 */
+   {  9986, 0x00008B52 }, /* GL_FLOAT_VEC4_ARB */
+   { 10004, 0x00000B60 }, /* GL_FOG */
+   { 10011, 0x00000080 }, /* GL_FOG_BIT */
+   { 10022, 0x00000B66 }, /* GL_FOG_COLOR */
+   { 10035, 0x00008451 }, /* GL_FOG_COORD */
+   { 10048, 0x00008451 }, /* GL_FOG_COORDINATE */
+   { 10066, 0x00008457 }, /* GL_FOG_COORDINATE_ARRAY */
+   { 10090, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
+   { 10129, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB */
+   { 10172, 0x00008456 }, /* GL_FOG_COORDINATE_ARRAY_POINTER */
+   { 10204, 0x00008455 }, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
+   { 10235, 0x00008454 }, /* GL_FOG_COORDINATE_ARRAY_TYPE */
+   { 10264, 0x00008450 }, /* GL_FOG_COORDINATE_SOURCE */
+   { 10289, 0x00008457 }, /* GL_FOG_COORD_ARRAY */
+   { 10308, 0x0000889D }, /* GL_FOG_COORD_ARRAY_BUFFER_BINDING */
+   { 10342, 0x00008456 }, /* GL_FOG_COORD_ARRAY_POINTER */
+   { 10369, 0x00008455 }, /* GL_FOG_COORD_ARRAY_STRIDE */
+   { 10395, 0x00008454 }, /* GL_FOG_COORD_ARRAY_TYPE */
+   { 10419, 0x00008450 }, /* GL_FOG_COORD_SRC */
+   { 10436, 0x00000B62 }, /* GL_FOG_DENSITY */
+   { 10451, 0x0000855A }, /* GL_FOG_DISTANCE_MODE_NV */
+   { 10475, 0x00000B64 }, /* GL_FOG_END */
+   { 10486, 0x00000C54 }, /* GL_FOG_HINT */
+   { 10498, 0x00000B61 }, /* GL_FOG_INDEX */
+   { 10511, 0x00000B65 }, /* GL_FOG_MODE */
+   { 10523, 0x00008198 }, /* GL_FOG_OFFSET_SGIX */
+   { 10542, 0x00008199 }, /* GL_FOG_OFFSET_VALUE_SGIX */
+   { 10567, 0x00000B63 }, /* GL_FOG_START */
+   { 10580, 0x00008452 }, /* GL_FRAGMENT_DEPTH */
+   { 10598, 0x00008804 }, /* GL_FRAGMENT_PROGRAM_ARB */
+   { 10622, 0x00008B30 }, /* GL_FRAGMENT_SHADER */
+   { 10641, 0x00008B30 }, /* GL_FRAGMENT_SHADER_ARB */
+   { 10664, 0x00008B8B }, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
+   { 10699, 0x00008D40 }, /* GL_FRAMEBUFFER */
+   { 10714, 0x00008215 }, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
+   { 10751, 0x00008214 }, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
+   { 10787, 0x00008210 }, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
+   { 10828, 0x00008211 }, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
+   { 10869, 0x00008216 }, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
+   { 10906, 0x00008213 }, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
+   { 10943, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
+   { 10981, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT */
+   { 11023, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
+   { 11061, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT */
+   { 11103, 0x00008212 }, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
+   { 11138, 0x00008217 }, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
+   { 11177, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT */
+   { 11226, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
+   { 11274, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT */
+   { 11326, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+   { 11366, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
+   { 11410, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
+   { 11450, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT */
+   { 11494, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING_EXT */
+   { 11521, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE */
+   { 11545, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE_EXT */
+   { 11573, 0x00008218 }, /* GL_FRAMEBUFFER_DEFAULT */
+   { 11596, 0x00008D40 }, /* GL_FRAMEBUFFER_EXT */
+   { 11615, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
+   { 11652, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT */
+   { 11693, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
+   { 11734, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
+   { 11776, 0x00008CD8 }, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
+   { 11827, 0x00008CDA }, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
+   { 11865, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
+   { 11910, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT */
+   { 11959, 0x00008D56 }, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
+   { 11997, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
+   { 12039, 0x00008CDE }, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
+   { 12071, 0x00008219 }, /* GL_FRAMEBUFFER_UNDEFINED */
+   { 12096, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED */
+   { 12123, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED_EXT */
+   { 12154, 0x00000404 }, /* GL_FRONT */
+   { 12163, 0x00000408 }, /* GL_FRONT_AND_BACK */
+   { 12181, 0x00000B46 }, /* GL_FRONT_FACE */
+   { 12195, 0x00000400 }, /* GL_FRONT_LEFT */
+   { 12209, 0x00000401 }, /* GL_FRONT_RIGHT */
+   { 12224, 0x00008006 }, /* GL_FUNC_ADD */
+   { 12236, 0x00008006 }, /* GL_FUNC_ADD_EXT */
+   { 12252, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT */
+   { 12277, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT_EXT */
+   { 12306, 0x0000800A }, /* GL_FUNC_SUBTRACT */
+   { 12323, 0x0000800A }, /* GL_FUNC_SUBTRACT_EXT */
+   { 12344, 0x00008191 }, /* GL_GENERATE_MIPMAP */
+   { 12363, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT */
+   { 12387, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT_SGIS */
+   { 12416, 0x00008191 }, /* GL_GENERATE_MIPMAP_SGIS */
+   { 12440, 0x00000206 }, /* GL_GEQUAL */
+   { 12450, 0x00000204 }, /* GL_GREATER */
+   { 12461, 0x00001904 }, /* GL_GREEN */
+   { 12470, 0x00000D19 }, /* GL_GREEN_BIAS */
+   { 12484, 0x00000D53 }, /* GL_GREEN_BITS */
+   { 12498, 0x00000D18 }, /* GL_GREEN_SCALE */
+   { 12513, 0x00008000 }, /* GL_HINT_BIT */
+   { 12525, 0x00008024 }, /* GL_HISTOGRAM */
+   { 12538, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE */
+   { 12562, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE_EXT */
+   { 12590, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE */
+   { 12613, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE_EXT */
+   { 12640, 0x00008024 }, /* GL_HISTOGRAM_EXT */
+   { 12657, 0x00008027 }, /* GL_HISTOGRAM_FORMAT */
+   { 12677, 0x00008027 }, /* GL_HISTOGRAM_FORMAT_EXT */
+   { 12701, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE */
+   { 12725, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE_EXT */
+   { 12753, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE */
+   { 12781, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE_EXT */
+   { 12813, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE */
+   { 12835, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE_EXT */
+   { 12861, 0x0000802D }, /* GL_HISTOGRAM_SINK */
+   { 12879, 0x0000802D }, /* GL_HISTOGRAM_SINK_EXT */
+   { 12901, 0x00008026 }, /* GL_HISTOGRAM_WIDTH */
+   { 12920, 0x00008026 }, /* GL_HISTOGRAM_WIDTH_EXT */
+   { 12943, 0x0000862A }, /* GL_IDENTITY_NV */
+   { 12958, 0x00008150 }, /* GL_IGNORE_BORDER_HP */
+   { 12978, 0x00008B9B }, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
+   { 13018, 0x00008B9A }, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
+   { 13056, 0x00001E02 }, /* GL_INCR */
+   { 13064, 0x00008507 }, /* GL_INCR_WRAP */
+   { 13077, 0x00008507 }, /* GL_INCR_WRAP_EXT */
+   { 13094, 0x00008222 }, /* GL_INDEX */
+   { 13103, 0x00008077 }, /* GL_INDEX_ARRAY */
+   { 13118, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING */
+   { 13148, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING_ARB */
+   { 13182, 0x00008091 }, /* GL_INDEX_ARRAY_POINTER */
+   { 13205, 0x00008086 }, /* GL_INDEX_ARRAY_STRIDE */
+   { 13227, 0x00008085 }, /* GL_INDEX_ARRAY_TYPE */
+   { 13247, 0x00000D51 }, /* GL_INDEX_BITS */
+   { 13261, 0x00000C20 }, /* GL_INDEX_CLEAR_VALUE */
+   { 13282, 0x00000BF1 }, /* GL_INDEX_LOGIC_OP */
+   { 13300, 0x00000C30 }, /* GL_INDEX_MODE */
+   { 13314, 0x00000D13 }, /* GL_INDEX_OFFSET */
+   { 13330, 0x00000D12 }, /* GL_INDEX_SHIFT */
+   { 13345, 0x00000C21 }, /* GL_INDEX_WRITEMASK */
+   { 13364, 0x00008B84 }, /* GL_INFO_LOG_LENGTH */
+   { 13383, 0x00001404 }, /* GL_INT */
+   { 13390, 0x00008049 }, /* GL_INTENSITY */
+   { 13403, 0x0000804C }, /* GL_INTENSITY12 */
+   { 13418, 0x0000804C }, /* GL_INTENSITY12_EXT */
+   { 13437, 0x0000804D }, /* GL_INTENSITY16 */
+   { 13452, 0x0000804D }, /* GL_INTENSITY16_EXT */
+   { 13471, 0x0000804A }, /* GL_INTENSITY4 */
+   { 13485, 0x0000804A }, /* GL_INTENSITY4_EXT */
+   { 13503, 0x0000804B }, /* GL_INTENSITY8 */
+   { 13517, 0x0000804B }, /* GL_INTENSITY8_EXT */
+   { 13535, 0x00008049 }, /* GL_INTENSITY_EXT */
+   { 13552, 0x00008575 }, /* GL_INTERPOLATE */
+   { 13567, 0x00008575 }, /* GL_INTERPOLATE_ARB */
+   { 13586, 0x00008575 }, /* GL_INTERPOLATE_EXT */
+   { 13605, 0x00008B53 }, /* GL_INT_VEC2 */
+   { 13617, 0x00008B53 }, /* GL_INT_VEC2_ARB */
+   { 13633, 0x00008B54 }, /* GL_INT_VEC3 */
+   { 13645, 0x00008B54 }, /* GL_INT_VEC3_ARB */
+   { 13661, 0x00008B55 }, /* GL_INT_VEC4 */
+   { 13673, 0x00008B55 }, /* GL_INT_VEC4_ARB */
+   { 13689, 0x00000500 }, /* GL_INVALID_ENUM */
+   { 13705, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION */
+   { 13738, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION_EXT */
+   { 13775, 0x00000502 }, /* GL_INVALID_OPERATION */
+   { 13796, 0x00000501 }, /* GL_INVALID_VALUE */
+   { 13813, 0x0000862B }, /* GL_INVERSE_NV */
+   { 13827, 0x0000862D }, /* GL_INVERSE_TRANSPOSE_NV */
+   { 13851, 0x0000150A }, /* GL_INVERT */
+   { 13861, 0x00001E00 }, /* GL_KEEP */
+   { 13869, 0x00008E4E }, /* GL_LAST_VERTEX_CONVENTION_EXT */
+   { 13899, 0x00000406 }, /* GL_LEFT */
+   { 13907, 0x00000203 }, /* GL_LEQUAL */
+   { 13917, 0x00000201 }, /* GL_LESS */
+   { 13925, 0x00004000 }, /* GL_LIGHT0 */
+   { 13935, 0x00004001 }, /* GL_LIGHT1 */
+   { 13945, 0x00004002 }, /* GL_LIGHT2 */
+   { 13955, 0x00004003 }, /* GL_LIGHT3 */
+   { 13965, 0x00004004 }, /* GL_LIGHT4 */
+   { 13975, 0x00004005 }, /* GL_LIGHT5 */
+   { 13985, 0x00004006 }, /* GL_LIGHT6 */
+   { 13995, 0x00004007 }, /* GL_LIGHT7 */
+   { 14005, 0x00000B50 }, /* GL_LIGHTING */
+   { 14017, 0x00000040 }, /* GL_LIGHTING_BIT */
+   { 14033, 0x00000B53 }, /* GL_LIGHT_MODEL_AMBIENT */
+   { 14056, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL */
+   { 14085, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL_EXT */
+   { 14118, 0x00000B51 }, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
+   { 14146, 0x00000B52 }, /* GL_LIGHT_MODEL_TWO_SIDE */
+   { 14170, 0x00001B01 }, /* GL_LINE */
+   { 14178, 0x00002601 }, /* GL_LINEAR */
+   { 14188, 0x00001208 }, /* GL_LINEAR_ATTENUATION */
+   { 14210, 0x00008170 }, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
+   { 14240, 0x0000844F }, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
+   { 14271, 0x00002703 }, /* GL_LINEAR_MIPMAP_LINEAR */
+   { 14295, 0x00002701 }, /* GL_LINEAR_MIPMAP_NEAREST */
+   { 14320, 0x00000001 }, /* GL_LINES */
+   { 14329, 0x00000004 }, /* GL_LINE_BIT */
+   { 14341, 0x00000002 }, /* GL_LINE_LOOP */
+   { 14354, 0x00000707 }, /* GL_LINE_RESET_TOKEN */
+   { 14374, 0x00000B20 }, /* GL_LINE_SMOOTH */
+   { 14389, 0x00000C52 }, /* GL_LINE_SMOOTH_HINT */
+   { 14409, 0x00000B24 }, /* GL_LINE_STIPPLE */
+   { 14425, 0x00000B25 }, /* GL_LINE_STIPPLE_PATTERN */
+   { 14449, 0x00000B26 }, /* GL_LINE_STIPPLE_REPEAT */
+   { 14472, 0x00000003 }, /* GL_LINE_STRIP */
+   { 14486, 0x00000702 }, /* GL_LINE_TOKEN */
+   { 14500, 0x00000B21 }, /* GL_LINE_WIDTH */
+   { 14514, 0x00000B23 }, /* GL_LINE_WIDTH_GRANULARITY */
+   { 14540, 0x00000B22 }, /* GL_LINE_WIDTH_RANGE */
+   { 14560, 0x00008B82 }, /* GL_LINK_STATUS */
+   { 14575, 0x00000B32 }, /* GL_LIST_BASE */
+   { 14588, 0x00020000 }, /* GL_LIST_BIT */
+   { 14600, 0x00000B33 }, /* GL_LIST_INDEX */
+   { 14614, 0x00000B30 }, /* GL_LIST_MODE */
+   { 14627, 0x00000101 }, /* GL_LOAD */
+   { 14635, 0x00000BF1 }, /* GL_LOGIC_OP */
+   { 14647, 0x00000BF0 }, /* GL_LOGIC_OP_MODE */
+   { 14664, 0x00008CA1 }, /* GL_LOWER_LEFT */
+   { 14678, 0x00001909 }, /* GL_LUMINANCE */
+   { 14691, 0x00008041 }, /* GL_LUMINANCE12 */
+   { 14706, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12 */
+   { 14729, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12_EXT */
+   { 14756, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4 */
+   { 14778, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4_EXT */
+   { 14804, 0x00008041 }, /* GL_LUMINANCE12_EXT */
+   { 14823, 0x00008042 }, /* GL_LUMINANCE16 */
+   { 14838, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16 */
+   { 14861, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16_EXT */
+   { 14888, 0x00008042 }, /* GL_LUMINANCE16_EXT */
+   { 14907, 0x0000803F }, /* GL_LUMINANCE4 */
+   { 14921, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4 */
+   { 14942, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4_EXT */
+   { 14967, 0x0000803F }, /* GL_LUMINANCE4_EXT */
+   { 14985, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2 */
+   { 15006, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2_EXT */
+   { 15031, 0x00008040 }, /* GL_LUMINANCE8 */
+   { 15045, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8 */
+   { 15066, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8_EXT */
+   { 15091, 0x00008040 }, /* GL_LUMINANCE8_EXT */
+   { 15109, 0x0000190A }, /* GL_LUMINANCE_ALPHA */
+   { 15128, 0x00000D90 }, /* GL_MAP1_COLOR_4 */
+   { 15144, 0x00000DD0 }, /* GL_MAP1_GRID_DOMAIN */
+   { 15164, 0x00000DD1 }, /* GL_MAP1_GRID_SEGMENTS */
+   { 15186, 0x00000D91 }, /* GL_MAP1_INDEX */
+   { 15200, 0x00000D92 }, /* GL_MAP1_NORMAL */
+   { 15215, 0x00000D93 }, /* GL_MAP1_TEXTURE_COORD_1 */
+   { 15239, 0x00000D94 }, /* GL_MAP1_TEXTURE_COORD_2 */
+   { 15263, 0x00000D95 }, /* GL_MAP1_TEXTURE_COORD_3 */
+   { 15287, 0x00000D96 }, /* GL_MAP1_TEXTURE_COORD_4 */
+   { 15311, 0x00000D97 }, /* GL_MAP1_VERTEX_3 */
+   { 15328, 0x00000D98 }, /* GL_MAP1_VERTEX_4 */
+   { 15345, 0x00008660 }, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
+   { 15373, 0x0000866A }, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
+   { 15402, 0x0000866B }, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
+   { 15431, 0x0000866C }, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
+   { 15460, 0x0000866D }, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
+   { 15489, 0x0000866E }, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
+   { 15518, 0x0000866F }, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
+   { 15547, 0x00008661 }, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
+   { 15575, 0x00008662 }, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
+   { 15603, 0x00008663 }, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
+   { 15631, 0x00008664 }, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
+   { 15659, 0x00008665 }, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
+   { 15687, 0x00008666 }, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
+   { 15715, 0x00008667 }, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
+   { 15743, 0x00008668 }, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
+   { 15771, 0x00008669 }, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
+   { 15799, 0x00000DB0 }, /* GL_MAP2_COLOR_4 */
+   { 15815, 0x00000DD2 }, /* GL_MAP2_GRID_DOMAIN */
+   { 15835, 0x00000DD3 }, /* GL_MAP2_GRID_SEGMENTS */
+   { 15857, 0x00000DB1 }, /* GL_MAP2_INDEX */
+   { 15871, 0x00000DB2 }, /* GL_MAP2_NORMAL */
+   { 15886, 0x00000DB3 }, /* GL_MAP2_TEXTURE_COORD_1 */
+   { 15910, 0x00000DB4 }, /* GL_MAP2_TEXTURE_COORD_2 */
+   { 15934, 0x00000DB5 }, /* GL_MAP2_TEXTURE_COORD_3 */
+   { 15958, 0x00000DB6 }, /* GL_MAP2_TEXTURE_COORD_4 */
+   { 15982, 0x00000DB7 }, /* GL_MAP2_VERTEX_3 */
+   { 15999, 0x00000DB8 }, /* GL_MAP2_VERTEX_4 */
+   { 16016, 0x00008670 }, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
+   { 16044, 0x0000867A }, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
+   { 16073, 0x0000867B }, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
+   { 16102, 0x0000867C }, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
+   { 16131, 0x0000867D }, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
+   { 16160, 0x0000867E }, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
+   { 16189, 0x0000867F }, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
+   { 16218, 0x00008671 }, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
+   { 16246, 0x00008672 }, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
+   { 16274, 0x00008673 }, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
+   { 16302, 0x00008674 }, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
+   { 16330, 0x00008675 }, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
+   { 16358, 0x00008676 }, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
+   { 16386, 0x00008677 }, /* GL_MAP2_VERTEX_ATTRIB7_4_NV */
+   { 16414, 0x00008678 }, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
+   { 16442, 0x00008679 }, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
+   { 16470, 0x00000D10 }, /* GL_MAP_COLOR */
+   { 16483, 0x00000010 }, /* GL_MAP_FLUSH_EXPLICIT_BIT */
+   { 16509, 0x00000008 }, /* GL_MAP_INVALIDATE_BUFFER_BIT */
+   { 16538, 0x00000004 }, /* GL_MAP_INVALIDATE_RANGE_BIT */
+   { 16566, 0x00000001 }, /* GL_MAP_READ_BIT */
+   { 16582, 0x00000D11 }, /* GL_MAP_STENCIL */
+   { 16597, 0x00000020 }, /* GL_MAP_UNSYNCHRONIZED_BIT */
+   { 16623, 0x00000002 }, /* GL_MAP_WRITE_BIT */
+   { 16640, 0x000088C0 }, /* GL_MATRIX0_ARB */
+   { 16655, 0x00008630 }, /* GL_MATRIX0_NV */
+   { 16669, 0x000088CA }, /* GL_MATRIX10_ARB */
+   { 16685, 0x000088CB }, /* GL_MATRIX11_ARB */
+   { 16701, 0x000088CC }, /* GL_MATRIX12_ARB */
+   { 16717, 0x000088CD }, /* GL_MATRIX13_ARB */
+   { 16733, 0x000088CE }, /* GL_MATRIX14_ARB */
+   { 16749, 0x000088CF }, /* GL_MATRIX15_ARB */
+   { 16765, 0x000088D0 }, /* GL_MATRIX16_ARB */
+   { 16781, 0x000088D1 }, /* GL_MATRIX17_ARB */
+   { 16797, 0x000088D2 }, /* GL_MATRIX18_ARB */
+   { 16813, 0x000088D3 }, /* GL_MATRIX19_ARB */
+   { 16829, 0x000088C1 }, /* GL_MATRIX1_ARB */
+   { 16844, 0x00008631 }, /* GL_MATRIX1_NV */
+   { 16858, 0x000088D4 }, /* GL_MATRIX20_ARB */
+   { 16874, 0x000088D5 }, /* GL_MATRIX21_ARB */
+   { 16890, 0x000088D6 }, /* GL_MATRIX22_ARB */
+   { 16906, 0x000088D7 }, /* GL_MATRIX23_ARB */
+   { 16922, 0x000088D8 }, /* GL_MATRIX24_ARB */
+   { 16938, 0x000088D9 }, /* GL_MATRIX25_ARB */
+   { 16954, 0x000088DA }, /* GL_MATRIX26_ARB */
+   { 16970, 0x000088DB }, /* GL_MATRIX27_ARB */
+   { 16986, 0x000088DC }, /* GL_MATRIX28_ARB */
+   { 17002, 0x000088DD }, /* GL_MATRIX29_ARB */
+   { 17018, 0x000088C2 }, /* GL_MATRIX2_ARB */
+   { 17033, 0x00008632 }, /* GL_MATRIX2_NV */
+   { 17047, 0x000088DE }, /* GL_MATRIX30_ARB */
+   { 17063, 0x000088DF }, /* GL_MATRIX31_ARB */
+   { 17079, 0x000088C3 }, /* GL_MATRIX3_ARB */
+   { 17094, 0x00008633 }, /* GL_MATRIX3_NV */
+   { 17108, 0x000088C4 }, /* GL_MATRIX4_ARB */
+   { 17123, 0x00008634 }, /* GL_MATRIX4_NV */
+   { 17137, 0x000088C5 }, /* GL_MATRIX5_ARB */
+   { 17152, 0x00008635 }, /* GL_MATRIX5_NV */
+   { 17166, 0x000088C6 }, /* GL_MATRIX6_ARB */
+   { 17181, 0x00008636 }, /* GL_MATRIX6_NV */
+   { 17195, 0x000088C7 }, /* GL_MATRIX7_ARB */
+   { 17210, 0x00008637 }, /* GL_MATRIX7_NV */
+   { 17224, 0x000088C8 }, /* GL_MATRIX8_ARB */
+   { 17239, 0x000088C9 }, /* GL_MATRIX9_ARB */
+   { 17254, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_ARB */
+   { 17280, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
+   { 17314, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
+   { 17345, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
+   { 17378, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
+   { 17409, 0x00000BA0 }, /* GL_MATRIX_MODE */
+   { 17424, 0x00008840 }, /* GL_MATRIX_PALETTE_ARB */
+   { 17446, 0x00008008 }, /* GL_MAX */
+   { 17453, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE */
+   { 17476, 0x000088FF }, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
+   { 17508, 0x00000D35 }, /* GL_MAX_ATTRIB_STACK_DEPTH */
+   { 17534, 0x00000D3B }, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
+   { 17567, 0x00008177 }, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
+   { 17593, 0x00008178 }, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+   { 17627, 0x00000D32 }, /* GL_MAX_CLIP_PLANES */
+   { 17646, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
+   { 17675, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
+   { 17707, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI */
+   { 17743, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
+   { 17779, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB */
+   { 17819, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT */
+   { 17845, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT_EXT */
+   { 17875, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH */
+   { 17900, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH_EXT */
+   { 17929, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
+   { 17958, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB */
+   { 17991, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS */
+   { 18011, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ARB */
+   { 18035, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ATI */
+   { 18059, 0x000080E9 }, /* GL_MAX_ELEMENTS_INDICES */
+   { 18083, 0x000080E8 }, /* GL_MAX_ELEMENTS_VERTICES */
+   { 18108, 0x00000D30 }, /* GL_MAX_EVAL_ORDER */
+   { 18126, 0x00008008 }, /* GL_MAX_EXT */
+   { 18137, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
+   { 18172, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB */
+   { 18211, 0x00000D31 }, /* GL_MAX_LIGHTS */
+   { 18225, 0x00000B31 }, /* GL_MAX_LIST_NESTING */
+   { 18245, 0x00008841 }, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
+   { 18283, 0x00000D36 }, /* GL_MAX_MODELVIEW_STACK_DEPTH */
+   { 18312, 0x00000D37 }, /* GL_MAX_NAME_STACK_DEPTH */
+   { 18336, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_ARB */
+   { 18364, 0x00000D34 }, /* GL_MAX_PIXEL_MAP_TABLE */
+   { 18387, 0x000088B1 }, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
+   { 18424, 0x0000880B }, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
+   { 18460, 0x000088AD }, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
+   { 18487, 0x000088F5 }, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
+   { 18516, 0x000088B5 }, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
+   { 18550, 0x000088F4 }, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
+   { 18586, 0x000088F6 }, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
+   { 18613, 0x000088A1 }, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
+   { 18645, 0x000088B4 }, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
+   { 18681, 0x000088F8 }, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
+   { 18710, 0x000088F7 }, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
+   { 18739, 0x0000862F }, /* GL_MAX_PROGRAM_MATRICES_ARB */
+   { 18767, 0x0000862E }, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
+   { 18805, 0x000088B3 }, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+   { 18849, 0x0000880E }, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+   { 18892, 0x000088AF }, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
+   { 18926, 0x000088A3 }, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+   { 18965, 0x000088AB }, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
+   { 19002, 0x000088A7 }, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
+   { 19040, 0x00008810 }, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+   { 19083, 0x0000880F }, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+   { 19126, 0x000088A9 }, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
+   { 19156, 0x000088A5 }, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
+   { 19187, 0x0000880D }, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
+   { 19223, 0x0000880C }, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
+   { 19259, 0x00000D38 }, /* GL_MAX_PROJECTION_STACK_DEPTH */
+   { 19289, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
+   { 19323, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_NV */
+   { 19356, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
+   { 19385, 0x00008D57 }, /* GL_MAX_SAMPLES */
+   { 19400, 0x00008504 }, /* GL_MAX_SHININESS_NV */
+   { 19420, 0x00008505 }, /* GL_MAX_SPOT_EXPONENT_NV */
+   { 19444, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS */
+   { 19466, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS_ARB */
+   { 19492, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS */
+   { 19519, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS_ARB */
+   { 19550, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS */
+   { 19574, 0x000084FF }, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
+   { 19608, 0x00000D33 }, /* GL_MAX_TEXTURE_SIZE */
+   { 19628, 0x00000D39 }, /* GL_MAX_TEXTURE_STACK_DEPTH */
+   { 19655, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS */
+   { 19676, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS_ARB */
+   { 19701, 0x0000862F }, /* GL_MAX_TRACK_MATRICES_NV */
+   { 19726, 0x0000862E }, /* GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */
+   { 19761, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS */
+   { 19783, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS_ARB */
+   { 19809, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS */
+   { 19831, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS_ARB */
+   { 19857, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
+   { 19891, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
+   { 19929, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
+   { 19962, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB */
+   { 19999, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_ARB */
+   { 20023, 0x00000D3A }, /* GL_MAX_VIEWPORT_DIMS */
+   { 20044, 0x00008007 }, /* GL_MIN */
+   { 20051, 0x0000802E }, /* GL_MINMAX */
+   { 20061, 0x0000802E }, /* GL_MINMAX_EXT */
+   { 20075, 0x0000802F }, /* GL_MINMAX_FORMAT */
+   { 20092, 0x0000802F }, /* GL_MINMAX_FORMAT_EXT */
+   { 20113, 0x00008030 }, /* GL_MINMAX_SINK */
+   { 20128, 0x00008030 }, /* GL_MINMAX_SINK_EXT */
+   { 20147, 0x00008007 }, /* GL_MIN_EXT */
+   { 20158, 0x00008370 }, /* GL_MIRRORED_REPEAT */
+   { 20177, 0x00008370 }, /* GL_MIRRORED_REPEAT_ARB */
+   { 20200, 0x00008370 }, /* GL_MIRRORED_REPEAT_IBM */
+   { 20223, 0x00008742 }, /* GL_MIRROR_CLAMP_ATI */
+   { 20243, 0x00008742 }, /* GL_MIRROR_CLAMP_EXT */
+   { 20263, 0x00008912 }, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
+   { 20293, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_ATI */
+   { 20321, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
+   { 20349, 0x00001700 }, /* GL_MODELVIEW */
+   { 20362, 0x00001700 }, /* GL_MODELVIEW0_ARB */
+   { 20380, 0x0000872A }, /* GL_MODELVIEW10_ARB */
+   { 20399, 0x0000872B }, /* GL_MODELVIEW11_ARB */
+   { 20418, 0x0000872C }, /* GL_MODELVIEW12_ARB */
+   { 20437, 0x0000872D }, /* GL_MODELVIEW13_ARB */
+   { 20456, 0x0000872E }, /* GL_MODELVIEW14_ARB */
+   { 20475, 0x0000872F }, /* GL_MODELVIEW15_ARB */
+   { 20494, 0x00008730 }, /* GL_MODELVIEW16_ARB */
+   { 20513, 0x00008731 }, /* GL_MODELVIEW17_ARB */
+   { 20532, 0x00008732 }, /* GL_MODELVIEW18_ARB */
+   { 20551, 0x00008733 }, /* GL_MODELVIEW19_ARB */
+   { 20570, 0x0000850A }, /* GL_MODELVIEW1_ARB */
+   { 20588, 0x00008734 }, /* GL_MODELVIEW20_ARB */
+   { 20607, 0x00008735 }, /* GL_MODELVIEW21_ARB */
+   { 20626, 0x00008736 }, /* GL_MODELVIEW22_ARB */
+   { 20645, 0x00008737 }, /* GL_MODELVIEW23_ARB */
+   { 20664, 0x00008738 }, /* GL_MODELVIEW24_ARB */
+   { 20683, 0x00008739 }, /* GL_MODELVIEW25_ARB */
+   { 20702, 0x0000873A }, /* GL_MODELVIEW26_ARB */
+   { 20721, 0x0000873B }, /* GL_MODELVIEW27_ARB */
+   { 20740, 0x0000873C }, /* GL_MODELVIEW28_ARB */
+   { 20759, 0x0000873D }, /* GL_MODELVIEW29_ARB */
+   { 20778, 0x00008722 }, /* GL_MODELVIEW2_ARB */
+   { 20796, 0x0000873E }, /* GL_MODELVIEW30_ARB */
+   { 20815, 0x0000873F }, /* GL_MODELVIEW31_ARB */
+   { 20834, 0x00008723 }, /* GL_MODELVIEW3_ARB */
+   { 20852, 0x00008724 }, /* GL_MODELVIEW4_ARB */
+   { 20870, 0x00008725 }, /* GL_MODELVIEW5_ARB */
+   { 20888, 0x00008726 }, /* GL_MODELVIEW6_ARB */
+   { 20906, 0x00008727 }, /* GL_MODELVIEW7_ARB */
+   { 20924, 0x00008728 }, /* GL_MODELVIEW8_ARB */
+   { 20942, 0x00008729 }, /* GL_MODELVIEW9_ARB */
+   { 20960, 0x00000BA6 }, /* GL_MODELVIEW_MATRIX */
+   { 20980, 0x00008629 }, /* GL_MODELVIEW_PROJECTION_NV */
+   { 21007, 0x00000BA3 }, /* GL_MODELVIEW_STACK_DEPTH */
+   { 21032, 0x00002100 }, /* GL_MODULATE */
+   { 21044, 0x00008744 }, /* GL_MODULATE_ADD_ATI */
+   { 21064, 0x00008745 }, /* GL_MODULATE_SIGNED_ADD_ATI */
+   { 21091, 0x00008746 }, /* GL_MODULATE_SUBTRACT_ATI */
+   { 21116, 0x00000103 }, /* GL_MULT */
+   { 21124, 0x0000809D }, /* GL_MULTISAMPLE */
+   { 21139, 0x000086B2 }, /* GL_MULTISAMPLE_3DFX */
+   { 21159, 0x0000809D }, /* GL_MULTISAMPLE_ARB */
+   { 21178, 0x20000000 }, /* GL_MULTISAMPLE_BIT */
+   { 21197, 0x20000000 }, /* GL_MULTISAMPLE_BIT_3DFX */
+   { 21221, 0x20000000 }, /* GL_MULTISAMPLE_BIT_ARB */
+   { 21244, 0x00008534 }, /* GL_MULTISAMPLE_FILTER_HINT_NV */
+   { 21274, 0x00002A25 }, /* GL_N3F_V3F */
+   { 21285, 0x00000D70 }, /* GL_NAME_STACK_DEPTH */
+   { 21305, 0x0000150E }, /* GL_NAND */
+   { 21313, 0x00002600 }, /* GL_NEAREST */
+   { 21324, 0x0000844E }, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
+   { 21355, 0x0000844D }, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
+   { 21387, 0x00002702 }, /* GL_NEAREST_MIPMAP_LINEAR */
+   { 21412, 0x00002700 }, /* GL_NEAREST_MIPMAP_NEAREST */
+   { 21438, 0x00000200 }, /* GL_NEVER */
+   { 21447, 0x00001102 }, /* GL_NICEST */
+   { 21457, 0x00000000 }, /* GL_NONE */
+   { 21465, 0x00001505 }, /* GL_NOOP */
+   { 21473, 0x00001508 }, /* GL_NOR */
+   { 21480, 0x00000BA1 }, /* GL_NORMALIZE */
+   { 21493, 0x00008075 }, /* GL_NORMAL_ARRAY */
+   { 21509, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
+   { 21540, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING_ARB */
+   { 21575, 0x0000808F }, /* GL_NORMAL_ARRAY_POINTER */
+   { 21599, 0x0000807F }, /* GL_NORMAL_ARRAY_STRIDE */
+   { 21622, 0x0000807E }, /* GL_NORMAL_ARRAY_TYPE */
+   { 21643, 0x00008511 }, /* GL_NORMAL_MAP */
+   { 21657, 0x00008511 }, /* GL_NORMAL_MAP_ARB */
+   { 21675, 0x00008511 }, /* GL_NORMAL_MAP_NV */
+   { 21692, 0x00000205 }, /* GL_NOTEQUAL */
+   { 21704, 0x00000000 }, /* GL_NO_ERROR */
+   { 21716, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
+   { 21750, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB */
+   { 21788, 0x00008B89 }, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */
+   { 21820, 0x00008B8A }, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */
+   { 21862, 0x00008B86 }, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */
+   { 21892, 0x00008B87 }, /* GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB */
+   { 21932, 0x00008B85 }, /* GL_OBJECT_ATTACHED_OBJECTS_ARB */
+   { 21963, 0x00008B81 }, /* GL_OBJECT_COMPILE_STATUS_ARB */
+   { 21992, 0x00008B80 }, /* GL_OBJECT_DELETE_STATUS_ARB */
+   { 22020, 0x00008B84 }, /* GL_OBJECT_INFO_LOG_LENGTH_ARB */
+   { 22050, 0x00002401 }, /* GL_OBJECT_LINEAR */
+   { 22067, 0x00008B82 }, /* GL_OBJECT_LINK_STATUS_ARB */
+   { 22093, 0x00002501 }, /* GL_OBJECT_PLANE */
+   { 22109, 0x00008B88 }, /* GL_OBJECT_SHADER_SOURCE_LENGTH_ARB */
+   { 22144, 0x00008B4F }, /* GL_OBJECT_SUBTYPE_ARB */
+   { 22166, 0x00008B4E }, /* GL_OBJECT_TYPE_ARB */
+   { 22185, 0x00008B83 }, /* GL_OBJECT_VALIDATE_STATUS_ARB */
+   { 22215, 0x00008165 }, /* GL_OCCLUSION_TEST_HP */
+   { 22236, 0x00008166 }, /* GL_OCCLUSION_TEST_RESULT_HP */
+   { 22264, 0x00000001 }, /* GL_ONE */
+   { 22271, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA */
+   { 22299, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA_EXT */
+   { 22331, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR */
+   { 22359, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR_EXT */
+   { 22391, 0x00000305 }, /* GL_ONE_MINUS_DST_ALPHA */
+   { 22414, 0x00000307 }, /* GL_ONE_MINUS_DST_COLOR */
+   { 22437, 0x00000303 }, /* GL_ONE_MINUS_SRC_ALPHA */
+   { 22460, 0x00000301 }, /* GL_ONE_MINUS_SRC_COLOR */
+   { 22483, 0x00008598 }, /* GL_OPERAND0_ALPHA */
+   { 22501, 0x00008598 }, /* GL_OPERAND0_ALPHA_ARB */
+   { 22523, 0x00008598 }, /* GL_OPERAND0_ALPHA_EXT */
+   { 22545, 0x00008590 }, /* GL_OPERAND0_RGB */
+   { 22561, 0x00008590 }, /* GL_OPERAND0_RGB_ARB */
+   { 22581, 0x00008590 }, /* GL_OPERAND0_RGB_EXT */
+   { 22601, 0x00008599 }, /* GL_OPERAND1_ALPHA */
+   { 22619, 0x00008599 }, /* GL_OPERAND1_ALPHA_ARB */
+   { 22641, 0x00008599 }, /* GL_OPERAND1_ALPHA_EXT */
+   { 22663, 0x00008591 }, /* GL_OPERAND1_RGB */
+   { 22679, 0x00008591 }, /* GL_OPERAND1_RGB_ARB */
+   { 22699, 0x00008591 }, /* GL_OPERAND1_RGB_EXT */
+   { 22719, 0x0000859A }, /* GL_OPERAND2_ALPHA */
+   { 22737, 0x0000859A }, /* GL_OPERAND2_ALPHA_ARB */
+   { 22759, 0x0000859A }, /* GL_OPERAND2_ALPHA_EXT */
+   { 22781, 0x00008592 }, /* GL_OPERAND2_RGB */
+   { 22797, 0x00008592 }, /* GL_OPERAND2_RGB_ARB */
+   { 22817, 0x00008592 }, /* GL_OPERAND2_RGB_EXT */
+   { 22837, 0x0000859B }, /* GL_OPERAND3_ALPHA_NV */
+   { 22858, 0x00008593 }, /* GL_OPERAND3_RGB_NV */
+   { 22877, 0x00001507 }, /* GL_OR */
+   { 22883, 0x00000A01 }, /* GL_ORDER */
+   { 22892, 0x0000150D }, /* GL_OR_INVERTED */
+   { 22907, 0x0000150B }, /* GL_OR_REVERSE */
+   { 22921, 0x00000505 }, /* GL_OUT_OF_MEMORY */
+   { 22938, 0x00000D05 }, /* GL_PACK_ALIGNMENT */
+   { 22956, 0x0000806C }, /* GL_PACK_IMAGE_HEIGHT */
+   { 22977, 0x00008758 }, /* GL_PACK_INVERT_MESA */
+   { 22997, 0x00000D01 }, /* GL_PACK_LSB_FIRST */
+   { 23015, 0x00000D02 }, /* GL_PACK_ROW_LENGTH */
+   { 23034, 0x0000806B }, /* GL_PACK_SKIP_IMAGES */
+   { 23054, 0x00000D04 }, /* GL_PACK_SKIP_PIXELS */
+   { 23074, 0x00000D03 }, /* GL_PACK_SKIP_ROWS */
+   { 23092, 0x00000D00 }, /* GL_PACK_SWAP_BYTES */
+   { 23111, 0x00008B92 }, /* GL_PALETTE4_R5_G6_B5_OES */
+   { 23136, 0x00008B94 }, /* GL_PALETTE4_RGB5_A1_OES */
+   { 23160, 0x00008B90 }, /* GL_PALETTE4_RGB8_OES */
+   { 23181, 0x00008B93 }, /* GL_PALETTE4_RGBA4_OES */
+   { 23203, 0x00008B91 }, /* GL_PALETTE4_RGBA8_OES */
+   { 23225, 0x00008B97 }, /* GL_PALETTE8_R5_G6_B5_OES */
+   { 23250, 0x00008B99 }, /* GL_PALETTE8_RGB5_A1_OES */
+   { 23274, 0x00008B95 }, /* GL_PALETTE8_RGB8_OES */
+   { 23295, 0x00008B98 }, /* GL_PALETTE8_RGBA4_OES */
+   { 23317, 0x00008B96 }, /* GL_PALETTE8_RGBA8_OES */
+   { 23339, 0x00000700 }, /* GL_PASS_THROUGH_TOKEN */
+   { 23361, 0x00000C50 }, /* GL_PERSPECTIVE_CORRECTION_HINT */
+   { 23392, 0x00000C79 }, /* GL_PIXEL_MAP_A_TO_A */
+   { 23412, 0x00000CB9 }, /* GL_PIXEL_MAP_A_TO_A_SIZE */
+   { 23437, 0x00000C78 }, /* GL_PIXEL_MAP_B_TO_B */
+   { 23457, 0x00000CB8 }, /* GL_PIXEL_MAP_B_TO_B_SIZE */
+   { 23482, 0x00000C77 }, /* GL_PIXEL_MAP_G_TO_G */
+   { 23502, 0x00000CB7 }, /* GL_PIXEL_MAP_G_TO_G_SIZE */
+   { 23527, 0x00000C75 }, /* GL_PIXEL_MAP_I_TO_A */
+   { 23547, 0x00000CB5 }, /* GL_PIXEL_MAP_I_TO_A_SIZE */
+   { 23572, 0x00000C74 }, /* GL_PIXEL_MAP_I_TO_B */
+   { 23592, 0x00000CB4 }, /* GL_PIXEL_MAP_I_TO_B_SIZE */
+   { 23617, 0x00000C73 }, /* GL_PIXEL_MAP_I_TO_G */
+   { 23637, 0x00000CB3 }, /* GL_PIXEL_MAP_I_TO_G_SIZE */
+   { 23662, 0x00000C70 }, /* GL_PIXEL_MAP_I_TO_I */
+   { 23682, 0x00000CB0 }, /* GL_PIXEL_MAP_I_TO_I_SIZE */
+   { 23707, 0x00000C72 }, /* GL_PIXEL_MAP_I_TO_R */
+   { 23727, 0x00000CB2 }, /* GL_PIXEL_MAP_I_TO_R_SIZE */
+   { 23752, 0x00000C76 }, /* GL_PIXEL_MAP_R_TO_R */
+   { 23772, 0x00000CB6 }, /* GL_PIXEL_MAP_R_TO_R_SIZE */
+   { 23797, 0x00000C71 }, /* GL_PIXEL_MAP_S_TO_S */
+   { 23817, 0x00000CB1 }, /* GL_PIXEL_MAP_S_TO_S_SIZE */
+   { 23842, 0x00000020 }, /* GL_PIXEL_MODE_BIT */
+   { 23860, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER */
+   { 23881, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING */
+   { 23910, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING_EXT */
+   { 23943, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER_EXT */
+   { 23968, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER */
+   { 23991, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
+   { 24022, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING_EXT */
+   { 24057, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER_EXT */
+   { 24084, 0x00001B00 }, /* GL_POINT */
+   { 24093, 0x00000000 }, /* GL_POINTS */
+   { 24103, 0x00000002 }, /* GL_POINT_BIT */
+   { 24116, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION */
+   { 24146, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_ARB */
+   { 24180, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_EXT */
+   { 24214, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_SGIS */
+   { 24249, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE */
+   { 24278, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_ARB */
+   { 24311, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_EXT */
+   { 24344, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_SGIS */
+   { 24378, 0x00000B11 }, /* GL_POINT_SIZE */
+   { 24392, 0x00000B13 }, /* GL_POINT_SIZE_GRANULARITY */
+   { 24418, 0x00008127 }, /* GL_POINT_SIZE_MAX */
+   { 24436, 0x00008127 }, /* GL_POINT_SIZE_MAX_ARB */
+   { 24458, 0x00008127 }, /* GL_POINT_SIZE_MAX_EXT */
+   { 24480, 0x00008127 }, /* GL_POINT_SIZE_MAX_SGIS */
+   { 24503, 0x00008126 }, /* GL_POINT_SIZE_MIN */
+   { 24521, 0x00008126 }, /* GL_POINT_SIZE_MIN_ARB */
+   { 24543, 0x00008126 }, /* GL_POINT_SIZE_MIN_EXT */
+   { 24565, 0x00008126 }, /* GL_POINT_SIZE_MIN_SGIS */
+   { 24588, 0x00000B12 }, /* GL_POINT_SIZE_RANGE */
+   { 24608, 0x00000B10 }, /* GL_POINT_SMOOTH */
+   { 24624, 0x00000C51 }, /* GL_POINT_SMOOTH_HINT */
+   { 24645, 0x00008861 }, /* GL_POINT_SPRITE */
+   { 24661, 0x00008861 }, /* GL_POINT_SPRITE_ARB */
+   { 24681, 0x00008CA0 }, /* GL_POINT_SPRITE_COORD_ORIGIN */
+   { 24710, 0x00008861 }, /* GL_POINT_SPRITE_NV */
+   { 24729, 0x00008863 }, /* GL_POINT_SPRITE_R_MODE_NV */
+   { 24755, 0x00000701 }, /* GL_POINT_TOKEN */
+   { 24770, 0x00000009 }, /* GL_POLYGON */
+   { 24781, 0x00000008 }, /* GL_POLYGON_BIT */
+   { 24796, 0x00000B40 }, /* GL_POLYGON_MODE */
+   { 24812, 0x00008039 }, /* GL_POLYGON_OFFSET_BIAS */
+   { 24835, 0x00008038 }, /* GL_POLYGON_OFFSET_FACTOR */
+   { 24860, 0x00008037 }, /* GL_POLYGON_OFFSET_FILL */
+   { 24883, 0x00002A02 }, /* GL_POLYGON_OFFSET_LINE */
+   { 24906, 0x00002A01 }, /* GL_POLYGON_OFFSET_POINT */
+   { 24930, 0x00002A00 }, /* GL_POLYGON_OFFSET_UNITS */
+   { 24954, 0x00000B41 }, /* GL_POLYGON_SMOOTH */
+   { 24972, 0x00000C53 }, /* GL_POLYGON_SMOOTH_HINT */
+   { 24995, 0x00000B42 }, /* GL_POLYGON_STIPPLE */
+   { 25014, 0x00000010 }, /* GL_POLYGON_STIPPLE_BIT */
+   { 25037, 0x00000703 }, /* GL_POLYGON_TOKEN */
+   { 25054, 0x00001203 }, /* GL_POSITION */
+   { 25066, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
+   { 25098, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI */
+   { 25134, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
+   { 25167, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI */
+   { 25204, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
+   { 25235, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI */
+   { 25270, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
+   { 25302, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI */
+   { 25338, 0x000080D2 }, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
+   { 25371, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
+   { 25403, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI */
+   { 25439, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
+   { 25472, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI */
+   { 25509, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS */
+   { 25539, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS_SGI */
+   { 25573, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE */
+   { 25604, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE_SGI */
+   { 25639, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
+   { 25670, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS_EXT */
+   { 25705, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
+   { 25737, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE_EXT */
+   { 25773, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS */
+   { 25803, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS_EXT */
+   { 25837, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE */
+   { 25868, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE_EXT */
+   { 25903, 0x000080D1 }, /* GL_POST_CONVOLUTION_COLOR_TABLE */
+   { 25935, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS */
+   { 25966, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS_EXT */
+   { 26001, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE */
+   { 26033, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE_EXT */
+   { 26069, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS */
+   { 26098, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS_EXT */
+   { 26131, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE */
+   { 26161, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE_EXT */
+   { 26195, 0x0000817B }, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
+   { 26234, 0x00008179 }, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
+   { 26267, 0x0000817C }, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
+   { 26307, 0x0000817A }, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
+   { 26341, 0x00008578 }, /* GL_PREVIOUS */
+   { 26353, 0x00008578 }, /* GL_PREVIOUS_ARB */
+   { 26369, 0x00008578 }, /* GL_PREVIOUS_EXT */
+   { 26385, 0x00008577 }, /* GL_PRIMARY_COLOR */
+   { 26402, 0x00008577 }, /* GL_PRIMARY_COLOR_ARB */
+   { 26423, 0x00008577 }, /* GL_PRIMARY_COLOR_EXT */
+   { 26444, 0x000088B0 }, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
+   { 26477, 0x00008805 }, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
+   { 26509, 0x000088AC }, /* GL_PROGRAM_ATTRIBS_ARB */
+   { 26532, 0x00008677 }, /* GL_PROGRAM_BINDING_ARB */
+   { 26555, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_ARB */
+   { 26585, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_NV */
+   { 26614, 0x00008874 }, /* GL_PROGRAM_ERROR_STRING_ARB */
+   { 26642, 0x00008876 }, /* GL_PROGRAM_FORMAT_ARB */
+   { 26664, 0x00008875 }, /* GL_PROGRAM_FORMAT_ASCII_ARB */
+   { 26692, 0x000088A0 }, /* GL_PROGRAM_INSTRUCTIONS_ARB */
+   { 26720, 0x00008627 }, /* GL_PROGRAM_LENGTH_ARB */
+   { 26742, 0x00008627 }, /* GL_PROGRAM_LENGTH_NV */
+   { 26763, 0x000088B2 }, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+   { 26803, 0x00008808 }, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+   { 26842, 0x000088AE }, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
+   { 26872, 0x000088A2 }, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+   { 26907, 0x000088AA }, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
+   { 26940, 0x000088A6 }, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
+   { 26974, 0x0000880A }, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+   { 27013, 0x00008809 }, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+   { 27052, 0x00008B40 }, /* GL_PROGRAM_OBJECT_ARB */
+   { 27074, 0x000088A8 }, /* GL_PROGRAM_PARAMETERS_ARB */
+   { 27100, 0x00008644 }, /* GL_PROGRAM_PARAMETER_NV */
+   { 27124, 0x00008647 }, /* GL_PROGRAM_RESIDENT_NV */
+   { 27147, 0x00008628 }, /* GL_PROGRAM_STRING_ARB */
+   { 27169, 0x00008628 }, /* GL_PROGRAM_STRING_NV */
+   { 27190, 0x00008646 }, /* GL_PROGRAM_TARGET_NV */
+   { 27211, 0x000088A4 }, /* GL_PROGRAM_TEMPORARIES_ARB */
+   { 27238, 0x00008807 }, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
+   { 27270, 0x00008806 }, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
+   { 27302, 0x000088B6 }, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
+   { 27337, 0x00001701 }, /* GL_PROJECTION */
+   { 27351, 0x00000BA7 }, /* GL_PROJECTION_MATRIX */
+   { 27372, 0x00000BA4 }, /* GL_PROJECTION_STACK_DEPTH */
+   { 27398, 0x00008E4F }, /* GL_PROVOKING_VERTEX_EXT */
+   { 27422, 0x000080D3 }, /* GL_PROXY_COLOR_TABLE */
+   { 27443, 0x00008025 }, /* GL_PROXY_HISTOGRAM */
+   { 27462, 0x00008025 }, /* GL_PROXY_HISTOGRAM_EXT */
+   { 27485, 0x000080D5 }, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
+   { 27524, 0x000080D4 }, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
+   { 27562, 0x00008063 }, /* GL_PROXY_TEXTURE_1D */
+   { 27582, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
+   { 27612, 0x00008063 }, /* GL_PROXY_TEXTURE_1D_EXT */
+   { 27636, 0x00008064 }, /* GL_PROXY_TEXTURE_2D */
+   { 27656, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
+   { 27686, 0x00008064 }, /* GL_PROXY_TEXTURE_2D_EXT */
+   { 27710, 0x00008070 }, /* GL_PROXY_TEXTURE_3D */
+   { 27730, 0x000080BD }, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
+   { 27763, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP */
+   { 27789, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP_ARB */
+   { 27819, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
+   { 27850, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_NV */
+   { 27880, 0x00002003 }, /* GL_Q */
+   { 27885, 0x00001209 }, /* GL_QUADRATIC_ATTENUATION */
+   { 27910, 0x00000007 }, /* GL_QUADS */
+   { 27919, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT */
+   { 27967, 0x00008614 }, /* GL_QUAD_MESH_SUN */
+   { 27984, 0x00000008 }, /* GL_QUAD_STRIP */
+   { 27998, 0x00008864 }, /* GL_QUERY_COUNTER_BITS */
+   { 28020, 0x00008864 }, /* GL_QUERY_COUNTER_BITS_ARB */
+   { 28046, 0x00008866 }, /* GL_QUERY_RESULT */
+   { 28062, 0x00008866 }, /* GL_QUERY_RESULT_ARB */
+   { 28082, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE */
+   { 28108, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE_ARB */
+   { 28138, 0x00002002 }, /* GL_R */
+   { 28143, 0x00002A10 }, /* GL_R3_G3_B2 */
+   { 28155, 0x00019262 }, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
+   { 28188, 0x00000C02 }, /* GL_READ_BUFFER */
+   { 28203, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER */
+   { 28223, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
+   { 28255, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER_EXT */
+   { 28279, 0x000088B8 }, /* GL_READ_ONLY */
+   { 28292, 0x000088B8 }, /* GL_READ_ONLY_ARB */
+   { 28309, 0x000088BA }, /* GL_READ_WRITE */
+   { 28323, 0x000088BA }, /* GL_READ_WRITE_ARB */
+   { 28341, 0x00001903 }, /* GL_RED */
+   { 28348, 0x00008016 }, /* GL_REDUCE */
+   { 28358, 0x00008016 }, /* GL_REDUCE_EXT */
+   { 28372, 0x00000D15 }, /* GL_RED_BIAS */
+   { 28384, 0x00000D52 }, /* GL_RED_BITS */
+   { 28396, 0x00000D14 }, /* GL_RED_SCALE */
+   { 28409, 0x00008512 }, /* GL_REFLECTION_MAP */
+   { 28427, 0x00008512 }, /* GL_REFLECTION_MAP_ARB */
+   { 28449, 0x00008512 }, /* GL_REFLECTION_MAP_NV */
+   { 28470, 0x00001C00 }, /* GL_RENDER */
+   { 28480, 0x00008D41 }, /* GL_RENDERBUFFER */
+   { 28496, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE */
+   { 28523, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_EXT */
+   { 28551, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE */
+   { 28577, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE */
+   { 28604, 0x00008D41 }, /* GL_RENDERBUFFER_EXT */
+   { 28624, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE */
+   { 28651, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT */
+   { 28674, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_EXT */
+   { 28701, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
+   { 28733, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */
+   { 28769, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE */
+   { 28794, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES */
+   { 28818, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE */
+   { 28847, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH */
+   { 28869, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_EXT */
+   { 28895, 0x00001F01 }, /* GL_RENDERER */
+   { 28907, 0x00000C40 }, /* GL_RENDER_MODE */
+   { 28922, 0x00002901 }, /* GL_REPEAT */
+   { 28932, 0x00001E01 }, /* GL_REPLACE */
+   { 28943, 0x00008062 }, /* GL_REPLACE_EXT */
+   { 28958, 0x00008153 }, /* GL_REPLICATE_BORDER_HP */
+   { 28981, 0x0000803A }, /* GL_RESCALE_NORMAL */
+   { 28999, 0x0000803A }, /* GL_RESCALE_NORMAL_EXT */
+   { 29021, 0x00000102 }, /* GL_RETURN */
+   { 29031, 0x00001907 }, /* GL_RGB */
+   { 29038, 0x00008052 }, /* GL_RGB10 */
+   { 29047, 0x00008059 }, /* GL_RGB10_A2 */
+   { 29059, 0x00008059 }, /* GL_RGB10_A2_EXT */
+   { 29075, 0x00008052 }, /* GL_RGB10_EXT */
+   { 29088, 0x00008053 }, /* GL_RGB12 */
+   { 29097, 0x00008053 }, /* GL_RGB12_EXT */
+   { 29110, 0x00008054 }, /* GL_RGB16 */
+   { 29119, 0x00008054 }, /* GL_RGB16_EXT */
+   { 29132, 0x0000804E }, /* GL_RGB2_EXT */
+   { 29144, 0x0000804F }, /* GL_RGB4 */
+   { 29152, 0x0000804F }, /* GL_RGB4_EXT */
+   { 29164, 0x000083A1 }, /* GL_RGB4_S3TC */
+   { 29177, 0x00008050 }, /* GL_RGB5 */
+   { 29185, 0x00008057 }, /* GL_RGB5_A1 */
+   { 29196, 0x00008057 }, /* GL_RGB5_A1_EXT */
+   { 29211, 0x00008050 }, /* GL_RGB5_EXT */
+   { 29223, 0x00008051 }, /* GL_RGB8 */
+   { 29231, 0x00008051 }, /* GL_RGB8_EXT */
+   { 29243, 0x00001908 }, /* GL_RGBA */
+   { 29251, 0x0000805A }, /* GL_RGBA12 */
+   { 29261, 0x0000805A }, /* GL_RGBA12_EXT */
+   { 29275, 0x0000805B }, /* GL_RGBA16 */
+   { 29285, 0x0000805B }, /* GL_RGBA16_EXT */
+   { 29299, 0x00008055 }, /* GL_RGBA2 */
+   { 29308, 0x00008055 }, /* GL_RGBA2_EXT */
+   { 29321, 0x00008056 }, /* GL_RGBA4 */
+   { 29330, 0x000083A5 }, /* GL_RGBA4_DXT5_S3TC */
+   { 29349, 0x00008056 }, /* GL_RGBA4_EXT */
+   { 29362, 0x000083A3 }, /* GL_RGBA4_S3TC */
+   { 29376, 0x00008058 }, /* GL_RGBA8 */
+   { 29385, 0x00008058 }, /* GL_RGBA8_EXT */
+   { 29398, 0x00008F97 }, /* GL_RGBA8_SNORM */
+   { 29413, 0x000083A4 }, /* GL_RGBA_DXT5_S3TC */
+   { 29431, 0x00000C31 }, /* GL_RGBA_MODE */
+   { 29444, 0x000083A2 }, /* GL_RGBA_S3TC */
+   { 29457, 0x00008F93 }, /* GL_RGBA_SNORM */
+   { 29471, 0x000083A0 }, /* GL_RGB_S3TC */
+   { 29483, 0x00008573 }, /* GL_RGB_SCALE */
+   { 29496, 0x00008573 }, /* GL_RGB_SCALE_ARB */
+   { 29513, 0x00008573 }, /* GL_RGB_SCALE_EXT */
+   { 29530, 0x00000407 }, /* GL_RIGHT */
+   { 29539, 0x00002000 }, /* GL_S */
+   { 29544, 0x00008B5D }, /* GL_SAMPLER_1D */
+   { 29558, 0x00008B61 }, /* GL_SAMPLER_1D_SHADOW */
+   { 29579, 0x00008B5E }, /* GL_SAMPLER_2D */
+   { 29593, 0x00008B62 }, /* GL_SAMPLER_2D_SHADOW */
+   { 29614, 0x00008B5F }, /* GL_SAMPLER_3D */
+   { 29628, 0x00008B60 }, /* GL_SAMPLER_CUBE */
+   { 29644, 0x000080A9 }, /* GL_SAMPLES */
+   { 29655, 0x000086B4 }, /* GL_SAMPLES_3DFX */
+   { 29671, 0x000080A9 }, /* GL_SAMPLES_ARB */
+   { 29686, 0x00008914 }, /* GL_SAMPLES_PASSED */
+   { 29704, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */
+   { 29726, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
+   { 29754, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */
+   { 29786, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */
+   { 29809, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */
+   { 29836, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */
+   { 29854, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */
+   { 29877, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */
+   { 29899, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */
+   { 29918, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */
+   { 29941, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */
+   { 29967, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */
+   { 29997, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */
+   { 30022, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */
+   { 30051, 0x00080000 }, /* GL_SCISSOR_BIT */
+   { 30066, 0x00000C10 }, /* GL_SCISSOR_BOX */
+   { 30081, 0x00000C11 }, /* GL_SCISSOR_TEST */
+   { 30097, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */
+   { 30122, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
+   { 30162, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */
+   { 30206, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
+   { 30239, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
+   { 30269, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
+   { 30301, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
+   { 30331, 0x00001C02 }, /* GL_SELECT */
+   { 30341, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */
+   { 30369, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */
+   { 30394, 0x00008012 }, /* GL_SEPARABLE_2D */
+   { 30410, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */
+   { 30437, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */
+   { 30468, 0x0000150F }, /* GL_SET */
+   { 30475, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */
+   { 30496, 0x00008B88 }, /* GL_SHADER_SOURCE_LENGTH */
+   { 30520, 0x00008B4F }, /* GL_SHADER_TYPE */
+   { 30535, 0x00000B54 }, /* GL_SHADE_MODEL */
+   { 30550, 0x00008B8C }, /* GL_SHADING_LANGUAGE_VERSION */
+   { 30578, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */
+   { 30601, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */
+   { 30631, 0x00001601 }, /* GL_SHININESS */
+   { 30644, 0x00001402 }, /* GL_SHORT */
+   { 30653, 0x00008F9C }, /* GL_SIGNED_NORMALIZED */
+   { 30674, 0x000081F9 }, /* GL_SINGLE_COLOR */
+   { 30690, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */
+   { 30710, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */
+   { 30729, 0x00008C46 }, /* GL_SLUMINANCE */
+   { 30743, 0x00008C47 }, /* GL_SLUMINANCE8 */
+   { 30758, 0x00008C45 }, /* GL_SLUMINANCE8_ALPHA8 */
+   { 30780, 0x00008C44 }, /* GL_SLUMINANCE_ALPHA */
+   { 30800, 0x00001D01 }, /* GL_SMOOTH */
+   { 30810, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */
+   { 30843, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */
+   { 30870, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */
+   { 30903, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */
+   { 30930, 0x00008588 }, /* GL_SOURCE0_ALPHA */
+   { 30947, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */
+   { 30968, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */
+   { 30989, 0x00008580 }, /* GL_SOURCE0_RGB */
+   { 31004, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */
+   { 31023, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */
+   { 31042, 0x00008589 }, /* GL_SOURCE1_ALPHA */
+   { 31059, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */
+   { 31080, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */
+   { 31101, 0x00008581 }, /* GL_SOURCE1_RGB */
+   { 31116, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */
+   { 31135, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */
+   { 31154, 0x0000858A }, /* GL_SOURCE2_ALPHA */
+   { 31171, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */
+   { 31192, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */
+   { 31213, 0x00008582 }, /* GL_SOURCE2_RGB */
+   { 31228, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */
+   { 31247, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */
+   { 31266, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */
+   { 31286, 0x00008583 }, /* GL_SOURCE3_RGB_NV */
+   { 31304, 0x00001202 }, /* GL_SPECULAR */
+   { 31316, 0x00002402 }, /* GL_SPHERE_MAP */
+   { 31330, 0x00001206 }, /* GL_SPOT_CUTOFF */
+   { 31345, 0x00001204 }, /* GL_SPOT_DIRECTION */
+   { 31363, 0x00001205 }, /* GL_SPOT_EXPONENT */
+   { 31380, 0x00008588 }, /* GL_SRC0_ALPHA */
+   { 31394, 0x00008580 }, /* GL_SRC0_RGB */
+   { 31406, 0x00008589 }, /* GL_SRC1_ALPHA */
+   { 31420, 0x00008581 }, /* GL_SRC1_RGB */
+   { 31432, 0x0000858A }, /* GL_SRC2_ALPHA */
+   { 31446, 0x00008582 }, /* GL_SRC2_RGB */
+   { 31458, 0x00000302 }, /* GL_SRC_ALPHA */
+   { 31471, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */
+   { 31493, 0x00000300 }, /* GL_SRC_COLOR */
+   { 31506, 0x00008C40 }, /* GL_SRGB */
+   { 31514, 0x00008C41 }, /* GL_SRGB8 */
+   { 31523, 0x00008C43 }, /* GL_SRGB8_ALPHA8 */
+   { 31539, 0x00008C42 }, /* GL_SRGB_ALPHA */
+   { 31553, 0x00000503 }, /* GL_STACK_OVERFLOW */
+   { 31571, 0x00000504 }, /* GL_STACK_UNDERFLOW */
+   { 31590, 0x000088E6 }, /* GL_STATIC_COPY */
+   { 31605, 0x000088E6 }, /* GL_STATIC_COPY_ARB */
+   { 31624, 0x000088E4 }, /* GL_STATIC_DRAW */
+   { 31639, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */
+   { 31658, 0x000088E5 }, /* GL_STATIC_READ */
+   { 31673, 0x000088E5 }, /* GL_STATIC_READ_ARB */
+   { 31692, 0x00001802 }, /* GL_STENCIL */
+   { 31703, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT */
+   { 31725, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */
+   { 31751, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */
+   { 31772, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */
+   { 31797, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
+   { 31818, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */
+   { 31843, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
+   { 31875, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */
+   { 31911, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
+   { 31943, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */
+   { 31979, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
+   { 31999, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
+   { 32026, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
+   { 32052, 0x00000D57 }, /* GL_STENCIL_BITS */
+   { 32068, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
+   { 32090, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
+   { 32113, 0x00000B94 }, /* GL_STENCIL_FAIL */
+   { 32129, 0x00000B92 }, /* GL_STENCIL_FUNC */
+   { 32145, 0x00001901 }, /* GL_STENCIL_INDEX */
+   { 32162, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
+   { 32185, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
+   { 32207, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
+   { 32229, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
+   { 32251, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
+   { 32272, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
+   { 32299, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
+   { 32326, 0x00000B97 }, /* GL_STENCIL_REF */
+   { 32341, 0x00000B90 }, /* GL_STENCIL_TEST */
+   { 32357, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
+   { 32386, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
+   { 32408, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
+   { 32429, 0x00000C33 }, /* GL_STEREO */
+   { 32439, 0x000085BE }, /* GL_STORAGE_CACHED_APPLE */
+   { 32463, 0x000085BD }, /* GL_STORAGE_PRIVATE_APPLE */
+   { 32488, 0x000085BF }, /* GL_STORAGE_SHARED_APPLE */
+   { 32512, 0x000088E2 }, /* GL_STREAM_COPY */
+   { 32527, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
+   { 32546, 0x000088E0 }, /* GL_STREAM_DRAW */
+   { 32561, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
+   { 32580, 0x000088E1 }, /* GL_STREAM_READ */
+   { 32595, 0x000088E1 }, /* GL_STREAM_READ_ARB */
+   { 32614, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
+   { 32631, 0x000084E7 }, /* GL_SUBTRACT */
+   { 32643, 0x000084E7 }, /* GL_SUBTRACT_ARB */
+   { 32659, 0x00002001 }, /* GL_T */
+   { 32664, 0x00002A2A }, /* GL_T2F_C3F_V3F */
+   { 32679, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
+   { 32698, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
+   { 32714, 0x00002A2B }, /* GL_T2F_N3F_V3F */
+   { 32729, 0x00002A27 }, /* GL_T2F_V3F */
+   { 32740, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
+   { 32759, 0x00002A28 }, /* GL_T4F_V4F */
+   { 32770, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
+   { 32793, 0x00001702 }, /* GL_TEXTURE */
+   { 32804, 0x000084C0 }, /* GL_TEXTURE0 */
+   { 32816, 0x000084C0 }, /* GL_TEXTURE0_ARB */
+   { 32832, 0x000084C1 }, /* GL_TEXTURE1 */
+   { 32844, 0x000084CA }, /* GL_TEXTURE10 */
+   { 32857, 0x000084CA }, /* GL_TEXTURE10_ARB */
+   { 32874, 0x000084CB }, /* GL_TEXTURE11 */
+   { 32887, 0x000084CB }, /* GL_TEXTURE11_ARB */
+   { 32904, 0x000084CC }, /* GL_TEXTURE12 */
+   { 32917, 0x000084CC }, /* GL_TEXTURE12_ARB */
+   { 32934, 0x000084CD }, /* GL_TEXTURE13 */
+   { 32947, 0x000084CD }, /* GL_TEXTURE13_ARB */
+   { 32964, 0x000084CE }, /* GL_TEXTURE14 */
+   { 32977, 0x000084CE }, /* GL_TEXTURE14_ARB */
+   { 32994, 0x000084CF }, /* GL_TEXTURE15 */
+   { 33007, 0x000084CF }, /* GL_TEXTURE15_ARB */
+   { 33024, 0x000084D0 }, /* GL_TEXTURE16 */
+   { 33037, 0x000084D0 }, /* GL_TEXTURE16_ARB */
+   { 33054, 0x000084D1 }, /* GL_TEXTURE17 */
+   { 33067, 0x000084D1 }, /* GL_TEXTURE17_ARB */
+   { 33084, 0x000084D2 }, /* GL_TEXTURE18 */
+   { 33097, 0x000084D2 }, /* GL_TEXTURE18_ARB */
+   { 33114, 0x000084D3 }, /* GL_TEXTURE19 */
+   { 33127, 0x000084D3 }, /* GL_TEXTURE19_ARB */
+   { 33144, 0x000084C1 }, /* GL_TEXTURE1_ARB */
+   { 33160, 0x000084C2 }, /* GL_TEXTURE2 */
+   { 33172, 0x000084D4 }, /* GL_TEXTURE20 */
+   { 33185, 0x000084D4 }, /* GL_TEXTURE20_ARB */
+   { 33202, 0x000084D5 }, /* GL_TEXTURE21 */
+   { 33215, 0x000084D5 }, /* GL_TEXTURE21_ARB */
+   { 33232, 0x000084D6 }, /* GL_TEXTURE22 */
+   { 33245, 0x000084D6 }, /* GL_TEXTURE22_ARB */
+   { 33262, 0x000084D7 }, /* GL_TEXTURE23 */
+   { 33275, 0x000084D7 }, /* GL_TEXTURE23_ARB */
+   { 33292, 0x000084D8 }, /* GL_TEXTURE24 */
+   { 33305, 0x000084D8 }, /* GL_TEXTURE24_ARB */
+   { 33322, 0x000084D9 }, /* GL_TEXTURE25 */
+   { 33335, 0x000084D9 }, /* GL_TEXTURE25_ARB */
+   { 33352, 0x000084DA }, /* GL_TEXTURE26 */
+   { 33365, 0x000084DA }, /* GL_TEXTURE26_ARB */
+   { 33382, 0x000084DB }, /* GL_TEXTURE27 */
+   { 33395, 0x000084DB }, /* GL_TEXTURE27_ARB */
+   { 33412, 0x000084DC }, /* GL_TEXTURE28 */
+   { 33425, 0x000084DC }, /* GL_TEXTURE28_ARB */
+   { 33442, 0x000084DD }, /* GL_TEXTURE29 */
+   { 33455, 0x000084DD }, /* GL_TEXTURE29_ARB */
+   { 33472, 0x000084C2 }, /* GL_TEXTURE2_ARB */
+   { 33488, 0x000084C3 }, /* GL_TEXTURE3 */
+   { 33500, 0x000084DE }, /* GL_TEXTURE30 */
+   { 33513, 0x000084DE }, /* GL_TEXTURE30_ARB */
+   { 33530, 0x000084DF }, /* GL_TEXTURE31 */
+   { 33543, 0x000084DF }, /* GL_TEXTURE31_ARB */
+   { 33560, 0x000084C3 }, /* GL_TEXTURE3_ARB */
+   { 33576, 0x000084C4 }, /* GL_TEXTURE4 */
+   { 33588, 0x000084C4 }, /* GL_TEXTURE4_ARB */
+   { 33604, 0x000084C5 }, /* GL_TEXTURE5 */
+   { 33616, 0x000084C5 }, /* GL_TEXTURE5_ARB */
+   { 33632, 0x000084C6 }, /* GL_TEXTURE6 */
+   { 33644, 0x000084C6 }, /* GL_TEXTURE6_ARB */
+   { 33660, 0x000084C7 }, /* GL_TEXTURE7 */
+   { 33672, 0x000084C7 }, /* GL_TEXTURE7_ARB */
+   { 33688, 0x000084C8 }, /* GL_TEXTURE8 */
+   { 33700, 0x000084C8 }, /* GL_TEXTURE8_ARB */
+   { 33716, 0x000084C9 }, /* GL_TEXTURE9 */
+   { 33728, 0x000084C9 }, /* GL_TEXTURE9_ARB */
+   { 33744, 0x00000DE0 }, /* GL_TEXTURE_1D */
+   { 33758, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
+   { 33782, 0x00000DE1 }, /* GL_TEXTURE_2D */
+   { 33796, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
+   { 33820, 0x0000806F }, /* GL_TEXTURE_3D */
+   { 33834, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
+   { 33856, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
+   { 33882, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
+   { 33904, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
+   { 33926, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
+   { 33958, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
+   { 33980, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
+   { 34012, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
+   { 34034, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
+   { 34062, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
+   { 34094, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
+   { 34127, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
+   { 34159, 0x00040000 }, /* GL_TEXTURE_BIT */
+   { 34174, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
+   { 34195, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
+   { 34220, 0x00001005 }, /* GL_TEXTURE_BORDER */
+   { 34238, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
+   { 34262, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
+   { 34293, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
+   { 34323, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
+   { 34353, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
+   { 34388, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
+   { 34419, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+   { 34457, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
+   { 34484, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
+   { 34516, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+   { 34550, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
+   { 34574, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
+   { 34602, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
+   { 34626, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
+   { 34654, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
+   { 34687, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
+   { 34711, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
+   { 34733, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
+   { 34755, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
+   { 34781, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
+   { 34815, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
+   { 34848, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
+   { 34885, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
+   { 34913, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
+   { 34945, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
+   { 34968, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
+   { 35006, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
+   { 35048, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
+   { 35079, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
+   { 35107, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
+   { 35137, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
+   { 35165, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
+   { 35185, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
+   { 35209, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
+   { 35240, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
+   { 35275, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
+   { 35306, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
+   { 35341, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
+   { 35372, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
+   { 35407, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
+   { 35438, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
+   { 35473, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
+   { 35504, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
+   { 35539, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
+   { 35570, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
+   { 35605, 0x00008071 }, /* GL_TEXTURE_DEPTH */
+   { 35622, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
+   { 35644, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
+   { 35670, 0x00002300 }, /* GL_TEXTURE_ENV */
+   { 35685, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
+   { 35706, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
+   { 35726, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
+   { 35752, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
+   { 35772, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
+   { 35789, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
+   { 35806, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
+   { 35823, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
+   { 35840, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
+   { 35865, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
+   { 35887, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
+   { 35913, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
+   { 35931, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
+   { 35957, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
+   { 35983, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
+   { 36013, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
+   { 36040, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
+   { 36065, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
+   { 36085, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
+   { 36109, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+   { 36136, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+   { 36163, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+   { 36190, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
+   { 36216, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
+   { 36246, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
+   { 36268, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
+   { 36286, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+   { 36316, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+   { 36344, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+   { 36372, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+   { 36400, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
+   { 36421, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
+   { 36440, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
+   { 36462, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
+   { 36481, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
+   { 36501, 0x000085B7 }, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
+   { 36531, 0x000085B8 }, /* GL_TEXTURE_RANGE_POINTER_APPLE */
+   { 36562, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
+   { 36587, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
+   { 36611, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
+   { 36631, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
+   { 36655, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
+   { 36675, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
+   { 36698, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */
+   { 36722, 0x000085BC }, /* GL_TEXTURE_STORAGE_HINT_APPLE */
+   { 36752, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
+   { 36777, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+   { 36811, 0x00001000 }, /* GL_TEXTURE_WIDTH */
+   { 36828, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
+   { 36846, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
+   { 36864, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
+   { 36882, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
+   { 36902, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
+   { 36921, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+   { 36950, 0x00001000 }, /* GL_TRANSFORM_BIT */
+   { 36967, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
+   { 36993, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
+   { 37023, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+   { 37055, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+   { 37085, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
+   { 37119, 0x0000862C }, /* GL_TRANSPOSE_NV */
+   { 37135, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+   { 37166, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
+   { 37201, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+   { 37229, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
+   { 37261, 0x00000004 }, /* GL_TRIANGLES */
+   { 37274, 0x00000006 }, /* GL_TRIANGLE_FAN */
+   { 37290, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
+   { 37311, 0x00000005 }, /* GL_TRIANGLE_STRIP */
+   { 37329, 0x00000001 }, /* GL_TRUE */
+   { 37337, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
+   { 37357, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
+   { 37380, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
+   { 37400, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
+   { 37421, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
+   { 37443, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
+   { 37465, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
+   { 37485, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
+   { 37506, 0x00001401 }, /* GL_UNSIGNED_BYTE */
+   { 37523, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+   { 37550, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
+   { 37573, 0x00001405 }, /* GL_UNSIGNED_INT */
+   { 37589, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
+   { 37616, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */
+   { 37637, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
+   { 37661, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+   { 37692, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
+   { 37716, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+   { 37744, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */
+   { 37767, 0x00001403 }, /* GL_UNSIGNED_SHORT */
+   { 37785, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+   { 37815, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+   { 37841, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+   { 37871, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+   { 37897, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
+   { 37921, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+   { 37949, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+   { 37977, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
+   { 38004, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+   { 38036, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
+   { 38067, 0x00008CA2 }, /* GL_UPPER_LEFT */
+   { 38081, 0x00002A20 }, /* GL_V2F */
+   { 38088, 0x00002A21 }, /* GL_V3F */
+   { 38095, 0x00008B83 }, /* GL_VALIDATE_STATUS */
+   { 38114, 0x00001F00 }, /* GL_VENDOR */
+   { 38124, 0x00001F02 }, /* GL_VERSION */
+   { 38135, 0x00008074 }, /* GL_VERTEX_ARRAY */
+   { 38151, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING */
+   { 38175, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
+   { 38205, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+   { 38236, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
+   { 38271, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
+   { 38295, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
+   { 38316, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
+   { 38339, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
+   { 38360, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+   { 38387, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+   { 38415, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+   { 38443, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+   { 38471, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+   { 38499, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+   { 38527, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+   { 38555, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+   { 38582, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+   { 38609, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+   { 38636, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+   { 38663, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+   { 38690, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+   { 38717, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+   { 38744, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+   { 38771, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+   { 38798, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+   { 38836, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
+   { 38878, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+   { 38909, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
+   { 38944, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+   { 38978, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
+   { 39016, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+   { 39047, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
+   { 39082, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+   { 39110, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
+   { 39142, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+   { 39172, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
+   { 39206, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+   { 39234, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
+   { 39266, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
+   { 39286, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
+   { 39308, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
+   { 39337, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
+   { 39358, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
+   { 39387, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
+   { 39420, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
+   { 39452, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+   { 39479, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
+   { 39510, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
+   { 39540, 0x00008B31 }, /* GL_VERTEX_SHADER */
+   { 39557, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
+   { 39578, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
+   { 39605, 0x00000BA2 }, /* GL_VIEWPORT */
+   { 39617, 0x00000800 }, /* GL_VIEWPORT_BIT */
+   { 39633, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
+   { 39653, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+   { 39684, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
+   { 39719, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+   { 39747, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+   { 39772, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+   { 39799, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+   { 39824, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
+   { 39848, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
+   { 39867, 0x000088B9 }, /* GL_WRITE_ONLY */
+   { 39881, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
+   { 39899, 0x00001506 }, /* GL_XOR */
+   { 39906, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
+   { 39925, 0x00008757 }, /* GL_YCBCR_MESA */
+   { 39939, 0x00000000 }, /* GL_ZERO */
+   { 39947, 0x00000D16 }, /* GL_ZOOM_X */
+   { 39957, 0x00000D17 }, /* GL_ZOOM_Y */
 };
 
-static const unsigned reduced_enums[1325] =
+static const unsigned reduced_enums[1333] =
 {
-       471, /* GL_FALSE */
-       687, /* GL_LINES */
-       689, /* GL_LINE_LOOP */
-       696, /* GL_LINE_STRIP */
-      1721, /* GL_TRIANGLES */
-      1724, /* GL_TRIANGLE_STRIP */
-      1722, /* GL_TRIANGLE_FAN */
-      1265, /* GL_QUADS */
-      1268, /* GL_QUAD_STRIP */
-      1152, /* GL_POLYGON */
-      1164, /* GL_POLYGON_STIPPLE_BIT */
-      1113, /* GL_PIXEL_MODE_BIT */
-       674, /* GL_LIGHTING_BIT */
-       500, /* GL_FOG_BIT */
+       473, /* GL_FALSE */
+       689, /* GL_LINES */
+       691, /* GL_LINE_LOOP */
+       698, /* GL_LINE_STRIP */
+      1729, /* GL_TRIANGLES */
+      1732, /* GL_TRIANGLE_STRIP */
+      1730, /* GL_TRIANGLE_FAN */
+      1267, /* GL_QUADS */
+      1270, /* GL_QUAD_STRIP */
+      1154, /* GL_POLYGON */
+      1166, /* GL_POLYGON_STIPPLE_BIT */
+      1115, /* GL_PIXEL_MODE_BIT */
+       676, /* GL_LIGHTING_BIT */
+       502, /* GL_FOG_BIT */
          8, /* GL_ACCUM */
-       706, /* GL_LOAD */
-      1320, /* GL_RETURN */
-       986, /* GL_MULT */
+       708, /* GL_LOAD */
+      1322, /* GL_RETURN */
+       988, /* GL_MULT */
         23, /* GL_ADD */
-      1002, /* GL_NEVER */
-       664, /* GL_LESS */
-       461, /* GL_EQUAL */
-       663, /* GL_LEQUAL */
-       586, /* GL_GREATER */
-      1017, /* GL_NOTEQUAL */
-       585, /* GL_GEQUAL */
+      1004, /* GL_NEVER */
+       666, /* GL_LESS */
+       463, /* GL_EQUAL */
+       665, /* GL_LEQUAL */
+       588, /* GL_GREATER */
+      1019, /* GL_NOTEQUAL */
+       587, /* GL_GEQUAL */
         46, /* GL_ALWAYS */
-      1460, /* GL_SRC_COLOR */
-      1046, /* GL_ONE_MINUS_SRC_COLOR */
-      1458, /* GL_SRC_ALPHA */
-      1045, /* GL_ONE_MINUS_SRC_ALPHA */
-       440, /* GL_DST_ALPHA */
-      1043, /* GL_ONE_MINUS_DST_ALPHA */
-       441, /* GL_DST_COLOR */
-      1044, /* GL_ONE_MINUS_DST_COLOR */
-      1459, /* GL_SRC_ALPHA_SATURATE */
-       573, /* GL_FRONT_LEFT */
-       574, /* GL_FRONT_RIGHT */
+      1462, /* GL_SRC_COLOR */
+      1048, /* GL_ONE_MINUS_SRC_COLOR */
+      1460, /* GL_SRC_ALPHA */
+      1047, /* GL_ONE_MINUS_SRC_ALPHA */
+       442, /* GL_DST_ALPHA */
+      1045, /* GL_ONE_MINUS_DST_ALPHA */
+       443, /* GL_DST_COLOR */
+      1046, /* GL_ONE_MINUS_DST_COLOR */
+      1461, /* GL_SRC_ALPHA_SATURATE */
+       575, /* GL_FRONT_LEFT */
+       576, /* GL_FRONT_RIGHT */
         68, /* GL_BACK_LEFT */
         69, /* GL_BACK_RIGHT */
-       570, /* GL_FRONT */
+       572, /* GL_FRONT */
         67, /* GL_BACK */
-       662, /* GL_LEFT */
-      1362, /* GL_RIGHT */
-       571, /* GL_FRONT_AND_BACK */
+       664, /* GL_LEFT */
+      1364, /* GL_RIGHT */
+       573, /* GL_FRONT_AND_BACK */
         62, /* GL_AUX0 */
         63, /* GL_AUX1 */
         64, /* GL_AUX2 */
         65, /* GL_AUX3 */
-       652, /* GL_INVALID_ENUM */
-       656, /* GL_INVALID_VALUE */
-       655, /* GL_INVALID_OPERATION */
-      1465, /* GL_STACK_OVERFLOW */
-      1466, /* GL_STACK_UNDERFLOW */
-      1071, /* GL_OUT_OF_MEMORY */
-       653, /* GL_INVALID_FRAMEBUFFER_OPERATION */
+       654, /* GL_INVALID_ENUM */
+       658, /* GL_INVALID_VALUE */
+       657, /* GL_INVALID_OPERATION */
+      1467, /* GL_STACK_OVERFLOW */
+      1468, /* GL_STACK_UNDERFLOW */
+      1073, /* GL_OUT_OF_MEMORY */
+       655, /* GL_INVALID_FRAMEBUFFER_OPERATION */
          0, /* GL_2D */
          2, /* GL_3D */
          3, /* GL_3D_COLOR */
          4, /* GL_3D_COLOR_TEXTURE */
          6, /* GL_4D_COLOR_TEXTURE */
-      1091, /* GL_PASS_THROUGH_TOKEN */
-      1151, /* GL_POINT_TOKEN */
-       697, /* GL_LINE_TOKEN */
-      1165, /* GL_POLYGON_TOKEN */
+      1093, /* GL_PASS_THROUGH_TOKEN */
+      1153, /* GL_POINT_TOKEN */
+       699, /* GL_LINE_TOKEN */
+      1167, /* GL_POLYGON_TOKEN */
         73, /* GL_BITMAP_TOKEN */
-       439, /* GL_DRAW_PIXEL_TOKEN */
-       297, /* GL_COPY_PIXEL_TOKEN */
-       690, /* GL_LINE_RESET_TOKEN */
-       464, /* GL_EXP */
-       465, /* GL_EXP2 */
-       333, /* GL_CW */
-       122, /* GL_CCW */
-       143, /* GL_COEFF */
-      1068, /* GL_ORDER */
-       377, /* GL_DOMAIN */
-       307, /* GL_CURRENT_COLOR */
-       310, /* GL_CURRENT_INDEX */
-       316, /* GL_CURRENT_NORMAL */
-       329, /* GL_CURRENT_TEXTURE_COORDS */
-       321, /* GL_CURRENT_RASTER_COLOR */
-       323, /* GL_CURRENT_RASTER_INDEX */
-       327, /* GL_CURRENT_RASTER_TEXTURE_COORDS */
-       324, /* GL_CURRENT_RASTER_POSITION */
-       325, /* GL_CURRENT_RASTER_POSITION_VALID */
-       322, /* GL_CURRENT_RASTER_DISTANCE */
-      1144, /* GL_POINT_SMOOTH */
-      1133, /* GL_POINT_SIZE */
-      1143, /* GL_POINT_SIZE_RANGE */
-      1134, /* GL_POINT_SIZE_GRANULARITY */
-       691, /* GL_LINE_SMOOTH */
-       698, /* GL_LINE_WIDTH */
-       700, /* GL_LINE_WIDTH_RANGE */
-       699, /* GL_LINE_WIDTH_GRANULARITY */
-       693, /* GL_LINE_STIPPLE */
-       694, /* GL_LINE_STIPPLE_PATTERN */
-       695, /* GL_LINE_STIPPLE_REPEAT */
-       705, /* GL_LIST_MODE */
-       870, /* GL_MAX_LIST_NESTING */
-       702, /* GL_LIST_BASE */
-       704, /* GL_LIST_INDEX */
-      1154, /* GL_POLYGON_MODE */
-      1161, /* GL_POLYGON_SMOOTH */
-      1163, /* GL_POLYGON_STIPPLE */
-       450, /* GL_EDGE_FLAG */
-       300, /* GL_CULL_FACE */
-       301, /* GL_CULL_FACE_MODE */
-       572, /* GL_FRONT_FACE */
-       673, /* GL_LIGHTING */
-       678, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
-       679, /* GL_LIGHT_MODEL_TWO_SIDE */
-       675, /* GL_LIGHT_MODEL_AMBIENT */
-      1408, /* GL_SHADE_MODEL */
-       190, /* GL_COLOR_MATERIAL_FACE */
-       191, /* GL_COLOR_MATERIAL_PARAMETER */
-       189, /* GL_COLOR_MATERIAL */
-       499, /* GL_FOG */
-       521, /* GL_FOG_INDEX */
-       517, /* GL_FOG_DENSITY */
-       525, /* GL_FOG_START */
-       519, /* GL_FOG_END */
-       522, /* GL_FOG_MODE */
-       501, /* GL_FOG_COLOR */
-       364, /* GL_DEPTH_RANGE */
-       371, /* GL_DEPTH_TEST */
-       374, /* GL_DEPTH_WRITEMASK */
-       352, /* GL_DEPTH_CLEAR_VALUE */
-       363, /* GL_DEPTH_FUNC */
+       441, /* GL_DRAW_PIXEL_TOKEN */
+       299, /* GL_COPY_PIXEL_TOKEN */
+       692, /* GL_LINE_RESET_TOKEN */
+       466, /* GL_EXP */
+       467, /* GL_EXP2 */
+       335, /* GL_CW */
+       124, /* GL_CCW */
+       145, /* GL_COEFF */
+      1070, /* GL_ORDER */
+       379, /* GL_DOMAIN */
+       309, /* GL_CURRENT_COLOR */
+       312, /* GL_CURRENT_INDEX */
+       318, /* GL_CURRENT_NORMAL */
+       331, /* GL_CURRENT_TEXTURE_COORDS */
+       323, /* GL_CURRENT_RASTER_COLOR */
+       325, /* GL_CURRENT_RASTER_INDEX */
+       329, /* GL_CURRENT_RASTER_TEXTURE_COORDS */
+       326, /* GL_CURRENT_RASTER_POSITION */
+       327, /* GL_CURRENT_RASTER_POSITION_VALID */
+       324, /* GL_CURRENT_RASTER_DISTANCE */
+      1146, /* GL_POINT_SMOOTH */
+      1135, /* GL_POINT_SIZE */
+      1145, /* GL_POINT_SIZE_RANGE */
+      1136, /* GL_POINT_SIZE_GRANULARITY */
+       693, /* GL_LINE_SMOOTH */
+       700, /* GL_LINE_WIDTH */
+       702, /* GL_LINE_WIDTH_RANGE */
+       701, /* GL_LINE_WIDTH_GRANULARITY */
+       695, /* GL_LINE_STIPPLE */
+       696, /* GL_LINE_STIPPLE_PATTERN */
+       697, /* GL_LINE_STIPPLE_REPEAT */
+       707, /* GL_LIST_MODE */
+       872, /* GL_MAX_LIST_NESTING */
+       704, /* GL_LIST_BASE */
+       706, /* GL_LIST_INDEX */
+      1156, /* GL_POLYGON_MODE */
+      1163, /* GL_POLYGON_SMOOTH */
+      1165, /* GL_POLYGON_STIPPLE */
+       452, /* GL_EDGE_FLAG */
+       302, /* GL_CULL_FACE */
+       303, /* GL_CULL_FACE_MODE */
+       574, /* GL_FRONT_FACE */
+       675, /* GL_LIGHTING */
+       680, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
+       681, /* GL_LIGHT_MODEL_TWO_SIDE */
+       677, /* GL_LIGHT_MODEL_AMBIENT */
+      1410, /* GL_SHADE_MODEL */
+       192, /* GL_COLOR_MATERIAL_FACE */
+       193, /* GL_COLOR_MATERIAL_PARAMETER */
+       191, /* GL_COLOR_MATERIAL */
+       501, /* GL_FOG */
+       523, /* GL_FOG_INDEX */
+       519, /* GL_FOG_DENSITY */
+       527, /* GL_FOG_START */
+       521, /* GL_FOG_END */
+       524, /* GL_FOG_MODE */
+       503, /* GL_FOG_COLOR */
+       366, /* GL_DEPTH_RANGE */
+       373, /* GL_DEPTH_TEST */
+       376, /* GL_DEPTH_WRITEMASK */
+       354, /* GL_DEPTH_CLEAR_VALUE */
+       365, /* GL_DEPTH_FUNC */
         12, /* GL_ACCUM_CLEAR_VALUE */
-      1501, /* GL_STENCIL_TEST */
-      1489, /* GL_STENCIL_CLEAR_VALUE */
-      1491, /* GL_STENCIL_FUNC */
-      1503, /* GL_STENCIL_VALUE_MASK */
-      1490, /* GL_STENCIL_FAIL */
-      1498, /* GL_STENCIL_PASS_DEPTH_FAIL */
-      1499, /* GL_STENCIL_PASS_DEPTH_PASS */
-      1500, /* GL_STENCIL_REF */
-      1504, /* GL_STENCIL_WRITEMASK */
-       839, /* GL_MATRIX_MODE */
-      1007, /* GL_NORMALIZE */
-      1814, /* GL_VIEWPORT */
-       981, /* GL_MODELVIEW_STACK_DEPTH */
-      1244, /* GL_PROJECTION_STACK_DEPTH */
-      1699, /* GL_TEXTURE_STACK_DEPTH */
-       979, /* GL_MODELVIEW_MATRIX */
-      1243, /* GL_PROJECTION_MATRIX */
-      1684, /* GL_TEXTURE_MATRIX */
+      1503, /* GL_STENCIL_TEST */
+      1491, /* GL_STENCIL_CLEAR_VALUE */
+      1493, /* GL_STENCIL_FUNC */
+      1505, /* GL_STENCIL_VALUE_MASK */
+      1492, /* GL_STENCIL_FAIL */
+      1500, /* GL_STENCIL_PASS_DEPTH_FAIL */
+      1501, /* GL_STENCIL_PASS_DEPTH_PASS */
+      1502, /* GL_STENCIL_REF */
+      1506, /* GL_STENCIL_WRITEMASK */
+       841, /* GL_MATRIX_MODE */
+      1009, /* GL_NORMALIZE */
+      1822, /* GL_VIEWPORT */
+       983, /* GL_MODELVIEW_STACK_DEPTH */
+      1246, /* GL_PROJECTION_STACK_DEPTH */
+      1706, /* GL_TEXTURE_STACK_DEPTH */
+       981, /* GL_MODELVIEW_MATRIX */
+      1245, /* GL_PROJECTION_MATRIX */
+      1689, /* GL_TEXTURE_MATRIX */
         60, /* GL_ATTRIB_STACK_DEPTH */
-       133, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
+       135, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
         43, /* GL_ALPHA_TEST */
         44, /* GL_ALPHA_TEST_FUNC */
         45, /* GL_ALPHA_TEST_REF */
-       376, /* GL_DITHER */
+       378, /* GL_DITHER */
         77, /* GL_BLEND_DST */
         86, /* GL_BLEND_SRC */
         74, /* GL_BLEND */
-       708, /* GL_LOGIC_OP_MODE */
-       626, /* GL_INDEX_LOGIC_OP */
-       188, /* GL_COLOR_LOGIC_OP */
+       710, /* GL_LOGIC_OP_MODE */
+       628, /* GL_INDEX_LOGIC_OP */
+       190, /* GL_COLOR_LOGIC_OP */
         66, /* GL_AUX_BUFFERS */
-       387, /* GL_DRAW_BUFFER */
-      1278, /* GL_READ_BUFFER */
-      1389, /* GL_SCISSOR_BOX */
-      1390, /* GL_SCISSOR_TEST */
-       625, /* GL_INDEX_CLEAR_VALUE */
-       630, /* GL_INDEX_WRITEMASK */
-       185, /* GL_COLOR_CLEAR_VALUE */
-       227, /* GL_COLOR_WRITEMASK */
-       627, /* GL_INDEX_MODE */
-      1355, /* GL_RGBA_MODE */
-       386, /* GL_DOUBLEBUFFER */
-      1505, /* GL_STEREO */
-      1313, /* GL_RENDER_MODE */
-      1092, /* GL_PERSPECTIVE_CORRECTION_HINT */
-      1145, /* GL_POINT_SMOOTH_HINT */
-       692, /* GL_LINE_SMOOTH_HINT */
-      1162, /* GL_POLYGON_SMOOTH_HINT */
-       520, /* GL_FOG_HINT */
-      1665, /* GL_TEXTURE_GEN_S */
-      1666, /* GL_TEXTURE_GEN_T */
-      1664, /* GL_TEXTURE_GEN_R */
-      1663, /* GL_TEXTURE_GEN_Q */
-      1105, /* GL_PIXEL_MAP_I_TO_I */
-      1111, /* GL_PIXEL_MAP_S_TO_S */
-      1107, /* GL_PIXEL_MAP_I_TO_R */
-      1103, /* GL_PIXEL_MAP_I_TO_G */
-      1101, /* GL_PIXEL_MAP_I_TO_B */
-      1099, /* GL_PIXEL_MAP_I_TO_A */
-      1109, /* GL_PIXEL_MAP_R_TO_R */
-      1097, /* GL_PIXEL_MAP_G_TO_G */
-      1095, /* GL_PIXEL_MAP_B_TO_B */
-      1093, /* GL_PIXEL_MAP_A_TO_A */
-      1106, /* GL_PIXEL_MAP_I_TO_I_SIZE */
-      1112, /* GL_PIXEL_MAP_S_TO_S_SIZE */
-      1108, /* GL_PIXEL_MAP_I_TO_R_SIZE */
-      1104, /* GL_PIXEL_MAP_I_TO_G_SIZE */
-      1102, /* GL_PIXEL_MAP_I_TO_B_SIZE */
-      1100, /* GL_PIXEL_MAP_I_TO_A_SIZE */
-      1110, /* GL_PIXEL_MAP_R_TO_R_SIZE */
-      1098, /* GL_PIXEL_MAP_G_TO_G_SIZE */
-      1096, /* GL_PIXEL_MAP_B_TO_B_SIZE */
-      1094, /* GL_PIXEL_MAP_A_TO_A_SIZE */
-      1733, /* GL_UNPACK_SWAP_BYTES */
-      1728, /* GL_UNPACK_LSB_FIRST */
-      1729, /* GL_UNPACK_ROW_LENGTH */
-      1732, /* GL_UNPACK_SKIP_ROWS */
-      1731, /* GL_UNPACK_SKIP_PIXELS */
-      1726, /* GL_UNPACK_ALIGNMENT */
-      1080, /* GL_PACK_SWAP_BYTES */
-      1075, /* GL_PACK_LSB_FIRST */
-      1076, /* GL_PACK_ROW_LENGTH */
-      1079, /* GL_PACK_SKIP_ROWS */
-      1078, /* GL_PACK_SKIP_PIXELS */
-      1072, /* GL_PACK_ALIGNMENT */
-       786, /* GL_MAP_COLOR */
-       791, /* GL_MAP_STENCIL */
-       629, /* GL_INDEX_SHIFT */
-       628, /* GL_INDEX_OFFSET */
-      1291, /* GL_RED_SCALE */
-      1289, /* GL_RED_BIAS */
-      1831, /* GL_ZOOM_X */
-      1832, /* GL_ZOOM_Y */
-       590, /* GL_GREEN_SCALE */
-       588, /* GL_GREEN_BIAS */
+       389, /* GL_DRAW_BUFFER */
+      1280, /* GL_READ_BUFFER */
+      1391, /* GL_SCISSOR_BOX */
+      1392, /* GL_SCISSOR_TEST */
+       627, /* GL_INDEX_CLEAR_VALUE */
+       632, /* GL_INDEX_WRITEMASK */
+       187, /* GL_COLOR_CLEAR_VALUE */
+       229, /* GL_COLOR_WRITEMASK */
+       629, /* GL_INDEX_MODE */
+      1357, /* GL_RGBA_MODE */
+       388, /* GL_DOUBLEBUFFER */
+      1507, /* GL_STEREO */
+      1315, /* GL_RENDER_MODE */
+      1094, /* GL_PERSPECTIVE_CORRECTION_HINT */
+      1147, /* GL_POINT_SMOOTH_HINT */
+       694, /* GL_LINE_SMOOTH_HINT */
+      1164, /* GL_POLYGON_SMOOTH_HINT */
+       522, /* GL_FOG_HINT */
+      1670, /* GL_TEXTURE_GEN_S */
+      1671, /* GL_TEXTURE_GEN_T */
+      1669, /* GL_TEXTURE_GEN_R */
+      1668, /* GL_TEXTURE_GEN_Q */
+      1107, /* GL_PIXEL_MAP_I_TO_I */
+      1113, /* GL_PIXEL_MAP_S_TO_S */
+      1109, /* GL_PIXEL_MAP_I_TO_R */
+      1105, /* GL_PIXEL_MAP_I_TO_G */
+      1103, /* GL_PIXEL_MAP_I_TO_B */
+      1101, /* GL_PIXEL_MAP_I_TO_A */
+      1111, /* GL_PIXEL_MAP_R_TO_R */
+      1099, /* GL_PIXEL_MAP_G_TO_G */
+      1097, /* GL_PIXEL_MAP_B_TO_B */
+      1095, /* GL_PIXEL_MAP_A_TO_A */
+      1108, /* GL_PIXEL_MAP_I_TO_I_SIZE */
+      1114, /* GL_PIXEL_MAP_S_TO_S_SIZE */
+      1110, /* GL_PIXEL_MAP_I_TO_R_SIZE */
+      1106, /* GL_PIXEL_MAP_I_TO_G_SIZE */
+      1104, /* GL_PIXEL_MAP_I_TO_B_SIZE */
+      1102, /* GL_PIXEL_MAP_I_TO_A_SIZE */
+      1112, /* GL_PIXEL_MAP_R_TO_R_SIZE */
+      1100, /* GL_PIXEL_MAP_G_TO_G_SIZE */
+      1098, /* GL_PIXEL_MAP_B_TO_B_SIZE */
+      1096, /* GL_PIXEL_MAP_A_TO_A_SIZE */
+      1741, /* GL_UNPACK_SWAP_BYTES */
+      1736, /* GL_UNPACK_LSB_FIRST */
+      1737, /* GL_UNPACK_ROW_LENGTH */
+      1740, /* GL_UNPACK_SKIP_ROWS */
+      1739, /* GL_UNPACK_SKIP_PIXELS */
+      1734, /* GL_UNPACK_ALIGNMENT */
+      1082, /* GL_PACK_SWAP_BYTES */
+      1077, /* GL_PACK_LSB_FIRST */
+      1078, /* GL_PACK_ROW_LENGTH */
+      1081, /* GL_PACK_SKIP_ROWS */
+      1080, /* GL_PACK_SKIP_PIXELS */
+      1074, /* GL_PACK_ALIGNMENT */
+       788, /* GL_MAP_COLOR */
+       793, /* GL_MAP_STENCIL */
+       631, /* GL_INDEX_SHIFT */
+       630, /* GL_INDEX_OFFSET */
+      1293, /* GL_RED_SCALE */
+      1291, /* GL_RED_BIAS */
+      1839, /* GL_ZOOM_X */
+      1840, /* GL_ZOOM_Y */
+       592, /* GL_GREEN_SCALE */
+       590, /* GL_GREEN_BIAS */
         92, /* GL_BLUE_SCALE */
         90, /* GL_BLUE_BIAS */
         42, /* GL_ALPHA_SCALE */
         40, /* GL_ALPHA_BIAS */
-       365, /* GL_DEPTH_SCALE */
-       346, /* GL_DEPTH_BIAS */
-       865, /* GL_MAX_EVAL_ORDER */
-       869, /* GL_MAX_LIGHTS */
-       848, /* GL_MAX_CLIP_PLANES */
-       914, /* GL_MAX_TEXTURE_SIZE */
-       875, /* GL_MAX_PIXEL_MAP_TABLE */
-       844, /* GL_MAX_ATTRIB_STACK_DEPTH */
-       872, /* GL_MAX_MODELVIEW_STACK_DEPTH */
-       873, /* GL_MAX_NAME_STACK_DEPTH */
-       901, /* GL_MAX_PROJECTION_STACK_DEPTH */
-       915, /* GL_MAX_TEXTURE_STACK_DEPTH */
-       929, /* GL_MAX_VIEWPORT_DIMS */
-       845, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
-      1512, /* GL_SUBPIXEL_BITS */
-       624, /* GL_INDEX_BITS */
-      1290, /* GL_RED_BITS */
-       589, /* GL_GREEN_BITS */
+       367, /* GL_DEPTH_SCALE */
+       348, /* GL_DEPTH_BIAS */
+       867, /* GL_MAX_EVAL_ORDER */
+       871, /* GL_MAX_LIGHTS */
+       850, /* GL_MAX_CLIP_PLANES */
+       916, /* GL_MAX_TEXTURE_SIZE */
+       877, /* GL_MAX_PIXEL_MAP_TABLE */
+       846, /* GL_MAX_ATTRIB_STACK_DEPTH */
+       874, /* GL_MAX_MODELVIEW_STACK_DEPTH */
+       875, /* GL_MAX_NAME_STACK_DEPTH */
+       903, /* GL_MAX_PROJECTION_STACK_DEPTH */
+       917, /* GL_MAX_TEXTURE_STACK_DEPTH */
+       931, /* GL_MAX_VIEWPORT_DIMS */
+       847, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
+      1517, /* GL_SUBPIXEL_BITS */
+       626, /* GL_INDEX_BITS */
+      1292, /* GL_RED_BITS */
+       591, /* GL_GREEN_BITS */
         91, /* GL_BLUE_BITS */
         41, /* GL_ALPHA_BITS */
-       347, /* GL_DEPTH_BITS */
-      1487, /* GL_STENCIL_BITS */
+       349, /* GL_DEPTH_BITS */
+      1489, /* GL_STENCIL_BITS */
         14, /* GL_ACCUM_RED_BITS */
         13, /* GL_ACCUM_GREEN_BITS */
         10, /* GL_ACCUM_BLUE_BITS */
          9, /* GL_ACCUM_ALPHA_BITS */
-       995, /* GL_NAME_STACK_DEPTH */
+       997, /* GL_NAME_STACK_DEPTH */
         61, /* GL_AUTO_NORMAL */
-       732, /* GL_MAP1_COLOR_4 */
-       735, /* GL_MAP1_INDEX */
-       736, /* GL_MAP1_NORMAL */
-       737, /* GL_MAP1_TEXTURE_COORD_1 */
-       738, /* GL_MAP1_TEXTURE_COORD_2 */
-       739, /* GL_MAP1_TEXTURE_COORD_3 */
-       740, /* GL_MAP1_TEXTURE_COORD_4 */
-       741, /* GL_MAP1_VERTEX_3 */
-       742, /* GL_MAP1_VERTEX_4 */
-       759, /* GL_MAP2_COLOR_4 */
-       762, /* GL_MAP2_INDEX */
-       763, /* GL_MAP2_NORMAL */
-       764, /* GL_MAP2_TEXTURE_COORD_1 */
-       765, /* GL_MAP2_TEXTURE_COORD_2 */
-       766, /* GL_MAP2_TEXTURE_COORD_3 */
-       767, /* GL_MAP2_TEXTURE_COORD_4 */
-       768, /* GL_MAP2_VERTEX_3 */
-       769, /* GL_MAP2_VERTEX_4 */
-       733, /* GL_MAP1_GRID_DOMAIN */
-       734, /* GL_MAP1_GRID_SEGMENTS */
-       760, /* GL_MAP2_GRID_DOMAIN */
-       761, /* GL_MAP2_GRID_SEGMENTS */
-      1589, /* GL_TEXTURE_1D */
-      1591, /* GL_TEXTURE_2D */
-       474, /* GL_FEEDBACK_BUFFER_POINTER */
-       475, /* GL_FEEDBACK_BUFFER_SIZE */
-       476, /* GL_FEEDBACK_BUFFER_TYPE */
-      1399, /* GL_SELECTION_BUFFER_POINTER */
-      1400, /* GL_SELECTION_BUFFER_SIZE */
-      1703, /* GL_TEXTURE_WIDTH */
-      1670, /* GL_TEXTURE_HEIGHT */
-      1626, /* GL_TEXTURE_COMPONENTS */
-      1610, /* GL_TEXTURE_BORDER_COLOR */
-      1609, /* GL_TEXTURE_BORDER */
-       378, /* GL_DONT_CARE */
-       472, /* GL_FASTEST */
-      1003, /* GL_NICEST */
+       734, /* GL_MAP1_COLOR_4 */
+       737, /* GL_MAP1_INDEX */
+       738, /* GL_MAP1_NORMAL */
+       739, /* GL_MAP1_TEXTURE_COORD_1 */
+       740, /* GL_MAP1_TEXTURE_COORD_2 */
+       741, /* GL_MAP1_TEXTURE_COORD_3 */
+       742, /* GL_MAP1_TEXTURE_COORD_4 */
+       743, /* GL_MAP1_VERTEX_3 */
+       744, /* GL_MAP1_VERTEX_4 */
+       761, /* GL_MAP2_COLOR_4 */
+       764, /* GL_MAP2_INDEX */
+       765, /* GL_MAP2_NORMAL */
+       766, /* GL_MAP2_TEXTURE_COORD_1 */
+       767, /* GL_MAP2_TEXTURE_COORD_2 */
+       768, /* GL_MAP2_TEXTURE_COORD_3 */
+       769, /* GL_MAP2_TEXTURE_COORD_4 */
+       770, /* GL_MAP2_VERTEX_3 */
+       771, /* GL_MAP2_VERTEX_4 */
+       735, /* GL_MAP1_GRID_DOMAIN */
+       736, /* GL_MAP1_GRID_SEGMENTS */
+       762, /* GL_MAP2_GRID_DOMAIN */
+       763, /* GL_MAP2_GRID_SEGMENTS */
+      1594, /* GL_TEXTURE_1D */
+      1596, /* GL_TEXTURE_2D */
+       476, /* GL_FEEDBACK_BUFFER_POINTER */
+       477, /* GL_FEEDBACK_BUFFER_SIZE */
+       478, /* GL_FEEDBACK_BUFFER_TYPE */
+      1401, /* GL_SELECTION_BUFFER_POINTER */
+      1402, /* GL_SELECTION_BUFFER_SIZE */
+      1711, /* GL_TEXTURE_WIDTH */
+      1675, /* GL_TEXTURE_HEIGHT */
+      1631, /* GL_TEXTURE_COMPONENTS */
+      1615, /* GL_TEXTURE_BORDER_COLOR */
+      1614, /* GL_TEXTURE_BORDER */
+       380, /* GL_DONT_CARE */
+       474, /* GL_FASTEST */
+      1005, /* GL_NICEST */
         47, /* GL_AMBIENT */
-       375, /* GL_DIFFUSE */
-      1447, /* GL_SPECULAR */
-      1166, /* GL_POSITION */
-      1450, /* GL_SPOT_DIRECTION */
-      1451, /* GL_SPOT_EXPONENT */
-      1449, /* GL_SPOT_CUTOFF */
-       271, /* GL_CONSTANT_ATTENUATION */
-       682, /* GL_LINEAR_ATTENUATION */
-      1264, /* GL_QUADRATIC_ATTENUATION */
-       241, /* GL_COMPILE */
-       242, /* GL_COMPILE_AND_EXECUTE */
-       117, /* GL_BYTE */
-      1734, /* GL_UNSIGNED_BYTE */
-      1413, /* GL_SHORT */
-      1745, /* GL_UNSIGNED_SHORT */
-       632, /* GL_INT */
-      1737, /* GL_UNSIGNED_INT */
-       480, /* GL_FLOAT */
+       377, /* GL_DIFFUSE */
+      1449, /* GL_SPECULAR */
+      1168, /* GL_POSITION */
+      1452, /* GL_SPOT_DIRECTION */
+      1453, /* GL_SPOT_EXPONENT */
+      1451, /* GL_SPOT_CUTOFF */
+       273, /* GL_CONSTANT_ATTENUATION */
+       684, /* GL_LINEAR_ATTENUATION */
+      1266, /* GL_QUADRATIC_ATTENUATION */
+       243, /* GL_COMPILE */
+       244, /* GL_COMPILE_AND_EXECUTE */
+       119, /* GL_BYTE */
+      1742, /* GL_UNSIGNED_BYTE */
+      1415, /* GL_SHORT */
+      1753, /* GL_UNSIGNED_SHORT */
+       634, /* GL_INT */
+      1745, /* GL_UNSIGNED_INT */
+       482, /* GL_FLOAT */
          1, /* GL_2_BYTES */
          5, /* GL_3_BYTES */
          7, /* GL_4_BYTES */
-       385, /* GL_DOUBLE */
-       129, /* GL_CLEAR */
+       387, /* GL_DOUBLE */
+       131, /* GL_CLEAR */
         49, /* GL_AND */
         51, /* GL_AND_REVERSE */
-       295, /* GL_COPY */
+       297, /* GL_COPY */
         50, /* GL_AND_INVERTED */
-      1005, /* GL_NOOP */
-      1827, /* GL_XOR */
-      1067, /* GL_OR */
-      1006, /* GL_NOR */
-       462, /* GL_EQUIV */
-       659, /* GL_INVERT */
-      1070, /* GL_OR_REVERSE */
-       296, /* GL_COPY_INVERTED */
-      1069, /* GL_OR_INVERTED */
-       996, /* GL_NAND */
-      1404, /* GL_SET */
-       459, /* GL_EMISSION */
-      1412, /* GL_SHININESS */
+      1007, /* GL_NOOP */
+      1835, /* GL_XOR */
+      1069, /* GL_OR */
+      1008, /* GL_NOR */
+       464, /* GL_EQUIV */
+       661, /* GL_INVERT */
+      1072, /* GL_OR_REVERSE */
+       298, /* GL_COPY_INVERTED */
+      1071, /* GL_OR_INVERTED */
+       998, /* GL_NAND */
+      1406, /* GL_SET */
+       461, /* GL_EMISSION */
+      1414, /* GL_SHININESS */
         48, /* GL_AMBIENT_AND_DIFFUSE */
-       187, /* GL_COLOR_INDEXES */
-       946, /* GL_MODELVIEW */
-      1242, /* GL_PROJECTION */
-      1524, /* GL_TEXTURE */
-       144, /* GL_COLOR */
-       342, /* GL_DEPTH */
-      1473, /* GL_STENCIL */
-       186, /* GL_COLOR_INDEX */
-      1492, /* GL_STENCIL_INDEX */
-       353, /* GL_DEPTH_COMPONENT */
-      1286, /* GL_RED */
-       587, /* GL_GREEN */
+       189, /* GL_COLOR_INDEXES */
+       948, /* GL_MODELVIEW */
+      1244, /* GL_PROJECTION */
+      1529, /* GL_TEXTURE */
+       146, /* GL_COLOR */
+       344, /* GL_DEPTH */
+      1475, /* GL_STENCIL */
+       188, /* GL_COLOR_INDEX */
+      1494, /* GL_STENCIL_INDEX */
+       355, /* GL_DEPTH_COMPONENT */
+      1288, /* GL_RED */
+       589, /* GL_GREEN */
         89, /* GL_BLUE */
         31, /* GL_ALPHA */
-      1321, /* GL_RGB */
-      1340, /* GL_RGBA */
-       710, /* GL_LUMINANCE */
-       731, /* GL_LUMINANCE_ALPHA */
+      1323, /* GL_RGB */
+      1342, /* GL_RGBA */
+       712, /* GL_LUMINANCE */
+       733, /* GL_LUMINANCE_ALPHA */
         72, /* GL_BITMAP */
-      1122, /* GL_POINT */
-       680, /* GL_LINE */
-       477, /* GL_FILL */
-      1295, /* GL_RENDER */
-       473, /* GL_FEEDBACK */
-      1398, /* GL_SELECT */
-       479, /* GL_FLAT */
-      1422, /* GL_SMOOTH */
-       660, /* GL_KEEP */
-      1315, /* GL_REPLACE */
-       614, /* GL_INCR */
-       338, /* GL_DECR */
-      1760, /* GL_VENDOR */
-      1312, /* GL_RENDERER */
-      1761, /* GL_VERSION */
-       466, /* GL_EXTENSIONS */
-      1363, /* GL_S */
-      1515, /* GL_T */
-      1275, /* GL_R */
-      1263, /* GL_Q */
-       982, /* GL_MODULATE */
-       337, /* GL_DECAL */
-      1660, /* GL_TEXTURE_ENV_MODE */
-      1659, /* GL_TEXTURE_ENV_COLOR */
-      1658, /* GL_TEXTURE_ENV */
-       467, /* GL_EYE_LINEAR */
-      1029, /* GL_OBJECT_LINEAR */
-      1448, /* GL_SPHERE_MAP */
-      1662, /* GL_TEXTURE_GEN_MODE */
-      1031, /* GL_OBJECT_PLANE */
-       468, /* GL_EYE_PLANE */
-       997, /* GL_NEAREST */
-       681, /* GL_LINEAR */
-      1001, /* GL_NEAREST_MIPMAP_NEAREST */
-       686, /* GL_LINEAR_MIPMAP_NEAREST */
-      1000, /* GL_NEAREST_MIPMAP_LINEAR */
-       685, /* GL_LINEAR_MIPMAP_LINEAR */
-      1683, /* GL_TEXTURE_MAG_FILTER */
-      1691, /* GL_TEXTURE_MIN_FILTER */
-      1705, /* GL_TEXTURE_WRAP_S */
-      1706, /* GL_TEXTURE_WRAP_T */
-       123, /* GL_CLAMP */
-      1314, /* GL_REPEAT */
-      1160, /* GL_POLYGON_OFFSET_UNITS */
-      1159, /* GL_POLYGON_OFFSET_POINT */
-      1158, /* GL_POLYGON_OFFSET_LINE */
-      1276, /* GL_R3_G3_B2 */
-      1757, /* GL_V2F */
-      1758, /* GL_V3F */
-       120, /* GL_C4UB_V2F */
-       121, /* GL_C4UB_V3F */
-       118, /* GL_C3F_V3F */
-       994, /* GL_N3F_V3F */
-       119, /* GL_C4F_N3F_V3F */
-      1520, /* GL_T2F_V3F */
-      1522, /* GL_T4F_V4F */
-      1518, /* GL_T2F_C4UB_V3F */
-      1516, /* GL_T2F_C3F_V3F */
-      1519, /* GL_T2F_N3F_V3F */
-      1517, /* GL_T2F_C4F_N3F_V3F */
-      1521, /* GL_T4F_C4F_N3F_V4F */
-       136, /* GL_CLIP_PLANE0 */
-       137, /* GL_CLIP_PLANE1 */
-       138, /* GL_CLIP_PLANE2 */
-       139, /* GL_CLIP_PLANE3 */
-       140, /* GL_CLIP_PLANE4 */
-       141, /* GL_CLIP_PLANE5 */
-       665, /* GL_LIGHT0 */
-       666, /* GL_LIGHT1 */
-       667, /* GL_LIGHT2 */
-       668, /* GL_LIGHT3 */
-       669, /* GL_LIGHT4 */
-       670, /* GL_LIGHT5 */
-       671, /* GL_LIGHT6 */
-       672, /* GL_LIGHT7 */
-       591, /* GL_HINT_BIT */
-       273, /* GL_CONSTANT_COLOR */
-      1041, /* GL_ONE_MINUS_CONSTANT_COLOR */
-       268, /* GL_CONSTANT_ALPHA */
-      1039, /* GL_ONE_MINUS_CONSTANT_ALPHA */
+      1124, /* GL_POINT */
+       682, /* GL_LINE */
+       479, /* GL_FILL */
+      1297, /* GL_RENDER */
+       475, /* GL_FEEDBACK */
+      1400, /* GL_SELECT */
+       481, /* GL_FLAT */
+      1424, /* GL_SMOOTH */
+       662, /* GL_KEEP */
+      1317, /* GL_REPLACE */
+       616, /* GL_INCR */
+       340, /* GL_DECR */
+      1768, /* GL_VENDOR */
+      1314, /* GL_RENDERER */
+      1769, /* GL_VERSION */
+       468, /* GL_EXTENSIONS */
+      1365, /* GL_S */
+      1520, /* GL_T */
+      1277, /* GL_R */
+      1265, /* GL_Q */
+       984, /* GL_MODULATE */
+       339, /* GL_DECAL */
+      1665, /* GL_TEXTURE_ENV_MODE */
+      1664, /* GL_TEXTURE_ENV_COLOR */
+      1663, /* GL_TEXTURE_ENV */
+       469, /* GL_EYE_LINEAR */
+      1031, /* GL_OBJECT_LINEAR */
+      1450, /* GL_SPHERE_MAP */
+      1667, /* GL_TEXTURE_GEN_MODE */
+      1033, /* GL_OBJECT_PLANE */
+       470, /* GL_EYE_PLANE */
+       999, /* GL_NEAREST */
+       683, /* GL_LINEAR */
+      1003, /* GL_NEAREST_MIPMAP_NEAREST */
+       688, /* GL_LINEAR_MIPMAP_NEAREST */
+      1002, /* GL_NEAREST_MIPMAP_LINEAR */
+       687, /* GL_LINEAR_MIPMAP_LINEAR */
+      1688, /* GL_TEXTURE_MAG_FILTER */
+      1696, /* GL_TEXTURE_MIN_FILTER */
+      1713, /* GL_TEXTURE_WRAP_S */
+      1714, /* GL_TEXTURE_WRAP_T */
+       125, /* GL_CLAMP */
+      1316, /* GL_REPEAT */
+      1162, /* GL_POLYGON_OFFSET_UNITS */
+      1161, /* GL_POLYGON_OFFSET_POINT */
+      1160, /* GL_POLYGON_OFFSET_LINE */
+      1278, /* GL_R3_G3_B2 */
+      1765, /* GL_V2F */
+      1766, /* GL_V3F */
+       122, /* GL_C4UB_V2F */
+       123, /* GL_C4UB_V3F */
+       120, /* GL_C3F_V3F */
+       996, /* GL_N3F_V3F */
+       121, /* GL_C4F_N3F_V3F */
+      1525, /* GL_T2F_V3F */
+      1527, /* GL_T4F_V4F */
+      1523, /* GL_T2F_C4UB_V3F */
+      1521, /* GL_T2F_C3F_V3F */
+      1524, /* GL_T2F_N3F_V3F */
+      1522, /* GL_T2F_C4F_N3F_V3F */
+      1526, /* GL_T4F_C4F_N3F_V4F */
+       138, /* GL_CLIP_PLANE0 */
+       139, /* GL_CLIP_PLANE1 */
+       140, /* GL_CLIP_PLANE2 */
+       141, /* GL_CLIP_PLANE3 */
+       142, /* GL_CLIP_PLANE4 */
+       143, /* GL_CLIP_PLANE5 */
+       667, /* GL_LIGHT0 */
+       668, /* GL_LIGHT1 */
+       669, /* GL_LIGHT2 */
+       670, /* GL_LIGHT3 */
+       671, /* GL_LIGHT4 */
+       672, /* GL_LIGHT5 */
+       673, /* GL_LIGHT6 */
+       674, /* GL_LIGHT7 */
+       593, /* GL_HINT_BIT */
+       275, /* GL_CONSTANT_COLOR */
+      1043, /* GL_ONE_MINUS_CONSTANT_COLOR */
+       270, /* GL_CONSTANT_ALPHA */
+      1041, /* GL_ONE_MINUS_CONSTANT_ALPHA */
         75, /* GL_BLEND_COLOR */
-       575, /* GL_FUNC_ADD */
-       930, /* GL_MIN */
-       841, /* GL_MAX */
+       577, /* GL_FUNC_ADD */
+       932, /* GL_MIN */
+       843, /* GL_MAX */
         80, /* GL_BLEND_EQUATION */
-       579, /* GL_FUNC_SUBTRACT */
-       577, /* GL_FUNC_REVERSE_SUBTRACT */
-       276, /* GL_CONVOLUTION_1D */
-       277, /* GL_CONVOLUTION_2D */
-      1401, /* GL_SEPARABLE_2D */
-       280, /* GL_CONVOLUTION_BORDER_MODE */
-       284, /* GL_CONVOLUTION_FILTER_SCALE */
-       282, /* GL_CONVOLUTION_FILTER_BIAS */
-      1287, /* GL_REDUCE */
-       286, /* GL_CONVOLUTION_FORMAT */
-       290, /* GL_CONVOLUTION_WIDTH */
-       288, /* GL_CONVOLUTION_HEIGHT */
-       856, /* GL_MAX_CONVOLUTION_WIDTH */
-       854, /* GL_MAX_CONVOLUTION_HEIGHT */
-      1199, /* GL_POST_CONVOLUTION_RED_SCALE */
-      1195, /* GL_POST_CONVOLUTION_GREEN_SCALE */
-      1190, /* GL_POST_CONVOLUTION_BLUE_SCALE */
-      1186, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
-      1197, /* GL_POST_CONVOLUTION_RED_BIAS */
-      1193, /* GL_POST_CONVOLUTION_GREEN_BIAS */
-      1188, /* GL_POST_CONVOLUTION_BLUE_BIAS */
-      1184, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
-       592, /* GL_HISTOGRAM */
-      1247, /* GL_PROXY_HISTOGRAM */
-       608, /* GL_HISTOGRAM_WIDTH */
-       598, /* GL_HISTOGRAM_FORMAT */
-       604, /* GL_HISTOGRAM_RED_SIZE */
-       600, /* GL_HISTOGRAM_GREEN_SIZE */
-       595, /* GL_HISTOGRAM_BLUE_SIZE */
-       593, /* GL_HISTOGRAM_ALPHA_SIZE */
-       602, /* GL_HISTOGRAM_LUMINANCE_SIZE */
-       606, /* GL_HISTOGRAM_SINK */
-       931, /* GL_MINMAX */
-       933, /* GL_MINMAX_FORMAT */
-       935, /* GL_MINMAX_SINK */
-      1523, /* GL_TABLE_TOO_LARGE_EXT */
-      1736, /* GL_UNSIGNED_BYTE_3_3_2 */
-      1747, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-      1749, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-      1742, /* GL_UNSIGNED_INT_8_8_8_8 */
-      1738, /* GL_UNSIGNED_INT_10_10_10_2 */
-      1157, /* GL_POLYGON_OFFSET_FILL */
-      1156, /* GL_POLYGON_OFFSET_FACTOR */
-      1155, /* GL_POLYGON_OFFSET_BIAS */
-      1318, /* GL_RESCALE_NORMAL */
+       581, /* GL_FUNC_SUBTRACT */
+       579, /* GL_FUNC_REVERSE_SUBTRACT */
+       278, /* GL_CONVOLUTION_1D */
+       279, /* GL_CONVOLUTION_2D */
+      1403, /* GL_SEPARABLE_2D */
+       282, /* GL_CONVOLUTION_BORDER_MODE */
+       286, /* GL_CONVOLUTION_FILTER_SCALE */
+       284, /* GL_CONVOLUTION_FILTER_BIAS */
+      1289, /* GL_REDUCE */
+       288, /* GL_CONVOLUTION_FORMAT */
+       292, /* GL_CONVOLUTION_WIDTH */
+       290, /* GL_CONVOLUTION_HEIGHT */
+       858, /* GL_MAX_CONVOLUTION_WIDTH */
+       856, /* GL_MAX_CONVOLUTION_HEIGHT */
+      1201, /* GL_POST_CONVOLUTION_RED_SCALE */
+      1197, /* GL_POST_CONVOLUTION_GREEN_SCALE */
+      1192, /* GL_POST_CONVOLUTION_BLUE_SCALE */
+      1188, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
+      1199, /* GL_POST_CONVOLUTION_RED_BIAS */
+      1195, /* GL_POST_CONVOLUTION_GREEN_BIAS */
+      1190, /* GL_POST_CONVOLUTION_BLUE_BIAS */
+      1186, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
+       594, /* GL_HISTOGRAM */
+      1249, /* GL_PROXY_HISTOGRAM */
+       610, /* GL_HISTOGRAM_WIDTH */
+       600, /* GL_HISTOGRAM_FORMAT */
+       606, /* GL_HISTOGRAM_RED_SIZE */
+       602, /* GL_HISTOGRAM_GREEN_SIZE */
+       597, /* GL_HISTOGRAM_BLUE_SIZE */
+       595, /* GL_HISTOGRAM_ALPHA_SIZE */
+       604, /* GL_HISTOGRAM_LUMINANCE_SIZE */
+       608, /* GL_HISTOGRAM_SINK */
+       933, /* GL_MINMAX */
+       935, /* GL_MINMAX_FORMAT */
+       937, /* GL_MINMAX_SINK */
+      1528, /* GL_TABLE_TOO_LARGE_EXT */
+      1744, /* GL_UNSIGNED_BYTE_3_3_2 */
+      1755, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+      1757, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+      1750, /* GL_UNSIGNED_INT_8_8_8_8 */
+      1746, /* GL_UNSIGNED_INT_10_10_10_2 */
+      1159, /* GL_POLYGON_OFFSET_FILL */
+      1158, /* GL_POLYGON_OFFSET_FACTOR */
+      1157, /* GL_POLYGON_OFFSET_BIAS */
+      1320, /* GL_RESCALE_NORMAL */
         36, /* GL_ALPHA4 */
         38, /* GL_ALPHA8 */
         32, /* GL_ALPHA12 */
         34, /* GL_ALPHA16 */
-       721, /* GL_LUMINANCE4 */
-       727, /* GL_LUMINANCE8 */
-       711, /* GL_LUMINANCE12 */
-       717, /* GL_LUMINANCE16 */
-       722, /* GL_LUMINANCE4_ALPHA4 */
-       725, /* GL_LUMINANCE6_ALPHA2 */
-       728, /* GL_LUMINANCE8_ALPHA8 */
-       714, /* GL_LUMINANCE12_ALPHA4 */
-       712, /* GL_LUMINANCE12_ALPHA12 */
-       718, /* GL_LUMINANCE16_ALPHA16 */
-       633, /* GL_INTENSITY */
-       638, /* GL_INTENSITY4 */
-       640, /* GL_INTENSITY8 */
-       634, /* GL_INTENSITY12 */
-       636, /* GL_INTENSITY16 */
-      1330, /* GL_RGB2_EXT */
-      1331, /* GL_RGB4 */
-      1334, /* GL_RGB5 */
-      1338, /* GL_RGB8 */
-      1322, /* GL_RGB10 */
-      1326, /* GL_RGB12 */
-      1328, /* GL_RGB16 */
-      1345, /* GL_RGBA2 */
-      1347, /* GL_RGBA4 */
-      1335, /* GL_RGB5_A1 */
-      1351, /* GL_RGBA8 */
-      1323, /* GL_RGB10_A2 */
-      1341, /* GL_RGBA12 */
-      1343, /* GL_RGBA16 */
-      1696, /* GL_TEXTURE_RED_SIZE */
-      1668, /* GL_TEXTURE_GREEN_SIZE */
-      1607, /* GL_TEXTURE_BLUE_SIZE */
-      1594, /* GL_TEXTURE_ALPHA_SIZE */
-      1681, /* GL_TEXTURE_LUMINANCE_SIZE */
-      1672, /* GL_TEXTURE_INTENSITY_SIZE */
-      1316, /* GL_REPLACE_EXT */
-      1251, /* GL_PROXY_TEXTURE_1D */
-      1254, /* GL_PROXY_TEXTURE_2D */
-      1701, /* GL_TEXTURE_TOO_LARGE_EXT */
-      1693, /* GL_TEXTURE_PRIORITY */
-      1698, /* GL_TEXTURE_RESIDENT */
-      1597, /* GL_TEXTURE_BINDING_1D */
-      1599, /* GL_TEXTURE_BINDING_2D */
-      1601, /* GL_TEXTURE_BINDING_3D */
-      1077, /* GL_PACK_SKIP_IMAGES */
-      1073, /* GL_PACK_IMAGE_HEIGHT */
-      1730, /* GL_UNPACK_SKIP_IMAGES */
-      1727, /* GL_UNPACK_IMAGE_HEIGHT */
-      1593, /* GL_TEXTURE_3D */
-      1257, /* GL_PROXY_TEXTURE_3D */
-      1655, /* GL_TEXTURE_DEPTH */
-      1704, /* GL_TEXTURE_WRAP_R */
-       842, /* GL_MAX_3D_TEXTURE_SIZE */
-      1762, /* GL_VERTEX_ARRAY */
-      1008, /* GL_NORMAL_ARRAY */
-       145, /* GL_COLOR_ARRAY */
-       618, /* GL_INDEX_ARRAY */
-      1634, /* GL_TEXTURE_COORD_ARRAY */
-       451, /* GL_EDGE_FLAG_ARRAY */
-      1768, /* GL_VERTEX_ARRAY_SIZE */
-      1770, /* GL_VERTEX_ARRAY_TYPE */
-      1769, /* GL_VERTEX_ARRAY_STRIDE */
-      1013, /* GL_NORMAL_ARRAY_TYPE */
-      1012, /* GL_NORMAL_ARRAY_STRIDE */
-       149, /* GL_COLOR_ARRAY_SIZE */
-       151, /* GL_COLOR_ARRAY_TYPE */
-       150, /* GL_COLOR_ARRAY_STRIDE */
-       623, /* GL_INDEX_ARRAY_TYPE */
-       622, /* GL_INDEX_ARRAY_STRIDE */
-      1638, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-      1640, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-      1639, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
-       455, /* GL_EDGE_FLAG_ARRAY_STRIDE */
-      1767, /* GL_VERTEX_ARRAY_POINTER */
-      1011, /* GL_NORMAL_ARRAY_POINTER */
-       148, /* GL_COLOR_ARRAY_POINTER */
-       621, /* GL_INDEX_ARRAY_POINTER */
-      1637, /* GL_TEXTURE_COORD_ARRAY_POINTER */
-       454, /* GL_EDGE_FLAG_ARRAY_POINTER */
-       987, /* GL_MULTISAMPLE */
-      1375, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
-      1377, /* GL_SAMPLE_ALPHA_TO_ONE */
-      1382, /* GL_SAMPLE_COVERAGE */
-      1379, /* GL_SAMPLE_BUFFERS */
-      1370, /* GL_SAMPLES */
-      1386, /* GL_SAMPLE_COVERAGE_VALUE */
-      1384, /* GL_SAMPLE_COVERAGE_INVERT */
-       192, /* GL_COLOR_MATRIX */
-       194, /* GL_COLOR_MATRIX_STACK_DEPTH */
-       850, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
-      1182, /* GL_POST_COLOR_MATRIX_RED_SCALE */
-      1178, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
-      1173, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
-      1169, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
-      1180, /* GL_POST_COLOR_MATRIX_RED_BIAS */
-      1176, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
-      1171, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
-      1167, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
-      1617, /* GL_TEXTURE_COLOR_TABLE_SGI */
-      1258, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
-      1619, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+       723, /* GL_LUMINANCE4 */
+       729, /* GL_LUMINANCE8 */
+       713, /* GL_LUMINANCE12 */
+       719, /* GL_LUMINANCE16 */
+       724, /* GL_LUMINANCE4_ALPHA4 */
+       727, /* GL_LUMINANCE6_ALPHA2 */
+       730, /* GL_LUMINANCE8_ALPHA8 */
+       716, /* GL_LUMINANCE12_ALPHA4 */
+       714, /* GL_LUMINANCE12_ALPHA12 */
+       720, /* GL_LUMINANCE16_ALPHA16 */
+       635, /* GL_INTENSITY */
+       640, /* GL_INTENSITY4 */
+       642, /* GL_INTENSITY8 */
+       636, /* GL_INTENSITY12 */
+       638, /* GL_INTENSITY16 */
+      1332, /* GL_RGB2_EXT */
+      1333, /* GL_RGB4 */
+      1336, /* GL_RGB5 */
+      1340, /* GL_RGB8 */
+      1324, /* GL_RGB10 */
+      1328, /* GL_RGB12 */
+      1330, /* GL_RGB16 */
+      1347, /* GL_RGBA2 */
+      1349, /* GL_RGBA4 */
+      1337, /* GL_RGB5_A1 */
+      1353, /* GL_RGBA8 */
+      1325, /* GL_RGB10_A2 */
+      1343, /* GL_RGBA12 */
+      1345, /* GL_RGBA16 */
+      1703, /* GL_TEXTURE_RED_SIZE */
+      1673, /* GL_TEXTURE_GREEN_SIZE */
+      1612, /* GL_TEXTURE_BLUE_SIZE */
+      1599, /* GL_TEXTURE_ALPHA_SIZE */
+      1686, /* GL_TEXTURE_LUMINANCE_SIZE */
+      1677, /* GL_TEXTURE_INTENSITY_SIZE */
+      1318, /* GL_REPLACE_EXT */
+      1253, /* GL_PROXY_TEXTURE_1D */
+      1256, /* GL_PROXY_TEXTURE_2D */
+      1709, /* GL_TEXTURE_TOO_LARGE_EXT */
+      1698, /* GL_TEXTURE_PRIORITY */
+      1705, /* GL_TEXTURE_RESIDENT */
+      1602, /* GL_TEXTURE_BINDING_1D */
+      1604, /* GL_TEXTURE_BINDING_2D */
+      1606, /* GL_TEXTURE_BINDING_3D */
+      1079, /* GL_PACK_SKIP_IMAGES */
+      1075, /* GL_PACK_IMAGE_HEIGHT */
+      1738, /* GL_UNPACK_SKIP_IMAGES */
+      1735, /* GL_UNPACK_IMAGE_HEIGHT */
+      1598, /* GL_TEXTURE_3D */
+      1259, /* GL_PROXY_TEXTURE_3D */
+      1660, /* GL_TEXTURE_DEPTH */
+      1712, /* GL_TEXTURE_WRAP_R */
+       844, /* GL_MAX_3D_TEXTURE_SIZE */
+      1770, /* GL_VERTEX_ARRAY */
+      1010, /* GL_NORMAL_ARRAY */
+       147, /* GL_COLOR_ARRAY */
+       620, /* GL_INDEX_ARRAY */
+      1639, /* GL_TEXTURE_COORD_ARRAY */
+       453, /* GL_EDGE_FLAG_ARRAY */
+      1776, /* GL_VERTEX_ARRAY_SIZE */
+      1778, /* GL_VERTEX_ARRAY_TYPE */
+      1777, /* GL_VERTEX_ARRAY_STRIDE */
+      1015, /* GL_NORMAL_ARRAY_TYPE */
+      1014, /* GL_NORMAL_ARRAY_STRIDE */
+       151, /* GL_COLOR_ARRAY_SIZE */
+       153, /* GL_COLOR_ARRAY_TYPE */
+       152, /* GL_COLOR_ARRAY_STRIDE */
+       625, /* GL_INDEX_ARRAY_TYPE */
+       624, /* GL_INDEX_ARRAY_STRIDE */
+      1643, /* GL_TEXTURE_COORD_ARRAY_SIZE */
+      1645, /* GL_TEXTURE_COORD_ARRAY_TYPE */
+      1644, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
+       457, /* GL_EDGE_FLAG_ARRAY_STRIDE */
+      1775, /* GL_VERTEX_ARRAY_POINTER */
+      1013, /* GL_NORMAL_ARRAY_POINTER */
+       150, /* GL_COLOR_ARRAY_POINTER */
+       623, /* GL_INDEX_ARRAY_POINTER */
+      1642, /* GL_TEXTURE_COORD_ARRAY_POINTER */
+       456, /* GL_EDGE_FLAG_ARRAY_POINTER */
+       989, /* GL_MULTISAMPLE */
+      1377, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
+      1379, /* GL_SAMPLE_ALPHA_TO_ONE */
+      1384, /* GL_SAMPLE_COVERAGE */
+      1381, /* GL_SAMPLE_BUFFERS */
+      1372, /* GL_SAMPLES */
+      1388, /* GL_SAMPLE_COVERAGE_VALUE */
+      1386, /* GL_SAMPLE_COVERAGE_INVERT */
+       194, /* GL_COLOR_MATRIX */
+       196, /* GL_COLOR_MATRIX_STACK_DEPTH */
+       852, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
+      1184, /* GL_POST_COLOR_MATRIX_RED_SCALE */
+      1180, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
+      1175, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
+      1171, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
+      1182, /* GL_POST_COLOR_MATRIX_RED_BIAS */
+      1178, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
+      1173, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
+      1169, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
+      1622, /* GL_TEXTURE_COLOR_TABLE_SGI */
+      1260, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
+      1624, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
         79, /* GL_BLEND_DST_RGB */
         88, /* GL_BLEND_SRC_RGB */
         78, /* GL_BLEND_DST_ALPHA */
         87, /* GL_BLEND_SRC_ALPHA */
-       198, /* GL_COLOR_TABLE */
-      1192, /* GL_POST_CONVOLUTION_COLOR_TABLE */
-      1175, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
-      1246, /* GL_PROXY_COLOR_TABLE */
-      1250, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
-      1249, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
-       222, /* GL_COLOR_TABLE_SCALE */
-       202, /* GL_COLOR_TABLE_BIAS */
-       207, /* GL_COLOR_TABLE_FORMAT */
-       224, /* GL_COLOR_TABLE_WIDTH */
-       219, /* GL_COLOR_TABLE_RED_SIZE */
-       210, /* GL_COLOR_TABLE_GREEN_SIZE */
-       204, /* GL_COLOR_TABLE_BLUE_SIZE */
-       199, /* GL_COLOR_TABLE_ALPHA_SIZE */
-       216, /* GL_COLOR_TABLE_LUMINANCE_SIZE */
-       213, /* GL_COLOR_TABLE_INTENSITY_SIZE */
+       200, /* GL_COLOR_TABLE */
+      1194, /* GL_POST_CONVOLUTION_COLOR_TABLE */
+      1177, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
+      1248, /* GL_PROXY_COLOR_TABLE */
+      1252, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
+      1251, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
+       224, /* GL_COLOR_TABLE_SCALE */
+       204, /* GL_COLOR_TABLE_BIAS */
+       209, /* GL_COLOR_TABLE_FORMAT */
+       226, /* GL_COLOR_TABLE_WIDTH */
+       221, /* GL_COLOR_TABLE_RED_SIZE */
+       212, /* GL_COLOR_TABLE_GREEN_SIZE */
+       206, /* GL_COLOR_TABLE_BLUE_SIZE */
+       201, /* GL_COLOR_TABLE_ALPHA_SIZE */
+       218, /* GL_COLOR_TABLE_LUMINANCE_SIZE */
+       215, /* GL_COLOR_TABLE_INTENSITY_SIZE */
         70, /* GL_BGR */
         71, /* GL_BGRA */
-       864, /* GL_MAX_ELEMENTS_VERTICES */
-       863, /* GL_MAX_ELEMENTS_INDICES */
-      1671, /* GL_TEXTURE_INDEX_SIZE_EXT */
-       142, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
-      1139, /* GL_POINT_SIZE_MIN */
-      1135, /* GL_POINT_SIZE_MAX */
-      1129, /* GL_POINT_FADE_THRESHOLD_SIZE */
-      1125, /* GL_POINT_DISTANCE_ATTENUATION */
-       124, /* GL_CLAMP_TO_BORDER */
-       127, /* GL_CLAMP_TO_EDGE */
-      1692, /* GL_TEXTURE_MIN_LOD */
-      1690, /* GL_TEXTURE_MAX_LOD */
-      1596, /* GL_TEXTURE_BASE_LEVEL */
-      1689, /* GL_TEXTURE_MAX_LEVEL */
-       611, /* GL_IGNORE_BORDER_HP */
-       272, /* GL_CONSTANT_BORDER_HP */
-      1317, /* GL_REPLICATE_BORDER_HP */
-       278, /* GL_CONVOLUTION_BORDER_COLOR */
-      1036, /* GL_OCCLUSION_TEST_HP */
-      1037, /* GL_OCCLUSION_TEST_RESULT_HP */
-       683, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
-      1611, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-      1613, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-      1615, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-      1616, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-      1614, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-      1612, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
-       846, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
-       847, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-      1202, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
-      1204, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
-      1201, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
-      1203, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
-      1679, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-      1680, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-      1678, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
-       581, /* GL_GENERATE_MIPMAP */
-       582, /* GL_GENERATE_MIPMAP_HINT */
-       523, /* GL_FOG_OFFSET_SGIX */
-       524, /* GL_FOG_OFFSET_VALUE_SGIX */
-      1625, /* GL_TEXTURE_COMPARE_SGIX */
-      1624, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-      1675, /* GL_TEXTURE_LEQUAL_R_SGIX */
-      1667, /* GL_TEXTURE_GEQUAL_R_SGIX */
-       354, /* GL_DEPTH_COMPONENT16 */
-       357, /* GL_DEPTH_COMPONENT24 */
-       360, /* GL_DEPTH_COMPONENT32 */
-       302, /* GL_CULL_VERTEX_EXT */
-       304, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
-       303, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
-      1824, /* GL_WRAP_BORDER_SUN */
-      1618, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
-       676, /* GL_LIGHT_MODEL_COLOR_CONTROL */
-      1415, /* GL_SINGLE_COLOR */
-      1402, /* GL_SEPARATE_SPECULAR_COLOR */
-      1411, /* GL_SHARED_TEXTURE_PALETTE_EXT */
-       534, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
-       535, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
-       542, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
-       537, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
-       533, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
-       532, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
-       536, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
-       543, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
-       554, /* GL_FRAMEBUFFER_DEFAULT */
-       567, /* GL_FRAMEBUFFER_UNDEFINED */
-       367, /* GL_DEPTH_STENCIL_ATTACHMENT */
-       617, /* GL_INDEX */
-      1735, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-      1750, /* GL_UNSIGNED_SHORT_5_6_5 */
-      1751, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-      1748, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-      1746, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-      1743, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-      1741, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-      1687, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-      1688, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-      1686, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
-       938, /* GL_MIRRORED_REPEAT */
-      1358, /* GL_RGB_S3TC */
-      1333, /* GL_RGB4_S3TC */
-      1356, /* GL_RGBA_S3TC */
-      1350, /* GL_RGBA4_S3TC */
-      1354, /* GL_RGBA_DXT5_S3TC */
-      1348, /* GL_RGBA4_DXT5_S3TC */
-       261, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
-       256, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
-       257, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
-       258, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */
-       999, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
-       998, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
-       684, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
-       510, /* GL_FOG_COORDINATE_SOURCE */
-       502, /* GL_FOG_COORD */
-       526, /* GL_FRAGMENT_DEPTH */
-       308, /* GL_CURRENT_FOG_COORD */
-       509, /* GL_FOG_COORDINATE_ARRAY_TYPE */
-       508, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
-       507, /* GL_FOG_COORDINATE_ARRAY_POINTER */
-       504, /* GL_FOG_COORDINATE_ARRAY */
-       196, /* GL_COLOR_SUM */
-       328, /* GL_CURRENT_SECONDARY_COLOR */
-      1395, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
-      1397, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
-      1396, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
-      1394, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
-      1391, /* GL_SECONDARY_COLOR_ARRAY */
-       326, /* GL_CURRENT_RASTER_SECONDARY_COLOR */
+       866, /* GL_MAX_ELEMENTS_VERTICES */
+       865, /* GL_MAX_ELEMENTS_INDICES */
+      1676, /* GL_TEXTURE_INDEX_SIZE_EXT */
+       144, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
+      1141, /* GL_POINT_SIZE_MIN */
+      1137, /* GL_POINT_SIZE_MAX */
+      1131, /* GL_POINT_FADE_THRESHOLD_SIZE */
+      1127, /* GL_POINT_DISTANCE_ATTENUATION */
+       126, /* GL_CLAMP_TO_BORDER */
+       129, /* GL_CLAMP_TO_EDGE */
+      1697, /* GL_TEXTURE_MIN_LOD */
+      1695, /* GL_TEXTURE_MAX_LOD */
+      1601, /* GL_TEXTURE_BASE_LEVEL */
+      1694, /* GL_TEXTURE_MAX_LEVEL */
+       613, /* GL_IGNORE_BORDER_HP */
+       274, /* GL_CONSTANT_BORDER_HP */
+      1319, /* GL_REPLICATE_BORDER_HP */
+       280, /* GL_CONVOLUTION_BORDER_COLOR */
+      1038, /* GL_OCCLUSION_TEST_HP */
+      1039, /* GL_OCCLUSION_TEST_RESULT_HP */
+       685, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
+      1616, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
+      1618, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
+      1620, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
+      1621, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+      1619, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
+      1617, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
+       848, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
+       849, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+      1204, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
+      1206, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
+      1203, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
+      1205, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
+      1684, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+      1685, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+      1683, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+       583, /* GL_GENERATE_MIPMAP */
+       584, /* GL_GENERATE_MIPMAP_HINT */
+       525, /* GL_FOG_OFFSET_SGIX */
+       526, /* GL_FOG_OFFSET_VALUE_SGIX */
+      1630, /* GL_TEXTURE_COMPARE_SGIX */
+      1629, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
+      1680, /* GL_TEXTURE_LEQUAL_R_SGIX */
+      1672, /* GL_TEXTURE_GEQUAL_R_SGIX */
+       356, /* GL_DEPTH_COMPONENT16 */
+       359, /* GL_DEPTH_COMPONENT24 */
+       362, /* GL_DEPTH_COMPONENT32 */
+       304, /* GL_CULL_VERTEX_EXT */
+       306, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
+       305, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
+      1832, /* GL_WRAP_BORDER_SUN */
+      1623, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
+       678, /* GL_LIGHT_MODEL_COLOR_CONTROL */
+      1417, /* GL_SINGLE_COLOR */
+      1404, /* GL_SEPARATE_SPECULAR_COLOR */
+      1413, /* GL_SHARED_TEXTURE_PALETTE_EXT */
+       536, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
+       537, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
+       544, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
+       539, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
+       535, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
+       534, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
+       538, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
+       545, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
+       556, /* GL_FRAMEBUFFER_DEFAULT */
+       569, /* GL_FRAMEBUFFER_UNDEFINED */
+       369, /* GL_DEPTH_STENCIL_ATTACHMENT */
+       619, /* GL_INDEX */
+      1743, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+      1758, /* GL_UNSIGNED_SHORT_5_6_5 */
+      1759, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+      1756, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+      1754, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+      1751, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+      1749, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+      1692, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+      1693, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+      1691, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+       940, /* GL_MIRRORED_REPEAT */
+      1360, /* GL_RGB_S3TC */
+      1335, /* GL_RGB4_S3TC */
+      1358, /* GL_RGBA_S3TC */
+      1352, /* GL_RGBA4_S3TC */
+      1356, /* GL_RGBA_DXT5_S3TC */
+      1350, /* GL_RGBA4_DXT5_S3TC */
+       263, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
+       258, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
+       259, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
+       260, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */
+      1001, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
+      1000, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
+       686, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
+       512, /* GL_FOG_COORDINATE_SOURCE */
+       504, /* GL_FOG_COORD */
+       528, /* GL_FRAGMENT_DEPTH */
+       310, /* GL_CURRENT_FOG_COORD */
+       511, /* GL_FOG_COORDINATE_ARRAY_TYPE */
+       510, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
+       509, /* GL_FOG_COORDINATE_ARRAY_POINTER */
+       506, /* GL_FOG_COORDINATE_ARRAY */
+       198, /* GL_COLOR_SUM */
+       330, /* GL_CURRENT_SECONDARY_COLOR */
+      1397, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
+      1399, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
+      1398, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
+      1396, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
+      1393, /* GL_SECONDARY_COLOR_ARRAY */
+       328, /* GL_CURRENT_RASTER_SECONDARY_COLOR */
         28, /* GL_ALIASED_POINT_SIZE_RANGE */
         27, /* GL_ALIASED_LINE_WIDTH_RANGE */
-      1525, /* GL_TEXTURE0 */
-      1527, /* GL_TEXTURE1 */
-      1549, /* GL_TEXTURE2 */
-      1571, /* GL_TEXTURE3 */
-      1577, /* GL_TEXTURE4 */
-      1579, /* GL_TEXTURE5 */
-      1581, /* GL_TEXTURE6 */
-      1583, /* GL_TEXTURE7 */
-      1585, /* GL_TEXTURE8 */
-      1587, /* GL_TEXTURE9 */
-      1528, /* GL_TEXTURE10 */
-      1530, /* GL_TEXTURE11 */
-      1532, /* GL_TEXTURE12 */
-      1534, /* GL_TEXTURE13 */
-      1536, /* GL_TEXTURE14 */
-      1538, /* GL_TEXTURE15 */
-      1540, /* GL_TEXTURE16 */
-      1542, /* GL_TEXTURE17 */
-      1544, /* GL_TEXTURE18 */
-      1546, /* GL_TEXTURE19 */
-      1550, /* GL_TEXTURE20 */
-      1552, /* GL_TEXTURE21 */
-      1554, /* GL_TEXTURE22 */
-      1556, /* GL_TEXTURE23 */
-      1558, /* GL_TEXTURE24 */
-      1560, /* GL_TEXTURE25 */
-      1562, /* GL_TEXTURE26 */
-      1564, /* GL_TEXTURE27 */
-      1566, /* GL_TEXTURE28 */
-      1568, /* GL_TEXTURE29 */
-      1572, /* GL_TEXTURE30 */
-      1574, /* GL_TEXTURE31 */
+      1530, /* GL_TEXTURE0 */
+      1532, /* GL_TEXTURE1 */
+      1554, /* GL_TEXTURE2 */
+      1576, /* GL_TEXTURE3 */
+      1582, /* GL_TEXTURE4 */
+      1584, /* GL_TEXTURE5 */
+      1586, /* GL_TEXTURE6 */
+      1588, /* GL_TEXTURE7 */
+      1590, /* GL_TEXTURE8 */
+      1592, /* GL_TEXTURE9 */
+      1533, /* GL_TEXTURE10 */
+      1535, /* GL_TEXTURE11 */
+      1537, /* GL_TEXTURE12 */
+      1539, /* GL_TEXTURE13 */
+      1541, /* GL_TEXTURE14 */
+      1543, /* GL_TEXTURE15 */
+      1545, /* GL_TEXTURE16 */
+      1547, /* GL_TEXTURE17 */
+      1549, /* GL_TEXTURE18 */
+      1551, /* GL_TEXTURE19 */
+      1555, /* GL_TEXTURE20 */
+      1557, /* GL_TEXTURE21 */
+      1559, /* GL_TEXTURE22 */
+      1561, /* GL_TEXTURE23 */
+      1563, /* GL_TEXTURE24 */
+      1565, /* GL_TEXTURE25 */
+      1567, /* GL_TEXTURE26 */
+      1569, /* GL_TEXTURE27 */
+      1571, /* GL_TEXTURE28 */
+      1573, /* GL_TEXTURE29 */
+      1577, /* GL_TEXTURE30 */
+      1579, /* GL_TEXTURE31 */
         18, /* GL_ACTIVE_TEXTURE */
-       130, /* GL_CLIENT_ACTIVE_TEXTURE */
-       916, /* GL_MAX_TEXTURE_UNITS */
-      1714, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-      1717, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-      1719, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-      1711, /* GL_TRANSPOSE_COLOR_MATRIX */
-      1513, /* GL_SUBTRACT */
-       904, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
-       244, /* GL_COMPRESSED_ALPHA */
-       248, /* GL_COMPRESSED_LUMINANCE */
-       249, /* GL_COMPRESSED_LUMINANCE_ALPHA */
-       246, /* GL_COMPRESSED_INTENSITY */
-       252, /* GL_COMPRESSED_RGB */
-       253, /* GL_COMPRESSED_RGBA */
-      1632, /* GL_TEXTURE_COMPRESSION_HINT */
-      1694, /* GL_TEXTURE_RECTANGLE_ARB */
-      1604, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
-      1261, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
-       902, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
-       366, /* GL_DEPTH_STENCIL */
-      1739, /* GL_UNSIGNED_INT_24_8 */
-       912, /* GL_MAX_TEXTURE_LOD_BIAS */
-      1685, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
-       913, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
-      1661, /* GL_TEXTURE_FILTER_CONTROL */
-      1676, /* GL_TEXTURE_LOD_BIAS */
-       229, /* GL_COMBINE4 */
-       906, /* GL_MAX_SHININESS_NV */
-       907, /* GL_MAX_SPOT_EXPONENT_NV */
-       615, /* GL_INCR_WRAP */
-       339, /* GL_DECR_WRAP */
-       958, /* GL_MODELVIEW1_ARB */
-      1014, /* GL_NORMAL_MAP */
-      1292, /* GL_REFLECTION_MAP */
-      1641, /* GL_TEXTURE_CUBE_MAP */
-      1602, /* GL_TEXTURE_BINDING_CUBE_MAP */
-      1649, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-      1643, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-      1651, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-      1645, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-      1653, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-      1647, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
-      1259, /* GL_PROXY_TEXTURE_CUBE_MAP */
-       858, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
-       993, /* GL_MULTISAMPLE_FILTER_HINT_NV */
-       518, /* GL_FOG_DISTANCE_MODE_NV */
-       470, /* GL_EYE_RADIAL_NV */
-       469, /* GL_EYE_PLANE_ABSOLUTE_NV */
-       228, /* GL_COMBINE */
-       235, /* GL_COMBINE_RGB */
-       230, /* GL_COMBINE_ALPHA */
-      1359, /* GL_RGB_SCALE */
+       132, /* GL_CLIENT_ACTIVE_TEXTURE */
+       918, /* GL_MAX_TEXTURE_UNITS */
+      1722, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+      1725, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+      1727, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+      1719, /* GL_TRANSPOSE_COLOR_MATRIX */
+      1518, /* GL_SUBTRACT */
+       906, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
+       246, /* GL_COMPRESSED_ALPHA */
+       250, /* GL_COMPRESSED_LUMINANCE */
+       251, /* GL_COMPRESSED_LUMINANCE_ALPHA */
+       248, /* GL_COMPRESSED_INTENSITY */
+       254, /* GL_COMPRESSED_RGB */
+       255, /* GL_COMPRESSED_RGBA */
+      1637, /* GL_TEXTURE_COMPRESSION_HINT */
+      1701, /* GL_TEXTURE_RECTANGLE_ARB */
+      1609, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
+      1263, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
+       904, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
+       368, /* GL_DEPTH_STENCIL */
+      1747, /* GL_UNSIGNED_INT_24_8 */
+       914, /* GL_MAX_TEXTURE_LOD_BIAS */
+      1690, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+       915, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
+      1666, /* GL_TEXTURE_FILTER_CONTROL */
+      1681, /* GL_TEXTURE_LOD_BIAS */
+       231, /* GL_COMBINE4 */
+       908, /* GL_MAX_SHININESS_NV */
+       909, /* GL_MAX_SPOT_EXPONENT_NV */
+       617, /* GL_INCR_WRAP */
+       341, /* GL_DECR_WRAP */
+       960, /* GL_MODELVIEW1_ARB */
+      1016, /* GL_NORMAL_MAP */
+      1294, /* GL_REFLECTION_MAP */
+      1646, /* GL_TEXTURE_CUBE_MAP */
+      1607, /* GL_TEXTURE_BINDING_CUBE_MAP */
+      1654, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
+      1648, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
+      1656, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
+      1650, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
+      1658, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
+      1652, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
+      1261, /* GL_PROXY_TEXTURE_CUBE_MAP */
+       860, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
+       995, /* GL_MULTISAMPLE_FILTER_HINT_NV */
+       520, /* GL_FOG_DISTANCE_MODE_NV */
+       472, /* GL_EYE_RADIAL_NV */
+       471, /* GL_EYE_PLANE_ABSOLUTE_NV */
+       230, /* GL_COMBINE */
+       237, /* GL_COMBINE_RGB */
+       232, /* GL_COMBINE_ALPHA */
+      1361, /* GL_RGB_SCALE */
         24, /* GL_ADD_SIGNED */
-       643, /* GL_INTERPOLATE */
-       267, /* GL_CONSTANT */
-      1208, /* GL_PRIMARY_COLOR */
-      1205, /* GL_PREVIOUS */
-      1430, /* GL_SOURCE0_RGB */
-      1436, /* GL_SOURCE1_RGB */
-      1442, /* GL_SOURCE2_RGB */
-      1446, /* GL_SOURCE3_RGB_NV */
-      1427, /* GL_SOURCE0_ALPHA */
-      1433, /* GL_SOURCE1_ALPHA */
-      1439, /* GL_SOURCE2_ALPHA */
-      1445, /* GL_SOURCE3_ALPHA_NV */
-      1050, /* GL_OPERAND0_RGB */
-      1056, /* GL_OPERAND1_RGB */
-      1062, /* GL_OPERAND2_RGB */
-      1066, /* GL_OPERAND3_RGB_NV */
-      1047, /* GL_OPERAND0_ALPHA */
-      1053, /* GL_OPERAND1_ALPHA */
-      1059, /* GL_OPERAND2_ALPHA */
-      1065, /* GL_OPERAND3_ALPHA_NV */
-      1763, /* GL_VERTEX_ARRAY_BINDING */
-      1828, /* GL_YCBCR_422_APPLE */
-      1752, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-      1754, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-      1417, /* GL_SLICE_ACCUM_SUN */
-      1267, /* GL_QUAD_MESH_SUN */
-      1723, /* GL_TRIANGLE_MESH_SUN */
-      1802, /* GL_VERTEX_PROGRAM_ARB */
-      1813, /* GL_VERTEX_STATE_PROGRAM_NV */
-      1789, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-      1795, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-      1797, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-      1799, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
-       330, /* GL_CURRENT_VERTEX_ATTRIB */
-      1221, /* GL_PROGRAM_LENGTH_ARB */
-      1235, /* GL_PROGRAM_STRING_ARB */
-       980, /* GL_MODELVIEW_PROJECTION_NV */
-       610, /* GL_IDENTITY_NV */
-       657, /* GL_INVERSE_NV */
-      1716, /* GL_TRANSPOSE_NV */
-       658, /* GL_INVERSE_TRANSPOSE_NV */
-       888, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
-       887, /* GL_MAX_PROGRAM_MATRICES_ARB */
-       795, /* GL_MATRIX0_NV */
-       807, /* GL_MATRIX1_NV */
-       819, /* GL_MATRIX2_NV */
-       823, /* GL_MATRIX3_NV */
-       825, /* GL_MATRIX4_NV */
-       827, /* GL_MATRIX5_NV */
-       829, /* GL_MATRIX6_NV */
-       831, /* GL_MATRIX7_NV */
-       314, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
-       311, /* GL_CURRENT_MATRIX_ARB */
-      1805, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-      1808, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-      1233, /* GL_PROGRAM_PARAMETER_NV */
-      1793, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-      1237, /* GL_PROGRAM_TARGET_NV */
-      1234, /* GL_PROGRAM_RESIDENT_NV */
-      1708, /* GL_TRACK_MATRIX_NV */
-      1709, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-      1803, /* GL_VERTEX_PROGRAM_BINDING_NV */
-      1215, /* GL_PROGRAM_ERROR_POSITION_ARB */
-       351, /* GL_DEPTH_CLAMP_NV */
-      1771, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-      1778, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-      1779, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-      1780, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-      1781, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-      1782, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-      1783, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-      1784, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-      1785, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-      1786, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-      1772, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-      1773, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-      1774, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-      1775, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-      1776, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-      1777, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
-       743, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
-       750, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
-       751, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
-       752, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
-       753, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
-       754, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
-       755, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
-       756, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
-       757, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
-       758, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
-       744, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
-       745, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
-       746, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
-       747, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
-       748, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
-       749, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
-       770, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
-       777, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
-       778, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
-       779, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
-       780, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
-       781, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
-       782, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
-      1214, /* GL_PROGRAM_BINDING_ARB */
-       784, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
-       785, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
-       771, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
-       772, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
-       773, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
-       774, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
-       775, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
-       776, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
-      1630, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-      1627, /* GL_TEXTURE_COMPRESSED */
-      1019, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
-       266, /* GL_COMPRESSED_TEXTURE_FORMATS */
-       928, /* GL_MAX_VERTEX_UNITS_ARB */
+       645, /* GL_INTERPOLATE */
+       269, /* GL_CONSTANT */
+      1210, /* GL_PRIMARY_COLOR */
+      1207, /* GL_PREVIOUS */
+      1432, /* GL_SOURCE0_RGB */
+      1438, /* GL_SOURCE1_RGB */
+      1444, /* GL_SOURCE2_RGB */
+      1448, /* GL_SOURCE3_RGB_NV */
+      1429, /* GL_SOURCE0_ALPHA */
+      1435, /* GL_SOURCE1_ALPHA */
+      1441, /* GL_SOURCE2_ALPHA */
+      1447, /* GL_SOURCE3_ALPHA_NV */
+      1052, /* GL_OPERAND0_RGB */
+      1058, /* GL_OPERAND1_RGB */
+      1064, /* GL_OPERAND2_RGB */
+      1068, /* GL_OPERAND3_RGB_NV */
+      1049, /* GL_OPERAND0_ALPHA */
+      1055, /* GL_OPERAND1_ALPHA */
+      1061, /* GL_OPERAND2_ALPHA */
+      1067, /* GL_OPERAND3_ALPHA_NV */
+      1771, /* GL_VERTEX_ARRAY_BINDING */
+      1699, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
+      1700, /* GL_TEXTURE_RANGE_POINTER_APPLE */
+      1836, /* GL_YCBCR_422_APPLE */
+      1760, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+      1762, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+      1708, /* GL_TEXTURE_STORAGE_HINT_APPLE */
+      1509, /* GL_STORAGE_PRIVATE_APPLE */
+      1508, /* GL_STORAGE_CACHED_APPLE */
+      1510, /* GL_STORAGE_SHARED_APPLE */
+      1419, /* GL_SLICE_ACCUM_SUN */
+      1269, /* GL_QUAD_MESH_SUN */
+      1731, /* GL_TRIANGLE_MESH_SUN */
+      1810, /* GL_VERTEX_PROGRAM_ARB */
+      1821, /* GL_VERTEX_STATE_PROGRAM_NV */
+      1797, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+      1803, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+      1805, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+      1807, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+       332, /* GL_CURRENT_VERTEX_ATTRIB */
+      1223, /* GL_PROGRAM_LENGTH_ARB */
+      1237, /* GL_PROGRAM_STRING_ARB */
+       982, /* GL_MODELVIEW_PROJECTION_NV */
+       612, /* GL_IDENTITY_NV */
+       659, /* GL_INVERSE_NV */
+      1724, /* GL_TRANSPOSE_NV */
+       660, /* GL_INVERSE_TRANSPOSE_NV */
+       890, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
+       889, /* GL_MAX_PROGRAM_MATRICES_ARB */
+       797, /* GL_MATRIX0_NV */
+       809, /* GL_MATRIX1_NV */
+       821, /* GL_MATRIX2_NV */
+       825, /* GL_MATRIX3_NV */
+       827, /* GL_MATRIX4_NV */
+       829, /* GL_MATRIX5_NV */
+       831, /* GL_MATRIX6_NV */
+       833, /* GL_MATRIX7_NV */
+       316, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
+       313, /* GL_CURRENT_MATRIX_ARB */
+      1813, /* GL_VERTEX_PROGRAM_POINT_SIZE */
+      1816, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+      1235, /* GL_PROGRAM_PARAMETER_NV */
+      1801, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+      1239, /* GL_PROGRAM_TARGET_NV */
+      1236, /* GL_PROGRAM_RESIDENT_NV */
+      1716, /* GL_TRACK_MATRIX_NV */
+      1717, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+      1811, /* GL_VERTEX_PROGRAM_BINDING_NV */
+      1217, /* GL_PROGRAM_ERROR_POSITION_ARB */
+       353, /* GL_DEPTH_CLAMP_NV */
+      1779, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+      1786, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+      1787, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+      1788, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+      1789, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+      1790, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+      1791, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+      1792, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+      1793, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+      1794, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+      1780, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+      1781, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+      1782, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+      1783, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+      1784, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+      1785, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+       745, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
+       752, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
+       753, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
+       754, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
+       755, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
+       756, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
+       757, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
+       758, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
+       759, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
+       760, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
+       746, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
+       747, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
+       748, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
+       749, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
+       750, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
+       751, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
+       772, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
+       779, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
+       780, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
+       781, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
+       782, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
+       783, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
+       784, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
+      1216, /* GL_PROGRAM_BINDING_ARB */
+       786, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
+       787, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
+       773, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
+       774, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
+       775, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
+       776, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
+       777, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
+       778, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
+      1635, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
+      1632, /* GL_TEXTURE_COMPRESSED */
+      1021, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
+       268, /* GL_COMPRESSED_TEXTURE_FORMATS */
+       930, /* GL_MAX_VERTEX_UNITS_ARB */
         22, /* GL_ACTIVE_VERTEX_UNITS_ARB */
-      1823, /* GL_WEIGHT_SUM_UNITY_ARB */
-      1801, /* GL_VERTEX_BLEND_ARB */
-       332, /* GL_CURRENT_WEIGHT_ARB */
-      1822, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-      1821, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-      1820, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-      1819, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-      1816, /* GL_WEIGHT_ARRAY_ARB */
-       379, /* GL_DOT3_RGB */
-       380, /* GL_DOT3_RGBA */
-       260, /* GL_COMPRESSED_RGB_FXT1_3DFX */
-       255, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
-       988, /* GL_MULTISAMPLE_3DFX */
-      1380, /* GL_SAMPLE_BUFFERS_3DFX */
-      1371, /* GL_SAMPLES_3DFX */
-       969, /* GL_MODELVIEW2_ARB */
-       972, /* GL_MODELVIEW3_ARB */
-       973, /* GL_MODELVIEW4_ARB */
-       974, /* GL_MODELVIEW5_ARB */
-       975, /* GL_MODELVIEW6_ARB */
-       976, /* GL_MODELVIEW7_ARB */
-       977, /* GL_MODELVIEW8_ARB */
-       978, /* GL_MODELVIEW9_ARB */
-       948, /* GL_MODELVIEW10_ARB */
-       949, /* GL_MODELVIEW11_ARB */
-       950, /* GL_MODELVIEW12_ARB */
-       951, /* GL_MODELVIEW13_ARB */
-       952, /* GL_MODELVIEW14_ARB */
-       953, /* GL_MODELVIEW15_ARB */
-       954, /* GL_MODELVIEW16_ARB */
-       955, /* GL_MODELVIEW17_ARB */
-       956, /* GL_MODELVIEW18_ARB */
-       957, /* GL_MODELVIEW19_ARB */
-       959, /* GL_MODELVIEW20_ARB */
-       960, /* GL_MODELVIEW21_ARB */
-       961, /* GL_MODELVIEW22_ARB */
-       962, /* GL_MODELVIEW23_ARB */
-       963, /* GL_MODELVIEW24_ARB */
-       964, /* GL_MODELVIEW25_ARB */
-       965, /* GL_MODELVIEW26_ARB */
-       966, /* GL_MODELVIEW27_ARB */
-       967, /* GL_MODELVIEW28_ARB */
-       968, /* GL_MODELVIEW29_ARB */
-       970, /* GL_MODELVIEW30_ARB */
-       971, /* GL_MODELVIEW31_ARB */
-       384, /* GL_DOT3_RGB_EXT */
-       382, /* GL_DOT3_RGBA_EXT */
-       942, /* GL_MIRROR_CLAMP_EXT */
-       945, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
-       983, /* GL_MODULATE_ADD_ATI */
-       984, /* GL_MODULATE_SIGNED_ADD_ATI */
-       985, /* GL_MODULATE_SUBTRACT_ATI */
-      1829, /* GL_YCBCR_MESA */
-      1074, /* GL_PACK_INVERT_MESA */
-       335, /* GL_DEBUG_OBJECT_MESA */
-       336, /* GL_DEBUG_PRINT_MESA */
-       334, /* GL_DEBUG_ASSERT_MESA */
-       107, /* GL_BUFFER_SIZE */
-       109, /* GL_BUFFER_USAGE */
-       113, /* GL_BUMP_ROT_MATRIX_ATI */
-       114, /* GL_BUMP_ROT_MATRIX_SIZE_ATI */
-       112, /* GL_BUMP_NUM_TEX_UNITS_ATI */
-       116, /* GL_BUMP_TEX_UNITS_ATI */
-       443, /* GL_DUDV_ATI */
-       442, /* GL_DU8DV8_ATI */
-       111, /* GL_BUMP_ENVMAP_ATI */
-       115, /* GL_BUMP_TARGET_ATI */
-      1478, /* GL_STENCIL_BACK_FUNC */
-      1476, /* GL_STENCIL_BACK_FAIL */
-      1480, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-      1482, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
-       527, /* GL_FRAGMENT_PROGRAM_ARB */
-      1212, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
-      1240, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
-      1239, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
-      1224, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-      1230, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-      1229, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-       877, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
-       900, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
-       899, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
-       890, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-       896, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-       895, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-       860, /* GL_MAX_DRAW_BUFFERS */
-       388, /* GL_DRAW_BUFFER0 */
-       391, /* GL_DRAW_BUFFER1 */
-       412, /* GL_DRAW_BUFFER2 */
-       415, /* GL_DRAW_BUFFER3 */
-       418, /* GL_DRAW_BUFFER4 */
-       421, /* GL_DRAW_BUFFER5 */
-       424, /* GL_DRAW_BUFFER6 */
-       427, /* GL_DRAW_BUFFER7 */
-       430, /* GL_DRAW_BUFFER8 */
-       433, /* GL_DRAW_BUFFER9 */
-       392, /* GL_DRAW_BUFFER10 */
-       395, /* GL_DRAW_BUFFER11 */
-       398, /* GL_DRAW_BUFFER12 */
-       401, /* GL_DRAW_BUFFER13 */
-       404, /* GL_DRAW_BUFFER14 */
-       407, /* GL_DRAW_BUFFER15 */
+      1831, /* GL_WEIGHT_SUM_UNITY_ARB */
+      1809, /* GL_VERTEX_BLEND_ARB */
+       334, /* GL_CURRENT_WEIGHT_ARB */
+      1830, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+      1829, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+      1828, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+      1827, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+      1824, /* GL_WEIGHT_ARRAY_ARB */
+       381, /* GL_DOT3_RGB */
+       382, /* GL_DOT3_RGBA */
+       262, /* GL_COMPRESSED_RGB_FXT1_3DFX */
+       257, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
+       990, /* GL_MULTISAMPLE_3DFX */
+      1382, /* GL_SAMPLE_BUFFERS_3DFX */
+      1373, /* GL_SAMPLES_3DFX */
+       971, /* GL_MODELVIEW2_ARB */
+       974, /* GL_MODELVIEW3_ARB */
+       975, /* GL_MODELVIEW4_ARB */
+       976, /* GL_MODELVIEW5_ARB */
+       977, /* GL_MODELVIEW6_ARB */
+       978, /* GL_MODELVIEW7_ARB */
+       979, /* GL_MODELVIEW8_ARB */
+       980, /* GL_MODELVIEW9_ARB */
+       950, /* GL_MODELVIEW10_ARB */
+       951, /* GL_MODELVIEW11_ARB */
+       952, /* GL_MODELVIEW12_ARB */
+       953, /* GL_MODELVIEW13_ARB */
+       954, /* GL_MODELVIEW14_ARB */
+       955, /* GL_MODELVIEW15_ARB */
+       956, /* GL_MODELVIEW16_ARB */
+       957, /* GL_MODELVIEW17_ARB */
+       958, /* GL_MODELVIEW18_ARB */
+       959, /* GL_MODELVIEW19_ARB */
+       961, /* GL_MODELVIEW20_ARB */
+       962, /* GL_MODELVIEW21_ARB */
+       963, /* GL_MODELVIEW22_ARB */
+       964, /* GL_MODELVIEW23_ARB */
+       965, /* GL_MODELVIEW24_ARB */
+       966, /* GL_MODELVIEW25_ARB */
+       967, /* GL_MODELVIEW26_ARB */
+       968, /* GL_MODELVIEW27_ARB */
+       969, /* GL_MODELVIEW28_ARB */
+       970, /* GL_MODELVIEW29_ARB */
+       972, /* GL_MODELVIEW30_ARB */
+       973, /* GL_MODELVIEW31_ARB */
+       386, /* GL_DOT3_RGB_EXT */
+       384, /* GL_DOT3_RGBA_EXT */
+       944, /* GL_MIRROR_CLAMP_EXT */
+       947, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
+       985, /* GL_MODULATE_ADD_ATI */
+       986, /* GL_MODULATE_SIGNED_ADD_ATI */
+       987, /* GL_MODULATE_SUBTRACT_ATI */
+      1837, /* GL_YCBCR_MESA */
+      1076, /* GL_PACK_INVERT_MESA */
+       337, /* GL_DEBUG_OBJECT_MESA */
+       338, /* GL_DEBUG_PRINT_MESA */
+       336, /* GL_DEBUG_ASSERT_MESA */
+       109, /* GL_BUFFER_SIZE */
+       111, /* GL_BUFFER_USAGE */
+       115, /* GL_BUMP_ROT_MATRIX_ATI */
+       116, /* GL_BUMP_ROT_MATRIX_SIZE_ATI */
+       114, /* GL_BUMP_NUM_TEX_UNITS_ATI */
+       118, /* GL_BUMP_TEX_UNITS_ATI */
+       445, /* GL_DUDV_ATI */
+       444, /* GL_DU8DV8_ATI */
+       113, /* GL_BUMP_ENVMAP_ATI */
+       117, /* GL_BUMP_TARGET_ATI */
+      1480, /* GL_STENCIL_BACK_FUNC */
+      1478, /* GL_STENCIL_BACK_FAIL */
+      1482, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
+      1484, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
+       529, /* GL_FRAGMENT_PROGRAM_ARB */
+      1214, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
+      1242, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
+      1241, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
+      1226, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+      1232, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+      1231, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+       879, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
+       902, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
+       901, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
+       892, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+       898, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+       897, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+       862, /* GL_MAX_DRAW_BUFFERS */
+       390, /* GL_DRAW_BUFFER0 */
+       393, /* GL_DRAW_BUFFER1 */
+       414, /* GL_DRAW_BUFFER2 */
+       417, /* GL_DRAW_BUFFER3 */
+       420, /* GL_DRAW_BUFFER4 */
+       423, /* GL_DRAW_BUFFER5 */
+       426, /* GL_DRAW_BUFFER6 */
+       429, /* GL_DRAW_BUFFER7 */
+       432, /* GL_DRAW_BUFFER8 */
+       435, /* GL_DRAW_BUFFER9 */
+       394, /* GL_DRAW_BUFFER10 */
+       397, /* GL_DRAW_BUFFER11 */
+       400, /* GL_DRAW_BUFFER12 */
+       403, /* GL_DRAW_BUFFER13 */
+       406, /* GL_DRAW_BUFFER14 */
+       409, /* GL_DRAW_BUFFER15 */
         81, /* GL_BLEND_EQUATION_ALPHA */
-       840, /* GL_MATRIX_PALETTE_ARB */
-       871, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
-       874, /* GL_MAX_PALETTE_MATRICES_ARB */
-       317, /* GL_CURRENT_PALETTE_MATRIX_ARB */
-       834, /* GL_MATRIX_INDEX_ARRAY_ARB */
-       312, /* GL_CURRENT_MATRIX_INDEX_ARB */
-       836, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
-       838, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
-       837, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
-       835, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
-      1656, /* GL_TEXTURE_DEPTH_SIZE */
-       372, /* GL_DEPTH_TEXTURE_MODE */
-      1622, /* GL_TEXTURE_COMPARE_MODE */
-      1620, /* GL_TEXTURE_COMPARE_FUNC */
-       239, /* GL_COMPARE_R_TO_TEXTURE */
-      1146, /* GL_POINT_SPRITE */
-       292, /* GL_COORD_REPLACE */
-      1150, /* GL_POINT_SPRITE_R_MODE_NV */
-      1269, /* GL_QUERY_COUNTER_BITS */
-       319, /* GL_CURRENT_QUERY */
-      1271, /* GL_QUERY_RESULT */
-      1273, /* GL_QUERY_RESULT_AVAILABLE */
-       922, /* GL_MAX_VERTEX_ATTRIBS */
-      1791, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
-       370, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
-       369, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
-       908, /* GL_MAX_TEXTURE_COORDS */
-       910, /* GL_MAX_TEXTURE_IMAGE_UNITS */
-      1217, /* GL_PROGRAM_ERROR_STRING_ARB */
-      1219, /* GL_PROGRAM_FORMAT_ASCII_ARB */
-      1218, /* GL_PROGRAM_FORMAT_ARB */
-      1702, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
-       349, /* GL_DEPTH_BOUNDS_TEST_EXT */
-       348, /* GL_DEPTH_BOUNDS_EXT */
+       842, /* GL_MATRIX_PALETTE_ARB */
+       873, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
+       876, /* GL_MAX_PALETTE_MATRICES_ARB */
+       319, /* GL_CURRENT_PALETTE_MATRIX_ARB */
+       836, /* GL_MATRIX_INDEX_ARRAY_ARB */
+       314, /* GL_CURRENT_MATRIX_INDEX_ARB */
+       838, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
+       840, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
+       839, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
+       837, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
+      1661, /* GL_TEXTURE_DEPTH_SIZE */
+       374, /* GL_DEPTH_TEXTURE_MODE */
+      1627, /* GL_TEXTURE_COMPARE_MODE */
+      1625, /* GL_TEXTURE_COMPARE_FUNC */
+       241, /* GL_COMPARE_R_TO_TEXTURE */
+      1148, /* GL_POINT_SPRITE */
+       294, /* GL_COORD_REPLACE */
+      1152, /* GL_POINT_SPRITE_R_MODE_NV */
+      1271, /* GL_QUERY_COUNTER_BITS */
+       321, /* GL_CURRENT_QUERY */
+      1273, /* GL_QUERY_RESULT */
+      1275, /* GL_QUERY_RESULT_AVAILABLE */
+       924, /* GL_MAX_VERTEX_ATTRIBS */
+      1799, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+       372, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
+       371, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
+       910, /* GL_MAX_TEXTURE_COORDS */
+       912, /* GL_MAX_TEXTURE_IMAGE_UNITS */
+      1219, /* GL_PROGRAM_ERROR_STRING_ARB */
+      1221, /* GL_PROGRAM_FORMAT_ASCII_ARB */
+      1220, /* GL_PROGRAM_FORMAT_ARB */
+      1710, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+       351, /* GL_DEPTH_BOUNDS_TEST_EXT */
+       350, /* GL_DEPTH_BOUNDS_EXT */
         52, /* GL_ARRAY_BUFFER */
-       456, /* GL_ELEMENT_ARRAY_BUFFER */
+       458, /* GL_ELEMENT_ARRAY_BUFFER */
         53, /* GL_ARRAY_BUFFER_BINDING */
-       457, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
-      1765, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-      1009, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
-       146, /* GL_COLOR_ARRAY_BUFFER_BINDING */
-       619, /* GL_INDEX_ARRAY_BUFFER_BINDING */
-      1635, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
-       452, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
-      1392, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
-       505, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
-      1817, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-      1787, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-      1220, /* GL_PROGRAM_INSTRUCTIONS_ARB */
-       883, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
-      1226, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-       892, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-      1238, /* GL_PROGRAM_TEMPORARIES_ARB */
-       898, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
-      1228, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
-       894, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
-      1232, /* GL_PROGRAM_PARAMETERS_ARB */
-       897, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
-      1227, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
-       893, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
-      1213, /* GL_PROGRAM_ATTRIBS_ARB */
-       878, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
-      1225, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
-       891, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
-      1211, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
-       876, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
-      1223, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-       889, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-       884, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
-       880, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
-      1241, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-      1713, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-      1282, /* GL_READ_ONLY */
-      1825, /* GL_WRITE_ONLY */
-      1284, /* GL_READ_WRITE */
+       459, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
+      1773, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+      1011, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
+       148, /* GL_COLOR_ARRAY_BUFFER_BINDING */
+       621, /* GL_INDEX_ARRAY_BUFFER_BINDING */
+      1640, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
+       454, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
+      1394, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
+       507, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
+      1825, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+      1795, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+      1222, /* GL_PROGRAM_INSTRUCTIONS_ARB */
+       885, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
+      1228, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+       894, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+      1240, /* GL_PROGRAM_TEMPORARIES_ARB */
+       900, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
+      1230, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
+       896, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
+      1234, /* GL_PROGRAM_PARAMETERS_ARB */
+       899, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
+      1229, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
+       895, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
+      1215, /* GL_PROGRAM_ATTRIBS_ARB */
+       880, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
+      1227, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
+       893, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
+      1213, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
+       878, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
+      1225, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+       891, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+       886, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
+       882, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
+      1243, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
+      1721, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+      1284, /* GL_READ_ONLY */
+      1833, /* GL_WRITE_ONLY */
+      1286, /* GL_READ_WRITE */
        101, /* GL_BUFFER_ACCESS */
-       103, /* GL_BUFFER_MAPPED */
-       105, /* GL_BUFFER_MAP_POINTER */
-      1707, /* GL_TIME_ELAPSED_EXT */
-       794, /* GL_MATRIX0_ARB */
-       806, /* GL_MATRIX1_ARB */
-       818, /* GL_MATRIX2_ARB */
-       822, /* GL_MATRIX3_ARB */
-       824, /* GL_MATRIX4_ARB */
-       826, /* GL_MATRIX5_ARB */
-       828, /* GL_MATRIX6_ARB */
-       830, /* GL_MATRIX7_ARB */
-       832, /* GL_MATRIX8_ARB */
-       833, /* GL_MATRIX9_ARB */
-       796, /* GL_MATRIX10_ARB */
-       797, /* GL_MATRIX11_ARB */
-       798, /* GL_MATRIX12_ARB */
-       799, /* GL_MATRIX13_ARB */
-       800, /* GL_MATRIX14_ARB */
-       801, /* GL_MATRIX15_ARB */
-       802, /* GL_MATRIX16_ARB */
-       803, /* GL_MATRIX17_ARB */
-       804, /* GL_MATRIX18_ARB */
-       805, /* GL_MATRIX19_ARB */
-       808, /* GL_MATRIX20_ARB */
-       809, /* GL_MATRIX21_ARB */
-       810, /* GL_MATRIX22_ARB */
-       811, /* GL_MATRIX23_ARB */
-       812, /* GL_MATRIX24_ARB */
-       813, /* GL_MATRIX25_ARB */
-       814, /* GL_MATRIX26_ARB */
-       815, /* GL_MATRIX27_ARB */
-       816, /* GL_MATRIX28_ARB */
-       817, /* GL_MATRIX29_ARB */
-       820, /* GL_MATRIX30_ARB */
-       821, /* GL_MATRIX31_ARB */
-      1508, /* GL_STREAM_DRAW */
-      1510, /* GL_STREAM_READ */
-      1506, /* GL_STREAM_COPY */
-      1469, /* GL_STATIC_DRAW */
-      1471, /* GL_STATIC_READ */
-      1467, /* GL_STATIC_COPY */
-       446, /* GL_DYNAMIC_DRAW */
-       448, /* GL_DYNAMIC_READ */
-       444, /* GL_DYNAMIC_COPY */
-      1114, /* GL_PIXEL_PACK_BUFFER */
-      1118, /* GL_PIXEL_UNPACK_BUFFER */
-      1115, /* GL_PIXEL_PACK_BUFFER_BINDING */
-      1119, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
-       343, /* GL_DEPTH24_STENCIL8 */
-      1700, /* GL_TEXTURE_STENCIL_SIZE */
-       881, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
-       879, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
-       882, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
-       886, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
-       885, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
-       843, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
-      1502, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
+       104, /* GL_BUFFER_MAPPED */
+       106, /* GL_BUFFER_MAP_POINTER */
+      1715, /* GL_TIME_ELAPSED_EXT */
+       796, /* GL_MATRIX0_ARB */
+       808, /* GL_MATRIX1_ARB */
+       820, /* GL_MATRIX2_ARB */
+       824, /* GL_MATRIX3_ARB */
+       826, /* GL_MATRIX4_ARB */
+       828, /* GL_MATRIX5_ARB */
+       830, /* GL_MATRIX6_ARB */
+       832, /* GL_MATRIX7_ARB */
+       834, /* GL_MATRIX8_ARB */
+       835, /* GL_MATRIX9_ARB */
+       798, /* GL_MATRIX10_ARB */
+       799, /* GL_MATRIX11_ARB */
+       800, /* GL_MATRIX12_ARB */
+       801, /* GL_MATRIX13_ARB */
+       802, /* GL_MATRIX14_ARB */
+       803, /* GL_MATRIX15_ARB */
+       804, /* GL_MATRIX16_ARB */
+       805, /* GL_MATRIX17_ARB */
+       806, /* GL_MATRIX18_ARB */
+       807, /* GL_MATRIX19_ARB */
+       810, /* GL_MATRIX20_ARB */
+       811, /* GL_MATRIX21_ARB */
+       812, /* GL_MATRIX22_ARB */
+       813, /* GL_MATRIX23_ARB */
+       814, /* GL_MATRIX24_ARB */
+       815, /* GL_MATRIX25_ARB */
+       816, /* GL_MATRIX26_ARB */
+       817, /* GL_MATRIX27_ARB */
+       818, /* GL_MATRIX28_ARB */
+       819, /* GL_MATRIX29_ARB */
+       822, /* GL_MATRIX30_ARB */
+       823, /* GL_MATRIX31_ARB */
+      1513, /* GL_STREAM_DRAW */
+      1515, /* GL_STREAM_READ */
+      1511, /* GL_STREAM_COPY */
+      1471, /* GL_STATIC_DRAW */
+      1473, /* GL_STATIC_READ */
+      1469, /* GL_STATIC_COPY */
+       448, /* GL_DYNAMIC_DRAW */
+       450, /* GL_DYNAMIC_READ */
+       446, /* GL_DYNAMIC_COPY */
+      1116, /* GL_PIXEL_PACK_BUFFER */
+      1120, /* GL_PIXEL_UNPACK_BUFFER */
+      1117, /* GL_PIXEL_PACK_BUFFER_BINDING */
+      1121, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
+       345, /* GL_DEPTH24_STENCIL8 */
+      1707, /* GL_TEXTURE_STENCIL_SIZE */
+       883, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
+       881, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
+       884, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
+       888, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
+       887, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
+       845, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
+      1504, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
         17, /* GL_ACTIVE_STENCIL_FACE_EXT */
-       943, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
-      1373, /* GL_SAMPLES_PASSED */
-       528, /* GL_FRAGMENT_SHADER */
-      1811, /* GL_VERTEX_SHADER */
-      1231, /* GL_PROGRAM_OBJECT_ARB */
-      1405, /* GL_SHADER_OBJECT_ARB */
-       867, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
-       926, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
-       920, /* GL_MAX_VARYING_FLOATS */
-       924, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
-       852, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
-      1034, /* GL_OBJECT_TYPE_ARB */
-      1407, /* GL_SHADER_TYPE */
-       493, /* GL_FLOAT_VEC2 */
-       495, /* GL_FLOAT_VEC3 */
-       497, /* GL_FLOAT_VEC4 */
-       646, /* GL_INT_VEC2 */
-       648, /* GL_INT_VEC3 */
-       650, /* GL_INT_VEC4 */
+       945, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
+      1375, /* GL_SAMPLES_PASSED */
+       108, /* GL_BUFFER_SERIALIZED_MODIFY_APPLE */
+       103, /* GL_BUFFER_FLUSHING_UNMAP_APPLE */
+       530, /* GL_FRAGMENT_SHADER */
+      1819, /* GL_VERTEX_SHADER */
+      1233, /* GL_PROGRAM_OBJECT_ARB */
+      1407, /* GL_SHADER_OBJECT_ARB */
+       869, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
+       928, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
+       922, /* GL_MAX_VARYING_FLOATS */
+       926, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
+       854, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
+      1036, /* GL_OBJECT_TYPE_ARB */
+      1409, /* GL_SHADER_TYPE */
+       495, /* GL_FLOAT_VEC2 */
+       497, /* GL_FLOAT_VEC3 */
+       499, /* GL_FLOAT_VEC4 */
+       648, /* GL_INT_VEC2 */
+       650, /* GL_INT_VEC3 */
+       652, /* GL_INT_VEC4 */
         93, /* GL_BOOL */
         95, /* GL_BOOL_VEC2 */
         97, /* GL_BOOL_VEC3 */
         99, /* GL_BOOL_VEC4 */
-       481, /* GL_FLOAT_MAT2 */
-       485, /* GL_FLOAT_MAT3 */
-       489, /* GL_FLOAT_MAT4 */
-      1364, /* GL_SAMPLER_1D */
-      1366, /* GL_SAMPLER_2D */
-      1368, /* GL_SAMPLER_3D */
-      1369, /* GL_SAMPLER_CUBE */
-      1365, /* GL_SAMPLER_1D_SHADOW */
-      1367, /* GL_SAMPLER_2D_SHADOW */
-       483, /* GL_FLOAT_MAT2x3 */
-       484, /* GL_FLOAT_MAT2x4 */
-       487, /* GL_FLOAT_MAT3x2 */
-       488, /* GL_FLOAT_MAT3x4 */
-       491, /* GL_FLOAT_MAT4x2 */
-       492, /* GL_FLOAT_MAT4x3 */
-       341, /* GL_DELETE_STATUS */
-       243, /* GL_COMPILE_STATUS */
-       701, /* GL_LINK_STATUS */
-      1759, /* GL_VALIDATE_STATUS */
-       631, /* GL_INFO_LOG_LENGTH */
+       483, /* GL_FLOAT_MAT2 */
+       487, /* GL_FLOAT_MAT3 */
+       491, /* GL_FLOAT_MAT4 */
+      1366, /* GL_SAMPLER_1D */
+      1368, /* GL_SAMPLER_2D */
+      1370, /* GL_SAMPLER_3D */
+      1371, /* GL_SAMPLER_CUBE */
+      1367, /* GL_SAMPLER_1D_SHADOW */
+      1369, /* GL_SAMPLER_2D_SHADOW */
+       485, /* GL_FLOAT_MAT2x3 */
+       486, /* GL_FLOAT_MAT2x4 */
+       489, /* GL_FLOAT_MAT3x2 */
+       490, /* GL_FLOAT_MAT3x4 */
+       493, /* GL_FLOAT_MAT4x2 */
+       494, /* GL_FLOAT_MAT4x3 */
+       343, /* GL_DELETE_STATUS */
+       245, /* GL_COMPILE_STATUS */
+       703, /* GL_LINK_STATUS */
+      1767, /* GL_VALIDATE_STATUS */
+       633, /* GL_INFO_LOG_LENGTH */
         55, /* GL_ATTACHED_SHADERS */
         20, /* GL_ACTIVE_UNIFORMS */
         21, /* GL_ACTIVE_UNIFORM_MAX_LENGTH */
-      1406, /* GL_SHADER_SOURCE_LENGTH */
+      1408, /* GL_SHADER_SOURCE_LENGTH */
         15, /* GL_ACTIVE_ATTRIBUTES */
         16, /* GL_ACTIVE_ATTRIBUTE_MAX_LENGTH */
-       530, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
-      1409, /* GL_SHADING_LANGUAGE_VERSION */
-       318, /* GL_CURRENT_PROGRAM */
-      1083, /* GL_PALETTE4_RGB8_OES */
-      1085, /* GL_PALETTE4_RGBA8_OES */
-      1081, /* GL_PALETTE4_R5_G6_B5_OES */
-      1084, /* GL_PALETTE4_RGBA4_OES */
-      1082, /* GL_PALETTE4_RGB5_A1_OES */
-      1088, /* GL_PALETTE8_RGB8_OES */
-      1090, /* GL_PALETTE8_RGBA8_OES */
-      1086, /* GL_PALETTE8_R5_G6_B5_OES */
-      1089, /* GL_PALETTE8_RGBA4_OES */
-      1087, /* GL_PALETTE8_RGB5_A1_OES */
-       613, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
-       612, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
-      1744, /* GL_UNSIGNED_NORMALIZED */
-      1590, /* GL_TEXTURE_1D_ARRAY_EXT */
-      1252, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
-      1592, /* GL_TEXTURE_2D_ARRAY_EXT */
-      1255, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
-      1598, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
-      1600, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
-      1461, /* GL_SRGB */
-      1462, /* GL_SRGB8 */
-      1464, /* GL_SRGB_ALPHA */
-      1463, /* GL_SRGB8_ALPHA8 */
-      1421, /* GL_SLUMINANCE_ALPHA */
-      1420, /* GL_SLUMINANCE8_ALPHA8 */
-      1418, /* GL_SLUMINANCE */
-      1419, /* GL_SLUMINANCE8 */
-       264, /* GL_COMPRESSED_SRGB */
-       265, /* GL_COMPRESSED_SRGB_ALPHA */
-       262, /* GL_COMPRESSED_SLUMINANCE */
-       263, /* GL_COMPRESSED_SLUMINANCE_ALPHA */
-      1148, /* GL_POINT_SPRITE_COORD_ORIGIN */
-       709, /* GL_LOWER_LEFT */
-      1756, /* GL_UPPER_LEFT */
-      1484, /* GL_STENCIL_BACK_REF */
-      1485, /* GL_STENCIL_BACK_VALUE_MASK */
-      1486, /* GL_STENCIL_BACK_WRITEMASK */
-       437, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
-      1298, /* GL_RENDERBUFFER_BINDING_EXT */
-      1279, /* GL_READ_FRAMEBUFFER */
-       436, /* GL_DRAW_FRAMEBUFFER */
-      1280, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
-      1308, /* GL_RENDERBUFFER_SAMPLES */
-       540, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
-       538, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
-       549, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
-       545, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
-       547, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
-       552, /* GL_FRAMEBUFFER_COMPLETE */
-       556, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
-       562, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
-       560, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
-       558, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
-       561, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
-       559, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
-       565, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
-       568, /* GL_FRAMEBUFFER_UNSUPPORTED */
-       566, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
-       849, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
-       152, /* GL_COLOR_ATTACHMENT0 */
-       154, /* GL_COLOR_ATTACHMENT1 */
-       168, /* GL_COLOR_ATTACHMENT2 */
-       170, /* GL_COLOR_ATTACHMENT3 */
-       172, /* GL_COLOR_ATTACHMENT4 */
-       174, /* GL_COLOR_ATTACHMENT5 */
-       176, /* GL_COLOR_ATTACHMENT6 */
-       178, /* GL_COLOR_ATTACHMENT7 */
-       180, /* GL_COLOR_ATTACHMENT8 */
-       182, /* GL_COLOR_ATTACHMENT9 */
-       155, /* GL_COLOR_ATTACHMENT10 */
-       157, /* GL_COLOR_ATTACHMENT11 */
-       159, /* GL_COLOR_ATTACHMENT12 */
-       161, /* GL_COLOR_ATTACHMENT13 */
-       163, /* GL_COLOR_ATTACHMENT14 */
-       165, /* GL_COLOR_ATTACHMENT15 */
-       344, /* GL_DEPTH_ATTACHMENT */
-      1474, /* GL_STENCIL_ATTACHMENT */
-       531, /* GL_FRAMEBUFFER */
-      1296, /* GL_RENDERBUFFER */
-      1310, /* GL_RENDERBUFFER_WIDTH */
-      1303, /* GL_RENDERBUFFER_HEIGHT */
-      1305, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
-      1497, /* GL_STENCIL_INDEX_EXT */
-      1494, /* GL_STENCIL_INDEX1_EXT */
-      1495, /* GL_STENCIL_INDEX4_EXT */
-      1496, /* GL_STENCIL_INDEX8_EXT */
-      1493, /* GL_STENCIL_INDEX16_EXT */
-      1307, /* GL_RENDERBUFFER_RED_SIZE */
-      1302, /* GL_RENDERBUFFER_GREEN_SIZE */
-      1299, /* GL_RENDERBUFFER_BLUE_SIZE */
-      1297, /* GL_RENDERBUFFER_ALPHA_SIZE */
-      1300, /* GL_RENDERBUFFER_DEPTH_SIZE */
-      1309, /* GL_RENDERBUFFER_STENCIL_SIZE */
-       564, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
-       905, /* GL_MAX_SAMPLES */
-      1266, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT */
-       478, /* GL_FIRST_VERTEX_CONVENTION_EXT */
-       661, /* GL_LAST_VERTEX_CONVENTION_EXT */
-      1245, /* GL_PROVOKING_VERTEX_EXT */
-       298, /* GL_COPY_READ_BUFFER */
-       299, /* GL_COPY_WRITE_BUFFER */
-      1357, /* GL_RGBA_SNORM */
-      1353, /* GL_RGBA8_SNORM */
-      1414, /* GL_SIGNED_NORMALIZED */
-       463, /* GL_EVAL_BIT */
-      1277, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
-       703, /* GL_LIST_BIT */
-      1606, /* GL_TEXTURE_BIT */
-      1388, /* GL_SCISSOR_BIT */
+       532, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
+      1411, /* GL_SHADING_LANGUAGE_VERSION */
+       320, /* GL_CURRENT_PROGRAM */
+      1085, /* GL_PALETTE4_RGB8_OES */
+      1087, /* GL_PALETTE4_RGBA8_OES */
+      1083, /* GL_PALETTE4_R5_G6_B5_OES */
+      1086, /* GL_PALETTE4_RGBA4_OES */
+      1084, /* GL_PALETTE4_RGB5_A1_OES */
+      1090, /* GL_PALETTE8_RGB8_OES */
+      1092, /* GL_PALETTE8_RGBA8_OES */
+      1088, /* GL_PALETTE8_R5_G6_B5_OES */
+      1091, /* GL_PALETTE8_RGBA4_OES */
+      1089, /* GL_PALETTE8_RGB5_A1_OES */
+       615, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
+       614, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
+      1752, /* GL_UNSIGNED_NORMALIZED */
+      1595, /* GL_TEXTURE_1D_ARRAY_EXT */
+      1254, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
+      1597, /* GL_TEXTURE_2D_ARRAY_EXT */
+      1257, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
+      1603, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
+      1605, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
+      1463, /* GL_SRGB */
+      1464, /* GL_SRGB8 */
+      1466, /* GL_SRGB_ALPHA */
+      1465, /* GL_SRGB8_ALPHA8 */
+      1423, /* GL_SLUMINANCE_ALPHA */
+      1422, /* GL_SLUMINANCE8_ALPHA8 */
+      1420, /* GL_SLUMINANCE */
+      1421, /* GL_SLUMINANCE8 */
+       266, /* GL_COMPRESSED_SRGB */
+       267, /* GL_COMPRESSED_SRGB_ALPHA */
+       264, /* GL_COMPRESSED_SLUMINANCE */
+       265, /* GL_COMPRESSED_SLUMINANCE_ALPHA */
+      1150, /* GL_POINT_SPRITE_COORD_ORIGIN */
+       711, /* GL_LOWER_LEFT */
+      1764, /* GL_UPPER_LEFT */
+      1486, /* GL_STENCIL_BACK_REF */
+      1487, /* GL_STENCIL_BACK_VALUE_MASK */
+      1488, /* GL_STENCIL_BACK_WRITEMASK */
+       439, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
+      1300, /* GL_RENDERBUFFER_BINDING_EXT */
+      1281, /* GL_READ_FRAMEBUFFER */
+       438, /* GL_DRAW_FRAMEBUFFER */
+      1282, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
+      1310, /* GL_RENDERBUFFER_SAMPLES */
+       542, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
+       540, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
+       551, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
+       547, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
+       549, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+       554, /* GL_FRAMEBUFFER_COMPLETE */
+       558, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
+       564, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
+       562, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
+       560, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
+       563, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
+       561, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
+       567, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
+       570, /* GL_FRAMEBUFFER_UNSUPPORTED */
+       568, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
+       851, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
+       154, /* GL_COLOR_ATTACHMENT0 */
+       156, /* GL_COLOR_ATTACHMENT1 */
+       170, /* GL_COLOR_ATTACHMENT2 */
+       172, /* GL_COLOR_ATTACHMENT3 */
+       174, /* GL_COLOR_ATTACHMENT4 */
+       176, /* GL_COLOR_ATTACHMENT5 */
+       178, /* GL_COLOR_ATTACHMENT6 */
+       180, /* GL_COLOR_ATTACHMENT7 */
+       182, /* GL_COLOR_ATTACHMENT8 */
+       184, /* GL_COLOR_ATTACHMENT9 */
+       157, /* GL_COLOR_ATTACHMENT10 */
+       159, /* GL_COLOR_ATTACHMENT11 */
+       161, /* GL_COLOR_ATTACHMENT12 */
+       163, /* GL_COLOR_ATTACHMENT13 */
+       165, /* GL_COLOR_ATTACHMENT14 */
+       167, /* GL_COLOR_ATTACHMENT15 */
+       346, /* GL_DEPTH_ATTACHMENT */
+      1476, /* GL_STENCIL_ATTACHMENT */
+       533, /* GL_FRAMEBUFFER */
+      1298, /* GL_RENDERBUFFER */
+      1312, /* GL_RENDERBUFFER_WIDTH */
+      1305, /* GL_RENDERBUFFER_HEIGHT */
+      1307, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
+      1499, /* GL_STENCIL_INDEX_EXT */
+      1496, /* GL_STENCIL_INDEX1_EXT */
+      1497, /* GL_STENCIL_INDEX4_EXT */
+      1498, /* GL_STENCIL_INDEX8_EXT */
+      1495, /* GL_STENCIL_INDEX16_EXT */
+      1309, /* GL_RENDERBUFFER_RED_SIZE */
+      1304, /* GL_RENDERBUFFER_GREEN_SIZE */
+      1301, /* GL_RENDERBUFFER_BLUE_SIZE */
+      1299, /* GL_RENDERBUFFER_ALPHA_SIZE */
+      1302, /* GL_RENDERBUFFER_DEPTH_SIZE */
+      1311, /* GL_RENDERBUFFER_STENCIL_SIZE */
+       566, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
+       907, /* GL_MAX_SAMPLES */
+      1268, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT */
+       480, /* GL_FIRST_VERTEX_CONVENTION_EXT */
+       663, /* GL_LAST_VERTEX_CONVENTION_EXT */
+      1247, /* GL_PROVOKING_VERTEX_EXT */
+       300, /* GL_COPY_READ_BUFFER */
+       301, /* GL_COPY_WRITE_BUFFER */
+      1359, /* GL_RGBA_SNORM */
+      1355, /* GL_RGBA8_SNORM */
+      1416, /* GL_SIGNED_NORMALIZED */
+       465, /* GL_EVAL_BIT */
+      1279, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
+       705, /* GL_LIST_BIT */
+      1611, /* GL_TEXTURE_BIT */
+      1390, /* GL_SCISSOR_BIT */
         29, /* GL_ALL_ATTRIB_BITS */
-       990, /* GL_MULTISAMPLE_BIT */
+       992, /* GL_MULTISAMPLE_BIT */
         30, /* GL_ALL_CLIENT_ATTRIB_BITS */
 };
 
diff --git a/src/mesa/sparc/glapi_sparc.S b/src/mesa/sparc/glapi_sparc.S
index 12d74fa4fb..34c1e09ad8 100644
--- a/src/mesa/sparc/glapi_sparc.S
+++ b/src/mesa/sparc/glapi_sparc.S
@@ -999,18 +999,26 @@ gl_dispatch_functions_start:
 	GL_STUB(glRenderbufferStorageEXT, _gloffset_RenderbufferStorageEXT)
 	GL_STUB(gl_dispatch_stub_773, _gloffset_BlitFramebufferEXT)
 	HIDDEN(gl_dispatch_stub_773)
+	GL_STUB(gl_dispatch_stub_774, _gloffset_BufferParameteriAPPLE)
+	HIDDEN(gl_dispatch_stub_774)
+	GL_STUB(gl_dispatch_stub_775, _gloffset_FlushMappedBufferRangeAPPLE)
+	HIDDEN(gl_dispatch_stub_775)
 	GL_STUB(glFramebufferTextureLayerEXT, _gloffset_FramebufferTextureLayerEXT)
 	GL_STUB(glProvokingVertexEXT, _gloffset_ProvokingVertexEXT)
-	GL_STUB(gl_dispatch_stub_776, _gloffset_StencilFuncSeparateATI)
-	HIDDEN(gl_dispatch_stub_776)
-	GL_STUB(gl_dispatch_stub_777, _gloffset_ProgramEnvParameters4fvEXT)
-	HIDDEN(gl_dispatch_stub_777)
-	GL_STUB(gl_dispatch_stub_778, _gloffset_ProgramLocalParameters4fvEXT)
+	GL_STUB(gl_dispatch_stub_778, _gloffset_GetTexParameterPointervAPPLE)
 	HIDDEN(gl_dispatch_stub_778)
-	GL_STUB(gl_dispatch_stub_779, _gloffset_GetQueryObjecti64vEXT)
+	GL_STUB(gl_dispatch_stub_779, _gloffset_TextureRangeAPPLE)
 	HIDDEN(gl_dispatch_stub_779)
-	GL_STUB(gl_dispatch_stub_780, _gloffset_GetQueryObjectui64vEXT)
+	GL_STUB(gl_dispatch_stub_780, _gloffset_StencilFuncSeparateATI)
 	HIDDEN(gl_dispatch_stub_780)
+	GL_STUB(gl_dispatch_stub_781, _gloffset_ProgramEnvParameters4fvEXT)
+	HIDDEN(gl_dispatch_stub_781)
+	GL_STUB(gl_dispatch_stub_782, _gloffset_ProgramLocalParameters4fvEXT)
+	HIDDEN(gl_dispatch_stub_782)
+	GL_STUB(gl_dispatch_stub_783, _gloffset_GetQueryObjecti64vEXT)
+	HIDDEN(gl_dispatch_stub_783)
+	GL_STUB(gl_dispatch_stub_784, _gloffset_GetQueryObjectui64vEXT)
+	HIDDEN(gl_dispatch_stub_784)
 	GL_STUB_ALIAS(glArrayElementEXT, glArrayElement)
 	GL_STUB_ALIAS(glBindTextureEXT, glBindTexture)
 	GL_STUB_ALIAS(glDrawArraysEXT, glDrawArrays)
diff --git a/src/mesa/x86-64/glapi_x86-64.S b/src/mesa/x86-64/glapi_x86-64.S
index 44179ab607..10525d4c65 100644
--- a/src/mesa/x86-64/glapi_x86-64.S
+++ b/src/mesa/x86-64/glapi_x86-64.S
@@ -29276,13 +29276,89 @@ GL_PREFIX(_dispatch_stub_773):
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(_dispatch_stub_773), .-GL_PREFIX(_dispatch_stub_773)
 
+	.p2align	4,,15
+	.globl	GL_PREFIX(_dispatch_stub_774)
+	.type	GL_PREFIX(_dispatch_stub_774), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_774))
+GL_PREFIX(_dispatch_stub_774):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	6192(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_x86_64_get_dispatch@PLT
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	6192(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	6192(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_glapi_get_dispatch
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	6192(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(_dispatch_stub_774), .-GL_PREFIX(_dispatch_stub_774)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(_dispatch_stub_775)
+	.type	GL_PREFIX(_dispatch_stub_775), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_775))
+GL_PREFIX(_dispatch_stub_775):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	6200(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_x86_64_get_dispatch@PLT
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	6200(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	6200(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_glapi_get_dispatch
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	6200(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(_dispatch_stub_775), .-GL_PREFIX(_dispatch_stub_775)
+
 	.p2align	4,,15
 	.globl	GL_PREFIX(FramebufferTextureLayerEXT)
 	.type	GL_PREFIX(FramebufferTextureLayerEXT), @function
 GL_PREFIX(FramebufferTextureLayerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6192(%rax), %r11
+	movq	6208(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29296,13 +29372,13 @@ GL_PREFIX(FramebufferTextureLayerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6192(%rax), %r11
+	movq	6208(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6192(%rax), %r11
+	movq	6208(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29316,7 +29392,7 @@ GL_PREFIX(FramebufferTextureLayerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6192(%rax), %r11
+	movq	6208(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTextureLayerEXT), .-GL_PREFIX(FramebufferTextureLayerEXT)
@@ -29327,37 +29403,113 @@ GL_PREFIX(FramebufferTextureLayerEXT):
 GL_PREFIX(ProvokingVertexEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6200(%rax), %r11
+	movq	6216(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6200(%rax), %r11
+	movq	6216(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6200(%rax), %r11
+	movq	6216(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6200(%rax), %r11
+	movq	6216(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProvokingVertexEXT), .-GL_PREFIX(ProvokingVertexEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_776)
-	.type	GL_PREFIX(_dispatch_stub_776), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_776))
-GL_PREFIX(_dispatch_stub_776):
+	.globl	GL_PREFIX(_dispatch_stub_778)
+	.type	GL_PREFIX(_dispatch_stub_778), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_778))
+GL_PREFIX(_dispatch_stub_778):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6208(%rax), %r11
+	movq	6224(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_x86_64_get_dispatch@PLT
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	6224(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	6224(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_glapi_get_dispatch
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	6224(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(_dispatch_stub_778), .-GL_PREFIX(_dispatch_stub_778)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(_dispatch_stub_779)
+	.type	GL_PREFIX(_dispatch_stub_779), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_779))
+GL_PREFIX(_dispatch_stub_779):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	6232(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_x86_64_get_dispatch@PLT
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	6232(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	6232(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_glapi_get_dispatch
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	6232(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(_dispatch_stub_779), .-GL_PREFIX(_dispatch_stub_779)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(_dispatch_stub_780)
+	.type	GL_PREFIX(_dispatch_stub_780), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_780))
+GL_PREFIX(_dispatch_stub_780):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	6240(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29371,13 +29523,13 @@ GL_PREFIX(_dispatch_stub_776):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6208(%rax), %r11
+	movq	6240(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6208(%rax), %r11
+	movq	6240(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29391,19 +29543,19 @@ GL_PREFIX(_dispatch_stub_776):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6208(%rax), %r11
+	movq	6240(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_776), .-GL_PREFIX(_dispatch_stub_776)
+	.size	GL_PREFIX(_dispatch_stub_780), .-GL_PREFIX(_dispatch_stub_780)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_777)
-	.type	GL_PREFIX(_dispatch_stub_777), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_777))
-GL_PREFIX(_dispatch_stub_777):
+	.globl	GL_PREFIX(_dispatch_stub_781)
+	.type	GL_PREFIX(_dispatch_stub_781), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_781))
+GL_PREFIX(_dispatch_stub_781):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6216(%rax), %r11
+	movq	6248(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29417,13 +29569,13 @@ GL_PREFIX(_dispatch_stub_777):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6216(%rax), %r11
+	movq	6248(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6216(%rax), %r11
+	movq	6248(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29437,19 +29589,19 @@ GL_PREFIX(_dispatch_stub_777):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6216(%rax), %r11
+	movq	6248(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_777), .-GL_PREFIX(_dispatch_stub_777)
+	.size	GL_PREFIX(_dispatch_stub_781), .-GL_PREFIX(_dispatch_stub_781)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_778)
-	.type	GL_PREFIX(_dispatch_stub_778), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_778))
-GL_PREFIX(_dispatch_stub_778):
+	.globl	GL_PREFIX(_dispatch_stub_782)
+	.type	GL_PREFIX(_dispatch_stub_782), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_782))
+GL_PREFIX(_dispatch_stub_782):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6224(%rax), %r11
+	movq	6256(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29463,13 +29615,13 @@ GL_PREFIX(_dispatch_stub_778):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6224(%rax), %r11
+	movq	6256(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6224(%rax), %r11
+	movq	6256(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29483,19 +29635,19 @@ GL_PREFIX(_dispatch_stub_778):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6224(%rax), %r11
+	movq	6256(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_778), .-GL_PREFIX(_dispatch_stub_778)
+	.size	GL_PREFIX(_dispatch_stub_782), .-GL_PREFIX(_dispatch_stub_782)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_779)
-	.type	GL_PREFIX(_dispatch_stub_779), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_779))
-GL_PREFIX(_dispatch_stub_779):
+	.globl	GL_PREFIX(_dispatch_stub_783)
+	.type	GL_PREFIX(_dispatch_stub_783), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_783))
+GL_PREFIX(_dispatch_stub_783):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6232(%rax), %r11
+	movq	6264(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29505,13 +29657,13 @@ GL_PREFIX(_dispatch_stub_779):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6232(%rax), %r11
+	movq	6264(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6232(%rax), %r11
+	movq	6264(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29521,19 +29673,19 @@ GL_PREFIX(_dispatch_stub_779):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6232(%rax), %r11
+	movq	6264(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_779), .-GL_PREFIX(_dispatch_stub_779)
+	.size	GL_PREFIX(_dispatch_stub_783), .-GL_PREFIX(_dispatch_stub_783)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_780)
-	.type	GL_PREFIX(_dispatch_stub_780), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_780))
-GL_PREFIX(_dispatch_stub_780):
+	.globl	GL_PREFIX(_dispatch_stub_784)
+	.type	GL_PREFIX(_dispatch_stub_784), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_784))
+GL_PREFIX(_dispatch_stub_784):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6240(%rax), %r11
+	movq	6272(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29543,13 +29695,13 @@ GL_PREFIX(_dispatch_stub_780):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6240(%rax), %r11
+	movq	6272(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6240(%rax), %r11
+	movq	6272(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29559,10 +29711,10 @@ GL_PREFIX(_dispatch_stub_780):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6240(%rax), %r11
+	movq	6272(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_780), .-GL_PREFIX(_dispatch_stub_780)
+	.size	GL_PREFIX(_dispatch_stub_784), .-GL_PREFIX(_dispatch_stub_784)
 
 	.globl GL_PREFIX(ArrayElementEXT) ; .set GL_PREFIX(ArrayElementEXT), GL_PREFIX(ArrayElement)
 	.globl GL_PREFIX(BindTextureEXT) ; .set GL_PREFIX(BindTextureEXT), GL_PREFIX(BindTexture)
diff --git a/src/mesa/x86/glapi_x86.S b/src/mesa/x86/glapi_x86.S
index fa25bf75cd..204175b72d 100644
--- a/src/mesa/x86/glapi_x86.S
+++ b/src/mesa/x86/glapi_x86.S
@@ -953,18 +953,26 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(RenderbufferStorageEXT, _gloffset_RenderbufferStorageEXT, RenderbufferStorageEXT@16)
 	GL_STUB(_dispatch_stub_773, _gloffset_BlitFramebufferEXT, _dispatch_stub_773@40)
 	HIDDEN(GL_PREFIX(_dispatch_stub_773, _dispatch_stub_773@40))
+	GL_STUB(_dispatch_stub_774, _gloffset_BufferParameteriAPPLE, _dispatch_stub_774@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_774, _dispatch_stub_774@12))
+	GL_STUB(_dispatch_stub_775, _gloffset_FlushMappedBufferRangeAPPLE, _dispatch_stub_775@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_775, _dispatch_stub_775@12))
 	GL_STUB(FramebufferTextureLayerEXT, _gloffset_FramebufferTextureLayerEXT, FramebufferTextureLayerEXT@20)
 	GL_STUB(ProvokingVertexEXT, _gloffset_ProvokingVertexEXT, ProvokingVertexEXT@4)
-	GL_STUB(_dispatch_stub_776, _gloffset_StencilFuncSeparateATI, _dispatch_stub_776@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_776, _dispatch_stub_776@16))
-	GL_STUB(_dispatch_stub_777, _gloffset_ProgramEnvParameters4fvEXT, _dispatch_stub_777@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_777, _dispatch_stub_777@16))
-	GL_STUB(_dispatch_stub_778, _gloffset_ProgramLocalParameters4fvEXT, _dispatch_stub_778@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_778, _dispatch_stub_778@16))
-	GL_STUB(_dispatch_stub_779, _gloffset_GetQueryObjecti64vEXT, _dispatch_stub_779@12)
+	GL_STUB(_dispatch_stub_778, _gloffset_GetTexParameterPointervAPPLE, _dispatch_stub_778@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_778, _dispatch_stub_778@12))
+	GL_STUB(_dispatch_stub_779, _gloffset_TextureRangeAPPLE, _dispatch_stub_779@12)
 	HIDDEN(GL_PREFIX(_dispatch_stub_779, _dispatch_stub_779@12))
-	GL_STUB(_dispatch_stub_780, _gloffset_GetQueryObjectui64vEXT, _dispatch_stub_780@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_780, _dispatch_stub_780@12))
+	GL_STUB(_dispatch_stub_780, _gloffset_StencilFuncSeparateATI, _dispatch_stub_780@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_780, _dispatch_stub_780@16))
+	GL_STUB(_dispatch_stub_781, _gloffset_ProgramEnvParameters4fvEXT, _dispatch_stub_781@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_781, _dispatch_stub_781@16))
+	GL_STUB(_dispatch_stub_782, _gloffset_ProgramLocalParameters4fvEXT, _dispatch_stub_782@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_782, _dispatch_stub_782@16))
+	GL_STUB(_dispatch_stub_783, _gloffset_GetQueryObjecti64vEXT, _dispatch_stub_783@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_783, _dispatch_stub_783@12))
+	GL_STUB(_dispatch_stub_784, _gloffset_GetQueryObjectui64vEXT, _dispatch_stub_784@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_784, _dispatch_stub_784@12))
 	GL_STUB_ALIAS(ArrayElementEXT, _gloffset_ArrayElement, ArrayElementEXT@4, ArrayElement, ArrayElement@4)
 	GL_STUB_ALIAS(BindTextureEXT, _gloffset_BindTexture, BindTextureEXT@8, BindTexture, BindTexture@8)
 	GL_STUB_ALIAS(DrawArraysEXT, _gloffset_DrawArrays, DrawArraysEXT@12, DrawArrays, DrawArrays@12)
-- 
cgit v1.2.3


From 9d5bb3c6f820a5a99e1f55b2fd14d250761fcddc Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Fri, 14 Aug 2009 01:20:56 -0700
Subject: Infrastructure for GL_ARB_seamless_cube_map

---
 src/mesa/glapi/ARB_seamless_cube_map.xml | 12 ++++++++++++
 src/mesa/glapi/Makefile                  |  1 +
 src/mesa/glapi/gl_API.xml                |  2 ++
 src/mesa/main/enable.c                   | 10 ++++++++++
 src/mesa/main/extensions.c               |  1 +
 src/mesa/main/get_gen.py                 |  4 ++++
 src/mesa/main/mtypes.h                   |  4 ++++
 7 files changed, 34 insertions(+)
 create mode 100644 src/mesa/glapi/ARB_seamless_cube_map.xml

(limited to 'src/mesa/main')

diff --git a/src/mesa/glapi/ARB_seamless_cube_map.xml b/src/mesa/glapi/ARB_seamless_cube_map.xml
new file mode 100644
index 0000000000..3cdc84d2b9
--- /dev/null
+++ b/src/mesa/glapi/ARB_seamless_cube_map.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<OpenGLAPI>
+
+<category name="GL_ARB_seamless_cubemap" number="65">
+    <enum name="TEXTURE_CUBE_MAP_SEAMLESS"     count="1"  value="0x88F4">
+        <size name="Get" mode="get"/>
+    </enum>
+</category>
+
+</OpenGLAPI>
diff --git a/src/mesa/glapi/Makefile b/src/mesa/glapi/Makefile
index 2178eacef5..f706309b56 100644
--- a/src/mesa/glapi/Makefile
+++ b/src/mesa/glapi/Makefile
@@ -50,6 +50,7 @@ API_XML = gl_API.xml \
 	ARB_copy_buffer.xml \
 	ARB_framebuffer_object.xml \
 	ARB_map_buffer_range.xml \
+	ARB_seamless_cube_map.xml \
 	ARB_vertex_array_object.xml \
 	APPLE_vertex_array_object.xml \
 	EXT_provoking_vertex.xml
diff --git a/src/mesa/glapi/gl_API.xml b/src/mesa/glapi/gl_API.xml
index 1703637c7b..d2fcc6dc1f 100644
--- a/src/mesa/glapi/gl_API.xml
+++ b/src/mesa/glapi/gl_API.xml
@@ -7954,6 +7954,8 @@
 
 <xi:include href="ARB_vertex_array_object.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
+<xi:include href="ARB_seamless_cube_map.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
 
 <!-- Non-ARB extensions sorted by extension number. -->
 
diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index 48268fcd27..4bc54771e9 100644
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -972,6 +972,11 @@ _mesa_set_enable(GLcontext *ctx, GLenum cap, GLboolean state)
          }
          break;
 
+      case GL_TEXTURE_CUBE_MAP_SEAMLESS:
+	 CHECK_EXTENSION(ARB_seamless_cube_map, cap);
+	 ctx->Texture.CubeMapSeamless = state;
+	 break;
+
       default:
          _mesa_error(ctx, GL_INVALID_ENUM,
                      "%s(0x%x)", state ? "glEnable" : "glDisable", cap);
@@ -1395,6 +1400,11 @@ _mesa_IsEnabled( GLenum cap )
 	 CHECK_EXTENSION(ATI_fragment_shader);
 	 return ctx->ATIFragmentShader.Enabled;
 #endif /* FEATURE_ATI_fragment_shader */
+
+      case GL_TEXTURE_CUBE_MAP_SEAMLESS:
+	 CHECK_EXTENSION(ARB_seamless_cube_map);
+	 return ctx->Texture.CubeMapSeamless;
+
       default:
          _mesa_error(ctx, GL_INVALID_ENUM, "glIsEnabled(0x%x)", (int) cap);
 	 return GL_FALSE;
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 8870a20d0e..195fdde346 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -61,6 +61,7 @@ static const struct {
    { OFF, "GL_ARB_pixel_buffer_object",        F(EXT_pixel_buffer_object) },
    { OFF, "GL_ARB_point_parameters",           F(EXT_point_parameters) },
    { OFF, "GL_ARB_point_sprite",               F(ARB_point_sprite) },
+   { OFF, "GL_ARB_seamless_cube_map",          F(ARB_seamless_cube_map) },
    { OFF, "GL_ARB_shader_objects",             F(ARB_shader_objects) },
    { OFF, "GL_ARB_shading_language_100",       F(ARB_shading_language_100) },
    { OFF, "GL_ARB_shading_language_120",       F(ARB_shading_language_120) },
diff --git a/src/mesa/main/get_gen.py b/src/mesa/main/get_gen.py
index 5666ad0e42..e9c8226d08 100644
--- a/src/mesa/main/get_gen.py
+++ b/src/mesa/main/get_gen.py
@@ -1015,6 +1015,10 @@ StateVars = [
 	# GL_APPLE_vertex_array_object
 	( "GL_VERTEX_ARRAY_BINDING_APPLE", GLint, ["ctx->Array.ArrayObj->Name"], "",
 	  ["APPLE_vertex_array_object"] ),
+
+	# GL_ARB_seamless_cube_map
+	( "GL_TEXTURE_CUBE_MAP_SEAMLESS", GLboolean, ["ctx->Texture.CubeMapSeamless"], "",
+	  ["ARB_seamless_cube_map"] ),
 ]
 
 
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 41172788ef..2d497ff2c6 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1445,6 +1445,9 @@ struct gl_texture_attrib
 
    struct gl_texture_object *ProxyTex[NUM_TEXTURE_TARGETS];
 
+   /** GL_ARB_seamless_cubemap */
+   GLboolean CubeMapSeamless;
+
    /** GL_EXT_shared_texture_palette */
    GLboolean SharedPalette;
    struct gl_color_table Palette;
@@ -2458,6 +2461,7 @@ struct gl_extensions
    GLboolean ARB_multitexture;
    GLboolean ARB_occlusion_query;
    GLboolean ARB_point_sprite;
+   GLboolean ARB_seamless_cube_map;
    GLboolean ARB_shader_objects;
    GLboolean ARB_shading_language_100;
    GLboolean ARB_shading_language_120;
-- 
cgit v1.2.3


From 06ae1db4a987fd22a56b6d8a640baffe73599a36 Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Fri, 14 Aug 2009 01:25:05 -0700
Subject: Regenerate files for GL_ARB_seamless_cube_map

---
 src/mesa/main/enums.c | 658 +++++++++++++++++++++++++-------------------------
 src/mesa/main/get.c   |  12 +
 2 files changed, 342 insertions(+), 328 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/enums.c b/src/mesa/main/enums.c
index 646552bdd5..ad40bb6e78 100644
--- a/src/mesa/main/enums.c
+++ b/src/mesa/main/enums.c
@@ -1696,6 +1696,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB\0"
    "GL_TEXTURE_CUBE_MAP_POSITIVE_Z\0"
    "GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB\0"
+   "GL_TEXTURE_CUBE_MAP_SEAMLESS\0"
    "GL_TEXTURE_DEPTH\0"
    "GL_TEXTURE_DEPTH_SIZE\0"
    "GL_TEXTURE_DEPTH_SIZE_ARB\0"
@@ -1879,7 +1880,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_ZOOM_Y\0"
    ;
 
-static const enum_elt all_enums[1841] =
+static const enum_elt all_enums[1842] =
 {
    {     0, 0x00000600 }, /* GL_2D */
    {     6, 0x00001407 }, /* GL_2_BYTES */
@@ -3541,187 +3542,188 @@ static const enum_elt all_enums[1841] =
    { 35504, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
    { 35539, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
    { 35570, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
-   { 35605, 0x00008071 }, /* GL_TEXTURE_DEPTH */
-   { 35622, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
-   { 35644, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
-   { 35670, 0x00002300 }, /* GL_TEXTURE_ENV */
-   { 35685, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
-   { 35706, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
-   { 35726, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
-   { 35752, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
-   { 35772, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
-   { 35789, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
-   { 35806, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
-   { 35823, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
-   { 35840, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
-   { 35865, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
-   { 35887, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
-   { 35913, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
-   { 35931, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
-   { 35957, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
-   { 35983, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
-   { 36013, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
-   { 36040, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
-   { 36065, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
-   { 36085, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
-   { 36109, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
-   { 36136, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-   { 36163, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-   { 36190, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
-   { 36216, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
-   { 36246, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
-   { 36268, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
-   { 36286, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
-   { 36316, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
-   { 36344, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-   { 36372, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-   { 36400, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
-   { 36421, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
-   { 36440, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
-   { 36462, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
-   { 36481, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
-   { 36501, 0x000085B7 }, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
-   { 36531, 0x000085B8 }, /* GL_TEXTURE_RANGE_POINTER_APPLE */
-   { 36562, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
-   { 36587, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
-   { 36611, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
-   { 36631, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
-   { 36655, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
-   { 36675, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
-   { 36698, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */
-   { 36722, 0x000085BC }, /* GL_TEXTURE_STORAGE_HINT_APPLE */
-   { 36752, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
-   { 36777, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
-   { 36811, 0x00001000 }, /* GL_TEXTURE_WIDTH */
-   { 36828, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
-   { 36846, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
-   { 36864, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
-   { 36882, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
-   { 36902, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
-   { 36921, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-   { 36950, 0x00001000 }, /* GL_TRANSFORM_BIT */
-   { 36967, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
-   { 36993, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
-   { 37023, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-   { 37055, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-   { 37085, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
-   { 37119, 0x0000862C }, /* GL_TRANSPOSE_NV */
-   { 37135, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-   { 37166, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
-   { 37201, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-   { 37229, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
-   { 37261, 0x00000004 }, /* GL_TRIANGLES */
-   { 37274, 0x00000006 }, /* GL_TRIANGLE_FAN */
-   { 37290, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
-   { 37311, 0x00000005 }, /* GL_TRIANGLE_STRIP */
-   { 37329, 0x00000001 }, /* GL_TRUE */
-   { 37337, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
-   { 37357, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
-   { 37380, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
-   { 37400, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
-   { 37421, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
-   { 37443, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
-   { 37465, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
-   { 37485, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
-   { 37506, 0x00001401 }, /* GL_UNSIGNED_BYTE */
-   { 37523, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-   { 37550, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
-   { 37573, 0x00001405 }, /* GL_UNSIGNED_INT */
-   { 37589, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
-   { 37616, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */
-   { 37637, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
-   { 37661, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-   { 37692, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
-   { 37716, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-   { 37744, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */
-   { 37767, 0x00001403 }, /* GL_UNSIGNED_SHORT */
-   { 37785, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-   { 37815, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-   { 37841, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-   { 37871, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-   { 37897, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
-   { 37921, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-   { 37949, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-   { 37977, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
-   { 38004, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-   { 38036, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
-   { 38067, 0x00008CA2 }, /* GL_UPPER_LEFT */
-   { 38081, 0x00002A20 }, /* GL_V2F */
-   { 38088, 0x00002A21 }, /* GL_V3F */
-   { 38095, 0x00008B83 }, /* GL_VALIDATE_STATUS */
-   { 38114, 0x00001F00 }, /* GL_VENDOR */
-   { 38124, 0x00001F02 }, /* GL_VERSION */
-   { 38135, 0x00008074 }, /* GL_VERTEX_ARRAY */
-   { 38151, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING */
-   { 38175, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
-   { 38205, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-   { 38236, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
-   { 38271, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
-   { 38295, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
-   { 38316, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
-   { 38339, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
-   { 38360, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-   { 38387, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-   { 38415, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-   { 38443, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-   { 38471, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-   { 38499, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-   { 38527, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
-   { 38555, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-   { 38582, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-   { 38609, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-   { 38636, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-   { 38663, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-   { 38690, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-   { 38717, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-   { 38744, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-   { 38771, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-   { 38798, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-   { 38836, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
-   { 38878, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-   { 38909, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
-   { 38944, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
-   { 38978, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
-   { 39016, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-   { 39047, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
-   { 39082, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-   { 39110, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
-   { 39142, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-   { 39172, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
-   { 39206, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
-   { 39234, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
-   { 39266, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
-   { 39286, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
-   { 39308, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
-   { 39337, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
-   { 39358, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-   { 39387, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
-   { 39420, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
-   { 39452, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-   { 39479, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
-   { 39510, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
-   { 39540, 0x00008B31 }, /* GL_VERTEX_SHADER */
-   { 39557, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
-   { 39578, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
-   { 39605, 0x00000BA2 }, /* GL_VIEWPORT */
-   { 39617, 0x00000800 }, /* GL_VIEWPORT_BIT */
-   { 39633, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
-   { 39653, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-   { 39684, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
-   { 39719, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-   { 39747, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-   { 39772, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-   { 39799, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-   { 39824, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
-   { 39848, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
-   { 39867, 0x000088B9 }, /* GL_WRITE_ONLY */
-   { 39881, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
-   { 39899, 0x00001506 }, /* GL_XOR */
-   { 39906, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
-   { 39925, 0x00008757 }, /* GL_YCBCR_MESA */
-   { 39939, 0x00000000 }, /* GL_ZERO */
-   { 39947, 0x00000D16 }, /* GL_ZOOM_X */
-   { 39957, 0x00000D17 }, /* GL_ZOOM_Y */
+   { 35605, 0x000088F4 }, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
+   { 35634, 0x00008071 }, /* GL_TEXTURE_DEPTH */
+   { 35651, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
+   { 35673, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
+   { 35699, 0x00002300 }, /* GL_TEXTURE_ENV */
+   { 35714, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
+   { 35735, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
+   { 35755, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
+   { 35781, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
+   { 35801, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
+   { 35818, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
+   { 35835, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
+   { 35852, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
+   { 35869, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
+   { 35894, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
+   { 35916, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
+   { 35942, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
+   { 35960, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
+   { 35986, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
+   { 36012, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
+   { 36042, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
+   { 36069, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
+   { 36094, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
+   { 36114, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
+   { 36138, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+   { 36165, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+   { 36192, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+   { 36219, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
+   { 36245, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
+   { 36275, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
+   { 36297, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
+   { 36315, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+   { 36345, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+   { 36373, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+   { 36401, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+   { 36429, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
+   { 36450, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
+   { 36469, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
+   { 36491, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
+   { 36510, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
+   { 36530, 0x000085B7 }, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
+   { 36560, 0x000085B8 }, /* GL_TEXTURE_RANGE_POINTER_APPLE */
+   { 36591, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
+   { 36616, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
+   { 36640, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
+   { 36660, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
+   { 36684, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
+   { 36704, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
+   { 36727, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */
+   { 36751, 0x000085BC }, /* GL_TEXTURE_STORAGE_HINT_APPLE */
+   { 36781, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
+   { 36806, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+   { 36840, 0x00001000 }, /* GL_TEXTURE_WIDTH */
+   { 36857, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
+   { 36875, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
+   { 36893, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
+   { 36911, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
+   { 36931, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
+   { 36950, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+   { 36979, 0x00001000 }, /* GL_TRANSFORM_BIT */
+   { 36996, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
+   { 37022, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
+   { 37052, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+   { 37084, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+   { 37114, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
+   { 37148, 0x0000862C }, /* GL_TRANSPOSE_NV */
+   { 37164, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+   { 37195, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
+   { 37230, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+   { 37258, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
+   { 37290, 0x00000004 }, /* GL_TRIANGLES */
+   { 37303, 0x00000006 }, /* GL_TRIANGLE_FAN */
+   { 37319, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
+   { 37340, 0x00000005 }, /* GL_TRIANGLE_STRIP */
+   { 37358, 0x00000001 }, /* GL_TRUE */
+   { 37366, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
+   { 37386, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
+   { 37409, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
+   { 37429, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
+   { 37450, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
+   { 37472, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
+   { 37494, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
+   { 37514, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
+   { 37535, 0x00001401 }, /* GL_UNSIGNED_BYTE */
+   { 37552, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+   { 37579, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
+   { 37602, 0x00001405 }, /* GL_UNSIGNED_INT */
+   { 37618, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
+   { 37645, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */
+   { 37666, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
+   { 37690, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+   { 37721, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
+   { 37745, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+   { 37773, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */
+   { 37796, 0x00001403 }, /* GL_UNSIGNED_SHORT */
+   { 37814, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+   { 37844, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+   { 37870, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+   { 37900, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+   { 37926, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
+   { 37950, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+   { 37978, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+   { 38006, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
+   { 38033, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+   { 38065, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
+   { 38096, 0x00008CA2 }, /* GL_UPPER_LEFT */
+   { 38110, 0x00002A20 }, /* GL_V2F */
+   { 38117, 0x00002A21 }, /* GL_V3F */
+   { 38124, 0x00008B83 }, /* GL_VALIDATE_STATUS */
+   { 38143, 0x00001F00 }, /* GL_VENDOR */
+   { 38153, 0x00001F02 }, /* GL_VERSION */
+   { 38164, 0x00008074 }, /* GL_VERTEX_ARRAY */
+   { 38180, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING */
+   { 38204, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
+   { 38234, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+   { 38265, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
+   { 38300, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
+   { 38324, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
+   { 38345, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
+   { 38368, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
+   { 38389, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+   { 38416, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+   { 38444, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+   { 38472, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+   { 38500, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+   { 38528, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+   { 38556, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+   { 38584, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+   { 38611, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+   { 38638, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+   { 38665, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+   { 38692, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+   { 38719, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+   { 38746, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+   { 38773, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+   { 38800, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+   { 38827, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+   { 38865, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
+   { 38907, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+   { 38938, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
+   { 38973, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+   { 39007, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
+   { 39045, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+   { 39076, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
+   { 39111, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+   { 39139, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
+   { 39171, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+   { 39201, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
+   { 39235, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+   { 39263, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
+   { 39295, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
+   { 39315, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
+   { 39337, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
+   { 39366, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
+   { 39387, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
+   { 39416, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
+   { 39449, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
+   { 39481, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+   { 39508, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
+   { 39539, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
+   { 39569, 0x00008B31 }, /* GL_VERTEX_SHADER */
+   { 39586, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
+   { 39607, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
+   { 39634, 0x00000BA2 }, /* GL_VIEWPORT */
+   { 39646, 0x00000800 }, /* GL_VIEWPORT_BIT */
+   { 39662, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
+   { 39682, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+   { 39713, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
+   { 39748, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+   { 39776, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+   { 39801, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+   { 39828, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+   { 39853, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
+   { 39877, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
+   { 39896, 0x000088B9 }, /* GL_WRITE_ONLY */
+   { 39910, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
+   { 39928, 0x00001506 }, /* GL_XOR */
+   { 39935, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
+   { 39954, 0x00008757 }, /* GL_YCBCR_MESA */
+   { 39968, 0x00000000 }, /* GL_ZERO */
+   { 39976, 0x00000D16 }, /* GL_ZOOM_X */
+   { 39986, 0x00000D17 }, /* GL_ZOOM_Y */
 };
 
 static const unsigned reduced_enums[1333] =
@@ -3730,9 +3732,9 @@ static const unsigned reduced_enums[1333] =
        689, /* GL_LINES */
        691, /* GL_LINE_LOOP */
        698, /* GL_LINE_STRIP */
-      1729, /* GL_TRIANGLES */
-      1732, /* GL_TRIANGLE_STRIP */
-      1730, /* GL_TRIANGLE_FAN */
+      1730, /* GL_TRIANGLES */
+      1733, /* GL_TRIANGLE_STRIP */
+      1731, /* GL_TRIANGLE_FAN */
       1267, /* GL_QUADS */
       1270, /* GL_QUAD_STRIP */
       1154, /* GL_POLYGON */
@@ -3866,13 +3868,13 @@ static const unsigned reduced_enums[1333] =
       1506, /* GL_STENCIL_WRITEMASK */
        841, /* GL_MATRIX_MODE */
       1009, /* GL_NORMALIZE */
-      1822, /* GL_VIEWPORT */
+      1823, /* GL_VIEWPORT */
        983, /* GL_MODELVIEW_STACK_DEPTH */
       1246, /* GL_PROJECTION_STACK_DEPTH */
-      1706, /* GL_TEXTURE_STACK_DEPTH */
+      1707, /* GL_TEXTURE_STACK_DEPTH */
        981, /* GL_MODELVIEW_MATRIX */
       1245, /* GL_PROJECTION_MATRIX */
-      1689, /* GL_TEXTURE_MATRIX */
+      1690, /* GL_TEXTURE_MATRIX */
         60, /* GL_ATTRIB_STACK_DEPTH */
        135, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
         43, /* GL_ALPHA_TEST */
@@ -3904,10 +3906,10 @@ static const unsigned reduced_enums[1333] =
        694, /* GL_LINE_SMOOTH_HINT */
       1164, /* GL_POLYGON_SMOOTH_HINT */
        522, /* GL_FOG_HINT */
-      1670, /* GL_TEXTURE_GEN_S */
-      1671, /* GL_TEXTURE_GEN_T */
-      1669, /* GL_TEXTURE_GEN_R */
-      1668, /* GL_TEXTURE_GEN_Q */
+      1671, /* GL_TEXTURE_GEN_S */
+      1672, /* GL_TEXTURE_GEN_T */
+      1670, /* GL_TEXTURE_GEN_R */
+      1669, /* GL_TEXTURE_GEN_Q */
       1107, /* GL_PIXEL_MAP_I_TO_I */
       1113, /* GL_PIXEL_MAP_S_TO_S */
       1109, /* GL_PIXEL_MAP_I_TO_R */
@@ -3928,12 +3930,12 @@ static const unsigned reduced_enums[1333] =
       1100, /* GL_PIXEL_MAP_G_TO_G_SIZE */
       1098, /* GL_PIXEL_MAP_B_TO_B_SIZE */
       1096, /* GL_PIXEL_MAP_A_TO_A_SIZE */
-      1741, /* GL_UNPACK_SWAP_BYTES */
-      1736, /* GL_UNPACK_LSB_FIRST */
-      1737, /* GL_UNPACK_ROW_LENGTH */
-      1740, /* GL_UNPACK_SKIP_ROWS */
-      1739, /* GL_UNPACK_SKIP_PIXELS */
-      1734, /* GL_UNPACK_ALIGNMENT */
+      1742, /* GL_UNPACK_SWAP_BYTES */
+      1737, /* GL_UNPACK_LSB_FIRST */
+      1738, /* GL_UNPACK_ROW_LENGTH */
+      1741, /* GL_UNPACK_SKIP_ROWS */
+      1740, /* GL_UNPACK_SKIP_PIXELS */
+      1735, /* GL_UNPACK_ALIGNMENT */
       1082, /* GL_PACK_SWAP_BYTES */
       1077, /* GL_PACK_LSB_FIRST */
       1078, /* GL_PACK_ROW_LENGTH */
@@ -3946,8 +3948,8 @@ static const unsigned reduced_enums[1333] =
        630, /* GL_INDEX_OFFSET */
       1293, /* GL_RED_SCALE */
       1291, /* GL_RED_BIAS */
-      1839, /* GL_ZOOM_X */
-      1840, /* GL_ZOOM_Y */
+      1840, /* GL_ZOOM_X */
+      1841, /* GL_ZOOM_Y */
        592, /* GL_GREEN_SCALE */
        590, /* GL_GREEN_BIAS */
         92, /* GL_BLUE_SCALE */
@@ -4011,8 +4013,8 @@ static const unsigned reduced_enums[1333] =
        478, /* GL_FEEDBACK_BUFFER_TYPE */
       1401, /* GL_SELECTION_BUFFER_POINTER */
       1402, /* GL_SELECTION_BUFFER_SIZE */
-      1711, /* GL_TEXTURE_WIDTH */
-      1675, /* GL_TEXTURE_HEIGHT */
+      1712, /* GL_TEXTURE_WIDTH */
+      1676, /* GL_TEXTURE_HEIGHT */
       1631, /* GL_TEXTURE_COMPONENTS */
       1615, /* GL_TEXTURE_BORDER_COLOR */
       1614, /* GL_TEXTURE_BORDER */
@@ -4032,11 +4034,11 @@ static const unsigned reduced_enums[1333] =
        243, /* GL_COMPILE */
        244, /* GL_COMPILE_AND_EXECUTE */
        119, /* GL_BYTE */
-      1742, /* GL_UNSIGNED_BYTE */
+      1743, /* GL_UNSIGNED_BYTE */
       1415, /* GL_SHORT */
-      1753, /* GL_UNSIGNED_SHORT */
+      1754, /* GL_UNSIGNED_SHORT */
        634, /* GL_INT */
-      1745, /* GL_UNSIGNED_INT */
+      1746, /* GL_UNSIGNED_INT */
        482, /* GL_FLOAT */
          1, /* GL_2_BYTES */
          5, /* GL_3_BYTES */
@@ -4048,7 +4050,7 @@ static const unsigned reduced_enums[1333] =
        297, /* GL_COPY */
         50, /* GL_AND_INVERTED */
       1007, /* GL_NOOP */
-      1835, /* GL_XOR */
+      1836, /* GL_XOR */
       1069, /* GL_OR */
       1008, /* GL_NOR */
        464, /* GL_EQUIV */
@@ -4092,9 +4094,9 @@ static const unsigned reduced_enums[1333] =
       1317, /* GL_REPLACE */
        616, /* GL_INCR */
        340, /* GL_DECR */
-      1768, /* GL_VENDOR */
+      1769, /* GL_VENDOR */
       1314, /* GL_RENDERER */
-      1769, /* GL_VERSION */
+      1770, /* GL_VERSION */
        468, /* GL_EXTENSIONS */
       1365, /* GL_S */
       1520, /* GL_T */
@@ -4102,13 +4104,13 @@ static const unsigned reduced_enums[1333] =
       1265, /* GL_Q */
        984, /* GL_MODULATE */
        339, /* GL_DECAL */
-      1665, /* GL_TEXTURE_ENV_MODE */
-      1664, /* GL_TEXTURE_ENV_COLOR */
-      1663, /* GL_TEXTURE_ENV */
+      1666, /* GL_TEXTURE_ENV_MODE */
+      1665, /* GL_TEXTURE_ENV_COLOR */
+      1664, /* GL_TEXTURE_ENV */
        469, /* GL_EYE_LINEAR */
       1031, /* GL_OBJECT_LINEAR */
       1450, /* GL_SPHERE_MAP */
-      1667, /* GL_TEXTURE_GEN_MODE */
+      1668, /* GL_TEXTURE_GEN_MODE */
       1033, /* GL_OBJECT_PLANE */
        470, /* GL_EYE_PLANE */
        999, /* GL_NEAREST */
@@ -4117,18 +4119,18 @@ static const unsigned reduced_enums[1333] =
        688, /* GL_LINEAR_MIPMAP_NEAREST */
       1002, /* GL_NEAREST_MIPMAP_LINEAR */
        687, /* GL_LINEAR_MIPMAP_LINEAR */
-      1688, /* GL_TEXTURE_MAG_FILTER */
-      1696, /* GL_TEXTURE_MIN_FILTER */
-      1713, /* GL_TEXTURE_WRAP_S */
-      1714, /* GL_TEXTURE_WRAP_T */
+      1689, /* GL_TEXTURE_MAG_FILTER */
+      1697, /* GL_TEXTURE_MIN_FILTER */
+      1714, /* GL_TEXTURE_WRAP_S */
+      1715, /* GL_TEXTURE_WRAP_T */
        125, /* GL_CLAMP */
       1316, /* GL_REPEAT */
       1162, /* GL_POLYGON_OFFSET_UNITS */
       1161, /* GL_POLYGON_OFFSET_POINT */
       1160, /* GL_POLYGON_OFFSET_LINE */
       1278, /* GL_R3_G3_B2 */
-      1765, /* GL_V2F */
-      1766, /* GL_V3F */
+      1766, /* GL_V2F */
+      1767, /* GL_V3F */
        122, /* GL_C4UB_V2F */
        123, /* GL_C4UB_V3F */
        120, /* GL_C3F_V3F */
@@ -4201,11 +4203,11 @@ static const unsigned reduced_enums[1333] =
        935, /* GL_MINMAX_FORMAT */
        937, /* GL_MINMAX_SINK */
       1528, /* GL_TABLE_TOO_LARGE_EXT */
-      1744, /* GL_UNSIGNED_BYTE_3_3_2 */
-      1755, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-      1757, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-      1750, /* GL_UNSIGNED_INT_8_8_8_8 */
-      1746, /* GL_UNSIGNED_INT_10_10_10_2 */
+      1745, /* GL_UNSIGNED_BYTE_3_3_2 */
+      1756, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+      1758, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+      1751, /* GL_UNSIGNED_INT_8_8_8_8 */
+      1747, /* GL_UNSIGNED_INT_10_10_10_2 */
       1159, /* GL_POLYGON_OFFSET_FILL */
       1158, /* GL_POLYGON_OFFSET_FACTOR */
       1157, /* GL_POLYGON_OFFSET_BIAS */
@@ -4243,39 +4245,39 @@ static const unsigned reduced_enums[1333] =
       1325, /* GL_RGB10_A2 */
       1343, /* GL_RGBA12 */
       1345, /* GL_RGBA16 */
-      1703, /* GL_TEXTURE_RED_SIZE */
-      1673, /* GL_TEXTURE_GREEN_SIZE */
+      1704, /* GL_TEXTURE_RED_SIZE */
+      1674, /* GL_TEXTURE_GREEN_SIZE */
       1612, /* GL_TEXTURE_BLUE_SIZE */
       1599, /* GL_TEXTURE_ALPHA_SIZE */
-      1686, /* GL_TEXTURE_LUMINANCE_SIZE */
-      1677, /* GL_TEXTURE_INTENSITY_SIZE */
+      1687, /* GL_TEXTURE_LUMINANCE_SIZE */
+      1678, /* GL_TEXTURE_INTENSITY_SIZE */
       1318, /* GL_REPLACE_EXT */
       1253, /* GL_PROXY_TEXTURE_1D */
       1256, /* GL_PROXY_TEXTURE_2D */
-      1709, /* GL_TEXTURE_TOO_LARGE_EXT */
-      1698, /* GL_TEXTURE_PRIORITY */
-      1705, /* GL_TEXTURE_RESIDENT */
+      1710, /* GL_TEXTURE_TOO_LARGE_EXT */
+      1699, /* GL_TEXTURE_PRIORITY */
+      1706, /* GL_TEXTURE_RESIDENT */
       1602, /* GL_TEXTURE_BINDING_1D */
       1604, /* GL_TEXTURE_BINDING_2D */
       1606, /* GL_TEXTURE_BINDING_3D */
       1079, /* GL_PACK_SKIP_IMAGES */
       1075, /* GL_PACK_IMAGE_HEIGHT */
-      1738, /* GL_UNPACK_SKIP_IMAGES */
-      1735, /* GL_UNPACK_IMAGE_HEIGHT */
+      1739, /* GL_UNPACK_SKIP_IMAGES */
+      1736, /* GL_UNPACK_IMAGE_HEIGHT */
       1598, /* GL_TEXTURE_3D */
       1259, /* GL_PROXY_TEXTURE_3D */
-      1660, /* GL_TEXTURE_DEPTH */
-      1712, /* GL_TEXTURE_WRAP_R */
+      1661, /* GL_TEXTURE_DEPTH */
+      1713, /* GL_TEXTURE_WRAP_R */
        844, /* GL_MAX_3D_TEXTURE_SIZE */
-      1770, /* GL_VERTEX_ARRAY */
+      1771, /* GL_VERTEX_ARRAY */
       1010, /* GL_NORMAL_ARRAY */
        147, /* GL_COLOR_ARRAY */
        620, /* GL_INDEX_ARRAY */
       1639, /* GL_TEXTURE_COORD_ARRAY */
        453, /* GL_EDGE_FLAG_ARRAY */
-      1776, /* GL_VERTEX_ARRAY_SIZE */
-      1778, /* GL_VERTEX_ARRAY_TYPE */
-      1777, /* GL_VERTEX_ARRAY_STRIDE */
+      1777, /* GL_VERTEX_ARRAY_SIZE */
+      1779, /* GL_VERTEX_ARRAY_TYPE */
+      1778, /* GL_VERTEX_ARRAY_STRIDE */
       1015, /* GL_NORMAL_ARRAY_TYPE */
       1014, /* GL_NORMAL_ARRAY_STRIDE */
        151, /* GL_COLOR_ARRAY_SIZE */
@@ -4287,7 +4289,7 @@ static const unsigned reduced_enums[1333] =
       1645, /* GL_TEXTURE_COORD_ARRAY_TYPE */
       1644, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
        457, /* GL_EDGE_FLAG_ARRAY_STRIDE */
-      1775, /* GL_VERTEX_ARRAY_POINTER */
+      1776, /* GL_VERTEX_ARRAY_POINTER */
       1013, /* GL_NORMAL_ARRAY_POINTER */
        150, /* GL_COLOR_ARRAY_POINTER */
        623, /* GL_INDEX_ARRAY_POINTER */
@@ -4339,7 +4341,7 @@ static const unsigned reduced_enums[1333] =
         71, /* GL_BGRA */
        866, /* GL_MAX_ELEMENTS_VERTICES */
        865, /* GL_MAX_ELEMENTS_INDICES */
-      1676, /* GL_TEXTURE_INDEX_SIZE_EXT */
+      1677, /* GL_TEXTURE_INDEX_SIZE_EXT */
        144, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
       1141, /* GL_POINT_SIZE_MIN */
       1137, /* GL_POINT_SIZE_MAX */
@@ -4347,10 +4349,10 @@ static const unsigned reduced_enums[1333] =
       1127, /* GL_POINT_DISTANCE_ATTENUATION */
        126, /* GL_CLAMP_TO_BORDER */
        129, /* GL_CLAMP_TO_EDGE */
-      1697, /* GL_TEXTURE_MIN_LOD */
-      1695, /* GL_TEXTURE_MAX_LOD */
+      1698, /* GL_TEXTURE_MIN_LOD */
+      1696, /* GL_TEXTURE_MAX_LOD */
       1601, /* GL_TEXTURE_BASE_LEVEL */
-      1694, /* GL_TEXTURE_MAX_LEVEL */
+      1695, /* GL_TEXTURE_MAX_LEVEL */
        613, /* GL_IGNORE_BORDER_HP */
        274, /* GL_CONSTANT_BORDER_HP */
       1319, /* GL_REPLICATE_BORDER_HP */
@@ -4370,24 +4372,24 @@ static const unsigned reduced_enums[1333] =
       1206, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
       1203, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
       1205, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
-      1684, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-      1685, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-      1683, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+      1685, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+      1686, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+      1684, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
        583, /* GL_GENERATE_MIPMAP */
        584, /* GL_GENERATE_MIPMAP_HINT */
        525, /* GL_FOG_OFFSET_SGIX */
        526, /* GL_FOG_OFFSET_VALUE_SGIX */
       1630, /* GL_TEXTURE_COMPARE_SGIX */
       1629, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-      1680, /* GL_TEXTURE_LEQUAL_R_SGIX */
-      1672, /* GL_TEXTURE_GEQUAL_R_SGIX */
+      1681, /* GL_TEXTURE_LEQUAL_R_SGIX */
+      1673, /* GL_TEXTURE_GEQUAL_R_SGIX */
        356, /* GL_DEPTH_COMPONENT16 */
        359, /* GL_DEPTH_COMPONENT24 */
        362, /* GL_DEPTH_COMPONENT32 */
        304, /* GL_CULL_VERTEX_EXT */
        306, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
        305, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
-      1832, /* GL_WRAP_BORDER_SUN */
+      1833, /* GL_WRAP_BORDER_SUN */
       1623, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
        678, /* GL_LIGHT_MODEL_COLOR_CONTROL */
       1417, /* GL_SINGLE_COLOR */
@@ -4405,16 +4407,16 @@ static const unsigned reduced_enums[1333] =
        569, /* GL_FRAMEBUFFER_UNDEFINED */
        369, /* GL_DEPTH_STENCIL_ATTACHMENT */
        619, /* GL_INDEX */
-      1743, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-      1758, /* GL_UNSIGNED_SHORT_5_6_5 */
-      1759, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-      1756, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-      1754, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-      1751, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-      1749, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-      1692, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-      1693, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-      1691, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+      1744, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+      1759, /* GL_UNSIGNED_SHORT_5_6_5 */
+      1760, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+      1757, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+      1755, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+      1752, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+      1750, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+      1693, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+      1694, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+      1692, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
        940, /* GL_MIRRORED_REPEAT */
       1360, /* GL_RGB_S3TC */
       1335, /* GL_RGB4_S3TC */
@@ -4482,10 +4484,10 @@ static const unsigned reduced_enums[1333] =
         18, /* GL_ACTIVE_TEXTURE */
        132, /* GL_CLIENT_ACTIVE_TEXTURE */
        918, /* GL_MAX_TEXTURE_UNITS */
-      1722, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-      1725, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-      1727, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-      1719, /* GL_TRANSPOSE_COLOR_MATRIX */
+      1723, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+      1726, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+      1728, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+      1720, /* GL_TRANSPOSE_COLOR_MATRIX */
       1518, /* GL_SUBTRACT */
        906, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
        246, /* GL_COMPRESSED_ALPHA */
@@ -4495,17 +4497,17 @@ static const unsigned reduced_enums[1333] =
        254, /* GL_COMPRESSED_RGB */
        255, /* GL_COMPRESSED_RGBA */
       1637, /* GL_TEXTURE_COMPRESSION_HINT */
-      1701, /* GL_TEXTURE_RECTANGLE_ARB */
+      1702, /* GL_TEXTURE_RECTANGLE_ARB */
       1609, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
       1263, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
        904, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
        368, /* GL_DEPTH_STENCIL */
-      1747, /* GL_UNSIGNED_INT_24_8 */
+      1748, /* GL_UNSIGNED_INT_24_8 */
        914, /* GL_MAX_TEXTURE_LOD_BIAS */
-      1690, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+      1691, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
        915, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
-      1666, /* GL_TEXTURE_FILTER_CONTROL */
-      1681, /* GL_TEXTURE_LOD_BIAS */
+      1667, /* GL_TEXTURE_FILTER_CONTROL */
+      1682, /* GL_TEXTURE_LOD_BIAS */
        231, /* GL_COMBINE4 */
        908, /* GL_MAX_SHININESS_NV */
        909, /* GL_MAX_SPOT_EXPONENT_NV */
@@ -4553,32 +4555,32 @@ static const unsigned reduced_enums[1333] =
       1055, /* GL_OPERAND1_ALPHA */
       1061, /* GL_OPERAND2_ALPHA */
       1067, /* GL_OPERAND3_ALPHA_NV */
-      1771, /* GL_VERTEX_ARRAY_BINDING */
-      1699, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
-      1700, /* GL_TEXTURE_RANGE_POINTER_APPLE */
-      1836, /* GL_YCBCR_422_APPLE */
-      1760, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-      1762, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-      1708, /* GL_TEXTURE_STORAGE_HINT_APPLE */
+      1772, /* GL_VERTEX_ARRAY_BINDING */
+      1700, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
+      1701, /* GL_TEXTURE_RANGE_POINTER_APPLE */
+      1837, /* GL_YCBCR_422_APPLE */
+      1761, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+      1763, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+      1709, /* GL_TEXTURE_STORAGE_HINT_APPLE */
       1509, /* GL_STORAGE_PRIVATE_APPLE */
       1508, /* GL_STORAGE_CACHED_APPLE */
       1510, /* GL_STORAGE_SHARED_APPLE */
       1419, /* GL_SLICE_ACCUM_SUN */
       1269, /* GL_QUAD_MESH_SUN */
-      1731, /* GL_TRIANGLE_MESH_SUN */
-      1810, /* GL_VERTEX_PROGRAM_ARB */
-      1821, /* GL_VERTEX_STATE_PROGRAM_NV */
-      1797, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-      1803, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-      1805, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-      1807, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+      1732, /* GL_TRIANGLE_MESH_SUN */
+      1811, /* GL_VERTEX_PROGRAM_ARB */
+      1822, /* GL_VERTEX_STATE_PROGRAM_NV */
+      1798, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+      1804, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+      1806, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+      1808, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
        332, /* GL_CURRENT_VERTEX_ATTRIB */
       1223, /* GL_PROGRAM_LENGTH_ARB */
       1237, /* GL_PROGRAM_STRING_ARB */
        982, /* GL_MODELVIEW_PROJECTION_NV */
        612, /* GL_IDENTITY_NV */
        659, /* GL_INVERSE_NV */
-      1724, /* GL_TRANSPOSE_NV */
+      1725, /* GL_TRANSPOSE_NV */
        660, /* GL_INVERSE_TRANSPOSE_NV */
        890, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
        889, /* GL_MAX_PROGRAM_MATRICES_ARB */
@@ -4592,33 +4594,33 @@ static const unsigned reduced_enums[1333] =
        833, /* GL_MATRIX7_NV */
        316, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
        313, /* GL_CURRENT_MATRIX_ARB */
-      1813, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-      1816, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+      1814, /* GL_VERTEX_PROGRAM_POINT_SIZE */
+      1817, /* GL_VERTEX_PROGRAM_TWO_SIDE */
       1235, /* GL_PROGRAM_PARAMETER_NV */
-      1801, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+      1802, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
       1239, /* GL_PROGRAM_TARGET_NV */
       1236, /* GL_PROGRAM_RESIDENT_NV */
-      1716, /* GL_TRACK_MATRIX_NV */
-      1717, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-      1811, /* GL_VERTEX_PROGRAM_BINDING_NV */
+      1717, /* GL_TRACK_MATRIX_NV */
+      1718, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+      1812, /* GL_VERTEX_PROGRAM_BINDING_NV */
       1217, /* GL_PROGRAM_ERROR_POSITION_ARB */
        353, /* GL_DEPTH_CLAMP_NV */
-      1779, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-      1786, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-      1787, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-      1788, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-      1789, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-      1790, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-      1791, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-      1792, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-      1793, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-      1794, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-      1780, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-      1781, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-      1782, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-      1783, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-      1784, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-      1785, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+      1780, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+      1787, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+      1788, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+      1789, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+      1790, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+      1791, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+      1792, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+      1793, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+      1794, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+      1795, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+      1781, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+      1782, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+      1783, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+      1784, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+      1785, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+      1786, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
        745, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
        752, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
        753, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
@@ -4657,14 +4659,14 @@ static const unsigned reduced_enums[1333] =
        268, /* GL_COMPRESSED_TEXTURE_FORMATS */
        930, /* GL_MAX_VERTEX_UNITS_ARB */
         22, /* GL_ACTIVE_VERTEX_UNITS_ARB */
-      1831, /* GL_WEIGHT_SUM_UNITY_ARB */
-      1809, /* GL_VERTEX_BLEND_ARB */
+      1832, /* GL_WEIGHT_SUM_UNITY_ARB */
+      1810, /* GL_VERTEX_BLEND_ARB */
        334, /* GL_CURRENT_WEIGHT_ARB */
-      1830, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-      1829, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-      1828, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-      1827, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-      1824, /* GL_WEIGHT_ARRAY_ARB */
+      1831, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+      1830, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+      1829, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+      1828, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+      1825, /* GL_WEIGHT_ARRAY_ARB */
        381, /* GL_DOT3_RGB */
        382, /* GL_DOT3_RGBA */
        262, /* GL_COMPRESSED_RGB_FXT1_3DFX */
@@ -4709,7 +4711,7 @@ static const unsigned reduced_enums[1333] =
        985, /* GL_MODULATE_ADD_ATI */
        986, /* GL_MODULATE_SIGNED_ADD_ATI */
        987, /* GL_MODULATE_SUBTRACT_ATI */
-      1837, /* GL_YCBCR_MESA */
+      1838, /* GL_YCBCR_MESA */
       1076, /* GL_PACK_INVERT_MESA */
        337, /* GL_DEBUG_OBJECT_MESA */
        338, /* GL_DEBUG_PRINT_MESA */
@@ -4769,7 +4771,7 @@ static const unsigned reduced_enums[1333] =
        840, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
        839, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
        837, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
-      1661, /* GL_TEXTURE_DEPTH_SIZE */
+      1662, /* GL_TEXTURE_DEPTH_SIZE */
        374, /* GL_DEPTH_TEXTURE_MODE */
       1627, /* GL_TEXTURE_COMPARE_MODE */
       1625, /* GL_TEXTURE_COMPARE_FUNC */
@@ -4782,7 +4784,7 @@ static const unsigned reduced_enums[1333] =
       1273, /* GL_QUERY_RESULT */
       1275, /* GL_QUERY_RESULT_AVAILABLE */
        924, /* GL_MAX_VERTEX_ATTRIBS */
-      1799, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+      1800, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
        372, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
        371, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
        910, /* GL_MAX_TEXTURE_COORDS */
@@ -4790,14 +4792,14 @@ static const unsigned reduced_enums[1333] =
       1219, /* GL_PROGRAM_ERROR_STRING_ARB */
       1221, /* GL_PROGRAM_FORMAT_ASCII_ARB */
       1220, /* GL_PROGRAM_FORMAT_ARB */
-      1710, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+      1711, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
        351, /* GL_DEPTH_BOUNDS_TEST_EXT */
        350, /* GL_DEPTH_BOUNDS_EXT */
         52, /* GL_ARRAY_BUFFER */
        458, /* GL_ELEMENT_ARRAY_BUFFER */
         53, /* GL_ARRAY_BUFFER_BINDING */
        459, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
-      1773, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+      1774, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
       1011, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
        148, /* GL_COLOR_ARRAY_BUFFER_BINDING */
        621, /* GL_INDEX_ARRAY_BUFFER_BINDING */
@@ -4805,8 +4807,8 @@ static const unsigned reduced_enums[1333] =
        454, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
       1394, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
        507, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
-      1825, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-      1795, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+      1826, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+      1796, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
       1222, /* GL_PROGRAM_INSTRUCTIONS_ARB */
        885, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
       1228, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
@@ -4830,14 +4832,14 @@ static const unsigned reduced_enums[1333] =
        886, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
        882, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
       1243, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-      1721, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+      1722, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
       1284, /* GL_READ_ONLY */
-      1833, /* GL_WRITE_ONLY */
+      1834, /* GL_WRITE_ONLY */
       1286, /* GL_READ_WRITE */
        101, /* GL_BUFFER_ACCESS */
        104, /* GL_BUFFER_MAPPED */
        106, /* GL_BUFFER_MAP_POINTER */
-      1715, /* GL_TIME_ELAPSED_EXT */
+      1716, /* GL_TIME_ELAPSED_EXT */
        796, /* GL_MATRIX0_ARB */
        808, /* GL_MATRIX1_ARB */
        820, /* GL_MATRIX2_ARB */
@@ -4884,8 +4886,8 @@ static const unsigned reduced_enums[1333] =
       1117, /* GL_PIXEL_PACK_BUFFER_BINDING */
       1121, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
        345, /* GL_DEPTH24_STENCIL8 */
-      1707, /* GL_TEXTURE_STENCIL_SIZE */
-       883, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
+      1708, /* GL_TEXTURE_STENCIL_SIZE */
+      1660, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
        881, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
        884, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
        888, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
@@ -4898,7 +4900,7 @@ static const unsigned reduced_enums[1333] =
        108, /* GL_BUFFER_SERIALIZED_MODIFY_APPLE */
        103, /* GL_BUFFER_FLUSHING_UNMAP_APPLE */
        530, /* GL_FRAGMENT_SHADER */
-      1819, /* GL_VERTEX_SHADER */
+      1820, /* GL_VERTEX_SHADER */
       1233, /* GL_PROGRAM_OBJECT_ARB */
       1407, /* GL_SHADER_OBJECT_ARB */
        869, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
@@ -4936,7 +4938,7 @@ static const unsigned reduced_enums[1333] =
        343, /* GL_DELETE_STATUS */
        245, /* GL_COMPILE_STATUS */
        703, /* GL_LINK_STATUS */
-      1767, /* GL_VALIDATE_STATUS */
+      1768, /* GL_VALIDATE_STATUS */
        633, /* GL_INFO_LOG_LENGTH */
         55, /* GL_ATTACHED_SHADERS */
         20, /* GL_ACTIVE_UNIFORMS */
@@ -4959,7 +4961,7 @@ static const unsigned reduced_enums[1333] =
       1089, /* GL_PALETTE8_RGB5_A1_OES */
        615, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
        614, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
-      1752, /* GL_UNSIGNED_NORMALIZED */
+      1753, /* GL_UNSIGNED_NORMALIZED */
       1595, /* GL_TEXTURE_1D_ARRAY_EXT */
       1254, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
       1597, /* GL_TEXTURE_2D_ARRAY_EXT */
@@ -4980,7 +4982,7 @@ static const unsigned reduced_enums[1333] =
        265, /* GL_COMPRESSED_SLUMINANCE_ALPHA */
       1150, /* GL_POINT_SPRITE_COORD_ORIGIN */
        711, /* GL_LOWER_LEFT */
-      1764, /* GL_UPPER_LEFT */
+      1765, /* GL_UPPER_LEFT */
       1486, /* GL_STENCIL_BACK_REF */
       1487, /* GL_STENCIL_BACK_VALUE_MASK */
       1488, /* GL_STENCIL_BACK_WRITEMASK */
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 516159bbf2..79f06a3c40 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -1879,6 +1879,10 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          CHECK_EXT1(APPLE_vertex_array_object, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Array.ArrayObj->Name);
          break;
+      case GL_TEXTURE_CUBE_MAP_SEAMLESS:
+         CHECK_EXT1(ARB_seamless_cube_map, "GetBooleanv");
+         params[0] = ctx->Texture.CubeMapSeamless;
+         break;
       default:
          _mesa_error(ctx, GL_INVALID_ENUM, "glGetBooleanv(pname=0x%x)", pname);
    }
@@ -3701,6 +3705,10 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          CHECK_EXT1(APPLE_vertex_array_object, "GetFloatv");
          params[0] = (GLfloat)(ctx->Array.ArrayObj->Name);
          break;
+      case GL_TEXTURE_CUBE_MAP_SEAMLESS:
+         CHECK_EXT1(ARB_seamless_cube_map, "GetFloatv");
+         params[0] = BOOLEAN_TO_FLOAT(ctx->Texture.CubeMapSeamless);
+         break;
       default:
          _mesa_error(ctx, GL_INVALID_ENUM, "glGetFloatv(pname=0x%x)", pname);
    }
@@ -5523,6 +5531,10 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          CHECK_EXT1(APPLE_vertex_array_object, "GetIntegerv");
          params[0] = ctx->Array.ArrayObj->Name;
          break;
+      case GL_TEXTURE_CUBE_MAP_SEAMLESS:
+         CHECK_EXT1(ARB_seamless_cube_map, "GetIntegerv");
+         params[0] = BOOLEAN_TO_INT(ctx->Texture.CubeMapSeamless);
+         break;
       default:
          _mesa_error(ctx, GL_INVALID_ENUM, "glGetIntegerv(pname=0x%x)", pname);
    }
-- 
cgit v1.2.3


From b062a119ff5fa06fe7b2e40262829f93cde63a96 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 18 Aug 2009 09:42:38 -0600
Subject: mesa: call FLUSH_CURRENT() for GL_CURRENT_TEXTURE_COORDS query

---
 src/mesa/main/get.c      | 3 +++
 src/mesa/main/get_gen.py | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 79f06a3c40..d0c9cea00c 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -276,6 +276,7 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
       case GL_CURRENT_TEXTURE_COORDS:
          {
          const GLuint texUnit = ctx->Texture.CurrentUnit;
+         FLUSH_CURRENT(ctx, 0);
          params[0] = FLOAT_TO_BOOLEAN(ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][0]);
          params[1] = FLOAT_TO_BOOLEAN(ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][1]);
          params[2] = FLOAT_TO_BOOLEAN(ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][2]);
@@ -2102,6 +2103,7 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
       case GL_CURRENT_TEXTURE_COORDS:
          {
          const GLuint texUnit = ctx->Texture.CurrentUnit;
+         FLUSH_CURRENT(ctx, 0);
          params[0] = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][0];
          params[1] = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][1];
          params[2] = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][2];
@@ -3928,6 +3930,7 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
       case GL_CURRENT_TEXTURE_COORDS:
          {
          const GLuint texUnit = ctx->Texture.CurrentUnit;
+         FLUSH_CURRENT(ctx, 0);
          params[0] = IROUND(ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][0]);
          params[1] = IROUND(ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][1]);
          params[2] = IROUND(ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][2]);
diff --git a/src/mesa/main/get_gen.py b/src/mesa/main/get_gen.py
index e9c8226d08..97dc785020 100644
--- a/src/mesa/main/get_gen.py
+++ b/src/mesa/main/get_gen.py
@@ -176,7 +176,8 @@ StateVars = [
 	   "ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][1]",
 	   "ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][2]",
 	   "ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][3]"],
-	  "const GLuint texUnit = ctx->Texture.CurrentUnit;", None ),
+	  """const GLuint texUnit = ctx->Texture.CurrentUnit;
+         FLUSH_CURRENT(ctx, 0);""", None ),
 	( "GL_DEPTH_BIAS", GLfloat, ["ctx->Pixel.DepthBias"], "", None ),
 	( "GL_DEPTH_BITS", GLint, ["ctx->DrawBuffer->Visual.depthBits"],
 	  "", None ),
-- 
cgit v1.2.3


From ee0984e299f7a48fbd3a0172ec9c471e0e8cbb92 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 18 Aug 2009 17:39:55 -0600
Subject: mesa: when emitting vertex program fog, set yzw=0,0,1

Fixes piglit fp-fog failure with gallium.
---
 src/mesa/main/ffvertex_prog.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index 80dde4b5aa..8e21a27f89 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -1306,7 +1306,9 @@ static void build_fog( struct tnl_program *p )
       input = swizzle1(register_input(p, VERT_ATTRIB_FOG), X);
    }
 
+   /* result.fog = {abs(f),0,0,1}; */
    emit_op1(p, OPCODE_ABS, fog, WRITEMASK_X, input);
+   emit_op1(p, OPCODE_MOV, fog, WRITEMASK_YZW, get_identity_param(p));
 }
 
 
-- 
cgit v1.2.3


From 39ec4a9253197c4507d53ce9a3c1d8963d8f5cea Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 20 Aug 2009 08:10:14 -0600
Subject: mesa: add GL_DEPTH_STENCIL to glCopyPixels error check

Plus, add a comment about 'type' error checking.
See bug 19087.
---
 src/mesa/main/drawpix.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index 6d31f32443..67311f71a2 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -152,7 +152,14 @@ _mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height,
       return;
    }
 
-   if (type != GL_COLOR && type != GL_DEPTH && type != GL_STENCIL) {
+   /* Note: more detailed 'type' checking is done by the
+    * _mesa_source/dest_buffer_exists() calls below.  That's where we
+    * check if the stencil buffer exists, etc.
+    */
+   if (type != GL_COLOR &&
+       type != GL_DEPTH &&
+       type != GL_STENCIL &&
+       type != GL_DEPTH_STENCIL) {
       _mesa_error(ctx, GL_INVALID_ENUM, "glCopyPixels(type=%s)",
                   _mesa_lookup_enum_by_nr(type));
       return;
-- 
cgit v1.2.3


From 2050baba9692600da7038dd18cbfee794caf4bf4 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 25 Aug 2009 17:37:38 -0600
Subject: mesa: use gl_texture_index type for gl_program::SamplerTargets

---
 src/mesa/main/mtypes.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 2d497ff2c6..53dc6360ea 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1799,7 +1799,7 @@ struct gl_program
    /** Map from sampler unit to texture unit (set by glUniform1i()) */
    GLubyte SamplerUnits[MAX_SAMPLERS];
    /** Which texture target is being sampled (TEXTURE_1D/2D/3D/etc_INDEX) */
-   GLubyte SamplerTargets[MAX_SAMPLERS];
+   gl_texture_index SamplerTargets[MAX_SAMPLERS];
 
    /** Logical counts */
    /*@{*/
-- 
cgit v1.2.3


From a088e5631d21fa41e8218feead2933ab3d2ddba0 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 25 Aug 2009 17:43:54 -0600
Subject: mesa: validate shader before drawing (for debugging, disabled)

---
 src/mesa/main/context.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 38ec418809..a9e520716d 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1595,6 +1595,16 @@ _mesa_valid_to_render(GLcontext *ctx, const char *where)
                      "%s(shader not linked), where");
          return GL_FALSE;
       }
+#if 0 /* not normally enabled */
+      {
+         char errMsg[100];
+         if (!_mesa_validate_shader_program(ctx, ctx->Shader.CurrentProgram,
+                                            errMsg)) {
+            _mesa_warning(ctx, "Shader program %u is invalid: %s",
+                          ctx->Shader.CurrentProgram->Name, errMsg);
+         }
+      }
+#endif
    }
    else {
       if (ctx->VertexProgram.Enabled && !ctx->VertexProgram._Enabled) {
-- 
cgit v1.2.3


From eabe12df44a41e97fb5736959e8864ddbd01be14 Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Mon, 24 Aug 2009 12:54:48 -0700
Subject: ARB prog: Change handling of program parameter limits

Several changes are made to program parameter limits.  Several of the
non-NATIVE limits are set higher.  All of the NATIVE limits are set to
zero in the core Mesa code.  Each driver must set the actual value in
its context creation routine.  If the NATIVE value remains zero, this
indicates that hardware shaders may not be supported.

Each of the preceeding changes matches the bahavior of Apple's shader
assembler, so it seems safe.

Finally, we limit the value of MaxEnvParams to be no greater than
MaxNativeAttribs.  At least one case has been found where an
application does the wrong thing if MaxNativeAttribs < MaxEnvParams.

See also bugzilla #23490.
---
 src/mesa/drivers/dri/i915/i915_context.c |  3 ++
 src/mesa/drivers/dri/i965/brw_context.c  | 27 ++++++++++++++-
 src/mesa/main/config.h                   | 56 ++++++++++++++++++++++----------
 src/mesa/main/context.c                  | 22 +++++++------
 4 files changed, 80 insertions(+), 28 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/i915/i915_context.c b/src/mesa/drivers/dri/i915/i915_context.c
index bb08cf8d18..be47ace65e 100644
--- a/src/mesa/drivers/dri/i915/i915_context.c
+++ b/src/mesa/drivers/dri/i915/i915_context.c
@@ -166,6 +166,9 @@ i915CreateContext(const __GLcontextModes * mesaVis,
    ctx->Const.FragmentProgram.MaxNativeTexIndirections =
       I915_MAX_TEX_INDIRECT;
    ctx->Const.FragmentProgram.MaxNativeAddressRegs = 0; /* I don't think we have one */
+   ctx->Const.FragmentProgram.MaxEnvParams =
+      MIN2(ctx->Const.FragmentProgram.MaxNativeParameters,
+	   ctx->Const.FragmentProgram.MaxEnvParams);
 
    ctx->FragmentProgram._MaintainTexEnvProgram = GL_TRUE;
 
diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
index 4dbe551d83..21c0ad16ab 100644
--- a/src/mesa/drivers/dri/i965/brw_context.c
+++ b/src/mesa/drivers/dri/i965/brw_context.c
@@ -126,7 +126,32 @@ GLboolean brwCreateContext( const __GLcontextModes *mesaVis,
    /* We want the GLSL compiler to emit code that uses condition codes */
    ctx->Shader.EmitCondCodes = GL_TRUE;
 
-/*    ctx->Const.MaxNativeVertexProgramTemps = 32; */
+   ctx->Const.VertexProgram.MaxNativeInstructions = (16 * 1024);
+   ctx->Const.VertexProgram.MaxAluInstructions = 0;
+   ctx->Const.VertexProgram.MaxTexInstructions = 0;
+   ctx->Const.VertexProgram.MaxTexIndirections = 0;
+   ctx->Const.VertexProgram.MaxNativeAluInstructions = 0;
+   ctx->Const.VertexProgram.MaxNativeTexInstructions = 0;
+   ctx->Const.VertexProgram.MaxNativeTexIndirections = 0;
+   ctx->Const.VertexProgram.MaxNativeAttribs = 16;
+   ctx->Const.VertexProgram.MaxNativeTemps = 256;
+   ctx->Const.VertexProgram.MaxNativeAddressRegs = 1;
+   ctx->Const.VertexProgram.MaxNativeParameters = 96;
+   ctx->Const.VertexProgram.MaxEnvParams =
+      MIN2(ctx->Const.VertexProgram.MaxNativeParameters,
+	   ctx->Const.VertexProgram.MaxEnvParams);
+
+   ctx->Const.FragmentProgram.MaxNativeInstructions = (16 * 1024);
+   ctx->Const.FragmentProgram.MaxNativeAluInstructions = (16 * 1024);
+   ctx->Const.FragmentProgram.MaxNativeTexInstructions = (16 * 1024);
+   ctx->Const.FragmentProgram.MaxNativeTexIndirections = (16 * 1024);
+   ctx->Const.FragmentProgram.MaxNativeAttribs = 12;
+   ctx->Const.FragmentProgram.MaxNativeTemps = 256;
+   ctx->Const.FragmentProgram.MaxNativeAddressRegs = 0;
+   ctx->Const.FragmentProgram.MaxNativeParameters = 64;
+   ctx->Const.FragmentProgram.MaxEnvParams =
+      MIN2(ctx->Const.FragmentProgram.MaxNativeParameters,
+	   ctx->Const.FragmentProgram.MaxEnvParams);
 
    brw_init_state( brw );
 
diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index e4995c35c4..8a09efdb53 100644
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -170,9 +170,48 @@
 /** For GL_EXT_texture_lod_bias (typically MAX_TEXTURE_LEVELS - 1) */
 #define MAX_TEXTURE_LOD_BIAS 12.0
 
+/** For any program target/extension */
+/*@{*/
+#define MAX_PROGRAM_INSTRUCTIONS       (16 * 1024)
+
+/**
+ * Per-program constants (power of two)
+ *
+ * \c MAX_PROGRAM_LOCAL_PARAMS and \c MAX_UNIFORMS are just the assmebly shader
+ * and GLSL shader names for the same thing.  They should \b always have the
+ * same value.  Each refers to the number of vec4 values supplied as
+ * per-program parameters.
+ */
+/*@{*/
+#define MAX_PROGRAM_LOCAL_PARAMS       1024
+#define MAX_UNIFORMS                   1024
+/*@}*/
+
+/**
+ * Per-context constants (power of two)
+ *
+ * \note
+ * This value should always be less than or equal to \c MAX_PROGRAM_LOCAL_PARAMS
+ * and \c MAX_VERTEX_PROGRAM_PARAMS.  Otherwise some applications will make
+ * incorrect assumptions.
+ */
+#define MAX_PROGRAM_ENV_PARAMS         256
+
+#define MAX_PROGRAM_MATRICES           8
+#define MAX_PROGRAM_MATRIX_STACK_DEPTH 4
+#define MAX_PROGRAM_CALL_DEPTH         8
+#define MAX_PROGRAM_TEMPS              256
+#define MAX_PROGRAM_ADDRESS_REGS       2
+#define MAX_VARYING                    16    /**< number of float[4] vectors */
+#define MAX_SAMPLERS                   MAX_TEXTURE_IMAGE_UNITS
+#define MAX_PROGRAM_INPUTS             32
+#define MAX_PROGRAM_OUTPUTS            32
+/*@}*/
+
 /** For GL_ARB_vertex_program */
 /*@{*/
 #define MAX_VERTEX_PROGRAM_ADDRESS_REGS 1
+#define MAX_VERTEX_PROGRAM_PARAMS       MAX_UNIFORMS
 /*@}*/
 
 /** For GL_ARB_fragment_program */
@@ -180,23 +219,6 @@
 #define MAX_FRAGMENT_PROGRAM_ADDRESS_REGS 0
 /*@}*/
 
-/** For any program target/extension */
-/*@{*/
-#define MAX_PROGRAM_INSTRUCTIONS  (16 * 1024)
-#define MAX_PROGRAM_LOCAL_PARAMS 256 /**< per-program constants (power of two) */
-#define MAX_PROGRAM_ENV_PARAMS 256   /**< per-context constants (power of two) */
-#define MAX_PROGRAM_MATRICES 8
-#define MAX_PROGRAM_MATRIX_STACK_DEPTH 4
-#define MAX_PROGRAM_CALL_DEPTH 8
-#define MAX_PROGRAM_TEMPS 256
-#define MAX_PROGRAM_ADDRESS_REGS 2
-#define MAX_UNIFORMS 1024  /**< number of vec4 uniforms */
-#define MAX_VARYING 16     /**< number of float[4] vectors */
-#define MAX_SAMPLERS MAX_TEXTURE_IMAGE_UNITS
-#define MAX_PROGRAM_INPUTS 32
-#define MAX_PROGRAM_OUTPUTS 32
-/*@}*/
-
 /** For GL_NV_vertex_program */
 /*@{*/
 #define MAX_NV_VERTEX_PROGRAM_INSTRUCTIONS 128
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index a9e520716d..4651760d78 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -487,7 +487,7 @@ init_program_limits(GLenum type, struct gl_program_constants *prog)
    prog->MaxUniformComponents = 4 * MAX_UNIFORMS;
 
    if (type == GL_VERTEX_PROGRAM_ARB) {
-      prog->MaxParameters = MAX_NV_VERTEX_PROGRAM_PARAMS;
+      prog->MaxParameters = MAX_VERTEX_PROGRAM_PARAMS;
       prog->MaxAttribs = MAX_NV_VERTEX_PROGRAM_INPUTS;
       prog->MaxAddressRegs = MAX_VERTEX_PROGRAM_ADDRESS_REGS;
    }
@@ -497,15 +497,17 @@ init_program_limits(GLenum type, struct gl_program_constants *prog)
       prog->MaxAddressRegs = MAX_FRAGMENT_PROGRAM_ADDRESS_REGS;
    }
 
-   /* copy the above limits to init native limits */
-   prog->MaxNativeInstructions = prog->MaxInstructions;
-   prog->MaxNativeAluInstructions = prog->MaxAluInstructions;
-   prog->MaxNativeTexInstructions = prog->MaxTexInstructions;
-   prog->MaxNativeTexIndirections = prog->MaxTexIndirections;
-   prog->MaxNativeAttribs = prog->MaxAttribs;
-   prog->MaxNativeTemps = prog->MaxTemps;
-   prog->MaxNativeAddressRegs = prog->MaxAddressRegs;
-   prog->MaxNativeParameters = prog->MaxParameters;
+   /* Set the native limits to zero.  This implies that there is no native
+    * support for shaders.  Let the drivers fill in the actual values.
+    */
+   prog->MaxNativeInstructions = 0;
+   prog->MaxNativeAluInstructions = 0;
+   prog->MaxNativeTexInstructions = 0;
+   prog->MaxNativeTexIndirections = 0;
+   prog->MaxNativeAttribs = 0;
+   prog->MaxNativeTemps = 0;
+   prog->MaxNativeAddressRegs = 0;
+   prog->MaxNativeParameters = 0;
 }
 
 
-- 
cgit v1.2.3


From 92033a9516942d7272ce4bf36ecd422009bbaf60 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 31 Aug 2009 08:50:15 -0600
Subject: mesa: new assertions, comments about buffer mapping

Since ctx->Driver.MapBuffer() and ctx->Driver.MapBufferRange() may be called
from other places in Mesa (such as VBO) it's important that the driver
callbacks set all the buffer object fields properly (Pointer, Offset, Length,
etc).  Add assertions to make sure that the driver does that.
---
 src/mesa/main/bufferobj.c | 41 +++++++++++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 12 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index f96185a4b5..715a6e650b 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -1165,6 +1165,8 @@ _mesa_MapBufferARB(GLenum target, GLenum access)
    GET_CURRENT_CONTEXT(ctx);
    struct gl_buffer_object * bufObj;
    GLbitfield accessFlags;
+   void *map;
+
    ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, NULL);
 
    switch (access) {
@@ -1197,14 +1199,21 @@ _mesa_MapBufferARB(GLenum target, GLenum access)
    }
 
    ASSERT(ctx->Driver.MapBuffer);
-   bufObj->Pointer = ctx->Driver.MapBuffer( ctx, target, access, bufObj );
-   if (!_mesa_bufferobj_mapped(bufObj)) {
+   map = ctx->Driver.MapBuffer( ctx, target, access, bufObj );
+   if (!map) {
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glMapBufferARB(access)");
    }
 
-   bufObj->AccessFlags = accessFlags;
-   bufObj->Offset = 0;
-   bufObj->Length = bufObj->Size;
+   if (map) {
+      /* The driver callback should have set these fields.
+       * This is important because other modules (like VBO) might call
+       * the driver function directly.
+       */
+      ASSERT(bufObj->Pointer == map);
+      ASSERT(bufObj->Length == bufObj->Size);
+      ASSERT(bufObj->Offset == 0);
+      bufObj->AccessFlags = accessFlags;
+   }
 
    if (access == GL_WRITE_ONLY_ARB || access == GL_READ_WRITE_ARB)
       bufObj->Written = GL_TRUE;
@@ -1455,6 +1464,8 @@ _mesa_MapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length,
 {
    GET_CURRENT_CONTEXT(ctx);
    struct gl_buffer_object *bufObj;
+   void *map;
+
    ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, NULL);
 
    if (!ctx->Extensions.ARB_map_buffer_range) {
@@ -1518,14 +1529,20 @@ _mesa_MapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length,
    }
       
    ASSERT(ctx->Driver.MapBufferRange);
-   bufObj->Pointer = ctx->Driver.MapBufferRange(ctx, target, offset, length,
-                                                access, bufObj);
-
-   bufObj->Offset = offset;
-   bufObj->Length = length;
-   bufObj->AccessFlags = access;
+   map = ctx->Driver.MapBufferRange(ctx, target, offset, length,
+                                    access, bufObj);
+   if (map) {
+      /* The driver callback should have set all these fields.
+       * This is important because other modules (like VBO) might call
+       * the driver function directly.
+       */
+      ASSERT(bufObj->Pointer == map);
+      ASSERT(bufObj->Length == length);
+      ASSERT(bufObj->Offset == offset);
+      ASSERT(bufObj->AccessFlags == access);
+   }
 
-   return bufObj->Pointer;
+   return map;
 }
 
 
-- 
cgit v1.2.3


From 822c7964819ca1fcc270880d4ca8b3de8a4276d0 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 31 Aug 2009 08:59:38 -0600
Subject: mesa: additional assertions for ctx->Driver.UnmapBuffer()

The Pointer, Offset and Lenght fields should be cleared by the driver function
since ctx->Driver.Unmap() may be called from VBO code, etc.
---
 src/mesa/main/bufferobj.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 715a6e650b..3fd1d17ff9 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -484,6 +484,9 @@ _mesa_buffer_unmap( GLcontext *ctx, GLenum target,
    (void) target;
    /* XXX we might assert here that bufObj->Pointer is non-null */
    bufObj->Pointer = NULL;
+   bufObj->Length = 0;
+   bufObj->Offset = 0;
+   bufObj->AccessFlags = 0x0;
    return GL_TRUE;
 }
 
@@ -1095,7 +1098,7 @@ _mesa_BufferDataARB(GLenum target, GLsizeiptrARB size,
       /* Unmap the existing buffer.  We'll replace it now.  Not an error. */
       ctx->Driver.UnmapBuffer(ctx, target, bufObj);
       bufObj->AccessFlags = DEFAULT_ACCESS;
-      bufObj->Pointer = NULL;
+      ASSERT(bufObj->Pointer == NULL);
    }  
 
    FLUSH_VERTICES(ctx, _NEW_BUFFER_OBJECT);
@@ -1304,9 +1307,9 @@ _mesa_UnmapBufferARB(GLenum target)
 
    status = ctx->Driver.UnmapBuffer( ctx, target, bufObj );
    bufObj->AccessFlags = DEFAULT_ACCESS;
-   bufObj->Pointer = NULL;
-   bufObj->Offset = 0;
-   bufObj->Length = 0;
+   ASSERT(bufObj->Pointer == NULL);
+   ASSERT(bufObj->Offset == 0);
+   ASSERT(bufObj->Length == 0);
 
    return status;
 }
-- 
cgit v1.2.3


From d1da8acd82190542cef7ffea41517974c0c9cc25 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 31 Aug 2009 09:05:28 -0600
Subject: mesa: set Length/Offset fields in _mesa_buffer_map()

---
 src/mesa/main/bufferobj.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 3fd1d17ff9..165eec019a 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -428,6 +428,8 @@ _mesa_buffer_map( GLcontext *ctx, GLenum target, GLenum access,
       return NULL;
    }
    bufObj->Pointer = bufObj->Data;
+   bufObj->Length = bufObj->Size;
+   bufObj->Offset = 0;
    return bufObj->Pointer;
 }
 
-- 
cgit v1.2.3


From 2b6ab615a42bd162b4a870218a5951ca32416c20 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 31 Aug 2009 09:12:04 -0600
Subject: mesa: set additional fields in _mesa_buffer_map_range()

---
 src/mesa/main/bufferobj.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 165eec019a..ebca798635 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -445,11 +445,13 @@ _mesa_buffer_map_range( GLcontext *ctx, GLenum target, GLintptr offset,
 {
    (void) ctx;
    (void) target;
-   (void) access;
-   (void) length;
    assert(!_mesa_bufferobj_mapped(bufObj));
    /* Just return a direct pointer to the data */
-   return bufObj->Data + offset;
+   bufObj->Pointer = bufObj->Data + offset;
+   bufObj->Length = length;
+   bufObj->Offset = offset;
+   bufObj->AccessFlags = access;
+   return bufObj->Pointer;
 }
 
 
-- 
cgit v1.2.3


From 956e6c3978abe918348377cf05e5c92971e50d3f Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 31 Aug 2009 11:14:16 -0600
Subject: mesa: fix saturation logic in emit_texenv()

We need to clamp/saturate after each texenv stage, not just the last one.
Fixes glean texEnv failure for softpipe (and probably other fragment program-
based drivers).
---
 src/mesa/main/texenvprogram.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 3736138b9e..847db5cfb6 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -1113,7 +1113,7 @@ static struct ureg
 emit_texenv(struct texenv_fragment_program *p, GLuint unit)
 {
    struct state_key *key = p->state;
-   GLboolean saturate = (unit < p->last_tex_stage);
+   GLboolean saturate;
    GLuint rgb_shift, alpha_shift;
    struct ureg out, shift;
    struct ureg dest;
@@ -1141,6 +1141,11 @@ emit_texenv(struct texenv_fragment_program *p, GLuint unit)
       break;
    }
    
+   /* If we'll do rgb/alpha shifting don't saturate in emit_combine().
+    * We don't want to clamp twice.
+    */
+   saturate = !(rgb_shift || alpha_shift);
+
    /* If this is the very last calculation, emit direct to output reg:
     */
    if (key->separate_specular ||
@@ -1189,6 +1194,7 @@ emit_texenv(struct texenv_fragment_program *p, GLuint unit)
    /* Deal with the final shift:
     */
    if (alpha_shift || rgb_shift) {
+      saturate = GL_TRUE;  /* always saturate at this point */
       if (rgb_shift == alpha_shift) {
 	 shift = register_scalar_const(p, (GLfloat)(1<<rgb_shift));
       }
-- 
cgit v1.2.3


From a5e7003565a021ceb82a8b16f4a0ecc7cc6c02e0 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 31 Aug 2009 11:17:59 -0600
Subject: mesa: added const qualifiers, move local var

---
 src/mesa/main/texenvprogram.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 847db5cfb6..3e5d65c875 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -952,7 +952,7 @@ static struct ureg emit_combine_source( struct texenv_fragment_program *p,
    }
 }
 
-static GLboolean args_match( struct state_key *key, GLuint unit )
+static GLboolean args_match( const struct state_key *key, GLuint unit )
 {
    GLuint i, nr = key->unit[unit].NumArgsRGB;
 
@@ -1112,11 +1112,10 @@ static struct ureg emit_combine( struct texenv_fragment_program *p,
 static struct ureg
 emit_texenv(struct texenv_fragment_program *p, GLuint unit)
 {
-   struct state_key *key = p->state;
+   const struct state_key *key = p->state;
    GLboolean saturate;
    GLuint rgb_shift, alpha_shift;
-   struct ureg out, shift;
-   struct ureg dest;
+   struct ureg out, dest;
 
    if (!key->unit[unit].enabled) {
       return get_source(p, SRC_PREVIOUS, 0);
@@ -1168,7 +1167,6 @@ emit_texenv(struct texenv_fragment_program *p, GLuint unit)
    }
    else if (key->unit[unit].ModeRGB == MODE_DOT3_RGBA_EXT ||
 	    key->unit[unit].ModeRGB == MODE_DOT3_RGBA) {
-
       out = emit_combine( p, dest, WRITEMASK_XYZW, saturate,
 			  unit,
 			  key->unit[unit].NumArgsRGB,
@@ -1194,7 +1192,10 @@ emit_texenv(struct texenv_fragment_program *p, GLuint unit)
    /* Deal with the final shift:
     */
    if (alpha_shift || rgb_shift) {
+      struct ureg shift;
+
       saturate = GL_TRUE;  /* always saturate at this point */
+
       if (rgb_shift == alpha_shift) {
 	 shift = register_scalar_const(p, (GLfloat)(1<<rgb_shift));
       }
@@ -1294,7 +1295,7 @@ static GLboolean load_texenv_source( struct texenv_fragment_program *p,
 static GLboolean
 load_texunit_sources( struct texenv_fragment_program *p, int unit )
 {
-   struct state_key *key = p->state;
+   const struct state_key *key = p->state;
    GLuint i;
 
    for (i = 0; i < key->unit[unit].NumArgsRGB; i++) {
@@ -1314,7 +1315,7 @@ load_texunit_sources( struct texenv_fragment_program *p, int unit )
 static GLboolean
 load_texunit_bumpmap( struct texenv_fragment_program *p, int unit )
 {
-   struct state_key *key = p->state;
+   const struct state_key *key = p->state;
    GLuint bumpedUnitNr = key->unit[unit].OptRGB[1].Source - SRC_TEXTURE0;
    struct ureg texcDst, bumpMapRes;
    struct ureg constdudvcolor = register_const4f(p, 0.0, 0.0, 0.0, 1.0);
-- 
cgit v1.2.3


From 10d81f466794c61c11225c94b2125bf2dd23748e Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 31 Aug 2009 19:26:00 -0600
Subject: mesa: added _mesa_is_stencil_format()

---
 src/mesa/main/image.c | 16 ++++++++++++++++
 src/mesa/main/image.h |  3 +++
 2 files changed, 19 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index d77c593ac7..006a55116b 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -688,6 +688,22 @@ _mesa_is_depth_format(GLenum format)
 }
 
 
+/**
+ * Test if the given image format is a stencil format.
+ */
+GLboolean
+_mesa_is_stencil_format(GLenum format)
+{
+   switch (format) {
+      case GL_STENCIL_INDEX:
+      case GL_DEPTH_STENCIL:
+         return GL_TRUE;
+      default:
+         return GL_FALSE;
+   }
+}
+
+
 /**
  * Test if the given image format is a YCbCr format.
  */
diff --git a/src/mesa/main/image.h b/src/mesa/main/image.h
index 20459a5f1e..a082f37457 100644
--- a/src/mesa/main/image.h
+++ b/src/mesa/main/image.h
@@ -63,6 +63,9 @@ _mesa_is_index_format(GLenum format);
 extern GLboolean
 _mesa_is_depth_format(GLenum format);
 
+extern GLboolean
+_mesa_is_stencil_format(GLenum format);
+
 extern GLboolean
 _mesa_is_ycbcr_format(GLenum format);
 
-- 
cgit v1.2.3


From d55a28e3dc712342e4a2f25aa9b661add7461e82 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 1 Sep 2009 15:34:16 -0600
Subject: mesa: replace 8 with MAX_TEXTURE_UNITS

---
 src/mesa/main/texenvprogram.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 3e5d65c875..f19bb99300 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -109,7 +109,7 @@ struct state_key {
       GLuint NumArgsA:3;
       GLuint ModeA:5;
       struct mode_opt OptA[MAX_COMBINER_TERMS];
-   } unit[8];
+   } unit[MAX_TEXTURE_UNITS];
 };
 
 #define FOG_LINEAR  0
-- 
cgit v1.2.3


From f337e2c4954b4779dcf2c2b4e0e068cb3ed7b841 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 1 Sep 2009 15:49:55 -0600
Subject: mesa: minor code clean-ups, comments

---
 src/mesa/main/texenvprogram.c | 58 +++++++++++++++++++++++++------------------
 1 file changed, 34 insertions(+), 24 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index f19bb99300..0898581485 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -83,8 +83,8 @@ texenv_doing_secondary_color(GLcontext *ctx)
 #define DISASSEM (MESA_VERBOSE & VERBOSE_DISASSEM)
 
 struct mode_opt {
-   GLuint Source:4;
-   GLuint Operand:3;
+   GLuint Source:4;  /**< SRC_x */
+   GLuint Operand:3; /**< OPR_x */
 };
 
 struct state_key {
@@ -103,11 +103,11 @@ struct state_key {
       GLuint ScaleShiftA:2;
 
       GLuint NumArgsRGB:3;
-      GLuint ModeRGB:5;
+      GLuint ModeRGB:5;     /**< MODE_x */
       struct mode_opt OptRGB[MAX_COMBINER_TERMS];
 
       GLuint NumArgsA:3;
-      GLuint ModeA:5;
+      GLuint ModeA:5;     /**< MODE_x */
       struct mode_opt OptA[MAX_COMBINER_TERMS];
    } unit[MAX_TEXTURE_UNITS];
 };
@@ -240,7 +240,12 @@ static GLuint translate_mode( GLenum envMode, GLenum mode )
    }
 }
 
+
 #define TEXTURE_UNKNOWN_INDEX 7
+
+/**
+ * Translate TEXTURE_x_BIT to TEXTURE_x_INDEX.
+ */
 static GLuint translate_tex_src_bit( GLbitfield bit )
 {
    /* make sure number of switch cases is correct */
@@ -259,6 +264,7 @@ static GLuint translate_tex_src_bit( GLbitfield bit )
    }
 }
 
+
 #define VERT_BIT_TEX_ANY    (0xff << VERT_ATTRIB_TEX0)
 #define VERT_RESULT_TEX_ANY (0xff << VERT_RESULT_TEX0)
 
@@ -375,51 +381,50 @@ static void make_state_key( GLcontext *ctx,  struct state_key *key )
 {
    GLuint i, j;
    GLbitfield inputs_referenced = FRAG_BIT_COL0;
-   GLbitfield inputs_available = get_fp_input_mask( ctx );
+   const GLbitfield inputs_available = get_fp_input_mask( ctx );
 
    memset(key, 0, sizeof(*key));
 
    /* _NEW_TEXTURE */
    for (i = 0; i < ctx->Const.MaxTextureUnits; i++) {
       const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[i];
+      const struct gl_texture_object *texObj = texUnit->_Current;
+      const struct gl_tex_env_combine_state *comb = texUnit->_CurrentCombine;
       GLenum format;
 
       if (!texUnit->_ReallyEnabled || !texUnit->Enabled)
          continue;
 
-      format = texUnit->_Current->Image[0][texUnit->_Current->BaseLevel]->_BaseFormat;
+      format = texObj->Image[0][texObj->BaseLevel]->_BaseFormat;
 
       key->unit[i].enabled = 1;
       key->enabled_units |= (1<<i);
       key->nr_enabled_units = i+1;
       inputs_referenced |= FRAG_BIT_TEX(i);
 
-      key->unit[i].source_index = 
-	 translate_tex_src_bit(texUnit->_ReallyEnabled);		
-      key->unit[i].shadow = ((texUnit->_Current->CompareMode == GL_COMPARE_R_TO_TEXTURE) && 
+      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].NumArgsRGB = texUnit->_CurrentCombine->_NumArgsRGB;
-      key->unit[i].NumArgsA = texUnit->_CurrentCombine->_NumArgsA;
+      key->unit[i].NumArgsRGB = comb->_NumArgsRGB;
+      key->unit[i].NumArgsA = comb->_NumArgsA;
 
       key->unit[i].ModeRGB =
-	 translate_mode(texUnit->EnvMode, texUnit->_CurrentCombine->ModeRGB);
+	 translate_mode(texUnit->EnvMode, comb->ModeRGB);
       key->unit[i].ModeA =
-	 translate_mode(texUnit->EnvMode, texUnit->_CurrentCombine->ModeA);
+	 translate_mode(texUnit->EnvMode, comb->ModeA);
 
-      key->unit[i].ScaleShiftRGB = texUnit->_CurrentCombine->ScaleShiftRGB;
-      key->unit[i].ScaleShiftA = texUnit->_CurrentCombine->ScaleShiftA;
+      key->unit[i].ScaleShiftRGB = comb->ScaleShiftRGB;
+      key->unit[i].ScaleShiftA = comb->ScaleShiftA;
 
       for (j = 0; j < MAX_COMBINER_TERMS; j++) {
-         key->unit[i].OptRGB[j].Operand =
-	    translate_operand(texUnit->_CurrentCombine->OperandRGB[j]);
-         key->unit[i].OptA[j].Operand =
-	    translate_operand(texUnit->_CurrentCombine->OperandA[j]);
-         key->unit[i].OptRGB[j].Source =
-	    translate_source(texUnit->_CurrentCombine->SourceRGB[j]);
-         key->unit[i].OptA[j].Source =
-	    translate_source(texUnit->_CurrentCombine->SourceA[j]);
+         key->unit[i].OptRGB[j].Operand = translate_operand(comb->OperandRGB[j]);
+         key->unit[i].OptA[j].Operand = translate_operand(comb->OperandA[j]);
+         key->unit[i].OptRGB[j].Source = translate_source(comb->SourceRGB[j]);
+         key->unit[i].OptA[j].Source = translate_source(comb->SourceA[j]);
       }
 
       if (key->unit[i].ModeRGB == MODE_BUMP_ENVMAP_ATI) {
@@ -952,6 +957,11 @@ static struct ureg emit_combine_source( struct texenv_fragment_program *p,
    }
 }
 
+/**
+ * Check if the RGB and Alpha sources and operands match for the given
+ * texture unit's combinder state.  When the RGB and A sources and
+ * operands match, we can emit fewer instructions.
+ */
 static GLboolean args_match( const struct state_key *key, GLuint unit )
 {
    GLuint i, nr = key->unit[unit].NumArgsRGB;
@@ -1234,7 +1244,7 @@ static void load_texture( struct texenv_fragment_program *p, GLuint unit )
 
       if (texTarget == TEXTURE_UNKNOWN_INDEX)
          program_error(p, "TexSrcBit");
-			  
+
       /* TODO: Use D0_MASK_XY where possible.
        */
       if (p->state->unit[unit].enabled) {
-- 
cgit v1.2.3


From b5ec0a68589c5d8f0d4be2556ea6d6b01fd4e37d Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 1 Sep 2009 15:51:23 -0600
Subject: mesa: simplify translate_tex_src_bit()

---
 src/mesa/main/texenvprogram.c | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 0898581485..ea0aa448e1 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -241,27 +241,13 @@ static GLuint translate_mode( GLenum envMode, GLenum mode )
 }
 
 
-#define TEXTURE_UNKNOWN_INDEX 7
-
 /**
  * Translate TEXTURE_x_BIT to TEXTURE_x_INDEX.
  */
 static GLuint translate_tex_src_bit( GLbitfield bit )
 {
-   /* make sure number of switch cases is correct */
-   assert(NUM_TEXTURE_TARGETS == 7);
-   switch (bit) {
-   case TEXTURE_1D_BIT:   return TEXTURE_1D_INDEX;
-   case TEXTURE_2D_BIT:   return TEXTURE_2D_INDEX;
-   case TEXTURE_RECT_BIT: return TEXTURE_RECT_INDEX;
-   case TEXTURE_3D_BIT:   return TEXTURE_3D_INDEX;
-   case TEXTURE_CUBE_BIT: return TEXTURE_CUBE_INDEX;
-   case TEXTURE_1D_ARRAY_BIT: return TEXTURE_1D_ARRAY_INDEX;
-   case TEXTURE_2D_ARRAY_BIT: return TEXTURE_2D_ARRAY_INDEX;
-   default:
-      assert(0);
-      return TEXTURE_UNKNOWN_INDEX;
-   }
+   ASSERT(bit);
+   return _mesa_ffs(bit) - 1;
 }
 
 
@@ -1230,7 +1216,7 @@ emit_texenv(struct texenv_fragment_program *p, GLuint unit)
 static void load_texture( struct texenv_fragment_program *p, GLuint unit )
 {
    if (is_undef(p->src_texture[unit])) {
-      GLuint texTarget = p->state->unit[unit].source_index;
+      const GLuint texTarget = p->state->unit[unit].source_index;
       struct ureg texcoord;
       struct ureg tmp = get_tex_temp( p );
 
@@ -1242,9 +1228,6 @@ static void load_texture( struct texenv_fragment_program *p, GLuint unit )
          texcoord = p->texcoord_tex[unit];
       }
 
-      if (texTarget == TEXTURE_UNKNOWN_INDEX)
-         program_error(p, "TexSrcBit");
-
       /* TODO: Use D0_MASK_XY where possible.
        */
       if (p->state->unit[unit].enabled) {
-- 
cgit v1.2.3


From 9ed0315271c38f5fe9cdd65020a54cbb7f61ed2b Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 1 Sep 2009 15:57:36 -0600
Subject: mesa: more comments, clean-ups

---
 src/mesa/main/texenvprogram.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index ea0aa448e1..54960a1fa1 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -92,21 +92,21 @@ struct state_key {
    GLuint enabled_units:8;
    GLuint separate_specular:1;
    GLuint fog_enabled:1;
-   GLuint fog_mode:2;
+   GLuint fog_mode:2;          /**< FOG_x */
    GLuint inputs_available:12;
 
    struct {
       GLuint enabled:1;
-      GLuint source_index:3;   /* one of TEXTURE_1D/2D/3D/CUBE/RECT_INDEX */
+      GLuint source_index:3;   /**< TEXTURE_x_INDEX */
       GLuint shadow:1;
       GLuint ScaleShiftRGB:2;
       GLuint ScaleShiftA:2;
 
-      GLuint NumArgsRGB:3;
+      GLuint NumArgsRGB:3;  /**< up to MAX_COMBINER_TERMS */
       GLuint ModeRGB:5;     /**< MODE_x */
       struct mode_opt OptRGB[MAX_COMBINER_TERMS];
 
-      GLuint NumArgsA:3;
+      GLuint NumArgsA:3;  /**< up to MAX_COMBINER_TERMS */
       GLuint ModeA:5;     /**< MODE_x */
       struct mode_opt OptA[MAX_COMBINER_TERMS];
    } unit[MAX_TEXTURE_UNITS];
@@ -705,7 +705,7 @@ emit_op(struct texenv_fragment_program *p,
 	struct ureg src1,
 	struct ureg src2 )
 {
-   GLuint nr = p->program->Base.NumInstructions++;
+   const GLuint nr = p->program->Base.NumInstructions++;
    struct prog_instruction *inst = &p->program->Base.Instructions[nr];
 
    assert(nr < MAX_INSTRUCTIONS);
@@ -950,15 +950,15 @@ static struct ureg emit_combine_source( struct texenv_fragment_program *p,
  */
 static GLboolean args_match( const struct state_key *key, GLuint unit )
 {
-   GLuint i, nr = key->unit[unit].NumArgsRGB;
+   GLuint i, numArgs = key->unit[unit].NumArgsRGB;
 
-   for (i = 0 ; i < nr ; i++) {
+   for (i = 0 ; i < numArgs ; i++) {
       if (key->unit[unit].OptA[i].Source != key->unit[unit].OptRGB[i].Source) 
 	 return GL_FALSE;
 
-      switch(key->unit[unit].OptA[i].Operand) {
+      switch (key->unit[unit].OptA[i].Operand) {
       case OPR_SRC_ALPHA: 
-	 switch(key->unit[unit].OptRGB[i].Operand) {
+	 switch (key->unit[unit].OptRGB[i].Operand) {
 	 case OPR_SRC_COLOR: 
 	 case OPR_SRC_ALPHA: 
 	    break;
@@ -967,7 +967,7 @@ static GLboolean args_match( const struct state_key *key, GLuint unit )
 	 }
 	 break;
       case OPR_ONE_MINUS_SRC_ALPHA: 
-	 switch(key->unit[unit].OptRGB[i].Operand) {
+	 switch (key->unit[unit].OptRGB[i].Operand) {
 	 case OPR_ONE_MINUS_SRC_COLOR: 
 	 case OPR_ONE_MINUS_SRC_ALPHA: 
 	    break;
-- 
cgit v1.2.3


From c7ba2b8622d8a924b3ac4c7d94a3c19d12e88e03 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 1 Sep 2009 15:58:49 -0600
Subject: mesa: remove unused ureg:negateabs field

---
 src/mesa/main/texenvprogram.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 54960a1fa1..869d8d026b 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -458,9 +458,8 @@ struct ureg {
    GLuint idx:8;
    GLuint negatebase:1;
    GLuint abs:1;
-   GLuint negateabs:1;
    GLuint swz:12;
-   GLuint pad:5;
+   GLuint pad:6;
 };
 
 static const struct ureg undef = { 
@@ -469,7 +468,6 @@ static const struct ureg undef = {
    0,
    0,
    0,
-   0,
    0
 };
 
@@ -516,7 +514,6 @@ static struct ureg make_ureg(GLuint file, GLuint idx)
    reg.idx = idx;
    reg.negatebase = 0;
    reg.abs = 0;
-   reg.negateabs = 0;
    reg.swz = SWIZZLE_NOOP;
    reg.pad = 0;
    return reg;
-- 
cgit v1.2.3


From 1480bcacfec8f215c5827278a5f984c6bf68ba69 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 1 Sep 2009 16:01:12 -0600
Subject: mesa: remove unused ureg::abs field

---
 src/mesa/main/texenvprogram.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 869d8d026b..8c588538b1 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -457,9 +457,8 @@ struct ureg {
    GLuint file:4;
    GLuint idx:8;
    GLuint negatebase:1;
-   GLuint abs:1;
    GLuint swz:12;
-   GLuint pad:6;
+   GLuint pad:7;
 };
 
 static const struct ureg undef = { 
@@ -467,7 +466,6 @@ static const struct ureg undef = {
    ~0,
    0,
    0,
-   0,
    0
 };
 
@@ -513,7 +511,6 @@ static struct ureg make_ureg(GLuint file, GLuint idx)
    reg.file = file;
    reg.idx = idx;
    reg.negatebase = 0;
-   reg.abs = 0;
    reg.swz = SWIZZLE_NOOP;
    reg.pad = 0;
    return reg;
@@ -679,7 +676,7 @@ static void emit_arg( struct prog_src_register *reg,
    reg->Index = ureg.idx;
    reg->Swizzle = ureg.swz;
    reg->Negate = ureg.negatebase ? NEGATE_XYZW : NEGATE_NONE;
-   reg->Abs = ureg.abs;
+   reg->Abs = GL_FALSE;
 }
 
 static void emit_dst( struct prog_dst_register *dst,
-- 
cgit v1.2.3


From 95136694ab28829f75c0a9f955a79836a0c433c7 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 1 Sep 2009 16:03:28 -0600
Subject: mesa: remove unused texenv_fragment_program::ctx field

---
 src/mesa/main/texenvprogram.c | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 8c588538b1..5c61c97354 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -474,7 +474,6 @@ static const struct ureg undef = {
  */
 struct texenv_fragment_program {
    struct gl_fragment_program *program;
-   GLcontext *ctx;
    struct state_key *state;
 
    GLbitfield alu_temps;	/**< Track texture indirections, see spec. */
@@ -1345,7 +1344,6 @@ create_new_program(GLcontext *ctx, struct state_key *key,
    struct ureg cf, out;
 
    _mesa_memset(&p, 0, sizeof(p));
-   p.ctx = ctx;
    p.state = key;
    p.program = program;
 
-- 
cgit v1.2.3


From 25e5a6f279cec0863dcc341805aa7ca71189b626 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 1 Sep 2009 16:05:07 -0600
Subject: mesa: updated #includes

---
 src/mesa/main/texenvprogram.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 5c61c97354..7efb10c5a0 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -27,8 +27,7 @@
  **************************************************************************/
 
 #include "glheader.h"
-#include "macros.h"
-#include "enums.h"
+#include "imports.h"
 #include "shader/program.h"
 #include "shader/prog_parameter.h"
 #include "shader/prog_cache.h"
-- 
cgit v1.2.3


From 84d6bed4d6844110af23a995e2fad0280a92d46c Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 1 Sep 2009 16:10:57 -0600
Subject: mesa: change conditional to match the previous one

---
 src/mesa/main/texenvprogram.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 7efb10c5a0..b316c25809 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -1401,7 +1401,7 @@ create_new_program(GLcontext *ctx, struct state_key *key,
       /* Second pass - emit combine instructions to build final color:
        */
       for (unit = 0 ; unit < ctx->Const.MaxTextureUnits; unit++)
-	 if (key->enabled_units & (1<<unit)) {
+	 if (key->unit[unit].enabled) {
 	    p.src_previous = emit_texenv( &p, unit );
             reserve_temp(&p, p.src_previous); /* don't re-use this temp reg */
 	    release_temps(ctx, &p);	/* release all temps */
-- 
cgit v1.2.3


From 457e427e32324884acb064b756e327dc131ff135 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 1 Sep 2009 16:22:02 -0600
Subject: mesa: more clean-ups

---
 src/mesa/main/texenvprogram.c | 55 ++++++++++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 24 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index b316c25809..5913957969 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -944,7 +944,7 @@ static GLboolean args_match( const struct state_key *key, GLuint unit )
 {
    GLuint i, numArgs = key->unit[unit].NumArgsRGB;
 
-   for (i = 0 ; i < numArgs ; i++) {
+   for (i = 0; i < numArgs; i++) {
       if (key->unit[unit].OptA[i].Source != key->unit[unit].OptRGB[i].Source) 
 	 return GL_FALSE;
 
@@ -1278,7 +1278,7 @@ static GLboolean load_texenv_source( struct texenv_fragment_program *p,
  * Generate instructions for loading all texture source terms.
  */
 static GLboolean
-load_texunit_sources( struct texenv_fragment_program *p, int unit )
+load_texunit_sources( struct texenv_fragment_program *p, GLuint unit )
 {
    const struct state_key *key = p->state;
    GLuint i;
@@ -1298,7 +1298,7 @@ load_texunit_sources( struct texenv_fragment_program *p, int unit )
  * Generate instructions for loading bump map textures.
  */
 static GLboolean
-load_texunit_bumpmap( struct texenv_fragment_program *p, int unit )
+load_texunit_bumpmap( struct texenv_fragment_program *p, GLuint unit )
 {
    const struct state_key *key = p->state;
    GLuint bumpedUnitNr = key->unit[unit].OptRGB[1].Source - SRC_TEXTURE0;
@@ -1314,17 +1314,20 @@ load_texunit_bumpmap( struct texenv_fragment_program *p, int unit )
    texcDst = get_tex_temp( p );
    p->texcoord_tex[bumpedUnitNr] = texcDst;
 
-   /* apply rot matrix and add coords to be available in next phase */
-   /* dest = (Arg0.xxxx * rotMat0 + Arg1) + (Arg0.yyyy * rotMat1) */
-   /* note only 2 coords are affected the rest are left unchanged (mul by 0) */
+   /* Apply rot matrix and add coords to be available in next phase.
+    * dest = (Arg0.xxxx * rotMat0 + Arg1) + (Arg0.yyyy * rotMat1)
+    * note only 2 coords are affected the rest are left unchanged (mul by 0)
+    */
    emit_arith( p, OPCODE_MAD, texcDst, WRITEMASK_XYZW, 0,
                swizzle1(bumpMapRes, SWIZZLE_X), rotMat0, texcSrc );
    emit_arith( p, OPCODE_MAD, texcDst, WRITEMASK_XYZW, 0,
                swizzle1(bumpMapRes, SWIZZLE_Y), rotMat1, texcDst );
 
-   /* move 0,0,0,1 into bumpmap src if someone (crossbar) is foolish
-      enough to access this later, should optimize away */
-   emit_arith( p, OPCODE_MOV, bumpMapRes, WRITEMASK_XYZW, 0, constdudvcolor, undef, undef );
+   /* Move 0,0,0,1 into bumpmap src if someone (crossbar) is foolish
+    * enough to access this later, should optimize away.
+    */
+   emit_arith( p, OPCODE_MOV, bumpMapRes, WRITEMASK_XYZW, 0,
+               constdudvcolor, undef, undef );
 
    return GL_TRUE;
 }
@@ -1351,17 +1354,17 @@ create_new_program(GLcontext *ctx, struct state_key *key,
     */
    p.program->Base.Instructions = instBuffer;
    p.program->Base.Target = GL_FRAGMENT_PROGRAM_ARB;
-   p.program->Base.NumTexIndirections = 1;
+   p.program->Base.String = NULL;
+   p.program->Base.NumTexIndirections = 1; /* is this right? */
    p.program->Base.NumTexInstructions = 0;
    p.program->Base.NumAluInstructions = 0;
-   p.program->Base.String = NULL;
-   p.program->Base.NumInstructions =
-   p.program->Base.NumTemporaries =
-   p.program->Base.NumParameters =
-   p.program->Base.NumAttributes = p.program->Base.NumAddressRegs = 0;
+   p.program->Base.NumInstructions = 0;
+   p.program->Base.NumTemporaries = 0;
+   p.program->Base.NumParameters = 0;
+   p.program->Base.NumAttributes = 0;
+   p.program->Base.NumAddressRegs = 0;
    p.program->Base.Parameters = _mesa_new_parameter_list();
-
-   p.program->Base.InputsRead = 0;
+   p.program->Base.InputsRead = 0x0;
    p.program->Base.OutputsWritten = 1 << FRAG_RESULT_COLOR;
 
    for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++) {
@@ -1378,10 +1381,12 @@ create_new_program(GLcontext *ctx, struct state_key *key,
    release_temps(ctx, &p);
 
    if (key->enabled_units) {
-       GLboolean needbumpstage = GL_FALSE;
+      GLboolean needbumpstage = GL_FALSE;
+
       /* Zeroth pass - bump map textures first */
-      for (unit = 0 ; unit < ctx->Const.MaxTextureUnits ; unit++)
-	 if (key->unit[unit].enabled && key->unit[unit].ModeRGB == MODE_BUMP_ENVMAP_ATI) {
+      for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++)
+	 if (key->unit[unit].enabled &&
+             key->unit[unit].ModeRGB == MODE_BUMP_ENVMAP_ATI) {
 	    needbumpstage = GL_TRUE;
 	    load_texunit_bumpmap( &p, unit );
 	 }
@@ -1392,7 +1397,7 @@ create_new_program(GLcontext *ctx, struct state_key *key,
        * all referenced texture sources and emit texld instructions
        * for each:
        */
-      for (unit = 0 ; unit < ctx->Const.MaxTextureUnits ; unit++)
+      for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++)
 	 if (key->unit[unit].enabled) {
 	    load_texunit_sources( &p, unit );
 	    p.last_tex_stage = unit;
@@ -1400,7 +1405,7 @@ create_new_program(GLcontext *ctx, struct state_key *key,
 
       /* Second pass - emit combine instructions to build final color:
        */
-      for (unit = 0 ; unit < ctx->Const.MaxTextureUnits; unit++)
+      for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++)
 	 if (key->unit[unit].enabled) {
 	    p.src_previous = emit_texenv( &p, unit );
             reserve_temp(&p, p.src_previous); /* don't re-use this temp reg */
@@ -1434,9 +1439,11 @@ create_new_program(GLcontext *ctx, struct state_key *key,
        * a reduced value and not what is expected in FogOption
        */
       p.program->FogOption = ctx->Fog.Mode;
-      p.program->Base.InputsRead |= FRAG_BIT_FOGC; /* XXX new */
-   } else
+      p.program->Base.InputsRead |= FRAG_BIT_FOGC;
+   }
+   else {
       p.program->FogOption = GL_NONE;
+   }
 
    if (p.program->Base.NumTexIndirections > ctx->Const.FragmentProgram.MaxTexIndirections) 
       program_error(&p, "Exceeded max nr indirect texture lookups");
-- 
cgit v1.2.3


From 921bbfc94278d6897d44d1b6ae230315e2ab6e8c Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 1 Sep 2009 16:26:03 -0600
Subject: mesa: remove redundant assignments

---
 src/mesa/main/texstate.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 6e0c0c688a..861c5f37c4 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -729,14 +729,7 @@ init_texture_unit( GLcontext *ctx, GLuint unit )
    ASSIGN_4V( texUnit->GenT.EyePlane, 0.0, 1.0, 0.0, 0.0 );
    ASSIGN_4V( texUnit->GenR.EyePlane, 0.0, 0.0, 0.0, 0.0 );
    ASSIGN_4V( texUnit->GenQ.EyePlane, 0.0, 0.0, 0.0, 0.0 );
-   ASSIGN_4V( texUnit->GenS.ObjectPlane, 1.0, 0.0, 0.0, 0.0 );
-   ASSIGN_4V( texUnit->GenT.ObjectPlane, 0.0, 1.0, 0.0, 0.0 );
-   ASSIGN_4V( texUnit->GenR.ObjectPlane, 0.0, 0.0, 0.0, 0.0 );
-   ASSIGN_4V( texUnit->GenQ.ObjectPlane, 0.0, 0.0, 0.0, 0.0 );
-   ASSIGN_4V( texUnit->GenS.EyePlane, 1.0, 0.0, 0.0, 0.0 );
-   ASSIGN_4V( texUnit->GenT.EyePlane, 0.0, 1.0, 0.0, 0.0 );
-   ASSIGN_4V( texUnit->GenR.EyePlane, 0.0, 0.0, 0.0, 0.0 );
-   ASSIGN_4V( texUnit->GenQ.EyePlane, 0.0, 0.0, 0.0, 0.0 );
+
    /* no mention of this in spec, but maybe id matrix expected? */
    ASSIGN_4V( texUnit->RotMatrix, 1.0, 0.0, 0.0, 1.0 );
 
-- 
cgit v1.2.3


From 278e76832fc26678592368b7b89bfddc137e0e93 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 1 Sep 2009 17:11:35 -0600
Subject: mesa: new _mesa_expand_bitmap() function

---
 src/mesa/main/image.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++
 src/mesa/main/image.h |  7 +++++
 2 files changed, 92 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index 006a55116b..baecbab0a3 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -1259,6 +1259,91 @@ _mesa_pack_bitmap( GLint width, GLint height, const GLubyte *source,
 }
 
 
+/**
+ * "Expand" a bitmap from 1-bit per pixel to 8-bits per pixel.
+ * This is typically used to convert a bitmap into a GLubyte/pixel texture.
+ * "On" bits will set texels to \p onValue.
+ * "Off" bits will not modify texels.
+ * \param width  src bitmap width in pixels
+ * \param height  src bitmap height in pixels
+ * \param unpack  bitmap unpacking state
+ * \param bitmap  the src bitmap data
+ * \param destBuffer  start of dest buffer
+ * \param destStride  row stride in dest buffer
+ * \param onValue  if bit is 1, set destBuffer pixel to this value
+ */
+void
+_mesa_expand_bitmap(GLsizei width, GLsizei height,
+                    const struct gl_pixelstore_attrib *unpack,
+                    const GLubyte *bitmap,
+                    GLubyte *destBuffer, GLint destStride,
+                    GLubyte onValue)
+{
+   const GLubyte *srcRow = (const GLubyte *)
+      _mesa_image_address2d(unpack, bitmap, width, height,
+                            GL_COLOR_INDEX, GL_BITMAP, 0, 0);
+   const GLint srcStride = _mesa_image_row_stride(unpack, width,
+                                                  GL_COLOR_INDEX, GL_BITMAP);
+   GLint row, col;
+
+#define SET_PIXEL(COL, ROW) \
+   destBuffer[(ROW) * destStride + (COL)] = onValue;
+
+   for (row = 0; row < height; row++) {
+      const GLubyte *src = srcRow;
+
+      if (unpack->LsbFirst) {
+         /* Lsb first */
+         GLubyte mask = 1U << (unpack->SkipPixels & 0x7);
+         for (col = 0; col < width; col++) {
+
+            if (*src & mask) {
+               SET_PIXEL(col, row);
+            }
+
+            if (mask == 128U) {
+               src++;
+               mask = 1U;
+            }
+            else {
+               mask = mask << 1;
+            }
+         }
+
+         /* get ready for next row */
+         if (mask != 1)
+            src++;
+      }
+      else {
+         /* Msb first */
+         GLubyte mask = 128U >> (unpack->SkipPixels & 0x7);
+         for (col = 0; col < width; col++) {
+
+            if (*src & mask) {
+               SET_PIXEL(col, row);
+            }
+
+            if (mask == 1U) {
+               src++;
+               mask = 128U;
+            }
+            else {
+               mask = mask >> 1;
+            }
+         }
+
+         /* get ready for next row */
+         if (mask != 128)
+            src++;
+      }
+
+      srcRow += srcStride;
+   } /* row */
+
+#undef SET_PIXEL
+}
+
+
 /**********************************************************************/
 /*****                  Pixel processing functions               ******/
 /**********************************************************************/
diff --git a/src/mesa/main/image.h b/src/mesa/main/image.h
index a082f37457..72717d6787 100644
--- a/src/mesa/main/image.h
+++ b/src/mesa/main/image.h
@@ -134,6 +134,13 @@ extern void
 _mesa_pack_bitmap( GLint width, GLint height, const GLubyte *source,
                    GLubyte *dest, const struct gl_pixelstore_attrib *packing );
 
+extern void
+_mesa_expand_bitmap(GLsizei width, GLsizei height,
+                    const struct gl_pixelstore_attrib *unpack,
+                    const GLubyte *bitmap,
+                    GLubyte *destBuffer, GLint destStride,
+                    GLubyte onValue);
+
 
 /** \name Pixel processing functions */
 /*@{*/
-- 
cgit v1.2.3


From 282f578dbd790d7e5d7f371c51b72f116cda3934 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 1 Sep 2009 17:40:07 -0600
Subject: mesa: skip bitmap drawing code if width==0 or height==0

---
 src/mesa/main/drawpix.c | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index 67311f71a2..aef6585641 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -264,27 +264,30 @@ _mesa_Bitmap( GLsizei width, GLsizei height,
 
    if (ctx->RenderMode == GL_RENDER) {
       /* Truncate, to satisfy conformance tests (matches SGI's OpenGL). */
-      const GLfloat epsilon = 0.0001F;
-      GLint x = IFLOOR(ctx->Current.RasterPos[0] + epsilon - xorig);
-      GLint y = IFLOOR(ctx->Current.RasterPos[1] + epsilon - yorig);
-
-      if (ctx->Unpack.BufferObj->Name) {
-         /* unpack from PBO */
-         if (!_mesa_validate_pbo_access(2, &ctx->Unpack, width, height, 1,
-                                        GL_COLOR_INDEX, GL_BITMAP,
-                                        (GLvoid *) bitmap)) {
-            _mesa_error(ctx, GL_INVALID_OPERATION,
-                        "glBitmap(invalid PBO access)");
-            return;
-         }
-         if (_mesa_bufferobj_mapped(ctx->Unpack.BufferObj)) {
-            /* buffer is mapped - that's an error */
-            _mesa_error(ctx, GL_INVALID_OPERATION, "glBitmap(PBO is mapped)");
-            return;
+      if (width > 0 && height > 0) {
+         const GLfloat epsilon = 0.0001F;
+         GLint x = IFLOOR(ctx->Current.RasterPos[0] + epsilon - xorig);
+         GLint y = IFLOOR(ctx->Current.RasterPos[1] + epsilon - yorig);
+
+         if (ctx->Unpack.BufferObj->Name) {
+            /* unpack from PBO */
+            if (!_mesa_validate_pbo_access(2, &ctx->Unpack, width, height, 1,
+                                           GL_COLOR_INDEX, GL_BITMAP,
+                                           (GLvoid *) bitmap)) {
+               _mesa_error(ctx, GL_INVALID_OPERATION,
+                           "glBitmap(invalid PBO access)");
+               return;
+            }
+            if (_mesa_bufferobj_mapped(ctx->Unpack.BufferObj)) {
+               /* buffer is mapped - that's an error */
+               _mesa_error(ctx, GL_INVALID_OPERATION,
+                           "glBitmap(PBO is mapped)");
+               return;
+            }
          }
-      }
 
-      ctx->Driver.Bitmap( ctx, x, y, width, height, &ctx->Unpack, bitmap );
+         ctx->Driver.Bitmap( ctx, x, y, width, height, &ctx->Unpack, bitmap );
+      }
    }
 #if _HAVE_FULL_GL
    else if (ctx->RenderMode == GL_FEEDBACK) {
-- 
cgit v1.2.3


From 60b08eb1fdf287d28ec66b9282513ab35a61aee0 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Mon, 31 Aug 2009 10:13:22 -0700
Subject: mesa: Make MultiDrawElements submit multiple primitives at once.

Previously, MultiDrawElements just called DrawElements a bunch of times.
By sending several primitives down the pipeline at once, we avoid a bunch
of validation.  On my GL demo, this improves fps by 2.5% (+/- .41%) and
reduces CPU usage by 70.5% (+/- 2.9%) (n=3).

Reviewed by: Ian Romanick <ian.d.romanick@intel.com>
---
 src/mesa/main/api_exec.c      |   1 -
 src/mesa/main/api_noop.c      |  15 ++++
 src/mesa/main/api_noop.h      |   4 ++
 src/mesa/main/dd.h            |   6 +-
 src/mesa/main/dlist.c         |  14 +---
 src/mesa/main/varray.c        |  18 -----
 src/mesa/main/vtxfmt.c        |   1 +
 src/mesa/main/vtxfmt_tmp.h    |  12 ++++
 src/mesa/vbo/vbo_exec_array.c | 157 ++++++++++++++++++++++++++++++++++++++++++
 src/mesa/vbo/vbo_save_api.c   |   5 ++
 10 files changed, 200 insertions(+), 33 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index 199550b35d..cbf48615bf 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -529,7 +529,6 @@ _mesa_init_exec_table(struct _glapi_table *exec)
    /* 148. GL_EXT_multi_draw_arrays */
 #if _HAVE_FULL_GL
    SET_MultiDrawArraysEXT(exec, _mesa_MultiDrawArraysEXT);
-   SET_MultiDrawElementsEXT(exec, _mesa_MultiDrawElementsEXT);
 #endif
 
    /* 173. GL_INGR_blend_func_separate */
diff --git a/src/mesa/main/api_noop.c b/src/mesa/main/api_noop.c
index 66f9c4e6bd..09ba7e5062 100644
--- a/src/mesa/main/api_noop.c
+++ b/src/mesa/main/api_noop.c
@@ -772,6 +772,20 @@ _mesa_noop_DrawRangeElements(GLenum mode,
        CALL_DrawElements(GET_DISPATCH(), (mode, count, type, indices));
 }
 
+/* GL_EXT_multi_draw_arrays */
+void GLAPIENTRY
+_mesa_noop_MultiDrawElements(GLenum mode, const GLsizei *count, GLenum type,
+			     const GLvoid **indices, GLsizei primcount)
+{
+   GLsizei i;
+
+   for (i = 0; i < primcount; i++) {
+      if (count[i] > 0) {
+	 CALL_DrawElements(GET_DISPATCH(), (mode, count[i], type, indices[i]));
+      }
+   }
+}
+
 /*
  * Eval Mesh
  */
@@ -980,6 +994,7 @@ _mesa_noop_vtxfmt_init( GLvertexformat *vfmt )
    vfmt->DrawArrays = _mesa_noop_DrawArrays;
    vfmt->DrawElements = _mesa_noop_DrawElements;
    vfmt->DrawRangeElements = _mesa_noop_DrawRangeElements;
+   vfmt->MultiDrawElementsEXT = _mesa_noop_MultiDrawElements;
    vfmt->EvalMesh1 = _mesa_noop_EvalMesh1;
    vfmt->EvalMesh2 = _mesa_noop_EvalMesh2;
 }
diff --git a/src/mesa/main/api_noop.h b/src/mesa/main/api_noop.h
index 8bf4660800..a7956d00b3 100644
--- a/src/mesa/main/api_noop.h
+++ b/src/mesa/main/api_noop.h
@@ -40,6 +40,10 @@ _mesa_noop_EvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2);
 extern void GLAPIENTRY
 _mesa_noop_Materialfv(GLenum face, GLenum pname, const GLfloat *param);
 
+extern void GLAPIENTRY
+_mesa_noop_MultiDrawElements(GLenum mode, const GLsizei *count, GLenum type,
+			     const GLvoid **indices, GLsizei primcount);
+
 extern void
 _mesa_noop_vtxfmt_init(GLvertexformat *vfmt);
 
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index 1d92e510a4..f02e868d4a 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -1150,7 +1150,11 @@ typedef struct {
    void (GLAPIENTRYP DrawRangeElements)( GLenum mode, GLuint start,
 			      GLuint end, GLsizei count,
 			      GLenum type, const GLvoid *indices );
-   /*@}*/
+   void (GLAPIENTRYP MultiDrawElementsEXT)( GLenum mode, const GLsizei *count,
+					    GLenum type,
+					    const GLvoid **indices,
+					    GLsizei primcount);
+  /*@}*/
 
    /**
     * \name Eval
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 9b68b3e116..8cff9ea64a 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -7751,18 +7751,6 @@ exec_MultiDrawArraysEXT(GLenum mode, GLint * first,
    CALL_MultiDrawArraysEXT(ctx->Exec, (mode, first, count, primcount));
 }
 
-/* GL_EXT_multi_draw_arrays */
-static void GLAPIENTRY
-exec_MultiDrawElementsEXT(GLenum mode, const GLsizei * count,
-                          GLenum type, const GLvoid ** indices,
-                          GLsizei primcount)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_MultiDrawElementsEXT(ctx->Exec,
-                             (mode, count, type, indices, primcount));
-}
-
 /* GL_IBM_multimode_draw_arrays */
 static void GLAPIENTRY
 exec_MultiModeDrawArraysIBM(const GLenum * mode, const GLint * first,
@@ -8108,7 +8096,6 @@ _mesa_init_dlist_table(struct _glapi_table *table)
 
    /* 148. GL_EXT_multi_draw_arrays */
    SET_MultiDrawArraysEXT(table, exec_MultiDrawArraysEXT);
-   SET_MultiDrawElementsEXT(table, exec_MultiDrawElementsEXT);
 
    /* 149. GL_EXT_fog_coord */
    SET_FogCoordPointerEXT(table, exec_FogCoordPointerEXT);
@@ -8723,6 +8710,7 @@ _mesa_save_vtxfmt_init(GLvertexformat * vfmt)
    vfmt->DrawArrays = 0;
    vfmt->DrawElements = 0;
    vfmt->DrawRangeElements = 0;
+   vfmt->MultiDrawElemementsEXT = 0;
 #endif
 }
 
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index be1c03cec2..6cd2a2f4f6 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -1038,24 +1038,6 @@ _mesa_MultiDrawArraysEXT( GLenum mode, GLint *first,
 }
 
 
-/* GL_EXT_multi_draw_arrays */
-void GLAPIENTRY
-_mesa_MultiDrawElementsEXT( GLenum mode, const GLsizei *count, GLenum type,
-                            const GLvoid **indices, GLsizei primcount )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLint i;
-
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   for (i = 0; i < primcount; i++) {
-      if (count[i] > 0) {
-         CALL_DrawElements(ctx->Exec, (mode, count[i], type, indices[i]));
-      }
-   }
-}
-
-
 /* GL_IBM_multimode_draw_arrays */
 void GLAPIENTRY
 _mesa_MultiModeDrawArraysIBM( const GLenum * mode, const GLint * first,
diff --git a/src/mesa/main/vtxfmt.c b/src/mesa/main/vtxfmt.c
index 1f807dc3dc..8d6f560a80 100644
--- a/src/mesa/main/vtxfmt.c
+++ b/src/mesa/main/vtxfmt.c
@@ -133,6 +133,7 @@ install_vtxfmt( struct _glapi_table *tab, const GLvertexformat *vfmt )
    SET_DrawArrays(tab, vfmt->DrawArrays);
    SET_DrawElements(tab, vfmt->DrawElements);
    SET_DrawRangeElements(tab, vfmt->DrawRangeElements);
+   SET_MultiDrawElementsEXT(tab, vfmt->MultiDrawElementsEXT);
    SET_EvalMesh1(tab, vfmt->EvalMesh1);
    SET_EvalMesh2(tab, vfmt->EvalMesh2);
    ASSERT(tab->EvalMesh2);
diff --git a/src/mesa/main/vtxfmt_tmp.h b/src/mesa/main/vtxfmt_tmp.h
index 6f5d01e40f..1308d0aa46 100644
--- a/src/mesa/main/vtxfmt_tmp.h
+++ b/src/mesa/main/vtxfmt_tmp.h
@@ -335,6 +335,17 @@ static void GLAPIENTRY TAG(DrawElements)( GLenum mode, GLsizei count, GLenum typ
    CALL_DrawElements(GET_DISPATCH(), ( mode, count, type, indices ));
 }
 
+static void GLAPIENTRY TAG(MultiDrawElementsEXT)( GLenum mode,
+						  const GLsizei *count,
+						  GLenum type,
+						  const GLvoid **indices,
+						  GLsizei primcount)
+{
+   PRE_LOOPBACK( MultiDrawElementsEXT );
+   CALL_MultiDrawElementsEXT(GET_DISPATCH(), ( mode, count, type, indices,
+					       primcount ));
+}
+
 static void GLAPIENTRY TAG(DrawRangeElements)( GLenum mode, GLuint start,
 				    GLuint end, GLsizei count,
 				    GLenum type, const GLvoid *indices )
@@ -522,6 +533,7 @@ static GLvertexformat TAG(vtxfmt) = {
    TAG(DrawArrays),
    TAG(DrawElements),
    TAG(DrawRangeElements),
+   TAG(MultiDrawElementsEXT),
    TAG(EvalMesh1),
    TAG(EvalMesh2)
 };
diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c
index 4148469ef4..12911f5750 100644
--- a/src/mesa/vbo/vbo_exec_array.c
+++ b/src/mesa/vbo/vbo_exec_array.c
@@ -33,6 +33,7 @@
 #include "main/api_noop.h"
 #include "main/varray.h"
 #include "main/bufferobj.h"
+#include "main/macros.h"
 #include "glapi/dispatch.h"
 
 #include "vbo_context.h"
@@ -721,6 +722,152 @@ vbo_exec_DrawElements(GLenum mode, GLsizei count, GLenum type,
 				   count, type, indices);
 }
 
+/* Inner support for both _mesa_DrawElements and _mesa_DrawRangeElements */
+static void
+vbo_validated_multidrawelements(GLcontext *ctx, GLenum mode,
+				const GLsizei *count, GLenum type,
+				const GLvoid **indices, GLsizei primcount)
+{
+   struct vbo_context *vbo = vbo_context(ctx);
+   struct vbo_exec_context *exec = &vbo->exec;
+   struct _mesa_index_buffer ib;
+   struct _mesa_prim *prim;
+   unsigned int index_type_size = 0;
+   uintptr_t min_index_ptr, max_index_ptr;
+   GLboolean fallback = GL_FALSE;
+   int i;
+
+   if (primcount == 0)
+      return;
+
+   FLUSH_CURRENT( ctx, 0 );
+
+   if (ctx->NewState)
+      _mesa_update_state( ctx );
+
+   if (!_mesa_valid_to_render(ctx, "glMultiDrawElements")) {
+      return;
+   }
+
+   if (ctx->NewState)
+      _mesa_update_state( ctx );
+
+   prim = _mesa_calloc(primcount * sizeof(*prim));
+   if (prim == NULL) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glMultiDrawElements");
+      return;
+   }
+
+   /* Decide if we can do this all as one set of primitives sharing the
+    * same index buffer, or if we have to reset the index pointer per primitive.
+    */
+   bind_arrays( ctx );
+
+   switch (type) {
+   case GL_UNSIGNED_INT:
+      index_type_size = 4;
+      break;
+   case GL_UNSIGNED_SHORT:
+      index_type_size = 2;
+      break;
+   case GL_UNSIGNED_BYTE:
+      index_type_size = 1;
+      break;
+   default:
+      assert(0);
+   }
+
+   min_index_ptr = (uintptr_t)indices[0];
+   max_index_ptr = 0;
+   for (i = 0; i < primcount; i++) {
+      min_index_ptr = MIN2(min_index_ptr, (uintptr_t)indices[i]);
+      max_index_ptr = MAX2(max_index_ptr, (uintptr_t)indices[i] +
+			   index_type_size * count[i]);
+   }
+
+   /* Check if we can handle this thing as a bunch of index offsets from the
+    * same index pointer.  If we can't, then we have to fall back to doing
+    * a draw_prims per primitive.
+    */
+   if (index_type_size != 1) {
+      for (i = 0; i < primcount; i++) {
+	 if ((((uintptr_t)indices[i] - min_index_ptr) % index_type_size) != 0) {
+	    fallback = GL_TRUE;
+	    break;
+	 }
+      }
+   }
+
+   /* If the index buffer isn't in a VBO, then treating the application's
+    * subranges of the index buffer as one large index buffer may lead to
+    * us reading unmapped memory.
+    */
+   if (!_mesa_is_bufferobj(ctx->Array.ElementArrayBufferObj))
+      fallback = GL_TRUE;
+
+   if (!fallback) {
+      ib.count = (max_index_ptr - min_index_ptr) / index_type_size;
+      ib.type = type;
+      ib.obj = ctx->Array.ElementArrayBufferObj;
+      ib.ptr = (void *)min_index_ptr;
+
+      for (i = 0; i < primcount; i++) {
+	 prim[i].begin = (i == 0);
+	 prim[i].end = (i == primcount - 1);
+	 prim[i].weak = 0;
+	 prim[i].pad = 0;
+	 prim[i].mode = mode;
+	 prim[i].start = ((uintptr_t)indices[i] - min_index_ptr) / index_type_size;
+	 prim[i].count = count[i];
+	 prim[i].indexed = 1;
+      }
+
+      vbo->draw_prims(ctx, exec->array.inputs, prim, primcount, &ib,
+		      GL_FALSE, ~0, ~0);
+   } else {
+      for (i = 0; i < primcount; i++) {
+	 ib.count = count[i];
+	 ib.type = type;
+	 ib.obj = ctx->Array.ElementArrayBufferObj;
+	 ib.ptr = indices[i];
+
+
+	 prim[0].begin = 1;
+	 prim[0].end = 1;
+	 prim[0].weak = 0;
+	 prim[0].pad = 0;
+	 prim[0].mode = mode;
+	 prim[0].start = 0;
+	 prim[0].count = count[i];
+	 prim[0].indexed = 1;
+      }
+
+      vbo->draw_prims(ctx, exec->array.inputs, prim, 1, &ib,
+		      GL_FALSE, ~0, ~0);
+   }
+   _mesa_free(prim);
+}
+
+static void GLAPIENTRY
+vbo_exec_MultiDrawElements(GLenum mode,
+			   const GLsizei *count, GLenum type,
+			   const GLvoid **indices,
+			   GLsizei primcount)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLint i;
+
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   for (i = 0; i < primcount; i++) {
+      if (!_mesa_validate_DrawElements( ctx, mode, count[i], type, indices[i] ))
+	 return;
+   }
+
+   vbo_validated_multidrawelements(ctx, mode, count, type, indices, primcount);
+}
+
+
 
 /***********************************************************************
  * Initialization
@@ -733,10 +880,12 @@ vbo_exec_array_init( struct vbo_exec_context *exec )
    exec->vtxfmt.DrawArrays = vbo_exec_DrawArrays;
    exec->vtxfmt.DrawElements = vbo_exec_DrawElements;
    exec->vtxfmt.DrawRangeElements = vbo_exec_DrawRangeElements;
+   exec->vtxfmt.MultiDrawElementsEXT = vbo_exec_MultiDrawElements;
 #else
    exec->vtxfmt.DrawArrays = _mesa_noop_DrawArrays;
    exec->vtxfmt.DrawElements = _mesa_noop_DrawElements;
    exec->vtxfmt.DrawRangeElements = _mesa_noop_DrawRangeElements;
+   exec->vtxfmt.MultiDrawElementsEXT = _mesa_noop_MultiDrawElements;
 #endif
 }
 
@@ -772,3 +921,11 @@ _mesa_DrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count,
 {
    vbo_exec_DrawRangeElements(mode, start, end, count, type, indices);
 }
+
+/* GL_EXT_multi_draw_arrays */
+void GLAPIENTRY
+_mesa_MultiDrawElementsEXT(GLenum mode, const GLsizei *count, GLenum type,
+			   const GLvoid **indices, GLsizei primcount)
+{
+   vbo_exec_MultiDrawElements(mode, count, type, indices, primcount);
+}
diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c
index cdbbc9c187..1771510d84 100644
--- a/src/mesa/vbo/vbo_save_api.c
+++ b/src/mesa/vbo/vbo_save_api.c
@@ -73,6 +73,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "main/dlist.h"
 #include "main/enums.h"
 #include "main/macros.h"
+#include "main/api_noop.h"
 #include "main/api_validate.h"
 #include "main/api_arrayelt.h"
 #include "main/vtxfmt.h"
@@ -1038,6 +1039,8 @@ static void _save_vtxfmt_init( GLcontext *ctx )
    vfmt->DrawArrays = _save_DrawArrays;
    vfmt->DrawElements = _save_DrawElements;
    vfmt->DrawRangeElements = _save_DrawRangeElements;
+   /* Loops back into vfmt->DrawElements */
+   vfmt->MultiDrawElementsEXT = _mesa_noop_MultiDrawElements;
 
 }
 
@@ -1228,6 +1231,8 @@ void vbo_save_api_init( struct vbo_save_context *save )
    ctx->ListState.ListVtxfmt.DrawArrays = _save_OBE_DrawArrays;
    ctx->ListState.ListVtxfmt.DrawElements = _save_OBE_DrawElements;
    ctx->ListState.ListVtxfmt.DrawRangeElements = _save_OBE_DrawRangeElements;
+   /* loops back into _save_OBE_DrawElements */
+   ctx->ListState.ListVtxfmt.MultiDrawElementsEXT = _mesa_noop_MultiDrawElements;
    _mesa_install_save_vtxfmt( ctx, &ctx->ListState.ListVtxfmt );
 }
 
-- 
cgit v1.2.3


From a46e32787d98192d35bf2834011cfa5537e0e703 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed, 2 Sep 2009 05:11:25 -0700
Subject: mesa: Compact state key for TexEnv program cache

By rearranging the bitfields within the key we can reduce the size
of the key from 644 to 196 bytes, reducing the cost of both the
hashing and equality tests.
---
 src/mesa/main/texenvprogram.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 5913957969..b16b8dd36b 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -82,8 +82,8 @@ texenv_doing_secondary_color(GLcontext *ctx)
 #define DISASSEM (MESA_VERBOSE & VERBOSE_DISASSEM)
 
 struct mode_opt {
-   GLuint Source:4;  /**< SRC_x */
-   GLuint Operand:3; /**< OPR_x */
+   GLubyte Source:4;  /**< SRC_x */
+   GLubyte Operand:3; /**< OPR_x */
 };
 
 struct state_key {
@@ -103,10 +103,11 @@ struct state_key {
 
       GLuint NumArgsRGB:3;  /**< up to MAX_COMBINER_TERMS */
       GLuint ModeRGB:5;     /**< MODE_x */
-      struct mode_opt OptRGB[MAX_COMBINER_TERMS];
 
       GLuint NumArgsA:3;  /**< up to MAX_COMBINER_TERMS */
       GLuint ModeA:5;     /**< MODE_x */
+
+      struct mode_opt OptRGB[MAX_COMBINER_TERMS];
       struct mode_opt OptA[MAX_COMBINER_TERMS];
    } unit[MAX_TEXTURE_UNITS];
 };
@@ -1497,6 +1498,7 @@ _mesa_get_fixed_func_fragment_program(GLcontext *ctx)
    struct gl_fragment_program *prog;
    struct state_key key;
 	
+   printf("SIZE OF KEY %d\n", sizeof(key));
    make_state_key(ctx, &key);
       
    prog = (struct gl_fragment_program *)
-- 
cgit v1.2.3


From 83e4470d9a3367883b3fe699629f1d8648459a89 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 2 Sep 2009 08:45:34 -0600
Subject: mesa: added #ifdef __GNUC__ around GLubyte bitfield usage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It would be nice if there were a #pragma or something to disable the warnings:

main/texenvprogram.c:87: warning: type of bit-field ‘Source’ is a GCC extension
main/texenvprogram.c:88: warning: type of bit-field ‘Operand’ is a GCC extension

but there doesn't appear to be a way to do that.
---
 src/mesa/main/texenvprogram.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index b16b8dd36b..770a2c26f7 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -82,8 +82,13 @@ texenv_doing_secondary_color(GLcontext *ctx)
 #define DISASSEM (MESA_VERBOSE & VERBOSE_DISASSEM)
 
 struct mode_opt {
+#ifdef __GNUC__
    GLubyte Source:4;  /**< SRC_x */
    GLubyte Operand:3; /**< OPR_x */
+#else
+   GLubyte Source;  /**< SRC_x */
+   GLubyte Operand; /**< OPR_x */
+#endif
 };
 
 struct state_key {
-- 
cgit v1.2.3


From 8cb651578de8dc4c956eaa8c0e5f1d442a3d4a92 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 2 Sep 2009 09:25:28 -0600
Subject: mesa: remove accidentally committed printf

---
 src/mesa/main/texenvprogram.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 770a2c26f7..d5343d44db 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -1503,7 +1503,6 @@ _mesa_get_fixed_func_fragment_program(GLcontext *ctx)
    struct gl_fragment_program *prog;
    struct state_key key;
 	
-   printf("SIZE OF KEY %d\n", sizeof(key));
    make_state_key(ctx, &key);
       
    prog = (struct gl_fragment_program *)
-- 
cgit v1.2.3


From a7a3d3c27144595b2134f4271996cba901938d12 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 2 Sep 2009 09:43:00 -0600
Subject: mesa: replace 8 with NUM_UNITS

---
 src/mesa/main/ffvertex_prog.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index 8e21a27f89..356476e35a 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -46,6 +46,9 @@
 #include "shader/prog_statevars.h"
 
 
+/** Max of number of lights and texture coord units */
+#define NUM_UNITS MAX2(MAX_TEXTURE_COORD_UNITS, MAX_LIGHTS)
+
 struct state_key {
    unsigned light_color_material_mask:12;
    unsigned light_global_enabled:1;
@@ -77,7 +80,7 @@ struct state_key {
       unsigned texgen_mode1:4;
       unsigned texgen_mode2:4;
       unsigned texgen_mode3:4;
-   } unit[8];
+   } unit[NUM_UNITS];
 };
 
 
-- 
cgit v1.2.3


From d98b9f4edbbee1654b66c8df7b1deeb401b3dc5f Mon Sep 17 00:00:00 2001
From: Gary Wong <gtw@gnu.org>
Date: Wed, 2 Sep 2009 10:11:15 -0600
Subject: mesa: silence gcc bit-field warning

---
 src/mesa/main/texenvprogram.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index d5343d44db..b4923e904d 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -83,8 +83,8 @@ texenv_doing_secondary_color(GLcontext *ctx)
 
 struct mode_opt {
 #ifdef __GNUC__
-   GLubyte Source:4;  /**< SRC_x */
-   GLubyte Operand:3; /**< OPR_x */
+   __extension__ GLubyte Source:4;  /**< SRC_x */
+   __extension__ GLubyte Operand:3; /**< OPR_x */
 #else
    GLubyte Source;  /**< SRC_x */
    GLubyte Operand; /**< OPR_x */
-- 
cgit v1.2.3


From 4b08e7498230eac30eea1721f33994b30999acd4 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 2 Sep 2009 10:12:15 -0600
Subject: mesa: fix the non-GNU C bit-field case

---
 src/mesa/main/texenvprogram.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index b4923e904d..165d464e3b 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -86,8 +86,8 @@ struct mode_opt {
    __extension__ GLubyte Source:4;  /**< SRC_x */
    __extension__ GLubyte Operand:3; /**< OPR_x */
 #else
-   GLubyte Source;  /**< SRC_x */
-   GLubyte Operand; /**< OPR_x */
+   GLuint Source;  /**< SRC_x */
+   GLuint Operand; /**< OPR_x */
 #endif
 };
 
-- 
cgit v1.2.3


From 5e809216a8d2e7ad093a1d25f3f6495f29e57572 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 2 Sep 2009 10:38:46 -0600
Subject: Revert "mesa: fix the non-GNU C bit-field case"

This reverts commit 4b08e7498230eac30eea1721f33994b30999acd4.

Don't know what I was thinking there.
---
 src/mesa/main/texenvprogram.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 165d464e3b..b4923e904d 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -86,8 +86,8 @@ struct mode_opt {
    __extension__ GLubyte Source:4;  /**< SRC_x */
    __extension__ GLubyte Operand:3; /**< OPR_x */
 #else
-   GLuint Source;  /**< SRC_x */
-   GLuint Operand; /**< OPR_x */
+   GLubyte Source;  /**< SRC_x */
+   GLubyte Operand; /**< OPR_x */
 #endif
 };
 
-- 
cgit v1.2.3


From 2f6d2a9e27f8582591dc60655f7d7b14d7552bbc Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 3 Sep 2009 09:41:41 -0600
Subject: mesa: change ctx->Driver.BufferData() to return GLboolean for
 success/failure

Return GL_FALSE if we failed to allocate the buffer.  Then raise
GL_OUT_OF_MEMORY in core Mesa.
---
 src/mesa/drivers/dri/intel/intel_buffer_objects.c  | 11 ++++++---
 .../drivers/dri/radeon/radeon_buffer_objects.c     |  9 ++++++--
 src/mesa/main/bufferobj.c                          | 26 +++++++++++++++-------
 src/mesa/main/dd.h                                 |  6 ++---
 src/mesa/state_tracker/st_cb_bufferobjects.c       |  9 ++++----
 5 files changed, 41 insertions(+), 20 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/intel/intel_buffer_objects.c b/src/mesa/drivers/dri/intel/intel_buffer_objects.c
index ae6f3064a8..c55c5c426e 100644
--- a/src/mesa/drivers/dri/intel/intel_buffer_objects.c
+++ b/src/mesa/drivers/dri/intel/intel_buffer_objects.c
@@ -130,9 +130,10 @@ intel_bufferobj_free(GLcontext * ctx, struct gl_buffer_object *obj)
  * Allocate space for and store data in a buffer object.  Any data that was
  * previously stored in the buffer object is lost.  If data is NULL,
  * memory will be allocated, but no copy will occur.
- * Called via glBufferDataARB().
+ * Called via ctx->Driver.BufferData().
+ * \return GL_TRUE for success, GL_FALSE if out of memory
  */
-static void
+static GLboolean
 intel_bufferobj_data(GLcontext * ctx,
                      GLenum target,
                      GLsizeiptrARB size,
@@ -167,15 +168,19 @@ intel_bufferobj_data(GLcontext * ctx,
 	 if (intel_obj->sys_buffer != NULL) {
 	    if (data != NULL)
 	       memcpy(intel_obj->sys_buffer, data, size);
-	    return;
+	    return GL_TRUE;
 	 }
       }
 #endif
       intel_bufferobj_alloc_buffer(intel, intel_obj);
+      if (!intel_obj->buffer)
+         return GL_FALSE;
 
       if (data != NULL)
 	 dri_bo_subdata(intel_obj->buffer, 0, size, data);
    }
+
+   return GL_TRUE;
 }
 
 
diff --git a/src/mesa/drivers/dri/radeon/radeon_buffer_objects.c b/src/mesa/drivers/dri/radeon/radeon_buffer_objects.c
index e8ae51e6ea..a24b6dac26 100644
--- a/src/mesa/drivers/dri/radeon/radeon_buffer_objects.c
+++ b/src/mesa/drivers/dri/radeon/radeon_buffer_objects.c
@@ -78,9 +78,10 @@ radeonDeleteBufferObject(GLcontext * ctx,
  * Allocate space for and store data in a buffer object.  Any data that was
  * previously stored in the buffer object is lost.  If data is NULL,
  * memory will be allocated, but no copy will occur.
- * Called via glBufferDataARB().
+ * Called via ctx->Driver.BufferData().
+ * \return GL_TRUE for success, GL_FALSE if out of memory
  */
-static void
+static GLboolean
 radeonBufferData(GLcontext * ctx,
                  GLenum target,
                  GLsizeiptrARB size,
@@ -107,6 +108,9 @@ radeonBufferData(GLcontext * ctx,
                                         RADEON_GEM_DOMAIN_GTT,
                                         0);
 
+        if (!radeon_obj->bo)
+            return GL_FALSE;
+
         if (data != NULL) {
             radeon_bo_map(radeon_obj->bo, GL_TRUE);
 
@@ -115,6 +119,7 @@ radeonBufferData(GLcontext * ctx,
             radeon_bo_unmap(radeon_obj->bo);
         }
     }
+    return GL_TRUE;
 }
 
 /**
diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index ebca798635..81b77b6ff2 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -314,9 +314,10 @@ _mesa_initialize_buffer_object( struct gl_buffer_object *obj,
  * \param usage   Hints about how the data will be used.
  * \param bufObj  Object to be used.
  *
+ * \return GL_TRUE for success, GL_FALSE for failure
  * \sa glBufferDataARB, dd_function_table::BufferData.
  */
-static void
+static GLboolean
 _mesa_buffer_data( GLcontext *ctx, GLenum target, GLsizeiptrARB size,
 		   const GLvoid * data, GLenum usage,
 		   struct gl_buffer_object * bufObj )
@@ -334,6 +335,11 @@ _mesa_buffer_data( GLcontext *ctx, GLenum target, GLsizeiptrARB size,
       if (data) {
 	 _mesa_memcpy( bufObj->Data, data, size );
       }
+
+      return GL_TRUE;
+   }
+   else {
+      return GL_FALSE;
    }
 }
 
@@ -1107,8 +1113,6 @@ _mesa_BufferDataARB(GLenum target, GLsizeiptrARB size,
 
    FLUSH_VERTICES(ctx, _NEW_BUFFER_OBJECT);
 
-   ASSERT(ctx->Driver.BufferData);
-
    bufObj->Written = GL_TRUE;
 
 #ifdef VBO_DEBUG
@@ -1119,8 +1123,11 @@ _mesa_BufferDataARB(GLenum target, GLsizeiptrARB size,
 #ifdef BOUNDS_CHECK
    size += 100;
 #endif
-   /* Give the buffer object to the driver!  <data> may be null! */
-   ctx->Driver.BufferData( ctx, target, size, data, usage, bufObj );
+
+   ASSERT(ctx->Driver.BufferData);
+   if (!ctx->Driver.BufferData( ctx, target, size, data, usage, bufObj )) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBufferDataARB(access)");
+   }
 }
 
 
@@ -1209,9 +1216,9 @@ _mesa_MapBufferARB(GLenum target, GLenum access)
    map = ctx->Driver.MapBuffer( ctx, target, access, bufObj );
    if (!map) {
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glMapBufferARB(access)");
+      return NULL;
    }
-
-   if (map) {
+   else {
       /* The driver callback should have set these fields.
        * This is important because other modules (like VBO) might call
        * the driver function directly.
@@ -1538,7 +1545,10 @@ _mesa_MapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length,
    ASSERT(ctx->Driver.MapBufferRange);
    map = ctx->Driver.MapBufferRange(ctx, target, offset, length,
                                     access, bufObj);
-   if (map) {
+   if (!map) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glMapBufferARB(access)");
+   }
+   else {
       /* The driver callback should have set all these fields.
        * This is important because other modules (like VBO) might call
        * the driver function directly.
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index f02e868d4a..4400e166c6 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -783,9 +783,9 @@ struct dd_function_table {
    
    void (*DeleteBuffer)( GLcontext *ctx, struct gl_buffer_object *obj );
 
-   void (*BufferData)( GLcontext *ctx, GLenum target, GLsizeiptrARB size,
-		       const GLvoid *data, GLenum usage,
-		       struct gl_buffer_object *obj );
+   GLboolean (*BufferData)( GLcontext *ctx, GLenum target, GLsizeiptrARB size,
+                            const GLvoid *data, GLenum usage,
+                            struct gl_buffer_object *obj );
 
    void (*BufferSubData)( GLcontext *ctx, GLenum target, GLintptrARB offset,
 			  GLsizeiptrARB size, const GLvoid *data,
diff --git a/src/mesa/state_tracker/st_cb_bufferobjects.c b/src/mesa/state_tracker/st_cb_bufferobjects.c
index 69dd76d083..8e09d0b932 100644
--- a/src/mesa/state_tracker/st_cb_bufferobjects.c
+++ b/src/mesa/state_tracker/st_cb_bufferobjects.c
@@ -134,9 +134,10 @@ st_bufferobj_get_subdata(GLcontext *ctx,
  * Allocate space for and store data in a buffer object.  Any data that was
  * previously stored in the buffer object is lost.  If data is NULL,
  * memory will be allocated, but no copy will occur.
- * Called via glBufferDataARB().
+ * Called via ctx->Driver.BufferData().
+ * \return GL_TRUE for success, GL_FALSE if out of memory
  */
-static void
+static GLboolean
 st_bufferobj_data(GLcontext *ctx,
 		  GLenum target,
 		  GLsizeiptrARB size,
@@ -172,13 +173,13 @@ st_bufferobj_data(GLcontext *ctx,
    st_obj->buffer = pipe_buffer_create( pipe->screen, 32, buffer_usage, size );
 
    if (!st_obj->buffer) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBufferDataARB");
-      return;
+      return GL_FALSE;
    }
 
    if (data)
       st_no_flush_pipe_buffer_write(st_context(ctx), st_obj->buffer, 0,
 				    size, data);
+   return GL_TRUE;
 }
 
 
-- 
cgit v1.2.3


From 1b448c7a5cafa68eeead2a4c45f4362a9883383b Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 3 Sep 2009 11:29:18 -0600
Subject: mesa: consolidate PBO map/unmap helpers

Instead of _mesa_map_readpix_pbo() use _mesa_map_pbo_source().

Instead of _mesa_map_drawpix_pbo() and _mesa_map_bitmap_pbo() use
_mesa_map_pbo_dest().
---
 src/mesa/main/bufferobj.c                 | 99 ++++++++++---------------------
 src/mesa/main/bufferobj.h                 | 27 +++------
 src/mesa/state_tracker/st_cb_bitmap.c     |  6 +-
 src/mesa/state_tracker/st_cb_drawpixels.c | 10 ++--
 src/mesa/state_tracker/st_cb_readpixels.c |  6 +-
 src/mesa/state_tracker/st_cb_texture.c    |  4 +-
 src/mesa/swrast/s_bitmap.c                |  4 +-
 src/mesa/swrast/s_drawpix.c               |  4 +-
 src/mesa/swrast/s_readpix.c               |  4 +-
 9 files changed, 60 insertions(+), 104 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 81b77b6ff2..1ae63a0ef6 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -658,6 +658,8 @@ _mesa_update_default_objects_buffer_objects(GLcontext *ctx)
  * currently mapped.  Whoever calls this function should check for that.
  * Remember, we can't use a PBO when it's mapped!
  *
+ * If we're not using a PBO, this is a no-op.
+ *
  * \param width  width of image to read/write
  * \param height  height of image to read/write
  * \param depth  depth of image to read/write
@@ -676,7 +678,8 @@ _mesa_validate_pbo_access(GLuint dimensions,
    GLvoid *start, *end;
    const GLubyte *sizeAddr; /* buffer size, cast to a pointer */
 
-   ASSERT(_mesa_is_bufferobj(pack->BufferObj));
+   if (!_mesa_is_bufferobj(pack->BufferObj))
+      return GL_TRUE;  /* no PBO, OK */
 
    if (pack->BufferObj->Size == 0)
       /* no buffer! */
@@ -708,17 +711,18 @@ _mesa_validate_pbo_access(GLuint dimensions,
 
 
 /**
- * If the source of glBitmap data is a PBO, check that we won't read out
- * of buffer bounds, then map the buffer.
- * If not sourcing from a PBO, just return the bitmap pointer.
- * This is a helper function for (some) drivers.
- * Return NULL if error.
- * If non-null return, must call _mesa_unmap_bitmap_pbo() when done.
+ * For commands that read from a PBO (glDrawPixels, glTexImage,
+ * glPolygonStipple, etc), if we're reading from a PBO, map it read-only
+ * and return the pointer into the PBO.  If we're not reading from a
+ * PBO, return \p src as-is.
+ * If non-null return, must call _mesa_unmap_pbo_source() when done.
+ *
+ * \return NULL if error, else pointer to start of data
  */
-const GLubyte *
-_mesa_map_bitmap_pbo(GLcontext *ctx,
+const GLvoid *
+_mesa_map_pbo_source(GLcontext *ctx,
                      const struct gl_pixelstore_attrib *unpack,
-                     const GLubyte *bitmap)
+                     const GLvoid *src)
 {
    const GLubyte *buf;
 
@@ -730,11 +734,11 @@ _mesa_map_bitmap_pbo(GLcontext *ctx,
       if (!buf)
          return NULL;
 
-      buf = ADD_POINTERS(buf, bitmap);
+      buf = ADD_POINTERS(buf, src);
    }
    else {
       /* unpack from normal memory */
-      buf = bitmap;
+      buf = src;
    }
 
    return buf;
@@ -742,13 +746,13 @@ _mesa_map_bitmap_pbo(GLcontext *ctx,
 
 
 /**
- * Counterpart to _mesa_map_bitmap_pbo()
- * This is a helper function for (some) drivers.
+ * Counterpart to _mesa_map_pbo_source()
  */
 void
-_mesa_unmap_bitmap_pbo(GLcontext *ctx,
+_mesa_unmap_pbo_source(GLcontext *ctx,
                        const struct gl_pixelstore_attrib *unpack)
 {
+   ASSERT(unpack != &ctx->Pack); /* catch pack/unpack mismatch */
    if (_mesa_is_bufferobj(unpack->BufferObj)) {
       ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
                               unpack->BufferObj);
@@ -757,57 +761,17 @@ _mesa_unmap_bitmap_pbo(GLcontext *ctx,
 
 
 /**
- * \sa _mesa_map_bitmap_pbo
- */
-const GLvoid *
-_mesa_map_drawpix_pbo(GLcontext *ctx,
-                      const struct gl_pixelstore_attrib *unpack,
-                      const GLvoid *pixels)
-{
-   const GLvoid *buf;
-
-   if (_mesa_is_bufferobj(unpack->BufferObj)) {
-      /* unpack from PBO */
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                                              GL_READ_ONLY_ARB,
-                                              unpack->BufferObj);
-      if (!buf)
-         return NULL;
-
-      buf = ADD_POINTERS(buf, pixels);
-   }
-   else {
-      /* unpack from normal memory */
-      buf = pixels;
-   }
-
-   return buf;
-}
-
-
-/**
- * \sa _mesa_unmap_bitmap_pbo
- */
-void
-_mesa_unmap_drawpix_pbo(GLcontext *ctx,
-                        const struct gl_pixelstore_attrib *unpack)
-{
-   if (_mesa_is_bufferobj(unpack->BufferObj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                              unpack->BufferObj);
-   }
-}
-
-
-/**
- * If PBO is bound, map the buffer, return dest pointer in mapped buffer.
- * Call _mesa_unmap_readpix_pbo() when finished
- * \return NULL if error
+ * For commands that write to a PBO (glReadPixels, glGetColorTable, etc),
+ * if we're writing to a PBO, map it write-only and return the pointer
+ * into the PBO.  If we're not writing to a PBO, return \p dst as-is.
+ * If non-null return, must call _mesa_unmap_pbo_dest() when done.
+ *
+ * \return NULL if error, else pointer to start of data
  */
 void *
-_mesa_map_readpix_pbo(GLcontext *ctx,
-                      const struct gl_pixelstore_attrib *pack,
-                      GLvoid *dest)
+_mesa_map_pbo_dest(GLcontext *ctx,
+                   const struct gl_pixelstore_attrib *pack,
+                   GLvoid *dest)
 {
    void *buf;
 
@@ -831,12 +795,13 @@ _mesa_map_readpix_pbo(GLcontext *ctx,
 
 
 /**
- * Counterpart to _mesa_map_readpix_pbo()
+ * Counterpart to _mesa_map_pbo_dest()
  */
 void
-_mesa_unmap_readpix_pbo(GLcontext *ctx,
-                        const struct gl_pixelstore_attrib *pack)
+_mesa_unmap_pbo_dest(GLcontext *ctx,
+                     const struct gl_pixelstore_attrib *pack)
 {
+   ASSERT(pack != &ctx->Unpack); /* catch pack/unpack mismatch */
    if (_mesa_is_bufferobj(pack->BufferObj)) {
       ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT, pack->BufferObj);
    }
diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h
index decb44a65e..2e7afc2d76 100644
--- a/src/mesa/main/bufferobj.h
+++ b/src/mesa/main/bufferobj.h
@@ -81,32 +81,23 @@ _mesa_validate_pbo_access(GLuint dimensions,
                           GLsizei width, GLsizei height, GLsizei depth,
                           GLenum format, GLenum type, const GLvoid *ptr);
 
-extern const GLubyte *
-_mesa_map_bitmap_pbo(GLcontext *ctx,
+extern const GLvoid *
+_mesa_map_pbo_source(GLcontext *ctx,
                      const struct gl_pixelstore_attrib *unpack,
-                     const GLubyte *bitmap);
+                     const GLvoid *src);
 
 extern void
-_mesa_unmap_bitmap_pbo(GLcontext *ctx,
+_mesa_unmap_pbo_source(GLcontext *ctx,
                        const struct gl_pixelstore_attrib *unpack);
 
-extern const GLvoid *
-_mesa_map_drawpix_pbo(GLcontext *ctx,
-                      const struct gl_pixelstore_attrib *unpack,
-                      const GLvoid *pixels);
-
-extern void
-_mesa_unmap_drawpix_pbo(GLcontext *ctx,
-                        const struct gl_pixelstore_attrib *unpack);
-
 extern void *
-_mesa_map_readpix_pbo(GLcontext *ctx,
-                      const struct gl_pixelstore_attrib *pack,
-                      GLvoid *dest);
+_mesa_map_pbo_dest(GLcontext *ctx,
+                   const struct gl_pixelstore_attrib *pack,
+                   GLvoid *dest);
 
 extern void
-_mesa_unmap_readpix_pbo(GLcontext *ctx,
-                        const struct gl_pixelstore_attrib *pack);
+_mesa_unmap_pbo_dest(GLcontext *ctx,
+                     const struct gl_pixelstore_attrib *pack);
 
 
 extern void
diff --git a/src/mesa/state_tracker/st_cb_bitmap.c b/src/mesa/state_tracker/st_cb_bitmap.c
index 3171b67376..902fb38d1a 100644
--- a/src/mesa/state_tracker/st_cb_bitmap.c
+++ b/src/mesa/state_tracker/st_cb_bitmap.c
@@ -275,7 +275,7 @@ make_bitmap_texture(GLcontext *ctx, GLsizei width, GLsizei height,
    struct pipe_texture *pt;
 
    /* PBO source... */
-   bitmap = _mesa_map_bitmap_pbo(ctx, unpack, bitmap);
+   bitmap = _mesa_map_pbo_source(ctx, unpack, bitmap);
    if (!bitmap) {
       return NULL;
    }
@@ -287,7 +287,7 @@ make_bitmap_texture(GLcontext *ctx, GLsizei width, GLsizei height,
                           0, width, height, 1,
                           PIPE_TEXTURE_USAGE_SAMPLER);
    if (!pt) {
-      _mesa_unmap_bitmap_pbo(ctx, unpack);
+      _mesa_unmap_pbo_source(ctx, unpack);
       return NULL;
    }
 
@@ -302,7 +302,7 @@ make_bitmap_texture(GLcontext *ctx, GLsizei width, GLsizei height,
    unpack_bitmap(ctx->st, 0, 0, width, height, unpack, bitmap,
                  dest, transfer->stride);
 
-   _mesa_unmap_bitmap_pbo(ctx, unpack);
+   _mesa_unmap_pbo_source(ctx, unpack);
 
    /* Release transfer */
    screen->transfer_unmap(screen, transfer);
diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index d19a88fa7c..e00754a036 100644
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -353,7 +353,7 @@ make_texture(struct st_context *st,
    assert(pipeFormat);
    cpp = st_sizeof_format(pipeFormat);
 
-   pixels = _mesa_map_drawpix_pbo(ctx, unpack, pixels);
+   pixels = _mesa_map_pbo_source(ctx, unpack, pixels);
    if (!pixels)
       return NULL;
 
@@ -381,7 +381,7 @@ make_texture(struct st_context *st,
    pt = st_texture_create(st, PIPE_TEXTURE_2D, pipeFormat, 0, ptw, pth, 1,
                           PIPE_TEXTURE_USAGE_SAMPLER);
    if (!pt) {
-      _mesa_unmap_drawpix_pbo(ctx, unpack);
+      _mesa_unmap_pbo_source(ctx, unpack);
       return NULL;
    }
 
@@ -428,7 +428,7 @@ make_texture(struct st_context *st,
       ctx->_ImageTransferState = imageTransferStateSave;
    }
 
-   _mesa_unmap_drawpix_pbo(ctx, unpack);
+   _mesa_unmap_pbo_source(ctx, unpack);
 
    return pt;
 }
@@ -681,7 +681,7 @@ draw_stencil_pixels(GLcontext *ctx, GLint x, GLint y,
 
    stmap = screen->transfer_map(screen, pt);
 
-   pixels = _mesa_map_drawpix_pbo(ctx, unpack, pixels);
+   pixels = _mesa_map_pbo_source(ctx, unpack, pixels);
    assert(pixels);
 
    /* if width > MAX_WIDTH, have to process image in chunks */
@@ -775,7 +775,7 @@ draw_stencil_pixels(GLcontext *ctx, GLint x, GLint y,
       skipPixels += spanWidth;
    }
 
-   _mesa_unmap_drawpix_pbo(ctx, unpack);
+   _mesa_unmap_pbo_source(ctx, unpack);
 
    /* unmap the stencil buffer */
    screen->transfer_unmap(screen, pt);
diff --git a/src/mesa/state_tracker/st_cb_readpixels.c b/src/mesa/state_tracker/st_cb_readpixels.c
index ccf1a0b563..75424aa2e7 100644
--- a/src/mesa/state_tracker/st_cb_readpixels.c
+++ b/src/mesa/state_tracker/st_cb_readpixels.c
@@ -353,7 +353,7 @@ st_readpixels(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height,
       return;
    }
 
-   dest = _mesa_map_readpix_pbo(ctx, &clippedPacking, dest);
+   dest = _mesa_map_pbo_dest(ctx, &clippedPacking, dest);
    if (!dest)
       return;
 
@@ -380,7 +380,7 @@ st_readpixels(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height,
    if (st_fast_readpixels(ctx, strb, x, y, width, height,
                           format, type, pack, dest)) {
       /* success! */
-      _mesa_unmap_readpix_pbo(ctx, &clippedPacking);
+      _mesa_unmap_pbo_dest(ctx, &clippedPacking);
       return;
    }
 
@@ -534,7 +534,7 @@ st_readpixels(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height,
 
    screen->tex_transfer_destroy(trans);
 
-   _mesa_unmap_readpix_pbo(ctx, &clippedPacking);
+   _mesa_unmap_pbo_dest(ctx, &clippedPacking);
 }
 
 
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index 90a059ca69..dc39a70121 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -870,7 +870,7 @@ decompress_with_blit(GLcontext * ctx, GLenum target, GLint level,
 					     PIPE_TRANSFER_READ,
 					     0, 0, width, height);
 
-   pixels = _mesa_map_readpix_pbo(ctx, &ctx->Pack, pixels);
+   pixels = _mesa_map_pbo_dest(ctx, &ctx->Pack, pixels);
 
    /* copy/pack data into user buffer */
    if (st_equal_formats(stImage->pt->format, format, type)) {
@@ -903,7 +903,7 @@ decompress_with_blit(GLcontext * ctx, GLenum target, GLint level,
       }
    }
 
-   _mesa_unmap_readpix_pbo(ctx, &ctx->Pack);
+   _mesa_unmap_pbo_dest(ctx, &ctx->Pack);
 
    /* destroy the temp / dest surface */
    util_destroy_rgba_surface(dst_texture, dst_surface);
diff --git a/src/mesa/swrast/s_bitmap.c b/src/mesa/swrast/s_bitmap.c
index 5e7822cf32..3dbdf2a61a 100644
--- a/src/mesa/swrast/s_bitmap.c
+++ b/src/mesa/swrast/s_bitmap.c
@@ -56,7 +56,7 @@ _swrast_Bitmap( GLcontext *ctx, GLint px, GLint py,
 
    ASSERT(ctx->RenderMode == GL_RENDER);
 
-   bitmap = _mesa_map_bitmap_pbo(ctx, unpack, bitmap);
+   bitmap = (const GLubyte *) _mesa_map_pbo_source(ctx, unpack, bitmap);
    if (!bitmap)
       return;
 
@@ -133,7 +133,7 @@ _swrast_Bitmap( GLcontext *ctx, GLint px, GLint py,
 
    swrast_render_finish(ctx);
 
-   _mesa_unmap_bitmap_pbo(ctx, unpack);
+   _mesa_unmap_pbo_source(ctx, unpack);
 }
 
 
diff --git a/src/mesa/swrast/s_drawpix.c b/src/mesa/swrast/s_drawpix.c
index a9ef8e685f..d31c402eea 100644
--- a/src/mesa/swrast/s_drawpix.c
+++ b/src/mesa/swrast/s_drawpix.c
@@ -847,7 +847,7 @@ _swrast_DrawPixels( GLcontext *ctx,
    if (swrast->NewState)
       _swrast_validate_derived( ctx );
 
-    pixels = _mesa_map_drawpix_pbo(ctx, unpack, pixels);
+    pixels = _mesa_map_pbo_source(ctx, unpack, pixels);
     if (!pixels) {
        swrast_render_finish(ctx);
        _mesa_set_vp_override(ctx, save_vp_override);
@@ -892,7 +892,7 @@ _swrast_DrawPixels( GLcontext *ctx,
    swrast_render_finish(ctx);
    _mesa_set_vp_override(ctx, save_vp_override);
 
-   _mesa_unmap_drawpix_pbo(ctx, unpack);
+   _mesa_unmap_pbo_source(ctx, unpack);
 }
 
 
diff --git a/src/mesa/swrast/s_readpix.c b/src/mesa/swrast/s_readpix.c
index e901fc6b5d..48b9408d24 100644
--- a/src/mesa/swrast/s_readpix.c
+++ b/src/mesa/swrast/s_readpix.c
@@ -574,7 +574,7 @@ _swrast_ReadPixels( GLcontext *ctx,
       return;
    }
 
-   pixels = _mesa_map_readpix_pbo(ctx, &clippedPacking, pixels);
+   pixels = _mesa_map_pbo_dest(ctx, &clippedPacking, pixels);
    if (!pixels)
       return;
   
@@ -616,5 +616,5 @@ _swrast_ReadPixels( GLcontext *ctx,
 
    swrast_render_finish(ctx);
 
-   _mesa_unmap_readpix_pbo(ctx, &clippedPacking);
+   _mesa_unmap_pbo_dest(ctx, &clippedPacking);
 }
-- 
cgit v1.2.3


From 203f395aaf717a6faf21a76979cc24d544ae148b Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 3 Sep 2009 10:41:14 -0600
Subject: mesa: use new _mesa_map_pbo_source/dest() functions in more places

This trims down the code a bit.  The next step would be to combine
the validate and map operations into one helper...
---
 src/mesa/main/colortab.c  |  63 +++++-------
 src/mesa/main/convolve.c  | 100 +++++++------------
 src/mesa/main/histogram.c |  67 +++++--------
 src/mesa/main/pixel.c     | 239 ++++++++++++++++------------------------------
 src/mesa/main/polygon.c   |  77 ++++++---------
 5 files changed, 192 insertions(+), 354 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/colortab.c b/src/mesa/main/colortab.c
index 36304065eb..91c29882ec 100644
--- a/src/mesa/main/colortab.c
+++ b/src/mesa/main/colortab.c
@@ -179,27 +179,22 @@ store_colortable_entries(GLcontext *ctx, struct gl_color_table *table,
 			 GLfloat bScale, GLfloat bBias,
 			 GLfloat aScale, GLfloat aBias)
 {
-   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-      /* Get/unpack the color table data from a PBO */
-      GLubyte *buf;
-      if (!_mesa_validate_pbo_access(1, &ctx->Unpack, count, 1, 1,
-                                     format, type, data)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glColor[Sub]Table(bad PBO access)");
-         return;
-      }
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                                              GL_READ_ONLY_ARB,
-                                              ctx->Unpack.BufferObj);
-      if (!buf) {
+   if (!_mesa_validate_pbo_access(1, &ctx->Unpack, count, 1, 1,
+                                  format, type, data)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glColor[Sub]Table(bad PBO access)");
+      return;
+   }
+
+   data = _mesa_map_pbo_source(ctx, &ctx->Unpack, data);
+   if (!data) {
+      if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "glColor[Sub]Table(PBO mapped)");
-         return;
       }
-      data = ADD_POINTERS(buf, data);
+      return;
    }
 
-
    {
       /* convert user-provided data to GLfloat values */
       GLfloat tempTab[MAX_COLOR_TABLE_SIZE * 4];
@@ -279,10 +274,7 @@ store_colortable_entries(GLcontext *ctx, struct gl_color_table *table,
       }
    }
 
-   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                              ctx->Unpack.BufferObj);
-   }
+   _mesa_unmap_pbo_source(ctx, &ctx->Unpack);
 }
 
 
@@ -696,34 +688,27 @@ _mesa_GetColorTable( GLenum target, GLenum format,
       return;
    }
 
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      /* pack color table into PBO */
-      GLubyte *buf;
-      if (!_mesa_validate_pbo_access(1, &ctx->Pack, table->Size, 1, 1,
-                                     format, type, data)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetColorTable(invalid PBO access)");
-         return;
-      }
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                                              GL_WRITE_ONLY_ARB,
-                                              ctx->Pack.BufferObj);
-      if (!buf) {
+   if (!_mesa_validate_pbo_access(1, &ctx->Pack, table->Size, 1, 1,
+                                  format, type, data)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glGetColorTable(invalid PBO access)");
+      return;
+   }
+
+   data = _mesa_map_pbo_dest(ctx, &ctx->Pack, data);
+   if (!data) {
+      if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
          /* buffer is already mapped - that's an error */
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "glGetColorTable(PBO is mapped)");
-         return;
       }
-      data = ADD_POINTERS(buf, data);
+      return;
    }
 
    _mesa_pack_rgba_span_float(ctx, table->Size, rgba,
                               format, type, data, &ctx->Pack, 0x0);
 
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                              ctx->Pack.BufferObj);
-   }
+   _mesa_unmap_pbo_dest(ctx, &ctx->Pack);
 }
 
 
diff --git a/src/mesa/main/convolve.c b/src/mesa/main/convolve.c
index 69dba72ed3..7e0761e68b 100644
--- a/src/mesa/main/convolve.c
+++ b/src/mesa/main/convolve.c
@@ -144,27 +144,19 @@ _mesa_ConvolutionFilter1D(GLenum target, GLenum internalFormat, GLsizei width, G
    ctx->Convolution1D.Width = width;
    ctx->Convolution1D.Height = 1;
 
-   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-      /* unpack filter from PBO */
-      GLubyte *buf;
-      if (!_mesa_validate_pbo_access(1, &ctx->Unpack, width, 1, 1,
-                                     format, type, image)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glConvolutionFilter1D(invalid PBO access)");
-         return;
-      }
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                                              GL_READ_ONLY_ARB,
-                                              ctx->Unpack.BufferObj);
-      if (!buf) {
-         /* buffer is already mapped - that's an error */
+   if (!_mesa_validate_pbo_access(1, &ctx->Unpack, width, 1, 1,
+                                  format, type, image)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glConvolutionFilter1D(invalid PBO access)");
+      return;
+   }
+
+   image = _mesa_map_pbo_source(ctx, &ctx->Unpack, image);
+   if (!image) {
+      if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "glConvolutionFilter1D(PBO is mapped)");
-         return;
       }
-      image = ADD_POINTERS(buf, image);
-   }
-   else if (!image) {
       return;
    }
 
@@ -173,10 +165,7 @@ _mesa_ConvolutionFilter1D(GLenum target, GLenum internalFormat, GLsizei width, G
                                  format, type, image, &ctx->Unpack,
                                  0); /* transferOps */
 
-   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                              ctx->Unpack.BufferObj);
-   }
+   _mesa_unmap_pbo_source(ctx, &ctx->Unpack);
 
    _mesa_scale_and_bias_rgba(width,
                              (GLfloat (*)[4]) ctx->Convolution1D.Filter,
@@ -242,27 +231,19 @@ _mesa_ConvolutionFilter2D(GLenum target, GLenum internalFormat, GLsizei width, G
    ctx->Convolution2D.Width = width;
    ctx->Convolution2D.Height = height;
 
-   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-      /* unpack filter from PBO */
-      GLubyte *buf;
-      if (!_mesa_validate_pbo_access(2, &ctx->Unpack, width, height, 1,
-                                     format, type, image)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glConvolutionFilter2D(invalid PBO access)");
-         return;
-      }
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                                              GL_READ_ONLY_ARB,
-                                              ctx->Unpack.BufferObj);
-      if (!buf) {
-         /* buffer is already mapped - that's an error */
+   if (!_mesa_validate_pbo_access(2, &ctx->Unpack, width, height, 1,
+                                  format, type, image)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glConvolutionFilter2D(invalid PBO access)");
+      return;
+   }
+
+   image = _mesa_map_pbo_source(ctx, &ctx->Unpack, image);
+   if (!image) {
+      if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "glConvolutionFilter2D(PBO is mapped)");
-         return;
       }
-      image = ADD_POINTERS(buf, image);
-   }
-   else if (!image) {
       return;
    }
 
@@ -276,10 +257,7 @@ _mesa_ConvolutionFilter2D(GLenum target, GLenum internalFormat, GLsizei width, G
                                     0); /* transferOps */
    }
 
-   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                              ctx->Unpack.BufferObj);
-   }
+   _mesa_unmap_pbo_source(ctx, &ctx->Unpack);
 
    _mesa_scale_and_bias_rgba(width * height,
                              (GLfloat (*)[4]) ctx->Convolution2D.Filter,
@@ -598,26 +576,21 @@ _mesa_GetConvolutionFilter(GLenum target, GLenum format, GLenum type,
          return;
    }
 
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      /* Pack the filter into a PBO */
-      GLubyte *buf;
-      if (!_mesa_validate_pbo_access(2, &ctx->Pack,
-                                     filter->Width, filter->Height,
-                                     1, format, type, image)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetConvolutionFilter(invalid PBO access)");
-         return;
-      }
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                                              GL_WRITE_ONLY_ARB,
-                                              ctx->Pack.BufferObj);
-      if (!buf) {
-         /* buffer is already mapped - that's an error */
+   if (!_mesa_validate_pbo_access(2, &ctx->Pack,
+                                  filter->Width, filter->Height,
+                                  1, format, type, image)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glGetConvolutionFilter(invalid PBO access)");
+      return;
+   }
+
+   image = _mesa_map_pbo_dest(ctx, &ctx->Pack, image);
+   if (!image) {
+      if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "glGetConvolutionFilter(PBO is mapped)");
-         return;
       }
-      image = ADD_POINTERS(image, buf);
+      return;
    }
 
    for (row = 0; row < filter->Height; row++) {
@@ -629,10 +602,7 @@ _mesa_GetConvolutionFilter(GLenum target, GLenum format, GLenum type,
                                  format, type, dst, &ctx->Pack, 0x0);
    }
 
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                              ctx->Pack.BufferObj);
-   }
+   _mesa_unmap_pbo_dest(ctx, &ctx->Pack);
 }
 
 
diff --git a/src/mesa/main/histogram.c b/src/mesa/main/histogram.c
index 726a50d3b1..f1d01cdb62 100644
--- a/src/mesa/main/histogram.c
+++ b/src/mesa/main/histogram.c
@@ -649,27 +649,19 @@ _mesa_GetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvo
       return;
    }
 
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      /* pack min/max values into a PBO */
-      GLubyte *buf;
-      if (!_mesa_validate_pbo_access(1, &ctx->Pack, 2, 1, 1,
-                                     format, type, values)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetMinMax(invalid PBO access)");
-         return;
-      }
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                                              GL_WRITE_ONLY_ARB,
-                                              ctx->Pack.BufferObj);
-      if (!buf) {
+   if (!_mesa_validate_pbo_access(1, &ctx->Pack, 2, 1, 1,
+                                  format, type, values)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glGetMinMax(invalid PBO access)");
+      return;
+   }
+
+   values = _mesa_map_pbo_dest(ctx, &ctx->Pack, values);
+   if (!values) {
+      if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
          /* buffer is already mapped - that's an error */
          _mesa_error(ctx, GL_INVALID_OPERATION,"glGetMinMax(PBO is mapped)");
-         return;
       }
-      values = ADD_POINTERS(buf, values);
-   }
-   else if (!values) {
-      /* not an error */
       return;
    }
 
@@ -687,10 +679,7 @@ _mesa_GetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvo
                                  format, type, values, &ctx->Pack, 0x0);
    }
 
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                              ctx->Pack.BufferObj);
-   }
+   _mesa_unmap_pbo_dest(ctx, &ctx->Pack);
 
    if (reset) {
       _mesa_ResetMinmax(GL_MINMAX);
@@ -733,27 +722,18 @@ _mesa_GetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, G
       return;
    }
 
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      /* pack min/max values into a PBO */
-      GLubyte *buf;
-      if (!_mesa_validate_pbo_access(1, &ctx->Pack, ctx->Histogram.Width, 1, 1,
-                                     format, type, values)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetHistogram(invalid PBO access)");
-         return;
-      }
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                                              GL_WRITE_ONLY_ARB,
-                                              ctx->Pack.BufferObj);
-      if (!buf) {
-         /* buffer is already mapped - that's an error */
+   if (!_mesa_validate_pbo_access(1, &ctx->Pack, ctx->Histogram.Width, 1, 1,
+                                  format, type, values)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glGetHistogram(invalid PBO access)");
+      return;
+   }
+
+   values = _mesa_map_pbo_dest(ctx, &ctx->Pack, values);
+   if (!values) {
+      if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
          _mesa_error(ctx,GL_INVALID_OPERATION,"glGetHistogram(PBO is mapped)");
-         return;
       }
-      values = ADD_POINTERS(buf, values);
-   }
-   else if (!values) {
-      /* not an error */
       return;
    }
 
@@ -761,10 +741,7 @@ _mesa_GetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, G
                   (CONST GLuint (*)[4]) ctx->Histogram.Count,
                   format, type, values, &ctx->Pack);
 
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                              ctx->Pack.BufferObj);
-   }
+   _mesa_unmap_pbo_dest(ctx, &ctx->Pack);
 
    if (reset) {
       GLuint i;
diff --git a/src/mesa/main/pixel.c b/src/mesa/main/pixel.c
index 25f55a422f..fcef6dfd42 100644
--- a/src/mesa/main/pixel.c
+++ b/src/mesa/main/pixel.c
@@ -136,6 +136,33 @@ store_pixelmap(GLcontext *ctx, GLenum map, GLsizei mapsize,
 }
 
 
+/**
+ * Convenience wrapper for _mesa_validate_pbo_access() for gl[Get]PixelMap().
+ */
+static GLboolean
+validate_pbo_access(GLcontext *ctx, struct gl_pixelstore_attrib *pack,
+                    GLsizei mapsize, GLenum format, GLenum type,
+                    const GLvoid *ptr)
+{
+   GLboolean ok;
+
+   /* Note, need to use DefaultPacking and Unpack's buffer object */
+   ctx->DefaultPacking.BufferObj = pack->BufferObj;
+
+   ok = _mesa_validate_pbo_access(1, &ctx->DefaultPacking, mapsize, 1, 1,
+                                  format, type, ptr);
+
+   /* restore */
+   ctx->DefaultPacking.BufferObj = ctx->Shared->NullBufferObj;
+
+   if (!ok) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glPixelMap(invalid PBO access)");
+   }
+   return ok;
+}
+
+
 void GLAPIENTRY
 _mesa_PixelMapfv( GLenum map, GLsizei mapsize, const GLfloat *values )
 {
@@ -158,40 +185,23 @@ _mesa_PixelMapfv( GLenum map, GLsizei mapsize, const GLfloat *values )
 
    FLUSH_VERTICES(ctx, _NEW_PIXEL);
 
-   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-      /* unpack pixelmap from PBO */
-      GLubyte *buf;
-      /* Note, need to use DefaultPacking and Unpack's buffer object */
-      ctx->DefaultPacking.BufferObj = ctx->Unpack.BufferObj;
-      if (!_mesa_validate_pbo_access(1, &ctx->DefaultPacking, mapsize, 1, 1,
-                                     GL_INTENSITY, GL_FLOAT, values)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glPixelMapfv(invalid PBO access)");
-         return;
-      }
-      /* restore */
-      ctx->DefaultPacking.BufferObj = ctx->Shared->NullBufferObj;
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                                              GL_READ_ONLY_ARB,
-                                              ctx->Unpack.BufferObj);
-      if (!buf) {
-         /* buffer is already mapped - that's an error */
+   if (!validate_pbo_access(ctx, &ctx->Unpack, mapsize,
+                            GL_INTENSITY, GL_FLOAT, values)) {
+      return;
+   }
+
+   values = (const GLfloat *) _mesa_map_pbo_source(ctx, &ctx->Unpack, values);
+   if (!values) {
+      if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "glPixelMapfv(PBO is mapped)");
-         return;
       }
-      values = (const GLfloat *) ADD_POINTERS(buf, values);
-   }
-   else if (!values) {
       return;
    }
 
    store_pixelmap(ctx, map, mapsize, values);
 
-   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                              ctx->Unpack.BufferObj);
-   }
+   _mesa_unmap_pbo_source(ctx, &ctx->Unpack);
 }
 
 
@@ -217,31 +227,17 @@ _mesa_PixelMapuiv(GLenum map, GLsizei mapsize, const GLuint *values )
 
    FLUSH_VERTICES(ctx, _NEW_PIXEL);
 
-   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-      /* unpack pixelmap from PBO */
-      GLubyte *buf;
-      /* Note, need to use DefaultPacking and Unpack's buffer object */
-      ctx->DefaultPacking.BufferObj = ctx->Unpack.BufferObj;
-      if (!_mesa_validate_pbo_access(1, &ctx->DefaultPacking, mapsize, 1, 1,
-                                     GL_INTENSITY, GL_UNSIGNED_INT, values)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glPixelMapuiv(invalid PBO access)");
-         return;
-      }
-      /* restore */
-      ctx->DefaultPacking.BufferObj = ctx->Shared->NullBufferObj;
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                                              GL_READ_ONLY_ARB,
-                                              ctx->Unpack.BufferObj);
-      if (!buf) {
-         /* buffer is already mapped - that's an error */
+   if (!validate_pbo_access(ctx, &ctx->Unpack, mapsize,
+                            GL_INTENSITY, GL_UNSIGNED_INT, values)) {
+      return;
+   }
+
+   values = (const GLuint *) _mesa_map_pbo_source(ctx, &ctx->Unpack, values);
+   if (!values) {
+      if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "glPixelMapuiv(PBO is mapped)");
-         return;
       }
-      values = (const GLuint *) ADD_POINTERS(buf, values);
-   }
-   else if (!values) {
       return;
    }
 
@@ -259,10 +255,7 @@ _mesa_PixelMapuiv(GLenum map, GLsizei mapsize, const GLuint *values )
       }
    }
 
-   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                              ctx->Unpack.BufferObj);
-   }
+   _mesa_unmap_pbo_source(ctx, &ctx->Unpack);
 
    store_pixelmap(ctx, map, mapsize, fvalues);
 }
@@ -290,32 +283,17 @@ _mesa_PixelMapusv(GLenum map, GLsizei mapsize, const GLushort *values )
 
    FLUSH_VERTICES(ctx, _NEW_PIXEL);
 
-   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-      /* unpack pixelmap from PBO */
-      GLubyte *buf;
-      /* Note, need to use DefaultPacking and Unpack's buffer object */
-      ctx->DefaultPacking.BufferObj = ctx->Unpack.BufferObj;
-      if (!_mesa_validate_pbo_access(1, &ctx->DefaultPacking, mapsize, 1, 1,
-                                     GL_INTENSITY, GL_UNSIGNED_SHORT,
-                                     values)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glPixelMapusv(invalid PBO access)");
-         return;
-      }
-      /* restore */
-      ctx->DefaultPacking.BufferObj = ctx->Shared->NullBufferObj;
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                                              GL_READ_ONLY_ARB,
-                                              ctx->Unpack.BufferObj);
-      if (!buf) {
-         /* buffer is already mapped - that's an error */
+   if (!validate_pbo_access(ctx, &ctx->Unpack, mapsize,
+                            GL_INTENSITY, GL_UNSIGNED_SHORT, values)) {
+      return;
+   }
+
+   values = (const GLushort *) _mesa_map_pbo_source(ctx, &ctx->Unpack, values);
+   if (!values) {
+      if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "glPixelMapusv(PBO is mapped)");
-         return;
       }
-      values = (const GLushort *) ADD_POINTERS(buf, values);
-   }
-   else if (!values) {
       return;
    }
 
@@ -333,10 +311,7 @@ _mesa_PixelMapusv(GLenum map, GLsizei mapsize, const GLushort *values )
       }
    }
 
-   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                              ctx->Unpack.BufferObj);
-   }
+   _mesa_unmap_pbo_source(ctx, &ctx->Unpack);
 
    store_pixelmap(ctx, map, mapsize, fvalues);
 }
@@ -359,31 +334,17 @@ _mesa_GetPixelMapfv( GLenum map, GLfloat *values )
 
    mapsize = pm->Size;
 
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      /* pack pixelmap into PBO */
-      GLubyte *buf;
-      /* Note, need to use DefaultPacking and Pack's buffer object */
-      ctx->DefaultPacking.BufferObj = ctx->Pack.BufferObj;
-      if (!_mesa_validate_pbo_access(1, &ctx->DefaultPacking, mapsize, 1, 1,
-                                     GL_INTENSITY, GL_FLOAT, values)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetPixelMapfv(invalid PBO access)");
-         return;
-      }
-      /* restore */
-      ctx->DefaultPacking.BufferObj = ctx->Shared->NullBufferObj;
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                                              GL_WRITE_ONLY_ARB,
-                                              ctx->Pack.BufferObj);
-      if (!buf) {
-         /* buffer is already mapped - that's an error */
+   if (!validate_pbo_access(ctx, &ctx->Pack, mapsize,
+                            GL_INTENSITY, GL_FLOAT, values)) {
+      return;
+   }
+
+   values = (GLfloat *) _mesa_map_pbo_dest(ctx, &ctx->Pack, values);
+   if (!values) {
+      if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "glGetPixelMapfv(PBO is mapped)");
-         return;
       }
-      values = (GLfloat *) ADD_POINTERS(buf, values);
-   }
-   else if (!values) {
       return;
    }
 
@@ -397,10 +358,7 @@ _mesa_GetPixelMapfv( GLenum map, GLfloat *values )
       MEMCPY(values, pm->Map, mapsize * sizeof(GLfloat));
    }
 
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                              ctx->Pack.BufferObj);
-   }
+   _mesa_unmap_pbo_dest(ctx, &ctx->Pack);
 }
 
 
@@ -420,31 +378,17 @@ _mesa_GetPixelMapuiv( GLenum map, GLuint *values )
    }
    mapsize = pm->Size;
 
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      /* pack pixelmap into PBO */
-      GLubyte *buf;
-      /* Note, need to use DefaultPacking and Pack's buffer object */
-      ctx->DefaultPacking.BufferObj = ctx->Pack.BufferObj;
-      if (!_mesa_validate_pbo_access(1, &ctx->DefaultPacking, mapsize, 1, 1,
-                                     GL_INTENSITY, GL_UNSIGNED_INT, values)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetPixelMapuiv(invalid PBO access)");
-         return;
-      }
-      /* restore */
-      ctx->DefaultPacking.BufferObj = ctx->Shared->NullBufferObj;
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                                              GL_WRITE_ONLY_ARB,
-                                              ctx->Pack.BufferObj);
-      if (!buf) {
-         /* buffer is already mapped - that's an error */
+   if (!validate_pbo_access(ctx, &ctx->Pack, mapsize,
+                            GL_INTENSITY, GL_UNSIGNED_INT, values)) {
+      return;
+   }
+
+   values = (GLuint *) _mesa_map_pbo_dest(ctx, &ctx->Pack, values);
+   if (!values) {
+      if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "glGetPixelMapuiv(PBO is mapped)");
-         return;
       }
-      values = (GLuint *) ADD_POINTERS(buf, values);
-   }
-   else if (!values) {
       return;
    }
 
@@ -458,10 +402,7 @@ _mesa_GetPixelMapuiv( GLenum map, GLuint *values )
       }
    }
 
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                              ctx->Pack.BufferObj);
-   }
+   _mesa_unmap_pbo_dest(ctx, &ctx->Pack);
 }
 
 
@@ -481,32 +422,17 @@ _mesa_GetPixelMapusv( GLenum map, GLushort *values )
    }
    mapsize = pm ? pm->Size : 0;
 
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      /* pack pixelmap into PBO */
-      GLubyte *buf;
-      /* Note, need to use DefaultPacking and Pack's buffer object */
-      ctx->DefaultPacking.BufferObj = ctx->Pack.BufferObj;
-      if (!_mesa_validate_pbo_access(1, &ctx->DefaultPacking, mapsize, 1, 1,
-                                     GL_INTENSITY, GL_UNSIGNED_SHORT,
-                                     values)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetPixelMapusv(invalid PBO access)");
-         return;
-      }
-      /* restore */
-      ctx->DefaultPacking.BufferObj = ctx->Shared->NullBufferObj;
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                                              GL_WRITE_ONLY_ARB,
-                                              ctx->Pack.BufferObj);
-      if (!buf) {
-         /* buffer is already mapped - that's an error */
+   if (!validate_pbo_access(ctx, &ctx->Pack, mapsize,
+                            GL_INTENSITY, GL_UNSIGNED_SHORT, values)) {
+      return;
+   }
+
+   values = (GLushort *) _mesa_map_pbo_dest(ctx, &ctx->Pack, values);
+   if (!values) {
+      if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "glGetPixelMapusv(PBO is mapped)");
-         return;
       }
-      values = (GLushort *) ADD_POINTERS(buf, values);
-   }
-   else if (!values) {
       return;
    }
 
@@ -528,10 +454,7 @@ _mesa_GetPixelMapusv( GLenum map, GLushort *values )
       }
    }
 
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                              ctx->Pack.BufferObj);
-   }
+   _mesa_unmap_pbo_dest(ctx, &ctx->Pack);
 }
 
 
diff --git a/src/mesa/main/polygon.c b/src/mesa/main/polygon.c
index d11c9424d5..e327a52415 100644
--- a/src/mesa/main/polygon.c
+++ b/src/mesa/main/polygon.c
@@ -193,32 +193,25 @@ _mesa_PolygonMode( GLenum face, GLenum mode )
 void
 _mesa_polygon_stipple(GLcontext *ctx, const GLubyte *pattern)
 {
-   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-      /* Get/unpack the stipple pattern from a PBO */
-      GLubyte *buf;
-      if (!_mesa_validate_pbo_access(2, &ctx->Unpack, 32, 32, 1,
-                                     GL_COLOR_INDEX, GL_BITMAP, pattern)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glPolygonStipple(bad PBO access)");
-         return;
-      }
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                                              GL_READ_ONLY_ARB,
-                                              ctx->Unpack.BufferObj);
-      if (!buf) {
+   if (!_mesa_validate_pbo_access(2, &ctx->Unpack, 32, 32, 1,
+                                  GL_COLOR_INDEX, GL_BITMAP, pattern)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glPolygonStipple(bad PBO access)");
+      return;
+   }
+
+   pattern = _mesa_map_pbo_source(ctx, &ctx->Unpack, pattern);
+   if (!pattern) {
+      if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "glPolygonStipple(PBO mapped)");
-         return;
       }
-      buf = ADD_POINTERS(buf, pattern);
-      _mesa_unpack_polygon_stipple(buf, ctx->PolygonStipple, &ctx->Unpack);
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                              ctx->Unpack.BufferObj);
-   }
-   else {
-      /* Get/unpack the stipple pattern from user memory */
-      _mesa_unpack_polygon_stipple(pattern, ctx->PolygonStipple, &ctx->Unpack);
+      return;
    }
+
+   _mesa_unpack_polygon_stipple(pattern, ctx->PolygonStipple, &ctx->Unpack);
+
+   _mesa_unmap_pbo_source(ctx, &ctx->Unpack);
 }
 
 
@@ -255,35 +248,25 @@ _mesa_GetPolygonStipple( GLubyte *dest )
    if (MESA_VERBOSE&VERBOSE_API)
       _mesa_debug(ctx, "glGetPolygonStipple\n");
 
-   /* XXX someday we may put this code into a separate function and call
-    * it with ctx->Driver.GetPolygonStipple().
-    */
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      /* Put/pack the stipple pattern into a PBO */
-      GLubyte *buf;
-      if (!_mesa_validate_pbo_access(2, &ctx->Pack, 32, 32, 1,
-                                     GL_COLOR_INDEX, GL_BITMAP, dest)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetPolygonStipple(bad PBO access)");
-         return;
-      }
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                                              GL_WRITE_ONLY_ARB,
-                                              ctx->Pack.BufferObj);
-      if (!buf) {
+   if (!_mesa_validate_pbo_access(2, &ctx->Pack, 32, 32, 1,
+                                  GL_COLOR_INDEX, GL_BITMAP, dest)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glGetPolygonStipple(bad PBO access)");
+      return;
+   }
+
+   dest = _mesa_map_pbo_dest(ctx, &ctx->Pack, dest);
+   if (!dest) {
+      if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "glGetPolygonStipple(PBO mapped)");
-         return;
       }
-      buf = ADD_POINTERS(buf, dest);
-      _mesa_pack_polygon_stipple(ctx->PolygonStipple, buf, &ctx->Pack);
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                              ctx->Pack.BufferObj);
-   }
-   else {
-      /* Put/pack the stipple pattern into user memory */
-      _mesa_pack_polygon_stipple(ctx->PolygonStipple, dest, &ctx->Pack);
+      return;
    }
+
+   _mesa_pack_polygon_stipple(ctx->PolygonStipple, dest, &ctx->Pack);
+
+   _mesa_unmap_pbo_dest(ctx, &ctx->Pack);
 }
 
 
-- 
cgit v1.2.3


From dc947c8f92732fab75f89015e2d506e964a41ace Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 3 Sep 2009 11:22:27 -0600
Subject: mesa: combined PBO validate/map helpers

---
 src/mesa/main/bufferobj.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++
 src/mesa/main/bufferobj.h | 16 +++++++++
 2 files changed, 98 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 1ae63a0ef6..b95e00af5b 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -745,6 +745,47 @@ _mesa_map_pbo_source(GLcontext *ctx,
 }
 
 
+/**
+ * Combine PBO-read validation and mapping.
+ * If any GL errors are detected, they'll be recorded and NULL returned.
+ * \sa _mesa_validate_pbo_access
+ * \sa _mesa_map_pbo_source
+ * A call to this function should have a matching call to
+ * _mesa_unmap_pbo_source().
+ */
+const GLvoid *
+_mesa_map_validate_pbo_source(GLcontext *ctx,
+                              GLuint dimensions,
+                              const struct gl_pixelstore_attrib *unpack,
+                              GLsizei width, GLsizei height, GLsizei depth,
+                              GLenum format, GLenum type, const GLvoid *ptr,
+                              const char *where)
+{
+   ASSERT(dimensions == 1 || dimensions == 2 || dimensions == 3);
+
+   if (!_mesa_is_bufferobj(unpack->BufferObj)) {
+      /* non-PBO access: no validation to be done */
+      return ptr;
+   }
+
+   if (!_mesa_validate_pbo_access(dimensions, unpack,
+                                  width, height, depth, format, type, ptr)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "%s(out of bounds PBO access)", where);
+      return NULL;
+   }
+
+   if (_mesa_bufferobj_mapped(unpack->BufferObj)) {
+      /* buffer is already mapped - that's an error */
+      _mesa_error(ctx, GL_INVALID_OPERATION, "%s(PBO is mapped)", where);
+      return NULL;
+   }
+
+   ptr = _mesa_map_pbo_source(ctx, unpack, ptr);
+   return ptr;
+}
+
+
 /**
  * Counterpart to _mesa_map_pbo_source()
  */
@@ -794,6 +835,47 @@ _mesa_map_pbo_dest(GLcontext *ctx,
 }
 
 
+/**
+ * Combine PBO-write validation and mapping.
+ * If any GL errors are detected, they'll be recorded and NULL returned.
+ * \sa _mesa_validate_pbo_access
+ * \sa _mesa_map_pbo_dest
+ * A call to this function should have a matching call to
+ * _mesa_unmap_pbo_dest().
+ */
+GLvoid *
+_mesa_map_validate_pbo_dest(GLcontext *ctx,
+                            GLuint dimensions,
+                            const struct gl_pixelstore_attrib *unpack,
+                            GLsizei width, GLsizei height, GLsizei depth,
+                            GLenum format, GLenum type, GLvoid *ptr,
+                            const char *where)
+{
+   ASSERT(dimensions == 1 || dimensions == 2 || dimensions == 3);
+
+   if (!_mesa_is_bufferobj(unpack->BufferObj)) {
+      /* non-PBO access: no validation to be done */
+      return ptr;
+   }
+
+   if (!_mesa_validate_pbo_access(dimensions, unpack,
+                                  width, height, depth, format, type, ptr)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "%s(out of bounds PBO access)", where);
+      return NULL;
+   }
+
+   if (_mesa_bufferobj_mapped(unpack->BufferObj)) {
+      /* buffer is already mapped - that's an error */
+      _mesa_error(ctx, GL_INVALID_OPERATION, "%s(PBO is mapped)", where);
+      return NULL;
+   }
+
+   ptr = _mesa_map_pbo_dest(ctx, unpack, ptr);
+   return ptr;
+}
+
+
 /**
  * Counterpart to _mesa_map_pbo_dest()
  */
diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h
index 2e7afc2d76..9f732ec0c0 100644
--- a/src/mesa/main/bufferobj.h
+++ b/src/mesa/main/bufferobj.h
@@ -86,6 +86,14 @@ _mesa_map_pbo_source(GLcontext *ctx,
                      const struct gl_pixelstore_attrib *unpack,
                      const GLvoid *src);
 
+extern const GLvoid *
+_mesa_map_validate_pbo_source(GLcontext *ctx,
+                              GLuint dimensions,
+                              const struct gl_pixelstore_attrib *unpack,
+                              GLsizei width, GLsizei height, GLsizei depth,
+                              GLenum format, GLenum type, const GLvoid *ptr,
+                              const char *where);
+
 extern void
 _mesa_unmap_pbo_source(GLcontext *ctx,
                        const struct gl_pixelstore_attrib *unpack);
@@ -95,6 +103,14 @@ _mesa_map_pbo_dest(GLcontext *ctx,
                    const struct gl_pixelstore_attrib *pack,
                    GLvoid *dest);
 
+extern GLvoid *
+_mesa_map_validate_pbo_dest(GLcontext *ctx,
+                            GLuint dimensions,
+                            const struct gl_pixelstore_attrib *unpack,
+                            GLsizei width, GLsizei height, GLsizei depth,
+                            GLenum format, GLenum type, GLvoid *ptr,
+                            const char *where);
+
 extern void
 _mesa_unmap_pbo_dest(GLcontext *ctx,
                      const struct gl_pixelstore_attrib *pack);
-- 
cgit v1.2.3


From 95027a00870bc1d12ea24dfb092a0cad6cbd5035 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 3 Sep 2009 11:23:05 -0600
Subject: mesa: use new combined PBO validate/map helpers

---
 src/mesa/main/colortab.c  | 39 ++++++++-----------------------
 src/mesa/main/convolve.c  | 58 ++++++++++++-----------------------------------
 src/mesa/main/histogram.c | 34 +++++++--------------------
 src/mesa/main/polygon.c   | 38 ++++++++-----------------------
 4 files changed, 43 insertions(+), 126 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/colortab.c b/src/mesa/main/colortab.c
index 91c29882ec..5a7de5f209 100644
--- a/src/mesa/main/colortab.c
+++ b/src/mesa/main/colortab.c
@@ -179,21 +179,12 @@ store_colortable_entries(GLcontext *ctx, struct gl_color_table *table,
 			 GLfloat bScale, GLfloat bBias,
 			 GLfloat aScale, GLfloat aBias)
 {
-   if (!_mesa_validate_pbo_access(1, &ctx->Unpack, count, 1, 1,
-                                  format, type, data)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glColor[Sub]Table(bad PBO access)");
+   data = _mesa_map_validate_pbo_source(ctx, 
+                                        1, &ctx->Unpack, count, 1, 1,
+                                        format, type, data,
+                                        "glColor[Sub]Table");
+   if (!data)
       return;
-   }
-
-   data = _mesa_map_pbo_source(ctx, &ctx->Unpack, data);
-   if (!data) {
-      if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glColor[Sub]Table(PBO mapped)");
-      }
-      return;
-   }
 
    {
       /* convert user-provided data to GLfloat values */
@@ -688,22 +679,12 @@ _mesa_GetColorTable( GLenum target, GLenum format,
       return;
    }
 
-   if (!_mesa_validate_pbo_access(1, &ctx->Pack, table->Size, 1, 1,
-                                  format, type, data)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glGetColorTable(invalid PBO access)");
+   data = _mesa_map_validate_pbo_dest(ctx, 
+                                      1, &ctx->Pack, table->Size, 1, 1,
+                                      format, type, data,
+                                      "glGetColorTable");
+   if (!data)
       return;
-   }
-
-   data = _mesa_map_pbo_dest(ctx, &ctx->Pack, data);
-   if (!data) {
-      if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-         /* buffer is already mapped - that's an error */
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetColorTable(PBO is mapped)");
-      }
-      return;
-   }
 
    _mesa_pack_rgba_span_float(ctx, table->Size, rgba,
                               format, type, data, &ctx->Pack, 0x0);
diff --git a/src/mesa/main/convolve.c b/src/mesa/main/convolve.c
index 7e0761e68b..714909f451 100644
--- a/src/mesa/main/convolve.c
+++ b/src/mesa/main/convolve.c
@@ -144,21 +144,12 @@ _mesa_ConvolutionFilter1D(GLenum target, GLenum internalFormat, GLsizei width, G
    ctx->Convolution1D.Width = width;
    ctx->Convolution1D.Height = 1;
 
-   if (!_mesa_validate_pbo_access(1, &ctx->Unpack, width, 1, 1,
-                                  format, type, image)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glConvolutionFilter1D(invalid PBO access)");
+   image = _mesa_map_validate_pbo_source(ctx, 
+                                        1, &ctx->Unpack, width, 1, 1,
+                                        format, type, image,
+                                        "glConvolutionFilter1D");
+   if (!image)
       return;
-   }
-
-   image = _mesa_map_pbo_source(ctx, &ctx->Unpack, image);
-   if (!image) {
-      if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glConvolutionFilter1D(PBO is mapped)");
-      }
-      return;
-   }
 
    _mesa_unpack_color_span_float(ctx, width, GL_RGBA,
                                  ctx->Convolution1D.Filter,
@@ -231,21 +222,12 @@ _mesa_ConvolutionFilter2D(GLenum target, GLenum internalFormat, GLsizei width, G
    ctx->Convolution2D.Width = width;
    ctx->Convolution2D.Height = height;
 
-   if (!_mesa_validate_pbo_access(2, &ctx->Unpack, width, height, 1,
-                                  format, type, image)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glConvolutionFilter2D(invalid PBO access)");
+   image = _mesa_map_validate_pbo_source(ctx, 
+                                         2, &ctx->Unpack, width, height, 1,
+                                         format, type, image,
+                                         "glConvolutionFilter2D");
+   if (!image)
       return;
-   }
-
-   image = _mesa_map_pbo_source(ctx, &ctx->Unpack, image);
-   if (!image) {
-      if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glConvolutionFilter2D(PBO is mapped)");
-      }
-      return;
-   }
 
    /* Unpack filter image.  We always store filters in RGBA format. */
    for (i = 0; i < height; i++) {
@@ -576,22 +558,12 @@ _mesa_GetConvolutionFilter(GLenum target, GLenum format, GLenum type,
          return;
    }
 
-   if (!_mesa_validate_pbo_access(2, &ctx->Pack,
-                                  filter->Width, filter->Height,
-                                  1, format, type, image)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glGetConvolutionFilter(invalid PBO access)");
-      return;
-   }
-
-   image = _mesa_map_pbo_dest(ctx, &ctx->Pack, image);
-   if (!image) {
-      if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetConvolutionFilter(PBO is mapped)");
-      }
+   image = _mesa_map_validate_pbo_dest(ctx, 2, &ctx->Pack,
+                                       filter->Width, filter->Height, 1,
+                                       format, type, image,
+                                       "glGetConvolutionFilter");
+   if (!image)
       return;
-   }
 
    for (row = 0; row < filter->Height; row++) {
       GLvoid *dst = _mesa_image_address2d(&ctx->Pack, image, filter->Width,
diff --git a/src/mesa/main/histogram.c b/src/mesa/main/histogram.c
index f1d01cdb62..ceb0d5a6a8 100644
--- a/src/mesa/main/histogram.c
+++ b/src/mesa/main/histogram.c
@@ -649,21 +649,11 @@ _mesa_GetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvo
       return;
    }
 
-   if (!_mesa_validate_pbo_access(1, &ctx->Pack, 2, 1, 1,
-                                  format, type, values)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glGetMinMax(invalid PBO access)");
-      return;
-   }
 
-   values = _mesa_map_pbo_dest(ctx, &ctx->Pack, values);
-   if (!values) {
-      if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-         /* buffer is already mapped - that's an error */
-         _mesa_error(ctx, GL_INVALID_OPERATION,"glGetMinMax(PBO is mapped)");
-      }
+   values = _mesa_map_validate_pbo_dest(ctx, 1, &ctx->Pack, 2, 1, 1,
+                                        format, type, values, "glGetMinmax");
+   if (!values)
       return;
-   }
 
    {
       GLfloat minmax[2][4];
@@ -722,20 +712,12 @@ _mesa_GetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, G
       return;
    }
 
-   if (!_mesa_validate_pbo_access(1, &ctx->Pack, ctx->Histogram.Width, 1, 1,
-                                  format, type, values)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glGetHistogram(invalid PBO access)");
+   values = _mesa_map_validate_pbo_dest(ctx, 1, &ctx->Pack,
+                                        ctx->Histogram.Width, 1, 1,
+                                        format, type, values,
+                                        "glGetHistogram");
+   if (!values)
       return;
-   }
-
-   values = _mesa_map_pbo_dest(ctx, &ctx->Pack, values);
-   if (!values) {
-      if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-         _mesa_error(ctx,GL_INVALID_OPERATION,"glGetHistogram(PBO is mapped)");
-      }
-      return;
-   }
 
    pack_histogram(ctx, ctx->Histogram.Width,
                   (CONST GLuint (*)[4]) ctx->Histogram.Count,
diff --git a/src/mesa/main/polygon.c b/src/mesa/main/polygon.c
index e327a52415..376a87a396 100644
--- a/src/mesa/main/polygon.c
+++ b/src/mesa/main/polygon.c
@@ -193,21 +193,12 @@ _mesa_PolygonMode( GLenum face, GLenum mode )
 void
 _mesa_polygon_stipple(GLcontext *ctx, const GLubyte *pattern)
 {
-   if (!_mesa_validate_pbo_access(2, &ctx->Unpack, 32, 32, 1,
-                                  GL_COLOR_INDEX, GL_BITMAP, pattern)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glPolygonStipple(bad PBO access)");
+   pattern = _mesa_map_validate_pbo_source(ctx, 2,
+                                           &ctx->Unpack, 32, 32, 1,
+                                           GL_COLOR_INDEX, GL_BITMAP, pattern,
+                                           "glPolygonStipple");
+   if (!pattern)
       return;
-   }
-
-   pattern = _mesa_map_pbo_source(ctx, &ctx->Unpack, pattern);
-   if (!pattern) {
-      if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glPolygonStipple(PBO mapped)");
-      }
-      return;
-   }
 
    _mesa_unpack_polygon_stipple(pattern, ctx->PolygonStipple, &ctx->Unpack);
 
@@ -248,21 +239,12 @@ _mesa_GetPolygonStipple( GLubyte *dest )
    if (MESA_VERBOSE&VERBOSE_API)
       _mesa_debug(ctx, "glGetPolygonStipple\n");
 
-   if (!_mesa_validate_pbo_access(2, &ctx->Pack, 32, 32, 1,
-                                  GL_COLOR_INDEX, GL_BITMAP, dest)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glGetPolygonStipple(bad PBO access)");
+   dest = _mesa_map_validate_pbo_dest(ctx, 2,
+                                      &ctx->Pack, 32, 32, 1,
+                                      GL_COLOR_INDEX, GL_BITMAP, dest,
+                                      "glGetPolygonStipple");
+   if (!dest)
       return;
-   }
-
-   dest = _mesa_map_pbo_dest(ctx, &ctx->Pack, dest);
-   if (!dest) {
-      if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetPolygonStipple(PBO mapped)");
-      }
-      return;
-   }
 
    _mesa_pack_polygon_stipple(ctx->PolygonStipple, dest, &ctx->Pack);
 
-- 
cgit v1.2.3


From 2db37ef659a43267dcb4c7a3c69b410a60a2a5d6 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 3 Sep 2009 11:41:29 -0600
Subject: mesa: use new combined PBO validate/map helpers in convolution/filter
 funcs

---
 src/mesa/main/convolve.c | 89 +++++++++++++-----------------------------------
 1 file changed, 23 insertions(+), 66 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/convolve.c b/src/mesa/main/convolve.c
index 714909f451..4d17f533d7 100644
--- a/src/mesa/main/convolve.c
+++ b/src/mesa/main/convolve.c
@@ -744,59 +744,35 @@ _mesa_GetSeparableFilter(GLenum target, GLenum format, GLenum type,
 
    filter = &ctx->Separable2D;
 
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      /* Pack filter into PBO */
-      GLubyte *buf;
-      if (!_mesa_validate_pbo_access(1, &ctx->Pack, filter->Width, 1, 1,
-                                     format, type, row)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetSeparableFilter(invalid PBO access, width)");
-         return;
-      }
-      if (!_mesa_validate_pbo_access(1, &ctx->Pack, filter->Height, 1, 1,
-                                     format, type, column)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetSeparableFilter(invalid PBO access, height)");
-         return;
-      }
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                                              GL_WRITE_ONLY_ARB,
-                                              ctx->Pack.BufferObj);
-      if (!buf) {
-         /* buffer is already mapped - that's an error */
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetSeparableFilter(PBO is mapped)");
-         return;
-      }
-      row = ADD_POINTERS(buf, row);
-      column = ADD_POINTERS(buf, column);
-   }
-
-   /* Row filter */
+   /* Get row filter */
+   row = _mesa_map_validate_pbo_dest(ctx, 1, &ctx->Pack,
+                                     filter->Width, 1, 1,
+                                     format, type, row,
+                                     "glGetConvolutionFilter");
    if (row) {
       GLvoid *dst = _mesa_image_address1d(&ctx->Pack, row, filter->Width,
                                           format, type, 0);
       _mesa_pack_rgba_span_float(ctx, filter->Width,
                                  (GLfloat (*)[4]) filter->Filter,
                                  format, type, dst, &ctx->Pack, 0x0);
+      _mesa_unmap_pbo_dest(ctx, &ctx->Pack);
    }
 
-   /* Column filter */
+   /* get column filter */
+   column = _mesa_map_validate_pbo_dest(ctx, 1, &ctx->Pack,
+                                        filter->Height, 1, 1,
+                                        format, type, row,
+                                        "glGetConvolutionFilter");
    if (column) {
       GLvoid *dst = _mesa_image_address1d(&ctx->Pack, column, filter->Height,
                                           format, type, 0);
       GLfloat (*src)[4] = (GLfloat (*)[4]) (filter->Filter + colStart);
       _mesa_pack_rgba_span_float(ctx, filter->Height, src,
                                  format, type, dst, &ctx->Pack, 0x0);
+      _mesa_unmap_pbo_dest(ctx, &ctx->Pack);
    }
 
    (void) span;  /* unused at this time */
-
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      /* Pack filter into PBO */
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                              ctx->Unpack.BufferObj);
-   }
 }
 
 
@@ -847,41 +823,16 @@ _mesa_SeparableFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLs
    ctx->Separable2D.Width = width;
    ctx->Separable2D.Height = height;
 
-   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-      /* unpack filter from PBO */
-      GLubyte *buf;
-      if (!_mesa_validate_pbo_access(1, &ctx->Unpack, width, 1, 1,
-                                     format, type, row)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glSeparableFilter2D(invalid PBO access, width)");
-         return;
-      }
-      if (!_mesa_validate_pbo_access(1, &ctx->Unpack, height, 1, 1,
-                                     format, type, column)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glSeparableFilter2D(invalid PBO access, height)");
-         return;
-      }
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                                              GL_READ_ONLY_ARB,
-                                              ctx->Unpack.BufferObj);
-      if (!buf) {
-         /* buffer is already mapped - that's an error */
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glSeparableFilter2D(PBO is mapped)");
-         return;
-      }
-      row = ADD_POINTERS(buf, row);
-      column = ADD_POINTERS(buf, column);
-   }
-
    /* unpack row filter */
+   row = _mesa_map_validate_pbo_source(ctx, 1, &ctx->Unpack,
+                                       width, 1, 1,
+                                       format, type, row,
+                                       "glSeperableFilter2D");
    if (row) {
       _mesa_unpack_color_span_float(ctx, width, GL_RGBA,
                                     ctx->Separable2D.Filter,
                                     format, type, row, &ctx->Unpack,
-                                    0);  /* transferOps */
-
+                                    0x0);  /* transferOps */
       _mesa_scale_and_bias_rgba(width,
                              (GLfloat (*)[4]) ctx->Separable2D.Filter,
                              ctx->Pixel.ConvolutionFilterScale[2][0],
@@ -892,9 +843,14 @@ _mesa_SeparableFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLs
                              ctx->Pixel.ConvolutionFilterBias[2][1],
                              ctx->Pixel.ConvolutionFilterBias[2][2],
                              ctx->Pixel.ConvolutionFilterBias[2][3]);
+      _mesa_unmap_pbo_source(ctx, &ctx->Unpack);
    }
 
    /* unpack column filter */
+   column = _mesa_map_validate_pbo_source(ctx, 1, &ctx->Unpack,
+                                          height, 1, 1,
+                                          format, type, row,
+                                          "glSeperableFilter2D");
    if (column) {
       _mesa_unpack_color_span_float(ctx, height, GL_RGBA,
                                     &ctx->Separable2D.Filter[colStart],
@@ -911,6 +867,7 @@ _mesa_SeparableFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLs
                        ctx->Pixel.ConvolutionFilterBias[2][1],
                        ctx->Pixel.ConvolutionFilterBias[2][2],
                        ctx->Pixel.ConvolutionFilterBias[2][3]);
+      _mesa_unmap_pbo_source(ctx, &ctx->Unpack);
    }
 
    if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-- 
cgit v1.2.3


From 7a7d5879e28607c151132a8b6a07cf4be36b5b3e Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 2 Sep 2009 15:39:13 -0600
Subject: mesa: compute tex env program key size based on nr_enabled_units

When no textures are enabled, the key size is 4 bytes.  If unit[0] is
enabled, the key size is 16 bytes.

Inspired by a patch from Chris Wilson.
---
 src/mesa/main/texenvprogram.c | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index b4923e904d..870970a355 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -99,6 +99,7 @@ struct state_key {
    GLuint fog_mode:2;          /**< FOG_x */
    GLuint inputs_available:12;
 
+   /* NOTE: This array of structs must be last! (see "keySize" below) */
    struct {
       GLuint enabled:1;
       GLuint source_index:3;   /**< TEXTURE_x_INDEX */
@@ -368,11 +369,12 @@ static GLbitfield get_fp_input_mask( GLcontext *ctx )
  * Examine current texture environment state and generate a unique
  * key to identify it.
  */
-static void make_state_key( GLcontext *ctx,  struct state_key *key )
+static GLuint make_state_key( GLcontext *ctx,  struct state_key *key )
 {
    GLuint i, j;
    GLbitfield inputs_referenced = FRAG_BIT_COL0;
    const GLbitfield inputs_available = get_fp_input_mask( ctx );
+   GLuint keySize;
 
    memset(key, 0, sizeof(*key));
 
@@ -390,7 +392,7 @@ static void make_state_key( GLcontext *ctx,  struct state_key *key )
 
       key->unit[i].enabled = 1;
       key->enabled_units |= (1<<i);
-      key->nr_enabled_units = i+1;
+      key->nr_enabled_units = i + 1;
       inputs_referenced |= FRAG_BIT_TEX(i);
 
       key->unit[i].source_index =
@@ -443,8 +445,15 @@ static void make_state_key( GLcontext *ctx,  struct state_key *key )
    }
 
    key->inputs_available = (inputs_available & inputs_referenced);
+
+   /* compute size of state key, ignoring unused texture units */
+   keySize = sizeof(*key) - sizeof(key->unit)
+      + key->nr_enabled_units * sizeof(key->unit[0]);
+
+   return keySize;
 }
 
+
 /**
  * Use uregs to represent registers internally, translate to Mesa's
  * expected formats on emit.  
@@ -1390,7 +1399,7 @@ create_new_program(GLcontext *ctx, struct state_key *key,
       GLboolean needbumpstage = GL_FALSE;
 
       /* Zeroth pass - bump map textures first */
-      for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++)
+      for (unit = 0; unit < key->nr_enabled_units; unit++)
 	 if (key->unit[unit].enabled &&
              key->unit[unit].ModeRGB == MODE_BUMP_ENVMAP_ATI) {
 	    needbumpstage = GL_TRUE;
@@ -1403,7 +1412,7 @@ create_new_program(GLcontext *ctx, struct state_key *key,
        * all referenced texture sources and emit texld instructions
        * for each:
        */
-      for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++)
+      for (unit = 0; unit < key->nr_enabled_units; unit++)
 	 if (key->unit[unit].enabled) {
 	    load_texunit_sources( &p, unit );
 	    p.last_tex_stage = unit;
@@ -1411,7 +1420,7 @@ create_new_program(GLcontext *ctx, struct state_key *key,
 
       /* Second pass - emit combine instructions to build final color:
        */
-      for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++)
+      for (unit = 0; unit < key->nr_enabled_units; unit++)
 	 if (key->unit[unit].enabled) {
 	    p.src_previous = emit_texenv( &p, unit );
             reserve_temp(&p, p.src_previous); /* don't re-use this temp reg */
@@ -1502,12 +1511,13 @@ _mesa_get_fixed_func_fragment_program(GLcontext *ctx)
 {
    struct gl_fragment_program *prog;
    struct state_key key;
+   GLuint keySize;
 	
-   make_state_key(ctx, &key);
+   keySize = make_state_key(ctx, &key);
       
    prog = (struct gl_fragment_program *)
       _mesa_search_program_cache(ctx->FragmentProgram.Cache,
-                                 &key, sizeof(key));
+                                 &key, keySize);
 
    if (!prog) {
       prog = (struct gl_fragment_program *) 
@@ -1516,7 +1526,7 @@ _mesa_get_fixed_func_fragment_program(GLcontext *ctx)
       create_new_program(ctx, &key, prog);
 
       _mesa_program_cache_insert(ctx, ctx->FragmentProgram.Cache,
-                                 &key, sizeof(key), &prog->Base);
+                                 &key, keySize, &prog->Base);
    }
 
    return prog;
-- 
cgit v1.2.3


From d75a99edd6386ab26d69a3f0cbbed4c79fe5fad4 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 3 Sep 2009 12:10:53 -0600
Subject: mesa: fix typos in separable filter functions

---
 src/mesa/main/convolve.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/convolve.c b/src/mesa/main/convolve.c
index 4d17f533d7..70951112a1 100644
--- a/src/mesa/main/convolve.c
+++ b/src/mesa/main/convolve.c
@@ -761,7 +761,7 @@ _mesa_GetSeparableFilter(GLenum target, GLenum format, GLenum type,
    /* get column filter */
    column = _mesa_map_validate_pbo_dest(ctx, 1, &ctx->Pack,
                                         filter->Height, 1, 1,
-                                        format, type, row,
+                                        format, type, column,
                                         "glGetConvolutionFilter");
    if (column) {
       GLvoid *dst = _mesa_image_address1d(&ctx->Pack, column, filter->Height,
@@ -827,7 +827,7 @@ _mesa_SeparableFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLs
    row = _mesa_map_validate_pbo_source(ctx, 1, &ctx->Unpack,
                                        width, 1, 1,
                                        format, type, row,
-                                       "glSeperableFilter2D");
+                                       "glSeparableFilter2D");
    if (row) {
       _mesa_unpack_color_span_float(ctx, width, GL_RGBA,
                                     ctx->Separable2D.Filter,
@@ -849,8 +849,8 @@ _mesa_SeparableFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLs
    /* unpack column filter */
    column = _mesa_map_validate_pbo_source(ctx, 1, &ctx->Unpack,
                                           height, 1, 1,
-                                          format, type, row,
-                                          "glSeperableFilter2D");
+                                          format, type, column,
+                                          "glSeparableFilter2D");
    if (column) {
       _mesa_unpack_color_span_float(ctx, height, GL_RGBA,
                                     &ctx->Separable2D.Filter[colStart],
-- 
cgit v1.2.3


From 10067e464132e6d484c34dd277da5eb5e21cf491 Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Fri, 28 Aug 2009 15:37:25 -0700
Subject: ARB sync: Add infrastructure for glGetInteger64v

---
 src/mesa/main/dd.h       |    2 +
 src/mesa/main/get.c      | 1832 ++++++++++++++++++++++++++++++++++++++++++++++
 src/mesa/main/get.h      |    3 +
 src/mesa/main/get_gen.py |   22 +-
 src/mesa/main/imports.h  |    1 +
 src/mesa/main/macros.h   |    3 +
 6 files changed, 1862 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index 4400e166c6..3a59872b5a 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -766,6 +766,8 @@ struct dd_function_table {
    /** Return the value or values of a selected parameter */
    GLboolean (*GetIntegerv)(GLcontext *ctx, GLenum pname, GLint *result);
    /** Return the value or values of a selected parameter */
+   GLboolean (*GetInteger64v)(GLcontext *ctx, GLenum pname, GLint64 *result);
+   /** Return the value or values of a selected parameter */
    GLboolean (*GetPointerv)(GLcontext *ctx, GLenum pname, GLvoid **result);
    /*@}*/
    
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index d0c9cea00c..fc742c4a90 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -20,8 +20,11 @@
 #define INT_TO_BOOLEAN(I)     ( (I) ? GL_TRUE : GL_FALSE )
 
 #define BOOLEAN_TO_INT(B)     ( (GLint) (B) )
+#define BOOLEAN_TO_INT64(B)   ( (GLint64) (B) )
 #define BOOLEAN_TO_FLOAT(B)   ( (B) ? 1.0F : 0.0F )
 
+#define ENUM_TO_INT64(E)      ( (GLint64) (E) )
+
 
 /*
  * Check if named extension is enabled, if not generate error and return.
@@ -5543,6 +5546,1835 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
    }
 }
 
+#if FEATURE_ARB_sync
+void GLAPIENTRY
+_mesa_GetInteger64v( GLenum pname, GLint64 *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (!params)
+      return;
+
+   if (ctx->NewState)
+      _mesa_update_state(ctx);
+
+   if (ctx->Driver.GetInteger64v &&
+       ctx->Driver.GetInteger64v(ctx, pname, params))
+      return;
+
+   switch (pname) {
+      case GL_ACCUM_RED_BITS:
+         params[0] = ctx->DrawBuffer->Visual.accumRedBits;
+         break;
+      case GL_ACCUM_GREEN_BITS:
+         params[0] = ctx->DrawBuffer->Visual.accumGreenBits;
+         break;
+      case GL_ACCUM_BLUE_BITS:
+         params[0] = ctx->DrawBuffer->Visual.accumBlueBits;
+         break;
+      case GL_ACCUM_ALPHA_BITS:
+         params[0] = ctx->DrawBuffer->Visual.accumAlphaBits;
+         break;
+      case GL_ACCUM_CLEAR_VALUE:
+         params[0] = FLOAT_TO_INT64(ctx->Accum.ClearColor[0]);
+         params[1] = FLOAT_TO_INT64(ctx->Accum.ClearColor[1]);
+         params[2] = FLOAT_TO_INT64(ctx->Accum.ClearColor[2]);
+         params[3] = FLOAT_TO_INT64(ctx->Accum.ClearColor[3]);
+         break;
+      case GL_ALPHA_BIAS:
+         params[0] = IROUND64(ctx->Pixel.AlphaBias);
+         break;
+      case GL_ALPHA_BITS:
+         params[0] = ctx->DrawBuffer->Visual.alphaBits;
+         break;
+      case GL_ALPHA_SCALE:
+         params[0] = IROUND64(ctx->Pixel.AlphaScale);
+         break;
+      case GL_ALPHA_TEST:
+         params[0] = BOOLEAN_TO_INT64(ctx->Color.AlphaEnabled);
+         break;
+      case GL_ALPHA_TEST_FUNC:
+         params[0] = ENUM_TO_INT64(ctx->Color.AlphaFunc);
+         break;
+      case GL_ALPHA_TEST_REF:
+         params[0] = FLOAT_TO_INT64(ctx->Color.AlphaRef);
+         break;
+      case GL_ATTRIB_STACK_DEPTH:
+         params[0] = ctx->AttribStackDepth;
+         break;
+      case GL_AUTO_NORMAL:
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.AutoNormal);
+         break;
+      case GL_AUX_BUFFERS:
+         params[0] = ctx->DrawBuffer->Visual.numAuxBuffers;
+         break;
+      case GL_BLEND:
+         params[0] = BOOLEAN_TO_INT64(ctx->Color.BlendEnabled);
+         break;
+      case GL_BLEND_DST:
+         params[0] = ENUM_TO_INT64(ctx->Color.BlendDstRGB);
+         break;
+      case GL_BLEND_SRC:
+         params[0] = ENUM_TO_INT64(ctx->Color.BlendSrcRGB);
+         break;
+      case GL_BLEND_SRC_RGB_EXT:
+         params[0] = ENUM_TO_INT64(ctx->Color.BlendSrcRGB);
+         break;
+      case GL_BLEND_DST_RGB_EXT:
+         params[0] = ENUM_TO_INT64(ctx->Color.BlendDstRGB);
+         break;
+      case GL_BLEND_SRC_ALPHA_EXT:
+         params[0] = ENUM_TO_INT64(ctx->Color.BlendSrcA);
+         break;
+      case GL_BLEND_DST_ALPHA_EXT:
+         params[0] = ENUM_TO_INT64(ctx->Color.BlendDstA);
+         break;
+      case GL_BLEND_EQUATION:
+         params[0] = ENUM_TO_INT64(ctx->Color.BlendEquationRGB );
+         break;
+      case GL_BLEND_EQUATION_ALPHA_EXT:
+         params[0] = ENUM_TO_INT64(ctx->Color.BlendEquationA );
+         break;
+      case GL_BLEND_COLOR_EXT:
+         params[0] = FLOAT_TO_INT64(ctx->Color.BlendColor[0]);
+         params[1] = FLOAT_TO_INT64(ctx->Color.BlendColor[1]);
+         params[2] = FLOAT_TO_INT64(ctx->Color.BlendColor[2]);
+         params[3] = FLOAT_TO_INT64(ctx->Color.BlendColor[3]);
+         break;
+      case GL_BLUE_BIAS:
+         params[0] = IROUND64(ctx->Pixel.BlueBias);
+         break;
+      case GL_BLUE_BITS:
+         params[0] = ctx->DrawBuffer->Visual.blueBits;
+         break;
+      case GL_BLUE_SCALE:
+         params[0] = IROUND64(ctx->Pixel.BlueScale);
+         break;
+      case GL_CLIENT_ATTRIB_STACK_DEPTH:
+         params[0] = ctx->ClientAttribStackDepth;
+         break;
+      case GL_CLIP_PLANE0:
+         params[0] = BOOLEAN_TO_INT64((ctx->Transform.ClipPlanesEnabled >> 0) & 1);
+         break;
+      case GL_CLIP_PLANE1:
+         params[0] = BOOLEAN_TO_INT64((ctx->Transform.ClipPlanesEnabled >> 1) & 1);
+         break;
+      case GL_CLIP_PLANE2:
+         params[0] = BOOLEAN_TO_INT64((ctx->Transform.ClipPlanesEnabled >> 2) & 1);
+         break;
+      case GL_CLIP_PLANE3:
+         params[0] = BOOLEAN_TO_INT64((ctx->Transform.ClipPlanesEnabled >> 3) & 1);
+         break;
+      case GL_CLIP_PLANE4:
+         params[0] = BOOLEAN_TO_INT64((ctx->Transform.ClipPlanesEnabled >> 4) & 1);
+         break;
+      case GL_CLIP_PLANE5:
+         params[0] = BOOLEAN_TO_INT64((ctx->Transform.ClipPlanesEnabled >> 5) & 1);
+         break;
+      case GL_COLOR_CLEAR_VALUE:
+         params[0] = FLOAT_TO_INT64(ctx->Color.ClearColor[0]);
+         params[1] = FLOAT_TO_INT64(ctx->Color.ClearColor[1]);
+         params[2] = FLOAT_TO_INT64(ctx->Color.ClearColor[2]);
+         params[3] = FLOAT_TO_INT64(ctx->Color.ClearColor[3]);
+         break;
+      case GL_COLOR_MATERIAL:
+         params[0] = BOOLEAN_TO_INT64(ctx->Light.ColorMaterialEnabled);
+         break;
+      case GL_COLOR_MATERIAL_FACE:
+         params[0] = ENUM_TO_INT64(ctx->Light.ColorMaterialFace);
+         break;
+      case GL_COLOR_MATERIAL_PARAMETER:
+         params[0] = ENUM_TO_INT64(ctx->Light.ColorMaterialMode);
+         break;
+      case GL_COLOR_WRITEMASK:
+         params[0] = ctx->Color.ColorMask[RCOMP] ? 1 : 0;
+         params[1] = ctx->Color.ColorMask[GCOMP] ? 1 : 0;
+         params[2] = ctx->Color.ColorMask[BCOMP] ? 1 : 0;
+         params[3] = ctx->Color.ColorMask[ACOMP] ? 1 : 0;
+         break;
+      case GL_CULL_FACE:
+         params[0] = BOOLEAN_TO_INT64(ctx->Polygon.CullFlag);
+         break;
+      case GL_CULL_FACE_MODE:
+         params[0] = ENUM_TO_INT64(ctx->Polygon.CullFaceMode);
+         break;
+      case GL_CURRENT_COLOR:
+         {
+         FLUSH_CURRENT(ctx, 0);
+         params[0] = FLOAT_TO_INT64(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][0]);
+         params[1] = FLOAT_TO_INT64(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][1]);
+         params[2] = FLOAT_TO_INT64(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][2]);
+         params[3] = FLOAT_TO_INT64(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][3]);
+         }
+         break;
+      case GL_CURRENT_INDEX:
+         {
+         FLUSH_CURRENT(ctx, 0);
+         params[0] = IROUND64(ctx->Current.Attrib[VERT_ATTRIB_COLOR_INDEX][0]);
+         }
+         break;
+      case GL_CURRENT_NORMAL:
+         {
+         FLUSH_CURRENT(ctx, 0);
+         params[0] = FLOAT_TO_INT64(ctx->Current.Attrib[VERT_ATTRIB_NORMAL][0]);
+         params[1] = FLOAT_TO_INT64(ctx->Current.Attrib[VERT_ATTRIB_NORMAL][1]);
+         params[2] = FLOAT_TO_INT64(ctx->Current.Attrib[VERT_ATTRIB_NORMAL][2]);
+         }
+         break;
+      case GL_CURRENT_RASTER_COLOR:
+         params[0] = FLOAT_TO_INT64(ctx->Current.RasterColor[0]);
+         params[1] = FLOAT_TO_INT64(ctx->Current.RasterColor[1]);
+         params[2] = FLOAT_TO_INT64(ctx->Current.RasterColor[2]);
+         params[3] = FLOAT_TO_INT64(ctx->Current.RasterColor[3]);
+         break;
+      case GL_CURRENT_RASTER_DISTANCE:
+         params[0] = IROUND64(ctx->Current.RasterDistance);
+         break;
+      case GL_CURRENT_RASTER_INDEX:
+         params[0] = IROUND64(ctx->Current.RasterIndex);
+         break;
+      case GL_CURRENT_RASTER_POSITION:
+         params[0] = IROUND64(ctx->Current.RasterPos[0]);
+         params[1] = IROUND64(ctx->Current.RasterPos[1]);
+         params[2] = IROUND64(ctx->Current.RasterPos[2]);
+         params[3] = IROUND64(ctx->Current.RasterPos[3]);
+         break;
+      case GL_CURRENT_RASTER_SECONDARY_COLOR:
+         params[0] = FLOAT_TO_INT64(ctx->Current.RasterSecondaryColor[0]);
+         params[1] = FLOAT_TO_INT64(ctx->Current.RasterSecondaryColor[1]);
+         params[2] = FLOAT_TO_INT64(ctx->Current.RasterSecondaryColor[2]);
+         params[3] = FLOAT_TO_INT64(ctx->Current.RasterSecondaryColor[3]);
+         break;
+      case GL_CURRENT_RASTER_TEXTURE_COORDS:
+         {
+         const GLuint texUnit = ctx->Texture.CurrentUnit;
+         params[0] = IROUND64(ctx->Current.RasterTexCoords[texUnit][0]);
+         params[1] = IROUND64(ctx->Current.RasterTexCoords[texUnit][1]);
+         params[2] = IROUND64(ctx->Current.RasterTexCoords[texUnit][2]);
+         params[3] = IROUND64(ctx->Current.RasterTexCoords[texUnit][3]);
+         }
+         break;
+      case GL_CURRENT_RASTER_POSITION_VALID:
+         params[0] = BOOLEAN_TO_INT64(ctx->Current.RasterPosValid);
+         break;
+      case GL_CURRENT_TEXTURE_COORDS:
+         {
+         const GLuint texUnit = ctx->Texture.CurrentUnit;
+         FLUSH_CURRENT(ctx, 0);
+         params[0] = IROUND64(ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][0]);
+         params[1] = IROUND64(ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][1]);
+         params[2] = IROUND64(ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][2]);
+         params[3] = IROUND64(ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][3]);
+         }
+         break;
+      case GL_DEPTH_BIAS:
+         params[0] = IROUND64(ctx->Pixel.DepthBias);
+         break;
+      case GL_DEPTH_BITS:
+         params[0] = ctx->DrawBuffer->Visual.depthBits;
+         break;
+      case GL_DEPTH_CLEAR_VALUE:
+         params[0] = FLOAT_TO_INT64(((GLfloat) ctx->Depth.Clear));
+         break;
+      case GL_DEPTH_FUNC:
+         params[0] = ENUM_TO_INT64(ctx->Depth.Func);
+         break;
+      case GL_DEPTH_RANGE:
+         params[0] = FLOAT_TO_INT64(ctx->Viewport.Near);
+         params[1] = FLOAT_TO_INT64(ctx->Viewport.Far);
+         break;
+      case GL_DEPTH_SCALE:
+         params[0] = IROUND64(ctx->Pixel.DepthScale);
+         break;
+      case GL_DEPTH_TEST:
+         params[0] = BOOLEAN_TO_INT64(ctx->Depth.Test);
+         break;
+      case GL_DEPTH_WRITEMASK:
+         params[0] = BOOLEAN_TO_INT64(ctx->Depth.Mask);
+         break;
+      case GL_DITHER:
+         params[0] = BOOLEAN_TO_INT64(ctx->Color.DitherFlag);
+         break;
+      case GL_DOUBLEBUFFER:
+         params[0] = BOOLEAN_TO_INT64(ctx->DrawBuffer->Visual.doubleBufferMode);
+         break;
+      case GL_DRAW_BUFFER:
+         params[0] = ENUM_TO_INT64(ctx->DrawBuffer->ColorDrawBuffer[0]);
+         break;
+      case GL_EDGE_FLAG:
+         {
+         FLUSH_CURRENT(ctx, 0);
+         params[0] = BOOLEAN_TO_INT64((ctx->Current.Attrib[VERT_ATTRIB_EDGEFLAG][0] == 1.0));
+         }
+         break;
+      case GL_FEEDBACK_BUFFER_SIZE:
+         params[0] = ctx->Feedback.BufferSize;
+         break;
+      case GL_FEEDBACK_BUFFER_TYPE:
+         params[0] = ENUM_TO_INT64(ctx->Feedback.Type);
+         break;
+      case GL_FOG:
+         params[0] = BOOLEAN_TO_INT64(ctx->Fog.Enabled);
+         break;
+      case GL_FOG_COLOR:
+         params[0] = FLOAT_TO_INT64(ctx->Fog.Color[0]);
+         params[1] = FLOAT_TO_INT64(ctx->Fog.Color[1]);
+         params[2] = FLOAT_TO_INT64(ctx->Fog.Color[2]);
+         params[3] = FLOAT_TO_INT64(ctx->Fog.Color[3]);
+         break;
+      case GL_FOG_DENSITY:
+         params[0] = IROUND64(ctx->Fog.Density);
+         break;
+      case GL_FOG_END:
+         params[0] = IROUND64(ctx->Fog.End);
+         break;
+      case GL_FOG_HINT:
+         params[0] = ENUM_TO_INT64(ctx->Hint.Fog);
+         break;
+      case GL_FOG_INDEX:
+         params[0] = IROUND64(ctx->Fog.Index);
+         break;
+      case GL_FOG_MODE:
+         params[0] = ENUM_TO_INT64(ctx->Fog.Mode);
+         break;
+      case GL_FOG_START:
+         params[0] = IROUND64(ctx->Fog.Start);
+         break;
+      case GL_FRONT_FACE:
+         params[0] = ENUM_TO_INT64(ctx->Polygon.FrontFace);
+         break;
+      case GL_GREEN_BIAS:
+         params[0] = IROUND64(ctx->Pixel.GreenBias);
+         break;
+      case GL_GREEN_BITS:
+         params[0] = ctx->DrawBuffer->Visual.greenBits;
+         break;
+      case GL_GREEN_SCALE:
+         params[0] = IROUND64(ctx->Pixel.GreenScale);
+         break;
+      case GL_INDEX_BITS:
+         params[0] = ctx->DrawBuffer->Visual.indexBits;
+         break;
+      case GL_INDEX_CLEAR_VALUE:
+         params[0] = ctx->Color.ClearIndex;
+         break;
+      case GL_INDEX_MODE:
+         params[0] = BOOLEAN_TO_INT64(!ctx->DrawBuffer->Visual.rgbMode);
+         break;
+      case GL_INDEX_OFFSET:
+         params[0] = ctx->Pixel.IndexOffset;
+         break;
+      case GL_INDEX_SHIFT:
+         params[0] = ctx->Pixel.IndexShift;
+         break;
+      case GL_INDEX_WRITEMASK:
+         params[0] = ctx->Color.IndexMask;
+         break;
+      case GL_LIGHT0:
+         params[0] = BOOLEAN_TO_INT64(ctx->Light.Light[0].Enabled);
+         break;
+      case GL_LIGHT1:
+         params[0] = BOOLEAN_TO_INT64(ctx->Light.Light[1].Enabled);
+         break;
+      case GL_LIGHT2:
+         params[0] = BOOLEAN_TO_INT64(ctx->Light.Light[2].Enabled);
+         break;
+      case GL_LIGHT3:
+         params[0] = BOOLEAN_TO_INT64(ctx->Light.Light[3].Enabled);
+         break;
+      case GL_LIGHT4:
+         params[0] = BOOLEAN_TO_INT64(ctx->Light.Light[4].Enabled);
+         break;
+      case GL_LIGHT5:
+         params[0] = BOOLEAN_TO_INT64(ctx->Light.Light[5].Enabled);
+         break;
+      case GL_LIGHT6:
+         params[0] = BOOLEAN_TO_INT64(ctx->Light.Light[6].Enabled);
+         break;
+      case GL_LIGHT7:
+         params[0] = BOOLEAN_TO_INT64(ctx->Light.Light[7].Enabled);
+         break;
+      case GL_LIGHTING:
+         params[0] = BOOLEAN_TO_INT64(ctx->Light.Enabled);
+         break;
+      case GL_LIGHT_MODEL_AMBIENT:
+         params[0] = FLOAT_TO_INT64(ctx->Light.Model.Ambient[0]);
+         params[1] = FLOAT_TO_INT64(ctx->Light.Model.Ambient[1]);
+         params[2] = FLOAT_TO_INT64(ctx->Light.Model.Ambient[2]);
+         params[3] = FLOAT_TO_INT64(ctx->Light.Model.Ambient[3]);
+         break;
+      case GL_LIGHT_MODEL_COLOR_CONTROL:
+         params[0] = ENUM_TO_INT64(ctx->Light.Model.ColorControl);
+         break;
+      case GL_LIGHT_MODEL_LOCAL_VIEWER:
+         params[0] = BOOLEAN_TO_INT64(ctx->Light.Model.LocalViewer);
+         break;
+      case GL_LIGHT_MODEL_TWO_SIDE:
+         params[0] = BOOLEAN_TO_INT64(ctx->Light.Model.TwoSide);
+         break;
+      case GL_LINE_SMOOTH:
+         params[0] = BOOLEAN_TO_INT64(ctx->Line.SmoothFlag);
+         break;
+      case GL_LINE_SMOOTH_HINT:
+         params[0] = ENUM_TO_INT64(ctx->Hint.LineSmooth);
+         break;
+      case GL_LINE_STIPPLE:
+         params[0] = BOOLEAN_TO_INT64(ctx->Line.StippleFlag);
+         break;
+      case GL_LINE_STIPPLE_PATTERN:
+         params[0] = ctx->Line.StipplePattern;
+         break;
+      case GL_LINE_STIPPLE_REPEAT:
+         params[0] = ctx->Line.StippleFactor;
+         break;
+      case GL_LINE_WIDTH:
+         params[0] = IROUND64(ctx->Line.Width);
+         break;
+      case GL_LINE_WIDTH_GRANULARITY:
+         params[0] = IROUND64(ctx->Const.LineWidthGranularity);
+         break;
+      case GL_LINE_WIDTH_RANGE:
+         params[0] = IROUND64(ctx->Const.MinLineWidthAA);
+         params[1] = IROUND64(ctx->Const.MaxLineWidthAA);
+         break;
+      case GL_ALIASED_LINE_WIDTH_RANGE:
+         params[0] = IROUND64(ctx->Const.MinLineWidth);
+         params[1] = IROUND64(ctx->Const.MaxLineWidth);
+         break;
+      case GL_LIST_BASE:
+         params[0] = ctx->List.ListBase;
+         break;
+      case GL_LIST_INDEX:
+         params[0] = (ctx->ListState.CurrentList ? ctx->ListState.CurrentList->Name : 0);
+         break;
+      case GL_LIST_MODE:
+         {
+         GLenum mode;
+         if (!ctx->CompileFlag)
+            mode = 0;
+         else if (ctx->ExecuteFlag)
+            mode = GL_COMPILE_AND_EXECUTE;
+         else
+            mode = GL_COMPILE;
+         params[0] = ENUM_TO_INT64(mode);
+         }
+         break;
+      case GL_INDEX_LOGIC_OP:
+         params[0] = BOOLEAN_TO_INT64(ctx->Color.IndexLogicOpEnabled);
+         break;
+      case GL_COLOR_LOGIC_OP:
+         params[0] = BOOLEAN_TO_INT64(ctx->Color.ColorLogicOpEnabled);
+         break;
+      case GL_LOGIC_OP_MODE:
+         params[0] = ENUM_TO_INT64(ctx->Color.LogicOp);
+         break;
+      case GL_MAP1_COLOR_4:
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Color4);
+         break;
+      case GL_MAP1_GRID_DOMAIN:
+         params[0] = IROUND64(ctx->Eval.MapGrid1u1);
+         params[1] = IROUND64(ctx->Eval.MapGrid1u2);
+         break;
+      case GL_MAP1_GRID_SEGMENTS:
+         params[0] = ctx->Eval.MapGrid1un;
+         break;
+      case GL_MAP1_INDEX:
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Index);
+         break;
+      case GL_MAP1_NORMAL:
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Normal);
+         break;
+      case GL_MAP1_TEXTURE_COORD_1:
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1TextureCoord1);
+         break;
+      case GL_MAP1_TEXTURE_COORD_2:
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1TextureCoord2);
+         break;
+      case GL_MAP1_TEXTURE_COORD_3:
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1TextureCoord3);
+         break;
+      case GL_MAP1_TEXTURE_COORD_4:
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1TextureCoord4);
+         break;
+      case GL_MAP1_VERTEX_3:
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Vertex3);
+         break;
+      case GL_MAP1_VERTEX_4:
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Vertex4);
+         break;
+      case GL_MAP2_COLOR_4:
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map2Color4);
+         break;
+      case GL_MAP2_GRID_DOMAIN:
+         params[0] = IROUND64(ctx->Eval.MapGrid2u1);
+         params[1] = IROUND64(ctx->Eval.MapGrid2u2);
+         params[2] = IROUND64(ctx->Eval.MapGrid2v1);
+         params[3] = IROUND64(ctx->Eval.MapGrid2v2);
+         break;
+      case GL_MAP2_GRID_SEGMENTS:
+         params[0] = ctx->Eval.MapGrid2un;
+         params[1] = ctx->Eval.MapGrid2vn;
+         break;
+      case GL_MAP2_INDEX:
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map2Index);
+         break;
+      case GL_MAP2_NORMAL:
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map2Normal);
+         break;
+      case GL_MAP2_TEXTURE_COORD_1:
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map2TextureCoord1);
+         break;
+      case GL_MAP2_TEXTURE_COORD_2:
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map2TextureCoord2);
+         break;
+      case GL_MAP2_TEXTURE_COORD_3:
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map2TextureCoord3);
+         break;
+      case GL_MAP2_TEXTURE_COORD_4:
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map2TextureCoord4);
+         break;
+      case GL_MAP2_VERTEX_3:
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map2Vertex3);
+         break;
+      case GL_MAP2_VERTEX_4:
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map2Vertex4);
+         break;
+      case GL_MAP_COLOR:
+         params[0] = BOOLEAN_TO_INT64(ctx->Pixel.MapColorFlag);
+         break;
+      case GL_MAP_STENCIL:
+         params[0] = BOOLEAN_TO_INT64(ctx->Pixel.MapStencilFlag);
+         break;
+      case GL_MATRIX_MODE:
+         params[0] = ENUM_TO_INT64(ctx->Transform.MatrixMode);
+         break;
+      case GL_MAX_ATTRIB_STACK_DEPTH:
+         params[0] = MAX_ATTRIB_STACK_DEPTH;
+         break;
+      case GL_MAX_CLIENT_ATTRIB_STACK_DEPTH:
+         params[0] = MAX_CLIENT_ATTRIB_STACK_DEPTH;
+         break;
+      case GL_MAX_CLIP_PLANES:
+         params[0] = ctx->Const.MaxClipPlanes;
+         break;
+      case GL_MAX_ELEMENTS_VERTICES:
+         params[0] = ctx->Const.MaxArrayLockSize;
+         break;
+      case GL_MAX_ELEMENTS_INDICES:
+         params[0] = ctx->Const.MaxArrayLockSize;
+         break;
+      case GL_MAX_EVAL_ORDER:
+         params[0] = MAX_EVAL_ORDER;
+         break;
+      case GL_MAX_LIGHTS:
+         params[0] = ctx->Const.MaxLights;
+         break;
+      case GL_MAX_LIST_NESTING:
+         params[0] = MAX_LIST_NESTING;
+         break;
+      case GL_MAX_MODELVIEW_STACK_DEPTH:
+         params[0] = MAX_MODELVIEW_STACK_DEPTH;
+         break;
+      case GL_MAX_NAME_STACK_DEPTH:
+         params[0] = MAX_NAME_STACK_DEPTH;
+         break;
+      case GL_MAX_PIXEL_MAP_TABLE:
+         params[0] = MAX_PIXEL_MAP_TABLE;
+         break;
+      case GL_MAX_PROJECTION_STACK_DEPTH:
+         params[0] = MAX_PROJECTION_STACK_DEPTH;
+         break;
+      case GL_MAX_TEXTURE_SIZE:
+         params[0] = 1 << (ctx->Const.MaxTextureLevels - 1);
+         break;
+      case GL_MAX_3D_TEXTURE_SIZE:
+         params[0] = 1 << (ctx->Const.Max3DTextureLevels - 1);
+         break;
+      case GL_MAX_TEXTURE_STACK_DEPTH:
+         params[0] = MAX_TEXTURE_STACK_DEPTH;
+         break;
+      case GL_MAX_VIEWPORT_DIMS:
+         params[0] = ctx->Const.MaxViewportWidth;
+         params[1] = ctx->Const.MaxViewportHeight;
+         break;
+      case GL_MODELVIEW_MATRIX:
+         {
+         const GLfloat *matrix = ctx->ModelviewMatrixStack.Top->m;
+         params[0] = IROUND64(matrix[0]);
+         params[1] = IROUND64(matrix[1]);
+         params[2] = IROUND64(matrix[2]);
+         params[3] = IROUND64(matrix[3]);
+         params[4] = IROUND64(matrix[4]);
+         params[5] = IROUND64(matrix[5]);
+         params[6] = IROUND64(matrix[6]);
+         params[7] = IROUND64(matrix[7]);
+         params[8] = IROUND64(matrix[8]);
+         params[9] = IROUND64(matrix[9]);
+         params[10] = IROUND64(matrix[10]);
+         params[11] = IROUND64(matrix[11]);
+         params[12] = IROUND64(matrix[12]);
+         params[13] = IROUND64(matrix[13]);
+         params[14] = IROUND64(matrix[14]);
+         params[15] = IROUND64(matrix[15]);
+         }
+         break;
+      case GL_MODELVIEW_STACK_DEPTH:
+         params[0] = ctx->ModelviewMatrixStack.Depth + 1;
+         break;
+      case GL_NAME_STACK_DEPTH:
+         params[0] = ctx->Select.NameStackDepth;
+         break;
+      case GL_NORMALIZE:
+         params[0] = BOOLEAN_TO_INT64(ctx->Transform.Normalize);
+         break;
+      case GL_PACK_ALIGNMENT:
+         params[0] = ctx->Pack.Alignment;
+         break;
+      case GL_PACK_LSB_FIRST:
+         params[0] = BOOLEAN_TO_INT64(ctx->Pack.LsbFirst);
+         break;
+      case GL_PACK_ROW_LENGTH:
+         params[0] = ctx->Pack.RowLength;
+         break;
+      case GL_PACK_SKIP_PIXELS:
+         params[0] = ctx->Pack.SkipPixels;
+         break;
+      case GL_PACK_SKIP_ROWS:
+         params[0] = ctx->Pack.SkipRows;
+         break;
+      case GL_PACK_SWAP_BYTES:
+         params[0] = BOOLEAN_TO_INT64(ctx->Pack.SwapBytes);
+         break;
+      case GL_PACK_SKIP_IMAGES_EXT:
+         params[0] = ctx->Pack.SkipImages;
+         break;
+      case GL_PACK_IMAGE_HEIGHT_EXT:
+         params[0] = ctx->Pack.ImageHeight;
+         break;
+      case GL_PACK_INVERT_MESA:
+         params[0] = BOOLEAN_TO_INT64(ctx->Pack.Invert);
+         break;
+      case GL_PERSPECTIVE_CORRECTION_HINT:
+         params[0] = ENUM_TO_INT64(ctx->Hint.PerspectiveCorrection);
+         break;
+      case GL_PIXEL_MAP_A_TO_A_SIZE:
+         params[0] = ctx->PixelMaps.AtoA.Size;
+         break;
+      case GL_PIXEL_MAP_B_TO_B_SIZE:
+         params[0] = ctx->PixelMaps.BtoB.Size;
+         break;
+      case GL_PIXEL_MAP_G_TO_G_SIZE:
+         params[0] = ctx->PixelMaps.GtoG.Size;
+         break;
+      case GL_PIXEL_MAP_I_TO_A_SIZE:
+         params[0] = ctx->PixelMaps.ItoA.Size;
+         break;
+      case GL_PIXEL_MAP_I_TO_B_SIZE:
+         params[0] = ctx->PixelMaps.ItoB.Size;
+         break;
+      case GL_PIXEL_MAP_I_TO_G_SIZE:
+         params[0] = ctx->PixelMaps.ItoG.Size;
+         break;
+      case GL_PIXEL_MAP_I_TO_I_SIZE:
+         params[0] = ctx->PixelMaps.ItoI.Size;
+         break;
+      case GL_PIXEL_MAP_I_TO_R_SIZE:
+         params[0] = ctx->PixelMaps.ItoR.Size;
+         break;
+      case GL_PIXEL_MAP_R_TO_R_SIZE:
+         params[0] = ctx->PixelMaps.RtoR.Size;
+         break;
+      case GL_PIXEL_MAP_S_TO_S_SIZE:
+         params[0] = ctx->PixelMaps.StoS.Size;
+         break;
+      case GL_POINT_SIZE:
+         params[0] = IROUND64(ctx->Point.Size);
+         break;
+      case GL_POINT_SIZE_GRANULARITY:
+         params[0] = IROUND64(ctx->Const.PointSizeGranularity);
+         break;
+      case GL_POINT_SIZE_RANGE:
+         params[0] = IROUND64(ctx->Const.MinPointSizeAA);
+         params[1] = IROUND64(ctx->Const.MaxPointSizeAA);
+         break;
+      case GL_ALIASED_POINT_SIZE_RANGE:
+         params[0] = IROUND64(ctx->Const.MinPointSize);
+         params[1] = IROUND64(ctx->Const.MaxPointSize);
+         break;
+      case GL_POINT_SMOOTH:
+         params[0] = BOOLEAN_TO_INT64(ctx->Point.SmoothFlag);
+         break;
+      case GL_POINT_SMOOTH_HINT:
+         params[0] = ENUM_TO_INT64(ctx->Hint.PointSmooth);
+         break;
+      case GL_POINT_SIZE_MIN_EXT:
+         params[0] = IROUND64(ctx->Point.MinSize);
+         break;
+      case GL_POINT_SIZE_MAX_EXT:
+         params[0] = IROUND64(ctx->Point.MaxSize);
+         break;
+      case GL_POINT_FADE_THRESHOLD_SIZE_EXT:
+         params[0] = IROUND64(ctx->Point.Threshold);
+         break;
+      case GL_DISTANCE_ATTENUATION_EXT:
+         params[0] = IROUND64(ctx->Point.Params[0]);
+         params[1] = IROUND64(ctx->Point.Params[1]);
+         params[2] = IROUND64(ctx->Point.Params[2]);
+         break;
+      case GL_POLYGON_MODE:
+         params[0] = ENUM_TO_INT64(ctx->Polygon.FrontMode);
+         params[1] = ENUM_TO_INT64(ctx->Polygon.BackMode);
+         break;
+      case GL_POLYGON_OFFSET_BIAS_EXT:
+         params[0] = IROUND64(ctx->Polygon.OffsetUnits);
+         break;
+      case GL_POLYGON_OFFSET_FACTOR:
+         params[0] = IROUND64(ctx->Polygon.OffsetFactor );
+         break;
+      case GL_POLYGON_OFFSET_UNITS:
+         params[0] = IROUND64(ctx->Polygon.OffsetUnits );
+         break;
+      case GL_POLYGON_OFFSET_POINT:
+         params[0] = BOOLEAN_TO_INT64(ctx->Polygon.OffsetPoint);
+         break;
+      case GL_POLYGON_OFFSET_LINE:
+         params[0] = BOOLEAN_TO_INT64(ctx->Polygon.OffsetLine);
+         break;
+      case GL_POLYGON_OFFSET_FILL:
+         params[0] = BOOLEAN_TO_INT64(ctx->Polygon.OffsetFill);
+         break;
+      case GL_POLYGON_SMOOTH:
+         params[0] = BOOLEAN_TO_INT64(ctx->Polygon.SmoothFlag);
+         break;
+      case GL_POLYGON_SMOOTH_HINT:
+         params[0] = ENUM_TO_INT64(ctx->Hint.PolygonSmooth);
+         break;
+      case GL_POLYGON_STIPPLE:
+         params[0] = BOOLEAN_TO_INT64(ctx->Polygon.StippleFlag);
+         break;
+      case GL_PROJECTION_MATRIX:
+         {
+         const GLfloat *matrix = ctx->ProjectionMatrixStack.Top->m;
+         params[0] = IROUND64(matrix[0]);
+         params[1] = IROUND64(matrix[1]);
+         params[2] = IROUND64(matrix[2]);
+         params[3] = IROUND64(matrix[3]);
+         params[4] = IROUND64(matrix[4]);
+         params[5] = IROUND64(matrix[5]);
+         params[6] = IROUND64(matrix[6]);
+         params[7] = IROUND64(matrix[7]);
+         params[8] = IROUND64(matrix[8]);
+         params[9] = IROUND64(matrix[9]);
+         params[10] = IROUND64(matrix[10]);
+         params[11] = IROUND64(matrix[11]);
+         params[12] = IROUND64(matrix[12]);
+         params[13] = IROUND64(matrix[13]);
+         params[14] = IROUND64(matrix[14]);
+         params[15] = IROUND64(matrix[15]);
+         }
+         break;
+      case GL_PROJECTION_STACK_DEPTH:
+         params[0] = ctx->ProjectionMatrixStack.Depth + 1;
+         break;
+      case GL_READ_BUFFER:
+         params[0] = ENUM_TO_INT64(ctx->ReadBuffer->ColorReadBuffer);
+         break;
+      case GL_RED_BIAS:
+         params[0] = IROUND64(ctx->Pixel.RedBias);
+         break;
+      case GL_RED_BITS:
+         params[0] = ctx->DrawBuffer->Visual.redBits;
+         break;
+      case GL_RED_SCALE:
+         params[0] = IROUND64(ctx->Pixel.RedScale);
+         break;
+      case GL_RENDER_MODE:
+         params[0] = ENUM_TO_INT64(ctx->RenderMode);
+         break;
+      case GL_RESCALE_NORMAL:
+         params[0] = BOOLEAN_TO_INT64(ctx->Transform.RescaleNormals);
+         break;
+      case GL_RGBA_MODE:
+         params[0] = BOOLEAN_TO_INT64(ctx->DrawBuffer->Visual.rgbMode);
+         break;
+      case GL_SCISSOR_BOX:
+         params[0] = ctx->Scissor.X;
+         params[1] = ctx->Scissor.Y;
+         params[2] = ctx->Scissor.Width;
+         params[3] = ctx->Scissor.Height;
+         break;
+      case GL_SCISSOR_TEST:
+         params[0] = BOOLEAN_TO_INT64(ctx->Scissor.Enabled);
+         break;
+      case GL_SELECTION_BUFFER_SIZE:
+         params[0] = ctx->Select.BufferSize;
+         break;
+      case GL_SHADE_MODEL:
+         params[0] = ENUM_TO_INT64(ctx->Light.ShadeModel);
+         break;
+      case GL_SHARED_TEXTURE_PALETTE_EXT:
+         params[0] = BOOLEAN_TO_INT64(ctx->Texture.SharedPalette);
+         break;
+      case GL_STENCIL_BITS:
+         params[0] = ctx->DrawBuffer->Visual.stencilBits;
+         break;
+      case GL_STENCIL_CLEAR_VALUE:
+         params[0] = ctx->Stencil.Clear;
+         break;
+      case GL_STENCIL_FAIL:
+         params[0] = ENUM_TO_INT64(ctx->Stencil.FailFunc[ctx->Stencil.ActiveFace]);
+         break;
+      case GL_STENCIL_FUNC:
+         params[0] = ENUM_TO_INT64(ctx->Stencil.Function[ctx->Stencil.ActiveFace]);
+         break;
+      case GL_STENCIL_PASS_DEPTH_FAIL:
+         params[0] = ENUM_TO_INT64(ctx->Stencil.ZFailFunc[ctx->Stencil.ActiveFace]);
+         break;
+      case GL_STENCIL_PASS_DEPTH_PASS:
+         params[0] = ENUM_TO_INT64(ctx->Stencil.ZPassFunc[ctx->Stencil.ActiveFace]);
+         break;
+      case GL_STENCIL_REF:
+         params[0] = ctx->Stencil.Ref[ctx->Stencil.ActiveFace];
+         break;
+      case GL_STENCIL_TEST:
+         params[0] = BOOLEAN_TO_INT64(ctx->Stencil.Enabled);
+         break;
+      case GL_STENCIL_VALUE_MASK:
+         params[0] = ctx->Stencil.ValueMask[ctx->Stencil.ActiveFace];
+         break;
+      case GL_STENCIL_WRITEMASK:
+         params[0] = ctx->Stencil.WriteMask[ctx->Stencil.ActiveFace];
+         break;
+      case GL_STEREO:
+         params[0] = BOOLEAN_TO_INT64(ctx->DrawBuffer->Visual.stereoMode);
+         break;
+      case GL_SUBPIXEL_BITS:
+         params[0] = ctx->Const.SubPixelBits;
+         break;
+      case GL_TEXTURE_1D:
+         params[0] = BOOLEAN_TO_INT64(_mesa_IsEnabled(GL_TEXTURE_1D));
+         break;
+      case GL_TEXTURE_2D:
+         params[0] = BOOLEAN_TO_INT64(_mesa_IsEnabled(GL_TEXTURE_2D));
+         break;
+      case GL_TEXTURE_3D:
+         params[0] = BOOLEAN_TO_INT64(_mesa_IsEnabled(GL_TEXTURE_3D));
+         break;
+      case GL_TEXTURE_1D_ARRAY_EXT:
+         CHECK_EXT1(MESA_texture_array, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(_mesa_IsEnabled(GL_TEXTURE_1D_ARRAY_EXT));
+         break;
+      case GL_TEXTURE_2D_ARRAY_EXT:
+         CHECK_EXT1(MESA_texture_array, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(_mesa_IsEnabled(GL_TEXTURE_2D_ARRAY_EXT));
+         break;
+      case GL_TEXTURE_BINDING_1D:
+         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_1D_INDEX]->Name;
+         break;
+      case GL_TEXTURE_BINDING_2D:
+         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_2D_INDEX]->Name;
+         break;
+      case GL_TEXTURE_BINDING_3D:
+         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_3D_INDEX]->Name;
+         break;
+      case GL_TEXTURE_BINDING_1D_ARRAY_EXT:
+         CHECK_EXT1(MESA_texture_array, "GetInteger64v");
+         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_1D_ARRAY_INDEX]->Name;
+         break;
+      case GL_TEXTURE_BINDING_2D_ARRAY_EXT:
+         CHECK_EXT1(MESA_texture_array, "GetInteger64v");
+         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_2D_ARRAY_INDEX]->Name;
+         break;
+      case GL_TEXTURE_GEN_S:
+         params[0] = BOOLEAN_TO_INT64(((ctx->Texture.Unit[ctx->Texture.CurrentUnit].TexGenEnabled & S_BIT) ? 1 : 0));
+         break;
+      case GL_TEXTURE_GEN_T:
+         params[0] = BOOLEAN_TO_INT64(((ctx->Texture.Unit[ctx->Texture.CurrentUnit].TexGenEnabled & T_BIT) ? 1 : 0));
+         break;
+      case GL_TEXTURE_GEN_R:
+         params[0] = BOOLEAN_TO_INT64(((ctx->Texture.Unit[ctx->Texture.CurrentUnit].TexGenEnabled & R_BIT) ? 1 : 0));
+         break;
+      case GL_TEXTURE_GEN_Q:
+         params[0] = BOOLEAN_TO_INT64(((ctx->Texture.Unit[ctx->Texture.CurrentUnit].TexGenEnabled & Q_BIT) ? 1 : 0));
+         break;
+      case GL_TEXTURE_MATRIX:
+         {
+         const GLfloat *matrix = ctx->TextureMatrixStack[ctx->Texture.CurrentUnit].Top->m;
+         params[0] = IROUND64(matrix[0]);
+         params[1] = IROUND64(matrix[1]);
+         params[2] = IROUND64(matrix[2]);
+         params[3] = IROUND64(matrix[3]);
+         params[4] = IROUND64(matrix[4]);
+         params[5] = IROUND64(matrix[5]);
+         params[6] = IROUND64(matrix[6]);
+         params[7] = IROUND64(matrix[7]);
+         params[8] = IROUND64(matrix[8]);
+         params[9] = IROUND64(matrix[9]);
+         params[10] = IROUND64(matrix[10]);
+         params[11] = IROUND64(matrix[11]);
+         params[12] = IROUND64(matrix[12]);
+         params[13] = IROUND64(matrix[13]);
+         params[14] = IROUND64(matrix[14]);
+         params[15] = IROUND64(matrix[15]);
+         }
+         break;
+      case GL_TEXTURE_STACK_DEPTH:
+         params[0] = ctx->TextureMatrixStack[ctx->Texture.CurrentUnit].Depth + 1;
+         break;
+      case GL_UNPACK_ALIGNMENT:
+         params[0] = ctx->Unpack.Alignment;
+         break;
+      case GL_UNPACK_LSB_FIRST:
+         params[0] = BOOLEAN_TO_INT64(ctx->Unpack.LsbFirst);
+         break;
+      case GL_UNPACK_ROW_LENGTH:
+         params[0] = ctx->Unpack.RowLength;
+         break;
+      case GL_UNPACK_SKIP_PIXELS:
+         params[0] = ctx->Unpack.SkipPixels;
+         break;
+      case GL_UNPACK_SKIP_ROWS:
+         params[0] = ctx->Unpack.SkipRows;
+         break;
+      case GL_UNPACK_SWAP_BYTES:
+         params[0] = BOOLEAN_TO_INT64(ctx->Unpack.SwapBytes);
+         break;
+      case GL_UNPACK_SKIP_IMAGES_EXT:
+         params[0] = ctx->Unpack.SkipImages;
+         break;
+      case GL_UNPACK_IMAGE_HEIGHT_EXT:
+         params[0] = ctx->Unpack.ImageHeight;
+         break;
+      case GL_UNPACK_CLIENT_STORAGE_APPLE:
+         params[0] = BOOLEAN_TO_INT64(ctx->Unpack.ClientStorage);
+         break;
+      case GL_VIEWPORT:
+         params[0] = ctx->Viewport.X;
+         params[1] = ctx->Viewport.Y;
+         params[2] = ctx->Viewport.Width;
+         params[3] = ctx->Viewport.Height;
+         break;
+      case GL_ZOOM_X:
+         params[0] = IROUND64(ctx->Pixel.ZoomX);
+         break;
+      case GL_ZOOM_Y:
+         params[0] = IROUND64(ctx->Pixel.ZoomY);
+         break;
+      case GL_VERTEX_ARRAY:
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->Vertex.Enabled);
+         break;
+      case GL_VERTEX_ARRAY_SIZE:
+         params[0] = ctx->Array.ArrayObj->Vertex.Size;
+         break;
+      case GL_VERTEX_ARRAY_TYPE:
+         params[0] = ENUM_TO_INT64(ctx->Array.ArrayObj->Vertex.Type);
+         break;
+      case GL_VERTEX_ARRAY_STRIDE:
+         params[0] = ctx->Array.ArrayObj->Vertex.Stride;
+         break;
+      case GL_VERTEX_ARRAY_COUNT_EXT:
+         params[0] = 0;
+         break;
+      case GL_NORMAL_ARRAY:
+         params[0] = ENUM_TO_INT64(ctx->Array.ArrayObj->Normal.Enabled);
+         break;
+      case GL_NORMAL_ARRAY_TYPE:
+         params[0] = ENUM_TO_INT64(ctx->Array.ArrayObj->Normal.Type);
+         break;
+      case GL_NORMAL_ARRAY_STRIDE:
+         params[0] = ctx->Array.ArrayObj->Normal.Stride;
+         break;
+      case GL_NORMAL_ARRAY_COUNT_EXT:
+         params[0] = 0;
+         break;
+      case GL_COLOR_ARRAY:
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->Color.Enabled);
+         break;
+      case GL_COLOR_ARRAY_SIZE:
+         params[0] = ctx->Array.ArrayObj->Color.Size;
+         break;
+      case GL_COLOR_ARRAY_TYPE:
+         params[0] = ENUM_TO_INT64(ctx->Array.ArrayObj->Color.Type);
+         break;
+      case GL_COLOR_ARRAY_STRIDE:
+         params[0] = ctx->Array.ArrayObj->Color.Stride;
+         break;
+      case GL_COLOR_ARRAY_COUNT_EXT:
+         params[0] = 0;
+         break;
+      case GL_INDEX_ARRAY:
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->Index.Enabled);
+         break;
+      case GL_INDEX_ARRAY_TYPE:
+         params[0] = ENUM_TO_INT64(ctx->Array.ArrayObj->Index.Type);
+         break;
+      case GL_INDEX_ARRAY_STRIDE:
+         params[0] = ctx->Array.ArrayObj->Index.Stride;
+         break;
+      case GL_INDEX_ARRAY_COUNT_EXT:
+         params[0] = 0;
+         break;
+      case GL_TEXTURE_COORD_ARRAY:
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture].Enabled);
+         break;
+      case GL_TEXTURE_COORD_ARRAY_SIZE:
+         params[0] = ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture].Size;
+         break;
+      case GL_TEXTURE_COORD_ARRAY_TYPE:
+         params[0] = ENUM_TO_INT64(ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture].Type);
+         break;
+      case GL_TEXTURE_COORD_ARRAY_STRIDE:
+         params[0] = ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture].Stride;
+         break;
+      case GL_TEXTURE_COORD_ARRAY_COUNT_EXT:
+         params[0] = 0;
+         break;
+      case GL_EDGE_FLAG_ARRAY:
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->EdgeFlag.Enabled);
+         break;
+      case GL_EDGE_FLAG_ARRAY_STRIDE:
+         params[0] = ctx->Array.ArrayObj->EdgeFlag.Stride;
+         break;
+      case GL_EDGE_FLAG_ARRAY_COUNT_EXT:
+         params[0] = 0;
+         break;
+      case GL_MAX_TEXTURE_UNITS_ARB:
+         CHECK_EXT1(ARB_multitexture, "GetInteger64v");
+         params[0] = ctx->Const.MaxTextureUnits;
+         break;
+      case GL_ACTIVE_TEXTURE_ARB:
+         CHECK_EXT1(ARB_multitexture, "GetInteger64v");
+         params[0] = GL_TEXTURE0_ARB + ctx->Texture.CurrentUnit;
+         break;
+      case GL_CLIENT_ACTIVE_TEXTURE_ARB:
+         CHECK_EXT1(ARB_multitexture, "GetInteger64v");
+         params[0] = GL_TEXTURE0_ARB + ctx->Array.ActiveTexture;
+         break;
+      case GL_TEXTURE_CUBE_MAP_ARB:
+         CHECK_EXT1(ARB_texture_cube_map, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(_mesa_IsEnabled(GL_TEXTURE_CUBE_MAP_ARB));
+         break;
+      case GL_TEXTURE_BINDING_CUBE_MAP_ARB:
+         CHECK_EXT1(ARB_texture_cube_map, "GetInteger64v");
+         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_CUBE_INDEX]->Name;
+         break;
+      case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB:
+         CHECK_EXT1(ARB_texture_cube_map, "GetInteger64v");
+         params[0] = (1 << (ctx->Const.MaxCubeTextureLevels - 1));
+         break;
+      case GL_TEXTURE_COMPRESSION_HINT_ARB:
+         params[0] = ctx->Hint.TextureCompression;
+         break;
+      case GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB:
+         params[0] = _mesa_get_compressed_formats(ctx, NULL, GL_FALSE);
+         break;
+      case GL_COMPRESSED_TEXTURE_FORMATS_ARB:
+         {
+         GLint formats[100];
+         GLuint i, n = _mesa_get_compressed_formats(ctx, formats, GL_FALSE);
+         ASSERT(n <= 100);
+         for (i = 0; i < n; i++)
+            params[i] = ENUM_TO_INT64(formats[i]);
+         }
+         break;
+      case GL_ARRAY_ELEMENT_LOCK_FIRST_EXT:
+         CHECK_EXT1(EXT_compiled_vertex_array, "GetInteger64v");
+         params[0] = ctx->Array.LockFirst;
+         break;
+      case GL_ARRAY_ELEMENT_LOCK_COUNT_EXT:
+         CHECK_EXT1(EXT_compiled_vertex_array, "GetInteger64v");
+         params[0] = ctx->Array.LockCount;
+         break;
+      case GL_TRANSPOSE_COLOR_MATRIX_ARB:
+         {
+         const GLfloat *matrix = ctx->ColorMatrixStack.Top->m;
+         params[0] = IROUND64(matrix[0]);
+         params[1] = IROUND64(matrix[4]);
+         params[2] = IROUND64(matrix[8]);
+         params[3] = IROUND64(matrix[12]);
+         params[4] = IROUND64(matrix[1]);
+         params[5] = IROUND64(matrix[5]);
+         params[6] = IROUND64(matrix[9]);
+         params[7] = IROUND64(matrix[13]);
+         params[8] = IROUND64(matrix[2]);
+         params[9] = IROUND64(matrix[6]);
+         params[10] = IROUND64(matrix[10]);
+         params[11] = IROUND64(matrix[14]);
+         params[12] = IROUND64(matrix[3]);
+         params[13] = IROUND64(matrix[7]);
+         params[14] = IROUND64(matrix[11]);
+         params[15] = IROUND64(matrix[15]);
+         }
+         break;
+      case GL_TRANSPOSE_MODELVIEW_MATRIX_ARB:
+         {
+         const GLfloat *matrix = ctx->ModelviewMatrixStack.Top->m;
+         params[0] = IROUND64(matrix[0]);
+         params[1] = IROUND64(matrix[4]);
+         params[2] = IROUND64(matrix[8]);
+         params[3] = IROUND64(matrix[12]);
+         params[4] = IROUND64(matrix[1]);
+         params[5] = IROUND64(matrix[5]);
+         params[6] = IROUND64(matrix[9]);
+         params[7] = IROUND64(matrix[13]);
+         params[8] = IROUND64(matrix[2]);
+         params[9] = IROUND64(matrix[6]);
+         params[10] = IROUND64(matrix[10]);
+         params[11] = IROUND64(matrix[14]);
+         params[12] = IROUND64(matrix[3]);
+         params[13] = IROUND64(matrix[7]);
+         params[14] = IROUND64(matrix[11]);
+         params[15] = IROUND64(matrix[15]);
+         }
+         break;
+      case GL_TRANSPOSE_PROJECTION_MATRIX_ARB:
+         {
+         const GLfloat *matrix = ctx->ProjectionMatrixStack.Top->m;
+         params[0] = IROUND64(matrix[0]);
+         params[1] = IROUND64(matrix[4]);
+         params[2] = IROUND64(matrix[8]);
+         params[3] = IROUND64(matrix[12]);
+         params[4] = IROUND64(matrix[1]);
+         params[5] = IROUND64(matrix[5]);
+         params[6] = IROUND64(matrix[9]);
+         params[7] = IROUND64(matrix[13]);
+         params[8] = IROUND64(matrix[2]);
+         params[9] = IROUND64(matrix[6]);
+         params[10] = IROUND64(matrix[10]);
+         params[11] = IROUND64(matrix[14]);
+         params[12] = IROUND64(matrix[3]);
+         params[13] = IROUND64(matrix[7]);
+         params[14] = IROUND64(matrix[11]);
+         params[15] = IROUND64(matrix[15]);
+         }
+         break;
+      case GL_TRANSPOSE_TEXTURE_MATRIX_ARB:
+         {
+         const GLfloat *matrix = ctx->TextureMatrixStack[ctx->Texture.CurrentUnit].Top->m;
+         params[0] = IROUND64(matrix[0]);
+         params[1] = IROUND64(matrix[4]);
+         params[2] = IROUND64(matrix[8]);
+         params[3] = IROUND64(matrix[12]);
+         params[4] = IROUND64(matrix[1]);
+         params[5] = IROUND64(matrix[5]);
+         params[6] = IROUND64(matrix[9]);
+         params[7] = IROUND64(matrix[13]);
+         params[8] = IROUND64(matrix[2]);
+         params[9] = IROUND64(matrix[6]);
+         params[10] = IROUND64(matrix[10]);
+         params[11] = IROUND64(matrix[14]);
+         params[12] = IROUND64(matrix[3]);
+         params[13] = IROUND64(matrix[7]);
+         params[14] = IROUND64(matrix[11]);
+         params[15] = IROUND64(matrix[15]);
+         }
+         break;
+      case GL_COLOR_MATRIX_SGI:
+         {
+         const GLfloat *matrix = ctx->ColorMatrixStack.Top->m;
+         params[0] = IROUND64(matrix[0]);
+         params[1] = IROUND64(matrix[1]);
+         params[2] = IROUND64(matrix[2]);
+         params[3] = IROUND64(matrix[3]);
+         params[4] = IROUND64(matrix[4]);
+         params[5] = IROUND64(matrix[5]);
+         params[6] = IROUND64(matrix[6]);
+         params[7] = IROUND64(matrix[7]);
+         params[8] = IROUND64(matrix[8]);
+         params[9] = IROUND64(matrix[9]);
+         params[10] = IROUND64(matrix[10]);
+         params[11] = IROUND64(matrix[11]);
+         params[12] = IROUND64(matrix[12]);
+         params[13] = IROUND64(matrix[13]);
+         params[14] = IROUND64(matrix[14]);
+         params[15] = IROUND64(matrix[15]);
+         }
+         break;
+      case GL_COLOR_MATRIX_STACK_DEPTH_SGI:
+         params[0] = ctx->ColorMatrixStack.Depth + 1;
+         break;
+      case GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI:
+         params[0] = MAX_COLOR_STACK_DEPTH;
+         break;
+      case GL_POST_COLOR_MATRIX_RED_SCALE_SGI:
+         params[0] = IROUND64(ctx->Pixel.PostColorMatrixScale[0]);
+         break;
+      case GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI:
+         params[0] = IROUND64(ctx->Pixel.PostColorMatrixScale[1]);
+         break;
+      case GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI:
+         params[0] = IROUND64(ctx->Pixel.PostColorMatrixScale[2]);
+         break;
+      case GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI:
+         params[0] = IROUND64(ctx->Pixel.PostColorMatrixScale[3]);
+         break;
+      case GL_POST_COLOR_MATRIX_RED_BIAS_SGI:
+         params[0] = IROUND64(ctx->Pixel.PostColorMatrixBias[0]);
+         break;
+      case GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI:
+         params[0] = IROUND64(ctx->Pixel.PostColorMatrixBias[1]);
+         break;
+      case GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI:
+         params[0] = IROUND64(ctx->Pixel.PostColorMatrixBias[2]);
+         break;
+      case GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI:
+         params[0] = IROUND64(ctx->Pixel.PostColorMatrixBias[3]);
+         break;
+      case GL_CONVOLUTION_1D_EXT:
+         CHECK_EXT1(EXT_convolution, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Pixel.Convolution1DEnabled);
+         break;
+      case GL_CONVOLUTION_2D_EXT:
+         CHECK_EXT1(EXT_convolution, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Pixel.Convolution2DEnabled);
+         break;
+      case GL_SEPARABLE_2D_EXT:
+         CHECK_EXT1(EXT_convolution, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Pixel.Separable2DEnabled);
+         break;
+      case GL_POST_CONVOLUTION_RED_SCALE_EXT:
+         CHECK_EXT1(EXT_convolution, "GetInteger64v");
+         params[0] = IROUND64(ctx->Pixel.PostConvolutionScale[0]);
+         break;
+      case GL_POST_CONVOLUTION_GREEN_SCALE_EXT:
+         CHECK_EXT1(EXT_convolution, "GetInteger64v");
+         params[0] = IROUND64(ctx->Pixel.PostConvolutionScale[1]);
+         break;
+      case GL_POST_CONVOLUTION_BLUE_SCALE_EXT:
+         CHECK_EXT1(EXT_convolution, "GetInteger64v");
+         params[0] = IROUND64(ctx->Pixel.PostConvolutionScale[2]);
+         break;
+      case GL_POST_CONVOLUTION_ALPHA_SCALE_EXT:
+         CHECK_EXT1(EXT_convolution, "GetInteger64v");
+         params[0] = IROUND64(ctx->Pixel.PostConvolutionScale[3]);
+         break;
+      case GL_POST_CONVOLUTION_RED_BIAS_EXT:
+         CHECK_EXT1(EXT_convolution, "GetInteger64v");
+         params[0] = IROUND64(ctx->Pixel.PostConvolutionBias[0]);
+         break;
+      case GL_POST_CONVOLUTION_GREEN_BIAS_EXT:
+         CHECK_EXT1(EXT_convolution, "GetInteger64v");
+         params[0] = IROUND64(ctx->Pixel.PostConvolutionBias[1]);
+         break;
+      case GL_POST_CONVOLUTION_BLUE_BIAS_EXT:
+         CHECK_EXT1(EXT_convolution, "GetInteger64v");
+         params[0] = IROUND64(ctx->Pixel.PostConvolutionBias[2]);
+         break;
+      case GL_POST_CONVOLUTION_ALPHA_BIAS_EXT:
+         CHECK_EXT1(EXT_convolution, "GetInteger64v");
+         params[0] = IROUND64(ctx->Pixel.PostConvolutionBias[3]);
+         break;
+      case GL_HISTOGRAM:
+         CHECK_EXT1(EXT_histogram, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Pixel.HistogramEnabled);
+         break;
+      case GL_MINMAX:
+         CHECK_EXT1(EXT_histogram, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Pixel.MinMaxEnabled);
+         break;
+      case GL_COLOR_TABLE_SGI:
+         CHECK_EXT1(SGI_color_table, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Pixel.ColorTableEnabled[COLORTABLE_PRECONVOLUTION]);
+         break;
+      case GL_POST_CONVOLUTION_COLOR_TABLE_SGI:
+         CHECK_EXT1(SGI_color_table, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Pixel.ColorTableEnabled[COLORTABLE_POSTCONVOLUTION]);
+         break;
+      case GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI:
+         CHECK_EXT1(SGI_color_table, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Pixel.ColorTableEnabled[COLORTABLE_POSTCOLORMATRIX]);
+         break;
+      case GL_TEXTURE_COLOR_TABLE_SGI:
+         CHECK_EXT1(SGI_texture_color_table, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Texture.Unit[ctx->Texture.CurrentUnit].ColorTableEnabled);
+         break;
+      case GL_COLOR_SUM_EXT:
+         CHECK_EXT2(EXT_secondary_color, ARB_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Fog.ColorSumEnabled);
+         break;
+      case GL_CURRENT_SECONDARY_COLOR_EXT:
+         CHECK_EXT1(EXT_secondary_color, "GetInteger64v");
+         {
+         FLUSH_CURRENT(ctx, 0);
+         params[0] = FLOAT_TO_INT64(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][0]);
+         params[1] = FLOAT_TO_INT64(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][1]);
+         params[2] = FLOAT_TO_INT64(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][2]);
+         params[3] = FLOAT_TO_INT64(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][3]);
+         }
+         break;
+      case GL_SECONDARY_COLOR_ARRAY_EXT:
+         CHECK_EXT1(EXT_secondary_color, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->SecondaryColor.Enabled);
+         break;
+      case GL_SECONDARY_COLOR_ARRAY_TYPE_EXT:
+         CHECK_EXT1(EXT_secondary_color, "GetInteger64v");
+         params[0] = ENUM_TO_INT64(ctx->Array.ArrayObj->SecondaryColor.Type);
+         break;
+      case GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT:
+         CHECK_EXT1(EXT_secondary_color, "GetInteger64v");
+         params[0] = ctx->Array.ArrayObj->SecondaryColor.Stride;
+         break;
+      case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT:
+         CHECK_EXT1(EXT_secondary_color, "GetInteger64v");
+         params[0] = ctx->Array.ArrayObj->SecondaryColor.Size;
+         break;
+      case GL_CURRENT_FOG_COORDINATE_EXT:
+         CHECK_EXT1(EXT_fog_coord, "GetInteger64v");
+         {
+         FLUSH_CURRENT(ctx, 0);
+         params[0] = IROUND64(ctx->Current.Attrib[VERT_ATTRIB_FOG][0]);
+         }
+         break;
+      case GL_FOG_COORDINATE_ARRAY_EXT:
+         CHECK_EXT1(EXT_fog_coord, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->FogCoord.Enabled);
+         break;
+      case GL_FOG_COORDINATE_ARRAY_TYPE_EXT:
+         CHECK_EXT1(EXT_fog_coord, "GetInteger64v");
+         params[0] = ENUM_TO_INT64(ctx->Array.ArrayObj->FogCoord.Type);
+         break;
+      case GL_FOG_COORDINATE_ARRAY_STRIDE_EXT:
+         CHECK_EXT1(EXT_fog_coord, "GetInteger64v");
+         params[0] = ctx->Array.ArrayObj->FogCoord.Stride;
+         break;
+      case GL_FOG_COORDINATE_SOURCE_EXT:
+         CHECK_EXT1(EXT_fog_coord, "GetInteger64v");
+         params[0] = ENUM_TO_INT64(ctx->Fog.FogCoordinateSource);
+         break;
+      case GL_MAX_TEXTURE_LOD_BIAS_EXT:
+         CHECK_EXT1(EXT_texture_lod_bias, "GetInteger64v");
+         params[0] = IROUND64(ctx->Const.MaxTextureLodBias);
+         break;
+      case GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT:
+         CHECK_EXT1(EXT_texture_filter_anisotropic, "GetInteger64v");
+         params[0] = IROUND64(ctx->Const.MaxTextureMaxAnisotropy);
+         break;
+      case GL_MULTISAMPLE_ARB:
+         params[0] = BOOLEAN_TO_INT64(ctx->Multisample.Enabled);
+         break;
+      case GL_SAMPLE_ALPHA_TO_COVERAGE_ARB:
+         params[0] = BOOLEAN_TO_INT64(ctx->Multisample.SampleAlphaToCoverage);
+         break;
+      case GL_SAMPLE_ALPHA_TO_ONE_ARB:
+         params[0] = BOOLEAN_TO_INT64(ctx->Multisample.SampleAlphaToOne);
+         break;
+      case GL_SAMPLE_COVERAGE_ARB:
+         params[0] = BOOLEAN_TO_INT64(ctx->Multisample.SampleCoverage);
+         break;
+      case GL_SAMPLE_COVERAGE_VALUE_ARB:
+         params[0] = IROUND64(ctx->Multisample.SampleCoverageValue);
+         break;
+      case GL_SAMPLE_COVERAGE_INVERT_ARB:
+         params[0] = BOOLEAN_TO_INT64(ctx->Multisample.SampleCoverageInvert);
+         break;
+      case GL_SAMPLE_BUFFERS_ARB:
+         params[0] = ctx->DrawBuffer->Visual.sampleBuffers;
+         break;
+      case GL_SAMPLES_ARB:
+         params[0] = ctx->DrawBuffer->Visual.samples;
+         break;
+      case GL_RASTER_POSITION_UNCLIPPED_IBM:
+         CHECK_EXT1(IBM_rasterpos_clip, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Transform.RasterPositionUnclipped);
+         break;
+      case GL_POINT_SPRITE_NV:
+         CHECK_EXT2(NV_point_sprite, ARB_point_sprite, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Point.PointSprite);
+         break;
+      case GL_POINT_SPRITE_R_MODE_NV:
+         CHECK_EXT1(NV_point_sprite, "GetInteger64v");
+         params[0] = ENUM_TO_INT64(ctx->Point.SpriteRMode);
+         break;
+      case GL_POINT_SPRITE_COORD_ORIGIN:
+         CHECK_EXT2(NV_point_sprite, ARB_point_sprite, "GetInteger64v");
+         params[0] = ENUM_TO_INT64(ctx->Point.SpriteOrigin);
+         break;
+      case GL_GENERATE_MIPMAP_HINT_SGIS:
+         CHECK_EXT1(SGIS_generate_mipmap, "GetInteger64v");
+         params[0] = ENUM_TO_INT64(ctx->Hint.GenerateMipmap);
+         break;
+      case GL_VERTEX_PROGRAM_BINDING_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = (ctx->VertexProgram.Current ? ctx->VertexProgram.Current->Base.Id : 0);
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY0_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[0].Enabled);
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY1_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[1].Enabled);
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY2_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[2].Enabled);
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY3_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[3].Enabled);
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY4_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[4].Enabled);
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY5_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[5].Enabled);
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY6_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[6].Enabled);
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY7_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[7].Enabled);
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY8_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[8].Enabled);
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY9_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[9].Enabled);
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY10_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[10].Enabled);
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY11_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[11].Enabled);
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY12_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[12].Enabled);
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY13_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[13].Enabled);
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY14_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[14].Enabled);
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY15_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[15].Enabled);
+         break;
+      case GL_MAP1_VERTEX_ATTRIB0_4_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[0]);
+         break;
+      case GL_MAP1_VERTEX_ATTRIB1_4_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[1]);
+         break;
+      case GL_MAP1_VERTEX_ATTRIB2_4_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[2]);
+         break;
+      case GL_MAP1_VERTEX_ATTRIB3_4_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[3]);
+         break;
+      case GL_MAP1_VERTEX_ATTRIB4_4_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[4]);
+         break;
+      case GL_MAP1_VERTEX_ATTRIB5_4_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[5]);
+         break;
+      case GL_MAP1_VERTEX_ATTRIB6_4_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[6]);
+         break;
+      case GL_MAP1_VERTEX_ATTRIB7_4_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[7]);
+         break;
+      case GL_MAP1_VERTEX_ATTRIB8_4_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[8]);
+         break;
+      case GL_MAP1_VERTEX_ATTRIB9_4_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[9]);
+         break;
+      case GL_MAP1_VERTEX_ATTRIB10_4_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[10]);
+         break;
+      case GL_MAP1_VERTEX_ATTRIB11_4_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[11]);
+         break;
+      case GL_MAP1_VERTEX_ATTRIB12_4_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[12]);
+         break;
+      case GL_MAP1_VERTEX_ATTRIB13_4_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[13]);
+         break;
+      case GL_MAP1_VERTEX_ATTRIB14_4_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[14]);
+         break;
+      case GL_MAP1_VERTEX_ATTRIB15_4_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[15]);
+         break;
+      case GL_FRAGMENT_PROGRAM_NV:
+         CHECK_EXT1(NV_fragment_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->FragmentProgram.Enabled);
+         break;
+      case GL_FRAGMENT_PROGRAM_BINDING_NV:
+         CHECK_EXT1(NV_fragment_program, "GetInteger64v");
+         params[0] = ctx->FragmentProgram.Current ? ctx->FragmentProgram.Current->Base.Id : 0;
+         break;
+      case GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV:
+         CHECK_EXT1(NV_fragment_program, "GetInteger64v");
+         params[0] = MAX_NV_FRAGMENT_PROGRAM_PARAMS;
+         break;
+      case GL_TEXTURE_RECTANGLE_NV:
+         CHECK_EXT1(NV_texture_rectangle, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(_mesa_IsEnabled(GL_TEXTURE_RECTANGLE_NV));
+         break;
+      case GL_TEXTURE_BINDING_RECTANGLE_NV:
+         CHECK_EXT1(NV_texture_rectangle, "GetInteger64v");
+         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_RECT_INDEX]->Name;
+         break;
+      case GL_MAX_RECTANGLE_TEXTURE_SIZE_NV:
+         CHECK_EXT1(NV_texture_rectangle, "GetInteger64v");
+         params[0] = ctx->Const.MaxTextureRectSize;
+         break;
+      case GL_STENCIL_TEST_TWO_SIDE_EXT:
+         CHECK_EXT1(EXT_stencil_two_side, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Stencil.TestTwoSide);
+         break;
+      case GL_ACTIVE_STENCIL_FACE_EXT:
+         CHECK_EXT1(EXT_stencil_two_side, "GetInteger64v");
+         params[0] = ENUM_TO_INT64(ctx->Stencil.ActiveFace ? GL_BACK : GL_FRONT);
+         break;
+      case GL_MAX_SHININESS_NV:
+         CHECK_EXT1(NV_light_max_exponent, "GetInteger64v");
+         params[0] = IROUND64(ctx->Const.MaxShininess);
+         break;
+      case GL_MAX_SPOT_EXPONENT_NV:
+         CHECK_EXT1(NV_light_max_exponent, "GetInteger64v");
+         params[0] = IROUND64(ctx->Const.MaxSpotExponent);
+         break;
+      case GL_ARRAY_BUFFER_BINDING_ARB:
+         params[0] = ctx->Array.ArrayBufferObj->Name;
+         break;
+      case GL_VERTEX_ARRAY_BUFFER_BINDING_ARB:
+         params[0] = ctx->Array.ArrayObj->Vertex.BufferObj->Name;
+         break;
+      case GL_NORMAL_ARRAY_BUFFER_BINDING_ARB:
+         params[0] = ctx->Array.ArrayObj->Normal.BufferObj->Name;
+         break;
+      case GL_COLOR_ARRAY_BUFFER_BINDING_ARB:
+         params[0] = ctx->Array.ArrayObj->Color.BufferObj->Name;
+         break;
+      case GL_INDEX_ARRAY_BUFFER_BINDING_ARB:
+         params[0] = ctx->Array.ArrayObj->Index.BufferObj->Name;
+         break;
+      case GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB:
+         params[0] = ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture].BufferObj->Name;
+         break;
+      case GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB:
+         params[0] = ctx->Array.ArrayObj->EdgeFlag.BufferObj->Name;
+         break;
+      case GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB:
+         params[0] = ctx->Array.ArrayObj->SecondaryColor.BufferObj->Name;
+         break;
+      case GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB:
+         params[0] = ctx->Array.ArrayObj->FogCoord.BufferObj->Name;
+         break;
+      case GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB:
+         params[0] = ctx->Array.ElementArrayBufferObj->Name;
+         break;
+      case GL_PIXEL_PACK_BUFFER_BINDING_EXT:
+         CHECK_EXT1(EXT_pixel_buffer_object, "GetInteger64v");
+         params[0] = ctx->Pack.BufferObj->Name;
+         break;
+      case GL_PIXEL_UNPACK_BUFFER_BINDING_EXT:
+         CHECK_EXT1(EXT_pixel_buffer_object, "GetInteger64v");
+         params[0] = ctx->Unpack.BufferObj->Name;
+         break;
+      case GL_VERTEX_PROGRAM_ARB:
+         CHECK_EXT2(ARB_vertex_program, NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->VertexProgram.Enabled);
+         break;
+      case GL_VERTEX_PROGRAM_POINT_SIZE_ARB:
+         CHECK_EXT2(ARB_vertex_program, NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->VertexProgram.PointSizeEnabled);
+         break;
+      case GL_VERTEX_PROGRAM_TWO_SIDE_ARB:
+         CHECK_EXT2(ARB_vertex_program, NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->VertexProgram.TwoSideEnabled);
+         break;
+      case GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB:
+         CHECK_EXT3(ARB_vertex_program, ARB_fragment_program, NV_vertex_program, "GetInteger64v");
+         params[0] = ctx->Const.MaxProgramMatrixStackDepth;
+         break;
+      case GL_MAX_PROGRAM_MATRICES_ARB:
+         CHECK_EXT3(ARB_vertex_program, ARB_fragment_program, NV_vertex_program, "GetInteger64v");
+         params[0] = ctx->Const.MaxProgramMatrices;
+         break;
+      case GL_CURRENT_MATRIX_STACK_DEPTH_ARB:
+         CHECK_EXT3(ARB_vertex_program, ARB_fragment_program, NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->CurrentStack->Depth + 1);
+         break;
+      case GL_CURRENT_MATRIX_ARB:
+         CHECK_EXT3(ARB_vertex_program, ARB_fragment_program, NV_fragment_program, "GetInteger64v");
+         {
+         const GLfloat *matrix = ctx->CurrentStack->Top->m;
+         params[0] = IROUND64(matrix[0]);
+         params[1] = IROUND64(matrix[1]);
+         params[2] = IROUND64(matrix[2]);
+         params[3] = IROUND64(matrix[3]);
+         params[4] = IROUND64(matrix[4]);
+         params[5] = IROUND64(matrix[5]);
+         params[6] = IROUND64(matrix[6]);
+         params[7] = IROUND64(matrix[7]);
+         params[8] = IROUND64(matrix[8]);
+         params[9] = IROUND64(matrix[9]);
+         params[10] = IROUND64(matrix[10]);
+         params[11] = IROUND64(matrix[11]);
+         params[12] = IROUND64(matrix[12]);
+         params[13] = IROUND64(matrix[13]);
+         params[14] = IROUND64(matrix[14]);
+         params[15] = IROUND64(matrix[15]);
+         }
+         break;
+      case GL_TRANSPOSE_CURRENT_MATRIX_ARB:
+         CHECK_EXT2(ARB_vertex_program, ARB_fragment_program, "GetInteger64v");
+         {
+         const GLfloat *matrix = ctx->CurrentStack->Top->m;
+         params[0] = IROUND64(matrix[0]);
+         params[1] = IROUND64(matrix[4]);
+         params[2] = IROUND64(matrix[8]);
+         params[3] = IROUND64(matrix[12]);
+         params[4] = IROUND64(matrix[1]);
+         params[5] = IROUND64(matrix[5]);
+         params[6] = IROUND64(matrix[9]);
+         params[7] = IROUND64(matrix[13]);
+         params[8] = IROUND64(matrix[2]);
+         params[9] = IROUND64(matrix[6]);
+         params[10] = IROUND64(matrix[10]);
+         params[11] = IROUND64(matrix[14]);
+         params[12] = IROUND64(matrix[3]);
+         params[13] = IROUND64(matrix[7]);
+         params[14] = IROUND64(matrix[11]);
+         params[15] = IROUND64(matrix[15]);
+         }
+         break;
+      case GL_MAX_VERTEX_ATTRIBS_ARB:
+         CHECK_EXT1(ARB_vertex_program, "GetInteger64v");
+         params[0] = ctx->Const.VertexProgram.MaxAttribs;
+         break;
+      case GL_PROGRAM_ERROR_POSITION_ARB:
+         CHECK_EXT4(NV_vertex_program, ARB_vertex_program, NV_fragment_program, ARB_fragment_program, "GetInteger64v");
+         params[0] = ctx->Program.ErrorPos;
+         break;
+      case GL_FRAGMENT_PROGRAM_ARB:
+         CHECK_EXT1(ARB_fragment_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->FragmentProgram.Enabled);
+         break;
+      case GL_MAX_TEXTURE_COORDS_ARB:
+         CHECK_EXT2(ARB_fragment_program, NV_fragment_program, "GetInteger64v");
+         params[0] = ctx->Const.MaxTextureCoordUnits;
+         break;
+      case GL_MAX_TEXTURE_IMAGE_UNITS_ARB:
+         CHECK_EXT2(ARB_fragment_program, NV_fragment_program, "GetInteger64v");
+         params[0] = ctx->Const.MaxTextureImageUnits;
+         break;
+      case GL_DEPTH_BOUNDS_TEST_EXT:
+         CHECK_EXT1(EXT_depth_bounds_test, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Depth.BoundsTest);
+         break;
+      case GL_DEPTH_BOUNDS_EXT:
+         CHECK_EXT1(EXT_depth_bounds_test, "GetInteger64v");
+         params[0] = IROUND64(ctx->Depth.BoundsMin);
+         params[1] = IROUND64(ctx->Depth.BoundsMax);
+         break;
+      case GL_MAX_DRAW_BUFFERS_ARB:
+         params[0] = ctx->Const.MaxDrawBuffers;
+         break;
+      case GL_DRAW_BUFFER0_ARB:
+         params[0] = ENUM_TO_INT64(ctx->DrawBuffer->ColorDrawBuffer[0]);
+         break;
+      case GL_DRAW_BUFFER1_ARB:
+         {
+         GLenum buffer;
+         if (pname - GL_DRAW_BUFFER0_ARB >= ctx->Const.MaxDrawBuffers) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glGet(GL_DRAW_BUFFERx_ARB)");
+            return;
+         }
+         buffer = ctx->DrawBuffer->ColorDrawBuffer[1];
+         params[0] = ENUM_TO_INT64(buffer);
+         }
+         break;
+      case GL_DRAW_BUFFER2_ARB:
+         {
+         GLenum buffer;
+         if (pname - GL_DRAW_BUFFER0_ARB >= ctx->Const.MaxDrawBuffers) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glGet(GL_DRAW_BUFFERx_ARB)");
+            return;
+         }
+         buffer = ctx->DrawBuffer->ColorDrawBuffer[2];
+         params[0] = ENUM_TO_INT64(buffer);
+         }
+         break;
+      case GL_DRAW_BUFFER3_ARB:
+         {
+         GLenum buffer;
+         if (pname - GL_DRAW_BUFFER0_ARB >= ctx->Const.MaxDrawBuffers) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glGet(GL_DRAW_BUFFERx_ARB)");
+            return;
+         }
+         buffer = ctx->DrawBuffer->ColorDrawBuffer[3];
+         params[0] = ENUM_TO_INT64(buffer);
+         }
+         break;
+      case GL_IMPLEMENTATION_COLOR_READ_TYPE_OES:
+         CHECK_EXT1(OES_read_format, "GetInteger64v");
+         params[0] = ctx->Const.ColorReadType;
+         break;
+      case GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES:
+         CHECK_EXT1(OES_read_format, "GetInteger64v");
+         params[0] = ctx->Const.ColorReadFormat;
+         break;
+      case GL_NUM_FRAGMENT_REGISTERS_ATI:
+         CHECK_EXT1(ATI_fragment_shader, "GetInteger64v");
+         params[0] = 6;
+         break;
+      case GL_NUM_FRAGMENT_CONSTANTS_ATI:
+         CHECK_EXT1(ATI_fragment_shader, "GetInteger64v");
+         params[0] = 8;
+         break;
+      case GL_NUM_PASSES_ATI:
+         CHECK_EXT1(ATI_fragment_shader, "GetInteger64v");
+         params[0] = 2;
+         break;
+      case GL_NUM_INSTRUCTIONS_PER_PASS_ATI:
+         CHECK_EXT1(ATI_fragment_shader, "GetInteger64v");
+         params[0] = 8;
+         break;
+      case GL_NUM_INSTRUCTIONS_TOTAL_ATI:
+         CHECK_EXT1(ATI_fragment_shader, "GetInteger64v");
+         params[0] = 16;
+         break;
+      case GL_COLOR_ALPHA_PAIRING_ATI:
+         CHECK_EXT1(ATI_fragment_shader, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(GL_TRUE);
+         break;
+      case GL_NUM_LOOPBACK_COMPONENTS_ATI:
+         CHECK_EXT1(ATI_fragment_shader, "GetInteger64v");
+         params[0] = 3;
+         break;
+      case GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI:
+         CHECK_EXT1(ATI_fragment_shader, "GetInteger64v");
+         params[0] = 3;
+         break;
+      case GL_STENCIL_BACK_FUNC:
+         params[0] = ENUM_TO_INT64(ctx->Stencil.Function[1]);
+         break;
+      case GL_STENCIL_BACK_VALUE_MASK:
+         params[0] = ctx->Stencil.ValueMask[1];
+         break;
+      case GL_STENCIL_BACK_WRITEMASK:
+         params[0] = ctx->Stencil.WriteMask[1];
+         break;
+      case GL_STENCIL_BACK_REF:
+         params[0] = ctx->Stencil.Ref[1];
+         break;
+      case GL_STENCIL_BACK_FAIL:
+         params[0] = ENUM_TO_INT64(ctx->Stencil.FailFunc[1]);
+         break;
+      case GL_STENCIL_BACK_PASS_DEPTH_FAIL:
+         params[0] = ENUM_TO_INT64(ctx->Stencil.ZFailFunc[1]);
+         break;
+      case GL_STENCIL_BACK_PASS_DEPTH_PASS:
+         params[0] = ENUM_TO_INT64(ctx->Stencil.ZPassFunc[1]);
+         break;
+      case GL_FRAMEBUFFER_BINDING_EXT:
+         CHECK_EXT1(EXT_framebuffer_object, "GetInteger64v");
+         params[0] = ctx->DrawBuffer->Name;
+         break;
+      case GL_RENDERBUFFER_BINDING_EXT:
+         CHECK_EXT1(EXT_framebuffer_object, "GetInteger64v");
+         params[0] = ctx->CurrentRenderbuffer ? ctx->CurrentRenderbuffer->Name : 0;
+         break;
+      case GL_MAX_COLOR_ATTACHMENTS_EXT:
+         CHECK_EXT1(EXT_framebuffer_object, "GetInteger64v");
+         params[0] = ctx->Const.MaxColorAttachments;
+         break;
+      case GL_MAX_RENDERBUFFER_SIZE_EXT:
+         CHECK_EXT1(EXT_framebuffer_object, "GetInteger64v");
+         params[0] = ctx->Const.MaxRenderbufferSize;
+         break;
+      case GL_READ_FRAMEBUFFER_BINDING_EXT:
+         CHECK_EXT1(EXT_framebuffer_blit, "GetInteger64v");
+         params[0] = ctx->ReadBuffer->Name;
+         break;
+      case GL_PROVOKING_VERTEX_EXT:
+         CHECK_EXT1(EXT_provoking_vertex, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Light.ProvokingVertex);
+         break;
+      case GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT:
+         CHECK_EXT1(EXT_provoking_vertex, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Const.QuadsFollowProvokingVertexConvention);
+         break;
+      case GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB:
+         CHECK_EXT1(ARB_fragment_shader, "GetInteger64v");
+         params[0] = ctx->Const.FragmentProgram.MaxUniformComponents;
+         break;
+      case GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB:
+         CHECK_EXT1(ARB_fragment_shader, "GetInteger64v");
+         params[0] = ENUM_TO_INT64(ctx->Hint.FragmentShaderDerivative);
+         break;
+      case GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB:
+         CHECK_EXT1(ARB_vertex_shader, "GetInteger64v");
+         params[0] = ctx->Const.VertexProgram.MaxUniformComponents;
+         break;
+      case GL_MAX_VARYING_FLOATS_ARB:
+         CHECK_EXT1(ARB_vertex_shader, "GetInteger64v");
+         params[0] = ctx->Const.MaxVarying * 4;
+         break;
+      case GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB:
+         CHECK_EXT1(ARB_vertex_shader, "GetInteger64v");
+         params[0] = ctx->Const.MaxVertexTextureImageUnits;
+         break;
+      case GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB:
+         CHECK_EXT1(ARB_vertex_shader, "GetInteger64v");
+         params[0] = MAX_COMBINED_TEXTURE_IMAGE_UNITS;
+         break;
+      case GL_CURRENT_PROGRAM:
+         CHECK_EXT1(ARB_shader_objects, "GetInteger64v");
+         params[0] = ctx->Shader.CurrentProgram ? ctx->Shader.CurrentProgram->Name : 0;
+         break;
+      case GL_MAX_SAMPLES:
+         CHECK_EXT1(ARB_framebuffer_object, "GetInteger64v");
+         params[0] = ctx->Const.MaxSamples;
+         break;
+      case GL_VERTEX_ARRAY_BINDING_APPLE:
+         CHECK_EXT1(APPLE_vertex_array_object, "GetInteger64v");
+         params[0] = ctx->Array.ArrayObj->Name;
+         break;
+      case GL_TEXTURE_CUBE_MAP_SEAMLESS:
+         CHECK_EXT1(ARB_seamless_cube_map, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Texture.CubeMapSeamless);
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetInteger64v(pname=0x%x)", pname);
+   }
+}
+#endif /* FEATURE_ARB_sync */
+
 
 void GLAPIENTRY
 _mesa_GetDoublev( GLenum pname, GLdouble *params )
diff --git a/src/mesa/main/get.h b/src/mesa/main/get.h
index 9b47b230a9..77a9a7d04b 100644
--- a/src/mesa/main/get.h
+++ b/src/mesa/main/get.h
@@ -47,6 +47,9 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params );
 extern void GLAPIENTRY
 _mesa_GetIntegerv( GLenum pname, GLint *params );
 
+extern void GLAPIENTRY
+_mesa_GetInteger64v( GLenum pname, GLint64 *params );
+
 extern void GLAPIENTRY
 _mesa_GetPointerv( GLenum pname, GLvoid **params );
 
diff --git a/src/mesa/main/get_gen.py b/src/mesa/main/get_gen.py
index 97dc785020..4f0feaad3c 100644
--- a/src/mesa/main/get_gen.py
+++ b/src/mesa/main/get_gen.py
@@ -35,6 +35,7 @@ GLfloat = 3
 GLdouble = 4
 GLboolean = 5
 GLfloatN = 6    # A normalized value, such as a color or depth range
+GLint64 = 7
 
 
 TypeStrings = {
@@ -42,7 +43,8 @@ TypeStrings = {
 	GLenum : "GLenum",
 	GLfloat : "GLfloat",
 	GLdouble : "GLdouble",
-	GLboolean : "GLboolean"
+	GLboolean : "GLboolean",
+	GLint64 : "GLint64"
 }
 
 
@@ -1029,10 +1031,16 @@ def ConversionFunc(fromType, toType):
 		return ""
 	elif fromType == GLfloat and toType == GLint:
 		return "IROUND"
+	elif fromType == GLfloat and toType == GLint64:
+		return "IROUND64"
 	elif fromType == GLfloatN and toType == GLfloat:
 		return ""
 	elif fromType == GLint and toType == GLfloat: # but not GLfloatN!
 		return "(GLfloat)"
+	elif fromType == GLint and toType == GLint64:
+		return ""
+	elif fromType == GLint64 and toType == GLfloat: # but not GLfloatN!
+		return "(GLfloat)"
 	else:
 		if fromType == GLfloatN:
 			fromType = GLfloat
@@ -1047,6 +1055,7 @@ def EmitGetFunction(stateVars, returnType):
 	"""Emit the code to implement glGetBooleanv, glGetIntegerv or glGetFloatv."""
 	assert (returnType == GLboolean or
 			returnType == GLint or
+			returnType == GLint64 or
 			returnType == GLfloat)
 
 	strType = TypeStrings[returnType]
@@ -1057,9 +1066,14 @@ def EmitGetFunction(stateVars, returnType):
 		function = "GetBooleanv"
 	elif returnType == GLfloat:
 		function = "GetFloatv"
+	elif returnType == GLint64:
+		function = "GetInteger64v"
 	else:
 		abort()
 
+	if returnType == GLint64:
+		print "#if FEATURE_ARB_sync"
+
 	print "void GLAPIENTRY"
 	print "_mesa_%s( GLenum pname, %s *params )" % (function, strType)
 	print "{"
@@ -1113,6 +1127,8 @@ def EmitGetFunction(stateVars, returnType):
 	print '         _mesa_error(ctx, GL_INVALID_ENUM, "gl%s(pname=0x%%x)", pname);' % function
 	print "   }"
 	print "}"
+	if returnType == GLint64:
+		print "#endif /* FEATURE_ARB_sync */"
 	print ""
 	return
 
@@ -1142,8 +1158,11 @@ def EmitHeader():
 #define INT_TO_BOOLEAN(I)     ( (I) ? GL_TRUE : GL_FALSE )
 
 #define BOOLEAN_TO_INT(B)     ( (GLint) (B) )
+#define BOOLEAN_TO_INT64(B)   ( (GLint64) (B) )
 #define BOOLEAN_TO_FLOAT(B)   ( (B) ? 1.0F : 0.0F )
 
+#define ENUM_TO_INT64(E)      ( (GLint64) (E) )
+
 
 /*
  * Check if named extension is enabled, if not generate error and return.
@@ -1221,5 +1240,6 @@ EmitHeader()
 EmitGetFunction(StateVars, GLboolean)
 EmitGetFunction(StateVars, GLfloat)
 EmitGetFunction(StateVars, GLint)
+EmitGetFunction(StateVars, GLint64)
 EmitGetDoublev()
 
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index fb85f0862c..7d4012a856 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -291,6 +291,7 @@ long iround(float f);
 #define IROUND(f)  ((int) (((f) >= 0.0F) ? ((f) + 0.5F) : ((f) - 0.5F)))
 #endif
 
+#define IROUND64(f)  ((GLint64) (((f) >= 0.0F) ? ((f) + 0.5F) : ((f) - 0.5F)))
 
 /***
  *** IROUND_POS: return (as an integer) positive float rounded to nearest int
diff --git a/src/mesa/main/macros.h b/src/mesa/main/macros.h
index 4ca7957ffa..3d9a1aba98 100644
--- a/src/mesa/main/macros.h
+++ b/src/mesa/main/macros.h
@@ -99,6 +99,9 @@ extern GLfloat _mesa_ubyte_to_float_color_tab[256];
 /* a close approximation: */
 #define FLOAT_TO_INT(X)     ( (GLint) (2147483647.0 * (X)) )
 
+/** Convert GLfloat in [-1.0,1.0] to GLint64 in [-(1<<63),(1 << 63) -1] */
+#define FLOAT_TO_INT64(X)     ( (GLint64) (9223372036854775807.0 * (double)(X)) )
+
 
 /** Convert GLint in [-2147483648,2147483647] to GLfloat in [-1.0,1.0], texture/fb data */
 #define INT_TO_FLOAT_TEX(I)    ((I) == -2147483648 ? -1.0F : (I) * (1.0F/2147483647.0))
-- 
cgit v1.2.3


From 064913430dd288c40351b41ab9e4040d3e92f0df Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Fri, 28 Aug 2009 15:50:28 -0700
Subject: ARB sync: Regenerate files from previous commit

---
 src/mesa/drivers/dri/common/extension_helper.h |   62 +
 src/mesa/glapi/dispatch.h                      |  487 +-
 src/mesa/glapi/glapioffsets.h                  |  452 +-
 src/mesa/glapi/glapitable.h                    |  443 +-
 src/mesa/glapi/glapitemp.h                     |  268 +-
 src/mesa/glapi/glprocs.h                       | 1184 ++---
 src/mesa/main/enums.c                          | 6230 ++++++++++++------------
 src/mesa/sparc/glapi_sparc.S                   |  147 +-
 src/mesa/x86-64/glapi_x86-64.S                 | 2373 +++++----
 src/mesa/x86/glapi_x86.S                       |  155 +-
 10 files changed, 6149 insertions(+), 5652 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/common/extension_helper.h b/src/mesa/drivers/dri/common/extension_helper.h
index 08a97bb111..790a2bc896 100644
--- a/src/mesa/drivers/dri/common/extension_helper.h
+++ b/src/mesa/drivers/dri/common/extension_helper.h
@@ -383,6 +383,13 @@ static const char ReplacementCodeuiNormal3fVertex3fSUN_names[] =
     "";
 #endif
 
+#if defined(need_GL_ARB_sync)
+static const char DeleteSync_names[] = 
+    "i\0" /* Parameter signature */
+    "glDeleteSync\0"
+    "";
+#endif
+
 #if defined(need_GL_SGIX_fragment_lighting)
 static const char FragmentMaterialfvSGIX_names[] = 
     "iip\0" /* Parameter signature */
@@ -1065,6 +1072,13 @@ static const char VertexAttrib1sARB_names[] =
     "";
 #endif
 
+#if defined(need_GL_ARB_sync)
+static const char FenceSync_names[] = 
+    "ii\0" /* Parameter signature */
+    "glFenceSync\0"
+    "";
+#endif
+
 #if defined(need_GL_NV_register_combiners)
 static const char FinalCombinerInputNV_names[] = 
     "iiii\0" /* Parameter signature */
@@ -1346,6 +1360,13 @@ static const char LoadProgramNV_names[] =
     "";
 #endif
 
+#if defined(need_GL_ARB_sync)
+static const char WaitSync_names[] = 
+    "iii\0" /* Parameter signature */
+    "glWaitSync\0"
+    "";
+#endif
+
 #if defined(need_GL_NV_vertex_program)
 static const char VertexAttrib4fvNV_names[] = 
     "ip\0" /* Parameter signature */
@@ -2219,6 +2240,13 @@ static const char VertexAttrib2dARB_names[] =
     "";
 #endif
 
+#if defined(need_GL_ARB_sync)
+static const char GetInteger64v_names[] = 
+    "ip\0" /* Parameter signature */
+    "glGetInteger64v\0"
+    "";
+#endif
+
 #if defined(need_GL_SGIS_texture_color_mask)
 static const char TextureColorMaskSGIS_names[] = 
     "iiii\0" /* Parameter signature */
@@ -3334,6 +3362,13 @@ static const char VertexAttrib3fvARB_names[] =
     "";
 #endif
 
+#if defined(need_GL_ARB_sync)
+static const char GetSynciv_names[] = 
+    "iiipp\0" /* Parameter signature */
+    "glGetSynciv\0"
+    "";
+#endif
+
 #if defined(need_GL_ARB_framebuffer_object) || defined(need_GL_EXT_framebuffer_object)
 static const char DeleteFramebuffersEXT_names[] = 
     "ip\0" /* Parameter signature */
@@ -4324,6 +4359,13 @@ static const char DrawMeshArraysSUN_names[] =
     "";
 #endif
 
+#if defined(need_GL_ARB_sync)
+static const char IsSync_names[] = 
+    "i\0" /* Parameter signature */
+    "glIsSync\0"
+    "";
+#endif
+
 #if defined(need_GL_NV_evaluators)
 static const char GetMapControlPointsNV_names[] = 
     "iiiiiip\0" /* Parameter signature */
@@ -4616,6 +4658,13 @@ static const char GetShaderiv_names[] =
     "";
 #endif
 
+#if defined(need_GL_ARB_sync)
+static const char ClientWaitSync_names[] = 
+    "iii\0" /* Parameter signature */
+    "glClientWaitSync\0"
+    "";
+#endif
+
 #if defined(need_GL_ATI_fragment_shader)
 static const char BindFragmentShaderATI_names[] = 
     "i\0" /* Parameter signature */
@@ -5160,6 +5209,19 @@ static const struct dri_extension_function GL_ARB_shader_objects_functions[] = {
 };
 #endif
 
+#if defined(need_GL_ARB_sync)
+static const struct dri_extension_function GL_ARB_sync_functions[] = {
+    { DeleteSync_names, DeleteSync_remap_index, -1 },
+    { FenceSync_names, FenceSync_remap_index, -1 },
+    { WaitSync_names, WaitSync_remap_index, -1 },
+    { GetInteger64v_names, GetInteger64v_remap_index, -1 },
+    { GetSynciv_names, GetSynciv_remap_index, -1 },
+    { IsSync_names, IsSync_remap_index, -1 },
+    { ClientWaitSync_names, ClientWaitSync_remap_index, -1 },
+    { NULL, 0, 0 }
+};
+#endif
+
 #if defined(need_GL_ARB_texture_compression)
 static const struct dri_extension_function GL_ARB_texture_compression_functions[] = {
     { CompressedTexSubImage2DARB_names, CompressedTexSubImage2DARB_remap_index, -1 },
diff --git a/src/mesa/glapi/dispatch.h b/src/mesa/glapi/dispatch.h
index 2f5cc55f00..8288c0a263 100644
--- a/src/mesa/glapi/dispatch.h
+++ b/src/mesa/glapi/dispatch.h
@@ -1761,6 +1761,27 @@
 #define CALL_CopyBufferSubData(disp, parameters) (*((disp)->CopyBufferSubData)) parameters
 #define GET_CopyBufferSubData(disp) ((disp)->CopyBufferSubData)
 #define SET_CopyBufferSubData(disp, fn) ((disp)->CopyBufferSubData = fn)
+#define CALL_ClientWaitSync(disp, parameters) (*((disp)->ClientWaitSync)) parameters
+#define GET_ClientWaitSync(disp) ((disp)->ClientWaitSync)
+#define SET_ClientWaitSync(disp, fn) ((disp)->ClientWaitSync = fn)
+#define CALL_DeleteSync(disp, parameters) (*((disp)->DeleteSync)) parameters
+#define GET_DeleteSync(disp) ((disp)->DeleteSync)
+#define SET_DeleteSync(disp, fn) ((disp)->DeleteSync = fn)
+#define CALL_FenceSync(disp, parameters) (*((disp)->FenceSync)) parameters
+#define GET_FenceSync(disp) ((disp)->FenceSync)
+#define SET_FenceSync(disp, fn) ((disp)->FenceSync = fn)
+#define CALL_GetInteger64v(disp, parameters) (*((disp)->GetInteger64v)) parameters
+#define GET_GetInteger64v(disp) ((disp)->GetInteger64v)
+#define SET_GetInteger64v(disp, fn) ((disp)->GetInteger64v = fn)
+#define CALL_GetSynciv(disp, parameters) (*((disp)->GetSynciv)) parameters
+#define GET_GetSynciv(disp) ((disp)->GetSynciv)
+#define SET_GetSynciv(disp, fn) ((disp)->GetSynciv = fn)
+#define CALL_IsSync(disp, parameters) (*((disp)->IsSync)) parameters
+#define GET_IsSync(disp) ((disp)->IsSync)
+#define SET_IsSync(disp, fn) ((disp)->IsSync = fn)
+#define CALL_WaitSync(disp, parameters) (*((disp)->WaitSync)) parameters
+#define GET_WaitSync(disp) ((disp)->WaitSync)
+#define SET_WaitSync(disp, fn) ((disp)->WaitSync = fn)
 #define CALL_PolygonOffsetEXT(disp, parameters) (*((disp)->PolygonOffsetEXT)) parameters
 #define GET_PolygonOffsetEXT(disp) ((disp)->PolygonOffsetEXT)
 #define SET_PolygonOffsetEXT(disp, fn) ((disp)->PolygonOffsetEXT = fn)
@@ -2418,7 +2439,7 @@
 
 #else
 
-#define driDispatchRemapTable_size 377
+#define driDispatchRemapTable_size 384
 extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 
 #define AttachShader_remap_index 0
@@ -2580,224 +2601,231 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define BindVertexArray_remap_index 156
 #define GenVertexArrays_remap_index 157
 #define CopyBufferSubData_remap_index 158
-#define PolygonOffsetEXT_remap_index 159
-#define GetPixelTexGenParameterfvSGIS_remap_index 160
-#define GetPixelTexGenParameterivSGIS_remap_index 161
-#define PixelTexGenParameterfSGIS_remap_index 162
-#define PixelTexGenParameterfvSGIS_remap_index 163
-#define PixelTexGenParameteriSGIS_remap_index 164
-#define PixelTexGenParameterivSGIS_remap_index 165
-#define SampleMaskSGIS_remap_index 166
-#define SamplePatternSGIS_remap_index 167
-#define ColorPointerEXT_remap_index 168
-#define EdgeFlagPointerEXT_remap_index 169
-#define IndexPointerEXT_remap_index 170
-#define NormalPointerEXT_remap_index 171
-#define TexCoordPointerEXT_remap_index 172
-#define VertexPointerEXT_remap_index 173
-#define PointParameterfEXT_remap_index 174
-#define PointParameterfvEXT_remap_index 175
-#define LockArraysEXT_remap_index 176
-#define UnlockArraysEXT_remap_index 177
-#define CullParameterdvEXT_remap_index 178
-#define CullParameterfvEXT_remap_index 179
-#define SecondaryColor3bEXT_remap_index 180
-#define SecondaryColor3bvEXT_remap_index 181
-#define SecondaryColor3dEXT_remap_index 182
-#define SecondaryColor3dvEXT_remap_index 183
-#define SecondaryColor3fEXT_remap_index 184
-#define SecondaryColor3fvEXT_remap_index 185
-#define SecondaryColor3iEXT_remap_index 186
-#define SecondaryColor3ivEXT_remap_index 187
-#define SecondaryColor3sEXT_remap_index 188
-#define SecondaryColor3svEXT_remap_index 189
-#define SecondaryColor3ubEXT_remap_index 190
-#define SecondaryColor3ubvEXT_remap_index 191
-#define SecondaryColor3uiEXT_remap_index 192
-#define SecondaryColor3uivEXT_remap_index 193
-#define SecondaryColor3usEXT_remap_index 194
-#define SecondaryColor3usvEXT_remap_index 195
-#define SecondaryColorPointerEXT_remap_index 196
-#define MultiDrawArraysEXT_remap_index 197
-#define MultiDrawElementsEXT_remap_index 198
-#define FogCoordPointerEXT_remap_index 199
-#define FogCoorddEXT_remap_index 200
-#define FogCoorddvEXT_remap_index 201
-#define FogCoordfEXT_remap_index 202
-#define FogCoordfvEXT_remap_index 203
-#define PixelTexGenSGIX_remap_index 204
-#define BlendFuncSeparateEXT_remap_index 205
-#define FlushVertexArrayRangeNV_remap_index 206
-#define VertexArrayRangeNV_remap_index 207
-#define CombinerInputNV_remap_index 208
-#define CombinerOutputNV_remap_index 209
-#define CombinerParameterfNV_remap_index 210
-#define CombinerParameterfvNV_remap_index 211
-#define CombinerParameteriNV_remap_index 212
-#define CombinerParameterivNV_remap_index 213
-#define FinalCombinerInputNV_remap_index 214
-#define GetCombinerInputParameterfvNV_remap_index 215
-#define GetCombinerInputParameterivNV_remap_index 216
-#define GetCombinerOutputParameterfvNV_remap_index 217
-#define GetCombinerOutputParameterivNV_remap_index 218
-#define GetFinalCombinerInputParameterfvNV_remap_index 219
-#define GetFinalCombinerInputParameterivNV_remap_index 220
-#define ResizeBuffersMESA_remap_index 221
-#define WindowPos2dMESA_remap_index 222
-#define WindowPos2dvMESA_remap_index 223
-#define WindowPos2fMESA_remap_index 224
-#define WindowPos2fvMESA_remap_index 225
-#define WindowPos2iMESA_remap_index 226
-#define WindowPos2ivMESA_remap_index 227
-#define WindowPos2sMESA_remap_index 228
-#define WindowPos2svMESA_remap_index 229
-#define WindowPos3dMESA_remap_index 230
-#define WindowPos3dvMESA_remap_index 231
-#define WindowPos3fMESA_remap_index 232
-#define WindowPos3fvMESA_remap_index 233
-#define WindowPos3iMESA_remap_index 234
-#define WindowPos3ivMESA_remap_index 235
-#define WindowPos3sMESA_remap_index 236
-#define WindowPos3svMESA_remap_index 237
-#define WindowPos4dMESA_remap_index 238
-#define WindowPos4dvMESA_remap_index 239
-#define WindowPos4fMESA_remap_index 240
-#define WindowPos4fvMESA_remap_index 241
-#define WindowPos4iMESA_remap_index 242
-#define WindowPos4ivMESA_remap_index 243
-#define WindowPos4sMESA_remap_index 244
-#define WindowPos4svMESA_remap_index 245
-#define MultiModeDrawArraysIBM_remap_index 246
-#define MultiModeDrawElementsIBM_remap_index 247
-#define DeleteFencesNV_remap_index 248
-#define FinishFenceNV_remap_index 249
-#define GenFencesNV_remap_index 250
-#define GetFenceivNV_remap_index 251
-#define IsFenceNV_remap_index 252
-#define SetFenceNV_remap_index 253
-#define TestFenceNV_remap_index 254
-#define AreProgramsResidentNV_remap_index 255
-#define BindProgramNV_remap_index 256
-#define DeleteProgramsNV_remap_index 257
-#define ExecuteProgramNV_remap_index 258
-#define GenProgramsNV_remap_index 259
-#define GetProgramParameterdvNV_remap_index 260
-#define GetProgramParameterfvNV_remap_index 261
-#define GetProgramStringNV_remap_index 262
-#define GetProgramivNV_remap_index 263
-#define GetTrackMatrixivNV_remap_index 264
-#define GetVertexAttribPointervNV_remap_index 265
-#define GetVertexAttribdvNV_remap_index 266
-#define GetVertexAttribfvNV_remap_index 267
-#define GetVertexAttribivNV_remap_index 268
-#define IsProgramNV_remap_index 269
-#define LoadProgramNV_remap_index 270
-#define ProgramParameters4dvNV_remap_index 271
-#define ProgramParameters4fvNV_remap_index 272
-#define RequestResidentProgramsNV_remap_index 273
-#define TrackMatrixNV_remap_index 274
-#define VertexAttrib1dNV_remap_index 275
-#define VertexAttrib1dvNV_remap_index 276
-#define VertexAttrib1fNV_remap_index 277
-#define VertexAttrib1fvNV_remap_index 278
-#define VertexAttrib1sNV_remap_index 279
-#define VertexAttrib1svNV_remap_index 280
-#define VertexAttrib2dNV_remap_index 281
-#define VertexAttrib2dvNV_remap_index 282
-#define VertexAttrib2fNV_remap_index 283
-#define VertexAttrib2fvNV_remap_index 284
-#define VertexAttrib2sNV_remap_index 285
-#define VertexAttrib2svNV_remap_index 286
-#define VertexAttrib3dNV_remap_index 287
-#define VertexAttrib3dvNV_remap_index 288
-#define VertexAttrib3fNV_remap_index 289
-#define VertexAttrib3fvNV_remap_index 290
-#define VertexAttrib3sNV_remap_index 291
-#define VertexAttrib3svNV_remap_index 292
-#define VertexAttrib4dNV_remap_index 293
-#define VertexAttrib4dvNV_remap_index 294
-#define VertexAttrib4fNV_remap_index 295
-#define VertexAttrib4fvNV_remap_index 296
-#define VertexAttrib4sNV_remap_index 297
-#define VertexAttrib4svNV_remap_index 298
-#define VertexAttrib4ubNV_remap_index 299
-#define VertexAttrib4ubvNV_remap_index 300
-#define VertexAttribPointerNV_remap_index 301
-#define VertexAttribs1dvNV_remap_index 302
-#define VertexAttribs1fvNV_remap_index 303
-#define VertexAttribs1svNV_remap_index 304
-#define VertexAttribs2dvNV_remap_index 305
-#define VertexAttribs2fvNV_remap_index 306
-#define VertexAttribs2svNV_remap_index 307
-#define VertexAttribs3dvNV_remap_index 308
-#define VertexAttribs3fvNV_remap_index 309
-#define VertexAttribs3svNV_remap_index 310
-#define VertexAttribs4dvNV_remap_index 311
-#define VertexAttribs4fvNV_remap_index 312
-#define VertexAttribs4svNV_remap_index 313
-#define VertexAttribs4ubvNV_remap_index 314
-#define GetTexBumpParameterfvATI_remap_index 315
-#define GetTexBumpParameterivATI_remap_index 316
-#define TexBumpParameterfvATI_remap_index 317
-#define TexBumpParameterivATI_remap_index 318
-#define AlphaFragmentOp1ATI_remap_index 319
-#define AlphaFragmentOp2ATI_remap_index 320
-#define AlphaFragmentOp3ATI_remap_index 321
-#define BeginFragmentShaderATI_remap_index 322
-#define BindFragmentShaderATI_remap_index 323
-#define ColorFragmentOp1ATI_remap_index 324
-#define ColorFragmentOp2ATI_remap_index 325
-#define ColorFragmentOp3ATI_remap_index 326
-#define DeleteFragmentShaderATI_remap_index 327
-#define EndFragmentShaderATI_remap_index 328
-#define GenFragmentShadersATI_remap_index 329
-#define PassTexCoordATI_remap_index 330
-#define SampleMapATI_remap_index 331
-#define SetFragmentShaderConstantATI_remap_index 332
-#define PointParameteriNV_remap_index 333
-#define PointParameterivNV_remap_index 334
-#define ActiveStencilFaceEXT_remap_index 335
-#define BindVertexArrayAPPLE_remap_index 336
-#define DeleteVertexArraysAPPLE_remap_index 337
-#define GenVertexArraysAPPLE_remap_index 338
-#define IsVertexArrayAPPLE_remap_index 339
-#define GetProgramNamedParameterdvNV_remap_index 340
-#define GetProgramNamedParameterfvNV_remap_index 341
-#define ProgramNamedParameter4dNV_remap_index 342
-#define ProgramNamedParameter4dvNV_remap_index 343
-#define ProgramNamedParameter4fNV_remap_index 344
-#define ProgramNamedParameter4fvNV_remap_index 345
-#define DepthBoundsEXT_remap_index 346
-#define BlendEquationSeparateEXT_remap_index 347
-#define BindFramebufferEXT_remap_index 348
-#define BindRenderbufferEXT_remap_index 349
-#define CheckFramebufferStatusEXT_remap_index 350
-#define DeleteFramebuffersEXT_remap_index 351
-#define DeleteRenderbuffersEXT_remap_index 352
-#define FramebufferRenderbufferEXT_remap_index 353
-#define FramebufferTexture1DEXT_remap_index 354
-#define FramebufferTexture2DEXT_remap_index 355
-#define FramebufferTexture3DEXT_remap_index 356
-#define GenFramebuffersEXT_remap_index 357
-#define GenRenderbuffersEXT_remap_index 358
-#define GenerateMipmapEXT_remap_index 359
-#define GetFramebufferAttachmentParameterivEXT_remap_index 360
-#define GetRenderbufferParameterivEXT_remap_index 361
-#define IsFramebufferEXT_remap_index 362
-#define IsRenderbufferEXT_remap_index 363
-#define RenderbufferStorageEXT_remap_index 364
-#define BlitFramebufferEXT_remap_index 365
-#define BufferParameteriAPPLE_remap_index 366
-#define FlushMappedBufferRangeAPPLE_remap_index 367
-#define FramebufferTextureLayerEXT_remap_index 368
-#define ProvokingVertexEXT_remap_index 369
-#define GetTexParameterPointervAPPLE_remap_index 370
-#define TextureRangeAPPLE_remap_index 371
-#define StencilFuncSeparateATI_remap_index 372
-#define ProgramEnvParameters4fvEXT_remap_index 373
-#define ProgramLocalParameters4fvEXT_remap_index 374
-#define GetQueryObjecti64vEXT_remap_index 375
-#define GetQueryObjectui64vEXT_remap_index 376
+#define ClientWaitSync_remap_index 159
+#define DeleteSync_remap_index 160
+#define FenceSync_remap_index 161
+#define GetInteger64v_remap_index 162
+#define GetSynciv_remap_index 163
+#define IsSync_remap_index 164
+#define WaitSync_remap_index 165
+#define PolygonOffsetEXT_remap_index 166
+#define GetPixelTexGenParameterfvSGIS_remap_index 167
+#define GetPixelTexGenParameterivSGIS_remap_index 168
+#define PixelTexGenParameterfSGIS_remap_index 169
+#define PixelTexGenParameterfvSGIS_remap_index 170
+#define PixelTexGenParameteriSGIS_remap_index 171
+#define PixelTexGenParameterivSGIS_remap_index 172
+#define SampleMaskSGIS_remap_index 173
+#define SamplePatternSGIS_remap_index 174
+#define ColorPointerEXT_remap_index 175
+#define EdgeFlagPointerEXT_remap_index 176
+#define IndexPointerEXT_remap_index 177
+#define NormalPointerEXT_remap_index 178
+#define TexCoordPointerEXT_remap_index 179
+#define VertexPointerEXT_remap_index 180
+#define PointParameterfEXT_remap_index 181
+#define PointParameterfvEXT_remap_index 182
+#define LockArraysEXT_remap_index 183
+#define UnlockArraysEXT_remap_index 184
+#define CullParameterdvEXT_remap_index 185
+#define CullParameterfvEXT_remap_index 186
+#define SecondaryColor3bEXT_remap_index 187
+#define SecondaryColor3bvEXT_remap_index 188
+#define SecondaryColor3dEXT_remap_index 189
+#define SecondaryColor3dvEXT_remap_index 190
+#define SecondaryColor3fEXT_remap_index 191
+#define SecondaryColor3fvEXT_remap_index 192
+#define SecondaryColor3iEXT_remap_index 193
+#define SecondaryColor3ivEXT_remap_index 194
+#define SecondaryColor3sEXT_remap_index 195
+#define SecondaryColor3svEXT_remap_index 196
+#define SecondaryColor3ubEXT_remap_index 197
+#define SecondaryColor3ubvEXT_remap_index 198
+#define SecondaryColor3uiEXT_remap_index 199
+#define SecondaryColor3uivEXT_remap_index 200
+#define SecondaryColor3usEXT_remap_index 201
+#define SecondaryColor3usvEXT_remap_index 202
+#define SecondaryColorPointerEXT_remap_index 203
+#define MultiDrawArraysEXT_remap_index 204
+#define MultiDrawElementsEXT_remap_index 205
+#define FogCoordPointerEXT_remap_index 206
+#define FogCoorddEXT_remap_index 207
+#define FogCoorddvEXT_remap_index 208
+#define FogCoordfEXT_remap_index 209
+#define FogCoordfvEXT_remap_index 210
+#define PixelTexGenSGIX_remap_index 211
+#define BlendFuncSeparateEXT_remap_index 212
+#define FlushVertexArrayRangeNV_remap_index 213
+#define VertexArrayRangeNV_remap_index 214
+#define CombinerInputNV_remap_index 215
+#define CombinerOutputNV_remap_index 216
+#define CombinerParameterfNV_remap_index 217
+#define CombinerParameterfvNV_remap_index 218
+#define CombinerParameteriNV_remap_index 219
+#define CombinerParameterivNV_remap_index 220
+#define FinalCombinerInputNV_remap_index 221
+#define GetCombinerInputParameterfvNV_remap_index 222
+#define GetCombinerInputParameterivNV_remap_index 223
+#define GetCombinerOutputParameterfvNV_remap_index 224
+#define GetCombinerOutputParameterivNV_remap_index 225
+#define GetFinalCombinerInputParameterfvNV_remap_index 226
+#define GetFinalCombinerInputParameterivNV_remap_index 227
+#define ResizeBuffersMESA_remap_index 228
+#define WindowPos2dMESA_remap_index 229
+#define WindowPos2dvMESA_remap_index 230
+#define WindowPos2fMESA_remap_index 231
+#define WindowPos2fvMESA_remap_index 232
+#define WindowPos2iMESA_remap_index 233
+#define WindowPos2ivMESA_remap_index 234
+#define WindowPos2sMESA_remap_index 235
+#define WindowPos2svMESA_remap_index 236
+#define WindowPos3dMESA_remap_index 237
+#define WindowPos3dvMESA_remap_index 238
+#define WindowPos3fMESA_remap_index 239
+#define WindowPos3fvMESA_remap_index 240
+#define WindowPos3iMESA_remap_index 241
+#define WindowPos3ivMESA_remap_index 242
+#define WindowPos3sMESA_remap_index 243
+#define WindowPos3svMESA_remap_index 244
+#define WindowPos4dMESA_remap_index 245
+#define WindowPos4dvMESA_remap_index 246
+#define WindowPos4fMESA_remap_index 247
+#define WindowPos4fvMESA_remap_index 248
+#define WindowPos4iMESA_remap_index 249
+#define WindowPos4ivMESA_remap_index 250
+#define WindowPos4sMESA_remap_index 251
+#define WindowPos4svMESA_remap_index 252
+#define MultiModeDrawArraysIBM_remap_index 253
+#define MultiModeDrawElementsIBM_remap_index 254
+#define DeleteFencesNV_remap_index 255
+#define FinishFenceNV_remap_index 256
+#define GenFencesNV_remap_index 257
+#define GetFenceivNV_remap_index 258
+#define IsFenceNV_remap_index 259
+#define SetFenceNV_remap_index 260
+#define TestFenceNV_remap_index 261
+#define AreProgramsResidentNV_remap_index 262
+#define BindProgramNV_remap_index 263
+#define DeleteProgramsNV_remap_index 264
+#define ExecuteProgramNV_remap_index 265
+#define GenProgramsNV_remap_index 266
+#define GetProgramParameterdvNV_remap_index 267
+#define GetProgramParameterfvNV_remap_index 268
+#define GetProgramStringNV_remap_index 269
+#define GetProgramivNV_remap_index 270
+#define GetTrackMatrixivNV_remap_index 271
+#define GetVertexAttribPointervNV_remap_index 272
+#define GetVertexAttribdvNV_remap_index 273
+#define GetVertexAttribfvNV_remap_index 274
+#define GetVertexAttribivNV_remap_index 275
+#define IsProgramNV_remap_index 276
+#define LoadProgramNV_remap_index 277
+#define ProgramParameters4dvNV_remap_index 278
+#define ProgramParameters4fvNV_remap_index 279
+#define RequestResidentProgramsNV_remap_index 280
+#define TrackMatrixNV_remap_index 281
+#define VertexAttrib1dNV_remap_index 282
+#define VertexAttrib1dvNV_remap_index 283
+#define VertexAttrib1fNV_remap_index 284
+#define VertexAttrib1fvNV_remap_index 285
+#define VertexAttrib1sNV_remap_index 286
+#define VertexAttrib1svNV_remap_index 287
+#define VertexAttrib2dNV_remap_index 288
+#define VertexAttrib2dvNV_remap_index 289
+#define VertexAttrib2fNV_remap_index 290
+#define VertexAttrib2fvNV_remap_index 291
+#define VertexAttrib2sNV_remap_index 292
+#define VertexAttrib2svNV_remap_index 293
+#define VertexAttrib3dNV_remap_index 294
+#define VertexAttrib3dvNV_remap_index 295
+#define VertexAttrib3fNV_remap_index 296
+#define VertexAttrib3fvNV_remap_index 297
+#define VertexAttrib3sNV_remap_index 298
+#define VertexAttrib3svNV_remap_index 299
+#define VertexAttrib4dNV_remap_index 300
+#define VertexAttrib4dvNV_remap_index 301
+#define VertexAttrib4fNV_remap_index 302
+#define VertexAttrib4fvNV_remap_index 303
+#define VertexAttrib4sNV_remap_index 304
+#define VertexAttrib4svNV_remap_index 305
+#define VertexAttrib4ubNV_remap_index 306
+#define VertexAttrib4ubvNV_remap_index 307
+#define VertexAttribPointerNV_remap_index 308
+#define VertexAttribs1dvNV_remap_index 309
+#define VertexAttribs1fvNV_remap_index 310
+#define VertexAttribs1svNV_remap_index 311
+#define VertexAttribs2dvNV_remap_index 312
+#define VertexAttribs2fvNV_remap_index 313
+#define VertexAttribs2svNV_remap_index 314
+#define VertexAttribs3dvNV_remap_index 315
+#define VertexAttribs3fvNV_remap_index 316
+#define VertexAttribs3svNV_remap_index 317
+#define VertexAttribs4dvNV_remap_index 318
+#define VertexAttribs4fvNV_remap_index 319
+#define VertexAttribs4svNV_remap_index 320
+#define VertexAttribs4ubvNV_remap_index 321
+#define GetTexBumpParameterfvATI_remap_index 322
+#define GetTexBumpParameterivATI_remap_index 323
+#define TexBumpParameterfvATI_remap_index 324
+#define TexBumpParameterivATI_remap_index 325
+#define AlphaFragmentOp1ATI_remap_index 326
+#define AlphaFragmentOp2ATI_remap_index 327
+#define AlphaFragmentOp3ATI_remap_index 328
+#define BeginFragmentShaderATI_remap_index 329
+#define BindFragmentShaderATI_remap_index 330
+#define ColorFragmentOp1ATI_remap_index 331
+#define ColorFragmentOp2ATI_remap_index 332
+#define ColorFragmentOp3ATI_remap_index 333
+#define DeleteFragmentShaderATI_remap_index 334
+#define EndFragmentShaderATI_remap_index 335
+#define GenFragmentShadersATI_remap_index 336
+#define PassTexCoordATI_remap_index 337
+#define SampleMapATI_remap_index 338
+#define SetFragmentShaderConstantATI_remap_index 339
+#define PointParameteriNV_remap_index 340
+#define PointParameterivNV_remap_index 341
+#define ActiveStencilFaceEXT_remap_index 342
+#define BindVertexArrayAPPLE_remap_index 343
+#define DeleteVertexArraysAPPLE_remap_index 344
+#define GenVertexArraysAPPLE_remap_index 345
+#define IsVertexArrayAPPLE_remap_index 346
+#define GetProgramNamedParameterdvNV_remap_index 347
+#define GetProgramNamedParameterfvNV_remap_index 348
+#define ProgramNamedParameter4dNV_remap_index 349
+#define ProgramNamedParameter4dvNV_remap_index 350
+#define ProgramNamedParameter4fNV_remap_index 351
+#define ProgramNamedParameter4fvNV_remap_index 352
+#define DepthBoundsEXT_remap_index 353
+#define BlendEquationSeparateEXT_remap_index 354
+#define BindFramebufferEXT_remap_index 355
+#define BindRenderbufferEXT_remap_index 356
+#define CheckFramebufferStatusEXT_remap_index 357
+#define DeleteFramebuffersEXT_remap_index 358
+#define DeleteRenderbuffersEXT_remap_index 359
+#define FramebufferRenderbufferEXT_remap_index 360
+#define FramebufferTexture1DEXT_remap_index 361
+#define FramebufferTexture2DEXT_remap_index 362
+#define FramebufferTexture3DEXT_remap_index 363
+#define GenFramebuffersEXT_remap_index 364
+#define GenRenderbuffersEXT_remap_index 365
+#define GenerateMipmapEXT_remap_index 366
+#define GetFramebufferAttachmentParameterivEXT_remap_index 367
+#define GetRenderbufferParameterivEXT_remap_index 368
+#define IsFramebufferEXT_remap_index 369
+#define IsRenderbufferEXT_remap_index 370
+#define RenderbufferStorageEXT_remap_index 371
+#define BlitFramebufferEXT_remap_index 372
+#define BufferParameteriAPPLE_remap_index 373
+#define FlushMappedBufferRangeAPPLE_remap_index 374
+#define FramebufferTextureLayerEXT_remap_index 375
+#define ProvokingVertexEXT_remap_index 376
+#define GetTexParameterPointervAPPLE_remap_index 377
+#define TextureRangeAPPLE_remap_index 378
+#define StencilFuncSeparateATI_remap_index 379
+#define ProgramEnvParameters4fvEXT_remap_index 380
+#define ProgramLocalParameters4fvEXT_remap_index 381
+#define GetQueryObjecti64vEXT_remap_index 382
+#define GetQueryObjectui64vEXT_remap_index 383
 
 #define CALL_AttachShader(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLuint)), driDispatchRemapTable[AttachShader_remap_index], parameters)
 #define GET_AttachShader(disp) GET_by_offset(disp, driDispatchRemapTable[AttachShader_remap_index])
@@ -3276,6 +3304,27 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define CALL_CopyBufferSubData(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLintptr, GLintptr, GLsizeiptr)), driDispatchRemapTable[CopyBufferSubData_remap_index], parameters)
 #define GET_CopyBufferSubData(disp) GET_by_offset(disp, driDispatchRemapTable[CopyBufferSubData_remap_index])
 #define SET_CopyBufferSubData(disp, fn) SET_by_offset(disp, driDispatchRemapTable[CopyBufferSubData_remap_index], fn)
+#define CALL_ClientWaitSync(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsync, GLbitfield, GLuint64)), driDispatchRemapTable[ClientWaitSync_remap_index], parameters)
+#define GET_ClientWaitSync(disp) GET_by_offset(disp, driDispatchRemapTable[ClientWaitSync_remap_index])
+#define SET_ClientWaitSync(disp, fn) SET_by_offset(disp, driDispatchRemapTable[ClientWaitSync_remap_index], fn)
+#define CALL_DeleteSync(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsync)), driDispatchRemapTable[DeleteSync_remap_index], parameters)
+#define GET_DeleteSync(disp) GET_by_offset(disp, driDispatchRemapTable[DeleteSync_remap_index])
+#define SET_DeleteSync(disp, fn) SET_by_offset(disp, driDispatchRemapTable[DeleteSync_remap_index], fn)
+#define CALL_FenceSync(disp, parameters) CALL_by_offset(disp, (GLuint (GLAPIENTRYP)(GLenum, GLbitfield)), driDispatchRemapTable[FenceSync_remap_index], parameters)
+#define GET_FenceSync(disp) GET_by_offset(disp, driDispatchRemapTable[FenceSync_remap_index])
+#define SET_FenceSync(disp, fn) SET_by_offset(disp, driDispatchRemapTable[FenceSync_remap_index], fn)
+#define CALL_GetInteger64v(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint64 *)), driDispatchRemapTable[GetInteger64v_remap_index], parameters)
+#define GET_GetInteger64v(disp) GET_by_offset(disp, driDispatchRemapTable[GetInteger64v_remap_index])
+#define SET_GetInteger64v(disp, fn) SET_by_offset(disp, driDispatchRemapTable[GetInteger64v_remap_index], fn)
+#define CALL_GetSynciv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsync, GLenum, GLsizei, GLsizei *, GLint *)), driDispatchRemapTable[GetSynciv_remap_index], parameters)
+#define GET_GetSynciv(disp) GET_by_offset(disp, driDispatchRemapTable[GetSynciv_remap_index])
+#define SET_GetSynciv(disp, fn) SET_by_offset(disp, driDispatchRemapTable[GetSynciv_remap_index], fn)
+#define CALL_IsSync(disp, parameters) CALL_by_offset(disp, (GLboolean (GLAPIENTRYP)(GLsync)), driDispatchRemapTable[IsSync_remap_index], parameters)
+#define GET_IsSync(disp) GET_by_offset(disp, driDispatchRemapTable[IsSync_remap_index])
+#define SET_IsSync(disp, fn) SET_by_offset(disp, driDispatchRemapTable[IsSync_remap_index], fn)
+#define CALL_WaitSync(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsync, GLbitfield, GLuint64)), driDispatchRemapTable[WaitSync_remap_index], parameters)
+#define GET_WaitSync(disp) GET_by_offset(disp, driDispatchRemapTable[WaitSync_remap_index])
+#define SET_WaitSync(disp, fn) SET_by_offset(disp, driDispatchRemapTable[WaitSync_remap_index], fn)
 #define CALL_PolygonOffsetEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLfloat, GLfloat)), driDispatchRemapTable[PolygonOffsetEXT_remap_index], parameters)
 #define GET_PolygonOffsetEXT(disp) GET_by_offset(disp, driDispatchRemapTable[PolygonOffsetEXT_remap_index])
 #define SET_PolygonOffsetEXT(disp, fn) SET_by_offset(disp, driDispatchRemapTable[PolygonOffsetEXT_remap_index], fn)
diff --git a/src/mesa/glapi/glapioffsets.h b/src/mesa/glapi/glapioffsets.h
index 01fd6f7158..6d4ab09b07 100644
--- a/src/mesa/glapi/glapioffsets.h
+++ b/src/mesa/glapi/glapioffsets.h
@@ -599,225 +599,232 @@
 #define _gloffset_BindVertexArray 564
 #define _gloffset_GenVertexArrays 565
 #define _gloffset_CopyBufferSubData 566
-#define _gloffset_PolygonOffsetEXT 567
-#define _gloffset_GetPixelTexGenParameterfvSGIS 568
-#define _gloffset_GetPixelTexGenParameterivSGIS 569
-#define _gloffset_PixelTexGenParameterfSGIS 570
-#define _gloffset_PixelTexGenParameterfvSGIS 571
-#define _gloffset_PixelTexGenParameteriSGIS 572
-#define _gloffset_PixelTexGenParameterivSGIS 573
-#define _gloffset_SampleMaskSGIS 574
-#define _gloffset_SamplePatternSGIS 575
-#define _gloffset_ColorPointerEXT 576
-#define _gloffset_EdgeFlagPointerEXT 577
-#define _gloffset_IndexPointerEXT 578
-#define _gloffset_NormalPointerEXT 579
-#define _gloffset_TexCoordPointerEXT 580
-#define _gloffset_VertexPointerEXT 581
-#define _gloffset_PointParameterfEXT 582
-#define _gloffset_PointParameterfvEXT 583
-#define _gloffset_LockArraysEXT 584
-#define _gloffset_UnlockArraysEXT 585
-#define _gloffset_CullParameterdvEXT 586
-#define _gloffset_CullParameterfvEXT 587
-#define _gloffset_SecondaryColor3bEXT 588
-#define _gloffset_SecondaryColor3bvEXT 589
-#define _gloffset_SecondaryColor3dEXT 590
-#define _gloffset_SecondaryColor3dvEXT 591
-#define _gloffset_SecondaryColor3fEXT 592
-#define _gloffset_SecondaryColor3fvEXT 593
-#define _gloffset_SecondaryColor3iEXT 594
-#define _gloffset_SecondaryColor3ivEXT 595
-#define _gloffset_SecondaryColor3sEXT 596
-#define _gloffset_SecondaryColor3svEXT 597
-#define _gloffset_SecondaryColor3ubEXT 598
-#define _gloffset_SecondaryColor3ubvEXT 599
-#define _gloffset_SecondaryColor3uiEXT 600
-#define _gloffset_SecondaryColor3uivEXT 601
-#define _gloffset_SecondaryColor3usEXT 602
-#define _gloffset_SecondaryColor3usvEXT 603
-#define _gloffset_SecondaryColorPointerEXT 604
-#define _gloffset_MultiDrawArraysEXT 605
-#define _gloffset_MultiDrawElementsEXT 606
-#define _gloffset_FogCoordPointerEXT 607
-#define _gloffset_FogCoorddEXT 608
-#define _gloffset_FogCoorddvEXT 609
-#define _gloffset_FogCoordfEXT 610
-#define _gloffset_FogCoordfvEXT 611
-#define _gloffset_PixelTexGenSGIX 612
-#define _gloffset_BlendFuncSeparateEXT 613
-#define _gloffset_FlushVertexArrayRangeNV 614
-#define _gloffset_VertexArrayRangeNV 615
-#define _gloffset_CombinerInputNV 616
-#define _gloffset_CombinerOutputNV 617
-#define _gloffset_CombinerParameterfNV 618
-#define _gloffset_CombinerParameterfvNV 619
-#define _gloffset_CombinerParameteriNV 620
-#define _gloffset_CombinerParameterivNV 621
-#define _gloffset_FinalCombinerInputNV 622
-#define _gloffset_GetCombinerInputParameterfvNV 623
-#define _gloffset_GetCombinerInputParameterivNV 624
-#define _gloffset_GetCombinerOutputParameterfvNV 625
-#define _gloffset_GetCombinerOutputParameterivNV 626
-#define _gloffset_GetFinalCombinerInputParameterfvNV 627
-#define _gloffset_GetFinalCombinerInputParameterivNV 628
-#define _gloffset_ResizeBuffersMESA 629
-#define _gloffset_WindowPos2dMESA 630
-#define _gloffset_WindowPos2dvMESA 631
-#define _gloffset_WindowPos2fMESA 632
-#define _gloffset_WindowPos2fvMESA 633
-#define _gloffset_WindowPos2iMESA 634
-#define _gloffset_WindowPos2ivMESA 635
-#define _gloffset_WindowPos2sMESA 636
-#define _gloffset_WindowPos2svMESA 637
-#define _gloffset_WindowPos3dMESA 638
-#define _gloffset_WindowPos3dvMESA 639
-#define _gloffset_WindowPos3fMESA 640
-#define _gloffset_WindowPos3fvMESA 641
-#define _gloffset_WindowPos3iMESA 642
-#define _gloffset_WindowPos3ivMESA 643
-#define _gloffset_WindowPos3sMESA 644
-#define _gloffset_WindowPos3svMESA 645
-#define _gloffset_WindowPos4dMESA 646
-#define _gloffset_WindowPos4dvMESA 647
-#define _gloffset_WindowPos4fMESA 648
-#define _gloffset_WindowPos4fvMESA 649
-#define _gloffset_WindowPos4iMESA 650
-#define _gloffset_WindowPos4ivMESA 651
-#define _gloffset_WindowPos4sMESA 652
-#define _gloffset_WindowPos4svMESA 653
-#define _gloffset_MultiModeDrawArraysIBM 654
-#define _gloffset_MultiModeDrawElementsIBM 655
-#define _gloffset_DeleteFencesNV 656
-#define _gloffset_FinishFenceNV 657
-#define _gloffset_GenFencesNV 658
-#define _gloffset_GetFenceivNV 659
-#define _gloffset_IsFenceNV 660
-#define _gloffset_SetFenceNV 661
-#define _gloffset_TestFenceNV 662
-#define _gloffset_AreProgramsResidentNV 663
-#define _gloffset_BindProgramNV 664
-#define _gloffset_DeleteProgramsNV 665
-#define _gloffset_ExecuteProgramNV 666
-#define _gloffset_GenProgramsNV 667
-#define _gloffset_GetProgramParameterdvNV 668
-#define _gloffset_GetProgramParameterfvNV 669
-#define _gloffset_GetProgramStringNV 670
-#define _gloffset_GetProgramivNV 671
-#define _gloffset_GetTrackMatrixivNV 672
-#define _gloffset_GetVertexAttribPointervNV 673
-#define _gloffset_GetVertexAttribdvNV 674
-#define _gloffset_GetVertexAttribfvNV 675
-#define _gloffset_GetVertexAttribivNV 676
-#define _gloffset_IsProgramNV 677
-#define _gloffset_LoadProgramNV 678
-#define _gloffset_ProgramParameters4dvNV 679
-#define _gloffset_ProgramParameters4fvNV 680
-#define _gloffset_RequestResidentProgramsNV 681
-#define _gloffset_TrackMatrixNV 682
-#define _gloffset_VertexAttrib1dNV 683
-#define _gloffset_VertexAttrib1dvNV 684
-#define _gloffset_VertexAttrib1fNV 685
-#define _gloffset_VertexAttrib1fvNV 686
-#define _gloffset_VertexAttrib1sNV 687
-#define _gloffset_VertexAttrib1svNV 688
-#define _gloffset_VertexAttrib2dNV 689
-#define _gloffset_VertexAttrib2dvNV 690
-#define _gloffset_VertexAttrib2fNV 691
-#define _gloffset_VertexAttrib2fvNV 692
-#define _gloffset_VertexAttrib2sNV 693
-#define _gloffset_VertexAttrib2svNV 694
-#define _gloffset_VertexAttrib3dNV 695
-#define _gloffset_VertexAttrib3dvNV 696
-#define _gloffset_VertexAttrib3fNV 697
-#define _gloffset_VertexAttrib3fvNV 698
-#define _gloffset_VertexAttrib3sNV 699
-#define _gloffset_VertexAttrib3svNV 700
-#define _gloffset_VertexAttrib4dNV 701
-#define _gloffset_VertexAttrib4dvNV 702
-#define _gloffset_VertexAttrib4fNV 703
-#define _gloffset_VertexAttrib4fvNV 704
-#define _gloffset_VertexAttrib4sNV 705
-#define _gloffset_VertexAttrib4svNV 706
-#define _gloffset_VertexAttrib4ubNV 707
-#define _gloffset_VertexAttrib4ubvNV 708
-#define _gloffset_VertexAttribPointerNV 709
-#define _gloffset_VertexAttribs1dvNV 710
-#define _gloffset_VertexAttribs1fvNV 711
-#define _gloffset_VertexAttribs1svNV 712
-#define _gloffset_VertexAttribs2dvNV 713
-#define _gloffset_VertexAttribs2fvNV 714
-#define _gloffset_VertexAttribs2svNV 715
-#define _gloffset_VertexAttribs3dvNV 716
-#define _gloffset_VertexAttribs3fvNV 717
-#define _gloffset_VertexAttribs3svNV 718
-#define _gloffset_VertexAttribs4dvNV 719
-#define _gloffset_VertexAttribs4fvNV 720
-#define _gloffset_VertexAttribs4svNV 721
-#define _gloffset_VertexAttribs4ubvNV 722
-#define _gloffset_GetTexBumpParameterfvATI 723
-#define _gloffset_GetTexBumpParameterivATI 724
-#define _gloffset_TexBumpParameterfvATI 725
-#define _gloffset_TexBumpParameterivATI 726
-#define _gloffset_AlphaFragmentOp1ATI 727
-#define _gloffset_AlphaFragmentOp2ATI 728
-#define _gloffset_AlphaFragmentOp3ATI 729
-#define _gloffset_BeginFragmentShaderATI 730
-#define _gloffset_BindFragmentShaderATI 731
-#define _gloffset_ColorFragmentOp1ATI 732
-#define _gloffset_ColorFragmentOp2ATI 733
-#define _gloffset_ColorFragmentOp3ATI 734
-#define _gloffset_DeleteFragmentShaderATI 735
-#define _gloffset_EndFragmentShaderATI 736
-#define _gloffset_GenFragmentShadersATI 737
-#define _gloffset_PassTexCoordATI 738
-#define _gloffset_SampleMapATI 739
-#define _gloffset_SetFragmentShaderConstantATI 740
-#define _gloffset_PointParameteriNV 741
-#define _gloffset_PointParameterivNV 742
-#define _gloffset_ActiveStencilFaceEXT 743
-#define _gloffset_BindVertexArrayAPPLE 744
-#define _gloffset_DeleteVertexArraysAPPLE 745
-#define _gloffset_GenVertexArraysAPPLE 746
-#define _gloffset_IsVertexArrayAPPLE 747
-#define _gloffset_GetProgramNamedParameterdvNV 748
-#define _gloffset_GetProgramNamedParameterfvNV 749
-#define _gloffset_ProgramNamedParameter4dNV 750
-#define _gloffset_ProgramNamedParameter4dvNV 751
-#define _gloffset_ProgramNamedParameter4fNV 752
-#define _gloffset_ProgramNamedParameter4fvNV 753
-#define _gloffset_DepthBoundsEXT 754
-#define _gloffset_BlendEquationSeparateEXT 755
-#define _gloffset_BindFramebufferEXT 756
-#define _gloffset_BindRenderbufferEXT 757
-#define _gloffset_CheckFramebufferStatusEXT 758
-#define _gloffset_DeleteFramebuffersEXT 759
-#define _gloffset_DeleteRenderbuffersEXT 760
-#define _gloffset_FramebufferRenderbufferEXT 761
-#define _gloffset_FramebufferTexture1DEXT 762
-#define _gloffset_FramebufferTexture2DEXT 763
-#define _gloffset_FramebufferTexture3DEXT 764
-#define _gloffset_GenFramebuffersEXT 765
-#define _gloffset_GenRenderbuffersEXT 766
-#define _gloffset_GenerateMipmapEXT 767
-#define _gloffset_GetFramebufferAttachmentParameterivEXT 768
-#define _gloffset_GetRenderbufferParameterivEXT 769
-#define _gloffset_IsFramebufferEXT 770
-#define _gloffset_IsRenderbufferEXT 771
-#define _gloffset_RenderbufferStorageEXT 772
-#define _gloffset_BlitFramebufferEXT 773
-#define _gloffset_BufferParameteriAPPLE 774
-#define _gloffset_FlushMappedBufferRangeAPPLE 775
-#define _gloffset_FramebufferTextureLayerEXT 776
-#define _gloffset_ProvokingVertexEXT 777
-#define _gloffset_GetTexParameterPointervAPPLE 778
-#define _gloffset_TextureRangeAPPLE 779
-#define _gloffset_StencilFuncSeparateATI 780
-#define _gloffset_ProgramEnvParameters4fvEXT 781
-#define _gloffset_ProgramLocalParameters4fvEXT 782
-#define _gloffset_GetQueryObjecti64vEXT 783
-#define _gloffset_GetQueryObjectui64vEXT 784
-#define _gloffset_FIRST_DYNAMIC 785
+#define _gloffset_ClientWaitSync 567
+#define _gloffset_DeleteSync 568
+#define _gloffset_FenceSync 569
+#define _gloffset_GetInteger64v 570
+#define _gloffset_GetSynciv 571
+#define _gloffset_IsSync 572
+#define _gloffset_WaitSync 573
+#define _gloffset_PolygonOffsetEXT 574
+#define _gloffset_GetPixelTexGenParameterfvSGIS 575
+#define _gloffset_GetPixelTexGenParameterivSGIS 576
+#define _gloffset_PixelTexGenParameterfSGIS 577
+#define _gloffset_PixelTexGenParameterfvSGIS 578
+#define _gloffset_PixelTexGenParameteriSGIS 579
+#define _gloffset_PixelTexGenParameterivSGIS 580
+#define _gloffset_SampleMaskSGIS 581
+#define _gloffset_SamplePatternSGIS 582
+#define _gloffset_ColorPointerEXT 583
+#define _gloffset_EdgeFlagPointerEXT 584
+#define _gloffset_IndexPointerEXT 585
+#define _gloffset_NormalPointerEXT 586
+#define _gloffset_TexCoordPointerEXT 587
+#define _gloffset_VertexPointerEXT 588
+#define _gloffset_PointParameterfEXT 589
+#define _gloffset_PointParameterfvEXT 590
+#define _gloffset_LockArraysEXT 591
+#define _gloffset_UnlockArraysEXT 592
+#define _gloffset_CullParameterdvEXT 593
+#define _gloffset_CullParameterfvEXT 594
+#define _gloffset_SecondaryColor3bEXT 595
+#define _gloffset_SecondaryColor3bvEXT 596
+#define _gloffset_SecondaryColor3dEXT 597
+#define _gloffset_SecondaryColor3dvEXT 598
+#define _gloffset_SecondaryColor3fEXT 599
+#define _gloffset_SecondaryColor3fvEXT 600
+#define _gloffset_SecondaryColor3iEXT 601
+#define _gloffset_SecondaryColor3ivEXT 602
+#define _gloffset_SecondaryColor3sEXT 603
+#define _gloffset_SecondaryColor3svEXT 604
+#define _gloffset_SecondaryColor3ubEXT 605
+#define _gloffset_SecondaryColor3ubvEXT 606
+#define _gloffset_SecondaryColor3uiEXT 607
+#define _gloffset_SecondaryColor3uivEXT 608
+#define _gloffset_SecondaryColor3usEXT 609
+#define _gloffset_SecondaryColor3usvEXT 610
+#define _gloffset_SecondaryColorPointerEXT 611
+#define _gloffset_MultiDrawArraysEXT 612
+#define _gloffset_MultiDrawElementsEXT 613
+#define _gloffset_FogCoordPointerEXT 614
+#define _gloffset_FogCoorddEXT 615
+#define _gloffset_FogCoorddvEXT 616
+#define _gloffset_FogCoordfEXT 617
+#define _gloffset_FogCoordfvEXT 618
+#define _gloffset_PixelTexGenSGIX 619
+#define _gloffset_BlendFuncSeparateEXT 620
+#define _gloffset_FlushVertexArrayRangeNV 621
+#define _gloffset_VertexArrayRangeNV 622
+#define _gloffset_CombinerInputNV 623
+#define _gloffset_CombinerOutputNV 624
+#define _gloffset_CombinerParameterfNV 625
+#define _gloffset_CombinerParameterfvNV 626
+#define _gloffset_CombinerParameteriNV 627
+#define _gloffset_CombinerParameterivNV 628
+#define _gloffset_FinalCombinerInputNV 629
+#define _gloffset_GetCombinerInputParameterfvNV 630
+#define _gloffset_GetCombinerInputParameterivNV 631
+#define _gloffset_GetCombinerOutputParameterfvNV 632
+#define _gloffset_GetCombinerOutputParameterivNV 633
+#define _gloffset_GetFinalCombinerInputParameterfvNV 634
+#define _gloffset_GetFinalCombinerInputParameterivNV 635
+#define _gloffset_ResizeBuffersMESA 636
+#define _gloffset_WindowPos2dMESA 637
+#define _gloffset_WindowPos2dvMESA 638
+#define _gloffset_WindowPos2fMESA 639
+#define _gloffset_WindowPos2fvMESA 640
+#define _gloffset_WindowPos2iMESA 641
+#define _gloffset_WindowPos2ivMESA 642
+#define _gloffset_WindowPos2sMESA 643
+#define _gloffset_WindowPos2svMESA 644
+#define _gloffset_WindowPos3dMESA 645
+#define _gloffset_WindowPos3dvMESA 646
+#define _gloffset_WindowPos3fMESA 647
+#define _gloffset_WindowPos3fvMESA 648
+#define _gloffset_WindowPos3iMESA 649
+#define _gloffset_WindowPos3ivMESA 650
+#define _gloffset_WindowPos3sMESA 651
+#define _gloffset_WindowPos3svMESA 652
+#define _gloffset_WindowPos4dMESA 653
+#define _gloffset_WindowPos4dvMESA 654
+#define _gloffset_WindowPos4fMESA 655
+#define _gloffset_WindowPos4fvMESA 656
+#define _gloffset_WindowPos4iMESA 657
+#define _gloffset_WindowPos4ivMESA 658
+#define _gloffset_WindowPos4sMESA 659
+#define _gloffset_WindowPos4svMESA 660
+#define _gloffset_MultiModeDrawArraysIBM 661
+#define _gloffset_MultiModeDrawElementsIBM 662
+#define _gloffset_DeleteFencesNV 663
+#define _gloffset_FinishFenceNV 664
+#define _gloffset_GenFencesNV 665
+#define _gloffset_GetFenceivNV 666
+#define _gloffset_IsFenceNV 667
+#define _gloffset_SetFenceNV 668
+#define _gloffset_TestFenceNV 669
+#define _gloffset_AreProgramsResidentNV 670
+#define _gloffset_BindProgramNV 671
+#define _gloffset_DeleteProgramsNV 672
+#define _gloffset_ExecuteProgramNV 673
+#define _gloffset_GenProgramsNV 674
+#define _gloffset_GetProgramParameterdvNV 675
+#define _gloffset_GetProgramParameterfvNV 676
+#define _gloffset_GetProgramStringNV 677
+#define _gloffset_GetProgramivNV 678
+#define _gloffset_GetTrackMatrixivNV 679
+#define _gloffset_GetVertexAttribPointervNV 680
+#define _gloffset_GetVertexAttribdvNV 681
+#define _gloffset_GetVertexAttribfvNV 682
+#define _gloffset_GetVertexAttribivNV 683
+#define _gloffset_IsProgramNV 684
+#define _gloffset_LoadProgramNV 685
+#define _gloffset_ProgramParameters4dvNV 686
+#define _gloffset_ProgramParameters4fvNV 687
+#define _gloffset_RequestResidentProgramsNV 688
+#define _gloffset_TrackMatrixNV 689
+#define _gloffset_VertexAttrib1dNV 690
+#define _gloffset_VertexAttrib1dvNV 691
+#define _gloffset_VertexAttrib1fNV 692
+#define _gloffset_VertexAttrib1fvNV 693
+#define _gloffset_VertexAttrib1sNV 694
+#define _gloffset_VertexAttrib1svNV 695
+#define _gloffset_VertexAttrib2dNV 696
+#define _gloffset_VertexAttrib2dvNV 697
+#define _gloffset_VertexAttrib2fNV 698
+#define _gloffset_VertexAttrib2fvNV 699
+#define _gloffset_VertexAttrib2sNV 700
+#define _gloffset_VertexAttrib2svNV 701
+#define _gloffset_VertexAttrib3dNV 702
+#define _gloffset_VertexAttrib3dvNV 703
+#define _gloffset_VertexAttrib3fNV 704
+#define _gloffset_VertexAttrib3fvNV 705
+#define _gloffset_VertexAttrib3sNV 706
+#define _gloffset_VertexAttrib3svNV 707
+#define _gloffset_VertexAttrib4dNV 708
+#define _gloffset_VertexAttrib4dvNV 709
+#define _gloffset_VertexAttrib4fNV 710
+#define _gloffset_VertexAttrib4fvNV 711
+#define _gloffset_VertexAttrib4sNV 712
+#define _gloffset_VertexAttrib4svNV 713
+#define _gloffset_VertexAttrib4ubNV 714
+#define _gloffset_VertexAttrib4ubvNV 715
+#define _gloffset_VertexAttribPointerNV 716
+#define _gloffset_VertexAttribs1dvNV 717
+#define _gloffset_VertexAttribs1fvNV 718
+#define _gloffset_VertexAttribs1svNV 719
+#define _gloffset_VertexAttribs2dvNV 720
+#define _gloffset_VertexAttribs2fvNV 721
+#define _gloffset_VertexAttribs2svNV 722
+#define _gloffset_VertexAttribs3dvNV 723
+#define _gloffset_VertexAttribs3fvNV 724
+#define _gloffset_VertexAttribs3svNV 725
+#define _gloffset_VertexAttribs4dvNV 726
+#define _gloffset_VertexAttribs4fvNV 727
+#define _gloffset_VertexAttribs4svNV 728
+#define _gloffset_VertexAttribs4ubvNV 729
+#define _gloffset_GetTexBumpParameterfvATI 730
+#define _gloffset_GetTexBumpParameterivATI 731
+#define _gloffset_TexBumpParameterfvATI 732
+#define _gloffset_TexBumpParameterivATI 733
+#define _gloffset_AlphaFragmentOp1ATI 734
+#define _gloffset_AlphaFragmentOp2ATI 735
+#define _gloffset_AlphaFragmentOp3ATI 736
+#define _gloffset_BeginFragmentShaderATI 737
+#define _gloffset_BindFragmentShaderATI 738
+#define _gloffset_ColorFragmentOp1ATI 739
+#define _gloffset_ColorFragmentOp2ATI 740
+#define _gloffset_ColorFragmentOp3ATI 741
+#define _gloffset_DeleteFragmentShaderATI 742
+#define _gloffset_EndFragmentShaderATI 743
+#define _gloffset_GenFragmentShadersATI 744
+#define _gloffset_PassTexCoordATI 745
+#define _gloffset_SampleMapATI 746
+#define _gloffset_SetFragmentShaderConstantATI 747
+#define _gloffset_PointParameteriNV 748
+#define _gloffset_PointParameterivNV 749
+#define _gloffset_ActiveStencilFaceEXT 750
+#define _gloffset_BindVertexArrayAPPLE 751
+#define _gloffset_DeleteVertexArraysAPPLE 752
+#define _gloffset_GenVertexArraysAPPLE 753
+#define _gloffset_IsVertexArrayAPPLE 754
+#define _gloffset_GetProgramNamedParameterdvNV 755
+#define _gloffset_GetProgramNamedParameterfvNV 756
+#define _gloffset_ProgramNamedParameter4dNV 757
+#define _gloffset_ProgramNamedParameter4dvNV 758
+#define _gloffset_ProgramNamedParameter4fNV 759
+#define _gloffset_ProgramNamedParameter4fvNV 760
+#define _gloffset_DepthBoundsEXT 761
+#define _gloffset_BlendEquationSeparateEXT 762
+#define _gloffset_BindFramebufferEXT 763
+#define _gloffset_BindRenderbufferEXT 764
+#define _gloffset_CheckFramebufferStatusEXT 765
+#define _gloffset_DeleteFramebuffersEXT 766
+#define _gloffset_DeleteRenderbuffersEXT 767
+#define _gloffset_FramebufferRenderbufferEXT 768
+#define _gloffset_FramebufferTexture1DEXT 769
+#define _gloffset_FramebufferTexture2DEXT 770
+#define _gloffset_FramebufferTexture3DEXT 771
+#define _gloffset_GenFramebuffersEXT 772
+#define _gloffset_GenRenderbuffersEXT 773
+#define _gloffset_GenerateMipmapEXT 774
+#define _gloffset_GetFramebufferAttachmentParameterivEXT 775
+#define _gloffset_GetRenderbufferParameterivEXT 776
+#define _gloffset_IsFramebufferEXT 777
+#define _gloffset_IsRenderbufferEXT 778
+#define _gloffset_RenderbufferStorageEXT 779
+#define _gloffset_BlitFramebufferEXT 780
+#define _gloffset_BufferParameteriAPPLE 781
+#define _gloffset_FlushMappedBufferRangeAPPLE 782
+#define _gloffset_FramebufferTextureLayerEXT 783
+#define _gloffset_ProvokingVertexEXT 784
+#define _gloffset_GetTexParameterPointervAPPLE 785
+#define _gloffset_TextureRangeAPPLE 786
+#define _gloffset_StencilFuncSeparateATI 787
+#define _gloffset_ProgramEnvParameters4fvEXT 788
+#define _gloffset_ProgramLocalParameters4fvEXT 789
+#define _gloffset_GetQueryObjecti64vEXT 790
+#define _gloffset_GetQueryObjectui64vEXT 791
+#define _gloffset_FIRST_DYNAMIC 792
 
 #else
 
@@ -980,6 +987,13 @@
 #define _gloffset_BindVertexArray driDispatchRemapTable[BindVertexArray_remap_index]
 #define _gloffset_GenVertexArrays driDispatchRemapTable[GenVertexArrays_remap_index]
 #define _gloffset_CopyBufferSubData driDispatchRemapTable[CopyBufferSubData_remap_index]
+#define _gloffset_ClientWaitSync driDispatchRemapTable[ClientWaitSync_remap_index]
+#define _gloffset_DeleteSync driDispatchRemapTable[DeleteSync_remap_index]
+#define _gloffset_FenceSync driDispatchRemapTable[FenceSync_remap_index]
+#define _gloffset_GetInteger64v driDispatchRemapTable[GetInteger64v_remap_index]
+#define _gloffset_GetSynciv driDispatchRemapTable[GetSynciv_remap_index]
+#define _gloffset_IsSync driDispatchRemapTable[IsSync_remap_index]
+#define _gloffset_WaitSync driDispatchRemapTable[WaitSync_remap_index]
 #define _gloffset_PolygonOffsetEXT driDispatchRemapTable[PolygonOffsetEXT_remap_index]
 #define _gloffset_GetPixelTexGenParameterfvSGIS driDispatchRemapTable[GetPixelTexGenParameterfvSGIS_remap_index]
 #define _gloffset_GetPixelTexGenParameterivSGIS driDispatchRemapTable[GetPixelTexGenParameterivSGIS_remap_index]
diff --git a/src/mesa/glapi/glapitable.h b/src/mesa/glapi/glapitable.h
index c23e9a63cf..2c661a0ae5 100644
--- a/src/mesa/glapi/glapitable.h
+++ b/src/mesa/glapi/glapitable.h
@@ -607,224 +607,231 @@ struct _glapi_table
    void (GLAPIENTRYP BindVertexArray)(GLuint array); /* 564 */
    void (GLAPIENTRYP GenVertexArrays)(GLsizei n, GLuint * arrays); /* 565 */
    void (GLAPIENTRYP CopyBufferSubData)(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); /* 566 */
-   void (GLAPIENTRYP PolygonOffsetEXT)(GLfloat factor, GLfloat bias); /* 567 */
-   void (GLAPIENTRYP GetPixelTexGenParameterfvSGIS)(GLenum pname, GLfloat * params); /* 568 */
-   void (GLAPIENTRYP GetPixelTexGenParameterivSGIS)(GLenum pname, GLint * params); /* 569 */
-   void (GLAPIENTRYP PixelTexGenParameterfSGIS)(GLenum pname, GLfloat param); /* 570 */
-   void (GLAPIENTRYP PixelTexGenParameterfvSGIS)(GLenum pname, const GLfloat * params); /* 571 */
-   void (GLAPIENTRYP PixelTexGenParameteriSGIS)(GLenum pname, GLint param); /* 572 */
-   void (GLAPIENTRYP PixelTexGenParameterivSGIS)(GLenum pname, const GLint * params); /* 573 */
-   void (GLAPIENTRYP SampleMaskSGIS)(GLclampf value, GLboolean invert); /* 574 */
-   void (GLAPIENTRYP SamplePatternSGIS)(GLenum pattern); /* 575 */
-   void (GLAPIENTRYP ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 576 */
-   void (GLAPIENTRYP EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean * pointer); /* 577 */
-   void (GLAPIENTRYP IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 578 */
-   void (GLAPIENTRYP NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 579 */
-   void (GLAPIENTRYP TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 580 */
-   void (GLAPIENTRYP VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 581 */
-   void (GLAPIENTRYP PointParameterfEXT)(GLenum pname, GLfloat param); /* 582 */
-   void (GLAPIENTRYP PointParameterfvEXT)(GLenum pname, const GLfloat * params); /* 583 */
-   void (GLAPIENTRYP LockArraysEXT)(GLint first, GLsizei count); /* 584 */
-   void (GLAPIENTRYP UnlockArraysEXT)(void); /* 585 */
-   void (GLAPIENTRYP CullParameterdvEXT)(GLenum pname, GLdouble * params); /* 586 */
-   void (GLAPIENTRYP CullParameterfvEXT)(GLenum pname, GLfloat * params); /* 587 */
-   void (GLAPIENTRYP SecondaryColor3bEXT)(GLbyte red, GLbyte green, GLbyte blue); /* 588 */
-   void (GLAPIENTRYP SecondaryColor3bvEXT)(const GLbyte * v); /* 589 */
-   void (GLAPIENTRYP SecondaryColor3dEXT)(GLdouble red, GLdouble green, GLdouble blue); /* 590 */
-   void (GLAPIENTRYP SecondaryColor3dvEXT)(const GLdouble * v); /* 591 */
-   void (GLAPIENTRYP SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue); /* 592 */
-   void (GLAPIENTRYP SecondaryColor3fvEXT)(const GLfloat * v); /* 593 */
-   void (GLAPIENTRYP SecondaryColor3iEXT)(GLint red, GLint green, GLint blue); /* 594 */
-   void (GLAPIENTRYP SecondaryColor3ivEXT)(const GLint * v); /* 595 */
-   void (GLAPIENTRYP SecondaryColor3sEXT)(GLshort red, GLshort green, GLshort blue); /* 596 */
-   void (GLAPIENTRYP SecondaryColor3svEXT)(const GLshort * v); /* 597 */
-   void (GLAPIENTRYP SecondaryColor3ubEXT)(GLubyte red, GLubyte green, GLubyte blue); /* 598 */
-   void (GLAPIENTRYP SecondaryColor3ubvEXT)(const GLubyte * v); /* 599 */
-   void (GLAPIENTRYP SecondaryColor3uiEXT)(GLuint red, GLuint green, GLuint blue); /* 600 */
-   void (GLAPIENTRYP SecondaryColor3uivEXT)(const GLuint * v); /* 601 */
-   void (GLAPIENTRYP SecondaryColor3usEXT)(GLushort red, GLushort green, GLushort blue); /* 602 */
-   void (GLAPIENTRYP SecondaryColor3usvEXT)(const GLushort * v); /* 603 */
-   void (GLAPIENTRYP SecondaryColorPointerEXT)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 604 */
-   void (GLAPIENTRYP MultiDrawArraysEXT)(GLenum mode, GLint * first, GLsizei * count, GLsizei primcount); /* 605 */
-   void (GLAPIENTRYP MultiDrawElementsEXT)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount); /* 606 */
-   void (GLAPIENTRYP FogCoordPointerEXT)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 607 */
-   void (GLAPIENTRYP FogCoorddEXT)(GLdouble coord); /* 608 */
-   void (GLAPIENTRYP FogCoorddvEXT)(const GLdouble * coord); /* 609 */
-   void (GLAPIENTRYP FogCoordfEXT)(GLfloat coord); /* 610 */
-   void (GLAPIENTRYP FogCoordfvEXT)(const GLfloat * coord); /* 611 */
-   void (GLAPIENTRYP PixelTexGenSGIX)(GLenum mode); /* 612 */
-   void (GLAPIENTRYP BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); /* 613 */
-   void (GLAPIENTRYP FlushVertexArrayRangeNV)(void); /* 614 */
-   void (GLAPIENTRYP VertexArrayRangeNV)(GLsizei length, const GLvoid * pointer); /* 615 */
-   void (GLAPIENTRYP CombinerInputNV)(GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 616 */
-   void (GLAPIENTRYP CombinerOutputNV)(GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum); /* 617 */
-   void (GLAPIENTRYP CombinerParameterfNV)(GLenum pname, GLfloat param); /* 618 */
-   void (GLAPIENTRYP CombinerParameterfvNV)(GLenum pname, const GLfloat * params); /* 619 */
-   void (GLAPIENTRYP CombinerParameteriNV)(GLenum pname, GLint param); /* 620 */
-   void (GLAPIENTRYP CombinerParameterivNV)(GLenum pname, const GLint * params); /* 621 */
-   void (GLAPIENTRYP FinalCombinerInputNV)(GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 622 */
-   void (GLAPIENTRYP GetCombinerInputParameterfvNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat * params); /* 623 */
-   void (GLAPIENTRYP GetCombinerInputParameterivNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint * params); /* 624 */
-   void (GLAPIENTRYP GetCombinerOutputParameterfvNV)(GLenum stage, GLenum portion, GLenum pname, GLfloat * params); /* 625 */
-   void (GLAPIENTRYP GetCombinerOutputParameterivNV)(GLenum stage, GLenum portion, GLenum pname, GLint * params); /* 626 */
-   void (GLAPIENTRYP GetFinalCombinerInputParameterfvNV)(GLenum variable, GLenum pname, GLfloat * params); /* 627 */
-   void (GLAPIENTRYP GetFinalCombinerInputParameterivNV)(GLenum variable, GLenum pname, GLint * params); /* 628 */
-   void (GLAPIENTRYP ResizeBuffersMESA)(void); /* 629 */
-   void (GLAPIENTRYP WindowPos2dMESA)(GLdouble x, GLdouble y); /* 630 */
-   void (GLAPIENTRYP WindowPos2dvMESA)(const GLdouble * v); /* 631 */
-   void (GLAPIENTRYP WindowPos2fMESA)(GLfloat x, GLfloat y); /* 632 */
-   void (GLAPIENTRYP WindowPos2fvMESA)(const GLfloat * v); /* 633 */
-   void (GLAPIENTRYP WindowPos2iMESA)(GLint x, GLint y); /* 634 */
-   void (GLAPIENTRYP WindowPos2ivMESA)(const GLint * v); /* 635 */
-   void (GLAPIENTRYP WindowPos2sMESA)(GLshort x, GLshort y); /* 636 */
-   void (GLAPIENTRYP WindowPos2svMESA)(const GLshort * v); /* 637 */
-   void (GLAPIENTRYP WindowPos3dMESA)(GLdouble x, GLdouble y, GLdouble z); /* 638 */
-   void (GLAPIENTRYP WindowPos3dvMESA)(const GLdouble * v); /* 639 */
-   void (GLAPIENTRYP WindowPos3fMESA)(GLfloat x, GLfloat y, GLfloat z); /* 640 */
-   void (GLAPIENTRYP WindowPos3fvMESA)(const GLfloat * v); /* 641 */
-   void (GLAPIENTRYP WindowPos3iMESA)(GLint x, GLint y, GLint z); /* 642 */
-   void (GLAPIENTRYP WindowPos3ivMESA)(const GLint * v); /* 643 */
-   void (GLAPIENTRYP WindowPos3sMESA)(GLshort x, GLshort y, GLshort z); /* 644 */
-   void (GLAPIENTRYP WindowPos3svMESA)(const GLshort * v); /* 645 */
-   void (GLAPIENTRYP WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 646 */
-   void (GLAPIENTRYP WindowPos4dvMESA)(const GLdouble * v); /* 647 */
-   void (GLAPIENTRYP WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 648 */
-   void (GLAPIENTRYP WindowPos4fvMESA)(const GLfloat * v); /* 649 */
-   void (GLAPIENTRYP WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w); /* 650 */
-   void (GLAPIENTRYP WindowPos4ivMESA)(const GLint * v); /* 651 */
-   void (GLAPIENTRYP WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w); /* 652 */
-   void (GLAPIENTRYP WindowPos4svMESA)(const GLshort * v); /* 653 */
-   void (GLAPIENTRYP MultiModeDrawArraysIBM)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride); /* 654 */
-   void (GLAPIENTRYP MultiModeDrawElementsIBM)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride); /* 655 */
-   void (GLAPIENTRYP DeleteFencesNV)(GLsizei n, const GLuint * fences); /* 656 */
-   void (GLAPIENTRYP FinishFenceNV)(GLuint fence); /* 657 */
-   void (GLAPIENTRYP GenFencesNV)(GLsizei n, GLuint * fences); /* 658 */
-   void (GLAPIENTRYP GetFenceivNV)(GLuint fence, GLenum pname, GLint * params); /* 659 */
-   GLboolean (GLAPIENTRYP IsFenceNV)(GLuint fence); /* 660 */
-   void (GLAPIENTRYP SetFenceNV)(GLuint fence, GLenum condition); /* 661 */
-   GLboolean (GLAPIENTRYP TestFenceNV)(GLuint fence); /* 662 */
-   GLboolean (GLAPIENTRYP AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences); /* 663 */
-   void (GLAPIENTRYP BindProgramNV)(GLenum target, GLuint program); /* 664 */
-   void (GLAPIENTRYP DeleteProgramsNV)(GLsizei n, const GLuint * programs); /* 665 */
-   void (GLAPIENTRYP ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat * params); /* 666 */
-   void (GLAPIENTRYP GenProgramsNV)(GLsizei n, GLuint * programs); /* 667 */
-   void (GLAPIENTRYP GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params); /* 668 */
-   void (GLAPIENTRYP GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat * params); /* 669 */
-   void (GLAPIENTRYP GetProgramStringNV)(GLuint id, GLenum pname, GLubyte * program); /* 670 */
-   void (GLAPIENTRYP GetProgramivNV)(GLuint id, GLenum pname, GLint * params); /* 671 */
-   void (GLAPIENTRYP GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint * params); /* 672 */
-   void (GLAPIENTRYP GetVertexAttribPointervNV)(GLuint index, GLenum pname, GLvoid ** pointer); /* 673 */
-   void (GLAPIENTRYP GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params); /* 674 */
-   void (GLAPIENTRYP GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat * params); /* 675 */
-   void (GLAPIENTRYP GetVertexAttribivNV)(GLuint index, GLenum pname, GLint * params); /* 676 */
-   GLboolean (GLAPIENTRYP IsProgramNV)(GLuint program); /* 677 */
-   void (GLAPIENTRYP LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte * program); /* 678 */
-   void (GLAPIENTRYP ProgramParameters4dvNV)(GLenum target, GLuint index, GLuint num, const GLdouble * params); /* 679 */
-   void (GLAPIENTRYP ProgramParameters4fvNV)(GLenum target, GLuint index, GLuint num, const GLfloat * params); /* 680 */
-   void (GLAPIENTRYP RequestResidentProgramsNV)(GLsizei n, const GLuint * ids); /* 681 */
-   void (GLAPIENTRYP TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform); /* 682 */
-   void (GLAPIENTRYP VertexAttrib1dNV)(GLuint index, GLdouble x); /* 683 */
-   void (GLAPIENTRYP VertexAttrib1dvNV)(GLuint index, const GLdouble * v); /* 684 */
-   void (GLAPIENTRYP VertexAttrib1fNV)(GLuint index, GLfloat x); /* 685 */
-   void (GLAPIENTRYP VertexAttrib1fvNV)(GLuint index, const GLfloat * v); /* 686 */
-   void (GLAPIENTRYP VertexAttrib1sNV)(GLuint index, GLshort x); /* 687 */
-   void (GLAPIENTRYP VertexAttrib1svNV)(GLuint index, const GLshort * v); /* 688 */
-   void (GLAPIENTRYP VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y); /* 689 */
-   void (GLAPIENTRYP VertexAttrib2dvNV)(GLuint index, const GLdouble * v); /* 690 */
-   void (GLAPIENTRYP VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y); /* 691 */
-   void (GLAPIENTRYP VertexAttrib2fvNV)(GLuint index, const GLfloat * v); /* 692 */
-   void (GLAPIENTRYP VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y); /* 693 */
-   void (GLAPIENTRYP VertexAttrib2svNV)(GLuint index, const GLshort * v); /* 694 */
-   void (GLAPIENTRYP VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 695 */
-   void (GLAPIENTRYP VertexAttrib3dvNV)(GLuint index, const GLdouble * v); /* 696 */
-   void (GLAPIENTRYP VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 697 */
-   void (GLAPIENTRYP VertexAttrib3fvNV)(GLuint index, const GLfloat * v); /* 698 */
-   void (GLAPIENTRYP VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z); /* 699 */
-   void (GLAPIENTRYP VertexAttrib3svNV)(GLuint index, const GLshort * v); /* 700 */
-   void (GLAPIENTRYP VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 701 */
-   void (GLAPIENTRYP VertexAttrib4dvNV)(GLuint index, const GLdouble * v); /* 702 */
-   void (GLAPIENTRYP VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 703 */
-   void (GLAPIENTRYP VertexAttrib4fvNV)(GLuint index, const GLfloat * v); /* 704 */
-   void (GLAPIENTRYP VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 705 */
-   void (GLAPIENTRYP VertexAttrib4svNV)(GLuint index, const GLshort * v); /* 706 */
-   void (GLAPIENTRYP VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 707 */
-   void (GLAPIENTRYP VertexAttrib4ubvNV)(GLuint index, const GLubyte * v); /* 708 */
-   void (GLAPIENTRYP VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 709 */
-   void (GLAPIENTRYP VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 710 */
-   void (GLAPIENTRYP VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 711 */
-   void (GLAPIENTRYP VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v); /* 712 */
-   void (GLAPIENTRYP VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 713 */
-   void (GLAPIENTRYP VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 714 */
-   void (GLAPIENTRYP VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v); /* 715 */
-   void (GLAPIENTRYP VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 716 */
-   void (GLAPIENTRYP VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 717 */
-   void (GLAPIENTRYP VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v); /* 718 */
-   void (GLAPIENTRYP VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 719 */
-   void (GLAPIENTRYP VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 720 */
-   void (GLAPIENTRYP VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v); /* 721 */
-   void (GLAPIENTRYP VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v); /* 722 */
-   void (GLAPIENTRYP GetTexBumpParameterfvATI)(GLenum pname, GLfloat * param); /* 723 */
-   void (GLAPIENTRYP GetTexBumpParameterivATI)(GLenum pname, GLint * param); /* 724 */
-   void (GLAPIENTRYP TexBumpParameterfvATI)(GLenum pname, const GLfloat * param); /* 725 */
-   void (GLAPIENTRYP TexBumpParameterivATI)(GLenum pname, const GLint * param); /* 726 */
-   void (GLAPIENTRYP AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 727 */
-   void (GLAPIENTRYP AlphaFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 728 */
-   void (GLAPIENTRYP AlphaFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 729 */
-   void (GLAPIENTRYP BeginFragmentShaderATI)(void); /* 730 */
-   void (GLAPIENTRYP BindFragmentShaderATI)(GLuint id); /* 731 */
-   void (GLAPIENTRYP ColorFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 732 */
-   void (GLAPIENTRYP ColorFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 733 */
-   void (GLAPIENTRYP ColorFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 734 */
-   void (GLAPIENTRYP DeleteFragmentShaderATI)(GLuint id); /* 735 */
-   void (GLAPIENTRYP EndFragmentShaderATI)(void); /* 736 */
-   GLuint (GLAPIENTRYP GenFragmentShadersATI)(GLuint range); /* 737 */
-   void (GLAPIENTRYP PassTexCoordATI)(GLuint dst, GLuint coord, GLenum swizzle); /* 738 */
-   void (GLAPIENTRYP SampleMapATI)(GLuint dst, GLuint interp, GLenum swizzle); /* 739 */
-   void (GLAPIENTRYP SetFragmentShaderConstantATI)(GLuint dst, const GLfloat * value); /* 740 */
-   void (GLAPIENTRYP PointParameteriNV)(GLenum pname, GLint param); /* 741 */
-   void (GLAPIENTRYP PointParameterivNV)(GLenum pname, const GLint * params); /* 742 */
-   void (GLAPIENTRYP ActiveStencilFaceEXT)(GLenum face); /* 743 */
-   void (GLAPIENTRYP BindVertexArrayAPPLE)(GLuint array); /* 744 */
-   void (GLAPIENTRYP DeleteVertexArraysAPPLE)(GLsizei n, const GLuint * arrays); /* 745 */
-   void (GLAPIENTRYP GenVertexArraysAPPLE)(GLsizei n, GLuint * arrays); /* 746 */
-   GLboolean (GLAPIENTRYP IsVertexArrayAPPLE)(GLuint array); /* 747 */
-   void (GLAPIENTRYP GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params); /* 748 */
-   void (GLAPIENTRYP GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params); /* 749 */
-   void (GLAPIENTRYP ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 750 */
-   void (GLAPIENTRYP ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 751 */
-   void (GLAPIENTRYP ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 752 */
-   void (GLAPIENTRYP ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 753 */
-   void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 754 */
-   void (GLAPIENTRYP BlendEquationSeparateEXT)(GLenum modeRGB, GLenum modeA); /* 755 */
-   void (GLAPIENTRYP BindFramebufferEXT)(GLenum target, GLuint framebuffer); /* 756 */
-   void (GLAPIENTRYP BindRenderbufferEXT)(GLenum target, GLuint renderbuffer); /* 757 */
-   GLenum (GLAPIENTRYP CheckFramebufferStatusEXT)(GLenum target); /* 758 */
-   void (GLAPIENTRYP DeleteFramebuffersEXT)(GLsizei n, const GLuint * framebuffers); /* 759 */
-   void (GLAPIENTRYP DeleteRenderbuffersEXT)(GLsizei n, const GLuint * renderbuffers); /* 760 */
-   void (GLAPIENTRYP FramebufferRenderbufferEXT)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); /* 761 */
-   void (GLAPIENTRYP FramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 762 */
-   void (GLAPIENTRYP FramebufferTexture2DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 763 */
-   void (GLAPIENTRYP FramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); /* 764 */
-   void (GLAPIENTRYP GenFramebuffersEXT)(GLsizei n, GLuint * framebuffers); /* 765 */
-   void (GLAPIENTRYP GenRenderbuffersEXT)(GLsizei n, GLuint * renderbuffers); /* 766 */
-   void (GLAPIENTRYP GenerateMipmapEXT)(GLenum target); /* 767 */
-   void (GLAPIENTRYP GetFramebufferAttachmentParameterivEXT)(GLenum target, GLenum attachment, GLenum pname, GLint * params); /* 768 */
-   void (GLAPIENTRYP GetRenderbufferParameterivEXT)(GLenum target, GLenum pname, GLint * params); /* 769 */
-   GLboolean (GLAPIENTRYP IsFramebufferEXT)(GLuint framebuffer); /* 770 */
-   GLboolean (GLAPIENTRYP IsRenderbufferEXT)(GLuint renderbuffer); /* 771 */
-   void (GLAPIENTRYP RenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); /* 772 */
-   void (GLAPIENTRYP BlitFramebufferEXT)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); /* 773 */
-   void (GLAPIENTRYP BufferParameteriAPPLE)(GLenum target, GLenum pname, GLint param); /* 774 */
-   void (GLAPIENTRYP FlushMappedBufferRangeAPPLE)(GLenum target, GLintptr offset, GLsizeiptr size); /* 775 */
-   void (GLAPIENTRYP FramebufferTextureLayerEXT)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); /* 776 */
-   void (GLAPIENTRYP ProvokingVertexEXT)(GLenum mode); /* 777 */
-   void (GLAPIENTRYP GetTexParameterPointervAPPLE)(GLenum target, GLenum pname, GLvoid ** params); /* 778 */
-   void (GLAPIENTRYP TextureRangeAPPLE)(GLenum target, GLsizei length, GLvoid * pointer); /* 779 */
-   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 780 */
-   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 781 */
-   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 782 */
-   void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 783 */
-   void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 784 */
+   void (GLAPIENTRYP ClientWaitSync)(GLsync sync, GLbitfield flags, GLuint64 timeout); /* 567 */
+   void (GLAPIENTRYP DeleteSync)(GLsync sync); /* 568 */
+   GLuint (GLAPIENTRYP FenceSync)(GLenum condition, GLbitfield flags); /* 569 */
+   void (GLAPIENTRYP GetInteger64v)(GLenum pname, GLint64 * params); /* 570 */
+   void (GLAPIENTRYP GetSynciv)(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * values); /* 571 */
+   GLboolean (GLAPIENTRYP IsSync)(GLsync sync); /* 572 */
+   void (GLAPIENTRYP WaitSync)(GLsync sync, GLbitfield flags, GLuint64 timeout); /* 573 */
+   void (GLAPIENTRYP PolygonOffsetEXT)(GLfloat factor, GLfloat bias); /* 574 */
+   void (GLAPIENTRYP GetPixelTexGenParameterfvSGIS)(GLenum pname, GLfloat * params); /* 575 */
+   void (GLAPIENTRYP GetPixelTexGenParameterivSGIS)(GLenum pname, GLint * params); /* 576 */
+   void (GLAPIENTRYP PixelTexGenParameterfSGIS)(GLenum pname, GLfloat param); /* 577 */
+   void (GLAPIENTRYP PixelTexGenParameterfvSGIS)(GLenum pname, const GLfloat * params); /* 578 */
+   void (GLAPIENTRYP PixelTexGenParameteriSGIS)(GLenum pname, GLint param); /* 579 */
+   void (GLAPIENTRYP PixelTexGenParameterivSGIS)(GLenum pname, const GLint * params); /* 580 */
+   void (GLAPIENTRYP SampleMaskSGIS)(GLclampf value, GLboolean invert); /* 581 */
+   void (GLAPIENTRYP SamplePatternSGIS)(GLenum pattern); /* 582 */
+   void (GLAPIENTRYP ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 583 */
+   void (GLAPIENTRYP EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean * pointer); /* 584 */
+   void (GLAPIENTRYP IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 585 */
+   void (GLAPIENTRYP NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 586 */
+   void (GLAPIENTRYP TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 587 */
+   void (GLAPIENTRYP VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 588 */
+   void (GLAPIENTRYP PointParameterfEXT)(GLenum pname, GLfloat param); /* 589 */
+   void (GLAPIENTRYP PointParameterfvEXT)(GLenum pname, const GLfloat * params); /* 590 */
+   void (GLAPIENTRYP LockArraysEXT)(GLint first, GLsizei count); /* 591 */
+   void (GLAPIENTRYP UnlockArraysEXT)(void); /* 592 */
+   void (GLAPIENTRYP CullParameterdvEXT)(GLenum pname, GLdouble * params); /* 593 */
+   void (GLAPIENTRYP CullParameterfvEXT)(GLenum pname, GLfloat * params); /* 594 */
+   void (GLAPIENTRYP SecondaryColor3bEXT)(GLbyte red, GLbyte green, GLbyte blue); /* 595 */
+   void (GLAPIENTRYP SecondaryColor3bvEXT)(const GLbyte * v); /* 596 */
+   void (GLAPIENTRYP SecondaryColor3dEXT)(GLdouble red, GLdouble green, GLdouble blue); /* 597 */
+   void (GLAPIENTRYP SecondaryColor3dvEXT)(const GLdouble * v); /* 598 */
+   void (GLAPIENTRYP SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue); /* 599 */
+   void (GLAPIENTRYP SecondaryColor3fvEXT)(const GLfloat * v); /* 600 */
+   void (GLAPIENTRYP SecondaryColor3iEXT)(GLint red, GLint green, GLint blue); /* 601 */
+   void (GLAPIENTRYP SecondaryColor3ivEXT)(const GLint * v); /* 602 */
+   void (GLAPIENTRYP SecondaryColor3sEXT)(GLshort red, GLshort green, GLshort blue); /* 603 */
+   void (GLAPIENTRYP SecondaryColor3svEXT)(const GLshort * v); /* 604 */
+   void (GLAPIENTRYP SecondaryColor3ubEXT)(GLubyte red, GLubyte green, GLubyte blue); /* 605 */
+   void (GLAPIENTRYP SecondaryColor3ubvEXT)(const GLubyte * v); /* 606 */
+   void (GLAPIENTRYP SecondaryColor3uiEXT)(GLuint red, GLuint green, GLuint blue); /* 607 */
+   void (GLAPIENTRYP SecondaryColor3uivEXT)(const GLuint * v); /* 608 */
+   void (GLAPIENTRYP SecondaryColor3usEXT)(GLushort red, GLushort green, GLushort blue); /* 609 */
+   void (GLAPIENTRYP SecondaryColor3usvEXT)(const GLushort * v); /* 610 */
+   void (GLAPIENTRYP SecondaryColorPointerEXT)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 611 */
+   void (GLAPIENTRYP MultiDrawArraysEXT)(GLenum mode, GLint * first, GLsizei * count, GLsizei primcount); /* 612 */
+   void (GLAPIENTRYP MultiDrawElementsEXT)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount); /* 613 */
+   void (GLAPIENTRYP FogCoordPointerEXT)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 614 */
+   void (GLAPIENTRYP FogCoorddEXT)(GLdouble coord); /* 615 */
+   void (GLAPIENTRYP FogCoorddvEXT)(const GLdouble * coord); /* 616 */
+   void (GLAPIENTRYP FogCoordfEXT)(GLfloat coord); /* 617 */
+   void (GLAPIENTRYP FogCoordfvEXT)(const GLfloat * coord); /* 618 */
+   void (GLAPIENTRYP PixelTexGenSGIX)(GLenum mode); /* 619 */
+   void (GLAPIENTRYP BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); /* 620 */
+   void (GLAPIENTRYP FlushVertexArrayRangeNV)(void); /* 621 */
+   void (GLAPIENTRYP VertexArrayRangeNV)(GLsizei length, const GLvoid * pointer); /* 622 */
+   void (GLAPIENTRYP CombinerInputNV)(GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 623 */
+   void (GLAPIENTRYP CombinerOutputNV)(GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum); /* 624 */
+   void (GLAPIENTRYP CombinerParameterfNV)(GLenum pname, GLfloat param); /* 625 */
+   void (GLAPIENTRYP CombinerParameterfvNV)(GLenum pname, const GLfloat * params); /* 626 */
+   void (GLAPIENTRYP CombinerParameteriNV)(GLenum pname, GLint param); /* 627 */
+   void (GLAPIENTRYP CombinerParameterivNV)(GLenum pname, const GLint * params); /* 628 */
+   void (GLAPIENTRYP FinalCombinerInputNV)(GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 629 */
+   void (GLAPIENTRYP GetCombinerInputParameterfvNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat * params); /* 630 */
+   void (GLAPIENTRYP GetCombinerInputParameterivNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint * params); /* 631 */
+   void (GLAPIENTRYP GetCombinerOutputParameterfvNV)(GLenum stage, GLenum portion, GLenum pname, GLfloat * params); /* 632 */
+   void (GLAPIENTRYP GetCombinerOutputParameterivNV)(GLenum stage, GLenum portion, GLenum pname, GLint * params); /* 633 */
+   void (GLAPIENTRYP GetFinalCombinerInputParameterfvNV)(GLenum variable, GLenum pname, GLfloat * params); /* 634 */
+   void (GLAPIENTRYP GetFinalCombinerInputParameterivNV)(GLenum variable, GLenum pname, GLint * params); /* 635 */
+   void (GLAPIENTRYP ResizeBuffersMESA)(void); /* 636 */
+   void (GLAPIENTRYP WindowPos2dMESA)(GLdouble x, GLdouble y); /* 637 */
+   void (GLAPIENTRYP WindowPos2dvMESA)(const GLdouble * v); /* 638 */
+   void (GLAPIENTRYP WindowPos2fMESA)(GLfloat x, GLfloat y); /* 639 */
+   void (GLAPIENTRYP WindowPos2fvMESA)(const GLfloat * v); /* 640 */
+   void (GLAPIENTRYP WindowPos2iMESA)(GLint x, GLint y); /* 641 */
+   void (GLAPIENTRYP WindowPos2ivMESA)(const GLint * v); /* 642 */
+   void (GLAPIENTRYP WindowPos2sMESA)(GLshort x, GLshort y); /* 643 */
+   void (GLAPIENTRYP WindowPos2svMESA)(const GLshort * v); /* 644 */
+   void (GLAPIENTRYP WindowPos3dMESA)(GLdouble x, GLdouble y, GLdouble z); /* 645 */
+   void (GLAPIENTRYP WindowPos3dvMESA)(const GLdouble * v); /* 646 */
+   void (GLAPIENTRYP WindowPos3fMESA)(GLfloat x, GLfloat y, GLfloat z); /* 647 */
+   void (GLAPIENTRYP WindowPos3fvMESA)(const GLfloat * v); /* 648 */
+   void (GLAPIENTRYP WindowPos3iMESA)(GLint x, GLint y, GLint z); /* 649 */
+   void (GLAPIENTRYP WindowPos3ivMESA)(const GLint * v); /* 650 */
+   void (GLAPIENTRYP WindowPos3sMESA)(GLshort x, GLshort y, GLshort z); /* 651 */
+   void (GLAPIENTRYP WindowPos3svMESA)(const GLshort * v); /* 652 */
+   void (GLAPIENTRYP WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 653 */
+   void (GLAPIENTRYP WindowPos4dvMESA)(const GLdouble * v); /* 654 */
+   void (GLAPIENTRYP WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 655 */
+   void (GLAPIENTRYP WindowPos4fvMESA)(const GLfloat * v); /* 656 */
+   void (GLAPIENTRYP WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w); /* 657 */
+   void (GLAPIENTRYP WindowPos4ivMESA)(const GLint * v); /* 658 */
+   void (GLAPIENTRYP WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w); /* 659 */
+   void (GLAPIENTRYP WindowPos4svMESA)(const GLshort * v); /* 660 */
+   void (GLAPIENTRYP MultiModeDrawArraysIBM)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride); /* 661 */
+   void (GLAPIENTRYP MultiModeDrawElementsIBM)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride); /* 662 */
+   void (GLAPIENTRYP DeleteFencesNV)(GLsizei n, const GLuint * fences); /* 663 */
+   void (GLAPIENTRYP FinishFenceNV)(GLuint fence); /* 664 */
+   void (GLAPIENTRYP GenFencesNV)(GLsizei n, GLuint * fences); /* 665 */
+   void (GLAPIENTRYP GetFenceivNV)(GLuint fence, GLenum pname, GLint * params); /* 666 */
+   GLboolean (GLAPIENTRYP IsFenceNV)(GLuint fence); /* 667 */
+   void (GLAPIENTRYP SetFenceNV)(GLuint fence, GLenum condition); /* 668 */
+   GLboolean (GLAPIENTRYP TestFenceNV)(GLuint fence); /* 669 */
+   GLboolean (GLAPIENTRYP AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences); /* 670 */
+   void (GLAPIENTRYP BindProgramNV)(GLenum target, GLuint program); /* 671 */
+   void (GLAPIENTRYP DeleteProgramsNV)(GLsizei n, const GLuint * programs); /* 672 */
+   void (GLAPIENTRYP ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat * params); /* 673 */
+   void (GLAPIENTRYP GenProgramsNV)(GLsizei n, GLuint * programs); /* 674 */
+   void (GLAPIENTRYP GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params); /* 675 */
+   void (GLAPIENTRYP GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat * params); /* 676 */
+   void (GLAPIENTRYP GetProgramStringNV)(GLuint id, GLenum pname, GLubyte * program); /* 677 */
+   void (GLAPIENTRYP GetProgramivNV)(GLuint id, GLenum pname, GLint * params); /* 678 */
+   void (GLAPIENTRYP GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint * params); /* 679 */
+   void (GLAPIENTRYP GetVertexAttribPointervNV)(GLuint index, GLenum pname, GLvoid ** pointer); /* 680 */
+   void (GLAPIENTRYP GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params); /* 681 */
+   void (GLAPIENTRYP GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat * params); /* 682 */
+   void (GLAPIENTRYP GetVertexAttribivNV)(GLuint index, GLenum pname, GLint * params); /* 683 */
+   GLboolean (GLAPIENTRYP IsProgramNV)(GLuint program); /* 684 */
+   void (GLAPIENTRYP LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte * program); /* 685 */
+   void (GLAPIENTRYP ProgramParameters4dvNV)(GLenum target, GLuint index, GLuint num, const GLdouble * params); /* 686 */
+   void (GLAPIENTRYP ProgramParameters4fvNV)(GLenum target, GLuint index, GLuint num, const GLfloat * params); /* 687 */
+   void (GLAPIENTRYP RequestResidentProgramsNV)(GLsizei n, const GLuint * ids); /* 688 */
+   void (GLAPIENTRYP TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform); /* 689 */
+   void (GLAPIENTRYP VertexAttrib1dNV)(GLuint index, GLdouble x); /* 690 */
+   void (GLAPIENTRYP VertexAttrib1dvNV)(GLuint index, const GLdouble * v); /* 691 */
+   void (GLAPIENTRYP VertexAttrib1fNV)(GLuint index, GLfloat x); /* 692 */
+   void (GLAPIENTRYP VertexAttrib1fvNV)(GLuint index, const GLfloat * v); /* 693 */
+   void (GLAPIENTRYP VertexAttrib1sNV)(GLuint index, GLshort x); /* 694 */
+   void (GLAPIENTRYP VertexAttrib1svNV)(GLuint index, const GLshort * v); /* 695 */
+   void (GLAPIENTRYP VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y); /* 696 */
+   void (GLAPIENTRYP VertexAttrib2dvNV)(GLuint index, const GLdouble * v); /* 697 */
+   void (GLAPIENTRYP VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y); /* 698 */
+   void (GLAPIENTRYP VertexAttrib2fvNV)(GLuint index, const GLfloat * v); /* 699 */
+   void (GLAPIENTRYP VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y); /* 700 */
+   void (GLAPIENTRYP VertexAttrib2svNV)(GLuint index, const GLshort * v); /* 701 */
+   void (GLAPIENTRYP VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 702 */
+   void (GLAPIENTRYP VertexAttrib3dvNV)(GLuint index, const GLdouble * v); /* 703 */
+   void (GLAPIENTRYP VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 704 */
+   void (GLAPIENTRYP VertexAttrib3fvNV)(GLuint index, const GLfloat * v); /* 705 */
+   void (GLAPIENTRYP VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z); /* 706 */
+   void (GLAPIENTRYP VertexAttrib3svNV)(GLuint index, const GLshort * v); /* 707 */
+   void (GLAPIENTRYP VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 708 */
+   void (GLAPIENTRYP VertexAttrib4dvNV)(GLuint index, const GLdouble * v); /* 709 */
+   void (GLAPIENTRYP VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 710 */
+   void (GLAPIENTRYP VertexAttrib4fvNV)(GLuint index, const GLfloat * v); /* 711 */
+   void (GLAPIENTRYP VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 712 */
+   void (GLAPIENTRYP VertexAttrib4svNV)(GLuint index, const GLshort * v); /* 713 */
+   void (GLAPIENTRYP VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 714 */
+   void (GLAPIENTRYP VertexAttrib4ubvNV)(GLuint index, const GLubyte * v); /* 715 */
+   void (GLAPIENTRYP VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 716 */
+   void (GLAPIENTRYP VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 717 */
+   void (GLAPIENTRYP VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 718 */
+   void (GLAPIENTRYP VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v); /* 719 */
+   void (GLAPIENTRYP VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 720 */
+   void (GLAPIENTRYP VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 721 */
+   void (GLAPIENTRYP VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v); /* 722 */
+   void (GLAPIENTRYP VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 723 */
+   void (GLAPIENTRYP VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 724 */
+   void (GLAPIENTRYP VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v); /* 725 */
+   void (GLAPIENTRYP VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 726 */
+   void (GLAPIENTRYP VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 727 */
+   void (GLAPIENTRYP VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v); /* 728 */
+   void (GLAPIENTRYP VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v); /* 729 */
+   void (GLAPIENTRYP GetTexBumpParameterfvATI)(GLenum pname, GLfloat * param); /* 730 */
+   void (GLAPIENTRYP GetTexBumpParameterivATI)(GLenum pname, GLint * param); /* 731 */
+   void (GLAPIENTRYP TexBumpParameterfvATI)(GLenum pname, const GLfloat * param); /* 732 */
+   void (GLAPIENTRYP TexBumpParameterivATI)(GLenum pname, const GLint * param); /* 733 */
+   void (GLAPIENTRYP AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 734 */
+   void (GLAPIENTRYP AlphaFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 735 */
+   void (GLAPIENTRYP AlphaFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 736 */
+   void (GLAPIENTRYP BeginFragmentShaderATI)(void); /* 737 */
+   void (GLAPIENTRYP BindFragmentShaderATI)(GLuint id); /* 738 */
+   void (GLAPIENTRYP ColorFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 739 */
+   void (GLAPIENTRYP ColorFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 740 */
+   void (GLAPIENTRYP ColorFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 741 */
+   void (GLAPIENTRYP DeleteFragmentShaderATI)(GLuint id); /* 742 */
+   void (GLAPIENTRYP EndFragmentShaderATI)(void); /* 743 */
+   GLuint (GLAPIENTRYP GenFragmentShadersATI)(GLuint range); /* 744 */
+   void (GLAPIENTRYP PassTexCoordATI)(GLuint dst, GLuint coord, GLenum swizzle); /* 745 */
+   void (GLAPIENTRYP SampleMapATI)(GLuint dst, GLuint interp, GLenum swizzle); /* 746 */
+   void (GLAPIENTRYP SetFragmentShaderConstantATI)(GLuint dst, const GLfloat * value); /* 747 */
+   void (GLAPIENTRYP PointParameteriNV)(GLenum pname, GLint param); /* 748 */
+   void (GLAPIENTRYP PointParameterivNV)(GLenum pname, const GLint * params); /* 749 */
+   void (GLAPIENTRYP ActiveStencilFaceEXT)(GLenum face); /* 750 */
+   void (GLAPIENTRYP BindVertexArrayAPPLE)(GLuint array); /* 751 */
+   void (GLAPIENTRYP DeleteVertexArraysAPPLE)(GLsizei n, const GLuint * arrays); /* 752 */
+   void (GLAPIENTRYP GenVertexArraysAPPLE)(GLsizei n, GLuint * arrays); /* 753 */
+   GLboolean (GLAPIENTRYP IsVertexArrayAPPLE)(GLuint array); /* 754 */
+   void (GLAPIENTRYP GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params); /* 755 */
+   void (GLAPIENTRYP GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params); /* 756 */
+   void (GLAPIENTRYP ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 757 */
+   void (GLAPIENTRYP ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 758 */
+   void (GLAPIENTRYP ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 759 */
+   void (GLAPIENTRYP ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 760 */
+   void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 761 */
+   void (GLAPIENTRYP BlendEquationSeparateEXT)(GLenum modeRGB, GLenum modeA); /* 762 */
+   void (GLAPIENTRYP BindFramebufferEXT)(GLenum target, GLuint framebuffer); /* 763 */
+   void (GLAPIENTRYP BindRenderbufferEXT)(GLenum target, GLuint renderbuffer); /* 764 */
+   GLenum (GLAPIENTRYP CheckFramebufferStatusEXT)(GLenum target); /* 765 */
+   void (GLAPIENTRYP DeleteFramebuffersEXT)(GLsizei n, const GLuint * framebuffers); /* 766 */
+   void (GLAPIENTRYP DeleteRenderbuffersEXT)(GLsizei n, const GLuint * renderbuffers); /* 767 */
+   void (GLAPIENTRYP FramebufferRenderbufferEXT)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); /* 768 */
+   void (GLAPIENTRYP FramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 769 */
+   void (GLAPIENTRYP FramebufferTexture2DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 770 */
+   void (GLAPIENTRYP FramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); /* 771 */
+   void (GLAPIENTRYP GenFramebuffersEXT)(GLsizei n, GLuint * framebuffers); /* 772 */
+   void (GLAPIENTRYP GenRenderbuffersEXT)(GLsizei n, GLuint * renderbuffers); /* 773 */
+   void (GLAPIENTRYP GenerateMipmapEXT)(GLenum target); /* 774 */
+   void (GLAPIENTRYP GetFramebufferAttachmentParameterivEXT)(GLenum target, GLenum attachment, GLenum pname, GLint * params); /* 775 */
+   void (GLAPIENTRYP GetRenderbufferParameterivEXT)(GLenum target, GLenum pname, GLint * params); /* 776 */
+   GLboolean (GLAPIENTRYP IsFramebufferEXT)(GLuint framebuffer); /* 777 */
+   GLboolean (GLAPIENTRYP IsRenderbufferEXT)(GLuint renderbuffer); /* 778 */
+   void (GLAPIENTRYP RenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); /* 779 */
+   void (GLAPIENTRYP BlitFramebufferEXT)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); /* 780 */
+   void (GLAPIENTRYP BufferParameteriAPPLE)(GLenum target, GLenum pname, GLint param); /* 781 */
+   void (GLAPIENTRYP FlushMappedBufferRangeAPPLE)(GLenum target, GLintptr offset, GLsizeiptr size); /* 782 */
+   void (GLAPIENTRYP FramebufferTextureLayerEXT)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); /* 783 */
+   void (GLAPIENTRYP ProvokingVertexEXT)(GLenum mode); /* 784 */
+   void (GLAPIENTRYP GetTexParameterPointervAPPLE)(GLenum target, GLenum pname, GLvoid ** params); /* 785 */
+   void (GLAPIENTRYP TextureRangeAPPLE)(GLenum target, GLsizei length, GLvoid * pointer); /* 786 */
+   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 787 */
+   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 788 */
+   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 789 */
+   void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 790 */
+   void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 791 */
 };
 
 #endif /* !defined( _GLAPI_TABLE_H_ ) */
diff --git a/src/mesa/glapi/glapitemp.h b/src/mesa/glapi/glapitemp.h
index 68e7a9a4f0..7b211918c1 100644
--- a/src/mesa/glapi/glapitemp.h
+++ b/src/mesa/glapi/glapitemp.h
@@ -4036,63 +4036,98 @@ KEYWORD1 void KEYWORD2 NAME(CopyBufferSubData)(GLenum readTarget, GLenum writeTa
    DISPATCH(CopyBufferSubData, (readTarget, writeTarget, readOffset, writeOffset, size), (F, "glCopyBufferSubData(0x%x, 0x%x, %d, %d, %d);\n", readTarget, writeTarget, readOffset, writeOffset, size));
 }
 
+KEYWORD1 void KEYWORD2 NAME(ClientWaitSync)(GLsync sync, GLbitfield flags, GLuint64 timeout)
+{
+   DISPATCH(ClientWaitSync, (sync, flags, timeout), (F, "glClientWaitSync(%d, %d, %d);\n", sync, flags, timeout));
+}
+
+KEYWORD1 void KEYWORD2 NAME(DeleteSync)(GLsync sync)
+{
+   DISPATCH(DeleteSync, (sync), (F, "glDeleteSync(%d);\n", sync));
+}
+
+KEYWORD1 GLuint KEYWORD2 NAME(FenceSync)(GLenum condition, GLbitfield flags)
+{
+   RETURN_DISPATCH(FenceSync, (condition, flags), (F, "glFenceSync(0x%x, %d);\n", condition, flags));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetInteger64v)(GLenum pname, GLint64 * params)
+{
+   DISPATCH(GetInteger64v, (pname, params), (F, "glGetInteger64v(0x%x, %p);\n", pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetSynciv)(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * values)
+{
+   DISPATCH(GetSynciv, (sync, pname, bufSize, length, values), (F, "glGetSynciv(%d, 0x%x, %d, %p, %p);\n", sync, pname, bufSize, (const void *) length, (const void *) values));
+}
+
+KEYWORD1 GLboolean KEYWORD2 NAME(IsSync)(GLsync sync)
+{
+   RETURN_DISPATCH(IsSync, (sync), (F, "glIsSync(%d);\n", sync));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WaitSync)(GLsync sync, GLbitfield flags, GLuint64 timeout)
+{
+   DISPATCH(WaitSync, (sync, flags, timeout), (F, "glWaitSync(%d, %d, %d);\n", sync, flags, timeout));
+}
+
 KEYWORD1 void KEYWORD2 NAME(PolygonOffsetEXT)(GLfloat factor, GLfloat bias)
 {
    DISPATCH(PolygonOffsetEXT, (factor, bias), (F, "glPolygonOffsetEXT(%f, %f);\n", factor, bias));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_568)(GLenum pname, GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_575)(GLenum pname, GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_568)(GLenum pname, GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_575)(GLenum pname, GLfloat * params)
 {
    DISPATCH(GetPixelTexGenParameterfvSGIS, (pname, params), (F, "glGetPixelTexGenParameterfvSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_569)(GLenum pname, GLint * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_576)(GLenum pname, GLint * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_569)(GLenum pname, GLint * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_576)(GLenum pname, GLint * params)
 {
    DISPATCH(GetPixelTexGenParameterivSGIS, (pname, params), (F, "glGetPixelTexGenParameterivSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_570)(GLenum pname, GLfloat param);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_577)(GLenum pname, GLfloat param);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_570)(GLenum pname, GLfloat param)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_577)(GLenum pname, GLfloat param)
 {
    DISPATCH(PixelTexGenParameterfSGIS, (pname, param), (F, "glPixelTexGenParameterfSGIS(0x%x, %f);\n", pname, param));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_571)(GLenum pname, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_578)(GLenum pname, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_571)(GLenum pname, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_578)(GLenum pname, const GLfloat * params)
 {
    DISPATCH(PixelTexGenParameterfvSGIS, (pname, params), (F, "glPixelTexGenParameterfvSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_572)(GLenum pname, GLint param);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_579)(GLenum pname, GLint param);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_572)(GLenum pname, GLint param)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_579)(GLenum pname, GLint param)
 {
    DISPATCH(PixelTexGenParameteriSGIS, (pname, param), (F, "glPixelTexGenParameteriSGIS(0x%x, %d);\n", pname, param));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_573)(GLenum pname, const GLint * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_580)(GLenum pname, const GLint * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_573)(GLenum pname, const GLint * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_580)(GLenum pname, const GLint * params)
 {
    DISPATCH(PixelTexGenParameterivSGIS, (pname, params), (F, "glPixelTexGenParameterivSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_574)(GLclampf value, GLboolean invert);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_581)(GLclampf value, GLboolean invert);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_574)(GLclampf value, GLboolean invert)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_581)(GLclampf value, GLboolean invert)
 {
    DISPATCH(SampleMaskSGIS, (value, invert), (F, "glSampleMaskSGIS(%f, %d);\n", value, invert));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_575)(GLenum pattern);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_582)(GLenum pattern);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_575)(GLenum pattern)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_582)(GLenum pattern)
 {
    DISPATCH(SamplePatternSGIS, (pattern), (F, "glSamplePatternSGIS(0x%x);\n", pattern));
 }
@@ -4142,9 +4177,9 @@ KEYWORD1 void KEYWORD2 NAME(PointParameterfEXT)(GLenum pname, GLfloat param)
    DISPATCH(PointParameterfEXT, (pname, param), (F, "glPointParameterfEXT(0x%x, %f);\n", pname, param));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_582)(GLenum pname, GLfloat param);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_589)(GLenum pname, GLfloat param);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_582)(GLenum pname, GLfloat param)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_589)(GLenum pname, GLfloat param)
 {
    DISPATCH(PointParameterfEXT, (pname, param), (F, "glPointParameterfSGIS(0x%x, %f);\n", pname, param));
 }
@@ -4164,9 +4199,9 @@ KEYWORD1 void KEYWORD2 NAME(PointParameterfvEXT)(GLenum pname, const GLfloat * p
    DISPATCH(PointParameterfvEXT, (pname, params), (F, "glPointParameterfvEXT(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_583)(GLenum pname, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_590)(GLenum pname, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_583)(GLenum pname, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_590)(GLenum pname, const GLfloat * params)
 {
    DISPATCH(PointParameterfvEXT, (pname, params), (F, "glPointParameterfvSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
@@ -4181,16 +4216,16 @@ KEYWORD1 void KEYWORD2 NAME(UnlockArraysEXT)(void)
    DISPATCH(UnlockArraysEXT, (), (F, "glUnlockArraysEXT();\n"));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_586)(GLenum pname, GLdouble * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_593)(GLenum pname, GLdouble * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_586)(GLenum pname, GLdouble * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_593)(GLenum pname, GLdouble * params)
 {
    DISPATCH(CullParameterdvEXT, (pname, params), (F, "glCullParameterdvEXT(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_587)(GLenum pname, GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_594)(GLenum pname, GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_587)(GLenum pname, GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_594)(GLenum pname, GLfloat * params)
 {
    DISPATCH(CullParameterfvEXT, (pname, params), (F, "glCullParameterfvEXT(0x%x, %p);\n", pname, (const void *) params));
 }
@@ -4435,9 +4470,9 @@ KEYWORD1 void KEYWORD2 NAME(FogCoordfvEXT)(const GLfloat * coord)
    DISPATCH(FogCoordfvEXT, (coord), (F, "glFogCoordfvEXT(%p);\n", (const void *) coord));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_612)(GLenum mode);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_619)(GLenum mode);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_612)(GLenum mode)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_619)(GLenum mode)
 {
    DISPATCH(PixelTexGenSGIX, (mode), (F, "glPixelTexGenSGIX(0x%x);\n", mode));
 }
@@ -4452,9 +4487,9 @@ KEYWORD1 void KEYWORD2 NAME(BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfac
    DISPATCH(BlendFuncSeparateEXT, (sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha), (F, "glBlendFuncSeparateEXT(0x%x, 0x%x, 0x%x, 0x%x);\n", sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_613)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_620)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_613)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_620)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
 {
    DISPATCH(BlendFuncSeparateEXT, (sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha), (F, "glBlendFuncSeparateINGR(0x%x, 0x%x, 0x%x, 0x%x);\n", sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha));
 }
@@ -4819,65 +4854,65 @@ KEYWORD1 void KEYWORD2 NAME(WindowPos4svMESA)(const GLshort * v)
    DISPATCH(WindowPos4svMESA, (v), (F, "glWindowPos4svMESA(%p);\n", (const void *) v));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_654)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_661)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_654)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_661)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride)
 {
    DISPATCH(MultiModeDrawArraysIBM, (mode, first, count, primcount, modestride), (F, "glMultiModeDrawArraysIBM(%p, %p, %p, %d, %d);\n", (const void *) mode, (const void *) first, (const void *) count, primcount, modestride));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_655)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_662)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_655)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_662)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride)
 {
    DISPATCH(MultiModeDrawElementsIBM, (mode, count, type, indices, primcount, modestride), (F, "glMultiModeDrawElementsIBM(%p, %p, 0x%x, %p, %d, %d);\n", (const void *) mode, (const void *) count, type, (const void *) indices, primcount, modestride));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_656)(GLsizei n, const GLuint * fences);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_663)(GLsizei n, const GLuint * fences);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_656)(GLsizei n, const GLuint * fences)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_663)(GLsizei n, const GLuint * fences)
 {
    DISPATCH(DeleteFencesNV, (n, fences), (F, "glDeleteFencesNV(%d, %p);\n", n, (const void *) fences));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_657)(GLuint fence);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_664)(GLuint fence);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_657)(GLuint fence)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_664)(GLuint fence)
 {
    DISPATCH(FinishFenceNV, (fence), (F, "glFinishFenceNV(%d);\n", fence));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_658)(GLsizei n, GLuint * fences);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_665)(GLsizei n, GLuint * fences);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_658)(GLsizei n, GLuint * fences)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_665)(GLsizei n, GLuint * fences)
 {
    DISPATCH(GenFencesNV, (n, fences), (F, "glGenFencesNV(%d, %p);\n", n, (const void *) fences));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_659)(GLuint fence, GLenum pname, GLint * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_666)(GLuint fence, GLenum pname, GLint * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_659)(GLuint fence, GLenum pname, GLint * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_666)(GLuint fence, GLenum pname, GLint * params)
 {
    DISPATCH(GetFenceivNV, (fence, pname, params), (F, "glGetFenceivNV(%d, 0x%x, %p);\n", fence, pname, (const void *) params));
 }
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_660)(GLuint fence);
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_667)(GLuint fence);
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_660)(GLuint fence)
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_667)(GLuint fence)
 {
    RETURN_DISPATCH(IsFenceNV, (fence), (F, "glIsFenceNV(%d);\n", fence));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_661)(GLuint fence, GLenum condition);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_668)(GLuint fence, GLenum condition);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_661)(GLuint fence, GLenum condition)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_668)(GLuint fence, GLenum condition)
 {
    DISPATCH(SetFenceNV, (fence, condition), (F, "glSetFenceNV(%d, 0x%x);\n", fence, condition));
 }
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_662)(GLuint fence);
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_669)(GLuint fence);
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_662)(GLuint fence)
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_669)(GLuint fence)
 {
    RETURN_DISPATCH(TestFenceNV, (fence), (F, "glTestFenceNV(%d);\n", fence));
 }
@@ -5322,16 +5357,16 @@ KEYWORD1 void KEYWORD2 NAME(PointParameterivNV)(GLenum pname, const GLint * para
    DISPATCH(PointParameterivNV, (pname, params), (F, "glPointParameterivNV(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_743)(GLenum face);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_750)(GLenum face);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_743)(GLenum face)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_750)(GLenum face)
 {
    DISPATCH(ActiveStencilFaceEXT, (face), (F, "glActiveStencilFaceEXT(0x%x);\n", face));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_744)(GLuint array);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_751)(GLuint array);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_744)(GLuint array)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_751)(GLuint array)
 {
    DISPATCH(BindVertexArrayAPPLE, (array), (F, "glBindVertexArrayAPPLE(%d);\n", array));
 }
@@ -5341,16 +5376,16 @@ KEYWORD1 void KEYWORD2 NAME(DeleteVertexArrays)(GLsizei n, const GLuint * arrays
    DISPATCH(DeleteVertexArraysAPPLE, (n, arrays), (F, "glDeleteVertexArrays(%d, %p);\n", n, (const void *) arrays));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_745)(GLsizei n, const GLuint * arrays);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_752)(GLsizei n, const GLuint * arrays);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_745)(GLsizei n, const GLuint * arrays)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_752)(GLsizei n, const GLuint * arrays)
 {
    DISPATCH(DeleteVertexArraysAPPLE, (n, arrays), (F, "glDeleteVertexArraysAPPLE(%d, %p);\n", n, (const void *) arrays));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_746)(GLsizei n, GLuint * arrays);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_753)(GLsizei n, GLuint * arrays);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_746)(GLsizei n, GLuint * arrays)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_753)(GLsizei n, GLuint * arrays)
 {
    DISPATCH(GenVertexArraysAPPLE, (n, arrays), (F, "glGenVertexArraysAPPLE(%d, %p);\n", n, (const void *) arrays));
 }
@@ -5360,9 +5395,9 @@ KEYWORD1 GLboolean KEYWORD2 NAME(IsVertexArray)(GLuint array)
    RETURN_DISPATCH(IsVertexArrayAPPLE, (array), (F, "glIsVertexArray(%d);\n", array));
 }
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_747)(GLuint array);
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_754)(GLuint array);
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_747)(GLuint array)
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_754)(GLuint array)
 {
    RETURN_DISPATCH(IsVertexArrayAPPLE, (array), (F, "glIsVertexArrayAPPLE(%d);\n", array));
 }
@@ -5397,9 +5432,9 @@ KEYWORD1 void KEYWORD2 NAME(ProgramNamedParameter4fvNV)(GLuint id, GLsizei len,
    DISPATCH(ProgramNamedParameter4fvNV, (id, len, name, v), (F, "glProgramNamedParameter4fvNV(%d, %d, %p, %p);\n", id, len, (const void *) name, (const void *) v));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_754)(GLclampd zmin, GLclampd zmax);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_761)(GLclampd zmin, GLclampd zmax);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_754)(GLclampd zmin, GLclampd zmax)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_761)(GLclampd zmin, GLclampd zmax)
 {
    DISPATCH(DepthBoundsEXT, (zmin, zmax), (F, "glDepthBoundsEXT(%f, %f);\n", zmin, zmax));
 }
@@ -5409,9 +5444,9 @@ KEYWORD1 void KEYWORD2 NAME(BlendEquationSeparate)(GLenum modeRGB, GLenum modeA)
    DISPATCH(BlendEquationSeparateEXT, (modeRGB, modeA), (F, "glBlendEquationSeparate(0x%x, 0x%x);\n", modeRGB, modeA));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_755)(GLenum modeRGB, GLenum modeA);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_762)(GLenum modeRGB, GLenum modeA);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_755)(GLenum modeRGB, GLenum modeA)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_762)(GLenum modeRGB, GLenum modeA)
 {
    DISPATCH(BlendEquationSeparateEXT, (modeRGB, modeA), (F, "glBlendEquationSeparateEXT(0x%x, 0x%x);\n", modeRGB, modeA));
 }
@@ -5591,23 +5626,23 @@ KEYWORD1 void KEYWORD2 NAME(BlitFramebuffer)(GLint srcX0, GLint srcY0, GLint src
    DISPATCH(BlitFramebufferEXT, (srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter), (F, "glBlitFramebuffer(%d, %d, %d, %d, %d, %d, %d, %d, %d, 0x%x);\n", srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_773)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_780)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_773)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_780)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
 {
    DISPATCH(BlitFramebufferEXT, (srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter), (F, "glBlitFramebufferEXT(%d, %d, %d, %d, %d, %d, %d, %d, %d, 0x%x);\n", srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_774)(GLenum target, GLenum pname, GLint param);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_781)(GLenum target, GLenum pname, GLint param);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_774)(GLenum target, GLenum pname, GLint param)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_781)(GLenum target, GLenum pname, GLint param)
 {
    DISPATCH(BufferParameteriAPPLE, (target, pname, param), (F, "glBufferParameteriAPPLE(0x%x, 0x%x, %d);\n", target, pname, param));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_775)(GLenum target, GLintptr offset, GLsizeiptr size);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_782)(GLenum target, GLintptr offset, GLsizeiptr size);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_775)(GLenum target, GLintptr offset, GLsizeiptr size)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_782)(GLenum target, GLintptr offset, GLsizeiptr size)
 {
    DISPATCH(FlushMappedBufferRangeAPPLE, (target, offset, size), (F, "glFlushMappedBufferRangeAPPLE(0x%x, %d, %d);\n", target, offset, size));
 }
@@ -5627,51 +5662,51 @@ KEYWORD1 void KEYWORD2 NAME(ProvokingVertexEXT)(GLenum mode)
    DISPATCH(ProvokingVertexEXT, (mode), (F, "glProvokingVertexEXT(0x%x);\n", mode));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_778)(GLenum target, GLenum pname, GLvoid ** params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_785)(GLenum target, GLenum pname, GLvoid ** params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_778)(GLenum target, GLenum pname, GLvoid ** params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_785)(GLenum target, GLenum pname, GLvoid ** params)
 {
    DISPATCH(GetTexParameterPointervAPPLE, (target, pname, params), (F, "glGetTexParameterPointervAPPLE(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_779)(GLenum target, GLsizei length, GLvoid * pointer);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_786)(GLenum target, GLsizei length, GLvoid * pointer);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_779)(GLenum target, GLsizei length, GLvoid * pointer)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_786)(GLenum target, GLsizei length, GLvoid * pointer)
 {
    DISPATCH(TextureRangeAPPLE, (target, length, pointer), (F, "glTextureRangeAPPLE(0x%x, %d, %p);\n", target, length, (const void *) pointer));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_780)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_787)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_780)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_787)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask)
 {
    DISPATCH(StencilFuncSeparateATI, (frontfunc, backfunc, ref, mask), (F, "glStencilFuncSeparateATI(0x%x, 0x%x, %d, %d);\n", frontfunc, backfunc, ref, mask));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_781)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_788)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_781)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_788)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
 {
    DISPATCH(ProgramEnvParameters4fvEXT, (target, index, count, params), (F, "glProgramEnvParameters4fvEXT(0x%x, %d, %d, %p);\n", target, index, count, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_782)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_789)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_782)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_789)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
 {
    DISPATCH(ProgramLocalParameters4fvEXT, (target, index, count, params), (F, "glProgramLocalParameters4fvEXT(0x%x, %d, %d, %p);\n", target, index, count, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_783)(GLuint id, GLenum pname, GLint64EXT * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_790)(GLuint id, GLenum pname, GLint64EXT * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_783)(GLuint id, GLenum pname, GLint64EXT * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_790)(GLuint id, GLenum pname, GLint64EXT * params)
 {
    DISPATCH(GetQueryObjecti64vEXT, (id, pname, params), (F, "glGetQueryObjecti64vEXT(%d, 0x%x, %p);\n", id, pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_784)(GLuint id, GLenum pname, GLuint64EXT * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_791)(GLuint id, GLenum pname, GLuint64EXT * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_784)(GLuint id, GLenum pname, GLuint64EXT * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_791)(GLuint id, GLenum pname, GLuint64EXT * params)
 {
    DISPATCH(GetQueryObjectui64vEXT, (id, pname, params), (F, "glGetQueryObjectui64vEXT(%d, 0x%x, %p);\n", id, pname, (const void *) params));
 }
@@ -6257,15 +6292,22 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(BindVertexArray),
    TABLE_ENTRY(GenVertexArrays),
    TABLE_ENTRY(CopyBufferSubData),
+   TABLE_ENTRY(ClientWaitSync),
+   TABLE_ENTRY(DeleteSync),
+   TABLE_ENTRY(FenceSync),
+   TABLE_ENTRY(GetInteger64v),
+   TABLE_ENTRY(GetSynciv),
+   TABLE_ENTRY(IsSync),
+   TABLE_ENTRY(WaitSync),
    TABLE_ENTRY(PolygonOffsetEXT),
-   TABLE_ENTRY(_dispatch_stub_568),
-   TABLE_ENTRY(_dispatch_stub_569),
-   TABLE_ENTRY(_dispatch_stub_570),
-   TABLE_ENTRY(_dispatch_stub_571),
-   TABLE_ENTRY(_dispatch_stub_572),
-   TABLE_ENTRY(_dispatch_stub_573),
-   TABLE_ENTRY(_dispatch_stub_574),
    TABLE_ENTRY(_dispatch_stub_575),
+   TABLE_ENTRY(_dispatch_stub_576),
+   TABLE_ENTRY(_dispatch_stub_577),
+   TABLE_ENTRY(_dispatch_stub_578),
+   TABLE_ENTRY(_dispatch_stub_579),
+   TABLE_ENTRY(_dispatch_stub_580),
+   TABLE_ENTRY(_dispatch_stub_581),
+   TABLE_ENTRY(_dispatch_stub_582),
    TABLE_ENTRY(ColorPointerEXT),
    TABLE_ENTRY(EdgeFlagPointerEXT),
    TABLE_ENTRY(IndexPointerEXT),
@@ -6276,8 +6318,8 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(PointParameterfvEXT),
    TABLE_ENTRY(LockArraysEXT),
    TABLE_ENTRY(UnlockArraysEXT),
-   TABLE_ENTRY(_dispatch_stub_586),
-   TABLE_ENTRY(_dispatch_stub_587),
+   TABLE_ENTRY(_dispatch_stub_593),
+   TABLE_ENTRY(_dispatch_stub_594),
    TABLE_ENTRY(SecondaryColor3bEXT),
    TABLE_ENTRY(SecondaryColor3bvEXT),
    TABLE_ENTRY(SecondaryColor3dEXT),
@@ -6302,7 +6344,7 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(FogCoorddvEXT),
    TABLE_ENTRY(FogCoordfEXT),
    TABLE_ENTRY(FogCoordfvEXT),
-   TABLE_ENTRY(_dispatch_stub_612),
+   TABLE_ENTRY(_dispatch_stub_619),
    TABLE_ENTRY(BlendFuncSeparateEXT),
    TABLE_ENTRY(FlushVertexArrayRangeNV),
    TABLE_ENTRY(VertexArrayRangeNV),
@@ -6344,15 +6386,15 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(WindowPos4ivMESA),
    TABLE_ENTRY(WindowPos4sMESA),
    TABLE_ENTRY(WindowPos4svMESA),
-   TABLE_ENTRY(_dispatch_stub_654),
-   TABLE_ENTRY(_dispatch_stub_655),
-   TABLE_ENTRY(_dispatch_stub_656),
-   TABLE_ENTRY(_dispatch_stub_657),
-   TABLE_ENTRY(_dispatch_stub_658),
-   TABLE_ENTRY(_dispatch_stub_659),
-   TABLE_ENTRY(_dispatch_stub_660),
    TABLE_ENTRY(_dispatch_stub_661),
    TABLE_ENTRY(_dispatch_stub_662),
+   TABLE_ENTRY(_dispatch_stub_663),
+   TABLE_ENTRY(_dispatch_stub_664),
+   TABLE_ENTRY(_dispatch_stub_665),
+   TABLE_ENTRY(_dispatch_stub_666),
+   TABLE_ENTRY(_dispatch_stub_667),
+   TABLE_ENTRY(_dispatch_stub_668),
+   TABLE_ENTRY(_dispatch_stub_669),
    TABLE_ENTRY(AreProgramsResidentNV),
    TABLE_ENTRY(BindProgramNV),
    TABLE_ENTRY(DeleteProgramsNV),
@@ -6433,19 +6475,19 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(SetFragmentShaderConstantATI),
    TABLE_ENTRY(PointParameteriNV),
    TABLE_ENTRY(PointParameterivNV),
-   TABLE_ENTRY(_dispatch_stub_743),
-   TABLE_ENTRY(_dispatch_stub_744),
-   TABLE_ENTRY(_dispatch_stub_745),
-   TABLE_ENTRY(_dispatch_stub_746),
-   TABLE_ENTRY(_dispatch_stub_747),
+   TABLE_ENTRY(_dispatch_stub_750),
+   TABLE_ENTRY(_dispatch_stub_751),
+   TABLE_ENTRY(_dispatch_stub_752),
+   TABLE_ENTRY(_dispatch_stub_753),
+   TABLE_ENTRY(_dispatch_stub_754),
    TABLE_ENTRY(GetProgramNamedParameterdvNV),
    TABLE_ENTRY(GetProgramNamedParameterfvNV),
    TABLE_ENTRY(ProgramNamedParameter4dNV),
    TABLE_ENTRY(ProgramNamedParameter4dvNV),
    TABLE_ENTRY(ProgramNamedParameter4fNV),
    TABLE_ENTRY(ProgramNamedParameter4fvNV),
-   TABLE_ENTRY(_dispatch_stub_754),
-   TABLE_ENTRY(_dispatch_stub_755),
+   TABLE_ENTRY(_dispatch_stub_761),
+   TABLE_ENTRY(_dispatch_stub_762),
    TABLE_ENTRY(BindFramebufferEXT),
    TABLE_ENTRY(BindRenderbufferEXT),
    TABLE_ENTRY(CheckFramebufferStatusEXT),
@@ -6463,18 +6505,18 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(IsFramebufferEXT),
    TABLE_ENTRY(IsRenderbufferEXT),
    TABLE_ENTRY(RenderbufferStorageEXT),
-   TABLE_ENTRY(_dispatch_stub_773),
-   TABLE_ENTRY(_dispatch_stub_774),
-   TABLE_ENTRY(_dispatch_stub_775),
-   TABLE_ENTRY(FramebufferTextureLayerEXT),
-   TABLE_ENTRY(ProvokingVertexEXT),
-   TABLE_ENTRY(_dispatch_stub_778),
-   TABLE_ENTRY(_dispatch_stub_779),
    TABLE_ENTRY(_dispatch_stub_780),
    TABLE_ENTRY(_dispatch_stub_781),
    TABLE_ENTRY(_dispatch_stub_782),
-   TABLE_ENTRY(_dispatch_stub_783),
-   TABLE_ENTRY(_dispatch_stub_784),
+   TABLE_ENTRY(FramebufferTextureLayerEXT),
+   TABLE_ENTRY(ProvokingVertexEXT),
+   TABLE_ENTRY(_dispatch_stub_785),
+   TABLE_ENTRY(_dispatch_stub_786),
+   TABLE_ENTRY(_dispatch_stub_787),
+   TABLE_ENTRY(_dispatch_stub_788),
+   TABLE_ENTRY(_dispatch_stub_789),
+   TABLE_ENTRY(_dispatch_stub_790),
+   TABLE_ENTRY(_dispatch_stub_791),
    /* A whole bunch of no-op functions.  These might be called
     * when someone tries to call a dynamically-registered
     * extension function without a current rendering context.
diff --git a/src/mesa/glapi/glprocs.h b/src/mesa/glapi/glprocs.h
index 21e96a9325..ae6603262e 100644
--- a/src/mesa/glapi/glprocs.h
+++ b/src/mesa/glapi/glprocs.h
@@ -619,6 +619,13 @@ static const char gl_string_table[] =
     "glBindVertexArray\0"
     "glGenVertexArrays\0"
     "glCopyBufferSubData\0"
+    "glClientWaitSync\0"
+    "glDeleteSync\0"
+    "glFenceSync\0"
+    "glGetInteger64v\0"
+    "glGetSynciv\0"
+    "glIsSync\0"
+    "glWaitSync\0"
     "glPolygonOffsetEXT\0"
     "glGetPixelTexGenParameterfvSGIS\0"
     "glGetPixelTexGenParameterivSGIS\0"
@@ -1154,43 +1161,43 @@ static const char gl_string_table[] =
 #define gl_dispatch_stub_364 mgl_dispatch_stub_364
 #define gl_dispatch_stub_365 mgl_dispatch_stub_365
 #define gl_dispatch_stub_366 mgl_dispatch_stub_366
-#define gl_dispatch_stub_568 mgl_dispatch_stub_568
-#define gl_dispatch_stub_569 mgl_dispatch_stub_569
-#define gl_dispatch_stub_570 mgl_dispatch_stub_570
-#define gl_dispatch_stub_571 mgl_dispatch_stub_571
-#define gl_dispatch_stub_572 mgl_dispatch_stub_572
-#define gl_dispatch_stub_573 mgl_dispatch_stub_573
-#define gl_dispatch_stub_574 mgl_dispatch_stub_574
 #define gl_dispatch_stub_575 mgl_dispatch_stub_575
-#define gl_dispatch_stub_586 mgl_dispatch_stub_586
-#define gl_dispatch_stub_587 mgl_dispatch_stub_587
-#define gl_dispatch_stub_612 mgl_dispatch_stub_612
-#define gl_dispatch_stub_654 mgl_dispatch_stub_654
-#define gl_dispatch_stub_655 mgl_dispatch_stub_655
-#define gl_dispatch_stub_656 mgl_dispatch_stub_656
-#define gl_dispatch_stub_657 mgl_dispatch_stub_657
-#define gl_dispatch_stub_658 mgl_dispatch_stub_658
-#define gl_dispatch_stub_659 mgl_dispatch_stub_659
-#define gl_dispatch_stub_660 mgl_dispatch_stub_660
+#define gl_dispatch_stub_576 mgl_dispatch_stub_576
+#define gl_dispatch_stub_577 mgl_dispatch_stub_577
+#define gl_dispatch_stub_578 mgl_dispatch_stub_578
+#define gl_dispatch_stub_579 mgl_dispatch_stub_579
+#define gl_dispatch_stub_580 mgl_dispatch_stub_580
+#define gl_dispatch_stub_581 mgl_dispatch_stub_581
+#define gl_dispatch_stub_582 mgl_dispatch_stub_582
+#define gl_dispatch_stub_593 mgl_dispatch_stub_593
+#define gl_dispatch_stub_594 mgl_dispatch_stub_594
+#define gl_dispatch_stub_619 mgl_dispatch_stub_619
 #define gl_dispatch_stub_661 mgl_dispatch_stub_661
 #define gl_dispatch_stub_662 mgl_dispatch_stub_662
-#define gl_dispatch_stub_743 mgl_dispatch_stub_743
-#define gl_dispatch_stub_744 mgl_dispatch_stub_744
-#define gl_dispatch_stub_745 mgl_dispatch_stub_745
-#define gl_dispatch_stub_746 mgl_dispatch_stub_746
-#define gl_dispatch_stub_747 mgl_dispatch_stub_747
+#define gl_dispatch_stub_663 mgl_dispatch_stub_663
+#define gl_dispatch_stub_664 mgl_dispatch_stub_664
+#define gl_dispatch_stub_665 mgl_dispatch_stub_665
+#define gl_dispatch_stub_666 mgl_dispatch_stub_666
+#define gl_dispatch_stub_667 mgl_dispatch_stub_667
+#define gl_dispatch_stub_668 mgl_dispatch_stub_668
+#define gl_dispatch_stub_669 mgl_dispatch_stub_669
+#define gl_dispatch_stub_750 mgl_dispatch_stub_750
+#define gl_dispatch_stub_751 mgl_dispatch_stub_751
+#define gl_dispatch_stub_752 mgl_dispatch_stub_752
+#define gl_dispatch_stub_753 mgl_dispatch_stub_753
 #define gl_dispatch_stub_754 mgl_dispatch_stub_754
-#define gl_dispatch_stub_755 mgl_dispatch_stub_755
-#define gl_dispatch_stub_773 mgl_dispatch_stub_773
-#define gl_dispatch_stub_774 mgl_dispatch_stub_774
-#define gl_dispatch_stub_775 mgl_dispatch_stub_775
-#define gl_dispatch_stub_778 mgl_dispatch_stub_778
-#define gl_dispatch_stub_779 mgl_dispatch_stub_779
+#define gl_dispatch_stub_761 mgl_dispatch_stub_761
+#define gl_dispatch_stub_762 mgl_dispatch_stub_762
 #define gl_dispatch_stub_780 mgl_dispatch_stub_780
 #define gl_dispatch_stub_781 mgl_dispatch_stub_781
 #define gl_dispatch_stub_782 mgl_dispatch_stub_782
-#define gl_dispatch_stub_783 mgl_dispatch_stub_783
-#define gl_dispatch_stub_784 mgl_dispatch_stub_784
+#define gl_dispatch_stub_785 mgl_dispatch_stub_785
+#define gl_dispatch_stub_786 mgl_dispatch_stub_786
+#define gl_dispatch_stub_787 mgl_dispatch_stub_787
+#define gl_dispatch_stub_788 mgl_dispatch_stub_788
+#define gl_dispatch_stub_789 mgl_dispatch_stub_789
+#define gl_dispatch_stub_790 mgl_dispatch_stub_790
+#define gl_dispatch_stub_791 mgl_dispatch_stub_791
 #endif /* USE_MGL_NAMESPACE */
 
 
@@ -1208,43 +1215,43 @@ void GLAPIENTRY gl_dispatch_stub_363(GLenum target, GLenum pname, GLint * params
 void GLAPIENTRY gl_dispatch_stub_364(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid * values);
 void GLAPIENTRY gl_dispatch_stub_365(GLenum target, GLenum pname, GLfloat * params);
 void GLAPIENTRY gl_dispatch_stub_366(GLenum target, GLenum pname, GLint * params);
-void GLAPIENTRY gl_dispatch_stub_568(GLenum pname, GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_569(GLenum pname, GLint * params);
-void GLAPIENTRY gl_dispatch_stub_570(GLenum pname, GLfloat param);
-void GLAPIENTRY gl_dispatch_stub_571(GLenum pname, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_572(GLenum pname, GLint param);
-void GLAPIENTRY gl_dispatch_stub_573(GLenum pname, const GLint * params);
-void GLAPIENTRY gl_dispatch_stub_574(GLclampf value, GLboolean invert);
-void GLAPIENTRY gl_dispatch_stub_575(GLenum pattern);
-void GLAPIENTRY gl_dispatch_stub_586(GLenum pname, GLdouble * params);
-void GLAPIENTRY gl_dispatch_stub_587(GLenum pname, GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_612(GLenum mode);
-void GLAPIENTRY gl_dispatch_stub_654(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
-void GLAPIENTRY gl_dispatch_stub_655(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
-void GLAPIENTRY gl_dispatch_stub_656(GLsizei n, const GLuint * fences);
-void GLAPIENTRY gl_dispatch_stub_657(GLuint fence);
-void GLAPIENTRY gl_dispatch_stub_658(GLsizei n, GLuint * fences);
-void GLAPIENTRY gl_dispatch_stub_659(GLuint fence, GLenum pname, GLint * params);
-GLboolean GLAPIENTRY gl_dispatch_stub_660(GLuint fence);
-void GLAPIENTRY gl_dispatch_stub_661(GLuint fence, GLenum condition);
-GLboolean GLAPIENTRY gl_dispatch_stub_662(GLuint fence);
-void GLAPIENTRY gl_dispatch_stub_743(GLenum face);
-void GLAPIENTRY gl_dispatch_stub_744(GLuint array);
-void GLAPIENTRY gl_dispatch_stub_745(GLsizei n, const GLuint * arrays);
-void GLAPIENTRY gl_dispatch_stub_746(GLsizei n, GLuint * arrays);
-GLboolean GLAPIENTRY gl_dispatch_stub_747(GLuint array);
-void GLAPIENTRY gl_dispatch_stub_754(GLclampd zmin, GLclampd zmax);
-void GLAPIENTRY gl_dispatch_stub_755(GLenum modeRGB, GLenum modeA);
-void GLAPIENTRY gl_dispatch_stub_773(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-void GLAPIENTRY gl_dispatch_stub_774(GLenum target, GLenum pname, GLint param);
-void GLAPIENTRY gl_dispatch_stub_775(GLenum target, GLintptr offset, GLsizeiptr size);
-void GLAPIENTRY gl_dispatch_stub_778(GLenum target, GLenum pname, GLvoid ** params);
-void GLAPIENTRY gl_dispatch_stub_779(GLenum target, GLsizei length, GLvoid * pointer);
-void GLAPIENTRY gl_dispatch_stub_780(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-void GLAPIENTRY gl_dispatch_stub_781(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_782(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_783(GLuint id, GLenum pname, GLint64EXT * params);
-void GLAPIENTRY gl_dispatch_stub_784(GLuint id, GLenum pname, GLuint64EXT * params);
+void GLAPIENTRY gl_dispatch_stub_575(GLenum pname, GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_576(GLenum pname, GLint * params);
+void GLAPIENTRY gl_dispatch_stub_577(GLenum pname, GLfloat param);
+void GLAPIENTRY gl_dispatch_stub_578(GLenum pname, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_579(GLenum pname, GLint param);
+void GLAPIENTRY gl_dispatch_stub_580(GLenum pname, const GLint * params);
+void GLAPIENTRY gl_dispatch_stub_581(GLclampf value, GLboolean invert);
+void GLAPIENTRY gl_dispatch_stub_582(GLenum pattern);
+void GLAPIENTRY gl_dispatch_stub_593(GLenum pname, GLdouble * params);
+void GLAPIENTRY gl_dispatch_stub_594(GLenum pname, GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_619(GLenum mode);
+void GLAPIENTRY gl_dispatch_stub_661(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
+void GLAPIENTRY gl_dispatch_stub_662(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
+void GLAPIENTRY gl_dispatch_stub_663(GLsizei n, const GLuint * fences);
+void GLAPIENTRY gl_dispatch_stub_664(GLuint fence);
+void GLAPIENTRY gl_dispatch_stub_665(GLsizei n, GLuint * fences);
+void GLAPIENTRY gl_dispatch_stub_666(GLuint fence, GLenum pname, GLint * params);
+GLboolean GLAPIENTRY gl_dispatch_stub_667(GLuint fence);
+void GLAPIENTRY gl_dispatch_stub_668(GLuint fence, GLenum condition);
+GLboolean GLAPIENTRY gl_dispatch_stub_669(GLuint fence);
+void GLAPIENTRY gl_dispatch_stub_750(GLenum face);
+void GLAPIENTRY gl_dispatch_stub_751(GLuint array);
+void GLAPIENTRY gl_dispatch_stub_752(GLsizei n, const GLuint * arrays);
+void GLAPIENTRY gl_dispatch_stub_753(GLsizei n, GLuint * arrays);
+GLboolean GLAPIENTRY gl_dispatch_stub_754(GLuint array);
+void GLAPIENTRY gl_dispatch_stub_761(GLclampd zmin, GLclampd zmax);
+void GLAPIENTRY gl_dispatch_stub_762(GLenum modeRGB, GLenum modeA);
+void GLAPIENTRY gl_dispatch_stub_780(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+void GLAPIENTRY gl_dispatch_stub_781(GLenum target, GLenum pname, GLint param);
+void GLAPIENTRY gl_dispatch_stub_782(GLenum target, GLintptr offset, GLsizeiptr size);
+void GLAPIENTRY gl_dispatch_stub_785(GLenum target, GLenum pname, GLvoid ** params);
+void GLAPIENTRY gl_dispatch_stub_786(GLenum target, GLsizei length, GLvoid * pointer);
+void GLAPIENTRY gl_dispatch_stub_787(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+void GLAPIENTRY gl_dispatch_stub_788(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_789(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_790(GLuint id, GLenum pname, GLint64EXT * params);
+void GLAPIENTRY gl_dispatch_stub_791(GLuint id, GLenum pname, GLuint64EXT * params);
 #endif /* defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING) */
 
 static const glprocs_table_t static_functions[] = {
@@ -1815,524 +1822,531 @@ static const glprocs_table_t static_functions[] = {
     NAME_FUNC_OFFSET( 9026, glBindVertexArray, glBindVertexArray, NULL, _gloffset_BindVertexArray),
     NAME_FUNC_OFFSET( 9044, glGenVertexArrays, glGenVertexArrays, NULL, _gloffset_GenVertexArrays),
     NAME_FUNC_OFFSET( 9062, glCopyBufferSubData, glCopyBufferSubData, NULL, _gloffset_CopyBufferSubData),
-    NAME_FUNC_OFFSET( 9082, glPolygonOffsetEXT, glPolygonOffsetEXT, NULL, _gloffset_PolygonOffsetEXT),
-    NAME_FUNC_OFFSET( 9101, gl_dispatch_stub_568, gl_dispatch_stub_568, NULL, _gloffset_GetPixelTexGenParameterfvSGIS),
-    NAME_FUNC_OFFSET( 9133, gl_dispatch_stub_569, gl_dispatch_stub_569, NULL, _gloffset_GetPixelTexGenParameterivSGIS),
-    NAME_FUNC_OFFSET( 9165, gl_dispatch_stub_570, gl_dispatch_stub_570, NULL, _gloffset_PixelTexGenParameterfSGIS),
-    NAME_FUNC_OFFSET( 9193, gl_dispatch_stub_571, gl_dispatch_stub_571, NULL, _gloffset_PixelTexGenParameterfvSGIS),
-    NAME_FUNC_OFFSET( 9222, gl_dispatch_stub_572, gl_dispatch_stub_572, NULL, _gloffset_PixelTexGenParameteriSGIS),
-    NAME_FUNC_OFFSET( 9250, gl_dispatch_stub_573, gl_dispatch_stub_573, NULL, _gloffset_PixelTexGenParameterivSGIS),
-    NAME_FUNC_OFFSET( 9279, gl_dispatch_stub_574, gl_dispatch_stub_574, NULL, _gloffset_SampleMaskSGIS),
-    NAME_FUNC_OFFSET( 9296, gl_dispatch_stub_575, gl_dispatch_stub_575, NULL, _gloffset_SamplePatternSGIS),
-    NAME_FUNC_OFFSET( 9316, glColorPointerEXT, glColorPointerEXT, NULL, _gloffset_ColorPointerEXT),
-    NAME_FUNC_OFFSET( 9334, glEdgeFlagPointerEXT, glEdgeFlagPointerEXT, NULL, _gloffset_EdgeFlagPointerEXT),
-    NAME_FUNC_OFFSET( 9355, glIndexPointerEXT, glIndexPointerEXT, NULL, _gloffset_IndexPointerEXT),
-    NAME_FUNC_OFFSET( 9373, glNormalPointerEXT, glNormalPointerEXT, NULL, _gloffset_NormalPointerEXT),
-    NAME_FUNC_OFFSET( 9392, glTexCoordPointerEXT, glTexCoordPointerEXT, NULL, _gloffset_TexCoordPointerEXT),
-    NAME_FUNC_OFFSET( 9413, glVertexPointerEXT, glVertexPointerEXT, NULL, _gloffset_VertexPointerEXT),
-    NAME_FUNC_OFFSET( 9432, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET( 9453, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET( 9475, glLockArraysEXT, glLockArraysEXT, NULL, _gloffset_LockArraysEXT),
-    NAME_FUNC_OFFSET( 9491, glUnlockArraysEXT, glUnlockArraysEXT, NULL, _gloffset_UnlockArraysEXT),
-    NAME_FUNC_OFFSET( 9509, gl_dispatch_stub_586, gl_dispatch_stub_586, NULL, _gloffset_CullParameterdvEXT),
-    NAME_FUNC_OFFSET( 9530, gl_dispatch_stub_587, gl_dispatch_stub_587, NULL, _gloffset_CullParameterfvEXT),
-    NAME_FUNC_OFFSET( 9551, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
-    NAME_FUNC_OFFSET( 9573, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
-    NAME_FUNC_OFFSET( 9596, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
-    NAME_FUNC_OFFSET( 9618, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
-    NAME_FUNC_OFFSET( 9641, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
-    NAME_FUNC_OFFSET( 9663, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
-    NAME_FUNC_OFFSET( 9686, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
-    NAME_FUNC_OFFSET( 9708, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
-    NAME_FUNC_OFFSET( 9731, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
-    NAME_FUNC_OFFSET( 9753, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
-    NAME_FUNC_OFFSET( 9776, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
-    NAME_FUNC_OFFSET( 9799, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
-    NAME_FUNC_OFFSET( 9823, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
-    NAME_FUNC_OFFSET( 9846, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
-    NAME_FUNC_OFFSET( 9870, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
-    NAME_FUNC_OFFSET( 9893, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
-    NAME_FUNC_OFFSET( 9917, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
-    NAME_FUNC_OFFSET( 9944, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
-    NAME_FUNC_OFFSET( 9965, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
-    NAME_FUNC_OFFSET( 9988, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
-    NAME_FUNC_OFFSET(10009, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
-    NAME_FUNC_OFFSET(10024, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
-    NAME_FUNC_OFFSET(10040, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
-    NAME_FUNC_OFFSET(10055, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
-    NAME_FUNC_OFFSET(10071, gl_dispatch_stub_612, gl_dispatch_stub_612, NULL, _gloffset_PixelTexGenSGIX),
-    NAME_FUNC_OFFSET(10089, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
-    NAME_FUNC_OFFSET(10112, glFlushVertexArrayRangeNV, glFlushVertexArrayRangeNV, NULL, _gloffset_FlushVertexArrayRangeNV),
-    NAME_FUNC_OFFSET(10138, glVertexArrayRangeNV, glVertexArrayRangeNV, NULL, _gloffset_VertexArrayRangeNV),
-    NAME_FUNC_OFFSET(10159, glCombinerInputNV, glCombinerInputNV, NULL, _gloffset_CombinerInputNV),
-    NAME_FUNC_OFFSET(10177, glCombinerOutputNV, glCombinerOutputNV, NULL, _gloffset_CombinerOutputNV),
-    NAME_FUNC_OFFSET(10196, glCombinerParameterfNV, glCombinerParameterfNV, NULL, _gloffset_CombinerParameterfNV),
-    NAME_FUNC_OFFSET(10219, glCombinerParameterfvNV, glCombinerParameterfvNV, NULL, _gloffset_CombinerParameterfvNV),
-    NAME_FUNC_OFFSET(10243, glCombinerParameteriNV, glCombinerParameteriNV, NULL, _gloffset_CombinerParameteriNV),
-    NAME_FUNC_OFFSET(10266, glCombinerParameterivNV, glCombinerParameterivNV, NULL, _gloffset_CombinerParameterivNV),
-    NAME_FUNC_OFFSET(10290, glFinalCombinerInputNV, glFinalCombinerInputNV, NULL, _gloffset_FinalCombinerInputNV),
-    NAME_FUNC_OFFSET(10313, glGetCombinerInputParameterfvNV, glGetCombinerInputParameterfvNV, NULL, _gloffset_GetCombinerInputParameterfvNV),
-    NAME_FUNC_OFFSET(10345, glGetCombinerInputParameterivNV, glGetCombinerInputParameterivNV, NULL, _gloffset_GetCombinerInputParameterivNV),
-    NAME_FUNC_OFFSET(10377, glGetCombinerOutputParameterfvNV, glGetCombinerOutputParameterfvNV, NULL, _gloffset_GetCombinerOutputParameterfvNV),
-    NAME_FUNC_OFFSET(10410, glGetCombinerOutputParameterivNV, glGetCombinerOutputParameterivNV, NULL, _gloffset_GetCombinerOutputParameterivNV),
-    NAME_FUNC_OFFSET(10443, glGetFinalCombinerInputParameterfvNV, glGetFinalCombinerInputParameterfvNV, NULL, _gloffset_GetFinalCombinerInputParameterfvNV),
-    NAME_FUNC_OFFSET(10480, glGetFinalCombinerInputParameterivNV, glGetFinalCombinerInputParameterivNV, NULL, _gloffset_GetFinalCombinerInputParameterivNV),
-    NAME_FUNC_OFFSET(10517, glResizeBuffersMESA, glResizeBuffersMESA, NULL, _gloffset_ResizeBuffersMESA),
-    NAME_FUNC_OFFSET(10537, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
-    NAME_FUNC_OFFSET(10555, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
-    NAME_FUNC_OFFSET(10574, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
-    NAME_FUNC_OFFSET(10592, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
-    NAME_FUNC_OFFSET(10611, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
-    NAME_FUNC_OFFSET(10629, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
-    NAME_FUNC_OFFSET(10648, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
-    NAME_FUNC_OFFSET(10666, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
-    NAME_FUNC_OFFSET(10685, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
-    NAME_FUNC_OFFSET(10703, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
-    NAME_FUNC_OFFSET(10722, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
-    NAME_FUNC_OFFSET(10740, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
-    NAME_FUNC_OFFSET(10759, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
-    NAME_FUNC_OFFSET(10777, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
-    NAME_FUNC_OFFSET(10796, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
-    NAME_FUNC_OFFSET(10814, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
-    NAME_FUNC_OFFSET(10833, glWindowPos4dMESA, glWindowPos4dMESA, NULL, _gloffset_WindowPos4dMESA),
-    NAME_FUNC_OFFSET(10851, glWindowPos4dvMESA, glWindowPos4dvMESA, NULL, _gloffset_WindowPos4dvMESA),
-    NAME_FUNC_OFFSET(10870, glWindowPos4fMESA, glWindowPos4fMESA, NULL, _gloffset_WindowPos4fMESA),
-    NAME_FUNC_OFFSET(10888, glWindowPos4fvMESA, glWindowPos4fvMESA, NULL, _gloffset_WindowPos4fvMESA),
-    NAME_FUNC_OFFSET(10907, glWindowPos4iMESA, glWindowPos4iMESA, NULL, _gloffset_WindowPos4iMESA),
-    NAME_FUNC_OFFSET(10925, glWindowPos4ivMESA, glWindowPos4ivMESA, NULL, _gloffset_WindowPos4ivMESA),
-    NAME_FUNC_OFFSET(10944, glWindowPos4sMESA, glWindowPos4sMESA, NULL, _gloffset_WindowPos4sMESA),
-    NAME_FUNC_OFFSET(10962, glWindowPos4svMESA, glWindowPos4svMESA, NULL, _gloffset_WindowPos4svMESA),
-    NAME_FUNC_OFFSET(10981, gl_dispatch_stub_654, gl_dispatch_stub_654, NULL, _gloffset_MultiModeDrawArraysIBM),
-    NAME_FUNC_OFFSET(11006, gl_dispatch_stub_655, gl_dispatch_stub_655, NULL, _gloffset_MultiModeDrawElementsIBM),
-    NAME_FUNC_OFFSET(11033, gl_dispatch_stub_656, gl_dispatch_stub_656, NULL, _gloffset_DeleteFencesNV),
-    NAME_FUNC_OFFSET(11050, gl_dispatch_stub_657, gl_dispatch_stub_657, NULL, _gloffset_FinishFenceNV),
-    NAME_FUNC_OFFSET(11066, gl_dispatch_stub_658, gl_dispatch_stub_658, NULL, _gloffset_GenFencesNV),
-    NAME_FUNC_OFFSET(11080, gl_dispatch_stub_659, gl_dispatch_stub_659, NULL, _gloffset_GetFenceivNV),
-    NAME_FUNC_OFFSET(11095, gl_dispatch_stub_660, gl_dispatch_stub_660, NULL, _gloffset_IsFenceNV),
-    NAME_FUNC_OFFSET(11107, gl_dispatch_stub_661, gl_dispatch_stub_661, NULL, _gloffset_SetFenceNV),
-    NAME_FUNC_OFFSET(11120, gl_dispatch_stub_662, gl_dispatch_stub_662, NULL, _gloffset_TestFenceNV),
-    NAME_FUNC_OFFSET(11134, glAreProgramsResidentNV, glAreProgramsResidentNV, NULL, _gloffset_AreProgramsResidentNV),
-    NAME_FUNC_OFFSET(11158, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
-    NAME_FUNC_OFFSET(11174, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
-    NAME_FUNC_OFFSET(11193, glExecuteProgramNV, glExecuteProgramNV, NULL, _gloffset_ExecuteProgramNV),
-    NAME_FUNC_OFFSET(11212, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
-    NAME_FUNC_OFFSET(11228, glGetProgramParameterdvNV, glGetProgramParameterdvNV, NULL, _gloffset_GetProgramParameterdvNV),
-    NAME_FUNC_OFFSET(11254, glGetProgramParameterfvNV, glGetProgramParameterfvNV, NULL, _gloffset_GetProgramParameterfvNV),
-    NAME_FUNC_OFFSET(11280, glGetProgramStringNV, glGetProgramStringNV, NULL, _gloffset_GetProgramStringNV),
-    NAME_FUNC_OFFSET(11301, glGetProgramivNV, glGetProgramivNV, NULL, _gloffset_GetProgramivNV),
-    NAME_FUNC_OFFSET(11318, glGetTrackMatrixivNV, glGetTrackMatrixivNV, NULL, _gloffset_GetTrackMatrixivNV),
-    NAME_FUNC_OFFSET(11339, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
-    NAME_FUNC_OFFSET(11367, glGetVertexAttribdvNV, glGetVertexAttribdvNV, NULL, _gloffset_GetVertexAttribdvNV),
-    NAME_FUNC_OFFSET(11389, glGetVertexAttribfvNV, glGetVertexAttribfvNV, NULL, _gloffset_GetVertexAttribfvNV),
-    NAME_FUNC_OFFSET(11411, glGetVertexAttribivNV, glGetVertexAttribivNV, NULL, _gloffset_GetVertexAttribivNV),
-    NAME_FUNC_OFFSET(11433, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
-    NAME_FUNC_OFFSET(11447, glLoadProgramNV, glLoadProgramNV, NULL, _gloffset_LoadProgramNV),
-    NAME_FUNC_OFFSET(11463, glProgramParameters4dvNV, glProgramParameters4dvNV, NULL, _gloffset_ProgramParameters4dvNV),
-    NAME_FUNC_OFFSET(11488, glProgramParameters4fvNV, glProgramParameters4fvNV, NULL, _gloffset_ProgramParameters4fvNV),
-    NAME_FUNC_OFFSET(11513, glRequestResidentProgramsNV, glRequestResidentProgramsNV, NULL, _gloffset_RequestResidentProgramsNV),
-    NAME_FUNC_OFFSET(11541, glTrackMatrixNV, glTrackMatrixNV, NULL, _gloffset_TrackMatrixNV),
-    NAME_FUNC_OFFSET(11557, glVertexAttrib1dNV, glVertexAttrib1dNV, NULL, _gloffset_VertexAttrib1dNV),
-    NAME_FUNC_OFFSET(11576, glVertexAttrib1dvNV, glVertexAttrib1dvNV, NULL, _gloffset_VertexAttrib1dvNV),
-    NAME_FUNC_OFFSET(11596, glVertexAttrib1fNV, glVertexAttrib1fNV, NULL, _gloffset_VertexAttrib1fNV),
-    NAME_FUNC_OFFSET(11615, glVertexAttrib1fvNV, glVertexAttrib1fvNV, NULL, _gloffset_VertexAttrib1fvNV),
-    NAME_FUNC_OFFSET(11635, glVertexAttrib1sNV, glVertexAttrib1sNV, NULL, _gloffset_VertexAttrib1sNV),
-    NAME_FUNC_OFFSET(11654, glVertexAttrib1svNV, glVertexAttrib1svNV, NULL, _gloffset_VertexAttrib1svNV),
-    NAME_FUNC_OFFSET(11674, glVertexAttrib2dNV, glVertexAttrib2dNV, NULL, _gloffset_VertexAttrib2dNV),
-    NAME_FUNC_OFFSET(11693, glVertexAttrib2dvNV, glVertexAttrib2dvNV, NULL, _gloffset_VertexAttrib2dvNV),
-    NAME_FUNC_OFFSET(11713, glVertexAttrib2fNV, glVertexAttrib2fNV, NULL, _gloffset_VertexAttrib2fNV),
-    NAME_FUNC_OFFSET(11732, glVertexAttrib2fvNV, glVertexAttrib2fvNV, NULL, _gloffset_VertexAttrib2fvNV),
-    NAME_FUNC_OFFSET(11752, glVertexAttrib2sNV, glVertexAttrib2sNV, NULL, _gloffset_VertexAttrib2sNV),
-    NAME_FUNC_OFFSET(11771, glVertexAttrib2svNV, glVertexAttrib2svNV, NULL, _gloffset_VertexAttrib2svNV),
-    NAME_FUNC_OFFSET(11791, glVertexAttrib3dNV, glVertexAttrib3dNV, NULL, _gloffset_VertexAttrib3dNV),
-    NAME_FUNC_OFFSET(11810, glVertexAttrib3dvNV, glVertexAttrib3dvNV, NULL, _gloffset_VertexAttrib3dvNV),
-    NAME_FUNC_OFFSET(11830, glVertexAttrib3fNV, glVertexAttrib3fNV, NULL, _gloffset_VertexAttrib3fNV),
-    NAME_FUNC_OFFSET(11849, glVertexAttrib3fvNV, glVertexAttrib3fvNV, NULL, _gloffset_VertexAttrib3fvNV),
-    NAME_FUNC_OFFSET(11869, glVertexAttrib3sNV, glVertexAttrib3sNV, NULL, _gloffset_VertexAttrib3sNV),
-    NAME_FUNC_OFFSET(11888, glVertexAttrib3svNV, glVertexAttrib3svNV, NULL, _gloffset_VertexAttrib3svNV),
-    NAME_FUNC_OFFSET(11908, glVertexAttrib4dNV, glVertexAttrib4dNV, NULL, _gloffset_VertexAttrib4dNV),
-    NAME_FUNC_OFFSET(11927, glVertexAttrib4dvNV, glVertexAttrib4dvNV, NULL, _gloffset_VertexAttrib4dvNV),
-    NAME_FUNC_OFFSET(11947, glVertexAttrib4fNV, glVertexAttrib4fNV, NULL, _gloffset_VertexAttrib4fNV),
-    NAME_FUNC_OFFSET(11966, glVertexAttrib4fvNV, glVertexAttrib4fvNV, NULL, _gloffset_VertexAttrib4fvNV),
-    NAME_FUNC_OFFSET(11986, glVertexAttrib4sNV, glVertexAttrib4sNV, NULL, _gloffset_VertexAttrib4sNV),
-    NAME_FUNC_OFFSET(12005, glVertexAttrib4svNV, glVertexAttrib4svNV, NULL, _gloffset_VertexAttrib4svNV),
-    NAME_FUNC_OFFSET(12025, glVertexAttrib4ubNV, glVertexAttrib4ubNV, NULL, _gloffset_VertexAttrib4ubNV),
-    NAME_FUNC_OFFSET(12045, glVertexAttrib4ubvNV, glVertexAttrib4ubvNV, NULL, _gloffset_VertexAttrib4ubvNV),
-    NAME_FUNC_OFFSET(12066, glVertexAttribPointerNV, glVertexAttribPointerNV, NULL, _gloffset_VertexAttribPointerNV),
-    NAME_FUNC_OFFSET(12090, glVertexAttribs1dvNV, glVertexAttribs1dvNV, NULL, _gloffset_VertexAttribs1dvNV),
-    NAME_FUNC_OFFSET(12111, glVertexAttribs1fvNV, glVertexAttribs1fvNV, NULL, _gloffset_VertexAttribs1fvNV),
-    NAME_FUNC_OFFSET(12132, glVertexAttribs1svNV, glVertexAttribs1svNV, NULL, _gloffset_VertexAttribs1svNV),
-    NAME_FUNC_OFFSET(12153, glVertexAttribs2dvNV, glVertexAttribs2dvNV, NULL, _gloffset_VertexAttribs2dvNV),
-    NAME_FUNC_OFFSET(12174, glVertexAttribs2fvNV, glVertexAttribs2fvNV, NULL, _gloffset_VertexAttribs2fvNV),
-    NAME_FUNC_OFFSET(12195, glVertexAttribs2svNV, glVertexAttribs2svNV, NULL, _gloffset_VertexAttribs2svNV),
-    NAME_FUNC_OFFSET(12216, glVertexAttribs3dvNV, glVertexAttribs3dvNV, NULL, _gloffset_VertexAttribs3dvNV),
-    NAME_FUNC_OFFSET(12237, glVertexAttribs3fvNV, glVertexAttribs3fvNV, NULL, _gloffset_VertexAttribs3fvNV),
-    NAME_FUNC_OFFSET(12258, glVertexAttribs3svNV, glVertexAttribs3svNV, NULL, _gloffset_VertexAttribs3svNV),
-    NAME_FUNC_OFFSET(12279, glVertexAttribs4dvNV, glVertexAttribs4dvNV, NULL, _gloffset_VertexAttribs4dvNV),
-    NAME_FUNC_OFFSET(12300, glVertexAttribs4fvNV, glVertexAttribs4fvNV, NULL, _gloffset_VertexAttribs4fvNV),
-    NAME_FUNC_OFFSET(12321, glVertexAttribs4svNV, glVertexAttribs4svNV, NULL, _gloffset_VertexAttribs4svNV),
-    NAME_FUNC_OFFSET(12342, glVertexAttribs4ubvNV, glVertexAttribs4ubvNV, NULL, _gloffset_VertexAttribs4ubvNV),
-    NAME_FUNC_OFFSET(12364, glGetTexBumpParameterfvATI, glGetTexBumpParameterfvATI, NULL, _gloffset_GetTexBumpParameterfvATI),
-    NAME_FUNC_OFFSET(12391, glGetTexBumpParameterivATI, glGetTexBumpParameterivATI, NULL, _gloffset_GetTexBumpParameterivATI),
-    NAME_FUNC_OFFSET(12418, glTexBumpParameterfvATI, glTexBumpParameterfvATI, NULL, _gloffset_TexBumpParameterfvATI),
-    NAME_FUNC_OFFSET(12442, glTexBumpParameterivATI, glTexBumpParameterivATI, NULL, _gloffset_TexBumpParameterivATI),
-    NAME_FUNC_OFFSET(12466, glAlphaFragmentOp1ATI, glAlphaFragmentOp1ATI, NULL, _gloffset_AlphaFragmentOp1ATI),
-    NAME_FUNC_OFFSET(12488, glAlphaFragmentOp2ATI, glAlphaFragmentOp2ATI, NULL, _gloffset_AlphaFragmentOp2ATI),
-    NAME_FUNC_OFFSET(12510, glAlphaFragmentOp3ATI, glAlphaFragmentOp3ATI, NULL, _gloffset_AlphaFragmentOp3ATI),
-    NAME_FUNC_OFFSET(12532, glBeginFragmentShaderATI, glBeginFragmentShaderATI, NULL, _gloffset_BeginFragmentShaderATI),
-    NAME_FUNC_OFFSET(12557, glBindFragmentShaderATI, glBindFragmentShaderATI, NULL, _gloffset_BindFragmentShaderATI),
-    NAME_FUNC_OFFSET(12581, glColorFragmentOp1ATI, glColorFragmentOp1ATI, NULL, _gloffset_ColorFragmentOp1ATI),
-    NAME_FUNC_OFFSET(12603, glColorFragmentOp2ATI, glColorFragmentOp2ATI, NULL, _gloffset_ColorFragmentOp2ATI),
-    NAME_FUNC_OFFSET(12625, glColorFragmentOp3ATI, glColorFragmentOp3ATI, NULL, _gloffset_ColorFragmentOp3ATI),
-    NAME_FUNC_OFFSET(12647, glDeleteFragmentShaderATI, glDeleteFragmentShaderATI, NULL, _gloffset_DeleteFragmentShaderATI),
-    NAME_FUNC_OFFSET(12673, glEndFragmentShaderATI, glEndFragmentShaderATI, NULL, _gloffset_EndFragmentShaderATI),
-    NAME_FUNC_OFFSET(12696, glGenFragmentShadersATI, glGenFragmentShadersATI, NULL, _gloffset_GenFragmentShadersATI),
-    NAME_FUNC_OFFSET(12720, glPassTexCoordATI, glPassTexCoordATI, NULL, _gloffset_PassTexCoordATI),
-    NAME_FUNC_OFFSET(12738, glSampleMapATI, glSampleMapATI, NULL, _gloffset_SampleMapATI),
-    NAME_FUNC_OFFSET(12753, glSetFragmentShaderConstantATI, glSetFragmentShaderConstantATI, NULL, _gloffset_SetFragmentShaderConstantATI),
-    NAME_FUNC_OFFSET(12784, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
-    NAME_FUNC_OFFSET(12804, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
-    NAME_FUNC_OFFSET(12825, gl_dispatch_stub_743, gl_dispatch_stub_743, NULL, _gloffset_ActiveStencilFaceEXT),
-    NAME_FUNC_OFFSET(12848, gl_dispatch_stub_744, gl_dispatch_stub_744, NULL, _gloffset_BindVertexArrayAPPLE),
-    NAME_FUNC_OFFSET(12871, gl_dispatch_stub_745, gl_dispatch_stub_745, NULL, _gloffset_DeleteVertexArraysAPPLE),
-    NAME_FUNC_OFFSET(12897, gl_dispatch_stub_746, gl_dispatch_stub_746, NULL, _gloffset_GenVertexArraysAPPLE),
-    NAME_FUNC_OFFSET(12920, gl_dispatch_stub_747, gl_dispatch_stub_747, NULL, _gloffset_IsVertexArrayAPPLE),
-    NAME_FUNC_OFFSET(12941, glGetProgramNamedParameterdvNV, glGetProgramNamedParameterdvNV, NULL, _gloffset_GetProgramNamedParameterdvNV),
-    NAME_FUNC_OFFSET(12972, glGetProgramNamedParameterfvNV, glGetProgramNamedParameterfvNV, NULL, _gloffset_GetProgramNamedParameterfvNV),
-    NAME_FUNC_OFFSET(13003, glProgramNamedParameter4dNV, glProgramNamedParameter4dNV, NULL, _gloffset_ProgramNamedParameter4dNV),
-    NAME_FUNC_OFFSET(13031, glProgramNamedParameter4dvNV, glProgramNamedParameter4dvNV, NULL, _gloffset_ProgramNamedParameter4dvNV),
-    NAME_FUNC_OFFSET(13060, glProgramNamedParameter4fNV, glProgramNamedParameter4fNV, NULL, _gloffset_ProgramNamedParameter4fNV),
-    NAME_FUNC_OFFSET(13088, glProgramNamedParameter4fvNV, glProgramNamedParameter4fvNV, NULL, _gloffset_ProgramNamedParameter4fvNV),
-    NAME_FUNC_OFFSET(13117, gl_dispatch_stub_754, gl_dispatch_stub_754, NULL, _gloffset_DepthBoundsEXT),
-    NAME_FUNC_OFFSET(13134, gl_dispatch_stub_755, gl_dispatch_stub_755, NULL, _gloffset_BlendEquationSeparateEXT),
-    NAME_FUNC_OFFSET(13161, glBindFramebufferEXT, glBindFramebufferEXT, NULL, _gloffset_BindFramebufferEXT),
-    NAME_FUNC_OFFSET(13182, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, _gloffset_BindRenderbufferEXT),
-    NAME_FUNC_OFFSET(13204, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, _gloffset_CheckFramebufferStatusEXT),
-    NAME_FUNC_OFFSET(13232, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, _gloffset_DeleteFramebuffersEXT),
-    NAME_FUNC_OFFSET(13256, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, _gloffset_DeleteRenderbuffersEXT),
-    NAME_FUNC_OFFSET(13281, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, _gloffset_FramebufferRenderbufferEXT),
-    NAME_FUNC_OFFSET(13310, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, _gloffset_FramebufferTexture1DEXT),
-    NAME_FUNC_OFFSET(13336, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, _gloffset_FramebufferTexture2DEXT),
-    NAME_FUNC_OFFSET(13362, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, _gloffset_FramebufferTexture3DEXT),
-    NAME_FUNC_OFFSET(13388, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, _gloffset_GenFramebuffersEXT),
-    NAME_FUNC_OFFSET(13409, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, _gloffset_GenRenderbuffersEXT),
-    NAME_FUNC_OFFSET(13431, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, _gloffset_GenerateMipmapEXT),
-    NAME_FUNC_OFFSET(13451, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, _gloffset_GetFramebufferAttachmentParameterivEXT),
-    NAME_FUNC_OFFSET(13492, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, _gloffset_GetRenderbufferParameterivEXT),
-    NAME_FUNC_OFFSET(13524, glIsFramebufferEXT, glIsFramebufferEXT, NULL, _gloffset_IsFramebufferEXT),
-    NAME_FUNC_OFFSET(13543, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, _gloffset_IsRenderbufferEXT),
-    NAME_FUNC_OFFSET(13563, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, _gloffset_RenderbufferStorageEXT),
-    NAME_FUNC_OFFSET(13588, gl_dispatch_stub_773, gl_dispatch_stub_773, NULL, _gloffset_BlitFramebufferEXT),
-    NAME_FUNC_OFFSET(13609, gl_dispatch_stub_774, gl_dispatch_stub_774, NULL, _gloffset_BufferParameteriAPPLE),
-    NAME_FUNC_OFFSET(13633, gl_dispatch_stub_775, gl_dispatch_stub_775, NULL, _gloffset_FlushMappedBufferRangeAPPLE),
-    NAME_FUNC_OFFSET(13663, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
-    NAME_FUNC_OFFSET(13692, glProvokingVertexEXT, glProvokingVertexEXT, NULL, _gloffset_ProvokingVertexEXT),
-    NAME_FUNC_OFFSET(13713, gl_dispatch_stub_778, gl_dispatch_stub_778, NULL, _gloffset_GetTexParameterPointervAPPLE),
-    NAME_FUNC_OFFSET(13744, gl_dispatch_stub_779, gl_dispatch_stub_779, NULL, _gloffset_TextureRangeAPPLE),
-    NAME_FUNC_OFFSET(13764, gl_dispatch_stub_780, gl_dispatch_stub_780, NULL, _gloffset_StencilFuncSeparateATI),
-    NAME_FUNC_OFFSET(13789, gl_dispatch_stub_781, gl_dispatch_stub_781, NULL, _gloffset_ProgramEnvParameters4fvEXT),
-    NAME_FUNC_OFFSET(13818, gl_dispatch_stub_782, gl_dispatch_stub_782, NULL, _gloffset_ProgramLocalParameters4fvEXT),
-    NAME_FUNC_OFFSET(13849, gl_dispatch_stub_783, gl_dispatch_stub_783, NULL, _gloffset_GetQueryObjecti64vEXT),
-    NAME_FUNC_OFFSET(13873, gl_dispatch_stub_784, gl_dispatch_stub_784, NULL, _gloffset_GetQueryObjectui64vEXT),
-    NAME_FUNC_OFFSET(13898, glArrayElement, glArrayElement, NULL, _gloffset_ArrayElement),
-    NAME_FUNC_OFFSET(13916, glBindTexture, glBindTexture, NULL, _gloffset_BindTexture),
-    NAME_FUNC_OFFSET(13933, glDrawArrays, glDrawArrays, NULL, _gloffset_DrawArrays),
-    NAME_FUNC_OFFSET(13949, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, _gloffset_AreTexturesResident),
-    NAME_FUNC_OFFSET(13974, glCopyTexImage1D, glCopyTexImage1D, NULL, _gloffset_CopyTexImage1D),
-    NAME_FUNC_OFFSET(13994, glCopyTexImage2D, glCopyTexImage2D, NULL, _gloffset_CopyTexImage2D),
-    NAME_FUNC_OFFSET(14014, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, _gloffset_CopyTexSubImage1D),
-    NAME_FUNC_OFFSET(14037, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, _gloffset_CopyTexSubImage2D),
-    NAME_FUNC_OFFSET(14060, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, _gloffset_DeleteTextures),
-    NAME_FUNC_OFFSET(14080, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, _gloffset_GenTextures),
-    NAME_FUNC_OFFSET(14097, glGetPointerv, glGetPointerv, NULL, _gloffset_GetPointerv),
-    NAME_FUNC_OFFSET(14114, glIsTexture, glIsTextureEXT, glIsTextureEXT, _gloffset_IsTexture),
-    NAME_FUNC_OFFSET(14129, glPrioritizeTextures, glPrioritizeTextures, NULL, _gloffset_PrioritizeTextures),
-    NAME_FUNC_OFFSET(14153, glTexSubImage1D, glTexSubImage1D, NULL, _gloffset_TexSubImage1D),
-    NAME_FUNC_OFFSET(14172, glTexSubImage2D, glTexSubImage2D, NULL, _gloffset_TexSubImage2D),
-    NAME_FUNC_OFFSET(14191, glBlendColor, glBlendColor, NULL, _gloffset_BlendColor),
-    NAME_FUNC_OFFSET(14207, glBlendEquation, glBlendEquation, NULL, _gloffset_BlendEquation),
-    NAME_FUNC_OFFSET(14226, glDrawRangeElements, glDrawRangeElements, NULL, _gloffset_DrawRangeElements),
-    NAME_FUNC_OFFSET(14249, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
-    NAME_FUNC_OFFSET(14265, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
-    NAME_FUNC_OFFSET(14281, glColorTableParameterfv, glColorTableParameterfv, NULL, _gloffset_ColorTableParameterfv),
-    NAME_FUNC_OFFSET(14308, glColorTableParameteriv, glColorTableParameteriv, NULL, _gloffset_ColorTableParameteriv),
-    NAME_FUNC_OFFSET(14335, glCopyColorTable, glCopyColorTable, NULL, _gloffset_CopyColorTable),
-    NAME_FUNC_OFFSET(14355, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
-    NAME_FUNC_OFFSET(14374, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
-    NAME_FUNC_OFFSET(14393, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
-    NAME_FUNC_OFFSET(14423, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
-    NAME_FUNC_OFFSET(14453, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
-    NAME_FUNC_OFFSET(14483, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
-    NAME_FUNC_OFFSET(14513, glColorSubTable, glColorSubTable, NULL, _gloffset_ColorSubTable),
-    NAME_FUNC_OFFSET(14532, glCopyColorSubTable, glCopyColorSubTable, NULL, _gloffset_CopyColorSubTable),
-    NAME_FUNC_OFFSET(14555, glConvolutionFilter1D, glConvolutionFilter1D, NULL, _gloffset_ConvolutionFilter1D),
-    NAME_FUNC_OFFSET(14580, glConvolutionFilter2D, glConvolutionFilter2D, NULL, _gloffset_ConvolutionFilter2D),
-    NAME_FUNC_OFFSET(14605, glConvolutionParameterf, glConvolutionParameterf, NULL, _gloffset_ConvolutionParameterf),
-    NAME_FUNC_OFFSET(14632, glConvolutionParameterfv, glConvolutionParameterfv, NULL, _gloffset_ConvolutionParameterfv),
-    NAME_FUNC_OFFSET(14660, glConvolutionParameteri, glConvolutionParameteri, NULL, _gloffset_ConvolutionParameteri),
-    NAME_FUNC_OFFSET(14687, glConvolutionParameteriv, glConvolutionParameteriv, NULL, _gloffset_ConvolutionParameteriv),
-    NAME_FUNC_OFFSET(14715, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, _gloffset_CopyConvolutionFilter1D),
-    NAME_FUNC_OFFSET(14744, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, _gloffset_CopyConvolutionFilter2D),
-    NAME_FUNC_OFFSET(14773, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, _gloffset_GetConvolutionFilter),
-    NAME_FUNC_OFFSET(14799, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, _gloffset_GetConvolutionParameterfv),
-    NAME_FUNC_OFFSET(14830, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, _gloffset_GetConvolutionParameteriv),
-    NAME_FUNC_OFFSET(14861, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, _gloffset_GetSeparableFilter),
-    NAME_FUNC_OFFSET(14885, glSeparableFilter2D, glSeparableFilter2D, NULL, _gloffset_SeparableFilter2D),
-    NAME_FUNC_OFFSET(14908, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, _gloffset_GetHistogram),
-    NAME_FUNC_OFFSET(14926, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, _gloffset_GetHistogramParameterfv),
-    NAME_FUNC_OFFSET(14955, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, _gloffset_GetHistogramParameteriv),
-    NAME_FUNC_OFFSET(14984, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, _gloffset_GetMinmax),
-    NAME_FUNC_OFFSET(14999, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, _gloffset_GetMinmaxParameterfv),
-    NAME_FUNC_OFFSET(15025, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, _gloffset_GetMinmaxParameteriv),
-    NAME_FUNC_OFFSET(15051, glHistogram, glHistogram, NULL, _gloffset_Histogram),
-    NAME_FUNC_OFFSET(15066, glMinmax, glMinmax, NULL, _gloffset_Minmax),
-    NAME_FUNC_OFFSET(15078, glResetHistogram, glResetHistogram, NULL, _gloffset_ResetHistogram),
-    NAME_FUNC_OFFSET(15098, glResetMinmax, glResetMinmax, NULL, _gloffset_ResetMinmax),
-    NAME_FUNC_OFFSET(15115, glTexImage3D, glTexImage3D, NULL, _gloffset_TexImage3D),
-    NAME_FUNC_OFFSET(15131, glTexSubImage3D, glTexSubImage3D, NULL, _gloffset_TexSubImage3D),
-    NAME_FUNC_OFFSET(15150, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, _gloffset_CopyTexSubImage3D),
-    NAME_FUNC_OFFSET(15173, glActiveTextureARB, glActiveTextureARB, NULL, _gloffset_ActiveTextureARB),
-    NAME_FUNC_OFFSET(15189, glClientActiveTextureARB, glClientActiveTextureARB, NULL, _gloffset_ClientActiveTextureARB),
-    NAME_FUNC_OFFSET(15211, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL, _gloffset_MultiTexCoord1dARB),
-    NAME_FUNC_OFFSET(15229, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL, _gloffset_MultiTexCoord1dvARB),
-    NAME_FUNC_OFFSET(15248, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, _gloffset_MultiTexCoord1fARB),
-    NAME_FUNC_OFFSET(15266, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, _gloffset_MultiTexCoord1fvARB),
-    NAME_FUNC_OFFSET(15285, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL, _gloffset_MultiTexCoord1iARB),
-    NAME_FUNC_OFFSET(15303, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL, _gloffset_MultiTexCoord1ivARB),
-    NAME_FUNC_OFFSET(15322, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL, _gloffset_MultiTexCoord1sARB),
-    NAME_FUNC_OFFSET(15340, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL, _gloffset_MultiTexCoord1svARB),
-    NAME_FUNC_OFFSET(15359, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL, _gloffset_MultiTexCoord2dARB),
-    NAME_FUNC_OFFSET(15377, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL, _gloffset_MultiTexCoord2dvARB),
-    NAME_FUNC_OFFSET(15396, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, _gloffset_MultiTexCoord2fARB),
-    NAME_FUNC_OFFSET(15414, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, _gloffset_MultiTexCoord2fvARB),
-    NAME_FUNC_OFFSET(15433, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL, _gloffset_MultiTexCoord2iARB),
-    NAME_FUNC_OFFSET(15451, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL, _gloffset_MultiTexCoord2ivARB),
-    NAME_FUNC_OFFSET(15470, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL, _gloffset_MultiTexCoord2sARB),
-    NAME_FUNC_OFFSET(15488, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL, _gloffset_MultiTexCoord2svARB),
-    NAME_FUNC_OFFSET(15507, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL, _gloffset_MultiTexCoord3dARB),
-    NAME_FUNC_OFFSET(15525, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL, _gloffset_MultiTexCoord3dvARB),
-    NAME_FUNC_OFFSET(15544, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, _gloffset_MultiTexCoord3fARB),
-    NAME_FUNC_OFFSET(15562, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, _gloffset_MultiTexCoord3fvARB),
-    NAME_FUNC_OFFSET(15581, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL, _gloffset_MultiTexCoord3iARB),
-    NAME_FUNC_OFFSET(15599, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL, _gloffset_MultiTexCoord3ivARB),
-    NAME_FUNC_OFFSET(15618, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL, _gloffset_MultiTexCoord3sARB),
-    NAME_FUNC_OFFSET(15636, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL, _gloffset_MultiTexCoord3svARB),
-    NAME_FUNC_OFFSET(15655, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL, _gloffset_MultiTexCoord4dARB),
-    NAME_FUNC_OFFSET(15673, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL, _gloffset_MultiTexCoord4dvARB),
-    NAME_FUNC_OFFSET(15692, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, _gloffset_MultiTexCoord4fARB),
-    NAME_FUNC_OFFSET(15710, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, _gloffset_MultiTexCoord4fvARB),
-    NAME_FUNC_OFFSET(15729, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL, _gloffset_MultiTexCoord4iARB),
-    NAME_FUNC_OFFSET(15747, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL, _gloffset_MultiTexCoord4ivARB),
-    NAME_FUNC_OFFSET(15766, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL, _gloffset_MultiTexCoord4sARB),
-    NAME_FUNC_OFFSET(15784, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL, _gloffset_MultiTexCoord4svARB),
-    NAME_FUNC_OFFSET(15803, glStencilOpSeparate, glStencilOpSeparate, NULL, _gloffset_StencilOpSeparate),
-    NAME_FUNC_OFFSET(15826, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, _gloffset_LoadTransposeMatrixdARB),
-    NAME_FUNC_OFFSET(15849, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, _gloffset_LoadTransposeMatrixfARB),
-    NAME_FUNC_OFFSET(15872, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, _gloffset_MultTransposeMatrixdARB),
-    NAME_FUNC_OFFSET(15895, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB, NULL, _gloffset_MultTransposeMatrixfARB),
-    NAME_FUNC_OFFSET(15918, glSampleCoverageARB, glSampleCoverageARB, NULL, _gloffset_SampleCoverageARB),
-    NAME_FUNC_OFFSET(15935, glCompressedTexImage1DARB, glCompressedTexImage1DARB, NULL, _gloffset_CompressedTexImage1DARB),
-    NAME_FUNC_OFFSET(15958, glCompressedTexImage2DARB, glCompressedTexImage2DARB, NULL, _gloffset_CompressedTexImage2DARB),
-    NAME_FUNC_OFFSET(15981, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, _gloffset_CompressedTexImage3DARB),
-    NAME_FUNC_OFFSET(16004, glCompressedTexSubImage1DARB, glCompressedTexSubImage1DARB, NULL, _gloffset_CompressedTexSubImage1DARB),
-    NAME_FUNC_OFFSET(16030, glCompressedTexSubImage2DARB, glCompressedTexSubImage2DARB, NULL, _gloffset_CompressedTexSubImage2DARB),
-    NAME_FUNC_OFFSET(16056, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, _gloffset_CompressedTexSubImage3DARB),
-    NAME_FUNC_OFFSET(16082, glGetCompressedTexImageARB, glGetCompressedTexImageARB, NULL, _gloffset_GetCompressedTexImageARB),
-    NAME_FUNC_OFFSET(16106, glDisableVertexAttribArrayARB, glDisableVertexAttribArrayARB, NULL, _gloffset_DisableVertexAttribArrayARB),
-    NAME_FUNC_OFFSET(16133, glEnableVertexAttribArrayARB, glEnableVertexAttribArrayARB, NULL, _gloffset_EnableVertexAttribArrayARB),
-    NAME_FUNC_OFFSET(16159, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL, _gloffset_GetVertexAttribdvARB),
-    NAME_FUNC_OFFSET(16179, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL, _gloffset_GetVertexAttribfvARB),
-    NAME_FUNC_OFFSET(16199, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL, _gloffset_GetVertexAttribivARB),
-    NAME_FUNC_OFFSET(16219, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, _gloffset_ProgramEnvParameter4dARB),
-    NAME_FUNC_OFFSET(16242, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, _gloffset_ProgramEnvParameter4dvARB),
-    NAME_FUNC_OFFSET(16266, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, _gloffset_ProgramEnvParameter4fARB),
-    NAME_FUNC_OFFSET(16289, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, _gloffset_ProgramEnvParameter4fvARB),
-    NAME_FUNC_OFFSET(16313, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, _gloffset_VertexAttrib1dARB),
-    NAME_FUNC_OFFSET(16330, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL, _gloffset_VertexAttrib1dvARB),
-    NAME_FUNC_OFFSET(16348, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, _gloffset_VertexAttrib1fARB),
-    NAME_FUNC_OFFSET(16365, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, _gloffset_VertexAttrib1fvARB),
-    NAME_FUNC_OFFSET(16383, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, _gloffset_VertexAttrib1sARB),
-    NAME_FUNC_OFFSET(16400, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL, _gloffset_VertexAttrib1svARB),
-    NAME_FUNC_OFFSET(16418, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, _gloffset_VertexAttrib2dARB),
-    NAME_FUNC_OFFSET(16435, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL, _gloffset_VertexAttrib2dvARB),
-    NAME_FUNC_OFFSET(16453, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, _gloffset_VertexAttrib2fARB),
-    NAME_FUNC_OFFSET(16470, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, _gloffset_VertexAttrib2fvARB),
-    NAME_FUNC_OFFSET(16488, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, _gloffset_VertexAttrib2sARB),
-    NAME_FUNC_OFFSET(16505, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL, _gloffset_VertexAttrib2svARB),
-    NAME_FUNC_OFFSET(16523, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, _gloffset_VertexAttrib3dARB),
-    NAME_FUNC_OFFSET(16540, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL, _gloffset_VertexAttrib3dvARB),
-    NAME_FUNC_OFFSET(16558, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, _gloffset_VertexAttrib3fARB),
-    NAME_FUNC_OFFSET(16575, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, _gloffset_VertexAttrib3fvARB),
-    NAME_FUNC_OFFSET(16593, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, _gloffset_VertexAttrib3sARB),
-    NAME_FUNC_OFFSET(16610, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL, _gloffset_VertexAttrib3svARB),
-    NAME_FUNC_OFFSET(16628, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL, _gloffset_VertexAttrib4NbvARB),
-    NAME_FUNC_OFFSET(16647, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL, _gloffset_VertexAttrib4NivARB),
-    NAME_FUNC_OFFSET(16666, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL, _gloffset_VertexAttrib4NsvARB),
-    NAME_FUNC_OFFSET(16685, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL, _gloffset_VertexAttrib4NubARB),
-    NAME_FUNC_OFFSET(16704, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, _gloffset_VertexAttrib4NubvARB),
-    NAME_FUNC_OFFSET(16724, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, _gloffset_VertexAttrib4NuivARB),
-    NAME_FUNC_OFFSET(16744, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, _gloffset_VertexAttrib4NusvARB),
-    NAME_FUNC_OFFSET(16764, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, _gloffset_VertexAttrib4bvARB),
-    NAME_FUNC_OFFSET(16782, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, _gloffset_VertexAttrib4dARB),
-    NAME_FUNC_OFFSET(16799, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, _gloffset_VertexAttrib4dvARB),
-    NAME_FUNC_OFFSET(16817, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, _gloffset_VertexAttrib4fARB),
-    NAME_FUNC_OFFSET(16834, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, _gloffset_VertexAttrib4fvARB),
-    NAME_FUNC_OFFSET(16852, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, _gloffset_VertexAttrib4ivARB),
-    NAME_FUNC_OFFSET(16870, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, _gloffset_VertexAttrib4sARB),
-    NAME_FUNC_OFFSET(16887, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, _gloffset_VertexAttrib4svARB),
-    NAME_FUNC_OFFSET(16905, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, _gloffset_VertexAttrib4ubvARB),
-    NAME_FUNC_OFFSET(16924, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, _gloffset_VertexAttrib4uivARB),
-    NAME_FUNC_OFFSET(16943, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, _gloffset_VertexAttrib4usvARB),
-    NAME_FUNC_OFFSET(16962, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, _gloffset_VertexAttribPointerARB),
-    NAME_FUNC_OFFSET(16984, glBindBufferARB, glBindBufferARB, NULL, _gloffset_BindBufferARB),
-    NAME_FUNC_OFFSET(16997, glBufferDataARB, glBufferDataARB, NULL, _gloffset_BufferDataARB),
-    NAME_FUNC_OFFSET(17010, glBufferSubDataARB, glBufferSubDataARB, NULL, _gloffset_BufferSubDataARB),
-    NAME_FUNC_OFFSET(17026, glDeleteBuffersARB, glDeleteBuffersARB, NULL, _gloffset_DeleteBuffersARB),
-    NAME_FUNC_OFFSET(17042, glGenBuffersARB, glGenBuffersARB, NULL, _gloffset_GenBuffersARB),
-    NAME_FUNC_OFFSET(17055, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, _gloffset_GetBufferParameterivARB),
-    NAME_FUNC_OFFSET(17078, glGetBufferPointervARB, glGetBufferPointervARB, NULL, _gloffset_GetBufferPointervARB),
-    NAME_FUNC_OFFSET(17098, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, _gloffset_GetBufferSubDataARB),
-    NAME_FUNC_OFFSET(17117, glIsBufferARB, glIsBufferARB, NULL, _gloffset_IsBufferARB),
-    NAME_FUNC_OFFSET(17128, glMapBufferARB, glMapBufferARB, NULL, _gloffset_MapBufferARB),
-    NAME_FUNC_OFFSET(17140, glUnmapBufferARB, glUnmapBufferARB, NULL, _gloffset_UnmapBufferARB),
-    NAME_FUNC_OFFSET(17154, glBeginQueryARB, glBeginQueryARB, NULL, _gloffset_BeginQueryARB),
-    NAME_FUNC_OFFSET(17167, glDeleteQueriesARB, glDeleteQueriesARB, NULL, _gloffset_DeleteQueriesARB),
-    NAME_FUNC_OFFSET(17183, glEndQueryARB, glEndQueryARB, NULL, _gloffset_EndQueryARB),
-    NAME_FUNC_OFFSET(17194, glGenQueriesARB, glGenQueriesARB, NULL, _gloffset_GenQueriesARB),
-    NAME_FUNC_OFFSET(17207, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, _gloffset_GetQueryObjectivARB),
-    NAME_FUNC_OFFSET(17226, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, _gloffset_GetQueryObjectuivARB),
-    NAME_FUNC_OFFSET(17246, glGetQueryivARB, glGetQueryivARB, NULL, _gloffset_GetQueryivARB),
-    NAME_FUNC_OFFSET(17259, glIsQueryARB, glIsQueryARB, NULL, _gloffset_IsQueryARB),
-    NAME_FUNC_OFFSET(17269, glCompileShaderARB, glCompileShaderARB, NULL, _gloffset_CompileShaderARB),
-    NAME_FUNC_OFFSET(17285, glGetActiveUniformARB, glGetActiveUniformARB, NULL, _gloffset_GetActiveUniformARB),
-    NAME_FUNC_OFFSET(17304, glGetShaderSourceARB, glGetShaderSourceARB, NULL, _gloffset_GetShaderSourceARB),
-    NAME_FUNC_OFFSET(17322, glGetUniformLocationARB, glGetUniformLocationARB, NULL, _gloffset_GetUniformLocationARB),
-    NAME_FUNC_OFFSET(17343, glGetUniformfvARB, glGetUniformfvARB, NULL, _gloffset_GetUniformfvARB),
-    NAME_FUNC_OFFSET(17358, glGetUniformivARB, glGetUniformivARB, NULL, _gloffset_GetUniformivARB),
-    NAME_FUNC_OFFSET(17373, glLinkProgramARB, glLinkProgramARB, NULL, _gloffset_LinkProgramARB),
-    NAME_FUNC_OFFSET(17387, glShaderSourceARB, glShaderSourceARB, NULL, _gloffset_ShaderSourceARB),
-    NAME_FUNC_OFFSET(17402, glUniform1fARB, glUniform1fARB, NULL, _gloffset_Uniform1fARB),
-    NAME_FUNC_OFFSET(17414, glUniform1fvARB, glUniform1fvARB, NULL, _gloffset_Uniform1fvARB),
-    NAME_FUNC_OFFSET(17427, glUniform1iARB, glUniform1iARB, NULL, _gloffset_Uniform1iARB),
-    NAME_FUNC_OFFSET(17439, glUniform1ivARB, glUniform1ivARB, NULL, _gloffset_Uniform1ivARB),
-    NAME_FUNC_OFFSET(17452, glUniform2fARB, glUniform2fARB, NULL, _gloffset_Uniform2fARB),
-    NAME_FUNC_OFFSET(17464, glUniform2fvARB, glUniform2fvARB, NULL, _gloffset_Uniform2fvARB),
-    NAME_FUNC_OFFSET(17477, glUniform2iARB, glUniform2iARB, NULL, _gloffset_Uniform2iARB),
-    NAME_FUNC_OFFSET(17489, glUniform2ivARB, glUniform2ivARB, NULL, _gloffset_Uniform2ivARB),
-    NAME_FUNC_OFFSET(17502, glUniform3fARB, glUniform3fARB, NULL, _gloffset_Uniform3fARB),
-    NAME_FUNC_OFFSET(17514, glUniform3fvARB, glUniform3fvARB, NULL, _gloffset_Uniform3fvARB),
-    NAME_FUNC_OFFSET(17527, glUniform3iARB, glUniform3iARB, NULL, _gloffset_Uniform3iARB),
-    NAME_FUNC_OFFSET(17539, glUniform3ivARB, glUniform3ivARB, NULL, _gloffset_Uniform3ivARB),
-    NAME_FUNC_OFFSET(17552, glUniform4fARB, glUniform4fARB, NULL, _gloffset_Uniform4fARB),
-    NAME_FUNC_OFFSET(17564, glUniform4fvARB, glUniform4fvARB, NULL, _gloffset_Uniform4fvARB),
-    NAME_FUNC_OFFSET(17577, glUniform4iARB, glUniform4iARB, NULL, _gloffset_Uniform4iARB),
-    NAME_FUNC_OFFSET(17589, glUniform4ivARB, glUniform4ivARB, NULL, _gloffset_Uniform4ivARB),
-    NAME_FUNC_OFFSET(17602, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, _gloffset_UniformMatrix2fvARB),
-    NAME_FUNC_OFFSET(17621, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, _gloffset_UniformMatrix3fvARB),
-    NAME_FUNC_OFFSET(17640, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, _gloffset_UniformMatrix4fvARB),
-    NAME_FUNC_OFFSET(17659, glUseProgramObjectARB, glUseProgramObjectARB, NULL, _gloffset_UseProgramObjectARB),
-    NAME_FUNC_OFFSET(17672, glValidateProgramARB, glValidateProgramARB, NULL, _gloffset_ValidateProgramARB),
-    NAME_FUNC_OFFSET(17690, glBindAttribLocationARB, glBindAttribLocationARB, NULL, _gloffset_BindAttribLocationARB),
-    NAME_FUNC_OFFSET(17711, glGetActiveAttribARB, glGetActiveAttribARB, NULL, _gloffset_GetActiveAttribARB),
-    NAME_FUNC_OFFSET(17729, glGetAttribLocationARB, glGetAttribLocationARB, NULL, _gloffset_GetAttribLocationARB),
-    NAME_FUNC_OFFSET(17749, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
-    NAME_FUNC_OFFSET(17763, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
-    NAME_FUNC_OFFSET(17780, gl_dispatch_stub_574, gl_dispatch_stub_574, NULL, _gloffset_SampleMaskSGIS),
-    NAME_FUNC_OFFSET(17796, gl_dispatch_stub_575, gl_dispatch_stub_575, NULL, _gloffset_SamplePatternSGIS),
-    NAME_FUNC_OFFSET(17815, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(17833, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(17854, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(17876, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(17895, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(17917, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(17940, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
-    NAME_FUNC_OFFSET(17959, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
-    NAME_FUNC_OFFSET(17979, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
-    NAME_FUNC_OFFSET(17998, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
-    NAME_FUNC_OFFSET(18018, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
-    NAME_FUNC_OFFSET(18037, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
-    NAME_FUNC_OFFSET(18057, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
-    NAME_FUNC_OFFSET(18076, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
-    NAME_FUNC_OFFSET(18096, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
-    NAME_FUNC_OFFSET(18115, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
-    NAME_FUNC_OFFSET(18135, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
-    NAME_FUNC_OFFSET(18155, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
-    NAME_FUNC_OFFSET(18176, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
-    NAME_FUNC_OFFSET(18196, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
-    NAME_FUNC_OFFSET(18217, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
-    NAME_FUNC_OFFSET(18237, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
-    NAME_FUNC_OFFSET(18258, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
-    NAME_FUNC_OFFSET(18282, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
-    NAME_FUNC_OFFSET(18300, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
-    NAME_FUNC_OFFSET(18320, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
-    NAME_FUNC_OFFSET(18338, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
-    NAME_FUNC_OFFSET(18350, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
-    NAME_FUNC_OFFSET(18363, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
-    NAME_FUNC_OFFSET(18375, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
-    NAME_FUNC_OFFSET(18388, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
-    NAME_FUNC_OFFSET(18408, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
-    NAME_FUNC_OFFSET(18432, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
-    NAME_FUNC_OFFSET(18446, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
-    NAME_FUNC_OFFSET(18463, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
-    NAME_FUNC_OFFSET(18478, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
-    NAME_FUNC_OFFSET(18496, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
-    NAME_FUNC_OFFSET(18510, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
-    NAME_FUNC_OFFSET(18527, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
-    NAME_FUNC_OFFSET(18542, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
-    NAME_FUNC_OFFSET(18560, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
-    NAME_FUNC_OFFSET(18574, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
-    NAME_FUNC_OFFSET(18591, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
-    NAME_FUNC_OFFSET(18606, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
-    NAME_FUNC_OFFSET(18624, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
-    NAME_FUNC_OFFSET(18638, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
-    NAME_FUNC_OFFSET(18655, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
-    NAME_FUNC_OFFSET(18670, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
-    NAME_FUNC_OFFSET(18688, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
-    NAME_FUNC_OFFSET(18702, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
-    NAME_FUNC_OFFSET(18719, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
-    NAME_FUNC_OFFSET(18734, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
-    NAME_FUNC_OFFSET(18752, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
-    NAME_FUNC_OFFSET(18766, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
-    NAME_FUNC_OFFSET(18783, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
-    NAME_FUNC_OFFSET(18798, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
-    NAME_FUNC_OFFSET(18816, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
-    NAME_FUNC_OFFSET(18830, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
-    NAME_FUNC_OFFSET(18847, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
-    NAME_FUNC_OFFSET(18862, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
-    NAME_FUNC_OFFSET(18880, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
-    NAME_FUNC_OFFSET(18894, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
-    NAME_FUNC_OFFSET(18911, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
-    NAME_FUNC_OFFSET(18926, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
-    NAME_FUNC_OFFSET(18944, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
-    NAME_FUNC_OFFSET(18961, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
-    NAME_FUNC_OFFSET(18981, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
-    NAME_FUNC_OFFSET(18998, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
-    NAME_FUNC_OFFSET(19024, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
-    NAME_FUNC_OFFSET(19053, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
-    NAME_FUNC_OFFSET(19068, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
-    NAME_FUNC_OFFSET(19086, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
-    NAME_FUNC_OFFSET(19105, gl_dispatch_stub_745, gl_dispatch_stub_745, NULL, _gloffset_DeleteVertexArraysAPPLE),
-    NAME_FUNC_OFFSET(19126, gl_dispatch_stub_747, gl_dispatch_stub_747, NULL, _gloffset_IsVertexArrayAPPLE),
-    NAME_FUNC_OFFSET(19142, gl_dispatch_stub_755, gl_dispatch_stub_755, NULL, _gloffset_BlendEquationSeparateEXT),
-    NAME_FUNC_OFFSET(19166, gl_dispatch_stub_755, gl_dispatch_stub_755, NULL, _gloffset_BlendEquationSeparateEXT),
-    NAME_FUNC_OFFSET(19193, glBindFramebufferEXT, glBindFramebufferEXT, NULL, _gloffset_BindFramebufferEXT),
-    NAME_FUNC_OFFSET(19211, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, _gloffset_BindRenderbufferEXT),
-    NAME_FUNC_OFFSET(19230, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, _gloffset_CheckFramebufferStatusEXT),
-    NAME_FUNC_OFFSET(19255, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, _gloffset_DeleteFramebuffersEXT),
-    NAME_FUNC_OFFSET(19276, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, _gloffset_DeleteRenderbuffersEXT),
-    NAME_FUNC_OFFSET(19298, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, _gloffset_FramebufferRenderbufferEXT),
-    NAME_FUNC_OFFSET(19324, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, _gloffset_FramebufferTexture1DEXT),
-    NAME_FUNC_OFFSET(19347, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, _gloffset_FramebufferTexture2DEXT),
-    NAME_FUNC_OFFSET(19370, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, _gloffset_FramebufferTexture3DEXT),
-    NAME_FUNC_OFFSET(19393, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, _gloffset_GenFramebuffersEXT),
-    NAME_FUNC_OFFSET(19411, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, _gloffset_GenRenderbuffersEXT),
-    NAME_FUNC_OFFSET(19430, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, _gloffset_GenerateMipmapEXT),
-    NAME_FUNC_OFFSET(19447, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, _gloffset_GetFramebufferAttachmentParameterivEXT),
-    NAME_FUNC_OFFSET(19485, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, _gloffset_GetRenderbufferParameterivEXT),
-    NAME_FUNC_OFFSET(19514, glIsFramebufferEXT, glIsFramebufferEXT, NULL, _gloffset_IsFramebufferEXT),
-    NAME_FUNC_OFFSET(19530, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, _gloffset_IsRenderbufferEXT),
-    NAME_FUNC_OFFSET(19547, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, _gloffset_RenderbufferStorageEXT),
-    NAME_FUNC_OFFSET(19569, gl_dispatch_stub_773, gl_dispatch_stub_773, NULL, _gloffset_BlitFramebufferEXT),
-    NAME_FUNC_OFFSET(19587, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
+    NAME_FUNC_OFFSET( 9082, glClientWaitSync, glClientWaitSync, NULL, _gloffset_ClientWaitSync),
+    NAME_FUNC_OFFSET( 9099, glDeleteSync, glDeleteSync, NULL, _gloffset_DeleteSync),
+    NAME_FUNC_OFFSET( 9112, glFenceSync, glFenceSync, NULL, _gloffset_FenceSync),
+    NAME_FUNC_OFFSET( 9124, glGetInteger64v, glGetInteger64v, NULL, _gloffset_GetInteger64v),
+    NAME_FUNC_OFFSET( 9140, glGetSynciv, glGetSynciv, NULL, _gloffset_GetSynciv),
+    NAME_FUNC_OFFSET( 9152, glIsSync, glIsSync, NULL, _gloffset_IsSync),
+    NAME_FUNC_OFFSET( 9161, glWaitSync, glWaitSync, NULL, _gloffset_WaitSync),
+    NAME_FUNC_OFFSET( 9172, glPolygonOffsetEXT, glPolygonOffsetEXT, NULL, _gloffset_PolygonOffsetEXT),
+    NAME_FUNC_OFFSET( 9191, gl_dispatch_stub_575, gl_dispatch_stub_575, NULL, _gloffset_GetPixelTexGenParameterfvSGIS),
+    NAME_FUNC_OFFSET( 9223, gl_dispatch_stub_576, gl_dispatch_stub_576, NULL, _gloffset_GetPixelTexGenParameterivSGIS),
+    NAME_FUNC_OFFSET( 9255, gl_dispatch_stub_577, gl_dispatch_stub_577, NULL, _gloffset_PixelTexGenParameterfSGIS),
+    NAME_FUNC_OFFSET( 9283, gl_dispatch_stub_578, gl_dispatch_stub_578, NULL, _gloffset_PixelTexGenParameterfvSGIS),
+    NAME_FUNC_OFFSET( 9312, gl_dispatch_stub_579, gl_dispatch_stub_579, NULL, _gloffset_PixelTexGenParameteriSGIS),
+    NAME_FUNC_OFFSET( 9340, gl_dispatch_stub_580, gl_dispatch_stub_580, NULL, _gloffset_PixelTexGenParameterivSGIS),
+    NAME_FUNC_OFFSET( 9369, gl_dispatch_stub_581, gl_dispatch_stub_581, NULL, _gloffset_SampleMaskSGIS),
+    NAME_FUNC_OFFSET( 9386, gl_dispatch_stub_582, gl_dispatch_stub_582, NULL, _gloffset_SamplePatternSGIS),
+    NAME_FUNC_OFFSET( 9406, glColorPointerEXT, glColorPointerEXT, NULL, _gloffset_ColorPointerEXT),
+    NAME_FUNC_OFFSET( 9424, glEdgeFlagPointerEXT, glEdgeFlagPointerEXT, NULL, _gloffset_EdgeFlagPointerEXT),
+    NAME_FUNC_OFFSET( 9445, glIndexPointerEXT, glIndexPointerEXT, NULL, _gloffset_IndexPointerEXT),
+    NAME_FUNC_OFFSET( 9463, glNormalPointerEXT, glNormalPointerEXT, NULL, _gloffset_NormalPointerEXT),
+    NAME_FUNC_OFFSET( 9482, glTexCoordPointerEXT, glTexCoordPointerEXT, NULL, _gloffset_TexCoordPointerEXT),
+    NAME_FUNC_OFFSET( 9503, glVertexPointerEXT, glVertexPointerEXT, NULL, _gloffset_VertexPointerEXT),
+    NAME_FUNC_OFFSET( 9522, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET( 9543, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET( 9565, glLockArraysEXT, glLockArraysEXT, NULL, _gloffset_LockArraysEXT),
+    NAME_FUNC_OFFSET( 9581, glUnlockArraysEXT, glUnlockArraysEXT, NULL, _gloffset_UnlockArraysEXT),
+    NAME_FUNC_OFFSET( 9599, gl_dispatch_stub_593, gl_dispatch_stub_593, NULL, _gloffset_CullParameterdvEXT),
+    NAME_FUNC_OFFSET( 9620, gl_dispatch_stub_594, gl_dispatch_stub_594, NULL, _gloffset_CullParameterfvEXT),
+    NAME_FUNC_OFFSET( 9641, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
+    NAME_FUNC_OFFSET( 9663, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
+    NAME_FUNC_OFFSET( 9686, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
+    NAME_FUNC_OFFSET( 9708, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
+    NAME_FUNC_OFFSET( 9731, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
+    NAME_FUNC_OFFSET( 9753, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
+    NAME_FUNC_OFFSET( 9776, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
+    NAME_FUNC_OFFSET( 9798, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
+    NAME_FUNC_OFFSET( 9821, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
+    NAME_FUNC_OFFSET( 9843, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
+    NAME_FUNC_OFFSET( 9866, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
+    NAME_FUNC_OFFSET( 9889, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
+    NAME_FUNC_OFFSET( 9913, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
+    NAME_FUNC_OFFSET( 9936, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
+    NAME_FUNC_OFFSET( 9960, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
+    NAME_FUNC_OFFSET( 9983, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
+    NAME_FUNC_OFFSET(10007, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
+    NAME_FUNC_OFFSET(10034, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
+    NAME_FUNC_OFFSET(10055, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
+    NAME_FUNC_OFFSET(10078, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
+    NAME_FUNC_OFFSET(10099, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
+    NAME_FUNC_OFFSET(10114, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
+    NAME_FUNC_OFFSET(10130, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
+    NAME_FUNC_OFFSET(10145, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
+    NAME_FUNC_OFFSET(10161, gl_dispatch_stub_619, gl_dispatch_stub_619, NULL, _gloffset_PixelTexGenSGIX),
+    NAME_FUNC_OFFSET(10179, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
+    NAME_FUNC_OFFSET(10202, glFlushVertexArrayRangeNV, glFlushVertexArrayRangeNV, NULL, _gloffset_FlushVertexArrayRangeNV),
+    NAME_FUNC_OFFSET(10228, glVertexArrayRangeNV, glVertexArrayRangeNV, NULL, _gloffset_VertexArrayRangeNV),
+    NAME_FUNC_OFFSET(10249, glCombinerInputNV, glCombinerInputNV, NULL, _gloffset_CombinerInputNV),
+    NAME_FUNC_OFFSET(10267, glCombinerOutputNV, glCombinerOutputNV, NULL, _gloffset_CombinerOutputNV),
+    NAME_FUNC_OFFSET(10286, glCombinerParameterfNV, glCombinerParameterfNV, NULL, _gloffset_CombinerParameterfNV),
+    NAME_FUNC_OFFSET(10309, glCombinerParameterfvNV, glCombinerParameterfvNV, NULL, _gloffset_CombinerParameterfvNV),
+    NAME_FUNC_OFFSET(10333, glCombinerParameteriNV, glCombinerParameteriNV, NULL, _gloffset_CombinerParameteriNV),
+    NAME_FUNC_OFFSET(10356, glCombinerParameterivNV, glCombinerParameterivNV, NULL, _gloffset_CombinerParameterivNV),
+    NAME_FUNC_OFFSET(10380, glFinalCombinerInputNV, glFinalCombinerInputNV, NULL, _gloffset_FinalCombinerInputNV),
+    NAME_FUNC_OFFSET(10403, glGetCombinerInputParameterfvNV, glGetCombinerInputParameterfvNV, NULL, _gloffset_GetCombinerInputParameterfvNV),
+    NAME_FUNC_OFFSET(10435, glGetCombinerInputParameterivNV, glGetCombinerInputParameterivNV, NULL, _gloffset_GetCombinerInputParameterivNV),
+    NAME_FUNC_OFFSET(10467, glGetCombinerOutputParameterfvNV, glGetCombinerOutputParameterfvNV, NULL, _gloffset_GetCombinerOutputParameterfvNV),
+    NAME_FUNC_OFFSET(10500, glGetCombinerOutputParameterivNV, glGetCombinerOutputParameterivNV, NULL, _gloffset_GetCombinerOutputParameterivNV),
+    NAME_FUNC_OFFSET(10533, glGetFinalCombinerInputParameterfvNV, glGetFinalCombinerInputParameterfvNV, NULL, _gloffset_GetFinalCombinerInputParameterfvNV),
+    NAME_FUNC_OFFSET(10570, glGetFinalCombinerInputParameterivNV, glGetFinalCombinerInputParameterivNV, NULL, _gloffset_GetFinalCombinerInputParameterivNV),
+    NAME_FUNC_OFFSET(10607, glResizeBuffersMESA, glResizeBuffersMESA, NULL, _gloffset_ResizeBuffersMESA),
+    NAME_FUNC_OFFSET(10627, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
+    NAME_FUNC_OFFSET(10645, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
+    NAME_FUNC_OFFSET(10664, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
+    NAME_FUNC_OFFSET(10682, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
+    NAME_FUNC_OFFSET(10701, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
+    NAME_FUNC_OFFSET(10719, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
+    NAME_FUNC_OFFSET(10738, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
+    NAME_FUNC_OFFSET(10756, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
+    NAME_FUNC_OFFSET(10775, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
+    NAME_FUNC_OFFSET(10793, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
+    NAME_FUNC_OFFSET(10812, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
+    NAME_FUNC_OFFSET(10830, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
+    NAME_FUNC_OFFSET(10849, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
+    NAME_FUNC_OFFSET(10867, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
+    NAME_FUNC_OFFSET(10886, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
+    NAME_FUNC_OFFSET(10904, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
+    NAME_FUNC_OFFSET(10923, glWindowPos4dMESA, glWindowPos4dMESA, NULL, _gloffset_WindowPos4dMESA),
+    NAME_FUNC_OFFSET(10941, glWindowPos4dvMESA, glWindowPos4dvMESA, NULL, _gloffset_WindowPos4dvMESA),
+    NAME_FUNC_OFFSET(10960, glWindowPos4fMESA, glWindowPos4fMESA, NULL, _gloffset_WindowPos4fMESA),
+    NAME_FUNC_OFFSET(10978, glWindowPos4fvMESA, glWindowPos4fvMESA, NULL, _gloffset_WindowPos4fvMESA),
+    NAME_FUNC_OFFSET(10997, glWindowPos4iMESA, glWindowPos4iMESA, NULL, _gloffset_WindowPos4iMESA),
+    NAME_FUNC_OFFSET(11015, glWindowPos4ivMESA, glWindowPos4ivMESA, NULL, _gloffset_WindowPos4ivMESA),
+    NAME_FUNC_OFFSET(11034, glWindowPos4sMESA, glWindowPos4sMESA, NULL, _gloffset_WindowPos4sMESA),
+    NAME_FUNC_OFFSET(11052, glWindowPos4svMESA, glWindowPos4svMESA, NULL, _gloffset_WindowPos4svMESA),
+    NAME_FUNC_OFFSET(11071, gl_dispatch_stub_661, gl_dispatch_stub_661, NULL, _gloffset_MultiModeDrawArraysIBM),
+    NAME_FUNC_OFFSET(11096, gl_dispatch_stub_662, gl_dispatch_stub_662, NULL, _gloffset_MultiModeDrawElementsIBM),
+    NAME_FUNC_OFFSET(11123, gl_dispatch_stub_663, gl_dispatch_stub_663, NULL, _gloffset_DeleteFencesNV),
+    NAME_FUNC_OFFSET(11140, gl_dispatch_stub_664, gl_dispatch_stub_664, NULL, _gloffset_FinishFenceNV),
+    NAME_FUNC_OFFSET(11156, gl_dispatch_stub_665, gl_dispatch_stub_665, NULL, _gloffset_GenFencesNV),
+    NAME_FUNC_OFFSET(11170, gl_dispatch_stub_666, gl_dispatch_stub_666, NULL, _gloffset_GetFenceivNV),
+    NAME_FUNC_OFFSET(11185, gl_dispatch_stub_667, gl_dispatch_stub_667, NULL, _gloffset_IsFenceNV),
+    NAME_FUNC_OFFSET(11197, gl_dispatch_stub_668, gl_dispatch_stub_668, NULL, _gloffset_SetFenceNV),
+    NAME_FUNC_OFFSET(11210, gl_dispatch_stub_669, gl_dispatch_stub_669, NULL, _gloffset_TestFenceNV),
+    NAME_FUNC_OFFSET(11224, glAreProgramsResidentNV, glAreProgramsResidentNV, NULL, _gloffset_AreProgramsResidentNV),
+    NAME_FUNC_OFFSET(11248, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
+    NAME_FUNC_OFFSET(11264, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
+    NAME_FUNC_OFFSET(11283, glExecuteProgramNV, glExecuteProgramNV, NULL, _gloffset_ExecuteProgramNV),
+    NAME_FUNC_OFFSET(11302, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
+    NAME_FUNC_OFFSET(11318, glGetProgramParameterdvNV, glGetProgramParameterdvNV, NULL, _gloffset_GetProgramParameterdvNV),
+    NAME_FUNC_OFFSET(11344, glGetProgramParameterfvNV, glGetProgramParameterfvNV, NULL, _gloffset_GetProgramParameterfvNV),
+    NAME_FUNC_OFFSET(11370, glGetProgramStringNV, glGetProgramStringNV, NULL, _gloffset_GetProgramStringNV),
+    NAME_FUNC_OFFSET(11391, glGetProgramivNV, glGetProgramivNV, NULL, _gloffset_GetProgramivNV),
+    NAME_FUNC_OFFSET(11408, glGetTrackMatrixivNV, glGetTrackMatrixivNV, NULL, _gloffset_GetTrackMatrixivNV),
+    NAME_FUNC_OFFSET(11429, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
+    NAME_FUNC_OFFSET(11457, glGetVertexAttribdvNV, glGetVertexAttribdvNV, NULL, _gloffset_GetVertexAttribdvNV),
+    NAME_FUNC_OFFSET(11479, glGetVertexAttribfvNV, glGetVertexAttribfvNV, NULL, _gloffset_GetVertexAttribfvNV),
+    NAME_FUNC_OFFSET(11501, glGetVertexAttribivNV, glGetVertexAttribivNV, NULL, _gloffset_GetVertexAttribivNV),
+    NAME_FUNC_OFFSET(11523, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
+    NAME_FUNC_OFFSET(11537, glLoadProgramNV, glLoadProgramNV, NULL, _gloffset_LoadProgramNV),
+    NAME_FUNC_OFFSET(11553, glProgramParameters4dvNV, glProgramParameters4dvNV, NULL, _gloffset_ProgramParameters4dvNV),
+    NAME_FUNC_OFFSET(11578, glProgramParameters4fvNV, glProgramParameters4fvNV, NULL, _gloffset_ProgramParameters4fvNV),
+    NAME_FUNC_OFFSET(11603, glRequestResidentProgramsNV, glRequestResidentProgramsNV, NULL, _gloffset_RequestResidentProgramsNV),
+    NAME_FUNC_OFFSET(11631, glTrackMatrixNV, glTrackMatrixNV, NULL, _gloffset_TrackMatrixNV),
+    NAME_FUNC_OFFSET(11647, glVertexAttrib1dNV, glVertexAttrib1dNV, NULL, _gloffset_VertexAttrib1dNV),
+    NAME_FUNC_OFFSET(11666, glVertexAttrib1dvNV, glVertexAttrib1dvNV, NULL, _gloffset_VertexAttrib1dvNV),
+    NAME_FUNC_OFFSET(11686, glVertexAttrib1fNV, glVertexAttrib1fNV, NULL, _gloffset_VertexAttrib1fNV),
+    NAME_FUNC_OFFSET(11705, glVertexAttrib1fvNV, glVertexAttrib1fvNV, NULL, _gloffset_VertexAttrib1fvNV),
+    NAME_FUNC_OFFSET(11725, glVertexAttrib1sNV, glVertexAttrib1sNV, NULL, _gloffset_VertexAttrib1sNV),
+    NAME_FUNC_OFFSET(11744, glVertexAttrib1svNV, glVertexAttrib1svNV, NULL, _gloffset_VertexAttrib1svNV),
+    NAME_FUNC_OFFSET(11764, glVertexAttrib2dNV, glVertexAttrib2dNV, NULL, _gloffset_VertexAttrib2dNV),
+    NAME_FUNC_OFFSET(11783, glVertexAttrib2dvNV, glVertexAttrib2dvNV, NULL, _gloffset_VertexAttrib2dvNV),
+    NAME_FUNC_OFFSET(11803, glVertexAttrib2fNV, glVertexAttrib2fNV, NULL, _gloffset_VertexAttrib2fNV),
+    NAME_FUNC_OFFSET(11822, glVertexAttrib2fvNV, glVertexAttrib2fvNV, NULL, _gloffset_VertexAttrib2fvNV),
+    NAME_FUNC_OFFSET(11842, glVertexAttrib2sNV, glVertexAttrib2sNV, NULL, _gloffset_VertexAttrib2sNV),
+    NAME_FUNC_OFFSET(11861, glVertexAttrib2svNV, glVertexAttrib2svNV, NULL, _gloffset_VertexAttrib2svNV),
+    NAME_FUNC_OFFSET(11881, glVertexAttrib3dNV, glVertexAttrib3dNV, NULL, _gloffset_VertexAttrib3dNV),
+    NAME_FUNC_OFFSET(11900, glVertexAttrib3dvNV, glVertexAttrib3dvNV, NULL, _gloffset_VertexAttrib3dvNV),
+    NAME_FUNC_OFFSET(11920, glVertexAttrib3fNV, glVertexAttrib3fNV, NULL, _gloffset_VertexAttrib3fNV),
+    NAME_FUNC_OFFSET(11939, glVertexAttrib3fvNV, glVertexAttrib3fvNV, NULL, _gloffset_VertexAttrib3fvNV),
+    NAME_FUNC_OFFSET(11959, glVertexAttrib3sNV, glVertexAttrib3sNV, NULL, _gloffset_VertexAttrib3sNV),
+    NAME_FUNC_OFFSET(11978, glVertexAttrib3svNV, glVertexAttrib3svNV, NULL, _gloffset_VertexAttrib3svNV),
+    NAME_FUNC_OFFSET(11998, glVertexAttrib4dNV, glVertexAttrib4dNV, NULL, _gloffset_VertexAttrib4dNV),
+    NAME_FUNC_OFFSET(12017, glVertexAttrib4dvNV, glVertexAttrib4dvNV, NULL, _gloffset_VertexAttrib4dvNV),
+    NAME_FUNC_OFFSET(12037, glVertexAttrib4fNV, glVertexAttrib4fNV, NULL, _gloffset_VertexAttrib4fNV),
+    NAME_FUNC_OFFSET(12056, glVertexAttrib4fvNV, glVertexAttrib4fvNV, NULL, _gloffset_VertexAttrib4fvNV),
+    NAME_FUNC_OFFSET(12076, glVertexAttrib4sNV, glVertexAttrib4sNV, NULL, _gloffset_VertexAttrib4sNV),
+    NAME_FUNC_OFFSET(12095, glVertexAttrib4svNV, glVertexAttrib4svNV, NULL, _gloffset_VertexAttrib4svNV),
+    NAME_FUNC_OFFSET(12115, glVertexAttrib4ubNV, glVertexAttrib4ubNV, NULL, _gloffset_VertexAttrib4ubNV),
+    NAME_FUNC_OFFSET(12135, glVertexAttrib4ubvNV, glVertexAttrib4ubvNV, NULL, _gloffset_VertexAttrib4ubvNV),
+    NAME_FUNC_OFFSET(12156, glVertexAttribPointerNV, glVertexAttribPointerNV, NULL, _gloffset_VertexAttribPointerNV),
+    NAME_FUNC_OFFSET(12180, glVertexAttribs1dvNV, glVertexAttribs1dvNV, NULL, _gloffset_VertexAttribs1dvNV),
+    NAME_FUNC_OFFSET(12201, glVertexAttribs1fvNV, glVertexAttribs1fvNV, NULL, _gloffset_VertexAttribs1fvNV),
+    NAME_FUNC_OFFSET(12222, glVertexAttribs1svNV, glVertexAttribs1svNV, NULL, _gloffset_VertexAttribs1svNV),
+    NAME_FUNC_OFFSET(12243, glVertexAttribs2dvNV, glVertexAttribs2dvNV, NULL, _gloffset_VertexAttribs2dvNV),
+    NAME_FUNC_OFFSET(12264, glVertexAttribs2fvNV, glVertexAttribs2fvNV, NULL, _gloffset_VertexAttribs2fvNV),
+    NAME_FUNC_OFFSET(12285, glVertexAttribs2svNV, glVertexAttribs2svNV, NULL, _gloffset_VertexAttribs2svNV),
+    NAME_FUNC_OFFSET(12306, glVertexAttribs3dvNV, glVertexAttribs3dvNV, NULL, _gloffset_VertexAttribs3dvNV),
+    NAME_FUNC_OFFSET(12327, glVertexAttribs3fvNV, glVertexAttribs3fvNV, NULL, _gloffset_VertexAttribs3fvNV),
+    NAME_FUNC_OFFSET(12348, glVertexAttribs3svNV, glVertexAttribs3svNV, NULL, _gloffset_VertexAttribs3svNV),
+    NAME_FUNC_OFFSET(12369, glVertexAttribs4dvNV, glVertexAttribs4dvNV, NULL, _gloffset_VertexAttribs4dvNV),
+    NAME_FUNC_OFFSET(12390, glVertexAttribs4fvNV, glVertexAttribs4fvNV, NULL, _gloffset_VertexAttribs4fvNV),
+    NAME_FUNC_OFFSET(12411, glVertexAttribs4svNV, glVertexAttribs4svNV, NULL, _gloffset_VertexAttribs4svNV),
+    NAME_FUNC_OFFSET(12432, glVertexAttribs4ubvNV, glVertexAttribs4ubvNV, NULL, _gloffset_VertexAttribs4ubvNV),
+    NAME_FUNC_OFFSET(12454, glGetTexBumpParameterfvATI, glGetTexBumpParameterfvATI, NULL, _gloffset_GetTexBumpParameterfvATI),
+    NAME_FUNC_OFFSET(12481, glGetTexBumpParameterivATI, glGetTexBumpParameterivATI, NULL, _gloffset_GetTexBumpParameterivATI),
+    NAME_FUNC_OFFSET(12508, glTexBumpParameterfvATI, glTexBumpParameterfvATI, NULL, _gloffset_TexBumpParameterfvATI),
+    NAME_FUNC_OFFSET(12532, glTexBumpParameterivATI, glTexBumpParameterivATI, NULL, _gloffset_TexBumpParameterivATI),
+    NAME_FUNC_OFFSET(12556, glAlphaFragmentOp1ATI, glAlphaFragmentOp1ATI, NULL, _gloffset_AlphaFragmentOp1ATI),
+    NAME_FUNC_OFFSET(12578, glAlphaFragmentOp2ATI, glAlphaFragmentOp2ATI, NULL, _gloffset_AlphaFragmentOp2ATI),
+    NAME_FUNC_OFFSET(12600, glAlphaFragmentOp3ATI, glAlphaFragmentOp3ATI, NULL, _gloffset_AlphaFragmentOp3ATI),
+    NAME_FUNC_OFFSET(12622, glBeginFragmentShaderATI, glBeginFragmentShaderATI, NULL, _gloffset_BeginFragmentShaderATI),
+    NAME_FUNC_OFFSET(12647, glBindFragmentShaderATI, glBindFragmentShaderATI, NULL, _gloffset_BindFragmentShaderATI),
+    NAME_FUNC_OFFSET(12671, glColorFragmentOp1ATI, glColorFragmentOp1ATI, NULL, _gloffset_ColorFragmentOp1ATI),
+    NAME_FUNC_OFFSET(12693, glColorFragmentOp2ATI, glColorFragmentOp2ATI, NULL, _gloffset_ColorFragmentOp2ATI),
+    NAME_FUNC_OFFSET(12715, glColorFragmentOp3ATI, glColorFragmentOp3ATI, NULL, _gloffset_ColorFragmentOp3ATI),
+    NAME_FUNC_OFFSET(12737, glDeleteFragmentShaderATI, glDeleteFragmentShaderATI, NULL, _gloffset_DeleteFragmentShaderATI),
+    NAME_FUNC_OFFSET(12763, glEndFragmentShaderATI, glEndFragmentShaderATI, NULL, _gloffset_EndFragmentShaderATI),
+    NAME_FUNC_OFFSET(12786, glGenFragmentShadersATI, glGenFragmentShadersATI, NULL, _gloffset_GenFragmentShadersATI),
+    NAME_FUNC_OFFSET(12810, glPassTexCoordATI, glPassTexCoordATI, NULL, _gloffset_PassTexCoordATI),
+    NAME_FUNC_OFFSET(12828, glSampleMapATI, glSampleMapATI, NULL, _gloffset_SampleMapATI),
+    NAME_FUNC_OFFSET(12843, glSetFragmentShaderConstantATI, glSetFragmentShaderConstantATI, NULL, _gloffset_SetFragmentShaderConstantATI),
+    NAME_FUNC_OFFSET(12874, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
+    NAME_FUNC_OFFSET(12894, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
+    NAME_FUNC_OFFSET(12915, gl_dispatch_stub_750, gl_dispatch_stub_750, NULL, _gloffset_ActiveStencilFaceEXT),
+    NAME_FUNC_OFFSET(12938, gl_dispatch_stub_751, gl_dispatch_stub_751, NULL, _gloffset_BindVertexArrayAPPLE),
+    NAME_FUNC_OFFSET(12961, gl_dispatch_stub_752, gl_dispatch_stub_752, NULL, _gloffset_DeleteVertexArraysAPPLE),
+    NAME_FUNC_OFFSET(12987, gl_dispatch_stub_753, gl_dispatch_stub_753, NULL, _gloffset_GenVertexArraysAPPLE),
+    NAME_FUNC_OFFSET(13010, gl_dispatch_stub_754, gl_dispatch_stub_754, NULL, _gloffset_IsVertexArrayAPPLE),
+    NAME_FUNC_OFFSET(13031, glGetProgramNamedParameterdvNV, glGetProgramNamedParameterdvNV, NULL, _gloffset_GetProgramNamedParameterdvNV),
+    NAME_FUNC_OFFSET(13062, glGetProgramNamedParameterfvNV, glGetProgramNamedParameterfvNV, NULL, _gloffset_GetProgramNamedParameterfvNV),
+    NAME_FUNC_OFFSET(13093, glProgramNamedParameter4dNV, glProgramNamedParameter4dNV, NULL, _gloffset_ProgramNamedParameter4dNV),
+    NAME_FUNC_OFFSET(13121, glProgramNamedParameter4dvNV, glProgramNamedParameter4dvNV, NULL, _gloffset_ProgramNamedParameter4dvNV),
+    NAME_FUNC_OFFSET(13150, glProgramNamedParameter4fNV, glProgramNamedParameter4fNV, NULL, _gloffset_ProgramNamedParameter4fNV),
+    NAME_FUNC_OFFSET(13178, glProgramNamedParameter4fvNV, glProgramNamedParameter4fvNV, NULL, _gloffset_ProgramNamedParameter4fvNV),
+    NAME_FUNC_OFFSET(13207, gl_dispatch_stub_761, gl_dispatch_stub_761, NULL, _gloffset_DepthBoundsEXT),
+    NAME_FUNC_OFFSET(13224, gl_dispatch_stub_762, gl_dispatch_stub_762, NULL, _gloffset_BlendEquationSeparateEXT),
+    NAME_FUNC_OFFSET(13251, glBindFramebufferEXT, glBindFramebufferEXT, NULL, _gloffset_BindFramebufferEXT),
+    NAME_FUNC_OFFSET(13272, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, _gloffset_BindRenderbufferEXT),
+    NAME_FUNC_OFFSET(13294, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, _gloffset_CheckFramebufferStatusEXT),
+    NAME_FUNC_OFFSET(13322, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, _gloffset_DeleteFramebuffersEXT),
+    NAME_FUNC_OFFSET(13346, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, _gloffset_DeleteRenderbuffersEXT),
+    NAME_FUNC_OFFSET(13371, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, _gloffset_FramebufferRenderbufferEXT),
+    NAME_FUNC_OFFSET(13400, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, _gloffset_FramebufferTexture1DEXT),
+    NAME_FUNC_OFFSET(13426, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, _gloffset_FramebufferTexture2DEXT),
+    NAME_FUNC_OFFSET(13452, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, _gloffset_FramebufferTexture3DEXT),
+    NAME_FUNC_OFFSET(13478, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, _gloffset_GenFramebuffersEXT),
+    NAME_FUNC_OFFSET(13499, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, _gloffset_GenRenderbuffersEXT),
+    NAME_FUNC_OFFSET(13521, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, _gloffset_GenerateMipmapEXT),
+    NAME_FUNC_OFFSET(13541, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, _gloffset_GetFramebufferAttachmentParameterivEXT),
+    NAME_FUNC_OFFSET(13582, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, _gloffset_GetRenderbufferParameterivEXT),
+    NAME_FUNC_OFFSET(13614, glIsFramebufferEXT, glIsFramebufferEXT, NULL, _gloffset_IsFramebufferEXT),
+    NAME_FUNC_OFFSET(13633, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, _gloffset_IsRenderbufferEXT),
+    NAME_FUNC_OFFSET(13653, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, _gloffset_RenderbufferStorageEXT),
+    NAME_FUNC_OFFSET(13678, gl_dispatch_stub_780, gl_dispatch_stub_780, NULL, _gloffset_BlitFramebufferEXT),
+    NAME_FUNC_OFFSET(13699, gl_dispatch_stub_781, gl_dispatch_stub_781, NULL, _gloffset_BufferParameteriAPPLE),
+    NAME_FUNC_OFFSET(13723, gl_dispatch_stub_782, gl_dispatch_stub_782, NULL, _gloffset_FlushMappedBufferRangeAPPLE),
+    NAME_FUNC_OFFSET(13753, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
+    NAME_FUNC_OFFSET(13782, glProvokingVertexEXT, glProvokingVertexEXT, NULL, _gloffset_ProvokingVertexEXT),
+    NAME_FUNC_OFFSET(13803, gl_dispatch_stub_785, gl_dispatch_stub_785, NULL, _gloffset_GetTexParameterPointervAPPLE),
+    NAME_FUNC_OFFSET(13834, gl_dispatch_stub_786, gl_dispatch_stub_786, NULL, _gloffset_TextureRangeAPPLE),
+    NAME_FUNC_OFFSET(13854, gl_dispatch_stub_787, gl_dispatch_stub_787, NULL, _gloffset_StencilFuncSeparateATI),
+    NAME_FUNC_OFFSET(13879, gl_dispatch_stub_788, gl_dispatch_stub_788, NULL, _gloffset_ProgramEnvParameters4fvEXT),
+    NAME_FUNC_OFFSET(13908, gl_dispatch_stub_789, gl_dispatch_stub_789, NULL, _gloffset_ProgramLocalParameters4fvEXT),
+    NAME_FUNC_OFFSET(13939, gl_dispatch_stub_790, gl_dispatch_stub_790, NULL, _gloffset_GetQueryObjecti64vEXT),
+    NAME_FUNC_OFFSET(13963, gl_dispatch_stub_791, gl_dispatch_stub_791, NULL, _gloffset_GetQueryObjectui64vEXT),
+    NAME_FUNC_OFFSET(13988, glArrayElement, glArrayElement, NULL, _gloffset_ArrayElement),
+    NAME_FUNC_OFFSET(14006, glBindTexture, glBindTexture, NULL, _gloffset_BindTexture),
+    NAME_FUNC_OFFSET(14023, glDrawArrays, glDrawArrays, NULL, _gloffset_DrawArrays),
+    NAME_FUNC_OFFSET(14039, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, _gloffset_AreTexturesResident),
+    NAME_FUNC_OFFSET(14064, glCopyTexImage1D, glCopyTexImage1D, NULL, _gloffset_CopyTexImage1D),
+    NAME_FUNC_OFFSET(14084, glCopyTexImage2D, glCopyTexImage2D, NULL, _gloffset_CopyTexImage2D),
+    NAME_FUNC_OFFSET(14104, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, _gloffset_CopyTexSubImage1D),
+    NAME_FUNC_OFFSET(14127, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, _gloffset_CopyTexSubImage2D),
+    NAME_FUNC_OFFSET(14150, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, _gloffset_DeleteTextures),
+    NAME_FUNC_OFFSET(14170, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, _gloffset_GenTextures),
+    NAME_FUNC_OFFSET(14187, glGetPointerv, glGetPointerv, NULL, _gloffset_GetPointerv),
+    NAME_FUNC_OFFSET(14204, glIsTexture, glIsTextureEXT, glIsTextureEXT, _gloffset_IsTexture),
+    NAME_FUNC_OFFSET(14219, glPrioritizeTextures, glPrioritizeTextures, NULL, _gloffset_PrioritizeTextures),
+    NAME_FUNC_OFFSET(14243, glTexSubImage1D, glTexSubImage1D, NULL, _gloffset_TexSubImage1D),
+    NAME_FUNC_OFFSET(14262, glTexSubImage2D, glTexSubImage2D, NULL, _gloffset_TexSubImage2D),
+    NAME_FUNC_OFFSET(14281, glBlendColor, glBlendColor, NULL, _gloffset_BlendColor),
+    NAME_FUNC_OFFSET(14297, glBlendEquation, glBlendEquation, NULL, _gloffset_BlendEquation),
+    NAME_FUNC_OFFSET(14316, glDrawRangeElements, glDrawRangeElements, NULL, _gloffset_DrawRangeElements),
+    NAME_FUNC_OFFSET(14339, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
+    NAME_FUNC_OFFSET(14355, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
+    NAME_FUNC_OFFSET(14371, glColorTableParameterfv, glColorTableParameterfv, NULL, _gloffset_ColorTableParameterfv),
+    NAME_FUNC_OFFSET(14398, glColorTableParameteriv, glColorTableParameteriv, NULL, _gloffset_ColorTableParameteriv),
+    NAME_FUNC_OFFSET(14425, glCopyColorTable, glCopyColorTable, NULL, _gloffset_CopyColorTable),
+    NAME_FUNC_OFFSET(14445, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
+    NAME_FUNC_OFFSET(14464, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
+    NAME_FUNC_OFFSET(14483, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
+    NAME_FUNC_OFFSET(14513, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
+    NAME_FUNC_OFFSET(14543, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
+    NAME_FUNC_OFFSET(14573, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
+    NAME_FUNC_OFFSET(14603, glColorSubTable, glColorSubTable, NULL, _gloffset_ColorSubTable),
+    NAME_FUNC_OFFSET(14622, glCopyColorSubTable, glCopyColorSubTable, NULL, _gloffset_CopyColorSubTable),
+    NAME_FUNC_OFFSET(14645, glConvolutionFilter1D, glConvolutionFilter1D, NULL, _gloffset_ConvolutionFilter1D),
+    NAME_FUNC_OFFSET(14670, glConvolutionFilter2D, glConvolutionFilter2D, NULL, _gloffset_ConvolutionFilter2D),
+    NAME_FUNC_OFFSET(14695, glConvolutionParameterf, glConvolutionParameterf, NULL, _gloffset_ConvolutionParameterf),
+    NAME_FUNC_OFFSET(14722, glConvolutionParameterfv, glConvolutionParameterfv, NULL, _gloffset_ConvolutionParameterfv),
+    NAME_FUNC_OFFSET(14750, glConvolutionParameteri, glConvolutionParameteri, NULL, _gloffset_ConvolutionParameteri),
+    NAME_FUNC_OFFSET(14777, glConvolutionParameteriv, glConvolutionParameteriv, NULL, _gloffset_ConvolutionParameteriv),
+    NAME_FUNC_OFFSET(14805, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, _gloffset_CopyConvolutionFilter1D),
+    NAME_FUNC_OFFSET(14834, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, _gloffset_CopyConvolutionFilter2D),
+    NAME_FUNC_OFFSET(14863, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, _gloffset_GetConvolutionFilter),
+    NAME_FUNC_OFFSET(14889, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, _gloffset_GetConvolutionParameterfv),
+    NAME_FUNC_OFFSET(14920, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, _gloffset_GetConvolutionParameteriv),
+    NAME_FUNC_OFFSET(14951, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, _gloffset_GetSeparableFilter),
+    NAME_FUNC_OFFSET(14975, glSeparableFilter2D, glSeparableFilter2D, NULL, _gloffset_SeparableFilter2D),
+    NAME_FUNC_OFFSET(14998, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, _gloffset_GetHistogram),
+    NAME_FUNC_OFFSET(15016, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, _gloffset_GetHistogramParameterfv),
+    NAME_FUNC_OFFSET(15045, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, _gloffset_GetHistogramParameteriv),
+    NAME_FUNC_OFFSET(15074, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, _gloffset_GetMinmax),
+    NAME_FUNC_OFFSET(15089, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, _gloffset_GetMinmaxParameterfv),
+    NAME_FUNC_OFFSET(15115, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, _gloffset_GetMinmaxParameteriv),
+    NAME_FUNC_OFFSET(15141, glHistogram, glHistogram, NULL, _gloffset_Histogram),
+    NAME_FUNC_OFFSET(15156, glMinmax, glMinmax, NULL, _gloffset_Minmax),
+    NAME_FUNC_OFFSET(15168, glResetHistogram, glResetHistogram, NULL, _gloffset_ResetHistogram),
+    NAME_FUNC_OFFSET(15188, glResetMinmax, glResetMinmax, NULL, _gloffset_ResetMinmax),
+    NAME_FUNC_OFFSET(15205, glTexImage3D, glTexImage3D, NULL, _gloffset_TexImage3D),
+    NAME_FUNC_OFFSET(15221, glTexSubImage3D, glTexSubImage3D, NULL, _gloffset_TexSubImage3D),
+    NAME_FUNC_OFFSET(15240, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, _gloffset_CopyTexSubImage3D),
+    NAME_FUNC_OFFSET(15263, glActiveTextureARB, glActiveTextureARB, NULL, _gloffset_ActiveTextureARB),
+    NAME_FUNC_OFFSET(15279, glClientActiveTextureARB, glClientActiveTextureARB, NULL, _gloffset_ClientActiveTextureARB),
+    NAME_FUNC_OFFSET(15301, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL, _gloffset_MultiTexCoord1dARB),
+    NAME_FUNC_OFFSET(15319, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL, _gloffset_MultiTexCoord1dvARB),
+    NAME_FUNC_OFFSET(15338, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, _gloffset_MultiTexCoord1fARB),
+    NAME_FUNC_OFFSET(15356, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, _gloffset_MultiTexCoord1fvARB),
+    NAME_FUNC_OFFSET(15375, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL, _gloffset_MultiTexCoord1iARB),
+    NAME_FUNC_OFFSET(15393, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL, _gloffset_MultiTexCoord1ivARB),
+    NAME_FUNC_OFFSET(15412, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL, _gloffset_MultiTexCoord1sARB),
+    NAME_FUNC_OFFSET(15430, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL, _gloffset_MultiTexCoord1svARB),
+    NAME_FUNC_OFFSET(15449, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL, _gloffset_MultiTexCoord2dARB),
+    NAME_FUNC_OFFSET(15467, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL, _gloffset_MultiTexCoord2dvARB),
+    NAME_FUNC_OFFSET(15486, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, _gloffset_MultiTexCoord2fARB),
+    NAME_FUNC_OFFSET(15504, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, _gloffset_MultiTexCoord2fvARB),
+    NAME_FUNC_OFFSET(15523, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL, _gloffset_MultiTexCoord2iARB),
+    NAME_FUNC_OFFSET(15541, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL, _gloffset_MultiTexCoord2ivARB),
+    NAME_FUNC_OFFSET(15560, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL, _gloffset_MultiTexCoord2sARB),
+    NAME_FUNC_OFFSET(15578, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL, _gloffset_MultiTexCoord2svARB),
+    NAME_FUNC_OFFSET(15597, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL, _gloffset_MultiTexCoord3dARB),
+    NAME_FUNC_OFFSET(15615, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL, _gloffset_MultiTexCoord3dvARB),
+    NAME_FUNC_OFFSET(15634, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, _gloffset_MultiTexCoord3fARB),
+    NAME_FUNC_OFFSET(15652, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, _gloffset_MultiTexCoord3fvARB),
+    NAME_FUNC_OFFSET(15671, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL, _gloffset_MultiTexCoord3iARB),
+    NAME_FUNC_OFFSET(15689, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL, _gloffset_MultiTexCoord3ivARB),
+    NAME_FUNC_OFFSET(15708, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL, _gloffset_MultiTexCoord3sARB),
+    NAME_FUNC_OFFSET(15726, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL, _gloffset_MultiTexCoord3svARB),
+    NAME_FUNC_OFFSET(15745, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL, _gloffset_MultiTexCoord4dARB),
+    NAME_FUNC_OFFSET(15763, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL, _gloffset_MultiTexCoord4dvARB),
+    NAME_FUNC_OFFSET(15782, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, _gloffset_MultiTexCoord4fARB),
+    NAME_FUNC_OFFSET(15800, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, _gloffset_MultiTexCoord4fvARB),
+    NAME_FUNC_OFFSET(15819, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL, _gloffset_MultiTexCoord4iARB),
+    NAME_FUNC_OFFSET(15837, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL, _gloffset_MultiTexCoord4ivARB),
+    NAME_FUNC_OFFSET(15856, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL, _gloffset_MultiTexCoord4sARB),
+    NAME_FUNC_OFFSET(15874, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL, _gloffset_MultiTexCoord4svARB),
+    NAME_FUNC_OFFSET(15893, glStencilOpSeparate, glStencilOpSeparate, NULL, _gloffset_StencilOpSeparate),
+    NAME_FUNC_OFFSET(15916, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, _gloffset_LoadTransposeMatrixdARB),
+    NAME_FUNC_OFFSET(15939, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, _gloffset_LoadTransposeMatrixfARB),
+    NAME_FUNC_OFFSET(15962, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, _gloffset_MultTransposeMatrixdARB),
+    NAME_FUNC_OFFSET(15985, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB, NULL, _gloffset_MultTransposeMatrixfARB),
+    NAME_FUNC_OFFSET(16008, glSampleCoverageARB, glSampleCoverageARB, NULL, _gloffset_SampleCoverageARB),
+    NAME_FUNC_OFFSET(16025, glCompressedTexImage1DARB, glCompressedTexImage1DARB, NULL, _gloffset_CompressedTexImage1DARB),
+    NAME_FUNC_OFFSET(16048, glCompressedTexImage2DARB, glCompressedTexImage2DARB, NULL, _gloffset_CompressedTexImage2DARB),
+    NAME_FUNC_OFFSET(16071, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, _gloffset_CompressedTexImage3DARB),
+    NAME_FUNC_OFFSET(16094, glCompressedTexSubImage1DARB, glCompressedTexSubImage1DARB, NULL, _gloffset_CompressedTexSubImage1DARB),
+    NAME_FUNC_OFFSET(16120, glCompressedTexSubImage2DARB, glCompressedTexSubImage2DARB, NULL, _gloffset_CompressedTexSubImage2DARB),
+    NAME_FUNC_OFFSET(16146, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, _gloffset_CompressedTexSubImage3DARB),
+    NAME_FUNC_OFFSET(16172, glGetCompressedTexImageARB, glGetCompressedTexImageARB, NULL, _gloffset_GetCompressedTexImageARB),
+    NAME_FUNC_OFFSET(16196, glDisableVertexAttribArrayARB, glDisableVertexAttribArrayARB, NULL, _gloffset_DisableVertexAttribArrayARB),
+    NAME_FUNC_OFFSET(16223, glEnableVertexAttribArrayARB, glEnableVertexAttribArrayARB, NULL, _gloffset_EnableVertexAttribArrayARB),
+    NAME_FUNC_OFFSET(16249, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL, _gloffset_GetVertexAttribdvARB),
+    NAME_FUNC_OFFSET(16269, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL, _gloffset_GetVertexAttribfvARB),
+    NAME_FUNC_OFFSET(16289, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL, _gloffset_GetVertexAttribivARB),
+    NAME_FUNC_OFFSET(16309, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, _gloffset_ProgramEnvParameter4dARB),
+    NAME_FUNC_OFFSET(16332, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, _gloffset_ProgramEnvParameter4dvARB),
+    NAME_FUNC_OFFSET(16356, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, _gloffset_ProgramEnvParameter4fARB),
+    NAME_FUNC_OFFSET(16379, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, _gloffset_ProgramEnvParameter4fvARB),
+    NAME_FUNC_OFFSET(16403, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, _gloffset_VertexAttrib1dARB),
+    NAME_FUNC_OFFSET(16420, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL, _gloffset_VertexAttrib1dvARB),
+    NAME_FUNC_OFFSET(16438, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, _gloffset_VertexAttrib1fARB),
+    NAME_FUNC_OFFSET(16455, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, _gloffset_VertexAttrib1fvARB),
+    NAME_FUNC_OFFSET(16473, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, _gloffset_VertexAttrib1sARB),
+    NAME_FUNC_OFFSET(16490, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL, _gloffset_VertexAttrib1svARB),
+    NAME_FUNC_OFFSET(16508, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, _gloffset_VertexAttrib2dARB),
+    NAME_FUNC_OFFSET(16525, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL, _gloffset_VertexAttrib2dvARB),
+    NAME_FUNC_OFFSET(16543, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, _gloffset_VertexAttrib2fARB),
+    NAME_FUNC_OFFSET(16560, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, _gloffset_VertexAttrib2fvARB),
+    NAME_FUNC_OFFSET(16578, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, _gloffset_VertexAttrib2sARB),
+    NAME_FUNC_OFFSET(16595, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL, _gloffset_VertexAttrib2svARB),
+    NAME_FUNC_OFFSET(16613, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, _gloffset_VertexAttrib3dARB),
+    NAME_FUNC_OFFSET(16630, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL, _gloffset_VertexAttrib3dvARB),
+    NAME_FUNC_OFFSET(16648, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, _gloffset_VertexAttrib3fARB),
+    NAME_FUNC_OFFSET(16665, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, _gloffset_VertexAttrib3fvARB),
+    NAME_FUNC_OFFSET(16683, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, _gloffset_VertexAttrib3sARB),
+    NAME_FUNC_OFFSET(16700, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL, _gloffset_VertexAttrib3svARB),
+    NAME_FUNC_OFFSET(16718, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL, _gloffset_VertexAttrib4NbvARB),
+    NAME_FUNC_OFFSET(16737, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL, _gloffset_VertexAttrib4NivARB),
+    NAME_FUNC_OFFSET(16756, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL, _gloffset_VertexAttrib4NsvARB),
+    NAME_FUNC_OFFSET(16775, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL, _gloffset_VertexAttrib4NubARB),
+    NAME_FUNC_OFFSET(16794, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, _gloffset_VertexAttrib4NubvARB),
+    NAME_FUNC_OFFSET(16814, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, _gloffset_VertexAttrib4NuivARB),
+    NAME_FUNC_OFFSET(16834, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, _gloffset_VertexAttrib4NusvARB),
+    NAME_FUNC_OFFSET(16854, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, _gloffset_VertexAttrib4bvARB),
+    NAME_FUNC_OFFSET(16872, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, _gloffset_VertexAttrib4dARB),
+    NAME_FUNC_OFFSET(16889, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, _gloffset_VertexAttrib4dvARB),
+    NAME_FUNC_OFFSET(16907, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, _gloffset_VertexAttrib4fARB),
+    NAME_FUNC_OFFSET(16924, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, _gloffset_VertexAttrib4fvARB),
+    NAME_FUNC_OFFSET(16942, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, _gloffset_VertexAttrib4ivARB),
+    NAME_FUNC_OFFSET(16960, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, _gloffset_VertexAttrib4sARB),
+    NAME_FUNC_OFFSET(16977, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, _gloffset_VertexAttrib4svARB),
+    NAME_FUNC_OFFSET(16995, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, _gloffset_VertexAttrib4ubvARB),
+    NAME_FUNC_OFFSET(17014, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, _gloffset_VertexAttrib4uivARB),
+    NAME_FUNC_OFFSET(17033, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, _gloffset_VertexAttrib4usvARB),
+    NAME_FUNC_OFFSET(17052, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, _gloffset_VertexAttribPointerARB),
+    NAME_FUNC_OFFSET(17074, glBindBufferARB, glBindBufferARB, NULL, _gloffset_BindBufferARB),
+    NAME_FUNC_OFFSET(17087, glBufferDataARB, glBufferDataARB, NULL, _gloffset_BufferDataARB),
+    NAME_FUNC_OFFSET(17100, glBufferSubDataARB, glBufferSubDataARB, NULL, _gloffset_BufferSubDataARB),
+    NAME_FUNC_OFFSET(17116, glDeleteBuffersARB, glDeleteBuffersARB, NULL, _gloffset_DeleteBuffersARB),
+    NAME_FUNC_OFFSET(17132, glGenBuffersARB, glGenBuffersARB, NULL, _gloffset_GenBuffersARB),
+    NAME_FUNC_OFFSET(17145, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, _gloffset_GetBufferParameterivARB),
+    NAME_FUNC_OFFSET(17168, glGetBufferPointervARB, glGetBufferPointervARB, NULL, _gloffset_GetBufferPointervARB),
+    NAME_FUNC_OFFSET(17188, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, _gloffset_GetBufferSubDataARB),
+    NAME_FUNC_OFFSET(17207, glIsBufferARB, glIsBufferARB, NULL, _gloffset_IsBufferARB),
+    NAME_FUNC_OFFSET(17218, glMapBufferARB, glMapBufferARB, NULL, _gloffset_MapBufferARB),
+    NAME_FUNC_OFFSET(17230, glUnmapBufferARB, glUnmapBufferARB, NULL, _gloffset_UnmapBufferARB),
+    NAME_FUNC_OFFSET(17244, glBeginQueryARB, glBeginQueryARB, NULL, _gloffset_BeginQueryARB),
+    NAME_FUNC_OFFSET(17257, glDeleteQueriesARB, glDeleteQueriesARB, NULL, _gloffset_DeleteQueriesARB),
+    NAME_FUNC_OFFSET(17273, glEndQueryARB, glEndQueryARB, NULL, _gloffset_EndQueryARB),
+    NAME_FUNC_OFFSET(17284, glGenQueriesARB, glGenQueriesARB, NULL, _gloffset_GenQueriesARB),
+    NAME_FUNC_OFFSET(17297, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, _gloffset_GetQueryObjectivARB),
+    NAME_FUNC_OFFSET(17316, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, _gloffset_GetQueryObjectuivARB),
+    NAME_FUNC_OFFSET(17336, glGetQueryivARB, glGetQueryivARB, NULL, _gloffset_GetQueryivARB),
+    NAME_FUNC_OFFSET(17349, glIsQueryARB, glIsQueryARB, NULL, _gloffset_IsQueryARB),
+    NAME_FUNC_OFFSET(17359, glCompileShaderARB, glCompileShaderARB, NULL, _gloffset_CompileShaderARB),
+    NAME_FUNC_OFFSET(17375, glGetActiveUniformARB, glGetActiveUniformARB, NULL, _gloffset_GetActiveUniformARB),
+    NAME_FUNC_OFFSET(17394, glGetShaderSourceARB, glGetShaderSourceARB, NULL, _gloffset_GetShaderSourceARB),
+    NAME_FUNC_OFFSET(17412, glGetUniformLocationARB, glGetUniformLocationARB, NULL, _gloffset_GetUniformLocationARB),
+    NAME_FUNC_OFFSET(17433, glGetUniformfvARB, glGetUniformfvARB, NULL, _gloffset_GetUniformfvARB),
+    NAME_FUNC_OFFSET(17448, glGetUniformivARB, glGetUniformivARB, NULL, _gloffset_GetUniformivARB),
+    NAME_FUNC_OFFSET(17463, glLinkProgramARB, glLinkProgramARB, NULL, _gloffset_LinkProgramARB),
+    NAME_FUNC_OFFSET(17477, glShaderSourceARB, glShaderSourceARB, NULL, _gloffset_ShaderSourceARB),
+    NAME_FUNC_OFFSET(17492, glUniform1fARB, glUniform1fARB, NULL, _gloffset_Uniform1fARB),
+    NAME_FUNC_OFFSET(17504, glUniform1fvARB, glUniform1fvARB, NULL, _gloffset_Uniform1fvARB),
+    NAME_FUNC_OFFSET(17517, glUniform1iARB, glUniform1iARB, NULL, _gloffset_Uniform1iARB),
+    NAME_FUNC_OFFSET(17529, glUniform1ivARB, glUniform1ivARB, NULL, _gloffset_Uniform1ivARB),
+    NAME_FUNC_OFFSET(17542, glUniform2fARB, glUniform2fARB, NULL, _gloffset_Uniform2fARB),
+    NAME_FUNC_OFFSET(17554, glUniform2fvARB, glUniform2fvARB, NULL, _gloffset_Uniform2fvARB),
+    NAME_FUNC_OFFSET(17567, glUniform2iARB, glUniform2iARB, NULL, _gloffset_Uniform2iARB),
+    NAME_FUNC_OFFSET(17579, glUniform2ivARB, glUniform2ivARB, NULL, _gloffset_Uniform2ivARB),
+    NAME_FUNC_OFFSET(17592, glUniform3fARB, glUniform3fARB, NULL, _gloffset_Uniform3fARB),
+    NAME_FUNC_OFFSET(17604, glUniform3fvARB, glUniform3fvARB, NULL, _gloffset_Uniform3fvARB),
+    NAME_FUNC_OFFSET(17617, glUniform3iARB, glUniform3iARB, NULL, _gloffset_Uniform3iARB),
+    NAME_FUNC_OFFSET(17629, glUniform3ivARB, glUniform3ivARB, NULL, _gloffset_Uniform3ivARB),
+    NAME_FUNC_OFFSET(17642, glUniform4fARB, glUniform4fARB, NULL, _gloffset_Uniform4fARB),
+    NAME_FUNC_OFFSET(17654, glUniform4fvARB, glUniform4fvARB, NULL, _gloffset_Uniform4fvARB),
+    NAME_FUNC_OFFSET(17667, glUniform4iARB, glUniform4iARB, NULL, _gloffset_Uniform4iARB),
+    NAME_FUNC_OFFSET(17679, glUniform4ivARB, glUniform4ivARB, NULL, _gloffset_Uniform4ivARB),
+    NAME_FUNC_OFFSET(17692, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, _gloffset_UniformMatrix2fvARB),
+    NAME_FUNC_OFFSET(17711, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, _gloffset_UniformMatrix3fvARB),
+    NAME_FUNC_OFFSET(17730, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, _gloffset_UniformMatrix4fvARB),
+    NAME_FUNC_OFFSET(17749, glUseProgramObjectARB, glUseProgramObjectARB, NULL, _gloffset_UseProgramObjectARB),
+    NAME_FUNC_OFFSET(17762, glValidateProgramARB, glValidateProgramARB, NULL, _gloffset_ValidateProgramARB),
+    NAME_FUNC_OFFSET(17780, glBindAttribLocationARB, glBindAttribLocationARB, NULL, _gloffset_BindAttribLocationARB),
+    NAME_FUNC_OFFSET(17801, glGetActiveAttribARB, glGetActiveAttribARB, NULL, _gloffset_GetActiveAttribARB),
+    NAME_FUNC_OFFSET(17819, glGetAttribLocationARB, glGetAttribLocationARB, NULL, _gloffset_GetAttribLocationARB),
+    NAME_FUNC_OFFSET(17839, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
+    NAME_FUNC_OFFSET(17853, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
+    NAME_FUNC_OFFSET(17870, gl_dispatch_stub_581, gl_dispatch_stub_581, NULL, _gloffset_SampleMaskSGIS),
+    NAME_FUNC_OFFSET(17886, gl_dispatch_stub_582, gl_dispatch_stub_582, NULL, _gloffset_SamplePatternSGIS),
+    NAME_FUNC_OFFSET(17905, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(17923, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(17944, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(17966, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(17985, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(18007, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(18030, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
+    NAME_FUNC_OFFSET(18049, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
+    NAME_FUNC_OFFSET(18069, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
+    NAME_FUNC_OFFSET(18088, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
+    NAME_FUNC_OFFSET(18108, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
+    NAME_FUNC_OFFSET(18127, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
+    NAME_FUNC_OFFSET(18147, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
+    NAME_FUNC_OFFSET(18166, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
+    NAME_FUNC_OFFSET(18186, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
+    NAME_FUNC_OFFSET(18205, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
+    NAME_FUNC_OFFSET(18225, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
+    NAME_FUNC_OFFSET(18245, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
+    NAME_FUNC_OFFSET(18266, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
+    NAME_FUNC_OFFSET(18286, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
+    NAME_FUNC_OFFSET(18307, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
+    NAME_FUNC_OFFSET(18327, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
+    NAME_FUNC_OFFSET(18348, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
+    NAME_FUNC_OFFSET(18372, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
+    NAME_FUNC_OFFSET(18390, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
+    NAME_FUNC_OFFSET(18410, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
+    NAME_FUNC_OFFSET(18428, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
+    NAME_FUNC_OFFSET(18440, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
+    NAME_FUNC_OFFSET(18453, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
+    NAME_FUNC_OFFSET(18465, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
+    NAME_FUNC_OFFSET(18478, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
+    NAME_FUNC_OFFSET(18498, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
+    NAME_FUNC_OFFSET(18522, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
+    NAME_FUNC_OFFSET(18536, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
+    NAME_FUNC_OFFSET(18553, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
+    NAME_FUNC_OFFSET(18568, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
+    NAME_FUNC_OFFSET(18586, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
+    NAME_FUNC_OFFSET(18600, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
+    NAME_FUNC_OFFSET(18617, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
+    NAME_FUNC_OFFSET(18632, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
+    NAME_FUNC_OFFSET(18650, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
+    NAME_FUNC_OFFSET(18664, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
+    NAME_FUNC_OFFSET(18681, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
+    NAME_FUNC_OFFSET(18696, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
+    NAME_FUNC_OFFSET(18714, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
+    NAME_FUNC_OFFSET(18728, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
+    NAME_FUNC_OFFSET(18745, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
+    NAME_FUNC_OFFSET(18760, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
+    NAME_FUNC_OFFSET(18778, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
+    NAME_FUNC_OFFSET(18792, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
+    NAME_FUNC_OFFSET(18809, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
+    NAME_FUNC_OFFSET(18824, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
+    NAME_FUNC_OFFSET(18842, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
+    NAME_FUNC_OFFSET(18856, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
+    NAME_FUNC_OFFSET(18873, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
+    NAME_FUNC_OFFSET(18888, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
+    NAME_FUNC_OFFSET(18906, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
+    NAME_FUNC_OFFSET(18920, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
+    NAME_FUNC_OFFSET(18937, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
+    NAME_FUNC_OFFSET(18952, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
+    NAME_FUNC_OFFSET(18970, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
+    NAME_FUNC_OFFSET(18984, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
+    NAME_FUNC_OFFSET(19001, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
+    NAME_FUNC_OFFSET(19016, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
+    NAME_FUNC_OFFSET(19034, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
+    NAME_FUNC_OFFSET(19051, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
+    NAME_FUNC_OFFSET(19071, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
+    NAME_FUNC_OFFSET(19088, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
+    NAME_FUNC_OFFSET(19114, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
+    NAME_FUNC_OFFSET(19143, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
+    NAME_FUNC_OFFSET(19158, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
+    NAME_FUNC_OFFSET(19176, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
+    NAME_FUNC_OFFSET(19195, gl_dispatch_stub_752, gl_dispatch_stub_752, NULL, _gloffset_DeleteVertexArraysAPPLE),
+    NAME_FUNC_OFFSET(19216, gl_dispatch_stub_754, gl_dispatch_stub_754, NULL, _gloffset_IsVertexArrayAPPLE),
+    NAME_FUNC_OFFSET(19232, gl_dispatch_stub_762, gl_dispatch_stub_762, NULL, _gloffset_BlendEquationSeparateEXT),
+    NAME_FUNC_OFFSET(19256, gl_dispatch_stub_762, gl_dispatch_stub_762, NULL, _gloffset_BlendEquationSeparateEXT),
+    NAME_FUNC_OFFSET(19283, glBindFramebufferEXT, glBindFramebufferEXT, NULL, _gloffset_BindFramebufferEXT),
+    NAME_FUNC_OFFSET(19301, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, _gloffset_BindRenderbufferEXT),
+    NAME_FUNC_OFFSET(19320, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, _gloffset_CheckFramebufferStatusEXT),
+    NAME_FUNC_OFFSET(19345, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, _gloffset_DeleteFramebuffersEXT),
+    NAME_FUNC_OFFSET(19366, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, _gloffset_DeleteRenderbuffersEXT),
+    NAME_FUNC_OFFSET(19388, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, _gloffset_FramebufferRenderbufferEXT),
+    NAME_FUNC_OFFSET(19414, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, _gloffset_FramebufferTexture1DEXT),
+    NAME_FUNC_OFFSET(19437, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, _gloffset_FramebufferTexture2DEXT),
+    NAME_FUNC_OFFSET(19460, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, _gloffset_FramebufferTexture3DEXT),
+    NAME_FUNC_OFFSET(19483, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, _gloffset_GenFramebuffersEXT),
+    NAME_FUNC_OFFSET(19501, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, _gloffset_GenRenderbuffersEXT),
+    NAME_FUNC_OFFSET(19520, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, _gloffset_GenerateMipmapEXT),
+    NAME_FUNC_OFFSET(19537, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, _gloffset_GetFramebufferAttachmentParameterivEXT),
+    NAME_FUNC_OFFSET(19575, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, _gloffset_GetRenderbufferParameterivEXT),
+    NAME_FUNC_OFFSET(19604, glIsFramebufferEXT, glIsFramebufferEXT, NULL, _gloffset_IsFramebufferEXT),
+    NAME_FUNC_OFFSET(19620, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, _gloffset_IsRenderbufferEXT),
+    NAME_FUNC_OFFSET(19637, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, _gloffset_RenderbufferStorageEXT),
+    NAME_FUNC_OFFSET(19659, gl_dispatch_stub_780, gl_dispatch_stub_780, NULL, _gloffset_BlitFramebufferEXT),
+    NAME_FUNC_OFFSET(19677, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
     NAME_FUNC_OFFSET(-1, NULL, NULL, NULL, 0)
 };
 
diff --git a/src/mesa/main/enums.c b/src/mesa/main/enums.c
index ad40bb6e78..9f650dadd3 100644
--- a/src/mesa/main/enums.c
+++ b/src/mesa/main/enums.c
@@ -82,6 +82,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_ALPHA_TEST\0"
    "GL_ALPHA_TEST_FUNC\0"
    "GL_ALPHA_TEST_REF\0"
+   "GL_ALREADY_SIGNALED\0"
    "GL_ALWAYS\0"
    "GL_AMBIENT\0"
    "GL_AMBIENT_AND_DIFFUSE\0"
@@ -305,6 +306,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_COMPRESSED_SRGB\0"
    "GL_COMPRESSED_SRGB_ALPHA\0"
    "GL_COMPRESSED_TEXTURE_FORMATS\0"
+   "GL_CONDITION_SATISFIED\0"
    "GL_CONSTANT\0"
    "GL_CONSTANT_ALPHA\0"
    "GL_CONSTANT_ALPHA_EXT\0"
@@ -944,6 +946,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_MAX_RECTANGLE_TEXTURE_SIZE_NV\0"
    "GL_MAX_RENDERBUFFER_SIZE_EXT\0"
    "GL_MAX_SAMPLES\0"
+   "GL_MAX_SERVER_WAIT_TIMEOUT\0"
    "GL_MAX_SHININESS_NV\0"
    "GL_MAX_SPOT_EXPONENT_NV\0"
    "GL_MAX_TEXTURE_COORDS\0"
@@ -1072,6 +1075,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_OBJECT_PLANE\0"
    "GL_OBJECT_SHADER_SOURCE_LENGTH_ARB\0"
    "GL_OBJECT_SUBTYPE_ARB\0"
+   "GL_OBJECT_TYPE\0"
    "GL_OBJECT_TYPE_ARB\0"
    "GL_OBJECT_VALIDATE_STATUS_ARB\0"
    "GL_OCCLUSION_TEST_HP\0"
@@ -1452,6 +1456,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_SHARED_TEXTURE_PALETTE_EXT\0"
    "GL_SHININESS\0"
    "GL_SHORT\0"
+   "GL_SIGNALED\0"
    "GL_SIGNED_NORMALIZED\0"
    "GL_SINGLE_COLOR\0"
    "GL_SINGLE_COLOR_EXT\0"
@@ -1556,6 +1561,12 @@ LONGSTRING static const char enum_string_table[] =
    "GL_SUBPIXEL_BITS\0"
    "GL_SUBTRACT\0"
    "GL_SUBTRACT_ARB\0"
+   "GL_SYNC_CONDITION\0"
+   "GL_SYNC_FENCE\0"
+   "GL_SYNC_FLAGS\0"
+   "GL_SYNC_FLUSH_COMMANDS_BIT\0"
+   "GL_SYNC_GPU_COMMANDS_COMPLETE\0"
+   "GL_SYNC_STATUS\0"
    "GL_T\0"
    "GL_T2F_C3F_V3F\0"
    "GL_T2F_C4F_N3F_V3F\0"
@@ -1752,6 +1763,8 @@ LONGSTRING static const char enum_string_table[] =
    "GL_TEXTURE_WRAP_R\0"
    "GL_TEXTURE_WRAP_S\0"
    "GL_TEXTURE_WRAP_T\0"
+   "GL_TIMEOUT_EXPIRED\0"
+   "GL_TIMEOUT_IGNORED\0"
    "GL_TIME_ELAPSED_EXT\0"
    "GL_TRACK_MATRIX_NV\0"
    "GL_TRACK_MATRIX_TRANSFORM_NV\0"
@@ -1779,6 +1792,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_UNPACK_SKIP_PIXELS\0"
    "GL_UNPACK_SKIP_ROWS\0"
    "GL_UNPACK_SWAP_BYTES\0"
+   "GL_UNSIGNALED\0"
    "GL_UNSIGNED_BYTE\0"
    "GL_UNSIGNED_BYTE_2_3_3_REV\0"
    "GL_UNSIGNED_BYTE_3_3_2\0"
@@ -1861,6 +1875,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_VERTEX_STATE_PROGRAM_NV\0"
    "GL_VIEWPORT\0"
    "GL_VIEWPORT_BIT\0"
+   "GL_WAIT_FAILED\0"
    "GL_WEIGHT_ARRAY_ARB\0"
    "GL_WEIGHT_ARRAY_BUFFER_BINDING\0"
    "GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB\0"
@@ -1880,7 +1895,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_ZOOM_Y\0"
    ;
 
-static const enum_elt all_enums[1842] =
+static const enum_elt all_enums[1857] =
 {
    {     0, 0x00000600 }, /* GL_2D */
    {     6, 0x00001407 }, /* GL_2_BYTES */
@@ -1928,3139 +1943,3168 @@ static const enum_elt all_enums[1842] =
    {   728, 0x00000BC0 }, /* GL_ALPHA_TEST */
    {   742, 0x00000BC1 }, /* GL_ALPHA_TEST_FUNC */
    {   761, 0x00000BC2 }, /* GL_ALPHA_TEST_REF */
-   {   779, 0x00000207 }, /* GL_ALWAYS */
-   {   789, 0x00001200 }, /* GL_AMBIENT */
-   {   800, 0x00001602 }, /* GL_AMBIENT_AND_DIFFUSE */
-   {   823, 0x00001501 }, /* GL_AND */
-   {   830, 0x00001504 }, /* GL_AND_INVERTED */
-   {   846, 0x00001502 }, /* GL_AND_REVERSE */
-   {   861, 0x00008892 }, /* GL_ARRAY_BUFFER */
-   {   877, 0x00008894 }, /* GL_ARRAY_BUFFER_BINDING */
-   {   901, 0x00008894 }, /* GL_ARRAY_BUFFER_BINDING_ARB */
-   {   929, 0x00008B85 }, /* GL_ATTACHED_SHADERS */
-   {   949, 0x00008645 }, /* GL_ATTRIB_ARRAY_POINTER_NV */
-   {   976, 0x00008623 }, /* GL_ATTRIB_ARRAY_SIZE_NV */
-   {  1000, 0x00008624 }, /* GL_ATTRIB_ARRAY_STRIDE_NV */
-   {  1026, 0x00008625 }, /* GL_ATTRIB_ARRAY_TYPE_NV */
-   {  1050, 0x00000BB0 }, /* GL_ATTRIB_STACK_DEPTH */
-   {  1072, 0x00000D80 }, /* GL_AUTO_NORMAL */
-   {  1087, 0x00000409 }, /* GL_AUX0 */
-   {  1095, 0x0000040A }, /* GL_AUX1 */
-   {  1103, 0x0000040B }, /* GL_AUX2 */
-   {  1111, 0x0000040C }, /* GL_AUX3 */
-   {  1119, 0x00000C00 }, /* GL_AUX_BUFFERS */
-   {  1134, 0x00000405 }, /* GL_BACK */
-   {  1142, 0x00000402 }, /* GL_BACK_LEFT */
-   {  1155, 0x00000403 }, /* GL_BACK_RIGHT */
-   {  1169, 0x000080E0 }, /* GL_BGR */
-   {  1176, 0x000080E1 }, /* GL_BGRA */
-   {  1184, 0x00001A00 }, /* GL_BITMAP */
-   {  1194, 0x00000704 }, /* GL_BITMAP_TOKEN */
-   {  1210, 0x00000BE2 }, /* GL_BLEND */
-   {  1219, 0x00008005 }, /* GL_BLEND_COLOR */
-   {  1234, 0x00008005 }, /* GL_BLEND_COLOR_EXT */
-   {  1253, 0x00000BE0 }, /* GL_BLEND_DST */
-   {  1266, 0x000080CA }, /* GL_BLEND_DST_ALPHA */
-   {  1285, 0x000080C8 }, /* GL_BLEND_DST_RGB */
-   {  1302, 0x00008009 }, /* GL_BLEND_EQUATION */
-   {  1320, 0x0000883D }, /* GL_BLEND_EQUATION_ALPHA */
-   {  1344, 0x0000883D }, /* GL_BLEND_EQUATION_ALPHA_EXT */
-   {  1372, 0x00008009 }, /* GL_BLEND_EQUATION_EXT */
-   {  1394, 0x00008009 }, /* GL_BLEND_EQUATION_RGB */
-   {  1416, 0x00008009 }, /* GL_BLEND_EQUATION_RGB_EXT */
-   {  1442, 0x00000BE1 }, /* GL_BLEND_SRC */
-   {  1455, 0x000080CB }, /* GL_BLEND_SRC_ALPHA */
-   {  1474, 0x000080C9 }, /* GL_BLEND_SRC_RGB */
-   {  1491, 0x00001905 }, /* GL_BLUE */
-   {  1499, 0x00000D1B }, /* GL_BLUE_BIAS */
-   {  1512, 0x00000D54 }, /* GL_BLUE_BITS */
-   {  1525, 0x00000D1A }, /* GL_BLUE_SCALE */
-   {  1539, 0x00008B56 }, /* GL_BOOL */
-   {  1547, 0x00008B56 }, /* GL_BOOL_ARB */
-   {  1559, 0x00008B57 }, /* GL_BOOL_VEC2 */
-   {  1572, 0x00008B57 }, /* GL_BOOL_VEC2_ARB */
-   {  1589, 0x00008B58 }, /* GL_BOOL_VEC3 */
-   {  1602, 0x00008B58 }, /* GL_BOOL_VEC3_ARB */
-   {  1619, 0x00008B59 }, /* GL_BOOL_VEC4 */
-   {  1632, 0x00008B59 }, /* GL_BOOL_VEC4_ARB */
-   {  1649, 0x000088BB }, /* GL_BUFFER_ACCESS */
-   {  1666, 0x000088BB }, /* GL_BUFFER_ACCESS_ARB */
-   {  1687, 0x00008A13 }, /* GL_BUFFER_FLUSHING_UNMAP_APPLE */
-   {  1718, 0x000088BC }, /* GL_BUFFER_MAPPED */
-   {  1735, 0x000088BC }, /* GL_BUFFER_MAPPED_ARB */
-   {  1756, 0x000088BD }, /* GL_BUFFER_MAP_POINTER */
-   {  1778, 0x000088BD }, /* GL_BUFFER_MAP_POINTER_ARB */
-   {  1804, 0x00008A12 }, /* GL_BUFFER_SERIALIZED_MODIFY_APPLE */
-   {  1838, 0x00008764 }, /* GL_BUFFER_SIZE */
-   {  1853, 0x00008764 }, /* GL_BUFFER_SIZE_ARB */
-   {  1872, 0x00008765 }, /* GL_BUFFER_USAGE */
-   {  1888, 0x00008765 }, /* GL_BUFFER_USAGE_ARB */
-   {  1908, 0x0000877B }, /* GL_BUMP_ENVMAP_ATI */
-   {  1927, 0x00008777 }, /* GL_BUMP_NUM_TEX_UNITS_ATI */
-   {  1953, 0x00008775 }, /* GL_BUMP_ROT_MATRIX_ATI */
-   {  1976, 0x00008776 }, /* GL_BUMP_ROT_MATRIX_SIZE_ATI */
-   {  2004, 0x0000877C }, /* GL_BUMP_TARGET_ATI */
-   {  2023, 0x00008778 }, /* GL_BUMP_TEX_UNITS_ATI */
-   {  2045, 0x00001400 }, /* GL_BYTE */
-   {  2053, 0x00002A24 }, /* GL_C3F_V3F */
-   {  2064, 0x00002A26 }, /* GL_C4F_N3F_V3F */
-   {  2079, 0x00002A22 }, /* GL_C4UB_V2F */
-   {  2091, 0x00002A23 }, /* GL_C4UB_V3F */
-   {  2103, 0x00000901 }, /* GL_CCW */
-   {  2110, 0x00002900 }, /* GL_CLAMP */
-   {  2119, 0x0000812D }, /* GL_CLAMP_TO_BORDER */
-   {  2138, 0x0000812D }, /* GL_CLAMP_TO_BORDER_ARB */
-   {  2161, 0x0000812D }, /* GL_CLAMP_TO_BORDER_SGIS */
-   {  2185, 0x0000812F }, /* GL_CLAMP_TO_EDGE */
-   {  2202, 0x0000812F }, /* GL_CLAMP_TO_EDGE_SGIS */
-   {  2224, 0x00001500 }, /* GL_CLEAR */
-   {  2233, 0x000084E1 }, /* GL_CLIENT_ACTIVE_TEXTURE */
-   {  2258, 0x000084E1 }, /* GL_CLIENT_ACTIVE_TEXTURE_ARB */
-   {  2287, 0xFFFFFFFF }, /* GL_CLIENT_ALL_ATTRIB_BITS */
-   {  2313, 0x00000BB1 }, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
-   {  2342, 0x00000001 }, /* GL_CLIENT_PIXEL_STORE_BIT */
-   {  2368, 0x00000002 }, /* GL_CLIENT_VERTEX_ARRAY_BIT */
-   {  2395, 0x00003000 }, /* GL_CLIP_PLANE0 */
-   {  2410, 0x00003001 }, /* GL_CLIP_PLANE1 */
-   {  2425, 0x00003002 }, /* GL_CLIP_PLANE2 */
-   {  2440, 0x00003003 }, /* GL_CLIP_PLANE3 */
-   {  2455, 0x00003004 }, /* GL_CLIP_PLANE4 */
-   {  2470, 0x00003005 }, /* GL_CLIP_PLANE5 */
-   {  2485, 0x000080F0 }, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
-   {  2518, 0x00000A00 }, /* GL_COEFF */
-   {  2527, 0x00001800 }, /* GL_COLOR */
-   {  2536, 0x00008076 }, /* GL_COLOR_ARRAY */
-   {  2551, 0x00008898 }, /* GL_COLOR_ARRAY_BUFFER_BINDING */
-   {  2581, 0x00008898 }, /* GL_COLOR_ARRAY_BUFFER_BINDING_ARB */
-   {  2615, 0x00008090 }, /* GL_COLOR_ARRAY_POINTER */
-   {  2638, 0x00008081 }, /* GL_COLOR_ARRAY_SIZE */
-   {  2658, 0x00008083 }, /* GL_COLOR_ARRAY_STRIDE */
-   {  2680, 0x00008082 }, /* GL_COLOR_ARRAY_TYPE */
-   {  2700, 0x00008CE0 }, /* GL_COLOR_ATTACHMENT0 */
-   {  2721, 0x00008CE0 }, /* GL_COLOR_ATTACHMENT0_EXT */
-   {  2746, 0x00008CE1 }, /* GL_COLOR_ATTACHMENT1 */
-   {  2767, 0x00008CEA }, /* GL_COLOR_ATTACHMENT10 */
-   {  2789, 0x00008CEA }, /* GL_COLOR_ATTACHMENT10_EXT */
-   {  2815, 0x00008CEB }, /* GL_COLOR_ATTACHMENT11 */
-   {  2837, 0x00008CEB }, /* GL_COLOR_ATTACHMENT11_EXT */
-   {  2863, 0x00008CEC }, /* GL_COLOR_ATTACHMENT12 */
-   {  2885, 0x00008CEC }, /* GL_COLOR_ATTACHMENT12_EXT */
-   {  2911, 0x00008CED }, /* GL_COLOR_ATTACHMENT13 */
-   {  2933, 0x00008CED }, /* GL_COLOR_ATTACHMENT13_EXT */
-   {  2959, 0x00008CEE }, /* GL_COLOR_ATTACHMENT14 */
-   {  2981, 0x00008CEE }, /* GL_COLOR_ATTACHMENT14_EXT */
-   {  3007, 0x00008CEF }, /* GL_COLOR_ATTACHMENT15 */
-   {  3029, 0x00008CEF }, /* GL_COLOR_ATTACHMENT15_EXT */
-   {  3055, 0x00008CE1 }, /* GL_COLOR_ATTACHMENT1_EXT */
-   {  3080, 0x00008CE2 }, /* GL_COLOR_ATTACHMENT2 */
-   {  3101, 0x00008CE2 }, /* GL_COLOR_ATTACHMENT2_EXT */
-   {  3126, 0x00008CE3 }, /* GL_COLOR_ATTACHMENT3 */
-   {  3147, 0x00008CE3 }, /* GL_COLOR_ATTACHMENT3_EXT */
-   {  3172, 0x00008CE4 }, /* GL_COLOR_ATTACHMENT4 */
-   {  3193, 0x00008CE4 }, /* GL_COLOR_ATTACHMENT4_EXT */
-   {  3218, 0x00008CE5 }, /* GL_COLOR_ATTACHMENT5 */
-   {  3239, 0x00008CE5 }, /* GL_COLOR_ATTACHMENT5_EXT */
-   {  3264, 0x00008CE6 }, /* GL_COLOR_ATTACHMENT6 */
-   {  3285, 0x00008CE6 }, /* GL_COLOR_ATTACHMENT6_EXT */
-   {  3310, 0x00008CE7 }, /* GL_COLOR_ATTACHMENT7 */
-   {  3331, 0x00008CE7 }, /* GL_COLOR_ATTACHMENT7_EXT */
-   {  3356, 0x00008CE8 }, /* GL_COLOR_ATTACHMENT8 */
-   {  3377, 0x00008CE8 }, /* GL_COLOR_ATTACHMENT8_EXT */
-   {  3402, 0x00008CE9 }, /* GL_COLOR_ATTACHMENT9 */
-   {  3423, 0x00008CE9 }, /* GL_COLOR_ATTACHMENT9_EXT */
-   {  3448, 0x00004000 }, /* GL_COLOR_BUFFER_BIT */
-   {  3468, 0x00000C22 }, /* GL_COLOR_CLEAR_VALUE */
-   {  3489, 0x00001900 }, /* GL_COLOR_INDEX */
-   {  3504, 0x00001603 }, /* GL_COLOR_INDEXES */
-   {  3521, 0x00000BF2 }, /* GL_COLOR_LOGIC_OP */
-   {  3539, 0x00000B57 }, /* GL_COLOR_MATERIAL */
-   {  3557, 0x00000B55 }, /* GL_COLOR_MATERIAL_FACE */
-   {  3580, 0x00000B56 }, /* GL_COLOR_MATERIAL_PARAMETER */
-   {  3608, 0x000080B1 }, /* GL_COLOR_MATRIX */
-   {  3624, 0x000080B1 }, /* GL_COLOR_MATRIX_SGI */
-   {  3644, 0x000080B2 }, /* GL_COLOR_MATRIX_STACK_DEPTH */
-   {  3672, 0x000080B2 }, /* GL_COLOR_MATRIX_STACK_DEPTH_SGI */
-   {  3704, 0x00008458 }, /* GL_COLOR_SUM */
-   {  3717, 0x00008458 }, /* GL_COLOR_SUM_ARB */
-   {  3734, 0x000080D0 }, /* GL_COLOR_TABLE */
-   {  3749, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE */
-   {  3775, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE_EXT */
-   {  3805, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE_SGI */
-   {  3835, 0x000080D7 }, /* GL_COLOR_TABLE_BIAS */
-   {  3855, 0x000080D7 }, /* GL_COLOR_TABLE_BIAS_SGI */
-   {  3879, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE */
-   {  3904, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE_EXT */
-   {  3933, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE_SGI */
-   {  3962, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT */
-   {  3984, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT_EXT */
-   {  4010, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT_SGI */
-   {  4036, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE */
-   {  4062, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE_EXT */
-   {  4092, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE_SGI */
-   {  4122, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE */
-   {  4152, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE_EXT */
-   {  4186, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE_SGI */
-   {  4220, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE */
-   {  4250, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE_EXT */
-   {  4284, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE_SGI */
-   {  4318, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE */
-   {  4342, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE_EXT */
-   {  4370, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE_SGI */
-   {  4398, 0x000080D6 }, /* GL_COLOR_TABLE_SCALE */
-   {  4419, 0x000080D6 }, /* GL_COLOR_TABLE_SCALE_SGI */
-   {  4444, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH */
-   {  4465, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH_EXT */
-   {  4490, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH_SGI */
-   {  4515, 0x00000C23 }, /* GL_COLOR_WRITEMASK */
-   {  4534, 0x00008570 }, /* GL_COMBINE */
-   {  4545, 0x00008503 }, /* GL_COMBINE4 */
-   {  4557, 0x00008572 }, /* GL_COMBINE_ALPHA */
-   {  4574, 0x00008572 }, /* GL_COMBINE_ALPHA_ARB */
-   {  4595, 0x00008572 }, /* GL_COMBINE_ALPHA_EXT */
-   {  4616, 0x00008570 }, /* GL_COMBINE_ARB */
-   {  4631, 0x00008570 }, /* GL_COMBINE_EXT */
-   {  4646, 0x00008571 }, /* GL_COMBINE_RGB */
-   {  4661, 0x00008571 }, /* GL_COMBINE_RGB_ARB */
-   {  4680, 0x00008571 }, /* GL_COMBINE_RGB_EXT */
-   {  4699, 0x0000884E }, /* GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT */
-   {  4735, 0x0000884E }, /* GL_COMPARE_R_TO_TEXTURE */
-   {  4759, 0x0000884E }, /* GL_COMPARE_R_TO_TEXTURE_ARB */
-   {  4787, 0x00001300 }, /* GL_COMPILE */
-   {  4798, 0x00001301 }, /* GL_COMPILE_AND_EXECUTE */
-   {  4821, 0x00008B81 }, /* GL_COMPILE_STATUS */
-   {  4839, 0x000084E9 }, /* GL_COMPRESSED_ALPHA */
-   {  4859, 0x000084E9 }, /* GL_COMPRESSED_ALPHA_ARB */
-   {  4883, 0x000084EC }, /* GL_COMPRESSED_INTENSITY */
-   {  4907, 0x000084EC }, /* GL_COMPRESSED_INTENSITY_ARB */
-   {  4935, 0x000084EA }, /* GL_COMPRESSED_LUMINANCE */
-   {  4959, 0x000084EB }, /* GL_COMPRESSED_LUMINANCE_ALPHA */
-   {  4989, 0x000084EB }, /* GL_COMPRESSED_LUMINANCE_ALPHA_ARB */
-   {  5023, 0x000084EA }, /* GL_COMPRESSED_LUMINANCE_ARB */
-   {  5051, 0x000084ED }, /* GL_COMPRESSED_RGB */
-   {  5069, 0x000084EE }, /* GL_COMPRESSED_RGBA */
-   {  5088, 0x000084EE }, /* GL_COMPRESSED_RGBA_ARB */
-   {  5111, 0x000086B1 }, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
-   {  5140, 0x000083F1 }, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
-   {  5173, 0x000083F2 }, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
-   {  5206, 0x000083F3 }, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */
-   {  5239, 0x000084ED }, /* GL_COMPRESSED_RGB_ARB */
-   {  5261, 0x000086B0 }, /* GL_COMPRESSED_RGB_FXT1_3DFX */
-   {  5289, 0x000083F0 }, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
-   {  5321, 0x00008C4A }, /* GL_COMPRESSED_SLUMINANCE */
-   {  5346, 0x00008C4B }, /* GL_COMPRESSED_SLUMINANCE_ALPHA */
-   {  5377, 0x00008C48 }, /* GL_COMPRESSED_SRGB */
-   {  5396, 0x00008C49 }, /* GL_COMPRESSED_SRGB_ALPHA */
-   {  5421, 0x000086A3 }, /* GL_COMPRESSED_TEXTURE_FORMATS */
-   {  5451, 0x00008576 }, /* GL_CONSTANT */
-   {  5463, 0x00008003 }, /* GL_CONSTANT_ALPHA */
-   {  5481, 0x00008003 }, /* GL_CONSTANT_ALPHA_EXT */
-   {  5503, 0x00008576 }, /* GL_CONSTANT_ARB */
-   {  5519, 0x00001207 }, /* GL_CONSTANT_ATTENUATION */
-   {  5543, 0x00008151 }, /* GL_CONSTANT_BORDER_HP */
-   {  5565, 0x00008001 }, /* GL_CONSTANT_COLOR */
-   {  5583, 0x00008001 }, /* GL_CONSTANT_COLOR_EXT */
-   {  5605, 0x00008576 }, /* GL_CONSTANT_EXT */
-   {  5621, 0x00008010 }, /* GL_CONVOLUTION_1D */
-   {  5639, 0x00008011 }, /* GL_CONVOLUTION_2D */
-   {  5657, 0x00008154 }, /* GL_CONVOLUTION_BORDER_COLOR */
-   {  5685, 0x00008154 }, /* GL_CONVOLUTION_BORDER_COLOR_HP */
-   {  5716, 0x00008013 }, /* GL_CONVOLUTION_BORDER_MODE */
-   {  5743, 0x00008013 }, /* GL_CONVOLUTION_BORDER_MODE_EXT */
-   {  5774, 0x00008015 }, /* GL_CONVOLUTION_FILTER_BIAS */
-   {  5801, 0x00008015 }, /* GL_CONVOLUTION_FILTER_BIAS_EXT */
-   {  5832, 0x00008014 }, /* GL_CONVOLUTION_FILTER_SCALE */
-   {  5860, 0x00008014 }, /* GL_CONVOLUTION_FILTER_SCALE_EXT */
-   {  5892, 0x00008017 }, /* GL_CONVOLUTION_FORMAT */
-   {  5914, 0x00008017 }, /* GL_CONVOLUTION_FORMAT_EXT */
-   {  5940, 0x00008019 }, /* GL_CONVOLUTION_HEIGHT */
-   {  5962, 0x00008019 }, /* GL_CONVOLUTION_HEIGHT_EXT */
-   {  5988, 0x00008018 }, /* GL_CONVOLUTION_WIDTH */
-   {  6009, 0x00008018 }, /* GL_CONVOLUTION_WIDTH_EXT */
-   {  6034, 0x00008862 }, /* GL_COORD_REPLACE */
-   {  6051, 0x00008862 }, /* GL_COORD_REPLACE_ARB */
-   {  6072, 0x00008862 }, /* GL_COORD_REPLACE_NV */
-   {  6092, 0x00001503 }, /* GL_COPY */
-   {  6100, 0x0000150C }, /* GL_COPY_INVERTED */
-   {  6117, 0x00000706 }, /* GL_COPY_PIXEL_TOKEN */
-   {  6137, 0x00008F36 }, /* GL_COPY_READ_BUFFER */
-   {  6157, 0x00008F37 }, /* GL_COPY_WRITE_BUFFER */
-   {  6178, 0x00000B44 }, /* GL_CULL_FACE */
-   {  6191, 0x00000B45 }, /* GL_CULL_FACE_MODE */
-   {  6209, 0x000081AA }, /* GL_CULL_VERTEX_EXT */
-   {  6228, 0x000081AC }, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
-   {  6260, 0x000081AB }, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
-   {  6295, 0x00008626 }, /* GL_CURRENT_ATTRIB_NV */
-   {  6316, 0x00000001 }, /* GL_CURRENT_BIT */
-   {  6331, 0x00000B00 }, /* GL_CURRENT_COLOR */
-   {  6348, 0x00008453 }, /* GL_CURRENT_FOG_COORD */
-   {  6369, 0x00008453 }, /* GL_CURRENT_FOG_COORDINATE */
-   {  6395, 0x00000B01 }, /* GL_CURRENT_INDEX */
-   {  6412, 0x00008641 }, /* GL_CURRENT_MATRIX_ARB */
-   {  6434, 0x00008845 }, /* GL_CURRENT_MATRIX_INDEX_ARB */
-   {  6462, 0x00008641 }, /* GL_CURRENT_MATRIX_NV */
-   {  6483, 0x00008640 }, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
-   {  6517, 0x00008640 }, /* GL_CURRENT_MATRIX_STACK_DEPTH_NV */
-   {  6550, 0x00000B02 }, /* GL_CURRENT_NORMAL */
-   {  6568, 0x00008843 }, /* GL_CURRENT_PALETTE_MATRIX_ARB */
-   {  6598, 0x00008B8D }, /* GL_CURRENT_PROGRAM */
-   {  6617, 0x00008865 }, /* GL_CURRENT_QUERY */
-   {  6634, 0x00008865 }, /* GL_CURRENT_QUERY_ARB */
-   {  6655, 0x00000B04 }, /* GL_CURRENT_RASTER_COLOR */
-   {  6679, 0x00000B09 }, /* GL_CURRENT_RASTER_DISTANCE */
-   {  6706, 0x00000B05 }, /* GL_CURRENT_RASTER_INDEX */
-   {  6730, 0x00000B07 }, /* GL_CURRENT_RASTER_POSITION */
-   {  6757, 0x00000B08 }, /* GL_CURRENT_RASTER_POSITION_VALID */
-   {  6790, 0x0000845F }, /* GL_CURRENT_RASTER_SECONDARY_COLOR */
-   {  6824, 0x00000B06 }, /* GL_CURRENT_RASTER_TEXTURE_COORDS */
-   {  6857, 0x00008459 }, /* GL_CURRENT_SECONDARY_COLOR */
-   {  6884, 0x00000B03 }, /* GL_CURRENT_TEXTURE_COORDS */
-   {  6910, 0x00008626 }, /* GL_CURRENT_VERTEX_ATTRIB */
-   {  6935, 0x00008626 }, /* GL_CURRENT_VERTEX_ATTRIB_ARB */
-   {  6964, 0x000086A8 }, /* GL_CURRENT_WEIGHT_ARB */
-   {  6986, 0x00000900 }, /* GL_CW */
-   {  6992, 0x0000875B }, /* GL_DEBUG_ASSERT_MESA */
-   {  7013, 0x00008759 }, /* GL_DEBUG_OBJECT_MESA */
-   {  7034, 0x0000875A }, /* GL_DEBUG_PRINT_MESA */
-   {  7054, 0x00002101 }, /* GL_DECAL */
-   {  7063, 0x00001E03 }, /* GL_DECR */
-   {  7071, 0x00008508 }, /* GL_DECR_WRAP */
-   {  7084, 0x00008508 }, /* GL_DECR_WRAP_EXT */
-   {  7101, 0x00008B80 }, /* GL_DELETE_STATUS */
-   {  7118, 0x00001801 }, /* GL_DEPTH */
-   {  7127, 0x000088F0 }, /* GL_DEPTH24_STENCIL8 */
-   {  7147, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT */
-   {  7167, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT_EXT */
-   {  7191, 0x00000D1F }, /* GL_DEPTH_BIAS */
-   {  7205, 0x00000D56 }, /* GL_DEPTH_BITS */
-   {  7219, 0x00008891 }, /* GL_DEPTH_BOUNDS_EXT */
-   {  7239, 0x00008890 }, /* GL_DEPTH_BOUNDS_TEST_EXT */
-   {  7264, 0x00000100 }, /* GL_DEPTH_BUFFER_BIT */
-   {  7284, 0x0000864F }, /* GL_DEPTH_CLAMP_NV */
-   {  7302, 0x00000B73 }, /* GL_DEPTH_CLEAR_VALUE */
-   {  7323, 0x00001902 }, /* GL_DEPTH_COMPONENT */
-   {  7342, 0x000081A5 }, /* GL_DEPTH_COMPONENT16 */
-   {  7363, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_ARB */
-   {  7388, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_SGIX */
-   {  7414, 0x000081A6 }, /* GL_DEPTH_COMPONENT24 */
-   {  7435, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_ARB */
-   {  7460, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_SGIX */
-   {  7486, 0x000081A7 }, /* GL_DEPTH_COMPONENT32 */
-   {  7507, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_ARB */
-   {  7532, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_SGIX */
-   {  7558, 0x00000B74 }, /* GL_DEPTH_FUNC */
-   {  7572, 0x00000B70 }, /* GL_DEPTH_RANGE */
-   {  7587, 0x00000D1E }, /* GL_DEPTH_SCALE */
-   {  7602, 0x000084F9 }, /* GL_DEPTH_STENCIL */
-   {  7619, 0x0000821A }, /* GL_DEPTH_STENCIL_ATTACHMENT */
-   {  7647, 0x000084F9 }, /* GL_DEPTH_STENCIL_NV */
-   {  7667, 0x0000886F }, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
-   {  7695, 0x0000886E }, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
-   {  7723, 0x00000B71 }, /* GL_DEPTH_TEST */
-   {  7737, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE */
-   {  7759, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE_ARB */
-   {  7785, 0x00000B72 }, /* GL_DEPTH_WRITEMASK */
-   {  7804, 0x00001201 }, /* GL_DIFFUSE */
-   {  7815, 0x00000BD0 }, /* GL_DITHER */
-   {  7825, 0x00000A02 }, /* GL_DOMAIN */
-   {  7835, 0x00001100 }, /* GL_DONT_CARE */
-   {  7848, 0x000086AE }, /* GL_DOT3_RGB */
-   {  7860, 0x000086AF }, /* GL_DOT3_RGBA */
-   {  7873, 0x000086AF }, /* GL_DOT3_RGBA_ARB */
-   {  7890, 0x00008741 }, /* GL_DOT3_RGBA_EXT */
-   {  7907, 0x000086AE }, /* GL_DOT3_RGB_ARB */
-   {  7923, 0x00008740 }, /* GL_DOT3_RGB_EXT */
-   {  7939, 0x0000140A }, /* GL_DOUBLE */
-   {  7949, 0x00000C32 }, /* GL_DOUBLEBUFFER */
-   {  7965, 0x00000C01 }, /* GL_DRAW_BUFFER */
-   {  7980, 0x00008825 }, /* GL_DRAW_BUFFER0 */
-   {  7996, 0x00008825 }, /* GL_DRAW_BUFFER0_ARB */
-   {  8016, 0x00008825 }, /* GL_DRAW_BUFFER0_ATI */
-   {  8036, 0x00008826 }, /* GL_DRAW_BUFFER1 */
-   {  8052, 0x0000882F }, /* GL_DRAW_BUFFER10 */
-   {  8069, 0x0000882F }, /* GL_DRAW_BUFFER10_ARB */
-   {  8090, 0x0000882F }, /* GL_DRAW_BUFFER10_ATI */
-   {  8111, 0x00008830 }, /* GL_DRAW_BUFFER11 */
-   {  8128, 0x00008830 }, /* GL_DRAW_BUFFER11_ARB */
-   {  8149, 0x00008830 }, /* GL_DRAW_BUFFER11_ATI */
-   {  8170, 0x00008831 }, /* GL_DRAW_BUFFER12 */
-   {  8187, 0x00008831 }, /* GL_DRAW_BUFFER12_ARB */
-   {  8208, 0x00008831 }, /* GL_DRAW_BUFFER12_ATI */
-   {  8229, 0x00008832 }, /* GL_DRAW_BUFFER13 */
-   {  8246, 0x00008832 }, /* GL_DRAW_BUFFER13_ARB */
-   {  8267, 0x00008832 }, /* GL_DRAW_BUFFER13_ATI */
-   {  8288, 0x00008833 }, /* GL_DRAW_BUFFER14 */
-   {  8305, 0x00008833 }, /* GL_DRAW_BUFFER14_ARB */
-   {  8326, 0x00008833 }, /* GL_DRAW_BUFFER14_ATI */
-   {  8347, 0x00008834 }, /* GL_DRAW_BUFFER15 */
-   {  8364, 0x00008834 }, /* GL_DRAW_BUFFER15_ARB */
-   {  8385, 0x00008834 }, /* GL_DRAW_BUFFER15_ATI */
-   {  8406, 0x00008826 }, /* GL_DRAW_BUFFER1_ARB */
-   {  8426, 0x00008826 }, /* GL_DRAW_BUFFER1_ATI */
-   {  8446, 0x00008827 }, /* GL_DRAW_BUFFER2 */
-   {  8462, 0x00008827 }, /* GL_DRAW_BUFFER2_ARB */
-   {  8482, 0x00008827 }, /* GL_DRAW_BUFFER2_ATI */
-   {  8502, 0x00008828 }, /* GL_DRAW_BUFFER3 */
-   {  8518, 0x00008828 }, /* GL_DRAW_BUFFER3_ARB */
-   {  8538, 0x00008828 }, /* GL_DRAW_BUFFER3_ATI */
-   {  8558, 0x00008829 }, /* GL_DRAW_BUFFER4 */
-   {  8574, 0x00008829 }, /* GL_DRAW_BUFFER4_ARB */
-   {  8594, 0x00008829 }, /* GL_DRAW_BUFFER4_ATI */
-   {  8614, 0x0000882A }, /* GL_DRAW_BUFFER5 */
-   {  8630, 0x0000882A }, /* GL_DRAW_BUFFER5_ARB */
-   {  8650, 0x0000882A }, /* GL_DRAW_BUFFER5_ATI */
-   {  8670, 0x0000882B }, /* GL_DRAW_BUFFER6 */
-   {  8686, 0x0000882B }, /* GL_DRAW_BUFFER6_ARB */
-   {  8706, 0x0000882B }, /* GL_DRAW_BUFFER6_ATI */
-   {  8726, 0x0000882C }, /* GL_DRAW_BUFFER7 */
-   {  8742, 0x0000882C }, /* GL_DRAW_BUFFER7_ARB */
-   {  8762, 0x0000882C }, /* GL_DRAW_BUFFER7_ATI */
-   {  8782, 0x0000882D }, /* GL_DRAW_BUFFER8 */
-   {  8798, 0x0000882D }, /* GL_DRAW_BUFFER8_ARB */
-   {  8818, 0x0000882D }, /* GL_DRAW_BUFFER8_ATI */
-   {  8838, 0x0000882E }, /* GL_DRAW_BUFFER9 */
-   {  8854, 0x0000882E }, /* GL_DRAW_BUFFER9_ARB */
-   {  8874, 0x0000882E }, /* GL_DRAW_BUFFER9_ATI */
-   {  8894, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER */
-   {  8914, 0x00008CA6 }, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
-   {  8946, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER_EXT */
-   {  8970, 0x00000705 }, /* GL_DRAW_PIXEL_TOKEN */
-   {  8990, 0x00000304 }, /* GL_DST_ALPHA */
-   {  9003, 0x00000306 }, /* GL_DST_COLOR */
-   {  9016, 0x0000877A }, /* GL_DU8DV8_ATI */
-   {  9030, 0x00008779 }, /* GL_DUDV_ATI */
-   {  9042, 0x000088EA }, /* GL_DYNAMIC_COPY */
-   {  9058, 0x000088EA }, /* GL_DYNAMIC_COPY_ARB */
-   {  9078, 0x000088E8 }, /* GL_DYNAMIC_DRAW */
-   {  9094, 0x000088E8 }, /* GL_DYNAMIC_DRAW_ARB */
-   {  9114, 0x000088E9 }, /* GL_DYNAMIC_READ */
-   {  9130, 0x000088E9 }, /* GL_DYNAMIC_READ_ARB */
-   {  9150, 0x00000B43 }, /* GL_EDGE_FLAG */
-   {  9163, 0x00008079 }, /* GL_EDGE_FLAG_ARRAY */
-   {  9182, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
-   {  9216, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB */
-   {  9254, 0x00008093 }, /* GL_EDGE_FLAG_ARRAY_POINTER */
-   {  9281, 0x0000808C }, /* GL_EDGE_FLAG_ARRAY_STRIDE */
-   {  9307, 0x00008893 }, /* GL_ELEMENT_ARRAY_BUFFER */
-   {  9331, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
-   {  9363, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB */
-   {  9399, 0x00001600 }, /* GL_EMISSION */
-   {  9411, 0x00002000 }, /* GL_ENABLE_BIT */
-   {  9425, 0x00000202 }, /* GL_EQUAL */
-   {  9434, 0x00001509 }, /* GL_EQUIV */
-   {  9443, 0x00010000 }, /* GL_EVAL_BIT */
-   {  9455, 0x00000800 }, /* GL_EXP */
-   {  9462, 0x00000801 }, /* GL_EXP2 */
-   {  9470, 0x00001F03 }, /* GL_EXTENSIONS */
-   {  9484, 0x00002400 }, /* GL_EYE_LINEAR */
-   {  9498, 0x00002502 }, /* GL_EYE_PLANE */
-   {  9511, 0x0000855C }, /* GL_EYE_PLANE_ABSOLUTE_NV */
-   {  9536, 0x0000855B }, /* GL_EYE_RADIAL_NV */
-   {  9553, 0x00000000 }, /* GL_FALSE */
-   {  9562, 0x00001101 }, /* GL_FASTEST */
-   {  9573, 0x00001C01 }, /* GL_FEEDBACK */
-   {  9585, 0x00000DF0 }, /* GL_FEEDBACK_BUFFER_POINTER */
-   {  9612, 0x00000DF1 }, /* GL_FEEDBACK_BUFFER_SIZE */
-   {  9636, 0x00000DF2 }, /* GL_FEEDBACK_BUFFER_TYPE */
-   {  9660, 0x00001B02 }, /* GL_FILL */
-   {  9668, 0x00008E4D }, /* GL_FIRST_VERTEX_CONVENTION_EXT */
-   {  9699, 0x00001D00 }, /* GL_FLAT */
-   {  9707, 0x00001406 }, /* GL_FLOAT */
-   {  9716, 0x00008B5A }, /* GL_FLOAT_MAT2 */
-   {  9730, 0x00008B5A }, /* GL_FLOAT_MAT2_ARB */
-   {  9748, 0x00008B65 }, /* GL_FLOAT_MAT2x3 */
-   {  9764, 0x00008B66 }, /* GL_FLOAT_MAT2x4 */
-   {  9780, 0x00008B5B }, /* GL_FLOAT_MAT3 */
-   {  9794, 0x00008B5B }, /* GL_FLOAT_MAT3_ARB */
-   {  9812, 0x00008B67 }, /* GL_FLOAT_MAT3x2 */
-   {  9828, 0x00008B68 }, /* GL_FLOAT_MAT3x4 */
-   {  9844, 0x00008B5C }, /* GL_FLOAT_MAT4 */
-   {  9858, 0x00008B5C }, /* GL_FLOAT_MAT4_ARB */
-   {  9876, 0x00008B69 }, /* GL_FLOAT_MAT4x2 */
-   {  9892, 0x00008B6A }, /* GL_FLOAT_MAT4x3 */
-   {  9908, 0x00008B50 }, /* GL_FLOAT_VEC2 */
-   {  9922, 0x00008B50 }, /* GL_FLOAT_VEC2_ARB */
-   {  9940, 0x00008B51 }, /* GL_FLOAT_VEC3 */
-   {  9954, 0x00008B51 }, /* GL_FLOAT_VEC3_ARB */
-   {  9972, 0x00008B52 }, /* GL_FLOAT_VEC4 */
-   {  9986, 0x00008B52 }, /* GL_FLOAT_VEC4_ARB */
-   { 10004, 0x00000B60 }, /* GL_FOG */
-   { 10011, 0x00000080 }, /* GL_FOG_BIT */
-   { 10022, 0x00000B66 }, /* GL_FOG_COLOR */
-   { 10035, 0x00008451 }, /* GL_FOG_COORD */
-   { 10048, 0x00008451 }, /* GL_FOG_COORDINATE */
-   { 10066, 0x00008457 }, /* GL_FOG_COORDINATE_ARRAY */
-   { 10090, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
-   { 10129, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB */
-   { 10172, 0x00008456 }, /* GL_FOG_COORDINATE_ARRAY_POINTER */
-   { 10204, 0x00008455 }, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
-   { 10235, 0x00008454 }, /* GL_FOG_COORDINATE_ARRAY_TYPE */
-   { 10264, 0x00008450 }, /* GL_FOG_COORDINATE_SOURCE */
-   { 10289, 0x00008457 }, /* GL_FOG_COORD_ARRAY */
-   { 10308, 0x0000889D }, /* GL_FOG_COORD_ARRAY_BUFFER_BINDING */
-   { 10342, 0x00008456 }, /* GL_FOG_COORD_ARRAY_POINTER */
-   { 10369, 0x00008455 }, /* GL_FOG_COORD_ARRAY_STRIDE */
-   { 10395, 0x00008454 }, /* GL_FOG_COORD_ARRAY_TYPE */
-   { 10419, 0x00008450 }, /* GL_FOG_COORD_SRC */
-   { 10436, 0x00000B62 }, /* GL_FOG_DENSITY */
-   { 10451, 0x0000855A }, /* GL_FOG_DISTANCE_MODE_NV */
-   { 10475, 0x00000B64 }, /* GL_FOG_END */
-   { 10486, 0x00000C54 }, /* GL_FOG_HINT */
-   { 10498, 0x00000B61 }, /* GL_FOG_INDEX */
-   { 10511, 0x00000B65 }, /* GL_FOG_MODE */
-   { 10523, 0x00008198 }, /* GL_FOG_OFFSET_SGIX */
-   { 10542, 0x00008199 }, /* GL_FOG_OFFSET_VALUE_SGIX */
-   { 10567, 0x00000B63 }, /* GL_FOG_START */
-   { 10580, 0x00008452 }, /* GL_FRAGMENT_DEPTH */
-   { 10598, 0x00008804 }, /* GL_FRAGMENT_PROGRAM_ARB */
-   { 10622, 0x00008B30 }, /* GL_FRAGMENT_SHADER */
-   { 10641, 0x00008B30 }, /* GL_FRAGMENT_SHADER_ARB */
-   { 10664, 0x00008B8B }, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
-   { 10699, 0x00008D40 }, /* GL_FRAMEBUFFER */
-   { 10714, 0x00008215 }, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
-   { 10751, 0x00008214 }, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
-   { 10787, 0x00008210 }, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
-   { 10828, 0x00008211 }, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
-   { 10869, 0x00008216 }, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
-   { 10906, 0x00008213 }, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
-   { 10943, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
-   { 10981, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT */
-   { 11023, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
-   { 11061, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT */
-   { 11103, 0x00008212 }, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
-   { 11138, 0x00008217 }, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
-   { 11177, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT */
-   { 11226, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
-   { 11274, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT */
-   { 11326, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
-   { 11366, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
-   { 11410, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
-   { 11450, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT */
-   { 11494, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING_EXT */
-   { 11521, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE */
-   { 11545, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE_EXT */
-   { 11573, 0x00008218 }, /* GL_FRAMEBUFFER_DEFAULT */
-   { 11596, 0x00008D40 }, /* GL_FRAMEBUFFER_EXT */
-   { 11615, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
-   { 11652, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT */
-   { 11693, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
-   { 11734, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
-   { 11776, 0x00008CD8 }, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
-   { 11827, 0x00008CDA }, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
-   { 11865, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
-   { 11910, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT */
-   { 11959, 0x00008D56 }, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
-   { 11997, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
-   { 12039, 0x00008CDE }, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
-   { 12071, 0x00008219 }, /* GL_FRAMEBUFFER_UNDEFINED */
-   { 12096, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED */
-   { 12123, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED_EXT */
-   { 12154, 0x00000404 }, /* GL_FRONT */
-   { 12163, 0x00000408 }, /* GL_FRONT_AND_BACK */
-   { 12181, 0x00000B46 }, /* GL_FRONT_FACE */
-   { 12195, 0x00000400 }, /* GL_FRONT_LEFT */
-   { 12209, 0x00000401 }, /* GL_FRONT_RIGHT */
-   { 12224, 0x00008006 }, /* GL_FUNC_ADD */
-   { 12236, 0x00008006 }, /* GL_FUNC_ADD_EXT */
-   { 12252, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT */
-   { 12277, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT_EXT */
-   { 12306, 0x0000800A }, /* GL_FUNC_SUBTRACT */
-   { 12323, 0x0000800A }, /* GL_FUNC_SUBTRACT_EXT */
-   { 12344, 0x00008191 }, /* GL_GENERATE_MIPMAP */
-   { 12363, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT */
-   { 12387, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT_SGIS */
-   { 12416, 0x00008191 }, /* GL_GENERATE_MIPMAP_SGIS */
-   { 12440, 0x00000206 }, /* GL_GEQUAL */
-   { 12450, 0x00000204 }, /* GL_GREATER */
-   { 12461, 0x00001904 }, /* GL_GREEN */
-   { 12470, 0x00000D19 }, /* GL_GREEN_BIAS */
-   { 12484, 0x00000D53 }, /* GL_GREEN_BITS */
-   { 12498, 0x00000D18 }, /* GL_GREEN_SCALE */
-   { 12513, 0x00008000 }, /* GL_HINT_BIT */
-   { 12525, 0x00008024 }, /* GL_HISTOGRAM */
-   { 12538, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE */
-   { 12562, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE_EXT */
-   { 12590, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE */
-   { 12613, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE_EXT */
-   { 12640, 0x00008024 }, /* GL_HISTOGRAM_EXT */
-   { 12657, 0x00008027 }, /* GL_HISTOGRAM_FORMAT */
-   { 12677, 0x00008027 }, /* GL_HISTOGRAM_FORMAT_EXT */
-   { 12701, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE */
-   { 12725, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE_EXT */
-   { 12753, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE */
-   { 12781, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE_EXT */
-   { 12813, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE */
-   { 12835, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE_EXT */
-   { 12861, 0x0000802D }, /* GL_HISTOGRAM_SINK */
-   { 12879, 0x0000802D }, /* GL_HISTOGRAM_SINK_EXT */
-   { 12901, 0x00008026 }, /* GL_HISTOGRAM_WIDTH */
-   { 12920, 0x00008026 }, /* GL_HISTOGRAM_WIDTH_EXT */
-   { 12943, 0x0000862A }, /* GL_IDENTITY_NV */
-   { 12958, 0x00008150 }, /* GL_IGNORE_BORDER_HP */
-   { 12978, 0x00008B9B }, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
-   { 13018, 0x00008B9A }, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
-   { 13056, 0x00001E02 }, /* GL_INCR */
-   { 13064, 0x00008507 }, /* GL_INCR_WRAP */
-   { 13077, 0x00008507 }, /* GL_INCR_WRAP_EXT */
-   { 13094, 0x00008222 }, /* GL_INDEX */
-   { 13103, 0x00008077 }, /* GL_INDEX_ARRAY */
-   { 13118, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING */
-   { 13148, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING_ARB */
-   { 13182, 0x00008091 }, /* GL_INDEX_ARRAY_POINTER */
-   { 13205, 0x00008086 }, /* GL_INDEX_ARRAY_STRIDE */
-   { 13227, 0x00008085 }, /* GL_INDEX_ARRAY_TYPE */
-   { 13247, 0x00000D51 }, /* GL_INDEX_BITS */
-   { 13261, 0x00000C20 }, /* GL_INDEX_CLEAR_VALUE */
-   { 13282, 0x00000BF1 }, /* GL_INDEX_LOGIC_OP */
-   { 13300, 0x00000C30 }, /* GL_INDEX_MODE */
-   { 13314, 0x00000D13 }, /* GL_INDEX_OFFSET */
-   { 13330, 0x00000D12 }, /* GL_INDEX_SHIFT */
-   { 13345, 0x00000C21 }, /* GL_INDEX_WRITEMASK */
-   { 13364, 0x00008B84 }, /* GL_INFO_LOG_LENGTH */
-   { 13383, 0x00001404 }, /* GL_INT */
-   { 13390, 0x00008049 }, /* GL_INTENSITY */
-   { 13403, 0x0000804C }, /* GL_INTENSITY12 */
-   { 13418, 0x0000804C }, /* GL_INTENSITY12_EXT */
-   { 13437, 0x0000804D }, /* GL_INTENSITY16 */
-   { 13452, 0x0000804D }, /* GL_INTENSITY16_EXT */
-   { 13471, 0x0000804A }, /* GL_INTENSITY4 */
-   { 13485, 0x0000804A }, /* GL_INTENSITY4_EXT */
-   { 13503, 0x0000804B }, /* GL_INTENSITY8 */
-   { 13517, 0x0000804B }, /* GL_INTENSITY8_EXT */
-   { 13535, 0x00008049 }, /* GL_INTENSITY_EXT */
-   { 13552, 0x00008575 }, /* GL_INTERPOLATE */
-   { 13567, 0x00008575 }, /* GL_INTERPOLATE_ARB */
-   { 13586, 0x00008575 }, /* GL_INTERPOLATE_EXT */
-   { 13605, 0x00008B53 }, /* GL_INT_VEC2 */
-   { 13617, 0x00008B53 }, /* GL_INT_VEC2_ARB */
-   { 13633, 0x00008B54 }, /* GL_INT_VEC3 */
-   { 13645, 0x00008B54 }, /* GL_INT_VEC3_ARB */
-   { 13661, 0x00008B55 }, /* GL_INT_VEC4 */
-   { 13673, 0x00008B55 }, /* GL_INT_VEC4_ARB */
-   { 13689, 0x00000500 }, /* GL_INVALID_ENUM */
-   { 13705, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION */
-   { 13738, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION_EXT */
-   { 13775, 0x00000502 }, /* GL_INVALID_OPERATION */
-   { 13796, 0x00000501 }, /* GL_INVALID_VALUE */
-   { 13813, 0x0000862B }, /* GL_INVERSE_NV */
-   { 13827, 0x0000862D }, /* GL_INVERSE_TRANSPOSE_NV */
-   { 13851, 0x0000150A }, /* GL_INVERT */
-   { 13861, 0x00001E00 }, /* GL_KEEP */
-   { 13869, 0x00008E4E }, /* GL_LAST_VERTEX_CONVENTION_EXT */
-   { 13899, 0x00000406 }, /* GL_LEFT */
-   { 13907, 0x00000203 }, /* GL_LEQUAL */
-   { 13917, 0x00000201 }, /* GL_LESS */
-   { 13925, 0x00004000 }, /* GL_LIGHT0 */
-   { 13935, 0x00004001 }, /* GL_LIGHT1 */
-   { 13945, 0x00004002 }, /* GL_LIGHT2 */
-   { 13955, 0x00004003 }, /* GL_LIGHT3 */
-   { 13965, 0x00004004 }, /* GL_LIGHT4 */
-   { 13975, 0x00004005 }, /* GL_LIGHT5 */
-   { 13985, 0x00004006 }, /* GL_LIGHT6 */
-   { 13995, 0x00004007 }, /* GL_LIGHT7 */
-   { 14005, 0x00000B50 }, /* GL_LIGHTING */
-   { 14017, 0x00000040 }, /* GL_LIGHTING_BIT */
-   { 14033, 0x00000B53 }, /* GL_LIGHT_MODEL_AMBIENT */
-   { 14056, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL */
-   { 14085, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL_EXT */
-   { 14118, 0x00000B51 }, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
-   { 14146, 0x00000B52 }, /* GL_LIGHT_MODEL_TWO_SIDE */
-   { 14170, 0x00001B01 }, /* GL_LINE */
-   { 14178, 0x00002601 }, /* GL_LINEAR */
-   { 14188, 0x00001208 }, /* GL_LINEAR_ATTENUATION */
-   { 14210, 0x00008170 }, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
-   { 14240, 0x0000844F }, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
-   { 14271, 0x00002703 }, /* GL_LINEAR_MIPMAP_LINEAR */
-   { 14295, 0x00002701 }, /* GL_LINEAR_MIPMAP_NEAREST */
-   { 14320, 0x00000001 }, /* GL_LINES */
-   { 14329, 0x00000004 }, /* GL_LINE_BIT */
-   { 14341, 0x00000002 }, /* GL_LINE_LOOP */
-   { 14354, 0x00000707 }, /* GL_LINE_RESET_TOKEN */
-   { 14374, 0x00000B20 }, /* GL_LINE_SMOOTH */
-   { 14389, 0x00000C52 }, /* GL_LINE_SMOOTH_HINT */
-   { 14409, 0x00000B24 }, /* GL_LINE_STIPPLE */
-   { 14425, 0x00000B25 }, /* GL_LINE_STIPPLE_PATTERN */
-   { 14449, 0x00000B26 }, /* GL_LINE_STIPPLE_REPEAT */
-   { 14472, 0x00000003 }, /* GL_LINE_STRIP */
-   { 14486, 0x00000702 }, /* GL_LINE_TOKEN */
-   { 14500, 0x00000B21 }, /* GL_LINE_WIDTH */
-   { 14514, 0x00000B23 }, /* GL_LINE_WIDTH_GRANULARITY */
-   { 14540, 0x00000B22 }, /* GL_LINE_WIDTH_RANGE */
-   { 14560, 0x00008B82 }, /* GL_LINK_STATUS */
-   { 14575, 0x00000B32 }, /* GL_LIST_BASE */
-   { 14588, 0x00020000 }, /* GL_LIST_BIT */
-   { 14600, 0x00000B33 }, /* GL_LIST_INDEX */
-   { 14614, 0x00000B30 }, /* GL_LIST_MODE */
-   { 14627, 0x00000101 }, /* GL_LOAD */
-   { 14635, 0x00000BF1 }, /* GL_LOGIC_OP */
-   { 14647, 0x00000BF0 }, /* GL_LOGIC_OP_MODE */
-   { 14664, 0x00008CA1 }, /* GL_LOWER_LEFT */
-   { 14678, 0x00001909 }, /* GL_LUMINANCE */
-   { 14691, 0x00008041 }, /* GL_LUMINANCE12 */
-   { 14706, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12 */
-   { 14729, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12_EXT */
-   { 14756, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4 */
-   { 14778, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4_EXT */
-   { 14804, 0x00008041 }, /* GL_LUMINANCE12_EXT */
-   { 14823, 0x00008042 }, /* GL_LUMINANCE16 */
-   { 14838, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16 */
-   { 14861, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16_EXT */
-   { 14888, 0x00008042 }, /* GL_LUMINANCE16_EXT */
-   { 14907, 0x0000803F }, /* GL_LUMINANCE4 */
-   { 14921, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4 */
-   { 14942, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4_EXT */
-   { 14967, 0x0000803F }, /* GL_LUMINANCE4_EXT */
-   { 14985, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2 */
-   { 15006, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2_EXT */
-   { 15031, 0x00008040 }, /* GL_LUMINANCE8 */
-   { 15045, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8 */
-   { 15066, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8_EXT */
-   { 15091, 0x00008040 }, /* GL_LUMINANCE8_EXT */
-   { 15109, 0x0000190A }, /* GL_LUMINANCE_ALPHA */
-   { 15128, 0x00000D90 }, /* GL_MAP1_COLOR_4 */
-   { 15144, 0x00000DD0 }, /* GL_MAP1_GRID_DOMAIN */
-   { 15164, 0x00000DD1 }, /* GL_MAP1_GRID_SEGMENTS */
-   { 15186, 0x00000D91 }, /* GL_MAP1_INDEX */
-   { 15200, 0x00000D92 }, /* GL_MAP1_NORMAL */
-   { 15215, 0x00000D93 }, /* GL_MAP1_TEXTURE_COORD_1 */
-   { 15239, 0x00000D94 }, /* GL_MAP1_TEXTURE_COORD_2 */
-   { 15263, 0x00000D95 }, /* GL_MAP1_TEXTURE_COORD_3 */
-   { 15287, 0x00000D96 }, /* GL_MAP1_TEXTURE_COORD_4 */
-   { 15311, 0x00000D97 }, /* GL_MAP1_VERTEX_3 */
-   { 15328, 0x00000D98 }, /* GL_MAP1_VERTEX_4 */
-   { 15345, 0x00008660 }, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
-   { 15373, 0x0000866A }, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
-   { 15402, 0x0000866B }, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
-   { 15431, 0x0000866C }, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
-   { 15460, 0x0000866D }, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
-   { 15489, 0x0000866E }, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
-   { 15518, 0x0000866F }, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
-   { 15547, 0x00008661 }, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
-   { 15575, 0x00008662 }, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
-   { 15603, 0x00008663 }, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
-   { 15631, 0x00008664 }, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
-   { 15659, 0x00008665 }, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
-   { 15687, 0x00008666 }, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
-   { 15715, 0x00008667 }, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
-   { 15743, 0x00008668 }, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
-   { 15771, 0x00008669 }, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
-   { 15799, 0x00000DB0 }, /* GL_MAP2_COLOR_4 */
-   { 15815, 0x00000DD2 }, /* GL_MAP2_GRID_DOMAIN */
-   { 15835, 0x00000DD3 }, /* GL_MAP2_GRID_SEGMENTS */
-   { 15857, 0x00000DB1 }, /* GL_MAP2_INDEX */
-   { 15871, 0x00000DB2 }, /* GL_MAP2_NORMAL */
-   { 15886, 0x00000DB3 }, /* GL_MAP2_TEXTURE_COORD_1 */
-   { 15910, 0x00000DB4 }, /* GL_MAP2_TEXTURE_COORD_2 */
-   { 15934, 0x00000DB5 }, /* GL_MAP2_TEXTURE_COORD_3 */
-   { 15958, 0x00000DB6 }, /* GL_MAP2_TEXTURE_COORD_4 */
-   { 15982, 0x00000DB7 }, /* GL_MAP2_VERTEX_3 */
-   { 15999, 0x00000DB8 }, /* GL_MAP2_VERTEX_4 */
-   { 16016, 0x00008670 }, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
-   { 16044, 0x0000867A }, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
-   { 16073, 0x0000867B }, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
-   { 16102, 0x0000867C }, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
-   { 16131, 0x0000867D }, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
-   { 16160, 0x0000867E }, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
-   { 16189, 0x0000867F }, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
-   { 16218, 0x00008671 }, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
-   { 16246, 0x00008672 }, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
-   { 16274, 0x00008673 }, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
-   { 16302, 0x00008674 }, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
-   { 16330, 0x00008675 }, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
-   { 16358, 0x00008676 }, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
-   { 16386, 0x00008677 }, /* GL_MAP2_VERTEX_ATTRIB7_4_NV */
-   { 16414, 0x00008678 }, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
-   { 16442, 0x00008679 }, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
-   { 16470, 0x00000D10 }, /* GL_MAP_COLOR */
-   { 16483, 0x00000010 }, /* GL_MAP_FLUSH_EXPLICIT_BIT */
-   { 16509, 0x00000008 }, /* GL_MAP_INVALIDATE_BUFFER_BIT */
-   { 16538, 0x00000004 }, /* GL_MAP_INVALIDATE_RANGE_BIT */
-   { 16566, 0x00000001 }, /* GL_MAP_READ_BIT */
-   { 16582, 0x00000D11 }, /* GL_MAP_STENCIL */
-   { 16597, 0x00000020 }, /* GL_MAP_UNSYNCHRONIZED_BIT */
-   { 16623, 0x00000002 }, /* GL_MAP_WRITE_BIT */
-   { 16640, 0x000088C0 }, /* GL_MATRIX0_ARB */
-   { 16655, 0x00008630 }, /* GL_MATRIX0_NV */
-   { 16669, 0x000088CA }, /* GL_MATRIX10_ARB */
-   { 16685, 0x000088CB }, /* GL_MATRIX11_ARB */
-   { 16701, 0x000088CC }, /* GL_MATRIX12_ARB */
-   { 16717, 0x000088CD }, /* GL_MATRIX13_ARB */
-   { 16733, 0x000088CE }, /* GL_MATRIX14_ARB */
-   { 16749, 0x000088CF }, /* GL_MATRIX15_ARB */
-   { 16765, 0x000088D0 }, /* GL_MATRIX16_ARB */
-   { 16781, 0x000088D1 }, /* GL_MATRIX17_ARB */
-   { 16797, 0x000088D2 }, /* GL_MATRIX18_ARB */
-   { 16813, 0x000088D3 }, /* GL_MATRIX19_ARB */
-   { 16829, 0x000088C1 }, /* GL_MATRIX1_ARB */
-   { 16844, 0x00008631 }, /* GL_MATRIX1_NV */
-   { 16858, 0x000088D4 }, /* GL_MATRIX20_ARB */
-   { 16874, 0x000088D5 }, /* GL_MATRIX21_ARB */
-   { 16890, 0x000088D6 }, /* GL_MATRIX22_ARB */
-   { 16906, 0x000088D7 }, /* GL_MATRIX23_ARB */
-   { 16922, 0x000088D8 }, /* GL_MATRIX24_ARB */
-   { 16938, 0x000088D9 }, /* GL_MATRIX25_ARB */
-   { 16954, 0x000088DA }, /* GL_MATRIX26_ARB */
-   { 16970, 0x000088DB }, /* GL_MATRIX27_ARB */
-   { 16986, 0x000088DC }, /* GL_MATRIX28_ARB */
-   { 17002, 0x000088DD }, /* GL_MATRIX29_ARB */
-   { 17018, 0x000088C2 }, /* GL_MATRIX2_ARB */
-   { 17033, 0x00008632 }, /* GL_MATRIX2_NV */
-   { 17047, 0x000088DE }, /* GL_MATRIX30_ARB */
-   { 17063, 0x000088DF }, /* GL_MATRIX31_ARB */
-   { 17079, 0x000088C3 }, /* GL_MATRIX3_ARB */
-   { 17094, 0x00008633 }, /* GL_MATRIX3_NV */
-   { 17108, 0x000088C4 }, /* GL_MATRIX4_ARB */
-   { 17123, 0x00008634 }, /* GL_MATRIX4_NV */
-   { 17137, 0x000088C5 }, /* GL_MATRIX5_ARB */
-   { 17152, 0x00008635 }, /* GL_MATRIX5_NV */
-   { 17166, 0x000088C6 }, /* GL_MATRIX6_ARB */
-   { 17181, 0x00008636 }, /* GL_MATRIX6_NV */
-   { 17195, 0x000088C7 }, /* GL_MATRIX7_ARB */
-   { 17210, 0x00008637 }, /* GL_MATRIX7_NV */
-   { 17224, 0x000088C8 }, /* GL_MATRIX8_ARB */
-   { 17239, 0x000088C9 }, /* GL_MATRIX9_ARB */
-   { 17254, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_ARB */
-   { 17280, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
-   { 17314, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
-   { 17345, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
-   { 17378, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
-   { 17409, 0x00000BA0 }, /* GL_MATRIX_MODE */
-   { 17424, 0x00008840 }, /* GL_MATRIX_PALETTE_ARB */
-   { 17446, 0x00008008 }, /* GL_MAX */
-   { 17453, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE */
-   { 17476, 0x000088FF }, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
-   { 17508, 0x00000D35 }, /* GL_MAX_ATTRIB_STACK_DEPTH */
-   { 17534, 0x00000D3B }, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
-   { 17567, 0x00008177 }, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
-   { 17593, 0x00008178 }, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-   { 17627, 0x00000D32 }, /* GL_MAX_CLIP_PLANES */
-   { 17646, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
-   { 17675, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
-   { 17707, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI */
-   { 17743, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
-   { 17779, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB */
-   { 17819, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT */
-   { 17845, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT_EXT */
-   { 17875, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH */
-   { 17900, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH_EXT */
-   { 17929, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
-   { 17958, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB */
-   { 17991, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS */
-   { 18011, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ARB */
-   { 18035, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ATI */
-   { 18059, 0x000080E9 }, /* GL_MAX_ELEMENTS_INDICES */
-   { 18083, 0x000080E8 }, /* GL_MAX_ELEMENTS_VERTICES */
-   { 18108, 0x00000D30 }, /* GL_MAX_EVAL_ORDER */
-   { 18126, 0x00008008 }, /* GL_MAX_EXT */
-   { 18137, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
-   { 18172, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB */
-   { 18211, 0x00000D31 }, /* GL_MAX_LIGHTS */
-   { 18225, 0x00000B31 }, /* GL_MAX_LIST_NESTING */
-   { 18245, 0x00008841 }, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
-   { 18283, 0x00000D36 }, /* GL_MAX_MODELVIEW_STACK_DEPTH */
-   { 18312, 0x00000D37 }, /* GL_MAX_NAME_STACK_DEPTH */
-   { 18336, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_ARB */
-   { 18364, 0x00000D34 }, /* GL_MAX_PIXEL_MAP_TABLE */
-   { 18387, 0x000088B1 }, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
-   { 18424, 0x0000880B }, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
-   { 18460, 0x000088AD }, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
-   { 18487, 0x000088F5 }, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
-   { 18516, 0x000088B5 }, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
-   { 18550, 0x000088F4 }, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
-   { 18586, 0x000088F6 }, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
-   { 18613, 0x000088A1 }, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
-   { 18645, 0x000088B4 }, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
-   { 18681, 0x000088F8 }, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
-   { 18710, 0x000088F7 }, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
-   { 18739, 0x0000862F }, /* GL_MAX_PROGRAM_MATRICES_ARB */
-   { 18767, 0x0000862E }, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
-   { 18805, 0x000088B3 }, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-   { 18849, 0x0000880E }, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-   { 18892, 0x000088AF }, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
-   { 18926, 0x000088A3 }, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-   { 18965, 0x000088AB }, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
-   { 19002, 0x000088A7 }, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
-   { 19040, 0x00008810 }, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-   { 19083, 0x0000880F }, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-   { 19126, 0x000088A9 }, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
-   { 19156, 0x000088A5 }, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
-   { 19187, 0x0000880D }, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
-   { 19223, 0x0000880C }, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
-   { 19259, 0x00000D38 }, /* GL_MAX_PROJECTION_STACK_DEPTH */
-   { 19289, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
-   { 19323, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_NV */
-   { 19356, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
-   { 19385, 0x00008D57 }, /* GL_MAX_SAMPLES */
-   { 19400, 0x00008504 }, /* GL_MAX_SHININESS_NV */
-   { 19420, 0x00008505 }, /* GL_MAX_SPOT_EXPONENT_NV */
-   { 19444, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS */
-   { 19466, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS_ARB */
-   { 19492, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS */
-   { 19519, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS_ARB */
-   { 19550, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS */
-   { 19574, 0x000084FF }, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
-   { 19608, 0x00000D33 }, /* GL_MAX_TEXTURE_SIZE */
-   { 19628, 0x00000D39 }, /* GL_MAX_TEXTURE_STACK_DEPTH */
-   { 19655, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS */
-   { 19676, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS_ARB */
-   { 19701, 0x0000862F }, /* GL_MAX_TRACK_MATRICES_NV */
-   { 19726, 0x0000862E }, /* GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */
-   { 19761, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS */
-   { 19783, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS_ARB */
-   { 19809, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS */
-   { 19831, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS_ARB */
-   { 19857, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
-   { 19891, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
-   { 19929, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
-   { 19962, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB */
-   { 19999, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_ARB */
-   { 20023, 0x00000D3A }, /* GL_MAX_VIEWPORT_DIMS */
-   { 20044, 0x00008007 }, /* GL_MIN */
-   { 20051, 0x0000802E }, /* GL_MINMAX */
-   { 20061, 0x0000802E }, /* GL_MINMAX_EXT */
-   { 20075, 0x0000802F }, /* GL_MINMAX_FORMAT */
-   { 20092, 0x0000802F }, /* GL_MINMAX_FORMAT_EXT */
-   { 20113, 0x00008030 }, /* GL_MINMAX_SINK */
-   { 20128, 0x00008030 }, /* GL_MINMAX_SINK_EXT */
-   { 20147, 0x00008007 }, /* GL_MIN_EXT */
-   { 20158, 0x00008370 }, /* GL_MIRRORED_REPEAT */
-   { 20177, 0x00008370 }, /* GL_MIRRORED_REPEAT_ARB */
-   { 20200, 0x00008370 }, /* GL_MIRRORED_REPEAT_IBM */
-   { 20223, 0x00008742 }, /* GL_MIRROR_CLAMP_ATI */
-   { 20243, 0x00008742 }, /* GL_MIRROR_CLAMP_EXT */
-   { 20263, 0x00008912 }, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
-   { 20293, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_ATI */
-   { 20321, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
-   { 20349, 0x00001700 }, /* GL_MODELVIEW */
-   { 20362, 0x00001700 }, /* GL_MODELVIEW0_ARB */
-   { 20380, 0x0000872A }, /* GL_MODELVIEW10_ARB */
-   { 20399, 0x0000872B }, /* GL_MODELVIEW11_ARB */
-   { 20418, 0x0000872C }, /* GL_MODELVIEW12_ARB */
-   { 20437, 0x0000872D }, /* GL_MODELVIEW13_ARB */
-   { 20456, 0x0000872E }, /* GL_MODELVIEW14_ARB */
-   { 20475, 0x0000872F }, /* GL_MODELVIEW15_ARB */
-   { 20494, 0x00008730 }, /* GL_MODELVIEW16_ARB */
-   { 20513, 0x00008731 }, /* GL_MODELVIEW17_ARB */
-   { 20532, 0x00008732 }, /* GL_MODELVIEW18_ARB */
-   { 20551, 0x00008733 }, /* GL_MODELVIEW19_ARB */
-   { 20570, 0x0000850A }, /* GL_MODELVIEW1_ARB */
-   { 20588, 0x00008734 }, /* GL_MODELVIEW20_ARB */
-   { 20607, 0x00008735 }, /* GL_MODELVIEW21_ARB */
-   { 20626, 0x00008736 }, /* GL_MODELVIEW22_ARB */
-   { 20645, 0x00008737 }, /* GL_MODELVIEW23_ARB */
-   { 20664, 0x00008738 }, /* GL_MODELVIEW24_ARB */
-   { 20683, 0x00008739 }, /* GL_MODELVIEW25_ARB */
-   { 20702, 0x0000873A }, /* GL_MODELVIEW26_ARB */
-   { 20721, 0x0000873B }, /* GL_MODELVIEW27_ARB */
-   { 20740, 0x0000873C }, /* GL_MODELVIEW28_ARB */
-   { 20759, 0x0000873D }, /* GL_MODELVIEW29_ARB */
-   { 20778, 0x00008722 }, /* GL_MODELVIEW2_ARB */
-   { 20796, 0x0000873E }, /* GL_MODELVIEW30_ARB */
-   { 20815, 0x0000873F }, /* GL_MODELVIEW31_ARB */
-   { 20834, 0x00008723 }, /* GL_MODELVIEW3_ARB */
-   { 20852, 0x00008724 }, /* GL_MODELVIEW4_ARB */
-   { 20870, 0x00008725 }, /* GL_MODELVIEW5_ARB */
-   { 20888, 0x00008726 }, /* GL_MODELVIEW6_ARB */
-   { 20906, 0x00008727 }, /* GL_MODELVIEW7_ARB */
-   { 20924, 0x00008728 }, /* GL_MODELVIEW8_ARB */
-   { 20942, 0x00008729 }, /* GL_MODELVIEW9_ARB */
-   { 20960, 0x00000BA6 }, /* GL_MODELVIEW_MATRIX */
-   { 20980, 0x00008629 }, /* GL_MODELVIEW_PROJECTION_NV */
-   { 21007, 0x00000BA3 }, /* GL_MODELVIEW_STACK_DEPTH */
-   { 21032, 0x00002100 }, /* GL_MODULATE */
-   { 21044, 0x00008744 }, /* GL_MODULATE_ADD_ATI */
-   { 21064, 0x00008745 }, /* GL_MODULATE_SIGNED_ADD_ATI */
-   { 21091, 0x00008746 }, /* GL_MODULATE_SUBTRACT_ATI */
-   { 21116, 0x00000103 }, /* GL_MULT */
-   { 21124, 0x0000809D }, /* GL_MULTISAMPLE */
-   { 21139, 0x000086B2 }, /* GL_MULTISAMPLE_3DFX */
-   { 21159, 0x0000809D }, /* GL_MULTISAMPLE_ARB */
-   { 21178, 0x20000000 }, /* GL_MULTISAMPLE_BIT */
-   { 21197, 0x20000000 }, /* GL_MULTISAMPLE_BIT_3DFX */
-   { 21221, 0x20000000 }, /* GL_MULTISAMPLE_BIT_ARB */
-   { 21244, 0x00008534 }, /* GL_MULTISAMPLE_FILTER_HINT_NV */
-   { 21274, 0x00002A25 }, /* GL_N3F_V3F */
-   { 21285, 0x00000D70 }, /* GL_NAME_STACK_DEPTH */
-   { 21305, 0x0000150E }, /* GL_NAND */
-   { 21313, 0x00002600 }, /* GL_NEAREST */
-   { 21324, 0x0000844E }, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
-   { 21355, 0x0000844D }, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
-   { 21387, 0x00002702 }, /* GL_NEAREST_MIPMAP_LINEAR */
-   { 21412, 0x00002700 }, /* GL_NEAREST_MIPMAP_NEAREST */
-   { 21438, 0x00000200 }, /* GL_NEVER */
-   { 21447, 0x00001102 }, /* GL_NICEST */
-   { 21457, 0x00000000 }, /* GL_NONE */
-   { 21465, 0x00001505 }, /* GL_NOOP */
-   { 21473, 0x00001508 }, /* GL_NOR */
-   { 21480, 0x00000BA1 }, /* GL_NORMALIZE */
-   { 21493, 0x00008075 }, /* GL_NORMAL_ARRAY */
-   { 21509, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
-   { 21540, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING_ARB */
-   { 21575, 0x0000808F }, /* GL_NORMAL_ARRAY_POINTER */
-   { 21599, 0x0000807F }, /* GL_NORMAL_ARRAY_STRIDE */
-   { 21622, 0x0000807E }, /* GL_NORMAL_ARRAY_TYPE */
-   { 21643, 0x00008511 }, /* GL_NORMAL_MAP */
-   { 21657, 0x00008511 }, /* GL_NORMAL_MAP_ARB */
-   { 21675, 0x00008511 }, /* GL_NORMAL_MAP_NV */
-   { 21692, 0x00000205 }, /* GL_NOTEQUAL */
-   { 21704, 0x00000000 }, /* GL_NO_ERROR */
-   { 21716, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
-   { 21750, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB */
-   { 21788, 0x00008B89 }, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */
-   { 21820, 0x00008B8A }, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */
-   { 21862, 0x00008B86 }, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */
-   { 21892, 0x00008B87 }, /* GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB */
-   { 21932, 0x00008B85 }, /* GL_OBJECT_ATTACHED_OBJECTS_ARB */
-   { 21963, 0x00008B81 }, /* GL_OBJECT_COMPILE_STATUS_ARB */
-   { 21992, 0x00008B80 }, /* GL_OBJECT_DELETE_STATUS_ARB */
-   { 22020, 0x00008B84 }, /* GL_OBJECT_INFO_LOG_LENGTH_ARB */
-   { 22050, 0x00002401 }, /* GL_OBJECT_LINEAR */
-   { 22067, 0x00008B82 }, /* GL_OBJECT_LINK_STATUS_ARB */
-   { 22093, 0x00002501 }, /* GL_OBJECT_PLANE */
-   { 22109, 0x00008B88 }, /* GL_OBJECT_SHADER_SOURCE_LENGTH_ARB */
-   { 22144, 0x00008B4F }, /* GL_OBJECT_SUBTYPE_ARB */
-   { 22166, 0x00008B4E }, /* GL_OBJECT_TYPE_ARB */
-   { 22185, 0x00008B83 }, /* GL_OBJECT_VALIDATE_STATUS_ARB */
-   { 22215, 0x00008165 }, /* GL_OCCLUSION_TEST_HP */
-   { 22236, 0x00008166 }, /* GL_OCCLUSION_TEST_RESULT_HP */
-   { 22264, 0x00000001 }, /* GL_ONE */
-   { 22271, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA */
-   { 22299, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA_EXT */
-   { 22331, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR */
-   { 22359, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR_EXT */
-   { 22391, 0x00000305 }, /* GL_ONE_MINUS_DST_ALPHA */
-   { 22414, 0x00000307 }, /* GL_ONE_MINUS_DST_COLOR */
-   { 22437, 0x00000303 }, /* GL_ONE_MINUS_SRC_ALPHA */
-   { 22460, 0x00000301 }, /* GL_ONE_MINUS_SRC_COLOR */
-   { 22483, 0x00008598 }, /* GL_OPERAND0_ALPHA */
-   { 22501, 0x00008598 }, /* GL_OPERAND0_ALPHA_ARB */
-   { 22523, 0x00008598 }, /* GL_OPERAND0_ALPHA_EXT */
-   { 22545, 0x00008590 }, /* GL_OPERAND0_RGB */
-   { 22561, 0x00008590 }, /* GL_OPERAND0_RGB_ARB */
-   { 22581, 0x00008590 }, /* GL_OPERAND0_RGB_EXT */
-   { 22601, 0x00008599 }, /* GL_OPERAND1_ALPHA */
-   { 22619, 0x00008599 }, /* GL_OPERAND1_ALPHA_ARB */
-   { 22641, 0x00008599 }, /* GL_OPERAND1_ALPHA_EXT */
-   { 22663, 0x00008591 }, /* GL_OPERAND1_RGB */
-   { 22679, 0x00008591 }, /* GL_OPERAND1_RGB_ARB */
-   { 22699, 0x00008591 }, /* GL_OPERAND1_RGB_EXT */
-   { 22719, 0x0000859A }, /* GL_OPERAND2_ALPHA */
-   { 22737, 0x0000859A }, /* GL_OPERAND2_ALPHA_ARB */
-   { 22759, 0x0000859A }, /* GL_OPERAND2_ALPHA_EXT */
-   { 22781, 0x00008592 }, /* GL_OPERAND2_RGB */
-   { 22797, 0x00008592 }, /* GL_OPERAND2_RGB_ARB */
-   { 22817, 0x00008592 }, /* GL_OPERAND2_RGB_EXT */
-   { 22837, 0x0000859B }, /* GL_OPERAND3_ALPHA_NV */
-   { 22858, 0x00008593 }, /* GL_OPERAND3_RGB_NV */
-   { 22877, 0x00001507 }, /* GL_OR */
-   { 22883, 0x00000A01 }, /* GL_ORDER */
-   { 22892, 0x0000150D }, /* GL_OR_INVERTED */
-   { 22907, 0x0000150B }, /* GL_OR_REVERSE */
-   { 22921, 0x00000505 }, /* GL_OUT_OF_MEMORY */
-   { 22938, 0x00000D05 }, /* GL_PACK_ALIGNMENT */
-   { 22956, 0x0000806C }, /* GL_PACK_IMAGE_HEIGHT */
-   { 22977, 0x00008758 }, /* GL_PACK_INVERT_MESA */
-   { 22997, 0x00000D01 }, /* GL_PACK_LSB_FIRST */
-   { 23015, 0x00000D02 }, /* GL_PACK_ROW_LENGTH */
-   { 23034, 0x0000806B }, /* GL_PACK_SKIP_IMAGES */
-   { 23054, 0x00000D04 }, /* GL_PACK_SKIP_PIXELS */
-   { 23074, 0x00000D03 }, /* GL_PACK_SKIP_ROWS */
-   { 23092, 0x00000D00 }, /* GL_PACK_SWAP_BYTES */
-   { 23111, 0x00008B92 }, /* GL_PALETTE4_R5_G6_B5_OES */
-   { 23136, 0x00008B94 }, /* GL_PALETTE4_RGB5_A1_OES */
-   { 23160, 0x00008B90 }, /* GL_PALETTE4_RGB8_OES */
-   { 23181, 0x00008B93 }, /* GL_PALETTE4_RGBA4_OES */
-   { 23203, 0x00008B91 }, /* GL_PALETTE4_RGBA8_OES */
-   { 23225, 0x00008B97 }, /* GL_PALETTE8_R5_G6_B5_OES */
-   { 23250, 0x00008B99 }, /* GL_PALETTE8_RGB5_A1_OES */
-   { 23274, 0x00008B95 }, /* GL_PALETTE8_RGB8_OES */
-   { 23295, 0x00008B98 }, /* GL_PALETTE8_RGBA4_OES */
-   { 23317, 0x00008B96 }, /* GL_PALETTE8_RGBA8_OES */
-   { 23339, 0x00000700 }, /* GL_PASS_THROUGH_TOKEN */
-   { 23361, 0x00000C50 }, /* GL_PERSPECTIVE_CORRECTION_HINT */
-   { 23392, 0x00000C79 }, /* GL_PIXEL_MAP_A_TO_A */
-   { 23412, 0x00000CB9 }, /* GL_PIXEL_MAP_A_TO_A_SIZE */
-   { 23437, 0x00000C78 }, /* GL_PIXEL_MAP_B_TO_B */
-   { 23457, 0x00000CB8 }, /* GL_PIXEL_MAP_B_TO_B_SIZE */
-   { 23482, 0x00000C77 }, /* GL_PIXEL_MAP_G_TO_G */
-   { 23502, 0x00000CB7 }, /* GL_PIXEL_MAP_G_TO_G_SIZE */
-   { 23527, 0x00000C75 }, /* GL_PIXEL_MAP_I_TO_A */
-   { 23547, 0x00000CB5 }, /* GL_PIXEL_MAP_I_TO_A_SIZE */
-   { 23572, 0x00000C74 }, /* GL_PIXEL_MAP_I_TO_B */
-   { 23592, 0x00000CB4 }, /* GL_PIXEL_MAP_I_TO_B_SIZE */
-   { 23617, 0x00000C73 }, /* GL_PIXEL_MAP_I_TO_G */
-   { 23637, 0x00000CB3 }, /* GL_PIXEL_MAP_I_TO_G_SIZE */
-   { 23662, 0x00000C70 }, /* GL_PIXEL_MAP_I_TO_I */
-   { 23682, 0x00000CB0 }, /* GL_PIXEL_MAP_I_TO_I_SIZE */
-   { 23707, 0x00000C72 }, /* GL_PIXEL_MAP_I_TO_R */
-   { 23727, 0x00000CB2 }, /* GL_PIXEL_MAP_I_TO_R_SIZE */
-   { 23752, 0x00000C76 }, /* GL_PIXEL_MAP_R_TO_R */
-   { 23772, 0x00000CB6 }, /* GL_PIXEL_MAP_R_TO_R_SIZE */
-   { 23797, 0x00000C71 }, /* GL_PIXEL_MAP_S_TO_S */
-   { 23817, 0x00000CB1 }, /* GL_PIXEL_MAP_S_TO_S_SIZE */
-   { 23842, 0x00000020 }, /* GL_PIXEL_MODE_BIT */
-   { 23860, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER */
-   { 23881, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING */
-   { 23910, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING_EXT */
-   { 23943, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER_EXT */
-   { 23968, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER */
-   { 23991, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
-   { 24022, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING_EXT */
-   { 24057, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER_EXT */
-   { 24084, 0x00001B00 }, /* GL_POINT */
-   { 24093, 0x00000000 }, /* GL_POINTS */
-   { 24103, 0x00000002 }, /* GL_POINT_BIT */
-   { 24116, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION */
-   { 24146, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_ARB */
-   { 24180, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_EXT */
-   { 24214, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_SGIS */
-   { 24249, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE */
-   { 24278, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_ARB */
-   { 24311, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_EXT */
-   { 24344, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_SGIS */
-   { 24378, 0x00000B11 }, /* GL_POINT_SIZE */
-   { 24392, 0x00000B13 }, /* GL_POINT_SIZE_GRANULARITY */
-   { 24418, 0x00008127 }, /* GL_POINT_SIZE_MAX */
-   { 24436, 0x00008127 }, /* GL_POINT_SIZE_MAX_ARB */
-   { 24458, 0x00008127 }, /* GL_POINT_SIZE_MAX_EXT */
-   { 24480, 0x00008127 }, /* GL_POINT_SIZE_MAX_SGIS */
-   { 24503, 0x00008126 }, /* GL_POINT_SIZE_MIN */
-   { 24521, 0x00008126 }, /* GL_POINT_SIZE_MIN_ARB */
-   { 24543, 0x00008126 }, /* GL_POINT_SIZE_MIN_EXT */
-   { 24565, 0x00008126 }, /* GL_POINT_SIZE_MIN_SGIS */
-   { 24588, 0x00000B12 }, /* GL_POINT_SIZE_RANGE */
-   { 24608, 0x00000B10 }, /* GL_POINT_SMOOTH */
-   { 24624, 0x00000C51 }, /* GL_POINT_SMOOTH_HINT */
-   { 24645, 0x00008861 }, /* GL_POINT_SPRITE */
-   { 24661, 0x00008861 }, /* GL_POINT_SPRITE_ARB */
-   { 24681, 0x00008CA0 }, /* GL_POINT_SPRITE_COORD_ORIGIN */
-   { 24710, 0x00008861 }, /* GL_POINT_SPRITE_NV */
-   { 24729, 0x00008863 }, /* GL_POINT_SPRITE_R_MODE_NV */
-   { 24755, 0x00000701 }, /* GL_POINT_TOKEN */
-   { 24770, 0x00000009 }, /* GL_POLYGON */
-   { 24781, 0x00000008 }, /* GL_POLYGON_BIT */
-   { 24796, 0x00000B40 }, /* GL_POLYGON_MODE */
-   { 24812, 0x00008039 }, /* GL_POLYGON_OFFSET_BIAS */
-   { 24835, 0x00008038 }, /* GL_POLYGON_OFFSET_FACTOR */
-   { 24860, 0x00008037 }, /* GL_POLYGON_OFFSET_FILL */
-   { 24883, 0x00002A02 }, /* GL_POLYGON_OFFSET_LINE */
-   { 24906, 0x00002A01 }, /* GL_POLYGON_OFFSET_POINT */
-   { 24930, 0x00002A00 }, /* GL_POLYGON_OFFSET_UNITS */
-   { 24954, 0x00000B41 }, /* GL_POLYGON_SMOOTH */
-   { 24972, 0x00000C53 }, /* GL_POLYGON_SMOOTH_HINT */
-   { 24995, 0x00000B42 }, /* GL_POLYGON_STIPPLE */
-   { 25014, 0x00000010 }, /* GL_POLYGON_STIPPLE_BIT */
-   { 25037, 0x00000703 }, /* GL_POLYGON_TOKEN */
-   { 25054, 0x00001203 }, /* GL_POSITION */
-   { 25066, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
-   { 25098, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI */
-   { 25134, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
-   { 25167, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI */
-   { 25204, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
-   { 25235, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI */
-   { 25270, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
-   { 25302, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI */
-   { 25338, 0x000080D2 }, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
-   { 25371, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
-   { 25403, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI */
-   { 25439, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
-   { 25472, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI */
-   { 25509, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS */
-   { 25539, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS_SGI */
-   { 25573, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE */
-   { 25604, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE_SGI */
-   { 25639, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
-   { 25670, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS_EXT */
-   { 25705, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
-   { 25737, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE_EXT */
-   { 25773, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS */
-   { 25803, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS_EXT */
-   { 25837, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE */
-   { 25868, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE_EXT */
-   { 25903, 0x000080D1 }, /* GL_POST_CONVOLUTION_COLOR_TABLE */
-   { 25935, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS */
-   { 25966, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS_EXT */
-   { 26001, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE */
-   { 26033, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE_EXT */
-   { 26069, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS */
-   { 26098, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS_EXT */
-   { 26131, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE */
-   { 26161, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE_EXT */
-   { 26195, 0x0000817B }, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
-   { 26234, 0x00008179 }, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
-   { 26267, 0x0000817C }, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
-   { 26307, 0x0000817A }, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
-   { 26341, 0x00008578 }, /* GL_PREVIOUS */
-   { 26353, 0x00008578 }, /* GL_PREVIOUS_ARB */
-   { 26369, 0x00008578 }, /* GL_PREVIOUS_EXT */
-   { 26385, 0x00008577 }, /* GL_PRIMARY_COLOR */
-   { 26402, 0x00008577 }, /* GL_PRIMARY_COLOR_ARB */
-   { 26423, 0x00008577 }, /* GL_PRIMARY_COLOR_EXT */
-   { 26444, 0x000088B0 }, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
-   { 26477, 0x00008805 }, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
-   { 26509, 0x000088AC }, /* GL_PROGRAM_ATTRIBS_ARB */
-   { 26532, 0x00008677 }, /* GL_PROGRAM_BINDING_ARB */
-   { 26555, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_ARB */
-   { 26585, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_NV */
-   { 26614, 0x00008874 }, /* GL_PROGRAM_ERROR_STRING_ARB */
-   { 26642, 0x00008876 }, /* GL_PROGRAM_FORMAT_ARB */
-   { 26664, 0x00008875 }, /* GL_PROGRAM_FORMAT_ASCII_ARB */
-   { 26692, 0x000088A0 }, /* GL_PROGRAM_INSTRUCTIONS_ARB */
-   { 26720, 0x00008627 }, /* GL_PROGRAM_LENGTH_ARB */
-   { 26742, 0x00008627 }, /* GL_PROGRAM_LENGTH_NV */
-   { 26763, 0x000088B2 }, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-   { 26803, 0x00008808 }, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-   { 26842, 0x000088AE }, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
-   { 26872, 0x000088A2 }, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-   { 26907, 0x000088AA }, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
-   { 26940, 0x000088A6 }, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
-   { 26974, 0x0000880A }, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-   { 27013, 0x00008809 }, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-   { 27052, 0x00008B40 }, /* GL_PROGRAM_OBJECT_ARB */
-   { 27074, 0x000088A8 }, /* GL_PROGRAM_PARAMETERS_ARB */
-   { 27100, 0x00008644 }, /* GL_PROGRAM_PARAMETER_NV */
-   { 27124, 0x00008647 }, /* GL_PROGRAM_RESIDENT_NV */
-   { 27147, 0x00008628 }, /* GL_PROGRAM_STRING_ARB */
-   { 27169, 0x00008628 }, /* GL_PROGRAM_STRING_NV */
-   { 27190, 0x00008646 }, /* GL_PROGRAM_TARGET_NV */
-   { 27211, 0x000088A4 }, /* GL_PROGRAM_TEMPORARIES_ARB */
-   { 27238, 0x00008807 }, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
-   { 27270, 0x00008806 }, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
-   { 27302, 0x000088B6 }, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-   { 27337, 0x00001701 }, /* GL_PROJECTION */
-   { 27351, 0x00000BA7 }, /* GL_PROJECTION_MATRIX */
-   { 27372, 0x00000BA4 }, /* GL_PROJECTION_STACK_DEPTH */
-   { 27398, 0x00008E4F }, /* GL_PROVOKING_VERTEX_EXT */
-   { 27422, 0x000080D3 }, /* GL_PROXY_COLOR_TABLE */
-   { 27443, 0x00008025 }, /* GL_PROXY_HISTOGRAM */
-   { 27462, 0x00008025 }, /* GL_PROXY_HISTOGRAM_EXT */
-   { 27485, 0x000080D5 }, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
-   { 27524, 0x000080D4 }, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
-   { 27562, 0x00008063 }, /* GL_PROXY_TEXTURE_1D */
-   { 27582, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
-   { 27612, 0x00008063 }, /* GL_PROXY_TEXTURE_1D_EXT */
-   { 27636, 0x00008064 }, /* GL_PROXY_TEXTURE_2D */
-   { 27656, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
-   { 27686, 0x00008064 }, /* GL_PROXY_TEXTURE_2D_EXT */
-   { 27710, 0x00008070 }, /* GL_PROXY_TEXTURE_3D */
-   { 27730, 0x000080BD }, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
-   { 27763, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP */
-   { 27789, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP_ARB */
-   { 27819, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
-   { 27850, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_NV */
-   { 27880, 0x00002003 }, /* GL_Q */
-   { 27885, 0x00001209 }, /* GL_QUADRATIC_ATTENUATION */
-   { 27910, 0x00000007 }, /* GL_QUADS */
-   { 27919, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT */
-   { 27967, 0x00008614 }, /* GL_QUAD_MESH_SUN */
-   { 27984, 0x00000008 }, /* GL_QUAD_STRIP */
-   { 27998, 0x00008864 }, /* GL_QUERY_COUNTER_BITS */
-   { 28020, 0x00008864 }, /* GL_QUERY_COUNTER_BITS_ARB */
-   { 28046, 0x00008866 }, /* GL_QUERY_RESULT */
-   { 28062, 0x00008866 }, /* GL_QUERY_RESULT_ARB */
-   { 28082, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE */
-   { 28108, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE_ARB */
-   { 28138, 0x00002002 }, /* GL_R */
-   { 28143, 0x00002A10 }, /* GL_R3_G3_B2 */
-   { 28155, 0x00019262 }, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
-   { 28188, 0x00000C02 }, /* GL_READ_BUFFER */
-   { 28203, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER */
-   { 28223, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
-   { 28255, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER_EXT */
-   { 28279, 0x000088B8 }, /* GL_READ_ONLY */
-   { 28292, 0x000088B8 }, /* GL_READ_ONLY_ARB */
-   { 28309, 0x000088BA }, /* GL_READ_WRITE */
-   { 28323, 0x000088BA }, /* GL_READ_WRITE_ARB */
-   { 28341, 0x00001903 }, /* GL_RED */
-   { 28348, 0x00008016 }, /* GL_REDUCE */
-   { 28358, 0x00008016 }, /* GL_REDUCE_EXT */
-   { 28372, 0x00000D15 }, /* GL_RED_BIAS */
-   { 28384, 0x00000D52 }, /* GL_RED_BITS */
-   { 28396, 0x00000D14 }, /* GL_RED_SCALE */
-   { 28409, 0x00008512 }, /* GL_REFLECTION_MAP */
-   { 28427, 0x00008512 }, /* GL_REFLECTION_MAP_ARB */
-   { 28449, 0x00008512 }, /* GL_REFLECTION_MAP_NV */
-   { 28470, 0x00001C00 }, /* GL_RENDER */
-   { 28480, 0x00008D41 }, /* GL_RENDERBUFFER */
-   { 28496, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE */
-   { 28523, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_EXT */
-   { 28551, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE */
-   { 28577, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE */
-   { 28604, 0x00008D41 }, /* GL_RENDERBUFFER_EXT */
-   { 28624, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE */
-   { 28651, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT */
-   { 28674, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_EXT */
-   { 28701, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
-   { 28733, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */
-   { 28769, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE */
-   { 28794, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES */
-   { 28818, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE */
-   { 28847, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH */
-   { 28869, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_EXT */
-   { 28895, 0x00001F01 }, /* GL_RENDERER */
-   { 28907, 0x00000C40 }, /* GL_RENDER_MODE */
-   { 28922, 0x00002901 }, /* GL_REPEAT */
-   { 28932, 0x00001E01 }, /* GL_REPLACE */
-   { 28943, 0x00008062 }, /* GL_REPLACE_EXT */
-   { 28958, 0x00008153 }, /* GL_REPLICATE_BORDER_HP */
-   { 28981, 0x0000803A }, /* GL_RESCALE_NORMAL */
-   { 28999, 0x0000803A }, /* GL_RESCALE_NORMAL_EXT */
-   { 29021, 0x00000102 }, /* GL_RETURN */
-   { 29031, 0x00001907 }, /* GL_RGB */
-   { 29038, 0x00008052 }, /* GL_RGB10 */
-   { 29047, 0x00008059 }, /* GL_RGB10_A2 */
-   { 29059, 0x00008059 }, /* GL_RGB10_A2_EXT */
-   { 29075, 0x00008052 }, /* GL_RGB10_EXT */
-   { 29088, 0x00008053 }, /* GL_RGB12 */
-   { 29097, 0x00008053 }, /* GL_RGB12_EXT */
-   { 29110, 0x00008054 }, /* GL_RGB16 */
-   { 29119, 0x00008054 }, /* GL_RGB16_EXT */
-   { 29132, 0x0000804E }, /* GL_RGB2_EXT */
-   { 29144, 0x0000804F }, /* GL_RGB4 */
-   { 29152, 0x0000804F }, /* GL_RGB4_EXT */
-   { 29164, 0x000083A1 }, /* GL_RGB4_S3TC */
-   { 29177, 0x00008050 }, /* GL_RGB5 */
-   { 29185, 0x00008057 }, /* GL_RGB5_A1 */
-   { 29196, 0x00008057 }, /* GL_RGB5_A1_EXT */
-   { 29211, 0x00008050 }, /* GL_RGB5_EXT */
-   { 29223, 0x00008051 }, /* GL_RGB8 */
-   { 29231, 0x00008051 }, /* GL_RGB8_EXT */
-   { 29243, 0x00001908 }, /* GL_RGBA */
-   { 29251, 0x0000805A }, /* GL_RGBA12 */
-   { 29261, 0x0000805A }, /* GL_RGBA12_EXT */
-   { 29275, 0x0000805B }, /* GL_RGBA16 */
-   { 29285, 0x0000805B }, /* GL_RGBA16_EXT */
-   { 29299, 0x00008055 }, /* GL_RGBA2 */
-   { 29308, 0x00008055 }, /* GL_RGBA2_EXT */
-   { 29321, 0x00008056 }, /* GL_RGBA4 */
-   { 29330, 0x000083A5 }, /* GL_RGBA4_DXT5_S3TC */
-   { 29349, 0x00008056 }, /* GL_RGBA4_EXT */
-   { 29362, 0x000083A3 }, /* GL_RGBA4_S3TC */
-   { 29376, 0x00008058 }, /* GL_RGBA8 */
-   { 29385, 0x00008058 }, /* GL_RGBA8_EXT */
-   { 29398, 0x00008F97 }, /* GL_RGBA8_SNORM */
-   { 29413, 0x000083A4 }, /* GL_RGBA_DXT5_S3TC */
-   { 29431, 0x00000C31 }, /* GL_RGBA_MODE */
-   { 29444, 0x000083A2 }, /* GL_RGBA_S3TC */
-   { 29457, 0x00008F93 }, /* GL_RGBA_SNORM */
-   { 29471, 0x000083A0 }, /* GL_RGB_S3TC */
-   { 29483, 0x00008573 }, /* GL_RGB_SCALE */
-   { 29496, 0x00008573 }, /* GL_RGB_SCALE_ARB */
-   { 29513, 0x00008573 }, /* GL_RGB_SCALE_EXT */
-   { 29530, 0x00000407 }, /* GL_RIGHT */
-   { 29539, 0x00002000 }, /* GL_S */
-   { 29544, 0x00008B5D }, /* GL_SAMPLER_1D */
-   { 29558, 0x00008B61 }, /* GL_SAMPLER_1D_SHADOW */
-   { 29579, 0x00008B5E }, /* GL_SAMPLER_2D */
-   { 29593, 0x00008B62 }, /* GL_SAMPLER_2D_SHADOW */
-   { 29614, 0x00008B5F }, /* GL_SAMPLER_3D */
-   { 29628, 0x00008B60 }, /* GL_SAMPLER_CUBE */
-   { 29644, 0x000080A9 }, /* GL_SAMPLES */
-   { 29655, 0x000086B4 }, /* GL_SAMPLES_3DFX */
-   { 29671, 0x000080A9 }, /* GL_SAMPLES_ARB */
-   { 29686, 0x00008914 }, /* GL_SAMPLES_PASSED */
-   { 29704, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */
-   { 29726, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
-   { 29754, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */
-   { 29786, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */
-   { 29809, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */
-   { 29836, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */
-   { 29854, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */
-   { 29877, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */
-   { 29899, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */
-   { 29918, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */
-   { 29941, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */
-   { 29967, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */
-   { 29997, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */
-   { 30022, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */
-   { 30051, 0x00080000 }, /* GL_SCISSOR_BIT */
-   { 30066, 0x00000C10 }, /* GL_SCISSOR_BOX */
-   { 30081, 0x00000C11 }, /* GL_SCISSOR_TEST */
-   { 30097, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */
-   { 30122, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
-   { 30162, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */
-   { 30206, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
-   { 30239, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
-   { 30269, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
-   { 30301, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
-   { 30331, 0x00001C02 }, /* GL_SELECT */
-   { 30341, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */
-   { 30369, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */
-   { 30394, 0x00008012 }, /* GL_SEPARABLE_2D */
-   { 30410, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */
-   { 30437, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */
-   { 30468, 0x0000150F }, /* GL_SET */
-   { 30475, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */
-   { 30496, 0x00008B88 }, /* GL_SHADER_SOURCE_LENGTH */
-   { 30520, 0x00008B4F }, /* GL_SHADER_TYPE */
-   { 30535, 0x00000B54 }, /* GL_SHADE_MODEL */
-   { 30550, 0x00008B8C }, /* GL_SHADING_LANGUAGE_VERSION */
-   { 30578, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */
-   { 30601, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */
-   { 30631, 0x00001601 }, /* GL_SHININESS */
-   { 30644, 0x00001402 }, /* GL_SHORT */
-   { 30653, 0x00008F9C }, /* GL_SIGNED_NORMALIZED */
-   { 30674, 0x000081F9 }, /* GL_SINGLE_COLOR */
-   { 30690, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */
-   { 30710, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */
-   { 30729, 0x00008C46 }, /* GL_SLUMINANCE */
-   { 30743, 0x00008C47 }, /* GL_SLUMINANCE8 */
-   { 30758, 0x00008C45 }, /* GL_SLUMINANCE8_ALPHA8 */
-   { 30780, 0x00008C44 }, /* GL_SLUMINANCE_ALPHA */
-   { 30800, 0x00001D01 }, /* GL_SMOOTH */
-   { 30810, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */
-   { 30843, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */
-   { 30870, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */
-   { 30903, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */
-   { 30930, 0x00008588 }, /* GL_SOURCE0_ALPHA */
-   { 30947, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */
-   { 30968, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */
-   { 30989, 0x00008580 }, /* GL_SOURCE0_RGB */
-   { 31004, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */
-   { 31023, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */
-   { 31042, 0x00008589 }, /* GL_SOURCE1_ALPHA */
-   { 31059, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */
-   { 31080, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */
-   { 31101, 0x00008581 }, /* GL_SOURCE1_RGB */
-   { 31116, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */
-   { 31135, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */
-   { 31154, 0x0000858A }, /* GL_SOURCE2_ALPHA */
-   { 31171, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */
-   { 31192, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */
-   { 31213, 0x00008582 }, /* GL_SOURCE2_RGB */
-   { 31228, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */
-   { 31247, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */
-   { 31266, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */
-   { 31286, 0x00008583 }, /* GL_SOURCE3_RGB_NV */
-   { 31304, 0x00001202 }, /* GL_SPECULAR */
-   { 31316, 0x00002402 }, /* GL_SPHERE_MAP */
-   { 31330, 0x00001206 }, /* GL_SPOT_CUTOFF */
-   { 31345, 0x00001204 }, /* GL_SPOT_DIRECTION */
-   { 31363, 0x00001205 }, /* GL_SPOT_EXPONENT */
-   { 31380, 0x00008588 }, /* GL_SRC0_ALPHA */
-   { 31394, 0x00008580 }, /* GL_SRC0_RGB */
-   { 31406, 0x00008589 }, /* GL_SRC1_ALPHA */
-   { 31420, 0x00008581 }, /* GL_SRC1_RGB */
-   { 31432, 0x0000858A }, /* GL_SRC2_ALPHA */
-   { 31446, 0x00008582 }, /* GL_SRC2_RGB */
-   { 31458, 0x00000302 }, /* GL_SRC_ALPHA */
-   { 31471, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */
-   { 31493, 0x00000300 }, /* GL_SRC_COLOR */
-   { 31506, 0x00008C40 }, /* GL_SRGB */
-   { 31514, 0x00008C41 }, /* GL_SRGB8 */
-   { 31523, 0x00008C43 }, /* GL_SRGB8_ALPHA8 */
-   { 31539, 0x00008C42 }, /* GL_SRGB_ALPHA */
-   { 31553, 0x00000503 }, /* GL_STACK_OVERFLOW */
-   { 31571, 0x00000504 }, /* GL_STACK_UNDERFLOW */
-   { 31590, 0x000088E6 }, /* GL_STATIC_COPY */
-   { 31605, 0x000088E6 }, /* GL_STATIC_COPY_ARB */
-   { 31624, 0x000088E4 }, /* GL_STATIC_DRAW */
-   { 31639, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */
-   { 31658, 0x000088E5 }, /* GL_STATIC_READ */
-   { 31673, 0x000088E5 }, /* GL_STATIC_READ_ARB */
-   { 31692, 0x00001802 }, /* GL_STENCIL */
-   { 31703, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT */
-   { 31725, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */
-   { 31751, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */
-   { 31772, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */
-   { 31797, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
-   { 31818, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */
-   { 31843, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-   { 31875, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */
-   { 31911, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
-   { 31943, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */
-   { 31979, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
-   { 31999, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
-   { 32026, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
-   { 32052, 0x00000D57 }, /* GL_STENCIL_BITS */
-   { 32068, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
-   { 32090, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
-   { 32113, 0x00000B94 }, /* GL_STENCIL_FAIL */
-   { 32129, 0x00000B92 }, /* GL_STENCIL_FUNC */
-   { 32145, 0x00001901 }, /* GL_STENCIL_INDEX */
-   { 32162, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
-   { 32185, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
-   { 32207, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
-   { 32229, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
-   { 32251, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
-   { 32272, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
-   { 32299, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
-   { 32326, 0x00000B97 }, /* GL_STENCIL_REF */
-   { 32341, 0x00000B90 }, /* GL_STENCIL_TEST */
-   { 32357, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
-   { 32386, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
-   { 32408, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
-   { 32429, 0x00000C33 }, /* GL_STEREO */
-   { 32439, 0x000085BE }, /* GL_STORAGE_CACHED_APPLE */
-   { 32463, 0x000085BD }, /* GL_STORAGE_PRIVATE_APPLE */
-   { 32488, 0x000085BF }, /* GL_STORAGE_SHARED_APPLE */
-   { 32512, 0x000088E2 }, /* GL_STREAM_COPY */
-   { 32527, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
-   { 32546, 0x000088E0 }, /* GL_STREAM_DRAW */
-   { 32561, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
-   { 32580, 0x000088E1 }, /* GL_STREAM_READ */
-   { 32595, 0x000088E1 }, /* GL_STREAM_READ_ARB */
-   { 32614, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
-   { 32631, 0x000084E7 }, /* GL_SUBTRACT */
-   { 32643, 0x000084E7 }, /* GL_SUBTRACT_ARB */
-   { 32659, 0x00002001 }, /* GL_T */
-   { 32664, 0x00002A2A }, /* GL_T2F_C3F_V3F */
-   { 32679, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
-   { 32698, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
-   { 32714, 0x00002A2B }, /* GL_T2F_N3F_V3F */
-   { 32729, 0x00002A27 }, /* GL_T2F_V3F */
-   { 32740, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
-   { 32759, 0x00002A28 }, /* GL_T4F_V4F */
-   { 32770, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
-   { 32793, 0x00001702 }, /* GL_TEXTURE */
-   { 32804, 0x000084C0 }, /* GL_TEXTURE0 */
-   { 32816, 0x000084C0 }, /* GL_TEXTURE0_ARB */
-   { 32832, 0x000084C1 }, /* GL_TEXTURE1 */
-   { 32844, 0x000084CA }, /* GL_TEXTURE10 */
-   { 32857, 0x000084CA }, /* GL_TEXTURE10_ARB */
-   { 32874, 0x000084CB }, /* GL_TEXTURE11 */
-   { 32887, 0x000084CB }, /* GL_TEXTURE11_ARB */
-   { 32904, 0x000084CC }, /* GL_TEXTURE12 */
-   { 32917, 0x000084CC }, /* GL_TEXTURE12_ARB */
-   { 32934, 0x000084CD }, /* GL_TEXTURE13 */
-   { 32947, 0x000084CD }, /* GL_TEXTURE13_ARB */
-   { 32964, 0x000084CE }, /* GL_TEXTURE14 */
-   { 32977, 0x000084CE }, /* GL_TEXTURE14_ARB */
-   { 32994, 0x000084CF }, /* GL_TEXTURE15 */
-   { 33007, 0x000084CF }, /* GL_TEXTURE15_ARB */
-   { 33024, 0x000084D0 }, /* GL_TEXTURE16 */
-   { 33037, 0x000084D0 }, /* GL_TEXTURE16_ARB */
-   { 33054, 0x000084D1 }, /* GL_TEXTURE17 */
-   { 33067, 0x000084D1 }, /* GL_TEXTURE17_ARB */
-   { 33084, 0x000084D2 }, /* GL_TEXTURE18 */
-   { 33097, 0x000084D2 }, /* GL_TEXTURE18_ARB */
-   { 33114, 0x000084D3 }, /* GL_TEXTURE19 */
-   { 33127, 0x000084D3 }, /* GL_TEXTURE19_ARB */
-   { 33144, 0x000084C1 }, /* GL_TEXTURE1_ARB */
-   { 33160, 0x000084C2 }, /* GL_TEXTURE2 */
-   { 33172, 0x000084D4 }, /* GL_TEXTURE20 */
-   { 33185, 0x000084D4 }, /* GL_TEXTURE20_ARB */
-   { 33202, 0x000084D5 }, /* GL_TEXTURE21 */
-   { 33215, 0x000084D5 }, /* GL_TEXTURE21_ARB */
-   { 33232, 0x000084D6 }, /* GL_TEXTURE22 */
-   { 33245, 0x000084D6 }, /* GL_TEXTURE22_ARB */
-   { 33262, 0x000084D7 }, /* GL_TEXTURE23 */
-   { 33275, 0x000084D7 }, /* GL_TEXTURE23_ARB */
-   { 33292, 0x000084D8 }, /* GL_TEXTURE24 */
-   { 33305, 0x000084D8 }, /* GL_TEXTURE24_ARB */
-   { 33322, 0x000084D9 }, /* GL_TEXTURE25 */
-   { 33335, 0x000084D9 }, /* GL_TEXTURE25_ARB */
-   { 33352, 0x000084DA }, /* GL_TEXTURE26 */
-   { 33365, 0x000084DA }, /* GL_TEXTURE26_ARB */
-   { 33382, 0x000084DB }, /* GL_TEXTURE27 */
-   { 33395, 0x000084DB }, /* GL_TEXTURE27_ARB */
-   { 33412, 0x000084DC }, /* GL_TEXTURE28 */
-   { 33425, 0x000084DC }, /* GL_TEXTURE28_ARB */
-   { 33442, 0x000084DD }, /* GL_TEXTURE29 */
-   { 33455, 0x000084DD }, /* GL_TEXTURE29_ARB */
-   { 33472, 0x000084C2 }, /* GL_TEXTURE2_ARB */
-   { 33488, 0x000084C3 }, /* GL_TEXTURE3 */
-   { 33500, 0x000084DE }, /* GL_TEXTURE30 */
-   { 33513, 0x000084DE }, /* GL_TEXTURE30_ARB */
-   { 33530, 0x000084DF }, /* GL_TEXTURE31 */
-   { 33543, 0x000084DF }, /* GL_TEXTURE31_ARB */
-   { 33560, 0x000084C3 }, /* GL_TEXTURE3_ARB */
-   { 33576, 0x000084C4 }, /* GL_TEXTURE4 */
-   { 33588, 0x000084C4 }, /* GL_TEXTURE4_ARB */
-   { 33604, 0x000084C5 }, /* GL_TEXTURE5 */
-   { 33616, 0x000084C5 }, /* GL_TEXTURE5_ARB */
-   { 33632, 0x000084C6 }, /* GL_TEXTURE6 */
-   { 33644, 0x000084C6 }, /* GL_TEXTURE6_ARB */
-   { 33660, 0x000084C7 }, /* GL_TEXTURE7 */
-   { 33672, 0x000084C7 }, /* GL_TEXTURE7_ARB */
-   { 33688, 0x000084C8 }, /* GL_TEXTURE8 */
-   { 33700, 0x000084C8 }, /* GL_TEXTURE8_ARB */
-   { 33716, 0x000084C9 }, /* GL_TEXTURE9 */
-   { 33728, 0x000084C9 }, /* GL_TEXTURE9_ARB */
-   { 33744, 0x00000DE0 }, /* GL_TEXTURE_1D */
-   { 33758, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
-   { 33782, 0x00000DE1 }, /* GL_TEXTURE_2D */
-   { 33796, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
-   { 33820, 0x0000806F }, /* GL_TEXTURE_3D */
-   { 33834, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
-   { 33856, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
-   { 33882, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
-   { 33904, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
-   { 33926, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
-   { 33958, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
-   { 33980, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
-   { 34012, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
-   { 34034, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
-   { 34062, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
-   { 34094, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
-   { 34127, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
-   { 34159, 0x00040000 }, /* GL_TEXTURE_BIT */
-   { 34174, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
-   { 34195, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
-   { 34220, 0x00001005 }, /* GL_TEXTURE_BORDER */
-   { 34238, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
-   { 34262, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-   { 34293, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
-   { 34323, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-   { 34353, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-   { 34388, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-   { 34419, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-   { 34457, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
-   { 34484, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
-   { 34516, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
-   { 34550, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
-   { 34574, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
-   { 34602, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
-   { 34626, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
-   { 34654, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-   { 34687, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
-   { 34711, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
-   { 34733, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
-   { 34755, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
-   { 34781, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
-   { 34815, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-   { 34848, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
-   { 34885, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
-   { 34913, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
-   { 34945, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
-   { 34968, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
-   { 35006, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
-   { 35048, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
-   { 35079, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-   { 35107, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
-   { 35137, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-   { 35165, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
-   { 35185, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
-   { 35209, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-   { 35240, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
-   { 35275, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-   { 35306, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
-   { 35341, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
-   { 35372, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
-   { 35407, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-   { 35438, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
-   { 35473, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-   { 35504, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
-   { 35539, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-   { 35570, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
-   { 35605, 0x000088F4 }, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
-   { 35634, 0x00008071 }, /* GL_TEXTURE_DEPTH */
-   { 35651, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
-   { 35673, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
-   { 35699, 0x00002300 }, /* GL_TEXTURE_ENV */
-   { 35714, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
-   { 35735, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
-   { 35755, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
-   { 35781, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
-   { 35801, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
-   { 35818, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
-   { 35835, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
-   { 35852, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
-   { 35869, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
-   { 35894, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
-   { 35916, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
-   { 35942, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
-   { 35960, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
-   { 35986, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
-   { 36012, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
-   { 36042, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
-   { 36069, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
-   { 36094, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
-   { 36114, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
-   { 36138, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
-   { 36165, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-   { 36192, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-   { 36219, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
-   { 36245, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
-   { 36275, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
-   { 36297, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
-   { 36315, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
-   { 36345, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
-   { 36373, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-   { 36401, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-   { 36429, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
-   { 36450, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
-   { 36469, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
-   { 36491, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
-   { 36510, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
-   { 36530, 0x000085B7 }, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
-   { 36560, 0x000085B8 }, /* GL_TEXTURE_RANGE_POINTER_APPLE */
-   { 36591, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
-   { 36616, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
-   { 36640, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
-   { 36660, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
-   { 36684, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
-   { 36704, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
-   { 36727, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */
-   { 36751, 0x000085BC }, /* GL_TEXTURE_STORAGE_HINT_APPLE */
-   { 36781, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
-   { 36806, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
-   { 36840, 0x00001000 }, /* GL_TEXTURE_WIDTH */
-   { 36857, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
-   { 36875, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
-   { 36893, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
-   { 36911, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
-   { 36931, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
-   { 36950, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-   { 36979, 0x00001000 }, /* GL_TRANSFORM_BIT */
-   { 36996, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
-   { 37022, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
-   { 37052, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-   { 37084, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-   { 37114, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
-   { 37148, 0x0000862C }, /* GL_TRANSPOSE_NV */
-   { 37164, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-   { 37195, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
-   { 37230, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-   { 37258, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
-   { 37290, 0x00000004 }, /* GL_TRIANGLES */
-   { 37303, 0x00000006 }, /* GL_TRIANGLE_FAN */
-   { 37319, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
-   { 37340, 0x00000005 }, /* GL_TRIANGLE_STRIP */
-   { 37358, 0x00000001 }, /* GL_TRUE */
-   { 37366, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
-   { 37386, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
-   { 37409, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
-   { 37429, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
-   { 37450, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
-   { 37472, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
-   { 37494, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
-   { 37514, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
-   { 37535, 0x00001401 }, /* GL_UNSIGNED_BYTE */
-   { 37552, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-   { 37579, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
-   { 37602, 0x00001405 }, /* GL_UNSIGNED_INT */
-   { 37618, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
-   { 37645, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */
-   { 37666, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
-   { 37690, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-   { 37721, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
-   { 37745, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-   { 37773, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */
-   { 37796, 0x00001403 }, /* GL_UNSIGNED_SHORT */
-   { 37814, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-   { 37844, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-   { 37870, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-   { 37900, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-   { 37926, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
-   { 37950, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-   { 37978, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-   { 38006, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
-   { 38033, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-   { 38065, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
-   { 38096, 0x00008CA2 }, /* GL_UPPER_LEFT */
-   { 38110, 0x00002A20 }, /* GL_V2F */
-   { 38117, 0x00002A21 }, /* GL_V3F */
-   { 38124, 0x00008B83 }, /* GL_VALIDATE_STATUS */
-   { 38143, 0x00001F00 }, /* GL_VENDOR */
-   { 38153, 0x00001F02 }, /* GL_VERSION */
-   { 38164, 0x00008074 }, /* GL_VERTEX_ARRAY */
-   { 38180, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING */
-   { 38204, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
-   { 38234, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-   { 38265, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
-   { 38300, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
-   { 38324, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
-   { 38345, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
-   { 38368, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
-   { 38389, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-   { 38416, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-   { 38444, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-   { 38472, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-   { 38500, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-   { 38528, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-   { 38556, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
-   { 38584, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-   { 38611, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-   { 38638, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-   { 38665, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-   { 38692, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-   { 38719, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-   { 38746, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-   { 38773, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-   { 38800, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-   { 38827, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-   { 38865, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
-   { 38907, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-   { 38938, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
-   { 38973, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
-   { 39007, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
-   { 39045, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-   { 39076, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
-   { 39111, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-   { 39139, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
-   { 39171, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-   { 39201, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
-   { 39235, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
-   { 39263, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
-   { 39295, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
-   { 39315, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
-   { 39337, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
-   { 39366, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
-   { 39387, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-   { 39416, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
-   { 39449, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
-   { 39481, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-   { 39508, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
-   { 39539, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
-   { 39569, 0x00008B31 }, /* GL_VERTEX_SHADER */
-   { 39586, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
-   { 39607, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
-   { 39634, 0x00000BA2 }, /* GL_VIEWPORT */
-   { 39646, 0x00000800 }, /* GL_VIEWPORT_BIT */
-   { 39662, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
-   { 39682, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-   { 39713, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
-   { 39748, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-   { 39776, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-   { 39801, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-   { 39828, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-   { 39853, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
-   { 39877, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
-   { 39896, 0x000088B9 }, /* GL_WRITE_ONLY */
-   { 39910, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
-   { 39928, 0x00001506 }, /* GL_XOR */
-   { 39935, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
-   { 39954, 0x00008757 }, /* GL_YCBCR_MESA */
-   { 39968, 0x00000000 }, /* GL_ZERO */
-   { 39976, 0x00000D16 }, /* GL_ZOOM_X */
-   { 39986, 0x00000D17 }, /* GL_ZOOM_Y */
+   {   779, 0x0000911A }, /* GL_ALREADY_SIGNALED */
+   {   799, 0x00000207 }, /* GL_ALWAYS */
+   {   809, 0x00001200 }, /* GL_AMBIENT */
+   {   820, 0x00001602 }, /* GL_AMBIENT_AND_DIFFUSE */
+   {   843, 0x00001501 }, /* GL_AND */
+   {   850, 0x00001504 }, /* GL_AND_INVERTED */
+   {   866, 0x00001502 }, /* GL_AND_REVERSE */
+   {   881, 0x00008892 }, /* GL_ARRAY_BUFFER */
+   {   897, 0x00008894 }, /* GL_ARRAY_BUFFER_BINDING */
+   {   921, 0x00008894 }, /* GL_ARRAY_BUFFER_BINDING_ARB */
+   {   949, 0x00008B85 }, /* GL_ATTACHED_SHADERS */
+   {   969, 0x00008645 }, /* GL_ATTRIB_ARRAY_POINTER_NV */
+   {   996, 0x00008623 }, /* GL_ATTRIB_ARRAY_SIZE_NV */
+   {  1020, 0x00008624 }, /* GL_ATTRIB_ARRAY_STRIDE_NV */
+   {  1046, 0x00008625 }, /* GL_ATTRIB_ARRAY_TYPE_NV */
+   {  1070, 0x00000BB0 }, /* GL_ATTRIB_STACK_DEPTH */
+   {  1092, 0x00000D80 }, /* GL_AUTO_NORMAL */
+   {  1107, 0x00000409 }, /* GL_AUX0 */
+   {  1115, 0x0000040A }, /* GL_AUX1 */
+   {  1123, 0x0000040B }, /* GL_AUX2 */
+   {  1131, 0x0000040C }, /* GL_AUX3 */
+   {  1139, 0x00000C00 }, /* GL_AUX_BUFFERS */
+   {  1154, 0x00000405 }, /* GL_BACK */
+   {  1162, 0x00000402 }, /* GL_BACK_LEFT */
+   {  1175, 0x00000403 }, /* GL_BACK_RIGHT */
+   {  1189, 0x000080E0 }, /* GL_BGR */
+   {  1196, 0x000080E1 }, /* GL_BGRA */
+   {  1204, 0x00001A00 }, /* GL_BITMAP */
+   {  1214, 0x00000704 }, /* GL_BITMAP_TOKEN */
+   {  1230, 0x00000BE2 }, /* GL_BLEND */
+   {  1239, 0x00008005 }, /* GL_BLEND_COLOR */
+   {  1254, 0x00008005 }, /* GL_BLEND_COLOR_EXT */
+   {  1273, 0x00000BE0 }, /* GL_BLEND_DST */
+   {  1286, 0x000080CA }, /* GL_BLEND_DST_ALPHA */
+   {  1305, 0x000080C8 }, /* GL_BLEND_DST_RGB */
+   {  1322, 0x00008009 }, /* GL_BLEND_EQUATION */
+   {  1340, 0x0000883D }, /* GL_BLEND_EQUATION_ALPHA */
+   {  1364, 0x0000883D }, /* GL_BLEND_EQUATION_ALPHA_EXT */
+   {  1392, 0x00008009 }, /* GL_BLEND_EQUATION_EXT */
+   {  1414, 0x00008009 }, /* GL_BLEND_EQUATION_RGB */
+   {  1436, 0x00008009 }, /* GL_BLEND_EQUATION_RGB_EXT */
+   {  1462, 0x00000BE1 }, /* GL_BLEND_SRC */
+   {  1475, 0x000080CB }, /* GL_BLEND_SRC_ALPHA */
+   {  1494, 0x000080C9 }, /* GL_BLEND_SRC_RGB */
+   {  1511, 0x00001905 }, /* GL_BLUE */
+   {  1519, 0x00000D1B }, /* GL_BLUE_BIAS */
+   {  1532, 0x00000D54 }, /* GL_BLUE_BITS */
+   {  1545, 0x00000D1A }, /* GL_BLUE_SCALE */
+   {  1559, 0x00008B56 }, /* GL_BOOL */
+   {  1567, 0x00008B56 }, /* GL_BOOL_ARB */
+   {  1579, 0x00008B57 }, /* GL_BOOL_VEC2 */
+   {  1592, 0x00008B57 }, /* GL_BOOL_VEC2_ARB */
+   {  1609, 0x00008B58 }, /* GL_BOOL_VEC3 */
+   {  1622, 0x00008B58 }, /* GL_BOOL_VEC3_ARB */
+   {  1639, 0x00008B59 }, /* GL_BOOL_VEC4 */
+   {  1652, 0x00008B59 }, /* GL_BOOL_VEC4_ARB */
+   {  1669, 0x000088BB }, /* GL_BUFFER_ACCESS */
+   {  1686, 0x000088BB }, /* GL_BUFFER_ACCESS_ARB */
+   {  1707, 0x00008A13 }, /* GL_BUFFER_FLUSHING_UNMAP_APPLE */
+   {  1738, 0x000088BC }, /* GL_BUFFER_MAPPED */
+   {  1755, 0x000088BC }, /* GL_BUFFER_MAPPED_ARB */
+   {  1776, 0x000088BD }, /* GL_BUFFER_MAP_POINTER */
+   {  1798, 0x000088BD }, /* GL_BUFFER_MAP_POINTER_ARB */
+   {  1824, 0x00008A12 }, /* GL_BUFFER_SERIALIZED_MODIFY_APPLE */
+   {  1858, 0x00008764 }, /* GL_BUFFER_SIZE */
+   {  1873, 0x00008764 }, /* GL_BUFFER_SIZE_ARB */
+   {  1892, 0x00008765 }, /* GL_BUFFER_USAGE */
+   {  1908, 0x00008765 }, /* GL_BUFFER_USAGE_ARB */
+   {  1928, 0x0000877B }, /* GL_BUMP_ENVMAP_ATI */
+   {  1947, 0x00008777 }, /* GL_BUMP_NUM_TEX_UNITS_ATI */
+   {  1973, 0x00008775 }, /* GL_BUMP_ROT_MATRIX_ATI */
+   {  1996, 0x00008776 }, /* GL_BUMP_ROT_MATRIX_SIZE_ATI */
+   {  2024, 0x0000877C }, /* GL_BUMP_TARGET_ATI */
+   {  2043, 0x00008778 }, /* GL_BUMP_TEX_UNITS_ATI */
+   {  2065, 0x00001400 }, /* GL_BYTE */
+   {  2073, 0x00002A24 }, /* GL_C3F_V3F */
+   {  2084, 0x00002A26 }, /* GL_C4F_N3F_V3F */
+   {  2099, 0x00002A22 }, /* GL_C4UB_V2F */
+   {  2111, 0x00002A23 }, /* GL_C4UB_V3F */
+   {  2123, 0x00000901 }, /* GL_CCW */
+   {  2130, 0x00002900 }, /* GL_CLAMP */
+   {  2139, 0x0000812D }, /* GL_CLAMP_TO_BORDER */
+   {  2158, 0x0000812D }, /* GL_CLAMP_TO_BORDER_ARB */
+   {  2181, 0x0000812D }, /* GL_CLAMP_TO_BORDER_SGIS */
+   {  2205, 0x0000812F }, /* GL_CLAMP_TO_EDGE */
+   {  2222, 0x0000812F }, /* GL_CLAMP_TO_EDGE_SGIS */
+   {  2244, 0x00001500 }, /* GL_CLEAR */
+   {  2253, 0x000084E1 }, /* GL_CLIENT_ACTIVE_TEXTURE */
+   {  2278, 0x000084E1 }, /* GL_CLIENT_ACTIVE_TEXTURE_ARB */
+   {  2307, 0xFFFFFFFF }, /* GL_CLIENT_ALL_ATTRIB_BITS */
+   {  2333, 0x00000BB1 }, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
+   {  2362, 0x00000001 }, /* GL_CLIENT_PIXEL_STORE_BIT */
+   {  2388, 0x00000002 }, /* GL_CLIENT_VERTEX_ARRAY_BIT */
+   {  2415, 0x00003000 }, /* GL_CLIP_PLANE0 */
+   {  2430, 0x00003001 }, /* GL_CLIP_PLANE1 */
+   {  2445, 0x00003002 }, /* GL_CLIP_PLANE2 */
+   {  2460, 0x00003003 }, /* GL_CLIP_PLANE3 */
+   {  2475, 0x00003004 }, /* GL_CLIP_PLANE4 */
+   {  2490, 0x00003005 }, /* GL_CLIP_PLANE5 */
+   {  2505, 0x000080F0 }, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
+   {  2538, 0x00000A00 }, /* GL_COEFF */
+   {  2547, 0x00001800 }, /* GL_COLOR */
+   {  2556, 0x00008076 }, /* GL_COLOR_ARRAY */
+   {  2571, 0x00008898 }, /* GL_COLOR_ARRAY_BUFFER_BINDING */
+   {  2601, 0x00008898 }, /* GL_COLOR_ARRAY_BUFFER_BINDING_ARB */
+   {  2635, 0x00008090 }, /* GL_COLOR_ARRAY_POINTER */
+   {  2658, 0x00008081 }, /* GL_COLOR_ARRAY_SIZE */
+   {  2678, 0x00008083 }, /* GL_COLOR_ARRAY_STRIDE */
+   {  2700, 0x00008082 }, /* GL_COLOR_ARRAY_TYPE */
+   {  2720, 0x00008CE0 }, /* GL_COLOR_ATTACHMENT0 */
+   {  2741, 0x00008CE0 }, /* GL_COLOR_ATTACHMENT0_EXT */
+   {  2766, 0x00008CE1 }, /* GL_COLOR_ATTACHMENT1 */
+   {  2787, 0x00008CEA }, /* GL_COLOR_ATTACHMENT10 */
+   {  2809, 0x00008CEA }, /* GL_COLOR_ATTACHMENT10_EXT */
+   {  2835, 0x00008CEB }, /* GL_COLOR_ATTACHMENT11 */
+   {  2857, 0x00008CEB }, /* GL_COLOR_ATTACHMENT11_EXT */
+   {  2883, 0x00008CEC }, /* GL_COLOR_ATTACHMENT12 */
+   {  2905, 0x00008CEC }, /* GL_COLOR_ATTACHMENT12_EXT */
+   {  2931, 0x00008CED }, /* GL_COLOR_ATTACHMENT13 */
+   {  2953, 0x00008CED }, /* GL_COLOR_ATTACHMENT13_EXT */
+   {  2979, 0x00008CEE }, /* GL_COLOR_ATTACHMENT14 */
+   {  3001, 0x00008CEE }, /* GL_COLOR_ATTACHMENT14_EXT */
+   {  3027, 0x00008CEF }, /* GL_COLOR_ATTACHMENT15 */
+   {  3049, 0x00008CEF }, /* GL_COLOR_ATTACHMENT15_EXT */
+   {  3075, 0x00008CE1 }, /* GL_COLOR_ATTACHMENT1_EXT */
+   {  3100, 0x00008CE2 }, /* GL_COLOR_ATTACHMENT2 */
+   {  3121, 0x00008CE2 }, /* GL_COLOR_ATTACHMENT2_EXT */
+   {  3146, 0x00008CE3 }, /* GL_COLOR_ATTACHMENT3 */
+   {  3167, 0x00008CE3 }, /* GL_COLOR_ATTACHMENT3_EXT */
+   {  3192, 0x00008CE4 }, /* GL_COLOR_ATTACHMENT4 */
+   {  3213, 0x00008CE4 }, /* GL_COLOR_ATTACHMENT4_EXT */
+   {  3238, 0x00008CE5 }, /* GL_COLOR_ATTACHMENT5 */
+   {  3259, 0x00008CE5 }, /* GL_COLOR_ATTACHMENT5_EXT */
+   {  3284, 0x00008CE6 }, /* GL_COLOR_ATTACHMENT6 */
+   {  3305, 0x00008CE6 }, /* GL_COLOR_ATTACHMENT6_EXT */
+   {  3330, 0x00008CE7 }, /* GL_COLOR_ATTACHMENT7 */
+   {  3351, 0x00008CE7 }, /* GL_COLOR_ATTACHMENT7_EXT */
+   {  3376, 0x00008CE8 }, /* GL_COLOR_ATTACHMENT8 */
+   {  3397, 0x00008CE8 }, /* GL_COLOR_ATTACHMENT8_EXT */
+   {  3422, 0x00008CE9 }, /* GL_COLOR_ATTACHMENT9 */
+   {  3443, 0x00008CE9 }, /* GL_COLOR_ATTACHMENT9_EXT */
+   {  3468, 0x00004000 }, /* GL_COLOR_BUFFER_BIT */
+   {  3488, 0x00000C22 }, /* GL_COLOR_CLEAR_VALUE */
+   {  3509, 0x00001900 }, /* GL_COLOR_INDEX */
+   {  3524, 0x00001603 }, /* GL_COLOR_INDEXES */
+   {  3541, 0x00000BF2 }, /* GL_COLOR_LOGIC_OP */
+   {  3559, 0x00000B57 }, /* GL_COLOR_MATERIAL */
+   {  3577, 0x00000B55 }, /* GL_COLOR_MATERIAL_FACE */
+   {  3600, 0x00000B56 }, /* GL_COLOR_MATERIAL_PARAMETER */
+   {  3628, 0x000080B1 }, /* GL_COLOR_MATRIX */
+   {  3644, 0x000080B1 }, /* GL_COLOR_MATRIX_SGI */
+   {  3664, 0x000080B2 }, /* GL_COLOR_MATRIX_STACK_DEPTH */
+   {  3692, 0x000080B2 }, /* GL_COLOR_MATRIX_STACK_DEPTH_SGI */
+   {  3724, 0x00008458 }, /* GL_COLOR_SUM */
+   {  3737, 0x00008458 }, /* GL_COLOR_SUM_ARB */
+   {  3754, 0x000080D0 }, /* GL_COLOR_TABLE */
+   {  3769, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE */
+   {  3795, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE_EXT */
+   {  3825, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE_SGI */
+   {  3855, 0x000080D7 }, /* GL_COLOR_TABLE_BIAS */
+   {  3875, 0x000080D7 }, /* GL_COLOR_TABLE_BIAS_SGI */
+   {  3899, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE */
+   {  3924, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE_EXT */
+   {  3953, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE_SGI */
+   {  3982, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT */
+   {  4004, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT_EXT */
+   {  4030, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT_SGI */
+   {  4056, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE */
+   {  4082, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE_EXT */
+   {  4112, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE_SGI */
+   {  4142, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE */
+   {  4172, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE_EXT */
+   {  4206, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE_SGI */
+   {  4240, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE */
+   {  4270, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE_EXT */
+   {  4304, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE_SGI */
+   {  4338, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE */
+   {  4362, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE_EXT */
+   {  4390, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE_SGI */
+   {  4418, 0x000080D6 }, /* GL_COLOR_TABLE_SCALE */
+   {  4439, 0x000080D6 }, /* GL_COLOR_TABLE_SCALE_SGI */
+   {  4464, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH */
+   {  4485, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH_EXT */
+   {  4510, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH_SGI */
+   {  4535, 0x00000C23 }, /* GL_COLOR_WRITEMASK */
+   {  4554, 0x00008570 }, /* GL_COMBINE */
+   {  4565, 0x00008503 }, /* GL_COMBINE4 */
+   {  4577, 0x00008572 }, /* GL_COMBINE_ALPHA */
+   {  4594, 0x00008572 }, /* GL_COMBINE_ALPHA_ARB */
+   {  4615, 0x00008572 }, /* GL_COMBINE_ALPHA_EXT */
+   {  4636, 0x00008570 }, /* GL_COMBINE_ARB */
+   {  4651, 0x00008570 }, /* GL_COMBINE_EXT */
+   {  4666, 0x00008571 }, /* GL_COMBINE_RGB */
+   {  4681, 0x00008571 }, /* GL_COMBINE_RGB_ARB */
+   {  4700, 0x00008571 }, /* GL_COMBINE_RGB_EXT */
+   {  4719, 0x0000884E }, /* GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT */
+   {  4755, 0x0000884E }, /* GL_COMPARE_R_TO_TEXTURE */
+   {  4779, 0x0000884E }, /* GL_COMPARE_R_TO_TEXTURE_ARB */
+   {  4807, 0x00001300 }, /* GL_COMPILE */
+   {  4818, 0x00001301 }, /* GL_COMPILE_AND_EXECUTE */
+   {  4841, 0x00008B81 }, /* GL_COMPILE_STATUS */
+   {  4859, 0x000084E9 }, /* GL_COMPRESSED_ALPHA */
+   {  4879, 0x000084E9 }, /* GL_COMPRESSED_ALPHA_ARB */
+   {  4903, 0x000084EC }, /* GL_COMPRESSED_INTENSITY */
+   {  4927, 0x000084EC }, /* GL_COMPRESSED_INTENSITY_ARB */
+   {  4955, 0x000084EA }, /* GL_COMPRESSED_LUMINANCE */
+   {  4979, 0x000084EB }, /* GL_COMPRESSED_LUMINANCE_ALPHA */
+   {  5009, 0x000084EB }, /* GL_COMPRESSED_LUMINANCE_ALPHA_ARB */
+   {  5043, 0x000084EA }, /* GL_COMPRESSED_LUMINANCE_ARB */
+   {  5071, 0x000084ED }, /* GL_COMPRESSED_RGB */
+   {  5089, 0x000084EE }, /* GL_COMPRESSED_RGBA */
+   {  5108, 0x000084EE }, /* GL_COMPRESSED_RGBA_ARB */
+   {  5131, 0x000086B1 }, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
+   {  5160, 0x000083F1 }, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
+   {  5193, 0x000083F2 }, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
+   {  5226, 0x000083F3 }, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */
+   {  5259, 0x000084ED }, /* GL_COMPRESSED_RGB_ARB */
+   {  5281, 0x000086B0 }, /* GL_COMPRESSED_RGB_FXT1_3DFX */
+   {  5309, 0x000083F0 }, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
+   {  5341, 0x00008C4A }, /* GL_COMPRESSED_SLUMINANCE */
+   {  5366, 0x00008C4B }, /* GL_COMPRESSED_SLUMINANCE_ALPHA */
+   {  5397, 0x00008C48 }, /* GL_COMPRESSED_SRGB */
+   {  5416, 0x00008C49 }, /* GL_COMPRESSED_SRGB_ALPHA */
+   {  5441, 0x000086A3 }, /* GL_COMPRESSED_TEXTURE_FORMATS */
+   {  5471, 0x0000911C }, /* GL_CONDITION_SATISFIED */
+   {  5494, 0x00008576 }, /* GL_CONSTANT */
+   {  5506, 0x00008003 }, /* GL_CONSTANT_ALPHA */
+   {  5524, 0x00008003 }, /* GL_CONSTANT_ALPHA_EXT */
+   {  5546, 0x00008576 }, /* GL_CONSTANT_ARB */
+   {  5562, 0x00001207 }, /* GL_CONSTANT_ATTENUATION */
+   {  5586, 0x00008151 }, /* GL_CONSTANT_BORDER_HP */
+   {  5608, 0x00008001 }, /* GL_CONSTANT_COLOR */
+   {  5626, 0x00008001 }, /* GL_CONSTANT_COLOR_EXT */
+   {  5648, 0x00008576 }, /* GL_CONSTANT_EXT */
+   {  5664, 0x00008010 }, /* GL_CONVOLUTION_1D */
+   {  5682, 0x00008011 }, /* GL_CONVOLUTION_2D */
+   {  5700, 0x00008154 }, /* GL_CONVOLUTION_BORDER_COLOR */
+   {  5728, 0x00008154 }, /* GL_CONVOLUTION_BORDER_COLOR_HP */
+   {  5759, 0x00008013 }, /* GL_CONVOLUTION_BORDER_MODE */
+   {  5786, 0x00008013 }, /* GL_CONVOLUTION_BORDER_MODE_EXT */
+   {  5817, 0x00008015 }, /* GL_CONVOLUTION_FILTER_BIAS */
+   {  5844, 0x00008015 }, /* GL_CONVOLUTION_FILTER_BIAS_EXT */
+   {  5875, 0x00008014 }, /* GL_CONVOLUTION_FILTER_SCALE */
+   {  5903, 0x00008014 }, /* GL_CONVOLUTION_FILTER_SCALE_EXT */
+   {  5935, 0x00008017 }, /* GL_CONVOLUTION_FORMAT */
+   {  5957, 0x00008017 }, /* GL_CONVOLUTION_FORMAT_EXT */
+   {  5983, 0x00008019 }, /* GL_CONVOLUTION_HEIGHT */
+   {  6005, 0x00008019 }, /* GL_CONVOLUTION_HEIGHT_EXT */
+   {  6031, 0x00008018 }, /* GL_CONVOLUTION_WIDTH */
+   {  6052, 0x00008018 }, /* GL_CONVOLUTION_WIDTH_EXT */
+   {  6077, 0x00008862 }, /* GL_COORD_REPLACE */
+   {  6094, 0x00008862 }, /* GL_COORD_REPLACE_ARB */
+   {  6115, 0x00008862 }, /* GL_COORD_REPLACE_NV */
+   {  6135, 0x00001503 }, /* GL_COPY */
+   {  6143, 0x0000150C }, /* GL_COPY_INVERTED */
+   {  6160, 0x00000706 }, /* GL_COPY_PIXEL_TOKEN */
+   {  6180, 0x00008F36 }, /* GL_COPY_READ_BUFFER */
+   {  6200, 0x00008F37 }, /* GL_COPY_WRITE_BUFFER */
+   {  6221, 0x00000B44 }, /* GL_CULL_FACE */
+   {  6234, 0x00000B45 }, /* GL_CULL_FACE_MODE */
+   {  6252, 0x000081AA }, /* GL_CULL_VERTEX_EXT */
+   {  6271, 0x000081AC }, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
+   {  6303, 0x000081AB }, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
+   {  6338, 0x00008626 }, /* GL_CURRENT_ATTRIB_NV */
+   {  6359, 0x00000001 }, /* GL_CURRENT_BIT */
+   {  6374, 0x00000B00 }, /* GL_CURRENT_COLOR */
+   {  6391, 0x00008453 }, /* GL_CURRENT_FOG_COORD */
+   {  6412, 0x00008453 }, /* GL_CURRENT_FOG_COORDINATE */
+   {  6438, 0x00000B01 }, /* GL_CURRENT_INDEX */
+   {  6455, 0x00008641 }, /* GL_CURRENT_MATRIX_ARB */
+   {  6477, 0x00008845 }, /* GL_CURRENT_MATRIX_INDEX_ARB */
+   {  6505, 0x00008641 }, /* GL_CURRENT_MATRIX_NV */
+   {  6526, 0x00008640 }, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
+   {  6560, 0x00008640 }, /* GL_CURRENT_MATRIX_STACK_DEPTH_NV */
+   {  6593, 0x00000B02 }, /* GL_CURRENT_NORMAL */
+   {  6611, 0x00008843 }, /* GL_CURRENT_PALETTE_MATRIX_ARB */
+   {  6641, 0x00008B8D }, /* GL_CURRENT_PROGRAM */
+   {  6660, 0x00008865 }, /* GL_CURRENT_QUERY */
+   {  6677, 0x00008865 }, /* GL_CURRENT_QUERY_ARB */
+   {  6698, 0x00000B04 }, /* GL_CURRENT_RASTER_COLOR */
+   {  6722, 0x00000B09 }, /* GL_CURRENT_RASTER_DISTANCE */
+   {  6749, 0x00000B05 }, /* GL_CURRENT_RASTER_INDEX */
+   {  6773, 0x00000B07 }, /* GL_CURRENT_RASTER_POSITION */
+   {  6800, 0x00000B08 }, /* GL_CURRENT_RASTER_POSITION_VALID */
+   {  6833, 0x0000845F }, /* GL_CURRENT_RASTER_SECONDARY_COLOR */
+   {  6867, 0x00000B06 }, /* GL_CURRENT_RASTER_TEXTURE_COORDS */
+   {  6900, 0x00008459 }, /* GL_CURRENT_SECONDARY_COLOR */
+   {  6927, 0x00000B03 }, /* GL_CURRENT_TEXTURE_COORDS */
+   {  6953, 0x00008626 }, /* GL_CURRENT_VERTEX_ATTRIB */
+   {  6978, 0x00008626 }, /* GL_CURRENT_VERTEX_ATTRIB_ARB */
+   {  7007, 0x000086A8 }, /* GL_CURRENT_WEIGHT_ARB */
+   {  7029, 0x00000900 }, /* GL_CW */
+   {  7035, 0x0000875B }, /* GL_DEBUG_ASSERT_MESA */
+   {  7056, 0x00008759 }, /* GL_DEBUG_OBJECT_MESA */
+   {  7077, 0x0000875A }, /* GL_DEBUG_PRINT_MESA */
+   {  7097, 0x00002101 }, /* GL_DECAL */
+   {  7106, 0x00001E03 }, /* GL_DECR */
+   {  7114, 0x00008508 }, /* GL_DECR_WRAP */
+   {  7127, 0x00008508 }, /* GL_DECR_WRAP_EXT */
+   {  7144, 0x00008B80 }, /* GL_DELETE_STATUS */
+   {  7161, 0x00001801 }, /* GL_DEPTH */
+   {  7170, 0x000088F0 }, /* GL_DEPTH24_STENCIL8 */
+   {  7190, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT */
+   {  7210, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT_EXT */
+   {  7234, 0x00000D1F }, /* GL_DEPTH_BIAS */
+   {  7248, 0x00000D56 }, /* GL_DEPTH_BITS */
+   {  7262, 0x00008891 }, /* GL_DEPTH_BOUNDS_EXT */
+   {  7282, 0x00008890 }, /* GL_DEPTH_BOUNDS_TEST_EXT */
+   {  7307, 0x00000100 }, /* GL_DEPTH_BUFFER_BIT */
+   {  7327, 0x0000864F }, /* GL_DEPTH_CLAMP_NV */
+   {  7345, 0x00000B73 }, /* GL_DEPTH_CLEAR_VALUE */
+   {  7366, 0x00001902 }, /* GL_DEPTH_COMPONENT */
+   {  7385, 0x000081A5 }, /* GL_DEPTH_COMPONENT16 */
+   {  7406, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_ARB */
+   {  7431, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_SGIX */
+   {  7457, 0x000081A6 }, /* GL_DEPTH_COMPONENT24 */
+   {  7478, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_ARB */
+   {  7503, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_SGIX */
+   {  7529, 0x000081A7 }, /* GL_DEPTH_COMPONENT32 */
+   {  7550, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_ARB */
+   {  7575, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_SGIX */
+   {  7601, 0x00000B74 }, /* GL_DEPTH_FUNC */
+   {  7615, 0x00000B70 }, /* GL_DEPTH_RANGE */
+   {  7630, 0x00000D1E }, /* GL_DEPTH_SCALE */
+   {  7645, 0x000084F9 }, /* GL_DEPTH_STENCIL */
+   {  7662, 0x0000821A }, /* GL_DEPTH_STENCIL_ATTACHMENT */
+   {  7690, 0x000084F9 }, /* GL_DEPTH_STENCIL_NV */
+   {  7710, 0x0000886F }, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
+   {  7738, 0x0000886E }, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
+   {  7766, 0x00000B71 }, /* GL_DEPTH_TEST */
+   {  7780, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE */
+   {  7802, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE_ARB */
+   {  7828, 0x00000B72 }, /* GL_DEPTH_WRITEMASK */
+   {  7847, 0x00001201 }, /* GL_DIFFUSE */
+   {  7858, 0x00000BD0 }, /* GL_DITHER */
+   {  7868, 0x00000A02 }, /* GL_DOMAIN */
+   {  7878, 0x00001100 }, /* GL_DONT_CARE */
+   {  7891, 0x000086AE }, /* GL_DOT3_RGB */
+   {  7903, 0x000086AF }, /* GL_DOT3_RGBA */
+   {  7916, 0x000086AF }, /* GL_DOT3_RGBA_ARB */
+   {  7933, 0x00008741 }, /* GL_DOT3_RGBA_EXT */
+   {  7950, 0x000086AE }, /* GL_DOT3_RGB_ARB */
+   {  7966, 0x00008740 }, /* GL_DOT3_RGB_EXT */
+   {  7982, 0x0000140A }, /* GL_DOUBLE */
+   {  7992, 0x00000C32 }, /* GL_DOUBLEBUFFER */
+   {  8008, 0x00000C01 }, /* GL_DRAW_BUFFER */
+   {  8023, 0x00008825 }, /* GL_DRAW_BUFFER0 */
+   {  8039, 0x00008825 }, /* GL_DRAW_BUFFER0_ARB */
+   {  8059, 0x00008825 }, /* GL_DRAW_BUFFER0_ATI */
+   {  8079, 0x00008826 }, /* GL_DRAW_BUFFER1 */
+   {  8095, 0x0000882F }, /* GL_DRAW_BUFFER10 */
+   {  8112, 0x0000882F }, /* GL_DRAW_BUFFER10_ARB */
+   {  8133, 0x0000882F }, /* GL_DRAW_BUFFER10_ATI */
+   {  8154, 0x00008830 }, /* GL_DRAW_BUFFER11 */
+   {  8171, 0x00008830 }, /* GL_DRAW_BUFFER11_ARB */
+   {  8192, 0x00008830 }, /* GL_DRAW_BUFFER11_ATI */
+   {  8213, 0x00008831 }, /* GL_DRAW_BUFFER12 */
+   {  8230, 0x00008831 }, /* GL_DRAW_BUFFER12_ARB */
+   {  8251, 0x00008831 }, /* GL_DRAW_BUFFER12_ATI */
+   {  8272, 0x00008832 }, /* GL_DRAW_BUFFER13 */
+   {  8289, 0x00008832 }, /* GL_DRAW_BUFFER13_ARB */
+   {  8310, 0x00008832 }, /* GL_DRAW_BUFFER13_ATI */
+   {  8331, 0x00008833 }, /* GL_DRAW_BUFFER14 */
+   {  8348, 0x00008833 }, /* GL_DRAW_BUFFER14_ARB */
+   {  8369, 0x00008833 }, /* GL_DRAW_BUFFER14_ATI */
+   {  8390, 0x00008834 }, /* GL_DRAW_BUFFER15 */
+   {  8407, 0x00008834 }, /* GL_DRAW_BUFFER15_ARB */
+   {  8428, 0x00008834 }, /* GL_DRAW_BUFFER15_ATI */
+   {  8449, 0x00008826 }, /* GL_DRAW_BUFFER1_ARB */
+   {  8469, 0x00008826 }, /* GL_DRAW_BUFFER1_ATI */
+   {  8489, 0x00008827 }, /* GL_DRAW_BUFFER2 */
+   {  8505, 0x00008827 }, /* GL_DRAW_BUFFER2_ARB */
+   {  8525, 0x00008827 }, /* GL_DRAW_BUFFER2_ATI */
+   {  8545, 0x00008828 }, /* GL_DRAW_BUFFER3 */
+   {  8561, 0x00008828 }, /* GL_DRAW_BUFFER3_ARB */
+   {  8581, 0x00008828 }, /* GL_DRAW_BUFFER3_ATI */
+   {  8601, 0x00008829 }, /* GL_DRAW_BUFFER4 */
+   {  8617, 0x00008829 }, /* GL_DRAW_BUFFER4_ARB */
+   {  8637, 0x00008829 }, /* GL_DRAW_BUFFER4_ATI */
+   {  8657, 0x0000882A }, /* GL_DRAW_BUFFER5 */
+   {  8673, 0x0000882A }, /* GL_DRAW_BUFFER5_ARB */
+   {  8693, 0x0000882A }, /* GL_DRAW_BUFFER5_ATI */
+   {  8713, 0x0000882B }, /* GL_DRAW_BUFFER6 */
+   {  8729, 0x0000882B }, /* GL_DRAW_BUFFER6_ARB */
+   {  8749, 0x0000882B }, /* GL_DRAW_BUFFER6_ATI */
+   {  8769, 0x0000882C }, /* GL_DRAW_BUFFER7 */
+   {  8785, 0x0000882C }, /* GL_DRAW_BUFFER7_ARB */
+   {  8805, 0x0000882C }, /* GL_DRAW_BUFFER7_ATI */
+   {  8825, 0x0000882D }, /* GL_DRAW_BUFFER8 */
+   {  8841, 0x0000882D }, /* GL_DRAW_BUFFER8_ARB */
+   {  8861, 0x0000882D }, /* GL_DRAW_BUFFER8_ATI */
+   {  8881, 0x0000882E }, /* GL_DRAW_BUFFER9 */
+   {  8897, 0x0000882E }, /* GL_DRAW_BUFFER9_ARB */
+   {  8917, 0x0000882E }, /* GL_DRAW_BUFFER9_ATI */
+   {  8937, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER */
+   {  8957, 0x00008CA6 }, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
+   {  8989, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER_EXT */
+   {  9013, 0x00000705 }, /* GL_DRAW_PIXEL_TOKEN */
+   {  9033, 0x00000304 }, /* GL_DST_ALPHA */
+   {  9046, 0x00000306 }, /* GL_DST_COLOR */
+   {  9059, 0x0000877A }, /* GL_DU8DV8_ATI */
+   {  9073, 0x00008779 }, /* GL_DUDV_ATI */
+   {  9085, 0x000088EA }, /* GL_DYNAMIC_COPY */
+   {  9101, 0x000088EA }, /* GL_DYNAMIC_COPY_ARB */
+   {  9121, 0x000088E8 }, /* GL_DYNAMIC_DRAW */
+   {  9137, 0x000088E8 }, /* GL_DYNAMIC_DRAW_ARB */
+   {  9157, 0x000088E9 }, /* GL_DYNAMIC_READ */
+   {  9173, 0x000088E9 }, /* GL_DYNAMIC_READ_ARB */
+   {  9193, 0x00000B43 }, /* GL_EDGE_FLAG */
+   {  9206, 0x00008079 }, /* GL_EDGE_FLAG_ARRAY */
+   {  9225, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
+   {  9259, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB */
+   {  9297, 0x00008093 }, /* GL_EDGE_FLAG_ARRAY_POINTER */
+   {  9324, 0x0000808C }, /* GL_EDGE_FLAG_ARRAY_STRIDE */
+   {  9350, 0x00008893 }, /* GL_ELEMENT_ARRAY_BUFFER */
+   {  9374, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
+   {  9406, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB */
+   {  9442, 0x00001600 }, /* GL_EMISSION */
+   {  9454, 0x00002000 }, /* GL_ENABLE_BIT */
+   {  9468, 0x00000202 }, /* GL_EQUAL */
+   {  9477, 0x00001509 }, /* GL_EQUIV */
+   {  9486, 0x00010000 }, /* GL_EVAL_BIT */
+   {  9498, 0x00000800 }, /* GL_EXP */
+   {  9505, 0x00000801 }, /* GL_EXP2 */
+   {  9513, 0x00001F03 }, /* GL_EXTENSIONS */
+   {  9527, 0x00002400 }, /* GL_EYE_LINEAR */
+   {  9541, 0x00002502 }, /* GL_EYE_PLANE */
+   {  9554, 0x0000855C }, /* GL_EYE_PLANE_ABSOLUTE_NV */
+   {  9579, 0x0000855B }, /* GL_EYE_RADIAL_NV */
+   {  9596, 0x00000000 }, /* GL_FALSE */
+   {  9605, 0x00001101 }, /* GL_FASTEST */
+   {  9616, 0x00001C01 }, /* GL_FEEDBACK */
+   {  9628, 0x00000DF0 }, /* GL_FEEDBACK_BUFFER_POINTER */
+   {  9655, 0x00000DF1 }, /* GL_FEEDBACK_BUFFER_SIZE */
+   {  9679, 0x00000DF2 }, /* GL_FEEDBACK_BUFFER_TYPE */
+   {  9703, 0x00001B02 }, /* GL_FILL */
+   {  9711, 0x00008E4D }, /* GL_FIRST_VERTEX_CONVENTION_EXT */
+   {  9742, 0x00001D00 }, /* GL_FLAT */
+   {  9750, 0x00001406 }, /* GL_FLOAT */
+   {  9759, 0x00008B5A }, /* GL_FLOAT_MAT2 */
+   {  9773, 0x00008B5A }, /* GL_FLOAT_MAT2_ARB */
+   {  9791, 0x00008B65 }, /* GL_FLOAT_MAT2x3 */
+   {  9807, 0x00008B66 }, /* GL_FLOAT_MAT2x4 */
+   {  9823, 0x00008B5B }, /* GL_FLOAT_MAT3 */
+   {  9837, 0x00008B5B }, /* GL_FLOAT_MAT3_ARB */
+   {  9855, 0x00008B67 }, /* GL_FLOAT_MAT3x2 */
+   {  9871, 0x00008B68 }, /* GL_FLOAT_MAT3x4 */
+   {  9887, 0x00008B5C }, /* GL_FLOAT_MAT4 */
+   {  9901, 0x00008B5C }, /* GL_FLOAT_MAT4_ARB */
+   {  9919, 0x00008B69 }, /* GL_FLOAT_MAT4x2 */
+   {  9935, 0x00008B6A }, /* GL_FLOAT_MAT4x3 */
+   {  9951, 0x00008B50 }, /* GL_FLOAT_VEC2 */
+   {  9965, 0x00008B50 }, /* GL_FLOAT_VEC2_ARB */
+   {  9983, 0x00008B51 }, /* GL_FLOAT_VEC3 */
+   {  9997, 0x00008B51 }, /* GL_FLOAT_VEC3_ARB */
+   { 10015, 0x00008B52 }, /* GL_FLOAT_VEC4 */
+   { 10029, 0x00008B52 }, /* GL_FLOAT_VEC4_ARB */
+   { 10047, 0x00000B60 }, /* GL_FOG */
+   { 10054, 0x00000080 }, /* GL_FOG_BIT */
+   { 10065, 0x00000B66 }, /* GL_FOG_COLOR */
+   { 10078, 0x00008451 }, /* GL_FOG_COORD */
+   { 10091, 0x00008451 }, /* GL_FOG_COORDINATE */
+   { 10109, 0x00008457 }, /* GL_FOG_COORDINATE_ARRAY */
+   { 10133, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
+   { 10172, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB */
+   { 10215, 0x00008456 }, /* GL_FOG_COORDINATE_ARRAY_POINTER */
+   { 10247, 0x00008455 }, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
+   { 10278, 0x00008454 }, /* GL_FOG_COORDINATE_ARRAY_TYPE */
+   { 10307, 0x00008450 }, /* GL_FOG_COORDINATE_SOURCE */
+   { 10332, 0x00008457 }, /* GL_FOG_COORD_ARRAY */
+   { 10351, 0x0000889D }, /* GL_FOG_COORD_ARRAY_BUFFER_BINDING */
+   { 10385, 0x00008456 }, /* GL_FOG_COORD_ARRAY_POINTER */
+   { 10412, 0x00008455 }, /* GL_FOG_COORD_ARRAY_STRIDE */
+   { 10438, 0x00008454 }, /* GL_FOG_COORD_ARRAY_TYPE */
+   { 10462, 0x00008450 }, /* GL_FOG_COORD_SRC */
+   { 10479, 0x00000B62 }, /* GL_FOG_DENSITY */
+   { 10494, 0x0000855A }, /* GL_FOG_DISTANCE_MODE_NV */
+   { 10518, 0x00000B64 }, /* GL_FOG_END */
+   { 10529, 0x00000C54 }, /* GL_FOG_HINT */
+   { 10541, 0x00000B61 }, /* GL_FOG_INDEX */
+   { 10554, 0x00000B65 }, /* GL_FOG_MODE */
+   { 10566, 0x00008198 }, /* GL_FOG_OFFSET_SGIX */
+   { 10585, 0x00008199 }, /* GL_FOG_OFFSET_VALUE_SGIX */
+   { 10610, 0x00000B63 }, /* GL_FOG_START */
+   { 10623, 0x00008452 }, /* GL_FRAGMENT_DEPTH */
+   { 10641, 0x00008804 }, /* GL_FRAGMENT_PROGRAM_ARB */
+   { 10665, 0x00008B30 }, /* GL_FRAGMENT_SHADER */
+   { 10684, 0x00008B30 }, /* GL_FRAGMENT_SHADER_ARB */
+   { 10707, 0x00008B8B }, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
+   { 10742, 0x00008D40 }, /* GL_FRAMEBUFFER */
+   { 10757, 0x00008215 }, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
+   { 10794, 0x00008214 }, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
+   { 10830, 0x00008210 }, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
+   { 10871, 0x00008211 }, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
+   { 10912, 0x00008216 }, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
+   { 10949, 0x00008213 }, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
+   { 10986, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
+   { 11024, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT */
+   { 11066, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
+   { 11104, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT */
+   { 11146, 0x00008212 }, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
+   { 11181, 0x00008217 }, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
+   { 11220, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT */
+   { 11269, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
+   { 11317, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT */
+   { 11369, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+   { 11409, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
+   { 11453, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
+   { 11493, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT */
+   { 11537, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING_EXT */
+   { 11564, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE */
+   { 11588, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE_EXT */
+   { 11616, 0x00008218 }, /* GL_FRAMEBUFFER_DEFAULT */
+   { 11639, 0x00008D40 }, /* GL_FRAMEBUFFER_EXT */
+   { 11658, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
+   { 11695, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT */
+   { 11736, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
+   { 11777, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
+   { 11819, 0x00008CD8 }, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
+   { 11870, 0x00008CDA }, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
+   { 11908, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
+   { 11953, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT */
+   { 12002, 0x00008D56 }, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
+   { 12040, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
+   { 12082, 0x00008CDE }, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
+   { 12114, 0x00008219 }, /* GL_FRAMEBUFFER_UNDEFINED */
+   { 12139, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED */
+   { 12166, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED_EXT */
+   { 12197, 0x00000404 }, /* GL_FRONT */
+   { 12206, 0x00000408 }, /* GL_FRONT_AND_BACK */
+   { 12224, 0x00000B46 }, /* GL_FRONT_FACE */
+   { 12238, 0x00000400 }, /* GL_FRONT_LEFT */
+   { 12252, 0x00000401 }, /* GL_FRONT_RIGHT */
+   { 12267, 0x00008006 }, /* GL_FUNC_ADD */
+   { 12279, 0x00008006 }, /* GL_FUNC_ADD_EXT */
+   { 12295, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT */
+   { 12320, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT_EXT */
+   { 12349, 0x0000800A }, /* GL_FUNC_SUBTRACT */
+   { 12366, 0x0000800A }, /* GL_FUNC_SUBTRACT_EXT */
+   { 12387, 0x00008191 }, /* GL_GENERATE_MIPMAP */
+   { 12406, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT */
+   { 12430, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT_SGIS */
+   { 12459, 0x00008191 }, /* GL_GENERATE_MIPMAP_SGIS */
+   { 12483, 0x00000206 }, /* GL_GEQUAL */
+   { 12493, 0x00000204 }, /* GL_GREATER */
+   { 12504, 0x00001904 }, /* GL_GREEN */
+   { 12513, 0x00000D19 }, /* GL_GREEN_BIAS */
+   { 12527, 0x00000D53 }, /* GL_GREEN_BITS */
+   { 12541, 0x00000D18 }, /* GL_GREEN_SCALE */
+   { 12556, 0x00008000 }, /* GL_HINT_BIT */
+   { 12568, 0x00008024 }, /* GL_HISTOGRAM */
+   { 12581, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE */
+   { 12605, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE_EXT */
+   { 12633, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE */
+   { 12656, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE_EXT */
+   { 12683, 0x00008024 }, /* GL_HISTOGRAM_EXT */
+   { 12700, 0x00008027 }, /* GL_HISTOGRAM_FORMAT */
+   { 12720, 0x00008027 }, /* GL_HISTOGRAM_FORMAT_EXT */
+   { 12744, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE */
+   { 12768, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE_EXT */
+   { 12796, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE */
+   { 12824, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE_EXT */
+   { 12856, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE */
+   { 12878, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE_EXT */
+   { 12904, 0x0000802D }, /* GL_HISTOGRAM_SINK */
+   { 12922, 0x0000802D }, /* GL_HISTOGRAM_SINK_EXT */
+   { 12944, 0x00008026 }, /* GL_HISTOGRAM_WIDTH */
+   { 12963, 0x00008026 }, /* GL_HISTOGRAM_WIDTH_EXT */
+   { 12986, 0x0000862A }, /* GL_IDENTITY_NV */
+   { 13001, 0x00008150 }, /* GL_IGNORE_BORDER_HP */
+   { 13021, 0x00008B9B }, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
+   { 13061, 0x00008B9A }, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
+   { 13099, 0x00001E02 }, /* GL_INCR */
+   { 13107, 0x00008507 }, /* GL_INCR_WRAP */
+   { 13120, 0x00008507 }, /* GL_INCR_WRAP_EXT */
+   { 13137, 0x00008222 }, /* GL_INDEX */
+   { 13146, 0x00008077 }, /* GL_INDEX_ARRAY */
+   { 13161, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING */
+   { 13191, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING_ARB */
+   { 13225, 0x00008091 }, /* GL_INDEX_ARRAY_POINTER */
+   { 13248, 0x00008086 }, /* GL_INDEX_ARRAY_STRIDE */
+   { 13270, 0x00008085 }, /* GL_INDEX_ARRAY_TYPE */
+   { 13290, 0x00000D51 }, /* GL_INDEX_BITS */
+   { 13304, 0x00000C20 }, /* GL_INDEX_CLEAR_VALUE */
+   { 13325, 0x00000BF1 }, /* GL_INDEX_LOGIC_OP */
+   { 13343, 0x00000C30 }, /* GL_INDEX_MODE */
+   { 13357, 0x00000D13 }, /* GL_INDEX_OFFSET */
+   { 13373, 0x00000D12 }, /* GL_INDEX_SHIFT */
+   { 13388, 0x00000C21 }, /* GL_INDEX_WRITEMASK */
+   { 13407, 0x00008B84 }, /* GL_INFO_LOG_LENGTH */
+   { 13426, 0x00001404 }, /* GL_INT */
+   { 13433, 0x00008049 }, /* GL_INTENSITY */
+   { 13446, 0x0000804C }, /* GL_INTENSITY12 */
+   { 13461, 0x0000804C }, /* GL_INTENSITY12_EXT */
+   { 13480, 0x0000804D }, /* GL_INTENSITY16 */
+   { 13495, 0x0000804D }, /* GL_INTENSITY16_EXT */
+   { 13514, 0x0000804A }, /* GL_INTENSITY4 */
+   { 13528, 0x0000804A }, /* GL_INTENSITY4_EXT */
+   { 13546, 0x0000804B }, /* GL_INTENSITY8 */
+   { 13560, 0x0000804B }, /* GL_INTENSITY8_EXT */
+   { 13578, 0x00008049 }, /* GL_INTENSITY_EXT */
+   { 13595, 0x00008575 }, /* GL_INTERPOLATE */
+   { 13610, 0x00008575 }, /* GL_INTERPOLATE_ARB */
+   { 13629, 0x00008575 }, /* GL_INTERPOLATE_EXT */
+   { 13648, 0x00008B53 }, /* GL_INT_VEC2 */
+   { 13660, 0x00008B53 }, /* GL_INT_VEC2_ARB */
+   { 13676, 0x00008B54 }, /* GL_INT_VEC3 */
+   { 13688, 0x00008B54 }, /* GL_INT_VEC3_ARB */
+   { 13704, 0x00008B55 }, /* GL_INT_VEC4 */
+   { 13716, 0x00008B55 }, /* GL_INT_VEC4_ARB */
+   { 13732, 0x00000500 }, /* GL_INVALID_ENUM */
+   { 13748, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION */
+   { 13781, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION_EXT */
+   { 13818, 0x00000502 }, /* GL_INVALID_OPERATION */
+   { 13839, 0x00000501 }, /* GL_INVALID_VALUE */
+   { 13856, 0x0000862B }, /* GL_INVERSE_NV */
+   { 13870, 0x0000862D }, /* GL_INVERSE_TRANSPOSE_NV */
+   { 13894, 0x0000150A }, /* GL_INVERT */
+   { 13904, 0x00001E00 }, /* GL_KEEP */
+   { 13912, 0x00008E4E }, /* GL_LAST_VERTEX_CONVENTION_EXT */
+   { 13942, 0x00000406 }, /* GL_LEFT */
+   { 13950, 0x00000203 }, /* GL_LEQUAL */
+   { 13960, 0x00000201 }, /* GL_LESS */
+   { 13968, 0x00004000 }, /* GL_LIGHT0 */
+   { 13978, 0x00004001 }, /* GL_LIGHT1 */
+   { 13988, 0x00004002 }, /* GL_LIGHT2 */
+   { 13998, 0x00004003 }, /* GL_LIGHT3 */
+   { 14008, 0x00004004 }, /* GL_LIGHT4 */
+   { 14018, 0x00004005 }, /* GL_LIGHT5 */
+   { 14028, 0x00004006 }, /* GL_LIGHT6 */
+   { 14038, 0x00004007 }, /* GL_LIGHT7 */
+   { 14048, 0x00000B50 }, /* GL_LIGHTING */
+   { 14060, 0x00000040 }, /* GL_LIGHTING_BIT */
+   { 14076, 0x00000B53 }, /* GL_LIGHT_MODEL_AMBIENT */
+   { 14099, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL */
+   { 14128, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL_EXT */
+   { 14161, 0x00000B51 }, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
+   { 14189, 0x00000B52 }, /* GL_LIGHT_MODEL_TWO_SIDE */
+   { 14213, 0x00001B01 }, /* GL_LINE */
+   { 14221, 0x00002601 }, /* GL_LINEAR */
+   { 14231, 0x00001208 }, /* GL_LINEAR_ATTENUATION */
+   { 14253, 0x00008170 }, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
+   { 14283, 0x0000844F }, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
+   { 14314, 0x00002703 }, /* GL_LINEAR_MIPMAP_LINEAR */
+   { 14338, 0x00002701 }, /* GL_LINEAR_MIPMAP_NEAREST */
+   { 14363, 0x00000001 }, /* GL_LINES */
+   { 14372, 0x00000004 }, /* GL_LINE_BIT */
+   { 14384, 0x00000002 }, /* GL_LINE_LOOP */
+   { 14397, 0x00000707 }, /* GL_LINE_RESET_TOKEN */
+   { 14417, 0x00000B20 }, /* GL_LINE_SMOOTH */
+   { 14432, 0x00000C52 }, /* GL_LINE_SMOOTH_HINT */
+   { 14452, 0x00000B24 }, /* GL_LINE_STIPPLE */
+   { 14468, 0x00000B25 }, /* GL_LINE_STIPPLE_PATTERN */
+   { 14492, 0x00000B26 }, /* GL_LINE_STIPPLE_REPEAT */
+   { 14515, 0x00000003 }, /* GL_LINE_STRIP */
+   { 14529, 0x00000702 }, /* GL_LINE_TOKEN */
+   { 14543, 0x00000B21 }, /* GL_LINE_WIDTH */
+   { 14557, 0x00000B23 }, /* GL_LINE_WIDTH_GRANULARITY */
+   { 14583, 0x00000B22 }, /* GL_LINE_WIDTH_RANGE */
+   { 14603, 0x00008B82 }, /* GL_LINK_STATUS */
+   { 14618, 0x00000B32 }, /* GL_LIST_BASE */
+   { 14631, 0x00020000 }, /* GL_LIST_BIT */
+   { 14643, 0x00000B33 }, /* GL_LIST_INDEX */
+   { 14657, 0x00000B30 }, /* GL_LIST_MODE */
+   { 14670, 0x00000101 }, /* GL_LOAD */
+   { 14678, 0x00000BF1 }, /* GL_LOGIC_OP */
+   { 14690, 0x00000BF0 }, /* GL_LOGIC_OP_MODE */
+   { 14707, 0x00008CA1 }, /* GL_LOWER_LEFT */
+   { 14721, 0x00001909 }, /* GL_LUMINANCE */
+   { 14734, 0x00008041 }, /* GL_LUMINANCE12 */
+   { 14749, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12 */
+   { 14772, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12_EXT */
+   { 14799, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4 */
+   { 14821, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4_EXT */
+   { 14847, 0x00008041 }, /* GL_LUMINANCE12_EXT */
+   { 14866, 0x00008042 }, /* GL_LUMINANCE16 */
+   { 14881, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16 */
+   { 14904, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16_EXT */
+   { 14931, 0x00008042 }, /* GL_LUMINANCE16_EXT */
+   { 14950, 0x0000803F }, /* GL_LUMINANCE4 */
+   { 14964, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4 */
+   { 14985, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4_EXT */
+   { 15010, 0x0000803F }, /* GL_LUMINANCE4_EXT */
+   { 15028, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2 */
+   { 15049, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2_EXT */
+   { 15074, 0x00008040 }, /* GL_LUMINANCE8 */
+   { 15088, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8 */
+   { 15109, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8_EXT */
+   { 15134, 0x00008040 }, /* GL_LUMINANCE8_EXT */
+   { 15152, 0x0000190A }, /* GL_LUMINANCE_ALPHA */
+   { 15171, 0x00000D90 }, /* GL_MAP1_COLOR_4 */
+   { 15187, 0x00000DD0 }, /* GL_MAP1_GRID_DOMAIN */
+   { 15207, 0x00000DD1 }, /* GL_MAP1_GRID_SEGMENTS */
+   { 15229, 0x00000D91 }, /* GL_MAP1_INDEX */
+   { 15243, 0x00000D92 }, /* GL_MAP1_NORMAL */
+   { 15258, 0x00000D93 }, /* GL_MAP1_TEXTURE_COORD_1 */
+   { 15282, 0x00000D94 }, /* GL_MAP1_TEXTURE_COORD_2 */
+   { 15306, 0x00000D95 }, /* GL_MAP1_TEXTURE_COORD_3 */
+   { 15330, 0x00000D96 }, /* GL_MAP1_TEXTURE_COORD_4 */
+   { 15354, 0x00000D97 }, /* GL_MAP1_VERTEX_3 */
+   { 15371, 0x00000D98 }, /* GL_MAP1_VERTEX_4 */
+   { 15388, 0x00008660 }, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
+   { 15416, 0x0000866A }, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
+   { 15445, 0x0000866B }, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
+   { 15474, 0x0000866C }, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
+   { 15503, 0x0000866D }, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
+   { 15532, 0x0000866E }, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
+   { 15561, 0x0000866F }, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
+   { 15590, 0x00008661 }, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
+   { 15618, 0x00008662 }, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
+   { 15646, 0x00008663 }, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
+   { 15674, 0x00008664 }, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
+   { 15702, 0x00008665 }, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
+   { 15730, 0x00008666 }, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
+   { 15758, 0x00008667 }, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
+   { 15786, 0x00008668 }, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
+   { 15814, 0x00008669 }, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
+   { 15842, 0x00000DB0 }, /* GL_MAP2_COLOR_4 */
+   { 15858, 0x00000DD2 }, /* GL_MAP2_GRID_DOMAIN */
+   { 15878, 0x00000DD3 }, /* GL_MAP2_GRID_SEGMENTS */
+   { 15900, 0x00000DB1 }, /* GL_MAP2_INDEX */
+   { 15914, 0x00000DB2 }, /* GL_MAP2_NORMAL */
+   { 15929, 0x00000DB3 }, /* GL_MAP2_TEXTURE_COORD_1 */
+   { 15953, 0x00000DB4 }, /* GL_MAP2_TEXTURE_COORD_2 */
+   { 15977, 0x00000DB5 }, /* GL_MAP2_TEXTURE_COORD_3 */
+   { 16001, 0x00000DB6 }, /* GL_MAP2_TEXTURE_COORD_4 */
+   { 16025, 0x00000DB7 }, /* GL_MAP2_VERTEX_3 */
+   { 16042, 0x00000DB8 }, /* GL_MAP2_VERTEX_4 */
+   { 16059, 0x00008670 }, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
+   { 16087, 0x0000867A }, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
+   { 16116, 0x0000867B }, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
+   { 16145, 0x0000867C }, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
+   { 16174, 0x0000867D }, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
+   { 16203, 0x0000867E }, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
+   { 16232, 0x0000867F }, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
+   { 16261, 0x00008671 }, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
+   { 16289, 0x00008672 }, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
+   { 16317, 0x00008673 }, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
+   { 16345, 0x00008674 }, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
+   { 16373, 0x00008675 }, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
+   { 16401, 0x00008676 }, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
+   { 16429, 0x00008677 }, /* GL_MAP2_VERTEX_ATTRIB7_4_NV */
+   { 16457, 0x00008678 }, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
+   { 16485, 0x00008679 }, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
+   { 16513, 0x00000D10 }, /* GL_MAP_COLOR */
+   { 16526, 0x00000010 }, /* GL_MAP_FLUSH_EXPLICIT_BIT */
+   { 16552, 0x00000008 }, /* GL_MAP_INVALIDATE_BUFFER_BIT */
+   { 16581, 0x00000004 }, /* GL_MAP_INVALIDATE_RANGE_BIT */
+   { 16609, 0x00000001 }, /* GL_MAP_READ_BIT */
+   { 16625, 0x00000D11 }, /* GL_MAP_STENCIL */
+   { 16640, 0x00000020 }, /* GL_MAP_UNSYNCHRONIZED_BIT */
+   { 16666, 0x00000002 }, /* GL_MAP_WRITE_BIT */
+   { 16683, 0x000088C0 }, /* GL_MATRIX0_ARB */
+   { 16698, 0x00008630 }, /* GL_MATRIX0_NV */
+   { 16712, 0x000088CA }, /* GL_MATRIX10_ARB */
+   { 16728, 0x000088CB }, /* GL_MATRIX11_ARB */
+   { 16744, 0x000088CC }, /* GL_MATRIX12_ARB */
+   { 16760, 0x000088CD }, /* GL_MATRIX13_ARB */
+   { 16776, 0x000088CE }, /* GL_MATRIX14_ARB */
+   { 16792, 0x000088CF }, /* GL_MATRIX15_ARB */
+   { 16808, 0x000088D0 }, /* GL_MATRIX16_ARB */
+   { 16824, 0x000088D1 }, /* GL_MATRIX17_ARB */
+   { 16840, 0x000088D2 }, /* GL_MATRIX18_ARB */
+   { 16856, 0x000088D3 }, /* GL_MATRIX19_ARB */
+   { 16872, 0x000088C1 }, /* GL_MATRIX1_ARB */
+   { 16887, 0x00008631 }, /* GL_MATRIX1_NV */
+   { 16901, 0x000088D4 }, /* GL_MATRIX20_ARB */
+   { 16917, 0x000088D5 }, /* GL_MATRIX21_ARB */
+   { 16933, 0x000088D6 }, /* GL_MATRIX22_ARB */
+   { 16949, 0x000088D7 }, /* GL_MATRIX23_ARB */
+   { 16965, 0x000088D8 }, /* GL_MATRIX24_ARB */
+   { 16981, 0x000088D9 }, /* GL_MATRIX25_ARB */
+   { 16997, 0x000088DA }, /* GL_MATRIX26_ARB */
+   { 17013, 0x000088DB }, /* GL_MATRIX27_ARB */
+   { 17029, 0x000088DC }, /* GL_MATRIX28_ARB */
+   { 17045, 0x000088DD }, /* GL_MATRIX29_ARB */
+   { 17061, 0x000088C2 }, /* GL_MATRIX2_ARB */
+   { 17076, 0x00008632 }, /* GL_MATRIX2_NV */
+   { 17090, 0x000088DE }, /* GL_MATRIX30_ARB */
+   { 17106, 0x000088DF }, /* GL_MATRIX31_ARB */
+   { 17122, 0x000088C3 }, /* GL_MATRIX3_ARB */
+   { 17137, 0x00008633 }, /* GL_MATRIX3_NV */
+   { 17151, 0x000088C4 }, /* GL_MATRIX4_ARB */
+   { 17166, 0x00008634 }, /* GL_MATRIX4_NV */
+   { 17180, 0x000088C5 }, /* GL_MATRIX5_ARB */
+   { 17195, 0x00008635 }, /* GL_MATRIX5_NV */
+   { 17209, 0x000088C6 }, /* GL_MATRIX6_ARB */
+   { 17224, 0x00008636 }, /* GL_MATRIX6_NV */
+   { 17238, 0x000088C7 }, /* GL_MATRIX7_ARB */
+   { 17253, 0x00008637 }, /* GL_MATRIX7_NV */
+   { 17267, 0x000088C8 }, /* GL_MATRIX8_ARB */
+   { 17282, 0x000088C9 }, /* GL_MATRIX9_ARB */
+   { 17297, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_ARB */
+   { 17323, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
+   { 17357, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
+   { 17388, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
+   { 17421, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
+   { 17452, 0x00000BA0 }, /* GL_MATRIX_MODE */
+   { 17467, 0x00008840 }, /* GL_MATRIX_PALETTE_ARB */
+   { 17489, 0x00008008 }, /* GL_MAX */
+   { 17496, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE */
+   { 17519, 0x000088FF }, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
+   { 17551, 0x00000D35 }, /* GL_MAX_ATTRIB_STACK_DEPTH */
+   { 17577, 0x00000D3B }, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
+   { 17610, 0x00008177 }, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
+   { 17636, 0x00008178 }, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+   { 17670, 0x00000D32 }, /* GL_MAX_CLIP_PLANES */
+   { 17689, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
+   { 17718, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
+   { 17750, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI */
+   { 17786, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
+   { 17822, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB */
+   { 17862, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT */
+   { 17888, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT_EXT */
+   { 17918, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH */
+   { 17943, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH_EXT */
+   { 17972, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
+   { 18001, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB */
+   { 18034, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS */
+   { 18054, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ARB */
+   { 18078, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ATI */
+   { 18102, 0x000080E9 }, /* GL_MAX_ELEMENTS_INDICES */
+   { 18126, 0x000080E8 }, /* GL_MAX_ELEMENTS_VERTICES */
+   { 18151, 0x00000D30 }, /* GL_MAX_EVAL_ORDER */
+   { 18169, 0x00008008 }, /* GL_MAX_EXT */
+   { 18180, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
+   { 18215, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB */
+   { 18254, 0x00000D31 }, /* GL_MAX_LIGHTS */
+   { 18268, 0x00000B31 }, /* GL_MAX_LIST_NESTING */
+   { 18288, 0x00008841 }, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
+   { 18326, 0x00000D36 }, /* GL_MAX_MODELVIEW_STACK_DEPTH */
+   { 18355, 0x00000D37 }, /* GL_MAX_NAME_STACK_DEPTH */
+   { 18379, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_ARB */
+   { 18407, 0x00000D34 }, /* GL_MAX_PIXEL_MAP_TABLE */
+   { 18430, 0x000088B1 }, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
+   { 18467, 0x0000880B }, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
+   { 18503, 0x000088AD }, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
+   { 18530, 0x000088F5 }, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
+   { 18559, 0x000088B5 }, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
+   { 18593, 0x000088F4 }, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
+   { 18629, 0x000088F6 }, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
+   { 18656, 0x000088A1 }, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
+   { 18688, 0x000088B4 }, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
+   { 18724, 0x000088F8 }, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
+   { 18753, 0x000088F7 }, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
+   { 18782, 0x0000862F }, /* GL_MAX_PROGRAM_MATRICES_ARB */
+   { 18810, 0x0000862E }, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
+   { 18848, 0x000088B3 }, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+   { 18892, 0x0000880E }, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+   { 18935, 0x000088AF }, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
+   { 18969, 0x000088A3 }, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+   { 19008, 0x000088AB }, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
+   { 19045, 0x000088A7 }, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
+   { 19083, 0x00008810 }, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+   { 19126, 0x0000880F }, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+   { 19169, 0x000088A9 }, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
+   { 19199, 0x000088A5 }, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
+   { 19230, 0x0000880D }, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
+   { 19266, 0x0000880C }, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
+   { 19302, 0x00000D38 }, /* GL_MAX_PROJECTION_STACK_DEPTH */
+   { 19332, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
+   { 19366, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_NV */
+   { 19399, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
+   { 19428, 0x00008D57 }, /* GL_MAX_SAMPLES */
+   { 19443, 0x00009111 }, /* GL_MAX_SERVER_WAIT_TIMEOUT */
+   { 19470, 0x00008504 }, /* GL_MAX_SHININESS_NV */
+   { 19490, 0x00008505 }, /* GL_MAX_SPOT_EXPONENT_NV */
+   { 19514, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS */
+   { 19536, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS_ARB */
+   { 19562, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS */
+   { 19589, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS_ARB */
+   { 19620, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS */
+   { 19644, 0x000084FF }, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
+   { 19678, 0x00000D33 }, /* GL_MAX_TEXTURE_SIZE */
+   { 19698, 0x00000D39 }, /* GL_MAX_TEXTURE_STACK_DEPTH */
+   { 19725, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS */
+   { 19746, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS_ARB */
+   { 19771, 0x0000862F }, /* GL_MAX_TRACK_MATRICES_NV */
+   { 19796, 0x0000862E }, /* GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */
+   { 19831, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS */
+   { 19853, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS_ARB */
+   { 19879, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS */
+   { 19901, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS_ARB */
+   { 19927, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
+   { 19961, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
+   { 19999, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
+   { 20032, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB */
+   { 20069, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_ARB */
+   { 20093, 0x00000D3A }, /* GL_MAX_VIEWPORT_DIMS */
+   { 20114, 0x00008007 }, /* GL_MIN */
+   { 20121, 0x0000802E }, /* GL_MINMAX */
+   { 20131, 0x0000802E }, /* GL_MINMAX_EXT */
+   { 20145, 0x0000802F }, /* GL_MINMAX_FORMAT */
+   { 20162, 0x0000802F }, /* GL_MINMAX_FORMAT_EXT */
+   { 20183, 0x00008030 }, /* GL_MINMAX_SINK */
+   { 20198, 0x00008030 }, /* GL_MINMAX_SINK_EXT */
+   { 20217, 0x00008007 }, /* GL_MIN_EXT */
+   { 20228, 0x00008370 }, /* GL_MIRRORED_REPEAT */
+   { 20247, 0x00008370 }, /* GL_MIRRORED_REPEAT_ARB */
+   { 20270, 0x00008370 }, /* GL_MIRRORED_REPEAT_IBM */
+   { 20293, 0x00008742 }, /* GL_MIRROR_CLAMP_ATI */
+   { 20313, 0x00008742 }, /* GL_MIRROR_CLAMP_EXT */
+   { 20333, 0x00008912 }, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
+   { 20363, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_ATI */
+   { 20391, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
+   { 20419, 0x00001700 }, /* GL_MODELVIEW */
+   { 20432, 0x00001700 }, /* GL_MODELVIEW0_ARB */
+   { 20450, 0x0000872A }, /* GL_MODELVIEW10_ARB */
+   { 20469, 0x0000872B }, /* GL_MODELVIEW11_ARB */
+   { 20488, 0x0000872C }, /* GL_MODELVIEW12_ARB */
+   { 20507, 0x0000872D }, /* GL_MODELVIEW13_ARB */
+   { 20526, 0x0000872E }, /* GL_MODELVIEW14_ARB */
+   { 20545, 0x0000872F }, /* GL_MODELVIEW15_ARB */
+   { 20564, 0x00008730 }, /* GL_MODELVIEW16_ARB */
+   { 20583, 0x00008731 }, /* GL_MODELVIEW17_ARB */
+   { 20602, 0x00008732 }, /* GL_MODELVIEW18_ARB */
+   { 20621, 0x00008733 }, /* GL_MODELVIEW19_ARB */
+   { 20640, 0x0000850A }, /* GL_MODELVIEW1_ARB */
+   { 20658, 0x00008734 }, /* GL_MODELVIEW20_ARB */
+   { 20677, 0x00008735 }, /* GL_MODELVIEW21_ARB */
+   { 20696, 0x00008736 }, /* GL_MODELVIEW22_ARB */
+   { 20715, 0x00008737 }, /* GL_MODELVIEW23_ARB */
+   { 20734, 0x00008738 }, /* GL_MODELVIEW24_ARB */
+   { 20753, 0x00008739 }, /* GL_MODELVIEW25_ARB */
+   { 20772, 0x0000873A }, /* GL_MODELVIEW26_ARB */
+   { 20791, 0x0000873B }, /* GL_MODELVIEW27_ARB */
+   { 20810, 0x0000873C }, /* GL_MODELVIEW28_ARB */
+   { 20829, 0x0000873D }, /* GL_MODELVIEW29_ARB */
+   { 20848, 0x00008722 }, /* GL_MODELVIEW2_ARB */
+   { 20866, 0x0000873E }, /* GL_MODELVIEW30_ARB */
+   { 20885, 0x0000873F }, /* GL_MODELVIEW31_ARB */
+   { 20904, 0x00008723 }, /* GL_MODELVIEW3_ARB */
+   { 20922, 0x00008724 }, /* GL_MODELVIEW4_ARB */
+   { 20940, 0x00008725 }, /* GL_MODELVIEW5_ARB */
+   { 20958, 0x00008726 }, /* GL_MODELVIEW6_ARB */
+   { 20976, 0x00008727 }, /* GL_MODELVIEW7_ARB */
+   { 20994, 0x00008728 }, /* GL_MODELVIEW8_ARB */
+   { 21012, 0x00008729 }, /* GL_MODELVIEW9_ARB */
+   { 21030, 0x00000BA6 }, /* GL_MODELVIEW_MATRIX */
+   { 21050, 0x00008629 }, /* GL_MODELVIEW_PROJECTION_NV */
+   { 21077, 0x00000BA3 }, /* GL_MODELVIEW_STACK_DEPTH */
+   { 21102, 0x00002100 }, /* GL_MODULATE */
+   { 21114, 0x00008744 }, /* GL_MODULATE_ADD_ATI */
+   { 21134, 0x00008745 }, /* GL_MODULATE_SIGNED_ADD_ATI */
+   { 21161, 0x00008746 }, /* GL_MODULATE_SUBTRACT_ATI */
+   { 21186, 0x00000103 }, /* GL_MULT */
+   { 21194, 0x0000809D }, /* GL_MULTISAMPLE */
+   { 21209, 0x000086B2 }, /* GL_MULTISAMPLE_3DFX */
+   { 21229, 0x0000809D }, /* GL_MULTISAMPLE_ARB */
+   { 21248, 0x20000000 }, /* GL_MULTISAMPLE_BIT */
+   { 21267, 0x20000000 }, /* GL_MULTISAMPLE_BIT_3DFX */
+   { 21291, 0x20000000 }, /* GL_MULTISAMPLE_BIT_ARB */
+   { 21314, 0x00008534 }, /* GL_MULTISAMPLE_FILTER_HINT_NV */
+   { 21344, 0x00002A25 }, /* GL_N3F_V3F */
+   { 21355, 0x00000D70 }, /* GL_NAME_STACK_DEPTH */
+   { 21375, 0x0000150E }, /* GL_NAND */
+   { 21383, 0x00002600 }, /* GL_NEAREST */
+   { 21394, 0x0000844E }, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
+   { 21425, 0x0000844D }, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
+   { 21457, 0x00002702 }, /* GL_NEAREST_MIPMAP_LINEAR */
+   { 21482, 0x00002700 }, /* GL_NEAREST_MIPMAP_NEAREST */
+   { 21508, 0x00000200 }, /* GL_NEVER */
+   { 21517, 0x00001102 }, /* GL_NICEST */
+   { 21527, 0x00000000 }, /* GL_NONE */
+   { 21535, 0x00001505 }, /* GL_NOOP */
+   { 21543, 0x00001508 }, /* GL_NOR */
+   { 21550, 0x00000BA1 }, /* GL_NORMALIZE */
+   { 21563, 0x00008075 }, /* GL_NORMAL_ARRAY */
+   { 21579, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
+   { 21610, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING_ARB */
+   { 21645, 0x0000808F }, /* GL_NORMAL_ARRAY_POINTER */
+   { 21669, 0x0000807F }, /* GL_NORMAL_ARRAY_STRIDE */
+   { 21692, 0x0000807E }, /* GL_NORMAL_ARRAY_TYPE */
+   { 21713, 0x00008511 }, /* GL_NORMAL_MAP */
+   { 21727, 0x00008511 }, /* GL_NORMAL_MAP_ARB */
+   { 21745, 0x00008511 }, /* GL_NORMAL_MAP_NV */
+   { 21762, 0x00000205 }, /* GL_NOTEQUAL */
+   { 21774, 0x00000000 }, /* GL_NO_ERROR */
+   { 21786, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
+   { 21820, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB */
+   { 21858, 0x00008B89 }, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */
+   { 21890, 0x00008B8A }, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */
+   { 21932, 0x00008B86 }, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */
+   { 21962, 0x00008B87 }, /* GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB */
+   { 22002, 0x00008B85 }, /* GL_OBJECT_ATTACHED_OBJECTS_ARB */
+   { 22033, 0x00008B81 }, /* GL_OBJECT_COMPILE_STATUS_ARB */
+   { 22062, 0x00008B80 }, /* GL_OBJECT_DELETE_STATUS_ARB */
+   { 22090, 0x00008B84 }, /* GL_OBJECT_INFO_LOG_LENGTH_ARB */
+   { 22120, 0x00002401 }, /* GL_OBJECT_LINEAR */
+   { 22137, 0x00008B82 }, /* GL_OBJECT_LINK_STATUS_ARB */
+   { 22163, 0x00002501 }, /* GL_OBJECT_PLANE */
+   { 22179, 0x00008B88 }, /* GL_OBJECT_SHADER_SOURCE_LENGTH_ARB */
+   { 22214, 0x00008B4F }, /* GL_OBJECT_SUBTYPE_ARB */
+   { 22236, 0x00009112 }, /* GL_OBJECT_TYPE */
+   { 22251, 0x00008B4E }, /* GL_OBJECT_TYPE_ARB */
+   { 22270, 0x00008B83 }, /* GL_OBJECT_VALIDATE_STATUS_ARB */
+   { 22300, 0x00008165 }, /* GL_OCCLUSION_TEST_HP */
+   { 22321, 0x00008166 }, /* GL_OCCLUSION_TEST_RESULT_HP */
+   { 22349, 0x00000001 }, /* GL_ONE */
+   { 22356, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA */
+   { 22384, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA_EXT */
+   { 22416, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR */
+   { 22444, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR_EXT */
+   { 22476, 0x00000305 }, /* GL_ONE_MINUS_DST_ALPHA */
+   { 22499, 0x00000307 }, /* GL_ONE_MINUS_DST_COLOR */
+   { 22522, 0x00000303 }, /* GL_ONE_MINUS_SRC_ALPHA */
+   { 22545, 0x00000301 }, /* GL_ONE_MINUS_SRC_COLOR */
+   { 22568, 0x00008598 }, /* GL_OPERAND0_ALPHA */
+   { 22586, 0x00008598 }, /* GL_OPERAND0_ALPHA_ARB */
+   { 22608, 0x00008598 }, /* GL_OPERAND0_ALPHA_EXT */
+   { 22630, 0x00008590 }, /* GL_OPERAND0_RGB */
+   { 22646, 0x00008590 }, /* GL_OPERAND0_RGB_ARB */
+   { 22666, 0x00008590 }, /* GL_OPERAND0_RGB_EXT */
+   { 22686, 0x00008599 }, /* GL_OPERAND1_ALPHA */
+   { 22704, 0x00008599 }, /* GL_OPERAND1_ALPHA_ARB */
+   { 22726, 0x00008599 }, /* GL_OPERAND1_ALPHA_EXT */
+   { 22748, 0x00008591 }, /* GL_OPERAND1_RGB */
+   { 22764, 0x00008591 }, /* GL_OPERAND1_RGB_ARB */
+   { 22784, 0x00008591 }, /* GL_OPERAND1_RGB_EXT */
+   { 22804, 0x0000859A }, /* GL_OPERAND2_ALPHA */
+   { 22822, 0x0000859A }, /* GL_OPERAND2_ALPHA_ARB */
+   { 22844, 0x0000859A }, /* GL_OPERAND2_ALPHA_EXT */
+   { 22866, 0x00008592 }, /* GL_OPERAND2_RGB */
+   { 22882, 0x00008592 }, /* GL_OPERAND2_RGB_ARB */
+   { 22902, 0x00008592 }, /* GL_OPERAND2_RGB_EXT */
+   { 22922, 0x0000859B }, /* GL_OPERAND3_ALPHA_NV */
+   { 22943, 0x00008593 }, /* GL_OPERAND3_RGB_NV */
+   { 22962, 0x00001507 }, /* GL_OR */
+   { 22968, 0x00000A01 }, /* GL_ORDER */
+   { 22977, 0x0000150D }, /* GL_OR_INVERTED */
+   { 22992, 0x0000150B }, /* GL_OR_REVERSE */
+   { 23006, 0x00000505 }, /* GL_OUT_OF_MEMORY */
+   { 23023, 0x00000D05 }, /* GL_PACK_ALIGNMENT */
+   { 23041, 0x0000806C }, /* GL_PACK_IMAGE_HEIGHT */
+   { 23062, 0x00008758 }, /* GL_PACK_INVERT_MESA */
+   { 23082, 0x00000D01 }, /* GL_PACK_LSB_FIRST */
+   { 23100, 0x00000D02 }, /* GL_PACK_ROW_LENGTH */
+   { 23119, 0x0000806B }, /* GL_PACK_SKIP_IMAGES */
+   { 23139, 0x00000D04 }, /* GL_PACK_SKIP_PIXELS */
+   { 23159, 0x00000D03 }, /* GL_PACK_SKIP_ROWS */
+   { 23177, 0x00000D00 }, /* GL_PACK_SWAP_BYTES */
+   { 23196, 0x00008B92 }, /* GL_PALETTE4_R5_G6_B5_OES */
+   { 23221, 0x00008B94 }, /* GL_PALETTE4_RGB5_A1_OES */
+   { 23245, 0x00008B90 }, /* GL_PALETTE4_RGB8_OES */
+   { 23266, 0x00008B93 }, /* GL_PALETTE4_RGBA4_OES */
+   { 23288, 0x00008B91 }, /* GL_PALETTE4_RGBA8_OES */
+   { 23310, 0x00008B97 }, /* GL_PALETTE8_R5_G6_B5_OES */
+   { 23335, 0x00008B99 }, /* GL_PALETTE8_RGB5_A1_OES */
+   { 23359, 0x00008B95 }, /* GL_PALETTE8_RGB8_OES */
+   { 23380, 0x00008B98 }, /* GL_PALETTE8_RGBA4_OES */
+   { 23402, 0x00008B96 }, /* GL_PALETTE8_RGBA8_OES */
+   { 23424, 0x00000700 }, /* GL_PASS_THROUGH_TOKEN */
+   { 23446, 0x00000C50 }, /* GL_PERSPECTIVE_CORRECTION_HINT */
+   { 23477, 0x00000C79 }, /* GL_PIXEL_MAP_A_TO_A */
+   { 23497, 0x00000CB9 }, /* GL_PIXEL_MAP_A_TO_A_SIZE */
+   { 23522, 0x00000C78 }, /* GL_PIXEL_MAP_B_TO_B */
+   { 23542, 0x00000CB8 }, /* GL_PIXEL_MAP_B_TO_B_SIZE */
+   { 23567, 0x00000C77 }, /* GL_PIXEL_MAP_G_TO_G */
+   { 23587, 0x00000CB7 }, /* GL_PIXEL_MAP_G_TO_G_SIZE */
+   { 23612, 0x00000C75 }, /* GL_PIXEL_MAP_I_TO_A */
+   { 23632, 0x00000CB5 }, /* GL_PIXEL_MAP_I_TO_A_SIZE */
+   { 23657, 0x00000C74 }, /* GL_PIXEL_MAP_I_TO_B */
+   { 23677, 0x00000CB4 }, /* GL_PIXEL_MAP_I_TO_B_SIZE */
+   { 23702, 0x00000C73 }, /* GL_PIXEL_MAP_I_TO_G */
+   { 23722, 0x00000CB3 }, /* GL_PIXEL_MAP_I_TO_G_SIZE */
+   { 23747, 0x00000C70 }, /* GL_PIXEL_MAP_I_TO_I */
+   { 23767, 0x00000CB0 }, /* GL_PIXEL_MAP_I_TO_I_SIZE */
+   { 23792, 0x00000C72 }, /* GL_PIXEL_MAP_I_TO_R */
+   { 23812, 0x00000CB2 }, /* GL_PIXEL_MAP_I_TO_R_SIZE */
+   { 23837, 0x00000C76 }, /* GL_PIXEL_MAP_R_TO_R */
+   { 23857, 0x00000CB6 }, /* GL_PIXEL_MAP_R_TO_R_SIZE */
+   { 23882, 0x00000C71 }, /* GL_PIXEL_MAP_S_TO_S */
+   { 23902, 0x00000CB1 }, /* GL_PIXEL_MAP_S_TO_S_SIZE */
+   { 23927, 0x00000020 }, /* GL_PIXEL_MODE_BIT */
+   { 23945, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER */
+   { 23966, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING */
+   { 23995, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING_EXT */
+   { 24028, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER_EXT */
+   { 24053, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER */
+   { 24076, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
+   { 24107, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING_EXT */
+   { 24142, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER_EXT */
+   { 24169, 0x00001B00 }, /* GL_POINT */
+   { 24178, 0x00000000 }, /* GL_POINTS */
+   { 24188, 0x00000002 }, /* GL_POINT_BIT */
+   { 24201, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION */
+   { 24231, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_ARB */
+   { 24265, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_EXT */
+   { 24299, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_SGIS */
+   { 24334, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE */
+   { 24363, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_ARB */
+   { 24396, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_EXT */
+   { 24429, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_SGIS */
+   { 24463, 0x00000B11 }, /* GL_POINT_SIZE */
+   { 24477, 0x00000B13 }, /* GL_POINT_SIZE_GRANULARITY */
+   { 24503, 0x00008127 }, /* GL_POINT_SIZE_MAX */
+   { 24521, 0x00008127 }, /* GL_POINT_SIZE_MAX_ARB */
+   { 24543, 0x00008127 }, /* GL_POINT_SIZE_MAX_EXT */
+   { 24565, 0x00008127 }, /* GL_POINT_SIZE_MAX_SGIS */
+   { 24588, 0x00008126 }, /* GL_POINT_SIZE_MIN */
+   { 24606, 0x00008126 }, /* GL_POINT_SIZE_MIN_ARB */
+   { 24628, 0x00008126 }, /* GL_POINT_SIZE_MIN_EXT */
+   { 24650, 0x00008126 }, /* GL_POINT_SIZE_MIN_SGIS */
+   { 24673, 0x00000B12 }, /* GL_POINT_SIZE_RANGE */
+   { 24693, 0x00000B10 }, /* GL_POINT_SMOOTH */
+   { 24709, 0x00000C51 }, /* GL_POINT_SMOOTH_HINT */
+   { 24730, 0x00008861 }, /* GL_POINT_SPRITE */
+   { 24746, 0x00008861 }, /* GL_POINT_SPRITE_ARB */
+   { 24766, 0x00008CA0 }, /* GL_POINT_SPRITE_COORD_ORIGIN */
+   { 24795, 0x00008861 }, /* GL_POINT_SPRITE_NV */
+   { 24814, 0x00008863 }, /* GL_POINT_SPRITE_R_MODE_NV */
+   { 24840, 0x00000701 }, /* GL_POINT_TOKEN */
+   { 24855, 0x00000009 }, /* GL_POLYGON */
+   { 24866, 0x00000008 }, /* GL_POLYGON_BIT */
+   { 24881, 0x00000B40 }, /* GL_POLYGON_MODE */
+   { 24897, 0x00008039 }, /* GL_POLYGON_OFFSET_BIAS */
+   { 24920, 0x00008038 }, /* GL_POLYGON_OFFSET_FACTOR */
+   { 24945, 0x00008037 }, /* GL_POLYGON_OFFSET_FILL */
+   { 24968, 0x00002A02 }, /* GL_POLYGON_OFFSET_LINE */
+   { 24991, 0x00002A01 }, /* GL_POLYGON_OFFSET_POINT */
+   { 25015, 0x00002A00 }, /* GL_POLYGON_OFFSET_UNITS */
+   { 25039, 0x00000B41 }, /* GL_POLYGON_SMOOTH */
+   { 25057, 0x00000C53 }, /* GL_POLYGON_SMOOTH_HINT */
+   { 25080, 0x00000B42 }, /* GL_POLYGON_STIPPLE */
+   { 25099, 0x00000010 }, /* GL_POLYGON_STIPPLE_BIT */
+   { 25122, 0x00000703 }, /* GL_POLYGON_TOKEN */
+   { 25139, 0x00001203 }, /* GL_POSITION */
+   { 25151, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
+   { 25183, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI */
+   { 25219, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
+   { 25252, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI */
+   { 25289, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
+   { 25320, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI */
+   { 25355, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
+   { 25387, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI */
+   { 25423, 0x000080D2 }, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
+   { 25456, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
+   { 25488, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI */
+   { 25524, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
+   { 25557, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI */
+   { 25594, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS */
+   { 25624, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS_SGI */
+   { 25658, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE */
+   { 25689, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE_SGI */
+   { 25724, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
+   { 25755, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS_EXT */
+   { 25790, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
+   { 25822, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE_EXT */
+   { 25858, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS */
+   { 25888, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS_EXT */
+   { 25922, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE */
+   { 25953, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE_EXT */
+   { 25988, 0x000080D1 }, /* GL_POST_CONVOLUTION_COLOR_TABLE */
+   { 26020, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS */
+   { 26051, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS_EXT */
+   { 26086, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE */
+   { 26118, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE_EXT */
+   { 26154, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS */
+   { 26183, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS_EXT */
+   { 26216, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE */
+   { 26246, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE_EXT */
+   { 26280, 0x0000817B }, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
+   { 26319, 0x00008179 }, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
+   { 26352, 0x0000817C }, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
+   { 26392, 0x0000817A }, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
+   { 26426, 0x00008578 }, /* GL_PREVIOUS */
+   { 26438, 0x00008578 }, /* GL_PREVIOUS_ARB */
+   { 26454, 0x00008578 }, /* GL_PREVIOUS_EXT */
+   { 26470, 0x00008577 }, /* GL_PRIMARY_COLOR */
+   { 26487, 0x00008577 }, /* GL_PRIMARY_COLOR_ARB */
+   { 26508, 0x00008577 }, /* GL_PRIMARY_COLOR_EXT */
+   { 26529, 0x000088B0 }, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
+   { 26562, 0x00008805 }, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
+   { 26594, 0x000088AC }, /* GL_PROGRAM_ATTRIBS_ARB */
+   { 26617, 0x00008677 }, /* GL_PROGRAM_BINDING_ARB */
+   { 26640, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_ARB */
+   { 26670, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_NV */
+   { 26699, 0x00008874 }, /* GL_PROGRAM_ERROR_STRING_ARB */
+   { 26727, 0x00008876 }, /* GL_PROGRAM_FORMAT_ARB */
+   { 26749, 0x00008875 }, /* GL_PROGRAM_FORMAT_ASCII_ARB */
+   { 26777, 0x000088A0 }, /* GL_PROGRAM_INSTRUCTIONS_ARB */
+   { 26805, 0x00008627 }, /* GL_PROGRAM_LENGTH_ARB */
+   { 26827, 0x00008627 }, /* GL_PROGRAM_LENGTH_NV */
+   { 26848, 0x000088B2 }, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+   { 26888, 0x00008808 }, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+   { 26927, 0x000088AE }, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
+   { 26957, 0x000088A2 }, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+   { 26992, 0x000088AA }, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
+   { 27025, 0x000088A6 }, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
+   { 27059, 0x0000880A }, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+   { 27098, 0x00008809 }, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+   { 27137, 0x00008B40 }, /* GL_PROGRAM_OBJECT_ARB */
+   { 27159, 0x000088A8 }, /* GL_PROGRAM_PARAMETERS_ARB */
+   { 27185, 0x00008644 }, /* GL_PROGRAM_PARAMETER_NV */
+   { 27209, 0x00008647 }, /* GL_PROGRAM_RESIDENT_NV */
+   { 27232, 0x00008628 }, /* GL_PROGRAM_STRING_ARB */
+   { 27254, 0x00008628 }, /* GL_PROGRAM_STRING_NV */
+   { 27275, 0x00008646 }, /* GL_PROGRAM_TARGET_NV */
+   { 27296, 0x000088A4 }, /* GL_PROGRAM_TEMPORARIES_ARB */
+   { 27323, 0x00008807 }, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
+   { 27355, 0x00008806 }, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
+   { 27387, 0x000088B6 }, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
+   { 27422, 0x00001701 }, /* GL_PROJECTION */
+   { 27436, 0x00000BA7 }, /* GL_PROJECTION_MATRIX */
+   { 27457, 0x00000BA4 }, /* GL_PROJECTION_STACK_DEPTH */
+   { 27483, 0x00008E4F }, /* GL_PROVOKING_VERTEX_EXT */
+   { 27507, 0x000080D3 }, /* GL_PROXY_COLOR_TABLE */
+   { 27528, 0x00008025 }, /* GL_PROXY_HISTOGRAM */
+   { 27547, 0x00008025 }, /* GL_PROXY_HISTOGRAM_EXT */
+   { 27570, 0x000080D5 }, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
+   { 27609, 0x000080D4 }, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
+   { 27647, 0x00008063 }, /* GL_PROXY_TEXTURE_1D */
+   { 27667, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
+   { 27697, 0x00008063 }, /* GL_PROXY_TEXTURE_1D_EXT */
+   { 27721, 0x00008064 }, /* GL_PROXY_TEXTURE_2D */
+   { 27741, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
+   { 27771, 0x00008064 }, /* GL_PROXY_TEXTURE_2D_EXT */
+   { 27795, 0x00008070 }, /* GL_PROXY_TEXTURE_3D */
+   { 27815, 0x000080BD }, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
+   { 27848, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP */
+   { 27874, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP_ARB */
+   { 27904, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
+   { 27935, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_NV */
+   { 27965, 0x00002003 }, /* GL_Q */
+   { 27970, 0x00001209 }, /* GL_QUADRATIC_ATTENUATION */
+   { 27995, 0x00000007 }, /* GL_QUADS */
+   { 28004, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT */
+   { 28052, 0x00008614 }, /* GL_QUAD_MESH_SUN */
+   { 28069, 0x00000008 }, /* GL_QUAD_STRIP */
+   { 28083, 0x00008864 }, /* GL_QUERY_COUNTER_BITS */
+   { 28105, 0x00008864 }, /* GL_QUERY_COUNTER_BITS_ARB */
+   { 28131, 0x00008866 }, /* GL_QUERY_RESULT */
+   { 28147, 0x00008866 }, /* GL_QUERY_RESULT_ARB */
+   { 28167, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE */
+   { 28193, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE_ARB */
+   { 28223, 0x00002002 }, /* GL_R */
+   { 28228, 0x00002A10 }, /* GL_R3_G3_B2 */
+   { 28240, 0x00019262 }, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
+   { 28273, 0x00000C02 }, /* GL_READ_BUFFER */
+   { 28288, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER */
+   { 28308, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
+   { 28340, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER_EXT */
+   { 28364, 0x000088B8 }, /* GL_READ_ONLY */
+   { 28377, 0x000088B8 }, /* GL_READ_ONLY_ARB */
+   { 28394, 0x000088BA }, /* GL_READ_WRITE */
+   { 28408, 0x000088BA }, /* GL_READ_WRITE_ARB */
+   { 28426, 0x00001903 }, /* GL_RED */
+   { 28433, 0x00008016 }, /* GL_REDUCE */
+   { 28443, 0x00008016 }, /* GL_REDUCE_EXT */
+   { 28457, 0x00000D15 }, /* GL_RED_BIAS */
+   { 28469, 0x00000D52 }, /* GL_RED_BITS */
+   { 28481, 0x00000D14 }, /* GL_RED_SCALE */
+   { 28494, 0x00008512 }, /* GL_REFLECTION_MAP */
+   { 28512, 0x00008512 }, /* GL_REFLECTION_MAP_ARB */
+   { 28534, 0x00008512 }, /* GL_REFLECTION_MAP_NV */
+   { 28555, 0x00001C00 }, /* GL_RENDER */
+   { 28565, 0x00008D41 }, /* GL_RENDERBUFFER */
+   { 28581, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE */
+   { 28608, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_EXT */
+   { 28636, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE */
+   { 28662, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE */
+   { 28689, 0x00008D41 }, /* GL_RENDERBUFFER_EXT */
+   { 28709, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE */
+   { 28736, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT */
+   { 28759, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_EXT */
+   { 28786, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
+   { 28818, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */
+   { 28854, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE */
+   { 28879, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES */
+   { 28903, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE */
+   { 28932, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH */
+   { 28954, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_EXT */
+   { 28980, 0x00001F01 }, /* GL_RENDERER */
+   { 28992, 0x00000C40 }, /* GL_RENDER_MODE */
+   { 29007, 0x00002901 }, /* GL_REPEAT */
+   { 29017, 0x00001E01 }, /* GL_REPLACE */
+   { 29028, 0x00008062 }, /* GL_REPLACE_EXT */
+   { 29043, 0x00008153 }, /* GL_REPLICATE_BORDER_HP */
+   { 29066, 0x0000803A }, /* GL_RESCALE_NORMAL */
+   { 29084, 0x0000803A }, /* GL_RESCALE_NORMAL_EXT */
+   { 29106, 0x00000102 }, /* GL_RETURN */
+   { 29116, 0x00001907 }, /* GL_RGB */
+   { 29123, 0x00008052 }, /* GL_RGB10 */
+   { 29132, 0x00008059 }, /* GL_RGB10_A2 */
+   { 29144, 0x00008059 }, /* GL_RGB10_A2_EXT */
+   { 29160, 0x00008052 }, /* GL_RGB10_EXT */
+   { 29173, 0x00008053 }, /* GL_RGB12 */
+   { 29182, 0x00008053 }, /* GL_RGB12_EXT */
+   { 29195, 0x00008054 }, /* GL_RGB16 */
+   { 29204, 0x00008054 }, /* GL_RGB16_EXT */
+   { 29217, 0x0000804E }, /* GL_RGB2_EXT */
+   { 29229, 0x0000804F }, /* GL_RGB4 */
+   { 29237, 0x0000804F }, /* GL_RGB4_EXT */
+   { 29249, 0x000083A1 }, /* GL_RGB4_S3TC */
+   { 29262, 0x00008050 }, /* GL_RGB5 */
+   { 29270, 0x00008057 }, /* GL_RGB5_A1 */
+   { 29281, 0x00008057 }, /* GL_RGB5_A1_EXT */
+   { 29296, 0x00008050 }, /* GL_RGB5_EXT */
+   { 29308, 0x00008051 }, /* GL_RGB8 */
+   { 29316, 0x00008051 }, /* GL_RGB8_EXT */
+   { 29328, 0x00001908 }, /* GL_RGBA */
+   { 29336, 0x0000805A }, /* GL_RGBA12 */
+   { 29346, 0x0000805A }, /* GL_RGBA12_EXT */
+   { 29360, 0x0000805B }, /* GL_RGBA16 */
+   { 29370, 0x0000805B }, /* GL_RGBA16_EXT */
+   { 29384, 0x00008055 }, /* GL_RGBA2 */
+   { 29393, 0x00008055 }, /* GL_RGBA2_EXT */
+   { 29406, 0x00008056 }, /* GL_RGBA4 */
+   { 29415, 0x000083A5 }, /* GL_RGBA4_DXT5_S3TC */
+   { 29434, 0x00008056 }, /* GL_RGBA4_EXT */
+   { 29447, 0x000083A3 }, /* GL_RGBA4_S3TC */
+   { 29461, 0x00008058 }, /* GL_RGBA8 */
+   { 29470, 0x00008058 }, /* GL_RGBA8_EXT */
+   { 29483, 0x00008F97 }, /* GL_RGBA8_SNORM */
+   { 29498, 0x000083A4 }, /* GL_RGBA_DXT5_S3TC */
+   { 29516, 0x00000C31 }, /* GL_RGBA_MODE */
+   { 29529, 0x000083A2 }, /* GL_RGBA_S3TC */
+   { 29542, 0x00008F93 }, /* GL_RGBA_SNORM */
+   { 29556, 0x000083A0 }, /* GL_RGB_S3TC */
+   { 29568, 0x00008573 }, /* GL_RGB_SCALE */
+   { 29581, 0x00008573 }, /* GL_RGB_SCALE_ARB */
+   { 29598, 0x00008573 }, /* GL_RGB_SCALE_EXT */
+   { 29615, 0x00000407 }, /* GL_RIGHT */
+   { 29624, 0x00002000 }, /* GL_S */
+   { 29629, 0x00008B5D }, /* GL_SAMPLER_1D */
+   { 29643, 0x00008B61 }, /* GL_SAMPLER_1D_SHADOW */
+   { 29664, 0x00008B5E }, /* GL_SAMPLER_2D */
+   { 29678, 0x00008B62 }, /* GL_SAMPLER_2D_SHADOW */
+   { 29699, 0x00008B5F }, /* GL_SAMPLER_3D */
+   { 29713, 0x00008B60 }, /* GL_SAMPLER_CUBE */
+   { 29729, 0x000080A9 }, /* GL_SAMPLES */
+   { 29740, 0x000086B4 }, /* GL_SAMPLES_3DFX */
+   { 29756, 0x000080A9 }, /* GL_SAMPLES_ARB */
+   { 29771, 0x00008914 }, /* GL_SAMPLES_PASSED */
+   { 29789, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */
+   { 29811, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
+   { 29839, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */
+   { 29871, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */
+   { 29894, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */
+   { 29921, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */
+   { 29939, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */
+   { 29962, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */
+   { 29984, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */
+   { 30003, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */
+   { 30026, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */
+   { 30052, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */
+   { 30082, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */
+   { 30107, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */
+   { 30136, 0x00080000 }, /* GL_SCISSOR_BIT */
+   { 30151, 0x00000C10 }, /* GL_SCISSOR_BOX */
+   { 30166, 0x00000C11 }, /* GL_SCISSOR_TEST */
+   { 30182, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */
+   { 30207, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
+   { 30247, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */
+   { 30291, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
+   { 30324, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
+   { 30354, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
+   { 30386, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
+   { 30416, 0x00001C02 }, /* GL_SELECT */
+   { 30426, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */
+   { 30454, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */
+   { 30479, 0x00008012 }, /* GL_SEPARABLE_2D */
+   { 30495, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */
+   { 30522, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */
+   { 30553, 0x0000150F }, /* GL_SET */
+   { 30560, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */
+   { 30581, 0x00008B88 }, /* GL_SHADER_SOURCE_LENGTH */
+   { 30605, 0x00008B4F }, /* GL_SHADER_TYPE */
+   { 30620, 0x00000B54 }, /* GL_SHADE_MODEL */
+   { 30635, 0x00008B8C }, /* GL_SHADING_LANGUAGE_VERSION */
+   { 30663, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */
+   { 30686, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */
+   { 30716, 0x00001601 }, /* GL_SHININESS */
+   { 30729, 0x00001402 }, /* GL_SHORT */
+   { 30738, 0x00009119 }, /* GL_SIGNALED */
+   { 30750, 0x00008F9C }, /* GL_SIGNED_NORMALIZED */
+   { 30771, 0x000081F9 }, /* GL_SINGLE_COLOR */
+   { 30787, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */
+   { 30807, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */
+   { 30826, 0x00008C46 }, /* GL_SLUMINANCE */
+   { 30840, 0x00008C47 }, /* GL_SLUMINANCE8 */
+   { 30855, 0x00008C45 }, /* GL_SLUMINANCE8_ALPHA8 */
+   { 30877, 0x00008C44 }, /* GL_SLUMINANCE_ALPHA */
+   { 30897, 0x00001D01 }, /* GL_SMOOTH */
+   { 30907, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */
+   { 30940, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */
+   { 30967, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */
+   { 31000, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */
+   { 31027, 0x00008588 }, /* GL_SOURCE0_ALPHA */
+   { 31044, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */
+   { 31065, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */
+   { 31086, 0x00008580 }, /* GL_SOURCE0_RGB */
+   { 31101, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */
+   { 31120, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */
+   { 31139, 0x00008589 }, /* GL_SOURCE1_ALPHA */
+   { 31156, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */
+   { 31177, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */
+   { 31198, 0x00008581 }, /* GL_SOURCE1_RGB */
+   { 31213, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */
+   { 31232, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */
+   { 31251, 0x0000858A }, /* GL_SOURCE2_ALPHA */
+   { 31268, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */
+   { 31289, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */
+   { 31310, 0x00008582 }, /* GL_SOURCE2_RGB */
+   { 31325, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */
+   { 31344, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */
+   { 31363, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */
+   { 31383, 0x00008583 }, /* GL_SOURCE3_RGB_NV */
+   { 31401, 0x00001202 }, /* GL_SPECULAR */
+   { 31413, 0x00002402 }, /* GL_SPHERE_MAP */
+   { 31427, 0x00001206 }, /* GL_SPOT_CUTOFF */
+   { 31442, 0x00001204 }, /* GL_SPOT_DIRECTION */
+   { 31460, 0x00001205 }, /* GL_SPOT_EXPONENT */
+   { 31477, 0x00008588 }, /* GL_SRC0_ALPHA */
+   { 31491, 0x00008580 }, /* GL_SRC0_RGB */
+   { 31503, 0x00008589 }, /* GL_SRC1_ALPHA */
+   { 31517, 0x00008581 }, /* GL_SRC1_RGB */
+   { 31529, 0x0000858A }, /* GL_SRC2_ALPHA */
+   { 31543, 0x00008582 }, /* GL_SRC2_RGB */
+   { 31555, 0x00000302 }, /* GL_SRC_ALPHA */
+   { 31568, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */
+   { 31590, 0x00000300 }, /* GL_SRC_COLOR */
+   { 31603, 0x00008C40 }, /* GL_SRGB */
+   { 31611, 0x00008C41 }, /* GL_SRGB8 */
+   { 31620, 0x00008C43 }, /* GL_SRGB8_ALPHA8 */
+   { 31636, 0x00008C42 }, /* GL_SRGB_ALPHA */
+   { 31650, 0x00000503 }, /* GL_STACK_OVERFLOW */
+   { 31668, 0x00000504 }, /* GL_STACK_UNDERFLOW */
+   { 31687, 0x000088E6 }, /* GL_STATIC_COPY */
+   { 31702, 0x000088E6 }, /* GL_STATIC_COPY_ARB */
+   { 31721, 0x000088E4 }, /* GL_STATIC_DRAW */
+   { 31736, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */
+   { 31755, 0x000088E5 }, /* GL_STATIC_READ */
+   { 31770, 0x000088E5 }, /* GL_STATIC_READ_ARB */
+   { 31789, 0x00001802 }, /* GL_STENCIL */
+   { 31800, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT */
+   { 31822, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */
+   { 31848, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */
+   { 31869, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */
+   { 31894, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
+   { 31915, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */
+   { 31940, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
+   { 31972, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */
+   { 32008, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
+   { 32040, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */
+   { 32076, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
+   { 32096, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
+   { 32123, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
+   { 32149, 0x00000D57 }, /* GL_STENCIL_BITS */
+   { 32165, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
+   { 32187, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
+   { 32210, 0x00000B94 }, /* GL_STENCIL_FAIL */
+   { 32226, 0x00000B92 }, /* GL_STENCIL_FUNC */
+   { 32242, 0x00001901 }, /* GL_STENCIL_INDEX */
+   { 32259, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
+   { 32282, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
+   { 32304, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
+   { 32326, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
+   { 32348, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
+   { 32369, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
+   { 32396, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
+   { 32423, 0x00000B97 }, /* GL_STENCIL_REF */
+   { 32438, 0x00000B90 }, /* GL_STENCIL_TEST */
+   { 32454, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
+   { 32483, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
+   { 32505, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
+   { 32526, 0x00000C33 }, /* GL_STEREO */
+   { 32536, 0x000085BE }, /* GL_STORAGE_CACHED_APPLE */
+   { 32560, 0x000085BD }, /* GL_STORAGE_PRIVATE_APPLE */
+   { 32585, 0x000085BF }, /* GL_STORAGE_SHARED_APPLE */
+   { 32609, 0x000088E2 }, /* GL_STREAM_COPY */
+   { 32624, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
+   { 32643, 0x000088E0 }, /* GL_STREAM_DRAW */
+   { 32658, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
+   { 32677, 0x000088E1 }, /* GL_STREAM_READ */
+   { 32692, 0x000088E1 }, /* GL_STREAM_READ_ARB */
+   { 32711, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
+   { 32728, 0x000084E7 }, /* GL_SUBTRACT */
+   { 32740, 0x000084E7 }, /* GL_SUBTRACT_ARB */
+   { 32756, 0x00009113 }, /* GL_SYNC_CONDITION */
+   { 32774, 0x00009116 }, /* GL_SYNC_FENCE */
+   { 32788, 0x00009115 }, /* GL_SYNC_FLAGS */
+   { 32802, 0x00000001 }, /* GL_SYNC_FLUSH_COMMANDS_BIT */
+   { 32829, 0x00009117 }, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
+   { 32859, 0x00009114 }, /* GL_SYNC_STATUS */
+   { 32874, 0x00002001 }, /* GL_T */
+   { 32879, 0x00002A2A }, /* GL_T2F_C3F_V3F */
+   { 32894, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
+   { 32913, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
+   { 32929, 0x00002A2B }, /* GL_T2F_N3F_V3F */
+   { 32944, 0x00002A27 }, /* GL_T2F_V3F */
+   { 32955, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
+   { 32974, 0x00002A28 }, /* GL_T4F_V4F */
+   { 32985, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
+   { 33008, 0x00001702 }, /* GL_TEXTURE */
+   { 33019, 0x000084C0 }, /* GL_TEXTURE0 */
+   { 33031, 0x000084C0 }, /* GL_TEXTURE0_ARB */
+   { 33047, 0x000084C1 }, /* GL_TEXTURE1 */
+   { 33059, 0x000084CA }, /* GL_TEXTURE10 */
+   { 33072, 0x000084CA }, /* GL_TEXTURE10_ARB */
+   { 33089, 0x000084CB }, /* GL_TEXTURE11 */
+   { 33102, 0x000084CB }, /* GL_TEXTURE11_ARB */
+   { 33119, 0x000084CC }, /* GL_TEXTURE12 */
+   { 33132, 0x000084CC }, /* GL_TEXTURE12_ARB */
+   { 33149, 0x000084CD }, /* GL_TEXTURE13 */
+   { 33162, 0x000084CD }, /* GL_TEXTURE13_ARB */
+   { 33179, 0x000084CE }, /* GL_TEXTURE14 */
+   { 33192, 0x000084CE }, /* GL_TEXTURE14_ARB */
+   { 33209, 0x000084CF }, /* GL_TEXTURE15 */
+   { 33222, 0x000084CF }, /* GL_TEXTURE15_ARB */
+   { 33239, 0x000084D0 }, /* GL_TEXTURE16 */
+   { 33252, 0x000084D0 }, /* GL_TEXTURE16_ARB */
+   { 33269, 0x000084D1 }, /* GL_TEXTURE17 */
+   { 33282, 0x000084D1 }, /* GL_TEXTURE17_ARB */
+   { 33299, 0x000084D2 }, /* GL_TEXTURE18 */
+   { 33312, 0x000084D2 }, /* GL_TEXTURE18_ARB */
+   { 33329, 0x000084D3 }, /* GL_TEXTURE19 */
+   { 33342, 0x000084D3 }, /* GL_TEXTURE19_ARB */
+   { 33359, 0x000084C1 }, /* GL_TEXTURE1_ARB */
+   { 33375, 0x000084C2 }, /* GL_TEXTURE2 */
+   { 33387, 0x000084D4 }, /* GL_TEXTURE20 */
+   { 33400, 0x000084D4 }, /* GL_TEXTURE20_ARB */
+   { 33417, 0x000084D5 }, /* GL_TEXTURE21 */
+   { 33430, 0x000084D5 }, /* GL_TEXTURE21_ARB */
+   { 33447, 0x000084D6 }, /* GL_TEXTURE22 */
+   { 33460, 0x000084D6 }, /* GL_TEXTURE22_ARB */
+   { 33477, 0x000084D7 }, /* GL_TEXTURE23 */
+   { 33490, 0x000084D7 }, /* GL_TEXTURE23_ARB */
+   { 33507, 0x000084D8 }, /* GL_TEXTURE24 */
+   { 33520, 0x000084D8 }, /* GL_TEXTURE24_ARB */
+   { 33537, 0x000084D9 }, /* GL_TEXTURE25 */
+   { 33550, 0x000084D9 }, /* GL_TEXTURE25_ARB */
+   { 33567, 0x000084DA }, /* GL_TEXTURE26 */
+   { 33580, 0x000084DA }, /* GL_TEXTURE26_ARB */
+   { 33597, 0x000084DB }, /* GL_TEXTURE27 */
+   { 33610, 0x000084DB }, /* GL_TEXTURE27_ARB */
+   { 33627, 0x000084DC }, /* GL_TEXTURE28 */
+   { 33640, 0x000084DC }, /* GL_TEXTURE28_ARB */
+   { 33657, 0x000084DD }, /* GL_TEXTURE29 */
+   { 33670, 0x000084DD }, /* GL_TEXTURE29_ARB */
+   { 33687, 0x000084C2 }, /* GL_TEXTURE2_ARB */
+   { 33703, 0x000084C3 }, /* GL_TEXTURE3 */
+   { 33715, 0x000084DE }, /* GL_TEXTURE30 */
+   { 33728, 0x000084DE }, /* GL_TEXTURE30_ARB */
+   { 33745, 0x000084DF }, /* GL_TEXTURE31 */
+   { 33758, 0x000084DF }, /* GL_TEXTURE31_ARB */
+   { 33775, 0x000084C3 }, /* GL_TEXTURE3_ARB */
+   { 33791, 0x000084C4 }, /* GL_TEXTURE4 */
+   { 33803, 0x000084C4 }, /* GL_TEXTURE4_ARB */
+   { 33819, 0x000084C5 }, /* GL_TEXTURE5 */
+   { 33831, 0x000084C5 }, /* GL_TEXTURE5_ARB */
+   { 33847, 0x000084C6 }, /* GL_TEXTURE6 */
+   { 33859, 0x000084C6 }, /* GL_TEXTURE6_ARB */
+   { 33875, 0x000084C7 }, /* GL_TEXTURE7 */
+   { 33887, 0x000084C7 }, /* GL_TEXTURE7_ARB */
+   { 33903, 0x000084C8 }, /* GL_TEXTURE8 */
+   { 33915, 0x000084C8 }, /* GL_TEXTURE8_ARB */
+   { 33931, 0x000084C9 }, /* GL_TEXTURE9 */
+   { 33943, 0x000084C9 }, /* GL_TEXTURE9_ARB */
+   { 33959, 0x00000DE0 }, /* GL_TEXTURE_1D */
+   { 33973, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
+   { 33997, 0x00000DE1 }, /* GL_TEXTURE_2D */
+   { 34011, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
+   { 34035, 0x0000806F }, /* GL_TEXTURE_3D */
+   { 34049, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
+   { 34071, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
+   { 34097, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
+   { 34119, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
+   { 34141, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
+   { 34173, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
+   { 34195, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
+   { 34227, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
+   { 34249, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
+   { 34277, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
+   { 34309, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
+   { 34342, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
+   { 34374, 0x00040000 }, /* GL_TEXTURE_BIT */
+   { 34389, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
+   { 34410, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
+   { 34435, 0x00001005 }, /* GL_TEXTURE_BORDER */
+   { 34453, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
+   { 34477, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
+   { 34508, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
+   { 34538, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
+   { 34568, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
+   { 34603, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
+   { 34634, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+   { 34672, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
+   { 34699, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
+   { 34731, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+   { 34765, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
+   { 34789, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
+   { 34817, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
+   { 34841, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
+   { 34869, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
+   { 34902, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
+   { 34926, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
+   { 34948, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
+   { 34970, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
+   { 34996, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
+   { 35030, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
+   { 35063, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
+   { 35100, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
+   { 35128, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
+   { 35160, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
+   { 35183, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
+   { 35221, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
+   { 35263, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
+   { 35294, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
+   { 35322, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
+   { 35352, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
+   { 35380, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
+   { 35400, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
+   { 35424, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
+   { 35455, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
+   { 35490, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
+   { 35521, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
+   { 35556, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
+   { 35587, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
+   { 35622, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
+   { 35653, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
+   { 35688, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
+   { 35719, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
+   { 35754, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
+   { 35785, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
+   { 35820, 0x000088F4 }, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
+   { 35849, 0x00008071 }, /* GL_TEXTURE_DEPTH */
+   { 35866, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
+   { 35888, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
+   { 35914, 0x00002300 }, /* GL_TEXTURE_ENV */
+   { 35929, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
+   { 35950, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
+   { 35970, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
+   { 35996, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
+   { 36016, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
+   { 36033, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
+   { 36050, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
+   { 36067, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
+   { 36084, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
+   { 36109, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
+   { 36131, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
+   { 36157, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
+   { 36175, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
+   { 36201, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
+   { 36227, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
+   { 36257, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
+   { 36284, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
+   { 36309, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
+   { 36329, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
+   { 36353, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+   { 36380, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+   { 36407, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+   { 36434, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
+   { 36460, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
+   { 36490, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
+   { 36512, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
+   { 36530, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+   { 36560, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+   { 36588, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+   { 36616, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+   { 36644, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
+   { 36665, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
+   { 36684, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
+   { 36706, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
+   { 36725, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
+   { 36745, 0x000085B7 }, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
+   { 36775, 0x000085B8 }, /* GL_TEXTURE_RANGE_POINTER_APPLE */
+   { 36806, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
+   { 36831, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
+   { 36855, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
+   { 36875, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
+   { 36899, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
+   { 36919, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
+   { 36942, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */
+   { 36966, 0x000085BC }, /* GL_TEXTURE_STORAGE_HINT_APPLE */
+   { 36996, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
+   { 37021, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+   { 37055, 0x00001000 }, /* GL_TEXTURE_WIDTH */
+   { 37072, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
+   { 37090, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
+   { 37108, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
+   { 37126, 0x0000911B }, /* GL_TIMEOUT_EXPIRED */
+   { 37145, 0xFFFFFFFFFFFFFFFF }, /* GL_TIMEOUT_IGNORED */
+   { 37164, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
+   { 37184, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
+   { 37203, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+   { 37232, 0x00001000 }, /* GL_TRANSFORM_BIT */
+   { 37249, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
+   { 37275, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
+   { 37305, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+   { 37337, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+   { 37367, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
+   { 37401, 0x0000862C }, /* GL_TRANSPOSE_NV */
+   { 37417, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+   { 37448, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
+   { 37483, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+   { 37511, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
+   { 37543, 0x00000004 }, /* GL_TRIANGLES */
+   { 37556, 0x00000006 }, /* GL_TRIANGLE_FAN */
+   { 37572, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
+   { 37593, 0x00000005 }, /* GL_TRIANGLE_STRIP */
+   { 37611, 0x00000001 }, /* GL_TRUE */
+   { 37619, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
+   { 37639, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
+   { 37662, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
+   { 37682, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
+   { 37703, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
+   { 37725, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
+   { 37747, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
+   { 37767, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
+   { 37788, 0x00009118 }, /* GL_UNSIGNALED */
+   { 37802, 0x00001401 }, /* GL_UNSIGNED_BYTE */
+   { 37819, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+   { 37846, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
+   { 37869, 0x00001405 }, /* GL_UNSIGNED_INT */
+   { 37885, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
+   { 37912, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */
+   { 37933, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
+   { 37957, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+   { 37988, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
+   { 38012, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+   { 38040, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */
+   { 38063, 0x00001403 }, /* GL_UNSIGNED_SHORT */
+   { 38081, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+   { 38111, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+   { 38137, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+   { 38167, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+   { 38193, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
+   { 38217, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+   { 38245, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+   { 38273, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
+   { 38300, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+   { 38332, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
+   { 38363, 0x00008CA2 }, /* GL_UPPER_LEFT */
+   { 38377, 0x00002A20 }, /* GL_V2F */
+   { 38384, 0x00002A21 }, /* GL_V3F */
+   { 38391, 0x00008B83 }, /* GL_VALIDATE_STATUS */
+   { 38410, 0x00001F00 }, /* GL_VENDOR */
+   { 38420, 0x00001F02 }, /* GL_VERSION */
+   { 38431, 0x00008074 }, /* GL_VERTEX_ARRAY */
+   { 38447, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING */
+   { 38471, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
+   { 38501, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+   { 38532, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
+   { 38567, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
+   { 38591, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
+   { 38612, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
+   { 38635, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
+   { 38656, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+   { 38683, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+   { 38711, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+   { 38739, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+   { 38767, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+   { 38795, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+   { 38823, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+   { 38851, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+   { 38878, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+   { 38905, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+   { 38932, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+   { 38959, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+   { 38986, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+   { 39013, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+   { 39040, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+   { 39067, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+   { 39094, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+   { 39132, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
+   { 39174, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+   { 39205, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
+   { 39240, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+   { 39274, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
+   { 39312, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+   { 39343, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
+   { 39378, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+   { 39406, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
+   { 39438, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+   { 39468, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
+   { 39502, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+   { 39530, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
+   { 39562, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
+   { 39582, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
+   { 39604, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
+   { 39633, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
+   { 39654, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
+   { 39683, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
+   { 39716, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
+   { 39748, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+   { 39775, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
+   { 39806, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
+   { 39836, 0x00008B31 }, /* GL_VERTEX_SHADER */
+   { 39853, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
+   { 39874, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
+   { 39901, 0x00000BA2 }, /* GL_VIEWPORT */
+   { 39913, 0x00000800 }, /* GL_VIEWPORT_BIT */
+   { 39929, 0x0000911D }, /* GL_WAIT_FAILED */
+   { 39944, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
+   { 39964, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+   { 39995, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
+   { 40030, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+   { 40058, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+   { 40083, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+   { 40110, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+   { 40135, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
+   { 40159, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
+   { 40178, 0x000088B9 }, /* GL_WRITE_ONLY */
+   { 40192, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
+   { 40210, 0x00001506 }, /* GL_XOR */
+   { 40217, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
+   { 40236, 0x00008757 }, /* GL_YCBCR_MESA */
+   { 40250, 0x00000000 }, /* GL_ZERO */
+   { 40258, 0x00000D16 }, /* GL_ZOOM_X */
+   { 40268, 0x00000D17 }, /* GL_ZOOM_Y */
 };
 
-static const unsigned reduced_enums[1333] =
+static const unsigned reduced_enums[1347] =
 {
-       473, /* GL_FALSE */
-       689, /* GL_LINES */
-       691, /* GL_LINE_LOOP */
-       698, /* GL_LINE_STRIP */
-      1730, /* GL_TRIANGLES */
-      1733, /* GL_TRIANGLE_STRIP */
-      1731, /* GL_TRIANGLE_FAN */
-      1267, /* GL_QUADS */
-      1270, /* GL_QUAD_STRIP */
-      1154, /* GL_POLYGON */
-      1166, /* GL_POLYGON_STIPPLE_BIT */
-      1115, /* GL_PIXEL_MODE_BIT */
-       676, /* GL_LIGHTING_BIT */
-       502, /* GL_FOG_BIT */
+       475, /* GL_FALSE */
+       691, /* GL_LINES */
+       693, /* GL_LINE_LOOP */
+       700, /* GL_LINE_STRIP */
+      1743, /* GL_TRIANGLES */
+      1746, /* GL_TRIANGLE_STRIP */
+      1744, /* GL_TRIANGLE_FAN */
+      1271, /* GL_QUADS */
+      1274, /* GL_QUAD_STRIP */
+      1158, /* GL_POLYGON */
+      1170, /* GL_POLYGON_STIPPLE_BIT */
+      1119, /* GL_PIXEL_MODE_BIT */
+       678, /* GL_LIGHTING_BIT */
+       504, /* GL_FOG_BIT */
          8, /* GL_ACCUM */
-       708, /* GL_LOAD */
-      1322, /* GL_RETURN */
-       988, /* GL_MULT */
+       710, /* GL_LOAD */
+      1326, /* GL_RETURN */
+       991, /* GL_MULT */
         23, /* GL_ADD */
-      1004, /* GL_NEVER */
-       666, /* GL_LESS */
-       463, /* GL_EQUAL */
-       665, /* GL_LEQUAL */
-       588, /* GL_GREATER */
-      1019, /* GL_NOTEQUAL */
-       587, /* GL_GEQUAL */
-        46, /* GL_ALWAYS */
-      1462, /* GL_SRC_COLOR */
-      1048, /* GL_ONE_MINUS_SRC_COLOR */
-      1460, /* GL_SRC_ALPHA */
-      1047, /* GL_ONE_MINUS_SRC_ALPHA */
-       442, /* GL_DST_ALPHA */
-      1045, /* GL_ONE_MINUS_DST_ALPHA */
-       443, /* GL_DST_COLOR */
-      1046, /* GL_ONE_MINUS_DST_COLOR */
-      1461, /* GL_SRC_ALPHA_SATURATE */
-       575, /* GL_FRONT_LEFT */
-       576, /* GL_FRONT_RIGHT */
-        68, /* GL_BACK_LEFT */
-        69, /* GL_BACK_RIGHT */
-       572, /* GL_FRONT */
-        67, /* GL_BACK */
-       664, /* GL_LEFT */
-      1364, /* GL_RIGHT */
-       573, /* GL_FRONT_AND_BACK */
-        62, /* GL_AUX0 */
-        63, /* GL_AUX1 */
-        64, /* GL_AUX2 */
-        65, /* GL_AUX3 */
-       654, /* GL_INVALID_ENUM */
-       658, /* GL_INVALID_VALUE */
-       657, /* GL_INVALID_OPERATION */
-      1467, /* GL_STACK_OVERFLOW */
-      1468, /* GL_STACK_UNDERFLOW */
-      1073, /* GL_OUT_OF_MEMORY */
-       655, /* GL_INVALID_FRAMEBUFFER_OPERATION */
+      1007, /* GL_NEVER */
+       668, /* GL_LESS */
+       465, /* GL_EQUAL */
+       667, /* GL_LEQUAL */
+       590, /* GL_GREATER */
+      1022, /* GL_NOTEQUAL */
+       589, /* GL_GEQUAL */
+        47, /* GL_ALWAYS */
+      1467, /* GL_SRC_COLOR */
+      1052, /* GL_ONE_MINUS_SRC_COLOR */
+      1465, /* GL_SRC_ALPHA */
+      1051, /* GL_ONE_MINUS_SRC_ALPHA */
+       444, /* GL_DST_ALPHA */
+      1049, /* GL_ONE_MINUS_DST_ALPHA */
+       445, /* GL_DST_COLOR */
+      1050, /* GL_ONE_MINUS_DST_COLOR */
+      1466, /* GL_SRC_ALPHA_SATURATE */
+       577, /* GL_FRONT_LEFT */
+       578, /* GL_FRONT_RIGHT */
+        69, /* GL_BACK_LEFT */
+        70, /* GL_BACK_RIGHT */
+       574, /* GL_FRONT */
+        68, /* GL_BACK */
+       666, /* GL_LEFT */
+      1368, /* GL_RIGHT */
+       575, /* GL_FRONT_AND_BACK */
+        63, /* GL_AUX0 */
+        64, /* GL_AUX1 */
+        65, /* GL_AUX2 */
+        66, /* GL_AUX3 */
+       656, /* GL_INVALID_ENUM */
+       660, /* GL_INVALID_VALUE */
+       659, /* GL_INVALID_OPERATION */
+      1472, /* GL_STACK_OVERFLOW */
+      1473, /* GL_STACK_UNDERFLOW */
+      1077, /* GL_OUT_OF_MEMORY */
+       657, /* GL_INVALID_FRAMEBUFFER_OPERATION */
          0, /* GL_2D */
          2, /* GL_3D */
          3, /* GL_3D_COLOR */
          4, /* GL_3D_COLOR_TEXTURE */
          6, /* GL_4D_COLOR_TEXTURE */
-      1093, /* GL_PASS_THROUGH_TOKEN */
-      1153, /* GL_POINT_TOKEN */
-       699, /* GL_LINE_TOKEN */
-      1167, /* GL_POLYGON_TOKEN */
-        73, /* GL_BITMAP_TOKEN */
-       441, /* GL_DRAW_PIXEL_TOKEN */
-       299, /* GL_COPY_PIXEL_TOKEN */
-       692, /* GL_LINE_RESET_TOKEN */
-       466, /* GL_EXP */
-       467, /* GL_EXP2 */
-       335, /* GL_CW */
-       124, /* GL_CCW */
-       145, /* GL_COEFF */
-      1070, /* GL_ORDER */
-       379, /* GL_DOMAIN */
-       309, /* GL_CURRENT_COLOR */
-       312, /* GL_CURRENT_INDEX */
-       318, /* GL_CURRENT_NORMAL */
-       331, /* GL_CURRENT_TEXTURE_COORDS */
-       323, /* GL_CURRENT_RASTER_COLOR */
-       325, /* GL_CURRENT_RASTER_INDEX */
-       329, /* GL_CURRENT_RASTER_TEXTURE_COORDS */
-       326, /* GL_CURRENT_RASTER_POSITION */
-       327, /* GL_CURRENT_RASTER_POSITION_VALID */
-       324, /* GL_CURRENT_RASTER_DISTANCE */
-      1146, /* GL_POINT_SMOOTH */
-      1135, /* GL_POINT_SIZE */
-      1145, /* GL_POINT_SIZE_RANGE */
-      1136, /* GL_POINT_SIZE_GRANULARITY */
-       693, /* GL_LINE_SMOOTH */
-       700, /* GL_LINE_WIDTH */
-       702, /* GL_LINE_WIDTH_RANGE */
-       701, /* GL_LINE_WIDTH_GRANULARITY */
-       695, /* GL_LINE_STIPPLE */
-       696, /* GL_LINE_STIPPLE_PATTERN */
-       697, /* GL_LINE_STIPPLE_REPEAT */
-       707, /* GL_LIST_MODE */
-       872, /* GL_MAX_LIST_NESTING */
-       704, /* GL_LIST_BASE */
-       706, /* GL_LIST_INDEX */
-      1156, /* GL_POLYGON_MODE */
-      1163, /* GL_POLYGON_SMOOTH */
-      1165, /* GL_POLYGON_STIPPLE */
-       452, /* GL_EDGE_FLAG */
-       302, /* GL_CULL_FACE */
-       303, /* GL_CULL_FACE_MODE */
-       574, /* GL_FRONT_FACE */
-       675, /* GL_LIGHTING */
-       680, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
-       681, /* GL_LIGHT_MODEL_TWO_SIDE */
-       677, /* GL_LIGHT_MODEL_AMBIENT */
-      1410, /* GL_SHADE_MODEL */
-       192, /* GL_COLOR_MATERIAL_FACE */
-       193, /* GL_COLOR_MATERIAL_PARAMETER */
-       191, /* GL_COLOR_MATERIAL */
-       501, /* GL_FOG */
-       523, /* GL_FOG_INDEX */
-       519, /* GL_FOG_DENSITY */
-       527, /* GL_FOG_START */
-       521, /* GL_FOG_END */
-       524, /* GL_FOG_MODE */
-       503, /* GL_FOG_COLOR */
-       366, /* GL_DEPTH_RANGE */
-       373, /* GL_DEPTH_TEST */
-       376, /* GL_DEPTH_WRITEMASK */
-       354, /* GL_DEPTH_CLEAR_VALUE */
-       365, /* GL_DEPTH_FUNC */
+      1097, /* GL_PASS_THROUGH_TOKEN */
+      1157, /* GL_POINT_TOKEN */
+       701, /* GL_LINE_TOKEN */
+      1171, /* GL_POLYGON_TOKEN */
+        74, /* GL_BITMAP_TOKEN */
+       443, /* GL_DRAW_PIXEL_TOKEN */
+       301, /* GL_COPY_PIXEL_TOKEN */
+       694, /* GL_LINE_RESET_TOKEN */
+       468, /* GL_EXP */
+       469, /* GL_EXP2 */
+       337, /* GL_CW */
+       125, /* GL_CCW */
+       146, /* GL_COEFF */
+      1074, /* GL_ORDER */
+       381, /* GL_DOMAIN */
+       311, /* GL_CURRENT_COLOR */
+       314, /* GL_CURRENT_INDEX */
+       320, /* GL_CURRENT_NORMAL */
+       333, /* GL_CURRENT_TEXTURE_COORDS */
+       325, /* GL_CURRENT_RASTER_COLOR */
+       327, /* GL_CURRENT_RASTER_INDEX */
+       331, /* GL_CURRENT_RASTER_TEXTURE_COORDS */
+       328, /* GL_CURRENT_RASTER_POSITION */
+       329, /* GL_CURRENT_RASTER_POSITION_VALID */
+       326, /* GL_CURRENT_RASTER_DISTANCE */
+      1150, /* GL_POINT_SMOOTH */
+      1139, /* GL_POINT_SIZE */
+      1149, /* GL_POINT_SIZE_RANGE */
+      1140, /* GL_POINT_SIZE_GRANULARITY */
+       695, /* GL_LINE_SMOOTH */
+       702, /* GL_LINE_WIDTH */
+       704, /* GL_LINE_WIDTH_RANGE */
+       703, /* GL_LINE_WIDTH_GRANULARITY */
+       697, /* GL_LINE_STIPPLE */
+       698, /* GL_LINE_STIPPLE_PATTERN */
+       699, /* GL_LINE_STIPPLE_REPEAT */
+       709, /* GL_LIST_MODE */
+       874, /* GL_MAX_LIST_NESTING */
+       706, /* GL_LIST_BASE */
+       708, /* GL_LIST_INDEX */
+      1160, /* GL_POLYGON_MODE */
+      1167, /* GL_POLYGON_SMOOTH */
+      1169, /* GL_POLYGON_STIPPLE */
+       454, /* GL_EDGE_FLAG */
+       304, /* GL_CULL_FACE */
+       305, /* GL_CULL_FACE_MODE */
+       576, /* GL_FRONT_FACE */
+       677, /* GL_LIGHTING */
+       682, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
+       683, /* GL_LIGHT_MODEL_TWO_SIDE */
+       679, /* GL_LIGHT_MODEL_AMBIENT */
+      1414, /* GL_SHADE_MODEL */
+       193, /* GL_COLOR_MATERIAL_FACE */
+       194, /* GL_COLOR_MATERIAL_PARAMETER */
+       192, /* GL_COLOR_MATERIAL */
+       503, /* GL_FOG */
+       525, /* GL_FOG_INDEX */
+       521, /* GL_FOG_DENSITY */
+       529, /* GL_FOG_START */
+       523, /* GL_FOG_END */
+       526, /* GL_FOG_MODE */
+       505, /* GL_FOG_COLOR */
+       368, /* GL_DEPTH_RANGE */
+       375, /* GL_DEPTH_TEST */
+       378, /* GL_DEPTH_WRITEMASK */
+       356, /* GL_DEPTH_CLEAR_VALUE */
+       367, /* GL_DEPTH_FUNC */
         12, /* GL_ACCUM_CLEAR_VALUE */
-      1503, /* GL_STENCIL_TEST */
-      1491, /* GL_STENCIL_CLEAR_VALUE */
-      1493, /* GL_STENCIL_FUNC */
-      1505, /* GL_STENCIL_VALUE_MASK */
-      1492, /* GL_STENCIL_FAIL */
-      1500, /* GL_STENCIL_PASS_DEPTH_FAIL */
-      1501, /* GL_STENCIL_PASS_DEPTH_PASS */
-      1502, /* GL_STENCIL_REF */
-      1506, /* GL_STENCIL_WRITEMASK */
-       841, /* GL_MATRIX_MODE */
-      1009, /* GL_NORMALIZE */
-      1823, /* GL_VIEWPORT */
-       983, /* GL_MODELVIEW_STACK_DEPTH */
-      1246, /* GL_PROJECTION_STACK_DEPTH */
-      1707, /* GL_TEXTURE_STACK_DEPTH */
-       981, /* GL_MODELVIEW_MATRIX */
-      1245, /* GL_PROJECTION_MATRIX */
-      1690, /* GL_TEXTURE_MATRIX */
-        60, /* GL_ATTRIB_STACK_DEPTH */
-       135, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
+      1508, /* GL_STENCIL_TEST */
+      1496, /* GL_STENCIL_CLEAR_VALUE */
+      1498, /* GL_STENCIL_FUNC */
+      1510, /* GL_STENCIL_VALUE_MASK */
+      1497, /* GL_STENCIL_FAIL */
+      1505, /* GL_STENCIL_PASS_DEPTH_FAIL */
+      1506, /* GL_STENCIL_PASS_DEPTH_PASS */
+      1507, /* GL_STENCIL_REF */
+      1511, /* GL_STENCIL_WRITEMASK */
+       843, /* GL_MATRIX_MODE */
+      1012, /* GL_NORMALIZE */
+      1837, /* GL_VIEWPORT */
+       986, /* GL_MODELVIEW_STACK_DEPTH */
+      1250, /* GL_PROJECTION_STACK_DEPTH */
+      1718, /* GL_TEXTURE_STACK_DEPTH */
+       984, /* GL_MODELVIEW_MATRIX */
+      1249, /* GL_PROJECTION_MATRIX */
+      1701, /* GL_TEXTURE_MATRIX */
+        61, /* GL_ATTRIB_STACK_DEPTH */
+       136, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
         43, /* GL_ALPHA_TEST */
         44, /* GL_ALPHA_TEST_FUNC */
         45, /* GL_ALPHA_TEST_REF */
-       378, /* GL_DITHER */
-        77, /* GL_BLEND_DST */
-        86, /* GL_BLEND_SRC */
-        74, /* GL_BLEND */
-       710, /* GL_LOGIC_OP_MODE */
-       628, /* GL_INDEX_LOGIC_OP */
-       190, /* GL_COLOR_LOGIC_OP */
-        66, /* GL_AUX_BUFFERS */
-       389, /* GL_DRAW_BUFFER */
-      1280, /* GL_READ_BUFFER */
-      1391, /* GL_SCISSOR_BOX */
-      1392, /* GL_SCISSOR_TEST */
-       627, /* GL_INDEX_CLEAR_VALUE */
-       632, /* GL_INDEX_WRITEMASK */
-       187, /* GL_COLOR_CLEAR_VALUE */
-       229, /* GL_COLOR_WRITEMASK */
-       629, /* GL_INDEX_MODE */
-      1357, /* GL_RGBA_MODE */
-       388, /* GL_DOUBLEBUFFER */
-      1507, /* GL_STEREO */
-      1315, /* GL_RENDER_MODE */
-      1094, /* GL_PERSPECTIVE_CORRECTION_HINT */
-      1147, /* GL_POINT_SMOOTH_HINT */
-       694, /* GL_LINE_SMOOTH_HINT */
-      1164, /* GL_POLYGON_SMOOTH_HINT */
-       522, /* GL_FOG_HINT */
-      1671, /* GL_TEXTURE_GEN_S */
-      1672, /* GL_TEXTURE_GEN_T */
-      1670, /* GL_TEXTURE_GEN_R */
-      1669, /* GL_TEXTURE_GEN_Q */
-      1107, /* GL_PIXEL_MAP_I_TO_I */
-      1113, /* GL_PIXEL_MAP_S_TO_S */
-      1109, /* GL_PIXEL_MAP_I_TO_R */
-      1105, /* GL_PIXEL_MAP_I_TO_G */
-      1103, /* GL_PIXEL_MAP_I_TO_B */
-      1101, /* GL_PIXEL_MAP_I_TO_A */
-      1111, /* GL_PIXEL_MAP_R_TO_R */
-      1099, /* GL_PIXEL_MAP_G_TO_G */
-      1097, /* GL_PIXEL_MAP_B_TO_B */
-      1095, /* GL_PIXEL_MAP_A_TO_A */
-      1108, /* GL_PIXEL_MAP_I_TO_I_SIZE */
-      1114, /* GL_PIXEL_MAP_S_TO_S_SIZE */
-      1110, /* GL_PIXEL_MAP_I_TO_R_SIZE */
-      1106, /* GL_PIXEL_MAP_I_TO_G_SIZE */
-      1104, /* GL_PIXEL_MAP_I_TO_B_SIZE */
-      1102, /* GL_PIXEL_MAP_I_TO_A_SIZE */
-      1112, /* GL_PIXEL_MAP_R_TO_R_SIZE */
-      1100, /* GL_PIXEL_MAP_G_TO_G_SIZE */
-      1098, /* GL_PIXEL_MAP_B_TO_B_SIZE */
-      1096, /* GL_PIXEL_MAP_A_TO_A_SIZE */
-      1742, /* GL_UNPACK_SWAP_BYTES */
-      1737, /* GL_UNPACK_LSB_FIRST */
-      1738, /* GL_UNPACK_ROW_LENGTH */
-      1741, /* GL_UNPACK_SKIP_ROWS */
-      1740, /* GL_UNPACK_SKIP_PIXELS */
-      1735, /* GL_UNPACK_ALIGNMENT */
-      1082, /* GL_PACK_SWAP_BYTES */
-      1077, /* GL_PACK_LSB_FIRST */
-      1078, /* GL_PACK_ROW_LENGTH */
-      1081, /* GL_PACK_SKIP_ROWS */
-      1080, /* GL_PACK_SKIP_PIXELS */
-      1074, /* GL_PACK_ALIGNMENT */
-       788, /* GL_MAP_COLOR */
-       793, /* GL_MAP_STENCIL */
-       631, /* GL_INDEX_SHIFT */
-       630, /* GL_INDEX_OFFSET */
-      1293, /* GL_RED_SCALE */
-      1291, /* GL_RED_BIAS */
-      1840, /* GL_ZOOM_X */
-      1841, /* GL_ZOOM_Y */
-       592, /* GL_GREEN_SCALE */
-       590, /* GL_GREEN_BIAS */
-        92, /* GL_BLUE_SCALE */
-        90, /* GL_BLUE_BIAS */
+       380, /* GL_DITHER */
+        78, /* GL_BLEND_DST */
+        87, /* GL_BLEND_SRC */
+        75, /* GL_BLEND */
+       712, /* GL_LOGIC_OP_MODE */
+       630, /* GL_INDEX_LOGIC_OP */
+       191, /* GL_COLOR_LOGIC_OP */
+        67, /* GL_AUX_BUFFERS */
+       391, /* GL_DRAW_BUFFER */
+      1284, /* GL_READ_BUFFER */
+      1395, /* GL_SCISSOR_BOX */
+      1396, /* GL_SCISSOR_TEST */
+       629, /* GL_INDEX_CLEAR_VALUE */
+       634, /* GL_INDEX_WRITEMASK */
+       188, /* GL_COLOR_CLEAR_VALUE */
+       230, /* GL_COLOR_WRITEMASK */
+       631, /* GL_INDEX_MODE */
+      1361, /* GL_RGBA_MODE */
+       390, /* GL_DOUBLEBUFFER */
+      1512, /* GL_STEREO */
+      1319, /* GL_RENDER_MODE */
+      1098, /* GL_PERSPECTIVE_CORRECTION_HINT */
+      1151, /* GL_POINT_SMOOTH_HINT */
+       696, /* GL_LINE_SMOOTH_HINT */
+      1168, /* GL_POLYGON_SMOOTH_HINT */
+       524, /* GL_FOG_HINT */
+      1682, /* GL_TEXTURE_GEN_S */
+      1683, /* GL_TEXTURE_GEN_T */
+      1681, /* GL_TEXTURE_GEN_R */
+      1680, /* GL_TEXTURE_GEN_Q */
+      1111, /* GL_PIXEL_MAP_I_TO_I */
+      1117, /* GL_PIXEL_MAP_S_TO_S */
+      1113, /* GL_PIXEL_MAP_I_TO_R */
+      1109, /* GL_PIXEL_MAP_I_TO_G */
+      1107, /* GL_PIXEL_MAP_I_TO_B */
+      1105, /* GL_PIXEL_MAP_I_TO_A */
+      1115, /* GL_PIXEL_MAP_R_TO_R */
+      1103, /* GL_PIXEL_MAP_G_TO_G */
+      1101, /* GL_PIXEL_MAP_B_TO_B */
+      1099, /* GL_PIXEL_MAP_A_TO_A */
+      1112, /* GL_PIXEL_MAP_I_TO_I_SIZE */
+      1118, /* GL_PIXEL_MAP_S_TO_S_SIZE */
+      1114, /* GL_PIXEL_MAP_I_TO_R_SIZE */
+      1110, /* GL_PIXEL_MAP_I_TO_G_SIZE */
+      1108, /* GL_PIXEL_MAP_I_TO_B_SIZE */
+      1106, /* GL_PIXEL_MAP_I_TO_A_SIZE */
+      1116, /* GL_PIXEL_MAP_R_TO_R_SIZE */
+      1104, /* GL_PIXEL_MAP_G_TO_G_SIZE */
+      1102, /* GL_PIXEL_MAP_B_TO_B_SIZE */
+      1100, /* GL_PIXEL_MAP_A_TO_A_SIZE */
+      1755, /* GL_UNPACK_SWAP_BYTES */
+      1750, /* GL_UNPACK_LSB_FIRST */
+      1751, /* GL_UNPACK_ROW_LENGTH */
+      1754, /* GL_UNPACK_SKIP_ROWS */
+      1753, /* GL_UNPACK_SKIP_PIXELS */
+      1748, /* GL_UNPACK_ALIGNMENT */
+      1086, /* GL_PACK_SWAP_BYTES */
+      1081, /* GL_PACK_LSB_FIRST */
+      1082, /* GL_PACK_ROW_LENGTH */
+      1085, /* GL_PACK_SKIP_ROWS */
+      1084, /* GL_PACK_SKIP_PIXELS */
+      1078, /* GL_PACK_ALIGNMENT */
+       790, /* GL_MAP_COLOR */
+       795, /* GL_MAP_STENCIL */
+       633, /* GL_INDEX_SHIFT */
+       632, /* GL_INDEX_OFFSET */
+      1297, /* GL_RED_SCALE */
+      1295, /* GL_RED_BIAS */
+      1855, /* GL_ZOOM_X */
+      1856, /* GL_ZOOM_Y */
+       594, /* GL_GREEN_SCALE */
+       592, /* GL_GREEN_BIAS */
+        93, /* GL_BLUE_SCALE */
+        91, /* GL_BLUE_BIAS */
         42, /* GL_ALPHA_SCALE */
         40, /* GL_ALPHA_BIAS */
-       367, /* GL_DEPTH_SCALE */
-       348, /* GL_DEPTH_BIAS */
-       867, /* GL_MAX_EVAL_ORDER */
-       871, /* GL_MAX_LIGHTS */
-       850, /* GL_MAX_CLIP_PLANES */
-       916, /* GL_MAX_TEXTURE_SIZE */
-       877, /* GL_MAX_PIXEL_MAP_TABLE */
-       846, /* GL_MAX_ATTRIB_STACK_DEPTH */
-       874, /* GL_MAX_MODELVIEW_STACK_DEPTH */
-       875, /* GL_MAX_NAME_STACK_DEPTH */
-       903, /* GL_MAX_PROJECTION_STACK_DEPTH */
-       917, /* GL_MAX_TEXTURE_STACK_DEPTH */
-       931, /* GL_MAX_VIEWPORT_DIMS */
-       847, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
-      1517, /* GL_SUBPIXEL_BITS */
-       626, /* GL_INDEX_BITS */
-      1292, /* GL_RED_BITS */
-       591, /* GL_GREEN_BITS */
-        91, /* GL_BLUE_BITS */
+       369, /* GL_DEPTH_SCALE */
+       350, /* GL_DEPTH_BIAS */
+       869, /* GL_MAX_EVAL_ORDER */
+       873, /* GL_MAX_LIGHTS */
+       852, /* GL_MAX_CLIP_PLANES */
+       919, /* GL_MAX_TEXTURE_SIZE */
+       879, /* GL_MAX_PIXEL_MAP_TABLE */
+       848, /* GL_MAX_ATTRIB_STACK_DEPTH */
+       876, /* GL_MAX_MODELVIEW_STACK_DEPTH */
+       877, /* GL_MAX_NAME_STACK_DEPTH */
+       905, /* GL_MAX_PROJECTION_STACK_DEPTH */
+       920, /* GL_MAX_TEXTURE_STACK_DEPTH */
+       934, /* GL_MAX_VIEWPORT_DIMS */
+       849, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
+      1522, /* GL_SUBPIXEL_BITS */
+       628, /* GL_INDEX_BITS */
+      1296, /* GL_RED_BITS */
+       593, /* GL_GREEN_BITS */
+        92, /* GL_BLUE_BITS */
         41, /* GL_ALPHA_BITS */
-       349, /* GL_DEPTH_BITS */
-      1489, /* GL_STENCIL_BITS */
+       351, /* GL_DEPTH_BITS */
+      1494, /* GL_STENCIL_BITS */
         14, /* GL_ACCUM_RED_BITS */
         13, /* GL_ACCUM_GREEN_BITS */
         10, /* GL_ACCUM_BLUE_BITS */
          9, /* GL_ACCUM_ALPHA_BITS */
-       997, /* GL_NAME_STACK_DEPTH */
-        61, /* GL_AUTO_NORMAL */
-       734, /* GL_MAP1_COLOR_4 */
-       737, /* GL_MAP1_INDEX */
-       738, /* GL_MAP1_NORMAL */
-       739, /* GL_MAP1_TEXTURE_COORD_1 */
-       740, /* GL_MAP1_TEXTURE_COORD_2 */
-       741, /* GL_MAP1_TEXTURE_COORD_3 */
-       742, /* GL_MAP1_TEXTURE_COORD_4 */
-       743, /* GL_MAP1_VERTEX_3 */
-       744, /* GL_MAP1_VERTEX_4 */
-       761, /* GL_MAP2_COLOR_4 */
-       764, /* GL_MAP2_INDEX */
-       765, /* GL_MAP2_NORMAL */
-       766, /* GL_MAP2_TEXTURE_COORD_1 */
-       767, /* GL_MAP2_TEXTURE_COORD_2 */
-       768, /* GL_MAP2_TEXTURE_COORD_3 */
-       769, /* GL_MAP2_TEXTURE_COORD_4 */
-       770, /* GL_MAP2_VERTEX_3 */
-       771, /* GL_MAP2_VERTEX_4 */
-       735, /* GL_MAP1_GRID_DOMAIN */
-       736, /* GL_MAP1_GRID_SEGMENTS */
-       762, /* GL_MAP2_GRID_DOMAIN */
-       763, /* GL_MAP2_GRID_SEGMENTS */
-      1594, /* GL_TEXTURE_1D */
-      1596, /* GL_TEXTURE_2D */
-       476, /* GL_FEEDBACK_BUFFER_POINTER */
-       477, /* GL_FEEDBACK_BUFFER_SIZE */
-       478, /* GL_FEEDBACK_BUFFER_TYPE */
-      1401, /* GL_SELECTION_BUFFER_POINTER */
-      1402, /* GL_SELECTION_BUFFER_SIZE */
-      1712, /* GL_TEXTURE_WIDTH */
-      1676, /* GL_TEXTURE_HEIGHT */
-      1631, /* GL_TEXTURE_COMPONENTS */
-      1615, /* GL_TEXTURE_BORDER_COLOR */
-      1614, /* GL_TEXTURE_BORDER */
-       380, /* GL_DONT_CARE */
-       474, /* GL_FASTEST */
-      1005, /* GL_NICEST */
-        47, /* GL_AMBIENT */
-       377, /* GL_DIFFUSE */
-      1449, /* GL_SPECULAR */
-      1168, /* GL_POSITION */
-      1452, /* GL_SPOT_DIRECTION */
-      1453, /* GL_SPOT_EXPONENT */
-      1451, /* GL_SPOT_CUTOFF */
-       273, /* GL_CONSTANT_ATTENUATION */
-       684, /* GL_LINEAR_ATTENUATION */
-      1266, /* GL_QUADRATIC_ATTENUATION */
-       243, /* GL_COMPILE */
-       244, /* GL_COMPILE_AND_EXECUTE */
-       119, /* GL_BYTE */
-      1743, /* GL_UNSIGNED_BYTE */
-      1415, /* GL_SHORT */
-      1754, /* GL_UNSIGNED_SHORT */
-       634, /* GL_INT */
-      1746, /* GL_UNSIGNED_INT */
-       482, /* GL_FLOAT */
+      1000, /* GL_NAME_STACK_DEPTH */
+        62, /* GL_AUTO_NORMAL */
+       736, /* GL_MAP1_COLOR_4 */
+       739, /* GL_MAP1_INDEX */
+       740, /* GL_MAP1_NORMAL */
+       741, /* GL_MAP1_TEXTURE_COORD_1 */
+       742, /* GL_MAP1_TEXTURE_COORD_2 */
+       743, /* GL_MAP1_TEXTURE_COORD_3 */
+       744, /* GL_MAP1_TEXTURE_COORD_4 */
+       745, /* GL_MAP1_VERTEX_3 */
+       746, /* GL_MAP1_VERTEX_4 */
+       763, /* GL_MAP2_COLOR_4 */
+       766, /* GL_MAP2_INDEX */
+       767, /* GL_MAP2_NORMAL */
+       768, /* GL_MAP2_TEXTURE_COORD_1 */
+       769, /* GL_MAP2_TEXTURE_COORD_2 */
+       770, /* GL_MAP2_TEXTURE_COORD_3 */
+       771, /* GL_MAP2_TEXTURE_COORD_4 */
+       772, /* GL_MAP2_VERTEX_3 */
+       773, /* GL_MAP2_VERTEX_4 */
+       737, /* GL_MAP1_GRID_DOMAIN */
+       738, /* GL_MAP1_GRID_SEGMENTS */
+       764, /* GL_MAP2_GRID_DOMAIN */
+       765, /* GL_MAP2_GRID_SEGMENTS */
+      1605, /* GL_TEXTURE_1D */
+      1607, /* GL_TEXTURE_2D */
+       478, /* GL_FEEDBACK_BUFFER_POINTER */
+       479, /* GL_FEEDBACK_BUFFER_SIZE */
+       480, /* GL_FEEDBACK_BUFFER_TYPE */
+      1405, /* GL_SELECTION_BUFFER_POINTER */
+      1406, /* GL_SELECTION_BUFFER_SIZE */
+      1723, /* GL_TEXTURE_WIDTH */
+      1687, /* GL_TEXTURE_HEIGHT */
+      1642, /* GL_TEXTURE_COMPONENTS */
+      1626, /* GL_TEXTURE_BORDER_COLOR */
+      1625, /* GL_TEXTURE_BORDER */
+       382, /* GL_DONT_CARE */
+       476, /* GL_FASTEST */
+      1008, /* GL_NICEST */
+        48, /* GL_AMBIENT */
+       379, /* GL_DIFFUSE */
+      1454, /* GL_SPECULAR */
+      1172, /* GL_POSITION */
+      1457, /* GL_SPOT_DIRECTION */
+      1458, /* GL_SPOT_EXPONENT */
+      1456, /* GL_SPOT_CUTOFF */
+       275, /* GL_CONSTANT_ATTENUATION */
+       686, /* GL_LINEAR_ATTENUATION */
+      1270, /* GL_QUADRATIC_ATTENUATION */
+       244, /* GL_COMPILE */
+       245, /* GL_COMPILE_AND_EXECUTE */
+       120, /* GL_BYTE */
+      1757, /* GL_UNSIGNED_BYTE */
+      1419, /* GL_SHORT */
+      1768, /* GL_UNSIGNED_SHORT */
+       636, /* GL_INT */
+      1760, /* GL_UNSIGNED_INT */
+       484, /* GL_FLOAT */
          1, /* GL_2_BYTES */
          5, /* GL_3_BYTES */
          7, /* GL_4_BYTES */
-       387, /* GL_DOUBLE */
-       131, /* GL_CLEAR */
-        49, /* GL_AND */
-        51, /* GL_AND_REVERSE */
-       297, /* GL_COPY */
-        50, /* GL_AND_INVERTED */
-      1007, /* GL_NOOP */
-      1836, /* GL_XOR */
-      1069, /* GL_OR */
-      1008, /* GL_NOR */
-       464, /* GL_EQUIV */
-       661, /* GL_INVERT */
-      1072, /* GL_OR_REVERSE */
-       298, /* GL_COPY_INVERTED */
-      1071, /* GL_OR_INVERTED */
-       998, /* GL_NAND */
-      1406, /* GL_SET */
-       461, /* GL_EMISSION */
-      1414, /* GL_SHININESS */
-        48, /* GL_AMBIENT_AND_DIFFUSE */
-       189, /* GL_COLOR_INDEXES */
-       948, /* GL_MODELVIEW */
-      1244, /* GL_PROJECTION */
-      1529, /* GL_TEXTURE */
-       146, /* GL_COLOR */
-       344, /* GL_DEPTH */
-      1475, /* GL_STENCIL */
-       188, /* GL_COLOR_INDEX */
-      1494, /* GL_STENCIL_INDEX */
-       355, /* GL_DEPTH_COMPONENT */
-      1288, /* GL_RED */
-       589, /* GL_GREEN */
-        89, /* GL_BLUE */
+       389, /* GL_DOUBLE */
+       132, /* GL_CLEAR */
+        50, /* GL_AND */
+        52, /* GL_AND_REVERSE */
+       299, /* GL_COPY */
+        51, /* GL_AND_INVERTED */
+      1010, /* GL_NOOP */
+      1851, /* GL_XOR */
+      1073, /* GL_OR */
+      1011, /* GL_NOR */
+       466, /* GL_EQUIV */
+       663, /* GL_INVERT */
+      1076, /* GL_OR_REVERSE */
+       300, /* GL_COPY_INVERTED */
+      1075, /* GL_OR_INVERTED */
+      1001, /* GL_NAND */
+      1410, /* GL_SET */
+       463, /* GL_EMISSION */
+      1418, /* GL_SHININESS */
+        49, /* GL_AMBIENT_AND_DIFFUSE */
+       190, /* GL_COLOR_INDEXES */
+       951, /* GL_MODELVIEW */
+      1248, /* GL_PROJECTION */
+      1540, /* GL_TEXTURE */
+       147, /* GL_COLOR */
+       346, /* GL_DEPTH */
+      1480, /* GL_STENCIL */
+       189, /* GL_COLOR_INDEX */
+      1499, /* GL_STENCIL_INDEX */
+       357, /* GL_DEPTH_COMPONENT */
+      1292, /* GL_RED */
+       591, /* GL_GREEN */
+        90, /* GL_BLUE */
         31, /* GL_ALPHA */
-      1323, /* GL_RGB */
-      1342, /* GL_RGBA */
-       712, /* GL_LUMINANCE */
-       733, /* GL_LUMINANCE_ALPHA */
-        72, /* GL_BITMAP */
-      1124, /* GL_POINT */
-       682, /* GL_LINE */
-       479, /* GL_FILL */
-      1297, /* GL_RENDER */
-       475, /* GL_FEEDBACK */
-      1400, /* GL_SELECT */
-       481, /* GL_FLAT */
-      1424, /* GL_SMOOTH */
-       662, /* GL_KEEP */
-      1317, /* GL_REPLACE */
-       616, /* GL_INCR */
-       340, /* GL_DECR */
-      1769, /* GL_VENDOR */
-      1314, /* GL_RENDERER */
-      1770, /* GL_VERSION */
-       468, /* GL_EXTENSIONS */
-      1365, /* GL_S */
-      1520, /* GL_T */
-      1277, /* GL_R */
-      1265, /* GL_Q */
-       984, /* GL_MODULATE */
-       339, /* GL_DECAL */
-      1666, /* GL_TEXTURE_ENV_MODE */
-      1665, /* GL_TEXTURE_ENV_COLOR */
-      1664, /* GL_TEXTURE_ENV */
-       469, /* GL_EYE_LINEAR */
-      1031, /* GL_OBJECT_LINEAR */
-      1450, /* GL_SPHERE_MAP */
-      1668, /* GL_TEXTURE_GEN_MODE */
-      1033, /* GL_OBJECT_PLANE */
-       470, /* GL_EYE_PLANE */
-       999, /* GL_NEAREST */
-       683, /* GL_LINEAR */
-      1003, /* GL_NEAREST_MIPMAP_NEAREST */
-       688, /* GL_LINEAR_MIPMAP_NEAREST */
-      1002, /* GL_NEAREST_MIPMAP_LINEAR */
-       687, /* GL_LINEAR_MIPMAP_LINEAR */
-      1689, /* GL_TEXTURE_MAG_FILTER */
-      1697, /* GL_TEXTURE_MIN_FILTER */
-      1714, /* GL_TEXTURE_WRAP_S */
-      1715, /* GL_TEXTURE_WRAP_T */
-       125, /* GL_CLAMP */
-      1316, /* GL_REPEAT */
-      1162, /* GL_POLYGON_OFFSET_UNITS */
-      1161, /* GL_POLYGON_OFFSET_POINT */
-      1160, /* GL_POLYGON_OFFSET_LINE */
-      1278, /* GL_R3_G3_B2 */
-      1766, /* GL_V2F */
-      1767, /* GL_V3F */
-       122, /* GL_C4UB_V2F */
-       123, /* GL_C4UB_V3F */
-       120, /* GL_C3F_V3F */
-       996, /* GL_N3F_V3F */
-       121, /* GL_C4F_N3F_V3F */
-      1525, /* GL_T2F_V3F */
-      1527, /* GL_T4F_V4F */
-      1523, /* GL_T2F_C4UB_V3F */
-      1521, /* GL_T2F_C3F_V3F */
-      1524, /* GL_T2F_N3F_V3F */
-      1522, /* GL_T2F_C4F_N3F_V3F */
-      1526, /* GL_T4F_C4F_N3F_V4F */
-       138, /* GL_CLIP_PLANE0 */
-       139, /* GL_CLIP_PLANE1 */
-       140, /* GL_CLIP_PLANE2 */
-       141, /* GL_CLIP_PLANE3 */
-       142, /* GL_CLIP_PLANE4 */
-       143, /* GL_CLIP_PLANE5 */
-       667, /* GL_LIGHT0 */
-       668, /* GL_LIGHT1 */
-       669, /* GL_LIGHT2 */
-       670, /* GL_LIGHT3 */
-       671, /* GL_LIGHT4 */
-       672, /* GL_LIGHT5 */
-       673, /* GL_LIGHT6 */
-       674, /* GL_LIGHT7 */
-       593, /* GL_HINT_BIT */
-       275, /* GL_CONSTANT_COLOR */
-      1043, /* GL_ONE_MINUS_CONSTANT_COLOR */
-       270, /* GL_CONSTANT_ALPHA */
-      1041, /* GL_ONE_MINUS_CONSTANT_ALPHA */
-        75, /* GL_BLEND_COLOR */
-       577, /* GL_FUNC_ADD */
-       932, /* GL_MIN */
-       843, /* GL_MAX */
-        80, /* GL_BLEND_EQUATION */
-       581, /* GL_FUNC_SUBTRACT */
-       579, /* GL_FUNC_REVERSE_SUBTRACT */
-       278, /* GL_CONVOLUTION_1D */
-       279, /* GL_CONVOLUTION_2D */
-      1403, /* GL_SEPARABLE_2D */
-       282, /* GL_CONVOLUTION_BORDER_MODE */
-       286, /* GL_CONVOLUTION_FILTER_SCALE */
-       284, /* GL_CONVOLUTION_FILTER_BIAS */
-      1289, /* GL_REDUCE */
-       288, /* GL_CONVOLUTION_FORMAT */
-       292, /* GL_CONVOLUTION_WIDTH */
-       290, /* GL_CONVOLUTION_HEIGHT */
-       858, /* GL_MAX_CONVOLUTION_WIDTH */
-       856, /* GL_MAX_CONVOLUTION_HEIGHT */
-      1201, /* GL_POST_CONVOLUTION_RED_SCALE */
-      1197, /* GL_POST_CONVOLUTION_GREEN_SCALE */
-      1192, /* GL_POST_CONVOLUTION_BLUE_SCALE */
-      1188, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
-      1199, /* GL_POST_CONVOLUTION_RED_BIAS */
-      1195, /* GL_POST_CONVOLUTION_GREEN_BIAS */
-      1190, /* GL_POST_CONVOLUTION_BLUE_BIAS */
-      1186, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
-       594, /* GL_HISTOGRAM */
-      1249, /* GL_PROXY_HISTOGRAM */
-       610, /* GL_HISTOGRAM_WIDTH */
-       600, /* GL_HISTOGRAM_FORMAT */
-       606, /* GL_HISTOGRAM_RED_SIZE */
-       602, /* GL_HISTOGRAM_GREEN_SIZE */
-       597, /* GL_HISTOGRAM_BLUE_SIZE */
-       595, /* GL_HISTOGRAM_ALPHA_SIZE */
-       604, /* GL_HISTOGRAM_LUMINANCE_SIZE */
-       608, /* GL_HISTOGRAM_SINK */
-       933, /* GL_MINMAX */
-       935, /* GL_MINMAX_FORMAT */
-       937, /* GL_MINMAX_SINK */
-      1528, /* GL_TABLE_TOO_LARGE_EXT */
-      1745, /* GL_UNSIGNED_BYTE_3_3_2 */
-      1756, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-      1758, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-      1751, /* GL_UNSIGNED_INT_8_8_8_8 */
-      1747, /* GL_UNSIGNED_INT_10_10_10_2 */
-      1159, /* GL_POLYGON_OFFSET_FILL */
-      1158, /* GL_POLYGON_OFFSET_FACTOR */
-      1157, /* GL_POLYGON_OFFSET_BIAS */
-      1320, /* GL_RESCALE_NORMAL */
+      1327, /* GL_RGB */
+      1346, /* GL_RGBA */
+       714, /* GL_LUMINANCE */
+       735, /* GL_LUMINANCE_ALPHA */
+        73, /* GL_BITMAP */
+      1128, /* GL_POINT */
+       684, /* GL_LINE */
+       481, /* GL_FILL */
+      1301, /* GL_RENDER */
+       477, /* GL_FEEDBACK */
+      1404, /* GL_SELECT */
+       483, /* GL_FLAT */
+      1429, /* GL_SMOOTH */
+       664, /* GL_KEEP */
+      1321, /* GL_REPLACE */
+       618, /* GL_INCR */
+       342, /* GL_DECR */
+      1783, /* GL_VENDOR */
+      1318, /* GL_RENDERER */
+      1784, /* GL_VERSION */
+       470, /* GL_EXTENSIONS */
+      1369, /* GL_S */
+      1531, /* GL_T */
+      1281, /* GL_R */
+      1269, /* GL_Q */
+       987, /* GL_MODULATE */
+       341, /* GL_DECAL */
+      1677, /* GL_TEXTURE_ENV_MODE */
+      1676, /* GL_TEXTURE_ENV_COLOR */
+      1675, /* GL_TEXTURE_ENV */
+       471, /* GL_EYE_LINEAR */
+      1034, /* GL_OBJECT_LINEAR */
+      1455, /* GL_SPHERE_MAP */
+      1679, /* GL_TEXTURE_GEN_MODE */
+      1036, /* GL_OBJECT_PLANE */
+       472, /* GL_EYE_PLANE */
+      1002, /* GL_NEAREST */
+       685, /* GL_LINEAR */
+      1006, /* GL_NEAREST_MIPMAP_NEAREST */
+       690, /* GL_LINEAR_MIPMAP_NEAREST */
+      1005, /* GL_NEAREST_MIPMAP_LINEAR */
+       689, /* GL_LINEAR_MIPMAP_LINEAR */
+      1700, /* GL_TEXTURE_MAG_FILTER */
+      1708, /* GL_TEXTURE_MIN_FILTER */
+      1725, /* GL_TEXTURE_WRAP_S */
+      1726, /* GL_TEXTURE_WRAP_T */
+       126, /* GL_CLAMP */
+      1320, /* GL_REPEAT */
+      1166, /* GL_POLYGON_OFFSET_UNITS */
+      1165, /* GL_POLYGON_OFFSET_POINT */
+      1164, /* GL_POLYGON_OFFSET_LINE */
+      1282, /* GL_R3_G3_B2 */
+      1780, /* GL_V2F */
+      1781, /* GL_V3F */
+       123, /* GL_C4UB_V2F */
+       124, /* GL_C4UB_V3F */
+       121, /* GL_C3F_V3F */
+       999, /* GL_N3F_V3F */
+       122, /* GL_C4F_N3F_V3F */
+      1536, /* GL_T2F_V3F */
+      1538, /* GL_T4F_V4F */
+      1534, /* GL_T2F_C4UB_V3F */
+      1532, /* GL_T2F_C3F_V3F */
+      1535, /* GL_T2F_N3F_V3F */
+      1533, /* GL_T2F_C4F_N3F_V3F */
+      1537, /* GL_T4F_C4F_N3F_V4F */
+       139, /* GL_CLIP_PLANE0 */
+       140, /* GL_CLIP_PLANE1 */
+       141, /* GL_CLIP_PLANE2 */
+       142, /* GL_CLIP_PLANE3 */
+       143, /* GL_CLIP_PLANE4 */
+       144, /* GL_CLIP_PLANE5 */
+       669, /* GL_LIGHT0 */
+       670, /* GL_LIGHT1 */
+       671, /* GL_LIGHT2 */
+       672, /* GL_LIGHT3 */
+       673, /* GL_LIGHT4 */
+       674, /* GL_LIGHT5 */
+       675, /* GL_LIGHT6 */
+       676, /* GL_LIGHT7 */
+       595, /* GL_HINT_BIT */
+       277, /* GL_CONSTANT_COLOR */
+      1047, /* GL_ONE_MINUS_CONSTANT_COLOR */
+       272, /* GL_CONSTANT_ALPHA */
+      1045, /* GL_ONE_MINUS_CONSTANT_ALPHA */
+        76, /* GL_BLEND_COLOR */
+       579, /* GL_FUNC_ADD */
+       935, /* GL_MIN */
+       845, /* GL_MAX */
+        81, /* GL_BLEND_EQUATION */
+       583, /* GL_FUNC_SUBTRACT */
+       581, /* GL_FUNC_REVERSE_SUBTRACT */
+       280, /* GL_CONVOLUTION_1D */
+       281, /* GL_CONVOLUTION_2D */
+      1407, /* GL_SEPARABLE_2D */
+       284, /* GL_CONVOLUTION_BORDER_MODE */
+       288, /* GL_CONVOLUTION_FILTER_SCALE */
+       286, /* GL_CONVOLUTION_FILTER_BIAS */
+      1293, /* GL_REDUCE */
+       290, /* GL_CONVOLUTION_FORMAT */
+       294, /* GL_CONVOLUTION_WIDTH */
+       292, /* GL_CONVOLUTION_HEIGHT */
+       860, /* GL_MAX_CONVOLUTION_WIDTH */
+       858, /* GL_MAX_CONVOLUTION_HEIGHT */
+      1205, /* GL_POST_CONVOLUTION_RED_SCALE */
+      1201, /* GL_POST_CONVOLUTION_GREEN_SCALE */
+      1196, /* GL_POST_CONVOLUTION_BLUE_SCALE */
+      1192, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
+      1203, /* GL_POST_CONVOLUTION_RED_BIAS */
+      1199, /* GL_POST_CONVOLUTION_GREEN_BIAS */
+      1194, /* GL_POST_CONVOLUTION_BLUE_BIAS */
+      1190, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
+       596, /* GL_HISTOGRAM */
+      1253, /* GL_PROXY_HISTOGRAM */
+       612, /* GL_HISTOGRAM_WIDTH */
+       602, /* GL_HISTOGRAM_FORMAT */
+       608, /* GL_HISTOGRAM_RED_SIZE */
+       604, /* GL_HISTOGRAM_GREEN_SIZE */
+       599, /* GL_HISTOGRAM_BLUE_SIZE */
+       597, /* GL_HISTOGRAM_ALPHA_SIZE */
+       606, /* GL_HISTOGRAM_LUMINANCE_SIZE */
+       610, /* GL_HISTOGRAM_SINK */
+       936, /* GL_MINMAX */
+       938, /* GL_MINMAX_FORMAT */
+       940, /* GL_MINMAX_SINK */
+      1539, /* GL_TABLE_TOO_LARGE_EXT */
+      1759, /* GL_UNSIGNED_BYTE_3_3_2 */
+      1770, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+      1772, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+      1765, /* GL_UNSIGNED_INT_8_8_8_8 */
+      1761, /* GL_UNSIGNED_INT_10_10_10_2 */
+      1163, /* GL_POLYGON_OFFSET_FILL */
+      1162, /* GL_POLYGON_OFFSET_FACTOR */
+      1161, /* GL_POLYGON_OFFSET_BIAS */
+      1324, /* GL_RESCALE_NORMAL */
         36, /* GL_ALPHA4 */
         38, /* GL_ALPHA8 */
         32, /* GL_ALPHA12 */
         34, /* GL_ALPHA16 */
-       723, /* GL_LUMINANCE4 */
-       729, /* GL_LUMINANCE8 */
-       713, /* GL_LUMINANCE12 */
-       719, /* GL_LUMINANCE16 */
-       724, /* GL_LUMINANCE4_ALPHA4 */
-       727, /* GL_LUMINANCE6_ALPHA2 */
-       730, /* GL_LUMINANCE8_ALPHA8 */
-       716, /* GL_LUMINANCE12_ALPHA4 */
-       714, /* GL_LUMINANCE12_ALPHA12 */
-       720, /* GL_LUMINANCE16_ALPHA16 */
-       635, /* GL_INTENSITY */
-       640, /* GL_INTENSITY4 */
-       642, /* GL_INTENSITY8 */
-       636, /* GL_INTENSITY12 */
-       638, /* GL_INTENSITY16 */
-      1332, /* GL_RGB2_EXT */
-      1333, /* GL_RGB4 */
-      1336, /* GL_RGB5 */
-      1340, /* GL_RGB8 */
-      1324, /* GL_RGB10 */
-      1328, /* GL_RGB12 */
-      1330, /* GL_RGB16 */
-      1347, /* GL_RGBA2 */
-      1349, /* GL_RGBA4 */
-      1337, /* GL_RGB5_A1 */
-      1353, /* GL_RGBA8 */
-      1325, /* GL_RGB10_A2 */
-      1343, /* GL_RGBA12 */
-      1345, /* GL_RGBA16 */
-      1704, /* GL_TEXTURE_RED_SIZE */
-      1674, /* GL_TEXTURE_GREEN_SIZE */
-      1612, /* GL_TEXTURE_BLUE_SIZE */
-      1599, /* GL_TEXTURE_ALPHA_SIZE */
-      1687, /* GL_TEXTURE_LUMINANCE_SIZE */
-      1678, /* GL_TEXTURE_INTENSITY_SIZE */
-      1318, /* GL_REPLACE_EXT */
-      1253, /* GL_PROXY_TEXTURE_1D */
-      1256, /* GL_PROXY_TEXTURE_2D */
-      1710, /* GL_TEXTURE_TOO_LARGE_EXT */
-      1699, /* GL_TEXTURE_PRIORITY */
-      1706, /* GL_TEXTURE_RESIDENT */
-      1602, /* GL_TEXTURE_BINDING_1D */
-      1604, /* GL_TEXTURE_BINDING_2D */
-      1606, /* GL_TEXTURE_BINDING_3D */
-      1079, /* GL_PACK_SKIP_IMAGES */
-      1075, /* GL_PACK_IMAGE_HEIGHT */
-      1739, /* GL_UNPACK_SKIP_IMAGES */
-      1736, /* GL_UNPACK_IMAGE_HEIGHT */
-      1598, /* GL_TEXTURE_3D */
-      1259, /* GL_PROXY_TEXTURE_3D */
-      1661, /* GL_TEXTURE_DEPTH */
-      1713, /* GL_TEXTURE_WRAP_R */
-       844, /* GL_MAX_3D_TEXTURE_SIZE */
-      1771, /* GL_VERTEX_ARRAY */
-      1010, /* GL_NORMAL_ARRAY */
-       147, /* GL_COLOR_ARRAY */
-       620, /* GL_INDEX_ARRAY */
-      1639, /* GL_TEXTURE_COORD_ARRAY */
-       453, /* GL_EDGE_FLAG_ARRAY */
-      1777, /* GL_VERTEX_ARRAY_SIZE */
-      1779, /* GL_VERTEX_ARRAY_TYPE */
-      1778, /* GL_VERTEX_ARRAY_STRIDE */
-      1015, /* GL_NORMAL_ARRAY_TYPE */
-      1014, /* GL_NORMAL_ARRAY_STRIDE */
-       151, /* GL_COLOR_ARRAY_SIZE */
-       153, /* GL_COLOR_ARRAY_TYPE */
-       152, /* GL_COLOR_ARRAY_STRIDE */
-       625, /* GL_INDEX_ARRAY_TYPE */
-       624, /* GL_INDEX_ARRAY_STRIDE */
-      1643, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-      1645, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-      1644, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
-       457, /* GL_EDGE_FLAG_ARRAY_STRIDE */
-      1776, /* GL_VERTEX_ARRAY_POINTER */
-      1013, /* GL_NORMAL_ARRAY_POINTER */
-       150, /* GL_COLOR_ARRAY_POINTER */
-       623, /* GL_INDEX_ARRAY_POINTER */
-      1642, /* GL_TEXTURE_COORD_ARRAY_POINTER */
-       456, /* GL_EDGE_FLAG_ARRAY_POINTER */
-       989, /* GL_MULTISAMPLE */
-      1377, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
-      1379, /* GL_SAMPLE_ALPHA_TO_ONE */
-      1384, /* GL_SAMPLE_COVERAGE */
-      1381, /* GL_SAMPLE_BUFFERS */
-      1372, /* GL_SAMPLES */
-      1388, /* GL_SAMPLE_COVERAGE_VALUE */
-      1386, /* GL_SAMPLE_COVERAGE_INVERT */
-       194, /* GL_COLOR_MATRIX */
-       196, /* GL_COLOR_MATRIX_STACK_DEPTH */
-       852, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
-      1184, /* GL_POST_COLOR_MATRIX_RED_SCALE */
-      1180, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
-      1175, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
-      1171, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
-      1182, /* GL_POST_COLOR_MATRIX_RED_BIAS */
-      1178, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
-      1173, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
-      1169, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
-      1622, /* GL_TEXTURE_COLOR_TABLE_SGI */
-      1260, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
-      1624, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
-        79, /* GL_BLEND_DST_RGB */
-        88, /* GL_BLEND_SRC_RGB */
-        78, /* GL_BLEND_DST_ALPHA */
-        87, /* GL_BLEND_SRC_ALPHA */
-       200, /* GL_COLOR_TABLE */
-      1194, /* GL_POST_CONVOLUTION_COLOR_TABLE */
-      1177, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
-      1248, /* GL_PROXY_COLOR_TABLE */
-      1252, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
-      1251, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
-       224, /* GL_COLOR_TABLE_SCALE */
-       204, /* GL_COLOR_TABLE_BIAS */
-       209, /* GL_COLOR_TABLE_FORMAT */
-       226, /* GL_COLOR_TABLE_WIDTH */
-       221, /* GL_COLOR_TABLE_RED_SIZE */
-       212, /* GL_COLOR_TABLE_GREEN_SIZE */
-       206, /* GL_COLOR_TABLE_BLUE_SIZE */
-       201, /* GL_COLOR_TABLE_ALPHA_SIZE */
-       218, /* GL_COLOR_TABLE_LUMINANCE_SIZE */
-       215, /* GL_COLOR_TABLE_INTENSITY_SIZE */
-        70, /* GL_BGR */
-        71, /* GL_BGRA */
-       866, /* GL_MAX_ELEMENTS_VERTICES */
-       865, /* GL_MAX_ELEMENTS_INDICES */
-      1677, /* GL_TEXTURE_INDEX_SIZE_EXT */
-       144, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
-      1141, /* GL_POINT_SIZE_MIN */
-      1137, /* GL_POINT_SIZE_MAX */
-      1131, /* GL_POINT_FADE_THRESHOLD_SIZE */
-      1127, /* GL_POINT_DISTANCE_ATTENUATION */
-       126, /* GL_CLAMP_TO_BORDER */
-       129, /* GL_CLAMP_TO_EDGE */
-      1698, /* GL_TEXTURE_MIN_LOD */
-      1696, /* GL_TEXTURE_MAX_LOD */
-      1601, /* GL_TEXTURE_BASE_LEVEL */
-      1695, /* GL_TEXTURE_MAX_LEVEL */
-       613, /* GL_IGNORE_BORDER_HP */
-       274, /* GL_CONSTANT_BORDER_HP */
-      1319, /* GL_REPLICATE_BORDER_HP */
-       280, /* GL_CONVOLUTION_BORDER_COLOR */
-      1038, /* GL_OCCLUSION_TEST_HP */
-      1039, /* GL_OCCLUSION_TEST_RESULT_HP */
-       685, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
-      1616, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-      1618, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-      1620, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-      1621, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-      1619, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-      1617, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
-       848, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
-       849, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-      1204, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
-      1206, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
-      1203, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
-      1205, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
-      1685, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-      1686, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-      1684, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
-       583, /* GL_GENERATE_MIPMAP */
-       584, /* GL_GENERATE_MIPMAP_HINT */
-       525, /* GL_FOG_OFFSET_SGIX */
-       526, /* GL_FOG_OFFSET_VALUE_SGIX */
-      1630, /* GL_TEXTURE_COMPARE_SGIX */
-      1629, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-      1681, /* GL_TEXTURE_LEQUAL_R_SGIX */
-      1673, /* GL_TEXTURE_GEQUAL_R_SGIX */
-       356, /* GL_DEPTH_COMPONENT16 */
-       359, /* GL_DEPTH_COMPONENT24 */
-       362, /* GL_DEPTH_COMPONENT32 */
-       304, /* GL_CULL_VERTEX_EXT */
-       306, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
-       305, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
-      1833, /* GL_WRAP_BORDER_SUN */
-      1623, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
-       678, /* GL_LIGHT_MODEL_COLOR_CONTROL */
-      1417, /* GL_SINGLE_COLOR */
-      1404, /* GL_SEPARATE_SPECULAR_COLOR */
-      1413, /* GL_SHARED_TEXTURE_PALETTE_EXT */
-       536, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
-       537, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
-       544, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
-       539, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
-       535, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
-       534, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
-       538, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
-       545, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
-       556, /* GL_FRAMEBUFFER_DEFAULT */
-       569, /* GL_FRAMEBUFFER_UNDEFINED */
-       369, /* GL_DEPTH_STENCIL_ATTACHMENT */
-       619, /* GL_INDEX */
-      1744, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-      1759, /* GL_UNSIGNED_SHORT_5_6_5 */
-      1760, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-      1757, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-      1755, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-      1752, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-      1750, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-      1693, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-      1694, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-      1692, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
-       940, /* GL_MIRRORED_REPEAT */
-      1360, /* GL_RGB_S3TC */
-      1335, /* GL_RGB4_S3TC */
-      1358, /* GL_RGBA_S3TC */
-      1352, /* GL_RGBA4_S3TC */
-      1356, /* GL_RGBA_DXT5_S3TC */
-      1350, /* GL_RGBA4_DXT5_S3TC */
-       263, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
-       258, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
-       259, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
-       260, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */
-      1001, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
-      1000, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
-       686, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
-       512, /* GL_FOG_COORDINATE_SOURCE */
-       504, /* GL_FOG_COORD */
-       528, /* GL_FRAGMENT_DEPTH */
-       310, /* GL_CURRENT_FOG_COORD */
-       511, /* GL_FOG_COORDINATE_ARRAY_TYPE */
-       510, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
-       509, /* GL_FOG_COORDINATE_ARRAY_POINTER */
-       506, /* GL_FOG_COORDINATE_ARRAY */
-       198, /* GL_COLOR_SUM */
-       330, /* GL_CURRENT_SECONDARY_COLOR */
-      1397, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
-      1399, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
-      1398, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
-      1396, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
-      1393, /* GL_SECONDARY_COLOR_ARRAY */
-       328, /* GL_CURRENT_RASTER_SECONDARY_COLOR */
+       725, /* GL_LUMINANCE4 */
+       731, /* GL_LUMINANCE8 */
+       715, /* GL_LUMINANCE12 */
+       721, /* GL_LUMINANCE16 */
+       726, /* GL_LUMINANCE4_ALPHA4 */
+       729, /* GL_LUMINANCE6_ALPHA2 */
+       732, /* GL_LUMINANCE8_ALPHA8 */
+       718, /* GL_LUMINANCE12_ALPHA4 */
+       716, /* GL_LUMINANCE12_ALPHA12 */
+       722, /* GL_LUMINANCE16_ALPHA16 */
+       637, /* GL_INTENSITY */
+       642, /* GL_INTENSITY4 */
+       644, /* GL_INTENSITY8 */
+       638, /* GL_INTENSITY12 */
+       640, /* GL_INTENSITY16 */
+      1336, /* GL_RGB2_EXT */
+      1337, /* GL_RGB4 */
+      1340, /* GL_RGB5 */
+      1344, /* GL_RGB8 */
+      1328, /* GL_RGB10 */
+      1332, /* GL_RGB12 */
+      1334, /* GL_RGB16 */
+      1351, /* GL_RGBA2 */
+      1353, /* GL_RGBA4 */
+      1341, /* GL_RGB5_A1 */
+      1357, /* GL_RGBA8 */
+      1329, /* GL_RGB10_A2 */
+      1347, /* GL_RGBA12 */
+      1349, /* GL_RGBA16 */
+      1715, /* GL_TEXTURE_RED_SIZE */
+      1685, /* GL_TEXTURE_GREEN_SIZE */
+      1623, /* GL_TEXTURE_BLUE_SIZE */
+      1610, /* GL_TEXTURE_ALPHA_SIZE */
+      1698, /* GL_TEXTURE_LUMINANCE_SIZE */
+      1689, /* GL_TEXTURE_INTENSITY_SIZE */
+      1322, /* GL_REPLACE_EXT */
+      1257, /* GL_PROXY_TEXTURE_1D */
+      1260, /* GL_PROXY_TEXTURE_2D */
+      1721, /* GL_TEXTURE_TOO_LARGE_EXT */
+      1710, /* GL_TEXTURE_PRIORITY */
+      1717, /* GL_TEXTURE_RESIDENT */
+      1613, /* GL_TEXTURE_BINDING_1D */
+      1615, /* GL_TEXTURE_BINDING_2D */
+      1617, /* GL_TEXTURE_BINDING_3D */
+      1083, /* GL_PACK_SKIP_IMAGES */
+      1079, /* GL_PACK_IMAGE_HEIGHT */
+      1752, /* GL_UNPACK_SKIP_IMAGES */
+      1749, /* GL_UNPACK_IMAGE_HEIGHT */
+      1609, /* GL_TEXTURE_3D */
+      1263, /* GL_PROXY_TEXTURE_3D */
+      1672, /* GL_TEXTURE_DEPTH */
+      1724, /* GL_TEXTURE_WRAP_R */
+       846, /* GL_MAX_3D_TEXTURE_SIZE */
+      1785, /* GL_VERTEX_ARRAY */
+      1013, /* GL_NORMAL_ARRAY */
+       148, /* GL_COLOR_ARRAY */
+       622, /* GL_INDEX_ARRAY */
+      1650, /* GL_TEXTURE_COORD_ARRAY */
+       455, /* GL_EDGE_FLAG_ARRAY */
+      1791, /* GL_VERTEX_ARRAY_SIZE */
+      1793, /* GL_VERTEX_ARRAY_TYPE */
+      1792, /* GL_VERTEX_ARRAY_STRIDE */
+      1018, /* GL_NORMAL_ARRAY_TYPE */
+      1017, /* GL_NORMAL_ARRAY_STRIDE */
+       152, /* GL_COLOR_ARRAY_SIZE */
+       154, /* GL_COLOR_ARRAY_TYPE */
+       153, /* GL_COLOR_ARRAY_STRIDE */
+       627, /* GL_INDEX_ARRAY_TYPE */
+       626, /* GL_INDEX_ARRAY_STRIDE */
+      1654, /* GL_TEXTURE_COORD_ARRAY_SIZE */
+      1656, /* GL_TEXTURE_COORD_ARRAY_TYPE */
+      1655, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
+       459, /* GL_EDGE_FLAG_ARRAY_STRIDE */
+      1790, /* GL_VERTEX_ARRAY_POINTER */
+      1016, /* GL_NORMAL_ARRAY_POINTER */
+       151, /* GL_COLOR_ARRAY_POINTER */
+       625, /* GL_INDEX_ARRAY_POINTER */
+      1653, /* GL_TEXTURE_COORD_ARRAY_POINTER */
+       458, /* GL_EDGE_FLAG_ARRAY_POINTER */
+       992, /* GL_MULTISAMPLE */
+      1381, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
+      1383, /* GL_SAMPLE_ALPHA_TO_ONE */
+      1388, /* GL_SAMPLE_COVERAGE */
+      1385, /* GL_SAMPLE_BUFFERS */
+      1376, /* GL_SAMPLES */
+      1392, /* GL_SAMPLE_COVERAGE_VALUE */
+      1390, /* GL_SAMPLE_COVERAGE_INVERT */
+       195, /* GL_COLOR_MATRIX */
+       197, /* GL_COLOR_MATRIX_STACK_DEPTH */
+       854, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
+      1188, /* GL_POST_COLOR_MATRIX_RED_SCALE */
+      1184, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
+      1179, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
+      1175, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
+      1186, /* GL_POST_COLOR_MATRIX_RED_BIAS */
+      1182, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
+      1177, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
+      1173, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
+      1633, /* GL_TEXTURE_COLOR_TABLE_SGI */
+      1264, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
+      1635, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+        80, /* GL_BLEND_DST_RGB */
+        89, /* GL_BLEND_SRC_RGB */
+        79, /* GL_BLEND_DST_ALPHA */
+        88, /* GL_BLEND_SRC_ALPHA */
+       201, /* GL_COLOR_TABLE */
+      1198, /* GL_POST_CONVOLUTION_COLOR_TABLE */
+      1181, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
+      1252, /* GL_PROXY_COLOR_TABLE */
+      1256, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
+      1255, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
+       225, /* GL_COLOR_TABLE_SCALE */
+       205, /* GL_COLOR_TABLE_BIAS */
+       210, /* GL_COLOR_TABLE_FORMAT */
+       227, /* GL_COLOR_TABLE_WIDTH */
+       222, /* GL_COLOR_TABLE_RED_SIZE */
+       213, /* GL_COLOR_TABLE_GREEN_SIZE */
+       207, /* GL_COLOR_TABLE_BLUE_SIZE */
+       202, /* GL_COLOR_TABLE_ALPHA_SIZE */
+       219, /* GL_COLOR_TABLE_LUMINANCE_SIZE */
+       216, /* GL_COLOR_TABLE_INTENSITY_SIZE */
+        71, /* GL_BGR */
+        72, /* GL_BGRA */
+       868, /* GL_MAX_ELEMENTS_VERTICES */
+       867, /* GL_MAX_ELEMENTS_INDICES */
+      1688, /* GL_TEXTURE_INDEX_SIZE_EXT */
+       145, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
+      1145, /* GL_POINT_SIZE_MIN */
+      1141, /* GL_POINT_SIZE_MAX */
+      1135, /* GL_POINT_FADE_THRESHOLD_SIZE */
+      1131, /* GL_POINT_DISTANCE_ATTENUATION */
+       127, /* GL_CLAMP_TO_BORDER */
+       130, /* GL_CLAMP_TO_EDGE */
+      1709, /* GL_TEXTURE_MIN_LOD */
+      1707, /* GL_TEXTURE_MAX_LOD */
+      1612, /* GL_TEXTURE_BASE_LEVEL */
+      1706, /* GL_TEXTURE_MAX_LEVEL */
+       615, /* GL_IGNORE_BORDER_HP */
+       276, /* GL_CONSTANT_BORDER_HP */
+      1323, /* GL_REPLICATE_BORDER_HP */
+       282, /* GL_CONVOLUTION_BORDER_COLOR */
+      1042, /* GL_OCCLUSION_TEST_HP */
+      1043, /* GL_OCCLUSION_TEST_RESULT_HP */
+       687, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
+      1627, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
+      1629, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
+      1631, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
+      1632, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+      1630, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
+      1628, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
+       850, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
+       851, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+      1208, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
+      1210, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
+      1207, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
+      1209, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
+      1696, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+      1697, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+      1695, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+       585, /* GL_GENERATE_MIPMAP */
+       586, /* GL_GENERATE_MIPMAP_HINT */
+       527, /* GL_FOG_OFFSET_SGIX */
+       528, /* GL_FOG_OFFSET_VALUE_SGIX */
+      1641, /* GL_TEXTURE_COMPARE_SGIX */
+      1640, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
+      1692, /* GL_TEXTURE_LEQUAL_R_SGIX */
+      1684, /* GL_TEXTURE_GEQUAL_R_SGIX */
+       358, /* GL_DEPTH_COMPONENT16 */
+       361, /* GL_DEPTH_COMPONENT24 */
+       364, /* GL_DEPTH_COMPONENT32 */
+       306, /* GL_CULL_VERTEX_EXT */
+       308, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
+       307, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
+      1848, /* GL_WRAP_BORDER_SUN */
+      1634, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
+       680, /* GL_LIGHT_MODEL_COLOR_CONTROL */
+      1422, /* GL_SINGLE_COLOR */
+      1408, /* GL_SEPARATE_SPECULAR_COLOR */
+      1417, /* GL_SHARED_TEXTURE_PALETTE_EXT */
+       538, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
+       539, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
+       546, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
+       541, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
+       537, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
+       536, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
+       540, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
+       547, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
+       558, /* GL_FRAMEBUFFER_DEFAULT */
+       571, /* GL_FRAMEBUFFER_UNDEFINED */
+       371, /* GL_DEPTH_STENCIL_ATTACHMENT */
+       621, /* GL_INDEX */
+      1758, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+      1773, /* GL_UNSIGNED_SHORT_5_6_5 */
+      1774, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+      1771, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+      1769, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+      1766, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+      1764, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+      1704, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+      1705, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+      1703, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+       943, /* GL_MIRRORED_REPEAT */
+      1364, /* GL_RGB_S3TC */
+      1339, /* GL_RGB4_S3TC */
+      1362, /* GL_RGBA_S3TC */
+      1356, /* GL_RGBA4_S3TC */
+      1360, /* GL_RGBA_DXT5_S3TC */
+      1354, /* GL_RGBA4_DXT5_S3TC */
+       264, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
+       259, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
+       260, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
+       261, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */
+      1004, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
+      1003, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
+       688, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
+       514, /* GL_FOG_COORDINATE_SOURCE */
+       506, /* GL_FOG_COORD */
+       530, /* GL_FRAGMENT_DEPTH */
+       312, /* GL_CURRENT_FOG_COORD */
+       513, /* GL_FOG_COORDINATE_ARRAY_TYPE */
+       512, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
+       511, /* GL_FOG_COORDINATE_ARRAY_POINTER */
+       508, /* GL_FOG_COORDINATE_ARRAY */
+       199, /* GL_COLOR_SUM */
+       332, /* GL_CURRENT_SECONDARY_COLOR */
+      1401, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
+      1403, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
+      1402, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
+      1400, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
+      1397, /* GL_SECONDARY_COLOR_ARRAY */
+       330, /* GL_CURRENT_RASTER_SECONDARY_COLOR */
         28, /* GL_ALIASED_POINT_SIZE_RANGE */
         27, /* GL_ALIASED_LINE_WIDTH_RANGE */
-      1530, /* GL_TEXTURE0 */
-      1532, /* GL_TEXTURE1 */
-      1554, /* GL_TEXTURE2 */
-      1576, /* GL_TEXTURE3 */
-      1582, /* GL_TEXTURE4 */
-      1584, /* GL_TEXTURE5 */
-      1586, /* GL_TEXTURE6 */
-      1588, /* GL_TEXTURE7 */
-      1590, /* GL_TEXTURE8 */
-      1592, /* GL_TEXTURE9 */
-      1533, /* GL_TEXTURE10 */
-      1535, /* GL_TEXTURE11 */
-      1537, /* GL_TEXTURE12 */
-      1539, /* GL_TEXTURE13 */
-      1541, /* GL_TEXTURE14 */
-      1543, /* GL_TEXTURE15 */
-      1545, /* GL_TEXTURE16 */
-      1547, /* GL_TEXTURE17 */
-      1549, /* GL_TEXTURE18 */
-      1551, /* GL_TEXTURE19 */
-      1555, /* GL_TEXTURE20 */
-      1557, /* GL_TEXTURE21 */
-      1559, /* GL_TEXTURE22 */
-      1561, /* GL_TEXTURE23 */
-      1563, /* GL_TEXTURE24 */
-      1565, /* GL_TEXTURE25 */
-      1567, /* GL_TEXTURE26 */
-      1569, /* GL_TEXTURE27 */
-      1571, /* GL_TEXTURE28 */
-      1573, /* GL_TEXTURE29 */
-      1577, /* GL_TEXTURE30 */
-      1579, /* GL_TEXTURE31 */
+      1541, /* GL_TEXTURE0 */
+      1543, /* GL_TEXTURE1 */
+      1565, /* GL_TEXTURE2 */
+      1587, /* GL_TEXTURE3 */
+      1593, /* GL_TEXTURE4 */
+      1595, /* GL_TEXTURE5 */
+      1597, /* GL_TEXTURE6 */
+      1599, /* GL_TEXTURE7 */
+      1601, /* GL_TEXTURE8 */
+      1603, /* GL_TEXTURE9 */
+      1544, /* GL_TEXTURE10 */
+      1546, /* GL_TEXTURE11 */
+      1548, /* GL_TEXTURE12 */
+      1550, /* GL_TEXTURE13 */
+      1552, /* GL_TEXTURE14 */
+      1554, /* GL_TEXTURE15 */
+      1556, /* GL_TEXTURE16 */
+      1558, /* GL_TEXTURE17 */
+      1560, /* GL_TEXTURE18 */
+      1562, /* GL_TEXTURE19 */
+      1566, /* GL_TEXTURE20 */
+      1568, /* GL_TEXTURE21 */
+      1570, /* GL_TEXTURE22 */
+      1572, /* GL_TEXTURE23 */
+      1574, /* GL_TEXTURE24 */
+      1576, /* GL_TEXTURE25 */
+      1578, /* GL_TEXTURE26 */
+      1580, /* GL_TEXTURE27 */
+      1582, /* GL_TEXTURE28 */
+      1584, /* GL_TEXTURE29 */
+      1588, /* GL_TEXTURE30 */
+      1590, /* GL_TEXTURE31 */
         18, /* GL_ACTIVE_TEXTURE */
-       132, /* GL_CLIENT_ACTIVE_TEXTURE */
-       918, /* GL_MAX_TEXTURE_UNITS */
-      1723, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-      1726, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-      1728, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-      1720, /* GL_TRANSPOSE_COLOR_MATRIX */
-      1518, /* GL_SUBTRACT */
-       906, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
-       246, /* GL_COMPRESSED_ALPHA */
-       250, /* GL_COMPRESSED_LUMINANCE */
-       251, /* GL_COMPRESSED_LUMINANCE_ALPHA */
-       248, /* GL_COMPRESSED_INTENSITY */
-       254, /* GL_COMPRESSED_RGB */
-       255, /* GL_COMPRESSED_RGBA */
-      1637, /* GL_TEXTURE_COMPRESSION_HINT */
-      1702, /* GL_TEXTURE_RECTANGLE_ARB */
-      1609, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
-      1263, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
-       904, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
-       368, /* GL_DEPTH_STENCIL */
-      1748, /* GL_UNSIGNED_INT_24_8 */
-       914, /* GL_MAX_TEXTURE_LOD_BIAS */
-      1691, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
-       915, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
-      1667, /* GL_TEXTURE_FILTER_CONTROL */
-      1682, /* GL_TEXTURE_LOD_BIAS */
-       231, /* GL_COMBINE4 */
-       908, /* GL_MAX_SHININESS_NV */
-       909, /* GL_MAX_SPOT_EXPONENT_NV */
-       617, /* GL_INCR_WRAP */
-       341, /* GL_DECR_WRAP */
-       960, /* GL_MODELVIEW1_ARB */
-      1016, /* GL_NORMAL_MAP */
-      1294, /* GL_REFLECTION_MAP */
-      1646, /* GL_TEXTURE_CUBE_MAP */
-      1607, /* GL_TEXTURE_BINDING_CUBE_MAP */
-      1654, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-      1648, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-      1656, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-      1650, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-      1658, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-      1652, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
-      1261, /* GL_PROXY_TEXTURE_CUBE_MAP */
-       860, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
-       995, /* GL_MULTISAMPLE_FILTER_HINT_NV */
-       520, /* GL_FOG_DISTANCE_MODE_NV */
-       472, /* GL_EYE_RADIAL_NV */
-       471, /* GL_EYE_PLANE_ABSOLUTE_NV */
-       230, /* GL_COMBINE */
-       237, /* GL_COMBINE_RGB */
-       232, /* GL_COMBINE_ALPHA */
-      1361, /* GL_RGB_SCALE */
+       133, /* GL_CLIENT_ACTIVE_TEXTURE */
+       921, /* GL_MAX_TEXTURE_UNITS */
+      1736, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+      1739, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+      1741, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+      1733, /* GL_TRANSPOSE_COLOR_MATRIX */
+      1523, /* GL_SUBTRACT */
+       908, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
+       247, /* GL_COMPRESSED_ALPHA */
+       251, /* GL_COMPRESSED_LUMINANCE */
+       252, /* GL_COMPRESSED_LUMINANCE_ALPHA */
+       249, /* GL_COMPRESSED_INTENSITY */
+       255, /* GL_COMPRESSED_RGB */
+       256, /* GL_COMPRESSED_RGBA */
+      1648, /* GL_TEXTURE_COMPRESSION_HINT */
+      1713, /* GL_TEXTURE_RECTANGLE_ARB */
+      1620, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
+      1267, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
+       906, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
+       370, /* GL_DEPTH_STENCIL */
+      1762, /* GL_UNSIGNED_INT_24_8 */
+       917, /* GL_MAX_TEXTURE_LOD_BIAS */
+      1702, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+       918, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
+      1678, /* GL_TEXTURE_FILTER_CONTROL */
+      1693, /* GL_TEXTURE_LOD_BIAS */
+       232, /* GL_COMBINE4 */
+       911, /* GL_MAX_SHININESS_NV */
+       912, /* GL_MAX_SPOT_EXPONENT_NV */
+       619, /* GL_INCR_WRAP */
+       343, /* GL_DECR_WRAP */
+       963, /* GL_MODELVIEW1_ARB */
+      1019, /* GL_NORMAL_MAP */
+      1298, /* GL_REFLECTION_MAP */
+      1657, /* GL_TEXTURE_CUBE_MAP */
+      1618, /* GL_TEXTURE_BINDING_CUBE_MAP */
+      1665, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
+      1659, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
+      1667, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
+      1661, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
+      1669, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
+      1663, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
+      1265, /* GL_PROXY_TEXTURE_CUBE_MAP */
+       862, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
+       998, /* GL_MULTISAMPLE_FILTER_HINT_NV */
+       522, /* GL_FOG_DISTANCE_MODE_NV */
+       474, /* GL_EYE_RADIAL_NV */
+       473, /* GL_EYE_PLANE_ABSOLUTE_NV */
+       231, /* GL_COMBINE */
+       238, /* GL_COMBINE_RGB */
+       233, /* GL_COMBINE_ALPHA */
+      1365, /* GL_RGB_SCALE */
         24, /* GL_ADD_SIGNED */
-       645, /* GL_INTERPOLATE */
-       269, /* GL_CONSTANT */
-      1210, /* GL_PRIMARY_COLOR */
-      1207, /* GL_PREVIOUS */
-      1432, /* GL_SOURCE0_RGB */
-      1438, /* GL_SOURCE1_RGB */
-      1444, /* GL_SOURCE2_RGB */
-      1448, /* GL_SOURCE3_RGB_NV */
-      1429, /* GL_SOURCE0_ALPHA */
-      1435, /* GL_SOURCE1_ALPHA */
-      1441, /* GL_SOURCE2_ALPHA */
-      1447, /* GL_SOURCE3_ALPHA_NV */
-      1052, /* GL_OPERAND0_RGB */
-      1058, /* GL_OPERAND1_RGB */
-      1064, /* GL_OPERAND2_RGB */
-      1068, /* GL_OPERAND3_RGB_NV */
-      1049, /* GL_OPERAND0_ALPHA */
-      1055, /* GL_OPERAND1_ALPHA */
-      1061, /* GL_OPERAND2_ALPHA */
-      1067, /* GL_OPERAND3_ALPHA_NV */
-      1772, /* GL_VERTEX_ARRAY_BINDING */
-      1700, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
-      1701, /* GL_TEXTURE_RANGE_POINTER_APPLE */
-      1837, /* GL_YCBCR_422_APPLE */
-      1761, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-      1763, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-      1709, /* GL_TEXTURE_STORAGE_HINT_APPLE */
-      1509, /* GL_STORAGE_PRIVATE_APPLE */
-      1508, /* GL_STORAGE_CACHED_APPLE */
-      1510, /* GL_STORAGE_SHARED_APPLE */
-      1419, /* GL_SLICE_ACCUM_SUN */
-      1269, /* GL_QUAD_MESH_SUN */
-      1732, /* GL_TRIANGLE_MESH_SUN */
-      1811, /* GL_VERTEX_PROGRAM_ARB */
-      1822, /* GL_VERTEX_STATE_PROGRAM_NV */
-      1798, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-      1804, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-      1806, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-      1808, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
-       332, /* GL_CURRENT_VERTEX_ATTRIB */
-      1223, /* GL_PROGRAM_LENGTH_ARB */
-      1237, /* GL_PROGRAM_STRING_ARB */
-       982, /* GL_MODELVIEW_PROJECTION_NV */
-       612, /* GL_IDENTITY_NV */
-       659, /* GL_INVERSE_NV */
-      1725, /* GL_TRANSPOSE_NV */
-       660, /* GL_INVERSE_TRANSPOSE_NV */
-       890, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
-       889, /* GL_MAX_PROGRAM_MATRICES_ARB */
-       797, /* GL_MATRIX0_NV */
-       809, /* GL_MATRIX1_NV */
-       821, /* GL_MATRIX2_NV */
-       825, /* GL_MATRIX3_NV */
-       827, /* GL_MATRIX4_NV */
-       829, /* GL_MATRIX5_NV */
-       831, /* GL_MATRIX6_NV */
-       833, /* GL_MATRIX7_NV */
-       316, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
-       313, /* GL_CURRENT_MATRIX_ARB */
-      1814, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-      1817, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-      1235, /* GL_PROGRAM_PARAMETER_NV */
-      1802, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-      1239, /* GL_PROGRAM_TARGET_NV */
-      1236, /* GL_PROGRAM_RESIDENT_NV */
-      1717, /* GL_TRACK_MATRIX_NV */
-      1718, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-      1812, /* GL_VERTEX_PROGRAM_BINDING_NV */
-      1217, /* GL_PROGRAM_ERROR_POSITION_ARB */
-       353, /* GL_DEPTH_CLAMP_NV */
-      1780, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-      1787, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-      1788, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-      1789, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-      1790, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-      1791, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-      1792, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-      1793, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-      1794, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-      1795, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-      1781, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-      1782, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-      1783, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-      1784, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-      1785, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-      1786, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
-       745, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
-       752, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
-       753, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
-       754, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
-       755, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
-       756, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
-       757, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
-       758, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
-       759, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
-       760, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
-       746, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
-       747, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
-       748, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
-       749, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
-       750, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
-       751, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
-       772, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
-       779, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
-       780, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
-       781, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
-       782, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
-       783, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
-       784, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
-      1216, /* GL_PROGRAM_BINDING_ARB */
-       786, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
-       787, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
-       773, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
-       774, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
-       775, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
-       776, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
-       777, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
-       778, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
-      1635, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-      1632, /* GL_TEXTURE_COMPRESSED */
-      1021, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
-       268, /* GL_COMPRESSED_TEXTURE_FORMATS */
-       930, /* GL_MAX_VERTEX_UNITS_ARB */
+       647, /* GL_INTERPOLATE */
+       271, /* GL_CONSTANT */
+      1214, /* GL_PRIMARY_COLOR */
+      1211, /* GL_PREVIOUS */
+      1437, /* GL_SOURCE0_RGB */
+      1443, /* GL_SOURCE1_RGB */
+      1449, /* GL_SOURCE2_RGB */
+      1453, /* GL_SOURCE3_RGB_NV */
+      1434, /* GL_SOURCE0_ALPHA */
+      1440, /* GL_SOURCE1_ALPHA */
+      1446, /* GL_SOURCE2_ALPHA */
+      1452, /* GL_SOURCE3_ALPHA_NV */
+      1056, /* GL_OPERAND0_RGB */
+      1062, /* GL_OPERAND1_RGB */
+      1068, /* GL_OPERAND2_RGB */
+      1072, /* GL_OPERAND3_RGB_NV */
+      1053, /* GL_OPERAND0_ALPHA */
+      1059, /* GL_OPERAND1_ALPHA */
+      1065, /* GL_OPERAND2_ALPHA */
+      1071, /* GL_OPERAND3_ALPHA_NV */
+      1786, /* GL_VERTEX_ARRAY_BINDING */
+      1711, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
+      1712, /* GL_TEXTURE_RANGE_POINTER_APPLE */
+      1852, /* GL_YCBCR_422_APPLE */
+      1775, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+      1777, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+      1720, /* GL_TEXTURE_STORAGE_HINT_APPLE */
+      1514, /* GL_STORAGE_PRIVATE_APPLE */
+      1513, /* GL_STORAGE_CACHED_APPLE */
+      1515, /* GL_STORAGE_SHARED_APPLE */
+      1424, /* GL_SLICE_ACCUM_SUN */
+      1273, /* GL_QUAD_MESH_SUN */
+      1745, /* GL_TRIANGLE_MESH_SUN */
+      1825, /* GL_VERTEX_PROGRAM_ARB */
+      1836, /* GL_VERTEX_STATE_PROGRAM_NV */
+      1812, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+      1818, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+      1820, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+      1822, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+       334, /* GL_CURRENT_VERTEX_ATTRIB */
+      1227, /* GL_PROGRAM_LENGTH_ARB */
+      1241, /* GL_PROGRAM_STRING_ARB */
+       985, /* GL_MODELVIEW_PROJECTION_NV */
+       614, /* GL_IDENTITY_NV */
+       661, /* GL_INVERSE_NV */
+      1738, /* GL_TRANSPOSE_NV */
+       662, /* GL_INVERSE_TRANSPOSE_NV */
+       892, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
+       891, /* GL_MAX_PROGRAM_MATRICES_ARB */
+       799, /* GL_MATRIX0_NV */
+       811, /* GL_MATRIX1_NV */
+       823, /* GL_MATRIX2_NV */
+       827, /* GL_MATRIX3_NV */
+       829, /* GL_MATRIX4_NV */
+       831, /* GL_MATRIX5_NV */
+       833, /* GL_MATRIX6_NV */
+       835, /* GL_MATRIX7_NV */
+       318, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
+       315, /* GL_CURRENT_MATRIX_ARB */
+      1828, /* GL_VERTEX_PROGRAM_POINT_SIZE */
+      1831, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+      1239, /* GL_PROGRAM_PARAMETER_NV */
+      1816, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+      1243, /* GL_PROGRAM_TARGET_NV */
+      1240, /* GL_PROGRAM_RESIDENT_NV */
+      1730, /* GL_TRACK_MATRIX_NV */
+      1731, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+      1826, /* GL_VERTEX_PROGRAM_BINDING_NV */
+      1221, /* GL_PROGRAM_ERROR_POSITION_ARB */
+       355, /* GL_DEPTH_CLAMP_NV */
+      1794, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+      1801, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+      1802, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+      1803, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+      1804, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+      1805, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+      1806, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+      1807, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+      1808, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+      1809, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+      1795, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+      1796, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+      1797, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+      1798, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+      1799, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+      1800, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+       747, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
+       754, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
+       755, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
+       756, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
+       757, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
+       758, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
+       759, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
+       760, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
+       761, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
+       762, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
+       748, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
+       749, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
+       750, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
+       751, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
+       752, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
+       753, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
+       774, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
+       781, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
+       782, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
+       783, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
+       784, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
+       785, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
+       786, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
+      1220, /* GL_PROGRAM_BINDING_ARB */
+       788, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
+       789, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
+       775, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
+       776, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
+       777, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
+       778, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
+       779, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
+       780, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
+      1646, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
+      1643, /* GL_TEXTURE_COMPRESSED */
+      1024, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
+       269, /* GL_COMPRESSED_TEXTURE_FORMATS */
+       933, /* GL_MAX_VERTEX_UNITS_ARB */
         22, /* GL_ACTIVE_VERTEX_UNITS_ARB */
-      1832, /* GL_WEIGHT_SUM_UNITY_ARB */
-      1810, /* GL_VERTEX_BLEND_ARB */
-       334, /* GL_CURRENT_WEIGHT_ARB */
-      1831, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-      1830, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-      1829, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-      1828, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-      1825, /* GL_WEIGHT_ARRAY_ARB */
-       381, /* GL_DOT3_RGB */
-       382, /* GL_DOT3_RGBA */
-       262, /* GL_COMPRESSED_RGB_FXT1_3DFX */
-       257, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
-       990, /* GL_MULTISAMPLE_3DFX */
-      1382, /* GL_SAMPLE_BUFFERS_3DFX */
-      1373, /* GL_SAMPLES_3DFX */
-       971, /* GL_MODELVIEW2_ARB */
-       974, /* GL_MODELVIEW3_ARB */
-       975, /* GL_MODELVIEW4_ARB */
-       976, /* GL_MODELVIEW5_ARB */
-       977, /* GL_MODELVIEW6_ARB */
-       978, /* GL_MODELVIEW7_ARB */
-       979, /* GL_MODELVIEW8_ARB */
-       980, /* GL_MODELVIEW9_ARB */
-       950, /* GL_MODELVIEW10_ARB */
-       951, /* GL_MODELVIEW11_ARB */
-       952, /* GL_MODELVIEW12_ARB */
-       953, /* GL_MODELVIEW13_ARB */
-       954, /* GL_MODELVIEW14_ARB */
-       955, /* GL_MODELVIEW15_ARB */
-       956, /* GL_MODELVIEW16_ARB */
-       957, /* GL_MODELVIEW17_ARB */
-       958, /* GL_MODELVIEW18_ARB */
-       959, /* GL_MODELVIEW19_ARB */
-       961, /* GL_MODELVIEW20_ARB */
-       962, /* GL_MODELVIEW21_ARB */
-       963, /* GL_MODELVIEW22_ARB */
-       964, /* GL_MODELVIEW23_ARB */
-       965, /* GL_MODELVIEW24_ARB */
-       966, /* GL_MODELVIEW25_ARB */
-       967, /* GL_MODELVIEW26_ARB */
-       968, /* GL_MODELVIEW27_ARB */
-       969, /* GL_MODELVIEW28_ARB */
-       970, /* GL_MODELVIEW29_ARB */
-       972, /* GL_MODELVIEW30_ARB */
-       973, /* GL_MODELVIEW31_ARB */
-       386, /* GL_DOT3_RGB_EXT */
-       384, /* GL_DOT3_RGBA_EXT */
-       944, /* GL_MIRROR_CLAMP_EXT */
-       947, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
-       985, /* GL_MODULATE_ADD_ATI */
-       986, /* GL_MODULATE_SIGNED_ADD_ATI */
-       987, /* GL_MODULATE_SUBTRACT_ATI */
-      1838, /* GL_YCBCR_MESA */
-      1076, /* GL_PACK_INVERT_MESA */
-       337, /* GL_DEBUG_OBJECT_MESA */
-       338, /* GL_DEBUG_PRINT_MESA */
-       336, /* GL_DEBUG_ASSERT_MESA */
-       109, /* GL_BUFFER_SIZE */
-       111, /* GL_BUFFER_USAGE */
-       115, /* GL_BUMP_ROT_MATRIX_ATI */
-       116, /* GL_BUMP_ROT_MATRIX_SIZE_ATI */
-       114, /* GL_BUMP_NUM_TEX_UNITS_ATI */
-       118, /* GL_BUMP_TEX_UNITS_ATI */
-       445, /* GL_DUDV_ATI */
-       444, /* GL_DU8DV8_ATI */
-       113, /* GL_BUMP_ENVMAP_ATI */
-       117, /* GL_BUMP_TARGET_ATI */
-      1480, /* GL_STENCIL_BACK_FUNC */
-      1478, /* GL_STENCIL_BACK_FAIL */
-      1482, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-      1484, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
-       529, /* GL_FRAGMENT_PROGRAM_ARB */
-      1214, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
-      1242, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
-      1241, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
-      1226, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-      1232, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-      1231, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-       879, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
-       902, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
-       901, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
-       892, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-       898, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-       897, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-       862, /* GL_MAX_DRAW_BUFFERS */
-       390, /* GL_DRAW_BUFFER0 */
-       393, /* GL_DRAW_BUFFER1 */
-       414, /* GL_DRAW_BUFFER2 */
-       417, /* GL_DRAW_BUFFER3 */
-       420, /* GL_DRAW_BUFFER4 */
-       423, /* GL_DRAW_BUFFER5 */
-       426, /* GL_DRAW_BUFFER6 */
-       429, /* GL_DRAW_BUFFER7 */
-       432, /* GL_DRAW_BUFFER8 */
-       435, /* GL_DRAW_BUFFER9 */
-       394, /* GL_DRAW_BUFFER10 */
-       397, /* GL_DRAW_BUFFER11 */
-       400, /* GL_DRAW_BUFFER12 */
-       403, /* GL_DRAW_BUFFER13 */
-       406, /* GL_DRAW_BUFFER14 */
-       409, /* GL_DRAW_BUFFER15 */
-        81, /* GL_BLEND_EQUATION_ALPHA */
-       842, /* GL_MATRIX_PALETTE_ARB */
-       873, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
-       876, /* GL_MAX_PALETTE_MATRICES_ARB */
-       319, /* GL_CURRENT_PALETTE_MATRIX_ARB */
-       836, /* GL_MATRIX_INDEX_ARRAY_ARB */
-       314, /* GL_CURRENT_MATRIX_INDEX_ARB */
-       838, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
-       840, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
-       839, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
-       837, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
-      1662, /* GL_TEXTURE_DEPTH_SIZE */
-       374, /* GL_DEPTH_TEXTURE_MODE */
-      1627, /* GL_TEXTURE_COMPARE_MODE */
-      1625, /* GL_TEXTURE_COMPARE_FUNC */
-       241, /* GL_COMPARE_R_TO_TEXTURE */
-      1148, /* GL_POINT_SPRITE */
-       294, /* GL_COORD_REPLACE */
-      1152, /* GL_POINT_SPRITE_R_MODE_NV */
-      1271, /* GL_QUERY_COUNTER_BITS */
-       321, /* GL_CURRENT_QUERY */
-      1273, /* GL_QUERY_RESULT */
-      1275, /* GL_QUERY_RESULT_AVAILABLE */
-       924, /* GL_MAX_VERTEX_ATTRIBS */
-      1800, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
-       372, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
-       371, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
-       910, /* GL_MAX_TEXTURE_COORDS */
-       912, /* GL_MAX_TEXTURE_IMAGE_UNITS */
-      1219, /* GL_PROGRAM_ERROR_STRING_ARB */
-      1221, /* GL_PROGRAM_FORMAT_ASCII_ARB */
-      1220, /* GL_PROGRAM_FORMAT_ARB */
-      1711, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
-       351, /* GL_DEPTH_BOUNDS_TEST_EXT */
-       350, /* GL_DEPTH_BOUNDS_EXT */
-        52, /* GL_ARRAY_BUFFER */
-       458, /* GL_ELEMENT_ARRAY_BUFFER */
-        53, /* GL_ARRAY_BUFFER_BINDING */
-       459, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
-      1774, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-      1011, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
-       148, /* GL_COLOR_ARRAY_BUFFER_BINDING */
-       621, /* GL_INDEX_ARRAY_BUFFER_BINDING */
-      1640, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
-       454, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
-      1394, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
-       507, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
-      1826, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-      1796, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-      1222, /* GL_PROGRAM_INSTRUCTIONS_ARB */
-       885, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
-      1228, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-       894, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-      1240, /* GL_PROGRAM_TEMPORARIES_ARB */
-       900, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
-      1230, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
-       896, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
-      1234, /* GL_PROGRAM_PARAMETERS_ARB */
-       899, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
-      1229, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
-       895, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
-      1215, /* GL_PROGRAM_ATTRIBS_ARB */
-       880, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
-      1227, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
-       893, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
-      1213, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
-       878, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
-      1225, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-       891, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-       886, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
-       882, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
-      1243, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-      1722, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-      1284, /* GL_READ_ONLY */
-      1834, /* GL_WRITE_ONLY */
-      1286, /* GL_READ_WRITE */
-       101, /* GL_BUFFER_ACCESS */
-       104, /* GL_BUFFER_MAPPED */
-       106, /* GL_BUFFER_MAP_POINTER */
-      1716, /* GL_TIME_ELAPSED_EXT */
-       796, /* GL_MATRIX0_ARB */
-       808, /* GL_MATRIX1_ARB */
-       820, /* GL_MATRIX2_ARB */
-       824, /* GL_MATRIX3_ARB */
-       826, /* GL_MATRIX4_ARB */
-       828, /* GL_MATRIX5_ARB */
-       830, /* GL_MATRIX6_ARB */
-       832, /* GL_MATRIX7_ARB */
-       834, /* GL_MATRIX8_ARB */
-       835, /* GL_MATRIX9_ARB */
-       798, /* GL_MATRIX10_ARB */
-       799, /* GL_MATRIX11_ARB */
-       800, /* GL_MATRIX12_ARB */
-       801, /* GL_MATRIX13_ARB */
-       802, /* GL_MATRIX14_ARB */
-       803, /* GL_MATRIX15_ARB */
-       804, /* GL_MATRIX16_ARB */
-       805, /* GL_MATRIX17_ARB */
-       806, /* GL_MATRIX18_ARB */
-       807, /* GL_MATRIX19_ARB */
-       810, /* GL_MATRIX20_ARB */
-       811, /* GL_MATRIX21_ARB */
-       812, /* GL_MATRIX22_ARB */
-       813, /* GL_MATRIX23_ARB */
-       814, /* GL_MATRIX24_ARB */
-       815, /* GL_MATRIX25_ARB */
-       816, /* GL_MATRIX26_ARB */
-       817, /* GL_MATRIX27_ARB */
-       818, /* GL_MATRIX28_ARB */
-       819, /* GL_MATRIX29_ARB */
-       822, /* GL_MATRIX30_ARB */
-       823, /* GL_MATRIX31_ARB */
-      1513, /* GL_STREAM_DRAW */
-      1515, /* GL_STREAM_READ */
-      1511, /* GL_STREAM_COPY */
-      1471, /* GL_STATIC_DRAW */
-      1473, /* GL_STATIC_READ */
-      1469, /* GL_STATIC_COPY */
-       448, /* GL_DYNAMIC_DRAW */
-       450, /* GL_DYNAMIC_READ */
-       446, /* GL_DYNAMIC_COPY */
-      1116, /* GL_PIXEL_PACK_BUFFER */
-      1120, /* GL_PIXEL_UNPACK_BUFFER */
-      1117, /* GL_PIXEL_PACK_BUFFER_BINDING */
-      1121, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
-       345, /* GL_DEPTH24_STENCIL8 */
-      1708, /* GL_TEXTURE_STENCIL_SIZE */
-      1660, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
-       881, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
-       884, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
-       888, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
-       887, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
-       845, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
-      1504, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
+      1847, /* GL_WEIGHT_SUM_UNITY_ARB */
+      1824, /* GL_VERTEX_BLEND_ARB */
+       336, /* GL_CURRENT_WEIGHT_ARB */
+      1846, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+      1845, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+      1844, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+      1843, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+      1840, /* GL_WEIGHT_ARRAY_ARB */
+       383, /* GL_DOT3_RGB */
+       384, /* GL_DOT3_RGBA */
+       263, /* GL_COMPRESSED_RGB_FXT1_3DFX */
+       258, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
+       993, /* GL_MULTISAMPLE_3DFX */
+      1386, /* GL_SAMPLE_BUFFERS_3DFX */
+      1377, /* GL_SAMPLES_3DFX */
+       974, /* GL_MODELVIEW2_ARB */
+       977, /* GL_MODELVIEW3_ARB */
+       978, /* GL_MODELVIEW4_ARB */
+       979, /* GL_MODELVIEW5_ARB */
+       980, /* GL_MODELVIEW6_ARB */
+       981, /* GL_MODELVIEW7_ARB */
+       982, /* GL_MODELVIEW8_ARB */
+       983, /* GL_MODELVIEW9_ARB */
+       953, /* GL_MODELVIEW10_ARB */
+       954, /* GL_MODELVIEW11_ARB */
+       955, /* GL_MODELVIEW12_ARB */
+       956, /* GL_MODELVIEW13_ARB */
+       957, /* GL_MODELVIEW14_ARB */
+       958, /* GL_MODELVIEW15_ARB */
+       959, /* GL_MODELVIEW16_ARB */
+       960, /* GL_MODELVIEW17_ARB */
+       961, /* GL_MODELVIEW18_ARB */
+       962, /* GL_MODELVIEW19_ARB */
+       964, /* GL_MODELVIEW20_ARB */
+       965, /* GL_MODELVIEW21_ARB */
+       966, /* GL_MODELVIEW22_ARB */
+       967, /* GL_MODELVIEW23_ARB */
+       968, /* GL_MODELVIEW24_ARB */
+       969, /* GL_MODELVIEW25_ARB */
+       970, /* GL_MODELVIEW26_ARB */
+       971, /* GL_MODELVIEW27_ARB */
+       972, /* GL_MODELVIEW28_ARB */
+       973, /* GL_MODELVIEW29_ARB */
+       975, /* GL_MODELVIEW30_ARB */
+       976, /* GL_MODELVIEW31_ARB */
+       388, /* GL_DOT3_RGB_EXT */
+       386, /* GL_DOT3_RGBA_EXT */
+       947, /* GL_MIRROR_CLAMP_EXT */
+       950, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
+       988, /* GL_MODULATE_ADD_ATI */
+       989, /* GL_MODULATE_SIGNED_ADD_ATI */
+       990, /* GL_MODULATE_SUBTRACT_ATI */
+      1853, /* GL_YCBCR_MESA */
+      1080, /* GL_PACK_INVERT_MESA */
+       339, /* GL_DEBUG_OBJECT_MESA */
+       340, /* GL_DEBUG_PRINT_MESA */
+       338, /* GL_DEBUG_ASSERT_MESA */
+       110, /* GL_BUFFER_SIZE */
+       112, /* GL_BUFFER_USAGE */
+       116, /* GL_BUMP_ROT_MATRIX_ATI */
+       117, /* GL_BUMP_ROT_MATRIX_SIZE_ATI */
+       115, /* GL_BUMP_NUM_TEX_UNITS_ATI */
+       119, /* GL_BUMP_TEX_UNITS_ATI */
+       447, /* GL_DUDV_ATI */
+       446, /* GL_DU8DV8_ATI */
+       114, /* GL_BUMP_ENVMAP_ATI */
+       118, /* GL_BUMP_TARGET_ATI */
+      1485, /* GL_STENCIL_BACK_FUNC */
+      1483, /* GL_STENCIL_BACK_FAIL */
+      1487, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
+      1489, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
+       531, /* GL_FRAGMENT_PROGRAM_ARB */
+      1218, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
+      1246, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
+      1245, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
+      1230, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+      1236, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+      1235, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+       881, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
+       904, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
+       903, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
+       894, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+       900, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+       899, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+       864, /* GL_MAX_DRAW_BUFFERS */
+       392, /* GL_DRAW_BUFFER0 */
+       395, /* GL_DRAW_BUFFER1 */
+       416, /* GL_DRAW_BUFFER2 */
+       419, /* GL_DRAW_BUFFER3 */
+       422, /* GL_DRAW_BUFFER4 */
+       425, /* GL_DRAW_BUFFER5 */
+       428, /* GL_DRAW_BUFFER6 */
+       431, /* GL_DRAW_BUFFER7 */
+       434, /* GL_DRAW_BUFFER8 */
+       437, /* GL_DRAW_BUFFER9 */
+       396, /* GL_DRAW_BUFFER10 */
+       399, /* GL_DRAW_BUFFER11 */
+       402, /* GL_DRAW_BUFFER12 */
+       405, /* GL_DRAW_BUFFER13 */
+       408, /* GL_DRAW_BUFFER14 */
+       411, /* GL_DRAW_BUFFER15 */
+        82, /* GL_BLEND_EQUATION_ALPHA */
+       844, /* GL_MATRIX_PALETTE_ARB */
+       875, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
+       878, /* GL_MAX_PALETTE_MATRICES_ARB */
+       321, /* GL_CURRENT_PALETTE_MATRIX_ARB */
+       838, /* GL_MATRIX_INDEX_ARRAY_ARB */
+       316, /* GL_CURRENT_MATRIX_INDEX_ARB */
+       840, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
+       842, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
+       841, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
+       839, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
+      1673, /* GL_TEXTURE_DEPTH_SIZE */
+       376, /* GL_DEPTH_TEXTURE_MODE */
+      1638, /* GL_TEXTURE_COMPARE_MODE */
+      1636, /* GL_TEXTURE_COMPARE_FUNC */
+       242, /* GL_COMPARE_R_TO_TEXTURE */
+      1152, /* GL_POINT_SPRITE */
+       296, /* GL_COORD_REPLACE */
+      1156, /* GL_POINT_SPRITE_R_MODE_NV */
+      1275, /* GL_QUERY_COUNTER_BITS */
+       323, /* GL_CURRENT_QUERY */
+      1277, /* GL_QUERY_RESULT */
+      1279, /* GL_QUERY_RESULT_AVAILABLE */
+       927, /* GL_MAX_VERTEX_ATTRIBS */
+      1814, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+       374, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
+       373, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
+       913, /* GL_MAX_TEXTURE_COORDS */
+       915, /* GL_MAX_TEXTURE_IMAGE_UNITS */
+      1223, /* GL_PROGRAM_ERROR_STRING_ARB */
+      1225, /* GL_PROGRAM_FORMAT_ASCII_ARB */
+      1224, /* GL_PROGRAM_FORMAT_ARB */
+      1722, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+       353, /* GL_DEPTH_BOUNDS_TEST_EXT */
+       352, /* GL_DEPTH_BOUNDS_EXT */
+        53, /* GL_ARRAY_BUFFER */
+       460, /* GL_ELEMENT_ARRAY_BUFFER */
+        54, /* GL_ARRAY_BUFFER_BINDING */
+       461, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
+      1788, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+      1014, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
+       149, /* GL_COLOR_ARRAY_BUFFER_BINDING */
+       623, /* GL_INDEX_ARRAY_BUFFER_BINDING */
+      1651, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
+       456, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
+      1398, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
+       509, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
+      1841, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+      1810, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+      1226, /* GL_PROGRAM_INSTRUCTIONS_ARB */
+       887, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
+      1232, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+       896, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+      1244, /* GL_PROGRAM_TEMPORARIES_ARB */
+       902, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
+      1234, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
+       898, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
+      1238, /* GL_PROGRAM_PARAMETERS_ARB */
+       901, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
+      1233, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
+       897, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
+      1219, /* GL_PROGRAM_ATTRIBS_ARB */
+       882, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
+      1231, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
+       895, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
+      1217, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
+       880, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
+      1229, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+       893, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+       888, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
+       884, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
+      1247, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
+      1735, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+      1288, /* GL_READ_ONLY */
+      1849, /* GL_WRITE_ONLY */
+      1290, /* GL_READ_WRITE */
+       102, /* GL_BUFFER_ACCESS */
+       105, /* GL_BUFFER_MAPPED */
+       107, /* GL_BUFFER_MAP_POINTER */
+      1729, /* GL_TIME_ELAPSED_EXT */
+       798, /* GL_MATRIX0_ARB */
+       810, /* GL_MATRIX1_ARB */
+       822, /* GL_MATRIX2_ARB */
+       826, /* GL_MATRIX3_ARB */
+       828, /* GL_MATRIX4_ARB */
+       830, /* GL_MATRIX5_ARB */
+       832, /* GL_MATRIX6_ARB */
+       834, /* GL_MATRIX7_ARB */
+       836, /* GL_MATRIX8_ARB */
+       837, /* GL_MATRIX9_ARB */
+       800, /* GL_MATRIX10_ARB */
+       801, /* GL_MATRIX11_ARB */
+       802, /* GL_MATRIX12_ARB */
+       803, /* GL_MATRIX13_ARB */
+       804, /* GL_MATRIX14_ARB */
+       805, /* GL_MATRIX15_ARB */
+       806, /* GL_MATRIX16_ARB */
+       807, /* GL_MATRIX17_ARB */
+       808, /* GL_MATRIX18_ARB */
+       809, /* GL_MATRIX19_ARB */
+       812, /* GL_MATRIX20_ARB */
+       813, /* GL_MATRIX21_ARB */
+       814, /* GL_MATRIX22_ARB */
+       815, /* GL_MATRIX23_ARB */
+       816, /* GL_MATRIX24_ARB */
+       817, /* GL_MATRIX25_ARB */
+       818, /* GL_MATRIX26_ARB */
+       819, /* GL_MATRIX27_ARB */
+       820, /* GL_MATRIX28_ARB */
+       821, /* GL_MATRIX29_ARB */
+       824, /* GL_MATRIX30_ARB */
+       825, /* GL_MATRIX31_ARB */
+      1518, /* GL_STREAM_DRAW */
+      1520, /* GL_STREAM_READ */
+      1516, /* GL_STREAM_COPY */
+      1476, /* GL_STATIC_DRAW */
+      1478, /* GL_STATIC_READ */
+      1474, /* GL_STATIC_COPY */
+       450, /* GL_DYNAMIC_DRAW */
+       452, /* GL_DYNAMIC_READ */
+       448, /* GL_DYNAMIC_COPY */
+      1120, /* GL_PIXEL_PACK_BUFFER */
+      1124, /* GL_PIXEL_UNPACK_BUFFER */
+      1121, /* GL_PIXEL_PACK_BUFFER_BINDING */
+      1125, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
+       347, /* GL_DEPTH24_STENCIL8 */
+      1719, /* GL_TEXTURE_STENCIL_SIZE */
+      1671, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
+       883, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
+       886, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
+       890, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
+       889, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
+       847, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
+      1509, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
         17, /* GL_ACTIVE_STENCIL_FACE_EXT */
-       945, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
-      1375, /* GL_SAMPLES_PASSED */
-       108, /* GL_BUFFER_SERIALIZED_MODIFY_APPLE */
-       103, /* GL_BUFFER_FLUSHING_UNMAP_APPLE */
-       530, /* GL_FRAGMENT_SHADER */
-      1820, /* GL_VERTEX_SHADER */
-      1233, /* GL_PROGRAM_OBJECT_ARB */
-      1407, /* GL_SHADER_OBJECT_ARB */
-       869, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
-       928, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
-       922, /* GL_MAX_VARYING_FLOATS */
-       926, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
-       854, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
-      1036, /* GL_OBJECT_TYPE_ARB */
-      1409, /* GL_SHADER_TYPE */
-       495, /* GL_FLOAT_VEC2 */
-       497, /* GL_FLOAT_VEC3 */
-       499, /* GL_FLOAT_VEC4 */
-       648, /* GL_INT_VEC2 */
-       650, /* GL_INT_VEC3 */
-       652, /* GL_INT_VEC4 */
-        93, /* GL_BOOL */
-        95, /* GL_BOOL_VEC2 */
-        97, /* GL_BOOL_VEC3 */
-        99, /* GL_BOOL_VEC4 */
-       483, /* GL_FLOAT_MAT2 */
-       487, /* GL_FLOAT_MAT3 */
-       491, /* GL_FLOAT_MAT4 */
-      1366, /* GL_SAMPLER_1D */
-      1368, /* GL_SAMPLER_2D */
-      1370, /* GL_SAMPLER_3D */
-      1371, /* GL_SAMPLER_CUBE */
-      1367, /* GL_SAMPLER_1D_SHADOW */
-      1369, /* GL_SAMPLER_2D_SHADOW */
-       485, /* GL_FLOAT_MAT2x3 */
-       486, /* GL_FLOAT_MAT2x4 */
-       489, /* GL_FLOAT_MAT3x2 */
-       490, /* GL_FLOAT_MAT3x4 */
-       493, /* GL_FLOAT_MAT4x2 */
-       494, /* GL_FLOAT_MAT4x3 */
-       343, /* GL_DELETE_STATUS */
-       245, /* GL_COMPILE_STATUS */
-       703, /* GL_LINK_STATUS */
-      1768, /* GL_VALIDATE_STATUS */
-       633, /* GL_INFO_LOG_LENGTH */
-        55, /* GL_ATTACHED_SHADERS */
+       948, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
+      1379, /* GL_SAMPLES_PASSED */
+       109, /* GL_BUFFER_SERIALIZED_MODIFY_APPLE */
+       104, /* GL_BUFFER_FLUSHING_UNMAP_APPLE */
+       532, /* GL_FRAGMENT_SHADER */
+      1834, /* GL_VERTEX_SHADER */
+      1237, /* GL_PROGRAM_OBJECT_ARB */
+      1411, /* GL_SHADER_OBJECT_ARB */
+       871, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
+       931, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
+       925, /* GL_MAX_VARYING_FLOATS */
+       929, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
+       856, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
+      1040, /* GL_OBJECT_TYPE_ARB */
+      1413, /* GL_SHADER_TYPE */
+       497, /* GL_FLOAT_VEC2 */
+       499, /* GL_FLOAT_VEC3 */
+       501, /* GL_FLOAT_VEC4 */
+       650, /* GL_INT_VEC2 */
+       652, /* GL_INT_VEC3 */
+       654, /* GL_INT_VEC4 */
+        94, /* GL_BOOL */
+        96, /* GL_BOOL_VEC2 */
+        98, /* GL_BOOL_VEC3 */
+       100, /* GL_BOOL_VEC4 */
+       485, /* GL_FLOAT_MAT2 */
+       489, /* GL_FLOAT_MAT3 */
+       493, /* GL_FLOAT_MAT4 */
+      1370, /* GL_SAMPLER_1D */
+      1372, /* GL_SAMPLER_2D */
+      1374, /* GL_SAMPLER_3D */
+      1375, /* GL_SAMPLER_CUBE */
+      1371, /* GL_SAMPLER_1D_SHADOW */
+      1373, /* GL_SAMPLER_2D_SHADOW */
+       487, /* GL_FLOAT_MAT2x3 */
+       488, /* GL_FLOAT_MAT2x4 */
+       491, /* GL_FLOAT_MAT3x2 */
+       492, /* GL_FLOAT_MAT3x4 */
+       495, /* GL_FLOAT_MAT4x2 */
+       496, /* GL_FLOAT_MAT4x3 */
+       345, /* GL_DELETE_STATUS */
+       246, /* GL_COMPILE_STATUS */
+       705, /* GL_LINK_STATUS */
+      1782, /* GL_VALIDATE_STATUS */
+       635, /* GL_INFO_LOG_LENGTH */
+        56, /* GL_ATTACHED_SHADERS */
         20, /* GL_ACTIVE_UNIFORMS */
         21, /* GL_ACTIVE_UNIFORM_MAX_LENGTH */
-      1408, /* GL_SHADER_SOURCE_LENGTH */
+      1412, /* GL_SHADER_SOURCE_LENGTH */
         15, /* GL_ACTIVE_ATTRIBUTES */
         16, /* GL_ACTIVE_ATTRIBUTE_MAX_LENGTH */
-       532, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
-      1411, /* GL_SHADING_LANGUAGE_VERSION */
-       320, /* GL_CURRENT_PROGRAM */
-      1085, /* GL_PALETTE4_RGB8_OES */
-      1087, /* GL_PALETTE4_RGBA8_OES */
-      1083, /* GL_PALETTE4_R5_G6_B5_OES */
-      1086, /* GL_PALETTE4_RGBA4_OES */
-      1084, /* GL_PALETTE4_RGB5_A1_OES */
-      1090, /* GL_PALETTE8_RGB8_OES */
-      1092, /* GL_PALETTE8_RGBA8_OES */
-      1088, /* GL_PALETTE8_R5_G6_B5_OES */
-      1091, /* GL_PALETTE8_RGBA4_OES */
-      1089, /* GL_PALETTE8_RGB5_A1_OES */
-       615, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
-       614, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
-      1753, /* GL_UNSIGNED_NORMALIZED */
-      1595, /* GL_TEXTURE_1D_ARRAY_EXT */
-      1254, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
-      1597, /* GL_TEXTURE_2D_ARRAY_EXT */
-      1257, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
-      1603, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
-      1605, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
-      1463, /* GL_SRGB */
-      1464, /* GL_SRGB8 */
-      1466, /* GL_SRGB_ALPHA */
-      1465, /* GL_SRGB8_ALPHA8 */
-      1423, /* GL_SLUMINANCE_ALPHA */
-      1422, /* GL_SLUMINANCE8_ALPHA8 */
-      1420, /* GL_SLUMINANCE */
-      1421, /* GL_SLUMINANCE8 */
-       266, /* GL_COMPRESSED_SRGB */
-       267, /* GL_COMPRESSED_SRGB_ALPHA */
-       264, /* GL_COMPRESSED_SLUMINANCE */
-       265, /* GL_COMPRESSED_SLUMINANCE_ALPHA */
-      1150, /* GL_POINT_SPRITE_COORD_ORIGIN */
-       711, /* GL_LOWER_LEFT */
-      1765, /* GL_UPPER_LEFT */
-      1486, /* GL_STENCIL_BACK_REF */
-      1487, /* GL_STENCIL_BACK_VALUE_MASK */
-      1488, /* GL_STENCIL_BACK_WRITEMASK */
-       439, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
-      1300, /* GL_RENDERBUFFER_BINDING_EXT */
-      1281, /* GL_READ_FRAMEBUFFER */
-       438, /* GL_DRAW_FRAMEBUFFER */
-      1282, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
-      1310, /* GL_RENDERBUFFER_SAMPLES */
-       542, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
-       540, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
-       551, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
-       547, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
-       549, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
-       554, /* GL_FRAMEBUFFER_COMPLETE */
-       558, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
-       564, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
-       562, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
-       560, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
-       563, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
-       561, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
-       567, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
-       570, /* GL_FRAMEBUFFER_UNSUPPORTED */
-       568, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
-       851, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
-       154, /* GL_COLOR_ATTACHMENT0 */
-       156, /* GL_COLOR_ATTACHMENT1 */
-       170, /* GL_COLOR_ATTACHMENT2 */
-       172, /* GL_COLOR_ATTACHMENT3 */
-       174, /* GL_COLOR_ATTACHMENT4 */
-       176, /* GL_COLOR_ATTACHMENT5 */
-       178, /* GL_COLOR_ATTACHMENT6 */
-       180, /* GL_COLOR_ATTACHMENT7 */
-       182, /* GL_COLOR_ATTACHMENT8 */
-       184, /* GL_COLOR_ATTACHMENT9 */
-       157, /* GL_COLOR_ATTACHMENT10 */
-       159, /* GL_COLOR_ATTACHMENT11 */
-       161, /* GL_COLOR_ATTACHMENT12 */
-       163, /* GL_COLOR_ATTACHMENT13 */
-       165, /* GL_COLOR_ATTACHMENT14 */
-       167, /* GL_COLOR_ATTACHMENT15 */
-       346, /* GL_DEPTH_ATTACHMENT */
-      1476, /* GL_STENCIL_ATTACHMENT */
-       533, /* GL_FRAMEBUFFER */
-      1298, /* GL_RENDERBUFFER */
-      1312, /* GL_RENDERBUFFER_WIDTH */
-      1305, /* GL_RENDERBUFFER_HEIGHT */
-      1307, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
-      1499, /* GL_STENCIL_INDEX_EXT */
-      1496, /* GL_STENCIL_INDEX1_EXT */
-      1497, /* GL_STENCIL_INDEX4_EXT */
-      1498, /* GL_STENCIL_INDEX8_EXT */
-      1495, /* GL_STENCIL_INDEX16_EXT */
-      1309, /* GL_RENDERBUFFER_RED_SIZE */
-      1304, /* GL_RENDERBUFFER_GREEN_SIZE */
-      1301, /* GL_RENDERBUFFER_BLUE_SIZE */
-      1299, /* GL_RENDERBUFFER_ALPHA_SIZE */
-      1302, /* GL_RENDERBUFFER_DEPTH_SIZE */
-      1311, /* GL_RENDERBUFFER_STENCIL_SIZE */
-       566, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
-       907, /* GL_MAX_SAMPLES */
-      1268, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT */
-       480, /* GL_FIRST_VERTEX_CONVENTION_EXT */
-       663, /* GL_LAST_VERTEX_CONVENTION_EXT */
-      1247, /* GL_PROVOKING_VERTEX_EXT */
-       300, /* GL_COPY_READ_BUFFER */
-       301, /* GL_COPY_WRITE_BUFFER */
-      1359, /* GL_RGBA_SNORM */
-      1355, /* GL_RGBA8_SNORM */
-      1416, /* GL_SIGNED_NORMALIZED */
-       465, /* GL_EVAL_BIT */
-      1279, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
-       705, /* GL_LIST_BIT */
-      1611, /* GL_TEXTURE_BIT */
-      1390, /* GL_SCISSOR_BIT */
+       534, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
+      1415, /* GL_SHADING_LANGUAGE_VERSION */
+       322, /* GL_CURRENT_PROGRAM */
+      1089, /* GL_PALETTE4_RGB8_OES */
+      1091, /* GL_PALETTE4_RGBA8_OES */
+      1087, /* GL_PALETTE4_R5_G6_B5_OES */
+      1090, /* GL_PALETTE4_RGBA4_OES */
+      1088, /* GL_PALETTE4_RGB5_A1_OES */
+      1094, /* GL_PALETTE8_RGB8_OES */
+      1096, /* GL_PALETTE8_RGBA8_OES */
+      1092, /* GL_PALETTE8_R5_G6_B5_OES */
+      1095, /* GL_PALETTE8_RGBA4_OES */
+      1093, /* GL_PALETTE8_RGB5_A1_OES */
+       617, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
+       616, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
+      1767, /* GL_UNSIGNED_NORMALIZED */
+      1606, /* GL_TEXTURE_1D_ARRAY_EXT */
+      1258, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
+      1608, /* GL_TEXTURE_2D_ARRAY_EXT */
+      1261, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
+      1614, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
+      1616, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
+      1468, /* GL_SRGB */
+      1469, /* GL_SRGB8 */
+      1471, /* GL_SRGB_ALPHA */
+      1470, /* GL_SRGB8_ALPHA8 */
+      1428, /* GL_SLUMINANCE_ALPHA */
+      1427, /* GL_SLUMINANCE8_ALPHA8 */
+      1425, /* GL_SLUMINANCE */
+      1426, /* GL_SLUMINANCE8 */
+       267, /* GL_COMPRESSED_SRGB */
+       268, /* GL_COMPRESSED_SRGB_ALPHA */
+       265, /* GL_COMPRESSED_SLUMINANCE */
+       266, /* GL_COMPRESSED_SLUMINANCE_ALPHA */
+      1154, /* GL_POINT_SPRITE_COORD_ORIGIN */
+       713, /* GL_LOWER_LEFT */
+      1779, /* GL_UPPER_LEFT */
+      1491, /* GL_STENCIL_BACK_REF */
+      1492, /* GL_STENCIL_BACK_VALUE_MASK */
+      1493, /* GL_STENCIL_BACK_WRITEMASK */
+       441, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
+      1304, /* GL_RENDERBUFFER_BINDING_EXT */
+      1285, /* GL_READ_FRAMEBUFFER */
+       440, /* GL_DRAW_FRAMEBUFFER */
+      1286, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
+      1314, /* GL_RENDERBUFFER_SAMPLES */
+       544, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
+       542, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
+       553, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
+       549, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
+       551, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+       556, /* GL_FRAMEBUFFER_COMPLETE */
+       560, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
+       566, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
+       564, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
+       562, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
+       565, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
+       563, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
+       569, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
+       572, /* GL_FRAMEBUFFER_UNSUPPORTED */
+       570, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
+       853, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
+       155, /* GL_COLOR_ATTACHMENT0 */
+       157, /* GL_COLOR_ATTACHMENT1 */
+       171, /* GL_COLOR_ATTACHMENT2 */
+       173, /* GL_COLOR_ATTACHMENT3 */
+       175, /* GL_COLOR_ATTACHMENT4 */
+       177, /* GL_COLOR_ATTACHMENT5 */
+       179, /* GL_COLOR_ATTACHMENT6 */
+       181, /* GL_COLOR_ATTACHMENT7 */
+       183, /* GL_COLOR_ATTACHMENT8 */
+       185, /* GL_COLOR_ATTACHMENT9 */
+       158, /* GL_COLOR_ATTACHMENT10 */
+       160, /* GL_COLOR_ATTACHMENT11 */
+       162, /* GL_COLOR_ATTACHMENT12 */
+       164, /* GL_COLOR_ATTACHMENT13 */
+       166, /* GL_COLOR_ATTACHMENT14 */
+       168, /* GL_COLOR_ATTACHMENT15 */
+       348, /* GL_DEPTH_ATTACHMENT */
+      1481, /* GL_STENCIL_ATTACHMENT */
+       535, /* GL_FRAMEBUFFER */
+      1302, /* GL_RENDERBUFFER */
+      1316, /* GL_RENDERBUFFER_WIDTH */
+      1309, /* GL_RENDERBUFFER_HEIGHT */
+      1311, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
+      1504, /* GL_STENCIL_INDEX_EXT */
+      1501, /* GL_STENCIL_INDEX1_EXT */
+      1502, /* GL_STENCIL_INDEX4_EXT */
+      1503, /* GL_STENCIL_INDEX8_EXT */
+      1500, /* GL_STENCIL_INDEX16_EXT */
+      1313, /* GL_RENDERBUFFER_RED_SIZE */
+      1308, /* GL_RENDERBUFFER_GREEN_SIZE */
+      1305, /* GL_RENDERBUFFER_BLUE_SIZE */
+      1303, /* GL_RENDERBUFFER_ALPHA_SIZE */
+      1306, /* GL_RENDERBUFFER_DEPTH_SIZE */
+      1315, /* GL_RENDERBUFFER_STENCIL_SIZE */
+       568, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
+       909, /* GL_MAX_SAMPLES */
+      1272, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT */
+       482, /* GL_FIRST_VERTEX_CONVENTION_EXT */
+       665, /* GL_LAST_VERTEX_CONVENTION_EXT */
+      1251, /* GL_PROVOKING_VERTEX_EXT */
+       302, /* GL_COPY_READ_BUFFER */
+       303, /* GL_COPY_WRITE_BUFFER */
+      1363, /* GL_RGBA_SNORM */
+      1359, /* GL_RGBA8_SNORM */
+      1421, /* GL_SIGNED_NORMALIZED */
+       910, /* GL_MAX_SERVER_WAIT_TIMEOUT */
+      1039, /* GL_OBJECT_TYPE */
+      1525, /* GL_SYNC_CONDITION */
+      1530, /* GL_SYNC_STATUS */
+      1527, /* GL_SYNC_FLAGS */
+      1526, /* GL_SYNC_FENCE */
+      1529, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
+      1756, /* GL_UNSIGNALED */
+      1420, /* GL_SIGNALED */
+        46, /* GL_ALREADY_SIGNALED */
+      1727, /* GL_TIMEOUT_EXPIRED */
+       270, /* GL_CONDITION_SATISFIED */
+      1839, /* GL_WAIT_FAILED */
+       467, /* GL_EVAL_BIT */
+      1283, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
+       707, /* GL_LIST_BIT */
+      1622, /* GL_TEXTURE_BIT */
+      1394, /* GL_SCISSOR_BIT */
         29, /* GL_ALL_ATTRIB_BITS */
-       992, /* GL_MULTISAMPLE_BIT */
+       995, /* GL_MULTISAMPLE_BIT */
         30, /* GL_ALL_CLIENT_ATTRIB_BITS */
+      1728, /* GL_TIMEOUT_IGNORED */
 };
 
 typedef int (*cfunc)(const void *, const void *);
diff --git a/src/mesa/sparc/glapi_sparc.S b/src/mesa/sparc/glapi_sparc.S
index 34c1e09ad8..5b2c9e4a9a 100644
--- a/src/mesa/sparc/glapi_sparc.S
+++ b/src/mesa/sparc/glapi_sparc.S
@@ -764,23 +764,30 @@ gl_dispatch_functions_start:
 	GL_STUB(glBindVertexArray, _gloffset_BindVertexArray)
 	GL_STUB(glGenVertexArrays, _gloffset_GenVertexArrays)
 	GL_STUB(glCopyBufferSubData, _gloffset_CopyBufferSubData)
+	GL_STUB(glClientWaitSync, _gloffset_ClientWaitSync)
+	GL_STUB(glDeleteSync, _gloffset_DeleteSync)
+	GL_STUB(glFenceSync, _gloffset_FenceSync)
+	GL_STUB(glGetInteger64v, _gloffset_GetInteger64v)
+	GL_STUB(glGetSynciv, _gloffset_GetSynciv)
+	GL_STUB(glIsSync, _gloffset_IsSync)
+	GL_STUB(glWaitSync, _gloffset_WaitSync)
 	GL_STUB(glPolygonOffsetEXT, _gloffset_PolygonOffsetEXT)
-	GL_STUB(gl_dispatch_stub_568, _gloffset_GetPixelTexGenParameterfvSGIS)
-	HIDDEN(gl_dispatch_stub_568)
-	GL_STUB(gl_dispatch_stub_569, _gloffset_GetPixelTexGenParameterivSGIS)
-	HIDDEN(gl_dispatch_stub_569)
-	GL_STUB(gl_dispatch_stub_570, _gloffset_PixelTexGenParameterfSGIS)
-	HIDDEN(gl_dispatch_stub_570)
-	GL_STUB(gl_dispatch_stub_571, _gloffset_PixelTexGenParameterfvSGIS)
-	HIDDEN(gl_dispatch_stub_571)
-	GL_STUB(gl_dispatch_stub_572, _gloffset_PixelTexGenParameteriSGIS)
-	HIDDEN(gl_dispatch_stub_572)
-	GL_STUB(gl_dispatch_stub_573, _gloffset_PixelTexGenParameterivSGIS)
-	HIDDEN(gl_dispatch_stub_573)
-	GL_STUB(gl_dispatch_stub_574, _gloffset_SampleMaskSGIS)
-	HIDDEN(gl_dispatch_stub_574)
-	GL_STUB(gl_dispatch_stub_575, _gloffset_SamplePatternSGIS)
+	GL_STUB(gl_dispatch_stub_575, _gloffset_GetPixelTexGenParameterfvSGIS)
 	HIDDEN(gl_dispatch_stub_575)
+	GL_STUB(gl_dispatch_stub_576, _gloffset_GetPixelTexGenParameterivSGIS)
+	HIDDEN(gl_dispatch_stub_576)
+	GL_STUB(gl_dispatch_stub_577, _gloffset_PixelTexGenParameterfSGIS)
+	HIDDEN(gl_dispatch_stub_577)
+	GL_STUB(gl_dispatch_stub_578, _gloffset_PixelTexGenParameterfvSGIS)
+	HIDDEN(gl_dispatch_stub_578)
+	GL_STUB(gl_dispatch_stub_579, _gloffset_PixelTexGenParameteriSGIS)
+	HIDDEN(gl_dispatch_stub_579)
+	GL_STUB(gl_dispatch_stub_580, _gloffset_PixelTexGenParameterivSGIS)
+	HIDDEN(gl_dispatch_stub_580)
+	GL_STUB(gl_dispatch_stub_581, _gloffset_SampleMaskSGIS)
+	HIDDEN(gl_dispatch_stub_581)
+	GL_STUB(gl_dispatch_stub_582, _gloffset_SamplePatternSGIS)
+	HIDDEN(gl_dispatch_stub_582)
 	GL_STUB(glColorPointerEXT, _gloffset_ColorPointerEXT)
 	GL_STUB(glEdgeFlagPointerEXT, _gloffset_EdgeFlagPointerEXT)
 	GL_STUB(glIndexPointerEXT, _gloffset_IndexPointerEXT)
@@ -791,10 +798,10 @@ gl_dispatch_functions_start:
 	GL_STUB(glPointParameterfvEXT, _gloffset_PointParameterfvEXT)
 	GL_STUB(glLockArraysEXT, _gloffset_LockArraysEXT)
 	GL_STUB(glUnlockArraysEXT, _gloffset_UnlockArraysEXT)
-	GL_STUB(gl_dispatch_stub_586, _gloffset_CullParameterdvEXT)
-	HIDDEN(gl_dispatch_stub_586)
-	GL_STUB(gl_dispatch_stub_587, _gloffset_CullParameterfvEXT)
-	HIDDEN(gl_dispatch_stub_587)
+	GL_STUB(gl_dispatch_stub_593, _gloffset_CullParameterdvEXT)
+	HIDDEN(gl_dispatch_stub_593)
+	GL_STUB(gl_dispatch_stub_594, _gloffset_CullParameterfvEXT)
+	HIDDEN(gl_dispatch_stub_594)
 	GL_STUB(glSecondaryColor3bEXT, _gloffset_SecondaryColor3bEXT)
 	GL_STUB(glSecondaryColor3bvEXT, _gloffset_SecondaryColor3bvEXT)
 	GL_STUB(glSecondaryColor3dEXT, _gloffset_SecondaryColor3dEXT)
@@ -819,8 +826,8 @@ gl_dispatch_functions_start:
 	GL_STUB(glFogCoorddvEXT, _gloffset_FogCoorddvEXT)
 	GL_STUB(glFogCoordfEXT, _gloffset_FogCoordfEXT)
 	GL_STUB(glFogCoordfvEXT, _gloffset_FogCoordfvEXT)
-	GL_STUB(gl_dispatch_stub_612, _gloffset_PixelTexGenSGIX)
-	HIDDEN(gl_dispatch_stub_612)
+	GL_STUB(gl_dispatch_stub_619, _gloffset_PixelTexGenSGIX)
+	HIDDEN(gl_dispatch_stub_619)
 	GL_STUB(glBlendFuncSeparateEXT, _gloffset_BlendFuncSeparateEXT)
 	GL_STUB(glFlushVertexArrayRangeNV, _gloffset_FlushVertexArrayRangeNV)
 	GL_STUB(glVertexArrayRangeNV, _gloffset_VertexArrayRangeNV)
@@ -862,24 +869,24 @@ gl_dispatch_functions_start:
 	GL_STUB(glWindowPos4ivMESA, _gloffset_WindowPos4ivMESA)
 	GL_STUB(glWindowPos4sMESA, _gloffset_WindowPos4sMESA)
 	GL_STUB(glWindowPos4svMESA, _gloffset_WindowPos4svMESA)
-	GL_STUB(gl_dispatch_stub_654, _gloffset_MultiModeDrawArraysIBM)
-	HIDDEN(gl_dispatch_stub_654)
-	GL_STUB(gl_dispatch_stub_655, _gloffset_MultiModeDrawElementsIBM)
-	HIDDEN(gl_dispatch_stub_655)
-	GL_STUB(gl_dispatch_stub_656, _gloffset_DeleteFencesNV)
-	HIDDEN(gl_dispatch_stub_656)
-	GL_STUB(gl_dispatch_stub_657, _gloffset_FinishFenceNV)
-	HIDDEN(gl_dispatch_stub_657)
-	GL_STUB(gl_dispatch_stub_658, _gloffset_GenFencesNV)
-	HIDDEN(gl_dispatch_stub_658)
-	GL_STUB(gl_dispatch_stub_659, _gloffset_GetFenceivNV)
-	HIDDEN(gl_dispatch_stub_659)
-	GL_STUB(gl_dispatch_stub_660, _gloffset_IsFenceNV)
-	HIDDEN(gl_dispatch_stub_660)
-	GL_STUB(gl_dispatch_stub_661, _gloffset_SetFenceNV)
+	GL_STUB(gl_dispatch_stub_661, _gloffset_MultiModeDrawArraysIBM)
 	HIDDEN(gl_dispatch_stub_661)
-	GL_STUB(gl_dispatch_stub_662, _gloffset_TestFenceNV)
+	GL_STUB(gl_dispatch_stub_662, _gloffset_MultiModeDrawElementsIBM)
 	HIDDEN(gl_dispatch_stub_662)
+	GL_STUB(gl_dispatch_stub_663, _gloffset_DeleteFencesNV)
+	HIDDEN(gl_dispatch_stub_663)
+	GL_STUB(gl_dispatch_stub_664, _gloffset_FinishFenceNV)
+	HIDDEN(gl_dispatch_stub_664)
+	GL_STUB(gl_dispatch_stub_665, _gloffset_GenFencesNV)
+	HIDDEN(gl_dispatch_stub_665)
+	GL_STUB(gl_dispatch_stub_666, _gloffset_GetFenceivNV)
+	HIDDEN(gl_dispatch_stub_666)
+	GL_STUB(gl_dispatch_stub_667, _gloffset_IsFenceNV)
+	HIDDEN(gl_dispatch_stub_667)
+	GL_STUB(gl_dispatch_stub_668, _gloffset_SetFenceNV)
+	HIDDEN(gl_dispatch_stub_668)
+	GL_STUB(gl_dispatch_stub_669, _gloffset_TestFenceNV)
+	HIDDEN(gl_dispatch_stub_669)
 	GL_STUB(glAreProgramsResidentNV, _gloffset_AreProgramsResidentNV)
 	GL_STUB(glBindProgramNV, _gloffset_BindProgramNV)
 	GL_STUB(glDeleteProgramsNV, _gloffset_DeleteProgramsNV)
@@ -960,26 +967,26 @@ gl_dispatch_functions_start:
 	GL_STUB(glSetFragmentShaderConstantATI, _gloffset_SetFragmentShaderConstantATI)
 	GL_STUB(glPointParameteriNV, _gloffset_PointParameteriNV)
 	GL_STUB(glPointParameterivNV, _gloffset_PointParameterivNV)
-	GL_STUB(gl_dispatch_stub_743, _gloffset_ActiveStencilFaceEXT)
-	HIDDEN(gl_dispatch_stub_743)
-	GL_STUB(gl_dispatch_stub_744, _gloffset_BindVertexArrayAPPLE)
-	HIDDEN(gl_dispatch_stub_744)
-	GL_STUB(gl_dispatch_stub_745, _gloffset_DeleteVertexArraysAPPLE)
-	HIDDEN(gl_dispatch_stub_745)
-	GL_STUB(gl_dispatch_stub_746, _gloffset_GenVertexArraysAPPLE)
-	HIDDEN(gl_dispatch_stub_746)
-	GL_STUB(gl_dispatch_stub_747, _gloffset_IsVertexArrayAPPLE)
-	HIDDEN(gl_dispatch_stub_747)
+	GL_STUB(gl_dispatch_stub_750, _gloffset_ActiveStencilFaceEXT)
+	HIDDEN(gl_dispatch_stub_750)
+	GL_STUB(gl_dispatch_stub_751, _gloffset_BindVertexArrayAPPLE)
+	HIDDEN(gl_dispatch_stub_751)
+	GL_STUB(gl_dispatch_stub_752, _gloffset_DeleteVertexArraysAPPLE)
+	HIDDEN(gl_dispatch_stub_752)
+	GL_STUB(gl_dispatch_stub_753, _gloffset_GenVertexArraysAPPLE)
+	HIDDEN(gl_dispatch_stub_753)
+	GL_STUB(gl_dispatch_stub_754, _gloffset_IsVertexArrayAPPLE)
+	HIDDEN(gl_dispatch_stub_754)
 	GL_STUB(glGetProgramNamedParameterdvNV, _gloffset_GetProgramNamedParameterdvNV)
 	GL_STUB(glGetProgramNamedParameterfvNV, _gloffset_GetProgramNamedParameterfvNV)
 	GL_STUB(glProgramNamedParameter4dNV, _gloffset_ProgramNamedParameter4dNV)
 	GL_STUB(glProgramNamedParameter4dvNV, _gloffset_ProgramNamedParameter4dvNV)
 	GL_STUB(glProgramNamedParameter4fNV, _gloffset_ProgramNamedParameter4fNV)
 	GL_STUB(glProgramNamedParameter4fvNV, _gloffset_ProgramNamedParameter4fvNV)
-	GL_STUB(gl_dispatch_stub_754, _gloffset_DepthBoundsEXT)
-	HIDDEN(gl_dispatch_stub_754)
-	GL_STUB(gl_dispatch_stub_755, _gloffset_BlendEquationSeparateEXT)
-	HIDDEN(gl_dispatch_stub_755)
+	GL_STUB(gl_dispatch_stub_761, _gloffset_DepthBoundsEXT)
+	HIDDEN(gl_dispatch_stub_761)
+	GL_STUB(gl_dispatch_stub_762, _gloffset_BlendEquationSeparateEXT)
+	HIDDEN(gl_dispatch_stub_762)
 	GL_STUB(glBindFramebufferEXT, _gloffset_BindFramebufferEXT)
 	GL_STUB(glBindRenderbufferEXT, _gloffset_BindRenderbufferEXT)
 	GL_STUB(glCheckFramebufferStatusEXT, _gloffset_CheckFramebufferStatusEXT)
@@ -997,28 +1004,28 @@ gl_dispatch_functions_start:
 	GL_STUB(glIsFramebufferEXT, _gloffset_IsFramebufferEXT)
 	GL_STUB(glIsRenderbufferEXT, _gloffset_IsRenderbufferEXT)
 	GL_STUB(glRenderbufferStorageEXT, _gloffset_RenderbufferStorageEXT)
-	GL_STUB(gl_dispatch_stub_773, _gloffset_BlitFramebufferEXT)
-	HIDDEN(gl_dispatch_stub_773)
-	GL_STUB(gl_dispatch_stub_774, _gloffset_BufferParameteriAPPLE)
-	HIDDEN(gl_dispatch_stub_774)
-	GL_STUB(gl_dispatch_stub_775, _gloffset_FlushMappedBufferRangeAPPLE)
-	HIDDEN(gl_dispatch_stub_775)
-	GL_STUB(glFramebufferTextureLayerEXT, _gloffset_FramebufferTextureLayerEXT)
-	GL_STUB(glProvokingVertexEXT, _gloffset_ProvokingVertexEXT)
-	GL_STUB(gl_dispatch_stub_778, _gloffset_GetTexParameterPointervAPPLE)
-	HIDDEN(gl_dispatch_stub_778)
-	GL_STUB(gl_dispatch_stub_779, _gloffset_TextureRangeAPPLE)
-	HIDDEN(gl_dispatch_stub_779)
-	GL_STUB(gl_dispatch_stub_780, _gloffset_StencilFuncSeparateATI)
+	GL_STUB(gl_dispatch_stub_780, _gloffset_BlitFramebufferEXT)
 	HIDDEN(gl_dispatch_stub_780)
-	GL_STUB(gl_dispatch_stub_781, _gloffset_ProgramEnvParameters4fvEXT)
+	GL_STUB(gl_dispatch_stub_781, _gloffset_BufferParameteriAPPLE)
 	HIDDEN(gl_dispatch_stub_781)
-	GL_STUB(gl_dispatch_stub_782, _gloffset_ProgramLocalParameters4fvEXT)
+	GL_STUB(gl_dispatch_stub_782, _gloffset_FlushMappedBufferRangeAPPLE)
 	HIDDEN(gl_dispatch_stub_782)
-	GL_STUB(gl_dispatch_stub_783, _gloffset_GetQueryObjecti64vEXT)
-	HIDDEN(gl_dispatch_stub_783)
-	GL_STUB(gl_dispatch_stub_784, _gloffset_GetQueryObjectui64vEXT)
-	HIDDEN(gl_dispatch_stub_784)
+	GL_STUB(glFramebufferTextureLayerEXT, _gloffset_FramebufferTextureLayerEXT)
+	GL_STUB(glProvokingVertexEXT, _gloffset_ProvokingVertexEXT)
+	GL_STUB(gl_dispatch_stub_785, _gloffset_GetTexParameterPointervAPPLE)
+	HIDDEN(gl_dispatch_stub_785)
+	GL_STUB(gl_dispatch_stub_786, _gloffset_TextureRangeAPPLE)
+	HIDDEN(gl_dispatch_stub_786)
+	GL_STUB(gl_dispatch_stub_787, _gloffset_StencilFuncSeparateATI)
+	HIDDEN(gl_dispatch_stub_787)
+	GL_STUB(gl_dispatch_stub_788, _gloffset_ProgramEnvParameters4fvEXT)
+	HIDDEN(gl_dispatch_stub_788)
+	GL_STUB(gl_dispatch_stub_789, _gloffset_ProgramLocalParameters4fvEXT)
+	HIDDEN(gl_dispatch_stub_789)
+	GL_STUB(gl_dispatch_stub_790, _gloffset_GetQueryObjecti64vEXT)
+	HIDDEN(gl_dispatch_stub_790)
+	GL_STUB(gl_dispatch_stub_791, _gloffset_GetQueryObjectui64vEXT)
+	HIDDEN(gl_dispatch_stub_791)
 	GL_STUB_ALIAS(glArrayElementEXT, glArrayElement)
 	GL_STUB_ALIAS(glBindTextureEXT, glBindTexture)
 	GL_STUB_ALIAS(glDrawArraysEXT, glDrawArrays)
diff --git a/src/mesa/x86-64/glapi_x86-64.S b/src/mesa/x86-64/glapi_x86-64.S
index 10525d4c65..db917f3982 100644
--- a/src/mesa/x86-64/glapi_x86-64.S
+++ b/src/mesa/x86-64/glapi_x86-64.S
@@ -21349,13 +21349,264 @@ GL_PREFIX(CopyBufferSubData):
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CopyBufferSubData), .-GL_PREFIX(CopyBufferSubData)
 
+	.p2align	4,,15
+	.globl	GL_PREFIX(ClientWaitSync)
+	.type	GL_PREFIX(ClientWaitSync), @function
+GL_PREFIX(ClientWaitSync):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	4536(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_x86_64_get_dispatch@PLT
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	4536(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	4536(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_glapi_get_dispatch
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	4536(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(ClientWaitSync), .-GL_PREFIX(ClientWaitSync)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(DeleteSync)
+	.type	GL_PREFIX(DeleteSync), @function
+GL_PREFIX(DeleteSync):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	4544(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	call	_x86_64_get_dispatch@PLT
+	popq	%rdi
+	movq	4544(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	4544(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	call	_glapi_get_dispatch
+	popq	%rdi
+	movq	4544(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(DeleteSync), .-GL_PREFIX(DeleteSync)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(FenceSync)
+	.type	GL_PREFIX(FenceSync), @function
+GL_PREFIX(FenceSync):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	4552(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
+	call	_x86_64_get_dispatch@PLT
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
+	movq	4552(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	4552(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
+	call	_glapi_get_dispatch
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
+	movq	4552(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(FenceSync), .-GL_PREFIX(FenceSync)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(GetInteger64v)
+	.type	GL_PREFIX(GetInteger64v), @function
+GL_PREFIX(GetInteger64v):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	4560(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
+	call	_x86_64_get_dispatch@PLT
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
+	movq	4560(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	4560(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
+	call	_glapi_get_dispatch
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
+	movq	4560(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(GetInteger64v), .-GL_PREFIX(GetInteger64v)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(GetSynciv)
+	.type	GL_PREFIX(GetSynciv), @function
+GL_PREFIX(GetSynciv):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	4568(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	pushq	%rcx
+	pushq	%r8
+	call	_x86_64_get_dispatch@PLT
+	popq	%r8
+	popq	%rcx
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	4568(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	4568(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	pushq	%rcx
+	pushq	%r8
+	call	_glapi_get_dispatch
+	popq	%r8
+	popq	%rcx
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	4568(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(GetSynciv), .-GL_PREFIX(GetSynciv)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(IsSync)
+	.type	GL_PREFIX(IsSync), @function
+GL_PREFIX(IsSync):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	4576(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	call	_x86_64_get_dispatch@PLT
+	popq	%rdi
+	movq	4576(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	4576(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	call	_glapi_get_dispatch
+	popq	%rdi
+	movq	4576(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(IsSync), .-GL_PREFIX(IsSync)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(WaitSync)
+	.type	GL_PREFIX(WaitSync), @function
+GL_PREFIX(WaitSync):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	4584(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_x86_64_get_dispatch@PLT
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	4584(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	4584(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_glapi_get_dispatch
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	4584(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(WaitSync), .-GL_PREFIX(WaitSync)
+
 	.p2align	4,,15
 	.globl	GL_PREFIX(PolygonOffsetEXT)
 	.type	GL_PREFIX(PolygonOffsetEXT), @function
 GL_PREFIX(PolygonOffsetEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4536(%rax), %r11
+	movq	4592(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -21365,13 +21616,13 @@ GL_PREFIX(PolygonOffsetEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	4536(%rax), %r11
+	movq	4592(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4536(%rax), %r11
+	movq	4592(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -21381,19 +21632,19 @@ GL_PREFIX(PolygonOffsetEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	4536(%rax), %r11
+	movq	4592(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PolygonOffsetEXT), .-GL_PREFIX(PolygonOffsetEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_568)
-	.type	GL_PREFIX(_dispatch_stub_568), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_568))
-GL_PREFIX(_dispatch_stub_568):
+	.globl	GL_PREFIX(_dispatch_stub_575)
+	.type	GL_PREFIX(_dispatch_stub_575), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_575))
+GL_PREFIX(_dispatch_stub_575):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4544(%rax), %r11
+	movq	4600(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21403,13 +21654,13 @@ GL_PREFIX(_dispatch_stub_568):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4544(%rax), %r11
+	movq	4600(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4544(%rax), %r11
+	movq	4600(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21419,19 +21670,19 @@ GL_PREFIX(_dispatch_stub_568):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4544(%rax), %r11
+	movq	4600(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_568), .-GL_PREFIX(_dispatch_stub_568)
+	.size	GL_PREFIX(_dispatch_stub_575), .-GL_PREFIX(_dispatch_stub_575)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_569)
-	.type	GL_PREFIX(_dispatch_stub_569), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_569))
-GL_PREFIX(_dispatch_stub_569):
+	.globl	GL_PREFIX(_dispatch_stub_576)
+	.type	GL_PREFIX(_dispatch_stub_576), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_576))
+GL_PREFIX(_dispatch_stub_576):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4552(%rax), %r11
+	movq	4608(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21441,13 +21692,13 @@ GL_PREFIX(_dispatch_stub_569):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4552(%rax), %r11
+	movq	4608(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4552(%rax), %r11
+	movq	4608(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21457,19 +21708,19 @@ GL_PREFIX(_dispatch_stub_569):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4552(%rax), %r11
+	movq	4608(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_569), .-GL_PREFIX(_dispatch_stub_569)
+	.size	GL_PREFIX(_dispatch_stub_576), .-GL_PREFIX(_dispatch_stub_576)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_570)
-	.type	GL_PREFIX(_dispatch_stub_570), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_570))
-GL_PREFIX(_dispatch_stub_570):
+	.globl	GL_PREFIX(_dispatch_stub_577)
+	.type	GL_PREFIX(_dispatch_stub_577), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_577))
+GL_PREFIX(_dispatch_stub_577):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4560(%rax), %r11
+	movq	4616(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -21479,13 +21730,13 @@ GL_PREFIX(_dispatch_stub_570):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	4560(%rax), %r11
+	movq	4616(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4560(%rax), %r11
+	movq	4616(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -21495,19 +21746,19 @@ GL_PREFIX(_dispatch_stub_570):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	4560(%rax), %r11
+	movq	4616(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_570), .-GL_PREFIX(_dispatch_stub_570)
+	.size	GL_PREFIX(_dispatch_stub_577), .-GL_PREFIX(_dispatch_stub_577)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_571)
-	.type	GL_PREFIX(_dispatch_stub_571), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_571))
-GL_PREFIX(_dispatch_stub_571):
+	.globl	GL_PREFIX(_dispatch_stub_578)
+	.type	GL_PREFIX(_dispatch_stub_578), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_578))
+GL_PREFIX(_dispatch_stub_578):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4568(%rax), %r11
+	movq	4624(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21517,13 +21768,13 @@ GL_PREFIX(_dispatch_stub_571):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4568(%rax), %r11
+	movq	4624(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4568(%rax), %r11
+	movq	4624(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21533,19 +21784,19 @@ GL_PREFIX(_dispatch_stub_571):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4568(%rax), %r11
+	movq	4624(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_571), .-GL_PREFIX(_dispatch_stub_571)
+	.size	GL_PREFIX(_dispatch_stub_578), .-GL_PREFIX(_dispatch_stub_578)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_572)
-	.type	GL_PREFIX(_dispatch_stub_572), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_572))
-GL_PREFIX(_dispatch_stub_572):
+	.globl	GL_PREFIX(_dispatch_stub_579)
+	.type	GL_PREFIX(_dispatch_stub_579), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_579))
+GL_PREFIX(_dispatch_stub_579):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4576(%rax), %r11
+	movq	4632(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21555,13 +21806,13 @@ GL_PREFIX(_dispatch_stub_572):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4576(%rax), %r11
+	movq	4632(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4576(%rax), %r11
+	movq	4632(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21571,19 +21822,19 @@ GL_PREFIX(_dispatch_stub_572):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4576(%rax), %r11
+	movq	4632(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_572), .-GL_PREFIX(_dispatch_stub_572)
+	.size	GL_PREFIX(_dispatch_stub_579), .-GL_PREFIX(_dispatch_stub_579)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_573)
-	.type	GL_PREFIX(_dispatch_stub_573), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_573))
-GL_PREFIX(_dispatch_stub_573):
+	.globl	GL_PREFIX(_dispatch_stub_580)
+	.type	GL_PREFIX(_dispatch_stub_580), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_580))
+GL_PREFIX(_dispatch_stub_580):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4584(%rax), %r11
+	movq	4640(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21593,13 +21844,13 @@ GL_PREFIX(_dispatch_stub_573):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4584(%rax), %r11
+	movq	4640(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4584(%rax), %r11
+	movq	4640(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21609,19 +21860,19 @@ GL_PREFIX(_dispatch_stub_573):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4584(%rax), %r11
+	movq	4640(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_573), .-GL_PREFIX(_dispatch_stub_573)
+	.size	GL_PREFIX(_dispatch_stub_580), .-GL_PREFIX(_dispatch_stub_580)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_574)
-	.type	GL_PREFIX(_dispatch_stub_574), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_574))
-GL_PREFIX(_dispatch_stub_574):
+	.globl	GL_PREFIX(_dispatch_stub_581)
+	.type	GL_PREFIX(_dispatch_stub_581), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_581))
+GL_PREFIX(_dispatch_stub_581):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4592(%rax), %r11
+	movq	4648(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21631,13 +21882,13 @@ GL_PREFIX(_dispatch_stub_574):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4592(%rax), %r11
+	movq	4648(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4592(%rax), %r11
+	movq	4648(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21647,40 +21898,40 @@ GL_PREFIX(_dispatch_stub_574):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4592(%rax), %r11
+	movq	4648(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_574), .-GL_PREFIX(_dispatch_stub_574)
+	.size	GL_PREFIX(_dispatch_stub_581), .-GL_PREFIX(_dispatch_stub_581)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_575)
-	.type	GL_PREFIX(_dispatch_stub_575), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_575))
-GL_PREFIX(_dispatch_stub_575):
+	.globl	GL_PREFIX(_dispatch_stub_582)
+	.type	GL_PREFIX(_dispatch_stub_582), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_582))
+GL_PREFIX(_dispatch_stub_582):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4600(%rax), %r11
+	movq	4656(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4600(%rax), %r11
+	movq	4656(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4600(%rax), %r11
+	movq	4656(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4600(%rax), %r11
+	movq	4656(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_575), .-GL_PREFIX(_dispatch_stub_575)
+	.size	GL_PREFIX(_dispatch_stub_582), .-GL_PREFIX(_dispatch_stub_582)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(ColorPointerEXT)
@@ -21688,7 +21939,7 @@ GL_PREFIX(_dispatch_stub_575):
 GL_PREFIX(ColorPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4608(%rax), %r11
+	movq	4664(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21702,13 +21953,13 @@ GL_PREFIX(ColorPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4608(%rax), %r11
+	movq	4664(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4608(%rax), %r11
+	movq	4664(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21722,7 +21973,7 @@ GL_PREFIX(ColorPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4608(%rax), %r11
+	movq	4664(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorPointerEXT), .-GL_PREFIX(ColorPointerEXT)
@@ -21733,7 +21984,7 @@ GL_PREFIX(ColorPointerEXT):
 GL_PREFIX(EdgeFlagPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4616(%rax), %r11
+	movq	4672(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21743,13 +21994,13 @@ GL_PREFIX(EdgeFlagPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4616(%rax), %r11
+	movq	4672(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4616(%rax), %r11
+	movq	4672(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21759,7 +22010,7 @@ GL_PREFIX(EdgeFlagPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4616(%rax), %r11
+	movq	4672(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EdgeFlagPointerEXT), .-GL_PREFIX(EdgeFlagPointerEXT)
@@ -21770,7 +22021,7 @@ GL_PREFIX(EdgeFlagPointerEXT):
 GL_PREFIX(IndexPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4624(%rax), %r11
+	movq	4680(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21784,13 +22035,13 @@ GL_PREFIX(IndexPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4624(%rax), %r11
+	movq	4680(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4624(%rax), %r11
+	movq	4680(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21804,7 +22055,7 @@ GL_PREFIX(IndexPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4624(%rax), %r11
+	movq	4680(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IndexPointerEXT), .-GL_PREFIX(IndexPointerEXT)
@@ -21815,7 +22066,7 @@ GL_PREFIX(IndexPointerEXT):
 GL_PREFIX(NormalPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4632(%rax), %r11
+	movq	4688(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21829,13 +22080,13 @@ GL_PREFIX(NormalPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4632(%rax), %r11
+	movq	4688(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4632(%rax), %r11
+	movq	4688(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21849,7 +22100,7 @@ GL_PREFIX(NormalPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4632(%rax), %r11
+	movq	4688(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(NormalPointerEXT), .-GL_PREFIX(NormalPointerEXT)
@@ -21860,7 +22111,7 @@ GL_PREFIX(NormalPointerEXT):
 GL_PREFIX(TexCoordPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4640(%rax), %r11
+	movq	4696(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21874,13 +22125,13 @@ GL_PREFIX(TexCoordPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4640(%rax), %r11
+	movq	4696(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4640(%rax), %r11
+	movq	4696(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21894,7 +22145,7 @@ GL_PREFIX(TexCoordPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4640(%rax), %r11
+	movq	4696(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexCoordPointerEXT), .-GL_PREFIX(TexCoordPointerEXT)
@@ -21905,7 +22156,7 @@ GL_PREFIX(TexCoordPointerEXT):
 GL_PREFIX(VertexPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4648(%rax), %r11
+	movq	4704(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21919,13 +22170,13 @@ GL_PREFIX(VertexPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4648(%rax), %r11
+	movq	4704(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4648(%rax), %r11
+	movq	4704(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21939,7 +22190,7 @@ GL_PREFIX(VertexPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4648(%rax), %r11
+	movq	4704(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexPointerEXT), .-GL_PREFIX(VertexPointerEXT)
@@ -21950,7 +22201,7 @@ GL_PREFIX(VertexPointerEXT):
 GL_PREFIX(PointParameterfEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4656(%rax), %r11
+	movq	4712(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -21960,13 +22211,13 @@ GL_PREFIX(PointParameterfEXT):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	4656(%rax), %r11
+	movq	4712(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4656(%rax), %r11
+	movq	4712(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -21976,7 +22227,7 @@ GL_PREFIX(PointParameterfEXT):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	4656(%rax), %r11
+	movq	4712(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PointParameterfEXT), .-GL_PREFIX(PointParameterfEXT)
@@ -21987,7 +22238,7 @@ GL_PREFIX(PointParameterfEXT):
 GL_PREFIX(PointParameterfvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4664(%rax), %r11
+	movq	4720(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21997,13 +22248,13 @@ GL_PREFIX(PointParameterfvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4664(%rax), %r11
+	movq	4720(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4664(%rax), %r11
+	movq	4720(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22013,7 +22264,7 @@ GL_PREFIX(PointParameterfvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4664(%rax), %r11
+	movq	4720(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PointParameterfvEXT), .-GL_PREFIX(PointParameterfvEXT)
@@ -22024,7 +22275,7 @@ GL_PREFIX(PointParameterfvEXT):
 GL_PREFIX(LockArraysEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4672(%rax), %r11
+	movq	4728(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22034,13 +22285,13 @@ GL_PREFIX(LockArraysEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4672(%rax), %r11
+	movq	4728(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4672(%rax), %r11
+	movq	4728(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22050,7 +22301,7 @@ GL_PREFIX(LockArraysEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4672(%rax), %r11
+	movq	4728(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(LockArraysEXT), .-GL_PREFIX(LockArraysEXT)
@@ -22061,37 +22312,37 @@ GL_PREFIX(LockArraysEXT):
 GL_PREFIX(UnlockArraysEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4680(%rax), %r11
+	movq	4736(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	4680(%rax), %r11
+	movq	4736(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4680(%rax), %r11
+	movq	4736(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	4680(%rax), %r11
+	movq	4736(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(UnlockArraysEXT), .-GL_PREFIX(UnlockArraysEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_586)
-	.type	GL_PREFIX(_dispatch_stub_586), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_586))
-GL_PREFIX(_dispatch_stub_586):
+	.globl	GL_PREFIX(_dispatch_stub_593)
+	.type	GL_PREFIX(_dispatch_stub_593), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_593))
+GL_PREFIX(_dispatch_stub_593):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4688(%rax), %r11
+	movq	4744(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22101,13 +22352,13 @@ GL_PREFIX(_dispatch_stub_586):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4688(%rax), %r11
+	movq	4744(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4688(%rax), %r11
+	movq	4744(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22117,19 +22368,19 @@ GL_PREFIX(_dispatch_stub_586):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4688(%rax), %r11
+	movq	4744(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_586), .-GL_PREFIX(_dispatch_stub_586)
+	.size	GL_PREFIX(_dispatch_stub_593), .-GL_PREFIX(_dispatch_stub_593)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_587)
-	.type	GL_PREFIX(_dispatch_stub_587), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_587))
-GL_PREFIX(_dispatch_stub_587):
+	.globl	GL_PREFIX(_dispatch_stub_594)
+	.type	GL_PREFIX(_dispatch_stub_594), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_594))
+GL_PREFIX(_dispatch_stub_594):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4696(%rax), %r11
+	movq	4752(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22139,13 +22390,13 @@ GL_PREFIX(_dispatch_stub_587):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4696(%rax), %r11
+	movq	4752(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4696(%rax), %r11
+	movq	4752(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22155,10 +22406,10 @@ GL_PREFIX(_dispatch_stub_587):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4696(%rax), %r11
+	movq	4752(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_587), .-GL_PREFIX(_dispatch_stub_587)
+	.size	GL_PREFIX(_dispatch_stub_594), .-GL_PREFIX(_dispatch_stub_594)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(SecondaryColor3bEXT)
@@ -22166,7 +22417,7 @@ GL_PREFIX(_dispatch_stub_587):
 GL_PREFIX(SecondaryColor3bEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4704(%rax), %r11
+	movq	4760(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22176,13 +22427,13 @@ GL_PREFIX(SecondaryColor3bEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4704(%rax), %r11
+	movq	4760(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4704(%rax), %r11
+	movq	4760(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22192,7 +22443,7 @@ GL_PREFIX(SecondaryColor3bEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4704(%rax), %r11
+	movq	4760(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3bEXT), .-GL_PREFIX(SecondaryColor3bEXT)
@@ -22203,25 +22454,25 @@ GL_PREFIX(SecondaryColor3bEXT):
 GL_PREFIX(SecondaryColor3bvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4712(%rax), %r11
+	movq	4768(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4712(%rax), %r11
+	movq	4768(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4712(%rax), %r11
+	movq	4768(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4712(%rax), %r11
+	movq	4768(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3bvEXT), .-GL_PREFIX(SecondaryColor3bvEXT)
@@ -22232,7 +22483,7 @@ GL_PREFIX(SecondaryColor3bvEXT):
 GL_PREFIX(SecondaryColor3dEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4720(%rax), %r11
+	movq	4776(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -22244,13 +22495,13 @@ GL_PREFIX(SecondaryColor3dEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	4720(%rax), %r11
+	movq	4776(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4720(%rax), %r11
+	movq	4776(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -22262,7 +22513,7 @@ GL_PREFIX(SecondaryColor3dEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	4720(%rax), %r11
+	movq	4776(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3dEXT), .-GL_PREFIX(SecondaryColor3dEXT)
@@ -22273,25 +22524,25 @@ GL_PREFIX(SecondaryColor3dEXT):
 GL_PREFIX(SecondaryColor3dvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4728(%rax), %r11
+	movq	4784(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4728(%rax), %r11
+	movq	4784(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4728(%rax), %r11
+	movq	4784(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4728(%rax), %r11
+	movq	4784(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3dvEXT), .-GL_PREFIX(SecondaryColor3dvEXT)
@@ -22302,7 +22553,7 @@ GL_PREFIX(SecondaryColor3dvEXT):
 GL_PREFIX(SecondaryColor3fEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4736(%rax), %r11
+	movq	4792(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -22314,13 +22565,13 @@ GL_PREFIX(SecondaryColor3fEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	4736(%rax), %r11
+	movq	4792(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4736(%rax), %r11
+	movq	4792(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -22332,7 +22583,7 @@ GL_PREFIX(SecondaryColor3fEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	4736(%rax), %r11
+	movq	4792(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3fEXT), .-GL_PREFIX(SecondaryColor3fEXT)
@@ -22343,25 +22594,25 @@ GL_PREFIX(SecondaryColor3fEXT):
 GL_PREFIX(SecondaryColor3fvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4744(%rax), %r11
+	movq	4800(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4744(%rax), %r11
+	movq	4800(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4744(%rax), %r11
+	movq	4800(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4744(%rax), %r11
+	movq	4800(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3fvEXT), .-GL_PREFIX(SecondaryColor3fvEXT)
@@ -22372,7 +22623,7 @@ GL_PREFIX(SecondaryColor3fvEXT):
 GL_PREFIX(SecondaryColor3iEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4752(%rax), %r11
+	movq	4808(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22382,13 +22633,13 @@ GL_PREFIX(SecondaryColor3iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4752(%rax), %r11
+	movq	4808(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4752(%rax), %r11
+	movq	4808(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22398,7 +22649,7 @@ GL_PREFIX(SecondaryColor3iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4752(%rax), %r11
+	movq	4808(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3iEXT), .-GL_PREFIX(SecondaryColor3iEXT)
@@ -22409,25 +22660,25 @@ GL_PREFIX(SecondaryColor3iEXT):
 GL_PREFIX(SecondaryColor3ivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4760(%rax), %r11
+	movq	4816(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4760(%rax), %r11
+	movq	4816(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4760(%rax), %r11
+	movq	4816(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4760(%rax), %r11
+	movq	4816(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3ivEXT), .-GL_PREFIX(SecondaryColor3ivEXT)
@@ -22438,7 +22689,7 @@ GL_PREFIX(SecondaryColor3ivEXT):
 GL_PREFIX(SecondaryColor3sEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4768(%rax), %r11
+	movq	4824(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22448,13 +22699,13 @@ GL_PREFIX(SecondaryColor3sEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4768(%rax), %r11
+	movq	4824(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4768(%rax), %r11
+	movq	4824(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22464,7 +22715,7 @@ GL_PREFIX(SecondaryColor3sEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4768(%rax), %r11
+	movq	4824(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3sEXT), .-GL_PREFIX(SecondaryColor3sEXT)
@@ -22475,25 +22726,25 @@ GL_PREFIX(SecondaryColor3sEXT):
 GL_PREFIX(SecondaryColor3svEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4776(%rax), %r11
+	movq	4832(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4776(%rax), %r11
+	movq	4832(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4776(%rax), %r11
+	movq	4832(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4776(%rax), %r11
+	movq	4832(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3svEXT), .-GL_PREFIX(SecondaryColor3svEXT)
@@ -22504,7 +22755,7 @@ GL_PREFIX(SecondaryColor3svEXT):
 GL_PREFIX(SecondaryColor3ubEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4784(%rax), %r11
+	movq	4840(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22514,13 +22765,13 @@ GL_PREFIX(SecondaryColor3ubEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4784(%rax), %r11
+	movq	4840(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4784(%rax), %r11
+	movq	4840(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22530,7 +22781,7 @@ GL_PREFIX(SecondaryColor3ubEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4784(%rax), %r11
+	movq	4840(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3ubEXT), .-GL_PREFIX(SecondaryColor3ubEXT)
@@ -22541,25 +22792,25 @@ GL_PREFIX(SecondaryColor3ubEXT):
 GL_PREFIX(SecondaryColor3ubvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4792(%rax), %r11
+	movq	4848(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4792(%rax), %r11
+	movq	4848(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4792(%rax), %r11
+	movq	4848(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4792(%rax), %r11
+	movq	4848(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3ubvEXT), .-GL_PREFIX(SecondaryColor3ubvEXT)
@@ -22570,7 +22821,7 @@ GL_PREFIX(SecondaryColor3ubvEXT):
 GL_PREFIX(SecondaryColor3uiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4800(%rax), %r11
+	movq	4856(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22580,13 +22831,13 @@ GL_PREFIX(SecondaryColor3uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4800(%rax), %r11
+	movq	4856(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4800(%rax), %r11
+	movq	4856(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22596,7 +22847,7 @@ GL_PREFIX(SecondaryColor3uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4800(%rax), %r11
+	movq	4856(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3uiEXT), .-GL_PREFIX(SecondaryColor3uiEXT)
@@ -22607,25 +22858,25 @@ GL_PREFIX(SecondaryColor3uiEXT):
 GL_PREFIX(SecondaryColor3uivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4808(%rax), %r11
+	movq	4864(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4808(%rax), %r11
+	movq	4864(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4808(%rax), %r11
+	movq	4864(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4808(%rax), %r11
+	movq	4864(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3uivEXT), .-GL_PREFIX(SecondaryColor3uivEXT)
@@ -22636,7 +22887,7 @@ GL_PREFIX(SecondaryColor3uivEXT):
 GL_PREFIX(SecondaryColor3usEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4816(%rax), %r11
+	movq	4872(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22646,13 +22897,13 @@ GL_PREFIX(SecondaryColor3usEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4816(%rax), %r11
+	movq	4872(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4816(%rax), %r11
+	movq	4872(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22662,7 +22913,7 @@ GL_PREFIX(SecondaryColor3usEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4816(%rax), %r11
+	movq	4872(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3usEXT), .-GL_PREFIX(SecondaryColor3usEXT)
@@ -22673,25 +22924,25 @@ GL_PREFIX(SecondaryColor3usEXT):
 GL_PREFIX(SecondaryColor3usvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4824(%rax), %r11
+	movq	4880(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4824(%rax), %r11
+	movq	4880(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4824(%rax), %r11
+	movq	4880(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4824(%rax), %r11
+	movq	4880(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3usvEXT), .-GL_PREFIX(SecondaryColor3usvEXT)
@@ -22702,7 +22953,7 @@ GL_PREFIX(SecondaryColor3usvEXT):
 GL_PREFIX(SecondaryColorPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4832(%rax), %r11
+	movq	4888(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22716,13 +22967,13 @@ GL_PREFIX(SecondaryColorPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4832(%rax), %r11
+	movq	4888(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4832(%rax), %r11
+	movq	4888(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22736,7 +22987,7 @@ GL_PREFIX(SecondaryColorPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4832(%rax), %r11
+	movq	4888(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColorPointerEXT), .-GL_PREFIX(SecondaryColorPointerEXT)
@@ -22747,7 +22998,7 @@ GL_PREFIX(SecondaryColorPointerEXT):
 GL_PREFIX(MultiDrawArraysEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4840(%rax), %r11
+	movq	4896(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22761,13 +23012,13 @@ GL_PREFIX(MultiDrawArraysEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4840(%rax), %r11
+	movq	4896(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4840(%rax), %r11
+	movq	4896(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22781,7 +23032,7 @@ GL_PREFIX(MultiDrawArraysEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4840(%rax), %r11
+	movq	4896(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(MultiDrawArraysEXT), .-GL_PREFIX(MultiDrawArraysEXT)
@@ -22792,7 +23043,7 @@ GL_PREFIX(MultiDrawArraysEXT):
 GL_PREFIX(MultiDrawElementsEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4848(%rax), %r11
+	movq	4904(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22806,13 +23057,13 @@ GL_PREFIX(MultiDrawElementsEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4848(%rax), %r11
+	movq	4904(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4848(%rax), %r11
+	movq	4904(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22826,7 +23077,7 @@ GL_PREFIX(MultiDrawElementsEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4848(%rax), %r11
+	movq	4904(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(MultiDrawElementsEXT), .-GL_PREFIX(MultiDrawElementsEXT)
@@ -22837,7 +23088,7 @@ GL_PREFIX(MultiDrawElementsEXT):
 GL_PREFIX(FogCoordPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4856(%rax), %r11
+	movq	4912(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22847,13 +23098,13 @@ GL_PREFIX(FogCoordPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4856(%rax), %r11
+	movq	4912(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4856(%rax), %r11
+	movq	4912(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22863,7 +23114,7 @@ GL_PREFIX(FogCoordPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4856(%rax), %r11
+	movq	4912(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoordPointerEXT), .-GL_PREFIX(FogCoordPointerEXT)
@@ -22874,7 +23125,7 @@ GL_PREFIX(FogCoordPointerEXT):
 GL_PREFIX(FogCoorddEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4864(%rax), %r11
+	movq	4920(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$8, %rsp
@@ -22882,13 +23133,13 @@ GL_PREFIX(FogCoorddEXT):
 	call	_x86_64_get_dispatch@PLT
 	movq	(%rsp), %xmm0
 	addq	$8, %rsp
-	movq	4864(%rax), %r11
+	movq	4920(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4864(%rax), %r11
+	movq	4920(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$8, %rsp
@@ -22896,7 +23147,7 @@ GL_PREFIX(FogCoorddEXT):
 	call	_glapi_get_dispatch
 	movq	(%rsp), %xmm0
 	addq	$8, %rsp
-	movq	4864(%rax), %r11
+	movq	4920(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoorddEXT), .-GL_PREFIX(FogCoorddEXT)
@@ -22907,25 +23158,25 @@ GL_PREFIX(FogCoorddEXT):
 GL_PREFIX(FogCoorddvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4872(%rax), %r11
+	movq	4928(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4872(%rax), %r11
+	movq	4928(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4872(%rax), %r11
+	movq	4928(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4872(%rax), %r11
+	movq	4928(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoorddvEXT), .-GL_PREFIX(FogCoorddvEXT)
@@ -22936,7 +23187,7 @@ GL_PREFIX(FogCoorddvEXT):
 GL_PREFIX(FogCoordfEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4880(%rax), %r11
+	movq	4936(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$8, %rsp
@@ -22944,13 +23195,13 @@ GL_PREFIX(FogCoordfEXT):
 	call	_x86_64_get_dispatch@PLT
 	movq	(%rsp), %xmm0
 	addq	$8, %rsp
-	movq	4880(%rax), %r11
+	movq	4936(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4880(%rax), %r11
+	movq	4936(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$8, %rsp
@@ -22958,7 +23209,7 @@ GL_PREFIX(FogCoordfEXT):
 	call	_glapi_get_dispatch
 	movq	(%rsp), %xmm0
 	addq	$8, %rsp
-	movq	4880(%rax), %r11
+	movq	4936(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoordfEXT), .-GL_PREFIX(FogCoordfEXT)
@@ -22969,58 +23220,58 @@ GL_PREFIX(FogCoordfEXT):
 GL_PREFIX(FogCoordfvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4888(%rax), %r11
+	movq	4944(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4888(%rax), %r11
+	movq	4944(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4888(%rax), %r11
+	movq	4944(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4888(%rax), %r11
+	movq	4944(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoordfvEXT), .-GL_PREFIX(FogCoordfvEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_612)
-	.type	GL_PREFIX(_dispatch_stub_612), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_612))
-GL_PREFIX(_dispatch_stub_612):
+	.globl	GL_PREFIX(_dispatch_stub_619)
+	.type	GL_PREFIX(_dispatch_stub_619), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_619))
+GL_PREFIX(_dispatch_stub_619):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4896(%rax), %r11
+	movq	4952(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4896(%rax), %r11
+	movq	4952(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4896(%rax), %r11
+	movq	4952(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4896(%rax), %r11
+	movq	4952(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_612), .-GL_PREFIX(_dispatch_stub_612)
+	.size	GL_PREFIX(_dispatch_stub_619), .-GL_PREFIX(_dispatch_stub_619)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(BlendFuncSeparateEXT)
@@ -23028,7 +23279,7 @@ GL_PREFIX(_dispatch_stub_612):
 GL_PREFIX(BlendFuncSeparateEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4904(%rax), %r11
+	movq	4960(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23042,13 +23293,13 @@ GL_PREFIX(BlendFuncSeparateEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4904(%rax), %r11
+	movq	4960(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4904(%rax), %r11
+	movq	4960(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23062,7 +23313,7 @@ GL_PREFIX(BlendFuncSeparateEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4904(%rax), %r11
+	movq	4960(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BlendFuncSeparateEXT), .-GL_PREFIX(BlendFuncSeparateEXT)
@@ -23073,25 +23324,25 @@ GL_PREFIX(BlendFuncSeparateEXT):
 GL_PREFIX(FlushVertexArrayRangeNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4912(%rax), %r11
+	movq	4968(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	4912(%rax), %r11
+	movq	4968(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4912(%rax), %r11
+	movq	4968(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	4912(%rax), %r11
+	movq	4968(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FlushVertexArrayRangeNV), .-GL_PREFIX(FlushVertexArrayRangeNV)
@@ -23102,7 +23353,7 @@ GL_PREFIX(FlushVertexArrayRangeNV):
 GL_PREFIX(VertexArrayRangeNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4920(%rax), %r11
+	movq	4976(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23112,13 +23363,13 @@ GL_PREFIX(VertexArrayRangeNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4920(%rax), %r11
+	movq	4976(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4920(%rax), %r11
+	movq	4976(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23128,7 +23379,7 @@ GL_PREFIX(VertexArrayRangeNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4920(%rax), %r11
+	movq	4976(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexArrayRangeNV), .-GL_PREFIX(VertexArrayRangeNV)
@@ -23139,7 +23390,7 @@ GL_PREFIX(VertexArrayRangeNV):
 GL_PREFIX(CombinerInputNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4928(%rax), %r11
+	movq	4984(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23157,13 +23408,13 @@ GL_PREFIX(CombinerInputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4928(%rax), %r11
+	movq	4984(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4928(%rax), %r11
+	movq	4984(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23181,7 +23432,7 @@ GL_PREFIX(CombinerInputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4928(%rax), %r11
+	movq	4984(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerInputNV), .-GL_PREFIX(CombinerInputNV)
@@ -23192,7 +23443,7 @@ GL_PREFIX(CombinerInputNV):
 GL_PREFIX(CombinerOutputNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4936(%rax), %r11
+	movq	4992(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23210,13 +23461,13 @@ GL_PREFIX(CombinerOutputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4936(%rax), %r11
+	movq	4992(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4936(%rax), %r11
+	movq	4992(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23234,7 +23485,7 @@ GL_PREFIX(CombinerOutputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4936(%rax), %r11
+	movq	4992(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerOutputNV), .-GL_PREFIX(CombinerOutputNV)
@@ -23245,7 +23496,7 @@ GL_PREFIX(CombinerOutputNV):
 GL_PREFIX(CombinerParameterfNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4944(%rax), %r11
+	movq	5000(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -23255,13 +23506,13 @@ GL_PREFIX(CombinerParameterfNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	4944(%rax), %r11
+	movq	5000(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4944(%rax), %r11
+	movq	5000(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -23271,7 +23522,7 @@ GL_PREFIX(CombinerParameterfNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	4944(%rax), %r11
+	movq	5000(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerParameterfNV), .-GL_PREFIX(CombinerParameterfNV)
@@ -23282,7 +23533,7 @@ GL_PREFIX(CombinerParameterfNV):
 GL_PREFIX(CombinerParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4952(%rax), %r11
+	movq	5008(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23292,13 +23543,13 @@ GL_PREFIX(CombinerParameterfvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4952(%rax), %r11
+	movq	5008(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4952(%rax), %r11
+	movq	5008(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23308,7 +23559,7 @@ GL_PREFIX(CombinerParameterfvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4952(%rax), %r11
+	movq	5008(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerParameterfvNV), .-GL_PREFIX(CombinerParameterfvNV)
@@ -23319,7 +23570,7 @@ GL_PREFIX(CombinerParameterfvNV):
 GL_PREFIX(CombinerParameteriNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4960(%rax), %r11
+	movq	5016(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23329,13 +23580,13 @@ GL_PREFIX(CombinerParameteriNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4960(%rax), %r11
+	movq	5016(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4960(%rax), %r11
+	movq	5016(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23345,7 +23596,7 @@ GL_PREFIX(CombinerParameteriNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4960(%rax), %r11
+	movq	5016(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerParameteriNV), .-GL_PREFIX(CombinerParameteriNV)
@@ -23356,7 +23607,7 @@ GL_PREFIX(CombinerParameteriNV):
 GL_PREFIX(CombinerParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4968(%rax), %r11
+	movq	5024(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23366,13 +23617,13 @@ GL_PREFIX(CombinerParameterivNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4968(%rax), %r11
+	movq	5024(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4968(%rax), %r11
+	movq	5024(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23382,7 +23633,7 @@ GL_PREFIX(CombinerParameterivNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4968(%rax), %r11
+	movq	5024(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerParameterivNV), .-GL_PREFIX(CombinerParameterivNV)
@@ -23393,7 +23644,7 @@ GL_PREFIX(CombinerParameterivNV):
 GL_PREFIX(FinalCombinerInputNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4976(%rax), %r11
+	movq	5032(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23407,13 +23658,13 @@ GL_PREFIX(FinalCombinerInputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4976(%rax), %r11
+	movq	5032(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4976(%rax), %r11
+	movq	5032(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23427,7 +23678,7 @@ GL_PREFIX(FinalCombinerInputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4976(%rax), %r11
+	movq	5032(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FinalCombinerInputNV), .-GL_PREFIX(FinalCombinerInputNV)
@@ -23438,7 +23689,7 @@ GL_PREFIX(FinalCombinerInputNV):
 GL_PREFIX(GetCombinerInputParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4984(%rax), %r11
+	movq	5040(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23452,13 +23703,13 @@ GL_PREFIX(GetCombinerInputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4984(%rax), %r11
+	movq	5040(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4984(%rax), %r11
+	movq	5040(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23472,7 +23723,7 @@ GL_PREFIX(GetCombinerInputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4984(%rax), %r11
+	movq	5040(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetCombinerInputParameterfvNV), .-GL_PREFIX(GetCombinerInputParameterfvNV)
@@ -23483,7 +23734,7 @@ GL_PREFIX(GetCombinerInputParameterfvNV):
 GL_PREFIX(GetCombinerInputParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4992(%rax), %r11
+	movq	5048(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23497,13 +23748,13 @@ GL_PREFIX(GetCombinerInputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4992(%rax), %r11
+	movq	5048(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4992(%rax), %r11
+	movq	5048(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23517,7 +23768,7 @@ GL_PREFIX(GetCombinerInputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4992(%rax), %r11
+	movq	5048(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetCombinerInputParameterivNV), .-GL_PREFIX(GetCombinerInputParameterivNV)
@@ -23528,7 +23779,7 @@ GL_PREFIX(GetCombinerInputParameterivNV):
 GL_PREFIX(GetCombinerOutputParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5000(%rax), %r11
+	movq	5056(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23542,13 +23793,13 @@ GL_PREFIX(GetCombinerOutputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5000(%rax), %r11
+	movq	5056(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5000(%rax), %r11
+	movq	5056(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23562,7 +23813,7 @@ GL_PREFIX(GetCombinerOutputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5000(%rax), %r11
+	movq	5056(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetCombinerOutputParameterfvNV), .-GL_PREFIX(GetCombinerOutputParameterfvNV)
@@ -23573,7 +23824,7 @@ GL_PREFIX(GetCombinerOutputParameterfvNV):
 GL_PREFIX(GetCombinerOutputParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5008(%rax), %r11
+	movq	5064(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23587,13 +23838,13 @@ GL_PREFIX(GetCombinerOutputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5008(%rax), %r11
+	movq	5064(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5008(%rax), %r11
+	movq	5064(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23607,7 +23858,7 @@ GL_PREFIX(GetCombinerOutputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5008(%rax), %r11
+	movq	5064(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetCombinerOutputParameterivNV), .-GL_PREFIX(GetCombinerOutputParameterivNV)
@@ -23618,7 +23869,7 @@ GL_PREFIX(GetCombinerOutputParameterivNV):
 GL_PREFIX(GetFinalCombinerInputParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5016(%rax), %r11
+	movq	5072(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23628,13 +23879,13 @@ GL_PREFIX(GetFinalCombinerInputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5016(%rax), %r11
+	movq	5072(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5016(%rax), %r11
+	movq	5072(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23644,7 +23895,7 @@ GL_PREFIX(GetFinalCombinerInputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5016(%rax), %r11
+	movq	5072(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetFinalCombinerInputParameterfvNV), .-GL_PREFIX(GetFinalCombinerInputParameterfvNV)
@@ -23655,7 +23906,7 @@ GL_PREFIX(GetFinalCombinerInputParameterfvNV):
 GL_PREFIX(GetFinalCombinerInputParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5024(%rax), %r11
+	movq	5080(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23665,13 +23916,13 @@ GL_PREFIX(GetFinalCombinerInputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5024(%rax), %r11
+	movq	5080(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5024(%rax), %r11
+	movq	5080(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23681,7 +23932,7 @@ GL_PREFIX(GetFinalCombinerInputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5024(%rax), %r11
+	movq	5080(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetFinalCombinerInputParameterivNV), .-GL_PREFIX(GetFinalCombinerInputParameterivNV)
@@ -23692,25 +23943,25 @@ GL_PREFIX(GetFinalCombinerInputParameterivNV):
 GL_PREFIX(ResizeBuffersMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5032(%rax), %r11
+	movq	5088(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	5032(%rax), %r11
+	movq	5088(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5032(%rax), %r11
+	movq	5088(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	5032(%rax), %r11
+	movq	5088(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ResizeBuffersMESA), .-GL_PREFIX(ResizeBuffersMESA)
@@ -23721,7 +23972,7 @@ GL_PREFIX(ResizeBuffersMESA):
 GL_PREFIX(WindowPos2dMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5040(%rax), %r11
+	movq	5096(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -23731,13 +23982,13 @@ GL_PREFIX(WindowPos2dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5040(%rax), %r11
+	movq	5096(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5040(%rax), %r11
+	movq	5096(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -23747,7 +23998,7 @@ GL_PREFIX(WindowPos2dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5040(%rax), %r11
+	movq	5096(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2dMESA), .-GL_PREFIX(WindowPos2dMESA)
@@ -23758,25 +24009,25 @@ GL_PREFIX(WindowPos2dMESA):
 GL_PREFIX(WindowPos2dvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5048(%rax), %r11
+	movq	5104(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5048(%rax), %r11
+	movq	5104(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5048(%rax), %r11
+	movq	5104(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5048(%rax), %r11
+	movq	5104(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2dvMESA), .-GL_PREFIX(WindowPos2dvMESA)
@@ -23787,7 +24038,7 @@ GL_PREFIX(WindowPos2dvMESA):
 GL_PREFIX(WindowPos2fMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5056(%rax), %r11
+	movq	5112(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -23797,13 +24048,13 @@ GL_PREFIX(WindowPos2fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5056(%rax), %r11
+	movq	5112(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5056(%rax), %r11
+	movq	5112(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -23813,7 +24064,7 @@ GL_PREFIX(WindowPos2fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5056(%rax), %r11
+	movq	5112(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2fMESA), .-GL_PREFIX(WindowPos2fMESA)
@@ -23824,25 +24075,25 @@ GL_PREFIX(WindowPos2fMESA):
 GL_PREFIX(WindowPos2fvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5064(%rax), %r11
+	movq	5120(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5064(%rax), %r11
+	movq	5120(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5064(%rax), %r11
+	movq	5120(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5064(%rax), %r11
+	movq	5120(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2fvMESA), .-GL_PREFIX(WindowPos2fvMESA)
@@ -23853,7 +24104,7 @@ GL_PREFIX(WindowPos2fvMESA):
 GL_PREFIX(WindowPos2iMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5072(%rax), %r11
+	movq	5128(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23863,13 +24114,13 @@ GL_PREFIX(WindowPos2iMESA):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5072(%rax), %r11
+	movq	5128(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5072(%rax), %r11
+	movq	5128(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23879,7 +24130,7 @@ GL_PREFIX(WindowPos2iMESA):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5072(%rax), %r11
+	movq	5128(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2iMESA), .-GL_PREFIX(WindowPos2iMESA)
@@ -23890,25 +24141,25 @@ GL_PREFIX(WindowPos2iMESA):
 GL_PREFIX(WindowPos2ivMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5080(%rax), %r11
+	movq	5136(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5080(%rax), %r11
+	movq	5136(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5080(%rax), %r11
+	movq	5136(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5080(%rax), %r11
+	movq	5136(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2ivMESA), .-GL_PREFIX(WindowPos2ivMESA)
@@ -23919,7 +24170,7 @@ GL_PREFIX(WindowPos2ivMESA):
 GL_PREFIX(WindowPos2sMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5088(%rax), %r11
+	movq	5144(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23929,13 +24180,13 @@ GL_PREFIX(WindowPos2sMESA):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5088(%rax), %r11
+	movq	5144(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5088(%rax), %r11
+	movq	5144(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23945,7 +24196,7 @@ GL_PREFIX(WindowPos2sMESA):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5088(%rax), %r11
+	movq	5144(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2sMESA), .-GL_PREFIX(WindowPos2sMESA)
@@ -23956,25 +24207,25 @@ GL_PREFIX(WindowPos2sMESA):
 GL_PREFIX(WindowPos2svMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5096(%rax), %r11
+	movq	5152(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5096(%rax), %r11
+	movq	5152(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5096(%rax), %r11
+	movq	5152(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5096(%rax), %r11
+	movq	5152(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2svMESA), .-GL_PREFIX(WindowPos2svMESA)
@@ -23985,7 +24236,7 @@ GL_PREFIX(WindowPos2svMESA):
 GL_PREFIX(WindowPos3dMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5104(%rax), %r11
+	movq	5160(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -23997,13 +24248,13 @@ GL_PREFIX(WindowPos3dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5104(%rax), %r11
+	movq	5160(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5104(%rax), %r11
+	movq	5160(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -24015,7 +24266,7 @@ GL_PREFIX(WindowPos3dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5104(%rax), %r11
+	movq	5160(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3dMESA), .-GL_PREFIX(WindowPos3dMESA)
@@ -24026,25 +24277,25 @@ GL_PREFIX(WindowPos3dMESA):
 GL_PREFIX(WindowPos3dvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5112(%rax), %r11
+	movq	5168(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5112(%rax), %r11
+	movq	5168(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5112(%rax), %r11
+	movq	5168(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5112(%rax), %r11
+	movq	5168(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3dvMESA), .-GL_PREFIX(WindowPos3dvMESA)
@@ -24055,7 +24306,7 @@ GL_PREFIX(WindowPos3dvMESA):
 GL_PREFIX(WindowPos3fMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5120(%rax), %r11
+	movq	5176(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -24067,13 +24318,13 @@ GL_PREFIX(WindowPos3fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5120(%rax), %r11
+	movq	5176(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5120(%rax), %r11
+	movq	5176(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -24085,7 +24336,7 @@ GL_PREFIX(WindowPos3fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5120(%rax), %r11
+	movq	5176(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3fMESA), .-GL_PREFIX(WindowPos3fMESA)
@@ -24096,25 +24347,25 @@ GL_PREFIX(WindowPos3fMESA):
 GL_PREFIX(WindowPos3fvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5128(%rax), %r11
+	movq	5184(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5128(%rax), %r11
+	movq	5184(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5128(%rax), %r11
+	movq	5184(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5128(%rax), %r11
+	movq	5184(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3fvMESA), .-GL_PREFIX(WindowPos3fvMESA)
@@ -24125,7 +24376,7 @@ GL_PREFIX(WindowPos3fvMESA):
 GL_PREFIX(WindowPos3iMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5136(%rax), %r11
+	movq	5192(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24135,13 +24386,13 @@ GL_PREFIX(WindowPos3iMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5136(%rax), %r11
+	movq	5192(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5136(%rax), %r11
+	movq	5192(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24151,7 +24402,7 @@ GL_PREFIX(WindowPos3iMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5136(%rax), %r11
+	movq	5192(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3iMESA), .-GL_PREFIX(WindowPos3iMESA)
@@ -24162,25 +24413,25 @@ GL_PREFIX(WindowPos3iMESA):
 GL_PREFIX(WindowPos3ivMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5144(%rax), %r11
+	movq	5200(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5144(%rax), %r11
+	movq	5200(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5144(%rax), %r11
+	movq	5200(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5144(%rax), %r11
+	movq	5200(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3ivMESA), .-GL_PREFIX(WindowPos3ivMESA)
@@ -24191,7 +24442,7 @@ GL_PREFIX(WindowPos3ivMESA):
 GL_PREFIX(WindowPos3sMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5152(%rax), %r11
+	movq	5208(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24201,13 +24452,13 @@ GL_PREFIX(WindowPos3sMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5152(%rax), %r11
+	movq	5208(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5152(%rax), %r11
+	movq	5208(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24217,7 +24468,7 @@ GL_PREFIX(WindowPos3sMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5152(%rax), %r11
+	movq	5208(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3sMESA), .-GL_PREFIX(WindowPos3sMESA)
@@ -24228,25 +24479,25 @@ GL_PREFIX(WindowPos3sMESA):
 GL_PREFIX(WindowPos3svMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5160(%rax), %r11
+	movq	5216(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5160(%rax), %r11
+	movq	5216(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5160(%rax), %r11
+	movq	5216(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5160(%rax), %r11
+	movq	5216(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3svMESA), .-GL_PREFIX(WindowPos3svMESA)
@@ -24257,7 +24508,7 @@ GL_PREFIX(WindowPos3svMESA):
 GL_PREFIX(WindowPos4dMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5168(%rax), %r11
+	movq	5224(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -24271,13 +24522,13 @@ GL_PREFIX(WindowPos4dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$40, %rsp
-	movq	5168(%rax), %r11
+	movq	5224(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5168(%rax), %r11
+	movq	5224(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -24291,7 +24542,7 @@ GL_PREFIX(WindowPos4dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$40, %rsp
-	movq	5168(%rax), %r11
+	movq	5224(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4dMESA), .-GL_PREFIX(WindowPos4dMESA)
@@ -24302,25 +24553,25 @@ GL_PREFIX(WindowPos4dMESA):
 GL_PREFIX(WindowPos4dvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5176(%rax), %r11
+	movq	5232(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5176(%rax), %r11
+	movq	5232(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5176(%rax), %r11
+	movq	5232(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5176(%rax), %r11
+	movq	5232(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4dvMESA), .-GL_PREFIX(WindowPos4dvMESA)
@@ -24331,7 +24582,7 @@ GL_PREFIX(WindowPos4dvMESA):
 GL_PREFIX(WindowPos4fMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5184(%rax), %r11
+	movq	5240(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -24345,13 +24596,13 @@ GL_PREFIX(WindowPos4fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$40, %rsp
-	movq	5184(%rax), %r11
+	movq	5240(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5184(%rax), %r11
+	movq	5240(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -24365,7 +24616,7 @@ GL_PREFIX(WindowPos4fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$40, %rsp
-	movq	5184(%rax), %r11
+	movq	5240(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4fMESA), .-GL_PREFIX(WindowPos4fMESA)
@@ -24376,25 +24627,25 @@ GL_PREFIX(WindowPos4fMESA):
 GL_PREFIX(WindowPos4fvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5192(%rax), %r11
+	movq	5248(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5192(%rax), %r11
+	movq	5248(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5192(%rax), %r11
+	movq	5248(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5192(%rax), %r11
+	movq	5248(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4fvMESA), .-GL_PREFIX(WindowPos4fvMESA)
@@ -24405,7 +24656,7 @@ GL_PREFIX(WindowPos4fvMESA):
 GL_PREFIX(WindowPos4iMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5200(%rax), %r11
+	movq	5256(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24419,13 +24670,13 @@ GL_PREFIX(WindowPos4iMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5200(%rax), %r11
+	movq	5256(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5200(%rax), %r11
+	movq	5256(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24439,7 +24690,7 @@ GL_PREFIX(WindowPos4iMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5200(%rax), %r11
+	movq	5256(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4iMESA), .-GL_PREFIX(WindowPos4iMESA)
@@ -24450,25 +24701,25 @@ GL_PREFIX(WindowPos4iMESA):
 GL_PREFIX(WindowPos4ivMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5208(%rax), %r11
+	movq	5264(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5208(%rax), %r11
+	movq	5264(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5208(%rax), %r11
+	movq	5264(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5208(%rax), %r11
+	movq	5264(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4ivMESA), .-GL_PREFIX(WindowPos4ivMESA)
@@ -24479,7 +24730,7 @@ GL_PREFIX(WindowPos4ivMESA):
 GL_PREFIX(WindowPos4sMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5216(%rax), %r11
+	movq	5272(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24493,13 +24744,13 @@ GL_PREFIX(WindowPos4sMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5216(%rax), %r11
+	movq	5272(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5216(%rax), %r11
+	movq	5272(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24513,7 +24764,7 @@ GL_PREFIX(WindowPos4sMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5216(%rax), %r11
+	movq	5272(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4sMESA), .-GL_PREFIX(WindowPos4sMESA)
@@ -24524,37 +24775,37 @@ GL_PREFIX(WindowPos4sMESA):
 GL_PREFIX(WindowPos4svMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5224(%rax), %r11
+	movq	5280(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5224(%rax), %r11
+	movq	5280(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5224(%rax), %r11
+	movq	5280(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5224(%rax), %r11
+	movq	5280(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4svMESA), .-GL_PREFIX(WindowPos4svMESA)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_654)
-	.type	GL_PREFIX(_dispatch_stub_654), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_654))
-GL_PREFIX(_dispatch_stub_654):
+	.globl	GL_PREFIX(_dispatch_stub_661)
+	.type	GL_PREFIX(_dispatch_stub_661), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_661))
+GL_PREFIX(_dispatch_stub_661):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5232(%rax), %r11
+	movq	5288(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24568,13 +24819,13 @@ GL_PREFIX(_dispatch_stub_654):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5232(%rax), %r11
+	movq	5288(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5232(%rax), %r11
+	movq	5288(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24588,19 +24839,19 @@ GL_PREFIX(_dispatch_stub_654):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5232(%rax), %r11
+	movq	5288(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_654), .-GL_PREFIX(_dispatch_stub_654)
+	.size	GL_PREFIX(_dispatch_stub_661), .-GL_PREFIX(_dispatch_stub_661)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_655)
-	.type	GL_PREFIX(_dispatch_stub_655), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_655))
-GL_PREFIX(_dispatch_stub_655):
+	.globl	GL_PREFIX(_dispatch_stub_662)
+	.type	GL_PREFIX(_dispatch_stub_662), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_662))
+GL_PREFIX(_dispatch_stub_662):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5240(%rax), %r11
+	movq	5296(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24618,13 +24869,13 @@ GL_PREFIX(_dispatch_stub_655):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5240(%rax), %r11
+	movq	5296(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5240(%rax), %r11
+	movq	5296(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24642,19 +24893,19 @@ GL_PREFIX(_dispatch_stub_655):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5240(%rax), %r11
+	movq	5296(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_655), .-GL_PREFIX(_dispatch_stub_655)
+	.size	GL_PREFIX(_dispatch_stub_662), .-GL_PREFIX(_dispatch_stub_662)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_656)
-	.type	GL_PREFIX(_dispatch_stub_656), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_656))
-GL_PREFIX(_dispatch_stub_656):
+	.globl	GL_PREFIX(_dispatch_stub_663)
+	.type	GL_PREFIX(_dispatch_stub_663), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_663))
+GL_PREFIX(_dispatch_stub_663):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5248(%rax), %r11
+	movq	5304(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24664,13 +24915,13 @@ GL_PREFIX(_dispatch_stub_656):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5248(%rax), %r11
+	movq	5304(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5248(%rax), %r11
+	movq	5304(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24680,49 +24931,49 @@ GL_PREFIX(_dispatch_stub_656):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5248(%rax), %r11
+	movq	5304(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_656), .-GL_PREFIX(_dispatch_stub_656)
+	.size	GL_PREFIX(_dispatch_stub_663), .-GL_PREFIX(_dispatch_stub_663)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_657)
-	.type	GL_PREFIX(_dispatch_stub_657), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_657))
-GL_PREFIX(_dispatch_stub_657):
+	.globl	GL_PREFIX(_dispatch_stub_664)
+	.type	GL_PREFIX(_dispatch_stub_664), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_664))
+GL_PREFIX(_dispatch_stub_664):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5256(%rax), %r11
+	movq	5312(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5256(%rax), %r11
+	movq	5312(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5256(%rax), %r11
+	movq	5312(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5256(%rax), %r11
+	movq	5312(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_657), .-GL_PREFIX(_dispatch_stub_657)
+	.size	GL_PREFIX(_dispatch_stub_664), .-GL_PREFIX(_dispatch_stub_664)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_658)
-	.type	GL_PREFIX(_dispatch_stub_658), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_658))
-GL_PREFIX(_dispatch_stub_658):
+	.globl	GL_PREFIX(_dispatch_stub_665)
+	.type	GL_PREFIX(_dispatch_stub_665), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_665))
+GL_PREFIX(_dispatch_stub_665):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5264(%rax), %r11
+	movq	5320(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24732,13 +24983,13 @@ GL_PREFIX(_dispatch_stub_658):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5264(%rax), %r11
+	movq	5320(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5264(%rax), %r11
+	movq	5320(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24748,19 +24999,19 @@ GL_PREFIX(_dispatch_stub_658):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5264(%rax), %r11
+	movq	5320(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_658), .-GL_PREFIX(_dispatch_stub_658)
+	.size	GL_PREFIX(_dispatch_stub_665), .-GL_PREFIX(_dispatch_stub_665)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_659)
-	.type	GL_PREFIX(_dispatch_stub_659), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_659))
-GL_PREFIX(_dispatch_stub_659):
+	.globl	GL_PREFIX(_dispatch_stub_666)
+	.type	GL_PREFIX(_dispatch_stub_666), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_666))
+GL_PREFIX(_dispatch_stub_666):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5272(%rax), %r11
+	movq	5328(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24770,13 +25021,13 @@ GL_PREFIX(_dispatch_stub_659):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5272(%rax), %r11
+	movq	5328(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5272(%rax), %r11
+	movq	5328(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24786,49 +25037,49 @@ GL_PREFIX(_dispatch_stub_659):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5272(%rax), %r11
+	movq	5328(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_659), .-GL_PREFIX(_dispatch_stub_659)
+	.size	GL_PREFIX(_dispatch_stub_666), .-GL_PREFIX(_dispatch_stub_666)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_660)
-	.type	GL_PREFIX(_dispatch_stub_660), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_660))
-GL_PREFIX(_dispatch_stub_660):
+	.globl	GL_PREFIX(_dispatch_stub_667)
+	.type	GL_PREFIX(_dispatch_stub_667), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_667))
+GL_PREFIX(_dispatch_stub_667):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5280(%rax), %r11
+	movq	5336(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5280(%rax), %r11
+	movq	5336(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5280(%rax), %r11
+	movq	5336(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5280(%rax), %r11
+	movq	5336(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_660), .-GL_PREFIX(_dispatch_stub_660)
+	.size	GL_PREFIX(_dispatch_stub_667), .-GL_PREFIX(_dispatch_stub_667)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_661)
-	.type	GL_PREFIX(_dispatch_stub_661), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_661))
-GL_PREFIX(_dispatch_stub_661):
+	.globl	GL_PREFIX(_dispatch_stub_668)
+	.type	GL_PREFIX(_dispatch_stub_668), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_668))
+GL_PREFIX(_dispatch_stub_668):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5288(%rax), %r11
+	movq	5344(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24838,13 +25089,13 @@ GL_PREFIX(_dispatch_stub_661):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5288(%rax), %r11
+	movq	5344(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5288(%rax), %r11
+	movq	5344(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24854,40 +25105,40 @@ GL_PREFIX(_dispatch_stub_661):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5288(%rax), %r11
+	movq	5344(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_661), .-GL_PREFIX(_dispatch_stub_661)
+	.size	GL_PREFIX(_dispatch_stub_668), .-GL_PREFIX(_dispatch_stub_668)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_662)
-	.type	GL_PREFIX(_dispatch_stub_662), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_662))
-GL_PREFIX(_dispatch_stub_662):
+	.globl	GL_PREFIX(_dispatch_stub_669)
+	.type	GL_PREFIX(_dispatch_stub_669), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_669))
+GL_PREFIX(_dispatch_stub_669):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5296(%rax), %r11
+	movq	5352(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5296(%rax), %r11
+	movq	5352(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5296(%rax), %r11
+	movq	5352(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5296(%rax), %r11
+	movq	5352(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_662), .-GL_PREFIX(_dispatch_stub_662)
+	.size	GL_PREFIX(_dispatch_stub_669), .-GL_PREFIX(_dispatch_stub_669)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(AreProgramsResidentNV)
@@ -24895,7 +25146,7 @@ GL_PREFIX(_dispatch_stub_662):
 GL_PREFIX(AreProgramsResidentNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5304(%rax), %r11
+	movq	5360(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24905,13 +25156,13 @@ GL_PREFIX(AreProgramsResidentNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5304(%rax), %r11
+	movq	5360(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5304(%rax), %r11
+	movq	5360(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24921,7 +25172,7 @@ GL_PREFIX(AreProgramsResidentNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5304(%rax), %r11
+	movq	5360(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AreProgramsResidentNV), .-GL_PREFIX(AreProgramsResidentNV)
@@ -24932,7 +25183,7 @@ GL_PREFIX(AreProgramsResidentNV):
 GL_PREFIX(BindProgramNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5312(%rax), %r11
+	movq	5368(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24942,13 +25193,13 @@ GL_PREFIX(BindProgramNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5312(%rax), %r11
+	movq	5368(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5312(%rax), %r11
+	movq	5368(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24958,7 +25209,7 @@ GL_PREFIX(BindProgramNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5312(%rax), %r11
+	movq	5368(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindProgramNV), .-GL_PREFIX(BindProgramNV)
@@ -24969,7 +25220,7 @@ GL_PREFIX(BindProgramNV):
 GL_PREFIX(DeleteProgramsNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5320(%rax), %r11
+	movq	5376(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24979,13 +25230,13 @@ GL_PREFIX(DeleteProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5320(%rax), %r11
+	movq	5376(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5320(%rax), %r11
+	movq	5376(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24995,7 +25246,7 @@ GL_PREFIX(DeleteProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5320(%rax), %r11
+	movq	5376(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteProgramsNV), .-GL_PREFIX(DeleteProgramsNV)
@@ -25006,7 +25257,7 @@ GL_PREFIX(DeleteProgramsNV):
 GL_PREFIX(ExecuteProgramNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5328(%rax), %r11
+	movq	5384(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25016,13 +25267,13 @@ GL_PREFIX(ExecuteProgramNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5328(%rax), %r11
+	movq	5384(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5328(%rax), %r11
+	movq	5384(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25032,7 +25283,7 @@ GL_PREFIX(ExecuteProgramNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5328(%rax), %r11
+	movq	5384(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ExecuteProgramNV), .-GL_PREFIX(ExecuteProgramNV)
@@ -25043,7 +25294,7 @@ GL_PREFIX(ExecuteProgramNV):
 GL_PREFIX(GenProgramsNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5336(%rax), %r11
+	movq	5392(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25053,13 +25304,13 @@ GL_PREFIX(GenProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5336(%rax), %r11
+	movq	5392(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5336(%rax), %r11
+	movq	5392(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25069,7 +25320,7 @@ GL_PREFIX(GenProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5336(%rax), %r11
+	movq	5392(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenProgramsNV), .-GL_PREFIX(GenProgramsNV)
@@ -25080,7 +25331,7 @@ GL_PREFIX(GenProgramsNV):
 GL_PREFIX(GetProgramParameterdvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5344(%rax), %r11
+	movq	5400(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25094,13 +25345,13 @@ GL_PREFIX(GetProgramParameterdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5344(%rax), %r11
+	movq	5400(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5344(%rax), %r11
+	movq	5400(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25114,7 +25365,7 @@ GL_PREFIX(GetProgramParameterdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5344(%rax), %r11
+	movq	5400(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramParameterdvNV), .-GL_PREFIX(GetProgramParameterdvNV)
@@ -25125,7 +25376,7 @@ GL_PREFIX(GetProgramParameterdvNV):
 GL_PREFIX(GetProgramParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5352(%rax), %r11
+	movq	5408(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25139,13 +25390,13 @@ GL_PREFIX(GetProgramParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5352(%rax), %r11
+	movq	5408(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5352(%rax), %r11
+	movq	5408(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25159,7 +25410,7 @@ GL_PREFIX(GetProgramParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5352(%rax), %r11
+	movq	5408(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramParameterfvNV), .-GL_PREFIX(GetProgramParameterfvNV)
@@ -25170,7 +25421,7 @@ GL_PREFIX(GetProgramParameterfvNV):
 GL_PREFIX(GetProgramStringNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5360(%rax), %r11
+	movq	5416(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25180,13 +25431,13 @@ GL_PREFIX(GetProgramStringNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5360(%rax), %r11
+	movq	5416(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5360(%rax), %r11
+	movq	5416(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25196,7 +25447,7 @@ GL_PREFIX(GetProgramStringNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5360(%rax), %r11
+	movq	5416(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramStringNV), .-GL_PREFIX(GetProgramStringNV)
@@ -25207,7 +25458,7 @@ GL_PREFIX(GetProgramStringNV):
 GL_PREFIX(GetProgramivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5368(%rax), %r11
+	movq	5424(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25217,13 +25468,13 @@ GL_PREFIX(GetProgramivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5368(%rax), %r11
+	movq	5424(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5368(%rax), %r11
+	movq	5424(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25233,7 +25484,7 @@ GL_PREFIX(GetProgramivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5368(%rax), %r11
+	movq	5424(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramivNV), .-GL_PREFIX(GetProgramivNV)
@@ -25244,7 +25495,7 @@ GL_PREFIX(GetProgramivNV):
 GL_PREFIX(GetTrackMatrixivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5376(%rax), %r11
+	movq	5432(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25258,13 +25509,13 @@ GL_PREFIX(GetTrackMatrixivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5376(%rax), %r11
+	movq	5432(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5376(%rax), %r11
+	movq	5432(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25278,7 +25529,7 @@ GL_PREFIX(GetTrackMatrixivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5376(%rax), %r11
+	movq	5432(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetTrackMatrixivNV), .-GL_PREFIX(GetTrackMatrixivNV)
@@ -25289,7 +25540,7 @@ GL_PREFIX(GetTrackMatrixivNV):
 GL_PREFIX(GetVertexAttribPointervNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5384(%rax), %r11
+	movq	5440(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25299,13 +25550,13 @@ GL_PREFIX(GetVertexAttribPointervNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5384(%rax), %r11
+	movq	5440(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5384(%rax), %r11
+	movq	5440(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25315,7 +25566,7 @@ GL_PREFIX(GetVertexAttribPointervNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5384(%rax), %r11
+	movq	5440(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribPointervNV), .-GL_PREFIX(GetVertexAttribPointervNV)
@@ -25326,7 +25577,7 @@ GL_PREFIX(GetVertexAttribPointervNV):
 GL_PREFIX(GetVertexAttribdvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5392(%rax), %r11
+	movq	5448(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25336,13 +25587,13 @@ GL_PREFIX(GetVertexAttribdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5392(%rax), %r11
+	movq	5448(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5392(%rax), %r11
+	movq	5448(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25352,7 +25603,7 @@ GL_PREFIX(GetVertexAttribdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5392(%rax), %r11
+	movq	5448(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribdvNV), .-GL_PREFIX(GetVertexAttribdvNV)
@@ -25363,7 +25614,7 @@ GL_PREFIX(GetVertexAttribdvNV):
 GL_PREFIX(GetVertexAttribfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5400(%rax), %r11
+	movq	5456(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25373,13 +25624,13 @@ GL_PREFIX(GetVertexAttribfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5400(%rax), %r11
+	movq	5456(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5400(%rax), %r11
+	movq	5456(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25389,7 +25640,7 @@ GL_PREFIX(GetVertexAttribfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5400(%rax), %r11
+	movq	5456(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribfvNV), .-GL_PREFIX(GetVertexAttribfvNV)
@@ -25400,7 +25651,7 @@ GL_PREFIX(GetVertexAttribfvNV):
 GL_PREFIX(GetVertexAttribivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5408(%rax), %r11
+	movq	5464(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25410,13 +25661,13 @@ GL_PREFIX(GetVertexAttribivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5408(%rax), %r11
+	movq	5464(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5408(%rax), %r11
+	movq	5464(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25426,7 +25677,7 @@ GL_PREFIX(GetVertexAttribivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5408(%rax), %r11
+	movq	5464(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribivNV), .-GL_PREFIX(GetVertexAttribivNV)
@@ -25437,25 +25688,25 @@ GL_PREFIX(GetVertexAttribivNV):
 GL_PREFIX(IsProgramNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5416(%rax), %r11
+	movq	5472(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5416(%rax), %r11
+	movq	5472(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5416(%rax), %r11
+	movq	5472(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5416(%rax), %r11
+	movq	5472(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsProgramNV), .-GL_PREFIX(IsProgramNV)
@@ -25466,7 +25717,7 @@ GL_PREFIX(IsProgramNV):
 GL_PREFIX(LoadProgramNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5424(%rax), %r11
+	movq	5480(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25480,13 +25731,13 @@ GL_PREFIX(LoadProgramNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5424(%rax), %r11
+	movq	5480(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5424(%rax), %r11
+	movq	5480(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25500,7 +25751,7 @@ GL_PREFIX(LoadProgramNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5424(%rax), %r11
+	movq	5480(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(LoadProgramNV), .-GL_PREFIX(LoadProgramNV)
@@ -25511,7 +25762,7 @@ GL_PREFIX(LoadProgramNV):
 GL_PREFIX(ProgramParameters4dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5432(%rax), %r11
+	movq	5488(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25525,13 +25776,13 @@ GL_PREFIX(ProgramParameters4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5432(%rax), %r11
+	movq	5488(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5432(%rax), %r11
+	movq	5488(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25545,7 +25796,7 @@ GL_PREFIX(ProgramParameters4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5432(%rax), %r11
+	movq	5488(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramParameters4dvNV), .-GL_PREFIX(ProgramParameters4dvNV)
@@ -25556,7 +25807,7 @@ GL_PREFIX(ProgramParameters4dvNV):
 GL_PREFIX(ProgramParameters4fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5440(%rax), %r11
+	movq	5496(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25570,13 +25821,13 @@ GL_PREFIX(ProgramParameters4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5440(%rax), %r11
+	movq	5496(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5440(%rax), %r11
+	movq	5496(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25590,7 +25841,7 @@ GL_PREFIX(ProgramParameters4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5440(%rax), %r11
+	movq	5496(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramParameters4fvNV), .-GL_PREFIX(ProgramParameters4fvNV)
@@ -25601,7 +25852,7 @@ GL_PREFIX(ProgramParameters4fvNV):
 GL_PREFIX(RequestResidentProgramsNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5448(%rax), %r11
+	movq	5504(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25611,13 +25862,13 @@ GL_PREFIX(RequestResidentProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5448(%rax), %r11
+	movq	5504(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5448(%rax), %r11
+	movq	5504(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25627,7 +25878,7 @@ GL_PREFIX(RequestResidentProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5448(%rax), %r11
+	movq	5504(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(RequestResidentProgramsNV), .-GL_PREFIX(RequestResidentProgramsNV)
@@ -25638,7 +25889,7 @@ GL_PREFIX(RequestResidentProgramsNV):
 GL_PREFIX(TrackMatrixNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5456(%rax), %r11
+	movq	5512(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25652,13 +25903,13 @@ GL_PREFIX(TrackMatrixNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5456(%rax), %r11
+	movq	5512(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5456(%rax), %r11
+	movq	5512(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25672,7 +25923,7 @@ GL_PREFIX(TrackMatrixNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5456(%rax), %r11
+	movq	5512(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TrackMatrixNV), .-GL_PREFIX(TrackMatrixNV)
@@ -25683,7 +25934,7 @@ GL_PREFIX(TrackMatrixNV):
 GL_PREFIX(VertexAttrib1dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5464(%rax), %r11
+	movq	5520(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -25693,13 +25944,13 @@ GL_PREFIX(VertexAttrib1dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5464(%rax), %r11
+	movq	5520(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5464(%rax), %r11
+	movq	5520(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -25709,7 +25960,7 @@ GL_PREFIX(VertexAttrib1dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5464(%rax), %r11
+	movq	5520(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1dNV), .-GL_PREFIX(VertexAttrib1dNV)
@@ -25720,7 +25971,7 @@ GL_PREFIX(VertexAttrib1dNV):
 GL_PREFIX(VertexAttrib1dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5472(%rax), %r11
+	movq	5528(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25730,13 +25981,13 @@ GL_PREFIX(VertexAttrib1dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5472(%rax), %r11
+	movq	5528(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5472(%rax), %r11
+	movq	5528(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25746,7 +25997,7 @@ GL_PREFIX(VertexAttrib1dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5472(%rax), %r11
+	movq	5528(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1dvNV), .-GL_PREFIX(VertexAttrib1dvNV)
@@ -25757,7 +26008,7 @@ GL_PREFIX(VertexAttrib1dvNV):
 GL_PREFIX(VertexAttrib1fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5480(%rax), %r11
+	movq	5536(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -25767,13 +26018,13 @@ GL_PREFIX(VertexAttrib1fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5480(%rax), %r11
+	movq	5536(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5480(%rax), %r11
+	movq	5536(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -25783,7 +26034,7 @@ GL_PREFIX(VertexAttrib1fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5480(%rax), %r11
+	movq	5536(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1fNV), .-GL_PREFIX(VertexAttrib1fNV)
@@ -25794,7 +26045,7 @@ GL_PREFIX(VertexAttrib1fNV):
 GL_PREFIX(VertexAttrib1fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5488(%rax), %r11
+	movq	5544(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25804,13 +26055,13 @@ GL_PREFIX(VertexAttrib1fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5488(%rax), %r11
+	movq	5544(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5488(%rax), %r11
+	movq	5544(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25820,7 +26071,7 @@ GL_PREFIX(VertexAttrib1fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5488(%rax), %r11
+	movq	5544(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1fvNV), .-GL_PREFIX(VertexAttrib1fvNV)
@@ -25831,7 +26082,7 @@ GL_PREFIX(VertexAttrib1fvNV):
 GL_PREFIX(VertexAttrib1sNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5496(%rax), %r11
+	movq	5552(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25841,13 +26092,13 @@ GL_PREFIX(VertexAttrib1sNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5496(%rax), %r11
+	movq	5552(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5496(%rax), %r11
+	movq	5552(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25857,7 +26108,7 @@ GL_PREFIX(VertexAttrib1sNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5496(%rax), %r11
+	movq	5552(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1sNV), .-GL_PREFIX(VertexAttrib1sNV)
@@ -25868,7 +26119,7 @@ GL_PREFIX(VertexAttrib1sNV):
 GL_PREFIX(VertexAttrib1svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5504(%rax), %r11
+	movq	5560(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25878,13 +26129,13 @@ GL_PREFIX(VertexAttrib1svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5504(%rax), %r11
+	movq	5560(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5504(%rax), %r11
+	movq	5560(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25894,7 +26145,7 @@ GL_PREFIX(VertexAttrib1svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5504(%rax), %r11
+	movq	5560(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1svNV), .-GL_PREFIX(VertexAttrib1svNV)
@@ -25905,7 +26156,7 @@ GL_PREFIX(VertexAttrib1svNV):
 GL_PREFIX(VertexAttrib2dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5512(%rax), %r11
+	movq	5568(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -25917,13 +26168,13 @@ GL_PREFIX(VertexAttrib2dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5512(%rax), %r11
+	movq	5568(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5512(%rax), %r11
+	movq	5568(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -25935,7 +26186,7 @@ GL_PREFIX(VertexAttrib2dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5512(%rax), %r11
+	movq	5568(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2dNV), .-GL_PREFIX(VertexAttrib2dNV)
@@ -25946,7 +26197,7 @@ GL_PREFIX(VertexAttrib2dNV):
 GL_PREFIX(VertexAttrib2dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5520(%rax), %r11
+	movq	5576(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25956,13 +26207,13 @@ GL_PREFIX(VertexAttrib2dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5520(%rax), %r11
+	movq	5576(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5520(%rax), %r11
+	movq	5576(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25972,7 +26223,7 @@ GL_PREFIX(VertexAttrib2dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5520(%rax), %r11
+	movq	5576(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2dvNV), .-GL_PREFIX(VertexAttrib2dvNV)
@@ -25983,7 +26234,7 @@ GL_PREFIX(VertexAttrib2dvNV):
 GL_PREFIX(VertexAttrib2fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5528(%rax), %r11
+	movq	5584(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -25995,13 +26246,13 @@ GL_PREFIX(VertexAttrib2fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5528(%rax), %r11
+	movq	5584(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5528(%rax), %r11
+	movq	5584(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -26013,7 +26264,7 @@ GL_PREFIX(VertexAttrib2fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5528(%rax), %r11
+	movq	5584(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2fNV), .-GL_PREFIX(VertexAttrib2fNV)
@@ -26024,7 +26275,7 @@ GL_PREFIX(VertexAttrib2fNV):
 GL_PREFIX(VertexAttrib2fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5536(%rax), %r11
+	movq	5592(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26034,13 +26285,13 @@ GL_PREFIX(VertexAttrib2fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5536(%rax), %r11
+	movq	5592(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5536(%rax), %r11
+	movq	5592(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26050,7 +26301,7 @@ GL_PREFIX(VertexAttrib2fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5536(%rax), %r11
+	movq	5592(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2fvNV), .-GL_PREFIX(VertexAttrib2fvNV)
@@ -26061,7 +26312,7 @@ GL_PREFIX(VertexAttrib2fvNV):
 GL_PREFIX(VertexAttrib2sNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5544(%rax), %r11
+	movq	5600(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26071,13 +26322,13 @@ GL_PREFIX(VertexAttrib2sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5544(%rax), %r11
+	movq	5600(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5544(%rax), %r11
+	movq	5600(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26087,7 +26338,7 @@ GL_PREFIX(VertexAttrib2sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5544(%rax), %r11
+	movq	5600(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2sNV), .-GL_PREFIX(VertexAttrib2sNV)
@@ -26098,7 +26349,7 @@ GL_PREFIX(VertexAttrib2sNV):
 GL_PREFIX(VertexAttrib2svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5552(%rax), %r11
+	movq	5608(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26108,13 +26359,13 @@ GL_PREFIX(VertexAttrib2svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5552(%rax), %r11
+	movq	5608(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5552(%rax), %r11
+	movq	5608(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26124,7 +26375,7 @@ GL_PREFIX(VertexAttrib2svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5552(%rax), %r11
+	movq	5608(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2svNV), .-GL_PREFIX(VertexAttrib2svNV)
@@ -26135,7 +26386,7 @@ GL_PREFIX(VertexAttrib2svNV):
 GL_PREFIX(VertexAttrib3dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5560(%rax), %r11
+	movq	5616(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -26149,13 +26400,13 @@ GL_PREFIX(VertexAttrib3dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5560(%rax), %r11
+	movq	5616(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5560(%rax), %r11
+	movq	5616(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -26169,7 +26420,7 @@ GL_PREFIX(VertexAttrib3dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5560(%rax), %r11
+	movq	5616(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3dNV), .-GL_PREFIX(VertexAttrib3dNV)
@@ -26180,7 +26431,7 @@ GL_PREFIX(VertexAttrib3dNV):
 GL_PREFIX(VertexAttrib3dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5568(%rax), %r11
+	movq	5624(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26190,13 +26441,13 @@ GL_PREFIX(VertexAttrib3dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5568(%rax), %r11
+	movq	5624(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5568(%rax), %r11
+	movq	5624(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26206,7 +26457,7 @@ GL_PREFIX(VertexAttrib3dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5568(%rax), %r11
+	movq	5624(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3dvNV), .-GL_PREFIX(VertexAttrib3dvNV)
@@ -26217,7 +26468,7 @@ GL_PREFIX(VertexAttrib3dvNV):
 GL_PREFIX(VertexAttrib3fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5576(%rax), %r11
+	movq	5632(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -26231,13 +26482,13 @@ GL_PREFIX(VertexAttrib3fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5576(%rax), %r11
+	movq	5632(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5576(%rax), %r11
+	movq	5632(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -26251,7 +26502,7 @@ GL_PREFIX(VertexAttrib3fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5576(%rax), %r11
+	movq	5632(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3fNV), .-GL_PREFIX(VertexAttrib3fNV)
@@ -26262,7 +26513,7 @@ GL_PREFIX(VertexAttrib3fNV):
 GL_PREFIX(VertexAttrib3fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5584(%rax), %r11
+	movq	5640(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26272,13 +26523,13 @@ GL_PREFIX(VertexAttrib3fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5584(%rax), %r11
+	movq	5640(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5584(%rax), %r11
+	movq	5640(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26288,7 +26539,7 @@ GL_PREFIX(VertexAttrib3fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5584(%rax), %r11
+	movq	5640(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3fvNV), .-GL_PREFIX(VertexAttrib3fvNV)
@@ -26299,7 +26550,7 @@ GL_PREFIX(VertexAttrib3fvNV):
 GL_PREFIX(VertexAttrib3sNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5592(%rax), %r11
+	movq	5648(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26313,13 +26564,13 @@ GL_PREFIX(VertexAttrib3sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5592(%rax), %r11
+	movq	5648(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5592(%rax), %r11
+	movq	5648(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26333,7 +26584,7 @@ GL_PREFIX(VertexAttrib3sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5592(%rax), %r11
+	movq	5648(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3sNV), .-GL_PREFIX(VertexAttrib3sNV)
@@ -26344,7 +26595,7 @@ GL_PREFIX(VertexAttrib3sNV):
 GL_PREFIX(VertexAttrib3svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5600(%rax), %r11
+	movq	5656(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26354,13 +26605,13 @@ GL_PREFIX(VertexAttrib3svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5600(%rax), %r11
+	movq	5656(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5600(%rax), %r11
+	movq	5656(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26370,7 +26621,7 @@ GL_PREFIX(VertexAttrib3svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5600(%rax), %r11
+	movq	5656(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3svNV), .-GL_PREFIX(VertexAttrib3svNV)
@@ -26381,7 +26632,7 @@ GL_PREFIX(VertexAttrib3svNV):
 GL_PREFIX(VertexAttrib4dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5608(%rax), %r11
+	movq	5664(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -26397,13 +26648,13 @@ GL_PREFIX(VertexAttrib4dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5608(%rax), %r11
+	movq	5664(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5608(%rax), %r11
+	movq	5664(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -26419,7 +26670,7 @@ GL_PREFIX(VertexAttrib4dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5608(%rax), %r11
+	movq	5664(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4dNV), .-GL_PREFIX(VertexAttrib4dNV)
@@ -26430,7 +26681,7 @@ GL_PREFIX(VertexAttrib4dNV):
 GL_PREFIX(VertexAttrib4dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5616(%rax), %r11
+	movq	5672(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26440,13 +26691,13 @@ GL_PREFIX(VertexAttrib4dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5616(%rax), %r11
+	movq	5672(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5616(%rax), %r11
+	movq	5672(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26456,7 +26707,7 @@ GL_PREFIX(VertexAttrib4dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5616(%rax), %r11
+	movq	5672(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4dvNV), .-GL_PREFIX(VertexAttrib4dvNV)
@@ -26467,7 +26718,7 @@ GL_PREFIX(VertexAttrib4dvNV):
 GL_PREFIX(VertexAttrib4fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5624(%rax), %r11
+	movq	5680(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -26483,13 +26734,13 @@ GL_PREFIX(VertexAttrib4fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5624(%rax), %r11
+	movq	5680(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5624(%rax), %r11
+	movq	5680(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -26505,7 +26756,7 @@ GL_PREFIX(VertexAttrib4fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5624(%rax), %r11
+	movq	5680(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4fNV), .-GL_PREFIX(VertexAttrib4fNV)
@@ -26516,7 +26767,7 @@ GL_PREFIX(VertexAttrib4fNV):
 GL_PREFIX(VertexAttrib4fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5632(%rax), %r11
+	movq	5688(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26526,13 +26777,13 @@ GL_PREFIX(VertexAttrib4fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5632(%rax), %r11
+	movq	5688(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5632(%rax), %r11
+	movq	5688(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26542,7 +26793,7 @@ GL_PREFIX(VertexAttrib4fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5632(%rax), %r11
+	movq	5688(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4fvNV), .-GL_PREFIX(VertexAttrib4fvNV)
@@ -26553,7 +26804,7 @@ GL_PREFIX(VertexAttrib4fvNV):
 GL_PREFIX(VertexAttrib4sNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5640(%rax), %r11
+	movq	5696(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26567,13 +26818,13 @@ GL_PREFIX(VertexAttrib4sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5640(%rax), %r11
+	movq	5696(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5640(%rax), %r11
+	movq	5696(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26587,7 +26838,7 @@ GL_PREFIX(VertexAttrib4sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5640(%rax), %r11
+	movq	5696(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4sNV), .-GL_PREFIX(VertexAttrib4sNV)
@@ -26598,7 +26849,7 @@ GL_PREFIX(VertexAttrib4sNV):
 GL_PREFIX(VertexAttrib4svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5648(%rax), %r11
+	movq	5704(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26608,13 +26859,13 @@ GL_PREFIX(VertexAttrib4svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5648(%rax), %r11
+	movq	5704(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5648(%rax), %r11
+	movq	5704(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26624,7 +26875,7 @@ GL_PREFIX(VertexAttrib4svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5648(%rax), %r11
+	movq	5704(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4svNV), .-GL_PREFIX(VertexAttrib4svNV)
@@ -26635,7 +26886,7 @@ GL_PREFIX(VertexAttrib4svNV):
 GL_PREFIX(VertexAttrib4ubNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5656(%rax), %r11
+	movq	5712(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26649,13 +26900,13 @@ GL_PREFIX(VertexAttrib4ubNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5656(%rax), %r11
+	movq	5712(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5656(%rax), %r11
+	movq	5712(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26669,7 +26920,7 @@ GL_PREFIX(VertexAttrib4ubNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5656(%rax), %r11
+	movq	5712(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4ubNV), .-GL_PREFIX(VertexAttrib4ubNV)
@@ -26680,7 +26931,7 @@ GL_PREFIX(VertexAttrib4ubNV):
 GL_PREFIX(VertexAttrib4ubvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5664(%rax), %r11
+	movq	5720(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26690,13 +26941,13 @@ GL_PREFIX(VertexAttrib4ubvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5664(%rax), %r11
+	movq	5720(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5664(%rax), %r11
+	movq	5720(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26706,7 +26957,7 @@ GL_PREFIX(VertexAttrib4ubvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5664(%rax), %r11
+	movq	5720(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4ubvNV), .-GL_PREFIX(VertexAttrib4ubvNV)
@@ -26717,7 +26968,7 @@ GL_PREFIX(VertexAttrib4ubvNV):
 GL_PREFIX(VertexAttribPointerNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5672(%rax), %r11
+	movq	5728(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26731,13 +26982,13 @@ GL_PREFIX(VertexAttribPointerNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5672(%rax), %r11
+	movq	5728(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5672(%rax), %r11
+	movq	5728(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26751,7 +27002,7 @@ GL_PREFIX(VertexAttribPointerNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5672(%rax), %r11
+	movq	5728(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribPointerNV), .-GL_PREFIX(VertexAttribPointerNV)
@@ -26762,7 +27013,7 @@ GL_PREFIX(VertexAttribPointerNV):
 GL_PREFIX(VertexAttribs1dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5680(%rax), %r11
+	movq	5736(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26772,13 +27023,13 @@ GL_PREFIX(VertexAttribs1dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5680(%rax), %r11
+	movq	5736(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5680(%rax), %r11
+	movq	5736(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26788,7 +27039,7 @@ GL_PREFIX(VertexAttribs1dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5680(%rax), %r11
+	movq	5736(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs1dvNV), .-GL_PREFIX(VertexAttribs1dvNV)
@@ -26799,7 +27050,7 @@ GL_PREFIX(VertexAttribs1dvNV):
 GL_PREFIX(VertexAttribs1fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5688(%rax), %r11
+	movq	5744(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26809,13 +27060,13 @@ GL_PREFIX(VertexAttribs1fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5688(%rax), %r11
+	movq	5744(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5688(%rax), %r11
+	movq	5744(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26825,7 +27076,7 @@ GL_PREFIX(VertexAttribs1fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5688(%rax), %r11
+	movq	5744(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs1fvNV), .-GL_PREFIX(VertexAttribs1fvNV)
@@ -26836,7 +27087,7 @@ GL_PREFIX(VertexAttribs1fvNV):
 GL_PREFIX(VertexAttribs1svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5696(%rax), %r11
+	movq	5752(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26846,13 +27097,13 @@ GL_PREFIX(VertexAttribs1svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5696(%rax), %r11
+	movq	5752(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5696(%rax), %r11
+	movq	5752(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26862,7 +27113,7 @@ GL_PREFIX(VertexAttribs1svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5696(%rax), %r11
+	movq	5752(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs1svNV), .-GL_PREFIX(VertexAttribs1svNV)
@@ -26873,7 +27124,7 @@ GL_PREFIX(VertexAttribs1svNV):
 GL_PREFIX(VertexAttribs2dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5704(%rax), %r11
+	movq	5760(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26883,13 +27134,13 @@ GL_PREFIX(VertexAttribs2dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5704(%rax), %r11
+	movq	5760(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5704(%rax), %r11
+	movq	5760(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26899,7 +27150,7 @@ GL_PREFIX(VertexAttribs2dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5704(%rax), %r11
+	movq	5760(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs2dvNV), .-GL_PREFIX(VertexAttribs2dvNV)
@@ -26910,7 +27161,7 @@ GL_PREFIX(VertexAttribs2dvNV):
 GL_PREFIX(VertexAttribs2fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5712(%rax), %r11
+	movq	5768(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26920,13 +27171,13 @@ GL_PREFIX(VertexAttribs2fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5712(%rax), %r11
+	movq	5768(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5712(%rax), %r11
+	movq	5768(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26936,7 +27187,7 @@ GL_PREFIX(VertexAttribs2fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5712(%rax), %r11
+	movq	5768(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs2fvNV), .-GL_PREFIX(VertexAttribs2fvNV)
@@ -26947,7 +27198,7 @@ GL_PREFIX(VertexAttribs2fvNV):
 GL_PREFIX(VertexAttribs2svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5720(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26957,13 +27208,13 @@ GL_PREFIX(VertexAttribs2svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5720(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5720(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26973,7 +27224,7 @@ GL_PREFIX(VertexAttribs2svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5720(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs2svNV), .-GL_PREFIX(VertexAttribs2svNV)
@@ -26984,7 +27235,7 @@ GL_PREFIX(VertexAttribs2svNV):
 GL_PREFIX(VertexAttribs3dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5728(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26994,13 +27245,13 @@ GL_PREFIX(VertexAttribs3dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5728(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5728(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27010,7 +27261,7 @@ GL_PREFIX(VertexAttribs3dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5728(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs3dvNV), .-GL_PREFIX(VertexAttribs3dvNV)
@@ -27021,7 +27272,7 @@ GL_PREFIX(VertexAttribs3dvNV):
 GL_PREFIX(VertexAttribs3fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5736(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27031,13 +27282,13 @@ GL_PREFIX(VertexAttribs3fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5736(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5736(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27047,7 +27298,7 @@ GL_PREFIX(VertexAttribs3fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5736(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs3fvNV), .-GL_PREFIX(VertexAttribs3fvNV)
@@ -27058,7 +27309,7 @@ GL_PREFIX(VertexAttribs3fvNV):
 GL_PREFIX(VertexAttribs3svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5744(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27068,13 +27319,13 @@ GL_PREFIX(VertexAttribs3svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5744(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5744(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27084,7 +27335,7 @@ GL_PREFIX(VertexAttribs3svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5744(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs3svNV), .-GL_PREFIX(VertexAttribs3svNV)
@@ -27095,7 +27346,7 @@ GL_PREFIX(VertexAttribs3svNV):
 GL_PREFIX(VertexAttribs4dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5752(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27105,13 +27356,13 @@ GL_PREFIX(VertexAttribs4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5752(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5752(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27121,7 +27372,7 @@ GL_PREFIX(VertexAttribs4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5752(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs4dvNV), .-GL_PREFIX(VertexAttribs4dvNV)
@@ -27132,7 +27383,7 @@ GL_PREFIX(VertexAttribs4dvNV):
 GL_PREFIX(VertexAttribs4fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5760(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27142,13 +27393,13 @@ GL_PREFIX(VertexAttribs4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5760(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5760(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27158,7 +27409,7 @@ GL_PREFIX(VertexAttribs4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5760(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs4fvNV), .-GL_PREFIX(VertexAttribs4fvNV)
@@ -27169,7 +27420,7 @@ GL_PREFIX(VertexAttribs4fvNV):
 GL_PREFIX(VertexAttribs4svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5768(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27179,13 +27430,13 @@ GL_PREFIX(VertexAttribs4svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5768(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5768(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27195,7 +27446,7 @@ GL_PREFIX(VertexAttribs4svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5768(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs4svNV), .-GL_PREFIX(VertexAttribs4svNV)
@@ -27206,7 +27457,7 @@ GL_PREFIX(VertexAttribs4svNV):
 GL_PREFIX(VertexAttribs4ubvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5776(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27216,13 +27467,13 @@ GL_PREFIX(VertexAttribs4ubvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5776(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5776(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27232,7 +27483,7 @@ GL_PREFIX(VertexAttribs4ubvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5776(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs4ubvNV), .-GL_PREFIX(VertexAttribs4ubvNV)
@@ -27243,7 +27494,7 @@ GL_PREFIX(VertexAttribs4ubvNV):
 GL_PREFIX(GetTexBumpParameterfvATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5784(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27253,13 +27504,13 @@ GL_PREFIX(GetTexBumpParameterfvATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5784(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5784(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27269,7 +27520,7 @@ GL_PREFIX(GetTexBumpParameterfvATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5784(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetTexBumpParameterfvATI), .-GL_PREFIX(GetTexBumpParameterfvATI)
@@ -27280,7 +27531,7 @@ GL_PREFIX(GetTexBumpParameterfvATI):
 GL_PREFIX(GetTexBumpParameterivATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5792(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27290,13 +27541,13 @@ GL_PREFIX(GetTexBumpParameterivATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5792(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5792(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27306,7 +27557,7 @@ GL_PREFIX(GetTexBumpParameterivATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5792(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetTexBumpParameterivATI), .-GL_PREFIX(GetTexBumpParameterivATI)
@@ -27317,7 +27568,7 @@ GL_PREFIX(GetTexBumpParameterivATI):
 GL_PREFIX(TexBumpParameterfvATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5800(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27327,13 +27578,13 @@ GL_PREFIX(TexBumpParameterfvATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5800(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5800(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27343,7 +27594,7 @@ GL_PREFIX(TexBumpParameterfvATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5800(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexBumpParameterfvATI), .-GL_PREFIX(TexBumpParameterfvATI)
@@ -27354,7 +27605,7 @@ GL_PREFIX(TexBumpParameterfvATI):
 GL_PREFIX(TexBumpParameterivATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5808(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27364,13 +27615,13 @@ GL_PREFIX(TexBumpParameterivATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5808(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5808(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27380,7 +27631,7 @@ GL_PREFIX(TexBumpParameterivATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5808(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexBumpParameterivATI), .-GL_PREFIX(TexBumpParameterivATI)
@@ -27391,7 +27642,7 @@ GL_PREFIX(TexBumpParameterivATI):
 GL_PREFIX(AlphaFragmentOp1ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5816(%rax), %r11
+	movq	5872(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27409,13 +27660,13 @@ GL_PREFIX(AlphaFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5816(%rax), %r11
+	movq	5872(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5816(%rax), %r11
+	movq	5872(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27433,7 +27684,7 @@ GL_PREFIX(AlphaFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5816(%rax), %r11
+	movq	5872(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AlphaFragmentOp1ATI), .-GL_PREFIX(AlphaFragmentOp1ATI)
@@ -27444,7 +27695,7 @@ GL_PREFIX(AlphaFragmentOp1ATI):
 GL_PREFIX(AlphaFragmentOp2ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5824(%rax), %r11
+	movq	5880(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27462,13 +27713,13 @@ GL_PREFIX(AlphaFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5824(%rax), %r11
+	movq	5880(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5824(%rax), %r11
+	movq	5880(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27486,7 +27737,7 @@ GL_PREFIX(AlphaFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5824(%rax), %r11
+	movq	5880(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AlphaFragmentOp2ATI), .-GL_PREFIX(AlphaFragmentOp2ATI)
@@ -27497,7 +27748,7 @@ GL_PREFIX(AlphaFragmentOp2ATI):
 GL_PREFIX(AlphaFragmentOp3ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5832(%rax), %r11
+	movq	5888(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27515,13 +27766,13 @@ GL_PREFIX(AlphaFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5832(%rax), %r11
+	movq	5888(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5832(%rax), %r11
+	movq	5888(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27539,7 +27790,7 @@ GL_PREFIX(AlphaFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5832(%rax), %r11
+	movq	5888(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AlphaFragmentOp3ATI), .-GL_PREFIX(AlphaFragmentOp3ATI)
@@ -27550,25 +27801,25 @@ GL_PREFIX(AlphaFragmentOp3ATI):
 GL_PREFIX(BeginFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5840(%rax), %r11
+	movq	5896(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	5840(%rax), %r11
+	movq	5896(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5840(%rax), %r11
+	movq	5896(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	5840(%rax), %r11
+	movq	5896(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BeginFragmentShaderATI), .-GL_PREFIX(BeginFragmentShaderATI)
@@ -27579,25 +27830,25 @@ GL_PREFIX(BeginFragmentShaderATI):
 GL_PREFIX(BindFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5848(%rax), %r11
+	movq	5904(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5848(%rax), %r11
+	movq	5904(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5848(%rax), %r11
+	movq	5904(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5848(%rax), %r11
+	movq	5904(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindFragmentShaderATI), .-GL_PREFIX(BindFragmentShaderATI)
@@ -27608,7 +27859,7 @@ GL_PREFIX(BindFragmentShaderATI):
 GL_PREFIX(ColorFragmentOp1ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5856(%rax), %r11
+	movq	5912(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27626,13 +27877,13 @@ GL_PREFIX(ColorFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5856(%rax), %r11
+	movq	5912(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5856(%rax), %r11
+	movq	5912(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27650,7 +27901,7 @@ GL_PREFIX(ColorFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5856(%rax), %r11
+	movq	5912(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorFragmentOp1ATI), .-GL_PREFIX(ColorFragmentOp1ATI)
@@ -27661,7 +27912,7 @@ GL_PREFIX(ColorFragmentOp1ATI):
 GL_PREFIX(ColorFragmentOp2ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5864(%rax), %r11
+	movq	5920(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27679,13 +27930,13 @@ GL_PREFIX(ColorFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5864(%rax), %r11
+	movq	5920(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5864(%rax), %r11
+	movq	5920(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27703,7 +27954,7 @@ GL_PREFIX(ColorFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5864(%rax), %r11
+	movq	5920(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorFragmentOp2ATI), .-GL_PREFIX(ColorFragmentOp2ATI)
@@ -27714,7 +27965,7 @@ GL_PREFIX(ColorFragmentOp2ATI):
 GL_PREFIX(ColorFragmentOp3ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5872(%rax), %r11
+	movq	5928(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27732,13 +27983,13 @@ GL_PREFIX(ColorFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5872(%rax), %r11
+	movq	5928(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5872(%rax), %r11
+	movq	5928(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27756,7 +28007,7 @@ GL_PREFIX(ColorFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5872(%rax), %r11
+	movq	5928(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorFragmentOp3ATI), .-GL_PREFIX(ColorFragmentOp3ATI)
@@ -27767,25 +28018,25 @@ GL_PREFIX(ColorFragmentOp3ATI):
 GL_PREFIX(DeleteFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5880(%rax), %r11
+	movq	5936(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5880(%rax), %r11
+	movq	5936(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5880(%rax), %r11
+	movq	5936(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5880(%rax), %r11
+	movq	5936(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteFragmentShaderATI), .-GL_PREFIX(DeleteFragmentShaderATI)
@@ -27796,25 +28047,25 @@ GL_PREFIX(DeleteFragmentShaderATI):
 GL_PREFIX(EndFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5888(%rax), %r11
+	movq	5944(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	5888(%rax), %r11
+	movq	5944(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5888(%rax), %r11
+	movq	5944(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	5888(%rax), %r11
+	movq	5944(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EndFragmentShaderATI), .-GL_PREFIX(EndFragmentShaderATI)
@@ -27825,25 +28076,25 @@ GL_PREFIX(EndFragmentShaderATI):
 GL_PREFIX(GenFragmentShadersATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5896(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5896(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5896(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5896(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenFragmentShadersATI), .-GL_PREFIX(GenFragmentShadersATI)
@@ -27854,7 +28105,7 @@ GL_PREFIX(GenFragmentShadersATI):
 GL_PREFIX(PassTexCoordATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5904(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27864,13 +28115,13 @@ GL_PREFIX(PassTexCoordATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5904(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5904(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27880,7 +28131,7 @@ GL_PREFIX(PassTexCoordATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5904(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PassTexCoordATI), .-GL_PREFIX(PassTexCoordATI)
@@ -27891,7 +28142,7 @@ GL_PREFIX(PassTexCoordATI):
 GL_PREFIX(SampleMapATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5912(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27901,13 +28152,13 @@ GL_PREFIX(SampleMapATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5912(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5912(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27917,7 +28168,7 @@ GL_PREFIX(SampleMapATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5912(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SampleMapATI), .-GL_PREFIX(SampleMapATI)
@@ -27928,7 +28179,7 @@ GL_PREFIX(SampleMapATI):
 GL_PREFIX(SetFragmentShaderConstantATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5920(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27938,13 +28189,13 @@ GL_PREFIX(SetFragmentShaderConstantATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5920(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5920(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27954,7 +28205,7 @@ GL_PREFIX(SetFragmentShaderConstantATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5920(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SetFragmentShaderConstantATI), .-GL_PREFIX(SetFragmentShaderConstantATI)
@@ -27965,7 +28216,7 @@ GL_PREFIX(SetFragmentShaderConstantATI):
 GL_PREFIX(PointParameteriNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5928(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27975,13 +28226,13 @@ GL_PREFIX(PointParameteriNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5928(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5928(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27991,7 +28242,7 @@ GL_PREFIX(PointParameteriNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5928(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PointParameteriNV), .-GL_PREFIX(PointParameteriNV)
@@ -28002,7 +28253,7 @@ GL_PREFIX(PointParameteriNV):
 GL_PREFIX(PointParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5936(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28012,13 +28263,13 @@ GL_PREFIX(PointParameterivNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5936(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5936(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28028,79 +28279,79 @@ GL_PREFIX(PointParameterivNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5936(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PointParameterivNV), .-GL_PREFIX(PointParameterivNV)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_743)
-	.type	GL_PREFIX(_dispatch_stub_743), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_743))
-GL_PREFIX(_dispatch_stub_743):
+	.globl	GL_PREFIX(_dispatch_stub_750)
+	.type	GL_PREFIX(_dispatch_stub_750), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_750))
+GL_PREFIX(_dispatch_stub_750):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5944(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5944(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5944(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5944(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_743), .-GL_PREFIX(_dispatch_stub_743)
+	.size	GL_PREFIX(_dispatch_stub_750), .-GL_PREFIX(_dispatch_stub_750)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_744)
-	.type	GL_PREFIX(_dispatch_stub_744), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_744))
-GL_PREFIX(_dispatch_stub_744):
+	.globl	GL_PREFIX(_dispatch_stub_751)
+	.type	GL_PREFIX(_dispatch_stub_751), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_751))
+GL_PREFIX(_dispatch_stub_751):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5952(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5952(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5952(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5952(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_744), .-GL_PREFIX(_dispatch_stub_744)
+	.size	GL_PREFIX(_dispatch_stub_751), .-GL_PREFIX(_dispatch_stub_751)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_745)
-	.type	GL_PREFIX(_dispatch_stub_745), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_745))
-GL_PREFIX(_dispatch_stub_745):
+	.globl	GL_PREFIX(_dispatch_stub_752)
+	.type	GL_PREFIX(_dispatch_stub_752), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_752))
+GL_PREFIX(_dispatch_stub_752):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5960(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28110,13 +28361,13 @@ GL_PREFIX(_dispatch_stub_745):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5960(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5960(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28126,19 +28377,19 @@ GL_PREFIX(_dispatch_stub_745):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5960(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_745), .-GL_PREFIX(_dispatch_stub_745)
+	.size	GL_PREFIX(_dispatch_stub_752), .-GL_PREFIX(_dispatch_stub_752)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_746)
-	.type	GL_PREFIX(_dispatch_stub_746), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_746))
-GL_PREFIX(_dispatch_stub_746):
+	.globl	GL_PREFIX(_dispatch_stub_753)
+	.type	GL_PREFIX(_dispatch_stub_753), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_753))
+GL_PREFIX(_dispatch_stub_753):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5968(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28148,13 +28399,13 @@ GL_PREFIX(_dispatch_stub_746):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5968(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5968(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28164,40 +28415,40 @@ GL_PREFIX(_dispatch_stub_746):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5968(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_746), .-GL_PREFIX(_dispatch_stub_746)
+	.size	GL_PREFIX(_dispatch_stub_753), .-GL_PREFIX(_dispatch_stub_753)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_747)
-	.type	GL_PREFIX(_dispatch_stub_747), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_747))
-GL_PREFIX(_dispatch_stub_747):
+	.globl	GL_PREFIX(_dispatch_stub_754)
+	.type	GL_PREFIX(_dispatch_stub_754), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_754))
+GL_PREFIX(_dispatch_stub_754):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5976(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5976(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5976(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5976(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_747), .-GL_PREFIX(_dispatch_stub_747)
+	.size	GL_PREFIX(_dispatch_stub_754), .-GL_PREFIX(_dispatch_stub_754)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(GetProgramNamedParameterdvNV)
@@ -28205,7 +28456,7 @@ GL_PREFIX(_dispatch_stub_747):
 GL_PREFIX(GetProgramNamedParameterdvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5984(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28219,13 +28470,13 @@ GL_PREFIX(GetProgramNamedParameterdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5984(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5984(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28239,7 +28490,7 @@ GL_PREFIX(GetProgramNamedParameterdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5984(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramNamedParameterdvNV), .-GL_PREFIX(GetProgramNamedParameterdvNV)
@@ -28250,7 +28501,7 @@ GL_PREFIX(GetProgramNamedParameterdvNV):
 GL_PREFIX(GetProgramNamedParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5992(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28264,13 +28515,13 @@ GL_PREFIX(GetProgramNamedParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5992(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5992(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28284,7 +28535,7 @@ GL_PREFIX(GetProgramNamedParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5992(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramNamedParameterfvNV), .-GL_PREFIX(GetProgramNamedParameterfvNV)
@@ -28295,7 +28546,7 @@ GL_PREFIX(GetProgramNamedParameterfvNV):
 GL_PREFIX(ProgramNamedParameter4dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6000(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$56, %rsp
@@ -28315,13 +28566,13 @@ GL_PREFIX(ProgramNamedParameter4dNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	6000(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6000(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$56, %rsp
@@ -28341,7 +28592,7 @@ GL_PREFIX(ProgramNamedParameter4dNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	6000(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4dNV), .-GL_PREFIX(ProgramNamedParameter4dNV)
@@ -28352,7 +28603,7 @@ GL_PREFIX(ProgramNamedParameter4dNV):
 GL_PREFIX(ProgramNamedParameter4dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6008(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28366,13 +28617,13 @@ GL_PREFIX(ProgramNamedParameter4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6008(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6008(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28386,7 +28637,7 @@ GL_PREFIX(ProgramNamedParameter4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6008(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4dvNV), .-GL_PREFIX(ProgramNamedParameter4dvNV)
@@ -28397,7 +28648,7 @@ GL_PREFIX(ProgramNamedParameter4dvNV):
 GL_PREFIX(ProgramNamedParameter4fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6016(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$56, %rsp
@@ -28417,13 +28668,13 @@ GL_PREFIX(ProgramNamedParameter4fNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	6016(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6016(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$56, %rsp
@@ -28443,7 +28694,7 @@ GL_PREFIX(ProgramNamedParameter4fNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	6016(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4fNV), .-GL_PREFIX(ProgramNamedParameter4fNV)
@@ -28454,7 +28705,7 @@ GL_PREFIX(ProgramNamedParameter4fNV):
 GL_PREFIX(ProgramNamedParameter4fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6024(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28468,13 +28719,13 @@ GL_PREFIX(ProgramNamedParameter4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6024(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6024(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28488,19 +28739,19 @@ GL_PREFIX(ProgramNamedParameter4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6024(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4fvNV), .-GL_PREFIX(ProgramNamedParameter4fvNV)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_754)
-	.type	GL_PREFIX(_dispatch_stub_754), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_754))
-GL_PREFIX(_dispatch_stub_754):
+	.globl	GL_PREFIX(_dispatch_stub_761)
+	.type	GL_PREFIX(_dispatch_stub_761), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_761))
+GL_PREFIX(_dispatch_stub_761):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6032(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28510,13 +28761,13 @@ GL_PREFIX(_dispatch_stub_754):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6032(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6032(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28526,19 +28777,19 @@ GL_PREFIX(_dispatch_stub_754):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6032(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_754), .-GL_PREFIX(_dispatch_stub_754)
+	.size	GL_PREFIX(_dispatch_stub_761), .-GL_PREFIX(_dispatch_stub_761)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_755)
-	.type	GL_PREFIX(_dispatch_stub_755), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_755))
-GL_PREFIX(_dispatch_stub_755):
+	.globl	GL_PREFIX(_dispatch_stub_762)
+	.type	GL_PREFIX(_dispatch_stub_762), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_762))
+GL_PREFIX(_dispatch_stub_762):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6040(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28548,13 +28799,13 @@ GL_PREFIX(_dispatch_stub_755):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6040(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6040(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28564,10 +28815,10 @@ GL_PREFIX(_dispatch_stub_755):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6040(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_755), .-GL_PREFIX(_dispatch_stub_755)
+	.size	GL_PREFIX(_dispatch_stub_762), .-GL_PREFIX(_dispatch_stub_762)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(BindFramebufferEXT)
@@ -28575,7 +28826,7 @@ GL_PREFIX(_dispatch_stub_755):
 GL_PREFIX(BindFramebufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6048(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28585,13 +28836,13 @@ GL_PREFIX(BindFramebufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6048(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6048(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28601,7 +28852,7 @@ GL_PREFIX(BindFramebufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6048(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindFramebufferEXT), .-GL_PREFIX(BindFramebufferEXT)
@@ -28612,7 +28863,7 @@ GL_PREFIX(BindFramebufferEXT):
 GL_PREFIX(BindRenderbufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6056(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28622,13 +28873,13 @@ GL_PREFIX(BindRenderbufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6056(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6056(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28638,7 +28889,7 @@ GL_PREFIX(BindRenderbufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6056(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindRenderbufferEXT), .-GL_PREFIX(BindRenderbufferEXT)
@@ -28649,25 +28900,25 @@ GL_PREFIX(BindRenderbufferEXT):
 GL_PREFIX(CheckFramebufferStatusEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6064(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6064(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6064(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6064(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CheckFramebufferStatusEXT), .-GL_PREFIX(CheckFramebufferStatusEXT)
@@ -28678,7 +28929,7 @@ GL_PREFIX(CheckFramebufferStatusEXT):
 GL_PREFIX(DeleteFramebuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6072(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28688,13 +28939,13 @@ GL_PREFIX(DeleteFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6072(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6072(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28704,7 +28955,7 @@ GL_PREFIX(DeleteFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6072(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteFramebuffersEXT), .-GL_PREFIX(DeleteFramebuffersEXT)
@@ -28715,7 +28966,7 @@ GL_PREFIX(DeleteFramebuffersEXT):
 GL_PREFIX(DeleteRenderbuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6080(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28725,13 +28976,13 @@ GL_PREFIX(DeleteRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6080(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6080(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28741,7 +28992,7 @@ GL_PREFIX(DeleteRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6080(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteRenderbuffersEXT), .-GL_PREFIX(DeleteRenderbuffersEXT)
@@ -28752,7 +29003,7 @@ GL_PREFIX(DeleteRenderbuffersEXT):
 GL_PREFIX(FramebufferRenderbufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6088(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28766,13 +29017,13 @@ GL_PREFIX(FramebufferRenderbufferEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6088(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6088(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28786,7 +29037,7 @@ GL_PREFIX(FramebufferRenderbufferEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6088(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferRenderbufferEXT), .-GL_PREFIX(FramebufferRenderbufferEXT)
@@ -28797,7 +29048,7 @@ GL_PREFIX(FramebufferRenderbufferEXT):
 GL_PREFIX(FramebufferTexture1DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6096(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28811,13 +29062,13 @@ GL_PREFIX(FramebufferTexture1DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6096(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6096(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28831,7 +29082,7 @@ GL_PREFIX(FramebufferTexture1DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6096(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTexture1DEXT), .-GL_PREFIX(FramebufferTexture1DEXT)
@@ -28842,7 +29093,7 @@ GL_PREFIX(FramebufferTexture1DEXT):
 GL_PREFIX(FramebufferTexture2DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6104(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28856,13 +29107,13 @@ GL_PREFIX(FramebufferTexture2DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6104(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6104(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28876,7 +29127,7 @@ GL_PREFIX(FramebufferTexture2DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6104(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTexture2DEXT), .-GL_PREFIX(FramebufferTexture2DEXT)
@@ -28887,7 +29138,7 @@ GL_PREFIX(FramebufferTexture2DEXT):
 GL_PREFIX(FramebufferTexture3DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6112(%rax), %r11
+	movq	6168(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28905,13 +29156,13 @@ GL_PREFIX(FramebufferTexture3DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6112(%rax), %r11
+	movq	6168(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6112(%rax), %r11
+	movq	6168(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28929,7 +29180,7 @@ GL_PREFIX(FramebufferTexture3DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6112(%rax), %r11
+	movq	6168(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTexture3DEXT), .-GL_PREFIX(FramebufferTexture3DEXT)
@@ -28940,7 +29191,7 @@ GL_PREFIX(FramebufferTexture3DEXT):
 GL_PREFIX(GenFramebuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6120(%rax), %r11
+	movq	6176(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28950,13 +29201,13 @@ GL_PREFIX(GenFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6120(%rax), %r11
+	movq	6176(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6120(%rax), %r11
+	movq	6176(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28966,7 +29217,7 @@ GL_PREFIX(GenFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6120(%rax), %r11
+	movq	6176(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenFramebuffersEXT), .-GL_PREFIX(GenFramebuffersEXT)
@@ -28977,7 +29228,7 @@ GL_PREFIX(GenFramebuffersEXT):
 GL_PREFIX(GenRenderbuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6128(%rax), %r11
+	movq	6184(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28987,13 +29238,13 @@ GL_PREFIX(GenRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6128(%rax), %r11
+	movq	6184(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6128(%rax), %r11
+	movq	6184(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29003,7 +29254,7 @@ GL_PREFIX(GenRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6128(%rax), %r11
+	movq	6184(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenRenderbuffersEXT), .-GL_PREFIX(GenRenderbuffersEXT)
@@ -29014,25 +29265,25 @@ GL_PREFIX(GenRenderbuffersEXT):
 GL_PREFIX(GenerateMipmapEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6136(%rax), %r11
+	movq	6192(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6136(%rax), %r11
+	movq	6192(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6136(%rax), %r11
+	movq	6192(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6136(%rax), %r11
+	movq	6192(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenerateMipmapEXT), .-GL_PREFIX(GenerateMipmapEXT)
@@ -29043,7 +29294,7 @@ GL_PREFIX(GenerateMipmapEXT):
 GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6144(%rax), %r11
+	movq	6200(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29057,13 +29308,13 @@ GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6144(%rax), %r11
+	movq	6200(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6144(%rax), %r11
+	movq	6200(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29077,7 +29328,7 @@ GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6144(%rax), %r11
+	movq	6200(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetFramebufferAttachmentParameterivEXT), .-GL_PREFIX(GetFramebufferAttachmentParameterivEXT)
@@ -29088,7 +29339,7 @@ GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 GL_PREFIX(GetRenderbufferParameterivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6152(%rax), %r11
+	movq	6208(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29098,13 +29349,13 @@ GL_PREFIX(GetRenderbufferParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6152(%rax), %r11
+	movq	6208(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6152(%rax), %r11
+	movq	6208(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29114,7 +29365,7 @@ GL_PREFIX(GetRenderbufferParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6152(%rax), %r11
+	movq	6208(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetRenderbufferParameterivEXT), .-GL_PREFIX(GetRenderbufferParameterivEXT)
@@ -29125,25 +29376,25 @@ GL_PREFIX(GetRenderbufferParameterivEXT):
 GL_PREFIX(IsFramebufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6160(%rax), %r11
+	movq	6216(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6160(%rax), %r11
+	movq	6216(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6160(%rax), %r11
+	movq	6216(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6160(%rax), %r11
+	movq	6216(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsFramebufferEXT), .-GL_PREFIX(IsFramebufferEXT)
@@ -29154,25 +29405,25 @@ GL_PREFIX(IsFramebufferEXT):
 GL_PREFIX(IsRenderbufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6168(%rax), %r11
+	movq	6224(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6168(%rax), %r11
+	movq	6224(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6168(%rax), %r11
+	movq	6224(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6168(%rax), %r11
+	movq	6224(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsRenderbufferEXT), .-GL_PREFIX(IsRenderbufferEXT)
@@ -29183,7 +29434,7 @@ GL_PREFIX(IsRenderbufferEXT):
 GL_PREFIX(RenderbufferStorageEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6176(%rax), %r11
+	movq	6232(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29197,13 +29448,13 @@ GL_PREFIX(RenderbufferStorageEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6176(%rax), %r11
+	movq	6232(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6176(%rax), %r11
+	movq	6232(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29217,19 +29468,19 @@ GL_PREFIX(RenderbufferStorageEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6176(%rax), %r11
+	movq	6232(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(RenderbufferStorageEXT), .-GL_PREFIX(RenderbufferStorageEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_773)
-	.type	GL_PREFIX(_dispatch_stub_773), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_773))
-GL_PREFIX(_dispatch_stub_773):
+	.globl	GL_PREFIX(_dispatch_stub_780)
+	.type	GL_PREFIX(_dispatch_stub_780), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_780))
+GL_PREFIX(_dispatch_stub_780):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6184(%rax), %r11
+	movq	6240(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29247,13 +29498,13 @@ GL_PREFIX(_dispatch_stub_773):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6184(%rax), %r11
+	movq	6240(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6184(%rax), %r11
+	movq	6240(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29271,19 +29522,19 @@ GL_PREFIX(_dispatch_stub_773):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6184(%rax), %r11
+	movq	6240(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_773), .-GL_PREFIX(_dispatch_stub_773)
+	.size	GL_PREFIX(_dispatch_stub_780), .-GL_PREFIX(_dispatch_stub_780)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_774)
-	.type	GL_PREFIX(_dispatch_stub_774), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_774))
-GL_PREFIX(_dispatch_stub_774):
+	.globl	GL_PREFIX(_dispatch_stub_781)
+	.type	GL_PREFIX(_dispatch_stub_781), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_781))
+GL_PREFIX(_dispatch_stub_781):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6192(%rax), %r11
+	movq	6248(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29293,13 +29544,13 @@ GL_PREFIX(_dispatch_stub_774):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6192(%rax), %r11
+	movq	6248(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6192(%rax), %r11
+	movq	6248(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29309,19 +29560,19 @@ GL_PREFIX(_dispatch_stub_774):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6192(%rax), %r11
+	movq	6248(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_774), .-GL_PREFIX(_dispatch_stub_774)
+	.size	GL_PREFIX(_dispatch_stub_781), .-GL_PREFIX(_dispatch_stub_781)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_775)
-	.type	GL_PREFIX(_dispatch_stub_775), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_775))
-GL_PREFIX(_dispatch_stub_775):
+	.globl	GL_PREFIX(_dispatch_stub_782)
+	.type	GL_PREFIX(_dispatch_stub_782), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_782))
+GL_PREFIX(_dispatch_stub_782):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6200(%rax), %r11
+	movq	6256(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29331,13 +29582,13 @@ GL_PREFIX(_dispatch_stub_775):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6200(%rax), %r11
+	movq	6256(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6200(%rax), %r11
+	movq	6256(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29347,10 +29598,10 @@ GL_PREFIX(_dispatch_stub_775):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6200(%rax), %r11
+	movq	6256(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_775), .-GL_PREFIX(_dispatch_stub_775)
+	.size	GL_PREFIX(_dispatch_stub_782), .-GL_PREFIX(_dispatch_stub_782)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(FramebufferTextureLayerEXT)
@@ -29358,7 +29609,7 @@ GL_PREFIX(_dispatch_stub_775):
 GL_PREFIX(FramebufferTextureLayerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6208(%rax), %r11
+	movq	6264(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29372,13 +29623,13 @@ GL_PREFIX(FramebufferTextureLayerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6208(%rax), %r11
+	movq	6264(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6208(%rax), %r11
+	movq	6264(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29392,7 +29643,7 @@ GL_PREFIX(FramebufferTextureLayerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6208(%rax), %r11
+	movq	6264(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTextureLayerEXT), .-GL_PREFIX(FramebufferTextureLayerEXT)
@@ -29403,37 +29654,37 @@ GL_PREFIX(FramebufferTextureLayerEXT):
 GL_PREFIX(ProvokingVertexEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6216(%rax), %r11
+	movq	6272(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6216(%rax), %r11
+	movq	6272(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6216(%rax), %r11
+	movq	6272(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6216(%rax), %r11
+	movq	6272(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProvokingVertexEXT), .-GL_PREFIX(ProvokingVertexEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_778)
-	.type	GL_PREFIX(_dispatch_stub_778), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_778))
-GL_PREFIX(_dispatch_stub_778):
+	.globl	GL_PREFIX(_dispatch_stub_785)
+	.type	GL_PREFIX(_dispatch_stub_785), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_785))
+GL_PREFIX(_dispatch_stub_785):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6224(%rax), %r11
+	movq	6280(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29443,13 +29694,13 @@ GL_PREFIX(_dispatch_stub_778):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6224(%rax), %r11
+	movq	6280(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6224(%rax), %r11
+	movq	6280(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29459,19 +29710,19 @@ GL_PREFIX(_dispatch_stub_778):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6224(%rax), %r11
+	movq	6280(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_778), .-GL_PREFIX(_dispatch_stub_778)
+	.size	GL_PREFIX(_dispatch_stub_785), .-GL_PREFIX(_dispatch_stub_785)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_779)
-	.type	GL_PREFIX(_dispatch_stub_779), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_779))
-GL_PREFIX(_dispatch_stub_779):
+	.globl	GL_PREFIX(_dispatch_stub_786)
+	.type	GL_PREFIX(_dispatch_stub_786), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_786))
+GL_PREFIX(_dispatch_stub_786):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6232(%rax), %r11
+	movq	6288(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29481,13 +29732,13 @@ GL_PREFIX(_dispatch_stub_779):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6232(%rax), %r11
+	movq	6288(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6232(%rax), %r11
+	movq	6288(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29497,19 +29748,19 @@ GL_PREFIX(_dispatch_stub_779):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6232(%rax), %r11
+	movq	6288(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_779), .-GL_PREFIX(_dispatch_stub_779)
+	.size	GL_PREFIX(_dispatch_stub_786), .-GL_PREFIX(_dispatch_stub_786)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_780)
-	.type	GL_PREFIX(_dispatch_stub_780), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_780))
-GL_PREFIX(_dispatch_stub_780):
+	.globl	GL_PREFIX(_dispatch_stub_787)
+	.type	GL_PREFIX(_dispatch_stub_787), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_787))
+GL_PREFIX(_dispatch_stub_787):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6240(%rax), %r11
+	movq	6296(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29523,13 +29774,13 @@ GL_PREFIX(_dispatch_stub_780):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6240(%rax), %r11
+	movq	6296(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6240(%rax), %r11
+	movq	6296(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29543,19 +29794,19 @@ GL_PREFIX(_dispatch_stub_780):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6240(%rax), %r11
+	movq	6296(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_780), .-GL_PREFIX(_dispatch_stub_780)
+	.size	GL_PREFIX(_dispatch_stub_787), .-GL_PREFIX(_dispatch_stub_787)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_781)
-	.type	GL_PREFIX(_dispatch_stub_781), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_781))
-GL_PREFIX(_dispatch_stub_781):
+	.globl	GL_PREFIX(_dispatch_stub_788)
+	.type	GL_PREFIX(_dispatch_stub_788), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_788))
+GL_PREFIX(_dispatch_stub_788):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6248(%rax), %r11
+	movq	6304(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29569,13 +29820,13 @@ GL_PREFIX(_dispatch_stub_781):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6248(%rax), %r11
+	movq	6304(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6248(%rax), %r11
+	movq	6304(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29589,19 +29840,19 @@ GL_PREFIX(_dispatch_stub_781):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6248(%rax), %r11
+	movq	6304(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_781), .-GL_PREFIX(_dispatch_stub_781)
+	.size	GL_PREFIX(_dispatch_stub_788), .-GL_PREFIX(_dispatch_stub_788)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_782)
-	.type	GL_PREFIX(_dispatch_stub_782), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_782))
-GL_PREFIX(_dispatch_stub_782):
+	.globl	GL_PREFIX(_dispatch_stub_789)
+	.type	GL_PREFIX(_dispatch_stub_789), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_789))
+GL_PREFIX(_dispatch_stub_789):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6256(%rax), %r11
+	movq	6312(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29615,13 +29866,13 @@ GL_PREFIX(_dispatch_stub_782):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6256(%rax), %r11
+	movq	6312(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6256(%rax), %r11
+	movq	6312(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29635,19 +29886,19 @@ GL_PREFIX(_dispatch_stub_782):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6256(%rax), %r11
+	movq	6312(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_782), .-GL_PREFIX(_dispatch_stub_782)
+	.size	GL_PREFIX(_dispatch_stub_789), .-GL_PREFIX(_dispatch_stub_789)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_783)
-	.type	GL_PREFIX(_dispatch_stub_783), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_783))
-GL_PREFIX(_dispatch_stub_783):
+	.globl	GL_PREFIX(_dispatch_stub_790)
+	.type	GL_PREFIX(_dispatch_stub_790), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_790))
+GL_PREFIX(_dispatch_stub_790):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6264(%rax), %r11
+	movq	6320(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29657,13 +29908,13 @@ GL_PREFIX(_dispatch_stub_783):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6264(%rax), %r11
+	movq	6320(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6264(%rax), %r11
+	movq	6320(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29673,19 +29924,19 @@ GL_PREFIX(_dispatch_stub_783):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6264(%rax), %r11
+	movq	6320(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_783), .-GL_PREFIX(_dispatch_stub_783)
+	.size	GL_PREFIX(_dispatch_stub_790), .-GL_PREFIX(_dispatch_stub_790)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_784)
-	.type	GL_PREFIX(_dispatch_stub_784), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_784))
-GL_PREFIX(_dispatch_stub_784):
+	.globl	GL_PREFIX(_dispatch_stub_791)
+	.type	GL_PREFIX(_dispatch_stub_791), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_791))
+GL_PREFIX(_dispatch_stub_791):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6272(%rax), %r11
+	movq	6328(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29695,13 +29946,13 @@ GL_PREFIX(_dispatch_stub_784):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6272(%rax), %r11
+	movq	6328(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6272(%rax), %r11
+	movq	6328(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29711,10 +29962,10 @@ GL_PREFIX(_dispatch_stub_784):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6272(%rax), %r11
+	movq	6328(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_784), .-GL_PREFIX(_dispatch_stub_784)
+	.size	GL_PREFIX(_dispatch_stub_791), .-GL_PREFIX(_dispatch_stub_791)
 
 	.globl GL_PREFIX(ArrayElementEXT) ; .set GL_PREFIX(ArrayElementEXT), GL_PREFIX(ArrayElement)
 	.globl GL_PREFIX(BindTextureEXT) ; .set GL_PREFIX(BindTextureEXT), GL_PREFIX(BindTexture)
@@ -29969,9 +30220,9 @@ GL_PREFIX(_dispatch_stub_784):
 	.globl GL_PREFIX(IsProgramARB) ; .set GL_PREFIX(IsProgramARB), GL_PREFIX(IsProgramNV)
 	.globl GL_PREFIX(PointParameteri) ; .set GL_PREFIX(PointParameteri), GL_PREFIX(PointParameteriNV)
 	.globl GL_PREFIX(PointParameteriv) ; .set GL_PREFIX(PointParameteriv), GL_PREFIX(PointParameterivNV)
-	.globl GL_PREFIX(DeleteVertexArrays) ; .set GL_PREFIX(DeleteVertexArrays), GL_PREFIX(_dispatch_stub_745)
-	.globl GL_PREFIX(IsVertexArray) ; .set GL_PREFIX(IsVertexArray), GL_PREFIX(_dispatch_stub_747)
-	.globl GL_PREFIX(BlendEquationSeparate) ; .set GL_PREFIX(BlendEquationSeparate), GL_PREFIX(_dispatch_stub_755)
+	.globl GL_PREFIX(DeleteVertexArrays) ; .set GL_PREFIX(DeleteVertexArrays), GL_PREFIX(_dispatch_stub_752)
+	.globl GL_PREFIX(IsVertexArray) ; .set GL_PREFIX(IsVertexArray), GL_PREFIX(_dispatch_stub_754)
+	.globl GL_PREFIX(BlendEquationSeparate) ; .set GL_PREFIX(BlendEquationSeparate), GL_PREFIX(_dispatch_stub_762)
 	.globl GL_PREFIX(BindFramebuffer) ; .set GL_PREFIX(BindFramebuffer), GL_PREFIX(BindFramebufferEXT)
 	.globl GL_PREFIX(BindRenderbuffer) ; .set GL_PREFIX(BindRenderbuffer), GL_PREFIX(BindRenderbufferEXT)
 	.globl GL_PREFIX(CheckFramebufferStatus) ; .set GL_PREFIX(CheckFramebufferStatus), GL_PREFIX(CheckFramebufferStatusEXT)
@@ -29989,7 +30240,7 @@ GL_PREFIX(_dispatch_stub_784):
 	.globl GL_PREFIX(IsFramebuffer) ; .set GL_PREFIX(IsFramebuffer), GL_PREFIX(IsFramebufferEXT)
 	.globl GL_PREFIX(IsRenderbuffer) ; .set GL_PREFIX(IsRenderbuffer), GL_PREFIX(IsRenderbufferEXT)
 	.globl GL_PREFIX(RenderbufferStorage) ; .set GL_PREFIX(RenderbufferStorage), GL_PREFIX(RenderbufferStorageEXT)
-	.globl GL_PREFIX(BlitFramebuffer) ; .set GL_PREFIX(BlitFramebuffer), GL_PREFIX(_dispatch_stub_773)
+	.globl GL_PREFIX(BlitFramebuffer) ; .set GL_PREFIX(BlitFramebuffer), GL_PREFIX(_dispatch_stub_780)
 	.globl GL_PREFIX(FramebufferTextureLayer) ; .set GL_PREFIX(FramebufferTextureLayer), GL_PREFIX(FramebufferTextureLayerEXT)
 
 #if defined(GLX_USE_TLS) && defined(__linux__)
diff --git a/src/mesa/x86/glapi_x86.S b/src/mesa/x86/glapi_x86.S
index 204175b72d..46794adaf7 100644
--- a/src/mesa/x86/glapi_x86.S
+++ b/src/mesa/x86/glapi_x86.S
@@ -718,23 +718,30 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(BindVertexArray, _gloffset_BindVertexArray, BindVertexArray@4)
 	GL_STUB(GenVertexArrays, _gloffset_GenVertexArrays, GenVertexArrays@8)
 	GL_STUB(CopyBufferSubData, _gloffset_CopyBufferSubData, CopyBufferSubData@20)
+	GL_STUB(ClientWaitSync, _gloffset_ClientWaitSync, ClientWaitSync@12)
+	GL_STUB(DeleteSync, _gloffset_DeleteSync, DeleteSync@4)
+	GL_STUB(FenceSync, _gloffset_FenceSync, FenceSync@8)
+	GL_STUB(GetInteger64v, _gloffset_GetInteger64v, GetInteger64v@8)
+	GL_STUB(GetSynciv, _gloffset_GetSynciv, GetSynciv@20)
+	GL_STUB(IsSync, _gloffset_IsSync, IsSync@4)
+	GL_STUB(WaitSync, _gloffset_WaitSync, WaitSync@12)
 	GL_STUB(PolygonOffsetEXT, _gloffset_PolygonOffsetEXT, PolygonOffsetEXT@8)
-	GL_STUB(_dispatch_stub_568, _gloffset_GetPixelTexGenParameterfvSGIS, _dispatch_stub_568@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_568, _dispatch_stub_568@8))
-	GL_STUB(_dispatch_stub_569, _gloffset_GetPixelTexGenParameterivSGIS, _dispatch_stub_569@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_569, _dispatch_stub_569@8))
-	GL_STUB(_dispatch_stub_570, _gloffset_PixelTexGenParameterfSGIS, _dispatch_stub_570@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_570, _dispatch_stub_570@8))
-	GL_STUB(_dispatch_stub_571, _gloffset_PixelTexGenParameterfvSGIS, _dispatch_stub_571@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_571, _dispatch_stub_571@8))
-	GL_STUB(_dispatch_stub_572, _gloffset_PixelTexGenParameteriSGIS, _dispatch_stub_572@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_572, _dispatch_stub_572@8))
-	GL_STUB(_dispatch_stub_573, _gloffset_PixelTexGenParameterivSGIS, _dispatch_stub_573@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_573, _dispatch_stub_573@8))
-	GL_STUB(_dispatch_stub_574, _gloffset_SampleMaskSGIS, _dispatch_stub_574@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_574, _dispatch_stub_574@8))
-	GL_STUB(_dispatch_stub_575, _gloffset_SamplePatternSGIS, _dispatch_stub_575@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_575, _dispatch_stub_575@4))
+	GL_STUB(_dispatch_stub_575, _gloffset_GetPixelTexGenParameterfvSGIS, _dispatch_stub_575@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_575, _dispatch_stub_575@8))
+	GL_STUB(_dispatch_stub_576, _gloffset_GetPixelTexGenParameterivSGIS, _dispatch_stub_576@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_576, _dispatch_stub_576@8))
+	GL_STUB(_dispatch_stub_577, _gloffset_PixelTexGenParameterfSGIS, _dispatch_stub_577@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_577, _dispatch_stub_577@8))
+	GL_STUB(_dispatch_stub_578, _gloffset_PixelTexGenParameterfvSGIS, _dispatch_stub_578@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_578, _dispatch_stub_578@8))
+	GL_STUB(_dispatch_stub_579, _gloffset_PixelTexGenParameteriSGIS, _dispatch_stub_579@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_579, _dispatch_stub_579@8))
+	GL_STUB(_dispatch_stub_580, _gloffset_PixelTexGenParameterivSGIS, _dispatch_stub_580@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_580, _dispatch_stub_580@8))
+	GL_STUB(_dispatch_stub_581, _gloffset_SampleMaskSGIS, _dispatch_stub_581@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_581, _dispatch_stub_581@8))
+	GL_STUB(_dispatch_stub_582, _gloffset_SamplePatternSGIS, _dispatch_stub_582@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_582, _dispatch_stub_582@4))
 	GL_STUB(ColorPointerEXT, _gloffset_ColorPointerEXT, ColorPointerEXT@20)
 	GL_STUB(EdgeFlagPointerEXT, _gloffset_EdgeFlagPointerEXT, EdgeFlagPointerEXT@12)
 	GL_STUB(IndexPointerEXT, _gloffset_IndexPointerEXT, IndexPointerEXT@16)
@@ -745,10 +752,10 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(PointParameterfvEXT, _gloffset_PointParameterfvEXT, PointParameterfvEXT@8)
 	GL_STUB(LockArraysEXT, _gloffset_LockArraysEXT, LockArraysEXT@8)
 	GL_STUB(UnlockArraysEXT, _gloffset_UnlockArraysEXT, UnlockArraysEXT@0)
-	GL_STUB(_dispatch_stub_586, _gloffset_CullParameterdvEXT, _dispatch_stub_586@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_586, _dispatch_stub_586@8))
-	GL_STUB(_dispatch_stub_587, _gloffset_CullParameterfvEXT, _dispatch_stub_587@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_587, _dispatch_stub_587@8))
+	GL_STUB(_dispatch_stub_593, _gloffset_CullParameterdvEXT, _dispatch_stub_593@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_593, _dispatch_stub_593@8))
+	GL_STUB(_dispatch_stub_594, _gloffset_CullParameterfvEXT, _dispatch_stub_594@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_594, _dispatch_stub_594@8))
 	GL_STUB(SecondaryColor3bEXT, _gloffset_SecondaryColor3bEXT, SecondaryColor3bEXT@12)
 	GL_STUB(SecondaryColor3bvEXT, _gloffset_SecondaryColor3bvEXT, SecondaryColor3bvEXT@4)
 	GL_STUB(SecondaryColor3dEXT, _gloffset_SecondaryColor3dEXT, SecondaryColor3dEXT@24)
@@ -773,8 +780,8 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(FogCoorddvEXT, _gloffset_FogCoorddvEXT, FogCoorddvEXT@4)
 	GL_STUB(FogCoordfEXT, _gloffset_FogCoordfEXT, FogCoordfEXT@4)
 	GL_STUB(FogCoordfvEXT, _gloffset_FogCoordfvEXT, FogCoordfvEXT@4)
-	GL_STUB(_dispatch_stub_612, _gloffset_PixelTexGenSGIX, _dispatch_stub_612@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_612, _dispatch_stub_612@4))
+	GL_STUB(_dispatch_stub_619, _gloffset_PixelTexGenSGIX, _dispatch_stub_619@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_619, _dispatch_stub_619@4))
 	GL_STUB(BlendFuncSeparateEXT, _gloffset_BlendFuncSeparateEXT, BlendFuncSeparateEXT@16)
 	GL_STUB(FlushVertexArrayRangeNV, _gloffset_FlushVertexArrayRangeNV, FlushVertexArrayRangeNV@0)
 	GL_STUB(VertexArrayRangeNV, _gloffset_VertexArrayRangeNV, VertexArrayRangeNV@8)
@@ -816,24 +823,24 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(WindowPos4ivMESA, _gloffset_WindowPos4ivMESA, WindowPos4ivMESA@4)
 	GL_STUB(WindowPos4sMESA, _gloffset_WindowPos4sMESA, WindowPos4sMESA@16)
 	GL_STUB(WindowPos4svMESA, _gloffset_WindowPos4svMESA, WindowPos4svMESA@4)
-	GL_STUB(_dispatch_stub_654, _gloffset_MultiModeDrawArraysIBM, _dispatch_stub_654@20)
-	HIDDEN(GL_PREFIX(_dispatch_stub_654, _dispatch_stub_654@20))
-	GL_STUB(_dispatch_stub_655, _gloffset_MultiModeDrawElementsIBM, _dispatch_stub_655@24)
-	HIDDEN(GL_PREFIX(_dispatch_stub_655, _dispatch_stub_655@24))
-	GL_STUB(_dispatch_stub_656, _gloffset_DeleteFencesNV, _dispatch_stub_656@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_656, _dispatch_stub_656@8))
-	GL_STUB(_dispatch_stub_657, _gloffset_FinishFenceNV, _dispatch_stub_657@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_657, _dispatch_stub_657@4))
-	GL_STUB(_dispatch_stub_658, _gloffset_GenFencesNV, _dispatch_stub_658@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_658, _dispatch_stub_658@8))
-	GL_STUB(_dispatch_stub_659, _gloffset_GetFenceivNV, _dispatch_stub_659@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_659, _dispatch_stub_659@12))
-	GL_STUB(_dispatch_stub_660, _gloffset_IsFenceNV, _dispatch_stub_660@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_660, _dispatch_stub_660@4))
-	GL_STUB(_dispatch_stub_661, _gloffset_SetFenceNV, _dispatch_stub_661@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_661, _dispatch_stub_661@8))
-	GL_STUB(_dispatch_stub_662, _gloffset_TestFenceNV, _dispatch_stub_662@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_662, _dispatch_stub_662@4))
+	GL_STUB(_dispatch_stub_661, _gloffset_MultiModeDrawArraysIBM, _dispatch_stub_661@20)
+	HIDDEN(GL_PREFIX(_dispatch_stub_661, _dispatch_stub_661@20))
+	GL_STUB(_dispatch_stub_662, _gloffset_MultiModeDrawElementsIBM, _dispatch_stub_662@24)
+	HIDDEN(GL_PREFIX(_dispatch_stub_662, _dispatch_stub_662@24))
+	GL_STUB(_dispatch_stub_663, _gloffset_DeleteFencesNV, _dispatch_stub_663@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_663, _dispatch_stub_663@8))
+	GL_STUB(_dispatch_stub_664, _gloffset_FinishFenceNV, _dispatch_stub_664@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_664, _dispatch_stub_664@4))
+	GL_STUB(_dispatch_stub_665, _gloffset_GenFencesNV, _dispatch_stub_665@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_665, _dispatch_stub_665@8))
+	GL_STUB(_dispatch_stub_666, _gloffset_GetFenceivNV, _dispatch_stub_666@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_666, _dispatch_stub_666@12))
+	GL_STUB(_dispatch_stub_667, _gloffset_IsFenceNV, _dispatch_stub_667@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_667, _dispatch_stub_667@4))
+	GL_STUB(_dispatch_stub_668, _gloffset_SetFenceNV, _dispatch_stub_668@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_668, _dispatch_stub_668@8))
+	GL_STUB(_dispatch_stub_669, _gloffset_TestFenceNV, _dispatch_stub_669@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_669, _dispatch_stub_669@4))
 	GL_STUB(AreProgramsResidentNV, _gloffset_AreProgramsResidentNV, AreProgramsResidentNV@12)
 	GL_STUB(BindProgramNV, _gloffset_BindProgramNV, BindProgramNV@8)
 	GL_STUB(DeleteProgramsNV, _gloffset_DeleteProgramsNV, DeleteProgramsNV@8)
@@ -914,26 +921,26 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(SetFragmentShaderConstantATI, _gloffset_SetFragmentShaderConstantATI, SetFragmentShaderConstantATI@8)
 	GL_STUB(PointParameteriNV, _gloffset_PointParameteriNV, PointParameteriNV@8)
 	GL_STUB(PointParameterivNV, _gloffset_PointParameterivNV, PointParameterivNV@8)
-	GL_STUB(_dispatch_stub_743, _gloffset_ActiveStencilFaceEXT, _dispatch_stub_743@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_743, _dispatch_stub_743@4))
-	GL_STUB(_dispatch_stub_744, _gloffset_BindVertexArrayAPPLE, _dispatch_stub_744@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_744, _dispatch_stub_744@4))
-	GL_STUB(_dispatch_stub_745, _gloffset_DeleteVertexArraysAPPLE, _dispatch_stub_745@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_745, _dispatch_stub_745@8))
-	GL_STUB(_dispatch_stub_746, _gloffset_GenVertexArraysAPPLE, _dispatch_stub_746@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_746, _dispatch_stub_746@8))
-	GL_STUB(_dispatch_stub_747, _gloffset_IsVertexArrayAPPLE, _dispatch_stub_747@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_747, _dispatch_stub_747@4))
+	GL_STUB(_dispatch_stub_750, _gloffset_ActiveStencilFaceEXT, _dispatch_stub_750@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_750, _dispatch_stub_750@4))
+	GL_STUB(_dispatch_stub_751, _gloffset_BindVertexArrayAPPLE, _dispatch_stub_751@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_751, _dispatch_stub_751@4))
+	GL_STUB(_dispatch_stub_752, _gloffset_DeleteVertexArraysAPPLE, _dispatch_stub_752@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_752, _dispatch_stub_752@8))
+	GL_STUB(_dispatch_stub_753, _gloffset_GenVertexArraysAPPLE, _dispatch_stub_753@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_753, _dispatch_stub_753@8))
+	GL_STUB(_dispatch_stub_754, _gloffset_IsVertexArrayAPPLE, _dispatch_stub_754@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_754, _dispatch_stub_754@4))
 	GL_STUB(GetProgramNamedParameterdvNV, _gloffset_GetProgramNamedParameterdvNV, GetProgramNamedParameterdvNV@16)
 	GL_STUB(GetProgramNamedParameterfvNV, _gloffset_GetProgramNamedParameterfvNV, GetProgramNamedParameterfvNV@16)
 	GL_STUB(ProgramNamedParameter4dNV, _gloffset_ProgramNamedParameter4dNV, ProgramNamedParameter4dNV@44)
 	GL_STUB(ProgramNamedParameter4dvNV, _gloffset_ProgramNamedParameter4dvNV, ProgramNamedParameter4dvNV@16)
 	GL_STUB(ProgramNamedParameter4fNV, _gloffset_ProgramNamedParameter4fNV, ProgramNamedParameter4fNV@28)
 	GL_STUB(ProgramNamedParameter4fvNV, _gloffset_ProgramNamedParameter4fvNV, ProgramNamedParameter4fvNV@16)
-	GL_STUB(_dispatch_stub_754, _gloffset_DepthBoundsEXT, _dispatch_stub_754@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_754, _dispatch_stub_754@16))
-	GL_STUB(_dispatch_stub_755, _gloffset_BlendEquationSeparateEXT, _dispatch_stub_755@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_755, _dispatch_stub_755@8))
+	GL_STUB(_dispatch_stub_761, _gloffset_DepthBoundsEXT, _dispatch_stub_761@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_761, _dispatch_stub_761@16))
+	GL_STUB(_dispatch_stub_762, _gloffset_BlendEquationSeparateEXT, _dispatch_stub_762@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_762, _dispatch_stub_762@8))
 	GL_STUB(BindFramebufferEXT, _gloffset_BindFramebufferEXT, BindFramebufferEXT@8)
 	GL_STUB(BindRenderbufferEXT, _gloffset_BindRenderbufferEXT, BindRenderbufferEXT@8)
 	GL_STUB(CheckFramebufferStatusEXT, _gloffset_CheckFramebufferStatusEXT, CheckFramebufferStatusEXT@4)
@@ -951,28 +958,28 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(IsFramebufferEXT, _gloffset_IsFramebufferEXT, IsFramebufferEXT@4)
 	GL_STUB(IsRenderbufferEXT, _gloffset_IsRenderbufferEXT, IsRenderbufferEXT@4)
 	GL_STUB(RenderbufferStorageEXT, _gloffset_RenderbufferStorageEXT, RenderbufferStorageEXT@16)
-	GL_STUB(_dispatch_stub_773, _gloffset_BlitFramebufferEXT, _dispatch_stub_773@40)
-	HIDDEN(GL_PREFIX(_dispatch_stub_773, _dispatch_stub_773@40))
-	GL_STUB(_dispatch_stub_774, _gloffset_BufferParameteriAPPLE, _dispatch_stub_774@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_774, _dispatch_stub_774@12))
-	GL_STUB(_dispatch_stub_775, _gloffset_FlushMappedBufferRangeAPPLE, _dispatch_stub_775@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_775, _dispatch_stub_775@12))
+	GL_STUB(_dispatch_stub_780, _gloffset_BlitFramebufferEXT, _dispatch_stub_780@40)
+	HIDDEN(GL_PREFIX(_dispatch_stub_780, _dispatch_stub_780@40))
+	GL_STUB(_dispatch_stub_781, _gloffset_BufferParameteriAPPLE, _dispatch_stub_781@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_781, _dispatch_stub_781@12))
+	GL_STUB(_dispatch_stub_782, _gloffset_FlushMappedBufferRangeAPPLE, _dispatch_stub_782@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_782, _dispatch_stub_782@12))
 	GL_STUB(FramebufferTextureLayerEXT, _gloffset_FramebufferTextureLayerEXT, FramebufferTextureLayerEXT@20)
 	GL_STUB(ProvokingVertexEXT, _gloffset_ProvokingVertexEXT, ProvokingVertexEXT@4)
-	GL_STUB(_dispatch_stub_778, _gloffset_GetTexParameterPointervAPPLE, _dispatch_stub_778@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_778, _dispatch_stub_778@12))
-	GL_STUB(_dispatch_stub_779, _gloffset_TextureRangeAPPLE, _dispatch_stub_779@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_779, _dispatch_stub_779@12))
-	GL_STUB(_dispatch_stub_780, _gloffset_StencilFuncSeparateATI, _dispatch_stub_780@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_780, _dispatch_stub_780@16))
-	GL_STUB(_dispatch_stub_781, _gloffset_ProgramEnvParameters4fvEXT, _dispatch_stub_781@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_781, _dispatch_stub_781@16))
-	GL_STUB(_dispatch_stub_782, _gloffset_ProgramLocalParameters4fvEXT, _dispatch_stub_782@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_782, _dispatch_stub_782@16))
-	GL_STUB(_dispatch_stub_783, _gloffset_GetQueryObjecti64vEXT, _dispatch_stub_783@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_783, _dispatch_stub_783@12))
-	GL_STUB(_dispatch_stub_784, _gloffset_GetQueryObjectui64vEXT, _dispatch_stub_784@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_784, _dispatch_stub_784@12))
+	GL_STUB(_dispatch_stub_785, _gloffset_GetTexParameterPointervAPPLE, _dispatch_stub_785@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_785, _dispatch_stub_785@12))
+	GL_STUB(_dispatch_stub_786, _gloffset_TextureRangeAPPLE, _dispatch_stub_786@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_786, _dispatch_stub_786@12))
+	GL_STUB(_dispatch_stub_787, _gloffset_StencilFuncSeparateATI, _dispatch_stub_787@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_787, _dispatch_stub_787@16))
+	GL_STUB(_dispatch_stub_788, _gloffset_ProgramEnvParameters4fvEXT, _dispatch_stub_788@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_788, _dispatch_stub_788@16))
+	GL_STUB(_dispatch_stub_789, _gloffset_ProgramLocalParameters4fvEXT, _dispatch_stub_789@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_789, _dispatch_stub_789@16))
+	GL_STUB(_dispatch_stub_790, _gloffset_GetQueryObjecti64vEXT, _dispatch_stub_790@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_790, _dispatch_stub_790@12))
+	GL_STUB(_dispatch_stub_791, _gloffset_GetQueryObjectui64vEXT, _dispatch_stub_791@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_791, _dispatch_stub_791@12))
 	GL_STUB_ALIAS(ArrayElementEXT, _gloffset_ArrayElement, ArrayElementEXT@4, ArrayElement, ArrayElement@4)
 	GL_STUB_ALIAS(BindTextureEXT, _gloffset_BindTexture, BindTextureEXT@8, BindTexture, BindTexture@8)
 	GL_STUB_ALIAS(DrawArraysEXT, _gloffset_DrawArrays, DrawArraysEXT@12, DrawArrays, DrawArrays@12)
-- 
cgit v1.2.3


From f37070bab6af350caec905ea7658e9241042b6cc Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Fri, 28 Aug 2009 20:10:05 -0700
Subject: ARB sync: Add support for GL_ARB_sync to swrast

This isn't quite right yet.  The delete behavior and the context
clean-up needs some work.
---
 src/mesa/drivers/common/driverfuncs.c |   8 +
 src/mesa/drivers/dri/swrast/swrast.c  |   2 +
 src/mesa/main/api_exec.c              |  14 ++
 src/mesa/main/context.c               |  12 ++
 src/mesa/main/dd.h                    |  16 ++
 src/mesa/main/extensions.c            |   4 +
 src/mesa/main/get.c                   |  19 ++
 src/mesa/main/get_gen.py              |   7 +
 src/mesa/main/mfeatures.h             |   1 +
 src/mesa/main/mtypes.h                |  21 ++
 src/mesa/main/syncobj.c               | 372 ++++++++++++++++++++++++++++++++++
 src/mesa/main/syncobj.h               |  64 ++++++
 src/mesa/sources.mak                  |   1 +
 13 files changed, 541 insertions(+)
 create mode 100644 src/mesa/main/syncobj.c
 create mode 100644 src/mesa/main/syncobj.h

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c
index 3b397fef7d..a9f3c8e727 100644
--- a/src/mesa/drivers/common/driverfuncs.c
+++ b/src/mesa/drivers/common/driverfuncs.c
@@ -45,6 +45,9 @@
 #include "main/fbobject.h"
 #include "main/texrender.h"
 #endif
+#if FEATURE_ARB_sync
+#include "main/syncobj.h"
+#endif
 
 #include "shader/program.h"
 #include "shader/prog_execute.h"
@@ -200,6 +203,7 @@ _mesa_init_driver_functions(struct dd_function_table *driver)
    driver->GetDoublev = NULL;
    driver->GetFloatv = NULL;
    driver->GetIntegerv = NULL;
+   driver->GetInteger64v = NULL;
    driver->GetPointerv = NULL;
    
    /* buffer objects */
@@ -208,6 +212,10 @@ _mesa_init_driver_functions(struct dd_function_table *driver)
    /* query objects */
    _mesa_init_query_object_functions(driver);
 
+#if FEATURE_ARB_sync
+   _mesa_init_sync_object_functions(driver);
+#endif
+
 #if FEATURE_EXT_framebuffer_object
    driver->NewFramebuffer = _mesa_new_framebuffer;
    driver->NewRenderbuffer = _mesa_new_soft_renderbuffer;
diff --git a/src/mesa/drivers/dri/swrast/swrast.c b/src/mesa/drivers/dri/swrast/swrast.c
index 3aa7843b1b..69b92e9e44 100644
--- a/src/mesa/drivers/dri/swrast/swrast.c
+++ b/src/mesa/drivers/dri/swrast/swrast.c
@@ -65,6 +65,7 @@
 #define need_GL_ARB_shader_objects
 #define need_GL_ARB_vertex_array_object
 #define need_GL_ARB_vertex_program
+#define need_GL_ARB_sync
 #define need_GL_APPLE_vertex_array_object
 #define need_GL_ATI_fragment_shader
 #define need_GL_ATI_separate_stencil
@@ -97,6 +98,7 @@ const struct dri_extension card_extensions[] =
     { "GL_ARB_shader_objects",		GL_ARB_shader_objects_functions },
     { "GL_ARB_vertex_array_object",	GL_ARB_vertex_array_object_functions },
     { "GL_ARB_vertex_program",		GL_ARB_vertex_program_functions },
+    { "GL_ARB_sync",			GL_ARB_sync },
     { "GL_APPLE_vertex_array_object",	GL_APPLE_vertex_array_object_functions },
     { "GL_ATI_fragment_shader",		GL_ATI_fragment_shader_functions },
     { "GL_ATI_separate_stencil",	GL_ATI_separate_stencil_functions },
diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index cbf48615bf..02550ae108 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -129,6 +129,9 @@
 #if FEATURE_ARB_shader_objects
 #include "shaders.h"
 #endif
+#if FEATURE_ARB_sync
+#include "syncobj.h"
+#endif
 #include "debug.h"
 #include "glapi/dispatch.h"
 
@@ -823,6 +826,17 @@ _mesa_init_exec_table(struct _glapi_table *exec)
    SET_GetAttribLocationARB(exec, _mesa_GetAttribLocationARB);
 #endif    /* FEATURE_ARB_vertex_shader */
 
+   /* GL_ARB_sync */
+#if FEATURE_ARB_sync
+   SET_IsSync(exec, _mesa_IsSync);
+   SET_DeleteSync(exec, _mesa_DeleteSync);
+   SET_FenceSync(exec, _mesa_FenceSync);
+   SET_ClientWaitSync(exec, _mesa_ClientWaitSync);
+   SET_WaitSync(exec, _mesa_WaitSync);
+   SET_GetInteger64v(exec, _mesa_GetInteger64v);
+   SET_GetSynciv(exec, _mesa_GetSynciv);
+#endif
+
   /* GL_ATI_fragment_shader */
 #if FEATURE_ATI_fragment_shader
    SET_GenFragmentShadersATI(exec, _mesa_GenFragmentShadersATI);
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 4651760d78..f6d4ac4595 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -129,6 +129,9 @@
 #if FEATURE_ARB_occlusion_query
 #include "queryobj.h"
 #endif
+#if FEATURE_ARB_sync
+#include "syncobj.h"
+#endif
 #if FEATURE_drawpix
 #include "rastpos.h"
 #endif
@@ -592,6 +595,9 @@ _mesa_init_constants(GLcontext *ctx)
    /* GL_ARB_framebuffer_object */
    ctx->Const.MaxSamples = 0;
 
+   /* GL_ARB_sync */
+   ctx->Const.MaxServerWaitTimeout = (GLuint64) ~0;
+
    /* GL_ATI_envmap_bumpmap */
    ctx->Const.SupportedBumpUnits = SUPPORTED_ATI_BUMP_UNITS;
 
@@ -715,6 +721,9 @@ init_attrib_groups(GLcontext *ctx)
 #if FEATURE_ARB_occlusion_query
    _mesa_init_query( ctx );
 #endif
+#if FEATURE_ARB_sync
+   _mesa_init_sync( ctx );
+#endif
 #if FEATURE_drawpix
    _mesa_init_rastpos( ctx );
 #endif
@@ -1013,6 +1022,9 @@ _mesa_free_context_data( GLcontext *ctx )
    _mesa_free_shader_state(ctx);
 #if FEATURE_ARB_occlusion_query
    _mesa_free_query_data(ctx);
+#endif
+#if FEATURE_ARB_sync
+   _mesa_free_sync_data(ctx);
 #endif
    _mesa_free_varray_data(ctx);
 
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index 3a59872b5a..4a700b5cb4 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -1044,6 +1044,22 @@ struct dd_function_table {
     */
    void (*EndCallList)( GLcontext *ctx );
 
+
+#if FEATURE_ARB_sync
+   /**
+    * \name GL_ARB_sync interfaces
+    */
+   /*@{*/
+   struct gl_sync_object * (*NewSyncObject)(GLcontext *, GLenum);
+   void (*FenceSync)(GLcontext *, struct gl_sync_object *, GLenum, GLbitfield);
+   void (*DeleteSyncObject)(GLcontext *, struct gl_sync_object *);
+   void (*CheckSync)(GLcontext *, struct gl_sync_object *);
+   void (*ClientWaitSync)(GLcontext *, struct gl_sync_object *,
+			  GLbitfield, GLuint64);
+   void (*ServerWaitSync)(GLcontext *, struct gl_sync_object *,
+			  GLbitfield, GLuint64);
+   /*@}*/
+#endif
 };
 
 
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 195fdde346..e3070b1547 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -67,6 +67,7 @@ static const struct {
    { OFF, "GL_ARB_shading_language_120",       F(ARB_shading_language_120) },
    { OFF, "GL_ARB_shadow",                     F(ARB_shadow) },
    { OFF, "GL_ARB_shadow_ambient",             F(ARB_shadow_ambient) },
+   { OFF, "GL_ARB_sync",                       F(ARB_sync) },
    { OFF, "GL_ARB_texture_border_clamp",       F(ARB_texture_border_clamp) },
    { ON,  "GL_ARB_texture_compression",        F(ARB_texture_compression) },
    { OFF, "GL_ARB_texture_cube_map",           F(ARB_texture_cube_map) },
@@ -239,6 +240,9 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
 #endif
 #if FEATURE_ARB_vertex_buffer_object
    /*ctx->Extensions.ARB_vertex_buffer_object = GL_TRUE;*/
+#endif
+#if FEATURE_ARB_sync
+   ctx->Extensions.ARB_sync = GL_TRUE;
 #endif
    ctx->Extensions.APPLE_vertex_array_object = GL_TRUE;
    ctx->Extensions.ATI_envmap_bumpmap = GL_TRUE;
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index fc742c4a90..477ed01030 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -19,6 +19,9 @@
 
 #define INT_TO_BOOLEAN(I)     ( (I) ? GL_TRUE : GL_FALSE )
 
+#define INT64_TO_BOOLEAN(I)   ( (I) ? GL_TRUE : GL_FALSE )
+#define INT64_TO_INT(I)       ( (GLint)((I > INT_MAX) ? INT_MAX : ((I < INT_MIN) ? INT_MIN : (I))) )
+
 #define BOOLEAN_TO_INT(B)     ( (GLint) (B) )
 #define BOOLEAN_TO_INT64(B)   ( (GLint64) (B) )
 #define BOOLEAN_TO_FLOAT(B)   ( (B) ? 1.0F : 0.0F )
@@ -1887,6 +1890,10 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          CHECK_EXT1(ARB_seamless_cube_map, "GetBooleanv");
          params[0] = ctx->Texture.CubeMapSeamless;
          break;
+      case GL_MAX_SERVER_WAIT_TIMEOUT:
+         CHECK_EXT1(ARB_sync, "GetBooleanv");
+         params[0] = INT64_TO_BOOLEAN(ctx->Const.MaxServerWaitTimeout);
+         break;
       default:
          _mesa_error(ctx, GL_INVALID_ENUM, "glGetBooleanv(pname=0x%x)", pname);
    }
@@ -3714,6 +3721,10 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          CHECK_EXT1(ARB_seamless_cube_map, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Texture.CubeMapSeamless);
          break;
+      case GL_MAX_SERVER_WAIT_TIMEOUT:
+         CHECK_EXT1(ARB_sync, "GetFloatv");
+         params[0] = (GLfloat)(ctx->Const.MaxServerWaitTimeout);
+         break;
       default:
          _mesa_error(ctx, GL_INVALID_ENUM, "glGetFloatv(pname=0x%x)", pname);
    }
@@ -5541,6 +5552,10 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          CHECK_EXT1(ARB_seamless_cube_map, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Texture.CubeMapSeamless);
          break;
+      case GL_MAX_SERVER_WAIT_TIMEOUT:
+         CHECK_EXT1(ARB_sync, "GetIntegerv");
+         params[0] = INT64_TO_INT(ctx->Const.MaxServerWaitTimeout);
+         break;
       default:
          _mesa_error(ctx, GL_INVALID_ENUM, "glGetIntegerv(pname=0x%x)", pname);
    }
@@ -7369,6 +7384,10 @@ _mesa_GetInteger64v( GLenum pname, GLint64 *params )
          CHECK_EXT1(ARB_seamless_cube_map, "GetInteger64v");
          params[0] = BOOLEAN_TO_INT64(ctx->Texture.CubeMapSeamless);
          break;
+      case GL_MAX_SERVER_WAIT_TIMEOUT:
+         CHECK_EXT1(ARB_sync, "GetInteger64v");
+         params[0] = ctx->Const.MaxServerWaitTimeout;
+         break;
       default:
          _mesa_error(ctx, GL_INVALID_ENUM, "glGetInteger64v(pname=0x%x)", pname);
    }
diff --git a/src/mesa/main/get_gen.py b/src/mesa/main/get_gen.py
index 4f0feaad3c..2878c1b552 100644
--- a/src/mesa/main/get_gen.py
+++ b/src/mesa/main/get_gen.py
@@ -1022,6 +1022,10 @@ StateVars = [
 	# GL_ARB_seamless_cube_map
 	( "GL_TEXTURE_CUBE_MAP_SEAMLESS", GLboolean, ["ctx->Texture.CubeMapSeamless"], "",
 	  ["ARB_seamless_cube_map"] ),
+
+	# GL_ARB_sync
+	( "GL_MAX_SERVER_WAIT_TIMEOUT", GLint64, ["ctx->Const.MaxServerWaitTimeout"], "",
+	  ["ARB_sync"] ),
 ]
 
 
@@ -1157,6 +1161,9 @@ def EmitHeader():
 
 #define INT_TO_BOOLEAN(I)     ( (I) ? GL_TRUE : GL_FALSE )
 
+#define INT64_TO_BOOLEAN(I)   ( (I) ? GL_TRUE : GL_FALSE )
+#define INT64_TO_INT(I)       ( (GLint)((I > INT_MAX) ? INT_MAX : ((I < INT_MIN) ? INT_MIN : (I))) )
+
 #define BOOLEAN_TO_INT(B)     ( (GLint) (B) )
 #define BOOLEAN_TO_INT64(B)   ( (GLint64) (B) )
 #define BOOLEAN_TO_FLOAT(B)   ( (B) ? 1.0F : 0.0F )
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index ef973314e3..e23cdb1f42 100644
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -70,6 +70,7 @@
 #define FEATURE_ARB_shader_objects (FEATURE_ARB_vertex_shader || FEATURE_ARB_fragment_shader)
 #define FEATURE_ARB_shading_language_100 FEATURE_ARB_shader_objects
 #define FEATURE_ARB_shading_language_120 FEATURE_ARB_shader_objects
+#define FEATURE_ARB_sync _HAVE_FULL_GL
 
 #define FEATURE_EXT_framebuffer_blit _HAVE_FULL_GL
 #define FEATURE_EXT_framebuffer_object _HAVE_FULL_GL
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 53dc6360ea..58da5d15eb 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1986,6 +1986,20 @@ struct gl_query_state
 };
 
 
+/** Sync object state */
+struct gl_sync_object {
+   GLenum Type;               /**< GL_SYNC_FENCE */
+   GLuint Name;               /**< Fence name */
+   GLint RefCount;            /**< Reference count */
+   GLboolean DeletePending;   /**< Object was deleted while there were still
+			       * live references (e.g., sync not yet finished)
+			       */
+   GLenum SyncCondition;
+   GLbitfield Flags;          /**< Flags passed to glFenceSync */
+   GLuint Status:1;           /**< Has the sync object been signaled? */
+};
+
+
 /** Set by #pragma directives */
 struct gl_sl_pragmas
 {
@@ -2435,6 +2449,12 @@ struct gl_constants
 
    GLbitfield SupportedBumpUnits; /**> units supporting GL_ATI_envmap_bumpmap as targets */
 
+   /**
+    * Maximum amount of time, measured in nanseconds, that the server can wait.
+    */
+   GLuint64 MaxServerWaitTimeout;
+
+
    /**< GL_EXT_provoking_vertex */
    GLboolean QuadsFollowProvokingVertexConvention;
 };
@@ -2467,6 +2487,7 @@ struct gl_extensions
    GLboolean ARB_shading_language_120;
    GLboolean ARB_shadow;
    GLboolean ARB_shadow_ambient; /* or GL_ARB_shadow_ambient */
+   GLboolean ARB_sync;
    GLboolean ARB_texture_border_clamp;
    GLboolean ARB_texture_compression;
    GLboolean ARB_texture_cube_map;
diff --git a/src/mesa/main/syncobj.c b/src/mesa/main/syncobj.c
new file mode 100644
index 0000000000..eeeeb49175
--- /dev/null
+++ b/src/mesa/main/syncobj.c
@@ -0,0 +1,372 @@
+/*
+ * Copyright © 2009 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+/**
+ * \file syncobj.c
+ * Sync object management.
+ *
+ * \author Ian Romanick <ian.d.romanick@intel.com>
+ */
+
+#include "glheader.h"
+#include "hash.h"
+#include "imports.h"
+#include "context.h"
+
+#if FEATURE_ARB_sync
+#include "syncobj.h"
+
+static struct gl_sync_object *
+_mesa_new_sync_object(GLcontext *ctx, GLenum type)
+{
+   struct gl_sync_object *s = MALLOC_STRUCT(gl_sync_object);
+   (void) ctx;
+   (void) type;
+
+   return s;
+}
+
+
+static void
+_mesa_delete_sync_object(GLcontext *ctx, struct gl_sync_object *syncObj)
+{
+   (void) ctx;
+   _mesa_free(syncObj);
+}
+
+
+static void
+_mesa_fence_sync(GLcontext *ctx, struct gl_sync_object *syncObj,
+		 GLenum condition, GLbitfield flags)
+{
+   (void) ctx;
+   (void) condition;
+   (void) flags;
+
+   syncObj->Status = 1;
+}
+
+
+static void
+_mesa_check_sync(GLcontext *ctx, struct gl_sync_object *syncObj)
+{
+   (void) ctx;
+   (void) syncObj;
+
+   /* No-op for software rendering.  Hardware drivers will need to determine
+    * whether the state of the sync object has changed.
+    */
+}
+
+
+static void
+_mesa_wait_sync(GLcontext *ctx, struct gl_sync_object *syncObj,
+		GLbitfield flags, GLuint64 timeout)
+{
+   (void) ctx;
+   (void) syncObj;
+   (void) flags;
+   (void) timeout;
+
+
+   /* No-op for software rendering.  Hardware drivers will need to wait until
+    * the state of the sync object changes or the timeout expires.
+    */
+}
+
+
+void
+_mesa_init_sync_object_functions(struct dd_function_table *driver)
+{
+   driver->NewSyncObject = _mesa_new_sync_object;
+   driver->FenceSync = _mesa_fence_sync;
+   driver->DeleteSyncObject = _mesa_delete_sync_object;
+   driver->CheckSync = _mesa_check_sync;
+
+   /* Use the same no-op wait function for both.
+    */
+   driver->ClientWaitSync = _mesa_wait_sync;
+   driver->ServerWaitSync = _mesa_wait_sync;
+}
+
+
+/**
+ * Allocate/init the context state related to sync objects.
+ */
+void
+_mesa_init_sync(GLcontext *ctx)
+{
+   (void) ctx;
+}
+
+
+/**
+ * Free the context state related to sync objects.
+ */
+void
+_mesa_free_sync_data(GLcontext *ctx)
+{
+   (void) ctx;
+}
+
+
+GLboolean
+_mesa_IsSync(GLsync sync)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_sync_object *const syncObj = (struct gl_sync_object *) sync;
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
+
+
+   return ((syncObj != NULL) && (syncObj->Type == GL_SYNC_FENCE))
+      ? GL_TRUE : GL_FALSE;
+}
+
+
+static void
+_mesa_unref_sync_object(GLcontext *ctx, struct gl_sync_object *syncObj)
+{
+   syncObj->RefCount--;
+   if (syncObj->RefCount == 0) {
+      (*ctx->Driver.DeleteSyncObject)(ctx, syncObj);
+   } else {
+      syncObj->DeletePending = 1;
+   }
+}
+
+
+void
+_mesa_DeleteSync(GLsync sync)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_sync_object *const syncObj = (struct gl_sync_object *) sync;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+
+   /* From the GL_ARB_sync spec:
+    *
+    *    DeleteSync will silently ignore a <sync> value of zero. An
+    *    INVALID_VALUE error is generated if <sync> is neither zero nor the
+    *    name of a sync object.
+    */
+   if (sync == 0) {
+      return;
+   }
+
+   if (syncObj->Type != GL_SYNC_FENCE) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glDeleteSync");
+      return;
+   }
+
+
+   /* If there are no client-waits or server-waits pending on this sync, delete
+    * the underlying object.
+    */
+   _mesa_unref_sync_object(ctx, syncObj);
+}
+
+
+
+GLsync
+_mesa_FenceSync(GLenum condition, GLbitfield flags)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_sync_object *syncObj;
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);
+
+
+   if (condition != GL_SYNC_GPU_COMMANDS_COMPLETE) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glFenceSync(condition=0x%x)",
+		  condition);
+      return 0;
+   }
+
+   if (flags != 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glFenceSync(flags=0x%x)",
+		  condition);
+      return 0;
+   }
+
+   syncObj = (*ctx->Driver.NewSyncObject)(ctx, GL_SYNC_FENCE);
+   if (syncObj != NULL) {
+      syncObj->Type = GL_SYNC_FENCE;
+      /* The name is not currently used, and it is never visible to
+       * applications.  If sync support is extended to provide support for
+       * NV_fence, this field will be used.  We'll also need to add an object
+       * ID hashtable.
+       */
+      syncObj->Name = 1;
+      syncObj->RefCount = 1;
+      syncObj->DeletePending = GL_FALSE;
+      syncObj->SyncCondition = condition;
+      syncObj->Flags = flags;
+      syncObj->Status = 0;
+
+      (*ctx->Driver.FenceSync)(ctx, syncObj, condition, flags);
+
+      return (GLsync) syncObj;
+   }
+
+   return NULL;
+}
+
+
+GLenum
+_mesa_ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_sync_object *const syncObj = (struct gl_sync_object *) sync;
+   GLenum ret;
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_WAIT_FAILED);
+
+
+   if ((syncObj == NULL) || (syncObj->Type != GL_SYNC_FENCE)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glClientWaitSync");
+      return GL_WAIT_FAILED;
+   }
+
+   if ((flags & ~GL_SYNC_FLUSH_COMMANDS_BIT) != 0) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glClientWaitSync(flags=0x%x)", flags);
+      return GL_WAIT_FAILED;
+   }
+
+
+   /* From the GL_ARB_sync spec:
+    *
+    *    ClientWaitSync returns one of four status values. A return value of
+    *    ALREADY_SIGNALED indicates that <sync> was signaled at the time
+    *    ClientWaitSync was called. ALREADY_SIGNALED will always be returned
+    *    if <sync> was signaled, even if the value of <timeout> is zero.
+    */
+   (*ctx->Driver.CheckSync)(ctx, syncObj);
+
+   if (syncObj->Status) {
+      return GL_ALREADY_SIGNALED;
+   }
+
+
+   (*ctx->Driver.ClientWaitSync)(ctx, syncObj, flags, timeout);
+
+   ret = syncObj->Status ? GL_CONDITION_SATISFIED : GL_TIMEOUT_EXPIRED;
+
+   if (syncObj->DeletePending && syncObj->Status) {
+      _mesa_unref_sync_object(ctx, syncObj);
+   }
+
+   return ret;
+}
+
+
+void
+_mesa_WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_sync_object *const syncObj = (struct gl_sync_object *) sync;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+
+   if ((syncObj == NULL) || (syncObj->Type != GL_SYNC_FENCE)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glWaitSync");
+      return;
+   }
+
+   if (flags != 0) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glWaitSync(flags=0x%x)", flags);
+      return;
+   }
+
+   /* From the GL_ARB_sync spec:
+    *
+    *     If the value of <timeout> is zero, then WaitSync does nothing.
+    */
+   if (timeout == 0) {
+      return;
+   }
+
+   (*ctx->Driver.ServerWaitSync)(ctx, syncObj, flags, timeout);
+}
+
+
+void
+_mesa_GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length,
+		GLint *values)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_sync_object *const syncObj = (struct gl_sync_object *) sync;
+   GLsizei size = 0;
+   GLint v[1];
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+
+   if ((syncObj == NULL) || (syncObj->Type != GL_SYNC_FENCE)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetSynciv");
+      return;
+   }
+
+
+   switch (pname) {
+   case GL_OBJECT_TYPE:
+      v[0] = syncObj->Type;
+      size = 1;
+      break;
+
+   case GL_SYNC_CONDITION:
+      v[0] = syncObj->SyncCondition;
+      size = 1;
+      break;
+
+   case GL_SYNC_STATUS:
+      /* Update the state of the sync by dipping into the driver.  Note that
+       * this call won't block.  It just updates state in the common object
+       * data from the current driver state.
+       */
+      (*ctx->Driver.CheckSync)(ctx, syncObj);
+
+      v[0] = (syncObj->Status) ? GL_SIGNALED : GL_UNSIGNALED;
+      size = 1;
+      break;
+
+   case GL_SYNC_FLAGS:
+      v[0] = syncObj->Flags;
+      size = 1;
+      break;
+
+   default:
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetSynciv(pname=0x%x)\n", pname);
+      return;
+   }
+
+
+   if (size > 0) {
+      const GLsizei copy_count = (size > bufSize) ? bufSize : size;
+
+      _mesa_memcpy(values, v, sizeof(GLint) * copy_count);
+   }
+
+
+   if (length != NULL) {
+      *length = size;
+   }
+}
+
+#endif /* FEATURE_ARB_sync */
diff --git a/src/mesa/main/syncobj.h b/src/mesa/main/syncobj.h
new file mode 100644
index 0000000000..d2b4d051c9
--- /dev/null
+++ b/src/mesa/main/syncobj.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright © 2009 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+/**
+ * \file syncobj.h
+ * Sync object management.
+ *
+ * \author Ian Romanick <ian.d.romanick@intel.com>
+ */
+
+#ifndef SYNCOBJ_H
+#define SYNCOBJ_H
+
+#include "context.h"
+
+extern void
+_mesa_init_sync_object_functions(struct dd_function_table *driver);
+
+extern void
+_mesa_init_sync(GLcontext *);
+
+extern void
+_mesa_free_sync_data(GLcontext *);
+
+extern GLboolean
+_mesa_IsSync(GLsync sync);
+
+extern void
+_mesa_DeleteSync(GLsync sync);
+
+extern GLsync
+_mesa_FenceSync(GLenum condition, GLbitfield flags);
+
+extern GLenum
+_mesa_ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout);
+
+extern void
+_mesa_WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout);
+
+extern void
+_mesa_GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length,
+		GLint *values);
+
+#endif /* SYNCOBJ_H */
diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 9a9c988ed9..fa2a6307a4 100644
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -61,6 +61,7 @@ MAIN_SOURCES = \
 	main/shared.c \
 	main/state.c \
 	main/stencil.c \
+	main/syncobj.c \
 	main/texcompress.c \
 	main/texcompress_s3tc.c \
 	main/texcompress_fxt1.c \
-- 
cgit v1.2.3


From f5a22721c5731c7a4c20f86d9925d9e58324c7a5 Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Mon, 31 Aug 2009 14:49:33 -0700
Subject: Add dummy list node type 'struct simple_node'

---
 src/mesa/main/simple_list.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/simple_list.h b/src/mesa/main/simple_list.h
index 63475f6f74..ff7f888238 100644
--- a/src/mesa/main/simple_list.h
+++ b/src/mesa/main/simple_list.h
@@ -37,6 +37,11 @@
 #ifndef _SIMPLE_LIST_H
 #define _SIMPLE_LIST_H
 
+struct simple_node {
+   struct simple_node *next;
+   struct simple_node *prev;
+};
+
 /**
  * Remove an element from list.
  *
-- 
cgit v1.2.3


From 16b393d05990b6e917e144f9de87d0103b4c3e6d Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Mon, 31 Aug 2009 14:57:50 -0700
Subject: ARB sync: Fix delete behavior and context destruction behavior

I believe this resolves the outstanding issues WRT sync object
deletetion.  I have also added a large comment at the top of syncobj.c
describing the expected memory management behavior.  I'm still a
little uncertain about the locking on ctx->Shared.
---
 src/mesa/main/mtypes.h  |  6 ++++
 src/mesa/main/shared.c  | 19 +++++++++-
 src/mesa/main/syncobj.c | 96 +++++++++++++++++++++++++++++++++++++------------
 src/mesa/main/syncobj.h |  6 ++++
 4 files changed, 103 insertions(+), 24 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 58da5d15eb..bd3bf28328 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -40,6 +40,7 @@
 #include "main/mfeatures.h"
 #include "glapi/glapi.h"
 #include "math/m_matrix.h"	/* GLmatrix */
+#include "main/simple_list.h"	/* struct simple_node */
 
 
 /**
@@ -1988,6 +1989,7 @@ struct gl_query_state
 
 /** Sync object state */
 struct gl_sync_object {
+   struct simple_node link;
    GLenum Type;               /**< GL_SYNC_FENCE */
    GLuint Name;               /**< Fence name */
    GLint RefCount;            /**< Reference count */
@@ -2145,6 +2147,10 @@ struct gl_shared_state
    struct _mesa_HashTable *FrameBuffers;
 #endif
 
+#if FEATURE_ARB_sync
+   struct simple_node SyncObjects;
+#endif
+
    void *DriverData;  /**< Device driver shared state */
 };
 
diff --git a/src/mesa/main/shared.c b/src/mesa/main/shared.c
index 93bbccd3c7..643ad3354e 100644
--- a/src/mesa/main/shared.c
+++ b/src/mesa/main/shared.c
@@ -43,7 +43,9 @@
 #if FEATURE_ATI_fragment_shader
 #include "shader/atifragshader.h"
 #endif
-
+#if FEATURE_ARB_sync
+#include "syncobj.h"
+#endif
 
 /**
  * Allocate and initialize a shared context state structure.
@@ -127,6 +129,10 @@ _mesa_alloc_shared_state(GLcontext *ctx)
    shared->RenderBuffers = _mesa_NewHashTable();
 #endif
 
+#if FEATURE_ARB_sync
+   make_empty_list(& shared->SyncObjects);
+#endif
+
    return shared;
 }
 
@@ -336,6 +342,17 @@ _mesa_free_shared_state(GLcontext *ctx, struct gl_shared_state *shared)
    ctx->Driver.DeleteBuffer(ctx, shared->NullBufferObj);
 #endif
 
+#if FEATURE_ARB_sync
+   {
+      struct simple_node *node;
+      struct simple_node *temp;
+
+      foreach_s(node, temp, & shared->SyncObjects) {
+	 _mesa_unref_sync_object(ctx, (struct gl_sync_object *) node);
+      }
+   }
+#endif
+
    /*
     * Free texture objects (after FBOs since some textures might have
     * been bound to FBOs).
diff --git a/src/mesa/main/syncobj.c b/src/mesa/main/syncobj.c
index eeeeb49175..0471a0ad7f 100644
--- a/src/mesa/main/syncobj.c
+++ b/src/mesa/main/syncobj.c
@@ -25,6 +25,33 @@
  * \file syncobj.c
  * Sync object management.
  *
+ * Unlike textures and other objects that are shared between contexts, sync
+ * objects are not bound to the context.  As a result, the reference counting
+ * and delete behavior of sync objects is slightly different.  References to
+ * sync objects are added:
+ *
+ *    - By \c glFencSynce.  This sets the initial reference count to 1.
+ *    - At the start of \c glClientWaitSync.  The reference is held for the
+ *      duration of the wait call.
+ *
+ * References are removed:
+ *
+ *    - By \c glDeleteSync.
+ *    - At the end of \c glClientWaitSync.
+ *
+ * Additionally, drivers may call \c _mesa_ref_sync_object and
+ * \c _mesa_unref_sync_object as needed to implement \c ServerWaitSync.
+ *
+ * As with shader objects, sync object names become invalid as soon as
+ * \c glDeleteSync is called.  For this reason \c glDeleteSync sets the
+ * \c DeletePending flag.  All functions validate object handles by testing
+ * this flag.
+ *
+ * \note
+ * Only \c GL_ARB_sync objects are shared between contexts.  If support is ever
+ * added for either \c GL_NV_fence or \c GL_APPLE_fence different semantics
+ * will need to be implemented.
+ *
  * \author Ian Romanick <ian.d.romanick@intel.com>
  */
 
@@ -130,31 +157,52 @@ _mesa_free_sync_data(GLcontext *ctx)
 }
 
 
-GLboolean
-_mesa_IsSync(GLsync sync)
+static int
+_mesa_validate_sync(struct gl_sync_object *syncObj)
 {
-   GET_CURRENT_CONTEXT(ctx);
-   struct gl_sync_object *const syncObj = (struct gl_sync_object *) sync;
-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
+   return (syncObj != NULL)
+      && (syncObj->Type == GL_SYNC_FENCE)
+      && !syncObj->DeletePending;
+}
 
 
-   return ((syncObj != NULL) && (syncObj->Type == GL_SYNC_FENCE))
-      ? GL_TRUE : GL_FALSE;
+void
+_mesa_ref_sync_object(GLcontext *ctx, struct gl_sync_object *syncObj)
+{
+   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
+   syncObj->RefCount++;
+   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
 }
 
 
-static void
+void
 _mesa_unref_sync_object(GLcontext *ctx, struct gl_sync_object *syncObj)
 {
+   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
    syncObj->RefCount--;
    if (syncObj->RefCount == 0) {
+      remove_from_list(& syncObj->link);
+      _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
+
       (*ctx->Driver.DeleteSyncObject)(ctx, syncObj);
    } else {
-      syncObj->DeletePending = 1;
+      _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
    }
 }
 
 
+GLboolean
+_mesa_IsSync(GLsync sync)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_sync_object *const syncObj = (struct gl_sync_object *) sync;
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
+
+
+   return _mesa_validate_sync(syncObj) ? GL_TRUE : GL_FALSE;
+}
+
+
 void
 _mesa_DeleteSync(GLsync sync)
 {
@@ -173,7 +221,7 @@ _mesa_DeleteSync(GLsync sync)
       return;
    }
 
-   if (syncObj->Type != GL_SYNC_FENCE) {
+   if (!_mesa_validate_sync(syncObj)) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "glDeleteSync");
       return;
    }
@@ -182,6 +230,7 @@ _mesa_DeleteSync(GLsync sync)
    /* If there are no client-waits or server-waits pending on this sync, delete
     * the underlying object.
     */
+   syncObj->DeletePending = GL_TRUE;
    _mesa_unref_sync_object(ctx, syncObj);
 }
 
@@ -224,6 +273,10 @@ _mesa_FenceSync(GLenum condition, GLbitfield flags)
 
       (*ctx->Driver.FenceSync)(ctx, syncObj, condition, flags);
 
+      _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
+      insert_at_tail(& ctx->Shared->SyncObjects, & syncObj->link);
+      _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
+
       return (GLsync) syncObj;
    }
 
@@ -240,7 +293,7 @@ _mesa_ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
    ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_WAIT_FAILED);
 
 
-   if ((syncObj == NULL) || (syncObj->Type != GL_SYNC_FENCE)) {
+   if (!_mesa_validate_sync(syncObj)) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "glClientWaitSync");
       return GL_WAIT_FAILED;
    }
@@ -251,6 +304,8 @@ _mesa_ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
    }
 
 
+   _mesa_ref_sync_object(ctx, syncObj);
+
    /* From the GL_ARB_sync spec:
     *
     *    ClientWaitSync returns one of four status values. A return value of
@@ -259,20 +314,15 @@ _mesa_ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
     *    if <sync> was signaled, even if the value of <timeout> is zero.
     */
    (*ctx->Driver.CheckSync)(ctx, syncObj);
-
    if (syncObj->Status) {
-      return GL_ALREADY_SIGNALED;
-   }
-
-
-   (*ctx->Driver.ClientWaitSync)(ctx, syncObj, flags, timeout);
-
-   ret = syncObj->Status ? GL_CONDITION_SATISFIED : GL_TIMEOUT_EXPIRED;
+      ret = GL_ALREADY_SIGNALED;
+   } else {
+      (*ctx->Driver.ClientWaitSync)(ctx, syncObj, flags, timeout);
 
-   if (syncObj->DeletePending && syncObj->Status) {
-      _mesa_unref_sync_object(ctx, syncObj);
+      ret = syncObj->Status ? GL_CONDITION_SATISFIED : GL_TIMEOUT_EXPIRED;
    }
 
+   _mesa_unref_sync_object(ctx, syncObj);
    return ret;
 }
 
@@ -285,7 +335,7 @@ _mesa_WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
 
-   if ((syncObj == NULL) || (syncObj->Type != GL_SYNC_FENCE)) {
+   if (!_mesa_validate_sync(syncObj)) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "glWaitSync");
       return;
    }
@@ -318,7 +368,7 @@ _mesa_GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length,
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
 
-   if ((syncObj == NULL) || (syncObj->Type != GL_SYNC_FENCE)) {
+   if (!_mesa_validate_sync(syncObj)) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "glGetSynciv");
       return;
    }
diff --git a/src/mesa/main/syncobj.h b/src/mesa/main/syncobj.h
index d2b4d051c9..fc160af289 100644
--- a/src/mesa/main/syncobj.h
+++ b/src/mesa/main/syncobj.h
@@ -42,6 +42,12 @@ _mesa_init_sync(GLcontext *);
 extern void
 _mesa_free_sync_data(GLcontext *);
 
+extern void
+_mesa_ref_sync_object(GLcontext *ctx, struct gl_sync_object *syncObj);
+
+extern void
+_mesa_unref_sync_object(GLcontext *ctx, struct gl_sync_object *syncObj);
+
 extern GLboolean
 _mesa_IsSync(GLsync sync);
 
-- 
cgit v1.2.3


From 0f8fdd81989de5026c8e415f1525931b74dd8647 Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue, 1 Sep 2009 11:24:54 -0700
Subject: Use MIN2 instead of open-coded version

Based on review comments by Brian Paul.
---
 src/mesa/main/syncobj.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/syncobj.c b/src/mesa/main/syncobj.c
index 0471a0ad7f..cbeda4b384 100644
--- a/src/mesa/main/syncobj.c
+++ b/src/mesa/main/syncobj.c
@@ -59,6 +59,7 @@
 #include "hash.h"
 #include "imports.h"
 #include "context.h"
+#include "macros.h"
 
 #if FEATURE_ARB_sync
 #include "syncobj.h"
@@ -408,7 +409,7 @@ _mesa_GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length,
 
 
    if (size > 0) {
-      const GLsizei copy_count = (size > bufSize) ? bufSize : size;
+      const GLsizei copy_count = MIN2(size, bufSize);
 
       _mesa_memcpy(values, v, sizeof(GLint) * copy_count);
    }
-- 
cgit v1.2.3


From 6af24b6b03a2ce8300c7ae78fd06c6b1edd02017 Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue, 1 Sep 2009 11:56:34 -0700
Subject: Whitespace and include file clean-up.

Based on review comments by Brian Paul.
---
 src/mesa/main/syncobj.c | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/syncobj.c b/src/mesa/main/syncobj.c
index cbeda4b384..b3c75c747a 100644
--- a/src/mesa/main/syncobj.c
+++ b/src/mesa/main/syncobj.c
@@ -56,7 +56,6 @@
  */
 
 #include "glheader.h"
-#include "hash.h"
 #include "imports.h"
 #include "context.h"
 #include "macros.h"
@@ -116,7 +115,6 @@ _mesa_wait_sync(GLcontext *ctx, struct gl_sync_object *syncObj,
    (void) flags;
    (void) timeout;
 
-
    /* No-op for software rendering.  Hardware drivers will need to wait until
     * the state of the sync object changes or the timeout expires.
     */
@@ -199,7 +197,6 @@ _mesa_IsSync(GLsync sync)
    struct gl_sync_object *const syncObj = (struct gl_sync_object *) sync;
    ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
 
-
    return _mesa_validate_sync(syncObj) ? GL_TRUE : GL_FALSE;
 }
 
@@ -211,7 +208,6 @@ _mesa_DeleteSync(GLsync sync)
    struct gl_sync_object *const syncObj = (struct gl_sync_object *) sync;
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-
    /* From the GL_ARB_sync spec:
     *
     *    DeleteSync will silently ignore a <sync> value of zero. An
@@ -227,7 +223,6 @@ _mesa_DeleteSync(GLsync sync)
       return;
    }
 
-
    /* If there are no client-waits or server-waits pending on this sync, delete
     * the underlying object.
     */
@@ -236,7 +231,6 @@ _mesa_DeleteSync(GLsync sync)
 }
 
 
-
 GLsync
 _mesa_FenceSync(GLenum condition, GLbitfield flags)
 {
@@ -244,7 +238,6 @@ _mesa_FenceSync(GLenum condition, GLbitfield flags)
    struct gl_sync_object *syncObj;
    ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);
 
-
    if (condition != GL_SYNC_GPU_COMMANDS_COMPLETE) {
       _mesa_error(ctx, GL_INVALID_ENUM, "glFenceSync(condition=0x%x)",
 		  condition);
@@ -293,7 +286,6 @@ _mesa_ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
    GLenum ret;
    ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_WAIT_FAILED);
 
-
    if (!_mesa_validate_sync(syncObj)) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "glClientWaitSync");
       return GL_WAIT_FAILED;
@@ -304,7 +296,6 @@ _mesa_ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
       return GL_WAIT_FAILED;
    }
 
-
    _mesa_ref_sync_object(ctx, syncObj);
 
    /* From the GL_ARB_sync spec:
@@ -335,7 +326,6 @@ _mesa_WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
    struct gl_sync_object *const syncObj = (struct gl_sync_object *) sync;
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-
    if (!_mesa_validate_sync(syncObj)) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "glWaitSync");
       return;
@@ -368,13 +358,11 @@ _mesa_GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length,
    GLint v[1];
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-
    if (!_mesa_validate_sync(syncObj)) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "glGetSynciv");
       return;
    }
 
-
    switch (pname) {
    case GL_OBJECT_TYPE:
       v[0] = syncObj->Type;
@@ -407,14 +395,12 @@ _mesa_GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length,
       return;
    }
 
-
    if (size > 0) {
       const GLsizei copy_count = MIN2(size, bufSize);
 
       _mesa_memcpy(values, v, sizeof(GLint) * copy_count);
    }
 
-
    if (length != NULL) {
       *length = size;
    }
-- 
cgit v1.2.3


From 0342dce226fe79d7a6c0e7cd735c596fad3e8aac Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue, 1 Sep 2009 11:58:36 -0700
Subject: Don't dereference function pointers in calls.

I'm apparently alone in prefering this calling convention, so I'll be
a team player. :p  Based on review comments by Brian Paul and Eric
Anholt.
---
 src/mesa/main/syncobj.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/syncobj.c b/src/mesa/main/syncobj.c
index b3c75c747a..075931c7ce 100644
--- a/src/mesa/main/syncobj.c
+++ b/src/mesa/main/syncobj.c
@@ -183,7 +183,7 @@ _mesa_unref_sync_object(GLcontext *ctx, struct gl_sync_object *syncObj)
       remove_from_list(& syncObj->link);
       _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
 
-      (*ctx->Driver.DeleteSyncObject)(ctx, syncObj);
+      ctx->Driver.DeleteSyncObject(ctx, syncObj);
    } else {
       _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
    }
@@ -250,7 +250,7 @@ _mesa_FenceSync(GLenum condition, GLbitfield flags)
       return 0;
    }
 
-   syncObj = (*ctx->Driver.NewSyncObject)(ctx, GL_SYNC_FENCE);
+   syncObj = ctx->Driver.NewSyncObject(ctx, GL_SYNC_FENCE);
    if (syncObj != NULL) {
       syncObj->Type = GL_SYNC_FENCE;
       /* The name is not currently used, and it is never visible to
@@ -265,7 +265,7 @@ _mesa_FenceSync(GLenum condition, GLbitfield flags)
       syncObj->Flags = flags;
       syncObj->Status = 0;
 
-      (*ctx->Driver.FenceSync)(ctx, syncObj, condition, flags);
+      ctx->Driver.FenceSync(ctx, syncObj, condition, flags);
 
       _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
       insert_at_tail(& ctx->Shared->SyncObjects, & syncObj->link);
@@ -305,11 +305,11 @@ _mesa_ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
     *    ClientWaitSync was called. ALREADY_SIGNALED will always be returned
     *    if <sync> was signaled, even if the value of <timeout> is zero.
     */
-   (*ctx->Driver.CheckSync)(ctx, syncObj);
+   ctx->Driver.CheckSync(ctx, syncObj);
    if (syncObj->Status) {
       ret = GL_ALREADY_SIGNALED;
    } else {
-      (*ctx->Driver.ClientWaitSync)(ctx, syncObj, flags, timeout);
+      ctx->Driver.ClientWaitSync(ctx, syncObj, flags, timeout);
 
       ret = syncObj->Status ? GL_CONDITION_SATISFIED : GL_TIMEOUT_EXPIRED;
    }
@@ -344,7 +344,7 @@ _mesa_WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
       return;
    }
 
-   (*ctx->Driver.ServerWaitSync)(ctx, syncObj, flags, timeout);
+   ctx->Driver.ServerWaitSync(ctx, syncObj, flags, timeout);
 }
 
 
@@ -379,7 +379,7 @@ _mesa_GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length,
        * this call won't block.  It just updates state in the common object
        * data from the current driver state.
        */
-      (*ctx->Driver.CheckSync)(ctx, syncObj);
+      ctx->Driver.CheckSync(ctx, syncObj);
 
       v[0] = (syncObj->Status) ? GL_SIGNALED : GL_UNSIGNALED;
       size = 1;
-- 
cgit v1.2.3


From e059885ce357dee8b847f10e8e8c515a4a20042e Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 3 Sep 2009 12:47:25 -0600
Subject: mesa: rename gl_sync_object::Status to StatusFlag

There's a symbol collision with X11/Xlib.h #define Status int
in the Mesa xlib code.  This seems the simpliest way to work around this.
---
 src/mesa/drivers/dri/intel/intel_syncobj.c |  4 ++--
 src/mesa/main/mtypes.h                     |  2 +-
 src/mesa/main/syncobj.c                    | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/intel/intel_syncobj.c b/src/mesa/drivers/dri/intel/intel_syncobj.c
index d447b6a0fa..1286fe929b 100644
--- a/src/mesa/drivers/dri/intel/intel_syncobj.c
+++ b/src/mesa/drivers/dri/intel/intel_syncobj.c
@@ -94,7 +94,7 @@ static void intel_client_wait_sync(GLcontext *ctx, struct gl_sync_object *s,
 
    if (sync->bo) {
       drm_intel_bo_wait_rendering(sync->bo);
-      s->Status = 1;
+      s->StatusFlag = 1;
       drm_intel_bo_unreference(sync->bo);
       sync->bo = NULL;
    }
@@ -117,7 +117,7 @@ static void intel_check_sync(GLcontext *ctx, struct gl_sync_object *s)
    if (sync->bo && drm_intel_bo_busy(sync->bo)) {
       drm_intel_bo_unreference(sync->bo);
       sync->bo = NULL;
-      s->Status = 1;
+      s->StatusFlag = 1;
    }
 }
 
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index bd3bf28328..6b64bf8139 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1998,7 +1998,7 @@ struct gl_sync_object {
 			       */
    GLenum SyncCondition;
    GLbitfield Flags;          /**< Flags passed to glFenceSync */
-   GLuint Status:1;           /**< Has the sync object been signaled? */
+   GLuint StatusFlag:1;       /**< Has the sync object been signaled? */
 };
 
 
diff --git a/src/mesa/main/syncobj.c b/src/mesa/main/syncobj.c
index 075931c7ce..64f923ff91 100644
--- a/src/mesa/main/syncobj.c
+++ b/src/mesa/main/syncobj.c
@@ -90,7 +90,7 @@ _mesa_fence_sync(GLcontext *ctx, struct gl_sync_object *syncObj,
    (void) condition;
    (void) flags;
 
-   syncObj->Status = 1;
+   syncObj->StatusFlag = 1;
 }
 
 
@@ -263,7 +263,7 @@ _mesa_FenceSync(GLenum condition, GLbitfield flags)
       syncObj->DeletePending = GL_FALSE;
       syncObj->SyncCondition = condition;
       syncObj->Flags = flags;
-      syncObj->Status = 0;
+      syncObj->StatusFlag = 0;
 
       ctx->Driver.FenceSync(ctx, syncObj, condition, flags);
 
@@ -306,12 +306,12 @@ _mesa_ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
     *    if <sync> was signaled, even if the value of <timeout> is zero.
     */
    ctx->Driver.CheckSync(ctx, syncObj);
-   if (syncObj->Status) {
+   if (syncObj->StatusFlag) {
       ret = GL_ALREADY_SIGNALED;
    } else {
       ctx->Driver.ClientWaitSync(ctx, syncObj, flags, timeout);
 
-      ret = syncObj->Status ? GL_CONDITION_SATISFIED : GL_TIMEOUT_EXPIRED;
+      ret = syncObj->StatusFlag ? GL_CONDITION_SATISFIED : GL_TIMEOUT_EXPIRED;
    }
 
    _mesa_unref_sync_object(ctx, syncObj);
@@ -381,7 +381,7 @@ _mesa_GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length,
        */
       ctx->Driver.CheckSync(ctx, syncObj);
 
-      v[0] = (syncObj->Status) ? GL_SIGNALED : GL_UNSIGNALED;
+      v[0] = (syncObj->StatusFlag) ? GL_SIGNALED : GL_UNSIGNALED;
       size = 1;
       break;
 
-- 
cgit v1.2.3


From 826d441cdfa16a16d165297beb3013f4ff8b4816 Mon Sep 17 00:00:00 2001
From: Michal Krol <michal@vmware.com>
Date: Mon, 7 Sep 2009 09:16:35 +0200
Subject: mesa: Fix calling conventions of sync object api callbacks.

---
 src/mesa/main/syncobj.c | 12 ++++++------
 src/mesa/main/syncobj.h | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/syncobj.c b/src/mesa/main/syncobj.c
index 64f923ff91..ac3f9eb175 100644
--- a/src/mesa/main/syncobj.c
+++ b/src/mesa/main/syncobj.c
@@ -190,7 +190,7 @@ _mesa_unref_sync_object(GLcontext *ctx, struct gl_sync_object *syncObj)
 }
 
 
-GLboolean
+GLboolean GLAPIENTRY
 _mesa_IsSync(GLsync sync)
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -201,7 +201,7 @@ _mesa_IsSync(GLsync sync)
 }
 
 
-void
+void GLAPIENTRY
 _mesa_DeleteSync(GLsync sync)
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -231,7 +231,7 @@ _mesa_DeleteSync(GLsync sync)
 }
 
 
-GLsync
+GLsync GLAPIENTRY
 _mesa_FenceSync(GLenum condition, GLbitfield flags)
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -278,7 +278,7 @@ _mesa_FenceSync(GLenum condition, GLbitfield flags)
 }
 
 
-GLenum
+GLenum GLAPIENTRY
 _mesa_ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -319,7 +319,7 @@ _mesa_ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 }
 
 
-void
+void GLAPIENTRY
 _mesa_WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -348,7 +348,7 @@ _mesa_WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 }
 
 
-void
+void GLAPIENTRY
 _mesa_GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length,
 		GLint *values)
 {
diff --git a/src/mesa/main/syncobj.h b/src/mesa/main/syncobj.h
index fc160af289..f23fa281e2 100644
--- a/src/mesa/main/syncobj.h
+++ b/src/mesa/main/syncobj.h
@@ -48,22 +48,22 @@ _mesa_ref_sync_object(GLcontext *ctx, struct gl_sync_object *syncObj);
 extern void
 _mesa_unref_sync_object(GLcontext *ctx, struct gl_sync_object *syncObj);
 
-extern GLboolean
+extern GLboolean GLAPIENTRY
 _mesa_IsSync(GLsync sync);
 
-extern void
+extern void GLAPIENTRY
 _mesa_DeleteSync(GLsync sync);
 
-extern GLsync
+extern GLsync GLAPIENTRY
 _mesa_FenceSync(GLenum condition, GLbitfield flags);
 
-extern GLenum
+extern GLenum GLAPIENTRY
 _mesa_ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout);
 
-extern void
+extern void GLAPIENTRY
 _mesa_WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout);
 
-extern void
+extern void GLAPIENTRY
 _mesa_GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length,
 		GLint *values);
 
-- 
cgit v1.2.3


From b4922b533155cc139ebafb111502bb55d2ad2ccf Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Wed, 26 Aug 2009 09:51:15 -0700
Subject: mesa: Add support for ARB_depth_clamp.

This currently doesn't include fixing up the cliptests in the assembly
paths to support ARB_depth_clamp, so enabling depth_clamp forces the C path.
---
 src/mesa/drivers/dri/swrast/swrast.c |  1 +
 src/mesa/drivers/x11/xm_api.c        |  1 +
 src/mesa/glapi/ARB_depth_clamp.xml   | 12 ++++++++++
 src/mesa/glapi/Makefile              |  1 +
 src/mesa/glapi/gl_API.xml            |  2 ++
 src/mesa/main/attrib.c               |  7 ++++++
 src/mesa/main/enable.c               | 20 ++++++++++++++++
 src/mesa/main/extensions.c           |  2 ++
 src/mesa/main/get_gen.py             |  4 ++++
 src/mesa/main/mtypes.h               |  2 ++
 src/mesa/math/m_clip_tmp.h           | 44 ++++++++++++++++++++++++------------
 src/mesa/math/m_debug_clip.c         |  9 +++++---
 src/mesa/math/m_xform.h              |  6 +++--
 src/mesa/sparc/clip.S                |  3 ++-
 src/mesa/sparc/sparc.c               |  6 +++--
 src/mesa/swrast/s_depth.c            | 27 ++++++++++++++++++++++
 src/mesa/swrast/s_depth.h            |  2 ++
 src/mesa/swrast/s_span.c             |  3 +++
 src/mesa/tnl/t_rasterpos.c           | 25 ++++++++++++--------
 src/mesa/tnl/t_vb_program.c          |  6 +++--
 src/mesa/tnl/t_vb_vertex.c           |  6 +++--
 src/mesa/x86/x86_xform.c             |  9 +++++---
 22 files changed, 158 insertions(+), 40 deletions(-)
 create mode 100644 src/mesa/glapi/ARB_depth_clamp.xml

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/swrast/swrast.c b/src/mesa/drivers/dri/swrast/swrast.c
index a858af30c1..9a130d61cf 100644
--- a/src/mesa/drivers/dri/swrast/swrast.c
+++ b/src/mesa/drivers/dri/swrast/swrast.c
@@ -95,6 +95,7 @@ const struct dri_extension card_extensions[] =
     { "GL_EXT_histogram",		GL_EXT_histogram_functions },
     { "GL_SGI_color_table",		GL_SGI_color_table_functions },
 
+    { "GL_ARB_depth_clamp",		NULL },
     { "GL_ARB_shader_objects",		GL_ARB_shader_objects_functions },
     { "GL_ARB_vertex_array_object",	GL_ARB_vertex_array_object_functions },
     { "GL_ARB_vertex_program",		GL_ARB_vertex_program_functions },
diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c
index 2c7be9f182..78545d0e17 100644
--- a/src/mesa/drivers/x11/xm_api.c
+++ b/src/mesa/drivers/x11/xm_api.c
@@ -1347,6 +1347,7 @@ const struct dri_extension card_extensions[] =
    { "GL_EXT_histogram",		GL_EXT_histogram_functions },
    { "GL_SGI_color_table",		GL_SGI_color_table_functions },
 
+   { "GL_ARB_depth_clamp",		NULL },
    { "GL_ARB_shader_objects",		GL_ARB_shader_objects_functions },
    { "GL_ARB_sync",			GL_ARB_sync_functions },
    { "GL_ARB_vertex_program",		GL_ARB_vertex_program_functions },
diff --git a/src/mesa/glapi/ARB_depth_clamp.xml b/src/mesa/glapi/ARB_depth_clamp.xml
new file mode 100644
index 0000000000..157c9a86b1
--- /dev/null
+++ b/src/mesa/glapi/ARB_depth_clamp.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<OpenGLAPI>
+
+<category name="GL_ARB_depth_clamp" number="61">
+    <enum name="DEPTH_CLAMP" count="1"  value="0x864F">
+        <size name="Get" mode="get"/>
+    </enum>
+</category>
+
+</OpenGLAPI>
diff --git a/src/mesa/glapi/Makefile b/src/mesa/glapi/Makefile
index 65edab7cec..22f65b74c2 100644
--- a/src/mesa/glapi/Makefile
+++ b/src/mesa/glapi/Makefile
@@ -48,6 +48,7 @@ SERVER_OUTPUTS = \
 API_XML = gl_API.xml \
 	EXT_framebuffer_object.xml \
 	ARB_copy_buffer.xml \
+	ARB_depth_clamp.xml \
 	ARB_framebuffer_object.xml \
 	ARB_map_buffer_range.xml \
 	ARB_seamless_cube_map.xml \
diff --git a/src/mesa/glapi/gl_API.xml b/src/mesa/glapi/gl_API.xml
index 1dfd92be08..920ce80c45 100644
--- a/src/mesa/glapi/gl_API.xml
+++ b/src/mesa/glapi/gl_API.xml
@@ -7950,6 +7950,8 @@
 
 <xi:include href="ARB_copy_buffer.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
+<xi:include href="ARB_depth_clamp.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
 <xi:include href="ARB_map_buffer_range.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 <xi:include href="ARB_vertex_array_object.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index ab99ca1c64..0fb8fa3bba 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -74,6 +74,7 @@ struct gl_enable_attrib
    GLboolean Convolution2D;
    GLboolean Separable2D;
    GLboolean CullFace;
+   GLboolean DepthClamp;
    GLboolean DepthTest;
    GLboolean Dither;
    GLboolean Fog;
@@ -265,6 +266,7 @@ _mesa_PushAttrib(GLbitfield mask)
       attr->Convolution2D = ctx->Pixel.Convolution2DEnabled;
       attr->Separable2D = ctx->Pixel.Separable2DEnabled;
       attr->CullFace = ctx->Polygon.CullFlag;
+      attr->DepthClamp = ctx->Transform.DepthClamp;
       attr->DepthTest = ctx->Depth.Test;
       attr->Dither = ctx->Color.DitherFlag;
       attr->Fog = ctx->Fog.Enabled;
@@ -514,6 +516,8 @@ pop_enable_group(GLcontext *ctx, const struct gl_enable_attrib *enable)
                    enable->ColorTable[COLORTABLE_POSTCOLORMATRIX],
                    GL_POST_COLOR_MATRIX_COLOR_TABLE);
    TEST_AND_UPDATE(ctx->Polygon.CullFlag, enable->CullFace, GL_CULL_FACE);
+   TEST_AND_UPDATE(ctx->Transform.DepthClamp, enable->DepthClamp,
+		   GL_DEPTH_CLAMP);
    TEST_AND_UPDATE(ctx->Depth.Test, enable->DepthTest, GL_DEPTH_TEST);
    TEST_AND_UPDATE(ctx->Color.DitherFlag, enable->Dither, GL_DITHER);
    TEST_AND_UPDATE(ctx->Pixel.Convolution1DEnabled, enable->Convolution1D,
@@ -1221,6 +1225,9 @@ _mesa_PopAttrib(void)
                if (xform->RescaleNormals != ctx->Transform.RescaleNormals)
                   _mesa_set_enable(ctx, GL_RESCALE_NORMAL_EXT,
                                    ctx->Transform.RescaleNormals);
+               if (xform->DepthClamp != ctx->Transform.DepthClamp)
+                  _mesa_set_enable(ctx, GL_DEPTH_CLAMP,
+                                   ctx->Transform.DepthClamp);
             }
             break;
          case GL_TEXTURE_BIT:
diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index 4bc54771e9..d066153fc2 100644
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -37,6 +37,7 @@
 #include "mtypes.h"
 #include "enums.h"
 #include "math/m_matrix.h"
+#include "math/m_xform.h"
 #include "api_arrayelt.h"
 
 
@@ -947,6 +948,20 @@ _mesa_set_enable(GLcontext *ctx, GLenum cap, GLboolean state)
          ctx->Depth.BoundsTest = state;
          break;
 
+      case GL_DEPTH_CLAMP:
+         if (ctx->Transform.DepthClamp == state)
+            return;
+	 /* Neither the x86 nor sparc asm cliptest functions have been updated
+	  * for ARB_depth_clamp, so force the C paths.
+	  */
+	 if (state)
+	    init_c_cliptest();
+
+	 CHECK_EXTENSION(ARB_depth_clamp, cap);
+         FLUSH_VERTICES(ctx, _NEW_TRANSFORM);
+	 ctx->Transform.DepthClamp = state;
+	 break;
+
 #if FEATURE_ATI_fragment_shader
       case GL_FRAGMENT_SHADER_ATI:
         CHECK_EXTENSION(ATI_fragment_shader, cap);
@@ -1395,6 +1410,11 @@ _mesa_IsEnabled( GLenum cap )
          CHECK_EXTENSION(EXT_depth_bounds_test);
          return ctx->Depth.BoundsTest;
 
+      /* GL_ARB_depth_clamp */
+      case GL_DEPTH_CLAMP:
+         CHECK_EXTENSION(ARB_depth_clamp);
+         return ctx->Transform.DepthClamp;
+
 #if FEATURE_ATI_fragment_shader
       case GL_FRAGMENT_SHADER_ATI:
 	 CHECK_EXTENSION(ATI_fragment_shader);
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index e3070b1547..ea67f820af 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -47,6 +47,7 @@ static const struct {
 } default_extensions[] = {
    { OFF, "GL_ARB_copy_buffer",                F(ARB_copy_buffer) },
    { OFF, "GL_ARB_depth_texture",              F(ARB_depth_texture) },
+   { OFF, "GL_ARB_depth_clamp",                F(ARB_depth_clamp) },
    { ON,  "GL_ARB_draw_buffers",               F(ARB_draw_buffers) },
    { OFF, "GL_ARB_fragment_program",           F(ARB_fragment_program) },
    { OFF, "GL_ARB_fragment_program_shadow",    F(ARB_fragment_program_shadow) },
@@ -192,6 +193,7 @@ void
 _mesa_enable_sw_extensions(GLcontext *ctx)
 {
    ctx->Extensions.ARB_copy_buffer = GL_TRUE;
+   ctx->Extensions.ARB_depth_clamp = GL_TRUE;
    ctx->Extensions.ARB_depth_texture = GL_TRUE;
    /*ctx->Extensions.ARB_draw_buffers = GL_TRUE;*/
 #if FEATURE_ARB_fragment_program
diff --git a/src/mesa/main/get_gen.py b/src/mesa/main/get_gen.py
index 2878c1b552..364d8c55c4 100644
--- a/src/mesa/main/get_gen.py
+++ b/src/mesa/main/get_gen.py
@@ -905,6 +905,10 @@ StateVars = [
 	  ["ctx->Depth.BoundsMin", "ctx->Depth.BoundsMax"],
 	  "", ["EXT_depth_bounds_test"] ),
 
+	# GL_ARB_depth_clamp
+	( "GL_DEPTH_CLAMP", GLboolean, ["ctx->Transform.DepthClamp"], "",
+	  ["ARB_depth_clamp"] ),
+
 	# GL_ARB_draw_buffers
 	( "GL_MAX_DRAW_BUFFERS_ARB", GLint,
 	  ["ctx->Const.MaxDrawBuffers"], "", None ),
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 6b64bf8139..20cd3aa5c0 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1482,6 +1482,7 @@ struct gl_transform_attrib
    GLboolean Normalize;				/**< Normalize all normals? */
    GLboolean RescaleNormals;			/**< GL_EXT_rescale_normal */
    GLboolean RasterPositionUnclipped;           /**< GL_IBM_rasterpos_clip */
+   GLboolean DepthClamp;			/**< GL_ARB_depth_clamp */
 
    GLboolean CullVertexFlag;	/**< True if GL_CULL_VERTEX_EXT is enabled */
    GLfloat CullEyePos[4];
@@ -2475,6 +2476,7 @@ struct gl_extensions
    GLboolean dummy;  /* don't remove this! */
    GLboolean ARB_copy_buffer;
    GLboolean ARB_depth_texture;
+   GLboolean ARB_depth_clamp;
    GLboolean ARB_draw_buffers;
    GLboolean ARB_fragment_program;
    GLboolean ARB_fragment_program_shadow;
diff --git a/src/mesa/math/m_clip_tmp.h b/src/mesa/math/m_clip_tmp.h
index f3a589be05..2e30964057 100644
--- a/src/mesa/math/m_clip_tmp.h
+++ b/src/mesa/math/m_clip_tmp.h
@@ -44,7 +44,8 @@ static GLvector4f * _XFORMAPI TAG(cliptest_points4)( GLvector4f *clip_vec,
                                                      GLvector4f *proj_vec,
                                                      GLubyte clipMask[],
                                                      GLubyte *orMask,
-                                                     GLubyte *andMask )
+                                                     GLubyte *andMask,
+						     GLboolean viewport_z_clip )
 {
    const GLuint stride = clip_vec->stride;
    const GLfloat *from = (GLfloat *)clip_vec->start;
@@ -66,16 +67,20 @@ static GLvector4f * _XFORMAPI TAG(cliptest_points4)( GLvector4f *clip_vec,
       mask |= (((cw < -cx) << CLIP_LEFT_SHIFT));
       mask |= (((cw < cy) << CLIP_TOP_SHIFT));
       mask |= (((cw < -cy) << CLIP_BOTTOM_SHIFT));
-      mask |= (((cw < cz) << CLIP_FAR_SHIFT));
-      mask |= (((cw < -cz) << CLIP_NEAR_SHIFT));
+      if (viewport_z_clip) {
+	 mask |= (((cw < cz) << CLIP_FAR_SHIFT));
+	 mask |= (((cw < -cz) << CLIP_NEAR_SHIFT));
+      }
 #else /* !defined(macintosh)) */
       GLubyte mask = 0;
       if (-cx + cw < 0) mask |= CLIP_RIGHT_BIT;
       if ( cx + cw < 0) mask |= CLIP_LEFT_BIT;
       if (-cy + cw < 0) mask |= CLIP_TOP_BIT;
       if ( cy + cw < 0) mask |= CLIP_BOTTOM_BIT;
-      if (-cz + cw < 0) mask |= CLIP_FAR_BIT;
-      if ( cz + cw < 0) mask |= CLIP_NEAR_BIT;
+      if (viewport_z_clip) {
+	 if (-cz + cw < 0) mask |= CLIP_FAR_BIT;
+	 if ( cz + cw < 0) mask |= CLIP_NEAR_BIT;
+      }
 #endif /* defined(macintosh) */
 
       clipMask[i] = mask;
@@ -119,7 +124,8 @@ static GLvector4f * _XFORMAPI TAG(cliptest_np_points4)( GLvector4f *clip_vec,
 							GLvector4f *proj_vec,
 							GLubyte clipMask[],
 							GLubyte *orMask,
-							GLubyte *andMask )
+							GLubyte *andMask,
+							GLboolean viewport_z_clip )
 {
    const GLuint stride = clip_vec->stride;
    const GLuint count = clip_vec->count;
@@ -141,16 +147,20 @@ static GLvector4f * _XFORMAPI TAG(cliptest_np_points4)( GLvector4f *clip_vec,
       mask |= (((cw < -cx) << CLIP_LEFT_SHIFT));
       mask |= (((cw < cy) << CLIP_TOP_SHIFT));
       mask |= (((cw < -cy) << CLIP_BOTTOM_SHIFT));
-      mask |= (((cw < cz) << CLIP_FAR_SHIFT));
-      mask |= (((cw < -cz) << CLIP_NEAR_SHIFT));
+      if (viewport_z_clip) {
+	 mask |= (((cw < cz) << CLIP_FAR_SHIFT));
+	 mask |= (((cw < -cz) << CLIP_NEAR_SHIFT));
+      }
 #else /* !defined(macintosh)) */
       GLubyte mask = 0;
       if (-cx + cw < 0) mask |= CLIP_RIGHT_BIT;
       if ( cx + cw < 0) mask |= CLIP_LEFT_BIT;
       if (-cy + cw < 0) mask |= CLIP_TOP_BIT;
       if ( cy + cw < 0) mask |= CLIP_BOTTOM_BIT;
-      if (-cz + cw < 0) mask |= CLIP_FAR_BIT;
-      if ( cz + cw < 0) mask |= CLIP_NEAR_BIT;
+      if (viewport_z_clip) {
+	 if (-cz + cw < 0) mask |= CLIP_FAR_BIT;
+	 if ( cz + cw < 0) mask |= CLIP_NEAR_BIT;
+      }
 #endif /* defined(macintosh) */
 
       clipMask[i] = mask;
@@ -171,7 +181,8 @@ static GLvector4f * _XFORMAPI TAG(cliptest_points3)( GLvector4f *clip_vec,
                                                      GLvector4f *proj_vec,
                                                      GLubyte clipMask[],
                                                      GLubyte *orMask,
-                                                     GLubyte *andMask )
+                                                     GLubyte *andMask,
+						     GLboolean viewport_z_clip )
 {
    const GLuint stride = clip_vec->stride;
    const GLuint count = clip_vec->count;
@@ -187,8 +198,10 @@ static GLvector4f * _XFORMAPI TAG(cliptest_points3)( GLvector4f *clip_vec,
       else if (cx < -1.0)  mask |= CLIP_LEFT_BIT;
       if (cy >  1.0)       mask |= CLIP_TOP_BIT;
       else if (cy < -1.0)  mask |= CLIP_BOTTOM_BIT;
-      if (cz >  1.0)       mask |= CLIP_FAR_BIT;
-      else if (cz < -1.0)  mask |= CLIP_NEAR_BIT;
+      if (viewport_z_clip) {
+	 if (cz >  1.0)       mask |= CLIP_FAR_BIT;
+	 else if (cz < -1.0)  mask |= CLIP_NEAR_BIT;
+      }
       clipMask[i] = mask;
       tmpOrMask |= mask;
       tmpAndMask &= mask;
@@ -204,7 +217,8 @@ static GLvector4f * _XFORMAPI TAG(cliptest_points2)( GLvector4f *clip_vec,
                                                      GLvector4f *proj_vec,
                                                      GLubyte clipMask[],
                                                      GLubyte *orMask,
-                                                     GLubyte *andMask )
+                                                     GLubyte *andMask,
+						     GLboolean viewport_z_clip )
 {
    const GLuint stride = clip_vec->stride;
    const GLuint count = clip_vec->count;
@@ -231,7 +245,7 @@ static GLvector4f * _XFORMAPI TAG(cliptest_points2)( GLvector4f *clip_vec,
 }
 
 
-static void TAG(init_c_cliptest)( void )
+void TAG(init_c_cliptest)( void )
 {
    _mesa_clip_tab[4] = TAG(cliptest_points4);
    _mesa_clip_tab[3] = TAG(cliptest_points3);
diff --git a/src/mesa/math/m_debug_clip.c b/src/mesa/math/m_debug_clip.c
index 460fed4a75..f2b757a91b 100644
--- a/src/mesa/math/m_debug_clip.c
+++ b/src/mesa/math/m_debug_clip.c
@@ -67,7 +67,8 @@ static GLvector4f *ref_cliptest_points4( GLvector4f *clip_vec,
 					 GLvector4f *proj_vec,
 					 GLubyte clipMask[],
 					 GLubyte *orMask,
-					 GLubyte *andMask )
+					 GLubyte *andMask,
+					 GLboolean viewport_z_clip )
 {
    const GLuint stride = clip_vec->stride;
    const GLuint count = clip_vec->count;
@@ -87,8 +88,10 @@ static GLvector4f *ref_cliptest_points4( GLvector4f *clip_vec,
       if (  cx + cw < 0 ) mask |= CLIP_LEFT_BIT;
       if ( -cy + cw < 0 ) mask |= CLIP_TOP_BIT;
       if (  cy + cw < 0 ) mask |= CLIP_BOTTOM_BIT;
-      if ( -cz + cw < 0 ) mask |= CLIP_FAR_BIT;
-      if (  cz + cw < 0 ) mask |= CLIP_NEAR_BIT;
+      if (viewport_z_clip) {
+	 if ( -cz + cw < 0 ) mask |= CLIP_FAR_BIT;
+	 if (  cz + cw < 0 ) mask |= CLIP_NEAR_BIT;
+      }
       clipMask[i] = mask;
       if ( mask ) {
 	 c++;
diff --git a/src/mesa/math/m_xform.h b/src/mesa/math/m_xform.h
index 7ef76e0b92..33421ad1c0 100644
--- a/src/mesa/math/m_xform.h
+++ b/src/mesa/math/m_xform.h
@@ -43,7 +43,8 @@
 
 extern void
 _math_init_transformation(void);
-
+extern void
+init_c_cliptest(void);
 
 /* KW: Clip functions now do projective divide as well.  The projected
  * coordinates are very useful to us because they let us cull
@@ -102,7 +103,8 @@ typedef GLvector4f * (_XFORMAPIP clip_func)( GLvector4f *vClip,
 					     GLvector4f *vProj,
 					     GLubyte clipMask[],
 					     GLubyte *orMask,
-					     GLubyte *andMask );
+					     GLubyte *andMask,
+					     GLboolean viewport_z_clip );
 
 typedef void (*dotprod_func)( GLfloat *out,
 			      GLuint out_stride,
diff --git a/src/mesa/sparc/clip.S b/src/mesa/sparc/clip.S
index 208843c606..dc239171ff 100644
--- a/src/mesa/sparc/clip.S
+++ b/src/mesa/sparc/clip.S
@@ -58,7 +58,8 @@ clip_table:
 	.byte	31, 29, 31, 30, 27, 25, 27, 26
 
 /* GLvector4f *clip_vec, GLvector4f *proj_vec, 
-   GLubyte clipMask[], GLubyte *orMask, GLubyte *andMask */
+   GLubyte clipMask[], GLubyte *orMask, GLubyte *andMask,
+   GLboolean viewport_z_enable */
 
 	.align		64
 __pc_tramp:
diff --git a/src/mesa/sparc/sparc.c b/src/mesa/sparc/sparc.c
index d2286a2c83..cea0c7cecf 100644
--- a/src/mesa/sparc/sparc.c
+++ b/src/mesa/sparc/sparc.c
@@ -78,13 +78,15 @@ extern GLvector4f  *_mesa_sparc_cliptest_points4(GLvector4f *clip_vec,
 						 GLvector4f *proj_vec,
 						 GLubyte clipMask[],
 						 GLubyte *orMask,
-						 GLubyte *andMask);
+						 GLubyte *andMask,
+						 GLboolean viewport_z_clip);
 
 extern GLvector4f  *_mesa_sparc_cliptest_points4_np(GLvector4f *clip_vec,
 						    GLvector4f *proj_vec,
 						    GLubyte clipMask[],
 						    GLubyte *orMask,
-						    GLubyte *andMask);
+						    GLubyte *andMask,
+						    GLboolean viewport_z_clip);
 
 #define NORM_ARGS	const GLmatrix *mat,				\
 			GLfloat scale,					\
diff --git a/src/mesa/swrast/s_depth.c b/src/mesa/swrast/s_depth.c
index 26e23f02d5..1a428fb1a2 100644
--- a/src/mesa/swrast/s_depth.c
+++ b/src/mesa/swrast/s_depth.c
@@ -497,6 +497,33 @@ depth_test_span32( GLcontext *ctx, GLuint n,
    return passed;
 }
 
+/* Apply ARB_depth_clamp to span of fragments. */
+void
+_swrast_depth_clamp_span( GLcontext *ctx, SWspan *span )
+{
+   struct gl_framebuffer *fb = ctx->DrawBuffer;
+   struct gl_renderbuffer *rb = fb->_DepthBuffer;
+   const GLuint count = span->end;
+   GLuint *zValues = span->array->z;
+   GLuint near, far;
+   int i;
+
+   if (rb->DataType == GL_UNSIGNED_SHORT) {
+      near = FLOAT_TO_UINT(ctx->Viewport.Near);
+      far = FLOAT_TO_UINT(ctx->Viewport.Far);
+   } else {
+      assert(rb->DataType == GL_UNSIGNED_INT);
+      CLAMPED_FLOAT_TO_USHORT(near, ctx->Viewport.Near);
+      CLAMPED_FLOAT_TO_USHORT(far, ctx->Viewport.Far);
+   }
+   for (i = 0; i < count; i++) {
+      if (zValues[i] < near)
+	 zValues[i] = near;
+      if (zValues[i] > far)
+	 zValues[i] = far;
+   }
+}
+
 
 
 /*
diff --git a/src/mesa/swrast/s_depth.h b/src/mesa/swrast/s_depth.h
index 3688625683..7eae366742 100644
--- a/src/mesa/swrast/s_depth.h
+++ b/src/mesa/swrast/s_depth.h
@@ -33,6 +33,8 @@
 extern GLuint
 _swrast_depth_test_span( GLcontext *ctx, SWspan *span);
 
+extern void
+_swrast_depth_clamp_span( GLcontext *ctx, SWspan *span );
 
 extern GLboolean
 _swrast_depth_bounds_test( GLcontext *ctx, SWspan *span );
diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c
index 0e2793b474..a45eac438e 100644
--- a/src/mesa/swrast/s_span.c
+++ b/src/mesa/swrast/s_span.c
@@ -880,6 +880,9 @@ _swrast_write_index_span( GLcontext *ctx, SWspan *span)
       stipple_polygon_span(ctx, span);
    }
 
+   if (ctx->Transform.DepthClamp)
+      _swrast_depth_clamp_span(ctx, span);
+
    /* Stencil and Z testing */
    if (ctx->Stencil._Enabled || ctx->Depth.Test) {
       if (!(span->arrayMask & SPAN_Z))
diff --git a/src/mesa/tnl/t_rasterpos.c b/src/mesa/tnl/t_rasterpos.c
index f1fdddf0f5..99b6787455 100644
--- a/src/mesa/tnl/t_rasterpos.c
+++ b/src/mesa/tnl/t_rasterpos.c
@@ -46,11 +46,10 @@
  * \return zero if outside view volume, or one if inside.
  */
 static GLuint
-viewclip_point( const GLfloat v[] )
+viewclip_point_xy( const GLfloat v[] )
 {
    if (   v[0] > v[3] || v[0] < -v[3]
-       || v[1] > v[3] || v[1] < -v[3]
-       || v[2] > v[3] || v[2] < -v[3] ) {
+       || v[1] > v[3] || v[1] < -v[3] ) {
       return 0;
    }
    else {
@@ -408,18 +407,18 @@ _tnl_RasterPos(GLcontext *ctx, const GLfloat vObj[4])
       /* apply projection matrix:  clip = Proj * eye */
       TRANSFORM_POINT( clip, ctx->ProjectionMatrixStack.Top->m, eye );
 
-      /* clip to view volume */
-      if (ctx->Transform.RasterPositionUnclipped) {
-         /* GL_IBM_rasterpos_clip: only clip against Z */
+      /* clip to view volume. */
+      if (!ctx->Transform.DepthClamp) {
          if (viewclip_point_z(clip) == 0) {
             ctx->Current.RasterPosValid = GL_FALSE;
             return;
          }
       }
-      else if (viewclip_point(clip) == 0) {
-         /* Normal OpenGL behaviour */
-         ctx->Current.RasterPosValid = GL_FALSE;
-         return;
+      if (!ctx->Transform.RasterPositionUnclipped) {
+         if (viewclip_point_xy(clip) == 0) {
+            ctx->Current.RasterPosValid = GL_FALSE;
+            return;
+         }
       }
 
       /* clip to user clipping planes */
@@ -443,6 +442,12 @@ _tnl_RasterPos(GLcontext *ctx, const GLfloat vObj[4])
                                   / ctx->DrawBuffer->_DepthMaxF;
       ctx->Current.RasterPos[3] = clip[3];
 
+      if (ctx->Transform.DepthClamp) {
+	 ctx->Current.RasterPos[3] = CLAMP(ctx->Current.RasterPos[3],
+					   ctx->Viewport.Near,
+					   ctx->Viewport.Far);
+      }
+
       /* compute raster distance */
       if (ctx->Fog.FogCoordinateSource == GL_FOG_COORDINATE_EXT)
          ctx->Current.RasterDistance = ctx->Current.Attrib[VERT_ATTRIB_FOG][0];
diff --git a/src/mesa/tnl/t_vb_program.c b/src/mesa/tnl/t_vb_program.c
index dc954bcba1..5d89f8bc31 100644
--- a/src/mesa/tnl/t_vb_program.c
+++ b/src/mesa/tnl/t_vb_program.c
@@ -137,7 +137,8 @@ do_ndc_cliptest(GLcontext *ctx, struct vp_stage_data *store)
                                             &store->ndcCoords,
                                             store->clipmask,
                                             &store->ormask,
-                                            &store->andmask );
+                                            &store->andmask,
+					    !ctx->Transform.DepthClamp );
    }
    else {
       VB->NdcPtr = NULL;
@@ -145,7 +146,8 @@ do_ndc_cliptest(GLcontext *ctx, struct vp_stage_data *store)
                                             NULL,
                                             store->clipmask,
                                             &store->ormask,
-                                            &store->andmask );
+                                            &store->andmask,
+					    !ctx->Transform.DepthClamp );
    }
 
    if (store->andmask) {
diff --git a/src/mesa/tnl/t_vb_vertex.c b/src/mesa/tnl/t_vb_vertex.c
index 30aa7c4086..6a746417c8 100644
--- a/src/mesa/tnl/t_vb_vertex.c
+++ b/src/mesa/tnl/t_vb_vertex.c
@@ -173,7 +173,8 @@ static GLboolean run_vertex_stage( GLcontext *ctx,
 					    &store->proj,
 					    store->clipmask,
 					    &store->ormask,
-					    &store->andmask );
+					    &store->andmask,
+					    !ctx->Transform.DepthClamp );
    }
    else {
       VB->NdcPtr = NULL;
@@ -181,7 +182,8 @@ static GLboolean run_vertex_stage( GLcontext *ctx,
 					    NULL,
 					    store->clipmask,
 					    &store->ormask,
-					    &store->andmask );
+					    &store->andmask,
+					    !ctx->Transform.DepthClamp );
    }
 
    if (store->andmask)
diff --git a/src/mesa/x86/x86_xform.c b/src/mesa/x86/x86_xform.c
index 16b2b26bcc..52f6b25d81 100644
--- a/src/mesa/x86/x86_xform.c
+++ b/src/mesa/x86/x86_xform.c
@@ -60,21 +60,24 @@ _mesa_x86_cliptest_points4( GLvector4f *clip_vec,
 			    GLvector4f *proj_vec,
 			    GLubyte clipMask[],
 			    GLubyte *orMask,
-			    GLubyte *andMask );
+			    GLubyte *andMask,
+			    GLboolean viewport_z_clip );
 
 extern GLvector4f * _ASMAPI
 _mesa_x86_cliptest_points4_np( GLvector4f *clip_vec,
 			       GLvector4f *proj_vec,
 			       GLubyte clipMask[],
 			       GLubyte *orMask,
-			       GLubyte *andMask );
+			       GLubyte *andMask,
+			       GLboolean viewport_z_clip );
 
 extern void _ASMAPI
 _mesa_v16_x86_cliptest_points4( GLfloat *first_vert,
 				GLfloat *last_vert,
 				GLubyte *or_mask,
 				GLubyte *and_mask,
-				GLubyte *clip_mask );
+				GLubyte *clip_mask,
+				GLboolean viewport_z_clip );
 
 extern void _ASMAPI
 _mesa_v16_x86_general_xform( GLfloat *dest,
-- 
cgit v1.2.3


From 0e5c2598ec8cd9e20cb02e2b120d5b43103b7b05 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Wed, 26 Aug 2009 10:34:31 -0700
Subject: Regenerate files for GL_ARB_depth_clamp.

---
 src/mesa/main/enums.c | 5212 +++++++++++++++++++++++++------------------------
 1 file changed, 2607 insertions(+), 2605 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/enums.c b/src/mesa/main/enums.c
index 9f650dadd3..2d1594eb7a 100644
--- a/src/mesa/main/enums.c
+++ b/src/mesa/main/enums.c
@@ -391,6 +391,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_DEPTH_BOUNDS_EXT\0"
    "GL_DEPTH_BOUNDS_TEST_EXT\0"
    "GL_DEPTH_BUFFER_BIT\0"
+   "GL_DEPTH_CLAMP\0"
    "GL_DEPTH_CLAMP_NV\0"
    "GL_DEPTH_CLEAR_VALUE\0"
    "GL_DEPTH_COMPONENT\0"
@@ -1895,7 +1896,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_ZOOM_Y\0"
    ;
 
-static const enum_elt all_enums[1857] =
+static const enum_elt all_enums[1858] =
 {
    {     0, 0x00000600 }, /* GL_2D */
    {     6, 0x00001407 }, /* GL_2_BYTES */
@@ -2252,1588 +2253,1589 @@ static const enum_elt all_enums[1857] =
    {  7262, 0x00008891 }, /* GL_DEPTH_BOUNDS_EXT */
    {  7282, 0x00008890 }, /* GL_DEPTH_BOUNDS_TEST_EXT */
    {  7307, 0x00000100 }, /* GL_DEPTH_BUFFER_BIT */
-   {  7327, 0x0000864F }, /* GL_DEPTH_CLAMP_NV */
-   {  7345, 0x00000B73 }, /* GL_DEPTH_CLEAR_VALUE */
-   {  7366, 0x00001902 }, /* GL_DEPTH_COMPONENT */
-   {  7385, 0x000081A5 }, /* GL_DEPTH_COMPONENT16 */
-   {  7406, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_ARB */
-   {  7431, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_SGIX */
-   {  7457, 0x000081A6 }, /* GL_DEPTH_COMPONENT24 */
-   {  7478, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_ARB */
-   {  7503, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_SGIX */
-   {  7529, 0x000081A7 }, /* GL_DEPTH_COMPONENT32 */
-   {  7550, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_ARB */
-   {  7575, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_SGIX */
-   {  7601, 0x00000B74 }, /* GL_DEPTH_FUNC */
-   {  7615, 0x00000B70 }, /* GL_DEPTH_RANGE */
-   {  7630, 0x00000D1E }, /* GL_DEPTH_SCALE */
-   {  7645, 0x000084F9 }, /* GL_DEPTH_STENCIL */
-   {  7662, 0x0000821A }, /* GL_DEPTH_STENCIL_ATTACHMENT */
-   {  7690, 0x000084F9 }, /* GL_DEPTH_STENCIL_NV */
-   {  7710, 0x0000886F }, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
-   {  7738, 0x0000886E }, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
-   {  7766, 0x00000B71 }, /* GL_DEPTH_TEST */
-   {  7780, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE */
-   {  7802, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE_ARB */
-   {  7828, 0x00000B72 }, /* GL_DEPTH_WRITEMASK */
-   {  7847, 0x00001201 }, /* GL_DIFFUSE */
-   {  7858, 0x00000BD0 }, /* GL_DITHER */
-   {  7868, 0x00000A02 }, /* GL_DOMAIN */
-   {  7878, 0x00001100 }, /* GL_DONT_CARE */
-   {  7891, 0x000086AE }, /* GL_DOT3_RGB */
-   {  7903, 0x000086AF }, /* GL_DOT3_RGBA */
-   {  7916, 0x000086AF }, /* GL_DOT3_RGBA_ARB */
-   {  7933, 0x00008741 }, /* GL_DOT3_RGBA_EXT */
-   {  7950, 0x000086AE }, /* GL_DOT3_RGB_ARB */
-   {  7966, 0x00008740 }, /* GL_DOT3_RGB_EXT */
-   {  7982, 0x0000140A }, /* GL_DOUBLE */
-   {  7992, 0x00000C32 }, /* GL_DOUBLEBUFFER */
-   {  8008, 0x00000C01 }, /* GL_DRAW_BUFFER */
-   {  8023, 0x00008825 }, /* GL_DRAW_BUFFER0 */
-   {  8039, 0x00008825 }, /* GL_DRAW_BUFFER0_ARB */
-   {  8059, 0x00008825 }, /* GL_DRAW_BUFFER0_ATI */
-   {  8079, 0x00008826 }, /* GL_DRAW_BUFFER1 */
-   {  8095, 0x0000882F }, /* GL_DRAW_BUFFER10 */
-   {  8112, 0x0000882F }, /* GL_DRAW_BUFFER10_ARB */
-   {  8133, 0x0000882F }, /* GL_DRAW_BUFFER10_ATI */
-   {  8154, 0x00008830 }, /* GL_DRAW_BUFFER11 */
-   {  8171, 0x00008830 }, /* GL_DRAW_BUFFER11_ARB */
-   {  8192, 0x00008830 }, /* GL_DRAW_BUFFER11_ATI */
-   {  8213, 0x00008831 }, /* GL_DRAW_BUFFER12 */
-   {  8230, 0x00008831 }, /* GL_DRAW_BUFFER12_ARB */
-   {  8251, 0x00008831 }, /* GL_DRAW_BUFFER12_ATI */
-   {  8272, 0x00008832 }, /* GL_DRAW_BUFFER13 */
-   {  8289, 0x00008832 }, /* GL_DRAW_BUFFER13_ARB */
-   {  8310, 0x00008832 }, /* GL_DRAW_BUFFER13_ATI */
-   {  8331, 0x00008833 }, /* GL_DRAW_BUFFER14 */
-   {  8348, 0x00008833 }, /* GL_DRAW_BUFFER14_ARB */
-   {  8369, 0x00008833 }, /* GL_DRAW_BUFFER14_ATI */
-   {  8390, 0x00008834 }, /* GL_DRAW_BUFFER15 */
-   {  8407, 0x00008834 }, /* GL_DRAW_BUFFER15_ARB */
-   {  8428, 0x00008834 }, /* GL_DRAW_BUFFER15_ATI */
-   {  8449, 0x00008826 }, /* GL_DRAW_BUFFER1_ARB */
-   {  8469, 0x00008826 }, /* GL_DRAW_BUFFER1_ATI */
-   {  8489, 0x00008827 }, /* GL_DRAW_BUFFER2 */
-   {  8505, 0x00008827 }, /* GL_DRAW_BUFFER2_ARB */
-   {  8525, 0x00008827 }, /* GL_DRAW_BUFFER2_ATI */
-   {  8545, 0x00008828 }, /* GL_DRAW_BUFFER3 */
-   {  8561, 0x00008828 }, /* GL_DRAW_BUFFER3_ARB */
-   {  8581, 0x00008828 }, /* GL_DRAW_BUFFER3_ATI */
-   {  8601, 0x00008829 }, /* GL_DRAW_BUFFER4 */
-   {  8617, 0x00008829 }, /* GL_DRAW_BUFFER4_ARB */
-   {  8637, 0x00008829 }, /* GL_DRAW_BUFFER4_ATI */
-   {  8657, 0x0000882A }, /* GL_DRAW_BUFFER5 */
-   {  8673, 0x0000882A }, /* GL_DRAW_BUFFER5_ARB */
-   {  8693, 0x0000882A }, /* GL_DRAW_BUFFER5_ATI */
-   {  8713, 0x0000882B }, /* GL_DRAW_BUFFER6 */
-   {  8729, 0x0000882B }, /* GL_DRAW_BUFFER6_ARB */
-   {  8749, 0x0000882B }, /* GL_DRAW_BUFFER6_ATI */
-   {  8769, 0x0000882C }, /* GL_DRAW_BUFFER7 */
-   {  8785, 0x0000882C }, /* GL_DRAW_BUFFER7_ARB */
-   {  8805, 0x0000882C }, /* GL_DRAW_BUFFER7_ATI */
-   {  8825, 0x0000882D }, /* GL_DRAW_BUFFER8 */
-   {  8841, 0x0000882D }, /* GL_DRAW_BUFFER8_ARB */
-   {  8861, 0x0000882D }, /* GL_DRAW_BUFFER8_ATI */
-   {  8881, 0x0000882E }, /* GL_DRAW_BUFFER9 */
-   {  8897, 0x0000882E }, /* GL_DRAW_BUFFER9_ARB */
-   {  8917, 0x0000882E }, /* GL_DRAW_BUFFER9_ATI */
-   {  8937, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER */
-   {  8957, 0x00008CA6 }, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
-   {  8989, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER_EXT */
-   {  9013, 0x00000705 }, /* GL_DRAW_PIXEL_TOKEN */
-   {  9033, 0x00000304 }, /* GL_DST_ALPHA */
-   {  9046, 0x00000306 }, /* GL_DST_COLOR */
-   {  9059, 0x0000877A }, /* GL_DU8DV8_ATI */
-   {  9073, 0x00008779 }, /* GL_DUDV_ATI */
-   {  9085, 0x000088EA }, /* GL_DYNAMIC_COPY */
-   {  9101, 0x000088EA }, /* GL_DYNAMIC_COPY_ARB */
-   {  9121, 0x000088E8 }, /* GL_DYNAMIC_DRAW */
-   {  9137, 0x000088E8 }, /* GL_DYNAMIC_DRAW_ARB */
-   {  9157, 0x000088E9 }, /* GL_DYNAMIC_READ */
-   {  9173, 0x000088E9 }, /* GL_DYNAMIC_READ_ARB */
-   {  9193, 0x00000B43 }, /* GL_EDGE_FLAG */
-   {  9206, 0x00008079 }, /* GL_EDGE_FLAG_ARRAY */
-   {  9225, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
-   {  9259, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB */
-   {  9297, 0x00008093 }, /* GL_EDGE_FLAG_ARRAY_POINTER */
-   {  9324, 0x0000808C }, /* GL_EDGE_FLAG_ARRAY_STRIDE */
-   {  9350, 0x00008893 }, /* GL_ELEMENT_ARRAY_BUFFER */
-   {  9374, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
-   {  9406, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB */
-   {  9442, 0x00001600 }, /* GL_EMISSION */
-   {  9454, 0x00002000 }, /* GL_ENABLE_BIT */
-   {  9468, 0x00000202 }, /* GL_EQUAL */
-   {  9477, 0x00001509 }, /* GL_EQUIV */
-   {  9486, 0x00010000 }, /* GL_EVAL_BIT */
-   {  9498, 0x00000800 }, /* GL_EXP */
-   {  9505, 0x00000801 }, /* GL_EXP2 */
-   {  9513, 0x00001F03 }, /* GL_EXTENSIONS */
-   {  9527, 0x00002400 }, /* GL_EYE_LINEAR */
-   {  9541, 0x00002502 }, /* GL_EYE_PLANE */
-   {  9554, 0x0000855C }, /* GL_EYE_PLANE_ABSOLUTE_NV */
-   {  9579, 0x0000855B }, /* GL_EYE_RADIAL_NV */
-   {  9596, 0x00000000 }, /* GL_FALSE */
-   {  9605, 0x00001101 }, /* GL_FASTEST */
-   {  9616, 0x00001C01 }, /* GL_FEEDBACK */
-   {  9628, 0x00000DF0 }, /* GL_FEEDBACK_BUFFER_POINTER */
-   {  9655, 0x00000DF1 }, /* GL_FEEDBACK_BUFFER_SIZE */
-   {  9679, 0x00000DF2 }, /* GL_FEEDBACK_BUFFER_TYPE */
-   {  9703, 0x00001B02 }, /* GL_FILL */
-   {  9711, 0x00008E4D }, /* GL_FIRST_VERTEX_CONVENTION_EXT */
-   {  9742, 0x00001D00 }, /* GL_FLAT */
-   {  9750, 0x00001406 }, /* GL_FLOAT */
-   {  9759, 0x00008B5A }, /* GL_FLOAT_MAT2 */
-   {  9773, 0x00008B5A }, /* GL_FLOAT_MAT2_ARB */
-   {  9791, 0x00008B65 }, /* GL_FLOAT_MAT2x3 */
-   {  9807, 0x00008B66 }, /* GL_FLOAT_MAT2x4 */
-   {  9823, 0x00008B5B }, /* GL_FLOAT_MAT3 */
-   {  9837, 0x00008B5B }, /* GL_FLOAT_MAT3_ARB */
-   {  9855, 0x00008B67 }, /* GL_FLOAT_MAT3x2 */
-   {  9871, 0x00008B68 }, /* GL_FLOAT_MAT3x4 */
-   {  9887, 0x00008B5C }, /* GL_FLOAT_MAT4 */
-   {  9901, 0x00008B5C }, /* GL_FLOAT_MAT4_ARB */
-   {  9919, 0x00008B69 }, /* GL_FLOAT_MAT4x2 */
-   {  9935, 0x00008B6A }, /* GL_FLOAT_MAT4x3 */
-   {  9951, 0x00008B50 }, /* GL_FLOAT_VEC2 */
-   {  9965, 0x00008B50 }, /* GL_FLOAT_VEC2_ARB */
-   {  9983, 0x00008B51 }, /* GL_FLOAT_VEC3 */
-   {  9997, 0x00008B51 }, /* GL_FLOAT_VEC3_ARB */
-   { 10015, 0x00008B52 }, /* GL_FLOAT_VEC4 */
-   { 10029, 0x00008B52 }, /* GL_FLOAT_VEC4_ARB */
-   { 10047, 0x00000B60 }, /* GL_FOG */
-   { 10054, 0x00000080 }, /* GL_FOG_BIT */
-   { 10065, 0x00000B66 }, /* GL_FOG_COLOR */
-   { 10078, 0x00008451 }, /* GL_FOG_COORD */
-   { 10091, 0x00008451 }, /* GL_FOG_COORDINATE */
-   { 10109, 0x00008457 }, /* GL_FOG_COORDINATE_ARRAY */
-   { 10133, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
-   { 10172, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB */
-   { 10215, 0x00008456 }, /* GL_FOG_COORDINATE_ARRAY_POINTER */
-   { 10247, 0x00008455 }, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
-   { 10278, 0x00008454 }, /* GL_FOG_COORDINATE_ARRAY_TYPE */
-   { 10307, 0x00008450 }, /* GL_FOG_COORDINATE_SOURCE */
-   { 10332, 0x00008457 }, /* GL_FOG_COORD_ARRAY */
-   { 10351, 0x0000889D }, /* GL_FOG_COORD_ARRAY_BUFFER_BINDING */
-   { 10385, 0x00008456 }, /* GL_FOG_COORD_ARRAY_POINTER */
-   { 10412, 0x00008455 }, /* GL_FOG_COORD_ARRAY_STRIDE */
-   { 10438, 0x00008454 }, /* GL_FOG_COORD_ARRAY_TYPE */
-   { 10462, 0x00008450 }, /* GL_FOG_COORD_SRC */
-   { 10479, 0x00000B62 }, /* GL_FOG_DENSITY */
-   { 10494, 0x0000855A }, /* GL_FOG_DISTANCE_MODE_NV */
-   { 10518, 0x00000B64 }, /* GL_FOG_END */
-   { 10529, 0x00000C54 }, /* GL_FOG_HINT */
-   { 10541, 0x00000B61 }, /* GL_FOG_INDEX */
-   { 10554, 0x00000B65 }, /* GL_FOG_MODE */
-   { 10566, 0x00008198 }, /* GL_FOG_OFFSET_SGIX */
-   { 10585, 0x00008199 }, /* GL_FOG_OFFSET_VALUE_SGIX */
-   { 10610, 0x00000B63 }, /* GL_FOG_START */
-   { 10623, 0x00008452 }, /* GL_FRAGMENT_DEPTH */
-   { 10641, 0x00008804 }, /* GL_FRAGMENT_PROGRAM_ARB */
-   { 10665, 0x00008B30 }, /* GL_FRAGMENT_SHADER */
-   { 10684, 0x00008B30 }, /* GL_FRAGMENT_SHADER_ARB */
-   { 10707, 0x00008B8B }, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
-   { 10742, 0x00008D40 }, /* GL_FRAMEBUFFER */
-   { 10757, 0x00008215 }, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
-   { 10794, 0x00008214 }, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
-   { 10830, 0x00008210 }, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
-   { 10871, 0x00008211 }, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
-   { 10912, 0x00008216 }, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
-   { 10949, 0x00008213 }, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
-   { 10986, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
-   { 11024, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT */
-   { 11066, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
-   { 11104, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT */
-   { 11146, 0x00008212 }, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
-   { 11181, 0x00008217 }, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
-   { 11220, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT */
-   { 11269, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
-   { 11317, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT */
-   { 11369, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
-   { 11409, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
-   { 11453, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
-   { 11493, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT */
-   { 11537, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING_EXT */
-   { 11564, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE */
-   { 11588, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE_EXT */
-   { 11616, 0x00008218 }, /* GL_FRAMEBUFFER_DEFAULT */
-   { 11639, 0x00008D40 }, /* GL_FRAMEBUFFER_EXT */
-   { 11658, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
-   { 11695, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT */
-   { 11736, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
-   { 11777, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
-   { 11819, 0x00008CD8 }, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
-   { 11870, 0x00008CDA }, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
-   { 11908, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
-   { 11953, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT */
-   { 12002, 0x00008D56 }, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
-   { 12040, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
-   { 12082, 0x00008CDE }, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
-   { 12114, 0x00008219 }, /* GL_FRAMEBUFFER_UNDEFINED */
-   { 12139, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED */
-   { 12166, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED_EXT */
-   { 12197, 0x00000404 }, /* GL_FRONT */
-   { 12206, 0x00000408 }, /* GL_FRONT_AND_BACK */
-   { 12224, 0x00000B46 }, /* GL_FRONT_FACE */
-   { 12238, 0x00000400 }, /* GL_FRONT_LEFT */
-   { 12252, 0x00000401 }, /* GL_FRONT_RIGHT */
-   { 12267, 0x00008006 }, /* GL_FUNC_ADD */
-   { 12279, 0x00008006 }, /* GL_FUNC_ADD_EXT */
-   { 12295, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT */
-   { 12320, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT_EXT */
-   { 12349, 0x0000800A }, /* GL_FUNC_SUBTRACT */
-   { 12366, 0x0000800A }, /* GL_FUNC_SUBTRACT_EXT */
-   { 12387, 0x00008191 }, /* GL_GENERATE_MIPMAP */
-   { 12406, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT */
-   { 12430, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT_SGIS */
-   { 12459, 0x00008191 }, /* GL_GENERATE_MIPMAP_SGIS */
-   { 12483, 0x00000206 }, /* GL_GEQUAL */
-   { 12493, 0x00000204 }, /* GL_GREATER */
-   { 12504, 0x00001904 }, /* GL_GREEN */
-   { 12513, 0x00000D19 }, /* GL_GREEN_BIAS */
-   { 12527, 0x00000D53 }, /* GL_GREEN_BITS */
-   { 12541, 0x00000D18 }, /* GL_GREEN_SCALE */
-   { 12556, 0x00008000 }, /* GL_HINT_BIT */
-   { 12568, 0x00008024 }, /* GL_HISTOGRAM */
-   { 12581, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE */
-   { 12605, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE_EXT */
-   { 12633, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE */
-   { 12656, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE_EXT */
-   { 12683, 0x00008024 }, /* GL_HISTOGRAM_EXT */
-   { 12700, 0x00008027 }, /* GL_HISTOGRAM_FORMAT */
-   { 12720, 0x00008027 }, /* GL_HISTOGRAM_FORMAT_EXT */
-   { 12744, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE */
-   { 12768, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE_EXT */
-   { 12796, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE */
-   { 12824, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE_EXT */
-   { 12856, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE */
-   { 12878, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE_EXT */
-   { 12904, 0x0000802D }, /* GL_HISTOGRAM_SINK */
-   { 12922, 0x0000802D }, /* GL_HISTOGRAM_SINK_EXT */
-   { 12944, 0x00008026 }, /* GL_HISTOGRAM_WIDTH */
-   { 12963, 0x00008026 }, /* GL_HISTOGRAM_WIDTH_EXT */
-   { 12986, 0x0000862A }, /* GL_IDENTITY_NV */
-   { 13001, 0x00008150 }, /* GL_IGNORE_BORDER_HP */
-   { 13021, 0x00008B9B }, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
-   { 13061, 0x00008B9A }, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
-   { 13099, 0x00001E02 }, /* GL_INCR */
-   { 13107, 0x00008507 }, /* GL_INCR_WRAP */
-   { 13120, 0x00008507 }, /* GL_INCR_WRAP_EXT */
-   { 13137, 0x00008222 }, /* GL_INDEX */
-   { 13146, 0x00008077 }, /* GL_INDEX_ARRAY */
-   { 13161, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING */
-   { 13191, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING_ARB */
-   { 13225, 0x00008091 }, /* GL_INDEX_ARRAY_POINTER */
-   { 13248, 0x00008086 }, /* GL_INDEX_ARRAY_STRIDE */
-   { 13270, 0x00008085 }, /* GL_INDEX_ARRAY_TYPE */
-   { 13290, 0x00000D51 }, /* GL_INDEX_BITS */
-   { 13304, 0x00000C20 }, /* GL_INDEX_CLEAR_VALUE */
-   { 13325, 0x00000BF1 }, /* GL_INDEX_LOGIC_OP */
-   { 13343, 0x00000C30 }, /* GL_INDEX_MODE */
-   { 13357, 0x00000D13 }, /* GL_INDEX_OFFSET */
-   { 13373, 0x00000D12 }, /* GL_INDEX_SHIFT */
-   { 13388, 0x00000C21 }, /* GL_INDEX_WRITEMASK */
-   { 13407, 0x00008B84 }, /* GL_INFO_LOG_LENGTH */
-   { 13426, 0x00001404 }, /* GL_INT */
-   { 13433, 0x00008049 }, /* GL_INTENSITY */
-   { 13446, 0x0000804C }, /* GL_INTENSITY12 */
-   { 13461, 0x0000804C }, /* GL_INTENSITY12_EXT */
-   { 13480, 0x0000804D }, /* GL_INTENSITY16 */
-   { 13495, 0x0000804D }, /* GL_INTENSITY16_EXT */
-   { 13514, 0x0000804A }, /* GL_INTENSITY4 */
-   { 13528, 0x0000804A }, /* GL_INTENSITY4_EXT */
-   { 13546, 0x0000804B }, /* GL_INTENSITY8 */
-   { 13560, 0x0000804B }, /* GL_INTENSITY8_EXT */
-   { 13578, 0x00008049 }, /* GL_INTENSITY_EXT */
-   { 13595, 0x00008575 }, /* GL_INTERPOLATE */
-   { 13610, 0x00008575 }, /* GL_INTERPOLATE_ARB */
-   { 13629, 0x00008575 }, /* GL_INTERPOLATE_EXT */
-   { 13648, 0x00008B53 }, /* GL_INT_VEC2 */
-   { 13660, 0x00008B53 }, /* GL_INT_VEC2_ARB */
-   { 13676, 0x00008B54 }, /* GL_INT_VEC3 */
-   { 13688, 0x00008B54 }, /* GL_INT_VEC3_ARB */
-   { 13704, 0x00008B55 }, /* GL_INT_VEC4 */
-   { 13716, 0x00008B55 }, /* GL_INT_VEC4_ARB */
-   { 13732, 0x00000500 }, /* GL_INVALID_ENUM */
-   { 13748, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION */
-   { 13781, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION_EXT */
-   { 13818, 0x00000502 }, /* GL_INVALID_OPERATION */
-   { 13839, 0x00000501 }, /* GL_INVALID_VALUE */
-   { 13856, 0x0000862B }, /* GL_INVERSE_NV */
-   { 13870, 0x0000862D }, /* GL_INVERSE_TRANSPOSE_NV */
-   { 13894, 0x0000150A }, /* GL_INVERT */
-   { 13904, 0x00001E00 }, /* GL_KEEP */
-   { 13912, 0x00008E4E }, /* GL_LAST_VERTEX_CONVENTION_EXT */
-   { 13942, 0x00000406 }, /* GL_LEFT */
-   { 13950, 0x00000203 }, /* GL_LEQUAL */
-   { 13960, 0x00000201 }, /* GL_LESS */
-   { 13968, 0x00004000 }, /* GL_LIGHT0 */
-   { 13978, 0x00004001 }, /* GL_LIGHT1 */
-   { 13988, 0x00004002 }, /* GL_LIGHT2 */
-   { 13998, 0x00004003 }, /* GL_LIGHT3 */
-   { 14008, 0x00004004 }, /* GL_LIGHT4 */
-   { 14018, 0x00004005 }, /* GL_LIGHT5 */
-   { 14028, 0x00004006 }, /* GL_LIGHT6 */
-   { 14038, 0x00004007 }, /* GL_LIGHT7 */
-   { 14048, 0x00000B50 }, /* GL_LIGHTING */
-   { 14060, 0x00000040 }, /* GL_LIGHTING_BIT */
-   { 14076, 0x00000B53 }, /* GL_LIGHT_MODEL_AMBIENT */
-   { 14099, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL */
-   { 14128, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL_EXT */
-   { 14161, 0x00000B51 }, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
-   { 14189, 0x00000B52 }, /* GL_LIGHT_MODEL_TWO_SIDE */
-   { 14213, 0x00001B01 }, /* GL_LINE */
-   { 14221, 0x00002601 }, /* GL_LINEAR */
-   { 14231, 0x00001208 }, /* GL_LINEAR_ATTENUATION */
-   { 14253, 0x00008170 }, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
-   { 14283, 0x0000844F }, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
-   { 14314, 0x00002703 }, /* GL_LINEAR_MIPMAP_LINEAR */
-   { 14338, 0x00002701 }, /* GL_LINEAR_MIPMAP_NEAREST */
-   { 14363, 0x00000001 }, /* GL_LINES */
-   { 14372, 0x00000004 }, /* GL_LINE_BIT */
-   { 14384, 0x00000002 }, /* GL_LINE_LOOP */
-   { 14397, 0x00000707 }, /* GL_LINE_RESET_TOKEN */
-   { 14417, 0x00000B20 }, /* GL_LINE_SMOOTH */
-   { 14432, 0x00000C52 }, /* GL_LINE_SMOOTH_HINT */
-   { 14452, 0x00000B24 }, /* GL_LINE_STIPPLE */
-   { 14468, 0x00000B25 }, /* GL_LINE_STIPPLE_PATTERN */
-   { 14492, 0x00000B26 }, /* GL_LINE_STIPPLE_REPEAT */
-   { 14515, 0x00000003 }, /* GL_LINE_STRIP */
-   { 14529, 0x00000702 }, /* GL_LINE_TOKEN */
-   { 14543, 0x00000B21 }, /* GL_LINE_WIDTH */
-   { 14557, 0x00000B23 }, /* GL_LINE_WIDTH_GRANULARITY */
-   { 14583, 0x00000B22 }, /* GL_LINE_WIDTH_RANGE */
-   { 14603, 0x00008B82 }, /* GL_LINK_STATUS */
-   { 14618, 0x00000B32 }, /* GL_LIST_BASE */
-   { 14631, 0x00020000 }, /* GL_LIST_BIT */
-   { 14643, 0x00000B33 }, /* GL_LIST_INDEX */
-   { 14657, 0x00000B30 }, /* GL_LIST_MODE */
-   { 14670, 0x00000101 }, /* GL_LOAD */
-   { 14678, 0x00000BF1 }, /* GL_LOGIC_OP */
-   { 14690, 0x00000BF0 }, /* GL_LOGIC_OP_MODE */
-   { 14707, 0x00008CA1 }, /* GL_LOWER_LEFT */
-   { 14721, 0x00001909 }, /* GL_LUMINANCE */
-   { 14734, 0x00008041 }, /* GL_LUMINANCE12 */
-   { 14749, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12 */
-   { 14772, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12_EXT */
-   { 14799, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4 */
-   { 14821, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4_EXT */
-   { 14847, 0x00008041 }, /* GL_LUMINANCE12_EXT */
-   { 14866, 0x00008042 }, /* GL_LUMINANCE16 */
-   { 14881, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16 */
-   { 14904, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16_EXT */
-   { 14931, 0x00008042 }, /* GL_LUMINANCE16_EXT */
-   { 14950, 0x0000803F }, /* GL_LUMINANCE4 */
-   { 14964, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4 */
-   { 14985, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4_EXT */
-   { 15010, 0x0000803F }, /* GL_LUMINANCE4_EXT */
-   { 15028, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2 */
-   { 15049, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2_EXT */
-   { 15074, 0x00008040 }, /* GL_LUMINANCE8 */
-   { 15088, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8 */
-   { 15109, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8_EXT */
-   { 15134, 0x00008040 }, /* GL_LUMINANCE8_EXT */
-   { 15152, 0x0000190A }, /* GL_LUMINANCE_ALPHA */
-   { 15171, 0x00000D90 }, /* GL_MAP1_COLOR_4 */
-   { 15187, 0x00000DD0 }, /* GL_MAP1_GRID_DOMAIN */
-   { 15207, 0x00000DD1 }, /* GL_MAP1_GRID_SEGMENTS */
-   { 15229, 0x00000D91 }, /* GL_MAP1_INDEX */
-   { 15243, 0x00000D92 }, /* GL_MAP1_NORMAL */
-   { 15258, 0x00000D93 }, /* GL_MAP1_TEXTURE_COORD_1 */
-   { 15282, 0x00000D94 }, /* GL_MAP1_TEXTURE_COORD_2 */
-   { 15306, 0x00000D95 }, /* GL_MAP1_TEXTURE_COORD_3 */
-   { 15330, 0x00000D96 }, /* GL_MAP1_TEXTURE_COORD_4 */
-   { 15354, 0x00000D97 }, /* GL_MAP1_VERTEX_3 */
-   { 15371, 0x00000D98 }, /* GL_MAP1_VERTEX_4 */
-   { 15388, 0x00008660 }, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
-   { 15416, 0x0000866A }, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
-   { 15445, 0x0000866B }, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
-   { 15474, 0x0000866C }, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
-   { 15503, 0x0000866D }, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
-   { 15532, 0x0000866E }, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
-   { 15561, 0x0000866F }, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
-   { 15590, 0x00008661 }, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
-   { 15618, 0x00008662 }, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
-   { 15646, 0x00008663 }, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
-   { 15674, 0x00008664 }, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
-   { 15702, 0x00008665 }, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
-   { 15730, 0x00008666 }, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
-   { 15758, 0x00008667 }, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
-   { 15786, 0x00008668 }, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
-   { 15814, 0x00008669 }, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
-   { 15842, 0x00000DB0 }, /* GL_MAP2_COLOR_4 */
-   { 15858, 0x00000DD2 }, /* GL_MAP2_GRID_DOMAIN */
-   { 15878, 0x00000DD3 }, /* GL_MAP2_GRID_SEGMENTS */
-   { 15900, 0x00000DB1 }, /* GL_MAP2_INDEX */
-   { 15914, 0x00000DB2 }, /* GL_MAP2_NORMAL */
-   { 15929, 0x00000DB3 }, /* GL_MAP2_TEXTURE_COORD_1 */
-   { 15953, 0x00000DB4 }, /* GL_MAP2_TEXTURE_COORD_2 */
-   { 15977, 0x00000DB5 }, /* GL_MAP2_TEXTURE_COORD_3 */
-   { 16001, 0x00000DB6 }, /* GL_MAP2_TEXTURE_COORD_4 */
-   { 16025, 0x00000DB7 }, /* GL_MAP2_VERTEX_3 */
-   { 16042, 0x00000DB8 }, /* GL_MAP2_VERTEX_4 */
-   { 16059, 0x00008670 }, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
-   { 16087, 0x0000867A }, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
-   { 16116, 0x0000867B }, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
-   { 16145, 0x0000867C }, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
-   { 16174, 0x0000867D }, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
-   { 16203, 0x0000867E }, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
-   { 16232, 0x0000867F }, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
-   { 16261, 0x00008671 }, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
-   { 16289, 0x00008672 }, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
-   { 16317, 0x00008673 }, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
-   { 16345, 0x00008674 }, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
-   { 16373, 0x00008675 }, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
-   { 16401, 0x00008676 }, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
-   { 16429, 0x00008677 }, /* GL_MAP2_VERTEX_ATTRIB7_4_NV */
-   { 16457, 0x00008678 }, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
-   { 16485, 0x00008679 }, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
-   { 16513, 0x00000D10 }, /* GL_MAP_COLOR */
-   { 16526, 0x00000010 }, /* GL_MAP_FLUSH_EXPLICIT_BIT */
-   { 16552, 0x00000008 }, /* GL_MAP_INVALIDATE_BUFFER_BIT */
-   { 16581, 0x00000004 }, /* GL_MAP_INVALIDATE_RANGE_BIT */
-   { 16609, 0x00000001 }, /* GL_MAP_READ_BIT */
-   { 16625, 0x00000D11 }, /* GL_MAP_STENCIL */
-   { 16640, 0x00000020 }, /* GL_MAP_UNSYNCHRONIZED_BIT */
-   { 16666, 0x00000002 }, /* GL_MAP_WRITE_BIT */
-   { 16683, 0x000088C0 }, /* GL_MATRIX0_ARB */
-   { 16698, 0x00008630 }, /* GL_MATRIX0_NV */
-   { 16712, 0x000088CA }, /* GL_MATRIX10_ARB */
-   { 16728, 0x000088CB }, /* GL_MATRIX11_ARB */
-   { 16744, 0x000088CC }, /* GL_MATRIX12_ARB */
-   { 16760, 0x000088CD }, /* GL_MATRIX13_ARB */
-   { 16776, 0x000088CE }, /* GL_MATRIX14_ARB */
-   { 16792, 0x000088CF }, /* GL_MATRIX15_ARB */
-   { 16808, 0x000088D0 }, /* GL_MATRIX16_ARB */
-   { 16824, 0x000088D1 }, /* GL_MATRIX17_ARB */
-   { 16840, 0x000088D2 }, /* GL_MATRIX18_ARB */
-   { 16856, 0x000088D3 }, /* GL_MATRIX19_ARB */
-   { 16872, 0x000088C1 }, /* GL_MATRIX1_ARB */
-   { 16887, 0x00008631 }, /* GL_MATRIX1_NV */
-   { 16901, 0x000088D4 }, /* GL_MATRIX20_ARB */
-   { 16917, 0x000088D5 }, /* GL_MATRIX21_ARB */
-   { 16933, 0x000088D6 }, /* GL_MATRIX22_ARB */
-   { 16949, 0x000088D7 }, /* GL_MATRIX23_ARB */
-   { 16965, 0x000088D8 }, /* GL_MATRIX24_ARB */
-   { 16981, 0x000088D9 }, /* GL_MATRIX25_ARB */
-   { 16997, 0x000088DA }, /* GL_MATRIX26_ARB */
-   { 17013, 0x000088DB }, /* GL_MATRIX27_ARB */
-   { 17029, 0x000088DC }, /* GL_MATRIX28_ARB */
-   { 17045, 0x000088DD }, /* GL_MATRIX29_ARB */
-   { 17061, 0x000088C2 }, /* GL_MATRIX2_ARB */
-   { 17076, 0x00008632 }, /* GL_MATRIX2_NV */
-   { 17090, 0x000088DE }, /* GL_MATRIX30_ARB */
-   { 17106, 0x000088DF }, /* GL_MATRIX31_ARB */
-   { 17122, 0x000088C3 }, /* GL_MATRIX3_ARB */
-   { 17137, 0x00008633 }, /* GL_MATRIX3_NV */
-   { 17151, 0x000088C4 }, /* GL_MATRIX4_ARB */
-   { 17166, 0x00008634 }, /* GL_MATRIX4_NV */
-   { 17180, 0x000088C5 }, /* GL_MATRIX5_ARB */
-   { 17195, 0x00008635 }, /* GL_MATRIX5_NV */
-   { 17209, 0x000088C6 }, /* GL_MATRIX6_ARB */
-   { 17224, 0x00008636 }, /* GL_MATRIX6_NV */
-   { 17238, 0x000088C7 }, /* GL_MATRIX7_ARB */
-   { 17253, 0x00008637 }, /* GL_MATRIX7_NV */
-   { 17267, 0x000088C8 }, /* GL_MATRIX8_ARB */
-   { 17282, 0x000088C9 }, /* GL_MATRIX9_ARB */
-   { 17297, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_ARB */
-   { 17323, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
-   { 17357, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
-   { 17388, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
-   { 17421, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
-   { 17452, 0x00000BA0 }, /* GL_MATRIX_MODE */
-   { 17467, 0x00008840 }, /* GL_MATRIX_PALETTE_ARB */
-   { 17489, 0x00008008 }, /* GL_MAX */
-   { 17496, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE */
-   { 17519, 0x000088FF }, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
-   { 17551, 0x00000D35 }, /* GL_MAX_ATTRIB_STACK_DEPTH */
-   { 17577, 0x00000D3B }, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
-   { 17610, 0x00008177 }, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
-   { 17636, 0x00008178 }, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-   { 17670, 0x00000D32 }, /* GL_MAX_CLIP_PLANES */
-   { 17689, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
-   { 17718, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
-   { 17750, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI */
-   { 17786, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
-   { 17822, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB */
-   { 17862, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT */
-   { 17888, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT_EXT */
-   { 17918, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH */
-   { 17943, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH_EXT */
-   { 17972, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
-   { 18001, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB */
-   { 18034, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS */
-   { 18054, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ARB */
-   { 18078, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ATI */
-   { 18102, 0x000080E9 }, /* GL_MAX_ELEMENTS_INDICES */
-   { 18126, 0x000080E8 }, /* GL_MAX_ELEMENTS_VERTICES */
-   { 18151, 0x00000D30 }, /* GL_MAX_EVAL_ORDER */
-   { 18169, 0x00008008 }, /* GL_MAX_EXT */
-   { 18180, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
-   { 18215, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB */
-   { 18254, 0x00000D31 }, /* GL_MAX_LIGHTS */
-   { 18268, 0x00000B31 }, /* GL_MAX_LIST_NESTING */
-   { 18288, 0x00008841 }, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
-   { 18326, 0x00000D36 }, /* GL_MAX_MODELVIEW_STACK_DEPTH */
-   { 18355, 0x00000D37 }, /* GL_MAX_NAME_STACK_DEPTH */
-   { 18379, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_ARB */
-   { 18407, 0x00000D34 }, /* GL_MAX_PIXEL_MAP_TABLE */
-   { 18430, 0x000088B1 }, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
-   { 18467, 0x0000880B }, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
-   { 18503, 0x000088AD }, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
-   { 18530, 0x000088F5 }, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
-   { 18559, 0x000088B5 }, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
-   { 18593, 0x000088F4 }, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
-   { 18629, 0x000088F6 }, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
-   { 18656, 0x000088A1 }, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
-   { 18688, 0x000088B4 }, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
-   { 18724, 0x000088F8 }, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
-   { 18753, 0x000088F7 }, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
-   { 18782, 0x0000862F }, /* GL_MAX_PROGRAM_MATRICES_ARB */
-   { 18810, 0x0000862E }, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
-   { 18848, 0x000088B3 }, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-   { 18892, 0x0000880E }, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-   { 18935, 0x000088AF }, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
-   { 18969, 0x000088A3 }, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-   { 19008, 0x000088AB }, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
-   { 19045, 0x000088A7 }, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
-   { 19083, 0x00008810 }, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-   { 19126, 0x0000880F }, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-   { 19169, 0x000088A9 }, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
-   { 19199, 0x000088A5 }, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
-   { 19230, 0x0000880D }, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
-   { 19266, 0x0000880C }, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
-   { 19302, 0x00000D38 }, /* GL_MAX_PROJECTION_STACK_DEPTH */
-   { 19332, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
-   { 19366, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_NV */
-   { 19399, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
-   { 19428, 0x00008D57 }, /* GL_MAX_SAMPLES */
-   { 19443, 0x00009111 }, /* GL_MAX_SERVER_WAIT_TIMEOUT */
-   { 19470, 0x00008504 }, /* GL_MAX_SHININESS_NV */
-   { 19490, 0x00008505 }, /* GL_MAX_SPOT_EXPONENT_NV */
-   { 19514, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS */
-   { 19536, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS_ARB */
-   { 19562, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS */
-   { 19589, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS_ARB */
-   { 19620, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS */
-   { 19644, 0x000084FF }, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
-   { 19678, 0x00000D33 }, /* GL_MAX_TEXTURE_SIZE */
-   { 19698, 0x00000D39 }, /* GL_MAX_TEXTURE_STACK_DEPTH */
-   { 19725, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS */
-   { 19746, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS_ARB */
-   { 19771, 0x0000862F }, /* GL_MAX_TRACK_MATRICES_NV */
-   { 19796, 0x0000862E }, /* GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */
-   { 19831, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS */
-   { 19853, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS_ARB */
-   { 19879, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS */
-   { 19901, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS_ARB */
-   { 19927, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
-   { 19961, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
-   { 19999, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
-   { 20032, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB */
-   { 20069, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_ARB */
-   { 20093, 0x00000D3A }, /* GL_MAX_VIEWPORT_DIMS */
-   { 20114, 0x00008007 }, /* GL_MIN */
-   { 20121, 0x0000802E }, /* GL_MINMAX */
-   { 20131, 0x0000802E }, /* GL_MINMAX_EXT */
-   { 20145, 0x0000802F }, /* GL_MINMAX_FORMAT */
-   { 20162, 0x0000802F }, /* GL_MINMAX_FORMAT_EXT */
-   { 20183, 0x00008030 }, /* GL_MINMAX_SINK */
-   { 20198, 0x00008030 }, /* GL_MINMAX_SINK_EXT */
-   { 20217, 0x00008007 }, /* GL_MIN_EXT */
-   { 20228, 0x00008370 }, /* GL_MIRRORED_REPEAT */
-   { 20247, 0x00008370 }, /* GL_MIRRORED_REPEAT_ARB */
-   { 20270, 0x00008370 }, /* GL_MIRRORED_REPEAT_IBM */
-   { 20293, 0x00008742 }, /* GL_MIRROR_CLAMP_ATI */
-   { 20313, 0x00008742 }, /* GL_MIRROR_CLAMP_EXT */
-   { 20333, 0x00008912 }, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
-   { 20363, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_ATI */
-   { 20391, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
-   { 20419, 0x00001700 }, /* GL_MODELVIEW */
-   { 20432, 0x00001700 }, /* GL_MODELVIEW0_ARB */
-   { 20450, 0x0000872A }, /* GL_MODELVIEW10_ARB */
-   { 20469, 0x0000872B }, /* GL_MODELVIEW11_ARB */
-   { 20488, 0x0000872C }, /* GL_MODELVIEW12_ARB */
-   { 20507, 0x0000872D }, /* GL_MODELVIEW13_ARB */
-   { 20526, 0x0000872E }, /* GL_MODELVIEW14_ARB */
-   { 20545, 0x0000872F }, /* GL_MODELVIEW15_ARB */
-   { 20564, 0x00008730 }, /* GL_MODELVIEW16_ARB */
-   { 20583, 0x00008731 }, /* GL_MODELVIEW17_ARB */
-   { 20602, 0x00008732 }, /* GL_MODELVIEW18_ARB */
-   { 20621, 0x00008733 }, /* GL_MODELVIEW19_ARB */
-   { 20640, 0x0000850A }, /* GL_MODELVIEW1_ARB */
-   { 20658, 0x00008734 }, /* GL_MODELVIEW20_ARB */
-   { 20677, 0x00008735 }, /* GL_MODELVIEW21_ARB */
-   { 20696, 0x00008736 }, /* GL_MODELVIEW22_ARB */
-   { 20715, 0x00008737 }, /* GL_MODELVIEW23_ARB */
-   { 20734, 0x00008738 }, /* GL_MODELVIEW24_ARB */
-   { 20753, 0x00008739 }, /* GL_MODELVIEW25_ARB */
-   { 20772, 0x0000873A }, /* GL_MODELVIEW26_ARB */
-   { 20791, 0x0000873B }, /* GL_MODELVIEW27_ARB */
-   { 20810, 0x0000873C }, /* GL_MODELVIEW28_ARB */
-   { 20829, 0x0000873D }, /* GL_MODELVIEW29_ARB */
-   { 20848, 0x00008722 }, /* GL_MODELVIEW2_ARB */
-   { 20866, 0x0000873E }, /* GL_MODELVIEW30_ARB */
-   { 20885, 0x0000873F }, /* GL_MODELVIEW31_ARB */
-   { 20904, 0x00008723 }, /* GL_MODELVIEW3_ARB */
-   { 20922, 0x00008724 }, /* GL_MODELVIEW4_ARB */
-   { 20940, 0x00008725 }, /* GL_MODELVIEW5_ARB */
-   { 20958, 0x00008726 }, /* GL_MODELVIEW6_ARB */
-   { 20976, 0x00008727 }, /* GL_MODELVIEW7_ARB */
-   { 20994, 0x00008728 }, /* GL_MODELVIEW8_ARB */
-   { 21012, 0x00008729 }, /* GL_MODELVIEW9_ARB */
-   { 21030, 0x00000BA6 }, /* GL_MODELVIEW_MATRIX */
-   { 21050, 0x00008629 }, /* GL_MODELVIEW_PROJECTION_NV */
-   { 21077, 0x00000BA3 }, /* GL_MODELVIEW_STACK_DEPTH */
-   { 21102, 0x00002100 }, /* GL_MODULATE */
-   { 21114, 0x00008744 }, /* GL_MODULATE_ADD_ATI */
-   { 21134, 0x00008745 }, /* GL_MODULATE_SIGNED_ADD_ATI */
-   { 21161, 0x00008746 }, /* GL_MODULATE_SUBTRACT_ATI */
-   { 21186, 0x00000103 }, /* GL_MULT */
-   { 21194, 0x0000809D }, /* GL_MULTISAMPLE */
-   { 21209, 0x000086B2 }, /* GL_MULTISAMPLE_3DFX */
-   { 21229, 0x0000809D }, /* GL_MULTISAMPLE_ARB */
-   { 21248, 0x20000000 }, /* GL_MULTISAMPLE_BIT */
-   { 21267, 0x20000000 }, /* GL_MULTISAMPLE_BIT_3DFX */
-   { 21291, 0x20000000 }, /* GL_MULTISAMPLE_BIT_ARB */
-   { 21314, 0x00008534 }, /* GL_MULTISAMPLE_FILTER_HINT_NV */
-   { 21344, 0x00002A25 }, /* GL_N3F_V3F */
-   { 21355, 0x00000D70 }, /* GL_NAME_STACK_DEPTH */
-   { 21375, 0x0000150E }, /* GL_NAND */
-   { 21383, 0x00002600 }, /* GL_NEAREST */
-   { 21394, 0x0000844E }, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
-   { 21425, 0x0000844D }, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
-   { 21457, 0x00002702 }, /* GL_NEAREST_MIPMAP_LINEAR */
-   { 21482, 0x00002700 }, /* GL_NEAREST_MIPMAP_NEAREST */
-   { 21508, 0x00000200 }, /* GL_NEVER */
-   { 21517, 0x00001102 }, /* GL_NICEST */
-   { 21527, 0x00000000 }, /* GL_NONE */
-   { 21535, 0x00001505 }, /* GL_NOOP */
-   { 21543, 0x00001508 }, /* GL_NOR */
-   { 21550, 0x00000BA1 }, /* GL_NORMALIZE */
-   { 21563, 0x00008075 }, /* GL_NORMAL_ARRAY */
-   { 21579, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
-   { 21610, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING_ARB */
-   { 21645, 0x0000808F }, /* GL_NORMAL_ARRAY_POINTER */
-   { 21669, 0x0000807F }, /* GL_NORMAL_ARRAY_STRIDE */
-   { 21692, 0x0000807E }, /* GL_NORMAL_ARRAY_TYPE */
-   { 21713, 0x00008511 }, /* GL_NORMAL_MAP */
-   { 21727, 0x00008511 }, /* GL_NORMAL_MAP_ARB */
-   { 21745, 0x00008511 }, /* GL_NORMAL_MAP_NV */
-   { 21762, 0x00000205 }, /* GL_NOTEQUAL */
-   { 21774, 0x00000000 }, /* GL_NO_ERROR */
-   { 21786, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
-   { 21820, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB */
-   { 21858, 0x00008B89 }, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */
-   { 21890, 0x00008B8A }, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */
-   { 21932, 0x00008B86 }, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */
-   { 21962, 0x00008B87 }, /* GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB */
-   { 22002, 0x00008B85 }, /* GL_OBJECT_ATTACHED_OBJECTS_ARB */
-   { 22033, 0x00008B81 }, /* GL_OBJECT_COMPILE_STATUS_ARB */
-   { 22062, 0x00008B80 }, /* GL_OBJECT_DELETE_STATUS_ARB */
-   { 22090, 0x00008B84 }, /* GL_OBJECT_INFO_LOG_LENGTH_ARB */
-   { 22120, 0x00002401 }, /* GL_OBJECT_LINEAR */
-   { 22137, 0x00008B82 }, /* GL_OBJECT_LINK_STATUS_ARB */
-   { 22163, 0x00002501 }, /* GL_OBJECT_PLANE */
-   { 22179, 0x00008B88 }, /* GL_OBJECT_SHADER_SOURCE_LENGTH_ARB */
-   { 22214, 0x00008B4F }, /* GL_OBJECT_SUBTYPE_ARB */
-   { 22236, 0x00009112 }, /* GL_OBJECT_TYPE */
-   { 22251, 0x00008B4E }, /* GL_OBJECT_TYPE_ARB */
-   { 22270, 0x00008B83 }, /* GL_OBJECT_VALIDATE_STATUS_ARB */
-   { 22300, 0x00008165 }, /* GL_OCCLUSION_TEST_HP */
-   { 22321, 0x00008166 }, /* GL_OCCLUSION_TEST_RESULT_HP */
-   { 22349, 0x00000001 }, /* GL_ONE */
-   { 22356, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA */
-   { 22384, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA_EXT */
-   { 22416, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR */
-   { 22444, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR_EXT */
-   { 22476, 0x00000305 }, /* GL_ONE_MINUS_DST_ALPHA */
-   { 22499, 0x00000307 }, /* GL_ONE_MINUS_DST_COLOR */
-   { 22522, 0x00000303 }, /* GL_ONE_MINUS_SRC_ALPHA */
-   { 22545, 0x00000301 }, /* GL_ONE_MINUS_SRC_COLOR */
-   { 22568, 0x00008598 }, /* GL_OPERAND0_ALPHA */
-   { 22586, 0x00008598 }, /* GL_OPERAND0_ALPHA_ARB */
-   { 22608, 0x00008598 }, /* GL_OPERAND0_ALPHA_EXT */
-   { 22630, 0x00008590 }, /* GL_OPERAND0_RGB */
-   { 22646, 0x00008590 }, /* GL_OPERAND0_RGB_ARB */
-   { 22666, 0x00008590 }, /* GL_OPERAND0_RGB_EXT */
-   { 22686, 0x00008599 }, /* GL_OPERAND1_ALPHA */
-   { 22704, 0x00008599 }, /* GL_OPERAND1_ALPHA_ARB */
-   { 22726, 0x00008599 }, /* GL_OPERAND1_ALPHA_EXT */
-   { 22748, 0x00008591 }, /* GL_OPERAND1_RGB */
-   { 22764, 0x00008591 }, /* GL_OPERAND1_RGB_ARB */
-   { 22784, 0x00008591 }, /* GL_OPERAND1_RGB_EXT */
-   { 22804, 0x0000859A }, /* GL_OPERAND2_ALPHA */
-   { 22822, 0x0000859A }, /* GL_OPERAND2_ALPHA_ARB */
-   { 22844, 0x0000859A }, /* GL_OPERAND2_ALPHA_EXT */
-   { 22866, 0x00008592 }, /* GL_OPERAND2_RGB */
-   { 22882, 0x00008592 }, /* GL_OPERAND2_RGB_ARB */
-   { 22902, 0x00008592 }, /* GL_OPERAND2_RGB_EXT */
-   { 22922, 0x0000859B }, /* GL_OPERAND3_ALPHA_NV */
-   { 22943, 0x00008593 }, /* GL_OPERAND3_RGB_NV */
-   { 22962, 0x00001507 }, /* GL_OR */
-   { 22968, 0x00000A01 }, /* GL_ORDER */
-   { 22977, 0x0000150D }, /* GL_OR_INVERTED */
-   { 22992, 0x0000150B }, /* GL_OR_REVERSE */
-   { 23006, 0x00000505 }, /* GL_OUT_OF_MEMORY */
-   { 23023, 0x00000D05 }, /* GL_PACK_ALIGNMENT */
-   { 23041, 0x0000806C }, /* GL_PACK_IMAGE_HEIGHT */
-   { 23062, 0x00008758 }, /* GL_PACK_INVERT_MESA */
-   { 23082, 0x00000D01 }, /* GL_PACK_LSB_FIRST */
-   { 23100, 0x00000D02 }, /* GL_PACK_ROW_LENGTH */
-   { 23119, 0x0000806B }, /* GL_PACK_SKIP_IMAGES */
-   { 23139, 0x00000D04 }, /* GL_PACK_SKIP_PIXELS */
-   { 23159, 0x00000D03 }, /* GL_PACK_SKIP_ROWS */
-   { 23177, 0x00000D00 }, /* GL_PACK_SWAP_BYTES */
-   { 23196, 0x00008B92 }, /* GL_PALETTE4_R5_G6_B5_OES */
-   { 23221, 0x00008B94 }, /* GL_PALETTE4_RGB5_A1_OES */
-   { 23245, 0x00008B90 }, /* GL_PALETTE4_RGB8_OES */
-   { 23266, 0x00008B93 }, /* GL_PALETTE4_RGBA4_OES */
-   { 23288, 0x00008B91 }, /* GL_PALETTE4_RGBA8_OES */
-   { 23310, 0x00008B97 }, /* GL_PALETTE8_R5_G6_B5_OES */
-   { 23335, 0x00008B99 }, /* GL_PALETTE8_RGB5_A1_OES */
-   { 23359, 0x00008B95 }, /* GL_PALETTE8_RGB8_OES */
-   { 23380, 0x00008B98 }, /* GL_PALETTE8_RGBA4_OES */
-   { 23402, 0x00008B96 }, /* GL_PALETTE8_RGBA8_OES */
-   { 23424, 0x00000700 }, /* GL_PASS_THROUGH_TOKEN */
-   { 23446, 0x00000C50 }, /* GL_PERSPECTIVE_CORRECTION_HINT */
-   { 23477, 0x00000C79 }, /* GL_PIXEL_MAP_A_TO_A */
-   { 23497, 0x00000CB9 }, /* GL_PIXEL_MAP_A_TO_A_SIZE */
-   { 23522, 0x00000C78 }, /* GL_PIXEL_MAP_B_TO_B */
-   { 23542, 0x00000CB8 }, /* GL_PIXEL_MAP_B_TO_B_SIZE */
-   { 23567, 0x00000C77 }, /* GL_PIXEL_MAP_G_TO_G */
-   { 23587, 0x00000CB7 }, /* GL_PIXEL_MAP_G_TO_G_SIZE */
-   { 23612, 0x00000C75 }, /* GL_PIXEL_MAP_I_TO_A */
-   { 23632, 0x00000CB5 }, /* GL_PIXEL_MAP_I_TO_A_SIZE */
-   { 23657, 0x00000C74 }, /* GL_PIXEL_MAP_I_TO_B */
-   { 23677, 0x00000CB4 }, /* GL_PIXEL_MAP_I_TO_B_SIZE */
-   { 23702, 0x00000C73 }, /* GL_PIXEL_MAP_I_TO_G */
-   { 23722, 0x00000CB3 }, /* GL_PIXEL_MAP_I_TO_G_SIZE */
-   { 23747, 0x00000C70 }, /* GL_PIXEL_MAP_I_TO_I */
-   { 23767, 0x00000CB0 }, /* GL_PIXEL_MAP_I_TO_I_SIZE */
-   { 23792, 0x00000C72 }, /* GL_PIXEL_MAP_I_TO_R */
-   { 23812, 0x00000CB2 }, /* GL_PIXEL_MAP_I_TO_R_SIZE */
-   { 23837, 0x00000C76 }, /* GL_PIXEL_MAP_R_TO_R */
-   { 23857, 0x00000CB6 }, /* GL_PIXEL_MAP_R_TO_R_SIZE */
-   { 23882, 0x00000C71 }, /* GL_PIXEL_MAP_S_TO_S */
-   { 23902, 0x00000CB1 }, /* GL_PIXEL_MAP_S_TO_S_SIZE */
-   { 23927, 0x00000020 }, /* GL_PIXEL_MODE_BIT */
-   { 23945, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER */
-   { 23966, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING */
-   { 23995, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING_EXT */
-   { 24028, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER_EXT */
-   { 24053, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER */
-   { 24076, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
-   { 24107, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING_EXT */
-   { 24142, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER_EXT */
-   { 24169, 0x00001B00 }, /* GL_POINT */
-   { 24178, 0x00000000 }, /* GL_POINTS */
-   { 24188, 0x00000002 }, /* GL_POINT_BIT */
-   { 24201, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION */
-   { 24231, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_ARB */
-   { 24265, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_EXT */
-   { 24299, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_SGIS */
-   { 24334, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE */
-   { 24363, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_ARB */
-   { 24396, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_EXT */
-   { 24429, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_SGIS */
-   { 24463, 0x00000B11 }, /* GL_POINT_SIZE */
-   { 24477, 0x00000B13 }, /* GL_POINT_SIZE_GRANULARITY */
-   { 24503, 0x00008127 }, /* GL_POINT_SIZE_MAX */
-   { 24521, 0x00008127 }, /* GL_POINT_SIZE_MAX_ARB */
-   { 24543, 0x00008127 }, /* GL_POINT_SIZE_MAX_EXT */
-   { 24565, 0x00008127 }, /* GL_POINT_SIZE_MAX_SGIS */
-   { 24588, 0x00008126 }, /* GL_POINT_SIZE_MIN */
-   { 24606, 0x00008126 }, /* GL_POINT_SIZE_MIN_ARB */
-   { 24628, 0x00008126 }, /* GL_POINT_SIZE_MIN_EXT */
-   { 24650, 0x00008126 }, /* GL_POINT_SIZE_MIN_SGIS */
-   { 24673, 0x00000B12 }, /* GL_POINT_SIZE_RANGE */
-   { 24693, 0x00000B10 }, /* GL_POINT_SMOOTH */
-   { 24709, 0x00000C51 }, /* GL_POINT_SMOOTH_HINT */
-   { 24730, 0x00008861 }, /* GL_POINT_SPRITE */
-   { 24746, 0x00008861 }, /* GL_POINT_SPRITE_ARB */
-   { 24766, 0x00008CA0 }, /* GL_POINT_SPRITE_COORD_ORIGIN */
-   { 24795, 0x00008861 }, /* GL_POINT_SPRITE_NV */
-   { 24814, 0x00008863 }, /* GL_POINT_SPRITE_R_MODE_NV */
-   { 24840, 0x00000701 }, /* GL_POINT_TOKEN */
-   { 24855, 0x00000009 }, /* GL_POLYGON */
-   { 24866, 0x00000008 }, /* GL_POLYGON_BIT */
-   { 24881, 0x00000B40 }, /* GL_POLYGON_MODE */
-   { 24897, 0x00008039 }, /* GL_POLYGON_OFFSET_BIAS */
-   { 24920, 0x00008038 }, /* GL_POLYGON_OFFSET_FACTOR */
-   { 24945, 0x00008037 }, /* GL_POLYGON_OFFSET_FILL */
-   { 24968, 0x00002A02 }, /* GL_POLYGON_OFFSET_LINE */
-   { 24991, 0x00002A01 }, /* GL_POLYGON_OFFSET_POINT */
-   { 25015, 0x00002A00 }, /* GL_POLYGON_OFFSET_UNITS */
-   { 25039, 0x00000B41 }, /* GL_POLYGON_SMOOTH */
-   { 25057, 0x00000C53 }, /* GL_POLYGON_SMOOTH_HINT */
-   { 25080, 0x00000B42 }, /* GL_POLYGON_STIPPLE */
-   { 25099, 0x00000010 }, /* GL_POLYGON_STIPPLE_BIT */
-   { 25122, 0x00000703 }, /* GL_POLYGON_TOKEN */
-   { 25139, 0x00001203 }, /* GL_POSITION */
-   { 25151, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
-   { 25183, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI */
-   { 25219, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
-   { 25252, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI */
-   { 25289, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
-   { 25320, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI */
-   { 25355, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
-   { 25387, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI */
-   { 25423, 0x000080D2 }, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
-   { 25456, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
-   { 25488, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI */
-   { 25524, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
-   { 25557, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI */
-   { 25594, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS */
-   { 25624, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS_SGI */
-   { 25658, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE */
-   { 25689, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE_SGI */
-   { 25724, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
-   { 25755, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS_EXT */
-   { 25790, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
-   { 25822, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE_EXT */
-   { 25858, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS */
-   { 25888, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS_EXT */
-   { 25922, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE */
-   { 25953, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE_EXT */
-   { 25988, 0x000080D1 }, /* GL_POST_CONVOLUTION_COLOR_TABLE */
-   { 26020, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS */
-   { 26051, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS_EXT */
-   { 26086, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE */
-   { 26118, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE_EXT */
-   { 26154, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS */
-   { 26183, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS_EXT */
-   { 26216, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE */
-   { 26246, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE_EXT */
-   { 26280, 0x0000817B }, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
-   { 26319, 0x00008179 }, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
-   { 26352, 0x0000817C }, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
-   { 26392, 0x0000817A }, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
-   { 26426, 0x00008578 }, /* GL_PREVIOUS */
-   { 26438, 0x00008578 }, /* GL_PREVIOUS_ARB */
-   { 26454, 0x00008578 }, /* GL_PREVIOUS_EXT */
-   { 26470, 0x00008577 }, /* GL_PRIMARY_COLOR */
-   { 26487, 0x00008577 }, /* GL_PRIMARY_COLOR_ARB */
-   { 26508, 0x00008577 }, /* GL_PRIMARY_COLOR_EXT */
-   { 26529, 0x000088B0 }, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
-   { 26562, 0x00008805 }, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
-   { 26594, 0x000088AC }, /* GL_PROGRAM_ATTRIBS_ARB */
-   { 26617, 0x00008677 }, /* GL_PROGRAM_BINDING_ARB */
-   { 26640, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_ARB */
-   { 26670, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_NV */
-   { 26699, 0x00008874 }, /* GL_PROGRAM_ERROR_STRING_ARB */
-   { 26727, 0x00008876 }, /* GL_PROGRAM_FORMAT_ARB */
-   { 26749, 0x00008875 }, /* GL_PROGRAM_FORMAT_ASCII_ARB */
-   { 26777, 0x000088A0 }, /* GL_PROGRAM_INSTRUCTIONS_ARB */
-   { 26805, 0x00008627 }, /* GL_PROGRAM_LENGTH_ARB */
-   { 26827, 0x00008627 }, /* GL_PROGRAM_LENGTH_NV */
-   { 26848, 0x000088B2 }, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-   { 26888, 0x00008808 }, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-   { 26927, 0x000088AE }, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
-   { 26957, 0x000088A2 }, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-   { 26992, 0x000088AA }, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
-   { 27025, 0x000088A6 }, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
-   { 27059, 0x0000880A }, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-   { 27098, 0x00008809 }, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-   { 27137, 0x00008B40 }, /* GL_PROGRAM_OBJECT_ARB */
-   { 27159, 0x000088A8 }, /* GL_PROGRAM_PARAMETERS_ARB */
-   { 27185, 0x00008644 }, /* GL_PROGRAM_PARAMETER_NV */
-   { 27209, 0x00008647 }, /* GL_PROGRAM_RESIDENT_NV */
-   { 27232, 0x00008628 }, /* GL_PROGRAM_STRING_ARB */
-   { 27254, 0x00008628 }, /* GL_PROGRAM_STRING_NV */
-   { 27275, 0x00008646 }, /* GL_PROGRAM_TARGET_NV */
-   { 27296, 0x000088A4 }, /* GL_PROGRAM_TEMPORARIES_ARB */
-   { 27323, 0x00008807 }, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
-   { 27355, 0x00008806 }, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
-   { 27387, 0x000088B6 }, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-   { 27422, 0x00001701 }, /* GL_PROJECTION */
-   { 27436, 0x00000BA7 }, /* GL_PROJECTION_MATRIX */
-   { 27457, 0x00000BA4 }, /* GL_PROJECTION_STACK_DEPTH */
-   { 27483, 0x00008E4F }, /* GL_PROVOKING_VERTEX_EXT */
-   { 27507, 0x000080D3 }, /* GL_PROXY_COLOR_TABLE */
-   { 27528, 0x00008025 }, /* GL_PROXY_HISTOGRAM */
-   { 27547, 0x00008025 }, /* GL_PROXY_HISTOGRAM_EXT */
-   { 27570, 0x000080D5 }, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
-   { 27609, 0x000080D4 }, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
-   { 27647, 0x00008063 }, /* GL_PROXY_TEXTURE_1D */
-   { 27667, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
-   { 27697, 0x00008063 }, /* GL_PROXY_TEXTURE_1D_EXT */
-   { 27721, 0x00008064 }, /* GL_PROXY_TEXTURE_2D */
-   { 27741, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
-   { 27771, 0x00008064 }, /* GL_PROXY_TEXTURE_2D_EXT */
-   { 27795, 0x00008070 }, /* GL_PROXY_TEXTURE_3D */
-   { 27815, 0x000080BD }, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
-   { 27848, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP */
-   { 27874, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP_ARB */
-   { 27904, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
-   { 27935, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_NV */
-   { 27965, 0x00002003 }, /* GL_Q */
-   { 27970, 0x00001209 }, /* GL_QUADRATIC_ATTENUATION */
-   { 27995, 0x00000007 }, /* GL_QUADS */
-   { 28004, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT */
-   { 28052, 0x00008614 }, /* GL_QUAD_MESH_SUN */
-   { 28069, 0x00000008 }, /* GL_QUAD_STRIP */
-   { 28083, 0x00008864 }, /* GL_QUERY_COUNTER_BITS */
-   { 28105, 0x00008864 }, /* GL_QUERY_COUNTER_BITS_ARB */
-   { 28131, 0x00008866 }, /* GL_QUERY_RESULT */
-   { 28147, 0x00008866 }, /* GL_QUERY_RESULT_ARB */
-   { 28167, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE */
-   { 28193, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE_ARB */
-   { 28223, 0x00002002 }, /* GL_R */
-   { 28228, 0x00002A10 }, /* GL_R3_G3_B2 */
-   { 28240, 0x00019262 }, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
-   { 28273, 0x00000C02 }, /* GL_READ_BUFFER */
-   { 28288, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER */
-   { 28308, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
-   { 28340, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER_EXT */
-   { 28364, 0x000088B8 }, /* GL_READ_ONLY */
-   { 28377, 0x000088B8 }, /* GL_READ_ONLY_ARB */
-   { 28394, 0x000088BA }, /* GL_READ_WRITE */
-   { 28408, 0x000088BA }, /* GL_READ_WRITE_ARB */
-   { 28426, 0x00001903 }, /* GL_RED */
-   { 28433, 0x00008016 }, /* GL_REDUCE */
-   { 28443, 0x00008016 }, /* GL_REDUCE_EXT */
-   { 28457, 0x00000D15 }, /* GL_RED_BIAS */
-   { 28469, 0x00000D52 }, /* GL_RED_BITS */
-   { 28481, 0x00000D14 }, /* GL_RED_SCALE */
-   { 28494, 0x00008512 }, /* GL_REFLECTION_MAP */
-   { 28512, 0x00008512 }, /* GL_REFLECTION_MAP_ARB */
-   { 28534, 0x00008512 }, /* GL_REFLECTION_MAP_NV */
-   { 28555, 0x00001C00 }, /* GL_RENDER */
-   { 28565, 0x00008D41 }, /* GL_RENDERBUFFER */
-   { 28581, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE */
-   { 28608, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_EXT */
-   { 28636, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE */
-   { 28662, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE */
-   { 28689, 0x00008D41 }, /* GL_RENDERBUFFER_EXT */
-   { 28709, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE */
-   { 28736, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT */
-   { 28759, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_EXT */
-   { 28786, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
-   { 28818, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */
-   { 28854, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE */
-   { 28879, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES */
-   { 28903, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE */
-   { 28932, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH */
-   { 28954, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_EXT */
-   { 28980, 0x00001F01 }, /* GL_RENDERER */
-   { 28992, 0x00000C40 }, /* GL_RENDER_MODE */
-   { 29007, 0x00002901 }, /* GL_REPEAT */
-   { 29017, 0x00001E01 }, /* GL_REPLACE */
-   { 29028, 0x00008062 }, /* GL_REPLACE_EXT */
-   { 29043, 0x00008153 }, /* GL_REPLICATE_BORDER_HP */
-   { 29066, 0x0000803A }, /* GL_RESCALE_NORMAL */
-   { 29084, 0x0000803A }, /* GL_RESCALE_NORMAL_EXT */
-   { 29106, 0x00000102 }, /* GL_RETURN */
-   { 29116, 0x00001907 }, /* GL_RGB */
-   { 29123, 0x00008052 }, /* GL_RGB10 */
-   { 29132, 0x00008059 }, /* GL_RGB10_A2 */
-   { 29144, 0x00008059 }, /* GL_RGB10_A2_EXT */
-   { 29160, 0x00008052 }, /* GL_RGB10_EXT */
-   { 29173, 0x00008053 }, /* GL_RGB12 */
-   { 29182, 0x00008053 }, /* GL_RGB12_EXT */
-   { 29195, 0x00008054 }, /* GL_RGB16 */
-   { 29204, 0x00008054 }, /* GL_RGB16_EXT */
-   { 29217, 0x0000804E }, /* GL_RGB2_EXT */
-   { 29229, 0x0000804F }, /* GL_RGB4 */
-   { 29237, 0x0000804F }, /* GL_RGB4_EXT */
-   { 29249, 0x000083A1 }, /* GL_RGB4_S3TC */
-   { 29262, 0x00008050 }, /* GL_RGB5 */
-   { 29270, 0x00008057 }, /* GL_RGB5_A1 */
-   { 29281, 0x00008057 }, /* GL_RGB5_A1_EXT */
-   { 29296, 0x00008050 }, /* GL_RGB5_EXT */
-   { 29308, 0x00008051 }, /* GL_RGB8 */
-   { 29316, 0x00008051 }, /* GL_RGB8_EXT */
-   { 29328, 0x00001908 }, /* GL_RGBA */
-   { 29336, 0x0000805A }, /* GL_RGBA12 */
-   { 29346, 0x0000805A }, /* GL_RGBA12_EXT */
-   { 29360, 0x0000805B }, /* GL_RGBA16 */
-   { 29370, 0x0000805B }, /* GL_RGBA16_EXT */
-   { 29384, 0x00008055 }, /* GL_RGBA2 */
-   { 29393, 0x00008055 }, /* GL_RGBA2_EXT */
-   { 29406, 0x00008056 }, /* GL_RGBA4 */
-   { 29415, 0x000083A5 }, /* GL_RGBA4_DXT5_S3TC */
-   { 29434, 0x00008056 }, /* GL_RGBA4_EXT */
-   { 29447, 0x000083A3 }, /* GL_RGBA4_S3TC */
-   { 29461, 0x00008058 }, /* GL_RGBA8 */
-   { 29470, 0x00008058 }, /* GL_RGBA8_EXT */
-   { 29483, 0x00008F97 }, /* GL_RGBA8_SNORM */
-   { 29498, 0x000083A4 }, /* GL_RGBA_DXT5_S3TC */
-   { 29516, 0x00000C31 }, /* GL_RGBA_MODE */
-   { 29529, 0x000083A2 }, /* GL_RGBA_S3TC */
-   { 29542, 0x00008F93 }, /* GL_RGBA_SNORM */
-   { 29556, 0x000083A0 }, /* GL_RGB_S3TC */
-   { 29568, 0x00008573 }, /* GL_RGB_SCALE */
-   { 29581, 0x00008573 }, /* GL_RGB_SCALE_ARB */
-   { 29598, 0x00008573 }, /* GL_RGB_SCALE_EXT */
-   { 29615, 0x00000407 }, /* GL_RIGHT */
-   { 29624, 0x00002000 }, /* GL_S */
-   { 29629, 0x00008B5D }, /* GL_SAMPLER_1D */
-   { 29643, 0x00008B61 }, /* GL_SAMPLER_1D_SHADOW */
-   { 29664, 0x00008B5E }, /* GL_SAMPLER_2D */
-   { 29678, 0x00008B62 }, /* GL_SAMPLER_2D_SHADOW */
-   { 29699, 0x00008B5F }, /* GL_SAMPLER_3D */
-   { 29713, 0x00008B60 }, /* GL_SAMPLER_CUBE */
-   { 29729, 0x000080A9 }, /* GL_SAMPLES */
-   { 29740, 0x000086B4 }, /* GL_SAMPLES_3DFX */
-   { 29756, 0x000080A9 }, /* GL_SAMPLES_ARB */
-   { 29771, 0x00008914 }, /* GL_SAMPLES_PASSED */
-   { 29789, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */
-   { 29811, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
-   { 29839, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */
-   { 29871, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */
-   { 29894, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */
-   { 29921, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */
-   { 29939, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */
-   { 29962, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */
-   { 29984, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */
-   { 30003, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */
-   { 30026, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */
-   { 30052, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */
-   { 30082, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */
-   { 30107, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */
-   { 30136, 0x00080000 }, /* GL_SCISSOR_BIT */
-   { 30151, 0x00000C10 }, /* GL_SCISSOR_BOX */
-   { 30166, 0x00000C11 }, /* GL_SCISSOR_TEST */
-   { 30182, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */
-   { 30207, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
-   { 30247, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */
-   { 30291, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
-   { 30324, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
-   { 30354, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
-   { 30386, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
-   { 30416, 0x00001C02 }, /* GL_SELECT */
-   { 30426, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */
-   { 30454, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */
-   { 30479, 0x00008012 }, /* GL_SEPARABLE_2D */
-   { 30495, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */
-   { 30522, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */
-   { 30553, 0x0000150F }, /* GL_SET */
-   { 30560, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */
-   { 30581, 0x00008B88 }, /* GL_SHADER_SOURCE_LENGTH */
-   { 30605, 0x00008B4F }, /* GL_SHADER_TYPE */
-   { 30620, 0x00000B54 }, /* GL_SHADE_MODEL */
-   { 30635, 0x00008B8C }, /* GL_SHADING_LANGUAGE_VERSION */
-   { 30663, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */
-   { 30686, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */
-   { 30716, 0x00001601 }, /* GL_SHININESS */
-   { 30729, 0x00001402 }, /* GL_SHORT */
-   { 30738, 0x00009119 }, /* GL_SIGNALED */
-   { 30750, 0x00008F9C }, /* GL_SIGNED_NORMALIZED */
-   { 30771, 0x000081F9 }, /* GL_SINGLE_COLOR */
-   { 30787, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */
-   { 30807, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */
-   { 30826, 0x00008C46 }, /* GL_SLUMINANCE */
-   { 30840, 0x00008C47 }, /* GL_SLUMINANCE8 */
-   { 30855, 0x00008C45 }, /* GL_SLUMINANCE8_ALPHA8 */
-   { 30877, 0x00008C44 }, /* GL_SLUMINANCE_ALPHA */
-   { 30897, 0x00001D01 }, /* GL_SMOOTH */
-   { 30907, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */
-   { 30940, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */
-   { 30967, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */
-   { 31000, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */
-   { 31027, 0x00008588 }, /* GL_SOURCE0_ALPHA */
-   { 31044, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */
-   { 31065, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */
-   { 31086, 0x00008580 }, /* GL_SOURCE0_RGB */
-   { 31101, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */
-   { 31120, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */
-   { 31139, 0x00008589 }, /* GL_SOURCE1_ALPHA */
-   { 31156, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */
-   { 31177, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */
-   { 31198, 0x00008581 }, /* GL_SOURCE1_RGB */
-   { 31213, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */
-   { 31232, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */
-   { 31251, 0x0000858A }, /* GL_SOURCE2_ALPHA */
-   { 31268, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */
-   { 31289, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */
-   { 31310, 0x00008582 }, /* GL_SOURCE2_RGB */
-   { 31325, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */
-   { 31344, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */
-   { 31363, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */
-   { 31383, 0x00008583 }, /* GL_SOURCE3_RGB_NV */
-   { 31401, 0x00001202 }, /* GL_SPECULAR */
-   { 31413, 0x00002402 }, /* GL_SPHERE_MAP */
-   { 31427, 0x00001206 }, /* GL_SPOT_CUTOFF */
-   { 31442, 0x00001204 }, /* GL_SPOT_DIRECTION */
-   { 31460, 0x00001205 }, /* GL_SPOT_EXPONENT */
-   { 31477, 0x00008588 }, /* GL_SRC0_ALPHA */
-   { 31491, 0x00008580 }, /* GL_SRC0_RGB */
-   { 31503, 0x00008589 }, /* GL_SRC1_ALPHA */
-   { 31517, 0x00008581 }, /* GL_SRC1_RGB */
-   { 31529, 0x0000858A }, /* GL_SRC2_ALPHA */
-   { 31543, 0x00008582 }, /* GL_SRC2_RGB */
-   { 31555, 0x00000302 }, /* GL_SRC_ALPHA */
-   { 31568, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */
-   { 31590, 0x00000300 }, /* GL_SRC_COLOR */
-   { 31603, 0x00008C40 }, /* GL_SRGB */
-   { 31611, 0x00008C41 }, /* GL_SRGB8 */
-   { 31620, 0x00008C43 }, /* GL_SRGB8_ALPHA8 */
-   { 31636, 0x00008C42 }, /* GL_SRGB_ALPHA */
-   { 31650, 0x00000503 }, /* GL_STACK_OVERFLOW */
-   { 31668, 0x00000504 }, /* GL_STACK_UNDERFLOW */
-   { 31687, 0x000088E6 }, /* GL_STATIC_COPY */
-   { 31702, 0x000088E6 }, /* GL_STATIC_COPY_ARB */
-   { 31721, 0x000088E4 }, /* GL_STATIC_DRAW */
-   { 31736, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */
-   { 31755, 0x000088E5 }, /* GL_STATIC_READ */
-   { 31770, 0x000088E5 }, /* GL_STATIC_READ_ARB */
-   { 31789, 0x00001802 }, /* GL_STENCIL */
-   { 31800, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT */
-   { 31822, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */
-   { 31848, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */
-   { 31869, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */
-   { 31894, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
-   { 31915, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */
-   { 31940, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-   { 31972, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */
-   { 32008, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
-   { 32040, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */
-   { 32076, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
-   { 32096, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
-   { 32123, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
-   { 32149, 0x00000D57 }, /* GL_STENCIL_BITS */
-   { 32165, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
-   { 32187, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
-   { 32210, 0x00000B94 }, /* GL_STENCIL_FAIL */
-   { 32226, 0x00000B92 }, /* GL_STENCIL_FUNC */
-   { 32242, 0x00001901 }, /* GL_STENCIL_INDEX */
-   { 32259, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
-   { 32282, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
-   { 32304, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
-   { 32326, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
-   { 32348, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
-   { 32369, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
-   { 32396, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
-   { 32423, 0x00000B97 }, /* GL_STENCIL_REF */
-   { 32438, 0x00000B90 }, /* GL_STENCIL_TEST */
-   { 32454, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
-   { 32483, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
-   { 32505, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
-   { 32526, 0x00000C33 }, /* GL_STEREO */
-   { 32536, 0x000085BE }, /* GL_STORAGE_CACHED_APPLE */
-   { 32560, 0x000085BD }, /* GL_STORAGE_PRIVATE_APPLE */
-   { 32585, 0x000085BF }, /* GL_STORAGE_SHARED_APPLE */
-   { 32609, 0x000088E2 }, /* GL_STREAM_COPY */
-   { 32624, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
-   { 32643, 0x000088E0 }, /* GL_STREAM_DRAW */
-   { 32658, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
-   { 32677, 0x000088E1 }, /* GL_STREAM_READ */
-   { 32692, 0x000088E1 }, /* GL_STREAM_READ_ARB */
-   { 32711, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
-   { 32728, 0x000084E7 }, /* GL_SUBTRACT */
-   { 32740, 0x000084E7 }, /* GL_SUBTRACT_ARB */
-   { 32756, 0x00009113 }, /* GL_SYNC_CONDITION */
-   { 32774, 0x00009116 }, /* GL_SYNC_FENCE */
-   { 32788, 0x00009115 }, /* GL_SYNC_FLAGS */
-   { 32802, 0x00000001 }, /* GL_SYNC_FLUSH_COMMANDS_BIT */
-   { 32829, 0x00009117 }, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
-   { 32859, 0x00009114 }, /* GL_SYNC_STATUS */
-   { 32874, 0x00002001 }, /* GL_T */
-   { 32879, 0x00002A2A }, /* GL_T2F_C3F_V3F */
-   { 32894, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
-   { 32913, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
-   { 32929, 0x00002A2B }, /* GL_T2F_N3F_V3F */
-   { 32944, 0x00002A27 }, /* GL_T2F_V3F */
-   { 32955, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
-   { 32974, 0x00002A28 }, /* GL_T4F_V4F */
-   { 32985, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
-   { 33008, 0x00001702 }, /* GL_TEXTURE */
-   { 33019, 0x000084C0 }, /* GL_TEXTURE0 */
-   { 33031, 0x000084C0 }, /* GL_TEXTURE0_ARB */
-   { 33047, 0x000084C1 }, /* GL_TEXTURE1 */
-   { 33059, 0x000084CA }, /* GL_TEXTURE10 */
-   { 33072, 0x000084CA }, /* GL_TEXTURE10_ARB */
-   { 33089, 0x000084CB }, /* GL_TEXTURE11 */
-   { 33102, 0x000084CB }, /* GL_TEXTURE11_ARB */
-   { 33119, 0x000084CC }, /* GL_TEXTURE12 */
-   { 33132, 0x000084CC }, /* GL_TEXTURE12_ARB */
-   { 33149, 0x000084CD }, /* GL_TEXTURE13 */
-   { 33162, 0x000084CD }, /* GL_TEXTURE13_ARB */
-   { 33179, 0x000084CE }, /* GL_TEXTURE14 */
-   { 33192, 0x000084CE }, /* GL_TEXTURE14_ARB */
-   { 33209, 0x000084CF }, /* GL_TEXTURE15 */
-   { 33222, 0x000084CF }, /* GL_TEXTURE15_ARB */
-   { 33239, 0x000084D0 }, /* GL_TEXTURE16 */
-   { 33252, 0x000084D0 }, /* GL_TEXTURE16_ARB */
-   { 33269, 0x000084D1 }, /* GL_TEXTURE17 */
-   { 33282, 0x000084D1 }, /* GL_TEXTURE17_ARB */
-   { 33299, 0x000084D2 }, /* GL_TEXTURE18 */
-   { 33312, 0x000084D2 }, /* GL_TEXTURE18_ARB */
-   { 33329, 0x000084D3 }, /* GL_TEXTURE19 */
-   { 33342, 0x000084D3 }, /* GL_TEXTURE19_ARB */
-   { 33359, 0x000084C1 }, /* GL_TEXTURE1_ARB */
-   { 33375, 0x000084C2 }, /* GL_TEXTURE2 */
-   { 33387, 0x000084D4 }, /* GL_TEXTURE20 */
-   { 33400, 0x000084D4 }, /* GL_TEXTURE20_ARB */
-   { 33417, 0x000084D5 }, /* GL_TEXTURE21 */
-   { 33430, 0x000084D5 }, /* GL_TEXTURE21_ARB */
-   { 33447, 0x000084D6 }, /* GL_TEXTURE22 */
-   { 33460, 0x000084D6 }, /* GL_TEXTURE22_ARB */
-   { 33477, 0x000084D7 }, /* GL_TEXTURE23 */
-   { 33490, 0x000084D7 }, /* GL_TEXTURE23_ARB */
-   { 33507, 0x000084D8 }, /* GL_TEXTURE24 */
-   { 33520, 0x000084D8 }, /* GL_TEXTURE24_ARB */
-   { 33537, 0x000084D9 }, /* GL_TEXTURE25 */
-   { 33550, 0x000084D9 }, /* GL_TEXTURE25_ARB */
-   { 33567, 0x000084DA }, /* GL_TEXTURE26 */
-   { 33580, 0x000084DA }, /* GL_TEXTURE26_ARB */
-   { 33597, 0x000084DB }, /* GL_TEXTURE27 */
-   { 33610, 0x000084DB }, /* GL_TEXTURE27_ARB */
-   { 33627, 0x000084DC }, /* GL_TEXTURE28 */
-   { 33640, 0x000084DC }, /* GL_TEXTURE28_ARB */
-   { 33657, 0x000084DD }, /* GL_TEXTURE29 */
-   { 33670, 0x000084DD }, /* GL_TEXTURE29_ARB */
-   { 33687, 0x000084C2 }, /* GL_TEXTURE2_ARB */
-   { 33703, 0x000084C3 }, /* GL_TEXTURE3 */
-   { 33715, 0x000084DE }, /* GL_TEXTURE30 */
-   { 33728, 0x000084DE }, /* GL_TEXTURE30_ARB */
-   { 33745, 0x000084DF }, /* GL_TEXTURE31 */
-   { 33758, 0x000084DF }, /* GL_TEXTURE31_ARB */
-   { 33775, 0x000084C3 }, /* GL_TEXTURE3_ARB */
-   { 33791, 0x000084C4 }, /* GL_TEXTURE4 */
-   { 33803, 0x000084C4 }, /* GL_TEXTURE4_ARB */
-   { 33819, 0x000084C5 }, /* GL_TEXTURE5 */
-   { 33831, 0x000084C5 }, /* GL_TEXTURE5_ARB */
-   { 33847, 0x000084C6 }, /* GL_TEXTURE6 */
-   { 33859, 0x000084C6 }, /* GL_TEXTURE6_ARB */
-   { 33875, 0x000084C7 }, /* GL_TEXTURE7 */
-   { 33887, 0x000084C7 }, /* GL_TEXTURE7_ARB */
-   { 33903, 0x000084C8 }, /* GL_TEXTURE8 */
-   { 33915, 0x000084C8 }, /* GL_TEXTURE8_ARB */
-   { 33931, 0x000084C9 }, /* GL_TEXTURE9 */
-   { 33943, 0x000084C9 }, /* GL_TEXTURE9_ARB */
-   { 33959, 0x00000DE0 }, /* GL_TEXTURE_1D */
-   { 33973, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
-   { 33997, 0x00000DE1 }, /* GL_TEXTURE_2D */
-   { 34011, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
-   { 34035, 0x0000806F }, /* GL_TEXTURE_3D */
-   { 34049, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
-   { 34071, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
-   { 34097, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
-   { 34119, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
-   { 34141, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
-   { 34173, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
-   { 34195, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
-   { 34227, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
-   { 34249, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
-   { 34277, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
-   { 34309, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
-   { 34342, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
-   { 34374, 0x00040000 }, /* GL_TEXTURE_BIT */
-   { 34389, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
-   { 34410, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
-   { 34435, 0x00001005 }, /* GL_TEXTURE_BORDER */
-   { 34453, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
-   { 34477, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-   { 34508, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
-   { 34538, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-   { 34568, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-   { 34603, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-   { 34634, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-   { 34672, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
-   { 34699, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
-   { 34731, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
-   { 34765, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
-   { 34789, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
-   { 34817, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
-   { 34841, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
-   { 34869, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-   { 34902, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
-   { 34926, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
-   { 34948, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
-   { 34970, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
-   { 34996, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
-   { 35030, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-   { 35063, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
-   { 35100, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
-   { 35128, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
-   { 35160, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
-   { 35183, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
-   { 35221, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
-   { 35263, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
-   { 35294, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-   { 35322, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
-   { 35352, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-   { 35380, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
-   { 35400, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
-   { 35424, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-   { 35455, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
-   { 35490, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-   { 35521, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
-   { 35556, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
-   { 35587, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
-   { 35622, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-   { 35653, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
-   { 35688, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-   { 35719, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
-   { 35754, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-   { 35785, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
-   { 35820, 0x000088F4 }, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
-   { 35849, 0x00008071 }, /* GL_TEXTURE_DEPTH */
-   { 35866, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
-   { 35888, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
-   { 35914, 0x00002300 }, /* GL_TEXTURE_ENV */
-   { 35929, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
-   { 35950, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
-   { 35970, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
-   { 35996, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
-   { 36016, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
-   { 36033, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
-   { 36050, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
-   { 36067, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
-   { 36084, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
-   { 36109, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
-   { 36131, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
-   { 36157, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
-   { 36175, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
-   { 36201, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
-   { 36227, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
-   { 36257, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
-   { 36284, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
-   { 36309, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
-   { 36329, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
-   { 36353, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
-   { 36380, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-   { 36407, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-   { 36434, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
-   { 36460, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
-   { 36490, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
-   { 36512, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
-   { 36530, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
-   { 36560, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
-   { 36588, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-   { 36616, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-   { 36644, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
-   { 36665, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
-   { 36684, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
-   { 36706, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
-   { 36725, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
-   { 36745, 0x000085B7 }, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
-   { 36775, 0x000085B8 }, /* GL_TEXTURE_RANGE_POINTER_APPLE */
-   { 36806, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
-   { 36831, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
-   { 36855, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
-   { 36875, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
-   { 36899, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
-   { 36919, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
-   { 36942, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */
-   { 36966, 0x000085BC }, /* GL_TEXTURE_STORAGE_HINT_APPLE */
-   { 36996, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
-   { 37021, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
-   { 37055, 0x00001000 }, /* GL_TEXTURE_WIDTH */
-   { 37072, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
-   { 37090, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
-   { 37108, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
-   { 37126, 0x0000911B }, /* GL_TIMEOUT_EXPIRED */
-   { 37145, 0xFFFFFFFFFFFFFFFF }, /* GL_TIMEOUT_IGNORED */
-   { 37164, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
-   { 37184, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
-   { 37203, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-   { 37232, 0x00001000 }, /* GL_TRANSFORM_BIT */
-   { 37249, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
-   { 37275, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
-   { 37305, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-   { 37337, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-   { 37367, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
-   { 37401, 0x0000862C }, /* GL_TRANSPOSE_NV */
-   { 37417, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-   { 37448, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
-   { 37483, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-   { 37511, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
-   { 37543, 0x00000004 }, /* GL_TRIANGLES */
-   { 37556, 0x00000006 }, /* GL_TRIANGLE_FAN */
-   { 37572, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
-   { 37593, 0x00000005 }, /* GL_TRIANGLE_STRIP */
-   { 37611, 0x00000001 }, /* GL_TRUE */
-   { 37619, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
-   { 37639, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
-   { 37662, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
-   { 37682, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
-   { 37703, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
-   { 37725, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
-   { 37747, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
-   { 37767, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
-   { 37788, 0x00009118 }, /* GL_UNSIGNALED */
-   { 37802, 0x00001401 }, /* GL_UNSIGNED_BYTE */
-   { 37819, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-   { 37846, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
-   { 37869, 0x00001405 }, /* GL_UNSIGNED_INT */
-   { 37885, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
-   { 37912, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */
-   { 37933, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
-   { 37957, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-   { 37988, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
-   { 38012, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-   { 38040, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */
-   { 38063, 0x00001403 }, /* GL_UNSIGNED_SHORT */
-   { 38081, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-   { 38111, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-   { 38137, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-   { 38167, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-   { 38193, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
-   { 38217, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-   { 38245, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-   { 38273, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
-   { 38300, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-   { 38332, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
-   { 38363, 0x00008CA2 }, /* GL_UPPER_LEFT */
-   { 38377, 0x00002A20 }, /* GL_V2F */
-   { 38384, 0x00002A21 }, /* GL_V3F */
-   { 38391, 0x00008B83 }, /* GL_VALIDATE_STATUS */
-   { 38410, 0x00001F00 }, /* GL_VENDOR */
-   { 38420, 0x00001F02 }, /* GL_VERSION */
-   { 38431, 0x00008074 }, /* GL_VERTEX_ARRAY */
-   { 38447, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING */
-   { 38471, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
-   { 38501, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-   { 38532, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
-   { 38567, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
-   { 38591, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
-   { 38612, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
-   { 38635, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
-   { 38656, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-   { 38683, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-   { 38711, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-   { 38739, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-   { 38767, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-   { 38795, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-   { 38823, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
-   { 38851, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-   { 38878, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-   { 38905, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-   { 38932, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-   { 38959, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-   { 38986, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-   { 39013, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-   { 39040, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-   { 39067, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-   { 39094, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-   { 39132, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
-   { 39174, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-   { 39205, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
-   { 39240, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
-   { 39274, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
-   { 39312, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-   { 39343, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
-   { 39378, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-   { 39406, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
-   { 39438, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-   { 39468, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
-   { 39502, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
-   { 39530, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
-   { 39562, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
-   { 39582, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
-   { 39604, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
-   { 39633, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
-   { 39654, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-   { 39683, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
-   { 39716, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
-   { 39748, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-   { 39775, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
-   { 39806, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
-   { 39836, 0x00008B31 }, /* GL_VERTEX_SHADER */
-   { 39853, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
-   { 39874, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
-   { 39901, 0x00000BA2 }, /* GL_VIEWPORT */
-   { 39913, 0x00000800 }, /* GL_VIEWPORT_BIT */
-   { 39929, 0x0000911D }, /* GL_WAIT_FAILED */
-   { 39944, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
-   { 39964, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-   { 39995, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
-   { 40030, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-   { 40058, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-   { 40083, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-   { 40110, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-   { 40135, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
-   { 40159, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
-   { 40178, 0x000088B9 }, /* GL_WRITE_ONLY */
-   { 40192, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
-   { 40210, 0x00001506 }, /* GL_XOR */
-   { 40217, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
-   { 40236, 0x00008757 }, /* GL_YCBCR_MESA */
-   { 40250, 0x00000000 }, /* GL_ZERO */
-   { 40258, 0x00000D16 }, /* GL_ZOOM_X */
-   { 40268, 0x00000D17 }, /* GL_ZOOM_Y */
+   {  7327, 0x0000864F }, /* GL_DEPTH_CLAMP */
+   {  7342, 0x0000864F }, /* GL_DEPTH_CLAMP_NV */
+   {  7360, 0x00000B73 }, /* GL_DEPTH_CLEAR_VALUE */
+   {  7381, 0x00001902 }, /* GL_DEPTH_COMPONENT */
+   {  7400, 0x000081A5 }, /* GL_DEPTH_COMPONENT16 */
+   {  7421, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_ARB */
+   {  7446, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_SGIX */
+   {  7472, 0x000081A6 }, /* GL_DEPTH_COMPONENT24 */
+   {  7493, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_ARB */
+   {  7518, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_SGIX */
+   {  7544, 0x000081A7 }, /* GL_DEPTH_COMPONENT32 */
+   {  7565, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_ARB */
+   {  7590, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_SGIX */
+   {  7616, 0x00000B74 }, /* GL_DEPTH_FUNC */
+   {  7630, 0x00000B70 }, /* GL_DEPTH_RANGE */
+   {  7645, 0x00000D1E }, /* GL_DEPTH_SCALE */
+   {  7660, 0x000084F9 }, /* GL_DEPTH_STENCIL */
+   {  7677, 0x0000821A }, /* GL_DEPTH_STENCIL_ATTACHMENT */
+   {  7705, 0x000084F9 }, /* GL_DEPTH_STENCIL_NV */
+   {  7725, 0x0000886F }, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
+   {  7753, 0x0000886E }, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
+   {  7781, 0x00000B71 }, /* GL_DEPTH_TEST */
+   {  7795, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE */
+   {  7817, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE_ARB */
+   {  7843, 0x00000B72 }, /* GL_DEPTH_WRITEMASK */
+   {  7862, 0x00001201 }, /* GL_DIFFUSE */
+   {  7873, 0x00000BD0 }, /* GL_DITHER */
+   {  7883, 0x00000A02 }, /* GL_DOMAIN */
+   {  7893, 0x00001100 }, /* GL_DONT_CARE */
+   {  7906, 0x000086AE }, /* GL_DOT3_RGB */
+   {  7918, 0x000086AF }, /* GL_DOT3_RGBA */
+   {  7931, 0x000086AF }, /* GL_DOT3_RGBA_ARB */
+   {  7948, 0x00008741 }, /* GL_DOT3_RGBA_EXT */
+   {  7965, 0x000086AE }, /* GL_DOT3_RGB_ARB */
+   {  7981, 0x00008740 }, /* GL_DOT3_RGB_EXT */
+   {  7997, 0x0000140A }, /* GL_DOUBLE */
+   {  8007, 0x00000C32 }, /* GL_DOUBLEBUFFER */
+   {  8023, 0x00000C01 }, /* GL_DRAW_BUFFER */
+   {  8038, 0x00008825 }, /* GL_DRAW_BUFFER0 */
+   {  8054, 0x00008825 }, /* GL_DRAW_BUFFER0_ARB */
+   {  8074, 0x00008825 }, /* GL_DRAW_BUFFER0_ATI */
+   {  8094, 0x00008826 }, /* GL_DRAW_BUFFER1 */
+   {  8110, 0x0000882F }, /* GL_DRAW_BUFFER10 */
+   {  8127, 0x0000882F }, /* GL_DRAW_BUFFER10_ARB */
+   {  8148, 0x0000882F }, /* GL_DRAW_BUFFER10_ATI */
+   {  8169, 0x00008830 }, /* GL_DRAW_BUFFER11 */
+   {  8186, 0x00008830 }, /* GL_DRAW_BUFFER11_ARB */
+   {  8207, 0x00008830 }, /* GL_DRAW_BUFFER11_ATI */
+   {  8228, 0x00008831 }, /* GL_DRAW_BUFFER12 */
+   {  8245, 0x00008831 }, /* GL_DRAW_BUFFER12_ARB */
+   {  8266, 0x00008831 }, /* GL_DRAW_BUFFER12_ATI */
+   {  8287, 0x00008832 }, /* GL_DRAW_BUFFER13 */
+   {  8304, 0x00008832 }, /* GL_DRAW_BUFFER13_ARB */
+   {  8325, 0x00008832 }, /* GL_DRAW_BUFFER13_ATI */
+   {  8346, 0x00008833 }, /* GL_DRAW_BUFFER14 */
+   {  8363, 0x00008833 }, /* GL_DRAW_BUFFER14_ARB */
+   {  8384, 0x00008833 }, /* GL_DRAW_BUFFER14_ATI */
+   {  8405, 0x00008834 }, /* GL_DRAW_BUFFER15 */
+   {  8422, 0x00008834 }, /* GL_DRAW_BUFFER15_ARB */
+   {  8443, 0x00008834 }, /* GL_DRAW_BUFFER15_ATI */
+   {  8464, 0x00008826 }, /* GL_DRAW_BUFFER1_ARB */
+   {  8484, 0x00008826 }, /* GL_DRAW_BUFFER1_ATI */
+   {  8504, 0x00008827 }, /* GL_DRAW_BUFFER2 */
+   {  8520, 0x00008827 }, /* GL_DRAW_BUFFER2_ARB */
+   {  8540, 0x00008827 }, /* GL_DRAW_BUFFER2_ATI */
+   {  8560, 0x00008828 }, /* GL_DRAW_BUFFER3 */
+   {  8576, 0x00008828 }, /* GL_DRAW_BUFFER3_ARB */
+   {  8596, 0x00008828 }, /* GL_DRAW_BUFFER3_ATI */
+   {  8616, 0x00008829 }, /* GL_DRAW_BUFFER4 */
+   {  8632, 0x00008829 }, /* GL_DRAW_BUFFER4_ARB */
+   {  8652, 0x00008829 }, /* GL_DRAW_BUFFER4_ATI */
+   {  8672, 0x0000882A }, /* GL_DRAW_BUFFER5 */
+   {  8688, 0x0000882A }, /* GL_DRAW_BUFFER5_ARB */
+   {  8708, 0x0000882A }, /* GL_DRAW_BUFFER5_ATI */
+   {  8728, 0x0000882B }, /* GL_DRAW_BUFFER6 */
+   {  8744, 0x0000882B }, /* GL_DRAW_BUFFER6_ARB */
+   {  8764, 0x0000882B }, /* GL_DRAW_BUFFER6_ATI */
+   {  8784, 0x0000882C }, /* GL_DRAW_BUFFER7 */
+   {  8800, 0x0000882C }, /* GL_DRAW_BUFFER7_ARB */
+   {  8820, 0x0000882C }, /* GL_DRAW_BUFFER7_ATI */
+   {  8840, 0x0000882D }, /* GL_DRAW_BUFFER8 */
+   {  8856, 0x0000882D }, /* GL_DRAW_BUFFER8_ARB */
+   {  8876, 0x0000882D }, /* GL_DRAW_BUFFER8_ATI */
+   {  8896, 0x0000882E }, /* GL_DRAW_BUFFER9 */
+   {  8912, 0x0000882E }, /* GL_DRAW_BUFFER9_ARB */
+   {  8932, 0x0000882E }, /* GL_DRAW_BUFFER9_ATI */
+   {  8952, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER */
+   {  8972, 0x00008CA6 }, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
+   {  9004, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER_EXT */
+   {  9028, 0x00000705 }, /* GL_DRAW_PIXEL_TOKEN */
+   {  9048, 0x00000304 }, /* GL_DST_ALPHA */
+   {  9061, 0x00000306 }, /* GL_DST_COLOR */
+   {  9074, 0x0000877A }, /* GL_DU8DV8_ATI */
+   {  9088, 0x00008779 }, /* GL_DUDV_ATI */
+   {  9100, 0x000088EA }, /* GL_DYNAMIC_COPY */
+   {  9116, 0x000088EA }, /* GL_DYNAMIC_COPY_ARB */
+   {  9136, 0x000088E8 }, /* GL_DYNAMIC_DRAW */
+   {  9152, 0x000088E8 }, /* GL_DYNAMIC_DRAW_ARB */
+   {  9172, 0x000088E9 }, /* GL_DYNAMIC_READ */
+   {  9188, 0x000088E9 }, /* GL_DYNAMIC_READ_ARB */
+   {  9208, 0x00000B43 }, /* GL_EDGE_FLAG */
+   {  9221, 0x00008079 }, /* GL_EDGE_FLAG_ARRAY */
+   {  9240, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
+   {  9274, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB */
+   {  9312, 0x00008093 }, /* GL_EDGE_FLAG_ARRAY_POINTER */
+   {  9339, 0x0000808C }, /* GL_EDGE_FLAG_ARRAY_STRIDE */
+   {  9365, 0x00008893 }, /* GL_ELEMENT_ARRAY_BUFFER */
+   {  9389, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
+   {  9421, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB */
+   {  9457, 0x00001600 }, /* GL_EMISSION */
+   {  9469, 0x00002000 }, /* GL_ENABLE_BIT */
+   {  9483, 0x00000202 }, /* GL_EQUAL */
+   {  9492, 0x00001509 }, /* GL_EQUIV */
+   {  9501, 0x00010000 }, /* GL_EVAL_BIT */
+   {  9513, 0x00000800 }, /* GL_EXP */
+   {  9520, 0x00000801 }, /* GL_EXP2 */
+   {  9528, 0x00001F03 }, /* GL_EXTENSIONS */
+   {  9542, 0x00002400 }, /* GL_EYE_LINEAR */
+   {  9556, 0x00002502 }, /* GL_EYE_PLANE */
+   {  9569, 0x0000855C }, /* GL_EYE_PLANE_ABSOLUTE_NV */
+   {  9594, 0x0000855B }, /* GL_EYE_RADIAL_NV */
+   {  9611, 0x00000000 }, /* GL_FALSE */
+   {  9620, 0x00001101 }, /* GL_FASTEST */
+   {  9631, 0x00001C01 }, /* GL_FEEDBACK */
+   {  9643, 0x00000DF0 }, /* GL_FEEDBACK_BUFFER_POINTER */
+   {  9670, 0x00000DF1 }, /* GL_FEEDBACK_BUFFER_SIZE */
+   {  9694, 0x00000DF2 }, /* GL_FEEDBACK_BUFFER_TYPE */
+   {  9718, 0x00001B02 }, /* GL_FILL */
+   {  9726, 0x00008E4D }, /* GL_FIRST_VERTEX_CONVENTION_EXT */
+   {  9757, 0x00001D00 }, /* GL_FLAT */
+   {  9765, 0x00001406 }, /* GL_FLOAT */
+   {  9774, 0x00008B5A }, /* GL_FLOAT_MAT2 */
+   {  9788, 0x00008B5A }, /* GL_FLOAT_MAT2_ARB */
+   {  9806, 0x00008B65 }, /* GL_FLOAT_MAT2x3 */
+   {  9822, 0x00008B66 }, /* GL_FLOAT_MAT2x4 */
+   {  9838, 0x00008B5B }, /* GL_FLOAT_MAT3 */
+   {  9852, 0x00008B5B }, /* GL_FLOAT_MAT3_ARB */
+   {  9870, 0x00008B67 }, /* GL_FLOAT_MAT3x2 */
+   {  9886, 0x00008B68 }, /* GL_FLOAT_MAT3x4 */
+   {  9902, 0x00008B5C }, /* GL_FLOAT_MAT4 */
+   {  9916, 0x00008B5C }, /* GL_FLOAT_MAT4_ARB */
+   {  9934, 0x00008B69 }, /* GL_FLOAT_MAT4x2 */
+   {  9950, 0x00008B6A }, /* GL_FLOAT_MAT4x3 */
+   {  9966, 0x00008B50 }, /* GL_FLOAT_VEC2 */
+   {  9980, 0x00008B50 }, /* GL_FLOAT_VEC2_ARB */
+   {  9998, 0x00008B51 }, /* GL_FLOAT_VEC3 */
+   { 10012, 0x00008B51 }, /* GL_FLOAT_VEC3_ARB */
+   { 10030, 0x00008B52 }, /* GL_FLOAT_VEC4 */
+   { 10044, 0x00008B52 }, /* GL_FLOAT_VEC4_ARB */
+   { 10062, 0x00000B60 }, /* GL_FOG */
+   { 10069, 0x00000080 }, /* GL_FOG_BIT */
+   { 10080, 0x00000B66 }, /* GL_FOG_COLOR */
+   { 10093, 0x00008451 }, /* GL_FOG_COORD */
+   { 10106, 0x00008451 }, /* GL_FOG_COORDINATE */
+   { 10124, 0x00008457 }, /* GL_FOG_COORDINATE_ARRAY */
+   { 10148, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
+   { 10187, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB */
+   { 10230, 0x00008456 }, /* GL_FOG_COORDINATE_ARRAY_POINTER */
+   { 10262, 0x00008455 }, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
+   { 10293, 0x00008454 }, /* GL_FOG_COORDINATE_ARRAY_TYPE */
+   { 10322, 0x00008450 }, /* GL_FOG_COORDINATE_SOURCE */
+   { 10347, 0x00008457 }, /* GL_FOG_COORD_ARRAY */
+   { 10366, 0x0000889D }, /* GL_FOG_COORD_ARRAY_BUFFER_BINDING */
+   { 10400, 0x00008456 }, /* GL_FOG_COORD_ARRAY_POINTER */
+   { 10427, 0x00008455 }, /* GL_FOG_COORD_ARRAY_STRIDE */
+   { 10453, 0x00008454 }, /* GL_FOG_COORD_ARRAY_TYPE */
+   { 10477, 0x00008450 }, /* GL_FOG_COORD_SRC */
+   { 10494, 0x00000B62 }, /* GL_FOG_DENSITY */
+   { 10509, 0x0000855A }, /* GL_FOG_DISTANCE_MODE_NV */
+   { 10533, 0x00000B64 }, /* GL_FOG_END */
+   { 10544, 0x00000C54 }, /* GL_FOG_HINT */
+   { 10556, 0x00000B61 }, /* GL_FOG_INDEX */
+   { 10569, 0x00000B65 }, /* GL_FOG_MODE */
+   { 10581, 0x00008198 }, /* GL_FOG_OFFSET_SGIX */
+   { 10600, 0x00008199 }, /* GL_FOG_OFFSET_VALUE_SGIX */
+   { 10625, 0x00000B63 }, /* GL_FOG_START */
+   { 10638, 0x00008452 }, /* GL_FRAGMENT_DEPTH */
+   { 10656, 0x00008804 }, /* GL_FRAGMENT_PROGRAM_ARB */
+   { 10680, 0x00008B30 }, /* GL_FRAGMENT_SHADER */
+   { 10699, 0x00008B30 }, /* GL_FRAGMENT_SHADER_ARB */
+   { 10722, 0x00008B8B }, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
+   { 10757, 0x00008D40 }, /* GL_FRAMEBUFFER */
+   { 10772, 0x00008215 }, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
+   { 10809, 0x00008214 }, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
+   { 10845, 0x00008210 }, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
+   { 10886, 0x00008211 }, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
+   { 10927, 0x00008216 }, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
+   { 10964, 0x00008213 }, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
+   { 11001, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
+   { 11039, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT */
+   { 11081, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
+   { 11119, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT */
+   { 11161, 0x00008212 }, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
+   { 11196, 0x00008217 }, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
+   { 11235, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT */
+   { 11284, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
+   { 11332, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT */
+   { 11384, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+   { 11424, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
+   { 11468, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
+   { 11508, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT */
+   { 11552, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING_EXT */
+   { 11579, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE */
+   { 11603, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE_EXT */
+   { 11631, 0x00008218 }, /* GL_FRAMEBUFFER_DEFAULT */
+   { 11654, 0x00008D40 }, /* GL_FRAMEBUFFER_EXT */
+   { 11673, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
+   { 11710, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT */
+   { 11751, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
+   { 11792, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
+   { 11834, 0x00008CD8 }, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
+   { 11885, 0x00008CDA }, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
+   { 11923, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
+   { 11968, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT */
+   { 12017, 0x00008D56 }, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
+   { 12055, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
+   { 12097, 0x00008CDE }, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
+   { 12129, 0x00008219 }, /* GL_FRAMEBUFFER_UNDEFINED */
+   { 12154, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED */
+   { 12181, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED_EXT */
+   { 12212, 0x00000404 }, /* GL_FRONT */
+   { 12221, 0x00000408 }, /* GL_FRONT_AND_BACK */
+   { 12239, 0x00000B46 }, /* GL_FRONT_FACE */
+   { 12253, 0x00000400 }, /* GL_FRONT_LEFT */
+   { 12267, 0x00000401 }, /* GL_FRONT_RIGHT */
+   { 12282, 0x00008006 }, /* GL_FUNC_ADD */
+   { 12294, 0x00008006 }, /* GL_FUNC_ADD_EXT */
+   { 12310, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT */
+   { 12335, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT_EXT */
+   { 12364, 0x0000800A }, /* GL_FUNC_SUBTRACT */
+   { 12381, 0x0000800A }, /* GL_FUNC_SUBTRACT_EXT */
+   { 12402, 0x00008191 }, /* GL_GENERATE_MIPMAP */
+   { 12421, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT */
+   { 12445, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT_SGIS */
+   { 12474, 0x00008191 }, /* GL_GENERATE_MIPMAP_SGIS */
+   { 12498, 0x00000206 }, /* GL_GEQUAL */
+   { 12508, 0x00000204 }, /* GL_GREATER */
+   { 12519, 0x00001904 }, /* GL_GREEN */
+   { 12528, 0x00000D19 }, /* GL_GREEN_BIAS */
+   { 12542, 0x00000D53 }, /* GL_GREEN_BITS */
+   { 12556, 0x00000D18 }, /* GL_GREEN_SCALE */
+   { 12571, 0x00008000 }, /* GL_HINT_BIT */
+   { 12583, 0x00008024 }, /* GL_HISTOGRAM */
+   { 12596, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE */
+   { 12620, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE_EXT */
+   { 12648, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE */
+   { 12671, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE_EXT */
+   { 12698, 0x00008024 }, /* GL_HISTOGRAM_EXT */
+   { 12715, 0x00008027 }, /* GL_HISTOGRAM_FORMAT */
+   { 12735, 0x00008027 }, /* GL_HISTOGRAM_FORMAT_EXT */
+   { 12759, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE */
+   { 12783, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE_EXT */
+   { 12811, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE */
+   { 12839, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE_EXT */
+   { 12871, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE */
+   { 12893, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE_EXT */
+   { 12919, 0x0000802D }, /* GL_HISTOGRAM_SINK */
+   { 12937, 0x0000802D }, /* GL_HISTOGRAM_SINK_EXT */
+   { 12959, 0x00008026 }, /* GL_HISTOGRAM_WIDTH */
+   { 12978, 0x00008026 }, /* GL_HISTOGRAM_WIDTH_EXT */
+   { 13001, 0x0000862A }, /* GL_IDENTITY_NV */
+   { 13016, 0x00008150 }, /* GL_IGNORE_BORDER_HP */
+   { 13036, 0x00008B9B }, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
+   { 13076, 0x00008B9A }, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
+   { 13114, 0x00001E02 }, /* GL_INCR */
+   { 13122, 0x00008507 }, /* GL_INCR_WRAP */
+   { 13135, 0x00008507 }, /* GL_INCR_WRAP_EXT */
+   { 13152, 0x00008222 }, /* GL_INDEX */
+   { 13161, 0x00008077 }, /* GL_INDEX_ARRAY */
+   { 13176, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING */
+   { 13206, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING_ARB */
+   { 13240, 0x00008091 }, /* GL_INDEX_ARRAY_POINTER */
+   { 13263, 0x00008086 }, /* GL_INDEX_ARRAY_STRIDE */
+   { 13285, 0x00008085 }, /* GL_INDEX_ARRAY_TYPE */
+   { 13305, 0x00000D51 }, /* GL_INDEX_BITS */
+   { 13319, 0x00000C20 }, /* GL_INDEX_CLEAR_VALUE */
+   { 13340, 0x00000BF1 }, /* GL_INDEX_LOGIC_OP */
+   { 13358, 0x00000C30 }, /* GL_INDEX_MODE */
+   { 13372, 0x00000D13 }, /* GL_INDEX_OFFSET */
+   { 13388, 0x00000D12 }, /* GL_INDEX_SHIFT */
+   { 13403, 0x00000C21 }, /* GL_INDEX_WRITEMASK */
+   { 13422, 0x00008B84 }, /* GL_INFO_LOG_LENGTH */
+   { 13441, 0x00001404 }, /* GL_INT */
+   { 13448, 0x00008049 }, /* GL_INTENSITY */
+   { 13461, 0x0000804C }, /* GL_INTENSITY12 */
+   { 13476, 0x0000804C }, /* GL_INTENSITY12_EXT */
+   { 13495, 0x0000804D }, /* GL_INTENSITY16 */
+   { 13510, 0x0000804D }, /* GL_INTENSITY16_EXT */
+   { 13529, 0x0000804A }, /* GL_INTENSITY4 */
+   { 13543, 0x0000804A }, /* GL_INTENSITY4_EXT */
+   { 13561, 0x0000804B }, /* GL_INTENSITY8 */
+   { 13575, 0x0000804B }, /* GL_INTENSITY8_EXT */
+   { 13593, 0x00008049 }, /* GL_INTENSITY_EXT */
+   { 13610, 0x00008575 }, /* GL_INTERPOLATE */
+   { 13625, 0x00008575 }, /* GL_INTERPOLATE_ARB */
+   { 13644, 0x00008575 }, /* GL_INTERPOLATE_EXT */
+   { 13663, 0x00008B53 }, /* GL_INT_VEC2 */
+   { 13675, 0x00008B53 }, /* GL_INT_VEC2_ARB */
+   { 13691, 0x00008B54 }, /* GL_INT_VEC3 */
+   { 13703, 0x00008B54 }, /* GL_INT_VEC3_ARB */
+   { 13719, 0x00008B55 }, /* GL_INT_VEC4 */
+   { 13731, 0x00008B55 }, /* GL_INT_VEC4_ARB */
+   { 13747, 0x00000500 }, /* GL_INVALID_ENUM */
+   { 13763, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION */
+   { 13796, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION_EXT */
+   { 13833, 0x00000502 }, /* GL_INVALID_OPERATION */
+   { 13854, 0x00000501 }, /* GL_INVALID_VALUE */
+   { 13871, 0x0000862B }, /* GL_INVERSE_NV */
+   { 13885, 0x0000862D }, /* GL_INVERSE_TRANSPOSE_NV */
+   { 13909, 0x0000150A }, /* GL_INVERT */
+   { 13919, 0x00001E00 }, /* GL_KEEP */
+   { 13927, 0x00008E4E }, /* GL_LAST_VERTEX_CONVENTION_EXT */
+   { 13957, 0x00000406 }, /* GL_LEFT */
+   { 13965, 0x00000203 }, /* GL_LEQUAL */
+   { 13975, 0x00000201 }, /* GL_LESS */
+   { 13983, 0x00004000 }, /* GL_LIGHT0 */
+   { 13993, 0x00004001 }, /* GL_LIGHT1 */
+   { 14003, 0x00004002 }, /* GL_LIGHT2 */
+   { 14013, 0x00004003 }, /* GL_LIGHT3 */
+   { 14023, 0x00004004 }, /* GL_LIGHT4 */
+   { 14033, 0x00004005 }, /* GL_LIGHT5 */
+   { 14043, 0x00004006 }, /* GL_LIGHT6 */
+   { 14053, 0x00004007 }, /* GL_LIGHT7 */
+   { 14063, 0x00000B50 }, /* GL_LIGHTING */
+   { 14075, 0x00000040 }, /* GL_LIGHTING_BIT */
+   { 14091, 0x00000B53 }, /* GL_LIGHT_MODEL_AMBIENT */
+   { 14114, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL */
+   { 14143, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL_EXT */
+   { 14176, 0x00000B51 }, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
+   { 14204, 0x00000B52 }, /* GL_LIGHT_MODEL_TWO_SIDE */
+   { 14228, 0x00001B01 }, /* GL_LINE */
+   { 14236, 0x00002601 }, /* GL_LINEAR */
+   { 14246, 0x00001208 }, /* GL_LINEAR_ATTENUATION */
+   { 14268, 0x00008170 }, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
+   { 14298, 0x0000844F }, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
+   { 14329, 0x00002703 }, /* GL_LINEAR_MIPMAP_LINEAR */
+   { 14353, 0x00002701 }, /* GL_LINEAR_MIPMAP_NEAREST */
+   { 14378, 0x00000001 }, /* GL_LINES */
+   { 14387, 0x00000004 }, /* GL_LINE_BIT */
+   { 14399, 0x00000002 }, /* GL_LINE_LOOP */
+   { 14412, 0x00000707 }, /* GL_LINE_RESET_TOKEN */
+   { 14432, 0x00000B20 }, /* GL_LINE_SMOOTH */
+   { 14447, 0x00000C52 }, /* GL_LINE_SMOOTH_HINT */
+   { 14467, 0x00000B24 }, /* GL_LINE_STIPPLE */
+   { 14483, 0x00000B25 }, /* GL_LINE_STIPPLE_PATTERN */
+   { 14507, 0x00000B26 }, /* GL_LINE_STIPPLE_REPEAT */
+   { 14530, 0x00000003 }, /* GL_LINE_STRIP */
+   { 14544, 0x00000702 }, /* GL_LINE_TOKEN */
+   { 14558, 0x00000B21 }, /* GL_LINE_WIDTH */
+   { 14572, 0x00000B23 }, /* GL_LINE_WIDTH_GRANULARITY */
+   { 14598, 0x00000B22 }, /* GL_LINE_WIDTH_RANGE */
+   { 14618, 0x00008B82 }, /* GL_LINK_STATUS */
+   { 14633, 0x00000B32 }, /* GL_LIST_BASE */
+   { 14646, 0x00020000 }, /* GL_LIST_BIT */
+   { 14658, 0x00000B33 }, /* GL_LIST_INDEX */
+   { 14672, 0x00000B30 }, /* GL_LIST_MODE */
+   { 14685, 0x00000101 }, /* GL_LOAD */
+   { 14693, 0x00000BF1 }, /* GL_LOGIC_OP */
+   { 14705, 0x00000BF0 }, /* GL_LOGIC_OP_MODE */
+   { 14722, 0x00008CA1 }, /* GL_LOWER_LEFT */
+   { 14736, 0x00001909 }, /* GL_LUMINANCE */
+   { 14749, 0x00008041 }, /* GL_LUMINANCE12 */
+   { 14764, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12 */
+   { 14787, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12_EXT */
+   { 14814, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4 */
+   { 14836, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4_EXT */
+   { 14862, 0x00008041 }, /* GL_LUMINANCE12_EXT */
+   { 14881, 0x00008042 }, /* GL_LUMINANCE16 */
+   { 14896, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16 */
+   { 14919, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16_EXT */
+   { 14946, 0x00008042 }, /* GL_LUMINANCE16_EXT */
+   { 14965, 0x0000803F }, /* GL_LUMINANCE4 */
+   { 14979, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4 */
+   { 15000, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4_EXT */
+   { 15025, 0x0000803F }, /* GL_LUMINANCE4_EXT */
+   { 15043, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2 */
+   { 15064, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2_EXT */
+   { 15089, 0x00008040 }, /* GL_LUMINANCE8 */
+   { 15103, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8 */
+   { 15124, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8_EXT */
+   { 15149, 0x00008040 }, /* GL_LUMINANCE8_EXT */
+   { 15167, 0x0000190A }, /* GL_LUMINANCE_ALPHA */
+   { 15186, 0x00000D90 }, /* GL_MAP1_COLOR_4 */
+   { 15202, 0x00000DD0 }, /* GL_MAP1_GRID_DOMAIN */
+   { 15222, 0x00000DD1 }, /* GL_MAP1_GRID_SEGMENTS */
+   { 15244, 0x00000D91 }, /* GL_MAP1_INDEX */
+   { 15258, 0x00000D92 }, /* GL_MAP1_NORMAL */
+   { 15273, 0x00000D93 }, /* GL_MAP1_TEXTURE_COORD_1 */
+   { 15297, 0x00000D94 }, /* GL_MAP1_TEXTURE_COORD_2 */
+   { 15321, 0x00000D95 }, /* GL_MAP1_TEXTURE_COORD_3 */
+   { 15345, 0x00000D96 }, /* GL_MAP1_TEXTURE_COORD_4 */
+   { 15369, 0x00000D97 }, /* GL_MAP1_VERTEX_3 */
+   { 15386, 0x00000D98 }, /* GL_MAP1_VERTEX_4 */
+   { 15403, 0x00008660 }, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
+   { 15431, 0x0000866A }, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
+   { 15460, 0x0000866B }, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
+   { 15489, 0x0000866C }, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
+   { 15518, 0x0000866D }, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
+   { 15547, 0x0000866E }, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
+   { 15576, 0x0000866F }, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
+   { 15605, 0x00008661 }, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
+   { 15633, 0x00008662 }, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
+   { 15661, 0x00008663 }, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
+   { 15689, 0x00008664 }, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
+   { 15717, 0x00008665 }, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
+   { 15745, 0x00008666 }, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
+   { 15773, 0x00008667 }, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
+   { 15801, 0x00008668 }, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
+   { 15829, 0x00008669 }, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
+   { 15857, 0x00000DB0 }, /* GL_MAP2_COLOR_4 */
+   { 15873, 0x00000DD2 }, /* GL_MAP2_GRID_DOMAIN */
+   { 15893, 0x00000DD3 }, /* GL_MAP2_GRID_SEGMENTS */
+   { 15915, 0x00000DB1 }, /* GL_MAP2_INDEX */
+   { 15929, 0x00000DB2 }, /* GL_MAP2_NORMAL */
+   { 15944, 0x00000DB3 }, /* GL_MAP2_TEXTURE_COORD_1 */
+   { 15968, 0x00000DB4 }, /* GL_MAP2_TEXTURE_COORD_2 */
+   { 15992, 0x00000DB5 }, /* GL_MAP2_TEXTURE_COORD_3 */
+   { 16016, 0x00000DB6 }, /* GL_MAP2_TEXTURE_COORD_4 */
+   { 16040, 0x00000DB7 }, /* GL_MAP2_VERTEX_3 */
+   { 16057, 0x00000DB8 }, /* GL_MAP2_VERTEX_4 */
+   { 16074, 0x00008670 }, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
+   { 16102, 0x0000867A }, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
+   { 16131, 0x0000867B }, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
+   { 16160, 0x0000867C }, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
+   { 16189, 0x0000867D }, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
+   { 16218, 0x0000867E }, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
+   { 16247, 0x0000867F }, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
+   { 16276, 0x00008671 }, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
+   { 16304, 0x00008672 }, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
+   { 16332, 0x00008673 }, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
+   { 16360, 0x00008674 }, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
+   { 16388, 0x00008675 }, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
+   { 16416, 0x00008676 }, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
+   { 16444, 0x00008677 }, /* GL_MAP2_VERTEX_ATTRIB7_4_NV */
+   { 16472, 0x00008678 }, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
+   { 16500, 0x00008679 }, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
+   { 16528, 0x00000D10 }, /* GL_MAP_COLOR */
+   { 16541, 0x00000010 }, /* GL_MAP_FLUSH_EXPLICIT_BIT */
+   { 16567, 0x00000008 }, /* GL_MAP_INVALIDATE_BUFFER_BIT */
+   { 16596, 0x00000004 }, /* GL_MAP_INVALIDATE_RANGE_BIT */
+   { 16624, 0x00000001 }, /* GL_MAP_READ_BIT */
+   { 16640, 0x00000D11 }, /* GL_MAP_STENCIL */
+   { 16655, 0x00000020 }, /* GL_MAP_UNSYNCHRONIZED_BIT */
+   { 16681, 0x00000002 }, /* GL_MAP_WRITE_BIT */
+   { 16698, 0x000088C0 }, /* GL_MATRIX0_ARB */
+   { 16713, 0x00008630 }, /* GL_MATRIX0_NV */
+   { 16727, 0x000088CA }, /* GL_MATRIX10_ARB */
+   { 16743, 0x000088CB }, /* GL_MATRIX11_ARB */
+   { 16759, 0x000088CC }, /* GL_MATRIX12_ARB */
+   { 16775, 0x000088CD }, /* GL_MATRIX13_ARB */
+   { 16791, 0x000088CE }, /* GL_MATRIX14_ARB */
+   { 16807, 0x000088CF }, /* GL_MATRIX15_ARB */
+   { 16823, 0x000088D0 }, /* GL_MATRIX16_ARB */
+   { 16839, 0x000088D1 }, /* GL_MATRIX17_ARB */
+   { 16855, 0x000088D2 }, /* GL_MATRIX18_ARB */
+   { 16871, 0x000088D3 }, /* GL_MATRIX19_ARB */
+   { 16887, 0x000088C1 }, /* GL_MATRIX1_ARB */
+   { 16902, 0x00008631 }, /* GL_MATRIX1_NV */
+   { 16916, 0x000088D4 }, /* GL_MATRIX20_ARB */
+   { 16932, 0x000088D5 }, /* GL_MATRIX21_ARB */
+   { 16948, 0x000088D6 }, /* GL_MATRIX22_ARB */
+   { 16964, 0x000088D7 }, /* GL_MATRIX23_ARB */
+   { 16980, 0x000088D8 }, /* GL_MATRIX24_ARB */
+   { 16996, 0x000088D9 }, /* GL_MATRIX25_ARB */
+   { 17012, 0x000088DA }, /* GL_MATRIX26_ARB */
+   { 17028, 0x000088DB }, /* GL_MATRIX27_ARB */
+   { 17044, 0x000088DC }, /* GL_MATRIX28_ARB */
+   { 17060, 0x000088DD }, /* GL_MATRIX29_ARB */
+   { 17076, 0x000088C2 }, /* GL_MATRIX2_ARB */
+   { 17091, 0x00008632 }, /* GL_MATRIX2_NV */
+   { 17105, 0x000088DE }, /* GL_MATRIX30_ARB */
+   { 17121, 0x000088DF }, /* GL_MATRIX31_ARB */
+   { 17137, 0x000088C3 }, /* GL_MATRIX3_ARB */
+   { 17152, 0x00008633 }, /* GL_MATRIX3_NV */
+   { 17166, 0x000088C4 }, /* GL_MATRIX4_ARB */
+   { 17181, 0x00008634 }, /* GL_MATRIX4_NV */
+   { 17195, 0x000088C5 }, /* GL_MATRIX5_ARB */
+   { 17210, 0x00008635 }, /* GL_MATRIX5_NV */
+   { 17224, 0x000088C6 }, /* GL_MATRIX6_ARB */
+   { 17239, 0x00008636 }, /* GL_MATRIX6_NV */
+   { 17253, 0x000088C7 }, /* GL_MATRIX7_ARB */
+   { 17268, 0x00008637 }, /* GL_MATRIX7_NV */
+   { 17282, 0x000088C8 }, /* GL_MATRIX8_ARB */
+   { 17297, 0x000088C9 }, /* GL_MATRIX9_ARB */
+   { 17312, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_ARB */
+   { 17338, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
+   { 17372, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
+   { 17403, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
+   { 17436, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
+   { 17467, 0x00000BA0 }, /* GL_MATRIX_MODE */
+   { 17482, 0x00008840 }, /* GL_MATRIX_PALETTE_ARB */
+   { 17504, 0x00008008 }, /* GL_MAX */
+   { 17511, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE */
+   { 17534, 0x000088FF }, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
+   { 17566, 0x00000D35 }, /* GL_MAX_ATTRIB_STACK_DEPTH */
+   { 17592, 0x00000D3B }, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
+   { 17625, 0x00008177 }, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
+   { 17651, 0x00008178 }, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+   { 17685, 0x00000D32 }, /* GL_MAX_CLIP_PLANES */
+   { 17704, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
+   { 17733, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
+   { 17765, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI */
+   { 17801, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
+   { 17837, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB */
+   { 17877, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT */
+   { 17903, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT_EXT */
+   { 17933, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH */
+   { 17958, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH_EXT */
+   { 17987, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
+   { 18016, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB */
+   { 18049, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS */
+   { 18069, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ARB */
+   { 18093, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ATI */
+   { 18117, 0x000080E9 }, /* GL_MAX_ELEMENTS_INDICES */
+   { 18141, 0x000080E8 }, /* GL_MAX_ELEMENTS_VERTICES */
+   { 18166, 0x00000D30 }, /* GL_MAX_EVAL_ORDER */
+   { 18184, 0x00008008 }, /* GL_MAX_EXT */
+   { 18195, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
+   { 18230, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB */
+   { 18269, 0x00000D31 }, /* GL_MAX_LIGHTS */
+   { 18283, 0x00000B31 }, /* GL_MAX_LIST_NESTING */
+   { 18303, 0x00008841 }, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
+   { 18341, 0x00000D36 }, /* GL_MAX_MODELVIEW_STACK_DEPTH */
+   { 18370, 0x00000D37 }, /* GL_MAX_NAME_STACK_DEPTH */
+   { 18394, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_ARB */
+   { 18422, 0x00000D34 }, /* GL_MAX_PIXEL_MAP_TABLE */
+   { 18445, 0x000088B1 }, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
+   { 18482, 0x0000880B }, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
+   { 18518, 0x000088AD }, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
+   { 18545, 0x000088F5 }, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
+   { 18574, 0x000088B5 }, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
+   { 18608, 0x000088F4 }, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
+   { 18644, 0x000088F6 }, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
+   { 18671, 0x000088A1 }, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
+   { 18703, 0x000088B4 }, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
+   { 18739, 0x000088F8 }, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
+   { 18768, 0x000088F7 }, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
+   { 18797, 0x0000862F }, /* GL_MAX_PROGRAM_MATRICES_ARB */
+   { 18825, 0x0000862E }, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
+   { 18863, 0x000088B3 }, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+   { 18907, 0x0000880E }, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+   { 18950, 0x000088AF }, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
+   { 18984, 0x000088A3 }, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+   { 19023, 0x000088AB }, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
+   { 19060, 0x000088A7 }, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
+   { 19098, 0x00008810 }, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+   { 19141, 0x0000880F }, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+   { 19184, 0x000088A9 }, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
+   { 19214, 0x000088A5 }, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
+   { 19245, 0x0000880D }, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
+   { 19281, 0x0000880C }, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
+   { 19317, 0x00000D38 }, /* GL_MAX_PROJECTION_STACK_DEPTH */
+   { 19347, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
+   { 19381, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_NV */
+   { 19414, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
+   { 19443, 0x00008D57 }, /* GL_MAX_SAMPLES */
+   { 19458, 0x00009111 }, /* GL_MAX_SERVER_WAIT_TIMEOUT */
+   { 19485, 0x00008504 }, /* GL_MAX_SHININESS_NV */
+   { 19505, 0x00008505 }, /* GL_MAX_SPOT_EXPONENT_NV */
+   { 19529, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS */
+   { 19551, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS_ARB */
+   { 19577, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS */
+   { 19604, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS_ARB */
+   { 19635, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS */
+   { 19659, 0x000084FF }, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
+   { 19693, 0x00000D33 }, /* GL_MAX_TEXTURE_SIZE */
+   { 19713, 0x00000D39 }, /* GL_MAX_TEXTURE_STACK_DEPTH */
+   { 19740, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS */
+   { 19761, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS_ARB */
+   { 19786, 0x0000862F }, /* GL_MAX_TRACK_MATRICES_NV */
+   { 19811, 0x0000862E }, /* GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */
+   { 19846, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS */
+   { 19868, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS_ARB */
+   { 19894, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS */
+   { 19916, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS_ARB */
+   { 19942, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
+   { 19976, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
+   { 20014, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
+   { 20047, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB */
+   { 20084, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_ARB */
+   { 20108, 0x00000D3A }, /* GL_MAX_VIEWPORT_DIMS */
+   { 20129, 0x00008007 }, /* GL_MIN */
+   { 20136, 0x0000802E }, /* GL_MINMAX */
+   { 20146, 0x0000802E }, /* GL_MINMAX_EXT */
+   { 20160, 0x0000802F }, /* GL_MINMAX_FORMAT */
+   { 20177, 0x0000802F }, /* GL_MINMAX_FORMAT_EXT */
+   { 20198, 0x00008030 }, /* GL_MINMAX_SINK */
+   { 20213, 0x00008030 }, /* GL_MINMAX_SINK_EXT */
+   { 20232, 0x00008007 }, /* GL_MIN_EXT */
+   { 20243, 0x00008370 }, /* GL_MIRRORED_REPEAT */
+   { 20262, 0x00008370 }, /* GL_MIRRORED_REPEAT_ARB */
+   { 20285, 0x00008370 }, /* GL_MIRRORED_REPEAT_IBM */
+   { 20308, 0x00008742 }, /* GL_MIRROR_CLAMP_ATI */
+   { 20328, 0x00008742 }, /* GL_MIRROR_CLAMP_EXT */
+   { 20348, 0x00008912 }, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
+   { 20378, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_ATI */
+   { 20406, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
+   { 20434, 0x00001700 }, /* GL_MODELVIEW */
+   { 20447, 0x00001700 }, /* GL_MODELVIEW0_ARB */
+   { 20465, 0x0000872A }, /* GL_MODELVIEW10_ARB */
+   { 20484, 0x0000872B }, /* GL_MODELVIEW11_ARB */
+   { 20503, 0x0000872C }, /* GL_MODELVIEW12_ARB */
+   { 20522, 0x0000872D }, /* GL_MODELVIEW13_ARB */
+   { 20541, 0x0000872E }, /* GL_MODELVIEW14_ARB */
+   { 20560, 0x0000872F }, /* GL_MODELVIEW15_ARB */
+   { 20579, 0x00008730 }, /* GL_MODELVIEW16_ARB */
+   { 20598, 0x00008731 }, /* GL_MODELVIEW17_ARB */
+   { 20617, 0x00008732 }, /* GL_MODELVIEW18_ARB */
+   { 20636, 0x00008733 }, /* GL_MODELVIEW19_ARB */
+   { 20655, 0x0000850A }, /* GL_MODELVIEW1_ARB */
+   { 20673, 0x00008734 }, /* GL_MODELVIEW20_ARB */
+   { 20692, 0x00008735 }, /* GL_MODELVIEW21_ARB */
+   { 20711, 0x00008736 }, /* GL_MODELVIEW22_ARB */
+   { 20730, 0x00008737 }, /* GL_MODELVIEW23_ARB */
+   { 20749, 0x00008738 }, /* GL_MODELVIEW24_ARB */
+   { 20768, 0x00008739 }, /* GL_MODELVIEW25_ARB */
+   { 20787, 0x0000873A }, /* GL_MODELVIEW26_ARB */
+   { 20806, 0x0000873B }, /* GL_MODELVIEW27_ARB */
+   { 20825, 0x0000873C }, /* GL_MODELVIEW28_ARB */
+   { 20844, 0x0000873D }, /* GL_MODELVIEW29_ARB */
+   { 20863, 0x00008722 }, /* GL_MODELVIEW2_ARB */
+   { 20881, 0x0000873E }, /* GL_MODELVIEW30_ARB */
+   { 20900, 0x0000873F }, /* GL_MODELVIEW31_ARB */
+   { 20919, 0x00008723 }, /* GL_MODELVIEW3_ARB */
+   { 20937, 0x00008724 }, /* GL_MODELVIEW4_ARB */
+   { 20955, 0x00008725 }, /* GL_MODELVIEW5_ARB */
+   { 20973, 0x00008726 }, /* GL_MODELVIEW6_ARB */
+   { 20991, 0x00008727 }, /* GL_MODELVIEW7_ARB */
+   { 21009, 0x00008728 }, /* GL_MODELVIEW8_ARB */
+   { 21027, 0x00008729 }, /* GL_MODELVIEW9_ARB */
+   { 21045, 0x00000BA6 }, /* GL_MODELVIEW_MATRIX */
+   { 21065, 0x00008629 }, /* GL_MODELVIEW_PROJECTION_NV */
+   { 21092, 0x00000BA3 }, /* GL_MODELVIEW_STACK_DEPTH */
+   { 21117, 0x00002100 }, /* GL_MODULATE */
+   { 21129, 0x00008744 }, /* GL_MODULATE_ADD_ATI */
+   { 21149, 0x00008745 }, /* GL_MODULATE_SIGNED_ADD_ATI */
+   { 21176, 0x00008746 }, /* GL_MODULATE_SUBTRACT_ATI */
+   { 21201, 0x00000103 }, /* GL_MULT */
+   { 21209, 0x0000809D }, /* GL_MULTISAMPLE */
+   { 21224, 0x000086B2 }, /* GL_MULTISAMPLE_3DFX */
+   { 21244, 0x0000809D }, /* GL_MULTISAMPLE_ARB */
+   { 21263, 0x20000000 }, /* GL_MULTISAMPLE_BIT */
+   { 21282, 0x20000000 }, /* GL_MULTISAMPLE_BIT_3DFX */
+   { 21306, 0x20000000 }, /* GL_MULTISAMPLE_BIT_ARB */
+   { 21329, 0x00008534 }, /* GL_MULTISAMPLE_FILTER_HINT_NV */
+   { 21359, 0x00002A25 }, /* GL_N3F_V3F */
+   { 21370, 0x00000D70 }, /* GL_NAME_STACK_DEPTH */
+   { 21390, 0x0000150E }, /* GL_NAND */
+   { 21398, 0x00002600 }, /* GL_NEAREST */
+   { 21409, 0x0000844E }, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
+   { 21440, 0x0000844D }, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
+   { 21472, 0x00002702 }, /* GL_NEAREST_MIPMAP_LINEAR */
+   { 21497, 0x00002700 }, /* GL_NEAREST_MIPMAP_NEAREST */
+   { 21523, 0x00000200 }, /* GL_NEVER */
+   { 21532, 0x00001102 }, /* GL_NICEST */
+   { 21542, 0x00000000 }, /* GL_NONE */
+   { 21550, 0x00001505 }, /* GL_NOOP */
+   { 21558, 0x00001508 }, /* GL_NOR */
+   { 21565, 0x00000BA1 }, /* GL_NORMALIZE */
+   { 21578, 0x00008075 }, /* GL_NORMAL_ARRAY */
+   { 21594, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
+   { 21625, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING_ARB */
+   { 21660, 0x0000808F }, /* GL_NORMAL_ARRAY_POINTER */
+   { 21684, 0x0000807F }, /* GL_NORMAL_ARRAY_STRIDE */
+   { 21707, 0x0000807E }, /* GL_NORMAL_ARRAY_TYPE */
+   { 21728, 0x00008511 }, /* GL_NORMAL_MAP */
+   { 21742, 0x00008511 }, /* GL_NORMAL_MAP_ARB */
+   { 21760, 0x00008511 }, /* GL_NORMAL_MAP_NV */
+   { 21777, 0x00000205 }, /* GL_NOTEQUAL */
+   { 21789, 0x00000000 }, /* GL_NO_ERROR */
+   { 21801, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
+   { 21835, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB */
+   { 21873, 0x00008B89 }, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */
+   { 21905, 0x00008B8A }, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */
+   { 21947, 0x00008B86 }, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */
+   { 21977, 0x00008B87 }, /* GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB */
+   { 22017, 0x00008B85 }, /* GL_OBJECT_ATTACHED_OBJECTS_ARB */
+   { 22048, 0x00008B81 }, /* GL_OBJECT_COMPILE_STATUS_ARB */
+   { 22077, 0x00008B80 }, /* GL_OBJECT_DELETE_STATUS_ARB */
+   { 22105, 0x00008B84 }, /* GL_OBJECT_INFO_LOG_LENGTH_ARB */
+   { 22135, 0x00002401 }, /* GL_OBJECT_LINEAR */
+   { 22152, 0x00008B82 }, /* GL_OBJECT_LINK_STATUS_ARB */
+   { 22178, 0x00002501 }, /* GL_OBJECT_PLANE */
+   { 22194, 0x00008B88 }, /* GL_OBJECT_SHADER_SOURCE_LENGTH_ARB */
+   { 22229, 0x00008B4F }, /* GL_OBJECT_SUBTYPE_ARB */
+   { 22251, 0x00009112 }, /* GL_OBJECT_TYPE */
+   { 22266, 0x00008B4E }, /* GL_OBJECT_TYPE_ARB */
+   { 22285, 0x00008B83 }, /* GL_OBJECT_VALIDATE_STATUS_ARB */
+   { 22315, 0x00008165 }, /* GL_OCCLUSION_TEST_HP */
+   { 22336, 0x00008166 }, /* GL_OCCLUSION_TEST_RESULT_HP */
+   { 22364, 0x00000001 }, /* GL_ONE */
+   { 22371, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA */
+   { 22399, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA_EXT */
+   { 22431, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR */
+   { 22459, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR_EXT */
+   { 22491, 0x00000305 }, /* GL_ONE_MINUS_DST_ALPHA */
+   { 22514, 0x00000307 }, /* GL_ONE_MINUS_DST_COLOR */
+   { 22537, 0x00000303 }, /* GL_ONE_MINUS_SRC_ALPHA */
+   { 22560, 0x00000301 }, /* GL_ONE_MINUS_SRC_COLOR */
+   { 22583, 0x00008598 }, /* GL_OPERAND0_ALPHA */
+   { 22601, 0x00008598 }, /* GL_OPERAND0_ALPHA_ARB */
+   { 22623, 0x00008598 }, /* GL_OPERAND0_ALPHA_EXT */
+   { 22645, 0x00008590 }, /* GL_OPERAND0_RGB */
+   { 22661, 0x00008590 }, /* GL_OPERAND0_RGB_ARB */
+   { 22681, 0x00008590 }, /* GL_OPERAND0_RGB_EXT */
+   { 22701, 0x00008599 }, /* GL_OPERAND1_ALPHA */
+   { 22719, 0x00008599 }, /* GL_OPERAND1_ALPHA_ARB */
+   { 22741, 0x00008599 }, /* GL_OPERAND1_ALPHA_EXT */
+   { 22763, 0x00008591 }, /* GL_OPERAND1_RGB */
+   { 22779, 0x00008591 }, /* GL_OPERAND1_RGB_ARB */
+   { 22799, 0x00008591 }, /* GL_OPERAND1_RGB_EXT */
+   { 22819, 0x0000859A }, /* GL_OPERAND2_ALPHA */
+   { 22837, 0x0000859A }, /* GL_OPERAND2_ALPHA_ARB */
+   { 22859, 0x0000859A }, /* GL_OPERAND2_ALPHA_EXT */
+   { 22881, 0x00008592 }, /* GL_OPERAND2_RGB */
+   { 22897, 0x00008592 }, /* GL_OPERAND2_RGB_ARB */
+   { 22917, 0x00008592 }, /* GL_OPERAND2_RGB_EXT */
+   { 22937, 0x0000859B }, /* GL_OPERAND3_ALPHA_NV */
+   { 22958, 0x00008593 }, /* GL_OPERAND3_RGB_NV */
+   { 22977, 0x00001507 }, /* GL_OR */
+   { 22983, 0x00000A01 }, /* GL_ORDER */
+   { 22992, 0x0000150D }, /* GL_OR_INVERTED */
+   { 23007, 0x0000150B }, /* GL_OR_REVERSE */
+   { 23021, 0x00000505 }, /* GL_OUT_OF_MEMORY */
+   { 23038, 0x00000D05 }, /* GL_PACK_ALIGNMENT */
+   { 23056, 0x0000806C }, /* GL_PACK_IMAGE_HEIGHT */
+   { 23077, 0x00008758 }, /* GL_PACK_INVERT_MESA */
+   { 23097, 0x00000D01 }, /* GL_PACK_LSB_FIRST */
+   { 23115, 0x00000D02 }, /* GL_PACK_ROW_LENGTH */
+   { 23134, 0x0000806B }, /* GL_PACK_SKIP_IMAGES */
+   { 23154, 0x00000D04 }, /* GL_PACK_SKIP_PIXELS */
+   { 23174, 0x00000D03 }, /* GL_PACK_SKIP_ROWS */
+   { 23192, 0x00000D00 }, /* GL_PACK_SWAP_BYTES */
+   { 23211, 0x00008B92 }, /* GL_PALETTE4_R5_G6_B5_OES */
+   { 23236, 0x00008B94 }, /* GL_PALETTE4_RGB5_A1_OES */
+   { 23260, 0x00008B90 }, /* GL_PALETTE4_RGB8_OES */
+   { 23281, 0x00008B93 }, /* GL_PALETTE4_RGBA4_OES */
+   { 23303, 0x00008B91 }, /* GL_PALETTE4_RGBA8_OES */
+   { 23325, 0x00008B97 }, /* GL_PALETTE8_R5_G6_B5_OES */
+   { 23350, 0x00008B99 }, /* GL_PALETTE8_RGB5_A1_OES */
+   { 23374, 0x00008B95 }, /* GL_PALETTE8_RGB8_OES */
+   { 23395, 0x00008B98 }, /* GL_PALETTE8_RGBA4_OES */
+   { 23417, 0x00008B96 }, /* GL_PALETTE8_RGBA8_OES */
+   { 23439, 0x00000700 }, /* GL_PASS_THROUGH_TOKEN */
+   { 23461, 0x00000C50 }, /* GL_PERSPECTIVE_CORRECTION_HINT */
+   { 23492, 0x00000C79 }, /* GL_PIXEL_MAP_A_TO_A */
+   { 23512, 0x00000CB9 }, /* GL_PIXEL_MAP_A_TO_A_SIZE */
+   { 23537, 0x00000C78 }, /* GL_PIXEL_MAP_B_TO_B */
+   { 23557, 0x00000CB8 }, /* GL_PIXEL_MAP_B_TO_B_SIZE */
+   { 23582, 0x00000C77 }, /* GL_PIXEL_MAP_G_TO_G */
+   { 23602, 0x00000CB7 }, /* GL_PIXEL_MAP_G_TO_G_SIZE */
+   { 23627, 0x00000C75 }, /* GL_PIXEL_MAP_I_TO_A */
+   { 23647, 0x00000CB5 }, /* GL_PIXEL_MAP_I_TO_A_SIZE */
+   { 23672, 0x00000C74 }, /* GL_PIXEL_MAP_I_TO_B */
+   { 23692, 0x00000CB4 }, /* GL_PIXEL_MAP_I_TO_B_SIZE */
+   { 23717, 0x00000C73 }, /* GL_PIXEL_MAP_I_TO_G */
+   { 23737, 0x00000CB3 }, /* GL_PIXEL_MAP_I_TO_G_SIZE */
+   { 23762, 0x00000C70 }, /* GL_PIXEL_MAP_I_TO_I */
+   { 23782, 0x00000CB0 }, /* GL_PIXEL_MAP_I_TO_I_SIZE */
+   { 23807, 0x00000C72 }, /* GL_PIXEL_MAP_I_TO_R */
+   { 23827, 0x00000CB2 }, /* GL_PIXEL_MAP_I_TO_R_SIZE */
+   { 23852, 0x00000C76 }, /* GL_PIXEL_MAP_R_TO_R */
+   { 23872, 0x00000CB6 }, /* GL_PIXEL_MAP_R_TO_R_SIZE */
+   { 23897, 0x00000C71 }, /* GL_PIXEL_MAP_S_TO_S */
+   { 23917, 0x00000CB1 }, /* GL_PIXEL_MAP_S_TO_S_SIZE */
+   { 23942, 0x00000020 }, /* GL_PIXEL_MODE_BIT */
+   { 23960, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER */
+   { 23981, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING */
+   { 24010, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING_EXT */
+   { 24043, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER_EXT */
+   { 24068, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER */
+   { 24091, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
+   { 24122, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING_EXT */
+   { 24157, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER_EXT */
+   { 24184, 0x00001B00 }, /* GL_POINT */
+   { 24193, 0x00000000 }, /* GL_POINTS */
+   { 24203, 0x00000002 }, /* GL_POINT_BIT */
+   { 24216, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION */
+   { 24246, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_ARB */
+   { 24280, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_EXT */
+   { 24314, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_SGIS */
+   { 24349, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE */
+   { 24378, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_ARB */
+   { 24411, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_EXT */
+   { 24444, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_SGIS */
+   { 24478, 0x00000B11 }, /* GL_POINT_SIZE */
+   { 24492, 0x00000B13 }, /* GL_POINT_SIZE_GRANULARITY */
+   { 24518, 0x00008127 }, /* GL_POINT_SIZE_MAX */
+   { 24536, 0x00008127 }, /* GL_POINT_SIZE_MAX_ARB */
+   { 24558, 0x00008127 }, /* GL_POINT_SIZE_MAX_EXT */
+   { 24580, 0x00008127 }, /* GL_POINT_SIZE_MAX_SGIS */
+   { 24603, 0x00008126 }, /* GL_POINT_SIZE_MIN */
+   { 24621, 0x00008126 }, /* GL_POINT_SIZE_MIN_ARB */
+   { 24643, 0x00008126 }, /* GL_POINT_SIZE_MIN_EXT */
+   { 24665, 0x00008126 }, /* GL_POINT_SIZE_MIN_SGIS */
+   { 24688, 0x00000B12 }, /* GL_POINT_SIZE_RANGE */
+   { 24708, 0x00000B10 }, /* GL_POINT_SMOOTH */
+   { 24724, 0x00000C51 }, /* GL_POINT_SMOOTH_HINT */
+   { 24745, 0x00008861 }, /* GL_POINT_SPRITE */
+   { 24761, 0x00008861 }, /* GL_POINT_SPRITE_ARB */
+   { 24781, 0x00008CA0 }, /* GL_POINT_SPRITE_COORD_ORIGIN */
+   { 24810, 0x00008861 }, /* GL_POINT_SPRITE_NV */
+   { 24829, 0x00008863 }, /* GL_POINT_SPRITE_R_MODE_NV */
+   { 24855, 0x00000701 }, /* GL_POINT_TOKEN */
+   { 24870, 0x00000009 }, /* GL_POLYGON */
+   { 24881, 0x00000008 }, /* GL_POLYGON_BIT */
+   { 24896, 0x00000B40 }, /* GL_POLYGON_MODE */
+   { 24912, 0x00008039 }, /* GL_POLYGON_OFFSET_BIAS */
+   { 24935, 0x00008038 }, /* GL_POLYGON_OFFSET_FACTOR */
+   { 24960, 0x00008037 }, /* GL_POLYGON_OFFSET_FILL */
+   { 24983, 0x00002A02 }, /* GL_POLYGON_OFFSET_LINE */
+   { 25006, 0x00002A01 }, /* GL_POLYGON_OFFSET_POINT */
+   { 25030, 0x00002A00 }, /* GL_POLYGON_OFFSET_UNITS */
+   { 25054, 0x00000B41 }, /* GL_POLYGON_SMOOTH */
+   { 25072, 0x00000C53 }, /* GL_POLYGON_SMOOTH_HINT */
+   { 25095, 0x00000B42 }, /* GL_POLYGON_STIPPLE */
+   { 25114, 0x00000010 }, /* GL_POLYGON_STIPPLE_BIT */
+   { 25137, 0x00000703 }, /* GL_POLYGON_TOKEN */
+   { 25154, 0x00001203 }, /* GL_POSITION */
+   { 25166, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
+   { 25198, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI */
+   { 25234, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
+   { 25267, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI */
+   { 25304, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
+   { 25335, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI */
+   { 25370, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
+   { 25402, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI */
+   { 25438, 0x000080D2 }, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
+   { 25471, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
+   { 25503, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI */
+   { 25539, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
+   { 25572, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI */
+   { 25609, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS */
+   { 25639, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS_SGI */
+   { 25673, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE */
+   { 25704, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE_SGI */
+   { 25739, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
+   { 25770, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS_EXT */
+   { 25805, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
+   { 25837, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE_EXT */
+   { 25873, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS */
+   { 25903, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS_EXT */
+   { 25937, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE */
+   { 25968, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE_EXT */
+   { 26003, 0x000080D1 }, /* GL_POST_CONVOLUTION_COLOR_TABLE */
+   { 26035, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS */
+   { 26066, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS_EXT */
+   { 26101, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE */
+   { 26133, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE_EXT */
+   { 26169, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS */
+   { 26198, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS_EXT */
+   { 26231, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE */
+   { 26261, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE_EXT */
+   { 26295, 0x0000817B }, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
+   { 26334, 0x00008179 }, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
+   { 26367, 0x0000817C }, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
+   { 26407, 0x0000817A }, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
+   { 26441, 0x00008578 }, /* GL_PREVIOUS */
+   { 26453, 0x00008578 }, /* GL_PREVIOUS_ARB */
+   { 26469, 0x00008578 }, /* GL_PREVIOUS_EXT */
+   { 26485, 0x00008577 }, /* GL_PRIMARY_COLOR */
+   { 26502, 0x00008577 }, /* GL_PRIMARY_COLOR_ARB */
+   { 26523, 0x00008577 }, /* GL_PRIMARY_COLOR_EXT */
+   { 26544, 0x000088B0 }, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
+   { 26577, 0x00008805 }, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
+   { 26609, 0x000088AC }, /* GL_PROGRAM_ATTRIBS_ARB */
+   { 26632, 0x00008677 }, /* GL_PROGRAM_BINDING_ARB */
+   { 26655, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_ARB */
+   { 26685, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_NV */
+   { 26714, 0x00008874 }, /* GL_PROGRAM_ERROR_STRING_ARB */
+   { 26742, 0x00008876 }, /* GL_PROGRAM_FORMAT_ARB */
+   { 26764, 0x00008875 }, /* GL_PROGRAM_FORMAT_ASCII_ARB */
+   { 26792, 0x000088A0 }, /* GL_PROGRAM_INSTRUCTIONS_ARB */
+   { 26820, 0x00008627 }, /* GL_PROGRAM_LENGTH_ARB */
+   { 26842, 0x00008627 }, /* GL_PROGRAM_LENGTH_NV */
+   { 26863, 0x000088B2 }, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+   { 26903, 0x00008808 }, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+   { 26942, 0x000088AE }, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
+   { 26972, 0x000088A2 }, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+   { 27007, 0x000088AA }, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
+   { 27040, 0x000088A6 }, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
+   { 27074, 0x0000880A }, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+   { 27113, 0x00008809 }, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+   { 27152, 0x00008B40 }, /* GL_PROGRAM_OBJECT_ARB */
+   { 27174, 0x000088A8 }, /* GL_PROGRAM_PARAMETERS_ARB */
+   { 27200, 0x00008644 }, /* GL_PROGRAM_PARAMETER_NV */
+   { 27224, 0x00008647 }, /* GL_PROGRAM_RESIDENT_NV */
+   { 27247, 0x00008628 }, /* GL_PROGRAM_STRING_ARB */
+   { 27269, 0x00008628 }, /* GL_PROGRAM_STRING_NV */
+   { 27290, 0x00008646 }, /* GL_PROGRAM_TARGET_NV */
+   { 27311, 0x000088A4 }, /* GL_PROGRAM_TEMPORARIES_ARB */
+   { 27338, 0x00008807 }, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
+   { 27370, 0x00008806 }, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
+   { 27402, 0x000088B6 }, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
+   { 27437, 0x00001701 }, /* GL_PROJECTION */
+   { 27451, 0x00000BA7 }, /* GL_PROJECTION_MATRIX */
+   { 27472, 0x00000BA4 }, /* GL_PROJECTION_STACK_DEPTH */
+   { 27498, 0x00008E4F }, /* GL_PROVOKING_VERTEX_EXT */
+   { 27522, 0x000080D3 }, /* GL_PROXY_COLOR_TABLE */
+   { 27543, 0x00008025 }, /* GL_PROXY_HISTOGRAM */
+   { 27562, 0x00008025 }, /* GL_PROXY_HISTOGRAM_EXT */
+   { 27585, 0x000080D5 }, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
+   { 27624, 0x000080D4 }, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
+   { 27662, 0x00008063 }, /* GL_PROXY_TEXTURE_1D */
+   { 27682, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
+   { 27712, 0x00008063 }, /* GL_PROXY_TEXTURE_1D_EXT */
+   { 27736, 0x00008064 }, /* GL_PROXY_TEXTURE_2D */
+   { 27756, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
+   { 27786, 0x00008064 }, /* GL_PROXY_TEXTURE_2D_EXT */
+   { 27810, 0x00008070 }, /* GL_PROXY_TEXTURE_3D */
+   { 27830, 0x000080BD }, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
+   { 27863, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP */
+   { 27889, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP_ARB */
+   { 27919, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
+   { 27950, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_NV */
+   { 27980, 0x00002003 }, /* GL_Q */
+   { 27985, 0x00001209 }, /* GL_QUADRATIC_ATTENUATION */
+   { 28010, 0x00000007 }, /* GL_QUADS */
+   { 28019, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT */
+   { 28067, 0x00008614 }, /* GL_QUAD_MESH_SUN */
+   { 28084, 0x00000008 }, /* GL_QUAD_STRIP */
+   { 28098, 0x00008864 }, /* GL_QUERY_COUNTER_BITS */
+   { 28120, 0x00008864 }, /* GL_QUERY_COUNTER_BITS_ARB */
+   { 28146, 0x00008866 }, /* GL_QUERY_RESULT */
+   { 28162, 0x00008866 }, /* GL_QUERY_RESULT_ARB */
+   { 28182, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE */
+   { 28208, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE_ARB */
+   { 28238, 0x00002002 }, /* GL_R */
+   { 28243, 0x00002A10 }, /* GL_R3_G3_B2 */
+   { 28255, 0x00019262 }, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
+   { 28288, 0x00000C02 }, /* GL_READ_BUFFER */
+   { 28303, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER */
+   { 28323, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
+   { 28355, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER_EXT */
+   { 28379, 0x000088B8 }, /* GL_READ_ONLY */
+   { 28392, 0x000088B8 }, /* GL_READ_ONLY_ARB */
+   { 28409, 0x000088BA }, /* GL_READ_WRITE */
+   { 28423, 0x000088BA }, /* GL_READ_WRITE_ARB */
+   { 28441, 0x00001903 }, /* GL_RED */
+   { 28448, 0x00008016 }, /* GL_REDUCE */
+   { 28458, 0x00008016 }, /* GL_REDUCE_EXT */
+   { 28472, 0x00000D15 }, /* GL_RED_BIAS */
+   { 28484, 0x00000D52 }, /* GL_RED_BITS */
+   { 28496, 0x00000D14 }, /* GL_RED_SCALE */
+   { 28509, 0x00008512 }, /* GL_REFLECTION_MAP */
+   { 28527, 0x00008512 }, /* GL_REFLECTION_MAP_ARB */
+   { 28549, 0x00008512 }, /* GL_REFLECTION_MAP_NV */
+   { 28570, 0x00001C00 }, /* GL_RENDER */
+   { 28580, 0x00008D41 }, /* GL_RENDERBUFFER */
+   { 28596, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE */
+   { 28623, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_EXT */
+   { 28651, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE */
+   { 28677, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE */
+   { 28704, 0x00008D41 }, /* GL_RENDERBUFFER_EXT */
+   { 28724, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE */
+   { 28751, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT */
+   { 28774, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_EXT */
+   { 28801, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
+   { 28833, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */
+   { 28869, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE */
+   { 28894, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES */
+   { 28918, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE */
+   { 28947, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH */
+   { 28969, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_EXT */
+   { 28995, 0x00001F01 }, /* GL_RENDERER */
+   { 29007, 0x00000C40 }, /* GL_RENDER_MODE */
+   { 29022, 0x00002901 }, /* GL_REPEAT */
+   { 29032, 0x00001E01 }, /* GL_REPLACE */
+   { 29043, 0x00008062 }, /* GL_REPLACE_EXT */
+   { 29058, 0x00008153 }, /* GL_REPLICATE_BORDER_HP */
+   { 29081, 0x0000803A }, /* GL_RESCALE_NORMAL */
+   { 29099, 0x0000803A }, /* GL_RESCALE_NORMAL_EXT */
+   { 29121, 0x00000102 }, /* GL_RETURN */
+   { 29131, 0x00001907 }, /* GL_RGB */
+   { 29138, 0x00008052 }, /* GL_RGB10 */
+   { 29147, 0x00008059 }, /* GL_RGB10_A2 */
+   { 29159, 0x00008059 }, /* GL_RGB10_A2_EXT */
+   { 29175, 0x00008052 }, /* GL_RGB10_EXT */
+   { 29188, 0x00008053 }, /* GL_RGB12 */
+   { 29197, 0x00008053 }, /* GL_RGB12_EXT */
+   { 29210, 0x00008054 }, /* GL_RGB16 */
+   { 29219, 0x00008054 }, /* GL_RGB16_EXT */
+   { 29232, 0x0000804E }, /* GL_RGB2_EXT */
+   { 29244, 0x0000804F }, /* GL_RGB4 */
+   { 29252, 0x0000804F }, /* GL_RGB4_EXT */
+   { 29264, 0x000083A1 }, /* GL_RGB4_S3TC */
+   { 29277, 0x00008050 }, /* GL_RGB5 */
+   { 29285, 0x00008057 }, /* GL_RGB5_A1 */
+   { 29296, 0x00008057 }, /* GL_RGB5_A1_EXT */
+   { 29311, 0x00008050 }, /* GL_RGB5_EXT */
+   { 29323, 0x00008051 }, /* GL_RGB8 */
+   { 29331, 0x00008051 }, /* GL_RGB8_EXT */
+   { 29343, 0x00001908 }, /* GL_RGBA */
+   { 29351, 0x0000805A }, /* GL_RGBA12 */
+   { 29361, 0x0000805A }, /* GL_RGBA12_EXT */
+   { 29375, 0x0000805B }, /* GL_RGBA16 */
+   { 29385, 0x0000805B }, /* GL_RGBA16_EXT */
+   { 29399, 0x00008055 }, /* GL_RGBA2 */
+   { 29408, 0x00008055 }, /* GL_RGBA2_EXT */
+   { 29421, 0x00008056 }, /* GL_RGBA4 */
+   { 29430, 0x000083A5 }, /* GL_RGBA4_DXT5_S3TC */
+   { 29449, 0x00008056 }, /* GL_RGBA4_EXT */
+   { 29462, 0x000083A3 }, /* GL_RGBA4_S3TC */
+   { 29476, 0x00008058 }, /* GL_RGBA8 */
+   { 29485, 0x00008058 }, /* GL_RGBA8_EXT */
+   { 29498, 0x00008F97 }, /* GL_RGBA8_SNORM */
+   { 29513, 0x000083A4 }, /* GL_RGBA_DXT5_S3TC */
+   { 29531, 0x00000C31 }, /* GL_RGBA_MODE */
+   { 29544, 0x000083A2 }, /* GL_RGBA_S3TC */
+   { 29557, 0x00008F93 }, /* GL_RGBA_SNORM */
+   { 29571, 0x000083A0 }, /* GL_RGB_S3TC */
+   { 29583, 0x00008573 }, /* GL_RGB_SCALE */
+   { 29596, 0x00008573 }, /* GL_RGB_SCALE_ARB */
+   { 29613, 0x00008573 }, /* GL_RGB_SCALE_EXT */
+   { 29630, 0x00000407 }, /* GL_RIGHT */
+   { 29639, 0x00002000 }, /* GL_S */
+   { 29644, 0x00008B5D }, /* GL_SAMPLER_1D */
+   { 29658, 0x00008B61 }, /* GL_SAMPLER_1D_SHADOW */
+   { 29679, 0x00008B5E }, /* GL_SAMPLER_2D */
+   { 29693, 0x00008B62 }, /* GL_SAMPLER_2D_SHADOW */
+   { 29714, 0x00008B5F }, /* GL_SAMPLER_3D */
+   { 29728, 0x00008B60 }, /* GL_SAMPLER_CUBE */
+   { 29744, 0x000080A9 }, /* GL_SAMPLES */
+   { 29755, 0x000086B4 }, /* GL_SAMPLES_3DFX */
+   { 29771, 0x000080A9 }, /* GL_SAMPLES_ARB */
+   { 29786, 0x00008914 }, /* GL_SAMPLES_PASSED */
+   { 29804, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */
+   { 29826, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
+   { 29854, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */
+   { 29886, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */
+   { 29909, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */
+   { 29936, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */
+   { 29954, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */
+   { 29977, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */
+   { 29999, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */
+   { 30018, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */
+   { 30041, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */
+   { 30067, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */
+   { 30097, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */
+   { 30122, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */
+   { 30151, 0x00080000 }, /* GL_SCISSOR_BIT */
+   { 30166, 0x00000C10 }, /* GL_SCISSOR_BOX */
+   { 30181, 0x00000C11 }, /* GL_SCISSOR_TEST */
+   { 30197, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */
+   { 30222, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
+   { 30262, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */
+   { 30306, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
+   { 30339, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
+   { 30369, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
+   { 30401, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
+   { 30431, 0x00001C02 }, /* GL_SELECT */
+   { 30441, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */
+   { 30469, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */
+   { 30494, 0x00008012 }, /* GL_SEPARABLE_2D */
+   { 30510, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */
+   { 30537, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */
+   { 30568, 0x0000150F }, /* GL_SET */
+   { 30575, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */
+   { 30596, 0x00008B88 }, /* GL_SHADER_SOURCE_LENGTH */
+   { 30620, 0x00008B4F }, /* GL_SHADER_TYPE */
+   { 30635, 0x00000B54 }, /* GL_SHADE_MODEL */
+   { 30650, 0x00008B8C }, /* GL_SHADING_LANGUAGE_VERSION */
+   { 30678, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */
+   { 30701, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */
+   { 30731, 0x00001601 }, /* GL_SHININESS */
+   { 30744, 0x00001402 }, /* GL_SHORT */
+   { 30753, 0x00009119 }, /* GL_SIGNALED */
+   { 30765, 0x00008F9C }, /* GL_SIGNED_NORMALIZED */
+   { 30786, 0x000081F9 }, /* GL_SINGLE_COLOR */
+   { 30802, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */
+   { 30822, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */
+   { 30841, 0x00008C46 }, /* GL_SLUMINANCE */
+   { 30855, 0x00008C47 }, /* GL_SLUMINANCE8 */
+   { 30870, 0x00008C45 }, /* GL_SLUMINANCE8_ALPHA8 */
+   { 30892, 0x00008C44 }, /* GL_SLUMINANCE_ALPHA */
+   { 30912, 0x00001D01 }, /* GL_SMOOTH */
+   { 30922, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */
+   { 30955, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */
+   { 30982, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */
+   { 31015, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */
+   { 31042, 0x00008588 }, /* GL_SOURCE0_ALPHA */
+   { 31059, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */
+   { 31080, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */
+   { 31101, 0x00008580 }, /* GL_SOURCE0_RGB */
+   { 31116, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */
+   { 31135, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */
+   { 31154, 0x00008589 }, /* GL_SOURCE1_ALPHA */
+   { 31171, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */
+   { 31192, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */
+   { 31213, 0x00008581 }, /* GL_SOURCE1_RGB */
+   { 31228, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */
+   { 31247, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */
+   { 31266, 0x0000858A }, /* GL_SOURCE2_ALPHA */
+   { 31283, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */
+   { 31304, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */
+   { 31325, 0x00008582 }, /* GL_SOURCE2_RGB */
+   { 31340, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */
+   { 31359, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */
+   { 31378, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */
+   { 31398, 0x00008583 }, /* GL_SOURCE3_RGB_NV */
+   { 31416, 0x00001202 }, /* GL_SPECULAR */
+   { 31428, 0x00002402 }, /* GL_SPHERE_MAP */
+   { 31442, 0x00001206 }, /* GL_SPOT_CUTOFF */
+   { 31457, 0x00001204 }, /* GL_SPOT_DIRECTION */
+   { 31475, 0x00001205 }, /* GL_SPOT_EXPONENT */
+   { 31492, 0x00008588 }, /* GL_SRC0_ALPHA */
+   { 31506, 0x00008580 }, /* GL_SRC0_RGB */
+   { 31518, 0x00008589 }, /* GL_SRC1_ALPHA */
+   { 31532, 0x00008581 }, /* GL_SRC1_RGB */
+   { 31544, 0x0000858A }, /* GL_SRC2_ALPHA */
+   { 31558, 0x00008582 }, /* GL_SRC2_RGB */
+   { 31570, 0x00000302 }, /* GL_SRC_ALPHA */
+   { 31583, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */
+   { 31605, 0x00000300 }, /* GL_SRC_COLOR */
+   { 31618, 0x00008C40 }, /* GL_SRGB */
+   { 31626, 0x00008C41 }, /* GL_SRGB8 */
+   { 31635, 0x00008C43 }, /* GL_SRGB8_ALPHA8 */
+   { 31651, 0x00008C42 }, /* GL_SRGB_ALPHA */
+   { 31665, 0x00000503 }, /* GL_STACK_OVERFLOW */
+   { 31683, 0x00000504 }, /* GL_STACK_UNDERFLOW */
+   { 31702, 0x000088E6 }, /* GL_STATIC_COPY */
+   { 31717, 0x000088E6 }, /* GL_STATIC_COPY_ARB */
+   { 31736, 0x000088E4 }, /* GL_STATIC_DRAW */
+   { 31751, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */
+   { 31770, 0x000088E5 }, /* GL_STATIC_READ */
+   { 31785, 0x000088E5 }, /* GL_STATIC_READ_ARB */
+   { 31804, 0x00001802 }, /* GL_STENCIL */
+   { 31815, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT */
+   { 31837, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */
+   { 31863, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */
+   { 31884, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */
+   { 31909, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
+   { 31930, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */
+   { 31955, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
+   { 31987, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */
+   { 32023, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
+   { 32055, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */
+   { 32091, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
+   { 32111, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
+   { 32138, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
+   { 32164, 0x00000D57 }, /* GL_STENCIL_BITS */
+   { 32180, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
+   { 32202, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
+   { 32225, 0x00000B94 }, /* GL_STENCIL_FAIL */
+   { 32241, 0x00000B92 }, /* GL_STENCIL_FUNC */
+   { 32257, 0x00001901 }, /* GL_STENCIL_INDEX */
+   { 32274, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
+   { 32297, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
+   { 32319, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
+   { 32341, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
+   { 32363, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
+   { 32384, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
+   { 32411, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
+   { 32438, 0x00000B97 }, /* GL_STENCIL_REF */
+   { 32453, 0x00000B90 }, /* GL_STENCIL_TEST */
+   { 32469, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
+   { 32498, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
+   { 32520, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
+   { 32541, 0x00000C33 }, /* GL_STEREO */
+   { 32551, 0x000085BE }, /* GL_STORAGE_CACHED_APPLE */
+   { 32575, 0x000085BD }, /* GL_STORAGE_PRIVATE_APPLE */
+   { 32600, 0x000085BF }, /* GL_STORAGE_SHARED_APPLE */
+   { 32624, 0x000088E2 }, /* GL_STREAM_COPY */
+   { 32639, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
+   { 32658, 0x000088E0 }, /* GL_STREAM_DRAW */
+   { 32673, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
+   { 32692, 0x000088E1 }, /* GL_STREAM_READ */
+   { 32707, 0x000088E1 }, /* GL_STREAM_READ_ARB */
+   { 32726, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
+   { 32743, 0x000084E7 }, /* GL_SUBTRACT */
+   { 32755, 0x000084E7 }, /* GL_SUBTRACT_ARB */
+   { 32771, 0x00009113 }, /* GL_SYNC_CONDITION */
+   { 32789, 0x00009116 }, /* GL_SYNC_FENCE */
+   { 32803, 0x00009115 }, /* GL_SYNC_FLAGS */
+   { 32817, 0x00000001 }, /* GL_SYNC_FLUSH_COMMANDS_BIT */
+   { 32844, 0x00009117 }, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
+   { 32874, 0x00009114 }, /* GL_SYNC_STATUS */
+   { 32889, 0x00002001 }, /* GL_T */
+   { 32894, 0x00002A2A }, /* GL_T2F_C3F_V3F */
+   { 32909, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
+   { 32928, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
+   { 32944, 0x00002A2B }, /* GL_T2F_N3F_V3F */
+   { 32959, 0x00002A27 }, /* GL_T2F_V3F */
+   { 32970, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
+   { 32989, 0x00002A28 }, /* GL_T4F_V4F */
+   { 33000, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
+   { 33023, 0x00001702 }, /* GL_TEXTURE */
+   { 33034, 0x000084C0 }, /* GL_TEXTURE0 */
+   { 33046, 0x000084C0 }, /* GL_TEXTURE0_ARB */
+   { 33062, 0x000084C1 }, /* GL_TEXTURE1 */
+   { 33074, 0x000084CA }, /* GL_TEXTURE10 */
+   { 33087, 0x000084CA }, /* GL_TEXTURE10_ARB */
+   { 33104, 0x000084CB }, /* GL_TEXTURE11 */
+   { 33117, 0x000084CB }, /* GL_TEXTURE11_ARB */
+   { 33134, 0x000084CC }, /* GL_TEXTURE12 */
+   { 33147, 0x000084CC }, /* GL_TEXTURE12_ARB */
+   { 33164, 0x000084CD }, /* GL_TEXTURE13 */
+   { 33177, 0x000084CD }, /* GL_TEXTURE13_ARB */
+   { 33194, 0x000084CE }, /* GL_TEXTURE14 */
+   { 33207, 0x000084CE }, /* GL_TEXTURE14_ARB */
+   { 33224, 0x000084CF }, /* GL_TEXTURE15 */
+   { 33237, 0x000084CF }, /* GL_TEXTURE15_ARB */
+   { 33254, 0x000084D0 }, /* GL_TEXTURE16 */
+   { 33267, 0x000084D0 }, /* GL_TEXTURE16_ARB */
+   { 33284, 0x000084D1 }, /* GL_TEXTURE17 */
+   { 33297, 0x000084D1 }, /* GL_TEXTURE17_ARB */
+   { 33314, 0x000084D2 }, /* GL_TEXTURE18 */
+   { 33327, 0x000084D2 }, /* GL_TEXTURE18_ARB */
+   { 33344, 0x000084D3 }, /* GL_TEXTURE19 */
+   { 33357, 0x000084D3 }, /* GL_TEXTURE19_ARB */
+   { 33374, 0x000084C1 }, /* GL_TEXTURE1_ARB */
+   { 33390, 0x000084C2 }, /* GL_TEXTURE2 */
+   { 33402, 0x000084D4 }, /* GL_TEXTURE20 */
+   { 33415, 0x000084D4 }, /* GL_TEXTURE20_ARB */
+   { 33432, 0x000084D5 }, /* GL_TEXTURE21 */
+   { 33445, 0x000084D5 }, /* GL_TEXTURE21_ARB */
+   { 33462, 0x000084D6 }, /* GL_TEXTURE22 */
+   { 33475, 0x000084D6 }, /* GL_TEXTURE22_ARB */
+   { 33492, 0x000084D7 }, /* GL_TEXTURE23 */
+   { 33505, 0x000084D7 }, /* GL_TEXTURE23_ARB */
+   { 33522, 0x000084D8 }, /* GL_TEXTURE24 */
+   { 33535, 0x000084D8 }, /* GL_TEXTURE24_ARB */
+   { 33552, 0x000084D9 }, /* GL_TEXTURE25 */
+   { 33565, 0x000084D9 }, /* GL_TEXTURE25_ARB */
+   { 33582, 0x000084DA }, /* GL_TEXTURE26 */
+   { 33595, 0x000084DA }, /* GL_TEXTURE26_ARB */
+   { 33612, 0x000084DB }, /* GL_TEXTURE27 */
+   { 33625, 0x000084DB }, /* GL_TEXTURE27_ARB */
+   { 33642, 0x000084DC }, /* GL_TEXTURE28 */
+   { 33655, 0x000084DC }, /* GL_TEXTURE28_ARB */
+   { 33672, 0x000084DD }, /* GL_TEXTURE29 */
+   { 33685, 0x000084DD }, /* GL_TEXTURE29_ARB */
+   { 33702, 0x000084C2 }, /* GL_TEXTURE2_ARB */
+   { 33718, 0x000084C3 }, /* GL_TEXTURE3 */
+   { 33730, 0x000084DE }, /* GL_TEXTURE30 */
+   { 33743, 0x000084DE }, /* GL_TEXTURE30_ARB */
+   { 33760, 0x000084DF }, /* GL_TEXTURE31 */
+   { 33773, 0x000084DF }, /* GL_TEXTURE31_ARB */
+   { 33790, 0x000084C3 }, /* GL_TEXTURE3_ARB */
+   { 33806, 0x000084C4 }, /* GL_TEXTURE4 */
+   { 33818, 0x000084C4 }, /* GL_TEXTURE4_ARB */
+   { 33834, 0x000084C5 }, /* GL_TEXTURE5 */
+   { 33846, 0x000084C5 }, /* GL_TEXTURE5_ARB */
+   { 33862, 0x000084C6 }, /* GL_TEXTURE6 */
+   { 33874, 0x000084C6 }, /* GL_TEXTURE6_ARB */
+   { 33890, 0x000084C7 }, /* GL_TEXTURE7 */
+   { 33902, 0x000084C7 }, /* GL_TEXTURE7_ARB */
+   { 33918, 0x000084C8 }, /* GL_TEXTURE8 */
+   { 33930, 0x000084C8 }, /* GL_TEXTURE8_ARB */
+   { 33946, 0x000084C9 }, /* GL_TEXTURE9 */
+   { 33958, 0x000084C9 }, /* GL_TEXTURE9_ARB */
+   { 33974, 0x00000DE0 }, /* GL_TEXTURE_1D */
+   { 33988, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
+   { 34012, 0x00000DE1 }, /* GL_TEXTURE_2D */
+   { 34026, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
+   { 34050, 0x0000806F }, /* GL_TEXTURE_3D */
+   { 34064, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
+   { 34086, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
+   { 34112, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
+   { 34134, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
+   { 34156, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
+   { 34188, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
+   { 34210, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
+   { 34242, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
+   { 34264, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
+   { 34292, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
+   { 34324, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
+   { 34357, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
+   { 34389, 0x00040000 }, /* GL_TEXTURE_BIT */
+   { 34404, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
+   { 34425, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
+   { 34450, 0x00001005 }, /* GL_TEXTURE_BORDER */
+   { 34468, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
+   { 34492, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
+   { 34523, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
+   { 34553, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
+   { 34583, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
+   { 34618, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
+   { 34649, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+   { 34687, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
+   { 34714, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
+   { 34746, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+   { 34780, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
+   { 34804, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
+   { 34832, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
+   { 34856, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
+   { 34884, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
+   { 34917, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
+   { 34941, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
+   { 34963, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
+   { 34985, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
+   { 35011, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
+   { 35045, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
+   { 35078, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
+   { 35115, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
+   { 35143, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
+   { 35175, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
+   { 35198, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
+   { 35236, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
+   { 35278, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
+   { 35309, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
+   { 35337, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
+   { 35367, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
+   { 35395, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
+   { 35415, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
+   { 35439, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
+   { 35470, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
+   { 35505, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
+   { 35536, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
+   { 35571, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
+   { 35602, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
+   { 35637, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
+   { 35668, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
+   { 35703, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
+   { 35734, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
+   { 35769, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
+   { 35800, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
+   { 35835, 0x000088F4 }, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
+   { 35864, 0x00008071 }, /* GL_TEXTURE_DEPTH */
+   { 35881, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
+   { 35903, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
+   { 35929, 0x00002300 }, /* GL_TEXTURE_ENV */
+   { 35944, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
+   { 35965, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
+   { 35985, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
+   { 36011, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
+   { 36031, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
+   { 36048, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
+   { 36065, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
+   { 36082, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
+   { 36099, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
+   { 36124, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
+   { 36146, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
+   { 36172, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
+   { 36190, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
+   { 36216, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
+   { 36242, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
+   { 36272, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
+   { 36299, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
+   { 36324, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
+   { 36344, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
+   { 36368, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+   { 36395, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+   { 36422, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+   { 36449, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
+   { 36475, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
+   { 36505, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
+   { 36527, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
+   { 36545, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+   { 36575, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+   { 36603, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+   { 36631, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+   { 36659, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
+   { 36680, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
+   { 36699, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
+   { 36721, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
+   { 36740, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
+   { 36760, 0x000085B7 }, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
+   { 36790, 0x000085B8 }, /* GL_TEXTURE_RANGE_POINTER_APPLE */
+   { 36821, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
+   { 36846, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
+   { 36870, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
+   { 36890, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
+   { 36914, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
+   { 36934, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
+   { 36957, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */
+   { 36981, 0x000085BC }, /* GL_TEXTURE_STORAGE_HINT_APPLE */
+   { 37011, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
+   { 37036, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+   { 37070, 0x00001000 }, /* GL_TEXTURE_WIDTH */
+   { 37087, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
+   { 37105, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
+   { 37123, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
+   { 37141, 0x0000911B }, /* GL_TIMEOUT_EXPIRED */
+   { 37160, 0xFFFFFFFFFFFFFFFF }, /* GL_TIMEOUT_IGNORED */
+   { 37179, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
+   { 37199, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
+   { 37218, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+   { 37247, 0x00001000 }, /* GL_TRANSFORM_BIT */
+   { 37264, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
+   { 37290, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
+   { 37320, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+   { 37352, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+   { 37382, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
+   { 37416, 0x0000862C }, /* GL_TRANSPOSE_NV */
+   { 37432, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+   { 37463, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
+   { 37498, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+   { 37526, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
+   { 37558, 0x00000004 }, /* GL_TRIANGLES */
+   { 37571, 0x00000006 }, /* GL_TRIANGLE_FAN */
+   { 37587, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
+   { 37608, 0x00000005 }, /* GL_TRIANGLE_STRIP */
+   { 37626, 0x00000001 }, /* GL_TRUE */
+   { 37634, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
+   { 37654, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
+   { 37677, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
+   { 37697, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
+   { 37718, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
+   { 37740, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
+   { 37762, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
+   { 37782, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
+   { 37803, 0x00009118 }, /* GL_UNSIGNALED */
+   { 37817, 0x00001401 }, /* GL_UNSIGNED_BYTE */
+   { 37834, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+   { 37861, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
+   { 37884, 0x00001405 }, /* GL_UNSIGNED_INT */
+   { 37900, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
+   { 37927, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */
+   { 37948, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
+   { 37972, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+   { 38003, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
+   { 38027, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+   { 38055, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */
+   { 38078, 0x00001403 }, /* GL_UNSIGNED_SHORT */
+   { 38096, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+   { 38126, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+   { 38152, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+   { 38182, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+   { 38208, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
+   { 38232, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+   { 38260, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+   { 38288, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
+   { 38315, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+   { 38347, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
+   { 38378, 0x00008CA2 }, /* GL_UPPER_LEFT */
+   { 38392, 0x00002A20 }, /* GL_V2F */
+   { 38399, 0x00002A21 }, /* GL_V3F */
+   { 38406, 0x00008B83 }, /* GL_VALIDATE_STATUS */
+   { 38425, 0x00001F00 }, /* GL_VENDOR */
+   { 38435, 0x00001F02 }, /* GL_VERSION */
+   { 38446, 0x00008074 }, /* GL_VERTEX_ARRAY */
+   { 38462, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING */
+   { 38486, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
+   { 38516, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+   { 38547, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
+   { 38582, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
+   { 38606, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
+   { 38627, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
+   { 38650, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
+   { 38671, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+   { 38698, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+   { 38726, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+   { 38754, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+   { 38782, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+   { 38810, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+   { 38838, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+   { 38866, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+   { 38893, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+   { 38920, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+   { 38947, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+   { 38974, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+   { 39001, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+   { 39028, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+   { 39055, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+   { 39082, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+   { 39109, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+   { 39147, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
+   { 39189, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+   { 39220, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
+   { 39255, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+   { 39289, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
+   { 39327, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+   { 39358, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
+   { 39393, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+   { 39421, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
+   { 39453, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+   { 39483, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
+   { 39517, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+   { 39545, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
+   { 39577, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
+   { 39597, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
+   { 39619, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
+   { 39648, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
+   { 39669, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
+   { 39698, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
+   { 39731, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
+   { 39763, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+   { 39790, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
+   { 39821, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
+   { 39851, 0x00008B31 }, /* GL_VERTEX_SHADER */
+   { 39868, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
+   { 39889, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
+   { 39916, 0x00000BA2 }, /* GL_VIEWPORT */
+   { 39928, 0x00000800 }, /* GL_VIEWPORT_BIT */
+   { 39944, 0x0000911D }, /* GL_WAIT_FAILED */
+   { 39959, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
+   { 39979, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+   { 40010, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
+   { 40045, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+   { 40073, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+   { 40098, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+   { 40125, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+   { 40150, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
+   { 40174, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
+   { 40193, 0x000088B9 }, /* GL_WRITE_ONLY */
+   { 40207, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
+   { 40225, 0x00001506 }, /* GL_XOR */
+   { 40232, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
+   { 40251, 0x00008757 }, /* GL_YCBCR_MESA */
+   { 40265, 0x00000000 }, /* GL_ZERO */
+   { 40273, 0x00000D16 }, /* GL_ZOOM_X */
+   { 40283, 0x00000D17 }, /* GL_ZOOM_Y */
 };
 
 static const unsigned reduced_enums[1347] =
 {
-       475, /* GL_FALSE */
-       691, /* GL_LINES */
-       693, /* GL_LINE_LOOP */
-       700, /* GL_LINE_STRIP */
-      1743, /* GL_TRIANGLES */
-      1746, /* GL_TRIANGLE_STRIP */
-      1744, /* GL_TRIANGLE_FAN */
-      1271, /* GL_QUADS */
-      1274, /* GL_QUAD_STRIP */
-      1158, /* GL_POLYGON */
-      1170, /* GL_POLYGON_STIPPLE_BIT */
-      1119, /* GL_PIXEL_MODE_BIT */
-       678, /* GL_LIGHTING_BIT */
-       504, /* GL_FOG_BIT */
+       476, /* GL_FALSE */
+       692, /* GL_LINES */
+       694, /* GL_LINE_LOOP */
+       701, /* GL_LINE_STRIP */
+      1744, /* GL_TRIANGLES */
+      1747, /* GL_TRIANGLE_STRIP */
+      1745, /* GL_TRIANGLE_FAN */
+      1272, /* GL_QUADS */
+      1275, /* GL_QUAD_STRIP */
+      1159, /* GL_POLYGON */
+      1171, /* GL_POLYGON_STIPPLE_BIT */
+      1120, /* GL_PIXEL_MODE_BIT */
+       679, /* GL_LIGHTING_BIT */
+       505, /* GL_FOG_BIT */
          8, /* GL_ACCUM */
-       710, /* GL_LOAD */
-      1326, /* GL_RETURN */
-       991, /* GL_MULT */
+       711, /* GL_LOAD */
+      1327, /* GL_RETURN */
+       992, /* GL_MULT */
         23, /* GL_ADD */
-      1007, /* GL_NEVER */
-       668, /* GL_LESS */
-       465, /* GL_EQUAL */
-       667, /* GL_LEQUAL */
-       590, /* GL_GREATER */
-      1022, /* GL_NOTEQUAL */
-       589, /* GL_GEQUAL */
+      1008, /* GL_NEVER */
+       669, /* GL_LESS */
+       466, /* GL_EQUAL */
+       668, /* GL_LEQUAL */
+       591, /* GL_GREATER */
+      1023, /* GL_NOTEQUAL */
+       590, /* GL_GEQUAL */
         47, /* GL_ALWAYS */
-      1467, /* GL_SRC_COLOR */
-      1052, /* GL_ONE_MINUS_SRC_COLOR */
-      1465, /* GL_SRC_ALPHA */
-      1051, /* GL_ONE_MINUS_SRC_ALPHA */
-       444, /* GL_DST_ALPHA */
-      1049, /* GL_ONE_MINUS_DST_ALPHA */
-       445, /* GL_DST_COLOR */
-      1050, /* GL_ONE_MINUS_DST_COLOR */
-      1466, /* GL_SRC_ALPHA_SATURATE */
-       577, /* GL_FRONT_LEFT */
-       578, /* GL_FRONT_RIGHT */
+      1468, /* GL_SRC_COLOR */
+      1053, /* GL_ONE_MINUS_SRC_COLOR */
+      1466, /* GL_SRC_ALPHA */
+      1052, /* GL_ONE_MINUS_SRC_ALPHA */
+       445, /* GL_DST_ALPHA */
+      1050, /* GL_ONE_MINUS_DST_ALPHA */
+       446, /* GL_DST_COLOR */
+      1051, /* GL_ONE_MINUS_DST_COLOR */
+      1467, /* GL_SRC_ALPHA_SATURATE */
+       578, /* GL_FRONT_LEFT */
+       579, /* GL_FRONT_RIGHT */
         69, /* GL_BACK_LEFT */
         70, /* GL_BACK_RIGHT */
-       574, /* GL_FRONT */
+       575, /* GL_FRONT */
         68, /* GL_BACK */
-       666, /* GL_LEFT */
-      1368, /* GL_RIGHT */
-       575, /* GL_FRONT_AND_BACK */
+       667, /* GL_LEFT */
+      1369, /* GL_RIGHT */
+       576, /* GL_FRONT_AND_BACK */
         63, /* GL_AUX0 */
         64, /* GL_AUX1 */
         65, /* GL_AUX2 */
         66, /* GL_AUX3 */
-       656, /* GL_INVALID_ENUM */
-       660, /* GL_INVALID_VALUE */
-       659, /* GL_INVALID_OPERATION */
-      1472, /* GL_STACK_OVERFLOW */
-      1473, /* GL_STACK_UNDERFLOW */
-      1077, /* GL_OUT_OF_MEMORY */
-       657, /* GL_INVALID_FRAMEBUFFER_OPERATION */
+       657, /* GL_INVALID_ENUM */
+       661, /* GL_INVALID_VALUE */
+       660, /* GL_INVALID_OPERATION */
+      1473, /* GL_STACK_OVERFLOW */
+      1474, /* GL_STACK_UNDERFLOW */
+      1078, /* GL_OUT_OF_MEMORY */
+       658, /* GL_INVALID_FRAMEBUFFER_OPERATION */
          0, /* GL_2D */
          2, /* GL_3D */
          3, /* GL_3D_COLOR */
          4, /* GL_3D_COLOR_TEXTURE */
          6, /* GL_4D_COLOR_TEXTURE */
-      1097, /* GL_PASS_THROUGH_TOKEN */
-      1157, /* GL_POINT_TOKEN */
-       701, /* GL_LINE_TOKEN */
-      1171, /* GL_POLYGON_TOKEN */
+      1098, /* GL_PASS_THROUGH_TOKEN */
+      1158, /* GL_POINT_TOKEN */
+       702, /* GL_LINE_TOKEN */
+      1172, /* GL_POLYGON_TOKEN */
         74, /* GL_BITMAP_TOKEN */
-       443, /* GL_DRAW_PIXEL_TOKEN */
+       444, /* GL_DRAW_PIXEL_TOKEN */
        301, /* GL_COPY_PIXEL_TOKEN */
-       694, /* GL_LINE_RESET_TOKEN */
-       468, /* GL_EXP */
-       469, /* GL_EXP2 */
+       695, /* GL_LINE_RESET_TOKEN */
+       469, /* GL_EXP */
+       470, /* GL_EXP2 */
        337, /* GL_CW */
        125, /* GL_CCW */
        146, /* GL_COEFF */
-      1074, /* GL_ORDER */
-       381, /* GL_DOMAIN */
+      1075, /* GL_ORDER */
+       382, /* GL_DOMAIN */
        311, /* GL_CURRENT_COLOR */
        314, /* GL_CURRENT_INDEX */
        320, /* GL_CURRENT_NORMAL */
@@ -3844,519 +3846,519 @@ static const unsigned reduced_enums[1347] =
        328, /* GL_CURRENT_RASTER_POSITION */
        329, /* GL_CURRENT_RASTER_POSITION_VALID */
        326, /* GL_CURRENT_RASTER_DISTANCE */
-      1150, /* GL_POINT_SMOOTH */
-      1139, /* GL_POINT_SIZE */
-      1149, /* GL_POINT_SIZE_RANGE */
-      1140, /* GL_POINT_SIZE_GRANULARITY */
-       695, /* GL_LINE_SMOOTH */
-       702, /* GL_LINE_WIDTH */
-       704, /* GL_LINE_WIDTH_RANGE */
-       703, /* GL_LINE_WIDTH_GRANULARITY */
-       697, /* GL_LINE_STIPPLE */
-       698, /* GL_LINE_STIPPLE_PATTERN */
-       699, /* GL_LINE_STIPPLE_REPEAT */
-       709, /* GL_LIST_MODE */
-       874, /* GL_MAX_LIST_NESTING */
-       706, /* GL_LIST_BASE */
-       708, /* GL_LIST_INDEX */
-      1160, /* GL_POLYGON_MODE */
-      1167, /* GL_POLYGON_SMOOTH */
-      1169, /* GL_POLYGON_STIPPLE */
-       454, /* GL_EDGE_FLAG */
+      1151, /* GL_POINT_SMOOTH */
+      1140, /* GL_POINT_SIZE */
+      1150, /* GL_POINT_SIZE_RANGE */
+      1141, /* GL_POINT_SIZE_GRANULARITY */
+       696, /* GL_LINE_SMOOTH */
+       703, /* GL_LINE_WIDTH */
+       705, /* GL_LINE_WIDTH_RANGE */
+       704, /* GL_LINE_WIDTH_GRANULARITY */
+       698, /* GL_LINE_STIPPLE */
+       699, /* GL_LINE_STIPPLE_PATTERN */
+       700, /* GL_LINE_STIPPLE_REPEAT */
+       710, /* GL_LIST_MODE */
+       875, /* GL_MAX_LIST_NESTING */
+       707, /* GL_LIST_BASE */
+       709, /* GL_LIST_INDEX */
+      1161, /* GL_POLYGON_MODE */
+      1168, /* GL_POLYGON_SMOOTH */
+      1170, /* GL_POLYGON_STIPPLE */
+       455, /* GL_EDGE_FLAG */
        304, /* GL_CULL_FACE */
        305, /* GL_CULL_FACE_MODE */
-       576, /* GL_FRONT_FACE */
-       677, /* GL_LIGHTING */
-       682, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
-       683, /* GL_LIGHT_MODEL_TWO_SIDE */
-       679, /* GL_LIGHT_MODEL_AMBIENT */
-      1414, /* GL_SHADE_MODEL */
+       577, /* GL_FRONT_FACE */
+       678, /* GL_LIGHTING */
+       683, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
+       684, /* GL_LIGHT_MODEL_TWO_SIDE */
+       680, /* GL_LIGHT_MODEL_AMBIENT */
+      1415, /* GL_SHADE_MODEL */
        193, /* GL_COLOR_MATERIAL_FACE */
        194, /* GL_COLOR_MATERIAL_PARAMETER */
        192, /* GL_COLOR_MATERIAL */
-       503, /* GL_FOG */
-       525, /* GL_FOG_INDEX */
-       521, /* GL_FOG_DENSITY */
-       529, /* GL_FOG_START */
-       523, /* GL_FOG_END */
-       526, /* GL_FOG_MODE */
-       505, /* GL_FOG_COLOR */
-       368, /* GL_DEPTH_RANGE */
-       375, /* GL_DEPTH_TEST */
-       378, /* GL_DEPTH_WRITEMASK */
-       356, /* GL_DEPTH_CLEAR_VALUE */
-       367, /* GL_DEPTH_FUNC */
+       504, /* GL_FOG */
+       526, /* GL_FOG_INDEX */
+       522, /* GL_FOG_DENSITY */
+       530, /* GL_FOG_START */
+       524, /* GL_FOG_END */
+       527, /* GL_FOG_MODE */
+       506, /* GL_FOG_COLOR */
+       369, /* GL_DEPTH_RANGE */
+       376, /* GL_DEPTH_TEST */
+       379, /* GL_DEPTH_WRITEMASK */
+       357, /* GL_DEPTH_CLEAR_VALUE */
+       368, /* GL_DEPTH_FUNC */
         12, /* GL_ACCUM_CLEAR_VALUE */
-      1508, /* GL_STENCIL_TEST */
-      1496, /* GL_STENCIL_CLEAR_VALUE */
-      1498, /* GL_STENCIL_FUNC */
-      1510, /* GL_STENCIL_VALUE_MASK */
-      1497, /* GL_STENCIL_FAIL */
-      1505, /* GL_STENCIL_PASS_DEPTH_FAIL */
-      1506, /* GL_STENCIL_PASS_DEPTH_PASS */
-      1507, /* GL_STENCIL_REF */
-      1511, /* GL_STENCIL_WRITEMASK */
-       843, /* GL_MATRIX_MODE */
-      1012, /* GL_NORMALIZE */
-      1837, /* GL_VIEWPORT */
-       986, /* GL_MODELVIEW_STACK_DEPTH */
-      1250, /* GL_PROJECTION_STACK_DEPTH */
-      1718, /* GL_TEXTURE_STACK_DEPTH */
-       984, /* GL_MODELVIEW_MATRIX */
-      1249, /* GL_PROJECTION_MATRIX */
-      1701, /* GL_TEXTURE_MATRIX */
+      1509, /* GL_STENCIL_TEST */
+      1497, /* GL_STENCIL_CLEAR_VALUE */
+      1499, /* GL_STENCIL_FUNC */
+      1511, /* GL_STENCIL_VALUE_MASK */
+      1498, /* GL_STENCIL_FAIL */
+      1506, /* GL_STENCIL_PASS_DEPTH_FAIL */
+      1507, /* GL_STENCIL_PASS_DEPTH_PASS */
+      1508, /* GL_STENCIL_REF */
+      1512, /* GL_STENCIL_WRITEMASK */
+       844, /* GL_MATRIX_MODE */
+      1013, /* GL_NORMALIZE */
+      1838, /* GL_VIEWPORT */
+       987, /* GL_MODELVIEW_STACK_DEPTH */
+      1251, /* GL_PROJECTION_STACK_DEPTH */
+      1719, /* GL_TEXTURE_STACK_DEPTH */
+       985, /* GL_MODELVIEW_MATRIX */
+      1250, /* GL_PROJECTION_MATRIX */
+      1702, /* GL_TEXTURE_MATRIX */
         61, /* GL_ATTRIB_STACK_DEPTH */
        136, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
         43, /* GL_ALPHA_TEST */
         44, /* GL_ALPHA_TEST_FUNC */
         45, /* GL_ALPHA_TEST_REF */
-       380, /* GL_DITHER */
+       381, /* GL_DITHER */
         78, /* GL_BLEND_DST */
         87, /* GL_BLEND_SRC */
         75, /* GL_BLEND */
-       712, /* GL_LOGIC_OP_MODE */
-       630, /* GL_INDEX_LOGIC_OP */
+       713, /* GL_LOGIC_OP_MODE */
+       631, /* GL_INDEX_LOGIC_OP */
        191, /* GL_COLOR_LOGIC_OP */
         67, /* GL_AUX_BUFFERS */
-       391, /* GL_DRAW_BUFFER */
-      1284, /* GL_READ_BUFFER */
-      1395, /* GL_SCISSOR_BOX */
-      1396, /* GL_SCISSOR_TEST */
-       629, /* GL_INDEX_CLEAR_VALUE */
-       634, /* GL_INDEX_WRITEMASK */
+       392, /* GL_DRAW_BUFFER */
+      1285, /* GL_READ_BUFFER */
+      1396, /* GL_SCISSOR_BOX */
+      1397, /* GL_SCISSOR_TEST */
+       630, /* GL_INDEX_CLEAR_VALUE */
+       635, /* GL_INDEX_WRITEMASK */
        188, /* GL_COLOR_CLEAR_VALUE */
        230, /* GL_COLOR_WRITEMASK */
-       631, /* GL_INDEX_MODE */
-      1361, /* GL_RGBA_MODE */
-       390, /* GL_DOUBLEBUFFER */
-      1512, /* GL_STEREO */
-      1319, /* GL_RENDER_MODE */
-      1098, /* GL_PERSPECTIVE_CORRECTION_HINT */
-      1151, /* GL_POINT_SMOOTH_HINT */
-       696, /* GL_LINE_SMOOTH_HINT */
-      1168, /* GL_POLYGON_SMOOTH_HINT */
-       524, /* GL_FOG_HINT */
-      1682, /* GL_TEXTURE_GEN_S */
-      1683, /* GL_TEXTURE_GEN_T */
-      1681, /* GL_TEXTURE_GEN_R */
-      1680, /* GL_TEXTURE_GEN_Q */
-      1111, /* GL_PIXEL_MAP_I_TO_I */
-      1117, /* GL_PIXEL_MAP_S_TO_S */
-      1113, /* GL_PIXEL_MAP_I_TO_R */
-      1109, /* GL_PIXEL_MAP_I_TO_G */
-      1107, /* GL_PIXEL_MAP_I_TO_B */
-      1105, /* GL_PIXEL_MAP_I_TO_A */
-      1115, /* GL_PIXEL_MAP_R_TO_R */
-      1103, /* GL_PIXEL_MAP_G_TO_G */
-      1101, /* GL_PIXEL_MAP_B_TO_B */
-      1099, /* GL_PIXEL_MAP_A_TO_A */
-      1112, /* GL_PIXEL_MAP_I_TO_I_SIZE */
-      1118, /* GL_PIXEL_MAP_S_TO_S_SIZE */
-      1114, /* GL_PIXEL_MAP_I_TO_R_SIZE */
-      1110, /* GL_PIXEL_MAP_I_TO_G_SIZE */
-      1108, /* GL_PIXEL_MAP_I_TO_B_SIZE */
-      1106, /* GL_PIXEL_MAP_I_TO_A_SIZE */
-      1116, /* GL_PIXEL_MAP_R_TO_R_SIZE */
-      1104, /* GL_PIXEL_MAP_G_TO_G_SIZE */
-      1102, /* GL_PIXEL_MAP_B_TO_B_SIZE */
-      1100, /* GL_PIXEL_MAP_A_TO_A_SIZE */
-      1755, /* GL_UNPACK_SWAP_BYTES */
-      1750, /* GL_UNPACK_LSB_FIRST */
-      1751, /* GL_UNPACK_ROW_LENGTH */
-      1754, /* GL_UNPACK_SKIP_ROWS */
-      1753, /* GL_UNPACK_SKIP_PIXELS */
-      1748, /* GL_UNPACK_ALIGNMENT */
-      1086, /* GL_PACK_SWAP_BYTES */
-      1081, /* GL_PACK_LSB_FIRST */
-      1082, /* GL_PACK_ROW_LENGTH */
-      1085, /* GL_PACK_SKIP_ROWS */
-      1084, /* GL_PACK_SKIP_PIXELS */
-      1078, /* GL_PACK_ALIGNMENT */
-       790, /* GL_MAP_COLOR */
-       795, /* GL_MAP_STENCIL */
-       633, /* GL_INDEX_SHIFT */
-       632, /* GL_INDEX_OFFSET */
-      1297, /* GL_RED_SCALE */
-      1295, /* GL_RED_BIAS */
-      1855, /* GL_ZOOM_X */
-      1856, /* GL_ZOOM_Y */
-       594, /* GL_GREEN_SCALE */
-       592, /* GL_GREEN_BIAS */
+       632, /* GL_INDEX_MODE */
+      1362, /* GL_RGBA_MODE */
+       391, /* GL_DOUBLEBUFFER */
+      1513, /* GL_STEREO */
+      1320, /* GL_RENDER_MODE */
+      1099, /* GL_PERSPECTIVE_CORRECTION_HINT */
+      1152, /* GL_POINT_SMOOTH_HINT */
+       697, /* GL_LINE_SMOOTH_HINT */
+      1169, /* GL_POLYGON_SMOOTH_HINT */
+       525, /* GL_FOG_HINT */
+      1683, /* GL_TEXTURE_GEN_S */
+      1684, /* GL_TEXTURE_GEN_T */
+      1682, /* GL_TEXTURE_GEN_R */
+      1681, /* GL_TEXTURE_GEN_Q */
+      1112, /* GL_PIXEL_MAP_I_TO_I */
+      1118, /* GL_PIXEL_MAP_S_TO_S */
+      1114, /* GL_PIXEL_MAP_I_TO_R */
+      1110, /* GL_PIXEL_MAP_I_TO_G */
+      1108, /* GL_PIXEL_MAP_I_TO_B */
+      1106, /* GL_PIXEL_MAP_I_TO_A */
+      1116, /* GL_PIXEL_MAP_R_TO_R */
+      1104, /* GL_PIXEL_MAP_G_TO_G */
+      1102, /* GL_PIXEL_MAP_B_TO_B */
+      1100, /* GL_PIXEL_MAP_A_TO_A */
+      1113, /* GL_PIXEL_MAP_I_TO_I_SIZE */
+      1119, /* GL_PIXEL_MAP_S_TO_S_SIZE */
+      1115, /* GL_PIXEL_MAP_I_TO_R_SIZE */
+      1111, /* GL_PIXEL_MAP_I_TO_G_SIZE */
+      1109, /* GL_PIXEL_MAP_I_TO_B_SIZE */
+      1107, /* GL_PIXEL_MAP_I_TO_A_SIZE */
+      1117, /* GL_PIXEL_MAP_R_TO_R_SIZE */
+      1105, /* GL_PIXEL_MAP_G_TO_G_SIZE */
+      1103, /* GL_PIXEL_MAP_B_TO_B_SIZE */
+      1101, /* GL_PIXEL_MAP_A_TO_A_SIZE */
+      1756, /* GL_UNPACK_SWAP_BYTES */
+      1751, /* GL_UNPACK_LSB_FIRST */
+      1752, /* GL_UNPACK_ROW_LENGTH */
+      1755, /* GL_UNPACK_SKIP_ROWS */
+      1754, /* GL_UNPACK_SKIP_PIXELS */
+      1749, /* GL_UNPACK_ALIGNMENT */
+      1087, /* GL_PACK_SWAP_BYTES */
+      1082, /* GL_PACK_LSB_FIRST */
+      1083, /* GL_PACK_ROW_LENGTH */
+      1086, /* GL_PACK_SKIP_ROWS */
+      1085, /* GL_PACK_SKIP_PIXELS */
+      1079, /* GL_PACK_ALIGNMENT */
+       791, /* GL_MAP_COLOR */
+       796, /* GL_MAP_STENCIL */
+       634, /* GL_INDEX_SHIFT */
+       633, /* GL_INDEX_OFFSET */
+      1298, /* GL_RED_SCALE */
+      1296, /* GL_RED_BIAS */
+      1856, /* GL_ZOOM_X */
+      1857, /* GL_ZOOM_Y */
+       595, /* GL_GREEN_SCALE */
+       593, /* GL_GREEN_BIAS */
         93, /* GL_BLUE_SCALE */
         91, /* GL_BLUE_BIAS */
         42, /* GL_ALPHA_SCALE */
         40, /* GL_ALPHA_BIAS */
-       369, /* GL_DEPTH_SCALE */
+       370, /* GL_DEPTH_SCALE */
        350, /* GL_DEPTH_BIAS */
-       869, /* GL_MAX_EVAL_ORDER */
-       873, /* GL_MAX_LIGHTS */
-       852, /* GL_MAX_CLIP_PLANES */
-       919, /* GL_MAX_TEXTURE_SIZE */
-       879, /* GL_MAX_PIXEL_MAP_TABLE */
-       848, /* GL_MAX_ATTRIB_STACK_DEPTH */
-       876, /* GL_MAX_MODELVIEW_STACK_DEPTH */
-       877, /* GL_MAX_NAME_STACK_DEPTH */
-       905, /* GL_MAX_PROJECTION_STACK_DEPTH */
-       920, /* GL_MAX_TEXTURE_STACK_DEPTH */
-       934, /* GL_MAX_VIEWPORT_DIMS */
-       849, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
-      1522, /* GL_SUBPIXEL_BITS */
-       628, /* GL_INDEX_BITS */
-      1296, /* GL_RED_BITS */
-       593, /* GL_GREEN_BITS */
+       870, /* GL_MAX_EVAL_ORDER */
+       874, /* GL_MAX_LIGHTS */
+       853, /* GL_MAX_CLIP_PLANES */
+       920, /* GL_MAX_TEXTURE_SIZE */
+       880, /* GL_MAX_PIXEL_MAP_TABLE */
+       849, /* GL_MAX_ATTRIB_STACK_DEPTH */
+       877, /* GL_MAX_MODELVIEW_STACK_DEPTH */
+       878, /* GL_MAX_NAME_STACK_DEPTH */
+       906, /* GL_MAX_PROJECTION_STACK_DEPTH */
+       921, /* GL_MAX_TEXTURE_STACK_DEPTH */
+       935, /* GL_MAX_VIEWPORT_DIMS */
+       850, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
+      1523, /* GL_SUBPIXEL_BITS */
+       629, /* GL_INDEX_BITS */
+      1297, /* GL_RED_BITS */
+       594, /* GL_GREEN_BITS */
         92, /* GL_BLUE_BITS */
         41, /* GL_ALPHA_BITS */
        351, /* GL_DEPTH_BITS */
-      1494, /* GL_STENCIL_BITS */
+      1495, /* GL_STENCIL_BITS */
         14, /* GL_ACCUM_RED_BITS */
         13, /* GL_ACCUM_GREEN_BITS */
         10, /* GL_ACCUM_BLUE_BITS */
          9, /* GL_ACCUM_ALPHA_BITS */
-      1000, /* GL_NAME_STACK_DEPTH */
+      1001, /* GL_NAME_STACK_DEPTH */
         62, /* GL_AUTO_NORMAL */
-       736, /* GL_MAP1_COLOR_4 */
-       739, /* GL_MAP1_INDEX */
-       740, /* GL_MAP1_NORMAL */
-       741, /* GL_MAP1_TEXTURE_COORD_1 */
-       742, /* GL_MAP1_TEXTURE_COORD_2 */
-       743, /* GL_MAP1_TEXTURE_COORD_3 */
-       744, /* GL_MAP1_TEXTURE_COORD_4 */
-       745, /* GL_MAP1_VERTEX_3 */
-       746, /* GL_MAP1_VERTEX_4 */
-       763, /* GL_MAP2_COLOR_4 */
-       766, /* GL_MAP2_INDEX */
-       767, /* GL_MAP2_NORMAL */
-       768, /* GL_MAP2_TEXTURE_COORD_1 */
-       769, /* GL_MAP2_TEXTURE_COORD_2 */
-       770, /* GL_MAP2_TEXTURE_COORD_3 */
-       771, /* GL_MAP2_TEXTURE_COORD_4 */
-       772, /* GL_MAP2_VERTEX_3 */
-       773, /* GL_MAP2_VERTEX_4 */
-       737, /* GL_MAP1_GRID_DOMAIN */
-       738, /* GL_MAP1_GRID_SEGMENTS */
-       764, /* GL_MAP2_GRID_DOMAIN */
-       765, /* GL_MAP2_GRID_SEGMENTS */
-      1605, /* GL_TEXTURE_1D */
-      1607, /* GL_TEXTURE_2D */
-       478, /* GL_FEEDBACK_BUFFER_POINTER */
-       479, /* GL_FEEDBACK_BUFFER_SIZE */
-       480, /* GL_FEEDBACK_BUFFER_TYPE */
-      1405, /* GL_SELECTION_BUFFER_POINTER */
-      1406, /* GL_SELECTION_BUFFER_SIZE */
-      1723, /* GL_TEXTURE_WIDTH */
-      1687, /* GL_TEXTURE_HEIGHT */
-      1642, /* GL_TEXTURE_COMPONENTS */
-      1626, /* GL_TEXTURE_BORDER_COLOR */
-      1625, /* GL_TEXTURE_BORDER */
-       382, /* GL_DONT_CARE */
-       476, /* GL_FASTEST */
-      1008, /* GL_NICEST */
+       737, /* GL_MAP1_COLOR_4 */
+       740, /* GL_MAP1_INDEX */
+       741, /* GL_MAP1_NORMAL */
+       742, /* GL_MAP1_TEXTURE_COORD_1 */
+       743, /* GL_MAP1_TEXTURE_COORD_2 */
+       744, /* GL_MAP1_TEXTURE_COORD_3 */
+       745, /* GL_MAP1_TEXTURE_COORD_4 */
+       746, /* GL_MAP1_VERTEX_3 */
+       747, /* GL_MAP1_VERTEX_4 */
+       764, /* GL_MAP2_COLOR_4 */
+       767, /* GL_MAP2_INDEX */
+       768, /* GL_MAP2_NORMAL */
+       769, /* GL_MAP2_TEXTURE_COORD_1 */
+       770, /* GL_MAP2_TEXTURE_COORD_2 */
+       771, /* GL_MAP2_TEXTURE_COORD_3 */
+       772, /* GL_MAP2_TEXTURE_COORD_4 */
+       773, /* GL_MAP2_VERTEX_3 */
+       774, /* GL_MAP2_VERTEX_4 */
+       738, /* GL_MAP1_GRID_DOMAIN */
+       739, /* GL_MAP1_GRID_SEGMENTS */
+       765, /* GL_MAP2_GRID_DOMAIN */
+       766, /* GL_MAP2_GRID_SEGMENTS */
+      1606, /* GL_TEXTURE_1D */
+      1608, /* GL_TEXTURE_2D */
+       479, /* GL_FEEDBACK_BUFFER_POINTER */
+       480, /* GL_FEEDBACK_BUFFER_SIZE */
+       481, /* GL_FEEDBACK_BUFFER_TYPE */
+      1406, /* GL_SELECTION_BUFFER_POINTER */
+      1407, /* GL_SELECTION_BUFFER_SIZE */
+      1724, /* GL_TEXTURE_WIDTH */
+      1688, /* GL_TEXTURE_HEIGHT */
+      1643, /* GL_TEXTURE_COMPONENTS */
+      1627, /* GL_TEXTURE_BORDER_COLOR */
+      1626, /* GL_TEXTURE_BORDER */
+       383, /* GL_DONT_CARE */
+       477, /* GL_FASTEST */
+      1009, /* GL_NICEST */
         48, /* GL_AMBIENT */
-       379, /* GL_DIFFUSE */
-      1454, /* GL_SPECULAR */
-      1172, /* GL_POSITION */
-      1457, /* GL_SPOT_DIRECTION */
-      1458, /* GL_SPOT_EXPONENT */
-      1456, /* GL_SPOT_CUTOFF */
+       380, /* GL_DIFFUSE */
+      1455, /* GL_SPECULAR */
+      1173, /* GL_POSITION */
+      1458, /* GL_SPOT_DIRECTION */
+      1459, /* GL_SPOT_EXPONENT */
+      1457, /* GL_SPOT_CUTOFF */
        275, /* GL_CONSTANT_ATTENUATION */
-       686, /* GL_LINEAR_ATTENUATION */
-      1270, /* GL_QUADRATIC_ATTENUATION */
+       687, /* GL_LINEAR_ATTENUATION */
+      1271, /* GL_QUADRATIC_ATTENUATION */
        244, /* GL_COMPILE */
        245, /* GL_COMPILE_AND_EXECUTE */
        120, /* GL_BYTE */
-      1757, /* GL_UNSIGNED_BYTE */
-      1419, /* GL_SHORT */
-      1768, /* GL_UNSIGNED_SHORT */
-       636, /* GL_INT */
-      1760, /* GL_UNSIGNED_INT */
-       484, /* GL_FLOAT */
+      1758, /* GL_UNSIGNED_BYTE */
+      1420, /* GL_SHORT */
+      1769, /* GL_UNSIGNED_SHORT */
+       637, /* GL_INT */
+      1761, /* GL_UNSIGNED_INT */
+       485, /* GL_FLOAT */
          1, /* GL_2_BYTES */
          5, /* GL_3_BYTES */
          7, /* GL_4_BYTES */
-       389, /* GL_DOUBLE */
+       390, /* GL_DOUBLE */
        132, /* GL_CLEAR */
         50, /* GL_AND */
         52, /* GL_AND_REVERSE */
        299, /* GL_COPY */
         51, /* GL_AND_INVERTED */
-      1010, /* GL_NOOP */
-      1851, /* GL_XOR */
-      1073, /* GL_OR */
-      1011, /* GL_NOR */
-       466, /* GL_EQUIV */
-       663, /* GL_INVERT */
-      1076, /* GL_OR_REVERSE */
+      1011, /* GL_NOOP */
+      1852, /* GL_XOR */
+      1074, /* GL_OR */
+      1012, /* GL_NOR */
+       467, /* GL_EQUIV */
+       664, /* GL_INVERT */
+      1077, /* GL_OR_REVERSE */
        300, /* GL_COPY_INVERTED */
-      1075, /* GL_OR_INVERTED */
-      1001, /* GL_NAND */
-      1410, /* GL_SET */
-       463, /* GL_EMISSION */
-      1418, /* GL_SHININESS */
+      1076, /* GL_OR_INVERTED */
+      1002, /* GL_NAND */
+      1411, /* GL_SET */
+       464, /* GL_EMISSION */
+      1419, /* GL_SHININESS */
         49, /* GL_AMBIENT_AND_DIFFUSE */
        190, /* GL_COLOR_INDEXES */
-       951, /* GL_MODELVIEW */
-      1248, /* GL_PROJECTION */
-      1540, /* GL_TEXTURE */
+       952, /* GL_MODELVIEW */
+      1249, /* GL_PROJECTION */
+      1541, /* GL_TEXTURE */
        147, /* GL_COLOR */
        346, /* GL_DEPTH */
-      1480, /* GL_STENCIL */
+      1481, /* GL_STENCIL */
        189, /* GL_COLOR_INDEX */
-      1499, /* GL_STENCIL_INDEX */
-       357, /* GL_DEPTH_COMPONENT */
-      1292, /* GL_RED */
-       591, /* GL_GREEN */
+      1500, /* GL_STENCIL_INDEX */
+       358, /* GL_DEPTH_COMPONENT */
+      1293, /* GL_RED */
+       592, /* GL_GREEN */
         90, /* GL_BLUE */
         31, /* GL_ALPHA */
-      1327, /* GL_RGB */
-      1346, /* GL_RGBA */
-       714, /* GL_LUMINANCE */
-       735, /* GL_LUMINANCE_ALPHA */
+      1328, /* GL_RGB */
+      1347, /* GL_RGBA */
+       715, /* GL_LUMINANCE */
+       736, /* GL_LUMINANCE_ALPHA */
         73, /* GL_BITMAP */
-      1128, /* GL_POINT */
-       684, /* GL_LINE */
-       481, /* GL_FILL */
-      1301, /* GL_RENDER */
-       477, /* GL_FEEDBACK */
-      1404, /* GL_SELECT */
-       483, /* GL_FLAT */
-      1429, /* GL_SMOOTH */
-       664, /* GL_KEEP */
-      1321, /* GL_REPLACE */
-       618, /* GL_INCR */
+      1129, /* GL_POINT */
+       685, /* GL_LINE */
+       482, /* GL_FILL */
+      1302, /* GL_RENDER */
+       478, /* GL_FEEDBACK */
+      1405, /* GL_SELECT */
+       484, /* GL_FLAT */
+      1430, /* GL_SMOOTH */
+       665, /* GL_KEEP */
+      1322, /* GL_REPLACE */
+       619, /* GL_INCR */
        342, /* GL_DECR */
-      1783, /* GL_VENDOR */
-      1318, /* GL_RENDERER */
-      1784, /* GL_VERSION */
-       470, /* GL_EXTENSIONS */
-      1369, /* GL_S */
-      1531, /* GL_T */
-      1281, /* GL_R */
-      1269, /* GL_Q */
-       987, /* GL_MODULATE */
+      1784, /* GL_VENDOR */
+      1319, /* GL_RENDERER */
+      1785, /* GL_VERSION */
+       471, /* GL_EXTENSIONS */
+      1370, /* GL_S */
+      1532, /* GL_T */
+      1282, /* GL_R */
+      1270, /* GL_Q */
+       988, /* GL_MODULATE */
        341, /* GL_DECAL */
-      1677, /* GL_TEXTURE_ENV_MODE */
-      1676, /* GL_TEXTURE_ENV_COLOR */
-      1675, /* GL_TEXTURE_ENV */
-       471, /* GL_EYE_LINEAR */
-      1034, /* GL_OBJECT_LINEAR */
-      1455, /* GL_SPHERE_MAP */
-      1679, /* GL_TEXTURE_GEN_MODE */
-      1036, /* GL_OBJECT_PLANE */
-       472, /* GL_EYE_PLANE */
-      1002, /* GL_NEAREST */
-       685, /* GL_LINEAR */
-      1006, /* GL_NEAREST_MIPMAP_NEAREST */
-       690, /* GL_LINEAR_MIPMAP_NEAREST */
-      1005, /* GL_NEAREST_MIPMAP_LINEAR */
-       689, /* GL_LINEAR_MIPMAP_LINEAR */
-      1700, /* GL_TEXTURE_MAG_FILTER */
-      1708, /* GL_TEXTURE_MIN_FILTER */
-      1725, /* GL_TEXTURE_WRAP_S */
-      1726, /* GL_TEXTURE_WRAP_T */
+      1678, /* GL_TEXTURE_ENV_MODE */
+      1677, /* GL_TEXTURE_ENV_COLOR */
+      1676, /* GL_TEXTURE_ENV */
+       472, /* GL_EYE_LINEAR */
+      1035, /* GL_OBJECT_LINEAR */
+      1456, /* GL_SPHERE_MAP */
+      1680, /* GL_TEXTURE_GEN_MODE */
+      1037, /* GL_OBJECT_PLANE */
+       473, /* GL_EYE_PLANE */
+      1003, /* GL_NEAREST */
+       686, /* GL_LINEAR */
+      1007, /* GL_NEAREST_MIPMAP_NEAREST */
+       691, /* GL_LINEAR_MIPMAP_NEAREST */
+      1006, /* GL_NEAREST_MIPMAP_LINEAR */
+       690, /* GL_LINEAR_MIPMAP_LINEAR */
+      1701, /* GL_TEXTURE_MAG_FILTER */
+      1709, /* GL_TEXTURE_MIN_FILTER */
+      1726, /* GL_TEXTURE_WRAP_S */
+      1727, /* GL_TEXTURE_WRAP_T */
        126, /* GL_CLAMP */
-      1320, /* GL_REPEAT */
-      1166, /* GL_POLYGON_OFFSET_UNITS */
-      1165, /* GL_POLYGON_OFFSET_POINT */
-      1164, /* GL_POLYGON_OFFSET_LINE */
-      1282, /* GL_R3_G3_B2 */
-      1780, /* GL_V2F */
-      1781, /* GL_V3F */
+      1321, /* GL_REPEAT */
+      1167, /* GL_POLYGON_OFFSET_UNITS */
+      1166, /* GL_POLYGON_OFFSET_POINT */
+      1165, /* GL_POLYGON_OFFSET_LINE */
+      1283, /* GL_R3_G3_B2 */
+      1781, /* GL_V2F */
+      1782, /* GL_V3F */
        123, /* GL_C4UB_V2F */
        124, /* GL_C4UB_V3F */
        121, /* GL_C3F_V3F */
-       999, /* GL_N3F_V3F */
+      1000, /* GL_N3F_V3F */
        122, /* GL_C4F_N3F_V3F */
-      1536, /* GL_T2F_V3F */
-      1538, /* GL_T4F_V4F */
-      1534, /* GL_T2F_C4UB_V3F */
-      1532, /* GL_T2F_C3F_V3F */
-      1535, /* GL_T2F_N3F_V3F */
-      1533, /* GL_T2F_C4F_N3F_V3F */
-      1537, /* GL_T4F_C4F_N3F_V4F */
+      1537, /* GL_T2F_V3F */
+      1539, /* GL_T4F_V4F */
+      1535, /* GL_T2F_C4UB_V3F */
+      1533, /* GL_T2F_C3F_V3F */
+      1536, /* GL_T2F_N3F_V3F */
+      1534, /* GL_T2F_C4F_N3F_V3F */
+      1538, /* GL_T4F_C4F_N3F_V4F */
        139, /* GL_CLIP_PLANE0 */
        140, /* GL_CLIP_PLANE1 */
        141, /* GL_CLIP_PLANE2 */
        142, /* GL_CLIP_PLANE3 */
        143, /* GL_CLIP_PLANE4 */
        144, /* GL_CLIP_PLANE5 */
-       669, /* GL_LIGHT0 */
-       670, /* GL_LIGHT1 */
-       671, /* GL_LIGHT2 */
-       672, /* GL_LIGHT3 */
-       673, /* GL_LIGHT4 */
-       674, /* GL_LIGHT5 */
-       675, /* GL_LIGHT6 */
-       676, /* GL_LIGHT7 */
-       595, /* GL_HINT_BIT */
+       670, /* GL_LIGHT0 */
+       671, /* GL_LIGHT1 */
+       672, /* GL_LIGHT2 */
+       673, /* GL_LIGHT3 */
+       674, /* GL_LIGHT4 */
+       675, /* GL_LIGHT5 */
+       676, /* GL_LIGHT6 */
+       677, /* GL_LIGHT7 */
+       596, /* GL_HINT_BIT */
        277, /* GL_CONSTANT_COLOR */
-      1047, /* GL_ONE_MINUS_CONSTANT_COLOR */
+      1048, /* GL_ONE_MINUS_CONSTANT_COLOR */
        272, /* GL_CONSTANT_ALPHA */
-      1045, /* GL_ONE_MINUS_CONSTANT_ALPHA */
+      1046, /* GL_ONE_MINUS_CONSTANT_ALPHA */
         76, /* GL_BLEND_COLOR */
-       579, /* GL_FUNC_ADD */
-       935, /* GL_MIN */
-       845, /* GL_MAX */
+       580, /* GL_FUNC_ADD */
+       936, /* GL_MIN */
+       846, /* GL_MAX */
         81, /* GL_BLEND_EQUATION */
-       583, /* GL_FUNC_SUBTRACT */
-       581, /* GL_FUNC_REVERSE_SUBTRACT */
+       584, /* GL_FUNC_SUBTRACT */
+       582, /* GL_FUNC_REVERSE_SUBTRACT */
        280, /* GL_CONVOLUTION_1D */
        281, /* GL_CONVOLUTION_2D */
-      1407, /* GL_SEPARABLE_2D */
+      1408, /* GL_SEPARABLE_2D */
        284, /* GL_CONVOLUTION_BORDER_MODE */
        288, /* GL_CONVOLUTION_FILTER_SCALE */
        286, /* GL_CONVOLUTION_FILTER_BIAS */
-      1293, /* GL_REDUCE */
+      1294, /* GL_REDUCE */
        290, /* GL_CONVOLUTION_FORMAT */
        294, /* GL_CONVOLUTION_WIDTH */
        292, /* GL_CONVOLUTION_HEIGHT */
-       860, /* GL_MAX_CONVOLUTION_WIDTH */
-       858, /* GL_MAX_CONVOLUTION_HEIGHT */
-      1205, /* GL_POST_CONVOLUTION_RED_SCALE */
-      1201, /* GL_POST_CONVOLUTION_GREEN_SCALE */
-      1196, /* GL_POST_CONVOLUTION_BLUE_SCALE */
-      1192, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
-      1203, /* GL_POST_CONVOLUTION_RED_BIAS */
-      1199, /* GL_POST_CONVOLUTION_GREEN_BIAS */
-      1194, /* GL_POST_CONVOLUTION_BLUE_BIAS */
-      1190, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
-       596, /* GL_HISTOGRAM */
-      1253, /* GL_PROXY_HISTOGRAM */
-       612, /* GL_HISTOGRAM_WIDTH */
-       602, /* GL_HISTOGRAM_FORMAT */
-       608, /* GL_HISTOGRAM_RED_SIZE */
-       604, /* GL_HISTOGRAM_GREEN_SIZE */
-       599, /* GL_HISTOGRAM_BLUE_SIZE */
-       597, /* GL_HISTOGRAM_ALPHA_SIZE */
-       606, /* GL_HISTOGRAM_LUMINANCE_SIZE */
-       610, /* GL_HISTOGRAM_SINK */
-       936, /* GL_MINMAX */
-       938, /* GL_MINMAX_FORMAT */
-       940, /* GL_MINMAX_SINK */
-      1539, /* GL_TABLE_TOO_LARGE_EXT */
-      1759, /* GL_UNSIGNED_BYTE_3_3_2 */
-      1770, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-      1772, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-      1765, /* GL_UNSIGNED_INT_8_8_8_8 */
-      1761, /* GL_UNSIGNED_INT_10_10_10_2 */
-      1163, /* GL_POLYGON_OFFSET_FILL */
-      1162, /* GL_POLYGON_OFFSET_FACTOR */
-      1161, /* GL_POLYGON_OFFSET_BIAS */
-      1324, /* GL_RESCALE_NORMAL */
+       861, /* GL_MAX_CONVOLUTION_WIDTH */
+       859, /* GL_MAX_CONVOLUTION_HEIGHT */
+      1206, /* GL_POST_CONVOLUTION_RED_SCALE */
+      1202, /* GL_POST_CONVOLUTION_GREEN_SCALE */
+      1197, /* GL_POST_CONVOLUTION_BLUE_SCALE */
+      1193, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
+      1204, /* GL_POST_CONVOLUTION_RED_BIAS */
+      1200, /* GL_POST_CONVOLUTION_GREEN_BIAS */
+      1195, /* GL_POST_CONVOLUTION_BLUE_BIAS */
+      1191, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
+       597, /* GL_HISTOGRAM */
+      1254, /* GL_PROXY_HISTOGRAM */
+       613, /* GL_HISTOGRAM_WIDTH */
+       603, /* GL_HISTOGRAM_FORMAT */
+       609, /* GL_HISTOGRAM_RED_SIZE */
+       605, /* GL_HISTOGRAM_GREEN_SIZE */
+       600, /* GL_HISTOGRAM_BLUE_SIZE */
+       598, /* GL_HISTOGRAM_ALPHA_SIZE */
+       607, /* GL_HISTOGRAM_LUMINANCE_SIZE */
+       611, /* GL_HISTOGRAM_SINK */
+       937, /* GL_MINMAX */
+       939, /* GL_MINMAX_FORMAT */
+       941, /* GL_MINMAX_SINK */
+      1540, /* GL_TABLE_TOO_LARGE_EXT */
+      1760, /* GL_UNSIGNED_BYTE_3_3_2 */
+      1771, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+      1773, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+      1766, /* GL_UNSIGNED_INT_8_8_8_8 */
+      1762, /* GL_UNSIGNED_INT_10_10_10_2 */
+      1164, /* GL_POLYGON_OFFSET_FILL */
+      1163, /* GL_POLYGON_OFFSET_FACTOR */
+      1162, /* GL_POLYGON_OFFSET_BIAS */
+      1325, /* GL_RESCALE_NORMAL */
         36, /* GL_ALPHA4 */
         38, /* GL_ALPHA8 */
         32, /* GL_ALPHA12 */
         34, /* GL_ALPHA16 */
-       725, /* GL_LUMINANCE4 */
-       731, /* GL_LUMINANCE8 */
-       715, /* GL_LUMINANCE12 */
-       721, /* GL_LUMINANCE16 */
-       726, /* GL_LUMINANCE4_ALPHA4 */
-       729, /* GL_LUMINANCE6_ALPHA2 */
-       732, /* GL_LUMINANCE8_ALPHA8 */
-       718, /* GL_LUMINANCE12_ALPHA4 */
-       716, /* GL_LUMINANCE12_ALPHA12 */
-       722, /* GL_LUMINANCE16_ALPHA16 */
-       637, /* GL_INTENSITY */
-       642, /* GL_INTENSITY4 */
-       644, /* GL_INTENSITY8 */
-       638, /* GL_INTENSITY12 */
-       640, /* GL_INTENSITY16 */
-      1336, /* GL_RGB2_EXT */
-      1337, /* GL_RGB4 */
-      1340, /* GL_RGB5 */
-      1344, /* GL_RGB8 */
-      1328, /* GL_RGB10 */
-      1332, /* GL_RGB12 */
-      1334, /* GL_RGB16 */
-      1351, /* GL_RGBA2 */
-      1353, /* GL_RGBA4 */
-      1341, /* GL_RGB5_A1 */
-      1357, /* GL_RGBA8 */
-      1329, /* GL_RGB10_A2 */
-      1347, /* GL_RGBA12 */
-      1349, /* GL_RGBA16 */
-      1715, /* GL_TEXTURE_RED_SIZE */
-      1685, /* GL_TEXTURE_GREEN_SIZE */
-      1623, /* GL_TEXTURE_BLUE_SIZE */
-      1610, /* GL_TEXTURE_ALPHA_SIZE */
-      1698, /* GL_TEXTURE_LUMINANCE_SIZE */
-      1689, /* GL_TEXTURE_INTENSITY_SIZE */
-      1322, /* GL_REPLACE_EXT */
-      1257, /* GL_PROXY_TEXTURE_1D */
-      1260, /* GL_PROXY_TEXTURE_2D */
-      1721, /* GL_TEXTURE_TOO_LARGE_EXT */
-      1710, /* GL_TEXTURE_PRIORITY */
-      1717, /* GL_TEXTURE_RESIDENT */
-      1613, /* GL_TEXTURE_BINDING_1D */
-      1615, /* GL_TEXTURE_BINDING_2D */
-      1617, /* GL_TEXTURE_BINDING_3D */
-      1083, /* GL_PACK_SKIP_IMAGES */
-      1079, /* GL_PACK_IMAGE_HEIGHT */
-      1752, /* GL_UNPACK_SKIP_IMAGES */
-      1749, /* GL_UNPACK_IMAGE_HEIGHT */
-      1609, /* GL_TEXTURE_3D */
-      1263, /* GL_PROXY_TEXTURE_3D */
-      1672, /* GL_TEXTURE_DEPTH */
-      1724, /* GL_TEXTURE_WRAP_R */
-       846, /* GL_MAX_3D_TEXTURE_SIZE */
-      1785, /* GL_VERTEX_ARRAY */
-      1013, /* GL_NORMAL_ARRAY */
+       726, /* GL_LUMINANCE4 */
+       732, /* GL_LUMINANCE8 */
+       716, /* GL_LUMINANCE12 */
+       722, /* GL_LUMINANCE16 */
+       727, /* GL_LUMINANCE4_ALPHA4 */
+       730, /* GL_LUMINANCE6_ALPHA2 */
+       733, /* GL_LUMINANCE8_ALPHA8 */
+       719, /* GL_LUMINANCE12_ALPHA4 */
+       717, /* GL_LUMINANCE12_ALPHA12 */
+       723, /* GL_LUMINANCE16_ALPHA16 */
+       638, /* GL_INTENSITY */
+       643, /* GL_INTENSITY4 */
+       645, /* GL_INTENSITY8 */
+       639, /* GL_INTENSITY12 */
+       641, /* GL_INTENSITY16 */
+      1337, /* GL_RGB2_EXT */
+      1338, /* GL_RGB4 */
+      1341, /* GL_RGB5 */
+      1345, /* GL_RGB8 */
+      1329, /* GL_RGB10 */
+      1333, /* GL_RGB12 */
+      1335, /* GL_RGB16 */
+      1352, /* GL_RGBA2 */
+      1354, /* GL_RGBA4 */
+      1342, /* GL_RGB5_A1 */
+      1358, /* GL_RGBA8 */
+      1330, /* GL_RGB10_A2 */
+      1348, /* GL_RGBA12 */
+      1350, /* GL_RGBA16 */
+      1716, /* GL_TEXTURE_RED_SIZE */
+      1686, /* GL_TEXTURE_GREEN_SIZE */
+      1624, /* GL_TEXTURE_BLUE_SIZE */
+      1611, /* GL_TEXTURE_ALPHA_SIZE */
+      1699, /* GL_TEXTURE_LUMINANCE_SIZE */
+      1690, /* GL_TEXTURE_INTENSITY_SIZE */
+      1323, /* GL_REPLACE_EXT */
+      1258, /* GL_PROXY_TEXTURE_1D */
+      1261, /* GL_PROXY_TEXTURE_2D */
+      1722, /* GL_TEXTURE_TOO_LARGE_EXT */
+      1711, /* GL_TEXTURE_PRIORITY */
+      1718, /* GL_TEXTURE_RESIDENT */
+      1614, /* GL_TEXTURE_BINDING_1D */
+      1616, /* GL_TEXTURE_BINDING_2D */
+      1618, /* GL_TEXTURE_BINDING_3D */
+      1084, /* GL_PACK_SKIP_IMAGES */
+      1080, /* GL_PACK_IMAGE_HEIGHT */
+      1753, /* GL_UNPACK_SKIP_IMAGES */
+      1750, /* GL_UNPACK_IMAGE_HEIGHT */
+      1610, /* GL_TEXTURE_3D */
+      1264, /* GL_PROXY_TEXTURE_3D */
+      1673, /* GL_TEXTURE_DEPTH */
+      1725, /* GL_TEXTURE_WRAP_R */
+       847, /* GL_MAX_3D_TEXTURE_SIZE */
+      1786, /* GL_VERTEX_ARRAY */
+      1014, /* GL_NORMAL_ARRAY */
        148, /* GL_COLOR_ARRAY */
-       622, /* GL_INDEX_ARRAY */
-      1650, /* GL_TEXTURE_COORD_ARRAY */
-       455, /* GL_EDGE_FLAG_ARRAY */
-      1791, /* GL_VERTEX_ARRAY_SIZE */
-      1793, /* GL_VERTEX_ARRAY_TYPE */
-      1792, /* GL_VERTEX_ARRAY_STRIDE */
-      1018, /* GL_NORMAL_ARRAY_TYPE */
-      1017, /* GL_NORMAL_ARRAY_STRIDE */
+       623, /* GL_INDEX_ARRAY */
+      1651, /* GL_TEXTURE_COORD_ARRAY */
+       456, /* GL_EDGE_FLAG_ARRAY */
+      1792, /* GL_VERTEX_ARRAY_SIZE */
+      1794, /* GL_VERTEX_ARRAY_TYPE */
+      1793, /* GL_VERTEX_ARRAY_STRIDE */
+      1019, /* GL_NORMAL_ARRAY_TYPE */
+      1018, /* GL_NORMAL_ARRAY_STRIDE */
        152, /* GL_COLOR_ARRAY_SIZE */
        154, /* GL_COLOR_ARRAY_TYPE */
        153, /* GL_COLOR_ARRAY_STRIDE */
-       627, /* GL_INDEX_ARRAY_TYPE */
-       626, /* GL_INDEX_ARRAY_STRIDE */
-      1654, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-      1656, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-      1655, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
-       459, /* GL_EDGE_FLAG_ARRAY_STRIDE */
-      1790, /* GL_VERTEX_ARRAY_POINTER */
-      1016, /* GL_NORMAL_ARRAY_POINTER */
+       628, /* GL_INDEX_ARRAY_TYPE */
+       627, /* GL_INDEX_ARRAY_STRIDE */
+      1655, /* GL_TEXTURE_COORD_ARRAY_SIZE */
+      1657, /* GL_TEXTURE_COORD_ARRAY_TYPE */
+      1656, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
+       460, /* GL_EDGE_FLAG_ARRAY_STRIDE */
+      1791, /* GL_VERTEX_ARRAY_POINTER */
+      1017, /* GL_NORMAL_ARRAY_POINTER */
        151, /* GL_COLOR_ARRAY_POINTER */
-       625, /* GL_INDEX_ARRAY_POINTER */
-      1653, /* GL_TEXTURE_COORD_ARRAY_POINTER */
-       458, /* GL_EDGE_FLAG_ARRAY_POINTER */
-       992, /* GL_MULTISAMPLE */
-      1381, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
-      1383, /* GL_SAMPLE_ALPHA_TO_ONE */
-      1388, /* GL_SAMPLE_COVERAGE */
-      1385, /* GL_SAMPLE_BUFFERS */
-      1376, /* GL_SAMPLES */
-      1392, /* GL_SAMPLE_COVERAGE_VALUE */
-      1390, /* GL_SAMPLE_COVERAGE_INVERT */
+       626, /* GL_INDEX_ARRAY_POINTER */
+      1654, /* GL_TEXTURE_COORD_ARRAY_POINTER */
+       459, /* GL_EDGE_FLAG_ARRAY_POINTER */
+       993, /* GL_MULTISAMPLE */
+      1382, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
+      1384, /* GL_SAMPLE_ALPHA_TO_ONE */
+      1389, /* GL_SAMPLE_COVERAGE */
+      1386, /* GL_SAMPLE_BUFFERS */
+      1377, /* GL_SAMPLES */
+      1393, /* GL_SAMPLE_COVERAGE_VALUE */
+      1391, /* GL_SAMPLE_COVERAGE_INVERT */
        195, /* GL_COLOR_MATRIX */
        197, /* GL_COLOR_MATRIX_STACK_DEPTH */
-       854, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
-      1188, /* GL_POST_COLOR_MATRIX_RED_SCALE */
-      1184, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
-      1179, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
-      1175, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
-      1186, /* GL_POST_COLOR_MATRIX_RED_BIAS */
-      1182, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
-      1177, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
-      1173, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
-      1633, /* GL_TEXTURE_COLOR_TABLE_SGI */
-      1264, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
-      1635, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+       855, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
+      1189, /* GL_POST_COLOR_MATRIX_RED_SCALE */
+      1185, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
+      1180, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
+      1176, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
+      1187, /* GL_POST_COLOR_MATRIX_RED_BIAS */
+      1183, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
+      1178, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
+      1174, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
+      1634, /* GL_TEXTURE_COLOR_TABLE_SGI */
+      1265, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
+      1636, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
         80, /* GL_BLEND_DST_RGB */
         89, /* GL_BLEND_SRC_RGB */
         79, /* GL_BLEND_DST_ALPHA */
         88, /* GL_BLEND_SRC_ALPHA */
        201, /* GL_COLOR_TABLE */
-      1198, /* GL_POST_CONVOLUTION_COLOR_TABLE */
-      1181, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
-      1252, /* GL_PROXY_COLOR_TABLE */
-      1256, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
-      1255, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
+      1199, /* GL_POST_CONVOLUTION_COLOR_TABLE */
+      1182, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
+      1253, /* GL_PROXY_COLOR_TABLE */
+      1257, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
+      1256, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
        225, /* GL_COLOR_TABLE_SCALE */
        205, /* GL_COLOR_TABLE_BIAS */
        210, /* GL_COLOR_TABLE_FORMAT */
@@ -4369,380 +4371,380 @@ static const unsigned reduced_enums[1347] =
        216, /* GL_COLOR_TABLE_INTENSITY_SIZE */
         71, /* GL_BGR */
         72, /* GL_BGRA */
-       868, /* GL_MAX_ELEMENTS_VERTICES */
-       867, /* GL_MAX_ELEMENTS_INDICES */
-      1688, /* GL_TEXTURE_INDEX_SIZE_EXT */
+       869, /* GL_MAX_ELEMENTS_VERTICES */
+       868, /* GL_MAX_ELEMENTS_INDICES */
+      1689, /* GL_TEXTURE_INDEX_SIZE_EXT */
        145, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
-      1145, /* GL_POINT_SIZE_MIN */
-      1141, /* GL_POINT_SIZE_MAX */
-      1135, /* GL_POINT_FADE_THRESHOLD_SIZE */
-      1131, /* GL_POINT_DISTANCE_ATTENUATION */
+      1146, /* GL_POINT_SIZE_MIN */
+      1142, /* GL_POINT_SIZE_MAX */
+      1136, /* GL_POINT_FADE_THRESHOLD_SIZE */
+      1132, /* GL_POINT_DISTANCE_ATTENUATION */
        127, /* GL_CLAMP_TO_BORDER */
        130, /* GL_CLAMP_TO_EDGE */
-      1709, /* GL_TEXTURE_MIN_LOD */
-      1707, /* GL_TEXTURE_MAX_LOD */
-      1612, /* GL_TEXTURE_BASE_LEVEL */
-      1706, /* GL_TEXTURE_MAX_LEVEL */
-       615, /* GL_IGNORE_BORDER_HP */
+      1710, /* GL_TEXTURE_MIN_LOD */
+      1708, /* GL_TEXTURE_MAX_LOD */
+      1613, /* GL_TEXTURE_BASE_LEVEL */
+      1707, /* GL_TEXTURE_MAX_LEVEL */
+       616, /* GL_IGNORE_BORDER_HP */
        276, /* GL_CONSTANT_BORDER_HP */
-      1323, /* GL_REPLICATE_BORDER_HP */
+      1324, /* GL_REPLICATE_BORDER_HP */
        282, /* GL_CONVOLUTION_BORDER_COLOR */
-      1042, /* GL_OCCLUSION_TEST_HP */
-      1043, /* GL_OCCLUSION_TEST_RESULT_HP */
-       687, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
-      1627, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-      1629, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-      1631, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-      1632, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-      1630, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-      1628, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
-       850, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
-       851, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-      1208, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
-      1210, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
-      1207, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
-      1209, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
-      1696, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-      1697, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-      1695, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
-       585, /* GL_GENERATE_MIPMAP */
-       586, /* GL_GENERATE_MIPMAP_HINT */
-       527, /* GL_FOG_OFFSET_SGIX */
-       528, /* GL_FOG_OFFSET_VALUE_SGIX */
-      1641, /* GL_TEXTURE_COMPARE_SGIX */
-      1640, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-      1692, /* GL_TEXTURE_LEQUAL_R_SGIX */
-      1684, /* GL_TEXTURE_GEQUAL_R_SGIX */
-       358, /* GL_DEPTH_COMPONENT16 */
-       361, /* GL_DEPTH_COMPONENT24 */
-       364, /* GL_DEPTH_COMPONENT32 */
+      1043, /* GL_OCCLUSION_TEST_HP */
+      1044, /* GL_OCCLUSION_TEST_RESULT_HP */
+       688, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
+      1628, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
+      1630, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
+      1632, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
+      1633, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+      1631, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
+      1629, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
+       851, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
+       852, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+      1209, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
+      1211, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
+      1208, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
+      1210, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
+      1697, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+      1698, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+      1696, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+       586, /* GL_GENERATE_MIPMAP */
+       587, /* GL_GENERATE_MIPMAP_HINT */
+       528, /* GL_FOG_OFFSET_SGIX */
+       529, /* GL_FOG_OFFSET_VALUE_SGIX */
+      1642, /* GL_TEXTURE_COMPARE_SGIX */
+      1641, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
+      1693, /* GL_TEXTURE_LEQUAL_R_SGIX */
+      1685, /* GL_TEXTURE_GEQUAL_R_SGIX */
+       359, /* GL_DEPTH_COMPONENT16 */
+       362, /* GL_DEPTH_COMPONENT24 */
+       365, /* GL_DEPTH_COMPONENT32 */
        306, /* GL_CULL_VERTEX_EXT */
        308, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
        307, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
-      1848, /* GL_WRAP_BORDER_SUN */
-      1634, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
-       680, /* GL_LIGHT_MODEL_COLOR_CONTROL */
-      1422, /* GL_SINGLE_COLOR */
-      1408, /* GL_SEPARATE_SPECULAR_COLOR */
-      1417, /* GL_SHARED_TEXTURE_PALETTE_EXT */
-       538, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
-       539, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
-       546, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
-       541, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
-       537, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
-       536, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
-       540, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
-       547, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
-       558, /* GL_FRAMEBUFFER_DEFAULT */
-       571, /* GL_FRAMEBUFFER_UNDEFINED */
-       371, /* GL_DEPTH_STENCIL_ATTACHMENT */
-       621, /* GL_INDEX */
-      1758, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-      1773, /* GL_UNSIGNED_SHORT_5_6_5 */
-      1774, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-      1771, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-      1769, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-      1766, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-      1764, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-      1704, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-      1705, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-      1703, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
-       943, /* GL_MIRRORED_REPEAT */
-      1364, /* GL_RGB_S3TC */
-      1339, /* GL_RGB4_S3TC */
-      1362, /* GL_RGBA_S3TC */
-      1356, /* GL_RGBA4_S3TC */
-      1360, /* GL_RGBA_DXT5_S3TC */
-      1354, /* GL_RGBA4_DXT5_S3TC */
+      1849, /* GL_WRAP_BORDER_SUN */
+      1635, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
+       681, /* GL_LIGHT_MODEL_COLOR_CONTROL */
+      1423, /* GL_SINGLE_COLOR */
+      1409, /* GL_SEPARATE_SPECULAR_COLOR */
+      1418, /* GL_SHARED_TEXTURE_PALETTE_EXT */
+       539, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
+       540, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
+       547, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
+       542, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
+       538, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
+       537, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
+       541, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
+       548, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
+       559, /* GL_FRAMEBUFFER_DEFAULT */
+       572, /* GL_FRAMEBUFFER_UNDEFINED */
+       372, /* GL_DEPTH_STENCIL_ATTACHMENT */
+       622, /* GL_INDEX */
+      1759, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+      1774, /* GL_UNSIGNED_SHORT_5_6_5 */
+      1775, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+      1772, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+      1770, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+      1767, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+      1765, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+      1705, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+      1706, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+      1704, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+       944, /* GL_MIRRORED_REPEAT */
+      1365, /* GL_RGB_S3TC */
+      1340, /* GL_RGB4_S3TC */
+      1363, /* GL_RGBA_S3TC */
+      1357, /* GL_RGBA4_S3TC */
+      1361, /* GL_RGBA_DXT5_S3TC */
+      1355, /* GL_RGBA4_DXT5_S3TC */
        264, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
        259, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
        260, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
        261, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */
-      1004, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
-      1003, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
-       688, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
-       514, /* GL_FOG_COORDINATE_SOURCE */
-       506, /* GL_FOG_COORD */
-       530, /* GL_FRAGMENT_DEPTH */
+      1005, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
+      1004, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
+       689, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
+       515, /* GL_FOG_COORDINATE_SOURCE */
+       507, /* GL_FOG_COORD */
+       531, /* GL_FRAGMENT_DEPTH */
        312, /* GL_CURRENT_FOG_COORD */
-       513, /* GL_FOG_COORDINATE_ARRAY_TYPE */
-       512, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
-       511, /* GL_FOG_COORDINATE_ARRAY_POINTER */
-       508, /* GL_FOG_COORDINATE_ARRAY */
+       514, /* GL_FOG_COORDINATE_ARRAY_TYPE */
+       513, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
+       512, /* GL_FOG_COORDINATE_ARRAY_POINTER */
+       509, /* GL_FOG_COORDINATE_ARRAY */
        199, /* GL_COLOR_SUM */
        332, /* GL_CURRENT_SECONDARY_COLOR */
-      1401, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
-      1403, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
-      1402, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
-      1400, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
-      1397, /* GL_SECONDARY_COLOR_ARRAY */
+      1402, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
+      1404, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
+      1403, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
+      1401, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
+      1398, /* GL_SECONDARY_COLOR_ARRAY */
        330, /* GL_CURRENT_RASTER_SECONDARY_COLOR */
         28, /* GL_ALIASED_POINT_SIZE_RANGE */
         27, /* GL_ALIASED_LINE_WIDTH_RANGE */
-      1541, /* GL_TEXTURE0 */
-      1543, /* GL_TEXTURE1 */
-      1565, /* GL_TEXTURE2 */
-      1587, /* GL_TEXTURE3 */
-      1593, /* GL_TEXTURE4 */
-      1595, /* GL_TEXTURE5 */
-      1597, /* GL_TEXTURE6 */
-      1599, /* GL_TEXTURE7 */
-      1601, /* GL_TEXTURE8 */
-      1603, /* GL_TEXTURE9 */
-      1544, /* GL_TEXTURE10 */
-      1546, /* GL_TEXTURE11 */
-      1548, /* GL_TEXTURE12 */
-      1550, /* GL_TEXTURE13 */
-      1552, /* GL_TEXTURE14 */
-      1554, /* GL_TEXTURE15 */
-      1556, /* GL_TEXTURE16 */
-      1558, /* GL_TEXTURE17 */
-      1560, /* GL_TEXTURE18 */
-      1562, /* GL_TEXTURE19 */
-      1566, /* GL_TEXTURE20 */
-      1568, /* GL_TEXTURE21 */
-      1570, /* GL_TEXTURE22 */
-      1572, /* GL_TEXTURE23 */
-      1574, /* GL_TEXTURE24 */
-      1576, /* GL_TEXTURE25 */
-      1578, /* GL_TEXTURE26 */
-      1580, /* GL_TEXTURE27 */
-      1582, /* GL_TEXTURE28 */
-      1584, /* GL_TEXTURE29 */
-      1588, /* GL_TEXTURE30 */
-      1590, /* GL_TEXTURE31 */
+      1542, /* GL_TEXTURE0 */
+      1544, /* GL_TEXTURE1 */
+      1566, /* GL_TEXTURE2 */
+      1588, /* GL_TEXTURE3 */
+      1594, /* GL_TEXTURE4 */
+      1596, /* GL_TEXTURE5 */
+      1598, /* GL_TEXTURE6 */
+      1600, /* GL_TEXTURE7 */
+      1602, /* GL_TEXTURE8 */
+      1604, /* GL_TEXTURE9 */
+      1545, /* GL_TEXTURE10 */
+      1547, /* GL_TEXTURE11 */
+      1549, /* GL_TEXTURE12 */
+      1551, /* GL_TEXTURE13 */
+      1553, /* GL_TEXTURE14 */
+      1555, /* GL_TEXTURE15 */
+      1557, /* GL_TEXTURE16 */
+      1559, /* GL_TEXTURE17 */
+      1561, /* GL_TEXTURE18 */
+      1563, /* GL_TEXTURE19 */
+      1567, /* GL_TEXTURE20 */
+      1569, /* GL_TEXTURE21 */
+      1571, /* GL_TEXTURE22 */
+      1573, /* GL_TEXTURE23 */
+      1575, /* GL_TEXTURE24 */
+      1577, /* GL_TEXTURE25 */
+      1579, /* GL_TEXTURE26 */
+      1581, /* GL_TEXTURE27 */
+      1583, /* GL_TEXTURE28 */
+      1585, /* GL_TEXTURE29 */
+      1589, /* GL_TEXTURE30 */
+      1591, /* GL_TEXTURE31 */
         18, /* GL_ACTIVE_TEXTURE */
        133, /* GL_CLIENT_ACTIVE_TEXTURE */
-       921, /* GL_MAX_TEXTURE_UNITS */
-      1736, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-      1739, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-      1741, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-      1733, /* GL_TRANSPOSE_COLOR_MATRIX */
-      1523, /* GL_SUBTRACT */
-       908, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
+       922, /* GL_MAX_TEXTURE_UNITS */
+      1737, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+      1740, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+      1742, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+      1734, /* GL_TRANSPOSE_COLOR_MATRIX */
+      1524, /* GL_SUBTRACT */
+       909, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
        247, /* GL_COMPRESSED_ALPHA */
        251, /* GL_COMPRESSED_LUMINANCE */
        252, /* GL_COMPRESSED_LUMINANCE_ALPHA */
        249, /* GL_COMPRESSED_INTENSITY */
        255, /* GL_COMPRESSED_RGB */
        256, /* GL_COMPRESSED_RGBA */
-      1648, /* GL_TEXTURE_COMPRESSION_HINT */
-      1713, /* GL_TEXTURE_RECTANGLE_ARB */
-      1620, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
-      1267, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
-       906, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
-       370, /* GL_DEPTH_STENCIL */
-      1762, /* GL_UNSIGNED_INT_24_8 */
-       917, /* GL_MAX_TEXTURE_LOD_BIAS */
-      1702, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
-       918, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
-      1678, /* GL_TEXTURE_FILTER_CONTROL */
-      1693, /* GL_TEXTURE_LOD_BIAS */
+      1649, /* GL_TEXTURE_COMPRESSION_HINT */
+      1714, /* GL_TEXTURE_RECTANGLE_ARB */
+      1621, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
+      1268, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
+       907, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
+       371, /* GL_DEPTH_STENCIL */
+      1763, /* GL_UNSIGNED_INT_24_8 */
+       918, /* GL_MAX_TEXTURE_LOD_BIAS */
+      1703, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+       919, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
+      1679, /* GL_TEXTURE_FILTER_CONTROL */
+      1694, /* GL_TEXTURE_LOD_BIAS */
        232, /* GL_COMBINE4 */
-       911, /* GL_MAX_SHININESS_NV */
-       912, /* GL_MAX_SPOT_EXPONENT_NV */
-       619, /* GL_INCR_WRAP */
+       912, /* GL_MAX_SHININESS_NV */
+       913, /* GL_MAX_SPOT_EXPONENT_NV */
+       620, /* GL_INCR_WRAP */
        343, /* GL_DECR_WRAP */
-       963, /* GL_MODELVIEW1_ARB */
-      1019, /* GL_NORMAL_MAP */
-      1298, /* GL_REFLECTION_MAP */
-      1657, /* GL_TEXTURE_CUBE_MAP */
-      1618, /* GL_TEXTURE_BINDING_CUBE_MAP */
-      1665, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-      1659, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-      1667, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-      1661, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-      1669, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-      1663, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
-      1265, /* GL_PROXY_TEXTURE_CUBE_MAP */
-       862, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
-       998, /* GL_MULTISAMPLE_FILTER_HINT_NV */
-       522, /* GL_FOG_DISTANCE_MODE_NV */
-       474, /* GL_EYE_RADIAL_NV */
-       473, /* GL_EYE_PLANE_ABSOLUTE_NV */
+       964, /* GL_MODELVIEW1_ARB */
+      1020, /* GL_NORMAL_MAP */
+      1299, /* GL_REFLECTION_MAP */
+      1658, /* GL_TEXTURE_CUBE_MAP */
+      1619, /* GL_TEXTURE_BINDING_CUBE_MAP */
+      1666, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
+      1660, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
+      1668, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
+      1662, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
+      1670, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
+      1664, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
+      1266, /* GL_PROXY_TEXTURE_CUBE_MAP */
+       863, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
+       999, /* GL_MULTISAMPLE_FILTER_HINT_NV */
+       523, /* GL_FOG_DISTANCE_MODE_NV */
+       475, /* GL_EYE_RADIAL_NV */
+       474, /* GL_EYE_PLANE_ABSOLUTE_NV */
        231, /* GL_COMBINE */
        238, /* GL_COMBINE_RGB */
        233, /* GL_COMBINE_ALPHA */
-      1365, /* GL_RGB_SCALE */
+      1366, /* GL_RGB_SCALE */
         24, /* GL_ADD_SIGNED */
-       647, /* GL_INTERPOLATE */
+       648, /* GL_INTERPOLATE */
        271, /* GL_CONSTANT */
-      1214, /* GL_PRIMARY_COLOR */
-      1211, /* GL_PREVIOUS */
-      1437, /* GL_SOURCE0_RGB */
-      1443, /* GL_SOURCE1_RGB */
-      1449, /* GL_SOURCE2_RGB */
-      1453, /* GL_SOURCE3_RGB_NV */
-      1434, /* GL_SOURCE0_ALPHA */
-      1440, /* GL_SOURCE1_ALPHA */
-      1446, /* GL_SOURCE2_ALPHA */
-      1452, /* GL_SOURCE3_ALPHA_NV */
-      1056, /* GL_OPERAND0_RGB */
-      1062, /* GL_OPERAND1_RGB */
-      1068, /* GL_OPERAND2_RGB */
-      1072, /* GL_OPERAND3_RGB_NV */
-      1053, /* GL_OPERAND0_ALPHA */
-      1059, /* GL_OPERAND1_ALPHA */
-      1065, /* GL_OPERAND2_ALPHA */
-      1071, /* GL_OPERAND3_ALPHA_NV */
-      1786, /* GL_VERTEX_ARRAY_BINDING */
-      1711, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
-      1712, /* GL_TEXTURE_RANGE_POINTER_APPLE */
-      1852, /* GL_YCBCR_422_APPLE */
-      1775, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-      1777, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-      1720, /* GL_TEXTURE_STORAGE_HINT_APPLE */
-      1514, /* GL_STORAGE_PRIVATE_APPLE */
-      1513, /* GL_STORAGE_CACHED_APPLE */
-      1515, /* GL_STORAGE_SHARED_APPLE */
-      1424, /* GL_SLICE_ACCUM_SUN */
-      1273, /* GL_QUAD_MESH_SUN */
-      1745, /* GL_TRIANGLE_MESH_SUN */
-      1825, /* GL_VERTEX_PROGRAM_ARB */
-      1836, /* GL_VERTEX_STATE_PROGRAM_NV */
-      1812, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-      1818, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-      1820, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-      1822, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+      1215, /* GL_PRIMARY_COLOR */
+      1212, /* GL_PREVIOUS */
+      1438, /* GL_SOURCE0_RGB */
+      1444, /* GL_SOURCE1_RGB */
+      1450, /* GL_SOURCE2_RGB */
+      1454, /* GL_SOURCE3_RGB_NV */
+      1435, /* GL_SOURCE0_ALPHA */
+      1441, /* GL_SOURCE1_ALPHA */
+      1447, /* GL_SOURCE2_ALPHA */
+      1453, /* GL_SOURCE3_ALPHA_NV */
+      1057, /* GL_OPERAND0_RGB */
+      1063, /* GL_OPERAND1_RGB */
+      1069, /* GL_OPERAND2_RGB */
+      1073, /* GL_OPERAND3_RGB_NV */
+      1054, /* GL_OPERAND0_ALPHA */
+      1060, /* GL_OPERAND1_ALPHA */
+      1066, /* GL_OPERAND2_ALPHA */
+      1072, /* GL_OPERAND3_ALPHA_NV */
+      1787, /* GL_VERTEX_ARRAY_BINDING */
+      1712, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
+      1713, /* GL_TEXTURE_RANGE_POINTER_APPLE */
+      1853, /* GL_YCBCR_422_APPLE */
+      1776, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+      1778, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+      1721, /* GL_TEXTURE_STORAGE_HINT_APPLE */
+      1515, /* GL_STORAGE_PRIVATE_APPLE */
+      1514, /* GL_STORAGE_CACHED_APPLE */
+      1516, /* GL_STORAGE_SHARED_APPLE */
+      1425, /* GL_SLICE_ACCUM_SUN */
+      1274, /* GL_QUAD_MESH_SUN */
+      1746, /* GL_TRIANGLE_MESH_SUN */
+      1826, /* GL_VERTEX_PROGRAM_ARB */
+      1837, /* GL_VERTEX_STATE_PROGRAM_NV */
+      1813, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+      1819, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+      1821, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+      1823, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
        334, /* GL_CURRENT_VERTEX_ATTRIB */
-      1227, /* GL_PROGRAM_LENGTH_ARB */
-      1241, /* GL_PROGRAM_STRING_ARB */
-       985, /* GL_MODELVIEW_PROJECTION_NV */
-       614, /* GL_IDENTITY_NV */
-       661, /* GL_INVERSE_NV */
-      1738, /* GL_TRANSPOSE_NV */
-       662, /* GL_INVERSE_TRANSPOSE_NV */
-       892, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
-       891, /* GL_MAX_PROGRAM_MATRICES_ARB */
-       799, /* GL_MATRIX0_NV */
-       811, /* GL_MATRIX1_NV */
-       823, /* GL_MATRIX2_NV */
-       827, /* GL_MATRIX3_NV */
-       829, /* GL_MATRIX4_NV */
-       831, /* GL_MATRIX5_NV */
-       833, /* GL_MATRIX6_NV */
-       835, /* GL_MATRIX7_NV */
+      1228, /* GL_PROGRAM_LENGTH_ARB */
+      1242, /* GL_PROGRAM_STRING_ARB */
+       986, /* GL_MODELVIEW_PROJECTION_NV */
+       615, /* GL_IDENTITY_NV */
+       662, /* GL_INVERSE_NV */
+      1739, /* GL_TRANSPOSE_NV */
+       663, /* GL_INVERSE_TRANSPOSE_NV */
+       893, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
+       892, /* GL_MAX_PROGRAM_MATRICES_ARB */
+       800, /* GL_MATRIX0_NV */
+       812, /* GL_MATRIX1_NV */
+       824, /* GL_MATRIX2_NV */
+       828, /* GL_MATRIX3_NV */
+       830, /* GL_MATRIX4_NV */
+       832, /* GL_MATRIX5_NV */
+       834, /* GL_MATRIX6_NV */
+       836, /* GL_MATRIX7_NV */
        318, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
        315, /* GL_CURRENT_MATRIX_ARB */
-      1828, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-      1831, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-      1239, /* GL_PROGRAM_PARAMETER_NV */
-      1816, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-      1243, /* GL_PROGRAM_TARGET_NV */
-      1240, /* GL_PROGRAM_RESIDENT_NV */
-      1730, /* GL_TRACK_MATRIX_NV */
-      1731, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-      1826, /* GL_VERTEX_PROGRAM_BINDING_NV */
-      1221, /* GL_PROGRAM_ERROR_POSITION_ARB */
-       355, /* GL_DEPTH_CLAMP_NV */
-      1794, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-      1801, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-      1802, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-      1803, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-      1804, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-      1805, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-      1806, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-      1807, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-      1808, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-      1809, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-      1795, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-      1796, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-      1797, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-      1798, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-      1799, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-      1800, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
-       747, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
-       754, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
-       755, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
-       756, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
-       757, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
-       758, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
-       759, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
-       760, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
-       761, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
-       762, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
-       748, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
-       749, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
-       750, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
-       751, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
-       752, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
-       753, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
-       774, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
-       781, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
-       782, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
-       783, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
-       784, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
-       785, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
-       786, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
-      1220, /* GL_PROGRAM_BINDING_ARB */
-       788, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
-       789, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
-       775, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
-       776, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
-       777, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
-       778, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
-       779, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
-       780, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
-      1646, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-      1643, /* GL_TEXTURE_COMPRESSED */
-      1024, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
+      1829, /* GL_VERTEX_PROGRAM_POINT_SIZE */
+      1832, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+      1240, /* GL_PROGRAM_PARAMETER_NV */
+      1817, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+      1244, /* GL_PROGRAM_TARGET_NV */
+      1241, /* GL_PROGRAM_RESIDENT_NV */
+      1731, /* GL_TRACK_MATRIX_NV */
+      1732, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+      1827, /* GL_VERTEX_PROGRAM_BINDING_NV */
+      1222, /* GL_PROGRAM_ERROR_POSITION_ARB */
+       355, /* GL_DEPTH_CLAMP */
+      1795, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+      1802, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+      1803, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+      1804, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+      1805, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+      1806, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+      1807, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+      1808, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+      1809, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+      1810, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+      1796, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+      1797, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+      1798, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+      1799, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+      1800, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+      1801, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+       748, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
+       755, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
+       756, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
+       757, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
+       758, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
+       759, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
+       760, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
+       761, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
+       762, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
+       763, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
+       749, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
+       750, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
+       751, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
+       752, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
+       753, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
+       754, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
+       775, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
+       782, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
+       783, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
+       784, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
+       785, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
+       786, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
+       787, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
+      1221, /* GL_PROGRAM_BINDING_ARB */
+       789, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
+       790, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
+       776, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
+       777, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
+       778, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
+       779, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
+       780, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
+       781, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
+      1647, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
+      1644, /* GL_TEXTURE_COMPRESSED */
+      1025, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
        269, /* GL_COMPRESSED_TEXTURE_FORMATS */
-       933, /* GL_MAX_VERTEX_UNITS_ARB */
+       934, /* GL_MAX_VERTEX_UNITS_ARB */
         22, /* GL_ACTIVE_VERTEX_UNITS_ARB */
-      1847, /* GL_WEIGHT_SUM_UNITY_ARB */
-      1824, /* GL_VERTEX_BLEND_ARB */
+      1848, /* GL_WEIGHT_SUM_UNITY_ARB */
+      1825, /* GL_VERTEX_BLEND_ARB */
        336, /* GL_CURRENT_WEIGHT_ARB */
-      1846, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-      1845, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-      1844, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-      1843, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-      1840, /* GL_WEIGHT_ARRAY_ARB */
-       383, /* GL_DOT3_RGB */
-       384, /* GL_DOT3_RGBA */
+      1847, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+      1846, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+      1845, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+      1844, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+      1841, /* GL_WEIGHT_ARRAY_ARB */
+       384, /* GL_DOT3_RGB */
+       385, /* GL_DOT3_RGBA */
        263, /* GL_COMPRESSED_RGB_FXT1_3DFX */
        258, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
-       993, /* GL_MULTISAMPLE_3DFX */
-      1386, /* GL_SAMPLE_BUFFERS_3DFX */
-      1377, /* GL_SAMPLES_3DFX */
-       974, /* GL_MODELVIEW2_ARB */
-       977, /* GL_MODELVIEW3_ARB */
-       978, /* GL_MODELVIEW4_ARB */
-       979, /* GL_MODELVIEW5_ARB */
-       980, /* GL_MODELVIEW6_ARB */
-       981, /* GL_MODELVIEW7_ARB */
-       982, /* GL_MODELVIEW8_ARB */
-       983, /* GL_MODELVIEW9_ARB */
-       953, /* GL_MODELVIEW10_ARB */
-       954, /* GL_MODELVIEW11_ARB */
-       955, /* GL_MODELVIEW12_ARB */
-       956, /* GL_MODELVIEW13_ARB */
-       957, /* GL_MODELVIEW14_ARB */
-       958, /* GL_MODELVIEW15_ARB */
-       959, /* GL_MODELVIEW16_ARB */
-       960, /* GL_MODELVIEW17_ARB */
-       961, /* GL_MODELVIEW18_ARB */
-       962, /* GL_MODELVIEW19_ARB */
-       964, /* GL_MODELVIEW20_ARB */
-       965, /* GL_MODELVIEW21_ARB */
-       966, /* GL_MODELVIEW22_ARB */
-       967, /* GL_MODELVIEW23_ARB */
-       968, /* GL_MODELVIEW24_ARB */
-       969, /* GL_MODELVIEW25_ARB */
-       970, /* GL_MODELVIEW26_ARB */
-       971, /* GL_MODELVIEW27_ARB */
-       972, /* GL_MODELVIEW28_ARB */
-       973, /* GL_MODELVIEW29_ARB */
-       975, /* GL_MODELVIEW30_ARB */
-       976, /* GL_MODELVIEW31_ARB */
-       388, /* GL_DOT3_RGB_EXT */
-       386, /* GL_DOT3_RGBA_EXT */
-       947, /* GL_MIRROR_CLAMP_EXT */
-       950, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
-       988, /* GL_MODULATE_ADD_ATI */
-       989, /* GL_MODULATE_SIGNED_ADD_ATI */
-       990, /* GL_MODULATE_SUBTRACT_ATI */
-      1853, /* GL_YCBCR_MESA */
-      1080, /* GL_PACK_INVERT_MESA */
+       994, /* GL_MULTISAMPLE_3DFX */
+      1387, /* GL_SAMPLE_BUFFERS_3DFX */
+      1378, /* GL_SAMPLES_3DFX */
+       975, /* GL_MODELVIEW2_ARB */
+       978, /* GL_MODELVIEW3_ARB */
+       979, /* GL_MODELVIEW4_ARB */
+       980, /* GL_MODELVIEW5_ARB */
+       981, /* GL_MODELVIEW6_ARB */
+       982, /* GL_MODELVIEW7_ARB */
+       983, /* GL_MODELVIEW8_ARB */
+       984, /* GL_MODELVIEW9_ARB */
+       954, /* GL_MODELVIEW10_ARB */
+       955, /* GL_MODELVIEW11_ARB */
+       956, /* GL_MODELVIEW12_ARB */
+       957, /* GL_MODELVIEW13_ARB */
+       958, /* GL_MODELVIEW14_ARB */
+       959, /* GL_MODELVIEW15_ARB */
+       960, /* GL_MODELVIEW16_ARB */
+       961, /* GL_MODELVIEW17_ARB */
+       962, /* GL_MODELVIEW18_ARB */
+       963, /* GL_MODELVIEW19_ARB */
+       965, /* GL_MODELVIEW20_ARB */
+       966, /* GL_MODELVIEW21_ARB */
+       967, /* GL_MODELVIEW22_ARB */
+       968, /* GL_MODELVIEW23_ARB */
+       969, /* GL_MODELVIEW24_ARB */
+       970, /* GL_MODELVIEW25_ARB */
+       971, /* GL_MODELVIEW26_ARB */
+       972, /* GL_MODELVIEW27_ARB */
+       973, /* GL_MODELVIEW28_ARB */
+       974, /* GL_MODELVIEW29_ARB */
+       976, /* GL_MODELVIEW30_ARB */
+       977, /* GL_MODELVIEW31_ARB */
+       389, /* GL_DOT3_RGB_EXT */
+       387, /* GL_DOT3_RGBA_EXT */
+       948, /* GL_MIRROR_CLAMP_EXT */
+       951, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
+       989, /* GL_MODULATE_ADD_ATI */
+       990, /* GL_MODULATE_SIGNED_ADD_ATI */
+       991, /* GL_MODULATE_SUBTRACT_ATI */
+      1854, /* GL_YCBCR_MESA */
+      1081, /* GL_PACK_INVERT_MESA */
        339, /* GL_DEBUG_OBJECT_MESA */
        340, /* GL_DEBUG_PRINT_MESA */
        338, /* GL_DEBUG_ASSERT_MESA */
@@ -4752,292 +4754,292 @@ static const unsigned reduced_enums[1347] =
        117, /* GL_BUMP_ROT_MATRIX_SIZE_ATI */
        115, /* GL_BUMP_NUM_TEX_UNITS_ATI */
        119, /* GL_BUMP_TEX_UNITS_ATI */
-       447, /* GL_DUDV_ATI */
-       446, /* GL_DU8DV8_ATI */
+       448, /* GL_DUDV_ATI */
+       447, /* GL_DU8DV8_ATI */
        114, /* GL_BUMP_ENVMAP_ATI */
        118, /* GL_BUMP_TARGET_ATI */
-      1485, /* GL_STENCIL_BACK_FUNC */
-      1483, /* GL_STENCIL_BACK_FAIL */
-      1487, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-      1489, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
-       531, /* GL_FRAGMENT_PROGRAM_ARB */
-      1218, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
-      1246, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
-      1245, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
-      1230, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-      1236, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-      1235, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-       881, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
-       904, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
-       903, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
-       894, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-       900, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-       899, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-       864, /* GL_MAX_DRAW_BUFFERS */
-       392, /* GL_DRAW_BUFFER0 */
-       395, /* GL_DRAW_BUFFER1 */
-       416, /* GL_DRAW_BUFFER2 */
-       419, /* GL_DRAW_BUFFER3 */
-       422, /* GL_DRAW_BUFFER4 */
-       425, /* GL_DRAW_BUFFER5 */
-       428, /* GL_DRAW_BUFFER6 */
-       431, /* GL_DRAW_BUFFER7 */
-       434, /* GL_DRAW_BUFFER8 */
-       437, /* GL_DRAW_BUFFER9 */
-       396, /* GL_DRAW_BUFFER10 */
-       399, /* GL_DRAW_BUFFER11 */
-       402, /* GL_DRAW_BUFFER12 */
-       405, /* GL_DRAW_BUFFER13 */
-       408, /* GL_DRAW_BUFFER14 */
-       411, /* GL_DRAW_BUFFER15 */
+      1486, /* GL_STENCIL_BACK_FUNC */
+      1484, /* GL_STENCIL_BACK_FAIL */
+      1488, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
+      1490, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
+       532, /* GL_FRAGMENT_PROGRAM_ARB */
+      1219, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
+      1247, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
+      1246, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
+      1231, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+      1237, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+      1236, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+       882, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
+       905, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
+       904, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
+       895, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+       901, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+       900, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+       865, /* GL_MAX_DRAW_BUFFERS */
+       393, /* GL_DRAW_BUFFER0 */
+       396, /* GL_DRAW_BUFFER1 */
+       417, /* GL_DRAW_BUFFER2 */
+       420, /* GL_DRAW_BUFFER3 */
+       423, /* GL_DRAW_BUFFER4 */
+       426, /* GL_DRAW_BUFFER5 */
+       429, /* GL_DRAW_BUFFER6 */
+       432, /* GL_DRAW_BUFFER7 */
+       435, /* GL_DRAW_BUFFER8 */
+       438, /* GL_DRAW_BUFFER9 */
+       397, /* GL_DRAW_BUFFER10 */
+       400, /* GL_DRAW_BUFFER11 */
+       403, /* GL_DRAW_BUFFER12 */
+       406, /* GL_DRAW_BUFFER13 */
+       409, /* GL_DRAW_BUFFER14 */
+       412, /* GL_DRAW_BUFFER15 */
         82, /* GL_BLEND_EQUATION_ALPHA */
-       844, /* GL_MATRIX_PALETTE_ARB */
-       875, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
-       878, /* GL_MAX_PALETTE_MATRICES_ARB */
+       845, /* GL_MATRIX_PALETTE_ARB */
+       876, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
+       879, /* GL_MAX_PALETTE_MATRICES_ARB */
        321, /* GL_CURRENT_PALETTE_MATRIX_ARB */
-       838, /* GL_MATRIX_INDEX_ARRAY_ARB */
+       839, /* GL_MATRIX_INDEX_ARRAY_ARB */
        316, /* GL_CURRENT_MATRIX_INDEX_ARB */
-       840, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
-       842, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
-       841, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
-       839, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
-      1673, /* GL_TEXTURE_DEPTH_SIZE */
-       376, /* GL_DEPTH_TEXTURE_MODE */
-      1638, /* GL_TEXTURE_COMPARE_MODE */
-      1636, /* GL_TEXTURE_COMPARE_FUNC */
+       841, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
+       843, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
+       842, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
+       840, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
+      1674, /* GL_TEXTURE_DEPTH_SIZE */
+       377, /* GL_DEPTH_TEXTURE_MODE */
+      1639, /* GL_TEXTURE_COMPARE_MODE */
+      1637, /* GL_TEXTURE_COMPARE_FUNC */
        242, /* GL_COMPARE_R_TO_TEXTURE */
-      1152, /* GL_POINT_SPRITE */
+      1153, /* GL_POINT_SPRITE */
        296, /* GL_COORD_REPLACE */
-      1156, /* GL_POINT_SPRITE_R_MODE_NV */
-      1275, /* GL_QUERY_COUNTER_BITS */
+      1157, /* GL_POINT_SPRITE_R_MODE_NV */
+      1276, /* GL_QUERY_COUNTER_BITS */
        323, /* GL_CURRENT_QUERY */
-      1277, /* GL_QUERY_RESULT */
-      1279, /* GL_QUERY_RESULT_AVAILABLE */
-       927, /* GL_MAX_VERTEX_ATTRIBS */
-      1814, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
-       374, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
-       373, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
-       913, /* GL_MAX_TEXTURE_COORDS */
-       915, /* GL_MAX_TEXTURE_IMAGE_UNITS */
-      1223, /* GL_PROGRAM_ERROR_STRING_ARB */
-      1225, /* GL_PROGRAM_FORMAT_ASCII_ARB */
-      1224, /* GL_PROGRAM_FORMAT_ARB */
-      1722, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+      1278, /* GL_QUERY_RESULT */
+      1280, /* GL_QUERY_RESULT_AVAILABLE */
+       928, /* GL_MAX_VERTEX_ATTRIBS */
+      1815, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+       375, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
+       374, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
+       914, /* GL_MAX_TEXTURE_COORDS */
+       916, /* GL_MAX_TEXTURE_IMAGE_UNITS */
+      1224, /* GL_PROGRAM_ERROR_STRING_ARB */
+      1226, /* GL_PROGRAM_FORMAT_ASCII_ARB */
+      1225, /* GL_PROGRAM_FORMAT_ARB */
+      1723, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
        353, /* GL_DEPTH_BOUNDS_TEST_EXT */
        352, /* GL_DEPTH_BOUNDS_EXT */
         53, /* GL_ARRAY_BUFFER */
-       460, /* GL_ELEMENT_ARRAY_BUFFER */
+       461, /* GL_ELEMENT_ARRAY_BUFFER */
         54, /* GL_ARRAY_BUFFER_BINDING */
-       461, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
-      1788, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-      1014, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
+       462, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
+      1789, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+      1015, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
        149, /* GL_COLOR_ARRAY_BUFFER_BINDING */
-       623, /* GL_INDEX_ARRAY_BUFFER_BINDING */
-      1651, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
-       456, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
-      1398, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
-       509, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
-      1841, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-      1810, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-      1226, /* GL_PROGRAM_INSTRUCTIONS_ARB */
-       887, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
-      1232, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-       896, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-      1244, /* GL_PROGRAM_TEMPORARIES_ARB */
-       902, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
-      1234, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
-       898, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
-      1238, /* GL_PROGRAM_PARAMETERS_ARB */
-       901, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
-      1233, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
-       897, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
-      1219, /* GL_PROGRAM_ATTRIBS_ARB */
-       882, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
-      1231, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
-       895, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
-      1217, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
-       880, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
-      1229, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-       893, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-       888, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
-       884, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
-      1247, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-      1735, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-      1288, /* GL_READ_ONLY */
-      1849, /* GL_WRITE_ONLY */
-      1290, /* GL_READ_WRITE */
+       624, /* GL_INDEX_ARRAY_BUFFER_BINDING */
+      1652, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
+       457, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
+      1399, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
+       510, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
+      1842, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+      1811, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+      1227, /* GL_PROGRAM_INSTRUCTIONS_ARB */
+       888, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
+      1233, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+       897, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+      1245, /* GL_PROGRAM_TEMPORARIES_ARB */
+       903, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
+      1235, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
+       899, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
+      1239, /* GL_PROGRAM_PARAMETERS_ARB */
+       902, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
+      1234, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
+       898, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
+      1220, /* GL_PROGRAM_ATTRIBS_ARB */
+       883, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
+      1232, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
+       896, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
+      1218, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
+       881, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
+      1230, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+       894, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+       889, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
+       885, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
+      1248, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
+      1736, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+      1289, /* GL_READ_ONLY */
+      1850, /* GL_WRITE_ONLY */
+      1291, /* GL_READ_WRITE */
        102, /* GL_BUFFER_ACCESS */
        105, /* GL_BUFFER_MAPPED */
        107, /* GL_BUFFER_MAP_POINTER */
-      1729, /* GL_TIME_ELAPSED_EXT */
-       798, /* GL_MATRIX0_ARB */
-       810, /* GL_MATRIX1_ARB */
-       822, /* GL_MATRIX2_ARB */
-       826, /* GL_MATRIX3_ARB */
-       828, /* GL_MATRIX4_ARB */
-       830, /* GL_MATRIX5_ARB */
-       832, /* GL_MATRIX6_ARB */
-       834, /* GL_MATRIX7_ARB */
-       836, /* GL_MATRIX8_ARB */
-       837, /* GL_MATRIX9_ARB */
-       800, /* GL_MATRIX10_ARB */
-       801, /* GL_MATRIX11_ARB */
-       802, /* GL_MATRIX12_ARB */
-       803, /* GL_MATRIX13_ARB */
-       804, /* GL_MATRIX14_ARB */
-       805, /* GL_MATRIX15_ARB */
-       806, /* GL_MATRIX16_ARB */
-       807, /* GL_MATRIX17_ARB */
-       808, /* GL_MATRIX18_ARB */
-       809, /* GL_MATRIX19_ARB */
-       812, /* GL_MATRIX20_ARB */
-       813, /* GL_MATRIX21_ARB */
-       814, /* GL_MATRIX22_ARB */
-       815, /* GL_MATRIX23_ARB */
-       816, /* GL_MATRIX24_ARB */
-       817, /* GL_MATRIX25_ARB */
-       818, /* GL_MATRIX26_ARB */
-       819, /* GL_MATRIX27_ARB */
-       820, /* GL_MATRIX28_ARB */
-       821, /* GL_MATRIX29_ARB */
-       824, /* GL_MATRIX30_ARB */
-       825, /* GL_MATRIX31_ARB */
-      1518, /* GL_STREAM_DRAW */
-      1520, /* GL_STREAM_READ */
-      1516, /* GL_STREAM_COPY */
-      1476, /* GL_STATIC_DRAW */
-      1478, /* GL_STATIC_READ */
-      1474, /* GL_STATIC_COPY */
-       450, /* GL_DYNAMIC_DRAW */
-       452, /* GL_DYNAMIC_READ */
-       448, /* GL_DYNAMIC_COPY */
-      1120, /* GL_PIXEL_PACK_BUFFER */
-      1124, /* GL_PIXEL_UNPACK_BUFFER */
-      1121, /* GL_PIXEL_PACK_BUFFER_BINDING */
-      1125, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
+      1730, /* GL_TIME_ELAPSED_EXT */
+       799, /* GL_MATRIX0_ARB */
+       811, /* GL_MATRIX1_ARB */
+       823, /* GL_MATRIX2_ARB */
+       827, /* GL_MATRIX3_ARB */
+       829, /* GL_MATRIX4_ARB */
+       831, /* GL_MATRIX5_ARB */
+       833, /* GL_MATRIX6_ARB */
+       835, /* GL_MATRIX7_ARB */
+       837, /* GL_MATRIX8_ARB */
+       838, /* GL_MATRIX9_ARB */
+       801, /* GL_MATRIX10_ARB */
+       802, /* GL_MATRIX11_ARB */
+       803, /* GL_MATRIX12_ARB */
+       804, /* GL_MATRIX13_ARB */
+       805, /* GL_MATRIX14_ARB */
+       806, /* GL_MATRIX15_ARB */
+       807, /* GL_MATRIX16_ARB */
+       808, /* GL_MATRIX17_ARB */
+       809, /* GL_MATRIX18_ARB */
+       810, /* GL_MATRIX19_ARB */
+       813, /* GL_MATRIX20_ARB */
+       814, /* GL_MATRIX21_ARB */
+       815, /* GL_MATRIX22_ARB */
+       816, /* GL_MATRIX23_ARB */
+       817, /* GL_MATRIX24_ARB */
+       818, /* GL_MATRIX25_ARB */
+       819, /* GL_MATRIX26_ARB */
+       820, /* GL_MATRIX27_ARB */
+       821, /* GL_MATRIX28_ARB */
+       822, /* GL_MATRIX29_ARB */
+       825, /* GL_MATRIX30_ARB */
+       826, /* GL_MATRIX31_ARB */
+      1519, /* GL_STREAM_DRAW */
+      1521, /* GL_STREAM_READ */
+      1517, /* GL_STREAM_COPY */
+      1477, /* GL_STATIC_DRAW */
+      1479, /* GL_STATIC_READ */
+      1475, /* GL_STATIC_COPY */
+       451, /* GL_DYNAMIC_DRAW */
+       453, /* GL_DYNAMIC_READ */
+       449, /* GL_DYNAMIC_COPY */
+      1121, /* GL_PIXEL_PACK_BUFFER */
+      1125, /* GL_PIXEL_UNPACK_BUFFER */
+      1122, /* GL_PIXEL_PACK_BUFFER_BINDING */
+      1126, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
        347, /* GL_DEPTH24_STENCIL8 */
-      1719, /* GL_TEXTURE_STENCIL_SIZE */
-      1671, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
-       883, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
-       886, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
-       890, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
-       889, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
-       847, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
-      1509, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
+      1720, /* GL_TEXTURE_STENCIL_SIZE */
+      1672, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
+       884, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
+       887, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
+       891, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
+       890, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
+       848, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
+      1510, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
         17, /* GL_ACTIVE_STENCIL_FACE_EXT */
-       948, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
-      1379, /* GL_SAMPLES_PASSED */
+       949, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
+      1380, /* GL_SAMPLES_PASSED */
        109, /* GL_BUFFER_SERIALIZED_MODIFY_APPLE */
        104, /* GL_BUFFER_FLUSHING_UNMAP_APPLE */
-       532, /* GL_FRAGMENT_SHADER */
-      1834, /* GL_VERTEX_SHADER */
-      1237, /* GL_PROGRAM_OBJECT_ARB */
-      1411, /* GL_SHADER_OBJECT_ARB */
-       871, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
-       931, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
-       925, /* GL_MAX_VARYING_FLOATS */
-       929, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
-       856, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
-      1040, /* GL_OBJECT_TYPE_ARB */
-      1413, /* GL_SHADER_TYPE */
-       497, /* GL_FLOAT_VEC2 */
-       499, /* GL_FLOAT_VEC3 */
-       501, /* GL_FLOAT_VEC4 */
-       650, /* GL_INT_VEC2 */
-       652, /* GL_INT_VEC3 */
-       654, /* GL_INT_VEC4 */
+       533, /* GL_FRAGMENT_SHADER */
+      1835, /* GL_VERTEX_SHADER */
+      1238, /* GL_PROGRAM_OBJECT_ARB */
+      1412, /* GL_SHADER_OBJECT_ARB */
+       872, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
+       932, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
+       926, /* GL_MAX_VARYING_FLOATS */
+       930, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
+       857, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
+      1041, /* GL_OBJECT_TYPE_ARB */
+      1414, /* GL_SHADER_TYPE */
+       498, /* GL_FLOAT_VEC2 */
+       500, /* GL_FLOAT_VEC3 */
+       502, /* GL_FLOAT_VEC4 */
+       651, /* GL_INT_VEC2 */
+       653, /* GL_INT_VEC3 */
+       655, /* GL_INT_VEC4 */
         94, /* GL_BOOL */
         96, /* GL_BOOL_VEC2 */
         98, /* GL_BOOL_VEC3 */
        100, /* GL_BOOL_VEC4 */
-       485, /* GL_FLOAT_MAT2 */
-       489, /* GL_FLOAT_MAT3 */
-       493, /* GL_FLOAT_MAT4 */
-      1370, /* GL_SAMPLER_1D */
-      1372, /* GL_SAMPLER_2D */
-      1374, /* GL_SAMPLER_3D */
-      1375, /* GL_SAMPLER_CUBE */
-      1371, /* GL_SAMPLER_1D_SHADOW */
-      1373, /* GL_SAMPLER_2D_SHADOW */
-       487, /* GL_FLOAT_MAT2x3 */
-       488, /* GL_FLOAT_MAT2x4 */
-       491, /* GL_FLOAT_MAT3x2 */
-       492, /* GL_FLOAT_MAT3x4 */
-       495, /* GL_FLOAT_MAT4x2 */
-       496, /* GL_FLOAT_MAT4x3 */
+       486, /* GL_FLOAT_MAT2 */
+       490, /* GL_FLOAT_MAT3 */
+       494, /* GL_FLOAT_MAT4 */
+      1371, /* GL_SAMPLER_1D */
+      1373, /* GL_SAMPLER_2D */
+      1375, /* GL_SAMPLER_3D */
+      1376, /* GL_SAMPLER_CUBE */
+      1372, /* GL_SAMPLER_1D_SHADOW */
+      1374, /* GL_SAMPLER_2D_SHADOW */
+       488, /* GL_FLOAT_MAT2x3 */
+       489, /* GL_FLOAT_MAT2x4 */
+       492, /* GL_FLOAT_MAT3x2 */
+       493, /* GL_FLOAT_MAT3x4 */
+       496, /* GL_FLOAT_MAT4x2 */
+       497, /* GL_FLOAT_MAT4x3 */
        345, /* GL_DELETE_STATUS */
        246, /* GL_COMPILE_STATUS */
-       705, /* GL_LINK_STATUS */
-      1782, /* GL_VALIDATE_STATUS */
-       635, /* GL_INFO_LOG_LENGTH */
+       706, /* GL_LINK_STATUS */
+      1783, /* GL_VALIDATE_STATUS */
+       636, /* GL_INFO_LOG_LENGTH */
         56, /* GL_ATTACHED_SHADERS */
         20, /* GL_ACTIVE_UNIFORMS */
         21, /* GL_ACTIVE_UNIFORM_MAX_LENGTH */
-      1412, /* GL_SHADER_SOURCE_LENGTH */
+      1413, /* GL_SHADER_SOURCE_LENGTH */
         15, /* GL_ACTIVE_ATTRIBUTES */
         16, /* GL_ACTIVE_ATTRIBUTE_MAX_LENGTH */
-       534, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
-      1415, /* GL_SHADING_LANGUAGE_VERSION */
+       535, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
+      1416, /* GL_SHADING_LANGUAGE_VERSION */
        322, /* GL_CURRENT_PROGRAM */
-      1089, /* GL_PALETTE4_RGB8_OES */
-      1091, /* GL_PALETTE4_RGBA8_OES */
-      1087, /* GL_PALETTE4_R5_G6_B5_OES */
-      1090, /* GL_PALETTE4_RGBA4_OES */
-      1088, /* GL_PALETTE4_RGB5_A1_OES */
-      1094, /* GL_PALETTE8_RGB8_OES */
-      1096, /* GL_PALETTE8_RGBA8_OES */
-      1092, /* GL_PALETTE8_R5_G6_B5_OES */
-      1095, /* GL_PALETTE8_RGBA4_OES */
-      1093, /* GL_PALETTE8_RGB5_A1_OES */
-       617, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
-       616, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
-      1767, /* GL_UNSIGNED_NORMALIZED */
-      1606, /* GL_TEXTURE_1D_ARRAY_EXT */
-      1258, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
-      1608, /* GL_TEXTURE_2D_ARRAY_EXT */
-      1261, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
-      1614, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
-      1616, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
-      1468, /* GL_SRGB */
-      1469, /* GL_SRGB8 */
-      1471, /* GL_SRGB_ALPHA */
-      1470, /* GL_SRGB8_ALPHA8 */
-      1428, /* GL_SLUMINANCE_ALPHA */
-      1427, /* GL_SLUMINANCE8_ALPHA8 */
-      1425, /* GL_SLUMINANCE */
-      1426, /* GL_SLUMINANCE8 */
+      1090, /* GL_PALETTE4_RGB8_OES */
+      1092, /* GL_PALETTE4_RGBA8_OES */
+      1088, /* GL_PALETTE4_R5_G6_B5_OES */
+      1091, /* GL_PALETTE4_RGBA4_OES */
+      1089, /* GL_PALETTE4_RGB5_A1_OES */
+      1095, /* GL_PALETTE8_RGB8_OES */
+      1097, /* GL_PALETTE8_RGBA8_OES */
+      1093, /* GL_PALETTE8_R5_G6_B5_OES */
+      1096, /* GL_PALETTE8_RGBA4_OES */
+      1094, /* GL_PALETTE8_RGB5_A1_OES */
+       618, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
+       617, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
+      1768, /* GL_UNSIGNED_NORMALIZED */
+      1607, /* GL_TEXTURE_1D_ARRAY_EXT */
+      1259, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
+      1609, /* GL_TEXTURE_2D_ARRAY_EXT */
+      1262, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
+      1615, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
+      1617, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
+      1469, /* GL_SRGB */
+      1470, /* GL_SRGB8 */
+      1472, /* GL_SRGB_ALPHA */
+      1471, /* GL_SRGB8_ALPHA8 */
+      1429, /* GL_SLUMINANCE_ALPHA */
+      1428, /* GL_SLUMINANCE8_ALPHA8 */
+      1426, /* GL_SLUMINANCE */
+      1427, /* GL_SLUMINANCE8 */
        267, /* GL_COMPRESSED_SRGB */
        268, /* GL_COMPRESSED_SRGB_ALPHA */
        265, /* GL_COMPRESSED_SLUMINANCE */
        266, /* GL_COMPRESSED_SLUMINANCE_ALPHA */
-      1154, /* GL_POINT_SPRITE_COORD_ORIGIN */
-       713, /* GL_LOWER_LEFT */
-      1779, /* GL_UPPER_LEFT */
-      1491, /* GL_STENCIL_BACK_REF */
-      1492, /* GL_STENCIL_BACK_VALUE_MASK */
-      1493, /* GL_STENCIL_BACK_WRITEMASK */
-       441, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
-      1304, /* GL_RENDERBUFFER_BINDING_EXT */
-      1285, /* GL_READ_FRAMEBUFFER */
-       440, /* GL_DRAW_FRAMEBUFFER */
-      1286, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
-      1314, /* GL_RENDERBUFFER_SAMPLES */
-       544, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
-       542, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
-       553, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
-       549, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
-       551, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
-       556, /* GL_FRAMEBUFFER_COMPLETE */
-       560, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
-       566, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
-       564, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
-       562, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
-       565, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
-       563, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
-       569, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
-       572, /* GL_FRAMEBUFFER_UNSUPPORTED */
-       570, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
-       853, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
+      1155, /* GL_POINT_SPRITE_COORD_ORIGIN */
+       714, /* GL_LOWER_LEFT */
+      1780, /* GL_UPPER_LEFT */
+      1492, /* GL_STENCIL_BACK_REF */
+      1493, /* GL_STENCIL_BACK_VALUE_MASK */
+      1494, /* GL_STENCIL_BACK_WRITEMASK */
+       442, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
+      1305, /* GL_RENDERBUFFER_BINDING_EXT */
+      1286, /* GL_READ_FRAMEBUFFER */
+       441, /* GL_DRAW_FRAMEBUFFER */
+      1287, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
+      1315, /* GL_RENDERBUFFER_SAMPLES */
+       545, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
+       543, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
+       554, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
+       550, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
+       552, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+       557, /* GL_FRAMEBUFFER_COMPLETE */
+       561, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
+       567, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
+       565, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
+       563, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
+       566, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
+       564, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
+       570, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
+       573, /* GL_FRAMEBUFFER_UNSUPPORTED */
+       571, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
+       854, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
        155, /* GL_COLOR_ATTACHMENT0 */
        157, /* GL_COLOR_ATTACHMENT1 */
        171, /* GL_COLOR_ATTACHMENT2 */
@@ -5055,56 +5057,56 @@ static const unsigned reduced_enums[1347] =
        166, /* GL_COLOR_ATTACHMENT14 */
        168, /* GL_COLOR_ATTACHMENT15 */
        348, /* GL_DEPTH_ATTACHMENT */
-      1481, /* GL_STENCIL_ATTACHMENT */
-       535, /* GL_FRAMEBUFFER */
-      1302, /* GL_RENDERBUFFER */
-      1316, /* GL_RENDERBUFFER_WIDTH */
-      1309, /* GL_RENDERBUFFER_HEIGHT */
-      1311, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
-      1504, /* GL_STENCIL_INDEX_EXT */
-      1501, /* GL_STENCIL_INDEX1_EXT */
-      1502, /* GL_STENCIL_INDEX4_EXT */
-      1503, /* GL_STENCIL_INDEX8_EXT */
-      1500, /* GL_STENCIL_INDEX16_EXT */
-      1313, /* GL_RENDERBUFFER_RED_SIZE */
-      1308, /* GL_RENDERBUFFER_GREEN_SIZE */
-      1305, /* GL_RENDERBUFFER_BLUE_SIZE */
-      1303, /* GL_RENDERBUFFER_ALPHA_SIZE */
-      1306, /* GL_RENDERBUFFER_DEPTH_SIZE */
-      1315, /* GL_RENDERBUFFER_STENCIL_SIZE */
-       568, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
-       909, /* GL_MAX_SAMPLES */
-      1272, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT */
-       482, /* GL_FIRST_VERTEX_CONVENTION_EXT */
-       665, /* GL_LAST_VERTEX_CONVENTION_EXT */
-      1251, /* GL_PROVOKING_VERTEX_EXT */
+      1482, /* GL_STENCIL_ATTACHMENT */
+       536, /* GL_FRAMEBUFFER */
+      1303, /* GL_RENDERBUFFER */
+      1317, /* GL_RENDERBUFFER_WIDTH */
+      1310, /* GL_RENDERBUFFER_HEIGHT */
+      1312, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
+      1505, /* GL_STENCIL_INDEX_EXT */
+      1502, /* GL_STENCIL_INDEX1_EXT */
+      1503, /* GL_STENCIL_INDEX4_EXT */
+      1504, /* GL_STENCIL_INDEX8_EXT */
+      1501, /* GL_STENCIL_INDEX16_EXT */
+      1314, /* GL_RENDERBUFFER_RED_SIZE */
+      1309, /* GL_RENDERBUFFER_GREEN_SIZE */
+      1306, /* GL_RENDERBUFFER_BLUE_SIZE */
+      1304, /* GL_RENDERBUFFER_ALPHA_SIZE */
+      1307, /* GL_RENDERBUFFER_DEPTH_SIZE */
+      1316, /* GL_RENDERBUFFER_STENCIL_SIZE */
+       569, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
+       910, /* GL_MAX_SAMPLES */
+      1273, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT */
+       483, /* GL_FIRST_VERTEX_CONVENTION_EXT */
+       666, /* GL_LAST_VERTEX_CONVENTION_EXT */
+      1252, /* GL_PROVOKING_VERTEX_EXT */
        302, /* GL_COPY_READ_BUFFER */
        303, /* GL_COPY_WRITE_BUFFER */
-      1363, /* GL_RGBA_SNORM */
-      1359, /* GL_RGBA8_SNORM */
-      1421, /* GL_SIGNED_NORMALIZED */
-       910, /* GL_MAX_SERVER_WAIT_TIMEOUT */
-      1039, /* GL_OBJECT_TYPE */
-      1525, /* GL_SYNC_CONDITION */
-      1530, /* GL_SYNC_STATUS */
-      1527, /* GL_SYNC_FLAGS */
-      1526, /* GL_SYNC_FENCE */
-      1529, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
-      1756, /* GL_UNSIGNALED */
-      1420, /* GL_SIGNALED */
+      1364, /* GL_RGBA_SNORM */
+      1360, /* GL_RGBA8_SNORM */
+      1422, /* GL_SIGNED_NORMALIZED */
+       911, /* GL_MAX_SERVER_WAIT_TIMEOUT */
+      1040, /* GL_OBJECT_TYPE */
+      1526, /* GL_SYNC_CONDITION */
+      1531, /* GL_SYNC_STATUS */
+      1528, /* GL_SYNC_FLAGS */
+      1527, /* GL_SYNC_FENCE */
+      1530, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
+      1757, /* GL_UNSIGNALED */
+      1421, /* GL_SIGNALED */
         46, /* GL_ALREADY_SIGNALED */
-      1727, /* GL_TIMEOUT_EXPIRED */
+      1728, /* GL_TIMEOUT_EXPIRED */
        270, /* GL_CONDITION_SATISFIED */
-      1839, /* GL_WAIT_FAILED */
-       467, /* GL_EVAL_BIT */
-      1283, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
-       707, /* GL_LIST_BIT */
-      1622, /* GL_TEXTURE_BIT */
-      1394, /* GL_SCISSOR_BIT */
+      1840, /* GL_WAIT_FAILED */
+       468, /* GL_EVAL_BIT */
+      1284, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
+       708, /* GL_LIST_BIT */
+      1623, /* GL_TEXTURE_BIT */
+      1395, /* GL_SCISSOR_BIT */
         29, /* GL_ALL_ATTRIB_BITS */
-       995, /* GL_MULTISAMPLE_BIT */
+       996, /* GL_MULTISAMPLE_BIT */
         30, /* GL_ALL_CLIENT_ATTRIB_BITS */
-      1728, /* GL_TIMEOUT_IGNORED */
+      1729, /* GL_TIMEOUT_IGNORED */
 };
 
 typedef int (*cfunc)(const void *, const void *);
-- 
cgit v1.2.3


From b11a8ea863612827fe04b636f1c2eae9e1536fbd Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Tue, 8 Sep 2009 12:32:05 -0700
Subject: mesa: Expose NV_depth_clamp if ARB_depth_clamp is supported.

The wording of these two is exactly the same, except for the issue
"Can fragments with wc<=0 be generated when this extension is supported?",
which idr thinks is a non-issue for us.
---
 src/mesa/drivers/dri/swrast/swrast.c | 1 +
 src/mesa/drivers/x11/xm_api.c        | 1 +
 src/mesa/main/extensions.c           | 1 +
 3 files changed, 3 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/swrast/swrast.c b/src/mesa/drivers/dri/swrast/swrast.c
index 9a130d61cf..2d2aa5e0f1 100644
--- a/src/mesa/drivers/dri/swrast/swrast.c
+++ b/src/mesa/drivers/dri/swrast/swrast.c
@@ -110,6 +110,7 @@ const struct dri_extension card_extensions[] =
     { "GL_EXT_paletted_texture",	GL_EXT_paletted_texture_functions },
     { "GL_EXT_stencil_two_side",	GL_EXT_stencil_two_side_functions },
     { "GL_MESA_resize_buffers",		GL_MESA_resize_buffers_functions },
+    { "GL_NV_depth_clamp",		NULL },
     { "GL_NV_vertex_program",		GL_NV_vertex_program_functions },
     { "GL_NV_fragment_program",		GL_NV_fragment_program_functions },
     { NULL,				NULL }
diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c
index 78545d0e17..777635b783 100644
--- a/src/mesa/drivers/x11/xm_api.c
+++ b/src/mesa/drivers/x11/xm_api.c
@@ -1359,6 +1359,7 @@ const struct dri_extension card_extensions[] =
    { "GL_EXT_gpu_program_parameters",	GL_EXT_gpu_program_parameters_functions },
    { "GL_EXT_paletted_texture",		GL_EXT_paletted_texture_functions },
    { "GL_MESA_resize_buffers",		GL_MESA_resize_buffers_functions },
+   { "GL_NV_depth_clamp",		NULL },
    { "GL_NV_vertex_program",		GL_NV_vertex_program_functions },
    { "GL_NV_fragment_program",		GL_NV_fragment_program_functions },
    { NULL,				NULL }
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index ea67f820af..d0e77bafdd 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -163,6 +163,7 @@ static const struct {
    { OFF, "GL_MESA_ycbcr_texture",             F(MESA_ycbcr_texture) },
    { ON,  "GL_MESA_window_pos",                F(ARB_window_pos) },
    { OFF, "GL_NV_blend_square",                F(NV_blend_square) },
+   { OFF, "GL_NV_depth_clamp",                 F(ARB_depth_clamp) },
    { OFF, "GL_NV_fragment_program",            F(NV_fragment_program) },
    { ON,  "GL_NV_light_max_exponent",          F(NV_light_max_exponent) },
    { OFF, "GL_NV_point_sprite",                F(NV_point_sprite) },
-- 
cgit v1.2.3


From 92d7ed8a20d4a018ce5324e6537ae7b478b9e5bf Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Thu, 27 Aug 2009 10:09:24 -0700
Subject: mesa: Add support for ARB_draw_elements_base_vertex.

---
 src/mesa/drivers/dri/swrast/swrast.c |   2 +
 src/mesa/drivers/x11/xm_api.c        |   2 +
 src/mesa/main/api_noop.c             |  78 ++++++++++++++++++++-
 src/mesa/main/api_noop.h             |   7 ++
 src/mesa/main/api_validate.c         | 108 +++++++++++------------------
 src/mesa/main/api_validate.h         |   4 +-
 src/mesa/main/dd.h                   |  17 ++++-
 src/mesa/main/dlist.c                |   3 +
 src/mesa/main/extensions.c           |   2 +
 src/mesa/main/mtypes.h               |   1 +
 src/mesa/main/varray.h               |  15 ++++
 src/mesa/main/vtxfmt.c               |   3 +
 src/mesa/main/vtxfmt_tmp.h           |  41 +++++++++++
 src/mesa/tnl/t_draw.c                |  58 +++++++++++-----
 src/mesa/vbo/vbo.h                   |   1 +
 src/mesa/vbo/vbo_exec_array.c        | 131 ++++++++++++++++++++++++++++++-----
 src/mesa/vbo/vbo_rebase.c            |  15 +++-
 src/mesa/vbo/vbo_save_api.c          |  36 +++++++++-
 src/mesa/vbo/vbo_split.c             |   8 ++-
 src/mesa/vbo/vbo_split_copy.c        |  52 ++++++++------
 20 files changed, 453 insertions(+), 131 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/swrast/swrast.c b/src/mesa/drivers/dri/swrast/swrast.c
index 2d2aa5e0f1..3016987d56 100644
--- a/src/mesa/drivers/dri/swrast/swrast.c
+++ b/src/mesa/drivers/dri/swrast/swrast.c
@@ -62,6 +62,7 @@
 #define need_GL_SGI_color_table
 
 /* sw extensions not associated with some GL version */
+#define need_GL_ARB_draw_elements_base_vertex
 #define need_GL_ARB_shader_objects
 #define need_GL_ARB_vertex_array_object
 #define need_GL_ARB_vertex_program
@@ -96,6 +97,7 @@ const struct dri_extension card_extensions[] =
     { "GL_SGI_color_table",		GL_SGI_color_table_functions },
 
     { "GL_ARB_depth_clamp",		NULL },
+    { "GL_ARB_draw_elements_base_vertex", GL_ARB_draw_elements_base_vertex_functions },
     { "GL_ARB_shader_objects",		GL_ARB_shader_objects_functions },
     { "GL_ARB_vertex_array_object",	GL_ARB_vertex_array_object_functions },
     { "GL_ARB_vertex_program",		GL_ARB_vertex_program_functions },
diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c
index 777635b783..662c61ae7e 100644
--- a/src/mesa/drivers/x11/xm_api.c
+++ b/src/mesa/drivers/x11/xm_api.c
@@ -1317,6 +1317,7 @@ xmesa_convert_from_x_visual_type( int visualType )
 #define need_GL_SGI_color_table
 
 /* sw extensions not associated with some GL version */
+#define need_GL_ARB_draw_elements_base_vertex
 #define need_GL_ARB_shader_objects
 #define need_GL_ARB_sync
 #define need_GL_ARB_vertex_program
@@ -1348,6 +1349,7 @@ const struct dri_extension card_extensions[] =
    { "GL_SGI_color_table",		GL_SGI_color_table_functions },
 
    { "GL_ARB_depth_clamp",		NULL },
+   { "GL_ARB_draw_elements_base_vertex", GL_ARB_draw_elements_base_vertex_functions },
    { "GL_ARB_shader_objects",		GL_ARB_shader_objects_functions },
    { "GL_ARB_sync",			GL_ARB_sync_functions },
    { "GL_ARB_vertex_program",		GL_ARB_vertex_program_functions },
diff --git a/src/mesa/main/api_noop.c b/src/mesa/main/api_noop.c
index 09ba7e5062..0b669e7e7f 100644
--- a/src/mesa/main/api_noop.c
+++ b/src/mesa/main/api_noop.c
@@ -731,7 +731,7 @@ _mesa_noop_DrawElements(GLenum mode, GLsizei count, GLenum type,
    GET_CURRENT_CONTEXT(ctx);
    GLint i;
 
-   if (!_mesa_validate_DrawElements( ctx, mode, count, type, indices ))
+   if (!_mesa_validate_DrawElements( ctx, mode, count, type, indices, 0 ))
       return;
 
    CALL_Begin(GET_DISPATCH(), (mode));
@@ -757,6 +757,43 @@ _mesa_noop_DrawElements(GLenum mode, GLsizei count, GLenum type,
    CALL_End(GET_DISPATCH(), ());
 }
 
+static void GLAPIENTRY
+_mesa_noop_DrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type,
+				  const GLvoid *indices, GLint basevertex)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLint i;
+
+   if (!_mesa_validate_DrawElements( ctx, mode, count, type, indices,
+				     basevertex ))
+      return;
+
+   CALL_Begin(GET_DISPATCH(), (mode));
+
+   switch (type) {
+   case GL_UNSIGNED_BYTE:
+      for (i = 0 ; i < count ; i++)
+	  CALL_ArrayElement(GET_DISPATCH(), ( ((GLubyte *)indices)[i] +
+					      basevertex));
+      break;
+   case GL_UNSIGNED_SHORT:
+      for (i = 0 ; i < count ; i++)
+	  CALL_ArrayElement(GET_DISPATCH(), ( ((GLushort *)indices)[i] +
+					      basevertex ));
+      break;
+   case GL_UNSIGNED_INT:
+      for (i = 0 ; i < count ; i++)
+	  CALL_ArrayElement(GET_DISPATCH(), ( ((GLuint *)indices)[i] +
+					      basevertex ));
+      break;
+   default:
+      _mesa_error( ctx, GL_INVALID_ENUM, "glDrawElementsBaseVertex(type)" );
+      break;
+   }
+
+   CALL_End(GET_DISPATCH(), ());
+}
+
 
 static void GLAPIENTRY
 _mesa_noop_DrawRangeElements(GLenum mode,
@@ -768,7 +805,7 @@ _mesa_noop_DrawRangeElements(GLenum mode,
 
    if (_mesa_validate_DrawRangeElements( ctx, mode,
 					 start, end,
-					 count, type, indices ))
+					 count, type, indices, 0 ))
        CALL_DrawElements(GET_DISPATCH(), (mode, count, type, indices));
 }
 
@@ -786,6 +823,40 @@ _mesa_noop_MultiDrawElements(GLenum mode, const GLsizei *count, GLenum type,
    }
 }
 
+static void GLAPIENTRY
+_mesa_noop_DrawRangeElementsBaseVertex(GLenum mode,
+				       GLuint start, GLuint end,
+				       GLsizei count, GLenum type,
+				       const GLvoid *indices, GLint basevertex)
+{
+   GET_CURRENT_CONTEXT(ctx);
+
+   if (_mesa_validate_DrawRangeElements( ctx, mode,
+					 start, end,
+					 count, type, indices, basevertex ))
+      CALL_DrawElementsBaseVertex(GET_DISPATCH(), (mode, count, type, indices,
+						   basevertex));
+}
+
+/* GL_EXT_multi_draw_arrays */
+void GLAPIENTRY
+_mesa_noop_MultiDrawElementsBaseVertex(GLenum mode, const GLsizei *count,
+				       GLenum type,
+				       const GLvoid **indices,
+				       GLsizei primcount,
+				       const GLint *basevertex)
+{
+   GLsizei i;
+
+   for (i = 0; i < primcount; i++) {
+      if (count[i] > 0) {
+	 CALL_DrawElementsBaseVertex(GET_DISPATCH(), (mode, count[i], type,
+						      indices[i],
+						      basevertex[i]));
+      }
+   }
+}
+
 /*
  * Eval Mesh
  */
@@ -995,6 +1066,9 @@ _mesa_noop_vtxfmt_init( GLvertexformat *vfmt )
    vfmt->DrawElements = _mesa_noop_DrawElements;
    vfmt->DrawRangeElements = _mesa_noop_DrawRangeElements;
    vfmt->MultiDrawElementsEXT = _mesa_noop_MultiDrawElements;
+   vfmt->DrawElementsBaseVertex = _mesa_noop_DrawElementsBaseVertex;
+   vfmt->DrawRangeElementsBaseVertex = _mesa_noop_DrawRangeElementsBaseVertex;
+   vfmt->MultiDrawElementsBaseVertex = _mesa_noop_MultiDrawElementsBaseVertex;
    vfmt->EvalMesh1 = _mesa_noop_EvalMesh1;
    vfmt->EvalMesh2 = _mesa_noop_EvalMesh2;
 }
diff --git a/src/mesa/main/api_noop.h b/src/mesa/main/api_noop.h
index a7956d00b3..1150984d64 100644
--- a/src/mesa/main/api_noop.h
+++ b/src/mesa/main/api_noop.h
@@ -44,6 +44,13 @@ extern void GLAPIENTRY
 _mesa_noop_MultiDrawElements(GLenum mode, const GLsizei *count, GLenum type,
 			     const GLvoid **indices, GLsizei primcount);
 
+extern void GLAPIENTRY
+_mesa_noop_MultiDrawElementsBaseVertex(GLenum mode, const GLsizei *count,
+				       GLenum type,
+				       const GLvoid **indices,
+				       GLsizei primcount,
+				       const GLint *basevertex);
+
 extern void
 _mesa_noop_vtxfmt_init(GLvertexformat *vfmt);
 
diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c
index 2df4f17389..4a1448deee 100644
--- a/src/mesa/main/api_validate.c
+++ b/src/mesa/main/api_validate.c
@@ -29,7 +29,7 @@
 #include "imports.h"
 #include "mtypes.h"
 #include "state.h"
-
+#include "vbo/vbo.h"
 
 
 /**
@@ -51,51 +51,6 @@ index_bytes(GLenum type, GLsizei count)
 }
 
 
-/**
- * Find the max index in the given element/index buffer
- */
-static GLuint
-max_buffer_index(GLcontext *ctx, GLuint count, GLenum type,
-                 const void *indices,
-                 struct gl_buffer_object *elementBuf)
-{
-   const GLubyte *map = NULL;
-   GLuint max = 0;
-   GLuint i;
-
-   if (_mesa_is_bufferobj(elementBuf)) {
-      /* elements are in a user-defined buffer object.  need to map it */
-      map = ctx->Driver.MapBuffer(ctx, GL_ELEMENT_ARRAY_BUFFER,
-                                  GL_READ_ONLY, elementBuf);
-      /* Actual address is the sum of pointers */
-      indices = (const GLvoid *) ADD_POINTERS(map, (const GLubyte *) indices);
-   }
-
-   if (type == GL_UNSIGNED_INT) {
-      for (i = 0; i < count; i++)
-         if (((GLuint *) indices)[i] > max)
-            max = ((GLuint *) indices)[i];
-   }
-   else if (type == GL_UNSIGNED_SHORT) {
-      for (i = 0; i < count; i++)
-         if (((GLushort *) indices)[i] > max)
-            max = ((GLushort *) indices)[i];
-   }
-   else {
-      ASSERT(type == GL_UNSIGNED_BYTE);
-      for (i = 0; i < count; i++)
-         if (((GLubyte *) indices)[i] > max)
-            max = ((GLubyte *) indices)[i];
-   }
-
-   if (map) {
-      ctx->Driver.UnmapBuffer(ctx, GL_ELEMENT_ARRAY_BUFFER_ARB, elementBuf);
-   }
-
-   return max;
-}
-
-
 /**
  * Check if OK to draw arrays/elements.
  */
@@ -124,6 +79,40 @@ check_valid_to_render(GLcontext *ctx, const char *function)
    return GL_TRUE;
 }
 
+static GLboolean
+check_index_bounds(GLcontext *ctx, GLsizei count, GLenum type,
+		   const GLvoid *indices, GLint basevertex)
+{
+   struct _mesa_prim prim;
+   struct _mesa_index_buffer ib;
+   GLuint min, max;
+
+   /* Only the X Server needs to do this -- otherwise, accessing outside
+    * array/BO bounds allows application termination.
+    */
+   if (!ctx->Const.CheckArrayBounds)
+      return GL_TRUE;
+
+   memset(&prim, 0, sizeof(prim));
+   prim.count = count;
+
+   memset(&ib, 0, sizeof(ib));
+   ib.type = type;
+   ib.ptr = indices;
+   ib.obj = ctx->Array.ElementArrayBufferObj;
+
+   vbo_get_minmax_index(ctx, &prim, &ib, &min, &max);
+
+   if (min + basevertex < 0 ||
+       max + basevertex > ctx->Array.ArrayObj->_MaxElement) {
+      /* the max element is out of bounds of one or more enabled arrays */
+      _mesa_warning(ctx, "glDrawElements() index=%u is "
+		    "out of bounds (max=%u)", max, ctx->Array.ArrayObj->_MaxElement);
+      return GL_FALSE;
+   }
+
+   return GL_TRUE;
+}
 
 /**
  * Error checking for glDrawElements().  Includes parameter checking
@@ -133,7 +122,7 @@ check_valid_to_render(GLcontext *ctx, const char *function)
 GLboolean
 _mesa_validate_DrawElements(GLcontext *ctx,
 			    GLenum mode, GLsizei count, GLenum type,
-			    const GLvoid *indices)
+			    const GLvoid *indices, GLint basevertex)
 {
    ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx,  GL_FALSE);
 
@@ -177,17 +166,8 @@ _mesa_validate_DrawElements(GLcontext *ctx,
          return GL_FALSE;
    }
 
-   if (ctx->Const.CheckArrayBounds) {
-      /* find max array index */
-      GLuint max = max_buffer_index(ctx, count, type, indices,
-                                    ctx->Array.ElementArrayBufferObj);
-      if (max >= ctx->Array.ArrayObj->_MaxElement) {
-         /* the max element is out of bounds of one or more enabled arrays */
-         _mesa_warning(ctx, "glDrawElements() index=%u is "
-                       "out of bounds (max=%u)", max, ctx->Array.ArrayObj->_MaxElement);
-         return GL_FALSE;
-      }
-   }
+   if (!check_index_bounds(ctx, count, type, indices, basevertex))
+      return GL_FALSE;
 
    return GL_TRUE;
 }
@@ -202,7 +182,7 @@ GLboolean
 _mesa_validate_DrawRangeElements(GLcontext *ctx, GLenum mode,
 				 GLuint start, GLuint end,
 				 GLsizei count, GLenum type,
-				 const GLvoid *indices)
+				 const GLvoid *indices, GLint basevertex)
 {
    ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
 
@@ -250,14 +230,8 @@ _mesa_validate_DrawRangeElements(GLcontext *ctx, GLenum mode,
          return GL_FALSE;
    }
 
-   if (ctx->Const.CheckArrayBounds) {
-      GLuint max = max_buffer_index(ctx, count, type, indices,
-                                    ctx->Array.ElementArrayBufferObj);
-      if (max >= ctx->Array.ArrayObj->_MaxElement) {
-         /* the max element is out of bounds of one or more enabled arrays */
-         return GL_FALSE;
-      }
-   }
+   if (!check_index_bounds(ctx, count, type, indices, basevertex))
+      return GL_FALSE;
 
    return GL_TRUE;
 }
diff --git a/src/mesa/main/api_validate.h b/src/mesa/main/api_validate.h
index 10f0c34e66..1d3ae157d7 100644
--- a/src/mesa/main/api_validate.h
+++ b/src/mesa/main/api_validate.h
@@ -37,13 +37,13 @@ _mesa_validate_DrawArrays(GLcontext *ctx,
 extern GLboolean
 _mesa_validate_DrawElements(GLcontext *ctx,
 			    GLenum mode, GLsizei count, GLenum type,
-			    const GLvoid *indices);
+			    const GLvoid *indices, GLint basevertex);
 
 extern GLboolean
 _mesa_validate_DrawRangeElements(GLcontext *ctx, GLenum mode,
 				 GLuint start, GLuint end,
 				 GLsizei count, GLenum type,
-				 const GLvoid *indices);
+				 const GLvoid *indices, GLint basevertex);
 
 
 #endif
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index 4a700b5cb4..ce5e158626 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -1172,7 +1172,22 @@ typedef struct {
 					    GLenum type,
 					    const GLvoid **indices,
 					    GLsizei primcount);
-  /*@}*/
+   void (GLAPIENTRYP DrawElementsBaseVertex)( GLenum mode, GLsizei count,
+					      GLenum type,
+					      const GLvoid *indices,
+					      GLint basevertex );
+   void (GLAPIENTRYP DrawRangeElementsBaseVertex)( GLenum mode, GLuint start,
+						   GLuint end, GLsizei count,
+						   GLenum type,
+						   const GLvoid *indices,
+						   GLint basevertex);
+   void (GLAPIENTRYP MultiDrawElementsBaseVertex)( GLenum mode,
+						   const GLsizei *count,
+						   GLenum type,
+						   const GLvoid **indices,
+						   GLsizei primcount,
+						   const GLint *basevertex);
+   /*@}*/
 
    /**
     * \name Eval
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 8cff9ea64a..d721f699fd 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -8711,6 +8711,9 @@ _mesa_save_vtxfmt_init(GLvertexformat * vfmt)
    vfmt->DrawElements = 0;
    vfmt->DrawRangeElements = 0;
    vfmt->MultiDrawElemementsEXT = 0;
+   vfmt->DrawElementsBaseVertex = 0;
+   vfmt->DrawRangeElementsBaseVertex = 0;
+   vfmt->MultiDrawElemementsBaseVertex = 0;
 #endif
 }
 
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index d0e77bafdd..2ad66de7dd 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -49,6 +49,7 @@ static const struct {
    { OFF, "GL_ARB_depth_texture",              F(ARB_depth_texture) },
    { OFF, "GL_ARB_depth_clamp",                F(ARB_depth_clamp) },
    { ON,  "GL_ARB_draw_buffers",               F(ARB_draw_buffers) },
+   { OFF, "GL_ARB_draw_elements_base_vertex",  F(ARB_draw_elements_base_vertex) },
    { OFF, "GL_ARB_fragment_program",           F(ARB_fragment_program) },
    { OFF, "GL_ARB_fragment_program_shadow",    F(ARB_fragment_program_shadow) },
    { OFF, "GL_ARB_fragment_shader",            F(ARB_fragment_shader) },
@@ -197,6 +198,7 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
    ctx->Extensions.ARB_depth_clamp = GL_TRUE;
    ctx->Extensions.ARB_depth_texture = GL_TRUE;
    /*ctx->Extensions.ARB_draw_buffers = GL_TRUE;*/
+   ctx->Extensions.ARB_draw_elements_base_vertex = GL_TRUE;
 #if FEATURE_ARB_fragment_program
    ctx->Extensions.ARB_fragment_program = GL_TRUE;
    ctx->Extensions.ARB_fragment_program_shadow = GL_TRUE;
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 20cd3aa5c0..ae169fb9db 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2478,6 +2478,7 @@ struct gl_extensions
    GLboolean ARB_depth_texture;
    GLboolean ARB_depth_clamp;
    GLboolean ARB_draw_buffers;
+   GLboolean ARB_draw_elements_base_vertex;
    GLboolean ARB_fragment_program;
    GLboolean ARB_fragment_program_shadow;
    GLboolean ARB_fragment_shader;
diff --git a/src/mesa/main/varray.h b/src/mesa/main/varray.h
index becc67c29d..ef790c504e 100644
--- a/src/mesa/main/varray.h
+++ b/src/mesa/main/varray.h
@@ -129,6 +129,11 @@ extern void GLAPIENTRY
 _mesa_MultiDrawElementsEXT( GLenum mode, const GLsizei *count, GLenum type,
                             const GLvoid **indices, GLsizei primcount );
 
+extern void GLAPIENTRY
+_mesa_MultiDrawElementsBaseVertex( GLenum mode,
+				   const GLsizei *count, GLenum type,
+				   const GLvoid **indices, GLsizei primcount,
+				   const GLint *basevertex);
 
 extern void GLAPIENTRY
 _mesa_MultiModeDrawArraysIBM( const GLenum * mode, const GLint * first,
@@ -159,6 +164,16 @@ extern void GLAPIENTRY
 _mesa_DrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count,
                         GLenum type, const GLvoid *indices);
 
+extern void GLAPIENTRY
+_mesa_DrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type,
+			     const GLvoid *indices, GLint basevertex);
+
+extern void GLAPIENTRY
+_mesa_DrawRangeElementsBaseVertex(GLenum mode, GLuint start, GLuint end,
+				  GLsizei count, GLenum type,
+				  const GLvoid *indices,
+				  GLint basevertex);
+
 
 extern void
 _mesa_copy_client_array(GLcontext *ctx,
diff --git a/src/mesa/main/vtxfmt.c b/src/mesa/main/vtxfmt.c
index 8d6f560a80..91412f138a 100644
--- a/src/mesa/main/vtxfmt.c
+++ b/src/mesa/main/vtxfmt.c
@@ -134,6 +134,9 @@ install_vtxfmt( struct _glapi_table *tab, const GLvertexformat *vfmt )
    SET_DrawElements(tab, vfmt->DrawElements);
    SET_DrawRangeElements(tab, vfmt->DrawRangeElements);
    SET_MultiDrawElementsEXT(tab, vfmt->MultiDrawElementsEXT);
+   SET_DrawElementsBaseVertex(tab, vfmt->DrawElementsBaseVertex);
+   SET_DrawRangeElementsBaseVertex(tab, vfmt->DrawRangeElementsBaseVertex);
+   SET_MultiDrawElementsBaseVertex(tab, vfmt->MultiDrawElementsBaseVertex);
    SET_EvalMesh1(tab, vfmt->EvalMesh1);
    SET_EvalMesh2(tab, vfmt->EvalMesh2);
    ASSERT(tab->EvalMesh2);
diff --git a/src/mesa/main/vtxfmt_tmp.h b/src/mesa/main/vtxfmt_tmp.h
index 1308d0aa46..d56a2bb95e 100644
--- a/src/mesa/main/vtxfmt_tmp.h
+++ b/src/mesa/main/vtxfmt_tmp.h
@@ -354,6 +354,44 @@ static void GLAPIENTRY TAG(DrawRangeElements)( GLenum mode, GLuint start,
    CALL_DrawRangeElements(GET_DISPATCH(), ( mode, start, end, count, type, indices ));
 }
 
+static void GLAPIENTRY TAG(DrawElementsBaseVertex)( GLenum mode,
+						    GLsizei count,
+						    GLenum type,
+						    const GLvoid *indices,
+						    GLint basevertex)
+{
+   PRE_LOOPBACK( DrawElementsBaseVertex );
+   CALL_DrawElementsBaseVertex(GET_DISPATCH(), ( mode, count, type,
+						 indices, basevertex ));
+}
+
+static void GLAPIENTRY TAG(DrawRangeElementsBaseVertex)( GLenum mode,
+							 GLuint start,
+							 GLuint end,
+							 GLsizei count,
+							 GLenum type,
+							 const GLvoid *indices,
+							 GLint basevertex)
+{
+   PRE_LOOPBACK( DrawRangeElementsBaseVertex );
+   CALL_DrawRangeElementsBaseVertex(GET_DISPATCH(), ( mode, start, end,
+						      count, type, indices,
+						      basevertex ));
+}
+
+static void GLAPIENTRY TAG(MultiDrawElementsBaseVertex)( GLenum mode,
+							 const GLsizei *count,
+							 GLenum type,
+							 const GLvoid **indices,
+							 GLsizei primcount,
+							 const GLint *basevertex)
+{
+   PRE_LOOPBACK( MultiDrawElementsBaseVertex );
+   CALL_MultiDrawElementsBaseVertex(GET_DISPATCH(), ( mode, count, type,
+						      indices,
+						      primcount, basevertex ));
+}
+
 static void GLAPIENTRY TAG(EvalMesh1)( GLenum mode, GLint i1, GLint i2 )
 {
    PRE_LOOPBACK( EvalMesh1 );
@@ -534,6 +572,9 @@ static GLvertexformat TAG(vtxfmt) = {
    TAG(DrawElements),
    TAG(DrawRangeElements),
    TAG(MultiDrawElementsEXT),
+   TAG(DrawElementsBaseVertex),
+   TAG(DrawRangeElementsBaseVertex),
+   TAG(MultiDrawElementsBaseVertex),
    TAG(EvalMesh1),
    TAG(EvalMesh2)
 };
diff --git a/src/mesa/tnl/t_draw.c b/src/mesa/tnl/t_draw.c
index c64c2c2077..04fa106300 100644
--- a/src/mesa/tnl/t_draw.c
+++ b/src/mesa/tnl/t_draw.c
@@ -316,22 +316,27 @@ static void bind_indices( GLcontext *ctx,
 
    ptr = ADD_POINTERS(ib->obj->Pointer, ib->ptr);
 
-   if (ib->type == GL_UNSIGNED_INT) {
+   if (ib->type == GL_UNSIGNED_INT && VB->Primitive[0].basevertex == 0) {
       VB->Elts = (GLuint *) ptr;
    }
    else {
       GLuint *elts = (GLuint *)get_space(ctx, ib->count * sizeof(GLuint));
       VB->Elts = elts;
 
-      if (ib->type == GL_UNSIGNED_SHORT) {
+      if (ib->type == GL_UNSIGNED_INT) {
+	 const GLuint *in = (GLuint *)ptr;
+	 for (i = 0; i < ib->count; i++)
+	    *elts++ = (GLuint)(*in++) + VB->Primitive[0].basevertex;
+      }
+      else if (ib->type == GL_UNSIGNED_SHORT) {
 	 const GLushort *in = (GLushort *)ptr;
 	 for (i = 0; i < ib->count; i++) 
-	    *elts++ = (GLuint)(*in++);
+	    *elts++ = (GLuint)(*in++) + VB->Primitive[0].basevertex;
       }
       else {
 	 const GLubyte *in = (GLubyte *)ptr;
 	 for (i = 0; i < ib->count; i++) 
-	    *elts++ = (GLuint)(*in++);
+	    *elts++ = (GLuint)(*in++) + VB->Primitive[0].basevertex;
       }
    }
 }
@@ -390,10 +395,14 @@ void _tnl_draw_prims( GLcontext *ctx,
    TNLcontext *tnl = TNL_CONTEXT(ctx);
    const GLuint TEST_SPLIT = 0;
    const GLint max = TEST_SPLIT ? 8 : tnl->vb.Size - MAX_CLIPPED_VERTICES;
+   GLuint max_basevertex = prim->basevertex;
+   GLuint i;
+
+   for (i = 1; i < nr_prims; i++)
+      max_basevertex = MAX2(max_basevertex, prim[i].basevertex);
 
    if (0)
    {
-      GLuint i;
       _mesa_printf("%s %d..%d\n", __FUNCTION__, min_index, max_index);
       for (i = 0; i < nr_prims; i++)
 	 _mesa_printf("prim %d: %s start %d count %d\n", i, 
@@ -410,7 +419,7 @@ void _tnl_draw_prims( GLcontext *ctx,
 			_tnl_vbo_draw_prims );
       return;
    }
-   else if (max_index > max) {
+   else if (max_index + max_basevertex > max) {
       /* The software TNL pipeline has a fixed amount of storage for
        * vertices and it is necessary to split incoming drawing commands
        * if they exceed that limit.
@@ -424,7 +433,7 @@ void _tnl_draw_prims( GLcontext *ctx,
        * recursively call back into this function.
        */
       vbo_split_prims( ctx, arrays, prim, nr_prims, ib, 
-		       0, max_index,
+		       0, max_index + prim->basevertex,
 		       _tnl_vbo_draw_prims,
 		       &limits );
    }
@@ -435,17 +444,34 @@ void _tnl_draw_prims( GLcontext *ctx,
       struct gl_buffer_object *bo[VERT_ATTRIB_MAX + 1];
       GLuint nr_bo = 0;
 
-      /* Binding inputs may imply mapping some vertex buffer objects.
-       * They will need to be unmapped below.
-       */
-      bind_inputs(ctx, arrays, max_index+1, bo, &nr_bo);
-      bind_indices(ctx, ib, bo, &nr_bo);
-      bind_prims(ctx, prim, nr_prims );
+      for (i = 0; i < nr_prims;) {
+	 GLuint this_nr_prims;
+
+	 /* Our SW TNL pipeline doesn't handle basevertex yet, so bind_indices
+	  * will rebase the elements to the basevertex, and we'll only
+	  * emit strings of prims with the same basevertex in one draw call.
+	  */
+	 for (this_nr_prims = 1; i + this_nr_prims < nr_prims;
+	      this_nr_prims++) {
+	    if (prim[i].basevertex != prim[i + this_nr_prims].basevertex)
+	       break;
+	 }
+
+	 /* Binding inputs may imply mapping some vertex buffer objects.
+	  * They will need to be unmapped below.
+	  */
+	 bind_prims(ctx, &prim[i], this_nr_prims);
+	 bind_inputs(ctx, arrays, max_index + prim[i].basevertex + 1,
+		     bo, &nr_bo);
+	 bind_indices(ctx, ib, bo, &nr_bo);
 
-      TNL_CONTEXT(ctx)->Driver.RunPipeline(ctx);
+	 TNL_CONTEXT(ctx)->Driver.RunPipeline(ctx);
 
-      unmap_vbos(ctx, bo, nr_bo);
-      free_space(ctx);
+	 unmap_vbos(ctx, bo, nr_bo);
+	 free_space(ctx);
+
+	 i += this_nr_prims;
+      }
    }
 }
 
diff --git a/src/mesa/vbo/vbo.h b/src/mesa/vbo/vbo.h
index 5986e93576..b24ecfd7cd 100644
--- a/src/mesa/vbo/vbo.h
+++ b/src/mesa/vbo/vbo.h
@@ -44,6 +44,7 @@ struct _mesa_prim {
 
    GLuint start;
    GLuint count;
+   GLint basevertex;
 };
 
 /* Would like to call this a "vbo_index_buffer", but this would be
diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c
index 12911f5750..b9550d6106 100644
--- a/src/mesa/vbo/vbo_exec_array.c
+++ b/src/mesa/vbo/vbo_exec_array.c
@@ -181,7 +181,7 @@ unmap_array_buffer(GLcontext *ctx, struct gl_client_array *array)
  */
 static void
 check_draw_elements_data(GLcontext *ctx, GLsizei count, GLenum elemType,
-                         const void *elements)
+                         const void *elements, GLint basevertex)
 {
    struct gl_array_object *arrayObj = ctx->Array.ArrayObj;
    const void *elemMap;
@@ -518,6 +518,7 @@ vbo_exec_DrawArrays(GLenum mode, GLint start, GLsizei count)
    prim[0].start = start;
    prim[0].count = count;
    prim[0].indexed = 0;
+   prim[0].basevertex = 0;
 
    vbo->draw_prims( ctx, exec->array.inputs, prim, 1, NULL,
                     GL_TRUE, start, start + count - 1 );
@@ -592,7 +593,8 @@ vbo_validated_drawrangeelements(GLcontext *ctx, GLenum mode,
 				GLboolean index_bounds_valid,
 				GLuint start, GLuint end,
 				GLsizei count, GLenum type,
-				const GLvoid *indices)
+				const GLvoid *indices,
+				GLint basevertex)
 {
    struct vbo_context *vbo = vbo_context(ctx);
    struct vbo_exec_context *exec = &vbo->exec;
@@ -626,6 +628,7 @@ vbo_validated_drawrangeelements(GLcontext *ctx, GLenum mode,
    prim[0].start = 0;
    prim[0].count = count;
    prim[0].indexed = 1;
+   prim[0].basevertex = basevertex;
 
    /* Need to give special consideration to rendering a range of
     * indices starting somewhere above zero.  Typically the
@@ -663,23 +666,25 @@ vbo_validated_drawrangeelements(GLcontext *ctx, GLenum mode,
 }
 
 static void GLAPIENTRY
-vbo_exec_DrawRangeElements(GLenum mode,
-			   GLuint start, GLuint end,
-			   GLsizei count, GLenum type, const GLvoid *indices)
+vbo_exec_DrawRangeElementsBaseVertex(GLenum mode,
+				     GLuint start, GLuint end,
+				     GLsizei count, GLenum type,
+				     const GLvoid *indices,
+				     GLint basevertex)
 {
    GET_CURRENT_CONTEXT(ctx);
 
    if (!_mesa_validate_DrawRangeElements( ctx, mode, start, end, count,
-                                          type, indices ))
+                                          type, indices, basevertex ))
       return;
 
    if (end >= ctx->Array.ArrayObj->_MaxElement) {
       /* the max element is out of bounds of one or more enabled arrays */
-      _mesa_warning(ctx, "glDraw[Range]Elements(start %u, end %u, count %d, "
-                    "type 0x%x, indices=%p)\n"
+      _mesa_warning(ctx, "glDraw[Range]Elements{,BaseVertex}(start %u, end %u, "
+		    "count %d, type 0x%x, indices=%p, base=%d)\n"
                     "\tindex=%u is out of bounds (max=%u)  "
                     "Element Buffer %u (size %d)",
-                    start, end, count, type, indices, end,
+                    start, end, count, type, indices, end, basevertex,
                     ctx->Array.ArrayObj->_MaxElement - 1,
                     ctx->Array.ElementArrayBufferObj->Name,
                     ctx->Array.ElementArrayBufferObj->Size);
@@ -692,10 +697,12 @@ vbo_exec_DrawRangeElements(GLenum mode,
       return;
    }
    else if (0) {
-      _mesa_printf("glDraw[Range]Elements"
-                   "(start %u, end %u, type 0x%x, count %d) ElemBuf %u\n",
+      _mesa_printf("glDraw[Range]Elements{,BaseVertex}"
+                   "(start %u, end %u, type 0x%x, count %d) ElemBuf %u, "
+		   "base %d\n",
                    start, end, type, count,
-                   ctx->Array.ElementArrayBufferObj->Name);
+                   ctx->Array.ElementArrayBufferObj->Name,
+		   basevertex);
    }
 
 #if 0
@@ -705,7 +712,17 @@ vbo_exec_DrawRangeElements(GLenum mode,
 #endif
 
    vbo_validated_drawrangeelements(ctx, mode, GL_TRUE, start, end,
-				   count, type, indices);
+				   count, type, indices, basevertex);
+}
+
+static void GLAPIENTRY
+vbo_exec_DrawRangeElements(GLenum mode,
+				     GLuint start, GLuint end,
+				     GLsizei count, GLenum type,
+				     const GLvoid *indices)
+{
+   vbo_exec_DrawRangeElementsBaseVertex(mode, start, end, count, type,
+					indices, 0);
 }
 
 
@@ -715,18 +732,33 @@ vbo_exec_DrawElements(GLenum mode, GLsizei count, GLenum type,
 {
    GET_CURRENT_CONTEXT(ctx);
 
-   if (!_mesa_validate_DrawElements( ctx, mode, count, type, indices ))
+   if (!_mesa_validate_DrawElements( ctx, mode, count, type, indices, 0 ))
+      return;
+
+   vbo_validated_drawrangeelements(ctx, mode, GL_FALSE, ~0, ~0,
+				   count, type, indices, 0);
+}
+
+static void GLAPIENTRY
+vbo_exec_DrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type,
+				const GLvoid *indices, GLint basevertex)
+{
+   GET_CURRENT_CONTEXT(ctx);
+
+   if (!_mesa_validate_DrawElements( ctx, mode, count, type, indices,
+				     basevertex ))
       return;
 
    vbo_validated_drawrangeelements(ctx, mode, GL_FALSE, ~0, ~0,
-				   count, type, indices);
+				   count, type, indices, basevertex);
 }
 
 /* Inner support for both _mesa_DrawElements and _mesa_DrawRangeElements */
 static void
 vbo_validated_multidrawelements(GLcontext *ctx, GLenum mode,
 				const GLsizei *count, GLenum type,
-				const GLvoid **indices, GLsizei primcount)
+				const GLvoid **indices, GLsizei primcount,
+				const GLint *basevertex)
 {
    struct vbo_context *vbo = vbo_context(ctx);
    struct vbo_exec_context *exec = &vbo->exec;
@@ -820,6 +852,10 @@ vbo_validated_multidrawelements(GLcontext *ctx, GLenum mode,
 	 prim[i].start = ((uintptr_t)indices[i] - min_index_ptr) / index_type_size;
 	 prim[i].count = count[i];
 	 prim[i].indexed = 1;
+	 if (basevertex != NULL)
+	    prim[i].basevertex = basevertex[i];
+	 else
+	    prim[i].basevertex = 0;
       }
 
       vbo->draw_prims(ctx, exec->array.inputs, prim, primcount, &ib,
@@ -840,6 +876,10 @@ vbo_validated_multidrawelements(GLcontext *ctx, GLenum mode,
 	 prim[0].start = 0;
 	 prim[0].count = count[i];
 	 prim[0].indexed = 1;
+	 if (basevertex != NULL)
+	    prim[0].basevertex = basevertex[i];
+	 else
+	    prim[0].basevertex = 0;
       }
 
       vbo->draw_prims(ctx, exec->array.inputs, prim, 1, &ib,
@@ -860,13 +900,36 @@ vbo_exec_MultiDrawElements(GLenum mode,
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
    for (i = 0; i < primcount; i++) {
-      if (!_mesa_validate_DrawElements( ctx, mode, count[i], type, indices[i] ))
+      if (!_mesa_validate_DrawElements(ctx, mode, count[i], type, indices[i],
+				       0))
 	 return;
    }
 
-   vbo_validated_multidrawelements(ctx, mode, count, type, indices, primcount);
+   vbo_validated_multidrawelements(ctx, mode, count, type, indices, primcount,
+				   NULL);
 }
 
+static void GLAPIENTRY
+vbo_exec_MultiDrawElementsBaseVertex(GLenum mode,
+				     const GLsizei *count, GLenum type,
+				     const GLvoid **indices,
+				     GLsizei primcount,
+				     const GLsizei *basevertex)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLint i;
+
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   for (i = 0; i < primcount; i++) {
+      if (!_mesa_validate_DrawElements(ctx, mode, count[i], type, indices[i],
+				       basevertex[i]))
+	 return;
+   }
+
+   vbo_validated_multidrawelements(ctx, mode, count, type, indices, primcount,
+				   basevertex);
+}
 
 
 /***********************************************************************
@@ -881,11 +944,17 @@ vbo_exec_array_init( struct vbo_exec_context *exec )
    exec->vtxfmt.DrawElements = vbo_exec_DrawElements;
    exec->vtxfmt.DrawRangeElements = vbo_exec_DrawRangeElements;
    exec->vtxfmt.MultiDrawElementsEXT = vbo_exec_MultiDrawElements;
+   exec->vtxfmt.DrawElementsBaseVertex = vbo_exec_DrawElementsBaseVertex;
+   exec->vtxfmt.DrawRangeElementsBaseVertex = vbo_exec_DrawRangeElementsBaseVertex;
+   exec->vtxfmt.MultiDrawElementsBaseVertex = vbo_exec_MultiDrawElementsBaseVertex;
 #else
    exec->vtxfmt.DrawArrays = _mesa_noop_DrawArrays;
    exec->vtxfmt.DrawElements = _mesa_noop_DrawElements;
    exec->vtxfmt.DrawRangeElements = _mesa_noop_DrawRangeElements;
    exec->vtxfmt.MultiDrawElementsEXT = _mesa_noop_MultiDrawElements;
+   exec->vtxfmt.DrawElementsBaseVertex = _mesa_noop_DrawElementsBaseVertex;
+   exec->vtxfmt.DrawRangeElementsBaseVertex = _mesa_noop_DrawRangeElementsBaseVertex;
+   exec->vtxfmt.MultiDrawElementsBaseVertex = _mesa_noop_MultiDrawElementsBaseVertex;
 #endif
 }
 
@@ -913,6 +982,13 @@ _mesa_DrawElements(GLenum mode, GLsizei count, GLenum type,
    vbo_exec_DrawElements(mode, count, type, indices);
 }
 
+void GLAPIENTRY
+_mesa_DrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type,
+			     const GLvoid *indices, GLint basevertex)
+{
+   vbo_exec_DrawElementsBaseVertex(mode, count, type, indices, basevertex);
+}
+
 
 /* This API entrypoint is not ordinarily used */
 void GLAPIENTRY
@@ -922,6 +998,15 @@ _mesa_DrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count,
    vbo_exec_DrawRangeElements(mode, start, end, count, type, indices);
 }
 
+void GLAPIENTRY
+_mesa_DrawRangeElementsBaseVertex(GLenum mode, GLuint start, GLuint end,
+				  GLsizei count, GLenum type,
+				  const GLvoid *indices, GLint basevertex)
+{
+   vbo_exec_DrawRangeElementsBaseVertex(mode, start, end, count, type,
+					indices, basevertex);
+}
+
 /* GL_EXT_multi_draw_arrays */
 void GLAPIENTRY
 _mesa_MultiDrawElementsEXT(GLenum mode, const GLsizei *count, GLenum type,
@@ -929,3 +1014,13 @@ _mesa_MultiDrawElementsEXT(GLenum mode, const GLsizei *count, GLenum type,
 {
    vbo_exec_MultiDrawElements(mode, count, type, indices, primcount);
 }
+
+void GLAPIENTRY
+_mesa_MultiDrawElementsBaseVertex(GLenum mode,
+				  const GLsizei *count, GLenum type,
+				  const GLvoid **indices, GLsizei primcount,
+				  const GLint *basevertex)
+{
+   vbo_exec_MultiDrawElementsBaseVertex(mode, count, type, indices,
+					primcount, basevertex);
+}
diff --git a/src/mesa/vbo/vbo_rebase.c b/src/mesa/vbo/vbo_rebase.c
index 3bf7ef580f..799a25fc1c 100644
--- a/src/mesa/vbo/vbo_rebase.c
+++ b/src/mesa/vbo/vbo_rebase.c
@@ -126,7 +126,20 @@ void vbo_rebase_prims( GLcontext *ctx,
    if (0)
       _mesa_printf("%s %d..%d\n", __FUNCTION__, min_index, max_index);
 
-   if (ib) {
+
+   if (ib && ctx->Extensions.ARB_draw_elements_base_vertex) {
+      /* If we can just tell the hardware or the TNL to interpret our
+       * indices with a different base, do so.
+       */
+      tmp_prims = (struct _mesa_prim *)_mesa_malloc(sizeof(*prim) * nr_prims);
+
+      for (i = 0; i < nr_prims; i++) {
+	 tmp_prims[i] = prim[i];
+	 tmp_prims[i].basevertex -= min_index;
+      }
+
+      prim = tmp_prims;
+   } else if (ib) {
       /* Unfortunately need to adjust each index individually.
        */
       GLboolean map_ib = ib->obj->Name && !ib->obj->Pointer;
diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c
index 1771510d84..41cd21d04b 100644
--- a/src/mesa/vbo/vbo_save_api.c
+++ b/src/mesa/vbo/vbo_save_api.c
@@ -826,6 +826,33 @@ static void GLAPIENTRY _save_DrawRangeElements(GLenum mode,
    _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glDrawRangeElements" );
 }
 
+static void GLAPIENTRY _save_DrawElementsBaseVertex(GLenum mode,
+						    GLsizei count,
+						    GLenum type,
+						    const GLvoid *indices,
+						    GLint basevertex)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   (void) mode; (void) count; (void) type; (void) indices; (void)basevertex;
+
+   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glDrawElements" );
+}
+
+static void GLAPIENTRY _save_DrawRangeElementsBaseVertex(GLenum mode,
+							 GLuint start,
+							 GLuint end,
+							 GLsizei count,
+							 GLenum type,
+							 const GLvoid *indices,
+							 GLint basevertex)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   (void) mode; (void) start; (void) end; (void) count; (void) type;
+   (void) indices; (void)basevertex;
+
+   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glDrawRangeElements" );
+}
+
 static void GLAPIENTRY _save_DrawArrays(GLenum mode, GLint start, GLsizei count)
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -907,7 +934,7 @@ static void GLAPIENTRY _save_OBE_DrawElements(GLenum mode, GLsizei count, GLenum
    GET_CURRENT_CONTEXT(ctx);
    GLint i;
 
-   if (!_mesa_validate_DrawElements( ctx, mode, count, type, indices ))
+   if (!_mesa_validate_DrawElements( ctx, mode, count, type, indices, 0 ))
       return;
 
    _ae_map_vbos( ctx );
@@ -948,7 +975,7 @@ static void GLAPIENTRY _save_OBE_DrawRangeElements(GLenum mode,
    GET_CURRENT_CONTEXT(ctx);
    if (_mesa_validate_DrawRangeElements( ctx, mode,
 					 start, end,
-					 count, type, indices ))
+					 count, type, indices, 0 ))
       _save_OBE_DrawElements( mode, count, type, indices );
 }
 
@@ -1039,9 +1066,11 @@ static void _save_vtxfmt_init( GLcontext *ctx )
    vfmt->DrawArrays = _save_DrawArrays;
    vfmt->DrawElements = _save_DrawElements;
    vfmt->DrawRangeElements = _save_DrawRangeElements;
+   vfmt->DrawElementsBaseVertex = _save_DrawElementsBaseVertex;
+   vfmt->DrawRangeElementsBaseVertex = _save_DrawRangeElementsBaseVertex;
    /* Loops back into vfmt->DrawElements */
    vfmt->MultiDrawElementsEXT = _mesa_noop_MultiDrawElements;
-
+   vfmt->MultiDrawElementsBaseVertex = _mesa_noop_MultiDrawElementsBaseVertex;
 }
 
 
@@ -1233,6 +1262,7 @@ void vbo_save_api_init( struct vbo_save_context *save )
    ctx->ListState.ListVtxfmt.DrawRangeElements = _save_OBE_DrawRangeElements;
    /* loops back into _save_OBE_DrawElements */
    ctx->ListState.ListVtxfmt.MultiDrawElementsEXT = _mesa_noop_MultiDrawElements;
+   ctx->ListState.ListVtxfmt.MultiDrawElementsBaseVertex = _mesa_noop_MultiDrawElementsBaseVertex;
    _mesa_install_save_vtxfmt( ctx, &ctx->ListState.ListVtxfmt );
 }
 
diff --git a/src/mesa/vbo/vbo_split.c b/src/mesa/vbo/vbo_split.c
index 58e879628d..c445acca7d 100644
--- a/src/mesa/vbo/vbo_split.c
+++ b/src/mesa/vbo/vbo_split.c
@@ -50,6 +50,7 @@
 #include "main/glheader.h"
 #include "main/imports.h"
 #include "main/mtypes.h"
+#include "main/macros.h"
 
 #include "vbo_split.h"
 #include "vbo.h"
@@ -107,7 +108,12 @@ void vbo_split_prims( GLcontext *ctx,
 		      vbo_draw_func draw,
 		      const struct split_limits *limits )
 {
-  
+   GLuint max_basevertex = prim->basevertex;
+   GLuint i;
+
+   for (i = 1; i < nr_prims; i++)
+      max_basevertex = MAX2(max_basevertex, prim[i].basevertex);
+
    if (ib) {
       if (limits->max_indices == 0) {
 	 /* Could traverse the indices, re-emitting vertices in turn.
diff --git a/src/mesa/vbo/vbo_split_copy.c b/src/mesa/vbo/vbo_split_copy.c
index 8ec180d550..c45190b9dd 100644
--- a/src/mesa/vbo/vbo_split_copy.c
+++ b/src/mesa/vbo/vbo_split_copy.c
@@ -589,28 +589,40 @@ void vbo_split_copy( GLcontext *ctx,
 		     const struct split_limits *limits )
 {
    struct copy_context copy;
-   GLuint i;
+   GLuint i, this_nr_prims;
+
+   for (i = 0; i < nr_prims;) {
+      /* Our SW TNL pipeline doesn't handle basevertex yet, so bind_indices
+       * will rebase the elements to the basevertex, and we'll only
+       * emit strings of prims with the same basevertex in one draw call.
+       */
+      for (this_nr_prims = 1; i + this_nr_prims < nr_prims;
+	   this_nr_prims++) {
+	 if (prim[i].basevertex != prim[i + this_nr_prims].basevertex)
+	    break;
+      }
 
-   memset(&copy, 0, sizeof(copy));
+      memset(&copy, 0, sizeof(copy));
 
-   /* Require indexed primitives:
-    */
-   assert(ib);
-   
-   copy.ctx = ctx;
-   copy.array = arrays;
-   copy.prim = prim;
-   copy.nr_prims = nr_prims;
-   copy.ib = ib;
-   copy.draw = draw;
-   copy.limits = limits;
+      /* Require indexed primitives:
+       */
+      assert(ib);
 
-   /* Clear the vertex cache:
-    */
-   for (i = 0; i < ELT_TABLE_SIZE; i++)
-      copy.vert_cache[i].in = ~0;
+      copy.ctx = ctx;
+      copy.array = arrays;
+      copy.prim = &prim[i];
+      copy.nr_prims = this_nr_prims;
+      copy.ib = ib;
+      copy.draw = draw;
+      copy.limits = limits;
 
-   replay_init(&copy);
-   replay_elts(&copy);
-   replay_finish(&copy);
+      /* Clear the vertex cache:
+       */
+      for (i = 0; i < ELT_TABLE_SIZE; i++)
+	 copy.vert_cache[i].in = ~0;
+
+      replay_init(&copy);
+      replay_elts(&copy);
+      replay_finish(&copy);
+   }
 }
-- 
cgit v1.2.3


From f78eafcacb67de3f2cd035335c4ecd98e21a8209 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 8 Sep 2009 16:46:06 -0600
Subject: mesa: bump version to 7.7

---
 Makefile                | 2 +-
 configs/default         | 2 +-
 src/mesa/main/version.h | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/mesa/main')

diff --git a/Makefile b/Makefile
index 211937d731..dd941ad9d5 100644
--- a/Makefile
+++ b/Makefile
@@ -182,7 +182,7 @@ ultrix-gcc:
 
 # Rules for making release tarballs
 
-VERSION=7.6-devel
+VERSION=7.7-devel
 DIRECTORY = Mesa-$(VERSION)
 LIB_NAME = MesaLib-$(VERSION)
 DEMO_NAME = MesaDemos-$(VERSION)
diff --git a/configs/default b/configs/default
index 127b98e76c..9e4bb08ea9 100644
--- a/configs/default
+++ b/configs/default
@@ -9,7 +9,7 @@ CONFIG_NAME = default
 
 # Version info
 MESA_MAJOR=7
-MESA_MINOR=6
+MESA_MINOR=7
 MESA_TINY=0
 MESA_VERSION = $(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY)
 
diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index d4d3dd1a94..0cae1860a3 100644
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -1,6 +1,6 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.6
+ * Version:  7.7
  *
  * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
@@ -30,9 +30,9 @@
 
 /* Mesa version */
 #define MESA_MAJOR 7
-#define MESA_MINOR 6
+#define MESA_MINOR 7
 #define MESA_PATCH 0
-#define MESA_VERSION_STRING "7.6-devel"
+#define MESA_VERSION_STRING "7.7-devel"
 
 /* To make version comparison easy */
 #define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
-- 
cgit v1.2.3


From 3fed69eb168774d2303e4efb9149f34e55d91b58 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 9 Sep 2009 08:54:38 -0600
Subject: mesa: move call to init_c_cliptest() from enable.c to tnl module.

Fixed gallium build breakage.
---
 src/mesa/main/enable.c      |  8 --------
 src/mesa/tnl/t_context.h    |  4 ++++
 src/mesa/tnl/t_vb_program.c |  2 ++
 src/mesa/tnl/t_vb_vertex.c  | 18 ++++++++++++++++++
 4 files changed, 24 insertions(+), 8 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index d066153fc2..4c1f46102d 100644
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -36,8 +36,6 @@
 #include "simple_list.h"
 #include "mtypes.h"
 #include "enums.h"
-#include "math/m_matrix.h"
-#include "math/m_xform.h"
 #include "api_arrayelt.h"
 
 
@@ -951,12 +949,6 @@ _mesa_set_enable(GLcontext *ctx, GLenum cap, GLboolean state)
       case GL_DEPTH_CLAMP:
          if (ctx->Transform.DepthClamp == state)
             return;
-	 /* Neither the x86 nor sparc asm cliptest functions have been updated
-	  * for ARB_depth_clamp, so force the C paths.
-	  */
-	 if (state)
-	    init_c_cliptest();
-
 	 CHECK_EXTENSION(ARB_depth_clamp, cap);
          FLUSH_VERTICES(ctx, _NEW_TRANSFORM);
 	 ctx->Transform.DepthClamp = state;
diff --git a/src/mesa/tnl/t_context.h b/src/mesa/tnl/t_context.h
index c19eb3df3c..6137c2d2fe 100644
--- a/src/mesa/tnl/t_context.h
+++ b/src/mesa/tnl/t_context.h
@@ -548,4 +548,8 @@ typedef struct
 #define MAX_TYPES TYPE_IDX(GL_DOUBLE)+1      /* 0xa + 1 */
 
 
+extern void
+tnl_clip_prepare(GLcontext *ctx);
+
+
 #endif
diff --git a/src/mesa/tnl/t_vb_program.c b/src/mesa/tnl/t_vb_program.c
index 5d89f8bc31..c10a27614f 100644
--- a/src/mesa/tnl/t_vb_program.c
+++ b/src/mesa/tnl/t_vb_program.c
@@ -131,6 +131,8 @@ do_ndc_cliptest(GLcontext *ctx, struct vp_stage_data *store)
    store->ormask = 0;
    store->andmask = CLIP_FRUSTUM_BITS;
 
+   tnl_clip_prepare(ctx);
+
    if (tnl->NeedNdcCoords) {
       VB->NdcPtr =
          _mesa_clip_tab[VB->ClipPtr->size]( VB->ClipPtr,
diff --git a/src/mesa/tnl/t_vb_vertex.c b/src/mesa/tnl/t_vb_vertex.c
index 6a746417c8..4734754ea4 100644
--- a/src/mesa/tnl/t_vb_vertex.c
+++ b/src/mesa/tnl/t_vb_vertex.c
@@ -118,6 +118,22 @@ static void (*(usercliptab[5]))( GLcontext *,
 };
 
 
+void
+tnl_clip_prepare(GLcontext *ctx)
+{
+   /* Neither the x86 nor sparc asm cliptest functions have been updated
+    * for ARB_depth_clamp, so force the C paths.
+    */
+   if (ctx->Transform.DepthClamp) {
+      static GLboolean c_funcs_installed = GL_FALSE;
+      if (!c_funcs_installed) {
+         init_c_cliptest();
+         c_funcs_installed = GL_TRUE;
+      }
+   }
+}
+
+
 
 static GLboolean run_vertex_stage( GLcontext *ctx,
 				   struct tnl_pipeline_stage *stage )
@@ -129,6 +145,8 @@ static GLboolean run_vertex_stage( GLcontext *ctx,
    if (ctx->VertexProgram._Current) 
       return GL_TRUE;
 
+   tnl_clip_prepare(ctx);
+
    if (ctx->_NeedEyeCoords) {
       /* Separate modelview transformation:
        * Use combined ModelProject to avoid some depth artifacts
-- 
cgit v1.2.3


From 94a8157ef6bf6695cdc66325c9a7698e64f3e37e Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 9 Sep 2009 08:55:32 -0600
Subject: mesa: regenerate get.c form get_gen.py

---
 src/mesa/main/get.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 477ed01030..a6e004a816 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -1722,6 +1722,10 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          params[0] = FLOAT_TO_BOOLEAN(ctx->Depth.BoundsMin);
          params[1] = FLOAT_TO_BOOLEAN(ctx->Depth.BoundsMax);
          break;
+      case GL_DEPTH_CLAMP:
+         CHECK_EXT1(ARB_depth_clamp, "GetBooleanv");
+         params[0] = ctx->Transform.DepthClamp;
+         break;
       case GL_MAX_DRAW_BUFFERS_ARB:
          params[0] = INT_TO_BOOLEAN(ctx->Const.MaxDrawBuffers);
          break;
@@ -3553,6 +3557,10 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          params[0] = ctx->Depth.BoundsMin;
          params[1] = ctx->Depth.BoundsMax;
          break;
+      case GL_DEPTH_CLAMP:
+         CHECK_EXT1(ARB_depth_clamp, "GetFloatv");
+         params[0] = BOOLEAN_TO_FLOAT(ctx->Transform.DepthClamp);
+         break;
       case GL_MAX_DRAW_BUFFERS_ARB:
          params[0] = (GLfloat)(ctx->Const.MaxDrawBuffers);
          break;
@@ -5384,6 +5392,10 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          params[0] = IROUND(ctx->Depth.BoundsMin);
          params[1] = IROUND(ctx->Depth.BoundsMax);
          break;
+      case GL_DEPTH_CLAMP:
+         CHECK_EXT1(ARB_depth_clamp, "GetIntegerv");
+         params[0] = BOOLEAN_TO_INT(ctx->Transform.DepthClamp);
+         break;
       case GL_MAX_DRAW_BUFFERS_ARB:
          params[0] = ctx->Const.MaxDrawBuffers;
          break;
@@ -7216,6 +7228,10 @@ _mesa_GetInteger64v( GLenum pname, GLint64 *params )
          params[0] = IROUND64(ctx->Depth.BoundsMin);
          params[1] = IROUND64(ctx->Depth.BoundsMax);
          break;
+      case GL_DEPTH_CLAMP:
+         CHECK_EXT1(ARB_depth_clamp, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Transform.DepthClamp);
+         break;
       case GL_MAX_DRAW_BUFFERS_ARB:
          params[0] = ctx->Const.MaxDrawBuffers;
          break;
-- 
cgit v1.2.3


From e9ba9ffc9aa5dcc2de02dc3e58279ffda2318c79 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 10 Sep 2009 08:41:12 -0600
Subject: mesa: in texenvprogram code, only do saturation when really needed.

For some env modes (like modulate or replace) we don't have to clamp
because we know the results will be in [0,1].
---
 src/mesa/main/texenvprogram.c | 61 +++++++++++++++++++++++++++++++++++++------
 1 file changed, 53 insertions(+), 8 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 870970a355..2f3e47e69e 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -247,6 +247,40 @@ static GLuint translate_mode( GLenum envMode, GLenum mode )
 }
 
 
+/**
+ * Do we need to clamp the results of the given texture env/combine mode?
+ * If the inputs to the mode are in [0,1] we don't always have to clamp
+ * the results.
+ */
+static GLboolean
+need_saturate( GLuint mode )
+{
+   switch (mode) {
+   case MODE_REPLACE:
+   case MODE_MODULATE:
+   case MODE_INTERPOLATE:
+      return GL_FALSE;
+   case MODE_ADD:
+   case MODE_ADD_SIGNED:
+   case MODE_SUBTRACT:
+   case MODE_DOT3_RGB:
+   case MODE_DOT3_RGB_EXT:
+   case MODE_DOT3_RGBA:
+   case MODE_DOT3_RGBA_EXT:
+   case MODE_MODULATE_ADD_ATI:
+   case MODE_MODULATE_SIGNED_ADD_ATI:
+   case MODE_MODULATE_SUBTRACT_ATI:
+   case MODE_ADD_PRODUCTS:
+   case MODE_ADD_PRODUCTS_SIGNED:
+   case MODE_BUMP_ENVMAP_ATI:
+      return GL_TRUE;
+   default:
+      assert(0);
+   }
+}
+
+
+
 /**
  * Translate TEXTURE_x_BIT to TEXTURE_x_INDEX.
  */
@@ -1116,7 +1150,7 @@ static struct ureg
 emit_texenv(struct texenv_fragment_program *p, GLuint unit)
 {
    const struct state_key *key = p->state;
-   GLboolean saturate;
+   GLboolean rgb_saturate, alpha_saturate;
    GLuint rgb_shift, alpha_shift;
    struct ureg out, dest;
 
@@ -1146,7 +1180,19 @@ emit_texenv(struct texenv_fragment_program *p, GLuint unit)
    /* If we'll do rgb/alpha shifting don't saturate in emit_combine().
     * We don't want to clamp twice.
     */
-   saturate = !(rgb_shift || alpha_shift);
+   if (rgb_shift)
+      rgb_saturate = GL_FALSE;  /* saturate after rgb shift */
+   else if (need_saturate(key->unit[unit].ModeRGB))
+      rgb_saturate = GL_TRUE;
+   else
+      rgb_saturate = GL_FALSE;
+
+   if (alpha_shift)
+      alpha_saturate = GL_FALSE;  /* saturate after alpha shift */
+   else if (need_saturate(key->unit[unit].ModeA))
+      alpha_saturate = GL_TRUE;
+   else
+      alpha_saturate = GL_FALSE;
 
    /* If this is the very last calculation, emit direct to output reg:
     */
@@ -1162,7 +1208,7 @@ emit_texenv(struct texenv_fragment_program *p, GLuint unit)
     */
    if (key->unit[unit].ModeRGB == key->unit[unit].ModeA &&
        args_match(key, unit)) {
-      out = emit_combine( p, dest, WRITEMASK_XYZW, saturate,
+      out = emit_combine( p, dest, WRITEMASK_XYZW, rgb_saturate,
 			  unit,
 			  key->unit[unit].NumArgsRGB,
 			  key->unit[unit].ModeRGB,
@@ -1170,7 +1216,7 @@ emit_texenv(struct texenv_fragment_program *p, GLuint unit)
    }
    else if (key->unit[unit].ModeRGB == MODE_DOT3_RGBA_EXT ||
 	    key->unit[unit].ModeRGB == MODE_DOT3_RGBA) {
-      out = emit_combine( p, dest, WRITEMASK_XYZW, saturate,
+      out = emit_combine( p, dest, WRITEMASK_XYZW, rgb_saturate,
 			  unit,
 			  key->unit[unit].NumArgsRGB,
 			  key->unit[unit].ModeRGB,
@@ -1180,12 +1226,12 @@ emit_texenv(struct texenv_fragment_program *p, GLuint unit)
       /* Need to do something to stop from re-emitting identical
        * argument calculations here:
        */
-      out = emit_combine( p, dest, WRITEMASK_XYZ, saturate,
+      out = emit_combine( p, dest, WRITEMASK_XYZ, rgb_saturate,
 			  unit,
 			  key->unit[unit].NumArgsRGB,
 			  key->unit[unit].ModeRGB,
 			  key->unit[unit].OptRGB);
-      out = emit_combine( p, dest, WRITEMASK_W, saturate,
+      out = emit_combine( p, dest, WRITEMASK_W, alpha_saturate,
 			  unit,
 			  key->unit[unit].NumArgsA,
 			  key->unit[unit].ModeA,
@@ -1196,8 +1242,7 @@ emit_texenv(struct texenv_fragment_program *p, GLuint unit)
     */
    if (alpha_shift || rgb_shift) {
       struct ureg shift;
-
-      saturate = GL_TRUE;  /* always saturate at this point */
+      GLboolean saturate = GL_TRUE;  /* always saturate at this point */
 
       if (rgb_shift == alpha_shift) {
 	 shift = register_scalar_const(p, (GLfloat)(1<<rgb_shift));
-- 
cgit v1.2.3


From b565e7b88c5604197a1393dda7b4ad57a835d4e5 Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olvaffe@gmail.com>
Date: Mon, 7 Sep 2009 17:51:33 +0800
Subject: mesa/main: Add comments to mfeatures.h.

The comments document the conventions that a feature may follow.
---
 src/mesa/main/mfeatures.h | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index e23cdb1f42..b05cfab1bf 100644
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -31,11 +31,44 @@
 #ifndef FEATURES_H
 #define FEATURES_H
 
+#include "compiler.h"
 
 #ifndef _HAVE_FULL_GL
 #define _HAVE_FULL_GL 1
 #endif
 
+/* assert that a feature is disabled and should never be used */
+#define ASSERT_NO_FEATURE() ASSERT(0)
+
+/**
+ * A feature can be anything.  But most of them share certain characteristics.
+ *
+ * When a feature defines driver entries, they can be initialized by
+ *   _MESA_INIT_<FEATURE>_FUNCTIONS
+ *
+ * When a feature defines vtxfmt entries, they can be initialized and
+ * installed by
+ *   _MESA_INIT_<FEATURE>_VTXFMT
+ *   _mesa_install_<feature>_vtxfmt
+ *
+ * When a feature defines dispatch entries, they are initialized by
+ *   _mesa_init_<feature>_dispatch
+ *
+ * When a feature has states, they are initialized and freed by
+ *   _mesa_init_<feature>
+ *   _mesa_free_<feature>_data
+ *
+ * Except for states, the others compile to no-op when a feature is disabled.
+ *
+ * The GLAPIENTRYs and helper functions defined by a feature should also
+ * compile to no-op when it is disabled.  But to save typings and to catch
+ * bugs, some of them may be unavailable, or compile to ASSERT_NO_FEATURE()
+ * when the feature is disabled.
+ *
+ * A feature following the convensions may be used without knowing if it is
+ * enabled or not.
+ */
+
 #define FEATURE_accum  _HAVE_FULL_GL
 #define FEATURE_attrib_stack  _HAVE_FULL_GL
 #define FEATURE_colortable  _HAVE_FULL_GL
-- 
cgit v1.2.3


From 57377d5d69ecdf03e4fa2ef44dfbb7fb37f3f799 Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olvaffe@gmail.com>
Date: Mon, 7 Sep 2009 16:59:27 +0800
Subject: mesa/main: Make FEATURE_pixel_transfer follow feature conventions.

As shown in mfeatures.h, this allows users of pixel.h to work without
knowing if the feature is available.
---
 src/mesa/main/api_exec.c | 16 +++-------------
 src/mesa/main/pixel.c    | 22 ++++++++++++++++++++++
 src/mesa/main/pixel.h    | 25 ++++++++++++++++++++++---
 src/mesa/main/state.c    |  4 ----
 4 files changed, 47 insertions(+), 20 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index 02550ae108..39941a1b03 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -93,9 +93,7 @@
 #include "macros.h"
 #include "matrix.h"
 #include "multisample.h"
-#if FEATURE_pixel_transfer
 #include "pixel.h"
-#endif
 #include "pixelstore.h"
 #include "points.h"
 #include "polygon.h"
@@ -284,17 +282,9 @@ _mesa_init_exec_table(struct _glapi_table *exec)
    SET_MapGrid2f(exec, _mesa_MapGrid2f);
 #endif
    SET_MultMatrixd(exec, _mesa_MultMatrixd);
-#if FEATURE_pixel_transfer
-   SET_GetPixelMapfv(exec, _mesa_GetPixelMapfv);
-   SET_GetPixelMapuiv(exec, _mesa_GetPixelMapuiv);
-   SET_GetPixelMapusv(exec, _mesa_GetPixelMapusv);
-   SET_PixelMapfv(exec, _mesa_PixelMapfv);
-   SET_PixelMapuiv(exec, _mesa_PixelMapuiv);
-   SET_PixelMapusv(exec, _mesa_PixelMapusv);
-   SET_PixelTransferf(exec, _mesa_PixelTransferf);
-   SET_PixelTransferi(exec, _mesa_PixelTransferi);
-   SET_PixelZoom(exec, _mesa_PixelZoom);
-#endif
+
+   _mesa_init_pixel_dispatch(exec);
+
    SET_PixelStoref(exec, _mesa_PixelStoref);
    SET_PointSize(exec, _mesa_PointSize);
    SET_PolygonMode(exec, _mesa_PolygonMode);
diff --git a/src/mesa/main/pixel.c b/src/mesa/main/pixel.c
index fcef6dfd42..23a5c9b9f7 100644
--- a/src/mesa/main/pixel.c
+++ b/src/mesa/main/pixel.c
@@ -36,6 +36,10 @@
 #include "macros.h"
 #include "pixel.h"
 #include "mtypes.h"
+#include "glapi/dispatch.h"
+
+
+#if FEATURE_pixel_transfer
 
 
 /**********************************************************************/
@@ -756,6 +760,24 @@ void _mesa_update_pixel( GLcontext *ctx, GLuint new_state )
 }
 
 
+void 
+_mesa_init_pixel_dispatch(struct _glapi_table *disp)
+{
+   SET_GetPixelMapfv(disp, _mesa_GetPixelMapfv);
+   SET_GetPixelMapuiv(disp, _mesa_GetPixelMapuiv);
+   SET_GetPixelMapusv(disp, _mesa_GetPixelMapusv);
+   SET_PixelMapfv(disp, _mesa_PixelMapfv);
+   SET_PixelMapuiv(disp, _mesa_PixelMapuiv);
+   SET_PixelMapusv(disp, _mesa_PixelMapusv);
+   SET_PixelTransferf(disp, _mesa_PixelTransferf);
+   SET_PixelTransferi(disp, _mesa_PixelTransferi);
+   SET_PixelZoom(disp, _mesa_PixelZoom);
+}
+
+
+#endif /* FEATURE_pixel_transfer */
+
+
 /**********************************************************************/
 /*****                      Initialization                        *****/
 /**********************************************************************/
diff --git a/src/mesa/main/pixel.h b/src/mesa/main/pixel.h
index cb6c5262a3..7a901aec10 100644
--- a/src/mesa/main/pixel.h
+++ b/src/mesa/main/pixel.h
@@ -33,9 +33,11 @@
 #define PIXEL_H
 
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 
+#if FEATURE_pixel_transfer
+
 /** \name API functions */
 /*@{*/
 
@@ -68,13 +70,30 @@ _mesa_PixelZoom( GLfloat xfactor, GLfloat yfactor );
 
 /*@}*/
 
-
 extern void 
 _mesa_update_pixel( GLcontext *ctx, GLuint newstate );
 
+extern void 
+_mesa_init_pixel_dispatch( struct _glapi_table * disp );
+
+#else /* FEATURE_pixel_transfer */
+
+static INLINE void
+_mesa_update_pixel(GLcontext *ctx, GLuint newstate)
+{
+}
+
+static INLINE void
+_mesa_init_pixel_dispatch(struct _glapi_table *disp)
+{
+}
+
+#endif /* FEATURE_pixel_transfer */
+
+
 extern void 
 _mesa_init_pixel( GLcontext * ctx );
 
 /*@}*/
 
-#endif
+#endif /* PIXEL_H */
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 140a998df2..f10e6b04b7 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -40,9 +40,7 @@
 #include "framebuffer.h"
 #include "light.h"
 #include "matrix.h"
-#if FEATURE_pixel_transfer
 #include "pixel.h"
-#endif
 #include "shader/program.h"
 #include "shader/prog_parameter.h"
 #include "state.h"
@@ -585,10 +583,8 @@ _mesa_update_state_locked( GLcontext *ctx )
    if (new_state & (_NEW_STENCIL | _NEW_BUFFERS))
       _mesa_update_stencil( ctx );
 
-#if FEATURE_pixel_transfer
    if (new_state & _MESA_NEW_TRANSFER_STATE)
       _mesa_update_pixel( ctx, new_state );
-#endif
 
    if (new_state & _DD_NEW_SEPARATE_SPECULAR)
       update_separate_specular( ctx );
-- 
cgit v1.2.3


From 5bcfe4b5c81f850d68d3100b8bcd2f2b74a258a6 Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olvaffe@gmail.com>
Date: Mon, 7 Sep 2009 17:17:11 +0800
Subject: mesa/main: Make FEATURE_colortable follow feature conventions.

As shown in mfeatures.h, this allows users of colortab.h to work
without knowing if the feature is available.
---
 src/mesa/main/api_exec.c | 14 +-------------
 src/mesa/main/colortab.c | 23 +++++++++++++++++++++++
 src/mesa/main/colortab.h | 41 +++++++++++++++++++++++------------------
 src/mesa/main/context.c  |  6 ------
 src/mesa/main/texobj.c   |  4 ----
 src/mesa/main/texstate.c |  6 ------
 6 files changed, 47 insertions(+), 47 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index 39941a1b03..30c142e53a 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -54,9 +54,7 @@
 #endif
 #include "clear.h"
 #include "clip.h"
-#if FEATURE_colortable
 #include "colortab.h"
-#endif
 #include "context.h"
 #if FEATURE_convolve
 #include "convolve.h"
@@ -385,17 +383,7 @@ _mesa_init_exec_table(struct _glapi_table *exec)
    SET_BlendEquation(exec, _mesa_BlendEquation);
    SET_BlendEquationSeparateEXT(exec, _mesa_BlendEquationSeparateEXT);
 
-#if FEATURE_colortable
-   SET_ColorSubTable(exec, _mesa_ColorSubTable);
-   SET_ColorTable(exec, _mesa_ColorTable);
-   SET_ColorTableParameterfv(exec, _mesa_ColorTableParameterfv);
-   SET_ColorTableParameteriv(exec, _mesa_ColorTableParameteriv);
-   SET_CopyColorSubTable(exec, _mesa_CopyColorSubTable);
-   SET_CopyColorTable(exec, _mesa_CopyColorTable);
-   SET_GetColorTable(exec, _mesa_GetColorTable);
-   SET_GetColorTableParameterfv(exec, _mesa_GetColorTableParameterfv);
-   SET_GetColorTableParameteriv(exec, _mesa_GetColorTableParameteriv);
-#endif
+   _mesa_init_colortable_dispatch(exec);
 
 #if FEATURE_convolve
    SET_ConvolutionFilter1D(exec, _mesa_ConvolutionFilter1D);
diff --git a/src/mesa/main/colortab.c b/src/mesa/main/colortab.c
index 5a7de5f209..d6f3121cb4 100644
--- a/src/mesa/main/colortab.c
+++ b/src/mesa/main/colortab.c
@@ -31,6 +31,10 @@
 #include "macros.h"
 #include "state.h"
 #include "teximage.h"
+#include "glapi/dispatch.h"
+
+
+#if FEATURE_colortable
 
 
 /**
@@ -1044,6 +1048,25 @@ _mesa_GetColorTableParameteriv( GLenum target, GLenum pname, GLint *params )
    }
 }
 
+
+void 
+_mesa_init_colortable_dispatch(struct _glapi_table *disp)
+{
+   SET_ColorSubTable(disp, _mesa_ColorSubTable);
+   SET_ColorTable(disp, _mesa_ColorTable);
+   SET_ColorTableParameterfv(disp, _mesa_ColorTableParameterfv);
+   SET_ColorTableParameteriv(disp, _mesa_ColorTableParameteriv);
+   SET_CopyColorSubTable(disp, _mesa_CopyColorSubTable);
+   SET_CopyColorTable(disp, _mesa_CopyColorTable);
+   SET_GetColorTable(disp, _mesa_GetColorTable);
+   SET_GetColorTableParameterfv(disp, _mesa_GetColorTableParameterfv);
+   SET_GetColorTableParameteriv(disp, _mesa_GetColorTableParameteriv);
+}
+
+
+#endif /* FEATURE_colortable */
+
+
 /**********************************************************************/
 /*****                      Initialization                        *****/
 /**********************************************************************/
diff --git a/src/mesa/main/colortab.h b/src/mesa/main/colortab.h
index b6ff737a65..ec28ceca9d 100644
--- a/src/mesa/main/colortab.h
+++ b/src/mesa/main/colortab.h
@@ -27,9 +27,16 @@
 #define COLORTAB_H
 
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 
-#if _HAVE_FULL_GL
+#if FEATURE_colortable
+
+#define _MESA_INIT_COLORTABLE_FUNCTIONS(driver, impl)                \
+   do {                                                              \
+      (driver)->CopyColorTable       = impl ## CopyColorTable;       \
+      (driver)->CopyColorSubTable    = impl ## CopyColorSubTable;    \
+      (driver)->UpdateTexturePalette = impl ## UpdateTexturePalette; \
+   } while (0)
 
 extern void GLAPIENTRY
 _mesa_ColorTable( GLenum target, GLenum internalformat,
@@ -67,6 +74,19 @@ _mesa_GetColorTableParameterfv( GLenum target, GLenum pname, GLfloat *params );
 extern void GLAPIENTRY
 _mesa_GetColorTableParameteriv( GLenum target, GLenum pname, GLint *params );
 
+extern void 
+_mesa_init_colortable_dispatch(struct _glapi_table *disp);
+
+#else /* FEATURE_colortable */
+
+#define _MESA_INIT_COLORTABLE_FUNCTIONS(driver, impl) do { } while (0)
+
+static INLINE void
+_mesa_init_colortable_dispatch(struct _glapi_table *disp)
+{
+}
+
+#endif /* FEATURE_colortable */
 
 
 extern void
@@ -81,20 +101,5 @@ _mesa_init_colortables( GLcontext *ctx );
 extern void 
 _mesa_free_colortables_data( GLcontext *ctx );
 
-#else
-
-/** No-op */
-#define _mesa_init_colortable( p ) ((void) 0)
-
-/** No-op */
-#define _mesa_free_colortable_data( p ) ((void) 0)
-
-/** No-op */
-#define _mesa_init_colortables( p ) ((void)0)
-
-/** No-op */
-#define _mesa_free_colortables_data( p ) ((void)0)
-
-#endif
 
-#endif
+#endif /* COLORTAB_H */
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index f6d4ac4595..1907c799df 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -90,9 +90,7 @@
 #include "blend.h"
 #include "buffers.h"
 #include "bufferobj.h"
-#if FEATURE_colortable
 #include "colortab.h"
-#endif
 #include "context.h"
 #include "cpuinfo.h"
 #include "debug.h"
@@ -686,9 +684,7 @@ init_attrib_groups(GLcontext *ctx)
 #endif
    _mesa_init_buffer_objects( ctx );
    _mesa_init_color( ctx );
-#if FEATURE_colortable
    _mesa_init_colortables( ctx );
-#endif
    _mesa_init_current( ctx );
    _mesa_init_depth( ctx );
    _mesa_init_debug( ctx );
@@ -1015,9 +1011,7 @@ _mesa_free_context_data( GLcontext *ctx )
    _mesa_free_texture_data( ctx );
    _mesa_free_matrix_data( ctx );
    _mesa_free_viewport_data( ctx );
-#if FEATURE_colortable
    _mesa_free_colortables_data( ctx );
-#endif
    _mesa_free_program_data(ctx);
    _mesa_free_shader_state(ctx);
 #if FEATURE_ARB_occlusion_query
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index d09c439250..678845ece0 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -29,9 +29,7 @@
 
 
 #include "mfeatures.h"
-#if FEATURE_colortable
 #include "colortab.h"
-#endif
 #include "context.h"
 #include "enums.h"
 #include "fbobject.h"
@@ -194,9 +192,7 @@ _mesa_delete_texture_object( GLcontext *ctx, struct gl_texture_object *texObj )
     */
    texObj->Target = 0x99;
 
-#if FEATURE_colortable
    _mesa_free_colortable_data(&texObj->Palette);
-#endif
 
    /* free the texture images */
    for (face = 0; face < 6; face++) {
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 861c5f37c4..b9311d0ffc 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -31,9 +31,7 @@
 #include "glheader.h"
 #include "mfeatures.h"
 #include "colormac.h"
-#if FEATURE_colortable
 #include "colortab.h"
-#endif
 #include "context.h"
 #include "enums.h"
 #include "macros.h"
@@ -753,9 +751,7 @@ _mesa_init_texture(GLcontext *ctx)
    ctx->Texture.CurrentUnit = 0;      /* multitexture */
    ctx->Texture._EnabledUnits = 0x0;
    ctx->Texture.SharedPalette = GL_FALSE;
-#if FEATURE_colortable
    _mesa_init_colortable(&ctx->Texture.Palette);
-#endif
 
    for (u = 0; u < MAX_TEXTURE_UNITS; u++)
       init_texture_unit(ctx, u);
@@ -796,10 +792,8 @@ _mesa_free_texture_data(GLcontext *ctx)
    for (tgt = 0; tgt < NUM_TEXTURE_TARGETS; tgt++)
       ctx->Driver.DeleteTexture(ctx, ctx->Texture.ProxyTex[tgt]);
 
-#if FEATURE_colortable
    for (u = 0; u < MAX_TEXTURE_IMAGE_UNITS; u++)
       _mesa_free_colortable_data(&ctx->Texture.Unit[u].ColorTable);
-#endif
 }
 
 
-- 
cgit v1.2.3


From ec86469c55c3f531c00ead130a31071ad8aede48 Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olvaffe@gmail.com>
Date: Mon, 7 Sep 2009 17:28:24 +0800
Subject: mesa/main: Make FEATURE_convolve follow feature conventions.

As shown in mfeatures.h, this allows users of convolve.h to work
without knowing if the feature is available.
---
 src/mesa/main/api_exec.c | 19 +-------------
 src/mesa/main/convolve.c | 26 +++++++++++++++++++
 src/mesa/main/convolve.h | 67 ++++++++++++++++++++++++++++++++++++++----------
 src/mesa/main/teximage.c | 20 ---------------
 src/mesa/main/texstore.c | 17 +-----------
 5 files changed, 82 insertions(+), 67 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index 30c142e53a..6317639075 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -56,9 +56,7 @@
 #include "clip.h"
 #include "colortab.h"
 #include "context.h"
-#if FEATURE_convolve
 #include "convolve.h"
-#endif
 #include "depth.h"
 #if FEATURE_dlist
 #include "dlist.h"
@@ -384,21 +382,7 @@ _mesa_init_exec_table(struct _glapi_table *exec)
    SET_BlendEquationSeparateEXT(exec, _mesa_BlendEquationSeparateEXT);
 
    _mesa_init_colortable_dispatch(exec);
-
-#if FEATURE_convolve
-   SET_ConvolutionFilter1D(exec, _mesa_ConvolutionFilter1D);
-   SET_ConvolutionFilter2D(exec, _mesa_ConvolutionFilter2D);
-   SET_ConvolutionParameterf(exec, _mesa_ConvolutionParameterf);
-   SET_ConvolutionParameterfv(exec, _mesa_ConvolutionParameterfv);
-   SET_ConvolutionParameteri(exec, _mesa_ConvolutionParameteri);
-   SET_ConvolutionParameteriv(exec, _mesa_ConvolutionParameteriv);
-   SET_CopyConvolutionFilter1D(exec, _mesa_CopyConvolutionFilter1D);
-   SET_CopyConvolutionFilter2D(exec, _mesa_CopyConvolutionFilter2D);
-   SET_GetConvolutionFilter(exec, _mesa_GetConvolutionFilter);
-   SET_GetConvolutionParameterfv(exec, _mesa_GetConvolutionParameterfv);
-   SET_GetConvolutionParameteriv(exec, _mesa_GetConvolutionParameteriv);
-   SET_SeparableFilter2D(exec, _mesa_SeparableFilter2D);
-#endif
+   _mesa_init_convolve_dispatch(exec);
 #if FEATURE_histogram
    SET_GetHistogram(exec, _mesa_GetHistogram);
    SET_GetHistogramParameterfv(exec, _mesa_GetHistogramParameterfv);
@@ -406,7 +390,6 @@ _mesa_init_exec_table(struct _glapi_table *exec)
    SET_GetMinmax(exec, _mesa_GetMinmax);
    SET_GetMinmaxParameterfv(exec, _mesa_GetMinmaxParameterfv);
    SET_GetMinmaxParameteriv(exec, _mesa_GetMinmaxParameteriv);
-   SET_GetSeparableFilter(exec, _mesa_GetSeparableFilter);
    SET_Histogram(exec, _mesa_Histogram);
    SET_Minmax(exec, _mesa_Minmax);
    SET_ResetHistogram(exec, _mesa_ResetHistogram);
diff --git a/src/mesa/main/convolve.c b/src/mesa/main/convolve.c
index 70951112a1..4bca436095 100644
--- a/src/mesa/main/convolve.c
+++ b/src/mesa/main/convolve.c
@@ -40,6 +40,10 @@
 #include "mtypes.h"
 #include "pixel.h"
 #include "state.h"
+#include "glapi/dispatch.h"
+
+
+#if FEATURE_convolve
 
 
 /*
@@ -1425,3 +1429,25 @@ _mesa_adjust_image_for_convolution(const GLcontext *ctx, GLuint dimensions,
       *height = *height - (MAX2(ctx->Separable2D.Height, 1) - 1);
    }
 }
+
+
+void 
+_mesa_init_convolve_dispatch(struct _glapi_table *disp)
+{
+   SET_ConvolutionFilter1D(disp, _mesa_ConvolutionFilter1D);
+   SET_ConvolutionFilter2D(disp, _mesa_ConvolutionFilter2D);
+   SET_ConvolutionParameterf(disp, _mesa_ConvolutionParameterf);
+   SET_ConvolutionParameterfv(disp, _mesa_ConvolutionParameterfv);
+   SET_ConvolutionParameteri(disp, _mesa_ConvolutionParameteri);
+   SET_ConvolutionParameteriv(disp, _mesa_ConvolutionParameteriv);
+   SET_CopyConvolutionFilter1D(disp, _mesa_CopyConvolutionFilter1D);
+   SET_CopyConvolutionFilter2D(disp, _mesa_CopyConvolutionFilter2D);
+   SET_GetConvolutionFilter(disp, _mesa_GetConvolutionFilter);
+   SET_GetConvolutionParameterfv(disp, _mesa_GetConvolutionParameterfv);
+   SET_GetConvolutionParameteriv(disp, _mesa_GetConvolutionParameteriv);
+   SET_SeparableFilter2D(disp, _mesa_SeparableFilter2D);
+   SET_GetSeparableFilter(disp, _mesa_GetSeparableFilter);
+}
+
+
+#endif /* FEATURE_convolve */
diff --git a/src/mesa/main/convolve.h b/src/mesa/main/convolve.h
index 4505cdae01..565a51ef8f 100644
--- a/src/mesa/main/convolve.h
+++ b/src/mesa/main/convolve.h
@@ -28,10 +28,17 @@
 #define CONVOLVE_H
 
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 
-#if _HAVE_FULL_GL
+#if FEATURE_convolve
+
+#define _MESA_INIT_CONVOLVE_FUNCTIONS(driver, impl)                        \
+   do {                                                                    \
+      (driver)->CopyConvolutionFilter1D = impl ## CopyConvolutionFilter1D; \
+      (driver)->CopyConvolutionFilter2D = impl ## CopyConvolutionFilter2D; \
+   } while (0)
+
 extern void GLAPIENTRY
 _mesa_ConvolutionFilter1D(GLenum target, GLenum internalformat, GLsizei width,
                           GLenum format, GLenum type, const GLvoid *image);
@@ -83,32 +90,66 @@ _mesa_SeparableFilter2D(GLenum target, GLenum internalformat,
                         const GLvoid *row, const GLvoid *column);
 
 
-
 extern void
 _mesa_convolve_1d_image(const GLcontext *ctx, GLsizei *width,
                         const GLfloat *srcImage, GLfloat *dstImage);
 
-
 extern void
 _mesa_convolve_2d_image(const GLcontext *ctx, GLsizei *width, GLsizei *height,
                         const GLfloat *srcImage, GLfloat *dstImage);
 
-
 extern void
 _mesa_convolve_sep_image(const GLcontext *ctx,
                          GLsizei *width, GLsizei *height,
                          const GLfloat *srcImage, GLfloat *dstImage);
 
-
 extern void
 _mesa_adjust_image_for_convolution(const GLcontext *ctx, GLuint dimensions,
                                    GLsizei *width, GLsizei *height);
 
-#else
-#define _mesa_adjust_image_for_convolution(c, d, w, h) ((void)0)
-#define _mesa_convolve_1d_image(c,w,s,d) ((void)0)
-#define _mesa_convolve_2d_image(c,w,h,s,d) ((void)0)
-#define _mesa_convolve_sep_image(c,w,h,s,d) ((void)0)
-#endif
+extern void
+_mesa_init_convolve_dispatch(struct _glapi_table *disp);
+
+#else /* FEATURE_convolve */
+
+#define _MESA_INIT_CONVOLVE_FUNCTIONS(driver, impl) do { } while (0)
+
+static INLINE void
+_mesa_convolve_1d_image(const GLcontext *ctx, GLsizei *width,
+                        const GLfloat *srcImage, GLfloat *dstImage)
+{
+   *width = 0;
+}
+
+static INLINE void
+_mesa_convolve_2d_image(const GLcontext *ctx, GLsizei *width, GLsizei *height,
+                        const GLfloat *srcImage, GLfloat *dstImage)
+{
+   *width = 0;
+   *height = 0;
+}
+
+
+static INLINE void
+_mesa_convolve_sep_image(const GLcontext *ctx,
+                         GLsizei *width, GLsizei *height,
+                         const GLfloat *srcImage, GLfloat *dstImage)
+{
+   *width = 0;
+   *height = 0;
+}
+
+static INLINE void
+_mesa_adjust_image_for_convolution(const GLcontext *ctx, GLuint dimensions,
+                                   GLsizei *width, GLsizei *height)
+{
+}
+
+static INLINE void 
+_mesa_init_convolve_dispatch(struct _glapi_table *disp)
+{
+}
+
+#endif /* FEATURE_convolve */
 
-#endif
+#endif /* CONVOLVE_H */
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 8228303040..a0304c02d4 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -33,9 +33,7 @@
 #include "glheader.h"
 #include "bufferobj.h"
 #include "context.h"
-#if FEATURE_convolve
 #include "convolve.h"
-#endif
 #include "fbobject.h"
 #include "framebuffer.h"
 #include "hash.h"
@@ -2133,11 +2131,9 @@ _mesa_TexImage1D( GLenum target, GLint level, GLint internalFormat,
 
    internalFormat = override_internal_format(internalFormat, width, 1);
 
-#if FEATURE_convolve
    if (_mesa_is_color_format(internalFormat)) {
       _mesa_adjust_image_for_convolution(ctx, 1, &postConvWidth, NULL);
    }
-#endif
 
    if (target == GL_TEXTURE_1D) {
       /* non-proxy target */
@@ -2232,12 +2228,10 @@ _mesa_TexImage2D( GLenum target, GLint level, GLint internalFormat,
 
    internalFormat = override_internal_format(internalFormat, width, height);
 
-#if FEATURE_convolve
    if (_mesa_is_color_format(internalFormat)) {
       _mesa_adjust_image_for_convolution(ctx, 2, &postConvWidth,
 					 &postConvHeight);
    }
-#endif
 
    if (target == GL_TEXTURE_2D ||
        (ctx->Extensions.ARB_texture_cube_map &&
@@ -2458,12 +2452,10 @@ _mesa_TexSubImage1D( GLenum target, GLint level,
    if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)
       _mesa_update_state(ctx);
 
-#if FEATURE_convolve
    /* XXX should test internal format */
    if (_mesa_is_color_format(format)) {
       _mesa_adjust_image_for_convolution(ctx, 1, &postConvWidth, NULL);
    }
-#endif
 
    if (subtexture_error_check(ctx, 1, target, level, xoffset, 0, 0,
 			       postConvWidth, 1, 1, format, type)) {
@@ -2518,13 +2510,11 @@ _mesa_TexSubImage2D( GLenum target, GLint level,
    if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)
       _mesa_update_state(ctx);
 
-#if FEATURE_convolve
    /* XXX should test internal format */
    if (_mesa_is_color_format(format)) {
       _mesa_adjust_image_for_convolution(ctx, 2, &postConvWidth,
                                          &postConvHeight);
    }
-#endif
 
    if (subtexture_error_check(ctx, 2, target, level, xoffset, yoffset, 0,
 			      postConvWidth, postConvHeight, 1, format, type)) {
@@ -2634,11 +2624,9 @@ _mesa_CopyTexImage1D( GLenum target, GLint level,
    if (ctx->NewState & NEW_COPY_TEX_STATE)
       _mesa_update_state(ctx);
 
-#if FEATURE_convolve
    if (_mesa_is_color_format(internalFormat)) {
       _mesa_adjust_image_for_convolution(ctx, 1, &postConvWidth, NULL);
    }
-#endif
 
    if (copytexture_error_check(ctx, 1, target, level, internalFormat,
                                postConvWidth, 1, border))
@@ -2699,12 +2687,10 @@ _mesa_CopyTexImage2D( GLenum target, GLint level, GLenum internalFormat,
    if (ctx->NewState & NEW_COPY_TEX_STATE)
       _mesa_update_state(ctx);
 
-#if FEATURE_convolve
    if (_mesa_is_color_format(internalFormat)) {
       _mesa_adjust_image_for_convolution(ctx, 2, &postConvWidth,
                                          &postConvHeight);
    }
-#endif
 
    if (copytexture_error_check(ctx, 2, target, level, internalFormat,
                                postConvWidth, postConvHeight, border))
@@ -2777,11 +2763,9 @@ _mesa_CopyTexSubImage1D( GLenum target, GLint level,
    {
       texImage = _mesa_select_tex_image(ctx, texObj, target, level);
 
-#if FEATURE_convolve
       if (texImage && _mesa_is_color_format(texImage->InternalFormat)) {
          _mesa_adjust_image_for_convolution(ctx, 1, &postConvWidth, NULL);
       }
-#endif
 
       if (copytexsubimage_error_check2(ctx, 1, target, level,
 				       xoffset, 0, 0, postConvWidth, 1,
@@ -2832,12 +2816,10 @@ _mesa_CopyTexSubImage2D( GLenum target, GLint level,
    {
       texImage = _mesa_select_tex_image(ctx, texObj, target, level);
 
-#if FEATURE_convolve
       if (texImage && _mesa_is_color_format(texImage->InternalFormat)) {
          _mesa_adjust_image_for_convolution(ctx, 2,
                                             &postConvWidth, &postConvHeight);
       }
-#endif
 
       if (copytexsubimage_error_check2(ctx, 2, target, level, xoffset, yoffset, 0,
 				       postConvWidth, postConvHeight, texImage))
@@ -2887,12 +2869,10 @@ _mesa_CopyTexSubImage3D( GLenum target, GLint level,
    {
       texImage = _mesa_select_tex_image(ctx, texObj, target, level);
 
-#if FEATURE_convolve
       if (texImage && _mesa_is_color_format(texImage->InternalFormat)) {
          _mesa_adjust_image_for_convolution(ctx, 2,
                                             &postConvWidth, &postConvHeight);
       }
-#endif
 
       if (copytexsubimage_error_check2(ctx, 3, target, level, xoffset, yoffset,
 				       zoffset, postConvWidth, postConvHeight,
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index a22db628d3..fce01b185e 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -56,9 +56,7 @@
 #include "bufferobj.h"
 #include "colormac.h"
 #include "context.h"
-#if FEATURE_convolve
 #include "convolve.h"
-#endif
 #include "image.h"
 #include "macros.h"
 #include "mipmap.h"
@@ -272,16 +270,6 @@ compute_component_mapping(GLenum inFormat, GLenum outFormat,
 }
 
 
-#if !FEATURE_convolve
-static void
-_mesa_adjust_image_for_convolution(GLcontext *ctx, GLuint dims,
-                                   GLsizei *srcWidth, GLsizei *srcHeight)
-{
-   /* no-op */
-}
-#endif
-
-
 /**
  * Make a temporary (color) texture image with GLfloat components.
  * Apply all needed pixel unpacking and pixel transfer operations.
@@ -385,7 +373,6 @@ make_temp_float_image(GLcontext *ctx, GLuint dims,
          convWidth = srcWidth;
          convHeight = srcHeight;
 
-#if FEATURE_convolve
          /* do convolution */
          {
             GLfloat *src = tempImage + img * (srcWidth * srcHeight * 4);
@@ -405,7 +392,7 @@ make_temp_float_image(GLcontext *ctx, GLuint dims,
                }
             }
          }
-#endif
+
          /* do post-convolution transfer and pack into tempImage */
          {
             const GLint logComponents
@@ -562,7 +549,6 @@ _mesa_make_temp_chan_image(GLcontext *ctx, GLuint dims,
           textureBaseFormat == GL_ALPHA ||
           textureBaseFormat == GL_INTENSITY);
 
-#if FEATURE_convolve
    if ((dims == 1 && ctx->Pixel.Convolution1DEnabled) ||
        (dims >= 2 && ctx->Pixel.Convolution2DEnabled) ||
        (dims >= 2 && ctx->Pixel.Separable2DEnabled)) {
@@ -584,7 +570,6 @@ _mesa_make_temp_chan_image(GLcontext *ctx, GLuint dims,
       transferOps = 0;
       freeSrcImage = GL_TRUE;
    }
-#endif
 
    /* unpack and transfer the source image */
    tempImage = (GLchan *) _mesa_malloc(srcWidth * srcHeight * srcDepth
-- 
cgit v1.2.3


From bae850f9afbb0d9d7dc25a9cd5e8e2ed05167ddf Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olvaffe@gmail.com>
Date: Mon, 7 Sep 2009 17:51:42 +0800
Subject: mesa/main: Make FEATURE_accum follow feature conventions.

As shown in mfeatures.h, this allows users of accum.h to work without
knowing if the feature is available.
---
 src/mesa/main/accum.c    | 14 ++++++++++++++
 src/mesa/main/accum.h    | 36 ++++++++++++++++++++++++++----------
 src/mesa/main/api_exec.c |  9 +++------
 src/mesa/main/context.c  |  4 ----
 4 files changed, 43 insertions(+), 20 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/accum.c b/src/mesa/main/accum.c
index 2345695f3c..30e2f9664a 100644
--- a/src/mesa/main/accum.c
+++ b/src/mesa/main/accum.c
@@ -29,6 +29,10 @@
 #include "macros.h"
 #include "state.h"
 #include "mtypes.h"
+#include "glapi/dispatch.h"
+
+
+#if FEATURE_accum
 
 
 void GLAPIENTRY
@@ -99,6 +103,16 @@ _mesa_Accum( GLenum op, GLfloat value )
 }
 
 
+void
+_mesa_init_accum_dispatch(struct _glapi_table *disp)
+{
+   SET_Accum(disp, _mesa_Accum);
+   SET_ClearAccum(disp, _mesa_ClearAccum);
+}
+
+
+#endif /* FEATURE_accum */
+
 
 void 
 _mesa_init_accum( GLcontext *ctx )
diff --git a/src/mesa/main/accum.h b/src/mesa/main/accum.h
index ce92688a5b..ef5e44ea9e 100644
--- a/src/mesa/main/accum.h
+++ b/src/mesa/main/accum.h
@@ -38,25 +38,41 @@
 #define ACCUM_H
 
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 
-#if _HAVE_FULL_GL
+#if FEATURE_accum
+
+#define _MESA_INIT_ACCUM_FUNCTIONS(driver, impl) \
+   do {                                          \
+      (driver)->Accum = impl ## Accum;           \
+   } while (0)
 
 extern void GLAPIENTRY
 _mesa_Accum( GLenum op, GLfloat value );
 
-
 extern void GLAPIENTRY
 _mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha );
 
-extern void 
-_mesa_init_accum( GLcontext *ctx );
+extern void
+_mesa_init_accum_dispatch(struct _glapi_table *disp);
+
+#else /* FEATURE_accum */
 
-#else
+#define _MESA_INIT_ACCUM_FUNCTIONS(driver, impl) do { } while (0)
 
-/** No-op */
-#define _mesa_init_accum( c ) ((void)0)
+static INLINE void
+_mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha )
+{
+}
 
-#endif
+static INLINE void
+_mesa_init_accum_dispatch(struct _glapi_table *disp)
+{
+}
+
+#endif /* FEATURE_accum */
+
+extern void 
+_mesa_init_accum( GLcontext *ctx );
 
-#endif
+#endif /* ACCUM_H */
diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index 6317639075..9ffac7905a 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -30,9 +30,7 @@
 
 
 #include "mfeatures.h"
-#if FEATURE_accum
 #include "accum.h"
-#endif
 #include "api_loopback.h"
 #include "api_exec.h"
 #if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
@@ -193,10 +191,9 @@ _mesa_init_exec_table(struct _glapi_table *exec)
    SET_TexParameteri(exec, _mesa_TexParameteri);
    SET_Translatef(exec, _mesa_Translatef);
    SET_Viewport(exec, _mesa_Viewport);
-#if FEATURE_accum
-   SET_Accum(exec, _mesa_Accum);
-   SET_ClearAccum(exec, _mesa_ClearAccum);
-#endif
+
+   _mesa_init_accum_dispatch(exec);
+
 #if FEATURE_dlist
    SET_CallList(exec, _mesa_CallList);
    SET_CallLists(exec, _mesa_CallLists);
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 1907c799df..df194c3edb 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -79,9 +79,7 @@
 #include "glheader.h"
 #include "mfeatures.h"
 #include "imports.h"
-#if FEATURE_accum
 #include "accum.h"
-#endif
 #include "api_exec.h"
 #include "arrayobj.h"
 #if FEATURE_attrib_stack
@@ -676,9 +674,7 @@ init_attrib_groups(GLcontext *ctx)
    _mesa_init_extensions( ctx );
 
    /* Attribute Groups */
-#if FEATURE_accum
    _mesa_init_accum( ctx );
-#endif
 #if FEATURE_attrib_stack
    _mesa_init_attrib( ctx );
 #endif
-- 
cgit v1.2.3


From c9ae896376a73480c0569b8449accf002088d6f3 Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olvaffe@gmail.com>
Date: Mon, 7 Sep 2009 18:20:10 +0800
Subject: mesa/main: Make FEATURE_attrib_stack follow feature conventions.

As shown in mfeatures.h, this allows users of attrib.h to work without
knowing if the feature is available.
---
 src/mesa/main/api_exec.c | 11 +++--------
 src/mesa/main/attrib.c   | 17 +++++++++++++++++
 src/mesa/main/attrib.h   | 36 +++++++++++++++++++++++++-----------
 src/mesa/main/context.c  |  6 ------
 4 files changed, 45 insertions(+), 25 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index 9ffac7905a..b363d4340e 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -39,9 +39,7 @@
 #if FEATURE_ATI_fragment_shader
 #include "shader/atifragshader.h"
 #endif
-#if FEATURE_attrib_stack
 #include "attrib.h"
-#endif
 #include "blend.h"
 #if FEATURE_ARB_vertex_buffer_object
 #include "bufferobj.h"
@@ -283,12 +281,9 @@ _mesa_init_exec_table(struct _glapi_table *exec)
    SET_PolygonMode(exec, _mesa_PolygonMode);
    SET_PolygonOffset(exec, _mesa_PolygonOffset);
    SET_PolygonStipple(exec, _mesa_PolygonStipple);
-#if FEATURE_attrib_stack
-   SET_PopAttrib(exec, _mesa_PopAttrib);
-   SET_PushAttrib(exec, _mesa_PushAttrib);
-   SET_PopClientAttrib(exec, _mesa_PopClientAttrib);
-   SET_PushClientAttrib(exec, _mesa_PushClientAttrib);
-#endif
+
+   _mesa_init_attrib_dispatch(exec);
+
 #if FEATURE_drawpix
    SET_RasterPos2f(exec, _mesa_RasterPos2f);
    SET_RasterPos2fv(exec, _mesa_RasterPos2fv);
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 0fb8fa3bba..246c5521b7 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -57,6 +57,7 @@
 #include "varray.h"
 #include "viewport.h"
 #include "mtypes.h"
+#include "glapi/dispatch.h"
 
 
 /**
@@ -174,6 +175,9 @@ struct texture_state
 };
 
 
+#if FEATURE_attrib_stack
+
+
 /**
  * Allocate new attribute node of given type/kind.  Attach payload data.
  * Insert it into the linked list named by 'head'.
@@ -1464,6 +1468,19 @@ _mesa_PopClientAttrib(void)
 }
 
 
+void
+_mesa_init_attrib_dispatch(struct _glapi_table *disp)
+{
+   SET_PopAttrib(disp, _mesa_PopAttrib);
+   SET_PushAttrib(disp, _mesa_PushAttrib);
+   SET_PopClientAttrib(disp, _mesa_PopClientAttrib);
+   SET_PushClientAttrib(disp, _mesa_PushClientAttrib);
+}
+
+
+#endif /* FEATURE_attrib_stack */
+
+
 /**
  * Free any attribute state data that might be attached to the context.
  */
diff --git a/src/mesa/main/attrib.h b/src/mesa/main/attrib.h
index 2cf8fe6934..aa9d42e408 100644
--- a/src/mesa/main/attrib.h
+++ b/src/mesa/main/attrib.h
@@ -26,10 +26,10 @@
 #define ATTRIB_H
 
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 
-#if _HAVE_FULL_GL
+#if FEATURE_attrib_stack
 
 extern void GLAPIENTRY
 _mesa_PushAttrib( GLbitfield mask );
@@ -43,18 +43,32 @@ _mesa_PushClientAttrib( GLbitfield mask );
 extern void GLAPIENTRY
 _mesa_PopClientAttrib( void );
 
+extern void
+_mesa_init_attrib_dispatch(struct _glapi_table *disp);
+
+#else /* FEATURE_attrib_stack */
+
+static INLINE void
+_mesa_PushClientAttrib( GLbitfield mask )
+{
+}
+
+static INLINE void
+_mesa_PopClientAttrib( void )
+{
+}
+
+static INLINE void
+_mesa_init_attrib_dispatch(struct _glapi_table *disp)
+{
+}
+
+#endif /* FEATURE_attrib_stack */
+
 extern void 
 _mesa_init_attrib( GLcontext *ctx );
 
 extern void 
 _mesa_free_attrib_data( GLcontext *ctx );
 
-#else
-
-/** No-op */
-#define _mesa_init_attrib( c ) ((void)0)
-#define _mesa_free_attrib_data( c ) ((void)0)
-
-#endif
-
-#endif
+#endif /* ATTRIB_H */
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index df194c3edb..53a21ba4f5 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -82,9 +82,7 @@
 #include "accum.h"
 #include "api_exec.h"
 #include "arrayobj.h"
-#if FEATURE_attrib_stack
 #include "attrib.h"
-#endif
 #include "blend.h"
 #include "buffers.h"
 #include "bufferobj.h"
@@ -675,9 +673,7 @@ init_attrib_groups(GLcontext *ctx)
 
    /* Attribute Groups */
    _mesa_init_accum( ctx );
-#if FEATURE_attrib_stack
    _mesa_init_attrib( ctx );
-#endif
    _mesa_init_buffer_objects( ctx );
    _mesa_init_color( ctx );
    _mesa_init_colortables( ctx );
@@ -997,9 +993,7 @@ _mesa_free_context_data( GLcontext *ctx )
    _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current, NULL);
    _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._TexEnvProgram, NULL);
 
-#if FEATURE_attrib_stack
    _mesa_free_attrib_data(ctx);
-#endif
    _mesa_free_lighting_data( ctx );
 #if FEATURE_evaluators
    _mesa_free_eval_data( ctx );
-- 
cgit v1.2.3


From 93c3911ca836187a99f28de3301b7957299dd75e Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olvaffe@gmail.com>
Date: Mon, 7 Sep 2009 18:06:00 +0800
Subject: mesa/main: Make FEATURE_histogram follow feature conventions.

As shown in mfeatures.h, this allows users of histogram.h to work without
knowing if the feature is available.
---
 src/mesa/main/api_exec.c  | 15 +--------------
 src/mesa/main/context.c   |  4 ----
 src/mesa/main/histogram.c | 21 +++++++++++++++++++++
 src/mesa/main/histogram.h | 22 +++++++++++++---------
 4 files changed, 35 insertions(+), 27 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index b363d4340e..6b529db5ec 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -76,9 +76,7 @@
 #include "ffvertex_prog.h"
 #include "framebuffer.h"
 #include "hint.h"
-#if FEATURE_histogram
 #include "histogram.h"
-#endif
 #include "imports.h"
 #include "light.h"
 #include "lines.h"
@@ -375,18 +373,7 @@ _mesa_init_exec_table(struct _glapi_table *exec)
 
    _mesa_init_colortable_dispatch(exec);
    _mesa_init_convolve_dispatch(exec);
-#if FEATURE_histogram
-   SET_GetHistogram(exec, _mesa_GetHistogram);
-   SET_GetHistogramParameterfv(exec, _mesa_GetHistogramParameterfv);
-   SET_GetHistogramParameteriv(exec, _mesa_GetHistogramParameteriv);
-   SET_GetMinmax(exec, _mesa_GetMinmax);
-   SET_GetMinmaxParameterfv(exec, _mesa_GetMinmaxParameterfv);
-   SET_GetMinmaxParameteriv(exec, _mesa_GetMinmaxParameteriv);
-   SET_Histogram(exec, _mesa_Histogram);
-   SET_Minmax(exec, _mesa_Minmax);
-   SET_ResetHistogram(exec, _mesa_ResetHistogram);
-   SET_ResetMinmax(exec, _mesa_ResetMinmax);
-#endif
+   _mesa_init_histogram_dispatch(exec);
 
    /* OpenGL 2.0 */
    SET_StencilFuncSeparate(exec, _mesa_StencilFuncSeparate);
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 53a21ba4f5..a546e37b5f 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -106,9 +106,7 @@
 #include "fog.h"
 #include "framebuffer.h"
 #include "get.h"
-#if FEATURE_histogram
 #include "histogram.h"
-#endif
 #include "hint.h"
 #include "hash.h"
 #include "light.h"
@@ -693,9 +691,7 @@ init_attrib_groups(GLcontext *ctx)
    ctx->RenderMode = GL_RENDER;
 #endif
    _mesa_init_fog( ctx );
-#if FEATURE_histogram
    _mesa_init_histogram( ctx );
-#endif
    _mesa_init_hint( ctx );
    _mesa_init_line( ctx );
    _mesa_init_lighting( ctx );
diff --git a/src/mesa/main/histogram.c b/src/mesa/main/histogram.c
index ceb0d5a6a8..3632adc03e 100644
--- a/src/mesa/main/histogram.c
+++ b/src/mesa/main/histogram.c
@@ -29,8 +29,11 @@
 #include "context.h"
 #include "image.h"
 #include "histogram.h"
+#include "glapi/dispatch.h"
 
 
+#if FEATURE_histogram
+
 
 /*
  * XXX the packed pixel formats haven't been tested.
@@ -1043,6 +1046,24 @@ _mesa_ResetMinmax(GLenum target)
 }
 
 
+void
+_mesa_init_histogram_dispatch(struct _glapi_table *disp)
+{
+   SET_GetHistogram(disp, _mesa_GetHistogram);
+   SET_GetHistogramParameterfv(disp, _mesa_GetHistogramParameterfv);
+   SET_GetHistogramParameteriv(disp, _mesa_GetHistogramParameteriv);
+   SET_GetMinmax(disp, _mesa_GetMinmax);
+   SET_GetMinmaxParameterfv(disp, _mesa_GetMinmaxParameterfv);
+   SET_GetMinmaxParameteriv(disp, _mesa_GetMinmaxParameteriv);
+   SET_Histogram(disp, _mesa_Histogram);
+   SET_Minmax(disp, _mesa_Minmax);
+   SET_ResetHistogram(disp, _mesa_ResetHistogram);
+   SET_ResetMinmax(disp, _mesa_ResetMinmax);
+}
+
+
+#endif /* FEATURE_histogram */
+
 
 /**********************************************************************/
 /*****                      Initialization                        *****/
diff --git a/src/mesa/main/histogram.h b/src/mesa/main/histogram.h
index 367e9b11ba..ce3246baf4 100644
--- a/src/mesa/main/histogram.h
+++ b/src/mesa/main/histogram.h
@@ -36,10 +36,9 @@
 #ifndef HISTOGRAM_H
 #define HISTOGRAM_H
 
-#include "glheader.h"
-#include "mtypes.h"
+#include "main/mtypes.h"
 
-#if _HAVE_FULL_GL
+#if FEATURE_histogram
 
 extern void GLAPIENTRY 
 _mesa_GetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum types, GLvoid *values);
@@ -71,13 +70,18 @@ _mesa_ResetHistogram(GLenum target);
 extern void GLAPIENTRY 
 _mesa_ResetMinmax(GLenum target);
 
-extern void _mesa_init_histogram( GLcontext * ctx );
+extern void
+_mesa_init_histogram_dispatch(struct _glapi_table *disp);
+
+#else /* FEATURE_histogram */
 
-#else
+static INLINE void
+_mesa_init_histogram_dispatch(struct _glapi_table *disp)
+{
+}
 
-/** No-op */
-#define _mesa_init_histogram( c ) ((void) 0)
+#endif /* FEATURE_histogram */
 
-#endif
+extern void _mesa_init_histogram( GLcontext * ctx );
 
-#endif
+#endif /* HISTOGRAM_H */
-- 
cgit v1.2.3


From 940b525a5acb1926cbd8b39594ecda3e614a3c2f Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olvaffe@gmail.com>
Date: Tue, 8 Sep 2009 10:05:36 +0800
Subject: mesa/main: New feature FEATURE_rastpos.

It is separated from FEATURE_drawpix and made to follow the feature
convensions.
---
 src/mesa/main/api_exec.c  | 56 +++-------------------------------------
 src/mesa/main/context.c   |  4 ---
 src/mesa/main/mfeatures.h |  2 +-
 src/mesa/main/rastpos.c   | 66 +++++++++++++++++++++++++++++++++++++++++++++--
 src/mesa/main/rastpos.h   | 27 ++++++++++++++++---
 5 files changed, 92 insertions(+), 63 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index 6b529db5ec..8de0691851 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -59,8 +59,8 @@
 #endif
 #if FEATURE_drawpix
 #include "drawpix.h"
-#include "rastpos.h"
 #endif
+#include "rastpos.h"
 #include "enable.h"
 #if FEATURE_evaluators
 #include "eval.h"
@@ -281,33 +281,8 @@ _mesa_init_exec_table(struct _glapi_table *exec)
    SET_PolygonStipple(exec, _mesa_PolygonStipple);
 
    _mesa_init_attrib_dispatch(exec);
+   _mesa_init_rastpos_dispatch(exec);
 
-#if FEATURE_drawpix
-   SET_RasterPos2f(exec, _mesa_RasterPos2f);
-   SET_RasterPos2fv(exec, _mesa_RasterPos2fv);
-   SET_RasterPos2i(exec, _mesa_RasterPos2i);
-   SET_RasterPos2iv(exec, _mesa_RasterPos2iv);
-   SET_RasterPos2d(exec, _mesa_RasterPos2d);
-   SET_RasterPos2dv(exec, _mesa_RasterPos2dv);
-   SET_RasterPos2s(exec, _mesa_RasterPos2s);
-   SET_RasterPos2sv(exec, _mesa_RasterPos2sv);
-   SET_RasterPos3d(exec, _mesa_RasterPos3d);
-   SET_RasterPos3dv(exec, _mesa_RasterPos3dv);
-   SET_RasterPos3f(exec, _mesa_RasterPos3f);
-   SET_RasterPos3fv(exec, _mesa_RasterPos3fv);
-   SET_RasterPos3i(exec, _mesa_RasterPos3i);
-   SET_RasterPos3iv(exec, _mesa_RasterPos3iv);
-   SET_RasterPos3s(exec, _mesa_RasterPos3s);
-   SET_RasterPos3sv(exec, _mesa_RasterPos3sv);
-   SET_RasterPos4d(exec, _mesa_RasterPos4d);
-   SET_RasterPos4dv(exec, _mesa_RasterPos4dv);
-   SET_RasterPos4f(exec, _mesa_RasterPos4f);
-   SET_RasterPos4fv(exec, _mesa_RasterPos4fv);
-   SET_RasterPos4i(exec, _mesa_RasterPos4i);
-   SET_RasterPos4iv(exec, _mesa_RasterPos4iv);
-   SET_RasterPos4s(exec, _mesa_RasterPos4s);
-   SET_RasterPos4sv(exec, _mesa_RasterPos4sv);
-#endif
    SET_ReadPixels(exec, _mesa_ReadPixels);
    SET_Rotated(exec, _mesa_Rotated);
    SET_Scaled(exec, _mesa_Scaled);
@@ -485,32 +460,7 @@ _mesa_init_exec_table(struct _glapi_table *exec)
 #endif
 
    /* 197. GL_MESA_window_pos */
-#if FEATURE_drawpix
-   SET_WindowPos2dMESA(exec, _mesa_WindowPos2dMESA);
-   SET_WindowPos2dvMESA(exec, _mesa_WindowPos2dvMESA);
-   SET_WindowPos2fMESA(exec, _mesa_WindowPos2fMESA);
-   SET_WindowPos2fvMESA(exec, _mesa_WindowPos2fvMESA);
-   SET_WindowPos2iMESA(exec, _mesa_WindowPos2iMESA);
-   SET_WindowPos2ivMESA(exec, _mesa_WindowPos2ivMESA);
-   SET_WindowPos2sMESA(exec, _mesa_WindowPos2sMESA);
-   SET_WindowPos2svMESA(exec, _mesa_WindowPos2svMESA);
-   SET_WindowPos3dMESA(exec, _mesa_WindowPos3dMESA);
-   SET_WindowPos3dvMESA(exec, _mesa_WindowPos3dvMESA);
-   SET_WindowPos3fMESA(exec, _mesa_WindowPos3fMESA);
-   SET_WindowPos3fvMESA(exec, _mesa_WindowPos3fvMESA);
-   SET_WindowPos3iMESA(exec, _mesa_WindowPos3iMESA);
-   SET_WindowPos3ivMESA(exec, _mesa_WindowPos3ivMESA);
-   SET_WindowPos3sMESA(exec, _mesa_WindowPos3sMESA);
-   SET_WindowPos3svMESA(exec, _mesa_WindowPos3svMESA);
-   SET_WindowPos4dMESA(exec, _mesa_WindowPos4dMESA);
-   SET_WindowPos4dvMESA(exec, _mesa_WindowPos4dvMESA);
-   SET_WindowPos4fMESA(exec, _mesa_WindowPos4fMESA);
-   SET_WindowPos4fvMESA(exec, _mesa_WindowPos4fvMESA);
-   SET_WindowPos4iMESA(exec, _mesa_WindowPos4iMESA);
-   SET_WindowPos4ivMESA(exec, _mesa_WindowPos4ivMESA);
-   SET_WindowPos4sMESA(exec, _mesa_WindowPos4sMESA);
-   SET_WindowPos4svMESA(exec, _mesa_WindowPos4svMESA);
-#endif
+   /* part of _mesa_init_rastpos_dispatch(exec); */
 
    /* 200. GL_IBM_multimode_draw_arrays */
 #if _HAVE_FULL_GL
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index a546e37b5f..cd8fe0df8f 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -124,9 +124,7 @@
 #if FEATURE_ARB_sync
 #include "syncobj.h"
 #endif
-#if FEATURE_drawpix
 #include "rastpos.h"
-#endif
 #include "scissor.h"
 #include "shared.h"
 #include "simple_list.h"
@@ -708,9 +706,7 @@ init_attrib_groups(GLcontext *ctx)
 #if FEATURE_ARB_sync
    _mesa_init_sync( ctx );
 #endif
-#if FEATURE_drawpix
    _mesa_init_rastpos( ctx );
-#endif
    _mesa_init_scissor( ctx );
    _mesa_init_shader_state( ctx );
    _mesa_init_stencil( ctx );
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index b05cfab1bf..cfffc2bf85 100644
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -83,12 +83,12 @@
 #define FEATURE_histogram  _HAVE_FULL_GL
 #define FEATURE_pixel_transfer  _HAVE_FULL_GL
 #define FEATURE_point_size_array 0
+#define FEATURE_rastpos  _HAVE_FULL_GL
 #define FEATURE_texgen  _HAVE_FULL_GL
 #define FEATURE_texture_fxt1  _HAVE_FULL_GL
 #define FEATURE_texture_s3tc  _HAVE_FULL_GL
 #define FEATURE_userclip  _HAVE_FULL_GL
 #define FEATURE_vertex_array_byte 0
-#define FEATURE_windowpos  _HAVE_FULL_GL
 #define FEATURE_es2_glsl 0
 
 #define FEATURE_ARB_occlusion_query  _HAVE_FULL_GL
diff --git a/src/mesa/main/rastpos.c b/src/mesa/main/rastpos.c
index 9f309d6ab8..77eb84103f 100644
--- a/src/mesa/main/rastpos.c
+++ b/src/mesa/main/rastpos.c
@@ -34,6 +34,10 @@
 #include "macros.h"
 #include "rastpos.h"
 #include "state.h"
+#include "glapi/dispatch.h"
+
+
+#if FEATURE_rastpos
 
 
 /**
@@ -211,7 +215,7 @@ _mesa_RasterPos4sv(const GLshort *v)
 /***           GL_ARB_window_pos / GL_MESA_window_pos               ***/
 /**********************************************************************/
 
-#if FEATURE_drawpix
+
 /**
  * All glWindowPosMESA and glWindowPosARB commands call this function to
  * update the current raster position.
@@ -436,7 +440,6 @@ _mesa_WindowPos4svMESA(const GLshort *v)
    window_pos4f(v[0], v[1], v[2], v[3]);
 }
 
-#endif
 
 #if 0
 
@@ -477,6 +480,65 @@ void glWindowPos4fMESA( GLfloat x, GLfloat y, GLfloat z, GLfloat w )
 #endif
 
 
+void 
+_mesa_init_rastpos_dispatch(struct _glapi_table *disp)
+{
+   SET_RasterPos2f(disp, _mesa_RasterPos2f);
+   SET_RasterPos2fv(disp, _mesa_RasterPos2fv);
+   SET_RasterPos2i(disp, _mesa_RasterPos2i);
+   SET_RasterPos2iv(disp, _mesa_RasterPos2iv);
+   SET_RasterPos2d(disp, _mesa_RasterPos2d);
+   SET_RasterPos2dv(disp, _mesa_RasterPos2dv);
+   SET_RasterPos2s(disp, _mesa_RasterPos2s);
+   SET_RasterPos2sv(disp, _mesa_RasterPos2sv);
+   SET_RasterPos3d(disp, _mesa_RasterPos3d);
+   SET_RasterPos3dv(disp, _mesa_RasterPos3dv);
+   SET_RasterPos3f(disp, _mesa_RasterPos3f);
+   SET_RasterPos3fv(disp, _mesa_RasterPos3fv);
+   SET_RasterPos3i(disp, _mesa_RasterPos3i);
+   SET_RasterPos3iv(disp, _mesa_RasterPos3iv);
+   SET_RasterPos3s(disp, _mesa_RasterPos3s);
+   SET_RasterPos3sv(disp, _mesa_RasterPos3sv);
+   SET_RasterPos4d(disp, _mesa_RasterPos4d);
+   SET_RasterPos4dv(disp, _mesa_RasterPos4dv);
+   SET_RasterPos4f(disp, _mesa_RasterPos4f);
+   SET_RasterPos4fv(disp, _mesa_RasterPos4fv);
+   SET_RasterPos4i(disp, _mesa_RasterPos4i);
+   SET_RasterPos4iv(disp, _mesa_RasterPos4iv);
+   SET_RasterPos4s(disp, _mesa_RasterPos4s);
+   SET_RasterPos4sv(disp, _mesa_RasterPos4sv);
+
+   /* 197. GL_MESA_window_pos */
+   SET_WindowPos2dMESA(disp, _mesa_WindowPos2dMESA);
+   SET_WindowPos2dvMESA(disp, _mesa_WindowPos2dvMESA);
+   SET_WindowPos2fMESA(disp, _mesa_WindowPos2fMESA);
+   SET_WindowPos2fvMESA(disp, _mesa_WindowPos2fvMESA);
+   SET_WindowPos2iMESA(disp, _mesa_WindowPos2iMESA);
+   SET_WindowPos2ivMESA(disp, _mesa_WindowPos2ivMESA);
+   SET_WindowPos2sMESA(disp, _mesa_WindowPos2sMESA);
+   SET_WindowPos2svMESA(disp, _mesa_WindowPos2svMESA);
+   SET_WindowPos3dMESA(disp, _mesa_WindowPos3dMESA);
+   SET_WindowPos3dvMESA(disp, _mesa_WindowPos3dvMESA);
+   SET_WindowPos3fMESA(disp, _mesa_WindowPos3fMESA);
+   SET_WindowPos3fvMESA(disp, _mesa_WindowPos3fvMESA);
+   SET_WindowPos3iMESA(disp, _mesa_WindowPos3iMESA);
+   SET_WindowPos3ivMESA(disp, _mesa_WindowPos3ivMESA);
+   SET_WindowPos3sMESA(disp, _mesa_WindowPos3sMESA);
+   SET_WindowPos3svMESA(disp, _mesa_WindowPos3svMESA);
+   SET_WindowPos4dMESA(disp, _mesa_WindowPos4dMESA);
+   SET_WindowPos4dvMESA(disp, _mesa_WindowPos4dvMESA);
+   SET_WindowPos4fMESA(disp, _mesa_WindowPos4fMESA);
+   SET_WindowPos4fvMESA(disp, _mesa_WindowPos4fvMESA);
+   SET_WindowPos4iMESA(disp, _mesa_WindowPos4iMESA);
+   SET_WindowPos4ivMESA(disp, _mesa_WindowPos4ivMESA);
+   SET_WindowPos4sMESA(disp, _mesa_WindowPos4sMESA);
+   SET_WindowPos4svMESA(disp, _mesa_WindowPos4svMESA);
+}
+
+
+#endif /* FEATURE_rastpos */
+
+
 /**********************************************************************/
 /** \name Initialization                                              */
 /**********************************************************************/
diff --git a/src/mesa/main/rastpos.h b/src/mesa/main/rastpos.h
index 363f86ad87..767d6f2677 100644
--- a/src/mesa/main/rastpos.h
+++ b/src/mesa/main/rastpos.h
@@ -32,9 +32,16 @@
 #define RASTPOS_H
 
 
-#include "glheader.h"
+#include "main/mtypes.h"
 
 
+#if FEATURE_rastpos
+
+#define _MESA_INIT_RASTPOS_FUNCTIONS(driver, impl) \
+   do {                                            \
+      (driver)->RasterPos = impl ## RasterPos;     \
+   } while (0)
+
 extern void GLAPIENTRY
 _mesa_RasterPos2d(GLdouble x, GLdouble y);
 
@@ -186,8 +193,22 @@ extern void GLAPIENTRY
 _mesa_WindowPos4svMESA(const GLshort *v);
 
 extern void 
-_mesa_init_rastpos( GLcontext * ctx );
+_mesa_init_rastpos_dispatch(struct _glapi_table *disp);
+
+#else /* FEATURE_rastpos */
+
+#define _MESA_INIT_RASTPOS_FUNCTIONS(driver, impl) do { } while (0)
+
+static INLINE void 
+_mesa_init_rastpos_dispatch(struct _glapi_table *disp)
+{
+}
+
+#endif /* FEATURE_rastpos */
+
+extern void 
+_mesa_init_rastpos(GLcontext *ctx);
 
 /*@}*/
 
-#endif
+#endif /* RASTPOS_H */
-- 
cgit v1.2.3


From 8df670164f9bd735a6212741c0178899d3462e0c Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olvaffe@gmail.com>
Date: Tue, 8 Sep 2009 10:15:06 +0800
Subject: mesa/main: Make FEATURE_drawpix follow feature conventions.

As shown in mfeatures.h, this allows users of drawpix.h to work
without knowing if the feature is available.
---
 src/mesa/main/api_exec.c | 10 +++-------
 src/mesa/main/drawpix.c  | 20 +++++++++++++++-----
 src/mesa/main/drawpix.h  | 30 ++++++++++++++++++++++++++----
 3 files changed, 44 insertions(+), 16 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index 8de0691851..5ddbf49759 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -57,9 +57,7 @@
 #if FEATURE_dlist
 #include "dlist.h"
 #endif
-#if FEATURE_drawpix
 #include "drawpix.h"
-#endif
 #include "rastpos.h"
 #include "enable.h"
 #if FEATURE_evaluators
@@ -209,11 +207,9 @@ _mesa_init_exec_table(struct _glapi_table *exec)
    SET_DepthFunc(exec, _mesa_DepthFunc);
    SET_DepthMask(exec, _mesa_DepthMask);
    SET_DepthRange(exec, _mesa_DepthRange);
-#if FEATURE_drawpix
-   SET_Bitmap(exec, _mesa_Bitmap);
-   SET_CopyPixels(exec, _mesa_CopyPixels);
-   SET_DrawPixels(exec, _mesa_DrawPixels);
-#endif
+
+   _mesa_init_drawpix_dispatch(exec);
+
 #if FEATURE_feedback
    SET_InitNames(exec, _mesa_InitNames);
    SET_FeedbackBuffer(exec, _mesa_FeedbackBuffer);
diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index aef6585641..f7ce64fd7c 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -33,8 +33,11 @@
 #include "image.h"
 #include "readpix.h"
 #include "state.h"
+#include "glapi/dispatch.h"
 
 
+#if FEATURE_drawpix
+
 
 /**
  * If a fragment program is enabled, check that it's valid.
@@ -47,8 +50,6 @@ valid_fragment_program(GLcontext *ctx)
 }
 
 
-#if _HAVE_FULL_GL
-
 /*
  * Execute glDrawPixels
  */
@@ -225,9 +226,6 @@ end:
    _mesa_set_vp_override(ctx, GL_FALSE);
 }
 
-#endif /* _HAVE_FULL_GL */
-
-
 
 void GLAPIENTRY
 _mesa_Bitmap( GLsizei width, GLsizei height,
@@ -309,3 +307,15 @@ _mesa_Bitmap( GLsizei width, GLsizei height,
    ctx->Current.RasterPos[0] += xmove;
    ctx->Current.RasterPos[1] += ymove;
 }
+
+
+void 
+_mesa_init_drawpix_dispatch(struct _glapi_table *disp)
+{
+   SET_Bitmap(disp, _mesa_Bitmap);
+   SET_CopyPixels(disp, _mesa_CopyPixels);
+   SET_DrawPixels(disp, _mesa_DrawPixels);
+}
+
+
+#endif /* FEATURE_drawpix */
diff --git a/src/mesa/main/drawpix.h b/src/mesa/main/drawpix.h
index 6177adad6d..01564b3ed7 100644
--- a/src/mesa/main/drawpix.h
+++ b/src/mesa/main/drawpix.h
@@ -22,13 +22,21 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#ifndef DRAWPIX_H
+#define DRAWPIX_H
 
-#ifndef DRAWPIXELS_H
-#define DRAWPIXELS_H
 
+#include "main/mtypes.h"
 
-#include "main/glheader.h"
 
+#if FEATURE_drawpix
+
+#define _MESA_INIT_DRAWPIX_FUNCTIONS(driver, impl) \
+   do {                                            \
+      (driver)->DrawPixels = impl ## DrawPixels;   \
+      (driver)->CopyPixels = impl ## CopyPixels;   \
+      (driver)->Bitmap     = impl ## Bitmap;       \
+   } while (0)
 
 extern void GLAPIENTRY
 _mesa_DrawPixels( GLsizei width, GLsizei height,
@@ -45,5 +53,19 @@ _mesa_Bitmap( GLsizei width, GLsizei height,
               GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove,
               const GLubyte *bitmap );
 
+extern void 
+_mesa_init_drawpix_dispatch(struct _glapi_table *disp);
+
+#else /* FEATURE_drawpix */
+
+#define _MESA_INIT_DRAWPIX_FUNCTIONS(driver, impl) do { } while (0)
+
+static INLINE void 
+_mesa_init_drawpix_dispatch(struct _glapi_table *disp)
+{
+}
+
+#endif /* FEATURE_drawpix */
+
 
-#endif
+#endif /* DRAWPIX_H */
-- 
cgit v1.2.3


From b04d58c0b1bd66ea59c5277a13e83e4306a6d740 Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olvaffe@gmail.com>
Date: Tue, 8 Sep 2009 10:52:01 +0800
Subject: mesa/main: Make FEATURE_feedback follow feature conventions.

As shown in mfeatures.h, this allows users of feedback.h to work without
knowing if the feature is available.
---
 src/mesa/main/api_exec.c | 13 +-----------
 src/mesa/main/context.c  |  6 ------
 src/mesa/main/feedback.c | 23 +++++++++++++++++----
 src/mesa/main/feedback.h | 54 ++++++++++++++++++++++++++++++++++++++++++++----
 4 files changed, 70 insertions(+), 26 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index 5ddbf49759..a2f0dfabda 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -64,9 +64,7 @@
 #include "eval.h"
 #endif
 #include "get.h"
-#if FEATURE_feedback
 #include "feedback.h"
-#endif
 #include "fog.h"
 #if FEATURE_EXT_framebuffer_object
 #include "fbobject.h"
@@ -209,17 +207,8 @@ _mesa_init_exec_table(struct _glapi_table *exec)
    SET_DepthRange(exec, _mesa_DepthRange);
 
    _mesa_init_drawpix_dispatch(exec);
+   _mesa_init_feedback_dispatch(exec);
 
-#if FEATURE_feedback
-   SET_InitNames(exec, _mesa_InitNames);
-   SET_FeedbackBuffer(exec, _mesa_FeedbackBuffer);
-   SET_LoadName(exec, _mesa_LoadName);
-   SET_PassThrough(exec, _mesa_PassThrough);
-   SET_PopName(exec, _mesa_PopName);
-   SET_PushName(exec, _mesa_PushName);
-   SET_SelectBuffer(exec, _mesa_SelectBuffer);
-   SET_RenderMode(exec, _mesa_RenderMode);
-#endif
    SET_FogCoordPointerEXT(exec, _mesa_FogCoordPointerEXT);
    SET_Fogf(exec, _mesa_Fogf);
    SET_Fogfv(exec, _mesa_Fogfv);
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index cd8fe0df8f..17e98ffa30 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -100,9 +100,7 @@
 #include "enums.h"
 #include "extensions.h"
 #include "fbobject.h"
-#if FEATURE_feedback
 #include "feedback.h"
-#endif
 #include "fog.h"
 #include "framebuffer.h"
 #include "get.h"
@@ -683,11 +681,7 @@ init_attrib_groups(GLcontext *ctx)
    _mesa_init_eval( ctx );
 #endif
    _mesa_init_fbobjects( ctx );
-#if FEATURE_feedback
    _mesa_init_feedback( ctx );
-#else
-   ctx->RenderMode = GL_RENDER;
-#endif
    _mesa_init_fog( ctx );
    _mesa_init_histogram( ctx );
    _mesa_init_hint( ctx );
diff --git a/src/mesa/main/feedback.c b/src/mesa/main/feedback.c
index 818a804540..46759dc99e 100644
--- a/src/mesa/main/feedback.c
+++ b/src/mesa/main/feedback.c
@@ -36,9 +36,10 @@
 #include "feedback.h"
 #include "macros.h"
 #include "mtypes.h"
+#include "glapi/dispatch.h"
 
 
-#if _HAVE_FULL_GL
+#if FEATURE_feedback
 
 
 #define FB_3D		0x01
@@ -153,9 +154,6 @@ _mesa_feedback_vertex(GLcontext *ctx,
 }
 
 
-#endif /* _HAVE_FULL_GL */
-
-
 /**********************************************************************/
 /** \name Selection */
 /*@{*/
@@ -507,6 +505,23 @@ _mesa_RenderMode( GLenum mode )
 /*@}*/
 
 
+void 
+_mesa_init_feedback_dispatch(struct _glapi_table *disp)
+{
+   SET_InitNames(disp, _mesa_InitNames);
+   SET_FeedbackBuffer(disp, _mesa_FeedbackBuffer);
+   SET_LoadName(disp, _mesa_LoadName);
+   SET_PassThrough(disp, _mesa_PassThrough);
+   SET_PopName(disp, _mesa_PopName);
+   SET_PushName(disp, _mesa_PushName);
+   SET_SelectBuffer(disp, _mesa_SelectBuffer);
+   SET_RenderMode(disp, _mesa_RenderMode);
+}
+
+
+#endif /* FEATURE_feedback */
+
+
 /**********************************************************************/
 /** \name Initialization */
 /*@{*/
diff --git a/src/mesa/main/feedback.h b/src/mesa/main/feedback.h
index 72c2acd5ed..6ed1a12525 100644
--- a/src/mesa/main/feedback.h
+++ b/src/mesa/main/feedback.h
@@ -27,11 +27,15 @@
 #define FEEDBACK_H
 
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 
-extern void
-_mesa_init_feedback( GLcontext *ctx );
+#if FEATURE_feedback
+
+#define _MESA_INIT_FEEDBACK_FUNCTIONS(driver, impl) \
+   do {                                             \
+      (driver)->RenderMode = impl ## RenderMode;    \
+   } while (0)
 
 extern void
 _mesa_feedback_vertex( GLcontext *ctx,
@@ -79,5 +83,47 @@ _mesa_PopName( void );
 extern GLint GLAPIENTRY
 _mesa_RenderMode( GLenum mode );
 
+extern void 
+_mesa_init_feedback_dispatch(struct _glapi_table *disp);
+
+#else /* FEATURE_feedback */
+
+#define _MESA_INIT_FEEDBACK_FUNCTIONS(driver, impl) do { } while (0)
+
+static INLINE void
+_mesa_feedback_vertex( GLcontext *ctx,
+                       const GLfloat win[4],
+                       const GLfloat color[4],
+                       GLfloat index,
+                       const GLfloat texcoord[4] )
+{
+   /* render mode is always GL_RENDER */
+   ASSERT_NO_FEATURE();
+}
+
+
+static INLINE void
+_mesa_feedback_token( GLcontext *ctx, GLfloat token )
+{
+   /* render mode is always GL_RENDER */
+   ASSERT_NO_FEATURE();
+}
+
+static INLINE void
+_mesa_update_hitflag( GLcontext *ctx, GLfloat z )
+{
+   /* render mode is always GL_RENDER */
+   ASSERT_NO_FEATURE();
+}
+
+static INLINE void 
+_mesa_init_feedback_dispatch(struct _glapi_table *disp)
+{
+}
+
+#endif /* FEATURE_feedback */
+
+extern void
+_mesa_init_feedback( GLcontext *ctx );
 
-#endif
+#endif /* FEEDBACK_H */
-- 
cgit v1.2.3


From 6fcf6a5a7fe631af7c0dab67455e46a8ba898583 Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olvaffe@gmail.com>
Date: Tue, 8 Sep 2009 11:01:19 +0800
Subject: mesa/main: Make FEATURE_texgen follow feature conventions.

As shown in mfeatures.h, this allows users of texgen.h to work without
knowing if the feature is available.
---
 src/mesa/main/api_exec.c | 14 +-------------
 src/mesa/main/texgen.c   | 20 ++++++++++++++++++++
 src/mesa/main/texgen.h   | 22 +++++++++++++++++++++-
 3 files changed, 42 insertions(+), 14 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index a2f0dfabda..b7b9aa0bf2 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -93,9 +93,7 @@
 #include "texenv.h"
 #include "texgetimage.h"
 #include "teximage.h"
-#if FEATURE_texgen
 #include "texgen.h"
-#endif
 #include "texobj.h"
 #include "texparam.h"
 #include "texstate.h"
@@ -275,17 +273,7 @@ _mesa_init_exec_table(struct _glapi_table *exec)
    SET_TexEnvf(exec, _mesa_TexEnvf);
    SET_TexEnviv(exec, _mesa_TexEnviv);
 
-#if FEATURE_texgen
-   SET_GetTexGendv(exec, _mesa_GetTexGendv);
-   SET_GetTexGenfv(exec, _mesa_GetTexGenfv);
-   SET_GetTexGeniv(exec, _mesa_GetTexGeniv);
-   SET_TexGend(exec, _mesa_TexGend);
-   SET_TexGendv(exec, _mesa_TexGendv);
-   SET_TexGenf(exec, _mesa_TexGenf);
-   SET_TexGenfv(exec, _mesa_TexGenfv);
-   SET_TexGeni(exec, _mesa_TexGeni);
-   SET_TexGeniv(exec, _mesa_TexGeniv);
-#endif
+   _mesa_init_texgen_dispatch(exec);
 
    SET_TexImage1D(exec, _mesa_TexImage1D);
    SET_TexParameterf(exec, _mesa_TexParameterf);
diff --git a/src/mesa/main/texgen.c b/src/mesa/main/texgen.c
index e3feb024c3..8c98ee3602 100644
--- a/src/mesa/main/texgen.c
+++ b/src/mesa/main/texgen.c
@@ -36,6 +36,10 @@
 #include "main/macros.h"
 #include "main/texgen.h"
 #include "math/m_matrix.h"
+#include "glapi/dispatch.h"
+
+
+#if FEATURE_texgen
 
 
 /**
@@ -337,3 +341,19 @@ _mesa_GetTexGeniv( GLenum coord, GLenum pname, GLint *params )
 }
 
 
+void 
+_mesa_init_texgen_dispatch(struct _glapi_table *disp)
+{
+   SET_GetTexGendv(disp, _mesa_GetTexGendv);
+   SET_GetTexGenfv(disp, _mesa_GetTexGenfv);
+   SET_GetTexGeniv(disp, _mesa_GetTexGeniv);
+   SET_TexGend(disp, _mesa_TexGend);
+   SET_TexGendv(disp, _mesa_TexGendv);
+   SET_TexGenf(disp, _mesa_TexGenf);
+   SET_TexGenfv(disp, _mesa_TexGenfv);
+   SET_TexGeni(disp, _mesa_TexGeni);
+   SET_TexGeniv(disp, _mesa_TexGeniv);
+}
+
+
+#endif /* FEATURE_texgen */
diff --git a/src/mesa/main/texgen.h b/src/mesa/main/texgen.h
index 073588efcd..2ca026de3d 100644
--- a/src/mesa/main/texgen.h
+++ b/src/mesa/main/texgen.h
@@ -27,9 +27,16 @@
 #define TEXGEN_H
 
 
-#include "main/glheader.h"
+#include "main/mtypes.h"
 
 
+#if FEATURE_texgen
+
+#define _MESA_INIT_TEXGEN_FUNCTIONS(driver, impl) \
+   do {                                           \
+      (driver)->TexGen = impl ## TexGen;          \
+   } while (0)
+
 extern void GLAPIENTRY
 _mesa_GetTexGendv( GLenum coord, GLenum pname, GLdouble *params );
 
@@ -57,6 +64,19 @@ _mesa_TexGeni( GLenum coord, GLenum pname, GLint param );
 extern void GLAPIENTRY
 _mesa_TexGeniv( GLenum coord, GLenum pname, const GLint *params );
 
+extern void 
+_mesa_init_texgen_dispatch(struct _glapi_table *disp);
+
+#else /* FEATURE_texgen */
+
+#define _MESA_INIT_TEXGEN_FUNCTIONS(driver, impl) do { } while (0)
+
+static INLINE void 
+_mesa_init_texgen_dispatch(struct _glapi_table *disp)
+{
+}
+
+#endif /* FEATURE_texgen */
 
 
 #endif /* TEXGEN_H */
-- 
cgit v1.2.3


From 7f8045ab4e11dee0d80498187e96d38ce95c8ef4 Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olvaffe@gmail.com>
Date: Tue, 8 Sep 2009 14:32:08 +0800
Subject: mesa/main: New feature FEATURE_arrayelt.

This allows the removal of AEcontext.
---
 src/mesa/main/api_arrayelt.c | 18 +++++++++++++++--
 src/mesa/main/api_arrayelt.h | 47 +++++++++++++++++++++++++++++++++++++++++---
 src/mesa/main/api_noop.c     |  3 ++-
 src/mesa/main/dlist.c        |  3 ++-
 src/mesa/main/mfeatures.h    |  3 ++-
 src/mesa/main/vtxfmt.c       |  4 +++-
 src/mesa/vbo/vbo_exec_api.c  |  3 ++-
 src/mesa/vbo/vbo_save_api.c  |  3 ++-
 8 files changed, 73 insertions(+), 11 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_arrayelt.c b/src/mesa/main/api_arrayelt.c
index 2462a1b003..a058227110 100644
--- a/src/mesa/main/api_arrayelt.c
+++ b/src/mesa/main/api_arrayelt.c
@@ -71,6 +71,10 @@ typedef struct {
  */
 #define TYPE_IDX(t) ( (t) == GL_DOUBLE ? 7 : (t) & 7 )
 
+
+#if FEATURE_arrayelt
+
+
 static const int ColorFuncs[2][8] = {
    {
       _gloffset_Color3bv,
@@ -1160,7 +1164,7 @@ static void _ae_update_state( GLcontext *ctx )
          at->array = attribArray;
          /* Note: we can't grab the _glapi_Dispatch->VertexAttrib1fvNV
           * function pointer here (for float arrays) since the pointer may
-          * change from one execution of _ae_loopback_array_elt() to
+          * change from one execution of _ae_ArrayElement() to
           * the next.  Doing so caused UT to break.
           */
          if (ctx->VertexProgram._Enabled
@@ -1254,7 +1258,7 @@ void _ae_unmap_vbos( GLcontext *ctx )
  * for all enabled vertex arrays (for elt-th element).
  * Note: this may be called during display list construction.
  */
-void GLAPIENTRY _ae_loopback_array_elt( GLint elt )
+void GLAPIENTRY _ae_ArrayElement( GLint elt )
 {
    GET_CURRENT_CONTEXT(ctx);
    const AEcontext *actx = AE_CONTEXT(ctx);
@@ -1317,3 +1321,13 @@ void _ae_invalidate_state( GLcontext *ctx, GLuint new_state )
       actx->NewState |= new_state;
    }
 }
+
+
+void _mesa_install_arrayelt_vtxfmt(struct _glapi_table *disp,
+                                   const GLvertexformat *vfmt)
+{
+   SET_ArrayElement(disp, vfmt->ArrayElement);
+}
+
+
+#endif /* FEATURE_arrayelt */
diff --git a/src/mesa/main/api_arrayelt.h b/src/mesa/main/api_arrayelt.h
index e621724fb2..d18c0792c3 100644
--- a/src/mesa/main/api_arrayelt.h
+++ b/src/mesa/main/api_arrayelt.h
@@ -27,16 +27,57 @@
 #ifndef API_ARRAYELT_H
 #define API_ARRAYELT_H
 
-#include "mtypes.h"
+
+#include "main/mtypes.h"
+
+#if FEATURE_arrayelt
+
+#define _MESA_INIT_ARRAYELT_VTXFMT(vfmt, impl)     \
+   do {                                            \
+      (vfmt)->ArrayElement = impl ## ArrayElement; \
+   } while (0)
 
 extern GLboolean _ae_create_context( GLcontext *ctx );
 extern void _ae_destroy_context( GLcontext *ctx );
 extern void _ae_invalidate_state( GLcontext *ctx, GLuint new_state );
-extern void GLAPIENTRY _ae_loopback_array_elt( GLint elt );
+extern void GLAPIENTRY _ae_ArrayElement( GLint elt );
 
 /* May optionally be called before a batch of element calls:
  */
 extern void _ae_map_vbos( GLcontext *ctx );
 extern void _ae_unmap_vbos( GLcontext *ctx );
 
-#endif
+extern void
+_mesa_install_arrayelt_vtxfmt(struct _glapi_table *disp,
+                              const GLvertexformat *vfmt);
+
+#else /* FEATURE_arrayelt */
+
+#define _MESA_INIT_ARRAYELT_VTXFMT(vfmt, impl) do { } while (0)
+
+static INLINE GLboolean
+_ae_create_context( GLcontext *ctx )
+{
+   return GL_TRUE;
+}
+
+static INLINE void
+_ae_destroy_context( GLcontext *ctx )
+{
+}
+
+static INLINE void
+_ae_invalidate_state( GLcontext *ctx, GLuint new_state )
+{
+}
+
+static INLINE void
+_mesa_install_arrayelt_vtxfmt(struct _glapi_table *disp,
+                              const GLvertexformat *vfmt)
+{
+}
+
+#endif /* FEATURE_arrayelt */
+
+
+#endif /* API_ARRAYELT_H */
diff --git a/src/mesa/main/api_noop.c b/src/mesa/main/api_noop.c
index 0b669e7e7f..162b685b02 100644
--- a/src/mesa/main/api_noop.c
+++ b/src/mesa/main/api_noop.c
@@ -992,7 +992,8 @@ _mesa_noop_EvalMesh2( GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2 )
 void
 _mesa_noop_vtxfmt_init( GLvertexformat *vfmt )
 {
-   vfmt->ArrayElement = _ae_loopback_array_elt;	        /* generic helper */
+   _MESA_INIT_ARRAYELT_VTXFMT(vfmt, _ae_);
+
    vfmt->Begin = _mesa_noop_Begin;
 #if FEATURE_dlist
    vfmt->CallList = _mesa_CallList;
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index d721f699fd..64617fbd79 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -8632,7 +8632,8 @@ mesa_print_display_list(GLuint list)
 void
 _mesa_save_vtxfmt_init(GLvertexformat * vfmt)
 {
-   vfmt->ArrayElement = _ae_loopback_array_elt; /* generic helper */
+   _MESA_INIT_ARRAYELT_VTXFMT(vfmt, _ae_);
+
    vfmt->Begin = save_Begin;
    vfmt->CallList = _mesa_save_CallList;
    vfmt->CallLists = _mesa_save_CallLists;
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index cfffc2bf85..eb6a1b1215 100644
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -70,11 +70,12 @@
  */
 
 #define FEATURE_accum  _HAVE_FULL_GL
+#define FEATURE_arrayelt  _HAVE_FULL_GL
 #define FEATURE_attrib_stack  _HAVE_FULL_GL
 #define FEATURE_colortable  _HAVE_FULL_GL
 #define FEATURE_convolve  _HAVE_FULL_GL
 #define FEATURE_dispatch  _HAVE_FULL_GL
-#define FEATURE_dlist  _HAVE_FULL_GL
+#define FEATURE_dlist  (_HAVE_FULL_GL && FEATURE_arrayelt)
 #define FEATURE_draw_read_buffer  _HAVE_FULL_GL
 #define FEATURE_drawpix  _HAVE_FULL_GL
 #define FEATURE_evaluators  _HAVE_FULL_GL
diff --git a/src/mesa/main/vtxfmt.c b/src/mesa/main/vtxfmt.c
index 91412f138a..de9479d6b0 100644
--- a/src/mesa/main/vtxfmt.c
+++ b/src/mesa/main/vtxfmt.c
@@ -27,6 +27,7 @@
  */
 
 #include "glheader.h"
+#include "api_arrayelt.h"
 #include "api_loopback.h"
 #include "context.h"
 #include "imports.h"
@@ -82,7 +83,8 @@
 static void
 install_vtxfmt( struct _glapi_table *tab, const GLvertexformat *vfmt )
 {
-   SET_ArrayElement(tab, vfmt->ArrayElement);
+   _mesa_install_arrayelt_vtxfmt(tab, vfmt);
+
    SET_Color3f(tab, vfmt->Color3f);
    SET_Color3fv(tab, vfmt->Color3fv);
    SET_Color4f(tab, vfmt->Color4f);
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c
index 387d4ee3d4..238beee030 100644
--- a/src/mesa/vbo/vbo_exec_api.c
+++ b/src/mesa/vbo/vbo_exec_api.c
@@ -557,7 +557,8 @@ static void vbo_exec_vtxfmt_init( struct vbo_exec_context *exec )
 {
    GLvertexformat *vfmt = &exec->vtxfmt;
 
-   vfmt->ArrayElement = _ae_loopback_array_elt;	        /* generic helper */
+   _MESA_INIT_ARRAYELT_VTXFMT(vfmt, _ae_);
+
    vfmt->Begin = vbo_exec_Begin;
 #if FEATURE_dlist
    vfmt->CallList = _mesa_CallList;
diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c
index 41cd21d04b..6e11344380 100644
--- a/src/mesa/vbo/vbo_save_api.c
+++ b/src/mesa/vbo/vbo_save_api.c
@@ -988,7 +988,8 @@ static void _save_vtxfmt_init( GLcontext *ctx )
    struct vbo_save_context *save = &vbo_context(ctx)->save;
    GLvertexformat *vfmt = &save->vtxfmt;
 
-   vfmt->ArrayElement = _ae_loopback_array_elt;	        /* generic helper */
+   _MESA_INIT_ARRAYELT_VTXFMT(vfmt, _ae_);
+
    vfmt->Begin = _save_Begin;
    vfmt->Color3f = _save_Color3f;
    vfmt->Color3fv = _save_Color3fv;
-- 
cgit v1.2.3


From 57ce3ab32382d08ac8f0aeca13677612af3adfc0 Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olvaffe@gmail.com>
Date: Tue, 8 Sep 2009 17:45:59 +0800
Subject: mesa/main: New feature FEATURE_queryobj.

It merges FEATURE_ARB_occlusion_query and FEATURE_EXT_timer_query, and
follows the feature conventions.
---
 src/mesa/main/api_exec.c            | 18 +------------
 src/mesa/main/context.c             | 10 ++------
 src/mesa/main/dlist.c               |  8 +++---
 src/mesa/main/extensions.c          |  2 +-
 src/mesa/main/mfeatures.h           |  3 +--
 src/mesa/main/queryobj.c            | 40 ++++++++++++++++++-----------
 src/mesa/main/queryobj.h            | 51 ++++++++++++++++++++++++++++++-------
 src/mesa/state_tracker/st_context.c |  2 +-
 src/mesa/swrast/s_span.c            |  4 ---
 9 files changed, 77 insertions(+), 61 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index b7b9aa0bf2..3fe10f1207 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -83,9 +83,7 @@
 #include "pixelstore.h"
 #include "points.h"
 #include "polygon.h"
-#if FEATURE_ARB_occlusion_query || FEATURE_EXT_timer_query
 #include "queryobj.h"
-#endif
 #include "readpix.h"
 #include "scissor.h"
 #include "state.h"
@@ -625,16 +623,7 @@ _mesa_init_exec_table(struct _glapi_table *exec)
 #endif
 
    /* ARB 29. GL_ARB_occlusion_query */
-#if FEATURE_ARB_occlusion_query
-   SET_GenQueriesARB(exec, _mesa_GenQueriesARB);
-   SET_DeleteQueriesARB(exec, _mesa_DeleteQueriesARB);
-   SET_IsQueryARB(exec, _mesa_IsQueryARB);
-   SET_BeginQueryARB(exec, _mesa_BeginQueryARB);
-   SET_EndQueryARB(exec, _mesa_EndQueryARB);
-   SET_GetQueryivARB(exec, _mesa_GetQueryivARB);
-   SET_GetQueryObjectivARB(exec, _mesa_GetQueryObjectivARB);
-   SET_GetQueryObjectuivARB(exec, _mesa_GetQueryObjectuivARB);
-#endif
+   _mesa_init_queryobj_dispatch(exec);
 
    /* ARB 37. GL_ARB_draw_buffers */
 #if FEATURE_draw_read_buffer
@@ -744,11 +733,6 @@ _mesa_init_exec_table(struct _glapi_table *exec)
    SET_GenerateMipmapEXT(exec, _mesa_GenerateMipmapEXT);
 #endif
 
-#if FEATURE_EXT_timer_query
-   SET_GetQueryObjecti64vEXT(exec, _mesa_GetQueryObjecti64vEXT);
-   SET_GetQueryObjectui64vEXT(exec, _mesa_GetQueryObjectui64vEXT);
-#endif
-
 #if FEATURE_EXT_framebuffer_blit
    SET_BlitFramebufferEXT(exec, _mesa_BlitFramebufferEXT);
 #endif
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 17e98ffa30..6994f98504 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -116,9 +116,7 @@
 #include "pixelstore.h"
 #include "points.h"
 #include "polygon.h"
-#if FEATURE_ARB_occlusion_query
 #include "queryobj.h"
-#endif
 #if FEATURE_ARB_sync
 #include "syncobj.h"
 #endif
@@ -694,9 +692,7 @@ init_attrib_groups(GLcontext *ctx)
    _mesa_init_point( ctx );
    _mesa_init_polygon( ctx );
    _mesa_init_program( ctx );
-#if FEATURE_ARB_occlusion_query
-   _mesa_init_query( ctx );
-#endif
+   _mesa_init_queryobj( ctx );
 #if FEATURE_ARB_sync
    _mesa_init_sync( ctx );
 #endif
@@ -990,9 +986,7 @@ _mesa_free_context_data( GLcontext *ctx )
    _mesa_free_colortables_data( ctx );
    _mesa_free_program_data(ctx);
    _mesa_free_shader_state(ctx);
-#if FEATURE_ARB_occlusion_query
-   _mesa_free_query_data(ctx);
-#endif
+   _mesa_free_queryobj_data(ctx);
 #if FEATURE_ARB_sync
    _mesa_free_sync_data(ctx);
 #endif
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 64617fbd79..25a2819783 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -4804,7 +4804,7 @@ save_ProgramStringARB(GLenum target, GLenum format, GLsizei len,
 #endif /* FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program */
 
 
-#if FEATURE_ARB_occlusion_query
+#if FEATURE_queryobj
 
 static void GLAPIENTRY
 save_BeginQueryARB(GLenum target, GLuint id)
@@ -4838,7 +4838,7 @@ save_EndQueryARB(GLenum target)
    }
 }
 
-#endif /* FEATURE_ARB_occlusion_query */
+#endif /* FEATURE_queryobj */
 
 
 static void GLAPIENTRY
@@ -6616,7 +6616,7 @@ execute_list(GLcontext *ctx, GLuint list)
                                                       n[6].f));
             break;
 #endif
-#if FEATURE_ARB_occlusion_query
+#if FEATURE_queryobj
          case OPCODE_BEGIN_QUERY_ARB:
             CALL_BeginQueryARB(ctx->Exec, (n[1].e, n[2].ui));
             break;
@@ -8293,7 +8293,7 @@ _mesa_init_dlist_table(struct _glapi_table *table)
    SET_UnmapBufferARB(table, _mesa_UnmapBufferARB);
 #endif
 
-#if FEATURE_ARB_occlusion_query
+#if FEATURE_queryobj
    SET_BeginQueryARB(table, save_BeginQueryARB);
    SET_EndQueryARB(table, save_EndQueryARB);
    SET_GenQueriesARB(table, _mesa_GenQueriesARB);
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 2ad66de7dd..cfc87e6fe6 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -213,7 +213,7 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
    ctx->Extensions.ARB_imaging = GL_TRUE;
    ctx->Extensions.ARB_map_buffer_range = GL_TRUE;
    ctx->Extensions.ARB_multitexture = GL_TRUE;
-#if FEATURE_ARB_occlusion_query
+#if FEATURE_queryobj
    ctx->Extensions.ARB_occlusion_query = GL_TRUE;
 #endif
    ctx->Extensions.ARB_point_sprite = GL_TRUE;
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index eb6a1b1215..cd39f5bd24 100644
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -84,6 +84,7 @@
 #define FEATURE_histogram  _HAVE_FULL_GL
 #define FEATURE_pixel_transfer  _HAVE_FULL_GL
 #define FEATURE_point_size_array 0
+#define FEATURE_queryobj  _HAVE_FULL_GL
 #define FEATURE_rastpos  _HAVE_FULL_GL
 #define FEATURE_texgen  _HAVE_FULL_GL
 #define FEATURE_texture_fxt1  _HAVE_FULL_GL
@@ -92,7 +93,6 @@
 #define FEATURE_vertex_array_byte 0
 #define FEATURE_es2_glsl 0
 
-#define FEATURE_ARB_occlusion_query  _HAVE_FULL_GL
 #define FEATURE_ARB_fragment_program  _HAVE_FULL_GL
 #define FEATURE_ARB_framebuffer_object  _HAVE_FULL_GL
 #define FEATURE_ARB_map_buffer_range  _HAVE_FULL_GL
@@ -110,7 +110,6 @@
 #define FEATURE_EXT_framebuffer_object _HAVE_FULL_GL
 #define FEATURE_EXT_pixel_buffer_object  _HAVE_FULL_GL
 #define FEATURE_EXT_texture_sRGB _HAVE_FULL_GL
-#define FEATURE_EXT_timer_query  _HAVE_FULL_GL
 #define FEATURE_ATI_fragment_shader _HAVE_FULL_GL
 #define FEATURE_NV_fence  _HAVE_FULL_GL
 #define FEATURE_NV_fragment_program  _HAVE_FULL_GL
diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c
index a73c6e0508..3cadaba9f3 100644
--- a/src/mesa/main/queryobj.c
+++ b/src/mesa/main/queryobj.c
@@ -29,6 +29,10 @@
 #include "imports.h"
 #include "queryobj.h"
 #include "mtypes.h"
+#include "glapi/dispatch.h"
+
+
+#if FEATURE_queryobj
 
 
 /**
@@ -236,7 +240,6 @@ _mesa_BeginQueryARB(GLenum target, GLuint id)
             return;
          }
          break;
-#if FEATURE_EXT_timer_query
       case GL_TIME_ELAPSED_EXT:
          if (!ctx->Extensions.EXT_timer_query) {
             _mesa_error(ctx, GL_INVALID_ENUM, "glBeginQueryARB(target)");
@@ -247,7 +250,6 @@ _mesa_BeginQueryARB(GLenum target, GLuint id)
             return;
          }
          break;
-#endif
       default:
          _mesa_error(ctx, GL_INVALID_ENUM, "glBeginQueryARB(target)");
          return;
@@ -285,11 +287,9 @@ _mesa_BeginQueryARB(GLenum target, GLuint id)
    if (target == GL_SAMPLES_PASSED_ARB) {
       ctx->Query.CurrentOcclusionObject = q;
    }
-#if FEATURE_EXT_timer_query
    else if (target == GL_TIME_ELAPSED_EXT) {
       ctx->Query.CurrentTimerObject = q;
    }
-#endif
 
    ctx->Driver.BeginQuery(ctx, q);
 }
@@ -313,7 +313,6 @@ _mesa_EndQueryARB(GLenum target)
          q = ctx->Query.CurrentOcclusionObject;
          ctx->Query.CurrentOcclusionObject = NULL;
          break;
-#if FEATURE_EXT_timer_query
       case GL_TIME_ELAPSED_EXT:
          if (!ctx->Extensions.EXT_timer_query) {
             _mesa_error(ctx, GL_INVALID_ENUM, "glEndQueryARB(target)");
@@ -322,7 +321,6 @@ _mesa_EndQueryARB(GLenum target)
          q = ctx->Query.CurrentTimerObject;
          ctx->Query.CurrentTimerObject = NULL;
          break;
-#endif
       default:
          _mesa_error(ctx, GL_INVALID_ENUM, "glEndQueryARB(target)");
          return;
@@ -354,7 +352,6 @@ _mesa_GetQueryivARB(GLenum target, GLenum pname, GLint *params)
          }
          q = ctx->Query.CurrentOcclusionObject;
          break;
-#if FEATURE_EXT_timer_query
       case GL_TIME_ELAPSED_EXT:
          if (!ctx->Extensions.EXT_timer_query) {
             _mesa_error(ctx, GL_INVALID_ENUM, "glEndQueryARB(target)");
@@ -362,7 +359,6 @@ _mesa_GetQueryivARB(GLenum target, GLenum pname, GLint *params)
          }
          q = ctx->Query.CurrentTimerObject;
          break;
-#endif
       default:
          _mesa_error(ctx, GL_INVALID_ENUM, "glGetQueryivARB(target)");
          return;
@@ -462,8 +458,6 @@ _mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params)
 }
 
 
-#if FEATURE_EXT_timer_query
-
 /**
  * New with GL_EXT_timer_query
  */
@@ -537,19 +531,35 @@ _mesa_GetQueryObjectui64vEXT(GLuint id, GLenum pname, GLuint64EXT *params)
    }
 }
 
-#endif /* FEATURE_EXT_timer_query */
+
+void
+_mesa_init_queryobj_dispatch(struct _glapi_table *disp)
+{
+   SET_GenQueriesARB(disp, _mesa_GenQueriesARB);
+   SET_DeleteQueriesARB(disp, _mesa_DeleteQueriesARB);
+   SET_IsQueryARB(disp, _mesa_IsQueryARB);
+   SET_BeginQueryARB(disp, _mesa_BeginQueryARB);
+   SET_EndQueryARB(disp, _mesa_EndQueryARB);
+   SET_GetQueryivARB(disp, _mesa_GetQueryivARB);
+   SET_GetQueryObjectivARB(disp, _mesa_GetQueryObjectivARB);
+   SET_GetQueryObjectuivARB(disp, _mesa_GetQueryObjectuivARB);
+
+   SET_GetQueryObjecti64vEXT(disp, _mesa_GetQueryObjecti64vEXT);
+   SET_GetQueryObjectui64vEXT(disp, _mesa_GetQueryObjectui64vEXT);
+}
+
+
+#endif /* FEATURE_queryobj */
 
 
 /**
  * Allocate/init the context state related to query objects.
  */
 void
-_mesa_init_query(GLcontext *ctx)
+_mesa_init_queryobj(GLcontext *ctx)
 {
-#if FEATURE_ARB_occlusion_query
    ctx->Query.QueryObjects = _mesa_NewHashTable();
    ctx->Query.CurrentOcclusionObject = NULL;
-#endif
 }
 
 
@@ -569,7 +579,7 @@ delete_queryobj_cb(GLuint id, void *data, void *userData)
  * Free the context state related to query objects.
  */
 void
-_mesa_free_query_data(GLcontext *ctx)
+_mesa_free_queryobj_data(GLcontext *ctx)
 {
    _mesa_HashDeleteAll(ctx->Query.QueryObjects, delete_queryobj_cb, ctx);
    _mesa_DeleteHashTable(ctx->Query.QueryObjects);
diff --git a/src/mesa/main/queryobj.h b/src/mesa/main/queryobj.h
index ee775ef959..861e6ba566 100644
--- a/src/mesa/main/queryobj.h
+++ b/src/mesa/main/queryobj.h
@@ -23,19 +23,24 @@
  */
 
 
-#ifndef OCCLUDE_H
-#define OCCLUDE_H
+#ifndef QUERYOBJ_H
+#define QUERYOBJ_H
 
 
-extern void
-_mesa_init_query(GLcontext *ctx);
+#include "main/mtypes.h"
 
-extern void
-_mesa_free_query_data(GLcontext *ctx);
 
-extern void
-_mesa_init_query_object_functions(struct dd_function_table *driver);
+#if FEATURE_queryobj
 
+#define _MESA_INIT_QUERYOBJ_FUNCTIONS(driver, impl)      \
+   do {                                                  \
+      (driver)->NewQueryObject = impl ## NewQueryObject; \
+      (driver)->DeleteQuery    = impl ## DeleteQuery;    \
+      (driver)->BeginQuery     = impl ## BeginQuery;     \
+      (driver)->EndQuery       = impl ## EndQuery;       \
+      (driver)->WaitQuery      = impl ## WaitQuery;      \
+      (driver)->CheckQuery     = impl ## CheckQuery;     \
+   } while (0)
 
 extern void GLAPIENTRY
 _mesa_GenQueriesARB(GLsizei n, GLuint *ids);
@@ -67,5 +72,33 @@ _mesa_GetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64EXT *params);
 extern void GLAPIENTRY
 _mesa_GetQueryObjectui64vEXT(GLuint id, GLenum pname, GLuint64EXT *params);
 
+extern void
+_mesa_init_query_object_functions(struct dd_function_table *driver);
+
+extern void
+_mesa_init_queryobj_dispatch(struct _glapi_table *disp);
+
+#else /* FEATURE_queryobj */
+
+#define _MESA_INIT_QUERYOBJ_FUNCTIONS(driver, impl) do { } while (0)
+
+static INLINE void
+_mesa_init_query_object_functions(struct dd_function_table *driver)
+{
+}
+
+static INLINE void
+_mesa_init_queryobj_dispatch(struct _glapi_table *disp)
+{
+}
+
+#endif /* FEATURE_queryobj */
+
+extern void
+_mesa_init_queryobj(GLcontext *ctx);
+
+extern void
+_mesa_free_queryobj_data(GLcontext *ctx);
+
 
-#endif /* OCCLUDE_H */
+#endif /* QUERYOBJ_H */
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index 8514b6b375..96969c736c 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -332,7 +332,7 @@ void st_init_driver_functions(struct dd_function_table *functions)
    st_init_feedback_functions(functions);
 #endif
    st_init_program_functions(functions);
-#if FEATURE_ARB_occlusion_query
+#if FEATURE_queryobj
    st_init_query_functions(functions);
 #endif
    st_init_readpixels_functions(functions);
diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c
index a45eac438e..704230d1d7 100644
--- a/src/mesa/swrast/s_span.c
+++ b/src/mesa/swrast/s_span.c
@@ -904,7 +904,6 @@ _swrast_write_index_span( GLcontext *ctx, SWspan *span)
       }
    }
 
-#if FEATURE_ARB_occlusion_query
    if (ctx->Query.CurrentOcclusionObject) {
       /* update count of 'passed' fragments */
       struct gl_query_object *q = ctx->Query.CurrentOcclusionObject;
@@ -912,7 +911,6 @@ _swrast_write_index_span( GLcontext *ctx, SWspan *span)
       for (i = 0; i < span->end; i++)
          q->Result += span->array->mask[i];
    }
-#endif
 
    /* we have to wait until after occlusion to do this test */
    if (ctx->Color.IndexMask == 0) {
@@ -1376,7 +1374,6 @@ _swrast_write_rgba_span( GLcontext *ctx, SWspan *span)
       }
    }
 
-#if FEATURE_ARB_occlusion_query
    if (ctx->Query.CurrentOcclusionObject) {
       /* update count of 'passed' fragments */
       struct gl_query_object *q = ctx->Query.CurrentOcclusionObject;
@@ -1384,7 +1381,6 @@ _swrast_write_rgba_span( GLcontext *ctx, SWspan *span)
       for (i = 0; i < span->end; i++)
          q->Result += span->array->mask[i];
    }
-#endif
 
    /* We had to wait until now to check for glColorMask(0,0,0,0) because of
     * the occlusion test.
-- 
cgit v1.2.3


From 17f2649e269b9d98abd6a66f687ffa29904bf4a0 Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olvaffe@gmail.com>
Date: Tue, 8 Sep 2009 10:25:22 +0800
Subject: mesa/main: Make FEATURE_evaluators follow feature conventions.

As shown in mfeatures.h, this allows users of eval.h to work without
knowing if the feature is available.  It is renamed to FEATURE_eval
along the way.
---
 src/mesa/main/api_exec.c    | 18 +++--------------
 src/mesa/main/api_noop.c    | 18 ++++++-----------
 src/mesa/main/context.c     |  6 ------
 src/mesa/main/dlist.c       | 19 +++++++-----------
 src/mesa/main/eval.c        | 39 ++++++++++++++++++++++++++++++++++++
 src/mesa/main/eval.h        | 49 +++++++++++++++++++++++++++++++++++----------
 src/mesa/main/mfeatures.h   |  2 +-
 src/mesa/main/vtxfmt.c      | 13 ++++--------
 src/mesa/vbo/vbo_exec_api.c | 17 ++++++++--------
 src/mesa/vbo/vbo_save_api.c | 11 +++-------
 10 files changed, 109 insertions(+), 83 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index 3fe10f1207..fc4de3c14c 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -60,9 +60,7 @@
 #include "drawpix.h"
 #include "rastpos.h"
 #include "enable.h"
-#if FEATURE_evaluators
 #include "eval.h"
-#endif
 #include "get.h"
 #include "feedback.h"
 #include "fog.h"
@@ -238,19 +236,9 @@ _mesa_init_exec_table(struct _glapi_table *exec)
    SET_Lighti(exec, _mesa_Lighti);
    SET_Lightiv(exec, _mesa_Lightiv);
    SET_LoadMatrixd(exec, _mesa_LoadMatrixd);
-#if FEATURE_evaluators
-   SET_GetMapdv(exec, _mesa_GetMapdv);
-   SET_GetMapfv(exec, _mesa_GetMapfv);
-   SET_GetMapiv(exec, _mesa_GetMapiv);
-   SET_Map1d(exec, _mesa_Map1d);
-   SET_Map1f(exec, _mesa_Map1f);
-   SET_Map2d(exec, _mesa_Map2d);
-   SET_Map2f(exec, _mesa_Map2f);
-   SET_MapGrid1d(exec, _mesa_MapGrid1d);
-   SET_MapGrid1f(exec, _mesa_MapGrid1f);
-   SET_MapGrid2d(exec, _mesa_MapGrid2d);
-   SET_MapGrid2f(exec, _mesa_MapGrid2f);
-#endif
+
+   _mesa_init_eval_dispatch(exec);
+
    SET_MultMatrixd(exec, _mesa_MultMatrixd);
 
    _mesa_init_pixel_dispatch(exec);
diff --git a/src/mesa/main/api_noop.c b/src/mesa/main/api_noop.c
index 162b685b02..f9ec69b511 100644
--- a/src/mesa/main/api_noop.c
+++ b/src/mesa/main/api_noop.c
@@ -33,6 +33,7 @@
 #if FEATURE_dlist
 #include "dlist.h"
 #endif
+#include "eval.h"
 #include "glapi/dispatch.h"
 
 
@@ -624,7 +625,7 @@ static void GLAPIENTRY _mesa_noop_Vertex4f( GLfloat a, GLfloat b, GLfloat c, GLf
 }
 
 
-#if FEATURE_evaluators
+#if FEATURE_eval
 /* Similarly, these have no effect outside begin/end:
  */
 static void GLAPIENTRY _mesa_noop_EvalCoord1f( GLfloat a )
@@ -656,7 +657,7 @@ static void GLAPIENTRY _mesa_noop_EvalPoint2( GLint a, GLint b )
 {
    (void) a; (void) b;
 }
-#endif /* FEATURE_evaluators */
+#endif /* FEATURE_eval */
 
 
 /* Begin -- call into driver, should result in the vtxfmt being
@@ -1005,14 +1006,9 @@ _mesa_noop_vtxfmt_init( GLvertexformat *vfmt )
    vfmt->Color4fv = _mesa_noop_Color4fv;
    vfmt->EdgeFlag = _mesa_noop_EdgeFlag;
    vfmt->End = _mesa_noop_End;
-#if FEATURE_evaluators
-   vfmt->EvalCoord1f = _mesa_noop_EvalCoord1f;
-   vfmt->EvalCoord1fv = _mesa_noop_EvalCoord1fv;
-   vfmt->EvalCoord2f = _mesa_noop_EvalCoord2f;
-   vfmt->EvalCoord2fv = _mesa_noop_EvalCoord2fv;
-   vfmt->EvalPoint1 = _mesa_noop_EvalPoint1;
-   vfmt->EvalPoint2 = _mesa_noop_EvalPoint2;
-#endif
+
+   _MESA_INIT_EVAL_VTXFMT(vfmt, _mesa_noop_);
+
    vfmt->FogCoordfEXT = _mesa_noop_FogCoordfEXT;
    vfmt->FogCoordfvEXT = _mesa_noop_FogCoordfvEXT;
    vfmt->Indexf = _mesa_noop_Indexf;
@@ -1070,6 +1066,4 @@ _mesa_noop_vtxfmt_init( GLvertexformat *vfmt )
    vfmt->DrawElementsBaseVertex = _mesa_noop_DrawElementsBaseVertex;
    vfmt->DrawRangeElementsBaseVertex = _mesa_noop_DrawRangeElementsBaseVertex;
    vfmt->MultiDrawElementsBaseVertex = _mesa_noop_MultiDrawElementsBaseVertex;
-   vfmt->EvalMesh1 = _mesa_noop_EvalMesh1;
-   vfmt->EvalMesh2 = _mesa_noop_EvalMesh2;
 }
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 6994f98504..03ee7fb04d 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -94,9 +94,7 @@
 #if FEATURE_dlist
 #include "dlist.h"
 #endif
-#if FEATURE_evaluators
 #include "eval.h"
-#endif
 #include "enums.h"
 #include "extensions.h"
 #include "fbobject.h"
@@ -675,9 +673,7 @@ init_attrib_groups(GLcontext *ctx)
 #if FEATURE_dlist
    _mesa_init_display_list( ctx );
 #endif
-#if FEATURE_evaluators
    _mesa_init_eval( ctx );
-#endif
    _mesa_init_fbobjects( ctx );
    _mesa_init_feedback( ctx );
    _mesa_init_fog( ctx );
@@ -977,9 +973,7 @@ _mesa_free_context_data( GLcontext *ctx )
 
    _mesa_free_attrib_data(ctx);
    _mesa_free_lighting_data( ctx );
-#if FEATURE_evaluators
    _mesa_free_eval_data( ctx );
-#endif
    _mesa_free_texture_data( ctx );
    _mesa_free_matrix_data( ctx );
    _mesa_free_viewport_data( ctx );
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 25a2819783..b0dcfe9055 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -1824,7 +1824,7 @@ save_Enable(GLenum cap)
 
 
 static void GLAPIENTRY
-_mesa_save_EvalMesh1(GLenum mode, GLint i1, GLint i2)
+save_EvalMesh1(GLenum mode, GLint i1, GLint i2)
 {
    GET_CURRENT_CONTEXT(ctx);
    Node *n;
@@ -1842,7 +1842,7 @@ _mesa_save_EvalMesh1(GLenum mode, GLint i1, GLint i2)
 
 
 static void GLAPIENTRY
-_mesa_save_EvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2)
+save_EvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2)
 {
    GET_CURRENT_CONTEXT(ctx);
    Node *n;
@@ -7820,8 +7820,8 @@ _mesa_init_dlist_table(struct _glapi_table *table)
    SET_DrawPixels(table, save_DrawPixels);
    SET_Enable(table, save_Enable);
    SET_EndList(table, _mesa_EndList);
-   SET_EvalMesh1(table, _mesa_save_EvalMesh1);
-   SET_EvalMesh2(table, _mesa_save_EvalMesh2);
+   SET_EvalMesh1(table, save_EvalMesh1);
+   SET_EvalMesh2(table, save_EvalMesh2);
    SET_Finish(table, exec_Finish);
    SET_Flush(table, exec_Flush);
    SET_Fogf(table, save_Fogf);
@@ -8643,12 +8643,9 @@ _mesa_save_vtxfmt_init(GLvertexformat * vfmt)
    vfmt->Color4fv = save_Color4fv;
    vfmt->EdgeFlag = save_EdgeFlag;
    vfmt->End = save_End;
-   vfmt->EvalCoord1f = save_EvalCoord1f;
-   vfmt->EvalCoord1fv = save_EvalCoord1fv;
-   vfmt->EvalCoord2f = save_EvalCoord2f;
-   vfmt->EvalCoord2fv = save_EvalCoord2fv;
-   vfmt->EvalPoint1 = save_EvalPoint1;
-   vfmt->EvalPoint2 = save_EvalPoint2;
+
+   _MESA_INIT_EVAL_VTXFMT(vfmt, save_);
+
    vfmt->FogCoordfEXT = save_FogCoordfEXT;
    vfmt->FogCoordfvEXT = save_FogCoordfvEXT;
    vfmt->Indexf = save_Indexf;
@@ -8697,8 +8694,6 @@ _mesa_save_vtxfmt_init(GLvertexformat * vfmt)
    vfmt->VertexAttrib4fARB = save_VertexAttrib4fARB;
    vfmt->VertexAttrib4fvARB = save_VertexAttrib4fvARB;
 
-   vfmt->EvalMesh1 = _mesa_save_EvalMesh1;
-   vfmt->EvalMesh2 = _mesa_save_EvalMesh2;
    vfmt->Rectf = save_Rectf;
 
    /* The driver is required to implement these as
diff --git a/src/mesa/main/eval.c b/src/mesa/main/eval.c
index 3f89f9c1ea..47f99270ce 100644
--- a/src/mesa/main/eval.c
+++ b/src/mesa/main/eval.c
@@ -44,6 +44,10 @@
 #include "eval.h"
 #include "macros.h"
 #include "mtypes.h"
+#include "glapi/dispatch.h"
+
+
+#if FEATURE_eval
 
 
 /*
@@ -797,6 +801,41 @@ _mesa_MapGrid2d( GLint un, GLdouble u1, GLdouble u2,
 }
 
 
+void 
+_mesa_install_eval_vtxfmt(struct _glapi_table *disp,
+                          const GLvertexformat *vfmt)
+{
+   SET_EvalCoord1f(disp, vfmt->EvalCoord1f);
+   SET_EvalCoord1fv(disp, vfmt->EvalCoord1fv);
+   SET_EvalCoord2f(disp, vfmt->EvalCoord2f);
+   SET_EvalCoord2fv(disp, vfmt->EvalCoord2fv);
+   SET_EvalPoint1(disp, vfmt->EvalPoint1);
+   SET_EvalPoint2(disp, vfmt->EvalPoint2);
+
+   SET_EvalMesh1(disp, vfmt->EvalMesh1);
+   SET_EvalMesh2(disp, vfmt->EvalMesh2);
+}
+
+
+void 
+_mesa_init_eval_dispatch(struct _glapi_table *disp)
+{
+   SET_GetMapdv(disp, _mesa_GetMapdv);
+   SET_GetMapfv(disp, _mesa_GetMapfv);
+   SET_GetMapiv(disp, _mesa_GetMapiv);
+   SET_Map1d(disp, _mesa_Map1d);
+   SET_Map1f(disp, _mesa_Map1f);
+   SET_Map2d(disp, _mesa_Map2d);
+   SET_Map2f(disp, _mesa_Map2f);
+   SET_MapGrid1d(disp, _mesa_MapGrid1d);
+   SET_MapGrid1f(disp, _mesa_MapGrid1f);
+   SET_MapGrid2d(disp, _mesa_MapGrid2d);
+   SET_MapGrid2f(disp, _mesa_MapGrid2f);
+}
+
+
+#endif /* FEATURE_eval */
+
 
 /**********************************************************************/
 /*****                      Initialization                        *****/
diff --git a/src/mesa/main/eval.h b/src/mesa/main/eval.h
index b3ff0a96f8..49fd37a057 100644
--- a/src/mesa/main/eval.h
+++ b/src/mesa/main/eval.h
@@ -37,13 +37,22 @@
 #define EVAL_H
 
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 
-#if _HAVE_FULL_GL
 
-extern void _mesa_init_eval( GLcontext *ctx );
-extern void _mesa_free_eval_data( GLcontext *ctx );
+#if FEATURE_eval
 
+#define _MESA_INIT_EVAL_VTXFMT(vfmt, impl)         \
+   do {                                            \
+      (vfmt)->EvalCoord1f  = impl ## EvalCoord1f;  \
+      (vfmt)->EvalCoord1fv = impl ## EvalCoord1fv; \
+      (vfmt)->EvalCoord2f  = impl ## EvalCoord2f;  \
+      (vfmt)->EvalCoord2fv = impl ## EvalCoord2fv; \
+      (vfmt)->EvalPoint1   = impl ## EvalPoint1;   \
+      (vfmt)->EvalPoint2   = impl ## EvalPoint2;   \
+      (vfmt)->EvalMesh1    = impl ## EvalMesh1;    \
+      (vfmt)->EvalMesh2    = impl ## EvalMesh2;    \
+   } while (0)
 
 extern GLuint _mesa_evaluator_components( GLenum target );
 
@@ -115,14 +124,32 @@ _mesa_GetMapfv( GLenum target, GLenum query, GLfloat *v );
 extern void GLAPIENTRY
 _mesa_GetMapiv( GLenum target, GLenum query, GLint *v );
 
-#else
+extern void 
+_mesa_install_eval_vtxfmt(struct _glapi_table *disp,
+                          const GLvertexformat *vfmt);
+
+extern void 
+_mesa_init_eval_dispatch(struct _glapi_table *disp);
+
+#else /* FEATURE_eval */
+
+#define _MESA_INIT_EVAL_VTXFMT(vfmt, impl) do { } while (0)
 
-/** No-op */
-#define _mesa_init_eval( c ) ((void)0)
+static INLINE void 
+_mesa_install_eval_vtxfmt(struct _glapi_table *disp,
+                          const GLvertexformat *vfmt)
+{
+}
 
-/** No-op */
-#define _mesa_free_eval_data( c ) ((void)0)
+static INLINE void 
+_mesa_init_eval_dispatch(struct _glapi_table *disp)
+{
+}
+
+#endif /* FEATURE_eval */
+
+extern void _mesa_init_eval( GLcontext *ctx );
+extern void _mesa_free_eval_data( GLcontext *ctx );
 
-#endif
 
-#endif
+#endif /* EVAL_H */
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index cd39f5bd24..a89b760774 100644
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -78,7 +78,7 @@
 #define FEATURE_dlist  (_HAVE_FULL_GL && FEATURE_arrayelt)
 #define FEATURE_draw_read_buffer  _HAVE_FULL_GL
 #define FEATURE_drawpix  _HAVE_FULL_GL
-#define FEATURE_evaluators  _HAVE_FULL_GL
+#define FEATURE_eval  _HAVE_FULL_GL
 #define FEATURE_feedback  _HAVE_FULL_GL
 #define FEATURE_fixedpt 0
 #define FEATURE_histogram  _HAVE_FULL_GL
diff --git a/src/mesa/main/vtxfmt.c b/src/mesa/main/vtxfmt.c
index de9479d6b0..c35e4dabe3 100644
--- a/src/mesa/main/vtxfmt.c
+++ b/src/mesa/main/vtxfmt.c
@@ -34,6 +34,7 @@
 #include "mtypes.h"
 #include "state.h"
 #include "vtxfmt.h"
+#include "eval.h"
 
 
 /* The neutral vertex format.  This wraps all tnl module functions,
@@ -90,12 +91,9 @@ install_vtxfmt( struct _glapi_table *tab, const GLvertexformat *vfmt )
    SET_Color4f(tab, vfmt->Color4f);
    SET_Color4fv(tab, vfmt->Color4fv);
    SET_EdgeFlag(tab, vfmt->EdgeFlag);
-   SET_EvalCoord1f(tab, vfmt->EvalCoord1f);
-   SET_EvalCoord1fv(tab, vfmt->EvalCoord1fv);
-   SET_EvalCoord2f(tab, vfmt->EvalCoord2f);
-   SET_EvalCoord2fv(tab, vfmt->EvalCoord2fv);
-   SET_EvalPoint1(tab, vfmt->EvalPoint1);
-   SET_EvalPoint2(tab, vfmt->EvalPoint2);
+
+   _mesa_install_eval_vtxfmt(tab, vfmt);
+
    SET_FogCoordfEXT(tab, vfmt->FogCoordfEXT);
    SET_FogCoordfvEXT(tab, vfmt->FogCoordfvEXT);
    SET_Indexf(tab, vfmt->Indexf);
@@ -139,9 +137,6 @@ install_vtxfmt( struct _glapi_table *tab, const GLvertexformat *vfmt )
    SET_DrawElementsBaseVertex(tab, vfmt->DrawElementsBaseVertex);
    SET_DrawRangeElementsBaseVertex(tab, vfmt->DrawRangeElementsBaseVertex);
    SET_MultiDrawElementsBaseVertex(tab, vfmt->MultiDrawElementsBaseVertex);
-   SET_EvalMesh1(tab, vfmt->EvalMesh1);
-   SET_EvalMesh2(tab, vfmt->EvalMesh2);
-   ASSERT(tab->EvalMesh2);
 
    /* GL_NV_vertex_program */
    SET_VertexAttrib1fNV(tab, vfmt->VertexAttrib1fNV);
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c
index 238beee030..27baebe3a7 100644
--- a/src/mesa/vbo/vbo_exec_api.c
+++ b/src/mesa/vbo/vbo_exec_api.c
@@ -38,6 +38,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #if FEATURE_dlist
 #include "main/dlist.h"
 #endif
+#include "main/eval.h"
 #include "main/state.h"
 #include "main/light.h"
 #include "main/api_arrayelt.h"
@@ -392,6 +393,7 @@ do {								\
 
 
 
+#if FEATURE_eval
 /* Eval
  */
 static void GLAPIENTRY vbo_exec_EvalCoord1f( GLfloat u )
@@ -484,6 +486,7 @@ static void GLAPIENTRY vbo_exec_EvalPoint2( GLint i, GLint j )
 
    vbo_exec_EvalCoord2f( u, v );
 }
+#endif /* FEATURE_eval */
 
 
 /* Build a list of primitives on the fly.  Keep
@@ -565,17 +568,13 @@ static void vbo_exec_vtxfmt_init( struct vbo_exec_context *exec )
    vfmt->CallLists = _mesa_CallLists;
 #endif
    vfmt->End = vbo_exec_End;
-   vfmt->EvalCoord1f = vbo_exec_EvalCoord1f;
-   vfmt->EvalCoord1fv = vbo_exec_EvalCoord1fv;
-   vfmt->EvalCoord2f = vbo_exec_EvalCoord2f;
-   vfmt->EvalCoord2fv = vbo_exec_EvalCoord2fv;
-   vfmt->EvalPoint1 = vbo_exec_EvalPoint1;
-   vfmt->EvalPoint2 = vbo_exec_EvalPoint2;
 
-   vfmt->Rectf = _mesa_noop_Rectf;
-   vfmt->EvalMesh1 = _mesa_noop_EvalMesh1;
-   vfmt->EvalMesh2 = _mesa_noop_EvalMesh2;
+   /* use noop eval mesh */
+#define vbo_exec_EvalMesh1 _mesa_noop_EvalMesh1
+#define vbo_exec_EvalMesh2 _mesa_noop_EvalMesh2
+   _MESA_INIT_EVAL_VTXFMT(vfmt, vbo_exec_);
 
+   vfmt->Rectf = _mesa_noop_Rectf;
 
    /* from attrib_tmp.h:
     */
diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c
index 6e11344380..611460dc7b 100644
--- a/src/mesa/vbo/vbo_save_api.c
+++ b/src/mesa/vbo/vbo_save_api.c
@@ -72,6 +72,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "main/context.h"
 #include "main/dlist.h"
 #include "main/enums.h"
+#include "main/eval.h"
 #include "main/macros.h"
 #include "main/api_noop.h"
 #include "main/api_validate.h"
@@ -1050,18 +1051,12 @@ static void _save_vtxfmt_init( GLcontext *ctx )
     */ 
    vfmt->CallList = _save_CallList; /* inside begin/end */
    vfmt->CallLists = _save_CallLists; /* inside begin/end */
-   vfmt->EvalCoord1f = _save_EvalCoord1f;
-   vfmt->EvalCoord1fv = _save_EvalCoord1fv;
-   vfmt->EvalCoord2f = _save_EvalCoord2f;
-   vfmt->EvalCoord2fv = _save_EvalCoord2fv;
-   vfmt->EvalPoint1 = _save_EvalPoint1;
-   vfmt->EvalPoint2 = _save_EvalPoint2;
+
+   _MESA_INIT_EVAL_VTXFMT(vfmt, _save_);
 
    /* These are all errors as we at least know we are in some sort of
     * begin/end pair:
     */
-   vfmt->EvalMesh1 = _save_EvalMesh1;	
-   vfmt->EvalMesh2 = _save_EvalMesh2;
    vfmt->Begin = _save_Begin;
    vfmt->Rectf = _save_Rectf;
    vfmt->DrawArrays = _save_DrawArrays;
-- 
cgit v1.2.3


From 1c497bd4c652de95deaaed0c704c3b776b69aded Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olvaffe@gmail.com>
Date: Wed, 9 Sep 2009 15:00:08 +0800
Subject: mesa/main: Make FEATURE_dlist follow feature conventions.

As shown in mfeatures.h, this allows users of dlist.h to work without
knowing if the feature is available.
---
 src/mesa/main/api_exec.c    | 13 +--------
 src/mesa/main/api_noop.c    |  9 ++----
 src/mesa/main/context.c     | 10 ++-----
 src/mesa/main/dlist.c       | 40 +++++++++++++++++++++++--
 src/mesa/main/dlist.h       | 71 +++++++++++++++++++++++++++++++++------------
 src/mesa/main/shared.c      |  4 ---
 src/mesa/main/vtxfmt.c      |  9 ++++--
 src/mesa/vbo/vbo_exec_api.c |  8 ++---
 src/mesa/vbo/vbo_save_api.c |  3 +-
 9 files changed, 107 insertions(+), 60 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index fc4de3c14c..1559984f43 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -54,9 +54,7 @@
 #include "context.h"
 #include "convolve.h"
 #include "depth.h"
-#if FEATURE_dlist
 #include "dlist.h"
-#endif
 #include "drawpix.h"
 #include "rastpos.h"
 #include "enable.h"
@@ -179,17 +177,8 @@ _mesa_init_exec_table(struct _glapi_table *exec)
    SET_Viewport(exec, _mesa_Viewport);
 
    _mesa_init_accum_dispatch(exec);
+   _mesa_init_dlist_dispatch(exec);
 
-#if FEATURE_dlist
-   SET_CallList(exec, _mesa_CallList);
-   SET_CallLists(exec, _mesa_CallLists);
-   SET_DeleteLists(exec, _mesa_DeleteLists);
-   SET_EndList(exec, _mesa_EndList);
-   SET_GenLists(exec, _mesa_GenLists);
-   SET_IsList(exec, _mesa_IsList);
-   SET_ListBase(exec, _mesa_ListBase);
-   SET_NewList(exec, _mesa_NewList);
-#endif
    SET_ClearDepth(exec, _mesa_ClearDepth);
    SET_ClearIndex(exec, _mesa_ClearIndex);
    SET_ClipPlane(exec, _mesa_ClipPlane);
diff --git a/src/mesa/main/api_noop.c b/src/mesa/main/api_noop.c
index f9ec69b511..a30c47da77 100644
--- a/src/mesa/main/api_noop.c
+++ b/src/mesa/main/api_noop.c
@@ -30,9 +30,7 @@
 #include "context.h"
 #include "light.h"
 #include "macros.h"
-#if FEATURE_dlist
 #include "dlist.h"
-#endif
 #include "eval.h"
 #include "glapi/dispatch.h"
 
@@ -996,10 +994,9 @@ _mesa_noop_vtxfmt_init( GLvertexformat *vfmt )
    _MESA_INIT_ARRAYELT_VTXFMT(vfmt, _ae_);
 
    vfmt->Begin = _mesa_noop_Begin;
-#if FEATURE_dlist
-   vfmt->CallList = _mesa_CallList;
-   vfmt->CallLists = _mesa_CallLists;
-#endif
+
+   _MESA_INIT_DLIST_VTXFMT(vfmt, _mesa_);
+
    vfmt->Color3f = _mesa_noop_Color3f;
    vfmt->Color3fv = _mesa_noop_Color3fv;
    vfmt->Color4f = _mesa_noop_Color4f;
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 03ee7fb04d..2869a722ec 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -91,9 +91,7 @@
 #include "cpuinfo.h"
 #include "debug.h"
 #include "depth.h"
-#if FEATURE_dlist
 #include "dlist.h"
-#endif
 #include "eval.h"
 #include "enums.h"
 #include "extensions.h"
@@ -670,9 +668,7 @@ init_attrib_groups(GLcontext *ctx)
    _mesa_init_current( ctx );
    _mesa_init_depth( ctx );
    _mesa_init_debug( ctx );
-#if FEATURE_dlist
    _mesa_init_display_list( ctx );
-#endif
    _mesa_init_eval( ctx );
    _mesa_init_fbobjects( ctx );
    _mesa_init_feedback( ctx );
@@ -869,10 +865,10 @@ _mesa_initialize_context(GLcontext *ctx,
    _mesa_init_exec_table(ctx->Exec);
 #endif
    ctx->CurrentDispatch = ctx->Exec;
-#if FEATURE_dlist
-   _mesa_init_dlist_table(ctx->Save);
+
+   _mesa_init_save_table(ctx->Save);
    _mesa_install_save_vtxfmt( ctx, &ctx->ListState.ListVtxfmt );
-#endif
+
    /* Neutral tnl module stuff */
    _mesa_init_exec_vtxfmt( ctx ); 
    ctx->TnlModule.Current = NULL;
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index b0dcfe9055..f793b60284 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -73,6 +73,7 @@
 #include "texstate.h"
 #include "mtypes.h"
 #include "varray.h"
+#include "vtxfmt.h"
 #if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
 #include "shader/arbprogram.h"
 #include "shader/program.h"
@@ -410,6 +411,10 @@ typedef union gl_dlist_node Node;
  */
 static GLuint InstSize[OPCODE_END_OF_LIST + 1];
 
+
+#if FEATURE_dlist
+
+
 void mesa_print_display_list(GLuint list);
 
 
@@ -7789,7 +7794,7 @@ exec_MultiModeDrawElementsIBM(const GLenum * mode,
  * struct.
  */
 void
-_mesa_init_dlist_table(struct _glapi_table *table)
+_mesa_init_save_table(struct _glapi_table *table)
 {
    _mesa_loopback_init_api_table(table);
 
@@ -8635,8 +8640,9 @@ _mesa_save_vtxfmt_init(GLvertexformat * vfmt)
    _MESA_INIT_ARRAYELT_VTXFMT(vfmt, _ae_);
 
    vfmt->Begin = save_Begin;
-   vfmt->CallList = _mesa_save_CallList;
-   vfmt->CallLists = _mesa_save_CallLists;
+
+   _MESA_INIT_DLIST_VTXFMT(vfmt, _mesa_save_);
+
    vfmt->Color3f = save_Color3f;
    vfmt->Color3fv = save_Color3fv;
    vfmt->Color4f = save_Color4f;
@@ -8714,6 +8720,32 @@ _mesa_save_vtxfmt_init(GLvertexformat * vfmt)
 }
 
 
+void
+_mesa_install_dlist_vtxfmt(struct _glapi_table *disp,
+                           const GLvertexformat *vfmt)
+{
+   SET_CallList(disp, vfmt->CallList);
+   SET_CallLists(disp, vfmt->CallLists);
+}
+
+
+void _mesa_init_dlist_dispatch(struct _glapi_table *disp)
+{
+   SET_CallList(disp, _mesa_CallList);
+   SET_CallLists(disp, _mesa_CallLists);
+
+   SET_DeleteLists(disp, _mesa_DeleteLists);
+   SET_EndList(disp, _mesa_EndList);
+   SET_GenLists(disp, _mesa_GenLists);
+   SET_IsList(disp, _mesa_IsList);
+   SET_ListBase(disp, _mesa_ListBase);
+   SET_NewList(disp, _mesa_NewList);
+}
+
+
+#endif /* FEATURE_dlist */
+
+
 /**
  * Initialize display list state for given context.
  */
@@ -8738,5 +8770,7 @@ _mesa_init_display_list(GLcontext *ctx)
    /* Display List group */
    ctx->List.ListBase = 0;
 
+#if FEATURE_dlist
    _mesa_save_vtxfmt_init(&ctx->ListState.ListVtxfmt);
+#endif
 }
diff --git a/src/mesa/main/dlist.h b/src/mesa/main/dlist.h
index ab7ec2c8db..6e1059eac2 100644
--- a/src/mesa/main/dlist.h
+++ b/src/mesa/main/dlist.h
@@ -33,13 +33,26 @@
 #define DLIST_H
 
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 
-#if _HAVE_FULL_GL
+#if FEATURE_dlist
 
-extern void
-_mesa_delete_list(GLcontext *ctx, struct gl_display_list *dlist);
+#define _MESA_INIT_DLIST_FUNCTIONS(driver, impl)               \
+   do {                                                        \
+      (driver)->NewList           = impl ## NewList;           \
+      (driver)->EndList           = impl ## EndList;           \
+      (driver)->BeginCallList     = impl ## BeginCallList;     \
+      (driver)->EndCallList       = impl ## EndCallList;       \
+      (driver)->SaveFlushVertices = impl ## SaveFlushVertices; \
+      (driver)->NotifySaveBegin   = impl ## NotifyBegin;       \
+   } while (0)
+
+#define _MESA_INIT_DLIST_VTXFMT(vfmt, impl)  \
+   do {                                      \
+      (vfmt)->CallList  = impl ## CallList;  \
+      (vfmt)->CallLists = impl ## CallLists; \
+   } while (0)
 
 extern void GLAPIENTRY _mesa_CallList( GLuint list );
 
@@ -62,12 +75,8 @@ extern void GLAPIENTRY _mesa_save_CallLists( GLsizei n, GLenum type, const GLvoi
 extern void GLAPIENTRY _mesa_save_CallList( GLuint list );
 
 
-
-extern void _mesa_init_dlist_table( struct _glapi_table *table );
-
 extern void _mesa_compile_error( GLcontext *ctx, GLenum error, const char *s );
 
-
 extern void *_mesa_alloc_instruction(GLcontext *ctx, GLuint opcode, GLuint sz);
 
 extern GLint _mesa_alloc_opcode( GLcontext *ctx, GLuint sz,
@@ -75,22 +84,48 @@ extern GLint _mesa_alloc_opcode( GLcontext *ctx, GLuint sz,
                                  void (*destroy)( GLcontext *, void * ),
                                  void (*print)( GLcontext *, void * ) );
 
-extern void _mesa_init_display_list( GLcontext * ctx );
+extern void _mesa_delete_list(GLcontext *ctx, struct gl_display_list *dlist);
 
 extern void _mesa_save_vtxfmt_init( GLvertexformat *vfmt );
 
+extern void _mesa_init_save_table( struct _glapi_table *table );
+
+extern void _mesa_install_dlist_vtxfmt(struct _glapi_table *disp,
+                                       const GLvertexformat *vfmt);
 
-#else
+extern void _mesa_init_dlist_dispatch(struct _glapi_table *disp);
 
-/** No-op */
-#define _mesa_init_dlist_table(t,ts) ((void)0)
+#else /* FEATURE_dlist */
 
-/** No-op */
-#define _mesa_init_display_list(c) ((void)0)
+#define _MESA_INIT_DLIST_FUNCTIONS(driver, impl) do { } while (0)
+#define _MESA_INIT_DLIST_VTXFMT(vfmt, impl) do { } while (0)
 
-/** No-op */
-#define _mesa_save_vtxfmt_init(v) ((void)0)
+static INLINE void
+_mesa_delete_list(GLcontext *ctx, struct gl_display_list *dlist)
+{
+   /* there should be no list to delete */
+   ASSERT_NO_FEATURE();
+}
+
+static INLINE void
+_mesa_init_save_table(struct _glapi_table *disp)
+{
+}
+
+static INLINE void
+_mesa_install_dlist_vtxfmt(struct _glapi_table *disp,
+                           const GLvertexformat *vfmt)
+{
+}
+
+static INLINE void 
+_mesa_init_dlist_dispatch(struct _glapi_table *disp)
+{
+}
+
+#endif /* FEATURE_dlist */
+
+extern void _mesa_init_display_list( GLcontext * ctx );
 
-#endif
 
-#endif
+#endif /* DLIST_H */
diff --git a/src/mesa/main/shared.c b/src/mesa/main/shared.c
index 643ad3354e..4d01e8abc6 100644
--- a/src/mesa/main/shared.c
+++ b/src/mesa/main/shared.c
@@ -37,9 +37,7 @@
 #include "shared.h"
 #include "shader/program.h"
 #include "shader/shader_api.h"
-#if FEATURE_dlist
 #include "dlist.h"
-#endif
 #if FEATURE_ATI_fragment_shader
 #include "shader/atifragshader.h"
 #endif
@@ -143,11 +141,9 @@ _mesa_alloc_shared_state(GLcontext *ctx)
 static void
 delete_displaylist_cb(GLuint id, void *data, void *userData)
 {
-#if FEATURE_dlist
    struct gl_display_list *list = (struct gl_display_list *) data;
    GLcontext *ctx = (GLcontext *) userData;
    _mesa_delete_list(ctx, list);
-#endif
 }
 
 
diff --git a/src/mesa/main/vtxfmt.c b/src/mesa/main/vtxfmt.c
index c35e4dabe3..8ba1af6de1 100644
--- a/src/mesa/main/vtxfmt.c
+++ b/src/mesa/main/vtxfmt.c
@@ -35,6 +35,7 @@
 #include "state.h"
 #include "vtxfmt.h"
 #include "eval.h"
+#include "dlist.h"
 
 
 /* The neutral vertex format.  This wraps all tnl module functions,
@@ -125,8 +126,9 @@ install_vtxfmt( struct _glapi_table *tab, const GLvertexformat *vfmt )
    SET_Vertex3fv(tab, vfmt->Vertex3fv);
    SET_Vertex4f(tab, vfmt->Vertex4f);
    SET_Vertex4fv(tab, vfmt->Vertex4fv);
-   SET_CallList(tab, vfmt->CallList);
-   SET_CallLists(tab, vfmt->CallLists);
+
+   _mesa_install_dlist_vtxfmt(tab, vfmt);
+
    SET_Begin(tab, vfmt->Begin);
    SET_End(tab, vfmt->End);
    SET_Rectf(tab, vfmt->Rectf);
@@ -176,7 +178,10 @@ void _mesa_install_exec_vtxfmt( GLcontext *ctx, const GLvertexformat *vfmt )
 
 void _mesa_install_save_vtxfmt( GLcontext *ctx, const GLvertexformat *vfmt )
 {
+   /* vfmt is empty when dlist is disabled */
+#if FEATURE_dlist
    install_vtxfmt( ctx->Save, vfmt );
+#endif
 }
 
 
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c
index 27baebe3a7..a81bd39eb1 100644
--- a/src/mesa/vbo/vbo_exec_api.c
+++ b/src/mesa/vbo/vbo_exec_api.c
@@ -35,9 +35,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "main/context.h"
 #include "main/macros.h"
 #include "main/vtxfmt.h"
-#if FEATURE_dlist
 #include "main/dlist.h"
-#endif
 #include "main/eval.h"
 #include "main/state.h"
 #include "main/light.h"
@@ -563,12 +561,10 @@ static void vbo_exec_vtxfmt_init( struct vbo_exec_context *exec )
    _MESA_INIT_ARRAYELT_VTXFMT(vfmt, _ae_);
 
    vfmt->Begin = vbo_exec_Begin;
-#if FEATURE_dlist
-   vfmt->CallList = _mesa_CallList;
-   vfmt->CallLists = _mesa_CallLists;
-#endif
    vfmt->End = vbo_exec_End;
 
+   _MESA_INIT_DLIST_VTXFMT(vfmt, _mesa_);
+
    /* use noop eval mesh */
 #define vbo_exec_EvalMesh1 _mesa_noop_EvalMesh1
 #define vbo_exec_EvalMesh2 _mesa_noop_EvalMesh2
diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c
index 611460dc7b..4da248e2b8 100644
--- a/src/mesa/vbo/vbo_save_api.c
+++ b/src/mesa/vbo/vbo_save_api.c
@@ -1049,8 +1049,7 @@ static void _save_vtxfmt_init( GLcontext *ctx )
    
    /* This will all require us to fallback to saving the list as opcodes:
     */ 
-   vfmt->CallList = _save_CallList; /* inside begin/end */
-   vfmt->CallLists = _save_CallLists; /* inside begin/end */
+   _MESA_INIT_DLIST_VTXFMT(vfmt, _save_); /* inside begin/end */
 
    _MESA_INIT_EVAL_VTXFMT(vfmt, _save_);
 
-- 
cgit v1.2.3


From b7c133b5c23ee02fecebc70717d02dc27b157786 Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olvaffe@gmail.com>
Date: Wed, 9 Sep 2009 11:54:10 +0800
Subject: mesa/main: Export null texformat operations.

---
 src/mesa/main/texformat.c | 27 ++++++++++++---------------
 src/mesa/main/texformat.h | 25 +++++++++++++++++++++++++
 src/mesa/main/texstore.c  | 26 ++++++++++++++++++++++++++
 src/mesa/main/texstore.h  |  1 +
 4 files changed, 64 insertions(+), 15 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c
index c709004784..19c92838e0 100644
--- a/src/mesa/main/texformat.c
+++ b/src/mesa/main/texformat.c
@@ -87,30 +87,33 @@ nonlinear_to_linear(GLubyte cs8)
  *
  * Have to have this so the FetchTexel function pointer is never NULL.
  */
-static void fetch_null_texel( const struct gl_texture_image *texImage,
-			      GLint i, GLint j, GLint k, GLchan *texel )
+void
+_mesa_texformat_fetch_texel_null(const struct gl_texture_image *texImage,
+                                 GLint i, GLint j, GLint k, GLchan *texel)
 {
    (void) texImage; (void) i; (void) j; (void) k;
    texel[RCOMP] = 0;
    texel[GCOMP] = 0;
    texel[BCOMP] = 0;
    texel[ACOMP] = 0;
-   _mesa_warning(NULL, "fetch_null_texel() called!");
+   _mesa_warning(NULL, "_mesa_texformat_fetch_texel_null() called!");
 }
 
-static void fetch_null_texelf( const struct gl_texture_image *texImage,
-                               GLint i, GLint j, GLint k, GLfloat *texel )
+void
+_mesa_texformat_fetch_texel_f_null(const struct gl_texture_image *texImage,
+                                   GLint i, GLint j, GLint k, GLfloat *texel)
 {
    (void) texImage; (void) i; (void) j; (void) k;
    texel[RCOMP] = 0.0;
    texel[GCOMP] = 0.0;
    texel[BCOMP] = 0.0;
    texel[ACOMP] = 0.0;
-   _mesa_warning(NULL, "fetch_null_texelf() called!");
+   _mesa_warning(NULL, "_mesa_texformat_fetch_texel_f_null() called!");
 }
 
-static void store_null_texel(struct gl_texture_image *texImage,
-                             GLint i, GLint j, GLint k, const void *texel)
+void
+_mesa_texformat_store_texel_null(struct gl_texture_image *texImage,
+                                 GLint i, GLint j, GLint k, const void *texel)
 {
    (void) texImage;
    (void) i;
@@ -1448,13 +1451,7 @@ const struct gl_texture_format _mesa_null_texformat = {
    0,					/* StencilBits */
    0,					/* TexelBytes */
    NULL,				/* StoreTexImageFunc */
-   fetch_null_texel,			/* FetchTexel1D */
-   fetch_null_texel,			/* FetchTexel2D */
-   fetch_null_texel,			/* FetchTexel3D */
-   fetch_null_texelf,			/* FetchTexel1Df */
-   fetch_null_texelf,			/* FetchTexel2Df */
-   fetch_null_texelf,			/* FetchTexel3Df */
-   store_null_texel			/* StoreTexel */
+   _MESA_TEXFORMAT_NULL_OPS
 };
 
 /*@}*/
diff --git a/src/mesa/main/texformat.h b/src/mesa/main/texformat.h
index 5aa1d756cb..b029fd8a74 100644
--- a/src/mesa/main/texformat.h
+++ b/src/mesa/main/texformat.h
@@ -39,6 +39,16 @@
 #include "mtypes.h"
 
 
+#define _MESA_TEXFORMAT_NULL_OPS \
+   _mesa_texformat_fetch_texel_null,	/* FetchTexel1D */  \
+   _mesa_texformat_fetch_texel_null,	/* FetchTexel2D */  \
+   _mesa_texformat_fetch_texel_null,	/* FetchTexel3D */  \
+   _mesa_texformat_fetch_texel_f_null,	/* FetchTexel1Df */ \
+   _mesa_texformat_fetch_texel_f_null,	/* FetchTexel2Df */ \
+   _mesa_texformat_fetch_texel_f_null,	/* FetchTexel3Df */ \
+   _mesa_texformat_store_texel_null	/* StoreTexel */
+
+
 /**
  * Mesa internal texture image formats.
  * All texture images are stored in one of these formats.
@@ -290,4 +300,19 @@ _mesa_format_to_type_and_comps(const struct gl_texture_format *format,
                                GLenum *datatype, GLuint *comps);
 
 
+extern void
+_mesa_texformat_fetch_texel_null(const struct gl_texture_image *texImage,
+			         GLint i, GLint j, GLint k, GLchan *texel);
+
+
+extern void
+_mesa_texformat_fetch_texel_f_null(const struct gl_texture_image *texImage,
+                                   GLint i, GLint j, GLint k, GLfloat *texel);
+
+
+extern void
+_mesa_texformat_store_texel_null(struct gl_texture_image *texImage,
+                                 GLint i, GLint j, GLint k, const void *texel);
+
+
 #endif
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index fce01b185e..352c88e673 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -980,6 +980,32 @@ memcpy_texture(GLcontext *ctx,
 }
 
 
+/**
+ * no-op store
+ */
+GLboolean
+_mesa_texstore_null(TEXSTORE_PARAMS)
+{
+   (void) ctx;
+   (void) dims; 
+   (void) baseInternalFormat; 
+   (void) dstFormat; 
+   (void) dstAddr; 
+   (void) dstXoffset;
+   (void) dstYoffset;
+   (void) dstZoffset; 
+   (void) dstRowStride;
+   (void) dstImageOffsets; 
+   (void) srcWidth;
+   (void) srcHeight;
+   (void) srcDepth; 
+   (void) srcFormat;
+   (void) srcType; 
+   (void) srcAddr; 
+   (void) srcPacking;
+   return GL_TRUE;
+}
+
 
 /**
  * Store an image in any of the formats:
diff --git a/src/mesa/main/texstore.h b/src/mesa/main/texstore.h
index 313f2d6a59..e1b12dfa95 100644
--- a/src/mesa/main/texstore.h
+++ b/src/mesa/main/texstore.h
@@ -39,6 +39,7 @@
 #include "mtypes.h"
 
 
+extern GLboolean _mesa_texstore_null(TEXSTORE_PARAMS);
 extern GLboolean _mesa_texstore_rgba(TEXSTORE_PARAMS);
 extern GLboolean _mesa_texstore_color_index(TEXSTORE_PARAMS);
 extern GLboolean _mesa_texstore_rgba8888(TEXSTORE_PARAMS);
-- 
cgit v1.2.3


From 5c8873a3111031e77934eeedbf81b868617183e1 Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olvaffe@gmail.com>
Date: Wed, 9 Sep 2009 11:12:49 +0800
Subject: mesa/main: Provide dummy texformats when FEATURE_texture_fxt1 is
 disabled.

Instead of removing the related enums and texture formats, provide dummy
ones when the feature is disabled.
---
 src/mesa/main/context.c          |  2 --
 src/mesa/main/texcompress_fxt1.c | 41 ++++++++++++++++++++++++++++++----------
 src/mesa/main/texformat.h        |  4 ----
 3 files changed, 31 insertions(+), 16 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 2869a722ec..20307926a3 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -702,9 +702,7 @@ init_attrib_groups(GLcontext *ctx)
 #if FEATURE_texture_s3tc
    _mesa_init_texture_s3tc( ctx );
 #endif
-#if FEATURE_texture_fxt1
    _mesa_init_texture_fxt1( ctx );
-#endif
 
    /* Miscellaneous */
    ctx->NewState = _NEW_ALL;
diff --git a/src/mesa/main/texcompress_fxt1.c b/src/mesa/main/texcompress_fxt1.c
index fc151605c9..14de935e71 100644
--- a/src/mesa/main/texcompress_fxt1.c
+++ b/src/mesa/main/texcompress_fxt1.c
@@ -41,6 +41,9 @@
 #include "texstore.h"
 
 
+#if FEATURE_texture_fxt1
+
+
 static void
 fxt1_encode (GLuint width, GLuint height, GLint comps,
              const void *source, GLint srcRowStride,
@@ -51,16 +54,6 @@ fxt1_decode_1 (const void *texture, GLint stride,
                GLint i, GLint j, GLchan *rgba);
 
 
-/**
- * Called during context initialization.
- */
-void
-_mesa_init_texture_fxt1( GLcontext *ctx )
-{
-   (void) ctx;
-}
-
-
 /**
  * Called via TexFormat->StoreImage to store an RGB_FXT1 texture.
  */
@@ -224,6 +217,8 @@ fetch_texel_2d_f_rgb_fxt1( const struct gl_texture_image *texImage,
 }
 
 
+#endif /* FEATURE_texture_fxt1 */
+
 
 const struct gl_texture_format _mesa_texformat_rgb_fxt1 = {
    MESA_FORMAT_RGB_FXT1,		/* MesaFormat */
@@ -239,6 +234,7 @@ const struct gl_texture_format _mesa_texformat_rgb_fxt1 = {
    0,					/* DepthBits */
    0,					/* StencilBits */
    0,					/* TexelBytes */
+#if FEATURE_texture_fxt1
    texstore_rgb_fxt1,			/* StoreTexImageFunc */
    NULL, /*impossible*/ 		/* FetchTexel1D */
    fetch_texel_2d_rgb_fxt1, 		/* FetchTexel2D */
@@ -247,6 +243,10 @@ const struct gl_texture_format _mesa_texformat_rgb_fxt1 = {
    fetch_texel_2d_f_rgb_fxt1, 		/* FetchTexel2Df */
    NULL, /*impossible*/ 		/* FetchTexel3Df */
    NULL					/* StoreTexel */
+#else
+   _mesa_texstore_null,
+   _MESA_TEXFORMAT_NULL_OPS
+#endif
 };
 
 const struct gl_texture_format _mesa_texformat_rgba_fxt1 = {
@@ -263,6 +263,7 @@ const struct gl_texture_format _mesa_texformat_rgba_fxt1 = {
    0,					/* DepthBits */
    0,					/* StencilBits */
    0,					/* TexelBytes */
+#if FEATURE_texture_fxt1
    texstore_rgba_fxt1,			/* StoreTexImageFunc */
    NULL, /*impossible*/ 		/* FetchTexel1D */
    fetch_texel_2d_rgba_fxt1, 		/* FetchTexel2D */
@@ -271,9 +272,16 @@ const struct gl_texture_format _mesa_texformat_rgba_fxt1 = {
    fetch_texel_2d_f_rgba_fxt1, 		/* FetchTexel2Df */
    NULL, /*impossible*/ 		/* FetchTexel3Df */
    NULL					/* StoreTexel */
+#else
+   _mesa_texstore_null,
+   _MESA_TEXFORMAT_NULL_OPS
+#endif
 };
 
 
+#if FEATURE_texture_fxt1
+
+
 /***************************************************************************\
  * FXT1 encoder
  *
@@ -1722,3 +1730,16 @@ fxt1_decode_1 (const void *texture, GLint stride, /* in pixels */
 
    decode_1[mode](code, t, rgba);
 }
+
+
+#endif /* FEATURE_texture_fxt1 */
+
+
+/**
+ * Called during context initialization.
+ */
+void
+_mesa_init_texture_fxt1( GLcontext *ctx )
+{
+   (void) ctx;
+}
diff --git a/src/mesa/main/texformat.h b/src/mesa/main/texformat.h
index b029fd8a74..b674301338 100644
--- a/src/mesa/main/texformat.h
+++ b/src/mesa/main/texformat.h
@@ -125,10 +125,8 @@ enum _format {
     * \name Compressed texture formats.
     */
    /*@{*/
-#if FEATURE_texture_fxt1
    MESA_FORMAT_RGB_FXT1,
    MESA_FORMAT_RGBA_FXT1,
-#endif
 #if FEATURE_texture_s3tc
    MESA_FORMAT_RGB_DXT1,
    MESA_FORMAT_RGBA_DXT1,
@@ -272,10 +270,8 @@ extern const struct gl_texture_format _mesa_texformat_ycbcr_rev;
 
 /** \name Compressed formats */
 /*@{*/
-#if FEATURE_texture_fxt1
 extern const struct gl_texture_format _mesa_texformat_rgb_fxt1;
 extern const struct gl_texture_format _mesa_texformat_rgba_fxt1;
-#endif
 #if FEATURE_texture_s3tc
 extern const struct gl_texture_format _mesa_texformat_rgb_dxt1;
 extern const struct gl_texture_format _mesa_texformat_rgba_dxt1;
-- 
cgit v1.2.3


From 4132e67e31fa14a1b529a0e16c5951d86db62ba2 Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olvaffe@gmail.com>
Date: Wed, 9 Sep 2009 12:01:19 +0800
Subject: mesa/main: Provide dummy texformats when FEATURE_texture_s3tc is
 disabled.

Instead of removing the related enums and texture formats, provide dummy
ones when the feature is disabled.
---
 src/mesa/main/context.c          |  2 --
 src/mesa/main/texcompress_s3tc.c | 40 +++++++++++++++++++++++++++++++++++++++-
 src/mesa/main/texformat.h        |  8 --------
 3 files changed, 39 insertions(+), 11 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 20307926a3..4e637ff44b 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -699,9 +699,7 @@ init_attrib_groups(GLcontext *ctx)
    if (!_mesa_init_texture( ctx ))
       return GL_FALSE;
 
-#if FEATURE_texture_s3tc
    _mesa_init_texture_s3tc( ctx );
-#endif
    _mesa_init_texture_fxt1( ctx );
 
    /* Miscellaneous */
diff --git a/src/mesa/main/texcompress_s3tc.c b/src/mesa/main/texcompress_s3tc.c
index a1c0f18f36..754cb33cc0 100644
--- a/src/mesa/main/texcompress_s3tc.c
+++ b/src/mesa/main/texcompress_s3tc.c
@@ -54,6 +54,10 @@
 #define DXTN_LIBNAME "libtxc_dxtn.so"
 #endif
 
+
+#if FEATURE_texture_s3tc
+
+
 #if FEATURE_EXT_texture_sRGB
 /**
  * Convert an 8-bit sRGB value from non-linear space to a
@@ -564,7 +568,21 @@ fetch_texel_2d_f_srgba_dxt5( const struct gl_texture_image *texImage,
    texel[BCOMP] = nonlinear_to_linear(rgba[BCOMP]);
    texel[ACOMP] = CHAN_TO_FLOAT(rgba[ACOMP]);
 }
-#endif
+#endif /* FEATURE_EXT_texture_sRGB */
+
+
+#else /* FEATURE_texture_s3tc */
+
+
+void
+_mesa_init_texture_s3tc( GLcontext *ctx )
+{
+   (void) ctx;
+}
+
+
+#endif /* FEATURE_texture_s3tc */
+
 
 const struct gl_texture_format _mesa_texformat_rgb_dxt1 = {
    MESA_FORMAT_RGB_DXT1,		/* MesaFormat */
@@ -580,6 +598,7 @@ const struct gl_texture_format _mesa_texformat_rgb_dxt1 = {
    0,					/* DepthBits */
    0,					/* StencilBits */
    0,					/* TexelBytes */
+#if FEATURE_texture_s3tc
    texstore_rgb_dxt1,			/* StoreTexImageFunc */
    NULL, /*impossible*/ 		/* FetchTexel1D */
    fetch_texel_2d_rgb_dxt1, 		/* FetchTexel2D */
@@ -588,6 +607,10 @@ const struct gl_texture_format _mesa_texformat_rgb_dxt1 = {
    fetch_texel_2d_f_rgb_dxt1, 		/* FetchTexel2Df */
    NULL, /*impossible*/ 		/* FetchTexel3Df */
    NULL					/* StoreTexel */
+#else
+   _mesa_texstore_null,
+   _MESA_TEXFORMAT_NULL_OPS
+#endif
 };
 
 const struct gl_texture_format _mesa_texformat_rgba_dxt1 = {
@@ -604,6 +627,7 @@ const struct gl_texture_format _mesa_texformat_rgba_dxt1 = {
    0,					/* DepthBits */
    0,					/* StencilBits */
    0,					/* TexelBytes */
+#if FEATURE_texture_s3tc
    texstore_rgba_dxt1,			/* StoreTexImageFunc */
    NULL, /*impossible*/ 		/* FetchTexel1D */
    fetch_texel_2d_rgba_dxt1, 		/* FetchTexel2D */
@@ -612,6 +636,10 @@ const struct gl_texture_format _mesa_texformat_rgba_dxt1 = {
    fetch_texel_2d_f_rgba_dxt1, 		/* FetchTexel2Df */
    NULL, /*impossible*/ 		/* FetchTexel3Df */
    NULL					/* StoreTexel */
+#else
+   _mesa_texstore_null,
+   _MESA_TEXFORMAT_NULL_OPS
+#endif
 };
 
 const struct gl_texture_format _mesa_texformat_rgba_dxt3 = {
@@ -628,6 +656,7 @@ const struct gl_texture_format _mesa_texformat_rgba_dxt3 = {
    0,					/* DepthBits */
    0,					/* StencilBits */
    0,					/* TexelBytes */
+#if FEATURE_texture_s3tc
    texstore_rgba_dxt3,			/* StoreTexImageFunc */
    NULL, /*impossible*/ 		/* FetchTexel1D */
    fetch_texel_2d_rgba_dxt3, 		/* FetchTexel2D */
@@ -636,6 +665,10 @@ const struct gl_texture_format _mesa_texformat_rgba_dxt3 = {
    fetch_texel_2d_f_rgba_dxt3, 		/* FetchTexel2Df */
    NULL, /*impossible*/ 		/* FetchTexel3Df */
    NULL					/* StoreTexel */
+#else
+   _mesa_texstore_null,
+   _MESA_TEXFORMAT_NULL_OPS
+#endif
 };
 
 const struct gl_texture_format _mesa_texformat_rgba_dxt5 = {
@@ -652,6 +685,7 @@ const struct gl_texture_format _mesa_texformat_rgba_dxt5 = {
    0,					/* DepthBits */
    0,					/* StencilBits */
    0,					/* TexelBytes */
+#if FEATURE_texture_s3tc
    texstore_rgba_dxt5,			/* StoreTexImageFunc */
    NULL, /*impossible*/ 		/* FetchTexel1D */
    fetch_texel_2d_rgba_dxt5, 		/* FetchTexel2D */
@@ -660,6 +694,10 @@ const struct gl_texture_format _mesa_texformat_rgba_dxt5 = {
    fetch_texel_2d_f_rgba_dxt5, 		/* FetchTexel2Df */
    NULL, /*impossible*/ 		/* FetchTexel3Df */
    NULL					/* StoreTexel */
+#else
+   _mesa_texstore_null,
+   _MESA_TEXFORMAT_NULL_OPS
+#endif
 };
 
 #if FEATURE_EXT_texture_sRGB
diff --git a/src/mesa/main/texformat.h b/src/mesa/main/texformat.h
index b674301338..a4d8bbf831 100644
--- a/src/mesa/main/texformat.h
+++ b/src/mesa/main/texformat.h
@@ -112,12 +112,10 @@ enum _format {
    MESA_FORMAT_SARGB8,
    MESA_FORMAT_SL8,
    MESA_FORMAT_SLA8,
-#if FEATURE_texture_s3tc
    MESA_FORMAT_SRGB_DXT1,
    MESA_FORMAT_SRGBA_DXT1,
    MESA_FORMAT_SRGBA_DXT3,
    MESA_FORMAT_SRGBA_DXT5,
-#endif
    /*@}*/
 #endif
 
@@ -127,12 +125,10 @@ enum _format {
    /*@{*/
    MESA_FORMAT_RGB_FXT1,
    MESA_FORMAT_RGBA_FXT1,
-#if FEATURE_texture_s3tc
    MESA_FORMAT_RGB_DXT1,
    MESA_FORMAT_RGBA_DXT1,
    MESA_FORMAT_RGBA_DXT3,
    MESA_FORMAT_RGBA_DXT5,
-#endif
    /*@}*/
 
    /**
@@ -201,12 +197,10 @@ extern const struct gl_texture_format _mesa_texformat_srgba8;
 extern const struct gl_texture_format _mesa_texformat_sargb8;
 extern const struct gl_texture_format _mesa_texformat_sl8;
 extern const struct gl_texture_format _mesa_texformat_sla8;
-#if FEATURE_texture_s3tc
 extern const struct gl_texture_format _mesa_texformat_srgb_dxt1;
 extern const struct gl_texture_format _mesa_texformat_srgba_dxt1;
 extern const struct gl_texture_format _mesa_texformat_srgba_dxt3;
 extern const struct gl_texture_format _mesa_texformat_srgba_dxt5;
-#endif
 /*@}*/
 #endif
 
@@ -272,12 +266,10 @@ extern const struct gl_texture_format _mesa_texformat_ycbcr_rev;
 /*@{*/
 extern const struct gl_texture_format _mesa_texformat_rgb_fxt1;
 extern const struct gl_texture_format _mesa_texformat_rgba_fxt1;
-#if FEATURE_texture_s3tc
 extern const struct gl_texture_format _mesa_texformat_rgb_dxt1;
 extern const struct gl_texture_format _mesa_texformat_rgba_dxt1;
 extern const struct gl_texture_format _mesa_texformat_rgba_dxt3;
 extern const struct gl_texture_format _mesa_texformat_rgba_dxt5;
-#endif
 /*@}*/
 
 /** \name The null format */
-- 
cgit v1.2.3


From de8b4f3bbd721ac3187d918f74375b873d43c5c7 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 12 May 2009 13:23:43 -0600
Subject: mesa: fix set_tex_parameteri() call

---
 src/mesa/main/texparam.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index 05d144270e..6cbb9999b1 100644
--- a/src/mesa/main/texparam.c
+++ b/src/mesa/main/texparam.c
@@ -599,7 +599,7 @@ _mesa_TexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
          iparams[1] = (GLint) params[1];
          iparams[2] = (GLint) params[2];
          iparams[3] = (GLint) params[3];
-         need_update = set_tex_parameteri(ctx, target, iparams);
+         need_update = set_tex_parameteri(ctx, texObj, pname, iparams);
       }
       break;
 #endif
-- 
cgit v1.2.3


From 9ac1d3e36f927687baf7467f1b71a5ff7b84d868 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 12 May 2009 13:24:37 -0600
Subject: mesa: silence warning

---
 src/mesa/main/fbobject.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 825a23090b..877ec00ae4 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -644,6 +644,8 @@ _mesa_test_framebuffer_completeness(GLcontext *ctx, struct gl_framebuffer *fb)
          return;
       }
    }
+#else
+   (void) j;
 #endif
 
    if (numImages == 0) {
-- 
cgit v1.2.3


From 3c417b27a259533aa7a4fcb886c42a3f50d38184 Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olvaffe@gmail.com>
Date: Mon, 7 Sep 2009 14:46:22 +0800
Subject: mesa/main: Add point size array.

---
 src/mesa/main/getstring.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/getstring.c b/src/mesa/main/getstring.c
index 6599ed9698..4b1f4b0ea1 100644
--- a/src/mesa/main/getstring.c
+++ b/src/mesa/main/getstring.c
@@ -242,6 +242,11 @@ _mesa_GetPointerv( GLenum pname, GLvoid **params )
       case GL_SELECTION_BUFFER_POINTER:
          *params = ctx->Select.Buffer;
          break;
+#if FEATURE_point_size_array
+      case GL_POINT_SIZE_ARRAY_POINTER_OES:
+         *params = (GLvoid *) ctx->Array.ArrayObj->PointSize.Ptr;
+         break;
+#endif
       default:
          _mesa_error( ctx, GL_INVALID_ENUM, "glGetPointerv" );
          return;
-- 
cgit v1.2.3


From e6f4bc9d824223325f926cbe7ac1b6a55d2b3dba Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olvaffe@gmail.com>
Date: Sat, 12 Sep 2009 18:59:13 +0800
Subject: mesa: New feature FEATURE_beginend.

This feature corresponds to the Begin/End paradigm.  Disabling this
feature also eliminates the use of GLvertexformat completely.
---
 src/mesa/main/api_loopback.c |  7 ++++
 src/mesa/main/api_loopback.h | 14 ++++++-
 src/mesa/main/api_noop.c     |  6 +++
 src/mesa/main/api_noop.h     |  9 +++--
 src/mesa/main/mfeatures.h    |  3 +-
 src/mesa/main/vtxfmt.c       |  6 +++
 src/mesa/main/vtxfmt.h       | 29 +++++++++++++-
 src/mesa/vbo/vbo_exec.h      | 18 +++++++++
 src/mesa/vbo/vbo_exec_api.c  | 94 +++++++++++++++++++++++++++++++++++++++++++-
 src/mesa/vbo/vbo_exec_draw.c |  6 +++
 10 files changed, 184 insertions(+), 8 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_loopback.c b/src/mesa/main/api_loopback.c
index 0e3f5ff957..3d466ac44a 100644
--- a/src/mesa/main/api_loopback.c
+++ b/src/mesa/main/api_loopback.c
@@ -77,6 +77,10 @@
 #define FOGCOORDF(x)                CALL_FogCoordfEXT(GET_DISPATCH(), (x))
 #define SECONDARYCOLORF(a,b,c)      CALL_SecondaryColor3fEXT(GET_DISPATCH(), (a,b,c))
 
+
+#if FEATURE_beginend
+
+
 static void GLAPIENTRY
 loopback_Color3b_f( GLbyte red, GLbyte green, GLbyte blue )
 {
@@ -1655,3 +1659,6 @@ _mesa_loopback_init_api_table( struct _glapi_table *dest )
    SET_VertexAttrib4NusvARB(dest, loopback_VertexAttrib4NusvARB);
    SET_VertexAttrib4NuivARB(dest, loopback_VertexAttrib4NuivARB);
 }
+
+
+#endif /* FEATURE_beginend */
diff --git a/src/mesa/main/api_loopback.h b/src/mesa/main/api_loopback.h
index 6f85bbc1d9..751cba2931 100644
--- a/src/mesa/main/api_loopback.h
+++ b/src/mesa/main/api_loopback.h
@@ -27,11 +27,21 @@
 #ifndef API_LOOPBACK_H
 #define API_LOOPBACK_H
 
-#include "glheader.h"
+#include "main/mtypes.h"
 
+#if FEATURE_beginend
 
 struct _glapi_table;
 
 extern void _mesa_loopback_init_api_table( struct _glapi_table *dest );
 
-#endif
+#else /* FEATURE_beginend */
+
+static INLINE void
+_mesa_loopback_init_api_table( struct _glapi_table *dest )
+{
+}
+
+#endif /* FEATURE_beginend */
+
+#endif /* API_LOOPBACK_H */
diff --git a/src/mesa/main/api_noop.c b/src/mesa/main/api_noop.c
index a30c47da77..cd67661382 100644
--- a/src/mesa/main/api_noop.c
+++ b/src/mesa/main/api_noop.c
@@ -43,6 +43,9 @@
  */
 
 
+#if FEATURE_beginend
+
+
 static void GLAPIENTRY _mesa_noop_EdgeFlag( GLboolean b )
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -1064,3 +1067,6 @@ _mesa_noop_vtxfmt_init( GLvertexformat *vfmt )
    vfmt->DrawRangeElementsBaseVertex = _mesa_noop_DrawRangeElementsBaseVertex;
    vfmt->MultiDrawElementsBaseVertex = _mesa_noop_MultiDrawElementsBaseVertex;
 }
+
+
+#endif /* FEATURE_beginend */
diff --git a/src/mesa/main/api_noop.h b/src/mesa/main/api_noop.h
index 1150984d64..e7fd49bafb 100644
--- a/src/mesa/main/api_noop.h
+++ b/src/mesa/main/api_noop.h
@@ -25,8 +25,9 @@
 #ifndef _API_NOOP_H
 #define _API_NOOP_H
 
-#include "mtypes.h"
-#include "context.h"
+#include "main/mtypes.h"
+
+#if FEATURE_beginend
 
 extern void GLAPIENTRY
 _mesa_noop_Rectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2);
@@ -54,4 +55,6 @@ _mesa_noop_MultiDrawElementsBaseVertex(GLenum mode, const GLsizei *count,
 extern void
 _mesa_noop_vtxfmt_init(GLvertexformat *vfmt);
 
-#endif
+#endif /* FEATURE_beginend */
+
+#endif /* _API_NOOP_H */
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index a89b760774..02083ecc3b 100644
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -75,7 +75,7 @@
 #define FEATURE_colortable  _HAVE_FULL_GL
 #define FEATURE_convolve  _HAVE_FULL_GL
 #define FEATURE_dispatch  _HAVE_FULL_GL
-#define FEATURE_dlist  (_HAVE_FULL_GL && FEATURE_arrayelt)
+#define FEATURE_dlist  (_HAVE_FULL_GL && FEATURE_arrayelt && FEATURE_beginend)
 #define FEATURE_draw_read_buffer  _HAVE_FULL_GL
 #define FEATURE_drawpix  _HAVE_FULL_GL
 #define FEATURE_eval  _HAVE_FULL_GL
@@ -90,6 +90,7 @@
 #define FEATURE_texture_fxt1  _HAVE_FULL_GL
 #define FEATURE_texture_s3tc  _HAVE_FULL_GL
 #define FEATURE_userclip  _HAVE_FULL_GL
+#define FEATURE_beginend  _HAVE_FULL_GL
 #define FEATURE_vertex_array_byte 0
 #define FEATURE_es2_glsl 0
 
diff --git a/src/mesa/main/vtxfmt.c b/src/mesa/main/vtxfmt.c
index 8ba1af6de1..6e0581f62d 100644
--- a/src/mesa/main/vtxfmt.c
+++ b/src/mesa/main/vtxfmt.c
@@ -38,6 +38,9 @@
 #include "dlist.h"
 
 
+#if FEATURE_beginend
+
+
 /* The neutral vertex format.  This wraps all tnl module functions,
  * verifying that the currently-installed module is valid and then
  * installing the function pointers in a lazy fashion.  It records the
@@ -198,3 +201,6 @@ void _mesa_restore_exec_vtxfmt( GLcontext *ctx )
 
    tnl->SwapCount = 0;
 }
+
+
+#endif /* FEATURE_beginend */
diff --git a/src/mesa/main/vtxfmt.h b/src/mesa/main/vtxfmt.h
index 76f108e023..819a6ec218 100644
--- a/src/mesa/main/vtxfmt.h
+++ b/src/mesa/main/vtxfmt.h
@@ -33,6 +33,8 @@
 #ifndef _VTXFMT_H_
 #define _VTXFMT_H_
 
+#if FEATURE_beginend
+
 extern void _mesa_init_exec_vtxfmt( GLcontext *ctx );
 
 extern void _mesa_install_exec_vtxfmt( GLcontext *ctx, const GLvertexformat *vfmt );
@@ -40,4 +42,29 @@ extern void _mesa_install_save_vtxfmt( GLcontext *ctx, const GLvertexformat *vfm
 
 extern void _mesa_restore_exec_vtxfmt( GLcontext *ctx );
 
-#endif
+#else /* FEATURE_beginend */
+
+static INLINE void
+_mesa_init_exec_vtxfmt( GLcontext *ctx )
+{
+}
+
+static INLINE void
+_mesa_install_exec_vtxfmt( GLcontext *ctx, const GLvertexformat *vfmt )
+{
+}
+
+static INLINE void
+_mesa_install_save_vtxfmt( GLcontext *ctx, const GLvertexformat *vfmt )
+{
+}
+
+
+static INLINE void
+_mesa_restore_exec_vtxfmt( GLcontext *ctx )
+{
+}
+
+#endif /* FEATURE_beginend */
+
+#endif /* _VTXFMT_H_ */
diff --git a/src/mesa/vbo/vbo_exec.h b/src/mesa/vbo/vbo_exec.h
index e0f44892cf..516be0995b 100644
--- a/src/mesa/vbo/vbo_exec.h
+++ b/src/mesa/vbo/vbo_exec.h
@@ -161,8 +161,26 @@ void vbo_exec_array_destroy( struct vbo_exec_context *exec );
 
 void vbo_exec_vtx_init( struct vbo_exec_context *exec );
 void vbo_exec_vtx_destroy( struct vbo_exec_context *exec );
+
+#if FEATURE_beginend
+
 void vbo_exec_vtx_flush( struct vbo_exec_context *exec, GLboolean unmap );
 void vbo_exec_vtx_map( struct vbo_exec_context *exec );
+
+#else /* FEATURE_beginend */
+
+static INLINE void
+vbo_exec_vtx_flush( struct vbo_exec_context *exec, GLboolean unmap )
+{
+}
+
+static INLINE void
+vbo_exec_vtx_map( struct vbo_exec_context *exec )
+{
+}
+
+#endif /* FEATURE_beginend */
+
 void vbo_exec_vtx_wrap( struct vbo_exec_context *exec );
 
 void vbo_exec_eval_update( struct vbo_exec_context *exec );
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c
index a81bd39eb1..d105183bac 100644
--- a/src/mesa/vbo/vbo_exec_api.c
+++ b/src/mesa/vbo/vbo_exec_api.c
@@ -348,7 +348,7 @@ static void vbo_exec_fixup_vertex( GLcontext *ctx,
 }
 
 
-
+#if FEATURE_beginend
 
 /* 
  */
@@ -634,6 +634,98 @@ static void vbo_exec_vtxfmt_init( struct vbo_exec_context *exec )
 }
 
 
+#else /* FEATURE_beginend */
+
+
+#define ATTR( A, N, V0, V1, V2, V3 )				\
+do {								\
+   struct vbo_exec_context *exec = &vbo_context(ctx)->exec;	\
+								\
+   /* FLUSH_UPDATE_CURRENT needs to be set manually */		\
+   exec->ctx->Driver.NeedFlush |= FLUSH_UPDATE_CURRENT;		\
+								\
+   if (exec->vtx.active_sz[A] != N)				\
+      vbo_exec_fixup_vertex(ctx, A, N);				\
+								\
+   {								\
+      GLfloat *dest = exec->vtx.attrptr[A];			\
+      if (N>0) dest[0] = V0;					\
+      if (N>1) dest[1] = V1;					\
+      if (N>2) dest[2] = V2;					\
+      if (N>3) dest[3] = V3;					\
+   }								\
+} while (0)
+
+#define ERROR() _mesa_error( ctx, GL_INVALID_ENUM, __FUNCTION__ )
+#define TAG(x) vbo_##x
+
+#include "vbo_attrib_tmp.h"
+
+static void vbo_exec_vtxfmt_init( struct vbo_exec_context *exec )
+{
+   /* silence warnings */
+   (void) vbo_Color3f;
+   (void) vbo_Color3fv;
+   (void) vbo_Color4f;
+   (void) vbo_Color4fv;
+   (void) vbo_FogCoordfEXT;
+   (void) vbo_FogCoordfvEXT;
+   (void) vbo_MultiTexCoord1f;
+   (void) vbo_MultiTexCoord1fv;
+   (void) vbo_MultiTexCoord2f;
+   (void) vbo_MultiTexCoord2fv;
+   (void) vbo_MultiTexCoord3f;
+   (void) vbo_MultiTexCoord3fv;
+   (void) vbo_MultiTexCoord4f;
+   (void) vbo_MultiTexCoord4fv;
+   (void) vbo_Normal3f;
+   (void) vbo_Normal3fv;
+   (void) vbo_SecondaryColor3fEXT;
+   (void) vbo_SecondaryColor3fvEXT;
+   (void) vbo_TexCoord1f;
+   (void) vbo_TexCoord1fv;
+   (void) vbo_TexCoord2f;
+   (void) vbo_TexCoord2fv;
+   (void) vbo_TexCoord3f;
+   (void) vbo_TexCoord3fv;
+   (void) vbo_TexCoord4f;
+   (void) vbo_TexCoord4fv;
+   (void) vbo_Vertex2f;
+   (void) vbo_Vertex2fv;
+   (void) vbo_Vertex3f;
+   (void) vbo_Vertex3fv;
+   (void) vbo_Vertex4f;
+   (void) vbo_Vertex4fv;
+
+   (void) vbo_VertexAttrib1fARB;
+   (void) vbo_VertexAttrib1fvARB;
+   (void) vbo_VertexAttrib2fARB;
+   (void) vbo_VertexAttrib2fvARB;
+   (void) vbo_VertexAttrib3fARB;
+   (void) vbo_VertexAttrib3fvARB;
+   (void) vbo_VertexAttrib4fARB;
+   (void) vbo_VertexAttrib4fvARB;
+
+   (void) vbo_VertexAttrib1fNV;
+   (void) vbo_VertexAttrib1fvNV;
+   (void) vbo_VertexAttrib2fNV;
+   (void) vbo_VertexAttrib2fvNV;
+   (void) vbo_VertexAttrib3fNV;
+   (void) vbo_VertexAttrib3fvNV;
+   (void) vbo_VertexAttrib4fNV;
+   (void) vbo_VertexAttrib4fvNV;
+
+   (void) vbo_Materialfv;
+
+   (void) vbo_EdgeFlag;
+   (void) vbo_Indexf;
+   (void) vbo_Indexfv;
+}
+
+
+#endif /* FEATURE_beginend */
+
+
 /**
  * Tell the VBO module to use a real OpenGL vertex buffer object to
  * store accumulated immediate-mode vertex data.
diff --git a/src/mesa/vbo/vbo_exec_draw.c b/src/mesa/vbo/vbo_exec_draw.c
index 0c258c535e..ee148df4a1 100644
--- a/src/mesa/vbo/vbo_exec_draw.c
+++ b/src/mesa/vbo/vbo_exec_draw.c
@@ -35,6 +35,9 @@
 #include "vbo_context.h"
 
 
+#if FEATURE_beginend
+
+
 static void
 vbo_exec_debug_verts( struct vbo_exec_context *exec )
 {
@@ -411,3 +414,6 @@ vbo_exec_vtx_flush( struct vbo_exec_context *exec, GLboolean unmap )
    exec->vtx.prim_count = 0;
    exec->vtx.vert_count = 0;
 }
+
+
+#endif /* FEATURE_beginend */
-- 
cgit v1.2.3


From a98c282c7da646c9def246b2619124c51f8b4464 Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olvaffe@gmail.com>
Date: Sun, 13 Sep 2009 19:04:37 +0800
Subject: es: Proper support for FEATURE_OES_draw_texture.

Update default extensions and add DrawTex driver function.
---
 src/mesa/es/main/APIspec.txt |   8 ---
 src/mesa/es/main/drawtex.c   | 144 +++++++++++++++++++++++++++++++++++++++++++
 src/mesa/es/main/drawtex.h   |  79 ++++++++++++++++++++++++
 src/mesa/es/sources.mak      |  17 ++++-
 src/mesa/main/dd.h           |  10 +++
 src/mesa/main/extensions.c   |   3 +
 src/mesa/main/mtypes.h       |   3 +
 7 files changed, 253 insertions(+), 11 deletions(-)
 create mode 100644 src/mesa/es/main/drawtex.c
 create mode 100644 src/mesa/es/main/drawtex.h

(limited to 'src/mesa/main')

diff --git a/src/mesa/es/main/APIspec.txt b/src/mesa/es/main/APIspec.txt
index 07a529d6e9..f102e7083c 100644
--- a/src/mesa/es/main/APIspec.txt
+++ b/src/mesa/es/main/APIspec.txt
@@ -2891,8 +2891,6 @@ param           y               GLint
 param           z               GLint
 param           w               GLint
 param           h               GLint
-convertalias    DrawTexf
-convertparams   GLfloat        x y z w h
 category        GLES1.1:OES_draw_texture
 
 name            DrawTexs
@@ -2902,8 +2900,6 @@ param           y               GLshort
 param           z               GLshort
 param           w               GLshort
 param           h               GLshort
-convertalias    DrawTexf
-convertparams   GLfloat        x y z w h
 category        GLES1.1:OES_draw_texture
 
 name            DrawTexx
@@ -2927,16 +2923,12 @@ name            DrawTexiv
 return          void
 param           coords          const GLint *
 vector          coords          5
-convertalias    DrawTexfv
-convertparams   GLfloat         coords
 category        GLES1.1:OES_draw_texture
 
 name            DrawTexsv
 return          void
 param           coords          const GLshort *
 vector          coords          5
-convertalias    DrawTexfv
-convertparams   GLfloat         coords
 category        GLES1.1:OES_draw_texture
 
 name            DrawTexxv
diff --git a/src/mesa/es/main/drawtex.c b/src/mesa/es/main/drawtex.c
new file mode 100644
index 0000000000..af055d07d2
--- /dev/null
+++ b/src/mesa/es/main/drawtex.c
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2009 Chia-I Wu <olvaffe@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#include "drawtex.h"
+#include "main/state.h"
+#include "main/imports.h"
+
+#include "glapi/dispatch.h"
+
+
+#if FEATURE_OES_draw_texture
+
+
+static INLINE void
+draw_texture(GLcontext *ctx, GLfloat x, GLfloat y, GLfloat z,
+             GLfloat width, GLfloat height)
+{
+   if (width <= 0.0f || height <= 0.0f) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glDrawTex(width or height <= 0)");
+      return;
+   }
+
+   if (ctx->NewState)
+      _mesa_update_state(ctx);
+
+   if (ctx->Driver.DrawTex)
+      ctx->Driver.DrawTex(ctx, x, y, z, width, height);
+}
+
+
+void GLAPIENTRY
+_mesa_DrawTexf(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   draw_texture(ctx, x, y, z, width, height);
+}
+
+
+void GLAPIENTRY
+_mesa_DrawTexfv(const GLfloat *coords)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   draw_texture(ctx, coords[0], coords[1], coords[2], coords[3], coords[4]);
+}
+
+
+void GLAPIENTRY
+_mesa_DrawTexi(GLint x, GLint y, GLint z, GLint width, GLint height)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   draw_texture(ctx, (GLfloat) x, (GLfloat) y, (GLfloat) z,
+                (GLfloat) width, (GLfloat) height);
+}
+
+
+void GLAPIENTRY
+_mesa_DrawTexiv(const GLint *coords)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   draw_texture(ctx, (GLfloat) coords[0], (GLfloat) coords[1],
+                (GLfloat) coords[2], (GLfloat) coords[3], (GLfloat) coords[4]);
+}
+
+
+void GLAPIENTRY
+_mesa_DrawTexs(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   draw_texture(ctx, (GLfloat) x, (GLfloat) y, (GLfloat) z,
+                (GLfloat) width, (GLfloat) height);
+}
+
+
+void GLAPIENTRY
+_mesa_DrawTexsv(const GLshort *coords)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   draw_texture(ctx, (GLfloat) coords[0], (GLfloat) coords[1],
+                (GLfloat) coords[2], (GLfloat) coords[3], (GLfloat) coords[4]);
+}
+
+
+/* it is static because GLfixed is not defined publicly */
+static void GLAPIENTRY
+_mesa_DrawTexx(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   draw_texture(ctx,
+                (GLfloat) x / 65536.0f,
+                (GLfloat) y / 65536.0f,
+                (GLfloat) z / 65536.0f,
+                (GLfloat) width / 65536.0f,
+                (GLfloat) height / 65536.0f);
+}
+
+
+static void GLAPIENTRY
+_mesa_DrawTexxv(const GLfixed *coords)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   draw_texture(ctx,
+                (GLfloat) coords[0] / 65536.0f,
+                (GLfloat) coords[1] / 65536.0f,
+                (GLfloat) coords[2] / 65536.0f,
+                (GLfloat) coords[3] / 65536.0f,
+                (GLfloat) coords[4] / 65536.0f);
+}
+
+
+void
+_mesa_init_drawtex_dispatch(struct _glapi_table *disp)
+{
+   SET_DrawTexfOES(disp, _mesa_DrawTexf);
+   SET_DrawTexfvOES(disp, _mesa_DrawTexfv);
+   SET_DrawTexiOES(disp, _mesa_DrawTexi);
+   SET_DrawTexivOES(disp, _mesa_DrawTexiv);
+   SET_DrawTexsOES(disp, _mesa_DrawTexs);
+   SET_DrawTexsvOES(disp, _mesa_DrawTexsv);
+   SET_DrawTexxOES(disp, _mesa_DrawTexx);
+   SET_DrawTexxvOES(disp, _mesa_DrawTexxv);
+}
+
+
+#endif /* FEATURE_OES_draw_texture */
diff --git a/src/mesa/es/main/drawtex.h b/src/mesa/es/main/drawtex.h
new file mode 100644
index 0000000000..04c5bdd123
--- /dev/null
+++ b/src/mesa/es/main/drawtex.h
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2009 Chia-I Wu <olvaffe@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef DRAWTEX_H
+#define DRAWTEX_H
+
+
+#include "main/mtypes.h"
+
+
+#if FEATURE_OES_draw_texture
+
+#define _MESA_INIT_DRAWTEX_FUNCTIONS(driver, impl) \
+   do {                                            \
+      (driver)->DrawTex = impl ## DrawTex;         \
+   } while (0)
+
+extern void GLAPIENTRY
+_mesa_DrawTexf(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);
+
+extern void GLAPIENTRY
+_mesa_DrawTexfv(const GLfloat *coords);
+
+extern void GLAPIENTRY
+_mesa_DrawTexi(GLint x, GLint y, GLint z, GLint width, GLint height);
+
+extern void GLAPIENTRY
+_mesa_DrawTexiv(const GLint *coords);
+
+extern void GLAPIENTRY
+_mesa_DrawTexs(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height);
+
+extern void GLAPIENTRY
+_mesa_DrawTexsv(const GLshort *coords);
+
+#if 0
+extern void GLAPIENTRY
+_mesa_DrawTexx(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height);
+
+extern void GLAPIENTRY
+_mesa_DrawTexxv(const GLfixed *coords);
+#endif
+
+extern void
+_mesa_init_drawtex_dispatch(struct _glapi_table *disp);
+
+#else /* FEATURE_OES_draw_texture */
+
+#define _MESA_INIT_DRAWTEX_FUNCTIONS(driver, impl) do { } while (0)
+
+static INLINE void
+_mesa_init_drawtex_dispatch(struct _glapi_table *disp)
+{
+}
+
+#endif /* FEATURE_OES_draw_texture */
+
+
+#endif /* DRAWTEX_H */
diff --git a/src/mesa/es/sources.mak b/src/mesa/es/sources.mak
index aef0650c21..6dedb726bd 100644
--- a/src/mesa/es/sources.mak
+++ b/src/mesa/es/sources.mak
@@ -2,6 +2,7 @@
 
 ES1_LOCAL_SOURCES :=			\
 	main/api_exec_es1.c		\
+	main/drawtex.c			\
 	main/get_es1.c			\
 	main/specials_es1.c		\
 	main/es_cpaltex.c		\
@@ -21,9 +22,19 @@ ES1_LOCAL_INCLUDES :=			\
 	-I./state_tracker		\
 	-I$(MESA)/state_tracker
 
-ES2_LOCAL_SOURCES := $(subst es1,es2,$(ES1_LOCAL_SOURCES))
-ES2_GALLIUM_LOCAL_SOURCES := $(subst es1,es2,$(ES1_GALLIUM_LOCAL_SOURCES))
-ES2_API_LOCAL_SOURCES := $(subst es1,es2,$(ES1_API_LOCAL_SOURCES))
+ES2_LOCAL_SOURCES :=			\
+	main/api_exec_es2.c		\
+	main/get_es2.c			\
+	main/specials_es2.c		\
+	main/es_cpaltex.c		\
+	main/es_fbo.c			\
+	main/stubs.c
+
+ES2_GALLIUM_LOCAL_SOURCES :=		\
+	$(ES2_LOCAL_SOURCES)
+
+ES2_API_LOCAL_SOURCES :=
+
 ES2_LOCAL_INCLUDES := $(subst es1,es2,$(ES1_LOCAL_INCLUDES))
 
 # MESA sources
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index ce5e158626..afcab5bf2b 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -1060,6 +1060,16 @@ struct dd_function_table {
 			  GLbitfield, GLuint64);
    /*@}*/
 #endif
+
+#if FEATURE_OES_draw_texture
+   /**
+    * \name GL_OES_draw_texture interface
+    */
+   /*@{*/
+   void (*DrawTex)(GLcontext *ctx, GLfloat x, GLfloat y, GLfloat z,
+                   GLfloat width, GLfloat height);
+   /*@}*/
+#endif
 };
 
 
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index cfc87e6fe6..7e289743ce 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -183,6 +183,9 @@ static const struct {
    { ON,  "GL_SGIS_texture_lod",               F(SGIS_texture_lod) },
    { ON,  "GL_SUN_multi_draw_arrays",          F(EXT_multi_draw_arrays) },
    { OFF, "GL_S3_s3tc",                        F(S3_s3tc) },
+#if FEATURE_OES_draw_texture
+   { OFF, "GL_OES_draw_texture",               F(OES_draw_texture) },
+#endif /* FEATURE_OES_draw_texture */
 };
 
 
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index ae169fb9db..bebb3e56a6 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2599,6 +2599,9 @@ struct gl_extensions
    GLboolean SGIS_texture_lod;
    GLboolean TDFX_texture_compression_FXT1;
    GLboolean S3_s3tc;
+#if FEATURE_OES_draw_texture
+   GLboolean OES_draw_texture;
+#endif /* FEATURE_OES_draw_texture */
    /** The extension string */
    const GLubyte *String;
 };
-- 
cgit v1.2.3


From c4a8ce7ffdf603c515b5202e2322e1b965f69f3a Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olvaffe@gmail.com>
Date: Mon, 14 Sep 2009 13:51:54 +0800
Subject: es: Add support for GL_OES_EGL_image.

---
 src/mesa/es/main/APIspec.txt    |  16 ++++++
 src/mesa/es/main/eglimage.c     | 115 ++++++++++++++++++++++++++++++++++++++++
 src/mesa/es/main/eglimage.h     |  61 +++++++++++++++++++++
 src/mesa/es/main/mfeatures.h    |   1 +
 src/mesa/es/main/specials_es1.c |   3 ++
 src/mesa/es/sources.mak         |   2 +
 src/mesa/main/dd.h              |  13 +++++
 src/mesa/main/extensions.c      |   3 ++
 src/mesa/main/mtypes.h          |   3 ++
 9 files changed, 217 insertions(+)
 create mode 100644 src/mesa/es/main/eglimage.c
 create mode 100644 src/mesa/es/main/eglimage.h

(limited to 'src/mesa/main')

diff --git a/src/mesa/es/main/APIspec.txt b/src/mesa/es/main/APIspec.txt
index f102e7083c..08ce699696 100644
--- a/src/mesa/es/main/APIspec.txt
+++ b/src/mesa/es/main/APIspec.txt
@@ -2939,6 +2939,22 @@ convertalias    DrawTexfv
 convertparams   GLfloat         coords
 category        GLES1.1:OES_draw_texture
 
+name            EGLImageTargetTexture2D
+alias           EGLImageTargetTexture2DOES
+return          void
+param           target          GLenum
+param           image           GLeglImageOES
+checkparam      target          GL_TEXTURE_2D
+category        GLES1.1:OES_EGL_image GLES2.0:OES_EGL_image
+
+name            EGLImageTargetRenderbufferStorage
+alias           EGLImageTargetRenderbufferStorageOES
+return          void
+param           target          GLenum
+param           image           GLeglImageOES
+checkparam      target          GLES1.1:GL_RENDERBUFFER_OES GLES2.0:GL_RENDERBUFFER
+category        GLES1.1:OES_EGL_image GLES2.0:OES_EGL_image
+
 # We don't support OES_get_program_binary yet either
 #name GetProgramBinary
 #return void
diff --git a/src/mesa/es/main/eglimage.c b/src/mesa/es/main/eglimage.c
new file mode 100644
index 0000000000..5dd7a0cfaa
--- /dev/null
+++ b/src/mesa/es/main/eglimage.c
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2009 Chia-I Wu <olvaffe@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#include "main/mtypes.h"
+#include "main/context.h"
+#include "main/teximage.h"
+#include "main/texstate.h"
+#include "main/imports.h"
+#include "glapi/dispatch.h"
+
+#include "eglimage.h"
+
+
+#if FEATURE_OES_EGL_image
+
+
+void GLAPIENTRY
+_mesa_EGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_renderbuffer *rb;
+
+   if (!ctx->Extensions.OES_EGL_image) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glEGLImageTargetRenderbufferStorageOES(unsupported)");
+      return;
+   }
+
+   if (target != GL_RENDERBUFFER) {
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "glEGLImageTargetRenderbufferStorage(target=0x%x)", target);
+      return;
+   }
+
+   rb = ctx->CurrentRenderbuffer;
+   if (!rb) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glEGLImageTargetRenderbufferStorageOES(no bound rb)");
+      return;
+   }
+
+   FLUSH_VERTICES(ctx, _NEW_BUFFERS);
+
+   ASSERT(ctx->Driver.EGLImageTargetRenderbufferStorage);
+   ctx->Driver.EGLImageTargetRenderbufferStorage(ctx, rb, image);
+   /* invalidate fbo? */
+}
+
+void GLAPIENTRY _mesa_EGLImageTargetTexture2DOES(GLenum target, GLeglImageOES image)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_texture_unit *texUnit;
+   struct gl_texture_object *texObj;
+
+   if (!ctx->Extensions.OES_EGL_image) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glEGLImageTargetTexture2DOES(unsupported)");
+      return;
+   }
+
+   if (target != GL_TEXTURE_2D) {
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "glEGLImageTargetTexture2D(target=0x%x)", target);
+      return;
+   }
+
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   texUnit = _mesa_get_current_tex_unit(ctx);
+   texObj = _mesa_select_tex_object(ctx, texUnit, target);
+
+   _mesa_lock_texture(ctx, texObj);
+
+   ASSERT(ctx->Driver.EGLImageTargetTexture2D);
+   ctx->Driver.EGLImageTargetTexture2D(ctx, texObj ,image);
+
+   /* invalidate state and fbo?*/
+   /* fbo? */
+   texObj->_Complete = GL_FALSE;
+   ctx->NewState |= _NEW_TEXTURE;
+
+   _mesa_unlock_texture(ctx, texObj);
+}
+
+
+void
+_mesa_init_eglimage_dispatch(struct _glapi_table *disp)
+{
+   SET_EGLImageTargetRenderbufferStorageOES(disp,
+         _mesa_EGLImageTargetRenderbufferStorageOES);
+   SET_EGLImageTargetTexture2DOES(disp, _mesa_EGLImageTargetTexture2DOES);
+}
+
+
+#endif /* FEATURE_OES_EGL_image */
diff --git a/src/mesa/es/main/eglimage.h b/src/mesa/es/main/eglimage.h
new file mode 100644
index 0000000000..7acb991200
--- /dev/null
+++ b/src/mesa/es/main/eglimage.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2009 Chia-I Wu <olvaffe@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef EGLIMAGE_H
+#define EGLIMAGE_H
+
+
+#include "main/mtypes.h"
+
+
+#if FEATURE_OES_EGL_image
+
+#define _MESA_INIT_EGLIMAGE_FUNCTIONS(driver, impl)                        \
+   do {                                                                    \
+      (driver)->EGLImageTargetRenderbufferStorage =                        \
+                        impl ## EGLImageTargetRenderbufferStorage;         \
+      (driver)->EGLImageTargetTexture2D = impl ## EGLImageTargetTexture2D; \
+   } while (0)
+
+extern void GLAPIENTRY
+_mesa_EGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image);
+
+extern void GLAPIENTRY
+_mesa_EGLImageTargetTexture2DOES(GLenum target, GLeglImageOES image);
+
+extern void
+_mesa_init_eglimage_dispatch(struct _glapi_table *disp);
+
+#else /* FEATURE_OES_EGL_image */
+
+#define _MESA_INIT_EGLIMAGE_FUNCTIONS(driver, impl) do { } while (0)
+
+static INLINE void
+_mesa_init_eglimage_dispatch(struct _glapi_table *disp)
+{
+}
+
+#endif /* FEATURE_OES_EGL_image */
+
+
+#endif /* EGLIMAGE_H */
diff --git a/src/mesa/es/main/mfeatures.h b/src/mesa/es/main/mfeatures.h
index 0f696824d0..28f376d2d1 100644
--- a/src/mesa/es/main/mfeatures.h
+++ b/src/mesa/es/main/mfeatures.h
@@ -98,6 +98,7 @@
 #define FEATURE_NV_fragment_program 0
 #define FEATURE_NV_vertex_program 0
 
+#define FEATURE_OES_EGL_image 1
 #define FEATURE_OES_framebuffer_object 1
 #define FEATURE_OES_draw_texture 1
 #define FEATURE_OES_mapbuffer 1
diff --git a/src/mesa/es/main/specials_es1.c b/src/mesa/es/main/specials_es1.c
index 0792dcfa97..02c3247e94 100644
--- a/src/mesa/es/main/specials_es1.c
+++ b/src/mesa/es/main/specials_es1.c
@@ -100,6 +100,9 @@ make_extension_string(const GLcontext *ctx, char *str)
    /* 1.1 deprecated extensions */
    len += append_extension(&str, "GL_OES_query_matrix");
 
+   if (ctx->Extensions.OES_EGL_image)
+      len += append_extension(&str, "GL_OES_EGL_image");
+
    if (ctx->Extensions.OES_draw_texture)
       len += append_extension(&str, "GL_OES_draw_texture");
 
diff --git a/src/mesa/es/sources.mak b/src/mesa/es/sources.mak
index b52978be96..6d20740095 100644
--- a/src/mesa/es/sources.mak
+++ b/src/mesa/es/sources.mak
@@ -3,6 +3,7 @@
 ES1_LOCAL_SOURCES :=			\
 	main/api_exec_es1.c		\
 	main/drawtex.c			\
+	main/eglimage.c			\
 	main/get_es1.c			\
 	main/specials_es1.c		\
 	main/es_cpaltex.c		\
@@ -23,6 +24,7 @@ ES1_LOCAL_INCLUDES :=			\
 
 ES2_LOCAL_SOURCES :=			\
 	main/api_exec_es2.c		\
+	main/eglimage.c			\
 	main/get_es2.c			\
 	main/specials_es2.c		\
 	main/es_cpaltex.c		\
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index afcab5bf2b..307ecd3d8b 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -1070,6 +1070,19 @@ struct dd_function_table {
                    GLfloat width, GLfloat height);
    /*@}*/
 #endif
+#if FEATURE_OES_EGL_image
+   /**
+    * \name GL_OES_EGL_image interface
+    */
+   /*@{*/
+   void (*EGLImageTargetRenderbufferStorage)(GLcontext *ctx,
+                                             struct gl_renderbuffer *rb,
+                                             GLvoid *image);
+   void (*EGLImageTargetTexture2D)(GLcontext *ctx,
+                                   struct gl_texture_object *texObj,
+                                   GLvoid *image);
+   /*@}*/
+#endif
 };
 
 
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 7e289743ce..5b54c1cf8c 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -186,6 +186,9 @@ static const struct {
 #if FEATURE_OES_draw_texture
    { OFF, "GL_OES_draw_texture",               F(OES_draw_texture) },
 #endif /* FEATURE_OES_draw_texture */
+#if FEATURE_OES_EGL_image
+   { OFF, "GL_OES_EGL_image",                  F(OES_EGL_image) },
+#endif
 };
 
 
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index bebb3e56a6..6ce9ae1d6a 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2602,6 +2602,9 @@ struct gl_extensions
 #if FEATURE_OES_draw_texture
    GLboolean OES_draw_texture;
 #endif /* FEATURE_OES_draw_texture */
+#if FEATURE_OES_EGL_image
+   GLboolean OES_EGL_image;
+#endif
    /** The extension string */
    const GLubyte *String;
 };
-- 
cgit v1.2.3